From 7922cf8a6f8075046060a2d65f8514f2677d9a14 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Thu, 4 Feb 2016 12:26:09 +0530 Subject: qcacld-4.0: Removing HIF/HTC from driver project Remove HIF/HTC from driver project. This is moved to host common project Change-Id: I7dd6d4117a197a474304aa4a28edacbca924b795 --- core/hif/inc/hif.h | 706 -------- core/hif/inc/hif_napi.h | 153 -- core/hif/inc/platform_icnss.h | 37 - core/hif/inc/regtable.h | 33 - core/hif/inc/regtable_ce.h | 260 --- core/hif/inc/regtable_pcie.h | 1030 ----------- core/hif/src/adrastea_reg_def.h | 2367 ------------------------ core/hif/src/ar6320def.h | 796 -------- core/hif/src/ar6320v2def.h | 815 --------- core/hif/src/ar9888def.h | 590 ------ core/hif/src/ath_procfs.c | 199 -- core/hif/src/ce/ce_api.h | 477 ----- core/hif/src/ce/ce_assignment.h | 301 ---- core/hif/src/ce/ce_bmi.c | 292 --- core/hif/src/ce/ce_bmi.h | 45 - core/hif/src/ce/ce_diag.c | 456 ----- core/hif/src/ce/ce_internal.h | 365 ---- core/hif/src/ce/ce_main.c | 2462 ------------------------- core/hif/src/ce/ce_main.h | 136 -- core/hif/src/ce/ce_reg.h | 544 ------ core/hif/src/ce/ce_service.c | 1840 ------------------- core/hif/src/ce/ce_tasklet.c | 411 ----- core/hif/src/ce/ce_tasklet.h | 36 - core/hif/src/hif_debug.h | 42 - core/hif/src/hif_hw_version.h | 93 - core/hif/src/hif_io32.h | 39 - core/hif/src/hif_main.c | 881 --------- core/hif/src/hif_main.h | 136 -- core/hif/src/hif_napi.c | 464 ----- core/hif/src/icnss_stub/icnss_stub.c | 369 ---- core/hif/src/icnss_stub/icnss_stub.h | 135 -- core/hif/src/mp_dev.c | 327 ---- core/hif/src/mp_dev.h | 36 - core/hif/src/pcie/cnss_stub.h | 40 - core/hif/src/pcie/hif_io32_pci.h | 312 ---- core/hif/src/pcie/if_pci.c | 3309 ---------------------------------- core/hif/src/pcie/if_pci.h | 234 --- core/hif/src/pcie/if_pci_internal.h | 110 -- core/hif/src/qca6180def.h | 1008 ----------- core/hif/src/regtable.c | 91 - core/hif/src/snoc/hif_io32_snoc.h | 236 --- core/hif/src/snoc/if_snoc.c | 315 ---- core/htc/dl_list.h | 208 --- core/htc/htc.c | 881 --------- core/htc/htc_api.h | 718 -------- core/htc/htc_debug.h | 50 - core/htc/htc_internal.h | 317 ---- core/htc/htc_packet.h | 280 --- core/htc/htc_recv.c | 749 -------- core/htc/htc_send.c | 2002 -------------------- core/htc/htc_services.c | 369 ---- 51 files changed, 28102 deletions(-) delete mode 100644 core/hif/inc/hif.h delete mode 100644 core/hif/inc/hif_napi.h delete mode 100644 core/hif/inc/platform_icnss.h delete mode 100644 core/hif/inc/regtable.h delete mode 100644 core/hif/inc/regtable_ce.h delete mode 100644 core/hif/inc/regtable_pcie.h delete mode 100644 core/hif/src/adrastea_reg_def.h delete mode 100644 core/hif/src/ar6320def.h delete mode 100644 core/hif/src/ar6320v2def.h delete mode 100644 core/hif/src/ar9888def.h delete mode 100644 core/hif/src/ath_procfs.c delete mode 100644 core/hif/src/ce/ce_api.h delete mode 100644 core/hif/src/ce/ce_assignment.h delete mode 100644 core/hif/src/ce/ce_bmi.c delete mode 100644 core/hif/src/ce/ce_bmi.h delete mode 100644 core/hif/src/ce/ce_diag.c delete mode 100644 core/hif/src/ce/ce_internal.h delete mode 100644 core/hif/src/ce/ce_main.c delete mode 100644 core/hif/src/ce/ce_main.h delete mode 100644 core/hif/src/ce/ce_reg.h delete mode 100644 core/hif/src/ce/ce_service.c delete mode 100644 core/hif/src/ce/ce_tasklet.c delete mode 100644 core/hif/src/ce/ce_tasklet.h delete mode 100644 core/hif/src/hif_debug.h delete mode 100644 core/hif/src/hif_hw_version.h delete mode 100644 core/hif/src/hif_io32.h delete mode 100644 core/hif/src/hif_main.c delete mode 100644 core/hif/src/hif_main.h delete mode 100644 core/hif/src/hif_napi.c delete mode 100644 core/hif/src/icnss_stub/icnss_stub.c delete mode 100644 core/hif/src/icnss_stub/icnss_stub.h delete mode 100644 core/hif/src/mp_dev.c delete mode 100644 core/hif/src/mp_dev.h delete mode 100644 core/hif/src/pcie/cnss_stub.h delete mode 100644 core/hif/src/pcie/hif_io32_pci.h delete mode 100644 core/hif/src/pcie/if_pci.c delete mode 100644 core/hif/src/pcie/if_pci.h delete mode 100644 core/hif/src/pcie/if_pci_internal.h delete mode 100644 core/hif/src/qca6180def.h delete mode 100644 core/hif/src/regtable.c delete mode 100644 core/hif/src/snoc/hif_io32_snoc.h delete mode 100644 core/hif/src/snoc/if_snoc.c delete mode 100644 core/htc/dl_list.h delete mode 100644 core/htc/htc.c delete mode 100644 core/htc/htc_api.h delete mode 100644 core/htc/htc_debug.h delete mode 100644 core/htc/htc_internal.h delete mode 100644 core/htc/htc_packet.h delete mode 100644 core/htc/htc_recv.c delete mode 100644 core/htc/htc_send.c delete mode 100644 core/htc/htc_services.c diff --git a/core/hif/inc/hif.h b/core/hif/inc/hif.h deleted file mode 100644 index 24d5c591af84..000000000000 --- a/core/hif/inc/hif.h +++ /dev/null @@ -1,706 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _HIF_H_ -#define _HIF_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Header files */ -#include "athdefs.h" -#include "a_types.h" -#include "osapi_linux.h" -#include "cdf_status.h" -#include "cdf_nbuf.h" -#include "ol_if_athvar.h" -#include -#ifdef HIF_PCI -#include -#endif /* HIF_PCI */ - -#define ENABLE_MBOX_DUMMY_SPACE_FEATURE 1 - -typedef struct htc_callbacks HTC_CALLBACKS; -typedef void __iomem *A_target_id_t; - -#define HIF_TYPE_AR6002 2 -#define HIF_TYPE_AR6003 3 -#define HIF_TYPE_AR6004 5 -#define HIF_TYPE_AR9888 6 -#define HIF_TYPE_AR6320 7 -#define HIF_TYPE_AR6320V2 8 -/* For attaching Peregrine 2.0 board host_reg_tbl only */ -#define HIF_TYPE_AR9888V2 8 -#define HIF_TYPE_QCA6180 9 -#define HIF_TYPE_ADRASTEA 10 - -#define TARGET_TYPE_UNKNOWN 0 -#define TARGET_TYPE_AR6001 1 -#define TARGET_TYPE_AR6002 2 -#define TARGET_TYPE_AR6003 3 -#define TARGET_TYPE_AR6004 5 -#define TARGET_TYPE_AR6006 6 -#define TARGET_TYPE_AR9888 7 -#define TARGET_TYPE_AR6320 8 -#define TARGET_TYPE_AR900B 9 -/* For attach Peregrine 2.0 board target_reg_tbl only */ -#define TARGET_TYPE_AR9888V2 10 -/* For attach Rome1.0 target_reg_tbl only*/ -#define TARGET_TYPE_AR6320V1 11 -/* For Rome2.0/2.1 target_reg_tbl ID*/ -#define TARGET_TYPE_AR6320V2 12 -/* For Rome3.0 target_reg_tbl ID*/ -#define TARGET_TYPE_AR6320V3 13 -/* For Tufello1.0 target_reg_tbl ID*/ -#define TARGET_TYPE_QCA9377V1 14 -/* For QCA6180 target */ -#define TARGET_TYPE_QCA6180 15 -/* For Adrastea target */ -#define TARGET_TYPE_ADRASTEA 16 - -struct CE_state; -#ifdef QCA_WIFI_3_0_ADRASTEA -#define CE_COUNT_MAX 12 -#else -#define CE_COUNT_MAX 8 -#endif - -/* These numbers are selected so that the product is close to current - higher limit of packets HIF services at one shot (1000) */ -#define QCA_NAPI_BUDGET 64 -#define QCA_NAPI_DEF_SCALE 16 -/* NOTE: This is to adapt non-NAPI solution to use - the same "budget" as NAPI. Will be removed - `once decision about NAPI is made */ -#define HIF_NAPI_MAX_RECEIVES (QCA_NAPI_BUDGET * QCA_NAPI_DEF_SCALE) - -/* NOTE: "napi->scale" can be changed, - but this does not change the number of buckets */ -#define QCA_NAPI_NUM_BUCKETS (QCA_NAPI_BUDGET / QCA_NAPI_DEF_SCALE) -struct qca_napi_stat { - uint32_t napi_schedules; - uint32_t napi_polls; - uint32_t napi_completes; - uint32_t napi_workdone; - uint32_t napi_budget_uses[QCA_NAPI_NUM_BUCKETS]; -}; - -/** - * per NAPI instance data structure - * This data structure holds stuff per NAPI instance. - * Note that, in the current implementation, though scale is - * an instance variable, it is set to the same value for all - * instances. - */ -struct qca_napi_info { - struct napi_struct napi; /* one NAPI Instance per CE in phase I */ - uint8_t scale; /* currently same on all instances */ - uint8_t id; - struct qca_napi_stat stats[NR_CPUS]; -}; - -/** - * NAPI data-sructure common to all NAPI instances. - * - * A variable of this type will be stored in hif module context. - */ - -struct qca_napi_data { - /* NOTE: make sure the mutex is inited only at the very beginning - once for the lifetime of the driver. For now, granularity of one - is OK, but we might want to have a better granularity later */ - struct mutex mutex; - uint32_t state; - uint32_t ce_map; /* bitmap of created/registered NAPI - instances, indexed by pipe_id, - not used by clients (clients use an - id returned by create) */ - struct net_device netdev; /* dummy net_dev */ - struct qca_napi_info napis[CE_COUNT_MAX]; -}; - -struct ol_softc { - void __iomem *mem; /* IO mapped memory base address */ - cdf_dma_addr_t mem_pa; - uint32_t soc_version; - /* - * handle for code that uses the osdep.h version of OS - * abstraction primitives - */ - struct _NIC_DEV aps_osdev; - enum ath_hal_bus_type bus_type; - uint32_t lcr_val; - bool pkt_log_init; - bool request_irq_done; - /* - * handle for code that uses cdf version of OS - * abstraction primitives - */ - cdf_device_t cdf_dev; - - struct ol_version version; - - /* Packet statistics */ - struct ol_ath_stats pkt_stats; - - /* A_TARGET_TYPE_* */ - uint32_t target_type; - uint32_t target_fw_version; - uint32_t target_version; - uint32_t target_revision; - uint8_t crm_version_string[64]; - uint8_t wlan_version_string[64]; - ol_target_status target_status; - bool is_sim; - /* calibration data is stored in flash */ - uint8_t *cal_in_flash; - /* virtual address for the calibration data on the flash */ - void *cal_mem; - /* status of target init */ - WLAN_INIT_STATUS wlan_init_status; - - /* BMI info */ - /* OS-dependent private info for BMI */ - void *bmi_ol_priv; - bool bmi_done; - bool bmi_ua_done; - uint8_t *bmi_cmd_buff; - dma_addr_t bmi_cmd_da; - OS_DMA_MEM_CONTEXT(bmicmd_dmacontext) - - uint8_t *bmi_rsp_buff; - dma_addr_t bmi_rsp_da; - /* length of last response */ - uint32_t last_rxlen; - OS_DMA_MEM_CONTEXT(bmirsp_dmacontext) - - void *msi_magic; - dma_addr_t msi_magic_da; - OS_DMA_MEM_CONTEXT(msi_dmacontext) - - /* Handles for Lower Layers : filled in at init time */ - hif_handle_t hif_hdl; -#ifdef HIF_PCI - struct hif_pci_softc *hif_sc; -#endif - -#ifdef WLAN_FEATURE_FASTPATH - int fastpath_mode_on; /* Duplicating this for data path efficiency */ -#endif /* WLAN_FEATURE_FASTPATH */ - - /* HTC handles */ - void *htc_handle; - - bool fEnableBeaconEarlyTermination; - uint8_t bcnEarlyTermWakeInterval; - - /* UTF event information */ - struct { - uint8_t *data; - uint32_t length; - cdf_size_t offset; - uint8_t currentSeq; - uint8_t expectedSeq; - } utf_event_info; - - struct ol_wow_info *scn_wowInfo; - /* enable uart/serial prints from target */ - bool enableuartprint; - /* enable fwlog */ - bool enablefwlog; - - HAL_REG_CAPABILITIES hal_reg_capabilities; - struct ol_regdmn *ol_regdmn_handle; - uint8_t bcn_mode; - uint8_t arp_override; - /* - * Includes host side stack level stats + - * radio level athstats - */ - struct wlan_dbg_stats ath_stats; - /* noise_floor */ - int16_t chan_nf; - uint32_t min_tx_power; - uint32_t max_tx_power; - uint32_t txpowlimit2G; - uint32_t txpowlimit5G; - uint32_t txpower_scale; - uint32_t chan_tx_pwr; - uint32_t vdev_count; - uint32_t max_bcn_ie_size; - cdf_spinlock_t scn_lock; - uint8_t vow_extstats; - /* if dcs enabled or not */ - uint8_t scn_dcs; - wdi_event_subscribe scn_rx_peer_invalid_subscriber; - uint8_t proxy_sta; - uint8_t bcn_enabled; - /* Dynamic Tx Chainmask Selection enabled/disabled */ - uint8_t dtcs; - /* true if vht ies are set on target */ - uint32_t set_ht_vht_ies:1; - /*CWM enable/disable state */ - bool scn_cwmenable; - uint8_t max_no_of_peers; -#ifdef CONFIG_CNSS - struct cnss_fw_files fw_files; -#endif -#if defined(CONFIG_CNSS) - void *ramdump_base; - unsigned long ramdump_address; - unsigned long ramdump_size; -#endif - bool enable_self_recovery; -#ifdef WLAN_FEATURE_LPSS - bool enablelpasssupport; -#endif - bool enable_ramdump_collection; - struct targetdef_s *targetdef; - struct ce_reg_def *target_ce_def; - struct hostdef_s *hostdef; - struct host_shadow_regs_s *host_shadow_regs; - bool athdiag_procfs_inited; - /* - * Guard changes to Target HW state and to software - * structures that track hardware state. - */ - unsigned int ce_count; /* Number of Copy Engines supported */ - struct CE_state *ce_id_to_state[CE_COUNT_MAX]; /* CE id to CE_state */ -#ifdef FEATURE_NAPI - struct qca_napi_data napi_data; -#endif /* FEATURE_NAPI */ - int htc_endpoint; - bool recovery; - bool hif_init_done; - int linkstate_vote; - atomic_t link_suspended; - atomic_t wow_done; - atomic_t tasklet_from_intr; - atomic_t active_tasklet_cnt; - bool notice_send; -#ifdef HIF_PCI - cdf_spinlock_t irq_lock; - uint32_t ce_irq_summary; -#endif - uint32_t *vaddr_rri_on_ddr; -}; - -typedef enum { - HIF_DEVICE_POWER_UP, /* HIF layer should power up interface - * and/or module */ - HIF_DEVICE_POWER_DOWN, /* HIF layer should initiate bus-specific - * measures to minimize power */ - HIF_DEVICE_POWER_CUT /* HIF layer should initiate bus-specific - * AND/OR platform-specific measures - * to completely power-off the module and - * associated hardware (i.e. cut power - * supplies) */ -} HIF_DEVICE_POWER_CHANGE_TYPE; - -/** - * enum hif_enable_type: what triggered the enabling of hif - * - * @HIF_ENABLE_TYPE_PROBE: probe triggered enable - * @HIF_ENABLE_TYPE_REINIT: reinit triggered enable - */ -enum hif_enable_type { - HIF_ENABLE_TYPE_PROBE, - HIF_ENABLE_TYPE_REINIT, - HIF_ENABLE_TYPE_MAX -}; - -/** - * enum hif_disable_type: what triggered the disabling of hif - * - * @HIF_DISABLE_TYPE_PROBE_ERROR: probe error triggered disable - * @HIF_DISABLE_TYPE_REINIT_ERROR: reinit error triggered - * disable - * @HIF_DISABLE_TYPE_REMOVE: remove triggered disable - * @HIF_DISABLE_TYPE_SHUTDOWN: shutdown triggered disable - */ -enum hif_disable_type { - HIF_DISABLE_TYPE_PROBE_ERROR, - HIF_DISABLE_TYPE_REINIT_ERROR, - HIF_DISABLE_TYPE_REMOVE, - HIF_DISABLE_TYPE_SHUTDOWN, - HIF_DISABLE_TYPE_MAX -}; - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -typedef struct _HID_ACCESS_LOG { - uint32_t seqnum; - bool is_write; - void *addr; - uint32_t value; -} HIF_ACCESS_LOG; -#endif - -#define HIF_MAX_DEVICES 1 - -struct htc_callbacks { - void *context; /* context to pass to the dsrhandler - * note : rwCompletionHandler is provided - * the context passed to hif_read_write */ - int (*rwCompletionHandler)(void *rwContext, int status); - int (*dsrHandler)(void *context); -}; - -typedef struct osdrv_callbacks { - void *context; /* context to pass for all callbacks - * except deviceRemovedHandler - * the deviceRemovedHandler is only - * called if the device is claimed */ - int (*deviceInsertedHandler)(void *context, void *hif_handle); - int (*deviceRemovedHandler)(void *claimedContext, - void *hif_handle); - int (*deviceSuspendHandler)(void *context); - int (*deviceResumeHandler)(void *context); - int (*deviceWakeupHandler)(void *context); - int (*devicePowerChangeHandler)(void *context, - HIF_DEVICE_POWER_CHANGE_TYPE - config); -} OSDRV_CALLBACKS; - -/* - * This API is used to perform any global initialization of the HIF layer - * and to set OS driver callbacks (i.e. insertion/removal) to the HIF layer - * - */ -int hif_init(OSDRV_CALLBACKS *callbacks); - -/* This API detaches the HTC layer from the HIF device */ -void hif_detach_htc(struct ol_softc *scn); - -/****************************************************************/ -/* BMI and Diag window abstraction */ -/****************************************************************/ - -#define HIF_BMI_EXCHANGE_NO_TIMEOUT ((uint32_t)(0)) - -#define DIAG_TRANSFER_LIMIT 2048U /* maximum number of bytes that can be - * handled atomically by - * DiagRead/DiagWrite */ - -/* - * API to handle HIF-specific BMI message exchanges, this API is synchronous - * and only allowed to be called from a context that can block (sleep) */ -CDF_STATUS hif_exchange_bmi_msg(struct ol_softc *scn, - uint8_t *pSendMessage, - uint32_t Length, - uint8_t *pResponseMessage, - uint32_t *pResponseLength, uint32_t TimeoutMS); - -/* - * APIs to handle HIF specific diagnostic read accesses. These APIs are - * synchronous and only allowed to be called from a context that - * can block (sleep). They are not high performance APIs. - * - * hif_diag_read_access reads a 4 Byte aligned/length value from a - * Target register or memory word. - * - * hif_diag_read_mem reads an arbitrary length of arbitrarily aligned memory. - */ -CDF_STATUS hif_diag_read_access(struct ol_softc *scn, uint32_t address, - uint32_t *data); -CDF_STATUS hif_diag_read_mem(struct ol_softc *scn, uint32_t address, - uint8_t *data, int nbytes); -void hif_dump_target_memory(struct ol_softc *scn, void *ramdump_base, - uint32_t address, uint32_t size); -/* - * APIs to handle HIF specific diagnostic write accesses. These APIs are - * synchronous and only allowed to be called from a context that - * can block (sleep). - * They are not high performance APIs. - * - * hif_diag_write_access writes a 4 Byte aligned/length value to a - * Target register or memory word. - * - * hif_diag_write_mem writes an arbitrary length of arbitrarily aligned memory. - */ -CDF_STATUS hif_diag_write_access(struct ol_softc *scn, uint32_t address, - uint32_t data); -CDF_STATUS hif_diag_write_mem(struct ol_softc *scn, uint32_t address, - uint8_t *data, int nbytes); - -/* - * Set the FASTPATH_mode_on flag in sc, for use by data path - */ -#ifdef WLAN_FEATURE_FASTPATH -void hif_enable_fastpath(struct ol_softc *hif_dev); -#endif - -#if defined(HIF_PCI) && !defined(A_SIMOS_DEVHOST) -/* - * This API allows the Host to access Target registers of a given - * A_target_id_t directly and relatively efficiently over PCIe. - * This allows the Host to avoid extra overhead associated with - * sending a message to firmware and waiting for a response message - * from firmware, as is done on other interconnects. - * - * Yet there is some complexity with direct accesses because the - * Target's power state is not known a priori. The Host must issue - * special PCIe reads/writes in order to explicitly wake the Target - * and to verify that it is awake and will remain awake. - * - * NB: Host endianness conversion is left for the caller to handle. - * These interfaces handle access; not interpretation. - * - * Usage: - * During initialization, use A_TARGET_ID to obtain an 'target ID' - * for use with these interfaces. - * - * Use A_TARGET_READ and A_TARGET_WRITE to access Target space. - * These calls must be bracketed by A_TARGET_ACCESS_BEGIN and - * A_TARGET_ACCESS_END. A single BEGIN/END pair is adequate for - * multiple READ/WRITE operations. - * - * Use A_TARGET_ACCESS_BEGIN to put the Target in a state in - * which it is legal for the Host to directly access it. This - * may involve waking the Target from a low power state, which - * may take up to 2Ms! - * - * Use A_TARGET_ACCESS_END to tell the Target that as far as - * this code path is concerned, it no longer needs to remain - * directly accessible. BEGIN/END is under a reference counter; - * multiple code paths may issue BEGIN/END on a single targid. - * - * For added efficiency, the Host may use A_TARGET_ACCESS_LIKELY. - * The LIKELY interface works just like A_TARGET_ACCESS_BEGIN, - * except that it may return before the Target is actually - * available. It's a vague indication that some Target accesses - * are expected "soon". When the LIKELY API is used, - * A_TARGET_ACCESS_BEGIN must be used before any access. - * - * There are several uses for the LIKELY/UNLIKELY API: - * -If there is some potential time before Target accesses - * and we want to get a head start on waking the Target - * (e.g. to overlap Target wake with Host-side malloc) - * -High-level code knows that it will call low-level - * functions that will use BEGIN/END, and we don't want - * to allow the Target to sleep until the entire sequence - * has completed. - * - * A_TARGET_ACCESS_OK verifies that the Target can be - * accessed. In general, this should not be needed, but it - * may be useful for debugging or for special uses. - * - * Note that there must be a matching END for each BEGIN - * AND there must be a matching UNLIKELY for each LIKELY! - * - * NB: This API is designed to allow some flexibility in tradeoffs - * between Target power utilization and Host efficiency and - * system performance. - */ - -/* - * Enable/disable CDC max performance workaround - * For max-performace set this to 0 - * To allow SoC to enter sleep set this to 1 - */ -#define CONFIG_DISABLE_CDC_MAX_PERF_WAR 0 -#endif - -#ifdef IPA_OFFLOAD -void hif_ipa_get_ce_resource(struct ol_softc *scn, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr); -#else -/** - * hif_ipa_get_ce_resource() - get uc resource on hif - * @scn: bus context - * @ce_sr_base_paddr: copyengine source ring base physical address - * @ce_sr_ring_size: copyengine source ring size - * @ce_reg_paddr: copyengine register physical address - * - * IPA micro controller data path offload feature enabled, - * HIF should release copy engine related resource information to IPA UC - * IPA UC will access hardware resource with released information - * - * Return: None - */ -static inline void hif_ipa_get_ce_resource(struct ol_softc *scn, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr) -{ - return; -} -#endif /* IPA_OFFLOAD */ - - -void hif_read_phy_mem_base(struct ol_softc *scn, - cdf_dma_addr_t *bar_value); - -/** - * @brief List of callbacks - filled in by HTC. - */ -struct hif_msg_callbacks { - void *Context; - /**< context meaningful to HTC */ - CDF_STATUS (*txCompletionHandler)(void *Context, cdf_nbuf_t wbuf, - uint32_t transferID, - uint32_t toeplitz_hash_result); - CDF_STATUS (*rxCompletionHandler)(void *Context, cdf_nbuf_t wbuf, - uint8_t pipeID); - void (*txResourceAvailHandler)(void *context, uint8_t pipe); - void (*fwEventHandler)(void *context, CDF_STATUS status); -}; - -#define HIF_DATA_ATTR_SET_TX_CLASSIFY(attr, v) \ - (attr |= (v & 0x01) << 5) -#define HIF_DATA_ATTR_SET_ENCAPSULATION_TYPE(attr, v) \ - (attr |= (v & 0x03) << 6) -#define HIF_DATA_ATTR_SET_ADDR_X_SEARCH_DISABLE(attr, v) \ - (attr |= (v & 0x01) << 13) -#define HIF_DATA_ATTR_SET_ADDR_Y_SEARCH_DISABLE(attr, v) \ - (attr |= (v & 0x01) << 14) -#define HIF_DATA_ATTR_SET_TOEPLITZ_HASH_ENABLE(attr, v) \ - (attr |= (v & 0x01) << 15) -#define HIF_DATA_ATTR_SET_PACKET_OR_RESULT_OFFSET(attr, v) \ - (attr |= (v & 0x0FFF) << 16) -#define HIF_DATA_ATTR_SET_ENABLE_11H(attr, v) \ - (attr |= (v & 0x01) << 30) - -#ifdef HIF_PCI -typedef struct pci_device_id hif_bus_id; -#else -typedef struct device hif_bus_id; -#endif - -void hif_post_init(struct ol_softc *scn, void *hHTC, - struct hif_msg_callbacks *callbacks); -CDF_STATUS hif_start(struct ol_softc *scn); -void hif_stop(struct ol_softc *scn); -void hif_flush_surprise_remove(struct ol_softc *scn); -void hif_dump(struct ol_softc *scn, uint8_t CmdId, bool start); -CDF_STATUS hif_send_head(struct ol_softc *scn, uint8_t PipeID, - uint32_t transferID, uint32_t nbytes, - cdf_nbuf_t wbuf, uint32_t data_attr); -void hif_send_complete_check(struct ol_softc *scn, uint8_t PipeID, - int force); -void hif_cancel_deferred_target_sleep(struct ol_softc *scn); -void hif_get_default_pipe(struct ol_softc *scn, uint8_t *ULPipe, - uint8_t *DLPipe); -int hif_map_service_to_pipe(struct ol_softc *scn, uint16_t svc_id, - uint8_t *ul_pipe, uint8_t *dl_pipe, int *ul_is_polled, - int *dl_is_polled); -uint16_t hif_get_free_queue_number(struct ol_softc *scn, uint8_t PipeID); -void *hif_get_targetdef(struct ol_softc *scn); -void hi_fsuspendwow(struct ol_softc *scn); -uint32_t hif_hia_item_address(uint32_t target_type, uint32_t item_offset); -void hif_set_target_sleep(struct ol_softc *scn, bool sleep_ok, - bool wait_for_it); -int hif_check_fw_reg(struct ol_softc *scn); -int hif_check_soc_status(struct ol_softc *scn); -void hif_get_hw_info(void *scn, u32 *version, u32 *revision, - const char **target_name); -void hif_set_fw_info(void *scn, u32 target_fw_version); -void hif_disable_isr(void *scn); -void hif_reset_soc(void *scn); -void hif_disable_aspm(void); -void hif_save_htc_htt_config_endpoint(int htc_endpoint); -CDF_STATUS hif_open(enum ath_hal_bus_type bus_type); -void hif_close(void *hif_ctx); -CDF_STATUS hif_enable(void *hif_ctx, struct device *dev, void *bdev, - const hif_bus_id *bid, enum ath_hal_bus_type bus_type, - enum hif_enable_type type); -void hif_disable(void *hif_ctx, enum hif_disable_type type); -void hif_enable_power_gating(void *hif_ctx); - -#ifdef FEATURE_RUNTIME_PM -struct hif_pm_runtime_lock; -int hif_pm_runtime_get(void *hif_ctx); -void hif_pm_runtime_get_noresume(void *hif_ctx); -int hif_pm_runtime_put(void *hif_ctx); -struct hif_pm_runtime_lock *hif_runtime_lock_init(const char *name); -void hif_runtime_lock_deinit(struct hif_pm_runtime_lock *lock); -int hif_pm_runtime_prevent_suspend(void *ol_sc, - struct hif_pm_runtime_lock *lock); -int hif_pm_runtime_allow_suspend(void *ol_sc, - struct hif_pm_runtime_lock *lock); -int hif_pm_runtime_prevent_suspend_timeout(void *ol_sc, - struct hif_pm_runtime_lock *lock, unsigned int delay); -#else -struct hif_pm_runtime_lock { - const char *name; -}; - -static inline void hif_pm_runtime_get_noresume(void *hif_ctx) -{} - -static inline int hif_pm_runtime_get(void *hif_ctx) -{ return 0; } -static inline int hif_pm_runtime_put(void *hif_ctx) -{ return 0; } -static inline struct hif_pm_runtime_lock *hif_runtime_lock_init( - const char *name) -{ return NULL; } -static inline void hif_runtime_lock_deinit(struct hif_pm_runtime_lock *lock) -{} - -static inline int hif_pm_runtime_prevent_suspend(void *ol_sc, - struct hif_pm_runtime_lock *lock) -{ return 0; } -static inline int hif_pm_runtime_allow_suspend(void *ol_sc, - struct hif_pm_runtime_lock *lock) -{ return 0; } -static inline int hif_pm_runtime_prevent_suspend_timeout(void *ol_sc, - struct hif_pm_runtime_lock *lock, unsigned int delay) -{ return 0; } -#endif - -void hif_enable_power_management(void *hif_ctx); -void hif_disable_power_management(void *hif_ctx); - -void hif_vote_link_down(void); -void hif_vote_link_up(void); -bool hif_can_suspend_link(void); - -int hif_bus_resume(void); -int hif_bus_suspend(void); - -#ifdef FEATURE_RUNTIME_PM -int hif_pre_runtime_suspend(void); -void hif_pre_runtime_resume(void); -int hif_runtime_suspend(void); -int hif_runtime_resume(void); -void hif_process_runtime_suspend_success(void); -void hif_process_runtime_suspend_failure(void); -void hif_process_runtime_resume_success(void); -#endif - -int hif_dump_registers(struct ol_softc *scn); -int ol_copy_ramdump(struct ol_softc *scn); -void hif_pktlogmod_exit(void *hif_ctx); -void hif_crash_shutdown(void *hif_ctx); -#ifdef __cplusplus -} -#endif -#endif /* _HIF_H_ */ diff --git a/core/hif/inc/hif_napi.h b/core/hif/inc/hif_napi.h deleted file mode 100644 index c6f817f3140a..000000000000 --- a/core/hif/inc/hif_napi.h +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __HIF_NAPI_H__ -#define __HIF_NAPI_H__ - -/** - * DOC: hif_napi.h - * - * Interface to HIF implemented functions of NAPI. - * These are used by hdd_napi. - */ - - -/* CLD headers */ -#include /* struct ol_softc; */ - -/** - * common stuff - * The declarations until #ifdef FEATURE_NAPI below - * are valid whether or not FEATURE_NAPI has been - * defined. - */ - -/* the following triggers napi_enable/disable as required */ -enum qca_napi_event { - NAPI_EVT_INVALID, - NAPI_EVT_INI_FILE, - NAPI_EVT_CMD_STATE /* ioctl enable/disable commands */ -}; - -/** - * Macros to map ids -returned by ...create()- to pipes and vice versa - */ -#define NAPI_ID2PIPE(i) ((i)-1) -#define NAPI_PIPE2ID(p) ((p)+1) - - -#ifdef FEATURE_NAPI - -/** - * NAPI HIF API - * - * the declarations below only apply to the case - * where FEATURE_NAPI is defined - */ - -int hif_napi_create(struct ol_softc *hif, - uint8_t pipe_id, - int (*poll)(struct napi_struct *, int), - int budget, - int scale); -int hif_napi_destroy(struct ol_softc *hif, - uint8_t id, - int force); - -struct qca_napi_data *hif_napi_get_all(struct ol_softc *hif); - -int hif_napi_event(struct ol_softc *hif, - enum qca_napi_event event, - void *data); - -/* called from the ISR within hif, so, ce is known */ -int hif_napi_enabled(struct ol_softc *hif, int ce); - -/* called from hdd (napi_poll), using napi id as a selector */ -void hif_napi_enable_irq(struct ol_softc *hif, int id); - -/* called by ce_tasklet.c::ce_irq_handler */ -int hif_napi_schedule(struct ol_softc *scn, int ce_id); - -/* called by hdd_napi, which is called by kernel */ -int hif_napi_poll(struct napi_struct *napi, int budget); - -#ifdef FEATURE_NAPI_DEBUG -#define NAPI_DEBUG(fmt, ...) \ - cdf_print("wlan: NAPI: %s:%d "fmt, __func__, __LINE__, ##__VA_ARGS__); -#else -#define NAPI_DEBUG(fmt, ...) /* NO-OP */ -#endif /* FEATURE NAPI_DEBUG */ - -#else /* ! defined(FEATURE_NAPI) */ - -/** - * Stub API - * - * The declarations in this section are valid only - * when FEATURE_NAPI has *not* been defined. - */ - -#define NAPI_DEBUG(fmt, ...) /* NO-OP */ - -static inline int hif_napi_create(struct ol_softc *hif, - uint8_t pipe_id, - int (*poll)(struct napi_struct *, int), - int budget, - int scale) -{ return -EPERM; } - -static inline int hif_napi_destroy(struct ol_softc *hif, - uint8_t id, - int force) -{ return -EPERM; } - -static inline struct qca_napi_data *hif_napi_get_all(struct ol_softc *hif) -{ return NULL; } - -static inline int hif_napi_event(struct ol_softc *hif, - enum qca_napi_event event, - void *data) -{ return -EPERM; } - -/* called from the ISR within hif, so, ce is known */ -static inline int hif_napi_enabled(struct ol_softc *hif, int ce) -{ return 0; } - -/* called from hdd (napi_poll), using napi id as a selector */ -static inline void hif_napi_enable_irq(struct ol_softc *hif, int id) -{ return; } - -static inline int hif_napi_schedule(struct ol_softc *hif, int ce_id) -{ return 0; } - -static inline int hif_napi_poll(struct napi_struct *napi, int budget) -{ return -EPERM; } - -#endif /* FEATURE_NAPI */ - -#endif /* __HIF_NAPI_H__ */ diff --git a/core/hif/inc/platform_icnss.h b/core/hif/inc/platform_icnss.h deleted file mode 100644 index 40c22b6c265a..000000000000 --- a/core/hif/inc/platform_icnss.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _PLATFORM_ICNSS_H_ -#define _PLATFORM_ICNSS_H_ - -#ifdef HIF_PCI -#include "icnss_stub.h" -#else -#include -#endif - -#endif diff --git a/core/hif/inc/regtable.h b/core/hif/inc/regtable.h deleted file mode 100644 index 2aae9e8d89f9..000000000000 --- a/core/hif/inc/regtable.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _REGTABLE_H_ -#define _REGTABLE_H_ - -#include "regtable_pcie.h" -#include "regtable_ce.h" -#endif diff --git a/core/hif/inc/regtable_ce.h b/core/hif/inc/regtable_ce.h deleted file mode 100644 index 5261bac0b070..000000000000 --- a/core/hif/inc/regtable_ce.h +++ /dev/null @@ -1,260 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _REGTABLE_CE_H_ -#define _REGTABLE_CE_H_ - -/* - * @d_DST_WR_INDEX_ADDRESS: Destination ring write index - * - * @d_SRC_WATERMARK_ADDRESS: Source ring watermark - * - * @d_SRC_WATERMARK_LOW_MASK: Bits indicating low watermark from Source ring - * watermark - * - * @d_SRC_WATERMARK_HIGH_MASK: Bits indicating high watermark from Source ring - * watermark - * - * @d_DST_WATERMARK_LOW_MASK: Bits indicating low watermark from Destination - * ring watermark - * - * @d_DST_WATERMARK_HIGH_MASK: Bits indicating high watermark from Destination - * ring watermark - * - * @d_CURRENT_SRRI_ADDRESS: Current source ring read index.The Start Offset - * will be reflected after a CE transfer is completed. - * - * @d_CURRENT_DRRI_ADDRESS: Current Destination ring read index. The Start - * Offset will be reflected after a CE transfer - * is completed. - * - * @d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK: Source ring high watermark - * Interrupt Status - * - * @d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK: Source ring low watermark - * Interrupt Status - * - * @d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK: Destination ring high watermark - * Interrupt Status - * - * @d_HOST_IS_DST_RING_LOW_WATERMARK_MASK: Source ring low watermark - * Interrupt Status - * - * @d_HOST_IS_ADDRESS: Host Interrupt Status Register - * - * @d_MISC_IS_ADDRESS: Miscellaneous Interrupt Status Register - * - * @d_HOST_IS_COPY_COMPLETE_MASK: Bits indicating Copy complete interrupt - * status from the Host Interrupt Status - * register - * - * @d_CE_WRAPPER_BASE_ADDRESS: Copy Engine Wrapper Base Address - * - * @d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS: CE Wrapper summary for interrupts - * to host - * - * @d_CE_WRAPPER_INDEX_BASE_LOW: The LSB Base address to which source and - * destination read indices are written - * - * @d_CE_WRAPPER_INDEX_BASE_HIGH: The MSB Base address to which source and - * destination read indices are written - * - * @d_HOST_IE_ADDRESS: Host Line Interrupt Enable Register - * - * @d_HOST_IE_COPY_COMPLETE_MASK: Bits indicating Copy complete interrupt - * enable from the IE register - * - * @d_SR_BA_ADDRESS: LSB of Source Ring Base Address - * - * @d_SR_BA_ADDRESS_HIGH: MSB of Source Ring Base Address - * - * @d_SR_SIZE_ADDRESS: Source Ring size - number of entries and Start Offset - * - * @d_CE_CTRL1_ADDRESS: CE Control register - * - * @d_CE_CTRL1_DMAX_LENGTH_MASK: Destination buffer Max Length used for error - * check - * - * @d_DR_BA_ADDRESS: Destination Ring Base Address Low - * - * @d_DR_BA_ADDRESS_HIGH: Destination Ring Base Address High - * - * @d_DR_SIZE_ADDRESS: Destination Ring size - number of entries Start Offset - * - * @d_CE_CMD_REGISTER: Implements commands to all CE Halt Flush - * - * @d_CE_MSI_ADDRESS: CE MSI LOW Address register - * - * @d_CE_MSI_ADDRESS_HIGH: CE MSI High Address register - * - * @d_CE_MSI_DATA: CE MSI Data Register - * - * @d_CE_MSI_ENABLE_BIT: Bit in CTRL1 register indication the MSI enable - * - * @d_MISC_IE_ADDRESS: Miscellaneous Interrupt Enable Register - * - * @d_MISC_IS_AXI_ERR_MASK: Bit in Misc IS indicating AXI Timeout Interrupt - * status - * - * @d_MISC_IS_DST_ADDR_ERR_MASK: Bit in Misc IS indicating Destination Address - * Error - * - * @d_MISC_IS_SRC_LEN_ERR_MASK: Bit in Misc IS indicating Source Zero Length - * Error Interrupt status - * - * @d_MISC_IS_DST_MAX_LEN_VIO_MASK: Bit in Misc IS indicating Destination Max - * Length Violated Interrupt status - * - * @d_MISC_IS_DST_RING_OVERFLOW_MASK: Bit in Misc IS indicating Destination - * Ring Overflow Interrupt status - * - * @d_MISC_IS_SRC_RING_OVERFLOW_MASK: Bit in Misc IS indicating Source Ring - * Overflow Interrupt status - * - * @d_SRC_WATERMARK_LOW_LSB: Source Ring Low Watermark LSB - * - * @d_SRC_WATERMARK_HIGH_LSB: Source Ring Low Watermark MSB - * - * @d_DST_WATERMARK_LOW_LSB: Destination Ring Low Watermark LSB - * - * @d_DST_WATERMARK_HIGH_LSB: Destination Ring High Watermark LSB - * - * - * @d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK: Bits in - * d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDR - * indicating Copy engine - * miscellaneous interrupt summary - * - * @d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB:Bits in - * d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDR - * indicating Host interrupts summary - * - * @d_CE_CTRL1_DMAX_LENGTH_LSB: LSB of Destination buffer Max Length used for - * error check - * - * @d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK: Bits indicating Source ring Byte Swap - * enable. Treats source ring memory - * organisation as big-endian - * - * @d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK: Bits indicating Destination ring - * byte swap enable. Treats destination - * ring memory organisation as big-endian - * - * @d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB: LSB of Source ring Byte Swap enable - * - * @d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB: LSB of Destination ring Byte Swap enable - * - * @d_CE_WRAPPER_DEBUG_OFFSET: Offset of CE OBS BUS Select register - * - * @d_CE_WRAPPER_DEBUG_SEL_MSB: MSB of Control register selecting inputs for - * trace/debug - * - * @d_CE_WRAPPER_DEBUG_SEL_LSB: LSB of Control register selecting inputs for - * trace/debug - * - * @d_CE_WRAPPER_DEBUG_SEL_MASK: Bits indicating Control register selecting - * inputs for trace/debug - * - * @d_CE_DEBUG_OFFSET: Offset of Copy Engine FSM Debug Status - * - * @d_CE_DEBUG_SEL_MSB: MSB of Copy Engine FSM Debug Status - * - * @d_CE_DEBUG_SEL_LSB: LSB of Copy Engine FSM Debug Status - * - * @d_CE_DEBUG_SEL_MASK: Bits indicating Copy Engine FSM Debug Status - * -*/ - -struct ce_reg_def { - /* copy_engine.c */ - uint32_t d_DST_WR_INDEX_ADDRESS; - uint32_t d_SRC_WATERMARK_ADDRESS; - uint32_t d_SRC_WATERMARK_LOW_MASK; - uint32_t d_SRC_WATERMARK_HIGH_MASK; - uint32_t d_DST_WATERMARK_LOW_MASK; - uint32_t d_DST_WATERMARK_HIGH_MASK; - uint32_t d_CURRENT_SRRI_ADDRESS; - uint32_t d_CURRENT_DRRI_ADDRESS; - uint32_t d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK; - uint32_t d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK; - uint32_t d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK; - uint32_t d_HOST_IS_DST_RING_LOW_WATERMARK_MASK; - uint32_t d_HOST_IS_ADDRESS; - uint32_t d_MISC_IS_ADDRESS; - uint32_t d_HOST_IS_COPY_COMPLETE_MASK; - uint32_t d_CE_WRAPPER_BASE_ADDRESS; - uint32_t d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS; - uint32_t d_CE_DDR_ADDRESS_FOR_RRI_LOW; - uint32_t d_CE_DDR_ADDRESS_FOR_RRI_HIGH; - uint32_t d_HOST_IE_ADDRESS; - uint32_t d_HOST_IE_COPY_COMPLETE_MASK; - uint32_t d_SR_BA_ADDRESS; - uint32_t d_SR_BA_ADDRESS_HIGH; - uint32_t d_SR_SIZE_ADDRESS; - uint32_t d_CE_CTRL1_ADDRESS; - uint32_t d_CE_CTRL1_DMAX_LENGTH_MASK; - uint32_t d_DR_BA_ADDRESS; - uint32_t d_DR_BA_ADDRESS_HIGH; - uint32_t d_DR_SIZE_ADDRESS; - uint32_t d_CE_CMD_REGISTER; - uint32_t d_CE_MSI_ADDRESS; - uint32_t d_CE_MSI_ADDRESS_HIGH; - uint32_t d_CE_MSI_DATA; - uint32_t d_CE_MSI_ENABLE_BIT; - uint32_t d_MISC_IE_ADDRESS; - uint32_t d_MISC_IS_AXI_ERR_MASK; - uint32_t d_MISC_IS_DST_ADDR_ERR_MASK; - uint32_t d_MISC_IS_SRC_LEN_ERR_MASK; - uint32_t d_MISC_IS_DST_MAX_LEN_VIO_MASK; - uint32_t d_MISC_IS_DST_RING_OVERFLOW_MASK; - uint32_t d_MISC_IS_SRC_RING_OVERFLOW_MASK; - uint32_t d_SRC_WATERMARK_LOW_LSB; - uint32_t d_SRC_WATERMARK_HIGH_LSB; - uint32_t d_DST_WATERMARK_LOW_LSB; - uint32_t d_DST_WATERMARK_HIGH_LSB; - uint32_t d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK; - uint32_t d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB; - uint32_t d_CE_CTRL1_DMAX_LENGTH_LSB; - uint32_t d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK; - uint32_t d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK; - uint32_t d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB; - uint32_t d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB; - uint32_t d_CE_CTRL1_IDX_UPD_EN_MASK; - uint32_t d_CE_WRAPPER_DEBUG_OFFSET; - uint32_t d_CE_WRAPPER_DEBUG_SEL_MSB; - uint32_t d_CE_WRAPPER_DEBUG_SEL_LSB; - uint32_t d_CE_WRAPPER_DEBUG_SEL_MASK; - uint32_t d_CE_DEBUG_OFFSET; - uint32_t d_CE_DEBUG_SEL_MSB; - uint32_t d_CE_DEBUG_SEL_LSB; - uint32_t d_CE_DEBUG_SEL_MASK; - uint32_t d_CE0_BASE_ADDRESS; - uint32_t d_CE1_BASE_ADDRESS; - uint32_t d_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES; - uint32_t d_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_STATUS; -}; -#endif /* _REGTABLE_CE_H_ */ diff --git a/core/hif/inc/regtable_pcie.h b/core/hif/inc/regtable_pcie.h deleted file mode 100644 index 1ae7b181ab82..000000000000 --- a/core/hif/inc/regtable_pcie.h +++ /dev/null @@ -1,1030 +0,0 @@ -/* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _REGTABLE_PCIE_H_ -#define _REGTABLE_PCIE_H_ - -#define MISSING 0 - -struct targetdef_s { - uint32_t d_RTC_SOC_BASE_ADDRESS; - uint32_t d_RTC_WMAC_BASE_ADDRESS; - uint32_t d_SYSTEM_SLEEP_OFFSET; - uint32_t d_WLAN_SYSTEM_SLEEP_OFFSET; - uint32_t d_WLAN_SYSTEM_SLEEP_DISABLE_LSB; - uint32_t d_WLAN_SYSTEM_SLEEP_DISABLE_MASK; - uint32_t d_CLOCK_CONTROL_OFFSET; - uint32_t d_CLOCK_CONTROL_SI0_CLK_MASK; - uint32_t d_RESET_CONTROL_OFFSET; - uint32_t d_RESET_CONTROL_MBOX_RST_MASK; - uint32_t d_RESET_CONTROL_SI0_RST_MASK; - uint32_t d_WLAN_RESET_CONTROL_OFFSET; - uint32_t d_WLAN_RESET_CONTROL_COLD_RST_MASK; - uint32_t d_WLAN_RESET_CONTROL_WARM_RST_MASK; - uint32_t d_GPIO_BASE_ADDRESS; - uint32_t d_GPIO_PIN0_OFFSET; - uint32_t d_GPIO_PIN1_OFFSET; - uint32_t d_GPIO_PIN0_CONFIG_MASK; - uint32_t d_GPIO_PIN1_CONFIG_MASK; - uint32_t d_SI_CONFIG_BIDIR_OD_DATA_LSB; - uint32_t d_SI_CONFIG_BIDIR_OD_DATA_MASK; - uint32_t d_SI_CONFIG_I2C_LSB; - uint32_t d_SI_CONFIG_I2C_MASK; - uint32_t d_SI_CONFIG_POS_SAMPLE_LSB; - uint32_t d_SI_CONFIG_POS_SAMPLE_MASK; - uint32_t d_SI_CONFIG_INACTIVE_CLK_LSB; - uint32_t d_SI_CONFIG_INACTIVE_CLK_MASK; - uint32_t d_SI_CONFIG_INACTIVE_DATA_LSB; - uint32_t d_SI_CONFIG_INACTIVE_DATA_MASK; - uint32_t d_SI_CONFIG_DIVIDER_LSB; - uint32_t d_SI_CONFIG_DIVIDER_MASK; - uint32_t d_SI_BASE_ADDRESS; - uint32_t d_SI_CONFIG_OFFSET; - uint32_t d_SI_TX_DATA0_OFFSET; - uint32_t d_SI_TX_DATA1_OFFSET; - uint32_t d_SI_RX_DATA0_OFFSET; - uint32_t d_SI_RX_DATA1_OFFSET; - uint32_t d_SI_CS_OFFSET; - uint32_t d_SI_CS_DONE_ERR_MASK; - uint32_t d_SI_CS_DONE_INT_MASK; - uint32_t d_SI_CS_START_LSB; - uint32_t d_SI_CS_START_MASK; - uint32_t d_SI_CS_RX_CNT_LSB; - uint32_t d_SI_CS_RX_CNT_MASK; - uint32_t d_SI_CS_TX_CNT_LSB; - uint32_t d_SI_CS_TX_CNT_MASK; - uint32_t d_BOARD_DATA_SZ; - uint32_t d_BOARD_EXT_DATA_SZ; - uint32_t d_MBOX_BASE_ADDRESS; - uint32_t d_LOCAL_SCRATCH_OFFSET; - uint32_t d_CPU_CLOCK_OFFSET; - uint32_t d_LPO_CAL_OFFSET; - uint32_t d_GPIO_PIN10_OFFSET; - uint32_t d_GPIO_PIN11_OFFSET; - uint32_t d_GPIO_PIN12_OFFSET; - uint32_t d_GPIO_PIN13_OFFSET; - uint32_t d_CLOCK_GPIO_OFFSET; - uint32_t d_CPU_CLOCK_STANDARD_LSB; - uint32_t d_CPU_CLOCK_STANDARD_MASK; - uint32_t d_LPO_CAL_ENABLE_LSB; - uint32_t d_LPO_CAL_ENABLE_MASK; - uint32_t d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB; - uint32_t d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK; - uint32_t d_ANALOG_INTF_BASE_ADDRESS; - uint32_t d_WLAN_MAC_BASE_ADDRESS; - uint32_t d_FW_INDICATOR_ADDRESS; - uint32_t d_DRAM_BASE_ADDRESS; - uint32_t d_SOC_CORE_BASE_ADDRESS; - uint32_t d_CORE_CTRL_ADDRESS; - uint32_t d_CE_COUNT; - uint32_t d_MSI_NUM_REQUEST; - uint32_t d_MSI_ASSIGN_FW; - uint32_t d_MSI_ASSIGN_CE_INITIAL; - uint32_t d_PCIE_INTR_ENABLE_ADDRESS; - uint32_t d_PCIE_INTR_CLR_ADDRESS; - uint32_t d_PCIE_INTR_FIRMWARE_MASK; - uint32_t d_PCIE_INTR_CE_MASK_ALL; - uint32_t d_CORE_CTRL_CPU_INTR_MASK; - uint32_t d_SR_WR_INDEX_ADDRESS; - uint32_t d_DST_WATERMARK_ADDRESS; - - /* htt_rx.c */ - uint32_t d_RX_MSDU_END_4_FIRST_MSDU_MASK; - uint32_t d_RX_MSDU_END_4_FIRST_MSDU_LSB; - uint32_t d_RX_MPDU_START_0_RETRY_LSB; - uint32_t d_RX_MPDU_START_0_RETRY_MASK; - uint32_t d_RX_MPDU_START_0_SEQ_NUM_MASK; - uint32_t d_RX_MPDU_START_0_SEQ_NUM_LSB; - uint32_t d_RX_MPDU_START_2_PN_47_32_LSB; - uint32_t d_RX_MPDU_START_2_PN_47_32_MASK; - uint32_t d_RX_MPDU_START_2_TID_LSB; - uint32_t d_RX_MPDU_START_2_TID_MASK; - uint32_t d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK; - uint32_t d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB; - uint32_t d_RX_MSDU_END_1_KEY_ID_OCT_MASK; - uint32_t d_RX_MSDU_END_1_KEY_ID_OCT_LSB; - uint32_t d_RX_MSDU_END_4_LAST_MSDU_MASK; - uint32_t d_RX_MSDU_END_4_LAST_MSDU_LSB; - uint32_t d_RX_ATTENTION_0_MCAST_BCAST_MASK; - uint32_t d_RX_ATTENTION_0_MCAST_BCAST_LSB; - uint32_t d_RX_ATTENTION_0_FRAGMENT_MASK; - uint32_t d_RX_ATTENTION_0_FRAGMENT_LSB; - uint32_t d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK; - uint32_t d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK; - uint32_t d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB; - uint32_t d_RX_MSDU_START_0_MSDU_LENGTH_MASK; - uint32_t d_RX_MSDU_START_0_MSDU_LENGTH_LSB; - uint32_t d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET; - uint32_t d_RX_MSDU_START_2_DECAP_FORMAT_MASK; - uint32_t d_RX_MSDU_START_2_DECAP_FORMAT_LSB; - uint32_t d_RX_MPDU_START_0_ENCRYPTED_MASK; - uint32_t d_RX_MPDU_START_0_ENCRYPTED_LSB; - uint32_t d_RX_ATTENTION_0_MORE_DATA_MASK; - uint32_t d_RX_ATTENTION_0_MSDU_DONE_MASK; - uint32_t d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK; - /* end */ - - /* PLL start */ - uint32_t d_EFUSE_OFFSET; - uint32_t d_EFUSE_XTAL_SEL_MSB; - uint32_t d_EFUSE_XTAL_SEL_LSB; - uint32_t d_EFUSE_XTAL_SEL_MASK; - uint32_t d_BB_PLL_CONFIG_OFFSET; - uint32_t d_BB_PLL_CONFIG_OUTDIV_MSB; - uint32_t d_BB_PLL_CONFIG_OUTDIV_LSB; - uint32_t d_BB_PLL_CONFIG_OUTDIV_MASK; - uint32_t d_BB_PLL_CONFIG_FRAC_MSB; - uint32_t d_BB_PLL_CONFIG_FRAC_LSB; - uint32_t d_BB_PLL_CONFIG_FRAC_MASK; - uint32_t d_WLAN_PLL_SETTLE_TIME_MSB; - uint32_t d_WLAN_PLL_SETTLE_TIME_LSB; - uint32_t d_WLAN_PLL_SETTLE_TIME_MASK; - uint32_t d_WLAN_PLL_SETTLE_OFFSET; - uint32_t d_WLAN_PLL_SETTLE_SW_MASK; - uint32_t d_WLAN_PLL_SETTLE_RSTMASK; - uint32_t d_WLAN_PLL_SETTLE_RESET; - uint32_t d_WLAN_PLL_CONTROL_NOPWD_MSB; - uint32_t d_WLAN_PLL_CONTROL_NOPWD_LSB; - uint32_t d_WLAN_PLL_CONTROL_NOPWD_MASK; - uint32_t d_WLAN_PLL_CONTROL_BYPASS_MSB; - uint32_t d_WLAN_PLL_CONTROL_BYPASS_LSB; - uint32_t d_WLAN_PLL_CONTROL_BYPASS_MASK; - uint32_t d_WLAN_PLL_CONTROL_BYPASS_RESET; - uint32_t d_WLAN_PLL_CONTROL_CLK_SEL_MSB; - uint32_t d_WLAN_PLL_CONTROL_CLK_SEL_LSB; - uint32_t d_WLAN_PLL_CONTROL_CLK_SEL_MASK; - uint32_t d_WLAN_PLL_CONTROL_CLK_SEL_RESET; - uint32_t d_WLAN_PLL_CONTROL_REFDIV_MSB; - uint32_t d_WLAN_PLL_CONTROL_REFDIV_LSB; - uint32_t d_WLAN_PLL_CONTROL_REFDIV_MASK; - uint32_t d_WLAN_PLL_CONTROL_REFDIV_RESET; - uint32_t d_WLAN_PLL_CONTROL_DIV_MSB; - uint32_t d_WLAN_PLL_CONTROL_DIV_LSB; - uint32_t d_WLAN_PLL_CONTROL_DIV_MASK; - uint32_t d_WLAN_PLL_CONTROL_DIV_RESET; - uint32_t d_WLAN_PLL_CONTROL_OFFSET; - uint32_t d_WLAN_PLL_CONTROL_SW_MASK; - uint32_t d_WLAN_PLL_CONTROL_RSTMASK; - uint32_t d_WLAN_PLL_CONTROL_RESET; - uint32_t d_SOC_CORE_CLK_CTRL_OFFSET; - uint32_t d_SOC_CORE_CLK_CTRL_DIV_MSB; - uint32_t d_SOC_CORE_CLK_CTRL_DIV_LSB; - uint32_t d_SOC_CORE_CLK_CTRL_DIV_MASK; - uint32_t d_RTC_SYNC_STATUS_PLL_CHANGING_MSB; - uint32_t d_RTC_SYNC_STATUS_PLL_CHANGING_LSB; - uint32_t d_RTC_SYNC_STATUS_PLL_CHANGING_MASK; - uint32_t d_RTC_SYNC_STATUS_PLL_CHANGING_RESET; - uint32_t d_RTC_SYNC_STATUS_OFFSET; - uint32_t d_SOC_CPU_CLOCK_OFFSET; - uint32_t d_SOC_CPU_CLOCK_STANDARD_MSB; - uint32_t d_SOC_CPU_CLOCK_STANDARD_LSB; - uint32_t d_SOC_CPU_CLOCK_STANDARD_MASK; - /* PLL end */ - - uint32_t d_SOC_POWER_REG_OFFSET; - uint32_t d_PCIE_INTR_CAUSE_ADDRESS; - uint32_t d_SOC_RESET_CONTROL_ADDRESS; - uint32_t d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK; - uint32_t d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB; - uint32_t d_SOC_RESET_CONTROL_CE_RST_MASK; - uint32_t d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK; - uint32_t d_CPU_INTR_ADDRESS; - uint32_t d_SOC_LF_TIMER_CONTROL0_ADDRESS; - uint32_t d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK; - - /* chip id start */ - uint32_t d_SOC_CHIP_ID_ADDRESS; - uint32_t d_SOC_CHIP_ID_VERSION_MASK; - uint32_t d_SOC_CHIP_ID_VERSION_LSB; - uint32_t d_SOC_CHIP_ID_REVISION_MASK; - uint32_t d_SOC_CHIP_ID_REVISION_LSB; - /* chip id end */ - - uint32_t d_A_SOC_CORE_SCRATCH_0_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_1_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_2_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_3_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_4_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_5_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_6_ADDRESS; - uint32_t d_A_SOC_CORE_SCRATCH_7_ADDRESS; - uint32_t d_A_SOC_CORE_SPARE_0_REGISTER; - uint32_t d_PCIE_INTR_FIRMWARE_ROUTE_MASK; - uint32_t d_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1; - uint32_t d_A_SOC_CORE_SPARE_1_REGISTER; - uint32_t d_A_SOC_CORE_PCIE_INTR_CLR_GRP1; - uint32_t d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1; - uint32_t d_A_SOC_PCIE_PCIE_SCRATCH_0; - uint32_t d_A_SOC_PCIE_PCIE_SCRATCH_1; - uint32_t d_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA; - uint32_t d_A_SOC_PCIE_PCIE_SCRATCH_2; - uint32_t d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK; - - uint32_t d_WLAN_DEBUG_INPUT_SEL_OFFSET; - uint32_t d_WLAN_DEBUG_INPUT_SEL_SRC_MSB; - uint32_t d_WLAN_DEBUG_INPUT_SEL_SRC_LSB; - uint32_t d_WLAN_DEBUG_INPUT_SEL_SRC_MASK; - uint32_t d_WLAN_DEBUG_CONTROL_OFFSET; - uint32_t d_WLAN_DEBUG_CONTROL_ENABLE_MSB; - uint32_t d_WLAN_DEBUG_CONTROL_ENABLE_LSB; - uint32_t d_WLAN_DEBUG_CONTROL_ENABLE_MASK; - uint32_t d_WLAN_DEBUG_OUT_OFFSET; - uint32_t d_WLAN_DEBUG_OUT_DATA_MSB; - uint32_t d_WLAN_DEBUG_OUT_DATA_LSB; - uint32_t d_WLAN_DEBUG_OUT_DATA_MASK; - uint32_t d_AMBA_DEBUG_BUS_OFFSET; - uint32_t d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB; - uint32_t d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB; - uint32_t d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK; - uint32_t d_AMBA_DEBUG_BUS_SEL_MSB; - uint32_t d_AMBA_DEBUG_BUS_SEL_LSB; - uint32_t d_AMBA_DEBUG_BUS_SEL_MASK; - -#ifdef QCA_WIFI_3_0_ADRASTEA - uint32_t d_Q6_ENABLE_REGISTER_0; - uint32_t d_Q6_ENABLE_REGISTER_1; - uint32_t d_Q6_CAUSE_REGISTER_0; - uint32_t d_Q6_CAUSE_REGISTER_1; - uint32_t d_Q6_CLEAR_REGISTER_0; - uint32_t d_Q6_CLEAR_REGISTER_1; -#endif -}; - -#define A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK \ - (scn->targetdef->d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK) -#define A_SOC_CORE_PCIE_INTR_CAUSE_GRP1 \ - (scn->targetdef->d_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1) -#define A_SOC_CORE_SPARE_1_REGISTER \ - (scn->targetdef->d_A_SOC_CORE_SPARE_1_REGISTER) -#define A_SOC_CORE_PCIE_INTR_CLR_GRP1 \ - (scn->targetdef->d_A_SOC_CORE_PCIE_INTR_CLR_GRP1) -#define A_SOC_CORE_PCIE_INTR_ENABLE_GRP1 \ - (scn->targetdef->d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1) -#define A_SOC_PCIE_PCIE_SCRATCH_0 \ - (scn->targetdef->d_A_SOC_PCIE_PCIE_SCRATCH_0) -#define A_SOC_PCIE_PCIE_SCRATCH_1 \ - (scn->targetdef->d_A_SOC_PCIE_PCIE_SCRATCH_1) -#define A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA \ - (scn->targetdef->d_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA) -#define A_SOC_PCIE_PCIE_SCRATCH_2 \ - (scn->targetdef->d_A_SOC_PCIE_PCIE_SCRATCH_2) -/* end Q6 iHelium emu registers */ - -#define PCIE_INTR_FIRMWARE_ROUTE_MASK \ - (scn->targetdef->d_PCIE_INTR_FIRMWARE_ROUTE_MASK) -#define A_SOC_CORE_SPARE_0_REGISTER \ - (scn->targetdef->d_A_SOC_CORE_SPARE_0_REGISTER) -#define A_SOC_CORE_SCRATCH_0_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_0_ADDRESS) -#define A_SOC_CORE_SCRATCH_1_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_1_ADDRESS) -#define A_SOC_CORE_SCRATCH_2_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_2_ADDRESS) -#define A_SOC_CORE_SCRATCH_3_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_3_ADDRESS) -#define A_SOC_CORE_SCRATCH_4_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_4_ADDRESS) -#define A_SOC_CORE_SCRATCH_5_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_5_ADDRESS) -#define A_SOC_CORE_SCRATCH_6_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_6_ADDRESS) -#define A_SOC_CORE_SCRATCH_7_ADDRESS \ - (scn->targetdef->d_A_SOC_CORE_SCRATCH_7_ADDRESS) -#define RTC_SOC_BASE_ADDRESS (scn->targetdef->d_RTC_SOC_BASE_ADDRESS) -#define RTC_WMAC_BASE_ADDRESS (scn->targetdef->d_RTC_WMAC_BASE_ADDRESS) -#define SYSTEM_SLEEP_OFFSET (scn->targetdef->d_SYSTEM_SLEEP_OFFSET) -#define WLAN_SYSTEM_SLEEP_OFFSET \ - (scn->targetdef->d_WLAN_SYSTEM_SLEEP_OFFSET) -#define WLAN_SYSTEM_SLEEP_DISABLE_LSB \ - (scn->targetdef->d_WLAN_SYSTEM_SLEEP_DISABLE_LSB) -#define WLAN_SYSTEM_SLEEP_DISABLE_MASK \ - (scn->targetdef->d_WLAN_SYSTEM_SLEEP_DISABLE_MASK) -#define CLOCK_CONTROL_OFFSET (scn->targetdef->d_CLOCK_CONTROL_OFFSET) -#define CLOCK_CONTROL_SI0_CLK_MASK \ - (scn->targetdef->d_CLOCK_CONTROL_SI0_CLK_MASK) -#define RESET_CONTROL_OFFSET (scn->targetdef->d_RESET_CONTROL_OFFSET) -#define RESET_CONTROL_MBOX_RST_MASK \ - (scn->targetdef->d_RESET_CONTROL_MBOX_RST_MASK) -#define RESET_CONTROL_SI0_RST_MASK \ - (scn->targetdef->d_RESET_CONTROL_SI0_RST_MASK) -#define WLAN_RESET_CONTROL_OFFSET \ - (scn->targetdef->d_WLAN_RESET_CONTROL_OFFSET) -#define WLAN_RESET_CONTROL_COLD_RST_MASK \ - (scn->targetdef->d_WLAN_RESET_CONTROL_COLD_RST_MASK) -#define WLAN_RESET_CONTROL_WARM_RST_MASK \ - (scn->targetdef->d_WLAN_RESET_CONTROL_WARM_RST_MASK) -#define GPIO_BASE_ADDRESS (scn->targetdef->d_GPIO_BASE_ADDRESS) -#define GPIO_PIN0_OFFSET (scn->targetdef->d_GPIO_PIN0_OFFSET) -#define GPIO_PIN1_OFFSET (scn->targetdef->d_GPIO_PIN1_OFFSET) -#define GPIO_PIN0_CONFIG_MASK (scn->targetdef->d_GPIO_PIN0_CONFIG_MASK) -#define GPIO_PIN1_CONFIG_MASK (scn->targetdef->d_GPIO_PIN1_CONFIG_MASK) -#define A_SOC_CORE_SCRATCH_0 (scn->targetdef->d_A_SOC_CORE_SCRATCH_0) -#define SI_CONFIG_BIDIR_OD_DATA_LSB \ - (scn->targetdef->d_SI_CONFIG_BIDIR_OD_DATA_LSB) -#define SI_CONFIG_BIDIR_OD_DATA_MASK \ - (scn->targetdef->d_SI_CONFIG_BIDIR_OD_DATA_MASK) -#define SI_CONFIG_I2C_LSB (scn->targetdef->d_SI_CONFIG_I2C_LSB) -#define SI_CONFIG_I2C_MASK \ - (scn->targetdef->d_SI_CONFIG_I2C_MASK) -#define SI_CONFIG_POS_SAMPLE_LSB \ - (scn->targetdef->d_SI_CONFIG_POS_SAMPLE_LSB) -#define SI_CONFIG_POS_SAMPLE_MASK \ - (scn->targetdef->d_SI_CONFIG_POS_SAMPLE_MASK) -#define SI_CONFIG_INACTIVE_CLK_LSB \ - (scn->targetdef->d_SI_CONFIG_INACTIVE_CLK_LSB) -#define SI_CONFIG_INACTIVE_CLK_MASK \ - (scn->targetdef->d_SI_CONFIG_INACTIVE_CLK_MASK) -#define SI_CONFIG_INACTIVE_DATA_LSB \ - (scn->targetdef->d_SI_CONFIG_INACTIVE_DATA_LSB) -#define SI_CONFIG_INACTIVE_DATA_MASK \ - (scn->targetdef->d_SI_CONFIG_INACTIVE_DATA_MASK) -#define SI_CONFIG_DIVIDER_LSB (scn->targetdef->d_SI_CONFIG_DIVIDER_LSB) -#define SI_CONFIG_DIVIDER_MASK (scn->targetdef->d_SI_CONFIG_DIVIDER_MASK) -#define SI_BASE_ADDRESS (scn->targetdef->d_SI_BASE_ADDRESS) -#define SI_CONFIG_OFFSET (scn->targetdef->d_SI_CONFIG_OFFSET) -#define SI_TX_DATA0_OFFSET (scn->targetdef->d_SI_TX_DATA0_OFFSET) -#define SI_TX_DATA1_OFFSET (scn->targetdef->d_SI_TX_DATA1_OFFSET) -#define SI_RX_DATA0_OFFSET (scn->targetdef->d_SI_RX_DATA0_OFFSET) -#define SI_RX_DATA1_OFFSET (scn->targetdef->d_SI_RX_DATA1_OFFSET) -#define SI_CS_OFFSET (scn->targetdef->d_SI_CS_OFFSET) -#define SI_CS_DONE_ERR_MASK (scn->targetdef->d_SI_CS_DONE_ERR_MASK) -#define SI_CS_DONE_INT_MASK (scn->targetdef->d_SI_CS_DONE_INT_MASK) -#define SI_CS_START_LSB (scn->targetdef->d_SI_CS_START_LSB) -#define SI_CS_START_MASK (scn->targetdef->d_SI_CS_START_MASK) -#define SI_CS_RX_CNT_LSB (scn->targetdef->d_SI_CS_RX_CNT_LSB) -#define SI_CS_RX_CNT_MASK (scn->targetdef->d_SI_CS_RX_CNT_MASK) -#define SI_CS_TX_CNT_LSB (scn->targetdef->d_SI_CS_TX_CNT_LSB) -#define SI_CS_TX_CNT_MASK (scn->targetdef->d_SI_CS_TX_CNT_MASK) -#define EEPROM_SZ (scn->targetdef->d_BOARD_DATA_SZ) -#define EEPROM_EXT_SZ (scn->targetdef->d_BOARD_EXT_DATA_SZ) -#define MBOX_BASE_ADDRESS (scn->targetdef->d_MBOX_BASE_ADDRESS) -#define LOCAL_SCRATCH_OFFSET (scn->targetdef->d_LOCAL_SCRATCH_OFFSET) -#define CPU_CLOCK_OFFSET (scn->targetdef->d_CPU_CLOCK_OFFSET) -#define LPO_CAL_OFFSET (scn->targetdef->d_LPO_CAL_OFFSET) -#define GPIO_PIN10_OFFSET (scn->targetdef->d_GPIO_PIN10_OFFSET) -#define GPIO_PIN11_OFFSET (scn->targetdef->d_GPIO_PIN11_OFFSET) -#define GPIO_PIN12_OFFSET (scn->targetdef->d_GPIO_PIN12_OFFSET) -#define GPIO_PIN13_OFFSET (scn->targetdef->d_GPIO_PIN13_OFFSET) -#define CLOCK_GPIO_OFFSET (scn->targetdef->d_CLOCK_GPIO_OFFSET) -#define CPU_CLOCK_STANDARD_LSB (scn->targetdef->d_CPU_CLOCK_STANDARD_LSB) -#define CPU_CLOCK_STANDARD_MASK (scn->targetdef->d_CPU_CLOCK_STANDARD_MASK) -#define LPO_CAL_ENABLE_LSB (scn->targetdef->d_LPO_CAL_ENABLE_LSB) -#define LPO_CAL_ENABLE_MASK (scn->targetdef->d_LPO_CAL_ENABLE_MASK) -#define CLOCK_GPIO_BT_CLK_OUT_EN_LSB \ - (scn->targetdef->d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB) -#define CLOCK_GPIO_BT_CLK_OUT_EN_MASK \ - (scn->targetdef->d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK) -#define ANALOG_INTF_BASE_ADDRESS (scn->targetdef->d_ANALOG_INTF_BASE_ADDRESS) -#define WLAN_MAC_BASE_ADDRESS (scn->targetdef->d_WLAN_MAC_BASE_ADDRESS) -#define FW_INDICATOR_ADDRESS (scn->targetdef->d_FW_INDICATOR_ADDRESS) -#define DRAM_BASE_ADDRESS (scn->targetdef->d_DRAM_BASE_ADDRESS) -#define SOC_CORE_BASE_ADDRESS (scn->targetdef->d_SOC_CORE_BASE_ADDRESS) -#define CORE_CTRL_ADDRESS (scn->targetdef->d_CORE_CTRL_ADDRESS) -#define CE_COUNT (scn->targetdef->d_CE_COUNT) -#define PCIE_INTR_ENABLE_ADDRESS (scn->targetdef->d_PCIE_INTR_ENABLE_ADDRESS) -#define PCIE_INTR_CLR_ADDRESS (scn->targetdef->d_PCIE_INTR_CLR_ADDRESS) -#define PCIE_INTR_FIRMWARE_MASK (scn->targetdef->d_PCIE_INTR_FIRMWARE_MASK) -#define PCIE_INTR_CE_MASK_ALL (scn->targetdef->d_PCIE_INTR_CE_MASK_ALL) -#define CORE_CTRL_CPU_INTR_MASK (scn->targetdef->d_CORE_CTRL_CPU_INTR_MASK) -#define PCIE_INTR_CAUSE_ADDRESS (scn->targetdef->d_PCIE_INTR_CAUSE_ADDRESS) -#define SOC_RESET_CONTROL_ADDRESS (scn->targetdef->d_SOC_RESET_CONTROL_ADDRESS) -#define HOST_GROUP0_MASK (PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL | \ - A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK) -#define SOC_RESET_CONTROL_CE_RST_MASK \ - (scn->targetdef->d_SOC_RESET_CONTROL_CE_RST_MASK) -#define SOC_RESET_CONTROL_CPU_WARM_RST_MASK \ - (scn->targetdef->d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK) -#define CPU_INTR_ADDRESS (scn->targetdef->d_CPU_INTR_ADDRESS) -#define SOC_LF_TIMER_CONTROL0_ADDRESS \ - (scn->targetdef->d_SOC_LF_TIMER_CONTROL0_ADDRESS) -#define SOC_LF_TIMER_CONTROL0_ENABLE_MASK \ - (scn->targetdef->d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK) -#define SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB \ - (scn->targetdef->d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB) -#define SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK \ - (scn->targetdef->d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK) - -#define SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_GET(x) \ - (((x) & SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK) >> \ - SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB) -#define SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_SET(x) \ - (((x) << SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB) & \ - SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK) - -/* hif_pci.c */ -#define CHIP_ID_ADDRESS (scn->targetdef->d_SOC_CHIP_ID_ADDRESS) -#define SOC_CHIP_ID_REVISION_MASK (scn->targetdef->d_SOC_CHIP_ID_REVISION_MASK) -#define SOC_CHIP_ID_REVISION_LSB (scn->targetdef->d_SOC_CHIP_ID_REVISION_LSB) -#define SOC_CHIP_ID_VERSION_MASK (scn->targetdef->d_SOC_CHIP_ID_VERSION_MASK) -#define SOC_CHIP_ID_VERSION_LSB (scn->targetdef->d_SOC_CHIP_ID_VERSION_LSB) -#define CHIP_ID_REVISION_GET(x) \ - (((x) & SOC_CHIP_ID_REVISION_MASK) >> SOC_CHIP_ID_REVISION_LSB) -#define CHIP_ID_VERSION_GET(x) \ - (((x) & SOC_CHIP_ID_VERSION_MASK) >> SOC_CHIP_ID_VERSION_LSB) -/* hif_pci.c end */ - -/* misc */ -#define SR_WR_INDEX_ADDRESS (scn->targetdef->d_SR_WR_INDEX_ADDRESS) -#define DST_WATERMARK_ADDRESS (scn->targetdef->d_DST_WATERMARK_ADDRESS) -#define SOC_POWER_REG_OFFSET (scn->targetdef->d_SOC_POWER_REG_OFFSET) -/* end */ - -/* htt_rx.c */ -#define RX_MSDU_END_4_FIRST_MSDU_MASK \ - (pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_MASK) -#define RX_MSDU_END_4_FIRST_MSDU_LSB \ - (pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_LSB) -#define RX_MPDU_START_0_RETRY_LSB \ - (pdev->targetdef->d_RX_MPDU_START_0_RETRY_LSB) -#define RX_MPDU_START_0_RETRY_MASK \ - (pdev->targetdef->d_RX_MPDU_START_0_RETRY_MASK) -#define RX_MPDU_START_0_SEQ_NUM_MASK \ - (pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_MASK) -#define RX_MPDU_START_0_SEQ_NUM_LSB \ - (pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_LSB) -#define RX_MPDU_START_2_PN_47_32_LSB \ - (pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_LSB) -#define RX_MPDU_START_2_PN_47_32_MASK \ - (pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_MASK) -#define RX_MPDU_START_2_TID_LSB \ - (pdev->targetdef->d_RX_MPDU_START_2_TID_LSB) -#define RX_MPDU_START_2_TID_MASK \ - (pdev->targetdef->d_RX_MPDU_START_2_TID_MASK) -#define RX_MSDU_END_1_KEY_ID_OCT_MASK \ - (pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_MASK) -#define RX_MSDU_END_1_KEY_ID_OCT_LSB \ - (pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_LSB) -#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK \ - (pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK) -#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB \ - (pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB) -#define RX_MSDU_END_4_LAST_MSDU_MASK \ - (pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_MASK) -#define RX_MSDU_END_4_LAST_MSDU_LSB \ - (pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_LSB) -#define RX_ATTENTION_0_MCAST_BCAST_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_MASK) -#define RX_ATTENTION_0_MCAST_BCAST_LSB \ - (pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_LSB) -#define RX_ATTENTION_0_FRAGMENT_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_MASK) -#define RX_ATTENTION_0_FRAGMENT_LSB \ - (pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_LSB) -#define RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK) -#define RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK \ - (pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK) -#define RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB \ - (pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB) -#define RX_MSDU_START_0_MSDU_LENGTH_MASK \ - (pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_MASK) -#define RX_MSDU_START_0_MSDU_LENGTH_LSB \ - (pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_LSB) -#define RX_MSDU_START_2_DECAP_FORMAT_OFFSET \ - (pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET) -#define RX_MSDU_START_2_DECAP_FORMAT_MASK \ - (pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_MASK) -#define RX_MSDU_START_2_DECAP_FORMAT_LSB \ - (pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_LSB) -#define RX_MPDU_START_0_ENCRYPTED_MASK \ - (pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_MASK) -#define RX_MPDU_START_0_ENCRYPTED_LSB \ - (pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_LSB) -#define RX_ATTENTION_0_MORE_DATA_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_MORE_DATA_MASK) -#define RX_ATTENTION_0_MSDU_DONE_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_MSDU_DONE_MASK) -#define RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK \ - (pdev->targetdef->d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK) -/* end */ - -/* copy_engine.c */ -/* end */ -/* PLL start */ -#define EFUSE_OFFSET (scn->targetdef->d_EFUSE_OFFSET) -#define EFUSE_XTAL_SEL_MSB (scn->targetdef->d_EFUSE_XTAL_SEL_MSB) -#define EFUSE_XTAL_SEL_LSB (scn->targetdef->d_EFUSE_XTAL_SEL_LSB) -#define EFUSE_XTAL_SEL_MASK (scn->targetdef->d_EFUSE_XTAL_SEL_MASK) -#define BB_PLL_CONFIG_OFFSET (scn->targetdef->d_BB_PLL_CONFIG_OFFSET) -#define BB_PLL_CONFIG_OUTDIV_MSB (scn->targetdef->d_BB_PLL_CONFIG_OUTDIV_MSB) -#define BB_PLL_CONFIG_OUTDIV_LSB (scn->targetdef->d_BB_PLL_CONFIG_OUTDIV_LSB) -#define BB_PLL_CONFIG_OUTDIV_MASK (scn->targetdef->d_BB_PLL_CONFIG_OUTDIV_MASK) -#define BB_PLL_CONFIG_FRAC_MSB (scn->targetdef->d_BB_PLL_CONFIG_FRAC_MSB) -#define BB_PLL_CONFIG_FRAC_LSB (scn->targetdef->d_BB_PLL_CONFIG_FRAC_LSB) -#define BB_PLL_CONFIG_FRAC_MASK (scn->targetdef->d_BB_PLL_CONFIG_FRAC_MASK) -#define WLAN_PLL_SETTLE_TIME_MSB (scn->targetdef->d_WLAN_PLL_SETTLE_TIME_MSB) -#define WLAN_PLL_SETTLE_TIME_LSB (scn->targetdef->d_WLAN_PLL_SETTLE_TIME_LSB) -#define WLAN_PLL_SETTLE_TIME_MASK (scn->targetdef->d_WLAN_PLL_SETTLE_TIME_MASK) -#define WLAN_PLL_SETTLE_OFFSET (scn->targetdef->d_WLAN_PLL_SETTLE_OFFSET) -#define WLAN_PLL_SETTLE_SW_MASK (scn->targetdef->d_WLAN_PLL_SETTLE_SW_MASK) -#define WLAN_PLL_SETTLE_RSTMASK (scn->targetdef->d_WLAN_PLL_SETTLE_RSTMASK) -#define WLAN_PLL_SETTLE_RESET (scn->targetdef->d_WLAN_PLL_SETTLE_RESET) -#define WLAN_PLL_CONTROL_NOPWD_MSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_NOPWD_MSB) -#define WLAN_PLL_CONTROL_NOPWD_LSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_NOPWD_LSB) -#define WLAN_PLL_CONTROL_NOPWD_MASK \ - (scn->targetdef->d_WLAN_PLL_CONTROL_NOPWD_MASK) -#define WLAN_PLL_CONTROL_BYPASS_MSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_BYPASS_MSB) -#define WLAN_PLL_CONTROL_BYPASS_LSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_BYPASS_LSB) -#define WLAN_PLL_CONTROL_BYPASS_MASK \ - (scn->targetdef->d_WLAN_PLL_CONTROL_BYPASS_MASK) -#define WLAN_PLL_CONTROL_BYPASS_RESET \ - (scn->targetdef->d_WLAN_PLL_CONTROL_BYPASS_RESET) -#define WLAN_PLL_CONTROL_CLK_SEL_MSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_CLK_SEL_MSB) -#define WLAN_PLL_CONTROL_CLK_SEL_LSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_CLK_SEL_LSB) -#define WLAN_PLL_CONTROL_CLK_SEL_MASK \ - (scn->targetdef->d_WLAN_PLL_CONTROL_CLK_SEL_MASK) -#define WLAN_PLL_CONTROL_CLK_SEL_RESET \ - (scn->targetdef->d_WLAN_PLL_CONTROL_CLK_SEL_RESET) -#define WLAN_PLL_CONTROL_REFDIV_MSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_REFDIV_MSB) -#define WLAN_PLL_CONTROL_REFDIV_LSB \ - (scn->targetdef->d_WLAN_PLL_CONTROL_REFDIV_LSB) -#define WLAN_PLL_CONTROL_REFDIV_MASK \ - (scn->targetdef->d_WLAN_PLL_CONTROL_REFDIV_MASK) -#define WLAN_PLL_CONTROL_REFDIV_RESET \ - (scn->targetdef->d_WLAN_PLL_CONTROL_REFDIV_RESET) -#define WLAN_PLL_CONTROL_DIV_MSB (scn->targetdef->d_WLAN_PLL_CONTROL_DIV_MSB) -#define WLAN_PLL_CONTROL_DIV_LSB (scn->targetdef->d_WLAN_PLL_CONTROL_DIV_LSB) -#define WLAN_PLL_CONTROL_DIV_MASK (scn->targetdef->d_WLAN_PLL_CONTROL_DIV_MASK) -#define WLAN_PLL_CONTROL_DIV_RESET \ - (scn->targetdef->d_WLAN_PLL_CONTROL_DIV_RESET) -#define WLAN_PLL_CONTROL_OFFSET (scn->targetdef->d_WLAN_PLL_CONTROL_OFFSET) -#define WLAN_PLL_CONTROL_SW_MASK (scn->targetdef->d_WLAN_PLL_CONTROL_SW_MASK) -#define WLAN_PLL_CONTROL_RSTMASK (scn->targetdef->d_WLAN_PLL_CONTROL_RSTMASK) -#define WLAN_PLL_CONTROL_RESET (scn->targetdef->d_WLAN_PLL_CONTROL_RESET) -#define SOC_CORE_CLK_CTRL_OFFSET (scn->targetdef->d_SOC_CORE_CLK_CTRL_OFFSET) -#define SOC_CORE_CLK_CTRL_DIV_MSB (scn->targetdef->d_SOC_CORE_CLK_CTRL_DIV_MSB) -#define SOC_CORE_CLK_CTRL_DIV_LSB (scn->targetdef->d_SOC_CORE_CLK_CTRL_DIV_LSB) -#define SOC_CORE_CLK_CTRL_DIV_MASK \ - (scn->targetdef->d_SOC_CORE_CLK_CTRL_DIV_MASK) -#define RTC_SYNC_STATUS_PLL_CHANGING_MSB \ - (scn->targetdef->d_RTC_SYNC_STATUS_PLL_CHANGING_MSB) -#define RTC_SYNC_STATUS_PLL_CHANGING_LSB \ - (scn->targetdef->d_RTC_SYNC_STATUS_PLL_CHANGING_LSB) -#define RTC_SYNC_STATUS_PLL_CHANGING_MASK \ - (scn->targetdef->d_RTC_SYNC_STATUS_PLL_CHANGING_MASK) -#define RTC_SYNC_STATUS_PLL_CHANGING_RESET \ - (scn->targetdef->d_RTC_SYNC_STATUS_PLL_CHANGING_RESET) -#define RTC_SYNC_STATUS_OFFSET (scn->targetdef->d_RTC_SYNC_STATUS_OFFSET) -#define SOC_CPU_CLOCK_OFFSET (scn->targetdef->d_SOC_CPU_CLOCK_OFFSET) -#define SOC_CPU_CLOCK_STANDARD_MSB \ - (scn->targetdef->d_SOC_CPU_CLOCK_STANDARD_MSB) -#define SOC_CPU_CLOCK_STANDARD_LSB \ - (scn->targetdef->d_SOC_CPU_CLOCK_STANDARD_LSB) -#define SOC_CPU_CLOCK_STANDARD_MASK \ - (scn->targetdef->d_SOC_CPU_CLOCK_STANDARD_MASK) -/* PLL end */ - -/* SET macros */ -#define WLAN_SYSTEM_SLEEP_DISABLE_SET(x) \ - (((x) << WLAN_SYSTEM_SLEEP_DISABLE_LSB) & \ - WLAN_SYSTEM_SLEEP_DISABLE_MASK) -#define SI_CONFIG_BIDIR_OD_DATA_SET(x) \ - (((x) << SI_CONFIG_BIDIR_OD_DATA_LSB) & SI_CONFIG_BIDIR_OD_DATA_MASK) -#define SI_CONFIG_I2C_SET(x) (((x) << SI_CONFIG_I2C_LSB) & SI_CONFIG_I2C_MASK) -#define SI_CONFIG_POS_SAMPLE_SET(x) \ - (((x) << SI_CONFIG_POS_SAMPLE_LSB) & SI_CONFIG_POS_SAMPLE_MASK) -#define SI_CONFIG_INACTIVE_CLK_SET(x) \ - (((x) << SI_CONFIG_INACTIVE_CLK_LSB) & SI_CONFIG_INACTIVE_CLK_MASK) -#define SI_CONFIG_INACTIVE_DATA_SET(x) \ - (((x) << SI_CONFIG_INACTIVE_DATA_LSB) & SI_CONFIG_INACTIVE_DATA_MASK) -#define SI_CONFIG_DIVIDER_SET(x) \ - (((x) << SI_CONFIG_DIVIDER_LSB) & SI_CONFIG_DIVIDER_MASK) -#define SI_CS_START_SET(x) (((x) << SI_CS_START_LSB) & SI_CS_START_MASK) -#define SI_CS_RX_CNT_SET(x) (((x) << SI_CS_RX_CNT_LSB) & SI_CS_RX_CNT_MASK) -#define SI_CS_TX_CNT_SET(x) (((x) << SI_CS_TX_CNT_LSB) & SI_CS_TX_CNT_MASK) -#define LPO_CAL_ENABLE_SET(x) \ - (((x) << LPO_CAL_ENABLE_LSB) & LPO_CAL_ENABLE_MASK) -#define CPU_CLOCK_STANDARD_SET(x) \ - (((x) << CPU_CLOCK_STANDARD_LSB) & CPU_CLOCK_STANDARD_MASK) -#define CLOCK_GPIO_BT_CLK_OUT_EN_SET(x) \ - (((x) << CLOCK_GPIO_BT_CLK_OUT_EN_LSB) & CLOCK_GPIO_BT_CLK_OUT_EN_MASK) -/* copy_engine.c */ -/* end */ -/* PLL start */ -#define EFUSE_XTAL_SEL_GET(x) \ - (((x) & EFUSE_XTAL_SEL_MASK) >> EFUSE_XTAL_SEL_LSB) -#define EFUSE_XTAL_SEL_SET(x) \ - (((x) << EFUSE_XTAL_SEL_LSB) & EFUSE_XTAL_SEL_MASK) -#define BB_PLL_CONFIG_OUTDIV_GET(x) \ - (((x) & BB_PLL_CONFIG_OUTDIV_MASK) >> BB_PLL_CONFIG_OUTDIV_LSB) -#define BB_PLL_CONFIG_OUTDIV_SET(x) \ - (((x) << BB_PLL_CONFIG_OUTDIV_LSB) & BB_PLL_CONFIG_OUTDIV_MASK) -#define BB_PLL_CONFIG_FRAC_GET(x) \ - (((x) & BB_PLL_CONFIG_FRAC_MASK) >> BB_PLL_CONFIG_FRAC_LSB) -#define BB_PLL_CONFIG_FRAC_SET(x) \ - (((x) << BB_PLL_CONFIG_FRAC_LSB) & BB_PLL_CONFIG_FRAC_MASK) -#define WLAN_PLL_SETTLE_TIME_GET(x) \ - (((x) & WLAN_PLL_SETTLE_TIME_MASK) >> WLAN_PLL_SETTLE_TIME_LSB) -#define WLAN_PLL_SETTLE_TIME_SET(x) \ - (((x) << WLAN_PLL_SETTLE_TIME_LSB) & WLAN_PLL_SETTLE_TIME_MASK) -#define WLAN_PLL_CONTROL_NOPWD_GET(x) \ - (((x) & WLAN_PLL_CONTROL_NOPWD_MASK) >> WLAN_PLL_CONTROL_NOPWD_LSB) -#define WLAN_PLL_CONTROL_NOPWD_SET(x) \ - (((x) << WLAN_PLL_CONTROL_NOPWD_LSB) & WLAN_PLL_CONTROL_NOPWD_MASK) -#define WLAN_PLL_CONTROL_BYPASS_GET(x) \ - (((x) & WLAN_PLL_CONTROL_BYPASS_MASK) >> WLAN_PLL_CONTROL_BYPASS_LSB) -#define WLAN_PLL_CONTROL_BYPASS_SET(x) \ - (((x) << WLAN_PLL_CONTROL_BYPASS_LSB) & WLAN_PLL_CONTROL_BYPASS_MASK) -#define WLAN_PLL_CONTROL_CLK_SEL_GET(x) \ - (((x) & WLAN_PLL_CONTROL_CLK_SEL_MASK) >> WLAN_PLL_CONTROL_CLK_SEL_LSB) -#define WLAN_PLL_CONTROL_CLK_SEL_SET(x) \ - (((x) << WLAN_PLL_CONTROL_CLK_SEL_LSB) & WLAN_PLL_CONTROL_CLK_SEL_MASK) -#define WLAN_PLL_CONTROL_REFDIV_GET(x) \ - (((x) & WLAN_PLL_CONTROL_REFDIV_MASK) >> WLAN_PLL_CONTROL_REFDIV_LSB) -#define WLAN_PLL_CONTROL_REFDIV_SET(x) \ - (((x) << WLAN_PLL_CONTROL_REFDIV_LSB) & WLAN_PLL_CONTROL_REFDIV_MASK) -#define WLAN_PLL_CONTROL_DIV_GET(x) \ - (((x) & WLAN_PLL_CONTROL_DIV_MASK) >> WLAN_PLL_CONTROL_DIV_LSB) -#define WLAN_PLL_CONTROL_DIV_SET(x) \ - (((x) << WLAN_PLL_CONTROL_DIV_LSB) & WLAN_PLL_CONTROL_DIV_MASK) -#define SOC_CORE_CLK_CTRL_DIV_GET(x) \ - (((x) & SOC_CORE_CLK_CTRL_DIV_MASK) >> SOC_CORE_CLK_CTRL_DIV_LSB) -#define SOC_CORE_CLK_CTRL_DIV_SET(x) \ - (((x) << SOC_CORE_CLK_CTRL_DIV_LSB) & SOC_CORE_CLK_CTRL_DIV_MASK) -#define RTC_SYNC_STATUS_PLL_CHANGING_GET(x) \ - (((x) & RTC_SYNC_STATUS_PLL_CHANGING_MASK) >> \ - RTC_SYNC_STATUS_PLL_CHANGING_LSB) -#define RTC_SYNC_STATUS_PLL_CHANGING_SET(x) \ - (((x) << RTC_SYNC_STATUS_PLL_CHANGING_LSB) & \ - RTC_SYNC_STATUS_PLL_CHANGING_MASK) -#define SOC_CPU_CLOCK_STANDARD_GET(x) \ - (((x) & SOC_CPU_CLOCK_STANDARD_MASK) >> SOC_CPU_CLOCK_STANDARD_LSB) -#define SOC_CPU_CLOCK_STANDARD_SET(x) \ - (((x) << SOC_CPU_CLOCK_STANDARD_LSB) & SOC_CPU_CLOCK_STANDARD_MASK) -/* PLL end */ - -#ifdef QCA_WIFI_3_0_ADRASTEA -#define Q6_ENABLE_REGISTER_0 \ - (scn->targetdef->d_Q6_ENABLE_REGISTER_0) -#define Q6_ENABLE_REGISTER_1 \ - (scn->targetdef->d_Q6_ENABLE_REGISTER_1) -#define Q6_CAUSE_REGISTER_0 \ - (scn->targetdef->d_Q6_CAUSE_REGISTER_0) -#define Q6_CAUSE_REGISTER_1 \ - (scn->targetdef->d_Q6_CAUSE_REGISTER_1) -#define Q6_CLEAR_REGISTER_0 \ - (scn->targetdef->d_Q6_CLEAR_REGISTER_0) -#define Q6_CLEAR_REGISTER_1 \ - (scn->targetdef->d_Q6_CLEAR_REGISTER_1) -#endif - -struct hostdef_s { - A_UINT32 d_INT_STATUS_ENABLE_ERROR_LSB; - A_UINT32 d_INT_STATUS_ENABLE_ERROR_MASK; - A_UINT32 d_INT_STATUS_ENABLE_CPU_LSB; - A_UINT32 d_INT_STATUS_ENABLE_CPU_MASK; - A_UINT32 d_INT_STATUS_ENABLE_COUNTER_LSB; - A_UINT32 d_INT_STATUS_ENABLE_COUNTER_MASK; - A_UINT32 d_INT_STATUS_ENABLE_MBOX_DATA_LSB; - A_UINT32 d_INT_STATUS_ENABLE_MBOX_DATA_MASK; - A_UINT32 d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB; - A_UINT32 d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK; - A_UINT32 d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB; - A_UINT32 d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK; - A_UINT32 d_COUNTER_INT_STATUS_ENABLE_BIT_LSB; - A_UINT32 d_COUNTER_INT_STATUS_ENABLE_BIT_MASK; - A_UINT32 d_INT_STATUS_ENABLE_ADDRESS; - A_UINT32 d_CPU_INT_STATUS_ENABLE_BIT_LSB; - A_UINT32 d_CPU_INT_STATUS_ENABLE_BIT_MASK; - A_UINT32 d_HOST_INT_STATUS_ADDRESS; - A_UINT32 d_CPU_INT_STATUS_ADDRESS; - A_UINT32 d_ERROR_INT_STATUS_ADDRESS; - A_UINT32 d_ERROR_INT_STATUS_WAKEUP_MASK; - A_UINT32 d_ERROR_INT_STATUS_WAKEUP_LSB; - A_UINT32 d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK; - A_UINT32 d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB; - A_UINT32 d_ERROR_INT_STATUS_TX_OVERFLOW_MASK; - A_UINT32 d_ERROR_INT_STATUS_TX_OVERFLOW_LSB; - A_UINT32 d_COUNT_DEC_ADDRESS; - A_UINT32 d_HOST_INT_STATUS_CPU_MASK; - A_UINT32 d_HOST_INT_STATUS_CPU_LSB; - A_UINT32 d_HOST_INT_STATUS_ERROR_MASK; - A_UINT32 d_HOST_INT_STATUS_ERROR_LSB; - A_UINT32 d_HOST_INT_STATUS_COUNTER_MASK; - A_UINT32 d_HOST_INT_STATUS_COUNTER_LSB; - A_UINT32 d_RX_LOOKAHEAD_VALID_ADDRESS; - A_UINT32 d_WINDOW_DATA_ADDRESS; - A_UINT32 d_WINDOW_READ_ADDR_ADDRESS; - A_UINT32 d_WINDOW_WRITE_ADDR_ADDRESS; - A_UINT32 d_SOC_GLOBAL_RESET_ADDRESS; - A_UINT32 d_RTC_STATE_ADDRESS; - A_UINT32 d_RTC_STATE_COLD_RESET_MASK; - A_UINT32 d_PCIE_LOCAL_BASE_ADDRESS; - A_UINT32 d_PCIE_SOC_WAKE_RESET; - A_UINT32 d_PCIE_SOC_WAKE_ADDRESS; - A_UINT32 d_PCIE_SOC_WAKE_V_MASK; - A_UINT32 d_RTC_STATE_V_MASK; - A_UINT32 d_RTC_STATE_V_LSB; - A_UINT32 d_FW_IND_EVENT_PENDING; - A_UINT32 d_FW_IND_INITIALIZED; - A_UINT32 d_FW_IND_HELPER; - A_UINT32 d_RTC_STATE_V_ON; -#if defined(SDIO_3_0) - A_UINT32 d_HOST_INT_STATUS_MBOX_DATA_MASK; - A_UINT32 d_HOST_INT_STATUS_MBOX_DATA_LSB; -#endif - A_UINT32 d_PCIE_SOC_RDY_STATUS_ADDRESS; - A_UINT32 d_PCIE_SOC_RDY_STATUS_BAR_MASK; - A_UINT32 d_SOC_PCIE_BASE_ADDRESS; - A_UINT32 d_MSI_MAGIC_ADR_ADDRESS; - A_UINT32 d_MSI_MAGIC_ADDRESS; - uint32_t d_HOST_CE_COUNT; - uint32_t d_ENABLE_MSI; - uint32_t d_MUX_ID_MASK; - uint32_t d_TRANSACTION_ID_MASK; - uint32_t d_DESC_DATA_FLAG_MASK; - uint32_t d_A_SOC_PCIE_PCIE_BAR0_START; -}; -#define A_SOC_PCIE_PCIE_BAR0_START (scn->hostdef->d_A_SOC_PCIE_PCIE_BAR0_START) -#define DESC_DATA_FLAG_MASK (scn->hostdef->d_DESC_DATA_FLAG_MASK) -#define MUX_ID_MASK (scn->hostdef->d_MUX_ID_MASK) -#define TRANSACTION_ID_MASK (scn->hostdef->d_TRANSACTION_ID_MASK) -#define HOST_CE_COUNT (scn->hostdef->d_HOST_CE_COUNT) -#define ENABLE_MSI (scn->hostdef->d_ENABLE_MSI) -#define INT_STATUS_ENABLE_ERROR_LSB \ - (scn->hostdef->d_INT_STATUS_ENABLE_ERROR_LSB) -#define INT_STATUS_ENABLE_ERROR_MASK \ - (scn->hostdef->d_INT_STATUS_ENABLE_ERROR_MASK) -#define INT_STATUS_ENABLE_CPU_LSB (scn->hostdef->d_INT_STATUS_ENABLE_CPU_LSB) -#define INT_STATUS_ENABLE_CPU_MASK (scn->hostdef->d_INT_STATUS_ENABLE_CPU_MASK) -#define INT_STATUS_ENABLE_COUNTER_LSB \ - (scn->hostdef->d_INT_STATUS_ENABLE_COUNTER_LSB) -#define INT_STATUS_ENABLE_COUNTER_MASK \ - (scn->hostdef->d_INT_STATUS_ENABLE_COUNTER_MASK) -#define INT_STATUS_ENABLE_MBOX_DATA_LSB \ - (scn->hostdef->d_INT_STATUS_ENABLE_MBOX_DATA_LSB) -#define INT_STATUS_ENABLE_MBOX_DATA_MASK \ - (scn->hostdef->d_INT_STATUS_ENABLE_MBOX_DATA_MASK) -#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB \ - (scn->hostdef->d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB) -#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK \ - (scn->hostdef->d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK) -#define ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB \ - (scn->hostdef->d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB) -#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK \ - (scn->hostdef->d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK) -#define COUNTER_INT_STATUS_ENABLE_BIT_LSB \ - (scn->hostdef->d_COUNTER_INT_STATUS_ENABLE_BIT_LSB) -#define COUNTER_INT_STATUS_ENABLE_BIT_MASK \ - (scn->hostdef->d_COUNTER_INT_STATUS_ENABLE_BIT_MASK) -#define INT_STATUS_ENABLE_ADDRESS \ - (scn->hostdef->d_INT_STATUS_ENABLE_ADDRESS) -#define CPU_INT_STATUS_ENABLE_BIT_LSB \ - (scn->hostdef->d_CPU_INT_STATUS_ENABLE_BIT_LSB) -#define CPU_INT_STATUS_ENABLE_BIT_MASK \ - (scn->hostdef->d_CPU_INT_STATUS_ENABLE_BIT_MASK) -#define HOST_INT_STATUS_ADDRESS (scn->hostdef->d_HOST_INT_STATUS_ADDRESS) -#define CPU_INT_STATUS_ADDRESS (scn->hostdef->d_CPU_INT_STATUS_ADDRESS) -#define ERROR_INT_STATUS_ADDRESS (scn->hostdef->d_ERROR_INT_STATUS_ADDRESS) -#define ERROR_INT_STATUS_WAKEUP_MASK \ - (scn->hostdef->d_ERROR_INT_STATUS_WAKEUP_MASK) -#define ERROR_INT_STATUS_WAKEUP_LSB \ - (scn->hostdef->d_ERROR_INT_STATUS_WAKEUP_LSB) -#define ERROR_INT_STATUS_RX_UNDERFLOW_MASK \ - (scn->hostdef->d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK) -#define ERROR_INT_STATUS_RX_UNDERFLOW_LSB \ - (scn->hostdef->d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB) -#define ERROR_INT_STATUS_TX_OVERFLOW_MASK \ - (scn->hostdef->d_ERROR_INT_STATUS_TX_OVERFLOW_MASK) -#define ERROR_INT_STATUS_TX_OVERFLOW_LSB \ - (scn->hostdef->d_ERROR_INT_STATUS_TX_OVERFLOW_LSB) -#define COUNT_DEC_ADDRESS (scn->hostdef->d_COUNT_DEC_ADDRESS) -#define HOST_INT_STATUS_CPU_MASK (scn->hostdef->d_HOST_INT_STATUS_CPU_MASK) -#define HOST_INT_STATUS_CPU_LSB (scn->hostdef->d_HOST_INT_STATUS_CPU_LSB) -#define HOST_INT_STATUS_ERROR_MASK (scn->hostdef->d_HOST_INT_STATUS_ERROR_MASK) -#define HOST_INT_STATUS_ERROR_LSB (scn->hostdef->d_HOST_INT_STATUS_ERROR_LSB) -#define HOST_INT_STATUS_COUNTER_MASK \ - (scn->hostdef->d_HOST_INT_STATUS_COUNTER_MASK) -#define HOST_INT_STATUS_COUNTER_LSB \ - (scn->hostdef->d_HOST_INT_STATUS_COUNTER_LSB) -#define RX_LOOKAHEAD_VALID_ADDRESS (scn->hostdef->d_RX_LOOKAHEAD_VALID_ADDRESS) -#define WINDOW_DATA_ADDRESS (scn->hostdef->d_WINDOW_DATA_ADDRESS) -#define WINDOW_READ_ADDR_ADDRESS (scn->hostdef->d_WINDOW_READ_ADDR_ADDRESS) -#define WINDOW_WRITE_ADDR_ADDRESS (scn->hostdef->d_WINDOW_WRITE_ADDR_ADDRESS) -#define SOC_GLOBAL_RESET_ADDRESS (scn->hostdef->d_SOC_GLOBAL_RESET_ADDRESS) -#define RTC_STATE_ADDRESS (scn->hostdef->d_RTC_STATE_ADDRESS) -#define RTC_STATE_COLD_RESET_MASK (scn->hostdef->d_RTC_STATE_COLD_RESET_MASK) -#define PCIE_LOCAL_BASE_ADDRESS (scn->hostdef->d_PCIE_LOCAL_BASE_ADDRESS) -#define PCIE_SOC_WAKE_RESET (scn->hostdef->d_PCIE_SOC_WAKE_RESET) -#define PCIE_SOC_WAKE_ADDRESS (scn->hostdef->d_PCIE_SOC_WAKE_ADDRESS) -#define PCIE_SOC_WAKE_V_MASK (scn->hostdef->d_PCIE_SOC_WAKE_V_MASK) -#define RTC_STATE_V_MASK (scn->hostdef->d_RTC_STATE_V_MASK) -#define RTC_STATE_V_LSB (scn->hostdef->d_RTC_STATE_V_LSB) -#define FW_IND_EVENT_PENDING (scn->hostdef->d_FW_IND_EVENT_PENDING) -#define FW_IND_INITIALIZED (scn->hostdef->d_FW_IND_INITIALIZED) -#define FW_IND_HELPER (scn->hostdef->d_FW_IND_HELPER) -#define RTC_STATE_V_ON (scn->hostdef->d_RTC_STATE_V_ON) -#if defined(SDIO_3_0) -#define HOST_INT_STATUS_MBOX_DATA_MASK \ - (scn->hostdef->d_HOST_INT_STATUS_MBOX_DATA_MASK) -#define HOST_INT_STATUS_MBOX_DATA_LSB \ - (scn->hostdef->d_HOST_INT_STATUS_MBOX_DATA_LSB) -#endif - -#if !defined(SOC_PCIE_BASE_ADDRESS) -#define SOC_PCIE_BASE_ADDRESS 0 -#endif - -#if !defined(PCIE_SOC_RDY_STATUS_ADDRESS) -#define PCIE_SOC_RDY_STATUS_ADDRESS 0 -#define PCIE_SOC_RDY_STATUS_BAR_MASK 0 -#endif - -#if !defined(MSI_MAGIC_ADR_ADDRESS) -#define MSI_MAGIC_ADR_ADDRESS 0 -#define MSI_MAGIC_ADDRESS 0 -#endif - -/* SET/GET macros */ -#define INT_STATUS_ENABLE_ERROR_SET(x) \ - (((x) << INT_STATUS_ENABLE_ERROR_LSB) & INT_STATUS_ENABLE_ERROR_MASK) -#define INT_STATUS_ENABLE_CPU_SET(x) \ - (((x) << INT_STATUS_ENABLE_CPU_LSB) & INT_STATUS_ENABLE_CPU_MASK) -#define INT_STATUS_ENABLE_COUNTER_SET(x) \ - (((x) << INT_STATUS_ENABLE_COUNTER_LSB) & \ - INT_STATUS_ENABLE_COUNTER_MASK) -#define INT_STATUS_ENABLE_MBOX_DATA_SET(x) \ - (((x) << INT_STATUS_ENABLE_MBOX_DATA_LSB) & \ - INT_STATUS_ENABLE_MBOX_DATA_MASK) -#define CPU_INT_STATUS_ENABLE_BIT_SET(x) \ - (((x) << CPU_INT_STATUS_ENABLE_BIT_LSB) & \ - CPU_INT_STATUS_ENABLE_BIT_MASK) -#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(x) \ - (((x) << ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB) & \ - ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK) -#define ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(x) \ - (((x) << ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB) & \ - ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK) -#define COUNTER_INT_STATUS_ENABLE_BIT_SET(x) \ - (((x) << COUNTER_INT_STATUS_ENABLE_BIT_LSB) & \ - COUNTER_INT_STATUS_ENABLE_BIT_MASK) -#define ERROR_INT_STATUS_WAKEUP_GET(x) \ - (((x) & ERROR_INT_STATUS_WAKEUP_MASK) >> \ - ERROR_INT_STATUS_WAKEUP_LSB) -#define ERROR_INT_STATUS_RX_UNDERFLOW_GET(x) \ - (((x) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK) >> \ - ERROR_INT_STATUS_RX_UNDERFLOW_LSB) -#define ERROR_INT_STATUS_TX_OVERFLOW_GET(x) \ - (((x) & ERROR_INT_STATUS_TX_OVERFLOW_MASK) >> \ - ERROR_INT_STATUS_TX_OVERFLOW_LSB) -#define HOST_INT_STATUS_CPU_GET(x) \ - (((x) & HOST_INT_STATUS_CPU_MASK) >> HOST_INT_STATUS_CPU_LSB) -#define HOST_INT_STATUS_ERROR_GET(x) \ - (((x) & HOST_INT_STATUS_ERROR_MASK) >> HOST_INT_STATUS_ERROR_LSB) -#define HOST_INT_STATUS_COUNTER_GET(x) \ - (((x) & HOST_INT_STATUS_COUNTER_MASK) >> HOST_INT_STATUS_COUNTER_LSB) -#define RTC_STATE_V_GET(x) \ - (((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB) -#if defined(SDIO_3_0) -#define HOST_INT_STATUS_MBOX_DATA_GET(x) \ - (((x) & HOST_INT_STATUS_MBOX_DATA_MASK) >> \ - HOST_INT_STATUS_MBOX_DATA_LSB) -#endif - -#define INVALID_REG_LOC_DUMMY_DATA 0xAA - -#define AR6320_CORE_CLK_DIV_ADDR 0x403fa8 -#define AR6320_CPU_PLL_INIT_DONE_ADDR 0x403fd0 -#define AR6320_CPU_SPEED_ADDR 0x403fa4 -#define AR6320V2_CORE_CLK_DIV_ADDR 0x403fd8 -#define AR6320V2_CPU_PLL_INIT_DONE_ADDR 0x403fd0 -#define AR6320V2_CPU_SPEED_ADDR 0x403fd4 -#define AR6320V3_CORE_CLK_DIV_ADDR 0x404028 -#define AR6320V3_CPU_PLL_INIT_DONE_ADDR 0x404020 -#define AR6320V3_CPU_SPEED_ADDR 0x404024 - -typedef enum { - SOC_REFCLK_UNKNOWN = -1, /* Unsupported ref clock -- use PLL Bypass */ - SOC_REFCLK_48_MHZ = 0, - SOC_REFCLK_19_2_MHZ = 1, - SOC_REFCLK_24_MHZ = 2, - SOC_REFCLK_26_MHZ = 3, - SOC_REFCLK_37_4_MHZ = 4, - SOC_REFCLK_38_4_MHZ = 5, - SOC_REFCLK_40_MHZ = 6, - SOC_REFCLK_52_MHZ = 7, -} A_refclk_speed_t; - -#define A_REFCLK_UNKNOWN SOC_REFCLK_UNKNOWN -#define A_REFCLK_48_MHZ SOC_REFCLK_48_MHZ -#define A_REFCLK_19_2_MHZ SOC_REFCLK_19_2_MHZ -#define A_REFCLK_24_MHZ SOC_REFCLK_24_MHZ -#define A_REFCLK_26_MHZ SOC_REFCLK_26_MHZ -#define A_REFCLK_37_4_MHZ SOC_REFCLK_37_4_MHZ -#define A_REFCLK_38_4_MHZ SOC_REFCLK_38_4_MHZ -#define A_REFCLK_40_MHZ SOC_REFCLK_40_MHZ -#define A_REFCLK_52_MHZ SOC_REFCLK_52_MHZ - -#define TARGET_CPU_FREQ 176000000 - -struct wlan_pll_s { - uint32_t refdiv; - uint32_t div; - uint32_t rnfrac; - uint32_t outdiv; -}; - -struct cmnos_clock_s { - A_refclk_speed_t refclk_speed; - uint32_t refclk_hz; - uint32_t pll_settling_time; /* 50us */ - struct wlan_pll_s wlan_pll; -}; - -typedef struct TGT_REG_SECTION { - uint32_t start_addr; - uint32_t end_addr; -} tgt_reg_section; - -typedef struct TGT_REG_TABLE { - tgt_reg_section *section; - uint32_t section_size; -} tgt_reg_table; - -struct ol_softc; -void target_register_tbl_attach(struct ol_softc *scn, u32 target_type); -void hif_register_tbl_attach(struct ol_softc *scn, u32 hif_type); - -struct host_shadow_regs_s { - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_0; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_1; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_2; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_3; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_4; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_5; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_6; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_7; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_8; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_9; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_10; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_11; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_12; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_13; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_14; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_15; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_16; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_17; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_18; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_19; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_20; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_21; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_22; - uint32_t d_A_LOCAL_SHADOW_REG_VALUE_23; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_0; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_1; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_2; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_3; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_4; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_5; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_6; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_7; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_8; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_9; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_10; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_11; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_12; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_13; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_14; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_15; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_16; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_17; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_18; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_19; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_20; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_21; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_22; - uint32_t d_A_LOCAL_SHADOW_REG_ADDRESS_23; -}; - -#endif /* _REGTABLE_PCIE_H_ */ diff --git a/core/hif/src/adrastea_reg_def.h b/core/hif/src/adrastea_reg_def.h deleted file mode 100644 index c51733aae3be..000000000000 --- a/core/hif/src/adrastea_reg_def.h +++ /dev/null @@ -1,2367 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef ADRASTEA_REG_DEF_H -#define ADRASTEA_REG_DEF_H - -/* - * Start auto-generated headers from register parser - * - * DO NOT CHANGE MANUALLY -*/ - - -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__SRC_FLUSH___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW (0x00241000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__SRC_RING_BYTE_SWAP_EN___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_MISC_P___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2 (0x00030028) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__FORCE_WAKE_CLEAR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__EXTERNAL_INTR___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW (0x00244000) -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SOFT_RESET___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR___M 0x000003FF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT_STATUS___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE (0x00032060) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6 (0x00030038) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_TIMEOUT_P___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH (0x00032064) -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID__BITS___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY___M 0x00FFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ERR_RESP_CLEAR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__FORCE_WAKE_CLEAR___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ECAHB_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__MCIM_INT___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN2_HW2SW_GRANT___M 0x00000080 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__SIZE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ECAHB_TIMEOUT___M 0x00000010 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__SRC_RING_BYTE_SWAP_EN___S 17 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS___M 0x0003FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_HIGH_WATERMARK___M 0x00000002 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX__SRC_WR_INDEX___M 0x0000FFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY___M 0x00FFF000 -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID___M 0x00FFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH__BASE_ADDR_HIGH___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4 (0x00030030) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_LEN_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_TIMEOUT_P___M 0x00000100 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ECAHB_TIMEOUT___S 4 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__DIRTY_BIT_SET___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX (0x00240040) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS (0x00240038) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_1_INTR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_PLL_REF_MUX_SEL___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR (0x002F1008) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_MAX_LEN_VIO___M 0x00000080 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_LOW_WATERMARK___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB__STATUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR___M 0x00000FFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__SRC_FLUSH___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20 (0x00030070) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12 (0x00032030) -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__CLOCK_GATE_DISABLE___M 0x00000002 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET__CE_INTR_LINE_HOST_P___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__EXTERNAL_INTR___S 18 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS__SELECT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX__DST_WR_INDEX___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES___M 0x00000FFF -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB (0x00032070) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN2_HW2SW_GRANT___M 0x00000080 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_OVERFLOW___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN2_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR__CE_INTR_LINE_HOST_P___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_SR_XO_SETTLE_TIMEOUT___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__COPY_COMPLETE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__BASE_ADDR_HIGH___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__SIZE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_HIGH_WATERMARK___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13 (0x00032034) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3 (0x0003002C) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID (0x000300E0) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22 (0x00032058) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_OVERFLOW___M 0x00000020 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__MSI_EN___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__VALUE_REG_UPDATED_WITH_INVALID_ADDR___M 0x00000020 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__SIZE___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__VALUE_REG_UPDATED_WITH_INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14 (0x00030058) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH___M 0x0000007F -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__CLOCK_GATE_DISABLE___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__IDX_UPD_EN___S 19 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB__STATUS___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1 (0x00032004) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_OVERFLOW___S 5 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_HIGH_WATER_MARK_THRESHOLD___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__BMH_INT___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__WCSS_CORE_WAKE_SLEEP_STATE___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_LOW_WATERMARK___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__DIRTY_BIT_SET_ENABLE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET__CE_INTR_LINE_HOST_P___M 0x00000FFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14 (0x00032038) -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_RF_XO_MUX_SEL___M 0x00000010 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__COPY_COMPLETE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__MISC___M 0x00000FFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_SR_XO_SETTLE_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY__ENABLE___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_STROBE_INTERRUPT___S 1 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_LOW_WATERMARK___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_LOW_WATERMARK___S 4 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS___M 0x0000001F -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23 (0x0003205C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE (0x00240034) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY (0x0024D000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15 (0x0003005C) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN1_SLP_TMR_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI__CURRENT_SRRI___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE (0x0024002C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_LOW_WATERMARK___S 4 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_SR_XO_SETTLE_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN2_HW2SW_GRANT___S 7 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH___M 0x0000001F -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__ADDRESS_BITS_17_TO_2___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ECAHB_TIMEOUT___M 0x00000010 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY___M 0x01FFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__PARSER_INT___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__COPY_COMPLETE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__ADDRESS_BITS_17_TO_2___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__ILL_REG___S 24 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_OVERFLOW___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__STATE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0 (0x00032000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_LOW_WATER_MARK_THRESOLD___M 0xFFFF0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR (0x00030014) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_MISC_P___M 0x00000080 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20 (0x00032050) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LMH_INT___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI__CURRENT_DRRI___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ERR_RESP_ENABLE___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN2_SLP_TMR_INTR___M 0x00008000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX__SRC_WR_INDEX___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__SRC_RING_BYTE_SWAP_EN___M 0x00020000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW (0x0024B000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET (0x002F1004) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2 (0x00032008) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__DESC_SKIP_DWORD___S 5 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_LOW_WATER_MARK_THRESHOLD___M 0xFFFF0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE__FORCE_WAKE_ENABLE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__BASE_ADDR_HIGH___POR 0x00 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__FORCE_WAKE_ENABLE___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__BMH_INT___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__DST_AXI_MAX_LEN___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__DESC_SKIP_DWORD___M 0x00000060 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SMH_INT___S 6 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__EXTERNAL_INTR___M 0x0FFC0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI__CURRENT_DRRI___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN1_HW2SW_GRANT___S 6 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_WCSS_WAKEUP_IRQ_ACK___S 8 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW (0x00245000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22 (0x00030078) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SMH_INT___M 0x00000040 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2___POR 0x00000005 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT_STATUS___S 3 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__DIRTY_BIT_SET___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__MISC___POR 0x000 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__FORCE_WAKE_ENABLE___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_OVERFLOW___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__ADDRESS_BITS_17_TO_2___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__DST_AXI_MAX_LEN___POR 0x1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK (0x0024004C) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ERR_RESP___M 0x00000004 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_WCSS_WAKEUP_IRQ_ACK___M 0x00000100 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_2_INTR___S 11 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17 (0x00030064) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW (0x0024000C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_1_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID__BITS___M 0x00FFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__DESC_SKIP_DWORD___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW (0x0024A000) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN1_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__MCIM_INT___S 4 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__SRC_AXI_MAX_LEN___M 0x00000003 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_OVERFLOW___M 0x00000040 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_WCSS_WAKEUP_IRQ_ACK___M 0x00000100 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS (0x00030008) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_PLL_REF_MUX_SEL___S 3 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__MSI_EN___M 0x00010000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__PARSER_INT___M 0x000FF800 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_LEN_ERR___S 8 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ECAHB_TIMEOUT___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19 (0x0003204C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_HIGH_WATERMARK___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5 (0x00030034) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_OVERFLOW___M 0x00000020 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR__CE_INTR_LINE_HOST_P___M 0x00000FFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__HOST___M 0x00FFF000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_RF_XO_MUX_SEL___S 4 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__MSI_EN___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__VALUE_REG_UPDATED_WITH_INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE___M 0x000FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__PARSER_INT___M 0x000FF800 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_HIGH_WATER_MARK_THRESHOLD___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WFSS_DBG_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__SIZE___M 0x0000FFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SW_SLP_TMR_INTR___M 0x00010000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_HIGH_WATER_MARK_THRESHOLD___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_WCSS_WAKEUP_IRQ_ACK___S 8 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB__STATUS___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_MAX_LEN_VIO___M 0x00000080 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__SIZE___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5 (0x00032014) -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS (0x0003000C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__DIRTY_BIT_SET_CLEAR___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH__BASE_ADDR_HIGH___M 0x0000001F -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__SRC_FLUSH___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_LOW_WATER_MARK_THRESHOLD___S 16 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9 (0x00032024) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__COPY_COMPLETE___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__WRITE_ACCESS___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE___M 0x0000001F -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__COPY_COMPLETE___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__PARSER_INT___S 11 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__HOST___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_OVERFLOW___S 6 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN1_SLP_TMR_INTR___M 0x00004000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ERR_RESP_CLEAR___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__WRITE_ACCESS___M 0x00020000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__VALUE_REG_UPDATED_WITH_INVALID_ADDR___S 5 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DEST_MAX_LENGTH___M 0x0000FFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT_STATUS___M 0x00000008 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_WCI2_INTERRUPT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_HIGH_WATERMARK___M 0x00000008 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1___POR 0x00000080 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__DIRTY_BIT_SET_CLEAR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_SR_XO_SETTLE_TIMEOUT___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18 (0x00032048) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__NOC_WCMN_INTR___M 0x00001000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK (0x00240050) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__DIRTY_BIT_SET___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB__STATUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__DIRTY_BIT_SET_ENABLE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__IDX_UPD_EN___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN1_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW (0x00243000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__START_OFFSET___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY (0x00030080) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW (0x00248000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_LOW_WATERMARK___S 2 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16 (0x00032040) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS___M 0x0000000F -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__START_OFFSET___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY (0x0024C000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN2_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__COPY_COMPLETE___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_2_INTR___M 0x00000800 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DST_RING_BYTE_SWAP_EN___S 18 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS (0x00032078) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB__STATUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH__SPARE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID__BITS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS__SELECT___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_LOW_WATERMARK___S 2 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LMH_INT___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_ADDRESS_VALID___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB__STATUS___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12 (0x00030050) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS__SELECT___M 0x00000007 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__PMH_INT___M 0x00000020 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__ENABLE_APSS_FULL_ACCESS___M 0x00000004 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN1_SLP_TMR_INTR___S 14 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_LOW_WATERMARK___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DST_RING_BYTE_SWAP_EN___M 0x00040000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_WCSS_WAKEUP_IRQ_ACK___S 8 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_LEN_ERR___M 0x00000100 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY__ENABLE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7 (0x0003003C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI__CURRENT_DRRI___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH__SPARE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_MAX_LEN_VIO___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET (0x002F0084) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET__CE_INTR_LINE_HOST_P___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_HIGH_WATER_MARK_THRESHOLD___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__READ_ACCESS___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__SIZE___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__ENABLE_APSS_FULL_ACCESS___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES__CE_INTR_LINE_HOST_P___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY__ENABLE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8 (0x00030040) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS (0x00240030) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_LOW_WATERMARK___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SOFT_RESET___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15 (0x0003203C) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_HIGH_WATERMARK___M 0x00000002 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__COPY_COMPLETE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH (0x00240004) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__STATE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__WRITE_ACCESS___S 17 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_OVERFLOW___S 6 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_SR_XO_SETTLE_TIMEOUT___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ECAHB_TIMEOUT___S 4 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DEST_MAX_LENGTH___POR 0x0080 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_LOW_WATER_MARK_THRESHOLD___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_SR_XO_SETTLE_TIMEOUT___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN1_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_HIGH_WATERMARK___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_HIGH_WATERMARK___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_WCSS_WAKEUP_IRQ_ACK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW (0x00240000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13 (0x00030054) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN2_SLP_TMR_INTR___S 15 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH (0x00240010) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__PARSER_INT___S 11 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ERR_RESP_CLEAR___S 2 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4 (0x00032010) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_WCSS_WAKEUP_IRQ_ACK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SW_SLP_TMR_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_MAX_LEN_VIO___S 7 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_MAX_LEN_VIO___S 7 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW (0x00246000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DST_RING_BYTE_SWAP_EN___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_2_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_WCSS_WAKEUP_IRQ_ACK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY__HOST___POR 0x000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__NOC_WCMN_INTR___S 12 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__PARSER_INT___POR 0x000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__DST_FLUSH___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23 (0x0003007C) -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL___M 0x0000001F -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_OVERFLOW___M 0x00000040 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SMH_INT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__SW_SLP_TMR_INTR___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY__HOST___S 12 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH__BASE_ADDR_HIGH___POR 0x00 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_LEN_ERR___M 0x00000100 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__VALUE_REG_UPDATED_WITH_INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH__SPARE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE__FORCE_WAKE_ENABLE___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX__SRC_WR_INDEX___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB__STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ERR_RESP_ENABLE___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__ILL_REG___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__SRC_AXI_MAX_LEN___POR 0x1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1 (0x00240018) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19 (0x0003006C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX (0x0024003C) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD___M 0x0000000F -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__VALUE_REG_UPDATED_WITH_INVALID_ADDR___S 5 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI__CURRENT_SRRI___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_RF_XO_MUX_SEL___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2___M 0x0000000F -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__INVALID_ADDR___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET___M 0x0FFFDDFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7 (0x0003201C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_LOW_WATERMARK___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__INVALID_ADDR___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__DST_AXI_MAX_LEN___M 0x0000000C -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__MISC___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__COPY_COMPLETE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_HIGH_WATER_MARK_THRESHOLD___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__CLOCK_GATE_DISABLE___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__DIRTY_BIT_SET_CLEAR___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ECAHB_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__FORCE_WAKE___S 1 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB__STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_SR_XO_SETTLE_TIMEOUT___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__VALUE_REG_UPDATED_WITH_INVALID_ADDR___S 5 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB__STATUS___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__VALUE_REG_UPDATED_WITH_INVALID_ADDR___M 0x00000020 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_MISC_P___S 7 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_OVERFLOW___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__INVALID_ADDR___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX__DST_WR_INDEX___M 0x0000FFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_STROBE_INTERRUPT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR___RWC QCSR_REG_WO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__PMM_SR_XO_SETTLE_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES__CE_INTR_LINE_HOST_P___M 0x00000FFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_LOW_WATER_MARK_THRESOLD___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__FORCE_WAKE___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16 (0x00030060) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS (0x00030144) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__START_OFFSET___POR 0x0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SR_PLL_REF_MUX_SEL___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17 (0x00032044) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS___M 0x000003FF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WFSS_DBG_INTR___M 0x00020000 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB__STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__ENABLE_APSS_FULL_ACCESS___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_HIGH_WATERMARK___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE__START_OFFSET___M 0xFFFF0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_HIGH_WATERMARK___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__CE_INTR_TIMEOUT_P___S 8 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__COPY_COMPLETE___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__START_OFFSET___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS___M 0x000FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ECAHB_TIMEOUT___S 4 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1___M 0x000FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__FORCE_WAKE_ENABLE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB__STATUS___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__INVALID_ADDR___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS___M 0x00000007 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN1_HW2SW_GRANT___S 6 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_HIGH_WATERMARK___S 1 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW (0x00242000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN2_HW2SW_GRANT___S 7 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_LOW_WATERMARK___S 4 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DEST_MAX_LENGTH___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE (0x00030010) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__FORCE_WAKE_CLEAR___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8 (0x00032020) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET___M 0x00000FFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__IDX_UPD_EN___M 0x00080000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__BMH_INT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL__SOFT_RESET___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN1_HW2SW_GRANT___S 6 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0 (0x00030020) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__PMH_INT___S 5 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY__HOST___M 0x00FFF000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX__DST_WR_INDEX___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_HIGH_WATER_MARK_THRESHOLD___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__ILL_REG___M 0x01000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WLAN2_SLP_TMR_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11 (0x0003004C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__PMH_INT___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__INVALID_BB_1_INTR___M 0x00000400 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_LOW_WATER_MARK_THRESOLD___POR 0x0000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB (0x0003206C) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__PMM_WCSS_WAKEUP_IRQ_ACK___M 0x00000100 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__DIRTY_BIT_SET_ENABLE___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX___M 0x0000FFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE (0x00240014) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__STATE___M 0x00000007 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11 (0x0003202C) -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI (0x00240048) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW__BASE_ADDR_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__WCSS_CORE_WAKE_SLEEP_STATE___S 3 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW (0x00249000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__DST_RING_LOW_WATERMARK___S 4 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_LEN_ERR___S 8 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_MISC_IS__AXI_TIMEOUT_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__ERR_RESP_ENABLE___M 0x00000004 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_WCI2_INTERRUPT___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_HIGH_WATERMARK___S 1 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS__WCSS_CORE_WAKE_SLEEP_STATE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__READ_ACCESS___S 16 -#define ADRASTEA_A_WCSS_SR_APSS_SR_TESTBUS___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_INVALID_ADDR_ACCESS__READ_ACCESS___M 0x00010000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_HIGH_WATERMARK___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_CLEAR__CE_INTR_LINE_HOST_P___POR 0x000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL (0x00030000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI (0x00240044) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_MAX_LEN_VIO___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY__BITS___M 0x00FFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE___M 0x000003FF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD (0x00240020) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_LOW_WATERMARK___M 0x00000004 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__NOC_WCMN_INTR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_SECURE_WRAPPER_CE_WRAPPER_INTERRUPT_SUMMARY__HOST___S 12 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_LSB___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__COPY_COMPLETE___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOWREG_STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB__STATUS___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES (0x002F1000) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_MISC_IS__AXI_TIMEOUT_ERR___M 0x00000400 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9 (0x00030044) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6 (0x00032018) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21 (0x00032054) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH__BASE_ADDR_HIGH___M 0x0000001F -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY___S 12 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__HALT___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW (0x00247000) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18 (0x00030068) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN1_HW2SW_GRANT___M 0x00000040 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_LOW_WATERMARK___M 0x00000010 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__INVALID_ADDR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_HIGH_WATERMARK___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ERR_RESP___S 2 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE (0x00240008) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_CONTROL___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY__BITS___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_HIGH_WATERMARK___S 3 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__WLAN1_HW2SW_GRANT___M 0x00000040 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LMH_INT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN2_HW2SW_GRANT___M 0x00000080 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1 (0x00030024) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2 (0x0024001C) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES__CE_INTR_LINE_HOST_P___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0__ADDRESS_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN2_HW2SW_GRANT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES_SET___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_STROBE_INTERRUPT___M 0x00000002 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__VALUE_REG_UPDATED_WITH_INVALID_ADDR___M 0x00000020 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__MCIM_INT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__FORCE_WAKE___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_MSB___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21 (0x00030074) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_DIRTY__BITS___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__DST_FLUSH___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__AXI_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__WLAN2_HW2SW_GRANT___S 7 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12__VALUE_REGISTER___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_LEN_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_WCSSAON_SR_MSB (0x00032074) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_HIGH_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE__FORCE_WAKE_ENABLE___M 0x00000001 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD__DST_FLUSH___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_LOW_WATERMARK___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE__START_OFFSET___M 0xFFFF0000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10 (0x00030048) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_OVERFLOW___S 5 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI__CURRENT_SRRI___M 0x0000FFFF -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4__ADDRESS_REGISTER___M 0x003FFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__SRC_RING_HIGH_WATERMARK___M 0x00000002 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__COPY_COMPLETE___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__ERR_RESP___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__COPY_COMPLETE___M 0x00000001 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20__VALUE_REGISTER___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW__BASE_ADDR_LOW___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_TIMEOUT_ERR___S 10 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW__BASE_ADDR_LOW___M 0xFFFFFFFF -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__INVALID_ADDR___S 3 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1___RWC QCSR_REG_RO -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__ECAHB_TIMEOUT___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SW_SCRATCH___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_BUS_ERR___S 9 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3__ADDRESS_REGISTER___POR 0x000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_LOW_WATERMARK___S 2 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL2__SRC_AXI_MAX_LEN___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_PMM_SR_LSB (0x00032068) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__WFSS_DBG_INTR___S 17 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_CLEAR__PMM_SR_XO_SETTLE_TIMEOUT___M 0x00000200 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH___S 0 -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_ENABLE__WLAN1_HW2SW_GRANT___M 0x00000040 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_BUS_ERR___M 0x00000200 -#define ADRASTEA_A_WCSS_SR_APSS_COMMIT_REPLAY (0x00030004) -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW___RWC QCSR_REG_RW -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21___S 0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_MISC_IS__AXI_BUS_ERR___POR 0x0 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_3_A_WCMN_QDSP_ERROR_INTR_ENABLES_SET__LCMH_WCI2_INTERRUPT___M 0x00000004 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__DST_RING_LOW_WATERMARK___POR 0x0 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10 (0x00032028) -#define ADRASTEA_A_WCSS_SR_APSS_SR_INTERRUPT_STATUS__INVALID_ADDR___M 0x00000008 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3 (0x0003200C) -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16__VALUE_REGISTER___POR 0x00000000 -#define ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE__SRC_RING_HIGH_WATERMARK___S 1 -#define ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12__ADDRESS_REGISTER___S 0 - - -/* End auto-generated headers from register parser */ - -#define A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_INDEX_BASE_LOW 0x0024C004 -#define A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_INDEX_BASE_HIGH 0x0024C008 - -#define MISSING 0 -#define MISSING_FOR_ADRASTEA MISSING -#define ADRASTEA_PCIE_LOCAL_REG_BASE_ADDRESS 0 -#define ADRASTEA_WIFI_RTC_REG_BASE_ADDRESS 0x45000 -#define ADRASTEA_RTC_SOC_REG_BASE_ADDRESS 0x113000 -#define ADRASTEA_GPIO_ATHR_WLAN_REG_BASE_ADDRESS 0x85000 -#define ADRASTEA_SI_REG_BASE_ADDRESS 0x84000 -#define ADRASTEA_SOC_CORE_REG_BASE_ADDRESS 0x113000 -#define ADRASTEA_CE_WRAPPER_REG_CSR_BASE_ADDRESS 0xC000 -#define ADRASTEA_MAC_WIFICMN_REG_BASE_ADDRESS MISSING - -/* Base Addresses */ -#define ADRASTEA_RTC_SOC_BASE_ADDRESS 0x00000000 -#define ADRASTEA_RTC_WMAC_BASE_ADDRESS 0x00000000 -#define ADRASTEA_MAC_COEX_BASE_ADDRESS 0x0000f000 -#define ADRASTEA_BT_COEX_BASE_ADDRESS 0x00002000 -#define ADRASTEA_SOC_PCIE_BASE_ADDRESS 0x00130000 -#define ADRASTEA_SOC_CORE_BASE_ADDRESS 0x00000000 -#define ADRASTEA_WLAN_UART_BASE_ADDRESS 0x00111000 -#define ADRASTEA_WLAN_SI_BASE_ADDRESS 0x00010000 -#define ADRASTEA_WLAN_GPIO_BASE_ADDRESS 0x00000000 -#define ADRASTEA_WLAN_ANALOG_INTF_BASE_ADDRESS 0x00000000 -#define ADRASTEA_WLAN_MAC_BASE_ADDRESS 0x00000000 -#define ADRASTEA_EFUSE_BASE_ADDRESS 0x00024000 -#define ADRASTEA_FPGA_REG_BASE_ADDRESS 0x00039000 -#define ADRASTEA_WLAN_UART2_BASE_ADDRESS 0x00054c00 - -#define ADRASTEA_CE_WRAPPER_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY -#define ADRASTEA_CE0_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW -#define ADRASTEA_CE1_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE1_SR_BA_LOW -#define ADRASTEA_CE2_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE2_SR_BA_LOW -#define ADRASTEA_CE3_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE3_SR_BA_LOW -#define ADRASTEA_CE4_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE4_SR_BA_LOW -#define ADRASTEA_CE5_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE5_SR_BA_LOW -#define ADRASTEA_CE6_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE6_SR_BA_LOW -#define ADRASTEA_CE7_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE7_SR_BA_LOW -#define ADRASTEA_CE8_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE8_SR_BA_LOW -#define ADRASTEA_CE9_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE9_SR_BA_LOW -#define ADRASTEA_CE10_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE10_SR_BA_LOW -#define ADRASTEA_CE11_BASE_ADDRESS \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE11_SR_BA_LOW - -#define ADRASTEA_A_SOC_PCIE_SOC_PCIE_REG MISSING -#define ADRASTEA_DBI_BASE_ADDRESS MISSING -#define ADRASTEA_WLAN_ANALOG_INTF_PCIE_BASE_ADDRESS MISSING -#define ADRASTEA_WIFICMN_BASE_ADDRESS MISSING -#define ADRASTEA_BOARD_DATA_SZ MISSING -#define ADRASTEA_BOARD_EXT_DATA_SZ MISSING -#define ADRASTEA_A_SOC_PCIE_PCIE_BAR0_START MISSING -#define ADRASTEA_A_SOC_CORE_SCRATCH_0_ADDRESS MISSING -#define ADRASTEA_A_SOC_CORE_SPARE_0_REGISTER MISSING -#define ADRASTEA_PCIE_INTR_FIRMWARE_ROUTE_MASK MISSING -#define ADRASTEA_SCRATCH_3_ADDRESS MISSING -#define ADRASTEA_TARG_DRAM_START 0x00400000 -#define ADRASTEA_SOC_SYSTEM_SLEEP_OFFSET 0x000000c0 -#define ADRASTEA_SOC_RESET_CONTROL_OFFSET \ - (0x00000000 + _RTC_SOC_REG_BASE_ADDRESS) -#define ADRASTEA_SOC_CLOCK_CONTROL_OFFSET \ - (0x00000028 + _RTC_SOC_REG_BASE_ADDRESS) -#define ADRASTEA_SOC_CLOCK_CONTROL_SI0_CLK_MASK 0x00000001 -#define ADRASTEA_SOC_RESET_CONTROL_SI0_RST_MASK 0x00000001 -#define ADRASTEA_WLAN_GPIO_PIN0_ADDRESS \ - (0x50 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN1_ADDRESS \ - (0x54 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN0_CONFIG_MASK 0x00007800 -#define ADRASTEA_WLAN_GPIO_PIN1_CONFIG_MASK 0x00007800 -#define ADRASTEA_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define ADRASTEA_SOC_LPO_CAL_OFFSET \ - (0xe0 + _RTC_SOC_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN10_ADDRESS \ - (0x78 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN11_ADDRESS \ - (0x7c + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN12_ADDRESS \ - (0x80 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_GPIO_PIN13_ADDRESS \ - (0x84 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define ADRASTEA_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define ADRASTEA_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -#define ADRASTEA_SOC_LPO_CAL_ENABLE_LSB 20 -#define ADRASTEA_SOC_LPO_CAL_ENABLE_MASK 0x00100000 - -#define ADRASTEA_WLAN_SYSTEM_SLEEP_DISABLE_LSB 0 -#define ADRASTEA_WLAN_SYSTEM_SLEEP_DISABLE_MASK 0x00000001 -#define ADRASTEA_WLAN_RESET_CONTROL_COLD_RST_MASK 0x00000002 -#define ADRASTEA_WLAN_RESET_CONTROL_WARM_RST_MASK 0x00000001 -#define ADRASTEA_SI_CONFIG_BIDIR_OD_DATA_LSB 18 -#define ADRASTEA_SI_CONFIG_BIDIR_OD_DATA_MASK 0x00040000 -#define ADRASTEA_SI_CONFIG_I2C_LSB 16 -#define ADRASTEA_SI_CONFIG_I2C_MASK 0x00010000 -#define ADRASTEA_SI_CONFIG_POS_SAMPLE_LSB 7 -#define ADRASTEA_SI_CONFIG_POS_SAMPLE_MASK 0x00000080 -#define ADRASTEA_SI_CONFIG_INACTIVE_CLK_LSB 4 -#define ADRASTEA_SI_CONFIG_INACTIVE_CLK_MASK 0x00000010 -#define ADRASTEA_SI_CONFIG_INACTIVE_DATA_LSB 5 -#define ADRASTEA_SI_CONFIG_INACTIVE_DATA_MASK 0x00000020 -#define ADRASTEA_SI_CONFIG_DIVIDER_LSB 0 -#define ADRASTEA_SI_CONFIG_DIVIDER_MASK 0x0000000f -#define ADRASTEA_SI_CONFIG_OFFSET (0x00000000 + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_TX_DATA0_OFFSET (0x00000008 + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_TX_DATA1_OFFSET (0x0000000c + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_RX_DATA0_OFFSET (0x00000010 + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_RX_DATA1_OFFSET (0x00000014 + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_CS_OFFSET (0x00000004 + _SI_REG_BASE_ADDRESS) -#define ADRASTEA_SI_CS_DONE_ERR_MASK 0x00000400 -#define ADRASTEA_SI_CS_DONE_INT_MASK 0x00000200 -#define ADRASTEA_SI_CS_START_LSB 8 -#define ADRASTEA_SI_CS_START_MASK 0x00000100 -#define ADRASTEA_SI_CS_RX_CNT_LSB 4 -#define ADRASTEA_SI_CS_RX_CNT_MASK 0x000000f0 -#define ADRASTEA_SI_CS_TX_CNT_LSB 0 -#define ADRASTEA_SI_CS_TX_CNT_MASK 0x0000000f -#define ADRASTEA_CE_COUNT 12 -#define ADRASTEA_SR_WR_INDEX_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WR_INDEX \ - - ADRASTEA_CE0_BASE_ADDRESS) -#define ADRASTEA_DST_WATERMARK_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK \ - - ADRASTEA_CE0_BASE_ADDRESS) -#define ADRASTEA_RX_MSDU_END_4_FIRST_MSDU_LSB 14 -#define ADRASTEA_RX_MSDU_END_4_FIRST_MSDU_MASK 0x00004000 -#define ADRASTEA_RX_MPDU_START_0_SEQ_NUM_LSB 16 -#define ADRASTEA_RX_MPDU_START_0_SEQ_NUM_MASK 0x0fff0000 -#define ADRASTEA_RX_MPDU_START_2_PN_47_32_LSB 0 -#define ADRASTEA_RX_MPDU_START_2_PN_47_32_MASK 0x0000ffff -#define ADRASTEA_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB 16 -#define ADRASTEA_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK 0xffff0000 -#define ADRASTEA_RX_MSDU_END_4_LAST_MSDU_LSB 15 -#define ADRASTEA_RX_MSDU_END_4_LAST_MSDU_MASK 0x00008000 -#define ADRASTEA_RX_ATTENTION_0_MCAST_BCAST_LSB 2 -#define ADRASTEA_RX_ATTENTION_0_MCAST_BCAST_MASK 0x00000004 -#define ADRASTEA_RX_ATTENTION_0_FRAGMENT_LSB 13 -#define ADRASTEA_RX_ATTENTION_0_FRAGMENT_MASK 0x00002000 -#define ADRASTEA_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK 0x08000000 -#define ADRASTEA_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB 16 -#define ADRASTEA_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK 0x00ff0000 -#define ADRASTEA_RX_MSDU_START_0_MSDU_LENGTH_LSB 0 -#define ADRASTEA_RX_MSDU_START_0_MSDU_LENGTH_MASK 0x00003fff - -#define ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_OFFSET 0x00000008 -#define ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_LSB 8 -#define ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_MASK 0x00000300 -#define ADRASTEA_RX_MPDU_START_0_ENCRYPTED_LSB 13 -#define ADRASTEA_RX_MPDU_START_0_ENCRYPTED_MASK 0x00002000 -#define ADRASTEA_RX_ATTENTION_0_MORE_DATA_MASK 0x00000400 -#define ADRASTEA_RX_ATTENTION_0_MSDU_DONE_MASK 0x80000000 -#define ADRASTEA_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK 0x00040000 - -#define ADRASTEA_DST_WR_INDEX_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WR_INDEX\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_SRC_WATERMARK_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_SRC_WATERMARK_LOW_MASK 0xffff0000 -#define ADRASTEA_SRC_WATERMARK_HIGH_MASK 0x0000ffff -#define ADRASTEA_DST_WATERMARK_LOW_MASK 0xffff0000 -#define ADRASTEA_DST_WATERMARK_HIGH_MASK 0x0000ffff - -#define ADRASTEA_CURRENT_SRRI_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_SRRI\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_CURRENT_DRRI_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CURRENT_DRRI\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK 0x00000002 -#define ADRASTEA_HOST_IS_SRC_RING_LOW_WATERMARK_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__SRC_RING_LOW_WATERMARK___M - -#define ADRASTEA_HOST_IS_DST_RING_HIGH_WATERMARK_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_HIGH_WATERMARK___M - -#define ADRASTEA_HOST_IS_DST_RING_LOW_WATERMARK_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__DST_RING_LOW_WATERMARK___M - -#define ADRASTEA_HOST_IS_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS \ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_MISC_IS_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS \ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_HOST_IS_COPY_COMPLETE_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IS__COPY_COMPLETE___M - -#define ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS_OFFSET \ - (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY\ - - ADRASTEA_CE_WRAPPER_BASE_ADDRESS) - -/* - * Base address where the CE source and destination ring read - * indices are written to be viewed by host. - */ - -#define ADRASTEA_CE_DDR_ADDRESS_FOR_RRI_LOW \ - (A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_INDEX_BASE_LOW\ - - ADRASTEA_CE_WRAPPER_BASE_ADDRESS) - -#define ADRASTEA_CE_DDR_ADDRESS_FOR_RRI_HIGH \ - (A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_INDEX_BASE_HIGH - ADRASTEA_CE_WRAPPER_BASE_ADDRESS) - -#define ADRASTEA_HOST_IE_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_HOST_IE_COPY_COMPLETE_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_HOST_IE__COPY_COMPLETE___M - -#define ADRASTEA_SR_BA_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_LOW\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_SR_BA_ADDRESS_HIGH_OFFSET \ - (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_BA_HIGH \ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_SR_SIZE_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SR_SIZE \ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_CE_CTRL1_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1 \ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_CE_CTRL1_DMAX_LENGTH_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DEST_MAX_LENGTH___M - -#define ADRASTEA_DR_BA_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_LOW\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_DR_BA_ADDRESS_HIGH_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_BA_HIGH\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_DR_SIZE_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DR_SIZE\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_CE_CMD_REGISTER_OFFSET (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CMD\ - - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_MISC_IE_OFFSET \ - (ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IE - ADRASTEA_CE0_BASE_ADDRESS) - -#define ADRASTEA_MISC_IS_AXI_ERR_MASK 0x00000100 - -#define ADRASTEA_MISC_IS_DST_ADDR_ERR_MASK 0x00000200 - -#define ADRASTEA_MISC_IS_AXI_TIMEOUT_ERR \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__AXI_TIMEOUT_ERR___M - -#define ADRASTEA_MISC_IS_SRC_LEN_ERR_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_LEN_ERR___M - -#define ADRASTEA_MISC_IS_DST_MAX_LEN_VIO_MASK\ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_MAX_LEN_VIO___M - -#define ADRASTEA_MISC_IS_DST_RING_OVERFLOW_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__DST_RING_OVERFLOW___M - -#define ADRASTEA_MISC_IS_SRC_RING_OVERFLOW_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_MISC_IS__SRC_RING_OVERFLOW___M - -#define ADRASTEA_SRC_WATERMARK_LOW_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_LOW_WATER_MARK_THRESOLD___S - -#define ADRASTEA_SRC_WATERMARK_HIGH_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_SRC_WATERMARK__SR_HIGH_WATER_MARK_THRESHOLD___S - -#define ADRASTEA_DST_WATERMARK_LOW_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_LOW_WATER_MARK_THRESHOLD___S - -#define ADRASTEA_DST_WATERMARK_HIGH_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_DST_WATERMARK__DR_HIGH_WATER_MARK_THRESHOLD___S - -#define ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY__HOST___M - -#define ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE_COMMON_WRAPPER_CE_WRAPPER_HOST_INTERRUPT_SUMMARY__HOST___S - -#define ADRASTEA_CE_CTRL1_DMAX_LENGTH_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DEST_MAX_LENGTH___S - -#define ADRASTEA_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__SRC_RING_BYTE_SWAP_EN___M - -#define ADRASTEA_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DST_RING_BYTE_SWAP_EN___M - -#define ADRASTEA_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__SRC_RING_BYTE_SWAP_EN___S - -#define ADRASTEA_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB \ - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__DST_RING_BYTE_SWAP_EN___S - -#define ADRASTEA_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK 0x0000004 -#define ADRASTEA_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB 2 -#define ADRASTEA_SOC_GLOBAL_RESET_ADDRESS \ - (0x0008 + ADRASTEA_PCIE_LOCAL_REG_BASE_ADDRESS) -#define ADRASTEA_RTC_STATE_ADDRESS \ - (0x0000 + ADRASTEA_PCIE_LOCAL_REG_BASE_ADDRESS) -#define ADRASTEA_RTC_STATE_COLD_RESET_MASK 0x400 - -#define ADRASTEA_PCIE_SOC_WAKE_RESET 0x00000000 -#define ADRASTEA_PCIE_SOC_WAKE_ADDRESS (ADRASTEA_A_WCSS_SR_APSS_FORCE_WAKE) -#define ADRASTEA_PCIE_SOC_WAKE_V_MASK 0x00000001 - -#define ADRASTEA_RTC_STATE_V_MASK 0x00000007 -#define ADRASTEA_RTC_STATE_V_LSB 0 -#define ADRASTEA_RTC_STATE_V_ON 5 -#define ADRASTEA_PCIE_LOCAL_BASE_ADDRESS 0x0 -#define ADRASTEA_FW_IND_EVENT_PENDING 1 -#define ADRASTEA_FW_IND_INITIALIZED 2 -#define ADRASTEA_FW_IND_HELPER 4 - -#define ADRASTEA_PCIE_INTR_FIRMWARE_MASK 0x00000000 -#define ADRASTEA_PCIE_INTR_CE0_MASK 0x00000100 -#define ADRASTEA_PCIE_INTR_CE_MASK_ALL 0x00001ffe - -#define ADRASTEA_CPU_INTR_ADDRESS 0xffffffff -#define ADRASTEA_SOC_LF_TIMER_CONTROL0_ADDRESS 0xffffffff -#define ADRASTEA_SOC_LF_TIMER_CONTROL0_ENABLE_MASK 0xffffffff -#define ADRASTEA_SOC_RESET_CONTROL_ADDRESS \ - (0x00000000 + _RTC_SOC_REG_BASE_ADDRESS) -#define ADRASTEA_SOC_RESET_CONTROL_CE_RST_MASK 0x0100 -#define ADRASTEA_SOC_RESET_CONTROL_CPU_WARM_RST_MASK 0x00000040 -#define ADRASTEA_CORE_CTRL_ADDRESS (0x0000 + _SOC_CORE_REG_BASE_ADDRESS) -#define ADRASTEA_CORE_CTRL_CPU_INTR_MASK 0x00002000 -#define ADRASTEA_LOCAL_SCRATCH_OFFSET 0x00000018 -#define ADRASTEA_CLOCK_GPIO_OFFSET 0xffffffff -#define ADRASTEA_CLOCK_GPIO_BT_CLK_OUT_EN_LSB 0 -#define ADRASTEA_CLOCK_GPIO_BT_CLK_OUT_EN_MASK 0 -#define ADRASTEA_SOC_CHIP_ID_ADDRESS 0x000000f0 -#define ADRASTEA_SOC_CHIP_ID_VERSION_MASK 0xfffc0000 -#define ADRASTEA_SOC_CHIP_ID_VERSION_LSB 18 -#define ADRASTEA_SOC_CHIP_ID_REVISION_MASK 0x00000f00 -#define ADRASTEA_SOC_CHIP_ID_REVISION_LSB 8 -#define ADRASTEA_SOC_POWER_REG_OFFSET 0x0000010c - -/* Copy Engine Debug */ -#define ADRASTEA_WLAN_DEBUG_INPUT_SEL_OFFSET 0x0000010c -#define ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_MSB 3 -#define ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_LSB 0 -#define ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_MASK 0x0000000f -#define ADRASTEA_WLAN_DEBUG_CONTROL_OFFSET 0x00000108 -#define ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_MSB 0 -#define ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_LSB 0 -#define ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_MASK 0x00000001 -#define ADRASTEA_WLAN_DEBUG_OUT_OFFSET 0x00000110 -#define ADRASTEA_WLAN_DEBUG_OUT_DATA_MSB 19 -#define ADRASTEA_WLAN_DEBUG_OUT_DATA_LSB 0 -#define ADRASTEA_WLAN_DEBUG_OUT_DATA_MASK 0x000fffff -#define ADRASTEA_AMBA_DEBUG_BUS_OFFSET 0x0000011c -#define ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB 13 -#define ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB 8 -#define ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK 0x00003f00 -#define ADRASTEA_AMBA_DEBUG_BUS_SEL_MSB 4 -#define ADRASTEA_AMBA_DEBUG_BUS_SEL_LSB 0 -#define ADRASTEA_AMBA_DEBUG_BUS_SEL_MASK 0x0000001f -#define ADRASTEA_CE_WRAPPER_DEBUG_OFFSET 0x0008 -#define ADRASTEA_CE_WRAPPER_DEBUG_SEL_MSB 4 -#define ADRASTEA_CE_WRAPPER_DEBUG_SEL_LSB 0 -#define ADRASTEA_CE_WRAPPER_DEBUG_SEL_MASK 0x0000001f -#define ADRASTEA_CE_DEBUG_OFFSET 0x0054 -#define ADRASTEA_CE_DEBUG_SEL_MSB 5 -#define ADRASTEA_CE_DEBUG_SEL_LSB 0 -#define ADRASTEA_CE_DEBUG_SEL_MASK 0x0000003f -/* End */ - -/* PLL start */ -#define ADRASTEA_EFUSE_OFFSET 0x0000032c -#define ADRASTEA_EFUSE_XTAL_SEL_MSB 10 -#define ADRASTEA_EFUSE_XTAL_SEL_LSB 8 -#define ADRASTEA_EFUSE_XTAL_SEL_MASK 0x00000700 -#define ADRASTEA_BB_PLL_CONFIG_OFFSET 0x000002f4 -#define ADRASTEA_BB_PLL_CONFIG_OUTDIV_MSB 20 -#define ADRASTEA_BB_PLL_CONFIG_OUTDIV_LSB 18 -#define ADRASTEA_BB_PLL_CONFIG_OUTDIV_MASK 0x001c0000 -#define ADRASTEA_BB_PLL_CONFIG_FRAC_MSB 17 -#define ADRASTEA_BB_PLL_CONFIG_FRAC_LSB 0 -#define ADRASTEA_BB_PLL_CONFIG_FRAC_MASK 0x0003ffff -#define ADRASTEA_WLAN_PLL_SETTLE_TIME_MSB 10 -#define ADRASTEA_WLAN_PLL_SETTLE_TIME_LSB 0 -#define ADRASTEA_WLAN_PLL_SETTLE_TIME_MASK 0x000007ff -#define ADRASTEA_WLAN_PLL_SETTLE_OFFSET 0x0018 -#define ADRASTEA_WLAN_PLL_SETTLE_SW_MASK 0x000007ff -#define ADRASTEA_WLAN_PLL_SETTLE_RSTMASK 0xffffffff -#define ADRASTEA_WLAN_PLL_SETTLE_RESET 0x00000400 -#define ADRASTEA_WLAN_PLL_CONTROL_NOPWD_MSB 18 -#define ADRASTEA_WLAN_PLL_CONTROL_NOPWD_LSB 18 -#define ADRASTEA_WLAN_PLL_CONTROL_NOPWD_MASK 0x00040000 -#define ADRASTEA_WLAN_PLL_CONTROL_BYPASS_MSB 16 -#define ADRASTEA_WLAN_PLL_CONTROL_BYPASS_LSB 16 -#define ADRASTEA_WLAN_PLL_CONTROL_BYPASS_MASK 0x00010000 -#define ADRASTEA_WLAN_PLL_CONTROL_BYPASS_RESET 0x1 -#define ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_MSB 15 -#define ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_LSB 14 -#define ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_MASK 0x0000c000 -#define ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_RESET 0x0 -#define ADRASTEA_WLAN_PLL_CONTROL_REFDIV_MSB 13 -#define ADRASTEA_WLAN_PLL_CONTROL_REFDIV_LSB 10 -#define ADRASTEA_WLAN_PLL_CONTROL_REFDIV_MASK 0x00003c00 -#define ADRASTEA_WLAN_PLL_CONTROL_REFDIV_RESET 0x0 -#define ADRASTEA_WLAN_PLL_CONTROL_DIV_MSB 9 -#define ADRASTEA_WLAN_PLL_CONTROL_DIV_LSB 0 -#define ADRASTEA_WLAN_PLL_CONTROL_DIV_MASK 0x000003ff -#define ADRASTEA_WLAN_PLL_CONTROL_DIV_RESET 0x11 -#define ADRASTEA_WLAN_PLL_CONTROL_OFFSET 0x0014 -#define ADRASTEA_WLAN_PLL_CONTROL_SW_MASK 0x001fffff -#define ADRASTEA_WLAN_PLL_CONTROL_RSTMASK 0xffffffff -#define ADRASTEA_WLAN_PLL_CONTROL_RESET 0x00010011 -#define ADRASTEA_SOC_CORE_CLK_CTRL_OFFSET 0x00000114 -#define ADRASTEA_SOC_CORE_CLK_CTRL_DIV_MSB 2 -#define ADRASTEA_SOC_CORE_CLK_CTRL_DIV_LSB 0 -#define ADRASTEA_SOC_CORE_CLK_CTRL_DIV_MASK 0x00000007 -#define ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_MSB 5 -#define ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_LSB 5 -#define ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_MASK 0x00000020 -#define ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_RESET 0x0 -#define ADRASTEA_RTC_SYNC_STATUS_OFFSET 0x0244 -#define ADRASTEA_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define ADRASTEA_SOC_CPU_CLOCK_STANDARD_MSB 1 -#define ADRASTEA_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define ADRASTEA_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -/* PLL end */ - -#define ADRASTEA_PCIE_INTR_CE_MASK(n) (ADRASTEA_PCIE_INTR_CE0_MASK << (n)) -#define ADRASTEA_DRAM_BASE_ADDRESS ADRASTEA_TARG_DRAM_START -#define ADRASTEA_FW_INDICATOR_ADDRESS \ - (ADRASTEA_WIFICMN_BASE_ADDRESS + ADRASTEA_SCRATCH_3_ADDRESS) -#define ADRASTEA_SYSTEM_SLEEP_OFFSET ADRASTEA_SOC_SYSTEM_SLEEP_OFFSET -#define ADRASTEA_WLAN_SYSTEM_SLEEP_OFFSET (0x002c + _WIFI_RTC_REG_BASE_ADDRESS) -#define ADRASTEA_WLAN_RESET_CONTROL_OFFSET (0x0000 + _WIFI_RTC_REG_BASE_ADDRESS) -#define ADRASTEA_CLOCK_CONTROL_OFFSET ADRASTEA_SOC_CLOCK_CONTROL_OFFSET -#define ADRASTEA_CLOCK_CONTROL_SI0_CLK_MASK \ - ADRASTEA_SOC_CLOCK_CONTROL_SI0_CLK_MASK -#define ADRASTEA_RESET_CONTROL_MBOX_RST_MASK 0x00000004 -#define ADRASTEA_RESET_CONTROL_SI0_RST_MASK \ - ADRASTEA_SOC_RESET_CONTROL_SI0_RST_MASK -#define ADRASTEA_GPIO_BASE_ADDRESS ADRASTEA_WLAN_GPIO_BASE_ADDRESS -#define ADRASTEA_GPIO_PIN0_OFFSET ADRASTEA_WLAN_GPIO_PIN0_ADDRESS -#define ADRASTEA_GPIO_PIN1_OFFSET ADRASTEA_WLAN_GPIO_PIN1_ADDRESS -#define ADRASTEA_GPIO_PIN0_CONFIG_MASK ADRASTEA_WLAN_GPIO_PIN0_CONFIG_MASK -#define ADRASTEA_GPIO_PIN1_CONFIG_MASK ADRASTEA_WLAN_GPIO_PIN1_CONFIG_MASK -#define ADRASTEA_SI_BASE_ADDRESS 0x00000000 -#define ADRASTEA_CPU_CLOCK_OFFSET (0x20 + _RTC_SOC_REG_BASE_ADDRESS) -#define ADRASTEA_LPO_CAL_OFFSET ADRASTEA_SOC_LPO_CAL_OFFSET -#define ADRASTEA_GPIO_PIN10_OFFSET ADRASTEA_WLAN_GPIO_PIN10_ADDRESS -#define ADRASTEA_GPIO_PIN11_OFFSET ADRASTEA_WLAN_GPIO_PIN11_ADDRESS -#define ADRASTEA_GPIO_PIN12_OFFSET ADRASTEA_WLAN_GPIO_PIN12_ADDRESS -#define ADRASTEA_GPIO_PIN13_OFFSET ADRASTEA_WLAN_GPIO_PIN13_ADDRESS -#define ADRASTEA_CPU_CLOCK_STANDARD_LSB 0 -#define ADRASTEA_CPU_CLOCK_STANDARD_MASK 0x1 -#define ADRASTEA_LPO_CAL_ENABLE_LSB ADRASTEA_SOC_LPO_CAL_ENABLE_LSB -#define ADRASTEA_LPO_CAL_ENABLE_MASK ADRASTEA_SOC_LPO_CAL_ENABLE_MASK -#define ADRASTEA_ANALOG_INTF_BASE_ADDRESS ADRASTEA_WLAN_ANALOG_INTF_BASE_ADDRESS -#define ADRASTEA_MBOX_BASE_ADDRESS 0x00008000 -#define ADRASTEA_INT_STATUS_ENABLE_ERROR_LSB MISSING -#define ADRASTEA_INT_STATUS_ENABLE_ERROR_MASK MISSING -#define ADRASTEA_INT_STATUS_ENABLE_CPU_LSB MISSING -#define ADRASTEA_INT_STATUS_ENABLE_CPU_MASK MISSING -#define ADRASTEA_INT_STATUS_ENABLE_COUNTER_LSB MISSING -#define ADRASTEA_INT_STATUS_ENABLE_COUNTER_MASK MISSING -#define ADRASTEA_INT_STATUS_ENABLE_MBOX_DATA_LSB MISSING -#define ADRASTEA_INT_STATUS_ENABLE_MBOX_DATA_MASK MISSING -#define ADRASTEA_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB MISSING -#define ADRASTEA_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK MISSING -#define ADRASTEA_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB MISSING -#define ADRASTEA_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK MISSING -#define ADRASTEA_COUNTER_INT_STATUS_ENABLE_BIT_LSB MISSING -#define ADRASTEA_COUNTER_INT_STATUS_ENABLE_BIT_MASK MISSING -#define ADRASTEA_INT_STATUS_ENABLE_ADDRESS MISSING -#define ADRASTEA_CPU_INT_STATUS_ENABLE_BIT_LSB MISSING -#define ADRASTEA_CPU_INT_STATUS_ENABLE_BIT_MASK MISSING -#define ADRASTEA_HOST_INT_STATUS_ADDRESS MISSING -#define ADRASTEA_CPU_INT_STATUS_ADDRESS MISSING -#define ADRASTEA_ERROR_INT_STATUS_ADDRESS MISSING -#define ADRASTEA_ERROR_INT_STATUS_WAKEUP_MASK MISSING -#define ADRASTEA_ERROR_INT_STATUS_WAKEUP_LSB MISSING -#define ADRASTEA_ERROR_INT_STATUS_RX_UNDERFLOW_MASK MISSING -#define ADRASTEA_ERROR_INT_STATUS_RX_UNDERFLOW_LSB MISSING -#define ADRASTEA_ERROR_INT_STATUS_TX_OVERFLOW_MASK MISSING -#define ADRASTEA_ERROR_INT_STATUS_TX_OVERFLOW_LSB MISSING -#define ADRASTEA_COUNT_DEC_ADDRESS MISSING -#define ADRASTEA_HOST_INT_STATUS_CPU_MASK MISSING -#define ADRASTEA_HOST_INT_STATUS_CPU_LSB MISSING -#define ADRASTEA_HOST_INT_STATUS_ERROR_MASK MISSING -#define ADRASTEA_HOST_INT_STATUS_ERROR_LSB MISSING -#define ADRASTEA_HOST_INT_STATUS_COUNTER_MASK MISSING -#define ADRASTEA_HOST_INT_STATUS_COUNTER_LSB MISSING -#define ADRASTEA_RX_LOOKAHEAD_VALID_ADDRESS MISSING -#define ADRASTEA_WINDOW_DATA_ADDRESS MISSING -#define ADRASTEA_WINDOW_READ_ADDR_ADDRESS MISSING -#define ADRASTEA_WINDOW_WRITE_ADDR_ADDRESS MISSING - -/* Shadow Registers - Start */ -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_0 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE0 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_1 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE1 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_2 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE2 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_3 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE3 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_4 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE4 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_5 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE5 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_6 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE6 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_7 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE7 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_8 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE8 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_9 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE9 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_10 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE10 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_11 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE11 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_12 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE12 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_13 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE13 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_14 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE14 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_15 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE15 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_16 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE16 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_17 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE17 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_18 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE18 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_19 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE19 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_20 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE20 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_21 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE21 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_22 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE22 -#define ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_23 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_VALUE23 - -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_0 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS0 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_1 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS1 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_2 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS2 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_3 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS3 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_4 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS4 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_5 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS5 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_6 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS6 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_7 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS7 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_8 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS8 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_9 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS9 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_10 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS10 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_11 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS11 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_12 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS12 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_13 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS13 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_14 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS14 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_15 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS15 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_16 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS16 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_17 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS17 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_18 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS18 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_19 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS19 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_20 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS20 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_21 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS21 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_22 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS22 -#define ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_23 \ - ADRASTEA_A_WCSS_SR_APSS_SHADOW_ADDRESS23 - -/* Q6 iHelium emulation registers */ -#define ADRASTEA_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1 0x00113018 -#define ADRASTEA_A_SOC_CORE_SPARE_1_REGISTER 0x00113184 -#define ADRASTEA_A_SOC_CORE_PCIE_INTR_CLR_GRP1 0x00113020 -#define ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1 0x00113010 -#define ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_0 0x00130040 -#define ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_1 0x00130044 - -#define ADRASTEA_HOST_ENABLE_REGISTER 0x00188000 -#define ADRASTEA_Q6_ENABLE_REGISTER_0 0x00188004 -#define ADRASTEA_Q6_ENABLE_REGISTER_1 0x00188008 -#define ADRASTEA_HOST_CAUSE_REGISTER 0x0018800c -#define ADRASTEA_Q6_CAUSE_REGISTER_0 0x00188010 -#define ADRASTEA_Q6_CAUSE_REGISTER_1 0x00188014 -#define ADRASTEA_HOST_CLEAR_REGISTER 0x00188018 -#define ADRASTEA_Q6_CLEAR_REGISTER_0 0x0018801c -#define ADRASTEA_Q6_CLEAR_REGISTER_1 0x00188020 - -#define ADRASTEA_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA 0x08 -#define ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_2 0x0013005C -#define ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK 0x0 -/* end: Q6 iHelium emulation registers */ - -struct targetdef_s adrastea_targetdef = { - .d_RTC_SOC_BASE_ADDRESS = ADRASTEA_RTC_SOC_BASE_ADDRESS, - .d_RTC_WMAC_BASE_ADDRESS = ADRASTEA_RTC_WMAC_BASE_ADDRESS, - .d_SYSTEM_SLEEP_OFFSET = ADRASTEA_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_OFFSET = ADRASTEA_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_DISABLE_LSB = - ADRASTEA_WLAN_SYSTEM_SLEEP_DISABLE_LSB, - .d_WLAN_SYSTEM_SLEEP_DISABLE_MASK = - ADRASTEA_WLAN_SYSTEM_SLEEP_DISABLE_MASK, - .d_CLOCK_CONTROL_OFFSET = ADRASTEA_CLOCK_CONTROL_OFFSET, - .d_CLOCK_CONTROL_SI0_CLK_MASK = ADRASTEA_CLOCK_CONTROL_SI0_CLK_MASK, - .d_RESET_CONTROL_OFFSET = ADRASTEA_SOC_RESET_CONTROL_OFFSET, - .d_RESET_CONTROL_MBOX_RST_MASK = ADRASTEA_RESET_CONTROL_MBOX_RST_MASK, - .d_RESET_CONTROL_SI0_RST_MASK = ADRASTEA_RESET_CONTROL_SI0_RST_MASK, - .d_WLAN_RESET_CONTROL_OFFSET = ADRASTEA_WLAN_RESET_CONTROL_OFFSET, - .d_WLAN_RESET_CONTROL_COLD_RST_MASK = - ADRASTEA_WLAN_RESET_CONTROL_COLD_RST_MASK, - .d_WLAN_RESET_CONTROL_WARM_RST_MASK = - ADRASTEA_WLAN_RESET_CONTROL_WARM_RST_MASK, - .d_GPIO_BASE_ADDRESS = ADRASTEA_GPIO_BASE_ADDRESS, - .d_GPIO_PIN0_OFFSET = ADRASTEA_GPIO_PIN0_OFFSET, - .d_GPIO_PIN1_OFFSET = ADRASTEA_GPIO_PIN1_OFFSET, - .d_GPIO_PIN0_CONFIG_MASK = ADRASTEA_GPIO_PIN0_CONFIG_MASK, - .d_GPIO_PIN1_CONFIG_MASK = ADRASTEA_GPIO_PIN1_CONFIG_MASK, - .d_SI_CONFIG_BIDIR_OD_DATA_LSB = ADRASTEA_SI_CONFIG_BIDIR_OD_DATA_LSB, - .d_SI_CONFIG_BIDIR_OD_DATA_MASK = ADRASTEA_SI_CONFIG_BIDIR_OD_DATA_MASK, - .d_SI_CONFIG_I2C_LSB = ADRASTEA_SI_CONFIG_I2C_LSB, - .d_SI_CONFIG_I2C_MASK = ADRASTEA_SI_CONFIG_I2C_MASK, - .d_SI_CONFIG_POS_SAMPLE_LSB = ADRASTEA_SI_CONFIG_POS_SAMPLE_LSB, - .d_SI_CONFIG_POS_SAMPLE_MASK = ADRASTEA_SI_CONFIG_POS_SAMPLE_MASK, - .d_SI_CONFIG_INACTIVE_CLK_LSB = ADRASTEA_SI_CONFIG_INACTIVE_CLK_LSB, - .d_SI_CONFIG_INACTIVE_CLK_MASK = ADRASTEA_SI_CONFIG_INACTIVE_CLK_MASK, - .d_SI_CONFIG_INACTIVE_DATA_LSB = ADRASTEA_SI_CONFIG_INACTIVE_DATA_LSB, - .d_SI_CONFIG_INACTIVE_DATA_MASK = ADRASTEA_SI_CONFIG_INACTIVE_DATA_MASK, - .d_SI_CONFIG_DIVIDER_LSB = ADRASTEA_SI_CONFIG_DIVIDER_LSB, - .d_SI_CONFIG_DIVIDER_MASK = ADRASTEA_SI_CONFIG_DIVIDER_MASK, - .d_SI_BASE_ADDRESS = ADRASTEA_SI_BASE_ADDRESS, - .d_SI_CONFIG_OFFSET = ADRASTEA_SI_CONFIG_OFFSET, - .d_SI_TX_DATA0_OFFSET = ADRASTEA_SI_TX_DATA0_OFFSET, - .d_SI_TX_DATA1_OFFSET = ADRASTEA_SI_TX_DATA1_OFFSET, - .d_SI_RX_DATA0_OFFSET = ADRASTEA_SI_RX_DATA0_OFFSET, - .d_SI_RX_DATA1_OFFSET = ADRASTEA_SI_RX_DATA1_OFFSET, - .d_SI_CS_OFFSET = ADRASTEA_SI_CS_OFFSET, - .d_SI_CS_DONE_ERR_MASK = ADRASTEA_SI_CS_DONE_ERR_MASK, - .d_SI_CS_DONE_INT_MASK = ADRASTEA_SI_CS_DONE_INT_MASK, - .d_SI_CS_START_LSB = ADRASTEA_SI_CS_START_LSB, - .d_SI_CS_START_MASK = ADRASTEA_SI_CS_START_MASK, - .d_SI_CS_RX_CNT_LSB = ADRASTEA_SI_CS_RX_CNT_LSB, - .d_SI_CS_RX_CNT_MASK = ADRASTEA_SI_CS_RX_CNT_MASK, - .d_SI_CS_TX_CNT_LSB = ADRASTEA_SI_CS_TX_CNT_LSB, - .d_SI_CS_TX_CNT_MASK = ADRASTEA_SI_CS_TX_CNT_MASK, - .d_BOARD_DATA_SZ = ADRASTEA_BOARD_DATA_SZ, - .d_BOARD_EXT_DATA_SZ = ADRASTEA_BOARD_EXT_DATA_SZ, - .d_MBOX_BASE_ADDRESS = ADRASTEA_MBOX_BASE_ADDRESS, - .d_LOCAL_SCRATCH_OFFSET = ADRASTEA_LOCAL_SCRATCH_OFFSET, - .d_CPU_CLOCK_OFFSET = ADRASTEA_CPU_CLOCK_OFFSET, - .d_LPO_CAL_OFFSET = ADRASTEA_LPO_CAL_OFFSET, - .d_GPIO_PIN10_OFFSET = ADRASTEA_GPIO_PIN10_OFFSET, - .d_GPIO_PIN11_OFFSET = ADRASTEA_GPIO_PIN11_OFFSET, - .d_GPIO_PIN12_OFFSET = ADRASTEA_GPIO_PIN12_OFFSET, - .d_GPIO_PIN13_OFFSET = ADRASTEA_GPIO_PIN13_OFFSET, - .d_CLOCK_GPIO_OFFSET = ADRASTEA_CLOCK_GPIO_OFFSET, - .d_CPU_CLOCK_STANDARD_LSB = ADRASTEA_CPU_CLOCK_STANDARD_LSB, - .d_CPU_CLOCK_STANDARD_MASK = ADRASTEA_CPU_CLOCK_STANDARD_MASK, - .d_LPO_CAL_ENABLE_LSB = ADRASTEA_LPO_CAL_ENABLE_LSB, - .d_LPO_CAL_ENABLE_MASK = ADRASTEA_LPO_CAL_ENABLE_MASK, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB = ADRASTEA_CLOCK_GPIO_BT_CLK_OUT_EN_LSB, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK = - ADRASTEA_CLOCK_GPIO_BT_CLK_OUT_EN_MASK, - .d_ANALOG_INTF_BASE_ADDRESS = ADRASTEA_ANALOG_INTF_BASE_ADDRESS, - .d_WLAN_MAC_BASE_ADDRESS = ADRASTEA_WLAN_MAC_BASE_ADDRESS, - .d_FW_INDICATOR_ADDRESS = ADRASTEA_FW_INDICATOR_ADDRESS, - .d_DRAM_BASE_ADDRESS = ADRASTEA_DRAM_BASE_ADDRESS, - .d_SOC_CORE_BASE_ADDRESS = ADRASTEA_SOC_CORE_BASE_ADDRESS, - .d_CORE_CTRL_ADDRESS = ADRASTEA_CORE_CTRL_ADDRESS, - .d_CE_COUNT = ADRASTEA_CE_COUNT, - .d_MSI_NUM_REQUEST = MSI_NUM_REQUEST, - .d_MSI_ASSIGN_FW = MSI_ASSIGN_FW, - .d_MSI_ASSIGN_CE_INITIAL = MSI_ASSIGN_CE_INITIAL, - .d_PCIE_INTR_ENABLE_ADDRESS = ADRASTEA_HOST_ENABLE_REGISTER, - .d_PCIE_INTR_CLR_ADDRESS = ADRASTEA_HOST_CLEAR_REGISTER, - .d_PCIE_INTR_FIRMWARE_MASK = ADRASTEA_PCIE_INTR_FIRMWARE_MASK, - .d_PCIE_INTR_CE_MASK_ALL = ADRASTEA_PCIE_INTR_CE_MASK_ALL, - .d_CORE_CTRL_CPU_INTR_MASK = ADRASTEA_CORE_CTRL_CPU_INTR_MASK, - .d_SR_WR_INDEX_ADDRESS = ADRASTEA_SR_WR_INDEX_OFFSET, - .d_DST_WATERMARK_ADDRESS = ADRASTEA_DST_WATERMARK_OFFSET, - /* htt_rx.c */ - .d_RX_MSDU_END_4_FIRST_MSDU_MASK = - ADRASTEA_RX_MSDU_END_4_FIRST_MSDU_MASK, - .d_RX_MSDU_END_4_FIRST_MSDU_LSB = ADRASTEA_RX_MSDU_END_4_FIRST_MSDU_LSB, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = ADRASTEA_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_LSB = ADRASTEA_RX_MPDU_START_0_SEQ_NUM_LSB, - .d_RX_MPDU_START_2_PN_47_32_LSB = ADRASTEA_RX_MPDU_START_2_PN_47_32_LSB, - .d_RX_MPDU_START_2_PN_47_32_MASK = - ADRASTEA_RX_MPDU_START_2_PN_47_32_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK = - ADRASTEA_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB = - ADRASTEA_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB, - .d_RX_MSDU_END_4_LAST_MSDU_MASK = ADRASTEA_RX_MSDU_END_4_LAST_MSDU_MASK, - .d_RX_MSDU_END_4_LAST_MSDU_LSB = ADRASTEA_RX_MSDU_END_4_LAST_MSDU_LSB, - .d_RX_ATTENTION_0_MCAST_BCAST_MASK = - ADRASTEA_RX_ATTENTION_0_MCAST_BCAST_MASK, - .d_RX_ATTENTION_0_MCAST_BCAST_LSB = - ADRASTEA_RX_ATTENTION_0_MCAST_BCAST_LSB, - .d_RX_ATTENTION_0_FRAGMENT_MASK = ADRASTEA_RX_ATTENTION_0_FRAGMENT_MASK, - .d_RX_ATTENTION_0_FRAGMENT_LSB = ADRASTEA_RX_ATTENTION_0_FRAGMENT_LSB, - .d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK = - ADRASTEA_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK = - ADRASTEA_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB = - ADRASTEA_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB, - .d_RX_MSDU_START_0_MSDU_LENGTH_MASK = - ADRASTEA_RX_MSDU_START_0_MSDU_LENGTH_MASK, - .d_RX_MSDU_START_0_MSDU_LENGTH_LSB = - ADRASTEA_RX_MSDU_START_0_MSDU_LENGTH_LSB, - .d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET = - ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_OFFSET, - .d_RX_MSDU_START_2_DECAP_FORMAT_MASK = - ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_MASK, - .d_RX_MSDU_START_2_DECAP_FORMAT_LSB = - ADRASTEA_RX_MSDU_START_2_DECAP_FORMAT_LSB, - .d_RX_MPDU_START_0_ENCRYPTED_MASK = - ADRASTEA_RX_MPDU_START_0_ENCRYPTED_MASK, - .d_RX_MPDU_START_0_ENCRYPTED_LSB = - ADRASTEA_RX_MPDU_START_0_ENCRYPTED_LSB, - .d_RX_ATTENTION_0_MORE_DATA_MASK = - ADRASTEA_RX_ATTENTION_0_MORE_DATA_MASK, - .d_RX_ATTENTION_0_MSDU_DONE_MASK = - ADRASTEA_RX_ATTENTION_0_MSDU_DONE_MASK, - .d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK = - ADRASTEA_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK, - - /* PLL start */ - .d_EFUSE_OFFSET = ADRASTEA_EFUSE_OFFSET, - .d_EFUSE_XTAL_SEL_MSB = ADRASTEA_EFUSE_XTAL_SEL_MSB, - .d_EFUSE_XTAL_SEL_LSB = ADRASTEA_EFUSE_XTAL_SEL_LSB, - .d_EFUSE_XTAL_SEL_MASK = ADRASTEA_EFUSE_XTAL_SEL_MASK, - .d_BB_PLL_CONFIG_OFFSET = ADRASTEA_BB_PLL_CONFIG_OFFSET, - .d_BB_PLL_CONFIG_OUTDIV_MSB = ADRASTEA_BB_PLL_CONFIG_OUTDIV_MSB, - .d_BB_PLL_CONFIG_OUTDIV_LSB = ADRASTEA_BB_PLL_CONFIG_OUTDIV_LSB, - .d_BB_PLL_CONFIG_OUTDIV_MASK = ADRASTEA_BB_PLL_CONFIG_OUTDIV_MASK, - .d_BB_PLL_CONFIG_FRAC_MSB = ADRASTEA_BB_PLL_CONFIG_FRAC_MSB, - .d_BB_PLL_CONFIG_FRAC_LSB = ADRASTEA_BB_PLL_CONFIG_FRAC_LSB, - .d_BB_PLL_CONFIG_FRAC_MASK = ADRASTEA_BB_PLL_CONFIG_FRAC_MASK, - .d_WLAN_PLL_SETTLE_TIME_MSB = ADRASTEA_WLAN_PLL_SETTLE_TIME_MSB, - .d_WLAN_PLL_SETTLE_TIME_LSB = ADRASTEA_WLAN_PLL_SETTLE_TIME_LSB, - .d_WLAN_PLL_SETTLE_TIME_MASK = ADRASTEA_WLAN_PLL_SETTLE_TIME_MASK, - .d_WLAN_PLL_SETTLE_OFFSET = ADRASTEA_WLAN_PLL_SETTLE_OFFSET, - .d_WLAN_PLL_SETTLE_SW_MASK = ADRASTEA_WLAN_PLL_SETTLE_SW_MASK, - .d_WLAN_PLL_SETTLE_RSTMASK = ADRASTEA_WLAN_PLL_SETTLE_RSTMASK, - .d_WLAN_PLL_SETTLE_RESET = ADRASTEA_WLAN_PLL_SETTLE_RESET, - .d_WLAN_PLL_CONTROL_NOPWD_MSB = ADRASTEA_WLAN_PLL_CONTROL_NOPWD_MSB, - .d_WLAN_PLL_CONTROL_NOPWD_LSB = ADRASTEA_WLAN_PLL_CONTROL_NOPWD_LSB, - .d_WLAN_PLL_CONTROL_NOPWD_MASK = ADRASTEA_WLAN_PLL_CONTROL_NOPWD_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_MSB = ADRASTEA_WLAN_PLL_CONTROL_BYPASS_MSB, - .d_WLAN_PLL_CONTROL_BYPASS_LSB = ADRASTEA_WLAN_PLL_CONTROL_BYPASS_LSB, - .d_WLAN_PLL_CONTROL_BYPASS_MASK = ADRASTEA_WLAN_PLL_CONTROL_BYPASS_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_RESET = - ADRASTEA_WLAN_PLL_CONTROL_BYPASS_RESET, - .d_WLAN_PLL_CONTROL_CLK_SEL_MSB = ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_MSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_LSB = ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_LSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_MASK = - ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_MASK, - .d_WLAN_PLL_CONTROL_CLK_SEL_RESET = - ADRASTEA_WLAN_PLL_CONTROL_CLK_SEL_RESET, - .d_WLAN_PLL_CONTROL_REFDIV_MSB = ADRASTEA_WLAN_PLL_CONTROL_REFDIV_MSB, - .d_WLAN_PLL_CONTROL_REFDIV_LSB = ADRASTEA_WLAN_PLL_CONTROL_REFDIV_LSB, - .d_WLAN_PLL_CONTROL_REFDIV_MASK = ADRASTEA_WLAN_PLL_CONTROL_REFDIV_MASK, - .d_WLAN_PLL_CONTROL_REFDIV_RESET = - ADRASTEA_WLAN_PLL_CONTROL_REFDIV_RESET, - .d_WLAN_PLL_CONTROL_DIV_MSB = ADRASTEA_WLAN_PLL_CONTROL_DIV_MSB, - .d_WLAN_PLL_CONTROL_DIV_LSB = ADRASTEA_WLAN_PLL_CONTROL_DIV_LSB, - .d_WLAN_PLL_CONTROL_DIV_MASK = ADRASTEA_WLAN_PLL_CONTROL_DIV_MASK, - .d_WLAN_PLL_CONTROL_DIV_RESET = ADRASTEA_WLAN_PLL_CONTROL_DIV_RESET, - .d_WLAN_PLL_CONTROL_OFFSET = ADRASTEA_WLAN_PLL_CONTROL_OFFSET, - .d_WLAN_PLL_CONTROL_SW_MASK = ADRASTEA_WLAN_PLL_CONTROL_SW_MASK, - .d_WLAN_PLL_CONTROL_RSTMASK = ADRASTEA_WLAN_PLL_CONTROL_RSTMASK, - .d_WLAN_PLL_CONTROL_RESET = ADRASTEA_WLAN_PLL_CONTROL_RESET, - .d_SOC_CORE_CLK_CTRL_OFFSET = ADRASTEA_SOC_CORE_CLK_CTRL_OFFSET, - .d_SOC_CORE_CLK_CTRL_DIV_MSB = ADRASTEA_SOC_CORE_CLK_CTRL_DIV_MSB, - .d_SOC_CORE_CLK_CTRL_DIV_LSB = ADRASTEA_SOC_CORE_CLK_CTRL_DIV_LSB, - .d_SOC_CORE_CLK_CTRL_DIV_MASK = ADRASTEA_SOC_CORE_CLK_CTRL_DIV_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MSB = - ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_MSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_LSB = - ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_LSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MASK = - ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_RESET = - ADRASTEA_RTC_SYNC_STATUS_PLL_CHANGING_RESET, - .d_RTC_SYNC_STATUS_OFFSET = ADRASTEA_RTC_SYNC_STATUS_OFFSET, - .d_SOC_CPU_CLOCK_OFFSET = ADRASTEA_SOC_CPU_CLOCK_OFFSET, - .d_SOC_CPU_CLOCK_STANDARD_MSB = ADRASTEA_SOC_CPU_CLOCK_STANDARD_MSB, - .d_SOC_CPU_CLOCK_STANDARD_LSB = ADRASTEA_SOC_CPU_CLOCK_STANDARD_LSB, - .d_SOC_CPU_CLOCK_STANDARD_MASK = ADRASTEA_SOC_CPU_CLOCK_STANDARD_MASK, - /* PLL end */ - .d_SOC_POWER_REG_OFFSET = ADRASTEA_SOC_POWER_REG_OFFSET, - .d_PCIE_INTR_CAUSE_ADDRESS = ADRASTEA_HOST_CAUSE_REGISTER, - .d_SOC_RESET_CONTROL_ADDRESS = ADRASTEA_SOC_RESET_CONTROL_ADDRESS, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK = - ADRASTEA_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB = - ADRASTEA_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB, - .d_SOC_RESET_CONTROL_CE_RST_MASK = - ADRASTEA_SOC_RESET_CONTROL_CE_RST_MASK, - .d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK = - ADRASTEA_SOC_RESET_CONTROL_CPU_WARM_RST_MASK, - .d_CPU_INTR_ADDRESS = ADRASTEA_CPU_INTR_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ADDRESS = - ADRASTEA_SOC_LF_TIMER_CONTROL0_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK = - ADRASTEA_SOC_LF_TIMER_CONTROL0_ENABLE_MASK, - /* chip id start */ - .d_SOC_CHIP_ID_ADDRESS = ADRASTEA_SOC_CHIP_ID_ADDRESS, - .d_SOC_CHIP_ID_VERSION_MASK = ADRASTEA_SOC_CHIP_ID_VERSION_MASK, - .d_SOC_CHIP_ID_VERSION_LSB = ADRASTEA_SOC_CHIP_ID_VERSION_LSB, - .d_SOC_CHIP_ID_REVISION_MASK = ADRASTEA_SOC_CHIP_ID_REVISION_MASK, - .d_SOC_CHIP_ID_REVISION_LSB = ADRASTEA_SOC_CHIP_ID_REVISION_LSB, - /* chip id end */ - .d_A_SOC_CORE_SCRATCH_0_ADDRESS = ADRASTEA_A_SOC_CORE_SCRATCH_0_ADDRESS, - .d_A_SOC_CORE_SPARE_0_REGISTER = ADRASTEA_A_SOC_CORE_SPARE_0_REGISTER, - .d_PCIE_INTR_FIRMWARE_ROUTE_MASK = - ADRASTEA_PCIE_INTR_FIRMWARE_ROUTE_MASK, - .d_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1 = - ADRASTEA_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1, - .d_A_SOC_CORE_SPARE_1_REGISTER = - ADRASTEA_A_SOC_CORE_SPARE_1_REGISTER, - .d_A_SOC_CORE_PCIE_INTR_CLR_GRP1 = - ADRASTEA_A_SOC_CORE_PCIE_INTR_CLR_GRP1, - .d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1 = - ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1, - .d_A_SOC_PCIE_PCIE_SCRATCH_0 = ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_0, - .d_A_SOC_PCIE_PCIE_SCRATCH_1 = ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_1, - .d_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA = - ADRASTEA_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA, - .d_A_SOC_PCIE_PCIE_SCRATCH_2 = ADRASTEA_A_SOC_PCIE_PCIE_SCRATCH_2, - .d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK = - ADRASTEA_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK, - .d_WLAN_DEBUG_INPUT_SEL_OFFSET = ADRASTEA_WLAN_DEBUG_INPUT_SEL_OFFSET, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MSB = ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_MSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_LSB = ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_LSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MASK = - ADRASTEA_WLAN_DEBUG_INPUT_SEL_SRC_MASK, - .d_WLAN_DEBUG_CONTROL_OFFSET = ADRASTEA_WLAN_DEBUG_CONTROL_OFFSET, - .d_WLAN_DEBUG_CONTROL_ENABLE_MSB = - ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_MSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_LSB = - ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_LSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_MASK = - ADRASTEA_WLAN_DEBUG_CONTROL_ENABLE_MASK, - .d_WLAN_DEBUG_OUT_OFFSET = ADRASTEA_WLAN_DEBUG_OUT_OFFSET, - .d_WLAN_DEBUG_OUT_DATA_MSB = ADRASTEA_WLAN_DEBUG_OUT_DATA_MSB, - .d_WLAN_DEBUG_OUT_DATA_LSB = ADRASTEA_WLAN_DEBUG_OUT_DATA_LSB, - .d_WLAN_DEBUG_OUT_DATA_MASK = ADRASTEA_WLAN_DEBUG_OUT_DATA_MASK, - .d_AMBA_DEBUG_BUS_OFFSET = ADRASTEA_AMBA_DEBUG_BUS_OFFSET, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB = - ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB = - ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK = - ADRASTEA_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK, - .d_AMBA_DEBUG_BUS_SEL_MSB = ADRASTEA_AMBA_DEBUG_BUS_SEL_MSB, - .d_AMBA_DEBUG_BUS_SEL_LSB = ADRASTEA_AMBA_DEBUG_BUS_SEL_LSB, - .d_AMBA_DEBUG_BUS_SEL_MASK = ADRASTEA_AMBA_DEBUG_BUS_SEL_MASK, - -#ifdef QCA_WIFI_3_0_ADRASTEA - .d_Q6_ENABLE_REGISTER_0 = ADRASTEA_Q6_ENABLE_REGISTER_0, - .d_Q6_ENABLE_REGISTER_1 = ADRASTEA_Q6_ENABLE_REGISTER_1, - .d_Q6_CAUSE_REGISTER_0 = ADRASTEA_Q6_CAUSE_REGISTER_0, - .d_Q6_CAUSE_REGISTER_1 = ADRASTEA_Q6_CAUSE_REGISTER_1, - .d_Q6_CLEAR_REGISTER_0 = ADRASTEA_Q6_CLEAR_REGISTER_0, - .d_Q6_CLEAR_REGISTER_1 = ADRASTEA_Q6_CLEAR_REGISTER_1, -#endif -}; - -struct hostdef_s adrastea_hostdef = { - .d_INT_STATUS_ENABLE_ERROR_LSB = ADRASTEA_INT_STATUS_ENABLE_ERROR_LSB, - .d_INT_STATUS_ENABLE_ERROR_MASK = ADRASTEA_INT_STATUS_ENABLE_ERROR_MASK, - .d_INT_STATUS_ENABLE_CPU_LSB = ADRASTEA_INT_STATUS_ENABLE_CPU_LSB, - .d_INT_STATUS_ENABLE_CPU_MASK = ADRASTEA_INT_STATUS_ENABLE_CPU_MASK, - .d_INT_STATUS_ENABLE_COUNTER_LSB = - ADRASTEA_INT_STATUS_ENABLE_COUNTER_LSB, - .d_INT_STATUS_ENABLE_COUNTER_MASK = - ADRASTEA_INT_STATUS_ENABLE_COUNTER_MASK, - .d_INT_STATUS_ENABLE_MBOX_DATA_LSB = - ADRASTEA_INT_STATUS_ENABLE_MBOX_DATA_LSB, - .d_INT_STATUS_ENABLE_MBOX_DATA_MASK = - ADRASTEA_INT_STATUS_ENABLE_MBOX_DATA_MASK, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB = - ADRASTEA_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK = - ADRASTEA_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB = - ADRASTEA_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK = - ADRASTEA_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK, - .d_COUNTER_INT_STATUS_ENABLE_BIT_LSB = - ADRASTEA_COUNTER_INT_STATUS_ENABLE_BIT_LSB, - .d_COUNTER_INT_STATUS_ENABLE_BIT_MASK = - ADRASTEA_COUNTER_INT_STATUS_ENABLE_BIT_MASK, - .d_INT_STATUS_ENABLE_ADDRESS = ADRASTEA_INT_STATUS_ENABLE_ADDRESS, - .d_CPU_INT_STATUS_ENABLE_BIT_LSB = - ADRASTEA_CPU_INT_STATUS_ENABLE_BIT_LSB, - .d_CPU_INT_STATUS_ENABLE_BIT_MASK = - ADRASTEA_CPU_INT_STATUS_ENABLE_BIT_MASK, - .d_HOST_INT_STATUS_ADDRESS = ADRASTEA_HOST_INT_STATUS_ADDRESS, - .d_CPU_INT_STATUS_ADDRESS = ADRASTEA_CPU_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_ADDRESS = ADRASTEA_ERROR_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_WAKEUP_MASK = ADRASTEA_ERROR_INT_STATUS_WAKEUP_MASK, - .d_ERROR_INT_STATUS_WAKEUP_LSB = ADRASTEA_ERROR_INT_STATUS_WAKEUP_LSB, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK = - ADRASTEA_ERROR_INT_STATUS_RX_UNDERFLOW_MASK, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB = - ADRASTEA_ERROR_INT_STATUS_RX_UNDERFLOW_LSB, - .d_ERROR_INT_STATUS_TX_OVERFLOW_MASK = - ADRASTEA_ERROR_INT_STATUS_TX_OVERFLOW_MASK, - .d_ERROR_INT_STATUS_TX_OVERFLOW_LSB = - ADRASTEA_ERROR_INT_STATUS_TX_OVERFLOW_LSB, - .d_COUNT_DEC_ADDRESS = ADRASTEA_COUNT_DEC_ADDRESS, - .d_HOST_INT_STATUS_CPU_MASK = ADRASTEA_HOST_INT_STATUS_CPU_MASK, - .d_HOST_INT_STATUS_CPU_LSB = ADRASTEA_HOST_INT_STATUS_CPU_LSB, - .d_HOST_INT_STATUS_ERROR_MASK = ADRASTEA_HOST_INT_STATUS_ERROR_MASK, - .d_HOST_INT_STATUS_ERROR_LSB = ADRASTEA_HOST_INT_STATUS_ERROR_LSB, - .d_HOST_INT_STATUS_COUNTER_MASK = ADRASTEA_HOST_INT_STATUS_COUNTER_MASK, - .d_HOST_INT_STATUS_COUNTER_LSB = ADRASTEA_HOST_INT_STATUS_COUNTER_LSB, - .d_RX_LOOKAHEAD_VALID_ADDRESS = ADRASTEA_RX_LOOKAHEAD_VALID_ADDRESS, - .d_WINDOW_DATA_ADDRESS = ADRASTEA_WINDOW_DATA_ADDRESS, - .d_WINDOW_READ_ADDR_ADDRESS = ADRASTEA_WINDOW_READ_ADDR_ADDRESS, - .d_WINDOW_WRITE_ADDR_ADDRESS = ADRASTEA_WINDOW_WRITE_ADDR_ADDRESS, - .d_SOC_GLOBAL_RESET_ADDRESS = ADRASTEA_SOC_GLOBAL_RESET_ADDRESS, - .d_RTC_STATE_ADDRESS = ADRASTEA_RTC_STATE_ADDRESS, - .d_RTC_STATE_COLD_RESET_MASK = ADRASTEA_RTC_STATE_COLD_RESET_MASK, - .d_PCIE_LOCAL_BASE_ADDRESS = ADRASTEA_PCIE_LOCAL_BASE_ADDRESS, - .d_PCIE_SOC_WAKE_RESET = ADRASTEA_PCIE_SOC_WAKE_RESET, - .d_PCIE_SOC_WAKE_ADDRESS = ADRASTEA_PCIE_SOC_WAKE_ADDRESS, - .d_PCIE_SOC_WAKE_V_MASK = ADRASTEA_PCIE_SOC_WAKE_V_MASK, - .d_RTC_STATE_V_MASK = ADRASTEA_RTC_STATE_V_MASK, - .d_RTC_STATE_V_LSB = ADRASTEA_RTC_STATE_V_LSB, - .d_FW_IND_EVENT_PENDING = ADRASTEA_FW_IND_EVENT_PENDING, - .d_FW_IND_INITIALIZED = ADRASTEA_FW_IND_INITIALIZED, - .d_FW_IND_HELPER = ADRASTEA_FW_IND_HELPER, - .d_RTC_STATE_V_ON = ADRASTEA_RTC_STATE_V_ON, -#if defined(SDIO_3_0) - .d_HOST_INT_STATUS_MBOX_DATA_MASK = - ADRASTEA_HOST_INT_STATUS_MBOX_DATA_MASK, - .d_HOST_INT_STATUS_MBOX_DATA_LSB = - ADRASTEA_HOST_INT_STATUS_MBOX_DATA_LSB, -#endif - .d_PCIE_SOC_RDY_STATUS_ADDRESS = PCIE_SOC_RDY_STATUS_ADDRESS, - .d_PCIE_SOC_RDY_STATUS_BAR_MASK = PCIE_SOC_RDY_STATUS_BAR_MASK, - .d_SOC_PCIE_BASE_ADDRESS = SOC_PCIE_BASE_ADDRESS, - .d_MSI_MAGIC_ADR_ADDRESS = MSI_MAGIC_ADR_ADDRESS, - .d_MSI_MAGIC_ADDRESS = MSI_MAGIC_ADDRESS, - .d_HOST_CE_COUNT = ADRASTEA_CE_COUNT, - .d_ENABLE_MSI = 0, - .d_MUX_ID_MASK = 0xf000, - .d_TRANSACTION_ID_MASK = 0x0fff, - .d_DESC_DATA_FLAG_MASK = 0x1FFFE3E0, - .d_A_SOC_PCIE_PCIE_BAR0_START = ADRASTEA_A_SOC_PCIE_PCIE_BAR0_START, -}; - - -struct ce_reg_def adrastea_ce_targetdef = { - /* copy_engine.c */ - .d_DST_WR_INDEX_ADDRESS = ADRASTEA_DST_WR_INDEX_OFFSET, - .d_SRC_WATERMARK_ADDRESS = ADRASTEA_SRC_WATERMARK_OFFSET, - .d_SRC_WATERMARK_LOW_MASK = ADRASTEA_SRC_WATERMARK_LOW_MASK, - .d_SRC_WATERMARK_HIGH_MASK = ADRASTEA_SRC_WATERMARK_HIGH_MASK, - .d_DST_WATERMARK_LOW_MASK = ADRASTEA_DST_WATERMARK_LOW_MASK, - .d_DST_WATERMARK_HIGH_MASK = ADRASTEA_DST_WATERMARK_HIGH_MASK, - .d_CURRENT_SRRI_ADDRESS = ADRASTEA_CURRENT_SRRI_OFFSET, - .d_CURRENT_DRRI_ADDRESS = ADRASTEA_CURRENT_DRRI_OFFSET, - .d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK = - ADRASTEA_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK = - ADRASTEA_HOST_IS_SRC_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK = - ADRASTEA_HOST_IS_DST_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_DST_RING_LOW_WATERMARK_MASK = - ADRASTEA_HOST_IS_DST_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_ADDRESS = ADRASTEA_HOST_IS_OFFSET, - .d_MISC_IS_ADDRESS = ADRASTEA_MISC_IS_OFFSET, - .d_HOST_IS_COPY_COMPLETE_MASK = ADRASTEA_HOST_IS_COPY_COMPLETE_MASK, - .d_CE_WRAPPER_BASE_ADDRESS = ADRASTEA_CE_WRAPPER_BASE_ADDRESS, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS = - ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS_OFFSET, - .d_CE_DDR_ADDRESS_FOR_RRI_LOW = - ADRASTEA_CE_DDR_ADDRESS_FOR_RRI_LOW, - .d_CE_DDR_ADDRESS_FOR_RRI_HIGH = - ADRASTEA_CE_DDR_ADDRESS_FOR_RRI_HIGH, - .d_HOST_IE_ADDRESS = ADRASTEA_HOST_IE_OFFSET, - .d_HOST_IE_COPY_COMPLETE_MASK = ADRASTEA_HOST_IE_COPY_COMPLETE_MASK, - .d_SR_BA_ADDRESS = ADRASTEA_SR_BA_OFFSET, - .d_SR_SIZE_ADDRESS = ADRASTEA_SR_SIZE_OFFSET, - .d_CE_CTRL1_ADDRESS = ADRASTEA_CE_CTRL1_OFFSET, - .d_CE_CTRL1_DMAX_LENGTH_MASK = ADRASTEA_CE_CTRL1_DMAX_LENGTH_MASK, - .d_DR_BA_ADDRESS = ADRASTEA_DR_BA_OFFSET, - .d_DR_SIZE_ADDRESS = ADRASTEA_DR_SIZE_OFFSET, - .d_CE_CMD_REGISTER = ADRASTEA_CE_CMD_REGISTER_OFFSET, - .d_CE_MSI_ADDRESS = MISSING_FOR_ADRASTEA, - .d_CE_MSI_ADDRESS_HIGH = MISSING_FOR_ADRASTEA, - .d_CE_MSI_DATA = MISSING_FOR_ADRASTEA, - .d_CE_MSI_ENABLE_BIT = MISSING_FOR_ADRASTEA, - .d_MISC_IE_ADDRESS = ADRASTEA_MISC_IE_OFFSET, - .d_MISC_IS_AXI_ERR_MASK = ADRASTEA_MISC_IS_AXI_ERR_MASK, - .d_MISC_IS_DST_ADDR_ERR_MASK = ADRASTEA_MISC_IS_DST_ADDR_ERR_MASK, - .d_MISC_IS_SRC_LEN_ERR_MASK = ADRASTEA_MISC_IS_SRC_LEN_ERR_MASK, - .d_MISC_IS_DST_MAX_LEN_VIO_MASK = ADRASTEA_MISC_IS_DST_MAX_LEN_VIO_MASK, - .d_MISC_IS_DST_RING_OVERFLOW_MASK = - ADRASTEA_MISC_IS_DST_RING_OVERFLOW_MASK, - .d_MISC_IS_SRC_RING_OVERFLOW_MASK = - ADRASTEA_MISC_IS_SRC_RING_OVERFLOW_MASK, - .d_SRC_WATERMARK_LOW_LSB = ADRASTEA_SRC_WATERMARK_LOW_LSB, - .d_SRC_WATERMARK_HIGH_LSB = ADRASTEA_SRC_WATERMARK_HIGH_LSB, - .d_DST_WATERMARK_LOW_LSB = ADRASTEA_DST_WATERMARK_LOW_LSB, - .d_DST_WATERMARK_HIGH_LSB = ADRASTEA_DST_WATERMARK_HIGH_LSB, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK = - ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB = - ADRASTEA_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB, - .d_CE_CTRL1_DMAX_LENGTH_LSB = ADRASTEA_CE_CTRL1_DMAX_LENGTH_LSB, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK = - ADRASTEA_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK = - ADRASTEA_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB = - ADRASTEA_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB = - ADRASTEA_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_IDX_UPD_EN_MASK = - ADRASTEA_A_WCSS_HM_A_WIFI_APB_1_A_WFSS_CE0_CE_CTRL1__IDX_UPD_EN___M, - .d_CE_WRAPPER_DEBUG_OFFSET = ADRASTEA_CE_WRAPPER_DEBUG_OFFSET, - .d_CE_WRAPPER_DEBUG_SEL_MSB = ADRASTEA_CE_WRAPPER_DEBUG_SEL_MSB, - .d_CE_WRAPPER_DEBUG_SEL_LSB = ADRASTEA_CE_WRAPPER_DEBUG_SEL_LSB, - .d_CE_WRAPPER_DEBUG_SEL_MASK = ADRASTEA_CE_WRAPPER_DEBUG_SEL_MASK, - .d_CE_DEBUG_OFFSET = ADRASTEA_CE_DEBUG_OFFSET, - .d_CE_DEBUG_SEL_MSB = ADRASTEA_CE_DEBUG_SEL_MSB, - .d_CE_DEBUG_SEL_LSB = ADRASTEA_CE_DEBUG_SEL_LSB, - .d_CE_DEBUG_SEL_MASK = ADRASTEA_CE_DEBUG_SEL_MASK, - .d_CE0_BASE_ADDRESS = ADRASTEA_CE0_BASE_ADDRESS, - .d_CE1_BASE_ADDRESS = ADRASTEA_CE1_BASE_ADDRESS, - .d_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_ENABLES = - MISSING_FOR_ADRASTEA, - .d_A_WIFI_APB_3_A_WCMN_APPS_CE_INTR_STATUS = - MISSING_FOR_ADRASTEA, -}; - - -struct host_shadow_regs_s adrastea_host_shadow_regs = { - .d_A_LOCAL_SHADOW_REG_VALUE_0 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_0, - .d_A_LOCAL_SHADOW_REG_VALUE_1 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_1, - .d_A_LOCAL_SHADOW_REG_VALUE_2 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_2, - .d_A_LOCAL_SHADOW_REG_VALUE_3 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_3, - .d_A_LOCAL_SHADOW_REG_VALUE_4 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_4, - .d_A_LOCAL_SHADOW_REG_VALUE_5 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_5, - .d_A_LOCAL_SHADOW_REG_VALUE_6 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_6, - .d_A_LOCAL_SHADOW_REG_VALUE_7 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_7, - .d_A_LOCAL_SHADOW_REG_VALUE_8 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_8, - .d_A_LOCAL_SHADOW_REG_VALUE_9 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_9, - .d_A_LOCAL_SHADOW_REG_VALUE_10 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_10, - .d_A_LOCAL_SHADOW_REG_VALUE_11 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_11, - .d_A_LOCAL_SHADOW_REG_VALUE_12 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_12, - .d_A_LOCAL_SHADOW_REG_VALUE_13 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_13, - .d_A_LOCAL_SHADOW_REG_VALUE_14 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_14, - .d_A_LOCAL_SHADOW_REG_VALUE_15 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_15, - .d_A_LOCAL_SHADOW_REG_VALUE_16 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_16, - .d_A_LOCAL_SHADOW_REG_VALUE_17 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_17, - .d_A_LOCAL_SHADOW_REG_VALUE_18 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_18, - .d_A_LOCAL_SHADOW_REG_VALUE_19 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_19, - .d_A_LOCAL_SHADOW_REG_VALUE_20 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_20, - .d_A_LOCAL_SHADOW_REG_VALUE_21 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_21, - .d_A_LOCAL_SHADOW_REG_VALUE_22 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_22, - .d_A_LOCAL_SHADOW_REG_VALUE_23 = - ADRASTEA_A_LOCAL_SHADOW_REG_VALUE_23, - .d_A_LOCAL_SHADOW_REG_ADDRESS_0 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_0, - .d_A_LOCAL_SHADOW_REG_ADDRESS_1 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_1, - .d_A_LOCAL_SHADOW_REG_ADDRESS_2 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_2, - .d_A_LOCAL_SHADOW_REG_ADDRESS_3 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_3, - .d_A_LOCAL_SHADOW_REG_ADDRESS_4 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_4, - .d_A_LOCAL_SHADOW_REG_ADDRESS_5 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_5, - .d_A_LOCAL_SHADOW_REG_ADDRESS_6 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_6, - .d_A_LOCAL_SHADOW_REG_ADDRESS_7 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_7, - .d_A_LOCAL_SHADOW_REG_ADDRESS_8 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_8, - .d_A_LOCAL_SHADOW_REG_ADDRESS_9 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_9, - .d_A_LOCAL_SHADOW_REG_ADDRESS_10 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_10, - .d_A_LOCAL_SHADOW_REG_ADDRESS_11 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_11, - .d_A_LOCAL_SHADOW_REG_ADDRESS_12 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_12, - .d_A_LOCAL_SHADOW_REG_ADDRESS_13 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_13, - .d_A_LOCAL_SHADOW_REG_ADDRESS_14 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_14, - .d_A_LOCAL_SHADOW_REG_ADDRESS_15 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_15, - .d_A_LOCAL_SHADOW_REG_ADDRESS_16 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_16, - .d_A_LOCAL_SHADOW_REG_ADDRESS_17 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_17, - .d_A_LOCAL_SHADOW_REG_ADDRESS_18 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_18, - .d_A_LOCAL_SHADOW_REG_ADDRESS_19 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_19, - .d_A_LOCAL_SHADOW_REG_ADDRESS_20 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_20, - .d_A_LOCAL_SHADOW_REG_ADDRESS_21 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_21, - .d_A_LOCAL_SHADOW_REG_ADDRESS_22 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_22, - .d_A_LOCAL_SHADOW_REG_ADDRESS_23 = - ADRASTEA_A_LOCAL_SHADOW_REG_ADDRESS_23 -}; - -#endif /* ADRASTEA_REG_DEF_H */ diff --git a/core/hif/src/ar6320def.h b/core/hif/src/ar6320def.h deleted file mode 100644 index eacce5d62894..000000000000 --- a/core/hif/src/ar6320def.h +++ /dev/null @@ -1,796 +0,0 @@ -/* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _AR6320DEF_H_ -#define _AR6320DEF_H_ - -/* Base Addresses */ -#define AR6320_RTC_SOC_BASE_ADDRESS 0x00000000 -#define AR6320_RTC_WMAC_BASE_ADDRESS 0x00001000 -#define AR6320_MAC_COEX_BASE_ADDRESS 0x0000f000 -#define AR6320_BT_COEX_BASE_ADDRESS 0x00002000 -#define AR6320_SOC_PCIE_BASE_ADDRESS 0x00038000 -#define AR6320_SOC_CORE_BASE_ADDRESS 0x0003a000 -#define AR6320_WLAN_UART_BASE_ADDRESS 0x0000c000 -#define AR6320_WLAN_SI_BASE_ADDRESS 0x00010000 -#define AR6320_WLAN_GPIO_BASE_ADDRESS 0x00005000 -#define AR6320_WLAN_ANALOG_INTF_BASE_ADDRESS 0x00006000 -#define AR6320_WLAN_MAC_BASE_ADDRESS 0x00010000 -#define AR6320_EFUSE_BASE_ADDRESS 0x00024000 -#define AR6320_FPGA_REG_BASE_ADDRESS 0x00039000 -#define AR6320_WLAN_UART2_BASE_ADDRESS 0x00054c00 -#define AR6320_CE_WRAPPER_BASE_ADDRESS 0x00034000 -#define AR6320_CE0_BASE_ADDRESS 0x00034400 -#define AR6320_CE1_BASE_ADDRESS 0x00034800 -#define AR6320_CE2_BASE_ADDRESS 0x00034c00 -#define AR6320_CE3_BASE_ADDRESS 0x00035000 -#define AR6320_CE4_BASE_ADDRESS 0x00035400 -#define AR6320_CE5_BASE_ADDRESS 0x00035800 -#define AR6320_CE6_BASE_ADDRESS 0x00035c00 -#define AR6320_CE7_BASE_ADDRESS 0x00036000 -#define AR6320_DBI_BASE_ADDRESS 0x0003c000 -#define AR6320_WLAN_ANALOG_INTF_PCIE_BASE_ADDRESS 0x00007800 - -#define AR6320_SCRATCH_3_ADDRESS 0x0028 -#define AR6320_TARG_DRAM_START 0x00400000 -#define AR6320_SOC_SYSTEM_SLEEP_OFFSET 0x000000c0 -#define AR6320_SOC_RESET_CONTROL_OFFSET 0x00000000 -#define AR6320_SOC_CLOCK_CONTROL_OFFSET 0x00000028 -#define AR6320_SOC_CLOCK_CONTROL_SI0_CLK_MASK 0x00000001 -#define AR6320_SOC_RESET_CONTROL_SI0_RST_MASK 0x00000000 -#define AR6320_WLAN_GPIO_PIN0_ADDRESS 0x00000068 -#define AR6320_WLAN_GPIO_PIN1_ADDRESS 0x0000006c -#define AR6320_WLAN_GPIO_PIN0_CONFIG_MASK 0x00007800 -#define AR6320_WLAN_GPIO_PIN1_CONFIG_MASK 0x00007800 -#define AR6320_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define AR6320_SOC_LPO_CAL_OFFSET 0x000000e0 -#define AR6320_WLAN_GPIO_PIN10_ADDRESS 0x00000090 -#define AR6320_WLAN_GPIO_PIN11_ADDRESS 0x00000094 -#define AR6320_WLAN_GPIO_PIN12_ADDRESS 0x00000098 -#define AR6320_WLAN_GPIO_PIN13_ADDRESS 0x0000009c -#define AR6320_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define AR6320_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -#define AR6320_SOC_LPO_CAL_ENABLE_LSB 20 -#define AR6320_SOC_LPO_CAL_ENABLE_MASK 0x00100000 - -#define AR6320_WLAN_SYSTEM_SLEEP_DISABLE_LSB 0 -#define AR6320_WLAN_SYSTEM_SLEEP_DISABLE_MASK 0x00000001 -#define AR6320_WLAN_RESET_CONTROL_COLD_RST_MASK 0x00000008 -#define AR6320_WLAN_RESET_CONTROL_WARM_RST_MASK 0x00000004 -#define AR6320_SI_CONFIG_BIDIR_OD_DATA_LSB 18 -#define AR6320_SI_CONFIG_BIDIR_OD_DATA_MASK 0x00040000 -#define AR6320_SI_CONFIG_I2C_LSB 16 -#define AR6320_SI_CONFIG_I2C_MASK 0x00010000 -#define AR6320_SI_CONFIG_POS_SAMPLE_LSB 7 -#define AR6320_SI_CONFIG_POS_SAMPLE_MASK 0x00000080 -#define AR6320_SI_CONFIG_INACTIVE_CLK_LSB 4 -#define AR6320_SI_CONFIG_INACTIVE_CLK_MASK 0x00000010 -#define AR6320_SI_CONFIG_INACTIVE_DATA_LSB 5 -#define AR6320_SI_CONFIG_INACTIVE_DATA_MASK 0x00000020 -#define AR6320_SI_CONFIG_DIVIDER_LSB 0 -#define AR6320_SI_CONFIG_DIVIDER_MASK 0x0000000f -#define AR6320_SI_CONFIG_OFFSET 0x00000000 -#define AR6320_SI_TX_DATA0_OFFSET 0x00000008 -#define AR6320_SI_TX_DATA1_OFFSET 0x0000000c -#define AR6320_SI_RX_DATA0_OFFSET 0x00000010 -#define AR6320_SI_RX_DATA1_OFFSET 0x00000014 -#define AR6320_SI_CS_OFFSET 0x00000004 -#define AR6320_SI_CS_DONE_ERR_MASK 0x00000400 -#define AR6320_SI_CS_DONE_INT_MASK 0x00000200 -#define AR6320_SI_CS_START_LSB 8 -#define AR6320_SI_CS_START_MASK 0x00000100 -#define AR6320_SI_CS_RX_CNT_LSB 4 -#define AR6320_SI_CS_RX_CNT_MASK 0x000000f0 -#define AR6320_SI_CS_TX_CNT_LSB 0 -#define AR6320_SI_CS_TX_CNT_MASK 0x0000000f -#define AR6320_CE_COUNT 8 -#define AR6320_SR_WR_INDEX_ADDRESS 0x003c -#define AR6320_DST_WATERMARK_ADDRESS 0x0050 -#define AR6320_RX_MSDU_END_4_FIRST_MSDU_LSB 14 -#define AR6320_RX_MSDU_END_4_FIRST_MSDU_MASK 0x00004000 -#define AR6320_RX_MPDU_START_0_RETRY_LSB 14 -#define AR6320_RX_MPDU_START_0_RETRY_MASK 0x00004000 -#define AR6320_RX_MPDU_START_0_SEQ_NUM_LSB 16 -#define AR6320_RX_MPDU_START_0_SEQ_NUM_MASK 0x0fff0000 -#define AR6320_RX_MPDU_START_2_TID_LSB 28 -#define AR6320_RX_MPDU_START_2_TID_MASK 0xf0000000 -#define AR6320_RX_MPDU_START_2_PN_47_32_LSB 0 -#define AR6320_RX_MPDU_START_2_PN_47_32_MASK 0x0000ffff -#define AR6320_RX_MSDU_END_1_KEY_ID_OCT_MASK 0x000000ff -#define AR6320_RX_MSDU_END_1_KEY_ID_OCT_LSB 0 -#define AR6320_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB 16 -#define AR6320_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK 0xffff0000 -#define AR6320_RX_MSDU_END_4_LAST_MSDU_LSB 15 -#define AR6320_RX_MSDU_END_4_LAST_MSDU_MASK 0x00008000 -#define AR6320_RX_ATTENTION_0_MCAST_BCAST_LSB 2 -#define AR6320_RX_ATTENTION_0_MCAST_BCAST_MASK 0x00000004 -#define AR6320_RX_ATTENTION_0_FRAGMENT_LSB 13 -#define AR6320_RX_ATTENTION_0_FRAGMENT_MASK 0x00002000 -#define AR6320_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK 0x08000000 -#define AR6320_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB 16 -#define AR6320_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK 0x00ff0000 -#define AR6320_RX_MSDU_START_0_MSDU_LENGTH_LSB 0 -#define AR6320_RX_MSDU_START_0_MSDU_LENGTH_MASK 0x00003fff -#define AR6320_RX_MSDU_START_2_DECAP_FORMAT_OFFSET 0x00000008 -#define AR6320_RX_MSDU_START_2_DECAP_FORMAT_LSB 8 -#define AR6320_RX_MSDU_START_2_DECAP_FORMAT_MASK 0x00000300 -#define AR6320_RX_MPDU_START_0_ENCRYPTED_LSB 13 -#define AR6320_RX_MPDU_START_0_ENCRYPTED_MASK 0x00002000 -#define AR6320_RX_ATTENTION_0_MORE_DATA_MASK 0x00000400 -#define AR6320_RX_ATTENTION_0_MSDU_DONE_MASK 0x80000000 -#define AR6320_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK 0x00040000 -#define AR6320_DST_WR_INDEX_ADDRESS 0x0040 -#define AR6320_SRC_WATERMARK_ADDRESS 0x004c -#define AR6320_SRC_WATERMARK_LOW_MASK 0xffff0000 -#define AR6320_SRC_WATERMARK_HIGH_MASK 0x0000ffff -#define AR6320_DST_WATERMARK_LOW_MASK 0xffff0000 -#define AR6320_DST_WATERMARK_HIGH_MASK 0x0000ffff -#define AR6320_CURRENT_SRRI_ADDRESS 0x0044 -#define AR6320_CURRENT_DRRI_ADDRESS 0x0048 -#define AR6320_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK 0x00000002 -#define AR6320_HOST_IS_SRC_RING_LOW_WATERMARK_MASK 0x00000004 -#define AR6320_HOST_IS_DST_RING_HIGH_WATERMARK_MASK 0x00000008 -#define AR6320_HOST_IS_DST_RING_LOW_WATERMARK_MASK 0x00000010 -#define AR6320_HOST_IS_ADDRESS 0x0030 -#define AR6320_HOST_IS_COPY_COMPLETE_MASK 0x00000001 -#define AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS 0x0000 -#define AR6320_HOST_IE_ADDRESS 0x002c -#define AR6320_HOST_IE_COPY_COMPLETE_MASK 0x00000001 -#define AR6320_SR_BA_ADDRESS 0x0000 -#define AR6320_SR_SIZE_ADDRESS 0x0004 -#define AR6320_CE_CTRL1_ADDRESS 0x0010 -#define AR6320_CE_CTRL1_DMAX_LENGTH_MASK 0x0000ffff -#define AR6320_DR_BA_ADDRESS 0x0008 -#define AR6320_DR_SIZE_ADDRESS 0x000c -#define AR6320_MISC_IE_ADDRESS 0x0034 -#define AR6320_MISC_IS_AXI_ERR_MASK 0x00000400 -#define AR6320_MISC_IS_DST_ADDR_ERR_MASK 0x00000200 -#define AR6320_MISC_IS_SRC_LEN_ERR_MASK 0x00000100 -#define AR6320_MISC_IS_DST_MAX_LEN_VIO_MASK 0x00000080 -#define AR6320_MISC_IS_DST_RING_OVERFLOW_MASK 0x00000040 -#define AR6320_MISC_IS_SRC_RING_OVERFLOW_MASK 0x00000020 -#define AR6320_SRC_WATERMARK_LOW_LSB 16 -#define AR6320_SRC_WATERMARK_HIGH_LSB 0 -#define AR6320_DST_WATERMARK_LOW_LSB 16 -#define AR6320_DST_WATERMARK_HIGH_LSB 0 -#define AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK 0x0000ff00 -#define AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB 8 -#define AR6320_CE_CTRL1_DMAX_LENGTH_LSB 0 -#define AR6320_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK 0x00010000 -#define AR6320_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK 0x00020000 -#define AR6320_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB 16 -#define AR6320_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB 17 -#define AR6320_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK 0x00000020 -#define AR6320_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB 5 -#define AR6320_SOC_GLOBAL_RESET_ADDRESS 0x0008 -#define AR6320_RTC_STATE_ADDRESS 0x0000 -#define AR6320_RTC_STATE_COLD_RESET_MASK 0x00002000 -#define AR6320_PCIE_SOC_WAKE_RESET 0x00000000 -#define AR6320_PCIE_SOC_WAKE_ADDRESS 0x0004 -#define AR6320_PCIE_SOC_WAKE_V_MASK 0x00000001 -#define AR6320_RTC_STATE_V_MASK 0x00000007 -#define AR6320_RTC_STATE_V_LSB 0 -#define AR6320_RTC_STATE_V_ON 3 -#define AR6320_MUX_ID_MASK 0x0000 -#define AR6320_TRANSACTION_ID_MASK 0x3fff -#define AR6320_PCIE_LOCAL_BASE_ADDRESS 0x80000 -#define AR6320_FW_IND_EVENT_PENDING 1 -#define AR6320_FW_IND_INITIALIZED 2 -#define AR6320_FW_IND_HELPER 4 -#define AR6320_PCIE_INTR_ENABLE_ADDRESS 0x0008 -#define AR6320_PCIE_INTR_CLR_ADDRESS 0x0014 -#define AR6320_PCIE_INTR_FIRMWARE_MASK 0x00000400 -#define AR6320_PCIE_INTR_CE0_MASK 0x00000800 -#define AR6320_PCIE_INTR_CE_MASK_ALL 0x0007f800 -#define AR6320_PCIE_INTR_CAUSE_ADDRESS 0x000c -#define AR6320_CPU_INTR_ADDRESS 0x0010 -#define AR6320_SOC_LF_TIMER_CONTROL0_ADDRESS 0x00000050 -#define AR6320_SOC_LF_TIMER_CONTROL0_ENABLE_MASK 0x00000004 -#define AR6320_SOC_RESET_CONTROL_ADDRESS 0x00000000 -#define AR6320_SOC_RESET_CONTROL_CE_RST_MASK 0x00000001 -#define AR6320_SOC_RESET_CONTROL_CPU_WARM_RST_MASK 0x00000040 -#define AR6320_CORE_CTRL_ADDRESS 0x0000 -#define AR6320_CORE_CTRL_CPU_INTR_MASK 0x00002000 -#define AR6320_LOCAL_SCRATCH_OFFSET 0x000000c0 -#define AR6320_CLOCK_GPIO_OFFSET 0xffffffff -#define AR6320_CLOCK_GPIO_BT_CLK_OUT_EN_LSB 0 -#define AR6320_CLOCK_GPIO_BT_CLK_OUT_EN_MASK 0 -#define AR6320_SOC_CHIP_ID_ADDRESS 0x000000f0 -#define AR6320_SOC_CHIP_ID_VERSION_MASK 0xfffc0000 -#define AR6320_SOC_CHIP_ID_VERSION_LSB 18 -#define AR6320_SOC_CHIP_ID_REVISION_MASK 0x00000f00 -#define AR6320_SOC_CHIP_ID_REVISION_LSB 8 -#define AR6320_SOC_POWER_REG_OFFSET 0x0000010c - -/* Copy Engine Debug */ -#define AR6320_WLAN_DEBUG_INPUT_SEL_OFFSET 0x0000010c -#define AR6320_WLAN_DEBUG_INPUT_SEL_SRC_MSB 3 -#define AR6320_WLAN_DEBUG_INPUT_SEL_SRC_LSB 0 -#define AR6320_WLAN_DEBUG_INPUT_SEL_SRC_MASK 0x0000000f -#define AR6320_WLAN_DEBUG_CONTROL_OFFSET 0x00000108 -#define AR6320_WLAN_DEBUG_CONTROL_ENABLE_MSB 0 -#define AR6320_WLAN_DEBUG_CONTROL_ENABLE_LSB 0 -#define AR6320_WLAN_DEBUG_CONTROL_ENABLE_MASK 0x00000001 -#define AR6320_WLAN_DEBUG_OUT_OFFSET 0x00000110 -#define AR6320_WLAN_DEBUG_OUT_DATA_MSB 19 -#define AR6320_WLAN_DEBUG_OUT_DATA_LSB 0 -#define AR6320_WLAN_DEBUG_OUT_DATA_MASK 0x000fffff -#define AR6320_AMBA_DEBUG_BUS_OFFSET 0x0000011c -#define AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB 13 -#define AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB 8 -#define AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK 0x00003f00 -#define AR6320_AMBA_DEBUG_BUS_SEL_MSB 4 -#define AR6320_AMBA_DEBUG_BUS_SEL_LSB 0 -#define AR6320_AMBA_DEBUG_BUS_SEL_MASK 0x0000001f -#define AR6320_CE_WRAPPER_DEBUG_OFFSET 0x0008 -#define AR6320_CE_WRAPPER_DEBUG_SEL_MSB 5 -#define AR6320_CE_WRAPPER_DEBUG_SEL_LSB 0 -#define AR6320_CE_WRAPPER_DEBUG_SEL_MASK 0x0000003f -#define AR6320_CE_DEBUG_OFFSET 0x0054 -#define AR6320_CE_DEBUG_SEL_MSB 5 -#define AR6320_CE_DEBUG_SEL_LSB 0 -#define AR6320_CE_DEBUG_SEL_MASK 0x0000003f -/* End */ - -/* PLL start */ -#define AR6320_EFUSE_OFFSET 0x0000032c -#define AR6320_EFUSE_XTAL_SEL_MSB 10 -#define AR6320_EFUSE_XTAL_SEL_LSB 8 -#define AR6320_EFUSE_XTAL_SEL_MASK 0x00000700 -#define AR6320_BB_PLL_CONFIG_OFFSET 0x000002f4 -#define AR6320_BB_PLL_CONFIG_OUTDIV_MSB 20 -#define AR6320_BB_PLL_CONFIG_OUTDIV_LSB 18 -#define AR6320_BB_PLL_CONFIG_OUTDIV_MASK 0x001c0000 -#define AR6320_BB_PLL_CONFIG_FRAC_MSB 17 -#define AR6320_BB_PLL_CONFIG_FRAC_LSB 0 -#define AR6320_BB_PLL_CONFIG_FRAC_MASK 0x0003ffff -#define AR6320_WLAN_PLL_SETTLE_TIME_MSB 10 -#define AR6320_WLAN_PLL_SETTLE_TIME_LSB 0 -#define AR6320_WLAN_PLL_SETTLE_TIME_MASK 0x000007ff -#define AR6320_WLAN_PLL_SETTLE_OFFSET 0x0018 -#define AR6320_WLAN_PLL_SETTLE_SW_MASK 0x000007ff -#define AR6320_WLAN_PLL_SETTLE_RSTMASK 0xffffffff -#define AR6320_WLAN_PLL_SETTLE_RESET 0x00000400 -#define AR6320_WLAN_PLL_CONTROL_NOPWD_MSB 18 -#define AR6320_WLAN_PLL_CONTROL_NOPWD_LSB 18 -#define AR6320_WLAN_PLL_CONTROL_NOPWD_MASK 0x00040000 -#define AR6320_WLAN_PLL_CONTROL_BYPASS_MSB 16 -#define AR6320_WLAN_PLL_CONTROL_BYPASS_LSB 16 -#define AR6320_WLAN_PLL_CONTROL_BYPASS_MASK 0x00010000 -#define AR6320_WLAN_PLL_CONTROL_BYPASS_RESET 0x1 -#define AR6320_WLAN_PLL_CONTROL_CLK_SEL_MSB 15 -#define AR6320_WLAN_PLL_CONTROL_CLK_SEL_LSB 14 -#define AR6320_WLAN_PLL_CONTROL_CLK_SEL_MASK 0x0000c000 -#define AR6320_WLAN_PLL_CONTROL_CLK_SEL_RESET 0x0 -#define AR6320_WLAN_PLL_CONTROL_REFDIV_MSB 13 -#define AR6320_WLAN_PLL_CONTROL_REFDIV_LSB 10 -#define AR6320_WLAN_PLL_CONTROL_REFDIV_MASK 0x00003c00 -#define AR6320_WLAN_PLL_CONTROL_REFDIV_RESET 0x0 -#define AR6320_WLAN_PLL_CONTROL_DIV_MSB 9 -#define AR6320_WLAN_PLL_CONTROL_DIV_LSB 0 -#define AR6320_WLAN_PLL_CONTROL_DIV_MASK 0x000003ff -#define AR6320_WLAN_PLL_CONTROL_DIV_RESET 0x11 -#define AR6320_WLAN_PLL_CONTROL_OFFSET 0x0014 -#define AR6320_WLAN_PLL_CONTROL_SW_MASK 0x001fffff -#define AR6320_WLAN_PLL_CONTROL_RSTMASK 0xffffffff -#define AR6320_WLAN_PLL_CONTROL_RESET 0x00010011 -#define AR6320_SOC_CORE_CLK_CTRL_OFFSET 0x00000114 -#define AR6320_SOC_CORE_CLK_CTRL_DIV_MSB 2 -#define AR6320_SOC_CORE_CLK_CTRL_DIV_LSB 0 -#define AR6320_SOC_CORE_CLK_CTRL_DIV_MASK 0x00000007 -#define AR6320_RTC_SYNC_STATUS_PLL_CHANGING_MSB 5 -#define AR6320_RTC_SYNC_STATUS_PLL_CHANGING_LSB 5 -#define AR6320_RTC_SYNC_STATUS_PLL_CHANGING_MASK 0x00000020 -#define AR6320_RTC_SYNC_STATUS_PLL_CHANGING_RESET 0x0 -#define AR6320_RTC_SYNC_STATUS_OFFSET 0x0244 -#define AR6320_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define AR6320_SOC_CPU_CLOCK_STANDARD_MSB 1 -#define AR6320_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define AR6320_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -/* PLL end */ - -#define AR6320_PCIE_INTR_CE_MASK(n) \ - (AR6320_PCIE_INTR_CE0_MASK << (n)) -#define AR6320_DRAM_BASE_ADDRESS AR6320_TARG_DRAM_START -#define AR6320_FW_INDICATOR_ADDRESS \ - (AR6320_SOC_CORE_BASE_ADDRESS + AR6320_SCRATCH_3_ADDRESS) -#define AR6320_SYSTEM_SLEEP_OFFSET AR6320_SOC_SYSTEM_SLEEP_OFFSET -#define AR6320_WLAN_SYSTEM_SLEEP_OFFSET 0x002c -#define AR6320_WLAN_RESET_CONTROL_OFFSET AR6320_SOC_RESET_CONTROL_OFFSET -#define AR6320_CLOCK_CONTROL_OFFSET AR6320_SOC_CLOCK_CONTROL_OFFSET -#define AR6320_CLOCK_CONTROL_SI0_CLK_MASK AR6320_SOC_CLOCK_CONTROL_SI0_CLK_MASK -#define AR6320_RESET_CONTROL_MBOX_RST_MASK 0x00000004 -#define AR6320_RESET_CONTROL_SI0_RST_MASK AR6320_SOC_RESET_CONTROL_SI0_RST_MASK -#define AR6320_GPIO_BASE_ADDRESS AR6320_WLAN_GPIO_BASE_ADDRESS -#define AR6320_GPIO_PIN0_OFFSET AR6320_WLAN_GPIO_PIN0_ADDRESS -#define AR6320_GPIO_PIN1_OFFSET AR6320_WLAN_GPIO_PIN1_ADDRESS -#define AR6320_GPIO_PIN0_CONFIG_MASK AR6320_WLAN_GPIO_PIN0_CONFIG_MASK -#define AR6320_GPIO_PIN1_CONFIG_MASK AR6320_WLAN_GPIO_PIN1_CONFIG_MASK -#define AR6320_SI_BASE_ADDRESS 0x00050000 -#define AR6320_CPU_CLOCK_OFFSET AR6320_SOC_CPU_CLOCK_OFFSET -#define AR6320_LPO_CAL_OFFSET AR6320_SOC_LPO_CAL_OFFSET -#define AR6320_GPIO_PIN10_OFFSET AR6320_WLAN_GPIO_PIN10_ADDRESS -#define AR6320_GPIO_PIN11_OFFSET AR6320_WLAN_GPIO_PIN11_ADDRESS -#define AR6320_GPIO_PIN12_OFFSET AR6320_WLAN_GPIO_PIN12_ADDRESS -#define AR6320_GPIO_PIN13_OFFSET AR6320_WLAN_GPIO_PIN13_ADDRESS -#define AR6320_CPU_CLOCK_STANDARD_LSB AR6320_SOC_CPU_CLOCK_STANDARD_LSB -#define AR6320_CPU_CLOCK_STANDARD_MASK AR6320_SOC_CPU_CLOCK_STANDARD_MASK -#define AR6320_LPO_CAL_ENABLE_LSB AR6320_SOC_LPO_CAL_ENABLE_LSB -#define AR6320_LPO_CAL_ENABLE_MASK AR6320_SOC_LPO_CAL_ENABLE_MASK -#define AR6320_ANALOG_INTF_BASE_ADDRESS AR6320_WLAN_ANALOG_INTF_BASE_ADDRESS -#define AR6320_MBOX_BASE_ADDRESS 0x00008000 -#define AR6320_INT_STATUS_ENABLE_ERROR_LSB 7 -#define AR6320_INT_STATUS_ENABLE_ERROR_MASK 0x00000080 -#define AR6320_INT_STATUS_ENABLE_CPU_LSB 6 -#define AR6320_INT_STATUS_ENABLE_CPU_MASK 0x00000040 -#define AR6320_INT_STATUS_ENABLE_COUNTER_LSB 4 -#define AR6320_INT_STATUS_ENABLE_COUNTER_MASK 0x00000010 -#define AR6320_INT_STATUS_ENABLE_MBOX_DATA_LSB 0 -#define AR6320_INT_STATUS_ENABLE_MBOX_DATA_MASK 0x0000000f -#define AR6320_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB 17 -#define AR6320_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK 0x00020000 -#define AR6320_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB 16 -#define AR6320_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK 0x00010000 -#define AR6320_COUNTER_INT_STATUS_ENABLE_BIT_LSB 24 -#define AR6320_COUNTER_INT_STATUS_ENABLE_BIT_MASK 0xff000000 -#define AR6320_INT_STATUS_ENABLE_ADDRESS 0x0828 -#define AR6320_CPU_INT_STATUS_ENABLE_BIT_LSB 8 -#define AR6320_CPU_INT_STATUS_ENABLE_BIT_MASK 0x0000ff00 -#define AR6320_HOST_INT_STATUS_ADDRESS 0x0800 -#define AR6320_CPU_INT_STATUS_ADDRESS 0x0801 -#define AR6320_ERROR_INT_STATUS_ADDRESS 0x0802 -#define AR6320_ERROR_INT_STATUS_WAKEUP_MASK 0x00040000 -#define AR6320_ERROR_INT_STATUS_WAKEUP_LSB 18 -#define AR6320_ERROR_INT_STATUS_RX_UNDERFLOW_MASK 0x00020000 -#define AR6320_ERROR_INT_STATUS_RX_UNDERFLOW_LSB 17 -#define AR6320_ERROR_INT_STATUS_TX_OVERFLOW_MASK 0x00010000 -#define AR6320_ERROR_INT_STATUS_TX_OVERFLOW_LSB 16 -#define AR6320_COUNT_DEC_ADDRESS 0x0840 -#define AR6320_HOST_INT_STATUS_CPU_MASK 0x00000040 -#define AR6320_HOST_INT_STATUS_CPU_LSB 6 -#define AR6320_HOST_INT_STATUS_ERROR_MASK 0x00000080 -#define AR6320_HOST_INT_STATUS_ERROR_LSB 7 -#define AR6320_HOST_INT_STATUS_COUNTER_MASK 0x00000010 -#define AR6320_HOST_INT_STATUS_COUNTER_LSB 4 -#define AR6320_RX_LOOKAHEAD_VALID_ADDRESS 0x0805 -#define AR6320_WINDOW_DATA_ADDRESS 0x0874 -#define AR6320_WINDOW_READ_ADDR_ADDRESS 0x087c -#define AR6320_WINDOW_WRITE_ADDR_ADDRESS 0x0878 - -struct targetdef_s ar6320_targetdef = { - .d_RTC_SOC_BASE_ADDRESS = AR6320_RTC_SOC_BASE_ADDRESS, - .d_RTC_WMAC_BASE_ADDRESS = AR6320_RTC_WMAC_BASE_ADDRESS, - .d_SYSTEM_SLEEP_OFFSET = AR6320_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_OFFSET = AR6320_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_DISABLE_LSB = - AR6320_WLAN_SYSTEM_SLEEP_DISABLE_LSB, - .d_WLAN_SYSTEM_SLEEP_DISABLE_MASK = - AR6320_WLAN_SYSTEM_SLEEP_DISABLE_MASK, - .d_CLOCK_CONTROL_OFFSET = AR6320_CLOCK_CONTROL_OFFSET, - .d_CLOCK_CONTROL_SI0_CLK_MASK = AR6320_CLOCK_CONTROL_SI0_CLK_MASK, - .d_RESET_CONTROL_OFFSET = AR6320_SOC_RESET_CONTROL_OFFSET, - .d_RESET_CONTROL_MBOX_RST_MASK = AR6320_RESET_CONTROL_MBOX_RST_MASK, - .d_RESET_CONTROL_SI0_RST_MASK = AR6320_RESET_CONTROL_SI0_RST_MASK, - .d_WLAN_RESET_CONTROL_OFFSET = AR6320_WLAN_RESET_CONTROL_OFFSET, - .d_WLAN_RESET_CONTROL_COLD_RST_MASK = - AR6320_WLAN_RESET_CONTROL_COLD_RST_MASK, - .d_WLAN_RESET_CONTROL_WARM_RST_MASK = - AR6320_WLAN_RESET_CONTROL_WARM_RST_MASK, - .d_GPIO_BASE_ADDRESS = AR6320_GPIO_BASE_ADDRESS, - .d_GPIO_PIN0_OFFSET = AR6320_GPIO_PIN0_OFFSET, - .d_GPIO_PIN1_OFFSET = AR6320_GPIO_PIN1_OFFSET, - .d_GPIO_PIN0_CONFIG_MASK = AR6320_GPIO_PIN0_CONFIG_MASK, - .d_GPIO_PIN1_CONFIG_MASK = AR6320_GPIO_PIN1_CONFIG_MASK, - .d_SI_CONFIG_BIDIR_OD_DATA_LSB = AR6320_SI_CONFIG_BIDIR_OD_DATA_LSB, - .d_SI_CONFIG_BIDIR_OD_DATA_MASK = AR6320_SI_CONFIG_BIDIR_OD_DATA_MASK, - .d_SI_CONFIG_I2C_LSB = AR6320_SI_CONFIG_I2C_LSB, - .d_SI_CONFIG_I2C_MASK = AR6320_SI_CONFIG_I2C_MASK, - .d_SI_CONFIG_POS_SAMPLE_LSB = AR6320_SI_CONFIG_POS_SAMPLE_LSB, - .d_SI_CONFIG_POS_SAMPLE_MASK = AR6320_SI_CONFIG_POS_SAMPLE_MASK, - .d_SI_CONFIG_INACTIVE_CLK_LSB = AR6320_SI_CONFIG_INACTIVE_CLK_LSB, - .d_SI_CONFIG_INACTIVE_CLK_MASK = AR6320_SI_CONFIG_INACTIVE_CLK_MASK, - .d_SI_CONFIG_INACTIVE_DATA_LSB = AR6320_SI_CONFIG_INACTIVE_DATA_LSB, - .d_SI_CONFIG_INACTIVE_DATA_MASK = AR6320_SI_CONFIG_INACTIVE_DATA_MASK, - .d_SI_CONFIG_DIVIDER_LSB = AR6320_SI_CONFIG_DIVIDER_LSB, - .d_SI_CONFIG_DIVIDER_MASK = AR6320_SI_CONFIG_DIVIDER_MASK, - .d_SI_BASE_ADDRESS = AR6320_SI_BASE_ADDRESS, - .d_SI_CONFIG_OFFSET = AR6320_SI_CONFIG_OFFSET, - .d_SI_TX_DATA0_OFFSET = AR6320_SI_TX_DATA0_OFFSET, - .d_SI_TX_DATA1_OFFSET = AR6320_SI_TX_DATA1_OFFSET, - .d_SI_RX_DATA0_OFFSET = AR6320_SI_RX_DATA0_OFFSET, - .d_SI_RX_DATA1_OFFSET = AR6320_SI_RX_DATA1_OFFSET, - .d_SI_CS_OFFSET = AR6320_SI_CS_OFFSET, - .d_SI_CS_DONE_ERR_MASK = AR6320_SI_CS_DONE_ERR_MASK, - .d_SI_CS_DONE_INT_MASK = AR6320_SI_CS_DONE_INT_MASK, - .d_SI_CS_START_LSB = AR6320_SI_CS_START_LSB, - .d_SI_CS_START_MASK = AR6320_SI_CS_START_MASK, - .d_SI_CS_RX_CNT_LSB = AR6320_SI_CS_RX_CNT_LSB, - .d_SI_CS_RX_CNT_MASK = AR6320_SI_CS_RX_CNT_MASK, - .d_SI_CS_TX_CNT_LSB = AR6320_SI_CS_TX_CNT_LSB, - .d_SI_CS_TX_CNT_MASK = AR6320_SI_CS_TX_CNT_MASK, - .d_BOARD_DATA_SZ = AR6320_BOARD_DATA_SZ, - .d_BOARD_EXT_DATA_SZ = AR6320_BOARD_EXT_DATA_SZ, - .d_MBOX_BASE_ADDRESS = AR6320_MBOX_BASE_ADDRESS, - .d_LOCAL_SCRATCH_OFFSET = AR6320_LOCAL_SCRATCH_OFFSET, - .d_CPU_CLOCK_OFFSET = AR6320_CPU_CLOCK_OFFSET, - .d_LPO_CAL_OFFSET = AR6320_LPO_CAL_OFFSET, - .d_GPIO_PIN10_OFFSET = AR6320_GPIO_PIN10_OFFSET, - .d_GPIO_PIN11_OFFSET = AR6320_GPIO_PIN11_OFFSET, - .d_GPIO_PIN12_OFFSET = AR6320_GPIO_PIN12_OFFSET, - .d_GPIO_PIN13_OFFSET = AR6320_GPIO_PIN13_OFFSET, - .d_CLOCK_GPIO_OFFSET = AR6320_CLOCK_GPIO_OFFSET, - .d_CPU_CLOCK_STANDARD_LSB = AR6320_CPU_CLOCK_STANDARD_LSB, - .d_CPU_CLOCK_STANDARD_MASK = AR6320_CPU_CLOCK_STANDARD_MASK, - .d_LPO_CAL_ENABLE_LSB = AR6320_LPO_CAL_ENABLE_LSB, - .d_LPO_CAL_ENABLE_MASK = AR6320_LPO_CAL_ENABLE_MASK, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB = AR6320_CLOCK_GPIO_BT_CLK_OUT_EN_LSB, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK = - AR6320_CLOCK_GPIO_BT_CLK_OUT_EN_MASK, - .d_ANALOG_INTF_BASE_ADDRESS = AR6320_ANALOG_INTF_BASE_ADDRESS, - .d_WLAN_MAC_BASE_ADDRESS = AR6320_WLAN_MAC_BASE_ADDRESS, - .d_FW_INDICATOR_ADDRESS = AR6320_FW_INDICATOR_ADDRESS, - .d_DRAM_BASE_ADDRESS = AR6320_DRAM_BASE_ADDRESS, - .d_SOC_CORE_BASE_ADDRESS = AR6320_SOC_CORE_BASE_ADDRESS, - .d_CORE_CTRL_ADDRESS = AR6320_CORE_CTRL_ADDRESS, - .d_CE_COUNT = AR6320_CE_COUNT, - .d_MSI_NUM_REQUEST = MSI_NUM_REQUEST, - .d_MSI_ASSIGN_FW = MSI_ASSIGN_FW, - .d_MSI_ASSIGN_CE_INITIAL = MSI_ASSIGN_CE_INITIAL, - .d_PCIE_INTR_ENABLE_ADDRESS = AR6320_PCIE_INTR_ENABLE_ADDRESS, - .d_PCIE_INTR_CLR_ADDRESS = AR6320_PCIE_INTR_CLR_ADDRESS, - .d_PCIE_INTR_FIRMWARE_MASK = AR6320_PCIE_INTR_FIRMWARE_MASK, - .d_PCIE_INTR_CE_MASK_ALL = AR6320_PCIE_INTR_CE_MASK_ALL, - .d_CORE_CTRL_CPU_INTR_MASK = AR6320_CORE_CTRL_CPU_INTR_MASK, - .d_SR_WR_INDEX_ADDRESS = AR6320_SR_WR_INDEX_ADDRESS, - .d_DST_WATERMARK_ADDRESS = AR6320_DST_WATERMARK_ADDRESS, - /* htt_rx.c */ - .d_RX_MSDU_END_4_FIRST_MSDU_MASK = - AR6320_RX_MSDU_END_4_FIRST_MSDU_MASK, - .d_RX_MSDU_END_4_FIRST_MSDU_LSB = AR6320_RX_MSDU_END_4_FIRST_MSDU_LSB, - .d_RX_MPDU_START_0_RETRY_LSB = AR6320_RX_MPDU_START_0_RETRY_LSB, - .d_RX_MPDU_START_0_RETRY_MASK = AR6320_RX_MPDU_START_0_RETRY_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = AR6320_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_LSB = AR6320_RX_MPDU_START_0_SEQ_NUM_LSB, - .d_RX_MPDU_START_2_PN_47_32_LSB = AR6320_RX_MPDU_START_2_PN_47_32_LSB, - .d_RX_MPDU_START_2_PN_47_32_MASK = - AR6320_RX_MPDU_START_2_PN_47_32_MASK, - .d_RX_MPDU_START_2_TID_LSB = AR6320_RX_MPDU_START_2_TID_LSB, - .d_RX_MPDU_START_2_TID_MASK = AR6320_RX_MPDU_START_2_TID_MASK, - .d_RX_MSDU_END_1_KEY_ID_OCT_MASK = - AR6320_RX_MSDU_END_1_KEY_ID_OCT_MASK, - .d_RX_MSDU_END_1_KEY_ID_OCT_LSB = AR6320_RX_MSDU_END_1_KEY_ID_OCT_LSB, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK = - AR6320_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB = - AR6320_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB, - .d_RX_MSDU_END_4_LAST_MSDU_MASK = AR6320_RX_MSDU_END_4_LAST_MSDU_MASK, - .d_RX_MSDU_END_4_LAST_MSDU_LSB = AR6320_RX_MSDU_END_4_LAST_MSDU_LSB, - .d_RX_ATTENTION_0_MCAST_BCAST_MASK = - AR6320_RX_ATTENTION_0_MCAST_BCAST_MASK, - .d_RX_ATTENTION_0_MCAST_BCAST_LSB = - AR6320_RX_ATTENTION_0_MCAST_BCAST_LSB, - .d_RX_ATTENTION_0_FRAGMENT_MASK = AR6320_RX_ATTENTION_0_FRAGMENT_MASK, - .d_RX_ATTENTION_0_FRAGMENT_LSB = AR6320_RX_ATTENTION_0_FRAGMENT_LSB, - .d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK = - AR6320_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK = - AR6320_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB = - AR6320_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB, - .d_RX_MSDU_START_0_MSDU_LENGTH_MASK = - AR6320_RX_MSDU_START_0_MSDU_LENGTH_MASK, - .d_RX_MSDU_START_0_MSDU_LENGTH_LSB = - AR6320_RX_MSDU_START_0_MSDU_LENGTH_LSB, - .d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET = - AR6320_RX_MSDU_START_2_DECAP_FORMAT_OFFSET, - .d_RX_MSDU_START_2_DECAP_FORMAT_MASK = - AR6320_RX_MSDU_START_2_DECAP_FORMAT_MASK, - .d_RX_MSDU_START_2_DECAP_FORMAT_LSB = - AR6320_RX_MSDU_START_2_DECAP_FORMAT_LSB, - .d_RX_MPDU_START_0_ENCRYPTED_MASK = - AR6320_RX_MPDU_START_0_ENCRYPTED_MASK, - .d_RX_MPDU_START_0_ENCRYPTED_LSB = - AR6320_RX_MPDU_START_0_ENCRYPTED_LSB, - .d_RX_ATTENTION_0_MORE_DATA_MASK = - AR6320_RX_ATTENTION_0_MORE_DATA_MASK, - .d_RX_ATTENTION_0_MSDU_DONE_MASK = - AR6320_RX_ATTENTION_0_MSDU_DONE_MASK, - .d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK = - AR6320_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK, - /* PLL start */ - .d_EFUSE_OFFSET = AR6320_EFUSE_OFFSET, - .d_EFUSE_XTAL_SEL_MSB = AR6320_EFUSE_XTAL_SEL_MSB, - .d_EFUSE_XTAL_SEL_LSB = AR6320_EFUSE_XTAL_SEL_LSB, - .d_EFUSE_XTAL_SEL_MASK = AR6320_EFUSE_XTAL_SEL_MASK, - .d_BB_PLL_CONFIG_OFFSET = AR6320_BB_PLL_CONFIG_OFFSET, - .d_BB_PLL_CONFIG_OUTDIV_MSB = AR6320_BB_PLL_CONFIG_OUTDIV_MSB, - .d_BB_PLL_CONFIG_OUTDIV_LSB = AR6320_BB_PLL_CONFIG_OUTDIV_LSB, - .d_BB_PLL_CONFIG_OUTDIV_MASK = AR6320_BB_PLL_CONFIG_OUTDIV_MASK, - .d_BB_PLL_CONFIG_FRAC_MSB = AR6320_BB_PLL_CONFIG_FRAC_MSB, - .d_BB_PLL_CONFIG_FRAC_LSB = AR6320_BB_PLL_CONFIG_FRAC_LSB, - .d_BB_PLL_CONFIG_FRAC_MASK = AR6320_BB_PLL_CONFIG_FRAC_MASK, - .d_WLAN_PLL_SETTLE_TIME_MSB = AR6320_WLAN_PLL_SETTLE_TIME_MSB, - .d_WLAN_PLL_SETTLE_TIME_LSB = AR6320_WLAN_PLL_SETTLE_TIME_LSB, - .d_WLAN_PLL_SETTLE_TIME_MASK = AR6320_WLAN_PLL_SETTLE_TIME_MASK, - .d_WLAN_PLL_SETTLE_OFFSET = AR6320_WLAN_PLL_SETTLE_OFFSET, - .d_WLAN_PLL_SETTLE_SW_MASK = AR6320_WLAN_PLL_SETTLE_SW_MASK, - .d_WLAN_PLL_SETTLE_RSTMASK = AR6320_WLAN_PLL_SETTLE_RSTMASK, - .d_WLAN_PLL_SETTLE_RESET = AR6320_WLAN_PLL_SETTLE_RESET, - .d_WLAN_PLL_CONTROL_NOPWD_MSB = AR6320_WLAN_PLL_CONTROL_NOPWD_MSB, - .d_WLAN_PLL_CONTROL_NOPWD_LSB = AR6320_WLAN_PLL_CONTROL_NOPWD_LSB, - .d_WLAN_PLL_CONTROL_NOPWD_MASK = AR6320_WLAN_PLL_CONTROL_NOPWD_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_MSB = AR6320_WLAN_PLL_CONTROL_BYPASS_MSB, - .d_WLAN_PLL_CONTROL_BYPASS_LSB = AR6320_WLAN_PLL_CONTROL_BYPASS_LSB, - .d_WLAN_PLL_CONTROL_BYPASS_MASK = AR6320_WLAN_PLL_CONTROL_BYPASS_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_RESET = - AR6320_WLAN_PLL_CONTROL_BYPASS_RESET, - .d_WLAN_PLL_CONTROL_CLK_SEL_MSB = AR6320_WLAN_PLL_CONTROL_CLK_SEL_MSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_LSB = AR6320_WLAN_PLL_CONTROL_CLK_SEL_LSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_MASK = - AR6320_WLAN_PLL_CONTROL_CLK_SEL_MASK, - .d_WLAN_PLL_CONTROL_CLK_SEL_RESET = - AR6320_WLAN_PLL_CONTROL_CLK_SEL_RESET, - .d_WLAN_PLL_CONTROL_REFDIV_MSB = AR6320_WLAN_PLL_CONTROL_REFDIV_MSB, - .d_WLAN_PLL_CONTROL_REFDIV_LSB = AR6320_WLAN_PLL_CONTROL_REFDIV_LSB, - .d_WLAN_PLL_CONTROL_REFDIV_MASK = AR6320_WLAN_PLL_CONTROL_REFDIV_MASK, - .d_WLAN_PLL_CONTROL_REFDIV_RESET = - AR6320_WLAN_PLL_CONTROL_REFDIV_RESET, - .d_WLAN_PLL_CONTROL_DIV_MSB = AR6320_WLAN_PLL_CONTROL_DIV_MSB, - .d_WLAN_PLL_CONTROL_DIV_LSB = AR6320_WLAN_PLL_CONTROL_DIV_LSB, - .d_WLAN_PLL_CONTROL_DIV_MASK = AR6320_WLAN_PLL_CONTROL_DIV_MASK, - .d_WLAN_PLL_CONTROL_DIV_RESET = AR6320_WLAN_PLL_CONTROL_DIV_RESET, - .d_WLAN_PLL_CONTROL_OFFSET = AR6320_WLAN_PLL_CONTROL_OFFSET, - .d_WLAN_PLL_CONTROL_SW_MASK = AR6320_WLAN_PLL_CONTROL_SW_MASK, - .d_WLAN_PLL_CONTROL_RSTMASK = AR6320_WLAN_PLL_CONTROL_RSTMASK, - .d_WLAN_PLL_CONTROL_RESET = AR6320_WLAN_PLL_CONTROL_RESET, - .d_SOC_CORE_CLK_CTRL_OFFSET = AR6320_SOC_CORE_CLK_CTRL_OFFSET, - .d_SOC_CORE_CLK_CTRL_DIV_MSB = AR6320_SOC_CORE_CLK_CTRL_DIV_MSB, - .d_SOC_CORE_CLK_CTRL_DIV_LSB = AR6320_SOC_CORE_CLK_CTRL_DIV_LSB, - .d_SOC_CORE_CLK_CTRL_DIV_MASK = AR6320_SOC_CORE_CLK_CTRL_DIV_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MSB = - AR6320_RTC_SYNC_STATUS_PLL_CHANGING_MSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_LSB = - AR6320_RTC_SYNC_STATUS_PLL_CHANGING_LSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MASK = - AR6320_RTC_SYNC_STATUS_PLL_CHANGING_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_RESET = - AR6320_RTC_SYNC_STATUS_PLL_CHANGING_RESET, - .d_RTC_SYNC_STATUS_OFFSET = AR6320_RTC_SYNC_STATUS_OFFSET, - .d_SOC_CPU_CLOCK_OFFSET = AR6320_SOC_CPU_CLOCK_OFFSET, - .d_SOC_CPU_CLOCK_STANDARD_MSB = AR6320_SOC_CPU_CLOCK_STANDARD_MSB, - .d_SOC_CPU_CLOCK_STANDARD_LSB = AR6320_SOC_CPU_CLOCK_STANDARD_LSB, - .d_SOC_CPU_CLOCK_STANDARD_MASK = AR6320_SOC_CPU_CLOCK_STANDARD_MASK, - /* PLL end */ - .d_SOC_POWER_REG_OFFSET = AR6320_SOC_POWER_REG_OFFSET, - .d_PCIE_INTR_CAUSE_ADDRESS = AR6320_PCIE_INTR_CAUSE_ADDRESS, - .d_SOC_RESET_CONTROL_ADDRESS = AR6320_SOC_RESET_CONTROL_ADDRESS, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK = - AR6320_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB = - AR6320_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB, - .d_SOC_RESET_CONTROL_CE_RST_MASK = - AR6320_SOC_RESET_CONTROL_CE_RST_MASK, - .d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK = - AR6320_SOC_RESET_CONTROL_CPU_WARM_RST_MASK, - .d_CPU_INTR_ADDRESS = AR6320_CPU_INTR_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ADDRESS = - AR6320_SOC_LF_TIMER_CONTROL0_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK = - AR6320_SOC_LF_TIMER_CONTROL0_ENABLE_MASK, - /* chip id start */ - .d_SOC_CHIP_ID_ADDRESS = AR6320_SOC_CHIP_ID_ADDRESS, - .d_SOC_CHIP_ID_VERSION_MASK = AR6320_SOC_CHIP_ID_VERSION_MASK, - .d_SOC_CHIP_ID_VERSION_LSB = AR6320_SOC_CHIP_ID_VERSION_LSB, - .d_SOC_CHIP_ID_REVISION_MASK = AR6320_SOC_CHIP_ID_REVISION_MASK, - .d_SOC_CHIP_ID_REVISION_LSB = AR6320_SOC_CHIP_ID_REVISION_LSB, - /* chip id end */ - - .d_WLAN_DEBUG_INPUT_SEL_OFFSET = AR6320_WLAN_DEBUG_INPUT_SEL_OFFSET, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MSB = AR6320_WLAN_DEBUG_INPUT_SEL_SRC_MSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_LSB = AR6320_WLAN_DEBUG_INPUT_SEL_SRC_LSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MASK = - AR6320_WLAN_DEBUG_INPUT_SEL_SRC_MASK, - .d_WLAN_DEBUG_CONTROL_OFFSET = AR6320_WLAN_DEBUG_CONTROL_OFFSET, - .d_WLAN_DEBUG_CONTROL_ENABLE_MSB = - AR6320_WLAN_DEBUG_CONTROL_ENABLE_MSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_LSB = - AR6320_WLAN_DEBUG_CONTROL_ENABLE_LSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_MASK = - AR6320_WLAN_DEBUG_CONTROL_ENABLE_MASK, - .d_WLAN_DEBUG_OUT_OFFSET = AR6320_WLAN_DEBUG_OUT_OFFSET, - .d_WLAN_DEBUG_OUT_DATA_MSB = AR6320_WLAN_DEBUG_OUT_DATA_MSB, - .d_WLAN_DEBUG_OUT_DATA_LSB = AR6320_WLAN_DEBUG_OUT_DATA_LSB, - .d_WLAN_DEBUG_OUT_DATA_MASK = AR6320_WLAN_DEBUG_OUT_DATA_MASK, - .d_AMBA_DEBUG_BUS_OFFSET = AR6320_AMBA_DEBUG_BUS_OFFSET, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB = - AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB = - AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK = - AR6320_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK, - .d_AMBA_DEBUG_BUS_SEL_MSB = AR6320_AMBA_DEBUG_BUS_SEL_MSB, - .d_AMBA_DEBUG_BUS_SEL_LSB = AR6320_AMBA_DEBUG_BUS_SEL_LSB, - .d_AMBA_DEBUG_BUS_SEL_MASK = AR6320_AMBA_DEBUG_BUS_SEL_MASK, - -}; - -struct hostdef_s ar6320_hostdef = { - .d_INT_STATUS_ENABLE_ERROR_LSB = AR6320_INT_STATUS_ENABLE_ERROR_LSB, - .d_INT_STATUS_ENABLE_ERROR_MASK = AR6320_INT_STATUS_ENABLE_ERROR_MASK, - .d_INT_STATUS_ENABLE_CPU_LSB = AR6320_INT_STATUS_ENABLE_CPU_LSB, - .d_INT_STATUS_ENABLE_CPU_MASK = AR6320_INT_STATUS_ENABLE_CPU_MASK, - .d_INT_STATUS_ENABLE_COUNTER_LSB = - AR6320_INT_STATUS_ENABLE_COUNTER_LSB, - .d_INT_STATUS_ENABLE_COUNTER_MASK = - AR6320_INT_STATUS_ENABLE_COUNTER_MASK, - .d_INT_STATUS_ENABLE_MBOX_DATA_LSB = - AR6320_INT_STATUS_ENABLE_MBOX_DATA_LSB, - .d_INT_STATUS_ENABLE_MBOX_DATA_MASK = - AR6320_INT_STATUS_ENABLE_MBOX_DATA_MASK, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB = - AR6320_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK = - AR6320_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB = - AR6320_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK = - AR6320_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK, - .d_COUNTER_INT_STATUS_ENABLE_BIT_LSB = - AR6320_COUNTER_INT_STATUS_ENABLE_BIT_LSB, - .d_COUNTER_INT_STATUS_ENABLE_BIT_MASK = - AR6320_COUNTER_INT_STATUS_ENABLE_BIT_MASK, - .d_INT_STATUS_ENABLE_ADDRESS = AR6320_INT_STATUS_ENABLE_ADDRESS, - .d_CPU_INT_STATUS_ENABLE_BIT_LSB = - AR6320_CPU_INT_STATUS_ENABLE_BIT_LSB, - .d_CPU_INT_STATUS_ENABLE_BIT_MASK = - AR6320_CPU_INT_STATUS_ENABLE_BIT_MASK, - .d_HOST_INT_STATUS_ADDRESS = AR6320_HOST_INT_STATUS_ADDRESS, - .d_CPU_INT_STATUS_ADDRESS = AR6320_CPU_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_ADDRESS = AR6320_ERROR_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_WAKEUP_MASK = AR6320_ERROR_INT_STATUS_WAKEUP_MASK, - .d_ERROR_INT_STATUS_WAKEUP_LSB = AR6320_ERROR_INT_STATUS_WAKEUP_LSB, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK = - AR6320_ERROR_INT_STATUS_RX_UNDERFLOW_MASK, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB = - AR6320_ERROR_INT_STATUS_RX_UNDERFLOW_LSB, - .d_ERROR_INT_STATUS_TX_OVERFLOW_MASK = - AR6320_ERROR_INT_STATUS_TX_OVERFLOW_MASK, - .d_ERROR_INT_STATUS_TX_OVERFLOW_LSB = - AR6320_ERROR_INT_STATUS_TX_OVERFLOW_LSB, - .d_COUNT_DEC_ADDRESS = AR6320_COUNT_DEC_ADDRESS, - .d_HOST_INT_STATUS_CPU_MASK = AR6320_HOST_INT_STATUS_CPU_MASK, - .d_HOST_INT_STATUS_CPU_LSB = AR6320_HOST_INT_STATUS_CPU_LSB, - .d_HOST_INT_STATUS_ERROR_MASK = AR6320_HOST_INT_STATUS_ERROR_MASK, - .d_HOST_INT_STATUS_ERROR_LSB = AR6320_HOST_INT_STATUS_ERROR_LSB, - .d_HOST_INT_STATUS_COUNTER_MASK = AR6320_HOST_INT_STATUS_COUNTER_MASK, - .d_HOST_INT_STATUS_COUNTER_LSB = AR6320_HOST_INT_STATUS_COUNTER_LSB, - .d_RX_LOOKAHEAD_VALID_ADDRESS = AR6320_RX_LOOKAHEAD_VALID_ADDRESS, - .d_WINDOW_DATA_ADDRESS = AR6320_WINDOW_DATA_ADDRESS, - .d_WINDOW_READ_ADDR_ADDRESS = AR6320_WINDOW_READ_ADDR_ADDRESS, - .d_WINDOW_WRITE_ADDR_ADDRESS = AR6320_WINDOW_WRITE_ADDR_ADDRESS, - .d_SOC_GLOBAL_RESET_ADDRESS = AR6320_SOC_GLOBAL_RESET_ADDRESS, - .d_RTC_STATE_ADDRESS = AR6320_RTC_STATE_ADDRESS, - .d_RTC_STATE_COLD_RESET_MASK = AR6320_RTC_STATE_COLD_RESET_MASK, - .d_PCIE_LOCAL_BASE_ADDRESS = AR6320_PCIE_LOCAL_BASE_ADDRESS, - .d_PCIE_SOC_WAKE_RESET = AR6320_PCIE_SOC_WAKE_RESET, - .d_PCIE_SOC_WAKE_ADDRESS = AR6320_PCIE_SOC_WAKE_ADDRESS, - .d_PCIE_SOC_WAKE_V_MASK = AR6320_PCIE_SOC_WAKE_V_MASK, - .d_RTC_STATE_V_MASK = AR6320_RTC_STATE_V_MASK, - .d_RTC_STATE_V_LSB = AR6320_RTC_STATE_V_LSB, - .d_FW_IND_EVENT_PENDING = AR6320_FW_IND_EVENT_PENDING, - .d_FW_IND_INITIALIZED = AR6320_FW_IND_INITIALIZED, - .d_FW_IND_HELPER = AR6320_FW_IND_HELPER, - .d_RTC_STATE_V_ON = AR6320_RTC_STATE_V_ON, - .d_MUX_ID_MASK = AR6320_MUX_ID_MASK, - .d_TRANSACTION_ID_MASK = AR6320_TRANSACTION_ID_MASK, -#if defined(SDIO_3_0) - .d_HOST_INT_STATUS_MBOX_DATA_MASK = - AR6320_HOST_INT_STATUS_MBOX_DATA_MASK, - .d_HOST_INT_STATUS_MBOX_DATA_LSB = - AR6320_HOST_INT_STATUS_MBOX_DATA_LSB, -#endif - .d_PCIE_SOC_RDY_STATUS_ADDRESS = PCIE_SOC_RDY_STATUS_ADDRESS, - .d_PCIE_SOC_RDY_STATUS_BAR_MASK = PCIE_SOC_RDY_STATUS_BAR_MASK, - .d_SOC_PCIE_BASE_ADDRESS = SOC_PCIE_BASE_ADDRESS, - .d_MSI_MAGIC_ADR_ADDRESS = MSI_MAGIC_ADR_ADDRESS, - .d_MSI_MAGIC_ADDRESS = MSI_MAGIC_ADDRESS, - .d_HOST_CE_COUNT = 8, - .d_ENABLE_MSI = 0, -}; - - -struct ce_reg_def ar6320_ce_targetdef = { - /* copy_engine.c */ - .d_DST_WR_INDEX_ADDRESS = AR6320_DST_WR_INDEX_ADDRESS, - .d_SRC_WATERMARK_ADDRESS = AR6320_SRC_WATERMARK_ADDRESS, - .d_SRC_WATERMARK_LOW_MASK = AR6320_SRC_WATERMARK_LOW_MASK, - .d_SRC_WATERMARK_HIGH_MASK = AR6320_SRC_WATERMARK_HIGH_MASK, - .d_DST_WATERMARK_LOW_MASK = AR6320_DST_WATERMARK_LOW_MASK, - .d_DST_WATERMARK_HIGH_MASK = AR6320_DST_WATERMARK_HIGH_MASK, - .d_CURRENT_SRRI_ADDRESS = AR6320_CURRENT_SRRI_ADDRESS, - .d_CURRENT_DRRI_ADDRESS = AR6320_CURRENT_DRRI_ADDRESS, - .d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK = - AR6320_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK = - AR6320_HOST_IS_SRC_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK = - AR6320_HOST_IS_DST_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_DST_RING_LOW_WATERMARK_MASK = - AR6320_HOST_IS_DST_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_ADDRESS = AR6320_HOST_IS_ADDRESS, - .d_HOST_IS_COPY_COMPLETE_MASK = AR6320_HOST_IS_COPY_COMPLETE_MASK, - .d_CE_WRAPPER_BASE_ADDRESS = AR6320_CE_WRAPPER_BASE_ADDRESS, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS = - AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS, - .d_HOST_IE_ADDRESS = AR6320_HOST_IE_ADDRESS, - .d_HOST_IE_COPY_COMPLETE_MASK = AR6320_HOST_IE_COPY_COMPLETE_MASK, - .d_SR_BA_ADDRESS = AR6320_SR_BA_ADDRESS, - .d_SR_SIZE_ADDRESS = AR6320_SR_SIZE_ADDRESS, - .d_CE_CTRL1_ADDRESS = AR6320_CE_CTRL1_ADDRESS, - .d_CE_CTRL1_DMAX_LENGTH_MASK = AR6320_CE_CTRL1_DMAX_LENGTH_MASK, - .d_DR_BA_ADDRESS = AR6320_DR_BA_ADDRESS, - .d_DR_SIZE_ADDRESS = AR6320_DR_SIZE_ADDRESS, - .d_MISC_IE_ADDRESS = AR6320_MISC_IE_ADDRESS, - .d_MISC_IS_AXI_ERR_MASK = AR6320_MISC_IS_AXI_ERR_MASK, - .d_MISC_IS_DST_ADDR_ERR_MASK = AR6320_MISC_IS_DST_ADDR_ERR_MASK, - .d_MISC_IS_SRC_LEN_ERR_MASK = AR6320_MISC_IS_SRC_LEN_ERR_MASK, - .d_MISC_IS_DST_MAX_LEN_VIO_MASK = AR6320_MISC_IS_DST_MAX_LEN_VIO_MASK, - .d_MISC_IS_DST_RING_OVERFLOW_MASK = - AR6320_MISC_IS_DST_RING_OVERFLOW_MASK, - .d_MISC_IS_SRC_RING_OVERFLOW_MASK = - AR6320_MISC_IS_SRC_RING_OVERFLOW_MASK, - .d_SRC_WATERMARK_LOW_LSB = AR6320_SRC_WATERMARK_LOW_LSB, - .d_SRC_WATERMARK_HIGH_LSB = AR6320_SRC_WATERMARK_HIGH_LSB, - .d_DST_WATERMARK_LOW_LSB = AR6320_DST_WATERMARK_LOW_LSB, - .d_DST_WATERMARK_HIGH_LSB = AR6320_DST_WATERMARK_HIGH_LSB, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK = - AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB = - AR6320_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB, - .d_CE_CTRL1_DMAX_LENGTH_LSB = AR6320_CE_CTRL1_DMAX_LENGTH_LSB, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK = - AR6320_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK = - AR6320_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB = - AR6320_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB = - AR6320_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB, - .d_CE_WRAPPER_DEBUG_OFFSET = AR6320_CE_WRAPPER_DEBUG_OFFSET, - .d_CE_WRAPPER_DEBUG_SEL_MSB = AR6320_CE_WRAPPER_DEBUG_SEL_MSB, - .d_CE_WRAPPER_DEBUG_SEL_LSB = AR6320_CE_WRAPPER_DEBUG_SEL_LSB, - .d_CE_WRAPPER_DEBUG_SEL_MASK = AR6320_CE_WRAPPER_DEBUG_SEL_MASK, - .d_CE_DEBUG_OFFSET = AR6320_CE_DEBUG_OFFSET, - .d_CE_DEBUG_SEL_MSB = AR6320_CE_DEBUG_SEL_MSB, - .d_CE_DEBUG_SEL_LSB = AR6320_CE_DEBUG_SEL_LSB, - .d_CE_DEBUG_SEL_MASK = AR6320_CE_DEBUG_SEL_MASK, - .d_CE0_BASE_ADDRESS = AR6320_CE0_BASE_ADDRESS, - .d_CE1_BASE_ADDRESS = AR6320_CE1_BASE_ADDRESS, - -}; - -#endif diff --git a/core/hif/src/ar6320v2def.h b/core/hif/src/ar6320v2def.h deleted file mode 100644 index 1b3b92598fcc..000000000000 --- a/core/hif/src/ar6320v2def.h +++ /dev/null @@ -1,815 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _AR6320V2DEF_H_ -#define _AR6320V2DEF_H_ - -/* Base Addresses */ -#define AR6320V2_RTC_SOC_BASE_ADDRESS 0x00000800 -#define AR6320V2_RTC_WMAC_BASE_ADDRESS 0x00001000 -#define AR6320V2_MAC_COEX_BASE_ADDRESS 0x0000f000 -#define AR6320V2_BT_COEX_BASE_ADDRESS 0x00002000 -#define AR6320V2_SOC_PCIE_BASE_ADDRESS 0x00038000 -#define AR6320V2_SOC_CORE_BASE_ADDRESS 0x0003a000 -#define AR6320V2_WLAN_UART_BASE_ADDRESS 0x0000c000 -#define AR6320V2_WLAN_SI_BASE_ADDRESS 0x00010000 -#define AR6320V2_WLAN_GPIO_BASE_ADDRESS 0x00005000 -#define AR6320V2_WLAN_ANALOG_INTF_BASE_ADDRESS 0x00006000 -#define AR6320V2_WLAN_MAC_BASE_ADDRESS 0x00010000 -#define AR6320V2_EFUSE_BASE_ADDRESS 0x00024000 -#define AR6320V2_FPGA_REG_BASE_ADDRESS 0x00039000 -#define AR6320V2_WLAN_UART2_BASE_ADDRESS 0x00054c00 -#define AR6320V2_CE_WRAPPER_BASE_ADDRESS 0x00034000 -#define AR6320V2_CE0_BASE_ADDRESS 0x00034400 -#define AR6320V2_CE1_BASE_ADDRESS 0x00034800 -#define AR6320V2_CE2_BASE_ADDRESS 0x00034c00 -#define AR6320V2_CE3_BASE_ADDRESS 0x00035000 -#define AR6320V2_CE4_BASE_ADDRESS 0x00035400 -#define AR6320V2_CE5_BASE_ADDRESS 0x00035800 -#define AR6320V2_CE6_BASE_ADDRESS 0x00035c00 -#define AR6320V2_CE7_BASE_ADDRESS 0x00036000 -#define AR6320V2_DBI_BASE_ADDRESS 0x0003c000 -#define AR6320V2_WLAN_ANALOG_INTF_PCIE_BASE_ADDRESS 0x00007800 - -#define AR6320V2_SCRATCH_3_ADDRESS 0x0028 -#define AR6320V2_TARG_DRAM_START 0x00400000 -#define AR6320V2_SOC_SYSTEM_SLEEP_OFFSET 0x000000c0 -#define AR6320V2_SOC_RESET_CONTROL_OFFSET 0x00000000 -#define AR6320V2_SOC_CLOCK_CONTROL_OFFSET 0x00000028 -#define AR6320V2_SOC_CLOCK_CONTROL_SI0_CLK_MASK 0x00000001 -#define AR6320V2_SOC_RESET_CONTROL_SI0_RST_MASK 0x00000000 -#define AR6320V2_WLAN_GPIO_PIN0_ADDRESS 0x00000068 -#define AR6320V2_WLAN_GPIO_PIN1_ADDRESS 0x0000006c -#define AR6320V2_WLAN_GPIO_PIN0_CONFIG_MASK 0x00007800 -#define AR6320V2_WLAN_GPIO_PIN1_CONFIG_MASK 0x00007800 -#define AR6320V2_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define AR6320V2_SOC_LPO_CAL_OFFSET 0x000000e0 -#define AR6320V2_WLAN_GPIO_PIN10_ADDRESS 0x00000090 -#define AR6320V2_WLAN_GPIO_PIN11_ADDRESS 0x00000094 -#define AR6320V2_WLAN_GPIO_PIN12_ADDRESS 0x00000098 -#define AR6320V2_WLAN_GPIO_PIN13_ADDRESS 0x0000009c -#define AR6320V2_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define AR6320V2_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -#define AR6320V2_SOC_LPO_CAL_ENABLE_LSB 20 -#define AR6320V2_SOC_LPO_CAL_ENABLE_MASK 0x00100000 - -#define AR6320V2_WLAN_SYSTEM_SLEEP_DISABLE_LSB 0 -#define AR6320V2_WLAN_SYSTEM_SLEEP_DISABLE_MASK 0x00000001 -#define AR6320V2_WLAN_RESET_CONTROL_COLD_RST_MASK 0x00000008 -#define AR6320V2_WLAN_RESET_CONTROL_WARM_RST_MASK 0x00000004 -#define AR6320V2_SI_CONFIG_BIDIR_OD_DATA_LSB 18 -#define AR6320V2_SI_CONFIG_BIDIR_OD_DATA_MASK 0x00040000 -#define AR6320V2_SI_CONFIG_I2C_LSB 16 -#define AR6320V2_SI_CONFIG_I2C_MASK 0x00010000 -#define AR6320V2_SI_CONFIG_POS_SAMPLE_LSB 7 -#define AR6320V2_SI_CONFIG_POS_SAMPLE_MASK 0x00000080 -#define AR6320V2_SI_CONFIG_INACTIVE_CLK_LSB 4 -#define AR6320V2_SI_CONFIG_INACTIVE_CLK_MASK 0x00000010 -#define AR6320V2_SI_CONFIG_INACTIVE_DATA_LSB 5 -#define AR6320V2_SI_CONFIG_INACTIVE_DATA_MASK 0x00000020 -#define AR6320V2_SI_CONFIG_DIVIDER_LSB 0 -#define AR6320V2_SI_CONFIG_DIVIDER_MASK 0x0000000f -#define AR6320V2_SI_CONFIG_OFFSET 0x00000000 -#define AR6320V2_SI_TX_DATA0_OFFSET 0x00000008 -#define AR6320V2_SI_TX_DATA1_OFFSET 0x0000000c -#define AR6320V2_SI_RX_DATA0_OFFSET 0x00000010 -#define AR6320V2_SI_RX_DATA1_OFFSET 0x00000014 -#define AR6320V2_SI_CS_OFFSET 0x00000004 -#define AR6320V2_SI_CS_DONE_ERR_MASK 0x00000400 -#define AR6320V2_SI_CS_DONE_INT_MASK 0x00000200 -#define AR6320V2_SI_CS_START_LSB 8 -#define AR6320V2_SI_CS_START_MASK 0x00000100 -#define AR6320V2_SI_CS_RX_CNT_LSB 4 -#define AR6320V2_SI_CS_RX_CNT_MASK 0x000000f0 -#define AR6320V2_SI_CS_TX_CNT_LSB 0 -#define AR6320V2_SI_CS_TX_CNT_MASK 0x0000000f -#define AR6320V2_CE_COUNT 8 -#define AR6320V2_SR_WR_INDEX_ADDRESS 0x003c -#define AR6320V2_DST_WATERMARK_ADDRESS 0x0050 -#define AR6320V2_RX_MSDU_END_4_FIRST_MSDU_LSB 14 -#define AR6320V2_RX_MSDU_END_4_FIRST_MSDU_MASK 0x00004000 -#define AR6320V2_RX_MPDU_START_0_RETRY_LSB 14 -#define AR6320V2_RX_MPDU_START_0_RETRY_MASK 0x00004000 -#define AR6320V2_RX_MPDU_START_0_SEQ_NUM_LSB 16 -#define AR6320V2_RX_MPDU_START_0_SEQ_NUM_MASK 0x0fff0000 -#define AR6320V2_RX_MPDU_START_2_PN_47_32_LSB 0 -#define AR6320V2_RX_MPDU_START_2_PN_47_32_MASK 0x0000ffff -#define AR6320V2_RX_MPDU_START_2_TID_LSB 28 -#define AR6320V2_RX_MPDU_START_2_TID_MASK 0xf0000000 -#define AR6320V2_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB 16 -#define AR6320V2_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK 0xffff0000 -#define AR6320V2_RX_MSDU_END_4_LAST_MSDU_LSB 15 -#define AR6320V2_RX_MSDU_END_4_LAST_MSDU_MASK 0x00008000 -#define AR6320V2_RX_ATTENTION_0_MCAST_BCAST_LSB 2 -#define AR6320V2_RX_ATTENTION_0_MCAST_BCAST_MASK 0x00000004 -#define AR6320V2_RX_ATTENTION_0_FRAGMENT_LSB 13 -#define AR6320V2_RX_ATTENTION_0_FRAGMENT_MASK 0x00002000 -#define AR6320V2_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK 0x08000000 -#define AR6320V2_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB 16 -#define AR6320V2_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK 0x00ff0000 -#define AR6320V2_RX_MSDU_START_0_MSDU_LENGTH_LSB 0 -#define AR6320V2_RX_MSDU_START_0_MSDU_LENGTH_MASK 0x00003fff - -#define AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_OFFSET 0x00000008 -#define AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_LSB 8 -#define AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_MASK 0x00000300 -#define AR6320V2_RX_MPDU_START_0_ENCRYPTED_LSB 13 -#define AR6320V2_RX_MPDU_START_0_ENCRYPTED_MASK 0x00002000 -#define AR6320V2_RX_ATTENTION_0_MORE_DATA_MASK 0x00000400 -#define AR6320V2_RX_ATTENTION_0_MSDU_DONE_MASK 0x80000000 -#define AR6320V2_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK 0x00040000 -#define AR6320V2_DST_WR_INDEX_ADDRESS 0x0040 -#define AR6320V2_SRC_WATERMARK_ADDRESS 0x004c -#define AR6320V2_SRC_WATERMARK_LOW_MASK 0xffff0000 -#define AR6320V2_SRC_WATERMARK_HIGH_MASK 0x0000ffff -#define AR6320V2_DST_WATERMARK_LOW_MASK 0xffff0000 -#define AR6320V2_DST_WATERMARK_HIGH_MASK 0x0000ffff -#define AR6320V2_CURRENT_SRRI_ADDRESS 0x0044 -#define AR6320V2_CURRENT_DRRI_ADDRESS 0x0048 -#define AR6320V2_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK 0x00000002 -#define AR6320V2_HOST_IS_SRC_RING_LOW_WATERMARK_MASK 0x00000004 -#define AR6320V2_HOST_IS_DST_RING_HIGH_WATERMARK_MASK 0x00000008 -#define AR6320V2_HOST_IS_DST_RING_LOW_WATERMARK_MASK 0x00000010 -#define AR6320V2_HOST_IS_ADDRESS 0x0030 -#define AR6320V2_HOST_IS_COPY_COMPLETE_MASK 0x00000001 -#define AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS 0x0000 -#define AR6320V2_HOST_IE_ADDRESS 0x002c -#define AR6320V2_HOST_IE_COPY_COMPLETE_MASK 0x00000001 -#define AR6320V2_SR_BA_ADDRESS 0x0000 -#define AR6320V2_SR_SIZE_ADDRESS 0x0004 -#define AR6320V2_CE_CTRL1_ADDRESS 0x0010 -#define AR6320V2_CE_CTRL1_DMAX_LENGTH_MASK 0x0000ffff -#define AR6320V2_DR_BA_ADDRESS 0x0008 -#define AR6320V2_DR_SIZE_ADDRESS 0x000c -#define AR6320V2_MISC_IE_ADDRESS 0x0034 -#define AR6320V2_MISC_IS_AXI_ERR_MASK 0x00000400 -#define AR6320V2_MISC_IS_DST_ADDR_ERR_MASK 0x00000200 -#define AR6320V2_MISC_IS_SRC_LEN_ERR_MASK 0x00000100 -#define AR6320V2_MISC_IS_DST_MAX_LEN_VIO_MASK 0x00000080 -#define AR6320V2_MISC_IS_DST_RING_OVERFLOW_MASK 0x00000040 -#define AR6320V2_MISC_IS_SRC_RING_OVERFLOW_MASK 0x00000020 -#define AR6320V2_SRC_WATERMARK_LOW_LSB 16 -#define AR6320V2_SRC_WATERMARK_HIGH_LSB 0 -#define AR6320V2_DST_WATERMARK_LOW_LSB 16 -#define AR6320V2_DST_WATERMARK_HIGH_LSB 0 -#define AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK 0x0000ff00 -#define AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB 8 -#define AR6320V2_CE_CTRL1_DMAX_LENGTH_LSB 0 -#define AR6320V2_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK 0x00010000 -#define AR6320V2_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK 0x00020000 -#define AR6320V2_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB 16 -#define AR6320V2_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB 17 -#define AR6320V2_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK 0x00000020 -#define AR6320V2_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB 5 -#define AR6320V2_SOC_GLOBAL_RESET_ADDRESS 0x0008 -#define AR6320V2_RTC_STATE_ADDRESS 0x0000 -#define AR6320V2_RTC_STATE_COLD_RESET_MASK 0x00002000 -#define AR6320V2_PCIE_SOC_WAKE_RESET 0x00000000 -#define AR6320V2_PCIE_SOC_WAKE_ADDRESS 0x0004 -#define AR6320V2_PCIE_SOC_WAKE_V_MASK 0x00000001 -#define AR6320V2_RTC_STATE_V_MASK 0x00000007 -#define AR6320V2_RTC_STATE_V_LSB 0 -#define AR6320V2_RTC_STATE_V_ON 3 -#define AR6320V2_MUX_ID_MASK 0x0000 -#define AR6320V2_TRANSACTION_ID_MASK 0x3fff -#define AR6320V2_PCIE_LOCAL_BASE_ADDRESS 0x80000 -#define AR6320V2_FW_IND_EVENT_PENDING 1 -#define AR6320V2_FW_IND_INITIALIZED 2 -#define AR6320V2_FW_IND_HELPER 4 -#define AR6320V2_PCIE_INTR_ENABLE_ADDRESS 0x0008 -#define AR6320V2_PCIE_INTR_CLR_ADDRESS 0x0014 -#define AR6320V2_PCIE_INTR_FIRMWARE_MASK 0x00000400 -#define AR6320V2_PCIE_INTR_CE0_MASK 0x00000800 -#define AR6320V2_PCIE_INTR_CE_MASK_ALL 0x0007f800 -#define AR6320V2_PCIE_INTR_CAUSE_ADDRESS 0x000c -#define AR6320V2_CPU_INTR_ADDRESS 0x0010 -#define AR6320V2_SOC_LF_TIMER_CONTROL0_ADDRESS 0x00000050 -#define AR6320V2_SOC_LF_TIMER_CONTROL0_ENABLE_MASK 0x00000004 -#define AR6320V2_SOC_RESET_CONTROL_ADDRESS 0x00000000 -#define AR6320V2_SOC_RESET_CONTROL_CE_RST_MASK 0x00000001 -#define AR6320V2_SOC_RESET_CONTROL_CPU_WARM_RST_MASK 0x00000040 -#define AR6320V2_CORE_CTRL_ADDRESS 0x0000 -#define AR6320V2_CORE_CTRL_CPU_INTR_MASK 0x00002000 -#define AR6320V2_LOCAL_SCRATCH_OFFSET 0x000000c0 -#define AR6320V2_CLOCK_GPIO_OFFSET 0xffffffff -#define AR6320V2_CLOCK_GPIO_BT_CLK_OUT_EN_LSB 0 -#define AR6320V2_CLOCK_GPIO_BT_CLK_OUT_EN_MASK 0 -#define AR6320V2_SOC_CHIP_ID_ADDRESS 0x000000f0 -#define AR6320V2_SOC_CHIP_ID_VERSION_MASK 0xfffc0000 -#define AR6320V2_SOC_CHIP_ID_VERSION_LSB 18 -#define AR6320V2_SOC_CHIP_ID_REVISION_MASK 0x00000f00 -#define AR6320V2_SOC_CHIP_ID_REVISION_LSB 8 -#define AR6320V2_SOC_POWER_REG_OFFSET 0x0000010c - -/* Copy Engine Debug */ -#define AR6320V2_WLAN_DEBUG_INPUT_SEL_OFFSET 0x0000010c -#define AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_MSB 3 -#define AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_LSB 0 -#define AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_MASK 0x0000000f -#define AR6320V2_WLAN_DEBUG_CONTROL_OFFSET 0x00000108 -#define AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_MSB 0 -#define AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_LSB 0 -#define AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_MASK 0x00000001 -#define AR6320V2_WLAN_DEBUG_OUT_OFFSET 0x00000110 -#define AR6320V2_WLAN_DEBUG_OUT_DATA_MSB 19 -#define AR6320V2_WLAN_DEBUG_OUT_DATA_LSB 0 -#define AR6320V2_WLAN_DEBUG_OUT_DATA_MASK 0x000fffff -#define AR6320V2_AMBA_DEBUG_BUS_OFFSET 0x0000011c -#define AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB 13 -#define AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB 8 -#define AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK 0x00003f00 -#define AR6320V2_AMBA_DEBUG_BUS_SEL_MSB 4 -#define AR6320V2_AMBA_DEBUG_BUS_SEL_LSB 0 -#define AR6320V2_AMBA_DEBUG_BUS_SEL_MASK 0x0000001f -#define AR6320V2_CE_WRAPPER_DEBUG_OFFSET 0x0008 -#define AR6320V2_CE_WRAPPER_DEBUG_SEL_MSB 5 -#define AR6320V2_CE_WRAPPER_DEBUG_SEL_LSB 0 -#define AR6320V2_CE_WRAPPER_DEBUG_SEL_MASK 0x0000003f -#define AR6320V2_CE_DEBUG_OFFSET 0x0054 -#define AR6320V2_CE_DEBUG_SEL_MSB 5 -#define AR6320V2_CE_DEBUG_SEL_LSB 0 -#define AR6320V2_CE_DEBUG_SEL_MASK 0x0000003f -/* End */ - -/* PLL start */ -#define AR6320V2_EFUSE_OFFSET 0x0000032c -#define AR6320V2_EFUSE_XTAL_SEL_MSB 10 -#define AR6320V2_EFUSE_XTAL_SEL_LSB 8 -#define AR6320V2_EFUSE_XTAL_SEL_MASK 0x00000700 -#define AR6320V2_BB_PLL_CONFIG_OFFSET 0x000002f4 -#define AR6320V2_BB_PLL_CONFIG_OUTDIV_MSB 20 -#define AR6320V2_BB_PLL_CONFIG_OUTDIV_LSB 18 -#define AR6320V2_BB_PLL_CONFIG_OUTDIV_MASK 0x001c0000 -#define AR6320V2_BB_PLL_CONFIG_FRAC_MSB 17 -#define AR6320V2_BB_PLL_CONFIG_FRAC_LSB 0 -#define AR6320V2_BB_PLL_CONFIG_FRAC_MASK 0x0003ffff -#define AR6320V2_WLAN_PLL_SETTLE_TIME_MSB 10 -#define AR6320V2_WLAN_PLL_SETTLE_TIME_LSB 0 -#define AR6320V2_WLAN_PLL_SETTLE_TIME_MASK 0x000007ff -#define AR6320V2_WLAN_PLL_SETTLE_OFFSET 0x0018 -#define AR6320V2_WLAN_PLL_SETTLE_SW_MASK 0x000007ff -#define AR6320V2_WLAN_PLL_SETTLE_RSTMASK 0xffffffff -#define AR6320V2_WLAN_PLL_SETTLE_RESET 0x00000400 -#define AR6320V2_WLAN_PLL_CONTROL_NOPWD_MSB 18 -#define AR6320V2_WLAN_PLL_CONTROL_NOPWD_LSB 18 -#define AR6320V2_WLAN_PLL_CONTROL_NOPWD_MASK 0x00040000 -#define AR6320V2_WLAN_PLL_CONTROL_BYPASS_MSB 16 -#define AR6320V2_WLAN_PLL_CONTROL_BYPASS_LSB 16 -#define AR6320V2_WLAN_PLL_CONTROL_BYPASS_MASK 0x00010000 -#define AR6320V2_WLAN_PLL_CONTROL_BYPASS_RESET 0x1 -#define AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_MSB 15 -#define AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_LSB 14 -#define AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_MASK 0x0000c000 -#define AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_RESET 0x0 -#define AR6320V2_WLAN_PLL_CONTROL_REFDIV_MSB 13 -#define AR6320V2_WLAN_PLL_CONTROL_REFDIV_LSB 10 -#define AR6320V2_WLAN_PLL_CONTROL_REFDIV_MASK 0x00003c00 -#define AR6320V2_WLAN_PLL_CONTROL_REFDIV_RESET 0x0 -#define AR6320V2_WLAN_PLL_CONTROL_DIV_MSB 9 -#define AR6320V2_WLAN_PLL_CONTROL_DIV_LSB 0 -#define AR6320V2_WLAN_PLL_CONTROL_DIV_MASK 0x000003ff -#define AR6320V2_WLAN_PLL_CONTROL_DIV_RESET 0x11 -#define AR6320V2_WLAN_PLL_CONTROL_OFFSET 0x0014 -#define AR6320V2_WLAN_PLL_CONTROL_SW_MASK 0x001fffff -#define AR6320V2_WLAN_PLL_CONTROL_RSTMASK 0xffffffff -#define AR6320V2_WLAN_PLL_CONTROL_RESET 0x00010011 -#define AR6320V2_SOC_CORE_CLK_CTRL_OFFSET 0x00000114 -#define AR6320V2_SOC_CORE_CLK_CTRL_DIV_MSB 2 -#define AR6320V2_SOC_CORE_CLK_CTRL_DIV_LSB 0 -#define AR6320V2_SOC_CORE_CLK_CTRL_DIV_MASK 0x00000007 -#define AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_MSB 5 -#define AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_LSB 5 -#define AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_MASK 0x00000020 -#define AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_RESET 0x0 -#define AR6320V2_RTC_SYNC_STATUS_OFFSET 0x0244 -#define AR6320V2_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define AR6320V2_SOC_CPU_CLOCK_STANDARD_MSB 1 -#define AR6320V2_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define AR6320V2_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -/* PLL end */ - -#define AR6320V2_PCIE_INTR_CE_MASK(n) \ - (AR6320V2_PCIE_INTR_CE0_MASK << (n)) -#define AR6320V2_DRAM_BASE_ADDRESS AR6320V2_TARG_DRAM_START -#define AR6320V2_FW_INDICATOR_ADDRESS \ - (AR6320V2_SOC_CORE_BASE_ADDRESS + AR6320V2_SCRATCH_3_ADDRESS) -#define AR6320V2_SYSTEM_SLEEP_OFFSET AR6320V2_SOC_SYSTEM_SLEEP_OFFSET -#define AR6320V2_WLAN_SYSTEM_SLEEP_OFFSET 0x002c -#define AR6320V2_WLAN_RESET_CONTROL_OFFSET AR6320V2_SOC_RESET_CONTROL_OFFSET -#define AR6320V2_CLOCK_CONTROL_OFFSET AR6320V2_SOC_CLOCK_CONTROL_OFFSET -#define AR6320V2_CLOCK_CONTROL_SI0_CLK_MASK \ - AR6320V2_SOC_CLOCK_CONTROL_SI0_CLK_MASK -#define AR6320V2_RESET_CONTROL_MBOX_RST_MASK 0x00000004 -#define AR6320V2_RESET_CONTROL_SI0_RST_MASK \ - AR6320V2_SOC_RESET_CONTROL_SI0_RST_MASK -#define AR6320V2_GPIO_BASE_ADDRESS AR6320V2_WLAN_GPIO_BASE_ADDRESS -#define AR6320V2_GPIO_PIN0_OFFSET AR6320V2_WLAN_GPIO_PIN0_ADDRESS -#define AR6320V2_GPIO_PIN1_OFFSET AR6320V2_WLAN_GPIO_PIN1_ADDRESS -#define AR6320V2_GPIO_PIN0_CONFIG_MASK AR6320V2_WLAN_GPIO_PIN0_CONFIG_MASK -#define AR6320V2_GPIO_PIN1_CONFIG_MASK AR6320V2_WLAN_GPIO_PIN1_CONFIG_MASK -#define AR6320V2_SI_BASE_ADDRESS 0x00050000 -#define AR6320V2_CPU_CLOCK_OFFSET AR6320V2_SOC_CPU_CLOCK_OFFSET -#define AR6320V2_LPO_CAL_OFFSET AR6320V2_SOC_LPO_CAL_OFFSET -#define AR6320V2_GPIO_PIN10_OFFSET AR6320V2_WLAN_GPIO_PIN10_ADDRESS -#define AR6320V2_GPIO_PIN11_OFFSET AR6320V2_WLAN_GPIO_PIN11_ADDRESS -#define AR6320V2_GPIO_PIN12_OFFSET AR6320V2_WLAN_GPIO_PIN12_ADDRESS -#define AR6320V2_GPIO_PIN13_OFFSET AR6320V2_WLAN_GPIO_PIN13_ADDRESS -#define AR6320V2_CPU_CLOCK_STANDARD_LSB AR6320V2_SOC_CPU_CLOCK_STANDARD_LSB -#define AR6320V2_CPU_CLOCK_STANDARD_MASK AR6320V2_SOC_CPU_CLOCK_STANDARD_MASK -#define AR6320V2_LPO_CAL_ENABLE_LSB AR6320V2_SOC_LPO_CAL_ENABLE_LSB -#define AR6320V2_LPO_CAL_ENABLE_MASK AR6320V2_SOC_LPO_CAL_ENABLE_MASK -#define AR6320V2_ANALOG_INTF_BASE_ADDRESS \ - AR6320V2_WLAN_ANALOG_INTF_BASE_ADDRESS -#define AR6320V2_MBOX_BASE_ADDRESS 0x00008000 -#define AR6320V2_INT_STATUS_ENABLE_ERROR_LSB 7 -#define AR6320V2_INT_STATUS_ENABLE_ERROR_MASK 0x00000080 -#define AR6320V2_INT_STATUS_ENABLE_CPU_LSB 6 -#define AR6320V2_INT_STATUS_ENABLE_CPU_MASK 0x00000040 -#define AR6320V2_INT_STATUS_ENABLE_COUNTER_LSB 4 -#define AR6320V2_INT_STATUS_ENABLE_COUNTER_MASK 0x00000010 -#define AR6320V2_INT_STATUS_ENABLE_MBOX_DATA_LSB 0 -#define AR6320V2_INT_STATUS_ENABLE_MBOX_DATA_MASK 0x0000000f -#define AR6320V2_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB 17 -#define AR6320V2_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK 0x00020000 -#define AR6320V2_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB 16 -#define AR6320V2_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK 0x00010000 -#define AR6320V2_COUNTER_INT_STATUS_ENABLE_BIT_LSB 24 -#define AR6320V2_COUNTER_INT_STATUS_ENABLE_BIT_MASK 0xff000000 -#define AR6320V2_INT_STATUS_ENABLE_ADDRESS 0x0828 -#define AR6320V2_CPU_INT_STATUS_ENABLE_BIT_LSB 8 -#define AR6320V2_CPU_INT_STATUS_ENABLE_BIT_MASK 0x0000ff00 -#define AR6320V2_HOST_INT_STATUS_ADDRESS 0x0800 -#define AR6320V2_CPU_INT_STATUS_ADDRESS 0x0801 -#define AR6320V2_ERROR_INT_STATUS_ADDRESS 0x0802 -#define AR6320V2_ERROR_INT_STATUS_WAKEUP_MASK 0x00040000 -#define AR6320V2_ERROR_INT_STATUS_WAKEUP_LSB 18 -#define AR6320V2_ERROR_INT_STATUS_RX_UNDERFLOW_MASK 0x00020000 -#define AR6320V2_ERROR_INT_STATUS_RX_UNDERFLOW_LSB 17 -#define AR6320V2_ERROR_INT_STATUS_TX_OVERFLOW_MASK 0x00010000 -#define AR6320V2_ERROR_INT_STATUS_TX_OVERFLOW_LSB 16 -#define AR6320V2_COUNT_DEC_ADDRESS 0x0840 -#define AR6320V2_HOST_INT_STATUS_CPU_MASK 0x00000040 -#define AR6320V2_HOST_INT_STATUS_CPU_LSB 6 -#define AR6320V2_HOST_INT_STATUS_ERROR_MASK 0x00000080 -#define AR6320V2_HOST_INT_STATUS_ERROR_LSB 7 -#define AR6320V2_HOST_INT_STATUS_COUNTER_MASK 0x00000010 -#define AR6320V2_HOST_INT_STATUS_COUNTER_LSB 4 -#define AR6320V2_RX_LOOKAHEAD_VALID_ADDRESS 0x0805 -#define AR6320V2_WINDOW_DATA_ADDRESS 0x0874 -#define AR6320V2_WINDOW_READ_ADDR_ADDRESS 0x087c -#define AR6320V2_WINDOW_WRITE_ADDR_ADDRESS 0x0878 - -struct targetdef_s ar6320v2_targetdef = { - .d_RTC_SOC_BASE_ADDRESS = AR6320V2_RTC_SOC_BASE_ADDRESS, - .d_RTC_WMAC_BASE_ADDRESS = AR6320V2_RTC_WMAC_BASE_ADDRESS, - .d_SYSTEM_SLEEP_OFFSET = AR6320V2_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_OFFSET = AR6320V2_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_DISABLE_LSB = - AR6320V2_WLAN_SYSTEM_SLEEP_DISABLE_LSB, - .d_WLAN_SYSTEM_SLEEP_DISABLE_MASK = - AR6320V2_WLAN_SYSTEM_SLEEP_DISABLE_MASK, - .d_CLOCK_CONTROL_OFFSET = AR6320V2_CLOCK_CONTROL_OFFSET, - .d_CLOCK_CONTROL_SI0_CLK_MASK = AR6320V2_CLOCK_CONTROL_SI0_CLK_MASK, - .d_RESET_CONTROL_OFFSET = AR6320V2_SOC_RESET_CONTROL_OFFSET, - .d_RESET_CONTROL_MBOX_RST_MASK = AR6320V2_RESET_CONTROL_MBOX_RST_MASK, - .d_RESET_CONTROL_SI0_RST_MASK = AR6320V2_RESET_CONTROL_SI0_RST_MASK, - .d_WLAN_RESET_CONTROL_OFFSET = AR6320V2_WLAN_RESET_CONTROL_OFFSET, - .d_WLAN_RESET_CONTROL_COLD_RST_MASK = - AR6320V2_WLAN_RESET_CONTROL_COLD_RST_MASK, - .d_WLAN_RESET_CONTROL_WARM_RST_MASK = - AR6320V2_WLAN_RESET_CONTROL_WARM_RST_MASK, - .d_GPIO_BASE_ADDRESS = AR6320V2_GPIO_BASE_ADDRESS, - .d_GPIO_PIN0_OFFSET = AR6320V2_GPIO_PIN0_OFFSET, - .d_GPIO_PIN1_OFFSET = AR6320V2_GPIO_PIN1_OFFSET, - .d_GPIO_PIN0_CONFIG_MASK = AR6320V2_GPIO_PIN0_CONFIG_MASK, - .d_GPIO_PIN1_CONFIG_MASK = AR6320V2_GPIO_PIN1_CONFIG_MASK, - .d_SI_CONFIG_BIDIR_OD_DATA_LSB = AR6320V2_SI_CONFIG_BIDIR_OD_DATA_LSB, - .d_SI_CONFIG_BIDIR_OD_DATA_MASK = - AR6320V2_SI_CONFIG_BIDIR_OD_DATA_MASK, - .d_SI_CONFIG_I2C_LSB = AR6320V2_SI_CONFIG_I2C_LSB, - .d_SI_CONFIG_I2C_MASK = AR6320V2_SI_CONFIG_I2C_MASK, - .d_SI_CONFIG_POS_SAMPLE_LSB = AR6320V2_SI_CONFIG_POS_SAMPLE_LSB, - .d_SI_CONFIG_POS_SAMPLE_MASK = AR6320V2_SI_CONFIG_POS_SAMPLE_MASK, - .d_SI_CONFIG_INACTIVE_CLK_LSB = AR6320V2_SI_CONFIG_INACTIVE_CLK_LSB, - .d_SI_CONFIG_INACTIVE_CLK_MASK = AR6320V2_SI_CONFIG_INACTIVE_CLK_MASK, - .d_SI_CONFIG_INACTIVE_DATA_LSB = AR6320V2_SI_CONFIG_INACTIVE_DATA_LSB, - .d_SI_CONFIG_INACTIVE_DATA_MASK = - AR6320V2_SI_CONFIG_INACTIVE_DATA_MASK, - .d_SI_CONFIG_DIVIDER_LSB = AR6320V2_SI_CONFIG_DIVIDER_LSB, - .d_SI_CONFIG_DIVIDER_MASK = AR6320V2_SI_CONFIG_DIVIDER_MASK, - .d_SI_BASE_ADDRESS = AR6320V2_SI_BASE_ADDRESS, - .d_SI_CONFIG_OFFSET = AR6320V2_SI_CONFIG_OFFSET, - .d_SI_TX_DATA0_OFFSET = AR6320V2_SI_TX_DATA0_OFFSET, - .d_SI_TX_DATA1_OFFSET = AR6320V2_SI_TX_DATA1_OFFSET, - .d_SI_RX_DATA0_OFFSET = AR6320V2_SI_RX_DATA0_OFFSET, - .d_SI_RX_DATA1_OFFSET = AR6320V2_SI_RX_DATA1_OFFSET, - .d_SI_CS_OFFSET = AR6320V2_SI_CS_OFFSET, - .d_SI_CS_DONE_ERR_MASK = AR6320V2_SI_CS_DONE_ERR_MASK, - .d_SI_CS_DONE_INT_MASK = AR6320V2_SI_CS_DONE_INT_MASK, - .d_SI_CS_START_LSB = AR6320V2_SI_CS_START_LSB, - .d_SI_CS_START_MASK = AR6320V2_SI_CS_START_MASK, - .d_SI_CS_RX_CNT_LSB = AR6320V2_SI_CS_RX_CNT_LSB, - .d_SI_CS_RX_CNT_MASK = AR6320V2_SI_CS_RX_CNT_MASK, - .d_SI_CS_TX_CNT_LSB = AR6320V2_SI_CS_TX_CNT_LSB, - .d_SI_CS_TX_CNT_MASK = AR6320V2_SI_CS_TX_CNT_MASK, - .d_BOARD_DATA_SZ = AR6320_BOARD_DATA_SZ, - .d_BOARD_EXT_DATA_SZ = AR6320_BOARD_EXT_DATA_SZ, - .d_MBOX_BASE_ADDRESS = AR6320V2_MBOX_BASE_ADDRESS, - .d_LOCAL_SCRATCH_OFFSET = AR6320V2_LOCAL_SCRATCH_OFFSET, - .d_CPU_CLOCK_OFFSET = AR6320V2_CPU_CLOCK_OFFSET, - .d_LPO_CAL_OFFSET = AR6320V2_LPO_CAL_OFFSET, - .d_GPIO_PIN10_OFFSET = AR6320V2_GPIO_PIN10_OFFSET, - .d_GPIO_PIN11_OFFSET = AR6320V2_GPIO_PIN11_OFFSET, - .d_GPIO_PIN12_OFFSET = AR6320V2_GPIO_PIN12_OFFSET, - .d_GPIO_PIN13_OFFSET = AR6320V2_GPIO_PIN13_OFFSET, - .d_CLOCK_GPIO_OFFSET = AR6320V2_CLOCK_GPIO_OFFSET, - .d_CPU_CLOCK_STANDARD_LSB = AR6320V2_CPU_CLOCK_STANDARD_LSB, - .d_CPU_CLOCK_STANDARD_MASK = AR6320V2_CPU_CLOCK_STANDARD_MASK, - .d_LPO_CAL_ENABLE_LSB = AR6320V2_LPO_CAL_ENABLE_LSB, - .d_LPO_CAL_ENABLE_MASK = AR6320V2_LPO_CAL_ENABLE_MASK, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB = - AR6320V2_CLOCK_GPIO_BT_CLK_OUT_EN_LSB, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK = - AR6320V2_CLOCK_GPIO_BT_CLK_OUT_EN_MASK, - .d_ANALOG_INTF_BASE_ADDRESS = AR6320V2_ANALOG_INTF_BASE_ADDRESS, - .d_WLAN_MAC_BASE_ADDRESS = AR6320V2_WLAN_MAC_BASE_ADDRESS, - .d_FW_INDICATOR_ADDRESS = AR6320V2_FW_INDICATOR_ADDRESS, - .d_DRAM_BASE_ADDRESS = AR6320V2_DRAM_BASE_ADDRESS, - .d_SOC_CORE_BASE_ADDRESS = AR6320V2_SOC_CORE_BASE_ADDRESS, - .d_CORE_CTRL_ADDRESS = AR6320V2_CORE_CTRL_ADDRESS, - .d_CE_COUNT = AR6320V2_CE_COUNT, - .d_MSI_NUM_REQUEST = MSI_NUM_REQUEST, - .d_MSI_ASSIGN_FW = MSI_ASSIGN_FW, - .d_MSI_ASSIGN_CE_INITIAL = MSI_ASSIGN_CE_INITIAL, - .d_PCIE_INTR_ENABLE_ADDRESS = AR6320V2_PCIE_INTR_ENABLE_ADDRESS, - .d_PCIE_INTR_CLR_ADDRESS = AR6320V2_PCIE_INTR_CLR_ADDRESS, - .d_PCIE_INTR_FIRMWARE_MASK = AR6320V2_PCIE_INTR_FIRMWARE_MASK, - .d_PCIE_INTR_CE_MASK_ALL = AR6320V2_PCIE_INTR_CE_MASK_ALL, - .d_CORE_CTRL_CPU_INTR_MASK = AR6320V2_CORE_CTRL_CPU_INTR_MASK, - .d_SR_WR_INDEX_ADDRESS = AR6320V2_SR_WR_INDEX_ADDRESS, - .d_DST_WATERMARK_ADDRESS = AR6320V2_DST_WATERMARK_ADDRESS, - /* htt_rx.c */ - .d_RX_MSDU_END_4_FIRST_MSDU_MASK = - AR6320V2_RX_MSDU_END_4_FIRST_MSDU_MASK, - .d_RX_MSDU_END_4_FIRST_MSDU_LSB = - AR6320V2_RX_MSDU_END_4_FIRST_MSDU_LSB, - .d_RX_MPDU_START_0_RETRY_MASK = - AR6320V2_RX_MPDU_START_0_RETRY_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = - AR6320V2_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = - AR6320V2_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_LSB = AR6320V2_RX_MPDU_START_0_SEQ_NUM_LSB, - .d_RX_MPDU_START_2_PN_47_32_LSB = - AR6320V2_RX_MPDU_START_2_PN_47_32_LSB, - .d_RX_MPDU_START_2_PN_47_32_MASK = - AR6320V2_RX_MPDU_START_2_PN_47_32_MASK, - .d_RX_MPDU_START_2_TID_LSB = - AR6320V2_RX_MPDU_START_2_TID_LSB, - .d_RX_MPDU_START_2_TID_MASK = - AR6320V2_RX_MPDU_START_2_TID_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK = - AR6320V2_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB = - AR6320V2_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB, - .d_RX_MSDU_END_4_LAST_MSDU_MASK = - AR6320V2_RX_MSDU_END_4_LAST_MSDU_MASK, - .d_RX_MSDU_END_4_LAST_MSDU_LSB = AR6320V2_RX_MSDU_END_4_LAST_MSDU_LSB, - .d_RX_ATTENTION_0_MCAST_BCAST_MASK = - AR6320V2_RX_ATTENTION_0_MCAST_BCAST_MASK, - .d_RX_ATTENTION_0_MCAST_BCAST_LSB = - AR6320V2_RX_ATTENTION_0_MCAST_BCAST_LSB, - .d_RX_ATTENTION_0_FRAGMENT_MASK = - AR6320V2_RX_ATTENTION_0_FRAGMENT_MASK, - .d_RX_ATTENTION_0_FRAGMENT_LSB = AR6320V2_RX_ATTENTION_0_FRAGMENT_LSB, - .d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK = - AR6320V2_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK = - AR6320V2_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB = - AR6320V2_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB, - .d_RX_MSDU_START_0_MSDU_LENGTH_MASK = - AR6320V2_RX_MSDU_START_0_MSDU_LENGTH_MASK, - .d_RX_MSDU_START_0_MSDU_LENGTH_LSB = - AR6320V2_RX_MSDU_START_0_MSDU_LENGTH_LSB, - .d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET = - AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_OFFSET, - .d_RX_MSDU_START_2_DECAP_FORMAT_MASK = - AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_MASK, - .d_RX_MSDU_START_2_DECAP_FORMAT_LSB = - AR6320V2_RX_MSDU_START_2_DECAP_FORMAT_LSB, - .d_RX_MPDU_START_0_ENCRYPTED_MASK = - AR6320V2_RX_MPDU_START_0_ENCRYPTED_MASK, - .d_RX_MPDU_START_0_ENCRYPTED_LSB = - AR6320V2_RX_MPDU_START_0_ENCRYPTED_LSB, - .d_RX_ATTENTION_0_MORE_DATA_MASK = - AR6320V2_RX_ATTENTION_0_MORE_DATA_MASK, - .d_RX_ATTENTION_0_MSDU_DONE_MASK = - AR6320V2_RX_ATTENTION_0_MSDU_DONE_MASK, - .d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK = - AR6320V2_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK, - /* PLL start */ - .d_EFUSE_OFFSET = AR6320V2_EFUSE_OFFSET, - .d_EFUSE_XTAL_SEL_MSB = AR6320V2_EFUSE_XTAL_SEL_MSB, - .d_EFUSE_XTAL_SEL_LSB = AR6320V2_EFUSE_XTAL_SEL_LSB, - .d_EFUSE_XTAL_SEL_MASK = AR6320V2_EFUSE_XTAL_SEL_MASK, - .d_BB_PLL_CONFIG_OFFSET = AR6320V2_BB_PLL_CONFIG_OFFSET, - .d_BB_PLL_CONFIG_OUTDIV_MSB = AR6320V2_BB_PLL_CONFIG_OUTDIV_MSB, - .d_BB_PLL_CONFIG_OUTDIV_LSB = AR6320V2_BB_PLL_CONFIG_OUTDIV_LSB, - .d_BB_PLL_CONFIG_OUTDIV_MASK = AR6320V2_BB_PLL_CONFIG_OUTDIV_MASK, - .d_BB_PLL_CONFIG_FRAC_MSB = AR6320V2_BB_PLL_CONFIG_FRAC_MSB, - .d_BB_PLL_CONFIG_FRAC_LSB = AR6320V2_BB_PLL_CONFIG_FRAC_LSB, - .d_BB_PLL_CONFIG_FRAC_MASK = AR6320V2_BB_PLL_CONFIG_FRAC_MASK, - .d_WLAN_PLL_SETTLE_TIME_MSB = AR6320V2_WLAN_PLL_SETTLE_TIME_MSB, - .d_WLAN_PLL_SETTLE_TIME_LSB = AR6320V2_WLAN_PLL_SETTLE_TIME_LSB, - .d_WLAN_PLL_SETTLE_TIME_MASK = AR6320V2_WLAN_PLL_SETTLE_TIME_MASK, - .d_WLAN_PLL_SETTLE_OFFSET = AR6320V2_WLAN_PLL_SETTLE_OFFSET, - .d_WLAN_PLL_SETTLE_SW_MASK = AR6320V2_WLAN_PLL_SETTLE_SW_MASK, - .d_WLAN_PLL_SETTLE_RSTMASK = AR6320V2_WLAN_PLL_SETTLE_RSTMASK, - .d_WLAN_PLL_SETTLE_RESET = AR6320V2_WLAN_PLL_SETTLE_RESET, - .d_WLAN_PLL_CONTROL_NOPWD_MSB = AR6320V2_WLAN_PLL_CONTROL_NOPWD_MSB, - .d_WLAN_PLL_CONTROL_NOPWD_LSB = AR6320V2_WLAN_PLL_CONTROL_NOPWD_LSB, - .d_WLAN_PLL_CONTROL_NOPWD_MASK = AR6320V2_WLAN_PLL_CONTROL_NOPWD_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_MSB = AR6320V2_WLAN_PLL_CONTROL_BYPASS_MSB, - .d_WLAN_PLL_CONTROL_BYPASS_LSB = AR6320V2_WLAN_PLL_CONTROL_BYPASS_LSB, - .d_WLAN_PLL_CONTROL_BYPASS_MASK = - AR6320V2_WLAN_PLL_CONTROL_BYPASS_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_RESET = - AR6320V2_WLAN_PLL_CONTROL_BYPASS_RESET, - .d_WLAN_PLL_CONTROL_CLK_SEL_MSB = - AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_MSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_LSB = - AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_LSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_MASK = - AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_MASK, - .d_WLAN_PLL_CONTROL_CLK_SEL_RESET = - AR6320V2_WLAN_PLL_CONTROL_CLK_SEL_RESET, - .d_WLAN_PLL_CONTROL_REFDIV_MSB = AR6320V2_WLAN_PLL_CONTROL_REFDIV_MSB, - .d_WLAN_PLL_CONTROL_REFDIV_LSB = AR6320V2_WLAN_PLL_CONTROL_REFDIV_LSB, - .d_WLAN_PLL_CONTROL_REFDIV_MASK = - AR6320V2_WLAN_PLL_CONTROL_REFDIV_MASK, - .d_WLAN_PLL_CONTROL_REFDIV_RESET = - AR6320V2_WLAN_PLL_CONTROL_REFDIV_RESET, - .d_WLAN_PLL_CONTROL_DIV_MSB = AR6320V2_WLAN_PLL_CONTROL_DIV_MSB, - .d_WLAN_PLL_CONTROL_DIV_LSB = AR6320V2_WLAN_PLL_CONTROL_DIV_LSB, - .d_WLAN_PLL_CONTROL_DIV_MASK = AR6320V2_WLAN_PLL_CONTROL_DIV_MASK, - .d_WLAN_PLL_CONTROL_DIV_RESET = AR6320V2_WLAN_PLL_CONTROL_DIV_RESET, - .d_WLAN_PLL_CONTROL_OFFSET = AR6320V2_WLAN_PLL_CONTROL_OFFSET, - .d_WLAN_PLL_CONTROL_SW_MASK = AR6320V2_WLAN_PLL_CONTROL_SW_MASK, - .d_WLAN_PLL_CONTROL_RSTMASK = AR6320V2_WLAN_PLL_CONTROL_RSTMASK, - .d_WLAN_PLL_CONTROL_RESET = AR6320V2_WLAN_PLL_CONTROL_RESET, - .d_SOC_CORE_CLK_CTRL_OFFSET = AR6320V2_SOC_CORE_CLK_CTRL_OFFSET, - .d_SOC_CORE_CLK_CTRL_DIV_MSB = AR6320V2_SOC_CORE_CLK_CTRL_DIV_MSB, - .d_SOC_CORE_CLK_CTRL_DIV_LSB = AR6320V2_SOC_CORE_CLK_CTRL_DIV_LSB, - .d_SOC_CORE_CLK_CTRL_DIV_MASK = AR6320V2_SOC_CORE_CLK_CTRL_DIV_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MSB = - AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_MSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_LSB = - AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_LSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MASK = - AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_RESET = - AR6320V2_RTC_SYNC_STATUS_PLL_CHANGING_RESET, - .d_RTC_SYNC_STATUS_OFFSET = AR6320V2_RTC_SYNC_STATUS_OFFSET, - .d_SOC_CPU_CLOCK_OFFSET = AR6320V2_SOC_CPU_CLOCK_OFFSET, - .d_SOC_CPU_CLOCK_STANDARD_MSB = AR6320V2_SOC_CPU_CLOCK_STANDARD_MSB, - .d_SOC_CPU_CLOCK_STANDARD_LSB = AR6320V2_SOC_CPU_CLOCK_STANDARD_LSB, - .d_SOC_CPU_CLOCK_STANDARD_MASK = AR6320V2_SOC_CPU_CLOCK_STANDARD_MASK, - /* PLL end */ - .d_SOC_POWER_REG_OFFSET = AR6320V2_SOC_POWER_REG_OFFSET, - .d_PCIE_INTR_CAUSE_ADDRESS = AR6320V2_PCIE_INTR_CAUSE_ADDRESS, - .d_SOC_RESET_CONTROL_ADDRESS = AR6320V2_SOC_RESET_CONTROL_ADDRESS, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK = - AR6320V2_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB = - AR6320V2_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB, - .d_SOC_RESET_CONTROL_CE_RST_MASK = - AR6320V2_SOC_RESET_CONTROL_CE_RST_MASK, - .d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK = - AR6320V2_SOC_RESET_CONTROL_CPU_WARM_RST_MASK, - .d_CPU_INTR_ADDRESS = AR6320V2_CPU_INTR_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ADDRESS = - AR6320V2_SOC_LF_TIMER_CONTROL0_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK = - AR6320V2_SOC_LF_TIMER_CONTROL0_ENABLE_MASK, - /* chip id start */ - .d_SOC_CHIP_ID_ADDRESS = AR6320V2_SOC_CHIP_ID_ADDRESS, - .d_SOC_CHIP_ID_VERSION_MASK = AR6320V2_SOC_CHIP_ID_VERSION_MASK, - .d_SOC_CHIP_ID_VERSION_LSB = AR6320V2_SOC_CHIP_ID_VERSION_LSB, - .d_SOC_CHIP_ID_REVISION_MASK = AR6320V2_SOC_CHIP_ID_REVISION_MASK, - .d_SOC_CHIP_ID_REVISION_LSB = AR6320V2_SOC_CHIP_ID_REVISION_LSB, - /* chip id end */ - - .d_WLAN_DEBUG_INPUT_SEL_OFFSET = AR6320V2_WLAN_DEBUG_INPUT_SEL_OFFSET, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MSB = - AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_MSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_LSB = - AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_LSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MASK = - AR6320V2_WLAN_DEBUG_INPUT_SEL_SRC_MASK, - .d_WLAN_DEBUG_CONTROL_OFFSET = AR6320V2_WLAN_DEBUG_CONTROL_OFFSET, - .d_WLAN_DEBUG_CONTROL_ENABLE_MSB = - AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_MSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_LSB = - AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_LSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_MASK = - AR6320V2_WLAN_DEBUG_CONTROL_ENABLE_MASK, - .d_WLAN_DEBUG_OUT_OFFSET = AR6320V2_WLAN_DEBUG_OUT_OFFSET, - .d_WLAN_DEBUG_OUT_DATA_MSB = AR6320V2_WLAN_DEBUG_OUT_DATA_MSB, - .d_WLAN_DEBUG_OUT_DATA_LSB = AR6320V2_WLAN_DEBUG_OUT_DATA_LSB, - .d_WLAN_DEBUG_OUT_DATA_MASK = AR6320V2_WLAN_DEBUG_OUT_DATA_MASK, - .d_AMBA_DEBUG_BUS_OFFSET = AR6320V2_AMBA_DEBUG_BUS_OFFSET, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB = - AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB = - AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK = - AR6320V2_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK, - .d_AMBA_DEBUG_BUS_SEL_MSB = AR6320V2_AMBA_DEBUG_BUS_SEL_MSB, - .d_AMBA_DEBUG_BUS_SEL_LSB = AR6320V2_AMBA_DEBUG_BUS_SEL_LSB, - .d_AMBA_DEBUG_BUS_SEL_MASK = AR6320V2_AMBA_DEBUG_BUS_SEL_MASK, -}; - -struct hostdef_s ar6320v2_hostdef = { - .d_INT_STATUS_ENABLE_ERROR_LSB = AR6320V2_INT_STATUS_ENABLE_ERROR_LSB, - .d_INT_STATUS_ENABLE_ERROR_MASK = - AR6320V2_INT_STATUS_ENABLE_ERROR_MASK, - .d_INT_STATUS_ENABLE_CPU_LSB = AR6320V2_INT_STATUS_ENABLE_CPU_LSB, - .d_INT_STATUS_ENABLE_CPU_MASK = AR6320V2_INT_STATUS_ENABLE_CPU_MASK, - .d_INT_STATUS_ENABLE_COUNTER_LSB = - AR6320V2_INT_STATUS_ENABLE_COUNTER_LSB, - .d_INT_STATUS_ENABLE_COUNTER_MASK = - AR6320V2_INT_STATUS_ENABLE_COUNTER_MASK, - .d_INT_STATUS_ENABLE_MBOX_DATA_LSB = - AR6320V2_INT_STATUS_ENABLE_MBOX_DATA_LSB, - .d_INT_STATUS_ENABLE_MBOX_DATA_MASK = - AR6320V2_INT_STATUS_ENABLE_MBOX_DATA_MASK, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB = - AR6320V2_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK = - AR6320V2_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB = - AR6320V2_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK = - AR6320V2_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK, - .d_COUNTER_INT_STATUS_ENABLE_BIT_LSB = - AR6320V2_COUNTER_INT_STATUS_ENABLE_BIT_LSB, - .d_COUNTER_INT_STATUS_ENABLE_BIT_MASK = - AR6320V2_COUNTER_INT_STATUS_ENABLE_BIT_MASK, - .d_INT_STATUS_ENABLE_ADDRESS = AR6320V2_INT_STATUS_ENABLE_ADDRESS, - .d_CPU_INT_STATUS_ENABLE_BIT_LSB = - AR6320V2_CPU_INT_STATUS_ENABLE_BIT_LSB, - .d_CPU_INT_STATUS_ENABLE_BIT_MASK = - AR6320V2_CPU_INT_STATUS_ENABLE_BIT_MASK, - .d_HOST_INT_STATUS_ADDRESS = AR6320V2_HOST_INT_STATUS_ADDRESS, - .d_CPU_INT_STATUS_ADDRESS = AR6320V2_CPU_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_ADDRESS = AR6320V2_ERROR_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_WAKEUP_MASK = - AR6320V2_ERROR_INT_STATUS_WAKEUP_MASK, - .d_ERROR_INT_STATUS_WAKEUP_LSB = AR6320V2_ERROR_INT_STATUS_WAKEUP_LSB, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK = - AR6320V2_ERROR_INT_STATUS_RX_UNDERFLOW_MASK, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB = - AR6320V2_ERROR_INT_STATUS_RX_UNDERFLOW_LSB, - .d_ERROR_INT_STATUS_TX_OVERFLOW_MASK = - AR6320V2_ERROR_INT_STATUS_TX_OVERFLOW_MASK, - .d_ERROR_INT_STATUS_TX_OVERFLOW_LSB = - AR6320V2_ERROR_INT_STATUS_TX_OVERFLOW_LSB, - .d_COUNT_DEC_ADDRESS = AR6320V2_COUNT_DEC_ADDRESS, - .d_HOST_INT_STATUS_CPU_MASK = AR6320V2_HOST_INT_STATUS_CPU_MASK, - .d_HOST_INT_STATUS_CPU_LSB = AR6320V2_HOST_INT_STATUS_CPU_LSB, - .d_HOST_INT_STATUS_ERROR_MASK = AR6320V2_HOST_INT_STATUS_ERROR_MASK, - .d_HOST_INT_STATUS_ERROR_LSB = AR6320V2_HOST_INT_STATUS_ERROR_LSB, - .d_HOST_INT_STATUS_COUNTER_MASK = - AR6320V2_HOST_INT_STATUS_COUNTER_MASK, - .d_HOST_INT_STATUS_COUNTER_LSB = AR6320V2_HOST_INT_STATUS_COUNTER_LSB, - .d_RX_LOOKAHEAD_VALID_ADDRESS = AR6320V2_RX_LOOKAHEAD_VALID_ADDRESS, - .d_WINDOW_DATA_ADDRESS = AR6320V2_WINDOW_DATA_ADDRESS, - .d_WINDOW_READ_ADDR_ADDRESS = AR6320V2_WINDOW_READ_ADDR_ADDRESS, - .d_WINDOW_WRITE_ADDR_ADDRESS = AR6320V2_WINDOW_WRITE_ADDR_ADDRESS, - .d_SOC_GLOBAL_RESET_ADDRESS = AR6320V2_SOC_GLOBAL_RESET_ADDRESS, - .d_RTC_STATE_ADDRESS = AR6320V2_RTC_STATE_ADDRESS, - .d_RTC_STATE_COLD_RESET_MASK = AR6320V2_RTC_STATE_COLD_RESET_MASK, - .d_PCIE_LOCAL_BASE_ADDRESS = AR6320V2_PCIE_LOCAL_BASE_ADDRESS, - .d_PCIE_SOC_WAKE_RESET = AR6320V2_PCIE_SOC_WAKE_RESET, - .d_PCIE_SOC_WAKE_ADDRESS = AR6320V2_PCIE_SOC_WAKE_ADDRESS, - .d_PCIE_SOC_WAKE_V_MASK = AR6320V2_PCIE_SOC_WAKE_V_MASK, - .d_RTC_STATE_V_MASK = AR6320V2_RTC_STATE_V_MASK, - .d_RTC_STATE_V_LSB = AR6320V2_RTC_STATE_V_LSB, - .d_FW_IND_EVENT_PENDING = AR6320V2_FW_IND_EVENT_PENDING, - .d_FW_IND_INITIALIZED = AR6320V2_FW_IND_INITIALIZED, - .d_FW_IND_HELPER = AR6320V2_FW_IND_HELPER, - .d_RTC_STATE_V_ON = AR6320V2_RTC_STATE_V_ON, - .d_MUX_ID_MASK = AR6320V2_MUX_ID_MASK, - .d_TRANSACTION_ID_MASK = AR6320V2_TRANSACTION_ID_MASK, -#if defined(SDIO_3_0) - .d_HOST_INT_STATUS_MBOX_DATA_MASK = - AR6320V2_HOST_INT_STATUS_MBOX_DATA_MASK, - .d_HOST_INT_STATUS_MBOX_DATA_LSB = - AR6320V2_HOST_INT_STATUS_MBOX_DATA_LSB, -#endif - .d_PCIE_SOC_RDY_STATUS_ADDRESS = PCIE_SOC_RDY_STATUS_ADDRESS, - .d_PCIE_SOC_RDY_STATUS_BAR_MASK = PCIE_SOC_RDY_STATUS_BAR_MASK, - .d_SOC_PCIE_BASE_ADDRESS = SOC_PCIE_BASE_ADDRESS, - .d_MSI_MAGIC_ADR_ADDRESS = MSI_MAGIC_ADR_ADDRESS, - .d_MSI_MAGIC_ADDRESS = MSI_MAGIC_ADDRESS, - .d_HOST_CE_COUNT = 8, - .d_ENABLE_MSI = 0, -}; - -struct ce_reg_def ar6320v2_ce_targetdef = { - /* copy_engine.c */ - .d_DST_WR_INDEX_ADDRESS = AR6320V2_DST_WR_INDEX_ADDRESS, - .d_SRC_WATERMARK_ADDRESS = AR6320V2_SRC_WATERMARK_ADDRESS, - .d_SRC_WATERMARK_LOW_MASK = AR6320V2_SRC_WATERMARK_LOW_MASK, - .d_SRC_WATERMARK_HIGH_MASK = AR6320V2_SRC_WATERMARK_HIGH_MASK, - .d_DST_WATERMARK_LOW_MASK = AR6320V2_DST_WATERMARK_LOW_MASK, - .d_DST_WATERMARK_HIGH_MASK = AR6320V2_DST_WATERMARK_HIGH_MASK, - .d_CURRENT_SRRI_ADDRESS = AR6320V2_CURRENT_SRRI_ADDRESS, - .d_CURRENT_DRRI_ADDRESS = AR6320V2_CURRENT_DRRI_ADDRESS, - .d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK = - AR6320V2_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK = - AR6320V2_HOST_IS_SRC_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK = - AR6320V2_HOST_IS_DST_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_DST_RING_LOW_WATERMARK_MASK = - AR6320V2_HOST_IS_DST_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_ADDRESS = AR6320V2_HOST_IS_ADDRESS, - .d_HOST_IS_COPY_COMPLETE_MASK = AR6320V2_HOST_IS_COPY_COMPLETE_MASK, - .d_CE_WRAPPER_BASE_ADDRESS = AR6320V2_CE_WRAPPER_BASE_ADDRESS, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS = - AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS, - .d_HOST_IE_ADDRESS = AR6320V2_HOST_IE_ADDRESS, - .d_HOST_IE_COPY_COMPLETE_MASK = AR6320V2_HOST_IE_COPY_COMPLETE_MASK, - .d_SR_BA_ADDRESS = AR6320V2_SR_BA_ADDRESS, - .d_SR_SIZE_ADDRESS = AR6320V2_SR_SIZE_ADDRESS, - .d_CE_CTRL1_ADDRESS = AR6320V2_CE_CTRL1_ADDRESS, - .d_CE_CTRL1_DMAX_LENGTH_MASK = AR6320V2_CE_CTRL1_DMAX_LENGTH_MASK, - .d_DR_BA_ADDRESS = AR6320V2_DR_BA_ADDRESS, - .d_DR_SIZE_ADDRESS = AR6320V2_DR_SIZE_ADDRESS, - .d_MISC_IE_ADDRESS = AR6320V2_MISC_IE_ADDRESS, - .d_MISC_IS_AXI_ERR_MASK = AR6320V2_MISC_IS_AXI_ERR_MASK, - .d_MISC_IS_DST_ADDR_ERR_MASK = AR6320V2_MISC_IS_DST_ADDR_ERR_MASK, - .d_MISC_IS_SRC_LEN_ERR_MASK = AR6320V2_MISC_IS_SRC_LEN_ERR_MASK, - .d_MISC_IS_DST_MAX_LEN_VIO_MASK = - AR6320V2_MISC_IS_DST_MAX_LEN_VIO_MASK, - .d_MISC_IS_DST_RING_OVERFLOW_MASK = - AR6320V2_MISC_IS_DST_RING_OVERFLOW_MASK, - .d_MISC_IS_SRC_RING_OVERFLOW_MASK = - AR6320V2_MISC_IS_SRC_RING_OVERFLOW_MASK, - .d_SRC_WATERMARK_LOW_LSB = AR6320V2_SRC_WATERMARK_LOW_LSB, - .d_SRC_WATERMARK_HIGH_LSB = AR6320V2_SRC_WATERMARK_HIGH_LSB, - .d_DST_WATERMARK_LOW_LSB = AR6320V2_DST_WATERMARK_LOW_LSB, - .d_DST_WATERMARK_HIGH_LSB = AR6320V2_DST_WATERMARK_HIGH_LSB, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK = - AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB = - AR6320V2_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB, - .d_CE_CTRL1_DMAX_LENGTH_LSB = AR6320V2_CE_CTRL1_DMAX_LENGTH_LSB, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK = - AR6320V2_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK = - AR6320V2_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB = - AR6320V2_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB = - AR6320V2_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB, - .d_CE_WRAPPER_DEBUG_OFFSET = AR6320V2_CE_WRAPPER_DEBUG_OFFSET, - .d_CE_WRAPPER_DEBUG_SEL_MSB = AR6320V2_CE_WRAPPER_DEBUG_SEL_MSB, - .d_CE_WRAPPER_DEBUG_SEL_LSB = AR6320V2_CE_WRAPPER_DEBUG_SEL_LSB, - .d_CE_WRAPPER_DEBUG_SEL_MASK = AR6320V2_CE_WRAPPER_DEBUG_SEL_MASK, - .d_CE_DEBUG_OFFSET = AR6320V2_CE_DEBUG_OFFSET, - .d_CE_DEBUG_SEL_MSB = AR6320V2_CE_DEBUG_SEL_MSB, - .d_CE_DEBUG_SEL_LSB = AR6320V2_CE_DEBUG_SEL_LSB, - .d_CE_DEBUG_SEL_MASK = AR6320V2_CE_DEBUG_SEL_MASK, - .d_CE0_BASE_ADDRESS = AR6320V2_CE0_BASE_ADDRESS, - .d_CE1_BASE_ADDRESS = AR6320V2_CE1_BASE_ADDRESS, - -}; - -#endif diff --git a/core/hif/src/ar9888def.h b/core/hif/src/ar9888def.h deleted file mode 100644 index fd9987b6f8cd..000000000000 --- a/core/hif/src/ar9888def.h +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _AR9888DEF_H_ -#define AR9888__AR9888DEF_H_ - -/* Base Addresses */ -#define AR9888_RTC_SOC_BASE_ADDRESS 0x00004000 -#define AR9888_RTC_WMAC_BASE_ADDRESS 0x00005000 -#define AR9888_MAC_COEX_BASE_ADDRESS 0x00006000 -#define AR9888_BT_COEX_BASE_ADDRESS 0x00007000 -#define AR9888_SOC_PCIE_BASE_ADDRESS 0x00008000 -#define AR9888_SOC_CORE_BASE_ADDRESS 0x00009000 -#define AR9888_WLAN_UART_BASE_ADDRESS 0x0000c000 -#define AR9888_WLAN_SI_BASE_ADDRESS 0x00010000 -#define AR9888_WLAN_GPIO_BASE_ADDRESS 0x00014000 -#define AR9888_WLAN_ANALOG_INTF_BASE_ADDRESS 0x0001c000 -#define AR9888_WLAN_MAC_BASE_ADDRESS 0x00020000 -#define AR9888_EFUSE_BASE_ADDRESS 0x00030000 -#define AR9888_FPGA_REG_BASE_ADDRESS 0x00039000 -#define AR9888_WLAN_UART2_BASE_ADDRESS 0x00054c00 -#define AR9888_CE_WRAPPER_BASE_ADDRESS 0x00057000 -#define AR9888_CE0_BASE_ADDRESS 0x00057400 -#define AR9888_CE1_BASE_ADDRESS 0x00057800 -#define AR9888_CE2_BASE_ADDRESS 0x00057c00 -#define AR9888_CE3_BASE_ADDRESS 0x00058000 -#define AR9888_CE4_BASE_ADDRESS 0x00058400 -#define AR9888_CE5_BASE_ADDRESS 0x00058800 -#define AR9888_CE6_BASE_ADDRESS 0x00058c00 -#define AR9888_CE7_BASE_ADDRESS 0x00059000 -#define AR9888_DBI_BASE_ADDRESS 0x00060000 -#define AR9888_WLAN_ANALOG_INTF_PCIE_BASE_ADDRESS 0x0006c000 - -#define AR9888_SCRATCH_3_ADDRESS 0x0030 -#define AR9888_TARG_DRAM_START 0x00400000 -#define AR9888_SOC_SYSTEM_SLEEP_OFFSET 0x000000c4 -#define AR9888_SOC_RESET_CONTROL_OFFSET 0x00000000 -#define AR9888_SOC_CLOCK_CONTROL_OFFSET 0x00000028 -#define AR9888_SOC_CLOCK_CONTROL_SI0_CLK_MASK 0x00000001 -#define AR9888_SOC_RESET_CONTROL_SI0_RST_MASK 0x00000001 -#define AR9888_WLAN_GPIO_BASE_ADDRESS 0x00014000 -#define AR9888_WLAN_GPIO_PIN0_ADDRESS 0x00000028 -#define AR9888_WLAN_GPIO_PIN1_ADDRESS 0x0000002c -#define AR9888_WLAN_GPIO_PIN0_CONFIG_MASK 0x00007800 -#define AR9888_WLAN_GPIO_PIN1_CONFIG_MASK 0x00007800 -#define AR9888_WLAN_SI_BASE_ADDRESS 0x00010000 -#define AR9888_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define AR9888_SOC_LPO_CAL_OFFSET 0x000000e0 -#define AR9888_WLAN_GPIO_PIN10_ADDRESS 0x00000050 -#define AR9888_WLAN_GPIO_PIN11_ADDRESS 0x00000054 -#define AR9888_WLAN_GPIO_PIN12_ADDRESS 0x00000058 -#define AR9888_WLAN_GPIO_PIN13_ADDRESS 0x0000005c -#define AR9888_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define AR9888_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -#define AR9888_SOC_LPO_CAL_ENABLE_LSB 20 -#define AR9888_SOC_LPO_CAL_ENABLE_MASK 0x00100000 -#define AR9888_WLAN_ANALOG_INTF_BASE_ADDRESS 0x0001c000 - -#define AR9888_WLAN_SYSTEM_SLEEP_DISABLE_LSB 0 -#define AR9888_WLAN_SYSTEM_SLEEP_DISABLE_MASK 0x00000001 -#define AR9888_WLAN_RESET_CONTROL_COLD_RST_MASK 0x00000008 -#define AR9888_WLAN_RESET_CONTROL_WARM_RST_MASK 0x00000004 -#define AR9888_SI_CONFIG_BIDIR_OD_DATA_LSB 18 -#define AR9888_SI_CONFIG_BIDIR_OD_DATA_MASK 0x00040000 -#define AR9888_SI_CONFIG_I2C_LSB 16 -#define AR9888_SI_CONFIG_I2C_MASK 0x00010000 -#define AR9888_SI_CONFIG_POS_SAMPLE_LSB 7 -#define AR9888_SI_CONFIG_POS_SAMPLE_MASK 0x00000080 -#define AR9888_SI_CONFIG_INACTIVE_CLK_LSB 4 -#define AR9888_SI_CONFIG_INACTIVE_CLK_MASK 0x00000010 -#define AR9888_SI_CONFIG_INACTIVE_DATA_LSB 5 -#define AR9888_SI_CONFIG_INACTIVE_DATA_MASK 0x00000020 -#define AR9888_SI_CONFIG_DIVIDER_LSB 0 -#define AR9888_SI_CONFIG_DIVIDER_MASK 0x0000000f -#define AR9888_SI_CONFIG_OFFSET 0x00000000 -#define AR9888_SI_TX_DATA0_OFFSET 0x00000008 -#define AR9888_SI_TX_DATA1_OFFSET 0x0000000c -#define AR9888_SI_RX_DATA0_OFFSET 0x00000010 -#define AR9888_SI_RX_DATA1_OFFSET 0x00000014 -#define AR9888_SI_CS_OFFSET 0x00000004 -#define AR9888_SI_CS_DONE_ERR_MASK 0x00000400 -#define AR9888_SI_CS_DONE_INT_MASK 0x00000200 -#define AR9888_SI_CS_START_LSB 8 -#define AR9888_SI_CS_START_MASK 0x00000100 -#define AR9888_SI_CS_RX_CNT_LSB 4 -#define AR9888_SI_CS_RX_CNT_MASK 0x000000f0 -#define AR9888_SI_CS_TX_CNT_LSB 0 -#define AR9888_SI_CS_TX_CNT_MASK 0x0000000f -#define AR9888_CE_COUNT 8 -#define AR9888_SR_WR_INDEX_ADDRESS 0x003c -#define AR9888_DST_WATERMARK_ADDRESS 0x0050 -#define AR9888_RX_MSDU_END_4_FIRST_MSDU_LSB 14 -#define AR9888_RX_MSDU_END_4_FIRST_MSDU_MASK 0x00004000 -#define AR9888_RX_MPDU_START_0_SEQ_NUM_LSB 16 -#define AR9888_RX_MPDU_START_0_SEQ_NUM_MASK 0x0fff0000 -#define AR9888_RX_MPDU_START_2_PN_47_32_LSB 0 -#define AR9888_RX_MPDU_START_2_PN_47_32_MASK 0x0000ffff -#define AR9888_RX_MSDU_END_1_KEY_ID_OCT_MASK 0x000000ff -#define AR9888_RX_MSDU_END_1_KEY_ID_OCT_LSB 0 -#define AR9888_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB 16 -#define AR9888_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK 0xffff0000 -#define AR9888_RX_MSDU_END_4_LAST_MSDU_LSB 15 -#define AR9888_RX_MSDU_END_4_LAST_MSDU_MASK 0x00008000 -#define AR9888_RX_ATTENTION_0_MCAST_BCAST_LSB 2 -#define AR9888_RX_ATTENTION_0_MCAST_BCAST_MASK 0x00000004 -#define AR9888_RX_ATTENTION_0_FRAGMENT_LSB 13 -#define AR9888_RX_ATTENTION_0_FRAGMENT_MASK 0x00002000 -#define AR9888_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK 0x08000000 -#define AR9888_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB 16 -#define AR9888_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK 0x00ff0000 -#define AR9888_RX_MSDU_START_0_MSDU_LENGTH_LSB 0 -#define AR9888_RX_MSDU_START_0_MSDU_LENGTH_MASK 0x00003fff -#define AR9888_RX_MSDU_START_2_DECAP_FORMAT_OFFSET 0x00000008 -#define AR9888_RX_MSDU_START_2_DECAP_FORMAT_LSB 8 -#define AR9888_RX_MSDU_START_2_DECAP_FORMAT_MASK 0x00000300 -#define AR9888_RX_MPDU_START_0_ENCRYPTED_LSB 13 -#define AR9888_RX_MPDU_START_0_ENCRYPTED_MASK 0x00002000 -#define AR9888_RX_ATTENTION_0_MORE_DATA_MASK 0x00000400 -#define AR9888_RX_ATTENTION_0_MSDU_DONE_MASK 0x80000000 -#define AR9888_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK 0x00040000 -#define AR9888_DST_WR_INDEX_ADDRESS 0x0040 -#define AR9888_SRC_WATERMARK_ADDRESS 0x004c -#define AR9888_SRC_WATERMARK_LOW_MASK 0xffff0000 -#define AR9888_SRC_WATERMARK_HIGH_MASK 0x0000ffff -#define AR9888_DST_WATERMARK_LOW_MASK 0xffff0000 -#define AR9888_DST_WATERMARK_HIGH_MASK 0x0000ffff -#define AR9888_CURRENT_SRRI_ADDRESS 0x0044 -#define AR9888_CURRENT_DRRI_ADDRESS 0x0048 -#define AR9888_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK 0x00000002 -#define AR9888_HOST_IS_SRC_RING_LOW_WATERMARK_MASK 0x00000004 -#define AR9888_HOST_IS_DST_RING_HIGH_WATERMARK_MASK 0x00000008 -#define AR9888_HOST_IS_DST_RING_LOW_WATERMARK_MASK 0x00000010 -#define AR9888_HOST_IS_ADDRESS 0x0030 -#define AR9888_HOST_IS_COPY_COMPLETE_MASK 0x00000001 -#define AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS 0x0000 -#define AR9888_HOST_IE_ADDRESS 0x002c -#define AR9888_HOST_IE_COPY_COMPLETE_MASK 0x00000001 -#define AR9888_SR_BA_ADDRESS 0x0000 -#define AR9888_SR_SIZE_ADDRESS 0x0004 -#define AR9888_CE_CTRL1_ADDRESS 0x0010 -#define AR9888_CE_CTRL1_DMAX_LENGTH_MASK 0x0000ffff -#define AR9888_DR_BA_ADDRESS 0x0008 -#define AR9888_DR_SIZE_ADDRESS 0x000c -#define AR9888_MISC_IE_ADDRESS 0x0034 -#define AR9888_MISC_IS_AXI_ERR_MASK 0x00000400 -#define AR9888_MISC_IS_DST_ADDR_ERR_MASK 0x00000200 -#define AR9888_MISC_IS_SRC_LEN_ERR_MASK 0x00000100 -#define AR9888_MISC_IS_DST_MAX_LEN_VIO_MASK 0x00000080 -#define AR9888_MISC_IS_DST_RING_OVERFLOW_MASK 0x00000040 -#define AR9888_MISC_IS_SRC_RING_OVERFLOW_MASK 0x00000020 -#define AR9888_SRC_WATERMARK_LOW_LSB 16 -#define AR9888_SRC_WATERMARK_HIGH_LSB 0 -#define AR9888_DST_WATERMARK_LOW_LSB 16 -#define AR9888_DST_WATERMARK_HIGH_LSB 0 -#define AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK 0x0000ff00 -#define AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB 8 -#define AR9888_CE_CTRL1_DMAX_LENGTH_LSB 0 -#define AR9888_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK 0x00010000 -#define AR9888_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK 0x00020000 -#define AR9888_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB 16 -#define AR9888_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB 17 -#define AR9888_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK 0x00000004 -#define AR9888_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB 2 -#define AR9888_SOC_GLOBAL_RESET_ADDRESS 0x0008 -#define AR9888_RTC_STATE_ADDRESS 0x0000 -#define AR9888_RTC_STATE_COLD_RESET_MASK 0x00000400 -#define AR9888_PCIE_SOC_WAKE_RESET 0x00000000 -#define AR9888_PCIE_SOC_WAKE_ADDRESS 0x0004 -#define AR9888_PCIE_SOC_WAKE_V_MASK 0x00000001 -#define AR9888_RTC_STATE_V_MASK 0x00000007 -#define AR9888_RTC_STATE_V_LSB 0 -#define AR9888_RTC_STATE_V_ON 3 -#define AR9888_MUX_ID_MASK 0x0000 -#define AR9888_TRANSACTION_ID_MASK 0x3fff -#define AR9888_PCIE_LOCAL_BASE_ADDRESS 0x80000 -#define AR9888_FW_IND_EVENT_PENDING 1 -#define AR9888_FW_IND_INITIALIZED 2 -#define AR9888_PCIE_INTR_ENABLE_ADDRESS 0x0008 -#define AR9888_PCIE_INTR_CLR_ADDRESS 0x0014 -#define AR9888_PCIE_INTR_FIRMWARE_MASK 0x00000400 -#define AR9888_PCIE_INTR_CE0_MASK 0x00000800 -#define AR9888_PCIE_INTR_CE_MASK_ALL 0x0007f800 -#define AR9888_PCIE_INTR_CAUSE_ADDRESS 0x000c -#define AR9888_CPU_INTR_ADDRESS 0x0010 -#define AR9888_SOC_LF_TIMER_CONTROL0_ADDRESS 0x00000050 -#define AR9888_SOC_LF_TIMER_CONTROL0_ENABLE_MASK 0x00000004 -#define AR9888_SOC_RESET_CONTROL_ADDRESS 0x00000000 -#define AR9888_SOC_RESET_CONTROL_CE_RST_MASK 0x00040000 -#define AR9888_SOC_RESET_CONTROL_CPU_WARM_RST_MASK 0x00000040 -#define AR9888_CORE_CTRL_ADDRESS 0x0000 -#define AR9888_CORE_CTRL_CPU_INTR_MASK 0x00002000 -#define AR9888_LOCAL_SCRATCH_OFFSET 0x18 -#define AR9888_CLOCK_GPIO_OFFSET 0xffffffff -#define AR9888_CLOCK_GPIO_BT_CLK_OUT_EN_LSB 0 -#define AR9888_CLOCK_GPIO_BT_CLK_OUT_EN_MASK 0 - -#define AR9888_PCIE_INTR_CE_MASK(n) (AR9888_PCIE_INTR_CE0_MASK << (n)) -#define AR9888_FW_EVENT_PENDING_ADDRESS \ - (AR9888_SOC_CORE_BASE_ADDRESS + AR9888_SCRATCH_3_ADDRESS) -#define AR9888_DRAM_BASE_ADDRESS AR9888_TARG_DRAM_START -#define AR9888_FW_INDICATOR_ADDRESS \ - (AR9888_SOC_CORE_BASE_ADDRESS + AR9888_SCRATCH_3_ADDRESS) -#define AR9888_SYSTEM_SLEEP_OFFSET AR9888_SOC_SYSTEM_SLEEP_OFFSET -#define AR9888_WLAN_SYSTEM_SLEEP_OFFSET AR9888_SOC_SYSTEM_SLEEP_OFFSET -#define AR9888_WLAN_RESET_CONTROL_OFFSET AR9888_SOC_RESET_CONTROL_OFFSET -#define AR9888_CLOCK_CONTROL_OFFSET AR9888_SOC_CLOCK_CONTROL_OFFSET -#define AR9888_CLOCK_CONTROL_SI0_CLK_MASK AR9888_SOC_CLOCK_CONTROL_SI0_CLK_MASK -#define AR9888_RESET_CONTROL_MBOX_RST_MASK MISSING -#define AR9888_RESET_CONTROL_SI0_RST_MASK AR9888_SOC_RESET_CONTROL_SI0_RST_MASK -#define AR9888_GPIO_BASE_ADDRESS AR9888_WLAN_GPIO_BASE_ADDRESS -#define AR9888_GPIO_PIN0_OFFSET AR9888_WLAN_GPIO_PIN0_ADDRESS -#define AR9888_GPIO_PIN1_OFFSET AR9888_WLAN_GPIO_PIN1_ADDRESS -#define AR9888_GPIO_PIN0_CONFIG_MASK AR9888_WLAN_GPIO_PIN0_CONFIG_MASK -#define AR9888_GPIO_PIN1_CONFIG_MASK AR9888_WLAN_GPIO_PIN1_CONFIG_MASK -#define AR9888_SI_BASE_ADDRESS AR9888_WLAN_SI_BASE_ADDRESS -#define AR9888_SCRATCH_BASE_ADDRESS AR9888_SOC_CORE_BASE_ADDRESS -#define AR9888_CPU_CLOCK_OFFSET AR9888_SOC_CPU_CLOCK_OFFSET -#define AR9888_LPO_CAL_OFFSET AR9888_SOC_LPO_CAL_OFFSET -#define AR9888_GPIO_PIN10_OFFSET AR9888_WLAN_GPIO_PIN10_ADDRESS -#define AR9888_GPIO_PIN11_OFFSET AR9888_WLAN_GPIO_PIN11_ADDRESS -#define AR9888_GPIO_PIN12_OFFSET AR9888_WLAN_GPIO_PIN12_ADDRESS -#define AR9888_GPIO_PIN13_OFFSET AR9888_WLAN_GPIO_PIN13_ADDRESS -#define AR9888_CPU_CLOCK_STANDARD_LSB AR9888_SOC_CPU_CLOCK_STANDARD_LSB -#define AR9888_CPU_CLOCK_STANDARD_MASK AR9888_SOC_CPU_CLOCK_STANDARD_MASK -#define AR9888_LPO_CAL_ENABLE_LSB AR9888_SOC_LPO_CAL_ENABLE_LSB -#define AR9888_LPO_CAL_ENABLE_MASK AR9888_SOC_LPO_CAL_ENABLE_MASK -#define AR9888_ANALOG_INTF_BASE_ADDRESS AR9888_WLAN_ANALOG_INTF_BASE_ADDRESS -#define AR9888_MBOX_BASE_ADDRESS MISSING -#define AR9888_INT_STATUS_ENABLE_ERROR_LSB MISSING -#define AR9888_INT_STATUS_ENABLE_ERROR_MASK MISSING -#define AR9888_INT_STATUS_ENABLE_CPU_LSB MISSING -#define AR9888_INT_STATUS_ENABLE_CPU_MASK MISSING -#define AR9888_INT_STATUS_ENABLE_COUNTER_LSB MISSING -#define AR9888_INT_STATUS_ENABLE_COUNTER_MASK MISSING -#define AR9888_INT_STATUS_ENABLE_MBOX_DATA_LSB MISSING -#define AR9888_INT_STATUS_ENABLE_MBOX_DATA_MASK MISSING -#define AR9888_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB MISSING -#define AR9888_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK MISSING -#define AR9888_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB MISSING -#define AR9888_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK MISSING -#define AR9888_COUNTER_INT_STATUS_ENABLE_BIT_LSB MISSING -#define AR9888_COUNTER_INT_STATUS_ENABLE_BIT_MASK MISSING -#define AR9888_INT_STATUS_ENABLE_ADDRESS MISSING -#define AR9888_CPU_INT_STATUS_ENABLE_BIT_LSB MISSING -#define AR9888_CPU_INT_STATUS_ENABLE_BIT_MASK MISSING -#define AR9888_HOST_INT_STATUS_ADDRESS MISSING -#define AR9888_CPU_INT_STATUS_ADDRESS MISSING -#define AR9888_ERROR_INT_STATUS_ADDRESS MISSING -#define AR9888_ERROR_INT_STATUS_WAKEUP_MASK MISSING -#define AR9888_ERROR_INT_STATUS_WAKEUP_LSB MISSING -#define AR9888_ERROR_INT_STATUS_RX_UNDERFLOW_MASK MISSING -#define AR9888_ERROR_INT_STATUS_RX_UNDERFLOW_LSB MISSING -#define AR9888_ERROR_INT_STATUS_TX_OVERFLOW_MASK MISSING -#define AR9888_ERROR_INT_STATUS_TX_OVERFLOW_LSB MISSING -#define AR9888_COUNT_DEC_ADDRESS MISSING -#define AR9888_HOST_INT_STATUS_CPU_MASK MISSING -#define AR9888_HOST_INT_STATUS_CPU_LSB MISSING -#define AR9888_HOST_INT_STATUS_ERROR_MASK MISSING -#define AR9888_HOST_INT_STATUS_ERROR_LSB MISSING -#define AR9888_HOST_INT_STATUS_COUNTER_MASK MISSING -#define AR9888_HOST_INT_STATUS_COUNTER_LSB MISSING -#define AR9888_RX_LOOKAHEAD_VALID_ADDRESS MISSING -#define AR9888_WINDOW_DATA_ADDRESS MISSING -#define AR9888_WINDOW_READ_ADDR_ADDRESS MISSING -#define AR9888_WINDOW_WRITE_ADDR_ADDRESS MISSING - -struct targetdef_s ar9888_targetdef = { - .d_RTC_SOC_BASE_ADDRESS = AR9888_RTC_SOC_BASE_ADDRESS, - .d_RTC_WMAC_BASE_ADDRESS = AR9888_RTC_WMAC_BASE_ADDRESS, - .d_SYSTEM_SLEEP_OFFSET = AR9888_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_OFFSET = AR9888_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_DISABLE_LSB = - AR9888_WLAN_SYSTEM_SLEEP_DISABLE_LSB, - .d_WLAN_SYSTEM_SLEEP_DISABLE_MASK = - AR9888_WLAN_SYSTEM_SLEEP_DISABLE_MASK, - .d_CLOCK_CONTROL_OFFSET = AR9888_CLOCK_CONTROL_OFFSET, - .d_CLOCK_CONTROL_SI0_CLK_MASK = AR9888_CLOCK_CONTROL_SI0_CLK_MASK, - .d_RESET_CONTROL_OFFSET = AR9888_SOC_RESET_CONTROL_OFFSET, - .d_RESET_CONTROL_MBOX_RST_MASK = AR9888_RESET_CONTROL_MBOX_RST_MASK, - .d_RESET_CONTROL_SI0_RST_MASK = AR9888_RESET_CONTROL_SI0_RST_MASK, - .d_WLAN_RESET_CONTROL_OFFSET = AR9888_WLAN_RESET_CONTROL_OFFSET, - .d_WLAN_RESET_CONTROL_COLD_RST_MASK = - AR9888_WLAN_RESET_CONTROL_COLD_RST_MASK, - .d_WLAN_RESET_CONTROL_WARM_RST_MASK = - AR9888_WLAN_RESET_CONTROL_WARM_RST_MASK, - .d_GPIO_BASE_ADDRESS = AR9888_GPIO_BASE_ADDRESS, - .d_GPIO_PIN0_OFFSET = AR9888_GPIO_PIN0_OFFSET, - .d_GPIO_PIN1_OFFSET = AR9888_GPIO_PIN1_OFFSET, - .d_GPIO_PIN0_CONFIG_MASK = AR9888_GPIO_PIN0_CONFIG_MASK, - .d_GPIO_PIN1_CONFIG_MASK = AR9888_GPIO_PIN1_CONFIG_MASK, - .d_SI_CONFIG_BIDIR_OD_DATA_LSB = AR9888_SI_CONFIG_BIDIR_OD_DATA_LSB, - .d_SI_CONFIG_BIDIR_OD_DATA_MASK = AR9888_SI_CONFIG_BIDIR_OD_DATA_MASK, - .d_SI_CONFIG_I2C_LSB = AR9888_SI_CONFIG_I2C_LSB, - .d_SI_CONFIG_I2C_MASK = AR9888_SI_CONFIG_I2C_MASK, - .d_SI_CONFIG_POS_SAMPLE_LSB = AR9888_SI_CONFIG_POS_SAMPLE_LSB, - .d_SI_CONFIG_POS_SAMPLE_MASK = AR9888_SI_CONFIG_POS_SAMPLE_MASK, - .d_SI_CONFIG_INACTIVE_CLK_LSB = AR9888_SI_CONFIG_INACTIVE_CLK_LSB, - .d_SI_CONFIG_INACTIVE_CLK_MASK = AR9888_SI_CONFIG_INACTIVE_CLK_MASK, - .d_SI_CONFIG_INACTIVE_DATA_LSB = AR9888_SI_CONFIG_INACTIVE_DATA_LSB, - .d_SI_CONFIG_INACTIVE_DATA_MASK = AR9888_SI_CONFIG_INACTIVE_DATA_MASK, - .d_SI_CONFIG_DIVIDER_LSB = AR9888_SI_CONFIG_DIVIDER_LSB, - .d_SI_CONFIG_DIVIDER_MASK = AR9888_SI_CONFIG_DIVIDER_MASK, - .d_SI_BASE_ADDRESS = AR9888_SI_BASE_ADDRESS, - .d_SI_CONFIG_OFFSET = AR9888_SI_CONFIG_OFFSET, - .d_SI_TX_DATA0_OFFSET = AR9888_SI_TX_DATA0_OFFSET, - .d_SI_TX_DATA1_OFFSET = AR9888_SI_TX_DATA1_OFFSET, - .d_SI_RX_DATA0_OFFSET = AR9888_SI_RX_DATA0_OFFSET, - .d_SI_RX_DATA1_OFFSET = AR9888_SI_RX_DATA1_OFFSET, - .d_SI_CS_OFFSET = AR9888_SI_CS_OFFSET, - .d_SI_CS_DONE_ERR_MASK = AR9888_SI_CS_DONE_ERR_MASK, - .d_SI_CS_DONE_INT_MASK = AR9888_SI_CS_DONE_INT_MASK, - .d_SI_CS_START_LSB = AR9888_SI_CS_START_LSB, - .d_SI_CS_START_MASK = AR9888_SI_CS_START_MASK, - .d_SI_CS_RX_CNT_LSB = AR9888_SI_CS_RX_CNT_LSB, - .d_SI_CS_RX_CNT_MASK = AR9888_SI_CS_RX_CNT_MASK, - .d_SI_CS_TX_CNT_LSB = AR9888_SI_CS_TX_CNT_LSB, - .d_SI_CS_TX_CNT_MASK = AR9888_SI_CS_TX_CNT_MASK, - .d_BOARD_DATA_SZ = AR9888_BOARD_DATA_SZ, - .d_BOARD_EXT_DATA_SZ = AR9888_BOARD_EXT_DATA_SZ, - .d_MBOX_BASE_ADDRESS = AR9888_MBOX_BASE_ADDRESS, - .d_LOCAL_SCRATCH_OFFSET = AR9888_LOCAL_SCRATCH_OFFSET, - .d_CPU_CLOCK_OFFSET = AR9888_CPU_CLOCK_OFFSET, - .d_LPO_CAL_OFFSET = AR9888_LPO_CAL_OFFSET, - .d_GPIO_PIN10_OFFSET = AR9888_GPIO_PIN10_OFFSET, - .d_GPIO_PIN11_OFFSET = AR9888_GPIO_PIN11_OFFSET, - .d_GPIO_PIN12_OFFSET = AR9888_GPIO_PIN12_OFFSET, - .d_GPIO_PIN13_OFFSET = AR9888_GPIO_PIN13_OFFSET, - .d_CLOCK_GPIO_OFFSET = AR9888_CLOCK_GPIO_OFFSET, - .d_CPU_CLOCK_STANDARD_LSB = AR9888_CPU_CLOCK_STANDARD_LSB, - .d_CPU_CLOCK_STANDARD_MASK = AR9888_CPU_CLOCK_STANDARD_MASK, - .d_LPO_CAL_ENABLE_LSB = AR9888_LPO_CAL_ENABLE_LSB, - .d_LPO_CAL_ENABLE_MASK = AR9888_LPO_CAL_ENABLE_MASK, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB = AR9888_CLOCK_GPIO_BT_CLK_OUT_EN_LSB, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK = - AR9888_CLOCK_GPIO_BT_CLK_OUT_EN_MASK, - .d_ANALOG_INTF_BASE_ADDRESS = AR9888_ANALOG_INTF_BASE_ADDRESS, - .d_WLAN_MAC_BASE_ADDRESS = AR9888_WLAN_MAC_BASE_ADDRESS, - .d_FW_INDICATOR_ADDRESS = AR9888_FW_INDICATOR_ADDRESS, - .d_DRAM_BASE_ADDRESS = AR9888_DRAM_BASE_ADDRESS, - .d_SOC_CORE_BASE_ADDRESS = AR9888_SOC_CORE_BASE_ADDRESS, - .d_CORE_CTRL_ADDRESS = AR9888_CORE_CTRL_ADDRESS, - .d_CE_COUNT = AR9888_CE_COUNT, - .d_MSI_NUM_REQUEST = MSI_NUM_REQUEST, - .d_MSI_ASSIGN_FW = MSI_ASSIGN_FW, - .d_MSI_ASSIGN_CE_INITIAL = MSI_ASSIGN_CE_INITIAL, - .d_PCIE_INTR_ENABLE_ADDRESS = AR9888_PCIE_INTR_ENABLE_ADDRESS, - .d_PCIE_INTR_CLR_ADDRESS = AR9888_PCIE_INTR_CLR_ADDRESS, - .d_PCIE_INTR_FIRMWARE_MASK = AR9888_PCIE_INTR_FIRMWARE_MASK, - .d_PCIE_INTR_CE_MASK_ALL = AR9888_PCIE_INTR_CE_MASK_ALL, - .d_CORE_CTRL_CPU_INTR_MASK = AR9888_CORE_CTRL_CPU_INTR_MASK, - .d_SR_WR_INDEX_ADDRESS = AR9888_SR_WR_INDEX_ADDRESS, - .d_DST_WATERMARK_ADDRESS = AR9888_DST_WATERMARK_ADDRESS, - /* htt_rx.c */ - .d_RX_MSDU_END_4_FIRST_MSDU_MASK = - AR9888_RX_MSDU_END_4_FIRST_MSDU_MASK, - .d_RX_MSDU_END_4_FIRST_MSDU_LSB = AR9888_RX_MSDU_END_4_FIRST_MSDU_LSB, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = AR9888_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_LSB = AR9888_RX_MPDU_START_0_SEQ_NUM_LSB, - .d_RX_MPDU_START_2_PN_47_32_LSB = AR9888_RX_MPDU_START_2_PN_47_32_LSB, - .d_RX_MPDU_START_2_PN_47_32_MASK = - AR9888_RX_MPDU_START_2_PN_47_32_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK = - AR9888_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB = - AR9888_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB, - .d_RX_MSDU_END_1_KEY_ID_OCT_MASK = - AR9888_RX_MSDU_END_1_KEY_ID_OCT_MASK, - .d_RX_MSDU_END_1_KEY_ID_OCT_LSB = AR9888_RX_MSDU_END_1_KEY_ID_OCT_LSB, - .d_RX_MSDU_END_4_LAST_MSDU_MASK = AR9888_RX_MSDU_END_4_LAST_MSDU_MASK, - .d_RX_MSDU_END_4_LAST_MSDU_LSB = AR9888_RX_MSDU_END_4_LAST_MSDU_LSB, - .d_RX_ATTENTION_0_MCAST_BCAST_MASK = - AR9888_RX_ATTENTION_0_MCAST_BCAST_MASK, - .d_RX_ATTENTION_0_MCAST_BCAST_LSB = - AR9888_RX_ATTENTION_0_MCAST_BCAST_LSB, - .d_RX_ATTENTION_0_FRAGMENT_MASK = AR9888_RX_ATTENTION_0_FRAGMENT_MASK, - .d_RX_ATTENTION_0_FRAGMENT_LSB = AR9888_RX_ATTENTION_0_FRAGMENT_LSB, - .d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK = - AR9888_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK = - AR9888_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB = - AR9888_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB, - .d_RX_MSDU_START_0_MSDU_LENGTH_MASK = - AR9888_RX_MSDU_START_0_MSDU_LENGTH_MASK, - .d_RX_MSDU_START_0_MSDU_LENGTH_LSB = - AR9888_RX_MSDU_START_0_MSDU_LENGTH_LSB, - .d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET = - AR9888_RX_MSDU_START_2_DECAP_FORMAT_OFFSET, - .d_RX_MSDU_START_2_DECAP_FORMAT_MASK = - AR9888_RX_MSDU_START_2_DECAP_FORMAT_MASK, - .d_RX_MSDU_START_2_DECAP_FORMAT_LSB = - AR9888_RX_MSDU_START_2_DECAP_FORMAT_LSB, - .d_RX_MPDU_START_0_ENCRYPTED_MASK = - AR9888_RX_MPDU_START_0_ENCRYPTED_MASK, - .d_RX_MPDU_START_0_ENCRYPTED_LSB = - AR9888_RX_MPDU_START_0_ENCRYPTED_LSB, - .d_RX_ATTENTION_0_MORE_DATA_MASK = - AR9888_RX_ATTENTION_0_MORE_DATA_MASK, - .d_RX_ATTENTION_0_MSDU_DONE_MASK = - AR9888_RX_ATTENTION_0_MSDU_DONE_MASK, - .d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK = - AR9888_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK, - - .d_PCIE_INTR_CAUSE_ADDRESS = AR9888_PCIE_INTR_CAUSE_ADDRESS, - .d_SOC_RESET_CONTROL_ADDRESS = AR9888_SOC_RESET_CONTROL_ADDRESS, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK = - AR9888_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB = - AR9888_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB, - .d_SOC_RESET_CONTROL_CE_RST_MASK = - AR9888_SOC_RESET_CONTROL_CE_RST_MASK, - .d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK = - AR9888_SOC_RESET_CONTROL_CPU_WARM_RST_MASK, - .d_CPU_INTR_ADDRESS = AR9888_CPU_INTR_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ADDRESS = - AR9888_SOC_LF_TIMER_CONTROL0_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK = - AR9888_SOC_LF_TIMER_CONTROL0_ENABLE_MASK, -}; - -struct hostdef_s ar9888_hostdef = { - .d_INT_STATUS_ENABLE_ERROR_LSB = AR9888_INT_STATUS_ENABLE_ERROR_LSB, - .d_INT_STATUS_ENABLE_ERROR_MASK = AR9888_INT_STATUS_ENABLE_ERROR_MASK, - .d_INT_STATUS_ENABLE_CPU_LSB = AR9888_INT_STATUS_ENABLE_CPU_LSB, - .d_INT_STATUS_ENABLE_CPU_MASK = AR9888_INT_STATUS_ENABLE_CPU_MASK, - .d_INT_STATUS_ENABLE_COUNTER_LSB = - AR9888_INT_STATUS_ENABLE_COUNTER_LSB, - .d_INT_STATUS_ENABLE_COUNTER_MASK = - AR9888_INT_STATUS_ENABLE_COUNTER_MASK, - .d_INT_STATUS_ENABLE_MBOX_DATA_LSB = - AR9888_INT_STATUS_ENABLE_MBOX_DATA_LSB, - .d_INT_STATUS_ENABLE_MBOX_DATA_MASK = - AR9888_INT_STATUS_ENABLE_MBOX_DATA_MASK, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB = - AR9888_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK = - AR9888_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB = - AR9888_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK = - AR9888_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK, - .d_COUNTER_INT_STATUS_ENABLE_BIT_LSB = - AR9888_COUNTER_INT_STATUS_ENABLE_BIT_LSB, - .d_COUNTER_INT_STATUS_ENABLE_BIT_MASK = - AR9888_COUNTER_INT_STATUS_ENABLE_BIT_MASK, - .d_INT_STATUS_ENABLE_ADDRESS = AR9888_INT_STATUS_ENABLE_ADDRESS, - .d_CPU_INT_STATUS_ENABLE_BIT_LSB = - AR9888_CPU_INT_STATUS_ENABLE_BIT_LSB, - .d_CPU_INT_STATUS_ENABLE_BIT_MASK = - AR9888_CPU_INT_STATUS_ENABLE_BIT_MASK, - .d_HOST_INT_STATUS_ADDRESS = AR9888_HOST_INT_STATUS_ADDRESS, - .d_CPU_INT_STATUS_ADDRESS = AR9888_CPU_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_ADDRESS = AR9888_ERROR_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_WAKEUP_MASK = AR9888_ERROR_INT_STATUS_WAKEUP_MASK, - .d_ERROR_INT_STATUS_WAKEUP_LSB = AR9888_ERROR_INT_STATUS_WAKEUP_LSB, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK = - AR9888_ERROR_INT_STATUS_RX_UNDERFLOW_MASK, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB = - AR9888_ERROR_INT_STATUS_RX_UNDERFLOW_LSB, - .d_ERROR_INT_STATUS_TX_OVERFLOW_MASK = - AR9888_ERROR_INT_STATUS_TX_OVERFLOW_MASK, - .d_ERROR_INT_STATUS_TX_OVERFLOW_LSB = - AR9888_ERROR_INT_STATUS_TX_OVERFLOW_LSB, - .d_COUNT_DEC_ADDRESS = AR9888_COUNT_DEC_ADDRESS, - .d_HOST_INT_STATUS_CPU_MASK = AR9888_HOST_INT_STATUS_CPU_MASK, - .d_HOST_INT_STATUS_CPU_LSB = AR9888_HOST_INT_STATUS_CPU_LSB, - .d_HOST_INT_STATUS_ERROR_MASK = AR9888_HOST_INT_STATUS_ERROR_MASK, - .d_HOST_INT_STATUS_ERROR_LSB = AR9888_HOST_INT_STATUS_ERROR_LSB, - .d_HOST_INT_STATUS_COUNTER_MASK = AR9888_HOST_INT_STATUS_COUNTER_MASK, - .d_HOST_INT_STATUS_COUNTER_LSB = AR9888_HOST_INT_STATUS_COUNTER_LSB, - .d_RX_LOOKAHEAD_VALID_ADDRESS = AR9888_RX_LOOKAHEAD_VALID_ADDRESS, - .d_WINDOW_DATA_ADDRESS = AR9888_WINDOW_DATA_ADDRESS, - .d_WINDOW_READ_ADDR_ADDRESS = AR9888_WINDOW_READ_ADDR_ADDRESS, - .d_WINDOW_WRITE_ADDR_ADDRESS = AR9888_WINDOW_WRITE_ADDR_ADDRESS, - .d_SOC_GLOBAL_RESET_ADDRESS = AR9888_SOC_GLOBAL_RESET_ADDRESS, - .d_RTC_STATE_ADDRESS = AR9888_RTC_STATE_ADDRESS, - .d_RTC_STATE_COLD_RESET_MASK = AR9888_RTC_STATE_COLD_RESET_MASK, - .d_PCIE_LOCAL_BASE_ADDRESS = AR9888_PCIE_LOCAL_BASE_ADDRESS, - .d_PCIE_SOC_WAKE_RESET = AR9888_PCIE_SOC_WAKE_RESET, - .d_PCIE_SOC_WAKE_ADDRESS = AR9888_PCIE_SOC_WAKE_ADDRESS, - .d_PCIE_SOC_WAKE_V_MASK = AR9888_PCIE_SOC_WAKE_V_MASK, - .d_RTC_STATE_V_MASK = AR9888_RTC_STATE_V_MASK, - .d_RTC_STATE_V_LSB = AR9888_RTC_STATE_V_LSB, - .d_FW_IND_EVENT_PENDING = AR9888_FW_IND_EVENT_PENDING, - .d_FW_IND_INITIALIZED = AR9888_FW_IND_INITIALIZED, - .d_RTC_STATE_V_ON = AR9888_RTC_STATE_V_ON, - .d_MUX_ID_MASK = AR9888_MUX_ID_MASK, - .d_TRANSACTION_ID_MASK = AR9888_TRANSACTION_ID_MASK, -#if defined(SDIO_3_0) - .d_HOST_INT_STATUS_MBOX_DATA_MASK = - AR9888_HOST_INT_STATUS_MBOX_DATA_MASK, - .d_HOST_INT_STATUS_MBOX_DATA_LSB = - AR9888_HOST_INT_STATUS_MBOX_DATA_LSB, -#endif - .d_PCIE_SOC_RDY_STATUS_ADDRESS = PCIE_SOC_RDY_STATUS_ADDRESS, - .d_PCIE_SOC_RDY_STATUS_BAR_MASK = PCIE_SOC_RDY_STATUS_BAR_MASK, - .d_SOC_PCIE_BASE_ADDRESS = SOC_PCIE_BASE_ADDRESS, - .d_MSI_MAGIC_ADR_ADDRESS = MSI_MAGIC_ADR_ADDRESS, - .d_MSI_MAGIC_ADDRESS = MSI_MAGIC_ADDRESS, - .d_HOST_CE_COUNT = 8, - .d_ENABLE_MSI = 0, -}; - - -struct ce_reg_def ar9888_ce_targetdef = { - /* copy_engine.c */ - .d_DST_WR_INDEX_ADDRESS = AR9888_DST_WR_INDEX_ADDRESS, - .d_SRC_WATERMARK_ADDRESS = AR9888_SRC_WATERMARK_ADDRESS, - .d_SRC_WATERMARK_LOW_MASK = AR9888_SRC_WATERMARK_LOW_MASK, - .d_SRC_WATERMARK_HIGH_MASK = AR9888_SRC_WATERMARK_HIGH_MASK, - .d_DST_WATERMARK_LOW_MASK = AR9888_DST_WATERMARK_LOW_MASK, - .d_DST_WATERMARK_HIGH_MASK = AR9888_DST_WATERMARK_HIGH_MASK, - .d_CURRENT_SRRI_ADDRESS = AR9888_CURRENT_SRRI_ADDRESS, - .d_CURRENT_DRRI_ADDRESS = AR9888_CURRENT_DRRI_ADDRESS, - .d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK = - AR9888_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK = - AR9888_HOST_IS_SRC_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK = - AR9888_HOST_IS_DST_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_DST_RING_LOW_WATERMARK_MASK = - AR9888_HOST_IS_DST_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_ADDRESS = AR9888_HOST_IS_ADDRESS, - .d_HOST_IS_COPY_COMPLETE_MASK = AR9888_HOST_IS_COPY_COMPLETE_MASK, - .d_CE_WRAPPER_BASE_ADDRESS = AR9888_CE_WRAPPER_BASE_ADDRESS, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS = - AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS, - .d_HOST_IE_ADDRESS = AR9888_HOST_IE_ADDRESS, - .d_HOST_IE_COPY_COMPLETE_MASK = AR9888_HOST_IE_COPY_COMPLETE_MASK, - .d_SR_BA_ADDRESS = AR9888_SR_BA_ADDRESS, - .d_SR_SIZE_ADDRESS = AR9888_SR_SIZE_ADDRESS, - .d_CE_CTRL1_ADDRESS = AR9888_CE_CTRL1_ADDRESS, - .d_CE_CTRL1_DMAX_LENGTH_MASK = AR9888_CE_CTRL1_DMAX_LENGTH_MASK, - .d_DR_BA_ADDRESS = AR9888_DR_BA_ADDRESS, - .d_DR_SIZE_ADDRESS = AR9888_DR_SIZE_ADDRESS, - .d_MISC_IE_ADDRESS = AR9888_MISC_IE_ADDRESS, - .d_MISC_IS_AXI_ERR_MASK = AR9888_MISC_IS_AXI_ERR_MASK, - .d_MISC_IS_DST_ADDR_ERR_MASK = AR9888_MISC_IS_DST_ADDR_ERR_MASK, - .d_MISC_IS_SRC_LEN_ERR_MASK = AR9888_MISC_IS_SRC_LEN_ERR_MASK, - .d_MISC_IS_DST_MAX_LEN_VIO_MASK = AR9888_MISC_IS_DST_MAX_LEN_VIO_MASK, - .d_MISC_IS_DST_RING_OVERFLOW_MASK = - AR9888_MISC_IS_DST_RING_OVERFLOW_MASK, - .d_MISC_IS_SRC_RING_OVERFLOW_MASK = - AR9888_MISC_IS_SRC_RING_OVERFLOW_MASK, - .d_SRC_WATERMARK_LOW_LSB = AR9888_SRC_WATERMARK_LOW_LSB, - .d_SRC_WATERMARK_HIGH_LSB = AR9888_SRC_WATERMARK_HIGH_LSB, - .d_DST_WATERMARK_LOW_LSB = AR9888_DST_WATERMARK_LOW_LSB, - .d_DST_WATERMARK_HIGH_LSB = AR9888_DST_WATERMARK_HIGH_LSB, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK = - AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB = - AR9888_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB, - .d_CE_CTRL1_DMAX_LENGTH_LSB = AR9888_CE_CTRL1_DMAX_LENGTH_LSB, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK = - AR9888_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK = - AR9888_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB = - AR9888_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB = - AR9888_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB, - .d_CE0_BASE_ADDRESS = AR9888_CE0_BASE_ADDRESS, - .d_CE1_BASE_ADDRESS = AR9888_CE1_BASE_ADDRESS, - -}; -#endif diff --git a/core/hif/src/ath_procfs.c b/core/hif/src/ath_procfs.c deleted file mode 100644 index 2b25e3ea7598..000000000000 --- a/core/hif/src/ath_procfs.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if defined(CONFIG_ATH_PROCFS_DIAG_SUPPORT) -#include /* Specifically, a module */ -#include /* We're doing kernel work */ -#include /* We're doing kernel work */ -#include /* Necessary because we use the proc fs */ -#include /* for copy_from_user */ -#include "ol_if_athvar.h" -#include "hif.h" -#if defined(HIF_PCI) -#include "if_pci.h" -#elif defined(HIF_USB) -#include "if_usb.h" -#elif defined(HIF_SDIO) -#include "if_ath_sdio.h" -#endif -#include "cds_api.h" -#include "hif_debug.h" - -#define PROCFS_NAME "athdiagpfs" -#define PROCFS_DIR "cld" - -/** - * This structure hold information about the /proc file - * - */ -static struct proc_dir_entry *proc_file, *proc_dir; - -static void *get_hif_hdl_from_file(struct file *file) -{ - struct ol_softc *scn; - - scn = (struct ol_softc *)PDE_DATA(file_inode(file)); - return (void *)scn; -} - -static ssize_t ath_procfs_diag_read(struct file *file, char __user *buf, - size_t count, loff_t *pos) -{ - hif_handle_t hif_hdl; - int rv; - uint8_t *read_buffer = NULL; - - read_buffer = cdf_mem_malloc(count); - if (NULL == read_buffer) { - HIF_ERROR("%s: cdf_mem_alloc failed", __func__); - return -ENOMEM; - } - - hif_hdl = get_hif_hdl_from_file(file); - HIF_DBG("rd buff 0x%p cnt %zu offset 0x%x buf 0x%p", - read_buffer, count, (int)*pos, buf); - - if ((count == 4) && ((((uint32_t) (*pos)) & 3) == 0)) { - /* reading a word? */ - rv = hif_diag_read_access(hif_hdl, (uint32_t)(*pos), - (uint32_t *)read_buffer); - } else { - rv = hif_diag_read_mem(hif_hdl, (uint32_t)(*pos), - (uint8_t *)read_buffer, count); - } - - if (copy_to_user(buf, read_buffer, count)) { - cdf_mem_free(read_buffer); - HIF_ERROR("%s: copy_to_user error in /proc/%s", - __func__, PROCFS_NAME); - return -EFAULT; - } else - cdf_mem_free(read_buffer); - - if (rv == 0) { - return count; - } else { - return -EIO; - } -} - -static ssize_t ath_procfs_diag_write(struct file *file, - const char __user *buf, - size_t count, loff_t *pos) -{ - hif_handle_t hif_hdl; - int rv; - uint8_t *write_buffer = NULL; - - write_buffer = cdf_mem_malloc(count); - if (NULL == write_buffer) { - HIF_ERROR("%s: cdf_mem_alloc failed", __func__); - return -ENOMEM; - } - if (copy_from_user(write_buffer, buf, count)) { - cdf_mem_free(write_buffer); - HIF_ERROR("%s: copy_to_user error in /proc/%s", - __func__, PROCFS_NAME); - return -EFAULT; - } - - hif_hdl = get_hif_hdl_from_file(file); - HIF_DBG("wr buff 0x%p buf 0x%p cnt %zu offset 0x%x value 0x%x", - write_buffer, buf, count, - (int)*pos, *((uint32_t *) write_buffer)); - - if ((count == 4) && ((((uint32_t) (*pos)) & 3) == 0)) { - /* reading a word? */ - uint32_t value = *((uint32_t *)write_buffer); - rv = hif_diag_write_access(hif_hdl, (uint32_t)(*pos), value); - } else { - rv = hif_diag_write_mem(hif_hdl, (uint32_t)(*pos), - (uint8_t *)write_buffer, count); - } - - cdf_mem_free(write_buffer); - if (rv == 0) { - return count; - } else { - return -EIO; - } -} - -static const struct file_operations athdiag_fops = { - .read = ath_procfs_diag_read, - .write = ath_procfs_diag_write, -}; - -/** - *This function is called when the module is loaded - * - */ -int athdiag_procfs_init(void *scn) -{ - proc_dir = proc_mkdir(PROCFS_DIR, NULL); - if (proc_dir == NULL) { - remove_proc_entry(PROCFS_DIR, NULL); - HIF_ERROR("%s: Error: Could not initialize /proc/%s", - __func__, PROCFS_DIR); - return -ENOMEM; - } - - proc_file = proc_create_data(PROCFS_NAME, - S_IRUSR | S_IWUSR, proc_dir, - &athdiag_fops, (void *)scn); - if (proc_file == NULL) { - remove_proc_entry(PROCFS_NAME, proc_dir); - HIF_ERROR("%s: Could not initialize /proc/%s", - __func__, PROCFS_NAME); - return -ENOMEM; - } - - HIF_DBG("/proc/%s/%s created", PROCFS_DIR, PROCFS_NAME); - return 0; /* everything is ok */ -} - -/** - *This function is called when the module is unloaded - * - */ -void athdiag_procfs_remove(void) -{ - if (proc_dir != NULL) { - remove_proc_entry(PROCFS_NAME, proc_dir); - HIF_DBG("/proc/%s/%s removed", PROCFS_DIR, PROCFS_NAME); - remove_proc_entry(PROCFS_DIR, NULL); - HIF_DBG("/proc/%s removed", PROCFS_DIR); - proc_dir = NULL; - } -} -#else -int athdiag_procfs_init(void *scn) -{ - return 0; -} -void athdiag_procfs_remove(void) {} -#endif diff --git a/core/hif/src/ce/ce_api.h b/core/hif/src/ce/ce_api.h deleted file mode 100644 index ddd82e357b11..000000000000 --- a/core/hif/src/ce/ce_api.h +++ /dev/null @@ -1,477 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __COPY_ENGINE_API_H__ -#define __COPY_ENGINE_API_H__ - -#include "ce_main.h" -/* TBDXXX: Use int return values for consistency with Target */ - -/* TBDXXX: Perhaps merge Host/Target-->common */ - -/* - * Copy Engine support: low-level Target-side Copy Engine API. - * This is a hardware access layer used by code that understands - * how to use copy engines. - */ - -/* - * A "struct CE_handle *" serves as an opaque pointer-sized - * handle to a specific copy engine. - */ -struct CE_handle; - -/* - * "Send Completion" callback type for Send Completion Notification. - * - * If a Send Completion callback is registered and one or more sends - * have completed, the callback is invoked. - * - * per_ce_send_context is a context supplied by the calling layer - * (via ce_send_cb_register). It is associated with a copy engine. - * - * per_transfer_send_context is context supplied by the calling layer - * (via the "send" call). It may be different for each invocation - * of send. - * - * The buffer parameter is the first byte sent of the first buffer - * sent (if more than one buffer). - * - * nbytes is the number of bytes of that buffer that were sent. - * - * transfer_id matches the value used when the buffer or - * buf_list was sent. - * - * Implementation note: Pops 1 completed send buffer from Source ring - */ -typedef void (*ce_send_cb)(struct CE_handle *copyeng, - void *per_ce_send_context, - void *per_transfer_send_context, - cdf_dma_addr_t buffer, - unsigned int nbytes, - unsigned int transfer_id, - unsigned int sw_index, - unsigned int hw_index, - uint32_t toeplitz_hash_result); - -/* - * "Buffer Received" callback type for Buffer Received Notification. - * - * Implementation note: Pops 1 completed recv buffer from Dest ring - */ -typedef void (*CE_recv_cb)(struct CE_handle *copyeng, - void *per_CE_recv_context, - void *per_transfer_recv_context, - cdf_dma_addr_t buffer, - unsigned int nbytes, - unsigned int transfer_id, - unsigned int flags); - -/* - * Copy Engine Watermark callback type. - * - * Allows upper layers to be notified when watermarks are reached: - * space is available and/or running short in a source ring - * buffers are exhausted and/or abundant in a destination ring - * - * The flags parameter indicates which condition triggered this - * callback. See CE_WM_FLAG_*. - * - * Watermark APIs are provided to allow upper layers "batch" - * descriptor processing and to allow upper layers to - * throttle/unthrottle. - */ -typedef void (*CE_watermark_cb)(struct CE_handle *copyeng, - void *per_CE_wm_context, unsigned int flags); - -#define CE_WM_FLAG_SEND_HIGH 1 -#define CE_WM_FLAG_SEND_LOW 2 -#define CE_WM_FLAG_RECV_HIGH 4 -#define CE_WM_FLAG_RECV_LOW 8 - -/* A list of buffers to be gathered and sent */ -struct ce_sendlist; - -/* Copy Engine settable attributes */ -struct CE_attr; - -/*==================Send=====================================================*/ - -/* ce_send flags */ -/* disable ring's byte swap, even if the default policy is to swap */ -#define CE_SEND_FLAG_SWAP_DISABLE 1 - -/* - * Queue a source buffer to be sent to an anonymous destination buffer. - * copyeng - which copy engine to use - * buffer - address of buffer - * nbytes - number of bytes to send - * transfer_id - arbitrary ID; reflected to destination - * flags - CE_SEND_FLAG_* values - * Returns 0 on success; otherwise an error status. - * - * Note: If no flags are specified, use CE's default data swap mode. - * - * Implementation note: pushes 1 buffer to Source ring - */ -int ce_send(struct CE_handle *copyeng, - void *per_transfer_send_context, - cdf_dma_addr_t buffer, - unsigned int nbytes, - unsigned int transfer_id, - unsigned int flags, - unsigned int user_flags); - -#ifdef WLAN_FEATURE_FASTPATH -int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, - unsigned int num_msdus, unsigned int transfer_id); - -#endif -void ce_pkt_dl_len_set(void *hif_sc, unsigned int pkt_download_len); - -/* - * Register a Send Callback function. - * This function is called as soon as the contents of a Send - * have reached the destination, unless disable_interrupts is - * requested. In this case, the callback is invoked when the - * send status is polled, shortly after the send completes. - */ -void ce_send_cb_register(struct CE_handle *copyeng, - ce_send_cb fn_ptr, - void *per_ce_send_context, int disable_interrupts); - -/* - * Return the size of a SendList. This allows the caller to allocate - * a SendList while the SendList structure remains opaque. - */ -unsigned int ce_sendlist_sizeof(void); - -/* Initialize a sendlist */ -void ce_sendlist_init(struct ce_sendlist *sendlist); - -/* Append a simple buffer (address/length) to a sendlist. */ -int ce_sendlist_buf_add(struct ce_sendlist *sendlist, - cdf_dma_addr_t buffer, - unsigned int nbytes, - uint32_t flags, /* OR-ed with internal flags */ - uint32_t user_flags); - -/* - * Queue a "sendlist" of buffers to be sent using gather to a single - * anonymous destination buffer - * copyeng - which copy engine to use - * sendlist - list of simple buffers to send using gather - * transfer_id - arbitrary ID; reflected to destination - * Returns 0 on success; otherwise an error status. - * - * Implemenation note: Pushes multiple buffers with Gather to Source ring. - */ -int ce_sendlist_send(struct CE_handle *copyeng, - void *per_transfer_send_context, - struct ce_sendlist *sendlist, - unsigned int transfer_id); - -/*==================Recv=====================================================*/ - -/* - * Make a buffer available to receive. The buffer must be at least of a - * minimal size appropriate for this copy engine (src_sz_max attribute). - * copyeng - which copy engine to use - * per_transfer_recv_context - context passed back to caller's recv_cb - * buffer - address of buffer in CE space - * Returns 0 on success; otherwise an error status. - * - * Implemenation note: Pushes a buffer to Dest ring. - */ -int ce_recv_buf_enqueue(struct CE_handle *copyeng, - void *per_transfer_recv_context, - cdf_dma_addr_t buffer); - -/* - * Register a Receive Callback function. - * This function is called as soon as data is received - * from the source. - */ -void ce_recv_cb_register(struct CE_handle *copyeng, - CE_recv_cb fn_ptr, - void *per_CE_recv_context, - int disable_interrupts); - -/*==================CE Watermark=============================================*/ - -/* - * Register a Watermark Callback function. - * This function is called as soon as a watermark level - * is crossed. A Watermark Callback function is free to - * handle received data "en masse"; but then some coordination - * is required with a registered Receive Callback function. - * [Suggestion: Either handle Receives in a Receive Callback - * or en masse in a Watermark Callback; but not both.] - */ -void ce_watermark_cb_register(struct CE_handle *copyeng, - CE_watermark_cb fn_ptr, - void *per_CE_wm_context); - -/* - * Set low/high watermarks for the send/source side of a copy engine. - * - * Typically, the destination side CPU manages watermarks for - * the receive side and the source side CPU manages watermarks - * for the send side. - * - * A low watermark of 0 is never hit (so the watermark function - * will never be called for a Low Watermark condition). - * - * A high watermark equal to nentries is never hit (so the - * watermark function will never be called for a High Watermark - * condition). - */ -void ce_send_watermarks_set(struct CE_handle *copyeng, - unsigned int low_alert_nentries, - unsigned int high_alert_nentries); - -/* Set low/high watermarks for the receive/destination side of copy engine. */ -void ce_recv_watermarks_set(struct CE_handle *copyeng, - unsigned int low_alert_nentries, - unsigned int high_alert_nentries); - -/* - * Return the number of entries that can be queued - * to a ring at an instant in time. - * - * For source ring, does not imply that destination-side - * buffers are available; merely indicates descriptor space - * in the source ring. - * - * For destination ring, does not imply that previously - * received buffers have been processed; merely indicates - * descriptor space in destination ring. - * - * Mainly for use with CE Watermark callback. - */ -unsigned int ce_send_entries_avail(struct CE_handle *copyeng); -unsigned int ce_recv_entries_avail(struct CE_handle *copyeng); - -/* - * Return the number of entries in the ring that are ready - * to be processed by software. - * - * For source ring, the number of descriptors that have - * been completed and can now be overwritten with new send - * descriptors. - * - * For destination ring, the number of descriptors that - * are available to be processed (newly received buffers). - */ -unsigned int ce_send_entries_done(struct CE_handle *copyeng); -unsigned int ce_recv_entries_done(struct CE_handle *copyeng); - -/* recv flags */ -/* Data is byte-swapped */ -#define CE_RECV_FLAG_SWAPPED 1 - -void ce_enable_msi(struct ol_softc *scn, - unsigned int CE_id, - uint32_t msi_addr_lo, - uint32_t msi_addr_hi, - uint32_t msi_data); -/* - * Supply data for the next completed unprocessed receive descriptor. - * - * For use - * with CE Watermark callback, - * in a recv_cb function when processing buf_lists - * in a recv_cb function in order to mitigate recv_cb's. - * - * Implemenation note: Pops buffer from Dest ring. - */ -int ce_completed_recv_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *flagsp); - -/* - * Supply data for the next completed unprocessed send descriptor. - * - * For use - * with CE Watermark callback - * in a send_cb function in order to mitigate send_cb's. - * - * Implementation note: Pops 1 completed send buffer from Source ring - */ -int ce_completed_send_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *sw_idx, - unsigned int *hw_idx, - uint32_t *toeplitz_hash_result); - -/*==================CE Engine Initialization=================================*/ - -/* Initialize an instance of a CE */ -struct CE_handle *ce_init(struct ol_softc *scn, - unsigned int CE_id, struct CE_attr *attr); - -/*==================CE Engine Shutdown=======================================*/ -/* - * Support clean shutdown by allowing the caller to revoke - * receive buffers. Target DMA must be stopped before using - * this API. - */ -CDF_STATUS -ce_revoke_recv_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp); - -/* - * Support clean shutdown by allowing the caller to cancel - * pending sends. Target DMA must be stopped before using - * this API. - */ -CDF_STATUS -ce_cancel_send_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - uint32_t *toeplitz_hash_result); - -void ce_fini(struct CE_handle *copyeng); - -/*==================CE Interrupt Handlers====================================*/ -void ce_per_engine_service_any(int irq, struct ol_softc *scn); -int ce_per_engine_service(struct ol_softc *scn, unsigned int CE_id); -void ce_per_engine_servicereap(struct ol_softc *scn, unsigned int CE_id); - -/*===================CE cmpl interrupt Enable/Disable =======================*/ -void ce_disable_any_copy_compl_intr_nolock(struct ol_softc *scn); -void ce_enable_any_copy_compl_intr_nolock(struct ol_softc *scn); - -/* API to check if any of the copy engine pipes has - * pending frames for prcoessing - */ -bool ce_get_rx_pending(struct ol_softc *scn); - -/* CE_attr.flags values */ -#define CE_ATTR_NO_SNOOP 0x01 /* Use NonSnooping PCIe accesses? */ -#define CE_ATTR_BYTE_SWAP_DATA 0x02 /* Byte swap data words */ -#define CE_ATTR_SWIZZLE_DESCRIPTORS 0x04 /* Swizzle descriptors? */ -#define CE_ATTR_DISABLE_INTR 0x08 /* no interrupt on copy completion */ -#define CE_ATTR_ENABLE_POLL 0x10 /* poll for residue descriptors */ - -/* Attributes of an instance of a Copy Engine */ -struct CE_attr { - unsigned int flags; /* CE_ATTR_* values */ - unsigned int priority; /* TBD */ - unsigned int src_nentries; /* #entries in source ring - - * Must be a power of 2 */ - unsigned int src_sz_max; /* Max source send size for this CE. - * This is also the minimum size of - * a destination buffer. */ - unsigned int dest_nentries; /* #entries in destination ring - - * Must be a power of 2 */ - void *reserved; /* Future use */ -}; - -/* - * When using sendlist_send to transfer multiple buffer fragments, the - * transfer context of each fragment, except last one, will be filled - * with CE_SENDLIST_ITEM_CTXT. CE_completed_send will return success for - * each fragment done with send and the transfer context would be - * CE_SENDLIST_ITEM_CTXT. Upper layer could use this to identify the - * status of a send completion. - */ -#define CE_SENDLIST_ITEM_CTXT ((void *)0xcecebeef) - -/* - * This is an opaque type that is at least large enough to hold - * a sendlist. A sendlist can only be accessed through CE APIs, - * but this allows a sendlist to be allocated on the run-time - * stack. TBDXXX: un-opaque would be simpler... - */ -struct ce_sendlist { - unsigned int word[62]; -}; - -#define ATH_ISR_NOSCHED 0x0000 /* Do not schedule bottom half/DPC */ -#define ATH_ISR_SCHED 0x0001 /* Schedule the bottom half for execution */ -#define ATH_ISR_NOTMINE 0x0002 /* for shared IRQ's */ - -#ifdef IPA_OFFLOAD -void ce_ipa_get_resource(struct CE_handle *ce, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr); -#else -/** - * ce_ipa_get_resource() - get uc resource on copyengine - * @ce: copyengine context - * @ce_sr_base_paddr: copyengine source ring base physical address - * @ce_sr_ring_size: copyengine source ring size - * @ce_reg_paddr: copyengine register physical address - * - * Copy engine should release resource to micro controller - * Micro controller needs - * - Copy engine source descriptor base address - * - Copy engine source descriptor size - * - PCI BAR address to access copy engine regiser - * - * Return: None - */ -static inline void ce_ipa_get_resource(struct CE_handle *ce, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr) -{ - return; -} -#endif /* IPA_OFFLOAD */ - -static inline void ce_pkt_error_count_incr( - struct HIF_CE_state *_hif_state, - enum ol_ath_hif_pkt_ecodes _hif_ecode) -{ - if (_hif_ecode == HIF_PIPE_NO_RESOURCE) - (_hif_state->scn->pkt_stats.hif_pipe_no_resrc_count) - += 1; -} - -bool ce_check_rx_pending(struct ol_softc *scn, int ce_id); -#if defined(FEATURE_LRO) -void ce_lro_flush_cb_register(struct ol_softc *scn, - void (handler)(void *), void *data); -void ce_lro_flush_cb_deregister(struct ol_softc *scn); -#endif -#endif /* __COPY_ENGINE_API_H__ */ diff --git a/core/hif/src/ce/ce_assignment.h b/core/hif/src/ce/ce_assignment.h deleted file mode 100644 index 9ff907f23fbf..000000000000 --- a/core/hif/src/ce/ce_assignment.h +++ /dev/null @@ -1,301 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * Implementation of the Host-side Host InterFace (HIF) API - * for a Host/Target interconnect using Copy Engines over PCIe. - */ - -#ifndef __HIF_PCI_INTERNAL_H__ -#define __HIF_PCI_INTERNAL_H__ - -#define HIF_PCI_DEBUG ATH_DEBUG_MAKE_MODULE_MASK(0) -#define HIF_PCI_IPA_UC_ASSIGNED_CE 5 - -#if defined(DEBUG) -static ATH_DEBUG_MASK_DESCRIPTION g_hif_debug_description[] = { - {HIF_PCI_DEBUG, "hif_pci"}, -}; - -ATH_DEBUG_INSTANTIATE_MODULE_VAR(hif, "hif", "PCIe Host Interface", - ATH_DEBUG_MASK_DEFAULTS | ATH_DEBUG_INFO, - ATH_DEBUG_DESCRIPTION_COUNT - (g_hif_debug_description), - g_hif_debug_description); -#endif - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -spinlock_t pcie_access_log_lock; -unsigned int pcie_access_log_seqnum = 0; -HIF_ACCESS_LOG pcie_access_log[PCIE_ACCESS_LOG_NUM]; -static void hif_target_dump_access_log(void); -#endif - -/* - * Host software's Copy Engine configuration. - * This table is derived from the CE_PCI TABLE, above. - */ -#ifdef BIG_ENDIAN_HOST -#define CE_ATTR_FLAGS CE_ATTR_BYTE_SWAP_DATA -#else -#define CE_ATTR_FLAGS 0 -#endif - -/* Maximum number of Copy Engine's supported */ -#define CE_HTT_H2T_MSG_SRC_NENTRIES 2048 - -#define DIAG_CE_ID 7 -#define EPPING_CE_FLAGS_POLL \ - (CE_ATTR_DISABLE_INTR|CE_ATTR_ENABLE_POLL|CE_ATTR_FLAGS) -#ifdef QCA_WIFI_3_0 -static struct CE_attr host_ce_config_wlan[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,}, - /* target->host HTT + HTC control */ - { /* CE1 */ CE_ATTR_FLAGS, 0, 0, 2048, 512, NULL,}, - /* target->host WMI */ - { /* CE2 */ CE_ATTR_FLAGS, 0, 0, 2048, 32, NULL,}, - /* host->target WMI */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,}, - /* host->target HTT */ - { /* CE4 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0, - CE_HTT_H2T_MSG_SRC_NENTRIES, 256, 0, NULL,}, - /* ipa_uc->target HTC control */ - { /* CE5 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0, - 1024, 512, 0, NULL,}, - /* Target autonomous HIF_memcpy */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0, - 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, - /* Target to uMC */ - { /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /*The following CEs are not being used yet */ - { /* CE9 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - { /* CE10 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - { /* CE11 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, -}; - -static struct CE_pipe_config target_ce_config_wlan[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ 0, PIPEDIR_OUT, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host HTT */ - { /* CE1 */ 1, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host WMI + HTC control */ - { /* CE2 */ 2, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target WMI */ - { /* CE3 */ 3, PIPEDIR_OUT, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target HTT */ - { /* CE4 */ 4, PIPEDIR_OUT, 256, 256, - (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,}, - /* NB: 50% of src nentries, since tx has 2 frags */ - /* ipa_uc->target */ - { /* CE5 */ 5, PIPEDIR_OUT, 1024, 64, - (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,}, - /* Reserved for target autonomous HIF_memcpy */ - { /* CE6 */ 6, PIPEDIR_INOUT, 32, 4096, CE_ATTR_FLAGS, 0,}, - /* CE7 used only by Host */ - { /* CE7 */ 7, PIPEDIR_INOUT_H2H, 0, 0, - (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,}, - /* CE8 used only by IPA */ - { /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}, - /*The following CEs are not being used yet*/ - { /* CE9 */ 9, PIPEDIR_IN, 0, 0, CE_ATTR_FLAGS, 0,}, - { /* CE10 */ 9, PIPEDIR_IN, 0, 0, CE_ATTR_FLAGS, 0,}, - { /* CE11 */ 9, PIPEDIR_IN, 0, 0, CE_ATTR_FLAGS, 0,}, -}; - -static struct CE_attr host_ce_config_wlan_epping_poll[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,}, - /* target->host EP-ping */ - { /* CE1 */ EPPING_CE_FLAGS_POLL, 0, 0, 2048, 128, NULL,}, - /* target->host EP-ping */ - { /* CE2 */ EPPING_CE_FLAGS_POLL, 0, 0, 2048, 128, NULL,}, - /* host->target EP-ping */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* host->target EP-ping */ - { /* CE4 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* EP-ping heartbeat */ - { /* CE5 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* unused */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ CE_ATTR_FLAGS, 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, -}; - -static struct CE_attr host_ce_config_wlan_epping_irq[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,}, - /* target->host EP-ping */ - { /* CE1 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* target->host EP-ping */ - { /* CE2 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* host->target EP-ping */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* host->target EP-ping */ - { /* CE4 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* EP-ping heartbeat */ - { /* CE5 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* unused */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ CE_ATTR_FLAGS, 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, -}; -/* - * EP-ping firmware's CE configuration - */ -static struct CE_pipe_config target_ce_config_wlan_epping[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ 0, PIPEDIR_OUT, 16, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host EP-ping */ - { /* CE1 */ 1, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host EP-ping */ - { /* CE2 */ 2, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target EP-ping */ - { /* CE3 */ 3, PIPEDIR_OUT, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target EP-ping */ - { /* CE4 */ 4, PIPEDIR_OUT, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* EP-ping heartbeat */ - { /* CE5 */ 5, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* unused */ - { /* CE6 */ 6, PIPEDIR_INOUT, 0, 0, CE_ATTR_FLAGS, 0,}, - /* CE7 used only by Host */ - { /* CE7 */ 7, PIPEDIR_INOUT_H2H, 0, 0, 0, 0,}, - /* CE8 used only by IPA */ - { /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,} -}; -#else -static struct CE_attr host_ce_config_wlan[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 256, 0, NULL,}, - /* target->host HTT + HTC control */ - { /* CE1 */ CE_ATTR_FLAGS, 0, 0, 2048, 512, NULL,}, - /* target->host WMI */ - { /* CE2 */ CE_ATTR_FLAGS, 0, 0, 2048, 32, NULL,}, - /* host->target WMI */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,}, - /* host->target HTT */ - { /* CE4 */ CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR, 0, - CE_HTT_H2T_MSG_SRC_NENTRIES, 256, 0, NULL,}, - /* ipa_uc->target HTC control */ - { /* CE5 */ CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR, 0, - 1024, 512, 0, NULL,}, - /* Target autonomous HIF_memcpy */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR, - 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, -}; - -static struct CE_pipe_config target_ce_config_wlan[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ 0, PIPEDIR_OUT, 32, 256, CE_ATTR_FLAGS, 0,}, - /* target->host HTT + HTC control */ - { /* CE1 */ 1, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host WMI */ - { /* CE2 */ 2, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target WMI */ - { /* CE3 */ 3, PIPEDIR_OUT, 32, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target HTT */ - { /* CE4 */ 4, PIPEDIR_OUT, 256, 256, CE_ATTR_FLAGS, 0,}, - /* NB: 50% of src nentries, since tx has 2 frags */ - /* ipa_uc->target HTC control */ - { /* CE5 */ 5, PIPEDIR_OUT, 1024, 64, CE_ATTR_FLAGS, 0,}, - /* Reserved for target autonomous HIF_memcpy */ - { /* CE6 */ 6, PIPEDIR_INOUT, 32, 4096, CE_ATTR_FLAGS, 0,}, - /* CE7 used only by Host */ - { /* CE7 */ 7, PIPEDIR_INOUT_H2H, 0, 0, 0, 0,}, - /* CE8 used only by IPA */ - { /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,} -}; - -static struct CE_attr host_ce_config_wlan_epping_poll[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 256, 0, NULL,}, - /* target->host EP-ping */ - { /* CE1 */ EPPING_CE_FLAGS_POLL, 0, 0, 2048, 128, NULL,}, - /* target->host EP-ping */ - { /* CE2 */ EPPING_CE_FLAGS_POLL, 0, 0, 2048, 128, NULL,}, - /* host->target EP-ping */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* host->target EP-ping */ - { /* CE4 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* EP-ping heartbeat */ - { /* CE5 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* unused */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ CE_ATTR_FLAGS, 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, -}; -static struct CE_attr host_ce_config_wlan_epping_irq[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ CE_ATTR_FLAGS, 0, 16, 256, 0, NULL,}, - /* target->host EP-ping */ - { /* CE1 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* target->host EP-ping */ - { /* CE2 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* host->target EP-ping */ - { /* CE3 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* host->target EP-ping */ - { /* CE4 */ CE_ATTR_FLAGS, 0, 128, 2048, 0, NULL,}, - /* EP-ping heartbeat */ - { /* CE5 */ CE_ATTR_FLAGS, 0, 0, 2048, 128, NULL,}, - /* unused */ - { /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,}, - /* ce_diag, the Diagnostic Window */ - { /* CE7 */ CE_ATTR_FLAGS, 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,}, -}; -/* - * EP-ping firmware's CE configuration - */ -static struct CE_pipe_config target_ce_config_wlan_epping[] = { - /* host->target HTC control and raw streams */ - { /* CE0 */ 0, PIPEDIR_OUT, 16, 256, CE_ATTR_FLAGS, 0,}, - /* target->host EP-ping */ - { /* CE1 */ 1, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* target->host EP-ping */ - { /* CE2 */ 2, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target EP-ping */ - { /* CE3 */ 3, PIPEDIR_OUT, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* host->target EP-ping */ - { /* CE4 */ 4, PIPEDIR_OUT, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* EP-ping heartbeat */ - { /* CE5 */ 5, PIPEDIR_IN, 128, 2048, CE_ATTR_FLAGS, 0,}, - /* unused */ - { /* CE6 */ 6, PIPEDIR_INOUT, 0, 0, CE_ATTR_FLAGS, 0,}, - /* CE7 used only by Host */ - { /* CE7 */ 7, PIPEDIR_INOUT_H2H, 0, 0, 0, 0,}, - /* CE8 used only by IPA */ - { /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,} -}; -#endif - -static struct CE_attr *host_ce_config = host_ce_config_wlan; -static struct CE_pipe_config *target_ce_config = target_ce_config_wlan; -static int target_ce_config_sz = sizeof(target_ce_config_wlan); -#endif /* __HIF_PCI_INTERNAL_H__ */ diff --git a/core/hif/src/ce/ce_bmi.c b/core/hif/src/ce/ce_bmi.c deleted file mode 100644 index edf1d46d059d..000000000000 --- a/core/hif/src/ce/ce_bmi.c +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include "a_types.h" -#include "athdefs.h" -#include "osapi_linux.h" -#include "targcfg.h" -#include "cdf_lock.h" -#include "cdf_status.h" -#include /* cdf_atomic_read */ -#include -#include -#include "hif_io32.h" -#include -#include "regtable.h" -#define ATH_MODULE_NAME hif -#include -#include "hif_main.h" -#include "ce_api.h" -#include "cdf_trace.h" -#include "cds_api.h" -#ifdef CONFIG_CNSS -#include -#else -#include "cnss_stub.h" -#endif -#include "epping_main.h" -#include "hif_debug.h" - -/* Track a BMI transaction that is in progress */ -#ifndef BIT -#define BIT(n) (1 << (n)) -#endif - -enum { - BMI_REQ_SEND_DONE = BIT(0), /* the bmi tx completion */ - BMI_RESP_RECV_DONE = BIT(1), /* the bmi respond is received */ -}; - -struct BMI_transaction { - struct HIF_CE_state *hif_state; - cdf_semaphore_t bmi_transaction_sem; - uint8_t *bmi_request_host; /* Req BMI msg in Host addr space */ - cdf_dma_addr_t bmi_request_CE; /* Req BMI msg in CE addr space */ - uint32_t bmi_request_length; /* Length of BMI request */ - uint8_t *bmi_response_host; /* Rsp BMI msg in Host addr space */ - cdf_dma_addr_t bmi_response_CE; /* Rsp BMI msg in CE addr space */ - unsigned int bmi_response_length; /* Length of received response */ - unsigned int bmi_timeout_ms; - uint32_t bmi_transaction_flags; /* flags for the transcation */ -}; - -/* - * send/recv completion functions for BMI. - * NB: The "net_buf" parameter is actually just a - * straight buffer, not an sk_buff. - */ -void hif_bmi_send_done(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t data, - unsigned int nbytes, - unsigned int transfer_id, unsigned int sw_index, - unsigned int hw_index, uint32_t toeplitz_hash_result) -{ - struct BMI_transaction *transaction = - (struct BMI_transaction *)transfer_context; - struct ol_softc *scn = transaction->hif_state->scn; - -#ifdef BMI_RSP_POLLING - /* - * Fix EV118783, Release a semaphore after sending - * no matter whether a response is been expecting now. - */ - cdf_semaphore_release(scn->cdf_dev, - &transaction->bmi_transaction_sem); -#else - /* - * If a response is anticipated, we'll complete the - * transaction if the response has been received. - * If no response is anticipated, complete the - * transaction now. - */ - transaction->bmi_transaction_flags |= BMI_REQ_SEND_DONE; - - /* resp is't needed or has already been received, - * never assume resp comes later then this */ - if (!transaction->bmi_response_CE || - (transaction->bmi_transaction_flags & BMI_RESP_RECV_DONE)) { - cdf_semaphore_release(scn->cdf_dev, - &transaction->bmi_transaction_sem); - } -#endif -} - -#ifndef BMI_RSP_POLLING -void hif_bmi_recv_data(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t data, - unsigned int nbytes, - unsigned int transfer_id, unsigned int flags) -{ - struct BMI_transaction *transaction = - (struct BMI_transaction *)transfer_context; - struct ol_softc *scn = transaction->hif_state->scn; - - transaction->bmi_response_length = nbytes; - transaction->bmi_transaction_flags |= BMI_RESP_RECV_DONE; - - /* when both send/recv are done, the sem can be released */ - if (transaction->bmi_transaction_flags & BMI_REQ_SEND_DONE) { - cdf_semaphore_release(scn->cdf_dev, - &transaction->bmi_transaction_sem); - } -} -#endif - -CDF_STATUS hif_exchange_bmi_msg(struct ol_softc *scn, - uint8_t *bmi_request, - uint32_t request_length, - uint8_t *bmi_response, - uint32_t *bmi_response_lengthp, uint32_t TimeoutMS) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - struct HIF_CE_pipe_info *send_pipe_info = - &(hif_state->pipe_info[BMI_CE_NUM_TO_TARG]); - struct CE_handle *ce_send_hdl = send_pipe_info->ce_hdl; - cdf_dma_addr_t CE_request, CE_response = 0; - struct BMI_transaction *transaction = NULL; - int status = CDF_STATUS_SUCCESS; - struct HIF_CE_pipe_info *recv_pipe_info = - &(hif_state->pipe_info[BMI_CE_NUM_TO_HOST]); - struct CE_handle *ce_recv = recv_pipe_info->ce_hdl; - unsigned int mux_id = 0; - unsigned int transaction_id = 0xffff; - unsigned int user_flags = 0; -#ifdef BMI_RSP_POLLING - cdf_dma_addr_t buf; - unsigned int completed_nbytes, id, flags; - int i; -#endif - - transaction = - (struct BMI_transaction *)cdf_mem_malloc(sizeof(*transaction)); - if (unlikely(!transaction)) { - HIF_ERROR("%s: no memory", __func__); - return CDF_STATUS_E_NOMEM; - } - transaction_id = (mux_id & MUX_ID_MASK) | - (transaction_id & TRANSACTION_ID_MASK); -#ifdef QCA_WIFI_3_0 - user_flags &= DESC_DATA_FLAG_MASK; -#endif - A_TARGET_ACCESS_LIKELY(scn); - - /* Initialize bmi_transaction_sem to block */ - cdf_semaphore_init(&transaction->bmi_transaction_sem); - cdf_semaphore_acquire(scn->cdf_dev, &transaction->bmi_transaction_sem); - - transaction->hif_state = hif_state; - transaction->bmi_request_host = bmi_request; - transaction->bmi_request_length = request_length; - transaction->bmi_response_length = 0; - transaction->bmi_timeout_ms = TimeoutMS; - transaction->bmi_transaction_flags = 0; - - /* - * CE_request = dma_map_single(dev, - * (void *)bmi_request, request_length, DMA_TO_DEVICE); - */ - CE_request = scn->bmi_cmd_da; - transaction->bmi_request_CE = CE_request; - - if (bmi_response) { - - /* - * CE_response = dma_map_single(dev, bmi_response, - * BMI_DATASZ_MAX, DMA_FROM_DEVICE); - */ - CE_response = scn->bmi_rsp_da; - transaction->bmi_response_host = bmi_response; - transaction->bmi_response_CE = CE_response; - /* dma_cache_sync(dev, bmi_response, - BMI_DATASZ_MAX, DMA_FROM_DEVICE); */ - cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, - CE_response, - BMI_DATASZ_MAX, - DMA_FROM_DEVICE); - ce_recv_buf_enqueue(ce_recv, transaction, - transaction->bmi_response_CE); - /* NB: see HIF_BMI_recv_done */ - } else { - transaction->bmi_response_host = NULL; - transaction->bmi_response_CE = 0; - } - - /* dma_cache_sync(dev, bmi_request, request_length, DMA_TO_DEVICE); */ - cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, CE_request, - request_length, DMA_TO_DEVICE); - - status = - ce_send(ce_send_hdl, transaction, - CE_request, request_length, - transaction_id, 0, user_flags); - ASSERT(status == CDF_STATUS_SUCCESS); - /* NB: see hif_bmi_send_done */ - - /* TBDXXX: handle timeout */ - - /* Wait for BMI request/response transaction to complete */ - /* Always just wait for BMI request here if - * BMI_RSP_POLLING is defined */ - while (cdf_semaphore_acquire - (scn->cdf_dev, &transaction->bmi_transaction_sem)) { - /*need some break out condition(time out?) */ - } - - if (bmi_response) { -#ifdef BMI_RSP_POLLING - /* Fix EV118783, do not wait a semaphore for the BMI response - * since the relative interruption may be lost. - * poll the BMI response instead. - */ - i = 0; - while (ce_completed_recv_next( - ce_recv, NULL, NULL, &buf, - &completed_nbytes, &id, - &flags) != CDF_STATUS_SUCCESS) { - if (i++ > BMI_RSP_TO_MILLISEC) { - HIF_ERROR("%s:error, can't get bmi response\n", - __func__); - status = CDF_STATUS_E_BUSY; - break; - } - OS_DELAY(1000); - } - - if ((status == CDF_STATUS_SUCCESS) && bmi_response_lengthp) - *bmi_response_lengthp = completed_nbytes; -#else - if ((status == CDF_STATUS_SUCCESS) && bmi_response_lengthp) { - *bmi_response_lengthp = - transaction->bmi_response_length; - } -#endif - - } - - /* dma_unmap_single(dev, transaction->bmi_request_CE, - request_length, DMA_TO_DEVICE); */ - /* bus_unmap_single(scn->sc_osdev, - transaction->bmi_request_CE, - request_length, BUS_DMA_TODEVICE); */ - - if (status != CDF_STATUS_SUCCESS) { - cdf_dma_addr_t unused_buffer; - unsigned int unused_nbytes; - unsigned int unused_id; - unsigned int toeplitz_hash_result; - - ce_cancel_send_next(ce_send_hdl, - NULL, NULL, &unused_buffer, - &unused_nbytes, &unused_id, - &toeplitz_hash_result); - } - - A_TARGET_ACCESS_UNLIKELY(scn); - cdf_mem_free(transaction); - return status; -} diff --git a/core/hif/src/ce/ce_bmi.h b/core/hif/src/ce/ce_bmi.h deleted file mode 100644 index c09b211b6e3e..000000000000 --- a/core/hif/src/ce/ce_bmi.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __CE_BMI_H__ -#define __CE_BMI_H__ - -#include /* cdf_atomic_read */ -#include "cdf_lock.h" -#include "ce_api.h" -#include "cepci.h" - -void hif_bmi_recv_data(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t data, - unsigned int nbytes, - unsigned int transfer_id, unsigned int flags); -void hif_bmi_send_done(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t data, - unsigned int nbytes, - unsigned int transfer_id, unsigned int sw_index, - unsigned int hw_index, uint32_t toeplitz_hash_result); -#endif /* __CE_BMI_H__ */ diff --git a/core/hif/src/ce/ce_diag.c b/core/hif/src/ce/ce_diag.c deleted file mode 100644 index f524702503cc..000000000000 --- a/core/hif/src/ce/ce_diag.c +++ /dev/null @@ -1,456 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include "a_types.h" -#include "athdefs.h" -#include "osapi_linux.h" -#include "targcfg.h" -#include "cdf_lock.h" -#include "cdf_status.h" -#include /* cdf_atomic_read */ -#include -#include -#include "hif_io32.h" -#include -#include -#include "regtable.h" -#include -#include "hif_main.h" -#include "ce_api.h" -#include "cdf_trace.h" -#include "cds_api.h" -#ifdef CONFIG_CNSS -#include -#endif -#include "hif_debug.h" -#include "epping_main.h" -#include "cds_concurrency.h" - -void hif_dump_target_memory(struct ol_softc *scn, void *ramdump_base, - uint32_t address, uint32_t size) -{ - uint32_t loc = address; - uint32_t val = 0; - uint32_t j = 0; - u8 *temp = ramdump_base; - - A_TARGET_ACCESS_BEGIN(scn); - while (j < size) { - val = hif_read32_mb(scn->mem + loc + j); - cdf_mem_copy(temp, &val, 4); - j += 4; - temp += 4; - } - A_TARGET_ACCESS_END(scn); -} -/* - * TBDXXX: Should be a function call specific to each Target-type. - * This convoluted macro converts from Target CPU Virtual Address - * Space to CE Address Space. As part of this process, we - * conservatively fetch the current PCIE_BAR. MOST of the time, - * this should match the upper bits of PCI space for this device; - * but that's not guaranteed. - */ -#ifdef QCA_WIFI_3_0 -#define TARG_CPU_SPACE_TO_CE_SPACE(pci_addr, addr) \ - (scn->mem_pa + addr) -#else -#define TARG_CPU_SPACE_TO_CE_SPACE(pci_addr, addr) \ - (((hif_read32_mb((pci_addr) + \ - (SOC_CORE_BASE_ADDRESS|CORE_CTRL_ADDRESS)) & 0x7ff) << 21) \ - | 0x100000 | ((addr) & 0xfffff)) -#endif -/* Wait up to this many Ms for a Diagnostic Access CE operation to complete */ -#define DIAG_ACCESS_CE_TIMEOUT_MS 10 - -/* - * Diagnostic read/write access is provided for startup/config/debug usage. - * Caller must guarantee proper alignment, when applicable, and single user - * at any moment. - */ - -CDF_STATUS -hif_diag_read_mem(struct ol_softc *scn, uint32_t address, uint8_t *data, - int nbytes) -{ - struct HIF_CE_state *hif_state; - CDF_STATUS status = CDF_STATUS_SUCCESS; - cdf_dma_addr_t buf; - unsigned int completed_nbytes, orig_nbytes, remaining_bytes; - unsigned int id; - unsigned int flags; - struct CE_handle *ce_diag; - cdf_dma_addr_t CE_data; /* Host buffer address in CE space */ - cdf_dma_addr_t CE_data_base = 0; - void *data_buf = NULL; - int i; - unsigned int mux_id = 0; - unsigned int transaction_id = 0xffff; - cdf_dma_addr_t ce_phy_addr = address; - unsigned int toeplitz_hash_result; - unsigned int user_flags = 0; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - transaction_id = (mux_id & MUX_ID_MASK) | - (transaction_id & TRANSACTION_ID_MASK); -#ifdef QCA_WIFI_3_0 - user_flags &= DESC_DATA_FLAG_MASK; -#endif - - /* This code cannot handle reads to non-memory space. Redirect to the - * register read fn but preserve the multi word read capability of - * this fn - */ - if (address < DRAM_BASE_ADDRESS) { - - if ((address & 0x3) || ((uintptr_t) data & 0x3)) - return CDF_STATUS_E_INVAL; - - while ((nbytes >= 4) && - (CDF_STATUS_SUCCESS == (status = - hif_diag_read_access(scn, address, - (uint32_t *)data)))) { - - nbytes -= sizeof(uint32_t); - address += sizeof(uint32_t); - data += sizeof(uint32_t); - - } - - return status; - } - ce_diag = hif_state->ce_diag; - - A_TARGET_ACCESS_LIKELY(scn); - - /* - * Allocate a temporary bounce buffer to hold caller's data - * to be DMA'ed from Target. This guarantees - * 1) 4-byte alignment - * 2) Buffer in DMA-able space - */ - orig_nbytes = nbytes; - data_buf = cdf_os_mem_alloc_consistent(scn->cdf_dev, - orig_nbytes, &CE_data_base, 0); - if (!data_buf) { - status = CDF_STATUS_E_NOMEM; - goto done; - } - cdf_mem_set(data_buf, orig_nbytes, 0); - cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, CE_data_base, - orig_nbytes, DMA_FROM_DEVICE); - - remaining_bytes = orig_nbytes; - CE_data = CE_data_base; - while (remaining_bytes) { - nbytes = min(remaining_bytes, DIAG_TRANSFER_LIMIT); - { - status = ce_recv_buf_enqueue(ce_diag, NULL, CE_data); - if (status != CDF_STATUS_SUCCESS) - goto done; - } - - { /* Request CE to send from Target(!) - * address to Host buffer */ - /* - * The address supplied by the caller is in the - * Target CPU virtual address space. - * - * In order to use this address with the diagnostic CE, - * convert it from - * Target CPU virtual address space - * to - * CE address space - */ - A_TARGET_ACCESS_BEGIN_RET(scn); - ce_phy_addr = - TARG_CPU_SPACE_TO_CE_SPACE(scn->mem, address); - A_TARGET_ACCESS_END_RET(scn); - - status = - ce_send(ce_diag, NULL, ce_phy_addr, nbytes, - transaction_id, 0, user_flags); - if (status != CDF_STATUS_SUCCESS) - goto done; - } - - i = 0; - while (ce_completed_send_next(ce_diag, NULL, NULL, &buf, - &completed_nbytes, &id, NULL, NULL, - &toeplitz_hash_result) != CDF_STATUS_SUCCESS) { - cdf_mdelay(1); - if (i++ > DIAG_ACCESS_CE_TIMEOUT_MS) { - status = CDF_STATUS_E_BUSY; - goto done; - } - } - if (nbytes != completed_nbytes) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - if (buf != ce_phy_addr) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - i = 0; - while (ce_completed_recv_next - (ce_diag, NULL, NULL, &buf, - &completed_nbytes, &id, - &flags) != CDF_STATUS_SUCCESS) { - cdf_mdelay(1); - if (i++ > DIAG_ACCESS_CE_TIMEOUT_MS) { - status = CDF_STATUS_E_BUSY; - goto done; - } - } - if (nbytes != completed_nbytes) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - if (buf != CE_data) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - remaining_bytes -= nbytes; - address += nbytes; - CE_data += nbytes; - } - -done: - A_TARGET_ACCESS_UNLIKELY(scn); - - if (status == CDF_STATUS_SUCCESS) - cdf_mem_copy(data, data_buf, orig_nbytes); - else - HIF_ERROR("%s failure (0x%x)", __func__, address); - - if (data_buf) - cdf_os_mem_free_consistent(scn->cdf_dev, orig_nbytes, - data_buf, CE_data_base, 0); - - return status; -} - -/* Read 4-byte aligned data from Target memory or register */ -CDF_STATUS hif_diag_read_access(struct ol_softc *scn, - uint32_t address, uint32_t *data) -{ - struct HIF_CE_state *hif_state; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - if (address >= DRAM_BASE_ADDRESS) { - /* Assume range doesn't cross this boundary */ - return hif_diag_read_mem(scn, address, (uint8_t *) data, - sizeof(uint32_t)); - } else { - A_TARGET_ACCESS_BEGIN_RET(scn); - *data = A_TARGET_READ(scn, address); - A_TARGET_ACCESS_END_RET(scn); - - return CDF_STATUS_SUCCESS; - } -} - -CDF_STATUS hif_diag_write_mem(struct ol_softc *scn, - uint32_t address, uint8_t *data, int nbytes) -{ - struct HIF_CE_state *hif_state; - CDF_STATUS status = CDF_STATUS_SUCCESS; - cdf_dma_addr_t buf; - unsigned int completed_nbytes, orig_nbytes, remaining_bytes; - unsigned int id; - unsigned int flags; - struct CE_handle *ce_diag; - void *data_buf = NULL; - cdf_dma_addr_t CE_data; /* Host buffer address in CE space */ - cdf_dma_addr_t CE_data_base = 0; - int i; - unsigned int mux_id = 0; - unsigned int transaction_id = 0xffff; - cdf_dma_addr_t ce_phy_addr = address; - unsigned int toeplitz_hash_result; - unsigned int user_flags = 0; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - ce_diag = hif_state->ce_diag; - transaction_id = (mux_id & MUX_ID_MASK) | - (transaction_id & TRANSACTION_ID_MASK); -#ifdef QCA_WIFI_3_0 - user_flags &= DESC_DATA_FLAG_MASK; -#endif - - A_TARGET_ACCESS_LIKELY(scn); - - /* - * Allocate a temporary bounce buffer to hold caller's data - * to be DMA'ed to Target. This guarantees - * 1) 4-byte alignment - * 2) Buffer in DMA-able space - */ - orig_nbytes = nbytes; - data_buf = cdf_os_mem_alloc_consistent(scn->cdf_dev, - orig_nbytes, &CE_data_base, 0); - if (!data_buf) { - status = A_NO_MEMORY; - goto done; - } - - /* Copy caller's data to allocated DMA buf */ - cdf_mem_copy(data_buf, data, orig_nbytes); - cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, CE_data_base, - orig_nbytes, DMA_TO_DEVICE); - - /* - * The address supplied by the caller is in the - * Target CPU virtual address space. - * - * In order to use this address with the diagnostic CE, - * convert it from - * Target CPU virtual address space - * to - * CE address space - */ - A_TARGET_ACCESS_BEGIN_RET(scn); - ce_phy_addr = TARG_CPU_SPACE_TO_CE_SPACE(scn->mem, address); - A_TARGET_ACCESS_END_RET(scn); - - remaining_bytes = orig_nbytes; - CE_data = CE_data_base; - while (remaining_bytes) { - nbytes = min(remaining_bytes, DIAG_TRANSFER_LIMIT); - - { /* Set up to receive directly into Target(!) address */ - status = ce_recv_buf_enqueue(ce_diag, - NULL, ce_phy_addr); - if (status != CDF_STATUS_SUCCESS) - goto done; - } - - { - /* - * Request CE to send caller-supplied data that - * was copied to bounce buffer to Target(!) address. - */ - status = - ce_send(ce_diag, NULL, - (cdf_dma_addr_t) CE_data, nbytes, - transaction_id, 0, user_flags); - if (status != CDF_STATUS_SUCCESS) - goto done; - } - - i = 0; - while (ce_completed_send_next(ce_diag, NULL, NULL, &buf, - &completed_nbytes, &id, - NULL, NULL, &toeplitz_hash_result) != - CDF_STATUS_SUCCESS) { - cdf_mdelay(1); - if (i++ > DIAG_ACCESS_CE_TIMEOUT_MS) { - status = CDF_STATUS_E_BUSY; - goto done; - } - } - - if (nbytes != completed_nbytes) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - if (buf != CE_data) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - i = 0; - while (ce_completed_recv_next - (ce_diag, NULL, NULL, &buf, - &completed_nbytes, &id, - &flags) != CDF_STATUS_SUCCESS) { - cdf_mdelay(1); - if (i++ > DIAG_ACCESS_CE_TIMEOUT_MS) { - status = CDF_STATUS_E_BUSY; - goto done; - } - } - - if (nbytes != completed_nbytes) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - if (buf != ce_phy_addr) { - status = CDF_STATUS_E_FAILURE; - goto done; - } - - remaining_bytes -= nbytes; - address += nbytes; - CE_data += nbytes; - } - -done: - A_TARGET_ACCESS_UNLIKELY(scn); - - if (data_buf) { - cdf_os_mem_free_consistent(scn->cdf_dev, orig_nbytes, - data_buf, CE_data_base, 0); - } - - if (status != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s failure (0x%llu)", __func__, - (uint64_t)ce_phy_addr); - } - - return status; -} - -/* Write 4B data to Target memory or register */ -CDF_STATUS -hif_diag_write_access(struct ol_softc *scn, uint32_t address, uint32_t data) -{ - struct HIF_CE_state *hif_state; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - if (address >= DRAM_BASE_ADDRESS) { - /* Assume range doesn't cross this boundary */ - uint32_t data_buf = data; - - return hif_diag_write_mem(scn, address, - (uint8_t *) &data_buf, - sizeof(uint32_t)); - } else { - A_TARGET_ACCESS_BEGIN_RET(scn); - A_TARGET_WRITE(scn, address, data); - A_TARGET_ACCESS_END_RET(scn); - - return CDF_STATUS_SUCCESS; - } -} diff --git a/core/hif/src/ce/ce_internal.h b/core/hif/src/ce/ce_internal.h deleted file mode 100644 index b4272c56a41a..000000000000 --- a/core/hif/src/ce/ce_internal.h +++ /dev/null @@ -1,365 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ -#ifndef __COPY_ENGINE_INTERNAL_H__ -#define __COPY_ENGINE_INTERNAL_H__ - -#include /* A_TARGET_WRITE */ - -/* Copy Engine operational state */ -enum CE_op_state { - CE_UNUSED, - CE_PAUSED, - CE_RUNNING, -}; - -enum ol_ath_hif_ce_ecodes { - CE_RING_DELTA_FAIL = 0 -}; - -struct CE_src_desc; - -/* Copy Engine Ring internal state */ -struct CE_ring_state { - - /* Number of entries in this ring; must be power of 2 */ - unsigned int nentries; - unsigned int nentries_mask; - - /* - * For dest ring, this is the next index to be processed - * by software after it was/is received into. - * - * For src ring, this is the last descriptor that was sent - * and completion processed by software. - * - * Regardless of src or dest ring, this is an invariant - * (modulo ring size): - * write index >= read index >= sw_index - */ - unsigned int sw_index; - unsigned int write_index; /* cached copy */ - /* - * For src ring, this is the next index not yet processed by HW. - * This is a cached copy of the real HW index (read index), used - * for avoiding reading the HW index register more often than - * necessary. - * This extends the invariant: - * write index >= read index >= hw_index >= sw_index - * - * For dest ring, this is currently unused. - */ - unsigned int hw_index; /* cached copy */ - - /* Start of DMA-coherent area reserved for descriptors */ - void *base_addr_owner_space_unaligned; /* Host address space */ - cdf_dma_addr_t base_addr_CE_space_unaligned; /* CE address space */ - - /* - * Actual start of descriptors. - * Aligned to descriptor-size boundary. - * Points into reserved DMA-coherent area, above. - */ - void *base_addr_owner_space; /* Host address space */ - cdf_dma_addr_t base_addr_CE_space; /* CE address space */ - /* - * Start of shadow copy of descriptors, within regular memory. - * Aligned to descriptor-size boundary. - */ - char *shadow_base_unaligned; - struct CE_src_desc *shadow_base; - - unsigned int low_water_mark_nentries; - unsigned int high_water_mark_nentries; - void **per_transfer_context; - OS_DMA_MEM_CONTEXT(ce_dmacontext) /* OS Specific DMA context */ -}; - -/* Copy Engine internal state */ -struct CE_state { - struct ol_softc *scn; - unsigned int id; - unsigned int attr_flags; /* CE_ATTR_* */ - uint32_t ctrl_addr; /* relative to BAR */ - enum CE_op_state state; - -#ifdef WLAN_FEATURE_FASTPATH - u_int32_t download_len; /* pkt download length for source ring */ -#endif /* WLAN_FEATURE_FASTPATH */ - - ce_send_cb send_cb; - void *send_context; - - CE_recv_cb recv_cb; - void *recv_context; - - /* misc_cbs - are any callbacks besides send and recv enabled? */ - uint8_t misc_cbs; - - CE_watermark_cb watermark_cb; - void *wm_context; - - /*Record the state of the copy compl interrupt */ - int disable_copy_compl_intr; - - unsigned int src_sz_max; - struct CE_ring_state *src_ring; - struct CE_ring_state *dest_ring; - atomic_t rx_pending; - - cdf_spinlock_t ce_index_lock; - bool force_break; /* Flag to indicate whether to - * break out the DPC context */ - - unsigned int receive_count; /* count Num Of Receive Buffers - * handled for one interrupt - * DPC routine */ - /* epping */ - bool timer_inited; - cdf_softirq_timer_t poll_timer; - void (*lro_flush_cb)(void *); - void *lro_data; -}; - -/* Descriptor rings must be aligned to this boundary */ -#define CE_DESC_RING_ALIGN 8 - -#ifdef QCA_WIFI_3_0 -#define HIF_CE_DESC_ADDR_TO_DMA(desc) \ - (cdf_dma_addr_t)(((uint64_t)(desc)->buffer_addr + \ - ((uint64_t)((desc)->buffer_addr_hi & 0x1F) << 32))) -#else -#define HIF_CE_DESC_ADDR_TO_DMA(desc) \ - (cdf_dma_addr_t)((desc)->buffer_addr) -#endif - -#ifdef QCA_WIFI_3_0 -struct CE_src_desc { - uint32_t buffer_addr:32; -#if _BYTE_ORDER == _BIG_ENDIAN - uint32_t gather:1, - enable_11h:1, - meta_data_low:2, /* fw_metadata_low */ - packet_result_offset:12, - toeplitz_hash_enable:1, - addr_y_search_disable:1, - addr_x_search_disable:1, - misc_int_disable:1, - target_int_disable:1, - host_int_disable:1, - dest_byte_swap:1, - byte_swap:1, - type:2, - tx_classify:1, - buffer_addr_hi:5; - uint32_t meta_data:16, /* fw_metadata_high */ - nbytes:16; /* length in register map */ -#else - uint32_t buffer_addr_hi:5, - tx_classify:1, - type:2, - byte_swap:1, /* src_byte_swap */ - dest_byte_swap:1, - host_int_disable:1, - target_int_disable:1, - misc_int_disable:1, - addr_x_search_disable:1, - addr_y_search_disable:1, - toeplitz_hash_enable:1, - packet_result_offset:12, - meta_data_low:2, /* fw_metadata_low */ - enable_11h:1, - gather:1; - uint32_t nbytes:16, /* length in register map */ - meta_data:16; /* fw_metadata_high */ -#endif - uint32_t toeplitz_hash_result:32; -}; - -struct CE_dest_desc { - uint32_t buffer_addr:32; -#if _BYTE_ORDER == _BIG_ENDIAN - uint32_t gather:1, - enable_11h:1, - meta_data_low:2, /* fw_metadata_low */ - packet_result_offset:12, - toeplitz_hash_enable:1, - addr_y_search_disable:1, - addr_x_search_disable:1, - misc_int_disable:1, - target_int_disable:1, - host_int_disable:1, - byte_swap:1, - src_byte_swap:1, - type:2, - tx_classify:1, - buffer_addr_hi:5; - uint32_t meta_data:16, /* fw_metadata_high */ - nbytes:16; /* length in register map */ -#else - uint32_t buffer_addr_hi:5, - tx_classify:1, - type:2, - src_byte_swap:1, - byte_swap:1, /* dest_byte_swap */ - host_int_disable:1, - target_int_disable:1, - misc_int_disable:1, - addr_x_search_disable:1, - addr_y_search_disable:1, - toeplitz_hash_enable:1, - packet_result_offset:12, - meta_data_low:2, /* fw_metadata_low */ - enable_11h:1, - gather:1; - uint32_t nbytes:16, /* length in register map */ - meta_data:16; /* fw_metadata_high */ -#endif - uint32_t toeplitz_hash_result:32; -}; -#else -struct CE_src_desc { - uint32_t buffer_addr; -#if _BYTE_ORDER == _BIG_ENDIAN - uint32_t meta_data:14, - byte_swap:1, - gather:1, - nbytes:16; -#else - - uint32_t nbytes:16, - gather:1, - byte_swap:1, - meta_data:14; -#endif -}; - -struct CE_dest_desc { - uint32_t buffer_addr; -#if _BYTE_ORDER == _BIG_ENDIAN - uint32_t meta_data:14, - byte_swap:1, - gather:1, - nbytes:16; -#else - uint32_t nbytes:16, - gather:1, - byte_swap:1, - meta_data:14; -#endif -}; -#endif /* QCA_WIFI_3_0 */ - -#define CE_SENDLIST_ITEMS_MAX 12 - -/** - * union ce_desc - unified data type for ce descriptors - * - * Both src and destination descriptors follow the same format. - * They use different data structures for different access symantics. - * Here we provice a unifying data type. - */ -union ce_desc { - struct CE_src_desc src_desc; - struct CE_dest_desc dest_desc; -}; - -/** - * enum hif_ce_event_type - HIF copy engine event type - * @HIF_RX_DESC_POST: event recorded before updating write index of RX ring. - * @HIF_RX_DESC_COMPLETION: event recorded before updating sw index of RX ring. - * @HIF_TX_GATHER_DESC_POST: post gather desc. (no write index update) - * @HIF_TX_DESC_POST: event recorded before updating write index of TX ring. - * @HIF_TX_DESC_COMPLETION: event recorded before updating sw index of TX ring. - * @HIF_IRQ_EVENT: event recorded in the irq before scheduling the bh - * @HIF_CE_TASKLET_ENTRY: records the start of the ce_tasklet - * @HIF_CE_TASKLET_RESCHEDULE: records the rescheduling of the wlan_tasklet - * @HIF_CE_TASKLET_EXIT: records the exit of the wlan tasklet without reschedule - * @HIF_CE_REAP_ENTRY: records when we process completion outside of a bh - * @HIF_CE_REAP_EXIT: records when we process completion outside of a bh - */ -enum hif_ce_event_type { - HIF_RX_DESC_POST, - HIF_RX_DESC_COMPLETION, - HIF_TX_GATHER_DESC_POST, - HIF_TX_DESC_POST, - HIF_TX_DESC_COMPLETION, - HIF_IRQ_EVENT, - HIF_CE_TASKLET_ENTRY, - HIF_CE_TASKLET_RESCHEDULE, - HIF_CE_TASKLET_EXIT, - HIF_CE_REAP_ENTRY, - HIF_CE_REAP_EXIT, -}; - -void ce_init_ce_desc_event_log(int ce_id, int size); -void hif_record_ce_desc_event(int ce_id, enum hif_ce_event_type type, - union ce_desc *descriptor, void *memory, int index); - -enum ce_sendlist_type_e { - CE_SIMPLE_BUFFER_TYPE, - /* TBDXXX: CE_RX_DESC_LIST, */ -}; - -/* - * There's a public "ce_sendlist" and a private "ce_sendlist_s". - * The former is an opaque structure with sufficient space - * to hold the latter. The latter is the actual structure - * definition and it is only used internally. The opaque version - * of the structure allows callers to allocate an instance on the - * run-time stack without knowing any of the details of the - * structure layout. - */ -struct ce_sendlist_s { - unsigned int num_items; - struct ce_sendlist_item { - enum ce_sendlist_type_e send_type; - dma_addr_t data; /* e.g. buffer or desc list */ - union { - unsigned int nbytes; /* simple buffer */ - unsigned int ndesc; /* Rx descriptor list */ - } u; - /* flags: externally-specified flags; - * OR-ed with internal flags */ - uint32_t flags; - uint32_t user_flags; - } item[CE_SENDLIST_ITEMS_MAX]; -}; - -#ifdef WLAN_FEATURE_FASTPATH -void ce_h2t_tx_ce_cleanup(struct CE_handle *ce_hdl); -#endif - -/* which ring of a CE? */ -#define CE_RING_SRC 0 -#define CE_RING_DEST 1 - -#define CDC_WAR_MAGIC_STR 0xceef0000 -#define CDC_WAR_DATA_CE 4 - -/* Additional internal-only ce_send flags */ -#define CE_SEND_FLAG_GATHER 0x00010000 /* Use Gather */ -#endif /* __COPY_ENGINE_INTERNAL_H__ */ diff --git a/core/hif/src/ce/ce_main.c b/core/hif/src/ce/ce_main.c deleted file mode 100644 index 6f74a72f023b..000000000000 --- a/core/hif/src/ce/ce_main.c +++ /dev/null @@ -1,2462 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ -#include -#include "a_types.h" -#include "athdefs.h" -#include "osapi_linux.h" -#include "targcfg.h" -#include "cdf_lock.h" -#include "cdf_status.h" -#include /* cdf_atomic_read */ -#include -#include -#include "hif_io32.h" -#include -#include "regtable.h" -#define ATH_MODULE_NAME hif -#include -#include "hif_main.h" -#ifdef HIF_PCI -#include "ce_bmi.h" -#endif -#include "ce_api.h" -#include "cdf_trace.h" -#include "cds_api.h" -#ifdef CONFIG_CNSS -#include -#endif -#include "epping_main.h" -#include "hif_debug.h" -#include "ce_internal.h" -#include "ce_reg.h" -#include "ce_assignment.h" -#include "ce_tasklet.h" -#ifdef HIF_PCI -#include "icnss_stub.h" -#else -#include -#endif -#include "qwlan_version.h" -#include "cds_concurrency.h" - -#define CE_POLL_TIMEOUT 10 /* ms */ - -/* Forward references */ -static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info); - -/* - * Fix EV118783, poll to check whether a BMI response comes - * other than waiting for the interruption which may be lost. - */ -/* #define BMI_RSP_POLLING */ -#define BMI_RSP_TO_MILLISEC 1000 - - -static int hif_post_recv_buffers(struct ol_softc *scn); -static void hif_config_rri_on_ddr(struct ol_softc *scn); - -static void ce_poll_timeout(void *arg) -{ - struct CE_state *CE_state = (struct CE_state *)arg; - if (CE_state->timer_inited) { - ce_per_engine_service(CE_state->scn, CE_state->id); - cdf_softirq_timer_mod(&CE_state->poll_timer, CE_POLL_TIMEOUT); - } -} - -static unsigned int roundup_pwr2(unsigned int n) -{ - int i; - unsigned int test_pwr2; - - if (!(n & (n - 1))) - return n; /* already a power of 2 */ - - test_pwr2 = 4; - for (i = 0; i < 29; i++) { - if (test_pwr2 > n) - return test_pwr2; - test_pwr2 = test_pwr2 << 1; - } - - CDF_ASSERT(0); /* n too large */ - return 0; -} - -/* - * Initialize a Copy Engine based on caller-supplied attributes. - * This may be called once to initialize both source and destination - * rings or it may be called twice for separate source and destination - * initialization. It may be that only one side or the other is - * initialized by software/firmware. - * - * This should be called durring the initialization sequence before - * interupts are enabled, so we don't have to worry about thread safety. - */ -struct CE_handle *ce_init(struct ol_softc *scn, - unsigned int CE_id, struct CE_attr *attr) -{ - struct CE_state *CE_state; - uint32_t ctrl_addr; - unsigned int nentries; - cdf_dma_addr_t base_addr; - bool malloc_CE_state = false; - bool malloc_src_ring = false; - - CDF_ASSERT(CE_id < scn->ce_count); - ctrl_addr = CE_BASE_ADDRESS(CE_id); - CE_state = scn->ce_id_to_state[CE_id]; - - if (!CE_state) { - CE_state = - (struct CE_state *)cdf_mem_malloc(sizeof(*CE_state)); - if (!CE_state) { - HIF_ERROR("%s: CE_state has no mem", __func__); - return NULL; - } - malloc_CE_state = true; - cdf_mem_zero(CE_state, sizeof(*CE_state)); - scn->ce_id_to_state[CE_id] = CE_state; - cdf_spinlock_init(&CE_state->ce_index_lock); - - CE_state->id = CE_id; - CE_state->ctrl_addr = ctrl_addr; - CE_state->state = CE_RUNNING; - CE_state->attr_flags = attr->flags; - } - CE_state->scn = scn; - - cdf_atomic_init(&CE_state->rx_pending); - if (attr == NULL) { - /* Already initialized; caller wants the handle */ - return (struct CE_handle *)CE_state; - } - -#ifdef ADRASTEA_SHADOW_REGISTERS - HIF_ERROR("%s: Using Shadow Registers instead of CE Registers\n", - __func__); -#endif - - if (CE_state->src_sz_max) - CDF_ASSERT(CE_state->src_sz_max == attr->src_sz_max); - else - CE_state->src_sz_max = attr->src_sz_max; - - ce_init_ce_desc_event_log(CE_id, - attr->src_nentries + attr->dest_nentries); - - /* source ring setup */ - nentries = attr->src_nentries; - if (nentries) { - struct CE_ring_state *src_ring; - unsigned CE_nbytes; - char *ptr; - uint64_t dma_addr; - nentries = roundup_pwr2(nentries); - if (CE_state->src_ring) { - CDF_ASSERT(CE_state->src_ring->nentries == nentries); - } else { - CE_nbytes = sizeof(struct CE_ring_state) - + (nentries * sizeof(void *)); - ptr = cdf_mem_malloc(CE_nbytes); - if (!ptr) { - /* cannot allocate src ring. If the - * CE_state is allocated locally free - * CE_State and return error. - */ - HIF_ERROR("%s: src ring has no mem", __func__); - if (malloc_CE_state) { - /* allocated CE_state locally */ - scn->ce_id_to_state[CE_id] = NULL; - cdf_mem_free(CE_state); - malloc_CE_state = false; - } - return NULL; - } else { - /* we can allocate src ring. - * Mark that the src ring is - * allocated locally - */ - malloc_src_ring = true; - } - cdf_mem_zero(ptr, CE_nbytes); - - src_ring = CE_state->src_ring = - (struct CE_ring_state *)ptr; - ptr += sizeof(struct CE_ring_state); - src_ring->nentries = nentries; - src_ring->nentries_mask = nentries - 1; - A_TARGET_ACCESS_BEGIN_RET_PTR(scn); - src_ring->hw_index = - CE_SRC_RING_READ_IDX_GET(scn, ctrl_addr); - src_ring->sw_index = src_ring->hw_index; - src_ring->write_index = - CE_SRC_RING_WRITE_IDX_GET(scn, ctrl_addr); - A_TARGET_ACCESS_END_RET_PTR(scn); - src_ring->low_water_mark_nentries = 0; - src_ring->high_water_mark_nentries = nentries; - src_ring->per_transfer_context = (void **)ptr; - - /* Legacy platforms that do not support cache - * coherent DMA are unsupported - */ - src_ring->base_addr_owner_space_unaligned = - cdf_os_mem_alloc_consistent(scn->cdf_dev, - (nentries * - sizeof(struct CE_src_desc) + - CE_DESC_RING_ALIGN), - &base_addr, 0); - if (src_ring->base_addr_owner_space_unaligned - == NULL) { - HIF_ERROR("%s: src ring has no DMA mem", - __func__); - goto error_no_dma_mem; - } - src_ring->base_addr_CE_space_unaligned = base_addr; - - if (src_ring-> - base_addr_CE_space_unaligned & (CE_DESC_RING_ALIGN - - 1)) { - src_ring->base_addr_CE_space = - (src_ring->base_addr_CE_space_unaligned - + CE_DESC_RING_ALIGN - - 1) & ~(CE_DESC_RING_ALIGN - 1); - - src_ring->base_addr_owner_space = - (void - *)(((size_t) src_ring-> - base_addr_owner_space_unaligned + - CE_DESC_RING_ALIGN - - 1) & ~(CE_DESC_RING_ALIGN - 1)); - } else { - src_ring->base_addr_CE_space = - src_ring->base_addr_CE_space_unaligned; - src_ring->base_addr_owner_space = - src_ring-> - base_addr_owner_space_unaligned; - } - /* - * Also allocate a shadow src ring in - * regular mem to use for faster access. - */ - src_ring->shadow_base_unaligned = - cdf_mem_malloc(nentries * - sizeof(struct CE_src_desc) + - CE_DESC_RING_ALIGN); - if (src_ring->shadow_base_unaligned == NULL) { - HIF_ERROR("%s: src ring no shadow_base mem", - __func__); - goto error_no_dma_mem; - } - src_ring->shadow_base = (struct CE_src_desc *) - (((size_t) src_ring->shadow_base_unaligned + - CE_DESC_RING_ALIGN - 1) & - ~(CE_DESC_RING_ALIGN - 1)); - - A_TARGET_ACCESS_BEGIN_RET_PTR(scn); - dma_addr = src_ring->base_addr_CE_space; - CE_SRC_RING_BASE_ADDR_SET(scn, ctrl_addr, - (uint32_t)(dma_addr & 0xFFFFFFFF)); -#ifdef WLAN_ENABLE_QCA6180 - { - uint32_t tmp; - tmp = CE_SRC_RING_BASE_ADDR_HIGH_GET( - scn, ctrl_addr); - tmp &= ~0x1F; - dma_addr = ((dma_addr >> 32) & 0x1F)|tmp; - CE_SRC_RING_BASE_ADDR_HIGH_SET(scn, - ctrl_addr, (uint32_t)dma_addr); - } -#endif - CE_SRC_RING_SZ_SET(scn, ctrl_addr, nentries); - CE_SRC_RING_DMAX_SET(scn, ctrl_addr, attr->src_sz_max); -#ifdef BIG_ENDIAN_HOST - /* Enable source ring byte swap for big endian host */ - CE_SRC_RING_BYTE_SWAP_SET(scn, ctrl_addr, 1); -#endif - CE_SRC_RING_LOWMARK_SET(scn, ctrl_addr, 0); - CE_SRC_RING_HIGHMARK_SET(scn, ctrl_addr, nentries); - A_TARGET_ACCESS_END_RET_PTR(scn); - } - } - - /* destination ring setup */ - nentries = attr->dest_nentries; - if (nentries) { - struct CE_ring_state *dest_ring; - unsigned CE_nbytes; - char *ptr; - uint64_t dma_addr; - - nentries = roundup_pwr2(nentries); - if (CE_state->dest_ring) { - CDF_ASSERT(CE_state->dest_ring->nentries == nentries); - } else { - CE_nbytes = sizeof(struct CE_ring_state) - + (nentries * sizeof(void *)); - ptr = cdf_mem_malloc(CE_nbytes); - if (!ptr) { - /* cannot allocate dst ring. If the CE_state - * or src ring is allocated locally free - * CE_State and src ring and return error. - */ - HIF_ERROR("%s: dest ring has no mem", - __func__); - if (malloc_src_ring) { - cdf_mem_free(CE_state->src_ring); - CE_state->src_ring = NULL; - malloc_src_ring = false; - } - if (malloc_CE_state) { - /* allocated CE_state locally */ - scn->ce_id_to_state[CE_id] = NULL; - cdf_mem_free(CE_state); - malloc_CE_state = false; - } - return NULL; - } - cdf_mem_zero(ptr, CE_nbytes); - - dest_ring = CE_state->dest_ring = - (struct CE_ring_state *)ptr; - ptr += sizeof(struct CE_ring_state); - dest_ring->nentries = nentries; - dest_ring->nentries_mask = nentries - 1; - A_TARGET_ACCESS_BEGIN_RET_PTR(scn); - dest_ring->sw_index = - CE_DEST_RING_READ_IDX_GET(scn, ctrl_addr); - dest_ring->write_index = - CE_DEST_RING_WRITE_IDX_GET(scn, ctrl_addr); - A_TARGET_ACCESS_END_RET_PTR(scn); - dest_ring->low_water_mark_nentries = 0; - dest_ring->high_water_mark_nentries = nentries; - dest_ring->per_transfer_context = (void **)ptr; - - /* Legacy platforms that do not support cache - * coherent DMA are unsupported */ - dest_ring->base_addr_owner_space_unaligned = - cdf_os_mem_alloc_consistent(scn->cdf_dev, - (nentries * - sizeof(struct CE_dest_desc) + - CE_DESC_RING_ALIGN), - &base_addr, 0); - if (dest_ring->base_addr_owner_space_unaligned - == NULL) { - HIF_ERROR("%s: dest ring has no DMA mem", - __func__); - goto error_no_dma_mem; - } - dest_ring->base_addr_CE_space_unaligned = base_addr; - - /* Correctly initialize memory to 0 to - * prevent garbage data crashing system - * when download firmware - */ - cdf_mem_zero(dest_ring->base_addr_owner_space_unaligned, - nentries * sizeof(struct CE_dest_desc) + - CE_DESC_RING_ALIGN); - - if (dest_ring-> - base_addr_CE_space_unaligned & (CE_DESC_RING_ALIGN - - 1)) { - - dest_ring->base_addr_CE_space = - (dest_ring-> - base_addr_CE_space_unaligned + - CE_DESC_RING_ALIGN - - 1) & ~(CE_DESC_RING_ALIGN - 1); - - dest_ring->base_addr_owner_space = - (void - *)(((size_t) dest_ring-> - base_addr_owner_space_unaligned + - CE_DESC_RING_ALIGN - - 1) & ~(CE_DESC_RING_ALIGN - 1)); - } else { - dest_ring->base_addr_CE_space = - dest_ring->base_addr_CE_space_unaligned; - dest_ring->base_addr_owner_space = - dest_ring-> - base_addr_owner_space_unaligned; - } - - A_TARGET_ACCESS_BEGIN_RET_PTR(scn); - dma_addr = dest_ring->base_addr_CE_space; - CE_DEST_RING_BASE_ADDR_SET(scn, ctrl_addr, - (uint32_t)(dma_addr & 0xFFFFFFFF)); -#ifdef WLAN_ENABLE_QCA6180 - { - uint32_t tmp; - tmp = CE_DEST_RING_BASE_ADDR_HIGH_GET(scn, - ctrl_addr); - tmp &= ~0x1F; - dma_addr = ((dma_addr >> 32) & 0x1F)|tmp; - CE_DEST_RING_BASE_ADDR_HIGH_SET(scn, - ctrl_addr, (uint32_t)dma_addr); - } -#endif - CE_DEST_RING_SZ_SET(scn, ctrl_addr, nentries); -#ifdef BIG_ENDIAN_HOST - /* Enable Dest ring byte swap for big endian host */ - CE_DEST_RING_BYTE_SWAP_SET(scn, ctrl_addr, 1); -#endif - CE_DEST_RING_LOWMARK_SET(scn, ctrl_addr, 0); - CE_DEST_RING_HIGHMARK_SET(scn, ctrl_addr, nentries); - A_TARGET_ACCESS_END_RET_PTR(scn); - - /* epping */ - /* poll timer */ - if ((CE_state->attr_flags & CE_ATTR_ENABLE_POLL)) { - cdf_softirq_timer_init(scn->cdf_dev, - &CE_state->poll_timer, - ce_poll_timeout, - CE_state, - CDF_TIMER_TYPE_SW); - CE_state->timer_inited = true; - cdf_softirq_timer_mod(&CE_state->poll_timer, - CE_POLL_TIMEOUT); - } - } - } - - /* Enable CE error interrupts */ - A_TARGET_ACCESS_BEGIN_RET_PTR(scn); - CE_ERROR_INTR_ENABLE(scn, ctrl_addr); - A_TARGET_ACCESS_END_RET_PTR(scn); - - return (struct CE_handle *)CE_state; - -error_no_dma_mem: - ce_fini((struct CE_handle *)CE_state); - return NULL; -} - -#ifdef WLAN_FEATURE_FASTPATH -/** - * ce_h2t_tx_ce_cleanup() Place holder function for H2T CE cleanup. - * No processing is required inside this function. - * @ce_hdl: Cope engine handle - * Using an assert, this function makes sure that, - * the TX CE has been processed completely. - * - * This is called while dismantling CE structures. No other thread - * should be using these structures while dismantling is occuring - * therfore no locking is needed. - * - * Return: none - */ -void -ce_h2t_tx_ce_cleanup(struct CE_handle *ce_hdl) -{ - struct CE_state *ce_state = (struct CE_state *)ce_hdl; - struct CE_ring_state *src_ring = ce_state->src_ring; - struct ol_softc *sc = ce_state->scn; - uint32_t sw_index, write_index; - - if (sc->fastpath_mode_on && (ce_state->id == CE_HTT_H2T_MSG)) { - HIF_INFO("%s %d Fastpath mode ON, Cleaning up HTT Tx CE\n", - __func__, __LINE__); - sw_index = src_ring->sw_index; - write_index = src_ring->sw_index; - - /* At this point Tx CE should be clean */ - cdf_assert_always(sw_index == write_index); - } -} -#else -void ce_h2t_tx_ce_cleanup(struct CE_handle *ce_hdl) -{ -} -#endif /* WLAN_FEATURE_FASTPATH */ - -void ce_fini(struct CE_handle *copyeng) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - unsigned int CE_id = CE_state->id; - struct ol_softc *scn = CE_state->scn; - - CE_state->state = CE_UNUSED; - scn->ce_id_to_state[CE_id] = NULL; - if (CE_state->src_ring) { - /* Cleanup the HTT Tx ring */ - ce_h2t_tx_ce_cleanup(copyeng); - - if (CE_state->src_ring->shadow_base_unaligned) - cdf_mem_free(CE_state->src_ring->shadow_base_unaligned); - if (CE_state->src_ring->base_addr_owner_space_unaligned) - cdf_os_mem_free_consistent(scn->cdf_dev, - (CE_state->src_ring->nentries * - sizeof(struct CE_src_desc) + - CE_DESC_RING_ALIGN), - CE_state->src_ring-> - base_addr_owner_space_unaligned, - CE_state->src_ring-> - base_addr_CE_space, 0); - cdf_mem_free(CE_state->src_ring); - } - if (CE_state->dest_ring) { - if (CE_state->dest_ring->base_addr_owner_space_unaligned) - cdf_os_mem_free_consistent(scn->cdf_dev, - (CE_state->dest_ring->nentries * - sizeof(struct CE_dest_desc) + - CE_DESC_RING_ALIGN), - CE_state->dest_ring-> - base_addr_owner_space_unaligned, - CE_state->dest_ring-> - base_addr_CE_space, 0); - cdf_mem_free(CE_state->dest_ring); - - /* epping */ - if (CE_state->timer_inited) { - CE_state->timer_inited = false; - cdf_softirq_timer_free(&CE_state->poll_timer); - } - } - cdf_mem_free(CE_state); -} - -void hif_detach_htc(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - cdf_mem_zero(&hif_state->msg_callbacks_pending, - sizeof(hif_state->msg_callbacks_pending)); - cdf_mem_zero(&hif_state->msg_callbacks_current, - sizeof(hif_state->msg_callbacks_current)); -} - -/* Send the first nbytes bytes of the buffer */ -CDF_STATUS -hif_send_head(struct ol_softc *scn, - uint8_t pipe, unsigned int transfer_id, unsigned int nbytes, - cdf_nbuf_t nbuf, unsigned int data_attr) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - struct HIF_CE_pipe_info *pipe_info = &(hif_state->pipe_info[pipe]); - struct CE_handle *ce_hdl = pipe_info->ce_hdl; - int bytes = nbytes, nfrags = 0; - struct ce_sendlist sendlist; - int status, i = 0; - unsigned int mux_id = 0; - - CDF_ASSERT(nbytes <= cdf_nbuf_len(nbuf)); - - transfer_id = - (mux_id & MUX_ID_MASK) | - (transfer_id & TRANSACTION_ID_MASK); - data_attr &= DESC_DATA_FLAG_MASK; - /* - * The common case involves sending multiple fragments within a - * single download (the tx descriptor and the tx frame header). - * So, optimize for the case of multiple fragments by not even - * checking whether it's necessary to use a sendlist. - * The overhead of using a sendlist for a single buffer download - * is not a big deal, since it happens rarely (for WMI messages). - */ - ce_sendlist_init(&sendlist); - do { - uint32_t frag_paddr; - int frag_bytes; - - frag_paddr = cdf_nbuf_get_frag_paddr_lo(nbuf, nfrags); - frag_bytes = cdf_nbuf_get_frag_len(nbuf, nfrags); - /* - * Clear the packet offset for all but the first CE desc. - */ - if (i++ > 0) - data_attr &= ~CDF_CE_TX_PKT_OFFSET_BIT_M; - - status = ce_sendlist_buf_add(&sendlist, frag_paddr, - frag_bytes > - bytes ? bytes : frag_bytes, - cdf_nbuf_get_frag_is_wordstream - (nbuf, - nfrags) ? 0 : - CE_SEND_FLAG_SWAP_DISABLE, - data_attr); - if (status != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: error, frag_num %d larger than limit", - __func__, nfrags); - return status; - } - bytes -= frag_bytes; - nfrags++; - } while (bytes > 0); - - /* Make sure we have resources to handle this request */ - cdf_spin_lock_bh(&pipe_info->completion_freeq_lock); - if (pipe_info->num_sends_allowed < nfrags) { - cdf_spin_unlock_bh(&pipe_info->completion_freeq_lock); - ce_pkt_error_count_incr(hif_state, HIF_PIPE_NO_RESOURCE); - return CDF_STATUS_E_RESOURCES; - } - pipe_info->num_sends_allowed -= nfrags; - cdf_spin_unlock_bh(&pipe_info->completion_freeq_lock); - - if (cdf_unlikely(ce_hdl == NULL)) { - HIF_ERROR("%s: error CE handle is null", __func__); - return A_ERROR; - } - - NBUF_UPDATE_TX_PKT_COUNT(nbuf, NBUF_TX_PKT_HIF); - DPTRACE(cdf_dp_trace(nbuf, CDF_DP_TRACE_HIF_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(nbuf)), - sizeof(cdf_nbuf_data(nbuf)))); - status = ce_sendlist_send(ce_hdl, nbuf, &sendlist, transfer_id); - CDF_ASSERT(status == CDF_STATUS_SUCCESS); - - return status; -} - -void hif_send_complete_check(struct ol_softc *scn, uint8_t pipe, int force) -{ - if (!force) { - int resources; - /* - * Decide whether to actually poll for completions, or just - * wait for a later chance. If there seem to be plenty of - * resources left, then just wait, since checking involves - * reading a CE register, which is a relatively expensive - * operation. - */ - resources = hif_get_free_queue_number(scn, pipe); - /* - * If at least 50% of the total resources are still available, - * don't bother checking again yet. - */ - if (resources > (host_ce_config[pipe].src_nentries >> 1)) { - return; - } - } -#ifdef ATH_11AC_TXCOMPACT - ce_per_engine_servicereap(scn, pipe); -#else - ce_per_engine_service(scn, pipe); -#endif -} - -uint16_t hif_get_free_queue_number(struct ol_softc *scn, uint8_t pipe) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - struct HIF_CE_pipe_info *pipe_info = &(hif_state->pipe_info[pipe]); - uint16_t rv; - - cdf_spin_lock_bh(&pipe_info->completion_freeq_lock); - rv = pipe_info->num_sends_allowed; - cdf_spin_unlock_bh(&pipe_info->completion_freeq_lock); - return rv; -} - -/* Called by lower (CE) layer when a send to Target completes. */ -void -hif_pci_ce_send_done(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t CE_data, - unsigned int nbytes, unsigned int transfer_id, - unsigned int sw_index, unsigned int hw_index, - unsigned int toeplitz_hash_result) -{ - struct HIF_CE_pipe_info *pipe_info = - (struct HIF_CE_pipe_info *)ce_context; - struct HIF_CE_state *hif_state = pipe_info->HIF_CE_state; - unsigned int sw_idx = sw_index, hw_idx = hw_index; - struct hif_msg_callbacks *msg_callbacks = - &hif_state->msg_callbacks_current; - - do { - /* - * The upper layer callback will be triggered - * when last fragment is complteted. - */ - if (transfer_context != CE_SENDLIST_ITEM_CTXT) { - if (hif_state->scn->target_status - == OL_TRGET_STATUS_RESET) - cdf_nbuf_free(transfer_context); - else - msg_callbacks->txCompletionHandler( - msg_callbacks->Context, - transfer_context, transfer_id, - toeplitz_hash_result); - } - - cdf_spin_lock(&pipe_info->completion_freeq_lock); - pipe_info->num_sends_allowed++; - cdf_spin_unlock(&pipe_info->completion_freeq_lock); - } while (ce_completed_send_next(copyeng, - &ce_context, &transfer_context, - &CE_data, &nbytes, &transfer_id, - &sw_idx, &hw_idx, - &toeplitz_hash_result) == CDF_STATUS_SUCCESS); -} - -/** - * hif_ce_do_recv(): send message from copy engine to upper layers - * @msg_callbacks: structure containing callback and callback context - * @netbuff: skb containing message - * @nbytes: number of bytes in the message - * @pipe_info: used for the pipe_number info - * - * Checks the packet length, configures the lenght in the netbuff, - * and calls the upper layer callback. - * - * return: None - */ -static inline void hif_ce_do_recv(struct hif_msg_callbacks *msg_callbacks, - cdf_nbuf_t netbuf, int nbytes, - struct HIF_CE_pipe_info *pipe_info) { - if (nbytes <= pipe_info->buf_sz) { - cdf_nbuf_set_pktlen(netbuf, nbytes); - msg_callbacks-> - rxCompletionHandler(msg_callbacks->Context, - netbuf, pipe_info->pipe_num); - } else { - HIF_ERROR("%s: Invalid Rx msg buf:%p nbytes:%d", - __func__, netbuf, nbytes); - cdf_nbuf_free(netbuf); - } -} - -/* Called by lower (CE) layer when data is received from the Target. */ -void -hif_pci_ce_recv_data(struct CE_handle *copyeng, void *ce_context, - void *transfer_context, cdf_dma_addr_t CE_data, - unsigned int nbytes, unsigned int transfer_id, - unsigned int flags) -{ - struct HIF_CE_pipe_info *pipe_info = - (struct HIF_CE_pipe_info *)ce_context; - struct HIF_CE_state *hif_state = pipe_info->HIF_CE_state; - struct CE_state *ce_state = (struct CE_state *) copyeng; - struct ol_softc *scn = hif_state->scn; - struct hif_msg_callbacks *msg_callbacks = - &hif_state->msg_callbacks_current; - - do { - hif_pm_runtime_mark_last_busy(scn->hif_sc->dev); - cdf_nbuf_unmap_single(scn->cdf_dev, - (cdf_nbuf_t) transfer_context, - CDF_DMA_FROM_DEVICE); - - atomic_inc(&pipe_info->recv_bufs_needed); - hif_post_recv_buffers_for_pipe(pipe_info); - if (hif_state->scn->target_status == OL_TRGET_STATUS_RESET) - cdf_nbuf_free(transfer_context); - else - hif_ce_do_recv(msg_callbacks, transfer_context, - nbytes, pipe_info); - - /* Set up force_break flag if num of receices reaches - * MAX_NUM_OF_RECEIVES */ - ce_state->receive_count++; - if (cdf_unlikely(hif_max_num_receives_reached( - ce_state->receive_count))) { - ce_state->force_break = 1; - break; - } - } while (ce_completed_recv_next(copyeng, &ce_context, &transfer_context, - &CE_data, &nbytes, &transfer_id, - &flags) == CDF_STATUS_SUCCESS); - -} - -/* TBDXXX: Set CE High Watermark; invoke txResourceAvailHandler in response */ - -void -hif_post_init(struct ol_softc *scn, void *unused, - struct hif_msg_callbacks *callbacks) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - spin_lock_init(&pcie_access_log_lock); -#endif - /* Save callbacks for later installation */ - cdf_mem_copy(&hif_state->msg_callbacks_pending, callbacks, - sizeof(hif_state->msg_callbacks_pending)); - -} - -int hif_completion_thread_startup(struct HIF_CE_state *hif_state) -{ - struct CE_handle *ce_diag = hif_state->ce_diag; - int pipe_num; - struct ol_softc *scn = hif_state->scn; - struct hif_msg_callbacks *hif_msg_callbacks = - &hif_state->msg_callbacks_current; - - /* daemonize("hif_compl_thread"); */ - - if (scn->ce_count == 0) { - HIF_ERROR("%s: Invalid ce_count\n", __func__); - return -EINVAL; - } - - if (!hif_msg_callbacks || - !hif_msg_callbacks->rxCompletionHandler || - !hif_msg_callbacks->txCompletionHandler) { - HIF_ERROR("%s: no completion handler registered", __func__); - return -EFAULT; - } - - A_TARGET_ACCESS_LIKELY(scn); - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - struct CE_attr attr; - struct HIF_CE_pipe_info *pipe_info; - - pipe_info = &hif_state->pipe_info[pipe_num]; - if (pipe_info->ce_hdl == ce_diag) { - continue; /* Handle Diagnostic CE specially */ - } - attr = host_ce_config[pipe_num]; - if (attr.src_nentries) { - /* pipe used to send to target */ - HIF_INFO_MED("%s: pipe_num:%d pipe_info:0x%p", - __func__, pipe_num, pipe_info); - ce_send_cb_register(pipe_info->ce_hdl, - hif_pci_ce_send_done, pipe_info, - attr.flags & CE_ATTR_DISABLE_INTR); - pipe_info->num_sends_allowed = attr.src_nentries - 1; - } - if (attr.dest_nentries) { - /* pipe used to receive from target */ - ce_recv_cb_register(pipe_info->ce_hdl, - hif_pci_ce_recv_data, pipe_info, - attr.flags & CE_ATTR_DISABLE_INTR); - } - - if (attr.src_nentries) - cdf_spinlock_init(&pipe_info->completion_freeq_lock); - } - - A_TARGET_ACCESS_UNLIKELY(scn); - return 0; -} - -/* - * Install pending msg callbacks. - * - * TBDXXX: This hack is needed because upper layers install msg callbacks - * for use with HTC before BMI is done; yet this HIF implementation - * needs to continue to use BMI msg callbacks. Really, upper layers - * should not register HTC callbacks until AFTER BMI phase. - */ -static void hif_msg_callbacks_install(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - cdf_mem_copy(&hif_state->msg_callbacks_current, - &hif_state->msg_callbacks_pending, - sizeof(hif_state->msg_callbacks_pending)); -} - -void -hif_get_default_pipe(struct ol_softc *scn, uint8_t *ULPipe, uint8_t *DLPipe) -{ - int ul_is_polled, dl_is_polled; - - (void)hif_map_service_to_pipe(scn, HTC_CTRL_RSVD_SVC, - ULPipe, DLPipe, &ul_is_polled, &dl_is_polled); -} - -/** - * hif_dump_pipe_debug_count() - Log error count - * @scn: ol_softc pointer. - * - * Output the pipe error counts of each pipe to log file - * - * Return: N/A - */ -void hif_dump_pipe_debug_count(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state; - int pipe_num; - - if (scn == NULL) { - HIF_ERROR("%s scn is NULL", __func__); - return; - } - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - if (hif_state == NULL) { - HIF_ERROR("%s hif_state is NULL", __func__); - return; - } - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - struct HIF_CE_pipe_info *pipe_info; - - pipe_info = &hif_state->pipe_info[pipe_num]; - - if (pipe_info->nbuf_alloc_err_count > 0 || - pipe_info->nbuf_dma_err_count > 0 || - pipe_info->nbuf_ce_enqueue_err_count) - HIF_ERROR( - "%s: pipe_id = %d, recv_bufs_needed = %d, nbuf_alloc_err_count = %u, nbuf_dma_err_count = %u, nbuf_ce_enqueue_err_count = %u", - __func__, pipe_info->pipe_num, - atomic_read(&pipe_info->recv_bufs_needed), - pipe_info->nbuf_alloc_err_count, - pipe_info->nbuf_dma_err_count, - pipe_info->nbuf_ce_enqueue_err_count); - } -} - -static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info) -{ - struct CE_handle *ce_hdl; - cdf_size_t buf_sz; - struct HIF_CE_state *hif_state = pipe_info->HIF_CE_state; - struct ol_softc *scn = hif_state->scn; - CDF_STATUS ret; - uint32_t bufs_posted = 0; - - buf_sz = pipe_info->buf_sz; - if (buf_sz == 0) { - /* Unused Copy Engine */ - return 0; - } - - ce_hdl = pipe_info->ce_hdl; - - cdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); - while (atomic_read(&pipe_info->recv_bufs_needed) > 0) { - cdf_dma_addr_t CE_data; /* CE space buffer address */ - cdf_nbuf_t nbuf; - int status; - - atomic_dec(&pipe_info->recv_bufs_needed); - cdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock); - - nbuf = cdf_nbuf_alloc(scn->cdf_dev, buf_sz, 0, 4, false); - if (!nbuf) { - cdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); - pipe_info->nbuf_alloc_err_count++; - cdf_spin_unlock_bh( - &pipe_info->recv_bufs_needed_lock); - HIF_ERROR( - "%s buf alloc error [%d] needed %d, nbuf_alloc_err_count = %u", - __func__, pipe_info->pipe_num, - atomic_read(&pipe_info->recv_bufs_needed), - pipe_info->nbuf_alloc_err_count); - atomic_inc(&pipe_info->recv_bufs_needed); - return 1; - } - - /* - * cdf_nbuf_peek_header(nbuf, &data, &unused); - * CE_data = dma_map_single(dev, data, buf_sz, ); - * DMA_FROM_DEVICE); - */ - ret = - cdf_nbuf_map_single(scn->cdf_dev, nbuf, - CDF_DMA_FROM_DEVICE); - - if (unlikely(ret != CDF_STATUS_SUCCESS)) { - cdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); - pipe_info->nbuf_dma_err_count++; - cdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock); - HIF_ERROR( - "%s buf alloc error [%d] needed %d, nbuf_dma_err_count = %u", - __func__, pipe_info->pipe_num, - atomic_read(&pipe_info->recv_bufs_needed), - pipe_info->nbuf_dma_err_count); - cdf_nbuf_free(nbuf); - atomic_inc(&pipe_info->recv_bufs_needed); - return 1; - } - - CE_data = cdf_nbuf_get_frag_paddr_lo(nbuf, 0); - - cdf_os_mem_dma_sync_single_for_device(scn->cdf_dev, CE_data, - buf_sz, DMA_FROM_DEVICE); - status = ce_recv_buf_enqueue(ce_hdl, (void *)nbuf, CE_data); - CDF_ASSERT(status == CDF_STATUS_SUCCESS); - if (status != EOK) { - cdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); - pipe_info->nbuf_ce_enqueue_err_count++; - cdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock); - HIF_ERROR( - "%s buf alloc error [%d] needed %d, nbuf_alloc_err_count = %u", - __func__, pipe_info->pipe_num, - atomic_read(&pipe_info->recv_bufs_needed), - pipe_info->nbuf_ce_enqueue_err_count); - atomic_inc(&pipe_info->recv_bufs_needed); - cdf_nbuf_free(nbuf); - return 1; - } - - cdf_spin_lock_bh(&pipe_info->recv_bufs_needed_lock); - bufs_posted++; - } - pipe_info->nbuf_alloc_err_count = - (pipe_info->nbuf_alloc_err_count > bufs_posted)? - pipe_info->nbuf_alloc_err_count - bufs_posted : 0; - pipe_info->nbuf_dma_err_count = - (pipe_info->nbuf_dma_err_count > bufs_posted)? - pipe_info->nbuf_dma_err_count - bufs_posted : 0; - pipe_info->nbuf_ce_enqueue_err_count = - (pipe_info->nbuf_ce_enqueue_err_count > bufs_posted)? - pipe_info->nbuf_ce_enqueue_err_count - bufs_posted : 0; - - cdf_spin_unlock_bh(&pipe_info->recv_bufs_needed_lock); - - return 0; -} - -/* - * Try to post all desired receive buffers for all pipes. - * Returns 0 if all desired buffers are posted, - * non-zero if were were unable to completely - * replenish receive buffers. - */ -static int hif_post_recv_buffers(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - int pipe_num, rv = 0; - - A_TARGET_ACCESS_LIKELY(scn); - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - struct HIF_CE_pipe_info *pipe_info; - - pipe_info = &hif_state->pipe_info[pipe_num]; - if (hif_post_recv_buffers_for_pipe(pipe_info)) { - rv = 1; - goto done; - } - } - -done: - A_TARGET_ACCESS_UNLIKELY(scn); - - return rv; -} - -CDF_STATUS hif_start(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - hif_msg_callbacks_install(scn); - - if (hif_completion_thread_startup(hif_state)) - return CDF_STATUS_E_FAILURE; - - /* Post buffers once to start things off. */ - (void)hif_post_recv_buffers(scn); - - hif_state->started = true; - - return CDF_STATUS_SUCCESS; -} - -#ifdef WLAN_FEATURE_FASTPATH -/** - * hif_enable_fastpath() Update that we have enabled fastpath mode - * @hif_device: HIF context - * - * For use in data path - * - * Retrun: void - */ -void -hif_enable_fastpath(struct ol_softc *hif_device) -{ - HIF_INFO("Enabling fastpath mode\n"); - hif_device->fastpath_mode_on = 1; -} -#endif /* WLAN_FEATURE_FASTPATH */ - -void hif_recv_buffer_cleanup_on_pipe(struct HIF_CE_pipe_info *pipe_info) -{ - struct ol_softc *scn; - struct CE_handle *ce_hdl; - uint32_t buf_sz; - struct HIF_CE_state *hif_state; - cdf_nbuf_t netbuf; - cdf_dma_addr_t CE_data; - void *per_CE_context; - - buf_sz = pipe_info->buf_sz; - if (buf_sz == 0) { - /* Unused Copy Engine */ - return; - } - - hif_state = pipe_info->HIF_CE_state; - if (!hif_state->started) { - return; - } - - scn = hif_state->scn; - ce_hdl = pipe_info->ce_hdl; - - if (scn->cdf_dev == NULL) { - return; - } - while (ce_revoke_recv_next - (ce_hdl, &per_CE_context, (void **)&netbuf, - &CE_data) == CDF_STATUS_SUCCESS) { - cdf_nbuf_unmap_single(scn->cdf_dev, netbuf, - CDF_DMA_FROM_DEVICE); - cdf_nbuf_free(netbuf); - } -} - -void hif_send_buffer_cleanup_on_pipe(struct HIF_CE_pipe_info *pipe_info) -{ - struct CE_handle *ce_hdl; - struct HIF_CE_state *hif_state; - cdf_nbuf_t netbuf; - void *per_CE_context; - cdf_dma_addr_t CE_data; - unsigned int nbytes; - unsigned int id; - uint32_t buf_sz; - uint32_t toeplitz_hash_result; - - buf_sz = pipe_info->buf_sz; - if (buf_sz == 0) { - /* Unused Copy Engine */ - return; - } - - hif_state = pipe_info->HIF_CE_state; - if (!hif_state->started) { - return; - } - - ce_hdl = pipe_info->ce_hdl; - - while (ce_cancel_send_next - (ce_hdl, &per_CE_context, - (void **)&netbuf, &CE_data, &nbytes, - &id, &toeplitz_hash_result) == CDF_STATUS_SUCCESS) { - if (netbuf != CE_SENDLIST_ITEM_CTXT) { - /* - * Packets enqueued by htt_h2t_ver_req_msg() and - * htt_h2t_rx_ring_cfg_msg_ll() have already been - * freed in htt_htc_misc_pkt_pool_free() in - * wlantl_close(), so do not free them here again - * by checking whether it's the endpoint - * which they are queued in. - */ - if (id == hif_state->scn->htc_endpoint) - return; - /* Indicate the completion to higer - * layer to free the buffer */ - hif_state->msg_callbacks_current. - txCompletionHandler(hif_state-> - msg_callbacks_current.Context, - netbuf, id, toeplitz_hash_result); - } - } -} - -/* - * Cleanup residual buffers for device shutdown: - * buffers that were enqueued for receive - * buffers that were to be sent - * Note: Buffers that had completed but which were - * not yet processed are on a completion queue. They - * are handled when the completion thread shuts down. - */ -void hif_buffer_cleanup(struct HIF_CE_state *hif_state) -{ - int pipe_num; - - for (pipe_num = 0; pipe_num < hif_state->scn->ce_count; pipe_num++) { - struct HIF_CE_pipe_info *pipe_info; - - pipe_info = &hif_state->pipe_info[pipe_num]; - hif_recv_buffer_cleanup_on_pipe(pipe_info); - hif_send_buffer_cleanup_on_pipe(pipe_info); - } -} - -void hif_flush_surprise_remove(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - hif_buffer_cleanup(hif_state); -} - -void hif_stop(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - int pipe_num; - - scn->hif_init_done = false; - - /* - * At this point, asynchronous threads are stopped, - * The Target should not DMA nor interrupt, Host code may - * not initiate anything more. So we just need to clean - * up Host-side state. - */ - - if (scn->athdiag_procfs_inited) { - athdiag_procfs_remove(); - scn->athdiag_procfs_inited = false; - } - - hif_buffer_cleanup(hif_state); - - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - struct HIF_CE_pipe_info *pipe_info; - - pipe_info = &hif_state->pipe_info[pipe_num]; - if (pipe_info->ce_hdl) { - ce_fini(pipe_info->ce_hdl); - pipe_info->ce_hdl = NULL; - pipe_info->buf_sz = 0; - } - } - - if (hif_state->sleep_timer_init) { - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - cdf_softirq_timer_free(&hif_state->sleep_timer); - hif_state->sleep_timer_init = false; - } - - hif_state->started = false; -} - -#define ADRASTEA_SRC_WR_INDEX_OFFSET 0x3C -#define ADRASTEA_DST_WR_INDEX_OFFSET 0x40 - - -static struct shadow_reg_cfg target_shadow_reg_cfg_map[] = { - { 0, ADRASTEA_SRC_WR_INDEX_OFFSET}, - { 3, ADRASTEA_SRC_WR_INDEX_OFFSET}, - { 4, ADRASTEA_SRC_WR_INDEX_OFFSET}, - { 5, ADRASTEA_SRC_WR_INDEX_OFFSET}, - { 7, ADRASTEA_SRC_WR_INDEX_OFFSET}, - { 1, ADRASTEA_DST_WR_INDEX_OFFSET}, - { 2, ADRASTEA_DST_WR_INDEX_OFFSET}, - { 7, ADRASTEA_DST_WR_INDEX_OFFSET}, - { 8, ADRASTEA_DST_WR_INDEX_OFFSET}, -}; - - - -/* CE_PCI TABLE */ -/* - * NOTE: the table below is out of date, though still a useful reference. - * Refer to target_service_to_ce_map and hif_map_service_to_pipe for the actual - * mapping of HTC services to HIF pipes. - */ -/* - * This authoritative table defines Copy Engine configuration and the mapping - * of services/endpoints to CEs. A subset of this information is passed to - * the Target during startup as a prerequisite to entering BMI phase. - * See: - * target_service_to_ce_map - Target-side mapping - * hif_map_service_to_pipe - Host-side mapping - * target_ce_config - Target-side configuration - * host_ce_config - Host-side configuration - ============================================================================ - Purpose | Service / Endpoint | CE | Dire | Xfer | Xfer - | | | ctio | Size | Frequency - | | | n | | - ============================================================================ - tx | HTT_DATA (downlink) | CE 0 | h->t | medium - | very frequent - descriptor | | | | O(100B) | and regular - download | | | | | - ---------------------------------------------------------------------------- - rx | HTT_DATA (uplink) | CE 1 | t->h | small - | frequent and - indication | | | | O(10B) | regular - upload | | | | | - ---------------------------------------------------------------------------- - MSDU | DATA_BK (uplink) | CE 2 | t->h | large - | rare - upload | | | | O(1000B) | (frequent - e.g. noise | | | | | during IP1.0 - packets | | | | | testing) - ---------------------------------------------------------------------------- - MSDU | DATA_BK (downlink) | CE 3 | h->t | large - | very rare - download | | | | O(1000B) | (frequent - e.g. | | | | | during IP1.0 - misdirecte | | | | | testing) - d EAPOL | | | | | - packets | | | | | - ---------------------------------------------------------------------------- - n/a | DATA_BE, DATA_VI | CE 2 | t->h | | never(?) - | DATA_VO (uplink) | | | | - ---------------------------------------------------------------------------- - n/a | DATA_BE, DATA_VI | CE 3 | h->t | | never(?) - | DATA_VO (downlink) | | | | - ---------------------------------------------------------------------------- - WMI events | WMI_CONTROL (uplink) | CE 4 | t->h | medium - | infrequent - | | | | O(100B) | - ---------------------------------------------------------------------------- - WMI | WMI_CONTROL | CE 5 | h->t | medium - | infrequent - messages | (downlink) | | | O(100B) | - | | | | | - ---------------------------------------------------------------------------- - n/a | HTC_CTRL_RSVD, | CE 1 | t->h | | never(?) - | HTC_RAW_STREAMS | | | | - | (uplink) | | | | - ---------------------------------------------------------------------------- - n/a | HTC_CTRL_RSVD, | CE 0 | h->t | | never(?) - | HTC_RAW_STREAMS | | | | - | (downlink) | | | | - ---------------------------------------------------------------------------- - diag | none (raw CE) | CE 7 | t<>h | 4 | Diag Window - | | | | | infrequent - ============================================================================ - */ - -/* - * Map from service/endpoint to Copy Engine. - * This table is derived from the CE_PCI TABLE, above. - * It is passed to the Target at startup for use by firmware. - */ -static struct service_to_pipe target_service_to_ce_map_wlan[] = { - { - WMI_DATA_VO_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 3, - }, - { - WMI_DATA_VO_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - WMI_DATA_BK_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 3, - }, - { - WMI_DATA_BK_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - WMI_DATA_BE_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 3, - }, - { - WMI_DATA_BE_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - WMI_DATA_VI_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 3, - }, - { - WMI_DATA_VI_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - WMI_CONTROL_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 3, - }, - { - WMI_CONTROL_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - HTC_CTRL_RSVD_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 0, /* could be moved to 3 (share with WMI) */ - }, - { - HTC_CTRL_RSVD_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - HTC_RAW_STREAMS_SVC, /* not currently used */ - PIPEDIR_OUT, /* out = UL = host -> target */ - 0, - }, - { - HTC_RAW_STREAMS_SVC, /* not currently used */ - PIPEDIR_IN, /* in = DL = target -> host */ - 2, - }, - { - HTT_DATA_MSG_SVC, - PIPEDIR_OUT, /* out = UL = host -> target */ - 4, - }, - { - HTT_DATA_MSG_SVC, - PIPEDIR_IN, /* in = DL = target -> host */ - 1, - }, - { - WDI_IPA_TX_SVC, - PIPEDIR_OUT, /* in = DL = target -> host */ - 5, - }, - /* (Additions here) */ - - { /* Must be last */ - 0, - 0, - 0, - }, -}; - -static struct service_to_pipe *target_service_to_ce_map = - target_service_to_ce_map_wlan; -static int target_service_to_ce_map_sz = sizeof(target_service_to_ce_map_wlan); - -static struct shadow_reg_cfg *target_shadow_reg_cfg = target_shadow_reg_cfg_map; -static int shadow_cfg_sz = sizeof(target_shadow_reg_cfg_map); - -static struct service_to_pipe target_service_to_ce_map_wlan_epping[] = { - {WMI_DATA_VO_SVC, PIPEDIR_OUT, 3,}, /* out = UL = host -> target */ - {WMI_DATA_VO_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {WMI_DATA_BK_SVC, PIPEDIR_OUT, 4,}, /* out = UL = host -> target */ - {WMI_DATA_BK_SVC, PIPEDIR_IN, 1,}, /* in = DL = target -> host */ - {WMI_DATA_BE_SVC, PIPEDIR_OUT, 3,}, /* out = UL = host -> target */ - {WMI_DATA_BE_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {WMI_DATA_VI_SVC, PIPEDIR_OUT, 3,}, /* out = UL = host -> target */ - {WMI_DATA_VI_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {WMI_CONTROL_SVC, PIPEDIR_OUT, 3,}, /* out = UL = host -> target */ - {WMI_CONTROL_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {HTC_CTRL_RSVD_SVC, PIPEDIR_OUT, 0,}, /* out = UL = host -> target */ - {HTC_CTRL_RSVD_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {HTC_RAW_STREAMS_SVC, PIPEDIR_OUT, 0,}, /* out = UL = host -> target */ - {HTC_RAW_STREAMS_SVC, PIPEDIR_IN, 2,}, /* in = DL = target -> host */ - {HTT_DATA_MSG_SVC, PIPEDIR_OUT, 4,}, /* out = UL = host -> target */ - {HTT_DATA_MSG_SVC, PIPEDIR_IN, 1,}, /* in = DL = target -> host */ - {0, 0, 0,}, /* Must be last */ -}; - -#ifdef HIF_PCI -/* - * Send an interrupt to the device to wake up the Target CPU - * so it has an opportunity to notice any changed state. - */ -void hif_wake_target_cpu(struct ol_softc *scn) -{ - CDF_STATUS rv; - uint32_t core_ctrl; - - rv = hif_diag_read_access(scn, - SOC_CORE_BASE_ADDRESS | CORE_CTRL_ADDRESS, - &core_ctrl); - CDF_ASSERT(rv == CDF_STATUS_SUCCESS); - /* A_INUM_FIRMWARE interrupt to Target CPU */ - core_ctrl |= CORE_CTRL_CPU_INTR_MASK; - - rv = hif_diag_write_access(scn, - SOC_CORE_BASE_ADDRESS | CORE_CTRL_ADDRESS, - core_ctrl); - CDF_ASSERT(rv == CDF_STATUS_SUCCESS); -} -#endif - -static void hif_sleep_entry(void *arg) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)arg; - struct ol_softc *scn = hif_state->scn; - uint32_t idle_ms; - if (scn->recovery) - return; - - if (cds_is_driver_unloading()) - return; - - cdf_spin_lock_irqsave(&hif_state->keep_awake_lock); - if (hif_state->verified_awake == false) { - idle_ms = cdf_system_ticks_to_msecs(cdf_system_ticks() - - hif_state->sleep_ticks); - if (idle_ms >= HIF_MIN_SLEEP_INACTIVITY_TIME_MS) { - if (!cdf_atomic_read(&scn->link_suspended)) { - soc_wake_reset(scn); - hif_state->fake_sleep = false; - } - } else { - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - cdf_softirq_timer_start(&hif_state->sleep_timer, - HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS); - } - } else { - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - cdf_softirq_timer_start(&hif_state->sleep_timer, - HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS); - } - cdf_spin_unlock_irqrestore(&hif_state->keep_awake_lock); -} -#define HIF_HIA_MAX_POLL_LOOP 1000000 -#define HIF_HIA_POLLING_DELAY_MS 10 - -#ifndef HIF_PCI -int hif_set_hia(struct ol_softc *scn) -{ - return 0; -} -#else -int hif_set_hia(struct ol_softc *scn) -{ - CDF_STATUS rv; - uint32_t interconnect_targ_addr = 0; - uint32_t pcie_state_targ_addr = 0; - uint32_t pipe_cfg_targ_addr = 0; - uint32_t svc_to_pipe_map = 0; - uint32_t pcie_config_flags = 0; - uint32_t flag2_value = 0; - uint32_t flag2_targ_addr = 0; -#ifdef QCA_WIFI_3_0 - uint32_t host_interest_area = 0; - uint8_t i; -#else - uint32_t ealloc_value = 0; - uint32_t ealloc_targ_addr = 0; - uint8_t banks_switched = 1; - uint32_t chip_id; -#endif - uint32_t pipe_cfg_addr; - - HIF_TRACE("%s: E", __func__); - - if (ADRASTEA_BU) - return CDF_STATUS_SUCCESS; - -#ifdef QCA_WIFI_3_0 - i = 0; - while (i < HIF_HIA_MAX_POLL_LOOP) { - host_interest_area = hif_read32_mb(scn->mem + - A_SOC_CORE_SCRATCH_0_ADDRESS); - if ((host_interest_area & 0x01) == 0) { - cdf_mdelay(HIF_HIA_POLLING_DELAY_MS); - host_interest_area = 0; - i++; - if (i > HIF_HIA_MAX_POLL_LOOP && (i % 1000 == 0)) { - HIF_ERROR("%s: poll timeout(%d)", __func__, i); - } - } else { - host_interest_area &= (~0x01); - hif_write32_mb(scn->mem + 0x113014, 0); - break; - } - } - - if (i >= HIF_HIA_MAX_POLL_LOOP) { - HIF_ERROR("%s: hia polling timeout", __func__); - return -EIO; - } - - if (host_interest_area == 0) { - HIF_ERROR("%s: host_interest_area = 0", __func__); - return -EIO; - } - - interconnect_targ_addr = host_interest_area + - offsetof(struct host_interest_area_t, - hi_interconnect_state); - - flag2_targ_addr = host_interest_area + - offsetof(struct host_interest_area_t, hi_option_flag2); - -#else - interconnect_targ_addr = hif_hia_item_address(scn->target_type, - offsetof(struct host_interest_s, hi_interconnect_state)); - ealloc_targ_addr = hif_hia_item_address(scn->target_type, - offsetof(struct host_interest_s, hi_early_alloc)); - flag2_targ_addr = hif_hia_item_address(scn->target_type, - offsetof(struct host_interest_s, hi_option_flag2)); -#endif - /* Supply Target-side CE configuration */ - rv = hif_diag_read_access(scn, interconnect_targ_addr, - &pcie_state_targ_addr); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: interconnect_targ_addr = 0x%0x, ret = %d", - __func__, interconnect_targ_addr, rv); - goto done; - } - if (pcie_state_targ_addr == 0) { - rv = CDF_STATUS_E_FAILURE; - HIF_ERROR("%s: pcie state addr is 0", __func__); - goto done; - } - pipe_cfg_addr = pcie_state_targ_addr + - offsetof(struct pcie_state_s, - pipe_cfg_addr); - rv = hif_diag_read_access(scn, - pipe_cfg_addr, - &pipe_cfg_targ_addr); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: pipe_cfg_addr = 0x%0x, ret = %d", - __func__, pipe_cfg_addr, rv); - goto done; - } - if (pipe_cfg_targ_addr == 0) { - rv = CDF_STATUS_E_FAILURE; - HIF_ERROR("%s: pipe cfg addr is 0", __func__); - goto done; - } - - rv = hif_diag_write_mem(scn, pipe_cfg_targ_addr, - (uint8_t *) target_ce_config, - target_ce_config_sz); - - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: write pipe cfg (%d)", __func__, rv); - goto done; - } - - rv = hif_diag_read_access(scn, - pcie_state_targ_addr + - offsetof(struct pcie_state_s, - svc_to_pipe_map), - &svc_to_pipe_map); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: get svc/pipe map (%d)", __func__, rv); - goto done; - } - if (svc_to_pipe_map == 0) { - rv = CDF_STATUS_E_FAILURE; - HIF_ERROR("%s: svc_to_pipe map is 0", __func__); - goto done; - } - - rv = hif_diag_write_mem(scn, - svc_to_pipe_map, - (uint8_t *) target_service_to_ce_map, - target_service_to_ce_map_sz); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: write svc/pipe map (%d)", __func__, rv); - goto done; - } - - rv = hif_diag_read_access(scn, - pcie_state_targ_addr + - offsetof(struct pcie_state_s, - config_flags), - &pcie_config_flags); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: get pcie config_flags (%d)", __func__, rv); - goto done; - } -#if (CONFIG_PCIE_ENABLE_L1_CLOCK_GATE) - pcie_config_flags |= PCIE_CONFIG_FLAG_ENABLE_L1; -#else - pcie_config_flags &= ~PCIE_CONFIG_FLAG_ENABLE_L1; -#endif /* CONFIG_PCIE_ENABLE_L1_CLOCK_GATE */ - pcie_config_flags |= PCIE_CONFIG_FLAG_CLK_SWITCH_WAIT; -#if (CONFIG_PCIE_ENABLE_AXI_CLK_GATE) - pcie_config_flags |= PCIE_CONFIG_FLAG_AXI_CLK_GATE; -#endif - rv = hif_diag_write_mem(scn, - pcie_state_targ_addr + - offsetof(struct pcie_state_s, - config_flags), - (uint8_t *) &pcie_config_flags, - sizeof(pcie_config_flags)); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: write pcie config_flags (%d)", __func__, rv); - goto done; - } - -#ifndef QCA_WIFI_3_0 - /* configure early allocation */ - ealloc_targ_addr = hif_hia_item_address(scn->target_type, - offsetof( - struct host_interest_s, - hi_early_alloc)); - - rv = hif_diag_read_access(scn, ealloc_targ_addr, - &ealloc_value); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: get early alloc val (%d)", __func__, rv); - goto done; - } - - /* 1 bank is switched to IRAM, except ROME 1.0 */ - ealloc_value |= - ((HI_EARLY_ALLOC_MAGIC << HI_EARLY_ALLOC_MAGIC_SHIFT) & - HI_EARLY_ALLOC_MAGIC_MASK); - - rv = hif_diag_read_access(scn, - CHIP_ID_ADDRESS | - RTC_SOC_BASE_ADDRESS, &chip_id); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: get chip id val (%d)", __func__, rv); - goto done; - } - if (CHIP_ID_VERSION_GET(chip_id) == 0xD) { - scn->target_revision = - CHIP_ID_REVISION_GET(chip_id); - switch (CHIP_ID_REVISION_GET(chip_id)) { - case 0x2: /* ROME 1.3 */ - /* 2 banks are switched to IRAM */ - banks_switched = 2; - break; - case 0x4: /* ROME 2.1 */ - case 0x5: /* ROME 2.2 */ - banks_switched = 6; - break; - case 0x8: /* ROME 3.0 */ - case 0x9: /* ROME 3.1 */ - case 0xA: /* ROME 3.2 */ - banks_switched = 9; - break; - case 0x0: /* ROME 1.0 */ - case 0x1: /* ROME 1.1 */ - default: - /* 3 banks are switched to IRAM */ - banks_switched = 3; - break; - } - } - - ealloc_value |= - ((banks_switched << HI_EARLY_ALLOC_IRAM_BANKS_SHIFT) - & HI_EARLY_ALLOC_IRAM_BANKS_MASK); - - rv = hif_diag_write_access(scn, - ealloc_targ_addr, - ealloc_value); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: set early alloc val (%d)", __func__, rv); - goto done; - } -#endif - - /* Tell Target to proceed with initialization */ - flag2_targ_addr = hif_hia_item_address(scn->target_type, - offsetof( - struct host_interest_s, - hi_option_flag2)); - - rv = hif_diag_read_access(scn, flag2_targ_addr, - &flag2_value); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: get option val (%d)", __func__, rv); - goto done; - } - - flag2_value |= HI_OPTION_EARLY_CFG_DONE; - rv = hif_diag_write_access(scn, flag2_targ_addr, - flag2_value); - if (rv != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: set option val (%d)", __func__, rv); - goto done; - } - - hif_wake_target_cpu(scn); - -done: - - return rv; -} -#endif - -/** - * hif_wlan_enable(): call the platform driver to enable wlan - * - * This function passes the con_mode and CE configuration to - * platform driver to enable wlan. - * - * Return: void - */ -static int hif_wlan_enable(void) -{ - struct icnss_wlan_enable_cfg cfg; - enum icnss_driver_mode mode; - uint32_t con_mode = cds_get_conparam(); - - cfg.num_ce_tgt_cfg = target_ce_config_sz / - sizeof(struct CE_pipe_config); - cfg.ce_tgt_cfg = (struct ce_tgt_pipe_cfg *)target_ce_config; - cfg.num_ce_svc_pipe_cfg = target_service_to_ce_map_sz / - sizeof(struct service_to_pipe); - cfg.ce_svc_cfg = (struct ce_svc_pipe_cfg *)target_service_to_ce_map; - cfg.num_shadow_reg_cfg = shadow_cfg_sz / sizeof(struct shadow_reg_cfg); - cfg.shadow_reg_cfg = (struct icnss_shadow_reg_cfg *) target_shadow_reg_cfg; - - if (CDF_GLOBAL_FTM_MODE == con_mode) - mode = ICNSS_FTM; - else if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) - mode = ICNSS_EPPING; - else - mode = ICNSS_MISSION; - - return icnss_wlan_enable(&cfg, mode, QWLAN_VERSIONSTR); -} - -/* - * Called from PCI layer whenever a new PCI device is probed. - * Initializes per-device HIF state and notifies the main - * driver that a new HIF device is present. - */ -int hif_config_ce(hif_handle_t hif_hdl) -{ - struct HIF_CE_state *hif_state; - struct HIF_CE_pipe_info *pipe_info; - int pipe_num; -#ifdef ADRASTEA_SHADOW_REGISTERS - int i; -#endif - CDF_STATUS rv = CDF_STATUS_SUCCESS; - int ret; - struct ol_softc *scn = hif_hdl; - struct icnss_soc_info soc_info; - - /* if epping is enabled we need to use the epping configuration. */ - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { - if (WLAN_IS_EPPING_IRQ(cds_get_conparam())) - host_ce_config = host_ce_config_wlan_epping_irq; - else - host_ce_config = host_ce_config_wlan_epping_poll; - target_ce_config = target_ce_config_wlan_epping; - target_ce_config_sz = sizeof(target_ce_config_wlan_epping); - target_service_to_ce_map = - target_service_to_ce_map_wlan_epping; - target_service_to_ce_map_sz = - sizeof(target_service_to_ce_map_wlan_epping); - } - - ret = hif_wlan_enable(); - - if (ret) { - HIF_ERROR("%s: hif_wlan_enable error = %d", __func__, ret); - return CDF_STATUS_NOT_INITIALIZED; - } - - scn->notice_send = true; - - cdf_mem_zero(&soc_info, sizeof(soc_info)); - ret = icnss_get_soc_info(&soc_info); - if (ret < 0) { - HIF_ERROR("%s: icnss_get_soc_info error = %d", __func__, ret); - return CDF_STATUS_NOT_INITIALIZED; - } - - hif_state = (struct HIF_CE_state *)cdf_mem_malloc(sizeof(*hif_state)); - if (!hif_state) { - return -ENOMEM; - } - cdf_mem_zero(hif_state, sizeof(*hif_state)); - - hif_state->scn = scn; - scn->hif_hdl = hif_state; - scn->mem = soc_info.v_addr; - scn->mem_pa = soc_info.p_addr; - scn->soc_version = soc_info.version; - - cdf_spinlock_init(&hif_state->keep_awake_lock); - - hif_state->keep_awake_count = 0; - - hif_state->fake_sleep = false; - hif_state->sleep_ticks = 0; - cdf_softirq_timer_init(NULL, &hif_state->sleep_timer, - hif_sleep_entry, (void *)hif_state, - CDF_TIMER_TYPE_WAKE_APPS); - hif_state->sleep_timer_init = true; - hif_state->fw_indicator_address = FW_INDICATOR_ADDRESS; -#ifdef HIF_PCI -#if CONFIG_ATH_PCIE_MAX_PERF || CONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD - /* Force AWAKE forever/till the driver is loaded */ - if (hif_target_sleep_state_adjust(scn, false, true) < 0) - return -EACCES; -#endif -#endif - - hif_config_rri_on_ddr(scn); - - /* During CE initializtion */ - scn->ce_count = HOST_CE_COUNT; - A_TARGET_ACCESS_LIKELY(scn); - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - struct CE_attr *attr; - - pipe_info = &hif_state->pipe_info[pipe_num]; - pipe_info->pipe_num = pipe_num; - pipe_info->HIF_CE_state = hif_state; - attr = &host_ce_config[pipe_num]; - pipe_info->ce_hdl = ce_init(scn, pipe_num, attr); - CDF_ASSERT(pipe_info->ce_hdl != NULL); - if (pipe_info->ce_hdl == NULL) { - rv = CDF_STATUS_E_FAILURE; - A_TARGET_ACCESS_UNLIKELY(scn); - goto err; - } - - if (pipe_num == DIAG_CE_ID) { - /* Reserve the ultimate CE for - * Diagnostic Window support */ - hif_state->ce_diag = - hif_state->pipe_info[scn->ce_count - 1].ce_hdl; - continue; - } - - pipe_info->buf_sz = (cdf_size_t) (attr->src_sz_max); - cdf_spinlock_init(&pipe_info->recv_bufs_needed_lock); - if (attr->dest_nentries > 0) { - atomic_set(&pipe_info->recv_bufs_needed, - init_buffer_count(attr->dest_nentries - 1)); - } else { - atomic_set(&pipe_info->recv_bufs_needed, 0); - } - ce_tasklet_init(hif_state, (1 << pipe_num)); - ce_register_irq(hif_state, (1 << pipe_num)); - scn->request_irq_done = true; - } - - if (athdiag_procfs_init(scn) != 0) { - A_TARGET_ACCESS_UNLIKELY(scn); - goto err; - } - scn->athdiag_procfs_inited = true; - - /* - * Initially, establish CE completion handlers for use with BMI. - * These are overwritten with generic handlers after we exit BMI phase. - */ - pipe_info = &hif_state->pipe_info[BMI_CE_NUM_TO_TARG]; -#ifdef HIF_PCI - ce_send_cb_register( - pipe_info->ce_hdl, hif_bmi_send_done, pipe_info, 0); -#ifndef BMI_RSP_POLLING - pipe_info = &hif_state->pipe_info[BMI_CE_NUM_TO_HOST]; - ce_recv_cb_register( - pipe_info->ce_hdl, hif_bmi_recv_data, pipe_info, 0); -#endif -#endif - HIF_INFO_MED("%s: ce_init done", __func__); - - rv = hif_set_hia(scn); - - HIF_INFO_MED("%s: hif_set_hia done", __func__); - - A_TARGET_ACCESS_UNLIKELY(scn); - - if (rv != CDF_STATUS_SUCCESS) - goto err; - else - init_tasklet_workers(); - - HIF_TRACE("%s: X, ret = %d\n", __func__, rv); - -#ifdef ADRASTEA_SHADOW_REGISTERS - HIF_ERROR("Using Shadow Registers instead of CE Registers\n"); - for (i = 0; i < NUM_SHADOW_REGISTERS; i++) { - HIF_ERROR("%s Shadow Register%d is mapped to address %x\n", - __func__, i, - (A_TARGET_READ(scn, (SHADOW_ADDRESS(i))) << 2)); - } -#endif - - - return rv != CDF_STATUS_SUCCESS; - -err: - /* Failure, so clean up */ - for (pipe_num = 0; pipe_num < scn->ce_count; pipe_num++) { - pipe_info = &hif_state->pipe_info[pipe_num]; - if (pipe_info->ce_hdl) { - ce_unregister_irq(hif_state, (1 << pipe_num)); - scn->request_irq_done = false; - ce_fini(pipe_info->ce_hdl); - pipe_info->ce_hdl = NULL; - pipe_info->buf_sz = 0; - } - } - if (hif_state->sleep_timer_init) { - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - cdf_softirq_timer_free(&hif_state->sleep_timer); - hif_state->sleep_timer_init = false; - } - if (scn->hif_hdl) { - scn->hif_hdl = NULL; - cdf_mem_free(hif_state); - } - athdiag_procfs_remove(); - scn->athdiag_procfs_inited = false; - HIF_TRACE("%s: X, ret = %d\n", __func__, rv); - return CDF_STATUS_SUCCESS != CDF_STATUS_E_FAILURE; -} - - - - - - -#ifdef IPA_OFFLOAD -/** - * hif_ipa_get_ce_resource() - get uc resource on hif - * @scn: bus context - * @ce_sr_base_paddr: copyengine source ring base physical address - * @ce_sr_ring_size: copyengine source ring size - * @ce_reg_paddr: copyengine register physical address - * - * IPA micro controller data path offload feature enabled, - * HIF should release copy engine related resource information to IPA UC - * IPA UC will access hardware resource with released information - * - * Return: None - */ -void hif_ipa_get_ce_resource(struct ol_softc *scn, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - struct HIF_CE_pipe_info *pipe_info = - &(hif_state->pipe_info[HIF_PCI_IPA_UC_ASSIGNED_CE]); - struct CE_handle *ce_hdl = pipe_info->ce_hdl; - - ce_ipa_get_resource(ce_hdl, ce_sr_base_paddr, ce_sr_ring_size, - ce_reg_paddr); - return; -} -#endif /* IPA_OFFLOAD */ - - -#ifdef ADRASTEA_SHADOW_REGISTERS - -/* - Current shadow register config - - ----------------------------------------------------------- - Shadow Register | CE | src/dst write index - ----------------------------------------------------------- - 0 | 0 | src - 1 No Config - Doesn't point to anything - 2 No Config - Doesn't point to anything - 3 | 3 | src - 4 | 4 | src - 5 | 5 | src - 6 No Config - Doesn't point to anything - 7 | 7 | src - 8 No Config - Doesn't point to anything - 9 No Config - Doesn't point to anything - 10 No Config - Doesn't point to anything - 11 No Config - Doesn't point to anything - ----------------------------------------------------------- - 12 No Config - Doesn't point to anything - 13 | 1 | dst - 14 | 2 | dst - 15 No Config - Doesn't point to anything - 16 No Config - Doesn't point to anything - 17 No Config - Doesn't point to anything - 18 No Config - Doesn't point to anything - 19 | 7 | dst - 20 | 8 | dst - 21 No Config - Doesn't point to anything - 22 No Config - Doesn't point to anything - 23 No Config - Doesn't point to anything - ----------------------------------------------------------- - - - ToDo - Move shadow register config to following in the future - This helps free up a block of shadow registers towards the end. - Can be used for other purposes - - ----------------------------------------------------------- - Shadow Register | CE | src/dst write index - ----------------------------------------------------------- - 0 | 0 | src - 1 | 3 | src - 2 | 4 | src - 3 | 5 | src - 4 | 7 | src - ----------------------------------------------------------- - 5 | 1 | dst - 6 | 2 | dst - 7 | 7 | dst - 8 | 8 | dst - ----------------------------------------------------------- - 9 No Config - Doesn't point to anything - 12 No Config - Doesn't point to anything - 13 No Config - Doesn't point to anything - 14 No Config - Doesn't point to anything - 15 No Config - Doesn't point to anything - 16 No Config - Doesn't point to anything - 17 No Config - Doesn't point to anything - 18 No Config - Doesn't point to anything - 19 No Config - Doesn't point to anything - 20 No Config - Doesn't point to anything - 21 No Config - Doesn't point to anything - 22 No Config - Doesn't point to anything - 23 No Config - Doesn't point to anything - ----------------------------------------------------------- -*/ - -u32 shadow_sr_wr_ind_addr(struct ol_softc *scn, u32 ctrl_addr) -{ - u32 addr = 0; - - switch (COPY_ENGINE_ID(ctrl_addr)) { - case 0: - addr = SHADOW_VALUE0; - break; - case 3: - addr = SHADOW_VALUE3; - break; - case 4: - addr = SHADOW_VALUE4; - break; - case 5: - addr = SHADOW_VALUE5; - break; - case 7: - addr = SHADOW_VALUE7; - break; - default: - HIF_ERROR("invalid CE ctrl_addr\n"); - CDF_ASSERT(0); - - } - return addr; - -} - -u32 shadow_dst_wr_ind_addr(struct ol_softc *scn, u32 ctrl_addr) -{ - u32 addr = 0; - - switch (COPY_ENGINE_ID(ctrl_addr)) { - case 1: - addr = SHADOW_VALUE13; - break; - case 2: - addr = SHADOW_VALUE14; - break; - case 7: - addr = SHADOW_VALUE19; - break; - case 8: - addr = SHADOW_VALUE20; - break; - default: - HIF_ERROR("invalid CE ctrl_addr\n"); - CDF_ASSERT(0); - } - - return addr; - -} -#endif - -#if defined(FEATURE_LRO) -/** - * ce_lro_flush_cb_register() - register the LRO flush - * callback - * @scn: HIF context - * @handler: callback function - * @data: opaque data pointer to be passed back - * - * Store the LRO flush callback provided - * - * Return: none - */ -void ce_lro_flush_cb_register(struct ol_softc *scn, - void (handler)(void *), void *data) -{ - uint8_t ul, dl; - int ul_polled, dl_polled; - - CDF_ASSERT(scn != NULL); - - if (CDF_STATUS_SUCCESS != - hif_map_service_to_pipe(scn, HTT_DATA_MSG_SVC, - &ul, &dl, &ul_polled, &dl_polled)) { - printk("%s cannot map service to pipe\n", __FUNCTION__); - return; - } else { - struct CE_state *ce_state; - ce_state = scn->ce_id_to_state[dl]; - ce_state->lro_flush_cb = handler; - ce_state->lro_data = data; - } -} - -/** - * ce_lro_flush_cb_deregister() - deregister the LRO flush - * callback - * @scn: HIF context - * - * Remove the LRO flush callback - * - * Return: none - */ -void ce_lro_flush_cb_deregister(struct ol_softc *scn) -{ - uint8_t ul, dl; - int ul_polled, dl_polled; - - CDF_ASSERT(scn != NULL); - - if (CDF_STATUS_SUCCESS != - hif_map_service_to_pipe(scn, HTT_DATA_MSG_SVC, - &ul, &dl, &ul_polled, &dl_polled)) { - printk("%s cannot map service to pipe\n", __FUNCTION__); - return; - } else { - struct CE_state *ce_state; - ce_state = scn->ce_id_to_state[dl]; - ce_state->lro_flush_cb = NULL; - ce_state->lro_data = NULL; - } -} -#endif - -/** - * hif_map_service_to_pipe() - returns the ce ids pertaining to - * this service - * @scn: ol_softc pointer. - * @svc_id: Service ID for which the mapping is needed. - * @ul_pipe: address of the container in which ul pipe is returned. - * @dl_pipe: address of the container in which dl pipe is returned. - * @ul_is_polled: address of the container in which a bool - * indicating if the UL CE for this service - * is polled is returned. - * @dl_is_polled: address of the container in which a bool - * indicating if the DL CE for this service - * is polled is returned. - * - * Return: Indicates whether this operation was successful. - */ - -int hif_map_service_to_pipe(struct ol_softc *scn, uint16_t svc_id, - uint8_t *ul_pipe, uint8_t *dl_pipe, int *ul_is_polled, - int *dl_is_polled) -{ - int status = CDF_STATUS_SUCCESS; - - unsigned int i; - struct service_to_pipe element; - - struct service_to_pipe *tgt_svc_map_to_use; - size_t sz_tgt_svc_map_to_use; - - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { - tgt_svc_map_to_use = target_service_to_ce_map_wlan_epping; - sz_tgt_svc_map_to_use = - sizeof(target_service_to_ce_map_wlan_epping); - } else { - tgt_svc_map_to_use = target_service_to_ce_map_wlan; - sz_tgt_svc_map_to_use = sizeof(target_service_to_ce_map_wlan); - } - - *dl_is_polled = 0; /* polling for received messages not supported */ - - for (i = 0; i < (sz_tgt_svc_map_to_use/sizeof(element)); i++) { - - memcpy(&element, &tgt_svc_map_to_use[i], sizeof(element)); - if (element.service_id == svc_id) { - - if (element.pipedir == PIPEDIR_OUT) - *ul_pipe = element.pipenum; - - else if (element.pipedir == PIPEDIR_IN) - *dl_pipe = element.pipenum; - } - } - - *ul_is_polled = - (host_ce_config[*ul_pipe].flags & CE_ATTR_DISABLE_INTR) != 0; - - return status; -} - -#ifdef SHADOW_REG_DEBUG -inline uint32_t DEBUG_CE_SRC_RING_READ_IDX_GET(struct ol_softc *scn, - uint32_t CE_ctrl_addr) -{ - uint32_t read_from_hw, srri_from_ddr = 0; - - read_from_hw = A_TARGET_READ(scn, CE_ctrl_addr + CURRENT_SRRI_ADDRESS); - - srri_from_ddr = SRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr)); - - if (read_from_hw != srri_from_ddr) { - HIF_ERROR("error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x\n", - srri_from_ddr, read_from_hw, - CE_MISC_INT_STATUS_GET(scn, CE_ctrl_addr)); - CDF_ASSERT(0); - } - return srri_from_ddr; -} - - -inline uint32_t DEBUG_CE_DEST_RING_READ_IDX_GET(struct ol_softc *scn, - uint32_t CE_ctrl_addr) -{ - uint32_t read_from_hw, drri_from_ddr = 0; - - read_from_hw = A_TARGET_READ(scn, CE_ctrl_addr + CURRENT_DRRI_ADDRESS); - - drri_from_ddr = DRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr)); - - if (read_from_hw != drri_from_ddr) { - HIF_ERROR("error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x\n", - drri_from_ddr, read_from_hw, - CE_MISC_INT_STATUS_GET(scn, CE_ctrl_addr)); - CDF_ASSERT(0); - } - return drri_from_ddr; -} - -#endif - -#ifdef ADRASTEA_RRI_ON_DDR -/** - * hif_get_src_ring_read_index(): Called to get the SRRI - * - * @scn: ol_softc pointer - * @CE_ctrl_addr: base address of the CE whose RRI is to be read - * - * This function returns the SRRI to the caller. For CEs that - * dont have interrupts enabled, we look at the DDR based SRRI - * - * Return: SRRI - */ -inline unsigned int hif_get_src_ring_read_index(struct ol_softc *scn, - uint32_t CE_ctrl_addr) -{ - struct CE_attr attr; - - attr = host_ce_config[COPY_ENGINE_ID(CE_ctrl_addr)]; - if (attr.flags & CE_ATTR_DISABLE_INTR) - return CE_SRC_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr); - else - return A_TARGET_READ(scn, - (CE_ctrl_addr) + CURRENT_SRRI_ADDRESS); -} - -/** - * hif_get_dst_ring_read_index(): Called to get the DRRI - * - * @scn: ol_softc pointer - * @CE_ctrl_addr: base address of the CE whose RRI is to be read - * - * This function returns the DRRI to the caller. For CEs that - * dont have interrupts enabled, we look at the DDR based DRRI - * - * Return: DRRI - */ -inline unsigned int hif_get_dst_ring_read_index(struct ol_softc *scn, - uint32_t CE_ctrl_addr) -{ - struct CE_attr attr; - - attr = host_ce_config[COPY_ENGINE_ID(CE_ctrl_addr)]; - - if (attr.flags & CE_ATTR_DISABLE_INTR) - return CE_DEST_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr); - else - return A_TARGET_READ(scn, - (CE_ctrl_addr) + CURRENT_DRRI_ADDRESS); -} - -/** - * hif_config_rri_on_ddr(): Configure the RRI on DDR mechanism - * - * @scn: ol_softc pointer - * - * This function allocates non cached memory on ddr and sends - * the physical address of this memory to the CE hardware. The - * hardware updates the RRI on this particular location. - * - * Return: None - */ -static inline void hif_config_rri_on_ddr(struct ol_softc *scn) -{ - unsigned int i; - cdf_dma_addr_t paddr_rri_on_ddr; - uint32_t high_paddr, low_paddr; - scn->vaddr_rri_on_ddr = - (uint32_t *)cdf_os_mem_alloc_consistent(scn->cdf_dev, - (CE_COUNT*sizeof(uint32_t)), &paddr_rri_on_ddr, 0); - - low_paddr = BITS0_TO_31(paddr_rri_on_ddr); - high_paddr = BITS32_TO_35(paddr_rri_on_ddr); - - HIF_ERROR("%s using srri and drri from DDR\n", __func__); - - WRITE_CE_DDR_ADDRESS_FOR_RRI_LOW(scn, low_paddr); - WRITE_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn, high_paddr); - - for (i = 0; i < CE_COUNT; i++) - CE_IDX_UPD_EN_SET(scn, CE_BASE_ADDRESS(i)); - - cdf_mem_zero(scn->vaddr_rri_on_ddr, CE_COUNT*sizeof(uint32_t)); - - return; -} -#else - -/** - * hif_config_rri_on_ddr(): Configure the RRI on DDR mechanism - * - * @scn: ol_softc pointer - * - * This is a dummy implementation for platforms that don't - * support this functionality. - * - * Return: None - */ -static inline void hif_config_rri_on_ddr(struct ol_softc *scn) -{ - return; -} -#endif - -/** - * hif_dump_ce_registers() - dump ce registers - * @scn: ol_softc pointer. - * - * Output the copy engine registers - * - * Return: 0 for success or error code - */ -int hif_dump_ce_registers(struct ol_softc *scn) -{ - uint32_t ce_reg_address = CE0_BASE_ADDRESS; - uint32_t ce_reg_values[8][CE_USEFUL_SIZE >> 2]; - uint32_t ce_reg_word_size = CE_USEFUL_SIZE >> 2; - uint16_t i, j; - - for (i = 0; i < 8; i++, ce_reg_address += CE_OFFSET) { - if (hif_diag_read_mem(scn, ce_reg_address, - (uint8_t *) &ce_reg_values[i][0], ce_reg_word_size * - sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { - HIF_ERROR("Dumping CE register failed!"); - return -EACCES; - } - } - - for (i = 0; i < 8; i++) { - HIF_ERROR("CE%d Registers:", i); - for (j = 0; j < ce_reg_word_size; j++) { - HIF_ERROR("0x%08x ", ce_reg_values[i][j]); - if (!((j + 1) % 5) || (ce_reg_word_size - 1) == j) - HIF_ERROR(" "); - } - } - - return 0; -} diff --git a/core/hif/src/ce/ce_main.h b/core/hif/src/ce/ce_main.h deleted file mode 100644 index 2e3240715881..000000000000 --- a/core/hif/src/ce/ce_main.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __CE_H__ -#define __CE_H__ - -#include "cdf_atomic.h" -#include "cdf_lock.h" -#include "hif.h" - -#define CE_HTT_T2H_MSG 1 -#define CE_HTT_H2T_MSG 4 - -#define CE_OFFSET 0x00000400 -#define CE_USEFUL_SIZE 0x00000058 - -/** - * enum ce_id_type - * - * @ce_id_type: Copy engine ID - */ -enum ce_id_type { - CE_ID_0, - CE_ID_1, - CE_ID_2, - CE_ID_3, - CE_ID_4, - CE_ID_5, - CE_ID_6, - CE_ID_7, - CE_ID_8, - CE_ID_9, - CE_ID_10, - CE_ID_11, - CE_ID_MAX -}; - -enum ol_ath_hif_pkt_ecodes { - HIF_PIPE_NO_RESOURCE = 0 -}; - -struct HIF_CE_state; - -/* Per-pipe state. */ -struct HIF_CE_pipe_info { - /* Handle of underlying Copy Engine */ - struct CE_handle *ce_hdl; - - /* Our pipe number; facilitiates use of pipe_info ptrs. */ - uint8_t pipe_num; - - /* Convenience back pointer to HIF_CE_state. */ - struct HIF_CE_state *HIF_CE_state; - - /* Instantaneous number of receive buffers that should be posted */ - atomic_t recv_bufs_needed; - cdf_size_t buf_sz; - cdf_spinlock_t recv_bufs_needed_lock; - - cdf_spinlock_t completion_freeq_lock; - /* Limit the number of outstanding send requests. */ - int num_sends_allowed; - - /* adding three counts for debugging ring buffer errors */ - uint32_t nbuf_alloc_err_count; - uint32_t nbuf_dma_err_count; - uint32_t nbuf_ce_enqueue_err_count; -}; - -/** - * struct ce_tasklet_entry - * - * @intr_tq: intr_tq - * @ce_id: ce_id - * @inited: inited - * @hif_ce_state: hif_ce_state - * @from_irq: from_irq - */ -struct ce_tasklet_entry { - struct tasklet_struct intr_tq; - enum ce_id_type ce_id; - bool inited; - void *hif_ce_state; -}; - -struct HIF_CE_state { - struct ol_softc *scn; - bool started; - struct ce_tasklet_entry tasklets[CE_COUNT_MAX]; - cdf_spinlock_t keep_awake_lock; - unsigned int keep_awake_count; - bool verified_awake; - bool fake_sleep; - cdf_softirq_timer_t sleep_timer; - bool sleep_timer_init; - unsigned long sleep_ticks; - - /* Per-pipe state. */ - struct HIF_CE_pipe_info pipe_info[CE_COUNT_MAX]; - /* to be activated after BMI_DONE */ - struct hif_msg_callbacks msg_callbacks_pending; - /* current msg callbacks in use */ - struct hif_msg_callbacks msg_callbacks_current; - - /* Target address used to signal a pending firmware event */ - uint32_t fw_indicator_address; - - /* Copy Engine used for Diagnostic Accesses */ - struct CE_handle *ce_diag; -}; -int hif_dump_ce_registers(struct ol_softc *scn); -#endif /* __CE_H__ */ diff --git a/core/hif/src/ce/ce_reg.h b/core/hif/src/ce/ce_reg.h deleted file mode 100644 index dc4ea6289409..000000000000 --- a/core/hif/src/ce/ce_reg.h +++ /dev/null @@ -1,544 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __CE_REG_H__ -#define __CE_REG_H__ - -#define COPY_ENGINE_ID(COPY_ENGINE_BASE_ADDRESS) ((COPY_ENGINE_BASE_ADDRESS \ - - CE0_BASE_ADDRESS)/(CE1_BASE_ADDRESS - CE0_BASE_ADDRESS)) - -#define DST_WR_INDEX_ADDRESS (scn->target_ce_def->d_DST_WR_INDEX_ADDRESS) -#define SRC_WATERMARK_ADDRESS (scn->target_ce_def->d_SRC_WATERMARK_ADDRESS) -#define SRC_WATERMARK_LOW_MASK (scn->target_ce_def->d_SRC_WATERMARK_LOW_MASK) -#define SRC_WATERMARK_HIGH_MASK (scn->target_ce_def->d_SRC_WATERMARK_HIGH_MASK) -#define DST_WATERMARK_LOW_MASK (scn->target_ce_def->d_DST_WATERMARK_LOW_MASK) -#define DST_WATERMARK_HIGH_MASK (scn->target_ce_def->d_DST_WATERMARK_HIGH_MASK) -#define CURRENT_SRRI_ADDRESS (scn->target_ce_def->d_CURRENT_SRRI_ADDRESS) -#define CURRENT_DRRI_ADDRESS (scn->target_ce_def->d_CURRENT_DRRI_ADDRESS) - -#define SHADOW_VALUE0 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_0) -#define SHADOW_VALUE1 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_1) -#define SHADOW_VALUE2 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_2) -#define SHADOW_VALUE3 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_3) -#define SHADOW_VALUE4 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_4) -#define SHADOW_VALUE5 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_5) -#define SHADOW_VALUE6 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_6) -#define SHADOW_VALUE7 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_7) -#define SHADOW_VALUE8 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_8) -#define SHADOW_VALUE9 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_9) -#define SHADOW_VALUE10 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_10) -#define SHADOW_VALUE11 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_11) -#define SHADOW_VALUE12 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_12) -#define SHADOW_VALUE13 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_13) -#define SHADOW_VALUE14 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_14) -#define SHADOW_VALUE15 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_15) -#define SHADOW_VALUE16 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_16) -#define SHADOW_VALUE17 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_17) -#define SHADOW_VALUE18 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_18) -#define SHADOW_VALUE19 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_19) -#define SHADOW_VALUE20 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_20) -#define SHADOW_VALUE21 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_21) -#define SHADOW_VALUE22 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_22) -#define SHADOW_VALUE23 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_VALUE_23) -#define SHADOW_ADDRESS0 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_0) -#define SHADOW_ADDRESS1 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_1) -#define SHADOW_ADDRESS2 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_2) -#define SHADOW_ADDRESS3 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_3) -#define SHADOW_ADDRESS4 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_4) -#define SHADOW_ADDRESS5 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_5) -#define SHADOW_ADDRESS6 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_6) -#define SHADOW_ADDRESS7 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_7) -#define SHADOW_ADDRESS8 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_8) -#define SHADOW_ADDRESS9 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_9) -#define SHADOW_ADDRESS10 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_10) -#define SHADOW_ADDRESS11 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_11) -#define SHADOW_ADDRESS12 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_12) -#define SHADOW_ADDRESS13 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_13) -#define SHADOW_ADDRESS14 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_14) -#define SHADOW_ADDRESS15 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_15) -#define SHADOW_ADDRESS16 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_16) -#define SHADOW_ADDRESS17 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_17) -#define SHADOW_ADDRESS18 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_18) -#define SHADOW_ADDRESS19 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_19) -#define SHADOW_ADDRESS20 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_20) -#define SHADOW_ADDRESS21 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_21) -#define SHADOW_ADDRESS22 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_22) -#define SHADOW_ADDRESS23 (scn->host_shadow_regs->d_A_LOCAL_SHADOW_REG_ADDRESS_23) - -#define SHADOW_ADDRESS(i) (SHADOW_ADDRESS0 + i*(SHADOW_ADDRESS1-SHADOW_ADDRESS0)) - -#define HOST_IS_SRC_RING_HIGH_WATERMARK_MASK \ - (scn->target_ce_def->d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK) -#define HOST_IS_SRC_RING_LOW_WATERMARK_MASK \ - (scn->target_ce_def->d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK) -#define HOST_IS_DST_RING_HIGH_WATERMARK_MASK \ - (scn->target_ce_def->d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK) -#define HOST_IS_DST_RING_LOW_WATERMARK_MASK \ - (scn->target_ce_def->d_HOST_IS_DST_RING_LOW_WATERMARK_MASK) -#define MISC_IS_ADDRESS (scn->target_ce_def->d_MISC_IS_ADDRESS) -#define HOST_IS_COPY_COMPLETE_MASK \ - (scn->target_ce_def->d_HOST_IS_COPY_COMPLETE_MASK) -#define CE_WRAPPER_BASE_ADDRESS (scn->target_ce_def->d_CE_WRAPPER_BASE_ADDRESS) -#define CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS \ - (scn->target_ce_def->d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS) -#define CE_DDR_ADDRESS_FOR_RRI_LOW \ - (scn->target_ce_def->d_CE_DDR_ADDRESS_FOR_RRI_LOW) -#define CE_DDR_ADDRESS_FOR_RRI_HIGH \ - (scn->target_ce_def->d_CE_DDR_ADDRESS_FOR_RRI_HIGH) -#define HOST_IE_COPY_COMPLETE_MASK \ - (scn->target_ce_def->d_HOST_IE_COPY_COMPLETE_MASK) -#define SR_BA_ADDRESS (scn->target_ce_def->d_SR_BA_ADDRESS) -#define SR_BA_ADDRESS_HIGH (scn->target_ce_def->d_SR_BA_ADDRESS_HIGH) -#define SR_SIZE_ADDRESS (scn->target_ce_def->d_SR_SIZE_ADDRESS) -#define CE_CTRL1_ADDRESS (scn->target_ce_def->d_CE_CTRL1_ADDRESS) -#define CE_CTRL1_DMAX_LENGTH_MASK \ - (scn->target_ce_def->d_CE_CTRL1_DMAX_LENGTH_MASK) -#define DR_BA_ADDRESS (scn->target_ce_def->d_DR_BA_ADDRESS) -#define DR_BA_ADDRESS_HIGH (scn->target_ce_def->d_DR_BA_ADDRESS_HIGH) -#define DR_SIZE_ADDRESS (scn->target_ce_def->d_DR_SIZE_ADDRESS) -#define CE_CMD_REGISTER (scn->target_ce_def->d_CE_CMD_REGISTER) -#define CE_MSI_ADDRESS (scn->target_ce_def->d_CE_MSI_ADDRESS) -#define CE_MSI_ADDRESS_HIGH (scn->target_ce_def->d_CE_MSI_ADDRESS_HIGH) -#define CE_MSI_DATA (scn->target_ce_def->d_CE_MSI_DATA) -#define CE_MSI_ENABLE_BIT (scn->target_ce_def->d_CE_MSI_ENABLE_BIT) -#define MISC_IE_ADDRESS (scn->target_ce_def->d_MISC_IE_ADDRESS) -#define MISC_IS_AXI_ERR_MASK (scn->target_ce_def->d_MISC_IS_AXI_ERR_MASK) -#define MISC_IS_DST_ADDR_ERR_MASK \ - (scn->target_ce_def->d_MISC_IS_DST_ADDR_ERR_MASK) -#define MISC_IS_SRC_LEN_ERR_MASK \ - (scn->target_ce_def->d_MISC_IS_SRC_LEN_ERR_MASK) -#define MISC_IS_DST_MAX_LEN_VIO_MASK \ - (scn->target_ce_def->d_MISC_IS_DST_MAX_LEN_VIO_MASK) -#define MISC_IS_DST_RING_OVERFLOW_MASK \ - (scn->target_ce_def->d_MISC_IS_DST_RING_OVERFLOW_MASK) -#define MISC_IS_SRC_RING_OVERFLOW_MASK \ - (scn->target_ce_def->d_MISC_IS_SRC_RING_OVERFLOW_MASK) -#define SRC_WATERMARK_LOW_LSB (scn->target_ce_def->d_SRC_WATERMARK_LOW_LSB) -#define SRC_WATERMARK_HIGH_LSB (scn->target_ce_def->d_SRC_WATERMARK_HIGH_LSB) -#define DST_WATERMARK_LOW_LSB (scn->target_ce_def->d_DST_WATERMARK_LOW_LSB) -#define DST_WATERMARK_HIGH_LSB (scn->target_ce_def->d_DST_WATERMARK_HIGH_LSB) -#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK \ - (scn->target_ce_def->d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK) -#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB \ - (scn->target_ce_def->d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB) -#define CE_CTRL1_DMAX_LENGTH_LSB (scn->target_ce_def->d_CE_CTRL1_DMAX_LENGTH_LSB) -#define CE_CTRL1_IDX_UPD_EN (scn->target_ce_def->d_CE_CTRL1_IDX_UPD_EN_MASK) -#define CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK \ - (scn->target_ce_def->d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK) -#define CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK \ - (scn->target_ce_def->d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK) -#define CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB \ - (scn->target_ce_def->d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB) -#define CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB \ - (scn->target_ce_def->d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB) -#define WLAN_DEBUG_INPUT_SEL_OFFSET \ - (scn->targetdef->d_WLAN_DEBUG_INPUT_SEL_OFFSET) -#define WLAN_DEBUG_INPUT_SEL_SRC_MSB \ - (scn->targetdef->d_WLAN_DEBUG_INPUT_SEL_SRC_MSB) -#define WLAN_DEBUG_INPUT_SEL_SRC_LSB \ - (scn->targetdef->d_WLAN_DEBUG_INPUT_SEL_SRC_LSB) -#define WLAN_DEBUG_INPUT_SEL_SRC_MASK \ - (scn->targetdef->d_WLAN_DEBUG_INPUT_SEL_SRC_MASK) -#define WLAN_DEBUG_CONTROL_OFFSET (scn->targetdef->d_WLAN_DEBUG_CONTROL_OFFSET) -#define WLAN_DEBUG_CONTROL_ENABLE_MSB \ - (scn->targetdef->d_WLAN_DEBUG_CONTROL_ENABLE_MSB) -#define WLAN_DEBUG_CONTROL_ENABLE_LSB \ - (scn->targetdef->d_WLAN_DEBUG_CONTROL_ENABLE_LSB) -#define WLAN_DEBUG_CONTROL_ENABLE_MASK \ - (scn->targetdef->d_WLAN_DEBUG_CONTROL_ENABLE_MASK) -#define WLAN_DEBUG_OUT_OFFSET (scn->targetdef->d_WLAN_DEBUG_OUT_OFFSET) -#define WLAN_DEBUG_OUT_DATA_MSB (scn->targetdef->d_WLAN_DEBUG_OUT_DATA_MSB) -#define WLAN_DEBUG_OUT_DATA_LSB (scn->targetdef->d_WLAN_DEBUG_OUT_DATA_LSB) -#define WLAN_DEBUG_OUT_DATA_MASK (scn->targetdef->d_WLAN_DEBUG_OUT_DATA_MASK) -#define AMBA_DEBUG_BUS_OFFSET (scn->targetdef->d_AMBA_DEBUG_BUS_OFFSET) -#define AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB \ - (scn->targetdef->d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB) -#define AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB \ - (scn->targetdef->d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB) -#define AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK \ - (scn->targetdef->d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK) -#define AMBA_DEBUG_BUS_SEL_MSB (scn->targetdef->d_AMBA_DEBUG_BUS_SEL_MSB) -#define AMBA_DEBUG_BUS_SEL_LSB (scn->targetdef->d_AMBA_DEBUG_BUS_SEL_LSB) -#define AMBA_DEBUG_BUS_SEL_MASK (scn->targetdef->d_AMBA_DEBUG_BUS_SEL_MASK) -#define CE_WRAPPER_DEBUG_OFFSET (scn->target_ce_def->d_CE_WRAPPER_DEBUG_OFFSET) -#define CE_WRAPPER_DEBUG_SEL_MSB (scn->target_ce_def->d_CE_WRAPPER_DEBUG_SEL_MSB) -#define CE_WRAPPER_DEBUG_SEL_LSB (scn->target_ce_def->d_CE_WRAPPER_DEBUG_SEL_LSB) -#define CE_WRAPPER_DEBUG_SEL_MASK (scn->target_ce_def->d_CE_WRAPPER_DEBUG_SEL_MASK) -#define CE_DEBUG_OFFSET (scn->target_ce_def->d_CE_DEBUG_OFFSET) -#define CE_DEBUG_SEL_MSB (scn->target_ce_def->d_CE_DEBUG_SEL_MSB) -#define CE_DEBUG_SEL_LSB (scn->target_ce_def->d_CE_DEBUG_SEL_LSB) -#define CE_DEBUG_SEL_MASK (scn->target_ce_def->d_CE_DEBUG_SEL_MASK) -#define HOST_IE_ADDRESS (scn->target_ce_def->d_HOST_IE_ADDRESS) -#define HOST_IS_ADDRESS (scn->target_ce_def->d_HOST_IS_ADDRESS) - -#define SRC_WATERMARK_LOW_SET(x) \ - (((x) << SRC_WATERMARK_LOW_LSB) & SRC_WATERMARK_LOW_MASK) -#define SRC_WATERMARK_HIGH_SET(x) \ - (((x) << SRC_WATERMARK_HIGH_LSB) & SRC_WATERMARK_HIGH_MASK) -#define DST_WATERMARK_LOW_SET(x) \ - (((x) << DST_WATERMARK_LOW_LSB) & DST_WATERMARK_LOW_MASK) -#define DST_WATERMARK_HIGH_SET(x) \ - (((x) << DST_WATERMARK_HIGH_LSB) & DST_WATERMARK_HIGH_MASK) -#define CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_GET(x) \ - (((x) & CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK) >> \ - CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB) -#define CE_CTRL1_DMAX_LENGTH_SET(x) \ - (((x) << CE_CTRL1_DMAX_LENGTH_LSB) & CE_CTRL1_DMAX_LENGTH_MASK) -#define CE_CTRL1_SRC_RING_BYTE_SWAP_EN_SET(x) \ - (((x) << CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB) & \ - CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK) -#define CE_CTRL1_DST_RING_BYTE_SWAP_EN_SET(x) \ - (((x) << CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB) & \ - CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK) -#define WLAN_DEBUG_INPUT_SEL_SRC_GET(x) \ - (((x) & WLAN_DEBUG_INPUT_SEL_SRC_MASK) >> \ - WLAN_DEBUG_INPUT_SEL_SRC_LSB) -#define WLAN_DEBUG_INPUT_SEL_SRC_SET(x) \ - (((x) << WLAN_DEBUG_INPUT_SEL_SRC_LSB) & \ - WLAN_DEBUG_INPUT_SEL_SRC_MASK) -#define WLAN_DEBUG_CONTROL_ENABLE_GET(x) \ - (((x) & WLAN_DEBUG_CONTROL_ENABLE_MASK) >> \ - WLAN_DEBUG_CONTROL_ENABLE_LSB) -#define WLAN_DEBUG_CONTROL_ENABLE_SET(x) \ - (((x) << WLAN_DEBUG_CONTROL_ENABLE_LSB) & \ - WLAN_DEBUG_CONTROL_ENABLE_MASK) -#define WLAN_DEBUG_OUT_DATA_GET(x) \ - (((x) & WLAN_DEBUG_OUT_DATA_MASK) >> WLAN_DEBUG_OUT_DATA_LSB) -#define WLAN_DEBUG_OUT_DATA_SET(x) \ - (((x) << WLAN_DEBUG_OUT_DATA_LSB) & WLAN_DEBUG_OUT_DATA_MASK) -#define AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_GET(x) \ - (((x) & AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK) >> \ - AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB) -#define AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_SET(x) \ - (((x) << AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB) & \ - AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK) -#define AMBA_DEBUG_BUS_SEL_GET(x) \ - (((x) & AMBA_DEBUG_BUS_SEL_MASK) >> AMBA_DEBUG_BUS_SEL_LSB) -#define AMBA_DEBUG_BUS_SEL_SET(x) \ - (((x) << AMBA_DEBUG_BUS_SEL_LSB) & AMBA_DEBUG_BUS_SEL_MASK) -#define CE_WRAPPER_DEBUG_SEL_GET(x) \ - (((x) & CE_WRAPPER_DEBUG_SEL_MASK) >> CE_WRAPPER_DEBUG_SEL_LSB) -#define CE_WRAPPER_DEBUG_SEL_SET(x) \ - (((x) << CE_WRAPPER_DEBUG_SEL_LSB) & CE_WRAPPER_DEBUG_SEL_MASK) -#define CE_DEBUG_SEL_GET(x) (((x) & CE_DEBUG_SEL_MASK) >> CE_DEBUG_SEL_LSB) -#define CE_DEBUG_SEL_SET(x) (((x) << CE_DEBUG_SEL_LSB) & CE_DEBUG_SEL_MASK) - -uint32_t DEBUG_CE_SRC_RING_READ_IDX_GET(struct ol_softc *scn, - uint32_t CE_ctrl_addr); -uint32_t DEBUG_CE_DEST_RING_READ_IDX_GET(struct ol_softc *scn, - uint32_t CE_ctrl_addr); - -#define BITS0_TO_31(val) ((uint32_t)((uint64_t)(paddr_rri_on_ddr)\ - & (uint64_t)(0xFFFFFFFF))) -#define BITS32_TO_35(val) ((uint32_t)(((uint64_t)(paddr_rri_on_ddr)\ - & (uint64_t)(0xF00000000))>>32)) - -#define VADDR_FOR_CE(scn, CE_ctrl_addr)\ - ((uint32_t *)((uint64_t)(scn->vaddr_rri_on_ddr) + \ - COPY_ENGINE_ID(CE_ctrl_addr)*sizeof(uint32_t))) - -#define SRRI_FROM_DDR_ADDR(addr) ((*(addr)) & 0xFFFF) -#define DRRI_FROM_DDR_ADDR(addr) (((*(addr))>>16) & 0xFFFF) - -#ifdef ADRASTEA_RRI_ON_DDR -#ifdef SHADOW_REG_DEBUG -#define CE_SRC_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr)\ - DEBUG_CE_SRC_RING_READ_IDX_GET(scn, CE_ctrl_addr) -#define CE_DEST_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr)\ - DEBUG_CE_DEST_RING_READ_IDX_GET(scn, CE_ctrl_addr) -#else -#define CE_SRC_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr)\ - SRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr)) -#define CE_DEST_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr)\ - DRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr)) -#endif - -unsigned int hif_get_src_ring_read_index(struct ol_softc *scn, - uint32_t CE_ctrl_addr); -unsigned int hif_get_dst_ring_read_index(struct ol_softc *scn, - uint32_t CE_ctrl_addr); - -#define CE_SRC_RING_READ_IDX_GET(scn, CE_ctrl_addr)\ - hif_get_src_ring_read_index(scn, CE_ctrl_addr) -#define CE_DEST_RING_READ_IDX_GET(scn, CE_ctrl_addr)\ - hif_get_dst_ring_read_index(scn, CE_ctrl_addr) -#else -#define CE_SRC_RING_READ_IDX_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + CURRENT_SRRI_ADDRESS) -#define CE_DEST_RING_READ_IDX_GET(scn, CE_ctrl_addr)\ - A_TARGET_READ(scn, (CE_ctrl_addr) + CURRENT_DRRI_ADDRESS) - -/** - * if RRI on DDR is not enabled, get idx from ddr defaults to - * using the register value & force wake must be used for - * non interrupt processing. - */ -#define CE_SRC_RING_READ_IDX_GET_FROM_DDR(scn, CE_ctrl_addr)\ - A_TARGET_READ(scn, (CE_ctrl_addr) + CURRENT_SRRI_ADDRESS) - -#endif - -#define CE_SRC_RING_BASE_ADDR_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SR_BA_ADDRESS, (addr)) - -#define CE_SRC_RING_BASE_ADDR_HIGH_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SR_BA_ADDRESS_HIGH, (addr)) - -#define CE_SRC_RING_BASE_ADDR_HIGH_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + SR_BA_ADDRESS_HIGH) - -#define CE_SRC_RING_SZ_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SR_SIZE_ADDRESS, (n)) - -#define CE_SRC_RING_DMAX_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS, \ - (A_TARGET_READ(scn, (CE_ctrl_addr) + \ - CE_CTRL1_ADDRESS) & ~CE_CTRL1_DMAX_LENGTH_MASK) | \ - CE_CTRL1_DMAX_LENGTH_SET(n)) - -#define CE_IDX_UPD_EN_SET(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS, \ - (A_TARGET_READ(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS) \ - | CE_CTRL1_IDX_UPD_EN)) - -#define CE_CMD_REGISTER_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + CE_CMD_REGISTER) - -#define CE_CMD_REGISTER_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CMD_REGISTER, n) - -#define CE_MSI_ADDR_LOW_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_MSI_ADDRESS, (addr)) - -#define CE_MSI_ADDR_HIGH_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_MSI_ADDRESS_HIGH, (addr)) - -#define CE_MSI_DATA_SET(scn, CE_ctrl_addr, data) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_MSI_DATA, (data)) - -#define CE_CTRL_REGISTER1_SET(scn, CE_ctrl_addr, val) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS, val) - -#define CE_CTRL_REGISTER1_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS) - -#define CE_SRC_RING_BYTE_SWAP_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + CE_CTRL1_ADDRESS, \ - (A_TARGET_READ((targid), \ - (CE_ctrl_addr) + CE_CTRL1_ADDRESS) \ - & ~CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK) | \ - CE_CTRL1_SRC_RING_BYTE_SWAP_EN_SET(n)) - -#define CE_DEST_RING_BYTE_SWAP_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr)+CE_CTRL1_ADDRESS, \ - (A_TARGET_READ((targid), \ - (CE_ctrl_addr) + CE_CTRL1_ADDRESS) \ - & ~CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK) | \ - CE_CTRL1_DST_RING_BYTE_SWAP_EN_SET(n)) - - -#define CE_DEST_RING_BASE_ADDR_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DR_BA_ADDRESS, (addr)) - -#define CE_DEST_RING_BASE_ADDR_HIGH_SET(scn, CE_ctrl_addr, addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DR_BA_ADDRESS_HIGH, (addr)) - -#define CE_DEST_RING_BASE_ADDR_HIGH_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + DR_BA_ADDRESS_HIGH) - -#define CE_DEST_RING_SZ_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DR_SIZE_ADDRESS, (n)) - -#define CE_SRC_RING_HIGHMARK_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SRC_WATERMARK_ADDRESS, \ - (A_TARGET_READ(scn, \ - (CE_ctrl_addr) + SRC_WATERMARK_ADDRESS) \ - & ~SRC_WATERMARK_HIGH_MASK) | \ - SRC_WATERMARK_HIGH_SET(n)) - -#define CE_SRC_RING_LOWMARK_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SRC_WATERMARK_ADDRESS, \ - (A_TARGET_READ(scn, \ - (CE_ctrl_addr) + SRC_WATERMARK_ADDRESS) \ - & ~SRC_WATERMARK_LOW_MASK) | \ - SRC_WATERMARK_LOW_SET(n)) - -#define CE_DEST_RING_HIGHMARK_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DST_WATERMARK_ADDRESS, \ - (A_TARGET_READ(scn, \ - (CE_ctrl_addr) + DST_WATERMARK_ADDRESS) \ - & ~DST_WATERMARK_HIGH_MASK) | \ - DST_WATERMARK_HIGH_SET(n)) - -#define CE_DEST_RING_LOWMARK_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DST_WATERMARK_ADDRESS, \ - (A_TARGET_READ(scn, \ - (CE_ctrl_addr) + DST_WATERMARK_ADDRESS) \ - & ~DST_WATERMARK_LOW_MASK) | \ - DST_WATERMARK_LOW_SET(n)) - -#define CE_COPY_COMPLETE_INTR_ENABLE(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + HOST_IE_ADDRESS, \ - A_TARGET_READ(scn, \ - (CE_ctrl_addr) + HOST_IE_ADDRESS) | \ - HOST_IE_COPY_COMPLETE_MASK) - -#define CE_COPY_COMPLETE_INTR_DISABLE(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + HOST_IE_ADDRESS, \ - A_TARGET_READ(scn, \ - (CE_ctrl_addr) + HOST_IE_ADDRESS) \ - & ~HOST_IE_COPY_COMPLETE_MASK) - -#define CE_BASE_ADDRESS(CE_id) \ - CE0_BASE_ADDRESS + ((CE1_BASE_ADDRESS - \ - CE0_BASE_ADDRESS)*(CE_id)) - -#define CE_WATERMARK_INTR_ENABLE(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + HOST_IE_ADDRESS, \ - A_TARGET_READ(scn, \ - (CE_ctrl_addr) + HOST_IE_ADDRESS) | \ - CE_WATERMARK_MASK) - -#define CE_WATERMARK_INTR_DISABLE(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + HOST_IE_ADDRESS, \ - A_TARGET_READ(scn, \ - (CE_ctrl_addr) + HOST_IE_ADDRESS) \ - & ~CE_WATERMARK_MASK) - -#define CE_ERROR_INTR_ENABLE(scn, CE_ctrl_addr) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + MISC_IE_ADDRESS, \ - A_TARGET_READ(scn, \ - (CE_ctrl_addr) + MISC_IE_ADDRESS) | CE_ERROR_MASK) - -#define CE_MISC_INT_STATUS_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + MISC_IS_ADDRESS) - -#define CE_ENGINE_INT_STATUS_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + HOST_IS_ADDRESS) - -#define CE_ENGINE_INT_STATUS_CLEAR(scn, CE_ctrl_addr, mask) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + HOST_IS_ADDRESS, (mask)) - -#define CE_WATERMARK_MASK (HOST_IS_SRC_RING_LOW_WATERMARK_MASK | \ - HOST_IS_SRC_RING_HIGH_WATERMARK_MASK | \ - HOST_IS_DST_RING_LOW_WATERMARK_MASK | \ - HOST_IS_DST_RING_HIGH_WATERMARK_MASK) - -#define CE_ERROR_MASK (MISC_IS_AXI_ERR_MASK | \ - MISC_IS_DST_ADDR_ERR_MASK | \ - MISC_IS_SRC_LEN_ERR_MASK | \ - MISC_IS_DST_MAX_LEN_VIO_MASK | \ - MISC_IS_DST_RING_OVERFLOW_MASK | \ - MISC_IS_SRC_RING_OVERFLOW_MASK) - -#define CE_SRC_RING_TO_DESC(baddr, idx) \ - (&(((struct CE_src_desc *)baddr)[idx])) -#define CE_DEST_RING_TO_DESC(baddr, idx) \ - (&(((struct CE_dest_desc *)baddr)[idx])) - -/* Ring arithmetic (modulus number of entries in ring, which is a pwr of 2). */ -#define CE_RING_DELTA(nentries_mask, fromidx, toidx) \ - (((int)(toidx)-(int)(fromidx)) & (nentries_mask)) - -#define CE_RING_IDX_INCR(nentries_mask, idx) \ - (((idx) + 1) & (nentries_mask)) - -#define CE_RING_IDX_ADD(nentries_mask, idx, num) \ - (((idx) + (num)) & (nentries_mask)) - -#define CE_INTERRUPT_SUMMARY(scn) \ - CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_GET( \ - A_TARGET_READ(scn, CE_WRAPPER_BASE_ADDRESS + \ - CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS)) - -#define READ_CE_DDR_ADDRESS_FOR_RRI_LOW(scn) \ - (A_TARGET_READ(scn, \ - CE_WRAPPER_BASE_ADDRESS + CE_DDR_ADDRESS_FOR_RRI_LOW)) - -#define READ_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn) \ - (A_TARGET_READ(scn, \ - CE_WRAPPER_BASE_ADDRESS + CE_DDR_ADDRESS_FOR_RRI_HIGH)) - -#define WRITE_CE_DDR_ADDRESS_FOR_RRI_LOW(scn, val) \ - (A_TARGET_WRITE(scn, \ - CE_WRAPPER_BASE_ADDRESS + CE_DDR_ADDRESS_FOR_RRI_LOW, \ - val)) - -#define WRITE_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn, val) \ - (A_TARGET_WRITE(scn, \ - CE_WRAPPER_BASE_ADDRESS + CE_DDR_ADDRESS_FOR_RRI_HIGH, \ - val)) - -/*Macro to increment CE packet errors*/ -#define OL_ATH_CE_PKT_ERROR_COUNT_INCR(_scn, _ce_ecode) \ - do { if (_ce_ecode == CE_RING_DELTA_FAIL) \ - (_scn->pkt_stats.ce_ring_delta_fail_count) \ - += 1; } while (0) - -/* Given a Copy Engine's ID, determine the interrupt number for that - * copy engine's interrupts. - */ -#define CE_ID_TO_INUM(id) (A_INUM_CE0_COPY_COMP_BASE + (id)) -#define CE_INUM_TO_ID(inum) ((inum) - A_INUM_CE0_COPY_COMP_BASE) -#define CE0_BASE_ADDRESS (scn->target_ce_def->d_CE0_BASE_ADDRESS) -#define CE1_BASE_ADDRESS (scn->target_ce_def->d_CE1_BASE_ADDRESS) - -#ifdef ADRASTEA_SHADOW_REGISTERS - -#define NUM_SHADOW_REGISTERS 24 - -u32 shadow_sr_wr_ind_addr(struct ol_softc *scn, u32 ctrl_addr); -u32 shadow_dst_wr_ind_addr(struct ol_softc *scn, u32 ctrl_addr); -#define CE_SRC_RING_WRITE_IDX_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, shadow_sr_wr_ind_addr(scn, CE_ctrl_addr), n) - -#define CE_SRC_RING_WRITE_IDX_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, shadow_sr_wr_ind_addr(scn, CE_ctrl_addr)) - -#define CE_DEST_RING_WRITE_IDX_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, shadow_dst_wr_ind_addr(scn, CE_ctrl_addr), n) - -#define CE_DEST_RING_WRITE_IDX_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, shadow_dst_wr_ind_addr(scn, CE_ctrl_addr)) - -#else - -#define CE_SRC_RING_WRITE_IDX_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + SR_WR_INDEX_ADDRESS, (n)) - -#define CE_SRC_RING_WRITE_IDX_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + SR_WR_INDEX_ADDRESS) - -#define CE_DEST_RING_WRITE_IDX_SET(scn, CE_ctrl_addr, n) \ - A_TARGET_WRITE(scn, (CE_ctrl_addr) + DST_WR_INDEX_ADDRESS, (n)) - -#define CE_DEST_RING_WRITE_IDX_GET(scn, CE_ctrl_addr) \ - A_TARGET_READ(scn, (CE_ctrl_addr) + DST_WR_INDEX_ADDRESS) - -#endif - -#endif /* __CE_REG_H__ */ diff --git a/core/hif/src/ce/ce_service.c b/core/hif/src/ce/ce_service.c deleted file mode 100644 index 0437f2d43b71..000000000000 --- a/core/hif/src/ce/ce_service.c +++ /dev/null @@ -1,1840 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include "a_types.h" -#include -#include "osapi_linux.h" -#include "hif.h" -#include "hif_io32.h" -#include "ce_api.h" -#include "ce_main.h" -#include "ce_internal.h" -#include "ce_reg.h" -#include "cdf_lock.h" -#include "regtable.h" -#include "epping_main.h" -#include "hif_main.h" -#include "hif_debug.h" -#include "cds_concurrency.h" - -#ifdef IPA_OFFLOAD -#ifdef QCA_WIFI_3_0 -#define CE_IPA_RING_INIT(ce_desc) \ - do { \ - ce_desc->gather = 0; \ - ce_desc->enable_11h = 0; \ - ce_desc->meta_data_low = 0; \ - ce_desc->packet_result_offset = 64; \ - ce_desc->toeplitz_hash_enable = 0; \ - ce_desc->addr_y_search_disable = 0; \ - ce_desc->addr_x_search_disable = 0; \ - ce_desc->misc_int_disable = 0; \ - ce_desc->target_int_disable = 0; \ - ce_desc->host_int_disable = 0; \ - ce_desc->dest_byte_swap = 0; \ - ce_desc->byte_swap = 0; \ - ce_desc->type = 2; \ - ce_desc->tx_classify = 1; \ - ce_desc->buffer_addr_hi = 0; \ - ce_desc->meta_data = 0; \ - ce_desc->nbytes = 128; \ - } while (0) -#else -#define CE_IPA_RING_INIT(ce_desc) \ - do { \ - ce_desc->byte_swap = 0; \ - ce_desc->nbytes = 60; \ - ce_desc->gather = 0; \ - } while (0) -#endif /* QCA_WIFI_3_0 */ -#endif /* IPA_OFFLOAD */ - -static int war1_allow_sleep; -/* io32 write workaround */ -static int hif_ce_war1; - -#ifdef CONFIG_SLUB_DEBUG_ON - -/** - * struct hif_ce_event - structure for detailing a ce event - * @type: what the event was - * @time: when it happened - * @descriptor: descriptor enqueued or dequeued - * @memory: virtual address that was used - * @index: location of the descriptor in the ce ring; - */ -struct hif_ce_desc_event { - uint16_t index; - enum hif_ce_event_type type; - uint64_t time; - union ce_desc descriptor; - void *memory; -}; - -/* max history to record per copy engine */ -#define HIF_CE_HISTORY_MAX 512 -cdf_atomic_t hif_ce_desc_history_index[CE_COUNT_MAX]; -struct hif_ce_desc_event hif_ce_desc_history[CE_COUNT_MAX][HIF_CE_HISTORY_MAX]; - - -/** - * get_next_record_index() - get the next record index - * @table_index: atomic index variable to increment - * @array_size: array size of the circular buffer - * - * Increment the atomic index and reserve the value. - * Takes care of buffer wrap. - * Guaranteed to be thread safe as long as fewer than array_size contexts - * try to access the array. If there are more than array_size contexts - * trying to access the array, full locking of the recording process would - * be needed to have sane logging. - */ -static int get_next_record_index(cdf_atomic_t *table_index, int array_size) -{ - int record_index = cdf_atomic_inc_return(table_index); - if (record_index == array_size) - cdf_atomic_sub(array_size, table_index); - - while (record_index >= array_size) - record_index -= array_size; - return record_index; -} - -/** - * hif_record_ce_desc_event() - record ce descriptor events - * @ce_id: which ce is the event occuring on - * @type: what happened - * @descriptor: pointer to the descriptor posted/completed - * @memory: virtual address of buffer related to the descriptor - * @index: index that the descriptor was/will be at. - */ -void hif_record_ce_desc_event(int ce_id, enum hif_ce_event_type type, - union ce_desc *descriptor, void *memory, int index) -{ - int record_index = get_next_record_index( - &hif_ce_desc_history_index[ce_id], HIF_CE_HISTORY_MAX); - - struct hif_ce_desc_event *event = - &hif_ce_desc_history[ce_id][record_index]; - event->type = type; - event->time = cds_get_monotonic_boottime(); - if (descriptor != NULL) - event->descriptor = *descriptor; - else - memset(&event->descriptor, 0, sizeof(union ce_desc)); - event->memory = memory; - event->index = index; -} - -/** - * ce_init_ce_desc_event_log() - initialize the ce event log - * @ce_id: copy engine id for which we are initializing the log - * @size: size of array to dedicate - * - * Currently the passed size is ignored in favor of a precompiled value. - */ -void ce_init_ce_desc_event_log(int ce_id, int size) -{ - cdf_atomic_init(&hif_ce_desc_history_index[ce_id]); -} -#else -void hif_record_ce_desc_event( - int ce_id, enum hif_ce_event_type type, - union ce_desc *descriptor, void *memory, - int index) -{ -} - -inline void ce_init_ce_desc_event_log(int ce_id, int size) -{ -} -#endif - -/* - * Support for Copy Engine hardware, which is mainly used for - * communication between Host and Target over a PCIe interconnect. - */ - -/* - * A single CopyEngine (CE) comprises two "rings": - * a source ring - * a destination ring - * - * Each ring consists of a number of descriptors which specify - * an address, length, and meta-data. - * - * Typically, one side of the PCIe interconnect (Host or Target) - * controls one ring and the other side controls the other ring. - * The source side chooses when to initiate a transfer and it - * chooses what to send (buffer address, length). The destination - * side keeps a supply of "anonymous receive buffers" available and - * it handles incoming data as it arrives (when the destination - * recieves an interrupt). - * - * The sender may send a simple buffer (address/length) or it may - * send a small list of buffers. When a small list is sent, hardware - * "gathers" these and they end up in a single destination buffer - * with a single interrupt. - * - * There are several "contexts" managed by this layer -- more, it - * may seem -- than should be needed. These are provided mainly for - * maximum flexibility and especially to facilitate a simpler HIF - * implementation. There are per-CopyEngine recv, send, and watermark - * contexts. These are supplied by the caller when a recv, send, - * or watermark handler is established and they are echoed back to - * the caller when the respective callbacks are invoked. There is - * also a per-transfer context supplied by the caller when a buffer - * (or sendlist) is sent and when a buffer is enqueued for recv. - * These per-transfer contexts are echoed back to the caller when - * the buffer is sent/received. - * Target TX harsh result toeplitz_hash_result - */ - -/* - * Guts of ce_send, used by both ce_send and ce_sendlist_send. - * The caller takes responsibility for any needed locking. - */ -int -ce_completed_send_next_nolock(struct CE_state *CE_state, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *sw_idx, unsigned int *hw_idx, - uint32_t *toeplitz_hash_result); - -void war_ce_src_ring_write_idx_set(struct ol_softc *scn, - u32 ctrl_addr, unsigned int write_index) -{ - if (hif_ce_war1) { - void __iomem *indicator_addr; - - indicator_addr = scn->mem + ctrl_addr + DST_WATERMARK_ADDRESS; - - if (!war1_allow_sleep - && ctrl_addr == CE_BASE_ADDRESS(CDC_WAR_DATA_CE)) { - hif_write32_mb(indicator_addr, - (CDC_WAR_MAGIC_STR | write_index)); - } else { - unsigned long irq_flags; - local_irq_save(irq_flags); - hif_write32_mb(indicator_addr, 1); - - /* - * PCIE write waits for ACK in IPQ8K, there is no - * need to read back value. - */ - (void)hif_read32_mb(indicator_addr); - (void)hif_read32_mb(indicator_addr); /* conservative */ - - CE_SRC_RING_WRITE_IDX_SET(scn, - ctrl_addr, write_index); - - hif_write32_mb(indicator_addr, 0); - local_irq_restore(irq_flags); - } - } else - CE_SRC_RING_WRITE_IDX_SET(scn, ctrl_addr, write_index); -} - -int -ce_send_nolock(struct CE_handle *copyeng, - void *per_transfer_context, - cdf_dma_addr_t buffer, - uint32_t nbytes, - uint32_t transfer_id, - uint32_t flags, - uint32_t user_flags) -{ - int status; - struct CE_state *CE_state = (struct CE_state *)copyeng; - struct CE_ring_state *src_ring = CE_state->src_ring; - uint32_t ctrl_addr = CE_state->ctrl_addr; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int sw_index = src_ring->sw_index; - unsigned int write_index = src_ring->write_index; - uint64_t dma_addr = buffer; - struct ol_softc *scn = CE_state->scn; - - A_TARGET_ACCESS_BEGIN_RET(scn); - if (unlikely(CE_RING_DELTA(nentries_mask, - write_index, sw_index - 1) <= 0)) { - OL_ATH_CE_PKT_ERROR_COUNT_INCR(scn, CE_RING_DELTA_FAIL); - status = CDF_STATUS_E_FAILURE; - A_TARGET_ACCESS_END_RET(scn); - return status; - } - { - enum hif_ce_event_type event_type = HIF_TX_GATHER_DESC_POST; - struct CE_src_desc *src_ring_base = - (struct CE_src_desc *)src_ring->base_addr_owner_space; - struct CE_src_desc *shadow_base = - (struct CE_src_desc *)src_ring->shadow_base; - struct CE_src_desc *src_desc = - CE_SRC_RING_TO_DESC(src_ring_base, write_index); - struct CE_src_desc *shadow_src_desc = - CE_SRC_RING_TO_DESC(shadow_base, write_index); - - /* Update low 32 bits source descriptor address */ - shadow_src_desc->buffer_addr = - (uint32_t)(dma_addr & 0xFFFFFFFF); -#ifdef QCA_WIFI_3_0 - shadow_src_desc->buffer_addr_hi = - (uint32_t)((dma_addr >> 32) & 0x1F); - user_flags |= shadow_src_desc->buffer_addr_hi; - memcpy(&(((uint32_t *)shadow_src_desc)[1]), &user_flags, - sizeof(uint32_t)); -#endif - shadow_src_desc->meta_data = transfer_id; - - /* - * Set the swap bit if: - * typical sends on this CE are swapped (host is big-endian) - * and this send doesn't disable the swapping - * (data is not bytestream) - */ - shadow_src_desc->byte_swap = - (((CE_state->attr_flags & CE_ATTR_BYTE_SWAP_DATA) - != 0) & ((flags & CE_SEND_FLAG_SWAP_DISABLE) == 0)); - shadow_src_desc->gather = ((flags & CE_SEND_FLAG_GATHER) != 0); - shadow_src_desc->nbytes = nbytes; - - *src_desc = *shadow_src_desc; - - src_ring->per_transfer_context[write_index] = - per_transfer_context; - - /* Update Source Ring Write Index */ - write_index = CE_RING_IDX_INCR(nentries_mask, write_index); - - /* WORKAROUND */ - if (!shadow_src_desc->gather) { - event_type = HIF_TX_DESC_POST; - war_ce_src_ring_write_idx_set(scn, ctrl_addr, - write_index); - } - - /* src_ring->write index hasn't been updated event though - * the register has allready been written to. - */ - hif_record_ce_desc_event(CE_state->id, event_type, - (union ce_desc *) shadow_src_desc, per_transfer_context, - src_ring->write_index); - - src_ring->write_index = write_index; - status = CDF_STATUS_SUCCESS; - } - A_TARGET_ACCESS_END_RET(scn); - - return status; -} - -int -ce_send(struct CE_handle *copyeng, - void *per_transfer_context, - cdf_dma_addr_t buffer, - uint32_t nbytes, - uint32_t transfer_id, - uint32_t flags, - uint32_t user_flag) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - int status; - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - status = ce_send_nolock(copyeng, per_transfer_context, buffer, nbytes, - transfer_id, flags, user_flag); - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - return status; -} - -unsigned int ce_sendlist_sizeof(void) -{ - return sizeof(struct ce_sendlist); -} - -void ce_sendlist_init(struct ce_sendlist *sendlist) -{ - struct ce_sendlist_s *sl = (struct ce_sendlist_s *)sendlist; - sl->num_items = 0; -} - -int -ce_sendlist_buf_add(struct ce_sendlist *sendlist, - cdf_dma_addr_t buffer, - uint32_t nbytes, - uint32_t flags, - uint32_t user_flags) -{ - struct ce_sendlist_s *sl = (struct ce_sendlist_s *)sendlist; - unsigned int num_items = sl->num_items; - struct ce_sendlist_item *item; - - if (num_items >= CE_SENDLIST_ITEMS_MAX) { - CDF_ASSERT(num_items < CE_SENDLIST_ITEMS_MAX); - return CDF_STATUS_E_RESOURCES; - } - - item = &sl->item[num_items]; - item->send_type = CE_SIMPLE_BUFFER_TYPE; - item->data = buffer; - item->u.nbytes = nbytes; - item->flags = flags; - item->user_flags = user_flags; - sl->num_items = num_items + 1; - return CDF_STATUS_SUCCESS; -} - -int -ce_sendlist_send(struct CE_handle *copyeng, - void *per_transfer_context, - struct ce_sendlist *sendlist, unsigned int transfer_id) -{ - int status = -ENOMEM; - struct ce_sendlist_s *sl = (struct ce_sendlist_s *)sendlist; - struct CE_state *CE_state = (struct CE_state *)copyeng; - struct CE_ring_state *src_ring = CE_state->src_ring; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int num_items = sl->num_items; - unsigned int sw_index; - unsigned int write_index; - - CDF_ASSERT((num_items > 0) && (num_items < src_ring->nentries)); - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - sw_index = src_ring->sw_index; - write_index = src_ring->write_index; - - if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) >= - num_items) { - struct ce_sendlist_item *item; - int i; - - /* handle all but the last item uniformly */ - for (i = 0; i < num_items - 1; i++) { - item = &sl->item[i]; - /* TBDXXX: Support extensible sendlist_types? */ - CDF_ASSERT(item->send_type == CE_SIMPLE_BUFFER_TYPE); - status = ce_send_nolock(copyeng, CE_SENDLIST_ITEM_CTXT, - (cdf_dma_addr_t) item->data, - item->u.nbytes, transfer_id, - item->flags | CE_SEND_FLAG_GATHER, - item->user_flags); - CDF_ASSERT(status == CDF_STATUS_SUCCESS); - } - /* provide valid context pointer for final item */ - item = &sl->item[i]; - /* TBDXXX: Support extensible sendlist_types? */ - CDF_ASSERT(item->send_type == CE_SIMPLE_BUFFER_TYPE); - status = ce_send_nolock(copyeng, per_transfer_context, - (cdf_dma_addr_t) item->data, - item->u.nbytes, - transfer_id, item->flags, - item->user_flags); - CDF_ASSERT(status == CDF_STATUS_SUCCESS); - NBUF_UPDATE_TX_PKT_COUNT((cdf_nbuf_t)per_transfer_context, - NBUF_TX_PKT_CE); - DPTRACE(cdf_dp_trace((cdf_nbuf_t)per_transfer_context, - CDF_DP_TRACE_CE_PACKET_PTR_RECORD, - (uint8_t *)(((cdf_nbuf_t)per_transfer_context)->data), - sizeof(((cdf_nbuf_t)per_transfer_context)->data))); - } else { - /* - * Probably not worth the additional complexity to support - * partial sends with continuation or notification. We expect - * to use large rings and small sendlists. If we can't handle - * the entire request at once, punt it back to the caller. - */ - } - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - return status; -} - -#ifdef WLAN_FEATURE_FASTPATH -#ifdef QCA_WIFI_3_0 -static inline void -ce_buffer_addr_hi_set(struct CE_src_desc *shadow_src_desc, - uint64_t dma_addr, - uint32_t user_flags) -{ - shadow_src_desc->buffer_addr_hi = - (uint32_t)((dma_addr >> 32) & 0x1F); - user_flags |= shadow_src_desc->buffer_addr_hi; - memcpy(&(((uint32_t *)shadow_src_desc)[1]), &user_flags, - sizeof(uint32_t)); -} -#else -static inline void -ce_buffer_addr_hi_set(struct CE_src_desc *shadow_src_desc, - uint64_t dma_addr, - uint32_t user_flags) -{ -} -#endif - -/** - * ce_send_fast() CE layer Tx buffer posting function - * @copyeng: copy engine handle - * @msdus: iarray of msdu to be sent - * @num_msdus: number of msdus in an array - * @transfer_id: transfer_id - * - * Assumption : Called with an array of MSDU's - * Function: - * For each msdu in the array - * 1. Check no. of available entries - * 2. Create src ring entries (allocated in consistent memory - * 3. Write index to h/w - * - * Return: No. of packets that could be sent - */ - -int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, - unsigned int num_msdus, unsigned int transfer_id) -{ - struct CE_state *ce_state = (struct CE_state *)copyeng; - struct ol_softc *scn = ce_state->scn; - struct CE_ring_state *src_ring = ce_state->src_ring; - u_int32_t ctrl_addr = ce_state->ctrl_addr; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int write_index; - unsigned int sw_index; - unsigned int frag_len; - cdf_nbuf_t msdu; - int i; - uint64_t dma_addr; - uint32_t user_flags = 0; - - cdf_spin_lock_bh(&ce_state->ce_index_lock); - sw_index = src_ring->sw_index; - write_index = src_ring->write_index; - - /* 2 msdus per packet */ - for (i = 0; i < num_msdus; i++) { - struct CE_src_desc *src_ring_base = - (struct CE_src_desc *)src_ring->base_addr_owner_space; - struct CE_src_desc *shadow_base = - (struct CE_src_desc *)src_ring->shadow_base; - struct CE_src_desc *src_desc = - CE_SRC_RING_TO_DESC(src_ring_base, write_index); - struct CE_src_desc *shadow_src_desc = - CE_SRC_RING_TO_DESC(shadow_base, write_index); - - hif_pm_runtime_get_noresume(scn); - msdu = msdus[i]; - - /* - * First fill out the ring descriptor for the HTC HTT frame - * header. These are uncached writes. Should we use a local - * structure instead? - */ - /* HTT/HTC header can be passed as a argument */ - dma_addr = cdf_nbuf_get_frag_paddr_lo(msdu, 0); - shadow_src_desc->buffer_addr = (uint32_t)(dma_addr & - 0xFFFFFFFF); - user_flags = cdf_nbuf_data_attr_get(msdu) & DESC_DATA_FLAG_MASK; - ce_buffer_addr_hi_set(shadow_src_desc, dma_addr, user_flags); - - shadow_src_desc->meta_data = transfer_id; - shadow_src_desc->nbytes = cdf_nbuf_get_frag_len(msdu, 0); - - /* - * HTC HTT header is a word stream, so byte swap if CE byte - * swap enabled - */ - shadow_src_desc->byte_swap = ((ce_state->attr_flags & - CE_ATTR_BYTE_SWAP_DATA) != 0); - /* For the first one, it still does not need to write */ - shadow_src_desc->gather = 1; - *src_desc = *shadow_src_desc; - - /* By default we could initialize the transfer context to this - * value - */ - src_ring->per_transfer_context[write_index] = - CE_SENDLIST_ITEM_CTXT; - - write_index = CE_RING_IDX_INCR(nentries_mask, write_index); - - src_desc = CE_SRC_RING_TO_DESC(src_ring_base, write_index); - shadow_src_desc = CE_SRC_RING_TO_DESC(shadow_base, write_index); - /* - * Now fill out the ring descriptor for the actual data - * packet - */ - dma_addr = cdf_nbuf_get_frag_paddr_lo(msdu, 1); - shadow_src_desc->buffer_addr = (uint32_t)(dma_addr & - 0xFFFFFFFF); - /* - * Clear packet offset for all but the first CE desc. - */ - user_flags &= ~CDF_CE_TX_PKT_OFFSET_BIT_M; - ce_buffer_addr_hi_set(shadow_src_desc, dma_addr, user_flags); - shadow_src_desc->meta_data = transfer_id; - - /* get actual packet length */ - frag_len = cdf_nbuf_get_frag_len(msdu, 1); - - /* only read download_len once */ - shadow_src_desc->nbytes = ce_state->download_len; - if (shadow_src_desc->nbytes > frag_len) - shadow_src_desc->nbytes = frag_len; - - /* Data packet is a byte stream, so disable byte swap */ - shadow_src_desc->byte_swap = 0; - /* For the last one, gather is not set */ - shadow_src_desc->gather = 0; - *src_desc = *shadow_src_desc; - src_ring->per_transfer_context[write_index] = msdu; - write_index = CE_RING_IDX_INCR(nentries_mask, write_index); - } - - /* Write the final index to h/w one-shot */ - if (i) { - src_ring->write_index = write_index; - - if (hif_pm_runtime_get(scn) == 0) { - /* Don't call WAR_XXX from here - * Just call XXX instead, that has the reqd. intel - */ - war_ce_src_ring_write_idx_set(scn, ctrl_addr, - write_index); - hif_pm_runtime_put(scn); - } - } - - cdf_spin_unlock_bh(&ce_state->ce_index_lock); - - /* - * If all packets in the array are transmitted, - * i = num_msdus - * Temporarily add an ASSERT - */ - ASSERT(i == num_msdus); - return i; -} -#endif /* WLAN_FEATURE_FASTPATH */ - -int -ce_recv_buf_enqueue(struct CE_handle *copyeng, - void *per_recv_context, cdf_dma_addr_t buffer) -{ - int status; - struct CE_state *CE_state = (struct CE_state *)copyeng; - struct CE_ring_state *dest_ring = CE_state->dest_ring; - uint32_t ctrl_addr = CE_state->ctrl_addr; - unsigned int nentries_mask = dest_ring->nentries_mask; - unsigned int write_index; - unsigned int sw_index; - int val = 0; - uint64_t dma_addr = buffer; - struct ol_softc *scn = CE_state->scn; - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - write_index = dest_ring->write_index; - sw_index = dest_ring->sw_index; - - A_TARGET_ACCESS_BEGIN_RET_EXT(scn, val); - if (val == -1) { - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - return val; - } - - if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) > 0) { - struct CE_dest_desc *dest_ring_base = - (struct CE_dest_desc *)dest_ring-> - base_addr_owner_space; - struct CE_dest_desc *dest_desc = - CE_DEST_RING_TO_DESC(dest_ring_base, write_index); - - /* Update low 32 bit destination descriptor */ - dest_desc->buffer_addr = (uint32_t)(dma_addr & 0xFFFFFFFF); -#ifdef QCA_WIFI_3_0 - dest_desc->buffer_addr_hi = - (uint32_t)((dma_addr >> 32) & 0x1F); -#endif - dest_desc->nbytes = 0; - - dest_ring->per_transfer_context[write_index] = - per_recv_context; - - hif_record_ce_desc_event(CE_state->id, HIF_RX_DESC_POST, - (union ce_desc *) dest_desc, per_recv_context, - write_index); - - /* Update Destination Ring Write Index */ - write_index = CE_RING_IDX_INCR(nentries_mask, write_index); - CE_DEST_RING_WRITE_IDX_SET(scn, ctrl_addr, write_index); - dest_ring->write_index = write_index; - status = CDF_STATUS_SUCCESS; - } else { - status = CDF_STATUS_E_FAILURE; - } - A_TARGET_ACCESS_END_RET_EXT(scn, val); - if (val == -1) { - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - return val; - } - - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - return status; -} - -void -ce_send_watermarks_set(struct CE_handle *copyeng, - unsigned int low_alert_nentries, - unsigned int high_alert_nentries) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - uint32_t ctrl_addr = CE_state->ctrl_addr; - struct ol_softc *scn = CE_state->scn; - - CE_SRC_RING_LOWMARK_SET(scn, ctrl_addr, low_alert_nentries); - CE_SRC_RING_HIGHMARK_SET(scn, ctrl_addr, high_alert_nentries); -} - -void -ce_recv_watermarks_set(struct CE_handle *copyeng, - unsigned int low_alert_nentries, - unsigned int high_alert_nentries) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - uint32_t ctrl_addr = CE_state->ctrl_addr; - struct ol_softc *scn = CE_state->scn; - - CE_DEST_RING_LOWMARK_SET(scn, ctrl_addr, - low_alert_nentries); - CE_DEST_RING_HIGHMARK_SET(scn, ctrl_addr, - high_alert_nentries); -} - -unsigned int ce_send_entries_avail(struct CE_handle *copyeng) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - struct CE_ring_state *src_ring = CE_state->src_ring; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int sw_index; - unsigned int write_index; - - cdf_spin_lock(&CE_state->ce_index_lock); - sw_index = src_ring->sw_index; - write_index = src_ring->write_index; - cdf_spin_unlock(&CE_state->ce_index_lock); - - return CE_RING_DELTA(nentries_mask, write_index, sw_index - 1); -} - -unsigned int ce_recv_entries_avail(struct CE_handle *copyeng) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - struct CE_ring_state *dest_ring = CE_state->dest_ring; - unsigned int nentries_mask = dest_ring->nentries_mask; - unsigned int sw_index; - unsigned int write_index; - - cdf_spin_lock(&CE_state->ce_index_lock); - sw_index = dest_ring->sw_index; - write_index = dest_ring->write_index; - cdf_spin_unlock(&CE_state->ce_index_lock); - - return CE_RING_DELTA(nentries_mask, write_index, sw_index - 1); -} - -/* - * Guts of ce_send_entries_done. - * The caller takes responsibility for any necessary locking. - */ -unsigned int -ce_send_entries_done_nolock(struct ol_softc *scn, - struct CE_state *CE_state) -{ - struct CE_ring_state *src_ring = CE_state->src_ring; - uint32_t ctrl_addr = CE_state->ctrl_addr; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int sw_index; - unsigned int read_index; - - sw_index = src_ring->sw_index; - read_index = CE_SRC_RING_READ_IDX_GET(scn, ctrl_addr); - - return CE_RING_DELTA(nentries_mask, sw_index, read_index); -} - -unsigned int ce_send_entries_done(struct CE_handle *copyeng) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - unsigned int nentries; - - cdf_spin_lock(&CE_state->ce_index_lock); - nentries = ce_send_entries_done_nolock(CE_state->scn, CE_state); - cdf_spin_unlock(&CE_state->ce_index_lock); - - return nentries; -} - -/* - * Guts of ce_recv_entries_done. - * The caller takes responsibility for any necessary locking. - */ -unsigned int -ce_recv_entries_done_nolock(struct ol_softc *scn, - struct CE_state *CE_state) -{ - struct CE_ring_state *dest_ring = CE_state->dest_ring; - uint32_t ctrl_addr = CE_state->ctrl_addr; - unsigned int nentries_mask = dest_ring->nentries_mask; - unsigned int sw_index; - unsigned int read_index; - - sw_index = dest_ring->sw_index; - read_index = CE_DEST_RING_READ_IDX_GET(scn, ctrl_addr); - - return CE_RING_DELTA(nentries_mask, sw_index, read_index); -} - -unsigned int ce_recv_entries_done(struct CE_handle *copyeng) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - unsigned int nentries; - - cdf_spin_lock(&CE_state->ce_index_lock); - nentries = ce_recv_entries_done_nolock(CE_state->scn, CE_state); - cdf_spin_unlock(&CE_state->ce_index_lock); - - return nentries; -} - -/* Debug support */ -void *ce_debug_cmplrn_context; /* completed recv next context */ -void *ce_debug_cnclsn_context; /* cancel send next context */ -void *ce_debug_rvkrn_context; /* revoke receive next context */ -void *ce_debug_cmplsn_context; /* completed send next context */ - -/* - * Guts of ce_completed_recv_next. - * The caller takes responsibility for any necessary locking. - */ -int -ce_completed_recv_next_nolock(struct CE_state *CE_state, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *flagsp) -{ - int status; - struct CE_ring_state *dest_ring = CE_state->dest_ring; - unsigned int nentries_mask = dest_ring->nentries_mask; - unsigned int sw_index = dest_ring->sw_index; - - struct CE_dest_desc *dest_ring_base = - (struct CE_dest_desc *)dest_ring->base_addr_owner_space; - struct CE_dest_desc *dest_desc = - CE_DEST_RING_TO_DESC(dest_ring_base, sw_index); - int nbytes; - struct CE_dest_desc dest_desc_info; - /* - * By copying the dest_desc_info element to local memory, we could - * avoid extra memory read from non-cachable memory. - */ - dest_desc_info = *dest_desc; - nbytes = dest_desc_info.nbytes; - if (nbytes == 0) { - /* - * This closes a relatively unusual race where the Host - * sees the updated DRRI before the update to the - * corresponding descriptor has completed. We treat this - * as a descriptor that is not yet done. - */ - status = CDF_STATUS_E_FAILURE; - goto done; - } - - hif_record_ce_desc_event(CE_state->id, HIF_RX_DESC_COMPLETION, - (union ce_desc *) dest_desc, - dest_ring->per_transfer_context[sw_index], - sw_index); - - dest_desc->nbytes = 0; - - /* Return data from completed destination descriptor */ - *bufferp = HIF_CE_DESC_ADDR_TO_DMA(&dest_desc_info); - *nbytesp = nbytes; - *transfer_idp = dest_desc_info.meta_data; - *flagsp = (dest_desc_info.byte_swap) ? CE_RECV_FLAG_SWAPPED : 0; - - if (per_CE_contextp) { - *per_CE_contextp = CE_state->recv_context; - } - - ce_debug_cmplrn_context = dest_ring->per_transfer_context[sw_index]; - if (per_transfer_contextp) { - *per_transfer_contextp = ce_debug_cmplrn_context; - } - dest_ring->per_transfer_context[sw_index] = 0; /* sanity */ - - /* Update sw_index */ - sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); - dest_ring->sw_index = sw_index; - status = CDF_STATUS_SUCCESS; - -done: - return status; -} - -int -ce_completed_recv_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, unsigned int *flagsp) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - int status; - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - status = - ce_completed_recv_next_nolock(CE_state, per_CE_contextp, - per_transfer_contextp, bufferp, - nbytesp, transfer_idp, flagsp); - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - return status; -} - -/* NB: Modeled after ce_completed_recv_next_nolock */ -CDF_STATUS -ce_revoke_recv_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, cdf_dma_addr_t *bufferp) -{ - struct CE_state *CE_state; - struct CE_ring_state *dest_ring; - unsigned int nentries_mask; - unsigned int sw_index; - unsigned int write_index; - CDF_STATUS status; - struct ol_softc *scn; - - CE_state = (struct CE_state *)copyeng; - dest_ring = CE_state->dest_ring; - if (!dest_ring) { - return CDF_STATUS_E_FAILURE; - } - - scn = CE_state->scn; - cdf_spin_lock(&CE_state->ce_index_lock); - nentries_mask = dest_ring->nentries_mask; - sw_index = dest_ring->sw_index; - write_index = dest_ring->write_index; - if (write_index != sw_index) { - struct CE_dest_desc *dest_ring_base = - (struct CE_dest_desc *)dest_ring-> - base_addr_owner_space; - struct CE_dest_desc *dest_desc = - CE_DEST_RING_TO_DESC(dest_ring_base, sw_index); - - /* Return data from completed destination descriptor */ - *bufferp = HIF_CE_DESC_ADDR_TO_DMA(dest_desc); - - if (per_CE_contextp) { - *per_CE_contextp = CE_state->recv_context; - } - - ce_debug_rvkrn_context = - dest_ring->per_transfer_context[sw_index]; - if (per_transfer_contextp) { - *per_transfer_contextp = ce_debug_rvkrn_context; - } - dest_ring->per_transfer_context[sw_index] = 0; /* sanity */ - - /* Update sw_index */ - sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); - dest_ring->sw_index = sw_index; - status = CDF_STATUS_SUCCESS; - } else { - status = CDF_STATUS_E_FAILURE; - } - cdf_spin_unlock(&CE_state->ce_index_lock); - - return status; -} - -/* - * Guts of ce_completed_send_next. - * The caller takes responsibility for any necessary locking. - */ -int -ce_completed_send_next_nolock(struct CE_state *CE_state, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *sw_idx, - unsigned int *hw_idx, - uint32_t *toeplitz_hash_result) -{ - int status = CDF_STATUS_E_FAILURE; - struct CE_ring_state *src_ring = CE_state->src_ring; - uint32_t ctrl_addr = CE_state->ctrl_addr; - unsigned int nentries_mask = src_ring->nentries_mask; - unsigned int sw_index = src_ring->sw_index; - unsigned int read_index; - struct ol_softc *scn = CE_state->scn; - - if (src_ring->hw_index == sw_index) { - /* - * The SW completion index has caught up with the cached - * version of the HW completion index. - * Update the cached HW completion index to see whether - * the SW has really caught up to the HW, or if the cached - * value of the HW index has become stale. - */ - A_TARGET_ACCESS_BEGIN_RET(scn); - src_ring->hw_index = - CE_SRC_RING_READ_IDX_GET_FROM_DDR(scn, ctrl_addr); - A_TARGET_ACCESS_END_RET(scn); - } - read_index = src_ring->hw_index; - - if (sw_idx) - *sw_idx = sw_index; - - if (hw_idx) - *hw_idx = read_index; - - if ((read_index != sw_index) && (read_index != 0xffffffff)) { - struct CE_src_desc *shadow_base = - (struct CE_src_desc *)src_ring->shadow_base; - struct CE_src_desc *shadow_src_desc = - CE_SRC_RING_TO_DESC(shadow_base, sw_index); -#ifdef QCA_WIFI_3_0 - struct CE_src_desc *src_ring_base = - (struct CE_src_desc *)src_ring->base_addr_owner_space; - struct CE_src_desc *src_desc = - CE_SRC_RING_TO_DESC(src_ring_base, sw_index); -#endif - hif_record_ce_desc_event(CE_state->id, HIF_TX_DESC_COMPLETION, - (union ce_desc *) shadow_src_desc, - src_ring->per_transfer_context[sw_index], - sw_index); - - /* Return data from completed source descriptor */ - *bufferp = HIF_CE_DESC_ADDR_TO_DMA(shadow_src_desc); - *nbytesp = shadow_src_desc->nbytes; - *transfer_idp = shadow_src_desc->meta_data; -#ifdef QCA_WIFI_3_0 - *toeplitz_hash_result = src_desc->toeplitz_hash_result; -#else - *toeplitz_hash_result = 0; -#endif - if (per_CE_contextp) { - *per_CE_contextp = CE_state->send_context; - } - - ce_debug_cmplsn_context = - src_ring->per_transfer_context[sw_index]; - if (per_transfer_contextp) { - *per_transfer_contextp = ce_debug_cmplsn_context; - } - src_ring->per_transfer_context[sw_index] = 0; /* sanity */ - - /* Update sw_index */ - sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); - src_ring->sw_index = sw_index; - status = CDF_STATUS_SUCCESS; - } - - return status; -} - -/* NB: Modeled after ce_completed_send_next */ -CDF_STATUS -ce_cancel_send_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - uint32_t *toeplitz_hash_result) -{ - struct CE_state *CE_state; - struct CE_ring_state *src_ring; - unsigned int nentries_mask; - unsigned int sw_index; - unsigned int write_index; - CDF_STATUS status; - struct ol_softc *scn; - - CE_state = (struct CE_state *)copyeng; - src_ring = CE_state->src_ring; - if (!src_ring) { - return CDF_STATUS_E_FAILURE; - } - - scn = CE_state->scn; - cdf_spin_lock(&CE_state->ce_index_lock); - nentries_mask = src_ring->nentries_mask; - sw_index = src_ring->sw_index; - write_index = src_ring->write_index; - - if (write_index != sw_index) { - struct CE_src_desc *src_ring_base = - (struct CE_src_desc *)src_ring->base_addr_owner_space; - struct CE_src_desc *src_desc = - CE_SRC_RING_TO_DESC(src_ring_base, sw_index); - - /* Return data from completed source descriptor */ - *bufferp = HIF_CE_DESC_ADDR_TO_DMA(src_desc); - *nbytesp = src_desc->nbytes; - *transfer_idp = src_desc->meta_data; -#ifdef QCA_WIFI_3_0 - *toeplitz_hash_result = src_desc->toeplitz_hash_result; -#else - *toeplitz_hash_result = 0; -#endif - - if (per_CE_contextp) { - *per_CE_contextp = CE_state->send_context; - } - - ce_debug_cnclsn_context = - src_ring->per_transfer_context[sw_index]; - if (per_transfer_contextp) { - *per_transfer_contextp = ce_debug_cnclsn_context; - } - src_ring->per_transfer_context[sw_index] = 0; /* sanity */ - - /* Update sw_index */ - sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); - src_ring->sw_index = sw_index; - status = CDF_STATUS_SUCCESS; - } else { - status = CDF_STATUS_E_FAILURE; - } - cdf_spin_unlock(&CE_state->ce_index_lock); - - return status; -} - -/* Shift bits to convert IS_*_RING_*_WATERMARK_MASK to CE_WM_FLAG_*_* */ -#define CE_WM_SHFT 1 - -int -ce_completed_send_next(struct CE_handle *copyeng, - void **per_CE_contextp, - void **per_transfer_contextp, - cdf_dma_addr_t *bufferp, - unsigned int *nbytesp, - unsigned int *transfer_idp, - unsigned int *sw_idx, - unsigned int *hw_idx, - unsigned int *toeplitz_hash_result) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - int status; - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - status = - ce_completed_send_next_nolock(CE_state, per_CE_contextp, - per_transfer_contextp, bufferp, - nbytesp, transfer_idp, sw_idx, - hw_idx, toeplitz_hash_result); - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - return status; -} - -#ifdef ATH_11AC_TXCOMPACT -/* CE engine descriptor reap - * Similar to ce_per_engine_service , Only difference is ce_per_engine_service - * does recieve and reaping of completed descriptor , - * This function only handles reaping of Tx complete descriptor. - * The Function is called from threshold reap poll routine - * hif_send_complete_check so should not countain recieve functionality - * within it . - */ - -void ce_per_engine_servicereap(struct ol_softc *scn, unsigned int ce_id) -{ - void *CE_context; - void *transfer_context; - cdf_dma_addr_t buf; - unsigned int nbytes; - unsigned int id; - unsigned int sw_idx, hw_idx; - uint32_t toeplitz_hash_result; - struct CE_state *CE_state = scn->ce_id_to_state[ce_id]; - - A_TARGET_ACCESS_BEGIN(scn); - hif_record_ce_desc_event(ce_id, HIF_CE_REAP_ENTRY, - NULL, NULL, 0); - - /* Since this function is called from both user context and - * tasklet context the spinlock has to lock the bottom halves. - * This fix assumes that ATH_11AC_TXCOMPACT flag is always - * enabled in TX polling mode. If this is not the case, more - * bottom halve spin lock changes are needed. Due to data path - * performance concern, after internal discussion we've decided - * to make minimum change, i.e., only address the issue occured - * in this function. The possible negative effect of this minimum - * change is that, in the future, if some other function will also - * be opened to let the user context to use, those cases need to be - * addressed by change spin_lock to spin_lock_bh also. - */ - - cdf_spin_lock_bh(&CE_state->ce_index_lock); - - if (CE_state->send_cb) { - { - /* Pop completed send buffers and call the - * registered send callback for each - */ - while (ce_completed_send_next_nolock - (CE_state, &CE_context, - &transfer_context, &buf, - &nbytes, &id, &sw_idx, &hw_idx, - &toeplitz_hash_result) == - CDF_STATUS_SUCCESS) { - if (ce_id != CE_HTT_H2T_MSG) { - cdf_spin_unlock_bh( - &CE_state->ce_index_lock); - CE_state->send_cb( - (struct CE_handle *) - CE_state, CE_context, - transfer_context, buf, - nbytes, id, sw_idx, hw_idx, - toeplitz_hash_result); - cdf_spin_lock_bh( - &CE_state->ce_index_lock); - } else { - struct HIF_CE_pipe_info *pipe_info = - (struct HIF_CE_pipe_info *) - CE_context; - - cdf_spin_lock_bh(&pipe_info-> - completion_freeq_lock); - pipe_info->num_sends_allowed++; - cdf_spin_unlock_bh(&pipe_info-> - completion_freeq_lock); - } - } - } - } - - cdf_spin_unlock_bh(&CE_state->ce_index_lock); - - hif_record_ce_desc_event(ce_id, HIF_CE_REAP_EXIT, - NULL, NULL, 0); - A_TARGET_ACCESS_END(scn); -} - -#endif /*ATH_11AC_TXCOMPACT */ - -/* - * Number of times to check for any pending tx/rx completion on - * a copy engine, this count should be big enough. Once we hit - * this threashold we'll not check for any Tx/Rx comlpetion in same - * interrupt handling. Note that this threashold is only used for - * Rx interrupt processing, this can be used tor Tx as well if we - * suspect any infinite loop in checking for pending Tx completion. - */ -#define CE_TXRX_COMP_CHECK_THRESHOLD 20 - -/* - * Guts of interrupt handler for per-engine interrupts on a particular CE. - * - * Invokes registered callbacks for recv_complete, - * send_complete, and watermarks. - * - * Returns: number of messages processed - */ - -int ce_per_engine_service(struct ol_softc *scn, unsigned int CE_id) -{ - struct CE_state *CE_state = scn->ce_id_to_state[CE_id]; - uint32_t ctrl_addr = CE_state->ctrl_addr; - void *CE_context; - void *transfer_context; - cdf_dma_addr_t buf; - unsigned int nbytes; - unsigned int id; - unsigned int flags; - uint32_t CE_int_status; - unsigned int more_comp_cnt = 0; - unsigned int more_snd_comp_cnt = 0; - unsigned int sw_idx, hw_idx; - uint32_t toeplitz_hash_result; - - if (Q_TARGET_ACCESS_BEGIN(scn) < 0) { - HIF_ERROR("[premature rc=0]\n"); - return 0; /* no work done */ - } - - cdf_spin_lock(&CE_state->ce_index_lock); - - /* Clear force_break flag and re-initialize receive_count to 0 */ - - /* NAPI: scn variables- thread/multi-processing safety? */ - CE_state->receive_count = 0; - CE_state->force_break = 0; -more_completions: - if (CE_state->recv_cb) { - - /* Pop completed recv buffers and call - * the registered recv callback for each - */ - while (ce_completed_recv_next_nolock - (CE_state, &CE_context, &transfer_context, - &buf, &nbytes, &id, &flags) == - CDF_STATUS_SUCCESS) { - cdf_spin_unlock(&CE_state->ce_index_lock); - CE_state->recv_cb((struct CE_handle *)CE_state, - CE_context, transfer_context, buf, - nbytes, id, flags); - - /* - * EV #112693 - - * [Peregrine][ES1][WB342][Win8x86][Performance] - * BSoD_0x133 occurred in VHT80 UDP_DL - * Break out DPC by force if number of loops in - * hif_pci_ce_recv_data reaches MAX_NUM_OF_RECEIVES - * to avoid spending too long time in - * DPC for each interrupt handling. Schedule another - * DPC to avoid data loss if we had taken - * force-break action before apply to Windows OS - * only currently, Linux/MAC os can expand to their - * platform if necessary - */ - - /* Break the receive processes by - * force if force_break set up - */ - if (cdf_unlikely(CE_state->force_break)) { - cdf_atomic_set(&CE_state->rx_pending, 1); - CE_ENGINE_INT_STATUS_CLEAR(scn, ctrl_addr, - HOST_IS_COPY_COMPLETE_MASK); - if (Q_TARGET_ACCESS_END(scn) < 0) - HIF_ERROR("<--[premature rc=%d]\n", - CE_state->receive_count); - return CE_state->receive_count; - } - cdf_spin_lock(&CE_state->ce_index_lock); - } - } - - /* - * Attention: We may experience potential infinite loop for below - * While Loop during Sending Stress test. - * Resolve the same way as Receive Case (Refer to EV #112693) - */ - - if (CE_state->send_cb) { - /* Pop completed send buffers and call - * the registered send callback for each - */ - -#ifdef ATH_11AC_TXCOMPACT - while (ce_completed_send_next_nolock - (CE_state, &CE_context, - &transfer_context, &buf, &nbytes, - &id, &sw_idx, &hw_idx, - &toeplitz_hash_result) == CDF_STATUS_SUCCESS) { - - if (CE_id != CE_HTT_H2T_MSG || - WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { - cdf_spin_unlock(&CE_state->ce_index_lock); - CE_state->send_cb((struct CE_handle *)CE_state, - CE_context, transfer_context, - buf, nbytes, id, sw_idx, - hw_idx, toeplitz_hash_result); - cdf_spin_lock(&CE_state->ce_index_lock); - } else { - struct HIF_CE_pipe_info *pipe_info = - (struct HIF_CE_pipe_info *)CE_context; - - cdf_spin_lock(&pipe_info-> - completion_freeq_lock); - pipe_info->num_sends_allowed++; - cdf_spin_unlock(&pipe_info-> - completion_freeq_lock); - } - } -#else /*ATH_11AC_TXCOMPACT */ - while (ce_completed_send_next_nolock - (CE_state, &CE_context, - &transfer_context, &buf, &nbytes, - &id, &sw_idx, &hw_idx, - &toeplitz_hash_result) == CDF_STATUS_SUCCESS) { - cdf_spin_unlock(&CE_state->ce_index_lock); - CE_state->send_cb((struct CE_handle *)CE_state, - CE_context, transfer_context, buf, - nbytes, id, sw_idx, hw_idx, - toeplitz_hash_result); - cdf_spin_lock(&CE_state->ce_index_lock); - } -#endif /*ATH_11AC_TXCOMPACT */ - } - -more_watermarks: - if (CE_state->misc_cbs) { - CE_int_status = CE_ENGINE_INT_STATUS_GET(scn, ctrl_addr); - if (CE_int_status & CE_WATERMARK_MASK) { - if (CE_state->watermark_cb) { - cdf_spin_unlock(&CE_state->ce_index_lock); - /* Convert HW IS bits to software flags */ - flags = - (CE_int_status & CE_WATERMARK_MASK) >> - CE_WM_SHFT; - - CE_state-> - watermark_cb((struct CE_handle *)CE_state, - CE_state->wm_context, flags); - cdf_spin_lock(&CE_state->ce_index_lock); - } - } - } - - /* - * Clear the misc interrupts (watermark) that were handled above, - * and that will be checked again below. - * Clear and check for copy-complete interrupts again, just in case - * more copy completions happened while the misc interrupts were being - * handled. - */ - CE_ENGINE_INT_STATUS_CLEAR(scn, ctrl_addr, - CE_WATERMARK_MASK | - HOST_IS_COPY_COMPLETE_MASK); - - /* - * Now that per-engine interrupts are cleared, verify that - * no recv interrupts arrive while processing send interrupts, - * and no recv or send interrupts happened while processing - * misc interrupts.Go back and check again.Keep checking until - * we find no more events to process. - */ - if (CE_state->recv_cb && ce_recv_entries_done_nolock(scn, CE_state)) { - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam()) || - more_comp_cnt++ < CE_TXRX_COMP_CHECK_THRESHOLD) { - goto more_completions; - } else { - HIF_ERROR( - "%s:Potential infinite loop detected during Rx processing nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", - __func__, CE_state->dest_ring->nentries_mask, - CE_state->dest_ring->sw_index, - CE_DEST_RING_READ_IDX_GET(scn, - CE_state->ctrl_addr)); - } - } - - if (CE_state->send_cb && ce_send_entries_done_nolock(scn, CE_state)) { - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam()) || - more_snd_comp_cnt++ < CE_TXRX_COMP_CHECK_THRESHOLD) { - goto more_completions; - } else { - HIF_ERROR( - "%s:Potential infinite loop detected during send completion nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", - __func__, CE_state->src_ring->nentries_mask, - CE_state->src_ring->sw_index, - CE_SRC_RING_READ_IDX_GET(scn, - CE_state->ctrl_addr)); - } - } - - if (CE_state->misc_cbs) { - CE_int_status = CE_ENGINE_INT_STATUS_GET(scn, ctrl_addr); - if (CE_int_status & CE_WATERMARK_MASK) { - if (CE_state->watermark_cb) { - goto more_watermarks; - } - } - } - - cdf_spin_unlock(&CE_state->ce_index_lock); - cdf_atomic_set(&CE_state->rx_pending, 0); - - if (Q_TARGET_ACCESS_END(scn) < 0) - HIF_ERROR("<--[premature rc=%d]\n", CE_state->receive_count); - return CE_state->receive_count; -} - -/* - * Handler for per-engine interrupts on ALL active CEs. - * This is used in cases where the system is sharing a - * single interrput for all CEs - */ - -void ce_per_engine_service_any(int irq, struct ol_softc *scn) -{ - int CE_id; - uint32_t intr_summary; - - A_TARGET_ACCESS_BEGIN(scn); - if (!cdf_atomic_read(&scn->tasklet_from_intr)) { - for (CE_id = 0; CE_id < scn->ce_count; CE_id++) { - struct CE_state *CE_state = scn->ce_id_to_state[CE_id]; - if (cdf_atomic_read(&CE_state->rx_pending)) { - cdf_atomic_set(&CE_state->rx_pending, 0); - ce_per_engine_service(scn, CE_id); - } - } - - A_TARGET_ACCESS_END(scn); - return; - } - - intr_summary = CE_INTERRUPT_SUMMARY(scn); - - for (CE_id = 0; intr_summary && (CE_id < scn->ce_count); CE_id++) { - if (intr_summary & (1 << CE_id)) { - intr_summary &= ~(1 << CE_id); - } else { - continue; /* no intr pending on this CE */ - } - - ce_per_engine_service(scn, CE_id); - } - - A_TARGET_ACCESS_END(scn); -} - -/* - * Adjust interrupts for the copy complete handler. - * If it's needed for either send or recv, then unmask - * this interrupt; otherwise, mask it. - * - * Called with target_lock held. - */ -static void -ce_per_engine_handler_adjust(struct CE_state *CE_state, - int disable_copy_compl_intr) -{ - uint32_t ctrl_addr = CE_state->ctrl_addr; - struct ol_softc *scn = CE_state->scn; - - CE_state->disable_copy_compl_intr = disable_copy_compl_intr; - A_TARGET_ACCESS_BEGIN(scn); - if ((!disable_copy_compl_intr) && - (CE_state->send_cb || CE_state->recv_cb)) { - CE_COPY_COMPLETE_INTR_ENABLE(scn, ctrl_addr); - } else { - CE_COPY_COMPLETE_INTR_DISABLE(scn, ctrl_addr); - } - - if (CE_state->watermark_cb) { - CE_WATERMARK_INTR_ENABLE(scn, ctrl_addr); - } else { - CE_WATERMARK_INTR_DISABLE(scn, ctrl_addr); - } - A_TARGET_ACCESS_END(scn); - -} - -/*Iterate the CE_state list and disable the compl interrupt - * if it has been registered already. - */ -void ce_disable_any_copy_compl_intr_nolock(struct ol_softc *scn) -{ - int CE_id; - - A_TARGET_ACCESS_BEGIN(scn); - for (CE_id = 0; CE_id < scn->ce_count; CE_id++) { - struct CE_state *CE_state = scn->ce_id_to_state[CE_id]; - uint32_t ctrl_addr = CE_state->ctrl_addr; - - /* if the interrupt is currently enabled, disable it */ - if (!CE_state->disable_copy_compl_intr - && (CE_state->send_cb || CE_state->recv_cb)) { - CE_COPY_COMPLETE_INTR_DISABLE(scn, ctrl_addr); - } - - if (CE_state->watermark_cb) { - CE_WATERMARK_INTR_DISABLE(scn, ctrl_addr); - } - } - A_TARGET_ACCESS_END(scn); -} - -void ce_enable_any_copy_compl_intr_nolock(struct ol_softc *scn) -{ - int CE_id; - - A_TARGET_ACCESS_BEGIN(scn); - for (CE_id = 0; CE_id < scn->ce_count; CE_id++) { - struct CE_state *CE_state = scn->ce_id_to_state[CE_id]; - uint32_t ctrl_addr = CE_state->ctrl_addr; - - /* - * If the CE is supposed to have copy complete interrupts - * enabled (i.e. there a callback registered, and the - * "disable" flag is not set), then re-enable the interrupt. - */ - if (!CE_state->disable_copy_compl_intr - && (CE_state->send_cb || CE_state->recv_cb)) { - CE_COPY_COMPLETE_INTR_ENABLE(scn, ctrl_addr); - } - - if (CE_state->watermark_cb) { - CE_WATERMARK_INTR_ENABLE(scn, ctrl_addr); - } - } - A_TARGET_ACCESS_END(scn); -} - -/** - * ce_send_cb_register(): register completion handler - * @copyeng: CE_state representing the ce we are adding the behavior to - * @fn_ptr: callback that the ce should use when processing tx completions - * @disable_interrupts: if the interupts should be enabled or not. - * - * Caller should guarantee that no transactions are in progress before - * switching the callback function. - * - * Registers the send context before the fn pointer so that if the cb is valid - * the context should be valid. - * - * Beware that currently this function will enable completion interrupts. - */ -void -ce_send_cb_register(struct CE_handle *copyeng, - ce_send_cb fn_ptr, - void *ce_send_context, int disable_interrupts) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - - if (CE_state == NULL) { - pr_err("%s: Error CE state = NULL\n", __func__); - return; - } - CE_state->send_context = ce_send_context; - CE_state->send_cb = fn_ptr; - ce_per_engine_handler_adjust(CE_state, disable_interrupts); -} - -/** - * ce_recv_cb_register(): register completion handler - * @copyeng: CE_state representing the ce we are adding the behavior to - * @fn_ptr: callback that the ce should use when processing rx completions - * @disable_interrupts: if the interupts should be enabled or not. - * - * Registers the send context before the fn pointer so that if the cb is valid - * the context should be valid. - * - * Caller should guarantee that no transactions are in progress before - * switching the callback function. - */ -void -ce_recv_cb_register(struct CE_handle *copyeng, - CE_recv_cb fn_ptr, - void *CE_recv_context, int disable_interrupts) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - - if (CE_state == NULL) { - pr_err("%s: ERROR CE state = NULL\n", __func__); - return; - } - CE_state->recv_context = CE_recv_context; - CE_state->recv_cb = fn_ptr; - ce_per_engine_handler_adjust(CE_state, disable_interrupts); -} - -/** - * ce_watermark_cb_register(): register completion handler - * @copyeng: CE_state representing the ce we are adding the behavior to - * @fn_ptr: callback that the ce should use when processing watermark events - * - * Caller should guarantee that no watermark events are being processed before - * switching the callback function. - */ -void -ce_watermark_cb_register(struct CE_handle *copyeng, - CE_watermark_cb fn_ptr, void *CE_wm_context) -{ - struct CE_state *CE_state = (struct CE_state *)copyeng; - - CE_state->watermark_cb = fn_ptr; - CE_state->wm_context = CE_wm_context; - ce_per_engine_handler_adjust(CE_state, 0); - if (fn_ptr) { - CE_state->misc_cbs = 1; - } -} - -#ifdef WLAN_FEATURE_FASTPATH -/** - * ce_pkt_dl_len_set() set the HTT packet download length - * @hif_sc: HIF context - * @pkt_download_len: download length - * - * Return: None - */ -void ce_pkt_dl_len_set(void *hif_sc, u_int32_t pkt_download_len) -{ - struct ol_softc *sc = (struct ol_softc *)(hif_sc); - struct CE_state *ce_state = sc->ce_id_to_state[CE_HTT_H2T_MSG]; - - cdf_assert_always(ce_state); - - ce_state->download_len = pkt_download_len; - - cdf_print("%s CE %d Pkt download length %d\n", __func__, - ce_state->id, ce_state->download_len); -} -#else -void ce_pkt_dl_len_set(void *hif_sc, u_int32_t pkt_download_len) -{ -} -#endif /* WLAN_FEATURE_FASTPATH */ - -bool ce_get_rx_pending(struct ol_softc *scn) -{ - int CE_id; - - for (CE_id = 0; CE_id < scn->ce_count; CE_id++) { - struct CE_state *CE_state = scn->ce_id_to_state[CE_id]; - if (cdf_atomic_read(&CE_state->rx_pending)) - return true; - } - - return false; -} - -/** - * ce_check_rx_pending() - ce_check_rx_pending - * @scn: ol_softc - * @ce_id: ce_id - * - * Return: bool - */ -bool ce_check_rx_pending(struct ol_softc *scn, int ce_id) -{ - struct CE_state *CE_state = scn->ce_id_to_state[ce_id]; - if (cdf_atomic_read(&CE_state->rx_pending)) - return true; - else - return false; -} - -/** - * ce_enable_msi(): write the msi configuration to the target - * @scn: hif context - * @CE_id: which copy engine will be configured for msi interupts - * @msi_addr_lo: Hardware will write to this address to generate an interrupt - * @msi_addr_hi: Hardware will write to this address to generate an interrupt - * @msi_data: Hardware will write this data to generate an interrupt - * - * should be done in the initialization sequence so no locking would be needed - */ -void ce_enable_msi(struct ol_softc *scn, unsigned int CE_id, - uint32_t msi_addr_lo, uint32_t msi_addr_hi, - uint32_t msi_data) -{ -#ifdef WLAN_ENABLE_QCA6180 - struct CE_state *CE_state; - A_target_id_t targid; - u_int32_t ctrl_addr; - uint32_t tmp; - - CE_state = scn->ce_id_to_state[CE_id]; - if (!CE_state) { - HIF_ERROR("%s: error - CE_state = NULL", __func__); - return; - } - targid = TARGID(sc); - ctrl_addr = CE_state->ctrl_addr; - CE_MSI_ADDR_LOW_SET(scn, ctrl_addr, msi_addr_lo); - CE_MSI_ADDR_HIGH_SET(scn, ctrl_addr, msi_addr_hi); - CE_MSI_DATA_SET(scn, ctrl_addr, msi_data); - tmp = CE_CTRL_REGISTER1_GET(scn, ctrl_addr); - tmp |= (1 << CE_MSI_ENABLE_BIT); - CE_CTRL_REGISTER1_SET(scn, ctrl_addr, tmp); -#endif -} - -#ifdef IPA_OFFLOAD -/** - * ce_ipa_get_resource() - get uc resource on copyengine - * @ce: copyengine context - * @ce_sr_base_paddr: copyengine source ring base physical address - * @ce_sr_ring_size: copyengine source ring size - * @ce_reg_paddr: copyengine register physical address - * - * Copy engine should release resource to micro controller - * Micro controller needs - * - Copy engine source descriptor base address - * - Copy engine source descriptor size - * - PCI BAR address to access copy engine regiser - * - * Return: None - */ -void ce_ipa_get_resource(struct CE_handle *ce, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr) -{ - struct CE_state *CE_state = (struct CE_state *)ce; - uint32_t ring_loop; - struct CE_src_desc *ce_desc; - cdf_dma_addr_t phy_mem_base; - struct ol_softc *scn = CE_state->scn; - - if (CE_RUNNING != CE_state->state) { - *ce_sr_base_paddr = 0; - *ce_sr_ring_size = 0; - return; - } - - /* Update default value for descriptor */ - for (ring_loop = 0; ring_loop < CE_state->src_ring->nentries; - ring_loop++) { - ce_desc = (struct CE_src_desc *) - ((char *)CE_state->src_ring->base_addr_owner_space + - ring_loop * (sizeof(struct CE_src_desc))); - CE_IPA_RING_INIT(ce_desc); - } - - /* Get BAR address */ - hif_read_phy_mem_base(CE_state->scn, &phy_mem_base); - - *ce_sr_base_paddr = CE_state->src_ring->base_addr_CE_space; - *ce_sr_ring_size = (uint32_t) (CE_state->src_ring->nentries * - sizeof(struct CE_src_desc)); - *ce_reg_paddr = phy_mem_base + CE_BASE_ADDRESS(CE_state->id) + - SR_WR_INDEX_ADDRESS; - return; -} -#endif /* IPA_OFFLOAD */ - diff --git a/core/hif/src/ce/ce_tasklet.c b/core/hif/src/ce/ce_tasklet.c deleted file mode 100644 index a2edeba26563..000000000000 --- a/core/hif/src/ce/ce_tasklet.c +++ /dev/null @@ -1,411 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include -#include -#include -#include -#include "a_types.h" -#include "athdefs.h" -#include "cdf_lock.h" -#include "cdf_types.h" -#include "cdf_status.h" -#include "cds_api.h" -#include "regtable.h" -#include "hif.h" -#include "hif_io32.h" -#include "ce_main.h" -#include "ce_api.h" -#include "ce_reg.h" -#include "ce_internal.h" -#ifdef CONFIG_CNSS -#include -#ifdef HIF_PCI -#include "icnss_stub.h" -#else -#include -#endif /* HIF_PCI */ -#endif -#include "hif_debug.h" -#include "hif_napi.h" - - -/** - * ce_irq_status() - read CE IRQ status - * @scn: struct ol_softc - * @ce_id: ce_id - * @host_status: host_status - * - * Return: IRQ status - */ -static inline void ce_irq_status(struct ol_softc *scn, - int ce_id, uint32_t *host_status) -{ - uint32_t offset = HOST_IS_ADDRESS + CE_BASE_ADDRESS(ce_id); - - *host_status = hif_read32_mb(scn->mem + offset); -} - -/** - * reschedule_ce_tasklet_work_handler() - reschedule work - * @ce_id: ce_id - * - * Return: N/A - */ -static void reschedule_ce_tasklet_work_handler(int ce_id) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct HIF_CE_state *hif_ce_state; - - if (NULL == scn) { - HIF_ERROR("%s: tasklet scn is null", __func__); - return; - } - hif_ce_state = (struct HIF_CE_state *)scn->hif_hdl; - - if (scn->hif_init_done == false) { - HIF_ERROR("%s: wlan driver is unloaded", __func__); - return; - } - tasklet_schedule(&hif_ce_state->tasklets[ce_id].intr_tq); - return; -} - -/** - * struct tasklet_work - * - * @id: ce_id - * @work: work - */ -struct tasklet_work { - enum ce_id_type id; - struct work_struct work; -}; - -static struct tasklet_work tasklet_workers[CE_ID_MAX]; -static bool work_initialized; - -/** - * work_handler() - work_handler - * @work: struct work_struct - * - * Return: N/A - */ -static void work_handler(struct work_struct *work) -{ - struct tasklet_work *tmp; - - tmp = container_of(work, struct tasklet_work, work); - reschedule_ce_tasklet_work_handler(tmp->id); -} - -/** - * init_tasklet_work() - init_tasklet_work - * @work: struct work_struct - * @work_handler: work_handler - * - * Return: N/A - */ -#ifdef CONFIG_CNSS -static void init_tasklet_work(struct work_struct *work, - work_func_t work_handler) -{ - cnss_init_work(work, work_handler); -} -#else -static void init_tasklet_work(struct work_struct *work, - work_func_t work_handler) -{ - INIT_WORK(work, work_handler); -} -#endif - -/** - * init_tasklet_workers() - init_tasklet_workers - * - * Return: N/A - */ -void init_tasklet_workers(void) -{ - uint32_t id; - - for (id = 0; id < CE_ID_MAX; id++) { - tasklet_workers[id].id = id; - init_tasklet_work(&tasklet_workers[id].work, work_handler); - } - work_initialized = true; -} - -#ifdef CONFIG_SLUB_DEBUG_ON -/** - * ce_schedule_tasklet() - schedule ce tasklet - * @tasklet_entry: struct ce_tasklet_entry - * - * Return: N/A - */ -static inline void ce_schedule_tasklet(struct ce_tasklet_entry *tasklet_entry) -{ - if (work_initialized && (tasklet_entry->ce_id < CE_ID_MAX)) - schedule_work(&tasklet_workers[tasklet_entry->ce_id].work); - else - HIF_ERROR("%s: work_initialized = %d, ce_id = %d", - __func__, work_initialized, tasklet_entry->ce_id); -} -#else -/** - * ce_schedule_tasklet() - schedule ce tasklet - * @tasklet_entry: struct ce_tasklet_entry - * - * Return: N/A - */ -static inline void ce_schedule_tasklet(struct ce_tasklet_entry *tasklet_entry) -{ - tasklet_schedule(&tasklet_entry->intr_tq); -} -#endif - -/** - * ce_tasklet() - ce_tasklet - * @data: data - * - * Return: N/A - */ -static void ce_tasklet(unsigned long data) -{ - struct ce_tasklet_entry *tasklet_entry = - (struct ce_tasklet_entry *)data; - struct HIF_CE_state *hif_ce_state = tasklet_entry->hif_ce_state; - struct ol_softc *scn = hif_ce_state->scn; - struct CE_state *CE_state = scn->ce_id_to_state[tasklet_entry->ce_id]; - - hif_record_ce_desc_event(tasklet_entry->ce_id, HIF_CE_TASKLET_ENTRY, - NULL, NULL, 0); - - if (cdf_atomic_read(&scn->link_suspended)) { - HIF_ERROR("%s: ce %d tasklet fired after link suspend.", - __func__, tasklet_entry->ce_id); - CDF_BUG(0); - } - - ce_per_engine_service(scn, tasklet_entry->ce_id); - - if (CE_state->lro_flush_cb != NULL) { - CE_state->lro_flush_cb(CE_state->lro_data); - } - - if (ce_check_rx_pending(scn, tasklet_entry->ce_id)) { - /* - * There are frames pending, schedule tasklet to process them. - * Enable the interrupt only when there is no pending frames in - * any of the Copy Engine pipes. - */ - hif_record_ce_desc_event(tasklet_entry->ce_id, - HIF_CE_TASKLET_RESCHEDULE, NULL, NULL, 0); - ce_schedule_tasklet(tasklet_entry); - return; - } - - if (scn->target_status != OL_TRGET_STATUS_RESET) - ce_irq_enable(scn, tasklet_entry->ce_id); - - hif_record_ce_desc_event(tasklet_entry->ce_id, HIF_CE_TASKLET_EXIT, - NULL, NULL, 0); - - cdf_atomic_dec(&scn->active_tasklet_cnt); -} -/** - * ce_tasklet_init() - ce_tasklet_init - * @hif_ce_state: hif_ce_state - * @mask: mask - * - * Return: N/A - */ -void ce_tasklet_init(struct HIF_CE_state *hif_ce_state, uint32_t mask) -{ - int i; - - for (i = 0; i < CE_COUNT_MAX; i++) { - if (mask & (1 << i)) { - hif_ce_state->tasklets[i].ce_id = i; - hif_ce_state->tasklets[i].inited = true; - hif_ce_state->tasklets[i].hif_ce_state = hif_ce_state; - tasklet_init(&hif_ce_state->tasklets[i].intr_tq, - ce_tasklet, - (unsigned long)&hif_ce_state->tasklets[i]); - } - } -} -/** - * ce_tasklet_kill() - ce_tasklet_kill - * @hif_ce_state: hif_ce_state - * - * Return: N/A - */ -void ce_tasklet_kill(struct HIF_CE_state *hif_ce_state) -{ - int i; - struct ol_softc *scn = hif_ce_state->scn; - - for (i = 0; i < CE_COUNT_MAX; i++) - if (hif_ce_state->tasklets[i].inited) { - tasklet_kill(&hif_ce_state->tasklets[i].intr_tq); - hif_ce_state->tasklets[i].inited = false; - } - cdf_atomic_set(&scn->active_tasklet_cnt, 0); -} -/** - * ce_irq_handler() - ce_irq_handler - * @ce_id: ce_id - * @context: context - * - * Return: N/A - */ -static irqreturn_t ce_irq_handler(int irq, void *context) -{ - struct ce_tasklet_entry *tasklet_entry = context; - struct HIF_CE_state *hif_ce_state = tasklet_entry->hif_ce_state; - struct ol_softc *scn = hif_ce_state->scn; - uint32_t host_status; - int ce_id = icnss_get_ce_id(irq); - - if (tasklet_entry->ce_id != ce_id) { - HIF_ERROR("%s: ce_id (expect %d, received %d) does not match", - __func__, tasklet_entry->ce_id, ce_id); - return IRQ_NONE; - } - if (unlikely(ce_id >= CE_COUNT_MAX)) { - HIF_ERROR("%s: ce_id=%d > CE_COUNT_MAX=%d", - __func__, tasklet_entry->ce_id, CE_COUNT_MAX); - return IRQ_NONE; - } -#ifndef HIF_PCI - disable_irq_nosync(irq); -#endif - ce_irq_disable(scn, ce_id); - ce_irq_status(scn, ce_id, &host_status); - cdf_atomic_inc(&scn->active_tasklet_cnt); - hif_record_ce_desc_event(ce_id, HIF_IRQ_EVENT, NULL, NULL, 0); - if (hif_napi_enabled(scn, ce_id)) - hif_napi_schedule(scn, ce_id); - else - tasklet_schedule(&tasklet_entry->intr_tq); - - return IRQ_HANDLED; -} - -/** - * const char *ce_name - * - * @ce_name: ce_name - */ -const char *ce_name[ICNSS_MAX_IRQ_REGISTRATIONS] = { - "WLAN_CE_0", - "WLAN_CE_1", - "WLAN_CE_2", - "WLAN_CE_3", - "WLAN_CE_4", - "WLAN_CE_5", - "WLAN_CE_6", - "WLAN_CE_7", - "WLAN_CE_8", - "WLAN_CE_9", - "WLAN_CE_10", - "WLAN_CE_11", -}; -/** - * ce_unregister_irq() - ce_unregister_irq - * @hif_ce_state: hif_ce_state copy engine device handle - * @mask: which coppy engines to unregister for. - * - * Unregisters copy engine irqs matching mask. If a 1 is set at bit x, - * unregister for copy engine x. - * - * Return: CDF_STATUS - */ -CDF_STATUS ce_unregister_irq(struct HIF_CE_state *hif_ce_state, uint32_t mask) -{ - int id; - int ret; - - if (hif_ce_state == NULL) { - HIF_WARN("%s: hif_ce_state = NULL", __func__); - return CDF_STATUS_SUCCESS; - } - for (id = 0; id < CE_COUNT_MAX; id++) { - if ((mask & (1 << id)) && hif_ce_state->tasklets[id].inited) { - ret = icnss_ce_free_irq(id, - &hif_ce_state->tasklets[id]); - if (ret < 0) - HIF_ERROR( - "%s: icnss_unregister_irq error - ce_id = %d, ret = %d", - __func__, id, ret); - } - } - return CDF_STATUS_SUCCESS; -} -/** - * ce_register_irq() - ce_register_irq - * @hif_ce_state: hif_ce_state - * @mask: which coppy engines to unregister for. - * - * Registers copy engine irqs matching mask. If a 1 is set at bit x, - * Register for copy engine x. - * - * Return: CDF_STATUS - */ -CDF_STATUS ce_register_irq(struct HIF_CE_state *hif_ce_state, uint32_t mask) -{ - int id; - int ret; - unsigned long irqflags = IRQF_TRIGGER_RISING; - uint32_t done_mask = 0; - - for (id = 0; id < CE_COUNT_MAX; id++) { - if ((mask & (1 << id)) && hif_ce_state->tasklets[id].inited) { - ret = icnss_ce_request_irq(id, ce_irq_handler, - irqflags, ce_name[id], - &hif_ce_state->tasklets[id]); - if (ret) { - HIF_ERROR( - "%s: cannot register CE %d irq handler, ret = %d", - __func__, id, ret); - ce_unregister_irq(hif_ce_state, done_mask); - return CDF_STATUS_E_FAULT; - } else { - done_mask |= 1 << id; - } - } - } - -#ifndef HIF_PCI - /* move to hif_configure_irq */ - ce_enable_irq_in_group_reg(hif_ce_state->scn, done_mask); -#endif - - return CDF_STATUS_SUCCESS; -} diff --git a/core/hif/src/ce/ce_tasklet.h b/core/hif/src/ce/ce_tasklet.h deleted file mode 100644 index bcfd75cc3e1c..000000000000 --- a/core/hif/src/ce/ce_tasklet.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __CE_TASKLET_H__ -#define __CE_TASKLET_H__ -#include "ce_main.h" -void init_tasklet_workers(void); -void ce_tasklet_init(struct HIF_CE_state *hif_ce_state, uint32_t mask); -void ce_tasklet_kill(struct HIF_CE_state *hif_ce_state); -CDF_STATUS ce_register_irq(struct HIF_CE_state *hif_ce_state, uint32_t mask); -CDF_STATUS ce_unregister_irq(struct HIF_CE_state *hif_ce_state, uint32_t mask); -#endif /* __CE_TASKLET_H__ */ diff --git a/core/hif/src/hif_debug.h b/core/hif/src/hif_debug.h deleted file mode 100644 index 4ab7d1f8e05f..000000000000 --- a/core/hif/src/hif_debug.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef __HIF_DEBUG_H__ -#define __HIF_DEBUG_H__ -#include "cdf_trace.h" - -#define HIF_ERROR(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_ERROR, ## args) -#define HIF_WARN(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_WARN, ## args) -#define HIF_INFO(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_INFO, ## args) -#define HIF_INFO_HI(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_INFO_HIGH, ## args) -#define HIF_INFO_MED(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_INFO_MED, ## args) -#define HIF_INFO_LO(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_INFO_LOW, ## args) -#define HIF_TRACE(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_ERROR, ## args) -#define HIF_DBG(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_DEBUG, ## args) -#endif /* __HIF_DEBUG_H__ */ diff --git a/core/hif/src/hif_hw_version.h b/core/hif/src/hif_hw_version.h deleted file mode 100644 index d5d76dc05942..000000000000 --- a/core/hif/src/hif_hw_version.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - - -#ifndef HIF_HW_VERSION_H -#define HIF_HW_VERSION_H - -#define AR6320_REV1_VERSION 0x5000000 -#define AR6320_REV1_1_VERSION 0x5000001 -#define AR6320_REV1_3_VERSION 0x5000003 -#define AR6320_REV2_1_VERSION 0x5010000 -#define AR6320_REV3_VERSION 0x5020000 -#define AR6320_REV3_2_VERSION 0x5030000 - -struct qwlan_hw { - u32 id; - u32 subid; - const char *name; -}; - -static const struct qwlan_hw qwlan_hw_list[] = { - { - .id = AR6320_REV1_VERSION, - .subid = 0, - .name = "QCA6174_REV1", - }, - { - .id = AR6320_REV1_1_VERSION, - .subid = 0x1, - .name = "QCA6174_REV1_1", - }, - { - .id = AR6320_REV1_3_VERSION, - .subid = 0x2, - .name = "QCA6174_REV1_3", - }, - { - .id = AR6320_REV2_1_VERSION, - .subid = 0x4, - .name = "QCA6174_REV2_1", - }, - { - .id = AR6320_REV2_1_VERSION, - .subid = 0x5, - .name = "QCA6174_REV2_2", - }, - { - .id = AR6320_REV3_VERSION, - .subid = 0x6, - .name = "QCA6174_REV2.3", - }, - { - .id = AR6320_REV3_VERSION, - .subid = 0x8, - .name = "QCA6174_REV3", - }, - { - .id = AR6320_REV3_VERSION, - .subid = 0x9, - .name = "QCA6174_REV3_1", - }, - { - .id = AR6320_REV3_2_VERSION, - .subid = 0xA, - .name = "AR6320_REV3_2_VERSION", - } -}; - -#endif /* HIF_HW_VERSION_H */ diff --git a/core/hif/src/hif_io32.h b/core/hif/src/hif_io32.h deleted file mode 100644 index d711ff719f02..000000000000 --- a/core/hif/src/hif_io32.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __HIF_IO32_H__ -#define __HIF_IO32_H__ - -#include -#include "ol_if_athvar.h" -#include "hif.h" -#ifdef HIF_PCI -#include "hif_io32_pci.h" -#else -#include "hif_io32_snoc.h" -#endif /* HIF_PCI */ -#endif /* __HIF_IO32_H__ */ diff --git a/core/hif/src/hif_main.c b/core/hif/src/hif_main.c deleted file mode 100644 index b9a7700c6c4b..000000000000 --- a/core/hif/src/hif_main.c +++ /dev/null @@ -1,881 +0,0 @@ -/* - * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include "a_types.h" -#include "athdefs.h" -#include "osapi_linux.h" -#include "targcfg.h" -#include "cdf_lock.h" -#include "cdf_status.h" -#include /* cdf_atomic_read */ -#include -#include -#include "hif_io32.h" -#include -#include -#include "regtable.h" -#define ATH_MODULE_NAME hif -#include -#include "hif_main.h" -#include "hif_hw_version.h" -#include "ce_api.h" -#include "ce_tasklet.h" -#include "cdf_trace.h" -#include "cdf_status.h" -#include "cds_api.h" -#ifdef CONFIG_CNSS -#include -#endif -#include "epping_main.h" -#include "hif_debug.h" -#include "mp_dev.h" -#ifdef HIF_PCI -#include "icnss_stub.h" -#else -#include -#endif - -#ifndef REMOVE_PKT_LOG -#include "pktlog_ac.h" -#endif - -#include "cds_concurrency.h" - -#define AGC_DUMP 1 -#define CHANINFO_DUMP 2 -#define BB_WATCHDOG_DUMP 3 -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -#define PCIE_ACCESS_DUMP 4 -#endif - -void hif_dump(struct ol_softc *scn, uint8_t cmd_id, bool start) -{ - switch (cmd_id) { - case AGC_DUMP: - if (start) - priv_start_agc(scn); - else - priv_dump_agc(scn); - break; - - case CHANINFO_DUMP: - if (start) - priv_start_cap_chaninfo(scn); - else - priv_dump_chaninfo(scn); - break; - - case BB_WATCHDOG_DUMP: - priv_dump_bbwatchdog(scn); - break; - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG - case PCIE_ACCESS_DUMP: - hif_target_dump_access_log(); - break; -#endif - default: - HIF_ERROR("%s: Invalid htc dump command", __func__); - break; - } -} - -/** - * hif_shut_down_device() - hif_shut_down_device - * - * SThis fucntion shuts down the device - * - * @scn: ol_softc - * - * Return: void - */ -void hif_shut_down_device(struct ol_softc *scn) -{ - if (scn && scn->hif_hdl) { - struct HIF_CE_state *hif_state = - (struct HIF_CE_state *)scn->hif_hdl; - - hif_stop(scn); - cdf_mem_free(hif_state); - scn->hif_hdl = NULL; - } - -} - - - -/** - * hif_cancel_deferred_target_sleep() - cancel deferred target sleep - * - * This function cancels the defered target sleep - * - * @scn: ol_softc - * - * Return: void - */ -void hif_cancel_deferred_target_sleep(struct ol_softc *scn) -{ - hif_pci_cancel_deferred_target_sleep(scn); -} - -/** - * hif_get_target_id(): hif_get_target_id - * - * Return the virtual memory base address to the caller - * - * @scn: ol_softc - * - * Return: A_target_id_t - */ -A_target_id_t hif_get_target_id(struct ol_softc *scn) -{ - return scn->mem; -} - -/** - * hif_set_target_sleep(): hif_set_target_sleep - * @scn: scn - * @sleep_ok: sleep_ok - * @wait_for_it: wait - * - * Return: void - */ -void hif_set_target_sleep(struct ol_softc *scn, - bool sleep_ok, bool wait_for_it) -{ - hif_target_sleep_state_adjust(scn, - sleep_ok, wait_for_it); -} - -/** - * hif_target_forced_awake(): hif_target_forced_awake - * @scn: scn - * - * Return: bool - */ -bool hif_target_forced_awake(struct ol_softc *scn) -{ - A_target_id_t addr = scn->mem; - bool awake; - bool forced_awake; - - awake = hif_targ_is_awake(scn, addr); - - forced_awake = - !!(hif_read32_mb - (addr + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS) & PCIE_SOC_WAKE_V_MASK); - - return awake && forced_awake; -} - - -static inline void hif_fw_event_handler(struct HIF_CE_state *hif_state) -{ - struct hif_msg_callbacks *msg_callbacks = - &hif_state->msg_callbacks_current; - - if (!msg_callbacks->fwEventHandler) - return; - - msg_callbacks->fwEventHandler(msg_callbacks->Context, - CDF_STATUS_E_FAILURE); -} - -/** - * hif_fw_interrupt_handler(): FW interrupt handler - * - * This function is the FW interrupt handlder - * - * @irq: irq number - * @arg: the user pointer - * - * Return: bool - */ -#ifndef QCA_WIFI_3_0 -irqreturn_t hif_fw_interrupt_handler(int irq, void *arg) -{ - struct ol_softc *scn = arg; - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - uint32_t fw_indicator_address, fw_indicator; - - A_TARGET_ACCESS_BEGIN_RET(scn); - - fw_indicator_address = hif_state->fw_indicator_address; - /* For sudden unplug this will return ~0 */ - fw_indicator = A_TARGET_READ(scn, fw_indicator_address); - - if ((fw_indicator != ~0) && (fw_indicator & FW_IND_EVENT_PENDING)) { - /* ACK: clear Target-side pending event */ - A_TARGET_WRITE(scn, fw_indicator_address, - fw_indicator & ~FW_IND_EVENT_PENDING); - A_TARGET_ACCESS_END_RET(scn); - - if (hif_state->started) { - hif_fw_event_handler(hif_state); - } else { - /* - * Probable Target failure before we're prepared - * to handle it. Generally unexpected. - */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("%s: Early firmware event indicated\n", - __func__)); - } - } else { - A_TARGET_ACCESS_END_RET(scn); - } - - return ATH_ISR_SCHED; -} -#else -irqreturn_t hif_fw_interrupt_handler(int irq, void *arg) -{ - return ATH_ISR_SCHED; -} -#endif /* #ifdef QCA_WIFI_3_0 */ - -/** - * hif_get_targetdef(): hif_get_targetdef - * @scn: scn - * - * Return: void * - */ -void *hif_get_targetdef(struct ol_softc *scn) -{ - return scn->targetdef; -} - -/** - * hif_vote_link_down(): unvote for link up - * - * Call hif_vote_link_down to release a previous request made using - * hif_vote_link_up. A hif_vote_link_down call should only be made - * after a corresponding hif_vote_link_up, otherwise you could be - * negating a vote from another source. When no votes are present - * hif will not guarantee the linkstate after hif_bus_suspend. - * - * SYNCHRONIZE WITH hif_vote_link_up by only calling in MC thread - * and initialization deinitialization sequencences. - * - * Return: n/a - */ -void hif_vote_link_down(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - CDF_BUG(scn); - - scn->linkstate_vote--; - if (scn->linkstate_vote == 0) - hif_bus_prevent_linkdown(scn, false); -} - -/** - * hif_vote_link_up(): vote to prevent bus from suspending - * - * Makes hif guarantee that fw can message the host normally - * durring suspend. - * - * SYNCHRONIZE WITH hif_vote_link_up by only calling in MC thread - * and initialization deinitialization sequencences. - * - * Return: n/a - */ -void hif_vote_link_up(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - CDF_BUG(scn); - - scn->linkstate_vote++; - if (scn->linkstate_vote == 1) - hif_bus_prevent_linkdown(scn, true); -} - -/** - * hif_can_suspend_link(): query if hif is permitted to suspend the link - * - * Hif will ensure that the link won't be suspended if the upperlayers - * don't want it to. - * - * SYNCHRONIZATION: MC thread is stopped before bus suspend thus - * we don't need extra locking to ensure votes dont change while - * we are in the process of suspending or resuming. - * - * Return: false if hif will guarantee link up durring suspend. - */ -bool hif_can_suspend_link(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - CDF_BUG(scn); - - return scn->linkstate_vote == 0; -} - -/** - * hif_hia_item_address(): hif_hia_item_address - * @target_type: target_type - * @item_offset: item_offset - * - * Return: n/a - */ -uint32_t hif_hia_item_address(uint32_t target_type, uint32_t item_offset) -{ - switch (target_type) { - case TARGET_TYPE_AR6002: - return AR6002_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_AR6003: - return AR6003_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_AR6004: - return AR6004_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_AR6006: - return AR6006_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_AR9888: - return AR9888_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_AR6320: - case TARGET_TYPE_AR6320V2: - return AR6320_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_QCA6180: - return QCA6180_HOST_INTEREST_ADDRESS + item_offset; - case TARGET_TYPE_ADRASTEA: - /* ADRASTEA doesn't have a host interest address */ - ASSERT(0); - return 0; - default: - ASSERT(0); - return 0; - } -} - -/** - * hif_max_num_receives_reached() - check max receive is reached - * @count: unsigned int. - * - * Output check status as bool - * - * Return: bool - */ -bool hif_max_num_receives_reached(unsigned int count) -{ - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) - return count > 120; - else - return count > MAX_NUM_OF_RECEIVES; -} - -/** - * init_buffer_count() - initial buffer count - * @maxSize: cdf_size_t - * - * routine to modify the initial buffer count to be allocated on an os - * platform basis. Platform owner will need to modify this as needed - * - * Return: cdf_size_t - */ -cdf_size_t init_buffer_count(cdf_size_t maxSize) -{ - return maxSize; -} - -/** - * hif_init_cdf_ctx(): hif_init_cdf_ctx - * @hif_ctx: hif_ctx - * - * Return: int - */ -int hif_init_cdf_ctx(void *hif_ctx) -{ - cdf_device_t cdf_ctx; - struct ol_softc *scn = (struct ol_softc *)hif_ctx; - - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); - if (!cdf_ctx) { - HIF_ERROR("%s: CDF is NULL", __func__); - return -ENOMEM; - } - - cdf_ctx->drv = &scn->aps_osdev; - cdf_ctx->drv_hdl = scn->aps_osdev.bdev; - cdf_ctx->dev = scn->aps_osdev.device; - scn->cdf_dev = cdf_ctx; - return 0; -} - -/** - * hif_deinit_cdf_ctx(): hif_deinit_cdf_ctx - * @hif_ctx: hif_ctx - * - * Return: void - */ -void hif_deinit_cdf_ctx(void *hif_ctx) -{ - struct ol_softc *scn = (struct ol_softc *)hif_ctx; - - if (scn == NULL || !scn->cdf_dev) - return; - scn->cdf_dev = NULL; -} - -/** - * hif_save_htc_htt_config_endpoint(): - * hif_save_htc_htt_config_endpoint - * @htc_endpoint: htc_endpoint - * - * Return: void - */ -void hif_save_htc_htt_config_endpoint(int htc_endpoint) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - - if (!scn) { - HIF_ERROR("%s: error: scn or scn->hif_sc is NULL!", - __func__); - return; - } - - scn->htc_endpoint = htc_endpoint; -} - -/** - * hif_get_hw_name(): get a human readable name for the hardware - * - * Return: human readible name for the underlying wifi hardware. - */ -const char *hif_get_hw_name(struct ol_softc *scn) -{ - int i; - for (i = 0; i < ARRAY_SIZE(qwlan_hw_list); i++) { - if (scn->target_version == qwlan_hw_list[i].id && - scn->target_revision == qwlan_hw_list[i].subid) { - return qwlan_hw_list[i].name; - } - } - - return "Unknown Device"; -} - -/** - * hif_get_hw_info(): hif_get_hw_info - * @scn: scn - * @version: version - * @revision: revision - * - * Return: n/a - */ -void hif_get_hw_info(void *scn, u32 *version, u32 *revision, - const char **target_name) -{ - *version = ((struct ol_softc *)scn)->target_version; - *revision = ((struct ol_softc *)scn)->target_revision; - *target_name = hif_get_hw_name((struct ol_softc *)scn); -} - -/** - * hif_set_fw_info(): set the target_fw_version - * @scn: scn - * @target_fw_version: target_fw_version - * - * Return: n/a - */ -void hif_set_fw_info(void *scn, uint32_t target_fw_version) -{ - ((struct ol_softc *)scn)->target_fw_version = target_fw_version; -} - -/** - * hif_open(): hif_open - * - * Return: scn - */ -CDF_STATUS hif_open(enum ath_hal_bus_type bus_type) -{ - struct ol_softc *scn; - v_CONTEXT_t cds_context; - CDF_STATUS status = CDF_STATUS_SUCCESS; - - cds_context = cds_get_global_context(); - status = cds_alloc_context(cds_context, CDF_MODULE_ID_HIF, - (void **)&scn, sizeof(*scn)); - if (status != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: cannot alloc ol_sc", __func__); - return status; - } - - cdf_mem_zero(scn, sizeof(*scn)); - scn->enableuartprint = 0; - scn->enablefwlog = 0; - scn->max_no_of_peers = 1; - scn->pkt_log_init = false; - cdf_atomic_init(&scn->wow_done); - cdf_atomic_init(&scn->active_tasklet_cnt); - cdf_atomic_init(&scn->link_suspended); - cdf_atomic_init(&scn->tasklet_from_intr); - init_waitqueue_head(&scn->aps_osdev.event_queue); - scn->linkstate_vote = 0; - - status = hif_bus_open(scn, bus_type); - if (status != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: hif_bus_open error = %d, bus_type = %d", - __func__, status, bus_type); - cds_free_context(cds_context, CDF_MODULE_ID_HIF, scn); - } - - return status; -} - -/** - * hif_close(): hif_close - * @hif_ctx: hif_ctx - * - * Return: n/a - */ -void hif_close(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - - if (scn == NULL) { - HIF_ERROR("%s: ol_softc is NULL", __func__); - return; - } - - if (scn->athdiag_procfs_inited) { - athdiag_procfs_remove(); - scn->athdiag_procfs_inited = false; - } - - if (scn->hif_hdl) { - cdf_mem_free(scn->hif_hdl); - scn->hif_hdl = NULL; - } - hif_bus_close(scn); - cds_free_context(cds_get_global_context(), - CDF_MODULE_ID_HIF, hif_ctx); -} - -/** - * hif_enable(): hif_enable - * @hif_ctx: hif_ctx - * @dev: dev - * @bdev: bus dev - * @bid: bus ID - * @bus_type: bus type - * @type: enable type - * - * Return: CDF_STATUS - */ -CDF_STATUS hif_enable(void *hif_ctx, struct device *dev, - void *bdev, const hif_bus_id *bid, - enum ath_hal_bus_type bus_type, - enum hif_enable_type type) -{ - CDF_STATUS status; - struct ol_softc *scn = hif_ctx; - - if (scn == NULL) { - HIF_ERROR("%s: hif_ctx = NULL", __func__); - return CDF_STATUS_E_NULL_VALUE; - } - - status = hif_enable_bus(scn, dev, bdev, bid, type); - if (status != CDF_STATUS_SUCCESS) { - HIF_ERROR("%s: hif_enable_bus error = %d", - __func__, status); - return status; - } - - if (ADRASTEA_BU) - hif_vote_link_up(); - - if (hif_config_ce(scn)) { - HIF_ERROR("%s: Target probe failed.", __func__); - hif_disable_bus(scn->aps_osdev.bdev); - status = CDF_STATUS_E_FAILURE; - return status; - } - /* - * Flag to avoid potential unallocated memory access from MSI - * interrupt handler which could get scheduled as soon as MSI - * is enabled, i.e to take care of the race due to the order - * in where MSI is enabled before the memory, that will be - * in interrupt handlers, is allocated. - */ - -#ifdef HIF_PCI - status = hif_configure_irq(scn->hif_sc); - if (status < 0) { - HIF_ERROR("%s: ERROR - configure_IRQ_and_CE failed, status = %d", - __func__, status); - return CDF_STATUS_E_FAILURE; - } -#endif - - scn->hif_init_done = true; - - HIF_TRACE("%s: X OK", __func__); - - return CDF_STATUS_SUCCESS; -} - -/** - * hif_pktlogmod_exit(): hif_pktlogmod_exit - * @scn: scn - * - * Return: n/a - */ -#ifndef REMOVE_PKT_LOG -void hif_pktlogmod_exit(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - - if (scn && cds_get_conparam() != CDF_GLOBAL_FTM_MODE && - !WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && scn->pkt_log_init) { - pktlogmod_exit(scn); - scn->pkt_log_init = false; - } -} -#else -void hif_pktlogmod_exit(void *hif_ctx) -{ -} -#endif - -/** - * hif_wlan_disable(): call the platform driver to disable wlan - * - * This function passes the con_mode to platform driver to disable - * wlan. - * - * Return: void - */ -void hif_wlan_disable(void) -{ - enum icnss_driver_mode mode; - uint32_t con_mode = cds_get_conparam(); - - if (CDF_GLOBAL_FTM_MODE == con_mode) - mode = ICNSS_FTM; - else if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) - mode = ICNSS_EPPING; - else - mode = ICNSS_MISSION; - - icnss_wlan_disable(mode); -} - -void hif_disable(void *hif_ctx, enum hif_disable_type type) -{ - struct ol_softc *scn = hif_ctx; - - if (!scn) - return; - - hif_nointrs(scn); - if (scn->hif_init_done == false) - hif_shut_down_device(scn); - else - hif_stop(scn); - - if (ADRASTEA_BU) - hif_vote_link_down(); - - if (scn->aps_osdev.bdev) - hif_disable_bus(scn->aps_osdev.bdev); - - hif_wlan_disable(); - - scn->notice_send = false; - - HIF_INFO("%s: X", __func__); -} - - -/** - * hif_crash_shutdown_dump_bus_register() - dump bus registers - * @hif_ctx: hif_ctx - * - * Return: n/a - */ -#if defined(TARGET_RAMDUMP_AFTER_KERNEL_PANIC) \ -&& defined(HIF_PCI) && defined(DEBUG) - -static void hif_crash_shutdown_dump_bus_register(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - - if (hif_check_soc_status(scn)) - return; - - if (hif_dump_registers(scn)) - HIF_ERROR("Failed to dump bus registers!"); -} - -/** - * hif_crash_shutdown(): hif_crash_shutdown - * - * This function is called by the platform driver to dump CE registers - * - * @hif_ctx: hif_ctx - * - * Return: n/a - */ -void hif_crash_shutdown(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - struct HIF_CE_state *hif_state; - - if (!scn) - return; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - if (!hif_state) - return; - - - if (OL_TRGET_STATUS_RESET == scn->target_status) { - HIF_INFO_MED("%s: Target is already asserted, ignore!", - __func__); - return; - } - - if (cds_is_load_or_unload_in_progress()) { - HIF_ERROR("%s: Load/unload is in progress, ignore!", __func__); - return; - } - - hif_crash_shutdown_dump_bus_register(hif_ctx); - - if (ol_copy_ramdump(scn)) - goto out; - - HIF_INFO_MED("%s: RAM dump collecting completed!", __func__); - -out: - return; -} -#else -void hif_crash_shutdown(void *hif_ctx) -{ - HIF_INFO_MED("%s: Collecting target RAM dump disabled", - __func__); - return; -} -#endif /* TARGET_RAMDUMP_AFTER_KERNEL_PANIC */ - -#ifdef QCA_WIFI_3_0 -/** - * hif_check_fw_reg(): hif_check_fw_reg - * @scn: scn - * @state: - * - * Return: int - */ -int hif_check_fw_reg(struct ol_softc *scn) -{ - return 0; -} -#endif - -#ifdef IPA_OFFLOAD -/** - * hif_read_phy_mem_base(): hif_read_phy_mem_base - * @scn: scn - * @phy_mem_base: physical mem base - * - * Return: n/a - */ -void hif_read_phy_mem_base(struct ol_softc *scn, cdf_dma_addr_t *phy_mem_base) -{ - *phy_mem_base = scn->mem_pa; -} -#endif /* IPA_OFFLOAD */ - -/** - * hif_get_device_type(): hif_get_device_type - * @device_id: device_id - * @revision_id: revision_id - * @hif_type: returned hif_type - * @target_type: returned target_type - * - * Return: int - */ -int hif_get_device_type(uint32_t device_id, - uint32_t revision_id, - uint32_t *hif_type, uint32_t *target_type) -{ - int ret = 0; - - switch (device_id) { -#ifdef QCA_WIFI_3_0_ADRASTEA - case ADRASTEA_DEVICE_ID: - case ADRASTEA_DEVICE_ID_P2_E12: - - *hif_type = HIF_TYPE_ADRASTEA; - *target_type = TARGET_TYPE_ADRASTEA; - break; -#else - case QCA6180_DEVICE_ID: - *hif_type = HIF_TYPE_QCA6180; - *target_type = TARGET_TYPE_QCA6180; - break; -#endif - - case AR9888_DEVICE_ID: - *hif_type = HIF_TYPE_AR9888; - *target_type = TARGET_TYPE_AR9888; - break; - - case AR6320_DEVICE_ID: - switch (revision_id) { - case AR6320_FW_1_1: - case AR6320_FW_1_3: - *hif_type = HIF_TYPE_AR6320; - *target_type = TARGET_TYPE_AR6320; - break; - - case AR6320_FW_2_0: - case AR6320_FW_3_0: - case AR6320_FW_3_2: - *hif_type = HIF_TYPE_AR6320V2; - *target_type = TARGET_TYPE_AR6320V2; - break; - - default: - HIF_ERROR("%s: error - dev_id = 0x%x, rev_id = 0x%x", - __func__, device_id, revision_id); - ret = -ENODEV; - goto end; - } - break; - - default: - HIF_ERROR("%s: Unsupported device ID!", __func__); - ret = -ENODEV; - break; - } -end: - return ret; -} diff --git a/core/hif/src/hif_main.h b/core/hif/src/hif_main.h deleted file mode 100644 index 9544ef823dae..000000000000 --- a/core/hif/src/hif_main.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * NB: Inappropriate references to "HTC" are used in this (and other) - * HIF implementations. HTC is typically the calling layer, but it - * theoretically could be some alternative. - */ - -/* - * This holds all state needed to process a pending send/recv interrupt. - * The information is saved here as soon as the interrupt occurs (thus - * allowing the underlying CE to re-use the ring descriptor). The - * information here is eventually processed by a completion processing - * thread. - */ - -#ifndef __HIF_MAIN_H__ -#define __HIF_MAIN_H__ - -#include /* cdf_atomic_read */ -#include "cdf_lock.h" -#include "cepci.h" -#include "hif.h" - -#define HIF_MIN_SLEEP_INACTIVITY_TIME_MS 50 -#define HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS 60 - -/* - * This macro implementation is exposed for efficiency only. - * The implementation may change and callers should - * consider the targid to be a completely opaque handle. - */ -#define TARGID_TO_PCI_ADDR(targid) (*((A_target_id_t *)(targid))) - -A_target_id_t hif_get_target_id(struct ol_softc *scn); -bool hif_target_forced_awake(struct ol_softc *scn); - -#ifdef QCA_WIFI_3_0 -#define DISABLE_L1SS_STATES 1 -#endif -#ifdef CONFIG_SLUB_DEBUG_ON -#define MAX_NUM_OF_RECEIVES 100 /* Maximum number of Rx buf to process before* - * break out in SLUB debug builds */ -#elif defined(FEATURE_NAPI) -#define MAX_NUM_OF_RECEIVES HIF_NAPI_MAX_RECEIVES -#else /* no SLUBS, no NAPI */ -/* Maximum number of Rx buf to process before break out */ -#define MAX_NUM_OF_RECEIVES 1000 -#endif /* SLUB_DEBUG_ON / FEATURE_NAPI */ - -#ifdef QCA_WIFI_3_0_ADRASTEA -#define ADRASTEA_BU 1 -#else -#define ADRASTEA_BU 0 -#endif - -#ifdef QCA_WIFI_3_0 -#define HAS_FW_INDICATOR 0 -#else -#define HAS_FW_INDICATOR 1 -#endif - - -#define AR9888_DEVICE_ID (0x003c) -#define AR6320_DEVICE_ID (0x003e) -#define AR6320_FW_1_1 (0x11) -#define AR6320_FW_1_3 (0x13) -#define AR6320_FW_2_0 (0x20) -#define AR6320_FW_3_0 (0x30) -#define AR6320_FW_3_2 (0x32) -#define ADRASTEA_DEVICE_ID (0xabcd) -#define ADRASTEA_DEVICE_ID_P2_E12 (0x7021) -#if (defined(QVIT)) -#define QCA6180_DEVICE_ID (0xabcd) -#else -#define QCA6180_DEVICE_ID (0x041) -#endif - -A_target_id_t hif_get_target_id(struct ol_softc *scn); -void hif_dump_pipe_debug_count(struct ol_softc *scn); - -bool hif_max_num_receives_reached(unsigned int count); -int hif_config_ce(hif_handle_t hif_hdl); -int athdiag_procfs_init(void *scn); -void athdiag_procfs_remove(void); -/* routine to modify the initial buffer count to be allocated on an os - * platform basis. Platform owner will need to modify this as needed - */ -cdf_size_t init_buffer_count(cdf_size_t maxSize); - -irqreturn_t hif_fw_interrupt_handler(int irq, void *arg); -int hif_get_target_type(struct ol_softc *ol_sc, struct device *dev, - void *bdev, const hif_bus_id *bid, uint32_t *hif_type, - uint32_t *target_type); -int hif_get_device_type(uint32_t device_id, - uint32_t revision_id, - uint32_t *hif_type, uint32_t *target_type); -/*These functions are exposed to HDD*/ -int hif_init_cdf_ctx(void *ol_sc); -void hif_deinit_cdf_ctx(void *ol_sc); -bool hif_targ_is_awake(struct ol_softc *scn, void *__iomem *mem); -void hif_nointrs(struct ol_softc *scn); -void hif_bus_close(struct ol_softc *ol_sc); -CDF_STATUS hif_bus_open(struct ol_softc *ol_sc, - enum ath_hal_bus_type bus_type); -CDF_STATUS hif_enable_bus(struct ol_softc *ol_sc, struct device *dev, - void *bdev, const hif_bus_id *bid, enum hif_enable_type type); -void hif_disable_bus(void *bdev); -void hif_bus_prevent_linkdown(struct ol_softc *scn, bool flag); - -#endif /* __HIF_MAIN_H__ */ diff --git a/core/hif/src/hif_napi.c b/core/hif/src/hif_napi.c deleted file mode 100644 index 2ef3dfd7c3bb..000000000000 --- a/core/hif/src/hif_napi.c +++ /dev/null @@ -1,464 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: hif_napi.c - * - * HIF NAPI interface implementation - */ - -#include /* memset */ - -#include -#include -#include -#include -#include -#include - -enum napi_decision_vector { - HIF_NAPI_NOEVENT = 0, - HIF_NAPI_INITED = 1, - HIF_NAPI_CONF_UP = 2 -}; -#define ENABLE_NAPI_MASK (HIF_NAPI_INITED | HIF_NAPI_CONF_UP) - -/** - * hif_napi_create() - creates the NAPI structures for a given CE - * @hif : pointer to hif context - * @pipe_id: the CE id on which the instance will be created - * @poll : poll function to be used for this NAPI instance - * @budget : budget to be registered with the NAPI instance - * @scale : scale factor on the weight (to scaler budget to 1000) - * - * Description: - * Creates NAPI instances. This function is called - * unconditionally during initialization. It creates - * napi structures through the proper HTC/HIF calls. - * The structures are disabled on creation. - * Note that for each NAPI instance a separate dummy netdev is used - * - * Return: - * < 0: error - * = 0: - * > 0: id of the created object (for multi-NAPI, number of objects created) - */ -int hif_napi_create(struct ol_softc *hif, - uint8_t pipe_id, - int (*poll)(struct napi_struct *, int), - int budget, - int scale) -{ - struct qca_napi_data *napid; - struct qca_napi_info *napii; - - NAPI_DEBUG("-->(pipe=%d, budget=%d, scale=%d)\n", - pipe_id, budget, scale); - NAPI_DEBUG("hif->napi_data.state = 0x%08x\n", - hif->napi_data.state); - NAPI_DEBUG("hif->napi_data.ce_map = 0x%08x\n", - hif->napi_data.ce_map); - - napid = &(hif->napi_data); - if (0 == (napid->state & HIF_NAPI_INITED)) { - memset(napid, 0, sizeof(struct qca_napi_data)); - mutex_init(&(napid->mutex)); - - init_dummy_netdev(&(napid->netdev)); - - napid->state |= HIF_NAPI_INITED; - HIF_INFO("%s: NAPI structures initialized\n", __func__); - - NAPI_DEBUG("NAPI structures initialized\n"); - } - napii = &(napid->napis[pipe_id]); - memset(napii, 0, sizeof(struct qca_napi_info)); - napii->scale = scale; - napii->id = NAPI_PIPE2ID(pipe_id); - - NAPI_DEBUG("adding napi=%p to netdev=%p (poll=%p, bdgt=%d)\n", - &(napii->napi), &(napid->netdev), poll, budget); - netif_napi_add(&(napid->netdev), &(napii->napi), poll, budget); - - NAPI_DEBUG("after napi_add\n"); - NAPI_DEBUG("napi=0x%p, netdev=0x%p\n", - &(napii->napi), &(napid->netdev)); - NAPI_DEBUG("napi.dev_list.prev=0x%p, next=0x%p\n", - napii->napi.dev_list.prev, napii->napi.dev_list.next); - NAPI_DEBUG("dev.napi_list.prev=0x%p, next=0x%p\n", - napid->netdev.napi_list.prev, napid->netdev.napi_list.next); - - /* It is OK to change the state variable below without protection - * as there should be no-one around yet - */ - napid->ce_map |= (0x01 << pipe_id); - HIF_INFO("%s: NAPI id %d created for pipe %d\n", __func__, - napii->id, pipe_id); - - NAPI_DEBUG("NAPI id %d created for pipe %d\n", napii->id, pipe_id); - NAPI_DEBUG("<--napi_id=%d]\n", napii->id); - return napii->id; -} - -/** - * - * hif_napi_destroy() - destroys the NAPI structures for a given instance - * @hif : pointer to hif context - * @ce_id : the CE id whose napi instance will be destroyed - * @force : if set, will destroy even if entry is active (de-activates) - * - * Description: - * Destroy a given NAPI instance. This function is called - * unconditionally during cleanup. - * Refuses to destroy an entry of it is still enabled (unless force=1) - * Marks the whole napi_data invalid if all instances are destroyed. - * - * Return: - * -EINVAL: specific entry has not been created - * -EPERM : specific entry is still active - * 0 < : error - * 0 = : success - */ -int hif_napi_destroy(struct ol_softc *hif, - uint8_t id, - int force) -{ - uint8_t ce = NAPI_ID2PIPE(id); - int rc = 0; - - NAPI_DEBUG("-->(id=%d, force=%d)\n", id, force); - - if (0 == (hif->napi_data.state & HIF_NAPI_INITED)) { - HIF_ERROR("%s: NAPI not initialized or entry %d not created\n", - __func__, id); - rc = -EINVAL; - } else if (0 == (hif->napi_data.ce_map & (0x01 << ce))) { - HIF_ERROR("%s: NAPI instance %d (pipe %d) not created\n", - __func__, id, ce); - rc = -EINVAL; - } else { - struct qca_napi_data *napid; - struct qca_napi_info *napii; - - napid = &(hif->napi_data); - napii = &(napid->napis[ce]); - - if (hif->napi_data.state == HIF_NAPI_CONF_UP) { - if (force) { - napi_disable(&(napii->napi)); - HIF_INFO("%s: NAPI entry %d force disabled\n", - __func__, id); - NAPI_DEBUG("NAPI %d force disabled\n", id); - } else { - HIF_ERROR("%s: Cannot destroy active NAPI %d\n", - __func__, id); - rc = -EPERM; - } - } - if (0 == rc) { - NAPI_DEBUG("before napi_del\n"); - NAPI_DEBUG("napi.dlist.prv=0x%p, next=0x%p\n", - napii->napi.dev_list.prev, - napii->napi.dev_list.next); - NAPI_DEBUG("dev.napi_l.prv=0x%p, next=0x%p\n", - napid->netdev.napi_list.prev, - napid->netdev.napi_list.next); - - netif_napi_del(&(napii->napi)); - - napid->ce_map &= ~(0x01 << ce); - napii->scale = 0; - HIF_INFO("%s: NAPI %d destroyed\n", __func__, id); - - /* if there are no active instances and - * if they are all destroyed, - * set the whole structure to uninitialized state - */ - if (napid->ce_map == 0) { - /* hif->napi_data.state = 0; */ - memset(napid, - 0, sizeof(struct qca_napi_data)); - HIF_INFO("%s: no NAPI instances. Zapped.\n", - __func__); - } - } - } - - return rc; -} - -/** - * - * hif_napi_get_all() - returns the address of the whole HIF NAPI structure - * @hif: pointer to hif context - * - * Description: - * Returns the address of the whole structure - * - * Return: - * : address of the whole HIF NAPI structure - */ -inline struct qca_napi_data *hif_napi_get_all(struct ol_softc *hif) -{ - return &(hif->napi_data); -} - -/** - * - * hif_napi_event() - Decision-maker to enable/disable NAPI. - * @hif : pointer to hif context - * @evnt: event that has been detected - * @data: more data regarding the event - * - * Description: - * This function decides whether or not NAPI should be enabled. - * NAPI will be enabled, if all the following is satisfied. - * 1- has been enabled administratively: - * the .ini file has the enabled setting and it has not been disabled - * by an vendor command override later - * - * Return: - * < 0: some error - * = 0: NAPI is now disabled - * = 1: NAPI is now enabled - */ -int hif_napi_event(struct ol_softc *hif, enum qca_napi_event event, void *data) -{ - int rc; - uint32_t prev_state; - int i; - struct napi_struct *napi; - - NAPI_DEBUG("-->(event=%d, aux=%p)\n", event, data); - - mutex_lock(&(hif->napi_data.mutex)); - prev_state = hif->napi_data.state; - switch (event) { - case NAPI_EVT_INI_FILE: - case NAPI_EVT_CMD_STATE: { - int on = (data != ((void *)0)); - - HIF_INFO("%s: received evnt: CONF %s; v = %d (state=0x%0x)\n", - __func__, - (event == NAPI_EVT_INI_FILE)?".ini file":"cmd", - on, prev_state); - if (on) - if (prev_state & HIF_NAPI_CONF_UP) { - HIF_INFO("%s: duplicate NAPI conf ON msg\n", - __func__); - } else { - HIF_INFO("%s: setting configuration to ON\n", - __func__); - hif->napi_data.state |= HIF_NAPI_CONF_UP; - } - else /* off request */ - if (prev_state & HIF_NAPI_CONF_UP) { - HIF_INFO("%s: setting configuration to OFF\n", - __func__); - hif->napi_data.state &= ~HIF_NAPI_CONF_UP; - } else { - HIF_INFO("%s: duplicate NAPI conf OFF msg\n", - __func__); - } - break; - } - /* case NAPI_INIT_FILE/CMD_STATE */ - default: { - HIF_ERROR("%s: unknown event: %d (data=0x%0lx)\n", - __func__, event, (unsigned long) data); - break; - } /* default */ - }; /* switch */ - - - mutex_unlock(&(hif->napi_data.mutex)); - - if (prev_state != hif->napi_data.state) { - if (hif->napi_data.state == ENABLE_NAPI_MASK) { - rc = 1; - for (i = 0; i < CE_COUNT_MAX; i++) - if ((hif->napi_data.ce_map & (0x01 << i))) { - napi = &(hif->napi_data.napis[i].napi); - NAPI_DEBUG("enabling NAPI %d\n", i); - napi_enable(napi); - } - } else { - rc = 0; - for (i = 0; i < CE_COUNT_MAX; i++) - if (hif->napi_data.ce_map & (0x01 << i)) { - napi = &(hif->napi_data.napis[i].napi); - NAPI_DEBUG("disabling NAPI %d\n", i); - napi_disable(napi); - } - } - } else { - HIF_INFO("%s: no change in hif napi state (still %d)\n", - __func__, prev_state); - rc = (hif->napi_data.state == ENABLE_NAPI_MASK); - } - - NAPI_DEBUG("<--[rc=%d]\n", rc); - return rc; -} - -/** - * hif_napi_enabled() - checks whether NAPI is enabled for given ce or not - * @hif: hif context - * @ce : CE instance (or -1, to check if any CEs are enabled) - * - * Return: bool - */ -int hif_napi_enabled(struct ol_softc *hif, int ce) -{ - int rc; - - if (-1 == ce) - rc = ((hif->napi_data.state == ENABLE_NAPI_MASK)); - else - rc = ((hif->napi_data.state == ENABLE_NAPI_MASK) && - (hif->napi_data.ce_map & (0x01 << ce))); - return rc; -}; - -/** - * hif_napi_enable_irq() - enables bus interrupts after napi_complete - * - * @hif: hif context - * @id : id of NAPI instance calling this (used to determine the CE) - * - * Return: void - */ -inline void hif_napi_enable_irq(struct ol_softc *hif, int id) -{ - ce_irq_enable(hif, NAPI_ID2PIPE(id)); -} - - -/** - * hif_napi_schedule() - schedules napi, updates stats - * @scn: hif context - * @ce_id: index of napi instance - * - * Return: void - */ -int hif_napi_schedule(struct ol_softc *scn, int ce_id) -{ - int cpu = smp_processor_id(); - - scn->napi_data.napis[ce_id].stats[cpu].napi_schedules++; - NAPI_DEBUG("scheduling napi %d (ce:%d)\n", - scn->napi_data.napis[ce_id].id, ce_id); - napi_schedule(&(scn->napi_data.napis[ce_id].napi)); - - return true; -} - -/** - * hif_napi_poll() - NAPI poll routine - * @napi : pointer to NAPI struct as kernel holds it - * @budget: - * - * This is the body of the poll function. - * The poll function is called by kernel. So, there is a wrapper - * function in HDD, which in turn calls this function. - * Two main reasons why the whole thing is not implemented in HDD: - * a) references to things like ce_service that HDD is not aware of - * b) proximity to the implementation of ce_tasklet, which the body - * of this function should be very close to. - * - * NOTE TO THE MAINTAINER: - * Consider this function and ce_tasklet very tightly coupled pairs. - * Any changes to ce_tasklet or this function may likely need to be - * reflected in the counterpart. - * - * Returns: - * int: the amount of work done in this poll ( <= budget) - */ -int hif_napi_poll(struct napi_struct *napi, int budget) -{ - int rc = 0; /* default: no work done, also takes care of error */ - int normalized, bucket; - int cpu = smp_processor_id(); - struct ol_softc *hif; - struct qca_napi_info *napi_info; - struct CE_state *ce_state; - - NAPI_DEBUG("%s -->(.., budget=%d)\n", budget); - - napi_info = (struct qca_napi_info *) - container_of(napi, struct qca_napi_info, napi); - napi_info->stats[cpu].napi_polls++; - - hif = (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); - if (unlikely(NULL == hif)) - CDF_ASSERT(hif != NULL); /* emit a warning if hif NULL */ - else { - rc = ce_per_engine_service(hif, NAPI_ID2PIPE(napi_info->id)); - HIF_INFO_HI("%s: ce_per_engine_service processed %d msgs", - __func__, rc); - } - napi_info->stats[cpu].napi_workdone += rc; - normalized = (rc / napi_info->scale); - - if (NULL != hif) { - ce_state = hif->ce_id_to_state[NAPI_ID2PIPE(napi_info->id)]; - if (ce_state->lro_flush_cb != NULL) { - ce_state->lro_flush_cb(ce_state->lro_data); - } - } - - /* do not return 0, if there was some work done, - * even if it is below the scale - */ - if (rc) - normalized++; - bucket = (normalized / QCA_NAPI_DEF_SCALE); - napi_info->stats[cpu].napi_budget_uses[bucket]++; - - /* if ce_per engine reports 0, then poll should be terminated */ - if (0 == rc) - NAPI_DEBUG("%s:%d: nothing processed by CE. Completing NAPI\n", - __func__, __LINE__); - - if (rc <= HIF_NAPI_MAX_RECEIVES) { - napi_info->stats[cpu].napi_completes++; - /* enable interrupts */ - napi_complete(napi); - if (NULL != hif) { - hif_napi_enable_irq(hif, napi_info->id); - - /* support suspend/resume */ - cdf_atomic_dec(&(hif->active_tasklet_cnt)); - } - - NAPI_DEBUG("%s:%d: napi_complete + enabling the interrupts\n", - __func__, __LINE__); - } - - NAPI_DEBUG("%s <--[normalized=%d]\n", _func__, normalized); - return normalized; -} diff --git a/core/hif/src/icnss_stub/icnss_stub.c b/core/hif/src/icnss_stub/icnss_stub.c deleted file mode 100644 index aa958ec335d6..000000000000 --- a/core/hif/src/icnss_stub/icnss_stub.c +++ /dev/null @@ -1,369 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifdef HIF_PCI - -#include "icnss_stub.h" -#include "hif_io32.h" -#include -#include "regtable.h" -#include "hif_debug.h" -#include "cds_api.h" -#include "cdf_status.h" -#include "qwlan_version.h" -#include - -static int icnss_get_irq_num(int ce_id); - -/** - * struct icnss_stub_entry - * - * @irq_handler: irq_handler - * @data: data - * @name: name - * @ce_id: ce_id - */ -struct icnss_stub_entry { - irqreturn_t (*irq_handler)(int, void *); - void *data; - const char *name; - int ce_id; -}; - -/** - * struct icnss_stub_context - * - * @stub: icnss_stub_entry - * @regged_irq: regged_irq - */ -struct icnss_stub_context { - struct icnss_stub_entry stub[ICNSS_MAX_IRQ_REGISTRATIONS]; - uint32_t regged_irq; -}; - -static struct icnss_stub_context cnss_stub; - -#ifndef QCA_WIFI_3_0_ADRASTEA -/** - * icnss_wlan_enable() - icnss_wlan_enable - * @config: ce configuration information - * @mode: driver_mode - * @host_version: version string to send to the fw - * - * Return: int - */ -int icnss_wlan_enable(struct icnss_wlan_enable_cfg *config, - enum icnss_driver_mode mode, const char *host_version) -{ - return 0; -} - -/** - * icnss_wlan_disable() - icnss_wlan_disable - * @mode: driver_mode - * - * Return: int - */ -int icnss_wlan_disable(enum icnss_driver_mode mode) -{ - return 0; -} - -/** - * icnss_set_fw_debug_mode() - icnss_set_fw_debug_mode - * @mode: fw debug mode, 0 for QXDM, 1 for WMI - * - * Return: int - */ -int icnss_set_fw_debug_mode(bool mode) -{ - return 0; -} - -#else - -/** - * icnss_wlan_enable(): call the platform driver to enable wlan - * @config: ce configuration information - * @mode: driver_mode - * @host_version: version string to send to the fw - * - * This function passes the con_mode and CE configuration to - * platform driver to enable wlan. - * cnss_wlan_enable has been hacked to do a qmi handshake with fw. - * this is not needed for rome. - * - * Return: 0 on success, error number otherwise. - */ -int icnss_wlan_enable(struct icnss_wlan_enable_cfg *config, - enum icnss_driver_mode mode, const char *host_version) -{ - struct cnss_wlan_enable_cfg cfg; - enum cnss_driver_mode cnss_mode; - - cfg.num_ce_tgt_cfg = config->num_ce_tgt_cfg; - cfg.ce_tgt_cfg = (struct cnss_ce_tgt_pipe_cfg *) - config->ce_tgt_cfg; - cfg.num_ce_svc_pipe_cfg = config->num_ce_svc_pipe_cfg; - cfg.ce_svc_cfg = (struct cnss_ce_svc_pipe_cfg *) - config->ce_svc_cfg; - - cfg.num_shadow_reg_cfg = config->num_shadow_reg_cfg; - cfg.shadow_reg_cfg = (struct cnss_shadow_reg_cfg *) - config->shadow_reg_cfg; - - switch (mode) { - case ICNSS_FTM: - cnss_mode = CNSS_FTM; - break; - case ICNSS_EPPING: - cnss_mode = CNSS_EPPING; - break; - default: - cnss_mode = CNSS_MISSION; - break; - } - return cnss_wlan_enable(&cfg, cnss_mode, host_version); -} - -/** - * icnss_wlan_disable(): call the platform driver to disable wlan - * - * This function passes the con_mode to platform driver to disable wlan. - * cnss_wlan_disable has been hacked to do a qmi handshake with fw. - * this is not needed for rome. - * - * Return: void - */ -int icnss_wlan_disable(enum icnss_driver_mode con_mode) -{ - enum cnss_driver_mode mode; - - switch (con_mode) { - case ICNSS_FTM: - mode = CNSS_FTM; - break; - case ICNSS_EPPING: - mode = CNSS_EPPING; - break; - default: - mode = CNSS_MISSION; - break; - } - - cnss_wlan_disable(mode); - return 0; -} - -/** - * icnss_set_fw_debug_mode() - call the platform driver to set fw - * debug mode - * @mode: fw debug mode, 0 for QXDM, 1 for WMI - * - * This function passes the fw debug mode to platform driver. - * cnss_set_fw_debug_mode has been hacked to do a qmi handshake with fw. - * This is not needed for rome. - * - * Return: int - */ -int icnss_set_fw_debug_mode(bool mode) -{ - return cnss_set_fw_debug_mode(mode); -} -#endif - -/** - * icnss_ce_request_irq() - register an irq handler - * @ce_id: ce_id - * @handler: handler - * @flags: flags to pass to the kernel api - * @name: name - * @context: context to pass to the irq handler - * - * Return: integer status - */ -int icnss_ce_request_irq(int ce_id, - irqreturn_t (*handler)(int, void *), - unsigned long flags, const char *name, - void *context) -{ - if (ce_id >= ICNSS_MAX_IRQ_REGISTRATIONS) { - HIF_ERROR("%s: invalid ce_id = %d", __func__, ce_id); - return -EINVAL; - } - - cnss_stub.stub[ce_id].irq_handler = handler; - cnss_stub.stub[ce_id].ce_id = ce_id; - cnss_stub.stub[ce_id].data = context; - cnss_stub.stub[ce_id].name = name; - cnss_stub.regged_irq |= (1 << ce_id); - return 0; -} - -/** - * icnss_ce_free_irq() - icnss_unregister_irq - * @ce_id: the ce_id that the irq belongs to - * @context: context with witch the irq was requested. - * Return: integer status - */ -int icnss_ce_free_irq(int ce_id, void *context) -{ - if (ce_id >= ICNSS_MAX_IRQ_REGISTRATIONS) { - HIF_ERROR("%s: invalid ce_id = %d", __func__, ce_id); - return -EINVAL; - } - - if (cnss_stub.stub[ce_id].data != context) { - HIF_ERROR("%s: context match failure for ce_id %d", - __func__, ce_id); - return -EINVAL; - } - - if (cnss_stub.regged_irq & (1 << ce_id)) { - cnss_stub.stub[ce_id].irq_handler = NULL; - cnss_stub.stub[ce_id].ce_id = 0; - cnss_stub.stub[ce_id].data = 0; - cnss_stub.stub[ce_id].name = NULL; - cnss_stub.regged_irq &= ~(1 << ce_id); - } - return 0; -} - -/** - * icnss_dispatch_one_ce_irq() - icnss_dispatch_one_ce_irq - * @ce_id: ce_id - * - * Return: irqreturn_t - */ -static irqreturn_t icnss_dispatch_one_ce_irq(int ce_id) -{ - irqreturn_t ret = IRQ_NONE; - - if (cnss_stub.stub[ce_id].irq_handler) - ret = cnss_stub.stub[ce_id].irq_handler( - icnss_get_irq_num(ce_id), - (void *)cnss_stub.stub[ce_id].data); - else - HIF_ERROR( - "%sd: error - ce_id = %d, no IRQ handler", - __func__, ce_id); - - return ret; -} - -/** - * icnss_dispatch_ce_irq() - icnss_dispatch_ce_irq - * @scn: scn - * - * Return: N/A - */ -void icnss_dispatch_ce_irq(struct ol_softc *scn) -{ - uint32_t intr_summary; - int id; - irqreturn_t ret; - - if (scn->hif_init_done != true) - return; - - A_TARGET_ACCESS_BEGIN(scn); - intr_summary = CE_INTERRUPT_SUMMARY(scn); - - if (intr_summary == 0) { - if ((scn->target_status != OL_TRGET_STATUS_RESET) && - (!cdf_atomic_read(&scn->link_suspended))) { - - hif_write32_mb(scn->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - HOST_GROUP0_MASK); - - hif_read32_mb(scn->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS)); - } - A_TARGET_ACCESS_END(scn); - return; - } else { - A_TARGET_ACCESS_END(scn); - } - - scn->ce_irq_summary = intr_summary; - for (id = 0; intr_summary && (id < scn->ce_count); id++) { - if (intr_summary & (1 << id)) { - intr_summary &= ~(1 << id); - ret = icnss_dispatch_one_ce_irq(id); - } - } -} - -/** - * icnss_get_soc_info() - get soc info - * - * This function query the soc information from the platform - * driver - * - * @info: struct icnss_soc_info - * - * Return: 0 for success - */ -int icnss_get_soc_info(struct icnss_soc_info *info) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - - if (!scn) { - HIF_ERROR("%s: SCN = NULL", __func__); - return -EINVAL; - } - info->v_addr = scn->mem; - info->p_addr = scn->mem_pa; - info->version = 0; - return 0; -} - - -/* icnss_get_irq_num() - generate a number to represent an irq number -*/ -static int icnss_get_irq_num(int ce_id) -{ - if (ce_id < CE_COUNT_MAX && ce_id >= 0) - return ce_id + 100; - - pr_err("icnss: No irq registered for CE id %d\n", ce_id); - return -EINVAL; -} - -int icnss_get_ce_id(int irq) -{ - int ce_id = irq - 100; - if (ce_id < CE_COUNT_MAX && ce_id >= 0) - return ce_id; - - pr_err("icnss: No matching CE id for irq %d\n", irq); - return -EINVAL; -} -#endif /* HIF_PCI */ diff --git a/core/hif/src/icnss_stub/icnss_stub.h b/core/hif/src/icnss_stub/icnss_stub.h deleted file mode 100644 index 33a83acaab00..000000000000 --- a/core/hif/src/icnss_stub/icnss_stub.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifdef HIF_PCI -#ifndef _ICNSS_WLAN_H_ -#define _ICNSS_WLAN_H_ - -#include -#include -#include - -#define ICNSS_MAX_IRQ_REGISTRATIONS 12 - -/** - * struct ce_tgt_pipe_cfg - * - * @pipenum: pipe_num - * @pipedir: pipe_dir - * @nentries: nentries - * @nbytes_max: nbytes_max - * @flags: flags - * @reserved: reserved - */ -struct ce_tgt_pipe_cfg { - uint32_t pipe_num; - uint32_t pipe_dir; - uint32_t nentries; - uint32_t nbytes_max; - uint32_t flags; - uint32_t reserved; -}; - -/** - * struct ce_svc_pipe_cfg - * - * @service_id: service_id - * @pipedir: pipedir - * @pipenum: pipenum - */ -struct ce_svc_pipe_cfg { - uint32_t service_id; - uint32_t pipedir; - uint32_t pipenum; -}; - -/** - * struct icnss_shadow_reg_cfg - * - * @ce_id: Copy engine id - * @reg_offset: Register offset - */ -struct icnss_shadow_reg_cfg { - u16 ce_id; - u16 reg_offset; -}; -/** - * struct icnss_wlan_enable_cfg - * - * @num_ce_tgt_cfg: num_ce_tgt_cfg - * @ce_tgt_cfg: ce_tgt_cfg - * @num_ce_svc_pipe_cfg: num_ce_svc_pipe_cfg - * @ce_svc_cfg: ce_svc_cfg - */ -struct icnss_wlan_enable_cfg { - uint32_t num_ce_tgt_cfg; - struct ce_tgt_pipe_cfg *ce_tgt_cfg; - uint32_t num_ce_svc_pipe_cfg; - struct ce_svc_pipe_cfg *ce_svc_cfg; - u32 num_shadow_reg_cfg; - struct icnss_shadow_reg_cfg *shadow_reg_cfg; -}; - -/** - * enum driver_mode - * - * @driver_mode: driver_mode - */ -enum icnss_driver_mode { - ICNSS_MISSION, - ICNSS_FTM, - ICNSS_EPPING, -}; - -/** - * struct icnss_soc_info - * - * @v_addr: virtual address - * @p_addr: physical address - * @ver: version - */ -struct icnss_soc_info { - void __iomem *v_addr; - phys_addr_t p_addr; - uint32_t version; -}; - -int icnss_wlan_enable(struct icnss_wlan_enable_cfg *config, - enum icnss_driver_mode mode, const char *host_version); -int icnss_wlan_disable(enum icnss_driver_mode mode); -int icnss_set_fw_debug_mode(bool mode); -int icnss_ce_request_irq(int ce_id, - irqreturn_t (*handler)(int ce_id, void *arg), - unsigned long flags, const char *name, void *context); -int icnss_ce_free_irq(int irq, void *context); -void icnss_enable_irq(unsigned int ce_id); -void icnss_disable_irq(unsigned int ce_id); -int icnss_get_soc_info(struct icnss_soc_info *info); -int icnss_get_ce_id(int irq); -#endif /* _ICNSS_WLAN_H_ */ -#endif /* HIF_PCI */ - diff --git a/core/hif/src/mp_dev.c b/core/hif/src/mp_dev.c deleted file mode 100644 index 6d261735c580..000000000000 --- a/core/hif/src/mp_dev.c +++ /dev/null @@ -1,327 +0,0 @@ -/* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "hif_io32.h" -#include "hif_debug.h" - -/*chaninfo*/ -#define CHANINFOMEM_S2_READ_MASK 0x00000008 -#define CHANINFO_CTRL_CAPTURE_CHAN_INFO_MASK 0x00000001 -#define CHANINFO_CTRL_CHANINFOMEM_BW_MASK 0x00000030 -#define MULTICHAIN_ENABLE_RX_CHAIN_MASK_MASK 0x00000007 - -/*agc*/ -#define GAINS_MIN_OFFSETS_CF_AGC_HIST_ENABLE_MASK 0x00040000 -#define GAINS_MIN_OFFSETS_CF_AGC_HIST_GC_MASK 0x00080000 -#define GAINS_MIN_OFFSETS_CF_AGC_HIST_VOTING_MASK 0x00100000 -#define GAINS_MIN_OFFSETS_CF_AGC_HIST_PHY_ERR_MASK 0x00200000 -#define AGC_HISTORY_DUMP_MASK (\ - GAINS_MIN_OFFSETS_CF_AGC_HIST_ENABLE_MASK| \ - GAINS_MIN_OFFSETS_CF_AGC_HIST_GC_MASK| \ - GAINS_MIN_OFFSETS_CF_AGC_HIST_VOTING_MASK| \ - GAINS_MIN_OFFSETS_CF_AGC_HIST_PHY_ERR_MASK \ - ) - -#define BB_chaninfo_ctrl 0x1a370 -#define BB_multichain_enable 0x1a2a0 -#define BB_chn_tables_intf_addr 0x19894 -#define BB_chn1_tables_intf_addr 0x1a894 -#define BB_chn_tables_intf_data 0x19898 -#define BB_chn1_tables_intf_data 0x1a898 -#define BB_gains_min_offsets 0x19e08 -#define BB_chaninfo_tab_b0 0x03200 -#define BB_chaninfo_tab_b1 0x03300 -#define BB_watchdog_status 0x1a7c0 -#define BB_watchdog_ctrl_1 0x1a7c4 -#define BB_watchdog_ctrl_2 0x1a7c8 -#define BB_watchdog_status_B 0x1a7e0 - - -#define PHY_BB_CHN_TABLES_INTF_ADDR 0x19894 -#define PHY_BB_CHN_TABLES_INTF_DATA 0x19898 - -#define PHY_BB_CHN1_TABLES_INTF_ADDR 0x1a894 -#define PHY_BB_CHN1_TABLES_INTF_DATA 0x1a898 - - -struct priv_ctrl_ctx { - uint32_t chaninfo_ctrl_orig; - uint32_t gain_min_offsets_orig; - uint32_t anyreg_start; - uint32_t anyreg_len; -}; - -static struct priv_ctrl_ctx g_priv_dump_ctx; - -static INLINE void set_target_reg_bits(void __iomem *mem, uint32_t reg, - uint32_t bitmask, uint32_t val) -{ - uint32_t value = hif_read32_mb(mem + (reg)); - uint32_t shift = 0; - value &= ~(bitmask); - while (!((bitmask >> shift) & 0x01)) - shift++; - - value |= (((val) << shift) & (bitmask)); - hif_write32_mb(mem + (reg), value); -} - -static INLINE uint32_t get_target_reg_bits(void __iomem *mem, - uint32_t reg, uint32_t bitmask) -{ - uint32_t value = hif_read32_mb(mem + (reg)); - uint32_t shift = 0; - while (!((bitmask >> shift) & 0x01)) - shift++; - - return (value >> shift) & bitmask; -} - -void priv_start_cap_chaninfo(struct ol_softc *scn) -{ - set_target_reg_bits(scn->mem, BB_chaninfo_ctrl, - CHANINFO_CTRL_CAPTURE_CHAN_INFO_MASK, 1); -} - -void priv_start_agc(struct ol_softc *scn) -{ - g_priv_dump_ctx.gain_min_offsets_orig = - hif_read32_mb(scn->mem + BB_gains_min_offsets); - set_target_reg_bits(scn->mem, BB_gains_min_offsets, - AGC_HISTORY_DUMP_MASK, - 0x0f); -} - -void priv_stop_agc(struct ol_softc *scn) -{ - set_target_reg_bits(scn->mem, BB_gains_min_offsets, - AGC_HISTORY_DUMP_MASK, - 0); -} - -void priv_dump_chaninfo(struct ol_softc *scn) -{ - uint32_t bw, val; - uint32_t len, i, tmp; - uint32_t chain_mask; - uint32_t chain0, chain1; - - chain_mask = - get_target_reg_bits(scn->mem, BB_multichain_enable, - MULTICHAIN_ENABLE_RX_CHAIN_MASK_MASK); - chain0 = chain_mask & 1; - chain1 = chain_mask & 2; - - HIF_TRACE("%s: E", __func__); - bw = get_target_reg_bits(scn->mem, BB_chaninfo_ctrl, - CHANINFO_CTRL_CHANINFOMEM_BW_MASK); - - if (bw == 0) - len = 53; - else if (bw == 1) - len = 57; - else if (bw == 2) - len = 59 * 2 - 1; - else - len = 60 * 2 + 61 * 2; - - /* - * each tone is 16 bit valid, write to 32bit buffer each. - * bw==0(legacy20): 53 tones. - * bw==1(ht/vht20): 57 tones. - * bw==2(ht/vht40): 59+58 tones. - * bw==3(vht80): 60*2+61*2 tones. - */ - - if (chain0) { - hif_write32_mb(scn->mem + BB_chn_tables_intf_addr, - 0x80003200); - } - if (chain1) { - hif_write32_mb(scn->mem + BB_chn1_tables_intf_addr, - 0x80003200); - } - - set_target_reg_bits(scn->mem, BB_chaninfo_ctrl, - CHANINFOMEM_S2_READ_MASK, 0); - - if (chain0) { - if (bw < 2) { - len = (bw == 0) ? 53 : 57; - for (i = 0; i < len; i++) { - val = - hif_read32_mb(scn->mem + - BB_chn_tables_intf_data) & - 0x0000ffff; - cdf_print("0x%x\t", val); - if (i % 4 == 0) - cdf_print("\n"); - } - } else { - len = (bw == 2) ? 59 : 60; - for (i = 0; i < len; i++) { - tmp = - hif_read32_mb(scn->mem + - BB_chn_tables_intf_data); - cdf_print("0x%x\t", ((tmp >> 16) & 0x0000ffff)); - cdf_print("0x%x\t", (tmp & 0x0000ffff)); - if (i % 2 == 0) - cdf_print("\n"); - } - if (bw > 2) { - /* bw == 3 for vht80 */ - hif_write32_mb(scn->mem + - BB_chn_tables_intf_addr, - 0x80003300); - len = 61; - for (i = 0; i < len; i++) { - tmp = - hif_read32_mb(scn->mem + - BB_chn_tables_intf_data); - cdf_print("0x%x\t", - ((tmp >> 16) & 0x0000ffff)); - cdf_print("0x%x\t", (tmp & 0x0000ffff)); - if (i % 2 == 0) - cdf_print("\n"); - } - } - } - } - if (chain1) { - if (bw < 2) { - len = (bw == 0) ? 53 : 57; - for (i = 0; i < len; i++) { - val = - hif_read32_mb(scn->mem + - BB_chn1_tables_intf_data) & - 0x0000ffff; - cdf_print("0x%x\t", val); - if (i % 4 == 0) - cdf_print("\n"); - } - } else { - len = (bw == 2) ? 59 : 60; - for (i = 0; i < len; i++) { - tmp = - hif_read32_mb(scn->mem + - BB_chn1_tables_intf_data); - cdf_print("0x%x\n", (tmp >> 16) & 0x0000ffff); - cdf_print("0x%x\n", tmp & 0x0000ffff); - if (i % 2 == 0) - cdf_print("\n"); - } - if (bw > 2) { - /* bw == 3 for vht80 */ - hif_write32_mb(scn->mem + - BB_chn1_tables_intf_addr, - 0x80003300); - len = 61; - for (i = 0; i < len; i++) { - tmp = - hif_read32_mb(scn->mem + - BB_chn1_tables_intf_data); - cdf_print("0x%x\t", - ((tmp >> 16) & 0x0000ffff)); - cdf_print("0x%x\t", (tmp & 0x0000ffff)); - if (i % 2 == 0) - cdf_print("\n"); - } - } - } - } - HIF_TRACE("%s: X", __func__); -} - -void priv_dump_agc(struct ol_softc *scn) -{ - int i, len = 30; /* check this value for Rome and Peregrine */ - uint32_t chain0, chain1, chain_mask, val; - - A_TARGET_ACCESS_BEGIN(scn); - - chain_mask = - get_target_reg_bits(scn->mem, BB_multichain_enable, - MULTICHAIN_ENABLE_RX_CHAIN_MASK_MASK); - chain0 = chain_mask & 1; - chain1 = chain_mask & 2; - - len = len << 1; /* each agc item is 64bit, total*2 */ - priv_stop_agc(scn); - - set_target_reg_bits(scn->mem, BB_chaninfo_ctrl, - CHANINFOMEM_S2_READ_MASK, 0); - - HIF_TRACE("%s: AGC history buffer dump: E", __func__); - if (chain0) { - for (i = 0; i < len; i++) { - hif_write32_mb(scn->mem + - PHY_BB_CHN_TABLES_INTF_ADDR, - BB_chaninfo_tab_b0 + i * 4); - val = hif_read32_mb(scn->mem + - PHY_BB_CHN_TABLES_INTF_DATA); - cdf_print("0x%x\t", val); - if (i % 4 == 0) - cdf_print("\n"); - } - } - if (chain1) { - for (i = 0; i < len; i++) { - hif_write32_mb(scn->mem + - PHY_BB_CHN1_TABLES_INTF_ADDR, - BB_chaninfo_tab_b0 + i * 4); - val = hif_read32_mb(scn->mem + - PHY_BB_CHN1_TABLES_INTF_DATA); - cdf_print("0x%x\t", val); - if (i % 4 == 0) - cdf_print("\n"); - } - } - HIF_TRACE("%s: AGC history buffer dump X", __func__); - /* restore original value */ - hif_write32_mb(scn->mem + BB_gains_min_offsets, - g_priv_dump_ctx.gain_min_offsets_orig); - - A_TARGET_ACCESS_END(scn); - - return; -} - -void priv_dump_bbwatchdog(struct ol_softc *scn) -{ - uint32_t val; - - HIF_TRACE("%s: BB watchdog dump E", __func__); - val = hif_read32_mb(scn->mem + BB_watchdog_status); - cdf_print("0x%x\t", val); - val = hif_read32_mb(scn->mem + BB_watchdog_ctrl_1); - cdf_print("0x%x\t", val); - val = hif_read32_mb(scn->mem + BB_watchdog_ctrl_2); - cdf_print("0x%x\t", val); - val = hif_read32_mb(scn->mem + BB_watchdog_status_B); - cdf_print("0x%x", val); - HIF_TRACE("%s: BB watchdog dump X", __func__); -} diff --git a/core/hif/src/mp_dev.h b/core/hif/src/mp_dev.h deleted file mode 100644 index cb7e3d06ec18..000000000000 --- a/core/hif/src/mp_dev.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __MP_DEV_H__ -#define __MP_DEV_H__ -void priv_start_agc(struct ol_softc *scn); -void priv_dump_agc(struct ol_softc *scn); -void priv_start_cap_chaninfo(struct ol_softc *scn); -void priv_dump_chaninfo(struct ol_softc *scn); -void priv_dump_bbwatchdog(struct ol_softc *scn); -void hif_shut_down_device(struct ol_softc *scn); -#endif /* __MP_DEV_H__ */ diff --git a/core/hif/src/pcie/cnss_stub.h b/core/hif/src/pcie/cnss_stub.h deleted file mode 100644 index 64ab19e535e3..000000000000 --- a/core/hif/src/pcie/cnss_stub.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __CNSS_STUB_H__ -#define __CNSS_STUB_H__ - -#ifndef CONFIG_CNSS -inline void cnss_wlan_pci_link_down(void) {} - -inline int cnss_pcie_shadow_control(struct pci_dev *dev, bool enable) -{ - return 0; -} - -#endif -#endif /* __CNSS_STUB_H__ */ diff --git a/core/hif/src/pcie/hif_io32_pci.h b/core/hif/src/pcie/hif_io32_pci.h deleted file mode 100644 index 597508f6b0e8..000000000000 --- a/core/hif/src/pcie/hif_io32_pci.h +++ /dev/null @@ -1,312 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __HIF_IO32_PCI_H__ -#define __HIF_IO32_PCI_H__ - -#ifdef HIF_PCI - -#include "hif.h" -#include "regtable.h" -#include "ce_reg.h" -#include "cdf_atomic.h" -#include "if_pci.h" -/* - * For maximum performance and no power management, set this to 1. - * For power management at the cost of performance, set this to 0. - */ -#define CONFIG_ATH_PCIE_MAX_PERF 0 - -/* - * For keeping the target awake till the driver is - * loaded, set this to 1 - */ -#define CONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD 1 - -/* - * When CONFIG_ATH_PCIE_MAX_PERF is 0: - * To use LIKELY hints, set this to 1 (slightly better performance, more power) - * To ignore "LIKELY" hints, set this to 0 (slightly worse performance, - * less power) - */ -#if defined(CONFIG_ATH_PCIE_MAX_PERF) -#define CONFIG_ATH_PCIE_ACCESS_LIKELY 0 -#else -#define CONFIG_ATH_PCIE_ACCESS_LIKELY 1 -#endif - -/* - * PCI-E L1 ASPPM sub-states - * To enable clock gating in L1 state, set this to 1. - * (less power, slightly more wakeup latency) - * To disable clock gating in L1 state, set this to 0. (slighly more power) - */ -#define CONFIG_PCIE_ENABLE_L1_CLOCK_GATE 1 - -/* - * PCIE_ACCESS_LOG_NUM specifies the number of - * read/write records to store - */ -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -#define PCIE_ACCESS_LOG_NUM 500 -#endif - -/* 64-bit MSI support */ -#define CONFIG_PCIE_64BIT_MSI 0 - -/* BAR0 ready checking for AR6320v2 */ -#define PCIE_BAR0_READY_CHECKING 0 - -/* AXI gating when L1, L2 to reduce power consumption */ -#define CONFIG_PCIE_ENABLE_AXI_CLK_GATE 0 - -#define hif_read32_mb(addr) ioread32((void __iomem *)addr) -#define hif_write32_mb(addr, value) \ - iowrite32((u32)(value), (void __iomem *)(addr)) - -extern int hif_target_sleep_state_adjust(struct ol_softc *scn, - bool sleep_ok, - bool wait_for_it); - -#if CONFIG_ATH_PCIE_MAX_PERF -#define A_TARGET_ACCESS_BEGIN(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_END(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_OK(scn) 1 - -#define A_TARGET_ACCESS_LIKELY(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_UNLIKELY(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_READ(scn, offset) \ - hif_read32_mb(scn->mem + (offset)) - -void war_pci_write32(char *addr, u32 offset, u32 value); -#define A_TARGET_WRITE(scn, offset, value) \ - war_pci_write32(scn->mem, (offset), (value)) - -#define A_TARGET_ACCESS_BEGIN_RET(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_BEGIN_RET_EXT(scn, val) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_BEGIN_RET_PTR(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_END_RET(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_END_RET_EXT(scn, val) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#define A_TARGET_ACCESS_END_RET_PTR(scn) \ - do {struct ol_softc *unused = scn; \ - unused = unused; } while (0) - -#else /* CONFIG_ATH_PCIE_MAX_PERF */ - -void war_pci_write32(char *addr, u32 offset, u32 value); - -#define A_TARGET_ACCESS_BEGIN_RET_EXT(scn, val) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_BEGIN(scn) < 0) \ - val = -1; \ -} while (0) - -#define A_TARGET_ACCESS_BEGIN_RET(scn) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_BEGIN(scn) < 0) \ - return ATH_ISR_NOSCHED; \ -} while (0) - -#define A_TARGET_ACCESS_BEGIN_RET_PTR(scn) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_BEGIN(scn) < 0) \ - return NULL; \ -} while (0) - -#define A_TARGET_ACCESS_BEGIN(scn) \ -do { \ - if (Q_TARGET_ACCESS_BEGIN(scn) < 0) \ - return; \ -} while (0) - -#define Q_TARGET_ACCESS_BEGIN(scn) \ - hif_target_sleep_state_adjust(scn, false, true) - -#define A_TARGET_ACCESS_END_RET(scn) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_END(scn) < 0) \ - return ATH_ISR_NOSCHED; \ -} while (0) - -#define A_TARGET_ACCESS_END_RET_EXT(scn, val) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_END(scn) < 0) \ - val = -1; \ -} while (0) - -#define A_TARGET_ACCESS_END_RET_PTR(scn) \ -do { \ - if (!WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && \ - Q_TARGET_ACCESS_END(scn) < 0) \ - return NULL; \ -} while (0) -#define A_TARGET_ACCESS_END(scn) \ -do { \ - if (Q_TARGET_ACCESS_END(scn) < 0) \ - return; \ -} while (0) - -#define Q_TARGET_ACCESS_END(scn) \ - hif_target_sleep_state_adjust(scn, true, false) - -#define A_TARGET_ACCESS_OK(scn) hif_target_forced_awake(scn) - -#if CONFIG_ATH_PCIE_ACCESS_LIKELY -#define A_TARGET_ACCESS_LIKELY(scn) \ - hif_target_sleep_state_adjust(scn, false, false) -#define A_TARGET_ACCESS_UNLIKELY(scn) \ - hif_target_sleep_state_adjust(scn, true, false) -#else /* CONFIG_ATH_PCIE_ACCESS_LIKELY */ -#define A_TARGET_ACCESS_LIKELY(scn) \ - do { \ - unsigned long unused = (unsigned long)(scn); \ - unused = unused; \ - } while (0) - -#define A_TARGET_ACCESS_UNLIKELY(scn) \ - do { \ - unsigned long unused = (unsigned long)(scn); \ - unused = unused; \ - } while (0) -#endif /* CONFIG_ATH_PCIE_ACCESS_LIKELY */ - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -extern uint32_t hif_target_read_checked(struct ol_softc *scn, - uint32_t offset); -extern void hif_target_write_checked(struct ol_softc *scn, uint32_t offset, - uint32_t value); -#define A_TARGET_READ(scn, offset) \ - hif_target_read_checked(scn, (offset)) -#define A_TARGET_WRITE(scn, offset, value) \ - hif_target_write_checked(scn, (offset), (value)) -#else /* CONFIG_ATH_PCIE_ACCESS_DEBUG */ -#define A_TARGET_READ(scn, offset) \ - hif_read32_mb(scn->mem + (offset)) -#define A_TARGET_WRITE(scn, offset, value) \ - war_pci_write32(scn->mem, (offset), (value)) -#endif -#endif /* CONFIG_ATH_PCIE_MAX_PERF */ - - -irqreturn_t hif_fw_interrupt_handler(int irq, void *arg); - -/** - * ce_irq_enable() - ce_irq_enable - * @scn: ol_softc - * @ce_id: ce_id - * - * Return: void - */ -static inline void ce_irq_enable(struct ol_softc *scn, int ce_id) -{ - uint32_t tmp = 1 << ce_id; - struct hif_pci_softc *sc = scn->hif_sc; - - cdf_spin_lock_irqsave(&scn->irq_lock); - scn->ce_irq_summary &= ~tmp; - if (scn->ce_irq_summary == 0) { - /* Enable Legacy PCI line interrupts */ - if (LEGACY_INTERRUPTS(sc) && - (scn->target_status != OL_TRGET_STATUS_RESET) && - (!cdf_atomic_read(&scn->link_suspended))) { - - hif_write32_mb(scn->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - HOST_GROUP0_MASK); - - hif_read32_mb(scn->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS)); - } - } - if (scn->hif_init_done == true) - A_TARGET_ACCESS_END(scn); - cdf_spin_unlock_irqrestore(&scn->irq_lock); - - /* check for missed firmware crash */ - hif_fw_interrupt_handler(0, scn); -} -/** - * ce_irq_disable() - ce_irq_disable - * @scn: ol_softc - * @ce_id: ce_id - * - * Return: void - */ -static inline void ce_irq_disable(struct ol_softc *scn, int ce_id) -{ - /* For Rome only need to wake up target */ - A_TARGET_ACCESS_BEGIN(scn); -} -/** - * soc_wake_reset() - soc_wake_reset - * @scn: ol_softc - * - * Return: void - */ -static inline void soc_wake_reset(struct ol_softc *scn) -{ - hif_write32_mb(scn->mem + - PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_RESET); -} -#endif /* HIF_PCI */ -#endif /* __HIF_IO32_PCI_H__ */ diff --git a/core/hif/src/pcie/if_pci.c b/core/hif/src/pcie/if_pci.c deleted file mode 100644 index dbba66c781ec..000000000000 --- a/core/hif/src/pcie/if_pci.c +++ /dev/null @@ -1,3309 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include -#include -#include -#include -#ifdef CONFIG_PCI_MSM -#include -#endif -#include "hif_io32.h" -#include "if_pci.h" -#include "hif.h" -#include "hif_main.h" -#include "ce_api.h" -#include "ce_internal.h" -#include "ce_reg.h" -#include "bmi_msg.h" /* TARGET_TYPE_ */ -#include "regtable.h" -#include "ol_fw.h" -#include -#include -#include -#include "cds_api.h" -#include "cdf_status.h" -#include "cds_sched.h" -#include "wma_api.h" -#include "cdf_atomic.h" -#include "wlan_hdd_power.h" -#include "wlan_hdd_main.h" -#ifdef CONFIG_CNSS -#include -#else -#include "cnss_stub.h" -#endif -#include "epping_main.h" -#include "mp_dev.h" -#include "hif_debug.h" - -#ifndef REMOVE_PKT_LOG -#include "ol_txrx_types.h" -#include "pktlog_ac_api.h" -#include "pktlog_ac.h" -#endif -#include "if_pci_internal.h" -#include "icnss_stub.h" -#include "ce_tasklet.h" -#include "cds_concurrency.h" - -/* Maximum ms timeout for host to wake up target */ -#define PCIE_WAKE_TIMEOUT 1000 -#define RAMDUMP_EVENT_TIMEOUT 2500 - -unsigned int msienable = 0; -module_param(msienable, int, 0644); - -int hif_pci_war1 = 0; -static DEFINE_SPINLOCK(pciwar_lock); - -#ifndef REMOVE_PKT_LOG -struct ol_pl_os_dep_funcs *g_ol_pl_os_dep_funcs = NULL; -#endif - -/* Setting SOC_GLOBAL_RESET during driver unload causes intermittent - * PCIe data bus error - * As workaround for this issue - changing the reset sequence to - * use TargetCPU warm reset * instead of SOC_GLOBAL_RESET - */ -#define CPU_WARM_RESET_WAR -/* - * Top-level interrupt handler for all PCI interrupts from a Target. - * When a block of MSI interrupts is allocated, this top-level handler - * is not used; instead, we directly call the correct sub-handler. - */ -struct ce_irq_reg_table { - uint32_t irq_enable; - uint32_t irq_status; -}; - -#if !defined(QCA_WIFI_3_0_ADRASTEA) -static inline void cnss_intr_notify_q6(void) -{ -} -#endif - -#if !defined(QCA_WIFI_3_0_ADRASTEA) -static inline void *cnss_get_target_smem(void) -{ - return NULL; -} -#endif - -#ifndef QCA_WIFI_3_0_ADRASTEA -static inline void hif_pci_route_adrastea_interrupt(struct hif_pci_softc *sc) -{ - return; -} -#else -void hif_pci_route_adrastea_interrupt(struct hif_pci_softc *sc) -{ - struct ol_softc *scn = sc->ol_sc; - unsigned int target_enable0, target_enable1; - unsigned int target_cause0, target_cause1; - - target_enable0 = hif_read32_mb(sc->mem + Q6_ENABLE_REGISTER_0); - target_enable1 = hif_read32_mb(sc->mem + Q6_ENABLE_REGISTER_1); - target_cause0 = hif_read32_mb(sc->mem + Q6_CAUSE_REGISTER_0); - target_cause1 = hif_read32_mb(sc->mem + Q6_CAUSE_REGISTER_1); - - if ((target_enable0 & target_cause0) || - (target_enable1 & target_cause1)) { - hif_write32_mb(sc->mem + Q6_ENABLE_REGISTER_0, 0); - hif_write32_mb(sc->mem + Q6_ENABLE_REGISTER_1, 0); - - if (scn->notice_send) - cnss_intr_notify_q6(); - } -} -#endif - -static irqreturn_t hif_pci_interrupt_handler(int irq, void *arg) -{ - struct hif_pci_softc *sc = (struct hif_pci_softc *)arg; - struct ol_softc *scn = sc->ol_sc; - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - volatile int tmp; - uint16_t val; - uint32_t bar0; - uint32_t fw_indicator_address, fw_indicator; - bool ssr_irq = false; - unsigned int host_cause, host_enable; - - if (LEGACY_INTERRUPTS(sc)) { - if (Q_TARGET_ACCESS_BEGIN(scn) < 0) - return IRQ_HANDLED; - - if (ADRASTEA_BU) { - host_enable = hif_read32_mb(sc->mem + - PCIE_INTR_ENABLE_ADDRESS); - host_cause = hif_read32_mb(sc->mem + - PCIE_INTR_CAUSE_ADDRESS); - if (!(host_enable & host_cause)) { - hif_pci_route_adrastea_interrupt(sc); - return IRQ_HANDLED; - } - } - - /* Clear Legacy PCI line interrupts - * IMPORTANT: INTR_CLR regiser has to be set - * after INTR_ENABLE is set to 0, - * otherwise interrupt can not be really cleared */ - hif_write32_mb(sc->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), 0); - - hif_write32_mb(sc->mem + - (SOC_CORE_BASE_ADDRESS | PCIE_INTR_CLR_ADDRESS), - ADRASTEA_BU ? - (host_enable & host_cause) : - HOST_GROUP0_MASK); - - if (ADRASTEA_BU) - hif_write32_mb(sc->mem + 0x2f100c , (host_cause >> 1)); - - /* IMPORTANT: this extra read transaction is required to - * flush the posted write buffer */ - if (!ADRASTEA_BU) { - tmp = - hif_read32_mb(sc->mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS)); - - if (tmp == 0xdeadbeef) { - HIF_ERROR("BUG(%s): SoC returns 0xdeadbeef!!", - __func__); - - pci_read_config_word(sc->pdev, PCI_VENDOR_ID, &val); - HIF_ERROR("%s: PCI Vendor ID = 0x%04x", - __func__, val); - - pci_read_config_word(sc->pdev, PCI_DEVICE_ID, &val); - HIF_ERROR("%s: PCI Device ID = 0x%04x", - __func__, val); - - pci_read_config_word(sc->pdev, PCI_COMMAND, &val); - HIF_ERROR("%s: PCI Command = 0x%04x", __func__, - val); - - pci_read_config_word(sc->pdev, PCI_STATUS, &val); - HIF_ERROR("%s: PCI Status = 0x%04x", __func__, - val); - - pci_read_config_dword(sc->pdev, PCI_BASE_ADDRESS_0, - &bar0); - HIF_ERROR("%s: PCI BAR0 = 0x%08x", __func__, - bar0); - - HIF_ERROR("%s: RTC_STATE_ADDRESS = 0x%08x", - __func__, - hif_read32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS - + RTC_STATE_ADDRESS)); - HIF_ERROR("%s: PCIE_SOC_WAKE_ADDRESS = 0x%08x", - __func__, - hif_read32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS - + PCIE_SOC_WAKE_ADDRESS)); - HIF_ERROR("%s: 0x80008 = 0x%08x, 0x8000c = 0x%08x", - __func__, - hif_read32_mb(sc->mem + 0x80008), - hif_read32_mb(sc->mem + 0x8000c)); - HIF_ERROR("%s: 0x80010 = 0x%08x, 0x80014 = 0x%08x", - __func__, - hif_read32_mb(sc->mem + 0x80010), - hif_read32_mb(sc->mem + 0x80014)); - HIF_ERROR("%s: 0x80018 = 0x%08x, 0x8001c = 0x%08x", - __func__, - hif_read32_mb(sc->mem + 0x80018), - hif_read32_mb(sc->mem + 0x8001c)); - CDF_BUG(0); - } - - PCI_CLR_CAUSE0_REGISTER(sc); - } - - if (HAS_FW_INDICATOR) { - fw_indicator_address = hif_state->fw_indicator_address; - fw_indicator = A_TARGET_READ(scn, fw_indicator_address); - if ((fw_indicator != ~0) && - (fw_indicator & FW_IND_EVENT_PENDING)) - ssr_irq = true; - } - - if (Q_TARGET_ACCESS_END(scn) < 0) - return IRQ_HANDLED; - } - /* TBDXXX: Add support for WMAC */ - - if (ssr_irq) { - sc->irq_event = irq; - cdf_atomic_set(&scn->tasklet_from_intr, 1); - - cdf_atomic_inc(&scn->active_tasklet_cnt); - tasklet_schedule(&sc->intr_tq); - } else { - icnss_dispatch_ce_irq(scn); - } - - return IRQ_HANDLED; -} - -static irqreturn_t hif_pci_msi_fw_handler(int irq, void *arg) -{ - struct hif_pci_softc *sc = (struct hif_pci_softc *)arg; - - (irqreturn_t) hif_fw_interrupt_handler(sc->irq_event, sc->ol_sc); - - return IRQ_HANDLED; -} - -bool hif_targ_is_awake(struct ol_softc *scn, void *__iomem *mem) -{ - HIF_PCI_TARG_IS_AWAKE(scn, mem); -} - -bool hif_pci_targ_is_present(struct ol_softc *scn, void *__iomem *mem) -{ - return 1; /* FIX THIS */ -} - -/** - * hif_pci_cancel_deferred_target_sleep() - cancels the defered target sleep - * @scn: ol_softc - * - * Return: void - */ -#if CONFIG_ATH_PCIE_MAX_PERF == 0 -void hif_pci_cancel_deferred_target_sleep(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - A_target_id_t pci_addr = scn->mem; - - cdf_spin_lock_irqsave(&hif_state->keep_awake_lock); - /* - * If the deferred sleep timer is running cancel it - * and put the soc into sleep. - */ - if (hif_state->fake_sleep == true) { - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - if (hif_state->verified_awake == false) { - hif_write32_mb(pci_addr + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_RESET); - } - hif_state->fake_sleep = false; - } - cdf_spin_unlock_irqrestore(&hif_state->keep_awake_lock); -} -#else -inline void hif_pci_cancel_deferred_target_sleep(struct ol_softc *scn) -{ - return; -} -#endif - -#define A_PCIE_LOCAL_REG_READ(mem, addr) \ - hif_read32_mb((char *)(mem) + \ - PCIE_LOCAL_BASE_ADDRESS + (uint32_t)(addr)) - -#define A_PCIE_LOCAL_REG_WRITE(mem, addr, val) \ - hif_write32_mb(((char *)(mem) + \ - PCIE_LOCAL_BASE_ADDRESS + (uint32_t)(addr)), (val)) - -#define ATH_PCI_RESET_WAIT_MAX 10 /* Ms */ -static void hif_pci_device_reset(struct hif_pci_softc *sc) -{ - void __iomem *mem = sc->mem; - int i; - uint32_t val; - struct ol_softc *scn = sc->ol_sc; - - if (!scn->hostdef) - return; - - /* NB: Don't check resetok here. This form of reset - * is integral to correct operation. */ - - if (!SOC_GLOBAL_RESET_ADDRESS) { - return; - } - - if (!mem) { - return; - } - - HIF_ERROR("%s: Reset Device", __func__); - - /* - * NB: If we try to write SOC_GLOBAL_RESET_ADDRESS without first - * writing WAKE_V, the Target may scribble over Host memory! - */ - A_PCIE_LOCAL_REG_WRITE(mem, PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_V_MASK); - for (i = 0; i < ATH_PCI_RESET_WAIT_MAX; i++) { - if (hif_targ_is_awake(scn, mem)) - break; - - cdf_mdelay(1); - } - - /* Put Target, including PCIe, into RESET. */ - val = A_PCIE_LOCAL_REG_READ(mem, SOC_GLOBAL_RESET_ADDRESS); - val |= 1; - A_PCIE_LOCAL_REG_WRITE(mem, SOC_GLOBAL_RESET_ADDRESS, val); - for (i = 0; i < ATH_PCI_RESET_WAIT_MAX; i++) { - if (A_PCIE_LOCAL_REG_READ(mem, RTC_STATE_ADDRESS) & - RTC_STATE_COLD_RESET_MASK) - break; - - cdf_mdelay(1); - } - - /* Pull Target, including PCIe, out of RESET. */ - val &= ~1; - A_PCIE_LOCAL_REG_WRITE(mem, SOC_GLOBAL_RESET_ADDRESS, val); - for (i = 0; i < ATH_PCI_RESET_WAIT_MAX; i++) { - if (! - (A_PCIE_LOCAL_REG_READ(mem, RTC_STATE_ADDRESS) & - RTC_STATE_COLD_RESET_MASK)) - break; - - cdf_mdelay(1); - } - - A_PCIE_LOCAL_REG_WRITE(mem, PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_RESET); -} - -/* CPU warm reset function - * Steps: - * 1. Disable all pending interrupts - so no pending interrupts on WARM reset - * 2. Clear the FW_INDICATOR_ADDRESS -so Traget CPU intializes FW - * correctly on WARM reset - * 3. Clear TARGET CPU LF timer interrupt - * 4. Reset all CEs to clear any pending CE tarnsactions - * 5. Warm reset CPU - */ -void hif_pci_device_warm_reset(struct hif_pci_softc *sc) -{ - void __iomem *mem = sc->mem; - int i; - uint32_t val; - uint32_t fw_indicator; - struct ol_softc *scn = sc->ol_sc; - - /* NB: Don't check resetok here. This form of reset is - * integral to correct operation. */ - - if (!mem) { - return; - } - - HIF_INFO_MED("%s: Target Warm Reset", __func__); - - /* - * NB: If we try to write SOC_GLOBAL_RESET_ADDRESS without first - * writing WAKE_V, the Target may scribble over Host memory! - */ - A_PCIE_LOCAL_REG_WRITE(mem, PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_V_MASK); - for (i = 0; i < ATH_PCI_RESET_WAIT_MAX; i++) { - if (hif_targ_is_awake(scn, mem)) - break; - cdf_mdelay(1); - } - - /* - * Disable Pending interrupts - */ - val = - hif_read32_mb(mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_CAUSE_ADDRESS)); - HIF_INFO_MED("%s: Host Intr Cause reg 0x%x : value : 0x%x", __func__, - (SOC_CORE_BASE_ADDRESS | PCIE_INTR_CAUSE_ADDRESS), val); - /* Target CPU Intr Cause */ - val = hif_read32_mb(mem + (SOC_CORE_BASE_ADDRESS | CPU_INTR_ADDRESS)); - HIF_INFO_MED("%s: Target CPU Intr Cause 0x%x", __func__, val); - - val = - hif_read32_mb(mem + - (SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS)); - hif_write32_mb((mem + - (SOC_CORE_BASE_ADDRESS | PCIE_INTR_ENABLE_ADDRESS)), 0); - hif_write32_mb((mem + (SOC_CORE_BASE_ADDRESS + PCIE_INTR_CLR_ADDRESS)), - HOST_GROUP0_MASK); - - cdf_mdelay(100); - - /* Clear FW_INDICATOR_ADDRESS */ - if (HAS_FW_INDICATOR) { - fw_indicator = hif_read32_mb(mem + FW_INDICATOR_ADDRESS); - hif_write32_mb(mem + FW_INDICATOR_ADDRESS, 0); - } - - /* Clear Target LF Timer interrupts */ - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS + - SOC_LF_TIMER_CONTROL0_ADDRESS)); - HIF_INFO_MED("%s: addr 0x%x : 0x%x", __func__, - (RTC_SOC_BASE_ADDRESS + SOC_LF_TIMER_CONTROL0_ADDRESS), val); - val &= ~SOC_LF_TIMER_CONTROL0_ENABLE_MASK; - hif_write32_mb(mem + - (RTC_SOC_BASE_ADDRESS + SOC_LF_TIMER_CONTROL0_ADDRESS), - val); - - /* Reset CE */ - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS | - SOC_RESET_CONTROL_ADDRESS)); - val |= SOC_RESET_CONTROL_CE_RST_MASK; - hif_write32_mb((mem + - (RTC_SOC_BASE_ADDRESS | SOC_RESET_CONTROL_ADDRESS)), - val); - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS | - SOC_RESET_CONTROL_ADDRESS)); - cdf_mdelay(10); - - /* CE unreset */ - val &= ~SOC_RESET_CONTROL_CE_RST_MASK; - hif_write32_mb(mem + (RTC_SOC_BASE_ADDRESS | SOC_RESET_CONTROL_ADDRESS), - val); - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS | - SOC_RESET_CONTROL_ADDRESS)); - cdf_mdelay(10); - - /* Read Target CPU Intr Cause */ - val = hif_read32_mb(mem + (SOC_CORE_BASE_ADDRESS | CPU_INTR_ADDRESS)); - HIF_INFO_MED("%s: Target CPU Intr Cause after CE reset 0x%x", - __func__, val); - - /* CPU warm RESET */ - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS | - SOC_RESET_CONTROL_ADDRESS)); - val |= SOC_RESET_CONTROL_CPU_WARM_RST_MASK; - hif_write32_mb(mem + (RTC_SOC_BASE_ADDRESS | SOC_RESET_CONTROL_ADDRESS), - val); - val = - hif_read32_mb(mem + - (RTC_SOC_BASE_ADDRESS | - SOC_RESET_CONTROL_ADDRESS)); - HIF_INFO_MED("%s: RESET_CONTROL after cpu warm reset 0x%x", - __func__, val); - - cdf_mdelay(100); - HIF_INFO_MED("%s: Target Warm reset complete", __func__); - -} - -#ifndef QCA_WIFI_3_0 -int hif_check_fw_reg(struct ol_softc *scn) -{ - struct hif_pci_softc *sc = scn->hif_sc; - void __iomem *mem = sc->mem; - uint32_t val; - - A_TARGET_ACCESS_BEGIN_RET(scn); - val = hif_read32_mb(mem + FW_INDICATOR_ADDRESS); - A_TARGET_ACCESS_END_RET(scn); - - HIF_INFO_MED("%s: FW_INDICATOR register is 0x%x", __func__, val); - - if (val & FW_IND_HELPER) - return 0; - - return 1; -} -#endif - -int hif_check_soc_status(struct ol_softc *scn) -{ - uint16_t device_id; - uint32_t val; - uint16_t timeout_count = 0; - struct hif_pci_softc *sc = scn->hif_sc; - - /* Check device ID from PCIe configuration space for link status */ - pci_read_config_word(sc->pdev, PCI_DEVICE_ID, &device_id); - if (device_id != sc->devid) { - HIF_ERROR("%s: device ID does match (read 0x%x, expect 0x%x)", - __func__, device_id, sc->devid); - return -EACCES; - } - - /* Check PCIe local register for bar/memory access */ - val = hif_read32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - RTC_STATE_ADDRESS); - HIF_INFO_MED("%s: RTC_STATE_ADDRESS is %08x", __func__, val); - - /* Try to wake up taget if it sleeps */ - hif_write32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_V_MASK); - HIF_INFO_MED("%s: PCIE_SOC_WAKE_ADDRESS is %08x", __func__, - hif_read32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS)); - - /* Check if taget can be woken up */ - while (!hif_targ_is_awake(scn, sc->mem)) { - if (timeout_count >= PCIE_WAKE_TIMEOUT) { - HIF_ERROR("%s: wake up timeout, %08x, %08x", - __func__, - hif_read32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS + - RTC_STATE_ADDRESS), - hif_read32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS)); - return -EACCES; - } - - hif_write32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_V_MASK); - - cdf_mdelay(100); - timeout_count += 100; - } - - /* Check Power register for SoC internal bus issues */ - val = - hif_read32_mb(sc->mem + RTC_SOC_BASE_ADDRESS + - SOC_POWER_REG_OFFSET); - HIF_INFO_MED("%s: Power register is %08x", __func__, val); - - return 0; -} - -/** - * hif_dump_pci_registers(): dump PCI debug registers - * - * This function dumps pci debug registers - * - * @scn: struct ol_softc - * - * Return: void - */ -static void hif_dump_pci_registers(struct ol_softc *scn) -{ - struct hif_pci_softc *sc = scn->hif_sc; - void __iomem *mem = sc->mem; - uint32_t val, i, j; - uint32_t wrapper_idx[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; - uint32_t ce_base; - - A_TARGET_ACCESS_BEGIN(scn); - - /* DEBUG_INPUT_SEL_SRC = 0x6 */ - val = - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_INPUT_SEL_OFFSET); - val &= ~WLAN_DEBUG_INPUT_SEL_SRC_MASK; - val |= WLAN_DEBUG_INPUT_SEL_SRC_SET(0x6); - hif_write32_mb(mem + GPIO_BASE_ADDRESS + WLAN_DEBUG_INPUT_SEL_OFFSET, - val); - - /* DEBUG_CONTROL_ENABLE = 0x1 */ - val = hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_CONTROL_OFFSET); - val &= ~WLAN_DEBUG_CONTROL_ENABLE_MASK; - val |= WLAN_DEBUG_CONTROL_ENABLE_SET(0x1); - hif_write32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_CONTROL_OFFSET, val); - - HIF_INFO_MED("%s: Debug: inputsel: %x dbgctrl: %x", __func__, - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_INPUT_SEL_OFFSET), - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_CONTROL_OFFSET)); - - HIF_INFO_MED("%s: Debug CE", __func__); - /* Loop CE debug output */ - /* AMBA_DEBUG_BUS_SEL = 0xc */ - val = hif_read32_mb(mem + GPIO_BASE_ADDRESS + AMBA_DEBUG_BUS_OFFSET); - val &= ~AMBA_DEBUG_BUS_SEL_MASK; - val |= AMBA_DEBUG_BUS_SEL_SET(0xc); - hif_write32_mb(mem + GPIO_BASE_ADDRESS + AMBA_DEBUG_BUS_OFFSET, val); - - for (i = 0; i < sizeof(wrapper_idx) / sizeof(uint32_t); i++) { - /* For (i=1,2,3,4,8,9) write CE_WRAPPER_DEBUG_SEL = i */ - val = hif_read32_mb(mem + CE_WRAPPER_BASE_ADDRESS + - CE_WRAPPER_DEBUG_OFFSET); - val &= ~CE_WRAPPER_DEBUG_SEL_MASK; - val |= CE_WRAPPER_DEBUG_SEL_SET(wrapper_idx[i]); - hif_write32_mb(mem + CE_WRAPPER_BASE_ADDRESS + - CE_WRAPPER_DEBUG_OFFSET, val); - - HIF_INFO_MED("%s: ce wrapper: %d amdbg: %x cewdbg: %x", - __func__, wrapper_idx[i], - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - AMBA_DEBUG_BUS_OFFSET), - hif_read32_mb(mem + CE_WRAPPER_BASE_ADDRESS + - CE_WRAPPER_DEBUG_OFFSET)); - - if (wrapper_idx[i] <= 7) { - for (j = 0; j <= 5; j++) { - ce_base = CE_BASE_ADDRESS(wrapper_idx[i]); - /* For (j=0~5) write CE_DEBUG_SEL = j */ - val = - hif_read32_mb(mem + ce_base + - CE_DEBUG_OFFSET); - val &= ~CE_DEBUG_SEL_MASK; - val |= CE_DEBUG_SEL_SET(j); - hif_write32_mb(mem + ce_base + CE_DEBUG_OFFSET, - val); - - /* read (@gpio_athr_wlan_reg) - * WLAN_DEBUG_OUT_DATA */ - val = hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_OUT_OFFSET); - val = WLAN_DEBUG_OUT_DATA_GET(val); - - HIF_INFO_MED("%s: module%d: cedbg: %x out: %x", - __func__, j, - hif_read32_mb(mem + ce_base + - CE_DEBUG_OFFSET), val); - } - } else { - /* read (@gpio_athr_wlan_reg) WLAN_DEBUG_OUT_DATA */ - val = - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_OUT_OFFSET); - val = WLAN_DEBUG_OUT_DATA_GET(val); - - HIF_INFO_MED("%s: out: %x", __func__, val); - } - } - - HIF_INFO_MED("%s: Debug PCIe:", __func__); - /* Loop PCIe debug output */ - /* Write AMBA_DEBUG_BUS_SEL = 0x1c */ - val = hif_read32_mb(mem + GPIO_BASE_ADDRESS + AMBA_DEBUG_BUS_OFFSET); - val &= ~AMBA_DEBUG_BUS_SEL_MASK; - val |= AMBA_DEBUG_BUS_SEL_SET(0x1c); - hif_write32_mb(mem + GPIO_BASE_ADDRESS + AMBA_DEBUG_BUS_OFFSET, val); - - for (i = 0; i <= 8; i++) { - /* For (i=1~8) write AMBA_DEBUG_BUS_PCIE_DEBUG_SEL = i */ - val = - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - AMBA_DEBUG_BUS_OFFSET); - val &= ~AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK; - val |= AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_SET(i); - hif_write32_mb(mem + GPIO_BASE_ADDRESS + AMBA_DEBUG_BUS_OFFSET, - val); - - /* read (@gpio_athr_wlan_reg) WLAN_DEBUG_OUT_DATA */ - val = - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_OUT_OFFSET); - val = WLAN_DEBUG_OUT_DATA_GET(val); - - HIF_INFO_MED("%s: amdbg: %x out: %x %x", __func__, - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_OUT_OFFSET), val, - hif_read32_mb(mem + GPIO_BASE_ADDRESS + - WLAN_DEBUG_OUT_OFFSET)); - } - - A_TARGET_ACCESS_END(scn); -} - -/** - * hif_dump_registers(): dump bus debug registers - * - * This function dumps hif bus debug registers - * - * @scn: struct ol_softc - * - * Return: 0 for success or error code - */ -int hif_dump_registers(struct ol_softc *scn) -{ - int status; - - status = hif_dump_ce_registers(scn); - if (status) - return status; - hif_dump_pci_registers(scn); - - return 0; -} - -/* - * Handler for a per-engine interrupt on a PARTICULAR CE. - * This is used in cases where each CE has a private - * MSI interrupt. - */ -static irqreturn_t ce_per_engine_handler(int irq, void *arg) -{ - struct hif_pci_softc *sc = (struct hif_pci_softc *)arg; - int CE_id = irq - MSI_ASSIGN_CE_INITIAL; - - /* - * NOTE: We are able to derive CE_id from irq because we - * use a one-to-one mapping for CE's 0..5. - * CE's 6 & 7 do not use interrupts at all. - * - * This mapping must be kept in sync with the mapping - * used by firmware. - */ - - ce_per_engine_service(sc->ol_sc, CE_id); - - return IRQ_HANDLED; -} - -#ifdef CONFIG_SLUB_DEBUG_ON - -/* worker thread to schedule wlan_tasklet in SLUB debug build */ -static void reschedule_tasklet_work_handler(struct work_struct *recovery) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct hif_pci_softc *sc; - - if (NULL == scn) { - HIF_ERROR("%s: tasklet scn is null", __func__); - return; - } - - sc = scn->hif_sc; - - if (scn->hif_init_done == false) { - HIF_ERROR("%s: wlan driver is unloaded", __func__); - return; - } - - tasklet_schedule(&sc->intr_tq); - return; -} - -static DECLARE_WORK(reschedule_tasklet_work, reschedule_tasklet_work_handler); - -#endif - -static void wlan_tasklet(unsigned long data) -{ - struct hif_pci_softc *sc = (struct hif_pci_softc *)data; - struct ol_softc *scn = sc->ol_sc; - - if (scn->hif_init_done == false) - goto end; - - if (cdf_atomic_read(&scn->link_suspended)) - goto end; - - if (!ADRASTEA_BU) { - (irqreturn_t) hif_fw_interrupt_handler(sc->irq_event, scn); - if (sc->ol_sc->target_status == OL_TRGET_STATUS_RESET) - goto end; - } - -end: - cdf_atomic_set(&scn->tasklet_from_intr, 0); - cdf_atomic_dec(&scn->active_tasklet_cnt); -} - -#ifdef FEATURE_RUNTIME_PM -#define HIF_PCI_RUNTIME_PM_STATS(_s, _sc, _name) \ - seq_printf(_s, "%30s: %u\n", #_name, _sc->pm_stats._name) - -/** - * hif_pci_runtime_pm_warn() - Runtime PM Debugging API - * @sc: hif_pci_softc context - * @msg: log message - * - * log runtime pm stats when something seems off. - * - * Return: void - */ -void hif_pci_runtime_pm_warn(struct hif_pci_softc *sc, const char *msg) -{ - struct hif_pm_runtime_lock *ctx; - - HIF_ERROR("%s: usage_count: %d, pm_state: %d, prevent_suspend_cnt: %d", - msg, atomic_read(&sc->dev->power.usage_count), - atomic_read(&sc->pm_state), - sc->prevent_suspend_cnt); - - HIF_ERROR("runtime_status: %d, runtime_error: %d, disable_depth: %d autosuspend_delay: %d", - sc->dev->power.runtime_status, - sc->dev->power.runtime_error, - sc->dev->power.disable_depth, - sc->dev->power.autosuspend_delay); - - HIF_ERROR("runtime_get: %u, runtime_put: %u, request_resume: %u", - sc->pm_stats.runtime_get, sc->pm_stats.runtime_put, - sc->pm_stats.request_resume); - - HIF_ERROR("allow_suspend: %u, prevent_suspend: %u", - sc->pm_stats.allow_suspend, - sc->pm_stats.prevent_suspend); - - HIF_ERROR("prevent_suspend_timeout: %u, allow_suspend_timeout: %u", - sc->pm_stats.prevent_suspend_timeout, - sc->pm_stats.allow_suspend_timeout); - - HIF_ERROR("Suspended: %u, resumed: %u count", - sc->pm_stats.suspended, - sc->pm_stats.resumed); - - HIF_ERROR("suspend_err: %u, runtime_get_err: %u", - sc->pm_stats.suspend_err, - sc->pm_stats.runtime_get_err); - - HIF_ERROR("Active Wakeup Sources preventing Runtime Suspend: "); - - list_for_each_entry(ctx, &sc->prevent_suspend_list, list) { - HIF_ERROR("source %s; timeout %d ms", ctx->name, ctx->timeout); - } - - WARN_ON(1); -} - -/** - * hif_pci_pm_runtime_debugfs_show(): show debug stats for runtimepm - * @s: file to print to - * @data: unused - * - * debugging tool added to the debug fs for displaying runtimepm stats - * - * Return: 0 - */ -static int hif_pci_pm_runtime_debugfs_show(struct seq_file *s, void *data) -{ - struct hif_pci_softc *sc = s->private; - static const char * const autopm_state[] = {"NONE", "ON", "INPROGRESS", - "SUSPENDED"}; - unsigned int msecs_age; - int pm_state = atomic_read(&sc->pm_state); - unsigned long timer_expires, flags; - struct hif_pm_runtime_lock *ctx; - - seq_printf(s, "%30s: %s\n", "Runtime PM state", - autopm_state[pm_state]); - seq_printf(s, "%30s: %pf\n", "Last Resume Caller", - sc->pm_stats.last_resume_caller); - - if (pm_state == HIF_PM_RUNTIME_STATE_SUSPENDED) { - msecs_age = jiffies_to_msecs( - jiffies - sc->pm_stats.suspend_jiffies); - seq_printf(s, "%30s: %d.%03ds\n", "Suspended Since", - msecs_age / 1000, msecs_age % 1000); - } - - seq_printf(s, "%30s: %d\n", "PM Usage count", - atomic_read(&sc->dev->power.usage_count)); - - seq_printf(s, "%30s: %u\n", "prevent_suspend_cnt", - sc->prevent_suspend_cnt); - - HIF_PCI_RUNTIME_PM_STATS(s, sc, suspended); - HIF_PCI_RUNTIME_PM_STATS(s, sc, suspend_err); - HIF_PCI_RUNTIME_PM_STATS(s, sc, resumed); - HIF_PCI_RUNTIME_PM_STATS(s, sc, runtime_get); - HIF_PCI_RUNTIME_PM_STATS(s, sc, runtime_put); - HIF_PCI_RUNTIME_PM_STATS(s, sc, request_resume); - HIF_PCI_RUNTIME_PM_STATS(s, sc, prevent_suspend); - HIF_PCI_RUNTIME_PM_STATS(s, sc, allow_suspend); - HIF_PCI_RUNTIME_PM_STATS(s, sc, prevent_suspend_timeout); - HIF_PCI_RUNTIME_PM_STATS(s, sc, allow_suspend_timeout); - HIF_PCI_RUNTIME_PM_STATS(s, sc, runtime_get_err); - - timer_expires = sc->runtime_timer_expires; - if (timer_expires > 0) { - msecs_age = jiffies_to_msecs(timer_expires - jiffies); - seq_printf(s, "%30s: %d.%03ds\n", "Prevent suspend timeout", - msecs_age / 1000, msecs_age % 1000); - } - - spin_lock_irqsave(&sc->runtime_lock, flags); - if (list_empty(&sc->prevent_suspend_list)) { - spin_unlock_irqrestore(&sc->runtime_lock, flags); - return 0; - } - - seq_printf(s, "%30s: ", "Active Wakeup_Sources"); - list_for_each_entry(ctx, &sc->prevent_suspend_list, list) { - seq_printf(s, "%s", ctx->name); - if (ctx->timeout) - seq_printf(s, "(%d ms)", ctx->timeout); - seq_puts(s, " "); - } - seq_puts(s, "\n"); - spin_unlock_irqrestore(&sc->runtime_lock, flags); - - return 0; -} -#undef HIF_PCI_RUNTIME_PM_STATS - -/** - * hif_pci_autopm_open() - open a debug fs file to access the runtime pm stats - * @inode - * @file - * - * Return: linux error code of single_open. - */ -static int hif_pci_runtime_pm_open(struct inode *inode, struct file *file) -{ - return single_open(file, hif_pci_pm_runtime_debugfs_show, - inode->i_private); -} - -#ifdef WLAN_OPEN_SOURCE -static const struct file_operations hif_pci_runtime_pm_fops = { - .owner = THIS_MODULE, - .open = hif_pci_runtime_pm_open, - .release = single_release, - .read = seq_read, - .llseek = seq_lseek, -}; - -/** - * hif_runtime_pm_debugfs_create() - creates runtimepm debugfs entry - * @sc: pci context - * - * creates a debugfs entry to debug the runtime pm feature. - */ -static void hif_runtime_pm_debugfs_create(struct hif_pci_softc *sc) -{ - sc->pm_dentry = debugfs_create_file("cnss_runtime_pm", - S_IRUSR, NULL, sc, - &hif_pci_runtime_pm_fops); -} -/** - * hif_runtime_pm_debugfs_remove() - removes runtimepm debugfs entry - * @sc: pci context - * - * removes the debugfs entry to debug the runtime pm feature. - */ -static void hif_runtime_pm_debugfs_remove(struct hif_pci_softc *sc) -{ - debugfs_remove(sc->pm_dentry); -} -#else -static inline void hif_runtime_pm_debugfs_create(struct hif_pci_softc *sc) -{ -} -static inline void hif_runtime_pm_debugfs_remove(struct hif_pci_softc *sc) -{ -} -#endif - -static void hif_pm_runtime_lock_timeout_fn(unsigned long data); - -/** - * hif_pm_runtime_start(): start the runtime pm - * @sc: pci context - * - * After this call, runtime pm will be active. - */ -static void hif_pm_runtime_start(struct hif_pci_softc *sc) -{ - struct ol_softc *ol_sc; - - ol_sc = sc->ol_sc; - - if (!ol_sc->enable_runtime_pm) { - HIF_INFO("%s: RUNTIME PM is disabled in ini\n", __func__); - return; - } - - if (cds_get_conparam() == CDF_FTM_MODE || - WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { - HIF_INFO("%s: RUNTIME PM is disabled for FTM/EPPING mode\n", - __func__); - return; - } - - setup_timer(&sc->runtime_timer, hif_pm_runtime_lock_timeout_fn, - (unsigned long)sc); - - HIF_INFO("%s: Enabling RUNTIME PM, Delay: %d ms", __func__, - ol_sc->runtime_pm_delay); - - cnss_runtime_init(sc->dev, ol_sc->runtime_pm_delay); - cdf_atomic_set(&sc->pm_state, HIF_PM_RUNTIME_STATE_ON); - hif_runtime_pm_debugfs_create(sc); -} - -/** - * hif_pm_runtime_stop(): stop runtime pm - * @sc: pci context - * - * Turns off runtime pm and frees corresponding resources - * that were acquired by hif_runtime_pm_start(). - */ -static void hif_pm_runtime_stop(struct hif_pci_softc *sc) -{ - struct ol_softc *ol_sc = sc->ol_sc; - - if (!ol_sc->enable_runtime_pm) - return; - - if (cds_get_conparam() == CDF_FTM_MODE || - WLAN_IS_EPPING_ENABLED(cds_get_conparam())) - return; - - cnss_runtime_exit(sc->dev); - cnss_pm_runtime_request(sc->dev, CNSS_PM_RUNTIME_RESUME); - - cdf_atomic_set(&sc->pm_state, HIF_PM_RUNTIME_STATE_NONE); - - hif_runtime_pm_debugfs_remove(sc); - del_timer_sync(&sc->runtime_timer); - /* doesn't wait for penting trafic unlike cld-2.0 */ -} - -/** - * hif_pm_runtime_open(): initialize runtime pm - * @sc: pci data structure - * - * Early initialization - */ -static void hif_pm_runtime_open(struct hif_pci_softc *sc) -{ - spin_lock_init(&sc->runtime_lock); - - cdf_atomic_init(&sc->pm_state); - sc->prevent_linkdown_lock = - hif_runtime_lock_init("linkdown suspend disabled"); - cdf_atomic_set(&sc->pm_state, HIF_PM_RUNTIME_STATE_NONE); - INIT_LIST_HEAD(&sc->prevent_suspend_list); -} - -/** - * hif_pm_runtime_close(): close runtime pm - * @sc: pci bus handle - * - * ensure runtime_pm is stopped before closing the driver - */ -static void hif_pm_runtime_close(struct hif_pci_softc *sc) -{ - if (cdf_atomic_read(&sc->pm_state) == HIF_PM_RUNTIME_STATE_NONE) - return; - else - hif_pm_runtime_stop(sc); -} - - -#else - -static void hif_pm_runtime_close(struct hif_pci_softc *sc) {} -static void hif_pm_runtime_open(struct hif_pci_softc *sc) {} -static void hif_pm_runtime_start(struct hif_pci_softc *sc) {} -static void hif_pm_runtime_stop(struct hif_pci_softc *sc) {} -#endif - -/** - * hif_enable_power_management(): enable power management - * @hif_ctx: hif context - * - * Currently only does runtime pm. Eventually this function could - * consolidate other power state features such as only letting - * the soc sleep after the driver finishes loading and re-enabling - * aspm (hif_enable_power_gating). - */ -void hif_enable_power_management(void *hif_ctx) -{ - struct hif_pci_softc *pci_ctx; - - if (hif_ctx == NULL) { - HIF_ERROR("%s, hif_ctx null", __func__); - return; - } - - pci_ctx = ((struct ol_softc *)hif_ctx)->hif_sc; - - hif_pm_runtime_start(pci_ctx); -} - -/** - * hif_disable_power_management(): disable power management - * @hif_ctx: hif context - * - * Currently disables runtime pm. Should be updated to behave - * if runtime pm is not started. Should be updated to take care - * of aspm and soc sleep for driver load. - */ -void hif_disable_power_management(void *hif_ctx) -{ - struct hif_pci_softc *pci_ctx; - - if (hif_ctx == NULL) { - HIF_ERROR("%s, hif_ctx null", __func__); - return; - } - - pci_ctx = ((struct ol_softc *)hif_ctx)->hif_sc; - - hif_pm_runtime_stop(pci_ctx); -} - -#define ATH_PCI_PROBE_RETRY_MAX 3 -/** - * hif_bus_open(): hif_bus_open - * @scn: scn - * @bus_type: bus type - * - * Return: n/a - */ -CDF_STATUS hif_bus_open(struct ol_softc *ol_sc, enum ath_hal_bus_type bus_type) -{ - struct hif_pci_softc *sc; - - sc = cdf_mem_malloc(sizeof(*sc)); - if (!sc) { - HIF_ERROR("%s: no mem", __func__); - return CDF_STATUS_E_NOMEM; - } - ol_sc->hif_sc = (void *)sc; - sc->ol_sc = ol_sc; - ol_sc->bus_type = bus_type; - hif_pm_runtime_open(sc); - - cdf_spinlock_init(&ol_sc->irq_lock); - - return CDF_STATUS_SUCCESS; -} - -/** - * hif_bus_close(): hif_bus_close - * - * Return: n/a - */ -void hif_bus_close(struct ol_softc *ol_sc) -{ - struct hif_pci_softc *sc; - - if (ol_sc == NULL) { - HIF_ERROR("%s: ol_softc is NULL", __func__); - return; - } - sc = ol_sc->hif_sc; - if (sc == NULL) - return; - - hif_pm_runtime_close(sc); - cdf_mem_free(sc); - ol_sc->hif_sc = NULL; -} - -#define BAR_NUM 0 - -int hif_enable_pci(struct hif_pci_softc *sc, - struct pci_dev *pdev, - const struct pci_device_id *id) -{ - void __iomem *mem; - int ret = 0; - uint16_t device_id; - struct ol_softc *ol_sc = sc->ol_sc; - - pci_read_config_word(pdev,PCI_DEVICE_ID,&device_id); - if(device_id != id->device) { - HIF_ERROR( - "%s: dev id mismatch, config id = 0x%x, probing id = 0x%x", - __func__, device_id, id->device); - /* pci link is down, so returing with error code */ - return -EIO; - } - - /* FIXME: temp. commenting out assign_resource - * call for dev_attach to work on 2.6.38 kernel - */ -#if (!defined(__LINUX_ARM_ARCH__)) - if (pci_assign_resource(pdev, BAR_NUM)) { - HIF_ERROR("%s: pci_assign_resource error", __func__); - return -EIO; - } -#endif - if (pci_enable_device(pdev)) { - HIF_ERROR("%s: pci_enable_device error", - __func__); - return -EIO; - } - - /* Request MMIO resources */ - ret = pci_request_region(pdev, BAR_NUM, "ath"); - if (ret) { - HIF_ERROR("%s: PCI MMIO reservation error", __func__); - ret = -EIO; - goto err_region; - } -#ifdef CONFIG_ARM_LPAE - /* if CONFIG_ARM_LPAE is enabled, we have to set 64 bits mask - * for 32 bits device also. */ - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); - if (ret) { - HIF_ERROR("%s: Cannot enable 64-bit pci DMA", __func__); - goto err_dma; - } - ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); - if (ret) { - HIF_ERROR("%s: Cannot enable 64-bit DMA", __func__); - goto err_dma; - } -#else - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); - if (ret) { - HIF_ERROR("%s: Cannot enable 32-bit pci DMA", __func__); - goto err_dma; - } - ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); - if (ret) { - HIF_ERROR("%s: Cannot enable 32-bit consistent DMA!", - __func__); - goto err_dma; - } -#endif - - PCI_CFG_TO_DISABLE_L1SS_STATES(pdev, 0x188); - - /* Set bus master bit in PCI_COMMAND to enable DMA */ - pci_set_master(pdev); - - /* Arrange for access to Target SoC registers. */ - mem = pci_iomap(pdev, BAR_NUM, 0); - if (!mem) { - HIF_ERROR("%s: PCI iomap error", __func__); - ret = -EIO; - goto err_iomap; - } - sc->mem = mem; - sc->pdev = pdev; - sc->dev = &pdev->dev; - ol_sc->aps_osdev.bdev = pdev; - ol_sc->aps_osdev.device = &pdev->dev; - ol_sc->aps_osdev.bc.bc_handle = (void *)mem; - ol_sc->aps_osdev.bc.bc_bustype = HAL_BUS_TYPE_PCI; - sc->devid = id->device; - sc->cacheline_sz = dma_get_cache_alignment(); - /* Get RAM dump memory address and size */ - GET_VIRT_RAMDUMP_MEM(ol_sc); - ol_sc->mem = mem; - sc->pci_enabled = true; - return ret; - -err_iomap: - pci_clear_master(pdev); -err_dma: - pci_release_region(pdev, BAR_NUM); -err_region: - pci_disable_device(pdev); - return ret; -} - -void hif_disable_pci(struct hif_pci_softc *sc) -{ - struct ol_softc *ol_sc; - - if (!sc) - return; - - ol_sc = sc->ol_sc; - if (ol_sc == NULL) { - HIF_ERROR("%s: ol_sc = NULL", __func__); - return; - } - pci_set_drvdata(sc->pdev, NULL); - hif_pci_device_reset(sc); - pci_iounmap(sc->pdev, sc->mem); - sc->mem = NULL; - ol_sc->mem = NULL; - pci_clear_master(sc->pdev); - pci_release_region(sc->pdev, BAR_NUM); - pci_disable_device(sc->pdev); -} - -int hif_pci_probe_tgt_wakeup(struct hif_pci_softc *sc) -{ - int ret = 0; - int targ_awake_limit = 500; -#ifndef QCA_WIFI_3_0 - uint32_t fw_indicator; -#endif - struct ol_softc *scn = sc->ol_sc; - /* - * Verify that the Target was started cleanly.* - * The case where this is most likely is with an AUX-powered - * Target and a Host in WoW mode. If the Host crashes, - * loses power, or is restarted (without unloading the driver) - * then the Target is left (aux) powered and running. On a - * subsequent driver load, the Target is in an unexpected state. - * We try to catch that here in order to reset the Target and - * retry the probe. - */ - hif_write32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_V_MASK); - while (!hif_targ_is_awake(scn, sc->mem)) { - if (0 == targ_awake_limit) { - HIF_ERROR("%s: target awake timeout", __func__); - ret = -EAGAIN; - goto end; - } - cdf_mdelay(1); - targ_awake_limit--; - } - -#if PCIE_BAR0_READY_CHECKING - { - int wait_limit = 200; - /* Synchronization point: wait the BAR0 is configured */ - while (wait_limit-- && - !(hif_read32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_RDY_STATUS_ADDRESS) \ - & PCIE_SOC_RDY_STATUS_BAR_MASK)) { - cdf_mdelay(10); - } - if (wait_limit < 0) { - /* AR6320v1 doesn't support checking of BAR0 configuration, - takes one sec to wait BAR0 ready */ - HIF_INFO_MED("%s: AR6320v1 waits two sec for BAR0", - __func__); - } - } -#endif - -#ifndef QCA_WIFI_3_0 - fw_indicator = hif_read32_mb(sc->mem + FW_INDICATOR_ADDRESS); - hif_write32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_RESET); - - if (fw_indicator & FW_IND_INITIALIZED) { - HIF_ERROR("%s: Target is in an unknown state. EAGAIN", - __func__); - ret = -EAGAIN; - goto end; - } -#endif - -end: - return ret; -} - -static void wlan_tasklet_msi(unsigned long data) -{ - struct hif_tasklet_entry *entry = (struct hif_tasklet_entry *)data; - struct hif_pci_softc *sc = (struct hif_pci_softc *) entry->hif_handler; - struct ol_softc *scn = sc->ol_sc; - - if (sc->ol_sc->hif_init_done == false) - goto irq_handled; - - if (cdf_atomic_read(&sc->ol_sc->link_suspended)) - goto irq_handled; - - cdf_atomic_inc(&scn->active_tasklet_cnt); - - if (entry->id == HIF_MAX_TASKLET_NUM) { - /* the last tasklet is for fw IRQ */ - (irqreturn_t)hif_fw_interrupt_handler(sc->irq_event, sc->ol_sc); - if (sc->ol_sc->target_status == OL_TRGET_STATUS_RESET) - goto irq_handled; - } else if (entry->id < sc->ol_sc->ce_count) { - ce_per_engine_service(sc->ol_sc, entry->id); - } else { - HIF_ERROR("%s: ERROR - invalid CE_id = %d", - __func__, entry->id); - } - return; - -irq_handled: - cdf_atomic_dec(&scn->active_tasklet_cnt); - -} - -int hif_configure_msi(struct hif_pci_softc *sc) -{ - int ret = 0; - int num_msi_desired; - int rv = -1; - struct ol_softc *scn = sc->ol_sc; - - HIF_TRACE("%s: E", __func__); - - num_msi_desired = MSI_NUM_REQUEST; /* Multiple MSI */ - if (num_msi_desired < 1) { - HIF_ERROR("%s: MSI is not configured", __func__); - return -EINVAL; - } - - if (num_msi_desired > 1) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) - rv = pci_enable_msi_range(sc->pdev, num_msi_desired, - num_msi_desired); -#else - rv = pci_enable_msi_block(sc->pdev, num_msi_desired); -#endif - } - HIF_TRACE("%s: num_msi_desired = %d, available_msi = %d", - __func__, num_msi_desired, rv); - - if (rv == 0 || rv >= HIF_MAX_TASKLET_NUM) { - int i; - - sc->num_msi_intrs = HIF_MAX_TASKLET_NUM; - sc->tasklet_entries[HIF_MAX_TASKLET_NUM -1].hif_handler = - (void *)sc; - sc->tasklet_entries[HIF_MAX_TASKLET_NUM -1].id = - HIF_MAX_TASKLET_NUM; - tasklet_init(&sc->intr_tq, wlan_tasklet_msi, - (unsigned long)&sc->tasklet_entries[ - HIF_MAX_TASKLET_NUM -1]); - ret = request_irq(sc->pdev->irq + MSI_ASSIGN_FW, - hif_pci_msi_fw_handler, - IRQF_SHARED, "wlan_pci", sc); - if(ret) { - HIF_ERROR("%s: request_irq failed", __func__); - goto err_intr; - } - for (i = 0; i <= scn->ce_count; i++) { - sc->tasklet_entries[i].hif_handler = (void *)sc; - sc->tasklet_entries[i].id = i; - tasklet_init(&sc->intr_tq, wlan_tasklet_msi, - (unsigned long)&sc->tasklet_entries[i]); - ret = request_irq((sc->pdev->irq + - i + MSI_ASSIGN_CE_INITIAL), - ce_per_engine_handler, IRQF_SHARED, - "wlan_pci", sc); - if(ret) { - HIF_ERROR("%s: request_irq failed", __func__); - goto err_intr; - } - } - } else if (rv > 0) { - HIF_TRACE("%s: use single msi", __func__); - - if ((ret = pci_enable_msi(sc->pdev)) < 0) { - HIF_ERROR("%s: single MSI allocation failed", - __func__); - /* Try for legacy PCI line interrupts */ - sc->num_msi_intrs = 0; - } else { - sc->num_msi_intrs = 1; - tasklet_init(&sc->intr_tq, - wlan_tasklet, (unsigned long)sc); - ret = request_irq(sc->pdev->irq, - hif_pci_interrupt_handler, - IRQF_SHARED, "wlan_pci", sc); - if(ret) { - HIF_ERROR("%s: request_irq failed", __func__); - goto err_intr; - } - } - } else { - sc->num_msi_intrs = 0; - ret = -EIO; - HIF_ERROR("%s: do not support MSI, rv = %d", __func__, rv); - } - if ((ret = pci_enable_msi(sc->pdev)) < 0) { - HIF_ERROR("%s: single MSI interrupt allocation failed", - __func__); - /* Try for legacy PCI line interrupts */ - sc->num_msi_intrs = 0; - } else { - sc->num_msi_intrs = 1; - tasklet_init(&sc->intr_tq, wlan_tasklet, (unsigned long)sc); - ret = request_irq(sc->pdev->irq, - hif_pci_interrupt_handler, IRQF_SHARED, - "wlan_pci", sc); - if(ret) { - HIF_ERROR("%s: request_irq failed", __func__); - goto err_intr; - } - } - - if (ret == 0) { - hif_write32_mb(sc->mem+(SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - HOST_GROUP0_MASK); - hif_write32_mb(sc->mem + - PCIE_LOCAL_BASE_ADDRESS + PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_RESET); - } - HIF_TRACE("%s: X, ret = %d", __func__, ret); - - return ret; - -err_intr: -if (sc->num_msi_intrs >= 1) - pci_disable_msi(sc->pdev); - return ret; -} - -static int hif_pci_configure_legacy_irq(struct hif_pci_softc *sc) -{ - int ret = 0; - struct ol_softc *scn = sc->ol_sc; - - HIF_TRACE("%s: E", __func__); - - /* do notn support MSI or MSI IRQ failed */ - tasklet_init(&sc->intr_tq, wlan_tasklet, (unsigned long)sc); - ret = request_irq(sc->pdev->irq, - hif_pci_interrupt_handler, IRQF_SHARED, - "wlan_pci", sc); - if(ret) { - HIF_ERROR("%s: request_irq failed, ret = %d", __func__, ret); - goto end; - } - /* Use Legacy PCI Interrupts */ - hif_write32_mb(sc->mem+(SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - HOST_GROUP0_MASK); - hif_write32_mb(sc->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_RESET); -end: - CDF_TRACE(CDF_MODULE_ID_HIF, CDF_TRACE_LEVEL_ERROR, - "%s: X, ret = %d", __func__, ret); - return ret; -} - -/** - * hif_nointrs(): disable IRQ - * - * This function stops interrupt(s) - * - * @scn: struct ol_softc - * - * Return: none - */ -void hif_nointrs(struct ol_softc *scn) -{ - int i; - struct hif_pci_softc *sc = scn->hif_sc; - - if (scn->request_irq_done == false) - return; - if (sc->num_msi_intrs > 0) { - /* MSI interrupt(s) */ - for (i = 0; i < sc->num_msi_intrs; i++) { - free_irq(sc->pdev->irq + i, sc); - } - sc->num_msi_intrs = 0; - } else { - /* Legacy PCI line interrupt */ - free_irq(sc->pdev->irq, sc); - } - ce_unregister_irq(scn->hif_hdl, 0xfff); - scn->request_irq_done = false; -} - -/** - * hif_disable_bus(): hif_disable_bus - * - * This function disables the bus - * - * @bdev: bus dev - * - * Return: none - */ -void hif_disable_bus(void *bdev) -{ - struct pci_dev *pdev = bdev; - struct hif_pci_softc *sc = pci_get_drvdata(pdev); - struct ol_softc *scn; - void __iomem *mem; - - /* Attach did not succeed, all resources have been - * freed in error handler - */ - if (!sc) - return; - - scn = sc->ol_sc; - - if (ADRASTEA_BU) { - hif_write32_mb(sc->mem + PCIE_INTR_ENABLE_ADDRESS, 0); - hif_write32_mb(sc->mem + PCIE_INTR_CLR_ADDRESS, - HOST_GROUP0_MASK); - } - - mem = (void __iomem *)sc->mem; - if (mem) { - pci_disable_msi(pdev); - hif_dump_pipe_debug_count(scn); - hif_deinit_cdf_ctx(scn); - if (scn->athdiag_procfs_inited) { - athdiag_procfs_remove(); - scn->athdiag_procfs_inited = false; - } - pci_set_drvdata(pdev, NULL); - pci_iounmap(pdev, mem); - scn->mem = NULL; - pci_release_region(pdev, BAR_NUM); - pci_clear_master(pdev); - pci_disable_device(pdev); - } - HIF_INFO("%s: X", __func__); -} - -#define OL_ATH_PCI_PM_CONTROL 0x44 - -#ifdef FEATURE_RUNTIME_PM -/** - * hif_runtime_prevent_linkdown() - prevent or allow a runtime pm from occuring - * @scn: hif context - * @flag: prevent linkdown if true otherwise allow - * - * this api should only be called as part of bus prevent linkdown - */ -static void hif_runtime_prevent_linkdown(struct ol_softc *scn, bool flag) -{ - struct hif_pci_softc *sc = scn->hif_sc; - - if (flag) - hif_pm_runtime_prevent_suspend(scn, sc->prevent_linkdown_lock); - else - hif_pm_runtime_allow_suspend(scn, sc->prevent_linkdown_lock); -} -#else -static void hif_runtime_prevent_linkdown(struct ol_softc *scn, bool flag) -{ -} -#endif - -#if defined(CONFIG_CNSS) && defined(CONFIG_PCI_MSM) -/** - * hif_bus_prevent_linkdown(): allow or permit linkdown - * @flag: true prevents linkdown, false allows - * - * Calls into the platform driver to vote against taking down the - * pcie link. - * - * Return: n/a - */ -void hif_bus_prevent_linkdown(struct ol_softc *scn, bool flag) -{ - HIF_ERROR("wlan: %s pcie power collapse", - (flag ? "disable" : "enable")); - hif_runtime_prevent_linkdown(scn, flag); - cnss_wlan_pm_control(flag); -} -#else -void hif_bus_prevent_linkdown(struct ol_softc *scn, bool flag) -{ - HIF_ERROR("wlan: %s pcie power collapse", - (flag ? "disable" : "enable")); - hif_runtime_prevent_linkdown(scn, flag); -} -#endif - -/** - * hif_drain_tasklets(): wait untill no tasklet is pending - * @scn: hif context - * - * Let running tasklets clear pending trafic. - * - * Return: 0 if no bottom half is in progress when it returns. - * -EFAULT if it times out. - */ -static inline int hif_drain_tasklets(struct ol_softc *scn) -{ - uint32_t ce_drain_wait_cnt = 0; - - while (cdf_atomic_read(&scn->active_tasklet_cnt)) { - if (++ce_drain_wait_cnt > HIF_CE_DRAIN_WAIT_CNT) { - HIF_ERROR("%s: CE still not done with access", - __func__); - - return -EFAULT; - } - HIF_INFO("%s: Waiting for CE to finish access", __func__); - msleep(10); - } - return 0; -} - -/** - * hif_bus_suspend_link_up() - suspend the bus - * - * Configures the pci irq line as a wakeup source. - * - * Return: 0 for success and non-zero for failure - */ -static int hif_bus_suspend_link_up(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct pci_dev *pdev; - int status; - - if (!scn) - return -EFAULT; - - pdev = scn->aps_osdev.bdev; - - status = hif_drain_tasklets(scn); - if (status != 0) - return status; - - if (unlikely(enable_irq_wake(pdev->irq))) { - HIF_ERROR("%s: Fail to enable wake IRQ!", __func__); - return -EINVAL; - } - - return 0; -} - -/** - * hif_bus_resume_link_up() - hif bus resume API - * - * This function disables the wakeup source. - * - * Return: 0 for success and non-zero for failure - */ -static int hif_bus_resume_link_up(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct pci_dev *pdev; - - if (!scn) - return -EFAULT; - - pdev = scn->aps_osdev.bdev; - if (!pdev) { - HIF_ERROR("%s: pci_dev is null", __func__); - return -EFAULT; - } - - if (unlikely(disable_irq_wake(pdev->irq))) { - HIF_ERROR("%s: Fail to disable wake IRQ!", __func__); - return -EFAULT; - } - - return 0; -} - -/** - * hif_bus_suspend_link_down() - suspend the bus - * - * Suspends the hif layer taking care of draining recieve queues and - * shutting down copy engines if needed. Ensures opy engine interrupts - * are disabled when it returns. Prevents register access after it - * returns. - * - * Return: 0 for success and non-zero for failure - */ -static int hif_bus_suspend_link_down(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct pci_dev *pdev; - struct HIF_CE_state *hif_state; - int status = 0; - - if (!scn) - return -EFAULT; - - pdev = scn->aps_osdev.bdev; - - hif_state = (struct HIF_CE_state *)scn->hif_hdl; - if (!hif_state) { - HIF_ERROR("%s: hif_state is null", __func__); - return -EFAULT; - } - - disable_irq(pdev->irq); - - status = hif_drain_tasklets(scn); - if (status != 0) { - enable_irq(pdev->irq); - return status; - } - - /* Stop the HIF Sleep Timer */ - hif_cancel_deferred_target_sleep(scn); - - cdf_atomic_set(&scn->link_suspended, 1); - - return 0; -} - -/** - * hif_bus_resume_link_down() - hif bus resume API - * - * This function resumes the bus reenabling interupts. - * - * Return: 0 for success and non-zero for failure - */ -static int hif_bus_resume_link_down(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct pci_dev *pdev; - - if (!scn) - return -EFAULT; - - pdev = scn->aps_osdev.bdev; - if (!pdev) { - HIF_ERROR("%s: pci_dev is null", __func__); - return -EFAULT; - } - - cdf_atomic_set(&scn->link_suspended, 0); - - enable_irq(pdev->irq); - - return 0; -} - -/** - * hif_bus_suspend(): prepare hif for suspend - * - * chose suspend type based on link suspend voting. - * - * Return: 0 for success and non-zero error code for failure - */ -int hif_bus_suspend(void) -{ - if (hif_can_suspend_link()) - return hif_bus_suspend_link_down(); - else - return hif_bus_suspend_link_up(); -} - -/** - * hif_bus_resume(): prepare hif for resume - * - * chose suspend type based on link suspend voting. - * - * Return: 0 for success and non-zero error code for failure - */ -int hif_bus_resume(void) -{ - if (hif_can_suspend_link()) - return hif_bus_resume_link_down(); - else - return hif_bus_resume_link_up(); -} - -#ifdef FEATURE_RUNTIME_PM -/** - * __hif_runtime_pm_set_state(): utility function - * @state: state to set - * - * indexes into the runtime pm state and sets it. - */ -static void __hif_runtime_pm_set_state(enum hif_pm_runtime_state state) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct hif_pci_softc *sc; - - if (NULL == scn) { - HIF_ERROR("%s: HIF_CTX not initialized", - __func__); - return; - } - - sc = scn->hif_sc; - cdf_atomic_set(&sc->pm_state, state); - -} -#endif - -#ifdef FEATURE_RUNTIME_PM -/** - * hif_runtime_pm_set_state_inprogress(): adjust runtime pm state - * - * Notify hif that a runtime pm opperation has started - */ -static void hif_runtime_pm_set_state_inprogress(void) -{ - __hif_runtime_pm_set_state(HIF_PM_RUNTIME_STATE_INPROGRESS); -} - -/** - * hif_runtime_pm_set_state_on(): adjust runtime pm state - * - * Notify hif that a the runtime pm state should be on - */ -static void hif_runtime_pm_set_state_on(void) -{ - __hif_runtime_pm_set_state(HIF_PM_RUNTIME_STATE_ON); -} - -/** - * hif_runtime_pm_set_state_suspended(): adjust runtime pm state - * - * Notify hif that a runtime suspend attempt has been completed successfully - */ -static void hif_runtime_pm_set_state_suspended(void) -{ - __hif_runtime_pm_set_state(HIF_PM_RUNTIME_STATE_SUSPENDED); -} - -static inline struct hif_pci_softc *get_sc(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - - if (NULL == scn) { - HIF_ERROR("%s: Could not disable ASPM scn is null", - __func__); - return NULL; - } - - return scn->hif_sc; -} - -/** - * hif_log_runtime_suspend_success() - log a successful runtime suspend - */ -static void hif_log_runtime_suspend_success(void) -{ - struct hif_pci_softc *sc = get_sc(); - if (sc == NULL) - return; - - sc->pm_stats.suspended++; - sc->pm_stats.suspend_jiffies = jiffies; -} - -/** - * hif_log_runtime_suspend_failure() - log a failed runtime suspend - * - * log a failed runtime suspend - * mark last busy to prevent immediate runtime suspend - */ -static void hif_log_runtime_suspend_failure(void) -{ - struct hif_pci_softc *sc = get_sc(); - if (sc == NULL) - return; - - sc->pm_stats.suspend_err++; -} - -/** - * hif_log_runtime_resume_success() - log a successful runtime resume - * - * log a successfull runtime resume - * mark last busy to prevent immediate runtime suspend - */ -static void hif_log_runtime_resume_success(void) -{ - struct hif_pci_softc *sc = get_sc(); - if (sc == NULL) - return; - - sc->pm_stats.resumed++; -} - -/** - * hif_process_runtime_suspend_failure() - bookkeeping of suspend failure - * - * Record the failure. - * mark last busy to delay a retry. - * adjust the runtime_pm state. - */ -void hif_process_runtime_suspend_failure(void) -{ - struct hif_pci_softc *sc = get_sc(); - - hif_log_runtime_suspend_failure(); - if (sc != NULL) - hif_pm_runtime_mark_last_busy(sc->dev); - hif_runtime_pm_set_state_on(); -} - -/** - * hif_pre_runtime_suspend() - bookkeeping before beginning runtime suspend - * - * Makes sure that the pci link will be taken down by the suspend opperation. - * If the hif layer is configured to leave the bus on, runtime suspend will - * not save any power. - * - * Set the runtime suspend state to in progress. - * - * return -EINVAL if the bus won't go down. otherwise return 0 - */ -int hif_pre_runtime_suspend(void) -{ - if (!hif_can_suspend_link()) { - HIF_ERROR("Runtime PM not supported for link up suspend"); - return -EINVAL; - } - - hif_runtime_pm_set_state_inprogress(); - return 0; -} - -/** - * hif_process_runtime_suspend_success() - bookkeeping of suspend success - * - * Record the success. - * adjust the runtime_pm state - */ -void hif_process_runtime_suspend_success(void) -{ - hif_runtime_pm_set_state_suspended(); - hif_log_runtime_suspend_success(); -} - -/** - * hif_pre_runtime_resume() - bookkeeping before beginning runtime resume - * - * update the runtime pm state. - */ -void hif_pre_runtime_resume(void) -{ - hif_runtime_pm_set_state_inprogress(); -} - -/** - * hif_process_runtime_resume_success() - bookkeeping after a runtime resume - * - * record the success. - * adjust the runtime_pm state - */ -void hif_process_runtime_resume_success(void) -{ - struct hif_pci_softc *sc = get_sc(); - - hif_log_runtime_resume_success(); - if (sc != NULL) - hif_pm_runtime_mark_last_busy(sc->dev); - hif_runtime_pm_set_state_on(); -} -#endif - -/** - * hif_runtime_suspend() - do the bus suspend part of a runtime suspend - * - * Return: 0 for success and non-zero error code for failure - */ -int hif_runtime_suspend(void) -{ - return hif_bus_suspend(); -} - -#ifdef WLAN_FEATURE_FASTPATH -/** - * hif_fastpath_resume() - resume fastpath for runtimepm - * - * ensure that the fastpath write index register is up to date - * since runtime pm may cause ce_send_fast to skip the register - * write. - */ -static void hif_fastpath_resume(void) -{ - struct ol_softc *scn = - (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); - struct CE_state *ce_state; - - if (!scn) - return; - - if (scn->fastpath_mode_on) { - if (Q_TARGET_ACCESS_BEGIN(scn)) { - ce_state = scn->ce_id_to_state[CE_HTT_H2T_MSG]; - cdf_spin_lock_bh(&ce_state->ce_index_lock); - - /*war_ce_src_ring_write_idx_set */ - CE_SRC_RING_WRITE_IDX_SET(scn, ce_state->ctrl_addr, - ce_state->src_ring->write_index); - cdf_spin_unlock_bh(&ce_state->ce_index_lock); - Q_TARGET_ACCESS_END(scn); - } - } -} -#else -static void hif_fastpath_resume(void) {} -#endif - - -/** - * hif_runtime_resume() - do the bus resume part of a runtime resume - * - * Return: 0 for success and non-zero error code for failure - */ -int hif_runtime_resume(void) -{ - int status = hif_bus_resume(); - - hif_fastpath_resume(); - - return status; -} - -void hif_disable_isr(void *ol_sc) -{ - struct ol_softc *scn = (struct ol_softc *)ol_sc; - struct hif_pci_softc *sc = scn->hif_sc; - - hif_nointrs(ol_sc); -#if CONFIG_PCIE_64BIT_MSI - OS_FREE_CONSISTENT(&scn->aps_osdev, 4, - scn->msi_magic, scn->msi_magic_dma, - OS_GET_DMA_MEM_CONTEXT(scn, MSI_dmacontext)); - scn->msi_magic = NULL; - scn->msi_magic_dma = 0; -#endif - /* Cancel the pending tasklet */ - ce_tasklet_kill(scn->hif_hdl); - tasklet_kill(&sc->intr_tq); - cdf_atomic_set(&scn->active_tasklet_cnt, 0); -} - -/* Function to reset SoC */ -void hif_reset_soc(void *ol_sc) -{ - struct ol_softc *scn = (struct ol_softc *)ol_sc; - struct hif_pci_softc *sc = scn->hif_sc; - -#if defined(CPU_WARM_RESET_WAR) - /* Currently CPU warm reset sequence is tested only for AR9888_REV2 - * Need to enable for AR9888_REV1 once CPU warm reset sequence is - * verified for AR9888_REV1 - */ - if (scn->target_version == AR9888_REV2_VERSION) { - hif_pci_device_warm_reset(sc); - } else { - hif_pci_device_reset(sc); - } -#else - hif_pci_device_reset(sc); -#endif -} - -void hif_disable_aspm(void) -{ - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct hif_pci_softc *sc; - - if (NULL == scn) { - HIF_ERROR("%s: Could not disable ASPM scn is null", - __func__); - return; - } - - sc = scn->hif_sc; - - /* Disable ASPM when pkt log is enabled */ - pci_read_config_dword(sc->pdev, 0x80, &scn->lcr_val); - pci_write_config_dword(sc->pdev, 0x80, (scn->lcr_val & 0xffffff00)); -} - -/** - * hif_enable_power_gating(): enable HW power gating - * - * This function enables HW gating - * - * Return: none - */ -void hif_enable_power_gating(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - struct hif_pci_softc *sc; - - if (NULL == scn) { - HIF_ERROR("%s: Could not disable ASPM scn is null", - __func__); - return; - } - sc = scn->hif_sc; - - /* Re-enable ASPM after firmware/OTP download is complete */ - pci_write_config_dword(sc->pdev, 0x80, scn->lcr_val); - if (scn->pkt_log_init == false) { - PKT_LOG_MOD_INIT(scn); - scn->pkt_log_init = true; - } -} - -#ifdef CONFIG_PCI_MSM -static inline void hif_msm_pcie_debug_info(struct hif_pci_softc *sc) -{ - msm_pcie_debug_info(sc->pdev, 13, 1, 0, 0, 0); - msm_pcie_debug_info(sc->pdev, 13, 2, 0, 0, 0); -} -#else -static inline void hif_msm_pcie_debug_info(struct hif_pci_softc *sc) {}; -#endif - -/* - * For now, we use simple on-demand sleep/wake. - * Some possible improvements: - * -Use the Host-destined A_INUM_PCIE_AWAKE interrupt rather than spin/delay - * (or perhaps spin/delay for a short while, then convert to sleep/interrupt) - * Careful, though, these functions may be used by - * interrupt handlers ("atomic") - * -Don't use host_reg_table for this code; instead use values directly - * -Use a separate timer to track activity and allow Target to sleep only - * if it hasn't done anything for a while; may even want to delay some - * processing for a short while in order to "batch" (e.g.) transmit - * requests with completion processing into "windows of up time". Costs - * some performance, but improves power utilization. - * -On some platforms, it might be possible to eliminate explicit - * sleep/wakeup. Instead, take a chance that each access works OK. If not, - * recover from the failure by forcing the Target awake. - * -Change keep_awake_count to an atomic_t in order to avoid spin lock - * overhead in some cases. Perhaps this makes more sense when - * CONFIG_ATH_PCIE_ACCESS_LIKELY is used and less sense when LIKELY is - * disabled. - * -It is possible to compile this code out and simply force the Target - * to remain awake. That would yield optimal performance at the cost of - * increased power. See CONFIG_ATH_PCIE_MAX_PERF. - * - * Note: parameter wait_for_it has meaning only when waking (when sleep_ok==0). - */ -/** - * hif_target_sleep_state_adjust() - on-demand sleep/wake - * @scn: ol_softc pointer. - * @sleep_ok: bool - * @wait_for_it: bool - * - * Output the pipe error counts of each pipe to log file - * - * Return: int - */ -#if ((CONFIG_ATH_PCIE_MAX_PERF == 0) && CONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD) -int -hif_target_sleep_state_adjust(struct ol_softc *scn, - bool sleep_ok, bool wait_for_it) -{ - struct HIF_CE_state *hif_state = scn->hif_hdl; - A_target_id_t pci_addr = scn->mem; - static int max_delay; - struct hif_pci_softc *sc = scn->hif_sc; - static int debug; - - if (scn->recovery) - return -EACCES; - - if (cdf_atomic_read(&scn->link_suspended)) { - HIF_ERROR("%s:invalid access, PCIe link is down", __func__); - debug = true; - CDF_ASSERT(0); - return -EACCES; - } - - if (debug) { - wait_for_it = true; - HIF_ERROR("%s: doing debug for invalid access, PCIe link is suspended", - __func__); - CDF_ASSERT(0); - } - - if (sleep_ok) { - cdf_spin_lock_irqsave(&hif_state->keep_awake_lock); - hif_state->keep_awake_count--; - if (hif_state->keep_awake_count == 0) { - /* Allow sleep */ - hif_state->verified_awake = false; - hif_state->sleep_ticks = cdf_system_ticks(); - } - if (hif_state->fake_sleep == false) { - /* Set the Fake Sleep */ - hif_state->fake_sleep = true; - - /* Start the Sleep Timer */ - cdf_softirq_timer_cancel(&hif_state->sleep_timer); - cdf_softirq_timer_start(&hif_state->sleep_timer, - HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS); - } - cdf_spin_unlock_irqrestore(&hif_state->keep_awake_lock); - } else { - cdf_spin_lock_irqsave(&hif_state->keep_awake_lock); - - if (hif_state->fake_sleep) { - hif_state->verified_awake = true; - } else { - if (hif_state->keep_awake_count == 0) { - /* Force AWAKE */ - hif_write32_mb(pci_addr + - PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_V_MASK); - } - } - hif_state->keep_awake_count++; - cdf_spin_unlock_irqrestore(&hif_state->keep_awake_lock); - - if (wait_for_it && !hif_state->verified_awake) { -#define PCIE_SLEEP_ADJUST_TIMEOUT 8000 /* 8Ms */ - int tot_delay = 0; - int curr_delay = 5; - - for (;; ) { - if (hif_targ_is_awake(scn, pci_addr)) { - hif_state->verified_awake = true; - break; - } else - if (!hif_pci_targ_is_present - (scn, pci_addr)) { - break; - } - if (tot_delay > PCIE_SLEEP_ADJUST_TIMEOUT) { - uint16_t val; - uint32_t bar; - - HIF_ERROR("%s: keep_awake_count = %d", - __func__, - hif_state->keep_awake_count); - - pci_read_config_word(sc->pdev, - PCI_VENDOR_ID, - &val); - HIF_ERROR("%s: PCI Vendor ID = 0x%04x", - __func__, val); - - pci_read_config_word(sc->pdev, - PCI_DEVICE_ID, - &val); - HIF_ERROR("%s: PCI Device ID = 0x%04x", - __func__, val); - - pci_read_config_word(sc->pdev, - PCI_COMMAND, &val); - HIF_ERROR("%s: PCI Command = 0x%04x", - __func__, val); - - pci_read_config_word(sc->pdev, - PCI_STATUS, &val); - HIF_ERROR("%s: PCI Status = 0x%04x", - __func__, val); - - pci_read_config_dword(sc->pdev, - PCI_BASE_ADDRESS_0, &bar); - HIF_ERROR("%s: PCI BAR 0 = 0x%08x", - __func__, bar); - - HIF_ERROR("%s: SOC_WAKE_ADDR 0%08x", - __func__, - hif_read32_mb(pci_addr + - PCIE_LOCAL_BASE_ADDRESS - + PCIE_SOC_WAKE_ADDRESS)); - HIF_ERROR("%s: RTC_STATE_ADDR 0x%08x", - __func__, - hif_read32_mb(pci_addr + - PCIE_LOCAL_BASE_ADDRESS - + RTC_STATE_ADDRESS)); - - HIF_ERROR("%s:error, wakeup target", - __func__); - hif_msm_pcie_debug_info(sc); - if (!sc->ol_sc->enable_self_recovery) - CDF_BUG(0); - scn->recovery = true; - cds_set_recovery_in_progress(true); - cnss_wlan_pci_link_down(); - return -EACCES; - } - - OS_DELAY(curr_delay); - tot_delay += curr_delay; - - if (curr_delay < 50) - curr_delay += 5; - } - - /* - * NB: If Target has to come out of Deep Sleep, - * this may take a few Msecs. Typically, though - * this delay should be <30us. - */ - if (tot_delay > max_delay) - max_delay = tot_delay; - } - } - - if (debug && hif_state->verified_awake) { - debug = 0; - HIF_ERROR("%s: INTR_ENABLE_REG = 0x%08x, INTR_CAUSE_REG = 0x%08x, CPU_INTR_REG = 0x%08x, INTR_CLR_REG = 0x%08x, CE_INTERRUPT_SUMMARY_REG = 0x%08x", - __func__, - hif_read32_mb(sc->mem + SOC_CORE_BASE_ADDRESS + - PCIE_INTR_ENABLE_ADDRESS), - hif_read32_mb(sc->mem + SOC_CORE_BASE_ADDRESS + - PCIE_INTR_CAUSE_ADDRESS), - hif_read32_mb(sc->mem + SOC_CORE_BASE_ADDRESS + - CPU_INTR_ADDRESS), - hif_read32_mb(sc->mem + SOC_CORE_BASE_ADDRESS + - PCIE_INTR_CLR_ADDRESS), - hif_read32_mb(sc->mem + CE_WRAPPER_BASE_ADDRESS + - CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS)); - } - - return 0; -} -#else -inline int -hif_target_sleep_state_adjust(struct ol_softc *scn, - bool sleep_ok, bool wait_for_it) -{ - return 0; -} -#endif - -#ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG -uint32_t hif_target_read_checked(struct ol_softc *scn, uint32_t offset) -{ - uint32_t value; - void *addr; - - if (!A_TARGET_ACCESS_OK(scn)) - hi_fdebug(); - - addr = scn->mem + offset; - value = A_PCI_READ32(addr); - - { - unsigned long irq_flags; - int idx = pcie_access_log_seqnum % PCIE_ACCESS_LOG_NUM; - - spin_lock_irqsave(&pcie_access_log_lock, irq_flags); - pcie_access_log[idx].seqnum = pcie_access_log_seqnum; - pcie_access_log[idx].is_write = false; - pcie_access_log[idx].addr = addr; - pcie_access_log[idx].value = value; - pcie_access_log_seqnum++; - spin_unlock_irqrestore(&pcie_access_log_lock, irq_flags); - } - - return value; -} - -void -hif_target_write_checked(struct ol_softc *scn, uint32_t offset, uint32_t value) -{ - void *addr; - - if (!A_TARGET_ACCESS_OK(scn)) - hi_fdebug(); - - addr = scn->mem + (offset); - hif_write32_mb(addr, value); - - { - unsigned long irq_flags; - int idx = pcie_access_log_seqnum % PCIE_ACCESS_LOG_NUM; - - spin_lock_irqsave(&pcie_access_log_lock, irq_flags); - pcie_access_log[idx].seqnum = pcie_access_log_seqnum; - pcie_access_log[idx].is_write = true; - pcie_access_log[idx].addr = addr; - pcie_access_log[idx].value = value; - pcie_access_log_seqnum++; - spin_unlock_irqrestore(&pcie_access_log_lock, irq_flags); - } -} - -/** - * hi_fdebug() - not needed in PCI - * - * - * Return: n/a - */ -void hi_fdebug(void) -{ - /* BUG_ON(1); */ -} - -/** - * hif_target_dump_access_log() - dump access log - * - * dump access log - * - * Return: n/a - */ -void hif_target_dump_access_log(void) -{ - int idx, len, start_idx, cur_idx; - unsigned long irq_flags; - - spin_lock_irqsave(&pcie_access_log_lock, irq_flags); - if (pcie_access_log_seqnum > PCIE_ACCESS_LOG_NUM) { - len = PCIE_ACCESS_LOG_NUM; - start_idx = pcie_access_log_seqnum % PCIE_ACCESS_LOG_NUM; - } else { - len = pcie_access_log_seqnum; - start_idx = 0; - } - - for (idx = 0; idx < len; idx++) { - cur_idx = (start_idx + idx) % PCIE_ACCESS_LOG_NUM; - HIF_ERROR("%s: idx:%d sn:%u wr:%d addr:%p val:%u.", - __func__, idx, - pcie_access_log[cur_idx].seqnum, - pcie_access_log[cur_idx].is_write, - pcie_access_log[cur_idx].addr, - pcie_access_log[cur_idx].value); - } - - pcie_access_log_seqnum = 0; - spin_unlock_irqrestore(&pcie_access_log_lock, irq_flags); -} -#endif - -/** - * war_pci_write32() - PCIe io32 write workaround - * @addr: addr - * @offset: offset - * @value: value - * - * iowrite32 - * - * Return: int - */ -void war_pci_write32(char *addr, uint32_t offset, uint32_t value) -{ - if (hif_pci_war1) { - unsigned long irq_flags; - - spin_lock_irqsave(&pciwar_lock, irq_flags); - - (void)ioread32((void __iomem *)(addr + offset + 4)); - (void)ioread32((void __iomem *)(addr + offset + 4)); - (void)ioread32((void __iomem *)(addr + offset + 4)); - iowrite32((uint32_t) (value), (void __iomem *)(addr + offset)); - - spin_unlock_irqrestore(&pciwar_lock, irq_flags); - } else { - iowrite32((uint32_t) (value), (void __iomem *)(addr + offset)); - } -} - -/** - * hif_configure_irq(): configure interrupt - * - * This function configures interrupt(s) - * - * @sc: PCIe control struct - * @hif_hdl: struct HIF_CE_state - * - * Return: 0 - for success - */ -int hif_configure_irq(struct hif_pci_softc *sc) -{ - int ret = 0; - struct ol_softc *scn = sc->ol_sc; - - HIF_TRACE("%s: E", __func__); - - if (ENABLE_MSI) { - ret = hif_configure_msi(sc); - if (ret == 0) - goto end; - } - /* MSI failed. Try legacy irq */ - ret = hif_pci_configure_legacy_irq(sc); - if (ret < 0) { - HIF_ERROR("%s: hif_pci_configure_legacy_irq error = %d", - __func__, ret); - return ret; - } -end: - scn->request_irq_done = true; - return 0; -} - -/** - * hif_target_sync() : ensure the target is ready - * @scn: hif controll structure - * - * Informs fw that we plan to use legacy interupts so that - * it can begin booting. Ensures that the fw finishes booting - * before continuing. Should be called before trying to write - * to the targets other registers for the first time. - * - * Return: none - */ -void hif_target_sync(struct ol_softc *scn) -{ - hif_write32_mb(scn->mem+(SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - PCIE_INTR_FIRMWARE_MASK); - - hif_write32_mb(scn->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, - PCIE_SOC_WAKE_V_MASK); - while (!hif_targ_is_awake(scn, scn->mem)) - ; - - if (HAS_FW_INDICATOR) { - int wait_limit = 500; - int fw_ind = 0; - HIF_TRACE("%s: Loop checking FW signal", __func__); - while (1) { - fw_ind = hif_read32_mb(scn->hif_sc->mem + - FW_INDICATOR_ADDRESS); - if (fw_ind & FW_IND_INITIALIZED) - break; - if (wait_limit-- < 0) - break; - hif_write32_mb(scn->mem+(SOC_CORE_BASE_ADDRESS | - PCIE_INTR_ENABLE_ADDRESS), - PCIE_INTR_FIRMWARE_MASK); - - cdf_mdelay(10); - } - if (wait_limit < 0) - HIF_TRACE("%s: FW signal timed out", - __func__); - else - HIF_TRACE("%s: Got FW signal, retries = %x", - __func__, 500-wait_limit); - } - hif_write32_mb(scn->mem + PCIE_LOCAL_BASE_ADDRESS + - PCIE_SOC_WAKE_ADDRESS, PCIE_SOC_WAKE_RESET); -} - -/** - * hif_enable_bus(): enable bus - * - * This function enables the bus - * - * @ol_sc: soft_sc struct - * @dev: device pointer - * @bdev: bus dev pointer - * bid: bus id pointer - * type: enum hif_enable_type such as HIF_ENABLE_TYPE_PROBE - * Return: CDF_STATUS - */ -CDF_STATUS hif_enable_bus(struct ol_softc *ol_sc, - struct device *dev, void *bdev, - const hif_bus_id *bid, - enum hif_enable_type type) -{ - int ret = 0; - uint32_t hif_type, target_type; - struct hif_pci_softc *sc; - uint16_t revision_id; - uint32_t lcr_val; - int probe_again = 0; - struct pci_dev *pdev = bdev; - const struct pci_device_id *id = bid; - - HIF_TRACE("%s: con_mode = 0x%x, device_id = 0x%x", - __func__, cds_get_conparam(), id->device); - - ol_sc = cds_get_context(CDF_MODULE_ID_HIF); - if (!ol_sc) { - HIF_ERROR("%s: hif_ctx is NULL", __func__); - return CDF_STATUS_E_NOMEM; - } - sc = ol_sc->hif_sc; - ol_sc->aps_osdev.bdev = pdev; - - sc->pdev = pdev; - sc->dev = &pdev->dev; - ol_sc->aps_osdev.bdev = pdev; - ol_sc->aps_osdev.device = &pdev->dev; - ol_sc->aps_osdev.bc.bc_handle = (void *)ol_sc->mem; - ol_sc->aps_osdev.bc.bc_bustype = type; - sc->devid = id->device; - sc->cacheline_sz = dma_get_cache_alignment(); -again: - ret = hif_enable_pci(sc, pdev, id); - if (ret < 0) { - HIF_ERROR("%s: ERROR - hif_enable_pci error = %d", - __func__, ret); - goto err_enable_pci; - } - HIF_TRACE("%s: hif_enable_pci done", __func__); - - /* Temporary FIX: disable ASPM on peregrine. - * Will be removed after the OTP is programmed - */ - pci_read_config_dword(pdev, 0x80, &lcr_val); - pci_write_config_dword(pdev, 0x80, (lcr_val & 0xffffff00)); - - device_disable_async_suspend(&pdev->dev); - pci_read_config_word(pdev, 0x08, &revision_id); - - ret = hif_get_device_type(id->device, revision_id, - &hif_type, &target_type); - if (ret < 0) { - HIF_ERROR("%s: invalid device id/revision_id", __func__); - goto err_tgtstate; - } - HIF_TRACE("%s: hif_type = 0x%x, target_type = 0x%x", - __func__, hif_type, target_type); - - hif_register_tbl_attach(sc->ol_sc, hif_type); - target_register_tbl_attach(sc->ol_sc, target_type); - - ret = hif_pci_probe_tgt_wakeup(sc); - if (ret < 0) { - HIF_ERROR("%s: ERROR - hif_pci_prob_wakeup error = %d", - __func__, ret); - if (ret == -EAGAIN) - probe_again++; - goto err_tgtstate; - } - HIF_TRACE("%s: hif_pci_probe_tgt_wakeup done", __func__); - - ol_sc->target_type = target_type; - sc->soc_pcie_bar0 = pci_resource_start(pdev, BAR_NUM); - if (!sc->soc_pcie_bar0) { - HIF_ERROR("%s: ERROR - cannot get CE BAR0", __func__); - ret = -EIO; - goto err_tgtstate; - } - ol_sc->mem_pa = sc->soc_pcie_bar0; - - BUG_ON(pci_get_drvdata(sc->pdev) != NULL); - pci_set_drvdata(sc->pdev, sc); - - ret = hif_init_cdf_ctx(ol_sc); - if (ret != 0) { - HIF_ERROR("%s: cannot init CDF", __func__); - goto err_tgtstate; - } - - hif_target_sync(ol_sc); - return 0; - -err_tgtstate: - hif_deinit_cdf_ctx(ol_sc); - hif_disable_pci(sc); - sc->pci_enabled = false; - HIF_ERROR("%s: error, hif_disable_pci done", __func__); - return CDF_STATUS_E_ABORTED; - -err_enable_pci: - if (probe_again && (probe_again <= ATH_PCI_PROBE_RETRY_MAX)) { - int delay_time; - - HIF_INFO("%s: pci reprobe", __func__); - /* 10, 40, 90, 100, 100, ... */ - delay_time = max(100, 10 * (probe_again * probe_again)); - cdf_mdelay(delay_time); - goto again; - } - return ret; -} - -/** - * hif_get_target_type(): Get the target type - * - * This function is used to query the target type. - * - * @ol_sc: ol_softc struct pointer - * @dev: device pointer - * @bdev: bus dev pointer - * @bid: bus id pointer - * @hif_type: HIF type such as HIF_TYPE_QCA6180 - * @target_type: target type such as TARGET_TYPE_QCA6180 - * - * Return: 0 for success - */ -int hif_get_target_type(struct ol_softc *ol_sc, struct device *dev, - void *bdev, const hif_bus_id *bid, uint32_t *hif_type, - uint32_t *target_type) -{ - uint16_t revision_id; - struct pci_dev *pdev = bdev; - const struct pci_device_id *id = bid; - - pci_read_config_word(pdev, 0x08, &revision_id); - return hif_get_device_type(id->device, revision_id, - hif_type, target_type); -} - -#ifdef FEATURE_RUNTIME_PM - -void hif_pm_runtime_get_noresume(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - struct hif_pci_softc *sc; - - if (NULL == scn) - return; - - sc = scn->hif_sc; - if (NULL == sc) - return; - - sc->pm_stats.runtime_get++; - pm_runtime_get_noresume(sc->dev); -} - -/** - * hif_pm_runtime_get() - do a get opperation on the device - * - * A get opperation will prevent a runtime suspend untill a - * corresponding put is done. This api should be used when sending - * data. - * - * CONTRARY TO THE REGULAR RUNTIME PM, WHEN THE BUS IS SUSPENDED, - * THIS API WILL ONLY REQUEST THE RESUME AND NOT TO A GET!!! - * - * return: success if the bus is up and a get has been issued - * otherwise an error code. - */ -int hif_pm_runtime_get(void *hif_ctx) -{ - struct ol_softc *scn = hif_ctx; - struct hif_pci_softc *sc; - int ret; - int pm_state; - - if (NULL == scn) { - HIF_ERROR("%s: Could not do runtime get, scn is null", - __func__); - return -EFAULT; - } - sc = scn->hif_sc; - - pm_state = cdf_atomic_read(&sc->pm_state); - - if (pm_state == HIF_PM_RUNTIME_STATE_ON || - pm_state == HIF_PM_RUNTIME_STATE_NONE) { - sc->pm_stats.runtime_get++; - ret = __hif_pm_runtime_get(sc->dev); - - /* Get can return 1 if the device is already active, just return - * success in that case - */ - if (ret > 0) - ret = 0; - - if (ret) - hif_pm_runtime_put(hif_ctx); - - if (ret && ret != -EINPROGRESS) { - sc->pm_stats.runtime_get_err++; - HIF_ERROR("%s: Runtime Get PM Error in pm_state:%d ret: %d", - __func__, cdf_atomic_read(&sc->pm_state), ret); - } - - return ret; - } - - sc->pm_stats.request_resume++; - sc->pm_stats.last_resume_caller = (void *)_RET_IP_; - ret = hif_pm_request_resume(sc->dev); - - return -EAGAIN; -} - -/** - * hif_pm_runtime_put() - do a put opperation on the device - * - * A put opperation will allow a runtime suspend after a corresponding - * get was done. This api should be used when sending data. - * - * This api will return a failure if runtime pm is stopped - * This api will return failure if it would decrement the usage count below 0. - * - * return: CDF_STATUS_SUCCESS if the put is performed - */ -int hif_pm_runtime_put(void *hif_ctx) -{ - struct ol_softc *scn = (struct ol_softc *)hif_ctx; - struct hif_pci_softc *sc; - int pm_state, usage_count; - unsigned long flags; - char *error = NULL; - - if (NULL == scn) { - HIF_ERROR("%s: Could not do runtime put, scn is null", - __func__); - return -EFAULT; - } - sc = scn->hif_sc; - - usage_count = atomic_read(&sc->dev->power.usage_count); - - if (usage_count == 1) { - pm_state = cdf_atomic_read(&sc->pm_state); - - if (pm_state == HIF_PM_RUNTIME_STATE_NONE) - error = "Ignoring unexpected put when runtime pm is disabled"; - - } else if (usage_count == 0) { - error = "PUT Without a Get Operation"; - } - - if (error) { - spin_lock_irqsave(&sc->runtime_lock, flags); - hif_pci_runtime_pm_warn(sc, error); - spin_unlock_irqrestore(&sc->runtime_lock, flags); - return -EINVAL; - } - - sc->pm_stats.runtime_put++; - - hif_pm_runtime_mark_last_busy(sc->dev); - hif_pm_runtime_put_auto(sc->dev); - - return 0; -} - - -/** - * __hif_pm_runtime_prevent_suspend() - prevent runtime suspend for a protocol reason - * @hif_sc: pci context - * @lock: runtime_pm lock being acquired - * - * Return 0 if successful. - */ -static int __hif_pm_runtime_prevent_suspend(struct hif_pci_softc - *hif_sc, struct hif_pm_runtime_lock *lock) -{ - int ret = 0; - - /* - * We shouldn't be setting context->timeout to zero here when - * context is active as we will have a case where Timeout API's - * for the same context called back to back. - * eg: echo "1=T:10:T:20" > /d/cnss_runtime_pm - * Set context->timeout to zero in hif_pm_runtime_prevent_suspend - * API to ensure the timeout version is no more active and - * list entry of this context will be deleted during allow suspend. - */ - if (lock->active) - return 0; - - ret = __hif_pm_runtime_get(hif_sc->dev); - - /** - * The ret can be -EINPROGRESS, if Runtime status is RPM_RESUMING or - * RPM_SUSPENDING. Any other negative value is an error. - * We shouldn't be do runtime_put here as in later point allow - * suspend gets called with the the context and there the usage count - * is decremented, so suspend will be prevented. - */ - - if (ret < 0 && ret != -EINPROGRESS) { - hif_sc->pm_stats.runtime_get_err++; - hif_pci_runtime_pm_warn(hif_sc, - "Prevent Suspend Runtime PM Error"); - } - - hif_sc->prevent_suspend_cnt++; - - lock->active = true; - - list_add_tail(&lock->list, &hif_sc->prevent_suspend_list); - - hif_sc->pm_stats.prevent_suspend++; - - HIF_ERROR("%s: in pm_state:%d ret: %d", __func__, - cdf_atomic_read(&hif_sc->pm_state), ret); - - return ret; -} - -static int __hif_pm_runtime_allow_suspend(struct hif_pci_softc *hif_sc, - struct hif_pm_runtime_lock *lock) -{ - int ret = 0; - int usage_count; - - if (hif_sc->prevent_suspend_cnt == 0) - return ret; - - if (!lock->active) - return ret; - - usage_count = atomic_read(&hif_sc->dev->power.usage_count); - - /* - * During Driver unload, platform driver increments the usage - * count to prevent any runtime suspend getting called. - * So during driver load in HIF_PM_RUNTIME_STATE_NONE state the - * usage_count should be one. Ideally this shouldn't happen as - * context->active should be active for allow suspend to happen - * Handling this case here to prevent any failures. - */ - if ((cdf_atomic_read(&hif_sc->pm_state) == HIF_PM_RUNTIME_STATE_NONE - && usage_count == 1) || usage_count == 0) { - hif_pci_runtime_pm_warn(hif_sc, - "Allow without a prevent suspend"); - return -EINVAL; - } - - list_del(&lock->list); - - hif_sc->prevent_suspend_cnt--; - - lock->active = false; - lock->timeout = 0; - - hif_pm_runtime_mark_last_busy(hif_sc->dev); - ret = hif_pm_runtime_put_auto(hif_sc->dev); - - HIF_ERROR("%s: in pm_state:%d ret: %d", __func__, - cdf_atomic_read(&hif_sc->pm_state), ret); - - hif_sc->pm_stats.allow_suspend++; - return ret; -} - -/** - * hif_pm_runtime_lock_timeout_fn() - callback the runtime lock timeout - * @data: calback data that is the pci context - * - * if runtime locks are aquired with a timeout, this function releases - * the locks when the last runtime lock expires. - * - * dummy implementation until lock acquisition is implemented. - */ -static void hif_pm_runtime_lock_timeout_fn(unsigned long data) -{ - struct hif_pci_softc *hif_sc = (struct hif_pci_softc *)data; - unsigned long flags; - unsigned long timer_expires; - struct hif_pm_runtime_lock *context, *temp; - - spin_lock_irqsave(&hif_sc->runtime_lock, flags); - - timer_expires = hif_sc->runtime_timer_expires; - - /* Make sure we are not called too early, this should take care of - * following case - * - * CPU0 CPU1 (timeout function) - * ---- ---------------------- - * spin_lock_irq - * timeout function called - * - * mod_timer() - * - * spin_unlock_irq - * spin_lock_irq - */ - if (timer_expires > 0 && !time_after(timer_expires, jiffies)) { - hif_sc->runtime_timer_expires = 0; - list_for_each_entry_safe(context, temp, - &hif_sc->prevent_suspend_list, list) { - if (context->timeout) { - __hif_pm_runtime_allow_suspend(hif_sc, context); - hif_sc->pm_stats.allow_suspend_timeout++; - } - } - } - - spin_unlock_irqrestore(&hif_sc->runtime_lock, flags); -} - -int hif_pm_runtime_prevent_suspend(void *ol_sc, - struct hif_pm_runtime_lock *data) -{ - struct ol_softc *sc = (struct ol_softc *)ol_sc; - struct hif_pci_softc *hif_sc = sc->hif_sc; - struct hif_pm_runtime_lock *context = data; - unsigned long flags; - - if (!sc->enable_runtime_pm) - return 0; - - if (!context) - return -EINVAL; - - spin_lock_irqsave(&hif_sc->runtime_lock, flags); - context->timeout = 0; - __hif_pm_runtime_prevent_suspend(hif_sc, context); - spin_unlock_irqrestore(&hif_sc->runtime_lock, flags); - - return 0; -} - -int hif_pm_runtime_allow_suspend(void *ol_sc, struct hif_pm_runtime_lock *data) -{ - struct ol_softc *sc = (struct ol_softc *)ol_sc; - struct hif_pci_softc *hif_sc = sc->hif_sc; - struct hif_pm_runtime_lock *context = data; - - unsigned long flags; - - if (!sc->enable_runtime_pm) - return 0; - - if (!context) - return -EINVAL; - - spin_lock_irqsave(&hif_sc->runtime_lock, flags); - - __hif_pm_runtime_allow_suspend(hif_sc, context); - - /* The list can be empty as well in cases where - * we have one context in the list and the allow - * suspend came before the timer expires and we delete - * context above from the list. - * When list is empty prevent_suspend count will be zero. - */ - if (hif_sc->prevent_suspend_cnt == 0 && - hif_sc->runtime_timer_expires > 0) { - del_timer(&hif_sc->runtime_timer); - hif_sc->runtime_timer_expires = 0; - } - - spin_unlock_irqrestore(&hif_sc->runtime_lock, flags); - - return 0; -} - -/** - * hif_pm_runtime_prevent_suspend_timeout() - Prevent runtime suspend timeout - * @ol_sc: HIF context - * @lock: which lock is being acquired - * @delay: Timeout in milliseconds - * - * Prevent runtime suspend with a timeout after which runtime suspend would be - * allowed. This API uses a single timer to allow the suspend and timer is - * modified if the timeout is changed before timer fires. - * If the timeout is less than autosuspend_delay then use mark_last_busy instead - * of starting the timer. - * - * It is wise to try not to use this API and correct the design if possible. - * - * Return: 0 on success and negative error code on failure - */ -int hif_pm_runtime_prevent_suspend_timeout(void *ol_sc, - struct hif_pm_runtime_lock *lock, unsigned int delay) -{ - struct ol_softc *sc = (struct ol_softc *)ol_sc; - struct hif_pci_softc *hif_sc = sc->hif_sc; - int ret = 0; - unsigned long expires; - unsigned long flags; - struct hif_pm_runtime_lock *context = lock; - - if (cds_is_load_unload_in_progress()) { - HIF_ERROR("%s: Load/unload in progress, ignore!", - __func__); - return -EINVAL; - } - - if (cds_is_logp_in_progress()) { - HIF_ERROR("%s: LOGP in progress, ignore!", __func__); - return -EINVAL; - } - - if (!sc->enable_runtime_pm) - return 0; - - if (!context) - return -EINVAL; - - /* - * Don't use internal timer if the timeout is less than auto suspend - * delay. - */ - if (delay <= hif_sc->dev->power.autosuspend_delay) { - hif_pm_request_resume(hif_sc->dev); - hif_pm_runtime_mark_last_busy(hif_sc->dev); - return ret; - } - - expires = jiffies + msecs_to_jiffies(delay); - expires += !expires; - - spin_lock_irqsave(&hif_sc->runtime_lock, flags); - - context->timeout = delay; - ret = __hif_pm_runtime_prevent_suspend(hif_sc, context); - hif_sc->pm_stats.prevent_suspend_timeout++; - - /* Modify the timer only if new timeout is after already configured - * timeout - */ - if (time_after(expires, hif_sc->runtime_timer_expires)) { - mod_timer(&hif_sc->runtime_timer, expires); - hif_sc->runtime_timer_expires = expires; - } - - spin_unlock_irqrestore(&hif_sc->runtime_lock, flags); - - HIF_ERROR("%s: pm_state: %d delay: %dms ret: %d\n", __func__, - cdf_atomic_read(&hif_sc->pm_state), delay, ret); - - return ret; -} - -/** - * hif_runtime_lock_init() - API to initialize Runtime PM context - * @name: Context name - * - * This API initalizes the Runtime PM context of the caller and - * return the pointer. - * - * Return: void * - */ -struct hif_pm_runtime_lock *hif_runtime_lock_init(const char *name) -{ - struct hif_pm_runtime_lock *context; - - context = cdf_mem_malloc(sizeof(*context)); - if (!context) { - HIF_ERROR("%s: No memory for Runtime PM wakelock context\n", - __func__); - return NULL; - } - - context->name = name ? name : "Default"; - return context; -} - -/** - * hif_runtime_lock_deinit() - This API frees the runtime pm ctx - * @data: Runtime PM context - * - * Return: void - */ -void hif_runtime_lock_deinit(struct hif_pm_runtime_lock *data) -{ - unsigned long flags; - struct hif_pm_runtime_lock *context = data; - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); - struct hif_pci_softc *sc; - - if (!scn) - return; - - sc = scn->hif_sc; - - if (!sc) - return; - - if (!context) - return; - - /* - * Ensure to delete the context list entry and reduce the usage count - * before freeing the context if context is active. - */ - spin_lock_irqsave(&sc->runtime_lock, flags); - __hif_pm_runtime_allow_suspend(sc, context); - spin_unlock_irqrestore(&sc->runtime_lock, flags); - - cdf_mem_free(context); -} - -#endif /* FEATURE_RUNTIME_PM */ diff --git a/core/hif/src/pcie/if_pci.h b/core/hif/src/pcie/if_pci.h deleted file mode 100644 index 806f91aadb8a..000000000000 --- a/core/hif/src/pcie/if_pci.h +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __ATH_PCI_H__ -#define __ATH_PCI_H__ - -#include -#include -#include - -#define ATH_DBG_DEFAULT 0 -#include -#include -#include -#include "osapi_linux.h" -#include "hif.h" -#include "cepci.h" - -struct CE_state; -struct ol_softc; - -/* An address (e.g. of a buffer) in Copy Engine space. */ - -#define HIF_MAX_TASKLET_NUM 11 -struct hif_tasklet_entry { - uint8_t id; /* 0 - 9: maps to CE, 10: fw */ - void *hif_handler; /* struct hif_pci_softc */ -}; - -/** - * enum hif_pm_runtime_state - Driver States for Runtime Power Management - * HIF_PM_RUNTIME_STATE_NONE: runtime pm is off - * HIF_PM_RUNTIME_STATE_ON: runtime pm is active and link is active - * HIF_PM_RUNTIME_STATE_INPROGRESS: a runtime suspend or resume is in progress - * HIF_PM_RUNTIME_STATE_SUSPENDED: the driver is runtime suspended - */ -enum hif_pm_runtime_state { - HIF_PM_RUNTIME_STATE_NONE, - HIF_PM_RUNTIME_STATE_ON, - HIF_PM_RUNTIME_STATE_INPROGRESS, - HIF_PM_RUNTIME_STATE_SUSPENDED, -}; - -#ifdef FEATURE_RUNTIME_PM - -/** - * struct hif_pm_runtime_lock - data structure for preventing runtime suspend - * @list - global list of runtime locks - * @active - true if this lock is preventing suspend - * @name - character string for tracking this lock - */ -struct hif_pm_runtime_lock { - struct list_head list; - bool active; - uint32_t timeout; - const char *name; -}; - -/* Debugging stats for Runtime PM */ -struct hif_pci_pm_stats { - u32 suspended; - u32 suspend_err; - u32 resumed; - u32 runtime_get; - u32 runtime_put; - u32 request_resume; - u32 allow_suspend; - u32 prevent_suspend; - u32 prevent_suspend_timeout; - u32 allow_suspend_timeout; - u32 runtime_get_err; - void *last_resume_caller; - unsigned long suspend_jiffies; -}; -#endif - -struct hif_pci_softc { - void __iomem *mem; /* PCI address. */ - /* For efficiency, should be first in struct */ - - struct device *dev; - struct pci_dev *pdev; - struct ol_softc *ol_sc; - int num_msi_intrs; /* number of MSI interrupts granted */ - /* 0 --> using legacy PCI line interrupts */ - struct tasklet_struct intr_tq; /* tasklet */ - - - int irq; - int irq_event; - int cacheline_sz; - u16 devid; - cdf_dma_addr_t soc_pcie_bar0; - struct hif_tasklet_entry tasklet_entries[HIF_MAX_TASKLET_NUM]; - bool pci_enabled; -#ifdef FEATURE_RUNTIME_PM - atomic_t pm_state; - uint32_t prevent_suspend_cnt; - struct hif_pci_pm_stats pm_stats; - struct work_struct pm_work; - spinlock_t runtime_lock; - struct timer_list runtime_timer; - struct list_head prevent_suspend_list; - unsigned long runtime_timer_expires; - struct hif_pm_runtime_lock *prevent_linkdown_lock; -#ifdef WLAN_OPEN_SOURCE - struct dentry *pm_dentry; -#endif -#endif -}; - -bool hif_pci_targ_is_present(struct ol_softc *scn, void *__iomem *mem); -void icnss_dispatch_ce_irq(struct ol_softc *scn); -int hif_configure_irq(struct hif_pci_softc *sc); -void hif_pci_cancel_deferred_target_sleep(struct ol_softc *scn); - -/* - * A firmware interrupt to the Host is indicated by the - * low bit of SCRATCH_3_ADDRESS being set. - */ -#define FW_EVENT_PENDING_REG_ADDRESS SCRATCH_3_ADDRESS - -/* - * Typically, MSI Interrupts are used with PCIe. To force use of legacy - * "ABCD" PCI line interrupts rather than MSI, define - * FORCE_LEGACY_PCI_INTERRUPTS. - * Even when NOT forced, the driver may attempt to use legacy PCI interrupts - * MSI allocation fails - */ -#define LEGACY_INTERRUPTS(sc) ((sc)->num_msi_intrs == 0) - -/* - * There may be some pending tx frames during platform suspend. - * Suspend operation should be delayed until those tx frames are - * transfered from the host to target. This macro specifies how - * long suspend thread has to sleep before checking pending tx - * frame count. - */ -#define OL_ATH_TX_DRAIN_WAIT_DELAY 50 /* ms */ - -#define HIF_CE_DRAIN_WAIT_DELAY 10 /* ms */ -/* - * Wait time (in unit of OL_ATH_TX_DRAIN_WAIT_DELAY) for pending - * tx frame completion before suspend. Refer: hif_pci_suspend() - */ -#ifndef QCA_WIFI_3_0_EMU -#define OL_ATH_TX_DRAIN_WAIT_CNT 10 -#else -#define OL_ATH_TX_DRAIN_WAIT_CNT 60 -#endif - -#define HIF_CE_DRAIN_WAIT_CNT 20 - - -#ifdef FEATURE_RUNTIME_PM -#include - -#ifdef WLAN_OPEN_SOURCE -static inline int hif_pm_request_resume(struct device *dev) -{ - return pm_request_resume(dev); -} -static inline int __hif_pm_runtime_get(struct device *dev) -{ - return pm_runtime_get(dev); -} - -static inline int hif_pm_runtime_put_auto(struct device *dev) -{ - return pm_runtime_put_autosuspend(dev); -} - -static inline void hif_pm_runtime_mark_last_busy(struct device *dev) -{ - pm_runtime_mark_last_busy(dev); -} - -static inline int hif_pm_runtime_resume(struct device *dev) -{ - return pm_runtime_resume(dev); -} -#else -static inline int hif_pm_request_resume(struct device *dev) -{ - return cnss_pm_runtime_request(dev, CNSS_PM_REQUEST_RESUME); -} - -static inline int __hif_pm_runtime_get(struct device *dev) -{ - return cnss_pm_runtime_request(dev, CNSS_PM_RUNTIME_GET); -} - -static inline int hif_pm_runtime_put_auto(struct device *dev) -{ - return cnss_pm_runtime_request(dev, CNSS_PM_RUNTIME_PUT_AUTO); -} - -static inline void hif_pm_runtime_mark_last_busy(struct device *dev) -{ - cnss_pm_runtime_request(dev, CNSS_PM_RUNTIME_MARK_LAST_BUSY); -} -static inline int hif_pm_runtime_resume(struct device *dev) -{ - return cnss_pm_runtime_request(dev, CNSS_PM_RUNTIME_RESUME); -} -#endif /* WLAN_OPEN_SOURCE */ -#else -static inline void hif_pm_runtime_mark_last_busy(struct device *dev) { } -#endif /* FEATURE_RUNTIME_PM */ -#endif /* __ATH_PCI_H__ */ diff --git a/core/hif/src/pcie/if_pci_internal.h b/core/hif/src/pcie/if_pci_internal.h deleted file mode 100644 index 5ea8e31481fb..000000000000 --- a/core/hif/src/pcie/if_pci_internal.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef __IF_PCI_INTERNAL_H__ -#define __IF_PCI_INTERNAL_H__ -#ifdef CONFIG_CNSS -#define HIF_REGISTER_DRIVER(wlan_drv_id) \ - cnss_wlan_register_driver(wlan_drv_id) -#define HIF_UNREGISTER_DRIVER(wlan_drv_id) \ - cnss_wlan_unregister_driver(wlan_drv_id) -#else -#define HIF_REGISTER_DRIVER(wlan_drv_id) \ - pci_register_driver(wlan_drv_id) -#define HIF_UNREGISTER_DRIVER(wlan_drv_id) \ - pci_unregister_driver(wlan_drv_id) -#endif - -#ifdef DISABLE_L1SS_STATES -#define PCI_CFG_TO_DISABLE_L1SS_STATES(pdev, addr) \ -{ \ - uint32_t lcr_val; \ - pci_read_config_dword(pdev, addr, &lcr_val); \ - pci_write_config_dword(pdev, addr, (lcr_val & ~0x0000000f)); \ -} -#else -#define PCI_CFG_TO_DISABLE_L1SS_STATES(pdev, addr) -#endif - -#if defined(CONFIG_CNSS) && !defined(QCA_WIFI_3_0) -#define GET_VIRT_RAMDUMP_MEM(ol_sc) \ -{ \ - ol_sc->ramdump_base = cnss_get_virt_ramdump_mem(&ol_sc->ramdump_size); \ - if (ol_sc->ramdump_base == NULL || !ol_sc->ramdump_size) \ - HIF_ERROR("%s: Failed to get RAM dump memory addr or size!", \ - __func__); \ -} -#else -#define GET_VIRT_RAMDUMP_MEM(ol_sc) -#endif - -#ifdef QCA_WIFI_3_0 -#define PCI_CLR_CAUSE0_REGISTER(sc) \ -{ \ - uint32_t tmp_cause0; \ - tmp_cause0 = hif_read32_mb(sc->mem + PCIE_INTR_CAUSE_ADDRESS); \ - hif_write32_mb(sc->mem + PCIE_INTR_CLR_ADDRESS, \ - PCIE_INTR_FIRMWARE_MASK | tmp_cause0); \ - hif_read32_mb(sc->mem + PCIE_INTR_CLR_ADDRESS); \ - hif_write32_mb(sc->mem + PCIE_INTR_CLR_ADDRESS, 0); \ - hif_read32_mb(sc->mem + PCIE_INTR_CLR_ADDRESS); \ -} - -#define HIF_PCI_TARG_IS_AWAKE(scn, mem) \ -{ \ - return 1; \ -} -#else -#define PCI_CLR_CAUSE0_REGISTER(sc) - -#define HIF_PCI_TARG_IS_AWAKE(scn, mem) \ -{ \ - uint32_t val; \ - if (scn->recovery) \ - return false; \ - val = hif_read32_mb(mem + PCIE_LOCAL_BASE_ADDRESS \ - + RTC_STATE_ADDRESS); \ - return RTC_STATE_V_GET(val) == RTC_STATE_V_ON; \ -} -#endif - -#if !defined(REMOVE_PKT_LOG) && !defined(QVIT) -#define PKT_LOG_MOD_INIT(ol_sc) \ -{ \ - ol_txrx_pdev_handle pdev_txrx_handle; \ - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); \ - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE && \ - !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { \ - ol_pl_sethandle(&pdev_txrx_handle->pl_dev, ol_sc); \ - if (pktlogmod_init(ol_sc)) \ - HIF_ERROR("%s: pktlogmod_init failed", __func__); \ - } \ -} -#else -#define PKT_LOG_MOD_INIT(ol_sc) -#endif -#endif /* __IF_PCI_INTERNAL_H__ */ diff --git a/core/hif/src/qca6180def.h b/core/hif/src/qca6180def.h deleted file mode 100644 index 155f4d8e9a88..000000000000 --- a/core/hif/src/qca6180def.h +++ /dev/null @@ -1,1008 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _QCA6180DEF_H_ -#define _QCA6180DEF_H_ - -#define MISSING 0 -#define _PCIE_LOCAL_REG_BASE_ADDRESS 0x1E8000 -#define _WIFI_RTC_REG_BASE_ADDRESS 0x45000 -#define _RTC_SOC_REG_BASE_ADDRESS 0x113000 -#define _GPIO_ATHR_WLAN_REG_BASE_ADDRESS 0x85000 -#define _SI_REG_BASE_ADDRESS 0x84000 -#define _SOC_CORE_REG_BASE_ADDRESS 0x113000 -#define _CE_REG_CSR_BASE_ADDRESS 0x240000 -#define _CE0_CE_REG_CSR_BASE_ADDRESS 0 -#define _CE_WRAPPER_REG_CSR_BASE_ADDRESS 0xC000 -#define _MAC_WIFICMN_REG_BASE_ADDRESS MISSING - -/* Base Addresses */ -#define QCA6180_RTC_SOC_BASE_ADDRESS 0x00000000 -#define QCA6180_RTC_WMAC_BASE_ADDRESS 0x00000000 -#define QCA6180_MAC_COEX_BASE_ADDRESS 0x0000f000 -#define QCA6180_BT_COEX_BASE_ADDRESS 0x00002000 -#define QCA6180_SOC_PCIE_BASE_ADDRESS 0x00130000 -#define QCA6180_SOC_CORE_BASE_ADDRESS 0x00000000 -#define QCA6180_WLAN_UART_BASE_ADDRESS 0x00111000 -#define QCA6180_WLAN_SI_BASE_ADDRESS 0x00010000 -#define QCA6180_WLAN_GPIO_BASE_ADDRESS 0x00000000 -#define QCA6180_WLAN_ANALOG_INTF_BASE_ADDRESS 0x00000000 -#define QCA6180_WLAN_MAC_BASE_ADDRESS 0x00000000 -#define QCA6180_EFUSE_BASE_ADDRESS 0x00024000 -#define QCA6180_FPGA_REG_BASE_ADDRESS 0x00039000 -#define QCA6180_WLAN_UART2_BASE_ADDRESS 0x00054c00 -#define QCA6180_CE_WRAPPER_BASE_ADDRESS 0x24C000 -#define QCA6180_CE0_BASE_ADDRESS 0x240000 -#define QCA6180_CE1_BASE_ADDRESS 0x241000 -#define QCA6180_CE2_BASE_ADDRESS 0x242000 -#define QCA6180_CE3_BASE_ADDRESS 0x243000 -#define QCA6180_CE4_BASE_ADDRESS 0x244000 -#define QCA6180_CE5_BASE_ADDRESS 0x245000 -#define QCA6180_CE6_BASE_ADDRESS 0x246000 -#define QCA6180_CE7_BASE_ADDRESS 0x247000 -#define QCA6180_CE8_BASE_ADDRESS 0x248000 -#define QCA6180_CE9_BASE_ADDRESS 0x249000 -#define QCA6180_CE10_BASE_ADDRESS 0x24A000 -#define QCA6180_CE11_BASE_ADDRESS 0x24B000 -#define QCA6180_A_SOC_PCIE_SOC_PCIE_REG 0x130000 -#define QCA6180_DBI_BASE_ADDRESS 0x0003c000 -#define QCA6180_WLAN_ANALOG_INTF_PCIE_BASE_ADDRESS 0x00007800 -#define QCA6180_WIFICMN_BASE_ADDRESS 0x00000000 -#define QCA6180_BOARD_DATA_SZ MISSING -#define QCA6180_BOARD_EXT_DATA_SZ MISSING -#define QCA6180_A_SOC_PCIE_PCIE_BAR0_START \ - (0x030 + QCA6180_A_SOC_PCIE_SOC_PCIE_REG) -#define QCA6180_A_SOC_CORE_SCRATCH_0_ADDRESS 0x00114000 -#define QCA6180_A_SOC_CORE_SCRATCH_1_ADDRESS 0x00114004 -#define QCA6180_A_SOC_CORE_SCRATCH_2_ADDRESS 0x00114008 -#define QCA6180_A_SOC_CORE_SCRATCH_3_ADDRESS 0x0011400c -#define QCA6180_A_SOC_CORE_SCRATCH_4_ADDRESS 0x00114010 -#define QCA6180_A_SOC_CORE_SCRATCH_5_ADDRESS 0x00114014 -#define QCA6180_A_SOC_CORE_SCRATCH_6_ADDRESS 0x00114018 -#define QCA6180_A_SOC_CORE_SCRATCH_7_ADDRESS 0x0011401c -#define QCA6180_A_SOC_CORE_SPARE_0_REGISTER 0x00113180 -#define QCA6180_PCIE_INTR_FIRMWARE_ROUTE_MASK 0xff -#define QCA6180_SCRATCH_3_ADDRESS 0x00113020 -#define QCA6180_TARG_DRAM_START 0x00400000 -#define QCA6180_SOC_SYSTEM_SLEEP_OFFSET 0x000000c0 -#define QCA6180_SOC_RESET_CONTROL_OFFSET \ - (0x00000000 + _RTC_SOC_REG_BASE_ADDRESS) -#define QCA6180_SOC_CLOCK_CONTROL_OFFSET \ - (0x00000028 + _RTC_SOC_REG_BASE_ADDRESS) -#define QCA6180_SOC_CLOCK_CONTROL_SI0_CLK_MASK 0x00000001 -#define QCA6180_SOC_RESET_CONTROL_SI0_RST_MASK 0x00000001 -#define QCA6180_WLAN_GPIO_PIN0_ADDRESS \ - (0x50 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN1_ADDRESS \ - (0x54 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN0_CONFIG_MASK 0x00007800 -#define QCA6180_WLAN_GPIO_PIN1_CONFIG_MASK 0x00007800 -#define QCA6180_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define QCA6180_SOC_LPO_CAL_OFFSET \ - (0xe0 + _RTC_SOC_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN10_ADDRESS \ - (0x78 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN11_ADDRESS \ - (0x7c + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN12_ADDRESS \ - (0x80 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_WLAN_GPIO_PIN13_ADDRESS \ - (0x84 + _GPIO_ATHR_WLAN_REG_BASE_ADDRESS) -#define QCA6180_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define QCA6180_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -#define QCA6180_SOC_LPO_CAL_ENABLE_LSB 20 -#define QCA6180_SOC_LPO_CAL_ENABLE_MASK 0x00100000 - -#define QCA6180_WLAN_SYSTEM_SLEEP_DISABLE_LSB 0 -#define QCA6180_WLAN_SYSTEM_SLEEP_DISABLE_MASK 0x00000001 -#define QCA6180_WLAN_RESET_CONTROL_COLD_RST_MASK 0x00000002 -#define QCA6180_WLAN_RESET_CONTROL_WARM_RST_MASK 0x00000001 -#define QCA6180_SI_CONFIG_BIDIR_OD_DATA_LSB 18 -#define QCA6180_SI_CONFIG_BIDIR_OD_DATA_MASK 0x00040000 -#define QCA6180_SI_CONFIG_I2C_LSB 16 -#define QCA6180_SI_CONFIG_I2C_MASK 0x00010000 -#define QCA6180_SI_CONFIG_POS_SAMPLE_LSB 7 -#define QCA6180_SI_CONFIG_POS_SAMPLE_MASK 0x00000080 -#define QCA6180_SI_CONFIG_INACTIVE_CLK_LSB 4 -#define QCA6180_SI_CONFIG_INACTIVE_CLK_MASK 0x00000010 -#define QCA6180_SI_CONFIG_INACTIVE_DATA_LSB 5 -#define QCA6180_SI_CONFIG_INACTIVE_DATA_MASK 0x00000020 -#define QCA6180_SI_CONFIG_DIVIDER_LSB 0 -#define QCA6180_SI_CONFIG_DIVIDER_MASK 0x0000000f -#define QCA6180_SI_CONFIG_OFFSET (0x00000000 + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_TX_DATA0_OFFSET (0x00000008 + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_TX_DATA1_OFFSET (0x0000000c + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_RX_DATA0_OFFSET (0x00000010 + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_RX_DATA1_OFFSET (0x00000014 + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_CS_OFFSET (0x00000004 + _SI_REG_BASE_ADDRESS) -#define QCA6180_SI_CS_DONE_ERR_MASK 0x00000400 -#define QCA6180_SI_CS_DONE_INT_MASK 0x00000200 -#define QCA6180_SI_CS_START_LSB 8 -#define QCA6180_SI_CS_START_MASK 0x00000100 -#define QCA6180_SI_CS_RX_CNT_LSB 4 -#define QCA6180_SI_CS_RX_CNT_MASK 0x000000f0 -#define QCA6180_SI_CS_TX_CNT_LSB 0 -#define QCA6180_SI_CS_TX_CNT_MASK 0x0000000f -#define QCA6180_CE_COUNT 8 -#define QCA6180_SR_WR_INDEX_ADDRESS (0x003C + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_DST_WATERMARK_ADDRESS (0x0050 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_RX_MSDU_END_4_FIRST_MSDU_LSB 14 -#define QCA6180_RX_MSDU_END_4_FIRST_MSDU_MASK 0x00004000 -#define QCA6180_RX_MPDU_START_0_SEQ_NUM_LSB 16 -#define QCA6180_RX_MPDU_START_0_SEQ_NUM_MASK 0x0fff0000 -#define QCA6180_RX_MPDU_START_2_PN_47_32_LSB 0 -#define QCA6180_RX_MPDU_START_2_PN_47_32_MASK 0x0000ffff -#define QCA6180_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB 16 -#define QCA6180_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK 0xffff0000 -#define QCA6180_RX_MSDU_END_4_LAST_MSDU_LSB 15 -#define QCA6180_RX_MSDU_END_4_LAST_MSDU_MASK 0x00008000 -#define QCA6180_RX_ATTENTION_0_MCAST_BCAST_LSB 2 -#define QCA6180_RX_ATTENTION_0_MCAST_BCAST_MASK 0x00000004 -#define QCA6180_RX_ATTENTION_0_FRAGMENT_LSB 13 -#define QCA6180_RX_ATTENTION_0_FRAGMENT_MASK 0x00002000 -#define QCA6180_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK 0x08000000 -#define QCA6180_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB 16 -#define QCA6180_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK 0x00ff0000 -#define QCA6180_RX_MSDU_START_0_MSDU_LENGTH_LSB 0 -#define QCA6180_RX_MSDU_START_0_MSDU_LENGTH_MASK 0x00003fff - -#define QCA6180_RX_MSDU_START_2_DECAP_FORMAT_OFFSET 0x00000008 -#define QCA6180_RX_MSDU_START_2_DECAP_FORMAT_LSB 8 -#define QCA6180_RX_MSDU_START_2_DECAP_FORMAT_MASK 0x00000300 -#define QCA6180_RX_MPDU_START_0_ENCRYPTED_LSB 13 -#define QCA6180_RX_MPDU_START_0_ENCRYPTED_MASK 0x00002000 -#define QCA6180_RX_ATTENTION_0_MORE_DATA_MASK 0x00000400 -#define QCA6180_RX_ATTENTION_0_MSDU_DONE_MASK 0x80000000 -#define QCA6180_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK 0x00040000 -#define QCA6180_DST_WR_INDEX_ADDRESS (0x0040 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_SRC_WATERMARK_ADDRESS (0x004c + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_SRC_WATERMARK_LOW_MASK 0xffff0000 -#define QCA6180_SRC_WATERMARK_HIGH_MASK 0x0000ffff -#define QCA6180_DST_WATERMARK_LOW_MASK 0xffff0000 -#define QCA6180_DST_WATERMARK_HIGH_MASK 0x0000ffff -#define QCA6180_CURRENT_SRRI_ADDRESS (0x0044 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CURRENT_DRRI_ADDRESS (0x0048 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK 0x00000002 -#define QCA6180_HOST_IS_SRC_RING_LOW_WATERMARK_MASK 0x00000004 -#define QCA6180_HOST_IS_DST_RING_HIGH_WATERMARK_MASK 0x00000008 -#define QCA6180_HOST_IS_DST_RING_LOW_WATERMARK_MASK 0x00000010 -#define QCA6180_HOST_IS_ADDRESS (0x0030 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_MISC_IS_ADDRESS (0x0038 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_HOST_IS_COPY_COMPLETE_MASK 0x00000001 -#define QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS 0x0000 -#define QCA6180_CE_WRAPPER_INDEX_BASE_LOW 0x0004 -#define QCA6180_CE_WRAPPER_INDEX_BASE_HIGH 0x0008 -#define QCA6180_HOST_IE_ADDRESS (0x002C + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_HOST_IE_COPY_COMPLETE_MASK 0x00000001 -#define QCA6180_SR_BA_ADDRESS (0x0000 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_SR_BA_ADDRESS_HIGH (0x0004 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_SR_SIZE_ADDRESS (0x0008 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_CTRL1_ADDRESS (0x0018 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_CTRL1_DMAX_LENGTH_MASK 0x0000ffff -#define QCA6180_DR_BA_ADDRESS (0x000C + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_DR_BA_ADDRESS_HIGH (0x000C + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_DR_SIZE_ADDRESS (0x0014 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_CMD_REGISTER (0x0020 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_MSI_ADDRESS (0x0058 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_MSI_ADDRESS_HIGH (0x005C + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_MSI_DATA (0x0060 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_CE_MSI_ENABLE_BIT 16 -#define QCA6180_MISC_IE_ADDRESS (0x0034 + _CE0_CE_REG_CSR_BASE_ADDRESS) -#define QCA6180_MISC_IS_AXI_ERR_MASK 0x00000100 -#define QCA6180_MISC_IS_DST_ADDR_ERR_MASK 0x00000200 -#define QCA6180_MISC_IS_SRC_LEN_ERR_MASK 0x00000100 -#define QCA6180_MISC_IS_DST_MAX_LEN_VIO_MASK 0x00000080 -#define QCA6180_MISC_IS_DST_RING_OVERFLOW_MASK 0x00000040 -#define QCA6180_MISC_IS_SRC_RING_OVERFLOW_MASK 0x00000020 -#define QCA6180_WRAPPER_INTERRUPT_SUMMARY_ADDR 0x0024D000 -#define QCA6180_SRC_WATERMARK_LOW_LSB 16 -#define QCA6180_SRC_WATERMARK_HIGH_LSB 0 -#define QCA6180_DST_WATERMARK_LOW_LSB 16 -#define QCA6180_DST_WATERMARK_HIGH_LSB 0 -#define QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK 0xfff000 -#define QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB 12 -#define QCA6180_CE_CTRL1_DMAX_LENGTH_LSB 0 -#define QCA6180_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK 0x00020000 -#define QCA6180_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK 0x00040000 -#define QCA6180_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB 17 -#define QCA6180_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB 18 -#define QCA6180_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK 0x0000004 -#define QCA6180_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB 2 -#define QCA6180_SOC_GLOBAL_RESET_ADDRESS \ - (0x0008 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_RTC_STATE_ADDRESS \ - (0x0000 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_RTC_STATE_COLD_RESET_MASK 0x400 - -#define QCA6180_PCIE_SOC_WAKE_RESET 0x00000000 -#define QCA6180_PCIE_SOC_WAKE_ADDRESS (0x0004 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_PCIE_SOC_WAKE_V_MASK 0x00000001 - -#define QCA6180_RTC_STATE_V_MASK 0x00000007 -#define QCA6180_RTC_STATE_V_LSB 0 -#define QCA6180_RTC_STATE_V_ON 5 -#define QCA6180_PCIE_LOCAL_BASE_ADDRESS 0x0 -#define QCA6180_FW_IND_EVENT_PENDING 1 -#define QCA6180_FW_IND_INITIALIZED 2 -#define QCA6180_FW_IND_HELPER 4 - -#define QCA6180_PCIE_INTR_ENABLE_ADDRESS (0x000c + _SOC_CORE_REG_BASE_ADDRESS) -#define QCA6180_PCIE_INTR_CLR_ADDRESS (0x001c + _SOC_CORE_REG_BASE_ADDRESS) -#define QCA6180_PCIE_INTR_FIRMWARE_MASK 0x00100000 -#define QCA6180_PCIE_INTR_CE0_MASK 0x00000100 -#define QCA6180_PCIE_INTR_CE_MASK_ALL 0x0000ff00 -#define QCA6180_PCIE_INTR_CAUSE_ADDRESS (0x0014 + _SOC_CORE_REG_BASE_ADDRESS) - -#define QCA6180_CPU_INTR_ADDRESS 0xffffffff -#define QCA6180_SOC_LF_TIMER_CONTROL0_ADDRESS 0xffffffff -#define QCA6180_SOC_LF_TIMER_CONTROL0_ENABLE_MASK 0xffffffff -#define QCA6180_SOC_RESET_CONTROL_ADDRESS \ - (0x00000000 + _RTC_SOC_REG_BASE_ADDRESS) -#define QCA6180_SOC_RESET_CONTROL_CE_RST_MASK 0x0100 -#define QCA6180_SOC_RESET_CONTROL_CPU_WARM_RST_MASK 0x00000040 -#define QCA6180_CORE_CTRL_ADDRESS (0x0000 + _SOC_CORE_REG_BASE_ADDRESS) -#define QCA6180_CORE_CTRL_CPU_INTR_MASK 0x00002000 -#define QCA6180_LOCAL_SCRATCH_OFFSET 0x00000018 -#define QCA6180_CLOCK_GPIO_OFFSET 0xffffffff -#define QCA6180_CLOCK_GPIO_BT_CLK_OUT_EN_LSB 0 -#define QCA6180_CLOCK_GPIO_BT_CLK_OUT_EN_MASK 0 -#define QCA6180_SOC_CHIP_ID_ADDRESS 0x000000f0 -#define QCA6180_SOC_CHIP_ID_VERSION_MASK 0xfffc0000 -#define QCA6180_SOC_CHIP_ID_VERSION_LSB 18 -#define QCA6180_SOC_CHIP_ID_REVISION_MASK 0x00000f00 -#define QCA6180_SOC_CHIP_ID_REVISION_LSB 8 -#define QCA6180_SOC_POWER_REG_OFFSET 0x0000010c - -/* Copy Engine Debug */ -#define QCA6180_WLAN_DEBUG_INPUT_SEL_OFFSET 0x0000010c -#define QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_MSB 3 -#define QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_LSB 0 -#define QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_MASK 0x0000000f -#define QCA6180_WLAN_DEBUG_CONTROL_OFFSET 0x00000108 -#define QCA6180_WLAN_DEBUG_CONTROL_ENABLE_MSB 0 -#define QCA6180_WLAN_DEBUG_CONTROL_ENABLE_LSB 0 -#define QCA6180_WLAN_DEBUG_CONTROL_ENABLE_MASK 0x00000001 -#define QCA6180_WLAN_DEBUG_OUT_OFFSET 0x00000110 -#define QCA6180_WLAN_DEBUG_OUT_DATA_MSB 19 -#define QCA6180_WLAN_DEBUG_OUT_DATA_LSB 0 -#define QCA6180_WLAN_DEBUG_OUT_DATA_MASK 0x000fffff -#define QCA6180_AMBA_DEBUG_BUS_OFFSET 0x0000011c -#define QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB 13 -#define QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB 8 -#define QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK 0x00003f00 -#define QCA6180_AMBA_DEBUG_BUS_SEL_MSB 4 -#define QCA6180_AMBA_DEBUG_BUS_SEL_LSB 0 -#define QCA6180_AMBA_DEBUG_BUS_SEL_MASK 0x0000001f -#define QCA6180_CE_WRAPPER_DEBUG_OFFSET 0x0008 -#define QCA6180_CE_WRAPPER_DEBUG_SEL_MSB 4 -#define QCA6180_CE_WRAPPER_DEBUG_SEL_LSB 0 -#define QCA6180_CE_WRAPPER_DEBUG_SEL_MASK 0x0000001f -#define QCA6180_CE_DEBUG_OFFSET 0x0054 -#define QCA6180_CE_DEBUG_SEL_MSB 5 -#define QCA6180_CE_DEBUG_SEL_LSB 0 -#define QCA6180_CE_DEBUG_SEL_MASK 0x0000003f -/* End */ - -/* PLL start */ -#define QCA6180_EFUSE_OFFSET 0x0000032c -#define QCA6180_EFUSE_XTAL_SEL_MSB 10 -#define QCA6180_EFUSE_XTAL_SEL_LSB 8 -#define QCA6180_EFUSE_XTAL_SEL_MASK 0x00000700 -#define QCA6180_BB_PLL_CONFIG_OFFSET 0x000002f4 -#define QCA6180_BB_PLL_CONFIG_OUTDIV_MSB 20 -#define QCA6180_BB_PLL_CONFIG_OUTDIV_LSB 18 -#define QCA6180_BB_PLL_CONFIG_OUTDIV_MASK 0x001c0000 -#define QCA6180_BB_PLL_CONFIG_FRAC_MSB 17 -#define QCA6180_BB_PLL_CONFIG_FRAC_LSB 0 -#define QCA6180_BB_PLL_CONFIG_FRAC_MASK 0x0003ffff -#define QCA6180_WLAN_PLL_SETTLE_TIME_MSB 10 -#define QCA6180_WLAN_PLL_SETTLE_TIME_LSB 0 -#define QCA6180_WLAN_PLL_SETTLE_TIME_MASK 0x000007ff -#define QCA6180_WLAN_PLL_SETTLE_OFFSET 0x0018 -#define QCA6180_WLAN_PLL_SETTLE_SW_MASK 0x000007ff -#define QCA6180_WLAN_PLL_SETTLE_RSTMASK 0xffffffff -#define QCA6180_WLAN_PLL_SETTLE_RESET 0x00000400 -#define QCA6180_WLAN_PLL_CONTROL_NOPWD_MSB 18 -#define QCA6180_WLAN_PLL_CONTROL_NOPWD_LSB 18 -#define QCA6180_WLAN_PLL_CONTROL_NOPWD_MASK 0x00040000 -#define QCA6180_WLAN_PLL_CONTROL_BYPASS_MSB 16 -#define QCA6180_WLAN_PLL_CONTROL_BYPASS_LSB 16 -#define QCA6180_WLAN_PLL_CONTROL_BYPASS_MASK 0x00010000 -#define QCA6180_WLAN_PLL_CONTROL_BYPASS_RESET 0x1 -#define QCA6180_WLAN_PLL_CONTROL_CLK_SEL_MSB 15 -#define QCA6180_WLAN_PLL_CONTROL_CLK_SEL_LSB 14 -#define QCA6180_WLAN_PLL_CONTROL_CLK_SEL_MASK 0x0000c000 -#define QCA6180_WLAN_PLL_CONTROL_CLK_SEL_RESET 0x0 -#define QCA6180_WLAN_PLL_CONTROL_REFDIV_MSB 13 -#define QCA6180_WLAN_PLL_CONTROL_REFDIV_LSB 10 -#define QCA6180_WLAN_PLL_CONTROL_REFDIV_MASK 0x00003c00 -#define QCA6180_WLAN_PLL_CONTROL_REFDIV_RESET 0x0 -#define QCA6180_WLAN_PLL_CONTROL_DIV_MSB 9 -#define QCA6180_WLAN_PLL_CONTROL_DIV_LSB 0 -#define QCA6180_WLAN_PLL_CONTROL_DIV_MASK 0x000003ff -#define QCA6180_WLAN_PLL_CONTROL_DIV_RESET 0x11 -#define QCA6180_WLAN_PLL_CONTROL_OFFSET 0x0014 -#define QCA6180_WLAN_PLL_CONTROL_SW_MASK 0x001fffff -#define QCA6180_WLAN_PLL_CONTROL_RSTMASK 0xffffffff -#define QCA6180_WLAN_PLL_CONTROL_RESET 0x00010011 -#define QCA6180_SOC_CORE_CLK_CTRL_OFFSET 0x00000114 -#define QCA6180_SOC_CORE_CLK_CTRL_DIV_MSB 2 -#define QCA6180_SOC_CORE_CLK_CTRL_DIV_LSB 0 -#define QCA6180_SOC_CORE_CLK_CTRL_DIV_MASK 0x00000007 -#define QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_MSB 5 -#define QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_LSB 5 -#define QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_MASK 0x00000020 -#define QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_RESET 0x0 -#define QCA6180_RTC_SYNC_STATUS_OFFSET 0x0244 -#define QCA6180_SOC_CPU_CLOCK_OFFSET 0x00000020 -#define QCA6180_SOC_CPU_CLOCK_STANDARD_MSB 1 -#define QCA6180_SOC_CPU_CLOCK_STANDARD_LSB 0 -#define QCA6180_SOC_CPU_CLOCK_STANDARD_MASK 0x00000003 -/* PLL end */ - -#define QCA6180_PCIE_INTR_CE_MASK(n) (QCA6180_PCIE_INTR_CE0_MASK << (n)) -#define QCA6180_DRAM_BASE_ADDRESS QCA6180_TARG_DRAM_START -#define QCA6180_FW_INDICATOR_ADDRESS \ - (QCA6180_WIFICMN_BASE_ADDRESS + QCA6180_SCRATCH_3_ADDRESS) -#define QCA6180_SYSTEM_SLEEP_OFFSET QCA6180_SOC_SYSTEM_SLEEP_OFFSET -#define QCA6180_WLAN_SYSTEM_SLEEP_OFFSET (0x002c + _WIFI_RTC_REG_BASE_ADDRESS) -#define QCA6180_WLAN_RESET_CONTROL_OFFSET (0x0000 + _WIFI_RTC_REG_BASE_ADDRESS) -#define QCA6180_CLOCK_CONTROL_OFFSET QCA6180_SOC_CLOCK_CONTROL_OFFSET -#define QCA6180_CLOCK_CONTROL_SI0_CLK_MASK \ - QCA6180_SOC_CLOCK_CONTROL_SI0_CLK_MASK -#define QCA6180_RESET_CONTROL_MBOX_RST_MASK 0x00000004 -#define QCA6180_RESET_CONTROL_SI0_RST_MASK \ - QCA6180_SOC_RESET_CONTROL_SI0_RST_MASK -#define QCA6180_GPIO_BASE_ADDRESS QCA6180_WLAN_GPIO_BASE_ADDRESS -#define QCA6180_GPIO_PIN0_OFFSET QCA6180_WLAN_GPIO_PIN0_ADDRESS -#define QCA6180_GPIO_PIN1_OFFSET QCA6180_WLAN_GPIO_PIN1_ADDRESS -#define QCA6180_GPIO_PIN0_CONFIG_MASK QCA6180_WLAN_GPIO_PIN0_CONFIG_MASK -#define QCA6180_GPIO_PIN1_CONFIG_MASK QCA6180_WLAN_GPIO_PIN1_CONFIG_MASK -#define QCA6180_SI_BASE_ADDRESS 0x00000000 -#define QCA6180_CPU_CLOCK_OFFSET (0x20 + _RTC_SOC_REG_BASE_ADDRESS) -#define QCA6180_LPO_CAL_OFFSET QCA6180_SOC_LPO_CAL_OFFSET -#define QCA6180_GPIO_PIN10_OFFSET QCA6180_WLAN_GPIO_PIN10_ADDRESS -#define QCA6180_GPIO_PIN11_OFFSET QCA6180_WLAN_GPIO_PIN11_ADDRESS -#define QCA6180_GPIO_PIN12_OFFSET QCA6180_WLAN_GPIO_PIN12_ADDRESS -#define QCA6180_GPIO_PIN13_OFFSET QCA6180_WLAN_GPIO_PIN13_ADDRESS -#define QCA6180_CPU_CLOCK_STANDARD_LSB 0 -#define QCA6180_CPU_CLOCK_STANDARD_MASK 0x1 -#define QCA6180_LPO_CAL_ENABLE_LSB QCA6180_SOC_LPO_CAL_ENABLE_LSB -#define QCA6180_LPO_CAL_ENABLE_MASK QCA6180_SOC_LPO_CAL_ENABLE_MASK -#define QCA6180_ANALOG_INTF_BASE_ADDRESS QCA6180_WLAN_ANALOG_INTF_BASE_ADDRESS -#define QCA6180_MBOX_BASE_ADDRESS 0x00008000 -#define QCA6180_INT_STATUS_ENABLE_ERROR_LSB MISSING -#define QCA6180_INT_STATUS_ENABLE_ERROR_MASK MISSING -#define QCA6180_INT_STATUS_ENABLE_CPU_LSB MISSING -#define QCA6180_INT_STATUS_ENABLE_CPU_MASK MISSING -#define QCA6180_INT_STATUS_ENABLE_COUNTER_LSB MISSING -#define QCA6180_INT_STATUS_ENABLE_COUNTER_MASK MISSING -#define QCA6180_INT_STATUS_ENABLE_MBOX_DATA_LSB MISSING -#define QCA6180_INT_STATUS_ENABLE_MBOX_DATA_MASK MISSING -#define QCA6180_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB MISSING -#define QCA6180_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK MISSING -#define QCA6180_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB MISSING -#define QCA6180_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK MISSING -#define QCA6180_COUNTER_INT_STATUS_ENABLE_BIT_LSB MISSING -#define QCA6180_COUNTER_INT_STATUS_ENABLE_BIT_MASK MISSING -#define QCA6180_INT_STATUS_ENABLE_ADDRESS MISSING -#define QCA6180_CPU_INT_STATUS_ENABLE_BIT_LSB MISSING -#define QCA6180_CPU_INT_STATUS_ENABLE_BIT_MASK MISSING -#define QCA6180_HOST_INT_STATUS_ADDRESS MISSING -#define QCA6180_CPU_INT_STATUS_ADDRESS MISSING -#define QCA6180_ERROR_INT_STATUS_ADDRESS MISSING -#define QCA6180_ERROR_INT_STATUS_WAKEUP_MASK MISSING -#define QCA6180_ERROR_INT_STATUS_WAKEUP_LSB MISSING -#define QCA6180_ERROR_INT_STATUS_RX_UNDERFLOW_MASK MISSING -#define QCA6180_ERROR_INT_STATUS_RX_UNDERFLOW_LSB MISSING -#define QCA6180_ERROR_INT_STATUS_TX_OVERFLOW_MASK MISSING -#define QCA6180_ERROR_INT_STATUS_TX_OVERFLOW_LSB MISSING -#define QCA6180_COUNT_DEC_ADDRESS MISSING -#define QCA6180_HOST_INT_STATUS_CPU_MASK MISSING -#define QCA6180_HOST_INT_STATUS_CPU_LSB MISSING -#define QCA6180_HOST_INT_STATUS_ERROR_MASK MISSING -#define QCA6180_HOST_INT_STATUS_ERROR_LSB MISSING -#define QCA6180_HOST_INT_STATUS_COUNTER_MASK MISSING -#define QCA6180_HOST_INT_STATUS_COUNTER_LSB MISSING -#define QCA6180_RX_LOOKAHEAD_VALID_ADDRESS MISSING -#define QCA6180_WINDOW_DATA_ADDRESS MISSING -#define QCA6180_WINDOW_READ_ADDR_ADDRESS MISSING -#define QCA6180_WINDOW_WRITE_ADDR_ADDRESS MISSING -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_0 \ - (0x0024 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_1 \ - (0x0028 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_2 \ - (0x002C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_3 \ - (0x0030 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_4 \ - (0x0034 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_5 \ - (0x0038 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_6 \ - (0x003C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_7 \ - (0x0040 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_8 \ - (0x0044 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_9 \ - (0x0048 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_10 \ - (0x004C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_11 \ - (0x0050 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_12 \ - (0x0054 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_13 \ - (0x0058 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_14 \ - (0x005C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_15 \ - (0x0060 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_16 \ - (0x0064 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_17 \ - (0x0068 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_18 \ - (0x006C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_19 \ - (0x0070 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_20 \ - (0x0074 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_21 \ - (0x0078 + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_22 \ - (0x007C + _PCIE_LOCAL_REG_BASE_ADDRESS) -#define QCA6180_A_LOCAL_SHADOW_REG_VALUE_23 \ - (0x0080 + _PCIE_LOCAL_REG_BASE_ADDRESS) - - -/* Q6 iHelium emulation registers */ -#define QCA6180_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1 0x00113018 -#define QCA6180_A_SOC_CORE_SPARE_1_REGISTER 0x00113184 -#define QCA6180_A_SOC_CORE_PCIE_INTR_CLR_GRP1 0x00113020 -#define QCA6180_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1 0x00113010 -#define QCA6180_A_SOC_PCIE_PCIE_SCRATCH_0 0x00130040 -#define QCA6180_A_SOC_PCIE_PCIE_SCRATCH_1 0x00130044 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE0_TARGET_IE 0x00240024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE0_TARGET_IS 0x00240028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE1_TARGET_IE 0x00241024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE1_TARGET_IS 0x00241028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE2_TARGET_IE 0x00242024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE2_TARGET_IS 0x00242028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE3_TARGET_IE 0x00243024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE3_TARGET_IS 0x00243028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE4_TARGET_IE 0x00244024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE4_TARGET_IS 0x00244028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE5_TARGET_IE 0x00245024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE5_TARGET_IS 0x00245028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE6_TARGET_IE 0x00246024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE6_TARGET_IS 0x00246028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE7_TARGET_IE 0x00247024 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE7_TARGET_IS 0x00247028 -#define QCA6180_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA 0x08 -#define QCA6180_A_SOC_PCIE_PCIE_SCRATCH_2 0x0013005C -#define QCA6180_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK 0x0 -/* end: Q6 iHelium emulation registers */ - -struct targetdef_s qca6180_targetdef = { - .d_RTC_SOC_BASE_ADDRESS = QCA6180_RTC_SOC_BASE_ADDRESS, - .d_RTC_WMAC_BASE_ADDRESS = QCA6180_RTC_WMAC_BASE_ADDRESS, - .d_SYSTEM_SLEEP_OFFSET = QCA6180_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_OFFSET = QCA6180_WLAN_SYSTEM_SLEEP_OFFSET, - .d_WLAN_SYSTEM_SLEEP_DISABLE_LSB = - QCA6180_WLAN_SYSTEM_SLEEP_DISABLE_LSB, - .d_WLAN_SYSTEM_SLEEP_DISABLE_MASK = - QCA6180_WLAN_SYSTEM_SLEEP_DISABLE_MASK, - .d_CLOCK_CONTROL_OFFSET = QCA6180_CLOCK_CONTROL_OFFSET, - .d_CLOCK_CONTROL_SI0_CLK_MASK = QCA6180_CLOCK_CONTROL_SI0_CLK_MASK, - .d_RESET_CONTROL_OFFSET = QCA6180_SOC_RESET_CONTROL_OFFSET, - .d_RESET_CONTROL_MBOX_RST_MASK = QCA6180_RESET_CONTROL_MBOX_RST_MASK, - .d_RESET_CONTROL_SI0_RST_MASK = QCA6180_RESET_CONTROL_SI0_RST_MASK, - .d_WLAN_RESET_CONTROL_OFFSET = QCA6180_WLAN_RESET_CONTROL_OFFSET, - .d_WLAN_RESET_CONTROL_COLD_RST_MASK = - QCA6180_WLAN_RESET_CONTROL_COLD_RST_MASK, - .d_WLAN_RESET_CONTROL_WARM_RST_MASK = - QCA6180_WLAN_RESET_CONTROL_WARM_RST_MASK, - .d_GPIO_BASE_ADDRESS = QCA6180_GPIO_BASE_ADDRESS, - .d_GPIO_PIN0_OFFSET = QCA6180_GPIO_PIN0_OFFSET, - .d_GPIO_PIN1_OFFSET = QCA6180_GPIO_PIN1_OFFSET, - .d_GPIO_PIN0_CONFIG_MASK = QCA6180_GPIO_PIN0_CONFIG_MASK, - .d_GPIO_PIN1_CONFIG_MASK = QCA6180_GPIO_PIN1_CONFIG_MASK, - .d_SI_CONFIG_BIDIR_OD_DATA_LSB = QCA6180_SI_CONFIG_BIDIR_OD_DATA_LSB, - .d_SI_CONFIG_BIDIR_OD_DATA_MASK = QCA6180_SI_CONFIG_BIDIR_OD_DATA_MASK, - .d_SI_CONFIG_I2C_LSB = QCA6180_SI_CONFIG_I2C_LSB, - .d_SI_CONFIG_I2C_MASK = QCA6180_SI_CONFIG_I2C_MASK, - .d_SI_CONFIG_POS_SAMPLE_LSB = QCA6180_SI_CONFIG_POS_SAMPLE_LSB, - .d_SI_CONFIG_POS_SAMPLE_MASK = QCA6180_SI_CONFIG_POS_SAMPLE_MASK, - .d_SI_CONFIG_INACTIVE_CLK_LSB = QCA6180_SI_CONFIG_INACTIVE_CLK_LSB, - .d_SI_CONFIG_INACTIVE_CLK_MASK = QCA6180_SI_CONFIG_INACTIVE_CLK_MASK, - .d_SI_CONFIG_INACTIVE_DATA_LSB = QCA6180_SI_CONFIG_INACTIVE_DATA_LSB, - .d_SI_CONFIG_INACTIVE_DATA_MASK = QCA6180_SI_CONFIG_INACTIVE_DATA_MASK, - .d_SI_CONFIG_DIVIDER_LSB = QCA6180_SI_CONFIG_DIVIDER_LSB, - .d_SI_CONFIG_DIVIDER_MASK = QCA6180_SI_CONFIG_DIVIDER_MASK, - .d_SI_BASE_ADDRESS = QCA6180_SI_BASE_ADDRESS, - .d_SI_CONFIG_OFFSET = QCA6180_SI_CONFIG_OFFSET, - .d_SI_TX_DATA0_OFFSET = QCA6180_SI_TX_DATA0_OFFSET, - .d_SI_TX_DATA1_OFFSET = QCA6180_SI_TX_DATA1_OFFSET, - .d_SI_RX_DATA0_OFFSET = QCA6180_SI_RX_DATA0_OFFSET, - .d_SI_RX_DATA1_OFFSET = QCA6180_SI_RX_DATA1_OFFSET, - .d_SI_CS_OFFSET = QCA6180_SI_CS_OFFSET, - .d_SI_CS_DONE_ERR_MASK = QCA6180_SI_CS_DONE_ERR_MASK, - .d_SI_CS_DONE_INT_MASK = QCA6180_SI_CS_DONE_INT_MASK, - .d_SI_CS_START_LSB = QCA6180_SI_CS_START_LSB, - .d_SI_CS_START_MASK = QCA6180_SI_CS_START_MASK, - .d_SI_CS_RX_CNT_LSB = QCA6180_SI_CS_RX_CNT_LSB, - .d_SI_CS_RX_CNT_MASK = QCA6180_SI_CS_RX_CNT_MASK, - .d_SI_CS_TX_CNT_LSB = QCA6180_SI_CS_TX_CNT_LSB, - .d_SI_CS_TX_CNT_MASK = QCA6180_SI_CS_TX_CNT_MASK, - .d_BOARD_DATA_SZ = QCA6180_BOARD_DATA_SZ, - .d_BOARD_EXT_DATA_SZ = QCA6180_BOARD_EXT_DATA_SZ, - .d_MBOX_BASE_ADDRESS = QCA6180_MBOX_BASE_ADDRESS, - .d_LOCAL_SCRATCH_OFFSET = QCA6180_LOCAL_SCRATCH_OFFSET, - .d_CPU_CLOCK_OFFSET = QCA6180_CPU_CLOCK_OFFSET, - .d_LPO_CAL_OFFSET = QCA6180_LPO_CAL_OFFSET, - .d_GPIO_PIN10_OFFSET = QCA6180_GPIO_PIN10_OFFSET, - .d_GPIO_PIN11_OFFSET = QCA6180_GPIO_PIN11_OFFSET, - .d_GPIO_PIN12_OFFSET = QCA6180_GPIO_PIN12_OFFSET, - .d_GPIO_PIN13_OFFSET = QCA6180_GPIO_PIN13_OFFSET, - .d_CLOCK_GPIO_OFFSET = QCA6180_CLOCK_GPIO_OFFSET, - .d_CPU_CLOCK_STANDARD_LSB = QCA6180_CPU_CLOCK_STANDARD_LSB, - .d_CPU_CLOCK_STANDARD_MASK = QCA6180_CPU_CLOCK_STANDARD_MASK, - .d_LPO_CAL_ENABLE_LSB = QCA6180_LPO_CAL_ENABLE_LSB, - .d_LPO_CAL_ENABLE_MASK = QCA6180_LPO_CAL_ENABLE_MASK, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_LSB = QCA6180_CLOCK_GPIO_BT_CLK_OUT_EN_LSB, - .d_CLOCK_GPIO_BT_CLK_OUT_EN_MASK = - QCA6180_CLOCK_GPIO_BT_CLK_OUT_EN_MASK, - .d_ANALOG_INTF_BASE_ADDRESS = QCA6180_ANALOG_INTF_BASE_ADDRESS, - .d_WLAN_MAC_BASE_ADDRESS = QCA6180_WLAN_MAC_BASE_ADDRESS, - .d_FW_INDICATOR_ADDRESS = QCA6180_FW_INDICATOR_ADDRESS, - .d_DRAM_BASE_ADDRESS = QCA6180_DRAM_BASE_ADDRESS, - .d_SOC_CORE_BASE_ADDRESS = QCA6180_SOC_CORE_BASE_ADDRESS, - .d_CORE_CTRL_ADDRESS = QCA6180_CORE_CTRL_ADDRESS, - .d_CE_COUNT = QCA6180_CE_COUNT, - .d_MSI_NUM_REQUEST = MSI_NUM_REQUEST, - .d_MSI_ASSIGN_FW = MSI_ASSIGN_FW, - .d_MSI_ASSIGN_CE_INITIAL = MSI_ASSIGN_CE_INITIAL, - .d_PCIE_INTR_ENABLE_ADDRESS = QCA6180_PCIE_INTR_ENABLE_ADDRESS, - .d_PCIE_INTR_CLR_ADDRESS = QCA6180_PCIE_INTR_CLR_ADDRESS, - .d_PCIE_INTR_FIRMWARE_MASK = QCA6180_PCIE_INTR_FIRMWARE_MASK, - .d_PCIE_INTR_CE_MASK_ALL = QCA6180_PCIE_INTR_CE_MASK_ALL, - .d_CORE_CTRL_CPU_INTR_MASK = QCA6180_CORE_CTRL_CPU_INTR_MASK, - .d_SR_WR_INDEX_ADDRESS = QCA6180_SR_WR_INDEX_ADDRESS, - .d_DST_WATERMARK_ADDRESS = QCA6180_DST_WATERMARK_ADDRESS, - /* htt_rx.c */ - .d_RX_MSDU_END_4_FIRST_MSDU_MASK = - QCA6180_RX_MSDU_END_4_FIRST_MSDU_MASK, - .d_RX_MSDU_END_4_FIRST_MSDU_LSB = QCA6180_RX_MSDU_END_4_FIRST_MSDU_LSB, - .d_RX_MPDU_START_0_SEQ_NUM_MASK = QCA6180_RX_MPDU_START_0_SEQ_NUM_MASK, - .d_RX_MPDU_START_0_SEQ_NUM_LSB = QCA6180_RX_MPDU_START_0_SEQ_NUM_LSB, - .d_RX_MPDU_START_2_PN_47_32_LSB = QCA6180_RX_MPDU_START_2_PN_47_32_LSB, - .d_RX_MPDU_START_2_PN_47_32_MASK = - QCA6180_RX_MPDU_START_2_PN_47_32_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK = - QCA6180_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK, - .d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB = - QCA6180_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB, - .d_RX_MSDU_END_4_LAST_MSDU_MASK = QCA6180_RX_MSDU_END_4_LAST_MSDU_MASK, - .d_RX_MSDU_END_4_LAST_MSDU_LSB = QCA6180_RX_MSDU_END_4_LAST_MSDU_LSB, - .d_RX_ATTENTION_0_MCAST_BCAST_MASK = - QCA6180_RX_ATTENTION_0_MCAST_BCAST_MASK, - .d_RX_ATTENTION_0_MCAST_BCAST_LSB = - QCA6180_RX_ATTENTION_0_MCAST_BCAST_LSB, - .d_RX_ATTENTION_0_FRAGMENT_MASK = QCA6180_RX_ATTENTION_0_FRAGMENT_MASK, - .d_RX_ATTENTION_0_FRAGMENT_LSB = QCA6180_RX_ATTENTION_0_FRAGMENT_LSB, - .d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK = - QCA6180_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK = - QCA6180_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK, - .d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB = - QCA6180_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB, - .d_RX_MSDU_START_0_MSDU_LENGTH_MASK = - QCA6180_RX_MSDU_START_0_MSDU_LENGTH_MASK, - .d_RX_MSDU_START_0_MSDU_LENGTH_LSB = - QCA6180_RX_MSDU_START_0_MSDU_LENGTH_LSB, - .d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET = - QCA6180_RX_MSDU_START_2_DECAP_FORMAT_OFFSET, - .d_RX_MSDU_START_2_DECAP_FORMAT_MASK = - QCA6180_RX_MSDU_START_2_DECAP_FORMAT_MASK, - .d_RX_MSDU_START_2_DECAP_FORMAT_LSB = - QCA6180_RX_MSDU_START_2_DECAP_FORMAT_LSB, - .d_RX_MPDU_START_0_ENCRYPTED_MASK = - QCA6180_RX_MPDU_START_0_ENCRYPTED_MASK, - .d_RX_MPDU_START_0_ENCRYPTED_LSB = - QCA6180_RX_MPDU_START_0_ENCRYPTED_LSB, - .d_RX_ATTENTION_0_MORE_DATA_MASK = - QCA6180_RX_ATTENTION_0_MORE_DATA_MASK, - .d_RX_ATTENTION_0_MSDU_DONE_MASK = - QCA6180_RX_ATTENTION_0_MSDU_DONE_MASK, - .d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK = - QCA6180_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK, - - /* PLL start */ - .d_EFUSE_OFFSET = QCA6180_EFUSE_OFFSET, - .d_EFUSE_XTAL_SEL_MSB = QCA6180_EFUSE_XTAL_SEL_MSB, - .d_EFUSE_XTAL_SEL_LSB = QCA6180_EFUSE_XTAL_SEL_LSB, - .d_EFUSE_XTAL_SEL_MASK = QCA6180_EFUSE_XTAL_SEL_MASK, - .d_BB_PLL_CONFIG_OFFSET = QCA6180_BB_PLL_CONFIG_OFFSET, - .d_BB_PLL_CONFIG_OUTDIV_MSB = QCA6180_BB_PLL_CONFIG_OUTDIV_MSB, - .d_BB_PLL_CONFIG_OUTDIV_LSB = QCA6180_BB_PLL_CONFIG_OUTDIV_LSB, - .d_BB_PLL_CONFIG_OUTDIV_MASK = QCA6180_BB_PLL_CONFIG_OUTDIV_MASK, - .d_BB_PLL_CONFIG_FRAC_MSB = QCA6180_BB_PLL_CONFIG_FRAC_MSB, - .d_BB_PLL_CONFIG_FRAC_LSB = QCA6180_BB_PLL_CONFIG_FRAC_LSB, - .d_BB_PLL_CONFIG_FRAC_MASK = QCA6180_BB_PLL_CONFIG_FRAC_MASK, - .d_WLAN_PLL_SETTLE_TIME_MSB = QCA6180_WLAN_PLL_SETTLE_TIME_MSB, - .d_WLAN_PLL_SETTLE_TIME_LSB = QCA6180_WLAN_PLL_SETTLE_TIME_LSB, - .d_WLAN_PLL_SETTLE_TIME_MASK = QCA6180_WLAN_PLL_SETTLE_TIME_MASK, - .d_WLAN_PLL_SETTLE_OFFSET = QCA6180_WLAN_PLL_SETTLE_OFFSET, - .d_WLAN_PLL_SETTLE_SW_MASK = QCA6180_WLAN_PLL_SETTLE_SW_MASK, - .d_WLAN_PLL_SETTLE_RSTMASK = QCA6180_WLAN_PLL_SETTLE_RSTMASK, - .d_WLAN_PLL_SETTLE_RESET = QCA6180_WLAN_PLL_SETTLE_RESET, - .d_WLAN_PLL_CONTROL_NOPWD_MSB = QCA6180_WLAN_PLL_CONTROL_NOPWD_MSB, - .d_WLAN_PLL_CONTROL_NOPWD_LSB = QCA6180_WLAN_PLL_CONTROL_NOPWD_LSB, - .d_WLAN_PLL_CONTROL_NOPWD_MASK = QCA6180_WLAN_PLL_CONTROL_NOPWD_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_MSB = QCA6180_WLAN_PLL_CONTROL_BYPASS_MSB, - .d_WLAN_PLL_CONTROL_BYPASS_LSB = QCA6180_WLAN_PLL_CONTROL_BYPASS_LSB, - .d_WLAN_PLL_CONTROL_BYPASS_MASK = QCA6180_WLAN_PLL_CONTROL_BYPASS_MASK, - .d_WLAN_PLL_CONTROL_BYPASS_RESET = - QCA6180_WLAN_PLL_CONTROL_BYPASS_RESET, - .d_WLAN_PLL_CONTROL_CLK_SEL_MSB = QCA6180_WLAN_PLL_CONTROL_CLK_SEL_MSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_LSB = QCA6180_WLAN_PLL_CONTROL_CLK_SEL_LSB, - .d_WLAN_PLL_CONTROL_CLK_SEL_MASK = - QCA6180_WLAN_PLL_CONTROL_CLK_SEL_MASK, - .d_WLAN_PLL_CONTROL_CLK_SEL_RESET = - QCA6180_WLAN_PLL_CONTROL_CLK_SEL_RESET, - .d_WLAN_PLL_CONTROL_REFDIV_MSB = QCA6180_WLAN_PLL_CONTROL_REFDIV_MSB, - .d_WLAN_PLL_CONTROL_REFDIV_LSB = QCA6180_WLAN_PLL_CONTROL_REFDIV_LSB, - .d_WLAN_PLL_CONTROL_REFDIV_MASK = QCA6180_WLAN_PLL_CONTROL_REFDIV_MASK, - .d_WLAN_PLL_CONTROL_REFDIV_RESET = - QCA6180_WLAN_PLL_CONTROL_REFDIV_RESET, - .d_WLAN_PLL_CONTROL_DIV_MSB = QCA6180_WLAN_PLL_CONTROL_DIV_MSB, - .d_WLAN_PLL_CONTROL_DIV_LSB = QCA6180_WLAN_PLL_CONTROL_DIV_LSB, - .d_WLAN_PLL_CONTROL_DIV_MASK = QCA6180_WLAN_PLL_CONTROL_DIV_MASK, - .d_WLAN_PLL_CONTROL_DIV_RESET = QCA6180_WLAN_PLL_CONTROL_DIV_RESET, - .d_WLAN_PLL_CONTROL_OFFSET = QCA6180_WLAN_PLL_CONTROL_OFFSET, - .d_WLAN_PLL_CONTROL_SW_MASK = QCA6180_WLAN_PLL_CONTROL_SW_MASK, - .d_WLAN_PLL_CONTROL_RSTMASK = QCA6180_WLAN_PLL_CONTROL_RSTMASK, - .d_WLAN_PLL_CONTROL_RESET = QCA6180_WLAN_PLL_CONTROL_RESET, - .d_SOC_CORE_CLK_CTRL_OFFSET = QCA6180_SOC_CORE_CLK_CTRL_OFFSET, - .d_SOC_CORE_CLK_CTRL_DIV_MSB = QCA6180_SOC_CORE_CLK_CTRL_DIV_MSB, - .d_SOC_CORE_CLK_CTRL_DIV_LSB = QCA6180_SOC_CORE_CLK_CTRL_DIV_LSB, - .d_SOC_CORE_CLK_CTRL_DIV_MASK = QCA6180_SOC_CORE_CLK_CTRL_DIV_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MSB = - QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_MSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_LSB = - QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_LSB, - .d_RTC_SYNC_STATUS_PLL_CHANGING_MASK = - QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_MASK, - .d_RTC_SYNC_STATUS_PLL_CHANGING_RESET = - QCA6180_RTC_SYNC_STATUS_PLL_CHANGING_RESET, - .d_RTC_SYNC_STATUS_OFFSET = QCA6180_RTC_SYNC_STATUS_OFFSET, - .d_SOC_CPU_CLOCK_OFFSET = QCA6180_SOC_CPU_CLOCK_OFFSET, - .d_SOC_CPU_CLOCK_STANDARD_MSB = QCA6180_SOC_CPU_CLOCK_STANDARD_MSB, - .d_SOC_CPU_CLOCK_STANDARD_LSB = QCA6180_SOC_CPU_CLOCK_STANDARD_LSB, - .d_SOC_CPU_CLOCK_STANDARD_MASK = QCA6180_SOC_CPU_CLOCK_STANDARD_MASK, - /* PLL end */ - .d_SOC_POWER_REG_OFFSET = QCA6180_SOC_POWER_REG_OFFSET, - .d_PCIE_INTR_CAUSE_ADDRESS = QCA6180_PCIE_INTR_CAUSE_ADDRESS, - .d_SOC_RESET_CONTROL_ADDRESS = QCA6180_SOC_RESET_CONTROL_ADDRESS, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK = - QCA6180_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_MASK, - .d_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB = - QCA6180_SOC_RESET_CONTROL_PCIE_RST_SHORT_OVRD_LSB, - .d_SOC_RESET_CONTROL_CE_RST_MASK = - QCA6180_SOC_RESET_CONTROL_CE_RST_MASK, - .d_SOC_RESET_CONTROL_CPU_WARM_RST_MASK = - QCA6180_SOC_RESET_CONTROL_CPU_WARM_RST_MASK, - .d_CPU_INTR_ADDRESS = QCA6180_CPU_INTR_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ADDRESS = - QCA6180_SOC_LF_TIMER_CONTROL0_ADDRESS, - .d_SOC_LF_TIMER_CONTROL0_ENABLE_MASK = - QCA6180_SOC_LF_TIMER_CONTROL0_ENABLE_MASK, - /* chip id start */ - .d_SOC_CHIP_ID_ADDRESS = QCA6180_SOC_CHIP_ID_ADDRESS, - .d_SOC_CHIP_ID_VERSION_MASK = QCA6180_SOC_CHIP_ID_VERSION_MASK, - .d_SOC_CHIP_ID_VERSION_LSB = QCA6180_SOC_CHIP_ID_VERSION_LSB, - .d_SOC_CHIP_ID_REVISION_MASK = QCA6180_SOC_CHIP_ID_REVISION_MASK, - .d_SOC_CHIP_ID_REVISION_LSB = QCA6180_SOC_CHIP_ID_REVISION_LSB, - /* chip id end */ - .d_A_SOC_CORE_SCRATCH_0_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_0_ADDRESS, - .d_A_SOC_CORE_SCRATCH_1_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_1_ADDRESS, - .d_A_SOC_CORE_SCRATCH_2_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_2_ADDRESS, - .d_A_SOC_CORE_SCRATCH_3_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_3_ADDRESS, - .d_A_SOC_CORE_SCRATCH_4_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_4_ADDRESS, - .d_A_SOC_CORE_SCRATCH_5_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_5_ADDRESS, - .d_A_SOC_CORE_SCRATCH_6_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_6_ADDRESS, - .d_A_SOC_CORE_SCRATCH_7_ADDRESS = QCA6180_A_SOC_CORE_SCRATCH_7_ADDRESS, - .d_A_SOC_CORE_SPARE_0_REGISTER = QCA6180_A_SOC_CORE_SPARE_0_REGISTER, - .d_PCIE_INTR_FIRMWARE_ROUTE_MASK = - QCA6180_PCIE_INTR_FIRMWARE_ROUTE_MASK, - .d_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1 = - QCA6180_A_SOC_CORE_PCIE_INTR_CAUSE_GRP1, - .d_A_SOC_CORE_SPARE_1_REGISTER = - QCA6180_A_SOC_CORE_SPARE_1_REGISTER, - .d_A_SOC_CORE_PCIE_INTR_CLR_GRP1 = - QCA6180_A_SOC_CORE_PCIE_INTR_CLR_GRP1, - .d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1 = - QCA6180_A_SOC_CORE_PCIE_INTR_ENABLE_GRP1, - .d_A_SOC_PCIE_PCIE_SCRATCH_0 = - QCA6180_A_SOC_PCIE_PCIE_SCRATCH_0, - .d_A_SOC_PCIE_PCIE_SCRATCH_1 = - QCA6180_A_SOC_PCIE_PCIE_SCRATCH_1, - .d_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA = - QCA6180_A_WIFI_APB_1_A_WFSS_CE_TARGET_HOST_DELTA, - .d_A_SOC_PCIE_PCIE_SCRATCH_2 = QCA6180_A_SOC_PCIE_PCIE_SCRATCH_2, - .d_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK = - QCA6180_A_SOC_CORE_PCIE_INTR_ENABLE_GRP0_Q6_MASK, - - .d_WLAN_DEBUG_INPUT_SEL_OFFSET = QCA6180_WLAN_DEBUG_INPUT_SEL_OFFSET, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MSB = QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_MSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_LSB = QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_LSB, - .d_WLAN_DEBUG_INPUT_SEL_SRC_MASK = - QCA6180_WLAN_DEBUG_INPUT_SEL_SRC_MASK, - .d_WLAN_DEBUG_CONTROL_OFFSET = QCA6180_WLAN_DEBUG_CONTROL_OFFSET, - .d_WLAN_DEBUG_CONTROL_ENABLE_MSB = - QCA6180_WLAN_DEBUG_CONTROL_ENABLE_MSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_LSB = - QCA6180_WLAN_DEBUG_CONTROL_ENABLE_LSB, - .d_WLAN_DEBUG_CONTROL_ENABLE_MASK = - QCA6180_WLAN_DEBUG_CONTROL_ENABLE_MASK, - .d_WLAN_DEBUG_OUT_OFFSET = QCA6180_WLAN_DEBUG_OUT_OFFSET, - .d_WLAN_DEBUG_OUT_DATA_MSB = QCA6180_WLAN_DEBUG_OUT_DATA_MSB, - .d_WLAN_DEBUG_OUT_DATA_LSB = QCA6180_WLAN_DEBUG_OUT_DATA_LSB, - .d_WLAN_DEBUG_OUT_DATA_MASK = QCA6180_WLAN_DEBUG_OUT_DATA_MASK, - .d_AMBA_DEBUG_BUS_OFFSET = QCA6180_AMBA_DEBUG_BUS_OFFSET, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB = - QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB = - QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_LSB, - .d_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK = - QCA6180_AMBA_DEBUG_BUS_PCIE_DEBUG_SEL_MASK, - .d_AMBA_DEBUG_BUS_SEL_MSB = QCA6180_AMBA_DEBUG_BUS_SEL_MSB, - .d_AMBA_DEBUG_BUS_SEL_LSB = QCA6180_AMBA_DEBUG_BUS_SEL_LSB, - .d_AMBA_DEBUG_BUS_SEL_MASK = QCA6180_AMBA_DEBUG_BUS_SEL_MASK, -}; - -struct hostdef_s qca6180_hostdef = { - .d_INT_STATUS_ENABLE_ERROR_LSB = QCA6180_INT_STATUS_ENABLE_ERROR_LSB, - .d_INT_STATUS_ENABLE_ERROR_MASK = QCA6180_INT_STATUS_ENABLE_ERROR_MASK, - .d_INT_STATUS_ENABLE_CPU_LSB = QCA6180_INT_STATUS_ENABLE_CPU_LSB, - .d_INT_STATUS_ENABLE_CPU_MASK = QCA6180_INT_STATUS_ENABLE_CPU_MASK, - .d_INT_STATUS_ENABLE_COUNTER_LSB = - QCA6180_INT_STATUS_ENABLE_COUNTER_LSB, - .d_INT_STATUS_ENABLE_COUNTER_MASK = - QCA6180_INT_STATUS_ENABLE_COUNTER_MASK, - .d_INT_STATUS_ENABLE_MBOX_DATA_LSB = - QCA6180_INT_STATUS_ENABLE_MBOX_DATA_LSB, - .d_INT_STATUS_ENABLE_MBOX_DATA_MASK = - QCA6180_INT_STATUS_ENABLE_MBOX_DATA_MASK, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB = - QCA6180_ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK = - QCA6180_ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB = - QCA6180_ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB, - .d_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK = - QCA6180_ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK, - .d_COUNTER_INT_STATUS_ENABLE_BIT_LSB = - QCA6180_COUNTER_INT_STATUS_ENABLE_BIT_LSB, - .d_COUNTER_INT_STATUS_ENABLE_BIT_MASK = - QCA6180_COUNTER_INT_STATUS_ENABLE_BIT_MASK, - .d_INT_STATUS_ENABLE_ADDRESS = QCA6180_INT_STATUS_ENABLE_ADDRESS, - .d_CPU_INT_STATUS_ENABLE_BIT_LSB = - QCA6180_CPU_INT_STATUS_ENABLE_BIT_LSB, - .d_CPU_INT_STATUS_ENABLE_BIT_MASK = - QCA6180_CPU_INT_STATUS_ENABLE_BIT_MASK, - .d_HOST_INT_STATUS_ADDRESS = QCA6180_HOST_INT_STATUS_ADDRESS, - .d_CPU_INT_STATUS_ADDRESS = QCA6180_CPU_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_ADDRESS = QCA6180_ERROR_INT_STATUS_ADDRESS, - .d_ERROR_INT_STATUS_WAKEUP_MASK = QCA6180_ERROR_INT_STATUS_WAKEUP_MASK, - .d_ERROR_INT_STATUS_WAKEUP_LSB = QCA6180_ERROR_INT_STATUS_WAKEUP_LSB, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_MASK = - QCA6180_ERROR_INT_STATUS_RX_UNDERFLOW_MASK, - .d_ERROR_INT_STATUS_RX_UNDERFLOW_LSB = - QCA6180_ERROR_INT_STATUS_RX_UNDERFLOW_LSB, - .d_ERROR_INT_STATUS_TX_OVERFLOW_MASK = - QCA6180_ERROR_INT_STATUS_TX_OVERFLOW_MASK, - .d_ERROR_INT_STATUS_TX_OVERFLOW_LSB = - QCA6180_ERROR_INT_STATUS_TX_OVERFLOW_LSB, - .d_COUNT_DEC_ADDRESS = QCA6180_COUNT_DEC_ADDRESS, - .d_HOST_INT_STATUS_CPU_MASK = QCA6180_HOST_INT_STATUS_CPU_MASK, - .d_HOST_INT_STATUS_CPU_LSB = QCA6180_HOST_INT_STATUS_CPU_LSB, - .d_HOST_INT_STATUS_ERROR_MASK = QCA6180_HOST_INT_STATUS_ERROR_MASK, - .d_HOST_INT_STATUS_ERROR_LSB = QCA6180_HOST_INT_STATUS_ERROR_LSB, - .d_HOST_INT_STATUS_COUNTER_MASK = QCA6180_HOST_INT_STATUS_COUNTER_MASK, - .d_HOST_INT_STATUS_COUNTER_LSB = QCA6180_HOST_INT_STATUS_COUNTER_LSB, - .d_RX_LOOKAHEAD_VALID_ADDRESS = QCA6180_RX_LOOKAHEAD_VALID_ADDRESS, - .d_WINDOW_DATA_ADDRESS = QCA6180_WINDOW_DATA_ADDRESS, - .d_WINDOW_READ_ADDR_ADDRESS = QCA6180_WINDOW_READ_ADDR_ADDRESS, - .d_WINDOW_WRITE_ADDR_ADDRESS = QCA6180_WINDOW_WRITE_ADDR_ADDRESS, - .d_SOC_GLOBAL_RESET_ADDRESS = QCA6180_SOC_GLOBAL_RESET_ADDRESS, - .d_RTC_STATE_ADDRESS = QCA6180_RTC_STATE_ADDRESS, - .d_RTC_STATE_COLD_RESET_MASK = QCA6180_RTC_STATE_COLD_RESET_MASK, - .d_PCIE_LOCAL_BASE_ADDRESS = QCA6180_PCIE_LOCAL_BASE_ADDRESS, - .d_PCIE_SOC_WAKE_RESET = QCA6180_PCIE_SOC_WAKE_RESET, - .d_PCIE_SOC_WAKE_ADDRESS = QCA6180_PCIE_SOC_WAKE_ADDRESS, - .d_PCIE_SOC_WAKE_V_MASK = QCA6180_PCIE_SOC_WAKE_V_MASK, - .d_RTC_STATE_V_MASK = QCA6180_RTC_STATE_V_MASK, - .d_RTC_STATE_V_LSB = QCA6180_RTC_STATE_V_LSB, - .d_FW_IND_EVENT_PENDING = QCA6180_FW_IND_EVENT_PENDING, - .d_FW_IND_INITIALIZED = QCA6180_FW_IND_INITIALIZED, - .d_FW_IND_HELPER = QCA6180_FW_IND_HELPER, - .d_RTC_STATE_V_ON = QCA6180_RTC_STATE_V_ON, -#if defined(SDIO_3_0) - .d_HOST_INT_STATUS_MBOX_DATA_MASK = - QCA6180_HOST_INT_STATUS_MBOX_DATA_MASK, - .d_HOST_INT_STATUS_MBOX_DATA_LSB = - QCA6180_HOST_INT_STATUS_MBOX_DATA_LSB, -#endif - .d_PCIE_SOC_RDY_STATUS_ADDRESS = PCIE_SOC_RDY_STATUS_ADDRESS, - .d_PCIE_SOC_RDY_STATUS_BAR_MASK = PCIE_SOC_RDY_STATUS_BAR_MASK, - .d_SOC_PCIE_BASE_ADDRESS = SOC_PCIE_BASE_ADDRESS, - .d_MSI_MAGIC_ADR_ADDRESS = MSI_MAGIC_ADR_ADDRESS, - .d_MSI_MAGIC_ADDRESS = MSI_MAGIC_ADDRESS, - .d_HOST_CE_COUNT = 8, - .d_ENABLE_MSI = 0, - .d_MUX_ID_MASK = 0xf000, - .d_TRANSACTION_ID_MASK = 0x0fff, - .d_DESC_DATA_FLAG_MASK = 0x1FFFE3E0, - .d_A_SOC_PCIE_PCIE_BAR0_START = QCA6180_A_SOC_PCIE_PCIE_BAR0_START, -}; - - -struct ce_reg_def qca6180_ce_targetdef = { - /* copy_engine.c */ - .d_DST_WR_INDEX_ADDRESS = QCA6180_DST_WR_INDEX_ADDRESS, - .d_SRC_WATERMARK_ADDRESS = QCA6180_SRC_WATERMARK_ADDRESS, - .d_SRC_WATERMARK_LOW_MASK = QCA6180_SRC_WATERMARK_LOW_MASK, - .d_SRC_WATERMARK_HIGH_MASK = QCA6180_SRC_WATERMARK_HIGH_MASK, - .d_DST_WATERMARK_LOW_MASK = QCA6180_DST_WATERMARK_LOW_MASK, - .d_DST_WATERMARK_HIGH_MASK = QCA6180_DST_WATERMARK_HIGH_MASK, - .d_CURRENT_SRRI_ADDRESS = QCA6180_CURRENT_SRRI_ADDRESS, - .d_CURRENT_DRRI_ADDRESS = QCA6180_CURRENT_DRRI_ADDRESS, - .d_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK = - QCA6180_HOST_IS_SRC_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_SRC_RING_LOW_WATERMARK_MASK = - QCA6180_HOST_IS_SRC_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_DST_RING_HIGH_WATERMARK_MASK = - QCA6180_HOST_IS_DST_RING_HIGH_WATERMARK_MASK, - .d_HOST_IS_DST_RING_LOW_WATERMARK_MASK = - QCA6180_HOST_IS_DST_RING_LOW_WATERMARK_MASK, - .d_HOST_IS_ADDRESS = QCA6180_HOST_IS_ADDRESS, - .d_MISC_IS_ADDRESS = QCA6180_MISC_IS_ADDRESS, - .d_HOST_IS_COPY_COMPLETE_MASK = QCA6180_HOST_IS_COPY_COMPLETE_MASK, - .d_CE_WRAPPER_BASE_ADDRESS = QCA6180_CE_WRAPPER_BASE_ADDRESS, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS = - QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS, - .d_CE_DDR_ADDRESS_FOR_RRI_LOW = QCA6180_CE_WRAPPER_INDEX_BASE_LOW, - .d_CE_DDR_ADDRESS_FOR_RRI_HIGH = QCA6180_CE_WRAPPER_INDEX_BASE_HIGH, - .d_HOST_IE_ADDRESS = QCA6180_HOST_IE_ADDRESS, - .d_HOST_IE_COPY_COMPLETE_MASK = QCA6180_HOST_IE_COPY_COMPLETE_MASK, - .d_SR_BA_ADDRESS = QCA6180_SR_BA_ADDRESS, - .d_SR_SIZE_ADDRESS = QCA6180_SR_SIZE_ADDRESS, - .d_CE_CTRL1_ADDRESS = QCA6180_CE_CTRL1_ADDRESS, - .d_CE_CTRL1_DMAX_LENGTH_MASK = QCA6180_CE_CTRL1_DMAX_LENGTH_MASK, - .d_DR_BA_ADDRESS = QCA6180_DR_BA_ADDRESS, - .d_DR_SIZE_ADDRESS = QCA6180_DR_SIZE_ADDRESS, - .d_CE_CMD_REGISTER = QCA6180_CE_CMD_REGISTER, - .d_CE_MSI_ADDRESS = QCA6180_CE_MSI_ADDRESS, - .d_CE_MSI_ADDRESS_HIGH = QCA6180_CE_MSI_ADDRESS_HIGH, - .d_CE_MSI_DATA = QCA6180_CE_MSI_DATA, - .d_CE_MSI_ENABLE_BIT = QCA6180_CE_MSI_ENABLE_BIT, - .d_MISC_IE_ADDRESS = QCA6180_MISC_IE_ADDRESS, - .d_MISC_IS_AXI_ERR_MASK = QCA6180_MISC_IS_AXI_ERR_MASK, - .d_MISC_IS_DST_ADDR_ERR_MASK = QCA6180_MISC_IS_DST_ADDR_ERR_MASK, - .d_MISC_IS_SRC_LEN_ERR_MASK = QCA6180_MISC_IS_SRC_LEN_ERR_MASK, - .d_MISC_IS_DST_MAX_LEN_VIO_MASK = QCA6180_MISC_IS_DST_MAX_LEN_VIO_MASK, - .d_MISC_IS_DST_RING_OVERFLOW_MASK = - QCA6180_MISC_IS_DST_RING_OVERFLOW_MASK, - .d_MISC_IS_SRC_RING_OVERFLOW_MASK = - QCA6180_MISC_IS_SRC_RING_OVERFLOW_MASK, - .d_SRC_WATERMARK_LOW_LSB = QCA6180_SRC_WATERMARK_LOW_LSB, - .d_SRC_WATERMARK_HIGH_LSB = QCA6180_SRC_WATERMARK_HIGH_LSB, - .d_DST_WATERMARK_LOW_LSB = QCA6180_DST_WATERMARK_LOW_LSB, - .d_DST_WATERMARK_HIGH_LSB = QCA6180_DST_WATERMARK_HIGH_LSB, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK = - QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_MASK, - .d_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB = - QCA6180_CE_WRAPPER_INTERRUPT_SUMMARY_HOST_MSI_LSB, - .d_CE_CTRL1_DMAX_LENGTH_LSB = QCA6180_CE_CTRL1_DMAX_LENGTH_LSB, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK = - QCA6180_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK = - QCA6180_CE_CTRL1_DST_RING_BYTE_SWAP_EN_MASK, - .d_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB = - QCA6180_CE_CTRL1_SRC_RING_BYTE_SWAP_EN_LSB, - .d_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB = - QCA6180_CE_CTRL1_DST_RING_BYTE_SWAP_EN_LSB, - .d_CE_WRAPPER_DEBUG_OFFSET = QCA6180_CE_WRAPPER_DEBUG_OFFSET, - .d_CE_WRAPPER_DEBUG_SEL_MSB = QCA6180_CE_WRAPPER_DEBUG_SEL_MSB, - .d_CE_WRAPPER_DEBUG_SEL_LSB = QCA6180_CE_WRAPPER_DEBUG_SEL_LSB, - .d_CE_WRAPPER_DEBUG_SEL_MASK = QCA6180_CE_WRAPPER_DEBUG_SEL_MASK, - .d_CE_DEBUG_OFFSET = QCA6180_CE_DEBUG_OFFSET, - .d_CE_DEBUG_SEL_MSB = QCA6180_CE_DEBUG_SEL_MSB, - .d_CE_DEBUG_SEL_LSB = QCA6180_CE_DEBUG_SEL_LSB, - .d_CE_DEBUG_SEL_MASK = QCA6180_CE_DEBUG_SEL_MASK, - .d_CE0_BASE_ADDRESS = QCA6180_CE0_BASE_ADDRESS, - .d_CE1_BASE_ADDRESS = QCA6180_CE1_BASE_ADDRESS, -}; - - -struct host_shadow_regs_s qca6180_host_shadow_regs = { - .d_A_LOCAL_SHADOW_REG_VALUE_0 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_0, - .d_A_LOCAL_SHADOW_REG_VALUE_1 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_1, - .d_A_LOCAL_SHADOW_REG_VALUE_2 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_2, - .d_A_LOCAL_SHADOW_REG_VALUE_3 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_3, - .d_A_LOCAL_SHADOW_REG_VALUE_4 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_4, - .d_A_LOCAL_SHADOW_REG_VALUE_5 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_5, - .d_A_LOCAL_SHADOW_REG_VALUE_6 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_6, - .d_A_LOCAL_SHADOW_REG_VALUE_7 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_7, - .d_A_LOCAL_SHADOW_REG_VALUE_8 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_8, - .d_A_LOCAL_SHADOW_REG_VALUE_9 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_9, - .d_A_LOCAL_SHADOW_REG_VALUE_10 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_10, - .d_A_LOCAL_SHADOW_REG_VALUE_11 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_11, - .d_A_LOCAL_SHADOW_REG_VALUE_12 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_12, - .d_A_LOCAL_SHADOW_REG_VALUE_13 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_13, - .d_A_LOCAL_SHADOW_REG_VALUE_14 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_14, - .d_A_LOCAL_SHADOW_REG_VALUE_15 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_15, - .d_A_LOCAL_SHADOW_REG_VALUE_16 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_16, - .d_A_LOCAL_SHADOW_REG_VALUE_17 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_17, - .d_A_LOCAL_SHADOW_REG_VALUE_18 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_18, - .d_A_LOCAL_SHADOW_REG_VALUE_19 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_19, - .d_A_LOCAL_SHADOW_REG_VALUE_20 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_20, - .d_A_LOCAL_SHADOW_REG_VALUE_21 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_21, - .d_A_LOCAL_SHADOW_REG_VALUE_22 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_22, - .d_A_LOCAL_SHADOW_REG_VALUE_23 = - QCA6180_A_LOCAL_SHADOW_REG_VALUE_23, - -}; - -#endif /* _QCA6180DEF_H_ */ diff --git a/core/hif/src/regtable.c b/core/hif/src/regtable.c deleted file mode 100644 index 90d8f8ef910d..000000000000 --- a/core/hif/src/regtable.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "bmi_msg.h" -#include "targaddrs.h" -#include "cepci.h" -#include "regtable.h" -#include "ar9888def.h" -#include "ar6320def.h" -#include "ar6320v2def.h" -#include "qca6180def.h" -#include "ol_if_athvar.h" -#include "hif.h" -#include "adrastea_reg_def.h" - -void target_register_tbl_attach(struct ol_softc *scn, u32 target_type) -{ - switch (target_type) { - case TARGET_TYPE_AR9888: - scn->targetdef = &ar9888_targetdef; - scn->target_ce_def = &ar9888_ce_targetdef; - break; - case TARGET_TYPE_AR6320: - scn->targetdef = &ar6320_targetdef; - scn->target_ce_def = &ar6320_ce_targetdef; - break; - case TARGET_TYPE_AR6320V2: - scn->targetdef = &ar6320v2_targetdef; - scn->target_ce_def = &ar6320v2_ce_targetdef; - break; - case TARGET_TYPE_QCA6180: - scn->targetdef = &qca6180_targetdef; - scn->target_ce_def = &qca6180_ce_targetdef; - break; - case TARGET_TYPE_ADRASTEA: - scn->targetdef = &adrastea_targetdef; - scn->target_ce_def = &adrastea_ce_targetdef; - break; - default: - break; - } -} - -void hif_register_tbl_attach(struct ol_softc *scn, u32 hif_type) -{ - switch (hif_type) { - case HIF_TYPE_AR9888: - scn->hostdef = &ar9888_hostdef; - break; - case HIF_TYPE_AR6320: - scn->hostdef = &ar6320_hostdef; - break; - case HIF_TYPE_AR6320V2: - scn->hostdef = &ar6320v2_hostdef; - break; - case HIF_TYPE_QCA6180: - scn->hostdef = &qca6180_hostdef; - scn->host_shadow_regs = &qca6180_host_shadow_regs; - break; - case HIF_TYPE_ADRASTEA: - scn->hostdef = &adrastea_hostdef; - scn->host_shadow_regs = &adrastea_host_shadow_regs; - break; - default: - break; - } -} diff --git a/core/hif/src/snoc/hif_io32_snoc.h b/core/hif/src/snoc/hif_io32_snoc.h deleted file mode 100644 index 8507c4b98d67..000000000000 --- a/core/hif/src/snoc/hif_io32_snoc.h +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: hif_io32_snoc.h - * - * snoc specific implementations and configurations - */ - -#ifndef __HIF_IO32_SNOC_H__ -#define __HIF_IO32_SNOC_H__ - -#ifdef HIF_PCI -#error snoc and pci cannot be supported in parrallel at this time -#endif - -#include "hif.h" -#include "regtable.h" -#include "ce_reg.h" -#include "cdf_atomic.h" -#include -#include "hif_main.h" -#include "hif_debug.h" - -/** - * Following features are not supported for snoc bus - * Force 0 and consider moving corresponding code into - * pci specific files - */ -#define CONFIG_ATH_PCIE_MAX_PERF 0 -#define CONFIG_ATH_PCIE_AWAKE_WHILE_DRIVER_LOAD 0 -#define CONFIG_ATH_PCIE_ACCESS_LIKELY 0 -#define CONFIG_PCIE_ENABLE_L1_CLOCK_GATE 0 - -#define A_TARGET_ACCESS_LIKELY(scn) -#define A_TARGET_ACCESS_UNLIKELY(scn) -#define A_TARGET_ACCESS_BEGIN_RET_PTR(scn) -#define A_TARGET_ACCESS_END_RET_PTR(scn) -#define A_TARGET_ACCESS_BEGIN(scn) -#define A_TARGET_ACCESS_END(scn) -#define A_TARGET_ACCESS_BEGIN_RET(scn) -#define A_TARGET_ACCESS_END_RET(scn) -#define A_TARGET_ACCESS_BEGIN_RET_EXT(scn, val) -#define A_TARGET_ACCESS_END_RET_EXT(scn, val) - -#define Q_TARGET_ACCESS_BEGIN(scn) 0 -#define Q_TARGET_ACCESS_END(scn) 0 - -static inline void hif_pci_cancel_deferred_target_sleep(struct ol_softc *scn) -{ - return; -} - -static inline void hif_target_sleep_state_adjust(struct ol_softc *scn, - bool sleep_ok, bool wait_for_it) -{ - return; -} - -/** - * soc_wake_reset() - soc_wake_reset - * @scn: ol_softc - * - * Return: void - */ -static inline void soc_wake_reset(struct ol_softc *scn) -{ -} - -/** - * hif_write32_mb - SNOC write 32 - * @addr: physical address - * @value: value - * - * Return: N/A - */ -static inline void hif_write32_mb(void __iomem *addr, uint32_t value) -{ - wmb(); /* write memory barrier */ - writel_relaxed((value), (addr)); - wmb(); /* write memory barrier */ -} - -/** - * hif_read32_mb - SNOC read 32 - * @addr: physical address - * - * Return: N/A - */ -static inline uint32_t hif_read32_mb(void __iomem *addr) -{ - uint32_t tmp; - rmb(); /* read memory barrier */ - tmp = readl_relaxed(addr); - rmb(); /* read memory barrier */ - return tmp; -} - -#define A_TARGET_READ(scn, offset) \ - hif_read32_mb(scn->mem + (offset)) -#define A_TARGET_WRITE(scn, offset, value) \ - hif_write32_mb((scn->mem + offset), (value)) - -#define ADRASTEA_CE_INTR_ENABLES 0x002F00A8 -#define ADRASTEA_CE_INTR_ENABLES_SET "COMING IN REGISTER SET36" -#define ADRASTEA_CE_INTR_ENABLES_CLEAR "COMING IN REGISTER SET36" - -#define ADRASTEA_CE_INTR_STATUS 0x002F00AC - -static inline void ce_enable_irq_in_individual_register(struct ol_softc *scn, - int ce_id) -{ - uint32_t offset; - offset = HOST_IE_ADDRESS + CE_BASE_ADDRESS(ce_id); - hif_write32_mb(scn->mem + offset, 1); - hif_read32_mb(scn->mem + offset); -} - -static inline void ce_disable_irq_in_individual_register(struct ol_softc *scn, - int ce_id) -{ - uint32_t offset; - offset = HOST_IE_ADDRESS + CE_BASE_ADDRESS(ce_id); - hif_write32_mb(scn->mem + offset, 0); - hif_read32_mb(scn->mem + offset); -} - -static inline void ce_read_irq_group_status(struct ol_softc *scn) -{ - uint32_t group_status = 0; - group_status = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_STATUS); -} - -static inline void ce_clear_irq_group_status(struct ol_softc *scn, int mask) -{ - uint32_t group_status = 0; - group_status = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_STATUS); - - hif_write32_mb(scn->mem + - ADRASTEA_CE_INTR_STATUS, mask); - - group_status = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_STATUS); -} - -/* this will need to be changed when we move to reg set 36 - * because we will have set & clear registers provided - */ -static inline void ce_enable_irq_in_group_reg(struct ol_softc *scn, - int mask) -{ - int new_mask = 0; - new_mask = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES); - - new_mask |= mask; - - hif_write32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES, new_mask); - mask = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES); -} - -/* this will need to be changed when we move to reg set 36 - * because we will have set & clear registers provided - */ -static inline void ce_disable_irq_in_group_reg(struct ol_softc *scn, - int mask) -{ - int new_mask = 0; - new_mask = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES); - - new_mask &= ~mask; - - hif_write32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES, new_mask); - mask = hif_read32_mb(scn->mem + - ADRASTEA_CE_INTR_ENABLES); -} - -/** - * ce_irq_enable() - enable copy engine IRQ - * @scn: struct ol_softc - * @ce_id: ce_id - * - * Return: N/A - */ -static inline void ce_irq_enable(struct ol_softc *scn, - int ce_id) -{ - icnss_enable_irq(ce_id); - ce_enable_irq_in_individual_register(scn, ce_id); - ce_enable_irq_in_group_reg(scn, 1<hif_hdl); - cdf_atomic_set(&scn->active_tasklet_cnt, 0); -} - -/** - * hif_dump_snoc_registers(): dump CE debug registers - * - * This function dumps CE debug registers - * - * @scn: struct ol_softc - * - * Return: void - */ -static void hif_dump_snoc_registers(struct ol_softc *scn) -{ - return; -} - -/** - * hif_dump_registers(): dump bus debug registers - * - * This function dumps hif bus debug registers - * - * @scn: struct ol_softc - * - * Return: 0 for success or error code - */ -int hif_dump_registers(struct ol_softc *scn) -{ - int status; - - status = hif_dump_ce_registers(scn); - if (status) - return status; - hif_dump_snoc_registers(scn); - - return 0; -} - -/** - * hif_bus_suspend() - suspend the bus - * - * This function suspends the bus, but snoc doesn't need to suspend. - * Therefore do nothing. - * - * Return: 0 for success and non-zero for failure - */ -int hif_bus_suspend(void) -{ - return 0; -} - -/** - * hif_bus_resume() - hif resume API - * - * This function resumes the bus. but snoc doesn't need to resume. - * Therefore do nothing. - * - * Return: 0 for success and non-zero for failure - */ -int hif_bus_resume(void) -{ - return 0; -} - -/** - * hif_enable_power_gating(): enable HW power gating - * - * Return: n/a - */ -void hif_enable_power_gating(void *hif_ctx) -{ -} - -/** - * hif_disable_aspm(): hif_disable_aspm - * - * Return: n/a - */ -void hif_disable_aspm(void) -{ -} - -/** - * hif_bus_close(): hif_bus_close - * - * Return: n/a - */ -void hif_bus_close(struct ol_softc *scn) -{ -} - -/** - * hif_bus_open(): hif_bus_open - * @scn: scn - * @bus_type: bus type - * - * Return: n/a - */ -CDF_STATUS hif_bus_open(struct ol_softc *scn, enum ath_hal_bus_type bus_type) -{ - return CDF_STATUS_SUCCESS; -} - -/** - * hif_get_target_type(): Get the target type - * - * This function is used to query the target type. - * - * @ol_sc: ol_softc struct pointer - * @dev: device pointer - * @bdev: bus dev pointer - * @bid: bus id pointer - * @hif_type: HIF type such as HIF_TYPE_QCA6180 - * @target_type: target type such as TARGET_TYPE_QCA6180 - * - * Return: 0 for success - */ -int hif_get_target_type(struct ol_softc *ol_sc, struct device *dev, - void *bdev, const hif_bus_id *bid, uint32_t *hif_type, - uint32_t *target_type) -{ - /* TODO: need to use CNSS's HW version. Hard code for now */ -#ifdef QCA_WIFI_3_0_ADRASTEA - *hif_type = HIF_TYPE_ADRASTEA; - *target_type = TARGET_TYPE_ADRASTEA; -#else - *hif_type = 0; - *target_type = 0; -#endif - return 0; -} - -/** - * hif_enable_bus(): hif_enable_bus - * @dev: dev - * @bdev: bus dev - * @bid: bus id - * @type: bus type - * - * Return: CDF_STATUS - */ -CDF_STATUS hif_enable_bus(struct ol_softc *ol_sc, - struct device *dev, void *bdev, - const hif_bus_id *bid, - enum hif_enable_type type) -{ - int ret; - int hif_type; - int target_type; - ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); - if (ret) { - HIF_ERROR("%s: failed to set dma mask error = %d", - __func__, ret); - return ret; - } - - if (!ol_sc) { - HIF_ERROR("%s: hif_ctx is NULL", __func__); - return CDF_STATUS_E_NOMEM; - } - - ol_sc->aps_osdev.device = dev; - ol_sc->aps_osdev.bc.bc_handle = (void *)ol_sc->mem; - ol_sc->aps_osdev.bc.bc_bustype = type; - - ret = hif_get_target_type(ol_sc, dev, bdev, bid, - &hif_type, &target_type); - if (ret < 0) { - HIF_ERROR("%s: invalid device id/revision_id", __func__); - return CDF_STATUS_E_FAILURE; - } - - hif_register_tbl_attach(ol_sc, hif_type); - target_register_tbl_attach(ol_sc, target_type); - - HIF_TRACE("%s: X - hif_type = 0x%x, target_type = 0x%x", - __func__, hif_type, target_type); - - ret = hif_init_cdf_ctx(ol_sc); - if (ret != 0) { - HIF_ERROR("%s: cannot init CDF", __func__); - return CDF_STATUS_E_FAILURE; - } - - return CDF_STATUS_SUCCESS; -} - -/** - * hif_disable_bus(): hif_disable_bus - * - * This function disables the bus - * - * @bdev: bus dev - * - * Return: none - */ -void hif_disable_bus(void *bdev) -{ -} - -/** - * hif_nointrs(): disable IRQ - * - * This function stops interrupt(s) - * - * @scn: struct ol_softc - * - * Return: none - */ -void hif_nointrs(struct ol_softc *scn) -{ - if (scn->request_irq_done) { - ce_unregister_irq(scn->hif_hdl, 0xfff); - scn->request_irq_done = false; - } -} diff --git a/core/htc/dl_list.h b/core/htc/dl_list.h deleted file mode 100644 index 1b5d72f780e2..000000000000 --- a/core/htc/dl_list.h +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* ============================================================================== */ -/* Double-link list definitions (adapted from Atheros SDIO stack) */ -/* */ -/* Author(s): ="Atheros" */ -/* ============================================================================== */ - -#ifndef __DL_LIST_H___ -#define __DL_LIST_H___ - -#define A_CONTAINING_STRUCT(address, struct_type, field_name) \ - ((struct_type *)((char *)(address) - (char *)(&((struct_type *)0)->field_name))) - -/* list functions */ -/* pointers for the list */ -typedef struct _DL_LIST { - struct _DL_LIST *pPrev; - struct _DL_LIST *pNext; -} DL_LIST, *PDL_LIST; -/* - * DL_LIST_INIT , initialize doubly linked list - */ -#define DL_LIST_INIT(pList) \ - {(pList)->pPrev = pList; (pList)->pNext = pList; } - -/* faster macro to init list and add a single item */ -#define DL_LIST_INIT_AND_ADD(pList,pItem) \ - { (pList)->pPrev = (pItem); \ - (pList)->pNext = (pItem); \ - (pItem)->pNext = (pList); \ - (pItem)->pPrev = (pList); \ - } - -#define DL_LIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList))) -#define DL_LIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext -#define DL_LIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev -/* - * ITERATE_OVER_LIST pStart is the list, pTemp is a temp list member - * NOT: do not use this function if the items in the list are deleted inside the - * iteration loop - */ -#define ITERATE_OVER_LIST(pStart, pTemp) \ - for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext) - -static __inline bool dl_list_is_entry_in_list(const DL_LIST *pList, - const DL_LIST *pEntry) -{ - const DL_LIST *pTmp; - - if (pList == pEntry) - return true; - - ITERATE_OVER_LIST(pList, pTmp) { - if (pTmp == pEntry) { - return true; - } - } - - return false; -} - -/* safe iterate macro that allows the item to be removed from the list - * the iteration continues to the next item in the list - */ -#define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset) \ - { \ - PDL_LIST pTemp; \ - pTemp = (pStart)->pNext; \ - while (pTemp != (pStart)) { \ - (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset); \ - pTemp = pTemp->pNext; \ - -#define ITERATE_IS_VALID(pStart) dl_list_is_entry_in_list(pStart, pTemp) -#define ITERATE_RESET(pStart) pTemp=(pStart)->pNext - -#define ITERATE_END }} - -/* - * dl_list_insert_tail - insert pAdd to the end of the list - */ -static __inline PDL_LIST dl_list_insert_tail(PDL_LIST pList, PDL_LIST pAdd) -{ - /* insert at tail */ - pAdd->pPrev = pList->pPrev; - pAdd->pNext = pList; - if (pList->pPrev) { - pList->pPrev->pNext = pAdd; - } - pList->pPrev = pAdd; - return pAdd; -} - -/* - * dl_list_insert_head - insert pAdd into the head of the list - */ -static __inline PDL_LIST dl_list_insert_head(PDL_LIST pList, PDL_LIST pAdd) -{ - /* insert at head */ - pAdd->pPrev = pList; - pAdd->pNext = pList->pNext; - pList->pNext->pPrev = pAdd; - pList->pNext = pAdd; - return pAdd; -} - -#define DL_ListAdd(pList,pItem) dl_list_insert_head((pList),(pItem)) -/* - * dl_list_remove - remove pDel from list - */ -static __inline PDL_LIST dl_list_remove(PDL_LIST pDel) -{ - if (pDel->pNext != NULL) { - pDel->pNext->pPrev = pDel->pPrev; - } - if (pDel->pPrev != NULL) { - pDel->pPrev->pNext = pDel->pNext; - } - - /* point back to itself just to be safe, incase remove is called again */ - pDel->pNext = pDel; - pDel->pPrev = pDel; - return pDel; -} - -/* - * dl_list_remove_item_from_head - get a list item from the head - */ -static __inline PDL_LIST dl_list_remove_item_from_head(PDL_LIST pList) -{ - PDL_LIST pItem = NULL; - if (pList->pNext != pList) { - pItem = pList->pNext; - /* remove the first item from head */ - dl_list_remove(pItem); - } - return pItem; -} - -static __inline PDL_LIST dl_list_remove_item_from_tail(PDL_LIST pList) -{ - PDL_LIST pItem = NULL; - if (pList->pPrev != pList) { - pItem = pList->pPrev; - /* remove the item from tail */ - dl_list_remove(pItem); - } - return pItem; -} - -/* transfer src list items to the tail of the destination list */ -static __inline void dl_list_transfer_items_to_tail(PDL_LIST pDest, PDL_LIST pSrc) -{ - /* only concatenate if src is not empty */ - if (!DL_LIST_IS_EMPTY(pSrc)) { - /* cut out circular list in src and re-attach to end of dest */ - pSrc->pPrev->pNext = pDest; - pSrc->pNext->pPrev = pDest->pPrev; - pDest->pPrev->pNext = pSrc->pNext; - pDest->pPrev = pSrc->pPrev; - /* terminate src list, it is now empty */ - pSrc->pPrev = pSrc; - pSrc->pNext = pSrc; - } -} - -/* transfer src list items to the head of the destination list */ -static __inline void dl_list_transfer_items_to_head(PDL_LIST pDest, PDL_LIST pSrc) -{ - /* only concatenate if src is not empty */ - if (!DL_LIST_IS_EMPTY(pSrc)) { - /* cut out circular list in src and re-attach to start of dest */ - pSrc->pNext->pPrev = pDest; - pDest->pNext->pPrev = pSrc->pPrev; - pSrc->pPrev->pNext = pDest->pNext; - pDest->pNext = pSrc->pNext; - /* terminate src list, it is now empty */ - pSrc->pPrev = pSrc; - pSrc->pNext = pSrc; - } -} - -#endif /* __DL_LIST_H___ */ diff --git a/core/htc/htc.c b/core/htc/htc.c deleted file mode 100644 index d065193da3b7..000000000000 --- a/core/htc/htc.c +++ /dev/null @@ -1,881 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "ol_if_athvar.h" -#include "htc_debug.h" -#include "htc_internal.h" -#include /* cdf_nbuf_t */ -#include /* cdf_print */ -#include -#include "epping_main.h" -#include "hif_io32.h" -#include "cds_concurrency.h" -#include - -#ifdef DEBUG -static ATH_DEBUG_MASK_DESCRIPTION g_htc_debug_description[] = { - {ATH_DEBUG_SEND, "Send"}, - {ATH_DEBUG_RECV, "Recv"}, - {ATH_DEBUG_SYNC, "Sync"}, - {ATH_DEBUG_DUMP, "Dump Data (RX or TX)"}, - {ATH_DEBUG_SETUP, "Setup"}, -}; - -ATH_DEBUG_INSTANTIATE_MODULE_VAR(htc, - "htc", - "Host Target Communications", - ATH_DEBUG_MASK_DEFAULTS | ATH_DEBUG_INFO | - ATH_DEBUG_SETUP, - ATH_DEBUG_DESCRIPTION_COUNT - (g_htc_debug_description), - g_htc_debug_description); - -#endif - -extern unsigned int htc_credit_flow; - -static void reset_endpoint_states(HTC_TARGET *target); - -static void destroy_htc_tx_ctrl_packet(HTC_PACKET *pPacket) -{ - cdf_nbuf_t netbuf; - netbuf = (cdf_nbuf_t) GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("free ctrl netbuf :0x%p \n", netbuf)); - if (netbuf != NULL) { - cdf_nbuf_free(netbuf); - } - - cdf_mem_free(pPacket); -} - -static HTC_PACKET *build_htc_tx_ctrl_packet(cdf_device_t osdev) -{ - HTC_PACKET *pPacket = NULL; - cdf_nbuf_t netbuf; - - do { - pPacket = (HTC_PACKET *) cdf_mem_malloc(sizeof(HTC_PACKET)); - if (NULL == pPacket) { - break; - } - A_MEMZERO(pPacket, sizeof(HTC_PACKET)); - netbuf = - cdf_nbuf_alloc(osdev, HTC_CONTROL_BUFFER_SIZE, 20, 4, true); - if (NULL == netbuf) { - cdf_mem_free(pPacket); - pPacket = NULL; - cdf_print("%s: nbuf alloc failed\n", __func__); - break; - } - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("alloc ctrl netbuf :0x%p \n", netbuf)); - SET_HTC_PACKET_NET_BUF_CONTEXT(pPacket, netbuf); - } while (false); - - return pPacket; -} - -void htc_free_control_tx_packet(HTC_TARGET *target, HTC_PACKET *pPacket) -{ - -#ifdef TODO_FIXME - LOCK_HTC(target); - HTC_PACKET_ENQUEUE(&target->ControlBufferTXFreeList, pPacket); - UNLOCK_HTC(target); - /* TODO_FIXME netbufs cannot be RESET! */ -#else - destroy_htc_tx_ctrl_packet(pPacket); -#endif - -} - -HTC_PACKET *htc_alloc_control_tx_packet(HTC_TARGET *target) -{ -#ifdef TODO_FIXME - HTC_PACKET *pPacket; - - LOCK_HTC(target); - pPacket = htc_packet_dequeue(&target->ControlBufferTXFreeList); - UNLOCK_HTC(target); - - return pPacket; -#else - return build_htc_tx_ctrl_packet(target->osdev); -#endif -} - -/* Set the target failure handling callback */ -void htc_set_target_failure_callback(HTC_HANDLE HTCHandle, - HTC_TARGET_FAILURE Callback) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - target->HTCInitInfo.TargetFailure = Callback; -} - -void htc_dump(HTC_HANDLE HTCHandle, uint8_t CmdId, bool start) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - hif_dump(target->hif_dev, CmdId, start); -} - -/* cleanup the HTC instance */ -static void htc_cleanup(HTC_TARGET *target) -{ - HTC_PACKET *pPacket; - /* cdf_nbuf_t netbuf; */ - - if (target->hif_dev != NULL) { - hif_detach_htc(target->hif_dev); - target->hif_dev = NULL; - } - - while (true) { - pPacket = allocate_htc_packet_container(target); - if (NULL == pPacket) { - break; - } - cdf_mem_free(pPacket); - } - - pPacket = target->pBundleFreeList; - while (pPacket) { - HTC_PACKET *pPacketTmp = (HTC_PACKET *) pPacket->ListLink.pNext; - cdf_mem_free(pPacket); - pPacket = pPacketTmp; - } -#ifdef TODO_FIXME - while (true) { - pPacket = htc_alloc_control_tx_packet(target); - if (NULL == pPacket) { - break; - } - netbuf = (cdf_nbuf_t) GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - if (netbuf != NULL) { - cdf_nbuf_free(netbuf); - } - - cdf_mem_free(pPacket); - } -#endif - - cdf_spinlock_destroy(&target->HTCLock); - cdf_spinlock_destroy(&target->HTCRxLock); - cdf_spinlock_destroy(&target->HTCTxLock); - cdf_spinlock_destroy(&target->HTCCreditLock); - - /* free our instance */ - cdf_mem_free(target); -} - -/* registered target arrival callback from the HIF layer */ -HTC_HANDLE htc_create(void *ol_sc, HTC_INIT_INFO *pInfo, cdf_device_t osdev) -{ - struct hif_msg_callbacks htcCallbacks; - HTC_ENDPOINT *pEndpoint = NULL; - HTC_TARGET *target = NULL; - int i; - - if (ol_sc == NULL) { - HTC_ERROR("%s: ol_sc = NULL", __func__); - return NULL; - } - HTC_TRACE("+htc_create .. HIF :%p", ol_sc); - - A_REGISTER_MODULE_DEBUG_INFO(htc); - - target = (HTC_TARGET *) cdf_mem_malloc(sizeof(HTC_TARGET)); - if (target == NULL) { - HTC_ERROR("%s: Unable to allocate memory", __func__); - return NULL; - } - - A_MEMZERO(target, sizeof(HTC_TARGET)); - - htc_runtime_pm_init(target); - cdf_spinlock_init(&target->HTCLock); - cdf_spinlock_init(&target->HTCRxLock); - cdf_spinlock_init(&target->HTCTxLock); - cdf_spinlock_init(&target->HTCCreditLock); - - do { - A_MEMCPY(&target->HTCInitInfo, pInfo, sizeof(HTC_INIT_INFO)); - target->host_handle = pInfo->pContext; - target->osdev = osdev; - - reset_endpoint_states(target); - - INIT_HTC_PACKET_QUEUE(&target->ControlBufferTXFreeList); - - for (i = 0; i < HTC_PACKET_CONTAINER_ALLOCATION; i++) { - HTC_PACKET *pPacket = - (HTC_PACKET *) cdf_mem_malloc(sizeof(HTC_PACKET)); - if (pPacket != NULL) { - A_MEMZERO(pPacket, sizeof(HTC_PACKET)); - free_htc_packet_container(target, pPacket); - } - } - -#ifdef TODO_FIXME - for (i = 0; i < NUM_CONTROL_TX_BUFFERS; i++) { - pPacket = build_htc_tx_ctrl_packet(); - if (NULL == pPacket) { - break; - } - htc_free_control_tx_packet(target, pPacket); - } -#endif - - /* setup HIF layer callbacks */ - cdf_mem_zero(&htcCallbacks, sizeof(struct hif_msg_callbacks)); - htcCallbacks.Context = target; - htcCallbacks.rxCompletionHandler = htc_rx_completion_handler; - htcCallbacks.txCompletionHandler = htc_tx_completion_handler; - htcCallbacks.txResourceAvailHandler = htc_tx_resource_avail_handler; - htcCallbacks.fwEventHandler = htc_fw_event_handler; - target->hif_dev = ol_sc; - - /* Get HIF default pipe for HTC message exchange */ - pEndpoint = &target->endpoint[ENDPOINT_0]; - - hif_post_init(target->hif_dev, target, &htcCallbacks); - hif_get_default_pipe(target->hif_dev, &pEndpoint->UL_PipeID, - &pEndpoint->DL_PipeID); - - } while (false); - - htc_recv_init(target); - - HTC_TRACE("-htc_create: (0x%p)", target); - - return (HTC_HANDLE) target; -} - -void htc_destroy(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("+htc_destroy .. Destroying :0x%p\n", target)); - hif_stop(htc_get_hif_device(HTCHandle)); - if (target) - htc_cleanup(target); - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-htc_destroy\n")); -} - -/* get the low level HIF device for the caller , the caller may wish to do low level - * HIF requests */ -void *htc_get_hif_device(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - return target->hif_dev; -} - -void htc_control_tx_complete(void *Context, HTC_PACKET *pPacket) -{ - HTC_TARGET *target = (HTC_TARGET *) Context; - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("+-htc_control_tx_complete 0x%p (l:%d) \n", pPacket, - pPacket->ActualLength)); - htc_free_control_tx_packet(target, pPacket); -} - -/* TODO, this is just a temporary max packet size */ -#define MAX_MESSAGE_SIZE 1536 - -/** - * htc_setup_target_buffer_assignments() - setup target buffer assignments - * @target: HTC Target Pointer - * - * Return: A_STATUS - */ -A_STATUS htc_setup_target_buffer_assignments(HTC_TARGET *target) -{ - HTC_SERVICE_TX_CREDIT_ALLOCATION *pEntry; - A_STATUS status; - int credits; - int creditsPerMaxMsg; - - creditsPerMaxMsg = MAX_MESSAGE_SIZE / target->TargetCreditSize; - if (MAX_MESSAGE_SIZE % target->TargetCreditSize) { - creditsPerMaxMsg++; - } - - /* TODO, this should be configured by the caller! */ - - credits = target->TotalTransmitCredits; - pEntry = &target->ServiceTxAllocTable[0]; - - /* - * Allocate all credists/HTC buffers to WMI. - * no buffers are used/required for data. data always - * remains on host. - */ - status = A_OK; - pEntry++; - pEntry->service_id = WMI_CONTROL_SVC; - pEntry->CreditAllocation = credits; - - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { - /* endpoint ping is a testing tool directly on top of HTC in - * both target and host sides. - * In target side, the endppint ping fw has no wlan stack and the - * FW mboxping app directly sits on HTC and it simply drops - * or loops back TX packets. For rx perf, FW mboxping app - * generates packets and passes packets to HTC to send to host. - * There is no WMI mesage exchanges between host and target - * in endpoint ping case. - * In host side, the endpoint ping driver is a Ethernet driver - * and it directly sits on HTC. Only HIF, HTC, CDF, ADF are - * used by the endpoint ping driver. There is no wifi stack - * at all in host side also. For tx perf use case, - * the user space mboxping app sends the raw packets to endpoint - * ping driver and it directly forwards to HTC for transmission - * to stress the bus. For the rx perf, HTC passes the received - * packets to endpoint ping driver and it is passed to the user - * space through the Ethernet interface. - * For credit allocation, in SDIO bus case, only BE service is - * used for tx/rx perf testing so that all credits are given - * to BE service. In PCIe and USB bus case, endpoint ping uses both - * BE and BK services to stress the bus so that the total credits - * are equally distributed to BE and BK services. - */ - pEntry->service_id = WMI_DATA_BE_SVC; - pEntry->CreditAllocation = (credits >> 1); - - pEntry++; - pEntry->service_id = WMI_DATA_BK_SVC; - pEntry->CreditAllocation = (credits >> 1); - } - - if (A_SUCCESS(status)) { - int i; - for (i = 0; i < HTC_MAX_SERVICE_ALLOC_ENTRIES; i++) { - if (target->ServiceTxAllocTable[i].service_id != 0) { - AR_DEBUG_PRINTF(ATH_DEBUG_INIT, - ("HTC Service Index : %d TX : 0x%2.2X : alloc:%d\n", - i, - target->ServiceTxAllocTable[i]. - service_id, - target->ServiceTxAllocTable[i]. - CreditAllocation)); - } - } - } - - return status; -} - -A_UINT8 htc_get_credit_allocation(HTC_TARGET *target, A_UINT16 service_id) -{ - A_UINT8 allocation = 0; - int i; - - for (i = 0; i < HTC_MAX_SERVICE_ALLOC_ENTRIES; i++) { - if (target->ServiceTxAllocTable[i].service_id == service_id) { - allocation = - target->ServiceTxAllocTable[i].CreditAllocation; - } - } - - if (0 == allocation) { - AR_DEBUG_PRINTF(ATH_DEBUG_INIT, - ("HTC Service TX : 0x%2.2X : allocation is zero!\n", - service_id)); - } - - return allocation; -} - -A_STATUS htc_wait_target(HTC_HANDLE HTCHandle) -{ - A_STATUS status = A_OK; - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_READY_EX_MSG *pReadyMsg; - HTC_SERVICE_CONNECT_REQ connect; - HTC_SERVICE_CONNECT_RESP resp; - HTC_READY_MSG *rdy_msg; - A_UINT16 htc_rdy_msg_id; - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("htc_wait_target - Enter (target:0x%p) \n", HTCHandle)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("+HWT\n")); - - do { - - status = hif_start(target->hif_dev); - if (A_FAILED(status)) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("hif_start failed\n")); - break; - } - - status = htc_wait_recv_ctrl_message(target); - - if (A_FAILED(status)) { - break; - } - - if (target->CtrlResponseLength < (sizeof(HTC_READY_EX_MSG))) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("Invalid HTC Ready Msg Len:%d! \n", - target->CtrlResponseLength)); - status = A_ECOMM; - break; - } - - pReadyMsg = (HTC_READY_EX_MSG *) target->CtrlResponseBuffer; - - rdy_msg = &pReadyMsg->Version2_0_Info; - htc_rdy_msg_id = - HTC_GET_FIELD(rdy_msg, HTC_READY_MSG, MESSAGEID); - if (htc_rdy_msg_id != HTC_MSG_READY_ID) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("Invalid HTC Ready Msg : 0x%X ! \n", - htc_rdy_msg_id)); - status = A_ECOMM; - break; - } - - target->TotalTransmitCredits = - HTC_GET_FIELD(rdy_msg, HTC_READY_MSG, CREDITCOUNT); - target->TargetCreditSize = - (int)HTC_GET_FIELD(rdy_msg, HTC_READY_MSG, CREDITSIZE); - target->MaxMsgsPerHTCBundle = - (A_UINT8) pReadyMsg->MaxMsgsPerHTCBundle; - /* for old fw this value is set to 0. But the minimum value should be 1, - * i.e., no bundling */ - if (target->MaxMsgsPerHTCBundle < 1) - target->MaxMsgsPerHTCBundle = 1; - - AR_DEBUG_PRINTF(ATH_DEBUG_INIT, - ("Target Ready! : transmit resources : %d size:%d, MaxMsgsPerHTCBundle = %d\n", - target->TotalTransmitCredits, - target->TargetCreditSize, - target->MaxMsgsPerHTCBundle)); - - if ((0 == target->TotalTransmitCredits) - || (0 == target->TargetCreditSize)) { - status = A_ECOMM; - break; - } - /* done processing */ - target->CtrlResponseProcessing = false; - - htc_setup_target_buffer_assignments(target); - - /* setup our pseudo HTC control endpoint connection */ - A_MEMZERO(&connect, sizeof(connect)); - A_MEMZERO(&resp, sizeof(resp)); - connect.EpCallbacks.pContext = target; - connect.EpCallbacks.EpTxComplete = htc_control_tx_complete; - connect.EpCallbacks.EpRecv = htc_control_rx_complete; - connect.MaxSendQueueDepth = NUM_CONTROL_TX_BUFFERS; - connect.service_id = HTC_CTRL_RSVD_SVC; - - /* connect fake service */ - status = htc_connect_service((HTC_HANDLE) target, - &connect, &resp); - - } while (false); - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htc_wait_target - Exit (%d)\n", status)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("-HWT\n")); - return status; -} - -/* start HTC, this is called after all services are connected */ -static A_STATUS htc_config_target_hif_pipe(HTC_TARGET *target) -{ - - return A_OK; -} - -static void reset_endpoint_states(HTC_TARGET *target) -{ - HTC_ENDPOINT *pEndpoint; - int i; - - for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - pEndpoint->service_id = 0; - pEndpoint->MaxMsgLength = 0; - pEndpoint->MaxTxQueueDepth = 0; - pEndpoint->Id = i; - INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue); - INIT_HTC_PACKET_QUEUE(&pEndpoint->TxLookupQueue); - INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBufferHoldQueue); - pEndpoint->target = target; - /* pEndpoint->TxCreditFlowEnabled = (A_BOOL)htc_credit_flow; */ - pEndpoint->TxCreditFlowEnabled = (A_BOOL) 1; - cdf_atomic_init(&pEndpoint->TxProcessCount); - } -} - -A_STATUS htc_start(HTC_HANDLE HTCHandle) -{ - cdf_nbuf_t netbuf; - A_STATUS status = A_OK; - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_SETUP_COMPLETE_EX_MSG *pSetupComp; - HTC_PACKET *pSendPacket; - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htc_start Enter\n")); - - do { - - htc_config_target_hif_pipe(target); - - /* allocate a buffer to send */ - pSendPacket = htc_alloc_control_tx_packet(target); - if (NULL == pSendPacket) { - AR_DEBUG_ASSERT(false); - cdf_print("%s: allocControlTxPacket failed\n", - __func__); - status = A_NO_MEMORY; - break; - } - - netbuf = - (cdf_nbuf_t) GET_HTC_PACKET_NET_BUF_CONTEXT(pSendPacket); - /* assemble setup complete message */ - cdf_nbuf_put_tail(netbuf, sizeof(HTC_SETUP_COMPLETE_EX_MSG)); - pSetupComp = - (HTC_SETUP_COMPLETE_EX_MSG *) cdf_nbuf_data(netbuf); - A_MEMZERO(pSetupComp, sizeof(HTC_SETUP_COMPLETE_EX_MSG)); - - HTC_SET_FIELD(pSetupComp, HTC_SETUP_COMPLETE_EX_MSG, - MESSAGEID, HTC_MSG_SETUP_COMPLETE_EX_ID); - - if (!htc_credit_flow) { - AR_DEBUG_PRINTF(ATH_DEBUG_INIT, - ("HTC will not use TX credit flow control\n")); - pSetupComp->SetupFlags |= - HTC_SETUP_COMPLETE_FLAGS_DISABLE_TX_CREDIT_FLOW; - } else { - AR_DEBUG_PRINTF(ATH_DEBUG_INIT, - ("HTC using TX credit flow control\n")); - } - -#ifdef HIF_SDIO -#if ENABLE_BUNDLE_RX - if (HTC_ENABLE_BUNDLE(target)) - pSetupComp->SetupFlags |= - HTC_SETUP_COMPLETE_FLAGS_ENABLE_BUNDLE_RECV; -#endif /* ENABLE_BUNDLE_RX */ -#endif /* HIF_SDIO */ - - SET_HTC_PACKET_INFO_TX(pSendPacket, - NULL, - (A_UINT8 *) pSetupComp, - sizeof(HTC_SETUP_COMPLETE_EX_MSG), - ENDPOINT_0, HTC_SERVICE_TX_PACKET_TAG); - - status = htc_send_pkt((HTC_HANDLE) target, pSendPacket); - if (A_FAILED(status)) { - break; - } - - } while (false); - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htc_start Exit\n")); - return status; -} - -/*flush all queued buffers for surpriseremove case*/ -void htc_flush_surprise_remove(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - int i; - HTC_ENDPOINT *pEndpoint; -#ifdef RX_SG_SUPPORT - cdf_nbuf_t netbuf; - cdf_nbuf_queue_t *rx_sg_queue = &target->RxSgQueue; -#endif - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+htc_flush_surprise_remove \n")); - - /* cleanup endpoints */ - for (i = 0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - htc_flush_rx_hold_queue(target, pEndpoint); - htc_flush_endpoint_tx(target, pEndpoint, HTC_TX_PACKET_TAG_ALL); - } - - hif_flush_surprise_remove(target->hif_dev); - -#ifdef RX_SG_SUPPORT - LOCK_HTC_RX(target); - while ((netbuf = cdf_nbuf_queue_remove(rx_sg_queue)) != NULL) { - cdf_nbuf_free(netbuf); - } - RESET_RX_SG_CONFIG(target); - UNLOCK_HTC_RX(target); -#endif - - reset_endpoint_states(target); - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-htc_flush_surprise_remove \n")); -} - -/* stop HTC communications, i.e. stop interrupt reception, and flush all queued buffers */ -void htc_stop(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - int i; - HTC_ENDPOINT *pEndpoint; -#ifdef RX_SG_SUPPORT - cdf_nbuf_t netbuf; - cdf_nbuf_queue_t *rx_sg_queue = &target->RxSgQueue; -#endif - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+htc_stop \n")); - - /* cleanup endpoints */ - for (i = 0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - htc_flush_rx_hold_queue(target, pEndpoint); - htc_flush_endpoint_tx(target, pEndpoint, HTC_TX_PACKET_TAG_ALL); - if (pEndpoint->ul_is_polled) { - cdf_softirq_timer_cancel(&pEndpoint->ul_poll_timer); - cdf_softirq_timer_free(&pEndpoint->ul_poll_timer); - } - } - - /* Note: htc_flush_endpoint_tx for all endpoints should be called before - * hif_stop - otherwise htc_tx_completion_handler called from - * hif_send_buffer_cleanup_on_pipe for residual tx frames in HIF layer, - * might queue the packet again to HIF Layer - which could cause tx - * buffer leak - */ - - hif_stop(target->hif_dev); - -#ifdef RX_SG_SUPPORT - LOCK_HTC_RX(target); - while ((netbuf = cdf_nbuf_queue_remove(rx_sg_queue)) != NULL) { - cdf_nbuf_free(netbuf); - } - RESET_RX_SG_CONFIG(target); - UNLOCK_HTC_RX(target); -#endif - - reset_endpoint_states(target); - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-htc_stop\n")); -} - -/** - * htc_runtime_pm_init(): runtime pm related intialization - * - * need to initialize a work item. - */ -void htc_runtime_pm_init(HTC_TARGET *target) -{ - cdf_create_work(&target->queue_kicker, htc_kick_queues, target); -} - -/** - * htc_runtime_suspend(): ensure htc is ready to suspend - * - * htc is ready to suspend if there are no pending pactets - * in the txrx queues. - * - * Return: 0 on success or -EBUSY if there are queued packets. - */ -int htc_runtime_suspend(void) -{ - ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); - - if (txrx_pdev == NULL) { - HTC_ERROR("%s: txrx context null", __func__); - return CDF_STATUS_E_FAULT; - } - - if (ol_txrx_get_tx_pending(txrx_pdev)) - return -EBUSY; - else - return 0; -} - -/** - * htc_runtime_resume(): resume htc - * - * The htc message queue needs to be kicked off after - * a runtime resume. Otherwise messages would get stuck. - * - * Return: 0 for success; - */ -int htc_runtime_resume(void) -{ - HTC_HANDLE htc_ctx = cds_get_context(CDF_MODULE_ID_HTC); - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(htc_ctx); - - if (target == NULL) - return 0; - - cdf_schedule_work(&target->queue_kicker); - return 0; -} - -void htc_dump_credit_states(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - int i; - - for (i = 0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - if (0 == pEndpoint->service_id) - continue; - - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - ("--- EP : %d service_id: 0x%X --------------\n", - pEndpoint->Id, pEndpoint->service_id)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - (" TxCredits : %d\n", - pEndpoint->TxCredits)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - (" TxCreditSize : %d\n", - pEndpoint->TxCreditSize)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - (" TxCreditsPerMaxMsg : %d\n", - pEndpoint->TxCreditsPerMaxMsg)); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - (" TxQueueDepth : %d\n", - HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue))); - AR_DEBUG_PRINTF(ATH_DEBUG_ANY, - ("----------------------------------------------------\n")); - } -} - -A_BOOL htc_get_endpoint_statistics(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint, - HTC_ENDPOINT_STAT_ACTION Action, - HTC_ENDPOINT_STATS *pStats) -{ -#ifdef HTC_EP_STAT_PROFILING - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - A_BOOL clearStats = false; - A_BOOL sample = false; - - switch (Action) { - case HTC_EP_STAT_SAMPLE: - sample = true; - break; - case HTC_EP_STAT_SAMPLE_AND_CLEAR: - sample = true; - clearStats = true; - break; - case HTC_EP_STAT_CLEAR: - clearStats = true; - break; - default: - break; - } - - A_ASSERT(Endpoint < ENDPOINT_MAX); - - /* lock out TX and RX while we sample and/or clear */ - LOCK_HTC_TX(target); - LOCK_HTC_RX(target); - - if (sample) { - A_ASSERT(pStats != NULL); - /* return the stats to the caller */ - A_MEMCPY(pStats, &target->endpoint[Endpoint].endpoint_stats, - sizeof(HTC_ENDPOINT_STATS)); - } - - if (clearStats) { - /* reset stats */ - A_MEMZERO(&target->endpoint[Endpoint].endpoint_stats, - sizeof(HTC_ENDPOINT_STATS)); - } - - UNLOCK_HTC_RX(target); - UNLOCK_HTC_TX(target); - - return true; -#else - return false; -#endif -} - -void *htc_get_targetdef(HTC_HANDLE htc_handle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(htc_handle); - - return hif_get_targetdef(target->hif_dev); -} - -/** - * htc_set_target_to_sleep() - set target to sleep - * @context: ol_softc context - * - * Return: none - */ -void htc_set_target_to_sleep(void *context) -{ - struct ol_softc *scn = (struct ol_softc *)context; - - hif_set_target_sleep(scn, true, false); -} - -/** - * htc_cancel_deferred_target_sleep() - cancel deferred target sleep - * @context: ol_softc context - * - * Return: none - */ -void htc_cancel_deferred_target_sleep(void *context) -{ - struct ol_softc *scn = (struct ol_softc *)context; - hif_cancel_deferred_target_sleep(scn); -} - -#ifdef IPA_OFFLOAD -/** - * htc_ipa_get_ce_resource() - get uc resource on lower layer - * @htc_handle: htc context - * @ce_sr_base_paddr: copyengine source ring base physical address - * @ce_sr_ring_size: copyengine source ring size - * @ce_reg_paddr: copyengine register physical address - * - * Return: None - */ -void htc_ipa_get_ce_resource(HTC_HANDLE htc_handle, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(htc_handle); - - if (target->hif_dev != NULL) { - hif_ipa_get_ce_resource(target->hif_dev, - ce_sr_base_paddr, - ce_sr_ring_size, ce_reg_paddr); - } -} -#endif /* IPA_OFFLOAD */ diff --git a/core/htc/htc_api.h b/core/htc/htc_api.h deleted file mode 100644 index 94b38296a5c3..000000000000 --- a/core/htc/htc_api.h +++ /dev/null @@ -1,718 +0,0 @@ -/* - * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _HTC_API_H_ -#define _HTC_API_H_ - -#include -#include "osapi_linux.h" -#include "htc_packet.h" -#include -#include -#include /* cdf_device_t */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* TODO.. for BMI */ -#define ENDPOINT1 0 -/* TODO -remove me, but we have to fix BMI first */ -#define HTC_MAILBOX_NUM_MAX 4 - -/* this is the amount of header room required by users of HTC */ -#define HTC_HEADER_LEN HTC_HDR_LENGTH - -typedef void *HTC_HANDLE; - -typedef A_UINT16 HTC_SERVICE_ID; - -typedef void (*HTC_TARGET_FAILURE)(void *Instance, CDF_STATUS Status); - -typedef struct _HTC_INIT_INFO { - void *pContext; /* context for target notifications */ - void (*TargetFailure)(void *Instance, CDF_STATUS Status); - void (*TargetSendSuspendComplete)(void *ctx); -} HTC_INIT_INFO; - -/* Struct for HTC layer packet stats*/ -struct ol_ath_htc_stats { - int htc_get_pkt_q_fail_count; - int htc_pkt_q_empty_count; - int htc_send_q_empty_count; -}; - -/* To resume HTT Tx queue during runtime resume */ -typedef void (*HTC_EP_RESUME_TX_QUEUE)(void *); - -/* per service connection send completion */ -typedef void (*HTC_EP_SEND_PKT_COMPLETE)(void *, HTC_PACKET *); -/* per service connection callback when a plurality of packets have been sent - * The HTC_PACKET_QUEUE is a temporary queue object (e.g. freed on return from the callback) - * to hold a list of completed send packets. - * If the handler cannot fully traverse the packet queue before returning, it should - * transfer the items of the queue into the caller's private queue using: - * HTC_PACKET_ENQUEUE() */ -typedef void (*HTC_EP_SEND_PKT_COMP_MULTIPLE)(void *, - HTC_PACKET_QUEUE *); -/* per service connection pkt received */ -typedef void (*HTC_EP_RECV_PKT)(void *, HTC_PACKET *); -/* per service connection callback when a plurality of packets are received - * The HTC_PACKET_QUEUE is a temporary queue object (e.g. freed on return from the callback) - * to hold a list of recv packets. - * If the handler cannot fully traverse the packet queue before returning, it should - * transfer the items of the queue into the caller's private queue using: - * HTC_PACKET_ENQUEUE() */ -typedef void (*HTC_EP_RECV_PKT_MULTIPLE)(void *, HTC_PACKET_QUEUE *); - -/* Optional per service connection receive buffer re-fill callback, - * On some OSes (like Linux) packets are allocated from a global pool and indicated up - * to the network stack. The driver never gets the packets back from the OS. For these OSes - * a refill callback can be used to allocate and re-queue buffers into HTC. - * - * On other OSes, the network stack can call into the driver's OS-specifc "return_packet" handler and - * the driver can re-queue these buffers into HTC. In this regard a refill callback is - * unnecessary */ -typedef void (*HTC_EP_RECV_REFILL)(void *, HTC_ENDPOINT_ID Endpoint); - -/* Optional per service connection receive buffer allocation callback. - * On some systems packet buffers are an extremely limited resource. Rather than - * queue largest-possible-sized buffers to HTC, some systems would rather - * allocate a specific size as the packet is received. The trade off is - * slightly more processing (callback invoked for each RX packet) - * for the benefit of committing fewer buffer resources into HTC. - * - * The callback is provided the length of the pending packet to fetch. This includes the - * HTC header length plus the length of payload. The callback can return a pointer to - * the allocated HTC packet for immediate use. - * - * Alternatively a variant of this handler can be used to allocate large receive packets as needed. - * For example an application can use the refill mechanism for normal packets and the recv-alloc mechanism to - * handle the case where a large packet buffer is required. This can significantly reduce the - * amount of "committed" memory used to receive packets. - * - * */ -typedef HTC_PACKET *(*HTC_EP_RECV_ALLOC)(void *, - HTC_ENDPOINT_ID Endpoint, - int Length); - -typedef enum _HTC_SEND_FULL_ACTION { - HTC_SEND_FULL_KEEP = 0, /* packet that overflowed should be kept in the queue */ - HTC_SEND_FULL_DROP = 1, /* packet that overflowed should be dropped */ -} HTC_SEND_FULL_ACTION; - -/* Optional per service connection callback when a send queue is full. This can occur if the - * host continues queueing up TX packets faster than credits can arrive - * To prevent the host (on some Oses like Linux) from continuously queueing packets - * and consuming resources, this callback is provided so that that the host - * can disable TX in the subsystem (i.e. network stack). - * This callback is invoked for each packet that "overflows" the HTC queue. The callback can - * determine whether the new packet that overflowed the queue can be kept (HTC_SEND_FULL_KEEP) or - * dropped (HTC_SEND_FULL_DROP). If a packet is dropped, the EpTxComplete handler will be called - * and the packet's status field will be set to A_NO_RESOURCE. - * Other OSes require a "per-packet" indication for each completed TX packet, this - * closed loop mechanism will prevent the network stack from overunning the NIC - * The packet to keep or drop is passed for inspection to the registered handler the handler - * must ONLY inspect the packet, it may not free or reclaim the packet. */ -typedef HTC_SEND_FULL_ACTION (*HTC_EP_SEND_QUEUE_FULL)(void *, - HTC_PACKET * - pPacket); - -typedef struct _HTC_EP_CALLBACKS { - void *pContext; /* context for each callback */ - HTC_EP_SEND_PKT_COMPLETE EpTxComplete; /* tx completion callback for connected endpoint */ - HTC_EP_RECV_PKT EpRecv; /* receive callback for connected endpoint */ - HTC_EP_RECV_REFILL EpRecvRefill; /* OPTIONAL receive re-fill callback for connected endpoint */ - HTC_EP_SEND_QUEUE_FULL EpSendFull; /* OPTIONAL send full callback */ - HTC_EP_RECV_ALLOC EpRecvAlloc; /* OPTIONAL recv allocation callback */ - HTC_EP_RECV_ALLOC EpRecvAllocThresh; /* OPTIONAL recv allocation callback based on a threshold */ - HTC_EP_SEND_PKT_COMP_MULTIPLE EpTxCompleteMultiple; /* OPTIONAL completion handler for multiple complete - indications (EpTxComplete must be NULL) */ - HTC_EP_RECV_PKT_MULTIPLE EpRecvPktMultiple; /* OPTIONAL completion handler for multiple - recv packet indications (EpRecv must be NULL) */ - HTC_EP_RESUME_TX_QUEUE ep_resume_tx_queue; - int RecvAllocThreshold; /* if EpRecvAllocThresh is non-NULL, HTC will compare the - threshold value to the current recv packet length and invoke - the EpRecvAllocThresh callback to acquire a packet buffer */ - int RecvRefillWaterMark; /* if a EpRecvRefill handler is provided, this value - can be used to set a trigger refill callback - when the recv queue drops below this value - if set to 0, the refill is only called when packets - are empty */ -} HTC_EP_CALLBACKS; - -/* service connection information */ -typedef struct _HTC_SERVICE_CONNECT_REQ { - HTC_SERVICE_ID service_id; /* service ID to connect to */ - A_UINT16 ConnectionFlags; /* connection flags, see htc protocol definition */ - A_UINT8 *pMetaData; /* ptr to optional service-specific meta-data */ - A_UINT8 MetaDataLength; /* optional meta data length */ - HTC_EP_CALLBACKS EpCallbacks; /* endpoint callbacks */ - int MaxSendQueueDepth; /* maximum depth of any send queue */ - A_UINT32 LocalConnectionFlags; /* HTC flags for the host-side (local) connection */ - unsigned int MaxSendMsgSize; /* override max message size in send direction */ -} HTC_SERVICE_CONNECT_REQ; - -#define HTC_LOCAL_CONN_FLAGS_ENABLE_SEND_BUNDLE_PADDING (1 << 0) /* enable send bundle padding for this endpoint */ - -/* service connection response information */ -typedef struct _HTC_SERVICE_CONNECT_RESP { - A_UINT8 *pMetaData; /* caller supplied buffer to optional meta-data */ - A_UINT8 BufferLength; /* length of caller supplied buffer */ - A_UINT8 ActualLength; /* actual length of meta data */ - HTC_ENDPOINT_ID Endpoint; /* endpoint to communicate over */ - unsigned int MaxMsgLength; /* max length of all messages over this endpoint */ - A_UINT8 ConnectRespCode; /* connect response code from target */ -} HTC_SERVICE_CONNECT_RESP; - -/* endpoint distribution structure */ -typedef struct _HTC_ENDPOINT_CREDIT_DIST { - struct _HTC_ENDPOINT_CREDIT_DIST *pNext; - struct _HTC_ENDPOINT_CREDIT_DIST *pPrev; - HTC_SERVICE_ID service_id; /* Service ID (set by HTC) */ - HTC_ENDPOINT_ID Endpoint; /* endpoint for this distribution struct (set by HTC) */ - A_UINT32 DistFlags; /* distribution flags, distribution function can - set default activity using SET_EP_ACTIVE() macro */ - int TxCreditsNorm; /* credits for normal operation, anything above this - indicates the endpoint is over-subscribed, this field - is only relevant to the credit distribution function */ - int TxCreditsMin; /* floor for credit distribution, this field is - only relevant to the credit distribution function */ - int TxCreditsAssigned; /* number of credits assigned to this EP, this field - is only relevant to the credit dist function */ - int TxCredits; /* current credits available, this field is used by - HTC to determine whether a message can be sent or - must be queued */ - int TxCreditsToDist; /* pending credits to distribute on this endpoint, this - is set by HTC when credit reports arrive. - The credit distribution functions sets this to zero - when it distributes the credits */ - int TxCreditsSeek; /* this is the number of credits that the current pending TX - packet needs to transmit. This is set by HTC when - and endpoint needs credits in order to transmit */ - int TxCreditSize; /* size in bytes of each credit (set by HTC) */ - int TxCreditsPerMaxMsg; /* credits required for a maximum sized messages (set by HTC) */ - void *pHTCReserved; /* reserved for HTC use */ - int TxQueueDepth; /* current depth of TX queue , i.e. messages waiting for credits - This field is valid only when HTC_CREDIT_DIST_ACTIVITY_CHANGE - or HTC_CREDIT_DIST_SEND_COMPLETE is indicated on an endpoint - that has non-zero credits to recover - */ -} HTC_ENDPOINT_CREDIT_DIST; - -#define HTC_EP_ACTIVE ((A_UINT32) (1u << 31)) - -/* macro to check if an endpoint has gone active, useful for credit - * distributions */ -#define IS_EP_ACTIVE(epDist) ((epDist)->DistFlags & HTC_EP_ACTIVE) -#define SET_EP_ACTIVE(epDist) (epDist)->DistFlags |= HTC_EP_ACTIVE - -/* credit distibution code that is passed into the distrbution function, - * there are mandatory and optional codes that must be handled */ -typedef enum _HTC_CREDIT_DIST_REASON { - HTC_CREDIT_DIST_SEND_COMPLETE = 0, /* credits available as a result of completed - send operations (MANDATORY) resulting in credit reports */ - HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1, /* a change in endpoint activity occured (OPTIONAL) */ - HTC_CREDIT_DIST_SEEK_CREDITS, /* an endpoint needs to "seek" credits (OPTIONAL) */ - HTC_DUMP_CREDIT_STATE /* for debugging, dump any state information that is kept by - the distribution function */ -} HTC_CREDIT_DIST_REASON; - -typedef void (*HTC_CREDIT_DIST_CALLBACK)(void *Context, - HTC_ENDPOINT_CREDIT_DIST * - pEPList, - HTC_CREDIT_DIST_REASON - Reason); - -typedef void (*HTC_CREDIT_INIT_CALLBACK)(void *Context, - HTC_ENDPOINT_CREDIT_DIST * - pEPList, int TotalCredits); - -/* endpoint statistics action */ -typedef enum _HTC_ENDPOINT_STAT_ACTION { - HTC_EP_STAT_SAMPLE = 0, /* only read statistics */ - HTC_EP_STAT_SAMPLE_AND_CLEAR = 1, /* sample and immediately clear statistics */ - HTC_EP_STAT_CLEAR /* clear only */ -} HTC_ENDPOINT_STAT_ACTION; - -/* endpoint statistics */ -typedef struct _HTC_ENDPOINT_STATS { - A_UINT32 TxPosted; /* number of TX packets posted to the endpoint */ - A_UINT32 TxCreditLowIndications; /* number of times the host set the credit-low flag in a send message on - this endpoint */ - A_UINT32 TxIssued; /* running count of total TX packets issued */ - A_UINT32 TxPacketsBundled; /* running count of TX packets that were issued in bundles */ - A_UINT32 TxBundles; /* running count of TX bundles that were issued */ - A_UINT32 TxDropped; /* tx packets that were dropped */ - A_UINT32 TxCreditRpts; /* running count of total credit reports received for this endpoint */ - A_UINT32 TxCreditRptsFromRx; /* credit reports received from this endpoint's RX packets */ - A_UINT32 TxCreditRptsFromOther; /* credit reports received from RX packets of other endpoints */ - A_UINT32 TxCreditRptsFromEp0; /* credit reports received from endpoint 0 RX packets */ - A_UINT32 TxCreditsFromRx; /* count of credits received via Rx packets on this endpoint */ - A_UINT32 TxCreditsFromOther; /* count of credits received via another endpoint */ - A_UINT32 TxCreditsFromEp0; /* count of credits received via another endpoint */ - A_UINT32 TxCreditsConsummed; /* count of consummed credits */ - A_UINT32 TxCreditsReturned; /* count of credits returned */ - A_UINT32 RxReceived; /* count of RX packets received */ - A_UINT32 RxLookAheads; /* count of lookahead records - found in messages received on this endpoint */ - A_UINT32 RxPacketsBundled; /* count of recv packets received in a bundle */ - A_UINT32 RxBundleLookAheads; /* count of number of bundled lookaheads */ - A_UINT32 RxBundleIndFromHdr; /* count of the number of bundle indications from the HTC header */ - A_UINT32 RxAllocThreshHit; /* count of the number of times the recv allocation threshhold was hit */ - A_UINT32 RxAllocThreshBytes; /* total number of bytes */ -} HTC_ENDPOINT_STATS; - -/* ------ Function Prototypes ------ */ -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Create an instance of HTC over the underlying HIF device - @function name: htc_create - @input: HifDevice - hif device handle, - pInfo - initialization information - @output: - @return: HTC_HANDLE on success, NULL on failure - @notes: - @example: - @see also: htc_destroy - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -HTC_HANDLE htc_create(void *HifDevice, - HTC_INIT_INFO *pInfo, cdf_device_t osdev); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Get the underlying HIF device handle - @function name: htc_get_hif_device - @input: HTCHandle - handle passed into the AddInstance callback - @output: - @return: opaque HIF device handle usable in HIF API calls. - @notes: - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void *htc_get_hif_device(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Set credit distribution parameters - @function name: htc_set_credit_distribution - @input: HTCHandle - HTC handle - pCreditDistCont - caller supplied context to pass into distribution functions - CreditDistFunc - Distribution function callback - CreditDistInit - Credit Distribution initialization callback - ServicePriorityOrder - Array containing list of service IDs, lowest index is highest - priority - ListLength - number of elements in ServicePriorityOrder - @output: - @return: - @notes: The user can set a custom credit distribution function to handle special requirements - for each endpoint. A default credit distribution routine can be used by setting - CreditInitFunc to NULL. The default credit distribution is only provided for simple - "fair" credit distribution without regard to any prioritization. - - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_set_credit_distribution(HTC_HANDLE HTCHandle, - void *pCreditDistContext, - HTC_CREDIT_DIST_CALLBACK CreditDistFunc, - HTC_CREDIT_INIT_CALLBACK CreditInitFunc, - HTC_SERVICE_ID ServicePriorityOrder[], - int ListLength); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Wait for the target to indicate the HTC layer is ready - @function name: htc_wait_target - @input: HTCHandle - HTC handle - @output: - @return: - @notes: This API blocks until the target responds with an HTC ready message. - The caller should not connect services until the target has indicated it is - ready. - @example: - @see also: htc_connect_service - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_wait_target(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Start target service communications - @function name: htc_start - @input: HTCHandle - HTC handle - @output: - @return: - @notes: This API indicates to the target that the service connection phase is complete - and the target can freely start all connected services. This API should only be - called AFTER all service connections have been made. TCStart will issue a - SETUP_COMPLETE message to the target to indicate that all service connections - have been made and the target can start communicating over the endpoints. - @example: - @see also: htc_connect_service - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_start(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Add receive packet to HTC - @function name: htc_add_receive_pkt - @input: HTCHandle - HTC handle - pPacket - HTC receive packet to add - @output: - @return: A_OK on success - @notes: user must supply HTC packets for capturing incomming HTC frames. The caller - must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL() - macro. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_add_receive_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Connect to an HTC service - @function name: htc_connect_service - @input: HTCHandle - HTC handle - pReq - connection details - @output: pResp - connection response - @return: - @notes: Service connections must be performed before htc_start. User provides callback handlers - for various endpoint events. - @example: - @see also: htc_start - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_connect_service(HTC_HANDLE HTCHandle, - HTC_SERVICE_CONNECT_REQ *pReq, - HTC_SERVICE_CONNECT_RESP *pResp); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: HTC register log dump - @function name: htc_dump - @input: HTCHandle - HTC handle - CmdId - Log command - start - start/print logs - @output: - @return: - @notes: Register logs will be started/printed. - be flushed. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - -void htc_dump(HTC_HANDLE HTCHandle, uint8_t CmdId, bool start); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Send an HTC packet - @function name: htc_send_pkt - @input: HTCHandle - HTC handle - pPacket - packet to send - @output: - @return: A_OK - @notes: Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro. - This interface is fully asynchronous. On error, HTC SendPkt will - call the registered Endpoint callback to cleanup the packet. - @example: - @see also: htc_flush_endpoint - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Send an HTC packet containing a tx descriptor and data - @function name: htc_send_data_pkt - @input: HTCHandle - HTC handle - pPacket - packet to send - @output: - @return: A_OK - @notes: Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro. - Caller must provide headroom in an initial fragment added to the - network buffer to store a HTC_FRAME_HDR. - This interface is fully asynchronous. On error, htc_send_data_pkt will - call the registered Endpoint EpDataTxComplete callback to cleanup - the packet. - @example: - @see also: htc_send_pkt - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -#ifdef ATH_11AC_TXCOMPACT -A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, cdf_nbuf_t netbuf, - int Epid, int ActualLength); -#else /*ATH_11AC_TXCOMPACT */ -A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket, - A_UINT8 more_data); -#endif /*ATH_11AC_TXCOMPACT */ -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Flush HTC when target is removed surprisely service communications - @function name: htc_flush_surprise_remove - @input: HTCHandle - HTC handle - @output: - @return: - @notes: All receive and pending TX packets will - be flushed. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_flush_surprise_remove(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Stop HTC service communications - @function name: htc_stop - @input: HTCHandle - HTC handle - @output: - @return: - @notes: HTC communications is halted. All receive and pending TX packets will - be flushed. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_stop(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Destory HTC service - @function name: htc_destroy - @input: HTCHandle - @output: - @return: - @notes: This cleans up all resources allocated by htc_create(). - @example: - @see also: htc_create - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_destroy(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Flush pending TX packets - @function name: htc_flush_endpoint - @input: HTCHandle - HTC handle - Endpoint - Endpoint to flush - Tag - flush tag - @output: - @return: - @notes: The Tag parameter is used to selectively flush packets with matching tags. - The value of 0 forces all packets to be flush regardless of tag. - @example: - @see also: htc_send_pkt - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_flush_endpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, - HTC_TX_TAG Tag); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Dump credit distribution state - @function name: htc_dump_credit_states - @input: HTCHandle - HTC handle - @output: - @return: - @notes: This dumps all credit distribution information to the debugger - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_dump_credit_states(HTC_HANDLE HTCHandle); -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Indicate a traffic activity change on an endpoint - @function name: htc_indicate_activity_change - @input: HTCHandle - HTC handle - Endpoint - endpoint in which activity has changed - Active - true if active, false if it has become inactive - @output: - @return: - @notes: This triggers the registered credit distribution function to - re-adjust credits for active/inactive endpoints. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_indicate_activity_change(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint, A_BOOL Active); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Get endpoint statistics - @function name: htc_get_endpoint_statistics - @input: HTCHandle - HTC handle - Endpoint - Endpoint identifier - Action - action to take with statistics - @output: - pStats - statistics that were sampled (can be NULL if Action is HTC_EP_STAT_CLEAR) - - @return: true if statistics profiling is enabled, otherwise false. - - @notes: Statistics is a compile-time option and this function may return false - if HTC is not compiled with profiling. - - The caller can specify the statistic "action" to take when sampling - the statistics. This includes: - - HTC_EP_STAT_SAMPLE: The pStats structure is filled with the current values. - HTC_EP_STAT_SAMPLE_AND_CLEAR: The structure is filled and the current statistics - are cleared. - HTC_EP_STAT_CLEA : the statistics are cleared, the called can pass a NULL value for - pStats - - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_BOOL htc_get_endpoint_statistics(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint, - HTC_ENDPOINT_STAT_ACTION Action, - HTC_ENDPOINT_STATS *pStats); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Unblock HTC message reception - @function name: htc_unblock_recv - @input: HTCHandle - HTC handle - @output: - @return: - @notes: - HTC will block the receiver if the EpRecvAlloc callback fails to provide a packet. - The caller can use this API to indicate to HTC when resources (buffers) are available - such that the receiver can be unblocked and HTC may re-attempt fetching the pending message. - - This API is not required if the user uses the EpRecvRefill callback or uses the HTCAddReceivePacket() - API to recycle or provide receive packets to HTC. - - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_unblock_recv(HTC_HANDLE HTCHandle); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: send a series of HTC packets - @function name: htc_send_pkts_multiple - @input: HTCHandle - HTC handle - pPktQueue - local queue holding packets to send - @output: - @return: A_OK - @notes: Caller must initialize each packet using SET_HTC_PACKET_INFO_TX() macro. - The queue must only contain packets directed at the same endpoint. - Caller supplies a pointer to an HTC_PACKET_QUEUE structure holding the TX packets in FIFO order. - This API will remove the packets from the pkt queue and place them into the HTC Tx Queue - and bundle messages where possible. - The caller may allocate the pkt queue on the stack to hold the packets. - This interface is fully asynchronous. On error, htc_send_pkts will - call the registered Endpoint callback to cleanup the packet. - @example: - @see also: htc_flush_endpoint - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle, - HTC_PACKET_QUEUE *pPktQueue); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Add multiple receive packets to HTC - @function name: htc_add_receive_pkt_multiple - @input: HTCHandle - HTC handle - pPktQueue - HTC receive packet queue holding packets to add - @output: - @return: A_OK on success - @notes: user must supply HTC packets for capturing incomming HTC frames. The caller - must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL() - macro. The queue must only contain recv packets for the same endpoint. - Caller supplies a pointer to an HTC_PACKET_QUEUE structure holding the recv packet. - This API will remove the packets from the pkt queue and place them into internal - recv packet list. - The caller may allocate the pkt queue on the stack to hold the packets. - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_STATUS htc_add_receive_pkt_multiple(HTC_HANDLE HTCHandle, - HTC_PACKET_QUEUE *pPktQueue); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Check if an endpoint is marked active - @function name: htc_is_endpoint_active - @input: HTCHandle - HTC handle - Endpoint - endpoint to check for active state - @output: - @return: returns true if Endpoint is Active - @notes: - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -A_BOOL htc_is_endpoint_active(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Get the number of recv buffers currently queued into an HTC endpoint - @function name: htc_get_num_recv_buffers - @input: HTCHandle - HTC handle - Endpoint - endpoint to check - @output: - @return: returns number of buffers in queue - @notes: - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -int htc_get_num_recv_buffers(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint); - -/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - @desc: Set the target failure handling callback in HTC layer - @function name: htc_set_target_failure_callback - @input: HTCHandle - HTC handle - Callback - target failure handling callback - @output: - @return: - @notes: - @example: - @see also: - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -void htc_set_target_failure_callback(HTC_HANDLE HTCHandle, - HTC_TARGET_FAILURE Callback); - -/* internally used functions for testing... */ -void htc_enable_recv(HTC_HANDLE HTCHandle); -void htc_disable_recv(HTC_HANDLE HTCHandle); -A_STATUS HTCWaitForPendingRecv(HTC_HANDLE HTCHandle, - A_UINT32 TimeoutInMs, - A_BOOL *pbIsRecvPending); - -/* function to fetch stats from htc layer*/ -struct ol_ath_htc_stats *ieee80211_ioctl_get_htc_stats(HTC_HANDLE - HTCHandle); - -#ifdef HIF_USB -#define HTCReturnReceivePkt(target,p,osbuf) \ - A_NETBUF_FREE(osbuf); \ - if(p->Status == A_CLONE) { \ - cdf_mem_free(p); \ - } -#else -#define HTCReturnReceivePkt(target,p,osbuf) htc_add_receive_pkt(target,p) -#endif - -#ifdef WLAN_FEATURE_FASTPATH -#define HTC_TX_DESC_FILL(_htc_tx_desc, _download_len, _ep_id, _seq_no) \ -do { \ - HTC_WRITE32((_htc_tx_desc), \ - SM((_download_len), HTC_FRAME_HDR_PAYLOADLEN) | \ - SM((_ep_id), HTC_FRAME_HDR_ENDPOINTID)); \ - \ - HTC_WRITE32((A_UINT32 *)(_htc_tx_desc) + 1, \ - SM((_seq_no), HTC_FRAME_HDR_CONTROLBYTES1));\ -} while (0) -#endif /* WLAN_FEATURE_FASTPATH */ - -#ifdef __cplusplus -} -#endif -void htc_get_control_endpoint_tx_host_credits(HTC_HANDLE HTCHandle, int *credit); -void htc_dump_counter_info(HTC_HANDLE HTCHandle); -void *htc_get_targetdef(HTC_HANDLE htc_handle); -void htc_set_target_to_sleep(void *context); -void htc_cancel_deferred_target_sleep(void *context); -int htc_runtime_suspend(void); -int htc_runtime_resume(void); - -/* Disable ASPM : Disable PCIe low power */ -void htc_disable_aspm(void); - -#ifdef IPA_OFFLOAD -void htc_ipa_get_ce_resource(HTC_HANDLE htc_handle, - cdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr); -#else -#define htc_ipa_get_ce_resource(htc_handle, \ - ce_sr_base_paddr, \ - ce_sr_ring_size, \ - ce_reg_paddr) /* NO-OP */ -#endif /* IPA_OFFLOAD */ -#endif /* _HTC_API_H_ */ diff --git a/core/htc/htc_debug.h b/core/htc/htc_debug.h deleted file mode 100644 index fe0c8496f813..000000000000 --- a/core/htc/htc_debug.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef HTC_DEBUG_H_ -#define HTC_DEBUG_H_ - -#define ATH_MODULE_NAME htc -#include "a_debug.h" -#include "cdf_trace.h" - -/* ------- Debug related stuff ------- */ - -#define ATH_DEBUG_SEND ATH_DEBUG_MAKE_MODULE_MASK(0) -#define ATH_DEBUG_RECV ATH_DEBUG_MAKE_MODULE_MASK(1) -#define ATH_DEBUG_SYNC ATH_DEBUG_MAKE_MODULE_MASK(2) -#define ATH_DEBUG_DUMP ATH_DEBUG_MAKE_MODULE_MASK(3) -#define ATH_DEBUG_SETUP ATH_DEBUG_MAKE_MODULE_MASK(4) -#define HTC_ERROR(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HTC, CDF_TRACE_LEVEL_ERROR, ## args) -#define HTC_WARN(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HTC, CDF_TRACE_LEVEL_WARN, ## args) -#define HTC_INFO(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HTC, CDF_TRACE_LEVEL_INFO, ## args) -#define HTC_TRACE(args ...) \ - CDF_TRACE(CDF_MODULE_ID_HTC, CDF_TRACE_LEVEL_DEBUG, ## args) -#endif /*HTC_DEBUG_H_ */ diff --git a/core/htc/htc_internal.h b/core/htc/htc_internal.h deleted file mode 100644 index 5b98d1368aae..000000000000 --- a/core/htc/htc_internal.h +++ /dev/null @@ -1,317 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _HTC_INTERNAL_H_ -#define _HTC_INTERNAL_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include -#include "a_types.h" -#include "osapi_linux.h" -#include -#include -#include -#include -#include -#include "hif.h" -#include -#include "htc_api.h" -#include "htc_packet.h" - -/* HTC operational parameters */ -#define HTC_TARGET_RESPONSE_TIMEOUT 2000 /* in ms */ -#define HTC_TARGET_DEBUG_INTR_MASK 0x01 -#define HTC_TARGET_CREDIT_INTR_MASK 0xF0 -#define HTC_MIN_MSG_PER_BUNDLE 2 -#if defined(HIF_USB) -#define HTC_MAX_MSG_PER_BUNDLE 9 -#else -#define HTC_MAX_MSG_PER_BUNDLE 16 -#endif -/* - * HTC_MAX_TX_BUNDLE_SEND_LIMIT - - * This value is in units of tx frame fragments. - * It needs to be at least as large as the maximum number of tx frames in a - * HTC download bundle times the average number of fragments in each such frame - * (In certain operating systems, such as Linux, we expect to only have - * a single fragment per frame anyway.) - */ -#define HTC_MAX_TX_BUNDLE_SEND_LIMIT 255 - -#define HTC_PACKET_CONTAINER_ALLOCATION 32 -#define NUM_CONTROL_TX_BUFFERS 2 -#define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CONTROL_MESSAGE_LENGTH + HTC_HDR_LENGTH) -#define HTC_CONTROL_BUFFER_ALIGN 32 -#define HTC_TARGET_RESPONSE_POLL_MS 10 -#if !defined(A_SIMOS_DEVHOST) -#define HTC_TARGET_MAX_RESPONSE_POLL 200 /* actual HW */ -#else -#define HTC_TARGET_MAX_RESPONSE_POLL 600 /* host + target simulation */ -#endif - -#define HTC_SERVICE_TX_PACKET_TAG HTC_TX_PACKET_TAG_INTERNAL - -#define HTC_CREDIT_HISTORY_MAX 1024 - -typedef enum { - HTC_REQUEST_CREDIT, - HTC_PROCESS_CREDIT_REPORT, - HTC_SUSPEND_ACK, - HTC_SUSPEND_NACK, -} htc_credit_exchange_type; - -typedef struct { - htc_credit_exchange_type type; - uint64_t time; - uint32_t tx_credit; - uint32_t htc_tx_queue_depth; -} HTC_CREDIT_HISTORY; - -typedef struct _HTC_ENDPOINT { - HTC_ENDPOINT_ID Id; - - /* service ID this endpoint is bound to - * non-zero value means this endpoint is in use - */ - HTC_SERVICE_ID service_id; - - HTC_EP_CALLBACKS EpCallBacks; /* callbacks associated with this endpoint */ - HTC_PACKET_QUEUE TxQueue; /* HTC frame buffer TX queue */ - int MaxTxQueueDepth; /* max depth of the TX queue before we need to - call driver's full handler */ - int MaxMsgLength; /* max length of endpoint message */ - uint8_t UL_PipeID; - uint8_t DL_PipeID; - int ul_is_polled; /* Need to call HIF to get tx completion callbacks? */ - cdf_softirq_timer_t ul_poll_timer; - int ul_poll_timer_active; - int ul_outstanding_cnt; - int dl_is_polled; /* Need to call HIF to fetch rx? (Not currently supported.) */ -#if 0 /* not currently supported */ - cdf_softirq_timer_t dl_poll_timer; -#endif - - HTC_PACKET_QUEUE TxLookupQueue; /* lookup queue to match netbufs to htc packets */ - HTC_PACKET_QUEUE RxBufferHoldQueue; /* temporary hold queue for back compatibility */ - A_UINT8 SeqNo; /* TX seq no (helpful) for debugging */ - cdf_atomic_t TxProcessCount; /* serialization */ - struct _HTC_TARGET *target; - int TxCredits; /* TX credits available on this endpoint */ - int TxCreditSize; /* size in bytes of each credit (set by HTC) */ - int TxCreditsPerMaxMsg; /* credits required per max message (precalculated) */ -#ifdef HTC_EP_STAT_PROFILING - HTC_ENDPOINT_STATS endpoint_stats; /* endpoint statistics */ -#endif - A_BOOL TxCreditFlowEnabled; -} HTC_ENDPOINT; - -#ifdef HTC_EP_STAT_PROFILING -#define INC_HTC_EP_STAT(p, stat, count) ((p)->endpoint_stats.stat += (count)) -#else -#define INC_HTC_EP_STAT(p, stat, count) -#endif - -typedef struct { - A_UINT16 service_id; - A_UINT8 CreditAllocation; -} HTC_SERVICE_TX_CREDIT_ALLOCATION; - -#define HTC_MAX_SERVICE_ALLOC_ENTRIES 8 - -/* Error codes for HTC layer packet stats*/ -enum ol_ath_htc_pkt_ecodes { - GET_HTC_PKT_Q_FAIL = 0, /* error- get packet at head of HTC_PACKET_Q */ - HTC_PKT_Q_EMPTY, - HTC_SEND_Q_EMPTY -}; -/* our HTC target state */ -typedef struct _HTC_TARGET { - struct ol_softc *hif_dev; - HTC_ENDPOINT endpoint[ENDPOINT_MAX]; - cdf_spinlock_t HTCLock; - cdf_spinlock_t HTCRxLock; - cdf_spinlock_t HTCTxLock; - cdf_spinlock_t HTCCreditLock; - A_UINT32 HTCStateFlags; - void *host_handle; - HTC_INIT_INFO HTCInitInfo; - HTC_PACKET *pHTCPacketStructPool; /* pool of HTC packets */ - HTC_PACKET_QUEUE ControlBufferTXFreeList; - A_UINT8 CtrlResponseBuffer[HTC_MAX_CONTROL_MESSAGE_LENGTH]; - int CtrlResponseLength; - cdf_event_t ctrl_response_valid; - A_BOOL CtrlResponseProcessing; - int TotalTransmitCredits; - HTC_SERVICE_TX_CREDIT_ALLOCATION - ServiceTxAllocTable[HTC_MAX_SERVICE_ALLOC_ENTRIES]; - int TargetCreditSize; -#ifdef RX_SG_SUPPORT - cdf_nbuf_queue_t RxSgQueue; - A_BOOL IsRxSgInprogress; - A_UINT32 CurRxSgTotalLen; /* current total length */ - A_UINT32 ExpRxSgTotalLen; /* expected total length */ -#endif - cdf_device_t osdev; - struct ol_ath_htc_stats htc_pkt_stats; - HTC_PACKET *pBundleFreeList; - A_UINT32 ce_send_cnt; - A_UINT32 TX_comp_cnt; - A_UINT8 MaxMsgsPerHTCBundle; - cdf_work_t queue_kicker; -} HTC_TARGET; - -#define HTC_ENABLE_BUNDLE(target) (target->MaxMsgsPerHTCBundle > 1) -#ifdef RX_SG_SUPPORT -#define RESET_RX_SG_CONFIG(_target) \ - _target->ExpRxSgTotalLen = 0; \ - _target->CurRxSgTotalLen = 0; \ - _target->IsRxSgInprogress = false; -#endif - -#define HTC_STATE_STOPPING (1 << 0) -#define HTC_STOPPING(t) ((t)->HTCStateFlags & HTC_STATE_STOPPING) -#define LOCK_HTC(t) cdf_spin_lock_bh(&(t)->HTCLock); -#define UNLOCK_HTC(t) cdf_spin_unlock_bh(&(t)->HTCLock); -#define LOCK_HTC_RX(t) cdf_spin_lock_bh(&(t)->HTCRxLock); -#define UNLOCK_HTC_RX(t) cdf_spin_unlock_bh(&(t)->HTCRxLock); -#define LOCK_HTC_TX(t) cdf_spin_lock_bh(&(t)->HTCTxLock); -#define UNLOCK_HTC_TX(t) cdf_spin_unlock_bh(&(t)->HTCTxLock); -#define LOCK_HTC_CREDIT(t) cdf_spin_lock_bh(&(t)->HTCCreditLock); -#define UNLOCK_HTC_CREDIT(t) cdf_spin_unlock_bh(&(t)->HTCCreditLock); - -#define GET_HTC_TARGET_FROM_HANDLE(hnd) ((HTC_TARGET *)(hnd)) - -#define IS_TX_CREDIT_FLOW_ENABLED(ep) ((ep)->TxCreditFlowEnabled) - -#define HTC_POLL_CLEANUP_PERIOD_MS 10 /* milliseconds */ - -/* Macro to Increment the HTC_PACKET_ERRORS for Tx.*/ -#define OL_ATH_HTC_PKT_ERROR_COUNT_INCR(_target,_ecode) \ - do { \ - if(_ecode==GET_HTC_PKT_Q_FAIL) (_target->htc_pkt_stats.htc_get_pkt_q_fail_count)+=1; \ - if(_ecode==HTC_PKT_Q_EMPTY) (_target->htc_pkt_stats.htc_pkt_q_empty_count)+=1; \ - if(_ecode==HTC_SEND_Q_EMPTY) (_target->htc_pkt_stats.htc_send_q_empty_count)+=1; \ - } while(0); -/* internal HTC functions */ - -CDF_STATUS htc_rx_completion_handler(void *Context, cdf_nbuf_t netbuf, - uint8_t pipeID); -CDF_STATUS htc_tx_completion_handler(void *Context, cdf_nbuf_t netbuf, - unsigned int transferID, uint32_t toeplitz_hash_result); - -HTC_PACKET *allocate_htc_bundle_packet(HTC_TARGET *target); -void free_htc_bundle_packet(HTC_TARGET *target, HTC_PACKET *pPacket); - -HTC_PACKET *allocate_htc_packet_container(HTC_TARGET *target); -void free_htc_packet_container(HTC_TARGET *target, HTC_PACKET *pPacket); -void htc_flush_rx_hold_queue(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint); -void htc_flush_endpoint_tx(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, - HTC_TX_TAG Tag); -void htc_recv_init(HTC_TARGET *target); -A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target); -void htc_free_control_tx_packet(HTC_TARGET *target, HTC_PACKET *pPacket); -HTC_PACKET *htc_alloc_control_tx_packet(HTC_TARGET *target); -A_UINT8 htc_get_credit_allocation(HTC_TARGET *target, A_UINT16 service_id); -void htc_tx_resource_avail_handler(void *context, A_UINT8 pipeID); -void htc_control_rx_complete(void *Context, HTC_PACKET *pPacket); -void htc_process_credit_rpt(HTC_TARGET *target, - HTC_CREDIT_REPORT *pRpt, - int NumEntries, HTC_ENDPOINT_ID FromEndpoint); -void htc_fw_event_handler(void *context, CDF_STATUS status); -void htc_send_complete_check_cleanup(void *context); -void htc_runtime_pm_init(HTC_TARGET *target); -void htc_kick_queues(void *context); - -void htc_credit_record(htc_credit_exchange_type type, uint32_t tx_credit, - uint32_t htc_tx_queue_depth); - -static inline void htc_send_complete_poll_timer_stop(HTC_ENDPOINT * - pEndpoint) { - LOCK_HTC_TX(pEndpoint->target); - if (pEndpoint->ul_poll_timer_active) { - /* cdf_softirq_timer_cancel(&pEndpoint->ul_poll_timer); */ - pEndpoint->ul_poll_timer_active = 0; - } - UNLOCK_HTC_TX(pEndpoint->target); -} - -static inline void htc_send_complete_poll_timer_start(HTC_ENDPOINT * - pEndpoint) { - LOCK_HTC_TX(pEndpoint->target); - if (pEndpoint->ul_outstanding_cnt - && !pEndpoint->ul_poll_timer_active) { - /* - cdf_softirq_timer_start( - &pEndpoint->ul_poll_timer, HTC_POLL_CLEANUP_PERIOD_MS); - */ - pEndpoint->ul_poll_timer_active = 1; - } - UNLOCK_HTC_TX(pEndpoint->target); -} - -static inline void -htc_send_complete_check(HTC_ENDPOINT *pEndpoint, int force) { - /* - * Stop the polling-cleanup timer that will result in a later call to - * this function. It may get started again below, if there are still - * outsending sends. - */ - htc_send_complete_poll_timer_stop(pEndpoint); - /* - * Check whether HIF has any prior sends that have finished, - * have not had the post-processing done. - */ - hif_send_complete_check(pEndpoint->target->hif_dev, - pEndpoint->UL_PipeID, force); - /* - * If there are still outstanding sends after polling, start a timer - * to check again a little later. - */ - htc_send_complete_poll_timer_start(pEndpoint); -} - -#ifdef __cplusplus -} -#endif - -#ifndef DEBUG_BUNDLE -#define DEBUG_BUNDLE 0 -#endif - -#ifdef HIF_SDIO -#ifndef ENABLE_BUNDLE_TX -#define ENABLE_BUNDLE_TX 1 -#endif - -#ifndef ENABLE_BUNDLE_RX -#define ENABLE_BUNDLE_RX 1 -#endif -#endif /* HIF_SDIO */ -#endif /* !_HTC_HOST_INTERNAL_H_ */ diff --git a/core/htc/htc_packet.h b/core/htc/htc_packet.h deleted file mode 100644 index ca3698f019b7..000000000000 --- a/core/htc/htc_packet.h +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef HTC_PACKET_H_ -#define HTC_PACKET_H_ - -#include -#include /* A_UINT16, etc. */ -#include "dl_list.h" - -/* ------ Endpoint IDS ------ */ -typedef enum { - ENDPOINT_UNUSED = -1, - ENDPOINT_0 = 0, - ENDPOINT_1 = 1, - ENDPOINT_2 = 2, - ENDPOINT_3, - ENDPOINT_4, - ENDPOINT_5, - ENDPOINT_6, - ENDPOINT_7, - ENDPOINT_8, - ENDPOINT_MAX, -} HTC_ENDPOINT_ID; - -struct _HTC_PACKET; - -typedef void (*HTC_PACKET_COMPLETION)(void *, struct _HTC_PACKET *); - -typedef A_UINT16 HTC_TX_TAG; - -typedef struct _HTC_TX_PACKET_INFO { - HTC_TX_TAG Tag; /* tag used to selective flush packets */ - int CreditsUsed; /* number of credits used for this TX packet (HTC internal) */ - A_UINT8 SendFlags; /* send flags (HTC internal) */ - int SeqNo; /* internal seq no for debugging (HTC internal) */ - A_UINT32 Flags; /* internal use */ -} HTC_TX_PACKET_INFO; - -/** - * HTC_TX_PACKET_TAG_XXX - #defines for tagging packets for special handling - * HTC_TX_PACKET_TAG_ALL: zero is reserved and used to flush ALL packets - * HTC_TX_PACKET_TAG_INTERNAL: internal tags start here - * HTC_TX_PACKET_TAG_USER_DEFINED: user-defined tags start here - * HTC_TX_PACKET_TAG_BUNDLED: indicate this is a bundled tx packet - * HTC_TX_PACKET_TAG_AUTO_PM: indicate a power management wmi command - */ -#define HTC_TX_PACKET_TAG_ALL 0 -#define HTC_TX_PACKET_TAG_INTERNAL 1 -#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) -#define HTC_TX_PACKET_TAG_BUNDLED (HTC_TX_PACKET_TAG_USER_DEFINED + 1) -#define HTC_TX_PACKET_TAG_AUTO_PM (HTC_TX_PACKET_TAG_USER_DEFINED + 2) - -/* Tag packet for runtime put after sending */ -#define HTC_TX_PACKET_TAG_RUNTIME_PUT (HTC_TX_PACKET_TAG_USER_DEFINED + 3) - - -#define HTC_TX_PACKET_FLAG_FIXUP_NETBUF (1 << 0) - -typedef struct _HTC_RX_PACKET_INFO { - A_UINT32 ExpectedHdr; /* HTC internal use */ - A_UINT32 HTCRxFlags; /* HTC internal use */ - A_UINT32 IndicationFlags; /* indication flags set on each RX packet indication */ -} HTC_RX_PACKET_INFO; - -#define HTC_RX_FLAGS_INDICATE_MORE_PKTS (1 << 0) /* more packets on this endpoint are being fetched */ - -/* wrapper around endpoint-specific packets */ -typedef struct _HTC_PACKET { - DL_LIST ListLink; /* double link */ - void *pPktContext; /* caller's per packet specific context */ - - A_UINT8 *pBufferStart; /* the true buffer start , the caller can - store the real buffer start here. In - receive callbacks, the HTC layer sets pBuffer - to the start of the payload past the header. This - field allows the caller to reset pBuffer when it - recycles receive packets back to HTC */ - /* - * Pointer to the start of the buffer. In the transmit - * direction this points to the start of the payload. In the - * receive direction, however, the buffer when queued up - * points to the start of the HTC header but when returned - * to the caller points to the start of the payload - */ - A_UINT8 *pBuffer; /* payload start (RX/TX) */ - A_UINT32 BufferLength; /* length of buffer */ - A_UINT32 ActualLength; /* actual length of payload */ - HTC_ENDPOINT_ID Endpoint; /* endpoint that this packet was sent/recv'd from */ - A_STATUS Status; /* completion status */ - union { - HTC_TX_PACKET_INFO AsTx; /* Tx Packet specific info */ - HTC_RX_PACKET_INFO AsRx; /* Rx Packet specific info */ - } PktInfo; - - /* the following fields are for internal HTC use */ - A_UINT32 netbufOrigHeadRoom; - HTC_PACKET_COMPLETION Completion; /* completion */ - void *pContext; /* HTC private completion context */ - void *pNetBufContext; /* optimization for network-oriented data, the HTC packet - can pass the network buffer corresponding to the HTC packet - lower layers may optimized the transfer knowing this is - a network buffer */ -} HTC_PACKET; - -#define COMPLETE_HTC_PACKET(p,status) \ - { \ - (p)->Status = (status); \ - (p)->Completion((p)->pContext,(p)); \ - } - -#define INIT_HTC_PACKET_INFO(p,b,len) \ - { \ - (p)->pBufferStart = (b); \ - (p)->BufferLength = (len); \ - } - -/* macro to set an initial RX packet for refilling HTC */ -#define SET_HTC_PACKET_INFO_RX_REFILL(p,c,b,len,ep) \ - { \ - (p)->pPktContext = (c); \ - (p)->pBuffer = (b); \ - (p)->pBufferStart = (b); \ - (p)->BufferLength = (len); \ - (p)->Endpoint = (ep); \ - } - -/* fast macro to recycle an RX packet that will be re-queued to HTC */ -#define HTC_PACKET_RESET_RX(p) \ - { (p)->pBuffer = (p)->pBufferStart; (p)->ActualLength = 0; } - -/* macro to set packet parameters for TX */ -#define SET_HTC_PACKET_INFO_TX(p,c,b,len,ep,tag) \ - { \ - (p)->pPktContext = (c); \ - (p)->pBuffer = (b); \ - (p)->ActualLength = (len); \ - (p)->Endpoint = (ep); \ - (p)->PktInfo.AsTx.Tag = (tag); \ - (p)->PktInfo.AsTx.Flags = 0; \ - (p)->PktInfo.AsTx.SendFlags = 0; \ - } - -#define SET_HTC_PACKET_NET_BUF_CONTEXT(p,nb) \ - (p)->pNetBufContext = (nb) - -#define GET_HTC_PACKET_NET_BUF_CONTEXT(p) (p)->pNetBufContext - -/* HTC Packet Queueing Macros */ -typedef struct _HTC_PACKET_QUEUE { - DL_LIST QueueHead; - int Depth; -} HTC_PACKET_QUEUE; - -/* initialize queue */ -#define INIT_HTC_PACKET_QUEUE(pQ) \ - { \ - DL_LIST_INIT(& (pQ)->QueueHead); \ - (pQ)->Depth = 0; \ - } - -/* enqueue HTC packet to the tail of the queue */ -#define HTC_PACKET_ENQUEUE(pQ,p) \ - { dl_list_insert_tail(& (pQ)->QueueHead,& (p)->ListLink); \ - (pQ)->Depth ++; \ - } - -/* enqueue HTC packet to the tail of the queue */ -#define HTC_PACKET_ENQUEUE_TO_HEAD(pQ,p) \ - { dl_list_insert_head(& (pQ)->QueueHead,& (p)->ListLink); \ - (pQ)->Depth ++; \ - } -/* test if a queue is empty */ -#define HTC_QUEUE_EMPTY(pQ) ((pQ)->Depth == 0) -/* get packet at head without removing it */ -static INLINE HTC_PACKET *htc_get_pkt_at_head(HTC_PACKET_QUEUE *queue) -{ - if (queue->Depth == 0) { - return NULL; - } - return - A_CONTAINING_STRUCT((DL_LIST_GET_ITEM_AT_HEAD(&queue->QueueHead)), - HTC_PACKET, ListLink); -} - -/* remove a packet from a queue, where-ever it is in the queue */ -#define HTC_PACKET_REMOVE(pQ,p) \ - { \ - dl_list_remove(& (p)->ListLink); \ - (pQ)->Depth --; \ - } - -/* dequeue an HTC packet from the head of the queue */ -static INLINE HTC_PACKET *htc_packet_dequeue(HTC_PACKET_QUEUE *queue) -{ - DL_LIST *pItem = dl_list_remove_item_from_head(&queue->QueueHead); - if (pItem != NULL) { - queue->Depth--; - return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); - } - return NULL; -} - -/* dequeue an HTC packet from the tail of the queue */ -static INLINE HTC_PACKET *htc_packet_dequeue_tail(HTC_PACKET_QUEUE *queue) -{ - DL_LIST *pItem = dl_list_remove_item_from_tail(&queue->QueueHead); - if (pItem != NULL) { - queue->Depth--; - return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink); - } - return NULL; -} - -#define HTC_PACKET_QUEUE_DEPTH(pQ) (pQ)->Depth - -#define HTC_GET_ENDPOINT_FROM_PKT(p) (p)->Endpoint -#define HTC_GET_TAG_FROM_PKT(p) (p)->PktInfo.AsTx.Tag - -/* transfer the packets from one queue to the tail of another queue */ -#define HTC_PACKET_QUEUE_TRANSFER_TO_TAIL(pQDest,pQSrc) \ - { \ - dl_list_transfer_items_to_tail(&(pQDest)->QueueHead,&(pQSrc)->QueueHead); \ - (pQDest)->Depth += (pQSrc)->Depth; \ - (pQSrc)->Depth = 0; \ - } - -/* - * Transfer the packets from one queue to the head of another queue. - * This xfer_to_head(q1,q2) is basically equivalent to xfer_to_tail(q2,q1), - * but it updates the queue descriptor object for the initial queue to refer - * to the concatenated queue. - */ -#define HTC_PACKET_QUEUE_TRANSFER_TO_HEAD(pQDest, pQSrc) \ - { \ - dl_list_transfer_items_to_head(&(pQDest)->QueueHead,&(pQSrc)->QueueHead); \ - (pQDest)->Depth += (pQSrc)->Depth; \ - (pQSrc)->Depth = 0; \ - } - -/* fast version to init and add a single packet to a queue */ -#define INIT_HTC_PACKET_QUEUE_AND_ADD(pQ,pP) \ - { \ - DL_LIST_INIT_AND_ADD(&(pQ)->QueueHead,&(pP)->ListLink) \ - (pQ)->Depth = 1; \ - } - -#define HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pQ, pPTemp) \ - ITERATE_OVER_LIST_ALLOW_REMOVE(&(pQ)->QueueHead,(pPTemp), HTC_PACKET, ListLink) - -#define HTC_PACKET_QUEUE_ITERATE_IS_VALID(pQ) ITERATE_IS_VALID(&(pQ)->QueueHead) -#define HTC_PACKET_QUEUE_ITERATE_RESET(pQ) ITERATE_RESET(&(pQ)->QueueHead) - -#define HTC_PACKET_QUEUE_ITERATE_END ITERATE_END - -#endif /*HTC_PACKET_H_ */ diff --git a/core/htc/htc_recv.c b/core/htc/htc_recv.c deleted file mode 100644 index 79bf6c6847d0..000000000000 --- a/core/htc/htc_recv.c +++ /dev/null @@ -1,749 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "htc_debug.h" -#include "htc_internal.h" -#include "cds_api.h" -#include /* cdf_nbuf_t */ -#include "epping_main.h" - -/* HTC Control message receive timeout msec */ -#define HTC_CONTROL_RX_TIMEOUT 3000 - -#ifdef DEBUG -void debug_dump_bytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription) -{ - A_CHAR stream[60]; - A_CHAR byteOffsetStr[10]; - A_UINT32 i; - A_UINT16 offset, count, byteOffset; - - A_PRINTF("<---------Dumping %d Bytes : %s ------>\n", length, - pDescription); - - count = 0; - offset = 0; - byteOffset = 0; - for (i = 0; i < length; i++) { - A_SNPRINTF(stream + offset, (sizeof(stream) - offset), - "%02X ", buffer[i]); - count++; - offset += 3; - - if (count == 16) { - count = 0; - offset = 0; - A_SNPRINTF(byteOffsetStr, sizeof(byteOffset), "%4.4X", - byteOffset); - A_PRINTF("[%s]: %s\n", byteOffsetStr, stream); - A_MEMZERO(stream, 60); - byteOffset += 16; - } - } - - if (offset != 0) { - A_SNPRINTF(byteOffsetStr, sizeof(byteOffset), "%4.4X", - byteOffset); - A_PRINTF("[%s]: %s\n", byteOffsetStr, stream); - } - - A_PRINTF("<------------------------------------------------->\n"); -} -#else -void debug_dump_bytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription) -{ -} -#endif - -static A_STATUS htc_process_trailer(HTC_TARGET *target, - A_UINT8 *pBuffer, - int Length, HTC_ENDPOINT_ID FromEndpoint); - -static void do_recv_completion(HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pQueueToIndicate) -{ - - do { - - if (HTC_QUEUE_EMPTY(pQueueToIndicate)) { - /* nothing to indicate */ - break; - } - - if (pEndpoint->EpCallBacks.EpRecvPktMultiple != NULL) { - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, - (" HTC calling ep %d, recv multiple callback (%d pkts) \n", - pEndpoint->Id, - HTC_PACKET_QUEUE_DEPTH - (pQueueToIndicate))); - /* a recv multiple handler is being used, pass the queue to the handler */ - pEndpoint->EpCallBacks.EpRecvPktMultiple(pEndpoint-> - EpCallBacks. - pContext, - pQueueToIndicate); - INIT_HTC_PACKET_QUEUE(pQueueToIndicate); - } else { - HTC_PACKET *pPacket; - /* using legacy EpRecv */ - while (!HTC_QUEUE_EMPTY(pQueueToIndicate)) { - pPacket = htc_packet_dequeue(pQueueToIndicate); - if (pEndpoint->EpCallBacks.EpRecv == NULL) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("HTC ep %d has NULL recv callback on packet %p\n", - pEndpoint->Id, - pPacket)); - continue; - } - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, - ("HTC calling ep %d recv callback on packet %p\n", - pEndpoint->Id, pPacket)); - pEndpoint->EpCallBacks.EpRecv(pEndpoint-> - EpCallBacks. - pContext, - pPacket); - } - } - - } while (false); - -} - -static void recv_packet_completion(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, - HTC_PACKET *pPacket) -{ - HTC_PACKET_QUEUE container; - INIT_HTC_PACKET_QUEUE_AND_ADD(&container, pPacket); - /* do completion */ - do_recv_completion(pEndpoint, &container); -} - -void htc_control_rx_complete(void *Context, HTC_PACKET *pPacket) -{ - /* TODO, can't really receive HTC control messages yet.... */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("Invalid call to htc_control_rx_complete\n")); -} - -void htc_unblock_recv(HTC_HANDLE HTCHandle) -{ - /* TODO find the Need in new model */ -} - -void htc_enable_recv(HTC_HANDLE HTCHandle) -{ - - /* TODO find the Need in new model */ -} - -void htc_disable_recv(HTC_HANDLE HTCHandle) -{ - - /* TODO find the Need in new model */ -} - -int htc_get_num_recv_buffers(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint = &target->endpoint[Endpoint]; - return HTC_PACKET_QUEUE_DEPTH(&pEndpoint->RxBufferHoldQueue); -} - -HTC_PACKET *allocate_htc_packet_container(HTC_TARGET *target) -{ - HTC_PACKET *pPacket; - - LOCK_HTC_RX(target); - - if (NULL == target->pHTCPacketStructPool) { - UNLOCK_HTC_RX(target); - return NULL; - } - - pPacket = target->pHTCPacketStructPool; - target->pHTCPacketStructPool = (HTC_PACKET *) pPacket->ListLink.pNext; - - UNLOCK_HTC_RX(target); - - pPacket->ListLink.pNext = NULL; - return pPacket; -} - -void free_htc_packet_container(HTC_TARGET *target, HTC_PACKET *pPacket) -{ - LOCK_HTC_RX(target); - - if (NULL == target->pHTCPacketStructPool) { - target->pHTCPacketStructPool = pPacket; - pPacket->ListLink.pNext = NULL; - } else { - pPacket->ListLink.pNext = - (DL_LIST *) target->pHTCPacketStructPool; - target->pHTCPacketStructPool = pPacket; - } - - UNLOCK_HTC_RX(target); -} - -#ifdef RX_SG_SUPPORT -cdf_nbuf_t rx_sg_to_single_netbuf(HTC_TARGET *target) -{ - cdf_nbuf_t skb; - uint8_t *anbdata; - uint8_t *anbdata_new; - uint32_t anblen; - cdf_nbuf_t new_skb = NULL; - uint32_t sg_queue_len; - cdf_nbuf_queue_t *rx_sg_queue = &target->RxSgQueue; - - sg_queue_len = cdf_nbuf_queue_len(rx_sg_queue); - - if (sg_queue_len <= 1) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("rx_sg_to_single_netbuf: invalid sg queue len %u\n")); - goto _failed; - } - - new_skb = cdf_nbuf_alloc(target->ExpRxSgTotalLen, 0, 4, false); - if (new_skb == NULL) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("rx_sg_to_single_netbuf: can't allocate %u size netbuf\n", - target->ExpRxSgTotalLen)); - goto _failed; - } - - cdf_nbuf_peek_header(new_skb, &anbdata_new, &anblen); - - skb = cdf_nbuf_queue_remove(rx_sg_queue); - do { - cdf_nbuf_peek_header(skb, &anbdata, &anblen); - cdf_mem_copy(anbdata_new, anbdata, cdf_nbuf_len(skb)); - cdf_nbuf_put_tail(new_skb, cdf_nbuf_len(skb)); - anbdata_new += cdf_nbuf_len(skb); - cdf_nbuf_free(skb); - skb = cdf_nbuf_queue_remove(rx_sg_queue); - } while (skb != NULL); - - RESET_RX_SG_CONFIG(target); - return new_skb; - -_failed: - - while ((skb = cdf_nbuf_queue_remove(rx_sg_queue)) != NULL) { - cdf_nbuf_free(skb); - } - - RESET_RX_SG_CONFIG(target); - return NULL; -} -#endif - -CDF_STATUS htc_rx_completion_handler(void *Context, cdf_nbuf_t netbuf, - uint8_t pipeID) -{ - CDF_STATUS status = CDF_STATUS_SUCCESS; - HTC_FRAME_HDR *HtcHdr; - HTC_TARGET *target = (HTC_TARGET *) Context; - uint8_t *netdata; - uint32_t netlen; - HTC_ENDPOINT *pEndpoint; - HTC_PACKET *pPacket; - A_UINT16 payloadLen; - uint32_t trailerlen = 0; - A_UINT8 htc_ep_id; - -#ifdef RX_SG_SUPPORT - LOCK_HTC_RX(target); - if (target->IsRxSgInprogress) { - target->CurRxSgTotalLen += cdf_nbuf_len(netbuf); - cdf_nbuf_queue_add(&target->RxSgQueue, netbuf); - if (target->CurRxSgTotalLen == target->ExpRxSgTotalLen) { - netbuf = rx_sg_to_single_netbuf(target); - if (netbuf == NULL) { - UNLOCK_HTC_RX(target); - goto _out; - } - } else { - netbuf = NULL; - UNLOCK_HTC_RX(target); - goto _out; - } - } - UNLOCK_HTC_RX(target); -#endif - - netdata = cdf_nbuf_data(netbuf); - netlen = cdf_nbuf_len(netbuf); - - HtcHdr = (HTC_FRAME_HDR *) netdata; - - do { - - htc_ep_id = HTC_GET_FIELD(HtcHdr, HTC_FRAME_HDR, ENDPOINTID); - - if (htc_ep_id >= ENDPOINT_MAX) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("HTC Rx: invalid EndpointID=%d\n", - htc_ep_id)); - debug_dump_bytes((A_UINT8 *) HtcHdr, - sizeof(HTC_FRAME_HDR), "BAD HTC Header"); - status = CDF_STATUS_E_FAILURE; - CDF_BUG(0); - break; - } - - pEndpoint = &target->endpoint[htc_ep_id]; - - /* - * If this endpoint that received a message from the target has - * a to-target HIF pipe whose send completions are polled rather - * than interrupt-driven, this is a good point to ask HIF to check - * whether it has any completed sends to handle. - */ - if (pEndpoint->ul_is_polled) { - htc_send_complete_check(pEndpoint, 1); - } - - payloadLen = HTC_GET_FIELD(HtcHdr, HTC_FRAME_HDR, PAYLOADLEN); - - if (netlen < (payloadLen + HTC_HDR_LENGTH)) { -#ifdef RX_SG_SUPPORT - LOCK_HTC_RX(target); - target->IsRxSgInprogress = true; - cdf_nbuf_queue_init(&target->RxSgQueue); - cdf_nbuf_queue_add(&target->RxSgQueue, netbuf); - target->ExpRxSgTotalLen = (payloadLen + HTC_HDR_LENGTH); - target->CurRxSgTotalLen += netlen; - UNLOCK_HTC_RX(target); - netbuf = NULL; - break; -#else - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("HTC Rx: insufficient length, got:%d expected =%zu\n", - netlen, payloadLen + HTC_HDR_LENGTH)); - debug_dump_bytes((A_UINT8 *) HtcHdr, - sizeof(HTC_FRAME_HDR), - "BAD RX packet length"); - status = CDF_STATUS_E_FAILURE; - CDF_BUG(0); - break; -#endif - } -#ifdef HTC_EP_STAT_PROFILING - LOCK_HTC_RX(target); - INC_HTC_EP_STAT(pEndpoint, RxReceived, 1); - UNLOCK_HTC_RX(target); -#endif - - /* if (IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { */ - { - A_UINT8 temp; - A_STATUS temp_status; - /* get flags to check for trailer */ - temp = HTC_GET_FIELD(HtcHdr, HTC_FRAME_HDR, FLAGS); - if (temp & HTC_FLAGS_RECV_TRAILER) { - /* extract the trailer length */ - temp = - HTC_GET_FIELD(HtcHdr, HTC_FRAME_HDR, - CONTROLBYTES0); - if ((temp < sizeof(HTC_RECORD_HDR)) - || (temp > payloadLen)) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("htc_rx_completion_handler, invalid header (payloadlength should be :%d, CB[0] is:%d)\n", - payloadLen, temp)); - status = CDF_STATUS_E_INVAL; - break; - } - - trailerlen = temp; - /* process trailer data that follows HDR + application payload */ - temp_status = htc_process_trailer(target, - ((A_UINT8 *) HtcHdr + - HTC_HDR_LENGTH + - payloadLen - temp), - temp, htc_ep_id); - if (A_FAILED(temp_status)) { - status = CDF_STATUS_E_FAILURE; - break; - } - - } - } - - if (((int)payloadLen - (int)trailerlen) <= 0) { - /* zero length packet with trailer data, just drop these */ - break; - } - - if (htc_ep_id == ENDPOINT_0) { - A_UINT16 message_id; - HTC_UNKNOWN_MSG *htc_msg; - int wow_nack = 0; - - /* remove HTC header */ - cdf_nbuf_pull_head(netbuf, HTC_HDR_LENGTH); - netdata = cdf_nbuf_data(netbuf); - netlen = cdf_nbuf_len(netbuf); - - htc_msg = (HTC_UNKNOWN_MSG *) netdata; - message_id = - HTC_GET_FIELD(htc_msg, HTC_UNKNOWN_MSG, MESSAGEID); - - switch (message_id) { - default: - /* handle HTC control message */ - if (target->CtrlResponseProcessing) { - /* this is a fatal error, target should not be sending unsolicited messages - * on the endpoint 0 */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("HTC Rx Ctrl still processing\n")); - status = CDF_STATUS_E_FAILURE; - CDF_BUG(false); - break; - } - - LOCK_HTC_RX(target); - target->CtrlResponseLength = - min((int)netlen, - HTC_MAX_CONTROL_MESSAGE_LENGTH); - A_MEMCPY(target->CtrlResponseBuffer, netdata, - target->CtrlResponseLength); - - /* Requester will clear this flag */ - target->CtrlResponseProcessing = true; - UNLOCK_HTC_RX(target); - - cdf_event_set(&target->ctrl_response_valid); - break; - case HTC_MSG_SEND_SUSPEND_COMPLETE: - wow_nack = 0; - LOCK_HTC_CREDIT(target); - htc_credit_record(HTC_SUSPEND_ACK, - pEndpoint->TxCredits, - HTC_PACKET_QUEUE_DEPTH( - &pEndpoint->TxQueue)); - UNLOCK_HTC_CREDIT(target); - target->HTCInitInfo. - TargetSendSuspendComplete((void *) - &wow_nack); - break; - case HTC_MSG_NACK_SUSPEND: - wow_nack = 1; - LOCK_HTC_CREDIT(target); - htc_credit_record(HTC_SUSPEND_ACK, - pEndpoint->TxCredits, - HTC_PACKET_QUEUE_DEPTH( - &pEndpoint->TxQueue)); - UNLOCK_HTC_CREDIT(target); - - target->HTCInitInfo. - TargetSendSuspendComplete((void *) - &wow_nack); - break; - } - - cdf_nbuf_free(netbuf); - netbuf = NULL; - break; - } - - /* the current message based HIF architecture allocates net bufs for recv packets - * since this layer bridges that HIF to upper layers , which expects HTC packets, - * we form the packets here - * TODO_FIXME */ - pPacket = allocate_htc_packet_container(target); - if (NULL == pPacket) { - status = CDF_STATUS_E_RESOURCES; - break; - } - pPacket->Status = CDF_STATUS_SUCCESS; - pPacket->Endpoint = htc_ep_id; - pPacket->pPktContext = netbuf; - pPacket->pBuffer = cdf_nbuf_data(netbuf) + HTC_HDR_LENGTH; - pPacket->ActualLength = netlen - HTC_HEADER_LEN - trailerlen; - - cdf_nbuf_pull_head(netbuf, HTC_HEADER_LEN); - cdf_nbuf_set_pktlen(netbuf, pPacket->ActualLength); - - recv_packet_completion(target, pEndpoint, pPacket); - /* recover the packet container */ - free_htc_packet_container(target, pPacket); - netbuf = NULL; - - } while (false); - -#ifdef RX_SG_SUPPORT -_out: -#endif - - if (netbuf != NULL) { - cdf_nbuf_free(netbuf); - } - - return status; - -} - -A_STATUS htc_add_receive_pkt_multiple(HTC_HANDLE HTCHandle, - HTC_PACKET_QUEUE *pPktQueue) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - HTC_PACKET *pFirstPacket; - A_STATUS status = A_OK; - HTC_PACKET *pPacket; - - pFirstPacket = htc_get_pkt_at_head(pPktQueue); - - if (NULL == pFirstPacket) { - A_ASSERT(false); - return A_EINVAL; - } - - AR_DEBUG_ASSERT(pFirstPacket->Endpoint < ENDPOINT_MAX); - - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, - ("+- htc_add_receive_pkt_multiple : endPointId: %d, cnt:%d, length: %d\n", - pFirstPacket->Endpoint, - HTC_PACKET_QUEUE_DEPTH(pPktQueue), - pFirstPacket->BufferLength)); - - pEndpoint = &target->endpoint[pFirstPacket->Endpoint]; - - LOCK_HTC_RX(target); - - do { - - if (HTC_STOPPING(target)) { - status = A_ERROR; - break; - } - - /* store receive packets */ - HTC_PACKET_QUEUE_TRANSFER_TO_TAIL(&pEndpoint->RxBufferHoldQueue, - pPktQueue); - - } while (false); - - UNLOCK_HTC_RX(target); - - if (A_FAILED(status)) { - /* walk through queue and mark each one canceled */ - HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pPktQueue, pPacket) { - pPacket->Status = A_ECANCELED; - } - HTC_PACKET_QUEUE_ITERATE_END; - - do_recv_completion(pEndpoint, pPktQueue); - } - - 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; - HTC_PACKET_QUEUE container; - - LOCK_HTC_RX(target); - - while (1) { - pPacket = htc_packet_dequeue(&pEndpoint->RxBufferHoldQueue); - if (NULL == pPacket) { - break; - } - UNLOCK_HTC_RX(target); - pPacket->Status = A_ECANCELED; - pPacket->ActualLength = 0; - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, - (" Flushing RX packet:%p, length:%d, ep:%d \n", - pPacket, pPacket->BufferLength, - pPacket->Endpoint)); - INIT_HTC_PACKET_QUEUE_AND_ADD(&container, pPacket); - /* give the packet back */ - do_recv_completion(pEndpoint, &container); - LOCK_HTC_RX(target); - } - - UNLOCK_HTC_RX(target); -} - -void htc_recv_init(HTC_TARGET *target) -{ - /* Initialize ctrl_response_valid to block */ - cdf_event_init(&target->ctrl_response_valid); -} - -/* polling routine to wait for a control packet to be received */ -A_STATUS htc_wait_recv_ctrl_message(HTC_TARGET *target) -{ -/* int count = HTC_TARGET_MAX_RESPONSE_POLL; */ - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCWaitCtrlMessageRecv\n")); - - /* Wait for BMI request/response transaction to complete */ - if (cdf_wait_single_event(&target->ctrl_response_valid, - cdf_system_msecs_to_ticks(HTC_CONTROL_RX_TIMEOUT))) { - CDF_BUG(0); - return A_ERROR; - } - - LOCK_HTC_RX(target); - /* caller will clear this flag */ - target->CtrlResponseProcessing = true; - - UNLOCK_HTC_RX(target); - -#if 0 - while (count > 0) { - - LOCK_HTC_RX(target); - - if (target->CtrlResponseValid) { - target->CtrlResponseValid = false; - /* caller will clear this flag */ - target->CtrlResponseProcessing = true; - UNLOCK_HTC_RX(target); - break; - } - - UNLOCK_HTC_RX(target); - - count--; - A_MSLEEP(HTC_TARGET_RESPONSE_POLL_MS); - } - - if (count <= 0) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("-HTCWaitCtrlMessageRecv: Timeout!\n")); - return A_ECOMM; - } -#endif - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCWaitCtrlMessageRecv success\n")); - return A_OK; -} - -static A_STATUS htc_process_trailer(HTC_TARGET *target, - A_UINT8 *pBuffer, - int Length, HTC_ENDPOINT_ID FromEndpoint) -{ - HTC_RECORD_HDR *pRecord; - A_UINT8 htc_rec_id; - A_UINT8 htc_rec_len; - A_UINT8 *pRecordBuf; - A_UINT8 *pOrigBuffer; - int origLength; - A_STATUS status; - - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, - ("+htc_process_trailer (length:%d) \n", Length)); - - if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) { - AR_DEBUG_PRINTBUF(pBuffer, Length, "Recv Trailer"); - } - - pOrigBuffer = pBuffer; - origLength = Length; - status = A_OK; - - while (Length > 0) { - - if (Length < sizeof(HTC_RECORD_HDR)) { - status = A_EPROTO; - break; - } - /* these are byte aligned structs */ - pRecord = (HTC_RECORD_HDR *) pBuffer; - Length -= sizeof(HTC_RECORD_HDR); - pBuffer += sizeof(HTC_RECORD_HDR); - - htc_rec_len = HTC_GET_FIELD(pRecord, HTC_RECORD_HDR, LENGTH); - htc_rec_id = HTC_GET_FIELD(pRecord, HTC_RECORD_HDR, RECORDID); - - if (htc_rec_len > Length) { - /* no room left in buffer for record */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" invalid record length: %d (id:%d) buffer has: %d bytes left \n", - htc_rec_len, htc_rec_id, Length)); - status = A_EPROTO; - break; - } - /* start of record follows the header */ - pRecordBuf = pBuffer; - - switch (htc_rec_id) { - case HTC_RECORD_CREDITS: - AR_DEBUG_ASSERT(htc_rec_len >= - sizeof(HTC_CREDIT_REPORT)); - htc_process_credit_rpt(target, - (HTC_CREDIT_REPORT *) pRecordBuf, - htc_rec_len / - (sizeof(HTC_CREDIT_REPORT)), - FromEndpoint); - break; - -#ifdef HIF_SDIO - case HTC_RECORD_LOOKAHEAD: - /* Process in HIF layer */ - break; - - case HTC_RECORD_LOOKAHEAD_BUNDLE: - /* Process in HIF layer */ - break; -#endif /* HIF_SDIO */ - - default: - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" HTC unhandled record: id:%d length:%d \n", - htc_rec_id, htc_rec_len)); - break; - } - - if (A_FAILED(status)) { - break; - } - - /* advance buffer past this record for next time around */ - pBuffer += htc_rec_len; - Length -= htc_rec_len; - } - - if (A_FAILED(status)) { - debug_dump_bytes(pOrigBuffer, origLength, "BAD Recv Trailer"); - } - - AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-htc_process_trailer \n")); - return status; - -} diff --git a/core/htc/htc_send.c b/core/htc/htc_send.c deleted file mode 100644 index 26821fd542a4..000000000000 --- a/core/htc/htc_send.c +++ /dev/null @@ -1,2002 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "htc_debug.h" -#include "htc_internal.h" -#include /* cdf_nbuf_t */ -#include /* cdf_mem_malloc */ -#include "epping_main.h" - -/* #define USB_HIF_SINGLE_PIPE_DATA_SCHED */ -/* #ifdef USB_HIF_SINGLE_PIPE_DATA_SCHED */ -#define DATA_EP_SIZE 4 -/* #endif */ -#define HTC_DATA_RESOURCE_THRS 256 -#define HTC_DATA_MINDESC_PERPACKET 2 - -typedef enum _HTC_SEND_QUEUE_RESULT { - HTC_SEND_QUEUE_OK = 0, /* packet was queued */ - HTC_SEND_QUEUE_DROP = 1, /* this packet should be dropped */ -} HTC_SEND_QUEUE_RESULT; - -#ifndef DEBUG_CREDIT -#define DEBUG_CREDIT 0 -#endif - -#if DEBUG_CREDIT -/* bit mask to enable debug certain endpoint */ -static unsigned ep_debug_mask = - (1 << ENDPOINT_0) | (1 << ENDPOINT_1) | (1 << ENDPOINT_2); -#endif - -/* HTC Control Path Credit History */ -A_UINT32 g_htc_credit_history_idx = 0; -HTC_CREDIT_HISTORY htc_credit_history_buffer[HTC_CREDIT_HISTORY_MAX]; - -/** - * htc_credit_record() - records tx que state & credit transactions - * @type: type of echange can be HTC_REQUEST_CREDIT - * or HTC_PROCESS_CREDIT_REPORT - * @tx_credits: current number of tx_credits - * @htc_tx_queue_depth: current hct tx queue depth - * - * This function records the credits and pending commands whenever a command is - * sent or credits are returned. Call this after the credits have been updated - * according to the transaction. Call this before dequeing commands. - * - * Consider making this function accept an HTC_ENDPOINT and find the current - * credits and queue depth itself. - * - * Consider moving the LOCK_HTC_CREDIT(target); logic into this function as well. - */ -void htc_credit_record(htc_credit_exchange_type type, uint32_t tx_credit, - uint32_t htc_tx_queue_depth) { - if (HTC_CREDIT_HISTORY_MAX <= g_htc_credit_history_idx) - g_htc_credit_history_idx = 0; - - htc_credit_history_buffer[g_htc_credit_history_idx].type = type; - htc_credit_history_buffer[g_htc_credit_history_idx].time = - cdf_get_log_timestamp(); - htc_credit_history_buffer[g_htc_credit_history_idx].tx_credit = - tx_credit; - htc_credit_history_buffer[g_htc_credit_history_idx].htc_tx_queue_depth = - htc_tx_queue_depth; - g_htc_credit_history_idx++; - -#ifdef QCA_WIFI_3_0_EMU - if (type == HTC_REQUEST_CREDIT) - printk("\nrequest_credits-> current_credit %d, pending commands %d\n", - tx_credit, htc_tx_queue_depth); - - else if (type == HTC_PROCESS_CREDIT_REPORT) - printk("\ncredit_report<- current_credit %d, pending commands %d\n", - tx_credit, htc_tx_queue_depth); -#endif -} - -void htc_dump_counter_info(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("\n%s: ce_send_cnt = %d, TX_comp_cnt = %d\n", - __func__, target->ce_send_cnt, target->TX_comp_cnt)); -} - -void htc_get_control_endpoint_tx_host_credits(HTC_HANDLE HTCHandle, int *credits) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - int i; - - if (!credits || !target) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("%s: invalid args", __func__)); - return; - } - - *credits = 0; - LOCK_HTC_TX(target); - for (i = 0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - if (pEndpoint->service_id == WMI_CONTROL_SVC) { - *credits = pEndpoint->TxCredits; - break; - } - } - UNLOCK_HTC_TX(target); -} - -static INLINE void restore_tx_packet(HTC_TARGET *target, HTC_PACKET *pPacket) -{ - if (pPacket->PktInfo.AsTx.Flags & HTC_TX_PACKET_FLAG_FIXUP_NETBUF) { - cdf_nbuf_t netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - cdf_nbuf_unmap(target->osdev, netbuf, CDF_DMA_TO_DEVICE); - cdf_nbuf_pull_head(netbuf, sizeof(HTC_FRAME_HDR)); - pPacket->PktInfo.AsTx.Flags &= ~HTC_TX_PACKET_FLAG_FIXUP_NETBUF; - } - -} - -static void do_send_completion(HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pQueueToIndicate) -{ - do { - - if (HTC_QUEUE_EMPTY(pQueueToIndicate)) { - /* nothing to indicate */ - break; - } - - if (pEndpoint->EpCallBacks.EpTxCompleteMultiple != NULL) { - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" HTC calling ep %d, send complete multiple callback (%d pkts) \n", - pEndpoint->Id, - HTC_PACKET_QUEUE_DEPTH - (pQueueToIndicate))); - /* a multiple send complete handler is being used, pass the queue to the handler */ - pEndpoint->EpCallBacks.EpTxCompleteMultiple(pEndpoint-> - EpCallBacks. - pContext, - pQueueToIndicate); - /* all packets are now owned by the callback, reset queue to be safe */ - INIT_HTC_PACKET_QUEUE(pQueueToIndicate); - } else { - HTC_PACKET *pPacket; - /* using legacy EpTxComplete */ - do { - pPacket = htc_packet_dequeue(pQueueToIndicate); - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" HTC calling ep %d send complete callback on packet %p \n", - pEndpoint->Id, pPacket)); - pEndpoint->EpCallBacks.EpTxComplete(pEndpoint-> - EpCallBacks. - pContext, - pPacket); - } while (!HTC_QUEUE_EMPTY(pQueueToIndicate)); - } - - } while (false); - -} - -static void send_packet_completion(HTC_TARGET *target, HTC_PACKET *pPacket) -{ - HTC_ENDPOINT *pEndpoint = &target->endpoint[pPacket->Endpoint]; - HTC_PACKET_QUEUE container; - - restore_tx_packet(target, pPacket); - INIT_HTC_PACKET_QUEUE_AND_ADD(&container, pPacket); - - /* do completion */ - do_send_completion(pEndpoint, &container); -} - -void htc_send_complete_check_cleanup(void *context) -{ - HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *) context; - htc_send_complete_check(pEndpoint, 1); -} - -HTC_PACKET *allocate_htc_bundle_packet(HTC_TARGET *target) -{ - HTC_PACKET *pPacket; - HTC_PACKET_QUEUE *pQueueSave; - cdf_nbuf_t netbuf; - LOCK_HTC_TX(target); - if (NULL == target->pBundleFreeList) { - UNLOCK_HTC_TX(target); - netbuf = cdf_nbuf_alloc(NULL, - target->MaxMsgsPerHTCBundle * - target->TargetCreditSize, 0, 4, false); - AR_DEBUG_ASSERT(netbuf); - if (!netbuf) { - return NULL; - } - pPacket = cdf_mem_malloc(sizeof(HTC_PACKET)); - AR_DEBUG_ASSERT(pPacket); - if (!pPacket) { - cdf_nbuf_free(netbuf); - return NULL; - } - pQueueSave = cdf_mem_malloc(sizeof(HTC_PACKET_QUEUE)); - AR_DEBUG_ASSERT(pQueueSave); - if (!pQueueSave) { - cdf_nbuf_free(netbuf); - cdf_mem_free(pPacket); - return NULL; - } - INIT_HTC_PACKET_QUEUE(pQueueSave); - pPacket->pContext = pQueueSave; - SET_HTC_PACKET_NET_BUF_CONTEXT(pPacket, netbuf); - pPacket->pBuffer = cdf_nbuf_data(netbuf); - pPacket->BufferLength = cdf_nbuf_len(netbuf); - - /* store the original head room so that we can restore this when we "free" the packet */ - /* free packet puts the packet back on the free list */ - pPacket->netbufOrigHeadRoom = cdf_nbuf_headroom(netbuf); - return pPacket; - } - /* already done malloc - restore from free list */ - pPacket = target->pBundleFreeList; - AR_DEBUG_ASSERT(pPacket); - if (!pPacket) { - UNLOCK_HTC_TX(target); - return NULL; - } - target->pBundleFreeList = (HTC_PACKET *) pPacket->ListLink.pNext; - UNLOCK_HTC_TX(target); - pPacket->ListLink.pNext = NULL; - - return pPacket; -} - -void free_htc_bundle_packet(HTC_TARGET *target, HTC_PACKET *pPacket) -{ - A_UINT32 curentHeadRoom; - cdf_nbuf_t netbuf; - HTC_PACKET_QUEUE *pQueueSave; - - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - AR_DEBUG_ASSERT(netbuf); - if (!netbuf) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("\n%s: Invalid netbuf in HTC " - "Packet\n", __func__)); - return; - } - /* HIF adds data to the headroom section of the nbuf, restore the original */ - /* size. If this is not done, headroom keeps shrinking with every HIF send */ - /* and eventually HIF ends up doing another malloc big enough to store the */ - /* data + its header */ - - curentHeadRoom = cdf_nbuf_headroom(netbuf); - cdf_nbuf_pull_head(netbuf, - pPacket->netbufOrigHeadRoom - curentHeadRoom); - cdf_nbuf_trim_tail(netbuf, cdf_nbuf_len(netbuf)); - - /* restore the pBuffer pointer. HIF changes this */ - pPacket->pBuffer = cdf_nbuf_data(netbuf); - pPacket->BufferLength = cdf_nbuf_len(netbuf); - - /* restore queue */ - pQueueSave = (HTC_PACKET_QUEUE *) pPacket->pContext; - AR_DEBUG_ASSERT(pQueueSave); - - INIT_HTC_PACKET_QUEUE(pQueueSave); - - LOCK_HTC_TX(target); - if (target->pBundleFreeList == NULL) { - target->pBundleFreeList = pPacket; - pPacket->ListLink.pNext = NULL; - } else { - pPacket->ListLink.pNext = (DL_LIST *) target->pBundleFreeList; - target->pBundleFreeList = pPacket; - } - UNLOCK_HTC_TX(target); -} - -#if defined(HIF_USB) || defined(HIF_SDIO) -#ifdef ENABLE_BUNDLE_TX -static A_STATUS htc_send_bundled_netbuf(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - unsigned char *pBundleBuffer, - HTC_PACKET *pPacketTx) -{ - cdf_size_t data_len; - A_STATUS status; - cdf_nbuf_t bundleBuf; - uint32_t data_attr = 0; - - bundleBuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacketTx); - data_len = pBundleBuffer - cdf_nbuf_data(bundleBuf); - cdf_nbuf_put_tail(bundleBuf, data_len); - SET_HTC_PACKET_INFO_TX(pPacketTx, - target, - pBundleBuffer, - data_len, - pEndpoint->Id, HTC_TX_PACKET_TAG_BUNDLED); - LOCK_HTC_TX(target); - HTC_PACKET_ENQUEUE(&pEndpoint->TxLookupQueue, pPacketTx); - UNLOCK_HTC_TX(target); -#if DEBUG_BUNDLE - cdf_print(" Send bundle EP%d buffer size:0x%x, total:0x%x, count:%d.\n", - pEndpoint->Id, - pEndpoint->TxCreditSize, - data_len, data_len / pEndpoint->TxCreditSize); -#endif - status = hif_send_head(target->hif_dev, - pEndpoint->UL_PipeID, - pEndpoint->Id, data_len, bundleBuf, data_attr); - if (status != A_OK) { - cdf_print("%s:hif_send_head failed(len=%d).\n", __FUNCTION__, - data_len); - } - return status; -} - -static void htc_issue_packets_bundle(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pPktQueue) -{ - int i, frag_count, nbytes; - cdf_nbuf_t netbuf, bundleBuf; - unsigned char *pBundleBuffer = NULL; - HTC_PACKET *pPacket = NULL, *pPacketTx = NULL; - HTC_FRAME_HDR *pHtcHdr; - int creditPad, creditRemainder, transferLength, bundlesSpaceRemaining = - 0; - HTC_PACKET_QUEUE *pQueueSave = NULL; - - bundlesSpaceRemaining = - target->MaxMsgsPerHTCBundle * pEndpoint->TxCreditSize; - pPacketTx = allocate_htc_bundle_packet(target); - if (!pPacketTx) { - /* good time to panic */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("allocate_htc_bundle_packet failed \n")); - AR_DEBUG_ASSERT(false); - return; - } - bundleBuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacketTx); - pBundleBuffer = cdf_nbuf_data(bundleBuf); - pQueueSave = (HTC_PACKET_QUEUE *) pPacketTx->pContext; - while (1) { - pPacket = htc_packet_dequeue(pPktQueue); - if (pPacket == NULL) { - break; - } - creditPad = 0; - transferLength = pPacket->ActualLength + HTC_HDR_LENGTH; - creditRemainder = transferLength % pEndpoint->TxCreditSize; - if (creditRemainder != 0) { - if (transferLength < pEndpoint->TxCreditSize) { - creditPad = - pEndpoint->TxCreditSize - transferLength; - } else { - creditPad = creditRemainder; - } - transferLength += creditPad; - } - - if (bundlesSpaceRemaining < transferLength) { - /* send out previous buffer */ - htc_send_bundled_netbuf(target, pEndpoint, pBundleBuffer, - pPacketTx); - if (HTC_PACKET_QUEUE_DEPTH(pPktQueue) < - HTC_MIN_MSG_PER_BUNDLE) { - return; - } - bundlesSpaceRemaining = - target->MaxMsgsPerHTCBundle * - pEndpoint->TxCreditSize; - pPacketTx = allocate_htc_bundle_packet(target); - if (!pPacketTx) { - /* good time to panic */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("allocate_htc_bundle_packet failed \n")); - AR_DEBUG_ASSERT(false); - return; - } - bundleBuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacketTx); - pBundleBuffer = cdf_nbuf_data(bundleBuf); - pQueueSave = (HTC_PACKET_QUEUE *) pPacketTx->pContext; - } - - bundlesSpaceRemaining -= transferLength; - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - pHtcHdr = (HTC_FRAME_HDR *) cdf_nbuf_get_frag_vaddr(netbuf, 0); - HTC_WRITE32(pHtcHdr, - SM(pPacket->ActualLength, - HTC_FRAME_HDR_PAYLOADLEN) | SM(pPacket->PktInfo. - AsTx. - SendFlags | - HTC_FLAGS_SEND_BUNDLE, - HTC_FRAME_HDR_FLAGS) - | SM(pPacket->Endpoint, HTC_FRAME_HDR_ENDPOINTID)); - HTC_WRITE32((A_UINT32 *) pHtcHdr + 1, - SM(pPacket->PktInfo.AsTx.SeqNo, - HTC_FRAME_HDR_CONTROLBYTES1) | SM(creditPad, - HTC_FRAME_HDR_RESERVED)); - pHtcHdr->reserved = creditPad; - frag_count = cdf_nbuf_get_num_frags(netbuf); - nbytes = pPacket->ActualLength + HTC_HDR_LENGTH; - for (i = 0; i < frag_count && nbytes > 0; i++) { - int frag_len = cdf_nbuf_get_frag_len(netbuf, i); - unsigned char *frag_addr = - cdf_nbuf_get_frag_vaddr(netbuf, i); - if (frag_len > nbytes) { - frag_len = nbytes; - } - A_MEMCPY(pBundleBuffer, frag_addr, frag_len); - nbytes -= frag_len; - pBundleBuffer += frag_len; - } - HTC_PACKET_ENQUEUE(pQueueSave, pPacket); - pBundleBuffer += creditPad; - } - if (pBundleBuffer != cdf_nbuf_data(bundleBuf)) { - /* send out remaining buffer */ - htc_send_bundled_netbuf(target, pEndpoint, pBundleBuffer, - pPacketTx); - } else { - free_htc_bundle_packet(target, pPacketTx); - } -} -#endif /* ENABLE_BUNDLE_TX */ -#endif - -static A_STATUS htc_issue_packets(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pPktQueue) -{ - A_STATUS status = A_OK; - cdf_nbuf_t netbuf; - HTC_PACKET *pPacket = NULL; - uint16_t payloadLen; - HTC_FRAME_HDR *pHtcHdr; - uint32_t data_attr = 0; - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+htc_issue_packets: Queue: %p, Pkts %d \n", pPktQueue, - HTC_PACKET_QUEUE_DEPTH(pPktQueue))); - while (true) { -#if defined(HIF_USB) || defined(HIF_SDIO) -#ifdef ENABLE_BUNDLE_TX - if (IS_TX_CREDIT_FLOW_ENABLED(pEndpoint) && - HTC_ENABLE_BUNDLE(target) && - HTC_PACKET_QUEUE_DEPTH(pPktQueue) >= - HTC_MIN_MSG_PER_BUNDLE) { - htc_issue_packets_bundle(target, pEndpoint, pPktQueue); - } -#endif -#endif - /* if not bundling or there was a packet that could not be placed in a bundle, - * and send it by normal way - */ - pPacket = htc_packet_dequeue(pPktQueue); - if (NULL == pPacket) { - /* local queue is fully drained */ - break; - } - - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - AR_DEBUG_ASSERT(netbuf); - /* Non-credit enabled endpoints have been mapped and setup by now, - * so no need to revisit the HTC headers - */ - if (IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { - - payloadLen = pPacket->ActualLength; - /* setup HTC frame header */ - - pHtcHdr = - (HTC_FRAME_HDR *) cdf_nbuf_get_frag_vaddr(netbuf, - 0); - AR_DEBUG_ASSERT(pHtcHdr); - - HTC_WRITE32(pHtcHdr, - SM(payloadLen, - HTC_FRAME_HDR_PAYLOADLEN) | SM(pPacket-> - PktInfo. - AsTx. - SendFlags, - HTC_FRAME_HDR_FLAGS) - | SM(pPacket->Endpoint, - HTC_FRAME_HDR_ENDPOINTID)); - HTC_WRITE32(((A_UINT32 *) pHtcHdr) + 1, - SM(pPacket->PktInfo.AsTx.SeqNo, - HTC_FRAME_HDR_CONTROLBYTES1)); - - /* - * Now that the HTC frame header has been added, the netbuf can be - * mapped. This only applies to non-data frames, since data frames - * were already mapped as they entered into the driver. - * Check the "FIXUP_NETBUF" flag to see whether this is a data netbuf - * that is already mapped, or a non-data netbuf that needs to be - * mapped. - */ - if (pPacket->PktInfo.AsTx. - Flags & HTC_TX_PACKET_FLAG_FIXUP_NETBUF) { - cdf_nbuf_map(target->osdev, - GET_HTC_PACKET_NET_BUF_CONTEXT - (pPacket), CDF_DMA_TO_DEVICE); - } - } - LOCK_HTC_TX(target); - /* store in look up queue to match completions */ - HTC_PACKET_ENQUEUE(&pEndpoint->TxLookupQueue, pPacket); - INC_HTC_EP_STAT(pEndpoint, TxIssued, 1); - pEndpoint->ul_outstanding_cnt++; - UNLOCK_HTC_TX(target); - - hif_send_complete_check(target->hif_dev, pEndpoint->UL_PipeID, false); - status = hif_send_head(target->hif_dev, - pEndpoint->UL_PipeID, pEndpoint->Id, - HTC_HDR_LENGTH + pPacket->ActualLength, - netbuf, data_attr); -#if DEBUG_BUNDLE - cdf_print(" Send single EP%d buffer size:0x%x, total:0x%x.\n", - pEndpoint->Id, - pEndpoint->TxCreditSize, - HTC_HDR_LENGTH + pPacket->ActualLength); -#endif - - target->ce_send_cnt++; - - if (cdf_unlikely(A_FAILED(status))) { - if (status != A_NO_RESOURCE) { - /* TODO : if more than 1 endpoint maps to the same PipeID it is possible - * to run out of resources in the HIF layer. Don't emit the error */ - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("hif_send Failed status:%d \n", - status)); - } - LOCK_HTC_TX(target); - target->ce_send_cnt--; - pEndpoint->ul_outstanding_cnt--; - HTC_PACKET_REMOVE(&pEndpoint->TxLookupQueue, pPacket); - /* reclaim credits */ -#if defined(HIF_USB) - if (pEndpoint->Id >= ENDPOINT_2 - && pEndpoint->Id <= ENDPOINT_5) - target->avail_tx_credits += - pPacket->PktInfo.AsTx.CreditsUsed; - else - pEndpoint->TxCredits += - pPacket->PktInfo.AsTx.CreditsUsed; -#else - pEndpoint->TxCredits += - pPacket->PktInfo.AsTx.CreditsUsed; -#endif - /* put it back into the callers queue */ - HTC_PACKET_ENQUEUE_TO_HEAD(pPktQueue, pPacket); - UNLOCK_HTC_TX(target); - break; - } - - /* - * For HTT messages without a response from fw, - * do the runtime put here. - * otherwise runtime put will be done when the fw response comes - */ - if (pPacket->PktInfo.AsTx.Tag == HTC_TX_PACKET_TAG_RUNTIME_PUT) - hif_pm_runtime_put(target->hif_dev); - } - if (cdf_unlikely(A_FAILED(status))) { -#if defined(HIF_USB) - if (pEndpoint->Id >= ENDPOINT_2 && pEndpoint->Id <= ENDPOINT_5) - target->avail_tx_credits += - pPacket->PktInfo.AsTx.CreditsUsed; - else - pEndpoint->TxCredits += - pPacket->PktInfo.AsTx.CreditsUsed; -#endif - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("htc_issue_packets, failed pkt:0x%p status:%d", - pPacket, status)); - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_issue_packets \n")); - - return status; -} - -#ifdef FEATURE_RUNTIME_PM -/** - * extract_htc_pm_packtes(): move pm packets from endpoint into queue - * @endpoint: which enpoint to extract packets from - * @queue: a queue to store extracted packets in. - * - * remove pm packets from the endpoint's tx queue. - * queue them into a queue - */ -static void extract_htc_pm_packets(HTC_ENDPOINT *endpoint, - HTC_PACKET_QUEUE *queue) -{ - HTC_PACKET *packet; - - /* only WMI endpoint has power management packets */ - if (endpoint->service_id != WMI_CONTROL_SVC) - return; - - ITERATE_OVER_LIST_ALLOW_REMOVE(&endpoint->TxQueue.QueueHead, packet, - HTC_PACKET, ListLink) { - if (packet->PktInfo.AsTx.Tag == HTC_TX_PACKET_TAG_AUTO_PM) { - HTC_PACKET_REMOVE(&endpoint->TxQueue, packet); - HTC_PACKET_ENQUEUE(queue, packet); - } - } ITERATE_END -} - -/** - * queue_htc_pm_packets(): queue pm packets with priority - * @endpoint: enpoint to queue packets to - * @queue: queue of pm packets to enque - * - * suspend resume packets get special treatment & priority. - * need to queue them at the front of the queue. - */ -static void queue_htc_pm_packets(HTC_ENDPOINT *endpoint, - HTC_PACKET_QUEUE *queue) -{ - if (endpoint->service_id != WMI_CONTROL_SVC) - return; - - HTC_PACKET_QUEUE_TRANSFER_TO_HEAD(&endpoint->TxQueue, queue); -} -#else -static void extract_htc_pm_packets(HTC_ENDPOINT *endpoint, - HTC_PACKET_QUEUE *queue) -{} - -static void queue_htc_pm_packets(HTC_ENDPOINT *endpoint, - HTC_PACKET_QUEUE *queue) -{} -#endif - - -/* get HTC send packets from the TX queue on an endpoint, based on available credits */ -void get_htc_send_packets_credit_based(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pQueue) -{ - int creditsRequired; - int remainder; - A_UINT8 sendFlags; - HTC_PACKET *pPacket; - unsigned int transferLength; - HTC_PACKET_QUEUE *tx_queue; - HTC_PACKET_QUEUE pm_queue; - bool do_pm_get = false; - - /****** NOTE : the TX lock is held when this function is called *****************/ - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+get_htc_send_packets_credit_based\n")); - - INIT_HTC_PACKET_QUEUE(&pm_queue); - extract_htc_pm_packets(pEndpoint, &pm_queue); - if (HTC_QUEUE_EMPTY(&pm_queue)) { - tx_queue = &pEndpoint->TxQueue; - do_pm_get = true; - } else { - tx_queue = &pm_queue; - } - - /* loop until we can grab as many packets out of the queue as we can */ - while (true) { - if (do_pm_get && hif_pm_runtime_get(target->hif_dev)) { - /* bus suspended, runtime resume issued */ - CDF_ASSERT(HTC_PACKET_QUEUE_DEPTH(pQueue) == 0); - break; - } - - sendFlags = 0; - /* get packet at head, but don't remove it */ - pPacket = htc_get_pkt_at_head(tx_queue); - if (pPacket == NULL) { - if (do_pm_get) - hif_pm_runtime_put(target->hif_dev); - break; - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Got head packet:%p , Queue Depth: %d\n", - pPacket, - HTC_PACKET_QUEUE_DEPTH(tx_queue))); - - transferLength = pPacket->ActualLength + HTC_HDR_LENGTH; - - if (transferLength <= pEndpoint->TxCreditSize) { - creditsRequired = 1; - } else { - /* figure out how many credits this message requires */ - creditsRequired = - transferLength / pEndpoint->TxCreditSize; - remainder = transferLength % pEndpoint->TxCreditSize; - - if (remainder) { - creditsRequired++; - } - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Credits Required:%d Got:%d\n", - creditsRequired, pEndpoint->TxCredits)); - - if (pEndpoint->Id == ENDPOINT_0) { - /* endpoint 0 is special, it always has a credit and does not require credit based - * flow control */ - creditsRequired = 0; -#if defined(HIF_USB) - } else if (pEndpoint->Id >= ENDPOINT_2 - && pEndpoint->Id <= ENDPOINT_5) { - if (target->avail_tx_credits < creditsRequired) - break; - - target->avail_tx_credits -= creditsRequired; - - if (target->avail_tx_credits < 9) { - /* tell the target we need credits ASAP! */ - sendFlags |= HTC_FLAGS_NEED_CREDIT_UPDATE; - INC_HTC_EP_STAT(pEndpoint, - TxCreditLowIndications, 1); - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Host Needs Credits \n")); - } -#endif - } else { - - if (pEndpoint->TxCredits < creditsRequired) { -#if DEBUG_CREDIT - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" EP%d, No Credit now. %d < %d\n", - pEndpoint->Id, - pEndpoint->TxCredits, - creditsRequired)); -#endif - if (do_pm_get) - hif_pm_runtime_put(target->hif_dev); - break; - } - - pEndpoint->TxCredits -= creditsRequired; - INC_HTC_EP_STAT(pEndpoint, TxCreditsConsummed, - creditsRequired); - - /* check if we need credits back from the target */ - if (pEndpoint->TxCredits <= - pEndpoint->TxCreditsPerMaxMsg) { - /* tell the target we need credits ASAP! */ - sendFlags |= HTC_FLAGS_NEED_CREDIT_UPDATE; - - if (pEndpoint->service_id == WMI_CONTROL_SVC) { - LOCK_HTC_CREDIT(target); - htc_credit_record(HTC_REQUEST_CREDIT, - pEndpoint->TxCredits, - HTC_PACKET_QUEUE_DEPTH - (tx_queue)); - UNLOCK_HTC_CREDIT(target); - } - - INC_HTC_EP_STAT(pEndpoint, - TxCreditLowIndications, 1); -#if DEBUG_CREDIT - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" EP%d Needs Credits\n", - pEndpoint->Id)); -#endif - } - } - - /* now we can fully dequeue */ - pPacket = htc_packet_dequeue(tx_queue); - if (pPacket) { - /* save the number of credits this packet consumed */ - pPacket->PktInfo.AsTx.CreditsUsed = creditsRequired; - /* save send flags */ - pPacket->PktInfo.AsTx.SendFlags = sendFlags; - - /* queue this packet into the caller's queue */ - HTC_PACKET_ENQUEUE(pQueue, pPacket); - } - } - - if (!HTC_QUEUE_EMPTY(&pm_queue)) - queue_htc_pm_packets(pEndpoint, &pm_queue); - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("-get_htc_send_packets_credit_based\n")); - -} - -void get_htc_send_packets(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pQueue, int Resources) -{ - - HTC_PACKET *pPacket; - HTC_PACKET_QUEUE *tx_queue; - HTC_PACKET_QUEUE pm_queue; - bool do_pm_get; - - /****** NOTE : the TX lock is held when this function is called *****************/ - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+get_htc_send_packets %d resources\n", Resources)); - - INIT_HTC_PACKET_QUEUE(&pm_queue); - extract_htc_pm_packets(pEndpoint, &pm_queue); - if (HTC_QUEUE_EMPTY(&pm_queue)) { - tx_queue = &pEndpoint->TxQueue; - do_pm_get = true; - } else { - tx_queue = &pm_queue; - } - - /* loop until we can grab as many packets out of the queue as we can */ - while (Resources > 0) { - int num_frags; - - if (do_pm_get && hif_pm_runtime_get(target->hif_dev)) { - /* bus suspended, runtime resume issued */ - CDF_ASSERT(HTC_PACKET_QUEUE_DEPTH(pQueue) == 0); - break; - } - - pPacket = htc_packet_dequeue(tx_queue); - if (pPacket == NULL) { - if (do_pm_get) - hif_pm_runtime_put(target->hif_dev); - break; - } - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Got packet:%p , New Queue Depth: %d\n", - pPacket, - HTC_PACKET_QUEUE_DEPTH(tx_queue))); - /* For non-credit path the sequence number is already embedded - * in the constructed HTC header - */ -#if 0 - pPacket->PktInfo.AsTx.SeqNo = pEndpoint->SeqNo; - pEndpoint->SeqNo++; -#endif - pPacket->PktInfo.AsTx.SendFlags = 0; - pPacket->PktInfo.AsTx.CreditsUsed = 0; - /* queue this packet into the caller's queue */ - HTC_PACKET_ENQUEUE(pQueue, pPacket); - - /* - * FIX THIS: - * For now, avoid calling cdf_nbuf_get_num_frags before calling - * cdf_nbuf_map, because the MacOS version of cdf_nbuf_t doesn't - * support cdf_nbuf_get_num_frags until after cdf_nbuf_map has - * been done. - * Assume that the non-data netbufs, i.e. the WMI message netbufs, - * consist of a single fragment. - */ - num_frags = - (pPacket->PktInfo.AsTx. - Flags & HTC_TX_PACKET_FLAG_FIXUP_NETBUF) ? 1 - /* WMI messages are in a single-fragment network buffer */ : - cdf_nbuf_get_num_frags(GET_HTC_PACKET_NET_BUF_CONTEXT - (pPacket)); - Resources -= num_frags; - } - - if (!HTC_QUEUE_EMPTY(&pm_queue)) - queue_htc_pm_packets(pEndpoint, &pm_queue); - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-get_htc_send_packets\n")); - -} - -static HTC_SEND_QUEUE_RESULT htc_try_send(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - HTC_PACKET_QUEUE *pCallersSendQueue) -{ - HTC_PACKET_QUEUE sendQueue; /* temp queue to hold packets at various stages */ - HTC_PACKET *pPacket; - int tx_resources; - int overflow; - HTC_SEND_QUEUE_RESULT result = HTC_SEND_QUEUE_OK; - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+htc_try_send (Queue:%p Depth:%d)\n", - pCallersSendQueue, - (pCallersSendQueue == - NULL) ? 0 : - HTC_PACKET_QUEUE_DEPTH - (pCallersSendQueue))); - - /* init the local send queue */ - INIT_HTC_PACKET_QUEUE(&sendQueue); - - do { - - if (NULL == pCallersSendQueue) { - /* caller didn't provide a queue, just wants us to check queues and send */ - break; - } - - if (HTC_QUEUE_EMPTY(pCallersSendQueue)) { - /* empty queue */ - OL_ATH_HTC_PKT_ERROR_COUNT_INCR(target, - HTC_PKT_Q_EMPTY); - result = HTC_SEND_QUEUE_DROP; - break; - } - - if (HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue) >= - pEndpoint->MaxTxQueueDepth) { - /* we've already overflowed */ - overflow = HTC_PACKET_QUEUE_DEPTH(pCallersSendQueue); - } else { - /* figure out how much we will overflow by */ - overflow = HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue); - overflow += HTC_PACKET_QUEUE_DEPTH(pCallersSendQueue); - /* figure out how much we will overflow the TX queue by */ - overflow -= pEndpoint->MaxTxQueueDepth; - } - - /* if overflow is negative or zero, we are okay */ - if (overflow > 0) { - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Endpoint %d, TX queue will overflow :%d , Tx Depth:%d, Max:%d \n", - pEndpoint->Id, overflow, - HTC_PACKET_QUEUE_DEPTH(&pEndpoint-> - TxQueue), - pEndpoint->MaxTxQueueDepth)); - } - if ((overflow <= 0) - || (pEndpoint->EpCallBacks.EpSendFull == NULL)) { - /* all packets will fit or caller did not provide send full indication handler - * -- just move all of them to the local sendQueue object */ - HTC_PACKET_QUEUE_TRANSFER_TO_TAIL(&sendQueue, - pCallersSendQueue); - } else { - int i; - int goodPkts = - HTC_PACKET_QUEUE_DEPTH(pCallersSendQueue) - - overflow; - - A_ASSERT(goodPkts >= 0); - /* we have overflowed, and a callback is provided */ - /* dequeue all non-overflow packets into the sendqueue */ - for (i = 0; i < goodPkts; i++) { - /* pop off caller's queue */ - pPacket = htc_packet_dequeue(pCallersSendQueue); - A_ASSERT(pPacket != NULL); - /* insert into local queue */ - HTC_PACKET_ENQUEUE(&sendQueue, pPacket); - } - - /* the caller's queue has all the packets that won't fit */ - /* walk through the caller's queue and indicate each one to the send full handler */ - ITERATE_OVER_LIST_ALLOW_REMOVE(&pCallersSendQueue-> - QueueHead, pPacket, - HTC_PACKET, ListLink) { - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Indicating overflowed TX packet: %p \n", - pPacket)); - /* - * Remove headroom reserved for HTC_FRAME_HDR before giving - * the packet back to the user via the EpSendFull callback. - */ - restore_tx_packet(target, pPacket); - - if (pEndpoint->EpCallBacks. - EpSendFull(pEndpoint->EpCallBacks.pContext, - pPacket) == HTC_SEND_FULL_DROP) { - /* callback wants the packet dropped */ - INC_HTC_EP_STAT(pEndpoint, TxDropped, - 1); - /* leave this one in the caller's queue for cleanup */ - } else { - /* callback wants to keep this packet, remove from caller's queue */ - HTC_PACKET_REMOVE(pCallersSendQueue, - pPacket); - /* put it in the send queue */ - /* add HTC_FRAME_HDR space reservation again */ - cdf_nbuf_push_head - (GET_HTC_PACKET_NET_BUF_CONTEXT - (pPacket), sizeof(HTC_FRAME_HDR)); - - HTC_PACKET_ENQUEUE(&sendQueue, pPacket); - } - - } - ITERATE_END; - - if (HTC_QUEUE_EMPTY(&sendQueue)) { - /* no packets made it in, caller will cleanup */ - OL_ATH_HTC_PKT_ERROR_COUNT_INCR(target, - HTC_SEND_Q_EMPTY); - result = HTC_SEND_QUEUE_DROP; - break; - } - } - - } while (false); - - if (result != HTC_SEND_QUEUE_OK) { - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_try_send: \n")); - return result; - } - - if (!IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { - tx_resources = - hif_get_free_queue_number(target->hif_dev, - pEndpoint->UL_PipeID); - } else { - tx_resources = 0; - } - - LOCK_HTC_TX(target); - - if (!HTC_QUEUE_EMPTY(&sendQueue)) { - /* transfer packets to tail */ - HTC_PACKET_QUEUE_TRANSFER_TO_TAIL(&pEndpoint->TxQueue, - &sendQueue); - A_ASSERT(HTC_QUEUE_EMPTY(&sendQueue)); - INIT_HTC_PACKET_QUEUE(&sendQueue); - } - - /* increment tx processing count on entry */ - cdf_atomic_inc(&pEndpoint->TxProcessCount); - if (cdf_atomic_read(&pEndpoint->TxProcessCount) > 1) { - /* another thread or task is draining the TX queues on this endpoint - * that thread will reset the tx processing count when the queue is drained */ - cdf_atomic_dec(&pEndpoint->TxProcessCount); - UNLOCK_HTC_TX(target); - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_try_send (busy) \n")); - return HTC_SEND_QUEUE_OK; - } - - /***** beyond this point only 1 thread may enter ******/ - - /* now drain the endpoint TX queue for transmission as long as we have enough - * transmit resources */ - while (true) { - - if (HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue) == 0) { - break; - } - - if (IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { -#if DEBUG_CREDIT - int cred = pEndpoint->TxCredits; -#endif - /* credit based mechanism provides flow control based on target transmit resource availability, we - * assume that the HIF layer will always have bus resources greater than target transmit resources */ - get_htc_send_packets_credit_based(target, pEndpoint, - &sendQueue); -#if DEBUG_CREDIT - if (ep_debug_mask & (1 << pEndpoint->Id)) { - if (cred - pEndpoint->TxCredits > 0) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" Decrease EP%d %d - %d = %d credits.\n", - pEndpoint->Id, cred, - cred - - pEndpoint->TxCredits, - pEndpoint->TxCredits)); - } - } -#endif - } else { - /* get all the packets for this endpoint that we can for this pass */ - get_htc_send_packets(target, pEndpoint, &sendQueue, - tx_resources); - } - - if (HTC_PACKET_QUEUE_DEPTH(&sendQueue) == 0) { - /* didn't get any packets due to a lack of resources or TX queue was drained */ - break; - } - - UNLOCK_HTC_TX(target); - - /* send what we can */ - result = htc_issue_packets(target, pEndpoint, &sendQueue); - if (result) { - int i; - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("htc_issue_packets, failed status:%d put it back to head of callersSendQueue", - result)); - - for (i = HTC_PACKET_QUEUE_DEPTH(&sendQueue); i > 0; i--) - hif_pm_runtime_put(target->hif_dev); - - HTC_PACKET_QUEUE_TRANSFER_TO_HEAD(&pEndpoint->TxQueue, - &sendQueue); - LOCK_HTC_TX(target); - break; - } - - if (!IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { - tx_resources = - hif_get_free_queue_number(target->hif_dev, - pEndpoint->UL_PipeID); - } - - LOCK_HTC_TX(target); - - } - - UNLOCK_HTC_TX(target); - /* done with this endpoint, we can clear the count */ - cdf_atomic_init(&pEndpoint->TxProcessCount); - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_try_send: \n")); - - return HTC_SEND_QUEUE_OK; -} - -#ifdef USB_HIF_SINGLE_PIPE_DATA_SCHED -static A_UINT16 htc_send_pkts_sched_check(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID id) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - HTC_ENDPOINT_ID eid; - HTC_PACKET_QUEUE *pTxQueue; - A_UINT16 resources; - A_UINT16 acQueueStatus[DATA_EP_SIZE] = { 0, 0, 0, 0 }; - - if (id < ENDPOINT_2 || id > ENDPOINT_5) { - return 1; - } - - for (eid = ENDPOINT_2; eid <= ENDPOINT_5; eid++) { - pEndpoint = &target->endpoint[eid]; - pTxQueue = &pEndpoint->TxQueue; - - if (HTC_QUEUE_EMPTY(pTxQueue)) { - acQueueStatus[eid - 2] = 1; - } - } - - switch (id) { - case ENDPOINT_2: /* BE */ - return (acQueueStatus[0] && acQueueStatus[2] - && acQueueStatus[3]); - case ENDPOINT_3: /* BK */ - return (acQueueStatus[0] && acQueueStatus[1] && acQueueStatus[2] - && acQueueStatus[3]); - case ENDPOINT_4: /* VI */ - return (acQueueStatus[2] && acQueueStatus[3]); - case ENDPOINT_5: /* VO */ - return (acQueueStatus[3]); - default: - return 0; - } - -} - -static A_STATUS htc_send_pkts_sched_queue(HTC_TARGET *target, - HTC_PACKET_QUEUE *pPktQueue, - HTC_ENDPOINT_ID eid) -{ - HTC_ENDPOINT *pEndpoint; - HTC_PACKET_QUEUE *pTxQueue; - HTC_PACKET *pPacket; - int goodPkts; - - pEndpoint = &target->endpoint[eid]; - pTxQueue = &pEndpoint->TxQueue; - - LOCK_HTC_TX(target); - - goodPkts = - pEndpoint->MaxTxQueueDepth - - HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue); - - if (goodPkts > 0) { - while (!HTC_QUEUE_EMPTY(pPktQueue)) { - pPacket = htc_packet_dequeue(pPktQueue); - HTC_PACKET_ENQUEUE(pTxQueue, pPacket); - goodPkts--; - - if (goodPkts <= 0) { - break; - } - } - } - - if (HTC_PACKET_QUEUE_DEPTH(pPktQueue)) { - ITERATE_OVER_LIST_ALLOW_REMOVE(&pPktQueue->QueueHead, pPacket, - HTC_PACKET, ListLink) { - - if (pEndpoint->EpCallBacks. - EpSendFull(pEndpoint->EpCallBacks.pContext, - pPacket) == HTC_SEND_FULL_DROP) { - INC_HTC_EP_STAT(pEndpoint, TxDropped, 1); - } else { - HTC_PACKET_REMOVE(pPktQueue, pPacket); - HTC_PACKET_ENQUEUE(pTxQueue, pPacket); - } - } - ITERATE_END; - } - - UNLOCK_HTC_TX(target); - - return A_OK; -} - -#endif - -A_STATUS htc_send_pkts_multiple(HTC_HANDLE HTCHandle, HTC_PACKET_QUEUE *pPktQueue) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - HTC_PACKET *pPacket; - cdf_nbuf_t netbuf; - HTC_FRAME_HDR *pHtcHdr; - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+htc_send_pkts_multiple: Queue: %p, Pkts %d \n", - pPktQueue, HTC_PACKET_QUEUE_DEPTH(pPktQueue))); - - /* get packet at head to figure out which endpoint these packets will go into */ - pPacket = htc_get_pkt_at_head(pPktQueue); - if (NULL == pPacket) { - OL_ATH_HTC_PKT_ERROR_COUNT_INCR(target, GET_HTC_PKT_Q_FAIL); - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_send_pkts_multiple \n")); - return A_EINVAL; - } - - AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX); - pEndpoint = &target->endpoint[pPacket->Endpoint]; - - if (!pEndpoint->service_id) { - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("%s service_id is invalid\n", - __func__)); - return A_EINVAL; - } - -#ifdef HTC_EP_STAT_PROFILING - LOCK_HTC_TX(target); - INC_HTC_EP_STAT(pEndpoint, TxPosted, HTC_PACKET_QUEUE_DEPTH(pPktQueue)); - UNLOCK_HTC_TX(target); -#endif - - /* provide room in each packet's netbuf for the HTC frame header */ - HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pPktQueue, pPacket) { - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - AR_DEBUG_ASSERT(netbuf); - - cdf_nbuf_push_head(netbuf, sizeof(HTC_FRAME_HDR)); - /* setup HTC frame header */ - pHtcHdr = (HTC_FRAME_HDR *) cdf_nbuf_get_frag_vaddr(netbuf, 0); - AR_DEBUG_ASSERT(pHtcHdr); - HTC_WRITE32(pHtcHdr, - SM(pPacket->ActualLength, - HTC_FRAME_HDR_PAYLOADLEN) | SM(pPacket->Endpoint, - HTC_FRAME_HDR_ENDPOINTID)); - - LOCK_HTC_TX(target); - - pPacket->PktInfo.AsTx.SeqNo = pEndpoint->SeqNo; - pEndpoint->SeqNo++; - - HTC_WRITE32(((A_UINT32 *) pHtcHdr) + 1, - SM(pPacket->PktInfo.AsTx.SeqNo, - HTC_FRAME_HDR_CONTROLBYTES1)); - - UNLOCK_HTC_TX(target); - /* - * Now that the HTC frame header has been added, the netbuf can be - * mapped. This only applies to non-data frames, since data frames - * were already mapped as they entered into the driver. - */ - cdf_nbuf_map(target->osdev, - GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket), - CDF_DMA_TO_DEVICE); - - pPacket->PktInfo.AsTx.Flags |= HTC_TX_PACKET_FLAG_FIXUP_NETBUF; - } - HTC_PACKET_QUEUE_ITERATE_END; - -#ifdef USB_HIF_SINGLE_PIPE_DATA_SCHED - if (!htc_send_pkts_sched_check(HTCHandle, pEndpoint->Id)) { - htc_send_pkts_sched_queue(HTCHandle, pPktQueue, pEndpoint->Id); - } else { - htc_try_send(target, pEndpoint, pPktQueue); - } -#else - htc_try_send(target, pEndpoint, pPktQueue); -#endif - - /* do completion on any packets that couldn't get in */ - if (!HTC_QUEUE_EMPTY(pPktQueue)) { - - HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pPktQueue, pPacket) { - /* remove the headroom reserved for HTC_FRAME_HDR */ - restore_tx_packet(target, pPacket); - - if (HTC_STOPPING(target)) { - pPacket->Status = A_ECANCELED; - } else { - pPacket->Status = A_NO_RESOURCE; - } - } - HTC_PACKET_QUEUE_ITERATE_END; - - do_send_completion(pEndpoint, pPktQueue); - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_send_pkts_multiple \n")); - - return A_OK; -} - -/* HTC API - htc_send_pkt */ -A_STATUS htc_send_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) -{ - HTC_PACKET_QUEUE queue; - - if (HTCHandle == NULL || pPacket == NULL) { - return A_ERROR; - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+-htc_send_pkt: Enter endPointId: %d, buffer: %p, length: %d \n", - pPacket->Endpoint, pPacket->pBuffer, - pPacket->ActualLength)); - INIT_HTC_PACKET_QUEUE_AND_ADD(&queue, pPacket); - return htc_send_pkts_multiple(HTCHandle, &queue); -} - -#ifdef ATH_11AC_TXCOMPACT - -A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, cdf_nbuf_t netbuf, int Epid, - int ActualLength) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - HTC_FRAME_HDR *pHtcHdr; - A_STATUS status = A_OK; - int tx_resources; - uint32_t data_attr = 0; - - pEndpoint = &target->endpoint[Epid]; - - tx_resources = - hif_get_free_queue_number(target->hif_dev, pEndpoint->UL_PipeID); - - if (tx_resources < HTC_DATA_RESOURCE_THRS) { - if (pEndpoint->ul_is_polled) { - hif_send_complete_check(pEndpoint->target->hif_dev, - pEndpoint->UL_PipeID, 1); - tx_resources = - hif_get_free_queue_number(target->hif_dev, - pEndpoint->UL_PipeID); - } - if (tx_resources < HTC_DATA_MINDESC_PERPACKET) { - return A_ERROR; - } - } - - if (hif_pm_runtime_get(target->hif_dev)) - return A_ERROR; - - pHtcHdr = (HTC_FRAME_HDR *) cdf_nbuf_get_frag_vaddr(netbuf, 0); - AR_DEBUG_ASSERT(pHtcHdr); - - data_attr = cdf_nbuf_data_attr_get(netbuf); - - HTC_WRITE32(pHtcHdr, SM(ActualLength, HTC_FRAME_HDR_PAYLOADLEN) | - SM(Epid, HTC_FRAME_HDR_ENDPOINTID)); - /* - * If the HIF pipe for the data endpoint is polled rather than - * interrupt-driven, this is a good point to check whether any - * data previously sent through the HIF pipe have finished being - * sent. - * Since this may result in callbacks to htc_tx_completion_handler, - * which can take the HTC tx lock, make the hif_send_complete_check - * call before acquiring the HTC tx lock. - * Call hif_send_complete_check directly, rather than calling - * htc_send_complete_check, and call the PollTimerStart separately - * after calling hif_send_head, so the timer will be started to - * check for completion of the new outstanding download (in the - * unexpected event that other polling calls don't catch it). - */ - - LOCK_HTC_TX(target); - - HTC_WRITE32(((A_UINT32 *) pHtcHdr) + 1, - SM(pEndpoint->SeqNo, HTC_FRAME_HDR_CONTROLBYTES1)); - - pEndpoint->SeqNo++; - - NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_HTC); - DPTRACE(cdf_dp_trace(netbuf, CDF_DP_TRACE_HTC_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(netbuf)), - sizeof(cdf_nbuf_data(netbuf)))); - status = hif_send_head(target->hif_dev, - pEndpoint->UL_PipeID, - pEndpoint->Id, ActualLength, netbuf, data_attr); - - UNLOCK_HTC_TX(target); - return status; -} -#else /*ATH_11AC_TXCOMPACT */ - -A_STATUS htc_send_data_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket, - A_UINT8 more_data) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint; - HTC_FRAME_HDR *pHtcHdr; - HTC_PACKET_QUEUE sendQueue; - cdf_nbuf_t netbuf = NULL; - int tx_resources; - A_STATUS status = A_OK; - uint32_t data_attr = 0; - - if (pPacket) { - AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX); - pEndpoint = &target->endpoint[pPacket->Endpoint]; - - /* add HTC_FRAME_HDR in the initial fragment */ - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - pHtcHdr = (HTC_FRAME_HDR *) cdf_nbuf_get_frag_vaddr(netbuf, 0); - AR_DEBUG_ASSERT(pHtcHdr); - - HTC_WRITE32(pHtcHdr, - SM(pPacket->ActualLength, - HTC_FRAME_HDR_PAYLOADLEN) | SM(pPacket->PktInfo. - AsTx.SendFlags, - HTC_FRAME_HDR_FLAGS) - | SM(pPacket->Endpoint, HTC_FRAME_HDR_ENDPOINTID)); - /* - * If the HIF pipe for the data endpoint is polled rather than - * interrupt-driven, this is a good point to check whether any - * data previously sent through the HIF pipe have finished being - * sent. - * Since this may result in callbacks to htc_tx_completion_handler, - * which can take the HTC tx lock, make the hif_send_complete_check - * call before acquiring the HTC tx lock. - * Call hif_send_complete_check directly, rather than calling - * htc_send_complete_check, and call the PollTimerStart separately - * after calling hif_send_head, so the timer will be started to - * check for completion of the new outstanding download (in the - * unexpected event that other polling calls don't catch it). - */ - if (pEndpoint->ul_is_polled) { - htc_send_complete_poll_timer_stop(pEndpoint); - hif_send_complete_check(pEndpoint->target->hif_dev, - pEndpoint->UL_PipeID, 0); - } - - LOCK_HTC_TX(target); - - pPacket->PktInfo.AsTx.SeqNo = pEndpoint->SeqNo; - pEndpoint->SeqNo++; - - HTC_WRITE32(((A_UINT32 *) pHtcHdr) + 1, - SM(pPacket->PktInfo.AsTx.SeqNo, - HTC_FRAME_HDR_CONTROLBYTES1)); - - /* append new packet to pEndpoint->TxQueue */ - HTC_PACKET_ENQUEUE(&pEndpoint->TxQueue, pPacket); -#ifdef ENABLE_BUNDLE_TX - if (HTC_ENABLE_BUNDLE(target) && (more_data)) { - UNLOCK_HTC_TX(target); - return A_OK; - } -#endif - } else { - LOCK_HTC_TX(target); - pEndpoint = &target->endpoint[1]; - } - - /* increment tx processing count on entry */ - cdf_atomic_inc(&pEndpoint->TxProcessCount); - if (cdf_atomic_read(&pEndpoint->TxProcessCount) > 1) { - /* - * Another thread or task is draining the TX queues on this endpoint. - * That thread will reset the tx processing count when the queue is - * drained. - */ - cdf_atomic_dec(&pEndpoint->TxProcessCount); - UNLOCK_HTC_TX(target); - return A_OK; - } - - /***** beyond this point only 1 thread may enter ******/ - - INIT_HTC_PACKET_QUEUE(&sendQueue); - if (IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { -#if DEBUG_CREDIT - int cred = pEndpoint->TxCredits; -#endif - get_htc_send_packets_credit_based(target, pEndpoint, &sendQueue); -#if DEBUG_CREDIT - if (ep_debug_mask & (1 << pEndpoint->Id)) { - if (cred - pEndpoint->TxCredits > 0) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" Decrease EP%d %d - %d = %d credits.\n", - pEndpoint->Id, cred, - cred - pEndpoint->TxCredits, - pEndpoint->TxCredits)); - } - } -#endif - UNLOCK_HTC_TX(target); - } -#ifdef ENABLE_BUNDLE_TX - else if (HTC_ENABLE_BUNDLE(target)) { - /* Dequeue max packets from endpoint tx queue */ - get_htc_send_packets(target, pEndpoint, &sendQueue, - HTC_MAX_TX_BUNDLE_SEND_LIMIT); - UNLOCK_HTC_TX(target); - } -#endif - else { - /* - * Now drain the endpoint TX queue for transmission as long as we have - * enough transmit resources - */ - tx_resources = - hif_get_free_queue_number(target->hif_dev, - pEndpoint->UL_PipeID); - get_htc_send_packets(target, pEndpoint, &sendQueue, tx_resources); - UNLOCK_HTC_TX(target); - } - NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_HTC); - DPTRACE(cdf_dp_trace(netbuf, CDF_DP_TRACE_HTC_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(netbuf)), - sizeof(cdf_nbuf_data(netbuf)))); - - /* send what we can */ - while (true) { -#if defined(HIF_USB) || defined(HIF_SDIO) -#ifdef ENABLE_BUNDLE_TX - if (HTC_ENABLE_BUNDLE(target) && - HTC_PACKET_QUEUE_DEPTH(&sendQueue) >= - HTC_MIN_MSG_PER_BUNDLE) { - htc_issue_packets_bundle(target, pEndpoint, &sendQueue); - } -#endif -#endif - pPacket = htc_packet_dequeue(&sendQueue); - if (pPacket == NULL) { - break; - } - netbuf = GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket); - - LOCK_HTC_TX(target); - /* store in look up queue to match completions */ - HTC_PACKET_ENQUEUE(&pEndpoint->TxLookupQueue, pPacket); - INC_HTC_EP_STAT(pEndpoint, TxIssued, 1); - pEndpoint->ul_outstanding_cnt++; - UNLOCK_HTC_TX(target); - - status = hif_send_head(target->hif_dev, - pEndpoint->UL_PipeID, - pEndpoint->Id, - HTC_HDR_LENGTH + pPacket->ActualLength, - netbuf, data_attr); -#if DEBUG_BUNDLE - cdf_print(" Send single EP%d buffer size:0x%x, total:0x%x.\n", - pEndpoint->Id, - pEndpoint->TxCreditSize, - HTC_HDR_LENGTH + pPacket->ActualLength); -#endif - - if (cdf_unlikely(A_FAILED(status))) { - LOCK_HTC_TX(target); - pEndpoint->ul_outstanding_cnt--; - /* remove this packet from the tx completion queue */ - HTC_PACKET_REMOVE(&pEndpoint->TxLookupQueue, pPacket); - - /* - * Don't bother reclaiming credits - HTC flow control - * is not applicable to tx data. - * In LL systems, there is no download flow control, - * since there's virtually no download delay. - * In HL systems, the txrx SW explicitly performs the - * tx flow control. - */ - /* pEndpoint->TxCredits += pPacket->PktInfo.AsTx.CreditsUsed; */ - - /* put this frame back at the front of the sendQueue */ - HTC_PACKET_ENQUEUE_TO_HEAD(&sendQueue, pPacket); - - /* put the sendQueue back at the front of pEndpoint->TxQueue */ - HTC_PACKET_QUEUE_TRANSFER_TO_HEAD(&pEndpoint->TxQueue, - &sendQueue); - UNLOCK_HTC_TX(target); - break; /* still need to reset TxProcessCount */ - } - } - /* done with this endpoint, we can clear the count */ - cdf_atomic_init(&pEndpoint->TxProcessCount); - - if (pEndpoint->ul_is_polled) { - /* - * Start a cleanup timer to poll for download completion. - * The download completion should be noticed promptly from - * other polling calls, but the timer provides a safety net - * in case other polling calls don't occur as expected. - */ - htc_send_complete_poll_timer_start(pEndpoint); - } - - return status; -} -#endif /*ATH_11AC_TXCOMPACT */ - -/* - * In the adapted HIF layer, cdf_nbuf_t are passed between HIF and HTC, since upper layers expects - * HTC_PACKET containers we use the completed netbuf and lookup its corresponding HTC packet buffer - * from a lookup list. - * This is extra overhead that can be fixed by re-aligning HIF interfaces with HTC. - * - */ -static HTC_PACKET *htc_lookup_tx_packet(HTC_TARGET *target, - HTC_ENDPOINT *pEndpoint, - cdf_nbuf_t netbuf) -{ - HTC_PACKET *pPacket = NULL; - HTC_PACKET *pFoundPacket = NULL; - HTC_PACKET_QUEUE lookupQueue; - - INIT_HTC_PACKET_QUEUE(&lookupQueue); - LOCK_HTC_TX(target); - - /* mark that HIF has indicated the send complete for another packet */ - pEndpoint->ul_outstanding_cnt--; - - /* Dequeue first packet directly because of in-order completion */ - pPacket = htc_packet_dequeue(&pEndpoint->TxLookupQueue); - if (cdf_unlikely(!pPacket)) { - UNLOCK_HTC_TX(target); - return NULL; - } - if (netbuf == (cdf_nbuf_t) GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket)) { - UNLOCK_HTC_TX(target); - return pPacket; - } else { - HTC_PACKET_ENQUEUE(&lookupQueue, pPacket); - } - - /* - * Move TX lookup queue to temp queue because most of packets that are not index 0 - * are not top 10 packets. - */ - HTC_PACKET_QUEUE_TRANSFER_TO_TAIL(&lookupQueue, - &pEndpoint->TxLookupQueue); - UNLOCK_HTC_TX(target); - - ITERATE_OVER_LIST_ALLOW_REMOVE(&lookupQueue.QueueHead, pPacket, - HTC_PACKET, ListLink) { - - if (NULL == pPacket) { - pFoundPacket = pPacket; - break; - } - /* check for removal */ - if (netbuf == - (cdf_nbuf_t) GET_HTC_PACKET_NET_BUF_CONTEXT(pPacket)) { - /* found it */ - HTC_PACKET_REMOVE(&lookupQueue, pPacket); - pFoundPacket = pPacket; - break; - } - - } - ITERATE_END; - - LOCK_HTC_TX(target); - HTC_PACKET_QUEUE_TRANSFER_TO_HEAD(&pEndpoint->TxLookupQueue, - &lookupQueue); - UNLOCK_HTC_TX(target); - - return pFoundPacket; -} - -CDF_STATUS htc_tx_completion_handler(void *Context, - cdf_nbuf_t netbuf, unsigned int EpID, - uint32_t toeplitz_hash_result) -{ - HTC_TARGET *target = (HTC_TARGET *) Context; - HTC_ENDPOINT *pEndpoint; - HTC_PACKET *pPacket; -#ifdef USB_HIF_SINGLE_PIPE_DATA_SCHED - HTC_ENDPOINT_ID eid[DATA_EP_SIZE] = - { ENDPOINT_5, ENDPOINT_4, ENDPOINT_2, ENDPOINT_3 }; - int epidIdx; - A_UINT16 resourcesThresh[DATA_EP_SIZE]; /* urb resources */ - A_UINT16 resources; - A_UINT16 resourcesMax; -#endif - - pEndpoint = &target->endpoint[EpID]; - target->TX_comp_cnt++; - - do { - pPacket = htc_lookup_tx_packet(target, pEndpoint, netbuf); - if (NULL == pPacket) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("HTC TX lookup failed!\n")); - /* may have already been flushed and freed */ - netbuf = NULL; - break; - } - if (pPacket->PktInfo.AsTx.Tag != HTC_TX_PACKET_TAG_AUTO_PM) - hif_pm_runtime_put(target->hif_dev); - - if (pPacket->PktInfo.AsTx.Tag == HTC_TX_PACKET_TAG_BUNDLED) { - HTC_PACKET *pPacketTemp; - HTC_PACKET_QUEUE *pQueueSave = - (HTC_PACKET_QUEUE *) pPacket->pContext; - HTC_PACKET_QUEUE_ITERATE_ALLOW_REMOVE(pQueueSave, - pPacketTemp) { - pPacket->Status = A_OK; - send_packet_completion(target, pPacketTemp); - } - HTC_PACKET_QUEUE_ITERATE_END; - free_htc_bundle_packet(target, pPacket); - return CDF_STATUS_SUCCESS; - } - /* will be giving this buffer back to upper layers */ - netbuf = NULL; - pPacket->Status = CDF_STATUS_SUCCESS; - send_packet_completion(target, pPacket); - - } while (false); - - if (!IS_TX_CREDIT_FLOW_ENABLED(pEndpoint)) { - /* note: when using TX credit flow, the re-checking of queues happens - * when credits flow back from the target. - * in the non-TX credit case, we recheck after the packet completes */ - htc_try_send(target, pEndpoint, NULL); - } - - return CDF_STATUS_SUCCESS; -} - -/* callback when TX resources become available */ -void htc_tx_resource_avail_handler(void *context, A_UINT8 pipeID) -{ - int i; - HTC_TARGET *target = (HTC_TARGET *) context; - HTC_ENDPOINT *pEndpoint = NULL; - - for (i = 0; i < ENDPOINT_MAX; i++) { - pEndpoint = &target->endpoint[i]; - if (pEndpoint->service_id != 0) { - if (pEndpoint->UL_PipeID == pipeID) { - break; - } - } - } - - if (i >= ENDPOINT_MAX) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("Invalid pipe indicated for TX resource avail : %d!\n", - pipeID)); - return; - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("HIF indicated more resources for pipe:%d \n", - pipeID)); - - htc_try_send(target, pEndpoint, NULL); -} - -/** - * htc_kick_queues(): resumes tx transactions of suspended endpoints - * @context: pointer to the htc target context - * - * Iterates throught the enpoints and provides a context to empty queues - * int the hif layer when they are stalled due to runtime suspend. - * - * Return: none - */ -void htc_kick_queues(void *context) -{ - int i; - HTC_TARGET *target = (HTC_TARGET *)context; - HTC_ENDPOINT *endpoint = NULL; - - for (i = 0; i < ENDPOINT_MAX; i++) { - endpoint = &target->endpoint[i]; - - if (endpoint->service_id == 0) - continue; - - if (endpoint->EpCallBacks.ep_resume_tx_queue) - endpoint->EpCallBacks.ep_resume_tx_queue( - endpoint->EpCallBacks.pContext); - - htc_try_send(target, endpoint, NULL); - } -} - -/* flush endpoint TX queue */ -void htc_flush_endpoint_tx(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, - HTC_TX_TAG Tag) -{ - HTC_PACKET *pPacket; - - LOCK_HTC_TX(target); - while (HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue)) { - pPacket = htc_packet_dequeue(&pEndpoint->TxQueue); - - if (pPacket) { - /* let the sender know the packet was not delivered */ - pPacket->Status = A_ECANCELED; - send_packet_completion(target, pPacket); - } - } - UNLOCK_HTC_TX(target); -} - -/* HTC API to flush an endpoint's TX queue*/ -void htc_flush_endpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, - HTC_TX_TAG Tag) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - HTC_ENDPOINT *pEndpoint = &target->endpoint[Endpoint]; - - if (pEndpoint->service_id == 0) { - AR_DEBUG_ASSERT(false); - /* not in use.. */ - return; - } - - htc_flush_endpoint_tx(target, pEndpoint, Tag); -} - -/* HTC API to indicate activity to the credit distribution function */ -void htc_indicate_activity_change(HTC_HANDLE HTCHandle, - HTC_ENDPOINT_ID Endpoint, A_BOOL Active) -{ - /* TODO */ -} - -A_BOOL htc_is_endpoint_active(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint) -{ - return true; -} - -/* process credit reports and call distribution function */ -void htc_process_credit_rpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, - int NumEntries, HTC_ENDPOINT_ID FromEndpoint) -{ - int i; - HTC_ENDPOINT *pEndpoint; - int totalCredits = 0; - A_UINT8 rpt_credits, rpt_ep_id; - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - ("+htc_process_credit_rpt, Credit Report Entries:%d \n", - NumEntries)); - - /* lock out TX while we update credits */ - LOCK_HTC_TX(target); - - for (i = 0; i < NumEntries; i++, pRpt++) { - - rpt_ep_id = HTC_GET_FIELD(pRpt, HTC_CREDIT_REPORT, ENDPOINTID); - - if (rpt_ep_id >= ENDPOINT_MAX) { - AR_DEBUG_ASSERT(false); - break; - } - - rpt_credits = HTC_GET_FIELD(pRpt, HTC_CREDIT_REPORT, CREDITS); - - pEndpoint = &target->endpoint[rpt_ep_id]; -#if DEBUG_CREDIT - if (ep_debug_mask & (1 << pEndpoint->Id)) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" Increase EP%d %d + %d = %d credits\n", - rpt_ep_id, pEndpoint->TxCredits, - rpt_credits, - pEndpoint->TxCredits + rpt_credits)); - } -#endif - -#ifdef HTC_EP_STAT_PROFILING - - INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1); - INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, rpt_credits); - - if (FromEndpoint == rpt_ep_id) { - /* this credit report arrived on the same endpoint indicating it arrived in an RX - * packet */ - INC_HTC_EP_STAT(pEndpoint, TxCreditsFromRx, - rpt_credits); - INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromRx, 1); - } else if (FromEndpoint == ENDPOINT_0) { - /* this credit arrived on endpoint 0 as a NULL message */ - INC_HTC_EP_STAT(pEndpoint, TxCreditsFromEp0, - rpt_credits); - INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromEp0, 1); - } else { - /* arrived on another endpoint */ - INC_HTC_EP_STAT(pEndpoint, TxCreditsFromOther, - rpt_credits); - INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1); - } - -#endif -#if defined(HIF_USB) - if (pEndpoint->Id >= ENDPOINT_2 && pEndpoint->Id <= ENDPOINT_5) { - HTC_ENDPOINT_ID eid[DATA_EP_SIZE] = - { ENDPOINT_5, ENDPOINT_4, ENDPOINT_2, ENDPOINT_3 }; - int epid_idx; - - target->avail_tx_credits += rpt_credits; - - for (epid_idx = 0; epid_idx < DATA_EP_SIZE; epid_idx++) { - pEndpoint = &target->endpoint[eid[epid_idx]]; - if (HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue)) { - break; - } - - } - UNLOCK_HTC_TX(target); - htc_try_send(target, pEndpoint, NULL); - LOCK_HTC_TX(target); - } else { - pEndpoint->TxCredits += rpt_credits; - - if (pEndpoint->TxCredits - && HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue)) { - UNLOCK_HTC_TX(target); - htc_try_send(target, pEndpoint, NULL); - LOCK_HTC_TX(target); - } - } -#else - pEndpoint->TxCredits += rpt_credits; - - if (pEndpoint->service_id == WMI_CONTROL_SVC) { - LOCK_HTC_CREDIT(target); - htc_credit_record(HTC_PROCESS_CREDIT_REPORT, - pEndpoint->TxCredits, - HTC_PACKET_QUEUE_DEPTH(&pEndpoint-> - TxQueue)); - UNLOCK_HTC_CREDIT(target); - } - - if (pEndpoint->TxCredits - && HTC_PACKET_QUEUE_DEPTH(&pEndpoint->TxQueue)) { - UNLOCK_HTC_TX(target); -#ifdef ATH_11AC_TXCOMPACT - htc_try_send(target, pEndpoint, NULL); -#else - if (pEndpoint->service_id == HTT_DATA_MSG_SVC) { - htc_send_data_pkt(target, NULL, 0); - } else { - htc_try_send(target, pEndpoint, NULL); - } -#endif - LOCK_HTC_TX(target); - } -#endif - totalCredits += rpt_credits; - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, - (" Report indicated %d credits to distribute \n", - totalCredits)); - - UNLOCK_HTC_TX(target); - - AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-htc_process_credit_rpt \n")); -} - -/* function to fetch stats from htc layer*/ -struct ol_ath_htc_stats *ieee80211_ioctl_get_htc_stats(HTC_HANDLE HTCHandle) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - - return (&(target->htc_pkt_stats)); -} diff --git a/core/htc/htc_services.c b/core/htc/htc_services.c deleted file mode 100644 index 0e6ce13a6c90..000000000000 --- a/core/htc/htc_services.c +++ /dev/null @@ -1,369 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include "htc_debug.h" -#include "htc_internal.h" -#include /* cdf_nbuf_t */ -#include "hif.h" - -/* use credit flow control over HTC */ -unsigned int htc_credit_flow = 1; -#ifndef DEBUG_CREDIT -#define DEBUG_CREDIT 0 -#endif - -A_STATUS htc_connect_service(HTC_HANDLE HTCHandle, - HTC_SERVICE_CONNECT_REQ *pConnectReq, - HTC_SERVICE_CONNECT_RESP *pConnectResp) -{ - HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); - A_STATUS status = A_OK; - HTC_PACKET *pSendPacket = NULL; - HTC_CONNECT_SERVICE_RESPONSE_MSG *pResponseMsg; - HTC_CONNECT_SERVICE_MSG *pConnectMsg; - HTC_ENDPOINT_ID assignedEndpoint = ENDPOINT_MAX; - HTC_ENDPOINT *pEndpoint; - unsigned int maxMsgSize = 0; - cdf_nbuf_t netbuf; - A_UINT8 txAlloc; - int length; - A_BOOL disableCreditFlowCtrl = false; - A_UINT16 conn_flags; - A_UINT16 rsp_msg_id, rsp_msg_serv_id, rsp_msg_max_msg_size; - A_UINT8 rsp_msg_status, rsp_msg_end_id, rsp_msg_serv_meta_len; - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("+htc_connect_service, target:%p SvcID:0x%X\n", target, - pConnectReq->service_id)); - - do { - - AR_DEBUG_ASSERT(pConnectReq->service_id != 0); - - if (HTC_CTRL_RSVD_SVC == pConnectReq->service_id) { - /* special case for pseudo control service */ - assignedEndpoint = ENDPOINT_0; - maxMsgSize = HTC_MAX_CONTROL_MESSAGE_LENGTH; - txAlloc = 0; - - } else { - - txAlloc = htc_get_credit_allocation(target, - pConnectReq->service_id); - - if (!txAlloc) { - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("Service %d does not allocate target credits!\n", - pConnectReq->service_id)); - } - - /* allocate a packet to send to the target */ - pSendPacket = htc_alloc_control_tx_packet(target); - - if (NULL == pSendPacket) { - AR_DEBUG_ASSERT(false); - status = A_NO_MEMORY; - break; - } - - netbuf = - (cdf_nbuf_t) - GET_HTC_PACKET_NET_BUF_CONTEXT(pSendPacket); - length = - sizeof(HTC_CONNECT_SERVICE_MSG) + - pConnectReq->MetaDataLength; - - /* assemble connect service message */ - cdf_nbuf_put_tail(netbuf, length); - pConnectMsg = - (HTC_CONNECT_SERVICE_MSG *) cdf_nbuf_data(netbuf); - - if (NULL == pConnectMsg) { - AR_DEBUG_ASSERT(0); - status = A_EFAULT; - break; - } - - A_MEMZERO(pConnectMsg, sizeof(HTC_CONNECT_SERVICE_MSG)); - - conn_flags = - (pConnectReq-> - ConnectionFlags & ~HTC_SET_RECV_ALLOC_MASK) | - HTC_CONNECT_FLAGS_SET_RECV_ALLOCATION(txAlloc); - HTC_SET_FIELD(pConnectMsg, HTC_CONNECT_SERVICE_MSG, - MESSAGEID, HTC_MSG_CONNECT_SERVICE_ID); - HTC_SET_FIELD(pConnectMsg, HTC_CONNECT_SERVICE_MSG, - SERVICE_ID, pConnectReq->service_id); - HTC_SET_FIELD(pConnectMsg, HTC_CONNECT_SERVICE_MSG, - CONNECTIONFLAGS, conn_flags); - - if (pConnectReq-> - ConnectionFlags & - HTC_CONNECT_FLAGS_DISABLE_CREDIT_FLOW_CTRL) { - disableCreditFlowCtrl = true; - } -#if defined(HIF_USB) - if (!htc_credit_flow) { - disableCreditFlowCtrl = true; - } -#else - /* Only enable credit for WMI service */ - if (!htc_credit_flow - && pConnectReq->service_id != WMI_CONTROL_SVC) { - disableCreditFlowCtrl = true; - } -#endif - /* check caller if it wants to transfer meta data */ - if ((pConnectReq->pMetaData != NULL) && - (pConnectReq->MetaDataLength <= - HTC_SERVICE_META_DATA_MAX_LENGTH)) { - /* copy meta data into message buffer (after header ) */ - A_MEMCPY((A_UINT8 *) pConnectMsg + - sizeof(HTC_CONNECT_SERVICE_MSG), - pConnectReq->pMetaData, - pConnectReq->MetaDataLength); - - HTC_SET_FIELD(pConnectMsg, - HTC_CONNECT_SERVICE_MSG, - SERVICEMETALENGTH, - pConnectReq->MetaDataLength); - } - - SET_HTC_PACKET_INFO_TX(pSendPacket, - NULL, - (A_UINT8 *) pConnectMsg, - length, - ENDPOINT_0, - HTC_SERVICE_TX_PACKET_TAG); - - status = htc_send_pkt((HTC_HANDLE) target, pSendPacket); - /* we don't own it anymore */ - pSendPacket = NULL; - if (A_FAILED(status)) { - break; - } - - /* wait for response */ - status = htc_wait_recv_ctrl_message(target); - if (A_FAILED(status)) { - break; - } - /* we controlled the buffer creation so it has to be properly aligned */ - pResponseMsg = - (HTC_CONNECT_SERVICE_RESPONSE_MSG *) target-> - CtrlResponseBuffer; - - rsp_msg_id = HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - MESSAGEID); - rsp_msg_serv_id = - HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - SERVICEID); - rsp_msg_status = - HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - STATUS); - rsp_msg_end_id = - HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - ENDPOINTID); - rsp_msg_max_msg_size = - HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - MAXMSGSIZE); - rsp_msg_serv_meta_len = - HTC_GET_FIELD(pResponseMsg, - HTC_CONNECT_SERVICE_RESPONSE_MSG, - SERVICEMETALENGTH); - - if ((rsp_msg_id != HTC_MSG_CONNECT_SERVICE_RESPONSE_ID) - || (target->CtrlResponseLength < - sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG))) { - /* this message is not valid */ - AR_DEBUG_ASSERT(false); - status = A_EPROTO; - break; - } - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, - ("htc_connect_service, service 0x%X connect response from target status:%d, assigned ep: %d\n", - rsp_msg_serv_id, rsp_msg_status, - rsp_msg_end_id)); - - pConnectResp->ConnectRespCode = rsp_msg_status; - - /* check response status */ - if (rsp_msg_status != HTC_SERVICE_SUCCESS) { - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - (" Target failed service 0x%X connect request (status:%d)\n", - rsp_msg_serv_id, - rsp_msg_status)); - status = A_EPROTO; -#ifdef QCA_TX_HTT2_SUPPORT - /* Keep work and not to block the control message. */ - target->CtrlResponseProcessing = false; -#endif /* QCA_TX_HTT2_SUPPORT */ - break; - } - - assignedEndpoint = (HTC_ENDPOINT_ID) rsp_msg_end_id; - maxMsgSize = rsp_msg_max_msg_size; - - if ((pConnectResp->pMetaData != NULL) && - (rsp_msg_serv_meta_len > 0) && - (rsp_msg_serv_meta_len <= - HTC_SERVICE_META_DATA_MAX_LENGTH)) { - /* caller supplied a buffer and the target responded with data */ - int copyLength = - min((int)pConnectResp->BufferLength, - (int)rsp_msg_serv_meta_len); - /* copy the meta data */ - A_MEMCPY(pConnectResp->pMetaData, - ((A_UINT8 *) pResponseMsg) + - sizeof - (HTC_CONNECT_SERVICE_RESPONSE_MSG), - copyLength); - pConnectResp->ActualLength = copyLength; - } - /* done processing response buffer */ - target->CtrlResponseProcessing = false; - } - - /* the rest of these are parameter checks so set the error status */ - status = A_EPROTO; - - if (assignedEndpoint >= ENDPOINT_MAX) { - AR_DEBUG_ASSERT(false); - break; - } - - if (0 == maxMsgSize) { - AR_DEBUG_ASSERT(false); - break; - } - - pEndpoint = &target->endpoint[assignedEndpoint]; - pEndpoint->Id = assignedEndpoint; - if (pEndpoint->service_id != 0) { - /* endpoint already in use! */ - AR_DEBUG_ASSERT(false); - break; - } - - /* return assigned endpoint to caller */ - pConnectResp->Endpoint = assignedEndpoint; - pConnectResp->MaxMsgLength = maxMsgSize; - - /* setup the endpoint */ - /* service_id marks the endpoint in use */ - pEndpoint->service_id = pConnectReq->service_id; - pEndpoint->MaxTxQueueDepth = pConnectReq->MaxSendQueueDepth; - pEndpoint->MaxMsgLength = maxMsgSize; - pEndpoint->TxCredits = txAlloc; - pEndpoint->TxCreditSize = target->TargetCreditSize; - pEndpoint->TxCreditsPerMaxMsg = - maxMsgSize / target->TargetCreditSize; - if (maxMsgSize % target->TargetCreditSize) { - pEndpoint->TxCreditsPerMaxMsg++; - } -#if DEBUG_CREDIT - cdf_print(" Endpoint%d initial credit:%d, size:%d.\n", - pEndpoint->Id, pEndpoint->TxCredits, - pEndpoint->TxCreditSize); -#endif - - /* copy all the callbacks */ - pEndpoint->EpCallBacks = pConnectReq->EpCallbacks; - - status = hif_map_service_to_pipe(target->hif_dev, - pEndpoint->service_id, - &pEndpoint->UL_PipeID, - &pEndpoint->DL_PipeID, - &pEndpoint->ul_is_polled, - &pEndpoint->dl_is_polled); - if (A_FAILED(status)) { - break; - } - - cdf_assert(!pEndpoint->dl_is_polled); /* not currently supported */ - - if (pEndpoint->ul_is_polled) { - cdf_softirq_timer_init(target->osdev, - &pEndpoint->ul_poll_timer, - htc_send_complete_check_cleanup, - pEndpoint, - CDF_TIMER_TYPE_SW); - } - - AR_DEBUG_PRINTF(ATH_DEBUG_SETUP, - ("HTC Service:0x%4.4X, ULpipe:%d DLpipe:%d id:%d Ready\n", - pEndpoint->service_id, pEndpoint->UL_PipeID, - pEndpoint->DL_PipeID, pEndpoint->Id)); - - if (disableCreditFlowCtrl && pEndpoint->TxCreditFlowEnabled) { - pEndpoint->TxCreditFlowEnabled = false; - AR_DEBUG_PRINTF(ATH_DEBUG_WARN, - ("HTC Service:0x%4.4X ep:%d TX flow control disabled\n", - pEndpoint->service_id, - assignedEndpoint)); - } - - } while (false); - - AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-htc_connect_service \n")); - - return status; -} - -void htc_set_credit_distribution(HTC_HANDLE HTCHandle, - void *pCreditDistContext, - HTC_CREDIT_DIST_CALLBACK CreditDistFunc, - HTC_CREDIT_INIT_CALLBACK CreditInitFunc, - HTC_SERVICE_ID ServicePriorityOrder[], - int ListLength) -{ - /* NOT Supported, this transport does not use a credit based flow control mechanism */ - -} - -void htc_fw_event_handler(void *context, CDF_STATUS status) -{ - HTC_TARGET *target = (HTC_TARGET *) context; - HTC_INIT_INFO *initInfo = &target->HTCInitInfo; - - /* check if target failure handler exists and pass error code to it. */ - if (target->HTCInitInfo.TargetFailure != NULL) { - initInfo->TargetFailure(initInfo->pContext, status); - } -} - -/* Disable ASPM : disable PCIe low power */ -void htc_disable_aspm(void) -{ - hif_disable_aspm(); -} -- cgit v1.2.3 From c11bb2226ce5ecfcdc16e38b5967ee49e28d2c81 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 27 Jan 2016 18:57:10 +0530 Subject: qcacld-3.0: Refactor ol_sc for target_info and ini params Clean up driver modules to query hif for the handle, instead of accessing hif context in other modules. Change-Id: If179255b355916794c9097cf8ff1cbc64ba5df84 CRs-Fixed: 967765 --- core/bmi/src/bmi_1.c | 9 +-- core/bmi/src/bmi_2.c | 10 +++- core/bmi/src/ol_fw.c | 108 +++++++++++++++++++++--------------- core/cds/src/cds_api.c | 11 +--- core/hdd/inc/wlan_hdd_cfg.h | 4 +- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_cfg.c | 6 +- core/hdd/src/wlan_hdd_ftm.c | 19 +++++-- core/hdd/src/wlan_hdd_main.c | 47 +++++++++++++--- core/hdd/src/wlan_hdd_power.c | 3 - core/utils/epping/src/epping_main.c | 14 ++++- 11 files changed, 146 insertions(+), 87 deletions(-) diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 2d0783a5a41a..e633030491aa 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -234,8 +234,9 @@ bmi_firmware_download(struct ol_softc *scn) { CDF_STATUS status; struct bmi_target_info targ_info; - cdf_mem_zero(&targ_info, sizeof(targ_info)); + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + cdf_mem_zero(&targ_info, sizeof(targ_info)); /* Initialize BMI */ status = bmi_init(scn); if (status != CDF_STATUS_SUCCESS) { @@ -250,8 +251,8 @@ bmi_firmware_download(struct ol_softc *scn) return status; } - scn->target_type = targ_info.target_type; - scn->target_version = targ_info.target_ver; + tgt_info->target_type = targ_info.target_type; + tgt_info->target_version = targ_info.target_ver; /* Configure target */ status = ol_configure_target(scn); diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index b04f4cbfc159..2391222d3801 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -382,6 +382,7 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) struct bmi_target_info targ_info; struct image_desc_info image_desc_info; CDF_STATUS status; + struct hif_target_info *tgt_info; if (!scn) { BMI_ERR("Invalid scn context"); @@ -389,6 +390,8 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) return CDF_STATUS_NOT_INITIALIZED; } + tgt_info = hif_get_target_info_handle(scn); + if (scn->bmi_cmd_buff == NULL || scn->bmi_rsp_buff == NULL) { BMI_ERR("bmi_open failed!"); return CDF_STATUS_NOT_INITIALIZED; @@ -400,8 +403,9 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) BMI_DBG("%s: target type 0x%x, target ver 0x%x", __func__, targ_info.target_type, targ_info.target_ver); - scn->target_type = targ_info.target_type; - scn->target_version = targ_info.target_ver; + + tgt_info->target_type = targ_info.target_type; + tgt_info->target_version = targ_info.target_ver; if (cnss_get_fw_image(&image_desc_info) != 0) { BMI_ERR("Failed to get fw image"); diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index eda2dde95e0f..bcf07c0a1af5 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -146,6 +146,8 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, int bin_off, bin_len; SIGN_HEADER_T *sign_header; #endif + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + uint32_t target_type = tgt_info->target_type; switch (file) { default: @@ -303,7 +305,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, cdf_mem_copy(temp_eeprom, (uint8_t *) fw_entry->data, fw_entry_size); - switch (scn->target_type) { + switch (target_type) { default: board_data_size = 0; board_ext_data_size = 0; @@ -318,7 +320,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, } /* Determine where in Target RAM to write Board Data */ - bmi_read_memory(HOST_INTEREST_ITEM_ADDRESS(scn->target_type, + bmi_read_memory(HOST_INTEREST_ITEM_ADDRESS(target_type, hi_board_ext_data), (uint8_t *) &board_ext_address, 4, scn); BMI_INFO("Board extended Data download address: 0x%x", @@ -344,7 +346,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, /* Record extended board Data initialized */ param = (board_ext_data_size << 16) | 1; bmi_write_memory( - HOST_INTEREST_ITEM_ADDRESS(scn->target_type, + HOST_INTEREST_ITEM_ADDRESS(target_type, hi_board_ext_data_config), (uint8_t *)¶m, 4, scn); @@ -498,11 +500,15 @@ static void ramdump_work_handler(struct work_struct *ramdump) int ret; uint32_t host_interest_address; uint32_t dram_dump_values[4]; - + uint32_t target_type; + struct hif_target_info *tgt_info; if (!ramdump_scn) { BMI_ERR("%s:Ramdump_scn is null:", __func__); goto out_fail; } + + tgt_info = hif_get_target_info_handle(ramdump_scn); + target_type = tgt_info->target_type; #ifdef DEBUG ret = hif_check_soc_status(ramdump_scn); if (ret) @@ -515,7 +521,7 @@ static void ramdump_work_handler(struct work_struct *ramdump) #endif if (hif_diag_read_mem(ramdump_scn, - hif_hia_item_address(ramdump_scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_failure_state)), (uint8_t *)&host_interest_address, sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { @@ -579,6 +585,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) { struct ol_softc *scn = (struct ol_softc *)instance; tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); int ret; cdf_event_set(&wma->recovery_event); @@ -604,7 +611,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) #ifdef CONFIG_CNSS ret = hif_check_fw_reg(scn); if (0 == ret) { - if (scn->enable_self_recovery) { + if (ini_cfg->enable_self_recovery) { ol_schedule_fw_indication_work(scn); return; } @@ -617,7 +624,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) #if defined(CONFIG_CNSS) /* Collect the RAM dump through a workqueue */ - if (scn->enable_ramdump_collection) + if (ini_cfg->enable_ramdump_collection) ol_schedule_ramdump_work(scn); else pr_debug("%s: athdiag read for target reg\n", __func__); @@ -633,11 +640,14 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) struct cnss_platform_cap cap; int ret; #endif + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + uint32_t target_type = tgt_info->target_type; /* Tell target which HTC version it is used */ param = HTC_PROTOCOL_VERSION; if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_app_host_interest)), (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_write_memory for htc version failed"); @@ -646,7 +656,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) /* set the firmware mode to STA/IBSS/AP */ { - if (bmi_read_memory(hif_hia_item_address(scn->target_type, + if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting fwmode failed"); @@ -668,7 +678,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) 1, HI_OPTION_FW_MODE_AP, 0, 0); if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting fwmode failed"); @@ -679,7 +689,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) #if (CONFIG_DISABLE_CDC_MAX_PERF_WAR) { /* set the firmware to disable CDC max perf WAR */ - if (bmi_read_memory(hif_hia_item_address(scn->target_type, + if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI READ for setting cdc max perf failed"); @@ -688,7 +698,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) param |= HI_OPTION_DISABLE_CDC_MAX_PERF_WAR; if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("setting cdc max perf failed"); @@ -704,7 +714,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) BMI_ERR("platform capability info from CNSS not available"); if (!ret && cap.cap_flag & CNSS_HAS_EXTERNAL_SWREG) { - if (bmi_read_memory(hif_hia_item_address(scn->target_type, + if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting" @@ -714,7 +724,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) param |= HI_OPTION_USE_EXT_LDO; if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting external SWREG fail"); @@ -724,8 +734,8 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) #endif #ifdef WLAN_FEATURE_LPSS - if (scn->enablelpasssupport) { - if (bmi_read_memory(hif_hia_item_address(scn->target_type, + if (ini_cfg->enable_lpass_support) { + if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI READ:Setting LPASS Support failed"); @@ -734,7 +744,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) param |= HI_OPTION_DBUART_SUPPORT; if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI_READ for setting LPASS Support fail"); @@ -751,7 +761,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) param = 0; #endif if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_be)), (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("setting host CPU BE mode failed"); @@ -762,7 +772,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) /* FW descriptor/Data swap flags */ param = 0; if (bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_fw_swap)), (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE failed setting FW data/desc swap flags"); @@ -854,8 +864,10 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) uint32_t cmnos_core_clk_div_addr = 0; uint32_t cmnos_cpu_pll_init_done_addr = 0; uint32_t cmnos_cpu_speed_addr = 0; + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + uint32_t target_version = tgt_info->target_version; - switch (scn->target_version) { + switch (target_version) { case AR6320_REV1_1_VERSION: cmnos_core_clk_div_addr = AR6320_CORE_CLK_DIV_ADDR; cmnos_cpu_pll_init_done_addr = AR6320_CPU_PLL_INIT_DONE_ADDR; @@ -875,7 +887,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) break; default: BMI_ERR("%s: Unsupported target version %x", __func__, - scn->target_version); + target_version); goto end; } @@ -1166,18 +1178,22 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) uint32_t param, address = 0; int status = !EOK; CDF_STATUS ret; + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + uint32_t target_type = tgt_info->target_type; + uint32_t target_version = tgt_info->target_version; #ifdef CONFIG_CNSS if (0 != cnss_get_fw_files_for_target(&scn->fw_files, - scn->target_type, - scn->target_version)) { + target_type, + target_version)) { BMI_ERR("%s: No FW files from CNSS driver", __func__); return CDF_STATUS_E_FAILURE; } #endif /* Transfer Board Data from Target EEPROM to Target RAM */ /* Determine where in Target RAM to write Board Data */ - bmi_read_memory(hif_hia_item_address(scn->target_type, + bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data)), (uint8_t *)&address, 4, scn); @@ -1201,7 +1217,7 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) /* Record the fact that Board Data is initialized */ param = 1; bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data_initialized)), (uint8_t *) ¶m, 4, scn); @@ -1215,7 +1231,7 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) /* Record the fact that Board Data is initialized */ param = 1; bmi_write_memory( - hif_hia_item_address(scn->target_type, + hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data_initialized)), (uint8_t *) ¶m, 4, scn); @@ -1264,15 +1280,15 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) != EOK) { return -1; } - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_dset_list_head)), (uint8_t *) &address, 4, scn); } - if (scn->enableuartprint || + if (ini_cfg->enable_uart_print || (WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && WLAN_IS_EPPING_FW_UART(cds_get_conparam()))) { - switch (scn->target_version) { + switch (tgt_info->target_version) { case AR6004_VERSION_REV1_3: param = 11; break; @@ -1289,11 +1305,11 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) param = 7; } - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_dbg_uart_txpin)), (uint8_t *)¶m, 4, scn); param = 1; - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_serial_enable)), (uint8_t *)¶m, 4, scn); } else { @@ -1302,18 +1318,18 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) * based on scratch registers. */ param = 0; - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_serial_enable)), (uint8_t *)¶m, 4, scn); } - if (scn->enablefwlog) { - bmi_read_memory(hif_hia_item_address(scn->target_type, + if (ini_cfg->enable_fw_log) { + bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *)¶m, 4, scn); param &= ~(HI_OPTION_DISABLE_DBGLOG); - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *)¶m, 4, scn); } else { @@ -1321,12 +1337,12 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) * Explicitly setting fwlog prints to zero as target turns it on * based on scratch registers. */ - bmi_read_memory(hif_hia_item_address(scn->target_type, + bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *)¶m, 4, scn); param |= HI_OPTION_DISABLE_DBGLOG; - bmi_write_memory(hif_hia_item_address(scn->target_type, + bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), (uint8_t *) ¶m, 4, scn); } @@ -1413,8 +1429,10 @@ static int ol_diag_read_reg_loc(struct ol_softc *scn, uint8_t *buffer, int dump_len, result = 0; tgt_reg_table reg_table; tgt_reg_section *curr_sec, *next_sec; + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + uint32_t target_version = tgt_info->target_version; - section_len = ol_ath_get_reg_table(scn->target_version, ®_table); + section_len = ol_ath_get_reg_table(target_version, ®_table); if (!reg_table.section || !reg_table.section_size || !section_len) { BMI_ERR("%s: failed to get reg table", __func__); @@ -1587,21 +1605,19 @@ static int ol_target_coredump(void *inst, void *memory_block, uint8_t ol_get_number_of_peers_supported(struct ol_softc *scn) { - uint8_t max_no_of_peers = 0; + struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + uint8_t max_no_of_peers = ini_cfg->max_no_of_peers; - switch (scn->target_version) { + switch (tgt_info->target_version) { case AR6320_REV1_1_VERSION: - if (scn->max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_1) + if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_1) max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_1; - else - max_no_of_peers = scn->max_no_of_peers; break; default: - if (scn->max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_3) + if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_3) max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_3; - else - max_no_of_peers = scn->max_no_of_peers; break; } diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 448aee02073d..dcb92c922e35 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -253,15 +253,8 @@ CDF_STATUS cds_open(void) "%s: scn is null!", __func__); goto err_sched_close; } - scn->enableuartprint = pHddCtx->config->enablefwprint; - scn->enablefwlog = pHddCtx->config->enablefwlog; - scn->max_no_of_peers = pHddCtx->config->maxNumberOfPeers; -#ifdef WLAN_FEATURE_LPSS - scn->enablelpasssupport = pHddCtx->config->enablelpasssupport; -#endif - scn->enable_ramdump_collection = - pHddCtx->config->is_ramdump_enabled; - scn->enable_self_recovery = pHddCtx->config->enableSelfRecovery; + + hdd_update_hif_config(scn, pHddCtx); /* Initialize BMI and Download firmware */ cdf_status = bmi_download_firmware(scn); diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index cc956bf71e18..d02124b3fb1e 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3242,7 +3242,7 @@ struct hdd_config { bool enable_ip_tcp_udp_checksum_offload; bool enablePowersaveOffload; bool enablefwprint; - bool enablefwlog; + bool enable_fw_log; #ifdef WLAN_FEATURE_11AC uint8_t fVhtAmpduLenExponent; uint32_t vhtMpduLen; @@ -3368,7 +3368,7 @@ struct hdd_config { bool enableSifsBurst; #ifdef WLAN_FEATURE_LPSS - bool enablelpasssupport; + bool enable_lpass_support; #endif #ifdef WLAN_FEATURE_NAN bool enable_nan_support; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 1e0e388c8087..a08d7362c6a5 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1525,5 +1525,5 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); - +void hdd_update_hif_config(void *scn, hdd_context_t *hdd_ctx); #endif /* end #if !defined(WLAN_HDD_MAIN_H) */ diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 34661104bf59..dc76115a4823 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -2587,7 +2587,7 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_ENABLE_FW_UART_PRINT_ENABLE), REG_VARIABLE(CFG_ENABLE_FW_LOG_NAME, WLAN_PARAM_Integer, - struct hdd_config, enablefwlog, + struct hdd_config, enable_fw_log, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, CFG_ENABLE_FW_LOG_DEFAULT, CFG_ENABLE_FW_LOG_DISABLE, @@ -3209,7 +3209,7 @@ REG_TABLE_ENTRY g_registry_table[] = { #ifdef WLAN_FEATURE_LPSS REG_VARIABLE(CFG_ENABLE_LPASS_SUPPORT, WLAN_PARAM_Integer, - struct hdd_config, enablelpasssupport, + struct hdd_config, enable_lpass_support, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, CFG_ENABLE_LPASS_SUPPORT_DEFAULT, CFG_ENABLE_LPASS_SUPPORT_MIN, @@ -5078,7 +5078,7 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) #ifdef WLAN_FEATURE_LPSS CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpassSupport] Value = [%u] ", - pHddCtx->config->enablelpasssupport); + pHddCtx->config->enable_lpass_support); #endif CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 87785387357d..8f5282c97edd 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -137,6 +137,18 @@ static void wlan_hdd_ftm_update_tgt_cfg(void *context, void *param) } } +#ifdef WLAN_FEATURE_LPSS +static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms, + hdd_context_t *hdd_ctx) +{ + mac_openParms->is_lpass_enabled = hdd_ctx->config->enable_lpass_support; +} +#else +static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms, + hdd_context_t *hdd_ctx) +{ } +#endif + /** * wlan_ftm_cds_open() - Open the CDS Module in FTM mode * @p_cds_context: pointer to the global CDS context @@ -281,9 +293,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, mac_openParms.powersaveOffloadEnabled = hdd_ctx->config->enablePowersaveOffload; -#ifdef WLAN_FEATURE_LPSS - mac_openParms.is_lpass_enabled = hdd_ctx->config->enablelpasssupport; -#endif + hdd_is_lpass_supported(&mac_openParms, hdd_ctx); vStatus = wma_open(gp_cds_context, wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms); @@ -296,8 +306,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, goto err_htc_close; } #if defined(QCA_WIFI_FTM) - ((struct ol_softc *)pHifContext)->enable_ramdump_collection = - hdd_ctx->config->is_ramdump_enabled; + hdd_update_hif_config(pHifContext, hdd_ctx); pHtcContext = cds_get_context(CDF_MODULE_ID_HTC); if (!pHtcContext) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 376cf5363ddc..484112567469 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2591,7 +2591,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, /* Enable FW logs based on INI configuration */ if ((CDF_GLOBAL_FTM_MODE != cds_get_conparam()) && - (hdd_ctx->config->enablefwlog)) { + (hdd_ctx->config->enable_fw_log)) { uint8_t count = 0; uint32_t value = 0; uint8_t numEntries = 0; @@ -5076,6 +5076,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) int ret = 0; hdd_context_t *hdd_ctx; v_CONTEXT_t p_cds_context; + struct hif_target_info *tgt_info = hif_get_target_info_handle(hif_sc); ENTER(); @@ -5133,11 +5134,11 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) hdd_tdls_pre_init(hdd_ctx); mutex_init(&hdd_ctx->dfs_lock); - hdd_ctx->target_type = ((struct ol_softc *)hif_sc)->target_type; + hdd_ctx->target_type = tgt_info->target_type; hdd_init_offloaded_packets_ctx(hdd_ctx); - icnss_set_fw_debug_mode(hdd_ctx->config->enablefwlog); + icnss_set_fw_debug_mode(hdd_ctx->config->enable_fw_log); hdd_ctx->max_intf_count = CSR_ROAM_SESSION_MAX; @@ -5159,7 +5160,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) hdd_enable_fastpath(hdd_ctx->config, hif_sc); /* Uses to enabled logging after SSR */ - hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enablefwlog; + hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) goto skip_multicast_logging; @@ -5612,9 +5613,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) /* Get the wlan hw/fw version */ hdd_wlan_get_version(adapter, NULL, NULL); - /* pass target_fw_version to HIF layer */ - hif_set_fw_info(hif_sc, hdd_ctx->target_fw_version); - ret = hdd_update_country_code(hdd_ctx, adapter); if (ret) @@ -5975,7 +5973,7 @@ int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data, } hdd_ctx = WLAN_HDD_GET_CTX(adapter); - if (hdd_ctx->lpss_support && hdd_ctx->config->enablelpasssupport) + if (hdd_ctx->lpss_support && hdd_ctx->config->enable_lpass_support) data->lpss_support = 1; else data->lpss_support = 0; @@ -6978,6 +6976,39 @@ void hdd_set_conparam(uint32_t con_param) curr_con_mode = con_param; } +#ifdef WLAN_FEATURE_LPSS +static inline bool hdd_is_lpass_supported(hdd_context_t *hdd_ctx) +{ + return hdd_ctx->config->enable_lpass_support; +} +#else +static inline bool hdd_is_lpass_supported(hdd_context_t *hdd_ctx) +{ + return false; +} +#endif + +/** + * hdd_update_hif_config() - Initialize HIF ini parameters + * @scn: HIF Context + * @hdd_ctx: HDD Context + * + * API is used to initialize all HIF configuration parameters + * Return: void + */ +void hdd_update_hif_config(void *scn, hdd_context_t *hdd_ctx) +{ + struct hif_config_info *cfg = hif_get_ini_handle(scn); + + cfg->enable_self_recovery = hdd_ctx->config->enableSelfRecovery; + cfg->enable_uart_print = hdd_ctx->config->enablefwprint; + cfg->enable_fw_log = hdd_ctx->config->enable_fw_log; + cfg->max_no_of_peers = hdd_ctx->config->maxNumberOfPeers; + cfg->enable_ramdump_collection = + hdd_ctx->config->is_ramdump_enabled; + cfg->enable_lpass_support = hdd_is_lpass_supported(hdd_ctx); +} + /* Register the module init/exit functions */ module_init(hdd_module_init); module_exit(hdd_module_exit); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 0af3ff235a09..6e99ced9bc90 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1534,9 +1534,6 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) if (pAdapter) hdd_wlan_get_version(pAdapter, NULL, NULL); - /* Pass FW version to HIF layer */ - hif_set_fw_info(hif_sc, pHddCtx->target_fw_version); - /* Restart all adapters */ hdd_start_all_adapters(pHddCtx); diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index cfbf04cf1c1e..0818a18114a7 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -181,6 +181,8 @@ int epping_enable(struct device *parent_dev) HTC_INIT_INFO htcInfo; struct ol_softc *scn; tSirMacAddr adapter_macAddr; + struct hif_config_info *cfg; + struct hif_target_info *tgt_info; EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); @@ -212,10 +214,16 @@ int epping_enable(struct device *parent_dev) "%s: scn is null!", __func__); return -1; } - scn->enableuartprint = 0; - scn->enablefwlog = 0; + + cfg = hif_get_ini_handle(scn); + + cfg->enable_uart_print = 0; + cfg->enable_fw_log = 0; + + tgt_info = hif_get_target_info_handle(scn); + /* store target type and target version info in hdd ctx */ - pEpping_ctx->target_type = scn->target_type; + pEpping_ctx->target_type = tgt_info->target_type; #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ -- cgit v1.2.3 From c4b2863aa8e20b0a1be66919914f55ff3bfff5f4 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 3 Feb 2016 15:02:18 +0530 Subject: qcacld-3.0: Refactor Ramdump API and PKTLOG API Ramdump collection can be supported by buses other than PCIe, hence move it to main files so other buses can also access those API's. PKTLOG is a DataPath Feature, HIF doesn't need to have any info of it. Move pktlog implementation to HTT folder. Change-Id: I113ef9bb44438cd7a1ba70799ce7e72f2eaa7121 CRs-Fixed: 967765 --- core/bmi/src/ol_fw.c | 41 +++++++++++++++++++++++---- core/dp/txrx/ol_txrx.c | 57 ++++++++++++++++++++++++++++++++++++-- core/dp/txrx/ol_txrx_types.h | 3 +- core/hdd/src/wlan_hdd_driver_ops.c | 5 ---- core/wmi/wmi_unified.c | 2 -- target/inc/cepci.h | 18 ++++++------ 6 files changed, 100 insertions(+), 26 deletions(-) diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index bcf07c0a1af5..93d92a0c27d9 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -479,19 +479,48 @@ static int ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, static struct ol_softc *ramdump_scn; +/** + * struct ramdump_info: Structure to hold ramdump information + * @base: Base address for Ramdump collection + * @size: Size of the dump + * + * Ramdump information. + */ +struct ramdump_info { + void *base; + unsigned long size; +}; + +#if defined(CONFIG_CNSS) && !defined(QCA_WIFI_3_0) +static inline void ol_get_ramdump_mem(struct ramdump_info *info) +{ + info->base = cnss_get_virt_ramdump_mem(&info->size); +} +#else +static inline void ol_get_ramdump_mem(struct ramdump_info *info) { } +#endif + int ol_copy_ramdump(struct ol_softc *scn) { - int ret; + int ret = -1; + + struct ramdump_info *info = cdf_mem_malloc(sizeof(struct ramdump_info)); + + if (!info) { + BMI_ERR("%s Memory for Ramdump Allocation failed", __func__); + return -ENOMEM; + } + + ol_get_ramdump_mem(info); - if (!scn->ramdump_base || !scn->ramdump_size) { + if (!info->base || !info->size) { BMI_ERR("%s:ramdump collection fail", __func__); - ret = -EACCES; - goto out; + return -EACCES; } - ret = ol_target_coredump(scn, scn->ramdump_base, scn->ramdump_size); + ret = ol_target_coredump(scn, info->base, info->size); -out: + cdf_mem_free(info); return ret; } diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index f1aa269bccee..785be89a9659 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -71,7 +71,11 @@ #include #include #include "wma.h" - +#ifndef REMOVE_PKT_LOG +#include "pktlog_ac.h" +#endif +#include +#include "epping_main.h" /*=== function definitions ===*/ @@ -440,6 +444,50 @@ fail0: return NULL; } +#if !defined(REMOVE_PKT_LOG) && !defined(QVIT) +/** + * htt_pkt_log_init() - API to initialize packet log + * @handle: pdev handle + * @scn: HIF context + * + * Return: void + */ +void htt_pkt_log_init(struct ol_txrx_pdev_t *handle, void *scn) +{ + if (handle->pkt_log_init) + return; + + if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE && + !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { + ol_pl_sethandle(&handle->pl_dev, scn); + if (pktlogmod_init(scn)) + cdf_print("%s: pktlogmod_init failed", __func__); + else + handle->pkt_log_init = true; + } +} + +/** + * htt_pktlogmod_exit() - API to cleanup pktlog info + * @handle: Pdev handle + * @scn: HIF Context + * + * Return: void + */ +void htt_pktlogmod_exit(struct ol_txrx_pdev_t *handle, void *scn) +{ + if (scn && cds_get_conparam() != CDF_GLOBAL_FTM_MODE && + !WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && + handle->pkt_log_init) { + pktlogmod_exit(scn); + handle->pkt_log_init = false; + } +} +#else +void htt_pkt_log_init(ol_txrx_pdev_handle handle, void *ol_sc) { } +void htt_pktlogmod_exit(ol_txrx_pdev_handle handle, void *sc) { } +#endif + /** * ol_txrx_pdev_attach() - attach txrx pdev * @pdev: txrx pdev @@ -871,6 +919,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ol_tx_throttle_init(pdev); ol_tso_seg_list_init(pdev, desc_pool_size); ol_tx_register_flow_control(pdev); + htt_pkt_log_init(pdev, osc); return 0; /* success */ @@ -911,6 +960,7 @@ A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle pdev) void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) { int i; + struct ol_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); /*checking to ensure txrx pdev structure is not NULL */ if (!pdev) { @@ -923,8 +973,9 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) /* check that the pdev has no vdevs allocated */ TXRX_ASSERT1(TAILQ_EMPTY(&pdev->vdev_list)); - OL_RX_REORDER_TIMEOUT_CLEANUP(pdev); + htt_pktlogmod_exit(pdev, osc); + OL_RX_REORDER_TIMEOUT_CLEANUP(pdev); #ifdef QCA_SUPPORT_TX_THROTTLE /* Thermal Mitigation */ cdf_softirq_timer_cancel(&pdev->tx_throttle.phase_timer); diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index eab2ca009305..c6569ce75358 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -466,7 +466,8 @@ struct ol_txrx_pdev_t { /* WDI subscriber's event list */ wdi_event_subscribe **wdi_event_list; -#ifndef REMOVE_PKT_LOG +#if !defined(REMOVE_PKT_LOG) && !defined(QVIT) + bool pkt_log_init; /* Pktlog pdev */ struct ol_pktlog_dev_t *pl_dev; #endif /* #ifndef REMOVE_PKT_LOG */ diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 0627f9e7ae50..55195a7c3f39 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -318,7 +318,6 @@ static void wlan_hdd_remove(void) hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); hif_disable_power_management(hif_ctx); - hif_pktlogmod_exit(hif_ctx); if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { epping_disable(); @@ -353,10 +352,6 @@ static void wlan_hdd_shutdown(void) /* this is for cases, where shutdown invoked from CNSS */ cds_set_recovery_in_progress(true); - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE && - !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) - hif_pktlogmod_exit(hif_ctx); - if (!cds_wait_for_external_threads_completion(__func__)) hdd_err("Host is not ready for SSR, attempting anyway"); diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 2270e602f3d4..6ebc2ca9df9b 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -838,8 +838,6 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, pr_err("\n%s: hostcredits = %d\n", __func__, wmi_get_host_credits(wmi_handle)); htc_dump_counter_info(wmi_handle->htc_handle); - /* dump_ce_register(scn); */ - /* dump_ce_debug_register(scn->hif_sc); */ cdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s: MAX 1024 WMI Pending cmds reached.\n", __func__); CDF_BUG(0); diff --git a/target/inc/cepci.h b/target/inc/cepci.h index 9cebbc590d71..1050836aeb7d 100644 --- a/target/inc/cepci.h +++ b/target/inc/cepci.h @@ -106,15 +106,15 @@ struct CE_pipe_config { * HIA Map Definition */ struct host_interest_area_t { - uint32_t hi_interconnect_state; - uint32_t hi_early_alloc; - uint32_t hi_option_flag2; - uint32_t hi_board_data; - uint32_t hi_board_data_initialized; - uint32_t hi_failure_state; - uint32_t hi_rddi_msi_num; - uint32_t hi_pcie_perst_couple_en; - uint32_t hi_sw_protocol_version; + A_UINT32 hi_interconnect_state; + A_UINT32 hi_early_alloc; + A_UINT32 hi_option_flag2; + A_UINT32 hi_board_data; + A_UINT32 hi_board_data_initialized; + A_UINT32 hi_failure_state; + A_UINT32 hi_rddi_msi_num; + A_UINT32 hi_pcie_perst_couple_en; + A_UINT32 hi_sw_protocol_version; }; struct shadow_reg_cfg { -- cgit v1.2.3 From 588ad2bc4699b38a7fdf5aa2949b262ca8fcdbda Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Mon, 1 Feb 2016 19:22:17 +0530 Subject: qcacld-3.0: Refactor BMI members from ol_softc Group BMI members and access bmi info from hif instead of dereferencing hif context. Change-Id: I9108ec1b719ec3e62dd19cc3341cbc1c868bf5de CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 78 ++++++++++++++++++++++++++++++---------------------- core/bmi/src/bmi_1.c | 49 ++++++++++++++++++--------------- core/bmi/src/bmi_2.c | 61 ++++++++++++++++++++++------------------ core/bmi/src/ol_fw.c | 20 ++++++++------ 4 files changed, 117 insertions(+), 91 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 6753f01b1bf2..9c0a519f0b65 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -57,26 +57,30 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, CDF_STATUS bmi_init(struct ol_softc *scn) { + struct bmi_info *info; + if (!scn) { BMI_ERR("Invalid scn Context"); bmi_assert(0); return CDF_STATUS_NOT_INITIALIZED; } - scn->bmi_done = false; - if (!scn->bmi_cmd_buff) { - scn->bmi_cmd_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, - MAX_BMI_CMDBUF_SZ, &scn->bmi_cmd_da, 0); - if (!scn->bmi_cmd_buff) { + info = hif_get_bmi_ctx(scn); + info->bmi_done = false; + + if (!info->bmi_cmd_buff) { + info->bmi_cmd_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, + MAX_BMI_CMDBUF_SZ, &info->bmi_cmd_da, 0); + if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); return CDF_STATUS_E_NOMEM; } } - if (!scn->bmi_rsp_buff) { - scn->bmi_rsp_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, - MAX_BMI_CMDBUF_SZ, &scn->bmi_rsp_da, 0); - if (!scn->bmi_rsp_buff) { + if (!info->bmi_rsp_buff) { + info->bmi_rsp_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, + MAX_BMI_CMDBUF_SZ, &info->bmi_rsp_da, 0); + if (!info->bmi_rsp_buff) { BMI_ERR("No Memory for BMI Response"); goto end; } @@ -84,25 +88,27 @@ CDF_STATUS bmi_init(struct ol_softc *scn) return CDF_STATUS_SUCCESS; end: cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_cmd_buff, scn->bmi_cmd_da, 0); - scn->bmi_cmd_buff = NULL; + info->bmi_cmd_buff, info->bmi_cmd_da, 0); + info->bmi_cmd_buff = NULL; return CDF_STATUS_E_NOMEM; } void bmi_cleanup(struct ol_softc *scn) { - if (scn->bmi_cmd_buff) { + struct bmi_info *info = hif_get_bmi_ctx(scn); + + if (info->bmi_cmd_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_cmd_buff, scn->bmi_cmd_da, 0); - scn->bmi_cmd_buff = NULL; - scn->bmi_cmd_da = 0; + info->bmi_cmd_buff, info->bmi_cmd_da, 0); + info->bmi_cmd_buff = NULL; + info->bmi_cmd_da = 0; } - if (scn->bmi_rsp_buff) { + if (info->bmi_rsp_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_rsp_buff, scn->bmi_rsp_da, 0); - scn->bmi_rsp_buff = NULL; - scn->bmi_rsp_da = 0; + info->bmi_rsp_buff, info->bmi_rsp_da, 0); + info->bmi_rsp_buff = NULL; + info->bmi_rsp_da = 0; } } @@ -126,11 +132,12 @@ bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_softc *scn) { int status = 0; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t cid, length; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("BMI Phase is Already Done"); return CDF_STATUS_E_PERM; } @@ -208,14 +215,15 @@ bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_softc *scn) uint32_t cid; int status; uint32_t offset, param_len; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); cdf_mem_set(bmi_rsp_buff, 0, sizeof(cid) + sizeof(address)); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_DBG("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -249,12 +257,13 @@ bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_softc *scn) uint32_t cid; int status; uint32_t offset; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); bmi_assert(BMI_COMMAND_FITS(size)); cdf_mem_set(bmi_cmd_buff, 0, size); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_DBG("Command disallowed"); return CDF_STATUS_E_FAILURE; } @@ -290,12 +299,13 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_softc *scn) uint32_t offset; uint32_t remaining, txlen; const uint32_t header = sizeof(cid) + sizeof(length); - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -342,13 +352,14 @@ bmi_sign_stream_start(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buf[BMI_DATASZ_MAX + 4]; uint8_t *src; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t remaining, txlen; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -402,12 +413,13 @@ bmilz_stream_start(uint32_t address, struct ol_softc *scn) uint32_t cid; int status; uint32_t offset; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_DBG("Command disallowed"); return CDF_STATUS_E_PERM; } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index e633030491aa..239f9d356b3c 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -37,16 +37,17 @@ bmi_read_memory(uint32_t address, int status; uint32_t offset; uint32_t remaining, rxlen; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t align; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_DBG("command disallowed"); return CDF_STATUS_E_PERM; } - if (!scn->bmi_cmd_buff || !scn->bmi_rsp_buff) { + if (!info->bmi_cmd_buff || !info->bmi_rsp_buff) { BMI_ERR("BMI Initialization hasn't done"); return CDF_STATUS_NOT_INITIALIZED; } @@ -111,9 +112,10 @@ bmi_write_memory(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -178,11 +180,12 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_softc *scn) int status; uint32_t offset; uint32_t param_len; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -272,6 +275,7 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) { int status; uint32_t cid; + struct bmi_info *info; if (!scn) { BMI_ERR("Invalid scn context"); @@ -279,43 +283,44 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) return CDF_STATUS_NOT_INITIALIZED; } - if (scn->bmi_done) { + info = hif_get_bmi_ctx(scn); + if (info->bmi_done) { BMI_DBG("bmi_done_local skipped"); return CDF_STATUS_E_PERM; } BMI_DBG("BMI Done: Enter (device: 0x%p)", scn); - scn->bmi_done = true; + info->bmi_done = true; cid = BMI_DONE; - if (!scn->bmi_cmd_buff) { + if (!info->bmi_cmd_buff) { BMI_ERR("Invalid scn BMICmdBuff"); bmi_assert(0); return CDF_STATUS_NOT_INITIALIZED; } - cdf_mem_copy(scn->bmi_cmd_buff, &cid, sizeof(cid)); + cdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); - status = hif_exchange_bmi_msg(scn, scn->bmi_cmd_buff, + status = hif_exchange_bmi_msg(scn, info->bmi_cmd_buff, sizeof(cid), NULL, NULL, 0); if (status) { BMI_ERR("Failed to write to the device; status:%d", status); return CDF_STATUS_E_FAILURE; } - if (scn->bmi_cmd_buff) { + if (info->bmi_cmd_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_cmd_buff, scn->bmi_cmd_da, 0); - scn->bmi_cmd_buff = NULL; - scn->bmi_cmd_da = 0; + info->bmi_cmd_buff, info->bmi_cmd_da, 0); + info->bmi_cmd_buff = NULL; + info->bmi_cmd_da = 0; } - if (scn->bmi_rsp_buff) { + if (info->bmi_rsp_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_rsp_buff, scn->bmi_rsp_da, 0); - scn->bmi_rsp_buff = NULL; - scn->bmi_rsp_da = 0; + info->bmi_rsp_buff, info->bmi_rsp_da, 0); + info->bmi_rsp_buff = NULL; + info->bmi_rsp_da = 0; } return CDF_STATUS_SUCCESS; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 2391222d3801..b37da7eb408a 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -39,10 +39,11 @@ bmi_no_command(struct ol_softc *scn) int status; uint32_t length; uint8_t ret = 0; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed: BMI DONE ALREADY"); return CDF_STATUS_E_PERM; } @@ -79,10 +80,11 @@ bmi_done_local(struct ol_softc *scn) int status; uint32_t length; uint8_t ret = 0; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -110,18 +112,18 @@ bmi_done_local(struct ol_softc *scn) return CDF_STATUS_E_FAILURE; } - if (scn->bmi_cmd_buff) { + if (info->bmi_cmd_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_cmd_buff, scn->bmi_cmd_da, 0); - scn->bmi_cmd_buff = NULL; - scn->bmi_cmd_da = 0; + info->bmi_cmd_buff, info->bmi_cmd_da, 0); + info->bmi_cmd_buff = NULL; + info->bmi_cmd_da = 0; } - if (scn->bmi_rsp_buff) { + if (info->bmi_rsp_buff) { cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, - scn->bmi_rsp_buff, scn->bmi_rsp_da, 0); - scn->bmi_rsp_buff = NULL; - scn->bmi_rsp_da = 0; + info->bmi_rsp_buff, info->bmi_rsp_da, 0); + info->bmi_rsp_buff = NULL; + info->bmi_rsp_da = 0; } return CDF_STATUS_SUCCESS; @@ -142,10 +144,11 @@ bmi_write_memory(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -211,12 +214,13 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, uint8_t ret = 0; uint32_t offset; uint32_t remaining, rxlen, rsp_len, total_len; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; /* note we reuse the same buffer to receive on */ - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(length); - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -282,10 +286,11 @@ bmi_execute(uint32_t address, uint32_t *param, int status; uint32_t length; uint8_t ret = 0; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -326,11 +331,12 @@ bmi_load_image(dma_addr_t address, uint32_t offset; uint32_t length; uint8_t ret = 0; - uint8_t *bmi_cmd_buff = scn->bmi_cmd_buff; - uint8_t *bmi_rsp_buff = scn->bmi_rsp_buff; + struct bmi_info *info = hif_get_bmi_ctx(scn); + uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t addr_h, addr_l; - if (scn->bmi_done) { + if (info->bmi_done) { BMI_ERR("Command disallowed"); return CDF_STATUS_E_PERM; } @@ -383,6 +389,7 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) struct image_desc_info image_desc_info; CDF_STATUS status; struct hif_target_info *tgt_info; + struct bmi_info *info = hif_get_bmi_ctx(scn); if (!scn) { BMI_ERR("Invalid scn context"); @@ -392,7 +399,7 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) tgt_info = hif_get_target_info_handle(scn); - if (scn->bmi_cmd_buff == NULL || scn->bmi_rsp_buff == NULL) { + if (info->bmi_cmd_buff == NULL || info->bmi_rsp_buff == NULL) { BMI_ERR("bmi_open failed!"); return CDF_STATUS_NOT_INITIALIZED; } diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 93d92a0c27d9..d8b5a709b1bc 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -148,6 +148,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, #endif struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); uint32_t target_type = tgt_info->target_type; + struct bmi_info *bmi_ctx = hif_get_bmi_ctx(scn); switch (file) { default: @@ -155,7 +156,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, return -1; case ATH_OTP_FILE: #if defined(CONFIG_CNSS) - filename = scn->fw_files.otp_data; + filename = bmi_ctx->fw_files.otp_data; #else filename = QCA_OTP_FILE; #endif @@ -166,7 +167,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, case ATH_FIRMWARE_FILE: if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { #if defined(CONFIG_CNSS) - filename = scn->fw_files.epping_file; + filename = bmi_ctx->fw_files.epping_file; #else filename = QCA_FIRMWARE_EPPING_FILE; #endif @@ -177,7 +178,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, #ifdef QCA_WIFI_FTM if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { #if defined(CONFIG_CNSS) - filename = scn->fw_files.utf_file; + filename = bmi_ctx->fw_files.utf_file; #else filename = QCA_UTF_FIRMWARE_FILE; #endif @@ -190,7 +191,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, } #endif #if defined(CONFIG_CNSS) - filename = scn->fw_files.image_file; + filename = bmi_ctx->fw_files.image_file; #else filename = QCA_FIRMWARE_FILE; #endif @@ -205,7 +206,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, #ifdef QCA_WIFI_FTM if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { #if defined(CONFIG_CNSS) - filename = scn->fw_files.utf_board_data; + filename = bmi_ctx->fw_files.utf_board_data; #else filename = QCA_BOARD_DATA_FILE; #endif @@ -218,7 +219,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, } #endif /* QCA_WIFI_FTM */ #if defined(CONFIG_CNSS) - filename = scn->fw_files.board_data; + filename = bmi_ctx->fw_files.board_data; #else filename = QCA_BOARD_DATA_FILE; #endif @@ -256,8 +257,8 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, #if defined(QCA_WIFI_FTM) && defined(CONFIG_CNSS) /* Try default board data file if FTM specific * board data file is not present. */ - if (filename == scn->fw_files.utf_board_data) { - filename = scn->fw_files.board_data; + if (filename == bmi_ctx->fw_files.utf_board_data) { + filename = bmi_ctx->fw_files.board_data; BMI_INFO("%s: Trying to load default %s", __func__, filename); if (request_firmware(&fw_entry, filename, @@ -1211,9 +1212,10 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); uint32_t target_type = tgt_info->target_type; uint32_t target_version = tgt_info->target_version; + struct bmi_info *bmi_ctx = hif_get_bmi_ctx(scn); #ifdef CONFIG_CNSS - if (0 != cnss_get_fw_files_for_target(&scn->fw_files, + if (0 != cnss_get_fw_files_for_target(&bmi_ctx->fw_files, target_type, target_version)) { BMI_ERR("%s: No FW files from CNSS driver", __func__); -- cgit v1.2.3 From c12e675c5014d7a18ac6b04a9c9388c789595dd0 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 2 Feb 2016 18:17:13 +0530 Subject: qcacld-3.0: Remove cds_get_context in HIF Refactor Transport Layer from cds_get_context and pass the hif context to all the API's to operate. Change-Id: I2fb376fda12951a77007f46ceb351bb2e7740ace CRs-Fixed: 967765 --- core/cdf/src/cdf_lock.c | 3 ++- core/dp/htt/htt.c | 7 ++----- core/dp/htt/htt_h2t.c | 2 +- core/dp/htt/htt_internal.h | 2 +- core/hdd/src/wlan_hdd_driver_ops.c | 28 +++++++++++++++++----------- core/hdd/src/wlan_hdd_napi.c | 4 ++-- core/wma/src/wma_dev_if.c | 4 ++-- core/wma/src/wma_features.c | 2 +- 8 files changed, 28 insertions(+), 24 deletions(-) diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c index b57363327a92..94f7b6f19baf 100644 --- a/core/cdf/src/cdf_lock.c +++ b/core/cdf/src/cdf_lock.c @@ -643,5 +643,6 @@ cdf_runtime_lock_t cdf_runtime_lock_init(const char *name) */ void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock) { - hif_runtime_lock_deinit(lock); + void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_runtime_lock_deinit(hif_ctx, lock); } diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 686882b6aead..8c570a048fbb 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -434,9 +434,6 @@ int htt_htc_attach(struct htt_pdev_t *pdev) return -EIO; /* failure */ pdev->htc_endpoint = response.Endpoint; -#if defined(HIF_PCI) - hif_save_htc_htt_config_endpoint(pdev->htc_endpoint); -#endif return 0; /* success */ } @@ -467,9 +464,9 @@ void htt_display(htt_pdev_handle pdev, int indent) #endif /* Disable ASPM : Disable PCIe low power */ -void htt_htc_disable_aspm(void) +void htt_htc_disable_aspm(struct htt_pdev_t *pdev) { - htc_disable_aspm(); + htc_disable_aspm(pdev->htc_pdev); } #ifdef IPA_OFFLOAD diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index cbfa4a7523d0..e7879b84f054 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -334,7 +334,7 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) enable_ppdu_end = 1; /* Disable ASPM when pkt log is enabled */ cdf_print("Pkt log is enabled\n"); - htt_htc_disable_aspm(); + htt_htc_disable_aspm(pdev); } else { cdf_print("Pkt log is disabled\n"); enable_ctrl_data = 0; diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 28b1e08b3da6..636572ef5498 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -459,7 +459,7 @@ htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt); void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev); #endif -void htt_htc_disable_aspm(void); +void htt_htc_disable_aspm(struct htt_pdev_t *pdev); int htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 55195a7c3f39..b02d8dd1199d 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -124,8 +124,9 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, CDF_STATUS status; int ret = 0; void *hif_ctx; + cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); - status = hif_open(bus_type); + status = hif_open(cdf_ctx, bus_type); if (!CDF_IS_STATUS_SUCCESS(status)) { hdd_err("hif_open error = %d", status); return cdf_status_to_os_return(status); @@ -413,6 +414,7 @@ void wlan_hdd_notify_handler(int state) static int __wlan_hdd_bus_suspend(pm_message_t state) { void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); int err = wlan_hdd_validate_context(hdd_ctx); int status; @@ -430,7 +432,7 @@ static int __wlan_hdd_bus_suspend(pm_message_t state) if (err) goto resume_oltxrx; - err = hif_bus_suspend(); + err = hif_bus_suspend(hif_ctx); if (err) goto resume_wma; @@ -485,6 +487,7 @@ int wlan_hdd_bus_suspend(pm_message_t state) static int __wlan_hdd_bus_resume(void) { void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); int status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -492,7 +495,7 @@ static int __wlan_hdd_bus_resume(void) return status; } - status = hif_bus_resume(); + status = hif_bus_resume(hif_ctx); CDF_BUG(!status); status = wma_bus_resume(); @@ -537,12 +540,13 @@ static int wlan_hdd_bus_resume(void) static int __wlan_hdd_runtime_suspend(void) { void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); int status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) goto process_failure; - status = hif_pre_runtime_suspend(); + status = hif_pre_runtime_suspend(hif_ctx); if (status) goto process_failure; @@ -554,7 +558,7 @@ static int __wlan_hdd_runtime_suspend(void) if (status) goto resume_htc; - status = hif_runtime_suspend(); + status = hif_runtime_suspend(hif_ctx); if (status) goto resume_wma; @@ -562,17 +566,17 @@ static int __wlan_hdd_runtime_suspend(void) if (status) goto resume_hif; - hif_process_runtime_suspend_success(); + hif_process_runtime_suspend_success(hif_ctx); return status; resume_hif: - CDF_BUG(!hif_runtime_resume()); + CDF_BUG(!hif_runtime_resume(hif_ctx)); resume_wma: CDF_BUG(!wma_runtime_resume()); resume_htc: CDF_BUG(!htc_runtime_resume()); process_failure: - hif_process_runtime_suspend_failure(); + hif_process_runtime_suspend_failure(hif_ctx); return status; } @@ -606,12 +610,14 @@ static int wlan_hdd_runtime_suspend(void) */ static int __wlan_hdd_runtime_resume(void) { - hif_pre_runtime_resume(); + void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + + hif_pre_runtime_resume(hif_ctx); CDF_BUG(!cnss_auto_resume()); - CDF_BUG(!hif_runtime_resume()); + CDF_BUG(!hif_runtime_resume(hif_ctx)); CDF_BUG(!wma_runtime_resume()); CDF_BUG(!htc_runtime_resume()); - hif_process_runtime_resume_success(); + hif_process_runtime_resume_success(hif_ctx); return 0; } diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 9f6e64dd8275..229e65ab341c 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -269,5 +269,5 @@ int hdd_napi_event(enum qca_napi_event event, void *data) */ int hdd_napi_poll(struct napi_struct *napi, int budget) { - return hif_napi_poll(napi, budget); + return hif_napi_poll(cds_get_context(CDF_MODULE_ID_HIF), napi, budget); } diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 5aaf9d11a1f8..5b39b08a2b04 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -4533,7 +4533,7 @@ void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta) /* IBSS should share the same code as AP mode */ case BSS_OPERATIONAL_MODE_IBSS: case BSS_OPERATIONAL_MODE_AP: - hif_vote_link_up(); + htc_vote_link_down(wma->htc_handle); wma_add_sta_req_ap_mode(wma, add_sta); break; } @@ -4575,7 +4575,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) case BSS_OPERATIONAL_MODE_IBSS: /* IBSS shares AP code */ case BSS_OPERATIONAL_MODE_AP: - hif_vote_link_down(); + htc_vote_link_up(wma->htc_handle); wma_delete_sta_req_ap_mode(wma, del_sta); break; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 031d9c58e4a7..06f7010ebc26 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3567,7 +3567,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) WMITLV_GET_STRUCT_TLVLEN (wmi_wow_enable_cmd_fixed_param)); cmd->enable = true; - if (hif_can_suspend_link()) + if (htc_can_suspend_link(wma->htc_handle)) cmd->pause_iface_config = WOW_IFACE_PAUSE_ENABLED; else cmd->pause_iface_config = WOW_IFACE_PAUSE_DISABLED; -- cgit v1.2.3 From 7fde14cabaea0fc91c2fc2a0a01d95c9577dd2ff Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 2 Feb 2016 13:05:57 +0530 Subject: qcacld-3.0: Query HIF for FastPath support Data Path bypasses HTC layer for better throughput's. Instead of dereferencing HIF structures, query HIF for fastpath mode support Change-Id: Iad2ae907e2d5345a71f5b64bd29f81dde4358460 CRs-Fixed: 967765 --- core/dp/txrx/ol_tx.c | 4 ++-- core/dp/txrx/ol_txrx.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 0f718389d702..3346896bfc1e 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -697,7 +697,7 @@ ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) struct ol_softc *hif_device = (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); - if (cdf_likely(hif_device && hif_device->fastpath_mode_on)) + if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device))) msdu_list = ol_tx_ll_fast(vdev, msdu_list); else msdu_list = ol_tx_ll(vdev, msdu_list); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 785be89a9659..00bb2059ee50 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -291,8 +291,7 @@ setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev) * CE handles are (struct CE_state *) * This is only required in the fast path */ - pdev->ce_tx_hdl = (struct CE_handle *) - osc->ce_id_to_state[CE_HTT_H2T_MSG]; + pdev->ce_tx_hdl = hif_get_ce_handle(osc, CE_HTT_H2T_MSG); } @@ -3423,7 +3422,7 @@ void ol_register_lro_flush_cb(void (handler)(void *), void *data) pdev->lro_info.lro_flush_cb = handler; pdev->lro_info.lro_data = data; - ce_lro_flush_cb_register(hif_device, ol_txrx_lro_flush, pdev); + hif_lro_flush_cb_register(hif_device, ol_txrx_lro_flush, pdev); } /** @@ -3441,7 +3440,7 @@ void ol_deregister_lro_flush_cb(void) (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); - ce_lro_flush_cb_deregister(hif_device); + hif_lro_flush_cb_deregister(hif_device); pdev->lro_info.lro_flush_cb = NULL; pdev->lro_info.lro_data = NULL; -- cgit v1.2.3 From 04d3d6a364a1a0281d2c7d42198214a17d059689 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Thu, 4 Feb 2016 15:57:52 +0530 Subject: qcacld-3.0: Carve Out hif_softc out of ol_softc Carve out hif_softc for internal hif usage. ol_softc acts a opaque handle to other modules. Change-Id: I2f29aea93b0a64169a3e095e1d5bddca15aadbd7 CRs-Fixed: 967765 --- core/bmi/src/ol_fw.c | 10 ++++--- core/utils/epping/src/epping_main.c | 4 +-- target/inc/cepci.h | 52 ++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index d8b5a709b1bc..89f115680c8e 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -617,14 +617,17 @@ void ol_target_failure(void *instance, CDF_STATUS status) tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); int ret; + ol_target_status target_status = + hif_get_target_status(scn); cdf_event_set(&wma->recovery_event); - if (OL_TRGET_STATUS_RESET == scn->target_status) { + if (OL_TRGET_STATUS_RESET == target_status) { BMI_ERR("Target is already asserted, ignore!"); return; } - scn->target_status = OL_TRGET_STATUS_RESET; + + hif_set_target_status(scn, OL_TRGET_STATUS_RESET); if (cds_is_driver_recovering()) { BMI_ERR("%s: Recovery in progress, ignore!\n", __func__); @@ -1238,7 +1241,8 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) BMI_ERR("pll switch failed. status %d", ret); return ret; } - if (scn->cal_in_flash) { + + if (bmi_ctx->cal_in_flash) { /* Write EEPROM or Flash data to Target RAM */ status = ol_transfer_bin_file(scn, ATH_FLASH_FILE, address, false); diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 0818a18114a7..921746dc839f 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -257,15 +257,15 @@ int epping_enable(struct device *parent_dev) "%s: HTCHandle is NULL", __func__); return -1; } - scn->htc_handle = pEpping_ctx->HTCHandle; if (bmi_done(scn)) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto error_end; } + /* start HIF */ - if (htc_wait_target(scn->htc_handle) != A_OK) { + if (htc_wait_target(pEpping_ctx->HTCHandle) != A_OK) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: htc_wait_target error", __func__); goto error_end; diff --git a/target/inc/cepci.h b/target/inc/cepci.h index 1050836aeb7d..88e19c31957f 100644 --- a/target/inc/cepci.h +++ b/target/inc/cepci.h @@ -62,22 +62,22 @@ * required to initialize pipe_cfg_addr and svc_to_pipe_map. */ struct pcie_state_s { - A_UINT32 pipe_cfg_addr; /* Pipe configuration Target address */ + uint32_t pipe_cfg_addr; /* Pipe configuration Target address */ /* NB: CE_pipe_config[CE_COUNT] */ - A_UINT32 svc_to_pipe_map; /* Service to pipe map Target address */ + uint32_t svc_to_pipe_map; /* Service to pipe map Target address */ /* NB: service_to_pipe[PIPE_TO_CE_MAP_CN] */ - A_UINT32 MSI_requested; /* number of MSI interrupts requested */ - A_UINT32 MSI_granted; /* number of MSI interrupts granted */ - A_UINT32 MSI_addr; /* Message Signalled Interrupt address */ - A_UINT32 MSI_data; /* Base data */ - A_UINT32 MSI_fw_intr_data; /* Data for firmware interrupt; + uint32_t MSI_requested; /* number of MSI interrupts requested */ + uint32_t MSI_granted; /* number of MSI interrupts granted */ + uint32_t MSI_addr; /* Message Signalled Interrupt address */ + uint32_t MSI_data; /* Base data */ + uint32_t MSI_fw_intr_data; /* Data for firmware interrupt; MSI data for other interrupts are in various SoC registers */ - A_UINT32 power_mgmt_method; /* PCIE_PWR_METHOD_* */ - A_UINT32 config_flags; /* PCIE_CONFIG_FLAG_* */ + uint32_t power_mgmt_method; /* PCIE_PWR_METHOD_* */ + uint32_t config_flags; /* PCIE_CONFIG_FLAG_* */ }; /* @@ -94,32 +94,32 @@ struct pcie_state_s { * Passed from Host to Target during startup (one per CE). */ struct CE_pipe_config { - A_UINT32 pipenum; - A_UINT32 pipedir; - A_UINT32 nentries; - A_UINT32 nbytes_max; - A_UINT32 flags; - A_UINT32 reserved; + uint32_t pipenum; + uint32_t pipedir; + uint32_t nentries; + uint32_t nbytes_max; + uint32_t flags; + uint32_t reserved; }; /* * HIA Map Definition */ struct host_interest_area_t { - A_UINT32 hi_interconnect_state; - A_UINT32 hi_early_alloc; - A_UINT32 hi_option_flag2; - A_UINT32 hi_board_data; - A_UINT32 hi_board_data_initialized; - A_UINT32 hi_failure_state; - A_UINT32 hi_rddi_msi_num; - A_UINT32 hi_pcie_perst_couple_en; - A_UINT32 hi_sw_protocol_version; + uint32_t hi_interconnect_state; + uint32_t hi_early_alloc; + uint32_t hi_option_flag2; + uint32_t hi_board_data; + uint32_t hi_board_data_initialized; + uint32_t hi_failure_state; + uint32_t hi_rddi_msi_num; + uint32_t hi_pcie_perst_couple_en; + uint32_t hi_sw_protocol_version; }; struct shadow_reg_cfg { - A_UINT16 ce_id; - A_UINT16 reg_offset; + uint16_t ce_id; + uint16_t reg_offset; }; #endif /* __CEPCI_H__ */ -- cgit v1.2.3 From 48152e1a16d7241e65c4b31323df54e45147ead4 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 9 Feb 2016 17:50:33 +0530 Subject: qcacld-3.0: Make cdf_device_t as global device structure aps_osdev/NIC_DEV is not needed in cld driver. Remove it's reference in BMI and pktlog code. Use global cdf_device context for memory allocations in BMI and pktlog files. Initialize cdf_device global structure in HDD. Change-Id: Idf257e196f86b8f0aae669ce05950a1212e5fd99 CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 29 ++++++++++++++++++++++------- core/bmi/src/bmi_1.c | 11 +++++++++-- core/bmi/src/bmi_2.c | 12 ++++++++++-- core/bmi/src/ol_fw.c | 9 +++++---- core/hdd/src/wlan_hdd_driver_ops.c | 17 +++++++++++++++++ core/utils/pktlog/include/pktlog_ac.h | 1 - core/utils/pktlog/pktlog_ac.c | 1 - 7 files changed, 63 insertions(+), 17 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 9c0a519f0b65..c520057265bb 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -26,6 +26,7 @@ */ #include "i_bmi.h" +#include "cds_api.h" /* APIs visible to the driver */ @@ -58,6 +59,7 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, CDF_STATUS bmi_init(struct ol_softc *scn) { struct bmi_info *info; + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); if (!scn) { BMI_ERR("Invalid scn Context"); @@ -65,12 +67,18 @@ CDF_STATUS bmi_init(struct ol_softc *scn) return CDF_STATUS_NOT_INITIALIZED; } + if (!cdf_dev->dev) { + BMI_ERR("%s: Invalid Device Pointer", __func__); + return CDF_STATUS_NOT_INITIALIZED; + } + info = hif_get_bmi_ctx(scn); info->bmi_done = false; if (!info->bmi_cmd_buff) { - info->bmi_cmd_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, - MAX_BMI_CMDBUF_SZ, &info->bmi_cmd_da, 0); + info->bmi_cmd_buff = + cdf_os_mem_alloc_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + &info->bmi_cmd_da, 0); if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); return CDF_STATUS_E_NOMEM; @@ -78,8 +86,9 @@ CDF_STATUS bmi_init(struct ol_softc *scn) } if (!info->bmi_rsp_buff) { - info->bmi_rsp_buff = cdf_os_mem_alloc_consistent(scn->cdf_dev, - MAX_BMI_CMDBUF_SZ, &info->bmi_rsp_da, 0); + info->bmi_rsp_buff = + cdf_os_mem_alloc_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + &info->bmi_rsp_da, 0); if (!info->bmi_rsp_buff) { BMI_ERR("No Memory for BMI Response"); goto end; @@ -87,7 +96,7 @@ CDF_STATUS bmi_init(struct ol_softc *scn) } return CDF_STATUS_SUCCESS; end: - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; return CDF_STATUS_E_NOMEM; @@ -96,16 +105,22 @@ end: void bmi_cleanup(struct ol_softc *scn) { struct bmi_info *info = hif_get_bmi_ctx(scn); + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + + if (!cdf_dev->dev) { + BMI_ERR("%s: Invalid Device Pointer", __func__); + return; + } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 239f9d356b3c..1936623c5d14 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -26,6 +26,7 @@ */ #include "i_bmi.h" +#include "cds_api.h" /* APIs visible to the driver */ @@ -276,6 +277,7 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) int status; uint32_t cid; struct bmi_info *info; + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); if (!scn) { BMI_ERR("Invalid scn context"); @@ -283,6 +285,11 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) return CDF_STATUS_NOT_INITIALIZED; } + if (!cdf_dev->dev) { + BMI_ERR("%s: Invalid device pointer", __func__); + return CDF_STATUS_NOT_INITIALIZED; + } + info = hif_get_bmi_ctx(scn); if (info->bmi_done) { BMI_DBG("bmi_done_local skipped"); @@ -310,14 +317,14 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index b37da7eb408a..16fdf7223cc5 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -25,6 +25,7 @@ * to the Linux Foundation. */ #include "i_bmi.h" +#include "cds_api.h" /* This need to defined in firmware interface files. * Defining here to address compilation issues. * Will be deleted once firmware interface files for @@ -83,6 +84,7 @@ bmi_done_local(struct ol_softc *scn) struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -93,6 +95,12 @@ bmi_done_local(struct ol_softc *scn) BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); return CDF_STATUS_NOT_INITIALIZED; } + + if (!cdf_dev->dev) { + BMI_ERR("%s Invalid Device pointer", __func__); + return CDF_STATUS_NOT_INITIALIZED; + } + cid = BMI_DONE; cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); @@ -113,14 +121,14 @@ bmi_done_local(struct ol_softc *scn) } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(scn->cdf_dev, MAX_BMI_CMDBUF_SZ, + cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 89f115680c8e..ab5edb355030 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -149,6 +149,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); uint32_t target_type = tgt_info->target_type; struct bmi_info *bmi_ctx = hif_get_bmi_ctx(scn); + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); switch (file) { default: @@ -248,7 +249,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, break; } - if (request_firmware(&fw_entry, filename, scn->aps_osdev.device) != 0) { + if (request_firmware(&fw_entry, filename, cdf_dev->dev) != 0) { BMI_ERR("%s: Failed to get %s", __func__, filename); if (file == ATH_OTP_FILE) @@ -262,7 +263,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, BMI_INFO("%s: Trying to load default %s", __func__, filename); if (request_firmware(&fw_entry, filename, - scn->aps_osdev.device) != 0) { + cdf_dev->dev) != 0) { BMI_ERR("%s: Failed to get %s", __func__, filename); return -1; @@ -488,8 +489,8 @@ static struct ol_softc *ramdump_scn; * Ramdump information. */ struct ramdump_info { - void *base; - unsigned long size; + void *base; + unsigned long size; }; #if defined(CONFIG_CNSS) && !defined(QCA_WIFI_3_0) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index b02d8dd1199d..729ed3f79794 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -185,6 +185,21 @@ static void hdd_hif_close(void *hif_ctx) hif_close(hif_ctx); } +/** + * hdd_init_cdf_ctx() - API to initialize global CDF Device structure + * @dev: Device Pointer + * @bdev: Bus Device pointer + * + * Return: void + */ +void hdd_init_cdf_ctx(struct device *dev, void *bdev) +{ + cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + + cdf_dev->dev = dev; + cdf_dev->drv_hdl = bdev; +} + /** * wlan_hdd_probe() - handles probe request * @@ -234,6 +249,8 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_hdd_deinit; } + hdd_init_cdf_ctx(dev, bdev); + ret = hdd_hif_open(dev, bdev, bid, bus_type, reinit); if (ret) diff --git a/core/utils/pktlog/include/pktlog_ac.h b/core/utils/pktlog/include/pktlog_ac.h index 0a5a784fe574..ade410222b27 100644 --- a/core/utils/pktlog/include/pktlog_ac.h +++ b/core/utils/pktlog/include/pktlog_ac.h @@ -94,7 +94,6 @@ struct ol_pktlog_dev_t { ol_ath_generic_softc_handle scn; char *name; bool tgt_pktlog_enabled; - osdev_t sc_osdev; }; #define PKTLOG_SYSCTL_SIZE 14 diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index 7bc10efb8826..3025a7cd1017 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -353,7 +353,6 @@ int pktlog_enable(struct ol_softc *scn, int32_t log_state) } pl_info = pl_dev->pl_info; - pl_dev->sc_osdev = &scn->aps_osdev; if (!pl_info) return 0; -- cgit v1.2.3 From 02d0934a4a83aee8bd0940f5869c032a194d3ca6 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 23 Feb 2016 18:03:19 +0530 Subject: qcacld-3.0: update WMA with ini config for max_peers Max_peers configuration is needed only by WMA. Remove dependency of ol layer for max_peers and move it WMA. Change-Id: I336b02ae84c72c70ca459425b38b197e5fe551a0 CRs-Fixed: 967765 --- core/bmi/inc/ol_fw.h | 8 +--- core/bmi/src/ol_fw.c | 24 ----------- core/cds/src/cds_api.c | 1 + core/hdd/src/wlan_hdd_main.c | 1 - core/wma/inc/wma.h | 12 ++++++ core/wma/src/wma_main.c | 94 ++++++++++++++++++++++++++++++++++---------- 6 files changed, 88 insertions(+), 52 deletions(-) diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index a9918d7cd82c..c26c26aaf279 100644 --- a/core/bmi/inc/ol_fw.h +++ b/core/bmi/inc/ol_fw.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -49,16 +49,10 @@ #ifdef HIF_PCI void ol_target_failure(void *instance, CDF_STATUS status); -uint8_t ol_get_number_of_peers_supported(struct ol_softc *scn); #else static inline void ol_target_failure(void *instance, CDF_STATUS status) { return; } - -static inline uint8_t ol_get_number_of_peers_supported(struct ol_softc *scn) -{ - return 1; -} #endif #endif /* _OL_FW_H_ */ diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index ab5edb355030..240f7c385ccd 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -1635,27 +1635,3 @@ static int ol_target_coredump(void *inst, void *memory_block, } return ret; } - -#define MAX_SUPPORTED_PEERS_REV1_1 14 -#define MAX_SUPPORTED_PEERS_REV1_3 32 - -uint8_t ol_get_number_of_peers_supported(struct ol_softc *scn) -{ - struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); - struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); - uint8_t max_no_of_peers = ini_cfg->max_no_of_peers; - - switch (tgt_info->target_version) { - case AR6320_REV1_1_VERSION: - if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_1) - max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_1; - break; - - default: - if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_3) - max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_3; - break; - - } - return max_no_of_peers; -} diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index dcb92c922e35..f205d2a73bf0 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -363,6 +363,7 @@ CDF_STATUS cds_open(void) mac_openParms.tx_chain_mask_cck = pHddCtx->config->tx_chain_mask_cck; mac_openParms.self_gen_frm_pwr = pHddCtx->config->self_gen_frm_pwr; + mac_openParms.maxStation = pHddCtx->config->maxNumberOfPeers; cdf_status = wma_open(gp_cds_context, hdd_update_tgt_cfg, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 484112567469..af356ed1d54b 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -7003,7 +7003,6 @@ void hdd_update_hif_config(void *scn, hdd_context_t *hdd_ctx) cfg->enable_self_recovery = hdd_ctx->config->enableSelfRecovery; cfg->enable_uart_print = hdd_ctx->config->enablefwprint; cfg->enable_fw_log = hdd_ctx->config->enable_fw_log; - cfg->max_no_of_peers = hdd_ctx->config->maxNumberOfPeers; cfg->enable_ramdump_collection = hdd_ctx->config->is_ramdump_enabled; cfg->enable_lpass_support = hdd_is_lpass_supported(hdd_ctx); diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 91e71471c956..456f08ed4c10 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1034,6 +1034,16 @@ struct wmi_init_cmd { uint32_t buf_len; }; +/** + * struct wma_ini_config - Structure to hold wma ini configuration + * @max_no_of_peers: Max Number of supported + * + * Placeholder for WMA ini parameters. + */ +struct wma_ini_config { + uint8_t max_no_of_peers; +}; + /** * struct t_wma_handle - wma context * @wmi_handle: wmi handle @@ -1342,6 +1352,7 @@ typedef struct { cdf_wake_lock_t wmi_cmd_rsp_wake_lock; cdf_runtime_lock_t wmi_cmd_rsp_runtime_lock; uint32_t fine_time_measurement_cap; + struct wma_ini_config ini_config; } t_wma_handle, *tp_wma_handle; /** @@ -2012,3 +2023,4 @@ void wma_indicate_err(enum ol_rx_err_type err_type, struct ol_error_info *err_info); #endif +struct wma_ini_config *wma_get_ini_handle(tp_wma_handle wma_handle); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 84d66d890c52..aa07912ab1e2 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -125,6 +125,62 @@ end: CDF_BUG(0); } +/** + * wma_get_ini_handle() - API to get WMA ini info handle + * @wma: WMA Handle + * + * Returns the pointer to WMA ini structure. + * Return: struct wma_ini_config + */ +struct wma_ini_config *wma_get_ini_handle(tp_wma_handle wma) +{ + if (!wma) { + WMA_LOGE("%s: Invalid WMA context\n", __func__); + return NULL; + } + + return &wma->ini_config; +} + +#define MAX_SUPPORTED_PEERS_REV1_1 14 +#define MAX_SUPPORTED_PEERS_REV1_3 32 +#define MIN_NO_OF_PEERS 1 + +/** + * wma_get_number_of_peers_supported - API to query for number of peers + * supported + * @wma: WMA Handle + * + * Return: Max Number of Peers Supported + */ +static uint8_t wma_get_number_of_peers_supported(tp_wma_handle wma) +{ + struct hif_target_info *tgt_info; + struct wma_ini_config *cfg = wma_get_ini_handle(wma); + uint8_t max_no_of_peers = cfg ? cfg->max_no_of_peers : MIN_NO_OF_PEERS; + struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + + if (!scn) { + WMA_LOGE("%s: Invalid wma handle", __func__); + return 0; + } + + tgt_info = hif_get_target_info_handle(scn); + + switch (tgt_info->target_version) { + case AR6320_REV1_1_VERSION: + if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_1) + max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_1; + break; + default: + if (max_no_of_peers > MAX_SUPPORTED_PEERS_REV1_3) + max_no_of_peers = MAX_SUPPORTED_PEERS_REV1_3; + break; + } + + return max_no_of_peers; +} + /** * wma_set_default_tgt_config() - set default tgt config * @wma_handle: wma handle @@ -133,7 +189,6 @@ end: */ static void wma_set_default_tgt_config(tp_wma_handle wma_handle) { - struct ol_softc *scn; uint8_t no_of_peers_supported; wmi_resource_config tgt_cfg = { 0, /* Filling zero for TLV Tag and Length fields */ @@ -180,13 +235,7 @@ static void wma_set_default_tgt_config(tp_wma_handle wma_handle) CFG_TGT_NUM_OCB_SCHEDULES, }; - /* Update the max number of peers */ - scn = cds_get_context(CDF_MODULE_ID_HIF); - if (!scn) { - WMA_LOGE("%s: cds_context is NULL", __func__); - return; - } - no_of_peers_supported = ol_get_number_of_peers_supported(scn); + no_of_peers_supported = wma_get_number_of_peers_supported(wma_handle); tgt_cfg.num_peers = no_of_peers_supported + CFG_TGT_NUM_VDEV + 2; tgt_cfg.num_tids = (2 * (no_of_peers_supported + CFG_TGT_NUM_VDEV + 2)); tgt_cfg.scan_max_pending_req = wma_handle->max_scan; @@ -1513,6 +1562,21 @@ static void wma_set_nan_enable(tp_wma_handle wma_handle, } #endif +/** + * wma_init_max_no_of_peers - API to initialize wma configuration params + * @wma_handle: WMA Handle + * @max_peers: Max Peers supported + * + * Return: void + */ +static void wma_init_max_no_of_peers(tp_wma_handle wma_handle, + uint16_t max_peers) +{ + struct wma_ini_config *cfg = wma_get_ini_handle(wma_handle); + + cfg->max_no_of_peers = max_peers; +} + /** * wma_open() - Allocate wma context and initialize it. * @cds_context: cds context @@ -1532,7 +1596,6 @@ CDF_STATUS wma_open(void *cds_context, cdf_device_t cdf_dev; void *wmi_handle; CDF_STATUS cdf_status; - struct ol_softc *scn; struct txrx_pdev_cfg_param_t olCfg = { 0 }; WMA_LOGD("%s: Enter", __func__); @@ -1648,17 +1711,8 @@ CDF_STATUS wma_open(void *cds_context, if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) wma_utf_attach(wma_handle); #endif /* QCA_WIFI_FTM */ - - /*TODO: Recheck below parameters */ - scn = cds_get_context(CDF_MODULE_ID_HIF); - - if (NULL == scn) { - WMA_LOGE("%s: Failed to get scn", __func__); - cdf_status = CDF_STATUS_E_NOMEM; - goto err_scn_context; - } - - mac_params->maxStation = ol_get_number_of_peers_supported(scn); + wma_init_max_no_of_peers(wma_handle, mac_params->maxStation); + mac_params->maxStation = wma_get_number_of_peers_supported(wma_handle); mac_params->maxBssId = WMA_MAX_SUPPORTED_BSS; mac_params->frameTransRequired = 0; -- cgit v1.2.3 From d910649caa2c5cf91f0269ffecf76ffb7c0fc3e1 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Mon, 15 Feb 2016 10:31:44 +0530 Subject: qcacld-3.0: Create OL BMI Context in global CDS Context. Create bmi context in global cds context for BMI operations. Modify HIF BMI API to pass dma command and response Pass BMI DMA Command and Response address to HIF BMI API as arguments instead of using bmi context in HIF. Change-Id: Ifdb51581a33665b1857c63e33b1c26bbd99575eb CRs-Fixed: 967765 --- core/bmi/inc/bmi.h | 14 ++++--- core/bmi/src/bmi.c | 82 ++++++++++++++++++++++++++++++++----- core/bmi/src/bmi_1.c | 24 ++++++++--- core/bmi/src/bmi_2.c | 28 +++++++++---- core/bmi/src/i_bmi.h | 12 ++++++ core/cds/inc/cds_sched.h | 1 + core/cds/src/cds_api.c | 24 ++++++++++- core/hdd/src/wlan_hdd_driver_ops.c | 17 +++++++- core/hdd/src/wlan_hdd_ftm.c | 6 ++- core/utils/epping/src/epping_main.c | 6 ++- 10 files changed, 177 insertions(+), 37 deletions(-) diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index 4548fd711160..d292cb3114ae 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -37,22 +37,26 @@ #include "ol_if_athvar.h" #include "hif.h" +struct ol_context; +CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); +void ol_cds_free(void); + #ifdef HIF_PCI void bmi_cleanup(struct ol_softc *scn); -CDF_STATUS bmi_done(struct ol_softc *scn); -CDF_STATUS bmi_download_firmware(struct ol_softc *scn); +CDF_STATUS bmi_done(struct ol_context *ol_ctx); +CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); #else static inline void bmi_cleanup(struct ol_softc *scn) { return; } -static inline CDF_STATUS bmi_done(struct ol_softc *scn) +static inline CDF_STATUS bmi_done(struct ol_context *ol_ctx) { return CDF_STATUS_SUCCESS; } -static inline CDF_STATUS bmi_download_firmware(struct ol_softc *scn) +static inline CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { return CDF_STATUS_SUCCESS; } diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index c520057265bb..ad625a0cb661 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -128,9 +128,10 @@ void bmi_cleanup(struct ol_softc *scn) } -CDF_STATUS bmi_done(struct ol_softc *scn) +CDF_STATUS bmi_done(struct ol_context *ol_ctx) { CDF_STATUS status = CDF_STATUS_SUCCESS; + struct ol_softc *scn = ol_ctx->scn; if (NO_BMI) return status; @@ -151,6 +152,8 @@ bmi_get_target_info(struct bmi_target_info *targ_info, uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t cid, length; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("BMI Phase is Already Done"); @@ -166,7 +169,7 @@ bmi_get_target_info(struct bmi_target_info *targ_info, cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(struct bmi_target_info); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, sizeof(cid), + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), (uint8_t *)bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { @@ -190,11 +193,12 @@ static inline uint32_t bmi_get_test_addr(void) } #endif -CDF_STATUS bmi_download_firmware(struct ol_softc *scn) +CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { uint8_t data[10], out[10]; uint32_t address; int32_t ret; + struct ol_softc *scn = ol_ctx->scn; if (NO_BMI) return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ @@ -233,6 +237,8 @@ bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_softc *scn) struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); @@ -254,7 +260,7 @@ bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_softc *scn) cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); param_len = sizeof(*param); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, bmi_rsp_buff, ¶m_len, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_DBG("Unable to read from the device; status:%d", status); @@ -275,6 +281,9 @@ bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_softc *scn) struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; + bmi_assert(BMI_COMMAND_FITS(size)); cdf_mem_set(bmi_cmd_buff, 0, size); @@ -295,7 +304,7 @@ bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_softc *scn) offset += sizeof(address); cdf_mem_copy(&(bmi_cmd_buff[offset]), ¶m, sizeof(param)); offset += sizeof(param); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, NULL, 0); if (status) { BMI_ERR("Unable to write to the device: status:%d", status); @@ -316,6 +325,8 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_softc *scn) const uint32_t header = sizeof(cid) + sizeof(length); struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); @@ -342,8 +353,9 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_softc *scn) cdf_mem_copy(&(bmi_cmd_buff[offset]), &buffer[length - remaining], txlen); offset += txlen; - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, - NULL, NULL, 0); + status = hif_exchange_bmi_msg(scn, cmd, rsp, + bmi_cmd_buff, offset, + NULL, NULL, 0); if (status) { BMI_ERR("Failed to write to the device: status:%d", status); @@ -370,6 +382,8 @@ bmi_sign_stream_start(uint32_t address, struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t remaining, txlen; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); @@ -407,9 +421,9 @@ bmi_sign_stream_start(uint32_t address, offset += sizeof(txlen); cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; - status = hif_exchange_bmi_msg(scn, - bmi_cmd_buff, offset, - NULL, NULL, BMI_EXCHANGE_TIMEOUT_MS); + status = hif_exchange_bmi_msg(scn, cmd, rsp, + bmi_cmd_buff, offset, NULL, + NULL, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Unable to write to the device: status:%d", status); @@ -430,6 +444,8 @@ bmilz_stream_start(uint32_t address, struct ol_softc *scn) uint32_t offset; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); @@ -447,7 +463,7 @@ bmilz_stream_start(uint32_t address, struct ol_softc *scn) offset += sizeof(cid); cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, NULL, 0); if (status) { BMI_ERR("Unable to Start LZ Stream to the device status:%d", @@ -494,3 +510,47 @@ end: return status; } +/** + * ol_cds_init() - API to initialize global CDS OL Context + * @cdf_dev: CDF Device + * @hif_ctx: HIF Context + * + * Return: Success/Failure + */ +CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) +{ + struct ol_context *ol_info; + CDF_STATUS status = CDF_STATUS_SUCCESS; + + if (NO_BMI) + return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + + status = cds_alloc_context(cds_get_global_context(), CDF_MODULE_ID_BMI, + (void **)&ol_info, sizeof(*ol_info)); + + if (status != CDF_STATUS_SUCCESS) { + BMI_ERR("%s: CDS Allocation failed for ol_bmi context", + __func__); + return status; + } + + ol_info->cdf_dev = cdf_dev; + ol_info->scn = hif_ctx; + + return status; +} + +/** + * ol_cds_free() - API to free the global CDS OL Context + * + * Return: void + */ +void ol_cds_free(void) +{ + struct ol_context *ol_info = cds_get_context(CDF_MODULE_ID_BMI); + + if (NO_BMI) + return; + + cds_free_context(cds_get_global_context(), CDF_MODULE_ID_BMI, ol_info); +} diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 1936623c5d14..d2293338051d 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -42,6 +42,8 @@ bmi_read_memory(uint32_t address, uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t align; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_DBG("command disallowed"); @@ -80,8 +82,9 @@ bmi_read_memory(uint32_t address, offset += sizeof(length); /* note we reuse the same buffer to receive on */ - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, - bmi_rsp_buff, &rxlen, BMI_EXCHANGE_TIMEOUT_MS); + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, + offset, bmi_rsp_buff, &rxlen, + BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Unable to read from the device"); return CDF_STATUS_E_FAILURE; @@ -115,6 +118,8 @@ bmi_write_memory(uint32_t address, uint8_t *src; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -158,8 +163,9 @@ bmi_write_memory(uint32_t address, offset += sizeof(txlen); cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, - NULL, NULL, BMI_EXCHANGE_TIMEOUT_MS); + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, + offset, NULL, NULL, + BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Unable to write to the device; status:%d", status); @@ -185,6 +191,8 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_softc *scn) uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -214,7 +222,7 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_softc *scn) cdf_mem_copy(&(bmi_cmd_buff[offset]), param, sizeof(*param)); offset += sizeof(*param); param_len = sizeof(*param); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, bmi_rsp_buff, ¶m_len, 0); if (status) { BMI_ERR("Unable to read from the device status:%d", status); @@ -278,6 +286,7 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) uint32_t cid; struct bmi_info *info; cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_dma_addr_t cmd, rsp; if (!scn) { BMI_ERR("Invalid scn context"); @@ -296,6 +305,9 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) return CDF_STATUS_E_PERM; } + cmd = info->bmi_cmd_da; + rsp = info->bmi_rsp_da; + BMI_DBG("BMI Done: Enter (device: 0x%p)", scn); info->bmi_done = true; @@ -309,7 +321,7 @@ CDF_STATUS bmi_done_local(struct ol_softc *scn) cdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); - status = hif_exchange_bmi_msg(scn, info->bmi_cmd_buff, + status = hif_exchange_bmi_msg(scn, cmd, rsp, info->bmi_cmd_buff, sizeof(cid), NULL, NULL, 0); if (status) { BMI_ERR("Failed to write to the device; status:%d", status); diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 16fdf7223cc5..a3a6d00d607c 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -43,6 +43,8 @@ bmi_no_command(struct ol_softc *scn) struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed: BMI DONE ALREADY"); @@ -58,7 +60,7 @@ bmi_no_command(struct ol_softc *scn) cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, sizeof(cid), + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { @@ -85,6 +87,8 @@ bmi_done_local(struct ol_softc *scn) uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -106,7 +110,7 @@ bmi_done_local(struct ol_softc *scn) cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, sizeof(cid), + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { @@ -155,6 +159,8 @@ bmi_write_memory(uint32_t address, struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -196,8 +202,9 @@ bmi_write_memory(uint32_t address, offset += sizeof(txlen); cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, - bmi_rsp_buff, &rsp_len, BMI_EXCHANGE_TIMEOUT_MS); + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, + offset, bmi_rsp_buff, &rsp_len, + BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("BMI Write Memory Failed status:%d", status); return CDF_STATUS_E_FAILURE; @@ -227,6 +234,8 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, /* note we reuse the same buffer to receive on */ uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(length); + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -259,7 +268,7 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, total_len = rxlen + rsp_len; - status = hif_exchange_bmi_msg(scn, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, bmi_rsp_buff, @@ -297,6 +306,8 @@ bmi_execute(uint32_t address, uint32_t *param, struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -313,7 +324,7 @@ bmi_execute(uint32_t address, uint32_t *param, cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, sizeof(cid), + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { @@ -342,6 +353,9 @@ bmi_load_image(dma_addr_t address, struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; + cdf_dma_addr_t cmd = info->bmi_cmd_da; + cdf_dma_addr_t rsp = info->bmi_rsp_da; + uint32_t addr_h, addr_l; if (info->bmi_done) { @@ -375,7 +389,7 @@ bmi_load_image(dma_addr_t address, offset += sizeof(size); length = sizeof(ret); - status = hif_exchange_bmi_msg(scn, bmi_cmd_buff, offset, + status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 7e9d984e33e8..d6f82352027b 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -121,6 +121,18 @@ typedef enum _ATH_BIN_FILE { #define NO_BMI 0 #endif +/** + * struct ol_context - Structure to hold OL context + * @cdf_dev: CDF Device + * @scn: HIF Context + * + * Structure to hold all ol BMI/Ramdump info + */ +struct ol_context { + cdf_device_t cdf_dev; + struct ol_softc *scn; +}; + CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_softc *scn); CDF_STATUS bmi_init(struct ol_softc *scn); diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 3d8d367d3d5e..0d8d5003c81c 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -263,6 +263,7 @@ typedef struct _cds_context_type { void *htc_ctx; + void *g_ol_context; /* * cdf_ctx will be used by cdf * while allocating dma memory diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index f205d2a73bf0..3a89ab2ae12b 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -173,6 +173,7 @@ CDF_STATUS cds_open(void) cdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; struct ol_softc *scn; + struct ol_context *ol_ctx; void *HTCHandle; hdd_context_t *pHddCtx; @@ -256,8 +257,9 @@ CDF_STATUS cds_open(void) hdd_update_hif_config(scn, pHddCtx); + ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ - cdf_status = bmi_download_firmware(scn); + cdf_status = bmi_download_firmware(ol_ctx); if (cdf_status != CDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "BMI FIALED status:%d", cdf_status); @@ -278,7 +280,7 @@ CDF_STATUS cds_open(void) goto err_bmi_close; } - if (bmi_done(scn)) { + if (bmi_done(ol_ctx)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; @@ -902,6 +904,12 @@ void *cds_get_context(CDF_MODULE_ID moduleId) break; } + case CDF_MODULE_ID_BMI: + { + pModContext = gp_cds_context->g_ol_context; + break; + } + case CDF_MODULE_ID_TXRX: { pModContext = gp_cds_context->pdev_txrx_ctx; @@ -1061,6 +1069,12 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, break; } + case CDF_MODULE_ID_BMI: + { + pGpModContext = &(gp_cds_context->g_ol_context); + break; + } + case CDF_MODULE_ID_EPPING: case CDF_MODULE_ID_SME: case CDF_MODULE_ID_PE: @@ -1150,6 +1164,12 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, break; } + case CDF_MODULE_ID_BMI: + { + pGpModContext = &(gp_cds_context->g_ol_context); + break; + } + case CDF_MODULE_ID_EPPING: case CDF_MODULE_ID_HDD: case CDF_MODULE_ID_SME: diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 729ed3f79794..c3d85e87c403 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -52,6 +52,7 @@ #include "wlan_hdd_napi.h" #include "cds_concurrency.h" #include "qwlan_version.h" +#include "bmi.h" #ifdef MODULE #define WLAN_MODULE_NAME module_name(THIS_MODULE) @@ -219,6 +220,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, void *hif_ctx; CDF_STATUS status; int ret = 0; + cdf_device_t cdf_dev; pr_info("%s: %sprobing driver v%s\n", WLAN_MODULE_NAME, reinit ? "re-" : "", QWLAN_VERSIONSTR); @@ -257,6 +259,14 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_epping_close; hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + + status = ol_cds_init(cdf_dev, hif_ctx); + + if (status != CDF_STATUS_SUCCESS) { + pr_err("%s No Memory to Create BMI Context\n", __func__); + goto err_hif_close; + } if (reinit) ret = hdd_wlan_re_init(hif_ctx); @@ -264,7 +274,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, ret = hdd_wlan_startup(dev, hif_ctx); if (ret) - goto err_hif_close; + goto err_bmi_close; hif_enable_power_management(hif_ctx); @@ -280,6 +290,8 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, return 0; +err_bmi_close: + ol_cds_free(); err_hif_close: hdd_hif_close(hif_ctx); err_epping_close: @@ -344,8 +356,8 @@ static void wlan_hdd_remove(void) __hdd_wlan_exit(); } + ol_cds_free(); hdd_hif_close(hif_ctx); - hdd_deinit(); pr_info("%s: Driver Removed\n", WLAN_MODULE_NAME); @@ -378,6 +390,7 @@ static void wlan_hdd_shutdown(void) hdd_wlan_shutdown(); } + ol_cds_free(); hdd_hif_close(hif_ctx); } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 8f5282c97edd..02d75e85aa8d 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -180,6 +180,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, HTC_INIT_INFO htcInfo; void *pHifContext = NULL; void *pHtcContext = NULL; + struct ol_context *ol_ctx; #endif hdd_context_t *hdd_ctx; @@ -251,7 +252,8 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, goto err_sched_close; } - if (bmi_download_firmware(pHifContext)) { + ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + if (bmi_download_firmware(ol_ctx)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); goto err_bmi_close; @@ -270,7 +272,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, goto err_bmi_close; } - if (bmi_done(pHifContext)) { + if (bmi_done(ol_ctx)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 921746dc839f..59da7cb16478 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -183,6 +183,7 @@ int epping_enable(struct device *parent_dev) tSirMacAddr adapter_macAddr; struct hif_config_info *cfg; struct hif_target_info *tgt_info; + struct ol_context *ol_ctx; EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); @@ -225,9 +226,10 @@ int epping_enable(struct device *parent_dev) /* store target type and target version info in hdd ctx */ pEpping_ctx->target_type = tgt_info->target_type; + ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ - if (bmi_download_firmware(scn)) { + if (bmi_download_firmware(ol_ctx)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); bmi_cleanup(scn); @@ -258,7 +260,7 @@ int epping_enable(struct device *parent_dev) return -1; } - if (bmi_done(scn)) { + if (bmi_done(ol_ctx)) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto error_end; -- cgit v1.2.3 From 5a6e508834a929c20949b30fe0140b5d6fa54634 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 24 Feb 2016 17:59:09 +0530 Subject: qcacld-3.0: Pass ol_context to all BMI API's Remove ol_softc as argument in BMI API's and pass ol_context as the default argument. Change-Id: I66b5daed047c7efe9a01cac30d2d0e7427aab2cd CRs-Fixed: 967765 --- core/bmi/inc/bmi.h | 4 +- core/bmi/src/bmi.c | 63 ++++++++------ core/bmi/src/bmi_1.c | 30 ++++--- core/bmi/src/bmi_2.c | 39 +++++---- core/bmi/src/i_bmi.h | 38 ++++----- core/bmi/src/ol_fw.c | 166 ++++++++++++++++++------------------ core/cds/src/cds_api.c | 2 +- core/hdd/src/wlan_hdd_ftm.c | 2 +- core/utils/epping/src/epping_main.c | 6 +- 9 files changed, 185 insertions(+), 165 deletions(-) diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index d292cb3114ae..c79aeec26b03 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -42,11 +42,11 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); void ol_cds_free(void); #ifdef HIF_PCI -void bmi_cleanup(struct ol_softc *scn); +void bmi_cleanup(struct ol_context *scn); CDF_STATUS bmi_done(struct ol_context *ol_ctx); CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); #else -static inline void bmi_cleanup(struct ol_softc *scn) +static inline void bmi_cleanup(struct ol_context *scn) { return; } diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index ad625a0cb661..1199acca0718 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -39,27 +39,28 @@ static CDF_STATUS bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, - uint32_t length, struct ol_softc *scn) + uint32_t length, struct ol_context *ol_ctx) { switch (command) { case BMI_NO_COMMAND: - return bmi_no_command(scn); + return bmi_no_command(ol_ctx); case BMI_WRITE_MEMORY: - return bmi_write_memory(address, data, length, scn); + return bmi_write_memory(address, data, length, ol_ctx); case BMI_READ_MEMORY: - return bmi_read_memory(address, data, length, scn); + return bmi_read_memory(address, data, length, ol_ctx); case BMI_EXECUTE: - return bmi_execute(address, (uint32_t *)data, scn); + return bmi_execute(address, (uint32_t *)data, ol_ctx); default: break; } return CDF_STATUS_SUCCESS; } -CDF_STATUS bmi_init(struct ol_softc *scn) +CDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info; - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + struct ol_softc *scn = ol_ctx->scn; + cdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!scn) { BMI_ERR("Invalid scn Context"); @@ -102,10 +103,11 @@ end: return CDF_STATUS_E_NOMEM; } -void bmi_cleanup(struct ol_softc *scn) +void bmi_cleanup(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!cdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); @@ -131,23 +133,24 @@ void bmi_cleanup(struct ol_softc *scn) CDF_STATUS bmi_done(struct ol_context *ol_ctx) { CDF_STATUS status = CDF_STATUS_SUCCESS; - struct ol_softc *scn = ol_ctx->scn; if (NO_BMI) return status; - status = bmi_done_local(scn); + status = bmi_done_local(ol_ctx); if (status != CDF_STATUS_SUCCESS) BMI_ERR("BMI_DONE Failed status:%d", status); + return status; } CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, - struct ol_softc *scn) + struct ol_context *ol_ctx) { int status = 0; + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -214,23 +217,24 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) BMI_DBG("ret:%d writing data:%s\n", ret, data); address = bmi_get_test_addr(); - if (bmi_init(scn) != CDF_STATUS_SUCCESS) { + if (bmi_init(ol_ctx) != CDF_STATUS_SUCCESS) { BMI_WARN("BMI_INIT Failed; No Memory!"); goto end; } - bmi_command_test(BMI_NO_COMMAND, address, data, 9, scn); - bmi_command_test(BMI_WRITE_MEMORY, address, data, 9, scn); - bmi_command_test(BMI_READ_MEMORY, address, out, 9, scn); + bmi_command_test(BMI_NO_COMMAND, address, data, 9, ol_ctx); + bmi_command_test(BMI_WRITE_MEMORY, address, data, 9, ol_ctx); + bmi_command_test(BMI_READ_MEMORY, address, out, 9, ol_ctx); BMI_DBG("Output:%s", out); } #endif end: - return bmi_firmware_download(scn); + return bmi_firmware_download(ol_ctx); } -CDF_STATUS -bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_softc *scn) +CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, + struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset, param_len; @@ -272,9 +276,10 @@ bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_softc *scn) return CDF_STATUS_SUCCESS; } -CDF_STATUS -bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_softc *scn) +CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, + struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -316,13 +321,14 @@ bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_softc *scn) } CDF_STATUS -bmilz_data(uint8_t *buffer, uint32_t length, struct ol_softc *scn) +bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; int status; uint32_t offset; uint32_t remaining, txlen; const uint32_t header = sizeof(cid) + sizeof(length); + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -437,11 +443,12 @@ bmi_sign_stream_start(uint32_t address, } CDF_STATUS -bmilz_stream_start(uint32_t address, struct ol_softc *scn) +bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) { uint32_t cid; int status; uint32_t offset; + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -476,14 +483,14 @@ bmilz_stream_start(uint32_t address, struct ol_softc *scn) CDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, - uint32_t length, struct ol_softc *scn) + uint32_t length, struct ol_context *ol_ctx) { CDF_STATUS status = CDF_STATUS_E_FAILURE; uint32_t last_word = 0; uint32_t last_word_offset = length & ~0x3; uint32_t unaligned_bytes = length & 0x3; - status = bmilz_stream_start(address, scn); + status = bmilz_stream_start(address, ol_ctx); if (status != CDF_STATUS_SUCCESS) goto end; @@ -492,20 +499,20 @@ bmi_fast_download(uint32_t address, uint8_t *buffer, cdf_mem_copy(&last_word, &buffer[last_word_offset], unaligned_bytes); - status = bmilz_data(buffer, last_word_offset, scn); + status = bmilz_data(buffer, last_word_offset, ol_ctx); if (status != CDF_STATUS_SUCCESS) goto end; if (unaligned_bytes) - status = bmilz_data((uint8_t *) &last_word, 4, scn); + status = bmilz_data((uint8_t *) &last_word, 4, ol_ctx); if (status != CDF_STATUS_SUCCESS) /* * Close compressed stream and open a new (fake) one. * This serves mainly to flush Target caches. */ - status = bmilz_stream_start(0x00, scn); + status = bmilz_stream_start(0x00, ol_ctx); end: return status; } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index d2293338051d..111874999b1a 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -32,8 +32,9 @@ CDF_STATUS bmi_read_memory(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn) + uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -105,10 +106,10 @@ bmi_read_memory(uint32_t address, return CDF_STATUS_SUCCESS; } -CDF_STATUS -bmi_write_memory(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn) +CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, + struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -181,8 +182,9 @@ bmi_write_memory(uint32_t address, } CDF_STATUS -bmi_execute(uint32_t address, A_UINT32 *param, struct ol_softc *scn) +bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -236,28 +238,29 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_softc *scn) } inline CDF_STATUS -bmi_no_command(struct ol_softc *scn) +bmi_no_command(struct ol_context *ol_ctx) { return CDF_STATUS_SUCCESS; } CDF_STATUS -bmi_firmware_download(struct ol_softc *scn) +bmi_firmware_download(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; CDF_STATUS status; struct bmi_target_info targ_info; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); cdf_mem_zero(&targ_info, sizeof(targ_info)); /* Initialize BMI */ - status = bmi_init(scn); + status = bmi_init(ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("BMI Initialization Failed err:%d", status); return status; } /* Get target information */ - status = bmi_get_target_info(&targ_info, scn); + status = bmi_get_target_info(&targ_info, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("BMI Target Info get failed: status:%d", status); return status; @@ -267,25 +270,26 @@ bmi_firmware_download(struct ol_softc *scn) tgt_info->target_version = targ_info.target_ver; /* Configure target */ - status = ol_configure_target(scn); + status = ol_configure_target(ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("BMI Configure Target Failed status:%d", status); return status; } - status = ol_download_firmware(scn); + status = ol_download_firmware(ol_ctx); if (status != CDF_STATUS_SUCCESS) BMI_ERR("BMI Download Firmware Failed Status:%d", status); return status; } -CDF_STATUS bmi_done_local(struct ol_softc *scn) +CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; int status; uint32_t cid; struct bmi_info *info; - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_device_t cdf_dev = ol_ctx->cdf_dev; cdf_dma_addr_t cmd, rsp; if (!scn) { diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index a3a6d00d607c..18ab4608b4ea 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -34,8 +34,9 @@ #define BMI_LOAD_IMAGE 18 CDF_STATUS -bmi_no_command(struct ol_softc *scn) +bmi_no_command(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -77,8 +78,9 @@ bmi_no_command(struct ol_softc *scn) } CDF_STATUS -bmi_done_local(struct ol_softc *scn) +bmi_done_local(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -86,7 +88,7 @@ bmi_done_local(struct ol_softc *scn) struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_device_t cdf_dev = ol_ctx->cdf_dev; cdf_dma_addr_t cmd = info->bmi_cmd_da; cdf_dma_addr_t rsp = info->bmi_rsp_da; @@ -145,7 +147,7 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, - struct ol_softc *scn) + struct ol_context *ol_ctx) { uint32_t cid; int status; @@ -156,6 +158,7 @@ bmi_write_memory(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -222,8 +225,9 @@ bmi_write_memory(uint32_t address, CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, - uint32_t length, struct ol_softc *scn) + uint32_t length, struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint8_t ret = 0; @@ -296,9 +300,9 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, } CDF_STATUS -bmi_execute(uint32_t address, uint32_t *param, - struct ol_softc *scn) +bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -343,13 +347,14 @@ bmi_execute(uint32_t address, uint32_t *param, static CDF_STATUS bmi_load_image(dma_addr_t address, - uint32_t size, struct ol_softc *scn) + uint32_t size, struct ol_context *ol_ctx) { uint32_t cid; CDF_STATUS status; uint32_t offset; uint32_t length; uint8_t ret = 0; + struct ol_softc *scn = ol_ctx->scn; struct bmi_info *info = hif_get_bmi_ctx(scn); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -405,8 +410,9 @@ bmi_load_image(dma_addr_t address, return CDF_STATUS_SUCCESS; } -static CDF_STATUS bmi_enable(struct ol_softc *scn) +static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; struct bmi_target_info targ_info; struct image_desc_info image_desc_info; CDF_STATUS status; @@ -426,7 +432,7 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) return CDF_STATUS_NOT_INITIALIZED; } - status = bmi_get_target_info(&targ_info, scn); + status = bmi_get_target_info(&targ_info, ol_ctx); if (status != CDF_STATUS_SUCCESS) return status; @@ -443,7 +449,7 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) status = bmi_load_image(image_desc_info.bdata_addr, image_desc_info.bdata_size, - scn); + ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Load board data failed! status:%d", status); return status; @@ -451,27 +457,28 @@ static CDF_STATUS bmi_enable(struct ol_softc *scn) status = bmi_load_image(image_desc_info.fw_addr, image_desc_info.fw_size, - scn); + ol_ctx); if (status != CDF_STATUS_SUCCESS) BMI_ERR("Load fw image failed! status:%d", status); return status; } -CDF_STATUS bmi_firmware_download(struct ol_softc *scn) +CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; CDF_STATUS status; if (NO_BMI) return CDF_STATUS_SUCCESS; - status = bmi_init(scn); + status = bmi_init(ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("BMI_INIT Failed status:%d", status); goto end; } - status = bmi_enable(scn); + status = bmi_enable(ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("BMI_ENABLE failed status:%d\n", status); goto err_bmi_enable; @@ -479,7 +486,7 @@ CDF_STATUS bmi_firmware_download(struct ol_softc *scn) return status; err_bmi_enable: - bmi_cleanup(scn); + bmi_cleanup(ol_ctx); end: return status; } diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index d6f82352027b..71aed7189a38 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -134,25 +134,23 @@ struct ol_context { }; CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, - struct ol_softc *scn); -CDF_STATUS bmi_init(struct ol_softc *scn); -CDF_STATUS bmi_no_command(struct ol_softc *scn); -CDF_STATUS bmi_read_memory(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn); -CDF_STATUS bmi_write_memory(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn); -CDF_STATUS bmi_fast_download(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn); + struct ol_context *ol_ctx); +CDF_STATUS bmi_init(struct ol_context *ol_ctx); +CDF_STATUS bmi_no_command(struct ol_context *ol_ctx); +CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, + struct ol_context *ol_ctx); +CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, + struct ol_context *ol_ctx); +CDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, + struct ol_context *ol_ctx); CDF_STATUS bmi_read_soc_register(uint32_t address, - uint32_t *param, struct ol_softc *scn); -CDF_STATUS bmi_write_soc_register(uint32_t address, - uint32_t param, struct ol_softc *scn); -CDF_STATUS bmi_get_target_info( - struct bmi_target_info *targ_info, struct ol_softc *scn); - -CDF_STATUS bmi_firmware_download(struct ol_softc *scn); -CDF_STATUS bmi_done_local(struct ol_softc *scn); - -CDF_STATUS ol_download_firmware(struct ol_softc *scn); -CDF_STATUS ol_configure_target(struct ol_softc *scn); + uint32_t *param, struct ol_context *ol_ctx); +CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, + struct ol_context *ol_ctx); +CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, + struct ol_context *ol_ctx); +CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); +CDF_STATUS bmi_done_local(struct ol_context *ol_ctx); +CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); +CDF_STATUS ol_configure_target(struct ol_context *ol_ctx); #endif diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 240f7c385ccd..e446fda02c37 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -132,9 +132,11 @@ end: } #endif -static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, +static int +__ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, uint32_t address, bool compressed) { + struct ol_softc *scn = ol_ctx->scn; int status = EOK; const char *filename = NULL; const struct firmware *fw_entry; @@ -324,7 +326,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, /* Determine where in Target RAM to write Board Data */ bmi_read_memory(HOST_INTEREST_ITEM_ADDRESS(target_type, hi_board_ext_data), - (uint8_t *) &board_ext_address, 4, scn); + (uint8_t *) &board_ext_address, 4, ol_ctx); BMI_INFO("Board extended Data download address: 0x%x", board_ext_address); @@ -340,7 +342,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, status = bmi_write_memory(board_ext_address, (uint8_t *)(temp_eeprom + board_data_size), - board_ext_data_size, scn); + board_ext_data_size, ol_ctx); if (status != EOK) goto end; @@ -350,7 +352,7 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, bmi_write_memory( HOST_INTEREST_ITEM_ADDRESS(target_type, hi_board_ext_data_config), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); fw_entry_size = board_data_size; } @@ -397,16 +399,16 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, if (compressed) { status = bmi_fast_download(address, (uint8_t *) fw_entry->data + bin_off, - bin_len, scn); + bin_len, ol_ctx); } else { if (file == ATH_BOARD_DATA_FILE && fw_entry->data) { status = bmi_write_memory(address, (uint8_t *) temp_eeprom, - fw_entry_size, scn); + fw_entry_size, ol_ctx); } else { status = bmi_write_memory(address, (uint8_t *) fw_entry->data - + bin_off, bin_len, scn); + + bin_off, bin_len, ol_ctx); } } @@ -426,16 +428,16 @@ static int __ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, if (compressed) { status = bmi_fast_download(address, (uint8_t *) fw_entry->data, - fw_entry_size, scn); + fw_entry_size, ol_ctx); } else { if (file == ATH_BOARD_DATA_FILE && fw_entry->data) { status = bmi_write_memory(address, (uint8_t *) temp_eeprom, - fw_entry_size, scn); + fw_entry_size, ol_ctx); } else { status = bmi_write_memory(address, (uint8_t *) fw_entry->data, - fw_entry_size, scn); + fw_entry_size, ol_ctx); } } #endif /* QCA_SIGNED_SPLIT_BINARY_SUPPORT */ @@ -458,7 +460,8 @@ end: return status; } -static int ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, +static int +ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, uint32_t address, bool compressed) { int ret; @@ -468,7 +471,7 @@ static int ol_transfer_bin_file(struct ol_softc *scn, ATH_BIN_FILE file, cnss_lock_pm_sem(); #endif - ret = __ol_transfer_bin_file(scn, file, address, compressed); + ret = __ol_transfer_bin_file(ol_ctx, file, address, compressed); #ifdef CONFIG_CNSS cnss_release_pm_sem(); @@ -667,13 +670,14 @@ void ol_target_failure(void *instance, CDF_STATUS status) return; } -CDF_STATUS ol_configure_target(struct ol_softc *scn) +CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) { uint32_t param; #ifdef CONFIG_CNSS struct cnss_platform_cap cap; int ret; #endif + struct ol_softc *scn = ol_ctx->scn; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); uint32_t target_type = tgt_info->target_type; @@ -683,7 +687,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_app_host_interest)), - (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_write_memory for htc version failed"); return CDF_STATUS_E_FAILURE; } @@ -692,7 +696,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting fwmode failed"); return CDF_STATUS_E_FAILURE; } @@ -714,7 +718,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting fwmode failed"); return CDF_STATUS_E_FAILURE; } @@ -725,7 +729,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) /* set the firmware to disable CDC max perf WAR */ if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI READ for setting cdc max perf failed"); return CDF_STATUS_E_FAILURE; } @@ -734,7 +738,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("setting cdc max perf failed"); return CDF_STATUS_E_FAILURE; } @@ -750,7 +754,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (!ret && cap.cap_flag & CNSS_HAS_EXTERNAL_SWREG) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting" "external SWREG failed"); return CDF_STATUS_E_FAILURE; @@ -760,7 +764,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting external SWREG fail"); return CDF_STATUS_E_FAILURE; } @@ -771,7 +775,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (ini_cfg->enable_lpass_support) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI READ:Setting LPASS Support failed"); return CDF_STATUS_E_FAILURE; } @@ -780,7 +784,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI_READ for setting LPASS Support fail"); return CDF_STATUS_E_FAILURE; } @@ -797,7 +801,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_be)), - (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("setting host CPU BE mode failed"); return CDF_STATUS_E_FAILURE; } @@ -808,7 +812,7 @@ CDF_STATUS ol_configure_target(struct ol_softc *scn) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_fw_swap)), - (uint8_t *) ¶m, 4, scn) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE failed setting FW data/desc swap flags"); return CDF_STATUS_E_FAILURE; } @@ -888,8 +892,9 @@ CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, return CDF_STATUS_SUCCESS; } -CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) +CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; CDF_STATUS status = CDF_STATUS_SUCCESS; uint32_t addr = 0; uint32_t reg_val = 0; @@ -926,7 +931,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) } addr = (RTC_SOC_BASE_ADDRESS | EFUSE_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read EFUSE Addr"); goto end; @@ -943,7 +948,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 1---- */ reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | BB_PLL_CONFIG_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CONFIG Addr"); goto end; @@ -953,14 +958,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val &= ~(BB_PLL_CONFIG_FRAC_MASK | BB_PLL_CONFIG_OUTDIV_MASK); reg_val |= (BB_PLL_CONFIG_FRAC_SET(clock_s.wlan_pll.rnfrac) | BB_PLL_CONFIG_OUTDIV_SET(clock_s.wlan_pll.outdiv)); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CONFIG Addr"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CONFIG Addr"); goto end; @@ -970,7 +975,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 2---- */ reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_SETTLE_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_SETTLE Addr"); goto end; @@ -979,14 +984,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val &= ~WLAN_PLL_SETTLE_TIME_MASK; reg_val |= WLAN_PLL_SETTLE_TIME_SET(clock_s.pll_settling_time); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_SETTLE Addr"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_SETTLE Addr"); goto end; @@ -996,7 +1001,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 3---- */ reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CORE_CLK_CTRL_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CLK_CTRL Addr"); goto end; @@ -1005,14 +1010,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val &= ~SOC_CORE_CLK_CTRL_DIV_MASK; reg_val |= SOC_CORE_CLK_CTRL_DIV_SET(1); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_CTRL Addr"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CLK_CTRL Addr"); goto end; @@ -1022,7 +1027,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 4----- */ mem_val = 1; status = bmi_write_memory(cmnos_core_clk_div_addr, - (uint8_t *) &mem_val, 4, scn); + (uint8_t *) &mem_val, 4, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_DIV Addr"); goto end; @@ -1031,7 +1036,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 5----- */ reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr"); goto end; @@ -1043,14 +1048,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val |= (WLAN_PLL_CONTROL_REFDIV_SET(clock_s.wlan_pll.refdiv) | WLAN_PLL_CONTROL_DIV_SET(clock_s.wlan_pll.div) | WLAN_PLL_CONTROL_NOPWD_SET(1)); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr"); goto end; @@ -1062,7 +1067,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) do { reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | - RTC_SYNC_STATUS_OFFSET), ®_val, scn); + RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read RTC_SYNC_STATUS Addr"); goto end; @@ -1072,7 +1077,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 7------- */ reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for CTRL_BYPASS"); goto end; @@ -1081,14 +1086,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val &= ~WLAN_PLL_CONTROL_BYPASS_MASK; reg_val |= WLAN_PLL_CONTROL_BYPASS_SET(0); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for CTRL_BYPASS"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for CTRL_BYPASS"); goto end; @@ -1099,7 +1104,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) do { reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | - RTC_SYNC_STATUS_OFFSET), ®_val, scn); + RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read SYNC_STATUS Addr"); goto end; @@ -1109,7 +1114,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 9-------- */ reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CPU_CLOCK_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CPU_CLK Addr"); goto end; @@ -1118,14 +1123,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) reg_val &= ~SOC_CPU_CLOCK_STANDARD_MASK; reg_val |= SOC_CPU_CLOCK_STANDARD_SET(1); - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_CLK Addr"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CPU_CLK Addr"); goto end; @@ -1135,7 +1140,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 10------- */ reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for NOPWD"); goto end; @@ -1143,13 +1148,13 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) BMI_DBG("Step 10a: %8X", reg_val); reg_val &= ~WLAN_PLL_CONTROL_NOPWD_MASK; - status = bmi_write_soc_register(addr, reg_val, scn); + status = bmi_write_soc_register(addr, reg_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for NOPWD"); goto end; } reg_val = 0; - status = bmi_read_soc_register(addr, ®_val, scn); + status = bmi_read_soc_register(addr, ®_val, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for NOPWD"); goto end; @@ -1159,7 +1164,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) /* ------Step 11------- */ mem_val = 1; status = bmi_write_memory(cmnos_cpu_pll_init_done_addr, - (uint8_t *) &mem_val, 4, scn); + (uint8_t *) &mem_val, 4, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_INIT Addr"); goto end; @@ -1167,7 +1172,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_softc *scn) mem_val = TARGET_CPU_FREQ; status = bmi_write_memory(cmnos_cpu_speed_addr, - (uint8_t *) &mem_val, 4, scn); + (uint8_t *) &mem_val, 4, ol_ctx); if (status != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_SPEED Addr"); goto end; @@ -1181,15 +1186,11 @@ end: /* AXI Start Address */ #define TARGET_ADDR (0xa0000) -void ol_transfer_codeswap_struct(struct ol_softc *scn) +void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) { struct codeswap_codeseg_info wlan_codeswap; CDF_STATUS rv; - if (!scn) { - BMI_ERR("%s: ol_softc is null", __func__); - return; - } if (cnss_get_codeswap_struct(&wlan_codeswap)) { BMI_ERR("%s: failed to get codeswap structure", __func__); return; @@ -1197,7 +1198,7 @@ void ol_transfer_codeswap_struct(struct ol_softc *scn) rv = bmi_write_memory(TARGET_ADDR, (uint8_t *) &wlan_codeswap, sizeof(wlan_codeswap), - scn); + ol_ctx); if (rv != CDF_STATUS_SUCCESS) { BMI_ERR("Failed to Write 0xa0000 to Target"); @@ -1207,8 +1208,9 @@ void ol_transfer_codeswap_struct(struct ol_softc *scn) } #endif -CDF_STATUS ol_download_firmware(struct ol_softc *scn) +CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) { + struct ol_softc *scn = ol_ctx->scn; uint32_t param, address = 0; int status = !EOK; CDF_STATUS ret; @@ -1230,14 +1232,16 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) /* Determine where in Target RAM to write Board Data */ bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data)), - (uint8_t *)&address, 4, scn); + (uint8_t *)&address, 4, ol_ctx); if (!address) { address = AR6004_REV5_BOARD_DATA_ADDRESS; BMI_DBG("%s: Target address not known! Using 0x%x", __func__, address); } - ret = ol_patch_pll_switch(scn); + + ret = ol_patch_pll_switch(ol_ctx); + if (ret != CDF_STATUS_SUCCESS) { BMI_ERR("pll switch failed. status %d", ret); return ret; @@ -1245,7 +1249,7 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) if (bmi_ctx->cal_in_flash) { /* Write EEPROM or Flash data to Target RAM */ - status = ol_transfer_bin_file(scn, ATH_FLASH_FILE, + status = ol_transfer_bin_file(ol_ctx, ATH_FLASH_FILE, address, false); } @@ -1256,11 +1260,11 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data_initialized)), - (uint8_t *) ¶m, 4, scn); + (uint8_t *) ¶m, 4, ol_ctx); } else { /* Flash is either not available or invalid */ - if (ol_transfer_bin_file - (scn, ATH_BOARD_DATA_FILE, address, false) != EOK) { + if (ol_transfer_bin_file(ol_ctx, ATH_BOARD_DATA_FILE, address, + false) != EOK) { return -1; } @@ -1270,7 +1274,7 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_board_data_initialized)), - (uint8_t *) ¶m, 4, scn); + (uint8_t *) ¶m, 4, ol_ctx); /* Transfer One Time Programmable data */ address = BMI_SEGMENTED_WRITE_ADDR; @@ -1278,26 +1282,26 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) __func__, address); #ifdef CONFIG_CNSS - ol_transfer_codeswap_struct(scn); + ol_transfer_codeswap_struct(ol_ctx); #endif - status = ol_transfer_bin_file(scn, ATH_OTP_FILE, + status = ol_transfer_bin_file(ol_ctx, ATH_OTP_FILE, address, true); /* Execute the OTP code only if entry found and downloaded */ if (status == EOK) { param = 0; #ifndef FEATURE_BMI_2 - bmi_execute(address, ¶m, scn); + bmi_execute(address, ¶m, ol_ctx); #endif } else if (status < 0) { return status; } } - if (ol_transfer_bin_file(scn, ATH_SETUP_FILE, + if (ol_transfer_bin_file(ol_ctx, ATH_SETUP_FILE, BMI_SEGMENTED_WRITE_ADDR, true) == EOK) { param = 0; #ifndef FEATURE_BMI_2 - bmi_execute(address, ¶m, scn); + bmi_execute(address, ¶m, ol_ctx); #endif } @@ -1305,20 +1309,20 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) * TODO point to target specific files in runtime */ address = BMI_SEGMENTED_WRITE_ADDR; - if (ol_transfer_bin_file(scn, ATH_FIRMWARE_FILE, + if (ol_transfer_bin_file(ol_ctx, ATH_FIRMWARE_FILE, address, true) != EOK) { return -1; } /* Apply the patches */ if (ol_check_dataset_patch(scn, &address)) { - if ((ol_transfer_bin_file(scn, ATH_PATCH_FILE, address, false)) + if ((ol_transfer_bin_file(ol_ctx, ATH_PATCH_FILE, address, false)) != EOK) { return -1; } bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_dset_list_head)), - (uint8_t *) &address, 4, scn); + (uint8_t *) &address, 4, ol_ctx); } if (ini_cfg->enable_uart_print || @@ -1343,11 +1347,11 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_dbg_uart_txpin)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); param = 1; bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_serial_enable)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); } else { /* * Explicitly setting UART prints to zero as target turns it on @@ -1356,18 +1360,18 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) param = 0; bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_serial_enable)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); } if (ini_cfg->enable_fw_log) { bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); param &= ~(HI_OPTION_DISABLE_DBGLOG); bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); } else { /* * Explicitly setting fwlog prints to zero as target turns it on @@ -1375,12 +1379,12 @@ CDF_STATUS ol_download_firmware(struct ol_softc *scn) */ bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, scn); + (uint8_t *)¶m, 4, ol_ctx); param |= HI_OPTION_DISABLE_DBGLOG; bmi_write_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *) ¶m, 4, scn); + (uint8_t *) ¶m, 4, ol_ctx); } return status; diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 3a89ab2ae12b..7a08600674af 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -461,7 +461,7 @@ err_htc_close: } err_bmi_close: - bmi_cleanup(scn); + bmi_cleanup(ol_ctx); err_sched_close: cds_sched_close(gp_cds_context); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 02d75e85aa8d..eceaa5fbc853 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -382,7 +382,7 @@ err_htc_close: } err_bmi_close: - bmi_cleanup(pHifContext); + bmi_cleanup(ol_ctx); #endif /* QCA_WIFI_FTM */ err_sched_close: diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 59da7cb16478..29e3f11f2f8c 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -232,7 +232,7 @@ int epping_enable(struct device *parent_dev) if (bmi_download_firmware(ol_ctx)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); - bmi_cleanup(scn); + bmi_cleanup(ol_ctx); return -1; } #endif @@ -249,7 +249,7 @@ int epping_enable(struct device *parent_dev) if (!p_cds_context->htc_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); - bmi_cleanup(scn); + bmi_cleanup(ol_ctx); return -1; } pEpping_ctx->HTCHandle = @@ -306,6 +306,6 @@ int epping_enable(struct device *parent_dev) error_end: htc_destroy(p_cds_context->htc_ctx); p_cds_context->htc_ctx = NULL; - bmi_cleanup(scn); + bmi_cleanup(ol_ctx); return -1; } -- cgit v1.2.3 From 0863349dd3eca90f99b27b5dab61710ff494c684 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 24 Feb 2016 18:05:07 +0530 Subject: qcacld-3.0: Make Ramdump Work as member of ol_context Initialize Ramdump Work as member of ol_context instead of global work. Pass ol_context as private data to host to target module. Change-Id: I97712f40c4bfcd7d854e2a89727d73fd7178598c CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 2 ++ core/bmi/src/i_bmi.h | 5 ++++- core/bmi/src/ol_fw.c | 21 +++++++-------------- core/cds/src/cds_api.c | 4 ++-- core/hdd/src/wlan_hdd_ftm.c | 5 +++-- core/utils/epping/src/epping_main.c | 4 ++-- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 1199acca0718..c3fd0463f0a5 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -544,6 +544,8 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) ol_info->cdf_dev = cdf_dev; ol_info->scn = hif_ctx; + cdf_create_work(&ol_info->ramdump_work, ramdump_work_handler, ol_info); + return status; } diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 71aed7189a38..007bc617cd63 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -125,12 +125,14 @@ typedef enum _ATH_BIN_FILE { * struct ol_context - Structure to hold OL context * @cdf_dev: CDF Device * @scn: HIF Context + * @ramdump_work: WorkQueue for Ramdump collection * * Structure to hold all ol BMI/Ramdump info */ struct ol_context { cdf_device_t cdf_dev; struct ol_softc *scn; + cdf_work_t ramdump_work; }; CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, @@ -148,9 +150,10 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx); CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, - struct ol_context *ol_ctx); + struct ol_context *ol_ctx); CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); CDF_STATUS bmi_done_local(struct ol_context *ol_ctx); CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); CDF_STATUS ol_configure_target(struct ol_context *ol_ctx); +void ramdump_work_handler(void *arg); #endif diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index e446fda02c37..78cd3a8e910b 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -482,8 +482,6 @@ ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, #if defined(CONFIG_CNSS) -static struct ol_softc *ramdump_scn; - /** * struct ramdump_info: Structure to hold ramdump information * @base: Base address for Ramdump collection @@ -529,18 +527,20 @@ int ol_copy_ramdump(struct ol_softc *scn) return ret; } -static void ramdump_work_handler(struct work_struct *ramdump) +void ramdump_work_handler(void *ol_context) { int ret; uint32_t host_interest_address; uint32_t dram_dump_values[4]; uint32_t target_type; struct hif_target_info *tgt_info; + struct ol_context *ol_ctx = ol_context; + struct ol_softc *ramdump_scn = ol_ctx->scn; + if (!ramdump_scn) { BMI_ERR("%s:Ramdump_scn is null:", __func__); goto out_fail; } - tgt_info = hif_get_target_info_handle(ramdump_scn); target_type = tgt_info->target_type; #ifdef DEBUG @@ -594,14 +594,6 @@ out_fail: return; } -static DECLARE_WORK(ramdump_work, ramdump_work_handler); - -void ol_schedule_ramdump_work(struct ol_softc *scn) -{ - ramdump_scn = scn; - schedule_work(&ramdump_work); -} - static void fw_indication_work_handler(struct work_struct *fw_indication) { cnss_device_self_recovery(); @@ -617,7 +609,8 @@ void ol_schedule_fw_indication_work(struct ol_softc *scn) void ol_target_failure(void *instance, CDF_STATUS status) { - struct ol_softc *scn = (struct ol_softc *)instance; + struct ol_context *ol_ctx = instance; + struct ol_softc *scn = ol_ctx->scn; tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); int ret; @@ -662,7 +655,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) #if defined(CONFIG_CNSS) /* Collect the RAM dump through a workqueue */ if (ini_cfg->enable_ramdump_collection) - ol_schedule_ramdump_work(scn); + cdf_schedule_work(&ol_ctx->ramdump_work); else pr_debug("%s: athdiag read for target reg\n", __func__); #endif diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 7a08600674af..a6bd718fcee2 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -266,14 +266,14 @@ CDF_STATUS cds_open(void) goto err_bmi_close; } - htcInfo.pContext = gp_cds_context->pHIFContext; + htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge; cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(htcInfo.pContext, &htcInfo, cdf_ctx); + htc_create(scn, &htcInfo, cdf_ctx); if (!gp_cds_context->htc_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index eceaa5fbc853..aee47a47fb90 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -258,14 +258,15 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, "%s: BMI failed to download target", __func__); goto err_bmi_close; } - htcInfo.pContext = gp_cds_context->pHIFContext; + + htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge; cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(htcInfo.pContext, &htcInfo, cdf_ctx); + htc_create(pHifContext, &htcInfo, cdf_ctx); if (!gp_cds_context->htc_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 29e3f11f2f8c..244f10f641d0 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -239,13 +239,13 @@ int epping_enable(struct device *parent_dev) EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: bmi_download_firmware done", __func__); - htcInfo.pContext = p_cds_context->pHIFContext; + htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = epping_target_suspend_acknowledge; cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); /* Create HTC */ - p_cds_context->htc_ctx = htc_create(htcInfo.pContext, &htcInfo, cdf_ctx); + p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx); if (!p_cds_context->htc_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); -- cgit v1.2.3 From 42c16a160613c324490171ac62d2439d416c115c Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 16 Feb 2016 18:09:10 +0530 Subject: qcacld-3.0: Move Targetdef from ol_softc to ol_context Targetdef is needed during BMI phase of PLL switching. Move this member to ol_context. Change-Id: Ibd7d9a916d9e61c1f7c13d4e18d018add94a6fa3 CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 1 + core/bmi/src/i_bmi.h | 3 +++ core/bmi/src/ol_fw.c | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index c3fd0463f0a5..e1b01c4ecc90 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -543,6 +543,7 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) ol_info->cdf_dev = cdf_dev; ol_info->scn = hif_ctx; + ol_info->tgt_def.targetdef = hif_get_targetdef(hif_ctx); cdf_create_work(&ol_info->ramdump_work, ramdump_work_handler, ol_info); diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 007bc617cd63..f9271a8d970d 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -133,6 +133,9 @@ struct ol_context { cdf_device_t cdf_dev; struct ol_softc *scn; cdf_work_t ramdump_work; + struct targetdef_t { + struct targetdef_s *targetdef; + } tgt_def; }; CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 78cd3a8e910b..a18c055a4531 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -887,7 +887,7 @@ CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct ol_softc *hif = ol_ctx->scn; CDF_STATUS status = CDF_STATUS_SUCCESS; uint32_t addr = 0; uint32_t reg_val = 0; @@ -896,8 +896,9 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) uint32_t cmnos_core_clk_div_addr = 0; uint32_t cmnos_cpu_pll_init_done_addr = 0; uint32_t cmnos_cpu_speed_addr = 0; - struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); + struct hif_target_info *tgt_info = hif_get_target_info_handle(hif); uint32_t target_version = tgt_info->target_version; + struct targetdef_t *scn = &ol_ctx->tgt_def; switch (target_version) { case AR6320_REV1_1_VERSION: -- cgit v1.2.3 From 9ef9458c04058a3e6b2169db7d63e7d93119245e Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 24 Feb 2016 18:14:55 +0530 Subject: qcacld-3.0: Create BMI info structures for BMI Phase BMI info is needed during BMI Phase. The structure holds the physical address and virtual address of Command and response of BMI buffer. Change-Id: I97e8dad2ccba1352677cdf37e2f62204128d4b06 CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 24 +++++++++++------------- core/bmi/src/bmi_1.c | 8 ++++---- core/bmi/src/bmi_2.c | 14 +++++++------- core/bmi/src/i_bmi.h | 28 ++++++++++++++++++++++++++++ core/bmi/src/ol_fw.c | 12 ++++++------ 5 files changed, 56 insertions(+), 30 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index e1b01c4ecc90..11e380a5d6fb 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -58,7 +58,7 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, CDF_STATUS bmi_init(struct ol_context *ol_ctx) { - struct bmi_info *info; + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); struct ol_softc *scn = ol_ctx->scn; cdf_device_t cdf_dev = ol_ctx->cdf_dev; @@ -73,7 +73,6 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) return CDF_STATUS_NOT_INITIALIZED; } - info = hif_get_bmi_ctx(scn); info->bmi_done = false; if (!info->bmi_cmd_buff) { @@ -105,8 +104,7 @@ end: void bmi_cleanup(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); cdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!cdf_dev->dev) { @@ -151,7 +149,7 @@ bmi_get_target_info(struct bmi_target_info *targ_info, { int status = 0; struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t cid, length; @@ -238,7 +236,7 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, uint32_t cid; int status; uint32_t offset, param_len; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -283,7 +281,7 @@ CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, uint32_t cid; int status; uint32_t offset; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -329,7 +327,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) uint32_t remaining, txlen; const uint32_t header = sizeof(cid) + sizeof(length); struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; cdf_dma_addr_t rsp = info->bmi_rsp_da; @@ -375,9 +373,8 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) return CDF_STATUS_SUCCESS; } -CDF_STATUS -bmi_sign_stream_start(uint32_t address, - uint8_t *buffer, uint32_t length, struct ol_softc *scn) +CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, + uint32_t length, struct ol_bmi_context *ol_ctx) { uint32_t cid; int status; @@ -385,7 +382,8 @@ bmi_sign_stream_start(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buf[BMI_DATASZ_MAX + 4]; uint8_t *src; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct ol_softc *scn = ol_ctx->scn; + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t remaining, txlen; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -449,7 +447,7 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) int status; uint32_t offset; struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; cdf_dma_addr_t rsp = info->bmi_rsp_da; diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 111874999b1a..375e8f9faaa6 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -39,7 +39,7 @@ bmi_read_memory(uint32_t address, int status; uint32_t offset; uint32_t remaining, rxlen; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t align; @@ -117,7 +117,7 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; cdf_dma_addr_t rsp = info->bmi_rsp_da; @@ -189,7 +189,7 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) int status; uint32_t offset; uint32_t param_len; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); @@ -303,7 +303,7 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) return CDF_STATUS_NOT_INITIALIZED; } - info = hif_get_bmi_ctx(scn); + info = GET_BMI_CONTEXT(ol_ctx); if (info->bmi_done) { BMI_DBG("bmi_done_local skipped"); return CDF_STATUS_E_PERM; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 18ab4608b4ea..3782d5dca7d0 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -41,7 +41,7 @@ bmi_no_command(struct ol_context *ol_ctx) int status; uint32_t length; uint8_t ret = 0; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -85,7 +85,7 @@ bmi_done_local(struct ol_context *ol_ctx) int status; uint32_t length; uint8_t ret = 0; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_device_t cdf_dev = ol_ctx->cdf_dev; @@ -159,7 +159,7 @@ bmi_write_memory(uint32_t address, uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -233,7 +233,7 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, uint8_t ret = 0; uint32_t offset; uint32_t remaining, rxlen, rsp_len, total_len; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; /* note we reuse the same buffer to receive on */ uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -307,7 +307,7 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) int status; uint32_t length; uint8_t ret = 0; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -355,7 +355,7 @@ bmi_load_image(dma_addr_t address, uint32_t length; uint8_t ret = 0; struct ol_softc *scn = ol_ctx->scn; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -417,7 +417,7 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) struct image_desc_info image_desc_info; CDF_STATUS status; struct hif_target_info *tgt_info; - struct bmi_info *info = hif_get_bmi_ctx(scn); + struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); if (!scn) { BMI_ERR("Invalid scn context"); diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index f9271a8d970d..3cc45ac7d586 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -121,15 +121,41 @@ typedef enum _ATH_BIN_FILE { #define NO_BMI 0 #endif +/** + * struct bmi_info - Structure to hold BMI Specific information + * @bmi_cmd_buff - BMI Command Buffer + * @bmi_rsp_buff - BMI Response Buffer + * @bmi_cmd_da - BMI Command Physical address + * @bmi_rsp_da - BMI Response Physical address + * @bmi_done - Flag to check if BMI Phase is complete + * @fw_files - FW files + * + */ +struct bmi_info { + uint8_t *bmi_cmd_buff; + uint8_t *bmi_rsp_buff; + dma_addr_t bmi_cmd_da; + dma_addr_t bmi_rsp_da; + bool bmi_done; +#ifdef CONFIG_CNSS + struct cnss_fw_files fw_files; +#endif +}; + /** * struct ol_context - Structure to hold OL context + * @bmi: BMI info + * @cal_in_flash: For Firmware Flash Download * @cdf_dev: CDF Device * @scn: HIF Context * @ramdump_work: WorkQueue for Ramdump collection + * @tgt_def: Target Defnition pointer * * Structure to hold all ol BMI/Ramdump info */ struct ol_context { + struct bmi_info bmi; + uint8_t *cal_in_flash; cdf_device_t cdf_dev; struct ol_softc *scn; cdf_work_t ramdump_work; @@ -138,6 +164,8 @@ struct ol_context { } tgt_def; }; +#define GET_BMI_CONTEXT(ol_ctx) ((struct bmi_info *)ol_ctx) + CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx); CDF_STATUS bmi_init(struct ol_context *ol_ctx); diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index a18c055a4531..7e6a4d9b81a9 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -150,8 +150,8 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, #endif struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); uint32_t target_type = tgt_info->target_type; - struct bmi_info *bmi_ctx = hif_get_bmi_ctx(scn); - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx); + cdf_device_t cdf_dev = ol_ctx->cdf_dev; switch (file) { default: @@ -376,7 +376,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, status = bmi_sign_stream_start(address, (uint8_t *)fw_entry->data, - sizeof(SIGN_HEADER_T), scn); + sizeof(SIGN_HEADER_T), ol_ctx); if (status != EOK) { BMI_ERR("unable to start sign stream"); status = CDF_STATUS_E_FAILURE; @@ -419,7 +419,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (bin_len > 0) { status = bmi_sign_stream_start(0, (uint8_t *)fw_entry->data + - bin_off, bin_len, scn); + bin_off, bin_len, ol_ctx); if (status != EOK) BMI_ERR("sign stream error"); } @@ -1212,7 +1212,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); uint32_t target_type = tgt_info->target_type; uint32_t target_version = tgt_info->target_version; - struct bmi_info *bmi_ctx = hif_get_bmi_ctx(scn); + struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx); #ifdef CONFIG_CNSS if (0 != cnss_get_fw_files_for_target(&bmi_ctx->fw_files, @@ -1241,7 +1241,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) return ret; } - if (bmi_ctx->cal_in_flash) { + if (ol_ctx->cal_in_flash) { /* Write EEPROM or Flash data to Target RAM */ status = ol_transfer_bin_file(ol_ctx, ATH_FLASH_FILE, address, false); -- cgit v1.2.3 From ec702b0afb6c8b921accc9f3498501f7e50aef06 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 24 Feb 2016 18:42:16 +0530 Subject: qcacld-3.0: Create ini config structures for each modules Update ini configuration parameters for each modules in the driver Change-Id: I00b1f2a9690060a15854ad84d819e9b883e95c41 CRs-Fixed: 967765 --- core/bmi/inc/bmi.h | 21 +++++++++++++ core/bmi/src/i_bmi.h | 4 ++- core/bmi/src/ol_fw.c | 62 +++++++++++++++++++++++++------------ core/cds/src/cds_api.c | 4 +-- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_ftm.c | 2 +- core/hdd/src/wlan_hdd_main.c | 57 +++++++++++++++++++++++++++------- core/utils/epping/src/epping_main.c | 6 ---- 8 files changed, 117 insertions(+), 41 deletions(-) diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index c79aeec26b03..b016e8769596 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -41,6 +41,27 @@ struct ol_context; CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); void ol_cds_free(void); +/** + * struct hif_config_info - Place Holder for hif confiruation + * @enable_uart_print: UART Print + * @enable_self_recovery: Self Recovery + * @enable_fw_log: To Enable FW LOG + * @enable_lpass_support: LPASS support + * @enable_ramdump_collection: Ramdump Collection + * + * Structure for holding ini parameters. + */ + +struct ol_config_info { + bool enable_uart_print; + bool enable_self_recovery; + bool enable_fw_log; + bool enable_lpass_support; + bool enable_ramdump_collection; +}; + +void ol_init_ini_config(struct ol_context *ol_ctx, + struct ol_config_info *cfg); #ifdef HIF_PCI void bmi_cleanup(struct ol_context *scn); CDF_STATUS bmi_done(struct ol_context *ol_ctx); diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 3cc45ac7d586..f6bcbb463269 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -155,10 +155,11 @@ struct bmi_info { */ struct ol_context { struct bmi_info bmi; + struct ol_config_info cfg_info; uint8_t *cal_in_flash; cdf_device_t cdf_dev; - struct ol_softc *scn; cdf_work_t ramdump_work; + struct ol_softc *scn; struct targetdef_t { struct targetdef_s *targetdef; } tgt_def; @@ -187,4 +188,5 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx); CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); CDF_STATUS ol_configure_target(struct ol_context *ol_ctx); void ramdump_work_handler(void *arg); +struct ol_config_info *ol_get_ini_handle(struct ol_context *ol_ctx); #endif diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 7e6a4d9b81a9..5fc5ad3cac30 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -527,14 +527,14 @@ int ol_copy_ramdump(struct ol_softc *scn) return ret; } -void ramdump_work_handler(void *ol_context) +void ramdump_work_handler(void *data) { int ret; uint32_t host_interest_address; uint32_t dram_dump_values[4]; uint32_t target_type; struct hif_target_info *tgt_info; - struct ol_context *ol_ctx = ol_context; + struct ol_context *ol_ctx = data; struct ol_softc *ramdump_scn = ol_ctx->scn; if (!ramdump_scn) { @@ -612,7 +612,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) struct ol_context *ol_ctx = instance; struct ol_softc *scn = ol_ctx->scn; tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); - struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); int ret; ol_target_status target_status = hif_get_target_status(scn); @@ -672,7 +672,7 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) #endif struct ol_softc *scn = ol_ctx->scn; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); - struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); uint32_t target_type = tgt_info->target_type; /* Tell target which HTC version it is used */ @@ -813,7 +813,8 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) return CDF_STATUS_SUCCESS; } -static int ol_check_dataset_patch(struct ol_softc *scn, uint32_t *address) +static int +ol_check_dataset_patch(struct ol_softc *scn, uint32_t *address) { /* Check if patch file needed for this target type/version. */ return 0; @@ -1209,7 +1210,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) int status = !EOK; CDF_STATUS ret; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); - struct hif_config_info *ini_cfg = hif_get_ini_handle(scn); + struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); uint32_t target_type = tgt_info->target_type; uint32_t target_version = tgt_info->target_version; struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx); @@ -1310,8 +1311,8 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) /* Apply the patches */ if (ol_check_dataset_patch(scn, &address)) { - if ((ol_transfer_bin_file(ol_ctx, ATH_PATCH_FILE, address, false)) - != EOK) { + if ((ol_transfer_bin_file(ol_ctx, ATH_PATCH_FILE, address, + false)) != EOK) { return -1; } bmi_write_memory(hif_hia_item_address(target_type, @@ -1546,17 +1547,16 @@ void ol_dump_target_memory(struct ol_softc *scn, void *memory_block) } } -/**--------------------------------------------------------------------------- -* \brief ol_target_coredump -* -* Function to perform core dump for the target -* -* \param: scn - ol_softc handler -* memory_block - non-NULL reserved memory location -* block_len - size of the dump to collect -* -* \return: None -* --------------------------------------------------------------------------*/ +/** + * ol_target_coredump() - API to collect target ramdump + * @inst - private context + * @memory_block - non-NULL reserved memory location + * @block_len - size of the dump to collect + * + * Function to perform core dump for the target. + * + * Return: int + */ static int ol_target_coredump(void *inst, void *memory_block, uint32_t block_len) { @@ -1633,3 +1633,27 @@ static int ol_target_coredump(void *inst, void *memory_block, } return ret; } + +/** + * ol_get_ini_handle() - API to get Ol INI configuration + * @ol_ctx: OL Context + * + * Return: pointer to OL configuration + */ +struct ol_config_info *ol_get_ini_handle(struct ol_context *ol_ctx) +{ + return &ol_ctx->cfg_info; +} + +/** + * ol_init_ini_config() - API to initialize INI configuration + * @ol_ctx: OL Context + * @cfg: OL ini configuration + * + * Return: void + */ +void ol_init_ini_config(struct ol_context *ol_ctx, + struct ol_config_info *cfg) +{ + cdf_mem_copy(&ol_ctx->cfg_info, cfg, sizeof(struct ol_config_info)); +} diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index a6bd718fcee2..de193faba069 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -172,8 +172,8 @@ CDF_STATUS cds_open(void) tMacOpenParameters mac_openParms; cdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; - struct ol_softc *scn; struct ol_context *ol_ctx; + struct ol_softc *scn; void *HTCHandle; hdd_context_t *pHddCtx; @@ -255,7 +255,7 @@ CDF_STATUS cds_open(void) goto err_sched_close; } - hdd_update_hif_config(scn, pHddCtx); + hdd_update_config(pHddCtx); ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index a08d7362c6a5..30c514ac6706 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1525,5 +1525,5 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); -void hdd_update_hif_config(void *scn, hdd_context_t *hdd_ctx); +void hdd_update_config(hdd_context_t *hdd_ctx); #endif /* end #if !defined(WLAN_HDD_MAIN_H) */ diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index aee47a47fb90..4cd57dce2982 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -309,7 +309,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, goto err_htc_close; } #if defined(QCA_WIFI_FTM) - hdd_update_hif_config(pHifContext, hdd_ctx); + hdd_update_config(hdd_ctx); pHtcContext = cds_get_context(CDF_MODULE_ID_HTC); if (!pHtcContext) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index af356ed1d54b..af3d07e4eae1 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -105,6 +105,7 @@ extern int hdd_hostapd_stop(struct net_device *dev); #include "cds_concurrency.h" #include "wlan_hdd_green_ap.h" #include "platform_icnss.h" +#include "bmi.h" #ifdef MODULE #define WLAN_MODULE_NAME module_name(THIS_MODULE) @@ -6989,23 +6990,57 @@ static inline bool hdd_is_lpass_supported(hdd_context_t *hdd_ctx) #endif /** - * hdd_update_hif_config() - Initialize HIF ini parameters - * @scn: HIF Context + * hdd_update_ol_config - API to update ol configuration parameters + * @hdd_ctx: HDD context + * + * Return: void + */ +static void hdd_update_ol_config(hdd_context_t *hdd_ctx) +{ + struct ol_config_info cfg; + struct ol_context *ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + + if (!ol_ctx) + return; + + cfg.enable_self_recovery = hdd_ctx->config->enableSelfRecovery; + cfg.enable_uart_print = hdd_ctx->config->enablefwprint; + cfg.enable_fw_log = hdd_ctx->config->enable_fw_log; + cfg.enable_ramdump_collection = hdd_ctx->config->is_ramdump_enabled; + cfg.enable_lpass_support = hdd_is_lpass_supported(hdd_ctx); + + ol_init_ini_config(ol_ctx, &cfg); +} + +/** + * hdd_update_hif_config - API to update HIF configuration parameters * @hdd_ctx: HDD Context * - * API is used to initialize all HIF configuration parameters * Return: void */ -void hdd_update_hif_config(void *scn, hdd_context_t *hdd_ctx) +static void hdd_update_hif_config(hdd_context_t *hdd_ctx) { - struct hif_config_info *cfg = hif_get_ini_handle(scn); + struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_config_info cfg; + + if (!scn) + return; - cfg->enable_self_recovery = hdd_ctx->config->enableSelfRecovery; - cfg->enable_uart_print = hdd_ctx->config->enablefwprint; - cfg->enable_fw_log = hdd_ctx->config->enable_fw_log; - cfg->enable_ramdump_collection = - hdd_ctx->config->is_ramdump_enabled; - cfg->enable_lpass_support = hdd_is_lpass_supported(hdd_ctx); + cfg.enable_self_recovery = hdd_ctx->config->enableSelfRecovery; + hif_init_ini_config(scn, &cfg); +} + +/** + * hdd_update_config() - Initialize driver per module ini parameters + * @hdd_ctx: HDD Context + * + * API is used to initialize all driver per module configuration parameters + * Return: void + */ +void hdd_update_config(hdd_context_t *hdd_ctx) +{ + hdd_update_ol_config(hdd_ctx); + hdd_update_hif_config(hdd_ctx); } /* Register the module init/exit functions */ diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 244f10f641d0..68e03eaa05ce 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -181,7 +181,6 @@ int epping_enable(struct device *parent_dev) HTC_INIT_INFO htcInfo; struct ol_softc *scn; tSirMacAddr adapter_macAddr; - struct hif_config_info *cfg; struct hif_target_info *tgt_info; struct ol_context *ol_ctx; @@ -216,11 +215,6 @@ int epping_enable(struct device *parent_dev) return -1; } - cfg = hif_get_ini_handle(scn); - - cfg->enable_uart_print = 0; - cfg->enable_fw_log = 0; - tgt_info = hif_get_target_info_handle(scn); /* store target type and target version info in hdd ctx */ -- cgit v1.2.3 From 3d2028618397e109f113c6b4f80cfd34ddd53b0e Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 24 Feb 2016 18:43:24 +0530 Subject: qcacld-3.0: Make hif_opaque_softc as global HIF Context Rename ol_softc to hif_opaque_softc. Change-Id: I48f6e4b6eb04ccfa2050cca052e1ad67a66e3479 CRs-Fixed: 967765 --- core/bmi/src/bmi.c | 18 +++++++-------- core/bmi/src/bmi_1.c | 10 ++++---- core/bmi/src/bmi_2.c | 22 ++++++++---------- core/bmi/src/i_bmi.h | 2 +- core/bmi/src/ol_fw.c | 26 ++++++++++----------- core/cds/src/cds_api.c | 2 +- core/dp/txrx/ol_tx.c | 4 ++-- core/dp/txrx/ol_txrx.c | 20 ++++++++-------- core/hdd/src/wlan_hdd_main.c | 2 +- core/hdd/src/wlan_hdd_napi.c | 10 ++++---- core/utils/epping/src/epping_main.c | 2 +- core/utils/pktlog/include/pktlog_ac.h | 34 +++++++++++++-------------- core/utils/pktlog/include/pktlog_ac_api.h | 15 ++++++------ core/utils/pktlog/linux_ac.c | 38 ++++++++++++++++--------------- core/utils/pktlog/pktlog_ac.c | 17 +++++++------- core/wma/src/wma_features.c | 4 ++-- core/wma/src/wma_main.c | 4 ++-- core/wmi/wmi_unified.c | 2 +- 18 files changed, 116 insertions(+), 116 deletions(-) diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 11e380a5d6fb..782792fb2c4a 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -59,7 +59,7 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, CDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; cdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!scn) { @@ -148,7 +148,7 @@ bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_context *ol_ctx) { int status = 0; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -199,7 +199,7 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) uint8_t data[10], out[10]; uint32_t address; int32_t ret; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; if (NO_BMI) return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ @@ -232,7 +232,7 @@ end: CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset, param_len; @@ -277,7 +277,7 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -326,7 +326,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) uint32_t offset; uint32_t remaining, txlen; const uint32_t header = sizeof(cid) + sizeof(length); - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; @@ -374,7 +374,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) } CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, - uint32_t length, struct ol_bmi_context *ol_ctx) + uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; int status; @@ -382,7 +382,7 @@ CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buf[BMI_DATASZ_MAX + 4]; uint8_t *src; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t remaining, txlen; @@ -446,7 +446,7 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) uint32_t cid; int status; uint32_t offset; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; cdf_dma_addr_t cmd = info->bmi_cmd_da; diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 375e8f9faaa6..331d1db27dd9 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -34,7 +34,7 @@ CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -109,7 +109,7 @@ bmi_read_memory(uint32_t address, CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -184,7 +184,7 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, CDF_STATUS bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t offset; @@ -246,7 +246,7 @@ bmi_no_command(struct ol_context *ol_ctx) CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; CDF_STATUS status; struct bmi_target_info targ_info; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); @@ -285,7 +285,7 @@ bmi_firmware_download(struct ol_context *ol_ctx) CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; int status; uint32_t cid; struct bmi_info *info; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 3782d5dca7d0..79de973756db 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -36,7 +36,7 @@ CDF_STATUS bmi_no_command(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -80,7 +80,7 @@ bmi_no_command(struct ol_context *ol_ctx) CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -143,11 +143,8 @@ bmi_done_local(struct ol_context *ol_ctx) return CDF_STATUS_SUCCESS; } -CDF_STATUS -bmi_write_memory(uint32_t address, - uint8_t *buffer, - uint32_t length, - struct ol_context *ol_ctx) +CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, + struct ol_context *ol_ctx) { uint32_t cid; int status; @@ -158,7 +155,7 @@ bmi_write_memory(uint32_t address, const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length); uint8_t aligned_buffer[BMI_DATASZ_MAX]; uint8_t *src; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -227,7 +224,7 @@ CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint8_t ret = 0; @@ -302,7 +299,7 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t cid; int status; uint32_t length; @@ -354,7 +351,7 @@ bmi_load_image(dma_addr_t address, uint32_t offset; uint32_t length; uint8_t ret = 0; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; @@ -412,7 +409,7 @@ bmi_load_image(dma_addr_t address, static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_target_info targ_info; struct image_desc_info image_desc_info; CDF_STATUS status; @@ -466,7 +463,6 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; CDF_STATUS status; if (NO_BMI) diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index f6bcbb463269..caef15d1b98a 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -159,7 +159,7 @@ struct ol_context { uint8_t *cal_in_flash; cdf_device_t cdf_dev; cdf_work_t ramdump_work; - struct ol_softc *scn; + struct hif_opaque_softc *scn; struct targetdef_t { struct targetdef_s *targetdef; } tgt_def; diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 5fc5ad3cac30..0b04d5169dc4 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -136,7 +136,7 @@ static int __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, uint32_t address, bool compressed) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; int status = EOK; const char *filename = NULL; const struct firmware *fw_entry; @@ -503,7 +503,7 @@ static inline void ol_get_ramdump_mem(struct ramdump_info *info) static inline void ol_get_ramdump_mem(struct ramdump_info *info) { } #endif -int ol_copy_ramdump(struct ol_softc *scn) +int ol_copy_ramdump(struct hif_opaque_softc *scn) { int ret = -1; @@ -535,7 +535,7 @@ void ramdump_work_handler(void *data) uint32_t target_type; struct hif_target_info *tgt_info; struct ol_context *ol_ctx = data; - struct ol_softc *ramdump_scn = ol_ctx->scn; + struct hif_opaque_softc *ramdump_scn = ol_ctx->scn; if (!ramdump_scn) { BMI_ERR("%s:Ramdump_scn is null:", __func__); @@ -601,7 +601,7 @@ static void fw_indication_work_handler(struct work_struct *fw_indication) static DECLARE_WORK(fw_indication_work, fw_indication_work_handler); -void ol_schedule_fw_indication_work(struct ol_softc *scn) +void ol_schedule_fw_indication_work(struct hif_opaque_softc *scn) { schedule_work(&fw_indication_work); } @@ -610,7 +610,7 @@ void ol_schedule_fw_indication_work(struct ol_softc *scn) void ol_target_failure(void *instance, CDF_STATUS status) { struct ol_context *ol_ctx = instance; - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); int ret; @@ -670,7 +670,7 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) struct cnss_platform_cap cap; int ret; #endif - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); uint32_t target_type = tgt_info->target_type; @@ -814,7 +814,7 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) } static int -ol_check_dataset_patch(struct ol_softc *scn, uint32_t *address) +ol_check_dataset_patch(struct hif_opaque_softc *scn, uint32_t *address) { /* Check if patch file needed for this target type/version. */ return 0; @@ -888,7 +888,7 @@ CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) { - struct ol_softc *hif = ol_ctx->scn; + struct hif_opaque_softc *hif = ol_ctx->scn; CDF_STATUS status = CDF_STATUS_SUCCESS; uint32_t addr = 0; uint32_t reg_val = 0; @@ -1205,7 +1205,7 @@ void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) { - struct ol_softc *scn = ol_ctx->scn; + struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t param, address = 0; int status = !EOK; CDF_STATUS ret; @@ -1385,7 +1385,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) return status; } -int ol_diag_read(struct ol_softc *scn, uint8_t *buffer, +int ol_diag_read(struct hif_opaque_softc *scn, uint8_t *buffer, uint32_t pos, size_t count) { int result = 0; @@ -1457,7 +1457,7 @@ static int ol_ath_get_reg_table(uint32_t target_version, return section_len; } -static int ol_diag_read_reg_loc(struct ol_softc *scn, uint8_t *buffer, +static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer, uint32_t buffer_len) { int i, len, section_len, fill_len; @@ -1523,7 +1523,7 @@ out: return result; } -void ol_dump_target_memory(struct ol_softc *scn, void *memory_block) +void ol_dump_target_memory(struct hif_opaque_softc *scn, void *memory_block) { char *buffer_loc = memory_block; u_int32_t section_count = 0; @@ -1560,7 +1560,7 @@ void ol_dump_target_memory(struct ol_softc *scn, void *memory_block) static int ol_target_coredump(void *inst, void *memory_block, uint32_t block_len) { - struct ol_softc *scn = (struct ol_softc *)inst; + struct hif_opaque_softc *scn = (struct hif_opaque_softc *)inst; int8_t *buffer_loc = memory_block; int result = 0; int ret = 0; diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index de193faba069..d54bfca593f4 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -173,7 +173,7 @@ CDF_STATUS cds_open(void) cdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; struct ol_context *ol_ctx; - struct ol_softc *scn; + struct hif_opaque_softc *scn; void *HTCHandle; hdd_context_t *pHddCtx; diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 3346896bfc1e..f63ee4df4059 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -694,8 +694,8 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) static inline cdf_nbuf_t ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) { - struct ol_softc *hif_device = - (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *hif_device = + (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device))) msdu_list = ol_tx_ll_fast(vdev, msdu_list); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 00bb2059ee50..be7623eaa9cb 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -283,8 +283,8 @@ static void ol_txrx_local_peer_id_cleanup(struct ol_txrx_pdev_t *pdev) * * Return: void */ -static inline void -setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev) +static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc, + struct ol_txrx_pdev_t *pdev) { /* * Before the HTT attach, set up the CE handles @@ -296,8 +296,8 @@ setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev) } #else /* not WLAN_FEATURE_FASTPATH */ -static inline void -setup_fastpath_ce_handles(struct ol_softc *osc, struct ol_txrx_pdev_t *pdev) +static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc, + struct ol_txrx_pdev_t *pdev) { } #endif /* WLAN_FEATURE_FASTPATH */ @@ -500,7 +500,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) uint16_t fail_idx = 0; int ret = 0; uint16_t desc_pool_size; - struct ol_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); uint16_t desc_element_size = sizeof(union ol_tx_desc_list_elem_t); union ol_tx_desc_list_elem_t *c_element; @@ -959,7 +959,7 @@ A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle pdev) void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) { int i; - struct ol_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); /*checking to ensure txrx pdev structure is not NULL */ if (!pdev) { @@ -3415,8 +3415,8 @@ void ol_txrx_lro_flush(void *data) */ void ol_register_lro_flush_cb(void (handler)(void *), void *data) { - struct ol_softc *hif_device = - (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *hif_device = + (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); pdev->lro_info.lro_flush_cb = handler; @@ -3436,8 +3436,8 @@ void ol_register_lro_flush_cb(void (handler)(void *), void *data) */ void ol_deregister_lro_flush_cb(void) { - struct ol_softc *hif_device = - (struct ol_softc *)cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *hif_device = + (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); hif_lro_flush_cb_deregister(hif_device); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index af3d07e4eae1..8a292a3dbf19 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -7020,7 +7020,7 @@ static void hdd_update_ol_config(hdd_context_t *hdd_ctx) */ static void hdd_update_hif_config(hdd_context_t *hdd_ctx) { - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); struct hif_config_info cfg; if (!scn) diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 229e65ab341c..9ff767106bee 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -54,7 +54,7 @@ static struct qca_napi_data *hdd_napi_ctx; struct qca_napi_data *hdd_napi_get_all(void) { struct qca_napi_data *rp = NULL; - struct ol_softc *hif; + struct hif_opaque_softc *hif; NAPI_DEBUG("-->\n"); @@ -103,7 +103,7 @@ static uint32_t hdd_napi_get_map(void) */ int hdd_napi_create(void) { - struct ol_softc *hif_ctx; + struct hif_opaque_softc *hif_ctx; uint8_t ul, dl; int ul_polled, dl_polled; int rc = 0; @@ -164,7 +164,7 @@ int hdd_napi_destroy(int force) NAPI_DEBUG("--> (force=%d)\n", force); if (hdd_napi_map) { - struct ol_softc *hif_ctx; + struct hif_opaque_softc *hif_ctx; hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) @@ -207,7 +207,7 @@ int hdd_napi_destroy(int force) */ int hdd_napi_enabled(int id) { - struct ol_softc *hif; + struct hif_opaque_softc *hif; int rc = 0; /* NOT enabled */ hif = cds_get_context(CDF_MODULE_ID_HIF); @@ -239,7 +239,7 @@ int hdd_napi_enabled(int id) int hdd_napi_event(enum qca_napi_event event, void *data) { int rc = -EFAULT; /* assume err */ - struct ol_softc *hif; + struct hif_opaque_softc *hif; NAPI_DEBUG("-->(event=%d, aux=%p)\n", event, data); diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 68e03eaa05ce..1171134da2b8 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -179,7 +179,7 @@ int epping_enable(struct device *parent_dev) cds_context_type *p_cds_context = NULL; cdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; - struct ol_softc *scn; + struct hif_opaque_softc *scn; tSirMacAddr adapter_macAddr; struct hif_target_info *tgt_info; struct ol_context *ol_ctx; diff --git a/core/utils/pktlog/include/pktlog_ac.h b/core/utils/pktlog/include/pktlog_ac.h index ade410222b27..e2d895ac1a9d 100644 --- a/core/utils/pktlog/include/pktlog_ac.h +++ b/core/utils/pktlog/include/pktlog_ac.h @@ -59,24 +59,24 @@ /* Opaque softc */ struct ol_ath_generic_softc_t; typedef struct ol_ath_generic_softc_t *ol_ath_generic_softc_handle; -extern void pktlog_disable_adapter_logging(struct ol_softc *scn); -extern int pktlog_alloc_buf(struct ol_softc *scn); -extern void pktlog_release_buf(struct ol_softc *scn); +extern void pktlog_disable_adapter_logging(struct hif_opaque_softc *scn); +extern int pktlog_alloc_buf(struct hif_opaque_softc *scn); +extern void pktlog_release_buf(struct hif_opaque_softc *scn); ssize_t pktlog_read_proc_entry(char *buf, size_t nbytes, loff_t *ppos, struct ath_pktlog_info *pl_info, bool *read_complete); int pktlog_send_per_pkt_stats_to_user(void); struct ol_pl_arch_dep_funcs { - void (*pktlog_init)(struct ol_softc *scn); - int (*pktlog_enable)(struct ol_softc *scn, int32_t log_state); - int (*pktlog_setsize)(struct ol_softc *scn, int32_t log_state); - int (*pktlog_disable)(struct ol_softc *scn); + void (*pktlog_init)(struct hif_opaque_softc *scn); + int (*pktlog_enable)(struct hif_opaque_softc *scn, int32_t log_state); + int (*pktlog_setsize)(struct hif_opaque_softc *scn, int32_t log_state); + int (*pktlog_disable)(struct hif_opaque_softc *scn); }; struct ol_pl_os_dep_funcs { - int (*pktlog_attach)(struct ol_softc *scn); - void (*pktlog_detach)(struct ol_softc *scn); + int (*pktlog_attach)(struct hif_opaque_softc *scn); + void (*pktlog_detach)(struct hif_opaque_softc *scn); }; struct ath_pktlog_wmi_params { @@ -118,10 +118,10 @@ extern struct ol_pktlog_dev_t ol_pl_dev; */ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data); -void pktlog_init(struct ol_softc *scn); -int pktlog_enable(struct ol_softc *scn, int32_t log_state); -int pktlog_setsize(struct ol_softc *scn, int32_t log_state); -int pktlog_disable(struct ol_softc *scn); +void pktlog_init(struct hif_opaque_softc *scn); +int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state); +int pktlog_setsize(struct hif_opaque_softc *scn, int32_t log_state); +int pktlog_disable(struct hif_opaque_softc *scn); int pktlogmod_init(void *context); void pktlogmod_exit(void *context); @@ -142,19 +142,19 @@ void pktlogmod_exit(void *context); #else /* REMOVE_PKT_LOG */ #define ol_pktlog_attach(_scn) ({ (void)_scn; }) #define ol_pktlog_detach(_scn) ({ (void)_scn; }) -static inline void pktlog_init(struct ol_softc *scn) +static inline void pktlog_init(struct hif_opaque_softc *scn) { return; } -static int pktlog_enable(struct ol_softc *scn, int32_t log_state) +static int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) { return 0; } -static int pktlog_setsize(struct ol_softc *scn, int32_t log_state) +static int pktlog_setsize(struct hif_opaque_softc *scn, int32_t log_state) { return 0; } -static int pktlog_disable(struct ol_softc *scn) +static int pktlog_disable(struct hif_opaque_softc *scn) { return 0; } diff --git a/core/utils/pktlog/include/pktlog_ac_api.h b/core/utils/pktlog/include/pktlog_ac_api.h index 04b32f70f126..c63c4aa6d165 100644 --- a/core/utils/pktlog/include/pktlog_ac_api.h +++ b/core/utils/pktlog/include/pktlog_ac_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -42,11 +42,11 @@ struct ol_pktlog_dev_t; typedef struct ol_pktlog_dev_t *ol_pktlog_dev_handle; /** - * @typedef ol_softc_handle - * @brief opaque handle for ol_softc + * @typedef hif_opaque_softc_handle + * @brief opaque handle for hif_opaque_softc */ -struct ol_softc; -typedef struct ol_softc *ol_softc_handle; +struct hif_opaque_softc; +typedef struct hif_opaque_softc *hif_opaque_softc_handle; /** * @typedef net_device_handle @@ -55,9 +55,10 @@ typedef struct ol_softc *ol_softc_handle; struct net_device; typedef struct net_device *net_device_handle; -void ol_pl_set_name(ol_softc_handle scn, net_device_handle dev); +void ol_pl_set_name(hif_opaque_softc_handle scn, net_device_handle dev); -void ol_pl_sethandle(ol_pktlog_dev_handle *pl_handle, ol_softc_handle scn); +void ol_pl_sethandle(ol_pktlog_dev_handle *pl_handle, + hif_opaque_softc_handle scn); /* Packet log state information */ #ifndef _PKTLOG_INFO diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index cfc12bcded47..a514ea3c257c 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -74,8 +74,8 @@ static struct ath_pktlog_info *g_pktlog_info; static struct proc_dir_entry *g_pktlog_pde; -static int pktlog_attach(struct ol_softc *sc); -static void pktlog_detach(struct ol_softc *sc); +static int pktlog_attach(struct hif_opaque_softc *sc); +static void pktlog_detach(struct hif_opaque_softc *sc); static int pktlog_open(struct inode *i, struct file *f); static int pktlog_release(struct inode *i, struct file *f); static int pktlog_mmap(struct file *f, struct vm_area_struct *vma); @@ -93,7 +93,7 @@ static struct file_operations pktlog_fops = { * Linux implementation of helper functions */ -static struct ol_pktlog_dev_t *get_pl_handle(struct ol_softc *scn) +static struct ol_pktlog_dev_t *get_pl_handle(struct hif_opaque_softc *scn) { ol_txrx_pdev_handle pdev_txrx_handle; pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); @@ -102,7 +102,7 @@ static struct ol_pktlog_dev_t *get_pl_handle(struct ol_softc *scn) return pdev_txrx_handle->pl_dev; } -void ol_pl_set_name(ol_softc_handle scn, net_device_handle dev) +void ol_pl_set_name(hif_opaque_softc_handle scn, net_device_handle dev) { ol_txrx_pdev_handle pdev_txrx_handle; pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); @@ -110,14 +110,14 @@ void ol_pl_set_name(ol_softc_handle scn, net_device_handle dev) pdev_txrx_handle->pl_dev->name = dev->name; } -void pktlog_disable_adapter_logging(struct ol_softc *scn) +void pktlog_disable_adapter_logging(struct hif_opaque_softc *scn) { struct ol_pktlog_dev_t *pl_dev = get_pl_handle(scn); if (pl_dev) pl_dev->pl_info->log_state = 0; } -int pktlog_alloc_buf(struct ol_softc *scn) +int pktlog_alloc_buf(struct hif_opaque_softc *scn) { uint32_t page_cnt; unsigned long vaddr; @@ -159,7 +159,7 @@ int pktlog_alloc_buf(struct ol_softc *scn) return 0; } -void pktlog_release_buf(struct ol_softc *scn) +void pktlog_release_buf(struct hif_opaque_softc *scn) { unsigned long page_cnt; unsigned long vaddr; @@ -214,7 +214,7 @@ ath_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) return -EINVAL; } - pl_dev = get_pl_handle((struct ol_softc *)scn); + pl_dev = get_pl_handle((struct hif_opaque_softc *)scn); if (!pl_dev) { printk("%s: Invalid pktlog context\n", __func__); @@ -229,8 +229,8 @@ ath_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); if (ret == 0) - ret = pl_dev->pl_funcs->pktlog_enable((struct ol_softc - *)scn, enable); + ret = pl_dev->pl_funcs->pktlog_enable( + (struct hif_opaque_softc *)scn, enable); else printk(PKTLOG_TAG "%s:proc_dointvec failed\n", __func__); @@ -269,7 +269,7 @@ ath_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) return -EINVAL; } - pl_dev = get_pl_handle((struct ol_softc *)scn); + pl_dev = get_pl_handle((struct hif_opaque_softc *)scn); if (!pl_dev) { printk("%s: Invalid pktlog handle\n", __func__); @@ -284,8 +284,8 @@ ath_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); if (ret == 0) - ret = pl_dev->pl_funcs->pktlog_setsize((struct ol_softc - *)scn, size); + ret = pl_dev->pl_funcs->pktlog_setsize( + (struct hif_opaque_softc *)scn, size); } else { size = get_pktlog_bufsize(pl_dev); ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, @@ -299,7 +299,7 @@ ath_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) } /* Register sysctl table */ -static int pktlog_sysctl_register(struct ol_softc *scn) +static int pktlog_sysctl_register(struct hif_opaque_softc *scn) { struct ol_pktlog_dev_t *pl_dev = get_pl_handle(scn); struct ath_pktlog_info_lnx *pl_info_lnx; @@ -403,7 +403,7 @@ static int pktlog_sysctl_register(struct ol_softc *scn) * Initialize logging for system or adapter * Parameter scn should be NULL for system wide logging */ -static int pktlog_attach(struct ol_softc *scn) +static int pktlog_attach(struct hif_opaque_softc *scn) { struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info_lnx *pl_info_lnx; @@ -488,7 +488,7 @@ static void pktlog_sysctl_unregister(struct ol_pktlog_dev_t *pl_dev) } } -static void pktlog_detach(struct ol_softc *scn) +static void pktlog_detach(struct hif_opaque_softc *scn) { struct ol_pktlog_dev_t *pl_dev = (struct ol_pktlog_dev_t *) get_pl_handle(scn); @@ -1008,7 +1008,9 @@ int pktlogmod_init(void *context) } /* Attach packet log */ - if ((ret = pktlog_attach((struct ol_softc *)context))) + ret = pktlog_attach((struct hif_opaque_softc *)context); + + if (ret) goto attach_fail; return ret; @@ -1021,7 +1023,7 @@ attach_fail: void pktlogmod_exit(void *context) { - struct ol_softc *scn = (struct ol_softc *)context; + struct hif_opaque_softc *scn = (struct hif_opaque_softc *)context; struct ol_pktlog_dev_t *pl_dev; if (!scn) diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index 3025a7cd1017..1632adbfd92f 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -64,7 +64,8 @@ struct ol_pktlog_dev_t ol_pl_dev = { .pl_funcs = &ol_pl_funcs, }; -void ol_pl_sethandle(ol_pktlog_dev_handle *pl_handle, struct ol_softc *scn) +void ol_pl_sethandle(ol_pktlog_dev_handle *pl_handle, + struct hif_opaque_softc *scn) { ol_pl_dev.scn = (ol_ath_generic_softc_handle) scn; *pl_handle = &ol_pl_dev; @@ -99,8 +100,8 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, return A_OK; } -static inline A_STATUS -pktlog_enable_tgt(struct ol_softc *_scn, uint32_t log_state) +static inline A_STATUS pktlog_enable_tgt(struct hif_opaque_softc *_scn, + uint32_t log_state) { uint32_t types = 0; @@ -261,7 +262,7 @@ wdi_pktlog_unsubscribe(struct ol_txrx_pdev_t *txrx_pdev, uint32_t log_state) return A_OK; } -int pktlog_disable(struct ol_softc *scn) +int pktlog_disable(struct hif_opaque_softc *scn) { struct ol_txrx_pdev_t *txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); @@ -289,7 +290,7 @@ int pktlog_disable(struct ol_softc *scn) return 0; } -void pktlog_init(struct ol_softc *scn) +void pktlog_init(struct hif_opaque_softc *scn) { struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; @@ -325,7 +326,7 @@ void pktlog_init(struct ol_softc *scn) PKTLOG_RCUPDATE_SUBSCRIBER.callback = pktlog_callback; } -int pktlog_enable(struct ol_softc *scn, int32_t log_state) +int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) { struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; @@ -410,7 +411,7 @@ int pktlog_enable(struct ol_softc *scn, int32_t log_state) return 0; } -int pktlog_setsize(struct ol_softc *scn, int32_t size) +int pktlog_setsize(struct hif_opaque_softc *scn, int32_t size) { ol_txrx_pdev_handle pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 06f7010ebc26..72b412f93155 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3541,7 +3541,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) wmi_buf_t buf; int32_t len; int ret; - struct ol_softc *scn; + struct hif_opaque_softc *scn; int host_credits; int wmi_pending_cmds; #ifdef CONFIG_CNSS @@ -6536,7 +6536,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) wmi_pdev_suspend_cmd_fixed_param *cmd; wmi_buf_t wmibuf; uint32_t len = sizeof(*cmd); - struct ol_softc *scn; + struct hif_opaque_softc *scn; int ret; #ifdef CONFIG_CNSS tpAniSirGlobal pmac = cds_get_context(CDF_MODULE_ID_PE); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index aa07912ab1e2..f92a6c76f7c6 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -158,7 +158,7 @@ static uint8_t wma_get_number_of_peers_supported(tp_wma_handle wma) struct hif_target_info *tgt_info; struct wma_ini_config *cfg = wma_get_ini_handle(wma); uint8_t max_no_of_peers = cfg ? cfg->max_no_of_peers : MIN_NO_OF_PEERS; - struct ol_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); if (!scn) { WMA_LOGE("%s: Invalid wma handle", __func__); @@ -4605,7 +4605,7 @@ void wma_enable_specific_fw_logs(tp_wma_handle wma_handle, void wma_set_wifi_start_packet_stats(void *wma_handle, struct sir_wifi_start_log *start_log) { - struct ol_softc *scn; + struct hif_opaque_softc *scn; uint32_t log_state; if (!start_log) { diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 6ebc2ca9df9b..e57c4610fceb 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -796,7 +796,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, { HTC_PACKET *pkt; A_STATUS status; - struct ol_softc *scn; + struct hif_opaque_softc *scn; uint16_t htc_tag = 0; if (wmi_get_runtime_pm_inprogress(wmi_handle)) { -- cgit v1.2.3 From ad5a90d420c96b1a421d6a5e5f87b19a300bb384 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 16 Feb 2016 13:50:03 +0530 Subject: qcacld-3.0: Remove CDS instances in HIF Remove CDS instances in HIF for WIN/MCL convergence. a. Update con_mode param in HIF b. Have callbacks to CDS from HIF to update CDS global context Change-Id: Ie9a65b5684f38bb2bf4feac615b97415e2bc7ed9 CRs-Fixed: 967765 --- core/cds/inc/cds_api.h | 2 + core/cds/src/cds_api.c | 34 ++++++++++ core/hdd/src/wlan_hdd_driver_ops.c | 134 +++++++++++++++++++++++++++++++++---- 3 files changed, 158 insertions(+), 12 deletions(-) diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index c88218f8f766..3356003e88dd 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -209,6 +209,8 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, void *pModuleContext); +CDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); + CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index d54bfca593f4..6e3f9ffa0568 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1121,6 +1121,40 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, return CDF_STATUS_SUCCESS; } /* cds_alloc_context() */ +/** + * cds_set_context() - API to set context in global CDS Context + * @moduleID: Module ID + * @context: Pointer to the Module Context + * + * API to set a MODULE Context in gloabl CDS Context + * + * Return: CDF_STATUS + */ +CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) +{ + p_cds_contextType p_cds_context = cds_get_global_context(); + + if (!p_cds_context) { + CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + "cds context is Invald"); + return CDF_STATUS_NOT_INITIALIZED; + } + + switch (module_id) { + case CDF_MODULE_ID_HIF: + p_cds_context->pHIFContext = context; + break; + default: + CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + "%s: Module ID %i does not have its context " + "allocated by CDS", __func__, module_id); + CDF_ASSERT(0); + return CDF_STATUS_E_INVAL; + } + + return CDF_STATUS_SUCCESS; +} + /** * cds_free_context() - free an allocated context within the * CDS global Context diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index c3d85e87c403..85abb7cf97de 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -107,6 +107,107 @@ static inline void hdd_remove_pm_qos(void) } #endif +/** + * hdd_set_recovery_in_progress() - API to set recovery in progress + * @data: Context + * @val: Value to set + * + * Return: None + */ +static void hdd_set_recovery_in_progress(void *data, uint8_t val) +{ + cds_set_recovery_in_progress(val); +} + +/** + * hdd_is_driver_unloading() - API to query if driver is unloading + * @data: Private Data + * + * Return: True/False + */ +static bool hdd_is_driver_unloading(void *data) +{ + return cds_is_driver_unloading(); +} + +/** + * hdd_is_load_or_unload_in_progress() - API to query if driver is + * loading/unloading + * @data: Private Data + * + * Return: bool + */ +static bool hdd_is_load_or_unload_in_progress(void *data) +{ + return cds_is_load_or_unload_in_progress(); +} + +/** + * hdd_is_recovery_in_prgress() - API to query if recovery in progress + * @data: Private Data + * + * Return: bool + */ +static bool hdd_is_recovery_in_prgress(void *data) +{ + return cds_is_driver_recovering(); +} + +/** + * hdd_hif_init_cds_callbacks() - API to initialize HIF callbacks + * @data: Private Data + * @cbk: callbacks + * + * HIF should be independent of CDS calls. Pass CDS Callbacks to HIF, HIF will + * call the callbacks. + * + * Return: void + */ +static void hdd_hif_init_cds_callbacks(void *data, struct hif_callbacks *cbk) +{ + cbk->context = data; + cbk->set_recovery_in_progress = hdd_set_recovery_in_progress; + cbk->get_monotonic_boottime = cds_get_monotonic_boottime; + cbk->is_recovery_in_progress = hdd_is_recovery_in_prgress; + cbk->is_load_unload_in_progress = hdd_is_load_or_unload_in_progress; + cbk->is_driver_unloading = hdd_is_driver_unloading; +} + +/** + * hdd_init_cds_hif_context() - API to set CDS HIF Context + * @hif: HIF Context + * + * Return: success/failure + */ +static int hdd_init_cds_hif_context(void *hif) +{ + CDF_STATUS status; + + status = cds_set_context(CDF_MODULE_ID_HIF, hif); + + if (status) + return -ENOENT; + + return 0; +} + +/** + * hdd_deinit_cds_hif_context() - API to clear CDS HIF COntext + * + * Return: None + */ +static void hdd_deinit_cds_hif_context(void) +{ + CDF_STATUS status; + + status = cds_set_context(CDF_MODULE_ID_HIF, NULL); + + if (status) + hdd_err("Failed to reset CDS HIF Context"); + + return; +} + /** * hdd_hif_open() - HIF open helper * @dev: wlan device structure @@ -124,23 +225,31 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, { CDF_STATUS status; int ret = 0; - void *hif_ctx; + struct hif_opaque_softc *hif_ctx; cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + struct hif_callbacks cbk; + uint32_t mode = cds_get_conparam(); - status = hif_open(cdf_ctx, bus_type); - if (!CDF_IS_STATUS_SUCCESS(status)) { - hdd_err("hif_open error = %d", status); - return cdf_status_to_os_return(status); + hdd_hif_init_cds_callbacks(dev, &cbk); + + hif_ctx = hif_open(cdf_ctx, mode, bus_type, &cbk); + if (!hif_ctx) { + hdd_err("hif_open error"); + return -ENOMEM; } - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + ret = hdd_init_cds_hif_context(hif_ctx); + if (ret) { + hdd_err("Failed to set global HIF CDS Context err:%d", ret); + goto err_hif_close; + } ret = hdd_napi_create(); if (hdd_napi_enabled(HDD_NAPI_ANY)) { - hdd_info("hdd_napi_create returned: %d", status); + hdd_info("hdd_napi_create returned: %d", ret); if (ret <= 0) { hdd_err("NAPI creation error, rc: 0x%x, reinit = %d", - status, reinit); + ret, reinit); ret = -EFAULT; goto err_hif_close; } @@ -162,10 +271,9 @@ err_napi_destroy: hdd_napi_destroy(true); err_hif_close: + hdd_deinit_cds_hif_context(); hif_close(hif_ctx); - return ret; - } /** @@ -183,6 +291,7 @@ static void hdd_hif_close(void *hif_ctx) hdd_napi_destroy(true); + hdd_deinit_cds_hif_context(); hif_close(hif_ctx); } @@ -221,6 +330,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, CDF_STATUS status; int ret = 0; cdf_device_t cdf_dev; + uint32_t mode = cds_get_conparam(); pr_info("%s: %sprobing driver v%s\n", WLAN_MODULE_NAME, reinit ? "re-" : "", QWLAN_VERSIONSTR); @@ -245,7 +355,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, cds_set_load_in_progress(true); } - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { + if (WLAN_IS_EPPING_ENABLED(mode)) { status = epping_open(); if (status != CDF_STATUS_SUCCESS) goto err_hdd_deinit; @@ -295,7 +405,7 @@ err_bmi_close: err_hif_close: hdd_hif_close(hif_ctx); err_epping_close: - if (WLAN_IS_EPPING_ENABLED(cds_get_conparam())) + if (WLAN_IS_EPPING_ENABLED(mode)) epping_close(); err_hdd_deinit: cds_set_load_in_progress(false); -- cgit v1.2.3 From 83d373d6812a5e61681931471a7d055e74ddc6a7 Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Tue, 28 Jul 2015 16:45:59 -0700 Subject: qcacld-3.0: TSO (TCP Segmentation Offload) Clean-up propagation from qcacld-3.0 to qcacld-3.1 Changes for TSO clean-up to address: - conditional compile within function bodies - change function return value - convert macro to static inline function, etc - Enable TSO for SAP mode Change-Id: I29e764f64f7866d4c016ac31cd701c54526cc75d CRs-Fixed: 881090 --- config/WCNSS_qcom_cfg.ini | 5 +++ core/cdf/inc/cdf_nbuf.h | 8 ++-- core/cdf/src/cdf_nbuf.c | 23 +++------- core/cdf/src/i_cdf_nbuf.h | 10 +++-- core/dp/htt/htt_tx.c | 2 - core/dp/htt/htt_types.h | 11 +---- core/dp/ol/inc/ol_htt_tx_api.h | 4 +- core/dp/txrx/ol_tx.c | 99 ++++++++++++++++++++++++++++------------- core/dp/txrx/ol_tx.h | 3 +- core/dp/txrx/ol_tx_desc.c | 11 ++--- core/dp/txrx/ol_tx_desc.h | 5 ++- core/dp/txrx/ol_txrx.c | 13 +++--- core/hdd/inc/wlan_hdd_main.h | 26 +++++++++++ core/hdd/src/wlan_hdd_hostapd.c | 1 + core/hdd/src/wlan_hdd_main.c | 10 +---- 15 files changed, 141 insertions(+), 90 deletions(-) diff --git a/config/WCNSS_qcom_cfg.ini b/config/WCNSS_qcom_cfg.ini index 0890d6a99e50..a4184f591736 100644 --- a/config/WCNSS_qcom_cfg.ini +++ b/config/WCNSS_qcom_cfg.ini @@ -588,6 +588,11 @@ gEnableMacAddrSpoof=0 # 1 - enable gEnableFastPath=1 +# Enable TCP Segmentation Offload +# 0 - disable +# 1 - enable +TSOEnable=1 + END # Note: Configuration parser would not read anything past the END marker diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index ba16cddf6751..61d535dc9688 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -940,9 +940,9 @@ static inline int cdf_nbuf_dec_num_frags(cdf_nbuf_t buf) * cdf_nbuf_is_tso() - is the network buffer a jumbo packet? * @buf: Network buffer * - * Return: 1 - this is a jumbo packet 0 - not a jumbo packet + * Return: true - jumbo packet false - not a jumbo packet */ -static inline uint8_t cdf_nbuf_is_tso(cdf_nbuf_t nbuf) +static inline bool cdf_nbuf_is_tso(cdf_nbuf_t nbuf) { return __cdf_nbuf_is_tso(nbuf); } @@ -992,9 +992,9 @@ static inline uint32_t cdf_nbuf_get_tso_num_seg(cdf_nbuf_t nbuf) * * Return: the network buffer */ -static inline cdf_nbuf_t cdf_nbuf_inc_users(cdf_nbuf_t nbuf) +static inline void cdf_nbuf_inc_users(cdf_nbuf_t nbuf) { - return __cdf_nbuf_inc_users(nbuf); + __cdf_nbuf_inc_users(nbuf); } #endif /*TSO*/ diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 382ff2b1ef14..005d6e714f65 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,6 +35,11 @@ #include #include #include +#if defined(FEATURE_TSO) +#include +#include +#include +#endif /* FEATURE_TSO */ #include #include #include @@ -42,14 +47,6 @@ #include #include -#if defined(FEATURE_TSO) -#include -#include -#include -#include -#include -#endif /* FEATURE_TSO */ - /* Packet Counter */ static uint32_t nbuf_tx_mgmt[NBUF_TX_PKT_STATE_MAX]; static uint32_t nbuf_tx_data[NBUF_TX_PKT_STATE_MAX]; @@ -837,7 +834,7 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, curr_seg = tso_info->tso_seg_list; /* length of the first chunk of data in the skb */ - skb_proc = skb_frag_len = skb->len - skb->data_len; + skb_proc = skb_frag_len = skb_headlen(skb); /* the 0th tso segment's 0th fragment always contains the EIT header */ /* update the remaining skb fragment length and TSO segment length */ @@ -1008,10 +1005,4 @@ uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb) return num_segs; } -struct sk_buff *__cdf_nbuf_inc_users(struct sk_buff *skb) -{ - atomic_inc(&skb->users); - return skb; -} - #endif /* FEATURE_TSO */ diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index c174435aa3b0..a78fb1e57294 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1008,12 +1008,16 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb); -static inline uint8_t __cdf_nbuf_is_tso(struct sk_buff *skb) +static inline bool __cdf_nbuf_is_tso(struct sk_buff *skb) { return skb_is_gso(skb); } -struct sk_buff *__cdf_nbuf_inc_users(struct sk_buff *skb); +static inline void __cdf_nbuf_inc_users(struct sk_buff *skb) +{ + atomic_inc(&skb->users); + return; +} #endif /* TSO */ /** diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 1aa28f9ce202..83551b70ae27 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -1159,8 +1159,6 @@ htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc, if (tso_seg->seg.num_frags < FRAG_NUM_MAX) { *word = 0; - word++; - *word = 0; } } #endif /* FEATURE_TSO */ diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index b30f722e7d2d..26fecb363e4e 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -175,16 +175,7 @@ struct ipa_uc_rx_ring_elem_t { #if defined(HELIUMPLUS_PADDR64) struct msdu_ext_desc_t { -#if defined(FEATURE_TSO) struct cdf_tso_flags_t tso_flags; -#else - u_int32_t tso_flag0; - u_int32_t tso_flag1; - u_int32_t tso_flag2; - u_int32_t tso_flag3; - u_int32_t tso_flag4; - u_int32_t tso_flag5; -#endif u_int32_t frag_ptr0; u_int32_t frag_len0; u_int32_t frag_ptr1; diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index baacfdb5848f..cd9ac7d931f5 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -608,11 +608,9 @@ htt_tx_desc_init(htt_pdev_handle pdev, local_word1 = 0; -#if defined(FEATURE_TSO) if (tso_info->is_tso) HTT_TX_DESC_FRM_LEN_SET(local_word1, tso_info->total_len); else -#endif HTT_TX_DESC_FRM_LEN_SET(local_word1, cdf_nbuf_len(msdu)); HTT_TX_DESC_FRM_ID_SET(local_word1, msdu_id); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index f63ee4df4059..0cff3cfc35e7 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -80,36 +80,59 @@ int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, } \ } while (0) -#define ol_tx_prepare_tso(vdev, msdu, msdu_info) \ - do { \ - msdu_info.tso_info.curr_seg = NULL; \ - if (cdf_nbuf_is_tso(msdu)) { \ - int num_seg = cdf_nbuf_get_tso_num_seg(msdu); \ - msdu_info.tso_info.tso_seg_list = NULL; \ - msdu_info.tso_info.num_segs = num_seg; \ - while (num_seg) { \ - struct cdf_tso_seg_elem_t *tso_seg = \ - ol_tso_alloc_segment(vdev->pdev); \ - if (tso_seg) { \ - tso_seg->next = \ - msdu_info.tso_info.tso_seg_list; \ - msdu_info.tso_info.tso_seg_list \ - = tso_seg; \ - num_seg--; \ - } else {\ - cdf_print("TSO seg alloc failed!\n"); \ - } \ - } \ - cdf_nbuf_get_tso_info(vdev->pdev->osdev, \ - msdu, &msdu_info.tso_info); \ - msdu_info.tso_info.curr_seg = \ - msdu_info.tso_info.tso_seg_list; \ - num_seg = msdu_info.tso_info.num_segs; \ - } else { \ - msdu_info.tso_info.is_tso = 0; \ - msdu_info.tso_info.num_segs = 1; \ - } \ - } while (0) +#if defined(FEATURE_TSO) +/** + * ol_tx_prepare_tso() - Given a jumbo msdu, prepare the TSO + * related information in the msdu_info meta data + * @vdev: virtual device handle + * @msdu: network buffer + * @msdu_info: meta data associated with the msdu + * + * Return: 0 - success, >0 - error + */ +static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, + cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) +{ + msdu_info->tso_info.curr_seg = NULL; + if (cdf_nbuf_is_tso(msdu)) { + int num_seg = cdf_nbuf_get_tso_num_seg(msdu); + msdu_info->tso_info.tso_seg_list = NULL; + msdu_info->tso_info.num_segs = num_seg; + while (num_seg) { + struct cdf_tso_seg_elem_t *tso_seg = + ol_tso_alloc_segment(vdev->pdev); + if (tso_seg) { + tso_seg->next = + msdu_info->tso_info.tso_seg_list; + msdu_info->tso_info.tso_seg_list + = tso_seg; + num_seg--; + } else { + struct cdf_tso_seg_elem_t *next_seg; + struct cdf_tso_seg_elem_t *free_seg = + msdu_info->tso_info.tso_seg_list; + cdf_print("TSO seg alloc failed!\n"); + while (free_seg) { + next_seg = free_seg->next; + ol_tso_free_segment(vdev->pdev, + free_seg); + free_seg = next_seg; + } + return 1; + } + } + cdf_nbuf_get_tso_info(vdev->pdev->osdev, + msdu, &(msdu_info->tso_info)); + msdu_info->tso_info.curr_seg = + msdu_info->tso_info.tso_seg_list; + num_seg = msdu_info->tso_info.num_segs; + } else { + msdu_info->tso_info.is_tso = 0; + msdu_info->tso_info.num_segs = 1; + } + return 0; +} +#endif /** * ol_tx_send_data_frame() - send data frame @@ -246,7 +269,13 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; - ol_tx_prepare_tso(vdev, msdu, msdu_info); + if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { + cdf_print("ol_tx_prepare_tso failed\n"); + TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, + tx.dropped.host_reject, msdu); + return msdu; + } + segments = msdu_info.tso_info.num_segs; /* @@ -508,7 +537,13 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; - ol_tx_prepare_tso(vdev, msdu, msdu_info); + if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { + cdf_print("ol_tx_prepare_tso failed\n"); + TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, + tx.dropped.host_reject, msdu); + return msdu; + } + segments = msdu_info.tso_info.num_segs; /* diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index 77ae56d1ae6b..e60d8831fc81 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -89,4 +89,5 @@ static inline void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) return; } #endif + #endif /* _OL_TX__H_ */ diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 591b66026bfc..9ea20bb5a579 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -230,15 +230,16 @@ ol_tx_desc_alloc_wrapper(struct ol_txrx_pdev_t *pdev, void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) { cdf_spin_lock_bh(&pdev->tx_mutex); -#if defined(FEATURE_TSO) + if (tx_desc->pkt_type == ol_tx_frm_tso) { - if (cdf_unlikely(tx_desc->tso_desc == NULL)) + if (cdf_unlikely(tx_desc->tso_desc == NULL)) { cdf_print("%s %d TSO desc is NULL!\n", __func__, __LINE__); - else + cdf_assert(0); + } else { ol_tso_free_segment(pdev, tx_desc->tso_desc); + } } -#endif ol_tx_desc_reset_pkt_type(tx_desc); ol_tx_desc_reset_timestamp(tx_desc); diff --git a/core/dp/txrx/ol_tx_desc.h b/core/dp/txrx/ol_tx_desc.h index c96c47a05241..fa154f8f3bd9 100644 --- a/core/dp/txrx/ol_tx_desc.h +++ b/core/dp/txrx/ol_tx_desc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -163,6 +163,9 @@ struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev); void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev, struct cdf_tso_seg_elem_t *tso_seg); +#else +#define ol_tso_alloc_segment(pdev) /*no-op*/ +#define ol_tso_free_segment(pdev, tso_seg) /*no-op*/ #endif /** diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index be7623eaa9cb..e42168458467 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -916,7 +916,9 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) /* Thermal Mitigation */ ol_tx_throttle_init(pdev); + ol_tso_seg_list_init(pdev, desc_pool_size); + ol_tx_register_flow_control(pdev); htt_pkt_log_init(pdev, osc); @@ -2405,6 +2407,12 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) } } } +#else +void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) +{ + CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + "TSO is not supported\n"); +} #endif /** @@ -2927,12 +2935,7 @@ void ol_txrx_display_stats(uint16_t value) ol_txrx_stats_display(pdev); break; case WLAN_TXRX_TSO_STATS: -#if defined(FEATURE_TSO) && defined(FEATURE_TSO_DEBUG) ol_txrx_stats_display_tso(pdev); -#else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, - "%s: TSO not supported", __func__); -#endif break; case WLAN_DUMP_TX_FLOW_POOL_INFO: ol_tx_dump_flow_pool_info(); diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 30c514ac6706..6eca6692ecf3 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1526,4 +1526,30 @@ phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); void hdd_update_config(hdd_context_t *hdd_ctx); + +#ifdef FEATURE_TSO +/** + * hdd_set_tso_flags() - enable TSO flags in the network device + * @hdd_ctx: HDD context + * @wlan_dev: network device structure + * + * This function enables the TSO related feature flags in the + * given network device. + * + * Return: none + */ +static inline void hdd_set_tso_flags(hdd_context_t *hdd_ctx, + struct net_device *wlan_dev) +{ + if (hdd_ctx->config->tso_enable) { + hdd_info("TSO Enabled"); + wlan_dev->features |= + NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | + NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; + } +} +#else +static inline void hdd_set_tso_flags(hdd_context_t *hdd_ctx, + struct net_device *wlan_dev){} +#endif /* FEATURE_TSO */ #endif /* end #if !defined(WLAN_HDD_MAIN_H) */ diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 97a3142d0fc8..0a568e51c3a5 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -6167,6 +6167,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, pWlanHostapdDev->ieee80211_ptr = &pHostapdAdapter->wdev; pHostapdAdapter->wdev.wiphy = pHddCtx->wiphy; pHostapdAdapter->wdev.netdev = pWlanHostapdDev; + hdd_set_tso_flags(pHddCtx, pWlanHostapdDev); init_completion(&pHostapdAdapter->tx_action_cnf_event); init_completion(&pHostapdAdapter->cancel_rem_on_chan_var); init_completion(&pHostapdAdapter->rem_on_chan_ready_event); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 8a292a3dbf19..854ea7e6971d 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1913,14 +1913,8 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; pWlanDev->features |= NETIF_F_RXCSUM; -#if defined(FEATURE_TSO) - if (hdd_ctx->config->tso_enable) { - hddLog(CDF_TRACE_LEVEL_INFO, FL("TSO Enabled\n")); - pWlanDev->features |= - NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | - NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; - } -#endif + hdd_set_tso_flags(hdd_ctx, pWlanDev); + hdd_set_station_ops(adapter->dev); pWlanDev->destructor = free_netdev; -- cgit v1.2.3 From 43d47fa65920a8a91ca17b315701a324d9bcef61 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Wed, 24 Feb 2016 16:34:30 -0800 Subject: qcacld-3.0: change skb->cb to support 64 bit paddrs(1/2) Praprogation from qcacld-3.0 to qcacld-3.1. Change skb->sb such that it is overlayed between tx and rx and each one of then still fits 48 bytes. Note that this will break IPA and it will be fixed subsequently by another change. Change-Id: I96168aee99dbdbecbdbd4259597e179b02d29f5d CRs-Fixed: 881090 Acked-by: Orhan K AKYILDIZ --- core/cdf/inc/cdf_nbuf.h | 93 +++- core/cdf/inc/cdf_types.h | 2 +- core/cdf/src/cdf_memory.c | 2 + core/cdf/src/cdf_nbuf.c | 84 ++-- core/cdf/src/cdf_trace.c | 14 +- core/cdf/src/i_cdf_nbuf.h | 870 +++++++++++++++++------------------ core/dp/htt/htt_internal.h | 22 +- core/dp/htt/htt_rx.c | 30 +- core/dp/htt/htt_t2h.c | 10 +- core/dp/htt/htt_tx.c | 68 ++- core/dp/htt/htt_types.h | 23 + core/dp/ol/inc/ol_htt_tx_api.h | 87 ++-- core/dp/txrx/ol_tx.c | 35 +- core/dp/txrx/ol_tx_desc.c | 33 +- core/dp/txrx/ol_txrx.c | 18 +- core/dp/txrx/ol_txrx_types.h | 8 +- core/hdd/inc/wlan_hdd_ipa.h | 15 +- core/hdd/src/wlan_hdd_ipa.c | 48 +- core/hdd/src/wlan_hdd_lro.c | 20 +- core/hdd/src/wlan_hdd_napi.c | 20 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 4 +- core/hdd/src/wlan_hdd_tx_rx.c | 4 +- core/wma/src/wma_data.c | 2 +- core/wma/src/wma_mgmt.c | 2 +- 24 files changed, 839 insertions(+), 675 deletions(-) diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 61d535dc9688..4a5234783df0 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -163,6 +163,7 @@ static inline int cdf_nbuf_get_num_frags(cdf_nbuf_t buf) */ static inline int cdf_nbuf_get_frag_len(cdf_nbuf_t buf, int frag_num) { + BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); return __cdf_nbuf_get_frag_len(buf, frag_num); } @@ -176,19 +177,21 @@ static inline int cdf_nbuf_get_frag_len(cdf_nbuf_t buf, int frag_num) static inline unsigned char *cdf_nbuf_get_frag_vaddr(cdf_nbuf_t buf, int frag_num) { + BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); return __cdf_nbuf_get_frag_vaddr(buf, frag_num); } /** - * cdf_nbuf_get_frag_paddr_lo() - get fragment physical address low order bytes + * cdf_nbuf_get_frag_paddr() - get fragment physical address * @buf: Network buffer * @frag_num: Fragment number * - * Return: Fragment physical address lo + * Return: Fragment physical address */ -static inline uint32_t cdf_nbuf_get_frag_paddr_lo(cdf_nbuf_t buf, int frag_num) +static inline cdf_dma_addr_t cdf_nbuf_get_frag_paddr(cdf_nbuf_t buf, int frag_num) { - return __cdf_nbuf_get_frag_paddr_lo(buf, frag_num); + BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); + return __cdf_nbuf_get_frag_paddr(buf, frag_num); } /** @@ -200,6 +203,7 @@ static inline uint32_t cdf_nbuf_get_frag_paddr_lo(cdf_nbuf_t buf, int frag_num) */ static inline int cdf_nbuf_get_frag_is_wordstream(cdf_nbuf_t buf, int frag_num) { + BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); return __cdf_nbuf_get_frag_is_wordstream(buf, frag_num); } @@ -214,9 +218,79 @@ static inline int cdf_nbuf_get_frag_is_wordstream(cdf_nbuf_t buf, int frag_num) static inline void cdf_nbuf_set_frag_is_wordstream(cdf_nbuf_t buf, int frag_num, int is_wordstream) { + BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); __cdf_nbuf_set_frag_is_wordstream(buf, frag_num, is_wordstream); } +/** + * cdf_nbuf_ipa_owned_get - gets the ipa_owned flag + * @buf: Network buffer + * + * Return: none + */ +static inline int cdf_nbuf_ipa_owned_get(cdf_nbuf_t buf) +{ + return __cdf_nbuf_ipa_owned_get(buf); +} + +/** + * cdf_nbuf_ipa_owned_set - sets the ipa_owned flag + * @buf: Network buffer + * + * Return: none + */ +static inline void cdf_nbuf_ipa_owned_set(cdf_nbuf_t buf) +{ + __cdf_nbuf_ipa_owned_set(buf); +} + +/** + * cdf_nbuf_ipa_priv_get - gets the ipa_priv field + * @buf: Network buffer + * + * Return: none + */ +static inline int cdf_nbuf_ipa_priv_get(cdf_nbuf_t buf) +{ + return __cdf_nbuf_ipa_priv_get(buf); +} + +/** + * cdf_nbuf_ipa_priv_set - sets the ipa_priv field + * @buf: Network buffer + * + * Return: none + */ +static inline void cdf_nbuf_ipa_priv_set(cdf_nbuf_t buf, uint32_t priv) +{ + BUG_ON(priv & 0x80000000); /* priv is 31 bits only */ + __cdf_nbuf_ipa_priv_set(buf, priv); +} + +/** + * cdf_nbuf_mapped_paddr_get - gets the paddr of nbuf->data + * @buf: Network buffer + * + * Return: none + */ +static inline cdf_dma_addr_t +cdf_nbuf_mapped_paddr_get(cdf_nbuf_t buf) +{ + return __cdf_nbuf_mapped_paddr_get(buf); +} + +/** + * cdf_nbuf_mapped_paddr_set - sets the paddr of nbuf->data + * @buf: Network buffer + * + * Return: none + */ +static inline void +cdf_nbuf_mapped_paddr_set(cdf_nbuf_t buf, cdf_dma_addr_t paddr) +{ + __cdf_nbuf_mapped_paddr_set(buf, paddr); +} + /** * cdf_nbuf_frag_push_head() - push fragment head * @buf: Network buffer @@ -231,10 +305,9 @@ static inline void cdf_nbuf_frag_push_head(cdf_nbuf_t buf, int frag_len, char *frag_vaddr, - uint32_t frag_paddr_lo, uint32_t frag_paddr_hi) + cdf_dma_addr_t frag_paddr) { - __cdf_nbuf_frag_push_head(buf, frag_len, frag_vaddr, frag_paddr_lo, - frag_paddr_hi); + __cdf_nbuf_frag_push_head(buf, frag_len, frag_vaddr, frag_paddr); } #ifdef MEMORY_DEBUG @@ -926,14 +999,14 @@ static inline void cdf_invalidate_range(void *start, void *end) #if defined(FEATURE_TSO) /** - * cdf_nbuf_dec_num_frags() - decrement the number of fragments + * cdf_nbuf_reset_num_frags() - resets the number of frags to 0 (valid range: 0..1) * @buf: Network buffer * * Return: Number of fragments */ -static inline int cdf_nbuf_dec_num_frags(cdf_nbuf_t buf) +static inline int cdf_nbuf_reset_num_frags(cdf_nbuf_t buf) { - return __cdf_nbuf_dec_num_frags(buf); + return __cdf_nbuf_reset_num_frags(buf); } /** diff --git a/core/cdf/inc/cdf_types.h b/core/cdf/inc/cdf_types.h index cdc16edb8125..635a59dd9e6a 100644 --- a/core/cdf/inc/cdf_types.h +++ b/core/cdf/inc/cdf_types.h @@ -126,7 +126,7 @@ typedef __cdf_size_t cdf_size_t; typedef __cdf_dma_map_t cdf_dma_map_t; /** - * tyepdef cdf_dma_addr_t - DMA address. + * typedef cdf_dma_addr_t - DMA address. */ typedef __cdf_dma_addr_t cdf_dma_addr_t; diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 874f5fb7a8fe..38712c4f1ae4 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -483,6 +483,8 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, void **cacheable_pages = NULL; uint16_t i; + CDF_BUG(PAGE_SIZE >= element_size); + pages->num_element_per_page = PAGE_SIZE / element_size; if (!pages->num_element_per_page) { cdf_print("Invalid page %d or element size %d", diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 005d6e714f65..b663fa0323e7 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -136,18 +136,19 @@ void cdf_nbuf_set_state(cdf_nbuf_t nbuf, uint8_t current_state) * such as scan commands are not tracked */ uint8_t packet_type; - packet_type = NBUF_GET_PACKET_TRACK(nbuf); + packet_type = NBUF_CB_TX_PACKET_TRACK(nbuf); if ((packet_type != NBUF_TX_PKT_DATA_TRACK) && (packet_type != NBUF_TX_PKT_MGMT_TRACK)) { return; } - NBUF_SET_PACKET_STATE(nbuf, current_state); + NBUF_CB_TX_PACKET_STATE(nbuf) = current_state; cdf_nbuf_tx_desc_count_update(packet_type, current_state); } -cdf_nbuf_trace_update_t trace_update_cb = NULL; +/* globals do not need to be initialized to NULL/0 */ +cdf_nbuf_trace_update_t trace_update_cb; /** * __cdf_nbuf_alloc() - Allocate nbuf @@ -183,11 +184,9 @@ struct sk_buff *__cdf_nbuf_alloc(cdf_device_t osdev, size_t size, int reserve, /* * The default is for netbuf fragments to be interpreted * as wordstreams rather than bytestreams. - * Set the CVG_NBUF_MAX_EXTRA_FRAGS+1 wordstream_flags bits, - * to provide this default. */ - NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) = - (1 << (CVG_NBUF_MAX_EXTRA_FRAGS + 1)) - 1; + NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) = 1; + NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) = 1; /* * XXX:how about we reserve first then align @@ -217,8 +216,9 @@ struct sk_buff *__cdf_nbuf_alloc(cdf_device_t osdev, size_t size, int reserve, */ void __cdf_nbuf_free(struct sk_buff *skb) { - if ((NBUF_OWNER_ID(skb) == IPA_NBUF_OWNER_ID) && NBUF_CALLBACK_FN(skb)) - NBUF_CALLBACK_FN_EXEC(skb); + if (cdf_nbuf_ipa_owned_get(skb)) + /* IPA cleanup function will need to be called here */ + CDF_BUG(1); else dev_kfree_skb_any(skb); } @@ -289,19 +289,20 @@ __cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) CDF_STATUS __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { - uint32_t paddr_lo; + cdf_dma_addr_t paddr; /* tempory hack for simulation */ #ifdef A_SIMOS_DEVHOST - NBUF_MAPPED_PADDR_LO(buf) = paddr_lo = (uint32_t) buf->data; + NBUF_CB_PADDR(buf) = paddr = buf->data; return CDF_STATUS_SUCCESS; #else /* assume that the OS only provides a single fragment */ - NBUF_MAPPED_PADDR_LO(buf) = paddr_lo = - dma_map_single(osdev->dev, buf->data, - skb_end_pointer(buf) - buf->data, dir); - return dma_mapping_error(osdev->dev, paddr_lo) ? - CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + NBUF_CB_PADDR(buf) = paddr = + dma_map_single(osdev->dev, buf->data, + skb_end_pointer(buf) - buf->data, dir); + return dma_mapping_error(osdev->dev, paddr) + ? CDF_STATUS_E_FAILURE + : CDF_STATUS_SUCCESS; #endif /* #ifdef A_SIMOS_DEVHOST */ } @@ -317,7 +318,7 @@ void __cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { #if !defined(A_SIMOS_DEVHOST) - dma_unmap_single(osdev->dev, NBUF_MAPPED_PADDR_LO(buf), + dma_unmap_single(osdev->dev, NBUF_CB_PADDR(buf), skb_end_pointer(buf) - buf->data, dir); #endif /* #if !defined(A_SIMOS_DEVHOST) */ } @@ -794,6 +795,24 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, return 0; } +/** + * cdf_dmaaddr_to_32s - return high and low parts of dma_addr + * + * Returns the high and low 32-bits of the DMA addr in the provided ptrs + * + * Return: N/A +*/ +static inline void cdf_dmaaddr_to_32s(cdf_dma_addr_t dmaaddr, + uint32_t *lo, uint32_t *hi) +{ + if (sizeof(dmaaddr) > sizeof(uint32_t)) { + *lo = (uint32_t) (dmaaddr & 0x0ffffffff); + *hi = (uint32_t) (dmaaddr >> 32); + } else { + *lo = dmaaddr; + *hi = 0; + } +} /** * __cdf_nbuf_get_tso_info() - function to divide a TSO nbuf * into segments @@ -815,7 +834,8 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, /* segment specific */ char *tso_frag_vaddr; - uint32_t tso_frag_paddr_32 = 0; + cdf_dma_addr_t tso_frag_paddr = 0; + uint32_t tso_frag_paddr_lo, tso_frag_paddr_hi; uint32_t num_seg = 0; struct cdf_tso_seg_elem_t *curr_seg; const struct skb_frag_struct *frag = NULL; @@ -845,8 +865,9 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, tso_frag_vaddr = skb->data + tso_cmn_info.eit_hdr_len; /* get the length of the next tso fragment */ tso_frag_len = min(skb_frag_len, tso_seg_size); - tso_frag_paddr_32 = dma_map_single(osdev->dev, + tso_frag_paddr = dma_map_single(osdev->dev, tso_frag_vaddr, tso_frag_len, DMA_TO_DEVICE); + cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); num_seg = tso_info->num_segs; tso_info->num_segs = 0; @@ -895,9 +916,16 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, curr_seg->seg.tso_frags[0].vaddr = tso_cmn_info.eit_hdr; curr_seg->seg.tso_frags[0].length = tso_cmn_info.eit_hdr_len; tso_info->total_len = curr_seg->seg.tso_frags[0].length; - curr_seg->seg.tso_frags[0].paddr_low_32 = - dma_map_single(osdev->dev, tso_cmn_info.eit_hdr, + { + cdf_dma_addr_t mapped; + uint32_t lo, hi; + + mapped = dma_map_single(osdev->dev, tso_cmn_info.eit_hdr, tso_cmn_info.eit_hdr_len, DMA_TO_DEVICE); + cdf_dmaaddr_to_32s(mapped, &lo, &hi); + curr_seg->seg.tso_frags[0].paddr_low_32 = lo; + curr_seg->seg.tso_frags[0].paddr_upper_16 = (hi & 0xffff); + } curr_seg->seg.tso_flags.ip_len = tso_cmn_info.ip_tcp_hdr_len; curr_seg->seg.num_frags++; @@ -913,9 +941,10 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, /* increment the TCP sequence number */ tso_cmn_info.tcp_seq_num += tso_frag_len; - curr_seg->seg.tso_frags[i].paddr_upper_16 = 0; + curr_seg->seg.tso_frags[i].paddr_upper_16 = + (tso_frag_paddr_hi & 0xffff); curr_seg->seg.tso_frags[i].paddr_low_32 = - tso_frag_paddr_32; + tso_frag_paddr_lo; /* if there is no more data left in the skb */ if (!skb_proc) @@ -939,17 +968,19 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, tso_frag_len = min(skb_frag_len, tso_seg_size); tso_frag_vaddr = tso_frag_vaddr + tso_frag_len; if (from_frag_table) { - tso_frag_paddr_32 = + tso_frag_paddr = skb_frag_dma_map(osdev->dev, frag, foffset, tso_frag_len, DMA_TO_DEVICE); + cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); } else { - tso_frag_paddr_32 = + tso_frag_paddr = dma_map_single(osdev->dev, tso_frag_vaddr, tso_frag_len, DMA_TO_DEVICE); + cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); } } else { /* the next fragment is not contiguous */ tso_frag_len = min(skb_frag_len, tso_seg_size); @@ -957,9 +988,10 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, skb_frag_len = skb_frag_size(frag); tso_frag_vaddr = skb_frag_address(frag); - tso_frag_paddr_32 = skb_frag_dma_map(osdev->dev, + tso_frag_paddr = skb_frag_dma_map(osdev->dev, frag, 0, tso_frag_len, DMA_TO_DEVICE); + cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); foffset += tso_frag_len; from_frag_table = 1; j++; diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index f159b124c59d..5cef1f6ec92f 100644 --- a/core/cdf/src/cdf_trace.c +++ b/core/cdf/src/cdf_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -757,13 +757,13 @@ void cdf_dp_trace_set_track(cdf_nbuf_t nbuf) if (g_cdf_dp_trace_data.proto_bitmap != 0) { if (cds_pkt_get_proto_type(nbuf, g_cdf_dp_trace_data.proto_bitmap, 0)) { - CDF_NBUF_SET_DP_TRACE(nbuf, 1); + NBUF_CB_TX_DP_TRACE(nbuf) = 1; } } if ((g_cdf_dp_trace_data.no_of_record != 0) && (g_cdf_dp_trace_data.count % g_cdf_dp_trace_data.no_of_record == 0)) { - CDF_NBUF_SET_DP_TRACE(nbuf, 1); + NBUF_CB_TX_DP_TRACE(nbuf) = 1; } spin_unlock_bh(&l_dp_trace_lock); return; @@ -793,7 +793,7 @@ static void dump_hex_trace(uint8_t *buf, uint8_t buf_len) * * Return: None */ -void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord , +void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord, uint16_t recIndex) { cdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex, @@ -857,14 +857,14 @@ void cdf_dp_trace(cdf_nbuf_t nbuf, enum CDF_DP_TRACE_ID code, } /* Return when the packet is not a data packet */ - if (NBUF_GET_PACKET_TRACK(nbuf) != NBUF_TX_PKT_DATA_TRACK) + if (NBUF_CB_TX_PACKET_TRACK(nbuf) != NBUF_TX_PKT_DATA_TRACK) return; /* Return when nbuf is not marked for dp tracing or * verbosity does not allow */ - if (cdf_dp_trace_enable_track(code) == false || - !CDF_NBUF_GET_DP_TRACE(nbuf)) + if ((cdf_dp_trace_enable_track(code) == false) || + !NBUF_CB_TX_DP_TRACE(nbuf)) return; /* Acquire the lock so that only one thread at a time can fill the ring diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index a78fb1e57294..ec61229440c2 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -37,14 +37,9 @@ #include #include #include -#include -#include #include #include -#define __CDF_NBUF_NULL NULL - - /* * Use socket buffer as the underlying implentation as skbuf . * Linux use sk_buff to represent both packet and data, @@ -52,316 +47,286 @@ */ typedef struct sk_buff *__cdf_nbuf_t; -typedef void (*__cdf_nbuf_callback_fn)(struct sk_buff *skb); -#define OSDEP_EAPOL_TID 6 /* send it on VO queue */ - -/* CVG_NBUF_MAX_OS_FRAGS - +/* NBUFCB_TX_MAX_OS_FRAGS * max tx fragments provided by the OS */ -#define CVG_NBUF_MAX_OS_FRAGS 1 +#define NBUF_CB_TX_MAX_OS_FRAGS 1 -/* CVG_NBUF_MAX_EXTRA_FRAGS - +/* NBUF_CB_TX_MAX_EXTRA_FRAGS - * max tx fragments added by the driver - * The driver will always add one tx fragment (the tx descriptor) and may - * add a second tx fragment (e.g. a TSO segment's modified IP header). + * The driver will always add one tx fragment (the tx descriptor) */ -#define CVG_NBUF_MAX_EXTRA_FRAGS 2 +#define NBUF_CB_TX_MAX_EXTRA_FRAGS 2 -typedef void (*cdf_nbuf_trace_update_t)(char *); +/* + * Make sure that cdf_dma_addr_t in the cb block is always 64 bit aligned + */ +typedef union { + uint64_t u64; + cdf_dma_addr_t dma_addr; +} cdf_paddr_t; /** - * struct cvg_nbuf_cb - network buffer control block - * @data_attr: Value that is programmed in CE descriptor, contains: - * 1) CE classification enablement bit - * 2) Pkt type (802.3 or Ethernet Type II) - * 3) Pkt Offset (Usually the length of HTT/HTC desc.) - * @trace: info for DP tracing - * @mapped_paddr_lo: DMA mapping info - * @extra_frags: Extra tx fragments - * @owner_id: Owner id - * @cdf_nbuf_callback_fn: Callback function - * @priv_data: IPA specific priv data - * @proto_type: Protocol type - * @vdev_id: vdev id - * @tx_htt2_frm: HTT 2 frame - * @tx_htt2_reserved: HTT 2 reserved bits + * struct cdf_nbuf_cb - network buffer control block contents (skb->cb) + * - data passed between layers of the driver. + * + * Notes: + * 1. Hard limited to 48 bytes. Please count your bytes + * 2. The size of this structure has to be easily calculatable and + * consistently so: do not use any conditional compile flags + * 3. Split into a common part followed by a tx/rx overlay + * 4. There is only one extra frag, which represents the HTC/HTT header + * + * @common.paddr : physical addressed retrived by dma_map of nbuf->data + * @rx.lro_flags : hardware assisted flags: + * @rx.lro_eligible : flag to indicate whether the MSDU is LRO eligible + * @rx.tcp_proto : L4 protocol is TCP + * @rx.tcp_pure_ack : A TCP ACK packet with no payload + * @rx.ipv6_proto : L3 protocol is IPV6 + * @rx.ip_offset : offset to IP header + * @rx.tcp_offset : offset to TCP header + * @rx.tcp_udp_chksum : L4 payload checksum + * @rx.tcp_seq_num : TCP sequence number + * @rx.tcp_ack_num : TCP ACK number + * @rx.flow_id_toeplitz: 32-bit 5-tuple Toeplitz hash + * @tx.extra_frag : represent HTC/HTT header + * @tx.efrag.vaddr : virtual address of ~ + * @tx.efrag.paddr : physical/DMA address of ~ + * @tx.efrag.len : length of efrag pointed by the above pointers + * @tx.efrag.num : number of extra frags ( 0 or 1) + * @tx.efrag.flags.nbuf : flag, nbuf payload to be swapped (wordstream) + * @tx.efrag.flags.efrag : flag, efrag payload to be swapped (wordstream) + * @tx.efrag.flags.chfrag_start: used by WIN + * @tx.efrags.flags.chfrag_end: used by WIN + * @tx.data_attr : value that is programmed into CE descr, includes: + * + (1) CE classification enablement bit + * + (2) packet type (802.3 or Ethernet type II) + * + (3) packet offset (usually length of HTC/HTT descr) + * @tx.trace : combined structure for DP and protocol trace + * @tx.trace.packet_state: {NBUF_TX_PKT_[(HDD)|(TXRX_ENQUEUE)|(TXRX_DEQUEUE)| + * + (TXRX)|(HTT)|(HTC)|(HIF)|(CE)|(FREE)] + * @tx.trace.packet_track: {NBUF_TX_PKT_[(DATA)|(MGMT)]_TRACK} + * @tx.trace.proto_type : bitmap of NBUF_PKT_TRAC_TYPE[(EAPOL)|(DHCP)| + * + (MGMT_ACTION)] - 4 bits + * @tx.trace.dp_trace : flag (Datapath trace) + * @tx.trace.htt2_frm : flag (high-latency path only) + * @tx.trace.vdev_id : vdev (for protocol trace) + * @tx.ipa.owned : packet owned by IPA + * @tx.ipa.priv : private data, used by IPA */ -struct cvg_nbuf_cb { - uint32_t data_attr; - /* - * Store info for data path tracing - */ - struct { - uint8_t packet_state; - uint8_t packet_track; - uint8_t dp_trace; - } trace; - - /* - * Store the DMA mapping info for the network buffer fragments - * provided by the OS. - */ - uint32_t mapped_paddr_lo[CVG_NBUF_MAX_OS_FRAGS]; -#ifdef DEBUG_RX_RING_BUFFER - uint32_t map_index; -#endif - - /* store extra tx fragments provided by the driver */ - struct { - /* vaddr - - * CPU address (a.k.a. virtual address) of the tx fragments - * added by the driver - */ - unsigned char *vaddr[CVG_NBUF_MAX_EXTRA_FRAGS]; - /* paddr_lo - - * bus address (a.k.a. physical address) of the tx fragments - * added by the driver - */ - uint32_t paddr_lo[CVG_NBUF_MAX_EXTRA_FRAGS]; - uint16_t len[CVG_NBUF_MAX_EXTRA_FRAGS]; - uint8_t num; /* how many extra frags has the driver added */ - uint8_t - /* - * Store a wordstream vs. bytestream flag for each extra - * fragment, plus one more flag for the original fragment(s) - * of the netbuf. - */ -wordstream_flags:CVG_NBUF_MAX_EXTRA_FRAGS + 1; - } extra_frags; - uint32_t owner_id; - __cdf_nbuf_callback_fn cdf_nbuf_callback_fn; - unsigned long priv_data; -#ifdef QCA_PKT_PROTO_TRACE - unsigned char proto_type; - unsigned char vdev_id; -#endif /* QCA_PKT_PROTO_TRACE */ -#ifdef QCA_TX_HTT2_SUPPORT - unsigned char tx_htt2_frm:1; - unsigned char tx_htt2_reserved:7; -#endif /* QCA_TX_HTT2_SUPPORT */ -}; -#ifdef DEBUG_RX_RING_BUFFER -#define NBUF_MAP_ID(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->map_index) -#endif -#define NBUF_OWNER_ID(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->owner_id) -#define NBUF_OWNER_PRIV_DATA(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->priv_data) -#define NBUF_CALLBACK_FN(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->cdf_nbuf_callback_fn) -#define NBUF_CALLBACK_FN_EXEC(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->cdf_nbuf_callback_fn)(skb) -#define NBUF_MAPPED_PADDR_LO(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->mapped_paddr_lo[0]) -#define NBUF_NUM_EXTRA_FRAGS(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->extra_frags.num) -#define NBUF_EXTRA_FRAG_VADDR(skb, frag_num) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->extra_frags.vaddr[(frag_num)]) -#define NBUF_EXTRA_FRAG_PADDR_LO(skb, frag_num) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->extra_frags.paddr_lo[(frag_num)]) -#define NBUF_EXTRA_FRAG_LEN(skb, frag_num) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->extra_frags.len[(frag_num)]) -#define NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->extra_frags.wordstream_flags) - -#ifdef QCA_PKT_PROTO_TRACE -#define NBUF_SET_PROTO_TYPE(skb, proto_type) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->proto_type = proto_type) -#define NBUF_GET_PROTO_TYPE(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->proto_type) -#else -#define NBUF_SET_PROTO_TYPE(skb, proto_type); -#define NBUF_GET_PROTO_TYPE(skb) 0; -#endif /* QCA_PKT_PROTO_TRACE */ - -#ifdef QCA_TX_HTT2_SUPPORT -#define NBUF_SET_TX_HTT2_FRM(skb, candi) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->tx_htt2_frm = candi) -#define NBUF_GET_TX_HTT2_FRM(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->tx_htt2_frm) -#else -#define NBUF_SET_TX_HTT2_FRM(skb, candi) -#define NBUF_GET_TX_HTT2_FRM(skb) 0 -#endif /* QCA_TX_HTT2_SUPPORT */ +struct cdf_nbuf_cb { + /* common */ + cdf_paddr_t paddr; /* of skb->data */ + /* valid only in one direction */ + union { + /* Note: MAX: 40 bytes */ + struct { + uint32_t lro_eligible:1, + tcp_proto:1, + tcp_pure_ack:1, + ipv6_proto:1, + ip_offset:7, + tcp_offset:7; + uint32_t tcp_udp_chksum:16, + tcp_win:16; + uint32_t tcp_seq_num; + uint32_t tcp_ack_num; + uint32_t flow_id_toeplitz; + } rx; /* 20 bytes */ + + /* Note: MAX: 40 bytes */ + struct { + struct { + unsigned char *vaddr; + cdf_paddr_t paddr; + uint16_t len; + uint8_t num; /* 0: cmn.addr; 1: tx.efrag */ + union { + struct { + uint8_t flag_efrag:1, + flag_nbuf:1, + /* following for WIN */ + flag_chfrag_start:1, + flag_chfrag_end:1, + reserved:4; + } bits; + uint8_t u8; + } flags; + } extra_frag; /* 20 bytes */ + uint32_t data_attr; /* 4 bytes */ + union { + struct { + uint8_t packet_state; + uint8_t packet_track:4, + proto_type:4; + uint8_t dp_trace:1, + htt2_frm:1, + rsrvd:6; + uint8_t vdev_id; + } hl; + struct { + uint8_t packet_state; + uint8_t packet_track:4, + proto_type:4; + uint8_t dp_trace:1, + rsrvd:7; + uint8_t vdev_id; + } ll; /* low latency */ + } trace; /* 4 bytes */ + struct { + uint32_t owned:1, + priv:31; + } ipa; /* 4 */ + } tx; /* 32 bytes */ + } u; +}; /* struct cdf_nbuf_cb: MAX 48 bytes */ -#define NBUF_DATA_ATTR_SET(skb, data_attr) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->data_attr = data_attr) - -#define NBUF_DATA_ATTR_GET(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->data_attr) - -#if defined(FEATURE_LRO) /** - * struct nbuf_rx_cb - network buffer control block - * on the receive path of the skb - * @lro_eligible: indicates whether the msdu is LRO eligible - * @tcp_proto: indicates if this is a TCP packet - * @ipv6_proto: indicates if this is an IPv6 packet - * @ip_offset: offset to the IP header - * @tcp_offset: offset to the TCP header - * @tcp_udp_chksum: TCP payload checksum - * @tcp_seq_num: TCP sequence number - * @tcp_ack_num: TCP acknowledgement number - * @flow_id_toeplitz: 32 bit 5-tuple flow id toeplitz hash + * access macros to cdf_nbuf_cb + * Note: These macros can be used as L-values as well as R-values. + * When used as R-values, they effectively function as "get" macros + * When used as L_values, they effectively function as "set" macros */ -struct nbuf_rx_cb { - uint32_t lro_eligible:1, - tcp_proto:1, - tcp_pure_ack:1, - ipv6_proto:1, - ip_offset:7, - tcp_offset:7; - uint32_t tcp_udp_chksum:16, - tcp_win:16; - uint32_t tcp_seq_num; - uint32_t tcp_ack_num; - uint32_t flow_id_toeplitz; -}; - -#define NBUF_LRO_ELIGIBLE(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->lro_eligible) -#define NBUF_TCP_PROTO(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_proto) -#define NBUF_TCP_PURE_ACK(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_pure_ack) -#define NBUF_IPV6_PROTO(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->ipv6_proto) -#define NBUF_IP_OFFSET(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->ip_offset) -#define NBUF_TCP_OFFSET(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_offset) -#define NBUF_TCP_CHKSUM(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_udp_chksum) -#define NBUF_TCP_SEQ_NUM(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_seq_num) -#define NBUF_TCP_ACK_NUM(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_ack_num) -#define NBUF_TCP_WIN(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->tcp_win) -#define NBUF_FLOW_ID_TOEPLITZ(skb) \ - (((struct nbuf_rx_cb *)((skb)->cb))->flow_id_toeplitz) -#endif /* FEATURE_LRO */ - -#define NBUF_SET_PACKET_STATE(skb, pkt_state) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.packet_state = \ - pkt_state) -#define NBUF_GET_PACKET_STATE(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.packet_state) - -#define NBUF_SET_PACKET_TRACK(skb, pkt_track) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.packet_track = \ - pkt_track) -#define NBUF_GET_PACKET_TRACK(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.packet_track) - +#define NBUF_CB_PADDR(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->paddr.dma_addr) +#define NBUF_CB_RX_LRO_ELIGIBLE(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.lro_eligible) +#define NBUF_CB_RX_TCP_PROTO(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_proto) +#define NBUF_CB_RX_TCP_PURE_ACK(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_pure_ack) +#define NBUF_CB_RX_IPV6_PROTO(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.ipv6_proto) +#define NBUF_CB_RX_IP_OFFSET(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.ip_offset) +#define NBUF_CB_RX_TCP_OFFSET(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_offset) +#define NBUF_CB_RX_TCP_CHKSUM(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_udp_chksum) +#define NBUF_CB_RX_TCP_OFFSET(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_offset) +#define NBUF_CB_RX_TCP_WIN(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_win) +#define NBUF_CB_RX_TCP_SEQ_NUM(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_seq_num) +#define NBUF_CB_RX_TCP_ACK_NUM(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_ack_num) +#define NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.flow_id_toeplitz) + +#define NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.vaddr) +#define NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.paddr.dma_addr) +#define NBUF_CB_TX_EXTRA_FRAG_LEN(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.len) +#define NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.num) +#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_FLAGS(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.u8) +#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.bits.flag_efrag) +#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.bits.flag_nbuf) +#define NBUF_CB_TX_DATA_ATTR(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.data_attr) +#define NBUF_CB_TX_PACKET_STATE(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.packet_state) +#define NBUF_CB_TX_PACKET_TRACK(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.packet_track) +#define NBUF_CB_TX_PROTO_TYPE(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.proto_type) #define NBUF_UPDATE_TX_PKT_COUNT(skb, PACKET_STATE) \ cdf_nbuf_set_state(skb, PACKET_STATE) - -#define CDF_NBUF_SET_DP_TRACE(skb, enable) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.dp_trace \ - = enable) -#define CDF_NBUF_GET_DP_TRACE(skb) \ - (((struct cvg_nbuf_cb *)((skb)->cb))->trace.dp_trace) - -#define __cdf_nbuf_get_num_frags(skb) \ - /* assume the OS provides a single fragment */ \ - (NBUF_NUM_EXTRA_FRAGS(skb) + 1) +#define NBUF_CB_TX_DP_TRACE(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.dp_trace) +#define NBUF_CB_TX_HL_HTT2_FRM(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.hl.htt2_frm) +#define NBUF_CB_TX_VDEV_ID(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.vdev_id) +#define NBUF_CB_TX_IPA_OWNED(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.ipa.owned) +#define NBUF_CB_TX_IPA_PRIV(skb) \ + (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.ipa.priv) + +#define __cdf_nbuf_get_num_frags(skb) \ + (NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) + 1) #if defined(FEATURE_TSO) -#define __cdf_nbuf_dec_num_frags(skb) \ - (NBUF_NUM_EXTRA_FRAGS(skb)--) +#define __cdf_nbuf_reset_num_frags(skb) \ + (NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) = 0) #endif +/** + * end of nbuf->cb access macros + */ + +typedef void (*cdf_nbuf_trace_update_t)(char *); -#define __cdf_nbuf_frag_push_head( \ - skb, frag_len, frag_vaddr, frag_paddr_lo, frag_paddr_hi) \ - do { \ - int frag_num = NBUF_NUM_EXTRA_FRAGS(skb)++; \ - NBUF_EXTRA_FRAG_VADDR(skb, frag_num) = frag_vaddr; \ - NBUF_EXTRA_FRAG_PADDR_LO(skb, frag_num) = frag_paddr_lo; \ - NBUF_EXTRA_FRAG_LEN(skb, frag_num) = frag_len; \ +#define __cdf_nbuf_mapped_paddr_get(skb) \ + NBUF_CB_PADDR(skb) + +#define __cdf_nbuf_mapped_paddr_set(skb, paddr) \ + (NBUF_CB_PADDR(skb) = (paddr)) + +#define __cdf_nbuf_frag_push_head( \ + skb, frag_len, frag_vaddr, frag_paddr) \ + do { \ + NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) = 1; \ + NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) = frag_vaddr; \ + NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) = frag_paddr; \ + NBUF_CB_TX_EXTRA_FRAG_LEN(skb) = frag_len; \ } while (0) -#define __cdf_nbuf_get_frag_len(skb, frag_num) \ - ((frag_num < NBUF_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_EXTRA_FRAG_LEN(skb, frag_num) : (skb)->len) - -#define __cdf_nbuf_get_frag_vaddr(skb, frag_num) \ - ((frag_num < NBUF_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_EXTRA_FRAG_VADDR(skb, frag_num) : ((skb)->data)) - -#define __cdf_nbuf_get_frag_paddr_lo(skb, frag_num) \ - ((frag_num < NBUF_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_EXTRA_FRAG_PADDR_LO(skb, frag_num) : \ - /* assume that the OS only provides a single fragment */ \ - NBUF_MAPPED_PADDR_LO(skb)) - -#define __cdf_nbuf_get_frag_is_wordstream(skb, frag_num) \ - ((frag_num < NBUF_NUM_EXTRA_FRAGS(skb)) ? \ - (NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) >> \ - (frag_num)) & 0x1 : \ - (NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) >> \ - (CVG_NBUF_MAX_EXTRA_FRAGS)) & 0x1) - -#define __cdf_nbuf_set_frag_is_wordstream(skb, frag_num, is_wordstream) \ - do { \ - if (frag_num >= NBUF_NUM_EXTRA_FRAGS(skb)) { \ - frag_num = CVG_NBUF_MAX_EXTRA_FRAGS; \ - } \ - /* clear the old value */ \ - NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) &= ~(1 << frag_num); \ - /* set the new value */ \ - NBUF_EXTRA_FRAG_WORDSTREAM_FLAGS(skb) |= \ - ((is_wordstream) << frag_num); \ +#define __cdf_nbuf_get_frag_vaddr(skb, frag_num) \ + ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ + NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) : ((skb)->data)) + +#define __cdf_nbuf_get_frag_paddr(skb, frag_num) \ + ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ + NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) : \ + /* assume that the OS only provides a single fragment */ \ + NBUF_CB_PADDR(skb)) + +#define __cdf_nbuf_get_frag_len(skb, frag_num) \ + ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ + NBUF_CB_TX_EXTRA_FRAG_LEN(skb) : (skb)->len) + +#define __cdf_nbuf_get_frag_is_wordstream(skb, frag) \ + ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) \ + ? (NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb)) \ + : (NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb))) + +#define __cdf_nbuf_set_frag_is_wordstream(skb, frag_num, is_wstrm) \ + do { \ + if (frag_num >= NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) \ + frag_num = NBUF_CB_TX_MAX_EXTRA_FRAGS; \ + if (frag_num) \ + NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) = is_wstrm; \ + else \ + NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) = is_wstrm; \ } while (0) #define __cdf_nbuf_trace_set_proto_type(skb, proto_type) \ - NBUF_SET_PROTO_TYPE(skb, proto_type) + (NBUF_CB_TX_PROTO_TYPE(skb) = (proto_type)) #define __cdf_nbuf_trace_get_proto_type(skb) \ - NBUF_GET_PROTO_TYPE(skb); + NBUF_CB_TX_PROTO_TYPE(skb) -/** - * __cdf_nbuf_data_attr_get() - Retrieves the data_attr value - * from cvg_nbuf_cb (skb->cb) - * @skb: Pointer to struct sk_buff - * - * Return: data_attr - */ #define __cdf_nbuf_data_attr_get(skb) \ - NBUF_DATA_ATTR_GET(skb) + NBUF_CB_TX_DATA_ATTR(skb) +#define __cdf_nbuf_data_attr_set(skb, data_attr) \ + (NBUF_CB_TX_DATA_ATTR(skb) = (data_attr)) -/** - * __cdf_nbuf_data_attr_set() - Sets the data_attr value - * in cvg_nbuf_cb (skb->cb) - * @skb: Pointer to struct sk_buff - * @data_attr: packet type from the enum cdf_txrx_pkt_type - * - * Return: - */ -static inline void -__cdf_nbuf_data_attr_set(struct sk_buff *skb, - uint32_t data_attr) -{ - NBUF_DATA_ATTR_SET(skb, data_attr); -} +#define __cdf_nbuf_ipa_owned_get(skb) \ + NBUF_CB_TX_IPA_OWNED(skb) -/** - * typedef struct __cdf_nbuf_queue_t - network buffer queue - * @head: Head pointer - * @tail: Tail pointer - * @qlen: Queue length - */ -typedef struct __cdf_nbuf_qhead { - struct sk_buff *head; - struct sk_buff *tail; - unsigned int qlen; -} __cdf_nbuf_queue_t; +#define __cdf_nbuf_ipa_owned_set(skb) \ + (NBUF_CB_TX_IPA_OWNED(skb) = 1) -/* - * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. - * Because the queue head will most likely put in some structure, - * we don't use pointer type as the definition. - */ +#define __cdf_nbuf_ipa_priv_get(skb) \ + NBUF_CB_TX_IPA_PRIV(skb) + +#define __cdf_nbuf_ipa_priv_set(skb, priv) \ + (NBUF_CB_TX_IPA_PRIV(skb) = (priv)) /* * prototypes. Implemented in cdf_nbuf.c @@ -417,9 +382,9 @@ static inline size_t __cdf_nbuf_len(struct sk_buff *skb) { int i, extra_frag_len = 0; - i = NBUF_NUM_EXTRA_FRAGS(skb); - while (i-- > 0) - extra_frag_len += NBUF_EXTRA_FRAG_LEN(skb, i); + i = NBUF_CB_TX_NUM_EXTRA_FRAGS(skb); + if (i > 0) + extra_frag_len = NBUF_CB_TX_EXTRA_FRAG_LEN(skb); return extra_frag_len + skb->len; } @@ -460,7 +425,9 @@ __cdf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src) return __cdf_os_to_status(error); } -/**************************nbuf manipulation routines*****************/ +/* + * nbuf manipulation routines + */ /** * __cdf_nbuf_headroom() - return the amount of tail space available @@ -494,8 +461,8 @@ static inline uint32_t __cdf_nbuf_tailroom(struct sk_buff *skb) */ static inline uint8_t *__cdf_nbuf_push_head(struct sk_buff *skb, size_t size) { - if (NBUF_MAPPED_PADDR_LO(skb)) - NBUF_MAPPED_PADDR_LO(skb) -= size; + if (NBUF_CB_PADDR(skb)) + NBUF_CB_PADDR(skb) -= size; return skb_push(skb, size); } @@ -530,8 +497,8 @@ static inline uint8_t *__cdf_nbuf_put_tail(struct sk_buff *skb, size_t size) */ static inline uint8_t *__cdf_nbuf_pull_head(struct sk_buff *skb, size_t size) { - if (NBUF_MAPPED_PADDR_LO(skb)) - NBUF_MAPPED_PADDR_LO(skb) += size; + if (NBUF_CB_PADDR(skb)) + NBUF_CB_PADDR(skb) += size; return skb_pull(skb, size); } @@ -548,151 +515,6 @@ static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size) return skb_trim(skb, skb->len - size); } -/*********************nbuf private buffer routines*************/ - -/** - * __cdf_nbuf_peek_header() - return the header's addr & m_len - * @skb: Pointer to network buffer - * @addr: Pointer to store header's addr - * @m_len: network buffer length - * - * Return: none - */ -static inline void -__cdf_nbuf_peek_header(struct sk_buff *skb, uint8_t **addr, uint32_t *len) -{ - *addr = skb->data; - *len = skb->len; -} - -/******************Custom queue*************/ - -/** - * __cdf_nbuf_queue_init() - initiallize the queue head - * @qhead: Queue head - * - * Return: CDF status - */ -static inline CDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) -{ - memset(qhead, 0, sizeof(struct __cdf_nbuf_qhead)); - return CDF_STATUS_SUCCESS; -} - -/** - * __cdf_nbuf_queue_add() - add an skb in the tail of the queue - * @qhead: Queue head - * @skb: Pointer to network buffer - * - * This is a lockless version, driver must acquire locks if it - * needs to synchronize - * - * Return: none - */ -static inline void -__cdf_nbuf_queue_add(__cdf_nbuf_queue_t *qhead, struct sk_buff *skb) -{ - skb->next = NULL; /*Nullify the next ptr */ - - if (!qhead->head) - qhead->head = skb; - else - qhead->tail->next = skb; - - qhead->tail = skb; - qhead->qlen++; -} - -/** - * __cdf_nbuf_queue_insert_head() - add an skb at the head of the queue - * @qhead: Queue head - * @skb: Pointer to network buffer - * - * This is a lockless version, driver must acquire locks if it needs to - * synchronize - * - * Return: none - */ -static inline void -__cdf_nbuf_queue_insert_head(__cdf_nbuf_queue_t *qhead, __cdf_nbuf_t skb) -{ - if (!qhead->head) { - /*Empty queue Tail pointer Must be updated */ - qhead->tail = skb; - } - skb->next = qhead->head; - qhead->head = skb; - qhead->qlen++; -} - -/** - * __cdf_nbuf_queue_remove() - remove a skb from the head of the queue - * @qhead: Queue head - * - * This is a lockless version. Driver should take care of the locks - * - * Return: skb or NULL - */ -static inline -struct sk_buff *__cdf_nbuf_queue_remove(__cdf_nbuf_queue_t *qhead) -{ - __cdf_nbuf_t tmp = NULL; - - if (qhead->head) { - qhead->qlen--; - tmp = qhead->head; - if (qhead->head == qhead->tail) { - qhead->head = NULL; - qhead->tail = NULL; - } else { - qhead->head = tmp->next; - } - tmp->next = NULL; - } - return tmp; -} - -/** - * __cdf_nbuf_queue_len() - return the queue length - * @qhead: Queue head - * - * Return: Queue length - */ -static inline uint32_t __cdf_nbuf_queue_len(__cdf_nbuf_queue_t *qhead) -{ - return qhead->qlen; -} - -/** - * __cdf_nbuf_queue_next() - return the next skb from packet chain - * @skb: Pointer to network buffer - * - * This API returns the next skb from packet chain, remember the skb is - * still in the queue - * - * Return: NULL if no packets are there - */ -static inline struct sk_buff *__cdf_nbuf_queue_next(struct sk_buff *skb) -{ - return skb->next; -} - -/** - * __cdf_nbuf_is_queue_empty() - check if the queue is empty or not - * @qhead: Queue head - * - * Return: true if length is 0 else false - */ -static inline bool __cdf_nbuf_is_queue_empty(__cdf_nbuf_queue_t *qhead) -{ - return qhead->qlen == 0; -} - -/* - * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. - * Because the queue head will most likely put in some structure, - * we don't use pointer type as the definition. - */ /* * prototypes. Implemented in cdf_nbuf.c @@ -998,9 +820,9 @@ __cdf_nbuf_set_protocol(struct sk_buff *skb, uint16_t protocol) } #define __cdf_nbuf_set_tx_htt2_frm(skb, candi) \ - NBUF_SET_TX_HTT2_FRM(skb, candi) + (NBUF_CB_TX_HL_HTT2_FRM(skb) = (candi)) #define __cdf_nbuf_get_tx_htt2_frm(skb) \ - NBUF_GET_TX_HTT2_FRM(skb) + NBUF_CB_TX_HL_HTT2_FRM(skb) #if defined(FEATURE_TSO) uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, @@ -1065,4 +887,170 @@ do { \ pkt_type = htt_pkt_type_ethernet; \ \ } while (0) + +/** + * nbuf private buffer routines + */ + +/** + * __cdf_nbuf_peek_header() - return the header's addr & m_len + * @skb: Pointer to network buffer + * @addr: Pointer to store header's addr + * @m_len: network buffer length + * + * Return: none + */ +static inline void +__cdf_nbuf_peek_header(struct sk_buff *skb, uint8_t **addr, uint32_t *len) +{ + *addr = skb->data; + *len = skb->len; +} + +/** + * typedef struct __cdf_nbuf_queue_t - network buffer queue + * @head: Head pointer + * @tail: Tail pointer + * @qlen: Queue length + */ +typedef struct __cdf_nbuf_qhead { + struct sk_buff *head; + struct sk_buff *tail; + unsigned int qlen; +} __cdf_nbuf_queue_t; + +/******************Functions *************/ + +/** + * __cdf_nbuf_queue_init() - initiallize the queue head + * @qhead: Queue head + * + * Return: CDF status + */ +static inline CDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) +{ + memset(qhead, 0, sizeof(struct __cdf_nbuf_qhead)); + return CDF_STATUS_SUCCESS; +} + +/** + * __cdf_nbuf_queue_add() - add an skb in the tail of the queue + * @qhead: Queue head + * @skb: Pointer to network buffer + * + * This is a lockless version, driver must acquire locks if it + * needs to synchronize + * + * Return: none + */ +static inline void +__cdf_nbuf_queue_add(__cdf_nbuf_queue_t *qhead, struct sk_buff *skb) +{ + skb->next = NULL; /*Nullify the next ptr */ + + if (!qhead->head) + qhead->head = skb; + else + qhead->tail->next = skb; + + qhead->tail = skb; + qhead->qlen++; +} + +/** + * __cdf_nbuf_queue_insert_head() - add an skb at the head of the queue + * @qhead: Queue head + * @skb: Pointer to network buffer + * + * This is a lockless version, driver must acquire locks if it needs to + * synchronize + * + * Return: none + */ +static inline void +__cdf_nbuf_queue_insert_head(__cdf_nbuf_queue_t *qhead, __cdf_nbuf_t skb) +{ + if (!qhead->head) { + /*Empty queue Tail pointer Must be updated */ + qhead->tail = skb; + } + skb->next = qhead->head; + qhead->head = skb; + qhead->qlen++; +} + +/** + * __cdf_nbuf_queue_remove() - remove a skb from the head of the queue + * @qhead: Queue head + * + * This is a lockless version. Driver should take care of the locks + * + * Return: skb or NULL + */ +static inline +struct sk_buff *__cdf_nbuf_queue_remove(__cdf_nbuf_queue_t *qhead) +{ + __cdf_nbuf_t tmp = NULL; + + if (qhead->head) { + qhead->qlen--; + tmp = qhead->head; + if (qhead->head == qhead->tail) { + qhead->head = NULL; + qhead->tail = NULL; + } else { + qhead->head = tmp->next; + } + tmp->next = NULL; + } + return tmp; +} + +/** + * __cdf_nbuf_queue_len() - return the queue length + * @qhead: Queue head + * + * Return: Queue length + */ +static inline uint32_t __cdf_nbuf_queue_len(__cdf_nbuf_queue_t *qhead) +{ + return qhead->qlen; +} + +/** + * __cdf_nbuf_queue_next() - return the next skb from packet chain + * @skb: Pointer to network buffer + * + * This API returns the next skb from packet chain, remember the skb is + * still in the queue + * + * Return: NULL if no packets are there + */ +static inline struct sk_buff *__cdf_nbuf_queue_next(struct sk_buff *skb) +{ + return skb->next; +} + +/** + * __cdf_nbuf_is_queue_empty() - check if the queue is empty or not + * @qhead: Queue head + * + * Return: true if length is 0 else false + */ +static inline bool __cdf_nbuf_is_queue_empty(__cdf_nbuf_queue_t *qhead) +{ + return qhead->qlen == 0; +} + +/* + * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. + * Because the queue head will most likely put in some structure, + * we don't use pointer type as the definition. + */ + +/* + * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. + * Because the queue head will most likely put in some structure, + * we don't use pointer type as the definition. + */ #endif /*_I_CDF_NET_BUF_H */ diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 636572ef5498..e18985fed2de 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -194,18 +194,18 @@ static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc) static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu, struct htt_host_rx_desc_base *rx_desc) { - NBUF_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible; + NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible; if (rx_desc->msdu_end.lro_eligible) { - NBUF_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack; - NBUF_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum; - NBUF_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number; - NBUF_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number; - NBUF_TCP_WIN(msdu) = rx_desc->msdu_end.window_size; - NBUF_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto; - NBUF_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto; - NBUF_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset; - NBUF_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset; - NBUF_FLOW_ID_TOEPLITZ(msdu) = + NBUF_CB_RX_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack; + NBUF_CB_RX_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum; + NBUF_CB_RX_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number; + NBUF_CB_RX_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number; + NBUF_CB_RX_TCP_WIN(msdu) = rx_desc->msdu_end.window_size; + NBUF_CB_RX_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto; + NBUF_CB_RX_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto; + NBUF_CB_RX_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset; + NBUF_CB_RX_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset; + NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) = rx_desc->msdu_start.flow_id_toeplitz; } } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 2eb0d68cfaca..a2b6fb11bcfc 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -107,7 +107,8 @@ #endif /* De -initialization function of the rx buffer hash table. This function will - free up the hash table which includes freeing all the pending rx buffers*/ + * free up the hash table which includes freeing all the pending rx buffers + */ void htt_rx_hash_deinit(struct htt_pdev_t *pdev) { @@ -228,7 +229,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) idx = *(pdev->rx_ring.alloc_idx.vaddr); while (num > 0) { - uint32_t paddr; + cdf_dma_addr_t paddr; cdf_nbuf_t rx_netbuf; int headroom; @@ -287,7 +288,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) cdf_nbuf_free(rx_netbuf); goto fail; } - paddr = cdf_nbuf_get_frag_paddr_lo(rx_netbuf, 0); + paddr = cdf_nbuf_get_frag_paddr(rx_netbuf, 0); if (pdev->cfg.is_full_reorder_offload) { if (cdf_unlikely (htt_rx_hash_list_insert(pdev, paddr, @@ -309,11 +310,9 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) pdev->rx_ring.buf.netbufs_ring[idx] = rx_netbuf; } #if HTT_PADDR64 - pdev->rx_ring.buf.paddrs_ring[idx] = 0; - pdev->rx_ring.buf.paddrs_ring[idx] = (uint32_t)paddr; -#else - pdev->rx_ring.buf.paddrs_ring[idx] = paddr; + paddr &= 0x1fffffffff; /* trim out higher than 37 bits */ #endif /* HTT_PADDR64 */ + pdev->rx_ring.buf.paddrs_ring[idx] = paddr; pdev->rx_ring.fill_cnt++; num--; @@ -388,7 +387,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) memctx)); cdf_os_mem_free_consistent(pdev->osdev, - pdev->rx_ring.size * sizeof(uint32_t), + pdev->rx_ring.size * sizeof(cdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, cdf_get_dma_mem_context((&pdev->rx_ring.buf), @@ -2130,11 +2129,8 @@ void htt_rx_hash_dump_table(struct htt_pdev_t *pdev) int htt_rx_attach(struct htt_pdev_t *pdev) { cdf_dma_addr_t paddr; -#if HTT_PADDR64 - uint32_t ring_elem_size = sizeof(uint64_t); -#else - uint32_t ring_elem_size = sizeof(uint32_t); -#endif /* HTT_PADDR64 */ + uint32_t ring_elem_size = sizeof(cdf_dma_addr_t); + pdev->rx_ring.size = htt_rx_ring_size(pdev); HTT_ASSERT2(CDF_IS_PWR2(pdev->rx_ring.size)); pdev->rx_ring.size_mask = pdev->rx_ring.size - 1; @@ -2243,10 +2239,10 @@ int htt_rx_attach(struct htt_pdev_t *pdev) } htt_rx_offload_msdu_pop = htt_rx_offload_msdu_pop_ll; - htt_rx_mpdu_desc_retry = htt_rx_mpdu_desc_retry_ll; + htt_rx_mpdu_desc_retry = htt_rx_mpdu_desc_retry_ll; htt_rx_mpdu_desc_seq_num = htt_rx_mpdu_desc_seq_num_ll; htt_rx_mpdu_desc_pn = htt_rx_mpdu_desc_pn_ll; - htt_rx_mpdu_desc_tid = htt_rx_mpdu_desc_tid_ll; + htt_rx_mpdu_desc_tid = htt_rx_mpdu_desc_tid_ll; htt_rx_msdu_desc_completes_mpdu = htt_rx_msdu_desc_completes_mpdu_ll; htt_rx_msdu_first_msdu_flag = htt_rx_msdu_first_msdu_flag_ll; htt_rx_msdu_has_wlan_mcast_flag = htt_rx_msdu_has_wlan_mcast_flag_ll; @@ -2262,7 +2258,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) fail3: cdf_os_mem_free_consistent(pdev->osdev, - pdev->rx_ring.size * sizeof(uint32_t), + pdev->rx_ring.size * sizeof(cdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, cdf_get_dma_mem_context((&pdev->rx_ring.buf), diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 4a12bddcba46..05756de03bf1 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -147,19 +147,19 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) pdev->tgt_ver.major = HTT_VER_CONF_MAJOR_GET(*msg_word); pdev->tgt_ver.minor = HTT_VER_CONF_MINOR_GET(*msg_word); cdf_print - ("target uses HTT version %d.%d; host uses %d.%d\n", + ("target uses HTT version %d.%d; host uses %d.%d", pdev->tgt_ver.major, pdev->tgt_ver.minor, HTT_CURRENT_VERSION_MAJOR, HTT_CURRENT_VERSION_MINOR); if (pdev->tgt_ver.major != HTT_CURRENT_VERSION_MAJOR) cdf_print - ("*** Incompatible host/target HTT versions!\n"); + ("*** Incompatible host/target HTT versions!"); /* abort if the target is incompatible with the host */ cdf_assert(pdev->tgt_ver.major == HTT_CURRENT_VERSION_MAJOR); if (pdev->tgt_ver.minor != HTT_CURRENT_VERSION_MINOR) { cdf_print("*** Warning: host/target HTT versions are "); - cdf_print(" different, though compatible!\n"); + cdf_print(" different, though compatible!"); } break; } @@ -293,7 +293,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) cdf_runtime_pm_put(); HTT_TX_SCHED(pdev); } else { - cdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication\n"); + cdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); } break; } @@ -510,7 +510,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s %d: msg_word 0x%x msg_type %d\n", + cdf_print("%s %d: msg_word 0x%x msg_type %d", __func__, __LINE__, *msg_word, msg_type); #endif diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 83551b70ae27..499ccad7c7ea 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -188,7 +188,7 @@ static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev) * htt_tx_frag_alloc() - Allocate single fragment descriptor from the pool * @pdev: htt device instance pointer * @index: Descriptor index - * @frag_paddr_lo: Fragment descriptor physical address + * @frag_paddr: Fragment descriptor physical address * @frag_ptr: Fragment descriptor virtual address * * This function will free fragment descriptor @@ -196,7 +196,7 @@ static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev) * Return: None */ int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, u_int32_t *frag_paddr_lo, void **frag_ptr) + u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr) { uint16_t frag_page_index; uint16_t frag_elem_index; @@ -223,7 +223,7 @@ int htt_tx_frag_alloc(htt_pdev_handle pdev, return 1; } - *frag_paddr_lo = dma_page->page_p_addr + + *frag_paddr = dma_page->page_p_addr + frag_elem_index * pdev->frag_descs.size; return 0; } @@ -436,7 +436,7 @@ static cdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, /*--- descriptor allocation functions ---------------------------------------*/ -void *htt_tx_desc_alloc(htt_pdev_handle pdev, uint32_t *paddr_lo, +void *htt_tx_desc_alloc(htt_pdev_handle pdev, cdf_dma_addr_t *paddr, uint16_t index) { struct htt_host_tx_desc_t *htt_host_tx_desc; /* includes HTC hdr */ @@ -477,7 +477,7 @@ void *htt_tx_desc_alloc(htt_pdev_handle pdev, uint32_t *paddr_lo, * Include the headroom for the HTC frame header when specifying the * physical address for the HTT tx descriptor. */ - *paddr_lo = (uint32_t)htt_tx_get_paddr(pdev, (char *)htt_host_tx_desc); + *paddr = (cdf_dma_addr_t)htt_tx_get_paddr(pdev, (char *)htt_host_tx_desc); /* * The allocated tx descriptor space includes headroom for a * HTC frame header. Hide this headroom, so that we don't have @@ -504,8 +504,8 @@ void htt_tx_desc_free(htt_pdev_handle pdev, void *tx_desc) void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, void *htt_tx_desc, - uint32_t paddr, - uint32_t frag_desc_paddr_lo, + cdf_dma_addr_t paddr, + cdf_dma_addr_t frag_desc_paddr, int reset) { uint32_t *fragmentation_descr_field_ptr; @@ -515,7 +515,7 @@ void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, HTT_TX_DESC_FRAGS_DESC_PADDR_OFFSET_DWORD; if (reset) { #if defined(HELIUMPLUS_PADDR64) - *fragmentation_descr_field_ptr = frag_desc_paddr_lo; + *fragmentation_descr_field_ptr = frag_desc_paddr; #else *fragmentation_descr_field_ptr = htt_tx_get_paddr(pdev, htt_tx_desc) + HTT_TX_DESC_LEN; @@ -812,7 +812,8 @@ int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) } #endif /*ATH_11AC_TXCOMPACT */ -#ifdef HTT_DBG + +#if defined(HTT_DBG) void htt_tx_desc_display(void *tx_desc) { struct htt_tx_msdu_desc_t *htt_tx_desc; @@ -820,32 +821,28 @@ void htt_tx_desc_display(void *tx_desc) htt_tx_desc = (struct htt_tx_msdu_desc_t *)tx_desc; /* only works for little-endian */ - cdf_print("HTT tx desc (@ %p):\n", htt_tx_desc); - cdf_print(" msg type = %d\n", htt_tx_desc->msg_type); - cdf_print(" pkt subtype = %d\n", htt_tx_desc->pkt_subtype); - cdf_print(" pkt type = %d\n", htt_tx_desc->pkt_type); - cdf_print(" vdev ID = %d\n", htt_tx_desc->vdev_id); - cdf_print(" ext TID = %d\n", htt_tx_desc->ext_tid); - cdf_print(" postponed = %d\n", htt_tx_desc->postponed); -#if HTT_PADDR64 - cdf_print(" reserved_dword0_bits28 = %d\n", htt_tx_desc->reserved_dword0_bits28); - cdf_print(" cksum_offload = %d\n", htt_tx_desc->cksum_offload); - cdf_print(" tx_compl_req= %d\n", htt_tx_desc->tx_compl_req); -#else /* !HTT_PADDR64 */ - cdf_print(" batch more = %d\n", htt_tx_desc->more_in_batch); -#endif /* HTT_PADDR64 */ - cdf_print(" length = %d\n", htt_tx_desc->len); - cdf_print(" id = %d\n", htt_tx_desc->id); + cdf_print("HTT tx desc (@ %p):", htt_tx_desc); + cdf_print(" msg type = %d", htt_tx_desc->msg_type); + cdf_print(" pkt subtype = %d", htt_tx_desc->pkt_subtype); + cdf_print(" pkt type = %d", htt_tx_desc->pkt_type); + cdf_print(" vdev ID = %d", htt_tx_desc->vdev_id); + cdf_print(" ext TID = %d", htt_tx_desc->ext_tid); + cdf_print(" postponed = %d", htt_tx_desc->postponed); + cdf_print(" extension = %d", htt_tx_desc->extension); + cdf_print(" cksum_offload = %d", htt_tx_desc->cksum_offload); + cdf_print(" tx_compl_req= %d", htt_tx_desc->tx_compl_req); + cdf_print(" length = %d", htt_tx_desc->len); + cdf_print(" id = %d", htt_tx_desc->id); #if HTT_PADDR64 - cdf_print(" frag desc addr.lo = %#x\n", + cdf_print(" frag desc addr.lo = %#x", htt_tx_desc->frags_desc_ptr.lo); - cdf_print(" frag desc addr.hi = %#x\n", + cdf_print(" frag desc addr.hi = %#x", htt_tx_desc->frags_desc_ptr.hi); - cdf_print(" peerid = %d\n", htt_tx_desc->peerid); - cdf_print(" chanfreq = %d\n", htt_tx_desc->chanfreq); #else /* ! HTT_PADDR64 */ - cdf_print(" frag desc addr = %#x\n", htt_tx_desc->frags_desc_ptr); + cdf_print(" frag desc addr = %#x", htt_tx_desc->frags_desc_ptr); #endif /* HTT_PADDR64 */ + cdf_print(" peerid = %d", htt_tx_desc->peerid); + cdf_print(" chanfreq = %d", htt_tx_desc->chanfreq); } #endif @@ -900,7 +897,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, tx_buffer_count) << 16; cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL); - buffer_paddr = cdf_nbuf_get_frag_paddr_lo(buffer_vaddr, 0); + buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; *header_ptr = (uint32_t) (buffer_paddr + IPA_UC_TX_BUF_FRAG_DESC_OFFSET); @@ -928,7 +925,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, { unsigned int tx_buffer_count; cdf_nbuf_t buffer_vaddr; - uint32_t buffer_paddr; + cdf_dma_addr_t buffer_paddr; uint32_t *header_ptr; uint32_t *ring_vaddr; #define IPA_UC_TX_BUF_FRAG_DESC_OFFSET 20 @@ -960,7 +957,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, tx_buffer_count) << 16; cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL); - buffer_paddr = cdf_nbuf_get_frag_paddr_lo(buffer_vaddr, 0); + buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; /* Frag Desc Pointer */ @@ -1063,8 +1060,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, free_tx_comp_base: cdf_os_mem_free_consistent(pdev->osdev, - ol_cfg_ipa_uc_tx_max_buf_cnt(pdev-> - ctrl_pdev) * 4, + tx_comp_ring_size, pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, cdf_get_dma_mem_context((&pdev-> @@ -1101,7 +1097,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { cdf_os_mem_free_consistent( pdev->osdev, - ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * 4, + ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t), pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, cdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 26fecb363e4e..0121a09ec0af 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -174,8 +174,30 @@ struct ipa_uc_rx_ring_elem_t { }; #if defined(HELIUMPLUS_PADDR64) +/** + * msdu_ext_frag_desc: + * semantically, this is an array of 6 of 2-tuples of + * a 48-bit physical address and a 16 bit len field + * with the following layout: + * 31 16 8 0 + * | p t r - l o w 3 2 | + * | len | ptr-7/16 | + */ +struct msdu_ext_frag_desc { + union { + uint64_t desc64; + struct { + uint32_t ptr_low; + uint32_t ptr_hi:16, + len:16; + } frag32; + } u; +}; + struct msdu_ext_desc_t { struct cdf_tso_flags_t tso_flags; + struct msdu_ext_frag_desc frags[6]; +/* u_int32_t frag_ptr0; u_int32_t frag_len0; u_int32_t frag_ptr1; @@ -188,6 +210,7 @@ struct msdu_ext_desc_t { u_int32_t frag_len4; u_int32_t frag_ptr5; u_int32_t frag_len5; +*/ }; #endif /* defined(HELIUMPLUS_PADDR64) */ diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index cd9ac7d931f5..b46f2ab72972 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -357,7 +357,7 @@ uint16_t htt_tx_compl_desc_id(void *iterator, int num); * @param[OUT] paddr_lo - physical address of the HTT descriptor * @return success -> descriptor handle, -OR- failure -> NULL */ -void *htt_tx_desc_alloc(htt_pdev_handle pdev, uint32_t *paddr_lo, +void *htt_tx_desc_alloc(htt_pdev_handle pdev, cdf_dma_addr_t *paddr, uint16_t index); /** @@ -381,10 +381,10 @@ void htt_tx_desc_free(htt_pdev_handle htt_pdev, void *htt_tx_desc); * @return success 0 */ int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, u_int32_t *frag_paddr_lo, void **frag_ptr); + u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr); #else static inline int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, u_int32_t *frag_paddr_lo, void **frag_ptr) + u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr) { *frag_ptr = NULL; return 0; @@ -530,7 +530,7 @@ static inline void htt_tx_desc_init(htt_pdev_handle pdev, void *htt_tx_desc, - uint32_t htt_tx_desc_paddr_lo, + cdf_dma_addr_t htt_tx_desc_paddr, uint16_t msdu_id, cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info, struct cdf_tso_info_t *tso_info, @@ -681,8 +681,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, /* store a link to the HTT tx descriptor within the netbuf */ cdf_nbuf_frag_push_head(msdu, sizeof(struct htt_host_tx_desc_t), (char *)htt_host_tx_desc, /* virtual addr */ - htt_tx_desc_paddr_lo, - 0 /* phys addr MSBs - n/a */); + htt_tx_desc_paddr); /* * Indicate that the HTT header (and HTC header) is a meta-data @@ -762,15 +761,14 @@ htt_tx_desc_num_frags(htt_pdev_handle pdev, void *desc, uint32_t num_frags) */ #if defined(HELIUMPLUS_PADDR64) if (HTT_WIFI_IP(pdev, 2, 0)) { + struct msdu_ext_frag_desc *fdesc; + /** Skip TSO related 4 dwords WIFI2.0*/ - desc = (void *)&(((struct msdu_ext_desc_t *)desc)->frag_ptr0); - /* Frag ptr is 48 bit wide so clear the next dword as well */ - *((uint32_t *)(((char *)desc) + (num_frags << 3))) = 0; - *((uint32_t *) - (((char *)desc) + (num_frags << 3) + sizeof(uint32_t))) = 0; - /* TODO: OKA: remove the magic constants */ + fdesc = (struct msdu_ext_frag_desc *) + &(((struct msdu_ext_desc_t *)desc)->frags[0]); + fdesc[num_frags].u.desc64 = 0; } else { - /* XXXOKA -- Looks like a bug, called with htt_frag_desc */ + /* This piece of code should never be executed on HELIUMPLUS */ *((u_int32_t *) (((char *) desc) + HTT_TX_DESC_LEN + num_frags * 8)) = 0; } @@ -809,54 +807,65 @@ static inline void htt_tx_desc_frag(htt_pdev_handle pdev, void *desc, - int frag_num, uint32_t frag_phys_addr, uint16_t frag_len) + int frag_num, cdf_dma_addr_t frag_phys_addr, uint16_t frag_len) { - u_int32_t *word; - + uint32_t *word32; #if defined(HELIUMPLUS_PADDR64) + uint64_t *word64; + if (HTT_WIFI_IP(pdev, 2, 0)) { - word = (u_int32_t *)(desc); + word32 = (u_int32_t *)(desc); /* Initialize top 6 words of TSO flags per packet */ - *word++ = 0; - *word++ = 0; - *word++ = 0; + *word32++ = 0; + *word32++ = 0; + *word32++ = 0; if (((struct txrx_pdev_cfg_t *)(pdev->ctrl_pdev)) ->ip_tcp_udp_checksum_offload) - *word |= (IPV4_CSUM_EN | TCP_IPV4_CSUM_EN | + *word32 |= (IPV4_CSUM_EN | TCP_IPV4_CSUM_EN | TCP_IPV6_CSUM_EN | UDP_IPV4_CSUM_EN | UDP_IPV6_CSUM_EN); else - *word = 0; - word++; - *word++ = 0; - *word++ = 0; + *word32 = 0; + word32++; + *word32++ = 0; + *word32++ = 0; - cdf_assert_always(word == &(((struct msdu_ext_desc_t *) - desc)->frag_ptr0)); + cdf_assert_always(word32 == (uint32_t *) + &(((struct msdu_ext_desc_t *)desc)->frags[0])); /* Each fragment consumes 2 DWORDS */ - word += (frag_num << 1); - *word = frag_phys_addr; - - word++; - *word = (frag_len<<16); - + word32 += (frag_num << 1); + word64 = (uint64_t *)word32; + *word64 = frag_phys_addr; + /* The frag_phys address is 37 bits. So, the higher 16 bits will be + for len */ + word32++; + *word32 &= 0x0000ffff; + *word32 |= (frag_len << 16); } else { /* For Helium+, this block cannot exist */ CDF_ASSERT(0); } #else /* !defined(HELIUMPLUS_PADDR64) */ - word = (uint32_t *) (((char *)desc) + HTT_TX_DESC_LEN + frag_num * 8); - *word = frag_phys_addr; - word++; - *word = frag_len; + { + uint64_t u64 = (uint64_t)frag_phys_addr; + uint32_t u32l = (u64 & 0xffffffff); + uint32_t u32h = (uint32_t)((u64 >> 32) & 0x1f); + uint64_t *word64; + + word32 = (uint32_t *) (((char *)desc) + HTT_TX_DESC_LEN + frag_num * 8); + word64 = (uint64_t *)word32; + *word32 = u32l; + word32++; + *word32 = (u32h << 16) | frag_len; + } #endif /* defined(HELIUMPLUS_PADDR64) */ } void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, void *desc, - uint32_t paddr, - uint32_t frag_desc_paddr_lo, + cdf_dma_addr_t paddr, + cdf_dma_addr_t frag_desc_paddr, int reset); /** diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 0cff3cfc35e7..a33771745a0b 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -288,8 +288,9 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) while (segments) { if (msdu_info.tso_info.curr_seg) - NBUF_MAPPED_PADDR_LO(msdu) = msdu_info.tso_info. - curr_seg->seg.tso_frags[0].paddr_low_32; + NBUF_CB_PADDR(msdu) = + msdu_info.tso_info.curr_seg-> + seg.tso_frags[0].paddr_low_32; segments--; @@ -317,7 +318,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.tso_info.curr_seg->next; } - cdf_nbuf_dec_num_frags(msdu); + cdf_nbuf_reset_num_frags(msdu); if (msdu_info.tso_info.is_tso) { TXRX_STATS_TSO_INC_SEG(vdev->pdev); @@ -437,8 +438,9 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, num_frags = cdf_nbuf_get_num_frags(msdu); /* num_frags are expected to be 2 max */ - num_frags = (num_frags > CVG_NBUF_MAX_EXTRA_FRAGS) ? - CVG_NBUF_MAX_EXTRA_FRAGS : num_frags; + num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS) + ? NBUF_CB_TX_MAX_EXTRA_FRAGS + : num_frags; #if defined(HELIUMPLUS_PADDR64) /* * Use num_frags - 1, since 1 frag is used to store @@ -459,17 +461,17 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, } else { for (i = 1; i < num_frags; i++) { cdf_size_t frag_len; - u_int32_t frag_paddr; + cdf_dma_addr_t frag_paddr; frag_len = cdf_nbuf_get_frag_len(msdu, i); - frag_paddr = cdf_nbuf_get_frag_paddr_lo(msdu, i); + frag_paddr = cdf_nbuf_get_frag_paddr(msdu, i); #if defined(HELIUMPLUS_PADDR64) htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s:%d: htt_fdesc=%p frag_paddr=%u len=%zu\n", + cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu", __func__, __LINE__, tx_desc->htt_frag_desc, - frag_paddr, frag_len); + i-1, frag_paddr, frag_len); dump_pkt(netbuf, frag_paddr, 64); #endif /* HELIUMPLUS_DEBUG */ #else /* ! defined(HELIUMPLUSPADDR64) */ @@ -556,7 +558,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) while (segments) { if (msdu_info.tso_info.curr_seg) - NBUF_MAPPED_PADDR_LO(msdu) = msdu_info.tso_info. + NBUF_CB_PADDR(msdu) = msdu_info.tso_info. curr_seg->seg.tso_frags[0].paddr_low_32; segments--; @@ -617,7 +619,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) } if (msdu_info.tso_info.is_tso) { - cdf_nbuf_dec_num_frags(msdu); + cdf_nbuf_reset_num_frags(msdu); TXRX_STATS_TSO_INC_SEG(vdev->pdev); TXRX_STATS_TSO_INC_SEG_IDX(vdev->pdev); } @@ -1195,10 +1197,10 @@ void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) cdf_print("OL TX Descriptor 0x%p msdu_id %d\n", tx_desc, tx_desc->id); - cdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%x\n", + cdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%llx", tx_desc->htt_tx_desc, tx_desc->htt_tx_desc_paddr); - cdf_print("%s %d: Fragment Descriptor 0x%p\n", - __func__, __LINE__, tx_desc->htt_frag_desc); + cdf_print("%s %d: Fragment Descriptor 0x%p (paddr=0x%llx)", + __func__, __LINE__, tx_desc->htt_frag_desc, tx_desc->htt_frag_desc_paddr); /* it looks from htt_tx_desc_frag() that tx_desc->htt_frag_desc is already de-referrable (=> in virtual address space) */ @@ -1308,7 +1310,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, htt_tx_desc_frags_table_set( pdev->htt_pdev, tx_desc->htt_tx_desc, - cdf_nbuf_get_frag_paddr_lo(tx_mgmt_frm, 1), + cdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1), 0, 0); #if defined(HELIUMPLUS_PADDR64) && defined(HELIUMPLUS_DEBUG) dump_frag_desc( @@ -1326,8 +1328,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, tx_desc->pkt_type = type + OL_TXRX_MGMT_TYPE_BASE; htt_tx_desc_set_chanfreq(tx_desc->htt_tx_desc, chanfreq); - NBUF_SET_PACKET_TRACK(tx_desc->netbuf, NBUF_TX_PKT_MGMT_TRACK); - ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm, + NBUF_CB_TX_PACKET_TRACK(tx_desc->netbuf) = NBUF_TX_PKT_MGMT_TRACK; ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm, htt_pkt_type_mgmt); return 0; /* accepted the tx mgmt frame */ diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 9ea20bb5a579..48499e818a8e 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -307,11 +307,11 @@ extern void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); void -dump_pkt(cdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len) +dump_pkt(cdf_nbuf_t nbuf, cdf_dma_addr_t nbuf_paddr, int len) { - cdf_print("%s: Pkt: VA 0x%p PA 0x%x len %d\n", __func__, + cdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, cdf_nbuf_data(nbuf), nbuf_paddr, len); - print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_NONE, 16, 4, + print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4, cdf_nbuf_data(nbuf), len, true); } @@ -381,8 +381,8 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, */ num_frags = cdf_nbuf_get_num_frags(netbuf); /* num_frags are expected to be 2 max */ - num_frags = (num_frags > CVG_NBUF_MAX_EXTRA_FRAGS) - ? CVG_NBUF_MAX_EXTRA_FRAGS + num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS) + ? NBUF_CB_TX_MAX_EXTRA_FRAGS : num_frags; #if defined(HELIUMPLUS_PADDR64) /* @@ -405,17 +405,20 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, } else { for (i = 1; i < num_frags; i++) { cdf_size_t frag_len; - uint32_t frag_paddr; - + cdf_dma_addr_t frag_paddr; +#ifdef HELIUMPLUS_DEBUG + void *frag_vaddr; + frag_vaddr = cdf_nbuf_get_frag_vaddr(netbuf, i); +#endif frag_len = cdf_nbuf_get_frag_len(netbuf, i); - frag_paddr = cdf_nbuf_get_frag_paddr_lo(netbuf, i); + frag_paddr = cdf_nbuf_get_frag_paddr(netbuf, i); #if defined(HELIUMPLUS_PADDR64) htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s:%d: htt_fdesc=%p frag_paddr=%u len=%zu\n", - __func__, __LINE__, tx_desc->htt_frag_desc, - frag_paddr, frag_len); + cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n", + __func__, __LINE__, tx_desc->htt_frag_desc, + i-1, frag_vaddr, frag_paddr, frag_len); dump_pkt(netbuf, frag_paddr, 64); #endif /* HELIUMPLUS_DEBUG */ #else /* ! defined(HELIUMPLUSPADDR64) */ @@ -485,10 +488,10 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, /* check the frame type to see what kind of special steps are needed */ if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) && (tx_desc->pkt_type != 0xff)) { - uint32_t frag_desc_paddr_lo = 0; + cdf_dma_addr_t frag_desc_paddr = 0; #if defined(HELIUMPLUS_PADDR64) - frag_desc_paddr_lo = tx_desc->htt_frag_desc_paddr; + frag_desc_paddr = tx_desc->htt_frag_desc_paddr; /* FIX THIS - * The FW currently has trouble using the host's fragments * table for management frames. Until this is fixed, @@ -501,12 +504,12 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, #if defined(HELIUMPLUS_DEBUG) cdf_print("%s %d: Frag Descriptor Reset [%d] to 0x%x\n", __func__, __LINE__, tx_desc->id, - frag_desc_paddr_lo); + frag_desc_paddr); #endif /* HELIUMPLUS_DEBUG */ #endif /* HELIUMPLUS_PADDR64 */ htt_tx_desc_frags_table_set(pdev->htt_pdev, tx_desc->htt_tx_desc, 0, - frag_desc_paddr_lo, 1); + frag_desc_paddr, 1); mgmt_type = tx_desc->pkt_type - OL_TXRX_MGMT_TYPE_BASE; /* diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index e42168458467..ef86e3abb5f4 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -588,8 +588,8 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) for (i = 0; i < desc_pool_size; i++) { void *htt_tx_desc; void *htt_frag_desc = NULL; - uint32_t frag_paddr_lo = 0; - uint32_t paddr_lo; + cdf_dma_addr_t frag_paddr = 0; + cdf_dma_addr_t paddr; if (i == (desc_pool_size - 1)) c_element->next = NULL; @@ -597,7 +597,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) c_element->next = (union ol_tx_desc_list_elem_t *) ol_tx_desc_find(pdev, i + 1); - htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr_lo, i); + htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr, i); if (!htt_tx_desc) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "%s: failed to alloc HTT tx desc (%d of %d)", @@ -607,9 +607,9 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) } c_element->tx_desc.htt_tx_desc = htt_tx_desc; - c_element->tx_desc.htt_tx_desc_paddr = paddr_lo; + c_element->tx_desc.htt_tx_desc_paddr = paddr; ret = htt_tx_frag_alloc(pdev->htt_pdev, - i, &frag_paddr_lo, &htt_frag_desc); + i, &frag_paddr, &htt_frag_desc); if (ret) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: failed to alloc HTT frag dsc (%d/%d)", @@ -623,10 +623,10 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) of the frag descriptor */ memset(htt_frag_desc, 0, 6 * sizeof(uint32_t)); c_element->tx_desc.htt_frag_desc = htt_frag_desc; - c_element->tx_desc.htt_frag_desc_paddr = frag_paddr_lo; + c_element->tx_desc.htt_frag_desc_paddr = frag_paddr; } CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, - "%s:%d - %d FRAG VA 0x%p FRAG PA 0x%x", + "%s:%d - %d FRAG VA 0x%p FRAG PA 0x%llx", __func__, __LINE__, i, c_element->tx_desc.htt_frag_desc, c_element->tx_desc.htt_frag_desc_paddr); @@ -1814,7 +1814,7 @@ void ol_txrx_peer_detach(ol_txrx_peer_handle peer) /* htt_rx_reorder_log_print(vdev->pdev->htt_pdev); */ TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, - "%s:peer %p (%02x:%02x:%02x:%02x:%02x:%02x)\n", + "%s:peer %p (%02x:%02x:%02x:%02x:%02x:%02x)", __func__, peer, peer->mac_addr.raw[0], peer->mac_addr.raw[1], peer->mac_addr.raw[2], peer->mac_addr.raw[3], @@ -1851,7 +1851,7 @@ ol_txrx_peer_find_by_addr(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac_addr) peer = ol_txrx_peer_find_hash_find(pdev, peer_mac_addr, 0, 0); if (peer) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, - "%s: Delete extra reference %p\n", __func__, peer); + "%s: Delete extra reference %p", __func__, peer); /* release the extra reference */ ol_txrx_peer_unref_delete(peer); } diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index c6569ce75358..3fa183ee1921 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -69,8 +69,8 @@ #define OL_TX_NUM_TIDS 18 #define OL_RX_MCAST_TID 18 /* Mcast TID only between f/w & host */ -#define OL_TX_VDEV_MCAST_BCAST 0 // HTT_TX_EXT_TID_MCAST_BCAST -#define OL_TX_VDEV_DEFAULT_MGMT 1 // HTT_TX_EXT_TID_DEFALT_MGMT +#define OL_TX_VDEV_MCAST_BCAST 0 /* HTT_TX_EXT_TID_MCAST_BCAST */ +#define OL_TX_VDEV_DEFAULT_MGMT 1 /* HTT_TX_EXT_TID_DEFALT_MGMT */ #define OL_TX_VDEV_NUM_QUEUES 2 #define OL_TXRX_MGMT_TYPE_BASE htt_pkt_num_types @@ -130,9 +130,9 @@ struct ol_tx_desc_t { cdf_nbuf_t netbuf; void *htt_tx_desc; uint16_t id; - uint32_t htt_tx_desc_paddr; + cdf_dma_addr_t htt_tx_desc_paddr; void *htt_frag_desc; /* struct msdu_ext_desc_t * */ - uint32_t htt_frag_desc_paddr; + cdf_dma_addr_t htt_frag_desc_paddr; cdf_atomic_t ref_cnt; enum htt_tx_status status; diff --git a/core/hdd/inc/wlan_hdd_ipa.h b/core/hdd/inc/wlan_hdd_ipa.h index 45e29b431a0a..d3c412548aee 100644 --- a/core/hdd/inc/wlan_hdd_ipa.h +++ b/core/hdd/inc/wlan_hdd_ipa.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -39,6 +39,19 @@ #ifdef IPA_OFFLOAD /* Include files */ +#include /* hdd_context_t */ + +/** + * FIXME: Temporary hack - until IPA functionality gets restored + * + */ +typedef void (*hdd_ipa_nbuf_cb_fn)(cdf_nbuf_t); +void hdd_ipa_nbuf_cb(cdf_nbuf_t skb); /* Fwd declare */ +static inline hdd_ipa_nbuf_cb_fn wlan_hdd_stub_ipa_fn(void) +{ + return hdd_ipa_nbuf_cb; +}; + CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); CDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 5d6cb265c65c..6873375443c8 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -469,6 +469,30 @@ struct hdd_ipa_priv { cdf_dma_addr_t rx_ready_doorbell_paddr; }; +/** + * FIXME: The following conversion routines will are just stubs. + * They will be implemented fully by another update. + * The stubs will let the compile go ahead, and functionality + * is broken. + * This should be OK and IPA is not enabled yet + */ +void *wlan_hdd_stub_priv_to_addr(uint32_t priv) +{ + void *vaddr; + uint32_t ipa_priv = priv; + + vaddr = &ipa_priv; /* just to use the var */ + vaddr = NULL; + return vaddr; +} + +uint32_t wlan_hdd_stub_addr_to_priv(void *ptr) +{ + uint32_t ipa_priv = 0; + + BUG_ON(ptr == NULL); + return ipa_priv; +} #define HDD_IPA_WLAN_CLD_HDR_LEN sizeof(struct hdd_ipa_cld_hdr) #define HDD_IPA_UC_WLAN_CLD_HDR_LEN 0 #define HDD_IPA_WLAN_TX_HDR_LEN sizeof(struct hdd_ipa_tx_hdr) @@ -2650,12 +2674,13 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, * * Return: None */ -static void hdd_ipa_nbuf_cb(cdf_nbuf_t skb) +void hdd_ipa_nbuf_cb(cdf_nbuf_t skb) { struct hdd_ipa_priv *hdd_ipa = ghdd_ipa; - HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "%lx", NBUF_OWNER_PRIV_DATA(skb)); - ipa_free_skb((struct ipa_rx_data *)NBUF_OWNER_PRIV_DATA(skb)); + HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); + /* FIXME: This is broken; PRIV_DATA is now 31 bits */ + ipa_free_skb((struct ipa_rx_data *)wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); hdd_ipa->stats.num_tx_comp_cnt++; @@ -2711,18 +2736,21 @@ static void hdd_ipa_send_pkt_to_tl( skb = ipa_tx_desc->skb; cdf_mem_set(skb->cb, sizeof(skb->cb), 0); - NBUF_OWNER_ID(skb) = IPA_NBUF_OWNER_ID; - NBUF_CALLBACK_FN(skb) = hdd_ipa_nbuf_cb; + cdf_nbuf_ipa_owned_set(skb); + /* FIXME: This is broken. No such field in cb any more: + NBUF_CALLBACK_FN(skb) = hdd_ipa_nbuf_cb; */ if (hdd_ipa_uc_sta_is_enabled(hdd_ipa->hdd_ctx)) { - NBUF_MAPPED_PADDR_LO(skb) = ipa_tx_desc->dma_addr - + HDD_IPA_WLAN_FRAG_HEADER - + HDD_IPA_WLAN_IPA_HEADER; + cdf_nbuf_mapped_paddr_set(skb, + ipa_tx_desc->dma_addr + + HDD_IPA_WLAN_FRAG_HEADER + + HDD_IPA_WLAN_IPA_HEADER); ipa_tx_desc->skb->len -= HDD_IPA_WLAN_FRAG_HEADER + HDD_IPA_WLAN_IPA_HEADER; } else - NBUF_MAPPED_PADDR_LO(skb) = ipa_tx_desc->dma_addr; + cdf_nbuf_mapped_paddr_set(skb, ipa_tx_desc->dma_addr); - NBUF_OWNER_PRIV_DATA(skb) = (unsigned long)ipa_tx_desc; + /* FIXME: This is broken: priv_data is 31 bits */ + cdf_nbuf_ipa_priv_set(skb, wlan_hdd_stub_addr_to_priv(ipa_tx_desc)); adapter->stats.tx_bytes += ipa_tx_desc->skb->len; diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 5ff2b9deeddb..1a51a05335b6 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -67,14 +67,14 @@ static int hdd_lro_get_skb_header(struct sk_buff *skb, void **ip_hdr, void **tcpudp_hdr, u64 *hdr_flags, void *priv) { - if (NBUF_IPV6_PROTO(skb)) { + if (NBUF_CB_RX_IPV6_PROTO(skb)) { hdr_flags = 0; return -EINVAL; } *hdr_flags |= (LRO_IPV4 | LRO_TCP); (*ip_hdr) = skb->data; - (*tcpudp_hdr) = skb->data + NBUF_TCP_OFFSET(skb); + (*tcpudp_hdr) = skb->data + NBUF_CB_RX_TCP_OFFSET(skb); return 0; } @@ -215,7 +215,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, struct hdd_lro_desc_info *desc_info = &adapter->lro_info.lro_desc_info; *lro_desc = NULL; - i = NBUF_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK; + i = NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK; lro_hash_table = &desc_info->lro_hash_table[i]; @@ -321,7 +321,7 @@ static bool hdd_lro_eligible(hdd_adapter_t *adapter, struct sk_buff *skb, { struct net_lro_desc *lro_desc = NULL; int hw_lro_eligible = - NBUF_LRO_ELIGIBLE(skb) && (!NBUF_TCP_PURE_ACK(skb)); + NBUF_CB_RX_LRO_ELIGIBLE(skb) && (!NBUF_CB_RX_TCP_PURE_ACK(skb)); if (!hw_lro_eligible) return false; @@ -624,12 +624,12 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx, enum hdd_lro_rx_status status = HDD_LRO_NO_RX; if ((adapter->dev->features & NETIF_F_LRO) && - NBUF_TCP_PROTO(skb)) { + NBUF_CB_RX_TCP_PROTO(skb)) { struct iphdr *iph; struct tcphdr *tcph; struct net_lro_desc *lro_desc = NULL; iph = (struct iphdr *)skb->data; - tcph = (struct tcphdr *)(skb->data + NBUF_TCP_OFFSET(skb)); + tcph = (struct tcphdr *)(skb->data + NBUF_CB_RX_TCP_OFFSET(skb)); if (hdd_lro_eligible(adapter, skb, iph, tcph, &lro_desc)) { struct net_lro_info hdd_lro_info; @@ -637,11 +637,11 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx, hdd_lro_info.lro_desc = lro_desc; hdd_lro_info.lro_eligible = 1; - hdd_lro_info.tcp_ack_num = NBUF_TCP_ACK_NUM(skb); + hdd_lro_info.tcp_ack_num = NBUF_CB_RX_TCP_ACK_NUM(skb); hdd_lro_info.tcp_data_csum = - csum_unfold(htons(NBUF_TCP_CHKSUM(skb))); - hdd_lro_info.tcp_seq_num = NBUF_TCP_SEQ_NUM(skb); - hdd_lro_info.tcp_win = NBUF_TCP_WIN(skb); + csum_unfold(htons(NBUF_CB_RX_TCP_CHKSUM(skb))); + hdd_lro_info.tcp_seq_num = NBUF_CB_RX_TCP_SEQ_NUM(skb); + hdd_lro_info.tcp_win = NBUF_CB_RX_TCP_WIN(skb); lro_receive_skb_ext(adapter->lro_info.lro_mgr, skb, (void *)adapter, &hdd_lro_info); diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 9ff767106bee..4865e30c6157 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -56,7 +56,7 @@ struct qca_napi_data *hdd_napi_get_all(void) struct qca_napi_data *rp = NULL; struct hif_opaque_softc *hif; - NAPI_DEBUG("-->\n"); + NAPI_DEBUG("-->"); hif = cds_get_context(CDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) @@ -64,7 +64,7 @@ struct qca_napi_data *hdd_napi_get_all(void) else rp = hif_napi_get_all(hif); - NAPI_DEBUG("<-- [addr=%p]\n", rp); + NAPI_DEBUG("<-- [addr=%p]", rp); return rp; } @@ -78,14 +78,14 @@ static uint32_t hdd_napi_get_map(void) { uint32_t map = 0; - NAPI_DEBUG("-->\n"); + NAPI_DEBUG("-->"); /* cache once, use forever */ if (hdd_napi_ctx == NULL) hdd_napi_ctx = hdd_napi_get_all(); if (hdd_napi_ctx != NULL) map = hdd_napi_ctx->ce_map; - NAPI_DEBUG("<--[map=0x%08x]\n", map); + NAPI_DEBUG("<-- [map=0x%08x]", map); return map; } @@ -108,7 +108,7 @@ int hdd_napi_create(void) int ul_polled, dl_polled; int rc = 0; - NAPI_DEBUG("-->\n"); + NAPI_DEBUG("-->"); hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) { @@ -140,7 +140,7 @@ int hdd_napi_create(void) } } } - NAPI_DEBUG("<-- [rc=%d]\n", rc); + NAPI_DEBUG("<-- [rc=%d]", rc); return rc; } @@ -162,7 +162,7 @@ int hdd_napi_destroy(int force) int i; uint32_t hdd_napi_map = hdd_napi_get_map(); - NAPI_DEBUG("--> (force=%d)\n", force); + NAPI_DEBUG("--> (force=%d)", force); if (hdd_napi_map) { struct hif_opaque_softc *hif_ctx; @@ -193,7 +193,7 @@ int hdd_napi_destroy(int force) if (0 == hdd_napi_map) hdd_napi_ctx = NULL; - NAPI_DEBUG("<-- [rc=%d]\n", rc); + NAPI_DEBUG("<-- [rc=%d]", rc); return rc; } @@ -241,7 +241,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data) int rc = -EFAULT; /* assume err */ struct hif_opaque_softc *hif; - NAPI_DEBUG("-->(event=%d, aux=%p)\n", event, data); + NAPI_DEBUG("-->(event=%d, aux=%p)", event, data); hif = cds_get_context(CDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) @@ -249,7 +249,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data) else rc = hif_napi_event(hif, event, data); - NAPI_DEBUG("<--[rc=%d]\n", rc); + NAPI_DEBUG("<--[rc=%d]", rc); return rc; } diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 698308566ae1..8abb284db862 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -258,7 +258,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; #if defined (IPA_OFFLOAD) - if (!(NBUF_OWNER_ID(skb) == IPA_NBUF_OWNER_ID)) { + if (!cdf_nbuf_ipa_owned_get(skb)) { #endif /* Check if the buffer has enough header room */ skb = skb_unshare(skb, GFP_ATOMIC); @@ -299,7 +299,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Zero out skb's context buffer for the driver to use */ cdf_mem_set(skb->cb, sizeof(skb->cb), 0); - NBUF_SET_PACKET_TRACK(skb, NBUF_TX_PKT_DATA_TRACK); + NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); cdf_dp_trace_set_track(skb); diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 2f3e4fe90d05..65e6204eba99 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -368,7 +368,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Get TL AC corresponding to Qdisc queue index/AC. */ ac = hdd_qdisc_ac_to_tl_ac[skb->queue_mapping]; - if (!(NBUF_OWNER_ID(skb) == IPA_NBUF_OWNER_ID)) { + if (!cdf_nbuf_ipa_owned_get(skb)) { /* Check if the buffer has enough header room */ skb = skb_unshare(skb, GFP_ATOMIC); if (!skb) @@ -476,7 +476,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Zero out skb's context buffer for the driver to use */ cdf_mem_set(skb->cb, sizeof(skb->cb), 0); - NBUF_SET_PACKET_TRACK(skb, NBUF_TX_PKT_DATA_TRACK); + NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); cdf_dp_trace_set_track(skb); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 7fa4971785c2..f82f428d586f 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2394,7 +2394,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, bufp += WMI_TLV_HDR_SIZE; cdf_mem_copy(bufp, pData, bufp_len); cdf_nbuf_map_single(cdf_ctx, tx_frame, CDF_DMA_TO_DEVICE); - dma_addr = cdf_nbuf_get_frag_paddr_lo(tx_frame, 0); + dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); #if defined(HELIUMPLUS_PADDR64) cmd->paddr_hi = (uint32_t)((dma_addr >> 32) & 0x1F); diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index d9da1626706c..94ea4847220a 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -220,7 +220,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, cmd->vdev_id = vdev_id; cmd->data_len = bcn->len; cmd->frame_ctrl = *((A_UINT16 *) wh->i_fc); - cmd->frag_ptr = cdf_nbuf_get_frag_paddr_lo(bcn->buf, 0); + cmd->frag_ptr = cdf_nbuf_get_frag_paddr(bcn->buf, 0); /* notify Firmware of DTM and mcast/bcast traffic */ if (tim_ie->dtim_count == 0) { -- cgit v1.2.3 From ce0dc99ca85170769a4ea0a68b30308743d3e409 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Tue, 16 Feb 2016 18:18:03 +0530 Subject: qcacld-3.0: Add qdf event API's Replace CDF event API's with QDF event API's Change-Id: I1d75c9ca01cc6bd7cac42f1ae4c1dd78f37b3d26 CRs-Fixed: 981188 --- core/cdf/inc/cdf_event.h | 154 -------------- core/cdf/inc/cdf_list.h | 1 + core/cdf/inc/cdf_lock.h | 1 + core/cdf/inc/cdf_mc_timer.h | 1 + core/cdf/inc/cdf_status.h | 1 + core/cdf/inc/cdf_trace.h | 1 + core/cdf/src/cdf_event.c | 270 ------------------------- core/cdf/src/i_cdf_atomic.h | 1 + core/cdf/src/i_cdf_defer.h | 1 + core/cdf/src/i_cdf_event.h | 62 ------ core/cdf/src/i_cdf_util.h | 1 + core/cds/inc/cds_api.h | 3 +- core/cds/inc/cds_crypto.h | 5 +- core/cds/inc/cds_mq.h | 35 ++-- core/cds/inc/cds_packet.h | 3 +- core/cds/inc/cds_sched.h | 37 ++-- core/cds/inc/cds_utils.h | 15 +- core/cds/src/cds_api.c | 74 +++---- core/cds/src/cds_concurrency.c | 45 +++-- core/dp/txrx/ol_txrx.c | 6 +- core/dp/txrx/ol_txrx_types.h | 2 +- core/hdd/inc/wlan_hdd_ftm.h | 3 +- core/hdd/inc/wlan_hdd_main.h | 6 +- core/hdd/inc/wlan_hdd_wext.h | 6 +- core/hdd/src/wlan_hdd_cfg80211.c | 20 +- core/hdd/src/wlan_hdd_driver_ops.c | 1 + core/hdd/src/wlan_hdd_ftm.c | 36 ++-- core/hdd/src/wlan_hdd_hostapd.c | 49 +++-- core/hdd/src/wlan_hdd_main.c | 25 +-- core/hdd/src/wlan_hdd_wext.c | 31 +-- core/mac/src/sys/common/inc/wlan_qct_sys.h | 27 +-- core/mac/src/sys/common/src/wlan_qct_sys.c | 27 +-- core/sme/inc/csr_internal.h | 1 + core/sme/inc/sme_inside.h | 3 +- core/sme/inc/sme_internal.h | 3 +- core/utils/logging/inc/wlan_logging_sock_svc.h | 3 +- core/utils/ptt/inc/wlan_ptt_sock_svc.h | 1 + core/utils/ptt/src/wlan_ptt_sock_svc.c | 6 +- core/wma/inc/wma.h | 21 +- core/wma/src/wma_data.c | 19 +- core/wma/src/wma_dev_if.c | 8 +- core/wma/src/wma_features.c | 42 ++-- 42 files changed, 305 insertions(+), 752 deletions(-) delete mode 100644 core/cdf/inc/cdf_event.h delete mode 100644 core/cdf/src/cdf_event.c delete mode 100644 core/cdf/src/i_cdf_event.h diff --git a/core/cdf/inc/cdf_event.h b/core/cdf/inc/cdf_event.h deleted file mode 100644 index e18588063636..000000000000 --- a/core/cdf/inc/cdf_event.h +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_EVENT_H) -#define __CDF_EVENT_H - -/** - * DOC: cdf_event.h - * - * Connectivity driver framework (CDF) events API - * - **/ - -/* Include Files */ -#include "cdf_status.h" -#include "cdf_types.h" -#include "i_cdf_event.h" - -/* Preprocessor definitions and constants */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_event_init() - initializes the specified event - * - * @event: Pointer to CDF event object to initialize - * - * Initializes the specified event. Upon successful initialization the state - * of the event becomes initialized and not signaled. - * - * Return: - * CDF_STATUS_SUCCESS - Event was successfully initialized and is ready to - * be used - * Otherwise failure CDF reason code - */ - -CDF_STATUS cdf_event_init(cdf_event_t *event); - -/** - * cdf_event_set() - set a CDF event - * - * @event: Pointer of CDF event to set to the signalled state - * - * The state of the specified event is set to 'signalled by calling - * cdf_event_set(). The state of the event remains signalled until an - * explicit call to cdf_event_reset(). - * - * Any threads waiting on the event as a result of a cdf_event_wait() will - * be unblocked and available to be scheduled for execution when the event - * is signaled by a call to cdf_event_set(). - * - * Return: - * CDF_STATUS_SUCCESS - Event was successfully set - * Otherwise failure CDF reason code - */ -CDF_STATUS cdf_event_set(cdf_event_t *event); - -/** - * cdf_event_reset() - reset a CDF event - * - * @event: Pointer of CDF event to reset - * - * The state of the specified event is set to 'NOT signalled' by calling - * cdf_event_reset(). The state of the event remains NOT signalled until an - * explicit call to cdf_event_set(). - * - * This function sets the event to a NOT signalled state even if the event was - * signalled multiple times before being signaled. - * - * Return: - * CDF_STATUS_SUCCESS - Event was successfully reset - * Otherwise failure CDF reason code - */ -CDF_STATUS cdf_event_reset(cdf_event_t *event); - -/** - * cdf_event_destroy() - destroy a CDF event - * - * @event: Pointer of CDF event to destroy - * - * The function destroys the event object referenced by event. - * After a successful return from cdf_event_destroy() the event object becomes, - * in effect, uninitialized. - * - * A destroyed event object can be reinitialized using cdf_event_init(); - * the results of otherwise referencing the object after it has been destroyed - * are undefined. Calls to CDF event functions to manipulate the lock such - * as cdf_event_set() will fail if the event is destroyed. Therefore, - * don't use the event after it has been destroyed until it has - * been re-initialized. - * - * Return: - * CDF_STATUS_SUCCESS - Event was successfully destroyed - * Otherwise failure CDF reason code - */ -CDF_STATUS cdf_event_destroy(cdf_event_t *event); - -/** - * cdf_wait_single_event() - wait for a single input CDF event to be set - * - * @event: Pointer of CDF event to wait on - * @timeout: Timeout value in milli seconds - * - * This API waits for the event to be set. This function returns - * if this interval elapses, regardless if any of the events have - * been set. An input value of 0 for this timeout parameter means - * to wait infinitely, meaning a timeout will never occur. - * - * - * Return: - * CDF_STATUS_SUCCESS - the wait was satisifed by the event being - * set. - * - * CDF_STATUS_E_TIMEOUT - the timeout interval elapsed before the - * event was set. - * - * CDF_STATUS_E_INVAL - The value specified by event is invalid. - */ -CDF_STATUS cdf_wait_single_event(cdf_event_t *pEvent, - uint32_t timeout); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* __CDF_EVENT_H */ diff --git a/core/cdf/inc/cdf_list.h b/core/cdf/inc/cdf_list.h index 2076e1c3988e..427847a91bef 100644 --- a/core/cdf/inc/cdf_list.h +++ b/core/cdf/inc/cdf_list.h @@ -50,6 +50,7 @@ /* Include Files */ #include #include +#include #include #include diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h index 83a5c4164e01..a477f9b586b7 100644 --- a/core/cdf/inc/cdf_lock.h +++ b/core/cdf/inc/cdf_lock.h @@ -40,6 +40,7 @@ /* Include Files */ #include "cdf_status.h" +#include "qdf_status.h" #include "i_cdf_lock.h" /* Preprocessor definitions and constants */ diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index b8740d78315e..c0992e9911a4 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -37,6 +37,7 @@ /* Include Files */ #include #include +#include #include #include diff --git a/core/cdf/inc/cdf_status.h b/core/cdf/inc/cdf_status.h index 635b4ad33bc2..306209105bd5 100644 --- a/core/cdf/inc/cdf_status.h +++ b/core/cdf/inc/cdf_status.h @@ -28,6 +28,7 @@ #if !defined(__CDF_STATUS_H) #define __CDF_STATUS_H +#include /** * DOC: cdf_status * diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h index bbf78b9cf6b6..fd0e41d44c58 100644 --- a/core/cdf/inc/cdf_trace.h +++ b/core/cdf/inc/cdf_trace.h @@ -41,6 +41,7 @@ #include /* For CDF_MODULE_ID... */ #include /* For va_list... */ #include +#include #include #include #include diff --git a/core/cdf/src/cdf_event.c b/core/cdf/src/cdf_event.c deleted file mode 100644 index ce39b4854636..000000000000 --- a/core/cdf/src/cdf_event.c +++ /dev/null @@ -1,270 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_event.c - * - * This source file contains linux specific definitions for CDF event APIs - * The APIs mentioned in this file are used for initializing, setting, - * resetting, destroying an event and waiting on an occurance of an event - * among multiple events. - */ - -/* Include Files */ -#include "cdf_event.h" -#include "cdf_trace.h" - -/* Preprocessor Definitions and Constants */ - -/* Type Declarations */ - -/* Global Data Definitions */ - -/* Static Variable Definitions */ - -/* Function Definitions and Documentation */ - -/** - * cdf_event_init() - initializes a CDF event - * @event: Pointer to the opaque event object to initialize - * - * The cdf_event_init() function initializes the specified event. Upon - * successful initialization, the state of the event becomes initialized - * and not signaled. - * - * An event must be initialized before it may be used in any other event - * functions. - * - * Attempting to initialize an already initialized event results in - * a failure. - * - * Return: CDF status - */ -CDF_STATUS cdf_event_init(cdf_event_t *event) -{ - /* check for null pointer */ - if (NULL == event) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "NULL event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check for 'already initialized' event */ - if (LINUX_EVENT_COOKIE == event->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Initialized event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_BUSY; - } - - /* initialize new event */ - init_completion(&event->complete); - event->cookie = LINUX_EVENT_COOKIE; - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_event_set() - sets a CDF event - * @event: The event to set to the signalled state - * - * The state of the specified event is set to signalled by calling - * cdf_event_set(). - * - * Any threads waiting on the event as a result of a cdf_event_wait() will - * be unblocked and available to be scheduled for execution when the event - * is signaled by a call to cdf_event_set(). - * - * - * Return: CDF status - */ - -CDF_STATUS cdf_event_set(cdf_event_t *event) -{ - /* check for null pointer */ - if (NULL == event) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "NULL event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check if event refers to an initialized object */ - if (LINUX_EVENT_COOKIE != event->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Uninitialized event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; - } - - complete(&event->complete); - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_event_reset() - resets a CDF event - * @event: The event to set to the NOT signalled state - * - * This function isn't required for Linux. Therefore, it doesn't do much. - * - * The state of the specified event is set to 'NOT signalled' by calling - * cdf_event_reset(). The state of the event remains NOT signalled until an - * explicit call to cdf_event_set(). - * - * This function sets the event to a NOT signalled state even if the event was - * signalled multiple times before being signaled. - * - * - * Return: CDF status - */ -CDF_STATUS cdf_event_reset(cdf_event_t *event) -{ - /* check for null pointer */ - if (NULL == event) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "NULL event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check to make sure it is an 'already initialized' event */ - if (LINUX_EVENT_COOKIE != event->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Uninitialized event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; - } - - /* (re)initialize event */ - INIT_COMPLETION(event->complete); - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_event_destroy() - Destroys a CDF event - * @event: The event object to be destroyed. - * - * This function doesn't do much in Linux. There is no need for the caller - * to explicitly destroy an event after use. - * - * The os_event_destroy() function shall destroy the event object - * referenced by event. After a successful return from cdf_event_destroy() - * the event object becomes, in effect, uninitialized. - * - * A destroyed event object can be reinitialized using cdf_event_init(); - * the results of otherwise referencing the object after it has been destroyed - * are undefined. Calls to CDF event functions to manipulate the lock such - * as cdf_event_set() will fail if the event is destroyed. Therefore, - * don't use the event after it has been destroyed until it has - * been re-initialized. - * - * Return: CDF status - */ - -CDF_STATUS cdf_event_destroy(cdf_event_t *event) -{ - /* check for null pointer */ - if (NULL == event) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "NULL event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check to make sure it is an 'already initialized' event */ - if (LINUX_EVENT_COOKIE != event->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Uninitialized event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; - } - - /* make sure nobody is waiting on the event */ - complete_all(&event->complete); - - /* destroy the event */ - memset(event, 0, sizeof(cdf_event_t)); - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_wait_single_event() - Waits for a single event to be set. - * - * This API waits for the event to be set. - * - * @pEvent: Pointer to an event to wait on. - * @timeout: Timeout value (in milliseconds). This function returns - * if this interval elapses, regardless if any of the events have - * been set. An input value of 0 for this timeout parameter means - * to wait infinitely, meaning a timeout will never occur. - * - * Return: CDF status - */ -CDF_STATUS cdf_wait_single_event(cdf_event_t *event, uint32_t timeout) -{ - if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "%s cannot be called from interrupt context!!!", - __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check for null pointer */ - if (NULL == event) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "NULL event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; - } - - /* check if cookie is same as that of initialized event */ - if (LINUX_EVENT_COOKIE != event->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Uninitialized event passed into %s", __func__); - CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; - } - - if (timeout) { - long ret; - ret = wait_for_completion_timeout(&event->complete, - msecs_to_jiffies(timeout)); - if (0 >= ret) - return CDF_STATUS_E_TIMEOUT; - } else { - CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "Zero timeout value passed into %s", __func__); - return CDF_STATUS_E_FAULT; - } - - return CDF_STATUS_SUCCESS; -} diff --git a/core/cdf/src/i_cdf_atomic.h b/core/cdf/src/i_cdf_atomic.h index 178c3275b490..9a0f89b09547 100644 --- a/core/cdf/src/i_cdf_atomic.h +++ b/core/cdf/src/i_cdf_atomic.h @@ -28,6 +28,7 @@ #define I_CDF_ATOMIC_H #include /* CDF_STATUS */ +#include /* QDF_STATUS */ #include diff --git a/core/cdf/src/i_cdf_defer.h b/core/cdf/src/i_cdf_defer.h index a21b618f5434..11bc076421b6 100644 --- a/core/cdf/src/i_cdf_defer.h +++ b/core/cdf/src/i_cdf_defer.h @@ -36,6 +36,7 @@ #endif #include #include +#include #include typedef struct tasklet_struct __cdf_bh_t; diff --git a/core/cdf/src/i_cdf_event.h b/core/cdf/src/i_cdf_event.h deleted file mode 100644 index beac5d93fd2b..000000000000 --- a/core/cdf/src/i_cdf_event.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__I_CDF_EVENT_H) -#define __I_CDF_EVENT_H - -/** - * DOC: i_cdf_event.h - * - * Linux-specific definitions for CDF Events - */ - -/* Include Files */ -#include -#include - -/* Preprocessor definitions and constants */ -#define LINUX_EVENT_COOKIE 0x12341234 - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) -#define INIT_COMPLETION(event) reinit_completion(&event) -#endif - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* Type declarations */ - -typedef struct evt { - struct completion complete; - uint32_t cookie; -} cdf_event_t; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* __I_CDF_EVENT_H */ diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h index 80ab1ae7ddf8..68977de5dc77 100644 --- a/core/cdf/src/i_cdf_util.h +++ b/core/cdf/src/i_cdf_util.h @@ -37,6 +37,7 @@ #include #include +#include #include /* * Generic compiler-dependent macros if defined by the OS diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 3356003e88dd..0852d199cf49 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -36,10 +36,11 @@ #include #include +#include #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 25fbfdfd7bc7..daa01b4cbc67 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -36,10 +36,11 @@ #include #include +#include #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index 8f76bee22447..74b396d94a4e 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __CDS_MQ_H ) +#if !defined(__CDS_MQ_H) #define __CDS_MQ_H /**========================================================================= @@ -43,6 +43,7 @@ ------------------------------------------------------------------------*/ #include #include +#include /*-------------------------------------------------------------------------- Preprocessor definitions and constants @@ -120,24 +121,24 @@ typedef enum { \param msgQueueId - identifies the message queue upon which the message - will be posted. + will be posted. \param message - a pointer to a message buffer. Memory for this message - buffer is allocated by the caller and free'd by the CDF after the - message is posted to the message queue. If the consumer of the - message needs anything in this message, it needs to copy the contents - before returning from the message queue handler. + buffer is allocated by the caller and free'd by the CDF after the + message is posted to the message queue. If the consumer of the + message needs anything in this message, it needs to copy the contents + before returning from the message queue handler. \return CDF_STATUS_SUCCESS - the message has been successfully posted - to the message queue. + to the message queue. - CDF_STATUS_E_INVAL - The value specified by msgQueueId does not - refer to a valid Message Queue Id. + CDF_STATUS_E_INVAL - The value specified by msgQueueId does not + refer to a valid Message Queue Id. - CDF_STATUS_E_FAULT - message is an invalid pointer. + CDF_STATUS_E_FAULT - message is an invalid pointer. - CDF_STATUS_E_FAILURE - the message queue handler has reported - an unknown failure. + CDF_STATUS_E_FAILURE - the message queue handler has reported + an unknown failure. \sa @@ -149,13 +150,13 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); \brief cds_send_mb_message_to_mac() - post a message to a message queue \param pBuf is a buffer allocated by caller. The actual structure varies - base on message type + base on message type \return CDF_STATUS_SUCCESS - the message has been successfully posted - to the message queue. + to the message queue. - CDF_STATUS_E_FAILURE - the message queue handler has reported - an unknown failure. + CDF_STATUS_E_FAILURE - the message queue handler has reported + an unknown failure. \sa --------------------------------------------------------------------------*/ diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 1fb7de36ab25..14940f3a0de3 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __CDS_PKT_H ) +#if !defined(__CDS_PKT_H) #define __CDS_PKT_H /**========================================================================= @@ -43,6 +43,7 @@ ------------------------------------------------------------------------*/ #include #include +#include /*-------------------------------------------------------------------------- Preprocessor definitions and constants diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 0d8d5003c81c..8186e50e91e8 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __CDS_SCHED_H ) +#if !defined(__CDS_SCHED_H) #define __CDS_SCHED_H /**========================================================================= @@ -39,7 +39,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include "i_cdf_types.h" #include #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) @@ -250,11 +250,11 @@ typedef struct _cds_context_type { /* MAC Module Context */ void *pMACContext; - cdf_event_t ProbeEvent; + qdf_event_t ProbeEvent; uint32_t driver_state; - cdf_event_t wmaCompleteEvent; + qdf_event_t wmaCompleteEvent; /* WMA Context */ void *pWMAContext; @@ -284,7 +284,7 @@ typedef struct _cds_context_type { uint32_t fw_debug_log_level; struct cds_log_complete log_complete; cdf_spinlock_t bug_report_lock; - cdf_event_t connection_update_done_evt; + qdf_event_t connection_update_done_evt; cdf_mutex_t cdf_conc_list_lock; } cds_context_type, *p_cds_contextType; @@ -372,22 +372,21 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); \param p_cds_context - pointer to the global CDF Context \param p_cds_sched_context - pointer to a previously allocated buffer big - enough to hold a scheduler context. - \ + enough to hold a scheduler context. \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and - is ready to be used. + is ready to be used. - CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable to initilize the scheduler + CDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable to initilize the scheduler - CDF_STATUS_E_NOMEM - insufficient memory exists to initialize - the scheduler + CDF_STATUS_E_NOMEM - insufficient memory exists to initialize + the scheduler - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open - function + CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_open() @@ -411,12 +410,12 @@ CDF_STATUS cds_sched_open(void *p_cds_context, \param p_cds_context - pointer to the global CDF Context \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and - is ready to be used. + is ready to be used. - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open - function + CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_close() diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index 5e4b2f61d6ea..3604b754c83d 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __CDS_UTILS_H ) +#if !defined(__CDS_UTILS_H) #define __CDS_UTILS_H /**========================================================================= @@ -43,7 +43,8 @@ ------------------------------------------------------------------------*/ #include #include -#include +#include +#include #include "ani_global.h" /*-------------------------------------------------------------------------- @@ -132,9 +133,9 @@ CDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, * */ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ - uint8_t * text, /* pointer to data stream */ + uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ - uint8_t * key, /* pointer to authentication key */ + uint8_t *key, /* pointer to authentication key */ uint32_t keyLen, /* length of authentication key */ uint8_t digest[CDS_DIGEST_SHA1_SIZE]); /* caller digest to be filled in */ @@ -161,9 +162,9 @@ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ * */ CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ - uint8_t * text, /* pointer to data stream */ + uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ - uint8_t * key, /* pointer to authentication key */ + uint8_t *key, /* pointer to authentication key */ uint32_t keyLen, /* length of authentication key */ uint8_t digest[CDS_DIGEST_MD5_SIZE]); /* caller digest to be filled in */ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 6e3f9ffa0568..9d1165720d5b 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -194,14 +194,14 @@ CDF_STATUS cds_open(void) cds_init_log_completion(); /* Initialize the probe event */ - if (cdf_event_init(&gp_cds_context->ProbeEvent) != CDF_STATUS_SUCCESS) { + if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); return CDF_STATUS_E_FAILURE; } - if (cdf_event_init(&(gp_cds_context->wmaCompleteEvent)) != - CDF_STATUS_SUCCESS) { + if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init wmaCompleteEvent", __func__); CDF_ASSERT(0); @@ -470,10 +470,10 @@ err_msg_queue: cds_mq_deinit(&gp_cds_context->freeVosMq); err_wma_complete_event: - cdf_event_destroy(&gp_cds_context->wmaCompleteEvent); + qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); err_probe_event: - cdf_event_destroy(&gp_cds_context->ProbeEvent); + qdf_event_destroy(&gp_cds_context->ProbeEvent); return CDF_STATUS_E_FAILURE; } /* cds_open() */ @@ -487,6 +487,7 @@ err_probe_event: CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) { CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); @@ -520,7 +521,7 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) } /* Reset wma wait event */ - cdf_event_reset(&gp_cds_context->wmaCompleteEvent); + qdf_event_reset(&gp_cds_context->wmaCompleteEvent); /*call WMA pre start */ cdf_status = wma_pre_start(gp_cds_context); @@ -532,10 +533,10 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) } /* Need to update time out of complete */ - cdf_status = cdf_wait_single_event(&gp_cds_context->wmaCompleteEvent, + qdf_status = qdf_wait_single_event(&gp_cds_context->wmaCompleteEvent, CDS_WMA_TIMEOUT); - if (cdf_status != CDF_STATUS_SUCCESS) { - if (cdf_status == CDF_STATUS_E_TIMEOUT) { + if (qdf_status != QDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_E_TIMEOUT) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); @@ -593,6 +594,7 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDF_STATUS cds_enable(v_CONTEXT_t cds_context) { CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSirRetStatus sirStatus = eSIR_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; tHalMacStartParameters halStartParams; @@ -679,7 +681,7 @@ err_mac_stop: mac_stop(p_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET); err_wma_stop: - cdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); + qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); cdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -687,11 +689,11 @@ err_wma_stop: CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); wma_setneedshutdown(cds_context); } else { - cdf_status = - cdf_wait_single_event(&(gp_cds_context->wmaCompleteEvent), + qdf_status = + qdf_wait_single_event(&(gp_cds_context->wmaCompleteEvent), CDS_WMA_TIMEOUT); - if (cdf_status != CDF_STATUS_SUCCESS) { - if (cdf_status == CDF_STATUS_E_TIMEOUT) { + if (qdf_status != QDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_E_TIMEOUT) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Timeout occurred before WMA_stop complete", @@ -724,7 +726,7 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) * pending responses will not be handled during uninitialization of * WLAN driver */ - cdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); + qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); cdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); @@ -758,6 +760,7 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) CDF_STATUS cds_close(v_CONTEXT_t cds_context) { CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_status = wma_wmi_work_close(cds_context); if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { @@ -813,18 +816,18 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); - cdf_status = cdf_event_destroy(&gp_cds_context->wmaCompleteEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - cdf_status = cdf_event_destroy(&gp_cds_context->ProbeEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_deinit_log_completion(); @@ -1357,9 +1360,9 @@ void cds_sys_probe_thread_cback(void *pUserData) return; } - if (cdf_event_set(&gp_cds_context->ProbeEvent) != CDF_STATUS_SUCCESS) { + if (qdf_event_set(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: cdf_event_set failed", __func__); + "%s: qdf_event_set failed", __func__); return; } } /* cds_sys_probe_thread_cback() */ @@ -1378,10 +1381,10 @@ void cds_wma_complete_cback(void *pUserData) return; } - if (cdf_event_set(&gp_cds_context->wmaCompleteEvent) != - CDF_STATUS_SUCCESS) { + if (qdf_event_set(&gp_cds_context->wmaCompleteEvent) != + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: cdf_event_set failed", __func__); + "%s: qdf_event_set failed", __func__); return; } } /* cds_wma_complete_cback() */ @@ -1430,6 +1433,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) { CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); ol_txrx_pdev_detach(gp_cds_context->pdev_txrx_ctx, 1); @@ -1495,18 +1499,18 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); - cdf_status = cdf_event_destroy(&gp_cds_context->wmaCompleteEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - cdf_status = cdf_event_destroy(&gp_cds_context->ProbeEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } return CDF_STATUS_SUCCESS; @@ -1615,7 +1619,7 @@ bool cds_is_packet_log_enabled(void) void cds_trigger_recovery(void) { tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -1625,10 +1629,10 @@ void cds_trigger_recovery(void) wma_crash_inject(wma_handle, RECOVERY_SIM_SELF_RECOVERY, 0); - status = cdf_wait_single_event(&wma_handle->recovery_event, + status = qdf_wait_single_event(&wma_handle->recovery_event, WMA_CRASH_INJECT_TIMEOUT); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "CRASH_INJECT command is timed out!"); #ifdef CONFIG_CNSS diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 39b2f0a1cb30..a7b62e7e9040 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -7262,6 +7262,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); #ifdef CFG80211_DEL_STA_V2 struct tagCsrDelStaParams delStaParams; @@ -7288,14 +7289,14 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) #endif hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); - cdf_event_reset(&hostapd_state->cdf_stop_bss_event); + qdf_event_reset(&hostapd_state->cdf_stop_bss_event); if (CDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { - cdf_status = - cdf_wait_single_event(&hostapd_state-> + qdf_status = + qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, BSS_WAIT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("SAP Stop Failed"); goto end; } @@ -7320,10 +7321,10 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) } cds_info("Waiting for SAP to start"); - cdf_status = - cdf_wait_single_event(&hostapd_state->cdf_event, + qdf_status = + qdf_wait_single_event(&hostapd_state->cdf_event, BSS_WAIT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("SAP Start failed"); goto end; } @@ -7743,7 +7744,7 @@ bool cds_is_sta_active_connection_exists(void) */ CDF_STATUS cdf_wait_for_connection_update(void) { - CDF_STATUS status; + QDF_STATUS status; p_cds_contextType cds_context; cds_context = cds_get_global_context(); @@ -7752,11 +7753,11 @@ CDF_STATUS cdf_wait_for_connection_update(void) return CDF_STATUS_E_FAILURE; } - status = cdf_wait_single_event( + status = qdf_wait_single_event( &cds_context->connection_update_done_evt, CONNECTION_UPDATE_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wait for event failed"); return CDF_STATUS_E_FAILURE; } @@ -7773,7 +7774,7 @@ CDF_STATUS cdf_wait_for_connection_update(void) */ CDF_STATUS cdf_reset_connection_update(void) { - CDF_STATUS status; + QDF_STATUS status; p_cds_contextType cds_context; cds_context = cds_get_global_context(); @@ -7782,9 +7783,9 @@ CDF_STATUS cdf_reset_connection_update(void) return CDF_STATUS_E_FAILURE; } - status = cdf_event_reset(&cds_context->connection_update_done_evt); + status = qdf_event_reset(&cds_context->connection_update_done_evt); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("clear event failed"); return CDF_STATUS_E_FAILURE; } @@ -7801,23 +7802,23 @@ CDF_STATUS cdf_reset_connection_update(void) */ CDF_STATUS cdf_set_connection_update(void) { - CDF_STATUS status; + QDF_STATUS status; p_cds_contextType cds_context; cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - status = cdf_event_set(&cds_context->connection_update_done_evt); + status = qdf_event_set(&cds_context->connection_update_done_evt); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("set event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7829,7 +7830,7 @@ CDF_STATUS cdf_set_connection_update(void) */ CDF_STATUS cdf_init_connection_update(void) { - CDF_STATUS status; + QDF_STATUS qdf_status; p_cds_contextType cds_context; cds_context = cds_get_global_context(); @@ -7838,9 +7839,9 @@ CDF_STATUS cdf_init_connection_update(void) return CDF_STATUS_E_FAILURE; } - status = cdf_event_init(&cds_context->connection_update_done_evt); + qdf_status = qdf_event_create(&cds_context->connection_update_done_evt); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("init event failed"); return CDF_STATUS_E_FAILURE; } diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index ef86e3abb5f4..6fd096a8b528 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1332,7 +1332,7 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, peer_mac_addr[4], peer_mac_addr[5]); if (cdf_atomic_read(&temp_peer->delete_in_progress)) { vdev->wait_on_peer_id = temp_peer->local_id; - cdf_event_init(&vdev->wait_delete_comp); + qdf_event_create(&vdev->wait_delete_comp); wait_on_deletion = true; } else { cdf_spin_unlock_bh(&pdev->peer_ref_mutex); @@ -1344,7 +1344,7 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, if (wait_on_deletion) { /* wait for peer deletion */ - rc = cdf_wait_single_event(&vdev->wait_delete_comp, + rc = qdf_wait_single_event(&vdev->wait_delete_comp, cdf_system_msecs_to_ticks(PEER_DELETION_TIMEOUT)); if (!rc) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -1729,7 +1729,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) * with registered peer id. */ if (peer_id == vdev->wait_on_peer_id) { - cdf_event_set(&vdev->wait_delete_comp); + qdf_event_set(&vdev->wait_delete_comp); vdev->wait_on_peer_id = OL_TXRX_INVALID_LOCAL_PEER_ID; } diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 3fa183ee1921..da06c7ded089 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -849,7 +849,7 @@ struct ol_txrx_vdev_t { ol_txrx_tx_flow_control_fp osif_flow_control_cb; void *osif_fc_ctx; uint16_t wait_on_peer_id; - cdf_event_t wait_delete_comp; + qdf_event_t wait_delete_comp; #if defined(FEATURE_TSO) struct { int pool_elems; /* total number of elements in the pool */ diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h index c9ed3557052c..0571dc5b95bc 100644 --- a/core/hdd/inc/wlan_hdd_ftm.h +++ b/core/hdd/inc/wlan_hdd_ftm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,6 +35,7 @@ */ #include "cdf_status.h" +#include "qdf_status.h" #include "cds_mq.h" #include "cds_api.h" #include "msg.h" diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 6eca6692ecf3..57139a07c97d 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -399,7 +399,7 @@ typedef enum { typedef struct roaming_info_s { HDD_ROAM_STATE roamingState; - cdf_event_t roamingEvent; + qdf_event_t roamingEvent; tSirMacAddr bssid; tSirMacAddr peerMac; @@ -672,8 +672,8 @@ struct hdd_station_ctx { #define BSS_START 1 typedef struct hdd_hostapd_state_s { int bssState; - cdf_event_t cdf_event; - cdf_event_t cdf_stop_bss_event; + qdf_event_t cdf_event; + qdf_event_t cdf_stop_bss_event; CDF_STATUS cdf_status; bool bCommit; diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index 428e4f76160c..ca84c666724b 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -34,7 +34,7 @@ #include #include #include -#include "cdf_event.h" +#include "qdf_event.h" /* * order of parameters in addTs private ioctl @@ -250,9 +250,9 @@ typedef struct hdd_wext_state_s { int32_t authKeyMgmt; /* cdf event */ - cdf_event_t hdd_cdf_event; + qdf_event_t hdd_cdf_event; - cdf_event_t scanevent; + qdf_event_t scanevent; /**Counter measure state, Started/Stopped*/ bool mTKIPCounterMeasures; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 886fd3547396..018e3b58ae0f 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9332,8 +9332,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, return status; if (NULL != - params->chandef.chan) - { + params->chandef.chan) { uint32_t numChans = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint8_t validChan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); @@ -9831,6 +9830,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_hostapd_state_t *hapd_state; int status; uint8_t staId; @@ -9892,7 +9892,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, DFS_CAC_IN_PROGRESS) goto fn_end; - cdf_event_reset(&hapd_state->cdf_event); + qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); cdf_status = @@ -9901,12 +9901,12 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (CDF_IS_STATUS_SUCCESS(cdf_status)) { pAdapter->aStaInfo[i]. isDeauthInProgress = true; - cdf_status = - cdf_wait_single_event( + qdf_status = + qdf_wait_single_event( &hapd_state->cdf_event, 1000); - if (!CDF_IS_STATUS_SUCCESS( - cdf_status)) + if (!QDF_IS_STATUS_SUCCESS( + qdf_status)) hddLog(LOGE, "%s: Deauth wait time expired", __func__); @@ -9956,7 +9956,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (pHddCtx->dev_dfs_cac_status == DFS_CAC_IN_PROGRESS) goto fn_end; - cdf_event_reset(&hapd_state->cdf_event); + qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); cdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); @@ -9969,10 +9969,10 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, MAC_ADDR_ARRAY(mac)); return -ENOENT; } else { - cdf_status = cdf_wait_single_event( + qdf_status = qdf_wait_single_event( &hapd_state->cdf_event, 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, "%s: Deauth wait time expired", __func__); diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 85abb7cf97de..c66dcbbfe2c9 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -39,6 +39,7 @@ #endif /* HIF_PCI */ #include "cds_api.h" #include "cdf_status.h" +#include "qdf_status.h" #include "cdf_lock.h" #include "cds_sched.h" #include "osdep.h" diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 4cd57dce2982..65585520d064 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -195,15 +195,15 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, } /* Initialize the probe event */ - if (cdf_event_init(&gp_cds_context->ProbeEvent) != CDF_STATUS_SUCCESS) { + if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); return CDF_STATUS_E_FAILURE; } - if (cdf_event_init(&(gp_cds_context->wmaCompleteEvent)) != - CDF_STATUS_SUCCESS) { + if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init wmaCompleteEvent", __func__); CDF_ASSERT(0); @@ -392,10 +392,10 @@ err_msg_queue: cds_mq_deinit(&gp_cds_context->freeVosMq); err_wma_complete_event: - cdf_event_destroy(&gp_cds_context->wmaCompleteEvent); + qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); err_probe_event: - cdf_event_destroy(&gp_cds_context->ProbeEvent); + qdf_event_destroy(&gp_cds_context->ProbeEvent); return CDF_STATUS_E_FAILURE; @@ -412,6 +412,7 @@ err_probe_event: static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) { CDF_STATUS cdf_status; + QDF_STATUS qdf_status; p_cds_contextType gp_cds_context = (p_cds_contextType) cds_context; #ifndef QCA_WIFI_FTM @@ -457,20 +458,20 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); - cdf_status = cdf_event_destroy(&gp_cds_context->ProbeEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy ProbeEvent %d", __func__, - cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - cdf_status = cdf_event_destroy(&gp_cds_context->wmaCompleteEvent); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy wmaCompleteEvent %d", __func__, - cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } return CDF_STATUS_SUCCESS; @@ -489,6 +490,7 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) { CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; #if defined(QCA_WIFI_FTM) p_cds_contextType gp_cds_context = @@ -504,7 +506,7 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) } /* Reset WMA wait event */ - cdf_event_reset(&p_cds_context->wmaCompleteEvent); + qdf_event_reset(&p_cds_context->wmaCompleteEvent); /*call WMA pre start */ vStatus = wma_pre_start(p_cds_context); @@ -516,10 +518,10 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) } /* Need to update time out of complete */ - vStatus = cdf_wait_single_event(&p_cds_context->wmaCompleteEvent, + qdf_status = qdf_wait_single_event(&p_cds_context->wmaCompleteEvent, HDD_FTM_WMA_PRE_START_TIMEOUT); - if (vStatus != CDF_STATUS_SUCCESS) { - if (vStatus == CDF_STATUS_E_TIMEOUT) { + if (qdf_status != QDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_E_TIMEOUT) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0a568e51c3a5..f10dcb8cff66 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -857,6 +857,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, int i = 0; uint8_t staId; CDF_STATUS cdf_status; + QDF_STATUS qdf_status; bool bWPSState; bool bAuthRequired = true; tpSap_AssocMacAddr pAssocStasArray = NULL; @@ -933,9 +934,9 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHostapdState->cdf_status = pSapEvent->sapevt.sapStartBssCompleteEvent.status; - cdf_status = cdf_event_set(&pHostapdState->cdf_event); + qdf_status = qdf_event_set(&pHostapdState->cdf_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status) + if (!QDF_IS_STATUS_SUCCESS(qdf_status) || pHostapdState->cdf_status) { hddLog(LOGE, ("ERROR: startbss event failed!!")); goto stopbss; @@ -1443,8 +1444,8 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, " disassociated " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); - cdf_status = cdf_event_set(&pHostapdState->cdf_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = qdf_event_set(&pHostapdState->cdf_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, "ERR: Station Deauth event Set failed"); if (pSapEvent->sapevt.sapStationDisassocCompleteEvent.reason == @@ -1863,7 +1864,7 @@ stopbss: * not be touched since they are now subject to being deleted * by another thread */ if (eSAP_STOP_BSS_EVENT == sapEvent) - cdf_event_set(&pHostapdState->cdf_stop_bss_event); + qdf_event_set(&pHostapdState->cdf_stop_bss_event); /* notify userspace that the BSS has stopped */ memset(&we_custom_event, '\0', sizeof(we_custom_event)); @@ -5035,6 +5036,7 @@ __iw_softap_stopbss(struct net_device *dev, { hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; ENTER(); @@ -5048,7 +5050,7 @@ __iw_softap_stopbss(struct net_device *dev, hdd_hostapd_state_t *pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); - cdf_event_reset(&pHostapdState->cdf_stop_bss_event); + qdf_event_reset(&pHostapdState->cdf_stop_bss_event); #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter)); @@ -5058,12 +5060,12 @@ __iw_softap_stopbss(struct net_device *dev, pcds_context); #endif if (CDF_IS_STATUS_SUCCESS(status)) { - status = - cdf_wait_single_event(&pHostapdState-> + qdf_status = + qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, 10000); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("wait for single_event failed!!")); CDF_ASSERT(0); @@ -5989,6 +5991,7 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); CDF_STATUS status; + QDF_STATUS qdf_status; #ifdef WLAN_FEATURE_MBSSID v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; v_CONTEXT_t sapContext = NULL; @@ -6033,23 +6036,23 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) return status; } - status = cdf_event_init(&phostapdBuf->cdf_event); - if (!CDF_IS_STATUS_SUCCESS(status)) { + qdf_status = qdf_event_create(&phostapdBuf->cdf_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, ("ERROR: Hostapd HDD cdf event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); #endif - return status; + return qdf_status; } - status = cdf_event_init(&phostapdBuf->cdf_stop_bss_event); - if (!CDF_IS_STATUS_SUCCESS(status)) { + qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: Hostapd HDD stop bss event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); #endif - return status; + return qdf_status; } init_completion(&pAdapter->session_close_comp_var); @@ -7314,6 +7317,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, eCsrEncryptionType RSNEncryptType; eCsrEncryptionType mcRSNEncryptType; int status = CDF_STATUS_SUCCESS, ret; + int qdf_status = QDF_STATUS_SUCCESS; tpWLAN_SAPEventCB pSapEventCallback; hdd_hostapd_state_t *pHostapdState; #ifndef WLAN_FEATURE_MBSSID @@ -7775,7 +7779,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->dfs_cac_block_tx = true; - cdf_event_reset(&pHostapdState->cdf_event); + qdf_event_reset(&pHostapdState->cdf_event); status = wlansap_start_bss( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR @@ -7795,11 +7799,11 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, hddLog(LOG1, FL("Waiting for Scan to complete(auto mode) and BSS to start")); - status = cdf_wait_single_event(&pHostapdState->cdf_event, 10000); + qdf_status = qdf_wait_single_event(&pHostapdState->cdf_event, 10000); wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ERROR: HDD cdf wait for single_event failed!!")); cds_set_connection_in_progress(false); @@ -7859,6 +7863,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_scaninfo_t *pScanInfo = NULL; hdd_adapter_t *staAdapter = NULL; CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tSirUpdateIE updateIE; beacon_data_t *old; int ret; @@ -7957,19 +7962,19 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_hostapd_state_t *pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); - cdf_event_reset(&pHostapdState->cdf_stop_bss_event); + qdf_event_reset(&pHostapdState->cdf_stop_bss_event); #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter)); #else status = wlansap_stop_bss(pHddCtx->pcds_context); #endif if (CDF_IS_STATUS_SUCCESS(status)) { - status = - cdf_wait_single_event(&pHostapdState-> + qdf_status = + qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, 10000); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("HDD cdf wait for single_event failed!!")); CDF_ASSERT(0); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 854ea7e6971d..2ac866def031 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2906,6 +2906,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) { CDF_STATUS status; + QDF_STATUS qdf_status; /* Stop Bss. */ #ifdef WLAN_FEATURE_MBSSID @@ -2919,19 +2920,19 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (CDF_IS_STATUS_SUCCESS(status)) { hdd_hostapd_state_t *hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); - cdf_event_reset(&hostapd_state-> + qdf_event_reset(&hostapd_state-> cdf_stop_bss_event); - status = - cdf_wait_single_event(&hostapd_state-> + qdf_status = + qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, BSS_WAIT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL( "failure waiting for wlansap_stop_bss %d" ), - status); + qdf_status); } } else { hddLog(LOGE, FL("failure in wlansap_stop_bss")); @@ -6555,7 +6556,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) { hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; #ifdef CFG80211_DEL_STA_V2 struct station_del_parameters delStaParams; @@ -6592,13 +6593,13 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("Now doing SAP STOPBSS")); - cdf_event_reset(&hostapd_state->cdf_stop_bss_event); + qdf_event_reset(&hostapd_state->cdf_stop_bss_event); if (CDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> sapContext)) { - cdf_status = cdf_wait_single_event(&hostapd_state-> + qdf_status = qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, BSS_WAIT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { mutex_unlock(&hdd_ctx->sap_lock); hddLog(CDF_TRACE_LEVEL_ERROR, FL("SAP Stop Failed")); @@ -6630,7 +6631,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) { hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; tsap_Config_t *sap_config; @@ -6673,9 +6674,9 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("Waiting for SAP to start")); - cdf_status = cdf_wait_single_event(&hostapd_state->cdf_event, + qdf_status = qdf_wait_single_event(&hostapd_state->cdf_event, BSS_WAIT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("SAP Start failed")); goto end; } diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 9485fd23335c..24e33289ff6e 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1448,7 +1448,7 @@ void hdd_statistics_cb(void *pStats, void *pContext) hdd_adapter_t *pAdapter = (hdd_adapter_t *) pContext; hdd_stats_t *pStatsCache = NULL; hdd_wext_state_t *pWextState; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tCsrSummaryStatsInfo *pSummaryStats = NULL; tCsrGlobalClassAStatsInfo *pClassAStats = NULL; @@ -1487,9 +1487,9 @@ void hdd_statistics_cb(void *pStats, void *pContext) if (pAdapter) { pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - cdf_status = cdf_event_set(&pWextState->hdd_cdf_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - hddLog(LOGE, FL("cdf_event_set failed")); + qdf_status = qdf_event_set(&pWextState->hdd_cdf_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + hddLog(LOGE, FL("qdf_event_set failed")); return; } } @@ -2228,6 +2228,7 @@ static int __iw_get_bitrate(struct net_device *dev, union iwreq_data *wrqu, char *extra) { CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; CDF_STATUS status = CDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -2273,11 +2274,11 @@ static int __iw_get_bitrate(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - cdf_status = - cdf_wait_single_event(&pWextState->hdd_cdf_event, + qdf_status = + qdf_wait_single_event(&pWextState->hdd_cdf_event, WLAN_WAIT_TIME_STATS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); @@ -8812,7 +8813,7 @@ static int __iw_get_statistics(struct net_device *dev, union iwreq_data *wrqu, char *extra) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; CDF_STATUS status = CDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -8856,10 +8857,10 @@ static int __iw_get_statistics(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - cdf_status = - cdf_wait_single_event(&pWextState->hdd_cdf_event, + qdf_status = + qdf_wait_single_event(&pWextState->hdd_cdf_event, WLAN_WAIT_TIME_STATS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); @@ -10751,7 +10752,7 @@ int hdd_register_wext(struct net_device *dev) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -10763,20 +10764,20 @@ int hdd_register_wext(struct net_device *dev) status = hdd_set_wext(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); return CDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(cdf_event_init(&pwextBuf->hdd_cdf_event))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); return CDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(cdf_event_init(&pwextBuf->scanevent))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); return CDF_STATUS_E_FAILURE; diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index c80b641a2035..ef0c89d6a2a4 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( WLAN_QCT_SYS_H__ ) +#if !defined(WLAN_QCT_SYS_H__) #define WLAN_QCT_SYS_H__ /**=========================================================================== @@ -43,6 +43,7 @@ -------------------------------------------------------------------------*/ #include #include +#include #include /*--------------------------------------------------------------------------- @@ -61,7 +62,7 @@ modules in the system. \param pUserData - user data that is passed to the Callback function - when it is invoked. + when it is invoked. \return Nothing @@ -97,12 +98,12 @@ typedef enum { specific message being built. \note There are internal / reserved items in a SYS message that must be - set correctly for the message to be recognized as a SYS message by - the SYS message handlers. It is important for every SYS message to - be setup / built / initialized through this function. + set correctly for the message to be recognized as a SYS message by + the SYS message handlers. It is important for every SYS message to + be setup / built / initialized through this function. \param sysMsgId - a valid message ID for a SYS message. See the - SYS_MSG_ID enum for all the valid SYS message IDs. + SYS_MSG_ID enum for all the valid SYS message IDs. \param pMsg - pointer to the message structure to be setup. @@ -123,15 +124,15 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); \param p_cds_context - pointer to the CDS Context \param userCallback - this is a callback that is called when the SYS - has completed the 'start' funciton. + has completed the 'start' funciton. \param pUserData - pointer to some user data entity that is passed to - the callback function as a parameter when invoked. + the callback function as a parameter when invoked. \return CDF_STATUS_SUCCESS - \todo: We have not 'status' on the callback. How do we notify the - callback that there is a failure ? + callback that there is a failure ? \sa @@ -151,7 +152,7 @@ CDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, \return CDF_STATUS_SUCCESS - the SYS module is stopped. - CDF_STATUS_E_FAILURE - the SYS module open failed to stop. + CDF_STATUS_E_FAILURE - the SYS module open failed to stop. \sa @@ -182,8 +183,8 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); \return - CDF_STATUS_SUCCESS - the message was processed successfully. - CDF_STATUS_E_BADMSG - a bad (unknown type) message was received - and subsequently not processed. + CDF_STATUS_E_BADMSG - a bad (unknown type) message was received + and subsequently not processed. \sa --------------------------------------------------------------------------*/ diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 212af83a949a..1c1452f01098 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -45,7 +45,7 @@ /* SYS stop timeout 30 seconds */ #define SYS_STOP_TIMEOUT (30000) -static cdf_event_t g_stop_evt; +static qdf_event_t g_stop_evt; /** * sys_build_message_header() - to build the sys message header @@ -74,10 +74,10 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) */ void sys_stop_complete_cb(void *pUserData) { - cdf_event_t *pStopEvt = (cdf_event_t *) pUserData; - CDF_STATUS cdf_status = cdf_event_set(pStopEvt); + qdf_event_t *pStopEvt = (qdf_event_t *) pUserData; + QDF_STATUS qdf_status = qdf_event_set(pStopEvt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -92,13 +92,14 @@ void sys_stop_complete_cb(void *pUserData) CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) { CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sysMsg; /* Initialize the stop event */ - cdf_status = cdf_event_init(&g_stop_evt); + qdf_status = qdf_event_create(&g_stop_evt); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - return cdf_status; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + return qdf_status; /* post a message to SYS module in MC to stop SME and MAC */ sys_build_message_header(SYS_MSG_ID_MC_STOP, &sysMsg); @@ -112,13 +113,13 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) if (!CDF_IS_STATUS_SUCCESS(cdf_status)) cdf_status = CDF_STATUS_E_BADMSG; - cdf_status = cdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + qdf_status = qdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); - cdf_status = cdf_event_destroy(&g_stop_evt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + qdf_status = qdf_event_destroy(&g_stop_evt); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); - return cdf_status; + return qdf_status; } /** @@ -253,7 +254,7 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) if (pMsg->bodyptr) cdf_mem_free(pMsg->bodyptr); } - return (cdf_status); + return cdf_status; } /** diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 5c04a15006b6..d422b8b0278c 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -34,6 +34,7 @@ #define CSRINTERNAL_H__ #include "cdf_status.h" +#include "qdf_status.h" #include "cdf_lock.h" #include "cdf_mc_timer.h" diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index ed5f1a8ec59d..7974b4ee2c6f 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -38,6 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "cdf_status.h" +#include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 9c0437b7f4e4..a86fb9cfa61d 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -38,6 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "cdf_status.h" +#include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" diff --git a/core/utils/logging/inc/wlan_logging_sock_svc.h b/core/utils/logging/inc/wlan_logging_sock_svc.h index c9070ab23480..5aa52459265f 100644 --- a/core/utils/logging/inc/wlan_logging_sock_svc.h +++ b/core/utils/logging/inc/wlan_logging_sock_svc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,6 +35,7 @@ #include #include +#include #include #include diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index a328d8ecc3d0..cc843856616b 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -34,6 +34,7 @@ #include #include #include +#include #include #include /* diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index b9a9c12c3320..409d3cfe24a3 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -96,7 +97,8 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid) } payload_len = wmsg_length + 4; /* 4 extra bytes for the radio idx */ tot_msg_len = NLMSG_SPACE(payload_len); - if ((skb = dev_alloc_skb(tot_msg_len)) == NULL) { + skb = dev_alloc_skb(tot_msg_len); + if (skb == NULL) { PTT_TRACE(CDF_TRACE_LEVEL_ERROR, "%s: dev_alloc_skb() failed for msg size[%d]\n", __func__, tot_msg_len); diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 456f08ed4c10..6dfbcaf71c62 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -32,13 +32,14 @@ #include "cdf_types.h" #include "osapi_linux.h" #include "htc_packet.h" -#include "i_cdf_event.h" +#include "i_qdf_event.h" #include "wmi_services.h" #include "wmi_unified.h" #include "wmi_version.h" #include "cdf_types.h" #include "cfg_api.h" #include "cdf_status.h" +#include "qdf_status.h" #include "cds_sched.h" #include "ol_txrx_api.h" #include "sir_mac_prot_def.h" @@ -1174,11 +1175,11 @@ typedef struct { void *htc_handle; void *cds_context; void *mac_context; - cdf_event_t wma_ready_event; - cdf_event_t wma_resume_event; - cdf_event_t target_suspend; - cdf_event_t runtime_suspend; - cdf_event_t recovery_event; + qdf_event_t wma_ready_event; + qdf_event_t wma_resume_event; + qdf_event_t target_suspend; + qdf_event_t runtime_suspend; + qdf_event_t recovery_event; uint16_t max_station; uint16_t max_bssid; uint32_t frame_xln_reqd; @@ -1205,14 +1206,14 @@ typedef struct { uint32_t frameTransRequired; tBssSystemRole wmaGlobalSystemRole; pWMATxRxCompFunc tx_frm_download_comp_cb; - cdf_event_t tx_frm_download_comp_event; + qdf_event_t tx_frm_download_comp_event; /* * Dummy event to wait for draining MSDUs left in hardware tx * queue and before requesting VDEV_STOP. Nobody will set this * and wait will timeout, and code will poll the pending tx * descriptors number to be zero. */ - cdf_event_t tx_queue_empty_event; + qdf_event_t tx_queue_empty_event; pWMAAckFnTxComp umac_ota_ack_cb[SIR_MAC_MGMT_RESERVED15]; pWMAAckFnTxComp umac_data_ota_ack_cb; v_TIME_t last_umac_data_ota_timestamp; @@ -1361,9 +1362,9 @@ typedef struct { * @wlan_resource_config: resource config */ struct wma_target_cap { - /* wmi services bitmap received from Target */ + /* wmi services bitmap received from Target */ uint32_t wmi_service_bitmap[WMI_SERVICE_BM_SIZE]; - /* default resource config,the os shim can overwrite it */ + /* default resource config,the os shim can overwrite it */ wmi_resource_config wlan_resource_config; }; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index f82f428d586f..d56a92f6b3a8 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1586,7 +1586,7 @@ static void wma_mgmt_tx_dload_comp_hldr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle) wma_context; void *mac_context = wma_handle->mac_context; @@ -1605,8 +1605,8 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, cdf_nbuf_t netbuf, wma_handle->tx_frm_download_comp_cb = NULL; /* Set the Tx Mgmt Complete Event */ - cdf_status = cdf_event_set(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = qdf_event_set(&wma_handle->tx_frm_download_comp_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGP("%s: Event Set failed - tx_frm_comp_event", __func__); } @@ -1674,10 +1674,10 @@ CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) } } /* Destroy Tx Frame Complete event */ - cdf_event_destroy(&wma_handle->tx_frm_download_comp_event); + qdf_event_destroy(&wma_handle->tx_frm_download_comp_event); /* Tx queue empty check event (dummy event) */ - cdf_event_destroy(&wma_handle->tx_queue_empty_event); + qdf_event_destroy(&wma_handle->tx_queue_empty_event); /* Reset Tx Frm Callbacks */ wma_handle->tx_frm_download_comp_cb = NULL; @@ -2444,6 +2444,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, tp_wma_handle wma_handle = (tp_wma_handle) (wma_context); int32_t status; CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t is_high_latency; ol_txrx_vdev_handle txrx_vdev; enum frame_index tx_frm_index = GENERIC_NODOWNLD_NOACK_COMP_INDEX; @@ -2740,7 +2741,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, /* Reset the Tx Frame Complete Event */ cdf_status = - cdf_event_reset(&wma_handle->tx_frm_download_comp_event); + qdf_event_reset(&wma_handle->tx_frm_download_comp_event); if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { WMA_LOGP("%s: Event Reset failed tx comp event %x", @@ -2817,12 +2818,12 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, * @ Integrated : Dxe Complete * @ Discrete : Target Download Complete */ - cdf_status = - cdf_wait_single_event(&wma_handle-> + qdf_status = + qdf_wait_single_event(&wma_handle-> tx_frm_download_comp_event, WMA_TX_FRAME_COMPLETE_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("Wait Event failed txfrm_comp_event"); /* * @Integrated: Something Wrong with Dxe diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 5b39b08a2b04..f69b5320ef9c 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1739,8 +1739,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, } if (wma_is_vdev_in_ibss_mode(wma, resp_event->vdev_id)) wma_delete_all_ibss_peers(wma, resp_event->vdev_id); - else - { + else { if (wma_is_vdev_in_ap_mode(wma, resp_event->vdev_id)) { wma_delete_all_ap_remote_peers(wma, resp_event->vdev_id); @@ -2749,8 +2748,7 @@ void wma_vdev_resp_timer(void *data) } if (wma_is_vdev_in_ibss_mode(wma, tgt_req->vdev_id)) wma_delete_all_ibss_peers(wma, tgt_req->vdev_id); - else - { + else { if (wma_is_vdev_in_ap_mode(wma, tgt_req->vdev_id)) { wma_delete_all_ap_remote_peers(wma, tgt_req-> @@ -4714,7 +4712,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) while (ol_txrx_get_tx_pending(pdev) && max_wait_iterations) { WMA_LOGW(FL("Waiting for outstanding packet to drain.")); - cdf_wait_single_event(&wma->tx_queue_empty_event, + qdf_wait_single_event(&wma->tx_queue_empty_event, WMA_TX_Q_RECHECK_TIMER_MAX_WAIT); max_wait_iterations--; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 72b412f93155..f767b9e26cb9 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2845,7 +2845,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, wma_wow_wake_reason_str(wake_info->wake_reason), wake_info->wake_reason, wake_info->vdev_id); - cdf_event_set(&wma->wma_resume_event); + qdf_event_set(&wma->wma_resume_event); switch (wake_info->wake_reason) { case WOW_REASON_AUTH_REQ_RECV: @@ -3088,7 +3088,7 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len) WMA_LOGA("Received PDEV resume event"); - cdf_event_set(&wma->wma_resume_event); + qdf_event_set(&wma->wma_resume_event); return 0; } @@ -3576,7 +3576,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) cmd->pause_iface_config == WOW_IFACE_PAUSE_ENABLED ? "WOW_IFACE_PAUSE_ENABLED" : "WOW_IFACE_PAUSE_DISABLED"); - cdf_event_reset(&wma->target_suspend); + qdf_event_reset(&wma->target_suspend); wma->wow_nack = 0; host_credits = wmi_get_host_credits(wma->wmi_handle); @@ -3603,9 +3603,9 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) wmi_set_target_suspend(wma->wmi_handle, true); - if (cdf_wait_single_event(&wma->target_suspend, + if (qdf_wait_single_event(&wma->target_suspend, WMA_TGT_SUSPEND_COMPLETE_TIMEOUT) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to receive WoW Enable Ack from FW"); WMA_LOGE("Credits:%d; Pending_Cmds: %d", wmi_get_host_credits(wma->wmi_handle), @@ -4201,7 +4201,7 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, if (type == CDF_SYSTEM_SUSPEND) wma_send_status_to_suspend_ind(wma, true); else if (type == CDF_RUNTIME_SUSPEND) - cdf_event_set(&wma->runtime_suspend); + qdf_event_set(&wma->runtime_suspend); } /** @@ -4256,6 +4256,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *cmd; wmi_buf_t buf; CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t len; int ret; #ifdef CONFIG_CNSS @@ -4281,7 +4282,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) WMITLV_GET_STRUCT_TLVLEN (wmi_wow_hostwakeup_from_sleep_cmd_fixed_param)); - cdf_event_reset(&wma->wma_resume_event); + qdf_event_reset(&wma->wma_resume_event); ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID); @@ -4293,9 +4294,9 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) WMA_LOGD("Host wakeup indication sent to fw"); - cdf_status = cdf_wait_single_event(&(wma->wma_resume_event), + qdf_status = qdf_wait_single_event(&(wma->wma_resume_event), WMA_RESUME_TIMEOUT); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Timeout waiting for resume event from FW", __func__); WMA_LOGP("%s: Pending commands %d credits %d", __func__, @@ -4932,7 +4933,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, * Return: CDF status */ CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, - tSirRcvFltMcAddrList * mcbc_param) + tSirRcvFltMcAddrList *mcbc_param) { uint8_t vdev_id = 0; int i; @@ -6367,7 +6368,7 @@ static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) CDF_STATUS cdf_status; tp_wma_handle wma = (tp_wma_handle) handle; - cdf_event_reset(&wma->runtime_suspend); + qdf_event_reset(&wma->runtime_suspend); cds_msg.bodyptr = NULL; cds_msg.type = WMA_RUNTIME_PM_SUSPEND_IND; @@ -6376,9 +6377,9 @@ static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) if (cdf_status != CDF_STATUS_SUCCESS) goto failure; - if (cdf_wait_single_event(&wma->runtime_suspend, + if (qdf_wait_single_event(&wma->runtime_suspend, WMA_TGT_SUSPEND_COMPLETE_TIMEOUT) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get runtime suspend event"); goto failure; } @@ -6573,7 +6574,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) } else { cmd->suspend_opt = WMI_PDEV_SUSPEND; } - cdf_event_reset(&wma_handle->target_suspend); + qdf_event_reset(&wma_handle->target_suspend); ret = wmi_unified_cmd_send(wma_handle->wmi_handle, wmibuf, len, WMI_PDEV_SUSPEND_CMDID); if (ret < 0) { @@ -6583,9 +6584,9 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) wmi_set_target_suspend(wma_handle->wmi_handle, true); - if (cdf_wait_single_event(&wma_handle->target_suspend, + if (qdf_wait_single_event(&wma_handle->target_suspend, WMA_TGT_SUSPEND_COMPLETE_TIMEOUT) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get ACK from firmware for pdev suspend"); wmi_set_target_suspend(wma_handle->wmi_handle, false); #ifdef CONFIG_CNSS @@ -6632,7 +6633,7 @@ void wma_target_suspend_acknowledge(void *context) } wma->wow_nack = wow_nack; - cdf_event_set(&wma->target_suspend); + qdf_event_set(&wma->target_suspend); if (wow_nack) cdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, WMA_WAKE_LOCK_TIMEOUT, @@ -6652,6 +6653,7 @@ int wma_resume_target(WMA_HANDLE handle) wmi_buf_t wmibuf; wmi_pdev_resume_cmd_fixed_param *cmd; CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); if (NULL == pMac) { @@ -6670,7 +6672,7 @@ int wma_resume_target(WMA_HANDLE handle) WMITLV_GET_STRUCT_TLVLEN (wmi_pdev_resume_cmd_fixed_param)); cmd->reserved0 = 0; - cdf_event_reset(&wma->wma_resume_event); + qdf_event_reset(&wma->wma_resume_event); ret = wmi_unified_cmd_send(wma->wmi_handle, wmibuf, sizeof(*cmd), WMI_PDEV_RESUME_CMDID); if (ret != EOK) { @@ -6678,9 +6680,9 @@ int wma_resume_target(WMA_HANDLE handle) wmi_buf_free(wmibuf); } - cdf_status = cdf_wait_single_event(&(wma->wma_resume_event), + qdf_status = qdf_wait_single_event(&(wma->wma_resume_event), WMA_RESUME_TIMEOUT); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Timeout waiting for resume event from FW", __func__); WMA_LOGP("%s: Pending commands %d credits %d", __func__, -- cgit v1.2.3 From ffb2154eff31cff255932fa9e4b314850cf5a950 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Wed, 17 Feb 2016 14:33:03 +0530 Subject: qcacld-3.0: Add QDF list API's Replace CDF list API's with QDF list API's Change-Id: Id7a3ec93fe6821450ef70e50649af8a4de285eeb CRs-Fixed: 981188 --- core/cdf/inc/cdf_list.h | 113 ---------- core/cdf/inc/cdf_mc_timer.h | 4 +- core/cdf/src/cdf_list.c | 236 --------------------- core/cdf/src/cdf_mc_timer.c | 52 ++--- core/cdf/src/cdf_memory.c | 40 ++-- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/hdd/inc/wlan_hdd_main.h | 14 +- core/hdd/src/wlan_hdd_hostapd.h | 2 +- core/hdd/src/wlan_hdd_ipa.c | 30 +-- core/hdd/src/wlan_hdd_main.c | 44 ++-- core/hdd/src/wlan_hdd_p2p.c | 31 +-- core/hdd/src/wlan_hdd_scan.c | 34 +-- core/mac/inc/ani_global.h | 4 +- core/mac/src/pe/lim/lim_api.c | 10 +- core/mac/src/pe/lim/lim_process_message_queue.c | 36 ++-- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 21 +- core/wma/inc/wma.h | 6 +- core/wma/src/wma_dev_if.c | 54 ++--- core/wma/src/wma_main.c | 36 ++-- 20 files changed, 211 insertions(+), 560 deletions(-) delete mode 100644 core/cdf/inc/cdf_list.h delete mode 100644 core/cdf/src/cdf_list.c diff --git a/core/cdf/inc/cdf_list.h b/core/cdf/inc/cdf_list.h deleted file mode 100644 index 427847a91bef..000000000000 --- a/core/cdf/inc/cdf_list.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_LIST_H) -#define __CDF_LIST_H - -/** - * DOC: cdf_list.h - * - * Connectivity driver framework (CDF) list APIs - * - * Definitions for CDF Linked Lists API - * - * Lists are implemented as a doubly linked list. An item in a list can - * be of any type as long as the datatype contains a field of type - * cdf_link_t. - * - * In general, a list is a doubly linked list of items with a pointer - * to the front of the list and a pointer to the end of the list. The - * list items contain a forward and back link. - * - * CDF linked list APIs are NOT thread safe so make sure to use appropriate - * locking mechanisms to assure operations on the list are thread safe. - */ - -/* Include Files */ -#include -#include -#include -#include -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -typedef struct list_head cdf_list_node_t; - -typedef struct cdf_list_s { - cdf_list_node_t anchor; - uint32_t count; - uint32_t max_size; -} cdf_list_t; - -/* Function declarations */ - -CDF_INLINE_FN void cdf_list_init(cdf_list_t *p_list, uint32_t max_size) -{ - INIT_LIST_HEAD(&p_list->anchor); - p_list->count = 0; - p_list->max_size = max_size; -} - -CDF_INLINE_FN void cdf_list_destroy(cdf_list_t *p_list) -{ - if (p_list->count != 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, - "%s: list length not equal to zero", __func__); - CDF_ASSERT(0); - } -} - -CDF_INLINE_FN void cdf_list_size(cdf_list_t *p_list, uint32_t *p_size) -{ - *p_size = p_list->count; -} - -CDF_STATUS cdf_list_insert_front(cdf_list_t *p_list, cdf_list_node_t *p_node); - -CDF_STATUS cdf_list_insert_back(cdf_list_t *p_list, cdf_list_node_t *p_node); - -CDF_STATUS cdf_list_insert_back_size(cdf_list_t *p_list, - cdf_list_node_t *p_node, uint32_t *p_size); - -CDF_STATUS cdf_list_remove_front(cdf_list_t *p_list, cdf_list_node_t **pp_node); - -CDF_STATUS cdf_list_remove_back(cdf_list_t *p_list, cdf_list_node_t **pp_node); - -CDF_STATUS cdf_list_peek_front(cdf_list_t *p_list, cdf_list_node_t **pp_node); - -CDF_STATUS cdf_list_peek_next(cdf_list_t *p_list, cdf_list_node_t *p_node, - cdf_list_node_t **pp_node); - -CDF_STATUS cdf_list_remove_node(cdf_list_t *p_list, - cdf_list_node_t *p_node_to_remove); - -bool cdf_list_empty(cdf_list_t *list); - -#endif /* __CDF_LIST_H */ diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index c0992e9911a4..ff7a857fd121 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -42,7 +42,7 @@ #include #ifdef TIMER_MANAGER -#include +#include #endif /* Preprocessor definitions and constants */ @@ -65,7 +65,7 @@ typedef enum { #ifdef TIMER_MANAGER struct cdf_mc_timer_s; typedef struct cdf_mc_timer_node_s { - cdf_list_node_t pNode; + qdf_list_node_t pNode; char *fileName; unsigned int lineNum; struct cdf_mc_timer_s *cdf_timer; diff --git a/core/cdf/src/cdf_list.c b/core/cdf/src/cdf_list.c deleted file mode 100644 index 9171f22c195c..000000000000 --- a/core/cdf/src/cdf_list.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_list.c - * - * Connectivity driver framework list manipulation APIs. CDF linked list - * APIs are NOT thread safe so make sure to use appropriate locking mechanisms - * to assure operations on the list are thread safe. - */ - -/* Include files */ -#include -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_list_insert_front() - insert input node at front of the list - * @pList: Pointer to list - * @pNode: Pointer to input node - * - * Return: CDF status - */ -CDF_STATUS cdf_list_insert_front(cdf_list_t *pList, cdf_list_node_t *pNode) -{ - list_add(pNode, &pList->anchor); - pList->count++; - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_insert_back() - insert input node at back of the list - * @pList: Pointer to list - * @pNode: Pointer to input node - * - * Return: CDF status - */ -CDF_STATUS cdf_list_insert_back(cdf_list_t *pList, cdf_list_node_t *pNode) -{ - list_add_tail(pNode, &pList->anchor); - pList->count++; - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_insert_back_size() - insert input node at back of list and save - * list size - * @pList: Pointer to list - * @pNode: Pointer to input node - * @pSize: Pointer to store list size - * - * Return: CDF status - */ -CDF_STATUS cdf_list_insert_back_size(cdf_list_t *pList, - cdf_list_node_t *pNode, uint32_t *pSize) -{ - list_add_tail(pNode, &pList->anchor); - pList->count++; - *pSize = pList->count; - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_remove_front() - remove node from front of the list - * @pList: Pointer to list - * @ppNode: Double pointer to store the node which is removed from list - * - * Return: CDF status - */ -CDF_STATUS cdf_list_remove_front(cdf_list_t *pList, cdf_list_node_t **ppNode) -{ - struct list_head *listptr; - - if (list_empty(&pList->anchor)) - return CDF_STATUS_E_EMPTY; - - listptr = pList->anchor.next; - *ppNode = listptr; - list_del(pList->anchor.next); - pList->count--; - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_remove_back() - remove node from end of the list - * @pList: Pointer to list - * @ppNode: Double pointer to store node which is removed from list - * - * Return: CDF status - */ -CDF_STATUS cdf_list_remove_back(cdf_list_t *pList, cdf_list_node_t **ppNode) -{ - struct list_head *listptr; - - if (list_empty(&pList->anchor)) - return CDF_STATUS_E_EMPTY; - - listptr = pList->anchor.prev; - *ppNode = listptr; - list_del(pList->anchor.prev); - pList->count--; - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_remove_node() - remove input node from list - * @pList: Pointer to list - * @pNodeToRemove: Pointer to node which needs to be removed - * - * Return: CDF status - */ -CDF_STATUS cdf_list_remove_node(cdf_list_t *pList, - cdf_list_node_t *pNodeToRemove) -{ - cdf_list_node_t *tmp; - int found = 0; - - if (list_empty(&pList->anchor)) - return CDF_STATUS_E_EMPTY; - - /* verify that pNodeToRemove is indeed part of list pList */ - list_for_each(tmp, &pList->anchor) { - if (tmp == pNodeToRemove) { - found = 1; - break; - } - } - if (found == 0) - return CDF_STATUS_E_INVAL; - - list_del(pNodeToRemove); - pList->count--; - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_peek_front() - peek front node from list - * @pList: Pointer to list - * @ppNode: Double pointer to store peeked node pointer - * - * Return: CDF status - */ -CDF_STATUS cdf_list_peek_front(cdf_list_t *pList, cdf_list_node_t **ppNode) -{ - struct list_head *listptr; - if (list_empty(&pList->anchor)) - return CDF_STATUS_E_EMPTY; - - listptr = pList->anchor.next; - *ppNode = listptr; - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_peek_next() - peek next node of input node in the list - * @pList: Pointer to list - * @pNode: Pointer to input node - * @ppNode: Double pointer to store peeked node pointer - * - * Return: CDF status - */ -CDF_STATUS cdf_list_peek_next(cdf_list_t *pList, cdf_list_node_t *pNode, - cdf_list_node_t **ppNode) -{ - struct list_head *listptr; - int found = 0; - cdf_list_node_t *tmp; - - if ((pList == NULL) || (pNode == NULL) || (ppNode == NULL)) - return CDF_STATUS_E_FAULT; - - if (list_empty(&pList->anchor)) - return CDF_STATUS_E_EMPTY; - - /* verify that pNode is indeed part of list pList */ - list_for_each(tmp, &pList->anchor) { - if (tmp == pNode) { - found = 1; - break; - } - } - - if (found == 0) - return CDF_STATUS_E_INVAL; - - listptr = pNode->next; - if (listptr == &pList->anchor) - return CDF_STATUS_E_EMPTY; - - *ppNode = listptr; - - return CDF_STATUS_SUCCESS; -} - -/** - * cdf_list_empty() - check if the list is empty - * @list: pointer to the list - * - * Return: true if the list is empty and false otherwise. - */ -bool cdf_list_empty(cdf_list_t *list) -{ - return list_empty(&list->anchor); -} diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 896e75fa8ab5..7911cef5134a 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/core/cdf/src/cdf_mc_timer.c @@ -233,7 +233,7 @@ void cdf_timer_module_init(void) #ifdef TIMER_MANAGER -cdf_list_t cdf_timer_list; +qdf_list_t cdf_timer_list; cdf_spinlock_t cdf_timer_list_lock; static void cdf_timer_clean(void); @@ -247,7 +247,7 @@ static void cdf_timer_clean(void); */ void cdf_mc_timer_manager_init(void) { - cdf_list_init(&cdf_timer_list, 1000); + qdf_list_create(&cdf_timer_list, 1000); cdf_spinlock_init(&cdf_timer_list_lock); return; } @@ -264,11 +264,11 @@ static void cdf_timer_clean(void) { uint32_t listSize; - cdf_list_size(&cdf_timer_list, &listSize); + listSize = qdf_list_size(&cdf_timer_list); if (listSize) { - cdf_list_node_t *pNode; - CDF_STATUS cdf_status; + qdf_list_node_t *pNode; + QDF_STATUS qdf_status; cdf_mc_timer_node_t *ptimerNode; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -277,10 +277,10 @@ static void cdf_timer_clean(void) do { cdf_spin_lock_irqsave(&cdf_timer_list_lock); - cdf_status = - cdf_list_remove_front(&cdf_timer_list, &pNode); + qdf_status = + qdf_list_remove_front(&cdf_timer_list, &pNode); cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { ptimerNode = (cdf_mc_timer_node_t *) pNode; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, @@ -289,7 +289,7 @@ static void cdf_timer_clean(void) (int)ptimerNode->lineNum); cdf_mem_free(ptimerNode); } - } while (cdf_status == CDF_STATUS_SUCCESS); + } while (qdf_status == QDF_STATUS_SUCCESS); } } @@ -303,7 +303,7 @@ static void cdf_timer_clean(void) void cdf_mc_timer_exit(void) { cdf_timer_clean(); - cdf_list_destroy(&cdf_timer_list); + qdf_list_destroy(&cdf_timer_list); } #endif @@ -345,7 +345,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, void *userData, char *fileName, uint32_t lineNum) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* check for invalid pointer */ if ((timer == NULL) || (callback == NULL)) { @@ -372,13 +372,13 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, timer->ptimerNode->cdf_timer = timer; cdf_spin_lock_irqsave(&cdf_timer_list_lock); - cdf_status = cdf_list_insert_front(&cdf_timer_list, + qdf_status = qdf_list_insert_front(&cdf_timer_list, &timer->ptimerNode->pNode); cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List cdf_status %d", - __func__, cdf_status); + __func__, qdf_status); } /* set the various members of the timer structure @@ -458,7 +458,7 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, #ifdef TIMER_MANAGER CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; unsigned long flags; /* check for invalid pointer */ @@ -478,12 +478,12 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) } cdf_spin_lock_irqsave(&cdf_timer_list_lock); - vStatus = cdf_list_remove_node(&cdf_timer_list, + status = qdf_list_remove_node(&cdf_timer_list, &timer->ptimerNode->pNode); cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (vStatus != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_free(timer->ptimerNode); @@ -492,32 +492,32 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) switch (timer->state) { case CDF_TIMER_STATE_STARTING: - vStatus = CDF_STATUS_E_BUSY; + status = QDF_STATUS_E_BUSY; break; case CDF_TIMER_STATE_RUNNING: /* Stop the timer first */ del_timer(&(timer->platformInfo.Timer)); - vStatus = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_STOPPED: - vStatus = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_UNUSED: - vStatus = CDF_STATUS_E_ALREADY; + status = QDF_STATUS_E_ALREADY; break; default: - vStatus = CDF_STATUS_E_FAULT; + status = QDF_STATUS_E_FAULT; break; } - if (CDF_STATUS_SUCCESS == vStatus) { + if (QDF_STATUS_SUCCESS == status) { timer->platformInfo.cookie = LINUX_INVALID_TIMER_COOKIE; timer->state = CDF_TIMER_STATE_UNUSED; spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - return vStatus; + return status; } spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); @@ -527,7 +527,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) timer->state); CDF_ASSERT(0); - return vStatus; + return status; } #else diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 38712c4f1ae4..97a3e7039e74 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -47,10 +47,10 @@ #endif #ifdef MEMORY_DEBUG -#include +#include #include -cdf_list_t cdf_mem_list; +qdf_list_t cdf_mem_list; cdf_spinlock_t cdf_mem_list_lock; static uint8_t WLAN_MEM_HEADER[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, @@ -61,7 +61,7 @@ static uint8_t WLAN_MEM_TAIL[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, #define CDF_MEM_MAX_STACK_TRACE 16 struct s_cdf_mem_struct { - cdf_list_node_t pNode; + qdf_list_node_t pNode; char *fileName; unsigned int lineNum; unsigned int size; @@ -136,7 +136,7 @@ static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct void cdf_mem_init(void) { /* Initalizing the list with maximum size of 60000 */ - cdf_list_init(&cdf_mem_list, 60000); + qdf_list_create(&cdf_mem_list, 60000); cdf_spinlock_init(&cdf_mem_list_lock); cdf_net_buf_debug_init(); return; @@ -150,13 +150,13 @@ void cdf_mem_init(void) void cdf_mem_clean(void) { uint32_t listSize; - cdf_list_size(&cdf_mem_list, &listSize); + listSize = qdf_list_size(&cdf_mem_list); cdf_net_buf_debug_clean(); if (listSize) { - cdf_list_node_t *pNode; - CDF_STATUS cdf_status; + qdf_list_node_t *pNode; + QDF_STATUS qdf_status; struct s_cdf_mem_struct *memStruct; char *prev_mleak_file = ""; @@ -170,10 +170,10 @@ void cdf_mem_clean(void) do { cdf_spin_lock(&cdf_mem_list_lock); - cdf_status = - cdf_list_remove_front(&cdf_mem_list, &pNode); + qdf_status = + qdf_list_remove_front(&cdf_mem_list, &pNode); cdf_spin_unlock(&cdf_mem_list_lock); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { memStruct = (struct s_cdf_mem_struct *)pNode; /* Take care to log only once multiple memory leaks from the same place */ @@ -199,7 +199,7 @@ void cdf_mem_clean(void) cdf_mem_print_stack_trace(memStruct); kfree((void *)memStruct); } - } while (cdf_status == CDF_STATUS_SUCCESS); + } while (qdf_status == QDF_STATUS_SUCCESS); /* Print last memory leak from the module */ if (mleak_cnt) { @@ -223,7 +223,7 @@ void cdf_mem_exit(void) { cdf_net_buf_debug_exit(); cdf_mem_clean(); - cdf_list_destroy(&cdf_mem_list); + qdf_list_destroy(&cdf_mem_list); } /** @@ -288,7 +288,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) size, (void *)_RET_IP_, lineNum); if (memStruct != NULL) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; memStruct->fileName = fileName; memStruct->lineNum = lineNum; @@ -302,13 +302,13 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) &WLAN_MEM_TAIL[0], sizeof(WLAN_MEM_TAIL)); cdf_spin_lock_irqsave(&cdf_mem_list_lock); - cdf_status = cdf_list_insert_front(&cdf_mem_list, + qdf_status = qdf_list_insert_front(&cdf_mem_list, &memStruct->pNode); cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List cdf_status %d", - __func__, cdf_status); + __func__, qdf_status); } memPtr = (void *)(memStruct + 1); @@ -329,7 +329,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) void cdf_mem_free(void *ptr) { if (ptr != NULL) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct s_cdf_mem_struct *memStruct = ((struct s_cdf_mem_struct *)ptr) - 1; @@ -339,11 +339,11 @@ void cdf_mem_free(void *ptr) #endif cdf_spin_lock_irqsave(&cdf_mem_list_lock); - cdf_status = - cdf_list_remove_node(&cdf_mem_list, &memStruct->pNode); + qdf_status = + qdf_list_remove_node(&cdf_mem_list, &memStruct->pNode); cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { if (0 == cdf_mem_compare(memStruct->header, &WLAN_MEM_HEADER[0], sizeof(WLAN_MEM_HEADER))) { diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 0852d199cf49..07c3117accae 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index daa01b4cbc67..7da595d09975 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 57139a07c97d..94145bba0047 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include "sir_mac_prot_def.h" #include "csr_api.h" @@ -578,7 +578,7 @@ typedef struct hdd_remain_on_chan_ctx { /* RoC Request entry */ typedef struct hdd_roc_req { - cdf_list_node_t node; /* MUST be first element */ + qdf_list_node_t node; /* MUST be first element */ hdd_adapter_t *pAdapter; hdd_remain_on_chan_ctx_t *pRemainChanCtx; } hdd_roc_req_t; @@ -596,7 +596,7 @@ typedef struct hdd_roc_req { * Scan request linked list element */ struct hdd_scan_req { - cdf_list_node_t node; + qdf_list_node_t node; hdd_adapter_t *adapter; struct cfg80211_scan_request *scan_request; uint32_t scan_id; @@ -1049,7 +1049,7 @@ struct hdd_adapter_s { #define HDD_RESET_MCC_P2P_QUOTA 50 typedef struct hdd_adapter_list_node { - cdf_list_node_t node; /* MUST be first element */ + qdf_list_node_t node; /* MUST be first element */ hdd_adapter_t *pAdapter; } hdd_adapter_list_node_t; @@ -1106,7 +1106,7 @@ struct hdd_context_s { /* TODO Remove this from here. */ cdf_spinlock_t hdd_adapter_lock; - cdf_list_t hddAdapters; /* List of adapters */ + qdf_list_t hddAdapters; /* List of adapters */ /* One per STA: 1 for BCMC_STA_ID, 1 for each SAP_SELF_STA_ID, 1 for WDS_STAID */ hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + CDF_MAX_NO_OF_SAP_MODE + 2]; /* One per sta. For quick reference. */ @@ -1290,9 +1290,9 @@ struct hdd_context_s { /* RoC request queue and work */ struct delayed_work roc_req_work; cdf_spinlock_t hdd_roc_req_q_lock; - cdf_list_t hdd_roc_req_q; + qdf_list_t hdd_roc_req_q; cdf_spinlock_t hdd_scan_req_q_lock; - cdf_list_t hdd_scan_req_q; + qdf_list_t hdd_scan_req_q; uint8_t miracast_value; #ifdef WLAN_NS_OFFLOAD /* IPv6 notifier callback for handling NS offload on change in IP */ diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 46dc54ebc8f9..1fb38dfa231f 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 6873375443c8..d15388e45a45 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -318,7 +318,7 @@ struct ipa_uc_fw_stats { }; struct ipa_uc_pending_event { - cdf_list_node_t node; + qdf_list_node_t node; hdd_adapter_t *adapter; enum ipa_wlan_event type; uint8_t sta_id; @@ -422,7 +422,7 @@ struct hdd_ipa_priv { bool resource_unloading; bool pending_cons_req; struct ipa_uc_stas_map assoc_stas_map[WLAN_MAX_STA_COUNT]; - cdf_list_t pending_event; + qdf_list_t pending_event; cdf_mutex_t event_lock; bool ipa_pipes_down; uint32_t ipa_tx_packets_diff; @@ -1316,7 +1316,7 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa) unsigned int pending_event_count; struct ipa_uc_pending_event *pending_event = NULL; - cdf_list_size(&hdd_ipa->pending_event, &pending_event_count); + pending_event_count = qdf_list_size(&hdd_ipa->pending_event); HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s, Pending Event Count %d", __func__, pending_event_count); if (!pending_event_count) { @@ -1325,8 +1325,8 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa) return; } - cdf_list_remove_front(&hdd_ipa->pending_event, - (cdf_list_node_t **)&pending_event); + qdf_list_remove_front(&hdd_ipa->pending_event, + (qdf_list_node_t **)&pending_event); while (pending_event != NULL) { hdd_ipa_wlan_evt(pending_event->adapter, pending_event->type, @@ -1334,8 +1334,8 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa) pending_event->mac_addr); cdf_mem_free(pending_event); pending_event = NULL; - cdf_list_remove_front(&hdd_ipa->pending_event, - (cdf_list_node_t **)&pending_event); + qdf_list_remove_front(&hdd_ipa->pending_event, + (qdf_list_node_t **)&pending_event); } } @@ -1788,7 +1788,7 @@ static CDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) cdf_mem_zero(&pipe_in, sizeof(struct ipa_wdi_in_params)); cdf_mem_zero(&pipe_out, sizeof(struct ipa_wdi_out_params)); - cdf_list_init(&ipa_ctxt->pending_event, 1000); + qdf_list_create(&ipa_ctxt->pending_event, 1000); cdf_mutex_init(&ipa_ctxt->event_lock); cdf_mutex_init(&ipa_ctxt->ipa_lock); @@ -3653,11 +3653,11 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, cdf_mutex_acquire(&hdd_ipa->event_lock); - cdf_list_size(&hdd_ipa->pending_event, &pending_event_count); + pending_event_count = qdf_list_size(&hdd_ipa->pending_event); if (pending_event_count >= HDD_IPA_MAX_PENDING_EVENT_COUNT) { hdd_notice("Reached max pending event count"); - cdf_list_remove_front(&hdd_ipa->pending_event, - (cdf_list_node_t **)&pending_event); + qdf_list_remove_front(&hdd_ipa->pending_event, + (qdf_list_node_t **)&pending_event); } else { pending_event = (struct ipa_uc_pending_event *)cdf_mem_malloc( @@ -3676,7 +3676,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, cdf_mem_copy(pending_event->mac_addr, mac_addr, CDF_MAC_ADDR_SIZE); - cdf_list_insert_back(&hdd_ipa->pending_event, + qdf_list_insert_back(&hdd_ipa->pending_event, &pending_event->node); cdf_mutex_release(&hdd_ipa->event_lock); @@ -4121,12 +4121,12 @@ void hdd_ipa_cleanup_pending_event(struct hdd_ipa_priv *hdd_ipa) { struct ipa_uc_pending_event *pending_event = NULL; - while (cdf_list_remove_front(&hdd_ipa->pending_event, - (cdf_list_node_t **)&pending_event) == CDF_STATUS_SUCCESS) { + while (qdf_list_remove_front(&hdd_ipa->pending_event, + (qdf_list_node_t **)&pending_event) == QDF_STATUS_SUCCESS) { cdf_mem_free(pending_event); } - cdf_list_destroy(&hdd_ipa->pending_event); + qdf_list_destroy(&hdd_ipa->pending_event); } /** diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 2ac866def031..65e09be75e62 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3148,10 +3148,10 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_peek_front(&hdd_ctx->hddAdapters, - (cdf_list_node_t **) padapterNode); + status = qdf_list_peek_front(&hdd_ctx->hddAdapters, + (qdf_list_node_t **) padapterNode); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3160,11 +3160,11 @@ CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode, hdd_adapter_list_node_t **pNextAdapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_peek_next(&hdd_ctx->hddAdapters, - (cdf_list_node_t *) adapterNode, - (cdf_list_node_t **) pNextAdapterNode); + status = qdf_list_peek_next(&hdd_ctx->hddAdapters, + (qdf_list_node_t *) adapterNode, + (qdf_list_node_t **) pNextAdapterNode); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; @@ -3173,9 +3173,9 @@ CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_remove_node(&hdd_ctx->hddAdapters, + status = qdf_list_remove_node(&hdd_ctx->hddAdapters, &adapterNode->node); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; @@ -3184,10 +3184,10 @@ CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_remove_front(&hdd_ctx->hddAdapters, - (cdf_list_node_t **) padapterNode); + status = qdf_list_remove_front(&hdd_ctx->hddAdapters, + (qdf_list_node_t **) padapterNode); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3195,10 +3195,10 @@ CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, CDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_insert_back(&hdd_ctx->hddAdapters, - (cdf_list_node_t *) adapterNode); + status = qdf_list_insert_back(&hdd_ctx->hddAdapters, + (qdf_list_node_t *) adapterNode); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3208,8 +3208,8 @@ CDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, { CDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); - status = cdf_list_insert_front(&hdd_ctx->hddAdapters, - (cdf_list_node_t *) adapterNode); + status = qdf_list_insert_front(&hdd_ctx->hddAdapters, + (qdf_list_node_t *) adapterNode); cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3802,8 +3802,8 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) /* Free up RoC request queue and flush workqueue */ cds_flush_work(&hdd_ctx->roc_req_work); - cdf_list_destroy(&hdd_ctx->hdd_roc_req_q); - cdf_list_destroy(&hdd_ctx->hdd_scan_req_q); + qdf_list_destroy(&hdd_ctx->hdd_roc_req_q); + qdf_list_destroy(&hdd_ctx->hdd_scan_req_q); if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); @@ -5123,7 +5123,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) cdf_spinlock_init(&hdd_ctx->sched_scan_lock); cdf_spinlock_init(&hdd_ctx->hdd_adapter_lock); - cdf_list_init(&hdd_ctx->hddAdapters, MAX_NUMBER_OF_ADAPTERS); + qdf_list_create(&hdd_ctx->hddAdapters, MAX_NUMBER_OF_ADAPTERS); wlan_hdd_cfg80211_extscan_init(hdd_ctx); @@ -5747,9 +5747,9 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_ctx->target_hw_name); cdf_spinlock_init(&hdd_ctx->hdd_roc_req_q_lock); - cdf_list_init((&hdd_ctx->hdd_roc_req_q), MAX_ROC_REQ_QUEUE_ENTRY); + qdf_list_create((&hdd_ctx->hdd_roc_req_q), MAX_ROC_REQ_QUEUE_ENTRY); cdf_spinlock_init(&hdd_ctx->hdd_scan_req_q_lock); - cdf_list_init((&hdd_ctx->hdd_scan_req_q), CFG_MAX_SCAN_COUNT_MAX); + qdf_list_create((&hdd_ctx->hdd_scan_req_q), CFG_MAX_SCAN_COUNT_MAX); #ifdef CONFIG_CNSS cnss_init_delayed_work(&hdd_ctx->roc_req_work, wlan_hdd_roc_request_dequeue); diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 6bbf1c625c2d..27064e10e9c2 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -282,7 +282,7 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) hddLog(LOGE, "Cancel Existing Remain on Channel"); if (CDF_TIMER_STATE_RUNNING == cdf_mc_timer_get_current_state( - &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer)) + &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer)) cdf_mc_timer_stop(&cfgState->remain_on_chan_ctx-> hdd_remain_on_chan_timer); @@ -702,7 +702,7 @@ static int wlan_hdd_roc_request_enqueue(hdd_adapter_t *adapter, { hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); hdd_roc_req_t *hdd_roc_req; - CDF_STATUS status; + QDF_STATUS status; /* * "Driver is busy" OR "there is already RoC request inside the queue" @@ -721,11 +721,11 @@ static int wlan_hdd_roc_request_enqueue(hdd_adapter_t *adapter, /* Enqueue this RoC request */ cdf_spin_lock(&hdd_ctx->hdd_roc_req_q_lock); - status = cdf_list_insert_back(&hdd_ctx->hdd_roc_req_q, + status = qdf_list_insert_back(&hdd_ctx->hdd_roc_req_q, &hdd_roc_req->node); cdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("Not able to enqueue RoC Req context")); cdf_mem_free(hdd_roc_req); return -EINVAL; @@ -773,7 +773,7 @@ void wlan_hdd_indicate_roc_drop(hdd_adapter_t *adapter, */ void wlan_hdd_roc_request_dequeue(struct work_struct *work) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; hdd_roc_req_t *hdd_roc_req; hdd_context_t *hdd_ctx = @@ -796,10 +796,10 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) hdd_debug("list is empty"); return; } - status = cdf_list_remove_front(&hdd_ctx->hdd_roc_req_q, - (cdf_list_node_t **) &hdd_roc_req); + status = qdf_list_remove_front(&hdd_ctx->hdd_roc_req_q, + (qdf_list_node_t **) &hdd_roc_req); cdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_debug("unable to remove roc element from list"); return; } @@ -871,10 +871,10 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress = false; if (REMAIN_ON_CHANNEL_REQUEST == request_type) { sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); - if ((NULL != sta_adapter)&& + if ((NULL != sta_adapter) && hdd_conn_is_connected( WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter))) { - if (pAdapter->last_roc_ts !=0 && + if (pAdapter->last_roc_ts != 0 && ((cdf_mc_timer_get_system_time() - pAdapter->last_roc_ts) < pHddCtx->config->p2p_listen_defer_interval)) { @@ -895,7 +895,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, } cdf_spin_lock(&pHddCtx->hdd_roc_req_q_lock); - cdf_list_size(&(pHddCtx->hdd_roc_req_q), &size); + size = qdf_list_size(&(pHddCtx->hdd_roc_req_q)); cdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); if ((isBusy == false) && (!size)) { status = wlan_hdd_execute_remain_on_channel(pAdapter, @@ -1087,8 +1087,9 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, hdd_remain_on_chan_ctx_t *pRemainChanCtx; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int status; + int qdf_status; unsigned long rc; - cdf_list_node_t *tmp, *q; + qdf_list_node_t *tmp, *q; hdd_roc_req_t *curr_roc_req; ENTER(); @@ -1106,11 +1107,11 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, list_for_each_safe(tmp, q, &pHddCtx->hdd_roc_req_q.anchor) { curr_roc_req = list_entry(tmp, hdd_roc_req_t, node); if ((uintptr_t) curr_roc_req->pRemainChanCtx == cookie) { - status = cdf_list_remove_node(&pHddCtx->hdd_roc_req_q, - (cdf_list_node_t *) + qdf_status = qdf_list_remove_node(&pHddCtx->hdd_roc_req_q, + (qdf_list_node_t *) curr_roc_req); cdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); - if (status == CDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_SUCCESS) { cdf_mem_free(curr_roc_req->pRemainChanCtx); cdf_mem_free(curr_roc_req); } diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 1a708a60b881..5e76a7e001c3 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -523,7 +523,7 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, { hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); struct hdd_scan_req *hdd_scan_req; - CDF_STATUS status; + QDF_STATUS status; ENTER(); hdd_scan_req = cdf_mem_malloc(sizeof(*hdd_scan_req)); @@ -539,11 +539,11 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, hdd_scan_req->timestamp = timestamp; cdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); - status = cdf_list_insert_back(&hdd_ctx->hdd_scan_req_q, + status = qdf_list_insert_back(&hdd_ctx->hdd_scan_req_q, &hdd_scan_req->node); cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_err("Failed to enqueue Scan Req"); cdf_mem_free(hdd_scan_req); return -EINVAL; @@ -566,36 +566,36 @@ CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, uint32_t scan_id, struct cfg80211_scan_request **req, uint8_t *source, uint32_t *timestamp) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct hdd_scan_req *hdd_scan_req; - cdf_list_node_t *pNode = NULL, *ppNode = NULL; + qdf_list_node_t *pNode = NULL, *ppNode = NULL; hdd_info("Dequeue Scan id: %d", scan_id); if ((source == NULL) && (timestamp == NULL) && (req == NULL)) - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; cdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); if (list_empty(&hdd_ctx->hdd_scan_req_q.anchor)) { cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS != - cdf_list_peek_front(&hdd_ctx->hdd_scan_req_q, &ppNode)) { + if (QDF_STATUS_SUCCESS != + qdf_list_peek_front(&hdd_ctx->hdd_scan_req_q, &ppNode)) { cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to remove Scan Req from queue"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { pNode = ppNode; hdd_scan_req = (struct hdd_scan_req *)pNode; if (hdd_scan_req->scan_id == scan_id) { - status = cdf_list_remove_node(&hdd_ctx->hdd_scan_req_q, + status = qdf_list_remove_node(&hdd_ctx->hdd_scan_req_q, pNode); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { *req = hdd_scan_req->scan_request; *source = hdd_scan_req->source; *timestamp = hdd_scan_req->timestamp; @@ -603,7 +603,7 @@ CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_info("removed Scan id: %d, req = %p", scan_id, req); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to remove node scan id %d", @@ -611,8 +611,8 @@ CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, return status; } } - } while (CDF_STATUS_SUCCESS == - cdf_list_peek_next(&hdd_ctx->hdd_scan_req_q, pNode, &ppNode)); + } while (QDF_STATUS_SUCCESS == + qdf_list_peek_next(&hdd_ctx->hdd_scan_req_q, pNode, &ppNode)); cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to find scan id %d", scan_id); @@ -674,7 +674,7 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, scanId); cdf_spin_lock(&hddctx->hdd_scan_req_q_lock); - cdf_list_size(&(hddctx->hdd_scan_req_q), &size); + size = qdf_list_size(&(hddctx->hdd_scan_req_q)); if (!size) /* Scan is no longer pending */ pAdapter->scan_info.mScanPending = false; @@ -1142,7 +1142,7 @@ static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, } cdf_spin_lock(&hddctx->hdd_scan_req_q_lock); - cdf_list_size(&(hddctx->hdd_scan_req_q), &size); + size = qdf_list_size(&(hddctx->hdd_scan_req_q)); if (!size) { /* Scan is no longer pending */ pScanInfo->mScanPending = false; diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 9b5096a0779a..d3d8a72837f2 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -826,7 +826,7 @@ typedef struct sAniSirLim { tSirRemainOnChnReq *gpLimRemainOnChanReq; /* hold remain on chan request in this buf */ cdf_mutex_t lim_frame_register_lock; - cdf_list_t gLimMgmtFrameRegistratinQueue; + qdf_list_t gLimMgmtFrameRegistratinQueue; uint32_t mgmtFrameSessionId; tpPESession pSessionEntry; @@ -850,7 +850,7 @@ typedef struct sAniSirLim { } tAniSirLim, *tpAniSirLim; struct mgmt_frm_reg_info { - cdf_list_node_t node; /* MUST be first element */ + qdf_list_node_t node; /* MUST be first element */ uint16_t frameType; uint16_t matchLen; uint16_t sessionId; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 97ec092c2f1d..0fcf3782a9a4 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -607,7 +607,7 @@ tSirRetStatus lim_initialize(tpAniSirGlobal pMac) #endif cdf_mutex_init(&pMac->lim.lim_frame_register_lock); - cdf_list_init(&pMac->lim.gLimMgmtFrameRegistratinQueue, 0); + qdf_list_create(&pMac->lim.gLimMgmtFrameRegistratinQueue, 0); /* Initialize the configurations needed by PE */ if (eSIR_FAILURE == __lim_init_config(pMac)) { @@ -657,16 +657,16 @@ void lim_cleanup(tpAniSirGlobal pMac) if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) { cdf_mutex_acquire(&pMac->lim.lim_frame_register_lock); - while (cdf_list_remove_front( + while (qdf_list_remove_front( &pMac->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t **) &pLimMgmtRegistration) == - CDF_STATUS_SUCCESS) { + (qdf_list_node_t **) &pLimMgmtRegistration) == + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Fixing leak! Deallocating pLimMgmtRegistration node")); cdf_mem_free(pLimMgmtRegistration); } cdf_mutex_release(&pMac->lim.lim_frame_register_lock); - cdf_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue); + qdf_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue); } lim_cleanup_mlm(pMac); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index a8a0d8b2cfe9..11bca80775a3 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -514,7 +514,7 @@ __lim_handle_beacon(tpAniSirGlobal pMac, tpSirMsgQ pMsg, /* checking for global SME state... */ uint8_t *pRxPacketInfo; lim_get_b_dfrom_rx_packet(pMac, pMsg->bodyptr, - (uint32_t * *) &pRxPacketInfo); + (uint32_t **) &pRxPacketInfo); /* This function should not be called if beacon is received in scan state. */ /* So not doing any checks for the global state. */ @@ -644,7 +644,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, uint16_t frm_len; uint8_t type, sub_type; bool match = false; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdr = WMA_GET_RX_MAC_HEADER(buff_desc); fc = hdr->fc; @@ -653,8 +653,8 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, frm_len = WMA_GET_RX_PAYLOAD_LEN(buff_desc); cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); - cdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t **) &mgmt_frame); + qdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, + (qdf_list_node_t **) &mgmt_frame); cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); while (mgmt_frame != NULL) { @@ -684,11 +684,11 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, } cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); - cdf_status = - cdf_list_peek_next( + qdf_status = + qdf_list_peek_next( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t *) mgmt_frame, - (cdf_list_node_t **) &next_frm); + (qdf_list_node_t *) mgmt_frame, + (qdf_list_node_t **) &next_frm); cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); mgmt_frame = next_frm; next_frm = NULL; @@ -750,7 +750,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg *pDeferMsg = false; lim_get_b_dfrom_rx_packet(pMac, limMsg->bodyptr, - (uint32_t * *) &pRxPacketInfo); + (uint32_t **) &pRxPacketInfo); pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); isFrmFt = WMA_GET_RX_FT_DONE(pRxPacketInfo); @@ -810,9 +810,9 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg goto end; } /* Added For BT-AMP Support */ - if ((psessionEntry = - pe_find_session_by_bssid(pMac, pHdr->bssId, - &sessionId)) == NULL) { + psessionEntry = pe_find_session_by_bssid(pMac, pHdr->bssId, + &sessionId); + if (psessionEntry == NULL) { #ifdef WLAN_FEATURE_VOWIFI_11R if (fc.subType == SIR_MAC_MGMT_AUTH) { lim_log(pMac, LOG1, @@ -1269,13 +1269,13 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; } - if (WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr)) - lim_log(mac_ctx, LOG1, FL("roamCandidateInd %d"), - WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr)); + if (WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr)) + lim_log(mac_ctx, LOG1, FL("roamCandidateInd %d"), + WMA_GET_ROAMCANDIDATEIND(new_msg.bodyptr)); - if (WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr)) - lim_log(mac_ctx, LOG1, FL("offloadScanLearn %d"), - WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr)); + if (WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr)) + lim_log(mac_ctx, LOG1, FL("offloadScanLearn %d"), + WMA_GET_OFFLOADSCANLEARN(new_msg.bodyptr)); lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg); diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 22b735b91740..581b47dde23f 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1427,8 +1427,7 @@ static void __lim_process_sme_scan_req(tpAniSirGlobal mac_ctx, scan_req->scan_id); return; } - } - else { + } else { /* In all other cases return 'cached' scan results */ if (mac_ctx->lim.gLimRspReqd) { mac_ctx->lim.gLimRspReqd = false; @@ -4492,7 +4491,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpSirRegisterMgmtFrame sme_req = (tpSirRegisterMgmtFrame)msg_buf; struct mgmt_frm_reg_info *lim_mgmt_regn = NULL; struct mgmt_frm_reg_info *next = NULL; @@ -4504,8 +4503,8 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, sme_req->matchLen); /* First check whether entry exists already */ cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); - cdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t **) &lim_mgmt_regn); + qdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, + (qdf_list_node_t **) &lim_mgmt_regn); cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); while (lim_mgmt_regn != NULL) { @@ -4527,19 +4526,19 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, } skip_match: cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); - cdf_status = cdf_list_peek_next( + qdf_status = qdf_list_peek_next( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t *)lim_mgmt_regn, - (cdf_list_node_t **)&next); + (qdf_list_node_t *)lim_mgmt_regn, + (qdf_list_node_t **)&next); cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); lim_mgmt_regn = next; next = NULL; } if (match) { cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); - cdf_list_remove_node( + qdf_list_remove_node( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, - (cdf_list_node_t *)lim_mgmt_regn); + (qdf_list_node_t *)lim_mgmt_regn); cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); cdf_mem_free(lim_mgmt_regn); } @@ -4562,7 +4561,7 @@ skip_match: } cdf_mutex_acquire( &mac_ctx->lim.lim_frame_register_lock); - cdf_list_insert_front(&mac_ctx->lim. + qdf_list_insert_front(&mac_ctx->lim. gLimMgmtFrameRegistratinQueue, &lim_mgmt_regn->node); cdf_mutex_release( diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 6dfbcaf71c62..7f184f5d53c6 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1227,9 +1227,9 @@ typedef struct { uint32_t scan_id; struct wma_txrx_node *interfaces; pdev_cli_config_t pdevconfig; - cdf_list_t vdev_resp_queue; + qdf_list_t vdev_resp_queue; cdf_spinlock_t vdev_respq_lock; - cdf_list_t wma_hold_req_queue; + qdf_list_t wma_hold_req_queue; cdf_spinlock_t wma_hold_req_q_lock; uint32_t ht_cap_info; #ifdef WLAN_FEATURE_11AC @@ -1459,7 +1459,7 @@ struct wma_tx_ack_work_ctx { */ struct wma_target_req { cdf_mc_timer_t event_timeout; - cdf_list_node_t node; + qdf_list_node_t node; void *user_data; uint32_t msg_type; uint8_t vdev_id; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index f69b5320ef9c..018eacc5fbe6 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -307,11 +307,11 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, { struct wma_target_req *req_msg = NULL; bool found = false; - cdf_list_node_t *node1 = NULL, *node2 = NULL; - CDF_STATUS status; + qdf_list_node_t *node1 = NULL, *node2 = NULL; + QDF_STATUS status; cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); - if (CDF_STATUS_SUCCESS != cdf_list_peek_front(&wma->wma_hold_req_queue, + if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->wma_hold_req_queue, &node2)) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("unable to get msg node from request queue")); @@ -327,16 +327,16 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, continue; found = true; - status = cdf_list_remove_node(&wma->wma_hold_req_queue, node1); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGD(FL("Failed to remove request for vdev_id %d type %d"), vdev_id, type); return NULL; } break; - } while (CDF_STATUS_SUCCESS == - cdf_list_peek_next(&wma->wma_hold_req_queue, node1, + } while (QDF_STATUS_SUCCESS == + qdf_list_peek_next(&wma->wma_hold_req_queue, node1, &node2)); cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); @@ -368,11 +368,11 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, { struct wma_target_req *req_msg = NULL; bool found = false; - cdf_list_node_t *node1 = NULL, *node2 = NULL; - CDF_STATUS status; + qdf_list_node_t *node1 = NULL, *node2 = NULL; + QDF_STATUS status; cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); - if (CDF_STATUS_SUCCESS != cdf_list_peek_front(&wma->wma_hold_req_queue, + if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->wma_hold_req_queue, &node2)) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("unable to get msg node from request queue")); @@ -388,16 +388,16 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, continue; found = true; - status = cdf_list_remove_node(&wma->wma_hold_req_queue, node1); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGD(FL("Failed to remove request. vdev_id %d type %d"), vdev_id, msg_type); return NULL; } break; - } while (CDF_STATUS_SUCCESS == - cdf_list_peek_next(&wma->wma_hold_req_queue, node1, + } while (QDF_STATUS_SUCCESS == + qdf_list_peek_next(&wma->wma_hold_req_queue, node1, &node2)); cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); @@ -427,11 +427,11 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, { struct wma_target_req *req_msg = NULL; bool found = false; - cdf_list_node_t *node1 = NULL, *node2 = NULL; - CDF_STATUS status; + qdf_list_node_t *node1 = NULL, *node2 = NULL; + QDF_STATUS status; cdf_spin_lock_bh(&wma->vdev_respq_lock); - if (CDF_STATUS_SUCCESS != cdf_list_peek_front(&wma->vdev_resp_queue, + if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->vdev_resp_queue, &node2)) { cdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("unable to get target req from vdev resp queue")); @@ -447,16 +447,16 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, continue; found = true; - status = cdf_list_remove_node(&wma->vdev_resp_queue, node1); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_remove_node(&wma->vdev_resp_queue, node1); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGD(FL("Failed to target req for vdev_id %d type %d"), vdev_id, type); return NULL; } break; - } while (CDF_STATUS_SUCCESS == - cdf_list_peek_next(&wma->vdev_resp_queue, + } while (QDF_STATUS_SUCCESS == + qdf_list_peek_next(&wma->vdev_resp_queue, node1, &node2)); cdf_spin_unlock_bh(&wma->vdev_respq_lock); @@ -2615,7 +2615,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, void *params, uint32_t timeout) { struct wma_target_req *req; - CDF_STATUS status; + QDF_STATUS status; req = cdf_mem_malloc(sizeof(*req)); if (!req) { @@ -2634,8 +2634,8 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, wma_hold_req_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); - status = cdf_list_insert_back(&wma->wma_hold_req_queue, &req->node); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_insert_back(&wma->wma_hold_req_queue, &req->node); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("Failed add request in queue")); cdf_mem_free(req); @@ -2924,7 +2924,7 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, void *params, uint32_t timeout) { struct wma_target_req *req; - CDF_STATUS status; + QDF_STATUS status; req = cdf_mem_malloc(sizeof(*req)); if (!req) { @@ -2942,8 +2942,8 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, wma_vdev_resp_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->vdev_respq_lock); - status = cdf_list_insert_back(&wma->vdev_resp_queue, &req->node); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_insert_back(&wma->vdev_resp_queue, &req->node); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("Failed add request in queue for vdev_id %d type %d"), vdev_id, type); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index f92a6c76f7c6..39f263aad9ce 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1416,7 +1416,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, if (cfg_set_int(pMac, WNI_CFG_CURRENT_TX_POWER_LEVEL, privcmd->param_value) != - eSIR_SUCCESS) + eSIR_SUCCESS) WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL"); } else { @@ -1432,7 +1432,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, if (cfg_set_int(pMac, WNI_CFG_CURRENT_TX_POWER_LEVEL, privcmd->param_value) != - eSIR_SUCCESS) + eSIR_SUCCESS) WMA_LOGE("could not set WNI_CFG_CURRENT_TX_POWER_LEVEL"); } else { @@ -1723,7 +1723,7 @@ CDF_STATUS wma_open(void *cds_context, WMA_MAXNUM_PERIODIC_TX_PTRNS; /* The current firmware implementation requires the number of - * offload peers should be (number of vdevs + 1). + * offload peers should be (number of vdevs + 1). */ wma_handle->wlan_resource_config.num_offload_peers = mac_params->apMaxOffloadPeers + 1; @@ -1833,10 +1833,10 @@ CDF_STATUS wma_open(void *cds_context, goto err_event_init; } - cdf_list_init(&wma_handle->vdev_resp_queue, + qdf_list_create(&wma_handle->vdev_resp_queue, MAX_ENTRY_VDEV_RESP_QUEUE); cdf_spinlock_init(&wma_handle->vdev_respq_lock); - cdf_list_init(&wma_handle->wma_hold_req_queue, + qdf_list_create(&wma_handle->wma_hold_req_queue, MAX_ENTRY_HOLD_REQ_QUEUE); cdf_spinlock_init(&wma_handle->wma_hold_req_q_lock); cdf_atomic_init(&wma_handle->is_wow_bus_suspended); @@ -2914,21 +2914,21 @@ end: static void wma_cleanup_hold_req(tp_wma_handle wma) { struct wma_target_req *req_msg = NULL; - cdf_list_node_t *node1 = NULL; - CDF_STATUS status; + qdf_list_node_t *node1 = NULL; + QDF_STATUS status; cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); - if (cdf_list_empty(&wma->wma_hold_req_queue)) { + if (!qdf_list_size(&wma->wma_hold_req_queue)) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGI(FL("request queue is empty")); return; } - while (CDF_STATUS_SUCCESS != - cdf_list_peek_front(&wma->wma_hold_req_queue, &node1)) { + while (QDF_STATUS_SUCCESS != + qdf_list_peek_front(&wma->wma_hold_req_queue, &node1)) { req_msg = cdf_container_of(node1, struct wma_target_req, node); - status = cdf_list_remove_node(&wma->wma_hold_req_queue, node1); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("Failed to remove request for vdev_id %d type %d"), req_msg->vdev_id, req_msg->type); @@ -2949,21 +2949,21 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) static void wma_cleanup_vdev_resp(tp_wma_handle wma) { struct wma_target_req *req_msg = NULL; - cdf_list_node_t *node1 = NULL; - CDF_STATUS status; + qdf_list_node_t *node1 = NULL; + QDF_STATUS status; cdf_spin_lock_bh(&wma->vdev_respq_lock); - if (cdf_list_empty(&wma->vdev_resp_queue)) { + if (!qdf_list_size(&wma->vdev_resp_queue)) { cdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGI(FL("request queue maybe empty")); return; } - while (CDF_STATUS_SUCCESS != cdf_list_peek_front(&wma->vdev_resp_queue, + while (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->vdev_resp_queue, &node1)) { req_msg = cdf_container_of(node1, struct wma_target_req, node); - status = cdf_list_remove_node(&wma->vdev_resp_queue, node1); - if (CDF_STATUS_SUCCESS != status) { + status = qdf_list_remove_node(&wma->vdev_resp_queue, node1); + if (QDF_STATUS_SUCCESS != status) { cdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("Failed to remove request for vdev_id %d type %d"), req_msg->vdev_id, req_msg->type); -- cgit v1.2.3 From fb54ab0eac58d30a0ea9ae60628a87e3ea2edf1c Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Thu, 18 Feb 2016 18:00:46 +0530 Subject: qcacld-3.0: Add QDF status Replace CDF status with QDF status Change-Id: I7170c8ae4c5bd97a8f0f383af637bb2ec312f082 CRs-Fixed: 981188 --- core/bmi/inc/bmi.h | 14 +- core/bmi/inc/ol_fw.h | 6 +- core/bmi/src/bmi.c | 106 +- core/bmi/src/bmi_1.c | 60 +- core/bmi/src/bmi_2.c | 102 +- core/bmi/src/i_bmi.h | 40 +- core/bmi/src/ol_fw.c | 148 +- core/cdf/inc/cdf_lock.h | 39 +- core/cdf/inc/cdf_mc_timer.h | 19 +- core/cdf/inc/cdf_nbuf.h | 6 +- core/cdf/inc/cdf_status.h | 112 - core/cdf/inc/cdf_trace.h | 3 +- core/cdf/inc/cdf_util.h | 2 +- core/cdf/src/cdf_lock.c | 126 +- core/cdf/src/cdf_mc_timer.c | 90 +- core/cdf/src/cdf_memory.c | 2 +- core/cdf/src/cdf_nbuf.c | 26 +- core/cdf/src/cdf_trace.c | 4 +- core/cdf/src/i_cdf_atomic.h | 5 +- core/cdf/src/i_cdf_defer.h | 21 +- core/cdf/src/i_cdf_lock.h | 12 +- core/cdf/src/i_cdf_nbuf.h | 26 +- core/cdf/src/i_cdf_softirq_timer.h | 12 +- core/cdf/src/i_cdf_util.h | 31 +- core/cds/inc/cds_api.h | 25 +- core/cds/inc/cds_concurrency.h | 54 +- core/cds/inc/cds_crypto.h | 1 - core/cds/inc/cds_mq.h | 17 +- core/cds/inc/cds_packet.h | 11 +- core/cds/inc/cds_reg_service.h | 16 +- core/cds/inc/cds_sched.h | 24 +- core/cds/inc/cds_utils.h | 23 +- core/cds/src/cds_api.c | 262 +- core/cds/src/cds_concurrency.c | 352 +-- core/cds/src/cds_mq.c | 16 +- core/cds/src/cds_packet.c | 28 +- core/cds/src/cds_reg_service.c | 82 +- core/cds/src/cds_sched.c | 54 +- core/cds/src/cds_utils.c | 138 +- core/dp/htt/htt_rx.c | 4 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 14 +- core/dp/ol/inc/ol_txrx_osif_api.h | 16 +- core/dp/txrx/ol_tx.c | 4 +- core/dp/txrx/ol_txrx.c | 86 +- core/dp/txrx/txrx.h | 8 +- core/hdd/inc/wlan_hdd_assoc.h | 10 +- core/hdd/inc/wlan_hdd_cfg.h | 20 +- core/hdd/inc/wlan_hdd_debugfs.h | 8 +- core/hdd/inc/wlan_hdd_ftm.h | 3 +- core/hdd/inc/wlan_hdd_ipa.h | 18 +- core/hdd/inc/wlan_hdd_main.h | 42 +- core/hdd/inc/wlan_hdd_power.h | 8 +- core/hdd/inc/wlan_hdd_softap_tx_rx.h | 28 +- core/hdd/inc/wlan_hdd_tx_rx.h | 12 +- core/hdd/inc/wlan_hdd_wext.h | 12 +- core/hdd/inc/wlan_hdd_wmm.h | 34 +- core/hdd/src/wlan_hdd_assoc.c | 278 +- core/hdd/src/wlan_hdd_cfg.c | 344 +-- core/hdd/src/wlan_hdd_cfg80211.c | 213 +- core/hdd/src/wlan_hdd_cfg80211.h | 8 +- core/hdd/src/wlan_hdd_conc_ut.c | 12 +- core/hdd/src/wlan_hdd_debugfs.c | 24 +- core/hdd/src/wlan_hdd_driver_ops.c | 17 +- core/hdd/src/wlan_hdd_ext_scan.c | 62 +- core/hdd/src/wlan_hdd_ftm.c | 125 +- core/hdd/src/wlan_hdd_green_ap.c | 22 +- core/hdd/src/wlan_hdd_hostapd.c | 387 ++- core/hdd/src/wlan_hdd_hostapd.h | 14 +- core/hdd/src/wlan_hdd_ioctl.c | 186 +- core/hdd/src/wlan_hdd_ipa.c | 38 +- core/hdd/src/wlan_hdd_main.c | 508 ++-- core/hdd/src/wlan_hdd_memdump.c | 22 +- core/hdd/src/wlan_hdd_nan.c | 4 +- core/hdd/src/wlan_hdd_napi.c | 2 +- core/hdd/src/wlan_hdd_ocb.c | 30 +- core/hdd/src/wlan_hdd_oemdata.c | 28 +- core/hdd/src/wlan_hdd_p2p.c | 46 +- core/hdd/src/wlan_hdd_power.c | 146 +- core/hdd/src/wlan_hdd_scan.c | 42 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 154 +- core/hdd/src/wlan_hdd_stats.c | 10 +- core/hdd/src/wlan_hdd_subnet_detect.c | 6 +- core/hdd/src/wlan_hdd_tdls.c | 62 +- core/hdd/src/wlan_hdd_tx_rx.c | 50 +- core/hdd/src/wlan_hdd_wext.c | 239 +- core/hdd/src/wlan_hdd_wmm.c | 136 +- core/hdd/src/wlan_hdd_wowl.c | 30 +- core/mac/inc/ani_global.h | 4 +- core/mac/inc/mac_trace.h | 6 +- core/mac/inc/sir_api.h | 4 +- core/mac/src/pe/include/lim_api.h | 4 +- core/mac/src/pe/include/lim_ft.h | 8 +- core/mac/src/pe/include/lim_global.h | 2 +- core/mac/src/pe/lim/lim_admit_control.c | 4 +- core/mac/src/pe/lim/lim_api.c | 68 +- core/mac/src/pe/lim/lim_assoc_utils.c | 14 +- core/mac/src/pe/lim/lim_ft.c | 33 +- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 8 +- core/mac/src/pe/lim/lim_p2p.c | 76 +- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 5 +- core/mac/src/pe/lim/lim_process_auth_frame.c | 2 +- core/mac/src/pe/lim/lim_process_message_queue.c | 26 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 26 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 59 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 50 +- core/mac/src/pe/lim/lim_process_tdls.c | 82 +- core/mac/src/pe/lim/lim_scan_result_utils.c | 22 +- core/mac/src/pe/lim/lim_scan_result_utils.h | 6 +- core/mac/src/pe/lim/lim_send_management_frames.c | 334 +-- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 14 +- core/mac/src/pe/lim/lim_session.c | 27 +- core/mac/src/pe/lim/lim_types.h | 18 +- core/mac/src/pe/lim/lim_utils.c | 34 +- core/mac/src/pe/lim/lim_utils.h | 4 +- core/mac/src/pe/sch/sch_api.c | 29 +- core/mac/src/sys/common/inc/wlan_qct_sys.h | 19 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 41 +- .../src/sys/legacy/src/platform/src/sys_wrapper.c | 42 +- .../src/sys/legacy/src/system/src/sys_entry_func.c | 4 +- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 65 +- core/sap/inc/sap_api.h | 92 +- core/sap/src/sap_api_link_cntl.c | 180 +- core/sap/src/sap_fsm.c | 358 +-- core/sap/src/sap_internal.h | 26 +- core/sap/src/sap_module.c | 676 ++--- core/sme/inc/csr_api.h | 18 +- core/sme/inc/csr_internal.h | 75 +- core/sme/inc/csr_link_list.h | 4 +- core/sme/inc/csr_neighbor_roam.h | 58 +- core/sme/inc/csr_support.h | 12 +- core/sme/inc/nan_api.h | 4 +- core/sme/inc/oem_data_api.h | 12 +- core/sme/inc/p2p_api.h | 32 +- core/sme/inc/sme_api.h | 512 ++-- core/sme/inc/sme_ft_api.h | 2 +- core/sme/inc/sme_inside.h | 49 +- core/sme/inc/sme_internal.h | 1 - core/sme/inc/sme_power_save.h | 4 +- core/sme/inc/sme_power_save_api.h | 36 +- core/sme/inc/sme_qos_api.h | 18 +- core/sme/inc/sme_qos_internal.h | 10 +- core/sme/inc/sme_rrm_api.h | 16 +- core/sme/inc/sme_rrm_internal.h | 4 +- core/sme/src/common/sme_api.c | 3040 ++++++++++---------- core/sme/src/common/sme_ft_api.c | 46 +- core/sme/src/common/sme_power_save.c | 264 +- core/sme/src/csr/csr_api_roam.c | 1696 +++++------ core/sme/src/csr/csr_api_scan.c | 694 ++--- core/sme/src/csr/csr_cmd_process.c | 12 +- core/sme/src/csr/csr_inside_api.h | 274 +- core/sme/src/csr/csr_link_list.c | 16 +- core/sme/src/csr/csr_neighbor_roam.c | 328 +-- core/sme/src/csr/csr_tdls_process.c | 120 +- core/sme/src/csr/csr_util.c | 124 +- core/sme/src/nan/nan_api.c | 22 +- core/sme/src/oem_data/oem_data_api.c | 78 +- core/sme/src/p2p/p2p_api.c | 64 +- core/sme/src/qos/sme_qos.c | 710 ++--- core/sme/src/rrm/sme_rrm.c | 170 +- core/utils/logging/inc/wlan_logging_sock_svc.h | 1 - core/utils/pktlog/pktlog_ac.c | 4 +- core/utils/ptt/inc/wlan_ptt_sock_svc.h | 1 - core/utils/ptt/src/wlan_ptt_sock_svc.c | 1 - core/wma/inc/wma.h | 35 +- core/wma/inc/wma_api.h | 54 +- core/wma/inc/wma_if.h | 34 +- core/wma/inc/wma_internal.h | 190 +- core/wma/inc/wma_types.h | 28 +- core/wma/src/wlan_qct_wma_legacy.c | 4 +- core/wma/src/wma_data.c | 237 +- core/wma/src/wma_dev_if.c | 220 +- core/wma/src/wma_features.c | 550 ++-- core/wma/src/wma_main.c | 335 +-- core/wma/src/wma_mgmt.c | 82 +- core/wma/src/wma_ocb.c | 66 +- core/wma/src/wma_power.c | 122 +- core/wma/src/wma_scan_roam.c | 612 ++-- core/wma/src/wma_utils.c | 164 +- 178 files changed, 9644 insertions(+), 9780 deletions(-) delete mode 100644 core/cdf/inc/cdf_status.h diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index b016e8769596..7ceb675a0e2a 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -38,7 +38,7 @@ #include "hif.h" struct ol_context; -CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); +QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); void ol_cds_free(void); /** @@ -64,22 +64,22 @@ void ol_init_ini_config(struct ol_context *ol_ctx, struct ol_config_info *cfg); #ifdef HIF_PCI void bmi_cleanup(struct ol_context *scn); -CDF_STATUS bmi_done(struct ol_context *ol_ctx); -CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); +QDF_STATUS bmi_done(struct ol_context *ol_ctx); +QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); #else static inline void bmi_cleanup(struct ol_context *scn) { return; } -static inline CDF_STATUS bmi_done(struct ol_context *ol_ctx) +static inline QDF_STATUS bmi_done(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) +static inline QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif #endif /* _BMI_H_ */ diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index c26c26aaf279..322c0e092886 100644 --- a/core/bmi/inc/ol_fw.h +++ b/core/bmi/inc/ol_fw.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,9 +48,9 @@ #define AR6320_DEV_VERSION 0x1000000 #ifdef HIF_PCI -void ol_target_failure(void *instance, CDF_STATUS status); +void ol_target_failure(void *instance, QDF_STATUS status); #else -static inline void ol_target_failure(void *instance, CDF_STATUS status) +static inline void ol_target_failure(void *instance, QDF_STATUS status) { return; } diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 782792fb2c4a..3e72c76af96c 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -37,7 +37,7 @@ /* Enable BMI_TEST COMMANDs; The Value 0x09 is randomly choosen */ #define BMI_TEST_ENABLE (0x09) -static CDF_STATUS +static QDF_STATUS bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, uint32_t length, struct ol_context *ol_ctx) { @@ -53,10 +53,10 @@ bmi_command_test(uint32_t command, uint32_t address, uint8_t *data, default: break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_init(struct ol_context *ol_ctx) +QDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); struct hif_opaque_softc *scn = ol_ctx->scn; @@ -65,12 +65,12 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!scn) { BMI_ERR("Invalid scn Context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } info->bmi_done = false; @@ -81,7 +81,7 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) &info->bmi_cmd_da, 0); if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } @@ -94,12 +94,12 @@ CDF_STATUS bmi_init(struct ol_context *ol_ctx) goto end; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; end: cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } void bmi_cleanup(struct ol_context *ol_ctx) @@ -128,22 +128,22 @@ void bmi_cleanup(struct ol_context *ol_ctx) } -CDF_STATUS bmi_done(struct ol_context *ol_ctx) +QDF_STATUS bmi_done(struct ol_context *ol_ctx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NO_BMI) return status; status = bmi_done_local(ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("BMI_DONE Failed status:%d", status); return status; } -CDF_STATUS +QDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_context *ol_ctx) { @@ -158,12 +158,12 @@ bmi_get_target_info(struct bmi_target_info *targ_info, if (info->bmi_done) { BMI_ERR("BMI Phase is Already Done"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("%s:BMI CMD/RSP Buffer is NULL", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_GET_TARGET_INFO; @@ -175,11 +175,11 @@ bmi_get_target_info(struct bmi_target_info *targ_info, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Failed to target info: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(targ_info, bmi_rsp_buff, length); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_BMI_2 @@ -194,7 +194,7 @@ static inline uint32_t bmi_get_test_addr(void) } #endif -CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) +QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) { uint8_t data[10], out[10]; uint32_t address; @@ -202,12 +202,12 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) struct hif_opaque_softc *scn = ol_ctx->scn; if (NO_BMI) - return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + return QDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } #ifdef CONFIG_CNSS if (BMI_TEST_ENABLE == cnss_get_bmi_setup()) { @@ -215,7 +215,7 @@ CDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) BMI_DBG("ret:%d writing data:%s\n", ret, data); address = bmi_get_test_addr(); - if (bmi_init(ol_ctx) != CDF_STATUS_SUCCESS) { + if (bmi_init(ol_ctx) != QDF_STATUS_SUCCESS) { BMI_WARN("BMI_INIT Failed; No Memory!"); goto end; } @@ -229,7 +229,7 @@ end: return bmi_firmware_download(ol_ctx); } -CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, +QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -248,7 +248,7 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI Read SOC Register:device: 0x%p, address: 0x%x", @@ -266,15 +266,15 @@ CDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, bmi_rsp_buff, ¶m_len, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_DBG("Unable to read from the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Read SOC Register: Exit value: %d", *param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, +QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -292,7 +292,7 @@ CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("SOC Register Write:device:0x%p, addr:0x%x, param:%d", @@ -311,14 +311,14 @@ CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, NULL, NULL, 0); if (status) { BMI_ERR("Unable to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("BMI Read SOC Register: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -337,7 +337,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI Send LZ Data: device: 0x%p, length: %d", @@ -363,17 +363,17 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; } BMI_DBG("BMI LZ Data: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, +QDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -394,7 +394,7 @@ CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_ERR("Sign Stream start:device:0x%p, addr:0x%x, length:%d", @@ -431,16 +431,16 @@ CDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, if (status) { BMI_ERR("Unable to write to the device: status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; } BMI_DBG("BMI SIGN Stream Start: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) { uint32_t cid; @@ -457,7 +457,7 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_DBG("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } BMI_DBG("BMI LZ Stream Start: (device: 0x%p, address: 0x%x)", scn, address); @@ -473,23 +473,23 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) if (status) { BMI_ERR("Unable to Start LZ Stream to the device status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } BMI_DBG("BMI LZ Stream: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t last_word = 0; uint32_t last_word_offset = length & ~0x3; uint32_t unaligned_bytes = length & 0x3; status = bmilz_stream_start(address, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto end; /* copy the last word into a zero padded buffer */ @@ -499,13 +499,13 @@ bmi_fast_download(uint32_t address, uint8_t *buffer, status = bmilz_data(buffer, last_word_offset, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto end; if (unaligned_bytes) status = bmilz_data((uint8_t *) &last_word, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) /* * Close compressed stream and open a new (fake) one. * This serves mainly to flush Target caches. @@ -517,23 +517,23 @@ end: /** * ol_cds_init() - API to initialize global CDS OL Context - * @cdf_dev: CDF Device + * @cdf_dev: QDF Device * @hif_ctx: HIF Context * * Return: Success/Failure */ -CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) +QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) { struct ol_context *ol_info; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NO_BMI) - return CDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + return QDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ - status = cds_alloc_context(cds_get_global_context(), CDF_MODULE_ID_BMI, + status = cds_alloc_context(cds_get_global_context(), QDF_MODULE_ID_BMI, (void **)&ol_info, sizeof(*ol_info)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("%s: CDS Allocation failed for ol_bmi context", __func__); return status; @@ -555,10 +555,10 @@ CDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) */ void ol_cds_free(void) { - struct ol_context *ol_info = cds_get_context(CDF_MODULE_ID_BMI); + struct ol_context *ol_info = cds_get_context(QDF_MODULE_ID_BMI); if (NO_BMI) return; - cds_free_context(cds_get_global_context(), CDF_MODULE_ID_BMI, ol_info); + cds_free_context(cds_get_global_context(), QDF_MODULE_ID_BMI, ol_info); } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index 331d1db27dd9..d95dbe75b1bb 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -30,7 +30,7 @@ /* APIs visible to the driver */ -CDF_STATUS +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { @@ -48,12 +48,12 @@ bmi_read_memory(uint32_t address, if (info->bmi_done) { BMI_DBG("command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!info->bmi_cmd_buff || !info->bmi_rsp_buff) { BMI_ERR("BMI Initialization hasn't done"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + sizeof(cid) + @@ -88,7 +88,7 @@ bmi_read_memory(uint32_t address, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("Unable to read from the device"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (remaining == rxlen) { cdf_mem_copy(&buffer[length - remaining + align], @@ -103,10 +103,10 @@ bmi_read_memory(uint32_t address, } BMI_DBG("BMI Read Memory: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -124,12 +124,12 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff) { BMI_ERR("BMI initialization hasn't done"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); @@ -170,7 +170,7 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (status) { BMI_ERR("Unable to write to the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; address += txlen; @@ -178,10 +178,10 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, BMI_DBG("BMI Write Memory: Exit"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -198,12 +198,12 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("%s:BMI CMD/RSP Buffer is NULL", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(size)); @@ -228,40 +228,40 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) bmi_rsp_buff, ¶m_len, 0); if (status) { BMI_ERR("Unable to read from the device status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Execute: Exit (param: %d)", *param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -inline CDF_STATUS +inline QDF_STATUS bmi_no_command(struct ol_context *ol_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; - CDF_STATUS status; + QDF_STATUS status; struct bmi_target_info targ_info; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); cdf_mem_zero(&targ_info, sizeof(targ_info)); /* Initialize BMI */ status = bmi_init(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Initialization Failed err:%d", status); return status; } /* Get target information */ status = bmi_get_target_info(&targ_info, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Target Info get failed: status:%d", status); return status; } @@ -271,19 +271,19 @@ bmi_firmware_download(struct ol_context *ol_ctx) /* Configure target */ status = ol_configure_target(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI Configure Target Failed status:%d", status); return status; } status = ol_download_firmware(ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("BMI Download Firmware Failed Status:%d", status); return status; } -CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; int status; @@ -295,18 +295,18 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s: Invalid device pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } info = GET_BMI_CONTEXT(ol_ctx); if (info->bmi_done) { BMI_DBG("bmi_done_local skipped"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } cmd = info->bmi_cmd_da; @@ -320,7 +320,7 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) if (!info->bmi_cmd_buff) { BMI_ERR("Invalid scn BMICmdBuff"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); @@ -329,7 +329,7 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) sizeof(cid), NULL, NULL, 0); if (status) { BMI_ERR("Failed to write to the device; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (info->bmi_cmd_buff) { @@ -346,5 +346,5 @@ CDF_STATUS bmi_done_local(struct ol_context *ol_ctx) info->bmi_rsp_da = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 79de973756db..ef697ecf6412 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -33,7 +33,7 @@ */ #define BMI_LOAD_IMAGE 18 -CDF_STATUS +QDF_STATUS bmi_no_command(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -49,12 +49,12 @@ bmi_no_command(struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed: BMI DONE ALREADY"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_NO_COMMAND; @@ -66,18 +66,18 @@ bmi_no_command(struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to write bmi no command status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("bmi no command response error ret 0x%x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -94,17 +94,17 @@ bmi_done_local(struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } if (!cdf_dev->dev) { BMI_ERR("%s Invalid Device pointer", __func__); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_DONE; @@ -117,13 +117,13 @@ bmi_done_local(struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to close BMI on target status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("BMI DONE response failed:%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (info->bmi_cmd_buff) { @@ -140,10 +140,10 @@ bmi_done_local(struct ol_context *ol_ctx) info->bmi_rsp_da = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { uint32_t cid; @@ -164,12 +164,12 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("BMI Initialization is not happened"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); @@ -207,20 +207,20 @@ CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, BMI_EXCHANGE_TIMEOUT_MS); if (status) { BMI_ERR("BMI Write Memory Failed status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("BMI Write memory response fail: %x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } remaining -= txlen; address += txlen; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) { @@ -240,11 +240,11 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("BMI Initialization is not done"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + size)); @@ -278,14 +278,14 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, if (status) { BMI_ERR("BMI Read memory failed status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("bmi read memory response fail %x", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&buffer[length - remaining], @@ -293,10 +293,10 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, remaining -= rxlen; address += rxlen; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; @@ -312,12 +312,12 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for bmi buffers"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } cid = BMI_EXECUTE; @@ -330,24 +330,24 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) if (status) { BMI_ERR("Failed to do BMI_EXECUTE status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS bmi_load_image(dma_addr_t address, uint32_t size, struct ol_context *ol_ctx) { uint32_t cid; - CDF_STATUS status; + QDF_STATUS status; uint32_t offset; uint32_t length; uint8_t ret = 0; @@ -362,12 +362,12 @@ bmi_load_image(dma_addr_t address, if (info->bmi_done) { BMI_ERR("Command disallowed"); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if (!bmi_cmd_buff || !bmi_rsp_buff) { BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); @@ -396,41 +396,41 @@ bmi_load_image(dma_addr_t address, if (status) { BMI_ERR("BMI Load Image Failed; status:%d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) +static QDF_STATUS bmi_enable(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_target_info targ_info; struct image_desc_info image_desc_info; - CDF_STATUS status; + QDF_STATUS status; struct hif_target_info *tgt_info; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); if (!scn) { BMI_ERR("Invalid scn context"); bmi_assert(0); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } tgt_info = hif_get_target_info_handle(scn); if (info->bmi_cmd_buff == NULL || info->bmi_rsp_buff == NULL) { BMI_ERR("bmi_open failed!"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } status = bmi_get_target_info(&targ_info, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; BMI_DBG("%s: target type 0x%x, target ver 0x%x", __func__, @@ -441,13 +441,13 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) if (cnss_get_fw_image(&image_desc_info) != 0) { BMI_ERR("Failed to get fw image"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = bmi_load_image(image_desc_info.bdata_addr, image_desc_info.bdata_size, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Load board data failed! status:%d", status); return status; } @@ -455,27 +455,27 @@ static CDF_STATUS bmi_enable(struct ol_context *ol_ctx) status = bmi_load_image(image_desc_info.fw_addr, image_desc_info.fw_size, ol_ctx); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) BMI_ERR("Load fw image failed! status:%d", status); return status; } -CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx) { - CDF_STATUS status; + QDF_STATUS status; if (NO_BMI) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; status = bmi_init(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_INIT Failed status:%d", status); goto end; } status = bmi_enable(ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_ENABLE failed status:%d\n", status); goto err_bmi_enable; } diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index caef15d1b98a..2638981efcb2 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -75,16 +75,16 @@ /* BMI LOGGING WRAPPERS */ -#define BMI_LOG(level, args...) CDF_TRACE(CDF_MODULE_ID_BMI, \ +#define BMI_LOG(level, args...) QDF_TRACE(QDF_MODULE_ID_BMI, \ level, ##args) -#define BMI_ERR(args ...) BMI_LOG(CDF_TRACE_LEVEL_ERROR, args) -#define BMI_DBG(args ...) BMI_LOG(CDF_TRACE_LEVEL_DEBUG, args) -#define BMI_WARN(args ...) BMI_LOG(CDF_TRACE_LEVEL_WARN, args) -#define BMI_INFO(args ...) BMI_LOG(CDF_TRACE_LEVEL_INFO, args) +#define BMI_ERR(args ...) BMI_LOG(QDF_TRACE_LEVEL_ERROR, args) +#define BMI_DBG(args ...) BMI_LOG(QDF_TRACE_LEVEL_DEBUG, args) +#define BMI_WARN(args ...) BMI_LOG(QDF_TRACE_LEVEL_WARN, args) +#define BMI_INFO(args ...) BMI_LOG(QDF_TRACE_LEVEL_INFO, args) /* End of BMI Logging Wrappers */ /* BMI Assert Wrappers */ -#define bmi_assert CDF_BUG +#define bmi_assert QDF_BUG /* * Although we had envisioned BMI to run on top of HTC, this is not how the * final implementation ended up. On the Target side, BMI is a part of the BSP @@ -146,7 +146,7 @@ struct bmi_info { * struct ol_context - Structure to hold OL context * @bmi: BMI info * @cal_in_flash: For Firmware Flash Download - * @cdf_dev: CDF Device + * @cdf_dev: QDF Device * @scn: HIF Context * @ramdump_work: WorkQueue for Ramdump collection * @tgt_def: Target Defnition pointer @@ -167,26 +167,26 @@ struct ol_context { #define GET_BMI_CONTEXT(ol_ctx) ((struct bmi_info *)ol_ctx) -CDF_STATUS bmi_execute(uint32_t address, uint32_t *param, +QDF_STATUS bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx); -CDF_STATUS bmi_init(struct ol_context *ol_ctx); -CDF_STATUS bmi_no_command(struct ol_context *ol_ctx); -CDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_init(struct ol_context *ol_ctx); +QDF_STATUS bmi_no_command(struct ol_context *ol_ctx); +QDF_STATUS bmi_read_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, +QDF_STATUS bmi_fast_download(uint32_t address, uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx); -CDF_STATUS bmi_read_soc_register(uint32_t address, +QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct ol_context *ol_ctx); -CDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, +QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct ol_context *ol_ctx); -CDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, +QDF_STATUS bmi_get_target_info(struct bmi_target_info *targ_info, struct ol_context *ol_ctx); -CDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); -CDF_STATUS bmi_done_local(struct ol_context *ol_ctx); -CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); -CDF_STATUS ol_configure_target(struct ol_context *ol_ctx); +QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx); +QDF_STATUS bmi_done_local(struct ol_context *ol_ctx); +QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx); +QDF_STATUS ol_configure_target(struct ol_context *ol_ctx); void ramdump_work_handler(void *arg); struct ol_config_info *ol_get_ini_handle(struct ol_context *ol_ctx); #endif diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 0b04d5169dc4..38b5674e1a02 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -124,7 +124,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) digest, SHA256_DIGEST_SIZE); cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, hash, SHA256_DIGEST_SIZE); - ret = CDF_STATUS_E_FAILURE; + ret = QDF_STATUS_E_FAILURE; } #endif end: @@ -280,7 +280,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (!fw_entry || !fw_entry->data) { BMI_ERR("Invalid fw_entries"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } fw_entry_size = fw_entry->size; @@ -290,7 +290,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (ol_check_fw_hash(fw_entry->data, fw_entry_size, file)) { BMI_ERR("Hash Check failed for file:%s", filename); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } #endif @@ -303,7 +303,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (!temp_eeprom) { BMI_ERR("%s: Memory allocation failed", __func__); release_firmware(fw_entry); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(temp_eeprom, (uint8_t *) fw_entry->data, @@ -363,7 +363,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, if (fw_entry_size < sizeof(SIGN_HEADER_T)) { BMI_ERR("Invalid binary size %d", fw_entry_size); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } @@ -379,7 +379,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, sizeof(SIGN_HEADER_T), ol_ctx); if (status != EOK) { BMI_ERR("unable to start sign stream"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto end; } @@ -449,7 +449,7 @@ end: if (status != EOK) { BMI_ERR("%s, BMI operation failed: %d", __func__, __LINE__); release_firmware(fw_entry); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } release_firmware(fw_entry); @@ -558,7 +558,7 @@ void ramdump_work_handler(void *data) hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_failure_state)), (uint8_t *)&host_interest_address, - sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { + sizeof(uint32_t)) != QDF_STATUS_SUCCESS) { BMI_ERR("HifDiagReadiMem FW Dump Area Pointer failed!"); ol_copy_ramdump(ramdump_scn); cnss_device_crashed(); @@ -569,7 +569,7 @@ void ramdump_work_handler(void *data) if (hif_diag_read_mem(ramdump_scn, host_interest_address, (uint8_t *) &dram_dump_values[0], - 4 * sizeof(uint32_t)) != CDF_STATUS_SUCCESS) { + 4 * sizeof(uint32_t)) != QDF_STATUS_SUCCESS) { BMI_ERR("HifDiagReadiMem FW Dump Area failed!"); goto out_fail; } @@ -607,7 +607,7 @@ void ol_schedule_fw_indication_work(struct hif_opaque_softc *scn) } #endif -void ol_target_failure(void *instance, CDF_STATUS status) +void ol_target_failure(void *instance, QDF_STATUS status) { struct ol_context *ol_ctx = instance; struct hif_opaque_softc *scn = ol_ctx->scn; @@ -663,7 +663,7 @@ void ol_target_failure(void *instance, CDF_STATUS status) return; } -CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) +QDF_STATUS ol_configure_target(struct ol_context *ol_ctx) { uint32_t param; #ifdef CONFIG_CNSS @@ -680,18 +680,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_app_host_interest)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_write_memory for htc version failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* set the firmware mode to STA/IBSS/AP */ { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting fwmode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* TODO following parameters need to be re-visited. */ @@ -711,9 +711,9 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting fwmode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -722,18 +722,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) /* set the firmware to disable CDC max perf WAR */ if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI READ for setting cdc max perf failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_DISABLE_CDC_MAX_PERF_WAR; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("setting cdc max perf failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif /* CONFIG_CDC_MAX_PERF_WAR */ @@ -747,19 +747,19 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (!ret && cap.cap_flag & CNSS_HAS_EXTERNAL_SWREG) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("bmi_read_memory for setting" "external SWREG failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_USE_EXT_LDO; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE for setting external SWREG fail"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif @@ -768,18 +768,18 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (ini_cfg->enable_lpass_support) { if (bmi_read_memory(hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI READ:Setting LPASS Support failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param |= HI_OPTION_DBUART_SUPPORT; if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_option_flag2)), - (uint8_t *)¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *)¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI_READ for setting LPASS Support fail"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } #endif @@ -794,9 +794,9 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_be)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("setting host CPU BE mode failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -805,12 +805,12 @@ CDF_STATUS ol_configure_target(struct ol_context *ol_ctx) if (bmi_write_memory( hif_hia_item_address(target_type, offsetof(struct host_interest_s, hi_fw_swap)), - (uint8_t *) ¶m, 4, ol_ctx) != CDF_STATUS_SUCCESS) { + (uint8_t *) ¶m, 4, ol_ctx) != QDF_STATUS_SUCCESS) { BMI_ERR("BMI WRITE failed setting FW data/desc swap flags"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static int @@ -821,11 +821,11 @@ ol_check_dataset_patch(struct hif_opaque_softc *scn, uint32_t *address) } -CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, +QDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, struct cmnos_clock_s *clock_s) { if (!clock_s) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; switch (refclk) { case SOC_REFCLK_48_MHZ: @@ -876,20 +876,20 @@ CDF_STATUS ol_fw_populate_clk_settings(A_refclk_speed_t refclk, clock_s->pll_settling_time = 1024; clock_s->refclk_hz = 0; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } clock_s->refclk_hz = refclk_speed_to_hz[refclk]; clock_s->wlan_pll.refdiv = 0; clock_s->wlan_pll.outdiv = 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) +QDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) { struct hif_opaque_softc *hif = ol_ctx->scn; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t addr = 0; uint32_t reg_val = 0; uint32_t mem_val = 0; @@ -927,14 +927,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) addr = (RTC_SOC_BASE_ADDRESS | EFUSE_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read EFUSE Addr"); goto end; } status = ol_fw_populate_clk_settings(EFUSE_XTAL_SEL_GET(reg_val), &clock_s); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to set clock settings"); goto end; } @@ -944,7 +944,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | BB_PLL_CONFIG_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CONFIG Addr"); goto end; } @@ -954,14 +954,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val |= (BB_PLL_CONFIG_FRAC_SET(clock_s.wlan_pll.rnfrac) | BB_PLL_CONFIG_OUTDIV_SET(clock_s.wlan_pll.outdiv)); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CONFIG Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CONFIG Addr"); goto end; } @@ -971,7 +971,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_SETTLE_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_SETTLE Addr"); goto end; } @@ -980,14 +980,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_SETTLE_TIME_MASK; reg_val |= WLAN_PLL_SETTLE_TIME_SET(clock_s.pll_settling_time); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_SETTLE Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_SETTLE Addr"); goto end; } @@ -997,7 +997,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CORE_CLK_CTRL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CLK_CTRL Addr"); goto end; } @@ -1006,14 +1006,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~SOC_CORE_CLK_CTRL_DIV_MASK; reg_val |= SOC_CORE_CLK_CTRL_DIV_SET(1); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_CTRL Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CLK_CTRL Addr"); goto end; } @@ -1023,7 +1023,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = 1; status = bmi_write_memory(cmnos_core_clk_div_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CLK_DIV Addr"); goto end; } @@ -1032,7 +1032,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr"); goto end; } @@ -1044,14 +1044,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) WLAN_PLL_CONTROL_DIV_SET(clock_s.wlan_pll.div) | WLAN_PLL_CONTROL_NOPWD_SET(1)); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr"); goto end; } @@ -1063,7 +1063,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read RTC_SYNC_STATUS Addr"); goto end; } @@ -1073,7 +1073,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for CTRL_BYPASS"); goto end; } @@ -1082,14 +1082,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_CONTROL_BYPASS_MASK; reg_val |= WLAN_PLL_CONTROL_BYPASS_SET(0); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for CTRL_BYPASS"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for CTRL_BYPASS"); goto end; } @@ -1100,7 +1100,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; status = bmi_read_soc_register((RTC_WMAC_BASE_ADDRESS | RTC_SYNC_STATUS_OFFSET), ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read SYNC_STATUS Addr"); goto end; } @@ -1110,7 +1110,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_SOC_BASE_ADDRESS | SOC_CPU_CLOCK_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read CPU_CLK Addr"); goto end; } @@ -1119,14 +1119,14 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~SOC_CPU_CLOCK_STANDARD_MASK; reg_val |= SOC_CPU_CLOCK_STANDARD_SET(1); status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_CLK Addr"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back CPU_CLK Addr"); goto end; } @@ -1136,7 +1136,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val = 0; addr = (RTC_WMAC_BASE_ADDRESS | WLAN_PLL_CONTROL_OFFSET); status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read PLL_CTRL Addr for NOPWD"); goto end; } @@ -1144,13 +1144,13 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) reg_val &= ~WLAN_PLL_CONTROL_NOPWD_MASK; status = bmi_write_soc_register(addr, reg_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_CTRL Addr for NOPWD"); goto end; } reg_val = 0; status = bmi_read_soc_register(addr, ®_val, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to read back PLL_CTRL Addr for NOPWD"); goto end; } @@ -1160,7 +1160,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = 1; status = bmi_write_memory(cmnos_cpu_pll_init_done_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write PLL_INIT Addr"); goto end; } @@ -1168,7 +1168,7 @@ CDF_STATUS ol_patch_pll_switch(struct ol_context *ol_ctx) mem_val = TARGET_CPU_FREQ; status = bmi_write_memory(cmnos_cpu_speed_addr, (uint8_t *) &mem_val, 4, ol_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to write CPU_SPEED Addr"); goto end; } @@ -1184,7 +1184,7 @@ end: void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) { struct codeswap_codeseg_info wlan_codeswap; - CDF_STATUS rv; + QDF_STATUS rv; if (cnss_get_codeswap_struct(&wlan_codeswap)) { BMI_ERR("%s: failed to get codeswap structure", __func__); @@ -1195,7 +1195,7 @@ void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) (uint8_t *) &wlan_codeswap, sizeof(wlan_codeswap), ol_ctx); - if (rv != CDF_STATUS_SUCCESS) { + if (rv != QDF_STATUS_SUCCESS) { BMI_ERR("Failed to Write 0xa0000 to Target"); return; } @@ -1203,12 +1203,12 @@ void ol_transfer_codeswap_struct(struct ol_context *ol_ctx) } #endif -CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) +QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) { struct hif_opaque_softc *scn = ol_ctx->scn; uint32_t param, address = 0; int status = !EOK; - CDF_STATUS ret; + QDF_STATUS ret; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); uint32_t target_type = tgt_info->target_type; @@ -1220,7 +1220,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) target_type, target_version)) { BMI_ERR("%s: No FW files from CNSS driver", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* Transfer Board Data from Target EEPROM to Target RAM */ @@ -1237,7 +1237,7 @@ CDF_STATUS ol_download_firmware(struct ol_context *ol_ctx) ret = ol_patch_pll_switch(ol_ctx); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { BMI_ERR("pll switch failed. status %d", ret); return ret; } diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h index a477f9b586b7..cdc3ada5313b 100644 --- a/core/cdf/inc/cdf_lock.h +++ b/core/cdf/inc/cdf_lock.h @@ -39,7 +39,6 @@ */ /* Include Files */ -#include "cdf_status.h" #include "qdf_status.h" #include "i_cdf_lock.h" @@ -107,10 +106,10 @@ cdf_semaphore_release(cdf_device_t osdev, cdf_semaphore_t *m) * a failure. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); /** * cdf_mutex_acquire () - acquire a CDF lock @@ -122,10 +121,10 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); * lock in the locked state with the calling thread as its owner. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); /** * cdf_mutex_release() - release a CDF lock @@ -138,10 +137,10 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); * initialized, an error is returned. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); /** * cdf_mutex_destroy() - destroy a CDF lock @@ -159,10 +158,10 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock); +QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock); /** * cdf_spinlock_init() - initialize a spinlock @@ -217,7 +216,7 @@ static inline void cdf_spin_unlock_bh(cdf_spinlock_t *lock) * CDF status success : if wake lock is initialized * CDF status fialure : if wake lock was not initialized */ -CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); +QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); /** * cdf_wake_lock_acquire() - acquires a wake lock @@ -228,7 +227,7 @@ CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); +QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); /** * cdf_wake_lock_timeout_acquire() - acquires a wake lock with a timeout @@ -239,7 +238,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, +QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, uint32_t reason); /** @@ -251,7 +250,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); +QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); /** * cdf_wake_lock_destroy() - destroys a wake lock @@ -261,15 +260,15 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock); +QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock); struct hif_pm_runtime_lock; typedef struct hif_pm_runtime_lock *cdf_runtime_lock_t; -CDF_STATUS cdf_runtime_pm_get(void); -CDF_STATUS cdf_runtime_pm_put(void); -CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock); -CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock); +QDF_STATUS cdf_runtime_pm_get(void); +QDF_STATUS cdf_runtime_pm_put(void); +QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock); +QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock); cdf_runtime_lock_t cdf_runtime_lock_init(const char *name); void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock); @@ -281,7 +280,7 @@ void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); +QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); /** * cdf_spinlock_release() - release a spin lock @@ -291,7 +290,7 @@ CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); * CDF status success : if wake lock is acquired * CDF status fialure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock); +QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock); #define cdf_spin_lock(_lock) __cdf_spin_lock(_lock) #define cdf_spin_unlock(_lock) __cdf_spin_unlock(_lock) diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index ff7a857fd121..67662966ef63 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -36,7 +36,6 @@ /* Include Files */ #include -#include #include #include #include @@ -150,7 +149,7 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); * within the tx thread flow. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER @@ -158,13 +157,13 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); cdf_mc_timer_init_debug(timer, timerType, callback, userdata, \ __FILE__, __LINE__) -CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, +QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, uint32_t lineNum); #else -CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData); #endif @@ -187,10 +186,10 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); /** * cdf_mc_timer_start() - start a CDF Timer object @@ -206,10 +205,10 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); * or has been cancelled. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); +QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); /** * cdf_mc_timer_stop() - stop a CDF Timer @@ -221,10 +220,10 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); * was created and can be started again via a call to cdf_mc_timer_start(). * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); +QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); /** * cdf_mc_timer_get_system_ticks() - get the system time in 10ms ticks diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 4a5234783df0..ac968498e073 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -95,7 +95,7 @@ typedef __cdf_nbuf_queue_t cdf_nbuf_queue_t; * * Return: Status of the operation */ -static inline CDF_STATUS +static inline QDF_STATUS cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { return __cdf_nbuf_map(osdev, buf, dir); @@ -123,7 +123,7 @@ cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * * Return: Status of the operation */ -static inline CDF_STATUS +static inline QDF_STATUS cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { return __cdf_nbuf_map_single(osdev, buf, dir); @@ -448,7 +448,7 @@ static inline cdf_nbuf_t cdf_nbuf_copy(cdf_nbuf_t buf) * * Return: Status of the call - 0 successful */ -static inline CDF_STATUS cdf_nbuf_cat(cdf_nbuf_t dst, cdf_nbuf_t src) +static inline QDF_STATUS cdf_nbuf_cat(cdf_nbuf_t dst, cdf_nbuf_t src) { return __cdf_nbuf_cat(dst, src); } diff --git a/core/cdf/inc/cdf_status.h b/core/cdf/inc/cdf_status.h deleted file mode 100644 index 306209105bd5..000000000000 --- a/core/cdf/inc/cdf_status.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_STATUS_H) -#define __CDF_STATUS_H - -#include -/** - * DOC: cdf_status - * - * Connectivity driver framework (CDF) status codes - * - * Basic status codes/definitions used by CDF - */ - -/** - * typedef CDF_STATUS - CDF error codes - * @CDF_STATUS_SUCCESS: success - * @CDF_STATUS_E_RESOURCES: system resource(other than memory) not available - * @CDF_STATUS_E_NOMEM: not enough memory - * @CDF_STATUS_E_AGAIN: try again - * @CDF_STATUS_E_INVAL: invalid request - * @CDF_STATUS_E_FAULT: system fault - * @CDF_STATUS_E_ALREADY: another request already in progress - * @CDF_STATUS_E_BADMSG: bad message - * @CDF_STATUS_E_BUSY: device or resource busy - * @CDF_STATUS_E_CANCELED: request cancelled - * @CDF_STATUS_E_ABORTED: request aborted - * @CDF_STATUS_E_NOSUPPORT: request not supported - * @CDF_STATUS_E_PERM: operation not permitted - * @CDF_STATUS_E_EMPTY: empty condition - * @CDF_STATUS_E_EXISTS: existence failure - * @CDF_STATUS_E_TIMEOUT: operation timeout - * @CDF_STATUS_E_FAILURE: unknown reason do not use unless nothign else applies - * @CDF_STATUS_NOT_INITIALIZED: resource not initialized - * @CDF_STATUS_E_NULL_VALUE: request is null - * @CDF_STATUS_PMC_PENDING: request pendign in pmc - * @CDF_STATUS_PMC_DISABLED: pmc is disabled - * @CDF_STATUS_PMC_NOT_NOW: pmc not ready now - * @CDF_STATUS_PMC_AC_POWER: pmc ac power - * @CDF_STATUS_PMC_SYS_ERROR: pmc system error - * @CDF_STATUS_HEARTBEAT_TMOUT: hearbeat timeout error - * @CDF_STATUS_NTH_BEACON_DELIVERY: Nth beacon delivery - * @CDF_STATUS_CSR_WRONG_STATE: csr in wrong state - * @CDF_STATUS_FT_PREAUTH_KEY_SUCCESS: ft preauth key success - * @CDF_STATUS_FT_PREAUTH_KEY_FAILED: ft preauth key failed - * @CDF_STATUS_CMD_NOT_QUEUED: command not queued - * @CDF_STATUS_FW_MSG_TIMEDOUT: target message timeout - * @CDF_STATUS_MAX: not a realy value just a place holder for max - */ -typedef enum { - CDF_STATUS_SUCCESS, - CDF_STATUS_E_RESOURCES, - CDF_STATUS_E_NOMEM, - CDF_STATUS_E_AGAIN, - CDF_STATUS_E_INVAL, - CDF_STATUS_E_FAULT, - CDF_STATUS_E_ALREADY, - CDF_STATUS_E_BADMSG, - CDF_STATUS_E_BUSY, - CDF_STATUS_E_CANCELED, - CDF_STATUS_E_ABORTED, - CDF_STATUS_E_NOSUPPORT, - CDF_STATUS_E_PERM, - CDF_STATUS_E_EMPTY, - CDF_STATUS_E_EXISTS, - CDF_STATUS_E_TIMEOUT, - CDF_STATUS_E_FAILURE, - CDF_STATUS_NOT_INITIALIZED, - CDF_STATUS_E_NULL_VALUE, - CDF_STATUS_PMC_PENDING, - CDF_STATUS_PMC_DISABLED, - CDF_STATUS_PMC_NOT_NOW, - CDF_STATUS_PMC_AC_POWER, - CDF_STATUS_PMC_SYS_ERROR, - CDF_STATUS_HEARTBEAT_TMOUT, - CDF_STATUS_NTH_BEACON_DELIVERY, - CDF_STATUS_CSR_WRONG_STATE, - CDF_STATUS_FT_PREAUTH_KEY_SUCCESS, - CDF_STATUS_FT_PREAUTH_KEY_FAILED, - CDF_STATUS_CMD_NOT_QUEUED, - CDF_STATUS_FW_MSG_TIMEDOUT, - CDF_STATUS_MAX -} CDF_STATUS; - -#define CDF_IS_STATUS_SUCCESS(status) (CDF_STATUS_SUCCESS == (status)) - -#endif /* if !defined __CDF_STATUS_H */ diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h index fd0e41d44c58..c32bb2e7d5be 100644 --- a/core/cdf/inc/cdf_trace.h +++ b/core/cdf/inc/cdf_trace.h @@ -40,7 +40,6 @@ /* Include Files */ #include /* For CDF_MODULE_ID... */ #include /* For va_list... */ -#include #include #include #include @@ -265,7 +264,7 @@ bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level); typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t); void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data); void cdf_trace_register(CDF_MODULE_ID, tp_cdf_trace_cb); -CDF_STATUS cdf_trace_spin_lock_init(void); +QDF_STATUS cdf_trace_spin_lock_init(void); void cdf_trace_init(void); void cdf_trace_enable(uint32_t, uint8_t enable); void cdf_trace_dump_all(void *, uint8_t, uint8_t, uint32_t, uint32_t); diff --git a/core/cdf/inc/cdf_util.h b/core/cdf/inc/cdf_util.h index 537b1fd41b3a..4f44274b390d 100644 --- a/core/cdf/inc/cdf_util.h +++ b/core/cdf/inc/cdf_util.h @@ -48,7 +48,7 @@ */ #define cdf_likely(_expr) __cdf_likely(_expr) -CDF_INLINE_FN int cdf_status_to_os_return(CDF_STATUS status) +CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status) { return __cdf_status_to_os_return(status); } diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c index 94f7b6f19baf..086360fd2be8 100644 --- a/core/cdf/src/cdf_lock.c +++ b/core/cdf/src/cdf_lock.c @@ -82,29 +82,29 @@ enum { * a failure. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check for 'already initialized' lock */ if (LINUX_LOCK_COOKIE == lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: already initialized lock", __func__); - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } if (in_interrupt()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* initialize new lock */ @@ -114,7 +114,7 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) lock->processID = 0; lock->refcount = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -127,10 +127,10 @@ CDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) * lock in the locked state with the calling thread as its owner. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) { int rc; /* check for invalid pointer */ @@ -138,14 +138,14 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock refers to an initialized object */ if (LINUX_LOCK_COOKIE != lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { @@ -153,7 +153,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if ((lock->processID == current->pid) && (lock->state == LOCK_ACQUIRED)) { @@ -163,7 +163,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) "%s: %x %d %d", __func__, lock, current->pid, lock->refcount); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* acquire a Lock */ mutex_lock(&lock->m_lock); @@ -172,7 +172,7 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: unable to lock mutex (rc = %d)", __func__, rc); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef CDF_NESTED_LOCK_DEBUG CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, @@ -182,14 +182,14 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) lock->processID = current->pid; lock->refcount++; lock->state = LOCK_ACQUIRED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { /* lock is already destroyed */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Lock is already destroyed", __func__); mutex_unlock(&lock->m_lock); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -204,17 +204,17 @@ CDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) * initialized, an error is returned. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock refers to an uninitialized object */ @@ -222,7 +222,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { @@ -230,7 +230,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* CurrentThread = GetCurrentThreadId(); @@ -247,7 +247,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) __func__, lock->processID, current->pid); #endif CDF_ASSERT(0); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if ((lock->processID == current->pid) && (lock->state == LOCK_ACQUIRED)) { @@ -260,7 +260,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) lock->refcount); #endif if (lock->refcount) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; lock->processID = 0; lock->refcount = 0; @@ -272,7 +272,7 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) "%s: Freeing lock %x %d %d", lock, lock->processID, lock->refcount); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -291,36 +291,36 @@ CDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS: lock was successfully initialized + * QDF_STATUS_SUCCESS: lock was successfully initialized * CDF failure reason codes: lock is not initialized and can't be used */ -CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) +QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) { /* check for invalid pointer */ if (NULL == lock) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (LINUX_LOCK_COOKIE != lock->cookie) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (in_interrupt()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if lock is released */ if (!mutex_trylock(&lock->m_lock)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: lock is not released", __func__); - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } lock->cookie = 0; lock->state = LOCK_DESTROYED; @@ -329,7 +329,7 @@ CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) mutex_unlock(&lock->m_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -340,10 +340,10 @@ CDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) +QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) { spin_lock(&pLock->spinlock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -354,10 +354,10 @@ CDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock) +QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock) { spin_unlock(&pLock->spinlock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -390,14 +390,14 @@ static const char *cdf_wake_lock_name(cdf_wake_lock_t *pLock) * CDF status success : if wake lock is initialized * CDF status failure : if wake lock was not initialized */ -CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) +QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) { #if defined CONFIG_CNSS cnss_pm_wake_lock_init(pLock, name); #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_init(pLock, WAKE_LOCK_SUSPEND, name); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -409,7 +409,7 @@ CDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) +QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) { host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, @@ -419,7 +419,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -431,7 +431,7 @@ CDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, +QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, uint32_t reason) { /* Wakelock for Rx is frequent. @@ -448,7 +448,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_timeout(pLock, msecs_to_jiffies(msec)); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -460,7 +460,7 @@ CDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) +QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) { host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, @@ -470,7 +470,7 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_unlock(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -481,14 +481,14 @@ CDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) * CDF status success : if wake lock is acquired * CDF status failure : if wake lock was not acquired */ -CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) +QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) { #if defined CONFIG_CNSS cnss_pm_wake_lock_destroy(pLock); #elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) wake_lock_destroy(pLock); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -504,7 +504,7 @@ CDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) * return: success if the bus is up and a get has been issued * otherwise an error code. */ -CDF_STATUS cdf_runtime_pm_get(void) +QDF_STATUS cdf_runtime_pm_get(void) { void *ol_sc; int ret; @@ -515,15 +515,15 @@ CDF_STATUS cdf_runtime_pm_get(void) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_get(ol_sc); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -534,9 +534,9 @@ CDF_STATUS cdf_runtime_pm_get(void) * * This api will return a failure if the hif module hasn't been initialized * - * return: CDF_STATUS_SUCCESS if the put is performed + * return: QDF_STATUS_SUCCESS if the put is performed */ -CDF_STATUS cdf_runtime_pm_put(void) +QDF_STATUS cdf_runtime_pm_put(void) { void *ol_sc; int ret; @@ -547,15 +547,15 @@ CDF_STATUS cdf_runtime_pm_put(void) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_put(ol_sc); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -564,9 +564,9 @@ CDF_STATUS cdf_runtime_pm_put(void) * * The lock can only be acquired once per lock context and is tracked. * - * return: CDF_STATUS_SUCCESS or failure code. + * return: QDF_STATUS_SUCCESS or failure code. */ -CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) +QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) { void *ol_sc; int ret; @@ -577,15 +577,15 @@ CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_prevent_suspend(ol_sc, lock); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -594,9 +594,9 @@ CDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) * * The lock can only be acquired once per lock context and is tracked. * - * return: CDF_STATUS_SUCCESS or failure code. + * return: QDF_STATUS_SUCCESS or failure code. */ -CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) +QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) { void *ol_sc; int ret; @@ -607,15 +607,15 @@ CDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ret = hif_pm_runtime_allow_suspend(ol_sc, lock); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 7911cef5134a..74997544a0f4 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/core/cdf/src/cdf_mc_timer.c @@ -96,7 +96,7 @@ static void cdf_linux_timer_callback(unsigned long data) { cdf_mc_timer_t *timer = (cdf_mc_timer_t *) data; cds_msg_t msg; - CDF_STATUS vStatus; + QDF_STATUS vStatus; unsigned long flags; cdf_mc_timer_callback_t callback = NULL; @@ -122,15 +122,15 @@ static void cdf_linux_timer_callback(unsigned long data) * not been updated this is a rare race condition! */ timer->state = CDF_TIMER_STATE_STOPPED; - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; case CDF_TIMER_STATE_STOPPED: - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; case CDF_TIMER_STATE_UNUSED: - vStatus = CDF_STATUS_E_EXISTS; + vStatus = QDF_STATUS_E_EXISTS; break; case CDF_TIMER_STATE_RUNNING: @@ -146,18 +146,18 @@ static void cdf_linux_timer_callback(unsigned long data) userData = timer->userData; threadId = timer->platformInfo.threadID; type = timer->type; - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; default: CDF_ASSERT(0); - vStatus = CDF_STATUS_E_FAULT; + vStatus = QDF_STATUS_E_FAULT; break; } spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - if (CDF_STATUS_SUCCESS != vStatus) { + if (QDF_STATUS_SUCCESS != vStatus) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "TIMER callback called in a wrong state=%d", timer->state); @@ -182,7 +182,7 @@ static void cdf_linux_timer_callback(unsigned long data) msg.bodyptr = userData; msg.bodyval = 0; - if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == CDF_STATUS_SUCCESS) + if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS) return; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -335,11 +335,11 @@ void cdf_mc_timer_exit(void) * within the tx thread flow. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER -CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, +QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, @@ -352,7 +352,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } timer->ptimerNode = cdf_mem_malloc(sizeof(cdf_mc_timer_node_t)); @@ -362,7 +362,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, "%s: Not able to allocate memory for timeNode", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(timer->ptimerNode, sizeof(cdf_mc_timer_node_t), 0); @@ -377,7 +377,7 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List cdf_status %d", + "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } @@ -398,10 +398,10 @@ CDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, timer->platformInfo.threadID = 0; timer->state = CDF_TIMER_STATE_STOPPED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #else -CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData) { @@ -410,7 +410,7 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* set the various members of the timer structure @@ -430,7 +430,7 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, timer->platformInfo.threadID = 0; timer->state = CDF_TIMER_STATE_STOPPED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -452,11 +452,11 @@ CDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ #ifdef TIMER_MANAGER -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) { QDF_STATUS status = QDF_STATUS_SUCCESS; unsigned long flags; @@ -466,7 +466,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Check if timer refers to an uninitialized object */ @@ -474,7 +474,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_spin_lock_irqsave(&cdf_timer_list_lock); @@ -550,12 +550,12 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) * been re-initialized. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; unsigned long flags; /* check for invalid pointer */ @@ -563,7 +563,7 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* check if timer refers to an uninitialized object */ @@ -571,36 +571,36 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } spin_lock_irqsave(&timer->platformInfo.spinlock, flags); switch (timer->state) { case CDF_TIMER_STATE_STARTING: - vStatus = CDF_STATUS_E_BUSY; + vStatus = QDF_STATUS_E_BUSY; break; case CDF_TIMER_STATE_RUNNING: /* Stop the timer first */ del_timer(&(timer->platformInfo.Timer)); - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_STOPPED: - vStatus = CDF_STATUS_SUCCESS; + vStatus = QDF_STATUS_SUCCESS; break; case CDF_TIMER_STATE_UNUSED: - vStatus = CDF_STATUS_E_ALREADY; + vStatus = QDF_STATUS_E_ALREADY; break; default: - vStatus = CDF_STATUS_E_FAULT; + vStatus = QDF_STATUS_E_FAULT; break; } - if (CDF_STATUS_SUCCESS == vStatus) { + if (QDF_STATUS_SUCCESS == vStatus) { timer->platformInfo.cookie = LINUX_INVALID_TIMER_COOKIE; timer->state = CDF_TIMER_STATE_UNUSED; spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); @@ -632,10 +632,10 @@ CDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) * or has been cancelled. * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) +QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) { unsigned long flags; @@ -647,7 +647,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ @@ -656,7 +656,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) "%s: Cannot start uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer has expiration time less than 10 ms */ @@ -665,7 +665,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) "%s: Cannot start a timer with expiration less than 10 ms", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* make sure the remainer of the logic isn't interrupted */ @@ -677,7 +677,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot start timer in state = %d ", __func__, timer->state); - return CDF_STATUS_E_ALREADY; + return QDF_STATUS_E_ALREADY; } /* start the timer */ @@ -701,7 +701,7 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -714,10 +714,10 @@ CDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) * was created and can be started again via a call to cdf_mc_timer_start(). * * Return: - * CDF_STATUS_SUCCESS - Timer is initialized successfully + * QDF_STATUS_SUCCESS - Timer is initialized successfully * CDF failure status - Timer initialization failed */ -CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) +QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) { unsigned long flags; @@ -729,7 +729,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* check if timer refers to an uninitialized object */ @@ -738,7 +738,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) "%s: Cannot stop uninitialized timer", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* ensure the timer state is correct */ @@ -749,7 +749,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot stop timer in state = %d", __func__, timer->state); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } timer->state = CDF_TIMER_STATE_STOPPED; @@ -760,7 +760,7 @@ CDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) try_allowing_sleep(timer->type); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 97a3e7039e74..de708861a1c4 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -307,7 +307,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List cdf_status %d", + "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index b663fa0323e7..80fe56dbeda8 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include /* Packet Counter */ @@ -230,9 +230,9 @@ void __cdf_nbuf_free(struct sk_buff *skb) * @skb: Pointer to network buffer * @dir: Direction * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) { #ifdef CDF_OS_DEBUG @@ -252,7 +252,7 @@ __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) return __cdf_nbuf_map_single(osdev, skb, dir); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -284,9 +284,9 @@ __cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) * @skb: Pointer to network buffer * @dir: Direction * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) { cdf_dma_addr_t paddr; @@ -294,15 +294,15 @@ __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) /* tempory hack for simulation */ #ifdef A_SIMOS_DEVHOST NBUF_CB_PADDR(buf) = paddr = buf->data; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #else /* assume that the OS only provides a single fragment */ NBUF_CB_PADDR(buf) = paddr = dma_map_single(osdev->dev, buf->data, skb_end_pointer(buf) - buf->data, dir); return dma_mapping_error(osdev->dev, paddr) - ? CDF_STATUS_E_FAILURE - : CDF_STATUS_SUCCESS; + ? QDF_STATUS_E_FAILURE + : QDF_STATUS_SUCCESS; #endif /* #ifdef A_SIMOS_DEVHOST */ } @@ -328,9 +328,9 @@ __cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * @skb: Pointer to network buffer * @cksum: Pointer to checksum value * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) { switch (cksum->l4_result) { @@ -347,9 +347,9 @@ __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) default: pr_err("ADF_NET:Unknown checksum type\n"); cdf_assert(0); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index 5cef1f6ec92f..1d1cba9eea5a 100644 --- a/core/cdf/src/cdf_trace.c +++ b/core/cdf/src/cdf_trace.c @@ -554,11 +554,11 @@ void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data) * * Return : nothing */ -CDF_STATUS cdf_trace_spin_lock_init(void) +QDF_STATUS cdf_trace_spin_lock_init(void) { spin_lock_init(<race_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_atomic.h b/core/cdf/src/i_cdf_atomic.h index 9a0f89b09547..e3c1a91f45e8 100644 --- a/core/cdf/src/i_cdf_atomic.h +++ b/core/cdf/src/i_cdf_atomic.h @@ -27,18 +27,17 @@ #ifndef I_CDF_ATOMIC_H #define I_CDF_ATOMIC_H -#include /* CDF_STATUS */ #include /* QDF_STATUS */ #include typedef atomic_t __cdf_atomic_t; -static inline CDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v) +static inline QDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v) { atomic_set(v, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline int32_t __cdf_atomic_read(__cdf_atomic_t *v) diff --git a/core/cdf/src/i_cdf_defer.h b/core/cdf/src/i_cdf_defer.h index 11bc076421b6..0e3f02fc0b69 100644 --- a/core/cdf/src/i_cdf_defer.h +++ b/core/cdf/src/i_cdf_defer.h @@ -35,7 +35,6 @@ #include #endif #include -#include #include #include @@ -52,7 +51,7 @@ typedef struct { extern void __cdf_defer_func(struct work_struct *work); -static inline CDF_STATUS +static inline QDF_STATUS __cdf_init_work(__cdf_work_t *work, cdf_defer_fn_t func, void *arg) { /*Initilize func and argument in work struct */ @@ -63,38 +62,38 @@ __cdf_init_work(__cdf_work_t *work, cdf_defer_fn_t func, void *arg) #else INIT_WORK(&work->work, __cdf_defer_func); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS __cdf_schedule_work(__cdf_work_t *work) +static inline QDF_STATUS __cdf_schedule_work(__cdf_work_t *work) { schedule_work(&work->work); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS __cdf_init_bh(cdf_handle_t hdl, +static inline QDF_STATUS __cdf_init_bh(cdf_handle_t hdl, struct tasklet_struct *bh, cdf_defer_fn_t func, void *arg) { tasklet_init(bh, (__cdf_bh_fn_t) func, (unsigned long)arg); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS +static inline QDF_STATUS __cdf_sched_bh(cdf_handle_t hdl, struct tasklet_struct *bh) { tasklet_schedule(bh); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS +static inline QDF_STATUS __cdf_disable_bh(cdf_handle_t hdl, struct tasklet_struct *bh) { tasklet_kill(bh); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /*_I_CDF_DEFER_H*/ diff --git a/core/cdf/src/i_cdf_lock.h b/core/cdf/src/i_cdf_lock.h index 634728db05d3..438b50aa5fc9 100644 --- a/core/cdf/src/i_cdf_lock.h +++ b/core/cdf/src/i_cdf_lock.h @@ -101,12 +101,12 @@ typedef int cdf_wake_lock_t; * __cdf_semaphore_init() - initialize the semaphore * @m: Semaphore object * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static inline CDF_STATUS __cdf_semaphore_init(struct semaphore *m) +static inline QDF_STATUS __cdf_semaphore_init(struct semaphore *m) { sema_init(m, 1); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -138,14 +138,14 @@ __cdf_semaphore_release(cdf_device_t osdev, struct semaphore *m) * __cdf_spinlock_init() - initialize spin lock * @lock: Spin lock object * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static inline CDF_STATUS __cdf_spinlock_init(__cdf_spinlock_t *lock) +static inline QDF_STATUS __cdf_spinlock_init(__cdf_spinlock_t *lock) { spin_lock_init(&lock->spinlock); lock->flags = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #define __cdf_spinlock_destroy(lock) diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index ec61229440c2..fc45827af1a7 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include /* * Use socket buffer as the underlying implentation as skbuf . @@ -334,11 +334,11 @@ typedef void (*cdf_nbuf_trace_update_t)(char *); __cdf_nbuf_t __cdf_nbuf_alloc(__cdf_device_t osdev, size_t size, int reserve, int align, int prio); void __cdf_nbuf_free(struct sk_buff *skb); -CDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev, +QDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); void __cdf_nbuf_unmap(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); -CDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev, +QDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); void __cdf_nbuf_unmap_single(__cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir); @@ -356,16 +356,16 @@ void __cdf_nbuf_trace_update(struct sk_buff *buf, char *event_string); * * Return: CDF status */ -static inline CDF_STATUS __cdf_os_to_status(signed int error) +static inline QDF_STATUS __cdf_os_to_status(signed int error) { switch (error) { case 0: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case ENOMEM: case -ENOMEM: - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; default: - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } } @@ -397,13 +397,13 @@ static inline size_t __cdf_nbuf_len(struct sk_buff *skb) * Link tow nbufs the new buf is piggybacked into the older one. The older * (src) skb is released. * - * Return: CDF_STATUS (status of the call) if failed the src skb + * Return: QDF_STATUS (status of the call) if failed the src skb * is released */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src) { - CDF_STATUS error = 0; + QDF_STATUS error = 0; cdf_assert(dst && src); @@ -520,7 +520,7 @@ static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size) * prototypes. Implemented in cdf_nbuf.c */ cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb); -CDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, +QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum); uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb); void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid); @@ -927,10 +927,10 @@ typedef struct __cdf_nbuf_qhead { * * Return: CDF status */ -static inline CDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) +static inline QDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) { memset(qhead, 0, sizeof(struct __cdf_nbuf_qhead)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_softirq_timer.h b/core/cdf/src/i_cdf_softirq_timer.h index 31cbd68e5970..14cc9fcd18c0 100644 --- a/core/cdf/src/i_cdf_softirq_timer.h +++ b/core/cdf/src/i_cdf_softirq_timer.h @@ -56,7 +56,7 @@ typedef void (*cdf_dummy_timer_func_t)(unsigned long arg); * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_init(cdf_handle_t hdl, struct timer_list *timer, cdf_softirq_timer_func_t func, void *arg, @@ -69,7 +69,7 @@ __cdf_softirq_timer_init(cdf_handle_t hdl, timer->function = (cdf_dummy_timer_func_t) func; timer->data = (unsigned long)arg; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -79,13 +79,13 @@ __cdf_softirq_timer_init(cdf_handle_t hdl, * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_start(struct timer_list *timer, uint32_t delay) { timer->expires = jiffies + msecs_to_jiffies(delay); add_timer(timer); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -95,12 +95,12 @@ __cdf_softirq_timer_start(struct timer_list *timer, uint32_t delay) * * Return: none */ -static inline CDF_STATUS +static inline QDF_STATUS __cdf_softirq_timer_mod(struct timer_list *timer, uint32_t delay) { mod_timer(timer, jiffies + msecs_to_jiffies(delay)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h index 68977de5dc77..bd34f4a5127b 100644 --- a/core/cdf/src/i_cdf_util.h +++ b/core/cdf/src/i_cdf_util.h @@ -36,7 +36,6 @@ #include #include -#include #include #include /* @@ -47,36 +46,36 @@ #define __cdf_likely(_expr) likely(_expr) /** - * cdf_status_to_os_return(): translates cdf_status types to linux return types + * cdf_status_to_os_return(): translates qdf_status types to linux return types * @status: status to translate * * Translates error types that linux may want to handle specially. * - * return: 0 or the linux error code that most closely matches the CDF_STATUS. + * return: 0 or the linux error code that most closely matches the QDF_STATUS. * defaults to -1 (EPERM) */ -static inline int __cdf_status_to_os_return(CDF_STATUS status) +static inline int __cdf_status_to_os_return(QDF_STATUS status) { switch (status) { - case CDF_STATUS_SUCCESS: + case QDF_STATUS_SUCCESS: return 0; - case CDF_STATUS_E_NULL_VALUE: - case CDF_STATUS_E_FAULT: + case QDF_STATUS_E_NULL_VALUE: + case QDF_STATUS_E_FAULT: return -EFAULT; - case CDF_STATUS_E_TIMEOUT: - case CDF_STATUS_E_BUSY: + case QDF_STATUS_E_TIMEOUT: + case QDF_STATUS_E_BUSY: return -EBUSY; - case CDF_STATUS_NOT_INITIALIZED: - case CDF_STATUS_E_AGAIN: + case QDF_STATUS_NOT_INITIALIZED: + case QDF_STATUS_E_AGAIN: return -EAGAIN; - case CDF_STATUS_E_NOSUPPORT: + case QDF_STATUS_E_NOSUPPORT: return -ENOSYS; - case CDF_STATUS_E_ALREADY: + case QDF_STATUS_E_ALREADY: return -EALREADY; - case CDF_STATUS_E_NOMEM: + case QDF_STATUS_E_NOMEM: return -ENOMEM; - case CDF_STATUS_E_FAILURE: - case CDF_STATUS_E_INVAL: + case QDF_STATUS_E_FAILURE: + case QDF_STATUS_E_INVAL: return -EINVAL; default: return -EPERM; diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 07c3117accae..cf8ffb72f0a4 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -35,7 +35,6 @@ */ #include -#include #include #include #include @@ -186,17 +185,17 @@ static inline void cds_set_unload_in_progress(uint8_t value) v_CONTEXT_t cds_init(void); void cds_deinit(void); -CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context); +QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context); -CDF_STATUS cds_open(void); +QDF_STATUS cds_open(void); -CDF_STATUS cds_enable(v_CONTEXT_t cds_context); +QDF_STATUS cds_enable(v_CONTEXT_t cds_context); -CDF_STATUS cds_disable(v_CONTEXT_t cds_context); +QDF_STATUS cds_disable(v_CONTEXT_t cds_context); -CDF_STATUS cds_close(v_CONTEXT_t cds_context); +QDF_STATUS cds_close(v_CONTEXT_t cds_context); -CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context); +QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context); void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper); @@ -204,15 +203,15 @@ void *cds_get_context(CDF_MODULE_ID moduleId); v_CONTEXT_t cds_get_global_context(void); -CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size); -CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, void *pModuleContext); -CDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); +QDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); -CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); void cds_flush_work(void *work); @@ -230,7 +229,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level); enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id); void cds_set_multicast_logging(uint8_t value); uint8_t cds_is_multicast_logging(void); -CDF_STATUS cds_set_log_completion(uint32_t is_fatal, +QDF_STATUS cds_set_log_completion(uint32_t is_fatal, uint32_t type, uint32_t sub_type); void cds_get_log_completion(uint32_t *is_fatal, @@ -239,7 +238,7 @@ void cds_get_log_completion(uint32_t *is_fatal, bool cds_is_log_report_in_progress(void); void cds_init_log_completion(void); void cds_deinit_log_completion(void); -CDF_STATUS cds_flush_logs(uint32_t is_fatal, +QDF_STATUS cds_flush_logs(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code); void cds_logging_set_fw_flush_complete(void); diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 7ac1a0736f98..33ec1a8c781a 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -477,7 +477,7 @@ int cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, const void *data, int data_len); uint32_t cds_get_concurrency_mode(void); -CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, +QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_station_ctx_t *hdd_sta_ctx); void cds_handle_conc_rule1(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile); @@ -494,9 +494,9 @@ static inline bool cds_handle_conc_rule2(hdd_adapter_t *adapter, } #endif /* FEATURE_WLAN_CH_AVOID */ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, - tCsrRoamProfile * roam_profile); + tCsrRoamProfile *roam_profile); bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel); -CDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel); +QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel); #ifdef FEATURE_WLAN_FORCE_SAP_SCC void cds_force_sap_on_scc(eCsrRoamResult roam_result, @@ -525,7 +525,7 @@ uint8_t cds_is_mcc_in_24G(void); int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value); int cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, uint32_t set_value); -CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter); +QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter); int cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, uint32_t set_value); void cds_set_mcc_latency(hdd_adapter_t *adapter, int set_value); @@ -555,32 +555,32 @@ void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode, uint8_t sessionId); void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, uint8_t session_id); -CDF_STATUS cds_init_policy_mgr(void); -CDF_STATUS cds_deinit_policy_mgr(void); -CDF_STATUS cds_get_pcl(enum cds_con_mode mode, +QDF_STATUS cds_init_policy_mgr(void); +QDF_STATUS cds_deinit_policy_mgr(void); +QDF_STATUS cds_get_pcl(enum cds_con_mode mode, uint8_t *pcl_Channels, uint32_t *len); bool cds_allow_concurrency(enum cds_con_mode mode, uint8_t channel, enum hw_mode_bandwidth bw); enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(void); enum cds_one_connection_mode cds_get_second_connection_pcl_table_index(void); enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void); -CDF_STATUS cds_incr_connection_count(uint32_t vdev_id); -CDF_STATUS cds_update_connection_info(uint32_t vdev_id); -CDF_STATUS cds_decr_connection_count(uint32_t vdev_id); -CDF_STATUS cds_current_connections_update(uint32_t session_id, +QDF_STATUS cds_incr_connection_count(uint32_t vdev_id); +QDF_STATUS cds_update_connection_info(uint32_t vdev_id); +QDF_STATUS cds_decr_connection_count(uint32_t vdev_id); +QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, enum cds_conn_update_reason); bool cds_is_ibss_conn_exist(uint8_t *ibss_channel); #ifdef MPC_UT_FRAMEWORK -CDF_STATUS cds_incr_connection_count_utfw( +QDF_STATUS cds_incr_connection_count_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id); -CDF_STATUS cds_update_connection_info_utfw( +QDF_STATUS cds_update_connection_info_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id); -CDF_STATUS cds_decr_connection_count_utfw( +QDF_STATUS cds_decr_connection_count_utfw( uint32_t del_all, uint32_t vdev_id); struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len); enum cds_pcl_type get_pcl_from_first_conn_table(enum cds_con_mode type, @@ -592,24 +592,24 @@ enum cds_pcl_type get_pcl_from_third_conn_table( enum cds_two_connection_mode idx, enum cds_con_mode type, enum cds_conc_priority_mode sys_pref, uint8_t dbs_capable); #else -static inline CDF_STATUS cds_incr_connection_count_utfw(uint32_t vdev_id, +static inline QDF_STATUS cds_incr_connection_count_utfw(uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS cds_update_connection_info_utfw(uint32_t vdev_id, +static inline QDF_STATUS cds_update_connection_info_utfw(uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, +static inline QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, uint32_t vdev_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) { @@ -618,7 +618,7 @@ static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) #endif enum cds_con_mode cds_convert_device_mode_to_hdd_type( device_mode_t device_mode); -CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, +QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac0_bw, enum hw_mode_ss_config mac1_ss, @@ -627,7 +627,7 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_agile_dfs_capab dfs, enum cds_conn_update_reason reason); enum cds_conc_next_action cds_need_opportunistic_upgrade(void); -CDF_STATUS cds_next_actions(uint32_t session_id, +QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, enum cds_conn_update_reason reason); void cds_set_dual_mac_scan_config(uint8_t dbs_val, @@ -640,7 +640,7 @@ void cds_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status, uint32_t fw_mode_config); bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, enum cds_con_mode *new_mode); -CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, +QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel); enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void); @@ -650,8 +650,8 @@ void cds_clear_concurrent_session_count(void); bool cds_is_multiple_active_sta_sessions(void); bool cds_is_sta_active_connection_exists(void); bool cds_concurrent_beaconing_sessions_running(void); -CDF_STATUS cdf_wait_for_connection_update(void); -CDF_STATUS cdf_reset_connection_update(void); -CDF_STATUS cdf_set_connection_update(void); -CDF_STATUS cdf_init_connection_update(void); +QDF_STATUS cdf_wait_for_connection_update(void); +QDF_STATUS cdf_reset_connection_update(void); +QDF_STATUS cdf_set_connection_update(void); +QDF_STATUS cdf_init_connection_update(void); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 7da595d09975..8848c56dd309 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -35,7 +35,6 @@ */ #include -#include #include #include #include diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index 74b396d94a4e..c8ab965bff3f 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include /*-------------------------------------------------------------------------- @@ -129,21 +128,21 @@ typedef enum { message needs anything in this message, it needs to copy the contents before returning from the message queue handler. - \return CDF_STATUS_SUCCESS - the message has been successfully posted + \return QDF_STATUS_SUCCESS - the message has been successfully posted to the message queue. - CDF_STATUS_E_INVAL - The value specified by msgQueueId does not + QDF_STATUS_E_INVAL - The value specified by msgQueueId does not refer to a valid Message Queue Id. - CDF_STATUS_E_FAULT - message is an invalid pointer. + QDF_STATUS_E_FAULT - message is an invalid pointer. - CDF_STATUS_E_FAILURE - the message queue handler has reported + QDF_STATUS_E_FAILURE - the message queue handler has reported an unknown failure. \sa --------------------------------------------------------------------------*/ -CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); +QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); /**--------------------------------------------------------------------------- @@ -152,15 +151,15 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *message); \param pBuf is a buffer allocated by caller. The actual structure varies base on message type - \return CDF_STATUS_SUCCESS - the message has been successfully posted + \return QDF_STATUS_SUCCESS - the message has been successfully posted to the message queue. - CDF_STATUS_E_FAILURE - the message queue handler has reported + QDF_STATUS_E_FAILURE - the message queue handler has reported an unknown failure. \sa --------------------------------------------------------------------------*/ -CDF_STATUS cds_send_mb_message_to_mac(void *pBuf); +QDF_STATUS cds_send_mb_message_to_mac(void *pBuf); #endif /* if !defined __CDS_MQ_H */ diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 14940f3a0de3..87dce8ddd39c 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include /*-------------------------------------------------------------------------- @@ -119,13 +118,13 @@ static inline void cds_pkt_proto_trace_close(void) {} * cds_pkt_return_packet Free the cds Packet * @ cds Packet */ -CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet); +QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet); /** * cds_pkt_get_packet_length Returns the packet length * @ cds Packet */ -CDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, +QDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize); /* @@ -175,15 +174,15 @@ typedef enum { #define cds_packet_alloc(s, d, p) \ cds_packet_alloc_debug(s, d, p, __FILE__, __LINE__) -CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, +QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num); #else -CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket); +QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket); #endif void cds_packet_free(void *pPacket); -typedef CDF_STATUS (*cds_pkt_get_packet_callback)(cds_pkt_t *pPacket, +typedef QDF_STATUS (*cds_pkt_get_packet_callback)(cds_pkt_t *pPacket, void *userData); #endif /* !defined( __CDS_PKT_H ) */ diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index 5bc32ea79c55..e9b9e93d72a5 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -36,7 +36,7 @@ ========================================================================*/ -#include "cdf_status.h" +#include "qdf_status.h" #define CDS_COUNTRY_CODE_LEN 2 #define CDS_MAC_ADDRESS_LEN 6 @@ -318,26 +318,26 @@ enum channel_width { extern struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; extern const struct chan_map chan_mapping[NUM_RF_CHANNELS]; -CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, +QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, const uint8_t *country_alpha2, enum country_src source); -CDF_STATUS cds_read_default_country(uint8_t *default_country); +QDF_STATUS cds_read_default_country(uint8_t *default_country); -CDF_STATUS cds_get_channel_list_with_power(struct channel_power +QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, uint8_t *num_base_channels, struct channel_power *channel_40mhz, uint8_t *num_channels_40mhz); -CDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); enum channel_state cds_get_channel_state(uint32_t chan_num); -CDF_STATUS cds_regulatory_init(void); -CDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); -CDF_STATUS cds_set_dfs_region(uint8_t dfs_region); +QDF_STATUS cds_regulatory_init(void); +QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); +QDF_STATUS cds_set_dfs_region(uint8_t dfs_region); bool cds_is_dsrc_channel(uint16_t); enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, enum channel_width chan_width); diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 8186e50e91e8..f08115adccf3 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -374,24 +374,24 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); \param p_cds_sched_context - pointer to a previously allocated buffer big enough to hold a scheduler context. - \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and is ready to be used. - CDF_STATUS_E_RESOURCES - System resources (other than memory) + QDF_STATUS_E_RESOURCES - System resources (other than memory) are unavailable to initilize the scheduler - CDF_STATUS_E_NOMEM - insufficient memory exists to initialize + QDF_STATUS_E_NOMEM - insufficient memory exists to initialize the scheduler - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + QDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + QDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_open() -------------------------------------------------------------------------*/ -CDF_STATUS cds_sched_open(void *p_cds_context, +QDF_STATUS cds_sched_open(void *p_cds_context, p_cds_sched_context pSchedCxt, uint32_t SchedCtxSize); /*--------------------------------------------------------------------------- @@ -409,27 +409,27 @@ CDF_STATUS cds_sched_open(void *p_cds_context, \param p_cds_context - pointer to the global CDF Context - \return CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and is ready to be used. - CDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open + QDF_STATUS_E_INVAL - Invalid parameter passed to the scheduler Open function - CDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ + QDF_STATUS_E_FAILURE - Failure to initialize the scheduler/ \sa cds_sched_close() ---------------------------------------------------------------------------*/ -CDF_STATUS cds_sched_close(void *p_cds_context); +QDF_STATUS cds_sched_close(void *p_cds_context); /* Helper routines provided to other CDS API's */ -CDF_STATUS cds_mq_init(p_cds_mq_type pMq); +QDF_STATUS cds_mq_init(p_cds_mq_type pMq); void cds_mq_deinit(p_cds_mq_type pMq); void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper); p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq); bool cds_is_mq_empty(p_cds_mq_type pMq); p_cds_sched_context get_cds_sched_ctxt(void); -CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext); +QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext); void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext); void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext); diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index 3604b754c83d..24d8b5af4eb5 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -42,7 +42,6 @@ Include Files ------------------------------------------------------------------------*/ #include -#include #include #include #include "ani_global.h" @@ -90,9 +89,9 @@ Function declarations and documenation ------------------------------------------------------------------------*/ -CDF_STATUS cds_crypto_init(uint32_t *phCryptProv); +QDF_STATUS cds_crypto_init(uint32_t *phCryptProv); -CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); +QDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); /** * cds_rand_get_bytes @@ -105,9 +104,9 @@ CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv); * @param numBytes the number of bytes that should be generated and * copied * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds */ -CDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, +QDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, uint32_t numBytes); /** @@ -129,10 +128,10 @@ CDF_STATUS cds_rand_get_bytes(uint32_t handle, uint8_t *pbBuf, * @param keyLen length of key * @param digest holds resultant SHA1 HMAC (20B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ -CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *key, /* pointer to authentication key */ @@ -158,21 +157,21 @@ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ * @param keyLen length of key * @param digest holds resultant MD5 HMAC (16B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ -CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *text, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *key, /* pointer to authentication key */ uint32_t keyLen, /* length of authentication key */ uint8_t digest[CDS_DIGEST_MD5_SIZE]); /* caller digest to be filled in */ -CDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *Encrypted, uint8_t *pKey); /* pointer to authentication key */ -CDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *pDecrypted, uint8_t *pKey); /* pointer to authentication key */ @@ -186,5 +185,5 @@ bool cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, uint8_t *frm, uint8_t *efrm, uint16_t frmLen); uint8_t cds_get_mmie_size(void); #endif /* WLAN_FEATURE_11W */ -CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal pMac); +QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal pMac); #endif /* #if !defined __CDS_UTILS_H */ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 9d1165720d5b..7b49adf4516a 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -164,9 +164,9 @@ static void cds_set_nan_enable(tMacOpenParameters *param, * * Return: CDF status */ -CDF_STATUS cds_open(void) +QDF_STATUS cds_open(void) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; @@ -184,7 +184,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the timer module */ @@ -198,7 +198,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { @@ -209,8 +209,8 @@ CDF_STATUS cds_open(void) } /* Initialize the free message queue */ - cdf_status = cds_mq_init(&gp_cds_context->freeVosMq); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_init(&gp_cds_context->freeVosMq); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to initialize CDS free message queue", @@ -228,10 +228,10 @@ CDF_STATUS cds_open(void) } /* Now Open the CDS Scheduler */ - cdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, + qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, sizeof(cds_sched_context)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open CDS Scheduler", __func__); @@ -259,10 +259,10 @@ CDF_STATUS cds_open(void) ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ - cdf_status = bmi_download_firmware(ol_ctx); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = bmi_download_firmware(ol_ctx); + if (qdf_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, - "BMI FIALED status:%d", cdf_status); + "BMI FIALED status:%d", qdf_status); goto err_bmi_close; } @@ -367,11 +367,11 @@ CDF_STATUS cds_open(void) mac_openParms.self_gen_frm_pwr = pHddCtx->config->self_gen_frm_pwr; mac_openParms.maxStation = pHddCtx->config->maxNumberOfPeers; - cdf_status = wma_open(gp_cds_context, + qdf_status = wma_open(gp_cds_context, hdd_update_tgt_cfg, hdd_dfs_indicate_radar, &mac_openParms); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open WMA module", __func__); @@ -417,8 +417,8 @@ CDF_STATUS cds_open(void) } /* Now proceed to open the SME */ - cdf_status = sme_open(gp_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_open(gp_cds_context->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open SME", __func__); @@ -441,7 +441,7 @@ CDF_STATUS cds_open(void) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_sme_close: sme_close(gp_cds_context->pMACContext); @@ -475,7 +475,7 @@ err_wma_complete_event: err_probe_event: qdf_event_destroy(&gp_cds_context->ProbeEvent); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* cds_open() */ /** @@ -484,9 +484,9 @@ err_probe_event: * * Return: CDF status */ -CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) +QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; @@ -496,40 +496,40 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Context mismatch", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (p_cds_context->pMACContext == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (p_cds_context->pWMAContext == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } scn = cds_get_context(CDF_MODULE_ID_HIF); if (!scn) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Reset wma wait event */ qdf_event_reset(&gp_cds_context->wmaCompleteEvent); /*call WMA pre start */ - cdf_status = wma_pre_start(gp_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_pre_start(gp_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to WMA prestart"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Need to update time out of complete */ @@ -551,24 +551,24 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) wlan_sys_probe(); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = htc_start(gp_cds_context->htc_ctx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = htc_start(gp_cds_context->htc_ctx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { @@ -577,12 +577,12 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } htc_set_target_to_sleep(scn); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -591,9 +591,9 @@ CDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) * * Return: CDF status */ -CDF_STATUS cds_enable(v_CONTEXT_t cds_context) +QDF_STATUS cds_enable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSirRetStatus sirStatus = eSIR_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; @@ -606,7 +606,7 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) if (gp_cds_context != p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((p_cds_context->pWMAContext == NULL) || @@ -618,15 +618,15 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Start the wma */ - cdf_status = wma_start(p_cds_context); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_start(p_cds_context); + if (qdf_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start wma", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: wma correctly started", __func__); @@ -649,9 +649,9 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) "%s: MAC correctly started", __func__); /* START SME */ - cdf_status = sme_start(p_cds_context->pMACContext); + qdf_status = sme_start(p_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start SME", __func__); goto err_mac_stop; @@ -672,7 +672,7 @@ CDF_STATUS cds_enable(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "%s: CDS Start is successful!!", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_sme_stop: sme_stop(p_cds_context->pMACContext, HAL_STOP_TYPE_SYS_RESET); @@ -682,11 +682,11 @@ err_mac_stop: err_wma_stop: qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); - cdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } else { qdf_status = @@ -709,7 +709,7 @@ err_wma_stop: } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* cds_enable() */ /** @@ -718,9 +718,9 @@ err_wma_stop: * * Return: CDF status */ -CDF_STATUS cds_disable(v_CONTEXT_t cds_context) +QDF_STATUS cds_disable(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* wma_stop is called before the SYS so that the processing of target * pending responses will not be handled during uninitialization of @@ -728,12 +728,12 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) */ qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); - cdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); + qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } @@ -741,14 +741,14 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) hif_reset_soc(((cds_context_type *) cds_context)->pHIFContext); /* SYS STOP will stop SME and MAC */ - cdf_status = sys_stop(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sys_stop(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop SYS", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -757,13 +757,13 @@ CDF_STATUS cds_disable(v_CONTEXT_t cds_context) * * Return: CDF status */ -CDF_STATUS cds_close(v_CONTEXT_t cds_context) +QDF_STATUS cds_close(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; - cdf_status = wma_wmi_work_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_work_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work", __func__); CDF_ASSERT(0); @@ -779,18 +779,18 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) cds_free_context(cds_context, CDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; @@ -799,19 +799,19 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); @@ -834,7 +834,7 @@ CDF_STATUS cds_close(v_CONTEXT_t cds_context) gp_cds_context->pHDDContext = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1033,7 +1033,7 @@ void cds_clear_driver_state(enum cds_driver_state state) * @moduleId: module ID who's context area is being allocated. * @ppModuleContext: pointer to location where the pointer to the * allocated context is returned. Note this output pointer - * is valid only if the API returns CDF_STATUS_SUCCESS + * is valid only if the API returns QDF_STATUS_SUCCESS * @param size: size of the context area to be allocated. * * This API allows any user to allocate a user context area within the @@ -1041,7 +1041,7 @@ void cds_clear_driver_state(enum cds_driver_state state) * * Return: CDF status */ -CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size) { void **pGpModContext = NULL; @@ -1049,14 +1049,14 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, if (p_cds_context == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: context mismatch or null param passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (moduleID) { @@ -1090,7 +1090,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, "does not have its context allocated by CDS", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } } @@ -1101,7 +1101,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context has already been allocated", __func__, moduleID); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } /* Dynamically allocate the context for module */ @@ -1113,7 +1113,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, "%s: Failed to " "allocate Context for module ID %i", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (moduleID == CDF_MODULE_ID_TLSHIM) @@ -1121,7 +1121,7 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, *pGpModContext = *ppModuleContext; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_alloc_context() */ /** @@ -1131,16 +1131,16 @@ CDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * API to set a MODULE Context in gloabl CDS Context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) +QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) { p_cds_contextType p_cds_context = cds_get_global_context(); if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } switch (module_id) { @@ -1152,10 +1152,10 @@ CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) "%s: Module ID %i does not have its context " "allocated by CDS", __func__, module_id); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1170,7 +1170,7 @@ CDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) * * Return: CDF status */ -CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, void *pModuleContext) { void **pGpModContext = NULL; @@ -1179,7 +1179,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, (pModuleContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or context mismatch", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (moduleID) { @@ -1219,7 +1219,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, "does not have its context allocated by CDS", __func__, moduleID); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } } @@ -1229,13 +1229,13 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, "%s: Module ID %i " "context has not been allocated or freed already", __func__, moduleID); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (*pGpModContext != pModuleContext) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: pGpModContext != pModuleContext", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pModuleContext != NULL) @@ -1243,7 +1243,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, *pGpModContext = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_free_context() */ /** @@ -1258,7 +1258,7 @@ CDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * Return: CDF status */ -CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) +QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) { p_cds_mq_type pTargetMq = NULL; p_cds_msg_wrapper pMsgWrapper = NULL; @@ -1269,7 +1269,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) "%s: Null params or global cds context is null", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (msgQueueId) { @@ -1306,14 +1306,14 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) ("%s: Trying to queue msg into unknown MC Msg queue ID %d"), __func__, msgQueueId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_ASSERT(NULL != pTargetMq); if (pTargetMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: pTargetMq == NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Try and get a free Msg wrapper */ @@ -1329,7 +1329,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) if (CDS_WRAPPER_MAX_FAIL_COUNT == debug_count) CDF_BUG(0); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } atomic_set(&cds_wrapper_empty_count, 0); @@ -1343,7 +1343,7 @@ CDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) set_bit(MC_POST_EVENT_MASK, &gp_cds_context->cdf_sched.mcEventFlag); wake_up_interruptible(&gp_cds_context->cdf_sched.mcWaitQueue); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_mq_post_message() */ /** @@ -1430,9 +1430,9 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) * * Return: CDF status */ -CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) +QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); @@ -1440,11 +1440,11 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) cds_free_context(cds_context, CDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* * CAC timer will be initiated and started only when SAP starts on @@ -1458,27 +1458,27 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) cdf_mc_timer_destroy(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); } - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; if (false == wma_needshutdown(cds_context)) { - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma!", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } - cdf_status = wma_wmi_work_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_work_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work!", __func__); CDF_ASSERT(0); @@ -1490,11 +1490,11 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) gp_cds_context->htc_ctx = NULL; } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service!", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); @@ -1513,7 +1513,7 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1524,10 +1524,10 @@ CDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) * * Return: WMI vdev type */ -CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *sub_type) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; *type = 0; *sub_type = 0; @@ -1556,7 +1556,7 @@ CDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, default: CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } return status; @@ -1891,7 +1891,7 @@ void cds_deinit_log_completion(void) * * Return: 0 if setting of params is successful */ -CDF_STATUS cds_set_log_completion(uint32_t is_fatal, +QDF_STATUS cds_set_log_completion(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code) { @@ -1901,7 +1901,7 @@ CDF_STATUS cds_set_log_completion(uint32_t is_fatal, if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_spinlock_acquire(&p_cds_context->bug_report_lock); @@ -1910,7 +1910,7 @@ CDF_STATUS cds_set_log_completion(uint32_t is_fatal, p_cds_context->log_complete.reason_code = reason_code; p_cds_context->log_complete.is_report_in_progress = true; cdf_spinlock_release(&p_cds_context->bug_report_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1976,12 +1976,12 @@ bool cds_is_log_report_in_progress(void) * * Return: 0 on success */ -CDF_STATUS cds_flush_logs(uint32_t is_fatal, +QDF_STATUS cds_flush_logs(uint32_t is_fatal, uint32_t indicator, uint32_t reason_code) { uint32_t ret; - CDF_STATUS status; + QDF_STATUS status; p_cds_contextType p_cds_context; @@ -1989,21 +1989,21 @@ CDF_STATUS cds_flush_logs(uint32_t is_fatal, if (!p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (cds_is_log_report_in_progress() == true) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cds_set_log_completion(is_fatal, indicator, reason_code); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set log trigger params", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, @@ -2015,10 +2015,10 @@ CDF_STATUS cds_flush_logs(uint32_t is_fatal, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to send flush FW log", __func__); cds_init_log_completion(); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index a7b62e7e9040..3fb0a10f771b 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2273,7 +2273,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, uint8_t single_mac_scan_with_dbs_val) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -2294,7 +2294,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, dbs_val, dbs_plus_agile_scan_val, single_mac_scan_with_dbs_val); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_scan_config failed %d", status); return; } @@ -2302,7 +2302,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, status = wma_get_updated_fw_mode_config(&cfg.fw_mode_config, wma_get_dbs_config(), wma_get_agile_dfs_config()); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_fw_mode_config failed %d", status); return; } @@ -2313,7 +2313,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, cfg.scan_config, cfg.fw_mode_config); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("sme_soc_set_dual_mac_config failed %d", status); return; } @@ -2332,7 +2332,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -2351,14 +2351,14 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) wma_get_dbs_scan_config(), wma_get_dbs_plus_agile_scan_config(), wma_get_single_mac_scan_with_dfs_config()); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_scan_config failed %d", status); return; } status = wma_get_updated_fw_mode_config(&cfg.fw_mode_config, dbs, dfs); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("wma_get_updated_fw_mode_config failed %d", status); return; } @@ -2369,7 +2369,7 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) cfg.scan_config, cfg.fw_mode_config); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("sme_soc_set_dual_mac_config failed %d", status); return; } @@ -2393,7 +2393,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, uint32_t num_vdev_mac_entries, struct sir_vdev_mac_map *vdev_mac_map) { - CDF_STATUS ret; + QDF_STATUS ret; struct sir_hw_mode_params hw_mode; uint32_t i; @@ -2415,7 +2415,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, vdev_mac_map[i].mac_id); ret = wma_get_hw_mode_from_idx(cfgd_hw_mode_index, &hw_mode); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { cds_err("Get HW mode failed: %d", ret); return; } @@ -2433,7 +2433,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, hw_mode); ret = cdf_set_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) + if (!QDF_IS_STATUS_SUCCESS(ret)) cds_err("ERROR: set connection_update_done event failed"); return; @@ -2456,7 +2456,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, uint32_t num_vdev_mac_entries, struct sir_vdev_mac_map *vdev_mac_map) { - CDF_STATUS status; + QDF_STATUS status; struct sir_hw_mode_params hw_mode; uint32_t i; @@ -2474,7 +2474,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, vdev_mac_map[i].mac_id); status = wma_get_hw_mode_from_idx(new_hw_mode_index, &hw_mode); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Get HW mode failed: %d", status); return; } @@ -2523,7 +2523,7 @@ static void cds_hw_mode_transition_cb(uint32_t old_hw_mode_index, * * Return: Success if the message made it down to the next layer */ -CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, +QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac0_bw, enum hw_mode_ss_config mac1_ss, @@ -2534,20 +2534,20 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, { int8_t hw_mode_index; struct sir_hw_mode msg; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hw_mode_index = wma_get_hw_mode_idx_from_dbs_hw_list(mac0_ss, mac0_bw, mac1_ss, mac1_bw, dbs, dfs); if (hw_mode_index < 0) { cds_err("Invalid HW mode index obtained"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } msg.hw_mode_index = hw_mode_index; @@ -2559,12 +2559,12 @@ CDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, msg.hw_mode_index); status = sme_soc_set_hw_mode(hdd_ctx->hHal, msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Failed to set hw mode to SME"); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2580,7 +2580,7 @@ bool cds_is_connection_in_progress(void) hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_station_ctx_t *hdd_sta_ctx = NULL; hdd_adapter_t *adapter = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; uint8_t sta_id = 0; uint8_t *sta_mac = NULL; hdd_context_t *hdd_ctx; @@ -2596,7 +2596,7 @@ bool cds_is_connection_in_progress(void) return true; } status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; if (!adapter) goto end; @@ -3084,7 +3084,7 @@ static void cds_dump_legacy_concurrency( void cds_dump_concurrency_info(void) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; hdd_station_ctx_t *pHddStaCtx; hdd_ap_ctx_t *hdd_ap_ctx; @@ -3112,7 +3112,7 @@ void cds_dump_concurrency_info(void) } status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; switch (adapter->device_mode) { case WLAN_HDD_INFRA_STATION: @@ -3146,8 +3146,8 @@ void cds_dump_concurrency_info(void) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START - && hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) { + && hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) { p2pChannel = hdd_ap_ctx->operatingChannel; cdf_copy_macaddr(&p2pBssid, &adapter->macAddressCurrent); @@ -3161,8 +3161,8 @@ void cds_dump_concurrency_info(void) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START - && hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) { + && hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) { apChannel = hdd_ap_ctx->operatingChannel; cdf_copy_macaddr(&apBssid, &adapter->macAddressCurrent); @@ -3451,7 +3451,7 @@ void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode) */ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) { - CDF_STATUS status; + QDF_STATUS status; enum cds_con_mode con_mode; struct sir_pcl_list pcl; hdd_context_t *hdd_ctx; @@ -3488,13 +3488,13 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) status = cds_get_pcl(con_mode, pcl.pcl_list, &pcl.pcl_len); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cds_err("Unable to set PCL to FW, Get PCL failed"); return; } status = sme_soc_set_pcl(hdd_ctx->hHal, pcl); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) cds_err("Send soc set PCL to SME failed"); else cds_info("Set PCL to FW for mode:%d", mode); @@ -3685,7 +3685,7 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, uint8_t session_id) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; @@ -3722,11 +3722,11 @@ void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, if (cds_need_opportunistic_upgrade()) { /* let's start the timer */ cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); - cdf_status = cdf_mc_timer_start( + qdf_status = cdf_mc_timer_start( &hdd_ctx->dbs_opportunistic_timer, DBS_OPPORTUNISTIC_TIME * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) cds_err("Failed to start dbs opportunistic timer"); } cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); @@ -3831,21 +3831,21 @@ void cds_dbs_opportunistic_timer_handler(void *data) * * Return: Success if the policy manager is deinitialized completely */ -CDF_STATUS cds_deinit_policy_mgr(void) +QDF_STATUS cds_deinit_policy_mgr(void) { cds_context_type *cds_ctx; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_destroy( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to destroy cdf_conc_list_lock"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3856,22 +3856,22 @@ CDF_STATUS cds_deinit_policy_mgr(void) * * Return: Success if the policy manager is initialized completely */ -CDF_STATUS cds_init_policy_mgr(void) +QDF_STATUS cds_init_policy_mgr(void) { - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_debug("Initializing the policy manager"); @@ -3879,11 +3879,11 @@ CDF_STATUS cds_init_policy_mgr(void) /* init conc_connection_list */ cdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to init cdf_conc_list_lock"); /* Lets us not proceed further */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_register_hw_mode_trans_cb(hdd_ctx->hHal, @@ -3892,18 +3892,18 @@ CDF_STATUS cds_init_policy_mgr(void) CDF_TIMER_TYPE_SW, cds_dbs_opportunistic_timer_handler, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("Failed to init DBS opportunistic timer"); return status; } status = cdf_init_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("connection_update_done_evt init failed"); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4010,11 +4010,11 @@ enum cds_con_mode cds_get_mode(uint8_t type, uint8_t subtype) * This function adds the new connection to the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) +QDF_STATUS cds_incr_connection_count(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index; struct wma_txrx_node *wma_conn_table_entry; hdd_context_t *hdd_ctx; @@ -4065,7 +4065,7 @@ CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) wma_conn_table_entry->chain_mask, wma_conn_table_entry->mac_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4077,11 +4077,11 @@ CDF_STATUS cds_incr_connection_count(uint32_t vdev_id) * This function adds the new connection to the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_update_connection_info(uint32_t vdev_id) +QDF_STATUS cds_update_connection_info(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0; bool found = false; struct wma_txrx_node *wma_conn_table_entry; @@ -4130,7 +4130,7 @@ CDF_STATUS cds_update_connection_info(uint32_t vdev_id) wma_conn_table_entry->rx_streams, wma_conn_table_entry->nss, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4142,11 +4142,11 @@ CDF_STATUS cds_update_connection_info(uint32_t vdev_id) * This function removes the old connection from the current * connections list * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) +QDF_STATUS cds_decr_connection_count(uint32_t vdev_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0, next_conn_index = 0; bool found = false; @@ -4191,7 +4191,7 @@ CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) /* clean up the entry */ cdf_mem_zero(&conc_connection_list[next_conn_index - 1], sizeof(*conc_connection_list)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4206,18 +4206,18 @@ CDF_STATUS cds_decr_connection_count(uint32_t vdev_id) * This function provides the channel(s) on which current * connection(s) is/are * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_connection_channels(uint8_t *channels, +QDF_STATUS cds_get_connection_channels(uint8_t *channels, uint32_t *len, uint8_t order) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t conn_index = 0, num_channels = 0; if ((NULL == channels) || (NULL == len)) { /* err msg*/ cds_err("channels or len is NULL"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4267,7 +4267,7 @@ CDF_STATUS cds_get_connection_channels(uint8_t *channels, *len = num_channels; } else { cds_err("unknown order %d", order); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -4351,10 +4351,10 @@ void cds_update_with_safe_channel_list(uint8_t *pcl_channels, uint32_t *len) * * Return: Channel List */ -CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, +QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, uint8_t *pcl_channels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t num_channels = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint32_t chan_index = 0, chan_index_24 = 0, chan_index_5 = 0; uint8_t channel_list[MAX_NUM_CHAN] = {0}; @@ -4383,12 +4383,12 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, if (CDS_NONE == pcl) { /* msg */ cds_err("pcl is 0"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* get the channel list for current domain */ status = sme_get_cfg_valid_channels(hdd_ctx->hHal, channel_list, &num_channels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { /* err msg*/ cds_err("No valid channel"); return status; @@ -4417,13 +4417,13 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(pcl_channels, channel_list_24, chan_index_24); *len = chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_5G: cdf_mem_copy(pcl_channels, channel_list_5, chan_index_5); *len = chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH: case CDS_MCC_CH: @@ -4431,7 +4431,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, channel_list, &num_channels, 0); cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH_24G: case CDS_MCC_CH_24G: @@ -4442,7 +4442,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_CH_5G: case CDS_MCC_CH_5G: @@ -4454,7 +4454,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_24G_SCC_CH: case CDS_24G_MCC_CH: @@ -4466,7 +4466,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[chan_index_24], channel_list, num_channels); *len += num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_5G_SCC_CH: case CDS_5G_MCC_CH: @@ -4478,7 +4478,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[chan_index_5], channel_list, num_channels); *len += num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5: cds_get_connection_channels( @@ -4486,14 +4486,14 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24: cds_get_connection_channels( channel_list, &num_channels, 2); cdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5_24G: cds_get_connection_channels( @@ -4503,7 +4503,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5_5G: cds_get_connection_channels( @@ -4513,7 +4513,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24_24G: cds_get_connection_channels( @@ -4523,7 +4523,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_5_SCC_ON_24_5G: cds_get_connection_channels( @@ -4533,7 +4533,7 @@ CDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, cdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; default: /* err msg */ @@ -4598,12 +4598,12 @@ bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, * connection decision making entities will using this function * to query the PCL info * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_pcl(enum cds_con_mode mode, +QDF_STATUS cds_get_pcl(enum cds_con_mode mode, uint8_t *pcl_channels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t num_connections = 0; enum cds_conc_priority_mode first_index = 0; enum cds_one_connection_mode second_index = 0; @@ -4694,7 +4694,7 @@ CDF_STATUS cds_get_pcl(enum cds_con_mode mode, * help from sme_get_cfg_valid_channels */ status = cds_get_channel_list(pcl, pcl_channels, len); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { uint32_t i; cds_debug("pcl len:%d", *len); for (i = 0; i < *len; i++) @@ -5536,9 +5536,9 @@ enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void) * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_current_connections_update(uint32_t session_id, +QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, enum cds_conn_update_reason reason) { @@ -5549,7 +5549,7 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, enum cds_band band; cds_context_type *cds_ctx; hdd_context_t *hdd_ctx; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { @@ -5560,12 +5560,12 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } if (CDS_IS_CHANNEL_24GHZ(channel)) band = CDS_BAND_24; @@ -5622,7 +5622,7 @@ CDF_STATUS cds_current_connections_update(uint32_t session_id, status = cds_next_actions(session_id, next_action, reason); else - status = CDF_STATUS_E_NOSUPPORT; + status = QDF_STATUS_E_NOSUPPORT; cds_debug("index2=%d index3=%d next_action=%d, band=%d status=%d reason=%d session_id=%d", second_index, third_index, next_action, band, status, @@ -5707,7 +5707,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, uint32_t conn_index = 0; bool wait = true; - if (CDF_STATUS_E_FAILURE == tx_status) { + if (QDF_STATUS_E_FAILURE == tx_status) { cds_err("nss update failed for vdev %d", vdev_id); return; } @@ -5765,13 +5765,13 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, +QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, enum cds_conn_update_reason reason, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t index = 0, count = 0; uint32_t list[MAX_NUMBER_OF_CONC_CONNECTIONS]; uint32_t conn_index = 0; @@ -5785,7 +5785,7 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* cds_complete_action() is called by cds_next_actions(). @@ -5810,7 +5810,7 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, [list[index]].vdev_id, new_nss, cds_nss_update_cb, next_action, hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); } @@ -5828,14 +5828,14 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, [list[index]].vdev_id, new_nss, cds_nss_update_cb, next_action, hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); } } index++; } - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) status = cds_next_actions(session_id, next_action, reason); @@ -5854,23 +5854,23 @@ CDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, * needed on current connections once channel has been decided * for the new connection. Notifies UMAC & FW as well * - * Return: CDF_STATUS enum + * Return: QDF_STATUS enum */ -CDF_STATUS cds_next_actions(uint32_t session_id, +QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, enum cds_conn_update_reason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct sir_hw_mode_params hw_mode; if (wma_is_hw_dbs_capable() == false) { cds_err("driver isn't dbs capable, no further action needed"); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* check for the current HW index to see if really need any action */ status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wma_get_current_hw_mode failed"); return status; } @@ -5885,7 +5885,7 @@ CDF_STATUS cds_next_actions(uint32_t session_id, && !hw_mode.dbs_cap)) { cds_err("driver is already in %s mode, no further action needed", (hw_mode.dbs_cap) ? "dbs" : "non dbs"); - return CDF_STATUS_E_ALREADY; + return QDF_STATUS_E_ALREADY; } switch (action) { @@ -5928,7 +5928,7 @@ CDF_STATUS cds_next_actions(uint32_t session_id, default: /* err msg */ cds_err("unexpected action value %d", action); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -6104,9 +6104,9 @@ static void cds_sap_restart_handle(struct work_struct *work) * * This routine will restart the SAP if restart is pending * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, +QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_station_ctx_t *hdd_sta_ctx) { hdd_adapter_t *sap_adapter = NULL; @@ -6117,28 +6117,28 @@ CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(hdd_ctx->config->conc_custom_rule1 && (true == cds_is_sap_restart_required()))) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; sap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); if (sap_adapter == NULL) { cds_err("sap_adapter is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (test_bit(SOFTAP_BSS_STARTED, &sap_adapter->event_flags)) { cds_err("SAP is already in started state"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(sap_adapter); if (hdd_ap_ctx == NULL) { cds_err("HDD sap context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((eCSR_ROAM_RESULT_ASSOCIATED == roam_result) && hdd_sta_ctx->conn_info.operationChannel < @@ -6175,7 +6175,7 @@ CDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, cds_sap_restart_handle); #endif schedule_work(&hdd_ctx->sap_start_work); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6196,7 +6196,7 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter; bool are_cc_channels_same = false; tScanResultHandle scan_cache = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -6212,14 +6212,14 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, wlan_hdd_check_custom_con_channel_rules(sta_adapter, ap_adapter, roam_profile, &scan_cache, &are_cc_channels_same); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("wlan_hdd_check_custom_con_channel_rules failed!"); /* Not returning */ } status = sme_scan_result_purge( WLAN_HDD_GET_HAL_CTX(sta_adapter), scan_cache); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("sme_scan_result_purge failed!"); /* Not returning */ } @@ -6266,7 +6266,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, tScanResultHandle scan_cache = NULL; uint32_t p2pgo_channel_num, freq; tHddAvoidFreqList hdd_avoid_freq_list; - CDF_STATUS status; + QDF_STATUS status; bool ret; hdd_context_t *hdd_ctx; @@ -6282,7 +6282,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, wlan_hdd_check_custom_con_channel_rules(sta_adapter, p2pgo_adapter, roam_profile, &scan_cache, &are_cc_channels_same); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("wlan_hdd_check_custom_con_channel_rules failed"); /* Not returning */ } @@ -6352,7 +6352,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, status = sme_scan_result_purge( WLAN_HDD_GET_HAL_CTX(sta_adapter), scan_cache); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cds_err("sme_scan_result_purge failed"); /* Not returning */ } @@ -6452,12 +6452,12 @@ bool cds_handle_conc_rule2(hdd_adapter_t *adapter, * This routine gets channel which most likely a candidate to which STA * will make connection. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, +QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel) { - CDF_STATUS status; + QDF_STATUS status; tScanResultHandle scan_cache = NULL; status = sme_get_ap_channel_from_scan_cache( @@ -6482,7 +6482,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, tCsrRoamProfile *roam_profile) { uint8_t channel = 0; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; hdd_adapter_t *adapter; bool ret; @@ -6501,7 +6501,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, status = cds_get_channel_from_scan_result(adapter, roam_profile, &channel); - if ((CDF_STATUS_SUCCESS != status) || (channel == 0)) { + if ((QDF_STATUS_SUCCESS != status) || (channel == 0)) { cds_err("%s error %d %d", __func__, status, channel); return 0; @@ -6573,25 +6573,25 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel) * This routine will handle STA side concurrency when policy manager * is enabled. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) +QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) { - CDF_STATUS status; + QDF_STATUS status; if (!cds_check_for_session_conc(session_id, channel)) { cds_err("Conc not allowed for the session %d", session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) cds_err("clearing event failed"); status = cds_current_connections_update(session_id, channel, CDS_UPDATE_REASON_NORMAL_STA); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { cds_err("connections update failed"); return status; } @@ -6773,7 +6773,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, */ uint8_t cds_is_mcc_in_24G(void) { - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *hdd_adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; uint8_t ret = 0; @@ -6793,7 +6793,7 @@ uint8_t cds_is_mcc_in_24G(void) status = hdd_get_front_adapter(hdd_ctx, &adapter_node); /* loop through all adapters and check MCC for STA,P2P,SAP adapters */ - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { hdd_adapter = adapter_node->pAdapter; if (!((hdd_adapter->device_mode >= WLAN_HDD_INFRA_STATION) @@ -6826,8 +6826,8 @@ uint8_t cds_is_mcc_in_24G(void) WLAN_HDD_GET_HOSTAP_STATE_PTR( hdd_adapter); if (hostapd_state->bssState == BSS_START && - hostapd_state->cdf_status == - CDF_STATUS_SUCCESS) + hostapd_state->qdf_status == + QDF_STATUS_SUCCESS) channel = ap_ctx->operatingChannel; } @@ -6866,7 +6866,7 @@ uint8_t cds_is_mcc_in_24G(void) int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) { hdd_context_t *hdd_ctx = NULL; - CDF_STATUS ret_status; + QDF_STATUS ret_status; hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (!hdd_ctx) @@ -6881,7 +6881,7 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) cds_err("Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CCM"); } ret_status = sme_set_mas(false); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { cds_err("Failed to disable MAS"); return -EBUSY; } @@ -6916,7 +6916,7 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) /* Enable MAS */ ret_status = sme_set_mas(true); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { cds_err("Unable to enable MAS"); return -EBUSY; } @@ -7051,9 +7051,9 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, * * Return: Success or Failure depending on the overall function behavior */ -CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) +QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal; cds_info("UPDATE Beacon Params"); @@ -7062,18 +7062,18 @@ CDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { cds_err("Hal ctx is null"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_change_mcc_beacon_interval(hHal, pHostapdAdapter-> sessionId); - if (cdf_ret_status == CDF_STATUS_E_FAILURE) { + if (cdf_ret_status == QDF_STATUS_E_FAILURE) { cds_err("Failed to update Beacon Params"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7261,7 +7261,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) { hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); #ifdef CFG80211_DEL_STA_V2 @@ -7290,7 +7290,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); qdf_event_reset(&hostapd_state->cdf_stop_bss_event); - if (CDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { + if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { qdf_status = qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, @@ -7315,7 +7315,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) if (wlansap_start_bss(sap_ctx, hdd_hostapd_sap_event_cb, sap_config, - ap_adapter->dev) != CDF_STATUS_SUCCESS) { + ap_adapter->dev) != QDF_STATUS_SUCCESS) { cds_err("SAP Start Bss fail"); goto end; } @@ -7389,12 +7389,12 @@ void cds_check_and_restart_sap_with_non_dfs_acs(void) } #endif #ifdef MPC_UT_FRAMEWORK -CDF_STATUS cds_update_connection_info_utfw( +QDF_STATUS cds_update_connection_info_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0, found = 0; cds_context_type *cds_ctx; @@ -7428,15 +7428,15 @@ CDF_STATUS cds_update_connection_info_utfw( rx_streams, 0, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS cds_incr_connection_count_utfw( +QDF_STATUS cds_incr_connection_count_utfw( uint32_t vdev_id, uint32_t tx_streams, uint32_t rx_streams, uint32_t chain_mask, uint32_t type, uint32_t sub_type, uint32_t channelid, uint32_t mac_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t conn_index = 0; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; @@ -7470,26 +7470,26 @@ CDF_STATUS cds_incr_connection_count_utfw( rx_streams, 0, vdev_id, true); cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, +QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, uint32_t vdev_id) { - CDF_STATUS status; + QDF_STATUS status; cds_context_type *cds_ctx; cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (del_all) { status = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("Policy manager initialization failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); @@ -7497,7 +7497,7 @@ CDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) @@ -7740,9 +7740,9 @@ bool cds_is_sta_active_connection_exists(void) * Waits for CONNECTION_UPDATE_TIMEOUT duration until the set hw mode * response sets the event connection_update_done_evt * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_wait_for_connection_update(void) +QDF_STATUS cdf_wait_for_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7750,7 +7750,7 @@ CDF_STATUS cdf_wait_for_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = qdf_wait_single_event( @@ -7759,10 +7759,10 @@ CDF_STATUS cdf_wait_for_connection_update(void) if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wait for event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7770,9 +7770,9 @@ CDF_STATUS cdf_wait_for_connection_update(void) * * Resets the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_reset_connection_update(void) +QDF_STATUS cdf_reset_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7780,17 +7780,17 @@ CDF_STATUS cdf_reset_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = qdf_event_reset(&cds_context->connection_update_done_evt); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("clear event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7798,9 +7798,9 @@ CDF_STATUS cdf_reset_connection_update(void) * * Sets the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_set_connection_update(void) +QDF_STATUS cdf_set_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7826,9 +7826,9 @@ CDF_STATUS cdf_set_connection_update(void) * * Initializes the concurrent connection update event * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cdf_init_connection_update(void) +QDF_STATUS cdf_init_connection_update(void) { QDF_STATUS qdf_status; p_cds_contextType cds_context; @@ -7836,15 +7836,15 @@ CDF_STATUS cdf_init_connection_update(void) cds_context = cds_get_global_context(); if (!cds_context) { cds_err("Invalid CDS context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } qdf_status = qdf_event_create(&cds_context->connection_update_done_evt); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("init event failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index 6354e04dc922..70ba1629ebc7 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -55,13 +55,13 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, void *pMb); * * Return: cdf status */ -inline CDF_STATUS cds_mq_init(p_cds_mq_type pMq) +inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) { if (pMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Now initialize the lock */ @@ -70,7 +70,7 @@ inline CDF_STATUS cds_mq_init(p_cds_mq_type pMq) /* Now initialize the List data structure */ INIT_LIST_HEAD(&pMq->mqList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_mq_init() */ /** @@ -170,7 +170,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) if (pMq == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } spin_lock_irqsave(&pMq->mqLock, flags); @@ -186,9 +186,9 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) * * Return: cdf status */ -CDF_STATUS cds_send_mb_message_to_mac(void *pBuf) +QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; tSirRetStatus sirStatus; v_CONTEXT_t cds_context; void *hHal; @@ -205,7 +205,7 @@ CDF_STATUS cds_send_mb_message_to_mac(void *pBuf) } else { sirStatus = u_mac_post_ctrl_msg(hHal, pBuf); if (eSIR_SUCCESS == sirStatus) - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } } diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 3f0ce95ae657..4b527948b739 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -76,11 +76,11 @@ cdf_spinlock_t trace_buffer_lock; * cds_pkt_return_packet Free the cds Packet * @ cds Packet */ -CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) +QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) { /* Validate the input parameter pointer */ if (unlikely(packet == NULL)) { - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Free up the Adf nbuf */ @@ -91,7 +91,7 @@ CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) /* Free up the Rx packet */ cdf_mem_free(packet); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /**-------------------------------------------------------------------------- @@ -103,13 +103,13 @@ CDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) \param pPacket - the cds Packet to get the packet length from. \param pPacketSize - location to return the total size of the data contained - in the cds Packet. + in the cds Packet. \return \sa ---------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) { /* Validate the parameter pointers */ @@ -117,11 +117,11 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) (pPacket->pkt_buf == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, "VPKT [%d]: NULL pointer", __LINE__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* return the requested information */ *pPacketSize = cdf_nbuf_len(pPacket->pkt_buf); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*--------------------------------------------------------------------------- @@ -289,10 +289,10 @@ void cds_pkt_proto_trace_close(void) * @brief cds_packet_alloc_debug() - Allocate a network buffer for TX ---------------------------------------------------------------------------*/ -CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, +QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_nbuf_t nbuf; nbuf = @@ -305,7 +305,7 @@ CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = cdf_nbuf_data(nbuf); - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } return cdf_ret_status; @@ -315,9 +315,9 @@ CDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, * @brief cds_packet_alloc() - Allocate a network buffer for TX ---------------------------------------------------------------------------*/ -CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) +QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_nbuf_t nbuf; nbuf = cdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), @@ -328,7 +328,7 @@ CDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = cdf_nbuf_data(nbuf); - cdf_ret_status = CDF_STATUS_SUCCESS; + cdf_ret_status = QDF_STATUS_SUCCESS; } return cdf_ret_status; diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index b4aa41aa7b24..3bd1b4b36894 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -333,7 +333,7 @@ static int cds_regulatory_wiphy_init(hdd_context_t *hdd_ctx, * cds_update_regulatory_info() - update regulatory info * @hdd_ctx: hdd context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ static void cds_update_regulatory_info(hdd_context_t *hdd_ctx) { @@ -357,16 +357,16 @@ static void cds_update_regulatory_info(hdd_context_t *hdd_ctx) * @channels_40mhz: 40 MHz channels * @num_40mhz_channels: number of 40 Mhz channels * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -CDF_STATUS cds_get_channel_list_with_power(struct channel_power +QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, uint8_t *num_base_channels, struct channel_power *channels_40mhz, uint8_t *num_40mhz_channels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int i, count; if (base_channels && num_base_channels) { @@ -420,9 +420,9 @@ CDF_STATUS cds_get_channel_list_with_power(struct channel_power * cds_read_default_country() - set the default country * @default_country: default country * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_read_default_country(uint8_t *default_country) +QDF_STATUS cds_read_default_country(uint8_t *default_country) { hdd_context_t *hdd_ctx; @@ -430,7 +430,7 @@ CDF_STATUS cds_read_default_country(uint8_t *default_country) if (!hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy(default_country, @@ -442,7 +442,7 @@ CDF_STATUS cds_read_default_country(uint8_t *default_country) default_country[0], default_country[1]); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -580,9 +580,7 @@ static int cds_bw20_ch_index_to_bw40_ch_index(int k) m = k - RF_CHAN_36 + RF_CHAN_BOND_38; if (m > RF_CHAN_BOND_62) m = RF_CHAN_BOND_62; - } - else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) - { + } else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) { m = k - RF_CHAN_100 + RF_CHAN_BOND_102; if (m > RF_CHAN_BOND_142) m = RF_CHAN_BOND_142; @@ -598,17 +596,17 @@ static int cds_bw20_ch_index_to_bw40_ch_index(int k) * cds_set_dfs_region() - set the dfs_region * @dfs_region: the dfs_region to set * - * Return: CDF_STATUS_SUCCESS if dfs_region set correctly - * CDF_STATUS_E_EXISTS if hdd context not found + * Return: QDF_STATUS_SUCCESS if dfs_region set correctly + * QDF_STATUS_E_EXISTS if hdd context not found */ -CDF_STATUS cds_set_dfs_region(uint8_t dfs_region) +QDF_STATUS cds_set_dfs_region(uint8_t dfs_region) { hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == hdd_ctx) - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) hdd_ctx->reg.dfs_region = dfs_region; @@ -631,39 +629,39 @@ CDF_STATUS cds_set_dfs_region(uint8_t dfs_region) break; } #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * cds_get_dfs_region() - get the dfs_region * @dfs_region: the dfs_region to return * - * Return: CDF_STATUS_SUCCESS if dfs_region set correctly - * CDF_STATUS_E_EXISTS if hdd context not found + * Return: QDF_STATUS_SUCCESS if dfs_region set correctly + * QDF_STATUS_E_EXISTS if hdd context not found */ -CDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) +QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) { hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == hdd_ctx) - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; *dfs_region = hdd_ctx->reg.dfs_region; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * cds_get_reg_domain_from_country_code() - get the regulatory domain * @reg_domain_ptr: ptr to store regulatory domain * - * Return: CDF_STATUS_SUCCESS on success - * CDF_STATUS_E_FAULT on error - * CDF_STATUS_E_EMPTY country table empty + * Return: QDF_STATUS_SUCCESS on success + * QDF_STATUS_E_FAULT on error + * QDF_STATUS_E_EMPTY country table empty */ -CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, +QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, const uint8_t *country_alpha2, enum country_src source) { @@ -673,24 +671,24 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, if (NULL == reg_domain_ptr) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Invalid reg domain pointer")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *reg_domain_ptr = 0; if (SOURCE_QUERY == source) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (NULL == country_alpha2) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Country code array is NULL")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "SSR in progress, return"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -698,7 +696,7 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, if (NULL == hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } wiphy = hdd_ctx->wiphy; @@ -716,7 +714,7 @@ CDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, NL80211_USER_REG_HINT_USER); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -757,7 +755,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (NULL == hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hdd_ctx->isVHT80Allowed = 0; @@ -928,7 +926,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (k == 0) return -1; - return 0; + return QDF_STATUS_SUCCESS; } #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) && !defined(WITH_BACKPORTS) @@ -1098,9 +1096,9 @@ void hdd_reg_notifier(struct wiphy *wiphy, /** * cds_regulatory_init() - regulatory_init - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_regulatory_init(void) +QDF_STATUS cds_regulatory_init(void) { hdd_context_t *hdd_ctx = NULL; struct wiphy *wiphy = NULL; @@ -1111,7 +1109,7 @@ CDF_STATUS cds_regulatory_init(void) if (!hdd_ctx) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } wiphy = hdd_ctx->wiphy; @@ -1125,7 +1123,7 @@ CDF_STATUS cds_regulatory_init(void) nBandCapability, true) != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ("Error while creating regulatory entry")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } reg_info->cc_src = SOURCE_DRIVER; @@ -1143,7 +1141,7 @@ CDF_STATUS cds_regulatory_init(void) cds_fill_and_send_ctl_to_fw(reg_info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1151,18 +1149,18 @@ CDF_STATUS cds_regulatory_init(void) * @client_ctxt: client context * @reg_domain: regulatory domain * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) { if (reg_domain >= REGDOMAIN_COUNT) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "CDS set reg domain, invalid REG domain ID %d", reg_domain); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index a30b031b12cd..ff22f1a8a8d9 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -82,7 +82,7 @@ static int cds_mc_thread(void *Arg); #ifdef QCA_CONFIG_SMP static int cds_ol_rx_thread(void *arg); static unsigned long affine_cpu; -static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); +static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); #endif #ifdef QCA_CONFIG_SMP @@ -186,29 +186,29 @@ static struct notifier_block cds_cpu_hotplug_notifier = { * * Return: CDF status */ -CDF_STATUS cds_sched_open(void *p_cds_context, +QDF_STATUS cds_sched_open(void *p_cds_context, p_cds_sched_context pSchedContext, uint32_t SchedCtxSize) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening the CDS Scheduler", __func__); /* Sanity checks */ if ((p_cds_context == NULL) || (pSchedContext == NULL)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sizeof(cds_sched_context) != SchedCtxSize) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Incorrect CDS Sched Context size passed", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_zero(pSchedContext, sizeof(cds_sched_context)); pSchedContext->pVContext = p_cds_context; vStatus = cds_sched_init_mqs(pSchedContext); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS Scheduler MQs", __func__); @@ -240,8 +240,8 @@ CDF_STATUS cds_sched_open(void *p_cds_context, spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); INIT_LIST_HEAD(&pSchedContext->cds_ol_rx_pkt_freeq); spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - if (cds_alloc_ol_rx_pkt_freeq(pSchedContext) != CDF_STATUS_SUCCESS) { - return CDF_STATUS_E_FAILURE; + if (cds_alloc_ol_rx_pkt_freeq(pSchedContext) != QDF_STATUS_SUCCESS) { + return QDF_STATUS_E_FAILURE; } register_hotcpu_notifier(&cds_cpu_hotplug_notifier); pSchedContext->cpu_hot_plug_notifier = &cds_cpu_hotplug_notifier; @@ -292,7 +292,7 @@ CDF_STATUS cds_sched_open(void *p_cds_context, /* We're good now: Let's get the ball rolling!!! */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Scheduler successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #ifdef QCA_CONFIG_SMP OL_RX_THREAD_START_FAILURE: @@ -313,7 +313,7 @@ MC_THREAD_START_FAILURE: cds_free_ol_rx_pkt_freeq(gp_cds_sched_context); #endif - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* cds_sched_open() */ @@ -329,7 +329,7 @@ static int cds_mc_thread(void *Arg) p_cds_msg_wrapper pMsgWrapper = NULL; tpAniSirGlobal pMacContext = NULL; tSirRetStatus macStatus = eSIR_SUCCESS; - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; int retWaitStatus = 0; bool shutdown = false; hdd_context_t *pHddCtx = NULL; @@ -424,7 +424,7 @@ static int cds_mc_thread(void *Arg) vStatus = sys_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SYS message", @@ -455,7 +455,7 @@ static int cds_mc_thread(void *Arg) vStatus = wma_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing WMA message", @@ -546,7 +546,7 @@ static int cds_mc_thread(void *Arg) vStatus = sme_process_msg((tHalHandle) pMacContext, pMsgWrapper->pVosMsg); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SME message", @@ -619,7 +619,7 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) * * Return: status of memory allocation */ -static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) +static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) { struct cds_ol_rx_pkt *pkt, *tmp; int i; @@ -638,7 +638,7 @@ static CDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; free: spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); @@ -650,7 +650,7 @@ free: spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /** @@ -895,14 +895,14 @@ static int cds_ol_rx_thread(void *arg) * * Return: cdf status */ -CDF_STATUS cds_sched_close(void *p_cds_context) +QDF_STATUS cds_sched_close(void *p_cds_context) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: invoked", __func__); if (gp_cds_sched_context == NULL) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* shut down MC Thread */ set_bit(MC_SHUTDOWN_EVENT_MASK, &gp_cds_sched_context->mcEventFlag); @@ -929,7 +929,7 @@ CDF_STATUS cds_sched_close(void *p_cds_context) cds_free_ol_rx_pkt_freeq(gp_cds_sched_context); unregister_hotcpu_notifier(&cds_cpu_hotplug_notifier); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_sched_close() */ /** @@ -940,14 +940,14 @@ CDF_STATUS cds_sched_close(void *p_cds_context) * * Return: CDF status */ -CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) +QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; /* Now intialize all the message queues */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the WMA MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->wmaMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init WMA MC Message queue", __func__); CDF_ASSERT(0); @@ -956,7 +956,7 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the PE MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->peMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init PE MC Message queue", __func__); CDF_ASSERT(0); @@ -965,7 +965,7 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SME MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->smeMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SME MC Message queue", __func__); CDF_ASSERT(0); @@ -974,14 +974,14 @@ CDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SYS MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->sysMcMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SYS MC Message queue", __func__); CDF_ASSERT(0); return vStatus; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* cds_sched_init_mqs() */ /** diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index cec62590eb18..048061fe1383 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,18 +29,18 @@ FILE: cds_utils.c OVERVIEW: This source file contains definitions for CDS crypto APIs - The four APIs mentioned in this file are used for - initializing, and de-initializing a crypto context, and - obtaining truly random data (for keys), as well as - SHA1 HMAC, and AES encrypt and decrypt routines. - - The routines include: - cds_crypto_init() - Initializes Crypto module - cds_crypto_deinit() - De-initializes Crypto module - cds_rand_get_bytes() - Generates random byte - cds_sha1_hmac_str() - Generate the HMAC-SHA1 of a string given a key - cds_encrypt_aes() - Generate AES Encrypted byte stream - cds_decrypt_aes() - Decrypts an AES Encrypted byte stream + The four APIs mentioned in this file are used for + initializing, and de-initializing a crypto context, and + obtaining truly random data (for keys), as well as + SHA1 HMAC, and AES encrypt and decrypt routines. + + The routines include: + cds_crypto_init() - Initializes Crypto module + cds_crypto_deinit() - De-initializes Crypto module + cds_rand_get_bytes() - Generates random byte + cds_sha1_hmac_str() - Generate the HMAC-SHA1 of a string given a key + cds_encrypt_aes() - Generate AES Encrypted byte stream + cds_decrypt_aes() - Decrypts an AES Encrypted byte stream DEPENDENCIES: ============================================================================*/ @@ -201,37 +201,37 @@ static void cds_cmac_calc_mic(struct crypto_cipher *tfm, \param phCryptProv - pointer to the Crypt handle - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_crypto_init(uint32_t *phCryptProv) +QDF_STATUS cds_crypto_init(uint32_t *phCryptProv) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* This implementation doesn't require a crypto context */ *phCryptProv = 0; - uResult = CDF_STATUS_SUCCESS; - return (uResult); + uResult = QDF_STATUS_SUCCESS; + return uResult; } -CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) +QDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* CryptReleaseContext succeeded */ - uResult = CDF_STATUS_SUCCESS; + uResult = QDF_STATUS_SUCCESS; - return (uResult); + return uResult; } /*-------------------------------------------------------------------------- @@ -247,38 +247,38 @@ CDF_STATUS cds_crypto_deinit(uint32_t hCryptProv) \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS cds_rand_get_bytes(uint32_t cryptHandle, uint8_t *pbBuf, uint32_t numBytes) { - CDF_STATUS uResult = CDF_STATUS_E_FAILURE; + QDF_STATUS uResult = QDF_STATUS_E_FAILURE; /* check for invalid pointer */ if (NULL == pbBuf) { - uResult = CDF_STATUS_E_FAULT; - return (uResult); + uResult = QDF_STATUS_E_FAULT; + return uResult; } get_random_bytes(pbBuf, numBytes); /* "Random sequence generated." */ - uResult = CDF_STATUS_SUCCESS; - return (uResult); + uResult = QDF_STATUS_SUCCESS; + return uResult; } #ifdef WLAN_FEATURE_11W -uint8_t cds_get_mmie_size() +uint8_t cds_get_mmie_size(void) { return sizeof(struct ieee80211_mmie); } @@ -310,7 +310,7 @@ static void cds_increase_seq(uint8_t *ipn) of Broadcast/Multicast robust management frames. \param igtk - pointer group key which will be used to calculate - the 8 byte MIC. + the 8 byte MIC. \param ipn - pointer ipn, it is also known as sequence number \param key_id - key identication number \param frm - pointer to the start of the frame. @@ -318,7 +318,7 @@ static void cds_increase_seq(uint8_t *ipn) \param frmLen - size of the entire frame. \return - this function will return true on success and false on - failure. + failure. --------------------------------------------------------------------------*/ @@ -420,7 +420,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, if (NULL == input) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation failed", __func__); - ret = CDF_STATUS_E_NOMEM; + ret = QDF_STATUS_E_NOMEM; goto err_tfm; } @@ -530,7 +530,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) if (NULL == input) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Memory allocation failed"); - ret = CDF_STATUS_E_NOMEM; + ret = QDF_STATUS_E_NOMEM; goto err_tfm; } @@ -708,7 +708,7 @@ err_tfm: return ret; } -CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *pKey, /* pointer to authentication key */ @@ -728,10 +728,10 @@ CDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "hmac_sha1() call failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -868,7 +868,7 @@ err_tfm: return ret; } -CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint32_t textLen, /* length of data stream */ uint8_t *pKey, /* pointer to authentication key */ @@ -888,10 +888,10 @@ CDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "hmac_md5() call failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } struct ecb_aes_result { @@ -921,21 +921,21 @@ static void ecb_aes_complete(struct crypto_async_request *req, int err) \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pPlainText, /* pointer to data stream */ uint8_t *pCiphertext, uint8_t *pKey) { /* pointer to authentication key */ @@ -997,10 +997,10 @@ err_tfm: if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -1016,25 +1016,25 @@ err_tfm: \param lock - pointer to the opaque lock object to initialize - \return CDF_STATUS_SUCCESS - Successfully generated random memory. + \return QDF_STATUS_SUCCESS - Successfully generated random memory. - CDF_STATUS_E_FAULT - pbBuf is an invalid pointer. + QDF_STATUS_E_FAULT - pbBuf is an invalid pointer. - CDF_STATUS_E_FAILURE - default return value if it fails due to - unknown reasons + QDF_STATUS_E_FAILURE - default return value if it fails due to + unknown reasons - ***CDF_STATUS_E_RESOURCES - System resources (other than memory) - are unavailable + ***QDF_STATUS_E_RESOURCES - System resources (other than memory) + are unavailable \sa ( *** return value not considered yet ) --------------------------------------------------------------------------*/ -CDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ +QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ uint8_t *pText, /* pointer to data stream */ uint8_t *pDecrypted, uint8_t *pKey) { /* pointer to authentication key */ -/* CDF_STATUS uResult = CDF_STATUS_E_FAILURE; */ +/* QDF_STATUS uResult = QDF_STATUS_E_FAILURE; */ struct ecb_aes_result result; struct ablkcipher_request *req; struct crypto_ablkcipher *tfm; @@ -1093,10 +1093,10 @@ err_tfm: if (ret != 0) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t cds_chan_to_freq(uint8_t chan) diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index a2b6fb11bcfc..6e6a9142d6a4 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -224,7 +224,7 @@ static void htt_rx_ring_refill_retry(void *arg) void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) { int idx; - CDF_STATUS status; + QDF_STATUS status; struct htt_host_rx_desc_base *rx_desc; idx = *(pdev->rx_ring.alloc_idx.vaddr); @@ -284,7 +284,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) cdf_nbuf_map(pdev->osdev, rx_netbuf, CDF_DMA_FROM_DEVICE); #endif - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cdf_nbuf_free(rx_netbuf); goto fail; } diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 700dcf4a0626..88333fa6b0ef 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -674,9 +674,9 @@ ol_txrx_set_monitor_mode_vap(ol_txrx_pdev_handle pdev, */ void ol_txrx_set_curchan(ol_txrx_pdev_handle pdev, uint32_t chan_mhz); -CDF_STATUS ol_txrx_bus_suspend(void); -CDF_STATUS ol_txrx_bus_resume(void); -CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); +QDF_STATUS ol_txrx_bus_suspend(void); +QDF_STATUS ol_txrx_bus_resume(void); +QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); /** * @brief Get the number of pending transmit frames that are awaiting completion. @@ -764,7 +764,7 @@ enum ol_txrx_peer_state { * * Return: CDF Status */ -CDF_STATUS +QDF_STATUS ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr, enum ol_txrx_peer_state state); @@ -900,7 +900,7 @@ struct txrx_pdev_cfg_param_t { ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev, struct txrx_pdev_cfg_param_t cfg_param); -CDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); +QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id); @@ -1252,7 +1252,7 @@ void ol_txrx_display_stats(uint16_t bitmap); void ol_txrx_clear_stats(uint16_t bitmap); int ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len); -CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, +QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, uint8_t *peer_id); void ol_txrx_set_ocb_peer(struct ol_txrx_pdev_t *pdev, diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 1bc73d28a550..81fddfee1f09 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -110,7 +110,7 @@ struct ol_txrx_desc_type { }; -typedef CDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, +typedef QDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, cdf_nbuf_t pDataBuff, uint8_t ucSTAId); @@ -119,12 +119,12 @@ typedef void (*ol_tx_pause_callback_fp)(uint8_t vdev_id, enum netif_reason_type reason); #ifdef QCA_LL_TX_FLOW_CONTROL_V2 -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb); +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb); #else static inline -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -262,12 +262,12 @@ cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, cdf_nbuf_t skb); #endif -CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, +QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc); -CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); +QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); -CDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, +QDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index a33771745a0b..e0ff7563c583 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -149,7 +149,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); struct ol_txrx_peer_t *peer; cdf_nbuf_t ret; - CDF_STATUS status; + QDF_STATUS status; if (cdf_unlikely(!pdev)) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, @@ -182,7 +182,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, } status = cdf_nbuf_map_single(cdf_ctx, skb, CDF_DMA_TO_DEVICE); - if (cdf_unlikely(status != CDF_STATUS_SUCCESS)) { + if (cdf_unlikely(status != QDF_STATUS_SUCCESS)) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 6fd096a8b528..9e49c6dcf8f4 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -130,16 +130,16 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, return peer; } -CDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) +QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) { if (!peer) { CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "peer argument is null!!"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *vdev_id = peer->vdev->vdev_id; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id) @@ -1263,7 +1263,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, bool drop) { struct ol_rx_cached_buf *cache_buf; - CDF_STATUS ret; + QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; void *cds_ctx = cds_get_global_context(); @@ -1291,7 +1291,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, } else { /* Flush the cached frames to HDD */ ret = data_rx(cds_ctx, cache_buf->buf, peer->local_id); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) cdf_nbuf_free(cache_buf->buf); } cdf_mem_free(cache_buf); @@ -1466,7 +1466,7 @@ static A_STATUS ol_tx_filter_pass_thru(struct ol_txrx_msdu_info_t *tx_msdu_info) return A_OK; } -CDF_STATUS +QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, enum ol_txrx_peer_state state) { @@ -1475,7 +1475,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, if (cdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL"); cdf_assert(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_hash_find(pdev, peer_mac, 0, 1); @@ -1484,7 +1484,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, " 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", __FUNCTION__, peer_mac[0], peer_mac[1], peer_mac[2], peer_mac[3], peer_mac[4], peer_mac[5]); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* TODO: Should we send WMI command of the connection state? */ @@ -1496,7 +1496,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, __func__); #endif cdf_atomic_dec(&peer->ref_cnt); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: change from %d to %d\n", @@ -1530,7 +1530,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, /* Set the state after the Pause to avoid the race condiction with ADDBA check in tx path */ peer->state = state; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void @@ -1886,18 +1886,18 @@ static void ol_txrx_dump_tx_desc(ol_txrx_pdev_handle pdev_handle) * queue doesn't empty before timeout occurs. * * Return: - * CDF_STATUS_SUCCESS if the queue empties, - * CDF_STATUS_E_TIMEOUT in case of timeout, - * CDF_STATUS_E_FAULT in case of missing handle + * QDF_STATUS_SUCCESS if the queue empties, + * QDF_STATUS_E_TIMEOUT in case of timeout, + * QDF_STATUS_E_FAULT in case of missing handle */ -CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) +QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) { ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (txrx_pdev == NULL) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: txrx context is null", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } while (ol_txrx_get_tx_pending(txrx_pdev)) { @@ -1906,11 +1906,11 @@ CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: tx frames are pending", __func__); ol_txrx_dump_tx_desc(txrx_pdev); - return CDF_STATUS_E_TIMEOUT; + return QDF_STATUS_E_TIMEOUT; } timeout = timeout - OL_ATH_TX_DRAIN_WAIT_DELAY; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifndef QCA_WIFI_3_0_EMU @@ -1924,9 +1924,9 @@ CDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) * * Ensure that ol_txrx is ready for bus suspend * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS ol_txrx_bus_suspend(void) +QDF_STATUS ol_txrx_bus_suspend(void) { return ol_txrx_wait_for_pending_tx(SUSPEND_DRAIN_WAIT); } @@ -1936,11 +1936,11 @@ CDF_STATUS ol_txrx_bus_suspend(void) * * Dummy function for symetry * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -CDF_STATUS ol_txrx_bus_resume(void) +QDF_STATUS ol_txrx_bus_resume(void) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int ol_txrx_get_tx_pending(ol_txrx_pdev_handle pdev_handle) @@ -2990,7 +2990,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, { void *cds_ctx = cds_get_global_context(); cdf_nbuf_t buf, next_buf; - CDF_STATUS ret; + QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; if (cdf_unlikely(!cds_ctx)) @@ -3017,7 +3017,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, next_buf = cdf_nbuf_queue_next(buf); cdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */ ret = data_rx(cds_ctx, buf, peer->local_id); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed"); cdf_nbuf_free(buf); } @@ -3141,7 +3141,7 @@ drop_rx_buf: * * Return: CDF Status */ -CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, +QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc) { struct ol_txrx_peer_t *peer; @@ -3151,18 +3151,18 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (sta_desc->sta_id >= WLAN_MAX_STA_COUNT) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id :%d", sta_desc->sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_desc->sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; cdf_spin_lock_bh(&peer->peer_info_lock); peer->osif_rx = rxcb; @@ -3182,7 +3182,7 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, } ol_txrx_flush_rx_frames(peer, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3191,7 +3191,7 @@ CDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, * * Return: CDF Status */ -CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) +QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) { struct ol_txrx_peer_t *peer; struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); @@ -3199,12 +3199,12 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_id >= WLAN_MAX_STA_COUNT) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Invalid sta id %d", sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } #ifdef QCA_CONFIG_SMP @@ -3218,7 +3218,7 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; /* Purge the cached rx frame queue */ ol_txrx_flush_rx_frames(peer, 1); @@ -3228,7 +3228,7 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) peer->state = ol_txrx_peer_state_disc; cdf_spin_unlock_bh(&peer->peer_info_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3237,9 +3237,9 @@ CDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) * @mac_addr: MAC address of the self peer * @peer_id: Pointer to the peer ID * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, +QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, uint8_t *peer_id) { ol_txrx_pdev_handle pdev; @@ -3248,21 +3248,21 @@ CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, if (!cds_ctx) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } peer = ol_txrx_find_peer_by_addr(pdev, mac_addr, peer_id); if (!peer) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find OCB peer!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ol_txrx_set_ocb_peer(pdev, peer); @@ -3271,7 +3271,7 @@ CDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, ol_txrx_peer_state_update(pdev, peer->mac_addr.raw, ol_txrx_peer_state_auth); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3324,15 +3324,15 @@ exit: * * Return: CDF status */ -CDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) +QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev || !pause_cb) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "pdev or pause_cb is NULL"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pdev->pause_cb = pause_cb; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif diff --git a/core/dp/txrx/txrx.h b/core/dp/txrx/txrx.h index a9808f19be0e..7d2c03cc0ec2 100644 --- a/core/dp/txrx/txrx.h +++ b/core/dp/txrx/txrx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -107,8 +107,8 @@ struct wlan_txrx_stats { struct ol_txrx_vdev_t; -CDF_STATUS wlan_register_mgmt_client(void *pdev_txrx, - CDF_STATUS (*rx_mgmt)(void *g_cdsctx, +QDF_STATUS wlan_register_mgmt_client(void *pdev_txrx, + QDF_STATUS (*rx_mgmt)(void *g_cdsctx, void *buf)); typedef void (*ol_txrx_vdev_delete_cb)(void *context); @@ -124,7 +124,7 @@ typedef void (*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error); /* If RSSI realm is changed, send notification to Clients, SME, HDD */ -typedef CDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, +typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, void *usr_ctx, int8_t avg_rssi); diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 3549c7b2d5e1..45f1a08e06af 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -168,9 +168,9 @@ eCsrBand hdd_conn_get_connected_band(hdd_station_ctx_t *pHddStaCtx); * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, +QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); @@ -214,9 +214,9 @@ int hdd_set_csr_auth_type(hdd_adapter_t *pAdapter, eCsrAuthType RSNAuthType); * Construct the staDesc and register with TL the new STA. * This is called as part of ADD_STA in the TDLS setup. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, const uint8_t *peerMac, uint16_t staId, uint8_t ucastSig); @@ -248,7 +248,7 @@ hdd_indicate_ese_bcn_report_no_results(const hdd_adapter_t *pAdapter, const uint8_t numBss); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress); diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index d02124b3fb1e..31929225b221 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3569,32 +3569,32 @@ static __inline unsigned long util_min(unsigned long a, unsigned long b) } /* Function declarations and documenation */ -CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx); -CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx); +QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx); bool hdd_update_config_dat(hdd_context_t *pHddCtx); -CDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, +QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, int buflen); eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode); -CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, +QDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, char *command); bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx); -CDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val); +QDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val); void hdd_update_tgt_cfg(void *context, void *param); bool hdd_dfs_indicate_radar(void *context, void *param); -CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *intArray, uint8_t *len, +QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *intArray, uint8_t *len, uint8_t intArrayMaxLen); -CDF_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, +QDF_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, uint8_t *len, uint8_t int_array_max_len); void hdd_cfg_print(hdd_context_t *pHddCtx); -CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss); +QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss); #ifdef FEATURE_WLAN_SCAN_PNO void hdd_set_pno_channel_prediction_config( tpSmeConfigParams sme_config, hdd_context_t *hdd_ctx); diff --git a/core/hdd/inc/wlan_hdd_debugfs.h b/core/hdd/inc/wlan_hdd_debugfs.h index be513177f83b..59f2f36238df 100644 --- a/core/hdd/inc/wlan_hdd_debugfs.h +++ b/core/hdd/inc/wlan_hdd_debugfs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,12 +29,12 @@ #define _WLAN_HDD_DEBUGFS_H #ifdef WLAN_OPEN_SOURCE -CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter); void hdd_debugfs_exit(hdd_context_t *pHddCtx); #else -inline CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) +inline QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } inline void hdd_debugfs_exit(hdd_context_t *pHddCtx) diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h index 0571dc5b95bc..90280d377539 100644 --- a/core/hdd/inc/wlan_hdd_ftm.h +++ b/core/hdd/inc/wlan_hdd_ftm.h @@ -34,7 +34,6 @@ * WLAN Host Device Driver Factory Test Mode header file */ -#include "cdf_status.h" #include "qdf_status.h" #include "cds_mq.h" #include "cds_api.h" @@ -60,7 +59,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx); int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx); #if defined(QCA_WIFI_FTM) -CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len); +QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len); int wlan_hdd_qcmbr_unified_ioctl(hdd_adapter_t *adapter, struct ifreq *ifr); int hdd_ftm_start(hdd_context_t *hdd_ctx); int hdd_ftm_stop(hdd_context_t *hdd_ctx); diff --git a/core/hdd/inc/wlan_hdd_ipa.h b/core/hdd/inc/wlan_hdd_ipa.h index d3c412548aee..a7cabccedfb6 100644 --- a/core/hdd/inc/wlan_hdd_ipa.h +++ b/core/hdd/inc/wlan_hdd_ipa.h @@ -52,9 +52,9 @@ static inline hdd_ipa_nbuf_cb_fn wlan_hdd_stub_ipa_fn(void) return hdd_ipa_nbuf_cb; }; -CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); -CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); -CDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, +QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, uint8_t sta_id); int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, enum ipa_wlan_event type, uint8_t *mac_addr); @@ -75,20 +75,20 @@ void hdd_ipa_uc_force_pipe_shutdown(hdd_context_t *hdd_ctx); struct sk_buff *hdd_ipa_tx_packet_ipa(hdd_context_t *hdd_ctx, struct sk_buff *skb, uint8_t session_id); #else -static inline CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) +static inline QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) +static inline QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static inline CDF_STATUS hdd_ipa_process_rxt(void *cds_context, +static inline QDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, uint8_t sta_id) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static inline int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 94145bba0047..fb6a0eb517b8 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -674,7 +674,7 @@ typedef struct hdd_hostapd_state_s { int bssState; qdf_event_t cdf_event; qdf_event_t cdf_stop_bss_event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; bool bCommit; } hdd_hostapd_state_t; @@ -899,7 +899,7 @@ struct hdd_adapter_s { struct completion tdls_del_station_comp; struct completion tdls_mgmt_comp; struct completion tdls_link_establish_req_comp; - CDF_STATUS tdlsAddStaStatus; + QDF_STATUS tdlsAddStaStatus; #endif /* Track whether the linkup handling is needed */ @@ -1343,43 +1343,43 @@ void wlan_hdd_check_sta_ap_concurrent_ch_intf(void *sta_pAdapter); const char *hdd_device_mode_to_string(uint8_t device_mode); -CDF_STATUS hdd_get_front_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_get_front_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t **ppAdapterNode); -CDF_STATUS hdd_get_next_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_get_next_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode, hdd_adapter_list_node_t **pNextAdapterNode); -CDF_STATUS hdd_remove_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_remove_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); -CDF_STATUS hdd_remove_front_adapter(hdd_context_t *pHddCtx, +QDF_STATUS hdd_remove_front_adapter(hdd_context_t *pHddCtx, hdd_adapter_list_node_t **ppAdapterNode); -CDF_STATUS hdd_add_adapter_back(hdd_context_t *pHddCtx, +QDF_STATUS hdd_add_adapter_back(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); -CDF_STATUS hdd_add_adapter_front(hdd_context_t *pHddCtx, +QDF_STATUS hdd_add_adapter_front(hdd_context_t *pHddCtx, hdd_adapter_list_node_t *pAdapterNode); hdd_adapter_t *hdd_open_adapter(hdd_context_t *pHddCtx, uint8_t session_type, const char *name, tSirMacAddr macAddr, bool rtnl_held); -CDF_STATUS hdd_close_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, +QDF_STATUS hdd_close_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); -CDF_STATUS hdd_close_all_adapters(hdd_context_t *pHddCtx, bool rtnl_held); -CDF_STATUS hdd_stop_all_adapters(hdd_context_t *pHddCtx); -CDF_STATUS hdd_reset_all_adapters(hdd_context_t *pHddCtx); -CDF_STATUS hdd_start_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_close_all_adapters(hdd_context_t *pHddCtx, bool rtnl_held); +QDF_STATUS hdd_stop_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_reset_all_adapters(hdd_context_t *pHddCtx); +QDF_STATUS hdd_start_all_adapters(hdd_context_t *pHddCtx); hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *pHddCtx, uint32_t vdev_id); hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *pHddCtx, tSirMacAddr macAddr); -CDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter); hdd_adapter_t *hdd_get_adapter(hdd_context_t *pHddCtx, device_mode_t mode); void hdd_deinit_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); -CDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, +QDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, const bool bCloseSession); void hdd_set_station_ops(struct net_device *pWlanDev); uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *pHddCtx); @@ -1400,12 +1400,12 @@ void hdd_allow_suspend(uint32_t reason); void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason); void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy); -CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx); +QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_restart_driver(hdd_context_t *pHddCtx); void hdd_exchange_version_and_caps(hdd_context_t *pHddCtx); int wlan_hdd_validate_context(hdd_context_t *pHddCtx); bool hdd_is_valid_mac_address(const uint8_t *pMacAddr); -CDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx); +QDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx); void hdd_checkandupdate_phymode(hdd_context_t *pHddCtx); @@ -1484,11 +1484,11 @@ void hdd_update_macaddr(struct hdd_config *config, void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter); void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_post_cds_enable_config(hdd_context_t *pHddCtx); +QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *pHddCtx); -CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx); +QDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx); -CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, +QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter, tCsrRoamProfile *roam_profile, tScanResultHandle *scan_cache, diff --git a/core/hdd/inc/wlan_hdd_power.h b/core/hdd/inc/wlan_hdd_power.h index df3a0d0ba3e8..2ce7f2dd2957 100644 --- a/core/hdd/inc/wlan_hdd_power.h +++ b/core/hdd/inc/wlan_hdd_power.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -128,11 +128,11 @@ struct pkt_filter_cfg { /* SSR shutdown & re-init functions */ -CDF_STATUS hdd_wlan_shutdown(void); -CDF_STATUS hdd_wlan_re_init(void *hif_sc); +QDF_STATUS hdd_wlan_shutdown(void); +QDF_STATUS hdd_wlan_re_init(void *hif_sc); void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter); -CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable); +QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable); void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, bool fenable); #ifdef WLAN_FEATURE_PACKET_FILTERING diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 2061ec72c689..8d122c71a077 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -39,24 +39,24 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_softap_tx_timeout(struct net_device *dev); -CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, struct cdf_mac_addr *pmacAddrSTA); -CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId); -CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD -CDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, cdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ -CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId); -CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, @@ -64,14 +64,14 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, uint8_t bcastSig, struct cdf_mac_addr *pPeerMacAddress, bool fWmmEnabled); -CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit); -CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter); -CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter); +QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state); -CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pMacAddress, uint8_t *staId); diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index fc80851a1430..704484401269 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -55,17 +55,17 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); -CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); -CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, +QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD -CDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, +QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, cdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ -CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, +QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, struct cdf_mac_addr *pMacAddress, uint8_t *staId); diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index ca84c666724b..809d4b4dd96e 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -338,23 +338,23 @@ extern int hdd_priv_get_data(struct iw_point *p_priv_data, extern void *mem_alloc_copy_from_user_helper(const void *wrqu_data, size_t len); -extern CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, +extern QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, struct cdf_mac_addr mac_address); void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter); uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size, uint8_t *ie, int ie_len); -CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter); +QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter); -CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value); +QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value); -CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr); +QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS iw_set_tdls_params(struct net_device *dev, +QDF_STATUS iw_set_tdls_params(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra, int nOffset); #endif diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h index 864a1e73fc01..b2171653210c 100644 --- a/core/hdd/inc/wlan_hdd_wmm.h +++ b/core/hdd/inc/wlan_hdd_wmm.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012,2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012,2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -223,9 +223,9 @@ int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr); * adapter to an initial state. The configuration can later be * overwritten via application APIs or via QoS Map sent OTA. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); /** * hdd_wmm_adapter_init() - initialize the WMM configuration of an adapter @@ -235,9 +235,9 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter); * adapter to an initial state. The configuration can later be * overwritten via application APIs * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); /** * hdd_wmm_close() - WMM close function @@ -246,9 +246,9 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter); * Function which will perform any necessary work to to clean up the * WMM functionality prior to the kernel module unload. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter); /** * hdd_wmm_select_queue() - Function which will classify the packet @@ -301,9 +301,9 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, * @pGranted: [out] pointer to bool flag when indicates if access * has been granted or not * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, sme_ac_enum_type acType, bool *pGranted); /** @@ -314,9 +314,9 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType: [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType); /** @@ -327,9 +327,9 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType : [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType); /** @@ -339,9 +339,9 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, * @pAdapter : [in] pointer to adapter context * @pUapsdMask: [out] pointer to where the UAPSD Mask is to be stored * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, uint8_t *pUapsdMask); /** @@ -396,9 +396,9 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, * * @pAdapter: [in] pointer to Adapter context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter); void wlan_hdd_process_peer_unauthorised_pause(hdd_adapter_t *adapter); #endif /* #ifndef _WLAN_HDD_WMM_H */ diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index e8f6a317a232..211d092d10dd 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -917,12 +917,12 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) * @pAdapter: pointer to adapter * @staId: station identifier * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (eConnectionState_IbssDisconnected == @@ -933,13 +933,13 @@ hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) */ } - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ol_txrx_clear_peer() failed for staID %d. Status(%d) [0x%08X]"), - staId, cdf_status, cdf_status); + staId, qdf_status, qdf_status); } - return cdf_status; + return qdf_status; } /** @@ -955,16 +955,16 @@ hdd_roam_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * 2. Clean up internal connection states and data structures; * 3. Send disconnect indication to supplicant. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS vstatus; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS vstatus; struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -973,7 +973,7 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, if (dev == NULL) { hddLog(LOGE, FL("net_dev is released return")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* notify apps that we can't pass traffic anymore */ hddLog(LOG1, FL("Disabling queues")); @@ -1083,10 +1083,10 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, uint8_t i; sta_id = pHddStaCtx->broadcast_ibss_staid; vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hdd_err("hdd_roam_deregister_sta() failed for staID %d Status=%d [0x%x]", sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } pHddCtx->sta_to_adapter[sta_id] = NULL; /* Clear all the peer sta register with TL. */ @@ -1096,11 +1096,11 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, sta_id = pHddStaCtx->conn_info.staId[i]; hddLog(LOG1, FL("Deregister StaID %d"), sta_id); vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(LOGE, FL("hdd_roamDeregisterSTA() failed to for staID %d. Status= %d [0x%x]"), sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } /* set the staid and peer mac as 0, all other * reset are done in hdd_connRemoveConnectInfo. @@ -1117,11 +1117,11 @@ static CDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, * for now, only one. */ vstatus = hdd_roam_deregister_sta(pAdapter, sta_id); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(LOGE, FL("hdd_roam_deregister_sta() failed to for staID %d. Status= %d [0x%x]"), sta_id, status, status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } pHddCtx->sta_to_adapter[sta_id] = NULL; } @@ -1181,38 +1181,38 @@ void hdd_set_peer_authorized_event(uint32_t vdev_id) * * Return: CDF status */ -CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress) { struct ol_txrx_peer_t *peer; - CDF_STATUS err; + QDF_STATUS err; struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!pdev) { hdd_err("Failed to get txrx context"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sta_id >= WLAN_MAX_STA_COUNT) { hddLog(LOGE, "Invalid sta id :%d", sta_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; err = ol_txrx_peer_state_update(pdev, (u_int8_t *) peer->mac_addr.raw, sta_state); - if (err != CDF_STATUS_SUCCESS) { + if (err != QDF_STATUS_SUCCESS) { hddLog(LOGE, "peer state update failed"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (roam_synch_in_progress) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif if (sta_state == ol_txrx_peer_state_auth) { @@ -1224,9 +1224,9 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, err = sme_set_peer_authorized(peer->mac_addr.raw, hdd_set_peer_authorized_event, pAdapter->sessionId); - if (err != CDF_STATUS_SUCCESS) { + if (err != QDF_STATUS_SUCCESS) { hddLog(LOGE, "Failed to set the peer state to authorized"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || @@ -1247,7 +1247,7 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, #endif } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1258,20 +1258,20 @@ CDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, * @pPeerMacAddress: peer MAC address * @pBssDesc: pointer to BSS description * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint8_t staId, struct cdf_mac_addr *pPeerMacAddress, tSirBssDescription *pBssDesc) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (NULL == pBssDesc) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* Get the Station ID from the one saved during the association */ staDesc.sta_id = staId; @@ -1291,13 +1291,13 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, staDesc.is_wapi_supported = 0; #endif /* FEATURE_WLAN_WAPI */ - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, "ol_txrx_register_peer() failed to register. Status=%d [0x%08X]", - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } if (!pRoamInfo->fAuthRequired) { @@ -1305,7 +1305,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, * Connections that do not need Upper layer auth, transition * TLSHIM directly to 'Authenticated' state */ - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_auth, #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -1320,7 +1320,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, hddLog(LOG3, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pHddStaCtx->conn_info.staId[0]); - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_conn, #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -1331,7 +1331,7 @@ static CDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, ); hdd_conn_set_authenticated(pAdapter, false); } - return cdf_status; + return qdf_status; } /** @@ -1541,9 +1541,9 @@ static int hdd_change_sta_state_authenticated(hdd_adapter_t *adapter, * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, @@ -1551,13 +1551,13 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, { eCsrEncryptionType connectedCipherAlgo; bool fConnected = false; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); ENTER(); if (NULL == pRoamInfo) { hddLog(LOG2, FL("pRoamInfo is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * if (WPA), tell TL to go to 'authenticated' after the keys are set. @@ -1579,11 +1579,11 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; } else { - cdf_status = hdd_ibss_get_sta_id( + qdf_status = hdd_ibss_get_sta_id( pHddStaCtx, &pRoamInfo->peerMac, &staId); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { hddLog(LOG2, "WLAN TL STA Ptk Installed for STAID=%d", staId); @@ -1623,11 +1623,11 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, eCSR_ENCRYPT_TYPE_WEP104_STATICKEY)) { if (pHddStaCtx->conn_info.gtk_installed && pHddStaCtx->conn_info.ptk_installed) - cdf_status = + qdf_status = hdd_change_sta_state_authenticated(pAdapter, pRoamInfo); } else if (pHddStaCtx->conn_info.ptk_installed) { - cdf_status = + qdf_status = hdd_change_sta_state_authenticated(pAdapter, pRoamInfo); } @@ -1650,7 +1650,7 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1661,7 +1661,7 @@ static CDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, */ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; @@ -1676,7 +1676,7 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) pHddStaCtx->roam_info.roamId, pHddStaCtx->roam_info.roamStatus, eCSR_ROAM_RESULT_AUTHENTICATED); - if (cdf_ret_status != CDF_STATUS_SUCCESS) + if (cdf_ret_status != QDF_STATUS_SUCCESS) hddLog(LOGE, FL("Set Key complete failure")); pHddStaCtx->roam_info.deferKeyComplete = false; @@ -1690,9 +1690,9 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, @@ -1701,7 +1701,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN]; uint32_t reqRsnLength = DOT11F_IE_RSN_MAX_LEN; int ft_carrier_on = false; @@ -1710,7 +1710,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, if (!pHddCtx) { hdd_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* HDD has initiated disconnect, do not send connect result indication @@ -1726,7 +1726,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, if (eCSR_ROAM_RESULT_ASSOCIATED == roamResult) { if (NULL == pRoamInfo) { hddLog(LOGE, FL("pRoamInfo is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!hddDisconInProgress) { hddLog(LOG1, FL("Set HDD connState to eConnectionState_Associated")); @@ -1853,7 +1853,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, wlan_hdd_netif_queue_control(pAdapter, WLAN_NETIF_CARRIER_OFF, WLAN_CONTROL_PATH); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pRoamInfo->u.pConnectedProfile->AuthType == eCSR_AUTH_TYPE_FT_RSN @@ -2083,7 +2083,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, /* * Register the Station with TL after associated */ - cdf_status = hdd_roam_register_sta(pAdapter, + qdf_status = hdd_roam_register_sta(pAdapter, pRoamInfo, pHddStaCtx-> conn_info. @@ -2107,7 +2107,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, reqRsnIe, reqRsnLength); /* Reassoc successfully */ if (pRoamInfo->fAuthRequired) { - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], ol_txrx_peer_state_conn, @@ -2122,7 +2122,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, FL("staId: %d Changing TL state to AUTHENTICATED"), pHddStaCtx->conn_info.staId[0]); - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], ol_txrx_peer_state_auth, @@ -2135,7 +2135,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hdd_conn_set_authenticated(pAdapter, true); } - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { /* * Perform any WMM-related association * processing @@ -2155,10 +2155,10 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, WLAN_CONTROL_PATH); } - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, "STA register with TL failed. status(=%d) [%08X]", - cdf_status, cdf_status); + qdf_status, qdf_status); } #ifdef WLAN_FEATURE_11W cdf_mem_zero(&pAdapter->hdd_stats.hddPmfStats, @@ -2293,19 +2293,19 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, WLAN_CONTROL_PATH); } - if (CDF_STATUS_SUCCESS != cds_check_and_restart_sap( + if (QDF_STATUS_SUCCESS != cds_check_and_restart_sap( roamResult, pHddStaCtx)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL != pRoamInfo && NULL != pRoamInfo->pBssDesc) { cds_force_sap_on_scc(roamResult, pRoamInfo->pBssDesc->channelId); } else { hdd_err("pRoamInfo profile is not set properly"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2561,9 +2561,9 @@ static bool roam_remove_ibss_station(hdd_adapter_t *pAdapter, uint8_t staId) * * We update the status of the IBSS to connected in this function. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, +static QDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { struct cfg80211_bss *bss; @@ -2585,13 +2585,13 @@ static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, hddLog(LOGE, FL("%s: unable to create IBSS entry"), pAdapter->dev->name); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg80211_put_bss( WLAN_HDD_GET_CTX(pAdapter)->wiphy, bss); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2604,9 +2604,9 @@ static CDF_STATUS roam_ibss_connect_handler(hdd_adapter_t *pAdapter, * * This function indicates the Mic failure to the supplicant * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, @@ -2652,7 +2652,7 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2665,16 +2665,16 @@ hdd_roam_mic_error_indication_handler(hdd_adapter_t *pAdapter, * * The Ibss connection status is updated regularly here in this function. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); switch (roamResult) { @@ -2702,15 +2702,15 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, pHddCtx->sta_to_adapter[pRoamInfo->staId] = pAdapter; /* Register the Station with TL for the new peer. */ - cdf_status = hdd_roam_register_sta(pAdapter, + qdf_status = hdd_roam_register_sta(pAdapter, pRoamInfo, pRoamInfo->staId, &pRoamInfo->peerMac, pRoamInfo->pBssDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, - "Cannot register STA with TL for IBSS. Failed with cdf_status = %d [%08X]", - cdf_status, cdf_status); + "Cannot register STA with TL for IBSS. Failed with qdf_status = %d [%08X]", + qdf_status, qdf_status); } pHddStaCtx->ibss_sta_generation++; memset(&staInfo, 0, sizeof(staInfo)); @@ -2737,18 +2737,18 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, "New peer joined set PTK encType=%d", pHddStaCtx->ibss_enc_key.encType); - cdf_status = + qdf_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX (pAdapter), pAdapter->sessionId, &pHddStaCtx->ibss_enc_key, &roamId); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, FL("sme_roam_set_key failed, status=%d"), - cdf_status); - return CDF_STATUS_E_FAILURE; + qdf_status); + return QDF_STATUS_E_FAILURE; } } hddLog(LOG1, FL("Enabling queues")); @@ -2814,7 +2814,7 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_TDLS @@ -2828,13 +2828,13 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, * Construct the staDesc and register with TL the new STA. * This is called as part of ADD_STA in the TDLS setup. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, const uint8_t *peerMac, uint16_t staId, uint8_t ucastSig) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; /* @@ -2849,15 +2849,15 @@ CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, /* Register the Station with TL... */ - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ol_txrx_register_peer() failed to register. Status=%d [0x%08X]"), - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } - return cdf_status; + return qdf_status; } /** @@ -2865,18 +2865,18 @@ CDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, * @pAdapter: pointer to adapter * @staId: station identifier * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, +static QDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status; - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + QDF_STATUS qdf_status; + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("ol_txrx_clear_peer() failed for staID %d. Status=%d [0x%08X]"), - staId, cdf_status, cdf_status); + staId, qdf_status, qdf_status); } - return cdf_status; + return qdf_status; } /** @@ -2891,9 +2891,9 @@ static CDF_STATUS hdd_roam_deregister_tdlssta(hdd_adapter_t *pAdapter, * TL in case of new TDLS client is added and deregistration at the time * TDLS client is deleted. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint32_t roamId, @@ -2903,7 +2903,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); tSmeTdlsPeerStateParams smeTdlsPeerStateParams; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t staIdx; hddTdlsPeer_t *curr_peer; uint32_t reason; @@ -2978,7 +2978,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, peerMac, &pRoamInfo-> peerMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -2991,7 +2991,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, staId)) { hddLog(LOGE, "wlan_hdd_tdls_set_sta_id() failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } (WLAN_HDD_GET_CTX(pAdapter))-> @@ -3008,7 +3008,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo-> ucastSig); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; hddLog(LOGE, FL("no available slot in conn_info. staId %d cannot be stored"), pRoamInfo->staId); @@ -3078,7 +3078,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, tdlsConnInfo[staIdx]. peerMac, CDF_MAC_ADDR_SIZE); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -3096,7 +3096,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); wlan_hdd_tdls_indicate_teardown(pAdapter, curr_peer, pRoamInfo->reasonCode); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } case eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND: @@ -3156,7 +3156,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, sme_update_tdls_peer_state( pHddCtx->hHal, &smeTdlsPeerStateParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_update_tdls_peer_state failed for " MAC_ADDRESS_STR), @@ -3176,7 +3176,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pHddCtx->tdlsConnInfo[staIdx]. sessionId = 255; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } break; @@ -3190,7 +3190,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, FL("concurrency detected. ignore SHOULD_DISCOVER concurrency_mode: 0x%x, active_sessions: %d"), pHddCtx->concurrency_mode, pHddCtx->no_of_active_sessions[CDF_STA_MODE]); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -3199,7 +3199,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3218,7 +3218,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, hddLog(LOG2, FL ("TDLS ExternalControl enabled but curr_peer is not forced, ignore SHOULD_DISCOVER")); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } else { hddLog(LOG2, @@ -3232,7 +3232,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, wlan_hdd_tdls_pre_setup_init_work (pHddTdlsCtx, curr_peer); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3244,7 +3244,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3281,7 +3281,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, ("TDLS link is not connected, ignore SHOULD_TEARDOWN, reason: %d"), pRoamInfo->reasonCode); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3293,7 +3293,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pRoamInfo->peerMac.bytes, true); if (!curr_peer) { hddLog(LOGE, FL("curr_peer is null")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (eTDLS_LINK_CONNECTED == curr_peer->link_status) { @@ -3329,7 +3329,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, ("TDLS link is not connected, ignore SHOULD_PEER_DISCONNECTED, reason: %d"), pRoamInfo->reasonCode); } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } break; } @@ -3835,17 +3835,17 @@ static inline bool hdd_is_8021x_sha256_auth_type(hdd_station_ctx_t *pHddStaCtx) * @roamStatus: roam status * @roamResult: roam result * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = (hdd_adapter_t *) pContext; hdd_wext_state_t *pWextState = NULL; hdd_station_ctx_t *pHddStaCtx = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_context_t *pHddCtx = NULL; hddLog(LOG2, @@ -3855,7 +3855,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, /* Sanity check */ if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { hddLog(LOGP, "invalid adapter or adapter has invalid magic"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); @@ -3916,8 +3916,8 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, WLAN_CONTROL_PATH); status = hdd_roam_deregister_sta(pAdapter, pHddStaCtx->conn_info.staId[0]); - if (!CDF_IS_STATUS_SUCCESS(status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; pHddStaCtx->ft_carrier_on = true; pHddStaCtx->hdd_ReassocScenario = true; hddLog(LOG1, @@ -4075,39 +4075,39 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, #ifdef FEATURE_WLAN_LFR_METRICS case eCSR_ROAM_PREAUTH_INIT_NOTIFY: /* This event is to notify pre-auth initiation */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth(pAdapter, pRoamInfo)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_SUCCESS: /* * This event will notify pre-auth completion in case of success */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 1)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_FAILURE: /* * This event will notify pre-auth completion incase of failure. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 0)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_HANDOVER_SUCCESS: /* This event is to notify handover success. It will be only invoked on success */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_handover(pAdapter, pRoamInfo)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; #endif @@ -4321,7 +4321,7 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter, uint16_t gen_ie_len, uint8_t *gen_ie) { tHalHandle halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS result; + QDF_STATUS result; tDot11fIERSN dot11RSNIE; tDot11fIEWPA dot11WPAIE; uint32_t i; @@ -4723,14 +4723,14 @@ static int __iw_set_essid(struct net_device *dev, if (hdd_conn_get_connected_bss_type(pHddStaCtx, &connectedBssType) || (eMib_dot11DesiredBssType_independent == pHddStaCtx->conn_info.connDot11DesiredBssType)) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* Need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - cdf_status = sme_roam_disconnect(hHal, pAdapter->sessionId, + qdf_status = sme_roam_disconnect(hHal, pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, msecs_to_jiffies @@ -4751,7 +4751,7 @@ static int __iw_set_essid(struct net_device *dev, status = hdd_wmm_get_uapsd_mask(pAdapter, &pWextState->roamProfile.uapsd_mask); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) pWextState->roamProfile.uapsd_mask = 0; pWextState->roamProfile.SSIDs.numOfSSIDs = 1; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index dc76115a4823..194af13edd0f 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3766,10 +3766,10 @@ static char *i_trim(char *str) * @pBuf: buffer to store the configuration * @buflen: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration and buffer size can carry - * the content, otherwise CDF_STATUS_E_RESOURCES + * Return: QDF_STATUS_SUCCESS if the configuration and buffer size can carry + * the content, otherwise QDF_STATUS_E_RESOURCES */ -static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, +static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, unsigned long cRegTableEntries, uint8_t *ini_struct, hdd_context_t *pHddCtx, char *pBuf, @@ -3842,7 +3842,7 @@ static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, buflen -= curlen; } else { /* buffer space exhausted, return what we have */ - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } #else printk(KERN_INFO "%s", configStr); @@ -3855,7 +3855,7 @@ static CDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, snprintf(pCur, buflen, "WLAN configuration written to system log"); #endif /* RETURN_IN_BUFFER */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** struct tCfgIniEntry - ini configuration entry @@ -3875,13 +3875,13 @@ typedef struct { * @name: the interested configuration to find * @value: the value to read back * - * Return: CDF_STATUS_SUCCESS if the interested configuration is found, - * otherwise CDF_STATUS_E_FAILURE + * Return: QDF_STATUS_SUCCESS if the interested configuration is found, + * otherwise QDF_STATUS_E_FAILURE */ -static CDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, +static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, char *name, char **value) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; unsigned long i; for (i = 0; i < entries; i++) { @@ -3890,7 +3890,7 @@ static CDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Found %s entry for Name=[%s] Value=[%s] ", WLAN_INI_FILE, name, *value); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } @@ -3959,15 +3959,15 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, * @entries: number fo the configuration entries * It overwrites the MAC address if config file exist. * - * Return: CDF_STATUS_SUCCESS if the ini configuration file is correctly parsed, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the ini configuration file is correctly parsed, + * otherwise QDF_STATUS_E_INVAL */ -static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, +static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, tCfgIniEntry *iniTable, unsigned long entries) { - CDF_STATUS match_status = CDF_STATUS_E_FAILURE; - CDF_STATUS ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS match_status = QDF_STATUS_E_FAILURE; + QDF_STATUS ret_status = QDF_STATUS_SUCCESS; unsigned int idx; void *pField; char *value_str = NULL; @@ -3996,13 +3996,13 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, find_cfg_item(iniTable, entries, pRegEntry->RegName, &value_str); - if ((match_status != CDF_STATUS_SUCCESS) + if ((match_status != QDF_STATUS_SUCCESS) && (pRegEntry->Flags & VAR_FLAGS_REQUIRED)) { /* If we could not read the cfg item and it is required, this is an error. */ hddLog(LOGE, "%s: Failed to read required config parameter %s", __func__, pRegEntry->RegName); - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; break; } @@ -4011,7 +4011,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* If successfully read from the registry, use the value read. * If not, use the default value. */ - if (match_status == CDF_STATUS_SUCCESS + if (match_status == QDF_STATUS_SUCCESS && (WLAN_PARAM_Integer == pRegEntry->RegType)) { rv = kstrtou32(value_str, 10, &value); if (rv < 0) { @@ -4020,7 +4020,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, __func__, pRegEntry->RegName); value = pRegEntry->VarDefault; } - } else if (match_status == CDF_STATUS_SUCCESS + } else if (match_status == QDF_STATUS_SUCCESS && (WLAN_PARAM_HexInteger == pRegEntry->RegType)) { rv = kstrtou32(value_str, 16, &value); @@ -4079,7 +4079,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* If successfully read from the registry, use the value read. * If not, use the default value. */ - if (CDF_STATUS_SUCCESS == match_status) { + if (QDF_STATUS_SUCCESS == match_status) { rv = kstrtos32(value_str, 10, &svalue); if (rv < 0) { hddLog(CDF_TRACE_LEVEL_WARN, @@ -4149,7 +4149,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, (char *)pRegEntry->VarDefault); #endif - if (match_status == CDF_STATUS_SUCCESS) { + if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); if (len_value_str > (pRegEntry->VarSize - 1)) { @@ -4192,7 +4192,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, continue; } candidate = (char *)pRegEntry->VarDefault; - if (match_status == CDF_STATUS_SUCCESS) { + if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { hddLog(LOGE, @@ -4217,7 +4217,7 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, } /* did we successfully parse a cfg item for this parameter? */ - if ((match_status == CDF_STATUS_SUCCESS) && + if ((match_status == QDF_STATUS_SUCCESS) && (idx < MAX_CFG_INI_ITEMS)) { set_bit(idx, (void *)&pHddCtx->config->bExplicitCfg); } @@ -4234,10 +4234,10 @@ static CDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, * @pHddCtx: the pointer to hdd context * @command: the command to run * - * Return: CDF_STATUS_SUCCESS if the command is found and able to execute, - * otherwise the appropriate CDF_STATUS will be returned + * Return: QDF_STATUS_SUCCESS if the command is found and able to execute, + * otherwise the appropriate QDF_STATUS will be returned */ -static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, +static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, unsigned long tableSize, uint8_t *ini_struct, hdd_context_t *pHddCtx, @@ -4254,11 +4254,11 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, size_t len_value_str; unsigned int idx; unsigned int i; - CDF_STATUS vstatus; + QDF_STATUS vstatus; int rv; /* assume failure until proven otherwise */ - vstatus = CDF_STATUS_E_FAILURE; + vstatus = QDF_STATUS_E_FAILURE; /* clone the command so that we can manipulate it */ clone = kstrdup(command, GFP_ATOMIC); @@ -4329,7 +4329,7 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, /* does not support dynamic configuration */ hddLog(LOGE, "%s: Global_Registry_Table.%s does not support " "dynamic configuration", __func__, name); - vstatus = CDF_STATUS_E_PERM; + vstatus = QDF_STATUS_E_PERM; goto done; } @@ -4438,7 +4438,7 @@ static CDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, } /* if we get here, we had a successful modification */ - vstatus = CDF_STATUS_SUCCESS; + vstatus = QDF_STATUS_SUCCESS; /* config table has been modified, is there a notifier? */ if (NULL != pRegEntry->pfnDynamicnotify) { @@ -5241,10 +5241,10 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) * * It overwrites the MAC address if config file exist. * - * Return: CDF_STATUS_SUCCESS if the MAC address is found from cfg file - * and overwritten, otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the MAC address is found from cfg file + * and overwritten, otherwise QDF_STATUS_E_INVAL */ -CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) +QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) { int status, i = 0; const struct firmware *fw = NULL; @@ -5253,7 +5253,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) tCfgIniEntry macTable[CDF_MAX_CONCURRENCY_PERSONA]; tSirMacAddr customMacAddr; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; memset(macTable, 0, sizeof(macTable)); status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev); @@ -5261,12 +5261,12 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) if (status) { hddLog(CDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d", __func__, status); - cdf_status = CDF_STATUS_E_FAILURE; - return cdf_status; + qdf_status = QDF_STATUS_E_FAILURE; + return qdf_status; } if (!fw || !fw->data || !fw->size) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto config_exit; } @@ -5313,7 +5313,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) hddLog(CDF_TRACE_LEVEL_ERROR, "%s: invalid number of Mac address provided, nMac = %d", __func__, i); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto config_exit; } @@ -5326,7 +5326,7 @@ CDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) config_exit: release_firmware(fw); - return cdf_status; + return qdf_status; } /** @@ -5336,10 +5336,10 @@ config_exit: * This function reads the qcom_cfg.ini file and * parses each 'Name=Value' pair in the ini file * - * Return: CDF_STATUS_SUCCESS if the qcom_cfg.ini is correctly read, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the qcom_cfg.ini is correctly read, + * otherwise QDF_STATUS_E_INVAL */ -CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) +QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) { int status, i = 0; /** Pointer for firmware image data */ @@ -5349,7 +5349,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) char *name, *value; /* cfgIniTable is static to avoid excess stack usage */ static tCfgIniEntry cfgIniTable[MAX_CFG_INI_ITEMS]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; memset(cfgIniTable, 0, sizeof(cfgIniTable)); @@ -5358,13 +5358,13 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) if (status) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d", __func__, status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; } if (!fw || !fw->data || !fw->size) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: %s download failed", __func__, WLAN_INI_FILE); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; } @@ -5375,7 +5375,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) if (NULL == buffer) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure")); release_firmware(fw); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pTemp = buffer; @@ -5426,9 +5426,9 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) } /* Loop through the registry table and apply all these configs */ - cdf_status = hdd_apply_cfg_ini(pHddCtx, cfgIniTable, i); + qdf_status = hdd_apply_cfg_ini(pHddCtx, cfgIniTable, i); #ifdef FEATURE_NAPI - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) hdd_napi_event(NAPI_EVT_INI_FILE, (void *)pHddCtx->config->napi_enable); #endif /* FEATURE_NAPI */ @@ -5436,7 +5436,7 @@ CDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) config_exit: release_firmware(fw); cdf_mem_free(pTemp); - return cdf_status; + return qdf_status; } /** @@ -5489,18 +5489,18 @@ eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode) * @pHddCtx: the pointer to hdd context * @val: the value to configure * - * Return: CDF_STATUS_SUCCESS if command set correctly, - * otherwise the CDF_STATUS return from SME layer + * Return: QDF_STATUS_SUCCESS if command set correctly, + * otherwise the QDF_STATUS return from SME layer */ -CDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val) +QDF_STATUS hdd_set_idle_ps_config(hdd_context_t *pHddCtx, uint32_t val) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hddLog(LOG1, "hdd_set_idle_ps_config: Enter Val %d", val); status = sme_set_idle_powersave_config(pHddCtx->pcds_context, pHddCtx->hHal, val); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) hddLog(LOGE, "Fail to Set Idle PS Config val %d", val); return status; } @@ -5544,16 +5544,16 @@ static void hdd_set_fine_time_meas_cap(hdd_context_t *hdd_ctx, * This API is called to convert string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, +static QDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, uint8_t *len, uint8_t array_max_len, bool to_hex) { char *format, *s = str; if (str == NULL || array == NULL || len == NULL) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; format = (to_hex) ? "%02x" : "%d"; @@ -5573,7 +5573,7 @@ static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, s++; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5586,9 +5586,9 @@ static CDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, * This API is called to convert hexadecimal string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, +QDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, uint8_t *len, uint8_t array_max_len) { return hdd_convert_string_to_array(str, hex_array, len, @@ -5605,10 +5605,10 @@ CDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, * This API is called to convert decimal string (each byte separated by * a comma) into an u8 array * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, +QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, uint8_t *len, uint8_t array_max_len) { return hdd_convert_string_to_array(str, array, len, @@ -5621,8 +5621,8 @@ CDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, * @intArray: the pointer of buffer to store the u8 value * @len: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration could be updated corectly, - * otherwise CDF_STATUS_E_INVAL + * Return: QDF_STATUS_SUCCESS if the configuration could be updated corectly, + * otherwise QDF_STATUS_E_INVAL */ bool hdd_update_config_dat(hdd_context_t *pHddCtx) { @@ -5635,20 +5635,20 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_SHORT_GI_20MHZ, pConfig->ShortGI20MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_20MHZ to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_FIXED_RATE, pConfig->TxRate) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_FIXED_RATE to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_MAX_RX_AMPDU_FACTOR, pConfig->MaxRxAmpduFactor) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_AMPDU_PARAMS_MAX_RX_AMPDU_FACTOR to CFG"); @@ -5656,7 +5656,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_MPDU_DENSITY, pConfig->ht_mpdu_density) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MPDU_DENSITY to CFG"); @@ -5664,7 +5664,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_SHORT_PREAMBLE, - pConfig->fIsShortPreamble) == CDF_STATUS_E_FAILURE) { + pConfig->fIsShortPreamble) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_PREAMBLE to CFG"); @@ -5673,7 +5673,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME, pConfig->nPassiveMinChnTime) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME" @@ -5683,7 +5683,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME, pConfig->nPassiveMaxChnTime) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PASSIVE_MAXIMUM_CHANNEL_TIME" @@ -5692,7 +5692,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_BEACON_INTERVAL, - pConfig->nBeaconInterval) == CDF_STATUS_E_FAILURE) { + pConfig->nBeaconInterval) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_BEACON_INTERVAL to CFG"); @@ -5700,21 +5700,21 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MAX_PS_POLL, - pConfig->nMaxPsPoll) == CDF_STATUS_E_FAILURE) { + pConfig->nMaxPsPoll) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MAX_PS_POLL to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_CURRENT_RX_ANTENNA, - pConfig->nRxAnt) == CDF_STATUS_E_FAILURE) { + pConfig->nRxAnt) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_CURRENT_RX_ANTENNA to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_LOW_GAIN_OVERRIDE, - pConfig->fIsLowGainOverride) == CDF_STATUS_E_FAILURE) { + pConfig->fIsLowGainOverride) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_LOW_GAIN_OVERRIDE to HAL"); @@ -5722,7 +5722,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RSSI_FILTER_PERIOD, - pConfig->nRssiFilterPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->nRssiFilterPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RSSI_FILTER_PERIOD to CFG"); @@ -5730,7 +5730,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_IGNORE_DTIM, - pConfig->fIgnoreDtim) == CDF_STATUS_E_FAILURE) { + pConfig->fIgnoreDtim) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_IGNORE_DTIM to CFG"); @@ -5739,7 +5739,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_HEART_BEAT, pConfig->fEnableFwHeartBeatMonitoring) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_HEART_BEAT to CFG"); @@ -5748,7 +5748,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_BCN_FILTER, pConfig->fEnableFwBeaconFiltering) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_BCN_FILTER to CFG"); @@ -5757,7 +5757,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, pConfig->fEnableFwRssiMonitoring) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); @@ -5765,7 +5765,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, - pConfig->nDataInactivityTimeout) == CDF_STATUS_E_FAILURE) { + pConfig->nDataInactivityTimeout) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT to CFG"); @@ -5773,7 +5773,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_LTE_COEX, - pConfig->enableLTECoex) == CDF_STATUS_E_FAILURE) { + pConfig->enableLTECoex) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LTE_COEX to CFG"); @@ -5781,7 +5781,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE, - pConfig->nEnableListenMode) == CDF_STATUS_E_FAILURE) { + pConfig->nEnableListenMode) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_PHY_AGC_LISTEN_MODE to CFG"); @@ -5789,7 +5789,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_KEEP_ALIVE_TIMEOUT, - pConfig->apKeepAlivePeriod) == CDF_STATUS_E_FAILURE) { + pConfig->apKeepAlivePeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_KEEP_ALIVE_TIMEOUT to CFG"); @@ -5797,7 +5797,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_GO_KEEP_ALIVE_TIMEOUT, - pConfig->goKeepAlivePeriod) == CDF_STATUS_E_FAILURE) { + pConfig->goKeepAlivePeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_GO_KEEP_ALIVE_TIMEOUT to CFG"); @@ -5805,7 +5805,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_LINK_MONITOR_TIMEOUT, - pConfig->apLinkMonitorPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->apLinkMonitorPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_LINK_MONITOR_TIMEOUT to CFG"); @@ -5813,7 +5813,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_GO_LINK_MONITOR_TIMEOUT, - pConfig->goLinkMonitorPeriod) == CDF_STATUS_E_FAILURE) { + pConfig->goLinkMonitorPeriod) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG"); @@ -5822,7 +5822,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #if defined WLAN_FEATURE_VOWIFI if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, - pConfig->mcastBcastFilterSetting) == CDF_STATUS_E_FAILURE) + pConfig->mcastBcastFilterSetting) == QDF_STATUS_E_FAILURE) fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MCAST_BCAST_FILTER_SETTING to CFG"); @@ -5830,7 +5830,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, - pConfig->bSingleTidRc) == CDF_STATUS_E_FAILURE) { + pConfig->bSingleTidRc) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SINGLE_TID_RC to CFG"); @@ -5838,7 +5838,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_WAKEUP_EN, - pConfig->teleBcnWakeupEn) == CDF_STATUS_E_FAILURE) { + pConfig->teleBcnWakeupEn) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_WAKEUP_EN to CFG"); @@ -5847,7 +5847,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI, pConfig->nTeleBcnTransListenInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_TRANS_LI to CFG"); @@ -5856,7 +5856,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI, pConfig->nTeleBcnMaxListenInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_MAX_LI to CFG"); @@ -5865,7 +5865,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS, pConfig->nTeleBcnTransLiNumIdleBeacons) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_TRANS_LI_IDLE_BCNS to CFG"); @@ -5874,7 +5874,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS, pConfig->nTeleBcnMaxLiNumIdleBeacons) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TELE_BCN_MAX_LI_IDLE_BCNS to CFG"); @@ -5882,7 +5882,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RF_SETTLING_TIME_CLK, - pConfig->rfSettlingTimeUs) == CDF_STATUS_E_FAILURE) { + pConfig->rfSettlingTimeUs) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RF_SETTLING_TIME_CLK to CFG"); @@ -5891,14 +5891,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD, pConfig->infraStaKeepAlivePeriod) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_PS_POLL_VALUE, - pConfig->dynamicPsPollValue) == CDF_STATUS_E_FAILURE) { + pConfig->dynamicPsPollValue) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_PS_POLL_VALUE to CFG"); @@ -5906,7 +5906,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_PS_NULLDATA_AP_RESP_TIMEOUT, - pConfig->nNullDataApRespTimeout) == CDF_STATUS_E_FAILURE) { + pConfig->nNullDataApRespTimeout) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_PS_NULLDATA_DELAY_TIMEOUT to CFG"); @@ -5915,21 +5915,21 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, - pConfig->FragmentationThreshold) == CDF_STATUS_E_FAILURE) { + pConfig->FragmentationThreshold) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_FRAGMENTATION_THRESHOLD to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_RTS_THRESHOLD, - pConfig->RTSThreshold) == CDF_STATUS_E_FAILURE) { + pConfig->RTSThreshold) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_RTS_THRESHOLD to CFG"); @@ -5937,7 +5937,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_11D_ENABLED, - pConfig->Is11dSupportEnabled) == CDF_STATUS_E_FAILURE) { + pConfig->Is11dSupportEnabled) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_11D_ENABLED to CFG"); @@ -5945,7 +5945,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DFS_MASTER_ENABLED, pConfig->enableDFSMasterCap) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Failure: Could not set value for WNI_CFG_DFS_MASTER_ENABLED"); @@ -5953,7 +5953,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_ENABLE_TXBF_20MHZ, pConfig->enableTxBFin20MHz) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not set value for WNI_CFG_VHT_ENABLE_TXBF_20MHZ"); @@ -5961,7 +5961,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_HEART_BEAT_THRESHOLD, - pConfig->HeartbeatThresh24) == CDF_STATUS_E_FAILURE) { + pConfig->HeartbeatThresh24) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HEART_BEAT_THRESHOLD to CFG"); @@ -5970,7 +5970,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD, pConfig->apDataAvailPollPeriodInMs) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_AP_DATA_AVAIL_POLL_PERIOD to CFG"); @@ -5978,7 +5978,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_CLOSE_LOOP, pConfig->enableCloseLoop) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_CLOSE_LOOP to CFG"); @@ -5986,7 +5986,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TX_PWR_CTRL_ENABLE, pConfig->enableAutomaticTxPowerControl) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TX_PWR_CTRL_ENABLE to CFG"); @@ -5994,14 +5994,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_SHORT_GI_40MHZ, pConfig->ShortGI40MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SHORT_GI_40MHZ to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_MC_ADDR_LIST, - pConfig->fEnableMCAddrList) == CDF_STATUS_E_FAILURE) { + pConfig->fEnableMCAddrList) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MC_ADDR_LIST to CFG"); @@ -6023,7 +6023,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFF3) | (pConfig->vhtRxMCS2x2 << 2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, temp) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG"); @@ -6036,7 +6036,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFF3) | (pConfig->vhtRxMCS2x2 << 2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_RX_MCS_MAP, temp) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG"); @@ -6051,7 +6051,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) pConfig->enable2x2); if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_TX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG"); @@ -6060,7 +6060,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_VHT_SHORT_GI_80MHZ, pConfig->ShortGI40MhzEnable) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass WNI_VHT_SHORT_GI_80MHZ to CFG"); @@ -6070,7 +6070,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, pConfig->fVhtAmpduLenExponent) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_AMPDU_LEN_EXPONENT to CFG"); @@ -6084,7 +6084,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, pConfig->enableMuBformee - ) == CDF_STATUS_E_FAILURE) { + ) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MU_BEAMFORMEE_CAP to CFG"); @@ -6092,7 +6092,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_MAX_MPDU_LENGTH, - pConfig->vhtMpduLen) == CDF_STATUS_E_FAILURE) { + pConfig->vhtMpduLen) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_MAX_MPDU_LENGTH to CFG"); @@ -6102,14 +6102,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_SU_BEAMFORMER_CAP, pConfig->enable_su_tx_bformer) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hdd_err("set SU_BEAMFORMER_CAP to CFG failed"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_NUM_SOUNDING_DIMENSIONS, NUM_OF_SOUNDING_DIMENSIONS) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hdd_err("failed to set NUM_OF_SOUNDING_DIM"); } @@ -6117,7 +6117,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_HT_RX_STBC, - pConfig->enableRxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_RX_STBC to CFG"); } @@ -6129,25 +6129,25 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) phtCapInfo->advCodingCap = pConfig->enableRxLDPC; val = val16; if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_HT_CAP_INFO, val) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_RXSTBC, - pConfig->enableRxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RXSTBC to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_TXSTBC, - pConfig->enableTxSTBC) == CDF_STATUS_E_FAILURE) { + pConfig->enableTxSTBC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TXSTBC to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_VHT_LDPC_CODING_CAP, - pConfig->enableRxLDPC) == CDF_STATUS_E_FAILURE) { + pConfig->enableRxLDPC) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_LDPC_CODING_CAP to CFG"); @@ -6162,7 +6162,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ASSOC_STA_LIMIT, val) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ASSOC_STA_LIMIT to CFG"); @@ -6170,7 +6170,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #endif if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_LPWR_IMG_TRANSITION, pConfig->enableLpwrImgTransition) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_LPWR_IMG_TRANSITION to CFG"); @@ -6179,14 +6179,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, pConfig->enableMCCAdaptiveScheduler) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED to CFG"); } if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP, - pConfig->disableLDPCWithTxbfAP) == CDF_STATUS_E_FAILURE) { + pConfig->disableLDPCWithTxbfAP) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DISABLE_LDPC_WITH_TXBF_AP to CFG"); @@ -6194,7 +6194,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ZERO, - pConfig->retryLimitZero) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitZero) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_ZERO to CFG"); @@ -6202,7 +6202,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_ONE, - pConfig->retryLimitOne) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitOne) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_ONE to CFG"); @@ -6210,7 +6210,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_DYNAMIC_THRESHOLD_TWO, - pConfig->retryLimitTwo) == CDF_STATUS_E_FAILURE) { + pConfig->retryLimitTwo) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DYNAMIC_THRESHOLD_TWO to CFG"); @@ -6218,7 +6218,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MAX_MEDIUM_TIME, - pConfig->cfgMaxMediumTime) == CDF_STATUS_E_FAILURE) { + pConfig->cfgMaxMediumTime) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MAX_MEDIUM_TIME to CFG"); @@ -6226,28 +6226,28 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #ifdef FEATURE_WLAN_TDLS if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK, - pConfig->fTDLSUapsdMask) == CDF_STATUS_E_FAILURE) { + pConfig->fTDLSUapsdMask) == QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_QOS_WMM_UAPSD_MASK to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_BUF_STA_ENABLED, pConfig->fEnableTDLSBufferSta) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_BUF_STA_ENABLED to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_PUAPSD_INACT_TIME, pConfig->fTDLSPuapsdInactivityTimer) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_PUAPSD_INACT_TIME to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_RX_FRAME_THRESHOLD, pConfig->fTDLSRxFrameThreshold) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_RX_FRAME_THRESHOLD to CFG"); @@ -6255,14 +6255,14 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_OFF_CHANNEL_ENABLED, pConfig->fEnableTDLSOffChannel) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_BUF_STA_ENABLED to CFG"); } if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_TDLS_WMM_MODE_ENABLED, pConfig->fEnableTDLSWmmMode) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_TDLS_WMM_MODE_ENABLED to CFG"); @@ -6271,7 +6271,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ENABLE_ADAPT_RX_DRAIN, pConfig->fEnableAdaptRxDrain) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ENABLE_ADAPT_RX_DRAIN to CFG"); @@ -6279,7 +6279,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_FLEX_CONNECT_POWER_FACTOR, pConfig->flexConnectPowerFactor) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Failure: Could not pass on " "WNI_CFG_FLEX_CONNECT_POWER_FACTOR to CFG"); @@ -6287,7 +6287,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_ANTENNA_DIVESITY, pConfig->antennaDiversity) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_ANTENNA_DIVESITY to CFG"); @@ -6296,7 +6296,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DEFAULT_RATE_INDEX_24GHZ, pConfig->defaultRateIndex24Ghz) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DEFAULT_RATE_INDEX_24GHZ to CFG"); @@ -6305,7 +6305,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL, pConfig->debugP2pRemainOnChannel) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_DEBUG_P2P_REMAIN_ON_CHANNEL to CFG"); @@ -6313,7 +6313,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) #ifdef WLAN_FEATURE_11W if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES, pConfig->pmfSaQueryMaxRetries) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_MAX_RETRIES to CFG"); @@ -6321,7 +6321,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL, pConfig->pmfSaQueryRetryInterval) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_SA_QUERY_RETRY_INTERVAL to CFG"); @@ -6330,7 +6330,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_ATIM_WIN_SIZE, pConfig->ibssATIMWinSize) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_IBSS_ATIM_WIN_SIZE to CFG"); @@ -6368,12 +6368,12 @@ void hdd_set_pno_channel_prediction_config( * * @pHddCtx: the pointer to hdd context * - * Return: CDF_STATUS_SUCCESS if configuration is correctly applied, - * otherwise the appropriate CDF_STATUS would be returned + * Return: QDF_STATUS_SUCCESS if configuration is correctly applied, + * otherwise the appropriate QDF_STATUS would be returned */ -CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) +QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeConfigParams *smeConfig; uint8_t rrm_capab_len; @@ -6383,7 +6383,7 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) if (NULL == smeConfig) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(smeConfig, sizeof(*smeConfig)); @@ -6672,7 +6672,7 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig->csrConfig.first_scan_bucket_threshold = pHddCtx->config->first_scan_bucket_threshold; status = sme_update_config(pHddCtx->hHal, smeConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "sme_update_config() return failure %d", status); } @@ -6686,9 +6686,9 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) * @pHddCtx: the pointer to hdd context * @command: the command to run * - * Return: the CDF_STATUS return from hdd_execute_config_command + * Return: the QDF_STATUS return from hdd_execute_config_command */ -CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, +QDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, char *command) { return hdd_execute_config_command(g_registry_table, @@ -6703,10 +6703,10 @@ CDF_STATUS hdd_execute_global_config_command(hdd_context_t *pHddCtx, * @pBuf: buffer to store the configuration * @buflen: size of the buffer * - * Return: CDF_STATUS_SUCCESS if the configuration and buffer size can carry - * the content, otherwise CDF_STATUS_E_RESOURCES + * Return: QDF_STATUS_SUCCESS if the configuration and buffer size can carry + * the content, otherwise QDF_STATUS_E_RESOURCES */ -CDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, +QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, int buflen) { return hdd_cfg_get_config(g_registry_table, @@ -6744,10 +6744,10 @@ bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx) * This function is used to modify the number of spatial streams * supported when not in connected state. * - * Return: CDF_STATUS_SUCCESS if nss is correctly updated, - * otherwise CDF_STATUS_E_FAILURE would be returned + * Return: QDF_STATUS_SUCCESS if nss is correctly updated, + * otherwise QDF_STATUS_E_FAILURE would be returned */ -CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) +QDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) { struct hdd_config *hdd_config = hdd_ctx->config; uint32_t temp = 0; @@ -6762,19 +6762,19 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) if ((nss == 2) && (hdd_ctx->num_rf_chains != 2)) { hddLog(LOGE, "No support for 2 spatial streams"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } enable2x2 = (nss == 1) ? 0 : 1; if (hdd_config->enable2x2 == enable2x2) { hddLog(LOGE, "NSS same as requested"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (true == sme_is_any_session_in_connected_state(hdd_ctx->hHal)) { hddLog(LOGE, "Connected sessions present, Do not change NSS"); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } hdd_config->enable2x2 = enable2x2; @@ -6792,7 +6792,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) /* Update Rx Highest Long GI data Rate */ if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE, - rx_supp_data_rate) == CDF_STATUS_E_FAILURE) { + rx_supp_data_rate) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CFG"); @@ -6801,7 +6801,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) /* Update Tx Highest Long GI data Rate */ if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE, - tx_supp_data_rate) == CDF_STATUS_E_FAILURE) { + tx_supp_data_rate) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE to CFG"); @@ -6816,7 +6816,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) ht_cap_info->txSTBC = hdd_config->enableTxSTBC; temp = val16; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_HT_CAP_INFO to CFG"); } @@ -6829,7 +6829,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_BASIC_MCS_SET, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_BASIC_MCS_SET to CFG"); @@ -6843,7 +6843,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_RX_MCS_MAP to CFG"); } @@ -6856,7 +6856,7 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) temp |= 0x000C; if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TX_MCS_MAP, - temp) == CDF_STATUS_E_FAILURE) { + temp) == QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on WNI_CFG_VHT_TX_MCS_MAP to CFG"); } @@ -6874,14 +6874,14 @@ CDF_STATUS hdd_update_nss(hdd_context_t *hdd_ctx, uint8_t nss) if (sme_cfg_set_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, SIZE_OF_SUPPORTED_MCS_SET) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { status = false; hddLog(LOGE, "Could not pass on MCS SET to CFG"); } #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES - if (CDF_STATUS_SUCCESS != sme_update_nss(hdd_ctx->hHal, nss)) + if (QDF_STATUS_SUCCESS != sme_update_nss(hdd_ctx->hHal, nss)) status = false; - return (status == false) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (status == false) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 018e3b58ae0f..ce41c1e2085c 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1529,7 +1529,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, status = cds_get_pcl(CDS_SAP_MODE, sap_config->acs_cfg.pcl_channels, &sap_config->acs_cfg.pcl_ch_count); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) hddLog(LOGE, FL("Get PCL failed")); wlan_hdd_set_acs_ch_range(sap_config, ht_enabled, vht_enabled); @@ -1938,7 +1938,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, tpSirScanMacOui pReqMsg = NULL; hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_SET_SCANNING_MAC_OUI_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -1977,7 +1977,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, hddLog(LOG1, FL("Oui (%02x:%02x:%02x)"), pReqMsg->oui[0], pReqMsg->oui[1], pReqMsg->oui[2]); status = sme_set_scanning_mac_oui(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_set_scanning_mac_oui failed(err=%d)"), status); goto fail; @@ -2058,7 +2058,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, struct sk_buff *skb = NULL; uint32_t dbs_capability = 0; bool one_by_one_dbs, two_by_two_dbs; - CDF_STATUS ret = CDF_STATUS_E_FAILURE; + QDF_STATUS ret = QDF_STATUS_E_FAILURE; int ret_val; uint8_t feature_flags[(NUM_QCA_WLAN_VENDOR_FEATURES + 7) / 8] = {0}; @@ -2097,7 +2097,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, goto nla_put_failure; ret = wma_get_dbs_hw_modes(&one_by_one_dbs, &two_by_two_dbs); - if (CDF_STATUS_SUCCESS == ret) { + if (QDF_STATUS_SUCCESS == ret) { if (one_by_one_dbs) dbs_capability = DRV_DBS_CAPABILITY_1X1; @@ -2483,13 +2483,13 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_ap_ctx_t *ap_ctx; hdd_station_ctx_t *sta_ctx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); while ((NULL != adapter_node) && - (CDF_STATUS_SUCCESS == cdf_status)) { + (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapter_node->pAdapter; if ((device_mode == adapter->device_mode) && @@ -2532,7 +2532,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, } } - cdf_status = hdd_get_next_adapter(hdd_ctx, + qdf_status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); adapter_node = next; @@ -2559,7 +2559,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, uint32_t no_dfs_flag) { tHalHandle h_hal = WLAN_HDD_GET_HAL_CTX(adapter); - CDF_STATUS status; + QDF_STATUS status; int ret_val = -EPERM; if (no_dfs_flag == hdd_ctx->config->enableDFSChnlScan) { @@ -2588,7 +2588,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, status = sme_handle_dfs_chan_scan( h_hal, hdd_ctx->config->enableDFSChnlScan); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { ret_val = 0; /* @@ -2598,7 +2598,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, * all sessions */ status = sme_scan_flush_result(h_hal); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3135,7 +3135,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u32 modulated_dtim; u16 stats_avg_factor; u32 guard_time; - CDF_STATUS status; + QDF_STATUS status; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3163,7 +3163,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, modulated_dtim); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3174,7 +3174,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, stats_avg_factor); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3186,7 +3186,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, adapter->sessionId, guard_time); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EPERM; } @@ -3251,7 +3251,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, const void *data, int data_len) { - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1]; struct sir_wifi_start_log start_log; @@ -3313,7 +3313,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, } status = sme_wifi_start_logger(hdd_ctx->hHal, start_log); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_wifi_start_logger failed(err=%d)"), status); return -EINVAL; @@ -3374,7 +3374,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, const void *data, int data_len) { - CDF_STATUS status; + QDF_STATUS status; uint32_t ring_id; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb @@ -3417,7 +3417,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, status = cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL, WLAN_LOG_INDICATOR_FRAMEWORK, WLAN_LOG_REASON_CODE_UNUSED); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to trigger bug report")); return -EINVAL; } @@ -3553,7 +3553,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, struct nlattr **tb) { struct sSirAddPeriodicTxPtrn *add_req; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id, ret, len; uint8_t pattern_id = 0; struct cdf_mac_addr dst_addr; @@ -3661,7 +3661,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, hddLog(LOG1, FL("pattern id: %d"), add_req->ucPtrnId); status = sme_add_periodic_tx_ptrn(hdd_ctx->hHal, add_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_add_periodic_tx_ptrn failed (err=%d)"), status); goto fail; @@ -3691,7 +3691,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, struct nlattr **tb) { struct sSirDelPeriodicTxPtrn *del_req; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id, ret; uint8_t pattern_id = 0; @@ -3725,7 +3725,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, request_id, del_req->ucPtrnId); status = sme_del_periodic_tx_ptrn(hdd_ctx->hHal, del_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_del_periodic_tx_ptrn failed (err=%d)"), status); goto fail; @@ -3878,7 +3878,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[PARAM_MAX + 1]; struct rssi_monitor_req req; - CDF_STATUS status; + QDF_STATUS status; int ret; uint32_t control; static const struct nla_policy policy[PARAM_MAX + 1] = { @@ -3951,7 +3951,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, req.request_id, req.session_id, req.control); status = sme_set_rssi_monitoring(hdd_ctx->hHal, &req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_rssi_monitoring failed(err=%d)"), status); return -EINVAL; @@ -4069,7 +4069,7 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, { hdd_context_t *hdd_ctx = wiphy_priv(wiphy); int i, ret = 0; - CDF_STATUS status; + QDF_STATUS status; uint8_t pcl[MAX_NUM_CHAN]; uint32_t pcl_len = 0; uint32_t freq_list[MAX_NUM_CHAN]; @@ -4103,7 +4103,7 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, hdd_debug("Userspace requested pref freq list"); status = cds_get_pcl(intf_mode, pcl, &pcl_len); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Get pcl failed"); return -EINVAL; } @@ -4234,19 +4234,19 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, if (hdd_ctx->config->policy_manager_enabled) { ret = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) + if (!QDF_IS_STATUS_SUCCESS(ret)) hdd_err("clearing event failed"); ret = cds_current_connections_update(adapter->sessionId, channel_hint, CDS_UPDATE_REASON_SET_OPER_CHAN); - if (CDF_STATUS_E_FAILURE == ret) { + if (QDF_STATUS_E_FAILURE == ret) { /* return in the failure case */ hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == ret) { + if (QDF_STATUS_SUCCESS == ret) { /* * Success is the only case for which we expect hw mode * change to take place, hence we need to wait. @@ -4254,7 +4254,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, * through */ ret = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -4507,7 +4507,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_OTA_TEST_MAX + 1]; uint8_t ota_enable = 0; - CDF_STATUS status; + QDF_STATUS status; uint32_t current_roam_state; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { @@ -4543,14 +4543,14 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, sme_get_current_roam_state(hal, adapter->sessionId); status = sme_stop_roaming(hal, adapter->sessionId, eCsrHddIssued); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Enable/Disable roaming failed"); return -EINVAL; } status = sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_DISABLE); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Enable/Disable power save failed"); /* restore previous roaming setting */ if (current_roam_state == eCSR_ROAMING_STATE_JOINING || @@ -4562,7 +4562,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, status = sme_stop_roaming(hal, adapter->sessionId, eCsrHddIssued); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) hdd_err("Restoring roaming state failed"); return -EINVAL; @@ -5743,7 +5743,7 @@ uint8_t *wlan_hdd_cfg80211_get_ie_ptr(const uint8_t *ies_ptr, int length, * This function validates whether given channel is part of valid * channel list. */ -CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, int channel) { @@ -5767,7 +5767,7 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, if (fValidChannel != true) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (0 != sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, @@ -5775,7 +5775,7 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: failed to get valid channel list", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (indx = 0; indx < num_ch; indx++) { if (channel == valid_ch[indx]) { @@ -5786,10 +5786,10 @@ CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, if (indx >= num_ch) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5836,7 +5836,7 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) temp = srv_ip[num]; pDhcpSrvInfo->dhcpSrvIP |= (temp << (8 * num)); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_dhcp_srv_offload(pHddCtx->hHal, pDhcpSrvInfo)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: sme_setDHCPSrvOffload fail!", __func__); @@ -5857,7 +5857,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int ret = 0; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; ENTER(); @@ -5894,7 +5894,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, pAdapter->sessionCtx. ap. apDisableIntraBssFwd); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { ret = -EINVAL; } } @@ -5929,7 +5929,7 @@ static int wlan_hdd_change_iface_to_sta_mode(struct net_device *ndev, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_wext_state_t *wext; struct wireless_dev *wdev; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -6011,7 +6011,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, struct hdd_config *pConfig = NULL; eMib_dot11DesiredBssType connectedBssType; unsigned long rc; - CDF_STATUS vstatus; + QDF_STATUS vstatus; int status; ENTER(); @@ -6063,7 +6063,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: vstatus = wlan_hdd_change_iface_to_sta_mode(ndev, type); - if (vstatus != CDF_STATUS_SUCCESS) + if (vstatus != QDF_STATUS_SUCCESS) return -EINVAL; hdd_register_tx_flow_control(pAdapter, @@ -6129,7 +6129,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, hdd_set_ap_ops(pAdapter->dev); vstatus = hdd_init_ap_mode(pAdapter); - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { hddLog(LOGP, FL ("Error initializing the ap mode")); @@ -6163,7 +6163,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_ADHOC: status = wlan_hdd_change_iface_to_sta_mode(ndev, type); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; if ((NL80211_IFTYPE_P2P_CLIENT == type) || @@ -6208,7 +6208,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, || (eCSR_BSS_TYPE_START_IBSS == LastBSSType)) { /* Need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED)) { @@ -6297,7 +6297,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, struct station_parameters *params) #endif { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; @@ -6337,7 +6337,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, &STAMacAddress, ol_txrx_peer_state_auth); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO, FL ("Not able to change TL state to AUTHENTICATED")); @@ -6514,7 +6514,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, &StaParams, isBufSta, isOffChannelSupported); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL ("wlan_hdd_tdls_set_peer_caps failed!")); @@ -6524,7 +6524,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, status = wlan_hdd_tdls_add_station(wiphy, dev, mac, 1, &StaParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("wlan_hdd_tdls_add_station failed!")); return -EINVAL; @@ -6588,7 +6588,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; #endif hdd_hostapd_state_t *pHostapdState; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; hdd_context_t *pHddCtx; hdd_ap_ctx_t *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); @@ -6771,7 +6771,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, #else status = wlansap_set_key_sta(p_cds_context, &setKey); #endif - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] wlansap_set_key_sta returned ERROR status= %d", @@ -6828,11 +6828,11 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, request */ cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -7486,7 +7486,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy, { tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tCsrScanResultInfo *pScanResult; - CDF_STATUS status = 0; + QDF_STATUS status = 0; tScanResultHandle pResult; struct cfg80211_bss *bss_status = NULL; hdd_context_t *pHddCtx; @@ -7615,7 +7615,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter, * Return: CDF status */ #define MAX_LFR_METRICS_EVENT_LENGTH 100 -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1]; @@ -7625,7 +7625,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7643,7 +7643,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7656,7 +7656,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, * * Return: CDF status */ -CDF_STATUS +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, bool preauth_status) @@ -7668,7 +7668,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7694,7 +7694,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7706,7 +7706,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, * * Return: CDF status */ -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) { unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1]; @@ -7716,7 +7716,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* create the event */ @@ -7735,7 +7735,7 @@ CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -7957,7 +7957,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, */ status = hdd_set_ibss_power_save_params(pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Set IBSS Power Save Params Failed")); return -EINVAL; @@ -8034,7 +8034,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, pAdapter->sessionId, pRoamProfile, &roamId); - if ((CDF_STATUS_SUCCESS != status) && + if ((QDF_STATUS_SUCCESS != status) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { hddLog(LOGE, @@ -8757,7 +8757,7 @@ static int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) * ssid and the previous connect command in CSR. Else we might * hit some race conditions leading to SME and HDD out of sync. */ - if (CDF_STATUS_CMD_NOT_QUEUED == status) { + if (QDF_STATUS_CMD_NOT_QUEUED == status) { hdd_info("Already disconnected or connect was in sme/roam pending list and removed by disconnect"); } else if (0 != status) { hdd_err("csrRoamDisconnect failure, returned %d", @@ -8770,7 +8770,7 @@ static int wlan_hdd_try_disconnect(hdd_adapter_t *pAdapter) rc = wait_for_completion_timeout( &pAdapter->disconnect_comp_var, msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT)); - if (!rc && (CDF_STATUS_CMD_NOT_QUEUED != status)) { + if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) { hdd_err("Sme disconnect event timed out session Id %d staDebugState %d", pAdapter->sessionId, pHddStaCtx->staDebugState); result = -ETIMEDOUT; @@ -8958,7 +8958,7 @@ int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) * the previous connect command in CSR. Else we might hit some * race conditions leading to SME and HDD out of sync. */ - if (CDF_STATUS_CMD_NOT_QUEUED == status) { + if (QDF_STATUS_CMD_NOT_QUEUED == status) { hdd_info("Already disconnected or connect was in sme/roam pending list and removed by disconnect"); } else if (0 != status) { hddLog(LOGE, @@ -8972,7 +8972,7 @@ int wlan_hdd_disconnect(hdd_adapter_t *pAdapter, u16 reason) msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); - if (!rc && (CDF_STATUS_CMD_NOT_QUEUED != status)) { + if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) { hddLog(LOGE, FL("Failed to disconnect, timed out")); result = -ETIMEDOUT; @@ -9370,20 +9370,20 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, } if (pHddCtx->config->policy_manager_enabled) { status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); status = cds_current_connections_update(pAdapter->sessionId, channelNum, CDS_UPDATE_REASON_JOIN_IBSS); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -9409,7 +9409,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, /* enable selected protection checks in IBSS mode */ pRoamProfile->cfg_protection = IBSS_CFG_PROTECTION_ENABLE_MASK; - if (CDF_STATUS_E_FAILURE == sme_cfg_set_int(pHddCtx->hHal, + if (QDF_STATUS_E_FAILURE == sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_ATIM_WIN_SIZE, pHddCtx->config-> ibssATIMWinSize)) { @@ -9420,7 +9420,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, /* BSSID is provided by upper layers hence no need to AUTO generate */ if (NULL != params->bssid) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; @@ -9428,7 +9428,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, cdf_mem_copy(bssid.bytes, params->bssid, CDF_MAC_ADDR_SIZE); } else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; @@ -9519,7 +9519,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, tCsrRoamProfile *pRoamProfile; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int status; - CDF_STATUS hal_status; + QDF_STATUS hal_status; unsigned long rc; ENTER(); @@ -9559,7 +9559,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, hal_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE); - if (!CDF_IS_STATUS_SUCCESS(hal_status)) { + if (!QDF_IS_STATUS_SUCCESS(hal_status)) { hddLog(LOGE, FL("sme_roam_disconnect failed hal_status(%d)"), hal_status); @@ -9829,7 +9829,6 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_hostapd_state_t *hapd_state; int status; @@ -9895,10 +9894,10 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); - cdf_status = + qdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { pAdapter->aStaInfo[i]. isDeauthInProgress = true; qdf_status = @@ -9914,11 +9913,11 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, } } } else { - cdf_status = + qdf_status = hdd_softap_get_sta_id(pAdapter, (struct cdf_mac_addr *) mac, &staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOG1, FL("Skip DEL STA as this is not used::" MAC_ADDRESS_STR), @@ -9958,9 +9957,9 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, qdf_event_reset(&hapd_state->cdf_event); hdd_softap_sta_disassoc(pAdapter, mac); - cdf_status = hdd_softap_sta_deauth(pAdapter, + qdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pAdapter->aStaInfo[staId].isDeauthInProgress = false; hddLog(LOG1, @@ -10131,7 +10130,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); tHalHandle halHandle; - CDF_STATUS result = CDF_STATUS_SUCCESS; + QDF_STATUS result = QDF_STATUS_SUCCESS; int status; tPmkidCacheInfo pmk_id; @@ -10175,7 +10174,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, pAdapter->sessionId, result)); EXIT(); - return CDF_IS_STATUS_SUCCESS(result) ? 0 : -EINVAL; + return QDF_IS_STATUS_SUCCESS(result) ? 0 : -EINVAL; } /** @@ -10247,7 +10246,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_DEL_PMKSA, pAdapter->sessionId, 0)); /* Delete the PMKID CSR cache */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_roam_del_pmkid_from_cache(halHandle, pAdapter->sessionId, pmksa->bssid, false)) { @@ -10315,7 +10314,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); /* Flush the PMKID cache in CSR */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_roam_del_pmkid_from_cache(halHandle, pAdapter->sessionId, NULL, true)) { hddLog(LOGE, FL("Cannot flush PMKIDCache")); @@ -10447,7 +10446,7 @@ void wlan_hdd_cfg80211_update_replay_counter_callback(void *callbackContext, return; } - if (CDF_STATUS_SUCCESS != pGtkOffloadGetInfoRsp->ulStatus) { + if (QDF_STATUS_SUCCESS != pGtkOffloadGetInfoRsp->ulStatus) { hddLog(LOGE, FL("wlan Failed to get replay counter value")); return; } @@ -10496,7 +10495,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, tHalHandle hHal; int result; tSirGtkOffloadParams hddGtkOffloadReqParams; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; ENTER(); @@ -10551,7 +10550,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, sme_set_gtk_offload(hHal, &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_set_gtk_offload failed, status(%d)"), status); return -EINVAL; @@ -10608,7 +10607,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx; int status; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ENTER(); @@ -10695,13 +10694,13 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, } } #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_set_mac_acl(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), pConfig); #else - cdf_status = wlansap_set_mac_acl(p_cds_context, pConfig); + qdf_status = wlansap_set_mac_acl(p_cds_context, pConfig); #endif - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("SAP Set Mac Acl fail")); return -EINVAL; } @@ -10837,7 +10836,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, void *buf; tSirLPHBReq *hb_params = NULL; tSirLPHBReq *hb_params_temp = NULL; - CDF_STATUS smeStatus; + QDF_STATUS smeStatus; if (!tb[WLAN_HDD_TM_ATTR_DATA]) { hddLog(LOGE, FL("Testmode INV DATA")); @@ -10865,7 +10864,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, sme_lphb_config_req((tHalHandle) (pHddCtx->hHal), hb_params, wlan_hdd_cfg80211_lphb_ind_handler); - if (CDF_STATUS_SUCCESS != smeStatus) { + if (QDF_STATUS_SUCCESS != smeStatus) { hddLog(LOGE, "LPHB Config Fail, disable"); cdf_mem_free(hb_params); } @@ -10878,7 +10877,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, { int buf_len; void *buf; - CDF_STATUS status; + QDF_STATUS status; if (!tb[WLAN_HDD_TM_ATTR_DATA]) { hddLog(LOGE, FL @@ -10893,7 +10892,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, status = wlan_hdd_ftm_testmode_cmd(buf, buf_len); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) err = -EBUSY; break; } @@ -11000,7 +10999,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS status; + QDF_STATUS status; tSmeConfigParams sme_config; bool cbModeChange; @@ -11062,7 +11061,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, /* Change SAP ht2040 mode */ status = hdd_set_sap_ht2040_mode(pAdapter, cfg80211_get_chandef_type(chandef)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error!!! Cannot set SAP HT20/40 mode!")); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index c830c06aa0ed..10962279f52d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -2266,16 +2266,16 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter, int index, bool preauth); #ifdef FEATURE_WLAN_LFR_METRICS -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo); -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t * +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t * pAdapter, tCsrRoamInfo * pRoamInfo, bool preauth_status); -CDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo); #endif @@ -2304,7 +2304,7 @@ void hdd_reg_notifier(struct wiphy *wiphy, extern void hdd_conn_set_connection_state(hdd_adapter_t *pAdapter, eConnectionState connState); -CDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, int channel); #ifdef FEATURE_WLAN_TDLS int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index 56470105971e..c3cda33116af 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -630,11 +630,11 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) bool status = false; enum cds_pcl_type pcl_type; char reason[20] = {0}; - CDF_STATUS ret; + QDF_STATUS ret; /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } @@ -681,7 +681,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, enum cds_one_connection_mode second_index; char reason[20] = {0}; bool status = false; - CDF_STATUS ret; + QDF_STATUS ret; for (sub_type = CDS_STA_MODE; sub_type < CDS_MAX_NUM_OF_MODE; sub_type++) { @@ -689,7 +689,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } @@ -761,7 +761,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, enum cds_two_connection_mode third_index; char reason[20] = {0}; bool status = false; - CDF_STATUS ret; + QDF_STATUS ret; /* let's set the chain_mask, mac_ids*/ if (chain_mask == CDS_TWO_TWO) { @@ -787,7 +787,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, type_1 = wlan_hdd_valid_type_of_persona(sub_type_1); /* flush the entire table first */ ret = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { hdd_err("Policy manager initialization failed"); return; } diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 7cb79d309206..9af633692f82 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -321,7 +321,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, char *pattern_buf; uint16_t pattern_len = 0; uint16_t i = 0; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -411,7 +411,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Delete pattern */ status = sme_del_periodic_tx_ptrn(pHddCtx->hHal, delPeriodicTxPtrnParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_del_periodic_tx_ptrn() failed!", __func__); @@ -489,7 +489,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Add pattern */ status = sme_add_periodic_tx_ptrn(pHddCtx->hHal, addPeriodicTxPtrnParams); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_add_periodic_tx_ptrn() failed!", __func__); @@ -610,33 +610,33 @@ static const struct file_operations fops_patterngen = { * NB: The current implementation only supports debugfs operations * on the primary interface, i.e. wlan0 * - * Return: CDF_STATUS_SUCCESS if all files registered, - * CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS if all files registered, + * QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) { hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); pHddCtx->debugfs_phy = debugfs_create_dir("wlan_wcnss", 0); if (NULL == pHddCtx->debugfs_phy) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_enable", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_wowenable)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_pattern", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_wowpattern)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("pattern_gen", S_IRUSR | S_IWUSR, pHddCtx->debugfs_phy, pAdapter, &fops_patterngen)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index c66dcbbfe2c9..f09f1bad5d93 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -38,7 +38,6 @@ #include #endif /* HIF_PCI */ #include "cds_api.h" -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cds_sched.h" @@ -182,7 +181,7 @@ static void hdd_hif_init_cds_callbacks(void *data, struct hif_callbacks *cbk) */ static int hdd_init_cds_hif_context(void *hif) { - CDF_STATUS status; + QDF_STATUS status; status = cds_set_context(CDF_MODULE_ID_HIF, hif); @@ -199,7 +198,7 @@ static int hdd_init_cds_hif_context(void *hif) */ static void hdd_deinit_cds_hif_context(void) { - CDF_STATUS status; + QDF_STATUS status; status = cds_set_context(CDF_MODULE_ID_HIF, NULL); @@ -224,7 +223,7 @@ static void hdd_deinit_cds_hif_context(void) static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, enum ath_hal_bus_type bus_type, bool reinit) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; struct hif_opaque_softc *hif_ctx; cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); @@ -259,7 +258,7 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, status = hif_enable(hif_ctx, dev, bdev, bid, bus_type, (reinit == true) ? HIF_ENABLE_TYPE_REINIT : HIF_ENABLE_TYPE_PROBE); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("hif_enable error = %d, reinit = %d", status, reinit); ret = cdf_status_to_os_return(status); @@ -328,7 +327,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, enum ath_hal_bus_type bus_type, bool reinit) { void *hif_ctx; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; cdf_device_t cdf_dev; uint32_t mode = cds_get_conparam(); @@ -358,7 +357,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, if (WLAN_IS_EPPING_ENABLED(mode)) { status = epping_open(); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto err_hdd_deinit; } @@ -374,7 +373,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, status = ol_cds_init(cdf_dev, hif_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { pr_err("%s No Memory to Create BMI Context\n", __func__); goto err_hif_close; } @@ -599,7 +598,7 @@ done: * * @state: state * - * Return: CDF_STATUS + * Return: QDF_STATUS */ int wlan_hdd_bus_suspend(pm_message_t state) { diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index f33a6e20eab6..65d31d5d780d 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1714,7 +1714,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -1759,7 +1759,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_get_capabilities(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_get_capabilities failed(err=%d)"), status); goto fail; @@ -1846,7 +1846,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_MAX + 1]; struct hdd_ext_scan_context *context; - CDF_STATUS status; + QDF_STATUS status; int retval = 0; unsigned long rc; @@ -1900,7 +1900,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_get_cached_results(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_get_cached_results failed(err=%d)"), status); goto fail; @@ -1993,7 +1993,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, struct nlattr *apTh; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t i; int rem, retval; unsigned long rc; @@ -2111,7 +2111,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_bss_hotlist(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_bss_hotlist failed(err=%d)"), status); goto fail; } @@ -2190,7 +2190,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, struct nlattr *apTh; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t i; int rem, retval; unsigned long rc; @@ -2330,7 +2330,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_significant_change(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_significant_change failed(err=%d)"), status); cdf_mem_free(pReqMsg); @@ -2472,7 +2472,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, 1]; uint32_t requestId, maxChannels; tWifiBand wifiBand; - CDF_STATUS status; + QDF_STATUS status; struct sk_buff *reply_skb; uint8_t i; int ret; @@ -2527,7 +2527,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, status = sme_get_valid_channels_by_band((tHalHandle) (pHddCtx->hHal), wifiBand, chan_list, &num_channels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_get_valid_channels_by_band failed (err=%d)"), status); @@ -2693,7 +2693,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( struct nlattr *buckets; struct nlattr *channels; int rem1, rem2; - CDF_STATUS status; + QDF_STATUS status; uint8_t bkt_index, j, num_channels, total_channels = 0; uint32_t chan_list[WNI_CFG_VALID_CHANNEL_LIST_LEN] = {0}; @@ -2821,7 +2821,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( status = sme_get_valid_channels_by_band(hdd_ctx->hHal, req_msg->buckets[bkt_index].band, chan_list, &num_channels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_GetValidChannelsByBand failed (err=%d)"), status); @@ -3138,7 +3138,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; uint32_t request_id, num_buckets; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3250,7 +3250,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_start(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_start failed(err=%d)"), status); goto fail; @@ -3347,7 +3347,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; - CDF_STATUS status; + QDF_STATUS status; uint32_t request_id; int retval; unsigned long rc; @@ -3393,7 +3393,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_ext_scan_stop(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_ext_scan_stop failed(err=%d)"), status); goto fail; @@ -3475,7 +3475,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3522,7 +3522,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_reset_bss_hotlist(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_bss_hotlist failed(err=%d)"), status); goto fail; @@ -3600,7 +3600,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -3647,7 +3647,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy spin_unlock(&context->context_lock); status = sme_reset_significant_change(pHddCtx->hHal, pReqMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_significant_change failed(err=%d)"), status); cdf_mem_free(pReqMsg); @@ -3812,7 +3812,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[ QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; uint32_t num_networks, len; int ret_val; @@ -3869,7 +3869,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, goto fail; status = sme_set_epno_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_epno_list failed(err=%d)"), status); goto fail; } @@ -4018,7 +4018,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; uint32_t num_networks = 0; int ret; @@ -4072,7 +4072,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, goto fail; status = sme_set_passpoint_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_passpoint_list failed(err=%d)"), status); goto fail; @@ -4135,7 +4135,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; int ret; ENTER(); @@ -4174,7 +4174,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, req_msg->request_id, req_msg->session_id); status = sme_reset_passpoint_list(hdd_ctx->hHal, req_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_passpoint_list failed(err=%d)"), status); goto fail; @@ -4264,7 +4264,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, uint32_t request_id; char ssid_string[SIR_MAC_MAX_SSID_LENGTH + 1]; int ssid_len, i, rem; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -4384,7 +4384,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_ssid_hotlist(hdd_ctx->hHal, request); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_ssid_hotlist failed(err=%d)"), status); goto fail; @@ -4484,7 +4484,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, struct nlattr *tb[PARAM_MAX + 1]; struct hdd_ext_scan_context *context; uint32_t request_id; - CDF_STATUS status; + QDF_STATUS status; int retval; unsigned long rc; @@ -4534,7 +4534,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, spin_unlock(&context->context_lock); status = sme_set_ssid_hotlist(hdd_ctx->hHal, request); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_ssid_hotlist failed(err=%d)"), status); goto fail; diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 65585520d064..645e7a0cc06e 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -99,16 +99,16 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len) ftmMsg.bodyptr = (uint8_t *) cmd_ptr; ftmMsg.bodyval = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &ftmMsg)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -161,16 +161,16 @@ static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms, * - All the WLAN SW components should have been opened. This includes MAC. * * Returns: - * CDF_STATUS_SUCCESS - Scheduler was successfully initialized and + * QDF_STATUS_SUCCESS - Scheduler was successfully initialized and * is ready to be used. - * CDF_STATUS_E_RESOURCES - System resources (other than memory) + * QDF_STATUS_E_RESOURCES - System resources (other than memory) * are unavailable to initialize the scheduler - * CDF_STATUS_E_FAILURE - Failure to initialize the scheduler + * QDF_STATUS_E_FAILURE - Failure to initialize the scheduler */ -static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, +static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, uint32_t hddContextSize) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; @@ -191,7 +191,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the probe event */ @@ -199,7 +199,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != @@ -213,7 +213,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, /* Initialize the free message queue */ vStatus = cds_mq_init(&gp_cds_context->freeVosMq); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, @@ -235,7 +235,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, sizeof(cds_sched_context)); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open CDS Scheduler %d", __func__, @@ -300,7 +300,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = wma_open(gp_cds_context, wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open WMA module %d", __func__, @@ -346,7 +346,7 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #ifndef QCA_WIFI_FTM /* Now proceed to open the SME */ vStatus = sme_open(gp_cds_context->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open SME %d", __func__, vStatus); @@ -355,16 +355,16 @@ static CDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_init_chan_list(gp_cds_context->pMACContext, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init sme channel list", __func__); } else { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #else - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif #ifndef QCA_WIFI_FTM @@ -397,7 +397,7 @@ err_wma_complete_event: err_probe_event: qdf_event_destroy(&gp_cds_context->ProbeEvent); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* wlan_ftm_cds_open() */ @@ -407,38 +407,37 @@ err_probe_event: * * The wlan_ftm_cds_close() function closes the CDF Module * - * Return: CDF_STATUS_SUCCESS - successfully closed + * Return: QDF_STATUS_SUCCESS - successfully closed */ -static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) +static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) { - CDF_STATUS cdf_status; QDF_STATUS qdf_status; p_cds_contextType gp_cds_context = (p_cds_contextType) cds_context; #ifndef QCA_WIFI_FTM - cdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close SME %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close SME %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #endif - cdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close MAC %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close MAC %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; - cdf_status = wma_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to close WMA %d", __func__, cdf_status); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + "%s: Failed to close WMA %d", __func__, qdf_status); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #if defined(QCA_WIFI_FTM) if (gp_cds_context->htc_ctx) { @@ -446,11 +445,11 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) htc_destroy(gp_cds_context->htc_ctx); gp_cds_context->htc_ctx = NULL; } - cdf_status = wma_wmi_service_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wmi_service_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } hif_disable_isr(gp_cds_context->pHIFContext); @@ -474,7 +473,7 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -484,12 +483,12 @@ static CDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) * The cds_ftm_pre_start() function performs all pre-start activities * in FTM mode. * - * Return: CDF_STATUS_SUCCESS if pre-start was successful, an + * Return: QDF_STATUS_SUCCESS if pre-start was successful, an * appropriate CDF_STATUS_E_* error code otherwise */ -static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) +static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; #if defined(QCA_WIFI_FTM) @@ -502,7 +501,7 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) CDF_ASSERT(0); CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Reset WMA wait event */ @@ -510,11 +509,11 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) /*call WMA pre start */ vStatus = wma_pre_start(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Failed to WMA prestart "); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Need to update time out of complete */ @@ -531,20 +530,20 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) __func__); } CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #if defined(QCA_WIFI_FTM) vStatus = htc_start(gp_cds_context->htc_ctx); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_wait_for_ready_event(gp_cds_context->pWMAContext); #endif /* QCA_WIFI_FTM */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -558,7 +557,7 @@ static CDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) */ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = NULL; CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, @@ -575,7 +574,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) vStatus = wlan_ftm_cds_open(p_cds_context, 0); - if (!CDF_IS_STATUS_SUCCESS(vStatus)) { + if (!QDF_IS_STATUS_SUCCESS(vStatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_cdf_status_failure; } @@ -656,7 +655,7 @@ static int wlan_ftm_stop(hdd_context_t *hdd_ctx) */ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t cds_context = hdd_ctx->pcds_context; hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM); @@ -675,11 +674,11 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) hdd_close_all_adapters(hdd_ctx, false); - cdf_status = cds_sched_close(cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_sched_close(cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close CDS Scheduler", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* Close CDS */ wlan_ftm_cds_close(cds_context); @@ -746,7 +745,7 @@ static void hdd_ftm_mc_process_msg(void *message) */ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) { - CDF_STATUS vStatus = CDF_STATUS_SUCCESS; + QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) (hdd_ctx->pcds_context); @@ -771,7 +770,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) } /* Vos preStart is calling */ - if (!CDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) { + if (!QDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed", __func__); goto err_status_failure; @@ -780,7 +779,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) sme_register_ftm_msg_processor(hdd_ctx->hHal, hdd_ftm_mc_process_msg); vStatus = wma_start(p_cds_context); - if (vStatus != CDF_STATUS_SUCCESS) { + if (vStatus != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start WMA", __func__); goto err_status_failure; @@ -856,7 +855,7 @@ static int wlan_hdd_qcmbr_command(hdd_adapter_t *adapter, if (wlan_hdd_ftm_testmode_cmd(pqcmbr_data->buf, pqcmbr_data-> length) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { ret = -EBUSY; } else { ret = 0; @@ -1013,9 +1012,9 @@ static void wlanqcmbr_mc_process_msg(void *message) * @data: FTM testmode command * @len: length of @data * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) +QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) { struct ar6k_testmode_cmd_data *cmd_data; @@ -1025,7 +1024,7 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (!cmd_data) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd_data->data = cdf_mem_malloc(len); @@ -1034,7 +1033,7 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data buffer")); cdf_mem_free(cmd_data); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd_data->len = len; @@ -1043,9 +1042,9 @@ CDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) if (wlan_ftm_postmsg((uint8_t *) cmd_data, sizeof(*cmd_data))) { cdf_mem_free(cmd_data->data); cdf_mem_free(cmd_data); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /*QCA_WIFI_FTM */ diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index fed68aa1ae29..c41e8f475774 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -302,19 +302,19 @@ static void hdd_wlan_green_ap_timer_fn(void *ctx) * hdd_wlan_green_ap_attach() - Attach Green AP context to HDD context * @hdd_ctx: Global HDD contect * - * Return: CDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error */ -static CDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) +static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) { struct hdd_green_ap_ctx *green_ap; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); green_ap = cdf_mem_malloc(sizeof(*green_ap)); if (!green_ap) { hdd_alert("Memory allocation for Green-AP failed!"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto error; } @@ -340,18 +340,18 @@ error: * hdd_wlan_green_ap_deattach() - Detach Green AP context from HDD context * @hdd_ctx: Global HDD contect * - * Return: CDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error */ -static CDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) +static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) { struct hdd_green_ap_ctx *green_ap = hdd_ctx->green_ap_ctx; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); if (green_ap == NULL) { hdd_notice("Green-AP is not enabled"); - status = CDF_STATUS_E_NOSUPPORT; + status = QDF_STATUS_E_NOSUPPORT; goto done; } @@ -361,7 +361,7 @@ static CDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) cdf_mc_timer_stop(&green_ap->ps_timer); /* Destroy the Green AP timer */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mc_timer_destroy(&green_ap->ps_timer))) + if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_destroy(&green_ap->ps_timer))) hdd_notice("Cannot deallocate Green-AP's timer"); /* release memory */ @@ -383,7 +383,7 @@ done: */ void hdd_wlan_green_ap_init(struct hdd_context_s *hdd_ctx) { - if (!CDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_attach(hdd_ctx))) + if (!QDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_attach(hdd_ctx))) hdd_err("Failed to allocate Green-AP resource"); } @@ -395,7 +395,7 @@ void hdd_wlan_green_ap_init(struct hdd_context_s *hdd_ctx) */ void hdd_wlan_green_ap_deinit(struct hdd_context_s *hdd_ctx) { - if (!CDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_deattach(hdd_ctx))) + if (!QDF_IS_STATUS_SUCCESS(hdd_wlan_green_ap_deattach(hdd_ctx))) hdd_err("Cannot deallocate Green-AP resource"); } diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index f10dcb8cff66..85a6c92dd969 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -376,10 +376,10 @@ static int hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu) } #ifdef QCA_HT_2040_COEX -CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, +QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, uint8_t channel_type) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; hddLog(LOGE, FL("change HT20/40 mode")); @@ -388,17 +388,17 @@ CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { hddLog(LOGE, FL("Hal ctx is null")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_set_ht2040_mode(hHal, pHostapdAdapter->sessionId, channel_type, true); - if (cdf_ret_status == CDF_STATUS_E_FAILURE) { + if (cdf_ret_status == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to change HT20/40 mode")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -456,7 +456,7 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) uint8_t we_custom_event[64]; union iwreq_data wrqu; #ifdef DISABLE_CONCURRENCY_AUTOSAVE - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_adapter_t *pHostapdAdapter; hdd_ap_ctx_t *pHddApCtx; #endif /* DISABLE_CONCURRENCY_AUTOSAVE */ @@ -483,11 +483,11 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) */ pHostapdAdapter = netdev_priv(dev); pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx->hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX(pHostapdAdapter))-> config->nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init AP inactivity timer")); } EXIT(); @@ -532,7 +532,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, { struct net_device *dev; hdd_context_t *pHddCtx = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; dev = (struct net_device *)usrDataForCallback; ENTER(); @@ -552,7 +552,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, wlansap_stop_bss((WLAN_HDD_GET_CTX(pHostapdAdapter))-> pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Deleting SAP/P2P link!!!!!!")); clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags); @@ -560,7 +560,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, pHostapdAdapter->sessionId); } EXIT(); - return (status == CDF_STATUS_SUCCESS) ? 0 : -EBUSY; + return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY; } /** @@ -592,7 +592,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter, MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_ISSUE_JOIN_REQ, sta_adapter->sessionId, roam_id)); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_issue_stored_joinreq(hal_handle, &roam_id, sta_adapter->sessionId)) { @@ -701,7 +701,7 @@ hdd_update_chandef(hdd_adapter_t *hostapd_adapter, * Return: Success on intimating userspace * */ -CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, +QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, struct net_device *dev, uint8_t oper_chan) { @@ -715,7 +715,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, if (NULL == hal) { hdd_err("hal is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } freq = cds_chan_to_freq(oper_chan); @@ -724,7 +724,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, if (!chan) { hdd_err("Invalid input frequency for channel conversion"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } phy_mode = hdd_sap_get_phymode(hostapd_adapter); @@ -766,7 +766,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, cfg80211_ch_switch_notify(dev, &chandef); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -782,7 +782,7 @@ CDF_STATUS hdd_chan_change_notify(hdd_adapter_t *hostapd_adapter, * Return: Success on sending notifying userspace * */ -CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, +QDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, eSapHddEvent event, struct wlan_dfs_info dfs_info, struct wireless_dev *wdev) @@ -795,7 +795,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (!hdd_context) { hddLog(LOGE, FL("HDD context is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } freq = cds_chan_to_freq(dfs_info.channel); @@ -817,7 +817,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, data_size = sizeof(uint32_t); break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } vendor_event = cfg80211_vendor_event_alloc(hdd_context->wiphy, @@ -828,7 +828,7 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (!vendor_event) { hddLog(LOGE, FL("cfg80211_vendor_event_alloc failed for %d"), index); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = nla_put_u32(vendor_event, NL80211_ATTR_WIPHY_FREQ, freq); @@ -836,14 +836,14 @@ CDF_STATUS hdd_send_radar_event(hdd_context_t *hdd_context, if (ret) { hddLog(LOGE, FL("NL80211_ATTR_WIPHY_FREQ put fail")); kfree_skb(vendor_event); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg80211_vendor_event(vendor_event, GFP_KERNEL); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, +QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, void *usrDataForCallback) { hdd_adapter_t *pHostapdAdapter; @@ -856,7 +856,6 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, int we_event = 0; int i = 0; uint8_t staId; - CDF_STATUS cdf_status; QDF_STATUS qdf_status; bool bWPSState; bool bAuthRequired = true; @@ -873,7 +872,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, struct wlan_dfs_info dfs_info; uint8_t cc_len = WLAN_SVC_COUNTRY_CODE_LEN; hdd_adapter_t *con_sap_adapter; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #if defined CONFIG_CNSS int ret = 0; #endif @@ -881,7 +880,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, dev = (struct net_device *)usrDataForCallback; if (!dev) { hddLog(LOGE, FL("usrDataForCallback is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHostapdAdapter = netdev_priv(dev); @@ -889,7 +888,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if ((NULL == pHostapdAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pHostapdAdapter->magic)) { hddLog(LOGE, "invalid adapter or adapter has invalid magic"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); @@ -897,7 +896,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (!pSapEvent) { hddLog(LOGE, FL("pSapEvent is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sapEvent = pSapEvent->sapHddEventCode; @@ -906,14 +905,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (!pHddCtx) { hddLog(LOGE, FL("HDD context is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg = pHddCtx->config; if (!cfg) { hddLog(LOGE, FL("HDD config is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } dfs_info.channel = pHddApCtx->operatingChannel; @@ -932,12 +931,12 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHostapdAdapter->sessionId = pSapEvent->sapevt.sapStartBssCompleteEvent.sessionId; - pHostapdState->cdf_status = + pHostapdState->qdf_status = pSapEvent->sapevt.sapStartBssCompleteEvent.status; qdf_status = qdf_event_set(&pHostapdState->cdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status) - || pHostapdState->cdf_status) { + || pHostapdState->qdf_status) { hddLog(LOGE, ("ERROR: startbss event failed!!")); goto stopbss; } else { @@ -951,12 +950,12 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hdd_softap_tx_resume_cb); /* @@@ need wep logic here to set privacy bit */ - cdf_status = + qdf_status = hdd_softap_register_bc_sta(pHostapdAdapter, pHddApCtx->uPrivacy); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("Failed to register BC STA %d"), - cdf_status); + qdf_status); hdd_stop_bss_link(pHostapdAdapter, usrDataForCallback); } @@ -978,23 +977,23 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, (WLAN_HDD_GET_CTX(pHostapdAdapter))->config-> nAPAutoShutOff) { /* AP Inactivity timer init and start */ - cdf_status = + qdf_status = cdf_mc_timer_init(&pHddApCtx-> hdd_ap_inactivity_timer, CDF_TIMER_TYPE_SW, hdd_hostapd_inactivity_timer_cb, dev); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init inactivity timer")); - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX (pHostapdAdapter))->config-> nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init inactivity timer")); @@ -1024,7 +1023,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pcds_context, #endif &pHddApCtx->groupKey); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("wlansap_set_key_sta failed")); } else { for (i = 0; i < CSR_MAX_NUM_KEY; i++) { @@ -1041,7 +1040,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, #endif &pHddApCtx-> wepKey[i]); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("set_key failed idx %d"), i); } @@ -1151,7 +1150,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, &dfs_info, sizeof(struct wlan_dfs_info)); pHddCtx->dev_dfs_cac_status = DFS_CAC_IN_PROGRESS; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_START, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate CAC start NL event")); @@ -1172,7 +1171,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, * space applications are waiting on CAC end for their state * management. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_END, dfs_info, &pHostapdAdapter->wdev)) { hdd_err("Unable to indicate CAC end (interrupted) event"); @@ -1186,7 +1185,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, sizeof(struct wlan_dfs_info)); pHddApCtx->dfs_cac_block_tx = false; pHddCtx->dev_dfs_cac_status = DFS_CAC_ALREADY_DONE; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_CAC_END, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate CAC end NL event")); @@ -1200,7 +1199,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, &dfs_info, sizeof(struct wlan_dfs_info)); pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_send_radar_event(pHddCtx, eSAP_DFS_RADAR_DETECT, dfs_info, &pHostapdAdapter->wdev)) { hddLog(LOGE, FL("Unable to indicate Radar detect NL event")); @@ -1223,7 +1222,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, FL("SET Key: configured status = %s"), pSapEvent->sapevt.sapStationSetKeyCompleteEvent. status ? "eSAP_STATUS_FAILURE" : "eSAP_STATUS_SUCCESS"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_STA_MIC_FAILURE_EVENT: { memset(&msg, '\0', sizeof(msg)); @@ -1288,7 +1287,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } if (bAuthRequired || bWPSState == true) { - cdf_status = hdd_softap_register_sta( + qdf_status = hdd_softap_register_sta( pHostapdAdapter, true, pHddApCtx->uPrivacy, @@ -1300,13 +1299,13 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. wmmEnabled); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGW, FL("Failed to register STA %d " - MAC_ADDRESS_STR ""), cdf_status, + MAC_ADDRESS_STR ""), qdf_status, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } else { - cdf_status = hdd_softap_register_sta( + qdf_status = hdd_softap_register_sta( pHostapdAdapter, false, pHddApCtx->uPrivacy, @@ -1318,16 +1317,16 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. wmmEnabled); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGW, FL("Failed to register STA %d " - MAC_ADDRESS_STR ""), cdf_status, + MAC_ADDRESS_STR ""), qdf_status, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); } staId = pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.staId; - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { pHostapdAdapter->aStaInfo[staId].nss = pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. @@ -1376,10 +1375,10 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* Stop AP inactivity timer */ if (pHddApCtx->hdd_ap_inactivity_timer.state == CDF_TIMER_STATE_RUNNING) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to start inactivity timer")); } @@ -1454,14 +1453,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, else hddLog(LOG1, " MAC initiated disassociation"); we_event = IWEVEXPIRED; - cdf_status = + qdf_status = hdd_softap_get_sta_id(pHostapdAdapter, &pSapEvent->sapevt. sapStationDisassocCompleteEvent.staMac, &staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ERROR: HDD Failed to find sta id!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef IPA_OFFLOAD if (hdd_ipa_is_enabled(pHddCtx)) { @@ -1506,7 +1505,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (pHddApCtx->bApActive == false) { if (pHddApCtx->hdd_ap_inactivity_timer.state == CDF_TIMER_STATE_STOPPED) { - cdf_status = + qdf_status = cdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX @@ -1514,7 +1513,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, config-> nAPAutoShutOff * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to init AP inactivity timer")); } else @@ -1535,10 +1534,10 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, bytes[0], GFP_KERNEL); /* Update the beacon Interval if it is P2P GO */ - cdf_status = cds_change_mcc_go_beacon_interval(pHostapdAdapter); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_change_mcc_go_beacon_interval(pHostapdAdapter); + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, FL("failed to update Beacon interval %d"), - cdf_status); + qdf_status); } if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { /* send peer status indication to oem app */ @@ -1589,7 +1588,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, wireless_send_event(dev, IWEVCUSTOM, &wreq, (char *)message); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } case eSAP_ASSOC_STA_CALLBACK_EVENT: pAssocStasArray = @@ -1611,17 +1610,17 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } cdf_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas); /* Release caller allocated memory here */ pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_REMAIN_CHAN_READY: hdd_remain_chan_ready_handler(pHostapdAdapter, pSapEvent->sapevt.sap_roc_ind.scan_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_SEND_ACTION_CNF: hdd_send_action_cnf(pHostapdAdapter, (eSAP_STATUS_SUCCESS == pSapEvent->sapevt.sapActionCnf. actionSendSuccess) ? true : false); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_UNKNOWN_STA_JOIN: snprintf(unknownSTAEvent, IW_CUSTOM_MAX, "JOIN_UNKNOWN_STA-%02x:%02x:%02x:%02x:%02x:%02x", @@ -1657,21 +1656,21 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, "%s", maxAssocExceededEvent); break; case eSAP_STA_ASSOC_IND: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_DISCONNECT_ALL_P2P_CLIENT: hddLog(LOG1, FL(" Disconnecting all the P2P Clients....")); hdd_clear_all_sta(pHostapdAdapter, usrDataForCallback); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_MAC_TRIG_STOP_BSS_EVENT: - cdf_status = + qdf_status = hdd_stop_bss_link(pHostapdAdapter, usrDataForCallback); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("hdd_stop_bss_link failed %d"), - cdf_status); + qdf_status); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_CHANNEL_CHANGE_EVENT: hddLog(LOG1, FL("Received eSAP_CHANNEL_CHANGE_EVENT event")); @@ -1706,7 +1705,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, */ if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP && pHddCtx->config->force_sap_acs) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; else return hdd_chan_change_notify(pHostapdAdapter, dev, pSapEvent->sapevt.sap_ch_selected.pri_ch); @@ -1717,13 +1716,13 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, FL("Reusing Last ACS scan result for %d sec"), ACS_SCAN_EXPIRY_TIMEOUT_S); cdf_mc_timer_stop(&pHddCtx->skip_acs_scan_timer); - cdf_status = cdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, + qdf_status = cdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, ACS_SCAN_EXPIRY_TIMEOUT_S * 1000); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to start ACS scan expiry timer")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif case eSAP_DFS_NOL_GET: @@ -1740,14 +1739,14 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (ret > 0) { hddLog(LOG2, FL("Get %d bytes of dfs nol from cnss"), ret); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { hddLog(LOG2, FL("No dfs nol entry in CNSS, ret: %d"), ret); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } #else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif case eSAP_DFS_NOL_SET: hddLog(LOG1, FL("Received eSAP_DFS_NOL_SET event")); @@ -1768,9 +1767,9 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt.sapDfsNolInfo.sDfsList); } #else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_ACS_CHANNEL_SELECTED: hddLog(LOG1, FL("ACS Completed for wlan%d"), pHostapdAdapter->dev->ifindex); @@ -1789,7 +1788,7 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* send vendor event to hostapd only for hostapd based acs*/ if (!pHddCtx->config->force_sap_acs) wlan_hdd_cfg80211_acs_ch_select_evt(pHostapdAdapter); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case eSAP_ECSA_CHANGE_CHAN_IND: hddLog(LOG1, FL("Channel change indication from peer for channel %d"), @@ -1797,18 +1796,18 @@ CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, if (hdd_softap_set_channel_change(dev, pSapEvent->sapevt.sap_chan_cng_ind.new_chan, CH_WIDTH_MAX)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; else - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; default: hddLog(LOG1, "SAP message is not handled"); goto stopbss; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wireless_send_event(dev, we_event, &wrqu, (char *)we_custom_event_generic); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; stopbss: { @@ -1829,19 +1828,19 @@ stopbss: nAPAutoShutOff) { if (CDF_TIMER_STATE_RUNNING == pHddApCtx->hdd_ap_inactivity_timer.state) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to stop AP inactivity timer")); } } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pHddApCtx-> hdd_ap_inactivity_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to Destroy AP inactivity timer")); } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN @@ -1853,11 +1852,11 @@ stopbss: hdd_hostapd_stop(dev); /* reclaim all resources allocated to the BSS */ - cdf_status = hdd_softap_stop_bss(pHostapdAdapter); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_softap_stop_bss(pHostapdAdapter); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, FL("hdd_softap_stop_bss failed %d"), - cdf_status); + qdf_status); } /* once the event is set, structure dev/pHostapdAdapter should @@ -1879,7 +1878,7 @@ stopbss: /* Send SCC/MCC Switching event to IPA */ hdd_ipa_send_mcc_scc_msg(pHddCtx, pHddCtx->mcc_mode); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int hdd_softap_unpack_ie(tHalHandle halHandle, @@ -1910,7 +1909,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, /* Validity checks */ if ((gen_ie_len < DOT11F_IE_RSN_MIN_LEN) || (gen_ie_len > DOT11F_IE_RSN_MAX_LEN)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Skip past the EID byte and length byte */ pRsnIe = gen_ie + 2; @@ -1946,7 +1945,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, /* Validity checks */ if ((gen_ie_len < DOT11F_IE_WPA_MIN_LEN) || (gen_ie_len > DOT11F_IE_WPA_MAX_LEN)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Skip past the EID byte and length byte - and four byte WiFi OUI */ pRsnIe = gen_ie + 2 + 4; @@ -1976,9 +1975,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, *pMFPRequired = false; } else { hddLog(LOGW, FL("gen_ie[0]: %d"), gen_ie[0]); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1996,7 +1995,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, phy_ch_width target_bw) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); hdd_context_t *pHddCtx = NULL; @@ -2068,7 +2067,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, target_channel, target_bw); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("SAP set channel failed for channel = %d, bw:%d"), target_channel, target_bw); @@ -2092,7 +2091,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS vstatus; + QDF_STATUS vstatus; int ret = 0; /* success */ hdd_adapter_t *pAdapter = (netdev_priv(dev)); hdd_context_t *pHddCtx; @@ -2112,7 +2111,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, hddLog(LOG1, FL("Received data %s"), extra); vstatus = hdd_execute_global_config_command(pHddCtx, extra); - if (CDF_STATUS_SUCCESS != vstatus) { + if (QDF_STATUS_SUCCESS != vstatus) { ret = -EINVAL; } @@ -2258,7 +2257,7 @@ static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size) return; } -static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) +static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) { eSapMacAddrACL acl_mode; struct cdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS]; @@ -2271,7 +2270,7 @@ static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) p_cds_gctx = (WLAN_HDD_GET_CTX(pHostapdAdapter))->pcds_context; #endif cdf_mem_zero(&MacList[0], sizeof(MacList)); - if (CDF_STATUS_SUCCESS == wlansap_get_acl_mode(p_cds_gctx, &acl_mode)) { + if (QDF_STATUS_SUCCESS == wlansap_get_acl_mode(p_cds_gctx, &acl_mode)) { pr_info("******** ACL MODE *********\n"); switch (acl_mode) { case eSAP_ACCEPT_UNLESS_DENIED: @@ -2288,32 +2287,32 @@ static CDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) break; default: pr_info("Invalid SAP ACL Mode = %d\n", acl_mode); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS == wlansap_get_acl_accept_list(p_cds_gctx, + if (QDF_STATUS_SUCCESS == wlansap_get_acl_accept_list(p_cds_gctx, &MacList[0], &listnum)) { pr_info("******* WHITE LIST ***********\n"); if (listnum <= MAX_ACL_MAC_ADDRESS) print_mac_list(&MacList[0], listnum); } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS == wlansap_get_acl_deny_list(p_cds_gctx, + if (QDF_STATUS_SUCCESS == wlansap_get_acl_deny_list(p_cds_gctx, &MacList[0], &listnum)) { pr_info("******* BLACK LIST ***********\n"); if (listnum <= MAX_ACL_MAC_ADDRESS) print_mac_list(&MacList[0], listnum); } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int @@ -2326,7 +2325,7 @@ static __iw_softap_setparam(struct net_device *dev, int *value = (int *)extra; int sub_cmd = value[0]; int set_value = value[1]; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* success */ v_CONTEXT_t p_cds_context; hdd_context_t *hdd_ctx; @@ -2358,7 +2357,7 @@ static __iw_softap_setparam(struct net_device *dev, break; case QCSAP_PARAM_CLR_ACL: - if (CDF_STATUS_SUCCESS != wlansap_clear_acl( + if (QDF_STATUS_SUCCESS != wlansap_clear_acl( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR (pHostapdAdapter) @@ -2427,7 +2426,7 @@ static __iw_softap_setparam(struct net_device *dev, } status = sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("setMaxAssoc failure, status %d"), status); @@ -2438,11 +2437,11 @@ static __iw_softap_setparam(struct net_device *dev, case QCSAP_PARAM_HIDE_SSID: { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_hide_ssid(hHal, pHostapdAdapter->sessionId, set_value); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("QCSAP_PARAM_HIDE_SSID failed")); return status; } @@ -2463,7 +2462,7 @@ static __iw_softap_setparam(struct net_device *dev, rateUpdate.mcastDataRate5GHz = set_value; rateUpdate.bcastDataRate = -1; status = sme_send_rate_update_ind(hHal, &rateUpdate); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("SET_MC_RATE failed")); ret = -1; } @@ -2990,7 +2989,7 @@ static __iw_softap_getparam(struct net_device *dev, tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); int *value = (int *)extra; int sub_cmd = value[0]; - CDF_STATUS status; + QDF_STATUS status; int ret; hdd_context_t *hdd_ctx; @@ -3006,7 +3005,7 @@ static __iw_softap_getparam(struct net_device *dev, status = sme_cfg_get_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, (uint32_t *) value); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("failed to get WNI_CFG_ASSOC_STA_LIMIT from cfg %d"), status); @@ -3132,7 +3131,7 @@ static __iw_softap_getparam(struct net_device *dev, { hddLog(LOG1, FL("QCSAP_GET_ACL")); if (hdd_print_acl(pHostapdAdapter) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL ("QCSAP_GET_ACL returned Error: not completed")); @@ -3236,7 +3235,7 @@ int __iw_softap_modify_acl(struct net_device *dev, uint8_t pPeerStaMac[CDF_MAC_ADDR_SIZE]; int listType, cmd, i; int ret; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; ENTER(); @@ -3266,16 +3265,16 @@ int __iw_softap_modify_acl(struct net_device *dev, MAC_ADDR_ARRAY(pPeerStaMac), listType, cmd); #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_modify_acl(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter), pPeerStaMac, (eSapACLType) listType, (eSapACLCmdType) cmd); #else - cdf_status = + qdf_status = wlansap_modify_acl(p_cds_context, pPeerStaMac, (eSapACLType) listType, (eSapACLCmdType) cmd); #endif - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Modify ACL failed")); ret = -EIO; } @@ -3365,7 +3364,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, cdf_copy_macaddr(&selfMac, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_max_tx_power(hHal, bssid, selfMac, set_value)) { hddLog(LOGE, FL("Setting maximum tx power failed")); return -EIO; @@ -3414,7 +3413,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, cdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_tx_power(hHal, pHostapdAdapter->sessionId, bssid, pHostapdAdapter->device_mode, set_value)) { hddLog(LOGE, FL("Setting tx power failed")); @@ -3661,9 +3660,9 @@ static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev, } if (wlan_hdd_validate_operation_channel(adapter, value[0]) != - CDF_STATUS_SUCCESS || + QDF_STATUS_SUCCESS || wlan_hdd_validate_operation_channel(adapter, value[1]) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { return -EINVAL; } else { hdd_ctx->config->force_sap_acs_st_ch = value[0]; @@ -3704,7 +3703,7 @@ static int __iw_softap_get_channel_list(struct net_device *dev, if (0 != ret) return ret; - if (CDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &curBand)) { + if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &curBand)) { hddLog(LOGE, FL("not able get the current frequency band")); return -EIO; } @@ -3767,7 +3766,7 @@ int __iw_get_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID v_CONTEXT_t cds_ctx; #endif - CDF_STATUS status; + QDF_STATUS status; uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; @@ -3799,7 +3798,7 @@ int __iw_get_genie(struct net_device *dev, cds_ctx, #endif &length, genIeBytes); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { length = CDF_MIN(length, DOT11F_IE_RSN_MAX_LEN); if (wrqu->data.length < length || copy_to_user(wrqu->data.pointer, (void *)genIeBytes, length)) { @@ -3993,7 +3992,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); hdd_context_t *hdd_ctx; int ret; - CDF_STATUS vstatus; + QDF_STATUS vstatus; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; int key_index; struct iw_point *encoding = &wrqu->encoding; @@ -4123,7 +4122,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, vstatus = wlansap_set_key_sta(cds_ctx, &setKey); #endif - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("wlansap_set_key_sta failed, status= %d"), vstatus); ret = -EINVAL; @@ -4330,7 +4329,7 @@ static int __iw_get_ap_freq(struct net_device *dev, if (pHostapdState->bssState == BSS_STOP) { if (sme_cfg_get_int(hHal, WNI_CFG_CURRENT_CHANNEL, &channel) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { return -EIO; } else { status = hdd_wlan_get_freq(channel, &freq); @@ -4442,7 +4441,7 @@ __iw_softap_setwpsie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_hostapd_state_t *pHostapdState; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *wps_genie; uint8_t *fwps_genie; uint8_t *pos; @@ -5035,7 +5034,7 @@ __iw_softap_stopbss(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; @@ -5059,7 +5058,7 @@ __iw_softap_stopbss(struct net_device *dev, wlansap_stop_bss((WLAN_HDD_GET_CTX(pHostapdAdapter))-> pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, @@ -5076,7 +5075,7 @@ __iw_softap_stopbss(struct net_device *dev, pHostapdAdapter->sessionId); } EXIT(); - return (status == CDF_STATUS_SUCCESS) ? 0 : -EBUSY; + return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY; } static int iw_softap_stopbss(struct net_device *dev, @@ -5129,7 +5128,7 @@ static int iw_softap_version(struct net_device *dev, } static -CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, +QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, int buf_len) { uint8_t i; uint8_t maxSta = 0; @@ -5147,7 +5146,7 @@ CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); if (0 != wlan_hdd_validate_context(hdd_ctx)) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; len = scnprintf(pBuf, buf_len, sta_info_header); pBuf += len; @@ -5176,7 +5175,7 @@ CDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, } } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static int __iw_softap_get_sta_info(struct net_device *dev, @@ -5184,7 +5183,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, union iwreq_data *wrqu, char *extra) { hdd_adapter_t *pHostapdAdapter = netdev_priv(dev); - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx; int ret; @@ -5199,7 +5198,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, hdd_softap_get_sta_info(pHostapdAdapter, extra, WE_SAP_MAX_STA_INFO); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Failed to get sta info: %d"), status); return -EINVAL; } @@ -5241,7 +5240,7 @@ static int __iw_set_ap_genie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_context_t *hdd_ctx; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *genie = (uint8_t *)extra; int ret; @@ -5332,7 +5331,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, int len = sizeof(uint32_t) + 1; struct cdf_mac_addr macAddress; char pmacAddress[MAC_ADDRESS_STR_LEN + 1]; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int rc, valid, i; ENTER(); @@ -5360,7 +5359,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, /* If no mac address is passed and/or its length is less than 17, * link speed for first connected client will be returned. */ - if (wrqu->data.length < 17 || !CDF_IS_STATUS_SUCCESS(status)) { + if (wrqu->data.length < 17 || !QDF_IS_STATUS_SUCCESS(status)) { for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if (pHostapdAdapter->aStaInfo[i].isUsed && (!cdf_is_macaddr_broadcast @@ -5369,18 +5368,18 @@ int __iw_get_softap_linkspeed(struct net_device *dev, &macAddress, &pHostapdAdapter->aStaInfo[i]. macAddrSTA); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Invalid peer macaddress")); return -EINVAL; } status = wlan_hdd_get_linkspeed_for_peermac(pHostapdAdapter, macAddress); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Unable to retrieve SME linkspeed")); return -EINVAL; } @@ -5977,7 +5976,7 @@ struct net_device_ops net_ops_struct = { static int hdd_set_hostapd(hdd_adapter_t *pAdapter) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void hdd_set_ap_ops(struct net_device *pWlanHostapdDev) @@ -5985,12 +5984,12 @@ void hdd_set_ap_ops(struct net_device *pWlanHostapdDev) pWlanHostapdDev->netdev_ops = &net_ops_struct; } -CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) { hdd_hostapd_state_t *phostapdBuf; struct net_device *dev = pAdapter->dev; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS status; + QDF_STATUS status; QDF_STATUS qdf_status; #ifdef WLAN_FEATURE_MBSSID v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; @@ -6004,13 +6003,13 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) sapContext = wlansap_open(p_cds_context); if (sapContext == NULL) { hddLog(LOGE, ("ERROR: wlansap_open failed!!")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pAdapter->sessionCtx.ap.sapContext = sapContext; status = wlansap_start(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, ("ERROR: wlansap_start failed!!")); wlansap_close(sapContext); return status; @@ -6028,7 +6027,7 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) /* Set up the pointer to the Wireless Extensions state structure */ /* NOP */ status = hdd_set_hostapd(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, ("ERROR: hdd_set_hostapd failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); @@ -6065,12 +6064,12 @@ CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) /* Initialize the data path module */ status = hdd_softap_init_tx_rx(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGP, FL("hdd_softap_init_tx_rx failed")); } status = hdd_wmm_adapter_init(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "hdd_wmm_adapter_init() failed code %08d [x%08x]", status, status); @@ -6192,10 +6191,10 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, * * Return: CDF status */ -CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_lock_held) { struct net_device *dev = pAdapter->dev; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ENTER(); @@ -6203,17 +6202,17 @@ CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, if (strnchr(dev->name, strlen(dev->name), '%')) { if (dev_alloc_name(dev, dev->name) < 0) { hddLog(LOGE, FL("Failed:dev_alloc_name")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (register_netdevice(dev)) { hddLog(LOGE, FL("Failed:register_netdevice")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (register_netdev(dev)) { hddLog(LOGE, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } set_bit(NET_DEVICE_REGISTERED, &pAdapter->event_flags); @@ -6227,12 +6226,12 @@ CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, * @pAdapter: Pointer to hostapd adapter * @rtnl_held: true if rtnl lock held; false otherwise * - * Return: CDF_STATUS enumaration + * Return: QDF_STATUS enumaration */ -CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) +QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) { #ifdef WLAN_FEATURE_MBSSID - CDF_STATUS status; + QDF_STATUS status; void *sapContext = WLAN_HDD_GET_SAP_CTX_PTR(pAdapter); #endif @@ -6257,11 +6256,11 @@ CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held) #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed:wlansap_stop")); status = wlansap_close(sapContext); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed:WLANSAP_close")); pAdapter->sessionCtx.ap.sapContext = NULL; #endif @@ -6405,7 +6404,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, if ((WLAN_HDD_SOFTAP != pAdapter->device_mode) && (WLAN_HDD_P2P_GO != pAdapter->device_mode)) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; @@ -6443,7 +6442,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, ) { sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig); if (WLAN_HDD_P2P_GO == pAdapter->device_mode) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, @@ -6454,7 +6453,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, sap_config->ch_params.center_freq_seg1 = channel_seg2; } else { /* set channel to what hostapd configured */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, @@ -6919,7 +6918,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_BCN) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on Add Ie probe beacon data")); ret = -EINVAL; @@ -6942,7 +6941,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RESP add Ie data")); ret = -EINVAL; @@ -6965,7 +6964,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_ASSOC_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on Add Ie Assoc Response data")); ret = -EINVAL; @@ -7049,9 +7048,9 @@ static void wlan_hdd_set_sap_hwmode(hdd_adapter_t *pHostapdAdapter) * This function get ACS related INI paramters and populated * sap config and smeConfig for ACS needed configurations. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) +QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { tsap_Config_t *sap_config; struct hdd_config *ini_config; @@ -7165,7 +7164,7 @@ CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) } #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7316,7 +7315,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, eCsrAuthType RSNAuthType; eCsrEncryptionType RSNEncryptType; eCsrEncryptionType mcRSNEncryptType; - int status = CDF_STATUS_SUCCESS, ret; + int status = QDF_STATUS_SUCCESS, ret; int qdf_status = QDF_STATUS_SUCCESS; tpWLAN_SAPEventCB pSapEventCallback; hdd_hostapd_state_t *pHostapdState; @@ -7394,7 +7393,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, } } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pHostapdAdapter, pConfig->channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), @@ -7493,7 +7492,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->RSNWPAReqIE[1] + 2, pConfig->RSNWPAReqIE); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Now copy over all the security attributes you have * parsed out. Use the cipher type in the RSN IE */ @@ -7541,7 +7540,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->RSNWPAReqIE[1] + 2, pConfig->RSNWPAReqIE); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Now copy over all the security attributes * you have parsed out. Use the cipher type * in the RSN IE @@ -7789,7 +7788,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, #endif pSapEventCallback, pConfig, pHostapdAdapter->dev); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL); cds_set_connection_in_progress(false); hddLog(LOGE, FL("SAP Start Bss fail")); @@ -7862,7 +7861,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_context_t *pHddCtx = NULL; hdd_scaninfo_t *pScanInfo = NULL; hdd_adapter_t *staAdapter = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tSirUpdateIE updateIE; beacon_data_t *old; @@ -7897,7 +7896,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, pAdapter->device_mode); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { staAdapter = pAdapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == staAdapter->device_mode || @@ -7968,7 +7967,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, #else status = wlansap_stop_bss(pHddCtx->pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> cdf_stop_bss_event, @@ -7989,7 +7988,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, } mutex_unlock(&pHddCtx->sap_lock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Stopping the BSS")); return -EINVAL; } @@ -8002,13 +8001,13 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, updateIE.notify = true; if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), &updateIE, - eUPDATE_IE_PROBE_BCN) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_PROBE_BCN) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RSP_BCN data to PE")); } if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), &updateIE, - eUPDATE_IE_ASSOC_RESP) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_ASSOC_RESP) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on ASSOC_RSP data to PE")); } /* Reset WNI_CFG_PROBE_RSP Flags */ @@ -8139,20 +8138,20 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, } if (pHddCtx->config->policy_manager_enabled) { status = cdf_reset_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); status = cds_current_connections_update(pAdapter->sessionId, channel, CDS_UPDATE_REASON_START_AP); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = cdf_wait_for_connection_update(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("ERROR: cdf wait for event failed!!"); return -EINVAL; } @@ -8292,7 +8291,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, status = wlan_hdd_cfg80211_alloc_new_beacon(pAdapter, &new, params, 0); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("new beacon alloc failed")); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 1fb38dfa231f..cf533547921b 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -50,9 +50,9 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, tSirMacAddr macAddr, uint8_t *name); -CDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_held); +QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_held); -CDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held); +QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held); eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4]); @@ -73,7 +73,7 @@ hdd_translate_wpa_to_csr_auth_type(uint8_t auth_suite[4]); eCsrEncryptionType hdd_translate_wpa_to_csr_encryption_type(uint8_t cipher_suite[4]); -CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *, +QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *, struct tagCsrDelStaParams *); void hdd_softap_sta_disassoc(hdd_adapter_t *, uint8_t *); void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *, bool); @@ -85,9 +85,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, bool *pMFPRequired, uint16_t gen_ie_len, uint8_t *gen_ie); -CDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, +QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, void *usrDataForCallback); -CDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter); +QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter); void hdd_set_ap_ops(struct net_device *pWlanHostapdDev); int hdd_hostapd_stop(struct net_device *dev); void hdd_hostapd_channel_wakelock_init(hdd_context_t *pHddCtx); @@ -96,7 +96,7 @@ void hdd_hostapd_channel_wakelock_deinit(hdd_context_t *pHddCtx); void hdd_restart_softap(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter); #endif /* FEATURE_WLAN_FORCE_SAP_SCC */ #ifdef QCA_HT_2040_COEX -CDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, +QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, uint8_t channel_type); #endif @@ -112,5 +112,5 @@ int wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_beacon_data *params); -CDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter); +QDF_STATUS wlan_hdd_config_acs(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter); #endif /* end #if !defined(WLAN_HDD_HOSTAPD_H) */ diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index f86143ee044c..79e10689f3db 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -180,13 +180,13 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, } static -CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, +QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, const uint8_t tid, tAniTrafStrmMetrics *tsm_metrics) { hdd_station_ctx_t *hdd_sta_ctx = NULL; - CDF_STATUS hstatus; - CDF_STATUS vstatus = CDF_STATUS_SUCCESS; + QDF_STATUS hstatus; + QDF_STATUS vstatus = QDF_STATUS_SUCCESS; unsigned long rc; struct statsContext context; hdd_context_t *hdd_ctx = NULL; @@ -194,7 +194,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, if (NULL == adapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: adapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -210,10 +210,10 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hdd_sta_ctx->conn_info.staId[0], hdd_sta_ctx->conn_info.bssId, &context, hdd_ctx->pcds_context, tid); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); - vstatus = CDF_STATUS_E_FAULT; + vstatus = QDF_STATUS_E_FAULT; } else { /* request was sent -- wait for the response */ rc = wait_for_completion_timeout(&context.completion, @@ -222,7 +222,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timed out while retrieving statistics", __func__); - vstatus = CDF_STATUS_E_TIMEOUT; + vstatus = QDF_STATUS_E_TIMEOUT; } } @@ -243,7 +243,7 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, context.magic = 0; spin_unlock(&hdd_context_lock); - if (CDF_STATUS_SUCCESS == vstatus) { + if (QDF_STATUS_SUCCESS == vstatus) { tsm_metrics->UplinkPktQueueDly = adapter->tsmStats.UplinkPktQueueDly; cdf_mem_copy(tsm_metrics->UplinkPktQueueDlyHist, @@ -566,7 +566,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, } /* Check channel number is a valid channel number */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, channel)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d", __func__, channel); @@ -1107,7 +1107,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, { uint8_t channel_list[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint8_t num_chan = 0; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; @@ -1135,7 +1135,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, sme_change_roam_scan_channel_list(hdd_ctx->hHal, adapter->sessionId, channel_list, num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -1174,7 +1174,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, uint8_t num_chan; int i; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* array of values begins after "SETROAMSCANCHANNELS " */ @@ -1208,7 +1208,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, sme_change_roam_scan_channel_list(hdd_ctx->hHal, adapter->sessionId, channel_list, num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -1278,7 +1278,7 @@ hdd_parse_set_roam_scan_channels(hdd_adapter_t *adapter, const char *command) * * Return: 0 for success non-zero for failure */ -CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) +QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) { uint8_t *cmdPtr = NULL; int count, content = 0, ret = 0; @@ -1287,11 +1287,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* move to argument list */ cmdPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* no space after the command */ if (SPACE_ASCII_VALUE != *cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1300,17 +1300,17 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* START/STOP PLM req */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->enable = content; cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1319,11 +1319,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* Dialog token of radio meas req containing meas reqIE */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->diag_token = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "diag token %d", @@ -1331,7 +1331,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1340,11 +1340,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* measurement token of meas req IE */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->meas_token = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "meas token %d", @@ -1357,7 +1357,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1366,14 +1366,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* total number of bursts after which STA stops sending */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->numBursts = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "num burst %d", @@ -1381,7 +1381,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1390,14 +1390,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* burst interval in seconds */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->burstInt = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "burst Int %d", @@ -1405,7 +1405,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1414,14 +1414,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* Meas dur in TU's,STA goes off-ch and transmit PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->measDuration = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "measDur %d", @@ -1429,7 +1429,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1438,14 +1438,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* burst length of PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->burstLen = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "burstLen %d", @@ -1453,7 +1453,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1462,14 +1462,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* desired tx power for transmission of PLM bursts */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->desiredTxPwr = content; hddLog(CDF_TRACE_LEVEL_DEBUG, @@ -1479,7 +1479,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) @@ -1488,11 +1488,11 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 16, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->mac_addr.bytes[count] = content; } @@ -1503,7 +1503,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) && ('\0' != *cmdPtr)) @@ -1512,14 +1512,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) /* number of channels */ ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->plmNumCh = content; hddLog(CDF_TRACE_LEVEL_DEBUG, "numch %d", @@ -1530,7 +1530,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* remove empty spaces */ while ((SPACE_ASCII_VALUE == *cmdPtr) @@ -1539,14 +1539,14 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) ret = sscanf(cmdPtr, "%31s ", buf); if (1 != ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; ret = kstrtos32(buf, 10, &content); if (ret < 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (content <= 0) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pPlmRequest->plmChList[count] = content; hddLog(CDF_TRACE_LEVEL_DEBUG, " ch- %d", @@ -1554,7 +1554,7 @@ CDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) } } /* If PLM START */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -1577,7 +1577,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, tpSirExtWoWParams arg_params) { tSirExtWoWParams params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); int rc; @@ -1589,7 +1589,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, cdf_ret_status = sme_configure_ext_wow(hHal, ¶ms, &wlan_hdd_ready_to_extwow, hdd_ctx); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_ext_wow returned failure %d"), cdf_ret_status); @@ -1621,7 +1621,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, return rc; } cdf_ret_status = wlan_hdd_bus_suspend(state); - if (cdf_ret_status != CDF_STATUS_SUCCESS) { + if (cdf_ret_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", __func__, cdf_ret_status); @@ -1685,12 +1685,12 @@ static int hdd_set_app_type1_params(tHalHandle hHal, tpSirAppType1Params arg_params) { tSirAppType1Params params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type1_params returned failure %d"), cdf_ret_status); @@ -1743,12 +1743,12 @@ static int hdd_set_app_type2_params(tHalHandle hHal, tpSirAppType2Params arg_params) { tSirAppType2Params params; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type2_params returned failure %d"), cdf_ret_status); @@ -2105,7 +2105,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); struct statsContext context; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; if (cds_is_driver_recovering()) { @@ -2137,7 +2137,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) hstatus = sme_get_link_status(WLAN_HDD_GET_HAL_CTX(adapter), hdd_get_link_status_cb, &context, adapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve link status", __func__); /* return a cached value */ @@ -2399,7 +2399,7 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe, int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) { tSirRateUpdateInd rateUpdate = {0}; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); struct hdd_config *pConfig = NULL; @@ -2433,7 +2433,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); status = sme_send_rate_update_ind(pHddCtx->hHal, &rateUpdate); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed", __func__); return -EFAULT; @@ -2557,7 +2557,7 @@ static int drv_cmd_country(hdd_adapter_t *adapter, hdd_priv_data_t *priv_data) { int ret = 0; - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; char *country_code; @@ -2572,7 +2572,7 @@ static int drv_cmd_country(hdd_adapter_t *adapter, hdd_ctx->pcds_context, eSIR_TRUE, eSIR_TRUE); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { rc = wait_for_completion_timeout( &adapter->change_country_code, msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY)); @@ -2600,7 +2600,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, uint8_t *value = command; int8_t rssi = 0; uint8_t lookUpThreshold = CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_DEFAULT; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* Move pointer to ahead of SETROAMTRIGGER */ value = value + command_len + 1; @@ -2648,7 +2648,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, status = sme_set_neighbor_lookup_rssi_threshold(hdd_ctx->hHal, adapter->sessionId, lookUpThreshold); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set roam trigger, try again", @@ -3131,7 +3131,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, char extra[128] = { 0 }; int len; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_get_roam_scan_channel_list(hdd_ctx->hHal, ChannelList, &numChannels, @@ -4160,7 +4160,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, msg.type = SIR_HAL_ROAM_INVOKE; msg.reserved = 0; msg.bodyptr = fastreassoc; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(fastreassoc); CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4237,7 +4237,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, } /* Check channel number is a valid channel number */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; @@ -4272,7 +4272,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, { int ret = 0; uint8_t *value = command; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirPlmReq pPlmRequest = NULL; pPlmRequest = cdf_mem_malloc(sizeof(tSirPlmReq)); @@ -4282,7 +4282,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, } status = hdd_parse_plm_cmd(value, pPlmRequest); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; @@ -4291,7 +4291,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, pPlmRequest->sessionId = adapter->sessionId; status = sme_set_plm_request(hdd_ctx->hHal, pPlmRequest); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { cdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; @@ -4600,7 +4600,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, uint8_t command_len, hdd_priv_data_t *priv_data) { - CDF_STATUS ret_status; + QDF_STATUS ret_status; int ret = 0; tHalHandle hHal; uint8_t filterType = 0; @@ -4646,7 +4646,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, pHddCtx->miracast_value = filterType; ret_status = sme_set_miracast(hHal, filterType); - if (CDF_STATUS_SUCCESS != ret_status) { + if (QDF_STATUS_SUCCESS != ret_status) { hddLog(LOGE, "Failed to set miracast"); return -EBUSY; } @@ -4669,7 +4669,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, uint8_t *value = command; uint8_t ChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint8_t numChannels = 0; - CDF_STATUS status; + QDF_STATUS status; ret = hdd_parse_channellist(value, ChannelList, &numChannels); if (ret) { @@ -4693,7 +4693,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, adapter->sessionId, ChannelList, numChannels); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", @@ -4769,7 +4769,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, CDF_TRACE_LEVEL_INFO, "%s: Received Command to get tsm stats tid = %d", __func__, tid); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4878,7 +4878,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, int ret; uint8_t *value = command; tCsrEseBeaconReq eseBcnReq; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", @@ -4909,13 +4909,13 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, adapter->sessionId, &eseBcnReq); - if (CDF_STATUS_E_RESOURCES == status) { + if (QDF_STATUS_E_RESOURCES == status) { hddLog(CDF_TRACE_LEVEL_INFO, FL("sme_set_ese_beacon_request failed (%d), a request already in progress"), status); ret = -EBUSY; goto exit; - } else if (CDF_STATUS_SUCCESS != status) { + } else if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_ese_beacon_request failed (%d)", @@ -4960,8 +4960,8 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, int ret = 0; int status; int txPower; - CDF_STATUS cdf_status; - CDF_STATUS smeStatus; + QDF_STATUS qdf_status; + QDF_STATUS smeStatus; uint8_t *value = command; struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER; struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -4977,9 +4977,9 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, goto exit; } - cdf_status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode); + qdf_status = hdd_get_front_adapter(hdd_ctx, &pAdapterNode); while (NULL != pAdapterNode - && CDF_STATUS_SUCCESS == cdf_status) { + && QDF_STATUS_SUCCESS == qdf_status) { adapter = pAdapterNode->pAdapter; /* Assign correct self MAC address */ cdf_copy_macaddr(&bssid, @@ -4995,7 +4995,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, smeStatus = sme_set_max_tx_power(hdd_ctx->hHal, bssid, selfMac, txPower); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:Set max tx power failed", __func__); @@ -5005,7 +5005,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, hddLog(CDF_TRACE_LEVEL_INFO, "%s: Set max tx power success", __func__); - cdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, + qdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, &pNext); pAdapterNode = pNext; } @@ -5910,7 +5910,7 @@ static int drv_cmd_set_fcc_channel(hdd_adapter_t *adapter, { uint8_t *value; uint8_t fcc_constraint; - CDF_STATUS status; + QDF_STATUS status; int ret = 0; /* @@ -5936,7 +5936,7 @@ static int drv_cmd_set_fcc_channel(hdd_adapter_t *adapter, } status = sme_disable_non_fcc_channel(hdd_ctx->hHal, !fcc_constraint); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("sme disable fn. returned err"); ret = -EPERM; } diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index d15388e45a45..6199d4d7b599 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1234,7 +1234,7 @@ static void hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) { struct hdd_ipa_priv *hdd_ipa = context; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* * When SSR is going on or driver is unloading, just return. @@ -1354,7 +1354,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) struct IpaHwStatsWDIInfoData_t ipa_stat; struct hdd_ipa_priv *hdd_ipa; hdd_context_t *hdd_ctx; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!op_msg || !usr_ctxt) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__); @@ -1664,7 +1664,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, ipa_offload_enable_disable.vdev_id, ipa_offload_enable_disable.enable); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_ipa_offload_enable_disable(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, &ipa_offload_enable_disable)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, @@ -1716,7 +1716,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx) struct hdd_ipa_priv *hdd_ipa; struct op_msg_type *msg; struct uc_op_work_struct *uc_op_work; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -1775,9 +1775,9 @@ static void hdd_ipa_init_uc_op_work(struct work_struct *work, * hdd_ipa_uc_ol_init() - Initialize IPA uC offload * @hdd_ctx: Global HDD context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) +static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) { struct ipa_wdi_in_params pipe_in; struct ipa_wdi_out_params pipe_out; @@ -1879,7 +1879,7 @@ static CDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) ipa_ctxt->uc_op_work[i].msg = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2827,7 +2827,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, struct hdd_ipa_iface_context *iface_context; cdf_nbuf_t skb; struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; iface_context = (struct hdd_ipa_iface_context *)priv; if (evt != IPA_RECEIVE) { @@ -3511,7 +3511,7 @@ static void hdd_ipa_msg_free_fn(void *buff, uint32_t len, uint32_t type) int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) { hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter; struct ipa_msg_meta meta; struct ipa_wlan_msg *msg; @@ -3523,7 +3523,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) if (!pHddCtx->mcc_mode) { /* Flush TxRx queue for each adapter before switch to SCC */ status = hdd_get_front_adapter(pHddCtx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { pAdapter = adapter_node->pAdapter; if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || pAdapter->device_mode == WLAN_HDD_SOFTAP) { @@ -4002,16 +4002,16 @@ static inline char *hdd_ipa_rm_state_to_str(enum hdd_ipa_rm_state state) * Allocate hdd_ipa resources, ipa pipe resource and register * wlan interface with IPA module. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = NULL; int ret, i; struct hdd_ipa_iface_context *iface_context = NULL; if (!hdd_ipa_is_enabled(hdd_ctx)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; hdd_ipa = cdf_mem_malloc(sizeof(*hdd_ipa)); if (!hdd_ipa) { @@ -4097,7 +4097,7 @@ CDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) goto fail_create_sys_pipe; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail_create_sys_pipe: hdd_ipa_destroy_rm_resource(hdd_ipa); @@ -4108,7 +4108,7 @@ fail_get_resource: hdd_ctx->hdd_ipa = NULL; ghdd_ipa = NULL; fail_return: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -4133,9 +4133,9 @@ void hdd_ipa_cleanup_pending_event(struct hdd_ipa_priv *hdd_ipa) * hdd_ipa_cleanup - IPA cleanup function * @hdd_ctx: HDD global context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = hdd_ctx->hdd_ipa; int i; @@ -4144,7 +4144,7 @@ CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; if (!hdd_ipa_is_enabled(hdd_ctx)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (!hdd_ipa_uc_is_enabled(hdd_ctx)) { unregister_inetaddr_notifier(&hdd_ipa->ipv4_notifier); @@ -4222,6 +4222,6 @@ CDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) cdf_mem_free(hdd_ipa); hdd_ctx->hdd_ipa = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 65e09be75e62..1f26a1bb802e 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -589,15 +589,15 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) ((eCSR_CFG_DOT11_MODE_11AC_ONLY == pHddStaCtx->conn_info.dot11Mode) || (eCSR_CFG_DOT11_MODE_11AC == pHddStaCtx->conn_info.dot11Mode))) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* need to issue a disconnect to CSR. */ INIT_COMPLETION(adapter->disconnect_comp_var); - cdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(adapter), + qdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { unsigned long rc; rc = wait_for_completion_timeout( @@ -618,10 +618,10 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) * which will send it to firmware if FW supports IBSS power save * before vdev start. * - * Return: CDF_STATUS CDF_STATUS_SUCCESS on Success and CDF_STATUS_E_FAILURE + * Return: QDF_STATUS QDF_STATUS_SUCCESS on Success and QDF_STATUS_E_FAILURE * on failure. */ -CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) +QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) { int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -629,7 +629,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (hdd_ctx == NULL) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -639,7 +639,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_ATIM_WINDOW_SIZE failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -650,7 +650,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_SAVE_ALLOWED failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -661,7 +661,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_COLLAPSE_ALLOWED failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -671,7 +671,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_AWAKE_ON_TX_RX failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -681,7 +681,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) if (0 != ret) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_INACTIVITY_TIME failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -694,7 +694,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) "WMA_VDEV_IBSS_SET_TXSP_END_INACTIVITY_TIME failed %d" ), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -705,7 +705,7 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hddLog(CDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_PS_SET_WARMUP_TIME_SECS failed %d"), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wma_cli_set_command(adapter->sessionId, @@ -718,10 +718,10 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) "WMA_VDEV_IBSS_PS_SET_1RX_CHAIN_IN_ATIM_WINDOW failed %d" ), ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #define INTF_MACADDR_MASK 0x7 @@ -818,7 +818,7 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, struct wma_tgt_ht_cap *cfg) { - CDF_STATUS status; + QDF_STATUS status; uint32_t value, val32; uint16_t val16; struct hdd_config *pconfig = hdd_ctx->config; @@ -833,7 +833,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, /* get the MPDU density */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU DENSITY")); value = 0; @@ -848,14 +848,14 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, cfg->mpdu_density); - if (status == CDF_STATUS_E_FAILURE) + if (status == QDF_STATUS_E_FAILURE) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set MPDU DENSITY to CCM")); } /* get the HT capability info */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, &val32); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get HT capability info")); return; @@ -888,7 +888,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, if (sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE, HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CCM" @@ -900,7 +900,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, (hdd_ctx->hHal, WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE, HDD_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_1_1) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1 to CCM" @@ -913,13 +913,13 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, val32 = val16; status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, val32); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set HT capability to CCM")); #define WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES 0xff value = SIZE_OF_SUPPORTED_MCS_SET; if (sme_cfg_get_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, - &value) == CDF_STATUS_SUCCESS) { + &value) == QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO, FL("Read MCS rate set")); if (pconfig->enable2x2) { @@ -932,7 +932,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, SIZE_OF_SUPPORTED_MCS_SET); - if (status == CDF_STATUS_E_FAILURE) + if (status == QDF_STATUS_E_FAILURE) hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set MCS SET to CCM")); } @@ -944,7 +944,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, struct wma_tgt_vht_cap *cfg) { - CDF_STATUS status; + QDF_STATUS status; uint32_t value = 0; struct hdd_config *pconfig = hdd_ctx->config; struct wiphy *wiphy = hdd_ctx->wiphy; @@ -956,7 +956,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MAX_MPDU_LENGTH, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; } @@ -971,7 +971,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MAX_MPDU_LENGTH, cfg->vht_max_mpdu); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT MAX MPDU LENGTH")); } @@ -982,7 +982,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SUPPORTED_CHAN_WIDTH_SET, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; @@ -993,7 +993,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_LDPC_CODING_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT LDPC CODING CAP")); value = 0; @@ -1005,7 +1005,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_LDPC_CODING_CAP, cfg->vht_rx_ldpc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT LDPC CODING CAP to CCM")); } @@ -1015,7 +1015,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_SHORT_GI_80MHZ, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80MHZ")); value = 0; @@ -1027,7 +1027,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SHORT_GI_80MHZ, cfg->vht_short_gi_80); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set SHORT GI 80MHZ to CCM")); } @@ -1038,7 +1038,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SHORT_GI_160_AND_80_PLUS_80MHZ, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80 & 160")); value = 0; @@ -1047,7 +1047,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT TX STBC cap */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT TX STBC")); value = 0; @@ -1058,7 +1058,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, cfg->vht_tx_stbc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TX STBC to CCM")); } @@ -1067,7 +1067,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT RX STBC cap */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT RX STBC")); value = 0; @@ -1078,7 +1078,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, cfg->vht_rx_stbc); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT RX STBC to CCM")); } @@ -1088,7 +1088,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_SU_BEAMFORMER_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT SU BEAMFORMER CAP")); value = 0; @@ -1100,7 +1100,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SU_BEAMFORMER_CAP, cfg->vht_su_bformer); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMER CAP")); } @@ -1114,7 +1114,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_SU_BEAMFORMEE_CAP, pconfig->enableTxBF); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMEE CAP")); } @@ -1123,7 +1123,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MU_BEAMFORMER_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMER CAP")); value = 0; @@ -1135,7 +1135,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MU_BEAMFORMER_CAP, cfg->vht_mu_bformer); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "could not set the VHT MU BEAMFORMER CAP to CCM" @@ -1147,7 +1147,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMEE CAP")); value = 0; @@ -1159,7 +1159,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_MU_BEAMFORMEE_CAP, cfg->vht_mu_bformee); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set VHT MU BEAMFORMER CAP")); } @@ -1169,7 +1169,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT AMPDU LEN")); value = 0; @@ -1188,7 +1188,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, WNI_CFG_VHT_AMPDU_LEN_EXPONENT, cfg->vht_max_ampdu_len_exp); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT AMPDU LEN EXP")); } @@ -1197,7 +1197,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, /* Get VHT TXOP PS CAP */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, &value); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get VHT TXOP PS")); value = 0; @@ -1208,7 +1208,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, cfg->vht_txop_ps); - if (status == CDF_STATUS_E_FAILURE) { + if (status == QDF_STATUS_E_FAILURE) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TXOP PS")); } @@ -1352,7 +1352,7 @@ bool hdd_dfs_indicate_radar(void *context, void *param) (struct wma_dfs_radar_ind *)param; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx || !hdd_radar_event || hdd_ctx->config->disableDFSChSwitch) @@ -1373,7 +1373,7 @@ bool hdd_dfs_indicate_radar(void *context, void *param) mutex_unlock(&hdd_ctx->dfs_lock); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (WLAN_HDD_SOFTAP == adapter->device_mode || WLAN_HDD_P2P_GO == adapter->device_mode) { @@ -1636,7 +1636,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; struct sockaddr *psta_mac_addr = addr; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; int ret; ENTER(); @@ -1931,51 +1931,51 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, return adapter; } -CDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, +QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, bool rtnl_held) { struct net_device *pWlanDev = adapter->dev; /* hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; */ /* hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX( adapter ); */ - /* CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; */ + /* QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; */ if (rtnl_held) { if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) { if (dev_alloc_name(pWlanDev, pWlanDev->name) < 0) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:dev_alloc_name")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (register_netdevice(pWlanDev)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (register_netdev(pWlanDev)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } set_bit(NET_DEVICE_REGISTERED, &adapter->event_flags); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS hdd_sme_close_session_callback(void *pContext) +static QDF_STATUS hdd_sme_close_session_callback(void *pContext) { hdd_adapter_t *adapter = pContext; if (NULL == adapter) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("NULL adapter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid magic")); - return CDF_STATUS_NOT_INITIALIZED; + return QDF_STATUS_NOT_INITIALIZED; } clear_bit(SME_SESSION_OPENED, &adapter->event_flags); @@ -2007,16 +2007,16 @@ static CDF_STATUS hdd_sme_close_session_callback(void *pContext) if (WLAN_HDD_ADAPTER_MAGIC == adapter->magic) complete(&adapter->session_close_comp_var); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) +QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) { struct net_device *pWlanDev = adapter->dev; hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t type, subType; unsigned long rc; int ret_val; @@ -2024,7 +2024,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) INIT_COMPLETION(adapter->session_open_comp_var); sme_set_curr_device_mode(hdd_ctx->hHal, adapter->device_mode); status = cds_get_vdev_types(adapter->device_mode, &type, &subType); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("failed to get vdev type")); goto error_sme_open; } @@ -2033,11 +2033,11 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter, (uint8_t *) &adapter->macAddressCurrent, &adapter->sessionId, type, subType); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(LOGP, FL("sme_open_session() failed, status code %08d [x%08x]"), cdf_ret_status, cdf_ret_status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_sme_open; } /* Block on a completion variable. Can't wait forever though. */ @@ -2048,17 +2048,17 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) hddLog(LOGP, FL("Session is not opened within timeout period code %ld"), rc); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_sme_open; } /* Register wireless extensions */ cdf_ret_status = hdd_register_wext(pWlanDev); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(LOGP, FL("hdd_register_wext() failed, status code %08d [x%08x]"), cdf_ret_status, cdf_ret_status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto error_register_wext; } /* Set the Connection State to Not Connected */ @@ -2074,7 +2074,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM; status = hdd_init_tx_rx(adapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("hdd_init_tx_rx() failed, status code %08d [x%08x]"), status, status); @@ -2084,7 +2084,7 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) set_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags); status = hdd_wmm_adapter_init(adapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("hdd_wmm_adapter_init() failed, status code %08d [x%08x]"), status, status); @@ -2105,14 +2105,14 @@ CDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) } #ifdef FEATURE_WLAN_TDLS if (0 != wlan_hdd_tdls_init(adapter)) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; hddLog(LOGE, FL("wlan_hdd_tdls_init failed")); goto error_tdls_init; } set_bit(TDLS_INIT_DONE, &adapter->event_flags); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #ifdef FEATURE_WLAN_TDLS error_tdls_init: @@ -2127,7 +2127,7 @@ error_init_txrx: error_register_wext: if (test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { INIT_COMPLETION(adapter->session_close_comp_var); - if (CDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, + if (QDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, adapter->sessionId, hdd_sme_close_session_callback, adapter)) { @@ -2263,24 +2263,24 @@ void hdd_cleanup_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, } } -CDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, tSirMacAddr macAddr) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && cdf_mem_compare(adapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr))) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); adapterNode = pNext; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, const char *iface_name, tSirMacAddr macAddr, @@ -2288,7 +2288,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, { hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *pHddAdapterNode = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_cfg80211_state_t *cfgState; int ret; @@ -2316,7 +2316,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, return NULL; } status = hdd_check_for_existing_macaddr(hdd_ctx, macAddr); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { hddLog(CDF_TRACE_LEVEL_ERROR, "Duplicate MAC addr: " MAC_ADDRESS_STR " already exists", @@ -2353,7 +2353,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter->device_mode = session_type; status = hdd_init_station_mode(adapter); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto err_free_netdev; hdd_lro_enable(hdd_ctx, adapter); @@ -2384,7 +2384,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #endif #endif status = hdd_register_interface(adapter, rtnl_held); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held); goto err_lro_cleanup; } @@ -2422,11 +2422,11 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter->device_mode = session_type; status = hdd_init_ap_mode(adapter); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto err_free_netdev; status = hdd_register_hostapd(adapter, rtnl_held); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held); goto err_free_netdev; } @@ -2480,19 +2480,19 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, cfgState = WLAN_HDD_GET_CFG_STATE_PTR(adapter); mutex_init(&cfgState->remain_on_chan_ctx_lock); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Add it to the hdd's session list. */ pHddAdapterNode = cdf_mem_malloc(sizeof(hdd_adapter_list_node_t)); if (NULL == pHddAdapterNode) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { pHddAdapterNode->pAdapter = adapter; status = hdd_add_adapter_back(hdd_ctx, pHddAdapterNode); } } - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { if (NULL != adapter) { hdd_cleanup_adapter(hdd_ctx, adapter, rtnl_held); adapter = NULL; @@ -2503,7 +2503,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, return NULL; } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cds_set_concurrency_mode(session_type); /* Initialize the WoWL service */ @@ -2665,14 +2665,14 @@ err_free_netdev: return NULL; } -CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, +QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, bool rtnl_held) { hdd_adapter_list_node_t *adapterNode, *pCurrent, *pNext; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &pCurrent); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"), status); return status; @@ -2680,13 +2680,13 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, while (pCurrent->pAdapter != adapter) { status = hdd_get_next_adapter(hdd_ctx, pCurrent, &pNext); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) break; pCurrent = pNext; } adapterNode = pCurrent; - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cds_clear_concurrency_mode(adapter->device_mode); hdd_cleanup_adapter(hdd_ctx, adapterNode->pAdapter, rtnl_held); @@ -2699,9 +2699,9 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, hdd_ctx->current_intf_count--; /* Fw will take care incase of concurrency */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2713,25 +2713,25 @@ CDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, * * Return: CDF status code */ -CDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) +QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) { hdd_adapter_list_node_t *pHddAdapterNode; - CDF_STATUS status; + QDF_STATUS status; ENTER(); do { status = hdd_remove_front_adapter(hdd_ctx, &pHddAdapterNode); - if (pHddAdapterNode && CDF_STATUS_SUCCESS == status) { + if (pHddAdapterNode && QDF_STATUS_SUCCESS == status) { hdd_cleanup_adapter(hdd_ctx, pHddAdapterNode->pAdapter, rtnl_held); cdf_mem_free(pHddAdapterNode); } - } while (NULL != pHddAdapterNode && CDF_STATUS_E_EMPTY != status); + } while (NULL != pHddAdapterNode && QDF_STATUS_E_EMPTY != status); EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) @@ -2775,15 +2775,15 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) updateIE.notify = false; if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pHostapdAdapter), &updateIE, - eUPDATE_IE_PROBE_RESP) == CDF_STATUS_E_FAILURE) { + eUPDATE_IE_PROBE_RESP) == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Could not pass on PROBE_RSP_BCN data to PE")); } } -CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, +QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, const bool bCloseSession) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); union iwreq_data wrqu; tSirUpdateIE updateIE; @@ -2815,7 +2815,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, adapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); /* success implies disconnect command got queued up successfully */ - if (cdf_ret_status == CDF_STATUS_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_SUCCESS) { rc = wait_for_completion_timeout( &adapter->disconnect_comp_var, msecs_to_jiffies @@ -2862,7 +2862,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (true == bCloseSession && test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { INIT_COMPLETION(adapter->session_close_comp_var); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_close_session(hdd_ctx->hHal, adapter->sessionId, hdd_sme_close_session_callback, adapter)) { @@ -2905,7 +2905,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) { - CDF_STATUS status; + QDF_STATUS status; QDF_STATUS qdf_status; /* Stop Bss. */ @@ -2917,7 +2917,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, (WLAN_HDD_GET_CTX(adapter))->pcds_context); #endif - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { hdd_hostapd_state_t *hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); qdf_event_reset(&hostapd_state-> @@ -2952,7 +2952,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, /* Probe bcn reset */ if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_PROBE_BCN) - == CDF_STATUS_E_FAILURE) { + == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on PROBE_RSP_BCN data to PE" @@ -2962,7 +2962,7 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), &updateIE, eUPDATE_IE_ASSOC_RESP) == - CDF_STATUS_E_FAILURE) { + QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL( "Could not pass on ASSOC_RSP data to PE" @@ -2984,20 +2984,20 @@ CDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, } EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hdd_stop_adapter(hdd_ctx, adapter, true); status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); @@ -3006,20 +3006,20 @@ CDF_STATUS hdd_stop_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hddLog(LOG1, FL("Disabling queues")); wlan_hdd_netif_queue_control(adapter, @@ -3042,13 +3042,13 @@ CDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; #ifndef MSM_PLATFORM struct cdf_mac_addr bcastMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -3059,7 +3059,7 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; hdd_wmm_init(adapter); @@ -3142,10 +3142,10 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; @@ -3156,7 +3156,7 @@ CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode, hdd_adapter_list_node_t **pNextAdapterNode) { @@ -3170,7 +3170,7 @@ CDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; @@ -3181,7 +3181,7 @@ CDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; @@ -3192,7 +3192,7 @@ CDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; @@ -3203,10 +3203,10 @@ CDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, return status; } -CDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, +QDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { - CDF_STATUS status; + QDF_STATUS status; cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_front(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); @@ -3219,11 +3219,11 @@ hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter @@ -3244,17 +3244,17 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, &adapterNode); + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while ((NULL != adapterNode) && (CDF_STATUS_SUCCESS == cdf_status)) { + while ((NULL != adapterNode) && (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapterNode->pAdapter; if (adapter->sessionId == vdev_id) return adapter; - cdf_status = + qdf_status = hdd_get_next_adapter(hdd_ctx, adapterNode, &pNext); adapterNode = pNext; } @@ -3281,20 +3281,20 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, { hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; hdd_adapter_t *adapter; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; - cdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); + qdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node); while ((NULL != adapter_node) && - (CDF_STATUS_SUCCESS == cdf_status)) { + (QDF_STATUS_SUCCESS == qdf_status)) { adapter = adapter_node->pAdapter; if (adapter && adapter->sessionId == sme_session_id) return adapter; - cdf_status = + qdf_status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); adapter_node = next; @@ -3306,11 +3306,11 @@ hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && (mode == adapter->device_mode)) @@ -3342,13 +3342,13 @@ hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; uint8_t operatingChannel = 0; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (mode == adapter->device_mode) { @@ -3387,18 +3387,18 @@ uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) return operatingChannel; } -static inline CDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * +static inline QDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || @@ -3415,20 +3415,20 @@ static inline CDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; ENTER(); status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || @@ -3445,7 +3445,7 @@ CDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_NS_OFFLOAD @@ -3662,7 +3662,7 @@ static void hdd_free_context(hdd_context_t *hdd_ctx) void hdd_wlan_exit(hdd_context_t *hdd_ctx) { v_CONTEXT_t p_cds_context = hdd_ctx->pcds_context; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct wiphy *wiphy = hdd_ctx->wiphy; ENTER(); @@ -3704,7 +3704,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate Bus bandwidth timer")); @@ -3717,7 +3717,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->skip_acs_scan_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate ACS Skip timer")); @@ -3729,7 +3729,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mc_timer_destroy( &hdd_ctx->dbs_opportunistic_timer))) { hdd_err("Cannot deallocate dbs opportunistic timer"); @@ -3754,11 +3754,11 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_stop_all_adapters(hdd_ctx); /* Stop all the modules */ - cdf_status = cds_disable(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_disable(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to stop CDS")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* @@ -3766,11 +3766,11 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) * is scheduled after the each module close is called i.e after all the * data structures are freed. */ - cdf_status = cds_sched_close(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_sched_close(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK /* Destroy the wake lock */ @@ -3805,7 +3805,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) qdf_list_destroy(&hdd_ctx->hdd_roc_req_q); qdf_list_destroy(&hdd_ctx->hdd_scan_req_q); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -3877,7 +3877,7 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, struct cdf_mac_addr macAddrSTA, int channel_type) { int status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = NULL; hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3890,9 +3890,9 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, if (!hdd_ctx->hHal) return -EINVAL; - cdf_status = sme_notify_ht2040_mode(hdd_ctx->hHal, staId, macAddrSTA, + qdf_status = sme_notify_ht2040_mode(hdd_ctx->hHal, staId, macAddrSTA, adapter->sessionId, channel_type); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, "Fail to send notification with ht2040 mode"); return -EINVAL; } @@ -3912,7 +3912,7 @@ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, int hdd_wlan_notify_modem_power_state(int state) { int status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); @@ -3924,8 +3924,8 @@ int hdd_wlan_notify_modem_power_state(int state) if (!hdd_ctx->hHal) return -EINVAL; - cdf_status = sme_notify_modem_power_state(hdd_ctx->hHal, state); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = sme_notify_modem_power_state(hdd_ctx->hHal, state); + if (QDF_STATUS_SUCCESS != qdf_status) { hddLog(LOGE, "Fail to send notification with modem power state %d", state); @@ -3941,25 +3941,25 @@ int hdd_wlan_notify_modem_power_state(int state) * * Return: None */ -CDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) { - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /* * Send ready indication to the HDD. This will kick off the MAC * into a 'running' state and should kick off an initial scan. */ cdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL( "sme_hdd_ready_ind() failed with status code %08d [x%08x]" ), cdf_ret_status, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wake lock APIs for HDD */ @@ -4002,7 +4002,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) tSirVersionType versionReported; tSirVersionString versionString; uint8_t fwFeatCapsMsgSupported = 0; - CDF_STATUS vstatus; + QDF_STATUS vstatus; memset(&versionCompiled, 0, sizeof(versionCompiled)); memset(&versionReported, 0, sizeof(versionReported)); @@ -4012,7 +4012,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_compiled_version(hdd_ctx->hHal, &versionCompiled); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN compiled version" @@ -4022,7 +4022,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_reported_version(hdd_ctx->hHal, &versionReported); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN reported version" @@ -4057,7 +4057,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_software_version(hdd_ctx->hHal, versionString, sizeof(versionString)); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS software version string" @@ -4071,7 +4071,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_hardware_version(hdd_ctx->hHal, versionString, sizeof(versionString)); - if (!CDF_IS_STATUS_SUCCESS(vstatus)) { + if (!QDF_IS_STATUS_SUCCESS(vstatus)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS hardware version string" @@ -4117,7 +4117,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) } /* Initialize channel list in sme based on the country code */ -CDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_set_sme_chan_list(hdd_context_t *hdd_ctx) { return sme_init_chan_list(hdd_ctx->hHal, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); @@ -4140,10 +4140,10 @@ bool hdd_is_5g_supported(hdd_context_t *hdd_ctx) return true; } -static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) +static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) { struct wiphy *wiphy; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; wiphy = hdd_ctx->wiphy; @@ -4152,7 +4152,7 @@ static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) * wiphy needs to be initialized before wiphy registration */ status = cds_regulatory_init(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_init_wiphy failed")); return status; @@ -4179,7 +4179,7 @@ static CDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) /* registration of wiphy dev with cfg80211 */ if (0 > wlan_hdd_cfg80211_register(wiphy)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("wiphy register failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -4274,12 +4274,12 @@ static void hdd_bus_bw_compute_cbk(void *priv) uint64_t tx_packets = 0, rx_packets = 0; uint64_t total_tx = 0, total_rx = 0; hdd_adapter_list_node_t *adapterNode = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; bool connected = false; uint32_t ipa_tx_packets = 0, ipa_rx_packets = 0; for (status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - NULL != adapterNode && CDF_STATUS_SUCCESS == status; + NULL != adapterNode && QDF_STATUS_SUCCESS == status; status = hdd_get_next_adapter(hdd_ctx, adapterNode, &adapterNode)) { @@ -4408,11 +4408,11 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; int i; status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; hddLog(CDF_TRACE_LEVEL_ERROR, @@ -4469,10 +4469,10 @@ void wlan_hdd_clear_netif_queue_history(hdd_context_t *hdd_ctx) { hdd_adapter_t *adapter = NULL; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; - CDF_STATUS status; + QDF_STATUS status; status = hdd_get_front_adapter(hdd_ctx, &adapter_node); - while (NULL != adapter_node && CDF_STATUS_SUCCESS == status) { + while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; cdf_mem_zero(adapter->queue_oper_stats, @@ -4503,9 +4503,9 @@ void wlan_hdd_clear_netif_queue_history(hdd_context_t *hdd_ctx) * it may try to connect to these APs, thus flush out all the scan results * which are present in SME after 11d scan is done. * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -static CDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, +static QDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, eCsrScanStatus status) { @@ -4515,7 +4515,7 @@ static CDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext, EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_OFFLOAD_PACKETS @@ -4956,16 +4956,16 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level) * * Disables all the dual mac features like DBS, Agile DFS etc. * - * Return: CDF_STATUS_SUCCESS on success + * Return: QDF_STATUS_SUCCESS on success */ -static CDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) +static QDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) { struct sir_dual_mac_config cfg; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx) { hdd_err("HDD context is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cfg.scan_config = 0; @@ -4976,12 +4976,12 @@ static CDF_STATUS wlan_hdd_disable_all_dual_mac_features(hdd_context_t *hdd_ctx) hdd_debug("Disabling all dual mac features..."); status = sme_soc_set_dual_mac_config(hdd_ctx->hHal, cfg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("sme_soc_set_dual_mac_config failed %d", status); return status; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5068,7 +5068,7 @@ static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx) */ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; hdd_context_t *hdd_ctx; v_CONTEXT_t p_cds_context; @@ -5101,7 +5101,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) /* Read and parse the qcom_cfg.ini file */ status = hdd_parse_config_ini(hdd_ctx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_alert("Error (status: %d) parsing INI file: %s", status, WLAN_INI_FILE); ret = -EINVAL; @@ -5319,7 +5319,7 @@ err_close_adapter: static int hdd_update_country_code(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { - CDF_STATUS status; + QDF_STATUS status; int ret = 0; unsigned long rc; @@ -5335,7 +5335,7 @@ static int hdd_update_country_code(hdd_context_t *hdd_ctx, eSIR_TRUE); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("SME Change Country code from module param fail ret=%d", ret); return -EINVAL; @@ -5363,7 +5363,7 @@ static int hdd_update_country_code(hdd_context_t *hdd_ctx, static int hdd_init_thermal_info(hdd_context_t *hdd_ctx) { tSmeThermalParams thermal_param; - CDF_STATUS status; + QDF_STATUS status; thermal_param.smeThermalMgmtEnabled = hdd_ctx->config->thermalMitigationEnable; @@ -5388,7 +5388,7 @@ static int hdd_init_thermal_info(hdd_context_t *hdd_ctx) status = sme_init_thermal_info(hdd_ctx->hHal, thermal_param); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return cdf_status_to_os_return(status); sme_add_set_thermal_level_callback(hdd_ctx->hHal, @@ -5438,7 +5438,7 @@ static inline void hdd_release_rtnl_lock(void) { } */ int hdd_wlan_startup(struct device *dev, void *hif_sc) { - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter = NULL; hdd_context_t *hdd_ctx = NULL; int ret; @@ -5471,7 +5471,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_wlan_green_ap_init(hdd_ctx); status = cds_open(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_open failed")); goto err_hdd_free_context; } @@ -5486,7 +5486,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) } status = cds_pre_enable(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed")); goto err_cds_close; } @@ -5495,7 +5495,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = wlan_hdd_regulatory_init(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_cds_close; @@ -5517,7 +5517,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) */ status = hdd_set_sme_config(hdd_ctx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config")); goto err_wiphy_unregister; } @@ -5532,7 +5532,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) } status = hdd_set_sme_chan_list(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_wiphy_unregister; @@ -5545,7 +5545,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) goto err_wiphy_unregister; } - if (CDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) { + if (QDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) { hddLog(CDF_TRACE_LEVEL_WARN, FL("can't update mac config, using MAC from ini file")); } @@ -5565,7 +5565,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) goto err_wiphy_unregister; } - if (hdd_ipa_init(hdd_ctx) == CDF_STATUS_E_FAILURE) + if (hdd_ipa_init(hdd_ctx) == QDF_STATUS_E_FAILURE) goto err_wiphy_unregister; /* @@ -5573,7 +5573,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) * else */ status = cds_enable(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_enable failed")); goto err_ipa_cleanup; } @@ -5581,7 +5581,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_init_channel_avoidance(hdd_ctx); status = hdd_post_cds_enable_config(hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("hdd_post_cds_enable_config failed")); goto err_cds_disable; @@ -5621,7 +5621,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = hdd_debugfs_init(adapter); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hdd_err("hdd_debugfs_init failed: %d!", status); /* FW capabilities received, Set the Dot11 mode */ @@ -5685,7 +5685,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (hdd_ctx->config->WlanAutoShutdown != 0) if (sme_set_auto_shutdown_cb (hdd_ctx->hHal, wlan_hdd_auto_shutdown_cb) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) hddLog(LOGE, FL( "Auto shutdown feature could not be enabled" @@ -5697,13 +5697,13 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) CDF_TIMER_TYPE_SW, hdd_skip_acs_scan_timer_handler, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hddLog(LOGE, FL("Failed to init ACS Skip timer")); #endif wlan_hdd_nan_init(hdd_ctx); status = cds_init_policy_mgr(); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("Policy manager initialization failed"); goto err_unreg_netdev_notifier; } @@ -5721,7 +5721,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hddtxlimit.txPower2g = hdd_ctx->config->TxPower2g; hddtxlimit.txPower5g = hdd_ctx->config->TxPower5g; status = sme_txpower_limit(hdd_ctx->hHal, &hddtxlimit); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) hdd_err("Error setting txlimit in sme: %d", status); #ifdef MSM_PLATFORM @@ -5778,7 +5778,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (hdd_ctx->config->dual_mac_feature_disable) { status = wlan_hdd_disable_all_dual_mac_features(hdd_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_err("Failed to disable dual mac features"); goto err_unreg_netdev_notifier; } @@ -5800,7 +5800,7 @@ err_nl_srv: #endif /* WLAN_KD_READY_NOTIFIER */ nl_srv_exit(); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -5823,10 +5823,10 @@ err_wiphy_unregister: err_cds_close: status = cds_sched_close(hdd_ctx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } cds_close(hdd_ctx->pcds_context); @@ -5850,13 +5850,13 @@ success: * * Return: None */ -CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, +QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, struct tagCsrDelStaParams *pDelStaParams) { #ifndef WLAN_FEATURE_MBSSID v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(adapter))->pcds_context; #endif - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ENTER(); @@ -5865,18 +5865,18 @@ CDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter, /* Ignore request to deauth bcmc station */ if (pDelStaParams->peerMacAddr.bytes[0] & 0x1) - return cdf_status; + return qdf_status; #ifdef WLAN_FEATURE_MBSSID - cdf_status = + qdf_status = wlansap_deauth_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter), pDelStaParams); #else - cdf_status = wlansap_deauth_sta(p_cds_context, pDelStaParams); + qdf_status = wlansap_deauth_sta(p_cds_context, pDelStaParams); #endif EXIT(); - return cdf_status; + return qdf_status; } /** @@ -5939,7 +5939,7 @@ void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *adapter, * * Return: true if connected; false otherwise */ -CDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *hdd_ctx) +QDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *hdd_ctx) { return sme_is_sta_p2p_client_connected(hdd_ctx->hHal); } @@ -6042,7 +6042,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) hdd_adapter_t *adapterIdx = NULL; hdd_adapter_list_node_t *adapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && @@ -6056,7 +6056,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) */ status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode @@ -6094,7 +6094,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) hdd_adapter_t *adapterIdx = NULL; hdd_adapter_list_node_t *adapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && @@ -6108,7 +6108,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) */ status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode @@ -6253,7 +6253,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) hdd_adapter_t *pDataAdapter = NULL; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; bool scan_intf_found = false; - CDF_STATUS status; + QDF_STATUS status; if (!hdd_ctx) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -6262,7 +6262,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) } status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { pDataAdapter = adapterNode->pAdapter; if (pDataAdapter) { if (pDataAdapter->device_mode == WLAN_HDD_INFRA_STATION @@ -6311,7 +6311,7 @@ void wlan_hdd_auto_shutdown_cb(void) void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *adapter; bool ap_connected = false, sta_connected = false; tHalHandle hal_handle; @@ -6325,7 +6325,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (enable == false) { if (sme_set_auto_shutdown_timer(hal_handle, 0) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Failed to stop wlan auto shutdown timer")); } @@ -6336,7 +6336,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (cds_concurrent_open_sessions_running()) { status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && adapter->device_mode == @@ -6371,7 +6371,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) if (sme_set_auto_shutdown_timer(hal_handle, hdd_ctx->config-> WlanAutoShutdown) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) hddLog(LOGE, FL("Failed to start wlan auto shutdown timer")); else @@ -6388,13 +6388,13 @@ hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter, { hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(this_sap_adapter); hdd_adapter_t *adapter, *con_sap_adapter; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; con_sap_adapter = NULL; status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && ((adapter->device_mode == WLAN_HDD_SOFTAP) || (adapter->device_mode == WLAN_HDD_P2P_GO)) && @@ -6433,7 +6433,7 @@ void hdd_start_bus_bw_compute_timer(hdd_adapter_t *adapter) void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; bool can_stop = true; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -6448,7 +6448,7 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) if (cds_concurrent_open_sessions_running()) { status = hdd_get_front_adapter(hdd_ctx, &adapterNode); - while (NULL != adapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter && (adapter->device_mode == WLAN_HDD_INFRA_STATION @@ -6492,9 +6492,9 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) * if both are same then it will return false else it will restart the sap in * sta's channel and return true. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. */ -CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, +QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, hdd_adapter_t *ap_adapter, tCsrRoamProfile *roam_profile, tScanResultHandle *scan_cache, @@ -6502,7 +6502,7 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, { hdd_ap_ctx_t *hdd_ap_ctx; uint8_t channel_id; - CDF_STATUS status; + QDF_STATUS status; device_mode_t device_mode = ap_adapter->device_mode; *concurrent_chnl_same = true; @@ -6512,7 +6512,7 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, roam_profile, scan_cache, &channel_id); - if ((CDF_STATUS_SUCCESS == status)) { + if ((QDF_STATUS_SUCCESS == status)) { if ((WLAN_HDD_SOFTAP == device_mode) && (channel_id < SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { @@ -6538,9 +6538,9 @@ CDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, */ hddLog(CDF_TRACE_LEVEL_ERROR, FL("Finding AP from scan cache failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_MBSSID @@ -6594,7 +6594,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("Now doing SAP STOPBSS")); qdf_event_reset(&hostapd_state->cdf_stop_bss_event); - if (CDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> + if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> sapContext)) { qdf_status = qdf_wait_single_event(&hostapd_state-> cdf_stop_bss_event, @@ -6669,7 +6669,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) if (wlansap_start_bss(hdd_ap_ctx->sapContext, hdd_hostapd_sap_event_cb, &hdd_ap_ctx->sapConfig, ap_adapter->dev) - != CDF_STATUS_SUCCESS) + != QDF_STATUS_SUCCESS) goto end; hddLog(CDF_TRACE_LEVEL_INFO_HIGH, diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 9013e81a77ed..80951ccd1213 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -197,7 +197,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, const void *data, int data_len) { int status; - CDF_STATUS sme_status; + QDF_STATUS sme_status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); struct fw_dump_req fw_mem_dump_req; struct fw_dump_seg_req *seg_req; @@ -296,7 +296,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, spin_unlock(&hdd_context_lock); sme_status = sme_fw_mem_dump(hdd_ctx->hHal, &fw_mem_dump_req); - if (CDF_STATUS_SUCCESS != sme_status) { + if (QDF_STATUS_SUCCESS != sme_status) { hddLog(LOGE, FL("sme_fw_mem_dump Failed")); mutex_lock(&hdd_ctx->memdump_lock); cdf_os_mem_free_consistent(cdf_ctx, @@ -539,8 +539,8 @@ int memdump_init(void) { hdd_context_t *hdd_ctx; int status = 0; - CDF_STATUS cb_status; - CDF_STATUS cdf_status; + QDF_STATUS cb_status; + QDF_STATUS qdf_status; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { @@ -555,7 +555,7 @@ int memdump_init(void) cb_status = sme_fw_mem_dump_register_cb(hdd_ctx->hHal, wlan_hdd_cfg80211_fw_mem_dump_cb); - if (CDF_STATUS_SUCCESS != cb_status) { + if (QDF_STATUS_SUCCESS != cb_status) { hddLog(LOGE , FL("Failed to register the callback")); return -EINVAL; } @@ -568,10 +568,10 @@ int memdump_init(void) init_completion(&fw_dump_context.response_event); - cdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, + qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, CDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, (void *)hdd_ctx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init memdump cleanup timer")); return -EINVAL; } @@ -594,7 +594,7 @@ void memdump_deinit(void) cdf_dma_addr_t paddr; cdf_dma_addr_t dma_ctx = 0; cdf_device_t cdf_ctx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); if (!hdd_ctx) { @@ -631,7 +631,7 @@ void memdump_deinit(void) cdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); } - cdf_status = cdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to deallocate timer")); } diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index 7e1e8c613152..9fe3aee14dc5 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -58,7 +58,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, int data_len) { tNanRequestReq nan_req; - CDF_STATUS status; + QDF_STATUS status; int ret_val; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); @@ -82,7 +82,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, nan_req.request_data = data; status = sme_nan_request(&nan_req); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { ret_val = -EINVAL; } return ret_val; diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 4865e30c6157..15d372d393c3 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -121,7 +121,7 @@ int hdd_napi_create(void) * services/calls. * For Rome, there is only one service, hence a single call */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hif_map_service_to_pipe(hif_ctx, HTT_DATA_MSG_SVC, &ul, &dl, &ul_polled, &dl_polled)) { hdd_err("cannot map service to pipe"); diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index f8df3fbfcd35..cc8543e0ded3 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -241,16 +241,16 @@ static int hdd_ocb_validate_config(hdd_adapter_t *adapter, */ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type sta_desc = {0}; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint8_t peer_id; - cdf_status = ol_txrx_register_ocb_peer(hdd_ctx->pcds_context, + qdf_status = ol_txrx_register_ocb_peer(hdd_ctx->pcds_context, adapter->macAddressCurrent.bytes, &peer_id); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Error registering OCB Self Peer!")); return -EINVAL; } @@ -260,11 +260,11 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) sta_desc.sta_id = peer_id; sta_desc.is_qos_enabled = 1; - cdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, + qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, &sta_desc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to register. Status= %d [0x%08X]"), - cdf_status, cdf_status); + qdf_status, qdf_status); return -EINVAL; } @@ -400,7 +400,7 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter, struct sir_ocb_config *config) { int rc; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct hdd_ocb_ctxt context = {0}; if (hdd_ocb_validate_config(adapter, config)) { @@ -417,10 +417,10 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter, netif_carrier_off(adapter->dev); /* Call the SME API to set the config */ - cdf_status = sme_ocb_set_config( + qdf_status = sme_ocb_set_config( ((hdd_context_t *)adapter->pHddCtx)->hHal, &context, hdd_ocb_set_config_callback, config); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error calling SME function.")); /* Convert from ecdf_status to errno */ return -EINVAL; @@ -1036,7 +1036,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, cdf_mem_copy(utc->time_error, nla_data(time_error_attr), SIZE_UTC_TIME_ERROR); - if (sme_ocb_set_utc_time(hdd_ctx->hHal, utc) != CDF_STATUS_SUCCESS) { + if (sme_ocb_set_utc_time(hdd_ctx->hHal, utc) != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while setting UTC time")); rc = -EINVAL; } else { @@ -1152,7 +1152,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, } if (sme_ocb_start_timing_advert(hdd_ctx->hHal, timing_advert) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while starting timing advert")); rc = -EINVAL; } else { @@ -1254,7 +1254,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_OCB_STOP_TIMING_ADVERT_CHANNEL_FREQ]); if (sme_ocb_stop_timing_advert(hdd_ctx->hHal, timing_advert) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error while stopping timing advert")); rc = -EINVAL; } else { @@ -1586,7 +1586,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, &request); if (rc) { hddLog(LOGE, FL("Error calling SME function")); - /* Need to convert from cdf_status to errno. */ + /* Need to convert from qdf_status to errno. */ return -EINVAL; } @@ -1733,7 +1733,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, if (sme_dcc_clear_stats(hdd_ctx->hHal, adapter->sessionId, nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_BITMAP])) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error calling SME function.")); return -EINVAL; } @@ -1882,7 +1882,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, &request); if (rc) { hddLog(LOGE, FL("Error calling SME function.")); - /* Convert from cdf_status to errno */ + /* Convert from qdf_status to errno */ return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 52c74fefcca1..187cdc45b9d9 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -58,7 +58,7 @@ static struct hdd_context_s *p_hdd_ctx; static int populate_oem_data_cap(hdd_adapter_t *adapter, t_iw_oem_data_cap *data_cap) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct hdd_config *config; uint32_t num_chan; uint8_t *chan_list; @@ -97,7 +97,7 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter, num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN; status = sme_get_cfg_valid_channels(hdd_ctx->hHal, &chan_list[0], &num_chan); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hdd_err("failed to get valid channel list, status: %d", status); cdf_mem_free(chan_list); return -EINVAL; @@ -179,7 +179,7 @@ static void send_oem_reg_rsp_nlink_msg(void) hdd_adapter_list_node_t *pAdapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; hdd_adapter_t *pAdapter = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { @@ -215,7 +215,7 @@ static void send_oem_reg_rsp_nlink_msg(void) /* Iterate through each of the adapters and fill device mode and vdev id */ status = hdd_get_front_adapter(p_hdd_ctx, &pAdapterNode); - while ((CDF_STATUS_SUCCESS == status) && pAdapterNode) { + while ((QDF_STATUS_SUCCESS == status) && pAdapterNode) { pAdapter = pAdapterNode->pAdapter; if (pAdapter) { deviceMode = buf++; @@ -364,27 +364,27 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) * * This function sends oem message to SME * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) +static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) { hdd_adapter_t *pAdapter = NULL; tOemDataReqConfig oemDataReqConfig; uint32_t oemDataReqID = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* for now, STA interface only */ pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); if (!pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!oemData) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: oemData is null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&oemDataReqConfig, sizeof(tOemDataReqConfig)); @@ -392,7 +392,7 @@ static CDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) oemDataReqConfig.data = cdf_mem_malloc(oemDataLen); if (!oemDataReqConfig.data) { hddLog(LOGE, FL("malloc failed for data req buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } oemDataReqConfig.data_len = oemDataLen; @@ -431,7 +431,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) uint8_t chanId; uint32_t reg_info_1; uint32_t reg_info_2; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i; uint8_t *buf; @@ -479,7 +479,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) chanId = chanList[i]; status = sme_get_reg_info(p_hdd_ctx->hHal, chanId, ®_info_1, ®_info_2); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* copy into hdd chan info struct */ hddChanInfo.chan_id = chanId; hddChanInfo.reserved0 = 0; @@ -538,7 +538,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) static int oem_process_set_cap_req_msg(int oem_cap_len, char *oem_cap, int32_t app_pid) { - CDF_STATUS status; + QDF_STATUS status; int error_code; struct sk_buff *skb; struct nlmsghdr *nlh; @@ -552,7 +552,7 @@ static int oem_process_set_cap_req_msg(int oem_cap_len, status = sme_oem_update_capability(p_hdd_ctx->hHal, (struct sme_oem_capability *)oem_cap); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("error updating rm capability, status: %d", status); error_code = cdf_status_to_os_return(status); diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 27064e10e9c2..fb48f5f27314 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -160,8 +160,8 @@ static bool hdd_p2p_is_action_type_rsp(const u8 *buf) } static -CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, - CDF_STATUS status, uint32_t scan_id) +QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, + QDF_STATUS status, uint32_t scan_id) { hdd_adapter_t *pAdapter = (hdd_adapter_t *) pCtx; hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); @@ -170,7 +170,7 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, if (!hdd_ctx) { hdd_err("Invalid HDD context"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mutex_lock(&cfgState->remain_on_chan_ctx_lock); @@ -181,7 +181,7 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, hddLog(LOGW, "%s: No Rem on channel pending for which Rsp is received", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } hddLog(LOG1, "Received remain on channel rsp"); @@ -266,9 +266,9 @@ CDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, } cdf_mem_free(pRemainChanCtx); complete(&pAdapter->cancel_rem_on_chan_var); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) complete(&pAdapter->rem_on_chan_ready_event); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) @@ -542,11 +542,11 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, hdd_remain_on_chan_ctx_t *pRemainChanCtx) { hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter_temp; - CDF_STATUS status; + QDF_STATUS status; bool isGoPresent = false; unsigned int duration; @@ -565,11 +565,11 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, mutex_unlock(&cfgState->remain_on_chan_ctx_lock); /* Initialize Remain on chan timer */ - cdf_status = + qdf_status = cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, CDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Not able to initialize remain_on_chan timer")); mutex_lock(&cfgState->remain_on_chan_ctx_lock); @@ -581,7 +581,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, } status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter_temp = pAdapterNode->pAdapter; if (pAdapter_temp->device_mode == WLAN_HDD_P2P_GO) { isGoPresent = true; @@ -608,7 +608,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, uint8_t sessionId = pAdapter->sessionId; /* call sme API to start remain on channel. */ - if (CDF_STATUS_SUCCESS != sme_remain_on_channel( + if (QDF_STATUS_SUCCESS != sme_remain_on_channel( WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, pRemainChanCtx->chan.hw_value, duration, @@ -631,7 +631,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, if (REMAIN_ON_CHANNEL_REQUEST == pRemainChanCtx->rem_on_chan_request) { - if (CDF_STATUS_SUCCESS != sme_register_mgmt_frame( + if (QDF_STATUS_SUCCESS != sme_register_mgmt_frame( WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, (SIR_MAC_MGMT_FRAME << 2) | @@ -644,7 +644,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || (WLAN_HDD_P2P_GO == pAdapter->device_mode)) { /* call sme API to start remain on channel. */ - if (CDF_STATUS_SUCCESS != wlansap_remain_on_channel( + if (QDF_STATUS_SUCCESS != wlansap_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -665,7 +665,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, return -EINVAL; } - if (CDF_STATUS_SUCCESS != wlansap_register_mgmt_frame( + if (QDF_STATUS_SUCCESS != wlansap_register_mgmt_frame( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -987,7 +987,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, { hdd_cfg80211_state_t *cfgState = NULL; hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL; - CDF_STATUS status; + QDF_STATUS status; if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL")); @@ -1017,7 +1017,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, hdd_remain_on_chan_timer, (pRemainChanCtx->duration + COMPLETE_EVENT_PROPOGATE_TIME)); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, "%s: Remain on Channel timer start failed", __func__); } @@ -1430,7 +1430,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, remain_on_chan_ctx-> hdd_remain_on_chan_timer, wait); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, "%s: Remain on Channel timer start failed", __func__); @@ -1572,7 +1572,7 @@ send_frame: } } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, buf, len, extendedWait, noack, current_freq)) { @@ -1582,7 +1582,7 @@ send_frame: } } else if (WLAN_HDD_SOFTAP == pAdapter->device_mode || WLAN_HDD_P2P_GO == pAdapter->device_mode) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != #ifdef WLAN_FEATURE_MBSSID wlansap_send_action(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), #else @@ -1896,7 +1896,7 @@ int hdd_set_p2p_ps(struct net_device *dev, void *msgData) { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tP2pPsConfig NoA; p2p_app_setP2pPs_t *pappNoA = (p2p_app_setP2pPs_t *) msgData; @@ -2096,7 +2096,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, uint8_t subType = 0; tActionFrmType actionFrmType; hdd_cfg80211_state_t *cfgState = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL; hdd_context_t *pHddCtx; @@ -2270,7 +2270,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, hdd_remain_on_chan_timer, extend_time); if (status != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog (LOGE, "%s: Remain on Channel timer start failed", diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 6e99ced9bc90..68e69c9f557c 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -103,7 +103,7 @@ static bool ssr_timer_started; #ifdef WLAN_FEATURE_GTK_OFFLOAD static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) { - CDF_STATUS ret; + QDF_STATUS ret; tSirGtkOffloadParams hddGtkOffloadReqParams; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -119,7 +119,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) ret = sme_set_gtk_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_gtk_offload failed, returned %d", @@ -145,7 +145,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) (WLAN_HDD_GET_HAL_CTX(pAdapter), wlan_hdd_cfg80211_update_replay_counter_callback, pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_get_gtk_offload failed, returned %d", @@ -168,7 +168,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) (pAdapter), &hddGtkOffloadReqParams, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to dissable GTK offload, returned %d", @@ -280,7 +280,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) hdd_context_t *pHddCtx; int i = 0; - CDF_STATUS returnStatus; + QDF_STATUS returnStatus; uint32_t count = 0, scope; ENTER(); @@ -394,7 +394,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) /* Configure the Firmware with this */ returnStatus = sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest); - if (CDF_STATUS_SUCCESS != returnStatus) { + if (QDF_STATUS_SUCCESS != returnStatus) { hdd_err("Failed to enable HostOffload feature with status: %d", returnStatus); } @@ -408,7 +408,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) hdd_err("Failed to disable NS Offload"); @@ -679,10 +679,10 @@ int wlan_hdd_ipv4_changed(struct notifier_block *nb, * @fenable: true : enable ARP offload false : disable arp offload * * Return: - * CDF_STATUS_SUCCESS - on successful operation, - * CDF_STATUS_E_FAILURE - on failure of operation + * QDF_STATUS_SUCCESS - on successful operation, + * QDF_STATUS_E_FAILURE - on failure of operation */ -CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) +QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) { struct in_ifaddr **ifap = NULL; struct in_ifaddr *ifa = NULL; @@ -701,7 +701,7 @@ CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) !pHddCtx->ap_arpns_support) { hddLog(LOG1, FL("ARP Offload is not supported in SAP/P2PGO mode")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (fenable) { @@ -749,36 +749,36 @@ CDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.params.hostIpv4Addr[2], offLoadRequest.params.hostIpv4Addr[3]); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to enable HostOffload feature", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { hddLog(CDF_TRACE_LEVEL_INFO, FL("IP Address is not assigned")); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { cdf_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq)); offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failure to disable host " "offload feature", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } @@ -832,7 +832,7 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx, */ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; tpSirWlanSetRxpFilters wlanRxpFilterParam = cdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); if (NULL == wlanRxpFilterParam) { @@ -857,17 +857,17 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) cdf_ret_status = sme_configure_rxp_filter(pHddCtx->hHal, wlanRxpFilterParam); - if (setfilter && (CDF_STATUS_SUCCESS == cdf_ret_status)) + if (setfilter && (QDF_STATUS_SUCCESS == cdf_ret_status)) pHddCtx->hdd_mcastbcast_filter_set = true; hddLog(LOG1, FL("%s to post set/reset filter to lower mac with status %d configuredMcstBcstFilterSetting = %d setMcstBcstFilter = %d"), - (CDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success", + (QDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success", cdf_ret_status, wlanRxpFilterParam->configuredMcstBcstFilterSetting, wlanRxpFilterParam->setMcstBcstFilter); - if (CDF_STATUS_SUCCESS != cdf_ret_status) + if (QDF_STATUS_SUCCESS != cdf_ret_status) cdf_mem_free(wlanRxpFilterParam); } @@ -1001,7 +1001,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, bool suspended), void *callbackContext) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hdd_info("%s: send wlan suspend indication", __func__); @@ -1009,7 +1009,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, sme_configure_suspend_ind(pHddCtx->hHal, conn_state_mask, callback, callbackContext); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == cdf_ret_status) { pHddCtx->hdd_mcastbcast_filter_set = true; } else { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -1027,11 +1027,11 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter) { hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: sme_configure_resume_req return failure %d", __func__, cdf_ret_status); @@ -1090,7 +1090,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), { hdd_context_t *pHddCtx; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter = NULL; hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; uint32_t conn_state_mask = 0; @@ -1113,7 +1113,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), hdd_update_mcastbcast_filter(pHddCtx); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; /* stop all TX queues before suspend */ @@ -1149,7 +1149,7 @@ static void hdd_resume_wlan(void) hdd_context_t *pHddCtx; hdd_adapter_t *pAdapter = NULL; hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", __func__); @@ -1172,7 +1172,7 @@ static void hdd_resume_wlan(void) /*loop through all adapters. Concurrency */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; /* wake the tx queues */ @@ -1258,12 +1258,12 @@ static void hdd_ssr_timer_start(int msec) * * This function is called by the HIF to shutdown the driver during SSR. * - * Return: CDF_STATUS_SUCCESS if the driver was shut down, + * Return: QDF_STATUS_SUCCESS if the driver was shut down, * or an error status otherwise */ -CDF_STATUS hdd_wlan_shutdown(void) +QDF_STATUS hdd_wlan_shutdown(void) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx; p_cds_sched_context cds_sched_context = NULL; @@ -1284,7 +1284,7 @@ CDF_STATUS hdd_wlan_shutdown(void) if (!p_cds_context) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Get the HDD context. */ @@ -1292,7 +1292,7 @@ CDF_STATUS hdd_wlan_shutdown(void) if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_set_recovery_in_progress(true); @@ -1343,12 +1343,12 @@ CDF_STATUS hdd_wlan_shutdown(void) #endif hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__); - cdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); + qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop WMA", __func__); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(p_cds_context); } @@ -1356,19 +1356,19 @@ CDF_STATUS hdd_wlan_shutdown(void) /* Stop SME - Cannot invoke cds_disable as cds_disable relies * on threads being running to process the SYS Stop */ - cdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to stop sme %d", __func__, cdf_status); + "%s: Failed to stop sme %d", __func__, qdf_status); CDF_ASSERT(0); } hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__); /* Stop MAC (PE and HAL) */ - cdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s: Failed to stop mac %d", __func__, cdf_status); + "%s: Failed to stop mac %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1389,7 +1389,7 @@ CDF_STATUS hdd_wlan_shutdown(void) hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1397,15 +1397,15 @@ CDF_STATUS hdd_wlan_shutdown(void) * * This function is called by the HIF to re-initialize the driver after SSR. * - * Return: CDF_STATUS_SUCCESS if the driver was re-initialized, + * Return: QDF_STATUS_SUCCESS if the driver was re-initialized, * or an error status otherwise */ -CDF_STATUS hdd_wlan_re_init(void *hif_sc) +QDF_STATUS hdd_wlan_re_init(void *hif_sc) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx = NULL; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; hdd_adapter_t *pAdapter; int i; @@ -1438,8 +1438,8 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) hdd_set_conparam(0); /* Re-open CDS, it is a re-open b'se control transport was never closed. */ - cdf_status = cds_open(); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_open(); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_re_init; } @@ -1452,8 +1452,8 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) goto err_cds_close; } - cdf_status = cds_pre_enable(pHddCtx->pcds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_pre_enable(pHddCtx->pcds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_alert("cds_pre_enable failed"); goto err_cds_close; } @@ -1464,16 +1464,16 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) * since the SME config operation must access the cfg database. * Set the SME configuration parameters. */ - cdf_status = hdd_set_sme_config(pHddCtx); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = hdd_set_sme_config(pHddCtx); + if (QDF_STATUS_SUCCESS != qdf_status) { hdd_alert("Failed hdd_set_sme_config"); goto err_cds_close; } ol_txrx_register_pause_cb(wlan_hdd_txrx_pause_cb); - cdf_status = hdd_set_sme_chan_list(pHddCtx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_set_sme_chan_list(pHddCtx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Failed to init channel list", __func__); goto err_cds_close; @@ -1492,7 +1492,7 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) (uint8_t *) &pHddCtx->config-> intfMacAddr[0], sizeof(pHddCtx->config->intfMacAddr[0])); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. " "HALStatus is %08d [x%08x]", __func__, cdf_ret_status, cdf_ret_status); @@ -1501,14 +1501,14 @@ CDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Start CDS which starts up the SME/MAC/HAL modules and everything else Note: Firmware image will be read and downloaded inside cds_enable API */ - cdf_status = cds_enable(p_cds_context); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_enable(p_cds_context); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__); goto err_cds_close; } - cdf_status = hdd_post_cds_enable_config(pHddCtx); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_post_cds_enable_config(pHddCtx); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: hdd_post_cds_enable_config failed", __func__); goto err_cds_disable; @@ -1628,7 +1628,7 @@ err_cds_close: wiphy_unregister(pHddCtx->wiphy); wiphy_free(pHddCtx->wiphy); - if (!CDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { + if (!QDF_IS_STATUS_SUCCESS(cds_deinit_policy_mgr())) { hdd_err("Failed to deinit policy manager"); /* Proceed and complete the clean up */ } @@ -1641,7 +1641,7 @@ err_re_init: return -EPERM; success: - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1720,7 +1720,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_adapter_t *pAdapter; hdd_adapter_list_node_t *pAdapterNode, *pNext; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int result; p_cds_sched_context cds_sched_context = get_cds_sched_ctxt(); @@ -1768,7 +1768,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; if ((NULL != pAdapter) && (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) { @@ -1857,7 +1857,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter; hdd_scaninfo_t *pScanInfo; - CDF_STATUS status; + QDF_STATUS status; int rc; ENTER(); @@ -1876,7 +1876,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, * until CAC is done for a SoftAP which is in started state. */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { if (BSS_START == @@ -1911,7 +1911,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, /* Stop ongoing scan on each interface */ status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pScanInfo = &pAdapter->scan_info; @@ -2077,7 +2077,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; int status; ENTER(); @@ -2105,11 +2105,11 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, hddLog(LOG1, FL("offload: in cfg80211_set_power_mgmt, calling arp offload")); - cdf_status = hdd_conf_arp_offload(pAdapter, true); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_conf_arp_offload(pAdapter, true); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOG1, FL("Failed to enable ARPOFFLOAD Feature %d"), - cdf_status); + qdf_status); } } @@ -2204,7 +2204,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, /* Fall through */ case NL80211_TX_POWER_LIMITED: /* Limit TX power by the mBm parameter */ if (sme_set_max_tx_power(hHal, bssid, selfMac, dbm) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Setting maximum tx power failed")); return -EIO; } diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 5e76a7e001c3..48ba11ed2c8b 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -560,9 +560,9 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, * @source : returns source of the scan request * @timestamp: scan request timestamp * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, +QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, uint32_t scan_id, struct cfg80211_scan_request **req, uint8_t *source, uint32_t *timestamp) { @@ -633,7 +633,7 @@ CDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, * Return: 0 for success, non zero for failure */ -static CDF_STATUS +static QDF_STATUS hdd_scan_request_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, eCsrScanStatus status) @@ -663,7 +663,7 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, if (pAdapter->dev != dev) { hddLog(LOGW, "%s: device mismatch %p vs %p", __func__, pAdapter->dev, dev); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wlan_hdd_scan_request_dequeue(hddctx, scanId, &req, &source, @@ -687,7 +687,7 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, wireless_send_event(dev, we_event, &wrqu, msg); EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -710,7 +710,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); hdd_wext_state_t *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); tCsrScanRequest scanRequest; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct iw_scan_req *scanReq = (struct iw_scan_req *)extra; hdd_adapter_t *con_sap_adapter; uint16_t con_dfs_ch; @@ -832,7 +832,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, status = sme_scan_request((WLAN_HDD_GET_CTX(pAdapter))->hHal, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:sme_scan_request fail %d!!!", __func__, status); goto error; @@ -891,7 +891,7 @@ static int __iw_get_scan(struct net_device *dev, hdd_context_t *hdd_ctx; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); tCsrScanResultInfo *pScanResult; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_scan_info_t scanInfo; tScanResultHandle pResult; int i = 0; @@ -1089,7 +1089,7 @@ nla_put_failure: * * Return: CDF status */ -static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, +static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, @@ -1108,7 +1108,7 @@ static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, ret = wlan_hdd_validate_context(hddctx); if (0 != ret) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; hddLog(CDF_TRACE_LEVEL_INFO, "%s called with hal = %p, pContext = %p, ID = %d, status = %d", @@ -1121,7 +1121,7 @@ static CDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, goto allow_suspend; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wlan_hdd_scan_request_dequeue(hddctx, scanId, &req, &source, &scan_time)) { hdd_err("Dequeue of scan request failed ID: %d", scanId); @@ -1554,9 +1554,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, pAdapter->sessionId, &scan_req, &hdd_cfg80211_scan_done_callback, dev); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_scan_request returned error %d"), status); - if (CDF_STATUS_E_RESOURCES == status) { + if (QDF_STATUS_E_RESOURCES == status) { hddLog(LOGE, FL("HO is in progress.So defer the scan by informing busy")); status = -EBUSY; @@ -1985,7 +1985,7 @@ hdd_sched_scan_callback(void *callbackContext, * * Return: Success if PNO is allowed, Failure otherwise. */ -static CDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) +static QDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) { hddLog(LOG1, FL("dev_mode=%d, conn_state=%d, session ID=%d"), @@ -1995,9 +1995,9 @@ static CDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) && (eConnectionState_NotConnected == adapter->sessionCtx.station.conn_info.connState)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; else - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } @@ -2023,7 +2023,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, u8 valid_ch[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; u8 channels_allowed[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; uint32_t num_channels_allowed = WNI_CFG_VALID_CHANNEL_LIST_LEN; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int ret = 0; hdd_scaninfo_t *pScanInfo = &pAdapter->scan_info; struct hdd_config *config = NULL; @@ -2079,7 +2079,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, } } - if (CDF_STATUS_E_FAILURE == wlan_hdd_is_pno_allowed(pAdapter)) { + if (QDF_STATUS_E_FAILURE == wlan_hdd_is_pno_allowed(pAdapter)) { hddLog(LOGE, FL("pno is not allowed")); return -ENOTSUPP; } @@ -2251,7 +2251,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, pAdapter->sessionId, hdd_sched_scan_callback, pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to enable PNO")); ret = -EINVAL; goto error; @@ -2297,7 +2297,7 @@ int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; tHalHandle hHal; @@ -2361,7 +2361,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, status = sme_set_preferred_network_list(hHal, pPnoRequest, pAdapter->sessionId, NULL, pAdapter); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("Failed to disabled PNO")); ret = -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 8abb284db862..1dddcd699c4b 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -208,7 +208,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) */ STAId = pHddApCtx->uBCStaId; } else { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &STAId)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, @@ -391,12 +391,12 @@ void hdd_softap_tx_timeout(struct net_device *dev) * @hdd_softap_init_tx_rx() - Initialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t STAId = 0; @@ -416,12 +416,12 @@ CDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) * @hdd_softap_deinit_tx_rx() - Deinitialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; return status; } @@ -432,10 +432,10 @@ CDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) * @STAId: Station ID to initialize * @pmacAddrSTA: pointer to the MAC address of the station * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, +QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, struct cdf_mac_addr *pmacAddrSTA) { spin_lock_bh(&pAdapter->staInfo_lock); @@ -443,7 +443,7 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId); spin_unlock_bh(&pAdapter->staInfo_lock); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&pAdapter->aStaInfo[STAId], sizeof(hdd_station_info_t)); @@ -453,7 +453,7 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, cdf_copy_macaddr(&pAdapter->aStaInfo[STAId].macAddrSTA, pmacAddrSTA); spin_unlock_bh(&pAdapter->staInfo_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -461,12 +461,12 @@ CDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, * @pAdapter: pointer to adapter context * @STAId: Station ID to deinitialize * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) +QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_hostapd_state_t *pHostapdState; pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); @@ -477,7 +477,7 @@ CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) spin_unlock_bh(&pAdapter->staInfo_lock); CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Deinit station not inited %d", __func__, STAId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter->aStaInfo[STAId].isUsed = false; @@ -497,10 +497,10 @@ CDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) * the HDD when one or more packets were received for a registered * STA. * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, +QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; @@ -516,14 +516,14 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, if ((NULL == cds_context) || (NULL == rxBuf)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == pHddCtx) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pHddCtx->sta_to_adapter[staId]; @@ -531,7 +531,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, hddLog(LOGE, FL("invalid adapter %p or adapter has invalid magic"), pAdapter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* walk the chain until all are processed */ @@ -545,7 +545,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cpu_index = wlan_hdd_get_cpu(); ++pAdapter->hdd_stats.hddTxRxStats.rxPackets[cpu_index]; @@ -592,7 +592,7 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, pAdapter->dev->last_rx = jiffies; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -600,23 +600,23 @@ CDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, * @pAdapter: pointer to adapter context * @staId: Station ID to deregister * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) +QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *pHddCtx; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pAdapter magic", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pHddCtx = (hdd_context_t *) (pAdapter->pHddCtx); @@ -624,11 +624,11 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * structures. This helps to block RX frames from other * station to this station. */ - cdf_status = ol_txrx_clear_peer(staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = ol_txrx_clear_peer(staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "ol_txrx_clear_peer() failed to for staID %d. " - "Status= %d [0x%08X]", staId, cdf_status, cdf_status); + "Status= %d [0x%08X]", staId, qdf_status, qdf_status); } if (pAdapter->aStaInfo[staId].isUsed) { @@ -639,7 +639,7 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) } pHddCtx->sta_to_adapter[staId] = NULL; - return cdf_status; + return qdf_status; } /** @@ -653,9 +653,9 @@ CDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * @pPeerMacAddress: station MAC address * @fWmmEnabled: is WMM enabled for this STA? * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, @@ -664,7 +664,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pPeerMacAddress, bool fWmmEnabled) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_context_t *pHddCtx = pAdapter->pHddCtx; @@ -683,7 +683,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, /*Save the pAdapter Pointer for this staId */ pHddCtx->sta_to_adapter[staId] = pAdapter; - cdf_status = + qdf_status = hdd_softap_init_tx_rx_sta(pAdapter, staId, pPeerMacAddress); @@ -693,14 +693,14 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, staDesc.is_qos_enabled); - cdf_status = + qdf_status = ol_txrx_register_peer(hdd_softap_rx_packet_cbk, &staDesc); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", - cdf_status, cdf_status); - return cdf_status; + qdf_status, qdf_status); + return qdf_status; } /* if ( WPA ), tell TL to go to 'connected' and after keys come to the @@ -720,7 +720,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, /* Connections that do not need Upper layer auth, * transition TL directly to 'Authenticated' state. */ - cdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_auth, false); pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_auth; @@ -731,7 +731,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId); - cdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, + qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, ol_txrx_peer_state_conn, false); pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_conn; @@ -745,7 +745,7 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, WLAN_START_ALL_NETIF_QUEUE_N_CARRIER, WLAN_CONTROL_PATH); - return cdf_status; + return qdf_status; } /** @@ -753,12 +753,12 @@ CDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * @pAdapter: pointer to adapter context * @fPrivacyBit: should 802.11 privacy bit be set? * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); struct cdf_mac_addr broadcastMacAddr = CDF_MAC_ADDR_BROADCAST_INITIALIZER; @@ -772,21 +772,21 @@ CDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, #else pHddCtx->sta_to_adapter[WLAN_RX_SAP_SELF_STA_ID] = pAdapter; #endif - cdf_status = + qdf_status = hdd_softap_register_sta(pAdapter, false, fPrivacyBit, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))-> uBCStaId, 0, 1, &broadcastMacAddr, 0); - return cdf_status; + return qdf_status; } /** * hdd_softap_deregister_bc_sta() - Deregister the SoftAP broadcast STA * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) { return hdd_softap_deregister_sta(pAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))-> @@ -797,11 +797,11 @@ CDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) * hdd_softap_stop_bss() - Stop the BSS * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t staId = 0; hdd_context_t *pHddCtx; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -813,12 +813,12 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } - cdf_status = hdd_softap_deregister_bc_sta(pAdapter); + qdf_status = hdd_softap_deregister_bc_sta(pAdapter); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId); @@ -827,8 +827,8 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) for (staId = 0; staId < WLAN_MAX_STA_COUNT; staId++) { /* This excludes BC sta as it is already deregistered */ if (pAdapter->aStaInfo[staId].isUsed) { - cdf_status = hdd_softap_deregister_sta(pAdapter, staId); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = hdd_softap_deregister_sta(pAdapter, staId); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister sta Id %d", @@ -836,7 +836,7 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) } } } - return cdf_status; + return qdf_status; } /** @@ -845,24 +845,24 @@ CDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * @pDestMacAddress: MAC address of the station * @state: new state of the station * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state) { uint8_t ucSTAId = WLAN_MAX_STA_COUNT; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: enter", __func__); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &ucSTAId)) { CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to find right station", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (false == @@ -871,15 +871,15 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = + qdf_status = hdd_change_peer_state(pAdapter, ucSTAId, state, false); CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: change station to state %d succeed", __func__, state); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { pAdapter->aStaInfo[ucSTAId].tlSTAState = ol_txrx_peer_state_auth; } @@ -887,7 +887,7 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s exit", __func__); - return cdf_status; + return qdf_status; } /* @@ -896,11 +896,11 @@ CDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, * @pDestMacAddress: MAC address of the destination * @staId: Station ID associated with the MAC address * - * Return: CDF_STATUS_SUCCESS if a match was found, in which case - * staId is populated, CDF_STATUS_E_FAILURE if a match is + * Return: QDF_STATUS_SUCCESS if a match was found, in which case + * staId is populated, QDF_STATUS_E_FAILURE if a match is * not found */ -CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, struct cdf_mac_addr *pMacAddress, uint8_t *staId) { @@ -911,9 +911,9 @@ CDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, (&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress, CDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { *staId = i; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 2f9a15f8cf87..af723a434ac3 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -1193,7 +1193,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, LinkLayerStatsSetReq.mpduSizeThreshold, LinkLayerStatsSetReq.aggressiveStatisticsGathering); - if (CDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal, &LinkLayerStatsSetReq)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_set_req Failed", __func__); @@ -1323,7 +1323,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, INIT_COMPLETION(context->response_event); spin_unlock(&context->context_lock); - if (CDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal, &LinkLayerStatsGetReq)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_get_req Failed", __func__); @@ -1454,7 +1454,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, LinkLayerStatsClearReq.statsClearReqMask, LinkLayerStatsClearReq.stopReq); - if (CDF_STATUS_SUCCESS == sme_ll_stats_clear_req(pHddCtx->hHal, + if (QDF_STATUS_SUCCESS == sme_ll_stats_clear_req(pHddCtx->hHal, &LinkLayerStatsClearReq)) { temp_skbuff = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 2 * @@ -1537,7 +1537,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, struct net_device *dev = wdev->netdev; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); int ret_val; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); ENTER(); @@ -1556,7 +1556,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, status = sme_stats_ext_request(pAdapter->sessionId, &stats_ext_req); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ret_val = -EINVAL; return ret_val; diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 44d69b5c24b3..96d0377a5a4c 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -78,7 +78,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1]; struct gateway_param_update_req req = { 0 }; int ret; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -156,7 +156,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, hdd_info("ipv6 addr: %pI6c", req.ipv6_addr); status = sme_gateway_param_update(hdd_ctx->hHal, &req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("sme_gateway_param_update failed(err=%d)", status); ret = -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 8e48da640e69..cd6d9f7e7ef9 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -234,11 +234,11 @@ static uint32_t wlan_hdd_tdls_discovery_sent_cnt(hdd_context_t *pHddCtx) hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; uint32_t count = 0; status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -535,7 +535,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) int i; uint8_t staIdx; tdlsInfo_t *tInfo; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddCtx) return -EINVAL; @@ -723,7 +723,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) dump_tdls_state_param_setting(tInfo); cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tInfo); cdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); cdf_mem_free(pHddTdlsCtx); @@ -744,7 +744,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) tdlsCtx_t *pHddTdlsCtx; hdd_context_t *pHddCtx; tdlsInfo_t *tInfo; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { @@ -826,7 +826,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, false); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tInfo); } } else { @@ -1530,7 +1530,7 @@ void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx, eTDLSSupportMode tdls_mode, bool bUpdateLast) { hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; - CDF_STATUS status; + QDF_STATUS status; hdd_adapter_t *pAdapter; tdlsCtx_t *pHddTdlsCtx; @@ -1551,7 +1551,7 @@ void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx, status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); if (NULL != pHddTdlsCtx) { @@ -1591,7 +1591,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); eTDLSSupportMode req_tdls_mode; tdlsInfo_t *tdlsParams; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddTdlsCtx) { hddLog(LOGE, FL("TDLS not enabled!")); @@ -1666,7 +1666,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, dump_tdls_state_param_setting(tdlsParams); cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tdlsParams); return -EINVAL; } @@ -1697,7 +1697,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tdlsCtx_t *hdd_tdls_ctx = WLAN_HDD_GET_TDLS_CTX_PTR(adapter); tdlsInfo_t *tdls_param; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; if (!hdd_tdls_ctx) { /* may be TDLS is not applicable for this adapter */ @@ -1777,7 +1777,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, cdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal, tdls_param, true); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tdls_param); return; } @@ -1855,7 +1855,7 @@ int wlan_hdd_tdls_update_peer_mac(hdd_adapter_t *adapter, const uint8_t *mac, uint32_t peer_state) { tSmeTdlsPeerStateParams sme_tdls_peer_state_params = {0}; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_peer_state_params.vdevId = adapter->sessionId; @@ -1864,7 +1864,7 @@ int wlan_hdd_tdls_update_peer_mac(hdd_adapter_t *adapter, const uint8_t *mac, sme_tdls_peer_state_params.peerState = peer_state; status = sme_update_tdls_peer_state(hdd_ctx->hHal, &sme_tdls_peer_state_params); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(LOGE, FL("sme_UpdateTdlsPeerState failed for "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(mac)); return -EPERM; @@ -1971,12 +1971,12 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_all_peer(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; hddTdlsPeer_t *curr_peer = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; mutex_lock(&pHddCtx->tdls_lock); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -2366,12 +2366,12 @@ hddTdlsPeer_t *wlan_hdd_tdls_is_progress(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter = NULL; tdlsCtx_t *pHddTdlsCtx = NULL; hddTdlsPeer_t *curr_peer = NULL; - CDF_STATUS status = 0; + QDF_STATUS status = 0; mutex_lock(&pHddCtx->tdls_lock); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); @@ -3055,7 +3055,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAX + 1]; - CDF_STATUS ret; + QDF_STATUS ret; uint32_t state; int32_t reason; uint32_t global_operating_class = 0; @@ -3237,7 +3237,7 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; tdls_req_params_t pReqMsg = { 0 }; int ret; @@ -3360,7 +3360,7 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1]; - CDF_STATUS status; + QDF_STATUS status; if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3429,7 +3429,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, { hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); - CDF_STATUS status; + QDF_STATUS status; hddTdlsPeer_t *pTdlsPeer; uint16_t numCurrTdlsPeers; unsigned long rc; @@ -3588,7 +3588,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, return -EPERM; } - if (CDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { + if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Add Station is unsuccessful", __func__); return -EPERM; @@ -3671,7 +3671,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_station_ctx_t *hdd_sta_ctx; u8 peerMac[CDF_MAC_ADDR_SIZE]; - CDF_STATUS status; + QDF_STATUS status; int max_sta_failed = 0; int responder; unsigned long rc; @@ -3859,7 +3859,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, peer_capability, (uint8_t *) buf, len, !responder); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_send_tdls_mgmt_frame failed!", __func__); pAdapter->mgmtTxCompletionStatus = false; @@ -4157,7 +4157,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); int status; tSmeTdlsPeerStateParams smeTdlsPeerStateParams; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; hddTdlsPeer_t *pTdlsPeer; ENTER(); @@ -4194,7 +4194,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, switch (oper) { case NL80211_TDLS_ENABLE_LINK: { - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; tCsrTdlsLinkEstablishParams tdlsLinkEstablishParams; @@ -4269,7 +4269,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, pTdlsPeer->staId, pTdlsPeer-> signature); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { uint8_t i; cdf_mem_zero(&smeTdlsPeerStateParams, @@ -4388,7 +4388,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, sme_update_tdls_peer_state(pHddCtx-> hHal, &smeTdlsPeerStateParams); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, @@ -4741,7 +4741,7 @@ int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_chan_switch_params chan_switch_params; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (offchanmode < ENABLE_CHANSWITCH || offchanmode > DISABLE_CHANSWITCH) { @@ -4834,7 +4834,7 @@ int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) status = sme_send_tdls_chan_switch_req(WLAN_HDD_GET_HAL_CTX(adapter), &chan_switch_params); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hdd_log(LOG1, FL("Failed to send channel switch request to sme")); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 65e6204eba99..1aec90ab677c 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -292,7 +292,7 @@ static bool wlan_hdd_is_eapol_or_wai(struct sk_buff *skb) */ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { - CDF_STATUS status; + QDF_STATUS status; sme_ac_enum_type ac; sme_QosWmmUpType up; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -325,7 +325,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) struct cdf_mac_addr *pDestMacAddress = (struct cdf_mac_addr *) skb->data; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_ibss_get_sta_id(&pAdapter->sessionCtx.station, pDestMacAddress, &STAId)) STAId = HDD_WLAN_INVALID_STA_ID; @@ -522,10 +522,10 @@ drop_pkt: * @pMacAddress: pointer to Peer Mac address * @staID: pointer to returned Station Index * - * Return: CDF_STATUS_SUCCESS/CDF_STATUS_E_FAILURE + * Return: QDF_STATUS_SUCCESS/QDF_STATUS_E_FAILURE */ -CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, +QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, struct cdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t idx; @@ -534,11 +534,11 @@ CDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx], pMacAddress, CDF_MAC_ADDR_SIZE)) { *staId = pHddStaCtx->conn_info.staId[idx]; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -601,18 +601,18 @@ void hdd_tx_timeout(struct net_device *dev) * @hdd_init_tx_rx() - Initialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return status; @@ -622,18 +622,18 @@ CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) * @hdd_deinit_tx_rx() - Deinitialize Tx/RX module * @pAdapter: pointer to adapter context * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return status; @@ -649,10 +649,10 @@ CDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) * the HDD when one or more packets were received for a registered * STA. * - * Return: CDF_STATUS_E_FAILURE if any errors encountered, - * CDF_STATUS_SUCCESS otherwise + * Return: QDF_STATUS_E_FAILURE if any errors encountered, + * QDF_STATUS_SUCCESS otherwise */ -CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; hdd_context_t *pHddCtx = NULL; @@ -668,14 +668,14 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) if ((NULL == cds_context) || (NULL == rxBuf)) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); if (NULL == pHddCtx) { CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pHddCtx->sta_to_adapter[staId]; @@ -683,7 +683,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) hddLog(LOGE, FL("invalid adapter %p or adapter has invalid magic"), pAdapter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cpu_index = wlan_hdd_get_cpu(); @@ -693,7 +693,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "Magic cookie(%x) for adapter sanity verification is invalid", pAdapter->magic); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -707,7 +707,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) * it to stack */ cdf_nbuf_free(skb); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wlan_hdd_log_eapol(skb, WIFI_EVENT_DRIVER_EAPOL_FRAME_RECEIVED); @@ -764,7 +764,7 @@ CDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) pAdapter->dev->last_rx = jiffies; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_DIAG_SUPPORT diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 24e33289ff6e..ecb1fcfaf5e6 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -799,7 +799,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) if (0 != ret) return ret; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL @@ -847,7 +847,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, return status; if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); @@ -1088,27 +1088,27 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext) * @pAdapter: adapter upon which the measurement is requested * @rssi_value: pointer to where the RSSI should be returned * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) +QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) { struct statsContext context; hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { hdd_err("Recovery in Progress. State: 0x%x Ignore!!!", cds_get_driver_state()); /* return a cached value */ *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -1117,13 +1117,13 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { hdd_err("Not associated!, return last connected AP rssi!"); *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (pHddStaCtx->hdd_ReassocScenario) { hdd_info("Roaming in progress, return cached RSSI"); *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } init_completion(&context.completion); @@ -1134,7 +1134,7 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) pHddStaCtx->conn_info.staId[0], pHddStaCtx->conn_info.bssId, pAdapter->rssi, &context, pHddCtx->pcds_context); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ @@ -1169,7 +1169,7 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) *rssi_value = pAdapter->rssi; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1177,14 +1177,14 @@ CDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) * @pAdapter: adapter upon which the measurement is requested * @snr: pointer to where the SNR should be returned * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ -CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) +QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) { struct statsContext context; hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; int valid; @@ -1193,14 +1193,14 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid context, pAdapter", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pHddCtx = WLAN_HDD_GET_CTX(pAdapter); valid = wlan_hdd_validate_context(pHddCtx); if (0 != valid) - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -1211,7 +1211,7 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) hstatus = sme_get_snr(pHddCtx->hHal, hdd_get_snr_cb, pHddStaCtx->conn_info.staId[0], pHddStaCtx->conn_info.bssId, &context); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ @@ -1246,7 +1246,7 @@ CDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) *snr = pAdapter->snr; EXIT(); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1326,25 +1326,25 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * This function will send a query to SME for the linkspeed of the * given peer, and then wait for the callback to be invoked. * - * Return: CDF_STATUS_SUCCESS if linkspeed data is available, + * Return: QDF_STATUS_SUCCESS if linkspeed data is available, * otherwise a CDF_STATUS_E_* error. */ -CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, +QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, struct cdf_mac_addr macAddress) { - CDF_STATUS status; + QDF_STATUS status; unsigned long rc; struct linkspeedContext context; tSirLinkSpeedInfo *linkspeed_req; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } init_completion(&context.completion); context.pAdapter = pAdapter; @@ -1354,7 +1354,7 @@ CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, status = sme_get_link_speed(WLAN_HDD_GET_HAL_CTX(pAdapter), linkspeed_req, &context, hdd_get_link_speed_cb); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics for link speed", __func__); @@ -1386,7 +1386,7 @@ CDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, spin_lock(&hdd_context_lock); context.magic = 0; spin_unlock(&hdd_context_lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1418,13 +1418,13 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) /* we are not connected so we don't have a classAstats */ *link_speed = 0; } else { - CDF_STATUS status; + QDF_STATUS status; struct cdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); status = wlan_hdd_get_linkspeed_for_peermac(sta_adapter, bssid); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("Unable to retrieve SME linkspeed")); return -EINVAL; } @@ -1772,14 +1772,14 @@ static int __iw_set_mode(struct net_device *dev, if (hdd_conn_get_connected_bss_type (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), &connectedBssType) || (eCSR_BSS_TYPE_START_IBSS == LastBSSType)) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* need to issue a disconnect to CSR. */ INIT_COMPLETION(pAdapter->disconnect_comp_var); - cdf_status = + qdf_status = sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE); - if (CDF_STATUS_SUCCESS == cdf_status) { + if (QDF_STATUS_SUCCESS == qdf_status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -1961,7 +1961,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; @@ -2050,7 +2050,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) { if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("failed to get operating channel %u"), pAdapter->sessionId); @@ -2181,7 +2181,7 @@ static int __iw_set_tx_power(struct net_device *dev, return ret; if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, - wrqu->txpower.value) != CDF_STATUS_SUCCESS) { + wrqu->txpower.value) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL")); return -EIO; @@ -2227,9 +2227,8 @@ static int __iw_get_bitrate(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -2266,7 +2265,7 @@ static int __iw_get_bitrate(struct net_device *dev, pHddStaCtx->conn_info.staId[0], pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); return status; @@ -2282,7 +2281,7 @@ static int __iw_get_bitrate(struct net_device *dev, hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wrqu->bitrate.value = @@ -2291,7 +2290,7 @@ static int __iw_get_bitrate(struct net_device *dev, EXIT(); - return cdf_status; + return qdf_status; } /** @@ -2360,17 +2359,17 @@ static int __iw_set_bitrate(struct net_device *dev, valid_rate = true; } else if (sme_cfg_get_int(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_DOT11_MODE, - &active_phy_mode) == CDF_STATUS_SUCCESS) { + &active_phy_mode) == QDF_STATUS_SUCCESS) { if (active_phy_mode == WNI_CFG_DOT11_MODE_11A || active_phy_mode == WNI_CFG_DOT11_MODE_11G || active_phy_mode == WNI_CFG_DOT11_MODE_11B) { if ((sme_cfg_get_str(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_SUPPORTED_RATES_11A, supp_rates, - &a_len) == CDF_STATUS_SUCCESS) + &a_len) == QDF_STATUS_SUCCESS) && (sme_cfg_get_str(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_SUPPORTED_RATES_11B, supp_rates, - &b_len) == CDF_STATUS_SUCCESS)) { + &b_len) == QDF_STATUS_SUCCESS)) { for (i = 0; i < (b_len + a_len); ++i) { /* supported rates returned is double * the actual rate so we divide it by 2 @@ -2390,7 +2389,7 @@ static int __iw_set_bitrate(struct net_device *dev, return -EINVAL; } if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter), - WNI_CFG_FIXED_RATE, rate) != CDF_STATUS_SUCCESS) { + WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FIXED_RATE")); return -EIO; @@ -2606,7 +2605,7 @@ static int __iw_get_genie(struct net_device *dev, hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS status; + QDF_STATUS status; uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; hdd_context_t *hdd_ctx; @@ -2825,7 +2824,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, } if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; @@ -2955,7 +2954,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, if (sme_cfg_set_int (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; @@ -3129,7 +3128,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, /*Get the phy mode */ if (sme_cfg_get_int(hHal, WNI_CFG_DOT11_MODE, - &active_phy_mode) == CDF_STATUS_SUCCESS) { + &active_phy_mode) == QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "active_phy_mode = %d", active_phy_mode); @@ -3140,7 +3139,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_SUPPORTED_RATES_11A, supp_rates, - &a_len) == CDF_STATUS_SUCCESS) { + &a_len) == QDF_STATUS_SUCCESS) { if (a_len > WNI_CFG_SUPPORTED_RATES_11A_LEN) { a_len = WNI_CFG_SUPPORTED_RATES_11A_LEN; } @@ -3159,7 +3158,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_SUPPORTED_RATES_11B, supp_rates, - &b_len) == CDF_STATUS_SUCCESS) { + &b_len) == QDF_STATUS_SUCCESS) { if (b_len > WNI_CFG_SUPPORTED_RATES_11B_LEN) { b_len = WNI_CFG_SUPPORTED_RATES_11B_LEN; } @@ -3191,7 +3190,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, /*Supported Channels and Frequencies */ if (sme_cfg_get_str ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels, - &num_channels) != CDF_STATUS_SUCCESS) { + &num_channels) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); @@ -3334,23 +3333,23 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext) * wlan_hdd_get_class_astats() - Get Class A statistics * @pAdapter: adapter for which statistics are desired * - * Return: CDF_STATUS_SUCCESS if adapter's Class A statistics were updated + * Return: QDF_STATUS_SUCCESS if adapter's Class A statistics were updated */ -CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) +QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; struct statsContext context; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { hdd_err("Recovery in Progress. State: 0x%x Ignore!!!", cds_get_driver_state()); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we are connected so prepare our callback context */ @@ -3365,7 +3364,7 @@ CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) false, /* non-cached results */ pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve Class A statistics", __func__); /* we'll returned a cached value below */ @@ -3398,7 +3397,7 @@ CDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) spin_unlock(&hdd_context_lock); /* either callback updated pAdapter stats or it has cached data */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3474,18 +3473,18 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext) * wlan_hdd_get_station_stats() - Get station statistics * @pAdapter: adapter for which statistics are desired * - * Return: CDF_STATUS_SUCCESS if adapter's statistics were updated + * Return: QDF_STATUS_SUCCESS if adapter's statistics were updated */ -CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) +QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - CDF_STATUS hstatus; + QDF_STATUS hstatus; unsigned long rc; struct statsContext context; if (NULL == pAdapter) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we are connected so prepare our callback context */ @@ -3503,7 +3502,7 @@ CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) false, /* non-cached results */ pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); /* we'll return with cached values */ @@ -3537,7 +3536,7 @@ CDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) spin_unlock(&hdd_context_lock); /* either callback updated pAdapter stats or it has cached data */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3748,7 +3747,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, eCsrEncryptionType encryptionType = eCSR_ENCRYPT_TYPE_NONE; bool fKeyPresent = 0; int i; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int ret; ENTER(); @@ -3800,7 +3799,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -4037,7 +4036,7 @@ static int __iw_set_encodeext(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_context_t *hdd_ctx; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; int ret; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; @@ -4190,11 +4189,11 @@ static int __iw_set_encodeext(struct net_device *dev, */ cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == CDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -4206,7 +4205,7 @@ static int __iw_set_encodeext(struct net_device *dev, pAdapter->sessionId, &setKey, &roamId); - if (cdf_ret_status != CDF_STATUS_SUCCESS) { + if (cdf_ret_status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, cdf_ret_status); @@ -4277,7 +4276,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if ((wrqu->retry.flags & IW_RETRY_LONG)) { if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT, wrqu->retry.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4286,7 +4285,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, } else if ((wrqu->retry.flags & IW_RETRY_SHORT)) { if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT, wrqu->retry.value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4356,7 +4355,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_LONG; if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4368,7 +4367,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_SHORT; if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); @@ -4425,7 +4424,7 @@ static int __iw_set_mlme(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); struct iw_mlme *mlme = (struct iw_mlme *)extra; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; int ret; @@ -4456,7 +4455,7 @@ static int __iw_set_mlme(struct net_device *dev, sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, reason); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { unsigned long rc; rc = wait_for_completion_timeout(&pAdapter-> disconnect_comp_var, @@ -4540,7 +4539,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, { #ifdef QCA_HT_2040_COEX hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(net); - CDF_STATUS halStatus = CDF_STATUS_E_FAILURE; + QDF_STATUS halStatus = QDF_STATUS_E_FAILURE; #endif bool band_24 = false, band_5g = false; bool ch_bond24 = false, ch_bond5g = false; @@ -4765,7 +4764,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, halStatus = sme_set_ht2040_mode(hal, pAdapter->sessionId, eHT_CHAN_HT20, false); - if (halStatus == CDF_STATUS_E_FAILURE) { + if (halStatus == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to disable OBSS")); return -EIO; } @@ -4775,7 +4774,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, halStatus = sme_set_ht2040_mode(hal, pAdapter->sessionId, eHT_CHAN_HT20, true); - if (halStatus == CDF_STATUS_E_FAILURE) { + if (halStatus == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to enable OBSS")); return -EIO; } @@ -4877,7 +4876,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext) */ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) { - CDF_STATUS status; + QDF_STATUS status; struct statsContext tempContext; unsigned long rc; @@ -4891,7 +4890,7 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) tempContext.magic = TEMP_CONTEXT_MAGIC; status = sme_get_temperature(WLAN_HDD_GET_HAL_CTX(pAdapter), &tempContext, hdd_get_temperature_cb); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Unable to retrieve temperature")); } else { @@ -4936,7 +4935,7 @@ static int __iw_setint_getnone(struct net_device *dev, int set_value = value[1]; int ret; int enable_pbm, enable_mp; - CDF_STATUS status; + QDF_STATUS status; ENTER(); @@ -5033,7 +5032,7 @@ static int __iw_setint_getnone(struct net_device *dev, ret = -EINVAL; } else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); @@ -5056,7 +5055,7 @@ static int __iw_setint_getnone(struct net_device *dev, (set_value > CFG_DATA_INACTIVITY_TIMEOUT_MAX) || (sme_cfg_set_int((WLAN_HDD_GET_CTX(pAdapter))->hHal, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, - set_value) == CDF_STATUS_E_FAILURE)) { + set_value) == QDF_STATUS_E_FAILURE)) { hddLog(LOGE, "Failure: Could not pass on " "WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT configuration info " "to CCM"); @@ -5077,7 +5076,7 @@ static int __iw_setint_getnone(struct net_device *dev, if (sme_set_tx_power (hHal, pAdapter->sessionId, bssid, pAdapter->device_mode, - set_value) != CDF_STATUS_SUCCESS) { + set_value) != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting tx power failed", __func__); return -EIO; @@ -5096,7 +5095,7 @@ static int __iw_setint_getnone(struct net_device *dev, cdf_copy_macaddr(&selfMac, &pHddStaCtx->conn_info.bssId); if (sme_set_max_tx_power(hHal, bssid, selfMac, set_value) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed", __func__); @@ -5111,7 +5110,7 @@ static int __iw_setint_getnone(struct net_device *dev, "%s: Setting maximum tx power %d dBm for 2.4 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_24, set_value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 2.4 GHz band", __func__); @@ -5126,7 +5125,7 @@ static int __iw_setint_getnone(struct net_device *dev, "%s: Setting maximum tx power %d dBm for 5.0 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_5G, set_value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 5.0 GHz band", __func__); @@ -5180,7 +5179,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOGE, "NSS greater than 2 not supported"); ret = -EINVAL; } else { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != hdd_update_nss(WLAN_HDD_GET_CTX(pAdapter), set_value)) ret = -EINVAL; @@ -5273,7 +5272,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOG1, "LDPC val %d", set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5311,7 +5310,7 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOG1, "TX_STBC val %d", set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5349,7 +5348,7 @@ static int __iw_setint_getnone(struct net_device *dev, set_value); /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); - if (CDF_STATUS_SUCCESS != ret) { + if (QDF_STATUS_SUCCESS != ret) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", @@ -5414,7 +5413,7 @@ static int __iw_setint_getnone(struct net_device *dev, if (!ret) { if (sme_cfg_set_int (hHal, WNI_CFG_RTS_THRESHOLD, value) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { hddLog(LOGE, "FAILED TO SET RTSCTS"); return -EIO; } @@ -6120,7 +6119,7 @@ static int __iw_setint_getnone(struct net_device *dev, status = sme_ext_change_channel(hHal, set_value, pAdapter->sessionId); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error in change channel status %d"), status); @@ -6174,7 +6173,7 @@ static int __iw_setchar_getnone(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - CDF_STATUS vstatus; + QDF_STATUS vstatus; int sub_cmd; int ret; char *pBuffer = NULL; @@ -6277,7 +6276,7 @@ static int __iw_setchar_getnone(struct net_device *dev, break; case WE_SET_CONFIG: vstatus = hdd_execute_global_config_command(hdd_ctx, pBuffer); - if (CDF_STATUS_SUCCESS != vstatus) { + if (QDF_STATUS_SUCCESS != vstatus) { ret = -EINVAL; } break; @@ -6362,7 +6361,7 @@ static int __iw_setnone_getint(struct net_device *dev, { if (sme_cfg_get_int (hHal, WNI_CFG_ASSOC_STA_LIMIT, - (uint32_t *) value) != CDF_STATUS_SUCCESS) { + (uint32_t *) value) != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); @@ -6638,7 +6637,7 @@ static int __iw_setnone_getint(struct net_device *dev, *value = wma_cli_get_command(pAdapter->sessionId, WMI_PDEV_PARAM_TXPOWER_LIMIT2G, PDEV_CMD); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, &txpow2g)) { return -EIO; @@ -6655,7 +6654,7 @@ static int __iw_setnone_getint(struct net_device *dev, *value = wma_cli_get_command(pAdapter->sessionId, WMI_PDEV_PARAM_TXPOWER_LIMIT5G, PDEV_CMD); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, &txpow5g)) { return -EIO; @@ -6852,9 +6851,9 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, */ case WE_SET_SAP_CHANNELS: if (wlan_hdd_validate_operation_channel(pAdapter, value[1]) != - CDF_STATUS_SUCCESS || + QDF_STATUS_SUCCESS || wlan_hdd_validate_operation_channel(pAdapter, - value[2]) != CDF_STATUS_SUCCESS) { + value[2]) != QDF_STATUS_SUCCESS) { ret = -EINVAL; } else { hdd_ctx->config->force_sap_acs_st_ch = value[1]; @@ -7189,7 +7188,7 @@ static int __iw_get_char_setnone(struct net_device *dev, } case WE_GET_CHANNEL_LIST: { - CDF_STATUS status; + QDF_STATUS status; uint8_t i, len; char *buf; uint8_t ubuf[WNI_CFG_COUNTRY_CODE_LEN]; @@ -7202,7 +7201,7 @@ static int __iw_get_char_setnone(struct net_device *dev, status = iw_softap_get_channel_list(dev, info, wrqu, (char *)&channel_list); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("GetChannelList Failed!!!")); return -EINVAL; } @@ -7221,7 +7220,7 @@ static int __iw_get_char_setnone(struct net_device *dev, } len = scnprintf(buf, WE_MAX_STR_LEN, "%u ", channel_list.num_channels); - if (CDF_STATUS_SUCCESS == sme_get_country_code(hdd_ctx->hHal, + if (QDF_STATUS_SUCCESS == sme_get_country_code(hdd_ctx->hHal, ubuf, &ubuf_len)) { /* Printing Country code in getChannelList */ for (i = 0; i < (ubuf_len - 1); i++) @@ -7292,7 +7291,7 @@ static int __iw_get_char_setnone(struct net_device *dev, ch_bond5g = true; phymode = sme_get_phy_mode(hal); - if ((CDF_STATUS_SUCCESS != + if ((QDF_STATUS_SUCCESS != sme_get_freq_band(hal, &currBand))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, @@ -7919,7 +7918,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, msg.type = SIR_HAL_UNIT_TEST_CMD; msg.reserved = 0; msg.bodyptr = unitTestArgs; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(unitTestArgs); CDF_TRACE(CDF_MODULE_ID_HDD, @@ -8491,7 +8490,7 @@ static int __iw_set_host_offload(struct net_device *dev, * copied individually. */ memcpy(&offloadRequest, pRequest, wrqu->data.length); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offloadRequest)) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -8579,7 +8578,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, hdd_info("Keep alive period %d", request->timePeriod); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_keep_alive(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, request)) { hdd_err("Failure to execute Keep Alive"); @@ -8694,7 +8693,7 @@ static int wlan_hdd_set_filter(hdd_context_t *hdd_ctx, request->params_data[i].data_mask[5]); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_receive_filter_set_filter(hdd_ctx->hHal, &packetFilterSetReq, sessionId)) { @@ -8709,7 +8708,7 @@ static int wlan_hdd_set_filter(hdd_context_t *hdd_ctx, hdd_info("Clear Packet Filter Request for Id: %d", request->filter_id); packetFilterClrReq.filterId = request->filter_id; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_receive_filter_clear_filter(hdd_ctx->hHal, &packetFilterClrReq, sessionId)) { @@ -8814,7 +8813,7 @@ static int __iw_get_statistics(struct net_device *dev, { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState; hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); @@ -8848,7 +8847,7 @@ static int __iw_get_statistics(struct net_device *dev, (pAdapter))->conn_info.staId[0], pAdapter, pAdapter->sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve SME statistics", __func__); @@ -9259,7 +9258,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); eCsrBand band; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx; hdd_adapter_list_node_t *pAdapterNode, *pNext; eCsrBand currBand = eCSR_BAND_MAX; @@ -9308,7 +9307,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) band = pHddCtx->config->nBandCapability; } - if (CDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { + if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; @@ -9324,7 +9323,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) __func__, currBand, band); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); - while (NULL != pAdapterNode && CDF_STATUS_SUCCESS == status) { + while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId, @@ -9341,7 +9340,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) (hdd_conn_is_connected (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) && (connectedBand != band)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; long lrc; /* STA already connected on current band, So issue disconnect @@ -9359,7 +9358,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) pAdapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s csr_roam_disconnect failure, returned %d", __func__, (int)status); @@ -9387,7 +9386,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) pAdapterNode = pNext; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sme_set_freq_band(hHal, pAdapter->sessionId, band)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, FL("Failed to set the band value to %u"), @@ -10744,7 +10743,7 @@ int hdd_set_wext(hdd_adapter_t *pAdapter) hdd_clear_roam_profile_ie(pAdapter); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -10768,19 +10767,19 @@ int hdd_register_wext(struct net_device *dev) CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Register as a wireless device */ dev->wireless_handlers = (struct iw_handler_def *)&we_handler_def; diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 582b2dfd5713..3cbff0221040 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -158,7 +158,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_STATUS status; + QDF_STATUS status; uint32_t service_interval; uint32_t suspension_interval; sme_QosWmmDirType direction; @@ -209,7 +209,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) direction, psb, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to enable U-APSD for AC=%d", __func__, acType); @@ -243,7 +243,7 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_STATUS status; + QDF_STATUS status; /* have we previously enabled UAPSD? */ if (pAc->wmmAcUapsdInfoValid == true) { @@ -254,7 +254,7 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) (pAdapter))->conn_info.staId[0], acType, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to disable U-APSD for AC=%d", __func__, acType); @@ -376,7 +376,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) hdd_adapter_t *pAdapter; hdd_wmm_ac_status_t *pAc; hdd_wlan_wmm_status_e status; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t currentTrafficCnt = 0; sme_ac_enum_type acType = pQosContext->acType; @@ -405,10 +405,10 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) pAc->wmmPrevTrafficCnt = currentTrafficCnt; if (pAc->wmmInactivityTimer.state == CDF_TIMER_STATE_STOPPED) { /* Restart the timer */ - cdf_status = + qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL( @@ -437,13 +437,13 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) * time specified in the AddTS parameters is non-zero, this function * is invoked to start a traffic inactivity timer for the given AC. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, uint32_t inactivityTime) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc; @@ -451,28 +451,28 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAdapter = pQosContext->pAdapter; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - cdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, + qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, CDF_TIMER_TYPE_SW, hdd_wmm_inactivity_timer_cb, pQosContext); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Initializing inactivity timer failed on AC %d"), acType); - return cdf_status; + return qdf_status; } /* Start the inactivity timer */ - cdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, + qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Starting inactivity timer failed on AC %d"), acType); - cdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to destroy inactivity timer"); } - return cdf_status; + return qdf_status; } pAc->wmmInactivityTime = inactivityTime; /* Initialize the current tx traffic count on this AC */ @@ -480,7 +480,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext-> acType]; pQosContext->is_inactivity_timer_running = true; - return cdf_status; + return qdf_status; } /** @@ -492,15 +492,15 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, * This function is invoked to disable the traffic inactivity timer * for the given AC. This is normally done when the TS is deleted. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS +static QDF_STATUS hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) { hdd_adapter_t *pAdapter = pQosContext->pAdapter; sme_ac_enum_type acType = pQosContext->acType; hdd_wmm_ac_status_t *pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; /* Clear the timer and the counter */ pAc->wmmInactivityTime = 0; @@ -508,17 +508,17 @@ hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) if (pQosContext->is_inactivity_timer_running == true) { pQosContext->is_inactivity_timer_running = false; - cdf_status = cdf_mc_timer_stop(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_stop(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to stop inactivity timer"); - return cdf_status; + return qdf_status; } - cdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hdd_err("Failed to destroy inactivity timer:Timer started"); } - return cdf_status; + return qdf_status; } #endif /* FEATURE_WLAN_ESE */ @@ -536,9 +536,9 @@ hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) * gets called externally through some function pointer magic (so * there is a need for rigorous parameter checking). * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, +static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, void *hddCtx, sme_QosWmmTspecInfo *pCurrentQosInfo, sme_QosStatusType smeStatus, @@ -556,7 +556,7 @@ static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pAdapter = pQosContext->pAdapter; @@ -1059,7 +1059,7 @@ static CDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, "%s: complete, access for TL AC %d is%sallowed", __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not "); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -1371,9 +1371,9 @@ static void hdd_wmm_do_implicit_qos(struct work_struct *work) * adapter to an initial state. The configuration can later be * overwritten via application APIs or via QoS Map sent OTA. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) { sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap; uint8_t dscp; @@ -1391,7 +1391,7 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) /* Special case for Expedited Forwarding (DSCP 46) */ hddWmmDscpToUpMap[46] = SME_QOS_WMM_UP_VO; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1402,9 +1402,9 @@ CDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) * adapter to an initial state. The configuration can later be * overwritten via application APIs * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; @@ -1432,7 +1432,7 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) */ pAdapter->configuredPsb = HDD_PSB_CFG_INVALID; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1441,9 +1441,9 @@ CDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) * * @pAdapter: [in] pointer to Adapter context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; @@ -1460,7 +1460,7 @@ CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) pAcStatus->wmmAcTspecValid = false; pAcStatus->wmmAcUapsdInfoValid = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1470,9 +1470,9 @@ CDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) * Function which will perform any necessary work to to clean up the * WMM functionality prior to the kernel module unload. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) { hdd_wmm_qos_context_t *pQosContext; @@ -1494,7 +1494,7 @@ CDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) hdd_wmm_free_context(pQosContext); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1792,9 +1792,9 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, * @pGranted: [out] pointer to bool flag when indicates if access * has been granted or not * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, sme_ac_enum_type acType, bool *pGranted) { hdd_wmm_qos_context_t *pQosContext; @@ -1815,7 +1815,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, pAdapter->hddWmmStatus.wmmAcStatus[acType]. wmmAcAccessAllowed; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* do we already have an implicit QoS request pending for this AC? */ if ((pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessNeeded) || @@ -1828,7 +1828,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, __func__, acType); *pGranted = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* did we already fail to establish implicit QoS for this AC? * (if so, access should have been granted when the failure @@ -1853,7 +1853,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, *pGranted = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, @@ -1872,7 +1872,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; *pGranted = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } pQosContext->acType = acType; @@ -1899,7 +1899,7 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * TSPEC negotiation completes */ *pGranted = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1910,13 +1910,13 @@ CDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, * @pRoamInfo: [in] pointer to roam information * @eBssType: [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType) { uint8_t uapsdMask; - CDF_STATUS status; + QDF_STATUS status; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); /* when we associate we need to notify TL if it needs to @@ -1939,7 +1939,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Reassoc so no work, Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* get the negotiated UAPSD Mask */ uapsdMask = @@ -1961,7 +1961,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_VI) { @@ -1977,7 +1977,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BK) { @@ -1993,7 +1993,7 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BE) { @@ -2009,21 +2009,21 @@ CDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } status = sme_update_dsc_pto_up_mapping(pHddCtx->hHal, pAdapter->hddWmmDscpToUpMap, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_wmm_init(pAdapter); } CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static const uint8_t acm_mask_bit[WLAN_MAX_AC] = { @@ -2041,9 +2041,9 @@ static const uint8_t acm_mask_bit[WLAN_MAX_AC] = { * @pRoamInfo: [in] pointer to roam information * @eBssType : [in] type of BSS * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, eCsrRoamBssType eBssType) { int ac; @@ -2108,7 +2108,7 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2118,9 +2118,9 @@ CDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, * @pAdapter : [in] pointer to adapter context * @pUapsdMask: [out] pointer to where the UAPSD Mask is to be stored * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, +QDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, uint8_t *pUapsdMask) { uint8_t uapsdMask; @@ -2157,7 +2157,7 @@ CDF_STATUS hdd_wmm_get_uapsd_mask(hdd_adapter_t *pAdapter, /* return calculated mask */ *pUapsdMask = uapsdMask; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 2901e1c2d207..fc1992a506da 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -57,7 +57,7 @@ static inline int find_ptrn_len(const char *ptrn) return len; } -static void hdd_wowl_callback(void *pContext, CDF_STATUS cdf_ret_status) +static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Return code = (%d)", __func__, cdf_ret_status); @@ -117,7 +117,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) { struct wow_add_pattern localPattern; int i, first_empty_slot, len, offset; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; const char *temp; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t sessionId = pAdapter->sessionId; @@ -256,7 +256,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) cdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Add failed, so invalidate the local storage */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", @@ -293,7 +293,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) unsigned char id; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); bool patternFound = false; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; uint8_t sessionId = pAdapter->sessionId; hdd_context_t *pHddCtx = pAdapter->pHddCtx; @@ -314,7 +314,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Remove from local storage as well */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, @@ -344,7 +344,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, char *pattern_mask) { struct wow_add_pattern localPattern; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t session_id = pAdapter->sessionId; uint16_t pattern_len, mask_len, i; @@ -432,7 +432,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, cdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, session_id); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -463,7 +463,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) { struct wow_delete_pattern delPattern; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { @@ -487,7 +487,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -513,7 +513,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) { tSirSmeWowlEnterParams wowParams; - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); cdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams)); @@ -541,8 +541,8 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) #endif /* WLAN_WAKEUP_EVENTS */ &wowParams, pAdapter->sessionId); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - if (CDF_STATUS_PMC_PENDING != cdf_ret_status) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { /* We failed to enter WoWL */ CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", @@ -563,12 +563,12 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) { tSirSmeWowlExitParams wowParams; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; wowParams.sessionId = pAdapter->sessionId; cdf_ret_status = sme_exit_wowl(hHal, &wowParams); - if (!CDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", cdf_ret_status); diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index d3d8a72837f2..cb22f9a2a7cf 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -247,7 +247,7 @@ enum wifi_logging_ring_id { /* ------------------------------------------------------------------- */ /* Change channel generic scheme */ -typedef void (*CHANGE_CHANNEL_CALLBACK)(tpAniSirGlobal pMac, CDF_STATUS status, +typedef void (*CHANGE_CHANNEL_CALLBACK)(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); @@ -842,7 +842,7 @@ typedef struct sAniSirLim { uint8_t gLimDfsTargetChanNum; uint8_t probeCounter; uint8_t maxProbe; - CDF_STATUS(*add_bssdescr_callback) + QDF_STATUS(*add_bssdescr_callback) (tpAniSirGlobal pMac, tpSirBssDescription buf, uint32_t scan_id, uint32_t flags); uint8_t retry_packet_cnt; diff --git a/core/mac/inc/mac_trace.h b/core/mac/inc/mac_trace.h index dbe01b1f3f24..919b0f5bf96b 100644 --- a/core/mac/inc/mac_trace.h +++ b/core/mac/inc/mac_trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -57,8 +57,8 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t limMsg); uint8_t *mac_trace_get_wma_msg_string(uint16_t wmaMsg); uint8_t *mac_trace_get_sme_msg_string(uint16_t smeMsg); uint8_t *mac_trace_get_info_log_string(uint16_t infoLog); -CDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe); -CDF_STATUS pe_release_global_lock(tAniSirLim *psPe); +QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe); +QDF_STATUS pe_release_global_lock(tAniSirLim *psPe); uint8_t *mac_trace_get_neighbour_roam_state(uint16_t neighbourRoamState); uint8_t *mac_trace_getcsr_roam_state(uint16_t csr_roamState); diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 87a829c3f82a..878ce5f883db 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2322,7 +2322,7 @@ typedef struct sSirHalWowlEnterParams { /* Status code to be filled by HAL when it sends * SIR_HAL_WOWL_ENTER_RSP to PE. */ - CDF_STATUS status; + QDF_STATUS status; /*BSSID to find the current session */ @@ -2342,7 +2342,7 @@ typedef struct sSirHalWowlExitParams { /* Status code to be filled by HAL when it sends * SIR_HAL_WOWL_EXIT_RSP to PE. */ - CDF_STATUS status; + QDF_STATUS status; /*BSSIDX to find the current session */ diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h index e10b3aace852..149a2c0d71f9 100644 --- a/core/mac/src/pe/include/lim_api.h +++ b/core/mac/src/pe/include/lim_api.h @@ -167,7 +167,7 @@ bool lim_is_deauth_diassoc_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info); bool lim_is_assoc_req_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, +QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr, tpSirBssDescription bss_desc_ptr); #endif @@ -229,7 +229,7 @@ void pe_free_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg); \return void --------------------------------------------------------------------------*/ -void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data); +void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data); void lim_process_abort_scan_ind(tpAniSirGlobal pMac, uint8_t sessionId, uint32_t scan_id, uint32_t scan_requestor_id); diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index b27e8e7310d4..eccc869d95dc 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -48,11 +48,11 @@ void lim_ft_open(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry); int lim_process_ft_pre_auth_req(tpAniSirGlobal pMac, tpSirMsgQ pMsg); -void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); -void limPerformPostFTPreAuth(tpAniSirGlobal pMac, CDF_STATUS status, +void limPerformPostFTPreAuth(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); -void limFTResumeLinkCb(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data); +void limFTResumeLinkCb(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data); void lim_post_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, uint8_t *auth_rsp, uint16_t auth_rsp_length, tpPESession psessionEntry); @@ -81,7 +81,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, uint8_t updateEntry, tpPESession pftSessionEntry, tpSirBssDescription bssDescription); -CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, +QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req); #endif /* __LIMFT_H__ */ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 3969a17599ca..8ee02bc3c708 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -209,7 +209,7 @@ typedef enum eLimDot11hChanSwStates { /* WLAN_SUSPEND_LINK Related */ typedef void (*SUSPEND_RESUME_LINK_CALLBACK)(tpAniSirGlobal pMac, - CDF_STATUS status, + QDF_STATUS status, uint32_t *data); /* LIM to HAL SCAN Management Message Interface states */ diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index 2f13a411640d..7dd6fca75246 100644 --- a/core/mac/src/pe/lim/lim_admit_control.c +++ b/core/mac/src/pe/lim/lim_admit_control.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1087,7 +1087,7 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) goto end; } - if (pAddTsRspMsg->status == CDF_STATUS_SUCCESS) { + if (pAddTsRspMsg->status == QDF_STATUS_SUCCESS) { PELOG1(lim_log (pMac, LOG1, FL("Received successful ADDTS response from HAL ")); diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 0fcf3782a9a4..fc694a5eead4 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -766,7 +766,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) pMac->lim.mgmtFrameSessionId = 0xff; pMac->lim.deferredMsgCnt = 0; - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pMac->lim.lkPeGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pMac->lim.lkPeGlobalLock))) { PELOGE(lim_log(pMac, LOGE, FL("pe lock init failed!"));) status = eSIR_FAILURE; goto pe_open_lock_fail; @@ -829,7 +829,7 @@ tSirRetStatus pe_close(tpAniSirGlobal pMac) cdf_mem_free(pMac->lim.gpSession); pMac->lim.gpSession = NULL; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mutex_destroy(&pMac->lim.lkPeGlobalLock))) { return eSIR_FAILURE; } @@ -987,18 +987,18 @@ tSirRetStatus pe_process_messages(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * @return None */ -CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) +QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) { tpAniSirGlobal pMac; tpSirMacMgmtHdr mHdr; tSirMsgQ msg; cds_pkt_t *pVosPkt; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t *pRxPacketInfo; pVosPkt = (cds_pkt_t *) cds_buff; if (NULL == pVosPkt) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); @@ -1006,16 +1006,16 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) /* cannot log a failure without a valid pMac */ cds_pkt_return_packet(pVosPkt); pVosPkt = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = + qdf_status = wma_ds_peek_rx_packet_info(pVosPkt, (void *)&pRxPacketInfo, false); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_pkt_return_packet(pVosPkt); pVosPkt = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -1065,10 +1065,10 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) lim_log(pMac, LOGW, FL ("sys_bbt_process_message_core failed to process SIR_BB_XPORT_MGMT_MSG")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1081,20 +1081,20 @@ CDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) void pe_register_wma_handle(tpAniSirGlobal pMac, tSirSmeReadyReq *ready_req) { void *p_cds_gctx; - CDF_STATUS retStatus; + QDF_STATUS retStatus; p_cds_gctx = cds_get_global_context(); retStatus = wma_register_mgmt_frm_client(p_cds_gctx, pe_handle_mgmt_frame); - if (retStatus != CDF_STATUS_SUCCESS) + if (retStatus != QDF_STATUS_SUCCESS) lim_log(pMac, LOGP, FL("Registering the PE Handle with WMA has failed")); retStatus = wma_register_roaming_callbacks(p_cds_gctx, ready_req->csr_roam_synch_cb, ready_req->pe_roam_synch_cb); - if (retStatus != CDF_STATUS_SUCCESS) + if (retStatus != QDF_STATUS_SUCCESS) lim_log(pMac, LOGP, FL("Registering roaming callbacks with WMA failed")); } @@ -1836,7 +1836,7 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp) #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, +QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_offload_synch_ind_ptr, tpSirBssDescription bss_desc_ptr) { @@ -1852,7 +1852,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (tpSirProbeRespBeacon) cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == parsed_frm_ptr) { lim_log(pMac, LOGE, "fail to allocate memory for frame"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (roam_offload_synch_ind_ptr->beaconProbeRespLength <= @@ -1861,7 +1861,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "few bytes in synchInd beacon / probe resp frame! length=%d", __func__, roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, @@ -1879,7 +1879,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "Parse error Beacon, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { if (sir_convert_probe_frame2_struct(pMac, @@ -1891,7 +1891,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "Parse error ProbeResponse, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } /* 24 byte MAC header and 12 byte to ssid IE */ @@ -1983,7 +1983,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, ie_len); } cdf_mem_free(parsed_frm_ptr); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * pe_roam_synch_callback() - PE level callback for roam synch propagation @@ -1997,7 +1997,7 @@ CDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, * * Return: Success or Failure status */ -CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, +QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, roam_offload_synch_ind *roam_sync_ind_ptr, tpSirBssDescription bss_desc) { @@ -2008,7 +2008,7 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, uint16_t aid; tpAddBssParams add_bss_params; uint8_t local_nss; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!roam_sync_ind_ptr) { lim_log(mac_ctx, LOGE, FL("LFR3:roam_sync_ind_ptr is NULL")); @@ -2030,11 +2030,11 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, return status; } status = lim_roam_fill_bss_descr(mac_ctx, roam_sync_ind_ptr, bss_desc); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { lim_log(mac_ctx, LOGE, FL("LFR3:Failed to fill Bss Descr")); return status; } - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; ft_session_ptr = pe_create_session(mac_ctx, bss_desc->bssId, &session_id, mac_ctx->lim.maxStation, eSIR_INFRASTRUCTURE_MODE); @@ -2096,7 +2096,7 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, if (NULL == mac_ctx->roam.pReassocResp) { lim_log(mac_ctx, LOGE, FL("LFR3:assoc resp mem alloc failed")); ft_session_ptr->bRoamSynchInProgress = false; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(mac_ctx->roam.pReassocResp, (uint8_t *)roam_sync_ind_ptr + @@ -2137,7 +2137,7 @@ CDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, if (mac_ctx->roam.pReassocResp) cdf_mem_free(mac_ctx->roam.pReassocResp); mac_ctx->roam.pReassocResp = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -2259,26 +2259,26 @@ tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(tpAniSirGlobal pMac, return eMGMT_DROP_NO_DROP; } -CDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe) +QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psPe) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_acquire(&psPe->lkPeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } return status; } -CDF_STATUS pe_release_global_lock(tAniSirLim *psPe) +QDF_STATUS pe_release_global_lock(tAniSirLim *psPe) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psPe) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_release(&psPe->lkPeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } return status; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 7625e460c84b..e9cdcd7c155a 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1980,7 +1980,7 @@ tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set, uint8_t *supported_mcs_set, tpPESession session_entry, - tDot11fIEVHTCaps * vht_caps) + tDot11fIEVHTCaps *vht_caps) #else tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, @@ -2348,7 +2348,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, add_sta_params->updateSta = update_entry; - add_sta_params->status = CDF_STATUS_SUCCESS; + add_sta_params->status = QDF_STATUS_SUCCESS; add_sta_params->respReqd = 1; /* Update HT Capability */ @@ -2757,7 +2757,7 @@ lim_del_sta(tpAniSirGlobal pMac, cdf_mem_copy((uint8_t *) pDelStaParams->staMac, (uint8_t *) pStaDs->staAddr, sizeof(tSirMacAddr)); - pDelStaParams->status = CDF_STATUS_SUCCESS; + pDelStaParams->status = QDF_STATUS_SUCCESS; msgQ.type = WMA_DELETE_STA_REQ; msgQ.reserved = 0; msgQ.bodyptr = pDelStaParams; @@ -2908,7 +2908,7 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->assocId = psessionEntry->limAID; pAddStaParams->staType = STA_ENTRY_SELF; - pAddStaParams->status = CDF_STATUS_SUCCESS; + pAddStaParams->status = QDF_STATUS_SUCCESS; pAddStaParams->respReqd = 1; /* Update PE session ID */ @@ -3586,7 +3586,7 @@ lim_del_bss(tpAniSirGlobal pMac, tpDphHashNode pStaDs, uint16_t bssIdx, lim_deactivate_and_change_timer(pMac, eLIM_JOIN_FAIL_TIMER); } - pDelBssParams->status = CDF_STATUS_SUCCESS; + pDelBssParams->status = QDF_STATUS_SUCCESS; pDelBssParams->respReqd = 1; cdf_mem_copy(pDelBssParams->bssid, psessionEntry->bssId, sizeof(tSirMacAddr)); @@ -4213,7 +4213,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower); #endif /* FIXME_GEN4 - Any other value that can be used for initialization? */ - pAddBssParams->status = CDF_STATUS_SUCCESS; + pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; /* update persona */ pAddBssParams->halPersona = (uint8_t) psessionEntry->pePersona; @@ -4744,7 +4744,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower); #endif - pAddBssParams->status = CDF_STATUS_SUCCESS; + pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; pAddBssParams->staContext.smesessionId = psessionEntry->smeSessionId; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 1cda53dc8294..8941504ba4a9 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -50,7 +50,7 @@ #include "wma.h" extern void lim_send_set_sta_key_req(tpAniSirGlobal pMac, - tLimMlmSetKeysReq *pMlmSetKeysReq, + tLimMlmSetKeysReq * pMlmSetKeysReq, uint16_t staIdx, uint8_t defWEPIdx, tpPESession sessionEntry, bool sendRsp); @@ -283,7 +283,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) FL("Performing pre-auth on same channel (session %p)"), session); /* We are in the same channel. Perform pre-auth */ - lim_perform_ft_pre_auth(mac_ctx, CDF_STATUS_SUCCESS, NULL, + lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, session); } @@ -294,7 +294,7 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) * Send the Auth1 * Receive back Auth2 *------------------------------------------------------------------*/ -void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry) { tSirMacAuthFrameBody authFrame; @@ -314,7 +314,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, CDF_STATUS status, } } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGE, FL(" Change channel not successful for FT pre-auth")); goto preauth_fail; @@ -404,7 +404,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, cdf_mem_free(pBeaconStruct); lim_log(pMac, LOGP, FL("Unable to allocate memory for creating ADD_BSS")); - return (eSIR_MEM_ALLOC_FAILED); + return eSIR_MEM_ALLOC_FAILED; } cdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); @@ -726,7 +726,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, } #endif - pAddBssParams->status = CDF_STATUS_SUCCESS; + pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; pAddBssParams->staContext.sessionId = pftSessionEntry->peSessionId; @@ -1012,7 +1012,7 @@ tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, /*------------------------------------------------------------------ * Resume Link Call Back *------------------------------------------------------------------*/ -void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, QDF_STATUS status, tpPESession psessionEntry) { if (NULL == psessionEntry || @@ -1172,10 +1172,11 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, pbssDescription = psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription; lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1); - if ((pftSessionEntry = + pftSessionEntry = pe_create_session(pMac, pbssDescription->bssId, &sessionId, pMac->lim.maxStation, - psessionEntry->bssType)) == NULL) { + psessionEntry->bssType); + if (pftSessionEntry == NULL) { lim_log(pMac, LOGE, FL( "Session not created for pre-auth 11R AP")); status = eSIR_FAILURE; @@ -1655,7 +1656,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) } for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) { if ((((1 << i) & pAggrQosRspMsg->tspecIdx)) && - (pAggrQosRspMsg->status[i] != CDF_STATUS_SUCCESS)) { + (pAggrQosRspMsg->status[i] != QDF_STATUS_SUCCESS)) { sir_copy_mac_addr(peerMacAddr, psessionEntry->bssId); addTsParam.staIdx = pAggrQosRspMsg->staIdx; addTsParam.sessionId = pAggrQosRspMsg->sessionId; @@ -1878,7 +1879,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf * * Return: Status of sending message to WMA. */ -CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, +QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req) { @@ -1890,7 +1891,7 @@ CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, if (NULL == scan_offload_req) { lim_log(mac_ctx, LOGE, FL("Memory allocation failed for pScanOffloadReq")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq)); @@ -1932,10 +1933,10 @@ CDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, if (rc != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL("START_SCAN_OFFLOAD failed %u"), rc); cdf_mem_free(scan_offload_req); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1982,13 +1983,13 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, * after successful auth, or timed out. Either way, STA * is back to home channel. Data traffic can continue. */ - lim_ft_process_pre_auth_result(mac_ctx, CDF_STATUS_SUCCESS, + lim_ft_process_pre_auth_result(mac_ctx, QDF_STATUS_SUCCESS, session_entry); break; case SCAN_EVENT_FOREIGN_CHANNEL: /* Sta is on candidate channel. Send auth */ - lim_perform_ft_pre_auth(mac_ctx, CDF_STATUS_SUCCESS, NULL, + lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, session_entry); break; default: diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index e12252b16e08..4d674fd8c568 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1088,7 +1088,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) return eSIR_FAILURE; } - if (pAddStaParams->status != CDF_STATUS_SUCCESS) { + if (pAddStaParams->status != QDF_STATUS_SUCCESS) { PELOGE(lim_log (pMac, LOGE, FL("IBSS: ADD_STA_RSP error (%x) "), pAddStaParams->status); @@ -1137,7 +1137,7 @@ void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, goto end; } - if (pDelBss->status != CDF_STATUS_SUCCESS) { + if (pDelBss->status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGE, FL("IBSS: DEL_BSS_RSP(coalesce) error (%x) Bss %d "), pDelBss->status, pDelBss->bssIdx); @@ -1234,7 +1234,7 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn return; } - if (pDelBss->status != CDF_STATUS_SUCCESS) { + if (pDelBss->status != QDF_STATUS_SUCCESS) { PELOGE(lim_log (pMac, LOGE, FL("IBSS: DEL_BSS_RSP error (%x) Bss %d "), pDelBss->status, pDelBss->bssIdx); diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 5e06023116c6..3a7dba6e0164 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -26,7 +26,7 @@ */ /*=========================================================================== - L I M _ P 2 P . C + L I M _ P 2 P . C OVERVIEW: @@ -36,7 +36,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -46,7 +46,7 @@ when who what, where, why ---------- --- -------------------------------------------------------- 2011-05-02 djindal Corrected file indentation and changed remain on channel - handling for concurrency. + handling for concurrency. ===========================================================================*/ #include "lim_utils.h" @@ -63,21 +63,21 @@ received Beacon/Prpbe Resp. */ #define MAX_TIME_TO_BE_ACTIVE_CHANNEL 9000 -void lim_exit_remain_on_channel(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_exit_remain_on_channel(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); extern tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMacAddr, tpSetLinkStateCallback callback, void *callbackArg); -CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); +QDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); /*------------------------------------------------------------------ * * Below function is called if hdd requests a remain on channel. * *------------------------------------------------------------------*/ -static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, +static QDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, tSirRemainOnChnReq * pRemOnChnReq) { @@ -89,7 +89,7 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, if (NULL == pScanOffloadReq) { lim_log(pMac, LOGE, FL("Memory allocation failed for pScanOffloadReq")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pScanOffloadReq, sizeof(tSirScanOffloadReq)); @@ -122,10 +122,10 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure %u"), rc); cdf_mem_free(pScanOffloadReq); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*------------------------------------------------------------------ @@ -137,11 +137,11 @@ static CDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg) { tSirRemainOnChnReq *msgbuff = (tSirRemainOnChnReq *) pMsg; - CDF_STATUS status; + QDF_STATUS status; pMac->lim.gpLimRemainOnChanReq = msgbuff; status = lim_send_hal_req_remain_on_chan_offload(pMac, msgbuff); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { /* Post the meessage to Sme */ lim_send_sme_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, status, msgbuff->sessionId, msgbuff->scan_id); @@ -250,14 +250,13 @@ void lim_process_remain_on_chn_timeout(tpAniSirGlobal mac_ctx) /* get the previous valid LINK state */ if (lim_set_link_state(mac_ctx, eSIR_LINK_IDLE_STATE, null_bssid, - mac_ctx->lim.gSelfMacAddr, NULL, NULL) != eSIR_SUCCESS) - { + mac_ctx->lim.gSelfMacAddr, NULL, NULL) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL("Unable to change link state")); return; } if (mac_ctx->lim.gLimMlmState != eLIM_MLM_P2P_LISTEN_STATE) { - lim_remain_on_chn_rsp(mac_ctx, CDF_STATUS_SUCCESS, NULL); + lim_remain_on_chn_rsp(mac_ctx, QDF_STATUS_SUCCESS, NULL); } else { session = pe_find_session_by_session_id(mac_ctx, roc_timer->sessionId); @@ -269,11 +268,11 @@ void lim_process_remain_on_chn_timeout(tpAniSirGlobal mac_ctx) goto error; } - lim_exit_remain_on_channel(mac_ctx, CDF_STATUS_SUCCESS, NULL, + lim_exit_remain_on_channel(mac_ctx, QDF_STATUS_SUCCESS, NULL, session); return; error: - lim_remain_on_chn_rsp(mac_ctx, CDF_STATUS_E_FAILURE, NULL); + lim_remain_on_chn_rsp(mac_ctx, QDF_STATUS_E_FAILURE, NULL); } return; } @@ -285,21 +284,21 @@ error: * *------------------------------------------------------------------*/ -void lim_exit_remain_on_channel(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_exit_remain_on_channel(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry) { - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { PELOGE(lim_log(pMac, LOGE, "Remain on Channel Failed");) goto error; } /* Set the resume channel to Any valid channel (invalid). */ /* This will instruct HAL to set it to any previous valid channel. */ pe_set_resume_channel(pMac, 0, 0); - lim_remain_on_chn_rsp(pMac, CDF_STATUS_SUCCESS, NULL); + lim_remain_on_chn_rsp(pMac, QDF_STATUS_SUCCESS, NULL); return; error: - lim_remain_on_chn_rsp(pMac, CDF_STATUS_E_FAILURE, NULL); + lim_remain_on_chn_rsp(pMac, QDF_STATUS_E_FAILURE, NULL); return; } @@ -308,7 +307,7 @@ error: * Send remain on channel respone: Success/ Failure * *------------------------------------------------------------------*/ -void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data) +void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data) { tpPESession psessionEntry; uint8_t sessionId; @@ -324,7 +323,7 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *dat } /* Incase of the Remain on Channel Failure Case */ /* Cleanup Everything */ - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { /* Deactivate Remain on Channel Timer */ lim_deactivate_and_change_timer(pMac, eLIM_REMAIN_CHN_TIMER); @@ -342,10 +341,11 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *dat } /* delete the session */ - if ((psessionEntry = pe_find_session_by_bssid(pMac, + psessionEntry = pe_find_session_by_bssid(pMac, MsgRemainonChannel-> selfMacAddr.bytes, - &sessionId)) != NULL) { + &sessionId); + if (psessionEntry != NULL) { if (LIM_IS_P2P_DEVICE_ROLE(psessionEntry)) { pe_delete_session(pMac, psessionEntry); } @@ -412,7 +412,7 @@ void lim_send_sme_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType, return; } -CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) +QDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) { if (pMac->lim.mgmtFrameSessionId != 0xff) { /* The session entry might be invalid(0xff) action confirmation received after @@ -424,7 +424,7 @@ CDF_STATUS lim_p2p_action_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) pMac->lim.mgmtFrameSessionId = 0xff; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -445,7 +445,7 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, { uint8_t tx_flag = 0; tpSirMacFrameCtl fc = (tpSirMacFrameCtl) mb_msg->data; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t sme_session_id = 0; uint16_t channel_freq; @@ -459,7 +459,7 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, if ((SIR_MAC_MGMT_PROBE_RSP == fc->subType) || (mb_msg->noack)) { - cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) msg_len, + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) msg_len, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_session_id, @@ -468,11 +468,11 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, if (!mb_msg->noack) lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF, - cdf_status, mb_msg->sessionId, 0); + qdf_status, mb_msg->sessionId, 0); mac_ctx->lim.mgmtFrameSessionId = 0xff; } else { mac_ctx->lim.mgmtFrameSessionId = mb_msg->sessionId; - cdf_status = + qdf_status = wma_tx_frameWithTxComplete(mac_ctx, packet, (uint16_t) msg_len, TXRX_FRM_802_11_MGMT, @@ -481,12 +481,12 @@ static void lim_tx_action_frame(tpAniSirGlobal mac_ctx, sme_session_id, false, channel_freq); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("couldn't send action frame")); lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF, - cdf_status, mb_msg->sessionId, 0); + qdf_status, mb_msg->sessionId, 0); mac_ctx->lim.mgmtFrameSessionId = 0xff; } else { mac_ctx->lim.mgmtFrameSessionId = mb_msg->sessionId; @@ -516,7 +516,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, uint32_t msg_len; uint8_t *frame; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpSirMacFrameCtl fc = (tpSirMacFrameCtl) mb_msg->data; uint8_t noa_len = 0; uint8_t noa_stream[SIR_MAX_NOA_ATTR_LEN + (2 * SIR_P2P_IE_HEADER_LEN)]; @@ -541,7 +541,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("RemainOnChannel is not running\n")); lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF, - CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); + QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); return; } sme_session_id = mb_msg->sessionId; @@ -654,9 +654,9 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, msg_len - PROBE_RSP_IE_OFFSET); /* Ok-- try to allocate some memory: */ - cdf_status = cds_packet_alloc((uint16_t) msg_len, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) msg_len, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("Failed to allocate %d bytes for a Probe Request."), msg_len); @@ -720,7 +720,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, FL("Dropping SA Query - PE Session not found")); lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF, - CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); + QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); cds_packet_free((void *)packet); return; } @@ -734,7 +734,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, FL("Dropping SA Query due to non PMF conne.")); lim_send_sme_rsp(mac_ctx, eWNI_SME_ACTION_FRAME_SEND_CNF, - CDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); + QDF_STATUS_E_FAILURE, mb_msg->sessionId, 0); cds_packet_free((void *)packet); return; } diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 5d97eaaf05be..19b3889f60b8 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -811,8 +811,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, /* Stop Association failure timer */ if (subtype == LIM_ASSOC) lim_deactivate_and_change_timer(mac_ctx, eLIM_ASSOC_FAIL_TIMER); - else - { + else { /* Stop Reassociation failure timer */ mac_ctx->lim.reAssocRetryAttempt = 0; if ((NULL != mac_ctx->lim.pSessionEntry) @@ -893,7 +892,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, FL("ASSOC res with eSIR_MAC_TRY_AGAIN_LATER " " recvd.Starting timer to wait timeout=%d."), timeout_value); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cdf_mc_timer_start( &session_entry->pmfComebackTimer, timeout_value)) { diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 2543a3b9c4e3..1723a7b9d457 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -200,7 +200,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, * get random bytes and use as challenge text. * If it fails we already have random stack bytes. */ - if (!CDF_IS_STATUS_SUCCESS(cds_rand_get_bytes(0, + if (!QDF_IS_STATUS_SUCCESS(cds_rand_get_bytes(0, (uint8_t *) challenge_txt_arr, SIR_MAC_AUTH_CHALLENGE_LENGTH))) lim_log(mac_ctx, LOGE, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 11bca80775a3..aa8f16ceabaf 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1018,9 +1018,9 @@ end: ***NOTE: * * @param pMac Pointer to Global MAC structure - * @return CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE + * @return QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE */ -CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, +QDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, uint8_t SessionId, uint32_t scan_id, uint32_t scan_requestor_id) { tSirMsgQ msg; @@ -1031,7 +1031,7 @@ CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, if (NULL == pAbortScanParams) { lim_log(pMac, LOGP, FL("Memory allocation failed for AbortScanParams")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pAbortScanParams->SessionId = SessionId; @@ -1045,11 +1045,11 @@ CDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure")); cdf_mem_free(pAbortScanParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } lim_log(pMac, LOG1, FL("Abort ongoing offload scan.")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1110,10 +1110,10 @@ void lim_message_processor(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #ifdef FEATURE_OEM_DATA_SUPPORT -void lim_oem_data_rsp_handle_resume_link_rsp(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_oem_data_rsp_handle_resume_link_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *mlmOemDataRsp) { - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGE, FL ("OEM Data Rsp failed to get the response for resume link")); @@ -1175,7 +1175,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) tLinkStateParams *link_state_param; uint16_t pkt_len = 0; cds_pkt_t *body_ptr = NULL; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tSirMsgQ new_msg; tSirSmeScanAbortReq *req_msg = NULL; uint8_t session_id; @@ -1261,10 +1261,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) body_ptr = (cds_pkt_t *) new_msg.bodyptr; cds_pkt_get_packet_length(body_ptr, &pkt_len); - cdf_status = wma_ds_peek_rx_packet_info(body_ptr, + qdf_status = wma_ds_peek_rx_packet_info(body_ptr, (void **) &new_msg.bodyptr, false); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_pkt_return_packet(body_ptr); break; } @@ -1407,13 +1407,13 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) p2p_go_exists = 1; cdf_mem_copy(&session_entry->p2pGoPsNoaStartInd, msg->bodyptr, sizeof(tSirP2PNoaStart)); - cdf_status = + qdf_status = session_entry->p2pGoPsNoaStartInd.status; - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) CDF_TRACE(CDF_MODULE_ID_PE, LOGW, FL( "GO NOA start status %d by FW"), - cdf_status); + qdf_status); break; } } diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index a4ce9e23fdd9..649402b4aeda 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -674,7 +674,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->bssId, addbss_param->htCapable, session); - addbss_param->status = CDF_STATUS_SUCCESS; + addbss_param->status = QDF_STATUS_SUCCESS; addbss_param->respReqd = 1; /* Set a new state for MLME */ @@ -941,14 +941,14 @@ failure: */ static void lim_process_mlm_post_join_suspend_link(tpAniSirGlobal mac_ctx, - CDF_STATUS status, + QDF_STATUS status, uint32_t *ctx) { tLimMlmJoinCnf mlm_join_cnf; tpPESession session = (tpPESession) ctx; tSirLinkState lnk_state; - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { lim_log(mac_ctx, LOGE, FL("Sessionid %d Suspend link(NOTIFY_BSS) failed. Still proceeding with join"), session->peSessionId); @@ -1057,7 +1057,7 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg) goto error; } lim_process_mlm_post_join_suspend_link(mac_ctx, - CDF_STATUS_SUCCESS, (uint32_t *)session); + QDF_STATUS_SUCCESS, (uint32_t *)session); } else { lim_log(mac_ctx, LOG1, FL("No need to Suspend link")); /* @@ -1070,7 +1070,7 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg) FL("SessionId:%d Join req on current chan"), sessionid); lim_process_mlm_post_join_suspend_link(mac_ctx, - CDF_STATUS_SUCCESS, (uint32_t *)session); + QDF_STATUS_SUCCESS, (uint32_t *)session); } return; } else { @@ -1578,7 +1578,7 @@ end: */ static void lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, - CDF_STATUS suspend_status, uint32_t *msg) + QDF_STATUS suspend_status, uint32_t *msg) { uint16_t aid; struct cdf_mac_addr curr_bssid; @@ -1590,7 +1590,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, tLimMlmStates mlm_state; tSirSmeDisassocRsp *sme_disassoc_rsp; - if (CDF_STATUS_SUCCESS != suspend_status) + if (QDF_STATUS_SUCCESS != suspend_status) lim_log(mac_ctx, LOGE, FL("Suspend Status is not success %X"), suspend_status); @@ -1655,7 +1655,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, msg = (uint32_t *)sme_disassoc_rsp; lim_send_sme_disassoc_deauth_ntf(mac_ctx, - CDF_STATUS_SUCCESS, msg); + QDF_STATUS_SUCCESS, msg); return; } @@ -1907,7 +1907,7 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_disassoc_req->sessionId, MAC_ADDR_ARRAY(mlm_disassoc_req->peer_macaddr.bytes)); - lim_process_mlm_disassoc_req_ntf(mac_ctx, CDF_STATUS_SUCCESS, + lim_process_mlm_disassoc_req_ntf(mac_ctx, QDF_STATUS_SUCCESS, (uint32_t *) msg_buf); } @@ -1925,7 +1925,7 @@ lim_process_mlm_disassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) */ static void lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, - CDF_STATUS suspend_status, uint32_t *msg_buf) + QDF_STATUS suspend_status, uint32_t *msg_buf) { uint16_t aid; tSirMacAddr curr_bssId; @@ -1936,7 +1936,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, tpPESession session; tSirSmeDeauthRsp *sme_deauth_rsp; - if (CDF_STATUS_SUCCESS != suspend_status) + if (QDF_STATUS_SUCCESS != suspend_status) lim_log(mac_ctx, LOGE, FL("Suspend Status is not success %X"), suspend_status); @@ -2016,7 +2016,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, msg_buf = (uint32_t *)sme_deauth_rsp; lim_send_sme_disassoc_deauth_ntf(mac_ctx, - CDF_STATUS_SUCCESS, msg_buf); + QDF_STATUS_SUCCESS, msg_buf); return; } @@ -2212,7 +2212,7 @@ lim_process_mlm_deauth_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_deauth_req->sessionId); return; } - lim_process_mlm_deauth_req_ntf(mac_ctx, CDF_STATUS_SUCCESS, + lim_process_mlm_deauth_req_ntf(mac_ctx, QDF_STATUS_SUCCESS, (uint32_t *) msg_buf); } diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 918ed850028e..03c3c601235c 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -1720,7 +1720,7 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, if (true == session_entry->fDeauthReceived) { lim_log(mac_ctx, LOGE, FL("Received Deauth frame in ADD_STA_RESP state")); - if (CDF_STATUS_SUCCESS == add_sta_params->status) { + if (QDF_STATUS_SUCCESS == add_sta_params->status) { lim_log(mac_ctx, LOGE, FL("ADD_STA success, send update result code with eSIR_SME_JOIN_DEAUTH_FROM_AP_DURING_ADD_STA staIdx: %d limMlmState: %d"), add_sta_params->staIdx, @@ -1744,7 +1744,7 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, } } - if (CDF_STATUS_SUCCESS == add_sta_params->status) { + if (QDF_STATUS_SUCCESS == add_sta_params->status) { if (eLIM_MLM_WT_ADD_STA_RSP_STATE != session_entry->limMlmState) { lim_log(mac_ctx, LOGE, @@ -1783,8 +1783,7 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, sta_ds->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; sta_ds->nss = add_sta_params->nss; - } - else + } else lim_log(mac_ctx, LOGW, FL("Fail to get DPH Hash Entry for AID - %d"), DPH_STA_HASH_INDEX_PEER); @@ -1880,7 +1879,7 @@ void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_log(pMac, LOGE, FL("Invalid body pointer in message")); goto end; } - if (CDF_STATUS_SUCCESS == pDelBssParams->status) { + if (QDF_STATUS_SUCCESS == pDelBssParams->status) { PELOGW(lim_log(pMac, LOGW, FL("STA received the DEL_BSS_RSP for BSSID: %X."), pDelBssParams->bssIdx); @@ -1980,7 +1979,7 @@ void lim_process_bt_amp_ap_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg rc = eSIR_SME_REFUSED; goto end; } - if (pDelBss->status != CDF_STATUS_SUCCESS) { + if (pDelBss->status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGE, FL("BSS: DEL_BSS_RSP error (%x) Bss %d "), pDelBss->status, pDelBss->bssIdx); rc = eSIR_SME_STOP_BSS_FAILURE; @@ -2087,7 +2086,7 @@ void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg } lim_log(pMac, LOG1, FL("Received del Sta Rsp in StaD MlmState : %d"), pStaDs->mlmStaContext.mlmState); - if (CDF_STATUS_SUCCESS == pDelStaParams->status) { + if (QDF_STATUS_SUCCESS == pDelStaParams->status) { lim_log(pMac, LOGW, FL("AP received the DEL_STA_RSP for assocID: %X."), pDelStaParams->assocId); @@ -2184,7 +2183,7 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_log(pMac, LOG1, FL("Del STA RSP received. Status:%d AssocID:%d"), pDelStaParams->status, pDelStaParams->assocId); - if (CDF_STATUS_SUCCESS != pDelStaParams->status) + if (QDF_STATUS_SUCCESS != pDelStaParams->status) lim_log(pMac, LOGE, FL( "Del STA failed! Status:%d, proceeding with Del BSS"), pDelStaParams->status); @@ -2258,7 +2257,7 @@ void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, pStaDs->mlmStaContext.mlmState); goto end; } - if (CDF_STATUS_SUCCESS != pAddStaParams->status) { + if (QDF_STATUS_SUCCESS != pAddStaParams->status) { PELOGE(lim_log (pMac, LOGE, FL("Error! rcvd delSta rsp from HAL with status %d"), @@ -2358,10 +2357,10 @@ static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg } /* Update PE session Id */ mlmStartCnf.sessionId = pAddBssParams->sessionId; - if (CDF_STATUS_SUCCESS == pAddBssParams->status) { + if (QDF_STATUS_SUCCESS == pAddBssParams->status) { PELOG2(lim_log (pMac, LOG2, - FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS")); + FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS")); ) if (lim_set_link_state (pMac, eSIR_LINK_AP_STATE, psessionEntry->bssId, @@ -2490,10 +2489,10 @@ lim_process_ibss_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_log(pMac, LOGE, FL("Invalid body pointer in message")); goto end; } - if (CDF_STATUS_SUCCESS == pAddBssParams->status) { + if (QDF_STATUS_SUCCESS == pAddBssParams->status) { PELOG1(lim_log (pMac, LOG1, - FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS")); + FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS")); ) if (lim_set_link_state (pMac, eSIR_LINK_IBSS_STATE, psessionEntry->bssId, @@ -2569,7 +2568,7 @@ lim_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Invalid body pointer in message")); goto joinFailure; } - if (CDF_STATUS_SUCCESS == pAddBssParams->status) { + if (QDF_STATUS_SUCCESS == pAddBssParams->status) { pStaDs = dph_add_hash_entry(mac_ctx, pAddBssParams->staContext.staMac, DPH_STA_HASH_INDEX_PEER, @@ -2797,7 +2796,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, psessionEntry->bssId, sizeof(tSirMacAddr)); pAddStaParams->staType = STA_ENTRY_SELF; - pAddStaParams->status = CDF_STATUS_SUCCESS; + pAddStaParams->status = QDF_STATUS_SUCCESS; pAddStaParams->respReqd = 1; /* Update PE session ID */ @@ -2981,7 +2980,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, "LFR3:lim_process_sta_mlm_add_bss_rsp"); #endif - if (CDF_STATUS_SUCCESS == add_bss_params->status) { + if (QDF_STATUS_SUCCESS == add_bss_params->status) { if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE == session_entry->limMlmState) { lim_log(mac_ctx, LOG1, FL("Mlm=%d %d"), @@ -3385,7 +3384,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, */ static void lim_process_switch_channel_re_assoc_req(tpAniSirGlobal pMac, tpPESession psessionEntry, - CDF_STATUS status) + QDF_STATUS status) { tLimMlmReassocCnf mlmReassocCnf; tLimMlmReassocReq *pMlmReassocReq; @@ -3399,7 +3398,7 @@ static void lim_process_switch_channel_re_assoc_req(tpAniSirGlobal pMac, goto end; } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { PELOGE(lim_log(pMac, LOGE, FL("Change channel failed!!"));) mlmReassocCnf.resultCode = eSIR_SME_CHANNEL_SWITCH_FAIL; goto end; @@ -3456,11 +3455,11 @@ end: */ static void lim_process_switch_channel_join_req( tpAniSirGlobal mac_ctx, tpPESession session_entry, - CDF_STATUS status) + QDF_STATUS status) { tSirMacSSid ssId; tLimMlmJoinCnf join_cnf; - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { PELOGE(lim_log(mac_ctx, LOGE, FL("Change channel failed!!"));) goto error; } @@ -3505,23 +3504,23 @@ static void lim_process_switch_channel_join_req( * If sendDeauthBeforeCon is enabled, Send Deauth first to AP if last * disconnection was caused by HB failure. */ - if(mac_ctx->roam.configParam.sendDeauthBeforeCon) { + if (mac_ctx->roam.configParam.sendDeauthBeforeCon) { int apCount; - for(apCount = 0; apCount < 2; apCount++) { + for (apCount = 0; apCount < 2; apCount++) { if (cdf_mem_compare(session_entry->pLimMlmJoinReq->bssDescription.bssId, mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) { lim_log(mac_ctx, LOGE, FL("Index %d Sessionid: %d Send deauth on " - "channel %d to BSSID: "MAC_ADDRESS_STR ), apCount, + "channel %d to BSSID: "MAC_ADDRESS_STR), apCount, session_entry->peSessionId, session_entry->currentOperChannel, MAC_ADDR_ARRAY(session_entry->pLimMlmJoinReq->bssDescription. bssId)); lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_REASON, session_entry->pLimMlmJoinReq->bssDescription.bssId, - session_entry, false ); + session_entry, false); cdf_mem_zero(mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr)); @@ -3625,7 +3624,7 @@ error: void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) { tpSwitchChannelParams pChnlParams = NULL; - CDF_STATUS status; + QDF_STATUS status; uint16_t channelChangeReasonCode; uint8_t peSessionId; tpPESession psessionEntry; @@ -3872,9 +3871,9 @@ lim_process_btamp_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_log(pMac, LOGE, FL("Invalid body pointer in message")); goto end; } - if (CDF_STATUS_SUCCESS == pAddBssParams->status) { + if (QDF_STATUS_SUCCESS == pAddBssParams->status) { lim_log(pMac, LOG2, - FL("WMA_ADD_BSS_RSP returned with CDF_STATUS_SUCCESS")); + FL("WMA_ADD_BSS_RSP returned with QDF_STATUS_SUCCESS")); if (psessionEntry->bssType == eSIR_BTAMP_AP_MODE) { if (lim_set_link_state (pMac, eSIR_LINK_BTAMP_AP_STATE, @@ -4131,7 +4130,7 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId) msg.bodyptr = NULL; msg.bodyval = sessionId; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA", @@ -4165,7 +4164,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) case SCAN_EVENT_COMPLETED: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, - CDF_STATUS_SUCCESS, + QDF_STATUS_SUCCESS, pScanEvent->sessionId, pScanEvent->scanId); cdf_mem_free(pMac->lim.gpLimRemainOnChanReq); @@ -4196,7 +4195,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) if (pMac->lim.gpLimRemainOnChanReq) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RDY_IND, - CDF_STATUS_SUCCESS, + QDF_STATUS_SUCCESS, pScanEvent->sessionId, pScanEvent->scanId); } else { diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 581b47dde23f..060eea4caeb7 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -127,11 +127,11 @@ static void lim_process_ext_change_channel(tpAniSirGlobal mac_ctx, * * Send the set HW mode command to WMA * - * Return: CDF_STATUS_SUCCESS if message posting is successful + * Return: QDF_STATUS_SUCCESS if message posting is successful */ -static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) +static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; struct sir_hw_mode *req_msg; uint32_t len; @@ -154,7 +154,7 @@ static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) /* Free the active command list * Probably the malloc is going to fail there as well?! */ - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -168,7 +168,7 @@ static CDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) lim_log(mac, LOG1, FL("Posting SIR_HAL_SOC_SET_HW_MOD to WMA")); status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { lim_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); @@ -180,7 +180,7 @@ fail: param = cdf_mem_malloc(sizeof(*param)); if (!param) { lim_log(mac, LOGE, FL("HW mode resp failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param->status = SET_HW_MODE_STATUS_ECANCELED; param->cfgd_hw_mode_index = 0; @@ -189,7 +189,7 @@ fail: resp_msg.bodyptr = param; resp_msg.bodyval = 0; lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -199,12 +199,12 @@ fail: * * Send the set dual mac config command to WMA * - * Return: CDF_STATUS_SUCCESS if message posting is successful + * Return: QDF_STATUS_SUCCESS if message posting is successful */ -static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, +static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, uint32_t *msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; struct sir_dual_mac_config *req_msg; uint32_t len; @@ -227,7 +227,7 @@ static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, /* Free the active command list * Probably the malloc is going to fail there as well?! */ - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -243,7 +243,7 @@ static CDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, FL("Post SIR_HAL_SOC_DUAL_MAC_CFG_REQ to WMA: %x %x"), req_msg->scan_config, req_msg->fw_mode_config); status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { lim_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); @@ -255,14 +255,14 @@ fail: param = cdf_mem_malloc(sizeof(*param)); if (!param) { lim_log(mac, LOGE, FL("Dual mac config resp failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param->status = SET_HW_MODE_STATUS_ECANCELED; resp_msg.type = eWNI_SME_SET_DUAL_MAC_CFG_RESP; resp_msg.bodyptr = param; resp_msg.bodyval = 0; lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1150,7 +1150,7 @@ void lim_get_random_bssid(tpAniSirGlobal pMac, uint8_t *data) cdf_mem_copy(data, (uint8_t *) random, sizeof(tSirMacAddr)); } -static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, +static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, tpSirSmeScanReq pScanReq) { tSirScanOffloadReq *pScanOffloadReq; @@ -1223,7 +1223,7 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, if (NULL == pScanOffloadReq) { lim_log(pMac, LOGE, FL("AllocateMemory failed for pScanOffloadReq")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((uint8_t *) pScanOffloadReq, len, 0); @@ -1239,7 +1239,7 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, FL("Invalid value (%d) for numSsid"), SIR_SCAN_MAX_NUM_SSID); cdf_mem_free(pScanOffloadReq); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pScanOffloadReq->numSsid = pScanReq->numSsid; @@ -1318,12 +1318,12 @@ static CDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure")); cdf_mem_free(pScanOffloadReq); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } lim_log(pMac, LOG1, FL("Processed Offload Scan Request Successfully")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1415,7 +1415,7 @@ static void __lim_process_sme_scan_req(tpAniSirGlobal mac_ctx, mac_ctx->lim.gLimReturnUniqueResults = ((scan_req->returnUniqueResults) > 0 ? true : false); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != lim_send_hal_start_scan_offload_req(mac_ctx, scan_req)) { lim_log(mac_ctx, LOGE, FL( @@ -3182,7 +3182,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, } sap_get_wpspbc_event = &sap_event.sapevt.sapGetWPSPBCSessionEvent; - sap_get_wpspbc_event->status = CDF_STATUS_E_FAULT; + sap_get_wpspbc_event->status = QDF_STATUS_E_FAULT; cdf_mem_copy(&get_wps_pbc_sessions_req, msg_buf, sizeof(struct sSirSmeGetWPSPBCSessionsReq)); @@ -3230,7 +3230,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, lim_print_mac_addr(mac_ctx, sap_get_wpspbc_event->addr.bytes, LOG4); - sap_get_wpspbc_event->status = CDF_STATUS_SUCCESS; + sap_get_wpspbc_event->status = QDF_STATUS_SUCCESS; lim_get_wpspbc_sessions_end: sap_event_cb = @@ -4350,7 +4350,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, msg.type = WMA_UPDATE_OP_MODE; msg.reserved = 0; msg.bodyptr = pHtOpMode; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { lim_log(pMac, LOGE, FL @@ -5719,7 +5719,7 @@ static void lim_process_nss_update_request(tpAniSirGlobal mac_ctx, static void lim_process_set_ie_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) { struct send_extcap_ie *msg; - CDF_STATUS status; + QDF_STATUS status; if (msg_buf == NULL) { lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); @@ -5728,7 +5728,7 @@ static void lim_process_set_ie_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) msg = (struct send_extcap_ie *)msg_buf; status = lim_send_ext_cap_ie(mac_ctx, msg->session_id, NULL, false); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) lim_log(mac_ctx, LOGE, FL("Unable to send ExtCap to FW")); } diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index bbabde1c834f..498ab623f036 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -319,7 +319,7 @@ static uint32_t lim_prepare_tdls_frame_header(tpAniSirGlobal pMac, uint8_t *pFra /* * TX Complete for Management frames */ -CDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) +QDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) { tpPESession psessionEntry = NULL; @@ -330,13 +330,13 @@ CDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) if (NULL == psessionEntry) { lim_log(pMac, LOGE, FL("sessionID %d is not found"), pMac->lim.mgmtFrameSessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } lim_send_sme_mgmt_tx_completion(pMac, psessionEntry, txCompleteSuccess); pMac->lim.mgmtFrameSessionId = 0xff; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -356,7 +356,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, uint32_t header_offset = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; #ifndef NO_PAD_TDLS_MIN_8023_SIZE uint32_t padLen = 0; #endif @@ -437,9 +437,9 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL( "Failed to allocate %d bytes for a TDLS Discovery Request." @@ -509,7 +509,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(peer_mac.bytes)); pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId; - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_DATA, ANI_TXDIR_TODS, TID_AC_VI, @@ -517,7 +517,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, lim_mgmt_tx_complete, HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Discovery Request frame")); @@ -606,7 +606,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, uint32_t nBytes = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t selfDot11Mode; /* Placeholder to support different channel bonding mode of TDLS than AP. */ /* Today, WNI_CFG_CHANNEL_BONDING_MODE will be overwritten when connecting to AP */ @@ -717,9 +717,9 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr) + addIeLen; /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL( "Failed to allocate %d bytes for a TDLS Discovery Request." @@ -790,7 +790,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, * wma does not do header conversion to 802.3 before calling tx/rx * routine and subsequenly target also sends frame as is OTA */ - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_IBSS, 0, @@ -798,7 +798,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, lim_mgmt_tx_complete, HAL_USE_SELF_STA_REQUESTED_MASK, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Discovery Response frame!")); @@ -867,7 +867,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, uint32_t header_offset = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t selfDot11Mode; uint8_t smeSessionId = 0; /* Placeholder to support different channel bonding mode of TDLS than AP. */ @@ -1039,9 +1039,9 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, + PAYLOAD_TYPE_TDLS_SIZE + addIeLen; /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL( "Failed to allocate %d bytes for a TDLS Setup Request." @@ -1110,7 +1110,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId; - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_DATA, ANI_TXDIR_TODS, TID_AC_VI, @@ -1119,7 +1119,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Setup Request frame!")); @@ -1148,7 +1148,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, uint32_t header_offset = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; #ifndef NO_PAD_TDLS_MIN_8023_SIZE uint32_t padLen = 0; #endif @@ -1224,9 +1224,9 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, #endif /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL( "Failed to allocate %d bytes for a TDLS Teardown Frame." @@ -1312,7 +1312,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId; - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_DATA, ANI_TXDIR_TODS, TID_AC_VI, @@ -1321,7 +1321,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Teardown frame")); @@ -1350,7 +1350,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, uint32_t nBytes = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t selfDot11Mode; /* Placeholder to support different channel bonding mode of TDLS than AP. */ /* Today, WNI_CFG_CHANNEL_BONDING_MODE will be overwritten when connecting to AP */ @@ -1521,9 +1521,9 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, + PAYLOAD_TYPE_TDLS_SIZE + addIeLen; /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL( "Failed to allocate %d bytes for a TDLS Setup Response." @@ -1590,7 +1590,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId; - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_DATA, ANI_TXDIR_TODS, TID_AC_VI, @@ -1599,7 +1599,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Dis Request frame!")); @@ -1627,7 +1627,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, uint32_t header_offset = 0; uint8_t *pFrame; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; #ifndef NO_PAD_TDLS_MIN_8023_SIZE uint32_t padLen = 0; #endif @@ -1728,9 +1728,9 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, #endif /* Ok-- try to allocate memory from MGMT PKT pool */ - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL( "Failed to allocate %d bytes for a TDLS Setup Confirm." @@ -1810,7 +1810,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, pMac->lim.mgmtFrameSessionId = psessionEntry->peSessionId; - cdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_DATA, ANI_TXDIR_TODS, TID_AC_VI, @@ -1819,7 +1819,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME, smeSessionId, false, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->lim.mgmtFrameSessionId = 0xff; lim_log(pMac, LOGE, FL("could not send TDLS Setup Confirm frame")); @@ -2470,7 +2470,7 @@ static tpDphHashNode lim_tdls_del_sta(tpAniSirGlobal pMac, /* * Once Link is setup with PEER, send Add STA ind to SME */ -static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, +static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirMacAddr peerMac, uint8_t updateSta, @@ -2483,7 +2483,7 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, addStaRsp = cdf_mem_malloc(sizeof(tSirTdlsAddStaRsp)); if (NULL == addStaRsp) { lim_log(pMac, LOGE, FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } addStaRsp->sessionId = sessionId; @@ -2509,13 +2509,13 @@ static CDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, mmhMsg.bodyval = 0; lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* * STA RSP received from HAL */ -CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, +QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) { tAddStaParams *pAddStaParams = (tAddStaParams *) msg; @@ -2528,7 +2528,7 @@ CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, pAddStaParams->staIdx, MAC_ADDR_ARRAY(pAddStaParams->staMac)); - if (pAddStaParams->status != CDF_STATUS_SUCCESS) { + if (pAddStaParams->status != QDF_STATUS_SUCCESS) { CDF_ASSERT(0); lim_log(pMac, LOGE, FL("Add sta failed ")); status = eSIR_FAILURE; @@ -2876,7 +2876,7 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, /* * Once link is teardown, send Del Peer Ind to SME */ -static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, +static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, uint8_t sessionId, struct cdf_mac_addr peerMac, tDphHashNode *pStaDs, uint8_t status) @@ -2888,7 +2888,7 @@ static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, pDelSta = cdf_mem_malloc(sizeof(tSirTdlsDelStaRsp)); if (NULL == pDelSta) { lim_log(pMac, LOGE, FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pDelSta->sessionId = sessionId; @@ -2907,7 +2907,7 @@ static CDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, mmhMsg.bodyval = 0; lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index a26a289531c5..623a900719ab 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -76,13 +76,13 @@ * @return None */ #if defined WLAN_FEATURE_VOWIFI -CDF_STATUS +QDF_STATUS lim_collect_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pBssDescr, tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo, uint8_t fScanning) #else -CDF_STATUS +QDF_STATUS lim_collect_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pBssDescr, tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo) @@ -100,7 +100,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, if (SIR_MAC_B_PR_SSID_OFFSET > WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)) { CDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >= SIR_MAC_B_PR_SSID_OFFSET); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ieLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) - SIR_MAC_B_PR_SSID_OFFSET; @@ -237,7 +237,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, FL("Collected BSS Description for Channel(%1d), length(%u), IE Fields(%u)"), pBssDescr->channelId, pBssDescr->length, ieLen); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*** end lim_collect_bss_description() ***/ /** @@ -257,8 +257,8 @@ lim_collect_bss_description(tpAniSirGlobal pMac, * NA * * @param pMac - Pointer to Global MAC structure - * @param ssId - SSID Received in beacons/Probe responses that is compared against the - requeusted SSID in scan list + * @param ssId - SSID Received in beacons/Probe responses that is compared + * against therequeusted SSID in scan list * --------------------------------------------- * * @return bool - true if SSID is present in requested list, false otherwise @@ -306,7 +306,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, tSirBssDescription *bssdescr = NULL; uint32_t frame_len, ie_len = 0; uint8_t rx_chan_in_beacon = 0; - CDF_STATUS status; + QDF_STATUS status; uint8_t dont_update_all = 0; uint8_t rf_band = 0; uint8_t rx_chan_bd = 0; @@ -400,12 +400,12 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, #if defined WLAN_FEATURE_VOWIFI status = lim_collect_bss_description(mac_ctx, bssdescr, bpr, rx_packet_info, scanning); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto last; #else status = lim_collect_bss_description(mac_ctx, bssdescr, bpr, rx_packet_info); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) goto last; #endif bssdescr->fProbeRsp = fProbeRsp; @@ -419,7 +419,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, } else { lim_log(mac_ctx, LOGE, FL("No CSR callback routine to send beacons")); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } last: cdf_mem_free(bssdescr); diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.h b/core/mac/src/pe/lim/lim_scan_result_utils.h index c622dc2c8a36..74fb3b0af965 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.h +++ b/core/mac/src/pe/lim/lim_scan_result_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -47,11 +47,11 @@ void lim_copy_scan_result(tpAniSirGlobal, uint8_t *); void lim_check_and_add_bss_description(tpAniSirGlobal, tpSirProbeRespBeacon, uint8_t *, bool, uint8_t); #if defined WLAN_FEATURE_VOWIFI -CDF_STATUS lim_collect_bss_description(tpAniSirGlobal, +QDF_STATUS lim_collect_bss_description(tpAniSirGlobal, tSirBssDescription *, tpSirProbeRespBeacon, uint8_t *, uint8_t); #else -CDF_STATUS lim_collect_bss_description(tpAniSirGlobal, +QDF_STATUS lim_collect_bss_description(tpAniSirGlobal, tSirBssDescription *, tpSirProbeRespBeacon, uint8_t *); #endif diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 9037fb64ac58..b04183adb753 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -217,7 +217,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, uint32_t status, bytes, payload; uint8_t *frame; void *packet; - CDF_STATUS cdf_status, extcap_status; + QDF_STATUS qdf_status, extcap_status; tpPESession pesession; uint8_t sessionid; uint8_t *p2pie = NULL; @@ -365,7 +365,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, if (addn_ielen) { extcap_status = lim_strip_extcap_ie(mac_ctx, additional_ie, &addn_ielen, NULL); - if (CDF_STATUS_SUCCESS != extcap_status) + if (QDF_STATUS_SUCCESS != extcap_status) lim_log(mac_ctx, LOGE, FL("Error:%d stripping extcap IE"), extcap_status); } @@ -373,9 +373,9 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, bytes = payload + sizeof(tSirMacMgmtHdr) + addn_ielen; /* Ok-- try to allocate some memory: */ - cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("Failed to allocate %d bytes for a Probe Request."), bytes); return eSIR_MEM_ALLOC_FAILED; } @@ -422,13 +422,13 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - cdf_status = + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) sizeof(tSirMacMgmtHdr) + payload, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, txflag, sme_sessionid, 0); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("could not send Probe Request frame!")); /* Pkt will be freed up by the callback */ @@ -525,7 +525,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr mac_hdr; uint8_t *frame; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t addn_ie_present = false; uint16_t addn_ie_len = 0; @@ -768,9 +768,9 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, } } - cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("Probe Response allocation failed")); goto err_ret; } @@ -841,7 +841,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; /* Queue Probe Response frame in high priority WQ */ - cdf_status = wma_tx_frame((tHalHandle) mac_ctx, packet, + qdf_status = wma_tx_frame((tHalHandle) mac_ctx, packet, (uint16_t) bytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, @@ -849,7 +849,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, sme_sessionid, 0); /* Pkt will be freed up by the callback */ - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, FL("Could not send Probe Response.")); if (add_ie != NULL) @@ -884,7 +884,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_ESE uint32_t phyMode; #endif - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -997,9 +997,9 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for an Ad" "d TS Request."), nBytes); return; @@ -1069,17 +1069,17 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Addts Response frame in high priority WQ */ - cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); + psessionEntry->peSessionId, qdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("*** Could not send an Add TS Request" - " (%X) ***"), cdf_status); + " (%X) ***"), qdf_status); /* Pkt will be freed up by the callback */ } @@ -1113,7 +1113,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, tHalBitVal qos_mode, wme_mode; uint32_t payload, bytes, status; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tUpdateBeaconParams beacon_params; uint8_t tx_flag = 0; uint32_t addn_ie_len = 0; @@ -1330,9 +1330,9 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, FL("addn_ie_len = %d for Assoc Resp : %d"), addn_ie_len, assoc_req->addIEPresent); } - cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("cds_packet_alloc failed.")); return; } @@ -1391,19 +1391,19 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); /* Queue Association Response frame in high priority WQ */ - cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes, + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_session, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - pe_session->peSessionId, cdf_status)); + pe_session->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, FL("*** Could not Send Re/AssocRsp, retCode=%X ***"), - cdf_status); + qdf_status); /* * update the ANI peer station count. @@ -1427,7 +1427,7 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tDot11fWMMDelTS WMMDelTS; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -1483,10 +1483,10 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for an Ad" "d TS Response."), nBytes); return; @@ -1554,17 +1554,17 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); + psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(pMac, LOGE, FL("Failed to send Del TS (%X)!"), - cdf_status); + qdf_status); } /* End lim_send_delts_req_action_frame. */ @@ -1592,7 +1592,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, uint32_t bytes, payload, status; uint8_t qos_enabled, wme_enabled, wsm_enabled; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint16_t add_ie_len; uint8_t *add_ie; uint8_t *wps_ie = NULL; @@ -1860,9 +1860,9 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, bytes = payload + sizeof(tSirMacMgmtHdr) + add_ie_len; - cdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) bytes, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("Failed to allocate %d bytes."), bytes); @@ -1952,18 +1952,18 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, mac_hdr = (tpSirMacMgmtHdr) frame; MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); - cdf_status = + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (sizeof(tSirMacMgmtHdr) + payload), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - pe_session->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + pe_session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("Failed to send Association Request (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ cdf_mem_free(frm); return; @@ -2000,7 +2000,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, uint32_t bytes, payload, status; uint8_t qos_enabled, wme_enabled, wsm_enabled; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; #if defined WLAN_FEATURE_VOWIFI uint8_t power_caps_populated = false; #endif @@ -2275,9 +2275,9 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, ft_ies_length = ft_sme_context->reassoc_ft_ies_length; #endif - cdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, + qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pe_session->limMlmState = pe_session->limPrevMlmState; MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, @@ -2386,17 +2386,17 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, #endif MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); - cdf_status = wma_tx_frame(mac_ctx, packet, + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (bytes + ft_ies_length), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - pe_session->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + pe_session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("Failed to send Re-Assoc Request (%X)!"), - cdf_status); + qdf_status); } end: @@ -2475,7 +2475,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, uint32_t nBytes, nPayload, nStatus; uint8_t fQosEnabled, fWmeEnabled, fWsmEnabled; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint16_t nAddIELen; uint8_t *pAddIE; uint8_t *wpsIe = NULL; @@ -2641,9 +2641,9 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr) + nAddIELen; - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { psessionEntry->limMlmState = psessionEntry->limPrevMlmState; MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, @@ -2722,18 +2722,18 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, #endif MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send Re-Association Request (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ } @@ -2769,7 +2769,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, uint32_t frame_len = 0, body_len = 0; tpSirMacMgmtHdr mac_hdr; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t tx_flag = 0; uint8_t sme_sessionid = 0; uint16_t ft_ies_length = 0; @@ -2901,10 +2901,10 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, break; } /* switch (auth_frame->authTransactionSeqNumber) */ - cdf_status = cds_packet_alloc((uint16_t) frame_len, (void **)&frame, + qdf_status = cds_packet_alloc((uint16_t) frame_len, (void **)&frame, (void **)&packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("call to bufAlloc failed for AUTH frame")); return; @@ -3019,21 +3019,21 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session->peSessionId, mac_hdr->fc.subType)); /* Queue Authentication frame in high priority WQ */ - cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - session->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, FL("*** Could not send Auth frame, retCode=%X ***"), - cdf_status); + qdf_status); return; } -CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) +QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) { uint16_t aid; tpDphHashNode pStaDs; @@ -3109,7 +3109,7 @@ CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) cdf_mem_free(pMlmDeauthReq); pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; end: cdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &pMlmDeauthReq->peer_macaddr); @@ -3123,7 +3123,7 @@ end: lim_post_sme_message(pMac, LIM_MLM_DEAUTH_CNF, (uint32_t *) &mlmDeauthCnf); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3134,10 +3134,10 @@ end: * Sends disassoc confirmation to SME. Removes disassoc request stored * in lim. * - * Return: CDF_STATUS_SUCCESS + * Return: QDF_STATUS_SUCCESS */ -CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) +QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) { uint16_t aid; tpDphHashNode sta_ds; @@ -3215,9 +3215,9 @@ CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) /* Free up buffer allocated for mlmDisassocReq */ cdf_mem_free(disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } end: cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, @@ -3237,16 +3237,16 @@ end: lim_post_sme_message(mac_ctx, LIM_MLM_DISASSOC_CNF, (uint32_t *) &disassoc_cnf); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, +QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) { return lim_send_disassoc_cnf(pMac); } -CDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, +QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) { return lim_send_deauth_cnf(pMac); @@ -3278,7 +3278,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint32_t val = 0; uint8_t smeSessionId = 0; @@ -3319,9 +3319,9 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Dis" "association."), nBytes); return; @@ -3377,7 +3377,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ /* get the duration from the request */ - cdf_status = + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, @@ -3385,7 +3385,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); + psessionEntry->peSessionId, qdf_status)); val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT); @@ -3409,7 +3409,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ - cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, @@ -3417,11 +3417,11 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, smeSessionId, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send Disassociation (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ } } @@ -3452,7 +3452,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint32_t val = 0; #ifdef FEATURE_WLAN_TDLS @@ -3498,9 +3498,9 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a De-" "Authentication."), nBytes); return; @@ -3558,7 +3558,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ - cdf_status = + qdf_status = wma_tx_frameWithTxComplete(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, @@ -3566,12 +3566,12 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); + psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback lim_tx_complete */ - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send De-Authentication (%X)!"), - cdf_status); + qdf_status); /* Call lim_process_deauth_ack_timeout which will send * DeauthCnf for this frame @@ -3605,7 +3605,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, if ((NULL != pStaDs) && (STA_ENTRY_TDLS_PEER == pStaDs->staType)) { /* Queue Disassociation frame in high priority WQ */ - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_IBSS, 7, lim_tx_complete, pFrame, txFlag, @@ -3613,7 +3613,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, } else { #endif /* Queue Disassociation frame in high priority WQ */ - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, @@ -3622,11 +3622,11 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, } #endif MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send De-Authentication (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ } } @@ -3658,7 +3658,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); @@ -3707,11 +3707,11 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT, (uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a De-" "Authentication."), nBytes); return eSIR_FAILURE; @@ -3748,18 +3748,18 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), - cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send a Measurement Report (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ return eSIR_FAILURE; /* just allocated... */ } @@ -3788,7 +3788,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); @@ -3811,11 +3811,11 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT, (uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC" " Request."), nBytes); return; @@ -3851,18 +3851,18 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), - cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send a TPC Request (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ } @@ -3891,7 +3891,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); @@ -3917,11 +3917,11 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc(pMac->hHdd, TXRX_FRM_802_11_MGMT, (uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC" " Report."), nBytes); return eSIR_FAILURE; @@ -3958,18 +3958,18 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); - cdf_status = + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), - cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send a TPC Report (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ return eSIR_FAILURE; /* just allocated... */ } @@ -4010,7 +4010,7 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; /* , nCfg; */ void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4045,10 +4045,10 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a TPC" " Report."), nBytes); return eSIR_FAILURE; @@ -4091,17 +4091,17 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send a Channel Switch (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ return eSIR_FAILURE; } @@ -4135,7 +4135,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr mac_hdr; uint32_t num_bytes, n_payload, status; void *packet; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t sme_session_id = 0; @@ -4173,10 +4173,10 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, num_bytes = n_payload + sizeof(tSirMacMgmtHdr); - cdf_status = cds_packet_alloc((uint16_t)num_bytes, + qdf_status = cds_packet_alloc((uint16_t)num_bytes, (void **) &frame, (void **) &packet); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGP, FL("Failed to allocate %d bytes for a Ext Channel Switch."), num_bytes); @@ -4225,18 +4225,18 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session_entry->peSessionId, mac_hdr->fc.subType)); - cdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes, + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, txFlag, sme_session_id, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - session_entry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + session_entry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, FL("Failed to send a Ext Channel Switch %X!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ return eSIR_FAILURE; } @@ -4253,7 +4253,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload = 0, nStatus; /* , nCfg; */ void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4287,10 +4287,10 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Operating Mode" " Report."), nBytes); @@ -4334,17 +4334,17 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, FL("Failed to send a Channel Switch (%X)!"), - cdf_status); + qdf_status); /* Pkt will be freed up by the callback */ return eSIR_FAILURE; } @@ -4382,7 +4382,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4419,10 +4419,10 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Neighbor " "Report Request."), nBytes); @@ -4478,7 +4478,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, @@ -4486,11 +4486,11 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (CDF_STATUS_SUCCESS != cdf_status) { + psessionEntry->peSessionId, qdf_status)); + if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log (pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), - cdf_status); + qdf_status); ) statusCode = eSIR_FAILURE; /* Pkt will be freed up by the callback */ @@ -4532,7 +4532,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4579,10 +4579,10 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Link " "Report."), nBytes); return eSIR_FAILURE; @@ -4635,7 +4635,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, @@ -4643,11 +4643,11 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (CDF_STATUS_SUCCESS != cdf_status) { + psessionEntry->peSessionId, qdf_status)); + if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log (pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), - cdf_status); + qdf_status); ) statusCode = eSIR_FAILURE; /* Pkt will be freed up by the callback */ @@ -4695,7 +4695,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t i; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4771,10 +4771,10 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Radio Measure " "Report."), nBytes); @@ -4830,7 +4830,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, @@ -4838,11 +4838,11 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (CDF_STATUS_SUCCESS != cdf_status) { + psessionEntry->peSessionId, qdf_status)); + if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log (pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), - cdf_status); + qdf_status); ) statusCode = eSIR_FAILURE; /* Pkt will be freed up by the callback */ @@ -4891,7 +4891,7 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -4918,9 +4918,9 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran } nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc(nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a SA Query Request " "action frame"), nBytes); @@ -4977,17 +4977,17 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran } smeSessionId = psessionEntry->smeSessionId; - cdf_status = wma_tx_frame(pMac, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log (pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), - cdf_status); + qdf_status); ) nSirStatus = eSIR_FAILURE; /* Pkt will be freed up by the callback */ @@ -5030,7 +5030,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, tpSirMacMgmtHdr pMacHdr; uint32_t nBytes, nPayload, nStatus; void *pPacket; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t txFlag = 0; uint8_t smeSessionId = 0; @@ -5060,9 +5060,9 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, } nBytes = nPayload + sizeof(tSirMacMgmtHdr); - cdf_status = + qdf_status = cds_packet_alloc(nBytes, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a SA query response" " action frame"), nBytes); @@ -5118,7 +5118,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); - cdf_status = wma_tx_frame(pMac, + qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, @@ -5126,11 +5126,11 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, cdf_status)); - if (CDF_STATUS_SUCCESS != cdf_status) { + psessionEntry->peSessionId, qdf_status)); + if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log (pMac, LOGE, FL("wma_tx_frame FAILED! Status [%d]"), - cdf_status); + qdf_status); ) nSirStatus = eSIR_FAILURE; /* Pkt will be freed up by the callback */ diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index f514619c28ae..13f86dacf742 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -231,7 +231,7 @@ uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds) * Return: None */ static void lim_send_sme_join_reassoc_rsp_after_resume(tpAniSirGlobal mac_ctx, - CDF_STATUS status, uint32_t *ctx) + QDF_STATUS status, uint32_t *ctx) { tSirMsgQ msg; tpSirSmeJoinRsp sme_join_rsp = (tpSirSmeJoinRsp) ctx; @@ -513,7 +513,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_join_rsp->sessionId = sme_session_id; sme_join_rsp->transactionId = sme_transaction_id; - lim_send_sme_join_reassoc_rsp_after_resume(mac_ctx, CDF_STATUS_SUCCESS, + lim_send_sme_join_reassoc_rsp_after_resume(mac_ctx, QDF_STATUS_SUCCESS, (uint32_t *)sme_join_rsp); } @@ -854,7 +854,7 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, #endif void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal pMac, - CDF_STATUS status, uint32_t *pCtx) + QDF_STATUS status, uint32_t *pCtx) { tSirMsgQ mmhMsg; tSirMsgQ *pMsg = (tSirMsgQ *) pCtx; @@ -1019,7 +1019,7 @@ error: } if (false == failure) - lim_send_sme_disassoc_deauth_ntf(pMac, CDF_STATUS_SUCCESS, + lim_send_sme_disassoc_deauth_ntf(pMac, QDF_STATUS_SUCCESS, (uint32_t *) pMsg); } /*** end lim_send_sme_disassoc_ntf() ***/ @@ -1462,7 +1462,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, pe_delete_session(pMac, psessionEntry); } - lim_send_sme_disassoc_deauth_ntf(pMac, CDF_STATUS_SUCCESS, + lim_send_sme_disassoc_deauth_ntf(pMac, QDF_STATUS_SUCCESS, (uint32_t *) pMsg); } /*** end lim_send_sme_deauth_ntf() ***/ @@ -2489,7 +2489,7 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e pChanSwTxResponse->sessionId = psessionEntry->smeSessionId; pChanSwTxResponse->chanSwIeTxStatus = - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; mmhMsg.type = eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND; mmhMsg.bodyptr = pChanSwTxResponse; @@ -2514,7 +2514,7 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e sizeof(*beacon_tx_comp_rsp_ptr), 0); beacon_tx_comp_rsp_ptr->session_id = psessionEntry->smeSessionId; - beacon_tx_comp_rsp_ptr->tx_status = CDF_STATUS_SUCCESS; + beacon_tx_comp_rsp_ptr->tx_status = QDF_STATUS_SUCCESS; mmhMsg.type = eWNI_SME_NSS_UPDATE_RSP; mmhMsg.bodyptr = beacon_tx_comp_rsp_ptr; mmhMsg.bodyval = 0; diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 7dcde4717d39..4885b6006645 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -162,8 +162,7 @@ void pe_reset_protection_callback(void *ptr) cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); /* index 0, is self node, peers start from 1 */ - for (i = 1 ; i <= mac_ctx->lim.gLimAssocStaLimit ; i++) - { + for (i = 1 ; i <= mac_ctx->lim.gLimAssocStaLimit ; i++) { station_hash_node = dph_get_hash_entry(mac_ctx, i, &pe_session_entry->dph.dphHashTable); if (NULL == station_hash_node) @@ -217,7 +216,7 @@ void pe_reset_protection_callback(void *ptr) if (cdf_mc_timer_start(&pe_session_entry-> protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); @@ -242,7 +241,7 @@ tpPESession pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, uint16_t numSta, tSirBssType bssType) { - CDF_STATUS status; + QDF_STATUS status; uint8_t i; tpPESession session_ptr; for (i = 0; i < pMac->lim.maxBssId; i++) { @@ -371,12 +370,12 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, &session_ptr->protection_fields_reset_timer, CDF_TIMER_TYPE_SW, pe_reset_protection_callback, (void *)&pMac->lim.gpSession[i]); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { status = cdf_mc_timer_start( &session_ptr->protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME); } - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } @@ -386,7 +385,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer, CDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, (void *)&session_ptr->pmfComebackTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) lim_log(pMac, LOGE, FL("cannot init pmf comeback timer.")); return &pMac->lim.gpSession[i]; @@ -414,16 +413,16 @@ tpPESession pe_find_session_by_bssid(tpAniSirGlobal pMac, uint8_t *bssid, for (i = 0; i < pMac->lim.maxBssId; i++) { /* If BSSID matches return corresponding tables address */ if ((pMac->lim.gpSession[i].valid) - && (sir_compare_mac_addr(pMac->lim.gpSession[i].bssId, bssid))) - { + && (sir_compare_mac_addr(pMac->lim.gpSession[i].bssId, + bssid))) { *sessionId = i; - return (&pMac->lim.gpSession[i]); + return &pMac->lim.gpSession[i]; } } lim_log(pMac, LOG4, FL("Session lookup fails for BSSID: \n ")); lim_print_mac_addr(pMac, bssid, LOG4); - return (NULL); + return NULL; } @@ -468,12 +467,12 @@ tpPESession pe_find_session_by_session_id(tpAniSirGlobal pMac, uint8_t sessionId { if (sessionId >= pMac->lim.maxBssId) { lim_log(pMac, LOGE, FL("Invalid sessionId: %d \n "), sessionId); - return (NULL); + return NULL; } if ((pMac->lim.gpSession[sessionId].valid == true)) { - return (&pMac->lim.gpSession[sessionId]); + return &pMac->lim.gpSession[sessionId]; } - return (NULL); + return NULL; } diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 514b70cdee9a..3a3161fcd22f 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -469,8 +469,8 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, #endif void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer, uint8_t wmmTspecPresent, - tSirMacTSInfo *pTsinfo, - tSirMacTspecIE *pTspecIe, + tSirMacTSInfo * pTsinfo, + tSirMacTspecIE * pTspecIe, tpPESession psessionEntry); void lim_send_addts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, tSirAddtsReqInfo *addts, tpPESession); @@ -530,7 +530,7 @@ void lim_send_sme_mgmt_tx_completion(tpAniSirGlobal pMac, tpPESession psessionEn uint32_t txCompleteStatus); tSirRetStatus lim_delete_tdls_peers(tpAniSirGlobal mac_ctx, tpPESession session_entry); -CDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession); +QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession); #else static inline tSirRetStatus lim_delete_tdls_peers(tpAniSirGlobal mac_ctx, tpPESession session_entry) @@ -829,11 +829,11 @@ void lim_process_regd_defd_sme_req_after_noa_start(tpAniSirGlobal pMac); void lim_process_disassoc_ack_timeout(tpAniSirGlobal pMac); void lim_process_deauth_ack_timeout(tpAniSirGlobal pMac); -CDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal pMac); -CDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac); -CDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, +QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal pMac); +QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac); +QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); -CDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, +QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); #ifdef WLAN_FEATURE_VOWIFI_11R @@ -845,9 +845,9 @@ typedef struct sSetLinkCbackParams { void lim_process_rx_scan_event(tpAniSirGlobal mac, void *buf); int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg); -void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, CDF_STATUS status, uint32_t *data); +void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data); void lim_send_sme_disassoc_deauth_ntf(tpAniSirGlobal mac_ctx, - CDF_STATUS status, uint32_t *ctx); + QDF_STATUS status, uint32_t *ctx); /* / Bit value data structure */ typedef enum sHalBitVal /* For Bit operations */ diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 98cb55117ff7..c53efd09af6e 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -1155,7 +1155,7 @@ uint8_t lim_is_null_ssid(tSirMacSSid *ssid) * characters in SSID are spaces to consider it as NULL SSID */ if ((ASCII_SPACE_CHARACTER == ssid->ssId[0]) && - (ssid->length == 1)){ + (ssid->length == 1)) { fnull_ssid = true; return fnull_ssid; } else { @@ -2653,7 +2653,7 @@ lim_util_count_sta_del(tpAniSirGlobal pMac, * @param psessionEntry Session information * @return NONE */ -void lim_switch_channel_cback(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry) { tSirMsgQ mmhMsg = { 0 }; @@ -3487,7 +3487,7 @@ lim_handle_11g_protection_for_11bcoexist(tpAniSirGlobal mac_ctx, overlap, beaconparams, session_entry); if (session_entry->gLimHt20Params. protectionEnabled) { - if(eHT_CHANNEL_WIDTH_20MHZ == + if (eHT_CHANNEL_WIDTH_20MHZ == session_entry->htSupportedChannelWidthSet) session_entry->htOperMode = eSIR_HT_OP_MODE_PURE; @@ -3896,7 +3896,7 @@ lim_enable_ht_protection_from11g(tpAniSirGlobal pMac, uint8_t enable, psessionEntry); if (psessionEntry->gLimHt20Params.protectionEnabled) { - if(eHT_CHANNEL_WIDTH_20MHZ == + if (eHT_CHANNEL_WIDTH_20MHZ == psessionEntry->htSupportedChannelWidthSet) psessionEntry->htOperMode = eSIR_HT_OP_MODE_PURE; @@ -4313,7 +4313,7 @@ static void lim_handle_ht20coexist_ht20protection(tpAniSirGlobal mac_ctx, session_entry->htOperMode)) { if (session_entry->gLimHt20Params. protectionEnabled) { - if(eHT_CHANNEL_WIDTH_20MHZ == + if (eHT_CHANNEL_WIDTH_20MHZ == session_entry->htSupportedChannelWidthSet) session_entry->htOperMode = eSIR_HT_OP_MODE_PURE; @@ -5591,7 +5591,7 @@ tAniBool lim_is_channel_valid_for_channel_switch(tpAniSirGlobal pMac, uint8_t ch \param type - Which way we want to stop/ resume tx. \param mode - To stop/resume. -------------------------------------------------------*/ -static CDF_STATUS +static QDF_STATUS __lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg, tLimQuietTxMode type, tLimControlTx mode) { @@ -5626,10 +5626,10 @@ __lim_fill_tx_control_params(tpAniSirGlobal pMac, tpTxControlParams pTxCtrlMsg, /* Fall thru... */ default: PELOGW(lim_log(pMac, LOGW, FL("Invalid case: Not Handled"));) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5654,7 +5654,7 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, tLimControlTx mode) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpTxControlParams pTxCtrlMsg; tSirMsgQ msgQ; uint8_t nBytes = 0; /* No of bytes required for station bitmap. */ @@ -5671,7 +5671,7 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, cdf_mem_set((void *)pTxCtrlMsg, (sizeof(*pTxCtrlMsg) + nBytes), 0); status = __lim_fill_tx_control_params(pMac, pTxCtrlMsg, type, mode); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cdf_mem_free(pTxCtrlMsg); lim_log(pMac, LOGP, FL("__lim_fill_tx_control_params failed, status = %d"), @@ -6898,9 +6898,9 @@ void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, * of. Since STA/SAP can have different Extended capabilities set, this function * is called per vdev creation. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, +QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, uint32_t session_id, tDot11fIEExtCap *extra_extcap, bool merge) { @@ -6920,7 +6920,7 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, NULL); if (eSIR_SUCCESS != status) { lim_log(mac_ctx, LOGE, FL("Failed to populate ext cap IE")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } num_bytes = ext_cap_data.num_bytes; @@ -6935,7 +6935,7 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, vdev_ie = cdf_mem_malloc(sizeof(*vdev_ie) + num_bytes); if (!vdev_ie) { lim_log(mac_ctx, LOGE, FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } vdev_ie->vdev_id = session_id; @@ -6955,15 +6955,15 @@ CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, msg.bodyptr = vdev_ie; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { lim_log(mac_ctx, LOGE, FL("Not able to post WMA_SET_IE_INFO to WDA")); cdf_mem_free(vdev_ie); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index ae5cd6a38728..9200313042dd 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -244,7 +244,7 @@ tSirRetStatus lim_restore_pre_quiet_state(tpAniSirGlobal pMac, void lim_prepare_for11h_channel_switch(tpAniSirGlobal pMac, tpPESession psessionEntry); -void lim_switch_channel_cback(tpAniSirGlobal pMac, CDF_STATUS status, +void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data, tpPESession psessionEntry); static inline tSirRFBand lim_get_rf_band(uint8_t channel) @@ -576,7 +576,7 @@ void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, void lim_check_and_reset_protection_params(tpAniSirGlobal mac_ctx); -CDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, uint32_t session_id, tDot11fIEExtCap *extracted_extcap, bool merge); tSirRetStatus lim_strip_extcap_ie(tpAniSirGlobal mac_ctx, uint8_t *addn_ie, diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 1a11104162bf..344ac544c306 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -201,7 +201,8 @@ void sch_send_start_scan_rsp(tpAniSirGlobal pMac) PELOG1(sch_log(pMac, LOG1, FL("Sending LIM message to go into scan"));) msgQ.type = SIR_SCH_START_SCAN_RSP; - if ((retCode = lim_post_msg_api(pMac, &msgQ)) != eSIR_SUCCESS) + retCode = lim_post_msg_api(pMac, &msgQ); + if (retCode != eSIR_SUCCESS) sch_log(pMac, LOGE, FL("Posting START_SCAN_RSP to LIM failed, reason=%X"), retCode); @@ -230,7 +231,7 @@ void sch_send_start_scan_rsp(tpAniSirGlobal pMac) * * @param size - Length of the beacon * - * @return CDF_STATUS + * @return QDF_STATUS */ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, uint16_t size, tpPESession psessionEntry) @@ -300,7 +301,8 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, } MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { sch_log(pMac, LOGE, FL("Posting SEND_BEACON_REQ to HAL failed, reason=%X"), retCode); @@ -310,12 +312,12 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, if (LIM_IS_AP_ROLE(psessionEntry) && (pMac->sch.schObject.fBeaconChanged)) { - if (eSIR_SUCCESS != - (retCode = - lim_send_probe_rsp_template_to_hal(pMac, psessionEntry, - &psessionEntry-> - DefProbeRspIeBitmap - [0]))) { + retCode = lim_send_probe_rsp_template_to_hal(pMac, + psessionEntry, + &psessionEntry-> + DefProbeRspIeBitmap + [0]); + if (eSIR_SUCCESS != retCode) { /* check whether we have to free any memory */ sch_log(pMac, LOGE, FL @@ -335,7 +337,7 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, { uint32_t left = psessionEntry->addIeParams.probeRespDataLen; uint8_t *ptr = psessionEntry->addIeParams.probeRespData_buff; - uint8_t elem_id,elem_len; + uint8_t elem_id, elem_len; uint32_t offset = 0; uint8_t eid = 0xDD; @@ -347,7 +349,7 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, elem_id = ptr[0]; elem_len = ptr[1]; left -= 2; - if(elem_len > left) { + if (elem_len > left) { sch_log(pMac, LOGE, FL("Invalid IEs")); return eSIR_FAILURE; } @@ -516,7 +518,8 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, msgQ.bodyptr = pprobeRespParams; msgQ.bodyval = 0; - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { /* free the allocated Memory */ sch_log(pMac, LOGE, FL diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index ef0c89d6a2a4..d4521b8fe3bb 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -42,7 +42,6 @@ Include files -------------------------------------------------------------------------*/ #include -#include #include #include @@ -112,7 +111,7 @@ typedef enum { \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); +QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); /*---------------------------------------------------------------------------- @@ -129,7 +128,7 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); \param pUserData - pointer to some user data entity that is passed to the callback function as a parameter when invoked. - \return CDF_STATUS_SUCCESS - + \return QDF_STATUS_SUCCESS - \todo: We have not 'status' on the callback. How do we notify the callback that there is a failure ? @@ -137,7 +136,7 @@ CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg); \sa --------------------------------------------------------------------------*/ -CDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, +QDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, void *pUserData); /*---------------------------------------------------------------------------- @@ -150,14 +149,14 @@ CDF_STATUS sysMcStart(v_CONTEXT_t p_cds_context, sysResponseCback userCallback, \param p_cds_context - pointer to the CDS Context - \return CDF_STATUS_SUCCESS - the SYS module is stopped. + \return QDF_STATUS_SUCCESS - the SYS module is stopped. - CDF_STATUS_E_FAILURE - the SYS module open failed to stop. + QDF_STATUS_E_FAILURE - the SYS module open failed to stop. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); +QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); /*---------------------------------------------------------------------------- @@ -181,14 +180,14 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context); \param pMsg - pointer to the message to be processed. - \return - CDF_STATUS_SUCCESS - the message was processed successfully. + \return - QDF_STATUS_SUCCESS - the message was processed successfully. - CDF_STATUS_E_BADMSG - a bad (unknown type) message was received + QDF_STATUS_E_BADMSG - a bad (unknown type) message was received and subsequently not processed. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg); +QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg); void wlan_sys_probe(void); diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 1c1452f01098..7c950e115af9 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -54,14 +54,14 @@ static qdf_event_t g_stop_evt; * * This API is used to build the sys message header. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) +QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) { pMsg->type = sysMsgId; pMsg->reserved = SYS_MSG_COOKIE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -87,11 +87,10 @@ void sys_stop_complete_cb(void *pUserData) * * This API is used post a stop message to system module * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) +QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sysMsg; @@ -109,9 +108,9 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) sysMsg.bodyptr = (void *)&g_stop_evt; /* post the message.. */ - cdf_status = cds_mq_post_message(CDS_MQ_ID_SYS, &sysMsg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_status = CDF_STATUS_E_BADMSG; + qdf_status = cds_mq_post_message(CDS_MQ_ID_SYS, &sysMsg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + qdf_status = QDF_STATUS_E_BADMSG; qdf_status = qdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); @@ -129,11 +128,11 @@ CDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) * * This API is used to process the message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) +QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cdf_mc_timer_callback_t timerCB; tpAniSirGlobal mac_ctx; void *hHal; @@ -142,7 +141,7 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer to cds_msg_t", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* @@ -177,17 +176,17 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal", __func__); } else { - cdf_status = sme_stop(hHal, + qdf_status = sme_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); - cdf_status = mac_stop(hHal, + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + qdf_status = mac_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(CDF_IS_STATUS_SUCCESS(cdf_status)); + CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); ((sysResponseCback) pMsg->callback)( (void *)pMsg->bodyptr); - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; } break; @@ -249,12 +248,12 @@ CDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) "Rx SYS unknown MC msgtype= %d [0x%08X]", pMsg->type, pMsg->type); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_BADMSG; + qdf_status = QDF_STATUS_E_BADMSG; if (pMsg->bodyptr) cdf_mem_free(pMsg->bodyptr); } - return cdf_status; + return qdf_status; } /** @@ -339,7 +338,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) /* * Post now the message to the appropriate module for handling */ - if (CDF_STATUS_SUCCESS != cds_mq_post_message(targetMQ, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(targetMQ, (cds_msg_t *) pMsg)) { /* * Caller doesn't allocate memory for the pMsg. diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index 47499656cd41..10c993efc8bc 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -34,7 +34,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -44,18 +44,18 @@ when who what, where, why -------- --- -------------------------------------------------------- 03/31/09 sho Remove the use of cdf_timerIsActive flag as it is not - thread-safe + thread-safe 02/17/08 sho Fix the timer callback function to work when it is called - after the timer has stopped due to a race condition. + after the timer has stopped due to a race condition. 02/10/08 sho Refactor the TX timer to use VOS timer directly instead - of using VOS utility timer + of using VOS utility timer 12/15/08 sho Resolved errors and warnings from the AMSS compiler when - this is ported from WM + this is ported from WM 11/20/08 sho Renamed this to VosWrapper.c; remove all dependencies on - WM platform and allow this to work on all VOSS enabled - platform + WM platform and allow this to work on all VOSS enabled + platform 06/24/08 tbh Modified the file to remove the dependecy on HDD files as - part of Gen6 bring up process. + part of Gen6 bring up process. 10/29/02 Neelay Das Created file. ===========================================================================*/ @@ -89,7 +89,7 @@ */ uint64_t tx_time_get(void) { - return (cdf_mc_timer_get_system_ticks()); + return cdf_mc_timer_get_system_ticks(); } /* * tx_time_get() */ @@ -111,7 +111,7 @@ uint64_t tx_time_get(void) */ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) { - CDF_STATUS status; + QDF_STATUS status; /* Uncomment the asserts, if the intention is to debug the occurence of the */ /* following anomalous cnditions. */ @@ -141,11 +141,11 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; - } else if (CDF_STATUS_E_ALREADY == status) { + } else if (QDF_STATUS_E_ALREADY == status) { /* starting timer fails because timer is already started; this is okay */ CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s is already running\n", TIMER_NAME); @@ -271,12 +271,12 @@ static void tx_main_timer_func(void *functionContext) /* check if this needs to be rescheduled */ if (0 != timer_ptr->rescheduleTimeInMsecs) { - CDF_STATUS status; + QDF_STATUS status; status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->rescheduleTimeInMsecs); timer_ptr->rescheduleTimeInMsecs = 0; - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, "Unable to reschedule timer %s; status=%d", TIMER_NAME, status); @@ -295,7 +295,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, uint64_t auto_activate, char *fileName, uint32_t lineNum) { - CDF_STATUS status; + QDF_STATUS status; if (NULL == expiration_function) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, @@ -338,7 +338,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; @@ -366,7 +366,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, uint64_t rescheduleTimeInTicks, uint64_t auto_activate) { - CDF_STATUS status; + QDF_STATUS status; if ((NULL == name_ptr) || (NULL == expiration_function)) return TX_TIMER_ERROR; @@ -396,7 +396,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, status = cdf_mc_timer_init(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; @@ -434,7 +434,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, */ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) { - CDF_STATUS vStatus; + QDF_STATUS vStatus; CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); @@ -444,7 +444,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) } /* if the timer is not running then we do not need to do anything here */ vStatus = cdf_mc_timer_stop(&timer_ptr->cdf_timer); - if (CDF_STATUS_SUCCESS != vStatus) { + if (QDF_STATUS_SUCCESS != vStatus) { CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", TIMER_NAME, vStatus); diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 304ab3e8f7be..a748f85ddb8d 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -107,7 +107,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, void *bd_ptr; tMgmtFrmDropReason dropreason; cds_pkt_t *vos_pkt = (cds_pkt_t *) msg->bodyptr; - CDF_STATUS cdf_status = + QDF_STATUS qdf_status = wma_ds_peek_rx_packet_info(vos_pkt, &bd_ptr, false); uint8_t sessionid; tpPESession pe_session; @@ -115,7 +115,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, mac_ctx->sys.gSysBbtReceived++; - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) goto fail; sys_log(mac_ctx, LOG3, FL("Rx Mgmt Frame Subtype: %d\n"), subtype); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index b13fd2971853..30ea1a79bd8d 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -132,7 +132,7 @@ void swap_bit_field32(uint32_t in, uint32_t *out) #endif /* ANI_LITTLE_BIT_ENDIAN */ } -inline static void __print_wmm_params(tpAniSirGlobal pMac, +static inline void __print_wmm_params(tpAniSirGlobal pMac, tDot11fIEWMMParams *pWmm) { lim_log(pMac, LOG1, FL("WMM Parameters Received: \n")); @@ -199,9 +199,9 @@ int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID) while (1) { if (EID == pRsnIe->rsnIEdata[idx]) { /* Found it */ - return (idx); + return idx; } else if (EID != pRsnIe->rsnIEdata[idx] && - /* & if no more IE, */ + /* & if no more IE, */ bytesLeft <= (uint16_t) (ieLen)) { dot11f_log(pMac, LOG3, FL("No IE (%d) in find_ie_location.\n"), EID); @@ -705,8 +705,7 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac, uHTCapabilityInfo.htCapInfo.lsigTXOPProtection; /* All sessionized entries will need the check below */ - if (psessionEntry == NULL) /* Only in case of NO session */ - { + if (psessionEntry == NULL) { /* Only in case of NO session */ pDot11f->supportedChannelWidthSet = uHTCapabilityInfo.htCapInfo.supportedChannelWidthSet; pDot11f->advCodingCap = @@ -1551,7 +1550,8 @@ populate_dot11f_rsn(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN); + if (0 <= idx) { status = dot11f_unpack_ie_rsn(pMac, pRsnIe->rsnIEdata + idx + 2, /* EID, length */ pRsnIe->rsnIEdata[idx + 1], pDot11f); @@ -1578,7 +1578,8 @@ tSirRetStatus populate_dot11f_rsn_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_RSN); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ @@ -1600,7 +1601,8 @@ populate_dot11f_wapi(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI); + if (0 <= idx) { status = dot11f_unpack_ie_wapi(pMac, pRsnIe->rsnIEdata + idx + 2, /* EID, length */ pRsnIe->rsnIEdata[idx + 1], pDot11f); @@ -1627,7 +1629,8 @@ tSirRetStatus populate_dot11f_wapi_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WAPI); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ @@ -1783,21 +1786,20 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac, wlan_cfg_get_int(p_mac, WNI_CFG_DOT11_MODE, &self_dot11mode); /** - * Include 11b rates only when the device configured in + * Include 11b rates only when the device configured in * auto, 11a/b/g or 11b_only - */ + */ if ((self_dot11mode == WNI_CFG_DOT11_MODE_ALL) || (self_dot11mode == WNI_CFG_DOT11_MODE_11A) || (self_dot11mode == WNI_CFG_DOT11_MODE_11AC) || (self_dot11mode == WNI_CFG_DOT11_MODE_11N) || (self_dot11mode == WNI_CFG_DOT11_MODE_11G) || - (self_dot11mode == WNI_CFG_DOT11_MODE_11B) ) { + (self_dot11mode == WNI_CFG_DOT11_MODE_11B)) { val = WNI_CFG_SUPPORTED_RATES_11B_LEN; wlan_cfg_get_str(p_mac, WNI_CFG_SUPPORTED_RATES_11B, (uint8_t *)&temp_rateset.rate, &val); temp_rateset.numRates = (uint8_t) val; - } - else { + } else { temp_rateset.numRates = 0; } @@ -1814,14 +1816,14 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac, if ((temp_rateset.numRates + temp_rateset2.numRates) > SIR_MAC_MAX_NUMBER_OF_RATES) { lim_log(p_mac, LOGP, FL("more than %d rates in CFG"), - SIR_MAC_MAX_NUMBER_OF_RATES); + SIR_MAC_MAX_NUMBER_OF_RATES); return eSIR_FAILURE; } /** - * copy all rates in temp_rateset, - * there are SIR_MAC_MAX_NUMBER_OF_RATES rates max - */ + * copy all rates in temp_rateset, + * there are SIR_MAC_MAX_NUMBER_OF_RATES rates max + */ for (i = 0; i < temp_rateset2.numRates; i++) temp_rateset.rate[i + temp_rateset.numRates] = temp_rateset2.rate[i]; @@ -2092,7 +2094,8 @@ populate_dot11f_wpa(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA); + if (0 <= idx) { status = dot11f_unpack_ie_wpa(pMac, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, length, OUI */ pRsnIe->rsnIEdata[idx + 1] - 4, /* OUI */ pDot11f); @@ -2115,7 +2118,8 @@ tSirRetStatus populate_dot11f_wpa_opaque(tpAniSirGlobal pMac, int idx; if (pRsnIe->length) { - if (0 <= (idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA))) { + idx = find_ie_location(pMac, pRsnIe, DOT11F_EID_WPA); + if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1] - 4; cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, len, OUI */ @@ -3111,7 +3115,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, uint8_t **outIeBuf, uint32_t *pOutIeLen) { tDot11fBeaconIEs *pBies = NULL; - uint32_t status = CDF_STATUS_SUCCESS; + uint32_t status = QDF_STATUS_SUCCESS; tSirRetStatus retStatus = eSIR_SUCCESS; tSirEseBcnReportMandatoryIe eseBcnReportMandatoryIe; @@ -4060,8 +4064,8 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirAddtsReqInfo *pAddTs) { - tDot11fAddTSRequest addts = { {0}}; - tDot11fWMMAddTSRequest wmmaddts = { {0}}; + tDot11fAddTSRequest addts = { {0} }; + tDot11fWMMAddTSRequest wmmaddts = { {0} }; uint8_t j; uint16_t i; uint32_t status; @@ -4201,8 +4205,8 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirAddtsRspInfo *pAddTs) { - tDot11fAddTSResponse addts = { {0}}; - tDot11fWMMAddTSResponse wmmaddts = { {0}}; + tDot11fAddTSResponse addts = { {0} }; + tDot11fWMMAddTSResponse wmmaddts = { {0} }; uint8_t j; uint16_t i; uint32_t status; @@ -4386,8 +4390,8 @@ sir_convert_delts_req2_struct(tpAniSirGlobal pMac, uint8_t *pFrame, uint32_t nFrame, tSirDeltsReqInfo *pDelTs) { - tDot11fDelTS delts = { {0}}; - tDot11fWMMDelTS wmmdelts = { {0}}; + tDot11fDelTS delts = { {0} }; + tDot11fWMMDelTS wmmdelts = { {0} }; uint32_t status; if (SIR_MAC_QOS_DEL_TS_REQ != *(pFrame + 1)) { @@ -4607,7 +4611,7 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac, [0]. request << 1) | - (mr.MeasurementRequest[0].report /*<< 0 */ ); + (mr.MeasurementRequest[0].report /*<< 0 */); pMeasReqFrame->measReqIE.measType = mr.MeasurementRequest[0].measurement_type; @@ -4721,8 +4725,9 @@ tSirRetStatus populate_dot11f_ese_cckm_opaque(tpAniSirGlobal pMac, { int idx; if (pCCKMie->length) { - if (0 <= (idx = find_ie_location(pMac, (tpSirRSNie) pCCKMie, - DOT11F_EID_ESECCKMOPAQUE))) { + idx = find_ie_location(pMac, (tpSirRSNie) pCCKMie, + DOT11F_EID_ESECCKMOPAQUE); + if (0 <= idx) { pDot11f->present = 1; /* Dont include OUI */ pDot11f->num_data = pCCKMie->cckmIEdata[idx + 1] - 4; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index e77d058822ea..b58fdd937010 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -800,109 +800,109 @@ typedef struct { #endif /* FEATURE_WLAN_CH_AVOID */ void sap_cleanup_channel_list(void *sapContext); void sapCleanupAllChannelList(void); -CDF_STATUS wlansap_set_wps_ie(void *p_cds_gctx, tSap_WPSIE *pWPSIe); -CDF_STATUS wlansap_update_wps_ie(void *p_cds_gctx); -CDF_STATUS wlansap_stop_Wps(void *p_cds_gctx); -CDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState); +QDF_STATUS wlansap_set_wps_ie(void *p_cds_gctx, tSap_WPSIE *pWPSIe); +QDF_STATUS wlansap_update_wps_ie(void *p_cds_gctx); +QDF_STATUS wlansap_stop_Wps(void *p_cds_gctx); +QDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState); void *wlansap_open(void *p_cds_gctx); -CDF_STATUS wlansap_start(void *p_cds_gctx); -CDF_STATUS wlansap_stop(void *p_cds_gctx); -CDF_STATUS wlansap_close(void *p_cds_gctx); -typedef CDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, +QDF_STATUS wlansap_start(void *p_cds_gctx); +QDF_STATUS wlansap_stop(void *p_cds_gctx); +QDF_STATUS wlansap_close(void *p_cds_gctx); +typedef QDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, void *pUsrContext); uint8_t wlansap_get_state(void *p_cds_gctx); -CDF_STATUS wlansap_start_bss(void *p_cds_gctx, +QDF_STATUS wlansap_start_bss(void *p_cds_gctx, tpWLAN_SAPEventCB pSapEventCallback, tsap_Config_t *pConfig, void *pUsrContext); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint16_t wlansap_check_cc_intf(void *Ctx); #endif -CDF_STATUS wlansap_set_mac_acl(void *p_cds_gctx, tsap_Config_t *pConfig); -CDF_STATUS wlansap_stop_bss(void *p_cds_gctx); -CDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, +QDF_STATUS wlansap_set_mac_acl(void *p_cds_gctx, tsap_Config_t *pConfig); +QDF_STATUS wlansap_stop_bss(void *p_cds_gctx); +QDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, const uint8_t *pPeerStaMac); -CDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, +QDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, +QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, phy_ch_width target_bw); -CDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, +QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); -CDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, +QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, CDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); -CDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, +QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, struct cdf_mac_addr pRemoveMac); -CDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); -CDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); -CDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, +QDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); +QDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); +QDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, uint32_t *pLen, uint8_t *pBuf); -CDF_STATUS wlansap_clear_acl(void *p_cds_gctx); -CDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, +QDF_STATUS wlansap_clear_acl(void *p_cds_gctx); +QDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList); -CDF_STATUS wlansap_get_acl_deny_list(void *pCtx, +QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, uint8_t *nDenyList); -CDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); -CDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); -CDF_STATUS wlansap_modify_acl(void *p_cds_gctx, +QDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); +QDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); +QDF_STATUS wlansap_modify_acl(void *p_cds_gctx, uint8_t *pPeerStaMac, eSapACLType listType, eSapACLCmdType cmd); -CDF_STATUS wlansap_set_wparsn_ies +QDF_STATUS wlansap_set_wparsn_ies (void *p_cds_gctx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen); -CDF_STATUS wlansap_send_action +QDF_STATUS wlansap_send_action (void *p_cds_gctx, const uint8_t *pBuf, uint32_t len, uint16_t wait, uint16_t channel_freq); -CDF_STATUS wlansap_remain_on_channel +QDF_STATUS wlansap_remain_on_channel (void *p_cds_gctx, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint32_t *scan_id); -CDF_STATUS wlansap_cancel_remain_on_channel(void *p_cds_gctx, +QDF_STATUS wlansap_cancel_remain_on_channel(void *p_cds_gctx, uint32_t scan_id); -CDF_STATUS wlansap_register_mgmt_frame +QDF_STATUS wlansap_register_mgmt_frame (void *p_cds_gctx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS wlansap_de_register_mgmt_frame +QDF_STATUS wlansap_de_register_mgmt_frame (void *p_cds_gctx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS wlansap_channel_change_request(void *p_cds_gctx, +QDF_STATUS wlansap_channel_change_request(void *p_cds_gctx, uint8_t tArgetChannel); -CDF_STATUS wlansap_start_beacon_req(void *pSapCtx); -CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx); -CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac); -CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac); -CDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, +QDF_STATUS wlansap_start_beacon_req(void *pSapCtx); +QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx); +QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac); +QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac); +QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_JapanW3); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE -CDF_STATUS +QDF_STATUS wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance); #endif -CDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, +QDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, uint8_t dfs_Preferred_Channels_location); -CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, +QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel); uint32_t wlan_sap_get_vht_ch_width(void *ctx); void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width); -CDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, +QDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, const uint8_t * pAdditionIEBuffer, uint16_t additionIELength, eUpdateIEsType updateType); -CDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, +QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType); void wlansap_extend_to_acs_range(uint8_t *startChannelNum, uint8_t *endChannelNum, uint8_t *bandStartChannel, uint8_t *bandEndChannel); -CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx); -CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf); +QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx); +QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf); void wlansap_populate_del_sta_params(const uint8_t *mac, uint16_t reason_code, uint8_t subtype, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS wlansap_acs_chselect(void *pvos_gctx, +QDF_STATUS wlansap_acs_chselect(void *pvos_gctx, tpWLAN_SAPEventCB pacs_event_callback, tsap_Config_t *pconfig, void *pusr_context); diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 0474e2120f14..32977d9f6b47 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p A p i L i n k C n t l . C + s a p A p i L i n k C n t l . C OVERVIEW: @@ -92,16 +92,16 @@ * * Return: Status */ -CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, +QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, void *ctx, /* Opaque SAP handle */ uint8_t session_id, uint32_t scan_id, eCsrScanStatus scan_status) { tScanResultHandle result = NULL; - CDF_STATUS get_result_status = CDF_STATUS_E_FAILURE; + QDF_STATUS get_result_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = (ptSapContext) ctx; tWLAN_SAPEvent sapEvent; /* State machine event */ uint8_t operChannel = 0; - CDF_STATUS sap_sm_status; + QDF_STATUS sap_sm_status; #ifdef SOFTAP_CHANNEL_RANGE uint32_t event; @@ -110,12 +110,12 @@ CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (NULL == hal_handle) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "In %s BSS already stopped", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (scan_status) { @@ -135,8 +135,8 @@ CDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, event = eSAP_MAC_SCAN_COMPLETE; - if ((get_result_status != CDF_STATUS_SUCCESS) - && (get_result_status != CDF_STATUS_E_NULL_VALUE)) { + if ((get_result_status != QDF_STATUS_SUCCESS) + && (get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* No scan results */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Get scan result failed! ret = %d", @@ -269,16 +269,16 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx, * this routine will be registered as callback to sme_close_session, so upon * closure of sap session it notifies the hostapd * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_hdd_signal_event_handler(void *ctx) +static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) { ptSapContext sap_ctx = (struct sSapContext *)ctx; - CDF_STATUS status; + QDF_STATUS status; if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sap context is not valid")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sap_signal_hdd_event(sap_ctx, NULL, sap_ctx->sap_state, @@ -299,18 +299,18 @@ static CDF_STATUS sap_hdd_signal_event_handler(void *ctx) * Api for scan callback. This function is invoked as a result of scan * completion and reports the scan results. * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -CDF_STATUS +QDF_STATUS wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, uint8_t sessionid, uint32_t scanid, eCsrScanStatus scan_status) { tScanResultHandle presult = NULL; - CDF_STATUS scan_get_result_status = CDF_STATUS_E_FAILURE; + QDF_STATUS scan_get_result_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = (ptSapContext)pcontext; uint8_t oper_channel = 0; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (eCSR_SCAN_SUCCESS != scan_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, @@ -339,8 +339,8 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, scan_get_result_status = sme_scan_get_result(hal_handle, sap_ctx->sessionId, NULL, &presult); - if ((scan_get_result_status != CDF_STATUS_SUCCESS) && - (scan_get_result_status != CDF_STATUS_E_NULL_VALUE)) { + if ((scan_get_result_status != QDF_STATUS_SUCCESS) && + (scan_get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* * No scan results So, set the operation channel not selected * to allow the default channel to be set when reporting to HDD @@ -406,7 +406,7 @@ close_session: status = sme_close_session(hal_handle, sap_ctx->sessionId, sap_hdd_signal_event_handler, sap_ctx); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession failed")); else @@ -430,10 +430,10 @@ static void wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, ptSapContext sap_ctx, tCsrRoamInfo *csr_roam_info, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { tWLAN_SAPEvent sap_event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds @@ -489,9 +489,9 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, } /* Handle the event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; } /** @@ -507,11 +507,11 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, static void wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, ptSapContext sap_ctx, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { tWLAN_SAPEvent sap_event; uint8_t intf; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); eCsrPhyMode phy_mode = sap_ctx->csr_roamProfile.phyMode; uint8_t dfs_beacon_start_req = 0; @@ -580,9 +580,9 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM")); /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } @@ -599,7 +599,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: sapctx[%p] ready but not concurrent sap"), sap_ctx); - *ret_status = CDF_STATUS_SUCCESS; + *ret_status = QDF_STATUS_SUCCESS; return; } @@ -620,12 +620,12 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, sap_event.u1 = 0; sap_event.u2 = 0; /* Handle event */ - cdf_status = sap_fsm(pSapContext, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = sap_fsm(pSapContext, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("post chnl chng req failed, sap[%p]"), sap_ctx); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } else { pSapContext->is_sap_ready_for_chnl_chng = false; } @@ -646,9 +646,9 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, static void wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, ptSapContext sap_ctx, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tWLAN_SAPEvent sap_event; if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) { if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { @@ -675,10 +675,10 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, * CAC end on this channel is not indicated, the user * space will be in some undefined state (e.g., UI frozen) */ - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Failed to send CAC end")); /* Want to still proceed and try to switch channel. @@ -691,9 +691,9 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } if (eSAP_STARTED == sap_ctx->sapsMachine) { @@ -709,9 +709,9 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - *ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + *ret_status = QDF_STATUS_E_FAILURE; return; } /* Further actions to be taken here */ @@ -737,9 +737,9 @@ static void wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, eCsrRoamResult roam_result, tCsrRoamInfo *csr_roam_info, - CDF_STATUS *ret_status) + QDF_STATUS *ret_status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"), roam_result); @@ -759,26 +759,26 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, sap_ctx->nStaAddIeLength); sap_ctx->SapQosCfg.WmmIsEnabled = csr_roam_info->wmmEnabledSta; /* MAC filtering */ - cdf_status = sap_is_peer_mac_allowed(sap_ctx, + qdf_status = sap_is_peer_mac_allowed(sap_ctx, (uint8_t *) csr_roam_info->peerMac.bytes); - if (CDF_STATUS_SUCCESS == cdf_status) { - cdf_status = sap_signal_hdd_event(sap_ctx, + if (QDF_STATUS_SUCCESS == qdf_status) { + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), roam_result, MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), roam_result, MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); - *ret_status = CDF_STATUS_E_FAILURE; + *ret_status = QDF_STATUS_E_FAILURE; } return; } @@ -797,7 +797,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, * * Return: Status of operation */ -CDF_STATUS +QDF_STATUS wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eRoamCmdStatus roam_status, eCsrRoamResult roam_result) { @@ -805,8 +805,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, ptSapContext sap_ctx = (ptSapContext) ctx; /* State machine event */ tWLAN_SAPEvent sap_event; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx = NULL; uint8_t intf; @@ -814,7 +814,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - cdf_ret_status = CDF_STATUS_E_NOMEM; + cdf_ret_status = QDF_STATUS_E_NOMEM; return cdf_ret_status; } @@ -841,9 +841,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.u1 = roam_status; sap_event.u2 = roam_result; /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_LOSTLINK: @@ -1008,22 +1008,22 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_ctx->SapQosCfg.WmmIsEnabled = csr_roam_info->wmmEnabledSta; /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_ASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"), roam_result); /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1034,11 +1034,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * we use the same event inorder to inform HDD to disassociate * the station */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1048,11 +1048,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for group key MIC failure event to be handled */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1062,12 +1062,12 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for unicast key MIC failure event to be handled */ - cdf_status = + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_RESULT_AUTHENTICATED: @@ -1078,8 +1078,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_STA_SET_KEY_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1104,9 +1104,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.params = csr_roam_info; sap_event.u1 = roam_status; sap_event.u2 = roam_result; - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1118,9 +1118,9 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.u1 = roam_status; sap_event.u2 = roam_result; /* Handle event */ - cdf_status = sap_fsm(sap_ctx, &sap_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + qdf_status = sap_fsm(sap_ctx, &sap_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1130,11 +1130,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, * Fill in the event structure * TODO: support for group key MIC failure event to be handled */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_WPS_PBC_PROBE_REQ_EVENT, (void *) NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1168,11 +1168,11 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"), roam_result); /* Fill in the event structure */ - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAX_ASSOC_EXCEEDED, NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND: @@ -1198,10 +1198,10 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Inform cfg80211 and hostapd that BSS is not alive anymore */ break; case eCSR_ROAM_EXT_CHG_CHNL_UPDATE_IND: - cdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_ECSA_CHANGE_CHAN_IND, NULL); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - cdf_ret_status = CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + cdf_ret_status = QDF_STATUS_E_FAILURE; break; default: CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 377cd0861431..621169cdf7de 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p F s m . C + s a p F s m . C OVERVIEW: @@ -732,7 +732,7 @@ tSapChanMatrixInfo ht20_chan[] = { * Static Function Declarations and Definitions * -------------------------------------------------------------------------*/ #ifdef SOFTAP_CHANNEL_RANGE -static CDF_STATUS sap_get_channel_list(ptSapContext sapContext, +static QDF_STATUS sap_get_channel_list(ptSapContext sapContext, uint8_t **channelList, uint8_t *numberOfChannels); #endif @@ -757,7 +757,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sapContext, SIDE EFFECTS ============================================================================*/ -static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext); +static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext); /*========================================================================== FUNCTION sapStopDfsCacTimer @@ -950,10 +950,10 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, * (if selected as target channel) will cause leakage in one of * the NOL channels * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, phy_ch_width ch_width, tSapDfsNolInfo *nol, @@ -989,7 +989,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Couldn't find target channel matrix!")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * following is based on assumption that both temp_ch_lst @@ -1027,7 +1027,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, k++; } } /* end of loop that selects each NOL */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* end of WLAN_ENABLE_CHNL_MATRIX_RESTRICTION */ @@ -1382,8 +1382,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) CDF_TRACE_LEVEL_INFO_LOW, FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."), i, channelID); - sapContext->SapAllChnlList.channelList[i].valid - = false; + sapContext->SapAllChnlList.channelList[i]. + valid = false; } } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -1439,7 +1439,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) FL ("sapdfs: Processing temp channel list against NOL.") ); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != sap_mark_channels_leaking_into_nol(sapContext, ch_width, nol, @@ -1954,18 +1954,18 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, * * Initiates sme scan for ACS to pick a channel. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, +QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, ptWLAN_SAPEvent sap_event, bool sap_do_acs_pre_start_bss) { /* Initiate a SCAN request */ - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /* To be initialised if scan is required */ tCsrScanRequest scan_request; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef SOFTAP_CHANNEL_RANGE uint8_t *channel_list = NULL; @@ -1979,7 +1979,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("invalid h_hal")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (cds_concurrent_beaconing_sessions_running()) { @@ -1992,7 +1992,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, CDS_IS_DFS_CH(sap_context->channel)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("MCC DFS not supported in AP_AP Mode")); - return CDF_STATUS_E_ABORTED; + return QDF_STATUS_E_ABORTED; } #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -2020,7 +2020,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, else if (CDS_IS_DFS_CH(sap_context->channel)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("DFS not supported in STA_AP Mode")); - return CDF_STATUS_E_ABORTED; + return QDF_STATUS_E_ABORTED; } #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -2127,7 +2127,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, &wlansap_scan_callback, sap_context); } - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), cdf_ret_status); @@ -2152,12 +2152,12 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * return failure so that the calling * fucntion can use the default channel. */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { /* Fill in the event structure */ sap_event_init(sap_event); /* Handle event */ - cdf_status = sap_fsm(sap_context, sap_event); + qdf_status = sap_fsm(sap_context, sap_event); } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -2189,7 +2189,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->acs_cfg->ch_width = sap_context->ch_width_orig; sap_config_acs_result(h_hal, sap_context, 0); - return CDF_STATUS_E_CANCELED; + return QDF_STATUS_E_CANCELED; } else { /* * Fill in the event structure @@ -2198,7 +2198,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, */ sap_event_init(sap_event); /* Handle event */ - cdf_status = sap_fsm(sap_context, sap_event); + qdf_status = sap_fsm(sap_context, sap_event); } } @@ -2213,7 +2213,7 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, FL("before exiting sap_goto_channel_sel channel=%d"), sap_context->channel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2232,17 +2232,17 @@ CDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sapContext : Sap Context value RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) +QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) { uint32_t type, subType; - CDF_STATUS cdf_ret_status; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (sapContext->csr_roamProfile.csrPersona == CDF_P2P_GO_MODE) @@ -2250,10 +2250,10 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) else status = cds_get_vdev_types(CDF_SAP_MODE, &type, &subType); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "failed to get vdev type"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Open SME Session for Softap */ cdf_ret_status = sme_open_session(hHal, @@ -2262,12 +2262,12 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) sapContext->self_mac_addr, &sapContext->sessionId, type, subType); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->sap.sapCtxList[sapContext->sessionId].sessionID = @@ -2275,7 +2275,7 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) pMac->sap.sapCtxList[sapContext->sessionId].pSapContext = sapContext; pMac->sap.sapCtxList[sapContext->sessionId].sapPersona = sapContext->csr_roamProfile.csrPersona; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2296,19 +2296,19 @@ CDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS +QDF_STATUS sap_goto_starting (ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, eCsrRoamBssType bssType) { /* tHalHandle */ tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; /*- - - - - - - - TODO:once configs from hdd available - - - - - - - - -*/ char key_material[32] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, @@ -2324,19 +2324,19 @@ sap_goto_starting /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "In %s, invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sap_open_session(hHal, sapContext); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* sapGotoStarting */ /*========================================================================== @@ -2355,15 +2355,15 @@ sap_goto_starting status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) +QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) { - CDF_STATUS cdf_ret_status; + QDF_STATUS cdf_ret_status; tHalHandle hHal; hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); @@ -2371,22 +2371,22 @@ CDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) /* we have a serious problem */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_free_roam_profile(&sapContext->csr_roamProfile); cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", __func__, cdf_ret_status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS sap_roam_session_close_callback(void *pContext) +static QDF_STATUS sap_roam_session_close_callback(void *pContext) { ptSapContext sapContext = (ptSapContext) pContext; return sap_signal_hdd_event(sapContext, NULL, @@ -2411,15 +2411,15 @@ static CDF_STATUS sap_roam_session_close_callback(void *pContext) status : Return the SAP status here RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) +QDF_STATUS sap_goto_disconnected(ptSapContext sapContext) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tWLAN_SAPEvent sapEvent; /* Processing has to be coded */ /* Clean up stations from TL etc as AP BSS is shut down then set event */ @@ -2428,9 +2428,9 @@ CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) sapEvent.u1 = 0; sapEvent.u2 = 0; /* Handle event */ - cdf_status = sap_fsm(sapContext, &sapEvent); + qdf_status = sap_fsm(sapContext, &sapEvent); - return cdf_status; + return qdf_status; } /** @@ -2442,13 +2442,13 @@ CDF_STATUS sap_goto_disconnected(ptSapContext sapContext) * * Function for HDD to send the event notification using callback * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, +QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, tCsrRoamInfo *csr_roaminfo, eSapHddEvent sap_hddevent, void *context) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSap_Event sap_ap_event; /* This now encodes ALL event types */ tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx; @@ -2464,18 +2464,18 @@ CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, /* Format the Start BSS Complete event to return... */ if (NULL == sap_ctx->pfnSapEventCallback) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -2763,10 +2763,10 @@ CDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_hddevent); break; } - cdf_status = (*sap_ctx->pfnSapEventCallback) + qdf_status = (*sap_ctx->pfnSapEventCallback) (&sap_ap_event, sap_ctx->pUsrContext); - return cdf_status; + return qdf_status; } @@ -2820,25 +2820,25 @@ ptSapContext sap_find_valid_concurrent_session(tHalHandle hHal) valid : Sap context is valid or no RETURN VALUE - The CDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + The QDF_STATUS code associated with performing the operation + QDF_STATUS_SUCCESS: Success SIDE EFFECTS NA ============================================================================*/ -CDF_STATUS sap_close_session(tHalHandle hHal, +QDF_STATUS sap_close_session(tHalHandle hHal, ptSapContext sapContext, csr_roamSessionCloseCallback callback, bool valid) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (false == valid) { - cdf_status = sme_close_session(hHal, + qdf_status = sme_close_session(hHal, sapContext->sessionId, callback, NULL); } else { - cdf_status = sme_close_session(hHal, + qdf_status = sme_close_session(hHal, sapContext->sessionId, callback, sapContext); } @@ -2869,14 +2869,14 @@ CDF_STATUS sap_close_session(tHalHandle hHal, cdf_mem_zero(&pMac->sap, sizeof(pMac->sap)); } - return cdf_status; + return qdf_status; } /*========================================================================== FUNCTION sap_cac_reset_notify DESCRIPTION Function will be called up on stop bss indication to clean up - DFS global structure. + DFS global structure. DEPENDENCIES PARAMETERS IN hHAL : HAL pointer @@ -2907,20 +2907,20 @@ void sap_cac_reset_notify(tHalHandle hHal) FUNCTION sap_cac_start_notify DESCRIPTION Function will be called to notify eSAP_DFS_CAC_START event - to HDD + to HDD DEPENDENCIES PARAMETERS IN hHAL : HAL pointer - RETURN VALUE : CDF_STATUS. + RETURN VALUE : QDF_STATUS. SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_cac_start_notify(tHalHandle hHal) +QDF_STATUS sap_cac_start_notify(tHalHandle hHal) { uint8_t intf = 0; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = @@ -2934,41 +2934,41 @@ CDF_STATUS sap_cac_start_notify(tHalHandle hHal) "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]", pSapContext); - cdf_status = sap_signal_hdd_event(pSapContext, NULL, + qdf_status = sap_signal_hdd_event(pSapContext, NULL, eSAP_DFS_CAC_START, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacStartNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } pSapContext->isCacStartNotified = true; } } - return cdf_status; + return qdf_status; } /*========================================================================== FUNCTION sap_cac_end_notify DESCRIPTION Function will be called to notify eSAP_DFS_CAC_END event - to HDD + to HDD DEPENDENCIES PARAMETERS IN hHAL : HAL pointer - RETURN VALUE : CDF_STATUS. + RETURN VALUE : QDF_STATUS. SIDE EFFECTS ============================================================================*/ -CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) +QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) { uint8_t intf; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; /* * eSAP_DFS_CHANNEL_CAC_END: @@ -2985,16 +2985,16 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacEndNotified)) { pSapContext = pMac->sap.sapCtxList[intf].pSapContext; - cdf_status = sap_signal_hdd_event(pSapContext, NULL, + qdf_status = sap_signal_hdd_event(pSapContext, NULL, eSAP_DFS_CAC_END, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } pSapContext->isCacEndNotified = true; pMac->sap.SapDfsInfo.sap_radar_found_status = false; @@ -3016,16 +3016,16 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) pSapContext->sapsMachine = eSAP_STARTED; /*Action code for transition */ - cdf_status = sap_signal_hdd_event(pSapContext, roamInfo, + qdf_status = sap_signal_hdd_event(pSapContext, roamInfo, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); - return cdf_status; + return qdf_status; } /* Transition from eSAP_STARTING to eSAP_STARTED @@ -3046,7 +3046,7 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) * by checking against eSAP_DFS_SKIP_CAC while starting the timer. */ pMac->sap.SapDfsInfo.cac_state = eSAP_DFS_SKIP_CAC; - return cdf_status; + return qdf_status; } /** @@ -3058,14 +3058,14 @@ CDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) * * This function is called for state transition from "eSAP_DISCONNECTED" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_HDD_START_INFRA_BSS) { /* @@ -3080,7 +3080,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SME Session is already opened")); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } sap_ctx->sessionId = 0xff; @@ -3088,13 +3088,13 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, if ((sap_ctx->channel == AUTO_CHANNEL_SELECT) && (sap_ctx->isScanSessionOpen == eSAP_FALSE)) { uint32_t type, subtype; - if (CDF_STATUS_SUCCESS == cds_get_vdev_types( + if (QDF_STATUS_SUCCESS == cds_get_vdev_types( CDF_STA_MODE, &type, &subtype)) { /* Open SME Session for scan */ - cdf_status = sme_open_session(hal, NULL, + qdf_status = sme_open_session(hal, NULL, sap_ctx, sap_ctx->self_mac_addr, &sap_ctx->sessionId, type, subtype); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Error: calling sme_open_session")); @@ -3113,7 +3113,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Perform sme_ScanRequest. This scan request is post start bss * request so, set the third to false. */ - cdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); + qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); /* * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT @@ -3138,7 +3138,7 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, sap_start_dfs_cac_timer(sap_ctx); } - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else if (msg == eSAP_CHANNEL_SELECTION_RETRY) { /* Set SAP device role */ sap_ctx->sapsMachine = eSAP_CH_SELECT; @@ -3147,14 +3147,14 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Perform sme_ScanRequest. This scan request is post start bss * request so, set the third to false. */ - cdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); + qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, event msg %d"), "eSAP_DISCONNECTED", msg); } - return cdf_status; + return qdf_status; } /** @@ -3166,14 +3166,14 @@ static CDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_CH_SELECT" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint32_t cbmode; bool b_leak_chan = false; #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION @@ -3183,9 +3183,9 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, if (sap_ctx->isScanSessionOpen == eSAP_TRUE) { /* scan completed, so close the session */ - cdf_status = sme_close_session(hal, sap_ctx->sessionId, + qdf_status = sme_close_session(hal, sap_ctx->sessionId, NULL, NULL); - if (CDF_STATUS_SUCCESS != cdf_status) + if (QDF_STATUS_SUCCESS != qdf_status) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession error event msg %d"), msg); else @@ -3233,7 +3233,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *)eSAP_STATUS_SUCCESS); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3295,7 +3295,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_signal_hdd_event(sap_ctx, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *) eSAP_STATUS_SUCCESS); - cdf_status = sap_goto_starting(sap_ctx, sap_event, + qdf_status = sap_goto_starting(sap_ctx, sap_event, eCSR_BSS_TYPE_INFRA_AP); } else if (msg == eSAP_CHANNEL_SELECTION_FAILED) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; @@ -3313,7 +3313,7 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, "eSAP_CH_SELECT", msg); } - return cdf_status; + return qdf_status; } /** @@ -3325,15 +3325,15 @@ static CDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_DFS_CAC_WAIT" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; tCsrRoamInfo *roam_info = (tCsrRoamInfo *) (sap_event->params); - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_DFS_CHANNEL_CAC_START) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3341,7 +3341,7 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT"); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) sap_start_dfs_cac_timer(sap_ctx); - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else if (msg == eSAP_DFS_CHANNEL_CAC_RADAR_FOUND) { uint8_t intf; /* @@ -3386,7 +3386,7 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, } } } else if (msg == eSAP_DFS_CHANNEL_CAC_END) { - cdf_status = sap_cac_end_notify(hal, roam_info); + qdf_status = sap_cac_end_notify(hal, roam_info); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -3407,14 +3407,14 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, } sap_ctx->sapsMachine = eSAP_DISCONNECTING; - cdf_status = sap_goto_disconnecting(sap_ctx); + qdf_status = sap_goto_disconnecting(sap_ctx); } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DFS_CAC_WAIT", msg); } - return cdf_status; + return qdf_status; } /** @@ -3426,16 +3426,16 @@ static CDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_STARTING" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; tCsrRoamInfo *roam_info = (tCsrRoamInfo *) (sap_event->params); tSapDfsInfo *sap_dfs_info; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_MAC_START_BSS_SUCCESS) { /* @@ -3448,7 +3448,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_STARTED; /* Action code for transition */ - cdf_status = sap_signal_hdd_event(sap_ctx, roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, roam_info, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); @@ -3475,7 +3475,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, if (sap_dfs_info->is_dfs_cac_timer_running != true) sap_start_dfs_cac_timer(sap_ctx); - cdf_status = sap_cac_start_notify(hal); + qdf_status = sap_cac_start_notify(hal); } else { wlansap_start_beacon_req(sap_ctx); @@ -3491,10 +3491,10 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", "eSAP_DISCONNECTED"); /*Action code for transition */ - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_FAILURE); - cdf_status = sap_goto_disconnected(sap_ctx); + qdf_status = sap_goto_disconnected(sap_ctx); /* Advance outer statevar */ sap_ctx->sapsMachine = eSAP_DISCONNECTED; } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { @@ -3508,14 +3508,14 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, /* Advance outer statevar */ sap_ctx->sapsMachine = eSAP_DISCONNECTED; - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *) eSAP_STATUS_FAILURE); - cdf_status = sap_goto_disconnected(sap_ctx); + qdf_status = sap_goto_disconnected(sap_ctx); /* Close the SME session */ if (eSAP_TRUE == sap_ctx->isSapSessionOpen) { - if (CDF_STATUS_SUCCESS == sap_close_session(hal, + if (QDF_STATUS_SUCCESS == sap_close_session(hal, sap_ctx, NULL, false)) sap_ctx->isSapSessionOpen = eSAP_FALSE; } @@ -3531,7 +3531,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", "eSAP_STARTED"); /* Indicate change in the state to upper layers */ - cdf_status = sap_signal_hdd_event(sap_ctx, roam_info, + qdf_status = sap_signal_hdd_event(sap_ctx, roam_info, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { @@ -3540,7 +3540,7 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, "eSAP_STARTING", msg); } - return cdf_status; + return qdf_status; } /** @@ -3551,13 +3551,13 @@ static CDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_STARTED" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* @@ -3568,7 +3568,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, FL("from state %s => %s"), "eSAP_STARTED", "eSAP_DISCONNECTING"); sap_ctx->sapsMachine = eSAP_DISCONNECTING; - cdf_status = sap_goto_disconnecting(sap_ctx); + qdf_status = sap_goto_disconnecting(sap_ctx); } else if (eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START == msg) { uint8_t intf; /* @@ -3590,7 +3590,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, FL("sapdfs: Sending CSAIE for sapctx[%p]"), temp_sap_ctx); - cdf_status = wlansap_dfs_send_csa_ie_request( + qdf_status = wlansap_dfs_send_csa_ie_request( (void *) temp_sap_ctx); } } @@ -3600,7 +3600,7 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, "eSAP_STARTED", msg); } - return cdf_status; + return qdf_status; } /** @@ -3611,14 +3611,14 @@ static CDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, * * This function is called for state transition from "eSAP_DISCONNECTING" * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, +static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event, tpAniSirGlobal mac_ctx, tHalHandle hal) { uint32_t msg = sap_event->event; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_MAC_READY_FOR_CONNECTIONS) { /* @@ -3633,10 +3633,10 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, /* Close the SME session */ if (eSAP_TRUE == sap_ctx->isSapSessionOpen) { sap_ctx->isSapSessionOpen = eSAP_FALSE; - cdf_status = sap_close_session(hal, sap_ctx, + qdf_status = sap_close_session(hal, sap_ctx, sap_roam_session_close_callback, true); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - cdf_status = sap_signal_hdd_event(sap_ctx, NULL, + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + qdf_status = sap_signal_hdd_event(sap_ctx, NULL, eSAP_STOP_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } @@ -3649,7 +3649,7 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * Most likely, radar has been detected and SAP wants to * change the channel */ - cdf_status = wlansap_channel_change_request((void *) sap_ctx, + qdf_status = wlansap_channel_change_request((void *) sap_ctx, mac_ctx->sap.SapDfsInfo.target_channel); CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, @@ -3660,7 +3660,7 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, "eSAP_DISCONNECTING", msg); } - return cdf_status; + return qdf_status; } /** @@ -3670,9 +3670,9 @@ static CDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * * SAP statem machine entry function * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) +QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) { /* * Retrieve the phy link state machine structure @@ -3681,21 +3681,21 @@ CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) */ eSapFsmStates_t state_var = sap_ctx->sapsMachine; uint32_t msg = sap_event->event; /* State machine input event message */ - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx; if (NULL == hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, @@ -3704,36 +3704,36 @@ CDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) switch (state_var) { case eSAP_DISCONNECTED: - cdf_status = sap_fsm_state_disconnected(sap_ctx, sap_event, + qdf_status = sap_fsm_state_disconnected(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_CH_SELECT: - cdf_status = sap_fsm_state_ch_select(sap_ctx, sap_event, + qdf_status = sap_fsm_state_ch_select(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_DFS_CAC_WAIT: - cdf_status = sap_fsm_state_dfs_cac_wait(sap_ctx, sap_event, + qdf_status = sap_fsm_state_dfs_cac_wait(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_STARTING: - cdf_status = sap_fsm_state_starting(sap_ctx, sap_event, + qdf_status = sap_fsm_state_starting(sap_ctx, sap_event, mac_ctx, hal); break; case eSAP_STARTED: - cdf_status = sap_fsm_state_started(sap_ctx, sap_event, + qdf_status = sap_fsm_state_started(sap_ctx, sap_event, mac_ctx); break; case eSAP_DISCONNECTING: - cdf_status = sap_fsm_state_disconnecting(sap_ctx, sap_event, + qdf_status = sap_fsm_state_disconnecting(sap_ctx, sap_event, mac_ctx, hal); break; } - return cdf_status; + return qdf_status; } eSapStatus @@ -4062,25 +4062,25 @@ void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) return; } -CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) +QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) { if (eSAP_ALLOW_ALL == sapContext->eSapMacAddrAclMode) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (sap_search_mac_list (sapContext->acceptMacList, sapContext->nAcceptMac, peerMac, NULL)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; if (sap_search_mac_list (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " in deny list", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* A new station CAN associate, unless in deny list. Less stringent mode */ if (eSAP_ACCEPT_UNLESS_DENIED == sapContext->eSapMacAddrAclMode) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { @@ -4088,7 +4088,7 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* The new STA is neither in accept list nor in deny list. In this case, deny the association @@ -4101,9 +4101,9 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, MAC_ADDR_ARRAY(peerMac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef SOFTAP_CHANNEL_RANGE @@ -4115,9 +4115,9 @@ CDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) * * This function populates the list of channels for scanning. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, +static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, uint8_t **ch_list, uint8_t *num_ch) { @@ -4138,7 +4138,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, FL("Invalid HAL pointer from p_cds_gctx")); *num_ch = 0; *ch_list = NULL; - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } start_ch_num = sap_ctx->acs_cfg->start_ch; @@ -4176,7 +4176,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, FL("Unable to allocate channel list")); *num_ch = 0; *ch_list = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Search for the Active channels in the given range */ @@ -4273,7 +4273,7 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("channel number: %d"), list[loop_count]); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -4281,14 +4281,14 @@ static CDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, * Function for initializing list of 2.4/5 Ghz [NON-DFS/DFS] * available channels in the current regulatory domain. */ -static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) +static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) { uint8_t count = 0; int i; if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sapContext->SapAllChnlList.channelList) { @@ -4302,7 +4302,7 @@ static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) if (NULL == sapContext->SapAllChnlList.channelList) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " Memory Allocation failed sap_get_channel_list"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = RF_CHAN_36; i <= RF_CHAN_165; i++) { @@ -4326,7 +4326,7 @@ static CDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) "sapContext->SapAllChnlList.numChannel = %d", __func__, __LINE__, count, sapContext->SapAllChnlList.numChannel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -4511,7 +4511,7 @@ sap_is_channel_bonding_etsi_weather_channel(ptSapContext sap_context) */ int sap_start_dfs_cac_timer(ptSapContext sapContext) { - CDF_STATUS status; + QDF_STATUS status; uint32_t cacTimeOut; tHalHandle hHal = NULL; tpAniSirGlobal pMac = NULL; @@ -4557,7 +4557,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) status = cdf_mc_timer_start(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, cacTimeOut); - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = true; return 1; } else { @@ -4570,7 +4570,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) * parameters required to track the radar * found DFS channels in the current Reg. Domain . */ -CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) +QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) { uint8_t count = 0; int i; @@ -4581,19 +4581,19 @@ CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_init_dfs_channel_nol_list"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); /* to indicate hdd to get cnss dfs nol */ - if (CDF_STATUS_SUCCESS == sap_signal_hdd_event(sapContext, NULL, + if (QDF_STATUS_SUCCESS == sap_signal_hdd_event(sapContext, NULL, eSAP_DFS_NOL_GET, (void *) eSAP_STATUS_SUCCESS)) { @@ -4632,7 +4632,7 @@ CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) __func__, __LINE__, pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 1abf9c8e3216..86f278114304 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -289,13 +289,13 @@ typedef struct sWLAN_SAPEvent { * Function Declarations and Documentation * -------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS wlansap_scan_callback (tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanID, eCsrScanStatus scanStatus); -CDF_STATUS +QDF_STATUS wlansap_pre_start_bss_acs_scan_callback( tHalHandle hal_handle, void *pcontext, @@ -304,29 +304,29 @@ wlansap_pre_start_bss_acs_scan_callback( eCsrScanStatus scan_status ); -CDF_STATUS +QDF_STATUS wlansap_roam_callback (void *pContext, tCsrRoamInfo *pCsrRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); -CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag); -CDF_STATUS SapFsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, +QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag); +QDF_STATUS SapFsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, uint8_t *status); void -wlansap_pmc_full_pwr_req_cb(void *callbackContext, CDF_STATUS status); +wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status); uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, tScanResultHandle pScanResult); -CDF_STATUS +QDF_STATUS sap_signal_hdd_event(ptSapContext sapContext, tCsrRoamInfo *pCsrRoamInfo, eSapHddEvent sapHddevent, void *); -CDF_STATUS sap_fsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent); +QDF_STATUS sap_fsm(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent); eSapStatus sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, @@ -335,7 +335,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, void sap_free_roam_profile(tCsrRoamProfile *profile); -CDF_STATUS +QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac); void @@ -356,9 +356,9 @@ eSapBool sap_search_mac_list(struct cdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index); -CDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); +QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); -CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx); +QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx); #ifdef FEATURE_WLAN_CH_AVOID void sap_update_unsafe_channel_list(ptSapContext pSapCtx); @@ -368,7 +368,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, tSirSmeDfsEventInd *dfs_event); -CDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext); +QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext); bool sap_dfs_is_channel_in_nol_list(ptSapContext sapContext, uint8_t channelNumber, @@ -395,7 +395,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID); bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID); -CDF_STATUS sap_goto_channel_sel( +QDF_STATUS sap_goto_channel_sel( ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, bool sap_do_acs_pre_start_bss); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 63b9981bf27f..1e23e8749216 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -139,11 +139,11 @@ void *wlansap_open(void *p_cds_gctx) * use this call to register with TL as the SAP entity for SAP RSN frames. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault. - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_start(void *pCtx) +QDF_STATUS wlansap_start(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -160,7 +160,7 @@ CDF_STATUS wlansap_start(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*------------------------------------------------------------------------ @@ -185,13 +185,13 @@ CDF_STATUS wlansap_start(void *pCtx) /* Now configure the auth type in the roaming profile. To open. */ pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -205,11 +205,11 @@ CDF_STATUS wlansap_start(void *pCtx) * close request to clean up its resources. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault. - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_stop(void *pCtx) +QDF_STATUS wlansap_stop(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -221,18 +221,18 @@ CDF_STATUS wlansap_stop(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_free_roam_profile(&pSapCtx->csr_roamProfile); - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -245,11 +245,11 @@ CDF_STATUS wlansap_stop(void *pCtx) * all the internal resources. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_close(void *pCtx) +QDF_STATUS wlansap_close(void *pCtx) { ptSapContext pSapCtx = NULL; @@ -261,7 +261,7 @@ CDF_STATUS wlansap_close(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Cleanup SAP control block */ @@ -273,7 +273,7 @@ CDF_STATUS wlansap_close(void *pCtx) cdf_mem_free(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wlansap_close */ /*---------------------------------------------------------------------------- @@ -289,11 +289,11 @@ CDF_STATUS wlansap_close(void *pCtx) * Clear out all fields in the SAP context. * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / *do not empty* /); */ +QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / *do not empty* /); */ ) { /*------------------------------------------------------------------------ Sanity check SAP control block @@ -302,7 +302,7 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*------------------------------------------------------------------------ @@ -324,7 +324,7 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->channel = 0; pSapCtx->isSapSessionOpen = eSAP_FALSE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* wlansap_clean_cb */ /*========================================================================== @@ -347,9 +347,9 @@ CDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / SIDE EFFECTS ============================================================================*/ void -wlansap_pmc_full_pwr_req_cb(void *callbackContext, CDF_STATUS status) +wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status) { - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* If success what else to be handled??? */ } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, @@ -378,7 +378,7 @@ uint8_t wlansap_get_state(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } return pSapCtx->sapsMachine; } @@ -430,7 +430,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx) * Return: The result code associated with * performing the operation */ -CDF_STATUS +QDF_STATUS wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, ptSapContext psap_ctx, void *pusr_context) @@ -440,13 +440,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, if (NULL == pconfig) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (NULL == psap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Channel selection is auto or configured */ @@ -492,7 +492,7 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wlan_sap_get_vht_ch_width() - Returns SAP VHT channel width. @@ -580,15 +580,15 @@ static inline bool wlan_sap_validate_channel_switch(tHalHandle hal, * starting AP BSS * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ +QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ tpWLAN_SAPEventCB pSapEventCallback, tsap_Config_t *pConfig, void *pUsrContext) { tWLAN_SAPEvent sapEvent; /* State machine event */ - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; tHalHandle hHal; tpAniSirGlobal pmac = NULL; @@ -608,7 +608,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->sapsMachine = eSAP_DISCONNECTED; @@ -648,7 +648,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } else { /* If concurrent session is running that is already associated * then we just follow that sessions country info (whether @@ -667,7 +667,7 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* * Copy the DFS Test Mode setting to pmac for @@ -694,9 +694,9 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ pSapCtx->pfnSapEventCallback = pSapEventCallback; /* Handle event */ - cdf_status = sap_fsm(pSapCtx, &sapEvent); + qdf_status = sap_fsm(pSapCtx, &sapEvent); - return cdf_status; + return qdf_status; } /* wlansap_start_bss */ /** @@ -710,13 +710,13 @@ CDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ * as deny list * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ +QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ tsap_Config_t *pConfig) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -727,7 +727,7 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Copy MAC filtering settings to sap context */ pSapCtx->eSapMacAddrAclMode = pConfig->SapMacaddr_acl; @@ -747,7 +747,7 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ sap_sort_mac_list(pSapCtx->denyMacList, pSapCtx->nDenyMac); } - return cdf_status; + return qdf_status; } /* wlansap_set_mac_acl */ /** @@ -760,14 +760,14 @@ CDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ * stopping AP BSS * * Return: The result code associated with performing the operation - * CDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; + * QDF_STATUS_E_FAULT: Pointer to SAP cb is NULL; * access would cause a page fault - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_stop_bss(void *pCtx) +QDF_STATUS wlansap_stop_bss(void *pCtx) { tWLAN_SAPEvent sapEvent; /* State machine event */ - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ @@ -778,7 +778,7 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) if (NULL == pCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Global CDS handle", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -786,7 +786,7 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* Fill in the event structure for FSM */ @@ -794,9 +794,9 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) sapEvent.params = 0; /* Handle event */ - cdf_status = sap_fsm(pSapCtx, &sapEvent); + qdf_status = sap_fsm(pSapCtx, &sapEvent); - return cdf_status; + return qdf_status; } /** @@ -815,9 +815,9 @@ CDF_STATUS wlansap_stop_bss(void *pCtx) * NOTE: The memory for this list will be allocated by the caller of this API * * Return: The result code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS +QDF_STATUS wlansap_get_assoc_stations (void *pCtx, CDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -829,7 +829,7 @@ wlansap_get_assoc_stations if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_associated_stas(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -838,7 +838,7 @@ wlansap_get_assoc_stations (void **) pSapCtx->pfnSapEventCallback, (uint8_t *) pAssocStas); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -851,12 +851,12 @@ wlansap_get_assoc_stations * This api function provides for Ap App/HDD to remove an entry from session * overlap info. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success - * CDF_STATUS_E_FAULT: Session is not dectected. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success + * QDF_STATUS_E_FAULT: Session is not dectected. * The parameter is function not valid. */ -CDF_STATUS +QDF_STATUS wlansap_remove_wps_session_overlap(void *pCtx, struct cdf_mac_addr pRemoveMac) { @@ -869,7 +869,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_wps_session_overlap(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -877,7 +877,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, (void **) pSapCtx->pfnSapEventCallback, pRemoveMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -888,10 +888,10 @@ wlansap_remove_wps_session_overlap(void *pCtx, * * This api function provides for Ap App/HDD to get WPS session overlap info. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) +QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) { struct cdf_mac_addr pRemoveMac = CDF_MAC_ADDR_ZERO_INITIALIZER; @@ -904,7 +904,7 @@ CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_get_wps_session_overlap(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), @@ -912,41 +912,41 @@ CDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) (void **) pSapCtx->pfnSapEventCallback, pRemoveMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* This routine will set the mode of operation for ACL dynamically*/ -CDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) +QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->eSapMacAddrAclMode = (eSapMacAddrACL) mode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Get ACL Mode */ -CDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) +QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *mode = pSapCtx->eSapMacAddrAclMode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* API to get ACL Accept List */ -CDF_STATUS +QDF_STATUS wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList) { @@ -954,17 +954,17 @@ wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy((void *)pAcceptList, (void *)pSapCtx->acceptMacList, (pSapCtx->nAcceptMac * CDF_MAC_ADDR_SIZE)); *nAcceptList = pSapCtx->nAcceptMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* API to get Deny List */ -CDF_STATUS +QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, uint8_t *nDenyList) { @@ -972,24 +972,24 @@ wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } memcpy((void *)pDenyList, (void *)pSapCtx->denyMacList, (pSapCtx->nDenyMac * CDF_MAC_ADDR_SIZE)); *nDenyList = pSapCtx->nDenyMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* This routine will clear all the entries in accept list as well as deny list */ -CDF_STATUS wlansap_clear_acl(void *pCtx) +QDF_STATUS wlansap_clear_acl(void *pCtx) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); uint8_t i; if (NULL == pSapCtx) { - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } if (pSapCtx->denyMacList != NULL) { @@ -1012,7 +1012,7 @@ CDF_STATUS wlansap_clear_acl(void *pCtx) sap_print_acl(pSapCtx->acceptMacList, pSapCtx->nAcceptMac); pSapCtx->nAcceptMac = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* @@ -1029,7 +1029,7 @@ CDF_STATUS wlansap_clear_acl(void *pCtx) * Return: Status */ -CDF_STATUS +QDF_STATUS wlansap_modify_acl (void *ctx, uint8_t *peer_sta_mac, eSapACLType list_type, eSapACLCmdType cmd) { @@ -1040,7 +1040,7 @@ wlansap_modify_acl if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP Context", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1069,7 +1069,7 @@ wlansap_modify_acl " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1086,7 +1086,7 @@ wlansap_modify_acl "White list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_white_list) { /* Do nothing if already present in white list. Just print a warning */ @@ -1095,7 +1095,7 @@ wlansap_modify_acl "MAC address already present in white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (sta_black_list) { /* remove it from black list before adding to the white list */ @@ -1146,12 +1146,12 @@ wlansap_modify_acl "MAC address to be deleted is not present in the white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; @@ -1167,7 +1167,7 @@ wlansap_modify_acl "Black list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sta_black_list) { /* Do nothing if already present in white list */ @@ -1176,7 +1176,7 @@ wlansap_modify_acl "MAC address already present in black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (sta_white_list) { /* remove it from white list before adding to the black list */ @@ -1224,12 +1224,12 @@ wlansap_modify_acl "MAC address to be deleted is not present in the black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; @@ -1237,7 +1237,7 @@ wlansap_modify_acl { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid list type passed %d", list_type); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, @@ -1248,7 +1248,7 @@ wlansap_modify_acl CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1260,10 +1260,10 @@ wlansap_modify_acl * * This api function provides for Ap App/HDD initiated disassociation of station * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) +QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1274,13 +1274,13 @@ CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_disconnect_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, pPeerStaMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1294,13 +1294,13 @@ CDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) * This api function provides for Ap App/HDD initiated deauthentication of * station * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -CDF_STATUS wlansap_deauth_sta(void *pCtx, +QDF_STATUS wlansap_deauth_sta(void *pCtx, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); /*------------------------------------------------------------------------ @@ -1310,17 +1310,17 @@ CDF_STATUS wlansap_deauth_sta(void *pCtx, if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return cdf_status; + return qdf_status; } cdf_ret_status = sme_roam_deauth_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, pDelStaParams); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } /** @@ -1359,9 +1359,9 @@ static inline void wlansap_update_bw80_cbmode(uint32_t channel, * @sap_context: sap adapter context * @channel: target channel * - * Return: The CDF_STATUS code associated with performing the operation + * Return: The QDF_STATUS code associated with performing the operation */ -static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, +static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, uint32_t channel) { void *hal; @@ -1372,7 +1372,7 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, if (!hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hal pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx = PMAC_STRUCT(hal); @@ -1421,7 +1421,7 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1433,9 +1433,9 @@ static CDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, * This api function does a channel change to the target channel specified. * CSA IE is included in the beacons before doing a channel change. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, phy_ch_width target_bw) { @@ -1445,21 +1445,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, tpAniSirGlobal pMac = NULL; void *hHal = NULL; bool valid; - CDF_STATUS status; + QDF_STATUS status; sapContext = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -1483,7 +1483,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel switch to %u is not allowed due to concurrent channel interference"), targetChannel); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* * Post a CSA IE request to SAP state machine with @@ -1494,7 +1494,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, if (eSAP_STARTED == sapContext->sapsMachine) { status = wlansap_update_csa_channel_params(sapContext, targetChannel); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; /* @@ -1574,7 +1574,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Failed to request Channel Change, since" "SAP is not in eSAP_STARTED state", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } } else { @@ -1582,7 +1582,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, "%s: Channel = %d is not valid in the current" "regulatory domain", __func__, targetChannel); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1590,7 +1590,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, "successfully to sap_fsm for Channel = %d", __func__, targetChannel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1612,10 +1612,10 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, * Once the 60 seconds timer expires, Authenticator will disable the counter * meassure at core stack. Now core stack can allow STAs to associate. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) +QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1626,13 +1626,13 @@ CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sme_roam_tkip_counter_measures(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, bEnable); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1644,15 +1644,15 @@ CDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) * * This api function provides for Ap App/HDD to set key for a station. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) +QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; uint32_t roamId = 0xFF; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1660,25 +1660,25 @@ CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_roam_set_key(hHal, pSapCtx->sessionId, pSetKeyInfo, &roamId); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + qdf_status = QDF_STATUS_SUCCESS; else - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; - return cdf_status; + return qdf_status; } /** @@ -1690,13 +1690,13 @@ CDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) * * Populate RSN IE from CSR to HDD context * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS wlan_sap_getstation_ie_information (void *ctx, uint32_t *len, uint8_t *buf) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; ptSapContext sap_ctx = NULL; uint32_t ie_len = 0; @@ -1704,7 +1704,7 @@ wlan_sap_getstation_ie_information if (NULL == sap_ctx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from pCtx")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (len) { @@ -1720,10 +1720,10 @@ wlan_sap_getstation_ie_information FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; } } - return cdf_status; + return qdf_status; } /** @@ -1735,10 +1735,10 @@ wlan_sap_getstation_ie_information * * This api function provides API for App/HDD to set WPS IE. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) +QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) { ptSapContext pSapCtx = NULL; void *hHal = NULL; @@ -1751,7 +1751,7 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1759,10 +1759,10 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - if (sap_acquire_global_lock(pSapCtx) == CDF_STATUS_SUCCESS) { + if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) { if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_BEACON_IE) { cdf_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, &pSap_WPSIe->sapwpsie. @@ -1777,12 +1777,12 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) sizeof(tSap_WPSProbeRspIE)); } else { sap_release_global_lock(pSapCtx); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } sap_release_global_lock(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -1793,14 +1793,14 @@ CDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) * * This api function provides API for App/HDD to update WPS IE. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS wlansap_update_wps_ie(void *pCtx) +QDF_STATUS wlansap_update_wps_ie(void *pCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, @@ -1811,7 +1811,7 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1819,19 +1819,19 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_roam_update_apwpsie(hHal, pSapCtx->sessionId, &pSapCtx->APWPSIEs); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - cdf_status = CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + qdf_status = QDF_STATUS_SUCCESS; else - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; - return cdf_status; + return qdf_status; } /** @@ -1844,10 +1844,10 @@ CDF_STATUS wlansap_update_wps_ie(void *pCtx) * * This api function provides for Ap App/HDD to check if WPS session in process. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) +QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) { ptSapContext pSapCtx = NULL; void *hHal = NULL; @@ -1860,7 +1860,7 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1868,10 +1868,10 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - if (sap_acquire_global_lock(pSapCtx) == CDF_STATUS_SUCCESS) { + if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) { if (pSapCtx->APWPSIEs.SirWPSProbeRspIE. FieldPresent & SIR_WPS_PROBRSP_SELECTEDREGISTRA_PRESENT) @@ -1881,32 +1881,32 @@ CDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) sap_release_global_lock(pSapCtx); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } -CDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx) +QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (CDF_IS_STATUS_SUCCESS(cdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { - cdf_status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } -CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) +QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) { - CDF_STATUS cdf_status = CDF_STATUS_E_FAULT; + QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (CDF_IS_STATUS_SUCCESS(cdf_mutex_release(&pSapCtx->SapGlobalLock))) { - cdf_status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cdf_mutex_release(&pSapCtx->SapGlobalLock))) { + qdf_status = QDF_STATUS_SUCCESS; } - return cdf_status; + return qdf_status; } /** @@ -1920,13 +1920,13 @@ CDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) * This api function provides for Ap App/HDD to set AP WPA and RSN IE in its * beacon and probe response. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_set_wparsn_ies +QDF_STATUS wlansap_set_wparsn_ies (void *pCtx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen) { ptSapContext pSapCtx = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1934,7 +1934,7 @@ CDF_STATUS wlansap_set_wparsn_ies CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); @@ -1942,7 +1942,7 @@ CDF_STATUS wlansap_set_wparsn_ies CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pSapCtx->APWPARSNIEs.length = (uint16_t) WPARSNIEsLen; @@ -1953,12 +1953,12 @@ CDF_STATUS wlansap_set_wparsn_ies sme_roam_update_apwparsni_es(hHal, pSapCtx->sessionId, &pSapCtx->APWPARSNIEs); - if (cdf_ret_status == CDF_STATUS_SUCCESS) - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) + return QDF_STATUS_SUCCESS; else - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -1971,43 +1971,43 @@ CDF_STATUS wlansap_set_wparsn_ies * * This api function provides to send action frame sent by upper layer. * - * Return: The CDF_STATUS code associated with performing the operation -* CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation +* QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, +QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, uint32_t len, uint16_t wait, uint16_t channel_freq) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_send_action(hHal, pSapCtx->sessionId, pBuf, len, 0, 0, channel_freq); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Send Action Frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2024,44 +2024,44 @@ CDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, * This api function provides to set Remain On channel on specified channel * for specified duration. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_remain_on_channel(void *pCtx, +QDF_STATUS wlansap_remain_on_channel(void *pCtx, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint32_t *scan_id) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId, channel, duration, callback, pContext, true, scan_id); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Set Remain on Channel"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2072,22 +2072,22 @@ CDF_STATUS wlansap_remain_on_channel(void *pCtx, * * This api cancel previous remain on channel request. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwie + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwie */ -CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, +QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, uint32_t scan_id) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || @@ -2095,21 +2095,21 @@ CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_cancel_remain_on_channel(hHal, pSapCtx->sessionId, scan_id); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Cancel Remain on Channel"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** * wlansap_register_mgmt_frame() - register management frame @@ -2123,43 +2123,43 @@ CDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, * HDD use this API to register specified type of frame with CORE stack. * On receiving such kind of frame CORE stack should pass this frame to HDD * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_register_mgmt_frame +QDF_STATUS wlansap_register_mgmt_frame (void *pCtx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Register MGMT frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /** @@ -2173,43 +2173,43 @@ CDF_STATUS wlansap_register_mgmt_frame * * This API is used to deregister previously registered frame. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise */ -CDF_STATUS wlansap_de_register_mgmt_frame +QDF_STATUS wlansap_de_register_mgmt_frame (void *pCtx, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cdf_ret_status = sme_deregister_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (CDF_STATUS_SUCCESS == cdf_ret_status) { - return CDF_STATUS_SUCCESS; + if (QDF_STATUS_SUCCESS == cdf_ret_status) { + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Deregister MGMT frame"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2233,17 +2233,17 @@ CDF_STATUS wlansap_de_register_mgmt_frame pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS +QDF_STATUS wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal mac_ctx = NULL; eCsrPhyMode phy_mode; @@ -2253,14 +2253,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx = PMAC_STRUCT(hHal); phy_mode = sapContext->csr_roamProfile.phyMode; @@ -2281,14 +2281,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) cdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid, &ch_params, &sapContext->csr_roamProfile); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { + if (cdf_ret_status == QDF_STATUS_SUCCESS) { sap_signal_hdd_event(sapContext, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *) eSAP_STATUS_SUCCESS); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2312,16 +2312,16 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) +QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; uint8_t dfsCacWaitStatus = 0; tpAniSirGlobal pMac = NULL; @@ -2330,14 +2330,14 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -2348,13 +2348,13 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) cdf_ret_status = sme_roam_start_beacon_req(hHal, sapContext->bssid, dfsCacWaitStatus); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2370,16 +2370,16 @@ CDF_STATUS wlansap_start_beacon_req(void *pSapCtx) pSapCtx: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) +QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) { ptSapContext sapContext = NULL; - CDF_STATUS cdf_ret_status = CDF_STATUS_E_FAILURE; + QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal pMac = NULL; sapContext = (ptSapContext) pSapCtx; @@ -2387,14 +2387,14 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); @@ -2404,11 +2404,11 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) pMac->sap.SapDfsInfo.csaIERequired, &pMac->sap.SapDfsInfo.new_ch_params); - if (cdf_ret_status == CDF_STATUS_SUCCESS) { - return CDF_STATUS_SUCCESS; + if (cdf_ret_status == QDF_STATUS_SUCCESS) { + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /*========================================================================== @@ -2426,13 +2426,13 @@ CDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) pIgnore_cac : pointer to ignore_cac variable RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) +QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) { tpAniSirGlobal pMac = NULL; @@ -2441,11 +2441,11 @@ CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *pIgnore_cac = pMac->sap.SapDfsInfo.ignore_cac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2463,13 +2463,13 @@ CDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) ignore_cac : value to set for ignore_cac variable in DFS global structure. RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) +QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) { tpAniSirGlobal pMac = NULL; @@ -2478,12 +2478,12 @@ CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac->sap.SapDfsInfo.ignore_cac = (ignore_cac >= true) ? true : false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2493,14 +2493,14 @@ CDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) * Indicates if Japan W53 is enabled when set to 0 * * This API is used to enable or disable Japan W53 Band - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success */ -CDF_STATUS +QDF_STATUS wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) { tpAniSirGlobal pMac = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t dfs_region; if (NULL != hHal) { @@ -2508,7 +2508,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cds_get_dfs_region(&dfs_region); @@ -2524,13 +2524,13 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"), pMac->sap.SapDfsInfo.is_dfs_w53_disabled); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("Regdomain not japan, set disable JP W53 not valid")); - status = CDF_STATUS_E_FAULT; + status = QDF_STATUS_E_FAULT; } return status; @@ -2546,7 +2546,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) * * Return: success of failure of operation */ -CDF_STATUS +QDF_STATUS wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) { tpAniSirGlobal mac_ctx = NULL; @@ -2556,10 +2556,10 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("hal or mac_ctx pointer NULL")); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } mac_ctx->sap.sap_channel_avoidance = sap_channel_avoidance; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -2575,16 +2575,16 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) * to resetrict the DFS random channel selection algorithm * either Indoor/Outdoor channels only. * - * Return: The CDF_STATUS code associated with performing the operation - * CDF_STATUS_SUCCESS: Success and error code otherwise. + * Return: The QDF_STATUS code associated with performing the operation + * QDF_STATUS_SUCCESS: Success and error code otherwise. */ -CDF_STATUS +QDF_STATUS wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, uint8_t dfs_Preferred_Channels_location) { tpAniSirGlobal pMac = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t dfs_region; if (NULL != hHal) { @@ -2592,7 +2592,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } cds_get_dfs_region(&dfs_region); @@ -2612,13 +2612,13 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, pMac->sap.SapDfsInfo. sap_operating_chan_preferred_location); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location")); - status = CDF_STATUS_E_FAULT; + status = QDF_STATUS_E_FAULT; } return status; @@ -2640,13 +2640,13 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, target_channel : target channel to be set RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) +QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) { tpAniSirGlobal pMac = NULL; @@ -2655,7 +2655,7 @@ CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) } else { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (target_channel > 0) { pMac->sap.SapDfsInfo.user_provided_target_channel = @@ -2664,22 +2664,22 @@ CDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) pMac->sap.SapDfsInfo.user_provided_target_channel = 0; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS +QDF_STATUS wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, const uint8_t *pAdditionIEBuffer, uint16_t additionIELength, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t bufferValid = false; uint16_t bufferLength = 0; uint8_t *pBuffer = NULL; if (NULL == pConfig) { - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if ((pAdditionIEBuffer != NULL) && (additionIELength != 0)) { @@ -2691,7 +2691,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pBuffer, pAdditionIEBuffer, bufferLength); bufferValid = true; @@ -2749,13 +2749,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, return status; } -CDF_STATUS +QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType) { if (NULL == pConfig) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Config pointer", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } switch (updateType) { @@ -2787,7 +2787,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp FL("Invalid buffer type %d"), updateType); break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2875,13 +2875,13 @@ void wlansap_extend_to_acs_range(uint8_t *startChannelNum, sapContext: Pointer to cds global context structure RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) +QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) { int i = 0; ptSapContext sapContext = (ptSapContext) pSapCtx; @@ -2895,20 +2895,20 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList; @@ -2916,7 +2916,7 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) if (!dfs_nol) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL context is null", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } for (i = 0; i < pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels; @@ -2960,7 +2960,7 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*========================================================================== @@ -2977,13 +2977,13 @@ CDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) conf: set type RETURN VALUE - The CDF_STATUS code associated with performing the operation + The QDF_STATUS code associated with performing the operation - CDF_STATUS_SUCCESS: Success + QDF_STATUS_SUCCESS: Success SIDE EFFECTS ============================================================================*/ -CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) +QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) { int i = 0; ptSapContext sapContext = (ptSapContext) pSapCtx; @@ -2993,20 +2993,20 @@ CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) if (NULL == sapContext) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (conf == eSAP_DFS_NOL_CLEAR) { @@ -3082,7 +3082,7 @@ CDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) sap_signal_hdd_event(sapContext, NULL, eSAP_DFS_NOL_SET, (void *) eSAP_STATUS_SUCCESS); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3140,9 +3140,9 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, * This function serves as an api for hdd to initiate acs scan pre * start bss. * - * Return: The CDF_STATUS code associated with performing the operation. + * Return: The QDF_STATUS code associated with performing the operation. */ -CDF_STATUS +QDF_STATUS wlansap_acs_chselect(void *pvos_gctx, tpWLAN_SAPEventCB pacs_event_callback, tsap_Config_t *pconfig, @@ -3150,7 +3150,7 @@ wlansap_acs_chselect(void *pvos_gctx, { ptSapContext sap_context = NULL; tHalHandle h_hal = NULL; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pmac = NULL; sap_context = CDS_GET_SAP_CB(pvos_gctx); @@ -3158,20 +3158,20 @@ wlansap_acs_chselect(void *pvos_gctx, CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pvos_gctx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (NULL == h_hal) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from pvosGCtx", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } if (sap_context->isSapSessionOpen == eSAP_TRUE) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "%s:SME Session is already opened\n", __func__); - return CDF_STATUS_E_EXISTS; + return QDF_STATUS_E_EXISTS; } sap_context->sessionId = 0xff; @@ -3191,12 +3191,12 @@ wlansap_acs_chselect(void *pvos_gctx, wlansap_set_scan_acs_channel_params(pconfig, sap_context, pusr_context); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == cds_get_vdev_types(CDF_STA_MODE, &type, &subType)) { /* * Open SME Session for scan */ - if (CDF_STATUS_SUCCESS != sme_open_session(h_hal, + if (QDF_STATUS_SUCCESS != sme_open_session(h_hal, NULL, sap_context, sap_context->self_mac_addr, &sap_context->sessionId, @@ -3205,7 +3205,7 @@ wlansap_acs_chselect(void *pvos_gctx, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_OpenSession", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { sap_context->isScanSessionOpen = eSAP_TRUE; } @@ -3234,14 +3234,14 @@ wlansap_acs_chselect(void *pvos_gctx, * different scan callback fucntion to process * the results pre start BSS. */ - cdf_status = sap_goto_channel_sel(sap_context, NULL, true); + qdf_status = sap_goto_channel_sel(sap_context, NULL, true); - if (CDF_STATUS_E_ABORTED == cdf_status) { + if (QDF_STATUS_E_ABORTED == qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); - return CDF_STATUS_E_FAILURE; - } else if (CDF_STATUS_E_CANCELED == cdf_status) { + return QDF_STATUS_E_FAILURE; + } else if (QDF_STATUS_E_CANCELED == qdf_status) { /* * ERROR is returned when either the SME scan request * failed or ACS is overridden due to other constrainst @@ -3257,11 +3257,11 @@ wlansap_acs_chselect(void *pvos_gctx, tHalHandle h_hal = CDS_GET_HAL_CB( sap_context->p_cds_gctx); if (h_hal == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (sme_close_session(h_hal, sap_context->sessionId, NULL, NULL) == - CDF_STATUS_SUCCESS) + QDF_STATUS_SUCCESS) sap_context->isScanSessionOpen = eSAP_FALSE; else @@ -3274,12 +3274,12 @@ wlansap_acs_chselect(void *pvos_gctx, return sap_signal_hdd_event(sap_context, NULL, eSAP_ACS_CHANNEL_SELECTED, (void *) eSAP_STATUS_SUCCESS); - } else if (CDF_STATUS_SUCCESS == cdf_status) { + } else if (QDF_STATUS_SUCCESS == qdf_status) { CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); } } - return cdf_status; + return qdf_status; } /** diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 797cc793ba40..34934654962c 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1526,16 +1526,16 @@ struct tagCsrDelStaParams { * NOTE: p2 is the second context pass in for the caller * NOTE: what if callback is called before requester gets the scanId?? */ -typedef CDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2, +typedef QDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2, uint8_t sessionId, uint32_t scanID, eCsrScanStatus status); -typedef CDF_STATUS (*csr_roam_completeCallback)(void *pContext, +typedef QDF_STATUS (*csr_roam_completeCallback)(void *pContext, tCsrRoamInfo * pParam, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult); -typedef CDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); +typedef QDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); #define CSR_IS_START_IBSS(pProfile) (eCSR_BSS_TYPE_START_IBSS == \ (pProfile)->BSSType) @@ -1554,14 +1554,14 @@ typedef CDF_STATUS (*csr_roamSessionCloseCallback)(void *pContext); #define CSR_IS_CLOSE_SESSION_COMMAND(pCommand) \ ((pCommand)->command == eSmeCommandDelStaSession) -CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam); +QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam); -CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); +QDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); /* enum to string conversion for debug output */ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val); const char *get_e_csr_roam_result_str(eCsrRoamResult val); -CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, +QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, bool *pfRestartNeeded); typedef void (*csr_roamLinkQualityIndCallback) (eCsrRoamLinkQualityInd ind, void *pContext); @@ -1574,16 +1574,16 @@ typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics, #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext); -CDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, tpSirBssDescription pBssDescription); -CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); +QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); eCsrBand csr_get_current_band(tHalHandle hHal); typedef void (*csr_readyToSuspendCallback)(void *pContext, bool suspended); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT typedef void (*csr_readyToExtWoWCallback)(void *pContext, bool status); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_issue_ft_roam_offload_synch(tHalHandle hHal, +QDF_STATUS csr_roam_issue_ft_roam_offload_synch(tHalHandle hHal, uint32_t sessionId, tSirBssDescription *pBssDescription); #endif typedef void (*tCsrLinkStatusCallback)(uint8_t status, void *pContext); diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index d422b8b0278c..1ce867970021 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -33,7 +33,6 @@ #ifndef CSRINTERNAL_H__ #define CSRINTERNAL_H__ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" @@ -1187,15 +1186,15 @@ typedef struct tagCsrRoamStruct { #define CSR_GET_SUBNET_STATUS(roam_reason) (0) #endif -CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac); -CDF_STATUS csrScanFilter11dResult(tpAniSirGlobal pMac); +QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac); +QDF_STATUS csrScanFilter11dResult(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); -CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, +QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); -CDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, +QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); void csr_set_global_cfgs(tpAniSirGlobal pMac); @@ -1227,41 +1226,41 @@ bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc); bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, +QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); -CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, +QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); -CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, +QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); -CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); +QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); -CDF_STATUS csr_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS csr_open(tpAniSirGlobal pMac); -CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2); -CDF_STATUS csr_close(tpAniSirGlobal pMac); -CDF_STATUS csr_start(tpAniSirGlobal pMac); -CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType); -CDF_STATUS csr_ready(tpAniSirGlobal pMac); +QDF_STATUS csr_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_open(tpAniSirGlobal pMac); +QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2); +QDF_STATUS csr_close(tpAniSirGlobal pMac); +QDF_STATUS csr_start(tpAniSirGlobal pMac); +QDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType); +QDF_STATUS csr_ready(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tBkidCandidateInfo * pBkidList, uint32_t *pNumItems); -CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); -CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, @@ -1269,9 +1268,9 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, tDot11fBeaconIEs *pIes, tCsrWapiIe *pWapiIe); #endif /* FEATURE_WLAN_WAPI */ -CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, tSirAPWPSIEs * pAPWPSIES); -CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, tSirRSNie *pAPSirRSNie); void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, bool fPrivacy); @@ -1286,13 +1285,13 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal pMac, uint16_t sap_ch, eCsrPhyMode sap_phymode, uint8_t cc_switch_mode); #endif -CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile); bool csr_is_set_key_allowed(tpAniSirGlobal pMac, uint32_t sessionId); void csr_set_opposite_band_channel_info(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tSirPrefNetworkFoundInd * pPrefNetworkFoundInd); #endif @@ -1315,31 +1314,31 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId); bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac); bool csr_is_channel_present_in_list(uint8_t *pChannelList, int numChannels, uint8_t channel); -CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, +QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, uint8_t channel); -CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, tpSirRoamOffloadScanRsp scanOffloadRsp); -CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo); bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); /* Post Channel Change Indication */ -CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); /* Post Beacon Tx Start Indication */ -CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -CDF_STATUS +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); -CDF_STATUS +QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, eUpdateIEsType updateType); -CDF_STATUS +QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -1353,7 +1352,7 @@ static inline void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, {} #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, tpSirBssDescription bss_desc_ptr); void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf); @@ -1365,14 +1364,14 @@ bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, uint32_t session_id); bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, uint32_t *roam_id, uint32_t session_id); #ifdef FEATURE_WLAN_DIAG_SUPPORT void csr_diag_event_report(tpAniSirGlobal pmac, uint16_t event_type, uint16_t status, uint16_t reasoncode); #endif -CDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); +QDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); /* csr_scan_process_single_bssdescr() - Add a bssdescriptor to scan table * @@ -1392,7 +1391,7 @@ CDF_STATUS csr_get_channels_and_power(tpAniSirGlobal pMac); * Return: 0 or other error codes. */ -CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDescription, uint32_t scan_id, uint32_t flags); diff --git a/core/sme/inc/csr_link_list.h b/core/sme/inc/csr_link_list.h index 11462468313b..8776006535e5 100644 --- a/core/sme/inc/csr_link_list.h +++ b/core/sme/inc/csr_link_list.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -82,7 +82,7 @@ typedef struct tagDblLinkList { #define csrIsListEmpty(pHead) ((pHead)->next == (pHead)) uint32_t csr_ll_count(tDblLinkList *pList); -CDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList); +QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList); void csr_ll_close(tDblLinkList *pList); void csr_ll_lock(tDblLinkList *pList); void csr_ll_unlock(tDblLinkList *pList); diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 29a82cf1561d..c65f19563327 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -173,57 +173,57 @@ typedef struct sCsrNeighborRoamControlInfo { } tCsrNeighborRoamControlInfo, *tpCsrNeighborRoamControlInfo; /* All the necessary Function declarations are here */ -CDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status); -CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status); +QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac); -CDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); -CDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, +QDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); +QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId); bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, uint8_t sessionId, tSirRetStatus limStatus); bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report( +QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report( tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t neighborLookupRssiThreshold); -CDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff( +QDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff( tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nOpportunisticThresholdDiff); -CDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamRescanRssiDiff); -CDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFirstBcnt); -CDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFinalBcnt); -CDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBeaconRssiWeight); -CDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool fastRoamEnabled); -CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool eseMode); -CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band( +QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band( tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, uint8_t *pMergedOutputNumOfChannels); -CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, @@ -270,26 +270,26 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ptr); #define REASON_ROAM_SCAN_HI_RSSI_DELAY_CHANGED 32 #define REASON_ROAM_SCAN_HI_RSSI_UB_CHANGED 33 -CDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t command, uint8_t reason); -CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg); -CDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); -CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); +QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status); -CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status); +QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, +QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, const uint8_t *pCckmIe, const uint8_t ccKmIeLen); -CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, +QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, const uint8_t sessionId); #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, uint8_t sessionId); void csr_roam_synch_callback(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 6fc1fbfff96c..d937ba0e8015 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -328,20 +328,20 @@ uint16_t csr_rates_find_best_rate(tSirMacRateSet *pSuppRates, tSirMacRateSet *pExtRates, tSirMacPropRateSet *pPropRates); tSirBssType csr_translate_bsstype_to_mac_type(eCsrRoamBssType csrtype); /* Caller allocates memory for pIEStruct */ -CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct); /* * This function will allocate memory for the parsed IEs to the caller. * Caller must free the memory. after it is done with the data only if * this function succeeds */ -CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs **ppIEStruct); bool csrValidateCountryString(tHalHandle hHal, uint8_t *pCountryString); tSirScanType csr_get_scan_type(tpAniSirGlobal pMac, uint8_t chnId); uint8_t csr_to_upper(uint8_t ch); -CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, +QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes); /* @@ -351,14 +351,14 @@ CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, * the user wants. There may be discrepency in it. UAPSD-bypass logic should * decide if it needs to reassoc */ -CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields *pModProfileFields, uint32_t *pRoamId, bool fForce); -CDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, +QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); /* BeaconInterval validation for MCC support */ -CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); bool csr_is_profile11r(tCsrRoamProfile *pProfile); diff --git a/core/sme/inc/nan_api.h b/core/sme/inc/nan_api.h index ee275cb3afaa..0d68a3fe8e8b 100644 --- a/core/sme/inc/nan_api.h +++ b/core/sme/inc/nan_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,6 +46,6 @@ typedef struct sNanRequestReq { typedef void (*NanCallback)(void *, tSirNanEvent *); void sme_nan_register_callback(tHalHandle hHal, NanCallback callback); -CDF_STATUS sme_nan_request(tpNanRequestReq input); +QDF_STATUS sme_nan_request(tpNanRequestReq input); #endif /* __NAN_API_H__ */ diff --git a/core/sme/inc/oem_data_api.h b/core/sme/inc/oem_data_api.h index f60c9a44ed60..110f0177a63b 100644 --- a/core/sme/inc/oem_data_api.h +++ b/core/sme/inc/oem_data_api.h @@ -66,20 +66,20 @@ typedef enum { eOEM_DATA_REQ_FAILURE, eOEM_DATA_REQ_INVALID_MODE, } eOemDataReqStatus; -CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal); -CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal); +QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal); +QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal); /* * HDD Callback function for the sme to callback when * the oem data rsp is available */ -typedef CDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle, +typedef QDF_STATUS (*oem_data_oem_data_reqCompleteCallback)(tHalHandle, void *p2, uint32_t oemDataReqID, eOemDataReqStatus status); -CDF_STATUS oem_data_oem_data_req(tHalHandle, uint8_t, tOemDataReqConfig *, +QDF_STATUS oem_data_oem_data_req(tHalHandle, uint8_t, tOemDataReqConfig *, uint32_t *pOemDataReqID); -CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *); -CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal); +QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *); +QDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal); typedef void (*sme_send_oem_data_rsp_msg)(int length, uint8_t *oem_data_rsp); #endif /* _OEM_DATA_API_H__ */ diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 8b16507f8857..7519f1a41726 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,8 +53,8 @@ typedef struct sP2pPsConfig { uint8_t sessionid; } tP2pPsConfig, *tpP2pPsConfig; -typedef CDF_STATUS (*remainOnChanCallback)(tHalHandle, void *context, - CDF_STATUS status, uint32_t scan_id); +typedef QDF_STATUS (*remainOnChanCallback)(tHalHandle, void *context, + QDF_STATUS status, uint32_t scan_id); typedef struct sRemainOnChn { uint8_t chn; @@ -81,33 +81,33 @@ typedef struct sp2pContext { uint32_t probeRspIeLength; } tp2pContext, *tPp2pContext; -CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t *scan_id); -CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag); -CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, +QDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag); +QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength); -CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq); -CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id); -CDF_STATUS sme_p2p_open(tHalHandle hHal); -CDF_STATUS p2p_stop(tHalHandle hHal); -CDF_STATUS sme_p2p_close(tHalHandle hHal); -CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data); -CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_p2p_open(tHalHandle hHal); +QDF_STATUS p2p_stop(tHalHandle hHal); +QDF_STATUS sme_p2p_close(tHalHandle hHal); +QDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data); +QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t scan_id); -CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq); -CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id); -CDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA); +QDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA); tSirRFBand get_rf_band(uint8_t channel); #endif /* __P2P_API_H__ */ diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index fd35a0a99627..f41d9747e894 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -205,26 +205,26 @@ struct sme_oem_capability { /*------------------------------------------------------------------------- Function declarations and documenation ------------------------------------------------------------------------*/ -CDF_STATUS sme_open(tHalHandle hHal); -CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, +QDF_STATUS sme_open(tHalHandle hHal); +QDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, enum country_src cc_src); -CDF_STATUS sme_close(tHalHandle hHal); -CDF_STATUS sme_start(tHalHandle hHal); -CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType); -CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, +QDF_STATUS sme_close(tHalHandle hHal); +QDF_STATUS sme_start(tHalHandle hHal); +QDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType); +QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType); void sme_set_curr_device_mode(tHalHandle hHal, enum tCDF_ADAPTER_MODE currDeviceMode); -CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); -CDF_STATUS sme_update_roam_params(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_update_roam_params(tHalHandle hHal, uint8_t session_id, struct roam_ext_params roam_params_src, int update_param); #ifdef FEATURE_WLAN_SCAN_PNO void sme_update_roam_pno_channel_prediction_config( - tHalHandle hal, tCsrConfigParam * csr_config, + tHalHandle hal, tCsrConfigParam *csr_config, uint8_t copy_from_to); #else static inline void sme_update_roam_pno_channel_prediction_config( @@ -232,29 +232,29 @@ static inline void sme_update_roam_pno_channel_prediction_config( uint8_t copy_from_to) {} #endif -CDF_STATUS sme_update_config(tHalHandle hHal, +QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); #endif -CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); -CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, +QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); +QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp); -CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); -CDF_STATUS sme_change_config_params(tHalHandle hHal, +QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode); +QDF_STATUS sme_change_config_params(tHalHandle hHal, tCsrUpdateConfigParam *pUpdateConfigParam); -CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal); -CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg); +QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal); +QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg); void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg); -CDF_STATUS sme_scan_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_request(tHalHandle hHal, uint8_t sessionId, tCsrScanRequest *, csr_scan_completeCallback callback, void *pContext); -CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult); -CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hHal, +QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hHal, tCsrRoamProfile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id); @@ -265,132 +265,132 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, uint32_t session_id); bool sme_clear_joinreq_param(tHalHandle hal_handle, uint32_t session_id); -CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, +QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, uint32_t *roam_id, uint32_t session_id); -CDF_STATUS sme_scan_flush_result(tHalHandle hHal); -CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_scan_flush_result(tHalHandle hHal); +QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId); tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle, tScanResultHandle hScanResult); tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle, tScanResultHandle hScanResult); -CDF_STATUS sme_scan_result_purge(tHalHandle hHal, +QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult); -CDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems); -CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId); -CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce); -CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason); -CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); -CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, const uint8_t *pPeerMacAddr); -CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, struct tagCsrDelStaParams *pDelStaParams); -CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, bool bEnable); -CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac); -CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState); -CDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, tCsrRoamConnectedProfile *pProfile); void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); -CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len); #endif -CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType); -CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType); uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache); -CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam); -CDF_STATUS sme_get_statistics(tHalHandle hHal, +QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam); +QDF_STATUS sme_get_statistics(tHalHandle hHal, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); -CDF_STATUS sme_get_rssi(tHalHandle hHal, +QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); -CDF_STATUS sme_get_snr(tHalHandle hHal, +QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, +QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); -CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, +QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen); -CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, +QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq); #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value); -CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value); +QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t length); -CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, +QDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value); -CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t *length); -CDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields); -extern CDF_STATUS sme_set_host_power_save(tHalHandle hHal, bool psMode); +extern QDF_STATUS sme_set_host_power_save(tHalHandle hHal, bool psMode); void sme_set_dhcp_till_power_active_flag(tHalHandle hHal, uint8_t flag); -extern CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, +extern QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, csr_scan_completeCallback); #ifdef FEATURE_OEM_DATA_SUPPORT -extern CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +extern QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback); #else -static inline CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +static inline QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif -extern CDF_STATUS sme_wow_add_pattern(tHalHandle hHal, +extern QDF_STATUS sme_wow_add_pattern(tHalHandle hHal, struct wow_add_pattern *pattern, uint8_t sessionId); -extern CDF_STATUS sme_wow_delete_pattern(tHalHandle hHal, +extern QDF_STATUS sme_wow_delete_pattern(tHalHandle hHal, struct wow_delete_pattern *pattern, uint8_t sessionId); void sme_register_ftm_msg_processor(tHalHandle hal, hdd_ftm_msg_processor callback); -extern CDF_STATUS sme_enter_wowl(tHalHandle hHal, +extern QDF_STATUS sme_enter_wowl(tHalHandle hHal, void (*enter_wowl_callback_routine)(void *callbackContext, - CDF_STATUS status), + QDF_STATUS status), void *enter_wowl_callback_context, #ifdef WLAN_WAKEUP_EVENTS void (*wake_reason_ind_cb)(void *callbackContext, @@ -401,11 +401,11 @@ extern CDF_STATUS sme_enter_wowl(tHalHandle hHal, tpSirSmeWowlEnterParams wowl_enter_params, uint8_t sessionId); -extern CDF_STATUS sme_exit_wowl(tHalHandle hHal, +extern QDF_STATUS sme_exit_wowl(tHalHandle hHal, tpSirSmeWowlExitParams wowl_exit_params); -CDF_STATUS sme_roam_set_key(tHalHandle, uint8_t sessionId, +QDF_STATUS sme_roam_set_key(tHalHandle, uint8_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t *pRoamId); -CDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen); +QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen); void sme_apply_channel_power_info_to_fw(tHalHandle hHal); @@ -416,86 +416,86 @@ bool sme_is11h_supported(tHalHandle hHal); bool sme_is_wmm_supported(tHalHandle hHal); typedef void (*tSmeChangeCountryCallback)(void *pContext); -CDF_STATUS sme_change_country_code(tHalHandle hHal, +QDF_STATUS sme_change_country_code(tHalHandle hHal, tSmeChangeCountryCallback callback, uint8_t *pCountry, void *pContext, void *p_cds_context, tAniBool countryFromUserSpace, tAniBool sendRegHint); -CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, +QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry); -CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); -CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy); void sme_get_recovery_stats(tHalHandle hHal); #if defined WLAN_FEATURE_VOWIFI -CDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); #endif -CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, tSirVersionType * pVersion); -CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, tSirVersionType *pVersion); -CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize); -CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize); #ifdef FEATURE_WLAN_WAPI -CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, tBkidCandidateInfo * pBkidList, uint32_t *pNumItems); #endif /* FEATURE_WLAN_WAPI */ #ifdef FEATURE_OEM_DATA_SUPPORT -CDF_STATUS sme_oem_data_req(tHalHandle hHal, +QDF_STATUS sme_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *, uint32_t *pOemDataReqID); -CDF_STATUS sme_oem_update_capability(tHalHandle hHal, +QDF_STATUS sme_oem_update_capability(tHalHandle hHal, struct sme_oem_capability *cap); -CDF_STATUS sme_oem_get_capability(tHalHandle hHal, +QDF_STATUS sme_oem_get_capability(tHalHandle hHal, struct sme_oem_capability *cap); #endif /*FEATURE_OEM_DATA_SUPPORT */ -CDF_STATUS sme_roam_update_apwpsie(tHalHandle, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwpsie(tHalHandle, uint8_t sessionId, tSirAPWPSIEs * pAPWPSIES); -CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, tSirRSNie *pAPSirRSNie); -CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpSirHostOffloadReq pRequest); -CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t sessionId, tpSirKeepAliveReq pRequest); -CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, +QDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, uint8_t sessionId); -CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen); -CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, +QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpSirWlanSetRxpFilters wlanRxpFilterParam); -CDF_STATUS sme_ConfigureAppsCpuWakeupState(tHalHandle hHal, bool isAppsAwake); -CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, +QDF_STATUS sme_ConfigureAppsCpuWakeupState(tHalHandle hHal, bool isAppsAwake); +QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, uint32_t conn_state_mask, csr_readyToSuspendCallback, void *callbackContext); -CDF_STATUS sme_configure_resume_req(tHalHandle hHal, +QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpSirWlanResumeParam wlanResumeParam); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, +QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToSuspendCallback callback, void *callbackContext); -CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, tpSirAppType1Params wlanAppType1Params); -CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, tpSirAppType2Params wlanAppType2Params); #endif int8_t sme_get_infra_session_id(tHalHandle hHal); @@ -506,62 +506,62 @@ uint16_t sme_check_concurrent_channel_overlap(tHalHandle hHal, uint16_t sap_ch, eCsrPhyMode sapPhyMode, uint8_t cc_switch_mode); #endif -CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, eCsrAbortReason reason); -CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, +QDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, uint32_t *len); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq pRequest, uint8_t sessionId, preferred_network_found_ind_cb callbackRoutine, void *callbackContext); -CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg); #endif /* FEATURE_WLAN_SCAN_PNO */ #ifdef WLAN_FEATURE_PACKET_FILTERING -CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpSirRcvFltMcAddrList pMulticastAddrs); -CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tpSirRcvPktFilterCfgType pRcvPktFilterCfg, uint8_t sessionId); -CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpSirRcvFltPktClearParam pRcvFltPktClearParam, uint8_t sessionId); #endif /* WLAN_FEATURE_PACKET_FILTERING */ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); -CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand); +QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand); #ifdef WLAN_FEATURE_GTK_OFFLOAD -CDF_STATUS sme_set_gtk_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_gtk_offload(tHalHandle hal_ctx, tpSirGtkOffloadParams request, uint8_t session_id); -CDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, +QDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, gtk_offload_get_info_callback callback_routine, void *callback_context, uint8_t session_id); #endif /* WLAN_FEATURE_GTK_OFFLOAD */ uint16_t sme_chn_to_freq(uint8_t chanNum); bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, struct cdf_mac_addr pSelfMacAddress, int8_t dB); -CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); -CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); +QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, struct cdf_mac_addr bssid, enum tCDF_ADAPTER_MODE dev_mode, int power); -CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); -CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); +QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden); -CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, +QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode); void sme_feature_caps_exchange(tHalHandle hHal); void sme_disable_feature_capablity(uint8_t feature_index); void sme_reset_power_values_for5_g(tHalHandle hHal); -CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz); -CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand); -CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz); +QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand); +QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, const uint8_t nProbes); -CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nRoamScanHomeAwayTime, const bool bSendOffloadCmd); @@ -569,56 +569,56 @@ CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, bool sme_get_roam_intra_band(tHalHandle hHal); uint8_t sme_get_roam_scan_n_probes(tHalHandle hHal); uint16_t sme_get_roam_scan_home_away_time(tHalHandle hHal); -CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, uint8_t RoamRssiDiff); -CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, +QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, bool isFastTransitionEnabled); -CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, +QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, uint8_t sessionId); -CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, bool roamScanControl); -CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled(tHalHandle hHal, uint8_t sessionId, const bool isFastRoamIniFeatureEnabled); -CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, const bool MAWCEnabled); -CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); -CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); +QDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason); -CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, +QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, bool bFastRoamInConIniFeatureEnabled); #ifdef FEATURE_WLAN_ESE -CDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled); #endif /* FEATURE_WLAN_ESE */ -CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, +QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring); -CDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff); uint8_t sme_get_roam_rescan_rssi_diff(tHalHandle hHal); -CDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nOpportunisticThresholdDiff); uint8_t sme_get_roam_opportunistic_scan_threshold_diff(tHalHandle hHal); -CDF_STATUS sme_set_neighbor_lookup_rssi_threshold(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_lookup_rssi_threshold(tHalHandle hHal, uint8_t sessionId, uint8_t neighborLookupRssiThreshold); -CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hHal, +QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hHal, uint8_t sessionId, uint8_t delay_before_vdev_stop); uint8_t sme_get_neighbor_lookup_rssi_threshold(tHalHandle hHal); -CDF_STATUS sme_set_neighbor_scan_refresh_period(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t neighborScanResultsRefreshPeriod); uint16_t sme_get_neighbor_scan_refresh_period(tHalHandle hHal); uint16_t sme_get_empty_scan_refresh_period(tHalHandle hHal); -CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, +QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t nEmptyScanRefreshPeriod); -CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, const uint16_t nNeighborScanMinChanTime, uint8_t sessionId); -CDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanMaxChanTime); uint16_t sme_get_neighbor_scan_min_chan_time(tHalHandle hHal, uint8_t sessionId); @@ -632,28 +632,28 @@ uint32_t sme_get_lim_sme_session_state(tHalHandle hHal, uint8_t sessionId); uint32_t sme_get_lim_mlm_session_state(tHalHandle hHal, uint8_t sessionId); uint16_t sme_get_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanPeriod); uint16_t sme_get_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFirstBcnt); uint8_t sme_get_roam_bmiss_first_bcnt(tHalHandle hHal); -CDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFinalBcnt); uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal); -CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBeaconRssiWeight); uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal); uint8_t sme_get_roam_rssi_diff(tHalHandle hHal); -CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); #ifdef FEATURE_WLAN_ESE_UPLOAD -CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); #endif -CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, uint8_t *pChannelList, uint8_t *pNumChannels, uint8_t sessionId); bool sme_get_is_ese_feature_enabled(tHalHandle hHal); @@ -661,30 +661,30 @@ bool sme_get_wes_mode(tHalHandle hHal); bool sme_get_roam_scan_control(tHalHandle hHal); bool sme_get_is_lfr_feature_enabled(tHalHandle hHal); bool sme_get_is_ft_feature_enabled(tHalHandle hHal); -CDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, bool nRoamScanOffloadEnabled); uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, +QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * tdlsLinkEstablishParams); -CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, uint8_t frame_type, uint8_t dialog, uint16_t status, uint32_t peerCapability, uint8_t *buf, uint8_t len, uint8_t responder); -CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams); -CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); void sme_set_tdls_power_save_prohibited(tHalHandle hHal, uint32_t sessionId, bool val); -CDF_STATUS sme_send_tdls_chan_switch_req( +QDF_STATUS sme_send_tdls_chan_switch_req( tHalHandle hal, sme_tdls_chan_switch_params *ch_switch_params); #endif @@ -693,31 +693,31 @@ CDF_STATUS sme_send_tdls_chan_switch_req( * SME API to enable/disable WLAN driver initiated SSR */ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR); -CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode); +QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode); eCsrPhyMode sme_get_phy_mode(tHalHandle hHal); /* * SME API to determine the channel bonding mode */ -CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, +QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params); -CDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo); -CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal); +QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal); #ifdef FEATURE_WLAN_LPHB -CDF_STATUS sme_lphb_config_req(tHalHandle hHal, +QDF_STATUS sme_lphb_config_req(tHalHandle hHal, tSirLPHBReq * lphdReq, void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd * indParam)); #endif /* FEATURE_WLAN_LPHB */ -CDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hHal, tSirAddPeriodicTxPtrn +QDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hHal, tSirAddPeriodicTxPtrn *addPeriodicTxPtrnParams); -CDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hHal, tSirDelPeriodicTxPtrn +QDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hHal, tSirDelPeriodicTxPtrn *delPeriodicTxPtrnParams); void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, uint8_t nNumP2PChan); -CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, +QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rateUpdateParams); -CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBSSId, bool flush_cache); void sme_get_command_q_status(tHalHandle hHal); @@ -726,9 +726,9 @@ void sme_get_command_q_status(tHalHandle hHal); * This should be called only if powersave offload * is enabled */ -CDF_STATUS sme_set_idle_powersave_config(void *cds_context, +QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value); -CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value); +QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value); /*SME API to convert convert the ini value to the ENUM used in csr and MAC*/ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value); @@ -737,66 +737,66 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab); #ifdef QCA_HT_2040_COEX -CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, +QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, struct cdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type); -CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, uint8_t channel_type, bool obssEnabled); #endif -CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, +QDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, uint32_t *regInfo1, uint32_t *regInfo2); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, +QDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, bool useSmeLock); -CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, +QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, tSmeTdlsPeerStateParams *pPeerStateParams); #endif /* FEATURE_WLAN_TDLS */ #ifdef FEATURE_WLAN_CH_AVOID -CDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, +QDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, void (*pCallbackfn)(void *hdd_context, void *indi_param)); -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal); +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal); #else static inline -CDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, +QDF_STATUS sme_add_ch_avoid_callback(tHalHandle hHal, void (*pCallbackfn)(void *hdd_context, void *indi_param)) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } static inline -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif /* FEATURE_WLAN_CH_AVOID */ #ifdef FEATURE_WLAN_AUTO_SHUTDOWN -CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); -CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); +QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); +QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); #endif -CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, +QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); -CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); -CDF_STATUS sme_init_thermal_info(tHalHandle hHal, +QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam); -CDF_STATUS sme_set_thermal_level(tHalHandle hHal, uint8_t level); -CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx); -CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, +QDF_STATUS sme_set_thermal_level(tHalHandle hHal, uint8_t level); +QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx); +QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void *plsContext, void (*pCallbackfn)(tSirLinkSpeedInfo *indParam, void *pContext)); -CDF_STATUS sme_modify_add_ie(tHalHandle hHal, +QDF_STATUS sme_modify_add_ie(tHalHandle hHal, tSirModifyIE *pModifyIE, eUpdateIEsType updateType); -CDF_STATUS sme_update_add_ie(tHalHandle hHal, +QDF_STATUS sme_update_add_ie(tHalHandle hHal, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); -CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value); +QDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value); const char *sme_request_type_to_string(const uint8_t request_type); -CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, bool disablefwd); uint32_t sme_get_channel_bonding_mode5_g(tHalHandle hHal); uint32_t sme_get_channel_bonding_mode24_g(tHalHandle hHal); @@ -808,98 +808,98 @@ typedef struct sStatsExtRequestReq { typedef void (*StatsExtCallback)(void *, tStatsExtEvent *); void sme_stats_ext_register_callback(tHalHandle hHal, StatsExtCallback callback); -CDF_STATUS sme_stats_ext_request(uint8_t session_id, +QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input); -CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg); #endif -CDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, +QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, uint8_t allowDFSChannelRoam); uint8_t sme_get_dfs_scan_mode(tHalHandle hHal); bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId); #ifdef FEATURE_WLAN_EXTSCAN -CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, +QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, uint32_t *aValidChannels, uint8_t *pNumChannels); -CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, +QDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, tSirGetExtScanCapabilitiesReqParams *pReq); -CDF_STATUS sme_ext_scan_start(tHalHandle hHal, +QDF_STATUS sme_ext_scan_start(tHalHandle hHal, tSirWifiScanCmdReqParams *pStartCmd); -CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, +QDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq); -CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, tSirExtScanSetBssidHotListReqParams * pSetHotListReq); -CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, tSirExtScanResetBssidHotlistReqParams * pResetReq); -CDF_STATUS sme_set_significant_change(tHalHandle hHal, +QDF_STATUS sme_set_significant_change(tHalHandle hHal, tSirExtScanSetSigChangeReqParams * pSetSignificantChangeReq); -CDF_STATUS sme_reset_significant_change(tHalHandle hHal, +QDF_STATUS sme_reset_significant_change(tHalHandle hHal, tSirExtScanResetSignificantChangeReqParams *pResetReq); -CDF_STATUS sme_get_cached_results(tHalHandle hHal, +QDF_STATUS sme_get_cached_results(tHalHandle hHal, tSirExtScanGetCachedResultsReqParams * pCachedResultsReq); -CDF_STATUS sme_set_epno_list(tHalHandle hal, +QDF_STATUS sme_set_epno_list(tHalHandle hal, struct wifi_epno_params *req_msg); -CDF_STATUS sme_set_passpoint_list(tHalHandle hal, +QDF_STATUS sme_set_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *req_msg); -CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, +QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *req_msg); -CDF_STATUS +QDF_STATUS sme_set_ssid_hotlist(tHalHandle hal, struct sir_set_ssid_hotlist_request *request); -CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)); #else -static inline CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +static inline QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_EXTSCAN */ -CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId); +QDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId); #ifdef WLAN_FEATURE_LINK_LAYER_STATS -CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, tSirLLStatsClearReq * pclearStatsReq); -CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq); -CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq); -CDF_STATUS sme_set_link_layer_stats_ind_cb(tHalHandle hHal, +QDF_STATUS sme_set_link_layer_stats_ind_cb(tHalHandle hHal, void (*callbackRoutine)(void *callbackCtx, int indType, void *pRsp)); #endif /* WLAN_FEATURE_LINK_LAYER_STATS */ -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req); -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hHal, +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req); +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hHal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)); -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hHal); +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hHal); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, bool nRoamOffloadEnabled); -CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, uint8_t sessionId, bool nRoamKeyMgmtOffloadEnabled); #endif #ifdef WLAN_FEATURE_NAN -CDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg); +QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg); #endif /* WLAN_FEATURE_NAN */ -CDF_STATUS sme_get_link_status(tHalHandle hHal, +QDF_STATUS sme_get_link_status(tHalHandle hHal, tCsrLinkStatusCallback callback, void *pContext, uint8_t sessionId); -CDF_STATUS sme_get_temperature(tHalHandle hHal, +QDF_STATUS sme_get_temperature(tHalHandle hHal, void *tempContext, void (*pCallbackfn)(int temperature, void *pContext)); -CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, +QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui); #ifdef IPA_OFFLOAD @@ -911,48 +911,48 @@ CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, \param pRequest - Pointer to the offload request. \return eHalStatus ---------------------------------------------------------------------------*/ -CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, +QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request); #else -static inline CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, +static inline QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ #ifdef DHCP_SERVER_OFFLOAD -CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, +QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, tSirDhcpSrvOffloadInfo * pDhcpSrvInfo); #endif /* DHCP_SERVER_OFFLOAD */ #ifdef WLAN_FEATURE_GPIO_LED_FLASHING -CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, +QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, uint32_t x0, uint32_t x1); #endif -CDF_STATUS sme_handle_dfs_chan_scan(tHalHandle hHal, uint8_t dfs_flag); -CDF_STATUS sme_set_mas(uint32_t val); -CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type); -CDF_STATUS sme_ext_change_channel(tHalHandle hHal, uint32_t channel, +QDF_STATUS sme_handle_dfs_chan_scan(tHalHandle hHal, uint8_t dfs_flag); +QDF_STATUS sme_set_mas(uint32_t val); +QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type); +QDF_STATUS sme_ext_change_channel(tHalHandle hHal, uint32_t channel, uint8_t session_id); -CDF_STATUS sme_configure_modulated_dtim(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_modulated_dtim(tHalHandle hal, uint8_t session_id, uint32_t modulated_dtim); -CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, uint16_t stats_avg_factor); -CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, uint32_t guard_time); -CDF_STATUS sme_wifi_start_logger(tHalHandle hal, +QDF_STATUS sme_wifi_start_logger(tHalHandle hal, struct sir_wifi_start_log start_log); bool sme_neighbor_middle_of_roaming(tHalHandle hHal, uint8_t sessionId); -CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint8_t tid, uint8_t pri, uint32_t srvc_int, uint32_t sus_int, @@ -960,46 +960,46 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, uint8_t psb, uint32_t sessionId, uint32_t delay_interval); -CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint32_t sessionId); -CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, +QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, struct rssi_monitor_req *input); -CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, +QDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, void (*cb)(void *, struct rssi_breach_event *)); -CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, +QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sir_mgmt_frame_ind_callback callback); -CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss); +QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss); bool sme_is_any_session_in_connected_state(tHalHandle h_hal); -CDF_STATUS sme_soc_set_pcl(tHalHandle hal, +QDF_STATUS sme_soc_set_pcl(tHalHandle hal, struct sir_pcl_list msg); -CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, +QDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, struct sir_hw_mode msg); void sme_register_hw_mode_trans_cb(tHalHandle hal, hw_mode_transition_cb callback); -CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, uint8_t next_action, void *hdd_context); typedef void (*sme_peer_authorized_fp) (uint32_t vdev_id); -CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, +QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, sme_peer_authorized_fp auth_fp, uint32_t vdev_id); -CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, +QDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, struct sir_dual_mac_config msg); void sme_set_scan_disable(tHalHandle h_hal, int value); void sme_setdef_dot11mode(tHalHandle hal); -CDF_STATUS sme_disable_non_fcc_channel(tHalHandle hHal, +QDF_STATUS sme_disable_non_fcc_channel(tHalHandle hHal, bool fcc_constraint); -CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, +QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, uint8_t session_id, uint32_t notify_id, int32_t val); @@ -1007,38 +1007,38 @@ CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, void wlan_sap_enable_phy_error_logs(tHalHandle hal, bool enable_log); void sme_set_dot11p_config(tHalHandle hal, bool enable_dot11p); -CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_config *config); -CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc); +QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc); -CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert); -CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert); int sme_ocb_gen_timing_advert_frame(tHalHandle hHal, tSirMacAddr self_addr, uint8_t **buf, uint32_t *timestamp_offset, uint32_t *time_value_offset); -CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_get_tsf_timer *request); -CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_get_stats *request); -CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, uint32_t dcc_stats_bitmap); -CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_update_ndl *request); -CDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, +QDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, ocb_callback callback); void sme_add_set_thermal_level_callback(tHalHandle hal, sme_set_thermal_level_callback callback); @@ -1060,22 +1060,22 @@ sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, #endif #ifdef FEATURE_LFR_SUBNET_DETECTION -CDF_STATUS sme_gateway_param_update(tHalHandle hHal, +QDF_STATUS sme_gateway_param_update(tHalHandle hHal, struct gateway_param_update_req *request); #endif #ifdef FEATURE_GREEN_AP -CDF_STATUS sme_send_egap_conf_params(uint32_t enable, +QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags); #else -static inline CDF_STATUS sme_send_egap_conf_params(uint32_t enable, +static inline QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/inc/sme_ft_api.h b/core/sme/inc/sme_ft_api.h index 71c97aa9ac96..ba2a1a983863 100644 --- a/core/sme/inc/sme_ft_api.h +++ b/core/sme/inc/sme_ft_api.h @@ -89,7 +89,7 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId); void sme_ft_reset(tHalHandle hHal, uint32_t sessionId); void sme_set_ft_ies(tHalHandle hHal, uint32_t sessionId, const uint8_t *ft_ies, uint16_t ft_ies_length); -CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, tCsrRoamSetKey *pFTKeyInfo); void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, uint8_t *ft_ies, uint32_t ft_ies_ip_len, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 7974b4ee2c6f..d1ee264cce9e 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -37,7 +37,6 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" @@ -208,38 +207,38 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, bool sme_command_pending(tpAniSirGlobal pMac); bool pmc_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_roam_process_wm_status_change_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_roam_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_wm_status_change_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_reinit_set_key_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_release_command_set_key(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_abort_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fStopping); -CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum); +QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum); bool csr_roam_is_valid40_mhz_channel(tpAniSirGlobal pmac, uint8_t channel); -CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); -CDF_STATUS sme_release_global_lock(tSmeStruct *psSme); +QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); +QDF_STATUS sme_release_global_lock(tSmeStruct *psSme); #ifdef FEATURE_OEM_DATA_SUPPORT -CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, +QDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); #endif -CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); -CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq pRequest, uint8_t sessionId, preferred_network_found_ind_cb @@ -247,34 +246,34 @@ CDF_STATUS pmc_set_preferred_network_list(tHalHandle hHal, #endif /* FEATURE_WLAN_SCAN_PNO */ bool csr_roamGetConcurrencyConnectStatusForBmps(tpAniSirGlobal pMac); #ifdef FEATURE_WLAN_TDLS -CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt * tdlsSendMgmt); -CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, +QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams *tdlsLinkEstablishParams); -CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams); -CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac); -CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); -CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd); -CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd); +QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); #endif /* FEATURE_WLAN_TDLS */ -CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, const uint8_t *pChannelList, const uint8_t numChannels); -CDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, eCsrBand eBand); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels, diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index a86fb9cfa61d..88286266d767 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -37,7 +37,6 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_status.h" #include "qdf_status.h" #include "cdf_lock.h" #include "cdf_trace.h" diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 295f644dbd45..7965e6d6274b 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -94,7 +94,7 @@ struct ps_params { uint8_t uapsd_per_ac_bit_mask; /* WOWL param */ void (*enter_wowl_callback_routine)(void *callback_context, - CDF_STATUS status); + QDF_STATUS status); void *enter_wowl_callback_context; tSirSmeWowlEnterParams wowl_enter_params; #ifdef WLAN_WAKEUP_EVENTS diff --git a/core/sme/inc/sme_power_save_api.h b/core/sme/inc/sme_power_save_api.h index 95a2db56b0ac..16df7cf4472a 100644 --- a/core/sme/inc/sme_power_save_api.h +++ b/core/sme/inc/sme_power_save_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -32,17 +32,17 @@ #include "ani_global.h" #include "sme_inside.h" -CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, enum sme_ps_cmd command); -CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id); -CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id); /* Condition check if driver is ready to enter in PS */ -CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id); +QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, enum sme_ps_cmd command); @@ -51,17 +51,17 @@ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, uint8_t session_id); /* Full Power Req Callback */ typedef void (*uapsd_start_indication_cb)(void *callback_context, - uint32_t session_id, CDF_STATUS status); + uint32_t session_id, QDF_STATUS status); -CDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, uapsd_start_indication_cb uapsd_start_ind_cb, void *callback_context); -CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id); #ifdef WLAN_NS_OFFLOAD -CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id); @@ -69,23 +69,23 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, /* / Post a message to PE module */ tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ pMsg); -CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, uint32_t sessionId, bool isReassoc); -CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, uint32_t sessionId); -CDF_STATUS sme_ps_open(tHalHandle hal_ctx); +QDF_STATUS sme_ps_open(tHalHandle hal_ctx); -CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id); +QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id); void sme_auto_ps_entry_timer_expired(void *ps_param); -CDF_STATUS sme_ps_close(tHalHandle hal_ctx); -CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t sessionId); +QDF_STATUS sme_ps_close(tHalHandle hal_ctx); +QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t sessionId); #ifdef FEATURE_WLAN_SCAN_PNO void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, tpAniSirGlobal mac_ctx); -CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, tpSirPNOScanReq request, uint8_t session_id, preferred_network_found_ind_cb callback_routine, @@ -96,7 +96,7 @@ static inline void sme_set_pno_channel_prediction(void *request_buf, {} #endif -CDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, +QDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, uint32_t session_id); #endif /* #if !defined(__SME_POWER_SAVE_API_H) */ diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index c9fd0cfed011..f3a18a409109 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -83,14 +83,14 @@ typedef enum { * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode right away - * (CDF_STATUS_PMC_PENDING) + * (QDF_STATUS_PMC_PENDING) */ SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING, /* * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode at all - * (CDF_STATUS_E_FAILURE) + * (QDF_STATUS_E_FAILURE) */ SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED, /* @@ -129,14 +129,14 @@ typedef enum { * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode right away - * (CDF_STATUS_PMC_PENDING) + * (QDF_STATUS_PMC_PENDING) */ SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_PENDING, /* * async: In case of UAPSD, once PE notifies successful TSPEC * negotiation, or CSR notifies for successful reassoc to SME-QoS, * notify HDD if PMC can't put the module in UAPSD mode at all - * (CDF_STATUS_E_FAILURE) + * (QDF_STATUS_E_FAILURE) */ SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED, /* sync: STA is handing off to a new AP */ @@ -231,7 +231,7 @@ typedef struct { /*-------------------------------------------------------------------------- External APIs ------------------------------------------------------------------------*/ -typedef CDF_STATUS (*sme_QosCallback)(tHalHandle hHal, void *HDDcontext, +typedef QDF_STATUS (*sme_QosCallback)(tHalHandle hHal, void *HDDcontext, sme_QosWmmTspecInfo *pCurrentQoSInfo, sme_QosStatusType status, uint32_t QosFlowID); sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, @@ -244,12 +244,12 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID); bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pQoSInfo, uint8_t sessionId); void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff); -CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, +QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, sme_QosWmmUpType *dscpmapping, uint8_t sessionId); -CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal mac_ctx, uint32_t session_id); -CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal mac_ctx, uint32_t session_id); diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index ed6948bcc662..7e24a2976d4a 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -113,17 +113,17 @@ typedef struct { /*-------------------------------------------------------------------------- External APIs for CSR - Internal to SME ------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_open(tpAniSirGlobal pMac); -CDF_STATUS sme_qos_close(tpAniSirGlobal pMac); -CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_qos_open(tpAniSirGlobal pMac); +QDF_STATUS sme_qos_close(tpAniSirGlobal pMac); +QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /*-------------------------------------------------------------------------- Internal APIs for CSR ------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); -CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_csr_event_indType ind, void *pEvent_info); uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index d0098447014a..1720d3b6c323 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,14 +46,14 @@ #include "sme_internal.h" #include "sme_rrm_internal.h" -CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); -CDF_STATUS rrm_close(tpAniSirGlobal pMac); -CDF_STATUS rrm_ready(tpAniSirGlobal pMac); -CDF_STATUS rrm_open(tpAniSirGlobal pMac); -CDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS rrm_close(tpAniSirGlobal pMac); +QDF_STATUS rrm_ready(tpAniSirGlobal pMac); +QDF_STATUS rrm_open(tpAniSirGlobal pMac); +QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, struct rrm_config_param *rrm_config); -CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, +QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); tRrmNeighborReportDesc *sme_rrm_get_first_bss_entry_from_neighbor_cache( @@ -61,7 +61,7 @@ tRrmNeighborReportDesc *sme_rrm_get_first_bss_entry_from_neighbor_cache( tRrmNeighborReportDesc *sme_rrm_get_next_bss_entry_from_neighbor_cache( tpAniSirGlobal pMac, tpRrmNeighborReportDesc pBssEntry); -CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf); #endif diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index e3926374f702..fdcb5e1ba7a5 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ typedef struct sRrmNeighborReportDesc { } tRrmNeighborReportDesc, *tpRrmNeighborReportDesc; typedef void (*NeighborReportRspCallback)(void *context, - CDF_STATUS cdf_status); + QDF_STATUS qdf_status); typedef struct sRrmNeighborRspCallbackInfo { uint32_t timeout; /* in ms.. min value is 10 (10ms) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 63f744416651..5c7169a65d9d 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -66,72 +66,72 @@ extern tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb); static tSelfRecoveryStats g_self_recovery_stats; /* TxMB Functions */ -extern CDF_STATUS pmc_prepare_command(tpAniSirGlobal pMac, uint32_t sessionId, +extern QDF_STATUS pmc_prepare_command(tpAniSirGlobal pMac, uint32_t sessionId, eSmeCommandType cmdType, void *pvParam, uint32_t size, tSmeCmd **ppCmd); extern void pmc_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); extern void qos_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); -extern CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, +extern QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemainonChn); -extern CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); -extern CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg); -extern CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg); +extern QDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg); +extern QDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg); +extern QDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg); -static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac); +static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac); static void sme_abort_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fStopping); eCsrPhyMode sme_get_phy_mode(tHalHandle hHal); -CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); void sme_disconnect_connected_sessions(tpAniSirGlobal pMac); -CDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, +QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); +QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId); #endif #ifdef WLAN_FEATURE_11W -CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, +QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm); #endif /* Message processor for events from DFS */ -CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, +QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /* Channel Change Response Indication Handler */ -CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, +QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf); /* Internal SME APIs */ -CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme) +QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psSme) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_acquire(&psSme->lkSmeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } return status; } -CDF_STATUS sme_release_global_lock(tSmeStruct *psSme) +QDF_STATUS sme_release_global_lock(tSmeStruct *psSme) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (psSme) { - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (cdf_mutex_release(&psSme->lkSmeGlobalLock))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -146,7 +146,7 @@ CDF_STATUS sme_release_global_lock(tSmeStruct *psSme) * Processes the HW mode response and invokes the HDD callback * to process further */ -static CDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) +static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; tSmeCmd *command = NULL; @@ -169,18 +169,18 @@ static CDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_set_hw_mode != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.set_hw_mode_cmd.set_hw_mode_cb; @@ -247,7 +247,7 @@ end: sme_release_command(mac, command); } sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -258,7 +258,7 @@ end: * Processes the HW mode transition indication and invoke the HDD callback * to process further */ -static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, +static QDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, uint8_t *msg) { hw_mode_transition_cb callback = NULL; @@ -267,7 +267,7 @@ static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, param = (struct sir_hw_mode_trans_ind *)msg; if (!param) { sms_log(mac, LOGE, FL("HW mode trans ind param is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = mac->sme.sme_hw_mode_trans_cb; @@ -279,7 +279,7 @@ static CDF_STATUS sme_process_hw_mode_trans_ind(tpAniSirGlobal mac, param->vdev_mac_map); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -303,46 +303,46 @@ static void free_sme_cmds(tpAniSirGlobal mac_ctx) mac_ctx->sme.pSmeCmdBufAddr = NULL; } -static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) +static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) { - CDF_STATUS status; + QDF_STATUS status; tSmeCmd *pCmd; uint32_t cmd_idx; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cdf_mc_timer_t *cmdTimeoutTimer = NULL; uint32_t sme_cmd_ptr_ary_sz; pMac->sme.totalSmeCmd = SME_TOTAL_COMMAND; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdActiveList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdPendingList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeScanCmdActiveList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeScanCmdPendingList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdFreeList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; /* following pointer contains array of pointers for tSmeCmd* */ sme_cmd_ptr_ary_sz = sizeof(void *) * pMac->sme.totalSmeCmd; pMac->sme.pSmeCmdBufAddr = cdf_mem_malloc(sme_cmd_ptr_ary_sz); if (NULL == pMac->sme.pSmeCmdBufAddr) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_set(pMac->sme.pSmeCmdBufAddr, sme_cmd_ptr_ary_sz, 0); for (cmd_idx = 0; cmd_idx < pMac->sme.totalSmeCmd; cmd_idx++) { /* @@ -357,7 +357,7 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.pSmeCmdBufAddr[cmd_idx] = cdf_mem_malloc(sizeof(tSmeCmd)); if (NULL == pMac->sme.pSmeCmdBufAddr[cmd_idx]) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; free_sme_cmds(pMac); goto end; } @@ -372,12 +372,12 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) (cdf_mc_timer_t *) cdf_mem_malloc(sizeof(cdf_mc_timer_t)); if (cmdTimeoutTimer) { pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; - cdf_status = + qdf_status = cdf_mc_timer_init(pMac->sme.smeCmdActiveList. cmdTimeoutTimer, CDF_TIMER_TYPE_SW, active_list_cmd_timeout_handle, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); cdf_mem_free(pMac->sme.smeCmdActiveList. @@ -390,7 +390,7 @@ static CDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) } end: - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, "failed to initialize sme command list:%d\n", status); @@ -434,7 +434,7 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -461,9 +461,9 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, csr_ll_close(&localList); } -static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) +static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; purge_sme_cmd_list(pMac); csr_ll_close(&pMac->sme.smeCmdPendingList); @@ -478,7 +478,7 @@ static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; status = cdf_mutex_acquire(&pMac->sme.lkSmeGlobalLock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to acquire the lock status = %d"), status); goto done; @@ -487,7 +487,7 @@ static CDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) free_sme_cmds(pMac); status = cdf_mutex_release(&pMac->sme.lkSmeGlobalLock); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to release the lock status = %d"), status); } @@ -805,7 +805,7 @@ end: bool sme_process_command(tpAniSirGlobal pMac) { bool fContinue = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; tSmeCmd *pCommand; tListElem *pSmeEntry; @@ -873,7 +873,7 @@ sme_process_cmd: pCommand->sessionId); status = csr_prepare_disconnect_command(pMac, pCommand->sessionId, &sme_cmd); - if (status == CDF_STATUS_SUCCESS && sme_cmd) { + if (status == QDF_STATUS_SUCCESS && sme_cmd) { csr_ll_lock(&pMac->sme.smeCmdPendingList); csr_ll_insert_head(&pMac->sme.smeCmdPendingList, &sme_cmd->Link, LL_ACCESS_NOLOCK); @@ -914,7 +914,7 @@ sme_process_cmd: case eSmeCommandRoam: csr_ll_unlock(&pMac->sme.smeCmdActiveList); status = csr_roam_process_command(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) && csr_ll_remove_entry(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_LOCK)) csr_release_command_roam(pMac, pCommand); @@ -926,7 +926,7 @@ sme_process_cmd: case eSmeCommandSetKey: csr_ll_unlock(&pMac->sme.smeCmdActiveList); status = csr_roam_process_set_key_command(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) && csr_ll_remove_entry(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_LOCK)) { csr_release_command_set_key(pMac, pCommand); @@ -1003,10 +1003,10 @@ sme_process_cmd: csr_ll_unlock(&pMac->sme.smeCmdActiveList); pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); sme_release_command(pMac, pCommand); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) fContinue = true; process_scan_q: if (!(sme_process_scan_queue(pMac))) @@ -1038,29 +1038,29 @@ bool sme_command_pending(tpAniSirGlobal pMac) * smeOpen must be called before any other SME APIs can be involved. * smeOpen must be called after mac_open. * - * Return: CDF_STATUS_SUCCESS - SME is successfully initialized. + * Return: QDF_STATUS_SUCCESS - SME is successfully initialized. * Other status means SME is failed to be initialized */ -CDF_STATUS sme_open(tHalHandle hHal) +QDF_STATUS sme_open(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.state = SME_STATE_STOP; pMac->sme.currDeviceMode = CDF_STA_MODE; - if (!CDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &pMac->sme.lkSmeGlobalLock))) { sms_log(pMac, LOGE, FL("sme_open failed init lock")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("csr_open failed, status=%d"), status); return status; } status = sme_ps_open(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("sme_ps_open failed during initialization with status=%d"), status); @@ -1072,14 +1072,14 @@ CDF_STATUS sme_open(tHalHandle hHal) #ifndef WLAN_MDM_CODE_REDUCTION_OPT status = sme_qos_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Qos open, status=%d"), status); return status; } #endif #ifdef FEATURE_OEM_DATA_SUPPORT status = oem_data_oem_data_req_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("oem_data_oem_data_req_open, status=%d"), status); @@ -1087,12 +1087,12 @@ CDF_STATUS sme_open(tHalHandle hHal) } #endif status = init_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; #if defined WLAN_FEATURE_VOWIFI status = rrm_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("rrm_open failed, status=%d"), status); return status; } @@ -1105,7 +1105,7 @@ CDF_STATUS sme_open(tHalHandle hHal) /* * sme_init_chan_list, triggers channel setup based on country code. */ -CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, +QDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, enum country_src cc_src) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); @@ -1130,15 +1130,15 @@ CDF_STATUS sme_init_chan_list(tHalHandle hal, uint8_t *alpha2, \Param pSmeConfigParams - a pointer to a caller allocated object of typedef struct _smeConfigParams. - \return CDF_STATUS_SUCCESS - SME update the config parameters successfully. + \return QDF_STATUS_SUCCESS - SME update the config parameters successfully. Other status means SME is failed to update the config parameters. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) +QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1150,7 +1150,7 @@ CDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) } status = csr_set_channels(hHal, &pSmeConfigParams->csrConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_change_default_config_param failed with status=%d", status); @@ -1182,15 +1182,15 @@ void sme_set_scan_disable(tHalHandle h_hal, int value) \param hHal - The handle returned by HostapdAdapter. \Param v_REGDOMAIN_t - The current Regulatory Domain requested for SoftAp. - \return CDF_STATUS_SUCCESS - SME successfully completed the request. + \return QDF_STATUS_SUCCESS - SME successfully completed the request. Other status means, failed to get the current regulatory domain. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp) +QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1202,14 +1202,14 @@ CDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp } *domainIdSoftAp = pMac->scan.domainIdCurrent; - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } -CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) +QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1220,7 +1220,7 @@ CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) } status = csr_set_reg_info(hHal, apCntryCode); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_set_reg_info failed with status=%d", status); } @@ -1228,9 +1228,9 @@ CDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) } #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) { - CDF_STATUS status; + QDF_STATUS status; bool ret = false; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t ch_list[WNI_CFG_VALID_CHANNEL_LIST] = { 0 }; @@ -1239,21 +1239,21 @@ CDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pPlmReq->sessionId); status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), pPlmReq->sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid Sessionid")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pPlmReq->enable) @@ -1301,12 +1301,12 @@ send_plm_start: msg.reserved = 0; msg.bodyptr = pPlmReq; - if (!CDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PLM_REQ to WMA")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -1329,15 +1329,15 @@ send_plm_start: \Param pSmeConfigParams - a pointer to a caller allocated object of typedef struct _smeConfigParams. - \return CDF_STATUS_SUCCESS - SME update the config parameters successfully. + \return QDF_STATUS_SUCCESS - SME update the config parameters successfully. Other status means SME is failed to update the config parameters. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) +QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1352,7 +1352,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = csr_change_default_config_param(pMac, &pSmeConfigParams->csrConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_change_default_config_param failed with status=%d", status); @@ -1361,7 +1361,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = rrm_change_default_config_param(hHal, &pSmeConfigParams->rrmConfig); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "rrm_change_default_config_param failed with status=%d", status); @@ -1380,7 +1380,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams */ status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); } @@ -1396,7 +1396,7 @@ CDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams * * Return: Return the status of the updation. */ -CDF_STATUS sme_update_roam_params(tHalHandle hal, +QDF_STATUS sme_update_roam_params(tHalHandle hal, uint8_t session_id, struct roam_ext_params roam_params_src, int update_param) { @@ -1582,12 +1582,12 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal, Regulatory domain, valid channel list, Tx power per channel, a list with active/passive scan allowed per valid channel. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_change_config_params(tHalHandle hHal, +QDF_STATUS sme_change_config_params(tHalHandle hHal, tCsrUpdateConfigParam *pUpdateConfigParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pUpdateConfigParam) { @@ -1598,7 +1598,7 @@ CDF_STATUS sme_change_config_params(tHalHandle hHal, status = csr_change_config_params(pMac, pUpdateConfigParam); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csrUpdateConfigParam failed with status=%d", status); } @@ -1618,17 +1618,17 @@ CDF_STATUS sme_change_config_params(tHalHandle hHal, This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - eWNI_SME_SYS_READY_IND is sent to PE + \return QDF_STATUS_SUCCESS - eWNI_SME_SYS_READY_IND is sent to PE successfully. Other status means SME failed to send the message to PE. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) +QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) { tSirSmeReadyReq Msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -1642,7 +1642,7 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) if (eSIR_FAILURE != u_mac_post_ctrl_msg(hHal, (tSirMbMsg *) &Msg)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { sms_log(pMac, LOGE, "u_mac_post_ctrl_msg failed to send eWNI_SME_SYS_READY_IND"); @@ -1650,7 +1650,7 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) } status = csr_ready(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_ready failed with status=%d", status); @@ -1658,8 +1658,8 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) } #if defined WLAN_FEATURE_VOWIFI - if (CDF_STATUS_SUCCESS != rrm_ready(hHal)) { - status = CDF_STATUS_E_FAILURE; + if (QDF_STATUS_SUCCESS != rrm_ready(hHal)) { + status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGE, "rrm_ready failed"); break; } @@ -1679,20 +1679,20 @@ CDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME is ready. + \return QDF_STATUS_SUCCESS - SME is ready. Other status means SME is failed to start \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_start(tHalHandle hHal) +QDF_STATUS sme_start(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { status = csr_start(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_start failed during smeStart with status=%d", status); @@ -1712,13 +1712,13 @@ CDF_STATUS sme_start(tHalHandle hHal) * Scan request message from upper layer is handled as * part of this API * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, void *msg) { struct ani_scan_req *scan_msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint16_t session_id; csr_scan_completeCallback callback; @@ -1728,7 +1728,7 @@ static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, status = csr_scan_request(mac_ctx, session_id, scan_msg->scan_param, callback, scan_msg->ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("scan request failed. session_id %d"), session_id); } @@ -1745,13 +1745,13 @@ static CDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, * Roc request message from upper layer is handled as * part of this API * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_handle_roc_req(tHalHandle hal, +static QDF_STATUS sme_handle_roc_req(tHalHandle hal, void *msg) { struct ani_roc_req *roc_msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); remainOnChanCallback callback; @@ -1766,7 +1766,7 @@ static CDF_STATUS sme_handle_roc_req(tHalHandle hal, roc_msg->channel, roc_msg->duration, callback, roc_msg->ctx, roc_msg->is_p2pprobe_allowed, roc_msg->scan_id); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("scan request failed. session_id %d scan_id %d"), roc_msg->session_id, roc_msg->scan_id); @@ -1782,11 +1782,11 @@ static CDF_STATUS sme_handle_roc_req(tHalHandle hal, * *------------------------------------------------------------------*/ -CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, +QDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, tpSirSmeUnprotMgmtFrameInd pSmeMgmtFrm) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo pRoamInfo = { 0 }; uint32_t SessionId = pSmeMgmtFrm->sessionId; @@ -1807,9 +1807,9 @@ CDF_STATUS sme_unprotected_mgmt_frm_ind(tHalHandle hHal, * Handle the DFS Radar Event and indicate it to the SAP * *------------------------------------------------------------------*/ -CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) +QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo = { 0 }; tSirSmeDfsEventInd *dfs_event; tSirSmeCSAIeTxCompleteRsp *csaIeTxCompleteRsp; @@ -1827,7 +1827,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sms_log(pMac, LOGE, "%s: pMsg is NULL for eWNI_SME_DFS_RADAR_FOUND message", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sessionId = dfs_event->sessionId; roamInfo.dfs_event.sessionId = sessionId; @@ -1856,7 +1856,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sms_log(pMac, LOGE, "%s: pMsg is NULL for eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sessionId = csaIeTxCompleteRsp->sessionId; roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY; @@ -1870,7 +1870,7 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu { sms_log(pMac, LOG1, "%s: Invalid DFS message = 0x%x", __func__, msgType); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } } @@ -1892,11 +1892,11 @@ CDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu * * Return: success if msg indicated to SAP else return failure */ -static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, void *msg_buf) { struct sir_sme_ext_cng_chan_ind *ext_chan_ind; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t session_id = 0; tCsrRoamInfo roamInfo = {0}; eRoamCmdStatus roam_status; @@ -1907,7 +1907,7 @@ static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, if (NULL == ext_chan_ind) { sms_log(mac_ctx, LOGE, FL("pMsg is NULL for eWNI_SME_EXT_CHANGE_CHANNEL_IND")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } session_id = ext_chan_ind->session_id; roamInfo.target_channel = ext_chan_ind->new_channel; @@ -1929,10 +1929,10 @@ static CDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, * Handle the tsm ie indication from LIM and forward it to HDD. * *------------------------------------------------------------------*/ -CDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) +QDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo pRoamInfo = { 0 }; uint32_t SessionId = pSmeTsmIeInd->sessionId; pRoamInfo.tsmIe.tsid = pSmeTsmIeInd->tsmIe.tsid; @@ -1954,13 +1954,13 @@ CDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) \param pCckmIeLen - length of the CCKM IE \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_set_cckm_ie(pMac, sessionId, pCckmIe, cckmIeLen); sme_release_global_lock(&pMac->sme); } @@ -1975,10 +1975,10 @@ CDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, \param pEseBcnReq - pointer to ESE beacon request \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, +QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq) { - CDF_STATUS status = eSIR_SUCCESS; + QDF_STATUS status = eSIR_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpSirBeaconReportReqInd pSmeBcnReportReq = NULL; tCsrEseBeaconReqParams *pBeaconReq = NULL; @@ -1989,7 +1989,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, if (pSmeRrmContext->eseBcnReqInProgress == true) { sms_log(pMac, LOGE, "A Beacon Report Req is already in progress"); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* Store the info in RRM context */ @@ -2001,7 +2001,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, if (NULL == pSmeBcnReportReq) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! ESE BcnReq Ind to SME"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pSmeRrmContext->eseBcnReqInProgress = true; @@ -2031,7 +2031,7 @@ CDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, status = sme_rrm_process_beacon_report_req_ind(pMac, pSmeBcnReportReq); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) pSmeRrmContext->eseBcnReqInProgress = false; return status; @@ -2074,7 +2074,7 @@ static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) * Processes the dual mac configuration response and invokes the HDD callback * to process further */ -static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, +static QDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; @@ -2095,18 +2095,18 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_set_dual_mac_config != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.set_dual_mac_cmd.set_dual_mac_cb; @@ -2132,7 +2132,7 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, sme_release_command(mac, command); sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -2146,15 +2146,15 @@ static CDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, \param hHal - The handle returned by mac_open. \param pMsg - A pointer to a caller allocated object of tSirMsgQ. - \return CDF_STATUS_SUCCESS - SME successfully process the message. + \return QDF_STATUS_SUCCESS - SME successfully process the message. Other status means SME failed to process the message to HAL. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) +QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pMsg == NULL) { @@ -2162,7 +2162,7 @@ CDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) return status; } status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("Locking failed, bailing out")); if (pMsg->bodyptr) cdf_mem_free(pMsg->bodyptr); @@ -2705,7 +2705,7 @@ release_lock: * Processes the nss update response and invokes the HDD * callback to process further */ -CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) +QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) { tListElem *entry = NULL; tSmeCmd *command = NULL; @@ -2725,18 +2725,18 @@ CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) LL_ACCESS_LOCK); if (!entry) { sms_log(mac, LOGE, FL("No cmd found in active list")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } command = GET_BASE_ADDR(entry, tSmeCmd, Link); if (!command) { sms_log(mac, LOGE, FL("Base address is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (e_sme_command_nss_update != command->command) { sms_log(mac, LOGE, FL("Command mismatch!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } callback = command->u.nss_update_cmd.nss_update_cb; @@ -2763,7 +2763,7 @@ CDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) sme_release_command(mac, command); } sme_process_pending_queue(mac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* No need to hold the global lock here because this function can only be called */ @@ -2789,23 +2789,23 @@ void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg) \param hHal - The handle returned by mac_open \param tHalStopType - reason for stopping - \return CDF_STATUS_SUCCESS - SME is stopped. + \return QDF_STATUS_SUCCESS - SME is stopped. Other status means SME is failed to stop but caller should still consider SME is stopped. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) +QDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS fail_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS fail_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); p2p_stop(hHal); status = csr_stop(pMac, stopType); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_stop failed during smeStop with status=%d", status); fail_status = status; @@ -2813,7 +2813,7 @@ CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) purge_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(fail_status)) { + if (!QDF_IS_STATUS_SUCCESS(fail_status)) { status = fail_status; } @@ -2834,25 +2834,25 @@ CDF_STATUS sme_stop(tHalHandle hHal, tHalStopType stopType) This is a synchronous call \param hHal - The handle returned by mac_open - \return CDF_STATUS_SUCCESS - SME is successfully close. + \return QDF_STATUS_SUCCESS - SME is successfully close. Other status means SME is failed to be closed but caller still cannot call any other SME functions except smeOpen. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_close(tHalHandle hHal) +QDF_STATUS sme_close(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS fail_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS fail_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (!pMac) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* Note: pSession will be invalid from here on, do not access */ status = csr_close(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_close failed during sme close with status=%d", status); @@ -2860,7 +2860,7 @@ CDF_STATUS sme_close(tHalHandle hHal) } #ifndef WLAN_MDM_CODE_REDUCTION_OPT status = sme_qos_close(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "Qos close failed during sme close with status=%d", status); @@ -2869,7 +2869,7 @@ CDF_STATUS sme_close(tHalHandle hHal) #endif #ifdef FEATURE_OEM_DATA_SUPPORT status = oem_data_oem_data_req_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "OEM DATA REQ close failed during sme close with status=%d", status); @@ -2877,7 +2877,7 @@ CDF_STATUS sme_close(tHalHandle hHal) } #endif status = sme_ps_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "sme_ps_close failed during smeClose status=%d", status); @@ -2886,7 +2886,7 @@ CDF_STATUS sme_close(tHalHandle hHal) #if defined WLAN_FEATURE_VOWIFI status = rrm_close(hHal); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "RRM close failed during sme close with status=%d", status); @@ -2898,12 +2898,12 @@ CDF_STATUS sme_close(tHalHandle hHal) free_sme_cmd_list(pMac); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cdf_mutex_destroy(&pMac->sme.lkSmeGlobalLock))) { - fail_status = CDF_STATUS_E_FAILURE; + fail_status = QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(fail_status)) { + if (!QDF_IS_STATUS_SUCCESS(fail_status)) { status = fail_status; } @@ -2926,11 +2926,11 @@ CDF_STATUS sme_close(tHalHandle hHal) * * Return: Status of operation */ -CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, tCsrScanRequest *scan_req, csr_scan_completeCallback callback, void *ctx) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); struct ani_scan_req *scan_msg; cds_msg_t msg; @@ -2947,13 +2947,13 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); if (scan_count >= mac_ctx->scan.max_scan_count) { sms_log(mac_ctx, LOGE, FL("Max scan reached")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_get_scan_id(&scan_req_id); scan_req->scan_id = scan_req_id; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Unable to acquire lock")); return status; } @@ -2963,7 +2963,7 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } scan_msg->msg_type = eWNI_SME_SCAN_CMD; scan_msg->msg_len = (uint16_t) sizeof(struct ani_scan_req); @@ -2976,21 +2976,21 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, "scan_req:failed to allocate mem for scanreq"); sme_release_global_lock(&mac_ctx->sme); cdf_mem_free(scan_msg); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_scan_copy_request(mac_ctx, scan_msg->scan_param, scan_req); msg.type = eWNI_SME_SCAN_CMD; msg.bodyptr = scan_msg; msg.reserved = 0; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); csr_scan_free_request(mac_ctx, scan_msg->scan_param); cdf_mem_free(scan_msg->scan_param); cdf_mem_free(scan_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); return status; @@ -3002,13 +3002,13 @@ CDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, This is a synchronous call \param pFilter - If pFilter is NULL, all cached results are returned \param phResult - an object for the result. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -3016,7 +3016,7 @@ CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_result(hHal, pFilter, phResult); sme_release_global_lock(&pMac->sme); } @@ -3036,14 +3036,14 @@ CDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, * This function is written to get AP's channel id from CSR by filtering * the result which matches our roam profile. This is a synchronous call. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, +QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, tCsrRoamProfile *profile, tScanResultHandle *scan_cache, uint8_t *ap_chnl_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); tCsrScanResultFilter *scan_filter = NULL; tScanResultHandle filtered_scan_result = NULL; @@ -3052,13 +3052,13 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, if (NULL == mac_ctx) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("mac_ctx is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); cdf_mem_set(&first_ap_profile, sizeof(tSirBssDescription), 0); @@ -3074,7 +3074,7 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, scan_filter); } - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Save the WPS info */ if (NULL != profile) { scan_filter->bWPSAssociation = @@ -3089,14 +3089,14 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); cdf_mem_free(scan_filter); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { status = csr_scan_get_result(hal_handle, scan_filter, &filtered_scan_result); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { csr_get_bssdescr_from_scan_handle(filtered_scan_result, &first_ap_profile); *scan_cache = filtered_scan_result; @@ -3116,19 +3116,19 @@ CDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan is empty, set chnl to 0")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get scan get result")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } csr_free_scan_filter(mac_ctx, scan_filter); sme_release_global_lock(&mac_ctx->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } cdf_mem_free(scan_filter); @@ -3157,14 +3157,14 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (false == csr_store_joinreq_param(mac_ctx, profile, scan_cache, roam_id, session_id)) { ret_status = false; @@ -3192,14 +3192,14 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (false == csr_clear_joinreq_param(mac_ctx, session_id)) { ret_status = false; @@ -3222,30 +3222,30 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, * This function will issue station's stored join request further down to csr * to proceed forward. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. **/ -CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, +QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, uint32_t *roam_id, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_E_FAILURE; - CDF_STATUS ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS ret_status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { - if (CDF_STATUS_SUCCESS != csr_issue_stored_joinreq(mac_ctx, + if (QDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS != csr_issue_stored_joinreq(mac_ctx, roam_id, session_id)) { - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); } else { csr_clear_joinreq_param(mac_ctx, session_id); - ret_status = CDF_STATUS_E_FAILURE; + ret_status = QDF_STATUS_E_FAILURE; } return ret_status; } @@ -3254,18 +3254,18 @@ CDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, \fn sme_scan_flush_result \brief a wrapper function to request CSR to clear scan results. This is a synchronous call - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_flush_result(tHalHandle hHal) +QDF_STATUS sme_scan_flush_result(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, 0, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_flush_result(hHal); sme_release_global_lock(&pMac->sme); } @@ -3279,18 +3279,18 @@ CDF_STATUS sme_scan_flush_result(tHalHandle hHal) This is a synchronous call \param tHalHandle - HAL context handle \param sessionId - session id - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_scan_filter_results(pMac); sme_release_global_lock(&pMac->sme); } @@ -3298,16 +3298,16 @@ CDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) return status; } -CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_flush_selective_result(hHal, true); sme_release_global_lock(&pMac->sme); } @@ -3326,7 +3326,7 @@ CDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; @@ -3334,7 +3334,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pRet = csr_scan_result_get_first(pMac, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3354,7 +3354,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; @@ -3362,7 +3362,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pRet = csr_scan_result_get_next(pMac, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3378,18 +3378,18 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, \param hScanResult - returned from csr_scan_get_result. hScanResult is considered gone by calling this function and even before this function reutrns. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) +QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_result_purge(hHal, hScanResult); sme_release_global_lock(&pMac->sme); } @@ -3407,21 +3407,21 @@ CDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) tPmkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCandidateInfo. \Note: pNumItems is a number of tPmkidCandidateInfo, not sizeof(tPmkidCandidateInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_scan_get_pmkid_candidate_list(tHalHandle hHal, uint8_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_pmkid_candidate_list(pMac, sessionId, pPmkidList, @@ -3479,23 +3479,23 @@ uint32_t sme_get_channel_bonding_mode24_g(tHalHandle hHal) \param hBssListIn - a list of BSS descriptor to roam to. It is returned from csr_scan_get_result \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (!pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_connect(pMac, sessionId, pProfile, @@ -3503,7 +3503,7 @@ CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, } else { sms_log(pMac, LOGE, FL("invalid sessionID %d"), sessionId); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } else { @@ -3523,17 +3523,17 @@ CDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, \param phyMode new phyMode which is to set - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) +QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->roam.configParam.phyMode = phyMode; @@ -3543,7 +3543,7 @@ CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) pMac->roam.configParam. ProprietaryRatesEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -3556,21 +3556,21 @@ CDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) that might need modification dynamically once STA is up & running and this could trigger a reassoc \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId, bool fForce) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { if ((NULL == pProfile) && (fForce == 1)) { status = @@ -3583,7 +3583,7 @@ CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, modProfileFields, pRoamId); } } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3596,22 +3596,22 @@ CDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, \brief a wrapper function to request CSR to disconnect and reconnect with the same profile This is an asynchronous call. - \return CDF_STATUS. It returns fail if currently connected + \return QDF_STATUS. It returns fail if currently connected ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_connect_to_last_profile(pMac, sessionId); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3625,12 +3625,12 @@ CDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) This is an asynchronous call. \param reason -- To indicate the reason for disconnecting. Currently, only eCSR_DISCONNECT_REASON_MIC_ERROR is meanful. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -3638,11 +3638,11 @@ CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, reason)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_disconnect(pMac, sessionId, reason); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3655,20 +3655,20 @@ CDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, \brief To stop BSS for Soft AP. This is an asynchronous API. \param hHal - Global structure \param sessionId - sessionId of SoftAP - \return CDF_STATUS SUCCESS Roam callback will be called to indicate actual results + \return QDF_STATUS SUCCESS Roam callback will be called to indicate actual results -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_stop_bss_cmd(pMac, sessionId, true); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3682,12 +3682,12 @@ CDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId) \param hHal - Global structure \param sessionId - sessionId of SoftAP \param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes) - \return CDF_STATUS SUCCESS Roam callback will be called to indicate actual results + \return QDF_STATUS SUCCESS Roam callback will be called to indicate actual results -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, const uint8_t *pPeerMacAddr) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3696,13 +3696,13 @@ CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_disassociate_sta_cmd(pMac, sessionId, pPeerMacAddr, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3718,14 +3718,14 @@ CDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, * * To disassociate a station. This is an asynchronous API. * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS error + * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS error * code on error. Roam callback will be called to indicate actual * result */ -CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3737,13 +3737,13 @@ CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, sessionId, pDelStaParams->reason_code)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_deauth_sta_cmd(pMac, sessionId, pDelStaParams); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3756,12 +3756,12 @@ CDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, \brief To start or stop TKIP counter measures. This is an asynchronous API. \param sessionId - sessionId of SoftAP \param pPeerMacAddr - Caller allocated memory filled with peer MAC address (6 bytes) - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, bool bEnable) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3770,13 +3770,13 @@ CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_issue_tkip_counter_measures(pMac, sessionId, bEnable); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3797,14 +3797,14 @@ CDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \param pfnSapEventCallback - Sap event callback in HDD \param pAssocBuf - Caller allocated memory to be filled with associatd stations info - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3813,7 +3813,7 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_associated_stas(pMac, sessionId, modId, @@ -3821,7 +3821,7 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, pfnSapEventCallback, pAssocStasBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3837,14 +3837,14 @@ CDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \pRemoveMac - pointer to Mac address which needs to be removed from session - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { @@ -3853,7 +3853,7 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wps_session_overlap(pMac, sessionId, @@ -3861,7 +3861,7 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, pfnSapEventCallback, pRemoveMac); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3874,21 +3874,21 @@ CDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, \brief a wrapper function to request CSR to return the current connect state of Roaming This is a synchronous call. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_connect_state(pMac, sessionId, pState); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3904,24 +3904,24 @@ CDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, This is a synchronous call. \param pProfile - pointer to a caller allocated structure tCsrRoamConnectedProfile - \return CDF_STATUS. Failure if not connected + \return QDF_STATUS. Failure if not connected ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_connect_profile(pMac, sessionId, pProfile); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3957,30 +3957,30 @@ void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) \param update_entire_cache - this bool value specifies if the entire pmkid cache should be overwritten or should it be updated entry by entry. - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCacheInfo. \Note: pNumItems is a number of tPmkidCacheInfo, not sizeof(tPmkidCacheInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId, numItems)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_set_pmkid_cache(pMac, sessionId, pPMKIDCache, numItems, update_entire_cache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -3988,22 +3988,22 @@ CDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, return status; } -CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBSSId, bool flush_cache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_del_pmkid_from_cache(pMac, sessionId, pBSSId, flush_cache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4021,22 +4021,22 @@ CDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, * \param pmk_len - Length could be only 16 bytes in case if LEAP * connections. Need to pass this information to * firmware. - * \return CDF_STATUS -status whether PSK/PMK is set or not + * \return QDF_STATUS -status whether PSK/PMK is set or not *--------------------------------------------------------------------------- */ -CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_set_psk_pmk(pMac, sessionId, pPSK_PMK, pmk_len); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4053,23 +4053,23 @@ CDF_STATUS sme_roam_set_psk_pmk(tHalHandle hHal, uint8_t sessionId, \param pBuf - Caller allocated memory that contain the IE field, if any, upon return \param secType - Specifies whether looking for WPA/WPA2/WAPI IE - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wpa_rsn_req_ie(hHal, sessionId, pLen, pBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4087,23 +4087,23 @@ CDF_STATUS sme_roam_get_security_req_ie(tHalHandle hHal, uint8_t sessionId, \param pBuf - Caller allocated memory that contain the IE field, if any, upon return \param secType - Specifies whether looking for WPA/WPA2/WAPI IE - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, uint32_t *pLen, uint8_t *pBuf, eCsrSecurityType secType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_wpa_rsn_rsp_ie(pMac, sessionId, pLen, pBuf); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4121,18 +4121,18 @@ CDF_STATUS sme_roam_get_security_rsp_ie(tHalHandle hHal, uint8_t sessionId, ---------------------------------------------------------------------------*/ uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint32_t numPmkidCache = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { numPmkidCache = csr_roam_get_num_pmkid_cache(pMac, sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4149,26 +4149,26 @@ uint32_t sme_roam_get_num_pmkid_cache(tHalHandle hHal, uint8_t sessionId) needed or actually number in tPmkidCacheInfo. \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_roam_get_pmkid_cache(pMac, sessionId, pNum, pPmkidCache); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4182,19 +4182,19 @@ CDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, currently maintained by CSR. This is a synchronous call. \param pParam - caller allocated memory - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) +QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_config_param(pMac, &pParam->csrConfig); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, "%s csr_get_config_param failed", __func__); sme_release_global_lock(&pMac->sme); @@ -4217,15 +4217,15 @@ CDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) * * This function sets the string value in cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) +QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != cfg_set_int(pmac, cfg_id, value)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4239,16 +4239,16 @@ CDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value) * * This function sets the string value in cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t length) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != cfg_set_str(pmac, cfg_id, str, length)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4262,15 +4262,15 @@ CDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, * * This function gets the value of the cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) +QDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != wlan_cfg_get_int(pmac, cfg_id, cfg_value)) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -4284,16 +4284,16 @@ CDF_STATUS sme_cfg_get_int(tHalHandle hal, uint16_t cfg_id, uint32_t *cfg_value) * * This function gets the string value of the cfg parameter. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, +QDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t *length) { tpAniSirGlobal pmac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (eSIR_SUCCESS != wlan_cfg_get_str(pmac, cfg_id, str, length)) - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; return status; } @@ -4310,26 +4310,26 @@ CDF_STATUS sme_cfg_get_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, \param pModifyProfileFields - pointer to the connected profile fields changing which can cause reassoc - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { status = csr_get_modify_profile_fields(pMac, sessionId, pModifyProfileFields); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -4360,12 +4360,12 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag) called whenever an 11d scan is done \param hHal - The handle returned by mac_open. \param callback - 11d scan complete routine to be registered - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, +QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, csr_scan_completeCallback callback) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->scan.callback11dScanDone = callback; @@ -4384,12 +4384,12 @@ CDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal, * sme_oem_data_rsp_callback is used to register sme_send_oem_data_rsp_msg * callback function. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, +QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, sme_send_oem_data_rsp_msg callback) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(h_hal); pmac->oemData.oem_data_rsp_callback = callback; @@ -4408,12 +4408,12 @@ CDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal, * related capabilities are updated. More capabilities can be * added in future. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_oem_update_capability(tHalHandle hal, +QDF_STATUS sme_oem_update_capability(tHalHandle hal, struct sme_oem_capability *cap) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); uint8_t *bytes; @@ -4436,12 +4436,12 @@ CDF_STATUS sme_oem_update_capability(tHalHandle hal, * Currently RTT related capabilities are received. More * capabilities can be added in future. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_oem_get_capability(tHalHandle hal, +QDF_STATUS sme_oem_get_capability(tHalHandle hal, struct sme_oem_capability *cap) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); uint8_t *bytes; @@ -4484,9 +4484,9 @@ void sme_register_ftm_msg_processor(tHalHandle hal, * do a pattern match on these patterns when WoW is enabled during system * suspend. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_wow_add_pattern(tHalHandle hal, +QDF_STATUS sme_wow_add_pattern(tHalHandle hal, struct wow_add_pattern *pattern, uint8_t session_id) { @@ -4501,7 +4501,7 @@ CDF_STATUS sme_wow_add_pattern(tHalHandle hal, if (NULL == ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } (void)cdf_mem_copy(ptrn, pattern, sizeof(*ptrn)); @@ -4526,9 +4526,9 @@ CDF_STATUS sme_wow_add_pattern(tHalHandle hal, * @pattern: pointer to delete pattern parameter * @sessionId: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, +QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, struct wow_delete_pattern *pattern, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); @@ -4542,7 +4542,7 @@ CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, if (NULL == delete_ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Delete Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } (void)cdf_mem_copy(delete_ptrn, pattern, sizeof(*delete_ptrn)); msg_q.type = WMA_WOW_DEL_PTRN; @@ -4589,16 +4589,16 @@ CDF_STATUS sme_wow_delete_pattern(tHalHandle hal, * Currently there is no requirement or use case to support * UAPSD and WOWL at the same time. * - * Return: CDF_STATUS - * CDF_STATUS_SUCCESS Device is already in WoWLAN mode - * CDF_STATUS_E_FAILURE Device cannot enter WoWLAN mode. - * CDF_STATUS_PMC_PENDING Request accepted. SME will enable + * Return: QDF_STATUS + * QDF_STATUS_SUCCESS Device is already in WoWLAN mode + * QDF_STATUS_E_FAILURE Device cannot enter WoWLAN mode. + * QDF_STATUS_PMC_PENDING Request accepted. SME will enable * WOWL after BMPS mode is entered. */ -CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, +QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, void (*enter_wowl_callback_routine)(void *callback_context, - CDF_STATUS status), + QDF_STATUS status), void *enter_wowl_callback_context, #ifdef WLAN_WAKEUP_EVENTS void (*wakeIndicationCB)(void *callback_context, @@ -4609,7 +4609,7 @@ CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, tpSirSmeWowlEnterParams wowl_enter_params, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -4641,14 +4641,14 @@ CDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, * * SME will initiate exit from WoWLAN mode and device will be * put in BMPS mode. - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Device cannot exit WoWLAN mode. - * CDF_STATUS_SUCCESS Request accepted to exit WoWLAN mode. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Device cannot exit WoWLAN mode. + * QDF_STATUS_SUCCESS Request accepted to exit WoWLAN mode. */ -CDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, +QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, tpSirSmeWowlExitParams wowl_exit_params) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); uint8_t session_id; MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -4671,10 +4671,10 @@ CDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, * * Return: Status of operation */ -CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, tCsrRoamSetKey *set_key, uint32_t *ptr_roam_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); uint32_t roam_id; uint32_t i; @@ -4686,14 +4686,14 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, if (set_key->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("Invalid key length %d"), set_key->keyLength); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /*Once Setkey is done, we can go in BMPS */ if (set_key->keyLength) ps_global_info->remain_in_power_active_till_dhcp = false; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); @@ -4710,7 +4710,7 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (CSR_IS_INFRA_AP(&session->connectedProfile) && set_key->keyDirection == eSIR_TX_DEFAULT) { @@ -4745,20 +4745,20 @@ CDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, RSSI, do not hold up but return this value. \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_rssi(tHalHandle hHal, +QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_rssi(pMac, callback, staId, bssId, lastRSSI, pContext, p_cds_context); @@ -4776,17 +4776,17 @@ CDF_STATUS sme_get_rssi(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_snr(tHalHandle hHal, +QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_snr(pMac, callback, staId, bssId, pContext); sme_release_global_lock(&pMac->sme); } @@ -4802,17 +4802,17 @@ CDF_STATUS sme_get_snr(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param p_cds_context - cds context - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, +QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_tsm_stats(pMac, callback, staId, bssId, pContext, p_cds_context, tid); @@ -4838,22 +4838,22 @@ CDF_STATUS sme_get_tsm_stats(tHalHandle hHal, \param staId - The station ID for which the stats is requested for \param pContext - user context to be passed back along with the callback \param sessionId - sme session interface - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_statistics(tHalHandle hHal, +QDF_STATUS sme_get_statistics(tHalHandle hHal, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION, periodicity)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_statistics(pMac, requesterId, statsMask, callback, periodicity, cache, staId, pContext, @@ -4865,24 +4865,24 @@ CDF_STATUS sme_get_statistics(tHalHandle hHal, } -CDF_STATUS sme_get_link_status(tHalHandle hHal, +QDF_STATUS sme_get_link_status(tHalHandle hHal, tCsrLinkStatusCallback callback, void *pContext, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tAniGetLinkStatus *pMsg; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_LINK_STATUS_GET_REQ; @@ -4895,14 +4895,14 @@ CDF_STATUS sme_get_link_status(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); cdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; pMac->sme.linkStatusCallback = NULL; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -4929,12 +4929,12 @@ CDF_STATUS sme_get_link_status(tHalHandle hHal, returns fail status and this parameter contains the number that is needed. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) +QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -4994,12 +4994,12 @@ bool sme_is_wmm_supported(tHalHandle hHal) \param sendRegHint If we want to send reg hint to nl80211 - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_change_country_code(tHalHandle hHal, +QDF_STATUS sme_change_country_code(tHalHandle hHal, tSmeChangeCountryCallback callback, uint8_t *pCountry, void *pContext, @@ -5007,7 +5007,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, tAniBool countryFromUserSpace, tAniBool sendRegHint) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; tAniChangeCountryCodeReq *pMsg; @@ -5016,7 +5016,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL(" called")); if ((pMac->roam.configParam.Is11dSupportEnabledOriginal == true) @@ -5027,7 +5027,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, "Set Country Code Fail since the STA is associated and userspace does not have priority "); sme_release_global_lock(&pMac->sme); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } @@ -5036,7 +5036,7 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, sms_log(pMac, LOGE, " csrChangeCountryCode: failed to allocate mem for req"); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_CHANGE_COUNTRY_CODE; @@ -5052,12 +5052,12 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " sme_change_country_code failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); sme_release_global_lock(&pMac->sme); @@ -5079,15 +5079,15 @@ CDF_STATUS sme_change_country_code(tHalHandle hHal, \param reg_domain regulatory domain - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. -----------------------------------------------------------------------------*/ -CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, +QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; tAniGenericChangeCountryCodeReq *pMsg; @@ -5099,7 +5099,7 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL(" called")); pMsg = cdf_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq)); @@ -5107,7 +5107,7 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, sms_log(pMac, LOGE, " sme_generic_change_country_code: failed to allocate mem for req"); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE; @@ -5120,12 +5120,12 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "sme_generic_change_country_code failed to post msg to self"); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); sme_release_global_lock(&pMac->sme); @@ -5148,30 +5148,30 @@ CDF_STATUS sme_generic_change_country_code(tHalHandle hHal, \param sessionId - session ID. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. --------------------------------------------------------------------------*/ -CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId) { - CDF_STATUS status; - CDF_STATUS cdf_status; + QDF_STATUS status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniDHCPInd *pMsg; tCsrRoamSession *pSession; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); @@ -5180,7 +5180,7 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, "%s: Not able to allocate memory for dhcp start", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_DHCP_START_IND; pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); @@ -5194,12 +5194,12 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -5219,29 +5219,29 @@ CDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, \param sessionId - session ID. - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. FAILURE or RESOURCES The API finished and failed. --------------------------------------------------------------------------*/ -CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, +QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId) { - CDF_STATUS status; - CDF_STATUS cdf_status; + QDF_STATUS status; + QDF_STATUS qdf_status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniDHCPInd *pMsg; tCsrRoamSession *pSession; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); @@ -5250,7 +5250,7 @@ CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, "%s: Not able to allocate memory for dhcp stop", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = WMA_DHCP_STOP_IND; @@ -5265,12 +5265,12 @@ CDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, cds_message.bodyptr = pMsg; cds_message.reserved = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); cdf_mem_free(pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -5293,7 +5293,7 @@ void sme_set_cfg_privacy(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { csr_set_cfg_privacy(pMac, pProfile, fPrivacy); sme_release_global_lock(&pMac->sme); } @@ -5307,21 +5307,21 @@ void sme_set_cfg_privacy(tHalHandle hHal, \param pRrmNeighborReq - Pointer to a caller allocated object of type tRrmNeighborReq. Caller owns the memory and is responsible for freeing it. - \return CDF_STATUS - CDF_STATUS_E_FAILURE - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_FAILURE - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION, 0)); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { status = sme_rrm_neighbor_report_request(hHal, sessionId, pRrmNeighborReq, callbackInfo); @@ -5357,21 +5357,21 @@ void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) which the HOST driver was built \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version structure to be filled - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, tSirVersionType *pVersion) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5385,21 +5385,21 @@ CDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, which the WCNSS driver reports it was built \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version structure to be filled - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, tSirVersionType *pVersion) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5413,26 +5413,26 @@ CDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version string buffer to be filled \param versionBufferSize - THe size of the Version string buffer - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); v_CONTEXT_t cds_context = cds_get_global_context(); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) { status = wma_get_wcnss_software_version(cds_context, pVersion, versionBufferSize); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -5446,22 +5446,22 @@ CDF_STATUS sme_get_wcnss_software_version(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param pVersion - Points to the Version string buffer to be filled \param versionBufferSize - THe size of the Version string buffer - \return CDF_STATUS - CDF_STATUS_E_INVAL - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_INVAL - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, +QDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, uint8_t *pVersion, uint32_t versionBufferSize) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { if (pVersion != NULL) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; else - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; sme_release_global_lock(&pMac->sme); } @@ -5480,21 +5480,21 @@ CDF_STATUS sme_get_wcnss_hardware_version(tHalHandle hHal, tBkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tBkidCandidateInfo. \Note: pNumItems is a number of tBkidCandidateInfo, not sizeof(tBkidCandidateInfo) * something ---------------------------------------------------------------------------*/ -CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, tBkidCandidateInfo *pBkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_get_bkid_candidate_list(pMac, sessionId, pBkidList, pNumItems); @@ -5516,27 +5516,27 @@ CDF_STATUS sme_scan_get_bkid_candidate_list(tHalHandle hHal, uint32_t sessionId, \brief a wrapper function for OEM DATA REQ \param sessionId - session id to be used. \param pOemDataReqId - pointer to an object to get back the request ID - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_oem_data_req(tHalHandle hHal, +QDF_STATUS sme_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *pOemDataReqConfig, uint32_t *pOemDataReqID) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { uint32_t lOemDataReqId = pMac->oemData.oemDataReqID++; /* let it wrap around */ if (pOemDataReqID) { *pOemDataReqID = lOemDataReqId; } else { sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = @@ -5570,29 +5570,29 @@ CDF_STATUS sme_oem_data_req(tHalHandle hHal, (6 bytes) \param pbSessionId - pointer to a caller allocated buffer for returned session ID - \return CDF_STATUS_SUCCESS - session is opened. sessionId returned. + \return QDF_STATUS_SUCCESS - session is opened. sessionId returned. Other status means SME is failed to open the session. - CDF_STATUS_E_RESOURCES - no more session available. + QDF_STATUS_E_RESOURCES - no more session available. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, +QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: type=%d, subType=%d", __func__, type, subType); if (NULL == pbSessionId) { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } else { status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_open_session(pMac, callback, pContext, pSelfMacAddr, pbSessionId, type, @@ -5619,24 +5619,24 @@ CDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, \param sessionId - A previous opened session's ID. - \return CDF_STATUS_SUCCESS - session is closed. + \return QDF_STATUS_SUCCESS - session is closed. Other status means SME is failed to open the session. - CDF_STATUS_E_INVAL - session is not opened. + QDF_STATUS_E_INVAL - session is not opened. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_close_session(pMac, sessionId, false, callback, pContext); @@ -5655,20 +5655,20 @@ CDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, \param pAPWPSIES - pointer to a caller allocated object of tSirAPWPSIEs - \return CDF_STATUS – SUCCESS – + \return QDF_STATUS – SUCCESS – FAILURE or RESOURCES – The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, tSirAPWPSIEs *pAPWPSIES) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_apwpsie(pMac, sessionId, pAPWPSIES); @@ -5687,20 +5687,20 @@ CDF_STATUS sme_roam_update_apwpsie(tHalHandle hHal, uint8_t sessionId, \param pAPSirRSNie - pointer to a caller allocated object of tSirRSNie with WPS/RSN IEs - \return CDF_STATUS – SUCCESS – + \return QDF_STATUS – SUCCESS – FAILURE or RESOURCES – The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, tSirRSNie *pAPSirRSNie) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_wparsni_es(pMac, sessionId, pAPSirRSNie); @@ -5720,19 +5720,19 @@ CDF_STATUS sme_roam_update_apwparsni_es(tHalHandle hHal, uint8_t sessionId, \param - \return CDF_STATUS SUCCESS + \return QDF_STATUS SUCCESS FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOG1, FL("Update Beacon PARAMS ")); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_send_chng_mcc_beacon_interval(pMac, sessionId); sme_release_global_lock(&pMac->sme); } @@ -5745,18 +5745,18 @@ CDF_STATUS sme_change_mcc_beacon_interval(tHalHandle hHal, uint8_t sessionId) * @sessionId: Session Identifier * @request: Pointer to the offload request. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpSirHostOffloadReq request) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef WLAN_NS_OFFLOAD if (SIR_IPV6_NS_OFFLOAD == request->offloadType) { status = sme_set_ps_ns_offload(hHal, request, @@ -5780,9 +5780,9 @@ CDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, * @sessionId: Session Identifier * @pGtkOffload: Pointer to the GTK offload request.. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, +QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, tpSirGtkOffloadParams pGtkOffload, uint8_t sessionId) { @@ -5798,14 +5798,14 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pGtkOffload->bssid, @@ -5816,15 +5816,15 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, msg.type = WMA_GTK_OFFLOAD_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5834,9 +5834,9 @@ CDF_STATUS sme_set_gtk_offload(tHalHandle hHal, * @sessionId: Session Identifier. * callback_context: callback_context. * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, +QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, gtk_offload_get_info_callback callback_routine, void *callback_context, uint8_t session_id) { @@ -5851,14 +5851,14 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request_buf->bssid, @@ -5883,15 +5883,15 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, pMac->sme.gtk_offload_get_info_cb = callback_routine; pMac->sme.gtk_offload_get_info_cb_context = callback_context; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_GTK_OFFLOAD */ @@ -5900,9 +5900,9 @@ CDF_STATUS sme_get_gtk_offload(tHalHandle hHal, \brief API to set the Keep Alive feature. \param hHal - The handle returned by mac_open. \param request - Pointer to the Keep Alive request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, tpSirKeepAliveReq request) { tpSirKeepAliveReq request_buf; @@ -5916,13 +5916,13 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, if (pSession == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session not Found")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); @@ -5936,15 +5936,15 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, msg.type = WMA_SET_KEEP_ALIVE; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_SCAN_PNO @@ -5953,9 +5953,9 @@ CDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, \brief API to set the Preferred Network List Offload feature. \param hHal - The handle returned by mac_open. \param request - Pointer to the offload request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, +QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpSirPNOScanReq request, uint8_t sessionId, void (*callback_routine)(void *callback_context, @@ -5964,13 +5964,13 @@ CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, void *callback_context) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, sessionId, request->ucNetworksCount)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sme_set_ps_preferred_network_list(hHal, request, sessionId, callback_routine, callback_context); sme_release_global_lock(&pMac->sme); @@ -5987,20 +5987,20 @@ CDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - sessionId on which we need to abort scan. \param reason - Reason to abort the scan. - \return CDF_STATUS - CDF_STATUS_E_FAILURE - failure - CDF_STATUS_SUCCESS success + \return QDF_STATUS + QDF_STATUS_E_FAILURE - failure + QDF_STATUS_SUCCESS success ---------------------------------------------------------------------------*/ -CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, eCsrAbortReason reason) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_scan_abort_mac_scan(pMac, sessionId, reason); sme_release_global_lock(&pMac->sme); @@ -6014,10 +6014,10 @@ CDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, \brief API to get current channel on which STA is parked this function gives channel information only of infra station or IBSS station \param hHal, pointer to memory location and sessionId - \returns CDF_STATUS_SUCCESS - CDF_STATUS_E_FAILURE + \returns QDF_STATUS_SUCCESS + QDF_STATUS_E_FAILURE -------------------------------------------------------------------------------*/ -CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, +QDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -6035,10 +6035,10 @@ CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, || (pSession->connectedProfile.BSSType == eCSR_BSS_TYPE_START_IBSS)) { *pChannel = pSession->connectedProfile.operationChannel; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* sme_get_operation_channel ends here */ /** @@ -6053,23 +6053,23 @@ CDF_STATUS sme_get_operation_channel(tHalHandle hHal, uint32_t *pChannel, * * Return: Success if msg is posted to PE else Failure. */ -CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, +QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sir_mgmt_frame_ind_callback callback) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); struct sir_sme_mgmt_frame_cb_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(mac_ctx, LOG1, FL(": ENTER")); - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac_ctx->sme)) { msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(mac_ctx, LOGE, FL("Not able to allocate memory for eWNI_SME_REGISTER_MGMT_FRAME_CB")); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(msg, sizeof(*msg), 0); msg->message_type = eWNI_SME_REGISTER_MGMT_FRAME_CB; @@ -6080,7 +6080,7 @@ CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, sme_release_global_lock(&mac_ctx->sme); return status; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* --------------------------------------------------------------------------- @@ -6092,19 +6092,19 @@ CDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, \param matchData - data which needs to be matched before passing frame to HDD. \param matchDataLen - Length of matched data. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tSirRegisterMgmtFrame *pMsg; uint16_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -6113,21 +6113,21 @@ CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(tSirRegisterMgmtFrame) + matchLen; pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; @@ -6153,20 +6153,20 @@ CDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, \param matchData - data which needs to be matched before passing frame to HDD. \param matchDataLen - Length of matched data. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tSirRegisterMgmtFrame *pMsg; uint16_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -6175,21 +6175,21 @@ CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(tSirRegisterMgmtFrame) + matchLen; pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; @@ -6218,15 +6218,15 @@ CDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, * * This function process the roc request and generates scan identifier.s * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, +QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t *scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); uint32_t san_req_id, scan_count; struct ani_roc_req *roc_msg; @@ -6239,7 +6239,7 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); if (scan_count >= mac_ctx->scan.max_scan_count) { sms_log(mac_ctx, LOGE, FL("Max scan reached")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_get_scan_id(&san_req_id); @@ -6252,7 +6252,7 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); sme_release_global_lock(&mac_ctx->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } roc_msg->msg_type = eWNI_SME_ROC_CMD; roc_msg->msg_len = (uint16_t) sizeof(struct ani_roc_req); @@ -6267,12 +6267,12 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, msg.bodyptr = roc_msg; msg.reserved = 0; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); cdf_mem_free(roc_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); return status; @@ -6283,19 +6283,19 @@ CDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, \brief API to enable/disable forwarding of probeReq to apps in p2p. \param hHal - The handle returned by mac_open. \param falg: to set the Probe request forarding to wpa_supplicant in listen state in p2p - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ #ifndef WLAN_FEATURE_CONCURRENT_P2P -CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) +QDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* call set in context */ pMac->p2pContext.probeReqForwarding = flag; /* release the lock for the sme object */ @@ -6314,19 +6314,19 @@ CDF_STATUS sme_report_probe_req(tHalHandle hHal, uint8_t flag) \param hHal - The handle returned by mac_open. \param p2pIe - Ptr to p2pIe from HDD. \param p2pIeLength: length of p2pIe - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) +QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (NULL != pMac->p2pContext.probeRspIe) { cdf_mem_free(pMac->p2pContext.probeRspIe); pMac->p2pContext.probeRspIeLength = 0; @@ -6337,7 +6337,7 @@ CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) sms_log(pMac, LOGE, "%s: Unable to allocate P2P IE", __func__); pMac->p2pContext.probeRspIeLength = 0; - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { pMac->p2pContext.probeRspIeLength = p2pIeLength; @@ -6362,22 +6362,22 @@ CDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) \fn sme_send_action \brief API to send action frame from supplicant. \param hHal - The handle returned by mac_open. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { p2p_send_action(hHal, sessionId, pBuf, len, wait, noack, channel_freq); /* release the lock for the sme object */ @@ -6389,17 +6389,17 @@ CDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, return status; } -CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = p2p_cancel_remain_on_channel(hHal, sessionId, scan_id); sme_release_global_lock(&pMac->sme); } @@ -6407,13 +6407,13 @@ CDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, } /* Power Save Related */ -CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) +QDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = p2p_set_ps(hHal, data); sme_release_global_lock(&pMac->sme); } @@ -6440,27 +6440,27 @@ CDF_STATUS sme_p2p_set_ps(tHalHandle hHal, tP2pPsConfig *data) FILTER_ALL_BROADCAST: FILTER_ALL_MULTICAST_BROADCAST: - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, +QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpSirWlanSetRxpFilters wlanRxpFilterParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = wlanRxpFilterParam; cds_message.type = WMA_CFG_RXP_FILTER_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6485,16 +6485,16 @@ CDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, event is received. callback_context - Context associated with csr_readyToSuspendCallback. - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, +QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, uint32_t conn_state_mask, csr_readyToSuspendCallback callback, void *callback_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -6506,15 +6506,15 @@ CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, pMac->readyToSuspendContext = callback_context; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyval = conn_state_mask; cds_message.type = WMA_WLAN_SUSPEND_IND; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->readyToSuspendCallback = NULL; pMac->readyToSuspendContext = NULL; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6536,14 +6536,14 @@ CDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, wlanResumeParam- Depicts the wlan resume params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_resume_req(tHalHandle hHal, +QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpSirWlanResumeParam wlanResumeParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -6551,13 +6551,13 @@ CDF_STATUS sme_configure_resume_req(tHalHandle hHal, TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = wlanResumeParam; cds_message.type = WMA_WLAN_RESUME_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -6573,21 +6573,21 @@ CDF_STATUS sme_configure_resume_req(tHalHandle hHal, * @callback_context - ext_wow callback context * * SME will pass this request to lower mac to configure Extr WoW - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, +QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, tpSirExtWoWParams wlanExtParams, csr_readyToExtWoWCallback callback, void *callback_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirExtWoWParams MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0)); @@ -6596,18 +6596,18 @@ CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, pMac->readyToExtWoWContext = callback_context; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanExtParams, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_EXT_WOW; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->readyToExtWoWCallback = NULL; pMac->readyToExtWoWContext = NULL; cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6632,35 +6632,35 @@ CDF_STATUS sme_configure_ext_wow(tHalHandle hHal, wlanAppType1Params- Depicts the wlan App Type 1(Indoor) params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, tpSirAppType1Params wlanAppType1Params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirAppType1Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanAppType1Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE1_PARAMS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6683,35 +6683,35 @@ CDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, wlanAppType2Params- Depicts the wlan App Type 2 (Outdoor) params - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, +QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, tpSirAppType2Params wlanAppType2Params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tpSirAppType2Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cdf_mem_copy(MsgPtr, wlanAppType2Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE2_PARAMS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(MsgPtr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -6736,12 +6736,12 @@ CDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, -------------------------------------------------------------------------------*/ int8_t sme_get_infra_session_id(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int8_t sessionid = -1; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sessionid = csr_get_infra_session_id(pMac); @@ -6766,11 +6766,11 @@ int8_t sme_get_infra_session_id(tHalHandle hHal) -------------------------------------------------------------------------------*/ uint8_t sme_get_infra_operation_channel(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_infra_operation_channel(pMac, sessionId); @@ -6784,11 +6784,11 @@ uint8_t sme_get_infra_operation_channel(tHalHandle hHal, uint8_t sessionId) /* If other BSS is not up or not connected it will return 0 */ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_concurrent_operation_channel(pMac); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " @@ -6804,12 +6804,12 @@ uint16_t sme_check_concurrent_channel_overlap(tHalHandle hHal, uint16_t sap_ch, eCsrPhyMode sapPhyMode, uint8_t cc_switch_mode) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint16_t channel = 0; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_check_concurrent_channel_overlap(pMac, sap_ch, sapPhyMode, cc_switch_mode); @@ -6869,13 +6869,13 @@ void sme_update_roam_pno_channel_prediction_config( * hHal - HAL handle for device * pMsg - found network description * -* Returns: CDF_STATUS +* Returns: QDF_STATUS * ******************************************************************************/ -CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirPrefNetworkFoundInd *pPrefNetworkFoundInd = (tSirPrefNetworkFoundInd *) pMsg; uint8_t dumpSsId[SIR_MAC_MAX_SSID_LENGTH + 1]; @@ -6883,7 +6883,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) if (NULL == pMsg) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pMac->pnoOffload) { @@ -6916,7 +6916,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) /* we may have a frame */ status = csr_scan_save_preferred_network_found(pMac, pPrefNetworkFoundInd); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to save preferred network")); } @@ -6928,7 +6928,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) } /* Call Preferred Netowrk Found Indication callback routine. */ - if (CDF_IS_STATUS_SUCCESS(status) + if (QDF_IS_STATUS_SUCCESS(status) && (pMac->sme.pref_netw_found_cb != NULL)) { pMac->sme.pref_netw_found_cb(pMac->sme. preferred_network_found_ind_cb_ctx, @@ -6937,7 +6937,7 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) } else { sms_log(pMac, LOGE, "%s: callback failed - SSID is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -6945,14 +6945,14 @@ CDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) #endif /* FEATURE_WLAN_SCAN_PNO */ -CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, +QDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, uint32_t *len) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_get_cfg_valid_channels(pMac, aValidChannels, len); sme_release_global_lock(&pMac->sme); } @@ -6979,15 +6979,15 @@ CDF_STATUS sme_get_cfg_valid_channels(tHalHandle hHal, uint8_t *aValidChannels, \param pMac - The handle returned by mac_open. \param pMsgBuf - MSG Buffer - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniChangeCountryCodeReq *pMsg; v_REGDOMAIN_t domainIdIoctl; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; static uint8_t default_country[CDS_COUNTRY_CODE_LEN + 1]; pMsg = (tAniChangeCountryCodeReq *) pMsgBuf; @@ -7000,15 +7000,15 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) pMac->roam.configParam.Is11dSupportEnabled = pMac->roam.configParam.Is11dSupportEnabledOriginal; - cdf_status = cds_read_default_country(default_country); + qdf_status = cds_read_default_country(default_country); /* read the country code and use it */ - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_copy(pMsg->countryCode, default_country, WNI_CFG_COUNTRY_CODE_LEN); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } /* @@ -7031,11 +7031,11 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) } if (pMac->roam.configParam.Is11dSupportEnabled) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Set Current Country code and Current Regulatory domain */ status = csr_set_country_code(pMac, pMsg->countryCode); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { /* Supplicant country code failed. So give 11D priority */ pMac->roam.configParam.Is11dSupportEnabled = pMac->roam.configParam.Is11dSupportEnabledOriginal; @@ -7053,7 +7053,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) (v_REGDOMAIN_t *) & domainIdIoctl, SOURCE_QUERY); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId %d"), domainIdIoctl); return status; } else if (REGDOMAIN_WORLD == domainIdIoctl) { @@ -7066,7 +7066,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) status = wma_set_reg_domain(pMac, domainIdIoctl); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to set regId %d"), domainIdIoctl); return status; } else { @@ -7089,7 +7089,7 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) pDevContext); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7104,11 +7104,11 @@ CDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) * * Return: status of operation */ -CDF_STATUS +QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; v_REGDOMAIN_t reg_domain_id = 0; bool is_11d_country = false; bool supplicant_priority = @@ -7147,7 +7147,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, (v_REGDOMAIN_t *) ®_domain_id, SOURCE_11D); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* if Supplicant country code has priority, disable 11d */ @@ -7164,7 +7164,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, /* set to default domain ID */ mac_ctx->scan.domainIdDefault = mac_ctx->scan.domainIdCurrent; } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("fail to set regId %d"), reg_domain_id); return status; @@ -7185,7 +7185,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, /* get the channels based on new cc */ status = csr_get_channel_and_power_list(mac_ctx); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("fail to get Channels")); return status; } @@ -7203,7 +7203,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, mac_ctx->scan.curScanType = eSIR_ACTIVE_SCAN; sme_disconnect_connected_sessions(mac_ctx); sms_log(mac_ctx, LOG1, FL(" returned")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static bool @@ -7260,7 +7260,7 @@ void sme_disconnect_connected_sessions(tpAniSirGlobal mac_ctx) } #ifdef WLAN_FEATURE_PACKET_FILTERING -CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpSirRcvFltMcAddrList pMulticastAddrs) { tpSirRcvFltMcAddrList request_buf; @@ -7285,7 +7285,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: Unable to find the session Id: %d", __func__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); @@ -7294,7 +7294,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, "%s: Not able to " "allocate memory for 8023 Multicast List request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!csr_is_conn_state_connected_infra(pMac, sessionId)) { @@ -7302,7 +7302,7 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, "%s: Ignoring the " "indication as we are not connected", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(request_buf, pMulticastAddrs, @@ -7315,19 +7315,19 @@ CDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, msg.type = WMA_8023_MULTICAST_LIST_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "post WMA_8023_MULTICAST_LIST message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tpSirRcvPktFilterCfgType pRcvPktFilterCfg, uint8_t sessionId) { @@ -7351,14 +7351,14 @@ CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, "%s: Not able to " "allocate memory for Receive Filter Set Filter request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_copy_macaddr(&pRcvPktFilterCfg->self_macaddr, @@ -7411,19 +7411,19 @@ CDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, +QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpSirRcvFltPktClearParam pRcvFltPktClearParam, uint8_t sessionId) { @@ -7438,7 +7438,7 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); @@ -7446,7 +7446,7 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " "Clear Filter request", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pRcvFltPktClearParam->self_macaddr, @@ -7460,16 +7460,16 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, msg.type = WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_PACKET_FILTERING */ @@ -7488,12 +7488,12 @@ CDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, -------------------------------------------------------------------------------*/ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; bool valid = false; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { valid = csr_roam_is_channel_valid(pMac, channel); @@ -7509,15 +7509,15 @@ bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel) \param hHal \param sessionId - Session Identifier \eBand band value to be configured - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) +QDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_set_band(hHal, sessionId, eBand); sme_release_global_lock(&pMac->sme); } @@ -7529,15 +7529,15 @@ CDF_STATUS sme_set_freq_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) \brief Used to get the current band settings. \param hHal \pBand pointer to hold band value - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) +QDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { *pBand = csr_get_current_band(hHal); sme_release_global_lock(&pMac->sme); } @@ -7552,10 +7552,10 @@ CDF_STATUS sme_get_freq_band(tHalHandle hHal, eCsrBand *pBand) \param band \param power to set in dB - \- return CDF_STATUS + \- return QDF_STATUS ----------------------------------------------------------------------------*/ -CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) +QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) { cds_msg_t msg; tpMaxTxPowerPerBandParams pMaxTxPowerPerBandParams = NULL; @@ -7566,7 +7566,7 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMaxTxPowerPerBandParams->power = dB; @@ -7576,15 +7576,15 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) msg.reserved = 0; msg.bodyptr = pMaxTxPowerPerBandParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); cdf_mem_free(pMaxTxPowerPerBandParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7598,10 +7598,10 @@ CDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) \param pBssid BSSID to set the power cap for \param pBssid pSelfMacAddress self MAC Address \param pBssid power to set in dB - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, struct cdf_mac_addr pSelfMacAddress, int8_t dB) { cds_msg_t msg; @@ -7614,7 +7614,7 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pMaxTxParams->bssId, &pBssid); @@ -7625,15 +7625,15 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, msg.reserved = 0; msg.bodyptr = pMaxTxParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA", __func__); cdf_mem_free(pMaxTxParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7643,10 +7643,10 @@ CDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, \brief Set the customer Mac Address. \param customMacAddr customer MAC Address - \- return CDF_STATUS + \- return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) +QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) { cds_msg_t msg; tSirMacAddr *pBaseMacAddr; @@ -7655,7 +7655,7 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) if (NULL == pBaseMacAddr) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(*pBaseMacAddr, customMacAddr, sizeof(tSirMacAddr)); @@ -7664,15 +7664,15 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) msg.reserved = 0; msg.bodyptr = pBaseMacAddr; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); cdf_mem_free(pBaseMacAddr); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* ---------------------------------------------------------------------------- @@ -7683,9 +7683,9 @@ CDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) \pBSSId BSSID \dev_mode dev_mode such as station, P2PGO, SAP \param dBm power to set - \- return CDF_STATUS + \- return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, struct cdf_mac_addr pBSSId, enum tCDF_ADAPTER_MODE dev_mode, int dBm) { @@ -7700,7 +7700,7 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, if ((int)power != dBm) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: error, invalid power = %d", __func__, dBm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); @@ -7708,7 +7708,7 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&pTxParams->bssId, &pBSSId); @@ -7718,15 +7718,15 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, msg.reserved = 0; msg.bodyptr = pTxParams; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); cdf_mem_free(pTxParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -7739,17 +7739,17 @@ CDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, \param hHal \param sessionId \param ssidHidden 0 - Broadcast SSID, 1 - Disable broadcast SSID - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) +QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint16_t len; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { tpSirUpdateParams pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -7757,7 +7757,7 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->sessionActive) @@ -7767,7 +7767,7 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) len = sizeof(tSirUpdateParams); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pMsg, sizeof(tSirUpdateParams), 0); pMsg->messageType = eWNI_SME_HIDE_SSID_REQ; @@ -7789,12 +7789,12 @@ CDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) \param hHal - The handle returned by mac_open. \param newTMLevel - new Thermal Mitigation Level \param tmMode - Thermal Mitigation handle mode, default 0 - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode) +QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMode) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tAniSetTmLevelReq *setTmLevelReq = NULL; @@ -7802,7 +7802,7 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { setTmLevelReq = (tAniSetTmLevelReq *) cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); @@ -7811,7 +7811,7 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod "%s: Not able to allocate memory for sme_set_tm_level", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } setTmLevelReq->tmMode = tmMode; @@ -7820,12 +7820,12 @@ CDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod /* serialize the req through MC thread */ cds_message.bodyptr = setTmLevelReq; cds_message.type = WMA_SET_TM_LEVEL_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); cdf_mem_free(setTmLevelReq); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -7888,15 +7888,15 @@ void sme_reset_power_values_for5_g(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) +QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamPrefer5GHz is changed from %d to %d", __func__, pMac->roam.configParam.nRoamPrefer5GHz, @@ -7917,15 +7917,15 @@ CDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) \param nRoamIntraBand Enable/Disable Intra band roaming \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) +QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamIntraBand is changed from %d to %d", __func__, pMac->roam.configParam.nRoamIntraBand, @@ -7947,17 +7947,17 @@ CDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) \param nProbes number of probe requests to be sent out \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, const uint8_t nProbes) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanNProbes is changed from %d to %d", __func__, pMac->roam.configParam.nProbes, nProbes); @@ -7984,19 +7984,19 @@ CDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, If false then command is not sent to firmware \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nRoamScanHomeAwayTime, const bool bSendOffloadCmd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHomeAwayTime is changed from %d to %d", __func__, @@ -8025,10 +8025,10 @@ CDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, * * Return: success if msg is sent else return failure */ -CDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, +QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); uint8_t channel_state; @@ -8038,12 +8038,12 @@ CDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, if (CHANNEL_STATE_DISABLE == channel_state) { sms_log(mac_ctx, LOGE, FL(" Invalid channel %d "), channel); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* update the channel list to the firmware */ status = csr_send_ext_change_channel(mac_ctx, channel, session_id); @@ -8104,14 +8104,14 @@ uint16_t sme_get_roam_scan_home_away_time(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, uint8_t RoamRssiDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s", RoamRssiDiff, @@ -8138,22 +8138,22 @@ CDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, isFastTransitionEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update isFastTransitionEnabled config + \return QDF_STATUS_SUCCESS - SME update isFastTransitionEnabled config successfully. Other status means SME is failed to update isFastTransitionEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, +QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, bool isFastTransitionEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: FastTransitionEnabled is changed from %d to %d", __func__, @@ -8175,18 +8175,18 @@ CDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, \param hHal - HAL handle for device \param isWESModeEnabled - WES mode \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update isWESModeEnabled config successfully. + \return QDF_STATUS_SUCCESS - SME update isWESModeEnabled config successfully. Other status means SME is failed to update isWESModeEnabled. -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, +QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s", isWESModeEnabled, @@ -8210,19 +8210,19 @@ CDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, any value other than 0 is treated as invalid value \param hHal - HAL handle for device \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME failure to update -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, bool roamScanControl) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s", roamScanControl, @@ -8255,12 +8255,12 @@ CDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update isFastRoamIniFeatureEnabled config + \return QDF_STATUS_SUCCESS - SME update isFastRoamIniFeatureEnabled config successfully. Other status means SME is failed to update isFastRoamIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled +QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled (tHalHandle hHal, uint8_t sessionId, const bool isFastRoamIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -8272,7 +8272,7 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, isFastRoamIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, @@ -8284,7 +8284,7 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled csr_neighbor_roam_update_fast_roaming_enabled(pMac, sessionId, isFastRoamIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -8294,18 +8294,18 @@ CDF_STATUS sme_update_is_fast_roam_ini_feature_enabled isMAWCIniFeatureEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update MAWCEnabled config successfully. + \return QDF_STATUS_SUCCESS - SME update MAWCEnabled config successfully. Other status means SME is failed to update MAWCEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, +QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, const bool MAWCEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MAWCEnabled is changed from %d to %d", __func__, pMac->roam.configParam.MAWCEnabled, MAWCEnabled); @@ -8322,17 +8322,17 @@ CDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, This is a synchronous call \param hHal - The handle returned by mac_open \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS on success + \return QDF_STATUS_SUCCESS on success Other status on failure \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) +QDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_STOP, reason); sme_release_global_lock(&pMac->sme); @@ -8346,17 +8346,17 @@ CDF_STATUS sme_stop_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) This is a synchronous call \param hHal - The handle returned by mac_open \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS on success + \return QDF_STATUS_SUCCESS on success Other status on failure \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) +QDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_START, reason); sme_release_global_lock(&pMac->sme); @@ -8370,21 +8370,21 @@ CDF_STATUS sme_start_roaming(tHalHandle hHal, uint8_t sessionId, uint8_t reason) Concurrent session exists This is a synchronuous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS + \return QDF_STATUS_SUCCESS Other status means SME is failed \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, +QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, bool bFastRoamInConIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->roam.configParam.bFastRoamInConIniFeatureEnabled = bFastRoamInConIniFeatureEnabled; if (0 == pMac->roam.configParam.isRoamOffloadScanEnabled) { @@ -8406,12 +8406,12 @@ CDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier \param isEseIniFeatureEnabled - flag to enable/disable - \return CDF_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config + \return QDF_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config successfully. Other status means SME is failed to update isEseIniFeatureEnabled. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_is_ese_feature_enabled +QDF_STATUS sme_update_is_ese_feature_enabled (tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -8422,7 +8422,7 @@ CDF_STATUS sme_update_is_ese_feature_enabled __func__, pMac->roam.configParam.isEseIniFeatureEnabled, isEseIniFeatureEnabled); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, @@ -8441,7 +8441,7 @@ CDF_STATUS sme_update_is_ese_feature_enabled ROAM_SCAN_OFFLOAD_UPDATE_CFG, REASON_ESE_INI_CFG_CHANGED); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_ESE */ @@ -8452,20 +8452,20 @@ CDF_STATUS sme_update_is_ese_feature_enabled fEnableFwRssiMonitoring. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update fEnableFwRssiMonitoring. + \return QDF_STATUS_SUCCESS - SME update fEnableFwRssiMonitoring. config successfully. Other status means SME is failed to update fEnableFwRssiMonitoring. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, +QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring) { - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, - fEnableFwRssiMonitoring) == CDF_STATUS_E_FAILURE) { - cdf_ret_status = CDF_STATUS_E_FAILURE; + fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { + cdf_ret_status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } @@ -8481,24 +8481,24 @@ CDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, \param hHal - HAL handle for device \param sessionId - Session Identifier \param nOpportunisticThresholdDiff - Opportunistic Scan threshold diff - \return CDF_STATUS_SUCCESS - SME update nOpportunisticThresholdDiff config + \return QDF_STATUS_SUCCESS - SME update nOpportunisticThresholdDiff config successfully. else SME is failed to update nOpportunisticThresholdDiff. -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nOpportunisticThresholdDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_opportunistic_scan_threshold_diff(pMac, sessionId, nOpportunisticThresholdDiff); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" @@ -8540,22 +8540,22 @@ uint8_t sme_get_roam_opportunistic_scan_threshold_diff(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamRescanRssiDiff - roam rescan rssi diff - \return CDF_STATUS_SUCCESS - SME update nRoamRescanRssiDiff config + \return QDF_STATUS_SUCCESS - SME update nRoamRescanRssiDiff config successfully. else SME is failed to update nRoamRescanRssiDiff. -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, +QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamRescanRssiDiff) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId, nRoamRescanRssiDiff); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" @@ -8595,22 +8595,22 @@ uint8_t sme_get_roam_rescan_rssi_diff(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBmissFirstBcnt - Roam first bmiss count - \return CDF_STATUS_SUCCESS - SME update nRoamBmissFirstBcnt + \return QDF_STATUS_SUCCESS - SME update nRoamBmissFirstBcnt successfully. else SME is failed to update nRoamBmissFirstBcnt -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFirstBcnt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId, nRoamBmissFirstBcnt); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss first beacon count to %d" @@ -8648,22 +8648,22 @@ uint8_t sme_get_roam_bmiss_first_bcnt(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBmissFinalBcnt - Roam final bmiss count - \return CDF_STATUS_SUCCESS - SME update nRoamBmissFinalBcnt + \return QDF_STATUS_SUCCESS - SME update nRoamBmissFinalBcnt successfully. else SME is failed to update nRoamBmissFinalBcnt -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, +QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBmissFinalBcnt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId, nRoamBmissFinalBcnt); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" @@ -8703,22 +8703,22 @@ uint8_t sme_get_roam_bmiss_final_bcnt(tHalHandle hHal) \param hHal - HAL handle for device \param sessionId - Session Identifier \param nRoamBeaconRssiWeight - Roam beacon rssi weight - \return CDF_STATUS_SUCCESS - SME update nRoamBeaconRssiWeight config + \return QDF_STATUS_SUCCESS - SME update nRoamBeaconRssiWeight config successfully. else SME is failed to update nRoamBeaconRssiWeight -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, +QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, uint8_t sessionId, const uint8_t nRoamBeaconRssiWeight) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId, nRoamBeaconRssiWeight); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" @@ -8756,20 +8756,20 @@ uint8_t sme_get_roam_beacon_rssi_weight(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_lookup_rssi_threshold +QDF_STATUS sme_set_neighbor_lookup_rssi_threshold (tHalHandle hHal, uint8_t sessionId, uint8_t neighborLookupRssiThreshold) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId, neighborLookupRssiThreshold); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s", neighborLookupRssiThreshold, @@ -8794,18 +8794,18 @@ CDF_STATUS sme_set_neighbor_lookup_rssi_threshold \param hal - The handle returned by macOpen. \param session_id - Session Identifier \param delay_before_vdev_stop - value to be set - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, +QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, uint8_t session_id, uint8_t delay_before_vdev_stop) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR param delay_before_vdev_stop changed from %d to %d"), @@ -8826,7 +8826,7 @@ CDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, rssi threshold This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ @@ -8843,20 +8843,20 @@ uint8_t sme_get_neighbor_lookup_rssi_threshold(tHalHandle hHal) This is a synchronous call \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_refresh_period +QDF_STATUS sme_set_neighbor_scan_refresh_period (tHalHandle hHal, uint8_t sessionId, uint16_t neighborScanResultsRefreshPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -8891,19 +8891,19 @@ CDF_STATUS sme_set_neighbor_scan_refresh_period gRoamScanOffloadEnabled. This is a synchronous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, bool nRoamScanOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("gRoamScanOffloadEnabled is changed from %d to %d"), @@ -8936,7 +8936,7 @@ uint16_t sme_get_neighbor_scan_refresh_period(tHalHandle hHal) \brief sme_get_empty_scan_refresh_period() - get empty scan refresh period This is a synchronuous call \param hHal - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS - SME update config successful. + \return QDF_STATUS_SUCCESS - SME update config successful. Other status means SME is failed to update \sa --------------------------------------------------------------------------*/ @@ -8960,16 +8960,16 @@ uint16_t sme_get_empty_scan_refresh_period(tHalHandle hHal) \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t sessionId, uint16_t nEmptyScanRefreshPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9008,16 +9008,16 @@ CDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session \param sessionId - Session Identifier \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, +QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, const uint16_t nNeighborScanMinChanTime, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s", nNeighborScanMinChanTime, @@ -9050,17 +9050,17 @@ CDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, \param nNeighborScanMinChanTime - Channel maximum dwell time \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanMaxChanTime) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9234,16 +9234,16 @@ uint16_t sme_get_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionId) \param nNeighborScanPeriod - neighbor scan period \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, const uint16_t nNeighborScanPeriod) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *pNeighborRoamConfig = NULL; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9311,14 +9311,14 @@ uint8_t sme_get_roam_rssi_diff(tHalHandle hHal) * This routine is called to Change roam scan channel list. * This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; uint8_t oldChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN * 2] = { 0 }; @@ -9328,7 +9328,7 @@ CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (pMac->roam.configParam.isRoamOffloadScanEnabled) csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_UPDATE_CFG, @@ -9388,15 +9388,15 @@ CDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, * This routine is called to set ese roam scan channel list. * This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; tpCsrChannelInfo curchnl_list_info @@ -9406,7 +9406,7 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t i = 0, j = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (pMac->roam.configParam.isRoamOffloadScanEnabled) csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_UPDATE_CFG, @@ -9423,7 +9423,7 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, status = csr_create_roam_scan_channel_list(pMac, sessionId, pChannelList, numChannels, csr_get_current_band(hHal)); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (NULL != curchnl_list_info->ChannelList) { j = 0; for (i = 0; i < curchnl_list_info->numOfChannels; i++) { @@ -9455,9 +9455,9 @@ CDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, * * To get roam scan channel list This is a synchronous call * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, +QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, uint8_t *pChannelList, uint8_t *pNumChannels, uint8_t sessionId) { @@ -9466,10 +9466,10 @@ CDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, @@ -9583,13 +9583,13 @@ uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue) \param tdlsLinkEstablishParams - TDLS Peer Link Establishment Parameters \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, +QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * tdlsLinkEstablishParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, @@ -9598,7 +9598,7 @@ CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, tdlsLinkEstablishParams->isOffChannelSupported)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_send_link_establish_params(hHal, sessionId, peerMac, tdlsLinkEstablishParams); sme_release_global_lock(&pMac->sme); @@ -9620,14 +9620,14 @@ CDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, \param responder - Tdls request type \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, uint8_t frame_type, uint8_t dialog, uint16_t statusCode, uint32_t peerCapability, uint8_t *buf, uint8_t len, uint8_t responder) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrTdlsSendMgmt sendTdlsReq = { {0} }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -9635,7 +9635,7 @@ CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(sendTdlsReq.peerMac, peerMac, sizeof(tSirMacAddr)); sendTdlsReq.frameType = frame_type; sendTdlsReq.buf = buf; @@ -9662,23 +9662,23 @@ CDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, \param staParams - Peer Station Parameters \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pstaParams) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s :pstaParams is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, pstaParams->capability)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_change_peer_sta(hHal, sessionId, peerMac, pstaParams); @@ -9696,17 +9696,17 @@ CDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \param peerMac - peer's Mac Adress. \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_add_peer_sta(hHal, sessionId, peerMac); sme_release_global_lock(&pMac->sme); @@ -9723,17 +9723,17 @@ CDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \param peerMac - peer's Mac Adress. \- return CDF_STATUS_SUCCES -------------------------------------------------------------------------*/ -CDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_tdls_del_peer_sta(hHal, sessionId, peerMac); sme_release_global_lock(&pMac->sme); @@ -9773,13 +9773,13 @@ void sme_set_tdls_power_save_prohibited(tHalHandle hHal, uint32_t sessionId, useSmeLock - Need to acquire SME Global Lock before state update or not - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, +QDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, bool useSmeLock) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = NULL; cds_msg_t cds_message; @@ -9787,19 +9787,19 @@ CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, if (useSmeLock) { pMac = PMAC_STRUCT(hHal); if (NULL == pMac) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) return status; } /* serialize the req through MC thread */ cds_message.bodyptr = psmeTdlsParams; cds_message.type = WMA_UPDATE_FW_TDLS_STATE; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; /* release the lock if it was acquired */ if (useSmeLock) @@ -9815,13 +9815,13 @@ CDF_STATUS sme_update_fw_tdls_state(tHalHandle hHal, void *psmeTdlsParams, * * SME will send message to WMA to set TDLS Peer state in f/w * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, +QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, tSmeTdlsPeerStateParams *peerStateParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tTdlsPeerStateParams *pTdlsPeerStateParams = NULL; tTdlsPeerCapParams *peer_cap = NULL; @@ -9831,14 +9831,14 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, uint8_t i; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pTdlsPeerStateParams, sizeof(*pTdlsPeerStateParams)); @@ -9877,7 +9877,7 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, peerStateParams->peerState); cdf_mem_free(pTdlsPeerStateParams); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } peer_cap = &(pTdlsPeerStateParams->peerCap); peer_cap->isPeerResponder = @@ -9931,10 +9931,10 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, cds_message.reserved = 0; cds_message.bodyptr = pTdlsPeerStateParams; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cdf_mem_free(pTdlsPeerStateParams); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); return status; @@ -9947,13 +9947,13 @@ CDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, * * API to set tdls channel switch parameters. * - * Return: CDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise + * Return: QDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise */ -CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, +QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, sme_tdls_chan_switch_params *ch_switch_params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tdls_chan_switch_params *chan_switch_params = NULL; cds_msg_t cds_message; @@ -9962,14 +9962,14 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, ch_switch_params->tdls_off_channel)); status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) return status; chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(chan_switch_params, sizeof(*chan_switch_params)); @@ -9988,7 +9988,7 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, ch_switch_params->tdls_off_ch_mode); cdf_mem_free(chan_switch_params); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&chan_switch_params->peer_mac_addr, @@ -10010,39 +10010,39 @@ CDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, cds_message.reserved = 0; cds_message.bodyptr = chan_switch_params; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), - cdf_status); + qdf_status); cdf_mem_free(chan_switch_params); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; } #endif /* FEATURE_WLAN_TDLS */ -CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, +QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void *plsContext, void (*pCallbackfn)(tSirLinkSpeedInfo *indParam, void *pContext)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pLinkSpeedIndCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pLinkSpeedCbContext = plsContext; pMac->sme.pLinkSpeedIndCb = pCallbackfn; @@ -10050,11 +10050,11 @@ CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, /* serialize the req through MC thread */ cds_message.bodyptr = lsReq; cds_message.type = WMA_GET_LINK_SPEED; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Link Speed msg fail", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -10068,10 +10068,10 @@ CDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "SSR level is changed %d", enableSSR); /* not serializing this messsage, as this is only going @@ -10083,23 +10083,23 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) return; } -CDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, +QDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, uint8_t ch_cnt) { uint8_t i; for (i = 0; i < ch_cnt; i++) { - if (CDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, + if (QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, (start_ch + i*4))) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, chan_params_t *ch_params) { uint8_t start_ch = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (channel >= 36 && channel <= 64) { ch_params->center_freq_seg0 = 50; @@ -10114,7 +10114,7 @@ void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, if (ch_params->ch_width == CH_WIDTH_160MHZ) status = sme_check_ch_in_band(mac_ctx, start_ch, 8); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ch_params->ch_width = CH_WIDTH_80MHZ; } @@ -10122,7 +10122,7 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, chan_params_t *ch_params) { uint8_t start_ch = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (channel >= 36 && channel <= 48) { ch_params->center_freq_seg0 = 42; @@ -10149,7 +10149,7 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, if (ch_params->ch_width == CH_WIDTH_80MHZ) status = sme_check_ch_in_band(mac_ctx, start_ch, 4); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) ch_params->ch_width = CH_WIDTH_40MHZ; } @@ -10191,7 +10191,7 @@ void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, /* * SME API to determine the channel bonding mode */ -CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, +QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); @@ -10199,7 +10199,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) || ch_params->ch_width == CH_WIDTH_20MHZ || - CDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { + QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel/phymode config: CB Mode disabled", __func__); @@ -10211,7 +10211,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, else mac_ctx->roam.configParam.channelBondingMode5GHz = PHY_SINGLE_CHANNEL_CENTERED; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } sms_log(mac_ctx, LOGW, "%s: channel - %d, vht channel width - %d", @@ -10272,7 +10272,7 @@ CDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, mac_ctx->roam.configParam.channelBondingMode24GHz = ch_params->sec_ch_offset; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*convert the ini value to the ENUM used in csr and MAC for CB state*/ @@ -10304,20 +10304,20 @@ void sme_set_curr_device_mode(tHalHandle hHal, \param sessionId - Session Identifier \param pHandoffInfo - info provided by HDD with the handoff request (namely: BSSID, channel etc.) - \return CDF_STATUS_SUCCESS - SME passed the request to CSR successfully. + \return QDF_STATUS_SUCCESS - SME passed the request to CSR successfully. Other status means SME is failed to send the request. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_handoff_request(tHalHandle hHal, +QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: invoked", __func__); status = csr_handoff_request(pMac, sessionId, pHandoffInfo); @@ -10334,25 +10334,25 @@ CDF_STATUS sme_handoff_request(tHalHandle hHal, \param hal - The handle returned by macOpen. \param session_id - Session Identifier \param request - Pointer to the offload request. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, struct sir_ipa_offload_enable_disable *request) { tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct sir_ipa_offload_enable_disable *request_buf; cds_msg_t msg; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ IPA_OFFLOAD_ENABLE_DISABLE")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } request_buf->offload_type = request->offload_type; @@ -10362,20 +10362,20 @@ CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, msg.type = WMA_IPA_OFFLOAD_ENABLE_DISABLE; msg.reserved = 0; msg.bodyptr = request_buf; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); cdf_mem_free(request_buf); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* IPA_OFFLOAD */ @@ -10383,13 +10383,13 @@ CDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, * SME API to check if there is any infra station or * P2P client is connected */ -CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) +QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (csr_is_infra_connected(pMac)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_LPHB @@ -10401,13 +10401,13 @@ CDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal) \param pCallbackfn - LPHB timeout notification callback function pointer \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_lphb_config_req +QDF_STATUS sme_lphb_config_req (tHalHandle hHal, tSirLPHBReq *lphdReq, - void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd *indParam) + void (*pCallbackfn)(void *pHddCtx, tSirLPHBInd * indParam) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; @@ -10415,14 +10415,14 @@ CDF_STATUS sme_lphb_config_req TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, NO_SESSION, lphdReq->cmd)); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) && (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pLphbIndCb = pCallbackfn; } @@ -10430,11 +10430,11 @@ CDF_STATUS sme_lphb_config_req /* serialize the req through MC thread */ cds_message.bodyptr = lphdReq; cds_message.type = WMA_LPHB_CONF_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Config LPHB MSG fail", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -10472,13 +10472,13 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, * @hal: global hal handle * @addPeriodicTxPtrnParams: request message * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS sme_add_periodic_tx_ptrn(tHalHandle hal, struct sSirAddPeriodicTxPtrn *addPeriodicTxPtrnParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sSirAddPeriodicTxPtrn *req_msg; cds_msg_t msg; @@ -10488,13 +10488,13 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *addPeriodicTxPtrnParams; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -10506,7 +10506,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, msg.bodyptr = req_msg; msg.type = WMA_ADD_PERIODIC_TX_PTRN_IND; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -10521,13 +10521,13 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, * @hal: global hal handle * @delPeriodicTxPtrnParams: request message * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS sme_del_periodic_tx_ptrn(tHalHandle hal, struct sSirDelPeriodicTxPtrn *delPeriodicTxPtrnParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sSirDelPeriodicTxPtrn *req_msg; cds_msg_t msg; @@ -10537,13 +10537,13 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *delPeriodicTxPtrnParams; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -10555,7 +10555,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, msg.bodyptr = req_msg; msg.type = WMA_DEL_PERIODIC_TX_PTRN_IND; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -10664,20 +10664,20 @@ static struct sir_ocb_config *sme_copy_sir_ocb_config( * @callback: the callback to hdd * @config: the OCB configuration * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_config *config) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_config *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* @@ -10685,14 +10685,14 @@ CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, * exists */ if (pMac->sme.ocb_set_config_callback) { - status = CDF_STATUS_E_BUSY; + status = QDF_STATUS_E_BUSY; goto end; } msg_body = sme_copy_sir_ocb_config(config); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -10704,7 +10704,7 @@ CDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, pMac->sme.ocb_set_config_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; @@ -10724,25 +10724,25 @@ end: * @hHal: reference to the HAL * @utc: the UTC time struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) +QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_utc *sme_utc; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *sme_utc = *utc; @@ -10751,7 +10751,7 @@ CDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) msg.reserved = 0; msg.bodyptr = sme_utc; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); cdf_mem_free(utc); @@ -10769,12 +10769,12 @@ end: * @hHal: reference to the HAL * @timing_advert: the timing advertisement struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; void *buf; @@ -10782,7 +10782,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + @@ -10790,7 +10790,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, if (!buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for start TA")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -10804,7 +10804,7 @@ CDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = buf; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; @@ -10821,26 +10821,26 @@ end: * @hHal: reference to the HAL * @timing_advert: the timing advertisement struct * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, +QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, struct sir_ocb_timing_advert *timing_advert) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_timing_advert *sme_timing_advert; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *sme_timing_advert = *timing_advert; @@ -10849,7 +10849,7 @@ CDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = sme_timing_advert; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; @@ -10891,26 +10891,26 @@ int sme_ocb_gen_timing_advert_frame(tHalHandle hal_handle, * @callback: the callback to hdd * @request: the TSF timer request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, +QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, ocb_callback callback, struct sir_ocb_get_tsf_timer *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_ocb_get_tsf_timer *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ msg_body = cdf_mem_malloc(sizeof(*msg_body)); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *msg_body = *request; @@ -10924,7 +10924,7 @@ CDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, /* Post the message to WDA */ status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; @@ -10946,27 +10946,27 @@ end: * @callback: the callback to hdd * @request: the get DCC stats request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_get_stats *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_get_stats *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ msg_body = cdf_mem_malloc(sizeof(*msg_body) + request->request_array_len); if (!msg_body) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } *msg_body = *request; @@ -10982,7 +10982,7 @@ CDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, pMac->sme.dcc_get_stats_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; @@ -11003,26 +11003,26 @@ end: * @vdev_id: vdev id for OCB interface * @dcc_stats_bitmap: the entries in the stats to clear * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, uint32_t dcc_stats_bitmap) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_clear_stats *request; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -11034,7 +11034,7 @@ CDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, msg.bodyptr = request; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); cdf_mem_free(request); @@ -11054,20 +11054,20 @@ end: * @callback: the callback to hdd * @request: the update DCC request * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, +QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, ocb_callback callback, struct sir_dcc_update_ndl *request) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg = {0}; struct sir_dcc_update_ndl *msg_body; /* Lock the SME structure */ status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; /* Allocate memory for the WMI request, and copy the parameter */ @@ -11077,7 +11077,7 @@ CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, if (!msg_body) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to allocate memory")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -11100,7 +11100,7 @@ CDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, pMac->sme.dcc_update_ndl_context = context; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; @@ -11122,13 +11122,13 @@ end: * @context: the context of the call * @callback: the callback to hdd * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE on failure + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on failure */ -CDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, +QDF_STATUS sme_register_for_dcc_stats_event(tHalHandle hHal, void *context, ocb_callback callback) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; status = sme_acquire_global_lock(&pMac->sme); pMac->sme.dcc_stats_event_callback = callback; @@ -11226,14 +11226,14 @@ void active_list_cmd_timeout_handle(void *userData) } } -CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) +QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) { cds_msg_t msg; tpSirModemPowerStateInd request_buf; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); @@ -11241,7 +11241,7 @@ CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } request_buf->param = value; @@ -11249,20 +11249,20 @@ CDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) msg.type = WMA_MODEM_POWER_STATE_IND; msg.reserved = 0; msg.bodyptr = request_buf; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_MODEM_POWER_STATE_IND message" " to WMA", __func__); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef QCA_HT_2040_COEX -CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, +QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, struct cdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type) @@ -11272,7 +11272,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); @@ -11280,7 +11280,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } switch (channel_type) { @@ -11296,7 +11296,7 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP mode", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pHtOpMode->staId = staId, @@ -11307,20 +11307,20 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, msg.type = WMA_UPDATE_OP_MODE; msg.reserved = 0; msg.bodyptr = pHtOpMode; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); cdf_mem_free(pHtOpMode); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Notifed FW about OP mode: %d for staId=%d", __func__, pHtOpMode->opMode, staId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -11331,15 +11331,15 @@ CDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, \param - \return CDF_STATUS SUCCESS + \return QDF_STATUS SUCCESS FAILURE or RESOURCES The API finished and failed. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, uint8_t channel_type, bool obssEnabled) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); ePhyChanBondState cbMode; @@ -11360,10 +11360,10 @@ CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Error!!! Invalid HT20/40 mode !", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_set_ht2040_mode(pMac, sessionId, cbMode, obssEnabled); sme_release_global_lock(&pMac->sme); @@ -11381,22 +11381,22 @@ CDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, \param cbMode new channel bonding mode which is to set - \return CDF_STATUS SUCCESS. + \return QDF_STATUS SUCCESS. -------------------------------------------------------------------------------*/ -CDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) +QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac->roam.configParam.channelBondingMode24GHz = phyCBMode; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -11405,7 +11405,7 @@ CDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) * This should be called only if powersave offload * is enabled */ -CDF_STATUS sme_set_idle_powersave_config(void *cds_context, +QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value) { void *wmaContext = cds_get_context(CDF_MODULE_ID_WMA); @@ -11414,20 +11414,20 @@ CDF_STATUS sme_set_idle_powersave_config(void *cds_context, if (NULL == wmaContext) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: wmaContext is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, " Idle Ps Set Value %d", value); pMac->imps_enabled = false; - if (CDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { + if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " Failed to Set Idle Ps Value %d", value); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (value) pMac->imps_enabled = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab) @@ -11469,7 +11469,7 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, return -EIO; } - if (CDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { + if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to set ht capability in target"); return -EIO; @@ -11500,20 +11500,20 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, \brief API to Update rate \param hHal - The handle returned by mac_open \param rateUpdateParams - Pointer to rate update params - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, +QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rateUpdateParams) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; cds_msg_t msg; tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Rate update struct alloc failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *rate_upd = *rateUpdateParams; @@ -11526,11 +11526,11 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, eHAL_TX_RATE_HT20 | eHAL_TX_RATE_SGI; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { msg.type = WMA_RATE_UPDATE_IND; msg.bodyptr = rate_upd; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able " @@ -11539,11 +11539,11 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, sme_release_global_lock(&pMac->sme); cdf_mem_free(rate_upd); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } return status; @@ -11558,20 +11558,20 @@ CDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, * * This routine will give you reg info * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, +QDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, uint32_t *regInfo1, uint32_t *regInfo2) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status; + QDF_STATUS status; uint8_t i; bool found = false; status = sme_acquire_global_lock(&pMac->sme); *regInfo1 = 0; *regInfo2 = 0; - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; for (i = 0; i < WNI_CFG_VALID_CHANNEL_LIST_LEN; i++) { @@ -11586,7 +11586,7 @@ CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, } } if (!found) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); return status; @@ -11598,18 +11598,18 @@ CDF_STATUS sme_get_reg_info(tHalHandle hHal, uint8_t chanId, \brief Used to plug in callback function for receiving auto shutdown evt \param hHal \param pCallbackfn : callback function pointer should be plugged in - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) +QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in Auto shutdown event callback", __func__); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (NULL != pCallbackfn) { pMac->sme.pAutoShutdownNotificationCb = pCallbackfn; } @@ -11626,23 +11626,23 @@ CDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) \param timer_val - The auto shutdown timer value to be set \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) +QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirAutoShutdownCmdParams *auto_sh_cmd; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { auto_sh_cmd = (tSirAutoShutdownCmdParams *) cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } auto_sh_cmd->timer_val = timer_val; @@ -11650,13 +11650,13 @@ CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) /* serialize the req through MC thread */ cds_message.bodyptr = auto_sh_cmd; cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); cdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Auto shutdown MSG", __func__); @@ -11675,19 +11675,19 @@ CDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) Notification come from FW. \param hHal \param pCallbackfn : callback function pointer should be plugged in - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_add_ch_avoid_callback +QDF_STATUS sme_add_ch_avoid_callback (tHalHandle hHal, void (*pCallbackfn)(void *pAdapter, void *indParam) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in CH AVOID CB", __func__); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (NULL != pCallbackfn) { pMac->sme.pChAvoidNotificationCb = pCallbackfn; } @@ -11704,23 +11704,23 @@ CDF_STATUS sme_add_ch_avoid_callback \param update_type - The udpate_type parameter of this request call \- return Configuration message posting status, SUCCESS or Fail -------------------------------------------------------------------------*/ -CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) +QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirChAvoidUpdateReq *cauReq; cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cauReq = (tSirChAvoidUpdateReq *) cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cauReq->reserved_param = 0; @@ -11728,14 +11728,14 @@ CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) /* serialize the req through MC thread */ cds_message.bodyptr = cauReq; cds_message.type = WMA_CH_AVOID_UPDATE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); cdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Ch Avoid Update MSG", __func__); @@ -11757,7 +11757,7 @@ CDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) * Return: Configuration message posting status, SUCCESS or Fail * */ -CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) +QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) { cds_msg_t msg; uint32_t *val; @@ -11767,7 +11767,7 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) if (NULL == val || NULL == mac_ptr) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *val = filter_type; @@ -11776,17 +11776,17 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) msg.reserved = 0; msg.bodyptr = val; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(val); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ptr->sme.miracast_value = filter_type; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -11799,7 +11799,7 @@ CDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) * Return: Configuration message posting status, SUCCESS or Fail * */ -CDF_STATUS sme_set_mas(uint32_t val) +QDF_STATUS sme_set_mas(uint32_t val) { cds_msg_t msg; uint32_t *ptr_val; @@ -11808,7 +11808,7 @@ CDF_STATUS sme_set_mas(uint32_t val) if (NULL == ptr_val) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *ptr_val = val; @@ -11817,15 +11817,15 @@ CDF_STATUS sme_set_mas(uint32_t val) msg.reserved = 0; msg.bodyptr = ptr_val; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(ptr_val); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -11837,17 +11837,17 @@ CDF_STATUS sme_set_mas(uint32_t val) * * API to Indicate Channel change to new target channel * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, +QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_channel_change_req(pMac, bssid, ch_params, profile); @@ -11859,12 +11859,12 @@ CDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, /* ------------------------------------------------------------------------- \fn sme_process_channel_change_resp \brief API to Indicate Channel change response message to SAP. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, +QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo proam_info = { 0 }; eCsrRoamResult roamResult; tpSwitchChannelParams pChnlParams = (tpSwitchChannelParams) pMsgBuf; @@ -11874,7 +11874,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, (tSirChanChangeResponse *) cdf_mem_malloc(sizeof(tSirChanChangeResponse)); if (NULL == proam_info.channelChangeRespEvent) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, "Channel Change Event Allocation Failed: %d\n", status); return status; @@ -11886,7 +11886,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, proam_info.channelChangeRespEvent->secondaryChannelOffset = pChnlParams->ch_width; - if (pChnlParams->status == CDF_STATUS_SUCCESS) { + if (pChnlParams->status == QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); @@ -11906,7 +11906,7 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, eCSR_ROAM_SET_CHANNEL_RSP, roamResult); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGE, "Invalid Channel Change Resp Message: %d\n", status); } @@ -11922,16 +11922,16 @@ CDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, \param hHal - The handle returned by mac_open \param sessionId - session ID \param dfsCacWaitStatus - CAC WAIT status flag - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_start_beacon_req(pMac, bssid, dfsCacWaitStatus); sme_release_global_lock(&pMac->sme); } @@ -11946,16 +11946,16 @@ CDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, * @csaIeReqd: CSA IE Request * @ch_params: channel information * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_send_chan_sw_ie_request(pMac, bssid, targetChannel, csaIeReqd, ch_params); sme_release_global_lock(&pMac->sme); @@ -11968,9 +11968,9 @@ CDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, \brief SME API to initialize the thermal mitigation parameters \param hHal \param thermalParam : thermal mitigation parameters - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam) +QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam) { t_thermal_mgmt *pWmaParam; cds_msg_t msg; @@ -11980,7 +11980,7 @@ CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam if (NULL == pWmaParam) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero((void *)pWmaParam, sizeof(t_thermal_mgmt)); @@ -12004,24 +12004,24 @@ CDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam pWmaParam->thermalLevels[3].maxTempThreshold = thermalParam.smeThermalLevels[3].smeMaxTempThreshold; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { msg.type = WMA_INIT_THERMAL_INFO_CMD; msg.bodyptr = pWmaParam; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!", __func__); cdf_mem_free(pWmaParam); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } cdf_mem_free(pWmaParam); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -12046,31 +12046,31 @@ void sme_add_set_thermal_level_callback(tHalHandle hal, * @hal: Handler to HAL * @level: Thermal mitigation level * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) +QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) { cds_msg_t msg; tpAniSirGlobal pMac = PMAC_STRUCT(hal); - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { cdf_mem_set(&msg, sizeof(msg), 0); msg.type = WMA_SET_THERMAL_LEVEL; msg.bodyval = level; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!", __func__); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* --------------------------------------------------------------------------- @@ -12078,12 +12078,12 @@ CDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) \brief SME API to set txpower limits \param hHal \param psmetx : power limits for 2g/5g - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) +QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirTxPowerLimit *tx_power_limit; @@ -12093,23 +12093,23 @@ CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *tx_power_limit = *psmetx; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cds_message.type = WMA_TX_POWER_LIMIT; cds_message.reserved = 0; cds_message.bodyptr = tx_power_limit; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_TX_POWER_LIMIT", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; cdf_mem_free(tx_power_limit); } sme_release_global_lock(&pMac->sme); @@ -12117,9 +12117,9 @@ CDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) return status; } -CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) +QDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->fEnableDebugLog = set_value; return status; @@ -12139,14 +12139,14 @@ CDF_STATUS sme_update_connect_debug(tHalHandle hHal, uint32_t set_value) disablefwd - bool value that indicate disable intrabss fwd disable - \return CDF_STATUS + \return QDF_STATUS --------------------------------------------------------------------------- */ -CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, bool disablefwd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - int status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + int status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t cds_message; tpDisableIntraBssFwd pSapDisableIntraFwd = NULL; @@ -12154,7 +12154,7 @@ CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, pSapDisableIntraFwd = cdf_mem_malloc(sizeof(tDisableIntraBssFwd)); if (NULL == pSapDisableIntraFwd) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! %s", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pSapDisableIntraFwd, sizeof(tDisableIntraBssFwd)); @@ -12163,13 +12163,13 @@ CDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, pSapDisableIntraFwd->disableintrabssfwd = disablefwd; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ cds_message.bodyptr = pSapDisableIntraFwd; cds_message.type = WMA_SET_SAP_INTRABSS_DIS; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + status = QDF_STATUS_E_FAILURE; cdf_mem_free(pSapDisableIntraFwd); } sme_release_global_lock(&pMac->sme); @@ -12205,9 +12205,9 @@ void sme_stats_ext_register_callback(tHalHandle hHal, StatsExtCallback callback) \param input - Stats Ext Request structure ptr - \return CDF_STATUS + \return QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) +QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) { cds_msg_t msg; tpStatsExtRequest data; @@ -12217,7 +12217,7 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) data = cdf_mem_malloc(data_len); if (data == NULL) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(data, data_len); @@ -12232,15 +12232,15 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA", __func__); cdf_mem_free(data); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /****************************************************************************** @@ -12252,16 +12252,16 @@ CDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) \param hHal - HAL handle for device \param pMsg - Message body passed from WMA; includes NAN header - \return CDF_STATUS + \return QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { sms_log(pMac, LOG2, "SME: entering %s", __func__); @@ -12285,19 +12285,19 @@ CDF_STATUS sme_stats_ext_event(tHalHandle hHal, void *pMsg) \param sessionId - Session Identifier \param allowDFSChannelRoam - DFS roaming scan mode 0 (disable), 1 (passive), 2 (active) - \return CDF_STATUS_SUCCESS - SME update DFS roaming scan config + \return QDF_STATUS_SUCCESS - SME update DFS roaming scan config successfully. Other status means SME failed to update DFS roaming scan config. \sa -------------------------------------------------------------------------*/ -CDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, uint8_t allowDFSChannelRoam) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set AllowDFSChannelRoam Mode to " "%d - old value is %d - roam state is %s", @@ -12341,14 +12341,14 @@ uint8_t sme_get_dfs_scan_mode(tHalHandle hHal) \param updateType - type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS sme_modify_add_ie(tHalHandle hHal, +QDF_STATUS sme_modify_add_ie(tHalHandle hHal, tSirModifyIE *pModifyIE, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_modify_add_ies(pMac, pModifyIE, updateType); sme_release_global_lock(&pMac->sme); } @@ -12363,14 +12363,14 @@ CDF_STATUS sme_modify_add_ie(tHalHandle hHal, \param updateType - type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS sme_update_add_ie(tHalHandle hHal, +QDF_STATUS sme_update_add_ie(tHalHandle hHal, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_update_add_ies(pMac, pUpdateIE, updateType); sme_release_global_lock(&pMac->sme); } @@ -12387,11 +12387,11 @@ CDF_STATUS sme_update_add_ie(tHalHandle hHal, bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool ret = false; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { ret = csr_neighbor_middle_of_roaming(hHal, sessionId); sme_release_global_lock(&pMac->sme); } @@ -12407,33 +12407,33 @@ bool sme_sta_in_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) * * This routine is called to update dscp mapping * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, +QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, sme_QosWmmUpType *dscpmapping, uint8_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t i, j, peSessionId; tCsrRoamSession *pCsrSession = NULL; tpPESession pSession = NULL; status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (pCsrSession == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session lookup fails for CSR session")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid session Id %u"), sessionId); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = pe_find_session_by_bssid(pMac, @@ -12444,14 +12444,14 @@ CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" Session lookup fails for BSSID")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pSession->QosMapSet.present) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("QOS Mapping IE not present")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (i = 0; i < SME_QOS_WMM_UP_MAX; i++) { for (j = pSession->QosMapSet.dscp_range[i][0]; @@ -12484,19 +12484,19 @@ CDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, \brief API to abort current roam scan cycle by roam scan offload module. \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) +QDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOGW, "entering function %s", __func__); if (pMac->roam.configParam.isRoamOffloadScanEnabled) { /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_ABORT_SCAN, REASON_ROAM_ABORT_ROAM_SCAN); @@ -12518,14 +12518,14 @@ CDF_STATUS sme_abort_roam_scan(tHalHandle hHal, uint8_t sessionId) * * SME API to fetch all valid channels filtered by band * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, +QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint8_t wifiBand, uint32_t *aValidChannels, uint8_t *pNumChannels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t chanList[WNI_CFG_VALID_CHANNEL_LIST_LEN] = { 0 }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t numChannels = 0; @@ -12535,18 +12535,18 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, if (!aValidChannels || !pNumChannels) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Output channel list/NumChannels is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if ((wifiBand < WIFI_BAND_UNSPECIFIED) || (wifiBand >= WIFI_BAND_MAX)) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Invalid wifiBand (%d)"), wifiBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } status = sme_get_cfg_valid_channels(hHal, &chanList[0], &totValidChannels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Fail to get valid channel list (err=%d)"), status); return status; @@ -12637,7 +12637,7 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, default: sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Unknown wifiBand (%d))"), wifiBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; break; } *pNumChannels = numChannels; @@ -12650,25 +12650,25 @@ CDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, \brief SME API to fetch extscan capabilities \param hHal \param pReq: extscan capabilities structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, +QDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, tSirGetExtScanCapabilitiesReqParams * pReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pReq; cds_message.type = WMA_EXTSCAN_GET_CAPABILITIES_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12680,24 +12680,24 @@ CDF_STATUS sme_ext_scan_get_capabilities(tHalHandle hHal, \brief SME API to issue extscan start \param hHal \param pStartCmd: extscan start structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_start(tHalHandle hHal, +QDF_STATUS sme_ext_scan_start(tHalHandle hHal, tSirWifiScanCmdReqParams *pStartCmd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pStartCmd; cds_message.type = WMA_EXTSCAN_START_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12709,23 +12709,23 @@ CDF_STATUS sme_ext_scan_start(tHalHandle hHal, \brief SME API to issue extscan stop \param hHal \param pStopReq: extscan stop structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq) +QDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pStopReq; cds_message.type = WMA_EXTSCAN_STOP_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } return status; @@ -12736,25 +12736,25 @@ CDF_STATUS sme_ext_scan_stop(tHalHandle hHal, tSirExtScanStopReqParams *pStopReq \brief SME API to set BSSID hotlist \param hHal \param pSetHotListReq: extscan set hotlist structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, tSirExtScanSetBssidHotListReqParams * pSetHotListReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pSetHotListReq; cds_message.type = WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12766,25 +12766,25 @@ CDF_STATUS sme_set_bss_hotlist(tHalHandle hHal, \brief SME API to reset BSSID hotlist \param hHal \param pSetHotListReq: extscan set hotlist structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, +QDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, tSirExtScanResetBssidHotlistReqParams * pResetReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pResetReq; cds_message.type = WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12796,25 +12796,25 @@ CDF_STATUS sme_reset_bss_hotlist(tHalHandle hHal, \brief SME API to set significant change \param hHal \param pSetSignificantChangeReq: extscan set significant change structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_significant_change(tHalHandle hHal, +QDF_STATUS sme_set_significant_change(tHalHandle hHal, tSirExtScanSetSigChangeReqParams * pSetSignificantChangeReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pSetSignificantChangeReq; cds_message.type = WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12826,25 +12826,25 @@ CDF_STATUS sme_set_significant_change(tHalHandle hHal, \brief SME API to reset significant change \param hHal \param pResetReq: extscan reset significant change structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_reset_significant_change(tHalHandle hHal, +QDF_STATUS sme_reset_significant_change(tHalHandle hHal, tSirExtScanResetSignificantChangeReqParams *pResetReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pResetReq; cds_message.type = WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12856,25 +12856,25 @@ CDF_STATUS sme_reset_significant_change(tHalHandle hHal, \brief SME API to get cached results \param hHal \param pCachedResultsReq: extscan get cached results structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_cached_results(tHalHandle hHal, +QDF_STATUS sme_get_cached_results(tHalHandle hHal, tSirExtScanGetCachedResultsReqParams * pCachedResultsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = pCachedResultsReq; cds_message.type = WMA_EXTSCAN_GET_CACHED_RESULTS_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } @@ -12891,10 +12891,10 @@ CDF_STATUS sme_get_cached_results(tHalHandle hHal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_set_epno_list(tHalHandle hal, +QDF_STATUS sme_set_epno_list(tHalHandle hal, struct wifi_epno_params *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_epno_params *req_msg; @@ -12906,7 +12906,7 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -12927,7 +12927,7 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, } status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -12939,12 +12939,12 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_EPNO_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -12960,10 +12960,10 @@ CDF_STATUS sme_set_epno_list(tHalHandle hal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_set_passpoint_list(tHalHandle hal, +QDF_STATUS sme_set_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_passpoint_req *req_msg; @@ -12975,7 +12975,7 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -12997,7 +12997,7 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, } status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13009,12 +13009,12 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_PASSPOINT_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -13027,10 +13027,10 @@ CDF_STATUS sme_set_passpoint_list(tHalHandle hal, * * Return: eHalStatus enumeration */ -CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, +QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct wifi_passpoint_req *req_msg; @@ -13039,7 +13039,7 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, sizeof(*req_msg)); @@ -13047,7 +13047,7 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, req_msg->session_id = input->session_id; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13059,12 +13059,12 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_RESET_PASSPOINT_LIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -13077,11 +13077,11 @@ CDF_STATUS sme_reset_passpoint_list(tHalHandle hal, * * Return: eHalStatus */ -CDF_STATUS +QDF_STATUS sme_set_ssid_hotlist(tHalHandle hal, struct sir_set_ssid_hotlist_request *request) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_set_ssid_hotlist_request *set_req; @@ -13089,41 +13089,41 @@ sme_set_ssid_hotlist(tHalHandle hal, set_req = cdf_mem_malloc(sizeof(*set_req)); if (!set_req) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *set_req = *request; status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Serialize the req through MC thread */ cds_message.bodyptr = set_req; cds_message.type = WMA_EXTSCAN_SET_SSID_HOTLIST_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); sme_release_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(set_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } else { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); cdf_mem_free(set_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } -CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, +QDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, void (*pExtScanIndCb)(void *, const uint16_t, void *)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->sme.pExtScanIndCb = pExtScanIndCb; sme_release_global_lock(&pMac->sme); } @@ -13138,13 +13138,13 @@ CDF_STATUS sme_ext_scan_register_callback(tHalHandle hHal, \brief SME API to clear Link Layer Statistics \param hHal \param pclearStatsReq: Link Layer clear stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, +QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, tSirLLStatsClearReq *pclearStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsClearReq *clear_stats_req; @@ -13163,29 +13163,29 @@ CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *clear_stats_req = *pclearStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = clear_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); cdf_mem_free(clear_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(clear_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13196,12 +13196,12 @@ CDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, \brief SME API to set the Link Layer Statistics \param hHal \param psetStatsReq: Link Layer set stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq) +QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsSetReq *set_stats_req; @@ -13219,29 +13219,29 @@ CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *set_stats_req = *psetStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = set_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); cdf_mem_free(set_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(set_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13252,12 +13252,12 @@ CDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq \brief SME API to get the Link Layer Statistics \param hHal \param pgetStatsReq: Link Layer get stats request params structure - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq) +QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLLStatsGetReq *get_stats_req; @@ -13275,23 +13275,23 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *get_stats_req = *pgetStatsReq; - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { /* Serialize the req through MC thread */ cds_message.bodyptr = get_stats_req; cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); cdf_mem_free(get_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -13299,7 +13299,7 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(get_stats_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -13311,17 +13311,17 @@ CDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq \param hHal \param callback_routine - HDD callback which needs to be invoked after getting status notification from FW - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_link_layer_stats_ind_cb +QDF_STATUS sme_set_link_layer_stats_ind_cb (tHalHandle hHal, void (*callback_routine)(void *callbackCtx, int indType, void *pRsp) ) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->sme.pLinkLayerStatsIndCallback = callback_routine; sme_release_global_lock(&pMac->sme); } else { @@ -13342,18 +13342,18 @@ CDF_STATUS sme_set_link_layer_stats_ind_cb * * This API is invoked by HDD to register its callback in SME * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pmac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&pmac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pmac->sme.fw_dump_callback = callback_routine; sme_release_global_lock(&pmac->sme); } else { @@ -13364,11 +13364,11 @@ CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, return status; } #else -CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, +QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, void (*callback_routine)(void *cb_context, struct fw_dump_rsp *rsp)) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -13379,16 +13379,16 @@ CDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, * * This API is invoked by HDD to unregister its callback in SME * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pmac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&pmac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { pmac->sme.fw_dump_callback = NULL; sme_release_global_lock(&pmac->sme); } else { @@ -13399,9 +13399,9 @@ CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) return status; } #else -CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) +QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -13411,19 +13411,19 @@ CDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) It is used at in the REG_DYNAMIC_VARIABLE macro definition of \param hHal - The handle returned by mac_open. \param nRoamOffloadEnabled - The bool to update with - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, bool nRoamOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isRoamOffloadEnabled, @@ -13443,20 +13443,20 @@ CDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, \param hHal - The handle returned by mac_open. \param sessionId - Session Identifier \param nRoamKeyMgmtOffloadEnabled - The bool to update with - \return CDF_STATUS_SUCCESS - SME update config successfully. + \return QDF_STATUS_SUCCESS - SME update config successfully. Other status means SME is failed to update. \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, +QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, uint8_t sessionId, bool nRoamKeyMgmtOffloadEnabled) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3: KeyMgmtOffloadEnabled changed to %d", @@ -13465,7 +13465,7 @@ CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, sessionId, nRoamKeyMgmtOffloadEnabled); } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } sme_release_global_lock(&pMac->sme); } @@ -13480,27 +13480,27 @@ CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, \param hHal \param temperature context \param pCallbackfn: callback fn with response (temperature) - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_get_temperature(tHalHandle hHal, +QDF_STATUS sme_get_temperature(tHalHandle hHal, void *tempContext, void (*pCallbackfn)(int temperature, void *pContext)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pGetTemperatureCb)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Indication Call back did not registered")); sme_release_global_lock(&pMac->sme); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (NULL != pCallbackfn) { pMac->sme.pTemperatureCbContext = tempContext; pMac->sme.pGetTemperatureCb = pCallbackfn; @@ -13508,11 +13508,11 @@ CDF_STATUS sme_get_temperature(tHalHandle hHal, /* serialize the req through MC thread */ cds_message.bodyptr = NULL; cds_message.type = WMA_GET_TEMPERATURE_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Post Get Temperature msg fail")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -13524,25 +13524,25 @@ CDF_STATUS sme_get_temperature(tHalHandle hHal, \brief SME API to set scanning mac oui \param hHal \param pScanMacOui: Scanning Mac Oui (input 3 bytes) - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui) +QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* Serialize the req through MC thread */ cds_message.bodyptr = pScanMacOui; cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Msg post Set Scan Mac OUI failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } @@ -13555,14 +13555,14 @@ CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui \brief SME API to set DHCP server offload info \param hHal \param pDhcpSrvInfo : DHCP server offload info struct - \- return CDF_STATUS + \- return QDF_STATUS -------------------------------------------------------------------------*/ -CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, +QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, tSirDhcpSrvOffloadInfo *pDhcpSrvInfo) { cds_msg_t cds_message; tSirDhcpSrvOffloadInfo *pSmeDhcpSrvInfo; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); @@ -13571,24 +13571,24 @@ CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *pSmeDhcpSrvInfo = *pDhcpSrvInfo; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { /* serialize the req through MC thread */ cds_message.type = WMA_SET_DHCP_SERVER_OFFLOAD_CMD; cds_message.bodyptr = pSmeDhcpSrvInfo; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { @@ -13607,13 +13607,13 @@ CDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, \brief API to set the Led flashing parameters. \param hHal - The handle returned by mac_open. \param x0, x1 - led flashing parameters - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, +QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, uint32_t x0, uint32_t x1) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; tSirLedFlashingReq *ledflashing; @@ -13623,7 +13623,7 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to allocate memory for WMA_LED_TIMING_REQ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } ledflashing->pattern_id = type; @@ -13631,13 +13631,13 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, ledflashing->led_x1 = x1; status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Serialize the req through MC thread */ cds_message.bodyptr = ledflashing; cds_message.type = WMA_LED_FLASHING_REQ; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) - status = CDF_STATUS_E_FAILURE; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + status = QDF_STATUS_E_FAILURE; sme_release_global_lock(&pMac->sme); } return status; @@ -13648,16 +13648,16 @@ CDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, * sme_handle_dfS_chan_scan() - handle DFS channel configuration * @h_hal: corestack handler * @dfs_flag: flag indicating dfs channel enable/disable - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_handle_dfs_chan_scan(tHalHandle h_hal, uint8_t dfs_flag) +QDF_STATUS sme_handle_dfs_chan_scan(tHalHandle h_hal, uint8_t dfs_flag) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(h_hal); status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { mac->scan.fEnableDFSChnlScan = dfs_flag; @@ -13686,7 +13686,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, uint16_t sap_ch, eCsrPhyMode sap_phy_mode, uint8_t cc_switch_mode, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac = PMAC_STRUCT(hal); tCsrRoamSession *session = CSR_GET_SESSION(mac, session_id); uint16_t intf_channel = 0; @@ -13696,7 +13696,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, session->ch_switch_in_progress = true; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { intf_channel = csr_check_concurrent_channel_overlap(mac, sap_ch, sap_phy_mode, cc_switch_mode); @@ -13721,13 +13721,13 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, * * This function configures the stats avg factor in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, uint16_t stats_avg_factor) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_stats_avg_factor *stats_factor; @@ -13737,12 +13737,12 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { stats_factor->vdev_id = session_id; stats_factor->stats_avg_factor = stats_avg_factor; @@ -13751,13 +13751,13 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, msg.type = SIR_HAL_CONFIG_STATS_FACTOR; msg.bodyptr = stats_factor; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); cdf_mem_free(stats_factor); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13778,13 +13778,13 @@ CDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, * * This function configures the guard time in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, +QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, uint32_t guard_time) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_guard_time_request *g_time; @@ -13794,12 +13794,12 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { g_time->vdev_id = session_id; g_time->guard_time = guard_time; @@ -13808,13 +13808,13 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, msg.type = SIR_HAL_CONFIG_GUARD_TIME; msg.bodyptr = g_time; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); cdf_mem_free(g_time); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13835,13 +13835,13 @@ CDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, * * This function configures the modulated dtim in firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, +QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, uint32_t modulated_dtim) { cds_msg_t msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(h_hal); wma_cli_set_cmd_t *iwcmd; @@ -13850,12 +13850,12 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } status = sme_acquire_global_lock(&mac->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { cdf_mem_zero((void *)iwcmd, sizeof(*iwcmd)); iwcmd->param_value = modulated_dtim; @@ -13866,13 +13866,13 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, msg.reserved = 0; msg.bodyptr = (void *)iwcmd; - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); cdf_mem_free(iwcmd); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); } else { @@ -13893,12 +13893,12 @@ CDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, * * This function sends the start/stop logging command to WMA * - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_wifi_start_logger(tHalHandle hal, +QDF_STATUS sme_wifi_start_logger(tHalHandle hal, struct sir_wifi_start_log start_log) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_wifi_start_log *req_msg; @@ -13908,7 +13908,7 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -13918,7 +13918,7 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, req_msg->ring_id = start_log.ring_id; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed(status=%d)"), status); @@ -13930,12 +13930,12 @@ CDF_STATUS sme_wifi_start_logger(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = SIR_HAL_START_STOP_LOGGING; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13969,13 +13969,13 @@ bool sme_neighbor_middle_of_roaming(tHalHandle hHal, uint8_t sessionId) * * Return: eHalStatus */ -CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) +QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) { - CDF_STATUS status; + QDF_STATUS status; cds_msg_t message; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -13986,11 +13986,11 @@ CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) message.bodyptr = NULL; message.type = SIR_HAL_FLUSH_LOG_TO_FW; status = cds_mq_post_message(CDS_MQ_ID_WMA, &message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); return status; @@ -14012,7 +14012,7 @@ CDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) * * Return: CDF status */ -CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint8_t tid, uint8_t pri, uint32_t srvc_int, uint32_t sus_int, @@ -14027,14 +14027,14 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, if (!psb) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "No need to configure auto trigger:psb is 0"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } switch (ac) { @@ -14051,7 +14051,7 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, access_category = UAPSD_VO; break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uapsd_params.wmm_ac = access_category; @@ -14060,14 +14060,14 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, uapsd_params.delay_interval = delay_interval; uapsd_params.suspend_interval = sus_int; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger Uapsd params for sessionId %d", sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14079,7 +14079,7 @@ CDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, * * Return: CDF status */ -CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, +QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint32_t sessionId) { @@ -14100,23 +14100,23 @@ CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, access_category = UAPSD_VO; break; default: - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to disable uapsd for ac %d for sessionId %d", ac, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14130,9 +14130,9 @@ CDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, * Return: Success upon successfully changing nss else failure * */ -CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) +QDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); uint32_t i, value = 0; union { @@ -14143,7 +14143,7 @@ CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { mac_ctx->roam.configParam.enable2x2 = (nss == 1) ? 0 : 1; /* get the HT capability info*/ @@ -14170,16 +14170,16 @@ CDF_STATUS sme_update_nss(tHalHandle h_hal, uint8_t nss) * * This function stores the rssi threshold breached callback function. * - * Return: CDF_STATUS enumeration. + * Return: QDF_STATUS enumeration. */ -CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, +QDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, void (*cb)(void *, struct rssi_breach_event *)) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -14206,11 +14206,11 @@ CDF_STATUS sme_set_rssi_threshold_breached_cb(tHalHandle hal, bool sme_is_any_session_in_connected_state(tHalHandle h_hal) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(h_hal); - CDF_STATUS status; + QDF_STATUS status; bool ret = false; status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { ret = csr_is_any_session_in_connect_state(mac_ctx); sme_release_global_lock(&mac_ctx->sme); } @@ -14225,12 +14225,12 @@ bool sme_is_any_session_in_connected_state(tHalHandle h_hal) * This function constructs the vos message and fill in message type, * bodyptr with @input and posts it to WDA queue. * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, +QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, struct rssi_monitor_req *input) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct rssi_monitor_req *req_msg; @@ -14239,13 +14239,13 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, req_msg = cdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *req_msg = *input; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); @@ -14257,7 +14257,7 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = WMA_SET_RSSI_MONITOR_REQ; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); @@ -14276,13 +14276,13 @@ CDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, * This API is invoked by HDD to indicate FW to start * dumping firmware memory. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ #ifdef WLAN_FEATURE_MEMDUMP -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t msg; struct fw_dump_req *send_req; @@ -14293,7 +14293,7 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) if (!send_req) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); @@ -14316,32 +14316,32 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) seg_req.dst_addr_hi); } - if (CDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { + if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { msg.bodyptr = send_req; msg.type = WMA_FW_MEM_DUMP_REQ; msg.reserved = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); cdf_mem_free(send_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); cdf_mem_free(send_req); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } #else -CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) +QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_MEMDUMP */ @@ -14351,12 +14351,12 @@ CDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) * @msg: PCL channel list and length structure * * Sends the command to WMA to send WMI_SOC_SET_PCL_CMDID to FW - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_soc_set_pcl(tHalHandle hal, +QDF_STATUS sme_soc_set_pcl(tHalHandle hal, struct sir_pcl_list msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); cds_msg_t cds_message; struct sir_pcl_list *req_msg; @@ -14367,7 +14367,7 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, req_msg = cdf_mem_malloc(len); if (!req_msg) { sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(req_msg, len); @@ -14378,7 +14378,7 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, req_msg->pcl_len = msg.pcl_len; status = sme_acquire_global_lock(&mac->sme); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("sme_AcquireGlobalLock failed!(status=%d)"), status); @@ -14390,12 +14390,12 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, cds_message.bodyptr = req_msg; cds_message.type = SIR_HAL_SOC_SET_PCL_TO_FW; status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); cdf_mem_free(req_msg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -14408,26 +14408,26 @@ CDF_STATUS sme_soc_set_pcl(tHalHandle hal, * @msg: HW mode structure containing hw mode and callback details * * Sends the command to CSR to send WMI_SOC_SET_HW_MODE_CMDID to FW - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, +QDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, struct sir_hw_mode msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tSmeCmd *cmd = NULL; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to acquire lock")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_set_hw_mode; @@ -14440,7 +14440,7 @@ CDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, csr_queue_sme_command(mac, cmd, false); sme_release_global_lock(&mac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -14472,23 +14472,23 @@ void sme_register_hw_mode_trans_cb(tHalHandle hal, * @next_action: next action to happen at policy mgr after beacon update * * Sends the command to CSR to send to PE - * Return: CDF_STATUS_SUCCESS on successful posting + * Return: QDF_STATUS_SUCCESS on successful posting */ -CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, +QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, uint8_t next_action, void *hdd_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac = PMAC_STRUCT(hHal); tSmeCmd *cmd = NULL; status = sme_acquire_global_lock(&mac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_nss_update; /* Sessionized modules may require this info */ @@ -14514,26 +14514,26 @@ CDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, * Queues configuration information to CSR to configure * WLAN firmware for the dual MAC features * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, +QDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, struct sir_dual_mac_config msg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal mac = PMAC_STRUCT(hal); tSmeCmd *cmd; status = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to acquire lock")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cmd = sme_get_command_buffer(mac); if (!cmd) { sms_log(mac, LOGE, FL("Get command buffer failed")); sme_release_global_lock(&mac->sme); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } cmd->command = e_sme_command_set_dual_mac_config; @@ -14548,7 +14548,7 @@ CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, csr_queue_sme_command(mac, cmd, false); sme_release_global_lock(&mac->sme); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_LFR_SUBNET_DETECTION @@ -14557,14 +14557,14 @@ CDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, * @Hal: hal handle * @gw_params: request parameters from HDD * - * Return: CDF_STATUS + * Return: QDF_STATUS * * This routine will update gateway parameters to WMA */ -CDF_STATUS sme_gateway_param_update(tHalHandle Hal, +QDF_STATUS sme_gateway_param_update(tHalHandle Hal, struct gateway_param_update_req *gw_params) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t cds_message; struct gateway_param_update_req *request_buf; @@ -14572,7 +14572,7 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *request_buf = *gw_params; @@ -14580,15 +14580,15 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_message.type = WMA_GW_PARAM_UPDATE_REQ; cds_message.reserved = 0; cds_message.bodyptr = request_buf; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ @@ -14600,7 +14600,7 @@ CDF_STATUS sme_gateway_param_update(tHalHandle Hal, * * Return: CDF Status */ -CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, +QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, sme_peer_authorized_fp auth_cb, uint32_t vdev_id) { @@ -14610,7 +14610,7 @@ CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_set_peer_authorized_cb(wma_handle, auth_cb); @@ -14623,16 +14623,16 @@ CDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, * @hal: HAL pointer * @fcc_constraint: true: disable, false; enable * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_disable_non_fcc_channel(tHalHandle hal, bool fcc_constraint) +QDF_STATUS sme_disable_non_fcc_channel(tHalHandle hal, bool fcc_constraint) { - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal mac_ptr = PMAC_STRUCT(hal); status = sme_acquire_global_lock(&mac_ptr->sme); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { if (fcc_constraint != mac_ptr->scan.fcc_constraint) { mac_ptr->scan.fcc_constraint = fcc_constraint; @@ -14666,23 +14666,23 @@ void sme_setdef_dot11mode(tHalHandle hal) * @notify_id - Identifies 1 of the 4 parameters to be modified * @val New value of the parameter * - * Return: CDF_STATUS - SME update config successful. + * Return: QDF_STATUS - SME update config successful. * Other status means SME failed to update */ -CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, +QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, uint8_t session_id, uint32_t notify_id, int32_t val) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_handle); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamConfig *nr_config = NULL; tpCsrNeighborRoamControlInfo nr_info = NULL; uint32_t reason = 0; status = sme_acquire_global_lock(&mac_ctx->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { nr_config = &mac_ctx->roam.configParam.neighborRoamConfig; nr_info = &mac_ctx->roam.neighborRoamInfo[session_id]; switch (notify_id) { @@ -14730,14 +14730,14 @@ CDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("invalid parameter notify_id %d"), notify_id); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } sme_release_global_lock(&mac_ctx->sme); } #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (mac_ctx->roam.configParam.isRoamOffloadScanEnabled && - status == CDF_STATUS_SUCCESS) { + status == QDF_STATUS_SUCCESS) { csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_UPDATE_CFG, reason); } @@ -14822,20 +14822,20 @@ void sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, * @wait_time: wait timeout value * @flag: feature flag in bitmasp * - * Return: Return CDF_STATUS, otherwise appropriate failure code + * Return: Return QDF_STATUS, otherwise appropriate failure code */ -CDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, +QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, uint32_t wait_time, uint32_t flags) { cds_msg_t message; - CDF_STATUS status; + QDF_STATUS status; struct egap_conf_params *egap_params; egap_params = cdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } egap_params->enable = enable; @@ -14846,7 +14846,7 @@ CDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, message.type = WMA_SET_EGAP_CONF_PARAMS; message.bodyptr = egap_params; status = cds_mq_post_message(CDF_MODULE_ID_WMA, &message); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 6861fa557f41..76bf27333a18 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -35,7 +35,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession) { @@ -59,7 +59,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) sme_preauth_reassoc_intvl_timer_callback, (void *)pSession->ftSmeContext.pUsrCtx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL ("Preauth Reassoc interval Timer allocation failed")); @@ -91,7 +91,7 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId) preAuthReassocIntvlTimer); } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cdf_mc_timer_destroy(&pSession->ftSmeContext. preAuthReassocIntvlTimer)) { sms_log(pMac, LOGE, @@ -144,7 +144,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ptr); tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == session || NULL == ft_ies) { sms_log(mac_ctx, LOGE, FL(" ft ies or session is NULL")); @@ -152,7 +152,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, } status = sme_acquire_global_lock(&mac_ctx->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; sms_log(mac_ctx, LOG1, "FT IEs Req is received in state %d", @@ -255,15 +255,15 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, * * To send key update indication for FT session * - * Return: CDF_STATUS + * Return: QDF_STATUS */ static -CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, +QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, tCsrRoamSetKey *ftkey_info) { tSirFTUpdateKeyInfo *msg; uint16_t msglen; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirKeyMaterial *keymaterial = NULL; tAniEdType ed_type; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); @@ -276,13 +276,13 @@ CDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"), ftkey_info->keyLength); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } msglen = sizeof(tSirFTUpdateKeyInfo); msg = cdf_mem_malloc(msglen); if (NULL == msg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(msg, msglen, 0); msg->messageType = eWNI_SME_FT_UPDATE_KEY; @@ -362,26 +362,26 @@ void sme_set_ftptk_state(tHalHandle hHal, uint32_t sessionId, bool state) pSession->ftSmeContext.setFTPTKState = state; } -CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, +QDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, tCsrRoamSetKey *pFTKeyInfo) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pFTKeyInfo == NULL) { sms_log(pMac, LOGE, "%s: pFTKeyInfo is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) { - return CDF_STATUS_E_FAILURE; + if (!(QDF_IS_STATUS_SUCCESS(status))) { + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, "sme_ft_update_key is received in state %d", pSession->ftSmeContext.FTState); @@ -396,10 +396,10 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, sms_log(pMac, LOGE, "%s: Key set failure %d", __func__, status); pSession->ftSmeContext.setFTPTKState = false; - status = CDF_STATUS_FT_PREAUTH_KEY_FAILED; + status = QDF_STATUS_FT_PREAUTH_KEY_FAILED; } else { pSession->ftSmeContext.setFTPTKState = true; - status = CDF_STATUS_FT_PREAUTH_KEY_SUCCESS; + status = QDF_STATUS_FT_PREAUTH_KEY_SUCCESS; sms_log(pMac, LOG1, "%s: Key set success", __func__); } @@ -414,7 +414,7 @@ CDF_STATUS sme_ft_update_key(tHalHandle hHal, uint32_t sessionId, default: sms_log(pMac, LOGW, "%s: Unhandled state=%d", __func__, pSession->ftSmeContext.FTState); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } sme_release_global_lock(&pMac->sme); @@ -435,7 +435,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); @@ -445,7 +445,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, *ft_ies_length = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; /* All or nothing - proceed only if both BSSID and FT IE fit */ @@ -487,7 +487,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); @@ -497,7 +497,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, *ric_ies_length = 0; status = sme_acquire_global_lock(&pMac->sme); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) return; /* All or nothing */ diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 8158218a0750..50731edac06e 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,9 +40,9 @@ * @type: type * @body: body pointer * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) +QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) { cds_msg_t msg; @@ -51,15 +51,15 @@ CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) msg.bodyptr = body; msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message( + if (QDF_STATUS_SUCCESS != cds_mq_post_message( CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); cdf_mem_free(body); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -67,29 +67,29 @@ CDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sEnablePsParams *enable_ps_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; enable_ps_req_params = cdf_mem_malloc(sizeof(*enable_ps_req_params)); if (NULL == enable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_ps_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } enable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; enable_ps_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -97,30 +97,30 @@ CDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sDisablePsParams *disable_ps_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; disable_ps_req_params = cdf_mem_malloc(sizeof(*disable_ps_req_params)); if (NULL == disable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for sDisablePsParams")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; disable_ps_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -128,9 +128,9 @@ CDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { @@ -139,14 +139,14 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint8_t uapsd_trigger_mask = 0; struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; enable_uapsd_req_params = cdf_mem_malloc(sizeof(*enable_uapsd_req_params)); if (NULL == enable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_uapsd_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } @@ -187,12 +187,12 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_ENABLE_UAPSD_REQ, enable_uapsd_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -200,31 +200,31 @@ CDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sDisableUapsdParams *disable_uapsd_req_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; disable_uapsd_req_params = cdf_mem_malloc(sizeof(*disable_uapsd_req_params)); if (NULL == disable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for disable_uapsd_req_params")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_uapsd_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_DISABLE_UAPSD_REQ, disable_uapsd_req_params); - if (!CDF_IS_STATUS_SUCCESS(status)) - return CDF_STATUS_E_FAILURE; + if (!QDF_IS_STATUS_SUCCESS(status)) + return QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -232,9 +232,9 @@ CDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sSirHalWowlEnterParams *hal_wowl_params; @@ -249,7 +249,7 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, if (NULL == hal_wowl_params) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for Enter Wowl Request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0); @@ -327,18 +327,18 @@ CDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, hal_wowl_params->sessionId = sme_wowl_params->sessionId; - if (CDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, + if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, hal_wowl_params)){ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else goto end; end: if (hal_wowl_params != NULL) cdf_mem_free(hal_wowl_params); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -346,9 +346,9 @@ end: * @mac_ctx: global mac context * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sSirHalWowlExitParams *hal_wowl_msg; @@ -356,21 +356,21 @@ CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, if (NULL == hal_wowl_msg) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((uint8_t *) hal_wowl_msg, sizeof(*hal_wowl_msg), 0); hal_wowl_msg->sessionId = session_id; - if (CDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, + if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, hal_wowl_msg)){ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (hal_wowl_msg != NULL) cdf_mem_free(hal_wowl_msg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -380,12 +380,12 @@ CDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, * @session_id: session id * sme_ps_cmd: power save message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, enum sme_ps_cmd command) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id); @@ -416,10 +416,10 @@ CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, default: sms_log(mac_ctx, LOGE, FL("Invalid command type %d"), command); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to enter in PS, Command: %d"), command); } @@ -435,9 +435,9 @@ CDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, *1) Sta Mode Ps should be enabled in ini file. *2) Session should be in infra mode and in connected state. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) +QDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -445,16 +445,16 @@ CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) if (!ps_global_info->ps_enabled) { sms_log(mac_ctx, LOG1, "Cannot initiate PS. PS is disabled in ini"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Check whether the given session is Infra and in Connected State */ if (!csr_is_conn_state_connected_infra(mac_ctx, session_id)) { sms_log(mac_ctx, LOGE, "Sta not infra/connected state %d", session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -464,15 +464,15 @@ CDF_STATUS sme_enable_sta_ps_check(tpAniSirGlobal mac_ctx, uint32_t session_id) * @session_id: session id * sme_ps_cmd: power save message * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, enum sme_ps_cmd command) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, command); return status; @@ -483,19 +483,19 @@ CDF_STATUS sme_ps_enable_disable(tHalHandle hal_ctx, uint32_t session_id, * @hal_ctx: global hal_handle * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_UAPSD_ENABLE); - if (status == CDF_STATUS_SUCCESS) + if (status == QDF_STATUS_SUCCESS) sme_offload_qos_process_into_uapsd_mode(mac_ctx, session_id); return status; @@ -506,19 +506,19 @@ CDF_STATUS sme_ps_uapsd_enable(tHalHandle hal_ctx, uint32_t session_id) * @hal_ctx: global hal_handle * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) return status; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_UAPSD_DISABLE); - if (status == CDF_STATUS_SUCCESS) + if (status == QDF_STATUS_SUCCESS) sme_offload_qos_process_out_of_uapsd_mode(mac_ctx, session_id); return status; @@ -530,7 +530,7 @@ CDF_STATUS sme_ps_uapsd_disable(tHalHandle hal_ctx, uint32_t session_id) * @ts_info: tspec info. * @session_id: session id * - * Return: CDF_STATUS + * Return: QDF_STATUS */ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, tSirMacTSInfo *ts_info, @@ -616,13 +616,13 @@ void sme_set_tspec_uapsd_mask_per_session(tpAniSirGlobal mac_ctx, * @uapsd_start_ind_cb: uapsd start indiation cb * @callback_context: callback context * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, +QDF_STATUS sme_ps_start_uapsd(tHalHandle hal_ctx, uint32_t session_id, uapsd_start_indication_cb uapsd_start_ind_cb, void *callback_context) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; status = sme_ps_uapsd_enable(hal_ctx, session_id); return status; } @@ -773,7 +773,7 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, request_buf->stationary_thresh, request_buf->channel_prediction_full_scan); } -CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, tpSirPNOScanReq request, uint8_t session_id, preferred_network_found_ind_cb callback_routine, @@ -788,7 +788,7 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__, @@ -812,14 +812,14 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, if (!session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(request_buf, request, sizeof(tSirPNOScanReq)); @@ -931,12 +931,12 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, msg.type = WMA_SET_PNO_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Cache the Preferred Network Found Indication callback information */ @@ -947,7 +947,7 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -956,11 +956,11 @@ CDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, * @hal_ctx - The handle returned by mac_open. * @request - Pointer to the offload request. * - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Cannot set the offload. - * CDF_STATUS_SUCCESS Request accepted. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Cannot set the offload. + * QDF_STATUS_SUCCESS Request accepted. */ -CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id) { @@ -979,14 +979,14 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: SESSION not Found", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); @@ -996,15 +996,15 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, msg.type = WMA_SET_HOST_OFFLOAD; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_NS_OFFLOAD @@ -1013,11 +1013,11 @@ CDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, * @hal_ctx - The handle returned by mac_open. * @request - Pointer to the offload request. * - * Return CDF_STATUS - * CDF_STATUS_E_FAILURE Cannot set the offload. - * CDF_STATUS_SUCCESS Request accepted. + * Return QDF_STATUS + * QDF_STATUS_E_FAILURE Cannot set the offload. + * QDF_STATUS_SUCCESS Request accepted. */ -CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, +QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tpSirHostOffloadReq request, uint8_t session_id) { @@ -1028,7 +1028,7 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, if (NULL == session) { sms_log(mac_ctx, LOGE, FL("Session not found ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); @@ -1037,22 +1037,22 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, if (NULL == request_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } *request_buf = *request; msg.type = WMA_SET_NS_OFFLOAD; msg.reserved = 0; msg.bodyptr = request_buf; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); cdf_mem_free(request_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_NS_OFFLOAD */ @@ -1075,26 +1075,26 @@ CDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, tSirRetStatus sme_post_pe_message(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) { - CDF_STATUS cdf_status; - cdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + QDF_STATUS qdf_status; + qdf_status = cds_mq_post_message(CDS_MQ_ID_PE, (cds_msg_t *) msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(mac_ctx, LOGP, FL("cds_mq_post_message failed with status code %d"), - cdf_status); + qdf_status); return eSIR_FAILURE; } return eSIR_SUCCESS; } -CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, uint32_t session_id, bool is_reassoc) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint32_t timer_value; if (is_reassoc) @@ -1105,23 +1105,23 @@ CDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, sms_log(mac_ctx, LOGE, FL("Start auto_ps_timer for %d is_reassoc:%d "), timer_value, is_reassoc); - cdf_status = cdf_mc_timer_start(&ps_param->auto_ps_enable_timer, + qdf_status = cdf_mc_timer_start(&ps_param->auto_ps_enable_timer, timer_value); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { - if (CDF_STATUS_E_ALREADY == cdf_status) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + if (QDF_STATUS_E_ALREADY == qdf_status) { /* Consider this ok since the timer is already started*/ sms_log(mac_ctx, LOGW, FL("auto_ps_timer is already started")); } else { sms_log(mac_ctx, LOGP, FL("Cannot start auto_ps_timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, +QDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); @@ -1138,11 +1138,11 @@ CDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, session_id); cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_open(tHalHandle hal_ctx) +QDF_STATUS sme_ps_open(tHalHandle hal_ctx) { uint32_t i; @@ -1151,17 +1151,17 @@ CDF_STATUS sme_ps_open(tHalHandle hal_ctx) sms_log(mac_ctx, LOG1, FL("Enter")); for (i = 0; i < MAX_SME_SESSIONS; i++) { - if (CDF_STATUS_SUCCESS != sme_ps_open_per_session(hal_ctx, i)) { + if (QDF_STATUS_SUCCESS != sme_ps_open_per_session(hal_ctx, i)) { sms_log(mac_ctx, LOGE, FL("PMC Init Failed for session %d"), i); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; @@ -1171,16 +1171,16 @@ CDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) sms_log(mac_ctx, LOG1, FL("Enter")); /* Allocate a timer to enable ps automatically */ - if (!CDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( + if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( &ps_param->auto_ps_enable_timer, CDF_TIMER_TYPE_SW, sme_auto_ps_entry_timer_expired, ps_param))) { sms_log(mac_ctx, LOGE, FL("Cannot allocate timer for auto ps entry")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1189,25 +1189,25 @@ void sme_auto_ps_entry_timer_expired(void *data) struct ps_params *ps_params = (struct ps_params *)data; tpAniSirGlobal mac_ctx = (tpAniSirGlobal)ps_params->mac_ctx; uint32_t session_id = ps_params->session_id; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_enable_sta_ps_check(mac_ctx, session_id); - if (CDF_STATUS_SUCCESS == status) { + if (QDF_STATUS_SUCCESS == status) { sme_ps_enable_disable((tHalHandle)mac_ctx, session_id, SME_PS_ENABLE); } else { status = cdf_mc_timer_start(&ps_params->auto_ps_enable_timer, AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE); - if (!CDF_IS_STATUS_SUCCESS(status) - && (CDF_STATUS_E_ALREADY != status)) { + if (!QDF_IS_STATUS_SUCCESS(status) + && (QDF_STATUS_E_ALREADY != status)) { sms_log(mac_ctx, LOGP, FL("Cannot start traffic timer")); } } } -CDF_STATUS sme_ps_close(tHalHandle hal_ctx) +QDF_STATUS sme_ps_close(tHalHandle hal_ctx) { uint32_t i; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); @@ -1216,16 +1216,16 @@ CDF_STATUS sme_ps_close(tHalHandle hal_ctx) for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) sme_ps_close_per_session(hal_ctx, i); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) +QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; /* * Stop the auto ps entry timer if running @@ -1235,14 +1235,14 @@ CDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) &ps_param->auto_ps_enable_timer)) { cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&ps_param->auto_ps_enable_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) sms_log(mac_ctx, LOGE, FL("Cannot deallocate suto PS timer")); - return cdf_status; + return qdf_status; } -CDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, +QDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, uint32_t session_id) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b3a1175699d4..15913d61f4f1 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -171,7 +171,7 @@ static void init_config_param(tpAniSirGlobal pMac); static bool csr_roam_process_results(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrRoamCompleteResult Result, void *Context); -static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, bool *pfSameIbss); static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, @@ -189,30 +189,30 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, static void csr_roaming_state_config_cnf_processor(tpAniSirGlobal pMac, uint32_t result); -CDF_STATUS csr_roam_open(tpAniSirGlobal pMac); -CDF_STATUS csr_roam_close(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_open(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_close(tpAniSirGlobal pMac); void csr_roamMICErrorTimerHandler(void *pv); void csr_roamTKIPCounterMeasureTimerHandler(void *pv); bool csr_roam_is_same_profile_keys(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile, tCsrRoamProfile *pProfile2); -static CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t interval); -static CDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId); static void csr_roam_roaming_timer_handler(void *pv); -CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval); -CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval); +QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); static void csr_roam_wait_for_key_time_out_handler(void *pv); -static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); -static CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, +static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); +static QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); -static CDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo); -CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, @@ -220,7 +220,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t session uint8_t keyId, uint8_t keyLength, uint8_t *pKey, uint8_t paeRole, uint8_t *pKeyRsc); -static CDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, @@ -230,7 +230,7 @@ void csr_roamStatsGlobalClassDTimerHandler(void *pv); static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid); static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_vcc_trigger(tpAniSirGlobal pMac); -CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, +QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, uint8_t staId, uint8_t sessionId); /* pStaEntry is no longer invalid upon the return of this function. @@ -240,7 +240,7 @@ static eCsrCfgDot11Mode csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, uint8_t operationChn, eCsrBand *pBand); -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); tCsrStatsClientReqInfo *csr_roam_insert_entry_into_list(tpAniSirGlobal pMac, tDblLinkList *pStaList, @@ -261,21 +261,21 @@ tListElem *csr_roam_check_client_req_list(tpAniSirGlobal pMac, uint32_t statsMas void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, tCsrPeStatsReqInfo *pPeStaEntry); tListElem *csr_roam_find_in_pe_stats_req_list(tpAniSirGlobal pMac, uint32_t statsMask); -CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac); static uint32_t csr_find_session_by_type(tpAniSirGlobal, enum tCDF_ADAPTER_MODE); static bool csr_is_conn_allow_2g_band(tpAniSirGlobal pMac, uint32_t chnl); static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac, uint32_t chnl); -static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc); static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId); -static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId); -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc); void csr_roam_reissue_roam_command(tpAniSirGlobal pMac); static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, @@ -301,9 +301,9 @@ static void csr_roam_de_init_globals(tpAniSirGlobal pMac) return; } -CDF_STATUS csr_open(tpAniSirGlobal pMac) +QDF_STATUS csr_open(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; do { @@ -314,21 +314,21 @@ CDF_STATUS csr_open(tpAniSirGlobal pMac) init_config_param(pMac); status = csr_scan_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; status = csr_roam_open(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; pMac->roam.nextRoamId = 1; /* Must not be 0 */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.statsClientReqList))) break; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.peStatsReqList))) break; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_ll_open(pMac->hHdd, &pMac->roam.roamCmdPendingList))) break; @@ -337,9 +337,9 @@ CDF_STATUS csr_open(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) +QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) { - CDF_STATUS status; + QDF_STATUS status; v_REGDOMAIN_t reg_id; enum country_src source = SOURCE_DRIVER; @@ -353,15 +353,15 @@ CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) status = csr_get_regulatory_domain_for_country(mac, mac->scan.countryCodeDefault, ®_id, source); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("csr_get_regulatory_domain_for_country failed")); return status; } - if (cds_set_reg_domain(mac, reg_id) != CDF_STATUS_SUCCESS) { + if (cds_set_reg_domain(mac, reg_id) != QDF_STATUS_SUCCESS) { sms_log(mac, LOGE, FL("cds_set_reg_domain failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac->scan.domainIdDefault = reg_id; mac->scan.domainIdCurrent = mac->scan.domainIdDefault; @@ -374,29 +374,29 @@ CDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) return status; } -CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) +QDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); v_REGDOMAIN_t regId; uint8_t cntryCodeLength; if (NULL == apCntryCode) { sms_log(pMac, LOGE, FL(" Invalid country Code Pointer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" country Code %.2s"), apCntryCode); cntryCodeLength = WNI_CFG_COUNTRY_CODE_LEN; status = csr_get_regulatory_domain_for_country(pMac, apCntryCode, ®Id, SOURCE_USERSPACE); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode); return status; } status = wma_set_reg_domain(hHal, regId); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL(" fail to get regId for country Code %.2s"), apCntryCode); @@ -421,9 +421,9 @@ CDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) return status; } -CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) +QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t index = 0; cdf_mem_copy(pParam->Csr11dinfo.countryCode, @@ -444,9 +444,9 @@ CDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) return status; } -CDF_STATUS csr_close(tpAniSirGlobal pMac) +QDF_STATUS csr_close(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_roam_close(pMac); csr_scan_close(pMac); @@ -673,7 +673,7 @@ scan_list_sort_error: cdf_mem_free(chan_list_non_greedy); } -CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) +QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) { tSirUpdateChanList *pChanList; tCsrScanStruct *pScan = &pMac->scan; @@ -700,7 +700,7 @@ CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) if (!pChanList) { CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pChanList, bufLen); @@ -765,19 +765,19 @@ CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) msg.bodyptr = pChanList; pChanList->numChan = num_channel; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); cdf_mem_free(pChanList); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_start(tpAniSirGlobal pMac) +QDF_STATUS csr_start(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; do { @@ -787,7 +787,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) csr_roam_state_change(pMac, eCSR_ROAMING_STATE_IDLE, i); status = csr_roam_start(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; pMac->roam.sPendingCommands = 0; @@ -799,7 +799,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) pMac->roam.tlStatsReqInfo.timerRunning = false; /* init the link quality indication also */ pMac->roam.vccLinkQuality = eCSR_ROAM_LINK_QUAL_MIN_IND; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, " csr_start: Couldn't Init HO control blk "); break; @@ -812,7 +812,7 @@ CDF_STATUS csr_start(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) +QDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) { uint32_t sessionId; @@ -847,12 +847,12 @@ CDF_STATUS csr_stop(tpAniSirGlobal pMac, tHalStopType stopType) b_roam_scan_offload_started = false; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_ready(tpAniSirGlobal pMac) +QDF_STATUS csr_ready(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* If the gScanAgingTime is set to '0' then scan results aging timeout based on timer feature is not enabled */ @@ -860,7 +860,7 @@ CDF_STATUS csr_ready(tpAniSirGlobal pMac) csr_scan_start_result_cfg_aging_timer(pMac); } status = csr_apply_channel_and_power_list(pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "csr_apply_channel_and_power_list failed during csr_ready with status=%d", status); @@ -902,9 +902,9 @@ void csr_set_global_cfgs(tpAniSirGlobal pMac) csr_set_default_dot11_mode(pMac); } -CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; tCsrRoamSession *pSession; do { @@ -922,7 +922,7 @@ CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) CDF_TIMER_TYPE_SW, csr_roam_wait_for_key_time_out_handler, &pMac->roam.WaitForKeyTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for WaitForKey time out timer")); @@ -932,17 +932,17 @@ CDF_STATUS csr_roam_open(tpAniSirGlobal pMac) cdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, CDF_TIMER_TYPE_SW, csr_roam_tl_stats_timer_handler, pMac); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for summary Statistics timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } while (0); return status; } -CDF_STATUS csr_roam_close(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_close(tpAniSirGlobal pMac) { uint32_t sessionId; for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { @@ -952,13 +952,13 @@ CDF_STATUS csr_roam_close(tpAniSirGlobal pMac) cdf_mc_timer_destroy(&pMac->roam.hTimerWaitForKey); cdf_mc_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); cdf_mc_timer_destroy(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_start(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_start(tpAniSirGlobal pMac) { (void)pMac; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId) @@ -968,32 +968,32 @@ void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId) csr_roam_dereg_statistics_req(pMac); } -CDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, eCsrConnectState *pState) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; if (CSR_IS_SESSION_VALID(pMac, sessionId) && (NULL != pState)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; *pState = pMac->roam.roamSession[sessionId].connectState; } return status; } -CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t size = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrRoamConnectedProfile *connected_prof; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pProfile) { sms_log(pMac, LOGE, FL("profile not found")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pConnectBssDesc) { @@ -1005,9 +1005,9 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, cdf_mem_copy(pProfile->pBssDesc, pSession->pConnectBssDesc, size); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } else { pProfile->pBssDesc = NULL; @@ -1057,10 +1057,10 @@ CDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if ((csr_is_conn_state_connected(pMac, sessionId)) || (csr_is_conn_state_ibss(pMac, sessionId))) { @@ -1083,11 +1083,11 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) profile->AuthType = eCSR_AUTH_TYPE_UNKNOWN; } -static CDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (pConnectedInfo->pbFrames) { cdf_mem_free(pConnectedInfo->pbFrames); pConnectedInfo->pbFrames = NULL; @@ -1383,10 +1383,10 @@ eCsrBand csr_get_current_band(tHalHandle hHal) /* This function flushes the roam scan cache */ -CDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; /* Free up the memory first (if required) */ @@ -1407,10 +1407,10 @@ CDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, /* This function flushes the roam scan cache */ -CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -1428,12 +1428,12 @@ CDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, This function flushes the roam scan cache and creates fresh cache based on the input channel list */ -CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, const uint8_t *pChannelList, const uint8_t numChannels) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -1447,7 +1447,7 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Memory Allocation for CFG Channel List failed")); pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Update the roam global structure */ @@ -1468,13 +1468,13 @@ CDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, * valid channels if the band is 5G, then make sure channel list contains * only 5G valid channels */ -CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, +QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels, const eCsrBand eBand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; uint8_t outNumChannels = 0; @@ -1531,7 +1531,7 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "Invalid band, No operation carried out (Band %d)", eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* * if roaming within band is enabled, then select only the @@ -1563,7 +1563,7 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(currChannelListInfo->ChannelList, ChannelList, outNumChannels); @@ -1572,17 +1572,17 @@ CDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) +QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) { /* DOT11 mode configured to 11a only and received request to change the band to 2.4 GHz */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band cfg80211 = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if ((CSR_IS_PHY_MODE_B_ONLY(pMac) || CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) { @@ -1591,7 +1591,7 @@ CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band dot11mode = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand); @@ -1599,7 +1599,7 @@ CDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) pMac->roam.configParam.bandCapability = eBand; status = csr_get_channel_and_power_list(pMac); - if (CDF_STATUS_SUCCESS == status) + if (QDF_STATUS_SUCCESS == status) csr_apply_channel_and_power_list(pMac); return status; } @@ -1721,10 +1721,10 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState) return cbIniValue; } -CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (pParam) { pMac->roam.configParam.WMMSupportMode = pParam->WMMSupportMode; @@ -2110,13 +2110,13 @@ CDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) +QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) { int i; tCsrConfig *cfg_params = &pMac->roam.configParam; if (!pParam) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; pParam->WMMSupportMode = cfg_params->WMMSupportMode; pParam->Is11eSupportEnabled = cfg_params->Is11eSupportEnabled; @@ -2272,13 +2272,13 @@ CDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pMac->roam.configParam.early_stop_scan_min_threshold; pParam->early_stop_scan_max_threshold = pMac->roam.configParam.early_stop_scan_max_threshold; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, +QDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, bool *pfRestartNeeded) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); bool fRestartNeeded = false; eCsrPhyMode newPhyMode = eCSR_DOT11_MODE_AUTO; @@ -2349,7 +2349,7 @@ CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, } } /* Done validating */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; /* Now we need to check whether a restart is needed. */ if (eBand != pMac->roam.configParam.eBand) { fRestartNeeded = true; @@ -2360,7 +2360,7 @@ CDF_STATUS csr_set_phy_mode(tHalHandle hHal, uint32_t phyMode, eCsrBand eBand, goto end; } end: - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.phyMode = newPhyMode; if (pfRestartNeeded) @@ -2437,21 +2437,21 @@ void csr_prune_channel_list_for_mode(tpAniSirGlobal mac_ctx, } #define INFRA_AP_DEFAULT_CHANNEL 6 -CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) +QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) { uint8_t index = 0; - CDF_STATUS status = CDF_STATUS_E_NOSUPPORT; + QDF_STATUS status = QDF_STATUS_E_NOSUPPORT; /* regulatory check */ for (index = 0; index < pMac->scan.base_channels.numChannels; index++) { if (pMac->scan.base_channels.channelList[index] == chnNum) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } - if (status == CDF_STATUS_SUCCESS) { + if (status == QDF_STATUS_SUCCESS) { /* dfs nol */ for (index = 0; index < @@ -2466,13 +2466,13 @@ CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) CDF_TRACE_LEVEL_ERROR, FL("channel %d is in dfs nol"), chnNum); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } } - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is not available"), chnNum); } @@ -2480,25 +2480,25 @@ CDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) return status; } -CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) +QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t num20MHzChannelsFound = 0; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; uint8_t Index = 0; uint8_t num40MHzChannelsFound = 0; /* TODO: this interface changed to include the 40MHz channel list */ /* this needs to be tied into the adapter structure somehow and referenced appropriately for CB operation */ /* Read the scan channel list (including the power limit) from EEPROM */ - cdf_status = + qdf_status = cds_get_channel_list_with_power(pMac->scan.defaultPowerTable, &num20MHzChannelsFound, pMac->scan.defaultPowerTable40MHz, &num40MHzChannelsFound); - if ((CDF_STATUS_SUCCESS != cdf_status) || (num20MHzChannelsFound == 0)) { + if ((QDF_STATUS_SUCCESS != qdf_status) || (num20MHzChannelsFound == 0)) { sms_log(pMac, LOGE, FL("failed to get channels ")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { if (num20MHzChannelsFound > WNI_CFG_VALID_CHANNEL_LIST_LEN) { num20MHzChannelsFound = WNI_CFG_VALID_CHANNEL_LIST_LEN; @@ -2526,9 +2526,9 @@ CDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) +QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_prune_channel_list_for_mode(pMac, &pMac->scan.base_channels); csr_save_channel_power_for_band(pMac, false); @@ -2542,19 +2542,19 @@ CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, +QDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, tCsrUpdateConfigParam *pUpdateConfigParam) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsr11dinfo *ps11dinfo = NULL; ps11dinfo = &pUpdateConfigParam->Csr11dinfo; status = csr_init11d_info(pMac, ps11dinfo); return status; } -static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) +static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t index; uint32_t count = 0; tSirMacChanInfo *pChanInfo; @@ -2575,7 +2575,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) ps11dinfo->Channels.numChannels); } else { /* No change */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* legacy maintenance */ @@ -2619,7 +2619,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) cdf_mem_free(pChanInfoStart); } /* Only apply them to CFG when not in STOP state. Otherwise they will be applied later */ - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { for (index = 0; index < CSR_ROAM_SESSION_MAX; index++) { if ((CSR_IS_SESSION_VALID(pMac, index)) && CSR_IS_ROAM_STOP(pMac, index)) { @@ -2640,7 +2640,7 @@ static CDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) } /* Initialize the Channel + Power List in the local cache and in the CFG */ -CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) +QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) { uint8_t index; uint32_t count = 0; @@ -2648,7 +2648,7 @@ CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din tSirMacChanInfo *pChanInfoStart; if (!ps11dinfo || !pMac) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pChanInfo = @@ -2681,7 +2681,7 @@ CDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din cdf_mem_free(pChanInfoStart); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* pCommand may be NULL */ @@ -2695,7 +2695,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -2808,11 +2808,11 @@ static void csr_roam_populate_channels(tDot11fBeaconIEs *beacon_ies, } } -CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus u1, eCsrRoamResult u2) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR uint32_t rssi = 0; WLAN_HOST_DIAG_EVENT_DEF(connectionStatus, @@ -2825,13 +2825,13 @@ CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, "Session ID:%d is not valid", sessionId); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = CSR_GET_SESSION(pMac, sessionId); if (false == pSession->sessionActive) { sms_log(pMac, LOG1, "%s Session is not Active", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG4, "Received RoamCmdStatus %d with Roam Result %d", u1, @@ -3019,18 +3019,18 @@ bool csr_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId) return csr_neighbor_roam_is_handoff_in_progress(pMac, sessionId); } -CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate, bool fMICFailure) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; uint16_t reasonCode; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (fMICFailure) { @@ -3069,7 +3069,7 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_send_mb_disassoc_req_msg(pMac, sessionId, bssId.bytes, reasonCode); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_link_down(pMac, sessionId); #ifndef WLAN_MDM_CODE_REDUCTION_OPT /* no need to tell QoS that we are disassociating, it will be taken care off in assoc req for HO */ @@ -3094,21 +3094,21 @@ CDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, \param sessionId - session Id for Soft AP \param pPeerMacAddr - MAC of associated station to delete \param reason - reason code, be one of the tSirMacReasonCodes - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pPeerMacAddr, uint32_t reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } pCommand->command = eSmeCommandRoam; @@ -3117,7 +3117,7 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, cdf_mem_copy(pCommand->u.roamCmd.peerMac, pPeerMacAddr, 6); pCommand->u.roamCmd.reason = (tSirMacReasonCodes) reason; status = csr_queue_sme_command(pMac, pCommand, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -3134,20 +3134,20 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to delete a associated station * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error */ -CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, struct tagCsrDelStaParams *pDelStaParams) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } pCommand->command = eSmeCommandRoam; @@ -3159,7 +3159,7 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, pCommand->u.roamCmd.reason = (tSirMacReasonCodes)pDelStaParams->reason_code; status = csr_queue_sme_command(pMac, pCommand, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -3169,20 +3169,20 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, return status; } -static CDF_STATUS +static QDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable, struct cdf_mac_addr *bssId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeTkipCntrMeasReq *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0); pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ; @@ -3196,11 +3196,11 @@ csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS +QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3225,12 +3225,12 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3258,12 +3258,12 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -3290,16 +3290,16 @@ csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pConnectBssDesc) { @@ -3313,7 +3313,7 @@ CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_send_mb_deauth_req_msg(pMac, sessionId, bssId.bytes, eSIR_MAC_DEAUTH_LEAVING_BSS_REASON); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) csr_roam_link_down(pMac, sessionId); else { sms_log(pMac, LOGE, @@ -3326,16 +3326,16 @@ CDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); uint32_t size; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If no BSS description was found in this connection (happens with start IBSS), then */ /* nix the BSS description that we keep around for the connected BSS) and get out... */ @@ -3355,14 +3355,14 @@ CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessio pSession->pConnectBssDesc = cdf_mem_malloc(size); } if (NULL == pSession->pConnectBssDesc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else cdf_mem_copy(pSession->pConnectBssDesc, pBssDesc, size); } return status; } -CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, @@ -3371,7 +3371,7 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, eCsrCfgDot11Mode cfgDot11Mode; CDF_ASSERT(pIes != NULL); if (pIes == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; cdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, sizeof(tSirMacCapabilityInfo)); @@ -3390,7 +3390,7 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, if (pProfile->SSIDs.numOfSSIDs == 0) { sms_log(pMac, LOGW, FL("BSS desc and profile doesn't have SSID")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } if (CDS_IS_CHANNEL_5GHZ(pBssDesc->channelId)) @@ -3484,17 +3484,17 @@ CDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, pBssConfig->cbMode = csr_get_cb_mode_from_ies(pMac, pBssDesc->channelId, pIes); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tBssConfigParam * pBssConfig, tSirBssDescription * pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t operationChannel = 0; uint8_t qAPisEnabled = false; /* SSID */ @@ -3506,7 +3506,7 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, sizeof(tSirMacSSid)); } else { /* SSID must present */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Settomg up the capabilities */ if (csr_is_bss_type_ibss(pProfile->BSSType)) { @@ -3536,7 +3536,7 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, qAPisEnabled = true; } else if (csr_roam_get_qos_info_from_bss(pMac, pBssDesc) == - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { qAPisEnabled = true; } else { qAPisEnabled = false; @@ -3594,14 +3594,14 @@ static CDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, return status; } -static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tDot11fBeaconIEs *pIes = NULL; do { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ @@ -3611,7 +3611,7 @@ static CDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, } /* check if the AP is QAP & it supports APSD */ if (CSR_IS_QOS_BSS(pIes)) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } while (0); @@ -3800,10 +3800,10 @@ static void csr_set_cfg_ssid(tpAniSirGlobal pMac, tSirMacSSid *pSSID) cfg_set_str(pMac, WNI_CFG_SSID, (uint8_t *) pSSID->ssId, len); } -CDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrMediaAccessType qosType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t QoSEnabled; uint32_t WmeEnabled; /* set the CFG enable/disable variables based on the qosType being configured... */ @@ -3840,14 +3840,14 @@ CDF_STATUS csr_set_qos_to_cfg(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, +static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, eCsrPhyMode phyMode, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes, tSirMacRateSet *pOpRateSet, tSirMacRateSet *pExRateSet) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i; eCsrCfgDot11Mode cfgDot11Mode; uint8_t *pDstRate; @@ -3909,7 +3909,7 @@ static CDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, } } if (pOpRateSet->numRates > 0 || pExRateSet->numRates > 0) - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } @@ -4199,7 +4199,7 @@ ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMod #endif /* pIes may be NULL */ -CDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tBssConfigParam *pBssConfig, @@ -4277,37 +4277,37 @@ CDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, pBssConfig->uJoinTimeOut); /* Any roaming related changes should be above this line */ if (pSession && pSession->roam_synch_in_progress) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Make this the last CFG to set. The callback will trigger a join_req */ /* Join time out */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_CONFIG, sessionId); csr_roam_ccm_cfg_set_callback(pMac, status); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status; + QDF_STATUS status; tBssConfigParam *pBssConfig; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); status = csr_roam_prepare_bss_config(pMac, pProfile, pBssDesc, pBssConfig, pIes); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { eCsrRoamSubState substate; substate = eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING; pSession->bssParams.uCfgDot11Mode = pBssConfig->uCfgDot11Mode; @@ -4386,7 +4386,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, uint32_t session_id, tDot11fBeaconIEs *ies_local, tSirBssDescription *bss_descr) { - CDF_STATUS status; + QDF_STATUS status; tBssConfigParam bssConfig; if (csr_roam_is_same_profile_keys(mac_ctx, &session->connectedProfile, profile)) @@ -4395,7 +4395,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, cdf_mem_set(&bssConfig, sizeof(bssConfig), 0); status = csr_roam_prepare_bss_config(mac_ctx, profile, bss_descr, &bssConfig, ies_local); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { session->bssParams.uCfgDot11Mode = bssConfig.uCfgDot11Mode; session->bssParams.cbMode = @@ -4404,7 +4404,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, status = csr_roam_set_bss_config_cfg(mac_ctx, session_id, profile, bss_descr, &bssConfig, ies_local, false); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) return eCsrContinueRoaming; } @@ -4427,7 +4427,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, } if (!pIesLocal && - !CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(pMac, + !QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal))) { sms_log(pMac, LOGE, FL("fail to parse IEs")); return eCsrStopRoaming; @@ -4462,7 +4462,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_state_for_same_profile(pMac, pProfile, pSession, sessionId, pIesLocal, pBssDesc); - } else if (!CDF_IS_STATUS_SUCCESS( + } else if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_disassociate(pMac, sessionId, eCSR_ROAM_SUBSTATE_DISASSOC_REQ, @@ -4472,7 +4472,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, sessionId); eRoamState = eCsrStopRoaming; } - } else if (!CDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, + } else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, pProfile, pBssDesc, pIesLocal))) { /* we used to pre-auth here with open auth * networks but that wasn't working so well. @@ -4480,7 +4480,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, * to join the new network... */ eRoamState = eCsrStopRoaming; } - } else if (!CDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, + } else if (!QDF_IS_STATUS_SUCCESS(csr_roam_stop_network(pMac, sessionId, pProfile, pBssDesc, pIesLocal))) { eRoamState = eCsrStopRoaming; @@ -4491,10 +4491,10 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, return eRoamState; } -CDF_STATUS csr_roam_should_roam(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_should_roam(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.pBssDesc = pBssDesc; @@ -4613,7 +4613,7 @@ static bool csr_roam_select_bss(tpAniSirGlobal mac_ctx, /* Ok to roam this */ if (!conc_channel && - CDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx, + QDF_IS_STATUS_SUCCESS(csr_roam_should_roam(mac_ctx, session_id, &result->BssDescriptor, roam_id))) { status = false; break; @@ -4649,7 +4649,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, #ifndef WLAN_MDM_CODE_REDUCTION_OPT uint8_t acm_mask = 0; #endif - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tCsrRoamProfile *profile = &cmd->u.roamCmd.roamProfile; tDot11fBeaconIEs *ies_local = NULL; @@ -4688,7 +4688,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, ies_local = scan_result->Result.pvIes; if (scan_result && !ies_local && - (!CDF_IS_STATUS_SUCCESS( + (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( mac_ctx, &result->BssDescriptor, @@ -4770,7 +4770,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, csr_roam_assign_default_param(mac_ctx, cmd); status = csr_roam_start_ibss(mac_ctx, session_id, profile, &same_ibss); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (same_ibss) *roam_state = eCsrStartIbssSameIbss; else @@ -4785,7 +4785,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, csr_roam_assign_default_param(mac_ctx, cmd); /* For AP WDS, we dont have any BSSDescription */ status = csr_roam_start_wds(mac_ctx, session_id, profile, NULL); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) *roam_state = eCsrContinueRoaming; else *roam_state = eCsrStopRoaming; @@ -4898,9 +4898,9 @@ end: return roam_state; } -static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) +static QDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrJoinState RoamState; eCsrRoamSubState substate; uint32_t sessionId = pCommand->sessionId; @@ -4918,7 +4918,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) substate = eCSR_ROAM_SUBSTATE_DISASSOC_NOTHING_TO_JOIN; status = csr_roam_issue_disassociate(pMac, sessionId, substate, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing disassoc status = %d"), status); @@ -4931,7 +4931,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) } else if (csr_is_conn_state_ibss(pMac, sessionId)) { status = csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing stop bss status = %d"), status); @@ -4946,7 +4946,7 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) substate = eCSR_ROAM_SUBSTATE_STOP_BSS_REQ; status = csr_roam_issue_stop_bss(pMac, sessionId, substate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("fail issuing stop bss status = %d"), status); @@ -4979,27 +4979,27 @@ static CDF_STATUS csr_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) return status; } -CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { uint32_t sessionId; tCsrRoamSession *pSession; tCsrScanResult *pScanResult = NULL; tSirBssDescription *pBssDesc = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sessionId = pCommand->sessionId; pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming) { /* the roaming is cancelled. Simply complete the command */ sms_log(pMac, LOG1, FL("Roam command canceled")); csr_roam_complete(pMac, eCsrNothingToJoin, NULL); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pCommand->u.roamCmd.pRoamBssEntry) { pScanResult = @@ -5010,7 +5010,7 @@ CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, /* the roaming is cancelled. Simply complete the command */ sms_log(pMac, LOG1, FL("Roam command canceled")); csr_roam_complete(pMac, eCsrNothingToJoin, NULL); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_roam_issue_reassociate(pMac, sessionId, pBssDesc, (tDot11fBeaconIEs *) (pScanResult-> @@ -5029,19 +5029,19 @@ CDF_STATUS csr_process_ft_reassoc_roam_command(tpAniSirGlobal pMac, * * This function will trigger reassociate. * - * Return: CDF_STATUS for success or failure. + * Return: QDF_STATUS for success or failure. */ -static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tCsrRoamInfo *roam_info, tCsrRoamSession *session_ptr, uint32_t session_id) { tDot11fBeaconIEs *pIes = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (session_ptr->pConnectBssDesc) { status = csr_get_parsed_bss_description_ies(mac_ctx, session_ptr->pConnectBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to parse IEs")); } else { roam_info->reasonCode = @@ -5063,7 +5063,7 @@ static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, status = csr_roam_issue_reassociate(mac_ctx, session_id, session_ptr->pConnectBssDesc, pIes, &cmd->u.roamCmd.roamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("failed status %d"), status); csr_release_command_roam(mac_ctx, cmd); @@ -5075,21 +5075,21 @@ static CDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, } else { sms_log(mac_ctx, LOGE, FL ("reassoc to same AP failed as connected BSS is NULL")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } -CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; uint32_t sessionId = pCommand->sessionId; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL("Roam Reason : %d, sessionId: %d"), pCommand->u.roamCmd.roamReason, sessionId); @@ -5100,7 +5100,7 @@ CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sms_log(pMac, LOGE, FL("Ignore eCsrForcedDisassoc cmd on roam state" " %d"), eCSR_ROAMING_STATE_IDLE); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = csr_roam_process_disassoc_deauth(pMac, pCommand, @@ -5198,7 +5198,7 @@ CDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) * (if we need to..) */ status = csr_roam(pMac, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGW, FL("csr_roam() failed with status = 0x%08X"), status); @@ -5323,7 +5323,7 @@ extern uint8_t csr_wpa_oui[][CSR_WPA_OUI_SIZE]; * * Return: none. */ -static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, tCsrRoamSession *session_ptr, eCsrAuthType auth_type, tDot11fBeaconIEs *ie_ptr, @@ -5357,7 +5357,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, /* nIeLen doesn't count EID and length fields */ session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(session_ptr->pWpaRsnRspIE, nIeLen + 2, 0); @@ -5410,7 +5410,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, * compiler; nIeLen doesn't count EID & length fields */ session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; session_ptr->pWpaRsnRspIE[0] = DOT11F_EID_WPA; session_ptr->pWpaRsnRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWpaRsnRspIE + 2; @@ -5445,7 +5445,7 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, session_ptr->pWapiRspIE = cdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWapiRspIE) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; session_ptr->pWapiRspIE[0] = DOT11F_EID_WAPI; session_ptr->pWapiRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWapiRspIE + 2; @@ -5492,22 +5492,22 @@ static CDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, } } #endif /* FEATURE_WLAN_WAPI */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, eCsrAuthType authType, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tDot11fBeaconIEs *pIesLocal = pIes; if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((eCSR_AUTH_TYPE_WPA == authType) || @@ -5525,7 +5525,7 @@ static CDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, (eCSR_AUTH_TYPE_RSN_8021X_SHA256 == authType) #endif /* FEATURE_WLAN_WAPI */ ) { - if (!pIesLocal && !CDF_IS_STATUS_SUCCESS + if (!pIesLocal && !QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(pMac, pSirBssDesc, &pIesLocal))) sms_log(pMac, LOGE, FL(" cannot parse IEs")); @@ -5671,7 +5671,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) msg.type = WMA_ROAM_OFFLOAD_SYNCH_FAIL; msg.reserved = 0; msg.bodyptr = roam_offload_failed; - if (!CDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", @@ -5726,7 +5726,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, uint32_t session_id = cmd->sessionId; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tCsrRoamInfo roam_info; - CDF_STATUS status; + QDF_STATUS status; sms_log(mac_ctx, LOGW, FL("receives no association indication")); sms_log(mac_ctx, LOG1, FL("Assoc ref count %d"), @@ -5770,7 +5770,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, */ if (csr_roam_is_handoff_in_progress(mac_ctx, session_id)) { csr_neighbor_roam_indicate_connect(mac_ctx, - (uint8_t)session_id, CDF_STATUS_E_FAILURE); + (uint8_t)session_id, QDF_STATUS_E_FAILURE); } if (session->bRefAssocStartCnt > 0) { session->bRefAssocStartCnt--; @@ -5933,7 +5933,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, eCsrRoamResult roam_result; tDot11fBeaconIEs *ies_ptr = NULL; tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - CDF_STATUS status; + QDF_STATUS status; host_log_ibss_pkt_type *ibss_log; uint32_t bi; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -5951,7 +5951,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, * started Ibss. */ sms_log(mac_ctx, LOG2, FL("receives start BSS ok indication")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; start_bss_rsp = (tSirSmeStartBssRsp *) context; cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); if (CSR_IS_IBSS(profile)) @@ -5964,7 +5964,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, csr_roam_state_change(mac_ctx, eCSR_ROAMING_STATE_JOINED, session_id); bss_desc = &start_bss_rsp->bssDescription; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &ies_ptr))) { sms_log(mac_ctx, LOGW, FL("cannot parse IBSS IEs")); @@ -6232,7 +6232,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, * Issue the set Context request to LIM to establish * the Unicast STA context */ - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_set_context_req(mac_ctx, session_id, profile->negotiatedUCEncryptionType, @@ -6298,7 +6298,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, * This time should be long enough for the rest * of the process plus setting key */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_wait_for_key_timer( mac_ctx, key_timeout_interval)) ) { @@ -6662,11 +6662,11 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, return release_cmd; } -CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile, tCsrRoamProfile *pSrcProfile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); @@ -6674,7 +6674,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, size = sizeof(struct cdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; pDstProfile->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == pDstProfile->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->BSSIDs.numOfBSSIDs = @@ -6686,7 +6686,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, size = sizeof(tCsrSSIDInfo) * pSrcProfile->SSIDs.numOfSSIDs; pDstProfile->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == pDstProfile->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->SSIDs.numOfSSIDs = @@ -6698,7 +6698,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pWPAReqIE = cdf_mem_malloc(pSrcProfile->nWPAReqIELength); if (NULL == pDstProfile->pWPAReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWPAReqIELength = @@ -6710,7 +6710,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pRSNReqIE = cdf_mem_malloc(pSrcProfile->nRSNReqIELength); if (NULL == pDstProfile->pRSNReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nRSNReqIELength = @@ -6723,7 +6723,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pWAPIReqIE = cdf_mem_malloc(pSrcProfile->nWAPIReqIELength); if (NULL == pDstProfile->pWAPIReqIE) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWAPIReqIELength = @@ -6736,7 +6736,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEScan = cdf_mem_malloc(pSrcProfile->nAddIEScanLength); if (NULL == pDstProfile->pAddIEScan) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEScanLength = @@ -6748,7 +6748,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEAssoc = cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEAssocLength = @@ -6761,7 +6761,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_malloc(pSrcProfile->ChannelInfo. numOfChannels); if (NULL == pDstProfile->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->ChannelInfo.numOfChannels = @@ -6833,7 +6833,7 @@ CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams, sizeof(tSirAddIeParams)); end: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_profile(pMac, pDstProfile); pDstProfile = NULL; } @@ -6841,10 +6841,10 @@ end: return status; } -CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile; @@ -6852,7 +6852,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate memory for BSSID " MAC_ADDRESS_STR), @@ -6866,7 +6866,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->SSIDs.SSIDList = cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == pDstProfile->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate memory for SSID " MAC_ADDRESS_STR), @@ -6885,7 +6885,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pDstProfile->pAddIEAssoc = cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("failed to allocate mem for additional ie")); goto end; @@ -6896,7 +6896,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, } pDstProfile->ChannelInfo.ChannelList = cdf_mem_malloc(1); if (NULL == pDstProfile->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->ChannelInfo.numOfChannels = 1; @@ -6930,7 +6930,7 @@ CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, #endif end: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_profile(pMac, pDstProfile); pDstProfile = NULL; } @@ -6938,19 +6938,19 @@ end: return status; } -CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tScanResultHandle hBSSList, eCsrRoamReason reason, uint32_t roamId, bool fImediate, bool fClearScan) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { if (fClearScan) { csr_scan_abort_mac_scan_not_for_connect(pMac, sessionId); @@ -6975,7 +6975,7 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_copy_profile(pMac, &pCommand->u.roamCmd.roamProfile, pProfile); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pCommand->u.roamCmd.fReleaseProfile = true; } } @@ -6992,7 +6992,7 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, FL("CSR PERSONA=%d"), pCommand->u.roamCmd.roamProfile.csrPersona); status = csr_queue_sme_command(pMac, pCommand, fImediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -7002,19 +7002,19 @@ CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields *pMmodProfileFields, eCsrRoamReason reason, uint32_t roamId, bool fImediate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { csr_scan_abort_mac_scan_not_for_connect(pMac, sessionId); if (pProfile) { @@ -7035,7 +7035,7 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->u.roamCmd.roamProfile.uapsd_mask = pMmodProfileFields->uapsd_mask; } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { pCommand->u.roamCmd.fReleaseProfile = true; } pCommand->command = eSmeCommandRoam; @@ -7050,7 +7050,7 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_remove_duplicate_command(pMac, sessionId, pCommand, reason); status = csr_queue_sme_command(pMac, pCommand, fImediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_roam_completion(pMac, sessionId, NULL, pCommand, @@ -7061,17 +7061,17 @@ CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, tpSirBssDescription pBssDescription, eCsrRoamReason reason, bool fImmediate) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { if (pBssDescription) { /* copy over the parameters we need later */ @@ -7082,7 +7082,7 @@ CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, /* in this case we are using this field for the "next" BSS */ pCommand->u.roamCmd.pLastRoamBss = pBssDescription; status = csr_queue_sme_command(pMac, pCommand, fImmediate); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL (" fail to enqueue preauth command, status = %d"), @@ -7091,13 +7091,13 @@ CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, } } else { /* Return failure */ - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } } return status; } -CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) +QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) { tListElem *pEntry; tSmeCmd *pCommand; @@ -7134,14 +7134,14 @@ CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) FL("pEntry NULL for eWNI_SME_FT_PRE_AUTH_RSP")); } sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tScanResultHandle hBSSList; tCsrScanResultFilter *pScanFilter; uint32_t roamId = 0; @@ -7153,12 +7153,12 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGE, FL("session does not exist for given sessionId:%d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pProfile) { sms_log(pMac, LOGP, FL("No profile specified")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Initialize the count before proceeding with the Join requests */ pSession->join_bssid_count = 0; @@ -7196,7 +7196,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, #endif pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -7216,7 +7216,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, roamId = GET_NEXT_ROAM_ID(&pMac->roam); if (pRoamId) *pRoamId = roamId; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); goto end; } @@ -7235,7 +7235,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* This can be started right away */ status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue start BSS cmd with status = 0x%08X"), status); @@ -7252,7 +7252,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); sms_log(pMac, LOG1, FL("******* csr_scan_get_result Status ****** %d"), status); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* check if set hw mode needs to be done */ if ((pMac->policy_manager_enabled) && ((pScanFilter->csrPersona == CDF_STA_MODE) || @@ -7261,14 +7261,14 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, &first_ap_profile); status = cds_handle_conc_multiport(sessionId, first_ap_profile.channelId); - if ((CDF_IS_STATUS_SUCCESS(status)) && + if ((QDF_IS_STATUS_SUCCESS(status)) && (!csr_wait_for_connection_update(pMac, true))) { sms_log(pMac, LOG1, FL("conn update error")); csr_scan_result_purge(pMac, hBSSList); fCallCallback = true; goto error; - } else if (status == CDF_STATUS_E_FAILURE) { + } else if (status == QDF_STATUS_E_FAILURE) { sms_log(pMac, LOG1, FL("conn update error")); csr_scan_result_purge(pMac, hBSSList); fCallCallback = true; @@ -7278,7 +7278,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue connect cmd with status = 0x%08X"), status); @@ -7291,7 +7291,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue startIBSS cmd with status = 0x%08X"), status); @@ -7301,7 +7301,7 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* scan for this SSID */ status = csr_scan_for_ssid(pMac, sessionId, pProfile, roamId, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("CSR failed to issue SSID scan cmd with status = 0x%08X"), status); @@ -7343,20 +7343,20 @@ end: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, tCsrRoamProfile *profile, tCsrRoamModifyProfileFields mod_fields, uint32_t *roam_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fCallCallback = true; uint32_t roamId = 0; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == profile) { sms_log(mac_ctx, LOGP, FL("No profile specified")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOG1, FL("called BSSType = %s (%d) authtype = %d encryType = %d"), @@ -7413,9 +7413,9 @@ csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, return status; } -CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = NULL; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId; @@ -7424,7 +7424,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->pCurRoamProfile) { @@ -7433,27 +7433,27 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) * will be free inside csr_roam_issue_connect */ pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; roamId = GET_NEXT_ROAM_ID(&pMac->roam); status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* we want to put the last connected BSS to the * very beginning, if possible */ csr_move_bss_to_head_from_bssid(pMac, @@ -7461,7 +7461,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, eCsrHddIssued, roamId, false, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, hBSSList); goto end; } @@ -7469,7 +7469,7 @@ CDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) /* scan for this SSID only incase AP suppresses SSID */ status = csr_scan_for_ssid(pMac, sessionId, pProfile, roamId, true); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto end; } } /* We have a profile */ @@ -7489,23 +7489,23 @@ end: return status; } -CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (csr_is_conn_state_connected(pMac, sessionId)) { status = csr_roam_issue_disassociate_cmd(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = csr_roam_join_last_profile(pMac, sessionId); } } return status; } -CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGW, FL("is called")); csr_roam_cancel_roaming(pMac, sessionId); csr_roam_remove_duplicate_command(pMac, sessionId, NULL, eCsrHddIssued); @@ -7515,10 +7515,10 @@ CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessio return status; } -CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fDisassoc, bool fMICFailure) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fComplete = false; eCsrRoamSubState NewSubstate; uint32_t sessionId = pCommand->sessionId; @@ -7538,7 +7538,7 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma status = csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ); - fComplete = (!CDF_IS_STATUS_SUCCESS(status)); + fComplete = (!QDF_IS_STATUS_SUCCESS(status)); } else if (csr_is_conn_state_infra(pMac, sessionId)) { /* * in Infrastructure, we need to disassociate from the @@ -7596,18 +7596,18 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma csr_roam_issue_deauth(pMac, sessionId, eCSR_ROAM_SUBSTATE_DEAUTH_REQ); } - fComplete = (!CDF_IS_STATUS_SUCCESS(status)); + fComplete = (!QDF_IS_STATUS_SUCCESS(status)); } else { /* we got a dis-assoc request while not connected to any peer */ /* just complete the command */ fComplete = true; - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } if (fComplete) { csr_roam_complete(pMac, eCsrNothingToJoin, NULL); } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (csr_is_conn_state_infra(pMac, sessionId)) { /* Set the state to disconnect here */ pMac->roam.roamSession[sessionId].connectState = @@ -7626,10 +7626,10 @@ CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma * @sme_cmd: pointer to sme command being prepared * * Function to prepare internal sme disconnect command - * Return: CDF_STATUS_SUCCESS on success else CDF_STATUS_E_RESOURCES on failure + * Return: QDF_STATUS_SUCCESS on success else QDF_STATUS_E_RESOURCES on failure */ -CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, +QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd) { tSmeCmd *command; @@ -7637,7 +7637,7 @@ CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, command = csr_get_command_buffer(mac); if (!command) { sms_log(mac, LOGE, FL("fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } command->command = eSmeCommandRoam; @@ -7645,19 +7645,19 @@ CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, command->u.roamCmd.roamReason = eCsrForcedDisassoc; *sme_cmd = command; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; do { pCommand = csr_get_command_buffer(pMac); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } /* Change the substate in case it is wait-for-key */ @@ -7706,7 +7706,7 @@ CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session break; } status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -7715,10 +7715,10 @@ CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session return status; } -CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, bool fHighPriority) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL != pCommand) { @@ -7732,27 +7732,27 @@ CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrStopBss; status = csr_queue_sme_command(pMac, pCommand, fHighPriority); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); } } else { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } return status; } -CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_BTAMP_UT_RF /* Stop the retry */ @@ -7771,7 +7771,7 @@ CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING; csr_scan_abort_scan_for_ssid(pMac, sessionId); - status = CDF_STATUS_CMD_NOT_QUEUED; + status = QDF_STATUS_CMD_NOT_QUEUED; sms_log(pMac, LOG1, FL (" Disconnect cmd not queued, Roam command is not present" @@ -7780,14 +7780,14 @@ CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } csr_roam_cancel_roaming(pMac, sessionId); @@ -7797,13 +7797,13 @@ CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, return csr_roam_disconnect_internal(pMac, sessionId, reason); } -CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pIesTemp = pIes; uint8_t index; tCsrRoamSession *pSession = NULL; @@ -7813,7 +7813,7 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pConnectProfile = &pSession->connectedProfile; if (pConnectProfile->pAddIEAssoc) { @@ -7841,13 +7841,13 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->pAddIEAssoc = cdf_mem_malloc(pProfile->nAddIEAssocLength); if (NULL == pConnectProfile->pAddIEAssoc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to allocate memory for IE")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pConnectProfile->nAddIEAssocLength = pProfile->nAddIEAssocLength; @@ -7880,14 +7880,14 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_ESE if ((csr_is_profile_ese(pProfile) || - (CDF_IS_STATUS_SUCCESS(status) && (pIesTemp->ESEVersion.present) + (QDF_IS_STATUS_SUCCESS(status) && (pIesTemp->ESEVersion.present) && (pProfile->negotiatedAuthType == eCSR_AUTH_TYPE_OPEN_SYSTEM))) && (pMac->roam.configParam.isEseIniFeatureEnabled)) { pConnectProfile->isESEAssoc = 1; } #endif /* save ssid */ - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (pIesTemp->SSID.present) { pConnectProfile->SSID.length = pIesTemp->SSID.num_ssid; cdf_mem_copy(pConnectProfile->SSID.ssId, @@ -7921,7 +7921,7 @@ CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->qosConnection = pMac->roam.roamSession[sessionId].fWMMConnection; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_connect_bss_desc(pMac, sessionId); } for (index = 0; index < pProfile->SSIDs.numOfSSIDs; index++) { @@ -8031,7 +8031,7 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, /* Should indicate neighbor roam algorithm about the connect failure here */ csr_neighbor_roam_indicate_connect(pMac, pSmeJoinRsp->sessionId, - CDF_STATUS_E_FAILURE); + QDF_STATUS_E_FAILURE); } /* * if userspace has issued disconnection, @@ -8070,12 +8070,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, } /*else: ( eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode ) */ } -CDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile, uint32_t roamId) { - CDF_STATUS status; + QDF_STATUS status; sms_log(pMac, LOG1, "Attempting to Join Bssid= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pSirBssDesc->bssId)); @@ -8088,7 +8088,7 @@ CDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, @@ -8161,7 +8161,7 @@ void csr_roam_reissue_roam_command(tpAniSirGlobal pMac) eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_DISASSOCIATED); - if (!CDF_IS_STATUS_SUCCESS(csr_roam_issue_stop_bss(pMac, sessionId, + if (!QDF_IS_STATUS_SUCCESS(csr_roam_issue_stop_bss(pMac, sessionId, eCSR_ROAM_SUBSTATE_STOP_BSS_REQ))) { sms_log(pMac, LOGE, FL("Failed to reissue stop_bss command for WDS")); @@ -8273,9 +8273,9 @@ bool csr_is_scan_for_roam_command_active(tpAniSirGlobal pMac) return fRet; } -CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand = NULL; bool fHighPriority = true; bool fRemoveCmd = false; @@ -8286,7 +8286,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (!pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } if (eSmeCommandRoam == pCommand->command) { if (pCommand->u.roamCmd.roamReason == @@ -8311,7 +8311,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI sms_log(pMac, LOGE, FL (" fail to get command buffer as expected based on previous connect roam command")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } do { /* Change the substate in case it is wait-for-key */ @@ -8324,7 +8324,7 @@ CDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionI pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; status = csr_queue_sme_command(pMac, pCommand, fHighPriority); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); csr_release_command_roam(pMac, pCommand); @@ -8346,7 +8346,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, uint32_t session_id; tCsrRoamSession *session; tDot11fBeaconIEs *local_ies = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == entry) { sms_log(mac_ctx, LOGE, FL("CFG_CNF with active list empty")); @@ -8415,7 +8415,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, } if (csr_is_bss_type_ibss(cmd->u.roamCmd.roamProfile.BSSType) || CSR_IS_INFRA_AP(&cmd->u.roamCmd.roamProfile)) { - if (!CDF_IS_STATUS_SUCCESS(csr_roam_issue_start_bss(mac_ctx, + if (!QDF_IS_STATUS_SUCCESS(csr_roam_issue_start_bss(mac_ctx, session_id, &session->bssParams, &cmd->u.roamCmd.roamProfile, bss_desc, @@ -8450,7 +8450,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, if (!local_ies) { status = csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &local_ies); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; } @@ -8471,13 +8471,13 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, bss_desc, local_ies, &cmd->u.roamCmd.roamProfile, cmd->u.roamCmd.roamId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* try something else */ csr_roam(mac_ctx, cmd); } } } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; /* * We need to come with other way to figure out that this is * because of HO in BMP The below API will be only available for @@ -8518,7 +8518,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, &cmd->u.roamCmd.roamProfile, cmd->u.roamCmd.roamId); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* try something else */ csr_roam(mac_ctx, cmd); } @@ -8595,7 +8595,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, /* roaming. Note that we will attempt to Join the AP instead of a Reassoc since we may have attempted a */ /* 'Reassoc to self', which AP's that don't support Reassoc will force a Disassoc. */ /* The disassoc rsp message will remove the command from active list */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_issue_disassociate (pMac, pSmeJoinRsp->sessionId, eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, false))) { @@ -8694,7 +8694,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, tCsrScanResultFilter *scan_filter, tCsrRoamProfile *cur_roam_profile) { - CDF_STATUS status; + QDF_STATUS status; if (scan_filter) { csr_free_scan_filter(mac_ctx, scan_filter); @@ -8719,7 +8719,7 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, */ status = csr_roam_issue_disassociate(mac_ctx, session_id, eCSR_ROAM_SUBSTATE_DISASSOC_REASSOC_FAILURE, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_roam_issue_disassociate failed, status %d"), status); @@ -8743,7 +8743,7 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, tpCsrNeighborRoamControlInfo neighbor_roam_info, tScanResultHandle *hBSSList) { - CDF_STATUS status; + QDF_STATUS status; *scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == *scan_filter) { sms_log(mac_ctx, LOGE, FL("alloc for ScanFilter failed.")); @@ -8754,14 +8754,14 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, status = csr_roam_prepare_filter_from_profile(mac_ctx, &neighbor_roam_info->csrNeighborRoamProfile, *scan_filter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("failed to prepare scan filter, status %d"), status); return false; } status = csr_scan_get_result(mac_ctx, *scan_filter, hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_scan_get_result failed, status %d"), status); @@ -8778,7 +8778,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; tCsrRoamProfile *pCurRoamProfile = NULL; - CDF_STATUS status; + QDF_STATUS status; uint32_t sessionId; tCsrRoamSession *pSession; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; @@ -8865,7 +8865,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, pCurRoamProfile, hBSSList, eCsrSmeIssuedAssocToSimilarAP, roamId, true, false); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("issue_connect failed. status %d"), status); @@ -9091,7 +9091,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) tCsrRoamInfo roamInfo; tCsrRoamInfo *pRoamInfo = NULL; uint32_t sessionId; - CDF_STATUS status; + QDF_STATUS status; sms_log(pMac, LOG1, FL ("ASSOCIATION confirmation can be given to upper layer ")); @@ -9163,7 +9163,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) } } -CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, eCsrEncryptionType EncryptType, tSirBssDescription *pBssDescription, @@ -9173,7 +9173,7 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint8_t keyId, uint16_t keyLength, uint8_t *pKey, uint8_t paeRole) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniEdType edType; if (eCSR_ENCRYPT_TYPE_UNKNOWN == EncryptType) { @@ -9220,7 +9220,7 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, tCsrRoamSetKey *set_key, tSmeCmd *set_key_cmd, bool *enqueue_cmd) @@ -9235,7 +9235,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WEP40 keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP40_KEY_LEN; @@ -9253,7 +9253,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WEP104 keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP104_KEY_LEN; @@ -9268,7 +9268,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid TKIP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_TKIP_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9281,7 +9281,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid AES/CCMP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9295,7 +9295,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid WAPI keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WAPI_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9307,7 +9307,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("pCurRoamProfile is NULL.")); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } *enqueue_cmd = true; break; @@ -9320,7 +9320,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("Invalid KRK keylength [= %d]"), set_key->keyLength); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_copy(session->eseCckmInfo.krk, set_key->Key, CSR_KRK_KEY_LEN); @@ -9335,7 +9335,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, sms_log(mac_ctx, LOGW, FL("LFR3:Invalid BTK keylength [= %d]"), set_key->keyLength); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cdf_mem_copy(session->eseCckmInfo.btk, set_key->Key, SIR_BTK_KEY_LEN); @@ -9350,7 +9350,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, FL("Invalid AES/CCMP keylength [= %d]"), set_key->keyLength); *enqueue_cmd = false; - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, @@ -9361,18 +9361,18 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, default: /* for open security also we want to enqueue command */ *enqueue_cmd = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* end of switch */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; bool enqueue_cmd = true; tSmeCmd *pCommand = NULL; #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI) @@ -9380,14 +9380,14 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, if (NULL == pSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* FEATURE_WLAN_ESE */ pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { sms_log(pMac, LOGE, FL(" fail to get command buffer")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } cdf_mem_zero(pCommand, sizeof(tSmeCmd)); pCommand->command = eSmeCommandSetKey; @@ -9421,7 +9421,7 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, */ status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to send message status = %d"), status); /* update to false so that command can be freed */ @@ -9441,9 +9441,9 @@ static CDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status; + QDF_STATUS status; uint8_t numKeys = (pCommand->u.setKeyCmd.keyLength) ? 1 : 0; tAniEdType edType = csr_translate_encrypt_type_to_ed_type(pCommand->u.setKeyCmd.encType); @@ -9457,7 +9457,7 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma if (NULL == pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (eSIR_ED_NONE != edType) { @@ -9522,9 +9522,9 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma } else { sms_log(pMac, LOGW, FL(" cannot process not connected")); /* Set this status so the error handling take care of the case. */ - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL(" error status %d"), status); csr_roam_call_callback(pMac, sessionId, NULL, pCommand->u.setKeyCmd.roamId, @@ -9549,13 +9549,13 @@ CDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma return status; } -CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId) { - CDF_STATUS status; + QDF_STATUS status; if (!csr_is_set_key_allowed(pMac, sessionId)) { - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; } else { status = csr_roam_issue_set_key_command(pMac, sessionId, pSetKey, roamId); @@ -9568,12 +9568,12 @@ CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, Upon successful return, caller MUST call csr_free_scan_filter on pScanFilter when it is done with the filter. */ -CDF_STATUS +QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, tCsrRoamProfile *profile, tCsrScanResultFilter *scan_fltr) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; uint8_t idx = 0; tCsrChannelInfo *fltr_ch_info = &scan_fltr->ChannelInfo; @@ -9587,7 +9587,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, size = sizeof(struct cdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; scan_fltr->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == scan_fltr->BSSIDs.bssid) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } scan_fltr->BSSIDs.numOfBSSIDs = profile->BSSIDs.numOfBSSIDs; @@ -9608,10 +9608,10 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, scan_fltr->SSIDs.numOfSSIDs; scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; for (i = 0; i < roam_params->num_ssid_allowed_list; @@ -9631,7 +9631,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, profile->SSIDs.numOfSSIDs; scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_copy(scan_fltr->SSIDs.SSIDList, @@ -9649,7 +9649,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, cdf_mem_malloc(sizeof(*(fltr_ch_info->ChannelList)) * profile_ch_info->numOfChannels); if (NULL == fltr_ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } @@ -9668,7 +9668,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, } } else { sms_log(mac_ctx, LOGE, FL("Channel list empty")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_filter; } scan_fltr->uapsd_mask = profile->uapsd_mask; @@ -9716,7 +9716,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, scan_fltr->csrPersona = profile->csrPersona; free_filter: - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_free_scan_filter(mac_ctx, scan_fltr); return status; @@ -9758,7 +9758,7 @@ bool csr_roam_issue_wm_status_change(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(pCommand->u.wmStatusChangeCmd.u. DeauthIndMsg)); } - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_queue_sme_command(pMac, pCommand, true))) { fCommandQueued = true; } else { @@ -9772,7 +9772,7 @@ bool csr_roam_issue_wm_status_change(tpAniSirGlobal pMac, uint32_t sessionId, return fCommandQueued; } -static CDF_STATUS csr_send_snr_request(void *pGetRssiReq) +static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) { void *wma_handle; @@ -9780,29 +9780,29 @@ static CDF_STATUS csr_send_snr_request(void *pGetRssiReq) if (!wma_handle) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_send_snr_request(wma_handle, pGetRssiReq)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger wma stats request"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* dont send success, otherwise call back * will released with out values */ - return CDF_STATUS_E_BUSY; + return QDF_STATUS_E_BUSY; } static void csr_update_rssi(tpAniSirGlobal pMac, void *pMsg) { int8_t rssi = 0; tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) pMsg; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; if (pGetRssiReq) { if (NULL != pGetRssiReq->p_cds_context) { - cdf_status = csr_send_snr_request(pGetRssiReq); + qdf_status = csr_send_snr_request(pGetRssiReq); } else { sms_log(pMac, LOGE, FL("pGetRssiReq->p_cds_context is NULL")); @@ -9810,7 +9810,7 @@ static void csr_update_rssi(tpAniSirGlobal pMac, void *pMsg) } if (NULL != pGetRssiReq->rssiCallback) { - if (cdf_status != CDF_STATUS_E_BUSY) + if (qdf_status != QDF_STATUS_E_BUSY) ((tCsrRssiCallback) (pGetRssiReq->rssiCallback)) (rssi, pGetRssiReq->staId, pGetRssiReq->pDevContext); @@ -9835,7 +9835,7 @@ static void csr_update_snr(tpAniSirGlobal pMac, void *pMsg) tAniGetSnrReq *pGetSnrReq = (tAniGetSnrReq *) pMsg; if (pGetSnrReq) { - if (CDF_STATUS_SUCCESS != wma_get_snr(pGetSnrReq)) { + if (QDF_STATUS_SUCCESS != wma_get_snr(pGetSnrReq)) { sms_log(pMac, LOGE, FL("Error in wma_get_snr")); return; } @@ -9917,22 +9917,22 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes } #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ -static CDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, +static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, struct cdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; uint16_t len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* Create the message and send to lim */ len = sizeof(tSirResetAPCapsChange); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; @@ -9952,7 +9952,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeAssocInd *pAssocInd; tCsrRoamInfo roam_info; @@ -9962,7 +9962,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) pAssocInd = (tSirSmeAssocInd *) msg_ptr; status = csr_roam_get_session_id_from_bssid(mac_ctx, (struct cdf_mac_addr *) pAssocInd->bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOG1, FL("Couldn't find session_id for given BSSID")); return; @@ -10017,7 +10017,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_call_callback(mac_ctx, sessionId, roam_info_ptr, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) /* Refused due to Mac filtering */ roam_info_ptr->statusCode = eSIR_SME_ASSOC_REFUSED; } @@ -10041,7 +10041,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDisassocInd *pDisassocInd; tSmeCmd cmd; @@ -10056,7 +10056,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDisassocInd->bssid, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Session Id not found for BSSID " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pDisassocInd->bssid.bytes)); @@ -10140,7 +10140,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDeauthInd *pDeauthInd; tCsrRoamInfo roam_info; @@ -10151,7 +10151,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDeauthInd->bssid, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; /* If we are in neighbor preauth done state then on receiving * disassoc or deauth we dont roam instead we just disassoc @@ -10210,7 +10210,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tpSirSmeSwitchChannelInd pSwitchChnInd; /* in case of STA, the SWITCH_CHANNEL originates from its AP */ @@ -10221,7 +10221,7 @@ csr_roam_chk_lnk_swt_ch_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) */ status = csr_roam_get_session_id_from_bssid(mac_ctx, &pSwitchChnInd->bssid, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { session = CSR_GET_SESSION(mac_ctx, sessionId); if (!session) { sms_log(mac_ctx, LOGE, @@ -10242,7 +10242,7 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeDeauthRsp *pDeauthRsp = (tSirSmeDeauthRsp *) msg_ptr; tCsrRoamInfo roam_info; @@ -10272,7 +10272,7 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tCsrRoamInfo roam_info; /* @@ -10334,7 +10334,7 @@ static void csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tCsrRoamInfo roam_info; tpSirSmeMicFailureInd pMicInd = (tpSirSmeMicFailureInd) msg_ptr; @@ -10343,7 +10343,7 @@ csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pMicInd->bssId, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pMICFailureInfo = &pMicInd->info; roam_info_ptr = &roam_info; @@ -10363,7 +10363,7 @@ static void csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo roam_info; tpSirSmeProbeReqInd pProbeReqInd = (tpSirSmeProbeReqInd) msg_ptr; @@ -10372,7 +10372,7 @@ csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = csr_roam_get_session_id_from_bssid(mac_ctx, &pProbeReqInd->bssid, &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pWPSPBCProbeReq = &pProbeReqInd->WPSPBCProbeReq; csr_roam_call_callback(mac_ctx, sessionId, &roam_info, @@ -10415,7 +10415,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeWmStatusChangeNtf *pStatusChangeMsg; tCsrRoamInfo roam_info; @@ -10522,7 +10522,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, FL("CSR handling eSIR_SME_AP_CAPS_CHANGED")); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pApNewCaps->bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; if (eCSR_ROAMING_STATE_JOINED == mac_ctx->roam.curState[sessionId] @@ -10573,7 +10573,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSmeIbssPeerInd *pIbssPeerInd = (tSmeIbssPeerInd *) msg_ptr; tCsrRoamInfo roam_info; @@ -10613,9 +10613,9 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info.pbFrames = cdf_mem_malloc((pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd))); if (NULL == roam_info.pbFrames) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; roam_info.nBeaconLength = pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd); cdf_mem_copy(roam_info.pbFrames, @@ -10629,13 +10629,13 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info.pBssDesc = cdf_mem_malloc( session->pConnectBssDesc->length); if (NULL == roam_info.pBssDesc) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; if (roam_info.pbFrames) cdf_mem_free(roam_info.pbFrames); if (roam_info.pBssDesc) cdf_mem_free(roam_info.pBssDesc); } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_copy(roam_info.pBssDesc, session->pConnectBssDesc, session->pConnectBssDesc->length); @@ -10749,7 +10749,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) { tCsrRoamSession *session; uint32_t sessionId = CSR_SESSION_ID_INVALID; - CDF_STATUS status; + QDF_STATUS status; tCsrRoamInfo *roam_info_ptr = NULL; tSmeCmd *cmd; tCsrRoamInfo roam_info; @@ -10972,10 +10972,10 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, } } -CDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamingReason roamingReason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (CSR_IS_LOSTLINK_ROAMING(roamingReason) && (false == pMac->roam.roamSession[sessionId].fCancelRoaming)) { status = csr_scan_request_lost_link1(pMac, sessionId); @@ -11026,7 +11026,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, pSession->roamingReason = eCsrNotRoaming; } else { pSession->roamResult = roamResult; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_roaming_timer (pMac, sessionId, CDF_MC_TIMER_TO_SEC_UNIT))) { csr_call_roaming_completion_callback(pMac, pSession, NULL, @@ -11083,7 +11083,7 @@ void csr_roam_roaming_timer_handler(void *pv) } if (false == pSession->fCancelRoaming) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_roaming (pMac, sessionId, pSession->roamingReason))) { csr_call_roaming_completion_callback(pMac, pSession, NULL, @@ -11094,15 +11094,15 @@ void csr_roam_roaming_timer_handler(void *pv) } } -CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t interval) { - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, " csrScanStartRoamingTimer"); @@ -11113,7 +11113,7 @@ CDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId) { return cdf_mc_timer_stop (&pMac->roam.roamSession[sessionId].hTimerRoaming); @@ -11124,7 +11124,7 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) tCsrTimerInfo *pInfo = (tCsrTimerInfo *) pv; tpAniSirGlobal pMac = pInfo->pMac; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pInfo->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (pSession == NULL) { sms_log(pMac, LOGE, "%s: session not found", __func__); @@ -11165,7 +11165,7 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) pSession->connectedProfile.bssid); sme_process_pending_queue(pMac); status = sme_acquire_global_lock(&pMac->sme); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_disconnect(pMac, pInfo->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); sme_release_global_lock(&pMac->sme); @@ -11177,9 +11177,9 @@ void csr_roam_wait_for_key_time_out_handler(void *pv) } -CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval) +QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval) { - CDF_STATUS status; + QDF_STATUS status; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[pMac->roam.WaitForKeyTimerInfo. sessionId]; @@ -11203,7 +11203,7 @@ CDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t inter return status; } -CDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[pMac->roam.WaitForKeyTimerInfo. @@ -11270,10 +11270,10 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId, } } -CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t type, tSirSmeRsp *pSirMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDeauthInd *pDeauthIndMsg = NULL; tSirSmeDisassocInd *pDisassocIndMsg = NULL; eCsrRoamResult result = eCSR_ROAM_RESULT_LOSTLINK; @@ -11284,7 +11284,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Only need to roam for infra station. In this case P2P client will roam as well */ fToRoam = CSR_IS_INFRASTRUCTURE(&pSession->connectedProfile); @@ -11332,7 +11332,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, } else if (eWNI_SME_DEAUTH_IND == type) { status = csr_send_mb_deauth_cnf_msg(pMac, pDeauthIndMsg); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* If fail to send confirmation to PE, not to trigger roaming */ fToRoam = false; } @@ -11374,7 +11374,7 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, (eWNI_SME_DEAUTH_IND == type) ? eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); /* For IBSS, we need to give some more info to HDD */ if (csr_is_bss_type_ibss @@ -11428,17 +11428,17 @@ CDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->fCancelRoaming = false; @@ -11448,7 +11448,7 @@ CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, if (pMac->roam.configParam.nRoamingTime) { status = csr_roam_start_roaming(pMac, sessionId, pSession->roamingReason); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* * before starting the lost link logic release * the roam command for handoff @@ -11475,7 +11475,7 @@ CDF_STATUS csr_roam_lost_link_afterhandoff_failure(tpAniSirGlobal pMac, } } else { /* We are told not to roam, indicate lostlink */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; @@ -11514,7 +11514,7 @@ void csr_roam_wm_status_change_complete(tpAniSirGlobal pMac) void csr_roam_process_wm_status_change_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirSmeRsp *pSirSmeMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pCommand->sessionId); @@ -11776,15 +11776,15 @@ csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx, return cfg_dot11_mode; } -CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { - CDF_STATUS status; + QDF_STATUS status; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR { @@ -11802,7 +11802,7 @@ CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, /* attempt to stop the Bss (reason code is ignored...) */ status = csr_send_mb_stop_bss_req_msg(pMac, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("csr_send_mb_stop_bss_req_msg failed with status %d"), status); @@ -11811,7 +11811,7 @@ CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, } /* pNumChan is a caller allocated space with the sizeof pChannels */ -CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, +QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, uint32_t *pNumChan) { uint8_t num_chan_temp = 0; @@ -11820,7 +11820,7 @@ CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, if (!IS_SIR_STATUS_SUCCESS(wlan_cfg_get_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, (uint8_t *) pChannels, pNumChan))) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; for (i = 0; i < *pNumChan; i++) { if (!cds_is_dsrc_channel(cds_chan_to_freq(pChannels[i]))) { @@ -11830,7 +11830,7 @@ CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, } *pNumChan = num_chan_temp; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) @@ -11839,7 +11839,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) uint16_t cfgId = 0; int8_t maxTxPwr = 0; uint8_t *pCountryInfo = NULL; - CDF_STATUS status; + QDF_STATUS status; uint8_t count = 0; uint8_t firstChannel; uint8_t maxChannels; @@ -11855,10 +11855,10 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) pCountryInfo = cdf_mem_malloc(cfgLength); if (NULL == pCountryInfo) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (status != CDF_STATUS_SUCCESS) { + status = QDF_STATUS_SUCCESS; + if (status != QDF_STATUS_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("%s: failed to allocate memory, status = %d"), __FUNCTION__, status); @@ -11893,7 +11893,7 @@ bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel) uint32_t idxValidChannels; uint32_t len = sizeof(pMac->roam.validChannelList); - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_cfg_valid_channels(pMac, pMac->roam.validChannelList, &len))) { for (idxValidChannels = 0; (idxValidChannels < len); idxValidChannels++) { @@ -12049,7 +12049,7 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, uint32_t i; bool fCheck = false; tCsrScanResultFilter *pScanFilter = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!(pProfile1 && pProfile2)) return fCheck; @@ -12060,7 +12060,7 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile2, pScanFilter); - if (!(CDF_IS_STATUS_SUCCESS(status))) + if (!(QDF_IS_STATUS_SUCCESS(status))) goto free_scan_filter; for (i = 0; i < pScanFilter->SSIDs.numOfSSIDs; i++) { @@ -12158,7 +12158,7 @@ uint8_t csr_roam_get_ibss_start_channel_number50(tpAniSirGlobal pMac) } if (0 == channel && - CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels + QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels (pMac, (uint8_t *) pMac->roam.validChannelList, &len))) { @@ -12218,7 +12218,7 @@ uint8_t csr_roam_get_ibss_start_channel_number24(tpAniSirGlobal pMac) if (0 == channel && - CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels + QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels (pMac, (uint8_t *) pMac->roam.validChannelList, &len))) { @@ -12504,12 +12504,12 @@ static void csr_roam_determine_max_rate_for_ad_hoc(tpAniSirGlobal pMac, return; } -CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamStartBssParams *pParam, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrBand eBand; /* Set the roaming substate to 'Start BSS attempt'... */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_START_BSS_REQ, @@ -12555,7 +12555,7 @@ CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, pParam->ssidHidden = pProfile->SSIDs.SSIDList[0].ssidHidden; if (CSR_IS_INFRA_AP(pProfile) && (pParam->operationChn != 0)) { if (csr_is_valid_channel(pMac, pParam->operationChn) != - CDF_STATUS_SUCCESS) { + QDF_STATUS_SUCCESS) { pParam->operationChn = INFRA_AP_DEFAULT_CHANNEL; } } @@ -12670,11 +12670,11 @@ static void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, } } -static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, bool *pfSameIbss) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fSameIbss = false; if (csr_is_conn_state_ibss(pMac, sessionId)) { @@ -12700,10 +12700,10 @@ static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); /* there is no Bss description before we start an IBSS so we need to adopt */ /* all Bss configuration parameters from the Profile. */ @@ -12711,7 +12711,7 @@ static CDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_prepare_bss_config_from_profile(pMac, pProfile, pBssConfig, NULL); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* save dotMode */ pMac->roam.roamSession[sessionId].bssParams. uCfgDot11Mode = pBssConfig->uCfgDot11Mode; @@ -12759,17 +12759,17 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pSession->psk_pmk, pPSK_PMK, sizeof(pSession->psk_pmk)); pSession->pmk_len = pmk_len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ @@ -12797,7 +12797,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) } #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ -CDF_STATUS +QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache) @@ -12808,13 +12808,13 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("numItems = %d"), numItems); if (numItems > CSR_MAX_PMKID_ALLOWED) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR csr_roam_diag_set_pmkid(pSession); @@ -12827,7 +12827,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(tPmkidCacheInfo) * numItems); pSession->curr_cache_idx = (uint16_t)numItems; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (i = 0; i < numItems; i++) { @@ -12855,10 +12855,10 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (pSession->NumPmkidCache > CSR_MAX_PMKID_ALLOWED) pSession->NumPmkidCache = CSR_MAX_PMKID_ALLOWED; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pBSSId, bool flush_cache) @@ -12871,13 +12871,13 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Check if there are no entries to delete */ if (0 == pSession->NumPmkidCache) { sms_log(pMac, LOG1, FL("No entries to delete/Flush")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (flush_cache) { @@ -12886,7 +12886,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, sizeof(tPmkidCacheInfo) * CSR_MAX_PMKID_ALLOWED); pSession->NumPmkidCache = 0; pSession->curr_cache_idx = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* !flush_cache - so look up in the cache */ @@ -12905,7 +12905,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, if (Index == CSR_MAX_PMKID_ALLOWED && !fMatchFound) { sms_log(pMac, LOG1, FL("No such PMKSA entry exists" MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pBSSId)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Match Found, Readjust the other entries */ @@ -12935,7 +12935,7 @@ CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, /* Decrement the count since an entry has been deleted */ pSession->NumPmkidCache--; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId) @@ -12943,7 +12943,7 @@ uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId) return pMac->roam.roamSession[sessionId].NumPmkidCache; } -CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -12952,21 +12952,21 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pNum || !pPmkidCache) { sms_log(pMac, LOGE, FL("Either pNum or pPmkidCache is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->NumPmkidCache == 0) { *pNum = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (*pNum < pSession->NumPmkidCache) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pSession->NumPmkidCache > CSR_MAX_PMKID_ALLOWED) { @@ -12990,19 +12990,19 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, } *pNum = pSession->NumPmkidCache; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13012,23 +13012,23 @@ CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWpaRsnReqIeLength) { cdf_mem_copy(pBuf, pSession->pWpaRsnReqIE, pSession->nWpaRsnReqIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } return status; } -CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13038,7 +13038,7 @@ CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWpaRsnRspIeLength) { cdf_mem_copy(pBuf, pSession->pWpaRsnRspIE, pSession->nWpaRsnRspIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -13046,16 +13046,16 @@ CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13065,23 +13065,23 @@ CDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWapiReqIeLength) { cdf_mem_copy(pBuf, pSession->pWapiReqIE, pSession->nWapiReqIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } return status; } -CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (pLen) { @@ -13091,7 +13091,7 @@ CDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (len >= pSession->nWapiRspIeLength) { cdf_mem_copy(pBuf, pSession->pWapiRspIE, pSession->nWapiRspIeLength); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -13116,11 +13116,11 @@ eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac, uint32_t sessio } /* This function remove the connected BSS from te cached scan result */ -CDF_STATUS +QDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pConnProfile) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrScanResultFilter *pScanFilter = NULL; tListElem *pEntry; tCsrScanResult *pResult; @@ -13136,13 +13136,13 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, */ pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); if (NULL == pScanFilter->BSSIDs.bssid) { cdf_mem_free(pScanFilter); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pScanFilter->BSSIDs.bssid, &pConnProfile->bssid, sizeof(struct cdf_mac_addr)); @@ -13154,7 +13154,7 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(&pScanFilter->SSIDs.SSIDList[0].SSID, &pConnProfile->SSID, sizeof(tSirMacSSid)); @@ -13213,17 +13213,17 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, return status; } -static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, +static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tBssConfigParam bssConfig; if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (csr_is_conn_state_ibss(pMac, sessionId)) { @@ -13244,7 +13244,7 @@ static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, if (csr_is_conn_state_wds(pMac, sessionId)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); /* Assume HDD provide bssid in profile */ @@ -13255,7 +13255,7 @@ static CDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, status = csr_roam_prepare_bss_config_from_profile(pMac, pProfile, &bssConfig, pBssDesc); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Save profile for late use */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = @@ -13303,7 +13303,7 @@ static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, } size = sizeof(mac_ctx->roam.validChannelList); - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &size))) { @@ -13335,12 +13335,12 @@ static void csr_add_supported_5Ghz_channels(tpAniSirGlobal mac_ctx, * the size of actual 'tSirBssDescription' varies, the receiving side should * keep in mind not to access the components DIRECTLY after tSirRSNie. */ -CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t acm_mask = 0, uapsd_mask; uint16_t msgLen, ieLen; tSirMacRateSet OpRateSet; @@ -13361,12 +13361,12 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* To satisfy klockworks */ if (NULL == pBssDescription) { sms_log(pMac, LOGE, FL(" pBssDescription is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { @@ -13395,10 +13395,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, sizeof(uint16_t); csr_join_req = cdf_mem_malloc(msgLen); if (NULL == csr_join_req) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(csr_join_req, msgLen, 0); csr_join_req->messageType = messageType; @@ -13457,7 +13457,7 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, &ExRateSet); ps_param->uapsd_per_ac_bit_mask = pProfile->uapsd_mask; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* OperationalRateSet */ if (OpRateSet.numRates) { csr_join_req->operationalRateSet.numRates = @@ -13528,10 +13528,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, pSession->pWapiReqIE = cdf_mem_malloc(ieLen); if (NULL == pSession->pWapiReqIE) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nWapiReqIeLength = ieLen; @@ -13553,10 +13553,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, pSession->pWpaRsnReqIE = cdf_mem_malloc(ieLen); if (NULL == pSession->pWpaRsnReqIE) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nWpaRsnReqIeLength = ieLen; @@ -13623,10 +13623,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->pAddIEScan = cdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEScan) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nAddIEScanLength = ieLen; @@ -13653,10 +13653,10 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->pAddIEAssoc = cdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEAssoc) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; } pSession->nAddIEAssocLength = ieLen; @@ -13929,13 +13929,13 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("STA-conn on 5G isn't allowed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } if (!CDS_IS_CHANNEL_5GHZ(pBssDescription->channelId) && (false == csr_is_conn_allow_2g_band(pMac, pBssDescription->channelId))) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } @@ -13951,12 +13951,12 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!CDS_IS_CHANNEL_24GHZ(pBssDescription->channelId) && (false == csr_is_conn_allow_5g_band(pMac, pBssDescription->channelId))) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } } status = cds_send_mb_message_to_mac(csr_join_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* * cds_send_mb_message_to_mac would've released the mem * allocated by csr_join_req. Let's make it defensive by @@ -13986,25 +13986,25 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } while (0); /* Clean up the memory in case of any failure */ - if (!CDF_IS_STATUS_SUCCESS(status) && (NULL != csr_join_req)) + if (!QDF_IS_STATUS_SUCCESS(status) && (NULL != csr_join_req)) cdf_mem_free(csr_join_req); return status; } /* */ -CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode) { tSirSmeDisassocReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!CSR_IS_SESSION_VALID(pMac, sessionId)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeDisassocReq), 0); pMsg->messageType = eWNI_SME_DISASSOC_REQ; @@ -14039,7 +14039,7 @@ CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS +QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, struct cdf_mac_addr bssid, @@ -14047,12 +14047,12 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetAssocSTAsReq *pMsg; pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_GET_ASSOC_STAS_REQ; cdf_copy_macaddr(&pMsg->bssid, &bssid); @@ -14067,22 +14067,22 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr remove_mac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetWPSPBCSessionsReq *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeGetWPSPBCSessionsReq)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeGetWPSPBCSessionsReq), 0); pMsg->messageType = eWNI_SME_GET_WPSPBC_SESSION_REQ; @@ -14097,20 +14097,20 @@ csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId) { tpSirChangeBIParams pMsg; uint16_t len = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* NO need to update the Beacon Params if update beacon parameter flag is not set */ if (!pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval = false; @@ -14119,10 +14119,10 @@ CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi len = sizeof(tSirChangeBIParams); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirChangeBIParams), 0); pMsg->messageType = eWNI_SME_CHNG_MCC_BEACON_INTERVAL; pMsg->length = len; @@ -14144,27 +14144,27 @@ CDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi } #ifdef QCA_HT_2040_COEX -CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, ePhyChanBondState cbMode, bool obssEnabled) { tpSirSetHT2040Mode pMsg; uint16_t len = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Create the message and send to lim */ len = sizeof(tSirSetHT2040Mode); pMsg = cdf_mem_malloc(len); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_set(pMsg, sizeof(tSirSetHT2040Mode), 0); pMsg->messageType = eWNI_SME_SET_HT_2040_MODE; pMsg->length = len; @@ -14184,18 +14184,18 @@ CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, } #endif -CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode) { tSirSmeDeauthReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!CSR_IS_SESSION_VALID(pMac, sessionId)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeDeauthReq), 0); pMsg->messageType = eWNI_SME_DEAUTH_REQ; @@ -14220,18 +14220,18 @@ CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDisassocInd pDisassocInd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDisassocCnf *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocCnf)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeDisassocCnf), 0); pMsg->messageType = eWNI_SME_DISASSOC_CNF; @@ -14239,15 +14239,15 @@ CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, pMsg->length = sizeof(tSirSmeDisassocCnf); cdf_copy_macaddr(&pMsg->peer_macaddr, &pDisassocInd->peer_macaddr); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } cdf_copy_macaddr(&pMsg->bssid, &pDisassocInd->bssid); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } @@ -14257,33 +14257,33 @@ CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDeauthCnf *pMsg; do { pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthCnf)); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) break; cdf_mem_set(pMsg, sizeof(tSirSmeDeauthCnf), 0); pMsg->messageType = eWNI_SME_DEAUTH_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDeauthCnf); cdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } cdf_copy_macaddr(&pMsg->peer_macaddr, &pDeauthInd->peer_macaddr); - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } @@ -14292,10 +14292,10 @@ CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus) +QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, + QDF_STATUS Halstatus) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeAssocCnf *pMsg; sms_log(pMac, LOG1, @@ -14304,11 +14304,11 @@ CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn do { pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocCnf)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeAssocCnf), 0); pMsg->messageType = eWNI_SME_ASSOC_CNF; pMsg->length = sizeof(tSirSmeAssocCnf); - if (CDF_IS_STATUS_SUCCESS(Halstatus)) + if (QDF_IS_STATUS_SUCCESS(Halstatus)) pMsg->statusCode = eSIR_SME_SUCCESS; else pMsg->statusCode = eSIR_SME_ASSOC_REFUSED; @@ -14331,9 +14331,9 @@ CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn return status; } -CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus, + QDF_STATUS Halstatus, uint8_t sessionId) { tSirMsgQ msgQ; @@ -14344,7 +14344,7 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, do { pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocIndToUpperLayerCnf)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeAssocIndToUpperLayerCnf), 0); pMsg->messageType = eWNI_SME_UPPER_LAYER_ASSOC_CNF; @@ -14353,7 +14353,7 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, pMsg->sessionId = sessionId; pBuf = (uint8_t *) &pMsg->statusCode; - if (CDF_IS_STATUS_SUCCESS(Halstatus)) + if (QDF_IS_STATUS_SUCCESS(Halstatus)) statusCode = eSIR_SME_SUCCESS; else statusCode = eSIR_SME_ASSOC_REFUSED; @@ -14409,10 +14409,10 @@ CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, msgQ.bodyval = 0; sys_process_mmh_msg(pMac, &msgQ); } while (0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr peer_macaddr, uint8_t numKeys, @@ -14424,7 +14424,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, { tSirSmeSetContextReq *pMsg; uint16_t msgLen; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); sms_log(pMac, LOG1, FL("keylength is %d, Encry type is : %d"), keyLength, edType); @@ -14440,7 +14440,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SETCONTEXT_REQ; pMsg->length = msgLen; @@ -14486,7 +14486,7 @@ CDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamBssType bssType, tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc) @@ -14497,14 +14497,14 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS; pSession->joinFailStatusCode.reasonCode = 0; pMsg = cdf_mem_malloc(sizeof(tSirSmeStartBssReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeStartBssReq), 0); pMsg->messageType = eWNI_SME_START_BSS_REQ; @@ -14523,7 +14523,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId wTmp = WNI_CFG_BEACON_INTERVAL_STADEF; if (csr_isconcurrentsession_valid(pMac, sessionId, pParam->bssPersona) - == CDF_STATUS_SUCCESS) { + == QDF_STATUS_SUCCESS) { csr_validate_mcc_beacon_interval(pMac, pParam->operationChn, &wTmp, @@ -14535,7 +14535,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId sms_log(pMac, LOGE, FL("****Start BSS failed persona already exists***")); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg->beaconInterval = wTmp; pMsg->dot11mode = @@ -14578,7 +14578,7 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId if (pParam->nRSNIELength > sizeof(pMsg->rsnIE.rsnIEdata)) { cdf_mem_free(pMsg); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pMsg->rsnIE.length = pParam->nRSNIELength; cdf_mem_copy(pMsg->rsnIE.rsnIEdata, @@ -14603,19 +14603,19 @@ CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) { tSirSmeStopBssReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(tSirSmeStopBssReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirSmeStopBssReq), 0); pMsg->messageType = eWNI_SME_STOP_BSS_REQ; pMsg->sessionId = sessionId; @@ -14626,11 +14626,11 @@ CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) return cds_send_mb_message_to_mac(pMsg); } -CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields *pModProfileFields, uint32_t *pRoamId, bool fForce) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t roamId = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if ((csr_is_conn_state_connected(pMac, sessionId)) && @@ -14652,10 +14652,10 @@ CDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static CDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, +static QDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); status = csr_roam_call_callback(pMac, sessionId, &roamInfo, 0, @@ -14664,34 +14664,34 @@ static CDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; struct add_sta_self_params *rsp; struct send_extcap_ie *msg; - CDF_STATUS status; + QDF_STATUS status; if (pMsg == NULL) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (!pEntry) { sms_log(pMac, LOGE, "in %s NO commands are ACTIVE ...", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); if (eSmeCommandAddStaSession != pCommand->command) { sms_log(pMac, LOGE, "in %s Cmd not in active list ...", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } rsp = (struct add_sta_self_params *) pMsg; sms_log(pMac, LOG1, "Add Sta self rsp status = %d", rsp->status); - if (CDF_STATUS_SUCCESS == rsp->status && + if (QDF_STATUS_SUCCESS == rsp->status && (WMI_VDEV_TYPE_STA == rsp->type || (WMI_VDEV_TYPE_AP == rsp->type && WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE == rsp->sub_type))) { @@ -14699,7 +14699,7 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(pMac, LOGE, FL("Memory allocation failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(msg, sizeof(*msg), 0); @@ -14707,7 +14707,7 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) msg->session_id = rsp->session_id; msg->length = sizeof(*msg); status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("Failed to send down the set IE req ")); } @@ -14720,18 +14720,18 @@ CDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_release_command(pMac, pCommand); } sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr sessionMacAddr, uint32_t type, uint32_t subType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { pCommand->command = eSmeCommandAddStaSession; pCommand->sessionId = (uint8_t) sessionId; @@ -14742,7 +14742,7 @@ CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi pCommand->u.addStaSessionCmd.type = type; pCommand->u.addStaSessionCmd.subType = subType; status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Should be panic?? */ sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); @@ -14751,14 +14751,14 @@ CDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi return status; } -CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { tAddStaForSessionCmd *pAddStaReq = &pCommand->u.addStaSessionCmd; uint8_t sessionId = pCommand->sessionId; struct add_sta_self_params *add_sta_self_req; - CDF_STATUS status = CDF_STATUS_E_NOMEM; + QDF_STATUS status = QDF_STATUS_E_NOMEM; tSirMsgQ msg; add_sta_self_req = cdf_mem_malloc(sizeof(struct add_sta_self_params)); @@ -14788,7 +14788,7 @@ CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); status = wma_post_ctrl_msg(pMac, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); cdf_mem_free(add_sta_self_req); add_sta_self_req = NULL; @@ -14796,13 +14796,13 @@ CDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i, value = 0; union { uint16_t nCfgValue16; @@ -14821,7 +14821,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, i); break; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pSession->sessionActive = true; pSession->sessionId = (uint8_t) i; @@ -14838,7 +14838,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, CDF_TIMER_TYPE_SW, csr_roam_roaming_timer_handler, &pSession->roamingTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for Roaming timer")); @@ -14859,7 +14859,7 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_join_retry_timer_handler, &pSession-> joinRetryTimerInfo); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("cannot allocate memory for join retry timer")); @@ -14885,14 +14885,14 @@ CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, sms_log(pMac, LOGE, "%s: Reached max interfaces: %d! Session creation will fail", __func__, pMac->sme.max_intf_count); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } return status; } -CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; struct del_sta_self_params *rsp; @@ -14919,13 +14919,13 @@ CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_cleanup_session(pMac, sessionId); if (pCommand->u.delStaSessionCmd.callback) { status = sme_release_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOG1, FL("Failed to Release Lock")); else { pCommand->u.delStaSessionCmd. callback(pCommand->u.delStaSessionCmd.pContext); status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("Failed to get Lock")); return status; } @@ -14938,21 +14938,21 @@ CDF_STATUS csr_process_del_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) csr_release_command(pMac, pCommand); } sme_process_pending_queue(pMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } -CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr sessionMacAddr, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *pCommand; pCommand = csr_get_command_buffer(pMac); if (NULL == pCommand) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; } else { pCommand->command = eSmeCommandDelStaSession; pCommand->sessionId = (uint8_t) sessionId; @@ -14961,7 +14961,7 @@ CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi cdf_mem_copy(pCommand->u.delStaSessionCmd.selfMacAddr, sessionMacAddr, sizeof(tSirMacAddr)); status = csr_queue_sme_command(pMac, pCommand, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Should be panic?? */ sms_log(pMac, LOGE, FL(" fail to send message status = %d"), status); @@ -14970,17 +14970,17 @@ CDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi return status; } -CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, +QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { struct del_sta_self_params *del_sta_self_req; tSirMsgQ msg; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; del_sta_self_req = cdf_mem_malloc(sizeof(struct del_sta_self_params)); if (NULL == del_sta_self_req) { lim_log(pMac, LOGP, FL(" mem alloc failed for tDelStaSelfParams")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(del_sta_self_req->self_mac_addr, @@ -14997,7 +14997,7 @@ CDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, FL("sending WMA_DEL_STA_SELF_REQ")); MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); status = wma_post_ctrl_msg(pMac, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); cdf_mem_free(del_sta_self_req); } @@ -15012,7 +15012,7 @@ static void purge_csr_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId) tDblLinkList localList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -15065,12 +15065,12 @@ void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId) } } -CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, bool fSync, csr_roamSessionCloseCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (CSR_IS_SESSION_VALID(pMac, sessionId)) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (fSync) { @@ -15088,7 +15088,7 @@ CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, callback, pContext); } } else { - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } return status; } @@ -15147,11 +15147,11 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) pSession->nAddIEAssocLength = 0; } -CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, uint32_t *pSessionId) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t i; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i)) { @@ -15159,7 +15159,7 @@ CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, &pMac->roam.roamSession[i].connectedProfile. bssid)) { /* Found it */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; *pSessionId = i; break; } @@ -15217,7 +15217,7 @@ static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid) csr_roam_get_session_id_from_bssid(pMac, &bssid, &sessionId); csr_neighbor_roam_indicate_connect(pMac, sessionId, - CDF_STATUS_SUCCESS); + QDF_STATUS_SUCCESS); } static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) @@ -15264,7 +15264,7 @@ static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId) void csr_roam_tl_stats_timer_handler(void *pv) { tpAniSirGlobal pMac = PMAC_STRUCT(pv); - CDF_STATUS status; + QDF_STATUS status; pMac->roam.tlStatsReqInfo.timerRunning = false; sms_log(pMac, LOG1, @@ -15279,7 +15279,7 @@ void csr_roam_tl_stats_timer_handler(void *pv) hTlStatsTimer, pMac->roam.tlStatsReqInfo. periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_tl_stats_timer_handler:cannot start TlStatsTimer timer")); @@ -15293,18 +15293,18 @@ void csr_roam_tl_stats_timer_handler(void *pv) void csr_roam_pe_stats_timer_handler(void *pv) { tCsrPeStatsReqInfo *pPeStatsReqListEntry = (tCsrPeStatsReqInfo *) pv; - CDF_STATUS status; + QDF_STATUS status; tpAniSirGlobal pMac = pPeStatsReqListEntry->pMac; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; pPeStatsReqListEntry->timerRunning = false; if (pPeStatsReqListEntry->timerStopFailed == true) { /* If we entered here, meaning the timer could not be successfully */ /* stopped in csr_roam_remove_entry_from_pe_stats_req_list(). So do it here. */ /* Destroy the timer */ - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pPeStatsReqListEntry->hPeStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:failed to destroy hPeStatsTimer timer")); @@ -15322,7 +15322,7 @@ void csr_roam_pe_stats_timer_handler(void *pv) pPeStatsReqListEntry->staId, pPeStatsReqListEntry-> sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:failed to send down stats req to PE")); @@ -15343,12 +15343,12 @@ void csr_roam_pe_stats_timer_handler(void *pv) statsReqPeriodicityInPS; } /* start timer */ - cdf_status = + qdf_status = cdf_mc_timer_start(&pPeStatsReqListEntry-> hPeStatsTimer, pPeStatsReqListEntry-> periodicity); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_pe_stats_timer_handler:cannot start hPeStatsTimer timer")); @@ -15371,15 +15371,15 @@ void csr_roam_stats_client_timer_handler(void *pv) } } -CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, +QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, uint8_t staId, uint8_t sessionId) { tAniGetPEStatsReq *pMsg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMsg = cdf_mem_malloc(sizeof(tAniGetPEStatsReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, FL("Failed to allocate mem for stats req ")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* need to initiate a stats request to PE */ pMsg->msgType = eWNI_SME_GET_STATISTICS_REQ; @@ -15388,7 +15388,7 @@ CDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, pMsg->statsMask = statsMask; pMsg->sessionId = sessionId; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("Failed to send down the stats req ")); } return status; @@ -15755,13 +15755,13 @@ tCsrPeStatsReqInfo *csr_roam_insert_entry_into_pe_stats_req_list(tpAniSirGlobal return pNewStaEntry; } -CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, +QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; uint32_t sessionId; @@ -15769,17 +15769,17 @@ CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, sms_log(pMac, LOG2, FL("called")); status = csr_roam_get_session_id_from_bssid(pMac, &bssId, &sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { callback(lastRSSI, staId, pContext); sms_log(pMac, LOGE, FL("Failed to get SessionId")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(tAniGetRssiReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_get_rssi: failed to allocate mem for req "); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_GET_RSSI_REQ; @@ -15797,20 +15797,20 @@ CDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, msg.type = eWNI_SME_GET_RSSI_REQ; msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_get_rssi failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, FL("returned")); return status; } -CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, +QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; uint32_t sessionId; @@ -15822,7 +15822,7 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, if (NULL == pMsg) { sms_log(pMac, LOGE, "%s: failed to allocate mem for req", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_roam_get_session_id_from_bssid(pMac, &bssId, &sessionId); @@ -15837,10 +15837,10 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "%s failed to post msg to self", __func__); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, FL("returned")); @@ -15848,19 +15848,19 @@ CDF_STATUS csr_get_snr(tpAniSirGlobal pMac, } #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, struct cdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tAniGetTsmStatsReq *pMsg = NULL; pMsg = cdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); if (!pMsg) { sms_log(pMac, LOGE, "csr_get_tsm_stats: failed to allocate mem for req"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* need to initiate a stats request to PE */ pMsg->msgType = eWNI_SME_GET_TSM_STATS_REQ; @@ -15872,11 +15872,11 @@ CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, pMsg->pDevContext = pContext; pMsg->p_cds_context = p_cds_context; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, " csr_get_tsm_stats: failed to send down the rssi req"); /* pMsg is freed by cds_send_mb_message_to_mac */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -15889,11 +15889,11 @@ CDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_deregister_client_request(tpAniSirGlobal mac_ctx, tCsrStatsClientReqInfo *sta_entry) { - CDF_STATUS status; + QDF_STATUS status; tListElem *entry = NULL; tCsrStatsClientReqInfo *ptr_sta_entry = NULL; @@ -15902,7 +15902,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, if (!entry) { sms_log(mac_ctx, LOGW, FL("callback is empty in the request & couldn't find any existing request in statsClientReqList")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* clean up & return */ ptr_sta_entry = GET_BASE_ADDR(entry, tCsrStatsClientReqInfo, link); @@ -15919,7 +15919,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, if (mac_ctx->roam.tlStatsReqInfo.timerRunning) { status = cdf_mc_timer_stop( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot stop TlStatsTimer timer")); return status; @@ -15931,12 +15931,12 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, cdf_mc_timer_stop(&ptr_sta_entry->timer); /* Destroy the cdf timer... */ status = cdf_mc_timer_destroy(&ptr_sta_entry->timer); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, FL("failed to destroy Client req timer")); csr_roam_remove_stat_list_entry(mac_ctx, entry); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -15947,19 +15947,19 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, tCsrStatsClientReqInfo *sta_entry, uint32_t periodicity) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrStatsClientReqInfo *ptr_sta_entry = csr_roam_insert_entry_into_list( mac_ctx, &mac_ctx->roam.statsClientReqList, sta_entry); if (!ptr_sta_entry) { sms_log(mac_ctx, LOGW, FL("Failed to insert req in statsClientReqList")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Init & start timer if needed */ ptr_sta_entry->periodicity = periodicity; @@ -15968,17 +15968,17 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, CDF_TIMER_TYPE_SW, csr_roam_stats_client_timer_handler, ptr_sta_entry); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot init StatsClient timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = cdf_mc_timer_start(&ptr_sta_entry->timer, ptr_sta_entry->periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot start StatsClient timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } return status; @@ -15993,18 +15993,18 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, * * Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, bool cache, uint8_t staId, uint32_t periodicity) { - CDF_STATUS status; + QDF_STATUS status; if (cache && mac_ctx->roam.tlStatsReqInfo.numClient) { sms_log(mac_ctx, LOGE, FL("Looking for cached stats from TL")); mac_ctx->roam.tlStatsReqInfo.numClient++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* update periodicity */ @@ -16028,19 +16028,19 @@ csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, status = cdf_mc_timer_start( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer, mac_ctx->roam.tlStatsReqInfo.periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("cannot start TlStatsTimer timer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx->roam.tlStatsReqInfo.timerRunning = true; } } mac_ctx->roam.tlStatsReqInfo.numClient++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, +QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, eCsrStatsRequesterType requesterId, uint32_t statsMask, tCsrStatsCallback callback, @@ -16053,22 +16053,22 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, tCsrStatsClientReqInfo staEntry; tCsrPeStatsReqInfo *pPeStaEntry = NULL; bool found = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool insertInClientList = false; uint32_t temp_mask = 0; if (csr_is_all_session_disconnected(pMac)) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (csr_neighbor_middle_of_roaming(pMac, sessionId)) { sms_log(pMac, LOG1, FL("in the middle of roaming states")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((!statsMask) && (!callback)) { sms_log(pMac, LOGW, FL("statsMask & callback empty in the request")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* for the search list method for deregister */ staEntry.requesterId = requesterId; @@ -16081,7 +16081,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* return the cached stats */ csr_roam_report_statistics(pMac, statsMask, callback, staId, pContext); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* add the request in the client req list */ staEntry.callback = callback; @@ -16104,7 +16104,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, staId, sessionId); if (!pPeStaEntry) /* bail out, maxed out on num of req for PE */ - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; else staEntry.pPeStaEntry = pPeStaEntry; } @@ -16116,7 +16116,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, if (temp_mask) { status = csr_get_statistics_from_tl(pMac, cache, staId, periodicity); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return status; } insertInClientList = true; @@ -16128,7 +16128,7 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* send down a req */ status = csr_send_mb_stats_req_msg(pMac, temp_mask, staId, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("failed to send down stats req")); /* @@ -16143,14 +16143,14 @@ CDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, /* return the stats */ csr_roam_report_statistics(pMac, statsMask, callback, staId, pContext); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } if (insertInClientList) return csr_insert_stats_request_to_list(pMac, &staEntry, periodicity); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static tSirRetStatus @@ -16270,17 +16270,17 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, uint32_t sessionId, bool nRoamKeyMgmtOffloadEnabled) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->RoamKeyMgmtOffloadEnabled = nRoamKeyMgmtOffloadEnabled; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -16368,7 +16368,7 @@ csr_check_band_channel_match(eCsrBand band, uint8_t channel) * * Return: result of operation */ -static CDF_STATUS +static QDF_STATUS csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, tpCsrNeighborRoamControlInfo roam_info, tSirRoamOffloadScanReq *req_buf) @@ -16387,7 +16387,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid band(%d), roam scan offload req aborted"), band); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (i = 0; i < roam_info->cfgParams.channelInfo.numOfChannels; i++) { @@ -16406,7 +16406,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, } req_buf->ConnectedNetwork.ChannelCount = num_channels; req_buf->ChannelCacheType = CHANNEL_LIST_STATIC; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -16519,11 +16519,11 @@ csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, * * Return: void */ -static CDF_STATUS +static QDF_STATUS csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, tSirRoamOffloadScanReq *req_buf) { - CDF_STATUS status; + QDF_STATUS status; uint32_t host_channels = 0; uint8_t *ch_lst = NULL; uint8_t i = 0, num_channels = 0; @@ -16532,7 +16532,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, status = csr_get_cfg_valid_channels(mac_ctx, mac_ctx->roam.validChannelList, &host_channels); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get the valid channel list")); return status; @@ -16572,7 +16572,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, tpCsrNeighborRoamControlInfo roam_info) { - CDF_STATUS status; + QDF_STATUS status; uint8_t i, j, dot11_mode; bool ese_neighbor_list_recvd = false; uint8_t ch_cache_str[128] = { 0 }; @@ -16683,7 +16683,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, if (roam_info->cfgParams.channelInfo.numOfChannels) { status = csr_fetch_ch_lst_from_ini(mac_ctx, roam_info, req_buf); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(req_buf); return NULL; } @@ -16719,7 +16719,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, /* Maintain the Valid Channels List */ status = csr_fetch_valid_ch_lst(mac_ctx, req_buf); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(req_buf); return NULL; } @@ -16913,14 +16913,14 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command, * * Return: result of operation */ -CDF_STATUS +QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, uint8_t command, uint8_t reason) { uint8_t *state = NULL; cds_msg_t msg; tSirRoamOffloadScanReq *req_buf; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); tpCsrNeighborRoamControlInfo roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; @@ -16932,7 +16932,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, if (NULL == session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session is null")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress @@ -16943,25 +16943,25 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, * expecting any WMI commands when the roam synch is in progress */ b_roam_scan_offload_started = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif if (0 == csr_roam_is_roam_offload_scan_enabled(mac_ctx)) { sms_log(mac_ctx, LOGE, "isRoamOffloadScanEnabled not set"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) && reason != REASON_ROAM_SET_BLACKLIST_BSSID) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RSO out-of-sync command %d lastSentCmd %d"), command, roam_info->last_sent_cmd); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((true == b_roam_scan_offload_started) && (ROAM_SCAN_OFFLOAD_START == command)) { sms_log(mac_ctx, LOGE, "Roam Scan Offload is already started"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * The Dynamic Config Items Update may happen even if the state is in @@ -16982,7 +16982,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan Command not sent to FW state=%s and cmd=%d"), state, command); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } req_buf = csr_create_roam_scan_offload_request(mac_ctx, command, @@ -16991,7 +16991,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, if (!req_buf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to create req packet")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_params_dst = &req_buf->roam_params; roam_params_src = &mac_ctx->roam.configParam.roam_params; @@ -17085,13 +17085,13 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, msg.type = WMA_ROAM_SCAN_OFFLOAD_REQ; msg.reserved = 0; msg.bodyptr = req_buf; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post message to WMA", __func__); cdf_mem_free(req_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { if (ROAM_SCAN_OFFLOAD_START == command) b_roam_scan_offload_started = true; @@ -17106,7 +17106,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, return status; } -CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, tpSirRoamOffloadScanRsp scanOffloadRsp) { switch (scanOffloadRsp->reason) { @@ -17124,7 +17124,7 @@ CDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, "Rsp for Roam Scan Offload with reason %d", scanOffloadRsp->reason); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, @@ -17134,11 +17134,11 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, uint8_t staId, uint8_t sessionId) { bool found = false; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrPeStatsReqInfo staEntry; tCsrPeStatsReqInfo *pTempStaEntry = NULL; tListElem *pStaEntry = NULL; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; *pFound = false; pStaEntry = csr_roam_find_in_pe_stats_req_list(pMac, statsMask); @@ -17186,7 +17186,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, statsMask & ~(1 << eCsrGlobalClassDStats), staId, sessionId); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:failed to send down stats req to PE")); @@ -17197,13 +17197,13 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, if (pTempStaEntry->periodicity) { if (!found) { - cdf_status = + qdf_status = cdf_mc_timer_init(&pTempStaEntry-> hPeStatsTimer, CDF_TIMER_TYPE_SW, csr_roam_pe_stats_timer_handler, pTempStaEntry); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:cannot init hPeStatsTimer timer")); @@ -17214,10 +17214,10 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, sms_log(pMac, LOG1, "csr_roam_check_pe_stats_req_list:peStatsTimer period %d", pTempStaEntry->periodicity); - cdf_status = + qdf_status = cdf_mc_timer_start(&pTempStaEntry->hPeStatsTimer, pTempStaEntry->periodicity); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_check_pe_stats_req_list:cannot start hPeStatsTimer timer")); @@ -17249,7 +17249,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, { tListElem *pEntry; tCsrPeStatsReqInfo *pTempStaEntry; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; pEntry = csr_ll_peek_head(&pMac->roam.peStatsReqList, LL_ACCESS_LOCK); if (!pEntry) { sms_log(pMac, LOGE, FL(" List empty, no stats req for PE")); @@ -17266,18 +17266,18 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, } sms_log(pMac, LOGW, FL("Match found")); if (pTempStaEntry->timerRunning) { - cdf_status = cdf_mc_timer_stop( + qdf_status = cdf_mc_timer_stop( &pTempStaEntry->hPeStatsTimer); /* * If we are not able to stop the timer here, just * remove the entry from the linked list. Destroy the * timer object and free the memory in the timer CB */ - if (cdf_status == CDF_STATUS_SUCCESS) { + if (qdf_status == QDF_STATUS_SUCCESS) { /* the timer is successfully stopped */ pTempStaEntry->timerRunning = false; /* Destroy the timer */ - cdf_status = cdf_mc_timer_destroy( + qdf_status = cdf_mc_timer_destroy( &pTempStaEntry->hPeStatsTimer); } else { /* @@ -17287,7 +17287,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, */ pTempStaEntry->timerStopFailed = true; } - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL("failed to stop/destroy timer")); } @@ -17394,13 +17394,13 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, callback(stats, pContext); } -CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) +QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) { tListElem *pEntry = NULL; tListElem *pPrevEntry = NULL; tCsrStatsClientReqInfo *pTempStaEntry = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status; pEntry = csr_ll_peek_head(&pMac->roam.statsClientReqList, LL_ACCESS_LOCK); if (!pEntry) { /* list empty */ @@ -17441,7 +17441,7 @@ CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pMac->roam. tlStatsReqInfo. hTlStatsTimer); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL ("csr_roam_dereg_statistics_req:cannot stop TlStatsTimer timer")); @@ -17458,9 +17458,9 @@ CDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pTempStaEntry->timer); /* Destroy the cdf timer... */ - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pTempStaEntry->timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL ("csr_roam_dereg_statistics_req:failed to destroy Client req timer")); @@ -17510,7 +17510,7 @@ void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) } /* Return SUCCESS is the command is queued, failed */ -CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fHighPriority) { bool fNoCmdPending; @@ -17518,13 +17518,13 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, if (!SME_IS_START(pMac)) { sms_log(pMac, LOGE, FL("Sme in stop state")); CDF_ASSERT(0); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } if ((eSmeCommandScan == pCommand->command) && pMac->scan.fDropScanCmd) { sms_log(pMac, LOGW, FL(" drop scan (scan reason %d) command"), pCommand->u.scanCmd.reason); - return CDF_STATUS_CSR_WRONG_STATE; + return QDF_STATUS_CSR_WRONG_STATE; } if ((pCommand->command == eSmeCommandScan) @@ -17537,7 +17537,7 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, &pCommand->Link, LL_ACCESS_LOCK); /* process the command queue... */ sme_process_pending_queue(pMac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Make sure roamCmdPendingList is not empty first */ fNoCmdPending = @@ -17554,13 +17554,13 @@ CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, &pCommand->Link, false); } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, tSirAPWPSIEs *pAPWPSIES) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirUpdateAPWPSIEsReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -17568,12 +17568,12 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGE, FL("Session does not exist for session id %d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ; pMsg->transactionId = 0; @@ -17586,22 +17586,22 @@ CDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, tSirRSNie *pAPSirRSNie) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirUpdateAPWPARSNIEsReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { sms_log(pMac, LOGE, FL(" Session does not exist for session id %d"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { pMsg = cdf_mem_malloc(sizeof(tSirUpdateAPWPARSNIEsReq)); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPARSNIEsReq), 0); pMsg->messageType = eWNI_SME_SET_APWPARSNIEs_REQ; pMsg->transactionId = 0; @@ -17615,7 +17615,7 @@ CDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -CDF_STATUS +QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, tpSirBssDescription pBssDescription) { @@ -17628,7 +17628,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, sms_log(pMac, LOGE, FL("Session does not exist for session id(%d)"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } auth_req_len = sizeof(tSirFTPreAuthReq); @@ -17636,7 +17636,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, if (NULL == pftPreAuthReq) { sms_log(pMac, LOGE, FL("Memory allocation for FT Preauth request failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* Save the SME Session ID here. We need it while processing the preauth response */ pSession->ftSmeContext.smeSessionId = sessionId; @@ -17648,7 +17648,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, if (NULL == pftPreAuthReq->pbssDescription) { sms_log(pMac, LOGE, FL("Memory allocation for FT Preauth request failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pftPreAuthReq->messageType = eWNI_SME_FT_PRE_AUTH_REQ; @@ -17691,7 +17691,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, tpSirFTPreAuthRsp pFTPreAuthRsp) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; eCsrAuthType conn_Auth_type; uint32_t sessionId = pFTPreAuthRsp->smeSessionId; @@ -17704,7 +17704,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, status = csr_neighbor_roam_preauth_rsp_handler(pMac, pFTPreAuthRsp->smeSessionId, pFTPreAuthRsp->status); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { /* * Bail out if pre-auth was not even processed. */ @@ -17715,7 +17715,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, } /* The below function calls/timers should be invoked only if the pre-auth is successful */ - if (CDF_STATUS_SUCCESS != (CDF_STATUS) pFTPreAuthRsp->status) + if (QDF_STATUS_SUCCESS != (QDF_STATUS) pFTPreAuthRsp->status) return; /* Implies a success */ pSession->ftSmeContext.FTState = eFT_AUTH_COMPLETE; @@ -17736,7 +17736,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, status = cdf_mc_timer_start(&pSession->ftSmeContext.preAuthReassocIntvlTimer, 60); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL ("Preauth reassoc interval timer start failed to start with status %d"), @@ -17881,11 +17881,11 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) return false; } -CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, +QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; tAniHandoffReq *pMsg; @@ -17893,7 +17893,7 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_handoff_request: failed to allocate mem for req "); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pMsg->msgType = eWNI_SME_HANDOFF_REQ; pMsg->msgLen = (uint16_t) sizeof(tAniHandoffReq); @@ -17904,11 +17904,11 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, msg.type = eWNI_SME_HANDOFF_REQ; msg.bodyptr = pMsg; msg.reserved = 0; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_handoff_request failed to post msg to self "); cdf_mem_free((void *)pMsg); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } return status; } @@ -17925,14 +17925,14 @@ CDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, \param ccKmIeLen - length of the CCKM IE \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, +QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, const uint8_t *pCckmIe, const uint8_t ccKmIeLen) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen; @@ -17948,10 +17948,10 @@ CDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, \param pTimestamp - output TSF timestamp \- return Success or failure -------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, +QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrNeighborRoamBSSInfo handoffNode; uint32_t timer_diff = 0; uint32_t timeStamp[2]; @@ -17981,20 +17981,20 @@ CDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * This API is primarily used to post * Channel Change Req for SAP * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirChanChangeRequest *pMsg; tCsrRoamStartBssParams param; csr_roam_get_bss_start_parms(pMac, profile, ¶m); pMsg = cdf_mem_malloc(sizeof(tSirChanChangeRequest)); if (!pMsg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)pMsg, sizeof(tSirChanChangeRequest), 0); @@ -18023,17 +18023,17 @@ CDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, * immediately after SAP CAC WAIT is * completed without any RADAR indications. */ -CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirStartBeaconIndication *pMsg; pMsg = cdf_mem_malloc(sizeof(tSirStartBeaconIndication)); if (!pMsg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)pMsg, sizeof(tSirStartBeaconIndication), 0); @@ -18055,27 +18055,27 @@ CDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, \param updateType - Type of buffer \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, eUpdateIEsType updateType) { tpSirModifyIEsInd pModifyAddIEInd = NULL; uint8_t *pLocalBuffer = NULL; - CDF_STATUS status; + QDF_STATUS status; /* following buffer will be freed by consumer (PE) */ pLocalBuffer = cdf_mem_malloc(pModifyIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pModifyAddIEInd = cdf_mem_malloc(sizeof(tSirModifyIEsInd)); if (NULL == pModifyAddIEInd) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); cdf_mem_free(pLocalBuffer); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /*copy the IE buffer */ @@ -18098,7 +18098,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, pModifyAddIEInd->updateType = updateType; status = cds_send_mb_message_to_mac(pModifyAddIEInd); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); @@ -18119,20 +18119,20 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, \param append - append or replace completely \- return Success or failure -----------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType) { tpSirUpdateIEsInd pUpdateAddIEs = NULL; uint8_t *pLocalBuffer = NULL; - CDF_STATUS status; + QDF_STATUS status; if (pUpdateIE->ieBufferlength != 0) { /* Following buffer will be freed by consumer (PE) */ pLocalBuffer = cdf_mem_malloc(pUpdateIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pLocalBuffer, pUpdateIE->pAdditionIEBuffer, pUpdateIE->ieBufferlength); @@ -18144,7 +18144,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, if (pLocalBuffer != NULL) { cdf_mem_free(pLocalBuffer); } - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pUpdateAddIEs, sizeof(tSirUpdateIEsInd)); @@ -18163,7 +18163,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, pUpdateAddIEs->updateType = updateType; status = cds_send_mb_message_to_mac(pUpdateAddIEs); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); @@ -18183,15 +18183,15 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, * * Return: success if msg posted to LIM else return failure */ -CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, +QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, uint8_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct sir_sme_ext_cng_chan_req *msg; msg = cdf_mem_malloc(sizeof(*msg)); if (NULL == msg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_zero(msg, sizeof(*msg)); msg->message_type = eWNI_SME_EXT_CHANGE_CHANNEL; @@ -18215,17 +18215,17 @@ CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, * * Return: success or failure **/ -CDF_STATUS +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, struct cdf_mac_addr bssid, uint8_t target_channel, uint8_t csa_ie_reqd, chan_params_t *ch_params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirDfsCsaIeRequest *msg; msg = cdf_mem_malloc(sizeof(tSirDfsCsaIeRequest)); if (!msg) { - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set((void *)msg, sizeof(tSirDfsCsaIeRequest), 0); @@ -18635,19 +18635,19 @@ bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, * This function will issue station's stored join request, from this point * onwards the flow will be just like normal connect request. * - * Return: CDF_STATUS_SUCCESS or CDF_STATUS_E_FAILURE. + * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE. **/ -CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, uint32_t *roam_id, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *sta_session; uint32_t new_roam_id; sta_session = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == sta_session) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; new_roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); *roam_id = new_roam_id; status = csr_roam_issue_connect(mac_ctx, @@ -18658,7 +18658,7 @@ CDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, new_roam_id, sta_session->stored_roam_profile.imediate_flag, sta_session->stored_roam_profile.clear_flag); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("CSR failed issuing connect cmd with status = 0x%08X"), @@ -18682,7 +18682,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct s_sir_set_hw_mode *cmd; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg; struct sir_set_hw_mode_resp *param; @@ -18712,7 +18712,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) sms_log(mac, LOGE, FL("clear any pending scan command")); status = csr_scan_abort_mac_scan_not_for_connect(mac, command->u.set_hw_mode_cmd.session_id); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("Failed to clear scan cmd")); goto fail; } @@ -18734,7 +18734,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) FL("Posting eWNI_SME_SET_HW_MODE_REQ to PE")); status = cds_send_mb_message_to_mac(cmd); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18769,7 +18769,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct sir_set_dual_mac_cfg *cmd; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg; struct sir_dual_mac_config_resp *param; @@ -18810,7 +18810,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) cmd->set_dual_mac.fw_mode_config); status = cds_send_mb_message_to_mac(cmd); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18844,7 +18844,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) { uint32_t len; struct sir_nss_update_request *msg; - CDF_STATUS status; + QDF_STATUS status; tSirMsgQ msg_return; struct sir_beacon_tx_complete_rsp *param; @@ -18882,7 +18882,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) FL("Posting eWNI_SME_NSS_UPDATE_REQ to PE")); status = cds_send_mb_message_to_mac(msg); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac, LOGE, FL("Posting to PE failed")); return; } @@ -18895,7 +18895,7 @@ fail: return; } sms_log(mac, LOGE, FL("Sending nss update fail response to SME")); - param->tx_status = CDF_STATUS_E_FAILURE; + param->tx_status = QDF_STATUS_E_FAILURE; param->session_id = command->u.nss_update_cmd.session_id; msg_return.type = eWNI_SME_NSS_UPDATE_RSP; msg_return.bodyptr = param; @@ -18946,10 +18946,10 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, sme_QosAssocInfo assoc_info; struct cdf_mac_addr bcast_mac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; tpAddBssParams add_bss_params; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&mac_ctx->sme); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("LFR3: Locking failed, bailing out")); return; } @@ -18966,7 +18966,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, return; } session->roam_synch_data = roam_synch_data; - if (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(mac_ctx, + if (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies(mac_ctx, bss_desc, &ies_local))) { sms_log(mac_ctx, LOGE, FL("LFR3: fail to parse IEs")); session->roam_synch_in_progress = false; @@ -19008,7 +19008,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, if (CSR_IS_ENC_TYPE_STATIC (session->pCurRoamProfile->negotiatedUCEncryptionType) && !session->pCurRoamProfile->bWPSAssociation) { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_roam_issue_set_context_req(mac_ctx, session_id, session->pCurRoamProfile->negotiatedUCEncryptionType, @@ -19043,7 +19043,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, ps_global_info->remain_in_power_active_till_dhcp = true; mac_ctx->roam.WaitForKeyTimerInfo.sessionId = session_id; - if (!CDF_IS_STATUS_SUCCESS(csr_roam_start_wait_for_key_timer( + if (!QDF_IS_STATUS_SUCCESS(csr_roam_start_wait_for_key_timer( mac_ctx, CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD)) ) { sms_log(mac_ctx, LOGE, FL diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2486d9eb8753..2c6a37034570 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -91,7 +91,7 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, tSirScanType scanTy static void csr_sta_ap_conc_timer_handler(void *); #endif bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId); -CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand); +QDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint8_t NumChannels); void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, @@ -138,10 +138,10 @@ void csr_free_scan_result_entry(tpAniSirGlobal pMac, tCsrScanResult *pResult) cdf_mem_free(pResult); } -static CDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, +static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, tDblLinkList *pList) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; tCsrScanResult *pBssDesc; @@ -157,9 +157,9 @@ static CDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) +QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) { - CDF_STATUS status; + QDF_STATUS status; csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.scanResultList); csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.tempScanResults); @@ -175,7 +175,7 @@ CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) CDF_TIMER_TYPE_SW, csr_sta_ap_conc_timer_handler, mac_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Mem Alloc failed for hTimerStaApConcTimer timer")); return status; @@ -185,14 +185,14 @@ CDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) CDF_TIMER_TYPE_SW, csr_scan_result_cfg_aging_timer_handler, mac_ctx); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, FL("Mem Alloc failed for CFG ResultAging timer")); return status; } -CDF_STATUS csr_scan_close(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_close(tpAniSirGlobal pMac) { csr_ll_scan_purge_result(pMac, &pMac->scan.tempScanResults); csr_ll_scan_purge_result(pMac, &pMac->scan.scanResultList); @@ -213,24 +213,24 @@ CDF_STATUS csr_scan_close(tpAniSirGlobal pMac) #ifdef WLAN_AP_STA_CONCURRENCY cdf_mc_timer_destroy(&pMac->scan.hTimerStaApConcTimer); #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_enable(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_enable(tpAniSirGlobal pMac) { pMac->scan.fScanEnable = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_disable(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_disable(tpAniSirGlobal pMac) { csr_scan_stop_timers(pMac); pMac->scan.fScanEnable = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* Set scan timing parameters according to state of other driver sessions */ @@ -296,7 +296,7 @@ static void csr_set_default_scan_timing(tpAniSirGlobal pMac, tSirScanType scanTy * * @Return: status of operation */ -static CDF_STATUS +static QDF_STATUS csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tCsrScanRequest *scan_req) @@ -308,11 +308,11 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, if ((scan_cmd == NULL) || (scan_req == NULL)) { sms_log(mac_ctx, LOGE, FL(" Scan Cmd or Scan Request is NULL ")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (eCSR_SCAN_REQUEST_FULL_SCAN != scan_req->requestType) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; sms_log(mac_ctx, LOG1, FL("Scanning only 2G Channels during first scan")); @@ -323,7 +323,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(NUM_24GHZ_CHANNELS); if (NULL == scan_req->ChannelInfo.ChannelList) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed.")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (idx = 1; idx <= NUM_24GHZ_CHANNELS; idx++) { if (csr_is_supported_channel(mac_ctx, idx)) { @@ -346,7 +346,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, } } scan_req->ChannelInfo.numOfChannels = lst_sz; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static void @@ -374,11 +374,11 @@ csr_set_scan_reason(tSmeCmd *scan_cmd, eCsrRequestType req_type) } } -static CDF_STATUS +static QDF_STATUS csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tCsrScanRequest *scan_req, uint16_t session_id) { - CDF_STATUS status; + QDF_STATUS status; tSmeCmd *scan_11d_cmd = NULL; tCsrScanRequest tmp_rq; tCsrChannelInfo *pChnInfo = &tmp_rq.ChannelInfo; @@ -389,7 +389,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(((false == mac_ctx->first_scan_done) @@ -398,20 +398,20 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, && (eCSR_SCAN_SOFTAP_CHANNEL_RANGE != scan_req->requestType) #endif && (false == mac_ctx->scan.fEnableBypass11d))) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; cdf_mem_set(&tmp_rq, sizeof(tCsrScanRequest), 0); scan_11d_cmd = csr_get_command_buffer(mac_ctx); if (!scan_11d_cmd) { sms_log(mac_ctx, LOGE, FL("scan_11d_cmd failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_set(&scan_11d_cmd->u.scanCmd, sizeof(tScanCmd), 0); pChnInfo->ChannelList = cdf_mem_malloc(numChn); if (NULL == pChnInfo->ChannelList) { sms_log(mac_ctx, LOGE, FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pChnInfo->ChannelList, mac_ctx->scan.base_channels.channelList, numChn); @@ -463,9 +463,9 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, /* Free the channel list */ cdf_mem_free(pChnInfo->ChannelList); pChnInfo->ChannelList = NULL; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_scan_copy_request failed")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mac_ctx->scan.scanProfile.numOfChannels = @@ -473,19 +473,19 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, status = csr_queue_sme_command(mac_ctx, scan_11d_cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Failed to send message status = %d"), status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, +QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, tCsrScanRequest *scan_req, csr_scan_completeCallback callback, void *pContext) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSmeCmd *scan_cmd = NULL; tCsrScanRequest *pTempScanReq = NULL; tCsrConfig *cfg_prm = &pMac->roam.configParam; @@ -571,7 +571,7 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, * & issue an 11d scan request to PE. */ status = csr_issue_11d_scan(pMac, scan_cmd, scan_req, sessionId); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) goto release_cmd; /* @@ -601,7 +601,7 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, * builds the target scan request in which this variable is used. */ cfg_prm->initial_scan_no_dfs_chnl = 0; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to copy request status = %d"), status); goto release_cmd; @@ -622,13 +622,13 @@ CDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, pTempScanReq->maxChnTime, pTempScanReq->uIEFieldLen); status = csr_queue_sme_command(pMac, scan_cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to send message status = %d"), status); } release_cmd: - if (!CDF_IS_STATUS_SUCCESS(status) && scan_cmd) { + if (!QDF_IS_STATUS_SUCCESS(status) && scan_cmd) { sms_log(pMac, LOGE, FL(" SId: %d Failed with status=%d" " Scan reason=%u numOfSSIDs=%d" " P2P search=%d scanId=%d"), @@ -641,11 +641,11 @@ release_cmd: return status; } -CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, +QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamReason reason) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = NULL; tCsrScanResultFilter *pScanFilter = NULL; uint32_t roamId = 0; @@ -654,19 +654,19 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL("Entry")); if (pSession->fCancelRoaming) { sms_log(pMac, LOGW, FL("lost link roaming canceled")); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; goto free_filter; } /* Here is the profile we need to connect to */ pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); @@ -681,23 +681,23 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, */ pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_filter; } cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); } /* We have a profile */ roamId = GET_NEXT_ROAM_ID(&pMac->roam); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_filter; if (eCsrLostLink1 == reason) { @@ -707,7 +707,7 @@ CDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, } status = csr_roam_issue_connect(pMac, sessionId, pProfile, hBSSList, reason, roamId, true, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, hBSSList); } @@ -724,18 +724,18 @@ free_filter: return status; } -CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, "Lost link scan 1 failed"); if (pSession->fCancelRoaming) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (!pSession->pCurRoamProfile) return csr_scan_request_lost_link3(pMac, sessionId); /* @@ -751,22 +751,22 @@ CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, /* go straight to lostlink scan3 */ return csr_scan_request_lost_link3(pMac, sessionId); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, "Lost link scan 2 failed"); if (pSession->fCancelRoaming) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (!pSession->pCurRoamProfile || !pSession->pCurRoamProfile->ChannelInfo.ChannelList @@ -774,17 +774,17 @@ CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, /* try lostlink scan3 */ return csr_scan_request_lost_link3(pMac, sessionId); } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } -CDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, uint32_t sessionId) { sms_log(pMac, LOGW, "Lost link scan 3 failed"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tCsrRoamSession *pSession, uint32_t session_id) { @@ -792,7 +792,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, tScanResultHandle bss_lst = NULL; tCsrScanResultInfo *scan_result = NULL; tCsrScanResultFilter *scan_filter = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrSSIDs *ssid_list = &cmd->u.scanCmd.u.scanRequest.SSIDs; tCsrChannelInfo *ch_info = &cmd->u.scanCmd.u.scanRequest.ChannelInfo; @@ -820,7 +820,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, */ ssid_list->SSIDList = cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == ssid_list->SSIDList) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; ssid_list->numOfSSIDs = 1; cdf_mem_copy(&ssid_list->SSIDList[0].SSID, &pSession->connectedProfile.SSID, @@ -830,25 +830,25 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, } if (!pSession->pCurRoamProfile) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, pSession->pCurRoamProfile, scan_filter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link1_local_mem; - if (!(CDF_IS_STATUS_SUCCESS(csr_scan_get_result(mac_ctx, scan_filter, + if (!(QDF_IS_STATUS_SUCCESS(csr_scan_get_result(mac_ctx, scan_filter, &bss_lst)) && bss_lst)) { if (csr_roam_is_channel_valid(mac_ctx, pSession->connectedProfile.operationChannel)) { ch_info->ChannelList = cdf_mem_malloc(1); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; } ch_info->ChannelList[0] = @@ -861,7 +861,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, /* on error: this mem will be released by csr_release_command_scan */ ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; } @@ -911,39 +911,39 @@ free_lost_link1_local_mem: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOGW, FL("Entry")); cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto release_lost_link1_cmd; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link1_cmd(mac_ctx, cmd, session, session_id); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link1_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct cdf_mac_addr), 0xFF); status = csr_queue_sme_command(mac_ctx, cmd, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); } release_lost_link1_cmd: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -952,11 +952,11 @@ release_lost_link1_cmd: return status; } -static CDF_STATUS +static QDF_STATUS csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, uint32_t session_id, tCsrRoamSession *session) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t i, num_ch = 0; tScanResultHandle bss_lst = NULL; tCsrScanResultInfo *scan_result = NULL; @@ -977,22 +977,22 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; if (!session->pCurRoamProfile) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, CDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_fltr) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(scan_fltr, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, session->pCurRoamProfile, scan_fltr); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link2_local_mem; status = csr_scan_get_result(mac_ctx, scan_fltr, &bss_lst); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_lost_link2_local_mem; if (!bss_lst) @@ -1000,7 +1000,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto free_lost_link2_local_mem; } scan_result = csr_scan_result_get_next(mac_ctx, bss_lst); @@ -1038,41 +1038,41 @@ free_lost_link2_local_mem: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(mac_ctx, LOGW, FL(" called")); cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto release_lost_link2_cmd; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link2_cmd(mac_ctx, cmd, session_id, session); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link2_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct cdf_mac_addr), 0xFF); /* Put to the head in pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); goto release_lost_link2_cmd; } release_lost_link2_cmd: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -1088,17 +1088,17 @@ release_lost_link2_cmd: * * Return: status of operation */ -CDF_STATUS +QDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSmeCmd *cmd; sms_log(mac_ctx, LOGW, FL(" called")); do { cmd = csr_get_command_buffer(mac_ctx); if (!cmd) { - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; break; } cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); @@ -1121,13 +1121,13 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) cdf_set_macaddr_broadcast(&cmd->u.scanCmd.u.scanRequest.bssid); /* Put to the head of pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("fail to send message status = %d"), status); break; } } while (0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGW, FL("failed with status %d"), status); if (cmd) csr_release_command_scan(mac_ctx, cmd); @@ -1136,10 +1136,10 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) return status; } -CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultHandle hBSSList = CSR_INVALID_SCANRESULT_HANDLE; tCsrScanResultFilter *pScanFilter = NULL; tCsrRoamProfile *pProfile = pCommand->u.scanCmd.pToRoamProfile; @@ -1150,11 +1150,11 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, if (pMac->roam.neighborRoamInfo[sessionId].uOsRequestedHandoff) { /* notify LFR state m/c */ status = csr_neighbor_roam_sssid_scan_done(pMac, - sessionId, CDF_STATUS_SUCCESS); - if (CDF_STATUS_SUCCESS != status) + sessionId, QDF_STATUS_SUCCESS); + if (QDF_STATUS_SUCCESS != status) csr_neighbor_roam_start_lfr_scan(pMac, sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } /* @@ -1170,22 +1170,22 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, break; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; break; } cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) break; if (pMac->roam.roamSession[sessionId].connectState == eCSR_ASSOC_STATE_TYPE_INFRA_DISCONNECTING) { sms_log(pMac, LOGE, FL("upper layer issued disconnetion")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } status = csr_roam_issue_connect(pMac, sessionId, pProfile, @@ -1194,7 +1194,7 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, true, true); } while (0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { if (CSR_INVALID_SCANRESULT_HANDLE != hBSSList) { csr_scan_result_purge(pMac, hBSSList); } @@ -1211,10 +1211,10 @@ CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t sessionId = pCommand->sessionId; tCsrRoamProfile *pProfile = pCommand->u.scanCmd.pToRoamProfile; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -1222,16 +1222,16 @@ CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If this scan is for LFR */ if (pMac->roam.neighborRoamInfo[sessionId].uOsRequestedHandoff) { /* notify LFR state m/c */ status = csr_neighbor_roam_sssid_scan_done(pMac, sessionId, - CDF_STATUS_E_FAILURE); - if (CDF_STATUS_SUCCESS != status) + QDF_STATUS_E_FAILURE); + if (QDF_STATUS_SUCCESS != status) csr_neighbor_roam_start_lfr_scan(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_DEBUG if (pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs == 1) { @@ -1251,7 +1251,7 @@ CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, status = csr_roam_issue_connect(pMac, sessionId, pProfile, NULL, eCsrHddIssued, pCommand->u.scanCmd.roamId, true, true); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("failed to issue startIBSS, status: 0x%08X"), status); @@ -1297,10 +1297,10 @@ roam_completion: return status; } -CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, tScanResultHandle hScanList) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tScanResultList *pScanList = (tScanResultList *) hScanList; if (pScanList) { @@ -1591,7 +1591,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac, tCsrChannel *occupied_ch, tDot11fBeaconIEs *pIes) { - CDF_STATUS status; + QDF_STATUS status; uint8_t ch; uint8_t num_occupied_ch = occupied_ch->numChannels; uint8_t *occupied_ch_lst = occupied_ch->channelList; @@ -1604,7 +1604,7 @@ static void csr_scan_add_to_occupied_channels(tpAniSirGlobal pMac, status = csr_add_to_channel_list_front(occupied_ch_lst, num_occupied_ch, ch); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { occupied_ch->numChannels++; sms_log(pMac, LOG2, FL("Added channel %d to the list (count=%d)"), @@ -1651,7 +1651,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) { bool fMatch; - CDF_STATUS status; + QDF_STATUS status; tListElem *pEntry; tDot11fBeaconIEs *pIes; tCsrScanResult *pBssDesc; @@ -1676,7 +1676,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, /* At this time, Result.pvIes may be NULL */ status = csr_get_parsed_bss_description_ies(pMac, &pBssDesc->Result.BssDescriptor, &pIes); - if (!pIes && (!CDF_IS_STATUS_SUCCESS(status))) + if (!pIes && (!QDF_IS_STATUS_SUCCESS(status))) continue; sms_log(pMac, LOG1, FL("SSID Matched")); @@ -1791,7 +1791,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) csr_ll_unlock(&pMac->scan.scanResultList); } -static CDF_STATUS +static QDF_STATUS csr_save_ies(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tCsrScanResult *pBssDesc, @@ -1801,7 +1801,7 @@ csr_save_ies(tpAniSirGlobal pMac, eCsrEncryptionType *mc, eCsrAuthType *auth) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pIes = NULL; if (!pFilter) @@ -1834,7 +1834,7 @@ csr_save_ies(tpAniSirGlobal pMac, */ *pNewIes = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == *pNewIes) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for IEs")); /* Need to free memory allocated by csr_match_bss */ if (!pBssDesc->Result.pvIes) @@ -1845,7 +1845,7 @@ csr_save_ies(tpAniSirGlobal pMac, return status; } -static CDF_STATUS +static QDF_STATUS csr_save_scan_entry(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, bool fMatch, @@ -1857,7 +1857,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, eCsrEncryptionType mc, eCsrAuthType *auth) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrScanResult *pResult; uint32_t bssLen, allocLen; /* To sort the list */ @@ -1872,7 +1872,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, allocLen = sizeof(tCsrScanResult) + bssLen; pResult = cdf_mem_malloc(allocLen); if (NULL == pResult) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for scan result, len=%d"), allocLen); @@ -1939,7 +1939,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, * * Return: success or failure */ -static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, tCsrScanResultFilter *filter, tCsrScanResult *bss_descr) { @@ -1947,7 +1947,7 @@ static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, int orig_pref_val = 0; if (NULL == mac_ctx || NULL == bss_descr) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (mac_ctx->policy_manager_enabled && is_channel_found_in_pcl(mac_ctx, @@ -1974,16 +1974,16 @@ static CDF_STATUS csr_calc_pref_val_by_pcl(tpAniSirGlobal mac_ctx, bss_descr->preferValue = CSR_MAX(new_pref_val, bss_descr->preferValue); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS +static QDF_STATUS csr_parse_scan_results(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tScanResultList *pRetList, uint32_t *count) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry; bool fMatch = false; tCsrScanResult *pBssDesc = NULL; @@ -2005,7 +2005,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, } } - if (CDF_STATUS_E_FAILURE == status) + if (QDF_STATUS_E_FAILURE == status) sms_log(pMac, CDF_TRACE_LEVEL_ERROR, FL("Retrieving pcl failed from HDD")); pEntry = csr_ll_peek_head(&pMac->scan.scanResultList, LL_ACCESS_NOLOCK); @@ -2021,7 +2021,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, pNewIes = NULL; status = csr_save_ies(pMac, pFilter, pBssDesc, &pNewIes, &fMatch, &uc, &mc, &auth); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("save ies fail %d"), status); break; @@ -2034,7 +2034,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, status = csr_save_scan_entry(pMac, pFilter, fMatch, pBssDesc, pNewIes, pRetList, count, uc, mc, &auth); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("save entry fail %d"), status); break; @@ -2046,11 +2046,11 @@ csr_parse_scan_results(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult) { - CDF_STATUS status; + QDF_STATUS status; tScanResultList *pRetList; uint32_t count = 0; @@ -2062,7 +2062,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, pRetList = cdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) { sms_log(pMac, LOGE, FL("pRetList is NULL")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pRetList, sizeof(tScanResultList), 0); @@ -2071,7 +2071,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, status = csr_parse_scan_results(pMac, pFilter, pRetList, &count); sms_log(pMac, LOG1, FL("return %d BSS %d"), csr_ll_count(&pRetList->List), status); - if (!CDF_IS_STATUS_SUCCESS(status) || (phResult == NULL)) { + if (!QDF_IS_STATUS_SUCCESS(status) || (phResult == NULL)) { /* Fail or No one wants the result. */ csr_scan_result_purge(pMac, (tScanResultHandle) pRetList); } else { @@ -2079,7 +2079,7 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, /* We are here meaning the there is no match */ csr_ll_close(&pRetList->List); cdf_mem_free(pRetList); - status = CDF_STATUS_E_NULL_VALUE; + status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; } @@ -2112,25 +2112,25 @@ bool csr_scan_flush_denied(tpAniSirGlobal pMac) return 0; } -CDF_STATUS csr_scan_flush_result(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_flush_result(tpAniSirGlobal pMac) { bool isFlushDenied = csr_scan_flush_denied(pMac); if (isFlushDenied) { sms_log(pMac, LOGW, "%s: scan flush denied in roam state %d", __func__, isFlushDenied); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG4, "%s: Flushing all scan results", __func__); csr_ll_scan_purge_result(pMac, &pMac->scan.tempScanResults); csr_ll_scan_purge_result(pMac, &pMac->scan.scanResultList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal pMac, bool flushP2P) +QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal pMac, bool flushP2P) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *pFreeElem; tCsrScanResult *pBssDesc; tDblLinkList *pList = &pMac->scan.scanResultList; @@ -2207,15 +2207,15 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, * @return Status */ -CDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, +QDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, uint32_t numChannels) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t i = 0; for (i = 0; i < numChannels; i++) { if (pChannelList[i] == channelId) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; } } @@ -2244,15 +2244,15 @@ CDF_STATUS csr_check11d_channel(uint8_t channelId, uint8_t *pChannelList, * @return Status */ -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *pTempEntry; tCsrScanResult *pBssDesc; uint32_t len = sizeof(pMac->roam.validChannelList); /* Get valid channels list from CFG */ - if (!CDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels(pMac, + if (!QDF_IS_STATUS_SUCCESS(csr_get_cfg_valid_channels(pMac, pMac->roam. validChannelList, &len))) { @@ -2307,10 +2307,10 @@ CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, +QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, tScanResultHandle *phResult) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tScanResultList *pRetList, *pInList = (tScanResultList *) hIn; tCsrScanResult *pResult, *pScanResult; uint32_t count = 0; @@ -2322,7 +2322,7 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, } pRetList = cdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pRetList, sizeof(tScanResultList), 0); csr_ll_open(pMac->hHdd, &pRetList->List); @@ -2340,10 +2340,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, allocLen = sizeof(tCsrScanResult) + bssLen; pResult = cdf_mem_malloc(allocLen); if (NULL == pResult) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_result_purge(pMac, (tScanResultHandle *) pRetList); @@ -2358,10 +2358,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, pResult->Result.pvIes = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == pResult->Result.pvIes) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (!QDF_IS_STATUS_SUCCESS(status)) { /* Free the memory we allocate above first */ cdf_mem_free(pResult); csr_scan_result_purge(pMac, @@ -2383,11 +2383,11 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, csr_ll_unlock(&pInList->List); csr_ll_unlock(&pMac->scan.scanResultList); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { if (0 == count) { csr_ll_close(&pRetList->List); cdf_mem_free(pRetList); - status = CDF_STATUS_E_NULL_VALUE; + status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; } @@ -2397,10 +2397,10 @@ CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, return status; } -CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, +QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsg *pMsg = (tSirMbMsg *) pMsgBuf; tCsrRoamSession *pSession; tSirSmeAssocIndToUpperLayerCnf *pUpperLayerAssocCnf; @@ -2439,7 +2439,7 @@ CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* send the status code as Success */ @@ -2590,11 +2590,11 @@ bool csr_remove_dup_bss_description(tpAniSirGlobal pMac, return fRC; } -CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tPmkidCandidateInfo *pmkid_info = NULL; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -2603,7 +2603,7 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("NumPmkidCandidate = %d"), @@ -2615,7 +2615,7 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, return status; if (pSession->NumPmkidCandidate >= CSR_MAX_PMKID_ALLOWED) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; /* BSS is capable of doing pre-authentication */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -2651,17 +2651,17 @@ CDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, * profile. If it is found, it return the sessionId, else it return invalid * sessionID */ -CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, +QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes, uint8_t sessionId) { tCsrRoamSession *pSession; tDot11fBeaconIEs *pIesLocal = pIes; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (!(pIesLocal || - CDF_IS_STATUS_SUCCESS( + QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal)))) return status; @@ -2681,11 +2681,11 @@ CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, /* This new BSS fits the current profile connected */ status = csr_add_pmkid_candidate_list(pMac, sessionId, pBssDesc, pIesLocal); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(pMac, LOGE, FL("csr_add_pmkid_candidate_list failed")); else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } if (!pIes) @@ -2695,16 +2695,16 @@ CDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, @@ -2733,7 +2733,7 @@ CDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, } pSession->NumBkidCandidate++; } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } } @@ -2753,10 +2753,10 @@ bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, tDot11fBeaconIEs *pIesLocal = pIes; uint32_t sessionId; tCsrRoamSession *pSession; - CDF_STATUS status; + QDF_STATUS status; if (!(pIesLocal || - CDF_IS_STATUS_SUCCESS( + QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIesLocal)))) return fRC; @@ -2774,7 +2774,7 @@ bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, /* this new BSS fits the current profile connected */ status = csr_add_bkid_candidate_list(pMac, sessionId, pBssDesc, pIesLocal); - if (CDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) fRC = true; } } @@ -2790,7 +2790,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, uint8_t reason, uint8_t session_id) { - CDF_STATUS status; + QDF_STATUS status; tListElem *entry; tCsrScanResult *bss_dscp; tDot11fBeaconIEs *local_ie = NULL; @@ -2813,7 +2813,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, local_ie = (tDot11fBeaconIEs *)(bss_dscp->Result.pvIes); status = csr_get_parsed_bss_description_ies(mac_ctx, &bss_dscp->Result.BssDescriptor, &local_ie); - if (!(local_ie || CDF_IS_STATUS_SUCCESS(status))) { + if (!(local_ie || QDF_IS_STATUS_SUCCESS(status))) { sms_log(mac_ctx, LOGE, FL("Cannot pared IEs")); csr_free_scan_result_entry(mac_ctx, bss_dscp); continue; @@ -2838,7 +2838,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, status = csr_process_bss_desc_for_pmkid_list(mac_ctx, &bss_dscp->Result.BssDescriptor, local_ie, session_id); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Found a new BSS */ csr_roam_call_callback(mac_ctx, session_id, NULL, 0, eCSR_ROAM_SCAN_FOUND_NEW_BSS, @@ -3030,7 +3030,7 @@ void csr_purge_channel_power(tpAniSirGlobal pMac, tDblLinkList *pChannelList) * Input: pCountryInfo -- the country code (e.g. "USI"), channel list, and power * limit are all stored inside this data structure */ -CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, +QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, tSirMacChanInfo *channelTable) { @@ -3072,7 +3072,7 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, FL("Invalid Channel %d Present in Country IE"), pChannelSet->firstChannel); cdf_mem_free(pChannelSet); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pChannelSet->txPower = CDF_MIN(pChannelInfo->maxTxPower, pMac->roam.configParam.nTxPowerCap); @@ -3120,7 +3120,7 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, } pChannelInfo++; /* move to next entry */ } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } static void csr_clear_dfs_channel_list(tpAniSirGlobal pMac) @@ -3269,7 +3269,7 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode) * 11d information element, let's default to US. */ - if (!CDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country(pMac, + if (!QDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country(pMac, pCountryCode, NULL, SOURCE_QUERY))) { pCountryCode[0] = '0'; @@ -3359,9 +3359,9 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) * * Return: none */ -CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) +QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; v_REGDOMAIN_t domainId; if (pCountry) { @@ -3369,7 +3369,7 @@ CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) status = csr_get_regulatory_domain_for_country(pMac, pCountry, &domainId, SOURCE_USERSPACE); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(pMac->scan.countryCodeCurrent, pCountry, WNI_CFG_COUNTRY_CODE_LEN); @@ -3470,14 +3470,14 @@ diag_end: void csr_apply_country_information(tpAniSirGlobal pMac) { v_REGDOMAIN_t domainId; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!csr_is11d_supported(pMac) || 0 == pMac->scan.channelOf11dInfo) return; status = csr_get_regulatory_domain_for_country(pMac, pMac->scan.countryCode11d, &domainId, SOURCE_QUERY); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return; /* Check whether we need to enforce default domain */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR @@ -3491,7 +3491,7 @@ void csr_apply_country_information(tpAniSirGlobal pMac) pMac->scan.domainIdCurrent, domainId); status = wma_set_reg_domain(pMac, domainId); } - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) sms_log(pMac, LOGE, FL("fail to set regId %d"), domainId); pMac->scan.domainIdCurrent = domainId; /* switch to active scans using this new channel list */ @@ -3572,7 +3572,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes, bool fForce) { - CDF_STATUS status; + QDF_STATUS status; uint8_t *pCountryCodeSelected; bool fRet = false; v_REGDOMAIN_t domainId; @@ -3588,7 +3588,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, if (false == useVoting) { if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS( + (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pSirBssDesc, &pIesLocal)))) goto free_ie; @@ -3599,7 +3599,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, status = csr_get_regulatory_domain_for_country(pMac, pIesLocal->Country.country, &domainId, SOURCE_QUERY); - if (CDF_IS_STATUS_SUCCESS(status) + if (QDF_IS_STATUS_SUCCESS(status) && (domainId == REGDOMAIN_WORLD)) goto free_ie; } /* useVoting == false */ @@ -3611,7 +3611,7 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, status = csr_get_regulatory_domain_for_country(pMac, pCountryCodeSelected, &domainId, SOURCE_11D); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("fail to get regId %d"), domainId); fRet = false; goto free_ie; @@ -3745,7 +3745,7 @@ bool csr_handle_scan11d1_failure(tpAniSirGlobal pMac, tSmeCmd *pCommand) /* Apply back the default setting and passively scan one more time. */ csr_apply_channel_power_info_wrapper(pMac); pCommand->u.scanCmd.reason = eCsrScan11d2; - if (CDF_IS_STATUS_SUCCESS(csr_scan_channels(pMac, pCommand))) { + if (QDF_IS_STATUS_SUCCESS(csr_scan_channels(pMac, pCommand))) { fRet = false; } @@ -3763,7 +3763,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, tCsrScanResultInfo *pScanResult; tDot11fBeaconIEs *pIes; int n = 0, c = 0; - CDF_STATUS status; + QDF_STATUS status; WLAN_HOST_DIAG_LOG_ALLOC(pScanLog, host_log_scan_pkt_type, @@ -3786,7 +3786,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, } status = csr_scan_get_result(pMac, NULL, &hScanResult); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WLAN_HOST_DIAG_LOG_REPORT(pScanLog); return; } @@ -3796,7 +3796,7 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, if (n < HOST_LOG_MAX_NUM_BSSID) { status = csr_get_parsed_bss_description_ies(pMac, &pScanResult->BssDescriptor, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("fail to parse IEs")); break; } @@ -3835,15 +3835,15 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, * * Saves the profile information from the SME's scan command * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, tSmeCmd *save_cmd, tSmeCmd *command) { tCsrScanResult *scan_result; tCsrScanResult *temp; uint32_t bss_len; - CDF_STATUS status; + QDF_STATUS status; save_cmd->u.scanCmd.pToRoamProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); @@ -3855,7 +3855,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, status = csr_roam_copy_profile(mac_ctx, save_cmd->u.scanCmd.pToRoamProfile, command->u.scanCmd.pToRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_roam_copy_profile fail")); goto error; } @@ -3879,7 +3879,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, sizeof(tCsrSSIDInfo)); if (!command->u.roamCmd.pRoamBssEntry) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; scan_result = GET_BASE_ADDR(command->u.roamCmd.pRoamBssEntry, tCsrScanResult, Link); @@ -3916,7 +3916,7 @@ CDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, temp->Link.last = temp->Link.next = NULL; save_cmd->u.roamCmd.pRoamBssEntry = (tListElem *)temp; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: csr_scan_handle_search_for_ssid_failure(mac_ctx, command); @@ -3927,7 +3927,7 @@ error: if (save_cmd->u.scanCmd.pToRoamProfile) cdf_mem_free(save_cmd->u.scanCmd.pToRoamProfile); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } static void @@ -3936,7 +3936,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, bool *remove_cmd, uint32_t session_id, uint8_t chan) { - CDF_STATUS status, ret; + QDF_STATUS status, ret; tSmeCmd *save_cmd = NULL; switch (*nxt_cmd) { @@ -3966,19 +3966,19 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, case eCsrNextLostLinkScan1Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink1(mac_ctx, session_id); break; case eCsrNextLostLinkScan2Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink2); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink2(mac_ctx, session_id); break; case eCsrNextLostLinkScan3Success: status = csr_issue_roam_after_lostlink_scan(mac_ctx, session_id, eCsrLostLink3); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) csr_scan_handle_failed_lostlink3(mac_ctx, session_id); break; case eCsrNextLostLinkScan1Failed: @@ -4016,7 +4016,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, } status = csr_save_profile(mac_ctx, save_cmd, pCommand); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { /* csr_save_profile should report error */ sms_log(mac_ctx, LOGE, FL("profile save failed %d"), status); @@ -4026,7 +4026,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, mac_ctx->sme.saved_scan_cmd = (void *)save_cmd; - if (CDF_STATUS_E_FAILURE == ret) { + if (QDF_STATUS_E_FAILURE == ret) { error: sms_log(mac_ctx, LOGE, FL("conn update fail %d"), chan); csr_scan_handle_search_for_ssid_failure(mac_ctx, @@ -4035,8 +4035,8 @@ error: cdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } - } else if ((CDF_STATUS_E_NOSUPPORT == ret) || - (CDF_STATUS_E_ALREADY == ret)) { + } else if ((QDF_STATUS_E_NOSUPPORT == ret) || + (QDF_STATUS_E_ALREADY == ret)) { sms_log(mac_ctx, LOGE, FL("conn update ret %d"), ret); csr_scan_handle_search_for_ssid(mac_ctx, pCommand); if (mac_ctx->sme.saved_scan_cmd) { @@ -4063,12 +4063,12 @@ error: * Scan entry in the active scan list mapping to the sent scan id * is returned to the caller. * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, uint32_t scan_id, tListElem **entry) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *localentry; tSmeCmd *cmd; uint32_t cmd_scan_id = 0; @@ -4080,7 +4080,7 @@ CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGE, FL(" Active list Empty scanId: %d"), scan_id); csr_ll_unlock(&mac_ctx->sme.smeScanCmdActiveList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } localentry = csr_ll_peek_head(&mac_ctx->sme.smeScanCmdActiveList, LL_ACCESS_NOLOCK); @@ -4095,7 +4095,7 @@ CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac_ctx, scan_id); *entry = localentry; csr_ll_unlock(&mac_ctx->sme.smeScanCmdActiveList); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } localentry = csr_ll_next(&mac_ctx->sme.smeScanCmdActiveList, localentry, LL_ACCESS_NOLOCK); @@ -4299,7 +4299,7 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, tSirMacCapabilityInfo *pCap1, *pCap2; tDot11fBeaconIEs *pIes1 = NULL; tDot11fBeaconIEs *pIesTemp = pIes2; - CDF_STATUS status; + QDF_STATUS status; pCap1 = (tSirMacCapabilityInfo *) &pSirBssDesc1->capabilityInfo; pCap2 = (tSirMacCapabilityInfo *) &pSirBssDesc2->capabilityInfo; @@ -4317,13 +4317,13 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, /* Check for SSID match, if exists */ status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; if (NULL == pIesTemp) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc2, &pIesTemp); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; } if (pIes1->SSID.present && pIesTemp->SSID.present) { @@ -4337,13 +4337,13 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, pSirBssDesc2->channelId)) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; if (NULL == pIesTemp) { status = csr_get_parsed_bss_description_ies(pMac, pSirBssDesc2, &pIesTemp); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto free_ies; } @@ -4387,7 +4387,7 @@ static bool csr_scan_is_bss_allowed(tpAniSirGlobal pMac, bool fAllowed = false; eCsrPhyMode phyMode; - if (CDF_IS_STATUS_SUCCESS + if (QDF_IS_STATUS_SUCCESS (csr_get_phy_mode_from_bss(pMac, pBssDesc, &phyMode, pIes))) { switch (pMac->roam.configParam.phyMode) { case eCSR_DOT11_MODE_11b: @@ -4438,7 +4438,7 @@ static bool csr_scan_validate_scan_result(tpAniSirGlobal pMac, bool valid = false; tDot11fBeaconIEs *pIes = NULL; uint8_t index; - CDF_STATUS status; + QDF_STATUS status; for (index = 0; index < numChn; index++) { /* @@ -4459,7 +4459,7 @@ static bool csr_scan_validate_scan_result(tpAniSirGlobal pMac, if (valid) { status = csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) return false; valid = csr_scan_is_bss_allowed(pMac, pBssDesc, pIes); @@ -4528,7 +4528,7 @@ static bool csr_scan_process_scan_results(tpAniSirGlobal pMac, tSmeCmd *pCommand * Return: 0 or other error codes. */ -CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, tSirBssDescription *bssdescr, uint32_t scan_id, uint32_t flags) { @@ -4538,7 +4538,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, uint32_t len = sizeof(mac_ctx->roam.validChannelList); sms_log(mac_ctx, LOG4, "CSR: Processing single bssdescr"); - if (CDF_IS_STATUS_SUCCESS( + if (QDF_IS_STATUS_SUCCESS( csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &len))) { @@ -4548,7 +4548,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, /* Cannot continue */ sms_log(mac_ctx, LOGW, FL("Received results on invalid channel")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (csr_scan_validate_scan_result(mac_ctx, chanlist, @@ -4562,7 +4562,7 @@ CDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, if (ies != NULL) cdf_mem_free(ies); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -4579,10 +4579,10 @@ bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) && (pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs != 1); } -CDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand; eCsrScanStatus scanStatus; @@ -4633,7 +4633,7 @@ error_handling: sms_log(pMac, LOGE, FL("PNO Scan completion called.")); csr_save_scan_results(pMac, eCsrScanCandidateFound, pScanRsp->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } else { /* * Scan completion was called, PNO is active, but scan @@ -4641,11 +4641,11 @@ error_handling: */ sms_log(pMac, LOGE, FL("Scan completion called, scan rsp was not PNO.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif sms_log(pMac, LOGE, FL("Scan completion called, but no active SCAN command.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tCsrScanResultInfo *csr_scan_result_get_first(tpAniSirGlobal pMac, @@ -4701,11 +4701,11 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal pMac, * This function moves the first BSS that matches the bssid to the * head of the result */ -CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, tScanResultHandle hScanResult) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanResultList *pResultList = (tScanResultList *) hScanResult; tCsrScanResult *pResult = NULL; tListElem *pEntry = NULL; @@ -4719,7 +4719,7 @@ CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, pResult = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(bssid, pResult->Result.BssDescriptor.bssId, sizeof(struct cdf_mac_addr))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; csr_ll_remove_entry(&pResultList->List, pEntry, LL_ACCESS_NOLOCK); csr_ll_insert_head(&pResultList->List, pEntry, @@ -4797,10 +4797,10 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) return fRet; } -CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry, *tmpEntry; tCsrScanResult *pResult; tLimScanChn *pChnInfo; @@ -4842,11 +4842,11 @@ CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, return status; } -CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, +QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, tCsrScanRequest *pScanReq, tScanReqParam *pScanReqParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeScanReq *pMsg; uint16_t msgLen; tSirScanType scanType = pScanReq->scanType; @@ -4880,7 +4880,7 @@ CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, pScanReq->ChannelInfo.numOfChannels, sme_request_type_to_string(pScanReq->requestType), pScanReq->requestType, pScanReq->p2pSearch); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pMsg, msgLen, 0); @@ -4922,13 +4922,13 @@ CDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, uint32_t len = CDF_MAC_ADDR_SIZE; status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, selfmac.bytes, &len); - if (!CDF_IS_STATUS_SUCCESS(status) + if (!QDF_IS_STATUS_SUCCESS(status) || (len < CDF_MAC_ADDR_SIZE)) { sms_log(pMac, LOGE, FL("Can't get self MAC address = %d"), status); /* Force failed status */ - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_scan_req; } } @@ -5031,7 +5031,7 @@ send_scan_req: pMsg->channelList.channelNumber[i]); } - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = cds_send_mb_message_to_mac(pMsg); } else { sms_log(pMac, LOGE, @@ -5042,18 +5042,18 @@ send_scan_req: return status; } -CDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, uint32_t sessionId, tScanReqParam *pScanReqParam) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeScanReq *pMsg; uint16_t msgLen; msgLen = (uint16_t) (sizeof(tSirSmeScanReq)); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SCAN_REQ; @@ -5066,7 +5066,7 @@ CDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, pMsg->returnAfterFirstMatch = pScanReqParam->bReturnAfter1stMatch; status = cds_send_mb_message_to_mac(pMsg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send down scan req with status = %d\n"), status); @@ -5114,9 +5114,9 @@ static void csr_diag_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) #define csr_diag_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) (void)0; #endif /* #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR */ -CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tScanReqParam scanReq; /* @@ -5147,11 +5147,11 @@ CDF_STATUS csr_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) return status; } -static CDF_STATUS +static QDF_STATUS csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) { int i, j; - CDF_STATUS status; + QDF_STATUS status; uint32_t len = 0; uint8_t *ch_lst = NULL; tCsrChannelInfo new_ch_info = { 0, NULL }; @@ -5171,7 +5171,7 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) len = sizeof(mac_ctx->roam.validChannelList); status = csr_get_cfg_valid_channels(mac_ctx, (uint8_t *) mac_ctx->roam.validChannelList, &len); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* allocate twice the channel */ new_ch_info.ChannelList = (uint8_t *) cdf_mem_malloc(len * 2); @@ -5206,9 +5206,9 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) return csr_scan_channels(mac_ctx, cmd); } -CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) +QDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(pMac, LOG3, FL("starting SCAN cmd in %d state. reason %d"), @@ -5224,7 +5224,7 @@ CDF_STATUS csr_process_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) break; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_release_scan_command(pMac, pCommand, eCSR_SCAN_FAILURE); } @@ -5391,11 +5391,11 @@ static bool csr_scan_filter_ibss_chnl_band(tpAniSirGlobal mac_ctx, * * Return: 0 - Success, Error number - Failure */ -CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, tCsrScanRequest *dst_req, tCsrScanRequest *src_req) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t len = sizeof(mac_ctx->roam.validChannelList); uint32_t index = 0; uint32_t new_index = 0; @@ -5407,7 +5407,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, !mac_ctx->scan.fEnableDFSChnlScan; status = csr_scan_free_request(mac_ctx, dst_req); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto complete; cdf_mem_copy(dst_req, src_req, sizeof(tCsrScanRequest)); /* Re-initialize the pointers to NULL since we did a copy */ @@ -5419,12 +5419,12 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->pIEField = cdf_mem_malloc(src_req->uIEFieldLen); if (NULL == dst_req->pIEField) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(mac_ctx, LOGE, FL("No memory for scanning IE fields")); goto complete; } else { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_copy(dst_req->pIEField, src_req->pIEField, src_req->uIEFieldLen); dst_req->uIEFieldLen = src_req->uIEFieldLen; @@ -5440,7 +5440,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(src_req->ChannelInfo.numOfChannels * sizeof(*dst_req->ChannelInfo.ChannelList)); if (NULL == dst_req->ChannelInfo.ChannelList) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; dst_req->ChannelInfo.numOfChannels = 0; sms_log(mac_ctx, LOGE, FL("No memory for scanning Channel List")); @@ -5471,7 +5471,7 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, } } dst_req->ChannelInfo.numOfChannels = new_index; - } else if (CDF_IS_STATUS_SUCCESS( + } else if (QDF_IS_STATUS_SUCCESS( csr_get_cfg_valid_channels(mac_ctx, mac_ctx->roam.validChannelList, &len))) { @@ -5527,10 +5527,10 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, cdf_mem_malloc(src_req->SSIDs.numOfSSIDs * sizeof(*dst_req->SSIDs.SSIDList)); if (NULL == dst_req->SSIDs.SSIDList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; - if (CDF_IS_STATUS_SUCCESS(status)) { + status = QDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(status)) { dst_req->SSIDs.numOfSSIDs = src_req->SSIDs.numOfSSIDs; cdf_mem_copy(dst_req->SSIDs.SSIDList, @@ -5551,14 +5551,14 @@ CDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->timestamp = src_req->timestamp; complete: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_scan_free_request(mac_ctx, dst_req); } return status; } -CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) +QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) { if (pReq->ChannelInfo.ChannelList) { @@ -5577,7 +5577,7 @@ CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) } pReq->SSIDs.numOfSSIDs = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand, @@ -5624,7 +5624,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv) uint8_t i, j; tCsrChannelInfo *chn_info = NULL; uint8_t channel_to_scan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - CDF_STATUS status; + QDF_STATUS status; csr_ll_lock(&mac_ctx->scan.scanCmdPendingList); @@ -5741,7 +5741,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv) status = csr_scan_copy_request(mac_ctx, &send_scancmd->u.scanCmd.u. scanRequest, &scan_req); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" Failed to get copy csr_scan_request = %d"), status); @@ -5778,9 +5778,9 @@ static void csr_sta_ap_conc_timer_handler(void *pv) } #endif -CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (pMac->scan.fScanEnable) { status = @@ -5791,7 +5791,7 @@ CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) return status; } -CDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac) +QDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac) { return cdf_mc_timer_stop(&pMac->scan.hTimerResultCfgAging); } @@ -5849,7 +5849,7 @@ bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId) tDblLinkList *pCmdList; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return fRet; } @@ -5921,12 +5921,12 @@ void csr_release_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, csr_release_command_scan(pMac, pCommand); } -CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrScanResultFilter *pScanFilter; tCsrScanResultInfo *pScanResult; @@ -5935,7 +5935,7 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("pMac->scan.NumPmkidCandidate = %d"), @@ -5948,19 +5948,19 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, *pNumItems = 0; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); return status; @@ -5992,12 +5992,12 @@ CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_WAPI -CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tBkidCandidateInfo *pBkidList, uint32_t *pNumItems) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tCsrScanResultFilter *pScanFilter; tCsrScanResultInfo *pScanResult; @@ -6006,7 +6006,7 @@ CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOGW, FL("pMac->scan.NumBkidCandidate = %d"), @@ -6019,19 +6019,19 @@ CDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, *pNumItems = 0; pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); cdf_mem_free(pScanFilter); return status; @@ -6105,13 +6105,13 @@ static void csr_roam_copy_channellist(tpAniSirGlobal mac_ctx, * Function is usually used for BSSs that suppresses SSID so the profile * shall have one and only one SSID. * - * Return: Success - CDF_STATUS_SUCCESS, Failure - error number + * Return: Success - QDF_STATUS_SUCCESS, Failure - error number */ -CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, +QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, tCsrRoamProfile *profile, uint32_t roam_id, bool notify) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tSmeCmd *scan_cmd = NULL; tCsrScanRequest *scan_req = NULL; uint8_t index = 0; @@ -6142,13 +6142,13 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == scan_cmd->u.scanCmd.pToRoamProfile) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else status = csr_roam_copy_profile(mac_ctx, scan_cmd->u.scanCmd.pToRoamProfile, profile); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto error; scan_cmd->u.scanCmd.roamId = roam_id; @@ -6182,14 +6182,14 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_malloc(profile->nAddIEScanLength); if (NULL == scan_req->pIEField) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; cdf_mem_set(scan_req->pIEField, profile->nAddIEScanLength, 0); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_copy(scan_req->pIEField, profile->pAddIEScan, profile->nAddIEScanLength); @@ -6239,13 +6239,13 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, profile->ChannelInfo.numOfChannels); if (NULL == scan_req->ChannelInfo.ChannelList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; scan_req->ChannelInfo.numOfChannels = 0; - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { csr_roam_is_channel_valid(mac_ctx, profile->ChannelInfo.ChannelList[0]); csr_roam_copy_channellist(mac_ctx, @@ -6263,11 +6263,11 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, sizeof(tCsrSSIDInfo)); if (NULL == scan_req->SSIDs.SSIDList) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) goto error; ssids = &scan_req->SSIDs; @@ -6281,7 +6281,7 @@ CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, /* Start process the command */ status = csr_queue_sme_command(mac_ctx, scan_cmd, false); error: - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" failed to iniate scan with status = %d"), status); if (scan_cmd) @@ -6298,7 +6298,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint8_t NumChannels) { uint32_t dataLen = sizeof(uint8_t) * NumChannels; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump valid channel list(NumChannels(%d))", @@ -6316,7 +6316,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, */ pMac->scan.fcc_constraint = false; status = csr_update_channel_list(pMac); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to update the supported channel list"); } @@ -6451,22 +6451,22 @@ void csr_set_cfg_country_code(tpAniSirGlobal pMac, uint8_t *countryCode) * domain-specific settings (TX filter...) */ /* - if(CDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country( + if(QDF_IS_STATUS_SUCCESS(csr_get_regulatory_domain_for_country( pMac, cc, &DomainId))) { halPhySetRegDomain(pMac, DomainId); } */ } -CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, +QDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *pbLen) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; uint32_t len; if (pBuf && pbLen && (*pbLen >= WNI_CFG_COUNTRY_CODE_LEN)) { len = *pbLen; status = wlan_cfg_get_str(pMac, WNI_CFG_COUNTRY_CODE, pBuf, &len); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { *pbLen = (uint8_t) len; } } @@ -6520,10 +6520,10 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } /* AllocateMemory */ } -CDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, eCsrAbortReason reason) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMac->scan.fDropScanCmd = true; csr_remove_cmd_with_session_id_from_pending_list(pMac, @@ -6548,7 +6548,7 @@ void csr_remove_cmd_with_session_id_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL("failed to open list")); return; } @@ -6598,7 +6598,7 @@ void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -6633,9 +6633,9 @@ void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, } -CDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId) +QDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; pMac->scan.fDropScanCmd = true; csr_remove_scan_for_ssid_from_pending_list(pMac, @@ -6656,7 +6656,7 @@ void csr_remove_scan_for_ssid_from_pending_list(tpAniSirGlobal pMac, tListElem *pEntryToRemove; cdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!CDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; } @@ -6709,7 +6709,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, { tSirSmeScanAbortReq *msg; uint16_t msg_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; msg_len = (uint16_t)(sizeof(tSirSmeScanAbortReq)); msg = cdf_mem_malloc(msg_len); @@ -6727,7 +6727,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, FL("Abort scan sent to Firmware scan_id %d session %d"), scan_id, session_id); status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(msg); sms_log(mac_ctx, LOGE, FL("Failed to send abort scan.scan_id %d session %d"), @@ -6746,16 +6746,16 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, * * .Remove Scan command from active scan list * - * Return: Success - CDF_STATUS_SUCCESS, Failure - error number + * Return: Success - QDF_STATUS_SUCCESS, Failure - error number */ -CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, tDblLinkList *list, uint32_t session_id, eSmeCommandType scan_cmd_type, eCsrAbortReason abort_reason) { tListElem *entry; tSmeCmd *cmd; tListElem *entry_remove; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; csr_ll_lock(list); if (!csr_ll_is_list_empty(list, LL_ACCESS_NOLOCK)) { @@ -6786,10 +6786,10 @@ CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal mac_ctx, } -CDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (!csr_is_scan_for_roam_command_active(pMac)) { /* * Only abort the scan if it is not used for other roam/connect @@ -6816,7 +6816,7 @@ bool csr_roam_is_valid_channel(tpAniSirGlobal pMac, uint8_t channel) } #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tSirPrefNetworkFoundInd * pPrefNetworkFoundInd) { @@ -6828,7 +6828,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tDot11fBeaconIEs *local_ie = NULL; tAniSSID tmpSsid; v_TIME_t timer = 0; - CDF_STATUS status; + QDF_STATUS status; tpSirMacMgmtHdr macHeader = (tpSirMacMgmtHdr) pPrefNetworkFoundInd->data; @@ -6837,14 +6837,14 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if (NULL == parsed_frm) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (pPrefNetworkFoundInd->frameLength <= SIR_MAC_HDR_LEN_3A) { sms_log(pMac, LOGE, FL("Incorrect len(%d)"), pPrefNetworkFoundInd->frameLength); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (sir_convert_probe_frame2_struct(pMac, &pPrefNetworkFoundInd->data[SIR_MAC_HDR_LEN_3A], @@ -6854,7 +6854,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Parse error ProbeResponse, length=%d"), pPrefNetworkFoundInd->frameLength); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* 24 byte MAC header and 12 byte to ssid IE */ if (pPrefNetworkFoundInd->frameLength > @@ -6866,7 +6866,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if (NULL == pScanResult) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pScanResult, sizeof(tCsrScanResult) + uLen, 0); pBssDescr = &pScanResult->Result.BssDescriptor; @@ -6927,11 +6927,11 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, local_ie = (tDot11fBeaconIEs *) (pScanResult->Result.pvIes); status = csr_get_parsed_bss_description_ies(pMac, &pScanResult->Result.BssDescriptor, &local_ie); - if (!(local_ie || CDF_IS_STATUS_SUCCESS(status))) { + if (!(local_ie || QDF_IS_STATUS_SUCCESS(status))) { sms_log(pMac, LOGE, FL("Cannot parse IEs")); csr_free_scan_result_entry(pMac, pScanResult); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } fDupBss = csr_remove_dup_bss_description(pMac, @@ -6946,7 +6946,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, cdf_mem_free(local_ie); csr_free_scan_result_entry(pMac, pScanResult); cdf_mem_free(parsed_frm); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } /* Add to scan cache */ csr_scan_add_result(pMac, pScanResult, local_ie, @@ -6955,7 +6955,7 @@ CDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if ((pScanResult->Result.pvIes == NULL) && local_ie) cdf_mem_free(local_ie); cdf_mem_free(parsed_frm); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -6994,7 +6994,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); pIes = (tDot11fBeaconIEs *) (pBssDesc->Result.pvIes); /* At this time, pBssDescription->Result.pvIes may be NULL */ - if (!pIes && !CDF_IS_STATUS_SUCCESS( + if (!pIes && !QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, &pBssDesc->Result.BssDescriptor, &pIes))) continue; @@ -7012,19 +7012,19 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) csr_ll_unlock(&pMac->scan.scanResultList); } -CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, uint8_t channel) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tDot11fBeaconIEs *pNewIes = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); tSirBssDescription *pNewBssDescriptor = NULL; uint32_t size = 0; if (NULL == pSession) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; return status; } sms_log(pMac, LOG2, FL("Current bssid::"MAC_ADDRESS_STR), @@ -7032,24 +7032,24 @@ CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, sms_log(pMac, LOG2, FL("My bssid::"MAC_ADDRESS_STR" channel %d"), MAC_ADDR_ARRAY(bssid.bytes), channel); - if (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( + if (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( pMac, pSession->pConnectBssDesc, &pNewIes))) { sms_log(pMac, LOGE, FL("Failed to parse IEs")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } size = pSession->pConnectBssDesc->length + sizeof(pSession->pConnectBssDesc->length); if (!size) { sms_log(pMac, LOGE, FL("length of bss descriptor is 0")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } pNewBssDescriptor = cdf_mem_malloc(size); if (NULL == pNewBssDescriptor) { sms_log(pMac, LOGE, FL("memory allocation failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } cdf_mem_copy(pNewBssDescriptor, pSession->pConnectBssDesc, size); @@ -7061,7 +7061,7 @@ CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, pNewIes, true, sessionId)) { sms_log(pMac, LOGE, FL("csr_scan_append_bss_description failed")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto free_mem; } sms_log(pMac, LOGE, FL("entry successfully added in scan cache")); @@ -7102,7 +7102,7 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1, * @return Status */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_sync_ind_ptr, tpSirBssDescription bss_desc_ptr) { @@ -7120,7 +7120,7 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, if (scan_res_ptr == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(scan_res_ptr, sizeof(tCsrScanResult) + length); @@ -7129,14 +7129,14 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, (sizeof(tSirBssDescription) + length)); ies_local_ptr = (tDot11fBeaconIEs *)(scan_res_ptr->Result.pvIes); if (!ies_local_ptr && - (!CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( + (!QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies( pMac, &scan_res_ptr->Result. BssDescriptor, &ies_local_ptr)))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Cannot Parse IEs", __func__); csr_free_scan_result_entry(pMac, scan_res_ptr); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } dup_bss = csr_remove_dup_bss_description(pMac, @@ -7149,10 +7149,10 @@ CDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, cdf_mem_free(ies_local_ptr); csr_free_scan_result_entry(pMac, scan_res_ptr); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } csr_scan_add_result(pMac, scan_res_ptr, ies_local_ptr, session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -7212,7 +7212,7 @@ void csr_scan_active_list_timeout_handle(void *userData) uint16_t scan_id; tSirSmeScanAbortReq *msg; uint16_t msg_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (scan_cmd == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -7242,7 +7242,7 @@ void csr_scan_active_list_timeout_handle(void *userData) msg->sessionId = scan_cmd->sessionId; msg->scan_id = scan_id; status = cds_send_mb_message_to_mac(msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" Failed to post message to LIM")); cdf_mem_free(msg); diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c index 7fa7ec8aaa28..0eb96e2d1ea9 100644 --- a/core/sme/src/csr/csr_cmd_process.c +++ b/core/sme/src/csr/csr_cmd_process.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,11 +46,11 @@ * * This routine will handle all the message for csr to process * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) +QDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeRsp *sme_rsp = (tSirSmeRsp *) msg_buf; #ifdef FEATURE_WLAN_SCAN_PNO tSirMbMsg *msg = (tSirMbMsg *) msg_buf; @@ -80,12 +80,12 @@ CDF_STATUS csr_msg_processor(tpAniSirGlobal mac_ctx, void *msg_buf) if (!session) { sms_log(mac_ctx, LOGE, FL("session %d not found, msgType : %d"), session_id, msg->type); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (eWNI_SME_SCAN_RSP == msg->type) { status = csr_scanning_state_msg_processor(mac_ctx, msg_buf); - if (CDF_STATUS_SUCCESS != status) + if (QDF_STATUS_SUCCESS != status) sms_log(mac_ctx, LOGE, FL("handling PNO scan resp 0x%X CSR state %d"), sme_rsp->messageType, cur_state); diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index db2591026611..e21cde84b5e1 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -197,7 +197,7 @@ typedef struct { eCsrRoamState csr_roam_state_change(tpAniSirGlobal pMac, eCsrRoamState NewRoamState, uint8_t sessionId); -CDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf); bool csr_scan_complete(tpAniSirGlobal pMac, tSirSmeScanRsp *pScanRsp); @@ -210,39 +210,39 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2, bool fForced); -CDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc); bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2); -CDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS csr_scan_sme_scan_response(tpAniSirGlobal pMac, void *pMsgBuf); /* Prepare a filter base on a profile for parsing the scan results. Upon successful return, caller MUST call csr_free_scan_filter on pScanFilter when it is done with the filter. */ -CDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_prepare_filter_from_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, tCsrScanResultFilter *pScanFilter); -CDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pDstProfile, tCsrRoamProfile *pSrcProfile); -CDF_STATUS csr_roam_start(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_start(tpAniSirGlobal pMac); void csr_roam_stop(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_startMICFailureTimer(tpAniSirGlobal pMac); void csr_roam_stopMICFailureTimer(tpAniSirGlobal pMac); void csr_roam_startTKIPCounterMeasureTimer(tpAniSirGlobal pMac); void csr_roam_stopTKIPCounterMeasureTimer(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_open(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_close(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_open(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_close(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_request_lost_link1(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_request_lost_link2(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_request_lost_link3(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_handle_failed_lostlink1(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink2(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_handle_failed_lostlink3(tpAniSirGlobal pMac, uint32_t sessionId); tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, tSirBssDescription * @@ -251,20 +251,20 @@ tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, bool fForced, uint8_t sessionId); void csr_scan_call_callback(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus scanStatus); -CDF_STATUS csr_scan_copy_request(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, +QDF_STATUS csr_scan_copy_request(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCsrScanRequest *pSrcReq); -CDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq); -CDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, +QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq); +QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, tScanResultHandle *phResult); -CDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t roamId, bool notify); -CDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac); -CDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac); void csr_scan_stop_timers(tpAniSirGlobal pMac); /* To remove fresh scan commands from the pending queue */ bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS csr_scan_abort_mac_scan(tpAniSirGlobal pMac, uint8_t sessionId, eCsrAbortReason reason); void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, tDblLinkList *pList, eSmeCommandType commandType); @@ -272,14 +272,14 @@ void csr_remove_cmd_with_session_id_from_pending_list(tpAniSirGlobal pMac, uint8_t sessionId, tDblLinkList *pList, eSmeCommandType commandType); -CDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_abort_mac_scan_not_for_connect(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_scan_abort_scan_for_ssid(tpAniSirGlobal pMac, uint32_t sessionId); void csr_remove_scan_for_ssid_from_pending_list(tpAniSirGlobal pMac, tDblLinkList *pList, uint32_t sessionId); -CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, +QDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, tDblLinkList *pList, uint32_t sessionId, eSmeCommandType scan_cmd_type, eCsrAbortReason abort_reason); @@ -288,7 +288,7 @@ CDF_STATUS csr_abort_scan_from_active_list(tpAniSirGlobal pMac, /* The logic is that whenever CSR add a BSS to scan result, it set the age count to */ /* a value. This function deduct the age count if channelId matches the BSS' channelId */ /* The BSS is remove if the count reaches 0. */ -CDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_age_results(tpAniSirGlobal pMac, tSmeGetScanChnRsp *pScanChnInfo); /* If fForce is true we will save the new String that is learn't. */ @@ -302,22 +302,22 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, void csr_reinit_scan_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_free_scan_result_entry(tpAniSirGlobal pMac, tCsrScanResult *pResult); -CDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus u1, eCsrRoamResult u2); -CDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tScanResultHandle hBSSList, eCsrRoamReason reason, uint32_t roamId, bool fImediate, bool fClearScan); -CDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields *pModProfileFields, eCsrRoamReason reason, uint32_t roamId, bool fImediate); void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, void *Context); -CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionId, eCsrEncryptionType EncryptType, tSirBssDescription *pBssDescription, tSirMacAddr *bssId, bool addKey, @@ -325,20 +325,20 @@ CDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, uint32_t sessionI tAniKeyDirection aniKeyDirection, uint8_t keyId, uint16_t keyLength, uint8_t *pKey, uint8_t paeRole); -CDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fDisassoc, bool fMICFailure); -CDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tSirBssDescription *pSirBssDesc, tDot11fBeaconIEs *pIes); void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg); void csr_roam_stats_rsp_processor(tpAniSirGlobal pMac, tSirSmeRsp *pSirMsg); -CDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamStartBssParams *pParam, tCsrRoamProfile *pProfile, tSirBssDescription *pBssDesc, uint32_t roamId); -CDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate); bool csr_is_same_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pProfile1, tCsrRoamProfile *pProfile2); @@ -348,38 +348,38 @@ bool csr_is_scan_for_roam_command_active(tpAniSirGlobal pMac); eRoamCmdStatus csr_get_roam_complete_status(tpAniSirGlobal pMac, uint32_t sessionId); /* pBand can be NULL if caller doesn't need to get it */ -CDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); -CDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect_internal(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); /* pCommand may be NULL */ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, tSmeCmd *pCommand, eCsrRoamReason eRoamReason); -CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDescription, tCsrRoamProfile *pProfile, tDot11fBeaconIEs *pIes, uint16_t messageType); -CDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode); -CDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, tSirMacAddr bssId, uint16_t reasonCode); -CDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDisassocInd pDisassocInd); -CDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, tpSirSmeDeauthInd pDeauthInd); -CDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS status); -CDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, + QDF_STATUS status); +QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocInd, - CDF_STATUS Halstatus, + QDF_STATUS Halstatus, uint8_t sessionId); -CDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamBssType bssType, tCsrRoamStartBssParams *pParam, tSirBssDescription *pBssDesc); -CDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId); /* Caller should put the BSS' ssid to fiedl bssSsid when comparing SSID for a BSS. */ bool csr_is_ssid_match(tpAniSirGlobal pMac, uint8_t *ssid1, uint8_t ssid1Len, @@ -392,7 +392,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel); /* pNumChan is a caller allocated space with the sizeof pChannels */ -CDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, +QDF_STATUS csr_get_cfg_valid_channels(tpAniSirGlobal pMac, uint8_t *pChannels, uint32_t *pNumChan); void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result); @@ -401,7 +401,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel); /* To free the last roaming profile */ void csr_free_roam_profile(tpAniSirGlobal pMac, uint32_t sessionId); void csr_free_connect_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, +QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, tScanResultHandle hScanResult); bool csr_check_ps_ready(void *pv); @@ -423,10 +423,10 @@ void csr_apply_channel_power_info_to_fw(tpAniSirGlobal pMac, void csr_apply_power2_current(tpAniSirGlobal pMac); void csr_assign_rssi_for_category(tpAniSirGlobal pMac, int8_t bestApRssi, uint8_t catOffset); -CDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, tCsrRoamConnectedProfile * pConnProfile); -CDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_start_roaming(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamingReason roamingReason); /* return a bool to indicate whether roaming completed or continue. */ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, @@ -440,7 +440,7 @@ void csr_reset_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId); #ifdef FEATURE_WLAN_WAPI void csr_reset_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId); #endif /* FEATURE_WLAN_WAPI */ -CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, +QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableSize, tSirMacChanInfo *channelTable); /* To check whether a country code matches the one in the IE */ @@ -452,19 +452,19 @@ CDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, uint32_t tableS /* pIes cannot be NULL */ bool csr_match_country_code(tpAniSirGlobal pMac, uint8_t *pCountry, tDot11fBeaconIEs *pIes); -CDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_key(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamSetKey *pSetKey, uint32_t roamId); -CDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, csr_roam_completeCallback callback, void *pContext, uint8_t *pSelfMacAddr, uint8_t *pbSessionId, uint32_t type, uint32_t subType); /* fSync: true means cleanupneeds to handle synchronously. */ -CDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, bool fSync, csr_roamSessionCloseCallback callback, void *pContext); void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId); -CDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, uint32_t *pSessionId); eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); @@ -472,44 +472,44 @@ eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); \fn csr_scan_enable \brief Enable the scanning feature of CSR. It must be called before any scan request can be performed. \param tHalHandle - HAL context handle - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_enable(tpAniSirGlobal); +QDF_STATUS csr_scan_enable(tpAniSirGlobal); /* --------------------------------------------------------------------------- \fn csr_scan_disable \brief Disableing the scanning feature of CSR. After this function return success, no scan is performed until a successfull to csr_scan_enable \param tHalHandle - HAL context handle - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_disable(tpAniSirGlobal); +QDF_STATUS csr_scan_disable(tpAniSirGlobal); /* --------------------------------------------------------------------------- \fn csr_scan_request \brief Request a 11d or full scan. \param callback - a callback function that scan calls upon finish, will not be called if csr_scan_request returns error \param pContext - a pointer passed in for the callback - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_request(tpAniSirGlobal, uint16_t, tCsrScanRequest *, +QDF_STATUS csr_scan_request(tpAniSirGlobal, uint16_t, tCsrScanRequest *, csr_scan_completeCallback callback, void *pContext); /* --------------------------------------------------------------------------- \fn csrScanAbort \brief If a scan request is abort, the scan complete callback will be called first before csrScanAbort returns. \param pScanRequestID - The request ID returned from csr_scan_request - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csrScanAbort(tpAniSirGlobal, uint32_t scanRequestID); +QDF_STATUS csrScanAbort(tpAniSirGlobal, uint32_t scanRequestID); /* --------------------------------------------------------------------------- \fn csr_scan_get_result \brief Return scan results. \param pFilter - If pFilter is NULL, all cached results are returned \param phResult - an object for the result. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, +QDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, tScanResultHandle *phResult); /* --------------------------------------------------------------------------- @@ -517,22 +517,22 @@ CDF_STATUS csr_scan_get_result(tpAniSirGlobal, tCsrScanResultFilter *pFilter, \brief Clear scan results. \param pMac - pMac global pointer \param sessionId - Session Identifier - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_flush_result(tpAniSirGlobal); +QDF_STATUS csr_scan_flush_result(tpAniSirGlobal); /* --------------------------------------------------------------------------- * \fn csr_scan_filter_results * \brief Filter scan results based on valid channel list. * \param pMac - Pointer to Global MAC structure - * \return CDF_STATUS + * \return QDF_STATUS ***------------------------------------------------------------------------------- */ -CDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); +QDF_STATUS csr_scan_filter_results(tpAniSirGlobal pMac); void csr_save_scan_results(tpAniSirGlobal pMac, uint8_t reason, uint8_t sessionId); -CDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal, bool flushP2P); +QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal, bool flushP2P); /* --------------------------------------------------------------------------- \fn csr_scan_result_get_first @@ -557,9 +557,9 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal, \param pBuf - Caller allocated buffer with at least 3 bytes, upon success return, this has the country code \param pbLen - Caller allocated, as input, it indicates the length of pBuf. Upon success return, this contains the length of the data in pBuf - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, +QDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, uint8_t *pbLen); /* --------------------------------------------------------------------------- @@ -567,9 +567,9 @@ CDF_STATUS csr_get_country_code(tpAniSirGlobal pMac, uint8_t *pBuf, \brief this function is to set the country code so channel/power setting matches the countrycode and the domain it belongs to. \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); +QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); /* --------------------------------------------------------------------------- \fn csr_get_regulatory_domain_for_country @@ -579,9 +579,9 @@ CDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry); \param pCountry - Caller allocated buffer with at least 3 bytes specifying the country code \param pDomainId - Caller allocated buffer to get the return domain ID upon success return. Can be NULL. \param source - the source of country information. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, +QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, uint8_t *pCountry, v_REGDOMAIN_t *pDomainId, enum country_src source); @@ -594,13 +594,13 @@ bool csr_is_wmm_supported(tpAniSirGlobal pMac); bool csr_is_mcc_supported(tpAniSirGlobal pMac); /* Return SUCCESS is the command is queued, failed */ -CDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, +QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool fHighPriority); tSmeCmd *csr_get_command_buffer(tpAniSirGlobal pMac); void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, tpSmeCsaOffloadInd pCsaOffloadInd); -CDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac, uint32_t scan_id, +QDF_STATUS csr_get_active_scan_entry(tpAniSirGlobal mac, uint32_t scan_id, tListElem **entry); #ifdef FEATURE_WLAN_WAPI @@ -691,9 +691,9 @@ int diag_enc_type_from_csr_type(eCsrEncryptionType encType); \brief remove all items(tCsrScanResult) in the list and free memory for each item \param hScanResult - returned from csr_scan_get_result. hScanResult is considered gone by calling this function and even before this function reutrns. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, tScanResultHandle hScanResult); /* /////////////////////////////////////////Common Scan ends */ @@ -703,9 +703,9 @@ CDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, \brief To inititiate an association \param pProfile - can be NULL to join to any open ones \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, uint32_t *pRoamId); @@ -719,9 +719,9 @@ CDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, that might need modification dynamically once STA is up & running and this could trigger a reassoc \param pRoamId - to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pProfile, tCsrRoamModifyProfileFields modProfileFields, uint32_t *pRoamId); @@ -729,9 +729,9 @@ CDF_STATUS csr_roam_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, /* --------------------------------------------------------------------------- \fn csr_roam_reconnect \brief To disconnect and reconnect with the same profile - \return CDF_STATUS. It returns fail if currently not connected + \return QDF_STATUS. It returns fail if currently not connected -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- \fn csr_roam_set_pmkid_cache @@ -739,11 +739,11 @@ CDF_STATUS csr_roam_reconnect(tpAniSirGlobal pMac, uint32_t sessionId); \param pPMKIDCache - caller allocated buffer point to an array of tPmkidCacheInfo \param numItems - a variable that has the number of tPmkidCacheInfo allocated when retruning, this is either the number needed or number of items put into pPMKIDCache - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCacheInfo. \Note: pNumItems is a number of tPmkidCacheInfo, not sizeof(tPmkidCacheInfo) * something -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCacheInfo *pPMKIDCache, uint32_t numItems, bool update_entire_cache); @@ -754,10 +754,10 @@ CDF_STATUS csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, *\param pMac - pointer to global structure for MAC *\param sessionId - Sme session id *\param pPSK_PMK - pointer to an array of Psk/Pmk - *\return CDF_STATUS - usually it succeed unless sessionId is not found + *\return QDF_STATUS - usually it succeed unless sessionId is not found *\Note: *-------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pPSK_PMK, size_t pmk_len); /* --------------------------------------------------------------------------- @@ -766,10 +766,10 @@ CDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, *\param pMac - pointer to global structure for MAC *\param sessionId - Sme session id *\param nRoamKeyMgmtOffloadEnabled - value of key mgmt offload enable - *\return CDF_STATUS - usually it succeed unless sessionId is not found + *\return QDF_STATUS - usually it succeed unless sessionId is not found *\Note: *-------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, uint32_t sessionId, bool nRoamKeyMgmtOffloadEnabled); #endif @@ -779,9 +779,9 @@ CDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the needed or IE length in pBuf. \param pBuf - Caller allocated memory that contain the IE field, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); /* --------------------------------------------------------------------------- @@ -790,9 +790,9 @@ CDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, \param pLen - caller allocated memory that has the length of pBuf as input. Upon returned, *pLen has the needed or IE length in pBuf. \param pBuf - Caller allocated memory that contain the IE field, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pLen, uint8_t *pBuf); /* --------------------------------------------------------------------------- @@ -808,9 +808,9 @@ uint32_t csr_roam_get_num_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId); \param pNum - caller allocated memory that has the space of the number of pBuf tPmkidCacheInfo as input. Upon returned, *pNum has the needed or actually number in tPmkidCacheInfo. \param pPmkidCache - Caller allocated memory that contains PMKID cache, if any, upon return - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pNum, tPmkidCacheInfo *pPmkidCache); /** @@ -823,17 +823,17 @@ CDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, * @pProfile: pointer to a caller allocated structure * tCsrRoamConnectedProfile * - * Return: CDF_STATUS. Failure if not connected, success otherwise + * Return: QDF_STATUS. Failure if not connected, success otherwise */ -CDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamConnectedProfile *pProfile); /* --------------------------------------------------------------------------- \fn csr_roam_get_connect_state \brief To return the current connect state of Roaming - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_connect_state(tpAniSirGlobal pMac, uint32_t sessionId, eCsrConnectState *pState); void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); @@ -843,9 +843,9 @@ void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile); \brief HDD calls this function to set the WNI_CFG_VALID_CHANNEL_LIST base on the band/mode settings. This function must be called after CFG is downloaded and all the band/mode setting already passed into CSR. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); +QDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); /** * csr_change_config_params() - The CSR API exposed for HDD to provide config @@ -862,25 +862,25 @@ CDF_STATUS csr_apply_channel_and_power_list(tpAniSirGlobal pMac); * API provides info regarding 11d only at reset but we can extend this for * other params (PMC, QoS) which needs to be initialized again at reset. * - * Return: CDF_STATUS. status of operation + * Return: QDF_STATUS. status of operation */ -CDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, +QDF_STATUS csr_change_config_params(tpAniSirGlobal pMac, tCsrUpdateConfigParam *pUpdateConfigParam); /* --------------------------------------------------------------------------- \fn csr_roam_connect_to_last_profile \brief To disconnect and reconnect with the same profile - \return CDF_STATUS. It returns fail if currently connected + \return QDF_STATUS. It returns fail if currently connected -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId); +QDF_STATUS csr_roam_connect_to_last_profile(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- \fn csr_roam_disconnect \brief To disconnect from a network \param reason -- To indicate the reason for disconnecting. Currently, only eCSR_DISCONNECT_REASON_MIC_ERROR is meanful. - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamDisconnectReason reason); /* --------------------------------------------------------------------------- @@ -889,17 +889,17 @@ CDF_STATUS csr_roam_disconnect(tpAniSirGlobal pMac, uint32_t sessionId, \param pPmkidList - caller allocated buffer point to an array of tPmkidCandidateInfo \param pNumItems - pointer to a variable that has the number of tPmkidCandidateInfo allocated when retruning, this is either the number needed or number of items put into pPmkidList - \return CDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems + \return QDF_STATUS - when fail, it usually means the buffer allocated is not big enough and pNumItems has the number of tPmkidCandidateInfo. \Note: pNumItems is a number of tPmkidCandidateInfo, not sizeof(tPmkidCandidateInfo) * something -------------------------------------------------------------------------------*/ -CDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, tPmkidCandidateInfo *pPmkidList, uint32_t *pNumItems); /* This function is used to stop a BSS. It is similar of csr_roamIssueDisconnect but this function */ /* doesn't have any logic other than blindly trying to stop BSS */ -CDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_issue_stop_bss_cmd(tpAniSirGlobal pMac, uint32_t sessionId, bool fHighPriority); void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, @@ -913,9 +913,9 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, \param sessionId - session Id for Soft AP \param pPeerMacAddr - MAC of associated station to delete \param reason - reason code, be one of the tSirMacReasonCodes - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pPeerMacAddr, uint32_t reason); @@ -928,9 +928,9 @@ CDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to issue a deauthenticate station command * - * Return: CDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error */ -CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, struct tagCsrDelStaParams *pDelStaParams); @@ -939,9 +939,9 @@ CDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, \brief csr function that HDD calls to start and stop tkip countermeasures \param sessionId - session Id for Soft AP \param bEnable - Flag to start/stop countermeasures - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, +QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable); /* --------------------------------------------------------------------------- @@ -952,14 +952,14 @@ CDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pAssocStasBuf - Caller allocated memory to be filled with associatd stations info - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); -CDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, CDF_MODULE_ID modId, struct cdf_mac_addr bssId, @@ -974,14 +974,14 @@ CDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pRemoveMac - pointer to MAC address of session to be removed - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, struct cdf_mac_addr pRemoveMac); -CDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, +QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssId, void *pUsrContext, @@ -992,9 +992,9 @@ CDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, \fn csr_send_chng_mcc_beacon_interval \brief csr function that HDD calls to send Update beacon interval \param sessionId - session Id for Soft AP - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS +QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId); /* --------------------------------------------------------------------------- @@ -1009,10 +1009,10 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1, uint32_t *incr); #endif -CDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, tpSirBssDescription pBssDescription, eCsrRoamReason reason, bool fImmediate); -CDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason); +QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason); void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac, uint8_t sessionId); @@ -1021,13 +1021,13 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, tCsrScanResult *pResult, tDot11fBeaconIEs *pIes); -CDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, struct cdf_mac_addr bssid, uint8_t channel); -CDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); -CDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, +QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); +QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, uint32_t sessionId, const uint8_t *pBSSId, bool flush_cache); @@ -1037,16 +1037,16 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode); void csr_clear_votes_for_country_info(tpAniSirGlobal pMac); #endif -CDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, uint8_t session_id); #ifdef QCA_HT_2040_COEX -CDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, ePhyChanBondState cbMode, bool obssEnabled); #endif -CDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac, +QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal mac, tSmeCmd *command); -CDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac, +QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal mac, tSmeCmd *command); tSirBssDescription* csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, @@ -1056,5 +1056,5 @@ void csr_release_scan_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, bool is_disconnect_pending(tpAniSirGlobal mac_ctx, uint8_t sessionid); void csr_scan_active_list_timeout_handle(void *userData); -CDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, +QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd); diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 1fa0b8b6f5a7..da01816d0249 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -217,28 +217,28 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) return fFound; } -CDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) +QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) { - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status; if (!pList) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (LIST_FLAG_OPEN != pList->Flag) { pList->Count = 0; pList->cmdTimeoutTimer = NULL; - cdf_status = cdf_mutex_init(&pList->Lock); + qdf_status = cdf_mutex_init(&pList->Lock); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { csr_list_init(&pList->ListHead); pList->Flag = LIST_FLAG_OPEN; pList->hHdd = hHdd; } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } } return status; diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index a2db166316ac..ba92198d1d09 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -55,10 +55,10 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile); -static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, +static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, uint8_t sessionId); #define CSR_NEIGHBOR_ROAM_STATE_TRANSITION(mac_ctx, newstate, session) \ @@ -262,12 +262,12 @@ static void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal pMac, } } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool fastRoamEnabled) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; /* set fast roam enable/disable flag */ @@ -296,18 +296,18 @@ csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, ("Unexpected state %s, returning failure"), mac_trace_get_neighbour_roam_state (pNeighborRoamInfo->neighborRoamState)); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } #ifdef FEATURE_WLAN_ESE -CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, uint8_t sessionId, const bool eseMode) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -338,18 +338,18 @@ CDF_STATUS csr_neighbor_roam_update_ese_mode_enabled(tpAniSirGlobal pMac, pNeighborRoamInfo->neighborRoamState); break; } - return cdf_status; + return qdf_status; } #endif -CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t neighborLookupRssiThreshold) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; switch (pNeighborRoamInfo->neighborRoamState) { case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED: @@ -381,19 +381,19 @@ CDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, ("Unexpected state %s, returning failure"), mac_trace_get_neighbour_roam_state (pNeighborRoamInfo->neighborRoamState)); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_opportunistic_scan_threshold_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nOpportunisticThresholdDiff) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -427,18 +427,18 @@ csr_neighbor_roam_set_opportunistic_scan_threshold_diff(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamRescanRssiDiff) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -470,18 +470,18 @@ csr_neighbor_roam_set_roam_rescan_rssi_diff(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFirstBcnt) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -516,18 +516,18 @@ csr_neighbor_roam_set_roam_bmiss_first_bcnt(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBmissFinalBcnt) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -561,18 +561,18 @@ csr_neighbor_roam_set_roam_bmiss_final_bcnt(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } -CDF_STATUS +QDF_STATUS csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t nRoamBeaconRssiWeight) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -606,10 +606,10 @@ csr_neighbor_roam_set_roam_beacon_rssi_weight(tpAniSirGlobal pMac, LOGE, FL("Unexpected state %d returning failure"), pNeighborRoamInfo->neighborRoamState); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; break; } - return cdf_status; + return qdf_status; } /*CleanUP Routines*/ @@ -773,9 +773,9 @@ void csr_neighbor_roam_purge_preauth_fail_list(tpAniSirGlobal pMac) * * This function adds the given BSSID to the Preauth fail list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirMacAddr bssid) { @@ -797,20 +797,20 @@ CDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, bssid, sizeof(tSirMacAddr))) { sms_log(mac_ctx, LOGW, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"), MAC_ADDR_ARRAY(bssid)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } if ((num_mac_addr + 1) > MAX_NUM_PREAUTH_FAIL_LIST_ADDRESS) { sms_log(mac_ctx, LOGE, FL("Cannot add, preauth fail list is full.")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. macAddress[num_mac_addr], bssid, sizeof(tSirMacAddr)); neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -863,14 +863,14 @@ bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, * This function issues preauth request to PE with the 1st AP entry in the * roamable AP list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, +static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, uint8_t session_id) { tpCsrNeighborRoamControlInfo neighbor_roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpCsrNeighborRoamBSSInfo neighbor_bss_node; @@ -878,7 +878,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, /* This must not be true here */ CDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -893,7 +893,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, if (NULL == neighbor_bss_node) { sms_log(mac_ctx, LOGW, FL("Roamable AP list is empty.. ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, neighbor_bss_node->pBssDescription->bssId, @@ -908,7 +908,7 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, neighbor_bss_node->pBssDescription->bssId), (int)neighbor_bss_node->pBssDescription->channelId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac_ctx, LOGE, FL("Return failed preauth request status %d"), status); @@ -943,17 +943,17 @@ static CDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, * pre-auth failed list. If no more entries present in roamable AP list, * transition to REPORT_SCAN state. * - * Return: CDF_STATUS_SUCCESS on success (i.e. pre-auth processed), - * CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success (i.e. pre-auth processed), + * QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, +QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirRetStatus lim_status) { tpCsrNeighborRoamControlInfo neighbor_roam_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; - CDF_STATUS preauth_processed = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS preauth_processed = QDF_STATUS_SUCCESS; tpCsrNeighborRoamBSSInfo preauth_rsp_node = NULL; if (false == neighbor_roam_info->FTRoamInfo.preauthRspPending) { @@ -966,7 +966,7 @@ CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, FL("Unexpected pre-auth response in state %d"), neighbor_roam_info->neighborRoamState); - preauth_processed = CDF_STATUS_E_FAILURE; + preauth_processed = QDF_STATUS_E_FAILURE; goto DEQ_PREAUTH; } /* We can receive it in these 2 states. */ @@ -976,7 +976,7 @@ CDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, FL("Preauth response received in state %s"), mac_trace_get_neighbour_roam_state (neighbor_roam_info->neighborRoamState)); - preauth_processed = CDF_STATUS_E_FAILURE; + preauth_processed = QDF_STATUS_E_FAILURE; goto DEQ_PREAUTH; } @@ -1088,7 +1088,7 @@ NEXT_PREAUTH: goto ABORT_PREAUTH; } /* Issue preauth request for the same/next entry */ - if (CDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( + if (QDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( mac_ctx, session_id)) goto DEQ_PREAUTH; ABORT_PREAUTH: @@ -1125,9 +1125,9 @@ DEQ_PREAUTH: * This function handles the RoamOffloadSynch and adds the * roamed AP to the preauth done list * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_sync_ind_ptr, uint8_t session_id) { @@ -1141,14 +1141,14 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("LFR3:Roam Offload Synch Ind received in state %d"), neighbor_roam_info_ptr->neighborRoamState); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } bss_info_ptr = cdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); if (NULL == bss_info_ptr) { sms_log(pMac, LOGE, FL("LFR3:Memory allocation for Neighbor Roam BSS Info failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } bss_desc_len = roam_sync_ind_ptr->bss_desc_ptr->length + sizeof(roam_sync_ind_ptr->bss_desc_ptr->length); @@ -1161,7 +1161,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("LFR3:Mem alloc for Neighbor Roam BSS Descriptor failed")); cdf_mem_free(bss_info_ptr); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } csr_ll_insert_tail(&neighbor_roam_info_ptr->FTRoamInfo.preAuthDoneList, @@ -1173,7 +1173,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /** @@ -1186,9 +1186,9 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, * This function creates a scan filter based on the currently * connected profile. Based on this filter, scan results are obtained * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId) @@ -1203,7 +1203,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, CDF_ASSERT(pScanFilter != NULL); if (pScanFilter == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; cdf_mem_zero(pScanFilter, sizeof(tCsrScanResultFilter)); roam_params = &pMac->roam.configParam.roam_params; @@ -1219,7 +1219,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->BSSIDs.bssid) { sms_log(pMac, LOGE, FL("Scan Filter BSSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pScanFilter->BSSIDs.bssid, @@ -1244,7 +1244,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, FL("Scan Filter SSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = 0; i < roam_params->num_ssid_allowed_list; i++) { pScanFilter->SSIDs.SSIDList[i].handoffPermitted = 1; @@ -1264,7 +1264,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, FL("Scan Filter SSID mem alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pScanFilter->SSIDs.SSIDList->handoffPermitted = 1; pScanFilter->SSIDs.SSIDList->ssidHidden = 0; @@ -1308,7 +1308,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, FL("Scan Filter Ch list mem alloc failed")); cdf_mem_free(pScanFilter->SSIDs.SSIDList); pScanFilter->SSIDs.SSIDList = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } for (i = 0; i < pScanFilter->ChannelInfo.numOfChannels; i++) { pScanFilter->ChannelInfo.ChannelList[i] = @@ -1335,7 +1335,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, pScanFilter->MFPRequired = pCurProfile->MFPRequired; pScanFilter->MFPCapable = pCurProfile->MFPCapable; #endif - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, @@ -1607,7 +1607,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, csr_scan_result_purge(mac_ctx, *scan_results_list); } -static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, +static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = @@ -1615,7 +1615,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, tCsrScanResultFilter scanFilter; tScanResultHandle scanResult; uint32_t tempVal = 0; - CDF_STATUS hstatus; + QDF_STATUS hstatus; hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, &scanFilter, @@ -1624,15 +1624,15 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, FL ("11R/ESE/Other Association: Prepare scan to find neighbor AP filter status = %d"), hstatus); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("Scan Filter preparation failed for Assoc type %d.. Bailing out.."), tempVal); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); - if (hstatus != CDF_STATUS_SUCCESS) { + if (hstatus != QDF_STATUS_SUCCESS) { NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Get Scan Result status code %d"), hstatus); @@ -1647,7 +1647,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, if (tempVal) { csr_neighbor_roam_trigger_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (csr_roam_is_roam_offload_scan_enabled(pMac)) { @@ -1666,7 +1666,7 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1687,9 +1687,9 @@ static CDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, * This function is used to filter out the channels based on the * currently associated AP channel * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t * pInputChannelList, @@ -1706,17 +1706,17 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac pMac->roam.neighborRoamInfo[sessionId].currAPoperationChannel; /* Check for NULL pointer */ if (!pInputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; /* Check for NULL pointer */ if (!pOutputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } for (i = 0; i < inputNumOfChannels; i++) { if (get_rf_band(currAPoperationChannel) == @@ -1729,7 +1729,7 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac /* Return final number of channels */ *pMergedOutputNumOfChannels = numChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1751,9 +1751,9 @@ CDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac * copies the input channel list to the output channel list. if number * of merged channels are more than 100, num of channels set to 100 * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, uint8_t *pInputChannelList, uint8_t inputNumOfChannels, uint8_t *pOutputChannelList, @@ -1767,23 +1767,23 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, /* Check for NULL pointer */ if (!pInputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; /* Check for NULL pointer */ if (!pOutputChannelList) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Output Channels %d", __func__, outputNumOfChannels); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Add the "new" channels in the input list to the end of the output list. */ for (i = 0; i < inputNumOfChannels; i++) { @@ -1813,7 +1813,7 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, /* Return final number of channels */ *pMergedOutputNumOfChannels = numChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1827,9 +1827,9 @@ CDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, * it generates channel list which will be used in REPORT_SCAN state to * scan for these neighbor APs * - * Return: CDF_STATUS_SUCCESS on success, CDF_STATUS_E_FAILURE otherwise + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise */ -CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGlobal pMac, uint8_t sessionId) { tpRrmNeighborReportDesc pNeighborBssDesc; @@ -1940,7 +1940,7 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba sms_log(pMac, LOGE, FL ("Memory allocation for Channel list failed.. TL event ignored")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. @@ -1992,7 +1992,7 @@ CDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba } pNeighborRoamInfo->roamChannelInfo.currentChanIndex = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_VOWIFI */ @@ -2094,7 +2094,7 @@ bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac, pBssDesc = pPrevProfile->pBssDesc; if (pBssDesc) { - if (CDF_IS_STATUS_SUCCESS( + if (QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(pMac, pBssDesc, &pIes)) && csr_neighbor_roam_is_ssid_and_security_match(pMac, pCurrProfile, pBssDesc, pIes)) { @@ -2148,9 +2148,9 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, * This function is used to prepare a channel list that is derived from * the list of valid channels and does not include those in the occupied list * - * Return CDF_STATUS + * Return QDF_STATUS */ -CDF_STATUS +QDF_STATUS csr_neighbor_roam_prepare_non_occupied_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pInputChannelList, uint8_t numOfChannels, uint8_t *pOutputChannelList, @@ -2191,7 +2191,7 @@ csr_neighbor_roam_prepare_non_occupied_channel_list(tpAniSirGlobal pMac, /* Return the number of channels */ *pOutputNumOfChannels = outputNumOfChannels; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2230,9 +2230,9 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) * data structures. Neighbor roam state transitions to INIT state whenever * this function is called except if the current state is REASSOCIATING * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = @@ -2244,7 +2244,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Disconn ind on session %d in state %d from bss :" @@ -2272,7 +2272,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, "sessionId: %d, csrPersonna %d"), sessionId, (int)roam_session->pCurRoamProfile->csrPersona); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_ESE if (pSession->connectedProfile.isESEAssoc) { @@ -2359,7 +2359,7 @@ CDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, REASON_DISCONNECTED); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2481,7 +2481,7 @@ static void csr_neighbor_roam_info_ctx_init( * csr_neighbor_roam_indicate_connect() * @pMac: mac context * @session_id: Session Id - * @cdf_status: CDF status + * @qdf_status: CDF status * * This function is called by CSR as soon as the station connects to an AP. * This initializes all the necessary data structures related to the @@ -2489,9 +2489,9 @@ static void csr_neighbor_roam_info_ctx_init( * * Return: CDF status */ -CDF_STATUS csr_neighbor_roam_indicate_connect( +QDF_STATUS csr_neighbor_roam_indicate_connect( tpAniSirGlobal pMac, uint8_t session_id, - CDF_STATUS cdf_status) + QDF_STATUS qdf_status) { tpCsrNeighborRoamControlInfo ngbr_roam_info = &pMac->roam.neighborRoamInfo[session_id]; @@ -2500,12 +2500,12 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( tCsrRoamSession *session = &pMac->roam.roamSession[session_id]; tpSirSetActiveModeSetBncFilterReq msg; #endif - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* if session id invalid then we need return failure */ if (NULL == ngbr_roam_info || !CSR_IS_SESSION_VALID(pMac, session_id) || (NULL == pMac->roam.roamSession[session_id].pCurRoamProfile)) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, @@ -2520,7 +2520,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( FL("Ignoring Connect ind received from a non STA." "session_id: %d, csrPersonna %d"), session_id, (int)session->pCurRoamProfile->csrPersona); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* if a concurrent session is running */ if ((false == @@ -2529,7 +2529,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( sms_log(pMac, LOGE, FL("Ignoring Connect ind. received in multisession %d"), csr_is_concurrent_session_running(pMac)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress && @@ -2541,7 +2541,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( if (msg == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } msg->messageType = eWNI_SME_SET_BCN_FILTER_REQ; msg->length = sizeof(uint8_t); @@ -2564,7 +2564,7 @@ CDF_STATUS csr_neighbor_roam_indicate_connect( switch (ngbr_roam_info->neighborRoamState) { case eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING: - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { /** * Just transition the state to INIT state.Rest of the * clean up happens when we get next connect indication @@ -2631,12 +2631,12 @@ void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) +QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) { - CDF_STATUS status; + QDF_STATUS status; uint8_t i; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; tpCsr11rAssocNeighborInfo pFTRoamInfo = NULL; @@ -2666,10 +2666,10 @@ CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) MAX_BSS_IN_NEIGHBOR_RPT); status = csr_ll_open(pMac->hHdd, &pFTRoamInfo->preAuthDoneList); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of preauth done AP List failed")); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } } return status; @@ -2683,12 +2683,12 @@ CDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) +QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) { - CDF_STATUS status; + QDF_STATUS status; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -2736,7 +2736,7 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { sms_log(pMac, LOGE, FL("Memory Allocation for CFG Channel List failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } else { pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; @@ -2781,12 +2781,12 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) sizeof(tCsrRoamConnectedProfile), 0); status = csr_ll_open(pMac->hHdd, &pNeighborRoamInfo->roamableAPList); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } pNeighborRoamInfo->roamChannelInfo.currentChanIndex = @@ -2798,13 +2798,13 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; status = csr_neighbor_roam_init11r_assoc_info(pMac); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; csr_ll_close(&pNeighborRoamInfo->roamableAPList); - return CDF_STATUS_E_RESOURCES; + return QDF_STATUS_E_RESOURCES; } CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, @@ -2812,7 +2812,7 @@ CDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; /* Set the Last Sent Cmd as RSO_STOP */ pNeighborRoamInfo->last_sent_cmd = ROAM_SCAN_OFFLOAD_STOP; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -2903,7 +2903,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, &mac_ctx->roam.neighborRoamInfo[session_id]; tCsrNeighborRoamBSSInfo handoff_node; uint32_t roamid = 0; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", __func__, session_id); @@ -2948,7 +2948,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, */ status = csr_roam_copy_connected_profile(mac_ctx, session_id, &neighbor_roam_info->csrNeighborRoamProfile); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("csr_roam_copy_connected_profile failed %d"), status); @@ -2962,7 +2962,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, " csr_roamHandoffRequested: disassociating with current AP"); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_roam_issue_disassociate_cmd (mac_ctx, session_id, eCSR_DISCONNECT_REASON_HANDOFF))) { @@ -3173,16 +3173,16 @@ bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId) * This function is called by CSR as soon as TL posts the candidate * found indication to SME via MC thread * - * Return: CDF_STATUS_SUCCESS on success, corresponding error code otherwise + * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise */ -CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg) +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg) { tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd = (tSirSmeCandidateFoundInd *) pMsg; uint32_t sessionId = pSirSmeCandidateFoundInd->sessionId; tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; sms_log(pMac, LOG1, FL("Received indication from firmware")); @@ -3193,7 +3193,7 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void sms_log(pMac, LOGE, FL ("Received in not CONNECTED state OR uOsRequestedHandoff is set. Ignore it")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { /* Firmware indicated that roaming candidate is found. Beacons * are already in the SME scan results table. @@ -3209,11 +3209,11 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void */ status = csr_neighbor_roam_process_scan_complete(pMac, sessionId); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("Neighbor scan process complete failed with status %d"), status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -3231,13 +3231,13 @@ CDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void * * Return: status */ -CDF_STATUS csr_neighbor_roam_process_handoff_req( +QDF_STATUS csr_neighbor_roam_process_handoff_req( tpAniSirGlobal mac_ctx, uint8_t session_id) { tpCsrNeighborRoamControlInfo roam_ctrl_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t roam_id; tCsrRoamProfile *profile = NULL; tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); @@ -3245,20 +3245,20 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( if (NULL == session) { sms_log(mac_ctx, LOGE, FL("session is NULL ")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); profile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == profile) { sms_log(mac_ctx, LOGE, FL("Memory alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(profile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(mac_ctx, profile, session->pCurRoamProfile); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("Profile copy failed")); goto end; } @@ -3270,7 +3270,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( profile->BSSIDs.numOfBSSIDs); if (NULL == profile->BSSIDs.bssid) { sms_log(mac_ctx, LOGE, FL("mem alloc failed for BSSID")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } } @@ -3294,7 +3294,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( if (NULL == profile->ChannelInfo.ChannelList) { sms_log(mac_ctx, LOGE, FL("mem alloc failed for ChannelList")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } } @@ -3304,7 +3304,7 @@ CDF_STATUS csr_neighbor_roam_process_handoff_req( /* do a SSID scan */ status = csr_scan_for_ssid(mac_ctx, session_id, profile, roam_id, false); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("SSID scan failed")); } @@ -3327,15 +3327,15 @@ end: \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, - uint8_t sessionId, CDF_STATUS status) +QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, + uint8_t sessionId, QDF_STATUS status) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS hstatus; + QDF_STATUS hstatus; sms_log(pMac, LOGE, FL("called ")); @@ -3344,36 +3344,36 @@ CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, pNeighborRoamInfo->neighborRoamState) { sms_log(pMac, LOGE, FL("Received in not CONNECTED state. Ignore it")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* if SSID scan failed to find our candidate add an entry to csr scan cache ourself */ - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Add an entry to csr scan cache")); hstatus = csr_scan_create_entry_in_scan_cache(pMac, sessionId, pNeighborRoamInfo-> handoffReqInfo.bssid, pNeighborRoamInfo-> handoffReqInfo.channel); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("csr_scan_create_entry_in_scan_cache failed with status %d"), hstatus); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } /* Now we have completed scanning for the candidate provided by HDD. Let move on to HO */ hstatus = csr_neighbor_roam_process_scan_complete(pMac, sessionId); - if (CDF_STATUS_SUCCESS != hstatus) { + if (QDF_STATUS_SUCCESS != hstatus) { sms_log(pMac, LOGE, FL ("Neighbor scan process complete failed with status %d"), hstatus); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -3387,28 +3387,28 @@ CDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, * * Return: status */ -CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( +QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( tpAniSirGlobal mac_ctx, void *msg) { tAniHandoffReq *handoff_req = (tAniHandoffReq *) msg; uint32_t session_id = handoff_req->sessionId; tpCsrNeighborRoamControlInfo roam_ctrl_info = &mac_ctx->roam.neighborRoamInfo[session_id]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* we must be in connected state, if not ignore it */ if (eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != roam_ctrl_info->neighborRoamState) { sms_log(mac_ctx, LOGE, FL("Received in not CONNECTED state. Ignore it")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* save the handoff info came from HDD as part of the reassoc req */ handoff_req = (tAniHandoffReq *) msg; if (NULL == handoff_req) { sms_log(mac_ctx, LOGE, FL("Received msg is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* sanity check */ @@ -3418,7 +3418,7 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( sms_log(mac_ctx, LOGE, FL ("Received req has same BSSID as current AP!!")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } roam_ctrl_info->handoffReqInfo.channel = handoff_req->channel; @@ -3430,7 +3430,7 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( status = csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_STOP, REASON_OS_REQUESTED_ROAMING_NOW); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { sms_log(mac_ctx, LOGE, FL("csr_roam_offload_scan failed")); roam_ctrl_info->uOsRequestedHandoff = 0; @@ -3447,14 +3447,14 @@ CDF_STATUS csr_neighbor_roam_handoff_req_hdlr( * This function is called by CSR as soon as it gets rsp back for * ROAM_SCAN_OFFLOAD_STOP with reason REASON_OS_REQUESTED_ROAMING_NOW * - * Return: CDF_STATUS_SUCCESS on success, corresponding error code otherwise + * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise */ -CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, +QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* we must be in connected state, if not ignore it */ if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != pNeighborRoamInfo->neighborRoamState) @@ -3462,12 +3462,12 @@ CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("Received in not CONNECTED state or uOsRequestedHandoff is not set. Ignore it")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { /* Let's go ahead with handoff */ status = csr_neighbor_roam_process_handoff_req(pMac, sessionId); } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { pNeighborRoamInfo->uOsRequestedHandoff = 0; } return status; @@ -3483,10 +3483,10 @@ CDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, \param pMac - The handle returned by mac_open. - \return CDF_STATUS_SUCCESS on success, corresponding error code otherwise + \return QDF_STATUS_SUCCESS on success, corresponding error code otherwise ---------------------------------------------------------------------------*/ -CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId) +QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -3496,5 +3496,5 @@ CDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t session csr_roam_offload_scan(pMac, sessionId, ROAM_SCAN_OFFLOAD_START, REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index e800fad1c037..d99bd997cd1e 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -51,9 +51,9 @@ * common routine to remove TDLS cmd from SME command list.. * commands are removed after getting reponse from PE. */ -CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) +QDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *pEntry; tSmeCmd *pCommand; @@ -67,7 +67,7 @@ CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) sizeof(tTdlsCmd)); csr_release_command(pMac, pCommand); sme_process_pending_queue(pMac); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } } @@ -83,13 +83,13 @@ CDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) * TDLS request API, called from HDD to send a TDLS frame in SME/CSR and * send message to PE to trigger TDLS discovery procedure. */ -CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt *tdlsSendMgmt) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsSendMgmtCmd; tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (!CSR_IS_SESSION_VALID(pMac, sessionId) || @@ -112,7 +112,7 @@ CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, if ((0 != tdlsSendMgmt->len) && (NULL != tdlsSendMgmt->buf)) { tdlsSendMgmtCmdInfo->buf = cdf_mem_malloc(tdlsSendMgmt->len); if (NULL == tdlsSendMgmtCmdInfo->buf) { - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("Alloc Failed")); CDF_ASSERT(0); return status; @@ -128,20 +128,20 @@ CDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tdlsSendMgmtCmd->command = eSmeCommandTdlsSendMgmt; tdlsSendMgmtCmd->u.tdlsCmd.size = sizeof(tTdlsSendMgmtCmdInfo); sme_push_command(pMac, tdlsSendMgmtCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; return status; } /* * TDLS request API, called from HDD to add a TDLS peer */ -CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrStaParams *pstaParams) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsAddStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -200,7 +200,7 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo); sme_push_command(pMac, tdlsAddStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -210,7 +210,7 @@ CDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS request API, called from HDD to Send Link Establishment Parameters */ -CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, +QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, tCsrTdlsLinkEstablishParams * @@ -218,7 +218,7 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsLinkEstablishCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && csr_is_conn_state_connected_infra(pMac, sessionId) && @@ -270,7 +270,7 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishCmd->u.tdlsCmd.size = sizeof(tTdlsLinkEstablishCmdInfo); sme_push_command(pMac, tdlsLinkEstablishCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -280,12 +280,12 @@ CDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, /* * TDLS request API, called from HDD to add a TDLS peer */ -CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsAddStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -307,7 +307,7 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->u.tdlsCmd.size = sizeof(tTdlsAddStaCmdInfo); sme_push_command(pMac, tdlsAddStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -317,12 +317,12 @@ CDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS request API, called from HDD to delete a TDLS peer */ -CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *tdlsDelStaCmd; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* If connected and in Infra. Only then allow this */ if (CSR_IS_SESSION_VALID(pMac, sessionId) && @@ -343,7 +343,7 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsDelStaCmd->u.tdlsCmd.size = sizeof(tTdlsDelStaCmdInfo); sme_push_command(pMac, tdlsDelStaCmd, false); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -353,7 +353,7 @@ CDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, /* * TDLS messages sent to PE . */ -CDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, void *msg_data, uint32_t msg_size) { @@ -364,40 +364,40 @@ CDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, ("sending msg = %d"), pMsg->type); /* Send message. */ - if (cds_send_mb_message_to_mac(pMsg) != CDF_STATUS_SUCCESS) { + if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Cannot send message")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsSendMgmtCmdInfo *tdlsSendMgmtCmdInfo = &cmd->u.tdlsCmd.u.tdlsSendMgmtCmdInfo; tSirTdlsSendMgmtReq *tdlsSendMgmtReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS Description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsSendMgmtReq = cdf_mem_malloc(sizeof(tSirTdlsSendMgmtReq) + tdlsSendMgmtCmdInfo->len); if (NULL == tdlsSendMgmtReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -428,7 +428,7 @@ CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) (void *)tdlsSendMgmtReq, sizeof(tSirTdlsSendMgmtReq) + tdlsSendMgmtCmdInfo->len); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { @@ -441,31 +441,31 @@ CDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) return status; } -CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsAddStaCmdInfo *tdlsAddStaCmdInfo = &cmd->u.tdlsCmd.u.tdlsAddStaCmdInfo; tSirTdlsAddStaReq *tdlsAddStaReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsAddStaReq = cdf_mem_malloc(sizeof(tSirTdlsAddStaReq)); if (NULL == tdlsAddStaReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -506,37 +506,37 @@ CDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_ADD_STA_REQ, (void *)tdlsAddStaReq, sizeof(tSirTdlsAddStaReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } return status; } -CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsDelStaCmdInfo *tdlsDelStaCmdInfo = &cmd->u.tdlsCmd.u.tdlsDelStaCmdInfo; tSirTdlsDelStaReq *tdlsDelStaReq = NULL; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == pSession->pConnectBssDesc) { sms_log(pMac, LOGE, FL("BSS description is not present")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsDelStaReq = cdf_mem_malloc(sizeof(tSirTdlsDelStaReq)); if (NULL == tdlsDelStaReq) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); return status; @@ -558,7 +558,7 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_DEL_STA_REQ, (void *)tdlsDelStaReq, sizeof(tSirTdlsDelStaReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC")); } return status; @@ -567,7 +567,7 @@ CDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) /* * commands received from CSR */ -CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) { eSmeCommandType cmdType = cmd->command; bool status = true; @@ -575,7 +575,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsSendMgmt: { status = csr_tdls_process_send_mgmt(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -583,7 +583,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsAddPeer: { status = csr_tdls_process_add_sta(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -591,7 +591,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsDelPeer: { status = csr_tdls_process_del_sta(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -599,7 +599,7 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) case eSmeCommandTdlsLinkEstablish: { status = csr_tdls_process_link_establish(pMac, cmd); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { status = false; } } @@ -614,17 +614,17 @@ CDF_STATUS csr_tdls_process_cmd(tpAniSirGlobal pMac, tSmeCmd *cmd) return status; } -CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) +QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) { tTdlsLinkEstablishCmdInfo *tdlsLinkEstablishCmdInfo = &cmd->u.tdlsCmd.u.tdlsLinkEstablishCmdInfo; tSirTdlsLinkEstablishReq *tdlsLinkEstablishReq = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, cmd->sessionId); if (NULL == pSession) { sms_log(pMac, LOGE, FL("pSession is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } tdlsLinkEstablishReq = cdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReq)); @@ -632,7 +632,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) if (tdlsLinkEstablishReq == NULL) { sms_log(pMac, LOGE, FL("alloc failed")); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } tdlsLinkEstablishReq->sessionId = cmd->sessionId; /* Using dialog as transactionId. This can be used to match response with request */ @@ -663,7 +663,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) status = tdls_send_message(pMac, eWNI_SME_TDLS_LINK_ESTABLISH_REQ, (void *)tdlsLinkEstablishReq, sizeof(tSirTdlsLinkEstablishReq)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("Failed to send request to MAC\n")); } return status; @@ -673,7 +673,7 @@ CDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) * TDLS Message processor, will be called after TDLS message recieved from * PE */ -CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, +QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBuf) { tCsrRoamInfo roamInfo = { 0 }; @@ -809,6 +809,6 @@ CDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index f895d7e96b11..562048d4445d 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1011,10 +1011,10 @@ bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal mac_ctx, pSession = CSR_GET_SESSION(mac_ctx, session_id); if (NULL == pSession->pCurRoamProfile) return false; - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == csr_isconcurrentsession_valid(mac_ctx, session_id, pSession->pCurRoamProfile->csrPersona)) { - if (CDF_STATUS_SUCCESS == + if (QDF_STATUS_SUCCESS == csr_validate_mcc_beacon_interval(mac_ctx, bss_descr->channelId, &bss_descr->beaconInterval, session_id, @@ -1108,13 +1108,13 @@ bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, break; if (!pIesLocal && - !CDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies + !QDF_IS_STATUS_SUCCESS(csr_get_parsed_bss_description_ies (pMac, pSirBssDesc2, &pIesLocal))) { sms_log(pMac, LOGE, FL(" fail to parse IEs")); break; } - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies(pMac, pSirBssDesc1, &pIes1))) { break; @@ -1152,7 +1152,7 @@ bool csr_is_bss_description_wme(tHalHandle hHal, tSirBssDescription *pSirBssDesc do { if (pIesTemp == NULL) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesTemp))) { fWme = false; @@ -1214,11 +1214,11 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, } /* Caller allocates memory for pIEStruct */ -CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIEStruct) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); int ieLen = (int)(pBssDesc->length + sizeof(pBssDesc->length) - @@ -1229,7 +1229,7 @@ CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, (dot11f_unpack_beacon_i_es (pMac, (uint8_t *) pBssDesc->ieFields, ieLen, pIEStruct))) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } } @@ -1238,11 +1238,11 @@ CDF_STATUS csr_parse_bss_description_ies(tHalHandle hHal, /* This function will allocate memory for the parsed IEs to the caller. Caller must free the memory */ /* after it is done with the data only if this function succeeds */ -CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, +QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, tSirBssDescription *pBssDesc, tDot11fBeaconIEs **ppIEStruct) { - CDF_STATUS status = CDF_STATUS_E_INVAL; + QDF_STATUS status = QDF_STATUS_E_INVAL; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pBssDesc && ppIEStruct) { @@ -1253,14 +1253,14 @@ CDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, status = csr_parse_bss_description_ies(hHal, pBssDesc, *ppIEStruct); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(*ppIEStruct); *ppIEStruct = NULL; } } else { sms_log(pMac, LOGE, FL(" failed to allocate memory")); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } } @@ -1422,11 +1422,11 @@ uint32_t csr_translate_to_wni_cfg_dot11_mode(tpAniSirGlobal pMac, * * Return: success **/ -CDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, +QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, tSirBssDescription *pBSSDescription, eCsrPhyMode *pPhyMode, tDot11fBeaconIEs *pIes) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; eCsrPhyMode phyMode = csr_translate_to_phy_mode_from_bss_desc(pBSSDescription); @@ -1647,7 +1647,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, eCsrCfgDot11Mode cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_AUTO; uint32_t bitMask, loopCount; - if (!CDF_IS_STATUS_SUCCESS(csr_get_phy_mode_from_bss(pMac, pSirBssDesc, + if (!QDF_IS_STATUS_SUCCESS(csr_get_phy_mode_from_bss(pMac, pSirBssDesc, &phyModeInBssDesc, pIes))) return fMatch; @@ -1876,9 +1876,9 @@ bool csr_is_profile_rsn(tCsrRoamProfile *pProfile) * * This function will check if concurrent session is valid * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS +QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, enum tCDF_ADAPTER_MODE cur_bss_persona) { @@ -1901,7 +1901,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("** STA session **")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; case CDF_SAP_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; @@ -1912,7 +1912,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif } break; @@ -1924,7 +1924,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } break; case CDF_IBSS_MODE: @@ -1934,7 +1934,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("IBSS mode already exist")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else if (((bss_persona == CDF_P2P_GO_MODE) || (bss_persona == CDF_SAP_MODE)) && (connect_state != @@ -1944,7 +1944,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start GO/SAP")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; #endif } break; @@ -1952,7 +1952,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("**P2P-Client session**")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; default: CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -1961,7 +1961,7 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, break; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1971,16 +1971,16 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, * * This function is to update the mcc p2p beacon interval * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) +QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) { uint32_t session_id = 0; tCsrRoamSession *roam_session; /* If MCC is not supported just break and return SUCCESS */ if (!mac_ctx->roam.configParam.fenableMCCMode) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; for (session_id = 0; session_id < CSR_ROAM_SESSION_MAX; session_id++) { /* @@ -2014,7 +2014,7 @@ CDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) eCSR_ROAM_RESULT_NONE); } } - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal pMac, uint16_t sta_bi, @@ -2068,7 +2068,7 @@ uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal pMac, uint16_t sta_bi, return go_fbi; } -CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, @@ -2079,7 +2079,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, /* If MCC is not supported just break */ if (!pMac->roam.configParam.fenableMCCMode) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { @@ -2115,7 +2115,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("*** MCC with SAP+STA sessions ****")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == @@ -2137,7 +2137,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, if (pMac->roam.configParam. fAllowMCCGODiffBI == 0x01) { return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } /* Send only Broadcast disassoc and update beaconInterval */ /* If configuration is set to 0x04 then dont */ @@ -2205,7 +2205,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, (pMac); } return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } /* Disconnect the P2P session */ else if (pMac->roam.configParam. @@ -2223,7 +2223,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, FL ("BeaconInterval is different cannot connect to preferred AP...")); return - CDF_STATUS_E_FAILURE; + QDF_STATUS_E_FAILURE; } } } @@ -2253,7 +2253,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL ("BeaconInterval is different cannot connect to P2P_GO network ...")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } break; @@ -2321,7 +2321,7 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, = new_beaconInterval; return - CDF_STATUS_SUCCESS; + QDF_STATUS_SUCCESS; } } } @@ -2331,12 +2331,12 @@ CDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL(" Persona not supported : %d"), currBssPersona); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3038,7 +3038,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -3367,7 +3367,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -3613,7 +3613,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, if (!pIesLocal && - (!CDF_IS_STATUS_SUCCESS + (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal)))) { break; @@ -4706,7 +4706,7 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, roam_params = &mac_ctx->roam.configParam.roam_params; if ((NULL == ie_dblptr) || (*ie_dblptr) == NULL) { /* If no IEs passed in, get our own. */ - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies(mac_ctx, bss_descr, &ie_ptr))) { goto end; @@ -4892,7 +4892,7 @@ bool csr_match_bss_to_connect_profile(tHalHandle hHal, do { if (!pIes) { - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pBssDesc, &pIesLocal))) { break; @@ -5387,34 +5387,34 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf return cfgDot11Mode; } -CDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, +QDF_STATUS csr_get_regulatory_domain_for_country(tpAniSirGlobal pMac, uint8_t *pCountry, v_REGDOMAIN_t *pDomainId, enum country_src source) { - CDF_STATUS status = CDF_STATUS_E_INVAL; - CDF_STATUS cdf_status; + QDF_STATUS status = QDF_STATUS_E_INVAL; + QDF_STATUS qdf_status; uint8_t countryCode[CDS_COUNTRY_CODE_LEN + 1]; v_REGDOMAIN_t domainId; if (pCountry) { countryCode[0] = pCountry[0]; countryCode[1] = pCountry[1]; - cdf_status = cds_get_reg_domain_from_country_code(&domainId, + qdf_status = cds_get_reg_domain_from_country_code(&domainId, countryCode, source); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { if (pDomainId) { *pDomainId = domainId; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { sms_log(pMac, LOGW, FL (" Couldn't find domain for country code %c%c"), pCountry[0], pCountry[1]); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } } @@ -5463,23 +5463,23 @@ bool csr_match_country_code(tpAniSirGlobal pMac, uint8_t *pCountry, return fRet; } -CDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { if (!pModifyProfileFields) { - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(pModifyProfileFields, &pMac->roam.roamSession[sessionId].connectedProfile. modifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, +QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamModifyProfileFields * pModifyProfileFields) { @@ -5488,7 +5488,7 @@ CDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId cdf_mem_copy(&pSession->connectedProfile.modifyProfileFields, pModifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5597,14 +5597,14 @@ const char *sme_request_type_to_string(const uint8_t request_type) } } -CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, +QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, uint8_t channel) { int i = 0; /* Check for NULL pointer */ if (!pChannelList) - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; /* Make room for the addition. (Start moving from the back.) */ for (i = numChannels; i > 0; i--) { @@ -5614,7 +5614,7 @@ CDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, /* Now add the NEW channel...at the front */ pChannelList[0] = channel; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_DIAG_SUPPORT /** @@ -5661,11 +5661,11 @@ void csr_diag_event_report(tpAniSirGlobal pmac, uint16_t event_type, bool csr_wait_for_connection_update(tpAniSirGlobal mac, bool do_release_reacquire_lock) { - CDF_STATUS status, ret; + QDF_STATUS status, ret; if (do_release_reacquire_lock == true) { ret = sme_release_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { cds_err("lock release fail %d", ret); return false; } @@ -5675,13 +5675,13 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, if (do_release_reacquire_lock == true) { ret = sme_acquire_global_lock(&mac->sme); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { cds_err("lock acquire fail %d", ret); return false; } } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("wait for event failed"); return false; } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index f2008ef03b71..12252ec80dd6 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -70,9 +70,9 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback) * Nan Request structure ptr * * Returns: - * CDF_STATUS + * QDF_STATUS *****************************************************************************/ -CDF_STATUS sme_nan_request(tpNanRequestReq input) +QDF_STATUS sme_nan_request(tpNanRequestReq input) { cds_msg_t msg; tpNanRequest data; @@ -84,7 +84,7 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) if (data == NULL) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failure")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(data, data_len); @@ -98,15 +98,15 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); cdf_mem_free(data); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /****************************************************************************** @@ -121,17 +121,17 @@ CDF_STATUS sme_nan_request(tpNanRequestReq input) * pMsg - Message body passed from WMA; includes NAN header * * Returns: -* CDF_STATUS +* QDF_STATUS ******************************************************************************/ -CDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) +QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("msg ptr is NULL")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, FL("SME: Received sme_nan_event")); diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index 680fb34dbb84..f38cdbdd8ffd 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -48,18 +48,18 @@ /* --------------------------------------------------------------------------- \fn oem_data_oem_data_req_open \brief This function must be called before any API call to (OEM DATA REQ/RSP module) - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) +QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { /* initialize all the variables to null */ cdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "oem_data_oem_data_req_open: Cannot allocate memory for the timer function"); break; @@ -72,16 +72,16 @@ CDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) /* --------------------------------------------------------------------------- \fn oem_data_oem_data_req_close \brief This function must be called before closing the csr module - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) +QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); do { - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "oem_data_oem_data_req_close: Failed in oem_data_oem_data_req_close at StopTimers"); break; @@ -92,14 +92,14 @@ CDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) } while (0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- \fn oem_data_release_oem_data_req_command \brief This function removes the oemDataCommand from the active list and - and frees up any memory occupied by this - \return CDF_STATUS + and frees up any memory occupied by this + \return QDF_STATUS -------------------------------------------------------------------------------*/ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pOemDataCmd, @@ -130,21 +130,21 @@ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac, \brief Request an OEM DATA RSP \param sessionId - Id of session to be used \param pOemDataReqID - pointer to an object to get back the request ID - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, +QDF_STATUS oem_data_oem_data_req(tHalHandle hHal, uint8_t sessionId, tOemDataReqConfig *oemDataReqConfig, uint32_t *pOemDataReqID) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *pOemDataCmd = NULL; tOemDataReq *cmd_req; do { if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -169,7 +169,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, if (!cmd_req->data) { sms_log(pMac, LOGE, FL("memory alloc failed")); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; break; } @@ -177,7 +177,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, (void *)(oemDataReqConfig->data), cmd_req->data_len); } else { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -188,7 +188,7 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, } while (0); - if (!CDF_IS_STATUS_SUCCESS(status) && pOemDataCmd) { + if (!QDF_IS_STATUS_SUCCESS(status) && pOemDataCmd) { oem_data_release_oem_data_req_command(pMac, pOemDataCmd, eOEM_DATA_REQ_FAILURE); pMac->oemData.oemDataReqActive = false; @@ -202,12 +202,12 @@ CDF_STATUS oem_data_oem_data_req(tHalHandle hHal, \brief Request an OEM DATA REQ to be passed down to PE \param pMac: \param pOemDataReq: Pointer to the oem data request - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, +QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, tOemDataReq *pOemDataReq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirOemDataReq *pMsg; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pOemDataReq->sessionId); @@ -217,13 +217,13 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, if (!pOemDataReq) { sms_log(pMac, LOGE, FL("oem data req is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pMsg = cdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } msgLen = (uint16_t) (sizeof(*pMsg) + pOemDataReq->data_len); @@ -250,12 +250,12 @@ CDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, * This function is called by the sme_process_command when the case hits * eSmeCommandOemDataReq. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, +QDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, tSmeCmd *pOemDataReqCmd) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* check if the system is in proper mode of operation for * oem data req/rsp to be functional. Currently, concurrency is not @@ -268,7 +268,7 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, * 3. BTAMP Mode */ - if (CDF_STATUS_SUCCESS == oem_data_is_oem_data_req_allowed(pMac)) { + if (QDF_STATUS_SUCCESS == oem_data_is_oem_data_req_allowed(pMac)) { sms_log(pMac, LOG1, FL("OEM_DATA REQ allowed in the current mode")); pMac->oemData.oemDataReqActive = true; @@ -277,10 +277,10 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, } else { sms_log(pMac, LOG1, FL("OEM_DATA REQ not allowed in the current mode")); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL("OEM_DATA Failure, Release command")); oem_data_release_oem_data_req_command(pMac, pOemDataReqCmd, eOEM_DATA_REQ_INVALID_MODE); @@ -297,11 +297,11 @@ CDF_STATUS oem_data_process_oem_data_req_command(tpAniSirGlobal pMac, * * This function processes the oem data response obtained from the PE * - * Return: CDF_STATUS. + * Return: QDF_STATUS. */ -CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; @@ -315,7 +315,7 @@ CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) do { if (pMsg == NULL) { sms_log(pMac, LOGE, "in %s msg ptr is NULL", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; break; } @@ -365,12 +365,12 @@ CDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) /* --------------------------------------------------------------------------- \fn oem_data_is_oem_data_req_allowed \brief This function checks if OEM DATA REQs can be performed in the - current driver state - \return CDF_STATUS + current driver state + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) +QDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t sessionId; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -382,7 +382,7 @@ CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) sms_log(pMac, LOGW, "OEM DATA REQ is not allowed due to IBSS exist in session %d", sessionId); - status = CDF_STATUS_CSR_WRONG_STATE; + status = QDF_STATUS_CSR_WRONG_STATE; break; } } @@ -391,7 +391,7 @@ CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) sms_log(pMac, LOG1, "Exiting oem_data_is_oem_data_req_allowed with status %d", status); - return (status); + return status; } #endif /*FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 118f78ad3159..05d23ae58466 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -40,10 +40,10 @@ * *------------------------------------------------------------------*/ -CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, +QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, tSmeCmd *p2pRemainonChn) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirRemainOnChnReq *pMsg; uint32_t len; tCsrRoamSession *pSession = @@ -94,7 +94,7 @@ CDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, status = cds_send_mb_message_to_mac(pMsg); } error: - if (CDF_STATUS_E_FAILURE == status) + if (QDF_STATUS_E_FAILURE == status) csr_release_roc_req_cmd(pMac); return status; } @@ -105,9 +105,9 @@ error: * *------------------------------------------------------------------*/ -CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) +QDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; bool fFound; @@ -145,10 +145,10 @@ CDF_STATUS sme_remain_on_chn_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) * *------------------------------------------------------------------*/ -CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tListElem *pEntry = NULL; tSmeCmd *pCommand = NULL; tCsrRoamInfo RoamInfo; @@ -174,10 +174,10 @@ CDF_STATUS sme_remain_on_chn_ready(tHalHandle hHal, uint8_t *pMsg) return status; } -CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) +QDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo RoamInfo; tSirSmeRsp *pSmeRsp = (tSirSmeRsp *) pMsg; @@ -190,22 +190,22 @@ CDF_STATUS sme_send_action_cnf(tHalHandle hHal, uint8_t *pMsg) return status; } -CDF_STATUS sme_p2p_open(tHalHandle hHal) +QDF_STATUS sme_p2p_open(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* If static structure is too big, Need to change this function to allocate memory dynamically */ cdf_mem_zero(&pMac->p2pContext, sizeof(tp2pContext)); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { sme_p2p_close(hHal); } return status; } -CDF_STATUS p2p_stop(tHalHandle hHal) +QDF_STATUS p2p_stop(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -216,10 +216,10 @@ CDF_STATUS p2p_stop(tHalHandle hHal) pMac->p2pContext.probeRspIeLength = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_p2p_close(tHalHandle hHal) +QDF_STATUS sme_p2p_close(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -230,7 +230,7 @@ CDF_STATUS sme_p2p_close(tHalHandle hHal) pMac->p2pContext.probeRspIeLength = 0; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } tSirRFBand get_rf_band(uint8_t channel) @@ -256,23 +256,23 @@ tSirRFBand get_rf_band(uint8_t channel) \param duration - Duration for which we should remain on channel \param callback - callback function. \param pContext - argument to the callback function - \return CDF_STATUS + \return QDF_STATUS -------------------------------------------------------------------------------*/ -CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint8_t channel, uint32_t duration, remainOnChanCallback callback, void *pContext, uint8_t isP2PProbeReqAllowed, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSmeCmd *pRemainChlCmd = NULL; uint32_t phyMode; pRemainChlCmd = sme_get_command_buffer(pMac); if (pRemainChlCmd == NULL) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; if (SIR_BAND_5_GHZ == get_rf_band(channel)) { phyMode = WNI_CFG_PHY_MODE_11A; @@ -300,14 +300,14 @@ CDF_STATUS p2p_remain_on_channel(tHalHandle hHal, uint8_t sessionId, sms_log(pMac, LOGW, "exiting function %s", __func__); - return (status); + return status; } -CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, +QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBuf, uint32_t len, uint16_t wait, bool noack, uint16_t channel_freq) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsgP2p *pMsg; uint16_t msgLen; @@ -316,7 +316,7 @@ CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_SEND_ACTION_FRAME_IND; @@ -328,13 +328,13 @@ CDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, cdf_mem_copy(pMsg->data, pBuf, len); status = cds_send_mb_message_to_mac(pMsg); } - return (status); + return status; } -CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, +QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, uint8_t sessionId, uint32_t scan_id) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tSirMbMsgP2p *pMsg; uint16_t msgLen; @@ -343,7 +343,7 @@ CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, msgLen = (uint16_t) (sizeof(tSirMbMsgP2p)); pMsg = cdf_mem_malloc(msgLen); if (NULL == pMsg) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_ABORT_REMAIN_ON_CHAN_IND; @@ -353,19 +353,19 @@ CDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, status = cds_send_mb_message_to_mac(pMsg); } - return (status); + return status; } -CDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA) +QDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA) { tpP2pPsConfig pNoAParam; tSirMsgQ msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pNoAParam = cdf_mem_malloc(sizeof(tP2pPsConfig)); if (NULL == pNoAParam) - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; else { cdf_mem_set(pNoAParam, sizeof(tP2pPsConfig), 0); cdf_mem_copy(pNoAParam, pNoA, sizeof(tP2pPsConfig)); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 02a1229940ab..1672a8d49855 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -363,7 +363,7 @@ struct sme_qos_cb_s { /* counter for assigning Dialog Tokens */ uint8_t nextDialogToken; } sme_qos_cb; -typedef CDF_STATUS (*sme_QosProcessSearchEntry)(tpAniSirGlobal pMac, +typedef QDF_STATUS (*sme_QosProcessSearchEntry)(tpAniSirGlobal pMac, tListElem *pEntry); sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, @@ -385,52 +385,52 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac); -CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac); -CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask); -CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info); -CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal pMac, void *pMsgBuf); -CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal pMac, uint8_t sessionId); -CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal pMac, void *pMsgBuf); +QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp); -CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp); -CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, +QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pCurrent_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info); -static CDF_STATUS sme_qos_update_params(uint8_t sessionId, +static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask, sme_QosWmmTspecInfo *pTspec_Info); @@ -439,46 +439,46 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up); bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, sme_QosEdcaAcType ac, tDot11fBeaconIEs *pIes); tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key); -CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal pMac, sme_QosSearchInfo search_key, sme_QosProcessSearchEntry fnp); static void sme_qos_state_transition(uint8_t sessionId, sme_QosEdcaAcType ac, sme_QosStates new_state); -CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head); -static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t sessionId); -CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, +QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head); +static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t sessionId); +QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, sme_QosAssocInfo *pAssoc_info); -CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry); -CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry); +QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal pMac, tListElem *pEntry); static bool sme_qos_is_rsp_pending(uint8_t sessionId, sme_QosEdcaAcType ac); static bool sme_qos_is_uapsd_active(void); void sme_qos_pmc_offload_start_uapsd_callback(void *callbackContext, - uint32_t sessionId, CDF_STATUS status); + uint32_t sessionId, QDF_STATUS status); bool sme_qos_pmc_offload_check_routine(void *callbackContext, uint32_t sessionId); -static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId); static void sme_qos_cleanup_ctrl_blk_for_handoff(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, uint8_t sessionId); bool sme_qos_validate_requested_params(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pQoSInfo, uint8_t sessionId); -extern CDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); -extern CDF_STATUS sme_release_global_lock(tSmeStruct *psSme); -static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, +extern QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme); +extern QDF_STATUS sme_release_global_lock(tSmeStruct *psSme); +static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, eSmeCommandType cmdType, sme_QosWmmTspecInfo *pQoSInfo, sme_QosEdcaAcType ac, uint8_t tspec_mask); @@ -491,12 +491,12 @@ static sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal pMac, sme_QosEdcaAcType ac, uint8_t tspecMask); static void sme_qos_init_a_cs(tpAniSirGlobal pMac, uint8_t sessionId); -static CDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, tCsrRoamModifyProfileFields * pModFields, bool fForce); static uint32_t sme_qos_assign_flow_id(void); static uint8_t sme_qos_assign_dialog_token(void); -static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, +static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, sme_QosSearchInfo search_key, uint8_t new_tspec_mask); @@ -509,13 +509,13 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionId, * This function must be called before any API call to * SME QoS module. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) +QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) { sme_QosSessionInfo *pSession; uint8_t sessionId; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ @@ -526,11 +526,11 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_qos_cb.nextDialogToken = SME_QOS_MIN_DIALOG_TOKEN; /* init flow list */ status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize Flow List", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; ++sessionId) { @@ -540,11 +540,11 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_qos_init_a_cs(pMac, sessionId); /* initialize the session's buffered command list */ status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize cmd list for session %d", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession->readyForPowerSave = true; } @@ -552,7 +552,7 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: done initializing SME-QoS module", __func__, __LINE__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* -------------------------------------------------------------------------- @@ -561,9 +561,9 @@ CDF_STATUS sme_qos_open(tpAniSirGlobal pMac) call of sme_qos_open. \param pMac - Pointer to the global MAC parameter structure. - \return CDF_STATUS + \return QDF_STATUS ----------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) +QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) { sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; @@ -608,7 +608,7 @@ CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closed down QoS", __func__, __LINE__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -636,7 +636,7 @@ CDF_STATUS sme_qos_close(tpAniSirGlobal pMac) * admission control on the requested AC, HDD needs to provide the necessary * Traffic Specification (TSPEC) parameters otherwise SME is going to use the * default params. - * Return: CDF_STATUS_SUCCESS - Setup is successful. + * Return: QDF_STATUS_SUCCESS - Setup is successful. * Other status means Setup request failed */ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, @@ -647,14 +647,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, uint32_t *pQosFlowID) { sme_QosSessionInfo *pSession; - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Setup requested by client on session %d", __func__, __LINE__, sessionId); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_SETUP_FAILURE_RSP; @@ -719,14 +719,14 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, sme_QosWmmTspecInfo *pQoSInfo, uint32_t QosFlowID) { - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; @@ -752,18 +752,18 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, * HDD sould invoke this API only if an explicit request for QoS release has * come from Application * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) { - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; @@ -792,12 +792,12 @@ void qos_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) * sme_process_msg() calls this function for the messages that * are handled by SME QoS module. * - * Return: CDF_STATUS enumeration. + * Return: QDF_STATUS enumeration. */ -CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, uint16_t msg_type, void *msg) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *entry = NULL; tSmeCmd *command; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -862,17 +862,17 @@ CDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, * The SME QoS API exposed to CSR to validate AP * capabilities regarding QoS support & any other QoS parameter validation. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, tSirBssDescription *pBssDesc) { tDot11fBeaconIEs *pIes = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validation for QAP & APSD", __func__, __LINE__); do { - if (!CDF_IS_STATUS_SUCCESS( + if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ @@ -898,7 +898,7 @@ CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, __func__, __LINE__); break; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } while (0); CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validated with status = %d", @@ -916,16 +916,16 @@ CDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, \param ind - The event occurred of type sme_qos_csr_event_indType. \param pEvent_info - Information related to the event - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_csr_event_indType ind, void *pEvent_info) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d Event %d received from CSR", __func__, __LINE__, sessionId, ind); @@ -1062,7 +1062,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes * provide the necessary Traffic Specification (TSPEC) parameters otherwise SME * is going to use the default params. * - * Return: CDF_STATUS_SUCCESS - Setup is successful. + * Return: QDF_STATUS_SUCCESS - Setup is successful. * Other status means Setup request failed */ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, @@ -1085,7 +1085,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, uint8_t tmask = 0; uint8_t new_tmask = 0; sme_QosSearchInfo search_key; - CDF_STATUS hstatus; + QDF_STATUS hstatus; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for flow %d", __func__, __LINE__, sessionId, QosFlowID); @@ -1148,7 +1148,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.hoRenewal = hoRenewal; cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the setup request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -1288,7 +1288,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.hoRenewal = hoRenewal; cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d couldn't buffer the setup " "request for flow %d in state = %d", @@ -1445,7 +1445,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, &pACInfo-> requested_QoSInfo [tmask - 1]); - if (hstatus == CDF_STATUS_SUCCESS) { + if (hstatus == QDF_STATUS_SUCCESS) { hstatus = sme_qos_aggregate_params (&pACInfo-> @@ -1458,7 +1458,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, } } - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -1568,7 +1568,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_setup_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -1677,7 +1677,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_QosSearchInfo search_key; sme_QosCmdInfo cmd; uint8_t sessionId; - CDF_STATUS hstatus; + QDF_STATUS hstatus; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); @@ -1769,7 +1769,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QosFlowID = QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -1824,7 +1824,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, hstatus = sme_qos_update_params(sessionId, ac, pNewEntry->tspec_mask, &Aggr_Tspec_Info); - if (CDF_IS_STATUS_SUCCESS(hstatus)) { + if (QDF_IS_STATUS_SUCCESS(hstatus)) { pACInfo->requested_QoSInfo[pNewEntry->tspec_mask - 1] = Aggr_Tspec_Info; /* if ACM, send out a new ADDTS */ @@ -1864,7 +1864,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, hstatus = sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_modify_fnp); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } @@ -1890,7 +1890,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_modification_notify_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -1963,7 +1963,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QosFlowID = QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2003,7 +2003,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, * The SME QoS internal function to request * for releasing a QoS flow running on a particular AC. - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, uint32_t QosFlowID, @@ -2023,7 +2023,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, tCsrRoamModifyProfileFields modifyProfileFields; bool deltsIssued = false; uint8_t sessionId; - CDF_STATUS hstatus; + QDF_STATUS hstatus; bool biDirectionalFlowsPresent = false; bool uplinkFlowsPresent = false; bool downlinkFlowsPresent = false; @@ -2071,7 +2071,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.sessionId = sessionId; cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2196,7 +2196,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo [SME_QOS_TSPEC_MASK_BIT_2_SET - 1] = Aggr_Tspec_Info; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd (&cmd, false))) { CDF_TRACE @@ -2232,7 +2232,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, hstatus = sme_qos_update_params(sessionId, ac, flow_info->tspec_mask, &Aggr_Tspec_Info); - if (CDF_IS_STATUS_SUCCESS(hstatus)) { + if (QDF_IS_STATUS_SUCCESS(hstatus)) { pACInfo->requested_QoSInfo[flow_info-> tspec_mask - 1] = Aggr_Tspec_Info; @@ -2293,7 +2293,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_setup_fnp); - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE (CDF_MODULE_ID_SME, @@ -2426,7 +2426,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, NULL, ac, flow_info-> tspec_mask); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2475,7 +2475,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, hstatus = sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2590,7 +2590,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.sessionId = sessionId; cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); @@ -2669,7 +2669,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_QosStatusType status = SME_QOS_STATUS_SETUP_FAILURE_RSP; tDot11fBeaconIEs *pIes = NULL; tCsrRoamModifyProfileFields modifyProfileFields; - CDF_STATUS hstatus; + QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", @@ -2692,7 +2692,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, hstatus = csr_get_parsed_bss_description_ies(pMac, pSession->assocInfo.pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); @@ -2743,7 +2743,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, hstatus = qos_issue_command(pMac, sessionId, eSmeCommandAddTs, pTspec_Info, ac, 0); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_add_ts_req() failed", @@ -2783,7 +2783,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2851,7 +2851,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, sme_qos_request_reassoc(pMac, sessionId, &modifyProfileFields, false); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -2880,13 +2880,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, * not required as we are ok with tspec getting programmed before set_key * as the roam timings are measured without tspec in reassoc! */ -CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "########### Set Key Complete #############"); (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_ESE @@ -2901,9 +2901,9 @@ CDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, * This function saves the TSPEC parameters that came along in the TSPEC IE * in the reassoc response * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ -CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionId, tDot11fIEWMMTSPEC *pTspec, uint8_t ac, uint8_t tspecIndex) { @@ -2930,7 +2930,7 @@ CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI convert_wmmtspec(pMac, &pAddtsRsp->rsp.tspec, pTspec); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2945,9 +2945,9 @@ CDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI * the reasso req from the STA would carry the TSPEC parameters which were * already negotiated with the older AP. * - * Return: CDF_STATUS_SUCCESS - Release is successful. + * Return: QDF_STATUS_SUCCESS - Release is successful. */ -CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { @@ -2956,7 +2956,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, tDot11fIEWMMTSPEC *pTspecIE = NULL; tCsrRoamSession *pCsrSession = NULL; tCsrRoamConnectedInfo *pCsrConnectedInfo = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; uint8_t ac, numTspec, cnt; uint8_t tspec_flow_index, tspec_mask_status; uint32_t tspecIeLen; @@ -2965,7 +2965,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, if (NULL == pCsrSession) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pCsrConnectedInfo = &pCsrSession->connectedInfo; pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -2986,7 +2986,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ESE Tspec IE len %d less than min %zu"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, @@ -2999,7 +2999,7 @@ CDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, if (ac >= SME_QOS_EDCA_AC_MAX) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ac %d more than it`s max value"), ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; tspec_mask_status = pACInfo->tspec_mask_status; @@ -3163,7 +3163,7 @@ uint8_t sme_qos_ese_retrieve_tspec_info(tpAniSirGlobal mac_ctx, #endif -CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, sme_QosWmmTspecInfo *pTspec_Info, uint8_t *pRICBuffer, uint32_t *pRICLength, uint8_t *pRICIdentifier) @@ -3173,7 +3173,7 @@ CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength == NULL) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&ricIE, sizeof(tDot11fIERICDataDesc)); @@ -3274,9 +3274,9 @@ CDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, * * This function Process reassoc request related to QOS * - * Return: CDF_STATUS enumeration value. + * Return: QDF_STATUS enumeration value. */ -static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( +static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( uint8_t sessionId) { sme_QosSessionInfo *session; @@ -3359,7 +3359,7 @@ static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( if (!entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Flow List empty, nothing to update")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } do { @@ -3375,7 +3375,7 @@ static CDF_STATUS sme_qos_process_ft_reassoc_req_ev( entry = csr_ll_next(&sme_qos_cb.flow_list, entry, false); } while (entry); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3437,13 +3437,13 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, * * This function is used to send aggregated QOS request to HAL. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) +QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) { tSirAggrQosReq *aggr_req = NULL; sme_QosSessionInfo *session; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; int i, j = 0; uint8_t direction; @@ -3458,7 +3458,7 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) /* err msg */ CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't allocate memory for the msg buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(aggr_req, sizeof(tSirAggrQosReq)); @@ -3501,8 +3501,8 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) FL("Sending aggregated message to HAL 0x%x"), aggr_req->aggrInfo.tspecIdx); - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sent down a AGGR QoS req to PE")); } @@ -3510,7 +3510,7 @@ CDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) return status; } -CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId, tDot11fIERICDataDesc *pRicDataDesc, uint8_t ac, uint8_t tspecIndex) { @@ -3564,7 +3564,7 @@ CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId &pRicDataDesc->WMMTSPEC); } /* return sme_qos_process_add_ts_rsp(pMac, &addtsRsp); */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3575,13 +3575,13 @@ CDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId * * this function process the QOS aggregation response received. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) +QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) { tpSirAggrQosRsp rsp = (tpSirAggrQosRsp) msgbuf; tSirAddtsRsp addtsrsp; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; int i, j = 0; uint8_t sessionid = rsp->sessionId; @@ -3623,8 +3623,8 @@ CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) i, j); /* post ADD TS response for each */ if (sme_qos_process_add_ts_rsp(mac_ctx, &addtsrsp) != - CDF_STATUS_SUCCESS) - status = CDF_STATUS_E_FAILURE; + QDF_STATUS_SUCCESS) + status = QDF_STATUS_E_FAILURE; } } return status; @@ -3642,14 +3642,14 @@ CDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) * This utility function is called by sme_qos_process_ft_reassoc_rsp_ev * to find the matching tspec * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, uint8_t sessionid, uint8_t ac, sme_QosACInfo *ac_info, tDot11fIERICDataDesc *ric_data_desc, uint32_t *ric_rsplen) { uint8_t tspec_flow_index; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; for (tspec_flow_index = 0; tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) { @@ -3693,7 +3693,7 @@ static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, status = sme_qos_process_ftric_response(mac_ctx, sessionid, ric_data_desc, ac, tspec_flow_index); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d in " @@ -3720,9 +3720,9 @@ static CDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, * This utility function is called by sme_qos_process_ft_reassoc_rsp_ev * to find the matching tspec while LFR3 is enabled. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, uint8_t sessionid, uint8_t ac, sme_QosSessionInfo *qos_session, tDot11fIERICDataDesc *ric_data_desc, uint32_t ric_rsplen) { @@ -3733,7 +3733,7 @@ static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, uint8_t ac1; tDot11fIERICDataDesc *ric_data = NULL; uint32_t ric_len; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ric_data = ric_data_desc; ric_len = ric_rsplen; @@ -3761,7 +3761,7 @@ static CDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, status = sme_qos_process_ftric_response(mac_ctx, sessionid, ric_data, ac, tspec_flow_idx); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d " @@ -3783,14 +3783,14 @@ sme_qos_next_ric: } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ -CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; uint8_t ac; tDot11fIERICDataDesc *ric_data_desc = NULL; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamSession *csr_session = CSR_GET_SESSION(mac_ctx, sessionid); tCsrRoamConnectedInfo *csr_conn_info = NULL; uint32_t ric_rsplen; @@ -3802,7 +3802,7 @@ CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, if (NULL == csr_session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("The Session pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } csr_conn_info = &csr_session->connectedInfo; ric_rsplen = csr_conn_info->nRICRspLength; @@ -3871,16 +3871,16 @@ CDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, * * This function is used to send down the ADDTS request with TSPEC params to PE * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosWmmTspecInfo *pTspec_Info, sme_QosEdcaAcType ac) { tSirAddtsReq *pMsg = NULL; sme_QosSessionInfo *pSession; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; #ifdef FEATURE_WLAN_ESE tCsrRoamSession *pCsrSession = CSR_GET_SESSION(pMac, sessionId); #endif @@ -3895,7 +3895,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sessionId(%d) is invalid", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -3905,7 +3905,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirAddtsReq)); pMsg->messageType = eWNI_SME_ADDTS_REQ; @@ -3957,7 +3957,7 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], @@ -3972,8 +3972,8 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg->req.tsrsPresent = 1; } #endif - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sent down a ADDTS req to PE", __func__, __LINE__); @@ -3996,12 +3996,12 @@ CDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, \param ac - Enumeration of the various EDCA Access Categories. \param tspec_mask - on which tspec per AC, the delts is requested - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask) { @@ -4009,7 +4009,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, sme_QosACInfo *pACInfo; tSirDeltsReq *pMsg; sme_QosWmmTspecInfo *pTspecInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif @@ -4022,7 +4022,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirDeltsReq)); /* get pointer to the TSPEC being deleted */ @@ -4067,7 +4067,7 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], @@ -4079,8 +4079,8 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); cdf_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1], sizeof(sme_QosWmmTspecInfo)); - if (CDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { - status = CDF_STATUS_SUCCESS; + if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { + status = QDF_STATUS_SUCCESS; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE", __func__, __LINE__); @@ -4105,17 +4105,17 @@ CDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirAddtsRsp paddts_rsp = (tpSirAddtsRsp) pMsgBuf; sme_QosSessionInfo *pSession; uint8_t sessionId = paddts_rsp->sessionId; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosWmmUpType up = (sme_QosWmmUpType) paddts_rsp->rsp.tspec.tsinfo.traffic.userPrio; sme_QosACInfo *pACInfo; @@ -4137,7 +4137,7 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; if (SME_QOS_HANDOFF == pACInfo->curr_state) { @@ -4146,7 +4146,7 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) ("ADDTS Response received for AC %d in HANDOFF State.. Dropping"), ac); pSession->readyForPowerSave = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -4180,12 +4180,12 @@ CDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirDeltsRsp pDeltsRsp = (tpSirDeltsRsp) pMsgBuf; sme_QosSessionInfo *pSession; @@ -4199,7 +4199,7 @@ CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) /* we can go into powersave */ pSession->readyForPowerSave = true; (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4211,12 +4211,12 @@ CDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) \param pMac - Pointer to the global MAC parameter structure. \param pMsgBuf - Pointer to the msg buffer came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirDeltsRsp pdeltsind = (tpSirDeltsRsp) pMsgBuf; sme_QosSessionInfo *pSession; @@ -4238,7 +4238,7 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -4250,13 +4250,13 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) search_key.sessionId = sessionId; /* find all Flows on the perticular AC & delete them, also send HDD indication */ /* through the callback it registered per request */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for ac = %d", __func__, __LINE__, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* event: EVENT_WLAN_QOS */ #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -4265,7 +4265,7 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) WLAN_HOST_DIAG_EVENT_REPORT(&qos, EVENT_WLAN_QOS); #endif /* FEATURE_WLAN_DIAG_SUPPORT */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4273,17 +4273,17 @@ CDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) SME_QOS_CSR_ASSOC_COMPLETE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", @@ -4340,7 +4340,7 @@ CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio pSession->handoffRequested = false; /* renew all flows */ (void)sme_qos_process_buffered_cmd(sessionId); - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; } else { for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; @@ -4373,12 +4373,12 @@ CDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio SME_QOS_CSR_REASSOC_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4398,10 +4398,10 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_qos_process_ft_reassoc_req_ev(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (pSession->handoffRequested) { @@ -4414,13 +4414,13 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* buffer the existing flows to be renewed after handoff is done */ sme_qos_buffer_existing_flows(pMac, sessionId); /* clean up the control block partially for handoff */ sme_qos_cleanup_ctrl_blk_for_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */ if (pSession->ftHandoffInProgress) { @@ -4433,11 +4433,11 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } sme_qos_process_ft_reassoc_req_ev(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { @@ -4462,7 +4462,7 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId break; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4478,9 +4478,9 @@ CDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId * to update the state machine on the reception of reassoc success * notificaiton * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, sme_QosSessionInfo *qos_session, sme_QosACInfo *ac_info, sme_QosEdcaAcType ac, uint8_t sessionid) @@ -4490,13 +4490,13 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac_index; tListElem *list_elt = NULL; sme_QosFlowInfoEntry *flow_info = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; /* return to our previous state */ sme_qos_state_transition(sessionid, ac, ac_info->prev_state); /* for which ac APSD (hence the reassoc) is requested */ if (!ac_info->reassoc_pending) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* * update the apsd mask in CB - make sure to take care of the @@ -4546,12 +4546,12 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, */ status = sme_qos_find_all_in_flow_list(mac_ctx, search_key, sme_qos_reassoc_success_ev_fnp); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no match found for ac = %d"), search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ac_info->hoRenewal = false; cdf_mem_zero(&ac_info->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], @@ -4570,9 +4570,9 @@ CDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, * Function to process the SME_QOS_CSR_REASSOC_COMPLETE event indication * from CSR * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { @@ -4580,7 +4580,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; sme_QosEdcaAcType ac; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); @@ -4625,7 +4625,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, qos_session->handoffRequested = false; /* renew all flows */ (void)sme_qos_process_buffered_cmd(sessionid); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (qos_session->ftHandoffInProgress) { if (csr_roam_is11r_assoc(mac_ctx, sessionid)) { @@ -4664,7 +4664,7 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, case SME_QOS_INIT: case SME_QOS_CLOSED: /* NOP */ - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; case SME_QOS_LINK_UP: case SME_QOS_REQUESTED: @@ -4686,12 +4686,12 @@ CDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, SME_QOS_CSR_REASSOC_FAILURE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4747,7 +4747,7 @@ CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, } /* need to clean up flows */ sme_qos_delete_existing_flows(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4755,12 +4755,12 @@ CDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_ASSOC_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4814,7 +4814,7 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, /* do any sessions still require UAPSD? */ sme_ps_uapsd_disable(pMac, sessionId); pSession->uapsdAlreadyRequested = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4822,18 +4822,18 @@ CDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_COMPLETE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); @@ -4849,7 +4849,7 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, if (SME_QOS_REQUESTED == pACInfo->curr_state) { pACInfo->curr_state = SME_QOS_LINK_UP; } - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; break; /* FT logic, has already moved it to QOS_REQUESTED state during the */ /* reassoc request event, which would include the Qos (TSPEC) params */ @@ -4881,12 +4881,12 @@ CDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_FAILURE event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4940,7 +4940,7 @@ CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, cdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -4949,12 +4949,12 @@ CDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -4976,10 +4976,10 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { CDF_ASSERT(0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } sme_qos_init_a_cs(pMac, sessionId); /* this session doesn't require UAPSD */ @@ -5001,7 +5001,7 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, pSession->assocInfo.pBssDesc = NULL; } sme_qos_cb.sessionInfo[sessionId].sessionActive = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5009,12 +5009,12 @@ CDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, SME_QOS_CSR_JOIN_REQ event indication from CSR \param pEvent_info - Pointer to relevant info from CSR. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; @@ -5038,7 +5038,7 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_buffer_existing_flows(pMac, sessionId); /* clean up the control block partially for handoff */ sme_qos_cleanup_ctrl_blk_for_handoff(pMac, sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { @@ -5049,7 +5049,7 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, cdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5061,16 +5061,16 @@ CDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, * Function to process the SME_QOS_CSR_PREAUTH_SUCCESS_IND event indication * from CSR * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, uint8_t sessionid, void *event_info) { sme_QosSessionInfo *qos_session; tCsrRoamSession *sme_session = CSR_GET_SESSION(mac_ctx, sessionid); sme_QosACInfo *ac_info; uint8_t ac; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint16_t ric_offset = 0; uint32_t ric_ielen = 0; uint8_t *ric_ie; @@ -5083,7 +5083,7 @@ CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, if (NULL == sme_session) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_session is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } qos_session = &sme_qos_cb.sessionInfo[sessionid]; @@ -5120,7 +5120,7 @@ CDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("psavedFTPreAuthRsp is NULL")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* @@ -5190,12 +5190,12 @@ add_next_ric: \param pMac - Pointer to the global MAC parameter structure. \param pRsp - Pointer to the addts response structure came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp) { @@ -5215,7 +5215,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -5226,7 +5226,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -5234,7 +5234,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; search_key.sessionId = sessionId; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_failure_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -5242,7 +5242,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, __func__, __LINE__, sessionId, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], sizeof(sme_QosWmmTspecInfo)); @@ -5258,7 +5258,7 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5270,9 +5270,9 @@ CDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, * Typical usage while aggregating unidirectional flows into a bi-directional * flow on AC which is running multiple flows * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, +static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, sme_QosSearchInfo search_key, uint8_t new_tspec_mask) { @@ -5293,14 +5293,14 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Exceeded the array bounds")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, nothing to update")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_elt) { @@ -5338,7 +5338,7 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, list_elt = list_next_elt; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5351,12 +5351,12 @@ static CDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, \param pMac - Pointer to the global MAC parameter structure. \param pRsp - Pointer to the addts response structure came from PE. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, +QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, uint8_t sessionId, tSirAddtsRspInfo *pRsp) { @@ -5384,7 +5384,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; /* is there a TSPEC request pending on this AC? */ @@ -5393,7 +5393,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* App is looking for APSD or the App which was looking for APSD has been */ /* released, so STA re-negotiated with AP */ @@ -5416,7 +5416,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } @@ -5507,7 +5507,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, search_key.sessionId = sessionId; /* notify HDD the success for the requested flow */ /* notify all the other flows running on the AC that QoS got modified */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_success_fnp))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -5515,7 +5515,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, __func__, __LINE__, sessionId, search_key.key.ac_type); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pACInfo->hoRenewal = false; cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], @@ -5586,7 +5586,7 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, &pRsp->tspec.tsinfo, sessionId); (void)sme_qos_process_buffered_cmd(sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5599,12 +5599,12 @@ CDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, \param pCurrent_Tspec_Info - Pointer to sme_QosWmmTspecInfo which contains current the WMM TSPEC related info - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, +QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pCurrent_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info) { @@ -5615,13 +5615,13 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: input is NULL, nothing to aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!pCurrent_Tspec_Info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Current is NULL, can't aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_copy(&TspecInfo, pCurrent_Tspec_Info, sizeof(sme_QosWmmTspecInfo)); @@ -5761,7 +5761,7 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, cdf_mem_copy(pCurrent_Tspec_Info, &TspecInfo, sizeof(sme_QosWmmTspecInfo)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -5773,12 +5773,12 @@ CDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, \param ac - Enumeration of the various EDCA Access Categories. \param tspec_mask - on which tspec per AC, the update is requested - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_update_params(uint8_t sessionId, +static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosEdcaAcType ac, uint8_t tspec_mask, sme_QosWmmTspecInfo *pTspec_Info) @@ -5795,7 +5795,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: output is NULL, can't aggregate", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); @@ -5803,7 +5803,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, nothing to update", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -5833,7 +5833,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, "for release/modify", __func__, __LINE__, flow_info->QosFlowID); } else - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_aggregate_params (&flow_info->QoSInfo, &Tspec_Info, NULL))) { /* err msg */ @@ -5847,7 +5847,7 @@ static CDF_STATUS sme_qos_update_params(uint8_t sessionId, } /* return the aggregate */ *pTspec_Info = Tspec_Info; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6007,21 +6007,21 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) * * Return: None */ -CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, sme_QosSearchInfo search_key, sme_QosProcessSearchEntry fnp) { tListElem *list_elt = NULL, *list_next_elt = NULL; sme_QosSessionInfo *qos_session; sme_QosFlowInfoEntry *flow_info = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac_type; list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_elt) { @@ -6040,7 +6040,7 @@ CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); status = fnp(mac_ctx, list_elt); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); @@ -6054,7 +6054,7 @@ CDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, flow_info->hoRenewal = qos_session->ac_info[ac_type].hoRenewal; status = fnp(mac_ctx, list_elt); - if (CDF_STATUS_E_FAILURE == status) { + if (QDF_STATUS_E_FAILURE == status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); @@ -6092,7 +6092,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, pIesLocal = pIes; } else { /* IEs were not provided so parse them ourselves */ - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal))) { /* err msg */ @@ -6150,9 +6150,9 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, * Utility function to buffer the existing flows in flow_list, * so that we can renew them after handoff is done. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, uint8_t sessionid) { tListElem *list_entry = NULL, *list_nextentry = NULL; @@ -6165,7 +6165,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, if (!list_entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow List empty, nothing to buffer")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (list_entry) { @@ -6196,7 +6196,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, else setupinfo->hoRenewal = true; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6214,7 +6214,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.pMac = mac_ctx; cmd.sessionId = sessionid; cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6234,7 +6234,7 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.sessionId = sessionid; cmd.u.modifyCmdInfo.QosFlowID = flow_info->QosFlowID; cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo; - if (!CDF_IS_STATUS_SUCCESS + if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -6259,19 +6259,19 @@ static CDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, } qos_session = &sme_qos_cb.sessionInfo[sessionid]; qos_session->uapsdAlreadyRequested = false; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- \brief sme_qos_delete_existing_flows() - Utility function to Delete the existing flows in flow_list, if we lost connectivity. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, uint8_t sessionId) { tListElem *pEntry = NULL, *pNextEntry = NULL; @@ -6281,7 +6281,7 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Flow List empty, nothing to delete", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, true); @@ -6308,7 +6308,7 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6320,9 +6320,9 @@ static CDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, * Utility function to buffer a request (setup/modify/release) from client * while processing another one on the same AC. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) +QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) { sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pentry = NULL; @@ -6335,7 +6335,7 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Memory allocation failure", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } /* copy the entire CmdInfo */ pentry->cmdInfo = *pcmd; @@ -6348,7 +6348,7 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) csr_ll_insert_tail(&pSession->bufferedCommandList, &pentry->link, true); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6358,15 +6358,15 @@ CDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) * Utility function to process a buffered request (setup/modify/release) * initially came from the client. * - * Return:CDF_STATUS + * Return:QDF_STATUS */ -static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) +static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) { sme_QosSessionInfo *qos_session; sme_QosCmdInfoEntry *pcmd = NULL; tListElem *list_elt = NULL; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -6380,7 +6380,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) FL("no more buffered commands on session %d"), session_id); qos_session->readyForPowerSave = true; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pcmd = GET_BASE_ADDR(list_elt, sme_QosCmdInfoEntry, link); qos_cmd = &pcmd->cmdInfo; @@ -6399,7 +6399,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RELEASE_REQ: @@ -6411,7 +6411,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_MODIFY_REQ: @@ -6425,7 +6425,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RESEND_REQ: @@ -6440,7 +6440,7 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) CDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); - cdf_ret_status = CDF_STATUS_E_FAILURE; + cdf_ret_status = QDF_STATUS_E_FAILURE; } break; default: @@ -6464,12 +6464,12 @@ static CDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) \brief sme_qos_delete_buffered_requests() - Utility function to Delete the buffered requests in the buffered_cmd_list, if we lost connectivity. - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, +static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, uint8_t sessionId) { sme_QosSessionInfo *pSession; @@ -6484,7 +6484,7 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Buffered List empty, nothing to delete on session %d", __func__, __LINE__, sessionId); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = @@ -6500,7 +6500,7 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, cdf_mem_free(pcmd); pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6514,9 +6514,9 @@ static CDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, * of the AP, the profile that HDD sent down with the connect request, * while CSR notifies for assoc/reassoc success. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, +QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, sme_QosAssocInfo *pAssoc_info) { tSirBssDescription *pBssDesc = NULL; @@ -6524,7 +6524,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, if (NULL == pAssoc_info) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pAssoc_info is NULL", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* clean up the assoc info if already set */ if (pSession->assocInfo.pBssDesc) { @@ -6539,7 +6539,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen); pSession->assocInfo.pBssDesc = pBssDesc; @@ -6548,7 +6548,7 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, pSession->apsdMask |= pAssoc_info->pProfile->uapsd_mask; } /* [TODO] Do we need to update the global APSD bitmap? */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6557,12 +6557,12 @@ CDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6573,7 +6573,7 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6589,7 +6589,7 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6598,12 +6598,12 @@ CDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6614,7 +6614,7 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6630,7 +6630,7 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6639,19 +6639,19 @@ CDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosFlowInfoEntry *flow_info = NULL; if (!pEntry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); switch (flow_info->reason) { @@ -6671,7 +6671,7 @@ CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) default: break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6681,25 +6681,25 @@ CDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosFlowInfoEntry *flow_info = NULL; sme_QosEdcaAcType ac; - CDF_STATUS lock_status = CDF_STATUS_E_FAILURE; + QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; sme_QosStatusType status; if (!pEntry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* delete the entry from Flow List */ flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6709,7 +6709,7 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) pACInfo->relTrig = SME_QOS_RELEASE_BY_AP; lock_status = sme_acquire_global_lock(&pMac->sme); - if (!CDF_IS_STATUS_SUCCESS(lock_status)) { + if (!QDF_IS_STATUS_SUCCESS(lock_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; @@ -6722,7 +6722,7 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, flow_info->QosFlowID, status); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6735,9 +6735,9 @@ CDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) * the success for the requested flow & notify all the other flows * running on the same AC that QoS params got modified * - * Return: CDF_STATUS enumaration + * Return: QDF_STATUS enumaration */ -CDF_STATUS +QDF_STATUS sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, tListElem *entry) { @@ -6747,12 +6747,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, bool delete_entry = false; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; - CDF_STATUS pmc_status = CDF_STATUS_E_FAILURE; + QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; if (!entry) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6779,12 +6779,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & later * to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -6814,12 +6814,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & * later to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { qos_session->uapsdAlreadyRequested = true; } @@ -6850,7 +6850,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -6866,12 +6866,12 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, \param pMac - Pointer to the global MAC parameter structure. \param pEntry - Pointer to an entry in the flow_list(i.e. tListElem structure) - \return CDF_STATUS + \return QDF_STATUS \sa --------------------------------------------------------------------------*/ -CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) +QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; @@ -6883,7 +6883,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6937,7 +6937,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6961,7 +6961,7 @@ CDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) * Return: Status */ -CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, +QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, tListElem *entry) { sme_QosSessionInfo *qos_session; @@ -6971,7 +6971,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, bool delete_entry = false; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; - CDF_STATUS pmc_status = CDF_STATUS_E_FAILURE; + QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; tCsrRoamModifyProfileFields profile_fields; uint8_t psb; uint8_t tspec_index; @@ -6980,7 +6980,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Entry is NULL")); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); ac = flow_info->ac_type; @@ -6992,7 +6992,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, FL(" No need to notify the HDD, the ADDTS " "success is not for index = %d of the AC = %d"), flow_info->tspec_mask, ac); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } switch (flow_info->reason) { case SME_QOS_REASON_SETUP: @@ -7014,12 +7014,12 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right away means * it is yet to put the module in BMPS state & later * to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -7057,12 +7057,12 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* if PMC doesn't return success right * away means it is yet to put * the module in BMPS state & later to UAPSD state */ - if (CDF_STATUS_E_FAILURE == pmc_status) { + if (QDF_STATUS_E_FAILURE == pmc_status) { hdd_status = SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED; /* we need to always notify this case */ flow_info->hoRenewal = false; - } else if (CDF_STATUS_PMC_PENDING == pmc_status) { + } else if (QDF_STATUS_PMC_PENDING == pmc_status) { /* let other flows know PMC has been notified */ qos_session->uapsdAlreadyRequested = true; @@ -7118,7 +7118,7 @@ CDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* reclaim the memory */ cdf_mem_free(flow_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /*-------------------------------------------------------------------------- @@ -7207,7 +7207,7 @@ static bool sme_qos_is_uapsd_active(void) to notify SME-QoS when it puts the chip into UAPSD mode \param callbackContext - The context passed to PMC during pmc_start_uapsd call. - \param status - CDF_STATUS returned by PMC. + \param status - QDF_STATUS returned by PMC. \return None @@ -7215,7 +7215,7 @@ static bool sme_qos_is_uapsd_active(void) --------------------------------------------------------------------------*/ void sme_qos_pmc_offload_start_uapsd_callback(void *callbackContext, - uint32_t sessionId, CDF_STATUS status) + uint32_t sessionId, QDF_STATUS status) { sme_QosSessionInfo *pSession = callbackContext; pSession->uapsdAlreadyRequested = false; @@ -7233,7 +7233,7 @@ bool sme_qos_pmc_offload_check_routine(void *callbackContext, uint32_t sessionId } -CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, +QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, uint32_t sessionId) { sme_QosSessionInfo *pSession; @@ -7245,7 +7245,7 @@ CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow List empty, can't search", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, false); @@ -7265,10 +7265,10 @@ CDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, +QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, uint32_t sessionId) { sme_QosSessionInfo *pSession; @@ -7280,7 +7280,7 @@ CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, can't search", __func__, __LINE__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } while (pEntry) { pNextEntry = csr_ll_next(&sme_qos_cb.flow_list, pEntry, false); @@ -7300,7 +7300,7 @@ CDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, } pEntry = pNextEntry; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } void sme_qos_cleanup_ctrl_blk_for_handoff(tpAniSirGlobal pMac, uint8_t sessionId) @@ -7346,7 +7346,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, { tDot11fBeaconIEs *pIes = NULL; sme_QosSessionInfo *pSession; - CDF_STATUS hstatus; + QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", @@ -7373,7 +7373,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, hstatus = csr_get_parsed_bss_description_ies(pMac, pSession->assocInfo.pBssDesc, &pIes); - if (!CDF_IS_STATUS_SUCCESS(hstatus)) { + if (!QDF_IS_STATUS_SUCCESS(hstatus)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); @@ -7414,12 +7414,12 @@ bool sme_qos_validate_requested_params(tpAniSirGlobal pMac, return rc; } -static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, eSmeCommandType cmdType, sme_QosWmmTspecInfo *pQoSInfo, sme_QosEdcaAcType ac, uint8_t tspec_mask) { - CDF_STATUS status = CDF_STATUS_E_RESOURCES; + QDF_STATUS status = QDF_STATUS_E_RESOURCES; tSmeCmd *pCommand = NULL; do { pCommand = sme_get_command_buffer(pMac); @@ -7434,7 +7434,7 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, switch (cmdType) { case eSmeCommandAddTs: if (pQoSInfo) { - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pCommand->u.qosCmd.tspecInfo = *pQoSInfo; pCommand->u.qosCmd.ac = ac; } else { @@ -7442,11 +7442,11 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, CDF_TRACE_LEVEL_ERROR, "%s: %d: NULL pointer passed", __func__, __LINE__); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; } break; case eSmeCommandDelTs: - status = CDF_STATUS_SUCCESS; + status = QDF_STATUS_SUCCESS; pCommand->u.qosCmd.ac = ac; pCommand->u.qosCmd.tspec_mask = tspec_mask; break; @@ -7454,11 +7454,11 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, cmdType); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; break; } } while (0); - if (CDF_IS_STATUS_SUCCESS(status) && pCommand) { + if (QDF_IS_STATUS_SUCCESS(status) && pCommand) { sme_push_command(pMac, pCommand, false); } else if (pCommand) { qos_release_command(pMac, pCommand); @@ -7468,7 +7468,7 @@ static CDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; bool fRemoveCmd = true; do { switch (pCommand->command) { @@ -7477,7 +7477,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_qos_add_ts_req(pMac, (uint8_t) pCommand->sessionId, &pCommand->u.qosCmd.tspecInfo, pCommand->u.qosCmd.ac); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { fRemoveCmd = false; status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; } @@ -7487,7 +7487,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_qos_del_ts_req(pMac, (uint8_t) pCommand->sessionId, pCommand->u.qosCmd.ac, pCommand->u.qosCmd.tspec_mask); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { fRemoveCmd = false; } break; @@ -7554,7 +7554,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.ac = ac; cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; - if (!CDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { + if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unable to buffer the AddTS " @@ -7615,7 +7615,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.ac = ac; cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; - if (!CDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { + if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" couldn't buf the read request state = %d"), ac_info->curr_state); @@ -7659,20 +7659,20 @@ static void sme_qos_init_a_cs(tpAniSirGlobal pMac, uint8_t sessionId) } } -static CDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, +static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId, tCsrRoamModifyProfileFields * pModFields, bool fForce) { sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; - CDF_STATUS status; + QDF_STATUS status; CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with UAPSD mask 0x%X", __func__, __LINE__, sessionId, pModFields->uapsd_mask); pSession = &sme_qos_cb.sessionInfo[sessionId]; status = csr_reassoc(pMac, sessionId, pModFields, &pSession->roamID, fForce); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { /* Update the state to Handoff so subsequent requests are queued until */ /* this one is finished */ sme_QosEdcaAcType ac; diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 88168bf5afc6..f6fa055d233a 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -105,7 +105,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, * rrm_indicate_neighbor_report_result() -calls the callback registered for * neighbor report * @pMac: Pointer to the Hal Handle. - * @cdf_status - CDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid + * @qdf_status - QDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid * report is received or neighbor timer expired * * This function calls the callback register by the caller while requesting for @@ -114,7 +114,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, * * Return: void */ -void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_status) +void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, QDF_STATUS qdf_status) { NeighborReportRspCallback callback; void *callbackContext; @@ -148,7 +148,7 @@ void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_sta /* Call the callback with the status received from caller */ if (callback) - callback(callbackContext, cdf_status); + callback(callbackContext, qdf_status); return; @@ -166,7 +166,7 @@ void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, CDF_STATUS cdf_sta * Return: status */ -static CDF_STATUS +static QDF_STATUS sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) @@ -176,7 +176,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, uint16_t length, ie_len; uint8_t i = 0, j = 0; tCsrScanResultInfo *cur_result = NULL; - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; #if defined WLAN_VOWIFI_DEBUG @@ -185,7 +185,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, if (NULL == result_arr && !msrmnt_status) { sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to PE Failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (result_arr) @@ -197,7 +197,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, if (NULL == beacon_rep) { sms_log(mac_ctx, LOGP, "Unable to allocate memory for beacon report"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(beacon_rep, length); #if defined WLAN_VOWIFI_DEBUG @@ -281,12 +281,12 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, * * Return: status */ -static CDF_STATUS sme_ese_send_beacon_req_scan_results( +static QDF_STATUS sme_ese_send_beacon_req_scan_results( tpAniSirGlobal mac_ctx, uint32_t session_id, uint8_t channel, tCsrScanResultInfo **result_arr, uint8_t msrmnt_status, uint8_t bss_count) { - CDF_STATUS status = CDF_STATUS_E_FAILURE; + QDF_STATUS status = QDF_STATUS_E_FAILURE; tSirRetStatus fill_ie_status; tpSirBssDescription bss_desc = NULL; uint32_t ie_len = 0; @@ -303,12 +303,12 @@ static CDF_STATUS sme_ese_send_beacon_req_scan_results( if (NULL == rrm_ctx) { sms_log(mac_ctx, LOGE, "rrm_ctx is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (NULL == result_arr && !msrmnt_status) { sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to HDD Failed"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (result_arr) @@ -422,9 +422,9 @@ static CDF_STATUS sme_ese_send_beacon_req_scan_results( * This function is called to get the scan result from CSR and send the beacon * report xmit ind message to PE * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, +static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, uint8_t num_chan, uint8_t *chan_list, uint8_t measurementdone) @@ -433,7 +433,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, tScanResultHandle result_handle; tCsrScanResultInfo *scan_results, *next_result; tCsrScanResultInfo *scanresults_arr[SIR_BCN_REPORT_MAX_BSS_DESC]; - CDF_STATUS status; + QDF_STATUS status; uint8_t counter = 0; tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; @@ -453,7 +453,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, (tCsrSSIDInfo *) cdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (filter.SSIDs.SSIDList == NULL) { sms_log(mac_ctx, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Allocated memory for SSIDList")); @@ -478,7 +478,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, * following call to csr_roam_get_session_id_from_bssid will fail, * hence use current session ID instead of one stored in SME rrm context */ - if (CDF_STATUS_E_FAILURE == csr_roam_get_session_id_from_bssid(mac_ctx, + if (QDF_STATUS_E_FAILURE == csr_roam_get_session_id_from_bssid(mac_ctx, &rrm_ctx->sessionBssId, &session_id)) { sms_log(mac_ctx, LOG1, FL("BSSID mismatch, using current session_id")); @@ -580,7 +580,7 @@ static CDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, * Return : 0 for success, non zero for failure */ -static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, +static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, void *pContext, uint8_t sessionId, uint32_t scanId, @@ -632,7 +632,7 @@ static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, #endif } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -641,22 +641,22 @@ static CDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, * * This routine is called to issue rrm scan request * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) +QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) { /* Issue scan request. */ tCsrScanRequest scan_req; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpRrmSMEContext sme_rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; tSirScanType scan_type; status = csr_roam_get_session_id_from_bssid(mac_ctx, &sme_rrm_ctx->sessionBssId, &session_id); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { sms_log(mac_ctx, LOGE, FL("Invalid sme Session ID")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if ((sme_rrm_ctx->currentIndex) >= @@ -688,7 +688,7 @@ CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) if (NULL == scan_req.SSIDs.SSIDList) { sms_log(mac_ctx, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, @@ -801,14 +801,14 @@ CDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) * This is called to process the Beacon * report request from peer AP forwarded through PE . * - * Return : CDF_STATUS_SUCCESS - Validation is successful. + * Return : QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsgBuf) { tpSirBeaconReportReqInd pBeaconReq = (tpSirBeaconReportReqInd) pMsgBuf; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; uint32_t len = 0, i = 0; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Received Beacon report request ind Channel = %d", @@ -824,7 +824,7 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); @@ -854,7 +854,7 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); @@ -929,14 +929,14 @@ CDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg * * This is API can be used to trigger a Neighbor report from the peer. * - * Return: CDF_STATUS_SUCCESS - Validation is successful. + * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, +QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionId, tpRrmNeighborReq pNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirNeighborReportReqInd pMsg; tCsrRoamSession *pSession; @@ -946,7 +946,7 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI #endif if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, FL("Invalid session %d"), sessionId); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } pSession = CSR_GET_SESSION(pMac, sessionId); @@ -956,14 +956,14 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI isNeighborRspPending) { sms_log(pMac, LOGE, FL("Neighbor request already pending.. Not allowed")); - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } pMsg = cdf_mem_malloc(sizeof(tSirNeighborReportReqInd)); if (NULL == pMsg) { sms_log(pMac, LOGE, "Unable to allocate memory for Neighbor request"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_zero(pMsg, sizeof(tSirNeighborReportReqInd)); @@ -989,8 +989,8 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI cdf_mem_copy(&pMsg->ucSSID, &pNeighborReq->ssid, sizeof(tSirMacSSid)); status = cds_send_mb_message_to_mac(pMsg); - if (status != CDF_STATUS_SUCCESS) - return CDF_STATUS_E_FAILURE; + if (status != QDF_STATUS_SUCCESS) + return QDF_STATUS_E_FAILURE; /* Neighbor report request message sent successfully to PE. Now register the callbacks */ pMac->rrm.rrmSmeContext.neighborReqControlInfo.neighborRspCallbackInfo. @@ -1005,7 +1005,7 @@ CDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI cdf_mc_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo. neighborRspWaitTimer, callbackInfo->timeout); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1169,15 +1169,15 @@ void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac, * The beginning of the buffer can always map to tSirSmeRsp. * This is called to process the Neighbor report received from PE. * - * Return: CDF_STATUS_SUCCESS - Validation is successful + * Return: QDF_STATUS_SUCCESS - Validation is successful */ -CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) +QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirNeighborReportInd pNeighborRpt = (tpSirNeighborReportInd) pMsgBuf; tpRrmNeighborReportDesc pNeighborReportDesc; uint8_t i = 0; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; uint8_t sessionId; /* Get the session id */ @@ -1185,7 +1185,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) csr_roam_get_session_id_from_bssid(pMac, (struct cdf_mac_addr *) pNeighborRpt->bssId, (uint32_t *) &sessionId); - if (CDF_IS_STATUS_SUCCESS(status)) { + if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE /* Clear the cache for ESE. */ if (csr_neighbor_roam_is_ese_assoc(pMac, sessionId)) { @@ -1202,7 +1202,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) if (NULL == pNeighborReportDesc) { sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report desc"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } @@ -1215,7 +1215,7 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report BSS Description"); cdf_mem_free(pNeighborReportDesc); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto end; } cdf_mem_zero(pNeighborReportDesc->pNeighborBssDescription, @@ -1255,10 +1255,10 @@ CDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) end: if (!csr_ll_count(&pMac->rrm.rrmSmeContext.neighborReportCache)) - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; /* Received a report from AP. Indicate SUCCESS to the caller if there are some valid reports */ - rrm_indicate_neighbor_report_result(pMac, cdf_status); + rrm_indicate_neighbor_report_result(pMac, qdf_status); return status; } @@ -1273,9 +1273,9 @@ end: * sme_process_msg() calls this function for the * messages that are handled by SME RRM module. * - * Return: CDF_STATUS_SUCCESS - Validation is successful. + * Return: QDF_STATUS_SUCCESS - Validation is successful. */ -CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, +QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, @@ -1300,7 +1300,7 @@ CDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1338,7 +1338,7 @@ void rrm_neighbor_rsp_timeout_handler(void *userData) #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Neighbor Response timed out "); #endif - rrm_indicate_neighbor_report_result(pMac, CDF_STATUS_E_FAILURE); + rrm_indicate_neighbor_report_result(pMac, QDF_STATUS_E_FAILURE); return; } @@ -1348,53 +1348,53 @@ void rrm_neighbor_rsp_timeout_handler(void *userData) * * Initialze all RRM module. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS rrm_open(tpAniSirGlobal pMac) +QDF_STATUS rrm_open(tpAniSirGlobal pMac) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; - CDF_STATUS cdf_ret_status = CDF_STATUS_SUCCESS; + QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ - cdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, + qdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, CDF_TIMER_TYPE_SW, rrm_iter_meas_timer_handle, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - cdf_status = + qdf_status = cdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer, CDF_TIMER_TYPE_SW, rrm_neighbor_rsp_timeout_handler, (void *)pMac); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pSmeRrmContext->neighborReqControlInfo.isNeighborRspPending = false; cdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); - if (CDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != cdf_ret_status) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1403,28 +1403,28 @@ CDF_STATUS rrm_open(tpAniSirGlobal pMac) * * Release all RRM modules and their resources. * - * Return: CDF_STATUS - * CDF_STATUS_E_FAILURE success - * CDF_STATUS_SUCCESS failure + * Return: QDF_STATUS + * QDF_STATUS_E_FAILURE success + * QDF_STATUS_SUCCESS failure */ -CDF_STATUS rrm_close(tpAniSirGlobal pMac) +QDF_STATUS rrm_close(tpAniSirGlobal pMac) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; if (CDF_TIMER_STATE_RUNNING == cdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { - cdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } - cdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Fail to destroy timer")); @@ -1435,19 +1435,19 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_get_current_state(&pSmeRrmContext-> neighborReqControlInfo. neighborRspWaitTimer)) { - cdf_status = + qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Timer stop fail")); } } - cdf_status = + qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Fail to destroy timer")); @@ -1457,7 +1457,7 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) csr_ll_close(&pSmeRrmContext->neighborReportCache); - return cdf_status; + return qdf_status; } @@ -1469,14 +1469,14 @@ CDF_STATUS rrm_close(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS rrm_ready(tpAniSirGlobal pMac) +QDF_STATUS rrm_ready(tpAniSirGlobal pMac) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- @@ -1487,16 +1487,16 @@ CDF_STATUS rrm_ready(tpAniSirGlobal pMac) \param pMac - The handle returned by mac_open. \param pRrmConfig - pointer to new rrm configs. - \return CDF_STATUS + \return QDF_STATUS ---------------------------------------------------------------------------*/ -CDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, +QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, struct rrm_config_param *rrm_config) { cdf_mem_copy(&pMac->rrm.rrmSmeContext.rrmConfig, rrm_config, sizeof(struct rrm_config_param)); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /* --------------------------------------------------------------------------- diff --git a/core/utils/logging/inc/wlan_logging_sock_svc.h b/core/utils/logging/inc/wlan_logging_sock_svc.h index 5aa52459265f..d6c94930ba49 100644 --- a/core/utils/logging/inc/wlan_logging_sock_svc.h +++ b/core/utils/logging/inc/wlan_logging_sock_svc.h @@ -34,7 +34,6 @@ #define WLAN_LOGGING_SOCK_SVC_H #include -#include #include #include #include diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index 1632adbfd92f..dfde60ddd663 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -75,7 +75,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, WMI_CMD_ID cmd_id) { cds_msg_t msg = { 0 }; - CDF_STATUS status; + QDF_STATUS status; struct ath_pktlog_wmi_params *param; param = cdf_mem_malloc(sizeof(struct ath_pktlog_wmi_params)); @@ -92,7 +92,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, status = cds_mq_post_message(CDS_MQ_ID_WMA, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { cdf_mem_free(param); return A_ERROR; } diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index cc843856616b..c59b92fcef87 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -33,7 +33,6 @@ #define PTT_SOCK_SVC_H #include #include -#include #include #include #include diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index 409d3cfe24a3..dce3cfd80f80 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -32,7 +32,6 @@ #ifdef PTT_SOCK_SVC_ENABLE #include #include -#include #include #include #include diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 7f184f5d53c6..eb38ae56f759 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -38,7 +38,6 @@ #include "wmi_version.h" #include "cdf_types.h" #include "cfg_api.h" -#include "cdf_status.h" #include "qdf_status.h" #include "cds_sched.h" #include "ol_txrx_api.h" @@ -1347,7 +1346,7 @@ typedef struct { void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr); cdf_wake_lock_t wmi_cmd_rsp_wake_lock; @@ -1855,7 +1854,7 @@ enum uapsd_ac { UAPSD_VO }; -CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, +QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uint32_t vdev_id, enum uapsd_ac ac); /** @@ -1945,32 +1944,32 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, struct dfs_ieee80211_channel *ichan); uint16_t dfs_usenol(struct ieee80211com *ic); -CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, +QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, tp_wma_trigger_uapsd_params trigger_uapsd_params); /* added to get average snr for both data and beacon */ -CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq); +QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq); -CDF_STATUS wma_update_vdev_tbl(tp_wma_handle wma_handle, uint8_t vdev_id, +QDF_STATUS wma_update_vdev_tbl(tp_wma_handle wma_handle, uint8_t vdev_id, ol_txrx_vdev_handle tx_rx_vdev_handle, uint8_t *mac, uint32_t vdev_type, bool add_del); void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle); void wma_log_completion_timeout(void *data); -CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, +QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, struct rssi_monitor_req *req); -CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, struct sir_pcl_list *msg); -CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, struct sir_hw_mode *msg); -CDF_STATUS wma_get_scan_id(uint32_t *scan_id); +QDF_STATUS wma_get_scan_id(uint32_t *scan_id); -CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg); int wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, uint32_t delay_time_ms); @@ -1984,7 +1983,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, uint8_t type, void *params, uint32_t timeout); -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart); void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id, @@ -2000,24 +1999,24 @@ void wma_set_dfs_region(tp_wma_handle wma, uint8_t dfs_region); uint32_t wma_get_vht_ch_width(void); #ifdef FEATURE_LFR_SUBNET_DETECTION -CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req); #else -static inline CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +static inline QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ #if defined(FEATURE_LRO) -CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd); #else -static inline CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +static inline QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif void diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index a0d73deec6a7..164ec4d5f52e 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -78,19 +78,19 @@ typedef enum { typedef void (*wma_peer_authorized_fp) (uint32_t vdev_id); -CDF_STATUS wma_pre_start(void *cds_context); +QDF_STATUS wma_pre_start(void *cds_context); -CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg); +QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg); -CDF_STATUS wma_start(void *cds_context); +QDF_STATUS wma_start(void *cds_context); -CDF_STATUS wma_stop(void *cds_context, uint8_t reason); +QDF_STATUS wma_stop(void *cds_context, uint8_t reason); -CDF_STATUS wma_close(void *cds_context); +QDF_STATUS wma_close(void *cds_context); -CDF_STATUS wma_wmi_service_close(void *cds_context); +QDF_STATUS wma_wmi_service_close(void *cds_context); -CDF_STATUS wma_wmi_work_close(void *cds_context); +QDF_STATUS wma_wmi_work_close(void *cds_context); void wma_rx_ready_event(WMA_HANDLE handle, void *ev); @@ -102,7 +102,7 @@ void wma_setneedshutdown(void *cds_context); bool wma_needshutdown(void *cds_context); -CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle); +QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle); uint8_t wma_map_channel(uint8_t mapChannel); @@ -111,10 +111,10 @@ int wma_cli_set_command(int vdev_id, int param_id, int sval, int vpdev); int wma_cli_set2_command(int vdev_id, int param_id, int sval1, int sval2, int vpdev); -CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value); -CDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId); +QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value); +QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId); -CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, +QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint8_t *pVersion, uint32_t versionBufferSize); int wma_runtime_suspend(void); @@ -124,17 +124,17 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); void wma_target_suspend_acknowledge(void *context); int wma_bus_resume(void); int wma_resume_target(WMA_HANDLE handle); -CDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle); -CDF_STATUS wma_disable_d0wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_disable_d0wow_in_fw(WMA_HANDLE handle); bool wma_is_wow_mode_selected(WMA_HANDLE handle); -CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle); -CDF_STATUS wma_enable_d0wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle); +QDF_STATUS wma_enable_d0wow_in_fw(WMA_HANDLE handle); bool wma_check_scan_in_progress(WMA_HANDLE handle); void wma_set_peer_authorized_cb(void *wma_ctx, wma_peer_authorized_fp auth_cb); int wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, uint32_t param_value, uint32_t vdev_id); #ifdef NOT_YET -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, void *scan_chan_info); +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, void *scan_chan_info); #endif uint8_t *wma_get_vdev_address_by_vdev_id(uint8_t vdev_id); @@ -159,7 +159,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac1_bw, enum hw_mode_dbs_capab dbs, enum hw_mode_agile_dfs_capab dfs); -CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, +QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, struct sir_hw_mode_params *hw_mode); int8_t wma_get_num_dbs_hw_modes(void); bool wma_is_hw_dbs_capable(void); @@ -167,18 +167,18 @@ bool wma_is_hw_agile_dfs_capable(void); int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id); void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, uint32_t cfgd_hw_mode_index); -CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, +QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, uint32_t *new_hw_mode_index); void wma_set_dbs_capability_ut(uint32_t dbs); -CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs); -CDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode); +QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs); +QDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode); bool wma_is_dbs_enable(void); bool wma_is_agile_dfs_enable(void); -CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, +QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, bool dbs_scan, bool dbs_plus_agile_scan, bool single_mac_scan_with_dfs); -CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, +QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, bool dbs, bool agile_dfs); bool wma_get_dbs_scan_config(void); @@ -225,18 +225,18 @@ bool wma_is_scan_simultaneous_capable(void); #ifdef FEATURE_GREEN_AP void wma_setup_egap_support(struct wma_tgt_cfg *tgt_cfg, WMA_HANDLE handle); void wma_register_egap_event_handle(WMA_HANDLE handle); -CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params); #else static inline void wma_setup_egap_support(struct wma_tgt_cfg *tgt_cfg, WMA_HANDLE handle) {} static inline void wma_register_egap_event_handle(WMA_HANDLE handle) {} -static inline CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +static inline QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif -CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value); -CDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value); +QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value); +QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value); #endif diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 5abd40bbd825..554e915b6fc1 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -278,9 +278,9 @@ typedef struct { * HAL to PE via response message. HAL does not read them. */ /* The return status of SIR_HAL_ADD_STA_REQ is reported here */ - CDF_STATUS status; + QDF_STATUS status; /* Station index; valid only when 'status' field value is - * CDF_STATUS_SUCCESS + * QDF_STATUS_SUCCESS */ uint8_t staIdx; /* BSSID of BSS to which the station is associated. @@ -338,7 +338,7 @@ typedef struct { typedef struct { uint16_t staIdx; uint16_t assocId; - CDF_STATUS status; + QDF_STATUS status; uint8_t respReqd; uint8_t sessionId; uint8_t smesessionId; @@ -374,7 +374,7 @@ typedef struct { uint8_t singleTidRc; uint8_t smesessionId; struct cdf_mac_addr peer_macaddr; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; uint8_t sendRsp; } tSetStaKeyParams, *tpSetStaKeyParams; @@ -476,7 +476,7 @@ typedef struct { uint8_t txChannelWidthSet; uint8_t currentOperChannel; tAddStaParams staContext; - CDF_STATUS status; + QDF_STATUS status; uint16_t bssIdx; /* HAL should update the existing BSS entry, if this flag is set. * PE will set this flag in case of reassoc, where we want to resue the @@ -525,7 +525,7 @@ typedef struct { */ typedef struct { uint8_t bssIdx; - CDF_STATUS status; + QDF_STATUS status; uint8_t respReqd; uint8_t sessionId; tSirMacAddr bssid; @@ -568,7 +568,7 @@ typedef struct { tSirMacMgmtHdr macMgmtHdr; tSirScanEntry scanEntry; tSirLinkTrafficCheck checkLinkTraffic; - CDF_STATUS status; + QDF_STATUS status; } tInitScanParams, *tpInitScanParams; typedef enum eDelStaReasonCode { @@ -612,7 +612,7 @@ typedef struct { */ typedef struct { uint8_t scanChannel; - CDF_STATUS status; + QDF_STATUS status; #if defined WLAN_FEATURE_VOWIFI uint32_t startTSF[2]; int8_t txMgmtPower; @@ -626,7 +626,7 @@ typedef struct { */ typedef struct { uint8_t scanChannel; - CDF_STATUS status; + QDF_STATUS status; } tEndScanParams, *tpEndScanParams; /** @@ -659,7 +659,7 @@ typedef struct { uint8_t frameType; tSirMacMgmtHdr macMgmtHdr; tSirScanEntry scanEntry; - CDF_STATUS status; + QDF_STATUS status; } tFinishScanParams, *tpFinishScanParams; #ifdef FEATURE_OEM_DATA_SUPPORT @@ -679,7 +679,7 @@ typedef struct { */ typedef struct { struct cdf_mac_addr selfMacAddr; - CDF_STATUS status; + QDF_STATUS status; uint8_t data_len; uint8_t *data; } tStartOemDataReq, *tpStartOemDataReq; @@ -765,7 +765,7 @@ typedef struct { tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; uint8_t singleTidRc; uint8_t smesessionId; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; } tSetBssKeyParams, *tpSetBssKeyParams; @@ -915,7 +915,7 @@ typedef struct { * this struct */ tSirMacAddr bssId; - CDF_STATUS status; + QDF_STATUS status; uint16_t chainMask; uint16_t smpsMode; uint8_t isDfsChannel; @@ -992,7 +992,7 @@ typedef struct { uint16_t staIdx; uint16_t tspecIdx; tSirMacTspecIE tspec; - CDF_STATUS status; + QDF_STATUS status; uint8_t sessionId; #ifdef FEATURE_WLAN_ESE uint16_t tsm_interval; @@ -1042,7 +1042,7 @@ typedef struct { uint16_t staIdx; uint16_t tspecIdx; tSirMacTspecIE tspec[HAL_QOS_NUM_AC_MAX]; - CDF_STATUS status[HAL_QOS_NUM_AC_MAX]; + QDF_STATUS status[HAL_QOS_NUM_AC_MAX]; uint8_t sessionId; } tAggrAddTsParams, *tpAggrAddTsParams; @@ -1079,7 +1079,7 @@ typedef struct { typedef struct sSet_MIMOPS { uint16_t staIdx; tSirMacHTMIMOPowerSaveState htMIMOPSState; - CDF_STATUS status; + QDF_STATUS status; uint8_t fsendRsp; tSirMacAddr peerMac; uint8_t sessionId; @@ -1108,7 +1108,7 @@ typedef struct sUapsdParams { uint8_t beTriggerEnabled:1; uint8_t viTriggerEnabled:1; uint8_t voTriggerEnabled:1; - CDF_STATUS status; + QDF_STATUS status; uint8_t bssIdx; } tUapsdParams, *tpUapsdParams; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index d2788103f868..0a7a646ff112 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -158,7 +158,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, void wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status); -CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, +QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int value); /* @@ -176,52 +176,52 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, uint32_t len); #endif -CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, int *buf_len, tAbortScanParams *abort_scan_req); -CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, uint16_t msg_type); -CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req); -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list); #ifdef WLAN_FEATURE_ROAM_OFFLOAD -CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, wmi_roam_offload_tlv_param * roam_offload_params, tSirRoamOffloadScanReq *roam_req); #endif -CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_cmd_fp, tSirRoamOffloadScanReq *roam_req, uint32_t mode, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req); -CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_period, uint32_t scan_age, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, int32_t rssi_change_thresh, uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans); -CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t chan_count, uint8_t *chan_list, uint8_t list_type, uint32_t vdev_id); @@ -242,25 +242,25 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_params); -CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, A_UINT32 final_bcnt, uint32_t vdev_id); -CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id); -CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req); -CDF_STATUS wma_roam_preauth_chan_set(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_preauth_chan_set(tp_wma_handle wma_handle, tpSwitchChannelParams params, uint8_t vdev_id); -CDF_STATUS wma_roam_preauth_chan_cancel(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_preauth_chan_cancel(tp_wma_handle wma_handle, tpSwitchChannelParams params, uint8_t vdev_id); @@ -272,9 +272,9 @@ void wma_roam_preauth_scan_event_handler(tp_wma_handle wma_handle, void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params); #ifdef FEATURE_WLAN_SCAN_PNO -CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno); +QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno); -CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id); +QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id); void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno); void wma_set_pno_channel_prediction(uint8_t *buf_ptr, @@ -289,9 +289,9 @@ static inline void wma_set_pno_channel_prediction(uint8_t *buf_ptr, } #endif #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); +QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); -CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); +QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm); #endif @@ -343,70 +343,70 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, void wma_register_extscan_event_handler(tp_wma_handle wma_handle); #ifdef FEATURE_WLAN_EXTSCAN -CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, tSirWifiScanCmdReqParams *pstart, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_start_extscan(tp_wma_handle wma, +QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart); -CDF_STATUS wma_stop_extscan(tp_wma_handle wma, +QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd); -CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * photlist, int *buf_len); -CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, tSirExtScanSetBssidHotListReqParams *photlist); -CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams *photlist_reset); -CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, tSirExtScanSetSigChangeReqParams *psigchange, wmi_buf_t *buf, int *buf_len); -CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * psigchange); -CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams *pResetReq); -CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * pcached_results); -CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * pgetcapab); -CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, struct wifi_epno_params *req); -CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req); -CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req); -CDF_STATUS +QDF_STATUS wma_set_ssid_hotlist(tp_wma_handle wma, struct sir_set_ssid_hotlist_request *request); #endif -CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, +QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload); #ifdef WLAN_FEATURE_ROAM_OFFLOAD void wma_process_unit_test_cmd(WMA_HANDLE handle, - t_wma_unit_test_cmd *wma_utest); + t_wma_unit_test_cmd * wma_utest); #endif -CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui); +QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui); int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, uint32_t len); @@ -536,7 +536,7 @@ int wma_unified_vdev_create_send(wmi_unified_t wmi_handle, uint8_t if_id, uint32_t type, uint32_t subtype, uint8_t macaddr[IEEE80211_ADDR_LEN]); -CDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, +QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, uint8_t generateRsp); @@ -556,7 +556,7 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, uint8_t vdev_id, ol_txrx_peer_handle peer, bool roam_synch_in_progress); -CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, +QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, ol_txrx_vdev_handle vdev, u8 peer_addr[IEEE80211_ADDR_LEN], uint32_t peer_type, uint8_t vdev_id, @@ -569,7 +569,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, struct add_sta_self_params *self_sta_req, uint8_t generateRsp); -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart); void wma_vdev_resp_timer(void *data); @@ -656,7 +656,7 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info); -CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, +QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params); int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, @@ -697,7 +697,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, uint32_t vdev_id, uint32_t param, uint32_t value); -CDF_STATUS +QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id); int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, @@ -723,12 +723,12 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req); void wma_disable_uapsd_mode(tp_wma_handle wma, tpDisableUapsdParams ps_req); -CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle); +QDF_STATUS wma_get_temperature(tp_wma_handle wma_handle); int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, +QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, tSirTxPowerLimit *ptxlim); void wma_update_noa(struct beacon_info *beacon, @@ -746,12 +746,12 @@ void wma_process_set_p2pgo_noa_req(tp_wma_handle wma, void wma_process_set_mimops_req(tp_wma_handle wma_handle, tSetMIMOPS *mimops); -CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value); +QDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value); -CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, +QDF_STATUS wma_notify_modem_power_state(void *wma_ptr, tSirModemPowerStateInd *pReq); -CDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, int value); void wma_set_suspend_dtim(tp_wma_handle wma); @@ -774,14 +774,14 @@ int wma_peer_state_change_event_handler(void *handle, uint8_t *event_buff, uint32_t len); -CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t +QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t mcc_adaptive_scheduler); -CDF_STATUS wma_set_mcc_channel_time_latency +QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, uint32_t mcc_channel, uint32_t mcc_channel_time_latency); -CDF_STATUS wma_set_mcc_channel_time_quota +QDF_STATUS wma_set_mcc_channel_time_quota (tp_wma_handle wma, uint32_t adapter_1_chan_number, uint32_t adapter_1_quota, uint32_t adapter_2_chan_number); @@ -790,26 +790,26 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params); void wma_unpause_vdev(tp_wma_handle wma); -CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, +QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * pRateUpdateParams); -CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle); +QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle); -CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle); +QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle); #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) int wma_mcc_vdev_tx_pause_evt_handler(void *handle, uint8_t *event, uint32_t len); #endif -CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, +QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, t_thermal_mgmt *pThermalParams); -CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, +QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, uint8_t thermal_level); -CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, +QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, t_thermal_cmd_params thermal_info); int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, @@ -829,13 +829,13 @@ tSmpsModeValue host_map_smps_mode(A_UINT32 fw_smps_mode); #ifdef WLAN_FEATURE_LINK_LAYER_STATS void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle); -CDF_STATUS wma_process_ll_stats_clear_req +QDF_STATUS wma_process_ll_stats_clear_req (tp_wma_handle wma, const tpSirLLStatsClearReq clearReq); -CDF_STATUS wma_process_ll_stats_set_req +QDF_STATUS wma_process_ll_stats_set_req (tp_wma_handle wma, const tpSirLLStatsSetReq setReq); -CDF_STATUS wma_process_ll_stats_get_req +QDF_STATUS wma_process_ll_stats_get_req (tp_wma_handle wma, const tpSirLLStatsGetReq getReq) ; int wma_unified_link_iface_stats_event_handler(void *handle, @@ -852,12 +852,12 @@ int wma_link_status_event_handler(void *handle, uint8_t *cmd_param_info, int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); -CDF_STATUS wma_send_link_speed(uint32_t link_speed); +QDF_STATUS wma_send_link_speed(uint32_t link_speed); int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); -CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle); +QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle); int wma_unified_debug_print_event_handler(void *handle, uint8_t *datap, uint32_t len); @@ -891,7 +891,7 @@ void wma_utf_detach(tp_wma_handle wma_handle); void wma_utf_attach(tp_wma_handle wma_handle); -CDF_STATUS +QDF_STATUS wma_process_ftm_command(tp_wma_handle wma_handle, struct ar6k_testmode_cmd_data *msg_buffer); #endif @@ -904,18 +904,18 @@ void wma_process_link_status_req(tp_wma_handle wma, tAniGetLinkStatus *pGetLinkStatus); #ifdef FEATURE_WLAN_LPHB -CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req); #endif -CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, +QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind); WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, u8 vht_capable, u8 dot11_mode); -CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); +QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); #ifdef FEATURE_GREEN_AP int32_t wmi_unified_pdev_green_ap_ps_enable_cmd(wmi_unified_t wmi_handle, @@ -968,7 +968,7 @@ int wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle); #if !defined(REMOVE_PKT_LOG) -CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, +QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params); #endif @@ -988,19 +988,19 @@ static inline int wma_get_wow_bus_suspend(tp_wma_handle wma) return cdf_atomic_read(&wma->is_wow_bus_suspended); } -CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); -CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn); -CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, struct wow_delete_pattern *pattern); -CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); +QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); -CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); +QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); -CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); void wma_calculate_and_update_conn_state(tp_wma_handle wma); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); @@ -1022,43 +1022,43 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma_handle, #ifdef FEATURE_OEM_DATA_SUPPORT void wma_start_oem_data_req(tp_wma_handle wma_handle, - tStartOemDataReq *startOemDataReq); + tStartOemDataReq * startOemDataReq); #endif #ifdef FEATURE_WLAN_ESE -CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, +QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg); #endif -CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, - tSirRcvFltMcAddrList *mcbc_param); +QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, + tSirRcvFltMcAddrList * mcbc_param); #ifdef WLAN_FEATURE_GTK_OFFLOAD -CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, tpSirGtkOffloadParams params); -CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params); #endif -CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, +QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq pHostOffloadParams, bool bArpOnly); -CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * pAddPeriodicTxPtrnParams); -CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirDelPeriodicTxPtrn * pDelPeriodicTxPtrnParams); #ifdef WLAN_FEATURE_STATS_EXT -CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq); +QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq); #endif -CDF_STATUS wma_process_ibss_route_table_update_ind(void *wma_handle, - tAniIbssRouteTable *pData); +QDF_STATUS wma_process_ibss_route_table_update_ind(void *wma_handle, + tAniIbssRouteTable * pData); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params); @@ -1074,14 +1074,14 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, int wma_auto_shutdown_event_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, +QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * auto_sh_cmd); #endif #ifdef WLAN_FEATURE_NAN -CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req); +QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req); #endif #ifdef DHCP_SERVER_OFFLOAD @@ -1091,7 +1091,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, #endif #ifdef WLAN_FEATURE_GPIO_LED_FLASHING -CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, +QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing); #endif @@ -1099,7 +1099,7 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, uint32_t len); -CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * ch_avoid_update_req); #endif @@ -1150,7 +1150,7 @@ int wma_rssi_breached_event_handler(void *handle, #ifdef WLAN_FEATURE_MEMDUMP int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, u_int32_t len); -CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, struct fw_dump_req *mem_dump_req); #else static inline int wma_fw_mem_dump_event_handler(void *handle, @@ -1159,13 +1159,13 @@ static inline int wma_fw_mem_dump_event_handler(void *handle, return 0; } -static inline CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +static inline QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, void *mem_dump_req) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif -CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, +QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, struct vdev_ie_info *ie_info); int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 9460d5f0fcc4..8180e06e328d 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -51,7 +51,7 @@ #define WMA_MAX_STA (16) #endif -#define WMA_NVDownload_Start(x) ({ CDF_STATUS_SUCCESS; }) +#define WMA_NVDownload_Start(x) ({ QDF_STATUS_SUCCESS; }) #define DPU_FEEDBACK_UNPROTECTED_ERROR 0x0F @@ -462,7 +462,7 @@ #define wma_tx_frame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, \ pData, txFlag, sessionid, channel_freq) \ - (CDF_STATUS)( wma_tx_packet( \ + (QDF_STATUS)( wma_tx_packet( \ cds_get_context(CDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ @@ -480,7 +480,7 @@ #define wma_tx_frameWithTxComplete(hHal, pFrmBuf, frmLen, frmType, txDir, tid, \ pCompFunc, pData, pCBackFnTxComp, txFlag, sessionid, tdlsflag, \ channel_freq) \ - (CDF_STATUS)( wma_tx_packet( \ + (QDF_STATUS)( wma_tx_packet( \ cds_get_context(CDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ @@ -584,7 +584,7 @@ typedef void (*pWMATxRxCompFunc)(void *pContext, void *pData, /* callback function for TX complete */ /* parameter 1 - global pMac pointer */ /* parameter 2 - txComplete status : 1- success, 0 - failure. */ -typedef CDF_STATUS (*pWMAAckFnTxComp)(tpAniSirGlobal, uint32_t); +typedef QDF_STATUS (*pWMAAckFnTxComp)(tpAniSirGlobal, uint32_t); /* generic callback for updating parameters from target to UMAC */ typedef void (*wma_tgt_cfg_cb)(void *context, void *param); @@ -653,17 +653,17 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg); tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb); -CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps); -CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req); +QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps); +QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req); -CDF_STATUS +QDF_STATUS wma_ds_peek_rx_packet_info (cds_pkt_t *vosDataBuff, void **ppRxHeader, bool bSwap); void wma_tx_abort(uint8_t vdev_id); -CDF_STATUS wma_tx_packet(void *pWMA, +QDF_STATUS wma_tx_packet(void *pWMA, void *pFrmBuf, uint16_t frmLen, eFrameType frmType, @@ -675,23 +675,23 @@ CDF_STATUS wma_tx_packet(void *pWMA, uint8_t txFlag, uint8_t sessionId, bool tdlsflag, uint16_t channel_freq); -CDF_STATUS wma_open(void *p_cds_context, +QDF_STATUS wma_open(void *p_cds_context, wma_tgt_cfg_cb pTgtUpdCB, wma_dfs_radar_indication_cb radar_ind_cb, tMacOpenParameters *pMacParams); -typedef CDF_STATUS (*wma_mgmt_frame_rx_callback)(void *p_cds_gctx, +typedef QDF_STATUS (*wma_mgmt_frame_rx_callback)(void *p_cds_gctx, void *cds_buff); -CDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx, +QDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx, wma_mgmt_frame_rx_callback mgmt_rx_cb); -CDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx); -CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +QDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx); +QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)); diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c index e11d46ece7e6..71768f74d793 100644 --- a/core/wma/src/wlan_qct_wma_legacy.c +++ b/core/wma/src/wlan_qct_wma_legacy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -56,7 +56,7 @@ tSirRetStatus wma_post_ctrl_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_WMA, (cds_msg_t *) pMsg)) return eSIR_FAILURE; else diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index d56a92f6b3a8..4d25ebc67da0 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -285,7 +285,7 @@ static void wma_bin_search_rate(wma_search_rate_t *tbl, int32_t tbl_size, * * Return: CDF status */ -static CDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, +static QDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate) { uint8_t idx = 0; @@ -297,7 +297,7 @@ static CDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, *rate |= (1 << 6) | (idx & 0xF); /* set bit 6 to 1 for CCK */ else *rate |= (idx & 0xF); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -339,7 +339,7 @@ static void wma_set_ht_vht_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -364,7 +364,7 @@ static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 2, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -377,7 +377,7 @@ static CDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -403,7 +403,7 @@ static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, wma_set_ht_vht_mcast_rate(shortgi, mbpsx10_rate, sgi_idx, sgi_rate, lgi_idx, lgi_rate, 2, rate, streaming_rate); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -416,7 +416,7 @@ static CDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -443,7 +443,7 @@ static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -456,7 +456,7 @@ static CDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -484,7 +484,7 @@ static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -497,7 +497,7 @@ static CDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate, int32_t *streaming_rate) @@ -524,7 +524,7 @@ static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, lgi_idx, lgi_rate, 3, rate, streaming_rate); if (nss == 1) *streaming_rate = *streaming_rate << 1; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -540,7 +540,7 @@ static CDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, uint32_t chwidth, int32_t mbpsx10_rate, uint8_t nss, WLAN_PHY_MODE chanmode, uint8_t *rate, @@ -558,7 +558,7 @@ static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, else WMA_LOGE("%s: Error, Invalid chwidth enum %d", __func__, chwidth); - return (*streaming_rate != 0) ? CDF_STATUS_SUCCESS : CDF_STATUS_E_INVAL; + return (*streaming_rate != 0) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_INVAL; } /** @@ -574,7 +574,7 @@ static CDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, +static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, uint32_t chwidth, int32_t mbpsx10_rate, uint8_t nss, WLAN_PHY_MODE chanmode, @@ -596,7 +596,7 @@ static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, else WMA_LOGE("%s: chwidth enum %d not supported", __func__, chwidth); - return (*streaming_rate != 0) ? CDF_STATUS_SUCCESS : CDF_STATUS_E_INVAL; + return (*streaming_rate != 0) ? QDF_STATUS_SUCCESS : QDF_STATUS_E_INVAL; } #define WMA_MCAST_1X1_CUT_OFF_RATE 2000 @@ -612,7 +612,7 @@ static CDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, * * Return: CDF status */ -static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, +static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, WLAN_PHY_MODE chanmode, A_UINT32 mhz, int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate) @@ -660,7 +660,7 @@ static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, ret = wma_fill_ht_mcast_rate(shortgi, chwidth, mbpsx10_rate, nss, chanmode, &rate_ht, &stream_rate_ht); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { stream_rate_ht = 0; } if (mhz < WMA_2_4_GHZ_MAX_FREQ) { @@ -673,9 +673,9 @@ static CDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, ret = wma_fill_vht_mcast_rate(shortgi, chwidth, mbpsx10_rate, nss, chanmode, &rate_vht, &stream_rate_vht); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { if (stream_rate_ht != 0) - ret = CDF_STATUS_SUCCESS; + ret = QDF_STATUS_SUCCESS; *rate = rate_ht; stream_rate = stream_rate_ht; goto ht_vht_done; @@ -989,9 +989,9 @@ int wma_peer_state_change_event_handler(void *handle, * * This function enable/disable mcc adaptive scheduler in fw. * - * Return: CDF_STATUS_SUCCESS for sucess or error code + * Return: QDF_STATUS_SUCCESS for sucess or error code */ -CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t +QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t mcc_adaptive_scheduler) { int ret = -1; @@ -1004,13 +1004,13 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t wma = cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s : Failed to get wma", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param *) wmi_buf_data(buf); @@ -1028,7 +1028,7 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t " adaptive scheduler command", __func__); cdf_nbuf_free(buf); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1043,7 +1043,7 @@ CDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t * * Return: CDF status */ -CDF_STATUS wma_set_mcc_channel_time_latency +QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, uint32_t mcc_channel, uint32_t mcc_channel_time_latency) { @@ -1064,20 +1064,20 @@ CDF_STATUS wma_set_mcc_channel_time_latency if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGE("%s: MCC is not active. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Confirm MCC adaptive scheduler feature is disabled */ if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, @@ -1085,13 +1085,13 @@ CDF_STATUS wma_set_mcc_channel_time_latency if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) { WMA_LOGD("%s: Can't set channel latency while MCC " "ADAPTIVE SCHED is enabled. Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else { WMA_LOGE("%s: Failed to get value for MCC_ADAPTIVE_SCHED, " "Exit w/o setting latency", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* If 0ms latency is provided, then FW will set to a default. * Otherwise, latency must be at least 30ms. @@ -1101,7 +1101,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency WMA_LOGE("%s: Invalid time latency for Channel #1 = %dms " "Minimum is 30ms (or 0 to use default value by " "firmware)", __func__, latency_chan1); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set WMI CMD for channel time latency here */ @@ -1111,7 +1111,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmdTL = (wmi_resmgr_set_chan_latency_cmd_fixed_param *) @@ -1136,9 +1136,9 @@ CDF_STATUS wma_set_mcc_channel_time_latency __func__); cdf_nbuf_free(buf); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1157,7 +1157,7 @@ CDF_STATUS wma_set_mcc_channel_time_latency * * Return: CDF status */ -CDF_STATUS wma_set_mcc_channel_time_quota +QDF_STATUS wma_set_mcc_channel_time_quota (tp_wma_handle wma, uint32_t adapter_1_chan_number, uint32_t adapter_1_quota, uint32_t adapter_2_chan_number) @@ -1188,20 +1188,20 @@ CDF_STATUS wma_set_mcc_channel_time_quota if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGD("%s: MCC is not active. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Confirm MCC adaptive scheduler feature is disabled */ @@ -1211,13 +1211,13 @@ CDF_STATUS wma_set_mcc_channel_time_quota WMA_LOGD("%s: Can't set channel quota while " "MCC_ADAPTIVE_SCHED is enabled. Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } } else { WMA_LOGE("%s: Failed to retrieve " "WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED. Exit", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -1227,7 +1227,7 @@ CDF_STATUS wma_set_mcc_channel_time_quota quota_chan1 > WMI_MCC_MAX_CHANNEL_QUOTA) { WMA_LOGE("%s: Invalid time quota for Channel #1=%dms. Minimum " "is 20ms & maximum is 80ms", __func__, quota_chan1); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set WMI CMD for channel time quota here */ len = sizeof(wmi_resmgr_set_chan_time_quota_cmd_fixed_param) + @@ -1237,7 +1237,7 @@ CDF_STATUS wma_set_mcc_channel_time_quota if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmdTQ = (wmi_resmgr_set_chan_time_quota_cmd_fixed_param *) @@ -1268,9 +1268,9 @@ CDF_STATUS wma_set_mcc_channel_time_quota WMA_LOGE("Failed to send MCC Channel Time Quota command"); cdf_nbuf_free(buf); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1287,7 +1287,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) ol_txrx_peer_handle peer; uint8_t vdev_id, peer_id; bool roam_synch_in_progress = false; - CDF_STATUS status; + QDF_STATUS status; params->status = true; WMA_LOGD("%s: state %d selfmac %pM", __func__, @@ -1324,7 +1324,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) status = wma_create_peer(wma, pdev, vdev, params->bssid, WMI_PEER_TYPE_DEFAULT, vdev_id, roam_synch_in_progress); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("%s: Unable to create peer", __func__); if (roam_synch_in_progress) return; @@ -1391,7 +1391,7 @@ void wma_unpause_vdev(tp_wma_handle wma) * * Return: CDF status */ -CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, +QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * pRateUpdateParams) { @@ -1411,7 +1411,7 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, WMA_LOGE("vdev handle is invalid for %pM", pRateUpdateParams->bssid.bytes); cdf_mem_free(pRateUpdateParams); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } short_gi = intr[vdev_id].config.shortgi; if (short_gi == 0) @@ -1444,7 +1444,7 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, ret = wma_encode_mc_rate(short_gi, intr[vdev_id].config.chwidth, intr[vdev_id].chanmode, intr[vdev_id].mhz, mbpsx10_rate, pRateUpdateParams->nss, &rate); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Error, Invalid input rate value", __func__); cdf_mem_free(pRateUpdateParams); return ret; @@ -1455,17 +1455,17 @@ CDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, WMA_LOGE("%s: Failed to Set WMI_VDEV_PARAM_SGI (%d), ret = %d", __func__, short_gi, ret); cdf_mem_free(pRateUpdateParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, paramId, rate); cdf_mem_free(pRateUpdateParams); if (ret) { WMA_LOGE("%s: Failed to Set rate, ret = %d", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1618,7 +1618,7 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, cdf_nbuf_t netbuf, * * Return: CDF status */ -CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) +QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) { /* Get the Vos Context */ p_cds_contextType cds_handle = @@ -1642,7 +1642,7 @@ CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) /* Store the Mac Context */ wma_handle->mac_context = cds_handle->pMACContext; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1653,7 +1653,7 @@ CDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) * * Return: CDF status */ -CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) +QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) { uint32_t frame_index = 0; @@ -1688,7 +1688,7 @@ CDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) /* Reset last Tx Data Frame nbuf ptr */ wma_handle->last_umac_data_nbuf = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) @@ -1799,9 +1799,9 @@ int wma_mcc_vdev_tx_pause_evt_handler(void *handle, uint8_t *event, * sends down the initial temperature thresholds to the firmware * and configures the throttle period in the tx rx module * - * Returns: CDF_STATUS_SUCCESS for success otherwise failure + * Returns: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, +QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, t_thermal_mgmt *pThermalParams) { t_thermal_cmd_params thermal_params; @@ -1809,13 +1809,13 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, if (NULL == wma || NULL == pThermalParams) { WMA_LOGE("TM Invalid input"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("TM enable %d period %d", pThermalParams->thermalMgmtEnabled, @@ -1871,12 +1871,12 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, thermal_params.minTemp, thermal_params.maxTemp, thermal_params.thermalEnable); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { WMA_LOGE("Could not send thermal mgmt command to the firmware!"); } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1889,7 +1889,7 @@ CDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, */ static void wma_set_thermal_level_ind(u_int8_t level) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = {0}; WMA_LOGI(FL("Thermal level: %d"), level); @@ -1898,8 +1898,8 @@ static void wma_set_thermal_level_ind(u_int8_t level) sme_msg.bodyptr = NULL; sme_msg.bodyval = level; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGE(FL( "Fail to post set thermal level ind msg")); } @@ -1913,22 +1913,22 @@ static void wma_set_thermal_level_ind(u_int8_t level) * txrx module and sends down the corresponding temperature * thresholds to the firmware * - * Returns: CDF_STATUS_SUCCESS for success otherwise failure + * Returns: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, +QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, uint8_t thermal_level) { ol_txrx_pdev_handle curr_pdev; if (NULL == wma) { WMA_LOGE("TM Invalid input"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGE("TM set level %d", thermal_level); @@ -1936,18 +1936,18 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, /* Check if thermal mitigation is enabled */ if (!wma->thermal_mgmt_info.thermalMgmtEnabled) { WMA_LOGE("Thermal mgmt is not enabled, ignoring set level command"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (thermal_level >= WLAN_WMA_MAX_THERMAL_LEVELS) { WMA_LOGE("Invalid thermal level set %d", thermal_level); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (thermal_level == wma->thermal_mgmt_info.thermalCurrLevel) { WMA_LOGD("Current level %d is same as the set level, ignoring", wma->thermal_mgmt_info.thermalCurrLevel); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma->thermal_mgmt_info.thermalCurrLevel = thermal_level; @@ -1957,7 +1957,7 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, /* Send SME SET_THERMAL_LEVEL_IND message */ wma_set_thermal_level_ind(thermal_level); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -1969,9 +1969,9 @@ CDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, * This function sends the thermal management command * to the firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, +QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, t_thermal_cmd_params thermal_info) { wmi_thermal_mgmt_cmd_fixed_param *cmd = NULL; @@ -1984,7 +1984,7 @@ CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_thermal_mgmt_cmd_fixed_param *) wmi_buf_data(buf); @@ -2006,10 +2006,10 @@ CDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, if (status) { cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send thermal mgmt command", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2126,7 +2126,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, thermal_params.thermalEnable = wma->thermal_mgmt_info.thermalMgmtEnabled; - if (CDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { + if (QDF_STATUS_SUCCESS != wma_set_thermal_mgmt(wma, thermal_params)) { WMA_LOGE("Could not send thermal mgmt command to the firmware!"); return -EINVAL; } @@ -2342,7 +2342,7 @@ void wmi_desc_put(tp_wma_handle wma_handle, struct wmi_desc_t *wmi_desc) } #define mgmt_tx_dl_frm_len 64 -static inline CDF_STATUS +static inline QDF_STATUS mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, uint16_t frmLen, uint8_t vdev_id, pWMATxRxCompFunc tx_complete_cb, @@ -2365,7 +2365,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, buf = wmi_buf_alloc(wma_handle->wmi_handle, cmd_len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_mgmt_tx_send_cmd_fixed_param *)wmi_buf_data(buf); @@ -2407,12 +2407,12 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, WMA_LOGE("%s: Failed to send mgmt Tx", __func__); goto err1; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err1: wmi_desc_put(wma_handle, wmi_desc); err2: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2435,7 +2435,7 @@ err2: * * Return: CDF status */ -CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, +QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, eFrameType frmType, eFrameTxDir txDir, uint8_t tid, pWMATxRxCompFunc tx_frm_download_comp_cb, void *pData, pWMAAckFnTxComp tx_frm_ota_comp_cb, uint8_t tx_flag, @@ -2443,7 +2443,6 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, { tp_wma_handle wma_handle = (tp_wma_handle) (wma_context); int32_t status; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t is_high_latency; ol_txrx_vdev_handle txrx_vdev; @@ -2466,7 +2465,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (NULL == wma_handle) { WMA_LOGE("wma_handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } iface = &wma_handle->interfaces[vdev_id]; /* Get the vdev handle from vdev id */ @@ -2474,18 +2473,18 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (!txrx_vdev) { WMA_LOGE("TxRx Vdev Handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (frmType >= TXRX_FRM_MAX) { WMA_LOGE("Invalid Frame Type Fail to send Frame"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(CDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("pMac Handle is NULL"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* * Currently only support to @@ -2494,7 +2493,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (!((frmType == TXRX_FRM_802_11_MGMT) || (frmType == TXRX_FRM_802_11_DATA))) { WMA_LOGE("No Support to send other frames except 802.11 Mgmt/Data"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } mHdr = (tpSirMacMgmtHdr)cdf_nbuf_data(tx_frame); #ifdef WLAN_FEATURE_11W @@ -2511,15 +2510,15 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, /* Allocate extra bytes for privacy header and trailer */ newFrmLen = frmLen + IEEE80211_CCMP_HEADERLEN + IEEE80211_CCMP_MICLEN; - cdf_status = + qdf_status = cds_packet_alloc((uint16_t) newFrmLen, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Failed to allocate %d bytes for RMF status " "code (%x)", __func__, newFrmLen, - cdf_status); + qdf_status); /* Free the original packet memory */ cds_packet_free((void *)tx_frame); goto error; @@ -2544,14 +2543,14 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } else { /* Allocate extra bytes for MMIE */ newFrmLen = frmLen + IEEE80211_MMIE_LEN; - cdf_status = cds_packet_alloc((uint16_t) newFrmLen, + qdf_status = cds_packet_alloc((uint16_t) newFrmLen, (void **)&pFrame, (void **)&pPacket); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Failed to allocate %d bytes for RMF status " "code (%x)", __func__, newFrmLen, - cdf_status); + qdf_status); /* Free the original packet memory */ cds_packet_free((void *)tx_frame); goto error; @@ -2608,7 +2607,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (pdev == NULL) { WMA_LOGE("%s: pdev pointer is not available", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* @@ -2631,7 +2630,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } else { WMA_LOGE("%s: Already one Data pending for Ack, reject Tx of data frame", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } } else { @@ -2640,7 +2639,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, * so Ack Complete Cb is must */ WMA_LOGE("No Ack Complete Cb. Don't Allow"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Take out 802.11 header from skb */ @@ -2681,7 +2680,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, WMA_TX_FRAME_BUFFER_FREE); wma_handle->umac_data_ota_ack_cb = NULL; wma_handle->last_umac_data_nbuf = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Call Download Callback if passed */ @@ -2690,7 +2689,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, tx_frame, WMA_TX_FRAME_BUFFER_NO_FREE); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } is_high_latency = @@ -2740,12 +2739,12 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, wma_handle->tx_frm_download_comp_cb = tx_frm_download_comp_cb; /* Reset the Tx Frame Complete Event */ - cdf_status = + qdf_status = qdf_event_reset(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: Event Reset failed tx comp event %x", - __func__, cdf_status); + __func__, qdf_status); goto error; } } @@ -2806,7 +2805,7 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, } if (!tx_frm_download_comp_cb) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* * Wait for Download Complete @@ -2845,11 +2844,11 @@ CDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, WMA_TX_FRAME_BUFFER_NO_FREE); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wma_handle->tx_frm_download_comp_cb = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2862,18 +2861,18 @@ error: * * Return: CDF status */ -CDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, +QDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, bool bSwap) { /* Sanity Check */ if (pkt == NULL) { WMA_LOGE("wma:Invalid parameter sent on wma_peek_rx_pkt_info"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } *pkt_meta = &(pkt->pkt_meta); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2944,7 +2943,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: could not post mic failure indication to SME", __func__); @@ -2999,9 +2998,9 @@ void wma_tx_abort(uint8_t vdev_id) * the firmware to enable LRO, sets the TCP flags and sets the * seed values for the toeplitz hash generation * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure */ -CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd) { wmi_lro_info_cmd_fixed_param *cmd; @@ -3010,13 +3009,13 @@ CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, if (NULL == wma_handle || NULL == wma_lro_cmd) { WMA_LOGE("wma_lro_config_cmd': invalid input!"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); if (!buf) { WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_lro_info_cmd_fixed_param *) wmi_buf_data(buf); @@ -3072,10 +3071,10 @@ CDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, if (status) { cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send WMI_LRO_CONFIG_CMDID", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -3145,7 +3144,7 @@ wma_indicate_err( cdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: mic failure ind post to SME failed", diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 018eacc5fbe6..0c92e0cb9769 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -482,7 +482,7 @@ void wma_vdev_detach_callback(void *ctx) struct wma_txrx_node *iface = (struct wma_txrx_node *)ctx; struct del_sta_self_params *param; struct wma_target_req *req_msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; wma = cds_get_context(CDF_MODULE_ID_WMA); @@ -516,13 +516,13 @@ void wma_vdev_detach_callback(void *ctx) cdf_mem_free(iface->staKeyParams); #endif /* WLAN_FEATURE_VOWIFI_11R */ cdf_mem_zero(iface, sizeof(*iface)); - param->status = CDF_STATUS_SUCCESS; + param->status = QDF_STATUS_SUCCESS; sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; sme_msg.bodyptr = param; sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(param); } @@ -538,7 +538,7 @@ void wma_vdev_detach_callback(void *ctx) * Return: success if peer delete command sent to firmware, else failure. */ -static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, +static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, struct del_sta_self_params *del_sta_self_req_param, uint8_t generate_vdev_rsp) { @@ -555,7 +555,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } peer = ol_txrx_find_peer_by_addr(pdev, @@ -564,7 +564,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, if (!peer) { WMA_LOGE("%s Failed to find peer %pM", __func__, del_sta_self_req_param->self_mac_addr); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma_remove_peer(wma_handle, del_sta_self_req_param->self_mac_addr, @@ -576,7 +576,7 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, cdf_mem_malloc(sizeof(struct del_sta_self_rsp_params)); if (sta_self_wmi_rsp == NULL) { WMA_LOGP(FL("Failed to allocate memory")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } sta_self_wmi_rsp->self_sta_param = del_sta_self_req_param; sta_self_wmi_rsp->generate_rsp = generate_vdev_rsp; @@ -590,17 +590,17 @@ static CDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, vdev_id); wma_remove_req(wma_handle, vdev_id, WMA_DEL_P2P_SELF_STA_RSP_START); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, +static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *del_sta_self_req_param, uint8_t generate_rsp) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id = del_sta_self_req_param->session_id; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; struct wma_target_req *msg = NULL; @@ -608,7 +608,7 @@ static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, if (wma_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id)) { WMA_LOGE("Unable to remove an interface"); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -625,7 +625,7 @@ static CDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, if (!msg) { WMA_LOGE("%s: Failed to fill vdev request for vdev_id %d", __func__, vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -665,7 +665,7 @@ out: sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP"); cdf_mem_free(del_sta_self_req_param); } @@ -680,11 +680,11 @@ out: * * Return: CDF status */ -CDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, +QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, uint8_t generateRsp) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id = pdel_sta_self_req_param->session_id; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; @@ -781,7 +781,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, #endif /* QCA_IBSS_SUPPORT */ if (resp_event->status) { - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; goto send_fail_resp; } @@ -797,7 +797,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, if (!bcn) { WMA_LOGE("%s: Failed alloc memory for beacon struct", __func__); - add_bss->status = CDF_STATUS_E_NOMEM; + add_bss->status = QDF_STATUS_E_NOMEM; goto send_fail_resp; } cdf_mem_zero(bcn, sizeof(*bcn)); @@ -807,7 +807,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, WMA_LOGE("%s: No memory allocated for beacon buffer", __func__); cdf_mem_free(bcn); - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; goto send_fail_resp; } bcn->seq_no = MIN_SW_SEQ; @@ -821,7 +821,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, WMA_LOGD("%s: Allocated beacon struct %p, template memory %p", __func__, bcn, bcn->buf); } - add_bss->status = CDF_STATUS_SUCCESS; + add_bss->status = QDF_STATUS_SUCCESS; add_bss->bssIdx = resp_event->vdev_id; add_bss->chainMask = resp_event->chain_mask; if ((2 != resp_event->cfgd_rx_streams) || @@ -932,7 +932,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, cdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); } - if (resp_event->status == CDF_STATUS_SUCCESS) { + if (resp_event->status == QDF_STATUS_SUCCESS) { wma->interfaces[resp_event->vdev_id].tx_streams = resp_event->cfgd_tx_streams; wma->interfaces[resp_event->vdev_id].rx_streams = @@ -981,7 +981,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, cdf_mc_timer_stop(&req_msg->event_timeout); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - if (resp_event->status == CDF_STATUS_SUCCESS + if (resp_event->status == QDF_STATUS_SUCCESS && mac_ctx->sap.sap_channel_avoidance) wma_find_mcc_ap(wma, resp_event->vdev_id, true); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ @@ -1286,7 +1286,7 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi, * * Return: CDF status */ -CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, +QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, ol_txrx_vdev_handle vdev, u8 peer_addr[IEEE80211_ADDR_LEN], uint32_t peer_type, uint8_t vdev_id, @@ -1310,7 +1310,7 @@ CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, WMA_LOGE("%s: LFR3: Created peer with peer_addr %pM vdev_id %d," "peer_count - %d", __func__, peer_addr, vdev_id, wma->interfaces[vdev_id].peer_count); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } if (wmi_unified_peer_create_send(wma->wmi_handle, peer_addr, peer_type, vdev_id) < 0) { @@ -1338,10 +1338,10 @@ CDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, wma_set_stakey(wma, &key_info); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err: wma->interfaces[vdev_id].peer_count--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -1512,7 +1512,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, ol_txrx_vdev_handle vdev; struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; - CDF_STATUS status; + QDF_STATUS status; if (!wma) { WMA_LOGE("%s: Null wma handle", __func__); @@ -1554,7 +1554,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* create ibss bss peer */ status = wma_create_peer(wma, vdev->pdev, vdev, vdev->mac_addr.raw, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("%s: Failed to create IBSS bss peer", __func__); else WMA_LOGA("IBSS BSS peer created with mac %pM", @@ -1795,13 +1795,13 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, * BSS REQ was timed out to stop the VDEV in this case no need * to send response to UMAC */ - if (params->status == CDF_STATUS_FW_MSG_TIMEDOUT) { + if (params->status == QDF_STATUS_FW_MSG_TIMEDOUT) { cdf_mem_free(params); WMA_LOGE("%s: DEL BSS from ADD BSS timeout do not send " "resp to UMAC (vdev id %x)", __func__, resp_event->vdev_id); } else { - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; wma_send_msg(wma, WMA_DELETE_BSS_RSP, (void *)params, 0); } @@ -1837,7 +1837,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, ol_txrx_vdev_handle txrx_vdev_handle = NULL; ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); enum wlan_op_mode txrx_vdev_type; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); uint32_t cfg_val; uint16_t val16; @@ -1858,7 +1858,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->self_mac_addr)) { WMA_LOGP("%s: Unable to add an interface for ath_dev", __func__); - status = CDF_STATUS_E_RESOURCES; + status = QDF_STATUS_E_RESOURCES; goto end; } @@ -1882,7 +1882,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (NULL == txrx_vdev_handle) { WMA_LOGP("%s: ol_txrx_vdev_attach failed", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); goto end; @@ -1955,9 +1955,9 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->self_mac_addr, WMI_PEER_TYPE_DEFAULT, self_sta_req->session_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); } @@ -2037,7 +2037,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, WMA_LOGD("%s: setting ini value for WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED: %d", __func__, cfg_val); ret = wma_set_enable_disable_mcc_adaptive_scheduler(cfg_val); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to set WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED"); } } else { @@ -2061,7 +2061,7 @@ end: sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(self_sta_req); } @@ -2077,7 +2077,7 @@ end: * * Return: CDF status */ -CDF_STATUS wma_vdev_start(tp_wma_handle wma, +QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart) { wmi_vdev_start_request_cmd_fixed_param *cmd; @@ -2093,7 +2093,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, mac_ctx = cds_get_context(CDF_MODULE_ID_PE); if (mac_ctx == NULL) { WMA_LOGE("%s: vdev start failed as mac_ctx is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } dfs = (struct ath_dfs *)wma->dfs_ic->ic_dfs; @@ -2104,7 +2104,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_vdev_start_request_cmd_fixed_param *) buf_ptr; @@ -2212,7 +2212,7 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, __func__, __LINE__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_spin_lock_bh(&wma->dfs_ic->chan_lock); @@ -2327,10 +2327,10 @@ CDF_STATUS wma_vdev_start(tp_wma_handle wma, if (ret < 0) { WMA_LOGP("%s: Failed to send vdev start command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2389,7 +2389,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, } /* peer assoc conf event means the cmd succeeds */ - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; WMA_LOGE(FL("Send ADD_STA_RSP: statype %d vdev_id %d aid %d bssid %pM staIdx %d status %d"), params->staType, params->smesessionId, params->assocId, params->bssId, params->staIdx, @@ -2405,7 +2405,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, } /* peer assoc conf event means the cmd succeeds */ - params->status = CDF_STATUS_SUCCESS; + params->status = QDF_STATUS_SUCCESS; WMA_LOGE(FL("Send ADD BSS RSP: opermode %d update_bss %d nw_type %d bssid %pM" " staIdx %d status %d"), params->operMode, params->updateBss, params->nwType, params->bssId, @@ -2525,7 +2525,7 @@ int wma_peer_delete_handler(void *handle, uint8_t *cmd_param_info, if (del_sta->respReqd) { WMA_LOGD(FL("Sending peer del rsp to umac")); wma_send_msg(wma, WMA_DELETE_STA_RSP, - (void *)del_sta, CDF_STATUS_SUCCESS); + (void *)del_sta, QDF_STATUS_SUCCESS); } } else if (req_msg->type == WMA_DEL_P2P_SELF_STA_RSP_START) { struct del_sta_self_rsp_params *data; @@ -2570,7 +2570,7 @@ void wma_hold_req_timer(void *data) if (tgt_req->msg_type == WMA_ADD_STA_REQ) { tpAddStaParams params = (tpAddStaParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA(FL("WMA_ADD_STA_REQ timed out")); WMA_LOGD(FL("Sending add sta rsp to umac (mac:%pM, status:%d)"), params->staMac, params->status); @@ -2579,7 +2579,7 @@ void wma_hold_req_timer(void *data) (tgt_req->type == WMA_DELETE_STA_RSP_START)) { tpDeleteStaParams params = (tpDeleteStaParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGE(FL("WMA_DEL_STA_REQ timed out")); WMA_LOGP(FL("Sending del sta rsp to umac (mac:%pM, status:%d)"), params->staMac, params->status); @@ -2685,7 +2685,7 @@ void wma_vdev_resp_timer(void *data) ol_txrx_pdev_handle pdev; uint8_t peer_id; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); @@ -2723,7 +2723,7 @@ void wma_vdev_resp_timer(void *data) if (tgt_req->msg_type == WMA_CHNL_SWITCH_REQ) { tpSwitchChannelParams params = (tpSwitchChannelParams) tgt_req->user_data; - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_SWITCH_CHANNEL_REQ timedout", __func__); wma_send_msg(wma, WMA_SWITCH_CHANNEL_RSP, (void *)params, 0); } else if (tgt_req->msg_type == WMA_DELETE_BSS_REQ) { @@ -2799,7 +2799,7 @@ void wma_vdev_resp_timer(void *data) wma_recreate_ibss_vdev_and_bss_peer(wma, tgt_req->vdev_id); - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_DELETE_BSS_REQ timedout", __func__); wma_send_msg(wma, WMA_DELETE_BSS_RSP, (void *)params, 0); if (iface->del_staself_req) { @@ -2820,7 +2820,7 @@ void wma_vdev_resp_timer(void *data) cdf_runtime_pm_allow_suspend( wma->wmi_cmd_rsp_runtime_lock); } - params->status = CDF_STATUS_E_TIMEOUT; + params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_DEL_STA_SELF_REQ timedout", __func__); sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; @@ -2828,7 +2828,7 @@ void wma_vdev_resp_timer(void *data) sme_msg.bodyval = 0; status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(status)) { + if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(iface->del_staself_req); } @@ -2851,7 +2851,7 @@ void wma_vdev_resp_timer(void *data) } del_bss_params->status = params->status = - CDF_STATUS_FW_MSG_TIMEDOUT; + QDF_STATUS_FW_MSG_TIMEDOUT; del_bss_params->sessionId = params->sessionId; del_bss_params->bssIdx = params->bssIdx; cdf_mem_copy(del_bss_params->bssid, params->bssId, @@ -2901,7 +2901,7 @@ error0: WMA_LOGE(FL("Failed to send OCB set config cmd")); iface = &wma->interfaces[tgt_req->vdev_id]; iface->vdev_up = false; - wma_ocb_set_config_resp(wma, CDF_STATUS_E_TIMEOUT); + wma_ocb_set_config_resp(wma, QDF_STATUS_E_TIMEOUT); } free_tgt_req: cdf_mc_timer_destroy(&tgt_req->event_timeout); @@ -3061,7 +3061,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer; struct wma_target_req *msg; uint8_t vdev_id, peer_id; - CDF_STATUS status; + QDF_STATUS status; int8_t maxTxPower; #ifdef WLAN_FEATURE_11W int ret = 0; @@ -3086,7 +3086,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_set_bss_rate_flags(&wma->interfaces[vdev_id], add_bss); status = wma_create_peer(wma, pdev, vdev, add_bss->bssId, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); goto send_fail_resp; } @@ -3149,7 +3149,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3161,7 +3161,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) } status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3177,7 +3177,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, false); send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } @@ -3197,7 +3197,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer = NULL; struct wma_target_req *msg; uint8_t vdev_id, peer_id; - CDF_STATUS status; + QDF_STATUS status; struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; tSetBssKeyParams key_info; @@ -3266,7 +3266,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); goto send_fail_resp; } @@ -3312,7 +3312,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_IBSS_PWRSAVE)) { status = wma_set_ibss_pwrsave_params(wma, vdev_id); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to Set IBSS Power Save Params to firmware", __func__); goto peer_cleanup; @@ -3341,7 +3341,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3357,7 +3357,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("%s: ssid = %s", __func__, req.ssid.ssId); status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3378,7 +3378,7 @@ peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, false); } send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } #endif /* QCA_IBSS_SUPPORT */ @@ -3397,7 +3397,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct wma_target_req *msg; uint8_t vdev_id, peer_id; ol_txrx_peer_handle peer; - CDF_STATUS status; + QDF_STATUS status; struct wma_txrx_node *iface; int ret = 0; int pps_val = 0; @@ -3523,7 +3523,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((add_bss->nss == 2) && !hw_mode.dbs_cap) { @@ -3535,7 +3535,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) } status = wma_vdev_start(wma, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); goto peer_cleanup; @@ -3643,7 +3643,7 @@ send_bss_resp: ol_txrx_find_peer_by_addr(pdev, add_bss->bssId, &add_bss->staContext.staIdx); add_bss->status = (add_bss->staContext.staIdx < 0) ? - CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; add_bss->bssIdx = add_bss->staContext.smesessionId; cdf_mem_copy(add_bss->staContext.staMac, add_bss->bssId, sizeof(add_bss->staContext.staMac)); @@ -3681,7 +3681,7 @@ peer_cleanup: wma_remove_peer(wma, add_bss->bssId, vdev_id, peer, roam_synch_in_progress); send_fail_resp: - add_bss->status = CDF_STATUS_E_FAILURE; + add_bss->status = QDF_STATUS_E_FAILURE; wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)add_bss, 0); } @@ -3778,7 +3778,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; uint8_t peer_id; - CDF_STATUS status; + QDF_STATUS status; int32_t ret; struct wma_txrx_node *iface = NULL; struct wma_target_req *msg; @@ -3788,7 +3788,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } /* UMAC sends WMA_ADD_STA_REQ msg twice to WMA when the station @@ -3800,14 +3800,14 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) * will get blocked. */ if (add_sta->staType != STA_ENTRY_PEER) { - add_sta->status = CDF_STATUS_SUCCESS; + add_sta->status = QDF_STATUS_SUCCESS; goto send_rsp; } vdev = wma_find_vdev_by_id(wma, add_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } @@ -3825,7 +3825,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) status = wma_create_peer(wma, pdev, vdev, add_sta->staMac, WMI_PEER_TYPE_DEFAULT, add_sta->smesessionId, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer for %pM", __func__, add_sta->staMac); add_sta->status = status; @@ -3838,7 +3838,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: Failed to find peer handle using peer mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3855,7 +3855,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), add_sta->smesessionId); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, add_sta->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, add_sta->staMac, @@ -3869,7 +3869,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) ret = wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3933,7 +3933,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) if (ret) { WMA_LOGE("Failed to set peer uapsd param for %pM", add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -3946,7 +3946,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) add_sta->staIdx = ol_txrx_local_peer_id(peer); add_sta->nss = iface->nss; - add_sta->status = CDF_STATUS_SUCCESS; + add_sta->status = QDF_STATUS_SUCCESS; send_rsp: /* Do not send add stat resp when peer assoc cnf is enabled */ if (peer_assoc_cnf) { @@ -3975,7 +3975,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; uint8_t peer_id; - CDF_STATUS status; + QDF_STATUS status; int32_t ret; tTdlsPeerStateParams *peerStateParams; struct wma_target_req *msg; @@ -3990,14 +3990,14 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } vdev = wma_find_vdev_by_id(wma, add_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; goto send_rsp; } @@ -4009,7 +4009,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) status = wma_create_peer(wma, pdev, vdev, add_sta->staMac, WMI_PEER_TYPE_TDLS, add_sta->smesessionId, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer for %pM", __func__, add_sta->staMac); add_sta->status = status; @@ -4020,7 +4020,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: addSta, failed to find peer handle for mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4036,7 +4036,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) WMA_LOGE ("%s: Failed to allocate memory for peerStateParams for %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_NOMEM; + add_sta->status = QDF_STATUS_E_NOMEM; goto send_rsp; } @@ -4053,7 +4053,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!peer) { WMA_LOGE("%s: changeSta,failed to find peer handle for mac %pM", __func__, add_sta->staMac); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4069,7 +4069,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), add_sta->smesessionId); - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, add_sta->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, add_sta->staMac, @@ -4087,7 +4087,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) ret = wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { - add_sta->status = CDF_STATUS_E_FAILURE; + add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, peer, false); goto send_rsp; @@ -4117,7 +4117,7 @@ send_rsp: static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) { ol_txrx_pdev_handle pdev; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; ol_txrx_peer_handle peer; struct wma_txrx_node *iface; int8_t maxTxPower; @@ -4157,7 +4157,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (wma->interfaces[params->smesessionId].vdev_up == true) { WMA_LOGE("%s: vdev id %d is already UP for %pM", __func__, params->smesessionId, params->bssId); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } if (peer != NULL && peer->state == ol_txrx_peer_state_disc) { @@ -4208,7 +4208,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (!msg) { WMA_LOGP(FL("Failed to alloc request for vdev_id %d"), params->smesessionId); - params->status = CDF_STATUS_E_FAILURE; + params->status = QDF_STATUS_E_FAILURE; wma_remove_req(wma, params->smesessionId, WMA_PEER_ASSOC_CNF_START); wma_remove_peer(wma, params->staMac, @@ -4224,7 +4224,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) iface->nwType, (tAddStaParams *) iface->addBssStaContext); if (ret) { - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, params->bssId, params->smesessionId, peer, false); goto out; @@ -4289,7 +4289,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) params->assocId, params->bssId) < 0) { WMA_LOGP("%s: Failed to send vdev up cmd: vdev %d bssid %pM", __func__, params->smesessionId, params->bssId); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } else { wma->interfaces[params->smesessionId].vdev_up = true; } @@ -4351,7 +4351,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4359,13 +4359,13 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, if (!peer) { WMA_LOGE("%s: Failed to get peer handle using peer id %d", __func__, del_sta->staIdx); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } wma_remove_peer(wma, peer->mac_addr.raw, del_sta->smesessionId, peer, false); - del_sta->status = CDF_STATUS_SUCCESS; + del_sta->status = QDF_STATUS_SUCCESS; if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { @@ -4378,7 +4378,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, del_sta->smesessionId); wma_remove_req(wma, del_sta->smesessionId, WMA_DELETE_STA_RSP_START); - del_sta->status = CDF_STATUS_E_NOMEM; + del_sta->status = QDF_STATUS_E_NOMEM; goto send_del_rsp; } /* @@ -4419,14 +4419,14 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } vdev = wma_find_vdev_by_id(wma, del_sta->smesessionId); if (!vdev) { WMA_LOGE("%s: Failed to find vdev", __func__); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4434,7 +4434,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (!peer) { WMA_LOGE("%s: Failed to get peer handle using peer id %d", __func__, del_sta->staIdx); - del_sta->status = CDF_STATUS_E_FAILURE; + del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } @@ -4442,7 +4442,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (!peerStateParams) { WMA_LOGE("%s: Failed to allocate memory for peerStateParams for: %pM", __func__, del_sta->staMac); - del_sta->status = CDF_STATUS_E_NOMEM; + del_sta->status = QDF_STATUS_E_NOMEM; goto send_del_rsp; } @@ -4459,7 +4459,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) wma_update_tdls_peer_state(wma, peerStateParams); - del_sta->status = CDF_STATUS_SUCCESS; + del_sta->status = QDF_STATUS_SUCCESS; send_del_rsp: if (del_sta->respReqd) { @@ -4480,7 +4480,7 @@ send_del_rsp: static void wma_delete_sta_req_sta_mode(tp_wma_handle wma, tpDeleteStaParams params) { - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; struct wma_txrx_node *iface; iface = &wma->interfaces[params->smesessionId]; iface->uapsd_cached_val = 0; @@ -4635,7 +4635,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) ol_txrx_pdev_handle pdev; ol_txrx_peer_handle peer = NULL; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t peer_id; uint8_t max_wait_iterations = 0; ol_txrx_vdev_handle txrx_vdev = NULL; @@ -4658,7 +4658,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) if (!peer) { WMA_LOGP("%s: Failed to find peer %pM", __func__, params->bssid); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -4668,7 +4668,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) txrx_vdev = wma_find_vdev_by_id(wma, params->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto out; } @@ -4699,7 +4699,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) if (!msg) { WMA_LOGP("%s: Failed to fill vdev request for vdev_id %d", __func__, params->smesessionId); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto detach_peer; } @@ -4733,7 +4733,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) WMA_LOGP("%s: %d Failed to send vdev stop", __func__, __LINE__); wma_remove_vdev_req(wma, params->smesessionId, WMA_TARGET_REQ_TYPE_VDEV_STOP); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto detach_peer; } WMA_LOGD("%s: bssid %pM vdev_id %d", diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index f767b9e26cb9..dee39dd17aa4 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -112,7 +112,7 @@ static const uint8_t discvr_mask[] = {0xf0, 0x00, 0x00, 0xf8}; static int wma_post_auto_shutdown_msg(void) { tSirAutoShutdownEvtParams *auto_sh_evt; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; auto_sh_evt = (tSirAutoShutdownEvtParams *) @@ -128,8 +128,8 @@ static int wma_post_auto_shutdown_msg(void) sme_msg.bodyptr = auto_sh_evt; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME"); cdf_mem_free(auto_sh_evt); return -EINVAL; @@ -145,7 +145,7 @@ static int wma_post_auto_shutdown_msg(void) * * Return: CDF status */ -CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, +QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq) { wmi_buf_t buf; @@ -155,7 +155,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, /* command is in progess */ if (NULL != wma_handle->pGetRssiReq) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* create a copy of csrRssiCallback to send rssi value * after wmi event @@ -165,7 +165,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, if (!pRssiBkUp) { WMA_LOGE("Failed to allocate memory for tAniGetRssiReq"); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(pRssiBkUp, sizeof(tAniGetRssiReq), 0); pRssiBkUp->sessionId = @@ -182,7 +182,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); @@ -197,9 +197,9 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, wmi_buf_free(buf); cdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -208,7 +208,7 @@ CDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) +QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) { wmi_buf_t buf; wmi_request_stats_cmd_fixed_param *cmd; @@ -221,20 +221,20 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) if (NULL == wma_handle) { WMA_LOGE("%s : Failed to get wma_handle", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } intr = &wma_handle->interfaces[psnr_req->sessionId]; /* command is in progess */ if (NULL != intr->psnr_req) { WMA_LOGE("%s : previous snr request is pending", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } psnr_req_bkp = cdf_mem_malloc(sizeof(tAniGetSnrReq)); if (!psnr_req_bkp) { WMA_LOGE("Failed to allocate memory for tAniGetSnrReq"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cdf_mem_set(psnr_req_bkp, sizeof(tAniGetSnrReq), 0); @@ -245,7 +245,7 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(psnr_req_bkp); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); @@ -263,10 +263,10 @@ CDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) wmi_buf_free(buf); cdf_mem_free(psnr_req_bkp); intr->psnr_req = NULL; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -329,10 +329,10 @@ end: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req, bool by_user) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBEnableStruct *ts_lphb_enable; wmi_buf_t buf = NULL; @@ -343,7 +343,7 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_enable = &(lphb_conf_req->params.lphbEnableReq); @@ -355,13 +355,13 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if ((ts_lphb_enable->item != 1) && (ts_lphb_enable->item != 2)) { WMA_LOGE("%s : LPHB configuration wrong item %d", __func__, ts_lphb_enable->item); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -382,7 +382,7 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_ENABLE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -409,9 +409,9 @@ CDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, } } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -421,10 +421,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpParamStruct *ts_lphb_tcp_param; wmi_buf_t buf = NULL; @@ -434,7 +434,7 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_tcp_param = &(lphb_conf_req->params.lphbTcpParamReq); @@ -451,7 +451,7 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -479,13 +479,13 @@ CDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PARAMS returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -495,10 +495,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpFilterStruct *ts_lphb_tcp_filter; wmi_buf_t buf = NULL; @@ -508,7 +508,7 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_tcp_filter = &(lphb_conf_req->params.lphbTcpFilterReq); @@ -523,7 +523,7 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -548,13 +548,13 @@ CDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PKT_FILTER returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -564,10 +564,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpParamStruct *ts_lphb_udp_param; wmi_buf_t buf = NULL; @@ -577,7 +577,7 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_udp_param = &(lphb_conf_req->params.lphbUdpParamReq); @@ -593,7 +593,7 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -620,13 +620,13 @@ CDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PARAMS returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -636,10 +636,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpFilterStruct *ts_lphb_udp_filter; wmi_buf_t buf = NULL; @@ -649,7 +649,7 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ts_lphb_udp_filter = &(lphb_conf_req->params.lphbUdpFilterReq); @@ -664,7 +664,7 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -689,13 +689,13 @@ CDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PKT_FILTER returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } /** @@ -705,41 +705,41 @@ error: * * Return: CDF status */ -CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s : LPHB configuration cmd id is %d", __func__, lphb_conf_req->cmd); switch (lphb_conf_req->cmd) { case LPHB_SET_EN_PARAMS_INDID: - cdf_status = wma_lphb_conf_hbenable(wma_handle, + qdf_status = wma_lphb_conf_hbenable(wma_handle, lphb_conf_req, true); break; case LPHB_SET_TCP_PARAMS_INDID: - cdf_status = wma_lphb_conf_tcp_params(wma_handle, + qdf_status = wma_lphb_conf_tcp_params(wma_handle, lphb_conf_req); break; case LPHB_SET_TCP_PKT_FILTER_INDID: - cdf_status = wma_lphb_conf_tcp_pkt_filter(wma_handle, + qdf_status = wma_lphb_conf_tcp_pkt_filter(wma_handle, lphb_conf_req); break; case LPHB_SET_UDP_PARAMS_INDID: - cdf_status = wma_lphb_conf_udp_params(wma_handle, + qdf_status = wma_lphb_conf_udp_params(wma_handle, lphb_conf_req); break; case LPHB_SET_UDP_PKT_FILTER_INDID: - cdf_status = wma_lphb_conf_udp_pkt_filter(wma_handle, + qdf_status = wma_lphb_conf_udp_pkt_filter(wma_handle, lphb_conf_req); break; @@ -749,7 +749,7 @@ CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, } cdf_mem_free(lphb_conf_req); - return cdf_status; + return qdf_status; } #endif /* FEATURE_WLAN_LPHB */ @@ -760,7 +760,7 @@ CDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, * * Return: CDF Status */ -CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, +QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind) { uint8_t vdev_id; @@ -772,7 +772,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, if (!ta_dhcp_ind) { WMA_LOGE("%s : DHCP indication is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_find_vdev_by_addr(wma_handle, @@ -780,7 +780,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for DHCP indication", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_PEER_SET_PARAM triggered by DHCP, " @@ -795,7 +795,7 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -820,10 +820,10 @@ CDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" " returned Error %d", __func__, status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -924,7 +924,7 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, * * Return: CDF status */ -CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) +QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) { tp_wma_handle wma_handle = (tp_wma_handle) handle; wmi_peer_get_estimated_linkspeed_cmd_fixed_param *cmd; @@ -935,20 +935,20 @@ CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue get link speed cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_ESTIMATE_LINKSPEED)) { WMA_LOGE("%s: Linkspeed feature bit not enabled" " Sending value 0 as link speed.", __func__); wma_send_link_speed(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(wmi_peer_get_estimated_linkspeed_cmd_fixed_param); wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -972,9 +972,9 @@ CDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID)) { WMA_LOGE("%s: failed to send link speed command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_GREEN_AP @@ -1022,7 +1022,7 @@ static int wma_egap_info_status_event(void *handle, u_int8_t *event, * * Return: 0 for success, otherwise appropriate error code */ -CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, +QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -1033,7 +1033,7 @@ CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); if (!buf) { WMA_LOGE("Failed to allocate buffer to send ap_ps_egap cmd"); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_ap_ps_egap_param_cmd_fixed_param *) wmi_buf_data(buf); WMITLV_SET_HDR(&cmd->tlv_header, @@ -1050,9 +1050,9 @@ CDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, if (err) { WMA_LOGE("Failed to send ap_ps_egap cmd"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1281,7 +1281,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) { wmi_hb_ind_event_fixed_param *hb_fp; tSirLPHBInd *slphb_indication; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; hb_fp = (wmi_hb_ind_event_fixed_param *) event; @@ -1308,8 +1308,8 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) sme_msg.bodyptr = slphb_indication; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME"); cdf_mem_free(slphb_indication); return -EINVAL; @@ -1327,7 +1327,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) * * Return: CDF status */ -static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) { WMI_WOW_ADD_PATTERN_CMD_fixed_param *cmd; @@ -1354,7 +1354,7 @@ static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -1404,10 +1404,10 @@ static CDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) WMA_LOGE("%s: Failed to send RA rate limit to fw", __func__); wmi_buf_free(buf); iface->num_wow_default_patterns--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_RA_FILTERING */ @@ -1500,7 +1500,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, WMI_NAN_EVENTID_param_tlvs *param_buf; tSirNanEvent *nan_rsp_event; wmi_nan_event_hdr *nan_rsp_event_hdr; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t *buf_ptr; uint32_t alloc_len; @@ -1542,7 +1542,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post NaN response event to SME", __func__); cdf_mem_free(nan_rsp_event); @@ -2500,7 +2500,7 @@ wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle) * * Return: CDF status */ -CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, +QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -2514,7 +2514,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, /*Check if packet log is enabled in cfg.ini */ if (!cds_is_packet_log_enabled()) { WMA_LOGE("%s:pkt log is not enabled in cfg.ini", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } PKTLOG_EVENT = params->pktlog_event; @@ -2526,7 +2526,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_pdev_pktlog_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -2546,7 +2546,7 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } disable_cmd = (wmi_pdev_pktlog_disable_cmd_fixed_param *) wmi_buf_data(buf); @@ -2566,18 +2566,18 @@ CDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, break; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; wmi_send_failed: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* REMOVE_PKT_LOG */ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) { tSirReadyToSuspendInd *ready_to_suspend; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t len; @@ -2600,7 +2600,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); cdf_mem_free(ready_to_suspend); } @@ -3116,7 +3116,7 @@ static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val) * * Return: CDF status */ -static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, +static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, uint32_t vdev_id, uint32_t bitmap, bool enable) @@ -3130,7 +3130,7 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_DEL_EVT_CMD_fixed_param *) wmi_buf_data(buf); WMITLV_SET_HDR(&cmd->tlv_header, @@ -3146,13 +3146,13 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, if (ret) { WMA_LOGE("Failed to config wow wakeup event"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Wakeup pattern 0x%x %s in fw", bitmap, enable ? "enabled" : "disabled"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3169,7 +3169,7 @@ static CDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, * * Return: CDF status */ -static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, +static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, uint8_t vdev_id, uint8_t ptrn_id, const uint8_t *ptrn, uint8_t ptrn_len, uint8_t ptrn_offset, const uint8_t *mask, @@ -3200,7 +3200,7 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -3289,13 +3289,13 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, wmi_buf_free(buf); if (!user) iface->num_wow_default_patterns--; - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (user) iface->num_wow_user_patterns++; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3307,9 +3307,9 @@ static CDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, * * Return: CDF status */ -static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) { - CDF_STATUS ret; + QDF_STATUS ret; uint8_t arp_offset = 20; uint8_t mac_mask[IEEE80211_ADDR_LEN]; @@ -3319,7 +3319,7 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, IEEE80211_ADDR_LEN, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW unicast pattern ret %d", ret); return ret; } @@ -3330,7 +3330,7 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) */ ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, arp_ptrn, 0, arp_offset, arp_mask, 0, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW ARP pattern ret %d", ret); return ret; } @@ -3347,12 +3347,12 @@ static CDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) * * Return: CDF status */ -static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) +static QDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) { uint8_t arp_offset = 12; uint8_t discvr_offset = 30; uint8_t mac_mask[IEEE80211_ADDR_LEN]; - CDF_STATUS ret = CDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; /* Setup unicast pkt pattern */ cdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); @@ -3360,7 +3360,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, IEEE80211_ADDR_LEN, false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW unicast pattern ret %d", ret); return ret; } @@ -3373,7 +3373,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, discvr_ptrn, sizeof(discvr_ptrn), discvr_offset, discvr_mask, sizeof(discvr_ptrn), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW mDNS/SSDP/LLMNR pattern"); return ret; } @@ -3389,7 +3389,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, arp_ptrn, sizeof(arp_ptrn), arp_offset, arp_mask, sizeof(arp_mask), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW ARP pattern"); return ret; } @@ -3401,7 +3401,7 @@ static CDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, ns_ptrn, sizeof(arp_ptrn), arp_offset, arp_mask, sizeof(arp_mask), false); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to add WOW NS pattern"); return ret; } @@ -3534,7 +3534,7 @@ void wma_enable_disable_wakeup_event(WMA_HANDLE handle, * * Return: CDF status */ -CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) +QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) { tp_wma_handle wma = handle; wmi_wow_enable_cmd_fixed_param *cmd; @@ -3549,7 +3549,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* CONFIG_CNSS */ @@ -3558,7 +3558,7 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_wow_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -3625,13 +3625,13 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) } wmi_set_target_suspend(wma->wmi_handle, false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wma->wow_nack) { WMA_LOGE("FW not ready to WOW"); wmi_set_target_suspend(wma->wmi_handle, false); - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } host_credits = wmi_get_host_credits(wma->wmi_handle); @@ -3657,18 +3657,18 @@ CDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } htc_cancel_deferred_target_sleep(scn); wma->wow.wow_enable_cmd_sent = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -3678,13 +3678,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) { if (type == CDF_SYSTEM_SUSPEND) { wma->no_of_resume_ind++; if (wma->no_of_resume_ind < wma_get_vdev_count(wma)) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; wma->no_of_resume_ind = 0; } @@ -3698,7 +3698,7 @@ CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) wmi_set_runtime_pm_inprogress(wma->wmi_handle, false); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3710,7 +3710,7 @@ CDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) * * Return: CDF status */ -static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, +static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, uint8_t vdev_id, bool user) { WMI_WOW_DEL_PATTERN_CMD_fixed_param *cmd; @@ -3726,7 +3726,7 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (WMI_WOW_DEL_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); @@ -3747,13 +3747,13 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, if (ret) { WMA_LOGE("%s: Failed to delete wow ptrn from fw", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (user) iface->num_wow_user_patterns--; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3770,17 +3770,17 @@ static CDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, * * Return: CDF status */ -CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) +QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) { uint8_t id; uint8_t bit_to_check, pos; struct wma_txrx_node *iface; - CDF_STATUS ret = CDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; uint8_t new_mask[SIR_WOWL_BCAST_PATTERN_MAX_SIZE]; if (ptrn->session_id > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", ptrn->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[ptrn->session_id]; @@ -3824,7 +3824,7 @@ CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) ptrn->pattern, ptrn->pattern_size, ptrn->pattern_byte_offset, new_mask, ptrn->pattern_size, true); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to add wow pattern %d", ptrn->pattern_id); return ret; @@ -3842,21 +3842,21 @@ CDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) * * Return: CDF status */ -CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, +QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, struct wow_delete_pattern *pattern) { struct wma_txrx_node *iface; if (pattern->session_id > wma->max_bssid) { WMA_LOGE("Invalid vdev id %d", pattern->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[pattern->session_id]; if (iface->num_wow_user_patterns <= 0) { WMA_LOGE("No valid user pattern. Num user pattern %u vdev %d", iface->num_wow_user_patterns, pattern->session_id); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } WMA_LOGI("Delete user passed wow pattern id %d total user pattern %d", @@ -3869,7 +3869,7 @@ CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, if (!iface->num_wow_user_patterns) wma_register_wow_default_patterns(wma, pattern->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3882,7 +3882,7 @@ CDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) +QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) { struct wma_txrx_node *iface; @@ -3891,7 +3891,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); cdf_mem_free(info); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[info->sessionId]; @@ -3904,7 +3904,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) cdf_mem_free(info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3914,7 +3914,7 @@ CDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) * * Return: CDF status */ -CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) +QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) { struct wma_txrx_node *iface; @@ -3923,7 +3923,7 @@ CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); cdf_mem_free(info); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[info->sessionId]; @@ -3931,7 +3931,7 @@ CDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) wma->wow.magic_ptrn_enable = false; cdf_mem_free(info); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4214,7 +4214,7 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) { if (type == CDF_RUNTIME_SUSPEND) wmi_set_runtime_pm_inprogress(wma->wmi_handle, true); @@ -4239,7 +4239,7 @@ CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) */ wma_set_wow_bus_suspend(wma, 1); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4251,11 +4251,10 @@ CDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) * * Return: CDF status */ -static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) +static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) { wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *cmd; wmi_buf_t buf; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int32_t len; int ret; @@ -4263,7 +4262,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } #endif /* CONFIG_CNSS */ @@ -4272,7 +4271,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *) @@ -4289,7 +4288,7 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) if (ret) { WMA_LOGE("Failed to send host wakeup indication to fw"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Host wakeup indication sent to fw"); @@ -4320,10 +4319,10 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) WMA_LOGD("Host wakeup received"); } - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) wmi_set_target_suspend(wma->wmi_handle, false); - return cdf_status; + return qdf_status; } /** @@ -4332,17 +4331,17 @@ static CDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) * * Return: 0 for success or error code */ -CDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle) +QDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle) { tp_wma_handle wma = handle; - CDF_STATUS ret; + QDF_STATUS ret; if (!wma->wow.wow_enable || !wma->wow.wow_enable_cmd_sent) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; ret = wma_send_host_wakeup_ind_to_fw(wma); - if (ret != CDF_STATUS_SUCCESS) + if (ret != QDF_STATUS_SUCCESS) return ret; wma->wow.wow_enable = false; @@ -4500,7 +4499,7 @@ void wma_aggr_qos_req(tp_wma_handle wma, * apart from sending ADDTS to firmware just send * success to upper layers */ - pAggrQosRspMsg->status[i] = CDF_STATUS_SUCCESS; + pAggrQosRspMsg->status[i] = QDF_STATUS_SUCCESS; buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { @@ -4529,7 +4528,7 @@ void wma_aggr_qos_req(tp_wma_handle wma, WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); pAggrQosRspMsg->status[i] = - CDF_STATUS_E_FAILURE; + QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } } @@ -4570,7 +4569,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) ol_tx_set_compute_interval(pdev, intervalMiliseconds); #endif /* FEATURE_WLAN_ESE */ - msg->status = CDF_STATUS_SUCCESS; + msg->status = QDF_STATUS_SUCCESS; buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { @@ -4592,7 +4591,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_VDEV_WMM_ADDTS_CMDID)) { WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); - msg->status = CDF_STATUS_E_FAILURE; + msg->status = QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -4804,7 +4803,7 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, +QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg) { uint8_t counter; @@ -4829,7 +4828,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); cdf_mem_free(pTsmStatsMsg); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* get required values from data path APIs */ @@ -4845,7 +4844,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, "%s: CDF MEM Alloc Failure", __func__); CDF_ASSERT(0); cdf_mem_free(pTsmStatsMsg); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } pTsmRspParams->staId = pStats->staId; pTsmRspParams->rc = eSIR_FAILURE; @@ -4871,7 +4870,7 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, #ifdef FEATURE_WLAN_ESE_UPLOAD wma_send_msg(wma_handler, WMA_TSM_STATS_RSP, (void *)pTsmRspParams, 0); #endif /* FEATURE_WLAN_ESE_UPLOAD */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_ESE */ @@ -4932,7 +4931,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, * * Return: CDF status */ -CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, tSirRcvFltMcAddrList *mcbc_param) { uint8_t vdev_id = 0; @@ -4940,14 +4939,14 @@ CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, if (mcbc_param->ulMulticastAddrCnt <= 0) { WMA_LOGW("Number of multicast addresses is 0"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_find_vdev_by_addr(wma_handle, mcbc_param->self_macaddr.bytes, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, mcbc_param->bssid.bytes); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* set mcbc_param->action to clear MCList and reset * to configure the MCList in FW @@ -4958,7 +4957,7 @@ CDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, mcbc_param->multicastAddr[i], (mcbc_param->action == 0)); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_GTK_OFFLOAD @@ -5011,7 +5010,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, cdf_mem_zero(resp, sizeof(*resp)); resp->mesgType = eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP; resp->mesgLen = sizeof(*resp); - resp->ulStatus = CDF_STATUS_SUCCESS; + resp->ulStatus = QDF_STATUS_SUCCESS; resp->ulTotalRekeyCount = status->refresh_cnt; /* TODO: Is the total rekey count and GTK rekey count same? */ resp->ulGTKRekeyCount = status->refresh_cnt; @@ -5031,7 +5030,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, cds_msg.bodyval = 0; if (cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg) - != CDF_STATUS_SUCCESS) { + != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post GTK response to SME"); cdf_mem_free(resp); return -EINVAL; @@ -5063,13 +5062,13 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, * * Return: CDF status */ -static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, +static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, tpSirGtkOffloadParams params) { int len; wmi_buf_t buf; WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); @@ -5079,7 +5078,7 @@ static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -5111,7 +5110,7 @@ static CDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, WMI_GTK_OFFLOAD_CMDID)) { WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID"); wmi_buf_free(buf); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } WMA_LOGD("VDEVID: %d, GTK_FLAGS: x%x", vdev_id, cmd->flags); @@ -5127,18 +5126,18 @@ out: * * Return: CDF status */ -CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, tpSirGtkOffloadParams params) { uint8_t vdev_id; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); /* Get the vdev id */ if (!wma_find_vdev_by_bssid(wma, params->bssid.bytes, &vdev_id)) { WMA_LOGE("vdev handle is invalid for %pM", params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5146,7 +5145,7 @@ CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, if (vdev_id >= wma->max_bssid) { WMA_LOGE("invalid vdev_id %d for %pM", vdev_id, params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5156,7 +5155,7 @@ CDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, "vdev_id %d", __func__, vdev_id); params->ulFlags = GTK_OFFLOAD_DISABLE; status = wma_send_gtk_offload_req(wma, vdev_id, params); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s Failed to disable GTK Offload", __func__); goto out; } @@ -5178,21 +5177,21 @@ out: * * Return: CDF status */ -CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, +QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params) { uint8_t vdev_id; int len; wmi_buf_t buf; WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); /* Get the vdev id */ if (!wma_find_vdev_by_bssid(wma, params->bssid.bytes, &vdev_id)) { WMA_LOGE("vdev handle is invalid for %pM", params->bssid.bytes); - status = CDF_STATUS_E_INVAL; + status = QDF_STATUS_E_INVAL; goto out; } @@ -5202,7 +5201,7 @@ CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto out; } @@ -5221,7 +5220,7 @@ CDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, WMI_GTK_OFFLOAD_CMDID)) { WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID for req info"); wmi_buf_free(buf); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; } out: cdf_mem_free(params); @@ -5241,7 +5240,7 @@ out: * * Return: CDF Status */ -CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, +QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq pHostOffloadParams, bool bArpOnly) { @@ -5262,13 +5261,13 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, WMA_LOGE("vdev handle is invalid for %pM", pHostOffloadParams->bssid.bytes); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!wma->interfaces[vdev_id].vdev_up) { WMA_LOGE("vdev %d is not up skipping arp/ns offload", vdev_id); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!bArpOnly) @@ -5297,7 +5296,7 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (A_UINT8 *) wmi_buf_data(buf); @@ -5440,11 +5439,11 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, WMA_LOGE("Failed to enable ARP NDP/NSffload"); wmi_buf_free(buf); cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cdf_mem_free(pHostOffloadParams); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5454,7 +5453,7 @@ CDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, * * Retrun: CDF status */ -CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * pAddPeriodicTxPtrnParams) { @@ -5470,7 +5469,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue fw add pattern cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ptrn_len = pAddPeriodicTxPtrnParams->ucPtrnSize; ptrn_len_aligned = roundup(ptrn_len, sizeof(uint32_t)); @@ -5480,7 +5479,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!wma_find_vdev_by_addr(wma_handle, pAddPeriodicTxPtrnParams->mac_address.bytes, @@ -5488,7 +5487,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pAddPeriodicTxPtrnParams->mac_address.bytes); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5520,9 +5519,9 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: failed to add pattern set state command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5532,7 +5531,7 @@ CDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, * * Retrun: CDF status */ -CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, +QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirDelPeriodicTxPtrn * pDelPeriodicTxPtrnParams) { @@ -5546,12 +5545,12 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue Del Pattern cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } if (!wma_find_vdev_by_addr(wma_handle, pDelPeriodicTxPtrnParams->mac_address.bytes, @@ -5559,7 +5558,7 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pDelPeriodicTxPtrnParams->mac_address.bytes); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } cmd = (WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *) wmi_buf_data(wmi_buf); @@ -5578,9 +5577,9 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { WMA_LOGE("%s: failed to send del pattern command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef WLAN_FEATURE_STATS_EXT @@ -5591,7 +5590,7 @@ CDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, * * Return: CDF status */ -CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) +QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) { int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; @@ -5651,7 +5650,7 @@ CDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) { tSirReadyToExtWoWInd *ready_to_extwow; - CDF_STATUS vstatus; + QDF_STATUS vstatus; cds_msg_t cds_msg; uint8_t len; @@ -5674,7 +5673,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) cds_msg.bodyval = 0; vstatus = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (vstatus != CDF_STATUS_SUCCESS) { + if (vstatus != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); cdf_mem_free(ready_to_extwow); } @@ -5698,7 +5697,7 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_enable_cmd_fixed_param *) wmi_buf_data(buf); @@ -5721,11 +5720,11 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) WMA_LOGE("%s: Failed to set EXTWOW Enable", __func__); wmi_buf_free(buf); wma_send_status_of_ext_wow(wma, false); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_send_status_of_ext_wow(wma, true); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -5748,7 +5747,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_set_app_type1_params_cmd_fixed_param *) @@ -5778,10 +5777,10 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to set APP TYPE1 PARAMS", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5803,7 +5802,7 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_extwow_set_app_type2_params_cmd_fixed_param *) @@ -5858,10 +5857,10 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to set APP TYPE2 PARAMS", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_EXTWOW_SUPPORT */ @@ -5910,7 +5909,7 @@ int wma_auto_shutdown_event_handler(void *handle, uint8_t *event, * * Return: CDF status */ -CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, +QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * auto_sh_cmd) { @@ -5922,7 +5921,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, if (auto_sh_cmd == NULL) { WMA_LOGE("%s : Invalid Autoshutdown cfg cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("%s: Set WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID:TIMER_VAL=%d", @@ -5931,7 +5930,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -5950,10 +5949,10 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, WMA_LOGE("%s: WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID Err %d", __func__, status); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ @@ -5965,7 +5964,7 @@ CDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) +QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) { int ret; tp_wma_handle wma_handle = (tp_wma_handle) wma_ptr; @@ -5983,7 +5982,7 @@ CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) */ if (!nan_req) { WMA_LOGE("%s:nan req is not valid", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } nan_data_len = nan_req->request_data_len; nan_data_len_aligned = roundup(nan_req->request_data_len, @@ -5992,7 +5991,7 @@ CDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_nan_cmd_param *) buf_ptr; @@ -6075,7 +6074,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, +QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing) { wmi_set_led_flashing_cmd_fixed_param *cmd; @@ -6086,11 +6085,11 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE(FL("WMA is closed, can not issue cmd")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!flashing) { WMA_LOGE(FL("invalid parameter: flashing")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } buf = wmi_buf_alloc(wma_handle->wmi_handle, len); @@ -6113,9 +6112,9 @@ CDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" " returned Error %d", __func__, status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* WLAN_FEATURE_GPIO_LED_FLASHING */ @@ -6135,7 +6134,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, wmi_avoid_freq_range_desc *afr_desc; uint32_t num_freq_ranges, freq_range_idx; tSirChAvoidIndType *sca_indication; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; cds_msg_t sme_msg = { 0 }; WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *param_buf = (WMI_WLAN_FREQ_AVOID_EVENTID_param_tlvs *) event; @@ -6192,8 +6191,8 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = sca_indication; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME"); cdf_mem_free(sca_indication); return -EINVAL; @@ -6209,7 +6208,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, * * Return: CDF status */ -CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * ch_avoid_update_req) { @@ -6221,7 +6220,7 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, if (ch_avoid_update_req == NULL) { WMA_LOGE("%s : ch_avoid_update_req is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE", __func__); @@ -6229,7 +6228,7 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -6246,12 +6245,12 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, " WMITLV_TABLE_WMI_CHAN_AVOID_UPDATE" " returned Error %d", status); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE sent through WMI", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_CH_AVOID */ @@ -6262,13 +6261,13 @@ CDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId) +QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId) { - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_set_reg_domain(clientCtxt, regId)) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6344,7 +6343,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, * * Return: cdf status of the mq post */ -static CDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) +static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) { cds_msg_t resume_msg; @@ -6360,21 +6359,21 @@ static CDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) * Requests for offloads to be configured for runtime suspend * on the MC thread * - * Return CDF_STATUS_E_AGAIN in case of timeout or CDF_STATUS_SUCCESS + * Return QDF_STATUS_E_AGAIN in case of timeout or QDF_STATUS_SUCCESS */ -static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) +static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) { cds_msg_t cds_msg; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tp_wma_handle wma = (tp_wma_handle) handle; qdf_event_reset(&wma->runtime_suspend); cds_msg.bodyptr = NULL; cds_msg.type = WMA_RUNTIME_PM_SUSPEND_IND; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); + qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) goto failure; if (qdf_wait_single_event(&wma->runtime_suspend, @@ -6384,10 +6383,10 @@ static CDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) goto failure; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; failure: - return CDF_STATUS_E_AGAIN; + return QDF_STATUS_E_AGAIN; } /** @@ -6413,9 +6412,9 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) } if (type == CDF_RUNTIME_SUSPEND) { - CDF_STATUS status = wma_post_runtime_suspend_msg(handle); + QDF_STATUS status = wma_post_runtime_suspend_msg(handle); if (status) - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } if (type == CDF_SYSTEM_SUSPEND) @@ -6423,8 +6422,8 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) wma_is_wow_mode_selected(handle)); if (wma_is_wow_mode_selected(handle)) { - CDF_STATUS status = wma_enable_wow_in_fw(handle); - return cdf_status_to_os_return(status); + QDF_STATUS status = wma_enable_wow_in_fw(handle); + return qdf_status_to_os_return(status); } return wma_suspend_target(handle, 0); @@ -6471,7 +6470,7 @@ int wma_bus_suspend(void) int __wma_bus_resume(WMA_HANDLE handle) { bool wow_mode = wma_is_wow_mode_selected(handle); - CDF_STATUS status; + QDF_STATUS status; WMA_LOGE("%s: wow mode %d", __func__, wow_mode); @@ -6479,7 +6478,7 @@ int __wma_bus_resume(WMA_HANDLE handle) return wma_resume_target(handle); status = wma_disable_wow_in_fw(handle); - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } /** @@ -6490,7 +6489,7 @@ int __wma_bus_resume(WMA_HANDLE handle) int wma_runtime_resume(void) { int ret; - CDF_STATUS status; + QDF_STATUS status; WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); @@ -6502,7 +6501,7 @@ int wma_runtime_resume(void) return ret; status = wma_post_runtime_resume_msg(handle); - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); } /** @@ -6652,7 +6651,6 @@ int wma_resume_target(WMA_HANDLE handle) tp_wma_handle wma = (tp_wma_handle) handle; wmi_buf_t wmibuf; wmi_pdev_resume_cmd_fixed_param *cmd; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); @@ -6706,7 +6704,7 @@ int wma_resume_target(WMA_HANDLE handle) WMA_LOGD("Host wakeup received"); } - if (CDF_STATUS_SUCCESS == cdf_status) + if (QDF_STATUS_SUCCESS == qdf_status) wmi_set_target_suspend(wma->wmi_handle, false); return ret; @@ -7686,10 +7684,10 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, * * This function sends memory dump request to firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, +QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, struct fw_dump_req *mem_dump_req) { wmi_get_fw_mem_dump_fixed_param *cmd; @@ -7702,7 +7700,7 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (!mem_dump_req || !wma) { WMA_LOGE(FL("input pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -7716,7 +7714,7 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (!buf) { WMA_LOGE(FL("Failed allocate wmi buffer")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (u_int8_t *) wmi_buf_data(buf); @@ -7769,11 +7767,11 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, if (ret) { WMA_LOGE(FL("Failed to send get firmware mem dump request")); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI(FL("Get firmware mem dump request sent successfully")); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -7785,20 +7783,20 @@ CDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, * This function is called by the memory dump response handler to * indicate SME that firmware dump copy is complete * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -static CDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) +static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) { struct fw_dump_rsp *dump_rsp; cds_msg_t sme_msg = {0}; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; dump_rsp = cdf_mem_malloc(sizeof(*dump_rsp)); if (!dump_rsp) { WMA_LOGE(FL("Memory allocation failed.")); - cdf_status = CDF_STATUS_E_NOMEM; - return cdf_status; + qdf_status = QDF_STATUS_E_NOMEM; + return qdf_status; } WMA_LOGI(FL("FW memory dump copy complete status: %d for request: %d"), @@ -7811,13 +7809,13 @@ static CDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) sme_msg.bodyptr = dump_rsp; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post fw mem dump ind msg")); cdf_mem_free(dump_rsp); } - return cdf_status; + return qdf_status; } /** @@ -7836,7 +7834,7 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, { WMI_UPDATE_FW_MEM_DUMP_EVENTID_param_tlvs *param_buf; wmi_update_fw_mem_dump_fixed_param *event; - CDF_STATUS status; + QDF_STATUS status; param_buf = (WMI_UPDATE_FW_MEM_DUMP_EVENTID_param_tlvs *) cmd_param_info; @@ -7849,7 +7847,7 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, status = wma_fw_mem_dump_rsp(event->request_id, event->fw_mem_dump_complete); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("Error posting FW MEM DUMP RSP."); return -EINVAL; } @@ -7866,10 +7864,10 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, * * This function sends IE information to firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, +QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, struct vdev_ie_info *ie_info) { wmi_vdev_set_ie_cmd_fixed_param *cmd; @@ -7880,13 +7878,13 @@ CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, if (!ie_info || !wma) { WMA_LOGE(FL("input pointer is NULL")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Validate the input */ if (ie_info->length <= 0) { WMA_LOGE(FL("Invalid IE length")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } ie_len_aligned = roundup(ie_info->length, sizeof(uint32_t)); @@ -7896,7 +7894,7 @@ CDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = wmi_buf_data(buf); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 39f263aad9ce..28b98cd25228 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -521,7 +521,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, msg.reserved = 0; msg.bodyptr = iwcmd; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg", __func__); @@ -1503,7 +1503,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, cds_msg.bodyptr = params_buf; cds_msg.bodyval = 0; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_WMA, &cds_msg)) { WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg", __func__); @@ -1586,7 +1586,7 @@ static void wma_init_max_no_of_peers(tp_wma_handle wma_handle, * * Return: 0 on success, errno on failure */ -CDF_STATUS wma_open(void *cds_context, +QDF_STATUS wma_open(void *cds_context, wma_tgt_cfg_cb tgt_cfg_cb, wma_dfs_radar_indication_cb radar_ind_cb, tMacOpenParameters *mac_params) @@ -1595,7 +1595,8 @@ CDF_STATUS wma_open(void *cds_context, HTC_HANDLE htc_handle; cdf_device_t cdf_dev; void *wmi_handle; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; + QDF_STATUS qdf_status; struct txrx_pdev_cfg_param_t olCfg = { 0 }; WMA_LOGD("%s: Enter", __func__); @@ -1605,18 +1606,18 @@ CDF_STATUS wma_open(void *cds_context, if (!htc_handle) { WMA_LOGP("%s: Invalid HTC handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Alloc memory for WMA Context */ - cdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, + qdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, (void **)&wma_handle, sizeof(t_wma_handle)); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Memory allocation failed for wma_handle", __func__); - return cdf_status; + return qdf_status; } cdf_mem_zero(wma_handle, sizeof(t_wma_handle)); @@ -1637,7 +1638,7 @@ CDF_STATUS wma_open(void *cds_context, wma_process_fw_event_handler); if (!wmi_handle) { WMA_LOGP("%s: failed to attach WMI", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_wma_handle; } @@ -1686,7 +1687,7 @@ CDF_STATUS wma_open(void *cds_context, olCfg); if (!(((p_cds_contextType) cds_context)->cfg_ctx)) { WMA_LOGP("%s: failed to init cfg handle", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_wmi_handle; } @@ -1756,7 +1757,7 @@ CDF_STATUS wma_open(void *cds_context, wma_handle->max_bssid); if (!wma_handle->interfaces) { WMA_LOGP("%s: failed to allocate interface table", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto err_scn_context; } cdf_mem_zero(wma_handle->interfaces, sizeof(struct wma_txrx_node) * @@ -1776,59 +1777,59 @@ CDF_STATUS wma_open(void *cds_context, wma_handle->new_hw_mode_index = WMA_DEFAULT_HW_MODE_INDEX; wma_handle->saved_wmi_init_cmd.buf = NULL; - cdf_status = cdf_event_init(&wma_handle->wma_ready_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->wma_ready_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_ready_event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, + qdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, CDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Failed to initialize service ready ext timeout"); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->target_suspend); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->target_suspend); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: target suspend event initialization failed", __func__); goto err_event_init; } /* Init Tx Frame Complete event */ - cdf_status = cdf_event_init(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_event_init(&wma_handle->tx_frm_download_comp_event); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_frm_download_comp_event", __func__); goto err_event_init; } /* Init tx queue empty check event */ - cdf_status = cdf_event_init(&wma_handle->tx_queue_empty_event); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cdf_event_init(&wma_handle->tx_queue_empty_event); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_queue_empty_event", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->wma_resume_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->wma_resume_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_resume_event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->runtime_suspend); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->runtime_suspend); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: runtime_suspend event initialization failed", __func__); goto err_event_init; } - cdf_status = cdf_event_init(&wma_handle->recovery_event); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_event_init(&wma_handle->recovery_event); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: recovery event initialization failed", __func__); goto err_event_init; } @@ -1922,8 +1923,8 @@ CDF_STATUS wma_open(void *cds_context, wma_fw_mem_dump_event_handler); /* Firmware debug log */ - cdf_status = dbglog_init(wma_handle->wmi_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = dbglog_init(wma_handle->wmi_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Firmware Dbglog initialization failed", __func__); goto err_dbglog_init; } @@ -2006,7 +2007,7 @@ CDF_STATUS wma_open(void *cds_context, wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_DELETE_RESP_EVENTID, wma_peer_delete_handler); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; err_dbglog_init: cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); @@ -2041,7 +2042,7 @@ err_wma_handle: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2050,9 +2051,9 @@ err_wma_handle: * * Return: 0 on success, errno on failure */ -CDF_STATUS wma_pre_start(void *cds_ctx) +QDF_STATUS wma_pre_start(void *cds_ctx) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; A_STATUS status = A_OK; tp_wma_handle wma_handle; cds_msg_t wma_msg = { 0 }; @@ -2064,7 +2065,7 @@ CDF_STATUS wma_pre_start(void *cds_ctx) /* Validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: invalid argument", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } /* Open endpoint for ctrl path - WMI <--> HTC */ @@ -2072,7 +2073,7 @@ CDF_STATUS wma_pre_start(void *cds_ctx) wma_handle->htc_handle); if (A_OK != status) { WMA_LOGP("%s: wmi_unified_connect_htc_service", __func__); - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; goto end; } @@ -2083,15 +2084,15 @@ CDF_STATUS wma_pre_start(void *cds_ctx) wma_msg.bodyptr = NULL; wma_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg); - if (CDF_STATUS_SUCCESS != cdf_status) { + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg); + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Failed to post WNI_CFG_DNLD_REQ msg", __func__); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2107,13 +2108,13 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, void *body_ptr, uint32_t body_val) { tSirMsgQ msg = { 0 }; - uint32_t status = CDF_STATUS_SUCCESS; + uint32_t status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); msg.type = msg_type; msg.bodyval = body_val; msg.bodyptr = body_ptr; status = lim_post_msg_api(pMac, &msg); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { if (NULL != body_ptr) cdf_mem_free(body_ptr); CDF_ASSERT(0); @@ -2294,7 +2295,7 @@ static int wma_flush_complete_evt_handler(void *handle, u_int8_t *event, u_int32_t len) { - CDF_STATUS status; + QDF_STATUS status; tp_wma_handle wma = (tp_wma_handle) handle; WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID_param_tlvs *param_buf; @@ -2304,7 +2305,7 @@ static int wma_flush_complete_evt_handler(void *handle, param_buf = (WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID_param_tlvs *) event; if (!param_buf) { WMA_LOGE("Invalid log flush complete event buffer"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wmi_event = param_buf->fixed_param; @@ -2321,7 +2322,7 @@ static int wma_flush_complete_evt_handler(void *handle, /* Flush event in response to flush command */ WMA_LOGI("Received WMI flush event in response to flush CMD"); status = cdf_mc_timer_stop(&wma->log_completion_timer); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to stop the log completion timeout"); cds_logging_set_fw_flush_complete(); } else if (reason_code && cds_is_log_report_in_progress() == false) { @@ -2331,10 +2332,10 @@ static int wma_flush_complete_evt_handler(void *handle, status = cds_set_log_completion(WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_FIRMWARE, reason_code); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to set log trigger params", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cds_logging_set_fw_flush_complete(); return status; @@ -2345,7 +2346,7 @@ static int wma_flush_complete_evt_handler(void *handle, WMA_LOGI("%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, WLAN_LOG_TYPE_FATAL, WLAN_LOG_INDICATOR_FIRMWARE, reason_code); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } return 0; } @@ -2377,7 +2378,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, /* Since WMA handle itself is NULL, we cannot send fail * response back to LIM here */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } hw_mode_resp = cdf_mem_malloc(sizeof(*hw_mode_resp)); @@ -2386,7 +2387,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, /* Since this memory allocation itself failed, we cannot * send fail response back to LIM here */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_SET_HW_MODE_RESP_EVENTID_param_tlvs *) event; @@ -2440,7 +2441,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) hw_mode_resp, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: WMA_LOGE("%s: Sending fail response to LIM", __func__); @@ -2450,7 +2451,7 @@ fail: wma_send_msg(wma, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) hw_mode_resp, 0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2480,20 +2481,20 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle, if (!wma) { /* This is an async event. So, not sending any event to LIM */ WMA_LOGE("Invalid WMA handle"); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_HW_MODE_TRANSITION_EVENTID_param_tlvs *) event; if (!param_buf) { /* This is an async event. So, not sending any event to LIM */ WMA_LOGE("Invalid WMI_SOC_HW_MODE_TRANSITION_EVENTID event"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } hw_mode_trans_ind = cdf_mem_malloc(sizeof(*hw_mode_trans_ind)); if (!hw_mode_trans_ind) { WMA_LOGI("%s: Memory allocation failed", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } wmi_event = param_buf->fixed_param; @@ -2532,7 +2533,7 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_HW_MODE_TRANS_IND, (void *) hw_mode_trans_ind, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2563,7 +2564,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, /* Since the WMA handle is NULL, we cannot send resp to LIM. * So, returning from here. */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } dual_mac_cfg_resp = cdf_mem_malloc(sizeof(*dual_mac_cfg_resp)); @@ -2572,7 +2573,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, /* Since the mem alloc failed, we cannot send resp to LIM. * So, returning from here. */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param_buf = (WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID_param_tlvs *) @@ -2601,7 +2602,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, wma_send_msg(wma, SIR_HAL_SOC_DUAL_MAC_CFG_RESP, (void *) dual_mac_cfg_resp, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: WMA_LOGE("%s: Sending fail response to LIM", __func__); @@ -2609,7 +2610,7 @@ fail: wma_send_msg(wma, SIR_HAL_SOC_DUAL_MAC_CFG_RESP, (void *) dual_mac_cfg_resp, 0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } @@ -2620,9 +2621,9 @@ fail: * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_start(void *cds_ctx) +QDF_STATUS wma_start(void *cds_ctx) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle; int status; WMA_LOGD("%s: Enter", __func__); @@ -2632,7 +2633,7 @@ CDF_STATUS wma_start(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: Invalid handle", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -2641,7 +2642,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_scan_event_callback); if (0 != status) { WMA_LOGP("%s: Failed to register scan callback", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2650,7 +2651,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_roam_event_callback); if (0 != status) { WMA_LOGP("%s: Failed to register Roam callback", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2660,7 +2661,7 @@ CDF_STATUS wma_start(void *cds_ctx) if (status) { WMA_LOGP("%s: Failed to register wow wakeup host event handler", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2670,7 +2671,7 @@ CDF_STATUS wma_start(void *cds_ctx) if (status) { WMA_LOGP("%s: Failed to register PDEV resume event handler", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2685,7 +2686,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_nlo_match_evt_handler); if (status) { WMA_LOGE("Failed to register nlo match event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2694,7 +2695,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_nlo_scan_cmp_evt_handler); if (status) { WMA_LOGE("Failed to register nlo scan comp event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } } @@ -2715,7 +2716,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_channel_avoid_evt_handler); if (status) { WMA_LOGE("Failed to register channel to avoid event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } #endif /* FEATURE_WLAN_CH_AVOID */ @@ -2726,7 +2727,7 @@ CDF_STATUS wma_start(void *cds_ctx) wma_auto_shutdown_event_handler); if (status) { WMA_LOGE("Failed to register WMI Auto shutdown event handler"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ @@ -2735,18 +2736,18 @@ CDF_STATUS wma_start(void *cds_ctx) wma_thermal_mgmt_evt_handler); if (status) { WMA_LOGE("Failed to register thermal mitigation event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } status = wma_ocb_register_event_handlers(wma_handle); if (status) { WMA_LOGE("Failed to register ocb event handlers"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; #ifdef QCA_WIFI_FTM /* @@ -2757,18 +2758,18 @@ CDF_STATUS wma_start(void *cds_ctx) goto end; #endif /* QCA_WIFI_FTM */ - cdf_status = wma_tx_attach(wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_tx_attach(wma_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to register tx management", __func__); goto end; } /* Initialize log completion timeout */ - cdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, + qdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, CDF_TIMER_TYPE_SW, wma_log_completion_timeout, wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to initialize log completion timeout"); goto end; } @@ -2777,9 +2778,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PDEV_TEMPERATURE_EVENTID, wma_pdev_temperature_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register get_temperature event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2787,9 +2788,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID, wma_flush_complete_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log flush complete event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2797,9 +2798,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_HW_MODE_RESP_EVENTID, wma_soc_set_hw_mode_resp_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register set hw mode resp event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2807,9 +2808,9 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_HW_MODE_TRANSITION_EVENTID, wma_soc_hw_mode_transition_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } @@ -2817,15 +2818,15 @@ CDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID, wma_soc_set_dual_mode_config_resp_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto end; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2836,10 +2837,10 @@ end: * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) +QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) { tp_wma_handle wma_handle; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int i; wma_handle = cds_get_context(CDF_MODULE_ID_WMA); @@ -2848,7 +2849,7 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGP("%s: Invalid handle", __func__); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } #ifdef QCA_WIFI_FTM @@ -2857,7 +2858,7 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) * in FTM mode. So skip the TX mgmt detach. */ if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; goto end; } #endif /* QCA_WIFI_FTM */ @@ -2869,8 +2870,8 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) } /* Destroy the timer for log completion */ - cdf_status = cdf_mc_timer_destroy(&wma_handle->log_completion_timer); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = cdf_mc_timer_destroy(&wma_handle->log_completion_timer); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to destroy the log completion timer"); } @@ -2894,15 +2895,15 @@ CDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) ol_txrx_vdev_flush(wma_handle->interfaces[i].handle); } } - cdf_status = wma_tx_detach(wma_handle); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_tx_detach(wma_handle); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to deregister tx management", __func__); goto end; } end: WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2981,7 +2982,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_wmi_service_close(void *cds_ctx) +QDF_STATUS wma_wmi_service_close(void *cds_ctx) { tp_wma_handle wma_handle; struct beacon_info *bcn; @@ -2994,13 +2995,13 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGE("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* dettach the wmi serice */ @@ -3044,7 +3045,7 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) cdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); WMA_LOGD("%s: Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3054,10 +3055,10 @@ CDF_STATUS wma_wmi_service_close(void *cds_ctx) * This function closes work queue items associated with WMI, but not fully * closes WMI service. * - * Return: CDF_STATUS_SUCCESS if work close is successful. Otherwise + * Return: QDF_STATUS_SUCCESS if work close is successful. Otherwise * proper error codes. */ -CDF_STATUS wma_wmi_work_close(void *cds_ctx) +QDF_STATUS wma_wmi_work_close(void *cds_ctx) { tp_wma_handle wma_handle; @@ -3068,20 +3069,20 @@ CDF_STATUS wma_wmi_work_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGE("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* remove the wmi work */ WMA_LOGD("calling wmi_unified_remove_work"); wmi_unified_remove_work(wma_handle->wmi_handle); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } @@ -3092,11 +3093,11 @@ CDF_STATUS wma_wmi_work_close(void *cds_ctx) * * Return: 0 on success, CDF Error on failure */ -CDF_STATUS wma_close(void *cds_ctx) +QDF_STATUS wma_close(void *cds_ctx) { tp_wma_handle wma_handle; uint32_t idx; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; WMA_LOGD("%s: Enter", __func__); @@ -3105,13 +3106,13 @@ CDF_STATUS wma_close(void *cds_ctx) /* validate the wma_handle */ if (NULL == wma_handle) { WMA_LOGE("%s: Invalid wma handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* validate the wmi handle */ if (NULL == wma_handle->wmi_handle) { WMA_LOGP("%s: Invalid wmi handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Free DBS list */ @@ -3143,14 +3144,14 @@ CDF_STATUS wma_close(void *cds_ctx) } /* unregister Firmware debug log */ - cdf_status = dbglog_deinit(wma_handle->wmi_handle); - if (cdf_status != CDF_STATUS_SUCCESS) + qdf_status = dbglog_deinit(wma_handle->wmi_handle); + if (qdf_status != QDF_STATUS_SUCCESS) WMA_LOGP("%s: dbglog_deinit failed", __func__); /* close the cdf events */ cdf_event_destroy(&wma_handle->wma_ready_event); - cdf_status = cdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) + qdf_status = cdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); + if (!CDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGP("%s: Failed to destroy service ready ext event timer", __func__); @@ -3193,7 +3194,7 @@ CDF_STATUS wma_close(void *cds_ctx) } WMA_LOGD("%s: Exit", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3810,7 +3811,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) wmi_service_ready_event_fixed_param *ev; int status; uint32_t *ev_wlan_dbs_hw_mode_list; - CDF_STATUS ret; + QDF_STATUS ret; WMA_LOGD("%s: Enter", __func__); @@ -3999,7 +4000,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID, wma_log_supported_evt_handler); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log supported event cb"); return; } @@ -4070,7 +4071,7 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; wmi_service_ready_ext_event_fixed_param *ev; int status; - CDF_STATUS ret; + QDF_STATUS ret; WMA_LOGD("%s: Enter", __func__); @@ -4262,21 +4263,21 @@ bool wma_needshutdown(void *cds_ctx) * * Return: 0 for success or CDF error */ -CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) +QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; /* wait until WMI_READY_EVENTID received from FW */ - cdf_status = cdf_wait_single_event(&(wma_handle->wma_ready_event), + qdf_status = cdf_wait_single_event(&(wma_handle->wma_ready_event), WMA_READY_EVENTID_TIMEOUT); - if (CDF_STATUS_SUCCESS != cdf_status) { + if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Timeout waiting for ready event from FW", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; } - return cdf_status; + return qdf_status; } /** @@ -4287,7 +4288,7 @@ CDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) * * Return: 0 for success or CDF error */ -CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, +QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int val) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); @@ -4296,7 +4297,7 @@ CDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } switch (pps_param) { @@ -4353,7 +4354,7 @@ pkt_pwr_save_config: WMA_LOGE("%s:INVALID PPS CONFIG", __func__); } - return (ret) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (ret) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } /** @@ -4365,27 +4366,27 @@ pkt_pwr_save_config: * * Return: CDF_SUCCESS for success otherwise failure */ -CDF_STATUS wma_process_set_mas(tp_wma_handle wma, +QDF_STATUS wma_process_set_mas(tp_wma_handle wma, uint32_t *mas_val) { uint32_t val; if (NULL == wma || NULL == mas_val) { WMA_LOGE("%s: Invalid input to enable/disable MAS", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } val = (*mas_val); - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != wma_set_enable_disable_mcc_adaptive_scheduler(val)) { WMA_LOGE("%s: Unable to enable/disable MAS", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } else { WMA_LOGE("%s: Value is %d", __func__, val); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4398,17 +4399,17 @@ CDF_STATUS wma_process_set_mas(tp_wma_handle wma, * Return: CDF_SUCCESS for success otherwise failure * */ -CDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) +QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) { if (NULL == wma || NULL == miracast_val) { WMA_LOGE("%s: Invalid input to store miracast value", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->miracast_value = *miracast_val; WMA_LOGE("%s: Miracast value is %d", __func__, wma->miracast_value); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -4418,17 +4419,17 @@ CDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) * * This function configures the avg. stats value in firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -static CDF_STATUS wma_config_stats_factor(tp_wma_handle wma, +static QDF_STATUS wma_config_stats_factor(tp_wma_handle wma, struct sir_stats_avg_factor *avg_factor) { int ret; if (NULL == wma || NULL == avg_factor) { WMA_LOGE("%s: Invalid input of stats avg factor", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, @@ -4453,17 +4454,17 @@ static CDF_STATUS wma_config_stats_factor(tp_wma_handle wma, * * This function configures the guard time in firmware * - * Return: CDF_STATUS_SUCCESS for success otherwise failure + * Return: QDF_STATUS_SUCCESS for success otherwise failure * */ -static CDF_STATUS wma_config_guard_time(tp_wma_handle wma, +static QDF_STATUS wma_config_guard_time(tp_wma_handle wma, struct sir_guard_time_request *guard_time) { int ret; if (NULL == wma || NULL == guard_time) { WMA_LOGE("%s: Invalid input of guard time", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, @@ -4650,7 +4651,7 @@ void wma_set_wifi_start_packet_stats(void *wma_handle, */ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) { - CDF_STATUS status; + QDF_STATUS status; wmi_debug_mesg_flush_fixed_param *cmd; wmi_buf_t buf; int len = sizeof(*cmd); @@ -4682,7 +4683,7 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) status = cdf_mc_timer_start(&wma_handle->log_completion_timer, WMA_LOG_COMPLETION_TIMER); - if (status != CDF_STATUS_SUCCESS) + if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to start the log completion timer"); } @@ -4693,9 +4694,9 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) * * Return: CDF_SUCCESS for success otherwise failure */ -CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) +QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle; ol_txrx_vdev_handle txrx_vdev_handle = NULL; extern uint8_t *mac_trace_get_wma_msg_string(uint16_t wmaMsg); @@ -4704,7 +4705,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) if (NULL == msg) { WMA_LOGE("msg is NULL"); CDF_ASSERT(0); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4717,7 +4718,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) WMA_LOGP("%s: wma_handle is NULL", __func__); CDF_ASSERT(0); cdf_mem_free(msg->bodyptr); - cdf_status = CDF_STATUS_E_INVAL; + qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4740,8 +4741,8 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) #endif /* FEATURE_WLAN_ESE */ case WNI_CFG_DNLD_REQ: WMA_LOGA("McThread: WNI_CFG_DNLD_REQ"); - cdf_status = wma_wni_cfg_dnld(wma_handle); - if (CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_wni_cfg_dnld(wma_handle); + if (CDF_IS_STATUS_SUCCESS(qdf_status)) { cds_wma_complete_cback(cds_context); } else { WMA_LOGD("config download failure"); @@ -5404,7 +5405,7 @@ CDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) } end: WMA_LOGI("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -5446,7 +5447,7 @@ void wma_log_completion_timeout(void *data) * * Return: Success if the cmd is sent successfully to the firmware */ -CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, struct sir_pcl_list *msg) { wmi_soc_set_pcl_cmd_fixed_param *cmd; @@ -5457,7 +5458,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } len = sizeof(*cmd) + @@ -5466,7 +5467,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_soc_set_pcl_cmd_fixed_param *) wmi_buf_data(buf); @@ -5489,9 +5490,9 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, WMI_SOC_SET_PCL_CMDID)) { WMA_LOGE("%s: Failed to send WMI_SOC_SET_PCL_CMDID", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5508,7 +5509,7 @@ CDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, * * Return: Success if the cmd is sent successfully to the firmware */ -CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, struct sir_hw_mode *msg) { wmi_soc_set_hw_mode_cmd_fixed_param *cmd; @@ -5522,7 +5523,7 @@ CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, /* Handle is NULL. Will not be able to send failure * response as well */ - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } if (!msg) { @@ -5553,12 +5554,12 @@ CDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, cdf_nbuf_free(buf); goto fail; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: param = cdf_mem_malloc(sizeof(*param)); if (!param) { WMA_LOGE("%s: Memory allocation failed", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } param->status = SET_HW_MODE_STATUS_ECANCELED; param->cfgd_hw_mode_index = 0; @@ -5566,7 +5567,7 @@ fail: WMA_LOGE("%s: Sending HW mode fail response to LIM", __func__); wma_send_msg(wma_handle, SIR_HAL_SOC_SET_HW_MODE_RESP, (void *) param, 0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5576,9 +5577,9 @@ fail: * * Configures WLAN firmware with the dual MAC features * - * Return: CDF_STATUS. 0 on success. + * Return: QDF_STATUS. 0 on success. */ -CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, +QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg) { wmi_soc_set_dual_mac_config_cmd_fixed_param *cmd; @@ -5588,12 +5589,12 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } if (!msg) { WMA_LOGE("%s: Set dual mode config is NULL", __func__); - return CDF_STATUS_E_NULL_VALUE; + return QDF_STATUS_E_NULL_VALUE; } len = sizeof(*cmd); @@ -5601,7 +5602,7 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } cmd = (wmi_soc_set_dual_mac_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -5623,7 +5624,7 @@ CDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, __func__); cdf_nbuf_free(buf); } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5668,7 +5669,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) msg.reserved = 0; msg.bodyptr = iwcmd; - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!"); cdf_mem_free(iwcmd); diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 94ea4847220a..e38234eee5f7 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -90,7 +90,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, wmi_tim_info *tim_info = param_buf->tim_info; uint8_t *bcn_payload; wmi_buf_t wmi_buf; - CDF_STATUS ret; + QDF_STATUS ret; struct beacon_tim_ie *tim_ie; wmi_p2p_noa_info *p2p_noa_info = param_buf->p2p_noa_info; struct p2p_sub_element_noa noa_ie; @@ -204,7 +204,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, bcn->dma_mapped = 0; } ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); - if (ret != CDF_STATUS_SUCCESS) { + if (ret != QDF_STATUS_SUCCESS) { cdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); cdf_spin_unlock_bh(&bcn->lock); @@ -322,7 +322,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) return -EINVAL; } - if (ol_txrx_get_vdevid(peer, &vdev_id) != CDF_STATUS_SUCCESS) { + if (ol_txrx_get_vdevid(peer, &vdev_id) != QDF_STATUS_SUCCESS) { WMA_LOGE("Not able to find BSSID for peer [%pM]", macaddr); return -EINVAL; } @@ -1600,7 +1600,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1610,7 +1610,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) * STA key is been setup for a peer */ if (wlan_op_mode_ibss == txrx_vdev->opmode) { - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; if (wma_handle->ibss_started > 0) goto out; WMA_LOGD("Caching IBSS Key"); @@ -1673,7 +1673,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) if (!buf) { WMA_LOGE("%s:Failed to setup install key buf", __func__); - key_info->status = CDF_STATUS_E_NOMEM; + key_info->status = QDF_STATUS_E_NOMEM; goto out; } @@ -1683,14 +1683,14 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } } wma_handle->ibss_started++; /* TODO: Should we wait till we get HTT_T2H_MSG_TYPE_SEC_IND? */ - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; out: wma_send_msg(wma_handle, WMA_SET_BSSKEY_RSP, (void *)key_info, 0); @@ -1819,7 +1819,7 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:Invalid vdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; return; } @@ -1907,7 +1907,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (!txrx_pdev) { WMA_LOGE("%s:Invalid txrx pdev handle", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1916,14 +1916,14 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) &peer_id); if (!peer) { WMA_LOGE("%s:Invalid peer for key setting", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); if (!txrx_vdev) { WMA_LOGE("%s:TxRx Vdev Handle is NULL", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } @@ -1981,7 +1981,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) if (!buf) { WMA_LOGE("%s:Failed to setup install key buf", __func__); - key_info->status = CDF_STATUS_E_NOMEM; + key_info->status = QDF_STATUS_E_NOMEM; goto out; } @@ -1994,7 +1994,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) cdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); - key_info->status = CDF_STATUS_E_FAILURE; + key_info->status = QDF_STATUS_E_FAILURE; goto out; } } @@ -2008,7 +2008,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) } /* TODO: Should we wait till we get HTT_T2H_MSG_TYPE_SEC_IND? */ - key_info->status = CDF_STATUS_SUCCESS; + key_info->status = QDF_STATUS_SUCCESS; out: if (key_info->sendRsp) wma_send_msg(wma_handle, WMA_SET_STAKEY_RSP, (void *)key_info, @@ -2024,7 +2024,7 @@ out: * * Return: CDF Status */ -CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, +QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; @@ -2042,7 +2042,7 @@ CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -2092,12 +2092,12 @@ CDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, else CDF_ASSERT(0); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; fail: wmi_buf_free(buf); WMA_LOGE("%s: Failed to set WMM Paremeters", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2297,7 +2297,7 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, tpSendbeaconParams bcn_info) { struct beacon_info *bcn; @@ -2309,14 +2309,14 @@ CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, if (!bcn || !bcn->buf) { WMA_LOGE("%s: Memory is not allocated to hold bcn template", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = *(u32 *) &bcn_info->beacon[0]; if (len > WMA_BCN_BUF_MAX_SIZE) { WMA_LOGE("%s: Received beacon len %d exceeding max limit %d", __func__, len, WMA_BCN_BUF_MAX_SIZE); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } WMA_LOGD("%s: Storing received beacon template buf to local buffer", __func__); @@ -2360,7 +2360,7 @@ CDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, cdf_spin_unlock_bh(&bcn->lock); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2565,7 +2565,7 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) { ol_txrx_vdev_handle vdev; uint8_t vdev_id; - CDF_STATUS status; + QDF_STATUS status; uint8_t *p2p_ie; tpAniBeaconStruct beacon; @@ -2599,7 +2599,7 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) } } status = wma_store_bcn_tmpl(wma, vdev_id, bcn_info); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s : wma_store_bcn_tmpl Failed", __func__); return; } @@ -2810,14 +2810,14 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) +QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); int ret = -EIO; if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } switch (ht_capab) { @@ -2849,7 +2849,7 @@ CDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) WMA_LOGE("%s:INVALID HT CONFIG", __func__); } - return (ret) ? CDF_STATUS_E_FAILURE : CDF_STATUS_SUCCESS; + return (ret) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; } /** @@ -3306,28 +3306,28 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, * * Return: CDF status */ -CDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) +QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) { tp_wma_handle wma_handle; #ifdef QCA_WIFI_FTM if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; #endif wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_unregister_event_handler(wma_handle->wmi_handle, WMI_MGMT_RX_EVENTID) != 0) { WMA_LOGE("Failed to Unregister rx mgmt handler with wmi"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle->mgmt_rx = NULL; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3341,11 +3341,11 @@ CDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) * * Return: Success or Failure Status */ -CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)) { @@ -3354,12 +3354,12 @@ CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, if (!wma) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->csr_roam_synch_cb = csr_roam_synch_cb; wma->pe_roam_synch_cb = pe_roam_synch_cb; WMA_LOGD("Registered roam synch callbacks with WMA successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wma_register_mgmt_frm_client() - register management frame callback @@ -3368,23 +3368,23 @@ CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, * * Return: CDF status */ -CDF_STATUS wma_register_mgmt_frm_client( +QDF_STATUS wma_register_mgmt_frm_client( void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx) { tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_MGMT_RX_EVENTID, wma_mgmt_rx_process) != 0) { WMA_LOGE("Failed to register rx mgmt handler with wmi"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma_handle->mgmt_rx = mgmt_frm_rx; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 260a8273b44c..1bc71f8ae13c 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -42,7 +42,7 @@ */ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_ocb_set_config_response *resp; cds_msg_t msg = {0}; struct sir_ocb_config *req = wma_handle->ocb_config_req; @@ -53,7 +53,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) * If the command was successful, save the channel information in the * vdev. */ - if (status == CDF_STATUS_SUCCESS && vdev && req) { + if (status == QDF_STATUS_SUCCESS && vdev && req) { if (vdev->ocb_channel_info) cdf_mem_free(vdev->ocb_channel_info); vdev->ocb_channel_count = @@ -93,8 +93,8 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) msg.type = eWNI_SME_OCB_SET_CONFIG_RSP; msg.bodyptr = resp; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post msg to SME")); cdf_mem_free(resp); return -EINVAL; @@ -159,7 +159,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, { struct wma_target_req *msg; struct wma_vdev_start_req req; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; /* if vdev is not yet up, send vdev start request and wait for response. * OCB set_config request should be sent on receiving @@ -174,7 +174,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, (void *)config_req, 1000); if (!msg) { WMA_LOGE(FL("Failed to fill vdev req %d"), req.vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; return status; } req.chan = cds_freq_to_chan(config_req->channels[0].chan_freq); @@ -191,7 +191,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, req.preferred_tx_streams = 2; status = wma_vdev_start(wma_handle, &req, false); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma_handle, req.vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); WMA_LOGE(FL("vdev_start failed, status = %d"), status); @@ -204,15 +204,15 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, int wma_ocb_start_resp_ind_cont(tp_wma_handle wma_handle) { - CDF_STATUS cdf_status = 0; + QDF_STATUS qdf_status = 0; if (!wma_handle->ocb_config_req) { WMA_LOGE(FL("The request could not be found")); - return CDF_STATUS_E_EMPTY; + return QDF_STATUS_E_EMPTY; } - cdf_status = wma_ocb_set_config(wma_handle, wma_handle->ocb_config_req); - return cdf_status; + qdf_status = wma_ocb_set_config(wma_handle, wma_handle->ocb_config_req); + return qdf_status; } static WLAN_PHY_MODE wma_ocb_freq_to_mode(uint32_t freq) @@ -626,7 +626,7 @@ int wma_ocb_stop_timing_advert(tp_wma_handle wma_handle, int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, struct sir_ocb_get_tsf_timer *request) { - CDF_STATUS ret; + QDF_STATUS ret; wmi_ocb_get_tsf_timer_cmd_fixed_param *cmd; uint8_t *buf_ptr; wmi_buf_t buf; @@ -671,7 +671,7 @@ int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_ocb_get_tsf_timer_response *response; WMI_OCB_GET_TSF_TIMER_RESP_EVENTID_param_tlvs *param_tlvs; wmi_ocb_get_tsf_timer_resp_event_fixed_param *fix_param; @@ -691,8 +691,8 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_OCB_GET_TSF_TIMER_RSP; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -733,7 +733,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = wmi_buf_data(buf); @@ -787,7 +787,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_get_stats_response *response; WMI_DCC_GET_STATS_RESP_EVENTID_param_tlvs *param_tlvs; wmi_dcc_get_stats_resp_event_fixed_param *fix_param; @@ -814,8 +814,8 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_GET_STATS_RSP; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -884,7 +884,7 @@ int wma_dcc_clear_stats(tp_wma_handle wma_handle, int wma_dcc_update_ndl(tp_wma_handle wma_handle, struct sir_dcc_update_ndl *update_ndl_param) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_dcc_update_ndl_cmd_fixed_param *cmd; wmi_dcc_ndl_chan *ndl_chan_array; wmi_dcc_ndl_active_state_config *ndl_active_state_array; @@ -898,7 +898,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, if (update_ndl_param->dcc_ndl_chan_list_len != update_ndl_param->channel_count * sizeof(*ndl_chan_array)) { WMA_LOGE(FL("Invalid parameter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } active_state_count = 0; ndl_chan_array = update_ndl_param->dcc_ndl_chan_list; @@ -908,7 +908,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, if (update_ndl_param->dcc_ndl_active_state_list_len != active_state_count * sizeof(*ndl_active_state_array)) { WMA_LOGE(FL("Invalid parameter")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Allocate memory for the WMI command */ @@ -968,11 +968,11 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, buf_ptr += update_ndl_param->dcc_ndl_active_state_list_len; /* Send the WMI command */ - cdf_status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, + qdf_status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_DCC_UPDATE_NDL_CMDID); /* If there is an error, set the completion event */ - if (cdf_status) { - WMA_LOGE(FL("Failed to send WMI message: %d"), cdf_status); + if (qdf_status) { + WMA_LOGE(FL("Failed to send WMI message: %d"), qdf_status); wmi_buf_free(buf); return -EIO; } @@ -992,7 +992,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_update_ndl_response *resp; WMI_DCC_UPDATE_NDL_RESP_EVENTID_param_tlvs *param_tlvs; wmi_dcc_update_ndl_resp_event_fixed_param *fix_param; @@ -1012,8 +1012,8 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_UPDATE_NDL_RSP; msg.bodyptr = resp; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(resp); return -EINVAL; @@ -1033,7 +1033,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, uint32_t len) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; struct sir_dcc_get_stats_response *response; WMI_DCC_STATS_EVENTID_param_tlvs *param_tlvs; wmi_dcc_stats_event_fixed_param *fix_param; @@ -1058,8 +1058,8 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_STATS_EVENT; msg.bodyptr = response; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); return -EINVAL; @@ -1118,5 +1118,5 @@ int wma_ocb_register_event_handlers(tp_wma_handle wma_handle) if (status) return status; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index b8f855a53cfd..846e9e7878f1 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -170,7 +170,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, * * Return: 0 for success or error code. */ -CDF_STATUS +QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) { int ret; @@ -181,7 +181,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed to set WMI_VDEV_PARAM_ATIM_WINDOW_LENGTH ret = %d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -190,7 +190,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -199,7 +199,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -208,7 +208,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -217,7 +217,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_INACTIVITY_CNT ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -226,7 +226,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -235,7 +235,7 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -244,10 +244,10 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) if (ret < 0) { WMA_LOGE("Failed to set IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE ret=%d", ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* QCA_IBSS_SUPPORT */ @@ -1209,9 +1209,9 @@ wmi_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, * trigger frames periodically when there * is no traffic on the transmit side. * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, +QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, tp_wma_trigger_uapsd_params trigger_uapsd_params) { @@ -1232,7 +1232,7 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, !WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_STA_UAPSD_VAR_AUTO_TRIG)) { WMA_LOGD("Trigger uapsd is not supported vdev id %d", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } uapsd_trigger_param.wmm_ac = trigger_uapsd_params->wmm_ac; @@ -1250,9 +1250,9 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, if (ret) { WMA_LOGE("Fail to send uapsd param cmd for vdevid %d ret = %d", ret, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1261,9 +1261,9 @@ CDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, * @vdev_id: vdev id * @ac: access category * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, +QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uint32_t vdev_id, enum uapsd_ac ac) { int32_t ret; @@ -1300,7 +1300,7 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, break; default: WMA_LOGE("Invalid AC vdevId %d ac %d", vdev_id, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -1319,7 +1319,7 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, if (ret) { WMA_LOGE("Fail to send auto trig cmd for vdevid %d ret = %d", ret, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_set_sta_ps_param(wma_handle->wmi_handle, vdev_id, @@ -1328,20 +1328,20 @@ CDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, if (ret) { WMA_LOGE("Disable Uapsd per ac Failed vdevId %d ac %d", vdev_id, ac); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Disable Uapsd per ac vdevId %d val %d", vdev_id, iface->uapsd_cached_val); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** * wma_get_temperature() - get pdev temperature req * @wmi_handle: wma handle * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) +QDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) { wmi_pdev_get_temperature_cmd_fixed_param *cmd; wmi_buf_t wmi_buf; @@ -1350,13 +1350,13 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) if (!wma_handle) { WMA_LOGE(FL("WMA is closed, can not issue cmd")); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!wmi_buf) { WMA_LOGE(FL("wmi_buf_alloc failed")); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -1371,9 +1371,9 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) WMI_PDEV_GET_TEMPERATURE_CMDID)) { WMA_LOGE(FL("failed to send get temperature command")); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1387,7 +1387,7 @@ CDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, uint32_t len) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; WMI_PDEV_TEMPERATURE_EVENTID_param_tlvs *param_buf; wmi_pdev_temperature_event_fixed_param *wmi_event; @@ -1405,8 +1405,8 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = NULL; sme_msg.bodyval = wmi_event->value; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post get temperature ind msg")); } @@ -1418,9 +1418,9 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, * @handle: wma handle * @ptxlim: power limit value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, +QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, tSirTxPowerLimit *ptxlim) { tp_wma_handle wma = (tp_wma_handle) handle; @@ -1431,7 +1431,7 @@ CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue tx power limit", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Set value and reason code for 2g and 5g power limit */ @@ -1451,16 +1451,16 @@ CDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, txpower_params2g); if (ret) { WMA_LOGE("%s: Failed to set txpower 2g (%d)", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_pdev_set_param(wma->wmi_handle, WMI_PDEV_PARAM_TXPOWER_LIMIT5G, txpower_params5g); if (ret) { WMA_LOGE("%s: Failed to set txpower 5g (%d)", __func__, ret); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1909,11 +1909,11 @@ void wma_process_set_mimops_req(tp_wma_handle wma_handle, * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) +QDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; wmi_sta_smps_force_mode_cmd_fixed_param *cmd; wmi_buf_t buf; uint16_t len = sizeof(*cmd); @@ -1946,7 +1946,7 @@ CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) break; default: WMA_LOGE("%s:INVALID Mimo PS CONFIG", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Setting vdev %d value = %u", vdev_id, value); @@ -1966,9 +1966,9 @@ CDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) * @wma_ptr: wma handle * @pReq: modem power state * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, +QDF_STATUS wma_notify_modem_power_state(void *wma_ptr, tSirModemPowerStateInd *pReq) { int32_t ret; @@ -1980,11 +1980,11 @@ CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, if (ret) { WMA_LOGE("%s: Fail to notify Modem Power State %d", __func__, pReq->param); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Successfully notify Modem Power State %d", pReq->param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1992,9 +1992,9 @@ CDF_STATUS wma_notify_modem_power_state(void *wma_ptr, * @wma_ptr: wma handle * @idle_ps: idle powersave * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) +QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) { int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; @@ -2007,11 +2007,11 @@ CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) idle_ps); if (ret) { WMA_LOGE("Fail to Set Idle Ps Config %d", idle_ps); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Successfully Set Idle Ps Config %d", idle_ps); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2020,12 +2020,12 @@ CDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, +QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; wmi_sta_smps_param_cmd_fixed_param *cmd; wmi_buf_t buf; uint16_t len = sizeof(*cmd); @@ -2257,21 +2257,21 @@ void wma_set_resume_dtim(tp_wma_handle wma) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) +QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up", __func__, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, @@ -2287,21 +2287,21 @@ CDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) * @vdev_id: vdev id * @value: value * - * Return: CDF_STATUS_SUCCESS for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code. */ -CDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) +QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) { - int ret = CDF_STATUS_SUCCESS; + int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up", __func__, vdev_id); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 7b1291c44ba5..66920c89d41f 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -173,7 +173,7 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle) * * Return: CDF status */ -CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, wmi_buf_t *buf, int *buf_len) { @@ -182,7 +182,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, wmi_mac_addr *bssid; wmi_ssid *ssid = NULL; uint32_t *tmp_ptr, ie_len_with_pad; - CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; uint8_t *buf_ptr; uint32_t dwell_time; uint8_t SSID_num; @@ -192,7 +192,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (!pMac) { WMA_LOGP("%s: pMac is NULL!", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of uint32_t */ @@ -216,7 +216,7 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for start scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); @@ -520,11 +520,11 @@ CDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + ie_len_with_pad; *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: cdf_mem_free(*buf); *buf = NULL; - return cdf_status; + return qdf_status; } /** @@ -538,13 +538,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, int *buf_len, tAbortScanParams *abort_scan_req) { wmi_stop_scan_cmd_fixed_param *cmd; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; int len = sizeof(*cmd); /* Allocate the memory */ @@ -552,7 +552,7 @@ CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for stop scan cmd", __func__); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -567,9 +567,9 @@ CDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, cmd->req_type = WMI_SCAN_STOP_ONE; *buf_len = len; - cdf_status = CDF_STATUS_SUCCESS; + qdf_status = QDF_STATUS_SUCCESS; error: - return cdf_status; + return qdf_status; } @@ -584,11 +584,11 @@ error: * * Return: CDF status */ -CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, uint16_t msg_type) { uint32_t vdev_id, scan_id; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; wmi_start_scan_cmd_fixed_param *cmd; int status = 0; @@ -610,9 +610,9 @@ CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, /* Fill individual elements of wmi_start_scan_req and * TLV for channel list, bssid, ssid etc ... */ - cdf_status = wma_get_buf_start_scan_cmd(wma_handle, scan_req, + qdf_status = wma_get_buf_start_scan_cmd(wma_handle, scan_req, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get buffer for start scan cmd"); goto error; } @@ -645,13 +645,13 @@ CDF_STATUS wma_start_scan(tp_wma_handle wma_handle, /* Call the wmi api to request the scan */ if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("WMA --> WMI_START_SCAN_CMDID"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: /* Send completion event for only for start scan request */ if (msg_type == WMA_START_SCAN_OFFLOAD_REQ) { @@ -661,7 +661,7 @@ error: if (!scan_event) { WMA_LOGP("%s: Failed to allocate memory for scan rsp", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } memset(scan_event, 0x00, sizeof(*scan_event)); scan_event->event = WMI_SCAN_EVENT_COMPLETED; @@ -673,7 +673,7 @@ error: wma_send_msg(wma_handle, WMA_RX_SCAN_EVENT, (void *)scan_event, 0); } - return cdf_status; + return qdf_status; } /** @@ -685,24 +685,24 @@ error: * * Return: CDF status */ -CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, +QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_buf_t buf; int status = 0; int len; - cdf_status = wma_get_buf_stop_scan_cmd(wma_handle, &buf, &len, + qdf_status = wma_get_buf_stop_scan_cmd(wma_handle, &buf, &len, abort_scan_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get buffer for stop scan cmd"); goto error1; } if (NULL == buf) { WMA_LOGE("Failed to get buffer for stop scan cmd"); - cdf_status = CDF_STATUS_E_FAULT; + qdf_status = QDF_STATUS_E_FAULT; goto error1; } @@ -712,7 +712,7 @@ CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_STOP_SCAN_CMDID returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGE("scan_id 0x%x, scan_requestor_id 0x%x, vdev_id %d", @@ -721,12 +721,12 @@ CDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, abort_scan_req->SessionId); WMA_LOGI("WMA --> WMI_STOP_SCAN_CMDID"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: if (buf) cdf_nbuf_free(buf); error1: - return cdf_status; + return qdf_status; } /** @@ -738,12 +738,12 @@ error1: * * Return: CDF status */ -CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, +QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list) { tp_wma_handle wma_handle = (tp_wma_handle) handle; wmi_buf_t buf; - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_scan_chan_list_cmd_fixed_param *cmd; int status, i; uint8_t *buf_ptr; @@ -754,7 +754,7 @@ CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("Failed to allocate memory"); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; goto end; } @@ -819,12 +819,12 @@ CDF_STATUS wma_update_channel_list(WMA_HANDLE handle, WMI_SCAN_CHAN_LIST_CMDID); if (status != EOK) { - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; WMA_LOGE("Failed to send WMI_SCAN_CHAN_LIST_CMDID"); wmi_buf_free(buf); } end: - return cdf_status; + return qdf_status; } @@ -841,13 +841,13 @@ end: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * scan_cmd_fp, tSirRoamOffloadScanReq *roam_req, uint32_t mode, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -908,7 +908,7 @@ CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1086,16 +1086,16 @@ CDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_MODE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_MODE", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1107,10 +1107,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len, rssi_thresh, rssi_thresh_diff; @@ -1140,7 +1140,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1233,7 +1233,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("cmd WMI_ROAM_SCAN_RSSI_THRESHOLD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -1242,11 +1242,11 @@ CDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, WMA_LOGI( FL("hirssi_scan max_count=%d, delta=%d, hirssi_upper_bound=%d"), hirssi_scan_max_count, hirssi_scan_delta, hirssi_upper_bound); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1260,12 +1260,12 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_period, uint32_t scan_age, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1277,7 +1277,7 @@ CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1296,17 +1296,17 @@ CDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_PERIOD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_PERIOD roam_scan_period=%d, roam_scan_age=%d", __func__, scan_period, scan_age); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1320,13 +1320,13 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, int32_t rssi_change_thresh, uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1338,7 +1338,7 @@ CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1359,18 +1359,18 @@ CDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI(FL("roam_scan_rssi_change_thresh=%d, bcn_rssi_weight=%d"), rssi_change_thresh, bcn_rssi_weight); WMA_LOGI(FL("hirssi_delay_btw_scans=%d"), hirssi_delay_btw_scans); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1385,12 +1385,12 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t chan_count, uint8_t *chan_list, uint8_t list_type, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len, list_tlv_len; @@ -1402,7 +1402,7 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, if (chan_count == 0) { WMA_LOGD("%s : invalid number of channels %d", __func__, chan_count); - return CDF_STATUS_E_EMPTY; + return QDF_STATUS_E_EMPTY; } /* Channel list is a table of 2 TLV's */ list_tlv_len = WMI_TLV_HDR_SIZE + chan_count * sizeof(A_UINT32); @@ -1410,7 +1410,7 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1447,16 +1447,16 @@ CDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_CHAN_LIST returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CHAN_LIST", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1800,11 +1800,11 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, uint32_t vdev_id) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf = NULL; int status = 0; int len; @@ -1816,7 +1816,7 @@ CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1839,16 +1839,16 @@ CDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_AP_PROFILE returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("WMA --> WMI_ROAM_AP_PROFILE and other parameters"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -1863,7 +1863,7 @@ error: * Return: Return success upon succesfully passing the * parameters to the firmware, otherwise failure. */ -CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { wmi_buf_t buf = NULL; @@ -1908,7 +1908,7 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, break; default: WMA_LOGD("%s : Roam Filter need not be sent", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; break; } } else { @@ -1926,7 +1926,7 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (u_int8_t *) wmi_buf_data(buf); @@ -2000,10 +2000,10 @@ CDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, status); goto error; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /** @@ -2017,7 +2017,7 @@ error: * * Return: CDF status */ -CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, A_UINT32 final_bcnt, uint32_t vdev_id) { @@ -2033,7 +2033,7 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FIRST_BCNT returned Error %d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, @@ -2043,10 +2043,10 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FINAL_BCNT returned Error %d", status); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2059,10 +2059,10 @@ CDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id) { - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; wmi_roam_scan_cmd_fixed_param *cmd_fp; wmi_buf_t buf = NULL; int status = 0; @@ -2073,7 +2073,7 @@ CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -2090,17 +2090,17 @@ CDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, if (status != EOK) { WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_CMD returned Error %d", status); - cdf_status = CDF_STATUS_E_FAILURE; + qdf_status = QDF_STATUS_E_FAILURE; goto error; } WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CMD", __func__); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; error: wmi_buf_free(buf); - return cdf_status; + return qdf_status; } /** @@ -2112,10 +2112,10 @@ error: * * Return: CDF status */ -CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_start_scan_cmd_fixed_param scan_params; wmi_ap_profile ap_profile; tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); @@ -2127,7 +2127,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, if (NULL == pMac) { WMA_LOGE("%s: pMac is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma_handle->roam_offload_enabled) { @@ -2135,7 +2135,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Cannot initialize it in the middle of connection. */ cdf_mem_free(roam_req); - return CDF_STATUS_E_PERM; + return QDF_STATUS_E_PERM; } switch (roam_req->Command) { case ROAM_SCAN_OFFLOAD_START: @@ -2152,15 +2152,15 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, */ wma_handle->suitable_ap_hb_failure = false; - cdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_bmiss_cnt(wma_handle, + qdf_status = wma_roam_scan_bmiss_cnt(wma_handle, roam_req->RoamBmissFirstBcnt, roam_req->RoamBmissFinalBcnt, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; /* Opportunistic scan runs on a timer, value set by @@ -2168,12 +2168,12 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * cycles. */ if (roam_req->EmptyRefreshScanPeriod > 0) { - cdf_status = + qdf_status = wma_roam_scan_offload_scan_period(wma_handle, roam_req->EmptyRefreshScanPeriod, roam_req->EmptyRefreshScanPeriod * 3, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; mode = WMI_ROAM_SCAN_MODE_PERIODIC; @@ -2191,44 +2191,44 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Beacon weight of 14 means average rssi is taken over 14 previous samples + * 2 times the current beacon's rssi. */ - cdf_status = wma_roam_scan_offload_rssi_change(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_ap_profile(wma_handle, pMac, roam_req, &ap_profile); - cdf_status = wma_roam_scan_offload_ap_profile(wma_handle, + qdf_status = wma_roam_scan_offload_ap_profile(wma_handle, &ap_profile, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_offload_chan_list(wma_handle, + qdf_status = wma_roam_scan_offload_chan_list(wma_handle, roam_req->ConnectedNetwork.ChannelCount, &roam_req->ConnectedNetwork.ChannelCache[0], roam_req->ChannelCacheType, roam_req->sessionId); - if ((cdf_status != CDF_STATUS_SUCCESS) && - (cdf_status != CDF_STATUS_E_EMPTY)) + if ((qdf_status != QDF_STATUS_SUCCESS) && + (qdf_status != QDF_STATUS_E_EMPTY)) break; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, mode, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Sending start for roam scan filter failed"); break; } @@ -2240,7 +2240,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, wma_roam_scan_fill_scan_params(wma_handle, pMac, NULL, &scan_params); - cdf_status = wma_roam_scan_offload_mode(wma_handle, + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, NULL, WMI_ROAM_SCAN_MODE_NONE, @@ -2253,8 +2253,8 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * send the cleared entries. */ if (!roam_req->middle_of_roaming) { - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("clear for roam scan filter failed"); break; } @@ -2270,7 +2270,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, WMA_LOGE("%s: Alloc failed for scan_offload_rsp", __func__); cdf_mem_free(roam_req); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cds_msg.type = eWNI_SME_ROAM_SCAN_OFFLOAD_RSP; scan_offload_rsp->sessionId = roam_req->sessionId; @@ -2281,7 +2281,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Roam_Scan_Offload_Rsp post a dummy rsp msg back to * SME with proper reason code. */ - if (CDF_STATUS_SUCCESS != + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(scan_offload_rsp); @@ -2297,7 +2297,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, /* If roam scan is running, stop that cycle. * It will continue automatically on next trigger. */ - cdf_status = wma_roam_scan_offload_command(wma_handle, + qdf_status = wma_roam_scan_offload_command(wma_handle, WMI_ROAM_SCAN_STOP_CMD, roam_req->sessionId); break; @@ -2322,25 +2322,25 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, wma_handle->suitable_ap_hb_failure = false; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, WMI_ROAM_SCAN_MODE_NONE, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; if (roam_req->RoamScanOffloadEnabled == false) break; - cdf_status = wma_roam_scan_bmiss_cnt(wma_handle, + qdf_status = wma_roam_scan_bmiss_cnt(wma_handle, roam_req->RoamBmissFirstBcnt, roam_req->RoamBmissFinalBcnt, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; - cdf_status = wma_roam_scan_filter(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_roam_scan_filter(wma_handle, roam_req); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Sending update for roam scan filter failed"); break; } @@ -2350,7 +2350,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Runtime (after association) changes to rssi thresholds and * other parameters. */ - cdf_status = wma_roam_scan_offload_chan_list(wma_handle, + qdf_status = wma_roam_scan_offload_chan_list(wma_handle, roam_req->ConnectedNetwork.ChannelCount, &roam_req->ConnectedNetwork.ChannelCache[0], roam_req->ChannelCacheType, @@ -2359,23 +2359,23 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, * Even though the channel list is empty, we can * still go ahead and start Roaming. */ - if ((cdf_status != CDF_STATUS_SUCCESS) && - (cdf_status != CDF_STATUS_E_EMPTY)) + if ((qdf_status != QDF_STATUS_SUCCESS) && + (qdf_status != QDF_STATUS_E_EMPTY)) break; - cdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_thresh(wma_handle, roam_req); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; if (roam_req->EmptyRefreshScanPeriod > 0) { - cdf_status = + qdf_status = wma_roam_scan_offload_scan_period(wma_handle, roam_req->EmptyRefreshScanPeriod, roam_req->EmptyRefreshScanPeriod * 3, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; mode = WMI_ROAM_SCAN_MODE_PERIODIC; @@ -2389,25 +2389,25 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, mode = WMI_ROAM_SCAN_MODE_RSSI_CHANGE; } - cdf_status = wma_roam_scan_offload_rssi_change(wma_handle, + qdf_status = wma_roam_scan_offload_rssi_change(wma_handle, roam_req->sessionId, roam_req->RoamRescanRssiDiff, roam_req->RoamBeaconRssiWeight, roam_req->hi_rssi_scan_delay); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_ap_profile(wma_handle, pMac, roam_req, &ap_profile); - cdf_status = + qdf_status = wma_roam_scan_offload_ap_profile(wma_handle, &ap_profile, roam_req->sessionId); - if (cdf_status != CDF_STATUS_SUCCESS) + if (qdf_status != QDF_STATUS_SUCCESS) break; wma_roam_scan_fill_scan_params(wma_handle, pMac, roam_req, &scan_params); - cdf_status = + qdf_status = wma_roam_scan_offload_mode(wma_handle, &scan_params, roam_req, mode, roam_req->sessionId); @@ -2418,7 +2418,7 @@ CDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, break; } cdf_mem_free(roam_req); - return cdf_status; + return qdf_status; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -2819,7 +2819,7 @@ int wma_rssi_breached_event_handler(void *handle, * * Return: CDF status */ -CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, +QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, wmi_roam_offload_tlv_param * roam_offload_params, tSirRoamOffloadScanReq *roam_req) @@ -2844,13 +2844,13 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PRIVACY_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } selfCaps.ess = 1; selfCaps.ibss = 0; @@ -2859,7 +2859,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SHORT_PREAMBLE"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortPreamble = 1; @@ -2870,28 +2870,28 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortSlotTime = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11H_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.spectrumMgt = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_QOS_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.qos = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_APSD_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (val) selfCaps.apsd = 1; @@ -2902,7 +2902,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_BLOCK_ACK_ENABLED"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } selfCaps.delayedBA = (uint16_t) ((val >> WNI_CFG_BLOCK_ACK_ENABLED_DELAYED) & 1); @@ -2915,7 +2915,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_CAP_INFO"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF; roam_offload_params->ht_caps_info = @@ -2924,7 +2924,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_AMPDU_PARAMS"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacHTParametersInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2936,13 +2936,13 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, &val) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SUPPORTED_MCS_SET"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_EXT_HT_CAP_INFO"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* uHTCapabilityInfo.extHtCapInfo */ uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF; @@ -2952,7 +2952,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_TX_BF_CAP"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacTxBFCapabilityInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2960,7 +2960,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_AS_CAP"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* tSirMacASCapabilityInfo */ nCfgValue8 = (uint8_t) nCfgValue; @@ -2971,7 +2971,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, eSIR_SUCCESS) { CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_MAX_SP_LENGTH"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } nCfgValue8 = (uint8_t) nCfgValue; macQosInfoSta.maxSpLen = nCfgValue8; @@ -2987,7 +2987,7 @@ CDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, */ roam_offload_params->qos_caps = (*pCfgValue8) & 0xFF; roam_offload_params->wmm_caps = 0x4 & 0xFF; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3075,7 +3075,7 @@ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) WMA_LOGP("%s: Failed to send vdev Set RIC Req command", __func__); if (is_add_ts) - ((tAddTsParams *) msg)->status = CDF_STATUS_E_FAILURE; + ((tAddTsParams *) msg)->status = QDF_STATUS_E_FAILURE; cdf_nbuf_free(buf); } } @@ -3154,7 +3154,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) { tSirSmeHOFailureInd *ho_failure_ind; cds_msg_t sme_msg = { 0 }; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; ho_failure_ind = cdf_mem_malloc(sizeof(tSirSmeHOFailureInd)); @@ -3167,8 +3167,8 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) sme_msg.bodyptr = ho_failure_ind; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME"); cdf_mem_free(ho_failure_ind); return; @@ -3233,7 +3233,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) { struct wma_vdev_start_req req; struct wma_target_req *msg; - CDF_STATUS status = CDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; uint8_t vdev_id, peer_id; ol_txrx_peer_handle peer; ol_txrx_pdev_handle pdev; @@ -3244,13 +3244,13 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) if (!wma_find_vdev_by_addr(wma, params->selfStaMacAddr, &vdev_id)) { WMA_LOGP("%s: Failed to find vdev id for %pM", __func__, params->selfStaMacAddr); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_resp; } pdev = cds_get_context(CDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - status = CDF_STATUS_E_FAILURE; + status = QDF_STATUS_E_FAILURE; goto send_resp; } @@ -3264,7 +3264,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) if (!msg) { WMA_LOGP("%s: Failed to fill channel switch request for vdev %d", __func__, req.vdev_id); - status = CDF_STATUS_E_NOMEM; + status = QDF_STATUS_E_NOMEM; goto send_resp; } req.chan = params->channelNumber; @@ -3274,7 +3274,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) req.ch_center_freq_seg1 = params->ch_center_freq_seg1; req.dot11_mode = params->dot11_mode; status = wma_get_current_hw_mode(&hw_mode); - if (!CDF_IS_STATUS_SUCCESS(status)) + if (!QDF_IS_STATUS_SUCCESS(status)) WMA_LOGE("wma_get_current_hw_mode failed"); if ((params->nss == 2) && !hw_mode.dbs_cap) { @@ -3304,7 +3304,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) status = wma_vdev_start(wma, &req, wma->interfaces[req.vdev_id].is_channel_switch); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { wma_remove_vdev_req(wma, req.vdev_id, WMA_TARGET_REQ_TYPE_VDEV_START); WMA_LOGP("%s: vdev start failed status = %d", __func__, status); @@ -3369,7 +3369,7 @@ void wma_set_pno_channel_prediction(uint8_t *buf_ptr, * This function request FW to start PNO request. * Request: CDF status */ -CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) +QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) { wmi_nlo_config_cmd_fixed_param *cmd; nlo_configured_parameters *nlo_list; @@ -3399,7 +3399,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -3497,7 +3497,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pno->sessionId].pno_in_progress = true; @@ -3505,7 +3505,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) WMA_LOGD("PNO start request sent successfully for vdev %d", pno->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3517,7 +3517,7 @@ CDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) * * Return: CDF status */ -CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) +QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) { wmi_nlo_config_cmd_fixed_param *cmd; int32_t len = sizeof(*cmd); @@ -3528,7 +3528,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) if (!wma->interfaces[vdev_id].pno_in_progress) { WMA_LOGD("No active pno session found for vdev %d, skip pno stop request", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } WMA_LOGD("PNO Stop"); @@ -3542,7 +3542,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -3572,14 +3572,14 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[vdev_id].pno_in_progress = false; WMA_LOGD("PNO stop request sent successfully for vdev %d", vdev_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3591,7 +3591,7 @@ CDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) */ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) { - CDF_STATUS ret; + QDF_STATUS ret; if (pno->enable) ret = wma_pno_start(wma, pno); @@ -3618,7 +3618,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) * * Return: CDF status */ -CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) +QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) { wmi_vdev_plmreq_start_cmd_fixed_param *cmd; uint32_t *channel_list; @@ -3630,7 +3630,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("PLM Start"); @@ -3640,7 +3640,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_plmreq_start_cmd_fixed_param *) wmi_buf_data(buf); @@ -3695,14 +3695,14 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) if (ret) { WMA_LOGE("%s: Failed to send plm start wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[plm->sessionId].plm_in_progress = true; WMA_LOGD("Plm start request sent successfully for vdev %d", plm->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3714,7 +3714,7 @@ CDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) * * Return: CDF status */ -CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) +QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) { wmi_vdev_plmreq_stop_cmd_fixed_param *cmd; int32_t len; @@ -3724,12 +3724,12 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (false == wma->interfaces[plm->sessionId].plm_in_progress) { WMA_LOGE("No active plm req found, skip plm stop req"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("PLM Stop"); @@ -3738,7 +3738,7 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_vdev_plmreq_stop_cmd_fixed_param *) wmi_buf_data(buf); @@ -3760,14 +3760,14 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) if (ret) { WMA_LOGE("%s: Failed to send plm stop wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[plm->sessionId].plm_in_progress = false; WMA_LOGD("Plm stop request sent successfully for vdev %d", plm->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3779,7 +3779,7 @@ CDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) */ void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm) { - CDF_STATUS ret = 0; + QDF_STATUS ret = 0; if (NULL == plm || NULL == wma) return; @@ -3816,7 +3816,7 @@ void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm) void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) { tSirPrefNetworkFoundInd *nw_found_ind; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t len, i; @@ -3850,7 +3850,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post PNO completion match event to SME", __func__); cdf_mem_free(nw_found_ind); @@ -5145,7 +5145,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, * * Return: CDF Status. */ -CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, tSirWifiScanCmdReqParams *pstart, wmi_buf_t *buf, int *buf_len) { @@ -5201,7 +5201,7 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory" " for start extscan cmd", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); cmd = (wmi_extscan_start_cmd_fixed_param *) buf_ptr; @@ -5361,7 +5361,7 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + (nchannels * sizeof(wmi_extscan_bucket_channel)); *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5373,46 +5373,46 @@ CDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, * * Return: CDF Status. */ -CDF_STATUS wma_start_extscan(tp_wma_handle wma, +QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan feature bit not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* Fill individual elements of extscan request and * TLV for buckets, channel list. */ - cdf_status = wma_get_buf_extscan_start_cmd(wma, pstart, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_get_buf_extscan_start_cmd(wma, pstart, &buf, &len); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer for ext scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!buf) { WMA_LOGE("%s:Failed to get buffer" "for current extscan info", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_START_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pstart->sessionId].extscan_in_progress = true; WMA_LOGD("Extscan start request sent successfully for vdev %d", pstart->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5424,7 +5424,7 @@ CDF_STATUS wma_start_extscan(tp_wma_handle wma, * * Return: CDF Status. */ -CDF_STATUS wma_stop_extscan(tp_wma_handle wma, +QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd) { wmi_extscan_stop_cmd_fixed_param *cmd; @@ -5434,18 +5434,18 @@ CDF_STATUS wma_stop_extscan(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); cmd = (wmi_extscan_stop_cmd_fixed_param *) buf_ptr; @@ -5461,13 +5461,13 @@ CDF_STATUS wma_stop_extscan(tp_wma_handle wma, WMI_EXTSCAN_STOP_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } wma->interfaces[pstopcmd->sessionId].extscan_in_progress = false; WMA_LOGD("Extscan stop request sent successfully for vdev %d", pstopcmd->sessionId); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** wma_get_hotlist_entries_per_page() - hotlist entries per page @@ -5507,7 +5507,7 @@ static inline int wma_get_hotlist_entries_per_page(wmi_unified_t wmi_handle, * * Return: CDF Status. */ -CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * photlist, int *buf_len) { @@ -5532,7 +5532,7 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, */ if (!numap) { WMA_LOGE("%s: Invalid number of bssid's", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } num_entries = wma_get_hotlist_entries_per_page(wma_handle->wmi_handle, cmd_len, @@ -5547,7 +5547,7 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(buf); cmd = (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *) @@ -5610,13 +5610,13 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } index = index + min_entries; num_entries = numap - min_entries; len = cmd_len; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5628,28 +5628,28 @@ CDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, tSirExtScanSetBssidHotListReqParams *photlist) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue hotlist cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Fill individual elements for hotlist request and * TLV for bssid entries */ - cdf_status = wma_get_buf_extscan_hotlist_cmd(wma, photlist, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + qdf_status = wma_get_buf_extscan_hotlist_cmd(wma, photlist, &len); + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer" "for hotlist scan cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5661,7 +5661,7 @@ CDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams *photlist_reset) { @@ -5673,16 +5673,16 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!photlist_reset) { WMA_LOGE("%s: Invalid reset hotlist buffer", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -5693,7 +5693,7 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5719,9 +5719,9 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5735,7 +5735,7 @@ CDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, +QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, tSirExtScanSetSigChangeReqParams *psigchange, wmi_buf_t *buf, int *buf_len) @@ -5750,7 +5750,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, if (!numap) { WMA_LOGE("%s: Invalid number of bssid's", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len += WMI_TLV_HDR_SIZE; len += numap * sizeof(wmi_extscan_wlan_change_bssid_param); @@ -5759,7 +5759,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, if (!*buf) { WMA_LOGP("%s: failed to allocate memory for change monitor cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } buf_ptr = (uint8_t *) wmi_buf_data(*buf); cmd = @@ -5806,7 +5806,7 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE + (numap * sizeof(wmi_extscan_wlan_change_bssid_param)); *buf_len = len; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5818,41 +5818,41 @@ CDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, * * Return: CDF status */ -CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * psigchange) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_buf_t buf; int len; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } /* Fill individual elements of change monitor and * TLV info ... */ - cdf_status = wma_get_buf_extscan_change_monitor_cmd(wma, + qdf_status = wma_get_buf_extscan_change_monitor_cmd(wma, psigchange, &buf, &len); - if (cdf_status != CDF_STATUS_SUCCESS) { + if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to get buffer for change monitor cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!buf) { WMA_LOGE("%s: Failed to get buffer", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5864,7 +5864,7 @@ CDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, +QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams *pResetReq) { @@ -5876,12 +5876,12 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: ext scan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -5891,7 +5891,7 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5919,9 +5919,9 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5933,7 +5933,7 @@ CDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * pcached_results) { @@ -5944,18 +5944,18 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5973,9 +5973,9 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -5987,7 +5987,7 @@ CDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, +QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * pgetcapab) { @@ -5998,18 +5998,18 @@ CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -6025,12 +6025,12 @@ CDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, WMI_EXTSCAN_GET_CAPABILITIES_CMDID)) { WMA_LOGE("%s: failed to command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } -CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, +QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload) { wmi_ipa_offload_enable_disable_cmd_fixed_param *cmd; @@ -6044,7 +6044,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, @@ -6055,18 +6055,18 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, ((ipa_offload->offload_type == AP_RX_DATA_OFFLOAD) ? "WMI_SERVICE_HSOFFLOAD" : "WMI_SERVICE_STA_RX_IPA_OFFLOAD_SUPPORT")); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (ipa_offload->offload_type > STA_RX_DATA_OFFLOAD) { - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed (len=%d)", __func__, len); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } WMA_LOGE("%s: offload_type=%d, enable=%d", __func__, @@ -6088,7 +6088,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)) { WMA_LOGE("%s: failed to command", __func__); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* @@ -6097,7 +6097,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, */ vdev = wma_find_vdev_by_id(wma, ipa_offload->vdev_id); if (!vdev) - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; /* Disable Intra-BSS FWD offload when gDisableIntraBssFwd=1 in INI */ cfg = (struct txrx_pdev_cfg_t *)vdev->pdev->ctrl_pdev; @@ -6113,10 +6113,10 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, ipa_offload->vdev_id, WMI_VDEV_PARAM_INTRA_BSS_FWD, intra_bss_fwd)) { WMA_LOGE("Failed to disable WMI_VDEV_PARAM_INTRA_BSS_FWD"); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** wma_set_epno_network_list() - set epno network list @@ -6128,7 +6128,7 @@ CDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, * * Returns: 0 on success, error number otherwise */ -CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, struct wifi_epno_params *req) { wmi_nlo_config_cmd_fixed_param *cmd; @@ -6142,12 +6142,12 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* TLV place holder for array of structures @@ -6161,7 +6161,7 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -6231,13 +6231,13 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("set ePNO list request sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6248,9 +6248,9 @@ CDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, * This function reads the incoming @req and fill in the destination * WMI structure and send down the passpoint configs down to the firmware * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { wmi_passpoint_config_cmd_fixed_param *cmd; @@ -6263,12 +6263,12 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } len = sizeof(*cmd); @@ -6276,7 +6276,7 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_passpoint_config_cmd_fixed_param *) @@ -6312,14 +6312,14 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, WMA_LOGE("%s: Failed to send set passpoint network list wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } } WMA_LOGD("Set passpoint network list request is sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6330,9 +6330,9 @@ CDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, * This function sends down WMI command with network id set to wildcard id. * firmware shall clear all the config entries * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, +QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { wmi_passpoint_config_cmd_fixed_param *cmd; @@ -6344,19 +6344,19 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } len = sizeof(*cmd); buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_passpoint_config_cmd_fixed_param *) wmi_buf_data(buf); @@ -6373,13 +6373,13 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, WMA_LOGE("%s: Failed to send reset passpoint network list wmi cmd", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Reset passpoint network list request is sent successfully for vdev %d", req->session_id); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6387,9 +6387,9 @@ CDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, * @wma: WMA handle * @request: SSID hotlist set request from SME * - * Return: CDF_STATUS enumeration + * Return: QDF_STATUS enumeration */ -CDF_STATUS +QDF_STATUS wma_set_ssid_hotlist(tp_wma_handle wma, struct sir_set_ssid_hotlist_request *request) { @@ -6402,17 +6402,17 @@ wma_set_ssid_hotlist(tp_wma_handle wma, if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue hotlist cmd", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!request) { WMA_LOGE("%s: Invalid request buffer", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_EXTSCAN)) { WMA_LOGE("%s: extscan not enabled", __func__); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } /* length of fixed portion */ @@ -6426,7 +6426,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -6481,9 +6481,9 @@ wma_set_ssid_hotlist(tp_wma_handle wma, WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); wmi_buf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif @@ -6496,7 +6496,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, * * Return: CDF status */ -CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) +QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) { wmi_scan_prob_req_oui_cmd_fixed_param *cmd; wmi_buf_t wmi_buf; @@ -6506,13 +6506,13 @@ CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } len = sizeof(*cmd); wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); if (!wmi_buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); cmd = (wmi_scan_prob_req_oui_cmd_fixed_param *) buf_ptr; @@ -6532,9 +6532,9 @@ CDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) WMI_SCAN_PROB_REQ_OUI_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); cdf_nbuf_free(wmi_buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6674,7 +6674,7 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, FL("posting candidate ind to SME")); - if (CDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(candidate_ind); CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, @@ -6753,7 +6753,7 @@ int wma_roam_event_callback(WMA_HANDLE handle, uint8_t *event_buf, * * Return: 0 on success; error number otherwise */ -CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, +QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, struct rssi_monitor_req *req) { wmi_rssi_breach_monitor_config_fixed_param *cmd; @@ -6763,7 +6763,7 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_rssi_breach_monitor_config_fixed_param *) wmi_buf_data(buf); @@ -6794,11 +6794,11 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, if (ret != EOK) { WMA_LOGE("Failed to send WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID"); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGI("Sent WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID to FW"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -6807,16 +6807,16 @@ CDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, * * This function generates the scan id. * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wma_get_scan_id(uint32_t *scan_id) +QDF_STATUS wma_get_scan_id(uint32_t *scan_id) { tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); if (!scan_id) { WMA_LOGE("Scan_id is NULL"); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } /* host need to cycle through the lower 12 bits to generate ids */ @@ -6827,7 +6827,7 @@ CDF_STATUS wma_get_scan_id(uint32_t *scan_id) * by PREFIX 0xA000 */ *scan_id = *scan_id | WMI_HOST_SCAN_REQ_ID_PREFIX; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_LFR_SUBNET_DETECTION @@ -6839,9 +6839,9 @@ CDF_STATUS wma_get_scan_id(uint32_t *scan_id) * This function reads the incoming @req and fill in the destination * WMI structure and sends down the gateway configs down to the firmware * - * Return: CDF_STATUS + * Return: QDF_STATUS */ -CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, +QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req) { wmi_roam_subnet_change_config_fixed_param *cmd; @@ -6852,7 +6852,7 @@ CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } cmd = (wmi_roam_subnet_change_config_fixed_param *) wmi_buf_data(buf); @@ -6884,10 +6884,10 @@ CDF_STATUS wma_set_gateway_params(tp_wma_handle wma, WMA_LOGE("Failed to send gw config parameter to fw, ret: %d", ret); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* FEATURE_LFR_SUBNET_DETECTION */ diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 1f91443b9164..3d72314f1278 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -337,7 +337,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, WMI_STATS_EXT_EVENTID_param_tlvs *param_buf; tSirStatsExtEvent *stats_ext_event; wmi_stats_ext_event_fixed_param *stats_ext_info; - CDF_STATUS status; + QDF_STATUS status; cds_msg_t cds_msg; uint8_t *buf_ptr; uint32_t alloc_len; @@ -374,7 +374,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, cds_msg.bodyval = 0; status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post stats ext event to SME", __func__); cdf_mem_free(stats_ext_event); return -EFAULT; @@ -782,9 +782,9 @@ void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle) * @wma: wma handle * @clearReq: ll stats clear request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_clear_req +QDF_STATUS wma_process_ll_stats_clear_req (tp_wma_handle wma, const tpSirLLStatsClearReq clearReq) { wmi_clear_link_stats_cmd_fixed_param *cmd; @@ -795,7 +795,7 @@ CDF_STATUS wma_process_ll_stats_clear_req if (!clearReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -803,7 +803,7 @@ CDF_STATUS wma_process_ll_stats_clear_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -834,11 +834,11 @@ CDF_STATUS wma_process_ll_stats_clear_req if (ret) { WMA_LOGE("%s: Failed to send clear link stats req", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Clear Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -846,9 +846,9 @@ CDF_STATUS wma_process_ll_stats_clear_req * @wma: wma handle * @setReq: ll stats set request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_set_req +QDF_STATUS wma_process_ll_stats_set_req (tp_wma_handle wma, const tpSirLLStatsSetReq setReq) { wmi_start_link_stats_cmd_fixed_param *cmd; @@ -859,7 +859,7 @@ CDF_STATUS wma_process_ll_stats_set_req if (!setReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -867,7 +867,7 @@ CDF_STATUS wma_process_ll_stats_set_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -892,11 +892,11 @@ CDF_STATUS wma_process_ll_stats_set_req if (ret) { WMA_LOGE("%s: Failed to send set link stats request", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Set Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -904,9 +904,9 @@ CDF_STATUS wma_process_ll_stats_set_req * @wma:wma handle * @getReq:ll stats get request command params * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_process_ll_stats_get_req +QDF_STATUS wma_process_ll_stats_get_req (tp_wma_handle wma, const tpSirLLStatsGetReq getReq) { wmi_request_link_stats_cmd_fixed_param *cmd; @@ -917,7 +917,7 @@ CDF_STATUS wma_process_ll_stats_get_req if (!getReq || !wma) { WMA_LOGE("%s: input pointer is NULL", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } len = sizeof(*cmd); @@ -925,7 +925,7 @@ CDF_STATUS wma_process_ll_stats_get_req if (!buf) { WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return CDF_STATUS_E_NOMEM; + return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -955,11 +955,11 @@ CDF_STATUS wma_process_ll_stats_get_req if (ret) { WMA_LOGE("%s: Failed to send get link stats request", __func__); wmi_buf_free(buf); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } WMA_LOGD("Get Link Layer Stats request sent successfully"); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -1177,7 +1177,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, struct wma_txrx_node *node; uint8_t i; int8_t rssi = 0; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; tAniGetRssiReq *pGetRssiReq = (tAniGetRssiReq *) wma->pGetRssiReq; cds_msg_t sme_msg = { 0 }; @@ -1268,8 +1268,8 @@ static void wma_update_vdev_stats(tp_wma_handle wma, sme_msg.bodyptr = p_snr_req; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post snr ind msg", __func__); cdf_mem_free(p_snr_req); } @@ -1378,7 +1378,7 @@ static void wma_update_peer_stats(tp_wma_handle wma, void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, uint8_t link_status) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; pGetLinkStatus->linkStatus = link_status; @@ -1386,8 +1386,8 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, sme_msg.bodyptr = pGetLinkStatus; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post link status ind msg", __func__); cdf_mem_free(pGetLinkStatus); } @@ -1520,31 +1520,31 @@ int wma_stats_event_handler(void *handle, uint8_t *cmd_param_info, * wma_send_link_speed() - send link speed to SME * @link_speed: link speed * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_send_link_speed(uint32_t link_speed) +QDF_STATUS wma_send_link_speed(uint32_t link_speed) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; tSirLinkSpeedInfo *ls_ind = (tSirLinkSpeedInfo *) cdf_mem_malloc(sizeof(tSirLinkSpeedInfo)); if (!ls_ind) { WMA_LOGE("%s: Memory allocation failed.", __func__); - cdf_status = CDF_STATUS_E_NOMEM; + qdf_status = QDF_STATUS_E_NOMEM; } else { ls_ind->estLinkSpeed = link_speed; sme_msg.type = eWNI_SME_LINK_SPEED_IND; sme_msg.bodyptr = ls_ind; sme_msg.bodyval = 0; - cdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post linkspeed ind msg", __func__); cdf_mem_free(ls_ind); } } - return cdf_status; + return qdf_status; } /** @@ -1560,7 +1560,7 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, { WMI_PEER_ESTIMATED_LINKSPEED_EVENTID_param_tlvs *param_buf; wmi_peer_estimated_linkspeed_event_fixed_param *event; - CDF_STATUS cdf_status; + QDF_STATUS qdf_status; param_buf = (WMI_PEER_ESTIMATED_LINKSPEED_EVENTID_param_tlvs *) cmd_param_info; @@ -1569,8 +1569,8 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } event = param_buf->fixed_param; - cdf_status = wma_send_link_speed(event->est_linkspeed_kbps); - if (!CDF_IS_STATUS_SUCCESS(cdf_status)) { + qdf_status = wma_send_link_speed(event->est_linkspeed_kbps); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { return -EINVAL; } return 0; @@ -1580,11 +1580,11 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, * wma_wni_cfg_dnld() - cfg download request * @handle: wma handle * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) +QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) { - CDF_STATUS cdf_status = CDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; void *mac = cds_get_context(CDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -1592,13 +1592,13 @@ CDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) if (NULL == mac) { WMA_LOGP("%s: Invalid context", __func__); CDF_ASSERT(0); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } process_cfg_download_req(mac); WMA_LOGD("%s: Exit", __func__); - return cdf_status; + return qdf_status; } /** @@ -2047,7 +2047,7 @@ static tAniGetPEStatsRsp *wma_get_stats_rsp_buf stats_rsp_params->statsMask = get_stats_param->statsMask; stats_rsp_params->msgType = WMA_GET_STATISTICS_RSP; stats_rsp_params->msgLen = len - sizeof(tAniGetPEStatsRsp); - stats_rsp_params->rc = CDF_STATUS_SUCCESS; + stats_rsp_params->rc = QDF_STATUS_SUCCESS; return stats_rsp_params; } @@ -2122,7 +2122,7 @@ void wma_get_stats_req(WMA_HANDLE handle, goto end; failed: - pGetPEStatsRspParams->rc = CDF_STATUS_E_FAILURE; + pGetPEStatsRspParams->rc = QDF_STATUS_E_FAILURE; node->stats_rsp = NULL; /* send response to UMAC */ wma_send_msg(wma_handle, WMA_GET_STATISTICS_RSP, pGetPEStatsRspParams, @@ -2301,7 +2301,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle) uint8_t *payload; uint32_t data_len; cds_msg_t msg = { 0 }; - CDF_STATUS status; + QDF_STATUS status; ret = wma_utf_rsp(wma_handle, &payload, &data_len); @@ -2315,7 +2315,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle) status = cds_mq_post_message(CDS_MQ_ID_SYS, &msg); - if (status != CDF_STATUS_SUCCESS) { + if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("failed to post ftm response to SYS"); cdf_mem_free(payload); } @@ -2537,9 +2537,9 @@ int wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data, uint16_t len) * @wma_handle: wma handle * @msg_buffer: message buffer * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS +QDF_STATUS wma_process_ftm_command(tp_wma_handle wma_handle, struct ar6k_testmode_cmd_data *msg_buffer) { @@ -2548,13 +2548,13 @@ wma_process_ftm_command(tp_wma_handle wma_handle, int ret; if (!msg_buffer) - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { WMA_LOGE("FTM command issued in non-FTM mode"); cdf_mem_free(msg_buffer->data); cdf_mem_free(msg_buffer); - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } data = msg_buffer->data; @@ -2566,9 +2566,9 @@ wma_process_ftm_command(tp_wma_handle wma_handle, cdf_mem_free(msg_buffer); if (ret) - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif /* QCA_WIFI_FTM */ @@ -2578,9 +2578,9 @@ wma_process_ftm_command(tp_wma_handle wma_handle, * @pVersion: version pointer * @versionBufferSize: buffer size * - * Return: CDF_STATUS_SUCCESS for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, +QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint8_t *pVersion, uint32_t versionBufferSize) { @@ -2589,12 +2589,12 @@ CDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, if (NULL == wma_handle) { WMA_LOGE("%s: Failed to get wma", __func__); - return CDF_STATUS_E_FAULT; + return QDF_STATUS_E_FAULT; } snprintf(pVersion, versionBufferSize, "%x", (unsigned int)wma_handle->target_fw_version); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2780,7 +2780,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, * * Return: Success if hw mode is obtained and the hw mode params */ -CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, +QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, struct sir_hw_mode_params *hw_mode) { tp_wma_handle wma; @@ -2789,17 +2789,17 @@ CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (idx > wma->num_dbs_hw_modes) { WMA_LOGE("%s: Invalid index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (!wma->num_dbs_hw_modes) { WMA_LOGE("%s: No dbs hw modes available", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } param = wma->hw_mode.hw_mode_list[idx]; @@ -2813,7 +2813,7 @@ CDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, hw_mode->dbs_cap = WMI_DBS_HW_MODE_DBS_MODE_GET(param); hw_mode->agile_dfs_cap = WMI_DBS_HW_MODE_AGILE_DFS_GET(param); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -2975,7 +2975,7 @@ int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id) * otherwise. When no HW mode transition has happened the values of * old_hw_mode_index and new_hw_mode_index will be the same. */ -CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, +QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, uint32_t *new_hw_mode_index) { tp_wma_handle wma; @@ -2983,13 +2983,13 @@ CDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_INVAL; + return QDF_STATUS_E_INVAL; } *old_hw_mode_index = wma->old_hw_mode_index; *new_hw_mode_index = wma->new_hw_mode_index; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3055,7 +3055,7 @@ void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, * false values of one_by_one_dbs/two_by_two_dbs, * indicate DBS is disabled */ -CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) +QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) { tp_wma_handle wma; uint32_t i; @@ -3069,14 +3069,14 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) if (wma_is_hw_dbs_capable() == false) { WMA_LOGE("%s: HW is not DBS capable", __func__); /* Caller will understand that DBS is disabled */ - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } /* To check 1x1 capability */ @@ -3138,7 +3138,7 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) if (found_two_by_two >= 0) *two_by_two_dbs = true; - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3150,31 +3150,31 @@ CDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) * * Return: Success if the current HW mode params are successfully populated */ -CDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode) +QDF_STATUS wma_get_current_hw_mode(struct sir_hw_mode_params *hw_mode) { - CDF_STATUS status; + QDF_STATUS status; uint32_t old_hw_index = 0, new_hw_index = 0; WMA_LOGI("%s: Get the current hw mode", __func__); status = wma_get_old_and_new_hw_index(&old_hw_index, &new_hw_index); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to get HW mode index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } if (new_hw_index == WMA_DEFAULT_HW_MODE_INDEX) { WMA_LOGE("%s: HW mode is not yet initialized", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } status = wma_get_hw_mode_from_idx(new_hw_index, hw_mode); - if (CDF_STATUS_SUCCESS != status) { + if (QDF_STATUS_SUCCESS != status) { WMA_LOGE("%s: Failed to get HW mode index", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3258,7 +3258,7 @@ bool wma_is_agile_dfs_enable(void) * * Return: 0 on success */ -CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, +QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, bool dbs_scan, bool dbs_plus_agile_scan, bool single_mac_scan_with_dfs) @@ -3268,7 +3268,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *scan_config = wma->dual_mac_cfg.cur_scan_config; @@ -3279,7 +3279,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, single_mac_scan_with_dfs); WMA_LOGD("%s: *scan_config:%x ", __func__, *scan_config); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** @@ -3294,7 +3294,7 @@ CDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, * * Return: 0 on success */ -CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, +QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, bool dbs, bool agile_dfs) { @@ -3303,7 +3303,7 @@ CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, wma = cds_get_context(CDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); - return CDF_STATUS_E_FAILURE; + return QDF_STATUS_E_FAILURE; } *fw_mode_config = wma->dual_mac_cfg.cur_fw_mode_config; @@ -3311,7 +3311,7 @@ CDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, WMI_DBS_FW_MODE_CFG_AGILE_DFS_SET(*fw_mode_config, agile_dfs); WMA_LOGD("%s: *fw_mode_config:%x ", __func__, *fw_mode_config); - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } /** -- cgit v1.2.3 From 50220ce67c2d9a67decf6995ccdadf96f21b815b Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Thu, 18 Feb 2016 20:11:33 +0530 Subject: qcacld-3.0: Add qdf time API's Replace CDF time API's with QDF time API's. Change-Id: I3418f5603e5a05219a8470de3a9197928a3a8f13 CRs-Fixed: 981188 --- core/cdf/inc/cdf_time.h | 202 ----------------------- core/cdf/inc/osdep.h | 12 +- core/cdf/src/cdf_trace.c | 8 +- core/cdf/src/i_cdf_time.h | 217 ------------------------- core/cds/src/cds_api.c | 2 +- core/dp/htt/htt_rx.c | 2 +- core/dp/htt/htt_tx.c | 2 +- core/dp/txrx/ol_rx_defrag.c | 8 +- core/dp/txrx/ol_rx_pn.c | 4 +- core/dp/txrx/ol_rx_reorder.c | 6 +- core/dp/txrx/ol_rx_reorder_timeout.c | 8 +- core/dp/txrx/ol_tx_desc.c | 4 +- core/dp/txrx/ol_tx_send.c | 10 +- core/dp/txrx/ol_txrx.c | 6 +- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_ext_scan.c | 4 +- core/hdd/src/wlan_hdd_main.c | 2 +- core/hdd/src/wlan_hdd_tx_rx.c | 2 +- core/sap/dfs/inc/dfs.h | 4 +- core/sap/dfs/src/dfs_nol.c | 20 +-- core/sme/src/csr/csr_neighbor_roam.c | 2 +- core/utils/logging/src/wlan_logging_sock_svc.c | 6 +- core/wmi/wmi_unified.c | 30 ++-- 23 files changed, 72 insertions(+), 491 deletions(-) delete mode 100644 core/cdf/inc/cdf_time.h delete mode 100644 core/cdf/src/i_cdf_time.h diff --git a/core/cdf/inc/cdf_time.h b/core/cdf/inc/cdf_time.h deleted file mode 100644 index 58314c18106a..000000000000 --- a/core/cdf/inc/cdf_time.h +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_time - * This file abstracts time related functionality. - */ - -#ifndef _CDF_OS_TIME_H -#define _CDF_OS_TIME_H - -#include -#ifdef CONFIG_CNSS -#include -#endif - -typedef __cdf_time_t cdf_time_t; - -/** - * cdf_system_ticks() - Count the number of ticks elapsed from the time when - * the system booted - * - * Return: ticks - */ -static inline unsigned long cdf_system_ticks(void) -{ - return __cdf_system_ticks(); -} - -/** - * cdf_system_ticks_to_msecs() - convert ticks to milliseconds - * @clock_ticks: Number of ticks - * - * Return: Time in milliseconds - */ -static inline uint32_t cdf_system_ticks_to_msecs(unsigned long clock_ticks) -{ - return __cdf_system_ticks_to_msecs(clock_ticks); -} - -/** - * cdf_system_msecs_to_ticks() - convert milliseconds to ticks - * @msec: Time in milliseconds - * - * Return: number of ticks - */ -static inline unsigned long cdf_system_msecs_to_ticks(uint32_t msecs) -{ - return __cdf_system_msecs_to_ticks(msecs); -} - -/** - * cdf_get_system_uptime() - Return a monotonically increasing time. - * This increments once per HZ ticks - * - * Return: system up time - */ -static inline unsigned long cdf_get_system_uptime(void) -{ - return __cdf_get_system_uptime(); -} - -/** - * cdf_get_system_timestamp() - brief Return current timestamp - * - * Return: none - */ -static inline unsigned long cdf_get_system_timestamp(void) -{ - return __cdf_get_system_timestamp(); -} - -/** - * cdf_udelay() - delay in microseconds - * @usecs: Number of microseconds to delay - * - * Return: none - */ -static inline void cdf_udelay(int usecs) -{ - __cdf_udelay(usecs); -} - -/** - * cdf_mdelay() - Delay in milliseconds. - * @msec: Number of milliseconds to delay - * - * Return: none - */ -static inline void cdf_mdelay(int msecs) -{ - __cdf_mdelay(msecs); -} - -/* Check if _a is later than _b */ -#define cdf_system_time_after(_a, _b) __cdf_system_time_after(_a, _b) - -/* Check if _a is prior to _b */ -#define cdf_system_time_before(_a, _b) __cdf_system_time_before(_a, _b) - -/* Check if _a atleast as recent as _b, if not later */ -#define cdf_system_time_after_eq(_a, _b) __cdf_system_time_after_eq(_a, _b) - -/** - * enum cdf_timestamp_unit - what unit the cdf timestamp is in - * @KERNEL_LOG: boottime time in uS (micro seconds) - * @KERNEL_LOG: QTIME in (1/19200)S - * - * This enum is used to distinguish which timer source is used. - */ -enum cdf_timestamp_unit { - KERNEL_LOG, - QTIMER, -}; - -#ifdef QCA_WIFI_3_0_ADRASTEA -#define CDF_LOG_TIMESTAMP_UNIT QTIMER -#else -#define CDF_LOG_TIMESTAMP_UNIT KERNEL_LOG -#endif - -#ifdef QCA_WIFI_3_0_ADRASTEA -/** - * cdf_get_log_timestamp() - get time stamp for logging - * - * For adrastea this API returns QTIMER tick which is needed to synchronize - * host and fw log timestamps - * - * For ROME and other discrete solution this API returns system boot time stamp - * - * Return: - * QTIMER ticks(19.2MHz) for adrastea - * System tick for rome and other future discrete solutions - */ -static inline uint64_t cdf_get_log_timestamp(void) -{ - return __cdf_get_qtimer_ticks(); -} -#else -/** - * cdf_get_log_timestamp() - get time stamp for logging - * - * For adrastea this API returns QTIMER tick which is needed to synchronize - * host and fw log timestamps - * - * For ROME and other discrete solution this API returns system boot time stamp - * - * Return: - * QTIMER ticks(19.2MHz) for adrastea - * System tick for rome and other future discrete solutions - */ -static inline uint64_t cdf_get_log_timestamp(void) -{ -#ifdef CONFIG_CNSS - struct timespec ts; - - cnss_get_boottime(&ts); - - return ((uint64_t) ts.tv_sec * 1000000) + (ts.tv_nsec / 1000); -#else - return cdf_system_ticks_to_msecs(cdf_system_ticks()) * 1000; -#endif /* CONFIG_CNSS */ -} -#endif /* QCA_WIFI_3_0_ADRASTEA */ - -/** - * cdf_get_monotonic_boottime() - get monotonic kernel boot time - * This API is similar to cdf_get_system_boottime but it includes - * time spent in suspend. - * - * Return: Time in microseconds - */ -static inline uint64_t cdf_get_monotonic_boottime(void) -{ - return __cdf_get_monotonic_boottime(); -} - -#endif diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index a14a65390512..3f249fd74898 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -138,7 +138,7 @@ typedef struct hal_bus_context { /* * Normal Delay functions. Time specified in microseconds. */ -#define OS_DELAY(_us) cdf_udelay(_us) +#define OS_DELAY(_us) qdf_udelay(_us) /* * memory data manipulation functions. @@ -182,12 +182,12 @@ typedef struct hal_bus_context { /* * System time interface */ -typedef cdf_time_t systime_t; -typedef cdf_time_t systick_t; +typedef qdf_time_t systime_t; +typedef qdf_time_t systick_t; -static INLINE cdf_time_t os_get_timestamp(void) +static INLINE qdf_time_t os_get_timestamp(void) { - return cdf_system_ticks(); /* Fix double conversion from jiffies to ms */ + return qdf_system_ticks(); /* Fix double conversion from jiffies to ms */ } struct _NIC_DEV; diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index 1d1cba9eea5a..f0ad0ec95661 100644 --- a/core/cdf/src/cdf_trace.c +++ b/core/cdf/src/cdf_trace.c @@ -38,12 +38,12 @@ #include #include #include -#include "cdf_time.h" +#include "qdf_time.h" /* Preprocessor definitions and constants */ #define CDF_TRACE_BUFFER_SIZE (512) -enum cdf_timestamp_unit cdf_log_timestamp_type = CDF_LOG_TIMESTAMP_UNIT; +enum qdf_timestamp_unit qdf_log_timestamp_type = QDF_LOG_TIMESTAMP_UNIT; /* macro to map cdf trace levels into the bitmask */ #define CDF_TRACE_LEVEL_TO_MODULE_BITMASK(_level) ((1 << (_level))) @@ -539,7 +539,7 @@ void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data) rec->code = code; rec->session = session; rec->data = data; - rec->time = cdf_get_log_timestamp(); + rec->time = qdf_get_log_timestamp(); rec->module = module; rec->pid = (in_interrupt() ? 0 : current->pid); g_cdf_trace_data.numSinceLastDump++; @@ -927,7 +927,7 @@ register_record: break; } } - rec->time = cdf_get_log_timestamp(); + rec->time = qdf_get_log_timestamp(); rec->pid = (in_interrupt() ? 0 : current->pid); spin_unlock_bh(&l_dp_trace_lock); } diff --git a/core/cdf/src/i_cdf_time.h b/core/cdf/src/i_cdf_time.h deleted file mode 100644 index 08cf5b4a15e4..000000000000 --- a/core/cdf/src/i_cdf_time.h +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: i_cdf_time.h - * - * Linux specific CDF timing APIs implementation - */ - -#ifndef _I_CDF_TIME_H -#define _I_CDF_TIME_H - -#include -#include -#include -#ifdef CONFIG_CNSS -#include -#endif - -typedef unsigned long __cdf_time_t; - -/** - * __cdf_system_ticks() - get system ticks - * - * Return: system tick in jiffies - */ -static inline __cdf_time_t __cdf_system_ticks(void) -{ - return jiffies; -} - -/** - * __cdf_system_ticks_to_msecs() - convert system ticks into milli seconds - * @ticks: System ticks - * - * Return: system tick converted into milli seconds - */ -static inline uint32_t __cdf_system_ticks_to_msecs(unsigned long ticks) -{ - return jiffies_to_msecs(ticks); -} - -/** - * __cdf_system_msecs_to_ticks() - convert milli seconds into system ticks - * @msecs: Milli seconds - * - * Return: milli seconds converted into system ticks - */ -static inline __cdf_time_t __cdf_system_msecs_to_ticks(uint32_t msecs) -{ - return msecs_to_jiffies(msecs); -} - -/** - * __cdf_get_system_uptime() - get system uptime - * - * Return: system uptime in jiffies - */ -static inline __cdf_time_t __cdf_get_system_uptime(void) -{ - return jiffies; -} - -static inline __cdf_time_t __cdf_get_system_timestamp(void) -{ - return (jiffies / HZ) * 1000 + (jiffies % HZ) * (1000 / HZ); -} - -/** - * __cdf_udelay() - delay execution for given microseconds - * @usecs: Micro seconds to delay - * - * Return: none - */ -static inline void __cdf_udelay(uint32_t usecs) -{ -#ifdef CONFIG_ARM - /* - * This is in support of XScale build. They have a limit on the udelay - * value, so we have to make sure we don't approach the limit - */ - - uint32_t mticks; - uint32_t leftover; - int i; - - /* slice into 1024 usec chunks (simplifies calculation) */ - - mticks = usecs >> 10; - leftover = usecs - (mticks << 10); - - for (i = 0; i < mticks; i++) - udelay(1024); - - udelay(leftover); - -#else - /* Normal Delay functions. Time specified in microseconds */ - udelay(usecs); - -#endif -} - -/** - * __cdf_mdelay() - delay execution for given milli seconds - * @usecs: Milli seconds to delay - * - * Return: none - */ -static inline void __cdf_mdelay(uint32_t msecs) -{ - mdelay(msecs); -} - -/** - * __cdf_system_time_after() - Check if a is later than b - * @a: Time stamp value a - * @b: Time stamp value b - * - * Return: - * true if a < b else false - */ -static inline bool __cdf_system_time_after(__cdf_time_t a, __cdf_time_t b) -{ - return (long)(b) - (long)(a) < 0; -} - -/** - * __cdf_system_time_before() - Check if a is before b - * @a: Time stamp value a - * @b: Time stamp value b - * - * Return: - * true if a is before b else false - */ -static inline bool __cdf_system_time_before(__cdf_time_t a, __cdf_time_t b) -{ - return __cdf_system_time_after(b, a); -} - -/** - * __cdf_system_time_before() - Check if a atleast as recent as b, if not - * later - * @a: Time stamp value a - * @b: Time stamp value b - * - * Return: - * true if a >= b else false - */ -static inline bool __cdf_system_time_after_eq(__cdf_time_t a, __cdf_time_t b) -{ - return (long)(a) - (long)(b) >= 0; -} - -/** - * __cdf_get_monotonic_boottime() - get monotonic kernel boot time - * This API is similar to cdf_get_system_boottime but it includes - * time spent in suspend. - * - * Return: Time in microseconds - */ -#ifdef CONFIG_CNSS -static inline uint64_t __cdf_get_monotonic_boottime(void) -{ - struct timespec ts; - - cnss_get_monotonic_boottime(&ts); - - return ((uint64_t) ts.tv_sec * 1000000) + (ts.tv_nsec / 1000); -} -#else -static inline uint64_t __cdf_get_monotonic_boottime(void) -{ - return __cdf_system_ticks_to_msecs(__cdf_system_ticks()) * 1000; -} -#endif /* CONFIG_CNSS */ - -#ifdef QCA_WIFI_3_0_ADRASTEA -/** - * __cdf_get_qtimer_ticks() - get QTIMER ticks - * - * Returns QTIMER(19.2 MHz) clock ticks. To convert it into seconds - * divide it by 19200. - * - * Return: QTIMER(19.2 MHz) clock ticks - */ -static inline uint64_t __cdf_get_qtimer_ticks(void) -{ - return arch_counter_get_cntpct(); -} -#endif /* QCA_WIFI_3_0_ADRASTEA */ - -#endif diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 7b49adf4516a..b1455353f0bb 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1663,7 +1663,7 @@ uint64_t cds_get_monotonic_boottime(void) cnss_get_monotonic_boottime(&ts); return ((uint64_t) ts.tv_sec * 1000000) + (ts.tv_nsec / 1000); #else - return ((uint64_t)cdf_system_ticks_to_msecs(cdf_system_ticks()) * + return ((uint64_t)qdf_system_ticks_to_msecs(qdf_system_ticks()) * 1000); #endif } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 6e6a9142d6a4..768736f22a31 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -877,7 +877,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, while (dbg_iter && (!((*(uint32_t *) &rx_desc->attention) & RX_ATTENTION_0_MSDU_DONE_MASK))) { - cdf_mdelay(1); + qdf_mdelay(1); cdf_invalidate_range((void *)rx_desc, (void *)((char *)rx_desc + diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 499ccad7c7ea..d0255ca210fc 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -40,7 +40,7 @@ #include /* cdf_dma_addr_t */ #include /* cdf_os_mem_alloc_consistent et al */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_mdelay */ +#include /* qdf_mdelay */ #include /* htt_tx_msdu_desc_t */ #include /* HTC_HDR_LENGTH */ diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index 33e829ed5ebf..74cbe897998a 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -68,7 +68,7 @@ #include #include #include -#include /* cdf_system_time */ +#include /* qdf_system_time */ #define DEFRAG_IEEE80211_ADDR_EQ(a1, a2) \ (cdf_mem_compare(a1, a2, IEEE80211_ADDR_LEN) == 0) @@ -279,7 +279,7 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, peer->tids_rx_reorder[tid].defrag_timeout_ms = 0; peer->tids_last_seq[tid] = seq_num; } else if (pdev->rx.flags.defrag_timeout_check) { - uint32_t now_ms = cdf_system_ticks_to_msecs(cdf_system_ticks()); + uint32_t now_ms = qdf_system_ticks_to_msecs(qdf_system_ticks()); peer->tids_rx_reorder[tid].defrag_timeout_ms = now_ms + pdev->rx.defrag.timeout_ms; @@ -419,7 +419,7 @@ void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned tid) void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev) { struct ol_rx_reorder_t *rx_reorder, *tmp; - uint32_t now_ms = cdf_system_ticks_to_msecs(cdf_system_ticks()); + uint32_t now_ms = qdf_system_ticks_to_msecs(qdf_system_ticks()); TAILQ_FOREACH_SAFE(rx_reorder, &pdev->rx.defrag.waitlist, defrag_waitlist_elem, tmp) { diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 74ffdda985e9..f61ccd1b447b 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -161,7 +161,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, */ msdu = mpdu; current_time_ms = - cdf_system_ticks_to_msecs(cdf_system_ticks()); + qdf_system_ticks_to_msecs(qdf_system_ticks()); if (TXRX_PN_CHECK_FAILURE_PRINT_PERIOD_MS < (current_time_ms - last_pncheck_print_time)) { last_pncheck_print_time = current_time_ms; diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index da0d486dddeb..79e42e743306 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -656,8 +656,8 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, htt_rx_mpdu_desc_pn(htt_pdev, rx_desc, &pn, pn_len); - current_time_ms = cdf_system_ticks_to_msecs( - cdf_system_ticks()); + current_time_ms = qdf_system_ticks_to_msecs( + qdf_system_ticks()); if (TXRX_PN_CHECK_FAILURE_PRINT_PERIOD_MS < (current_time_ms - last_pncheck_print_time)) { diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index cc2e2a32c78f..f4e80775877e 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,7 +29,7 @@ /* generic utilities */ #include /* cdf_nbuf_t, etc. */ #include -#include +#include /* datapath internal interfaces */ #include /* ol_txrx_pdev_t, etc. */ @@ -91,7 +91,7 @@ ol_rx_reorder_timeout_add(struct ol_txrx_peer_t *peer, uint8_t tid) list_elem->tid = tid; /* set the expiration timestamp */ - time_now_ms = cdf_system_ticks_to_msecs(cdf_system_ticks()); + time_now_ms = qdf_system_ticks_to_msecs(qdf_system_ticks()); list_elem->timestamp_ms = time_now_ms + rx_reorder_timeout_ac->duration_ms; @@ -133,7 +133,7 @@ static void ol_rx_reorder_timeout(void *arg) struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac; rx_reorder_timeout_ac = (struct ol_tx_reorder_cat_timeout_t *)arg; - time_now_ms = cdf_system_ticks_to_msecs(cdf_system_ticks()); + time_now_ms = qdf_system_ticks_to_msecs(qdf_system_ticks()); pdev = rx_reorder_timeout_ac->pdev; cdf_spin_lock(&pdev->rx.mutex); diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 48499e818a8e..4a70fdb81462 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -30,7 +30,7 @@ #include /* cdf_assert */ #include /* cdf_spinlock */ #ifdef QCA_COMPUTE_TX_DELAY -#include /* cdf_system_ticks */ +#include /* qdf_system_ticks */ #endif #include /* htt_tx_desc_id */ @@ -79,7 +79,7 @@ static inline void ol_tx_desc_compute_delay(struct ol_tx_desc_t *tx_desc) __func__, tx_desc->entry_timestamp_ticks); cdf_assert(0); } - tx_desc->entry_timestamp_ticks = cdf_system_ticks(); + tx_desc->entry_timestamp_ticks = qdf_system_ticks(); } static inline void ol_tx_desc_reset_timestamp(struct ol_tx_desc_t *tx_desc) { diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index bc762694cecf..e729f0241e78 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -27,7 +27,7 @@ #include /* cdf_atomic_inc, etc. */ #include /* cdf_os_spinlock */ -#include /* cdf_system_ticks, etc. */ +#include /* qdf_system_ticks, etc. */ #include /* cdf_nbuf_t */ #include /* ADF_NBUF_TX_EXT_TID_INVALID */ @@ -655,7 +655,7 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, void ol_tx_set_compute_interval(ol_txrx_pdev_handle pdev, uint32_t interval) { - pdev->tx_delay.avg_period_ticks = cdf_system_msecs_to_ticks(interval); + pdev->tx_delay.avg_period_ticks = qdf_system_msecs_to_ticks(interval); } void @@ -707,7 +707,7 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, ol_tx_delay_avg(data->avgs.transmit_sum_ticks, data->avgs.transmit_num); *tx_delay_microsec = - cdf_system_ticks_to_msecs(avg_delay_ticks * 1000); + qdf_system_ticks_to_msecs(avg_delay_ticks * 1000); } else { /* * This case should only happen if there's a query @@ -720,7 +720,7 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, ol_tx_delay_avg(data->avgs.queue_sum_ticks, data->avgs.queue_num); *queue_delay_microsec = - cdf_system_ticks_to_msecs(avg_delay_ticks * 1000); + qdf_system_ticks_to_msecs(avg_delay_ticks * 1000); } else { /* * This case should only happen if there's a query @@ -889,7 +889,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, uint16_t *desc_ids, int num_msdus) { int i, index, cat; - uint32_t now_ticks = cdf_system_ticks(); + uint32_t now_ticks = qdf_system_ticks(); uint32_t tx_delay_transmit_ticks, tx_delay_queue_ticks; uint32_t avg_time_ticks; struct ol_tx_delay_data *data; diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 9e49c6dcf8f4..f8629ba4315f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -874,11 +874,11 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) cdf_spinlock_init(&pdev->tx_delay.mutex); /* initialize compute interval with 5 seconds (ESE default) */ - pdev->tx_delay.avg_period_ticks = cdf_system_msecs_to_ticks(5000); + pdev->tx_delay.avg_period_ticks = qdf_system_msecs_to_ticks(5000); { uint32_t bin_width_1000ticks; bin_width_1000ticks = - cdf_system_msecs_to_ticks + qdf_system_msecs_to_ticks (QCA_TX_DELAY_HIST_INTERNAL_BIN_WIDTH_MS * 1000); /* @@ -1345,7 +1345,7 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, if (wait_on_deletion) { /* wait for peer deletion */ rc = qdf_wait_single_event(&vdev->wait_delete_comp, - cdf_system_msecs_to_ticks(PEER_DELETION_TIMEOUT)); + qdf_system_msecs_to_ticks(PEER_DELETION_TIMEOUT)); if (!rc) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "timedout waiting for peer(%d) deletion\n", diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index fb6a0eb517b8..8b05e0c35388 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -806,7 +806,7 @@ struct hdd_netif_queue_stats { * @pause_map: pause map */ struct hdd_netif_queue_history { - cdf_time_t time; + qdf_time_t time; uint16_t netif_action; uint16_t netif_reason; uint32_t pause_map; diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index 65d31d5d780d..d2179910cabc 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -544,7 +544,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(void *ctx, data->ap_found); for (i = 0; i < data->numOfAps; i++) { - data->ap[i].ts = cdf_get_monotonic_boottime(); + data->ap[i].ts = qdf_get_monotonic_boottime(); hddLog(LOG1, "[i=%d] Timestamp %llu " "Ssid: %s " @@ -3256,7 +3256,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, goto fail; } - pHddCtx->ext_scan_start_since_boot = cdf_get_monotonic_boottime(); + pHddCtx->ext_scan_start_since_boot = qdf_get_monotonic_boottime(); hddLog(LOG1, FL("Timestamp since boot: %llu"), pHddCtx->ext_scan_start_since_boot); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 1f26a1bb802e..ba20df84a534 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4443,7 +4443,7 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) for (i = 0; i < WLAN_HDD_MAX_HISTORY_ENTRY; i++) { hddLog(CDF_TRACE_LEVEL_ERROR, "%d: %u: %s: %s: %x", - i, cdf_system_ticks_to_msecs( + i, qdf_system_ticks_to_msecs( adapter->queue_oper_history[i].time), hdd_action_type_to_string( adapter->queue_oper_history[i].netif_action), diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 1aec90ab677c..3826d725c048 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -1044,7 +1044,7 @@ void wlan_hdd_netif_queue_control(hdd_adapter_t *adapter, wlan_hdd_update_queue_oper_stats(adapter, action, reason); adapter->queue_oper_history[adapter->history_index].time = - cdf_system_ticks(); + qdf_system_ticks(); adapter->queue_oper_history[adapter->history_index].netif_action = action; adapter->queue_oper_history[adapter->history_index].netif_reason = diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index f3bdff8e7efb..e65543fbf519 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2005-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,7 +53,7 @@ #include /* cdf_assert */ #include /* cdf_spinlock */ #include /* TAILQ */ -#include +#include #include #include #include diff --git a/core/sap/dfs/src/dfs_nol.c b/core/sap/dfs/src/dfs_nol.c index 278bc31bc452..400e5159ea16 100644 --- a/core/sap/dfs/src/dfs_nol.c +++ b/core/sap/dfs/src/dfs_nol.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_nol.c + dfs_nol.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -63,7 +63,7 @@ #if defined(ATH_SUPPORT_DFS) && !defined(ATH_DFS_RADAR_DETECTION_ONLY) #include "dfs_ioctl.h" #include "dfs_ioctl_private.h" -#include "cdf_time.h" /* cdf_time_t, cdf_system_time_after */ +#include "qdf_time.h" /* qdf_time_t, qdf_system_time_after */ static void dfs_nol_delete(struct ath_dfs *dfs, uint16_t delfreq, uint16_t delchwidth); @@ -113,7 +113,7 @@ void dfs_print_nol(struct ath_dfs *dfs) DFS_DPRINTK(dfs, ATH_DEBUG_DFS_NOL, "%s: NOL", __func__); while (nol != NULL) { diff_ms = - cdf_system_ticks_to_msecs(cdf_system_ticks() - + qdf_system_ticks_to_msecs(qdf_system_ticks() - nol->nol_start_ticks); diff_ms = (nol->nol_timeout_ms - diff_ms); remaining_sec = diff_ms / 1000; /* convert to seconds */ @@ -160,7 +160,7 @@ void dfs_set_nol(struct ath_dfs *dfs, struct dfsreq_nolelem *dfs_nol, int nchan) for (i = 0; i < nchan; i++) { nol_time_left_ms = - cdf_system_ticks_to_msecs(cdf_system_ticks() - + qdf_system_ticks_to_msecs(qdf_system_ticks() - dfs_nol[i].nol_start_ticks); if (nol_time_left_ms < dfs_nol[i].nol_timeout_ms) { chan.ic_freq = dfs_nol[i].nol_freq; @@ -198,7 +198,7 @@ dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan, while (nol != NULL) { if ((nol->nol_freq == chan->ic_freq) && (nol->nol_chwidth == ch_width)) { - nol->nol_start_ticks = cdf_system_ticks(); + nol->nol_start_ticks = qdf_system_ticks(); nol->nol_timeout_ms = dfs_nol_timeout * TIME_IN_MS; DFS_DPRINTK(dfs, ATH_DEBUG_DFS_NOL, "%s: Update OS Ticks for NOL %d MHz / %d MHz", @@ -228,7 +228,7 @@ dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan, } elem->nol_freq = chan->ic_freq; elem->nol_chwidth = ch_width; - elem->nol_start_ticks = cdf_system_ticks(); + elem->nol_start_ticks = qdf_system_ticks(); elem->nol_timeout_ms = dfs_nol_timeout * TIME_IN_MS; elem->nol_next = NULL; if (prev) { @@ -285,8 +285,8 @@ dfs_nol_delete(struct ath_dfs *dfs, uint16_t delfreq, uint16_t delchwidth) DFS_DPRINTK(dfs, ATH_DEBUG_DFS_NOL, "%s removing channel %d/%dMHz from NOL tstamp=%d", __func__, nol->nol_freq, nol->nol_chwidth, - (cdf_system_ticks_to_msecs - (cdf_system_ticks()) / 1000)); + (qdf_system_ticks_to_msecs + (qdf_system_ticks()) / 1000)); OS_CANCEL_TIMER(&nol->nol_timer); OS_FREE(nol); nol = NULL; diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index ba92198d1d09..41034a8d8e4a 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1402,7 +1402,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, uint32_t cur_ap_rssi; uint32_t age_ticks = 0; uint32_t limit_ticks = - cdf_system_msecs_to_ticks(ROAM_AP_AGE_LIMIT_MS); + qdf_system_msecs_to_ticks(ROAM_AP_AGE_LIMIT_MS); uint8_t num_candidates = 0; uint8_t num_dropped = 0; /* diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 60cbfb3b1bb6..09fec12a8890 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include "pktlog_ac.h" #include @@ -322,7 +322,7 @@ int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length) return 0; } - ts = cdf_get_log_timestamp(); + ts = qdf_get_log_timestamp(); tlen = wlan_add_user_log_time_stamp(tbuf, sizeof(tbuf), ts); /* 1+1 indicate '\n'+'\0' */ diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index e57c4610fceb..4daab4026b80 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -70,7 +70,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; wmi_command_log_buffer[g_wmi_command_buf_idx].command = a; \ cdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \ wmi_command_log_buffer[g_wmi_command_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_command_buf_idx++; \ } @@ -81,7 +81,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; cdf_mem_copy(wmi_command_tx_cmp_log_buffer \ [g_wmi_command_tx_cmp_buf_idx].data, b, 16); \ wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_command_tx_cmp_buf_idx++; \ } @@ -91,17 +91,17 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; wmi_event_log_buffer[g_wmi_event_buf_idx].event = a; \ cdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \ wmi_event_log_buffer[g_wmi_event_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_event_buf_idx++; \ } -#define WMI_RX_EVENT_RECORD(a,b) { \ +#define WMI_RX_EVENT_RECORD(a, b) { \ if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_rx_event_buf_idx) \ g_wmi_rx_event_buf_idx = 0; \ wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].event = a; \ cdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \ wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_rx_event_buf_idx++; \ } /* wmi_mgmt commands */ @@ -130,7 +130,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].data,\ b, 16); \ wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_mgmt_command_buf_idx++; \ } @@ -144,7 +144,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; [g_wmi_mgmt_command_tx_cmp_buf_idx].data, b, 16); \ wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\ time =\ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_mgmt_command_tx_cmp_buf_idx++; \ } @@ -155,7 +155,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; cdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\ b, 16); \ wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].time = \ - cdf_get_log_timestamp(); \ + qdf_get_log_timestamp(); \ g_wmi_mgmt_event_buf_idx++; \ } @@ -168,7 +168,7 @@ int wmi_get_host_credits(wmi_unified_t wmi_handle); #ifdef MEMORY_DEBUG wmi_buf_t wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name, - uint32_t line_num) + uint32_t line_num) { wmi_buf_t wmi_buf; @@ -855,7 +855,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, SET_HTC_PACKET_INFO_TX(pkt, NULL, cdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR), - /* htt_host_data_dl_len(buf)+20 */ + /* htt_host_data_dl_len(buf)+20 */ wmi_handle->wmi_endpoint_id, htc_tag); SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf); @@ -883,7 +883,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, pr_err("%s %d, htc_send_pkt failed\n", __func__, __LINE__); } - return ((status == A_OK) ? EOK : -1); + return (status == A_OK) ? EOK : -1; } /* WMI Event handler register API */ @@ -928,8 +928,8 @@ int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, WMI_EVT_ID event_id) { uint32_t idx = 0; - if ((idx = - wmi_unified_get_event_handler_ix(wmi_handle, event_id)) == -1) { + idx = wmi_unified_get_event_handler_ix(wmi_handle, event_id); + if (idx == -1) { printk("%s : event handler is not registered: event id 0x%x \n", __func__, event_id); return -1; @@ -1344,8 +1344,8 @@ wmi_unified_connect_htc_service(struct wmi_unified *wmi_handle, /* connect to control service */ connect.service_id = WMI_CONTROL_SVC; - if ((status = - htc_connect_service(htc_handle, &connect, &response)) != EOK) { + status = htc_connect_service(htc_handle, &connect, &response); + if (status != EOK) { printk (" Failed to connect to WMI CONTROL service status:%d \n", status); -- cgit v1.2.3 From 8e0ccd330baabb4be0ab36248a3407ffb34d1174 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Fri, 19 Feb 2016 15:30:20 +0530 Subject: qcacld-3.0: Add QDF atomic API's Replace CDF atomic API's with QDF atomic API's. Change-Id: I18b4ab3487357d150bdfb96f9a078e1b5abb3156 CRs-Fixed: 981188 --- core/cdf/inc/cdf_atomic.h | 152 -------------------------------- core/cdf/src/i_cdf_atomic.h | 90 ------------------- core/dp/htt/htt_rx.c | 8 +- core/dp/htt/htt_types.h | 4 +- core/dp/txrx/ol_rx.c | 2 +- core/dp/txrx/ol_rx_pn.c | 2 +- core/dp/txrx/ol_rx_reorder.c | 2 +- core/dp/txrx/ol_tx.c | 4 +- core/dp/txrx/ol_tx_desc.c | 4 +- core/dp/txrx/ol_tx_queue.c | 4 +- core/dp/txrx/ol_tx_send.c | 44 ++++----- core/dp/txrx/ol_txrx.c | 58 ++++++------ core/dp/txrx/ol_txrx_flow_control.c | 4 +- core/dp/txrx/ol_txrx_internal.h | 8 +- core/dp/txrx/ol_txrx_peer_find.c | 12 +-- core/dp/txrx/ol_txrx_types.h | 20 ++--- core/utils/epping/inc/epping_internal.h | 6 +- core/wma/inc/wma.h | 8 +- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_dev_if.c | 30 +++---- core/wma/src/wma_features.c | 2 +- core/wma/src/wma_main.c | 4 +- core/wma/src/wma_mgmt.c | 4 +- core/wma/src/wma_scan_roam.c | 2 +- core/wmi/wmi_unified.c | 28 +++--- core/wmi/wmi_unified_priv.h | 8 +- 26 files changed, 135 insertions(+), 377 deletions(-) delete mode 100644 core/cdf/inc/cdf_atomic.h delete mode 100644 core/cdf/src/i_cdf_atomic.h diff --git a/core/cdf/inc/cdf_atomic.h b/core/cdf/inc/cdf_atomic.h deleted file mode 100644 index 4ae5dc5b9ab7..000000000000 --- a/core/cdf/inc/cdf_atomic.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_atomic.h - * This file abstracts an atomic counter. - */ - -#ifndef _CDF_ATOMIC_H -#define _CDF_ATOMIC_H - -#include - -/** - * cdf_atomic_t - atomic type of variable - * - * Use this when you want a simple resource counter etc. which is atomic - * across multiple CPU's. These maybe slower than usual counters on some - * platforms/OS'es, so use them with caution. - */ - -typedef __cdf_atomic_t cdf_atomic_t; - -/** - * cdf_atomic_init() - initialize an atomic type variable - * @v: A pointer to an opaque atomic variable - * - * Return: None - */ -static inline void cdf_atomic_init(cdf_atomic_t *v) -{ - __cdf_atomic_init(v); -} - -/** - * cdf_atomic_read() - read the value of an atomic variable - * @v: A pointer to an opaque atomic variable - * - * Return: The current value of the variable - */ -static inline int32_t cdf_atomic_read(cdf_atomic_t *v) -{ - return __cdf_atomic_read(v); -} - -/** - * cdf_atomic_inc() - increment the value of an atomic variable - * @v: A pointer to an opaque atomic variable - * - * Return: None - */ -static inline void cdf_atomic_inc(cdf_atomic_t *v) -{ - __cdf_atomic_inc(v); -} - -/** - * cdf_atomic_dec() - decrement the value of an atomic variable - * @v: A pointer to an opaque atomic variable - * - * Return: None - */ -static inline void cdf_atomic_dec(cdf_atomic_t *v) -{ - __cdf_atomic_dec(v); -} - -/** - * cdf_atomic_add() - add a value to the value of an atomic variable - * @v: A pointer to an opaque atomic variable - * @i: The amount by which to increase the atomic counter - * - * Return: None - */ -static inline void cdf_atomic_add(int i, cdf_atomic_t *v) -{ - __cdf_atomic_add(i, v); -} - -/** - * cdf_atomic_sub() - Subtract a value from an atomic variable. - * @i: the amount by which to decrease the atomic counter - * @v: a pointer to an opaque atomic variable - * - * Return: none - */ -static inline void cdf_atomic_sub(int i, cdf_atomic_t *v) -{ - __cdf_atomic_sub(i, v); -} - -/** - * cdf_atomic_dec_and_test() - decrement an atomic variable and check if the - * new value is zero - * @v: A pointer to an opaque atomic variable - * - * Return: - * true (non-zero) if the new value is zero, - * or false (0) if the new value is non-zero - */ -static inline int32_t cdf_atomic_dec_and_test(cdf_atomic_t *v) -{ - return __cdf_atomic_dec_and_test(v); -} - -/** - * cdf_atomic_set() - set a value to the value of an atomic variable - * @v: A pointer to an opaque atomic variable - * - * Return: None - */ -static inline void cdf_atomic_set(cdf_atomic_t *v, int i) -{ - __cdf_atomic_set(v, i); -} - -/** - * cdf_atomic_inc_return() - return the incremented value of an atomic variable - * @v: A pointer to an opaque atomic variable - * - * Return: The current value of the variable - */ -static inline int32_t cdf_atomic_inc_return(cdf_atomic_t *v) -{ - return __cdf_atomic_inc_return(v); -} - -#endif diff --git a/core/cdf/src/i_cdf_atomic.h b/core/cdf/src/i_cdf_atomic.h deleted file mode 100644 index e3c1a91f45e8..000000000000 --- a/core/cdf/src/i_cdf_atomic.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ -#ifndef I_CDF_ATOMIC_H -#define I_CDF_ATOMIC_H - -#include /* QDF_STATUS */ - -#include - -typedef atomic_t __cdf_atomic_t; - -static inline QDF_STATUS __cdf_atomic_init(__cdf_atomic_t *v) -{ - atomic_set(v, 0); - - return QDF_STATUS_SUCCESS; -} - -static inline int32_t __cdf_atomic_read(__cdf_atomic_t *v) -{ - return atomic_read(v); -} - -static inline void __cdf_atomic_inc(__cdf_atomic_t *v) -{ - atomic_inc(v); -} - -static inline void __cdf_atomic_dec(__cdf_atomic_t *v) -{ - atomic_dec(v); -} - -static inline void __cdf_atomic_add(int i, __cdf_atomic_t *v) -{ - atomic_add(i, v); -} - -/** - * cdf_atomic_sub() - Subtract a value from an atomic variable - * @i: the amount by which to decrease the atomic counter - * @v: a pointer to an opaque atomic variable - * - * Return: none - */ -static inline void __cdf_atomic_sub(int i, __cdf_atomic_t *v) -{ - atomic_sub(i, v); -} - -static inline int32_t __cdf_atomic_dec_and_test(__cdf_atomic_t *v) -{ - return atomic_dec_and_test(v); -} - -static inline void __cdf_atomic_set(__cdf_atomic_t *v, int i) -{ - atomic_set(v, i); -} - -static inline int32_t __cdf_atomic_inc_return(__cdf_atomic_t *v) -{ - return atomic_inc_return(v); -} - -#endif diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 768736f22a31..191a567a267d 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -1849,7 +1849,7 @@ void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu) void htt_rx_msdu_buff_replenish(htt_pdev_handle pdev) { - if (cdf_atomic_dec_and_test(&pdev->rx_ring.refill_ref_cnt)) { + if (qdf_atomic_dec_and_test(&pdev->rx_ring.refill_ref_cnt)) { int num_to_fill; num_to_fill = pdev->rx_ring.fill_level - pdev->rx_ring.fill_cnt; @@ -1857,7 +1857,7 @@ void htt_rx_msdu_buff_replenish(htt_pdev_handle pdev) htt_rx_ring_fill_n(pdev, num_to_fill /* okay if <= 0 */); } - cdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt); + qdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt); } #define AR600P_ASSEMBLE_HW_RATECODE(_rate, _nss, _pream) \ @@ -2204,8 +2204,8 @@ int htt_rx_attach(struct htt_pdev_t *pdev) * Initialize the Rx refill reference counter to be one so that * only one thread is allowed to refill the Rx ring. */ - cdf_atomic_init(&pdev->rx_ring.refill_ref_cnt); - cdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt); + qdf_atomic_init(&pdev->rx_ring.refill_ref_cnt); + qdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt); /* Initialize the Rx refill retry timer */ cdf_softirq_timer_init(pdev->osdev, diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 0121a09ec0af..e3229809f266 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -32,7 +32,7 @@ #include /* cdf_device_t */ #include /* cdf_spinlock_t */ #include /* cdf_softirq_timer_t */ -#include /* cdf_atomic_inc */ +#include /* qdf_atomic_inc */ #include /* cdf_nbuf_t */ #include /* HTC_PACKET */ @@ -331,7 +331,7 @@ struct htt_pdev_t { * variable is used to guarantee that only one thread tries * to replenish Rx ring. */ - cdf_atomic_t refill_ref_cnt; + qdf_atomic_t refill_ref_cnt; #ifdef DEBUG_DMA_DONE uint32_t dbg_initial_msdu_payld; uint32_t dbg_mpdu_range; diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 19db13998ccc..310d13d842cb 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -1201,7 +1201,7 @@ void ol_rx_peer_init(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer) peer->security[txrx_sec_ucast].sec_type = peer->security[txrx_sec_mcast].sec_type = htt_sec_type_none; peer->keyinstalled = 0; - cdf_atomic_init(&peer->fw_pn_check); + qdf_atomic_init(&peer->fw_pn_check); } void diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index f61ccd1b447b..a37125ae79a0 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -96,7 +96,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, int last_pn_valid; /* Make sure host pn check is not redundant */ - if ((cdf_atomic_read(&peer->fw_pn_check)) || + if ((qdf_atomic_read(&peer->fw_pn_check)) || (vdev->opmode == wlan_op_mode_ibss)) { return msdu_list; } diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 79e42e743306..e6f3c1634998 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -617,7 +617,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, else return; - cdf_atomic_set(&peer->fw_pn_check, 1); + qdf_atomic_set(&peer->fw_pn_check, 1); /*TODO: Fragmentation case */ win_sz_mask = peer->tids_rx_reorder[tid].win_sz_mask; seq_num_start &= win_sz_mask; diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index e0ff7563c583..3ab78276c228 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -27,7 +27,7 @@ /* OS abstraction libraries */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_atomic_read, etc. */ +#include /* qdf_atomic_read, etc. */ #include /* cdf_unlikely */ /* APIs for other modules */ @@ -1106,7 +1106,7 @@ ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, #define OL_TX_ENCAP_WRAPPER(pdev, vdev, tx_desc, msdu, tx_msdu_info) \ do { \ if (OL_TX_ENCAP(vdev, tx_desc, msdu, &tx_msdu_info) != A_OK) { \ - cdf_atomic_inc(&pdev->tx_queue.rsrc_cnt); \ + qdf_atomic_inc(&pdev->tx_queue.rsrc_cnt); \ ol_tx_desc_frame_free_nonstd(pdev, tx_desc, 1); \ if (tx_msdu_info.peer) { \ /* remove the peer reference added above */ \ diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 4a70fdb81462..a6aba47641f1 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -443,7 +443,7 @@ void ol_tx_desc_frame_list_free(struct ol_txrx_pdev_t *pdev, TAILQ_FOREACH_SAFE(tx_desc, tx_descs, tx_desc_list_elem, tmp) { cdf_nbuf_t msdu = tx_desc->netbuf; - cdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */ + qdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */ #ifdef QCA_SUPPORT_SW_TXRX_ENCAP /* restore original hdr offset */ OL_TX_RESTORE_HDR(tx_desc, msdu); @@ -466,7 +466,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, ol_txrx_mgmt_tx_cb ota_ack_cb; char *trace_str; - cdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */ + qdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */ #ifdef QCA_SUPPORT_SW_TXRX_ENCAP /* restore original hdr offset */ OL_TX_RESTORE_HDR(tx_desc, (tx_desc->netbuf)); diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index a894b1c30cb3..9ff8fcdfbe11 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -26,7 +26,7 @@ */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_atomic_read, etc. */ +#include /* qdf_atomic_read, etc. */ #include /* ol_cfg_addba_retry */ #include /* HTT_TX_EXT_TID_MGMT */ #include /* htt_tx_desc_tid */ diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index e729f0241e78..6ab22acf34cb 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#include /* cdf_atomic_inc, etc. */ +#include /* qdf_atomic_inc, etc. */ #include /* cdf_os_spinlock */ #include /* qdf_system_ticks, etc. */ #include /* cdf_nbuf_t */ @@ -60,7 +60,7 @@ #define OL_TX_CREDIT_RECLAIM(pdev) \ do { \ - if (cdf_atomic_read(&pdev->target_tx_credit) < \ + if (qdf_atomic_read(&pdev->target_tx_credit) < \ ol_cfg_tx_credit_lwm(pdev->ctrl_pdev)) { \ ol_osif_ath_tasklet(pdev->osdev); \ } \ @@ -83,16 +83,16 @@ * messages. */ #define OL_TX_TARGET_CREDIT_ADJUST(factor, pdev, msdu) \ - cdf_atomic_add( \ + qdf_atomic_add( \ factor * htt_tx_msdu_credit(msdu), &pdev->target_tx_credit) #define OL_TX_TARGET_CREDIT_DECR(pdev, msdu) \ OL_TX_TARGET_CREDIT_ADJUST(-1, pdev, msdu) #define OL_TX_TARGET_CREDIT_INCR(pdev, msdu) \ OL_TX_TARGET_CREDIT_ADJUST(1, pdev, msdu) #define OL_TX_TARGET_CREDIT_DECR_INT(pdev, delta) \ - cdf_atomic_add(-1 * delta, &pdev->target_tx_credit) + qdf_atomic_add(-1 * delta, &pdev->target_tx_credit) #define OL_TX_TARGET_CREDIT_INCR_INT(pdev, delta) \ - cdf_atomic_add(delta, &pdev->target_tx_credit) + qdf_atomic_add(delta, &pdev->target_tx_credit) #else /* * LL does not need to keep track of target credit. @@ -112,12 +112,12 @@ do { \ struct ol_txrx_vdev_t *vdev; \ TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { \ - if (cdf_atomic_read(&vdev->os_q_paused) && \ + if (qdf_atomic_read(&vdev->os_q_paused) && \ (vdev->tx_fl_hwm != 0)) { \ cdf_spin_lock(&pdev->tx_mutex); \ if (pdev->tx_desc.num_free > \ vdev->tx_fl_hwm) { \ - cdf_atomic_set(&vdev->os_q_paused, 0); \ + qdf_atomic_set(&vdev->os_q_paused, 0); \ cdf_spin_unlock(&pdev->tx_mutex); \ ol_txrx_flow_control_cb(vdev, true);\ } \ @@ -139,8 +139,8 @@ ol_tx_send_base(struct ol_txrx_pdev_t *pdev, TX_CREDIT_DEBUG_PRINT("TX %d bytes\n", cdf_nbuf_len(msdu)); TX_CREDIT_DEBUG_PRINT(" Decrease credit %d - 1 = %d, len:%d.\n", - cdf_atomic_read(&pdev->target_tx_credit), - cdf_atomic_read(&pdev->target_tx_credit) - 1, + qdf_atomic_read(&pdev->target_tx_credit), + qdf_atomic_read(&pdev->target_tx_credit) - 1, cdf_nbuf_len(msdu)); msdu_credit_consumed = htt_tx_msdu_credit(msdu); @@ -312,24 +312,24 @@ ol_tx_download_done_hl_free(void *txrx_pdev, if ((tx_desc->pkt_type != ol_tx_frm_no_free) && (tx_desc->pkt_type < OL_TXRX_MGMT_TYPE_BASE)) { - cdf_atomic_add(1, &pdev->tx_queue.rsrc_cnt); + qdf_atomic_add(1, &pdev->tx_queue.rsrc_cnt); ol_tx_desc_frame_free_nonstd(pdev, tx_desc, status != A_OK); } } void ol_tx_target_credit_init(struct ol_txrx_pdev_t *pdev, int credit_delta) { - cdf_atomic_add(credit_delta, &pdev->orig_target_tx_credit); + qdf_atomic_add(credit_delta, &pdev->orig_target_tx_credit); } void ol_tx_target_credit_update(struct ol_txrx_pdev_t *pdev, int credit_delta) { TX_CREDIT_DEBUG_PRINT(" Increase credit %d + %d = %d\n", - cdf_atomic_read(&pdev->target_tx_credit), + qdf_atomic_read(&pdev->target_tx_credit), credit_delta, - cdf_atomic_read(&pdev->target_tx_credit) + + qdf_atomic_read(&pdev->target_tx_credit) + credit_delta); - cdf_atomic_add(credit_delta, &pdev->target_tx_credit); + qdf_atomic_add(credit_delta, &pdev->target_tx_credit); } #ifdef QCA_COMPUTE_TX_DELAY @@ -360,7 +360,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, #define ol_tx_msdu_complete_single(_pdev, _tx_desc, _netbuf,\ _lcl_freelist, _tx_desc_last) \ do { \ - cdf_atomic_init(&(_tx_desc)->ref_cnt); \ + qdf_atomic_init(&(_tx_desc)->ref_cnt); \ /* restore orginal hdr offset */ \ OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \ cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), CDF_DMA_TO_DEVICE); \ @@ -453,7 +453,7 @@ void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev) * been given to the target to transmit, for which the * target has never provided a response. */ - if (cdf_atomic_read(&tx_desc->ref_cnt)) { + if (qdf_atomic_read(&tx_desc->ref_cnt)) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "Warning: freeing tx frame " "(no tx completion from the target)\n"); @@ -577,11 +577,11 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev, } TX_CREDIT_DEBUG_PRINT(" Increase credit %d + %d = %d\n", - cdf_atomic_read(&pdev->target_tx_credit), - 1, cdf_atomic_read(&pdev->target_tx_credit) + 1); + qdf_atomic_read(&pdev->target_tx_credit), + 1, qdf_atomic_read(&pdev->target_tx_credit) + 1); - cdf_atomic_add(1, &pdev->target_tx_credit); + qdf_atomic_add(1, &pdev->target_tx_credit); } /* WARNING: ol_tx_inspect_handler()'s bahavior is similar to that of @@ -620,7 +620,7 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, #ifndef ATH_11AC_TXCOMPACT /* save this multicast packet to local free list */ - if (cdf_atomic_dec_and_test(&tx_desc->ref_cnt)) + if (qdf_atomic_dec_and_test(&tx_desc->ref_cnt)) #endif { /* for this function only, force htt status to be @@ -643,9 +643,9 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, htt_tx_status_discard); } TX_CREDIT_DEBUG_PRINT(" Increase HTT credit %d + %d = %d..\n", - cdf_atomic_read(&pdev->target_tx_credit), + qdf_atomic_read(&pdev->target_tx_credit), num_msdus, - cdf_atomic_read(&pdev->target_tx_credit) + + qdf_atomic_read(&pdev->target_tx_credit) + num_msdus); OL_TX_TARGET_CREDIT_ADJUST(num_msdus, pdev, NULL); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index f8629ba4315f..282e26ca6a9f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -31,7 +31,7 @@ #include /* cdf_mem_malloc,free */ #include /* cdf_device_t, cdf_print */ #include /* cdf_spinlock */ -#include /* cdf_atomic_read */ +#include /* qdf_atomic_read */ /* Required for WLAN_FEATURE_FASTPATH */ #include @@ -126,7 +126,7 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, if (!peer) return NULL; *peer_id = peer->local_id; - cdf_atomic_dec(&peer->ref_cnt); + qdf_atomic_dec(&peer->ref_cnt); return peer; } @@ -180,7 +180,7 @@ ol_txrx_peer_handle ol_txrx_find_peer_by_addr(ol_txrx_pdev_handle pdev, if (!peer) return NULL; *peer_id = peer->local_id; - cdf_atomic_dec(&peer->ref_cnt); + qdf_atomic_dec(&peer->ref_cnt); return peer; } @@ -523,14 +523,14 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) */ /* initialize the counter of the target's tx buffer availability */ - cdf_atomic_init(&pdev->target_tx_credit); - cdf_atomic_init(&pdev->orig_target_tx_credit); + qdf_atomic_init(&pdev->target_tx_credit); + qdf_atomic_init(&pdev->orig_target_tx_credit); /* * LL - initialize the target credit outselves. * HL - wait for a HTT target credit initialization during htt_attach. */ - cdf_atomic_add(ol_cfg_target_tx_credit(pdev->ctrl_pdev), + qdf_atomic_add(ol_cfg_target_tx_credit(pdev->ctrl_pdev), &pdev->target_tx_credit); desc_pool_size = ol_tx_get_desc_global_pool_size(pdev); @@ -638,7 +638,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) #endif #endif c_element->tx_desc.id = i; - cdf_atomic_init(&c_element->tx_desc.ref_cnt); + qdf_atomic_init(&c_element->tx_desc.ref_cnt); c_element = c_element->next; fail_idx = i; } @@ -1022,7 +1022,7 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) * been given to the target to transmit, for which the * target has never provided a response. */ - if (cdf_atomic_read(&tx_desc->ref_cnt)) { + if (qdf_atomic_read(&tx_desc->ref_cnt)) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "Warning: freeing tx frame (no compltn)\n"); ol_tx_desc_frame_free_nonstd(pdev, @@ -1112,8 +1112,8 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, &vdev->ll_pause.timer, ol_tx_vdev_ll_pause_queue_send, vdev, CDF_TIMER_TYPE_SW); - cdf_atomic_init(&vdev->os_q_paused); - cdf_atomic_set(&vdev->os_q_paused, 0); + qdf_atomic_init(&vdev->os_q_paused); + qdf_atomic_set(&vdev->os_q_paused, 0); vdev->tx_fl_lwm = 0; vdev->tx_fl_hwm = 0; vdev->wait_on_peer_id = OL_TXRX_INVALID_LOCAL_PEER_ID; @@ -1267,8 +1267,8 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, ol_rx_callback_fp data_rx = NULL; void *cds_ctx = cds_get_global_context(); - if (cdf_atomic_inc_return(&peer->flush_in_progress) > 1) { - cdf_atomic_dec(&peer->flush_in_progress); + if (qdf_atomic_inc_return(&peer->flush_in_progress) > 1) { + qdf_atomic_dec(&peer->flush_in_progress); return; } @@ -1300,7 +1300,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, typeof(*cache_buf), list); } cdf_spin_unlock_bh(&peer->bufq_lock); - cdf_atomic_dec(&peer->flush_in_progress); + qdf_atomic_dec(&peer->flush_in_progress); } ol_txrx_peer_handle @@ -1330,7 +1330,7 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, peer_mac_addr[0], peer_mac_addr[1], peer_mac_addr[2], peer_mac_addr[3], peer_mac_addr[4], peer_mac_addr[5]); - if (cdf_atomic_read(&temp_peer->delete_in_progress)) { + if (qdf_atomic_read(&temp_peer->delete_in_progress)) { vdev->wait_on_peer_id = temp_peer->local_id; qdf_event_create(&vdev->wait_delete_comp); wait_on_deletion = true; @@ -1387,16 +1387,16 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, cdf_spinlock_init(&peer->peer_info_lock); cdf_spinlock_init(&peer->bufq_lock); - cdf_atomic_init(&peer->delete_in_progress); - cdf_atomic_init(&peer->flush_in_progress); + qdf_atomic_init(&peer->delete_in_progress); + qdf_atomic_init(&peer->flush_in_progress); - cdf_atomic_init(&peer->ref_cnt); + qdf_atomic_init(&peer->ref_cnt); /* keep one reference for attach */ - cdf_atomic_inc(&peer->ref_cnt); + qdf_atomic_inc(&peer->ref_cnt); /* keep one reference for ol_rx_peer_map_handler */ - cdf_atomic_inc(&peer->ref_cnt); + qdf_atomic_inc(&peer->ref_cnt); peer->valid = 1; @@ -1495,7 +1495,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, "%s: no state change, returns directly\n", __func__); #endif - cdf_atomic_dec(&peer->ref_cnt); + qdf_atomic_dec(&peer->ref_cnt); return QDF_STATUS_SUCCESS; } @@ -1525,7 +1525,7 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, ol_txrx_peer_tid_unpause(peer, tid); } } - cdf_atomic_dec(&peer->ref_cnt); + qdf_atomic_dec(&peer->ref_cnt); /* Set the state after the Pause to avoid the race condiction with ADDBA check in tx path */ @@ -1628,7 +1628,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev, break; } } - cdf_atomic_dec(&peer->ref_cnt); + qdf_atomic_dec(&peer->ref_cnt); } uint8_t @@ -1683,7 +1683,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) * (A double-free should never happen, so assert if it does.) */ - if (0 == cdf_atomic_read(&(peer->ref_cnt))) { + if (0 == qdf_atomic_read(&(peer->ref_cnt))) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "The Peer is not present anymore\n"); cdf_assert(0); @@ -1701,7 +1701,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) * concurrently with the empty check. */ cdf_spin_lock_bh(&pdev->peer_ref_mutex); - if (cdf_atomic_dec_and_test(&peer->ref_cnt)) { + if (qdf_atomic_dec_and_test(&peer->ref_cnt)) { u_int16_t peer_id; TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -1722,7 +1722,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) ol_rx_peer_cleanup(vdev, peer); /* peer is removed from peer_list */ - cdf_atomic_set(&peer->delete_in_progress, 0); + qdf_atomic_set(&peer->delete_in_progress, 0); /* * Set wait_delete_comp event if the current peer id matches @@ -1834,7 +1834,7 @@ void ol_txrx_peer_detach(ol_txrx_peer_handle peer) cdf_spinlock_destroy(&peer->bufq_lock); /* set delete_in_progress to identify that wma * is waiting for unmap massage for this peer */ - cdf_atomic_set(&peer->delete_in_progress, 1); + qdf_atomic_set(&peer->delete_in_progress, 1); /* * Remove the reference added during peer_attach. * The peer will still be left allocated until the @@ -1956,8 +1956,8 @@ int ol_txrx_get_tx_pending(ol_txrx_pdev_handle pdev_handle) void ol_txrx_discard_tx_pending(ol_txrx_pdev_handle pdev_handle) { ol_tx_desc_list tx_descs; - /* First let hif do the cdf_atomic_dec_and_test(&tx_desc->ref_cnt) - * then let htt do the cdf_atomic_dec_and_test(&tx_desc->ref_cnt) + /* First let hif do the qdf_atomic_dec_and_test(&tx_desc->ref_cnt) + * then let htt do the qdf_atomic_dec_and_test(&tx_desc->ref_cnt) * which is tha same with normal data send complete path*/ htt_tx_pending_discard(pdev_handle->htt_pdev); @@ -2672,7 +2672,7 @@ ol_txrx_get_tx_resource(uint8_t sta_id, vdev->tx_fl_hwm = (uint16_t) (low_watermark + high_watermark_offset); /* Not enough free resource, stop TX OS Q */ - cdf_atomic_set(&vdev->os_q_paused, 1); + qdf_atomic_set(&vdev->os_q_paused, 1); cdf_spin_unlock_bh(&vdev->pdev->tx_mutex); return false; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 77fd41ee1ed4..cd352e12b346 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /* OS abstraction libraries */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_atomic_read, etc. */ +#include /* qdf_atomic_read, etc. */ #include /* cdf_unlikely */ /* APIs for other modules */ diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 30315e64ce1b..85da2683065e 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,9 +48,9 @@ #define OL_TX_DESC_REF_INC(tx_desc) /* no-op */ #else #define OL_TX_DESC_NO_REFS(tx_desc) \ - cdf_atomic_dec_and_test(&tx_desc->ref_cnt) -#define OL_TX_DESC_REF_INIT(tx_desc) cdf_atomic_init(&tx_desc->ref_cnt) -#define OL_TX_DESC_REF_INC(tx_desc) cdf_atomic_inc(&tx_desc->ref_cnt) + qdf_atomic_dec_and_test(&tx_desc->ref_cnt) +#define OL_TX_DESC_REF_INIT(tx_desc) qdf_atomic_init(&tx_desc->ref_cnt) +#define OL_TX_DESC_REF_INC(tx_desc) qdf_atomic_inc(&tx_desc->ref_cnt) #endif #ifndef TXRX_ASSERT_LEVEL diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 6422ed4433a0..495afa0e307b 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -194,7 +194,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev, && peer->vdev == vdev) { /* found it - increment the ref count before releasing the lock */ - cdf_atomic_inc(&peer->ref_cnt); + qdf_atomic_inc(&peer->ref_cnt); cdf_spin_unlock_bh(&pdev->peer_ref_mutex); return peer; } @@ -226,7 +226,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_find_hash_find(struct ol_txrx_pdev_t *pdev, 0 && (check_valid == 0 || peer->valid)) { /* found it - increment the ref count before releasing the lock */ - cdf_atomic_inc(&peer->ref_cnt); + qdf_atomic_inc(&peer->ref_cnt); cdf_spin_unlock_bh(&pdev->peer_ref_mutex); return peer; } @@ -290,8 +290,8 @@ void ol_txrx_peer_find_hash_erase(struct ol_txrx_pdev_t *pdev) * 1, so it will get deleted by * ol_txrx_peer_unref_delete. */ - cdf_atomic_init(&peer->ref_cnt); /* set to 0 */ - cdf_atomic_inc(&peer->ref_cnt); /* incr to 1 */ + qdf_atomic_init(&peer->ref_cnt); /* set to 0 */ + qdf_atomic_inc(&peer->ref_cnt); /* incr to 1 */ TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Delete Peer %p\n", __func__, peer); @@ -441,7 +441,7 @@ struct ol_txrx_peer_t *ol_txrx_assoc_peer_find(struct ol_txrx_vdev_t *vdev) */ if (vdev->last_real_peer && vdev->last_real_peer->peer_ids[0] != HTT_INVALID_PEER_ID) { - cdf_atomic_inc(&vdev->last_real_peer->ref_cnt); + qdf_atomic_inc(&vdev->last_real_peer->ref_cnt); peer = vdev->last_real_peer; } else { peer = NULL; diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index da06c7ded089..7c0bc80817a9 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -37,7 +37,7 @@ #include /* TAILQ */ #include /* A_UINT8 */ #include /* htt_sec_type, htt_pkt_type, etc. */ -#include /* cdf_atomic_t */ +#include /* qdf_atomic_t */ #include /* wdi_event_subscribe */ #include /* cdf_softirq_timer_t */ #include /* cdf_spinlock */ @@ -133,7 +133,7 @@ struct ol_tx_desc_t { cdf_dma_addr_t htt_tx_desc_paddr; void *htt_frag_desc; /* struct msdu_ext_desc_t * */ cdf_dma_addr_t htt_frag_desc_paddr; - cdf_atomic_t ref_cnt; + qdf_atomic_t ref_cnt; enum htt_tx_status status; #ifdef QCA_COMPUTE_TX_DELAY @@ -497,8 +497,8 @@ struct ol_txrx_pdev_t { * track of roughly how much space is available in the target for * tx frames */ - cdf_atomic_t target_tx_credit; - cdf_atomic_t orig_target_tx_credit; + qdf_atomic_t target_tx_credit; + qdf_atomic_t orig_target_tx_credit; /* Peer mac address to staid mapping */ struct ol_mac_addr mac_to_staid[WLAN_MAX_STA_COUNT + 3]; @@ -677,7 +677,7 @@ struct ol_txrx_pdev_t { * conditional compilation. */ struct { - cdf_atomic_t rsrc_cnt; + qdf_atomic_t rsrc_cnt; /* threshold_lo - when to start tx desc margin replenishment */ uint16_t rsrc_threshold_lo; /* threshold_hi - where to stop during tx desc margin @@ -842,7 +842,7 @@ struct ol_txrx_vdev_t { uint32_t q_overflow_cnt; } ll_pause; bool disable_intrabss_fwd; - cdf_atomic_t os_q_paused; + qdf_atomic_t os_q_paused; uint16_t tx_fl_lwm; uint16_t tx_fl_hwm; cdf_spinlock_t flow_control_lock; @@ -910,9 +910,9 @@ typedef A_STATUS (*ol_tx_filter_func)(struct ol_txrx_msdu_info_t * struct ol_txrx_peer_t { struct ol_txrx_vdev_t *vdev; - cdf_atomic_t ref_cnt; - cdf_atomic_t delete_in_progress; - cdf_atomic_t flush_in_progress; + qdf_atomic_t ref_cnt; + qdf_atomic_t delete_in_progress; + qdf_atomic_t flush_in_progress; /* The peer state tracking is used for HL systems * that don't support tx and rx filtering within the target. @@ -985,7 +985,7 @@ struct ol_txrx_peer_t { uint8_t keyinstalled; /* Bit to indicate if PN check is done in fw */ - cdf_atomic_t fw_pn_check; + qdf_atomic_t fw_pn_check; #ifdef WLAN_FEATURE_11W /* PN counter for Robust Management Frames */ diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 0ea5d526558c..2e03fd50a9f1 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -50,7 +50,7 @@ #include "htc_api.h" #include "htc_packet.h" #include "epping_test.h" -#include +#include #include #include @@ -68,7 +68,7 @@ -------------------------------------------------------------------------*/ #define EPPING_MAX_ADAPTERS 1 -#define EPPING_LOG(level, args ...) CDF_TRACE( CDF_MODULE_ID_HDD, level, ## args) +#define EPPING_LOG(level, args ...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) struct epping_cookie { HTC_PACKET HtcPkt; /* HTC packet wrapper */ @@ -100,7 +100,7 @@ typedef struct { HTC_ENDPOINT_ID eid; struct semaphore sem; bool inited; - cdf_atomic_t atm; + qdf_atomic_t atm; } epping_poll_t; #endif diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index eb38ae56f759..fd1548b74ef9 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -765,7 +765,7 @@ typedef struct { A_UINT32 requestor_id; A_UINT32 disable_hw_ack; wmi_channel chan; - cdf_atomic_t hidden_ssid_restart_in_progress; + qdf_atomic_t hidden_ssid_restart_in_progress; uint8_t ssidHidden; } vdev_restart_params_t; @@ -870,7 +870,7 @@ struct wma_txrx_node { tAniGetPEStatsRsp *stats_rsp; uint8_t fw_stats_set; void *del_staself_req; - cdf_atomic_t bss_status; + qdf_atomic_t bss_status; uint8_t rate_flags; uint8_t nss; bool is_channel_switch; @@ -1273,7 +1273,7 @@ typedef struct { #endif cdf_wake_lock_t wow_wake_lock; int wow_nack; - cdf_atomic_t is_wow_bus_suspended; + qdf_atomic_t is_wow_bus_suspended; cdf_mc_timer_t wma_scan_comp_timer; uint8_t dfs_phyerr_filter_offload; bool suitable_ap_hb_failure; @@ -1301,7 +1301,7 @@ typedef struct { struct dbs_hw_mode_info hw_mode; uint32_t old_hw_mode_index; uint32_t new_hw_mode_index; - cdf_atomic_t scan_id_counter; + qdf_atomic_t scan_id_counter; wma_peer_authorized_fp peer_authorized_cb; uint32_t num_of_diag_events_logs; uint32_t *events_logs_list; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 0a7a646ff112..66015f67d522 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -985,7 +985,7 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len); static inline int wma_get_wow_bus_suspend(tp_wma_handle wma) { - return cdf_atomic_read(&wma->is_wow_bus_suspended); + return qdf_atomic_read(&wma->is_wow_bus_suspended); } QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 0c92e0cb9769..2372a7a6eabf 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -688,7 +688,7 @@ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, uint8_t vdev_id = pdel_sta_self_req_param->session_id; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; - if (cdf_atomic_read(&iface->bss_status) == WMA_BSS_STATUS_STARTED) { + if (qdf_atomic_read(&iface->bss_status) == WMA_BSS_STATUS_STARTED) { WMA_LOGA("BSS is not yet stopped. Defering vdev(vdev id %x) deletion", vdev_id); iface->del_staself_req = pdel_sta_self_req_param; @@ -812,7 +812,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, } bcn->seq_no = MIN_SW_SEQ; cdf_spinlock_init(&bcn->lock); - cdf_atomic_set(&wma->interfaces[resp_event->vdev_id].bss_status, + qdf_atomic_set(&wma->interfaces[resp_event->vdev_id].bss_status, WMA_BSS_STATUS_STARTED); WMA_LOGD("%s: AP mode (type %d subtype %d) BSS is started", __func__, wma->interfaces[resp_event->vdev_id].type, @@ -951,7 +951,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, } if ((resp_event->vdev_id <= wma->max_bssid) && - (cdf_atomic_read + (qdf_atomic_read (&wma->interfaces[resp_event->vdev_id].vdev_restart_params.hidden_ssid_restart_in_progress)) && (wma_is_vdev_in_ap_mode(wma, resp_event->vdev_id) == true)) { WMA_LOGE("%s: vdev restart event recevied for hidden ssid set using IOCTL", @@ -963,7 +963,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, WMA_LOGE("%s : failed to send vdev up", __func__); return -EEXIST; } - cdf_atomic_set(&wma->interfaces[resp_event->vdev_id]. + qdf_atomic_set(&wma->interfaces[resp_event->vdev_id]. vdev_restart_params. hidden_ssid_restart_in_progress, 0); wma->interfaces[resp_event->vdev_id].vdev_up = true; @@ -1409,7 +1409,7 @@ static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, peer_list_elem) { if (temp) { cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - if (cdf_atomic_read(&temp->delete_in_progress) == 0) { + if (qdf_atomic_read(&temp->delete_in_progress) == 0) { wma_remove_peer(wma, temp->mac_addr.raw, vdev_id, temp, false); } @@ -1480,7 +1480,7 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) peer_list_elem) { if (temp) { cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - if (cdf_atomic_read(&temp->delete_in_progress) == 0) { + if (qdf_atomic_read(&temp->delete_in_progress) == 0) { wma_remove_peer(wma, temp->mac_addr.raw, vdev_id, temp, false); } @@ -1598,7 +1598,7 @@ void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - cdf_atomic_set(&intr[sessionId].vdev_restart_params. + qdf_atomic_set(&intr[sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 0); return; } @@ -1649,7 +1649,7 @@ void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle, WMI_VDEV_RESTART_REQUEST_CMDID); if (ret < 0) { WMA_LOGE("%s: Failed to send vdev restart command", __func__); - cdf_atomic_set(&intr[sessionId].vdev_restart_params. + qdf_atomic_set(&intr[sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 0); cdf_nbuf_free(buf); } @@ -1692,7 +1692,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, resp_event = param_buf->fixed_param; if ((resp_event->vdev_id <= wma->max_bssid) && - (cdf_atomic_read + (qdf_atomic_read (&wma->interfaces[resp_event->vdev_id].vdev_restart_params. hidden_ssid_restart_in_progress)) && ((wma->interfaces[resp_event->vdev_id].type == WMI_VDEV_TYPE_AP) @@ -1770,7 +1770,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, ol_txrx_vdev_unpause(iface->handle, OL_TXQ_PAUSE_REASON_VDEV_STOP); iface->pause_bitmap &= ~(1 << PAUSE_TYPE_HOST); - cdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STOPPED); + qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STOPPED); WMA_LOGD("%s: (type %d subtype %d) BSS is stopped", __func__, iface->type, iface->sub_type); bcn = wma->interfaces[resp_event->vdev_id].beacon; @@ -1942,7 +1942,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, self_sta_req->type; wma_handle->interfaces[self_sta_req->session_id].sub_type = self_sta_req->sub_type; - cdf_atomic_init(&wma_handle->interfaces + qdf_atomic_init(&wma_handle->interfaces [self_sta_req->session_id].bss_status); if (((self_sta_req->type == WMI_VDEV_TYPE_AP) && @@ -2777,7 +2777,7 @@ void wma_vdev_resp_timer(void *data) ol_txrx_vdev_unpause(iface->handle, OL_TXQ_PAUSE_REASON_VDEV_STOP); iface->pause_bitmap &= ~(1 << PAUSE_TYPE_HOST); - cdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STOPPED); + qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STOPPED); WMA_LOGD("%s: (type %d subtype %d) BSS is stopped", __func__, iface->type, iface->sub_type); @@ -4149,7 +4149,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (params->nonRoamReassoc) { ol_txrx_peer_state_update(pdev, params->bssId, ol_txrx_peer_state_auth); - cdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); + qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); iface->aid = params->assocId; goto out; } @@ -4188,7 +4188,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) * following which are useful for LFR3.0.*/ ol_txrx_peer_state_update(pdev, params->bssId, ol_txrx_peer_state_auth); - cdf_atomic_set(&iface->bss_status, + qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); iface->aid = params->assocId; WMA_LOGE("LFR3:statype %d vdev %d aid %d bssid %pM", @@ -4294,7 +4294,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) wma->interfaces[params->smesessionId].vdev_up = true; } - cdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); + qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); WMA_LOGD("%s: STA mode (type %d subtype %d) BSS is started", __func__, iface->type, iface->sub_type); /* Sta is now associated, configure various params */ diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index dee39dd17aa4..57736436a1a1 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3102,7 +3102,7 @@ int wma_pdev_resume_event_handler(void *handle, uint8_t *event, uint32_t len) static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val) { - cdf_atomic_set(&wma->is_wow_bus_suspended, val); + qdf_atomic_set(&wma->is_wow_bus_suspended, val); } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 28b98cd25228..76ae27d22bcf 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1840,8 +1840,8 @@ QDF_STATUS wma_open(void *cds_context, qdf_list_create(&wma_handle->wma_hold_req_queue, MAX_ENTRY_HOLD_REQ_QUEUE); cdf_spinlock_init(&wma_handle->wma_hold_req_q_lock); - cdf_atomic_init(&wma_handle->is_wow_bus_suspended); - cdf_atomic_init(&wma_handle->scan_id_counter); + qdf_atomic_init(&wma_handle->is_wow_bus_suspended); + qdf_atomic_init(&wma_handle->scan_id_counter); /* Register vdev start response event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index e38234eee5f7..02cbc2ebe638 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2873,7 +2873,7 @@ void wma_hidden_ssid_vdev_restart(tp_wma_handle wma_handle, } intr[pReq->sessionId].vdev_restart_params.ssidHidden = pReq->ssidHidden; - cdf_atomic_set(&intr[pReq->sessionId].vdev_restart_params. + qdf_atomic_set(&intr[pReq->sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 1); /* vdev stop -> vdev restart -> vdev up */ @@ -2885,7 +2885,7 @@ void wma_hidden_ssid_vdev_restart(tp_wma_handle wma_handle, (1 << PAUSE_TYPE_HOST); if (wmi_unified_vdev_stop_send(wma_handle->wmi_handle, pReq->sessionId)) { WMA_LOGE("%s: %d Failed to send vdev stop", __func__, __LINE__); - cdf_atomic_set(&intr[pReq->sessionId].vdev_restart_params. + qdf_atomic_set(&intr[pReq->sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 0); return; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 66920c89d41f..6dff2ec28f80 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -6820,7 +6820,7 @@ QDF_STATUS wma_get_scan_id(uint32_t *scan_id) } /* host need to cycle through the lower 12 bits to generate ids */ - *scan_id = cdf_atomic_inc_return(&wma->scan_id_counter) & + *scan_id = qdf_atomic_inc_return(&wma->scan_id_counter) & WMA_SCAN_ID_MASK; /* * Firmware expects the host scan request id appended diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 4daab4026b80..8bf451ce76df 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -802,7 +802,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, if (wmi_get_runtime_pm_inprogress(wmi_handle)) { if (wmi_is_runtime_pm_cmd(cmd_id)) htc_tag = HTC_TX_PACKET_TAG_AUTO_PM; - } else if (cdf_atomic_read(&wmi_handle->is_target_suspended) && + } else if (qdf_atomic_read(&wmi_handle->is_target_suspended) && ((WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID != cmd_id) && (WMI_PDEV_RESUME_CMDID != cmd_id))) { pr_err("%s: Target is suspended could not send WMI command\n", @@ -832,13 +832,13 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, WMI_SET_FIELD(cdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id); - cdf_atomic_inc(&wmi_handle->pending_cmds); - if (cdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { + qdf_atomic_inc(&wmi_handle->pending_cmds); + if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { scn = cds_get_context(CDF_MODULE_ID_HIF); pr_err("\n%s: hostcredits = %d\n", __func__, wmi_get_host_credits(wmi_handle)); htc_dump_counter_info(wmi_handle->htc_handle); - cdf_atomic_dec(&wmi_handle->pending_cmds); + qdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s: MAX 1024 WMI Pending cmds reached.\n", __func__); CDF_BUG(0); return -EBUSY; @@ -846,7 +846,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, pkt = cdf_mem_malloc(sizeof(*pkt)); if (!pkt) { - cdf_atomic_dec(&wmi_handle->pending_cmds); + qdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s, Failed to alloc htc packet %x, no memory\n", __func__, cmd_id); return -ENOMEM; @@ -879,7 +879,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, status = htc_send_pkt(wmi_handle->htc_handle, pkt); if (A_OK != status) { - cdf_atomic_dec(&wmi_handle->pending_cmds); + qdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s %d, htc_send_pkt failed\n", __func__, __LINE__); } @@ -1193,7 +1193,7 @@ void wmi_rx_event_work(struct work_struct *work) */ void wmi_runtime_pm_init(struct wmi_unified *wmi_handle) { - cdf_atomic_init(&wmi_handle->runtime_pm_inprogress); + qdf_atomic_init(&wmi_handle->runtime_pm_inprogress); } #else void wmi_runtime_pm_init(struct wmi_unified *wmi_handle) @@ -1215,8 +1215,8 @@ void *wmi_unified_attach(ol_scn_t scn_handle, } OS_MEMZERO(wmi_handle, sizeof(struct wmi_unified)); wmi_handle->scn_handle = scn_handle; - cdf_atomic_init(&wmi_handle->pending_cmds); - cdf_atomic_init(&wmi_handle->is_target_suspended); + qdf_atomic_init(&wmi_handle->pending_cmds); + qdf_atomic_init(&wmi_handle->is_target_suspended); wmi_runtime_pm_init(wmi_handle); cdf_spinlock_init(&wmi_handle->eventq_lock); cdf_nbuf_queue_init(&wmi_handle->event_queue); @@ -1313,7 +1313,7 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) #endif cdf_nbuf_free(wmi_cmd_buf); cdf_mem_free(htc_pkt); - cdf_atomic_dec(&wmi_handle->pending_cmds); + qdf_atomic_dec(&wmi_handle->pending_cmds); } int @@ -1369,22 +1369,22 @@ int wmi_get_host_credits(wmi_unified_t wmi_handle) int wmi_get_pending_cmds(wmi_unified_t wmi_handle) { - return cdf_atomic_read(&wmi_handle->pending_cmds); + return qdf_atomic_read(&wmi_handle->pending_cmds); } void wmi_set_target_suspend(wmi_unified_t wmi_handle, A_BOOL val) { - cdf_atomic_set(&wmi_handle->is_target_suspended, val); + qdf_atomic_set(&wmi_handle->is_target_suspended, val); } #ifdef FEATURE_RUNTIME_PM void wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, A_BOOL val) { - cdf_atomic_set(&wmi_handle->runtime_pm_inprogress, val); + qdf_atomic_set(&wmi_handle->runtime_pm_inprogress, val); } inline bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle) { - return cdf_atomic_read(&wmi_handle->runtime_pm_inprogress); + return qdf_atomic_read(&wmi_handle->runtime_pm_inprogress); } #endif diff --git a/core/wmi/wmi_unified_priv.h b/core/wmi/wmi_unified_priv.h index 293480dba42c..3787a9441dec 100644 --- a/core/wmi/wmi_unified_priv.h +++ b/core/wmi/wmi_unified_priv.h @@ -34,7 +34,7 @@ #include "a_types.h" #include "wmi.h" #include "wmi_unified.h" -#include "cdf_atomic.h" +#include "qdf_atomic.h" #define WMI_UNIFIED_MAX_EVENT 0x100 #define WMI_MAX_CMDS 1024 @@ -69,7 +69,7 @@ struct fwdebug { struct wmi_unified { ol_scn_t scn_handle; /* handle to device */ - cdf_atomic_t pending_cmds; + qdf_atomic_t pending_cmds; HTC_ENDPOINT_ID wmi_endpoint_id; uint16_t max_msg_len; WMI_EVT_ID event_id[WMI_UNIFIED_MAX_EVENT]; @@ -88,10 +88,10 @@ struct wmi_unified { cdf_spinlock_t wmi_record_lock; #endif /*WMI_INTERFACE_EVENT_LOGGING */ - cdf_atomic_t is_target_suspended; + qdf_atomic_t is_target_suspended; #ifdef FEATURE_RUNTIME_PM - cdf_atomic_t runtime_pm_inprogress; + qdf_atomic_t runtime_pm_inprogress; #endif int (*wma_process_fw_event_handler_cbk)(struct wmi_unified *wmi_handle, -- cgit v1.2.3 From 42958bb929f3097eeb23583c91aac3028b3520c2 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Fri, 19 Feb 2016 15:43:11 +0530 Subject: qcacld-3.0: Add QDF defer API's Replace CDF defer API's with QDF defer API's Change-Id: I67a9f57a76813bf2c35c42d69013133aad0b2393 CRs-Fixed: 981188 --- core/cdf/inc/cdf_defer.h | 123 ----------------------------------------- core/cdf/inc/osdep.h | 4 +- core/cdf/src/cdf_defer.c | 50 ----------------- core/cdf/src/i_cdf_defer.h | 99 --------------------------------- core/cds/src/cds_concurrency.c | 4 +- core/hdd/inc/wlan_hdd_main.h | 4 +- core/wma/inc/wma.h | 2 +- core/wma/src/wma_data.c | 8 +-- 8 files changed, 11 insertions(+), 283 deletions(-) delete mode 100644 core/cdf/inc/cdf_defer.h delete mode 100644 core/cdf/src/cdf_defer.c delete mode 100644 core/cdf/src/i_cdf_defer.h diff --git a/core/cdf/inc/cdf_defer.h b/core/cdf/inc/cdf_defer.h deleted file mode 100644 index 829f350f6023..000000000000 --- a/core/cdf/inc/cdf_defer.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2014, 2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_defer.h - * This file abstracts deferred execution contexts. - */ - -#ifndef __CDF_DEFER_H -#define __CDF_DEFER_H - -#include -#include - -/** - * This implements work queues (worker threads, kernel threads etc.). - * Note that there is no cancel on a scheduled work. You cannot free a work - * item if its queued. You cannot know if a work item is queued or not unless - * its running, whence you know its not queued. - * - * so if, say, a module is asked to unload itself, how exactly will it make - * sure that the work's not queued, for OS'es that dont provide such a - * mechanism?? - */ - -/* cdf_work_t - representation of a work queue */ -typedef __cdf_work_t cdf_work_t; - -/* cdf_work_t - representation of a bottom half */ -typedef __cdf_bh_t cdf_bh_t; - -/** - * cdf_create_bh() - this creates the Bottom half deferred handler - * @hdl: OS handle - * @bh: Bottom instance - * @func: Func deferred function to run at bottom half interrupt - * context - * Return: None - */ -static inline void -cdf_create_bh(cdf_handle_t hdl, cdf_bh_t *bh, cdf_defer_fn_t func, void *arg) -{ - __cdf_init_bh(hdl, bh, func, arg); -} - -/** - * cdf_sched_bh() - schedule a bottom half (DPC) - * @hdl: OS handle - * @bh: Bottom instance - * - * Return: None - */ -static inline void cdf_sched_bh(cdf_handle_t hdl, cdf_bh_t *bh) -{ - __cdf_sched_bh(hdl, bh); -} - -/** - * cdf_destroy_bh() - destroy a bottom half (DPC) - * @hdl: OS handle - * @bh: Bottom instance - * - * Return: None - */ -static inline void cdf_destroy_bh(cdf_handle_t hdl, cdf_bh_t *bh) -{ - __cdf_disable_bh(hdl, bh); -} - -/*********************Non-Interrupt Context deferred Execution***************/ - -/** - * cdf_create_work() - create a work/task queue, This runs in non-interrupt - * context, so can be preempted by H/W & S/W intr - * @work: Work instance - * @func: Deferred function to run at bottom half non-interrupt - * context - * @arg: Argument for the deferred function - * - * Return: None - */ -static inline void -cdf_create_work(cdf_work_t *work, - cdf_defer_fn_t func, void *arg) -{ - __cdf_init_work(work, func, arg); -} - -/** - * cdf_sched_work() - schedule a deferred task on non-interrupt context - * @work: Work instance - * - * Return: None - */ -static inline void cdf_schedule_work(cdf_work_t *work) -{ - __cdf_schedule_work(work); -} -#endif /*__CDF_DEFER_H*/ diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index 3f249fd74898..6bb05f193bb7 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -233,7 +233,7 @@ typedef struct { struct _NIC_DEV { void *bdev; /* bus device handle */ struct net_device *netdev; /* net device handle (wifi%d) */ - cdf_bh_t intr_tq; /* tasklet */ + qdf_bh_t intr_tq; /* tasklet */ struct net_device_stats devstats; /* net device statisitics */ HAL_BUS_CONTEXT bc; #ifdef ATH_PERF_PWR_OFFLOAD diff --git a/core/cdf/src/cdf_defer.c b/core/cdf/src/cdf_defer.c deleted file mode 100644 index 061f3c5b99f0..000000000000 --- a/core/cdf/src/cdf_defer.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#include -#include -#include -#include - -#include "i_cdf_defer.h" - -/** - * __cdf_defer_func() - defer work handler - * @work: Pointer to defer work - * - * Return: none - */ -void __cdf_defer_func(struct work_struct *work) -{ - __cdf_work_t *ctx = container_of(work, __cdf_work_t, work); - if (ctx->fn == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "No callback registered !!"); - return; - } - ctx->fn(ctx->arg); -} diff --git a/core/cdf/src/i_cdf_defer.h b/core/cdf/src/i_cdf_defer.h deleted file mode 100644 index 0e3f02fc0b69..000000000000 --- a/core/cdf/src/i_cdf_defer.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _I_CDF_DEFER_H -#define _I_CDF_DEFER_H - -#include -#include -#include -#ifdef CONFIG_CNSS -#include -#endif -#include -#include -#include - -typedef struct tasklet_struct __cdf_bh_t; - -typedef void (*__cdf_bh_fn_t)(unsigned long arg); - -/* wrapper around the real task func */ -typedef struct { - struct work_struct work; - cdf_defer_fn_t fn; - void *arg; -} __cdf_work_t; - -extern void __cdf_defer_func(struct work_struct *work); - -static inline QDF_STATUS -__cdf_init_work(__cdf_work_t *work, cdf_defer_fn_t func, void *arg) -{ - /*Initilize func and argument in work struct */ - work->fn = func; - work->arg = arg; -#ifdef CONFIG_CNSS - cnss_init_work(&work->work, __cdf_defer_func); -#else - INIT_WORK(&work->work, __cdf_defer_func); -#endif - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS __cdf_schedule_work(__cdf_work_t *work) -{ - schedule_work(&work->work); - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS __cdf_init_bh(cdf_handle_t hdl, - struct tasklet_struct *bh, - cdf_defer_fn_t func, void *arg) -{ - tasklet_init(bh, (__cdf_bh_fn_t) func, (unsigned long)arg); - - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS -__cdf_sched_bh(cdf_handle_t hdl, struct tasklet_struct *bh) -{ - tasklet_schedule(bh); - - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS -__cdf_disable_bh(cdf_handle_t hdl, struct tasklet_struct *bh) -{ - tasklet_kill(bh); - - return QDF_STATUS_SUCCESS; -} - -#endif /*_I_CDF_DEFER_H*/ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 3fb0a10f771b..2c33fd545202 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -6753,10 +6753,10 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, operationChannel) #endif ) { - cdf_create_work(&hdd_ctx->sta_ap_intf_check_work, + qdf_create_work(0, &hdd_ctx->sta_ap_intf_check_work, cds_check_sta_ap_concurrent_ch_intf, (void *)adapter); - cdf_schedule_work(&hdd_ctx->sta_ap_intf_check_work); + qdf_sched_work(0, &hdd_ctx->sta_ap_intf_check_work); cds_info("Checking for Concurrent Change interference"); } } diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 8b05e0c35388..40c3492e7c2d 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -58,7 +58,7 @@ #include "wlan_hdd_tdls.h" #endif #include "wlan_hdd_cfg80211.h" -#include +#include #ifdef WLAN_FEATURE_MBSSID #include "sap_api.h" #endif @@ -1253,7 +1253,7 @@ struct hdd_context_s { tSirScanType ioctl_scan_mode; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH - cdf_work_t sta_ap_intf_check_work; + qdf_work_t sta_ap_intf_check_work; #endif struct work_struct sap_start_work; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index fd1548b74ef9..478d3d71b9e2 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1444,7 +1444,7 @@ struct wma_tx_ack_work_ctx { tp_wma_handle wma_handle; uint16_t sub_type; int32_t status; - cdf_work_t ack_cmp_work; + qdf_work_t ack_cmp_work; }; /** diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 4d25ebc67da0..cb2c41a56228 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -888,10 +888,10 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) ack_work->sub_type = 0; ack_work->status = status; - cdf_create_work(&ack_work->ack_cmp_work, + qdf_create_work(0, &ack_work->ack_cmp_work, wma_data_tx_ack_work_handler, ack_work); - cdf_schedule_work(&ack_work->ack_cmp_work); + qdf_sched_work(0, &ack_work->ack_cmp_work); } } @@ -1562,11 +1562,11 @@ wma_mgmt_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) ack_work->sub_type = pFc->subType; ack_work->status = status; - cdf_create_work(&ack_work->ack_cmp_work, + qdf_create_work(0, &ack_work->ack_cmp_work, wma_mgmt_tx_ack_work_handler, ack_work); - cdf_schedule_work(&ack_work->ack_cmp_work); + qdf_sched_work(0, &ack_work->ack_cmp_work); } } } -- cgit v1.2.3 From 512c7d5fcad7c938aaeecde23094b3afaaffc5e3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Fri, 19 Feb 2016 15:49:46 +0530 Subject: qcacld-3.0: Add QDF threads API's Replace CDF threads API's with QDF threads API's Change-Id: Ic20e6734f85b37ed11580ff3ed7e1a6de1356afb CRs-Fixed: 981188 --- core/cdf/inc/cdf_threads.h | 83 ----------------------------------- core/cdf/src/cdf_threads.c | 107 --------------------------------------------- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/dp/txrx/ol_txrx.c | 2 +- 5 files changed, 3 insertions(+), 193 deletions(-) delete mode 100644 core/cdf/inc/cdf_threads.h delete mode 100644 core/cdf/src/cdf_threads.c diff --git a/core/cdf/inc/cdf_threads.h b/core/cdf/inc/cdf_threads.h deleted file mode 100644 index 8aa320c50d75..000000000000 --- a/core/cdf/inc/cdf_threads.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_THREADS_H) -#define __CDF_THREADS_H - -/** - * DOC: cdf_threads - * - * Connectivity driver framework (CDF) thread related APIs - * - */ - -/* Include Files */ -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_sleep() - sleep - * @msInterval : Number of milliseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return: nothing - */ -void cdf_sleep(uint32_t msInterval); - -/** - * cdf_sleep_us() - sleep - * @usInterval : Number of microseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return : nothing - */ -void cdf_sleep_us(uint32_t usInterval); - -/** - * cdf_busy_wait() - busy wait - * @usInterval : Number of microseconds to busy wait. - * - * This function places the current thread in busy wait until the specified - * time out interval elapses. If the interval is greater than 50us on WM, the - * behaviour is undefined. - * - * Return : nothing - */ -void cdf_busy_wait(uint32_t usInterval); - -#endif /* __CDF_THREADS_H */ diff --git a/core/cdf/src/cdf_threads.c b/core/cdf/src/cdf_threads.c deleted file mode 100644 index 6b408d567850..000000000000 --- a/core/cdf/src/cdf_threads.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_threads - * - * Connectivity driver framework (CDF) thread APIs - * - */ - -/* Include Files */ -#include -#include -#include -#include -#include -#include - -/* Preprocessor definitions and constants */ - -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_sleep() - sleep - * @msInterval : Number of milliseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return: nothing - */ -void cdf_sleep(uint32_t msInterval) -{ - if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return; - } - msleep_interruptible(msInterval); -} - -/** - * cdf_sleep_us() - sleep - * @usInterval : Number of microseconds to suspend the current thread. - * A value of 0 may or may not cause the current thread to yield. - * - * This function suspends the execution of the current thread - * until the specified time out interval elapses. - * - * Return : nothing - */ -void cdf_sleep_us(uint32_t usInterval) -{ - unsigned long timeout = usecs_to_jiffies(usInterval) + 1; - if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return; - } - - while (timeout && !signal_pending(current)) - timeout = schedule_timeout_interruptible(timeout); -} - -/** - * cdf_busy_wait() - busy wait - * @usInterval : Number of microseconds to busy wait. - * - * This function places the current thread in busy wait until the specified - * time out interval elapses. If the interval is greater than 50us on WM, the - * behaviour is undefined. - * - * Return : nothing - */ -void cdf_busy_wait(uint32_t usInterval) -{ - udelay(usInterval); -} diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index cf8ffb72f0a4..2292ac7f95a4 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 8848c56dd309..d1fdb08eec8e 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 282e26ca6a9f..3f4ee5eb9a4f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1901,7 +1901,7 @@ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) } while (ol_txrx_get_tx_pending(txrx_pdev)) { - cdf_sleep(OL_ATH_TX_DRAIN_WAIT_DELAY); + qdf_sleep(OL_ATH_TX_DRAIN_WAIT_DELAY); if (timeout <= 0) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: tx frames are pending", __func__); -- cgit v1.2.3 From 754fbd8d95652b4186ee7fb2c23ebcf88ec83bfe Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Fri, 19 Feb 2016 17:00:08 +0530 Subject: qcacld-3.0: Add QDF timer API's Replace CDF timer API's with QDF timer API's Change-Id: I43aa23676ed893a7309135dec6a8b897b113f00e CRs-Fixed: 981188 --- core/cdf/inc/cdf_softirq_timer.h | 118 ------------------------- core/cdf/inc/osdep.h | 10 +-- core/cdf/src/i_cdf_softirq_timer.h | 152 -------------------------------- core/dp/htt/htt_rx.c | 12 +-- core/dp/htt/htt_types.h | 4 +- core/dp/txrx/ol_rx_reorder_timeout.c | 10 +-- core/dp/txrx/ol_tx.c | 12 +-- core/dp/txrx/ol_tx_queue.c | 14 +-- core/dp/txrx/ol_txrx.c | 14 +-- core/dp/txrx/ol_txrx_types.h | 10 +-- core/sap/dfs/inc/dfs.h | 2 +- core/utils/epping/inc/epping_internal.h | 2 +- core/utils/epping/src/epping_tx.c | 8 +- core/utils/epping/src/epping_txrx.c | 9 +- 14 files changed, 54 insertions(+), 323 deletions(-) delete mode 100644 core/cdf/inc/cdf_softirq_timer.h delete mode 100644 core/cdf/src/i_cdf_softirq_timer.h diff --git a/core/cdf/inc/cdf_softirq_timer.h b/core/cdf/inc/cdf_softirq_timer.h deleted file mode 100644 index d05a9509f59d..000000000000 --- a/core/cdf/inc/cdf_softirq_timer.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_softirq_timer - * This file abstracts OS timers running in soft IRQ context. - */ - -#ifndef _CDF_SOFTIRQ_TIMER_H -#define _CDF_SOFTIRQ_TIMER_H - -#include -#include - -/* Platform timer object */ -typedef __cdf_softirq_timer_t cdf_softirq_timer_t; - -/** - * cdf_softirq_timer_init() - initialize a softirq timer - * @hdl: OS handle - * @timer: Timer object pointer - * @func: Timer function - * @arg: Arguement of timer function - * @type: deferrable or non deferrable timer type - * - * Timer type CDF_TIMER_TYPE_SW means its a deferrable sw timer which will - * not cause CPU wake upon expiry - * Timer type CDF_TIMER_TYPE_WAKE_APPS means its a non-deferrable timer which - * will cause CPU wake up on expiry - * - * Return: none - */ -static inline void -cdf_softirq_timer_init(cdf_handle_t hdl, - cdf_softirq_timer_t *timer, - cdf_softirq_timer_func_t func, void *arg, - CDF_TIMER_TYPE type) -{ - __cdf_softirq_timer_init(hdl, timer, func, arg, type); -} - -/** - * cdf_softirq_timer_start() - start a one-shot softirq timer - * @timer: Timer object pointer - * @msec: Expiration period in milliseconds - * - * Return: none - */ -static inline void -cdf_softirq_timer_start(cdf_softirq_timer_t *timer, int msec) -{ - __cdf_softirq_timer_start(timer, msec); -} - -/** - * cdf_softirq_timer_mod() - modify existing timer to new timeout value - * @timer: Timer object pointer - * @msec: Expiration period in milliseconds - * - * Return: none - */ -static inline void cdf_softirq_timer_mod(cdf_softirq_timer_t *timer, int msec) -{ - __cdf_softirq_timer_mod(timer, msec); -} - -/** - * cdf_softirq_timer_cancel() - cancel cdf softirq timer - * @timer: Timer object pointer - * @retval: Timer was cancelled and deactived - * @retval: Timer was cancelled but already got fired. - * - * The function will return after any running timer completes. - * - * Return: none - */ -static inline bool cdf_softirq_timer_cancel(cdf_softirq_timer_t *timer) -{ - return __cdf_softirq_timer_cancel(timer); -} - -/** - * cdf_softirq_timer_free() - free cdf softirq timer - * @timer: Timer object pointer - * - * The function will return after any running timer completes. - * Return: none - */ -static inline void cdf_softirq_timer_free(cdf_softirq_timer_t *timer) -{ - __cdf_softirq_timer_free(timer); -} - -#endif diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index 6bb05f193bb7..e5bc0bf1ba46 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -282,13 +282,13 @@ static INLINE unsigned char *os_malloc(osdev_t pNicDev, (_arg) = (_type)(timer_arg) #define OS_INIT_TIMER(_osdev, _timer, _fn, _ctx, type) \ - cdf_softirq_timer_init(_osdev, _timer, _fn, _ctx, type) + qdf_timer_init(_osdev, _timer, _fn, _ctx, type) -#define OS_SET_TIMER(_timer, _ms) cdf_softirq_timer_mod(_timer, _ms) +#define OS_SET_TIMER(_timer, _ms) qdf_timer_mod(_timer, _ms) -#define OS_CANCEL_TIMER(_timer) cdf_softirq_timer_cancel(_timer) +#define OS_CANCEL_TIMER(_timer) qdf_timer_stop(_timer) -#define OS_FREE_TIMER(_timer) cdf_softirq_timer_cancel(_timer) +#define OS_FREE_TIMER(_timer) qdf_timer_stop(_timer) /* * These are required for network manager support diff --git a/core/cdf/src/i_cdf_softirq_timer.h b/core/cdf/src/i_cdf_softirq_timer.h deleted file mode 100644 index 14cc9fcd18c0..000000000000 --- a/core/cdf/src/i_cdf_softirq_timer.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _I_CDF_SOFTIRQ_TIMER_H -#define _I_CDF_SOFTIRQ_TIMER_H - -#include -#include -#include -#include -#include - -/* timer data type */ -typedef struct timer_list __cdf_softirq_timer_t; - -/* ugly - but every other OS takes, sanely, a void */ - -typedef void (*cdf_dummy_timer_func_t)(unsigned long arg); - -/** - * __cdf_softirq_timer_init() - initialize a softirq timer - * @hdl: OS handle - * @timer: Pointer to timer object - * @func: Function pointer - * @arg: Arguement - * @type: deferrable or non deferrable timer type - * - * Timer type CDF_TIMER_TYPE_SW means its a deferrable sw timer which will - * not cause CPU wake upon expiry - * Timer type CDF_TIMER_TYPE_WAKE_APPS means its a non-deferrable timer which - * will cause CPU wake up on expiry - * - * Return: none - */ -static inline QDF_STATUS -__cdf_softirq_timer_init(cdf_handle_t hdl, - struct timer_list *timer, - cdf_softirq_timer_func_t func, void *arg, - CDF_TIMER_TYPE type) -{ - if (CDF_TIMER_TYPE_SW == type) - init_timer_deferrable(timer); - else - init_timer(timer); - timer->function = (cdf_dummy_timer_func_t) func; - timer->data = (unsigned long)arg; - - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_softirq_timer_start() - start a cdf softirq timer - * @timer: Pointer to timer object - * @delay: Delay in milli seconds - * - * Return: none - */ -static inline QDF_STATUS -__cdf_softirq_timer_start(struct timer_list *timer, uint32_t delay) -{ - timer->expires = jiffies + msecs_to_jiffies(delay); - add_timer(timer); - - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_softirq_timer_mod() - modify a timer - * @timer: Pointer to timer object - * @delay: Delay in milli seconds - * - * Return: none - */ -static inline QDF_STATUS -__cdf_softirq_timer_mod(struct timer_list *timer, uint32_t delay) -{ - mod_timer(timer, jiffies + msecs_to_jiffies(delay)); - - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_softirq_timer_cancel() - cancel a timer - * @timer: Pointer to timer object - * - * Return: true if timer was cancelled and deactived, - * false if timer was cancelled but already got fired. - */ -static inline bool __cdf_softirq_timer_cancel(struct timer_list *timer) -{ - if (likely(del_timer(timer))) - return 1; - else - return 0; -} - -/** - * __cdf_softirq_timer_free() - free a cdf timer - * @timer: Pointer to timer object - * - * Return: true if timer was cancelled and deactived, - * false if timer was cancelled but already got fired. - */ -static inline void __cdf_softirq_timer_free(struct timer_list *timer) -{ - del_timer_sync(timer); -} - -/** - * __cdf_sostirq_timer_sync_cancel() - Synchronously canel a timer - * @timer: Pointer to timer object - * - * Synchronization Rules: - * 1. caller must make sure timer function will not use - * cdf_softirq_set_timer to add iteself again. - * 2. caller must not hold any lock that timer function - * is likely to hold as well. - * 3. It can't be called from interrupt context. - * - * Return: true if timer was cancelled and deactived, - * false if timer was cancelled but already got fired. - */ -static inline bool __cdf_sostirq_timer_sync_cancel(struct timer_list *timer) -{ - return del_timer_sync(timer); -} - -#endif /*_ADF_OS_TIMER_PVT_H*/ diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 191a567a267d..c1749877021f 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -42,7 +42,7 @@ #include /* cdf_mem_malloc,free, etc. */ #include /* cdf_print, bool */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_softirq_timer_free */ +#include /* qdf_timer_free */ #include /* HTT_HL_RX_DESC_SIZE */ #include @@ -237,7 +237,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) cdf_nbuf_alloc(pdev->osdev, HTT_RX_BUF_SIZE, 0, 4, false); if (!rx_netbuf) { - cdf_softirq_timer_cancel(&pdev->rx_ring. + qdf_timer_stop(&pdev->rx_ring. refill_retry_timer); /* * Failed to fill it to the desired level - @@ -248,7 +248,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) #ifdef DEBUG_DMA_DONE pdev->rx_ring.dbg_refill_cnt++; #endif - cdf_softirq_timer_start( + qdf_timer_start( &pdev->rx_ring.refill_retry_timer, HTT_RX_RING_REFILL_RETRY_TIME_MS); goto fail; @@ -342,8 +342,8 @@ unsigned int htt_rx_in_order_ring_elems(struct htt_pdev_t *pdev) void htt_rx_detach(struct htt_pdev_t *pdev) { - cdf_softirq_timer_cancel(&pdev->rx_ring.refill_retry_timer); - cdf_softirq_timer_free(&pdev->rx_ring.refill_retry_timer); + qdf_timer_stop(&pdev->rx_ring.refill_retry_timer); + qdf_timer_free(&pdev->rx_ring.refill_retry_timer); if (pdev->cfg.is_full_reorder_offload) { cdf_os_mem_free_consistent(pdev->osdev, @@ -2208,7 +2208,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) qdf_atomic_inc(&pdev->rx_ring.refill_ref_cnt); /* Initialize the Rx refill retry timer */ - cdf_softirq_timer_init(pdev->osdev, + qdf_timer_init(pdev->osdev, &pdev->rx_ring.refill_retry_timer, htt_rx_ring_refill_retry, (void *)pdev, CDF_TIMER_TYPE_SW); diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index e3229809f266..68a937c31157 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -31,7 +31,7 @@ #include /* uint16_t, dma_addr_t */ #include /* cdf_device_t */ #include /* cdf_spinlock_t */ -#include /* cdf_softirq_timer_t */ +#include /* qdf_timer_t */ #include /* qdf_atomic_inc */ #include /* cdf_nbuf_t */ #include /* HTC_PACKET */ @@ -324,7 +324,7 @@ struct htt_pdev_t { * refill_retry_timer - timer triggered when the ring is not * refilled to the level expected */ - cdf_softirq_timer_t refill_retry_timer; + qdf_timer_t refill_retry_timer; /* * refill_ref_cnt - ref cnt for Rx buffer replenishment - this diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index f4e80775877e..f908bd65b9b2 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -28,7 +28,7 @@ /*=== header file includes ===*/ /* generic utilities */ #include /* cdf_nbuf_t, etc. */ -#include +#include #include /* datapath internal interfaces */ @@ -68,7 +68,7 @@ ol_rx_reorder_timeout_start(struct ol_tx_reorder_cat_timeout_t list_elem = TAILQ_FIRST(&rx_reorder_timeout_ac->virtual_timer_list); duration_ms = list_elem->timestamp_ms - time_now_ms; - cdf_softirq_timer_start(&rx_reorder_timeout_ac->timer, duration_ms); + qdf_timer_start(&rx_reorder_timeout_ac->timer, duration_ms); } static inline void @@ -178,7 +178,7 @@ void ol_rx_reorder_timeout_init(struct ol_txrx_pdev_t *pdev) rx_reorder_timeout_ac = &pdev->rx.reorder_timeout.access_cats[i]; /* init the per-AC timers */ - cdf_softirq_timer_init(pdev->osdev, + qdf_timer_init(pdev->osdev, &rx_reorder_timeout_ac->timer, ol_rx_reorder_timeout, rx_reorder_timeout_ac); @@ -211,8 +211,8 @@ void ol_rx_reorder_timeout_cleanup(struct ol_txrx_pdev_t *pdev) struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac; rx_reorder_timeout_ac = &pdev->rx.reorder_timeout.access_cats[i]; - cdf_softirq_timer_cancel(&rx_reorder_timeout_ac->timer); - cdf_softirq_timer_free(&rx_reorder_timeout_ac->timer); + qdf_timer_stop(&rx_reorder_timeout_ac->timer); + qdf_timer_free(&rx_reorder_timeout_ac->timer); } } diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 3ab78276c228..3ac0976aac65 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -806,8 +806,8 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) } } if (vdev->ll_pause.txq.depth) { - cdf_softirq_timer_cancel(&vdev->ll_pause.timer); - cdf_softirq_timer_start(&vdev->ll_pause.timer, + qdf_timer_stop(&vdev->ll_pause.timer); + qdf_timer_start(&vdev->ll_pause.timer, OL_TX_VDEV_PAUSE_QUEUE_SEND_PERIOD_MS); vdev->ll_pause.is_q_timer_on = true; if (vdev->ll_pause.txq.depth >= vdev->ll_pause.max_q_depth) @@ -846,8 +846,8 @@ ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, cdf_nbuf_set_next(vdev->ll_pause.txq.tail, NULL); if (start_timer) { - cdf_softirq_timer_cancel(&vdev->ll_pause.timer); - cdf_softirq_timer_start(&vdev->ll_pause.timer, + qdf_timer_stop(&vdev->ll_pause.timer); + qdf_timer_start(&vdev->ll_pause.timer, OL_TX_VDEV_PAUSE_QUEUE_SEND_PERIOD_MS); vdev->ll_pause.is_q_timer_on = true; } @@ -995,8 +995,8 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { cdf_spin_lock_bh(&vdev->ll_pause.mutex); if (vdev->ll_pause.txq.depth) { - cdf_softirq_timer_cancel(&pdev->tx_throttle.tx_timer); - cdf_softirq_timer_start( + qdf_timer_stop(&pdev->tx_throttle.tx_timer); + qdf_timer_start( &pdev->tx_throttle.tx_timer, OL_TX_VDEV_PAUSE_QUEUE_SEND_PERIOD_MS); cdf_spin_unlock_bh(&vdev->ll_pause.mutex); diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index 9ff8fcdfbe11..b60789c16fe3 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -88,7 +88,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) { cdf_spin_lock_bh(&vdev->ll_pause.mutex); - cdf_softirq_timer_cancel(&vdev->ll_pause.timer); + qdf_timer_stop(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; while (vdev->ll_pause.txq.head) { cdf_nbuf_t next = @@ -310,7 +310,7 @@ void ol_tx_pdev_throttle_phase_timer(void *context) THROTTLE_LEVEL_0) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "start timer %d ms\n", ms); - cdf_softirq_timer_start(&pdev->tx_throttle. + qdf_timer_start(&pdev->tx_throttle. phase_timer, ms); } } else { @@ -325,7 +325,7 @@ void ol_tx_pdev_throttle_phase_timer(void *context) THROTTLE_LEVEL_0) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "start timer %d ms\n", ms); - cdf_softirq_timer_start(&pdev->tx_throttle.phase_timer, + qdf_timer_start(&pdev->tx_throttle.phase_timer, ms); } } @@ -363,10 +363,10 @@ void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev, int level) ms = pdev->tx_throttle. throttle_time_ms[level][THROTTLE_PHASE_OFF]; - cdf_softirq_timer_cancel(&pdev->tx_throttle.phase_timer); + qdf_timer_stop(&pdev->tx_throttle.phase_timer); if (level != THROTTLE_LEVEL_0) - cdf_softirq_timer_start(&pdev->tx_throttle.phase_timer, ms); + qdf_timer_start(&pdev->tx_throttle.phase_timer, ms); } /* This table stores the duty cycle for each level. @@ -411,13 +411,13 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev) ol_tx_throttle_init_period(pdev, throttle_period); - cdf_softirq_timer_init(pdev->osdev, + qdf_timer_init(pdev->osdev, &pdev->tx_throttle.phase_timer, ol_tx_pdev_throttle_phase_timer, pdev, CDF_TIMER_TYPE_SW); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL - cdf_softirq_timer_init(pdev->osdev, + qdf_timer_init(pdev->osdev, &pdev->tx_throttle.tx_timer, ol_tx_pdev_throttle_tx_timer, pdev, CDF_TIMER_TYPE_SW); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 3f4ee5eb9a4f..6dbf31c04b7e 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -979,11 +979,11 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) OL_RX_REORDER_TIMEOUT_CLEANUP(pdev); #ifdef QCA_SUPPORT_TX_THROTTLE /* Thermal Mitigation */ - cdf_softirq_timer_cancel(&pdev->tx_throttle.phase_timer); - cdf_softirq_timer_free(&pdev->tx_throttle.phase_timer); + qdf_timer_stop(&pdev->tx_throttle.phase_timer); + qdf_timer_free(&pdev->tx_throttle.phase_timer); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL - cdf_softirq_timer_cancel(&pdev->tx_throttle.tx_timer); - cdf_softirq_timer_free(&pdev->tx_throttle.tx_timer); + qdf_timer_stop(&pdev->tx_throttle.tx_timer); + qdf_timer_free(&pdev->tx_throttle.tx_timer); #endif #endif ol_tso_seg_list_deinit(pdev); @@ -1108,7 +1108,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, vdev->ll_pause.paused_reason = 0; vdev->ll_pause.txq.head = vdev->ll_pause.txq.tail = NULL; vdev->ll_pause.txq.depth = 0; - cdf_softirq_timer_init(pdev->osdev, + qdf_timer_init(pdev->osdev, &vdev->ll_pause.timer, ol_tx_vdev_ll_pause_queue_send, vdev, CDF_TIMER_TYPE_SW); @@ -1186,8 +1186,8 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, TXRX_ASSERT2(vdev); cdf_spin_lock_bh(&vdev->ll_pause.mutex); - cdf_softirq_timer_cancel(&vdev->ll_pause.timer); - cdf_softirq_timer_free(&vdev->ll_pause.timer); + qdf_timer_stop(&vdev->ll_pause.timer); + qdf_timer_free(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; while (vdev->ll_pause.txq.head) { cdf_nbuf_t next = cdf_nbuf_next(vdev->ll_pause.txq.head); diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 7c0bc80817a9..9f5e7fbf5ea2 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -39,7 +39,7 @@ #include /* htt_sec_type, htt_pkt_type, etc. */ #include /* qdf_atomic_t */ #include /* wdi_event_subscribe */ -#include /* cdf_softirq_timer_t */ +#include /* qdf_timer_t */ #include /* cdf_spinlock */ #include /* ol_pktlog_dev_handle */ #include @@ -202,7 +202,7 @@ struct ol_rx_reorder_timeout_list_elem_t { struct ol_tx_reorder_cat_timeout_t { TAILQ_HEAD(, ol_rx_reorder_timeout_list_elem_t) virtual_timer_list; - cdf_softirq_timer_t timer; + qdf_timer_t timer; uint32_t duration_ms; struct ol_txrx_pdev_t *pdev; }; @@ -729,9 +729,9 @@ struct ol_txrx_pdev_t { cdf_spinlock_t mutex; /* timer used to monitor the throttle "on" phase and "off" phase */ - cdf_softirq_timer_t phase_timer; + qdf_timer_t phase_timer; /* timer used to send tx frames */ - cdf_softirq_timer_t tx_timer; + qdf_timer_t tx_timer; /* This is the time in ms of the throttling window, it will * include an "on" phase and an "off" phase */ uint32_t throttle_period_ms; @@ -833,7 +833,7 @@ struct ol_txrx_vdev_t { } txq; uint32_t paused_reason; cdf_spinlock_t mutex; - cdf_softirq_timer_t timer; + qdf_timer_t timer; int max_q_depth; bool is_q_paused; bool is_q_timer_on; diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index e65543fbf519..6516e15aa9ec 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -54,7 +54,7 @@ #include /* cdf_spinlock */ #include /* TAILQ */ #include -#include +#include #include #include /*DFS Utility Include END*/ diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 2e03fd50a9f1..2675c703dcd0 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -143,7 +143,7 @@ typedef struct epping_adapter_s { /* for mboxping */ cdf_spinlock_t data_lock; cdf_nbuf_queue_t nodrop_queue; - cdf_softirq_timer_t epping_timer; + qdf_timer_t epping_timer; epping_tx_timer_state_t epping_timer_state; bool registered; bool started; diff --git a/core/utils/epping/src/epping_tx.c b/core/utils/epping/src/epping_tx.c index 38489b25ff82..a1f0f4e3feab 100644 --- a/core/utils/epping/src/epping_tx.c +++ b/core/utils/epping/src/epping_tx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,7 +53,7 @@ #define TX_RETRY_TIMEOUT_IN_MS 1 -static bool enb_tx_dump = 0; +static bool enb_tx_dump; void epping_tx_dup_pkt(epping_adapter_t *pAdapter, HTC_ENDPOINT_ID eid, cdf_nbuf_t skb) @@ -204,7 +204,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) /* if nodrop queue is not empty, continue to arm timer */ if (pAdapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { pAdapter->epping_timer_state = EPPING_TX_TIMER_RUNNING; - cdf_softirq_timer_mod(&pAdapter->epping_timer, + qdf_timer_mod(&pAdapter->epping_timer, TX_RETRY_TIMEOUT_IN_MS); } cdf_spin_unlock_bh(&pAdapter->data_lock); @@ -291,7 +291,7 @@ tx_fail: cdf_spin_lock_bh(&pAdapter->data_lock); if (pAdapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { pAdapter->epping_timer_state = EPPING_TX_TIMER_RUNNING; - cdf_softirq_timer_mod(&pAdapter->epping_timer, + qdf_timer_mod(&pAdapter->epping_timer, TX_RETRY_TIMEOUT_IN_MS); } cdf_spin_unlock_bh(&pAdapter->data_lock); diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index f3a3101eefcc..d703ac9c4e13 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -267,7 +267,8 @@ static int epping_register_adapter(epping_adapter_t *pAdapter) { int ret = 0; - if ((ret = register_netdev(pAdapter->dev)) != 0) { + ret = register_netdev(pAdapter->dev); + if (ret != 0) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: unable to register device\n", pAdapter->dev->name); @@ -308,7 +309,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter) epping_unregister_adapter(pAdapter); cdf_spinlock_destroy(&pAdapter->data_lock); - cdf_softirq_timer_free(&pAdapter->epping_timer); + qdf_timer_free(&pAdapter->epping_timer); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; while (cdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { @@ -369,7 +370,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, cdf_spinlock_init(&pAdapter->data_lock); cdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; - cdf_softirq_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, + qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, epping_timer_expire, dev, CDF_TIMER_TYPE_SW); dev->type = ARPHRD_IEEE80211; dev->netdev_ops = &epping_drv_ops; -- cgit v1.2.3 From 6d760664eee7fc5dd0f3fe6c449049551ffa4cd3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sat, 20 Feb 2016 16:05:43 +0530 Subject: qcacld-3.0: Add QDF types Replace CDF types with QDF types Change-Id: Idd6e65b148efb54f22d6951572957f1c6166465b CRs-Fixed: 981188 --- core/bmi/inc/ol_fw.h | 2 +- core/bmi/inc/ol_if_athvar.h | 4 +- core/bmi/src/ol_fw.c | 12 +- core/cdf/inc/cdf_lock.h | 4 +- core/cdf/inc/cdf_mc_timer.h | 12 +- core/cdf/inc/cdf_memory.h | 30 +- core/cdf/inc/cdf_nbuf.h | 36 +- core/cdf/inc/cdf_net_types.h | 2 +- core/cdf/inc/cdf_trace.h | 10 +- core/cdf/inc/cdf_types.h | 521 -------------- core/cdf/inc/cdf_util.h | 48 +- core/cdf/inc/osdep.h | 2 +- core/cdf/src/cdf_lock.c | 60 +- core/cdf/src/cdf_mc_timer.c | 74 +- core/cdf/src/cdf_memory.c | 72 +- core/cdf/src/cdf_nbuf.c | 54 +- core/cdf/src/cdf_trace.c | 96 +-- core/cdf/src/i_cdf_lock.h | 6 +- core/cdf/src/i_cdf_mc_timer.h | 2 +- core/cdf/src/i_cdf_nbuf.h | 24 +- core/cdf/src/i_cdf_trace.h | 12 +- core/cdf/src/i_cdf_types.h | 234 ------ core/cdf/src/i_cdf_util.h | 2 +- core/cds/inc/cds_api.h | 10 +- core/cds/inc/cds_concurrency.h | 14 +- core/cds/inc/cds_crypto.h | 2 +- core/cds/inc/cds_mq.h | 10 +- core/cds/inc/cds_packet.h | 2 +- core/cds/inc/cds_sched.h | 6 +- core/cds/inc/cds_utils.h | 4 +- core/cds/src/cds_api.c | 332 ++++----- core/cds/src/cds_concurrency.c | 278 ++++---- core/cds/src/cds_mq.c | 18 +- core/cds/src/cds_packet.c | 28 +- core/cds/src/cds_reg_service.c | 58 +- core/cds/src/cds_regdomain.c | 154 ++-- core/cds/src/cds_sched.c | 136 ++-- core/cds/src/cds_utils.c | 70 +- core/cds/src/i_cds_packet.h | 12 +- core/dp/htt/htt.c | 48 +- core/dp/htt/htt_fw_stats.c | 460 ++++++------ core/dp/htt/htt_h2t.c | 10 +- core/dp/htt/htt_internal.h | 48 +- core/dp/htt/htt_rx.c | 152 ++-- core/dp/htt/htt_t2h.c | 38 +- core/dp/htt/htt_tx.c | 86 +-- core/dp/htt/htt_types.h | 24 +- core/dp/ol/inc/ol_cfg.h | 4 +- core/dp/ol/inc/ol_htt_api.h | 38 +- core/dp/ol/inc/ol_htt_rx_api.h | 4 +- core/dp/ol/inc/ol_htt_tx_api.h | 42 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 42 +- core/dp/ol/inc/ol_txrx_htt_api.h | 4 +- core/dp/ol/inc/ol_txrx_stats.h | 4 +- core/dp/txrx/ol_cfg.c | 4 +- core/dp/txrx/ol_osif_txrx_api.h | 4 +- core/dp/txrx/ol_rx.c | 12 +- core/dp/txrx/ol_rx_defrag.h | 8 +- core/dp/txrx/ol_rx_fwd.c | 6 +- core/dp/txrx/ol_rx_pn.c | 6 +- core/dp/txrx/ol_rx_reorder.c | 8 +- core/dp/txrx/ol_rx_reorder_timeout.c | 4 +- core/dp/txrx/ol_tx.c | 50 +- core/dp/txrx/ol_tx_desc.c | 20 +- core/dp/txrx/ol_tx_queue.c | 8 +- core/dp/txrx/ol_tx_queue.h | 4 +- core/dp/txrx/ol_tx_send.c | 6 +- core/dp/txrx/ol_txrx.c | 196 +++--- core/dp/txrx/ol_txrx.h | 4 +- core/dp/txrx/ol_txrx_event.c | 24 +- core/dp/txrx/ol_txrx_flow_control.c | 18 +- core/dp/txrx/ol_txrx_internal.h | 32 +- core/dp/txrx/ol_txrx_peer_find.c | 10 +- core/dp/txrx/ol_txrx_types.h | 4 +- core/hdd/inc/qc_sap_ioctl.h | 4 +- core/hdd/inc/wlan_hdd_assoc.h | 4 +- core/hdd/inc/wlan_hdd_cfg.h | 6 +- core/hdd/inc/wlan_hdd_ftm.h | 2 +- core/hdd/inc/wlan_hdd_host_offload.h | 4 +- core/hdd/inc/wlan_hdd_main.h | 32 +- core/hdd/inc/wlan_hdd_mib.h | 8 +- core/hdd/inc/wlan_hdd_oemdata.h | 10 +- core/hdd/inc/wlan_hdd_softap_tx_rx.h | 8 +- core/hdd/inc/wlan_hdd_tdls.h | 4 +- core/hdd/inc/wlan_hdd_tx_rx.h | 2 +- core/hdd/inc/wlan_hdd_wext.h | 4 +- core/hdd/inc/wlan_hdd_wowl.h | 4 +- core/hdd/src/wlan_hdd_assoc.c | 68 +- core/hdd/src/wlan_hdd_cfg.c | 458 ++++++------ core/hdd/src/wlan_hdd_cfg80211.c | 220 +++--- core/hdd/src/wlan_hdd_conc_ut.c | 2 +- core/hdd/src/wlan_hdd_debugfs.c | 42 +- core/hdd/src/wlan_hdd_driver_ops.c | 26 +- core/hdd/src/wlan_hdd_ext_scan.c | 40 +- core/hdd/src/wlan_hdd_ftm.c | 68 +- core/hdd/src/wlan_hdd_green_ap.c | 8 +- core/hdd/src/wlan_hdd_hostapd.c | 96 +-- core/hdd/src/wlan_hdd_hostapd.h | 2 +- core/hdd/src/wlan_hdd_ioctl.c | 396 +++++------ core/hdd/src/wlan_hdd_ipa.c | 54 +- core/hdd/src/wlan_hdd_lro.c | 4 +- core/hdd/src/wlan_hdd_main.c | 114 +-- core/hdd/src/wlan_hdd_memdump.c | 44 +- core/hdd/src/wlan_hdd_nan.c | 2 +- core/hdd/src/wlan_hdd_napi.c | 14 +- core/hdd/src/wlan_hdd_ocb.c | 4 +- core/hdd/src/wlan_hdd_oemdata.c | 72 +- core/hdd/src/wlan_hdd_p2p.c | 56 +- core/hdd/src/wlan_hdd_power.c | 54 +- core/hdd/src/wlan_hdd_scan.c | 32 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 106 +-- core/hdd/src/wlan_hdd_stats.c | 36 +- core/hdd/src/wlan_hdd_subnet_detect.c | 12 +- core/hdd/src/wlan_hdd_tdls.c | 160 ++--- core/hdd/src/wlan_hdd_trace.c | 6 +- core/hdd/src/wlan_hdd_tx_rx.c | 50 +- core/hdd/src/wlan_hdd_wext.c | 166 ++--- core/hdd/src/wlan_hdd_wmm.c | 216 +++--- core/hdd/src/wlan_hdd_wowl.c | 62 +- core/mac/inc/ani_global.h | 2 +- core/mac/inc/ani_system_defs.h | 6 +- core/mac/inc/sir_api.h | 264 +++---- core/mac/inc/sir_mac_prot_def.h | 136 ++-- core/mac/inc/sir_types.h | 4 +- core/mac/src/cfg/cfg_proc_msg.c | 10 +- core/mac/src/include/cfg_api.h | 2 +- core/mac/src/include/dph_global.h | 6 +- core/mac/src/pe/include/lim_ft_defs.h | 2 +- core/mac/src/pe/include/lim_global.h | 6 +- core/mac/src/pe/include/lim_session.h | 2 +- core/mac/src/pe/lim/lim_api.c | 28 +- core/mac/src/pe/lim/lim_assoc_utils.c | 24 +- core/mac/src/pe/lim/lim_assoc_utils.h | 8 +- core/mac/src/pe/lim/lim_ft.c | 4 +- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 4 +- core/mac/src/pe/lim/lim_process_action_frame.c | 31 +- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 48 +- core/mac/src/pe/lim/lim_process_auth_frame.c | 6 +- core/mac/src/pe/lim/lim_process_message_queue.c | 38 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 26 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 24 +- core/mac/src/pe/lim/lim_process_probe_req_frame.c | 26 +- core/mac/src/pe/lim/lim_process_probe_rsp_frame.c | 6 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 48 +- core/mac/src/pe/lim/lim_process_tdls.c | 44 +- core/mac/src/pe/lim/lim_prop_exts_utils.c | 6 +- core/mac/src/pe/lim/lim_send_management_frames.c | 204 +++--- core/mac/src/pe/lim/lim_send_messages.c | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 26 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.h | 6 +- core/mac/src/pe/lim/lim_session.c | 20 +- core/mac/src/pe/lim/lim_trace.c | 12 +- core/mac/src/pe/lim/lim_types.h | 12 +- core/mac/src/pe/lim/lim_utils.c | 20 +- core/mac/src/pe/rrm/rrm_api.c | 38 +- core/mac/src/pe/sch/sch_api.c | 2 +- core/mac/src/pe/sch/sch_beacon_process.c | 7 +- core/mac/src/pe/sch/sch_debug.c | 4 +- core/mac/src/sys/common/inc/wlan_qct_sys.h | 2 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 32 +- .../src/sys/legacy/src/platform/inc/sys_wrapper.h | 4 +- .../src/sys/legacy/src/platform/src/sys_wrapper.c | 36 +- .../src/sys/legacy/src/system/src/sys_entry_func.c | 10 +- core/mac/src/sys/legacy/src/utils/src/log_api.c | 16 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 2 +- core/sap/dfs/inc/dfs.h | 18 +- core/sap/dfs/src/dfs.c | 16 +- core/sap/dfs/src/dfs_init.c | 28 +- core/sap/dfs/src/dfs_nol.c | 2 +- core/sap/dfs/src/dfs_phyerr_tlv.c | 32 +- core/sap/dfs/src/dfs_process_phyerr.c | 10 +- core/sap/dfs/src/dfs_process_radarevent.c | 50 +- core/sap/inc/sap_api.h | 52 +- core/sap/src/sap_api_link_cntl.c | 146 ++-- core/sap/src/sap_ch_select.c | 76 +- core/sap/src/sap_fsm.c | 406 +++++------ core/sap/src/sap_internal.h | 18 +- core/sap/src/sap_module.c | 346 ++++----- core/sme/inc/csr_api.h | 32 +- core/sme/inc/csr_internal.h | 32 +- core/sme/inc/csr_neighbor_roam.h | 2 +- core/sme/inc/csr_support.h | 44 +- core/sme/inc/nan_api.h | 3 +- core/sme/inc/p2p_api.h | 3 +- core/sme/inc/sme_api.h | 30 +- core/sme/inc/sme_inside.h | 8 +- core/sme/inc/sme_internal.h | 4 +- core/sme/inc/sme_power_save.h | 2 +- core/sme/inc/sme_qos_api.h | 2 +- core/sme/inc/sme_qos_internal.h | 2 +- core/sme/inc/sme_rrm_api.h | 2 +- core/sme/inc/sme_rrm_internal.h | 4 +- core/sme/src/common/sme_api.c | 782 ++++++++++----------- core/sme/src/common/sme_ft_api.c | 14 +- core/sme/src/common/sme_power_save.c | 76 +- core/sme/src/common/sme_trace.c | 4 +- core/sme/src/csr/csr_api_roam.c | 436 ++++++------ core/sme/src/csr/csr_api_scan.c | 156 ++-- core/sme/src/csr/csr_inside_api.h | 18 +- core/sme/src/csr/csr_link_list.c | 50 +- core/sme/src/csr/csr_neighbor_roam.c | 64 +- core/sme/src/csr/csr_tdls_process.c | 26 +- core/sme/src/csr/csr_util.c | 144 ++-- core/sme/src/nan/nan_api.c | 12 +- core/sme/src/p2p/p2p_api.c | 4 +- core/sme/src/qos/sme_qos.c | 654 ++++++++--------- core/sme/src/rrm/sme_rrm.c | 34 +- core/utils/epping/inc/epping_internal.h | 8 +- core/utils/epping/src/epping_helper.c | 6 +- core/utils/epping/src/epping_main.c | 24 +- core/utils/epping/src/epping_txrx.c | 4 +- core/utils/fwlog/dbglog_host.c | 66 +- .../utils/host_diag_log/inc/host_diag_core_event.h | 4 +- core/utils/host_diag_log/inc/host_diag_core_log.h | 10 +- core/utils/host_diag_log/inc/log_codes.h | 14 +- core/utils/host_diag_log/src/host_diag_log.c | 18 +- .../host_diag_log/src/i_host_diag_core_event.h | 20 +- .../utils/host_diag_log/src/i_host_diag_core_log.h | 32 +- core/utils/logging/src/wlan_logging_sock_svc.c | 20 +- core/utils/nlink/src/wlan_nlink_srv.c | 26 +- core/utils/pktlog/linux_ac.c | 27 +- core/utils/pktlog/pktlog_ac.c | 8 +- core/utils/pktlog/pktlog_internal.c | 8 +- core/utils/ptt/inc/wlan_ptt_sock_svc.h | 2 +- core/utils/ptt/src/wlan_ptt_sock_svc.c | 12 +- core/wma/inc/wma.h | 26 +- core/wma/inc/wma_if.h | 28 +- core/wma/inc/wma_internal.h | 4 +- core/wma/inc/wma_tgt_cfg.h | 2 +- core/wma/inc/wma_types.h | 4 +- core/wma/src/wma_data.c | 58 +- core/wma/src/wma_dev_if.c | 90 +-- core/wma/src/wma_dfs_interface.c | 4 +- core/wma/src/wma_features.c | 104 +-- core/wma/src/wma_main.c | 98 +-- core/wma/src/wma_mgmt.c | 40 +- core/wma/src/wma_ocb.c | 10 +- core/wma/src/wma_power.c | 34 +- core/wma/src/wma_scan_roam.c | 102 +-- core/wma/src/wma_utils.c | 84 +-- core/wma/src/wma_utils_ut.c | 4 +- core/wmi/wmi_tlv_helper.c | 52 +- core/wmi/wmi_tlv_platform.c | 4 +- core/wmi/wmi_unified.c | 8 +- uapi/linux/osapi_linux.h | 18 +- 245 files changed, 6046 insertions(+), 6814 deletions(-) delete mode 100644 core/cdf/inc/cdf_types.h delete mode 100644 core/cdf/src/i_cdf_types.h diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index 322c0e092886..d417bb3fe090 100644 --- a/core/bmi/inc/ol_fw.h +++ b/core/bmi/inc/ol_fw.h @@ -29,7 +29,7 @@ #define _OL_FW_H_ #ifdef QCA_WIFI_FTM -#include "cdf_types.h" +#include "qdf_types.h" #endif #include "hif.h" diff --git a/core/bmi/inc/ol_if_athvar.h b/core/bmi/inc/ol_if_athvar.h index c820cbe2f006..cb7774c2a31a 100644 --- a/core/bmi/inc/ol_if_athvar.h +++ b/core/bmi/inc/ol_if_athvar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -32,7 +32,7 @@ #define _DEV_OL_ATH_ATHVAR_H #include -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_lock.h" #include "wmi_unified_api.h" #include "htc_api.h" diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 38b5674e1a02..c4baf314546b 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -81,7 +81,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) break; case ATH_FIRMWARE_FILE: #ifdef QCA_WIFI_FTM - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) { hash = fw_hash.utf; break; } @@ -120,9 +120,9 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) if (cdf_mem_compare(hash, digest, SHA256_DIGEST_SIZE) != 0) { BMI_ERR("Hash Mismatch"); - cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, digest, SHA256_DIGEST_SIZE); - cdf_trace_hex_dump(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, hash, SHA256_DIGEST_SIZE); ret = QDF_STATUS_E_FAILURE; } @@ -179,7 +179,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, break; } #ifdef QCA_WIFI_FTM - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) { #if defined(CONFIG_CNSS) filename = bmi_ctx->fw_files.utf_file; #else @@ -207,7 +207,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, return 0; case ATH_BOARD_DATA_FILE: #ifdef QCA_WIFI_FTM - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) { #if defined(CONFIG_CNSS) filename = bmi_ctx->fw_files.utf_board_data; #else @@ -231,7 +231,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, #endif break; case ATH_SETUP_FILE: - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE && + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE && !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { #ifdef CONFIG_CNSS BMI_INFO("%s: no Setup file defined", __func__); diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h index cdc3ada5313b..e1f1846d3def 100644 --- a/core/cdf/inc/cdf_lock.h +++ b/core/cdf/inc/cdf_lock.h @@ -74,7 +74,7 @@ static inline void cdf_semaphore_init(cdf_semaphore_t *m) * * Return: None */ -static inline int cdf_semaphore_acquire(cdf_device_t osdev, cdf_semaphore_t *m) +static inline int cdf_semaphore_acquire(qdf_device_t osdev, cdf_semaphore_t *m) { return __cdf_semaphore_acquire(osdev, m); } @@ -86,7 +86,7 @@ static inline int cdf_semaphore_acquire(cdf_device_t osdev, cdf_semaphore_t *m) * Return: None */ static inline void -cdf_semaphore_release(cdf_device_t osdev, cdf_semaphore_t *m) +cdf_semaphore_release(qdf_device_t osdev, cdf_semaphore_t *m) { __cdf_semaphore_release(osdev, m); } diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index 67662966ef63..e93b9b6dce23 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -35,7 +35,7 @@ */ /* Include Files */ -#include +#include #include #include #include @@ -80,7 +80,7 @@ typedef struct cdf_mc_timer_s { cdf_mc_timer_callback_t callback; void *userData; cdf_mutex_t lock; - CDF_TIMER_TYPE type; + QDF_TIMER_TYPE type; CDF_TIMER_STATE state; } cdf_mc_timer_t; @@ -158,12 +158,12 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); __FILE__, __LINE__) QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, - CDF_TIMER_TYPE timerType, + QDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, uint32_t lineNum); #else -QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData); #endif @@ -237,7 +237,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); * The current system tick count (in 10msec intervals). This * function cannot fail. */ -v_TIME_t cdf_mc_timer_get_system_ticks(void); +unsigned long cdf_mc_timer_get_system_ticks(void); /** * cdf_mc_timer_get_system_time() - Get the system time in milliseconds @@ -248,6 +248,6 @@ v_TIME_t cdf_mc_timer_get_system_ticks(void); * Return: * The current system time in milliseconds */ -v_TIME_t cdf_mc_timer_get_system_time(void); +unsigned long cdf_mc_timer_get_system_time(void); #endif /* #if !defined __CDF_MC_TIMER_H */ diff --git a/core/cdf/inc/cdf_memory.h b/core/cdf/inc/cdf_memory.h index e6c77cfebd66..8170a0f87dc9 100644 --- a/core/cdf/inc/cdf_memory.h +++ b/core/cdf/inc/cdf_memory.h @@ -35,7 +35,7 @@ */ /* Include Files */ -#include +#include /** * struct cdf_mem_dma_page_t - Allocated dmaable page @@ -46,7 +46,7 @@ struct cdf_mem_dma_page_t { char *page_v_addr_start; char *page_v_addr_end; - cdf_dma_addr_t page_p_addr; + qdf_dma_addr_t page_p_addr; }; /** @@ -221,19 +221,19 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2, int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2, uint32_t numBytes); -void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size, - cdf_dma_addr_t *paddr, - cdf_dma_context_t mctx); +void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size, + qdf_dma_addr_t *paddr, + qdf_dma_context_t mctx); void -cdf_os_mem_free_consistent(cdf_device_t osdev, - cdf_size_t size, +cdf_os_mem_free_consistent(qdf_device_t osdev, + qdf_size_t size, void *vaddr, - cdf_dma_addr_t paddr, cdf_dma_context_t memctx); + qdf_dma_addr_t paddr, qdf_dma_context_t memctx); void -cdf_os_mem_dma_sync_single_for_device(cdf_device_t osdev, - cdf_dma_addr_t bus_addr, - cdf_size_t size, +cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev, + qdf_dma_addr_t bus_addr, + qdf_size_t size, enum dma_data_direction direction); /** @@ -248,15 +248,15 @@ static inline int32_t cdf_str_len(const char *str) return strlen(str); } -void cdf_mem_multi_pages_alloc(cdf_device_t osdev, +void cdf_mem_multi_pages_alloc(qdf_device_t osdev, struct cdf_mem_multi_page_t *pages, size_t element_size, uint16_t element_num, - cdf_dma_context_t memctxt, + qdf_dma_context_t memctxt, bool cacheable); -void cdf_mem_multi_pages_free(cdf_device_t osdev, +void cdf_mem_multi_pages_free(qdf_device_t osdev, struct cdf_mem_multi_page_t *pages, - cdf_dma_context_t memctxt, + qdf_dma_context_t memctxt, bool cacheable); #endif /* __CDF_MEMORY_H */ diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index ac968498e073..403a09edcda0 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -33,7 +33,7 @@ #ifndef _CDF_NBUF_H #define _CDF_NBUF_H #include -#include +#include #include #include #include @@ -74,7 +74,7 @@ typedef __cdf_nbuf_t cdf_nbuf_t; * @cdf_dma_map_cb_t - Dma map callback prototype */ typedef void (*cdf_dma_map_cb_t)(void *arg, cdf_nbuf_t buf, - cdf_dma_map_t dmap); + qdf_dma_map_t dmap); /** * @__CDF_NBUF_NULL - invalid handle @@ -96,7 +96,7 @@ typedef __cdf_nbuf_queue_t cdf_nbuf_queue_t; * Return: Status of the operation */ static inline QDF_STATUS -cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +cdf_nbuf_map(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { return __cdf_nbuf_map(osdev, buf, dir); } @@ -110,7 +110,7 @@ cdf_nbuf_map(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * Return: none */ static inline void -cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +cdf_nbuf_unmap(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { __cdf_nbuf_unmap(osdev, buf, dir); } @@ -124,7 +124,7 @@ cdf_nbuf_unmap(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * Return: Status of the operation */ static inline QDF_STATUS -cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { return __cdf_nbuf_map_single(osdev, buf, dir); } @@ -138,7 +138,7 @@ cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * Return: none */ static inline void -cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { __cdf_nbuf_unmap_single(osdev, buf, dir); } @@ -339,7 +339,7 @@ void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf); #define cdf_nbuf_alloc(d, s, r, a, p) \ cdf_nbuf_alloc_debug(d, s, r, a, p, __FILE__, __LINE__) static inline cdf_nbuf_t -cdf_nbuf_alloc_debug(cdf_device_t osdev, cdf_size_t size, int reserve, +cdf_nbuf_alloc_debug(qdf_device_t osdev, qdf_size_t size, int reserve, int align, int prio, uint8_t *file_name, uint32_t line_num) { @@ -392,8 +392,8 @@ static inline void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf) * Return: new cdf_nbuf instance or NULL if there's not enough memory. */ static inline cdf_nbuf_t -cdf_nbuf_alloc(cdf_device_t osdev, - cdf_size_t size, int reserve, int align, int prio) +cdf_nbuf_alloc(qdf_device_t osdev, + qdf_size_t size, int reserve, int align, int prio) { return __cdf_nbuf_alloc(osdev, size, reserve, align, prio); } @@ -533,7 +533,7 @@ static inline uint32_t cdf_nbuf_tailroom(cdf_nbuf_t buf) * Return: New data pointer of this buf after data has been pushed, * or NULL if there is not enough room in this buf. */ -static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, cdf_size_t size) +static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, qdf_size_t size) { return __cdf_nbuf_push_head(buf, size); } @@ -546,7 +546,7 @@ static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, cdf_size_t size) * Return: Data pointer of this buf where new data has to be * put, or NULL if there is not enough room in this buf. */ -static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, cdf_size_t size) +static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, qdf_size_t size) { return __cdf_nbuf_put_tail(buf, size); } @@ -559,7 +559,7 @@ static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, cdf_size_t size) * Return: New data pointer of this buf after data has been popped, * or NULL if there is not sufficient data to pull. */ -static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, cdf_size_t size) +static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, qdf_size_t size) { return __cdf_nbuf_pull_head(buf, size); } @@ -571,7 +571,7 @@ static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, cdf_size_t size) * * Return: none */ -static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, cdf_size_t size) +static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, qdf_size_t size) { __cdf_nbuf_trim_tail(buf, size); } @@ -582,7 +582,7 @@ static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, cdf_size_t size) * * Return: total length of this buf. */ -static inline cdf_size_t cdf_nbuf_len(cdf_nbuf_t buf) +static inline qdf_size_t cdf_nbuf_len(cdf_nbuf_t buf) { return __cdf_nbuf_len(buf); } @@ -606,7 +606,7 @@ static inline void cdf_nbuf_set_pktlen(cdf_nbuf_t buf, uint32_t len) * * Return: none */ -static inline void cdf_nbuf_reserve(cdf_nbuf_t buf, cdf_size_t size) +static inline void cdf_nbuf_reserve(cdf_nbuf_t buf, qdf_size_t size) { __cdf_nbuf_reserve(buf, size); } @@ -818,7 +818,7 @@ static inline cdf_nbuf_t cdf_nbuf_next_ext(cdf_nbuf_t buf) */ static inline void cdf_nbuf_append_ext_list(cdf_nbuf_t head_buf, cdf_nbuf_t ext_list, - cdf_size_t ext_len) + qdf_size_t ext_len) { __cdf_nbuf_append_ext_list(head_buf, ext_list, ext_len); } @@ -1033,8 +1033,8 @@ static inline bool cdf_nbuf_is_tso(cdf_nbuf_t nbuf) * * Return: number of TSO segments */ -static inline uint32_t cdf_nbuf_get_tso_info(cdf_device_t osdev, - cdf_nbuf_t nbuf, struct cdf_tso_info_t *tso_info) +static inline uint32_t cdf_nbuf_get_tso_info(qdf_device_t osdev, + cdf_nbuf_t nbuf, struct qdf_tso_info_t *tso_info) { return __cdf_nbuf_get_tso_info(osdev, nbuf, tso_info); } diff --git a/core/cdf/inc/cdf_net_types.h b/core/cdf/inc/cdf_net_types.h index fc70c110e39c..4a6cbfda4b9b 100644 --- a/core/cdf/inc/cdf_net_types.h +++ b/core/cdf/inc/cdf_net_types.h @@ -33,7 +33,7 @@ #ifndef _CDF_NET_TYPES_H #define _CDF_NET_TYPES_H -#include /* uint8_t, etc. */ +#include /* uint8_t, etc. */ #define ADF_NET_MAC_ADDR_MAX_LEN 6 #define ADF_NET_IF_NAME_SIZE 64 diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h index c32bb2e7d5be..4d198abaa75d 100644 --- a/core/cdf/inc/cdf_trace.h +++ b/core/cdf/inc/cdf_trace.h @@ -38,12 +38,12 @@ */ /* Include Files */ -#include /* For CDF_MODULE_ID... */ +#include /* For QDF_MODULE_ID... */ #include /* For va_list... */ #include #include #include -#include +#include /* Type declarations */ @@ -240,7 +240,7 @@ struct s_cdf_dp_trace_data { * * Return: nothing */ -void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level); +void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level); /** * cdf_trace_get_level() - get the trace level @@ -259,11 +259,11 @@ void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level); * false - the specified trace level for the specified module is OFF * true - the specified trace level for the specified module is ON */ -bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level); +bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level); typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t); void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data); -void cdf_trace_register(CDF_MODULE_ID, tp_cdf_trace_cb); +void cdf_trace_register(QDF_MODULE_ID, tp_cdf_trace_cb); QDF_STATUS cdf_trace_spin_lock_init(void); void cdf_trace_init(void); void cdf_trace_enable(uint32_t, uint8_t enable); diff --git a/core/cdf/inc/cdf_types.h b/core/cdf/inc/cdf_types.h deleted file mode 100644 index 635a59dd9e6a..000000000000 --- a/core/cdf/inc/cdf_types.h +++ /dev/null @@ -1,521 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_TYPES_H) -#define __CDF_TYPES_H -/** - * DOC: cdf_types.h - * - * Connectivity driver framework (CDF) basic type definitions - */ - -/* Include Files */ -#include "i_cdf_types.h" -#include - -/* Preprocessor definitions and constants */ - -/** - * CDF_MAX - get maximum of two values - * @_x: 1st arguement - * @_y: 2nd arguement - */ -#define CDF_MAX(_x, _y) (((_x) > (_y)) ? (_x) : (_y)) - -/** - * CDF_MIN - get minimum of two values - * @_x: 1st arguement - * @_y: 2nd arguement - */ -#define CDF_MIN(_x, _y) (((_x) < (_y)) ? (_x) : (_y)) - -/** - * CDF_SWAP_U16 - swap input u16 value - * @_x: variable to swap - */ -#define CDF_SWAP_U16(_x) \ - ((((_x) << 8) & 0xFF00) | (((_x) >> 8) & 0x00FF)) - -/** - * CDF_SWAP_U32 - swap input u32 value - * @_x: variable to swap - */ -#define CDF_SWAP_U32(_x) \ - (((((_x) << 24) & 0xFF000000) | (((_x) >> 24) & 0x000000FF)) | \ - ((((_x) << 8) & 0x00FF0000) | (((_x) >> 8) & 0x0000FF00))) - -#define CDF_TICKS_PER_SECOND (1000) - -/** - * CDF_ARRAY_SIZE - get array size - * @_arr: array variable name - */ -#define CDF_ARRAY_SIZE(_arr) (sizeof(_arr) / sizeof((_arr)[0])) - -/* endian operations for Big Endian and Small Endian modes */ -#ifdef ANI_LITTLE_BYTE_ENDIAN - -#define cdf_be16_to_cpu(_x) CDF_SWAP_U16(_x) - -#endif - -#ifdef ANI_BIG_BYTE_ENDIAN - -#define cdf_be16_to_cpu(_x) (_x) - -#endif - -#ifndef __ahdecl -#ifdef __i386__ -#define __ahdecl __attribute__((regparm(0))) -#else -#define __ahdecl -#endif -#endif - -#define CDF_OS_MAX_SCATTER __CDF_OS_MAX_SCATTER - -/** - * @brief denotes structure is packed. - */ -#define cdf_packed __cdf_packed - -/** - * typedef cdf_handle_t - handles opaque to each other - */ -typedef void *cdf_handle_t; - -/** - * typedef cdf_device_t - Platform/bus generic handle. - * Used for bus specific functions. - */ -typedef __cdf_device_t cdf_device_t; - -/** - * typedef cdf_size_t - size of an object - */ -typedef __cdf_size_t cdf_size_t; - -/** - * typedef cdf_dma_map_t - DMA mapping object. - */ -typedef __cdf_dma_map_t cdf_dma_map_t; - -/** - * typedef cdf_dma_addr_t - DMA address. - */ -typedef __cdf_dma_addr_t cdf_dma_addr_t; - -/** - * tyepdef cdf_dma_context_t - DMA context. - */ -typedef __cdf_dma_context_t cdf_dma_context_t; - - -#define cdf_iomem_t __cdf_iomem_t; -/** - * typedef enum CDF_TIMER_TYPE - CDF timer type - * @CDF_TIMER_TYPE_SW: Deferrable SW timer it will not cause CPU to wake up - * on expiry - * @CDF_TIMER_TYPE_WAKE_APPS: Non deferrable timer which will cause CPU to - * wake up on expiry - */ -typedef enum { - CDF_TIMER_TYPE_SW, - CDF_TIMER_TYPE_WAKE_APPS -} CDF_TIMER_TYPE; - -/** - * tyepdef cdf_resource_type_t - hw resources - * - * @CDF_RESOURCE_TYPE_MEM: memory resource - * @CDF_RESOURCE_TYPE_IO: io resource - * - * Define the hw resources the OS has allocated for the device - * Note that start defines a mapped area. - */ -typedef enum { - CDF_RESOURCE_TYPE_MEM, - CDF_RESOURCE_TYPE_IO, -} cdf_resource_type_t; - -/** - * tyepdef cdf_resource_t - representation of a h/w resource. - * - * @start: start - * @end: end - * @type: resource type - */ -typedef struct { - uint64_t start; - uint64_t end; - cdf_resource_type_t type; -} cdf_resource_t; - -/** - * typedef cdf_dma_dir_t - DMA directions - * - * @CDF_DMA_BIDIRECTIONAL: bidirectional data - * @CDF_DMA_TO_DEVICE: data going from device to memory - * @CDF_DMA_FROM_DEVICE: data going from memory to device - */ -typedef enum { - CDF_DMA_BIDIRECTIONAL = __CDF_DMA_BIDIRECTIONAL, - CDF_DMA_TO_DEVICE = __CDF_DMA_TO_DEVICE, - CDF_DMA_FROM_DEVICE = __CDF_DMA_FROM_DEVICE, -} cdf_dma_dir_t; - -/* work queue(kernel thread)/DPC function callback */ -typedef void (*cdf_defer_fn_t)(void *); - -/* Prototype of the critical region function that is to be - * executed with spinlock held and interrupt disalbed - */ -typedef bool (*cdf_irqlocked_func_t)(void *); - -/* Prototype of timer function */ -typedef void (*cdf_softirq_timer_func_t)(void *); - -#define cdf_offsetof(type, field) offsetof(type, field) - -/** - * typedef CDF_MODULE_ID - CDF Module IDs - * - * @CDF_MODULE_ID_TLSHIM: TLSHIM module ID - * @CDF_MODULE_ID_WMI: WMI module ID - * @CDF_MODULE_ID_HTT: HTT module ID - * @CDF_MODULE_ID_RSV4: Reserved - * @CDF_MODULE_ID_HDD: HDD module ID - * @CDF_MODULE_ID_SME: SME module ID - * @CDF_MODULE_ID_PE: PE module ID - * @CDF_MODULE_ID_WMA: WMA module ID - * @CDF_MODULE_ID_SYS: SYS module ID - * @CDF_MODULE_ID_CDF: CDF module ID - * @CDF_MODULE_ID_SAP: SAP module ID - * @CDF_MODULE_ID_HDD_SOFTAP: HDD SAP module ID - * @CDF_MODULE_ID_HDD_DATA: HDD DATA module ID - * @CDF_MODULE_ID_HDD_SAP_DATA: HDD SAP DATA module ID - * @CDF_MODULE_ID_HIF: HIF module ID - * @CDF_MODULE_ID_HTC: HTC module ID - * @CDF_MODULE_ID_TXRX: TXRX module ID - * @CDF_MODULE_ID_CDF_DEVICE: CDF DEVICE module ID - * @CDF_MODULE_ID_CFG: CFG module ID - * @CDF_MODULE_ID_BMI: BMI module ID - * @CDF_MODULE_ID_EPPING: EPPING module ID - * @CDF_MODULE_ID_MAX: Max place holder module ID - * - * These are generic IDs that identify the various modules in the software - * system - * 0 is unused for historical purposes - * 3 & 4 are unused for historical purposes - */ -typedef enum { - CDF_MODULE_ID_TLSHIM = 1, - CDF_MODULE_ID_WMI = 2, - CDF_MODULE_ID_HTT = 3, - CDF_MODULE_ID_RSV4 = 4, - CDF_MODULE_ID_HDD = 5, - CDF_MODULE_ID_SME = 6, - CDF_MODULE_ID_PE = 7, - CDF_MODULE_ID_WMA = 8, - CDF_MODULE_ID_SYS = 9, - CDF_MODULE_ID_CDF = 10, - CDF_MODULE_ID_SAP = 11, - CDF_MODULE_ID_HDD_SOFTAP = 12, - CDF_MODULE_ID_HDD_DATA = 14, - CDF_MODULE_ID_HDD_SAP_DATA = 15, - - CDF_MODULE_ID_HIF = 16, - CDF_MODULE_ID_HTC = 17, - CDF_MODULE_ID_TXRX = 18, - CDF_MODULE_ID_CDF_DEVICE = 19, - CDF_MODULE_ID_CFG = 20, - CDF_MODULE_ID_BMI = 21, - CDF_MODULE_ID_EPPING = 22, - - CDF_MODULE_ID_MAX -} CDF_MODULE_ID; - -#define cdf_print(args...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) -#define cdf_vprint __cdf_vprint -#define cdf_snprint __cdf_snprint - -/** - * enum tCDF_ADAPTER_MODE - adapter role. - * - * @CDF_STA_MODE: STA mode - * @CDF_SAP_MODE: SAP mode - * @CDF_P2P_CLIENT_MODE: P2P client mode - * @CDF_P2P_GO_MODE: P2P GO mode - * @CDF_FTM_MODE: FTM mode - * @CDF_IBSS_MODE: IBSS mode - * @CDF_P2P_DEVICE_MODE: P2P device mode - * @CDF_EPPING_MODE: EPPING device mode - * @CDF_OCB_MODE: OCB device mode - * @CDF_MAX_NO_OF_MODE: Max place holder - * - * These are generic IDs that identify the various roles - * in the software system - */ -enum tCDF_ADAPTER_MODE { - CDF_STA_MODE = 0, - CDF_SAP_MODE = 1, - CDF_P2P_CLIENT_MODE, - CDF_P2P_GO_MODE, - CDF_FTM_MODE, - CDF_IBSS_MODE, - CDF_P2P_DEVICE_MODE, - CDF_EPPING_MODE, - CDF_OCB_MODE, - CDF_MAX_NO_OF_MODE -}; - -/** - * enum tCDF_GLOBAL_CON_MODE - global config mode when - * driver is loaded. - * - * @CDF_GLOBAL_MISSION_MODE: mission mode (STA, SAP...) - * @CDF_GLOBAL_FTM_MODE: FTM mode - * @CDF_GLOBAL_EPPING_MODE: EPPING mode - * @CDF_GLOBAL_MAX_MODE: Max place holder - */ -enum tCDF_GLOBAL_CON_MODE { - CDF_GLOBAL_MISSION_MODE, - CDF_GLOBAL_FTM_MODE = 5, - CDF_GLOBAL_EPPING_MODE = 8, - CDF_GLOBAL_MAX_MODE -}; - - -#ifdef WLAN_OPEN_P2P_INTERFACE -/* This should match with WLAN_MAX_INTERFACES */ -#define CDF_MAX_CONCURRENCY_PERSONA (4) -#else -#define CDF_MAX_CONCURRENCY_PERSONA (3) -#endif - -#define CDF_STA_MASK (1 << CDF_STA_MODE) -#define CDF_SAP_MASK (1 << CDF_SAP_MODE) -#define CDF_P2P_CLIENT_MASK (1 << CDF_P2P_CLIENT_MODE) -#define CDF_P2P_GO_MASK (1 << CDF_P2P_GO_MODE) - -#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH -typedef enum { - CDF_MCC_TO_SCC_SWITCH_DISABLE = 0, - CDF_MCC_TO_SCC_SWITCH_ENABLE, - CDF_MCC_TO_SCC_SWITCH_FORCE, - CDF_MCC_TO_SCC_SWITCH_MAX -} tCDF_MCC_TO_SCC_SWITCH_MODE; -#endif - -#if !defined(NULL) -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif - -/* 'Time' type */ -typedef unsigned long v_TIME_t; - -/* typedef for CDF Context... */ -typedef void *v_CONTEXT_t; - -#define CDF_MAC_ADDR_SIZE (6) - -/** - * struct cdf_mac_addr - mac address array - * @bytes: MAC address bytes - */ -struct cdf_mac_addr { - uint8_t bytes[CDF_MAC_ADDR_SIZE]; -}; - -/* This macro is used to initialize a CDF MacAddress to the broadcast - * MacAddress. It is used like this... - * struct cdf_mac_addr macAddress = CDF_MAC_ADDR_BROADCAST_INITIALIZER - */ -#define CDF_MAC_ADDR_BROADCAST_INITIALIZER { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } } - -/* This macro is used to initialize a CDF MacAddress to zero - * It is used like this... - * struct cdf_mac_addr macAddress = CDF_MAC_ADDR_ZERO_INITIALIZER - */ -#define CDF_MAC_ADDR_ZERO_INITIALIZER { { 0, 0, 0, 0, 0, 0 } } - -#define CDF_IPV4_ADDR_SIZE (4) -#define CDF_IPV6_ADDR_SIZE (16) - -/** - * struct cdf_tso_frag_t - fragments of a single TCP segment - * @paddr_low_32: Lower 32 bits of the buffer pointer - * @paddr_upper_16: upper 16 bits of the buffer pointer - * @length: length of the buffer - * @vaddr: virtual address - * - * This structure holds the fragments of a single TCP segment of a - * given jumbo TSO network buffer - */ -struct cdf_tso_frag_t { - uint32_t paddr_low_32; - uint32_t paddr_upper_16:16, - length:16; - unsigned char *vaddr; -}; - -#define FRAG_NUM_MAX 6 - -/** - * struct cdf_tso_flags_t - TSO specific flags - * @tso_enable: Enable transmit segmentation offload - * @tcp_flags_mask: Tcp_flag is inserted into the header based - * on the mask - * @l2_len: L2 length for the msdu - * @ip_len: IP length for the msdu - * @tcp_seq_num: TCP sequence number - * @ip_id: IP identification number - * - * This structure holds the TSO specific flags extracted from the TSO network - * buffer for a given TCP segment - */ -struct cdf_tso_flags_t { - u_int32_t tso_enable:1, - reserved_0a:6, - fin:1, - syn:1, - rst:1, - psh:1, - ack:1, - urg:1, - ece:1, - cwr:1, - ns:1, - tcp_flags_mask:9, - reserved_0b:7; -/* ------------------------------------------------------------------- */ - - u_int32_t l2_len:16, - ip_len:16; -/* ------------------------------------------------------------------- */ - - u_int32_t tcp_seq_num; -/* ------------------------------------------------------------------- */ - - u_int32_t ip_id:16, - ipv4_checksum_en:1, - udp_ipv4_checksum_en:1, - udp_ipv6_checksum_en:1, - tcp_ipv4_checksum_en:1, - tcp_ipv6_checksum_en:1, - partial_checksum_en:1, - reserved_3a:10; -/* ------------------------------------------------------------------- */ - - u_int32_t checksum_offset:14, - reserved_4a:2, - payload_start_offset:14, - reserved_4b:2; -/* ------------------------------------------------------------------- */ - - u_int32_t payload_end_offset:14, - reserved_5:18; -}; - -/** - * struct cdf_tso_seg_t - single TSO segment - * @tso_flags: TSO flags - * @num_frags: number of fragments - * @tso_frags: array holding the fragments - * - * This structure holds the information of a single TSO segment of a jumbo - * TSO network buffer - */ -struct cdf_tso_seg_t { - struct cdf_tso_flags_t tso_flags; -/* ------------------------------------------------------------------- */ - uint32_t num_frags; - struct cdf_tso_frag_t tso_frags[FRAG_NUM_MAX]; -}; - -struct cdf_tso_seg_elem_t { - struct cdf_tso_seg_t seg; - struct cdf_tso_seg_elem_t *next; -}; - -/** - * struct cdf_tso_info_t - TSO information extracted - * @is_tso: is this is a TSO frame - * @num_segs: number of segments - * @total_len: total length of the packet - * @tso_seg_list: list of TSO segments for this jumbo packet - * @curr_seg: segment that is currently being processed - * - * This structure holds the TSO information extracted after parsing the TSO - * jumbo network buffer. It contains a chain of the TSO segments belonging to - * the jumbo packet - */ -struct cdf_tso_info_t { - uint8_t is_tso; - uint32_t num_segs; - uint32_t total_len; - struct cdf_tso_seg_elem_t *tso_seg_list; - struct cdf_tso_seg_elem_t *curr_seg; -}; - -/** - * Used to set classify bit in CE desc. - */ -#define CDF_CE_TX_CLASSIFY_BIT_S 5 - -/** - * 2 bits starting at bit 6 in CE desc. - */ -#define CDF_CE_TX_PKT_TYPE_BIT_S 6 - -/** - * 12 bits --> 16-27, in the CE desciptor, the length of HTT/HTC descriptor - */ -#define CDF_CE_TX_PKT_OFFSET_BIT_S 16 - -/** - * Mask for packet offset in the CE descriptor. - */ -#define CDF_CE_TX_PKT_OFFSET_BIT_M 0x0fff0000 - -/** - * enum cdf_suspend_type - type of suspend - * CDF_SYSTEM_SUSPEND: System suspend triggered wlan suspend - * CDF_RUNTIME_SUSPEND: Runtime pm inactivity timer triggered wlan suspend - */ -enum cdf_suspend_type { - CDF_SYSTEM_SUSPEND, - CDF_RUNTIME_SUSPEND -}; - -#endif /* if !defined __CDF_TYPES_H */ diff --git a/core/cdf/inc/cdf_util.h b/core/cdf/inc/cdf_util.h index 4f44274b390d..c1bffd7a79d3 100644 --- a/core/cdf/inc/cdf_util.h +++ b/core/cdf/inc/cdf_util.h @@ -48,7 +48,7 @@ */ #define cdf_likely(_expr) __cdf_likely(_expr) -CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status) +static inline int cdf_status_to_os_return(QDF_STATUS status) { return __cdf_status_to_os_return(status); } @@ -125,15 +125,15 @@ CDF_INLINE_FN int cdf_status_to_os_return(QDF_STATUS status) * Return: true if the MacAddress's are equal * not true if the MacAddress's are not equal */ -CDF_INLINE_FN bool cdf_is_macaddr_equal(struct cdf_mac_addr *pMacAddr1, - struct cdf_mac_addr *pMacAddr2) +static inline bool cdf_is_macaddr_equal(struct qdf_mac_addr *pMacAddr1, + struct qdf_mac_addr *pMacAddr2) { - return 0 == memcmp(pMacAddr1, pMacAddr2, CDF_MAC_ADDR_SIZE); + return 0 == memcmp(pMacAddr1, pMacAddr2, QDF_MAC_ADDR_SIZE); } /** * cdf_is_macaddr_zero() - check for a MacAddress of all zeros. - * @pMacAddr - pointer to the struct cdf_mac_addr to check. + * @pMacAddr - pointer to the struct qdf_mac_addr to check. * * This function returns a bool that tells if a MacAddress is made up of * all zeros. @@ -143,24 +143,24 @@ CDF_INLINE_FN bool cdf_is_macaddr_equal(struct cdf_mac_addr *pMacAddr1, * false if the MacAddress is not all Zeros. * */ -CDF_INLINE_FN bool cdf_is_macaddr_zero(struct cdf_mac_addr *pMacAddr) +static inline bool cdf_is_macaddr_zero(struct qdf_mac_addr *pMacAddr) { - struct cdf_mac_addr zeroMacAddr = CDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr zeroMacAddr = QDF_MAC_ADDR_ZERO_INITIALIZER; return cdf_is_macaddr_equal(pMacAddr, &zeroMacAddr); } /** * cdf_zero_macaddr() - zero out a MacAddress - * @pMacAddr: pointer to the struct cdf_mac_addr to zero. + * @pMacAddr: pointer to the struct qdf_mac_addr to zero. * * This function zeros out a CDF MacAddress type. * * Return: nothing */ -CDF_INLINE_FN void cdf_zero_macaddr(struct cdf_mac_addr *pMacAddr) +static inline void cdf_zero_macaddr(struct qdf_mac_addr *pMacAddr) { - memset(pMacAddr, 0, CDF_MAC_ADDR_SIZE); + memset(pMacAddr, 0, QDF_MAC_ADDR_SIZE); } /** @@ -175,7 +175,7 @@ CDF_INLINE_FN void cdf_zero_macaddr(struct cdf_mac_addr *pMacAddr) * Return: true if the input MacAddress is a Group address * false if the input MacAddress is not a Group address */ -CDF_INLINE_FN bool cdf_is_macaddr_group(struct cdf_mac_addr *pMacAddr) +static inline bool cdf_is_macaddr_group(struct qdf_mac_addr *pMacAddr) { return pMacAddr->bytes[0] & 0x01; } @@ -191,10 +191,10 @@ CDF_INLINE_FN bool cdf_is_macaddr_group(struct cdf_mac_addr *pMacAddr) * Return: true if the input MacAddress is a broadcast address * false if the input MacAddress is not a broadcast address */ -CDF_INLINE_FN bool cdf_is_macaddr_broadcast(struct cdf_mac_addr *pMacAddr) +static inline bool cdf_is_macaddr_broadcast(struct qdf_mac_addr *pMacAddr) { - struct cdf_mac_addr broadcastMacAddr = - CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr broadcastMacAddr = + QDF_MAC_ADDR_BROADCAST_INITIALIZER; return cdf_is_macaddr_equal(pMacAddr, &broadcastMacAddr); } @@ -209,8 +209,8 @@ CDF_INLINE_FN bool cdf_is_macaddr_broadcast(struct cdf_mac_addr *pMacAddr) * * Return: nothing */ -CDF_INLINE_FN void cdf_copy_macaddr(struct cdf_mac_addr *pDst, - struct cdf_mac_addr *pSrc) +static inline void cdf_copy_macaddr(struct qdf_mac_addr *pDst, + struct qdf_mac_addr *pSrc) { *pDst = *pSrc; } @@ -224,9 +224,9 @@ CDF_INLINE_FN void cdf_copy_macaddr(struct cdf_mac_addr *pDst, * * Return: nothing */ -CDF_INLINE_FN void cdf_set_macaddr_broadcast(struct cdf_mac_addr *pMacAddr) +static inline void cdf_set_macaddr_broadcast(struct qdf_mac_addr *pMacAddr) { - memset(pMacAddr, 0xff, CDF_MAC_ADDR_SIZE); + memset(pMacAddr, 0xff, QDF_MAC_ADDR_SIZE); } #if defined(ANI_LITTLE_BYTE_ENDIAN) @@ -237,7 +237,7 @@ CDF_INLINE_FN void cdf_set_macaddr_broadcast(struct cdf_mac_addr *pMacAddr) * * Return: converted network byte order */ -CDF_INLINE_FN unsigned long i_cdf_htonl(unsigned long ul) +static inline unsigned long i_cdf_htonl(unsigned long ul) { return ((ul & 0x000000ff) << 24) | ((ul & 0x0000ff00) << 8) | @@ -250,7 +250,7 @@ CDF_INLINE_FN unsigned long i_cdf_htonl(unsigned long ul) * * Return: converted host byte order */ -CDF_INLINE_FN unsigned long i_cdf_ntohl(unsigned long ul) +static inline unsigned long i_cdf_ntohl(unsigned long ul) { return i_cdf_htonl(ul); } @@ -268,7 +268,7 @@ CDF_INLINE_FN unsigned long i_cdf_ntohl(unsigned long ul) * Return: The address to the byte after the assignment. This may or may not * be valid. Caller to verify. */ -CDF_INLINE_FN uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value) +static inline uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value) { #if defined(ANI_BIG_BYTE_ENDIAN) *(ptr) = (uint8_t) (value >> 8); @@ -293,7 +293,7 @@ CDF_INLINE_FN uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value) * Return: The address to the byte after the assignment. This may or may not * be valid. Caller to verify. */ -CDF_INLINE_FN uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue) +static inline uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue) { #if defined(ANI_BIG_BYTE_ENDIAN) *pValue = (((uint16_t) (*ptr << 8)) | ((uint16_t) (*(ptr + 1)))); @@ -316,7 +316,7 @@ CDF_INLINE_FN uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue) * Return: The address to the byte after the assignment. This may or may not * be valid. Caller to verify. */ -CDF_INLINE_FN uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue) +static inline uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue) { #if defined(ANI_BIG_BYTE_ENDIAN) *pValue = ((uint32_t) (*(ptr) << 24) | @@ -338,7 +338,7 @@ CDF_INLINE_FN uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue) * * Return: Power of 2 integer */ -CDF_INLINE_FN int cdf_get_pwr2(int value) +static inline int cdf_get_pwr2(int value) { int log2; if (CDF_IS_PWR2(value)) diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index e5bc0bf1ba46..6a7bce092536 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -28,7 +28,7 @@ #ifndef _OSDEP_H #define _OSDEP_H -#include +#include #include #include #include diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c index 086360fd2be8..25fa695a63da 100644 --- a/core/cdf/src/cdf_lock.c +++ b/core/cdf/src/cdf_lock.c @@ -39,7 +39,7 @@ #include "cdf_lock.h" #include "cdf_memory.h" #include "cdf_trace.h" -#include +#include #ifdef CONFIG_CNSS #include #endif @@ -89,19 +89,19 @@ QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); return QDF_STATUS_E_FAULT; } /* check for 'already initialized' lock */ if (LINUX_LOCK_COOKIE == lock->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: already initialized lock", __func__); return QDF_STATUS_E_BUSY; } if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); return QDF_STATUS_E_FAULT; @@ -135,21 +135,21 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) int rc; /* check for invalid pointer */ if (lock == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; } /* check if lock refers to an initialized object */ if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); @@ -159,7 +159,7 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) (lock->state == LOCK_ACQUIRED)) { lock->refcount++; #ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: %x %d %d", __func__, lock, current->pid, lock->refcount); #endif @@ -169,13 +169,13 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) mutex_lock(&lock->m_lock); rc = mutex_is_locked(&lock->m_lock); if (rc == 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: unable to lock mutex (rc = %d)", __func__, rc); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } #ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: %x %d", __func__, lock, current->pid); #endif if (LOCK_DESTROYED != lock->state) { @@ -185,7 +185,7 @@ QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) return QDF_STATUS_SUCCESS; } else { /* lock is already destroyed */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Lock is already destroyed", __func__); mutex_unlock(&lock->m_lock); CDF_ASSERT(0); @@ -211,7 +211,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) { /* check for invalid pointer */ if (lock == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; @@ -219,14 +219,14 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) /* check if lock refers to an uninitialized object */ if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); CDF_ASSERT(0); @@ -238,11 +238,11 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) * of the thread which acquire the lock */ if (lock->processID != current->pid) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: current task pid does not match original task pid!!", __func__); #ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Lock held by=%d being released by=%d", __func__, lock->processID, current->pid); #endif @@ -255,7 +255,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) lock->refcount--; } #ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: %x %d %d", __func__, lock, lock->processID, lock->refcount); #endif @@ -268,7 +268,7 @@ QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) /* release a Lock */ mutex_unlock(&lock->m_lock); #ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Freeing lock %x %d %d", lock, lock->processID, lock->refcount); #endif @@ -298,19 +298,19 @@ QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) { /* check for invalid pointer */ if (NULL == lock) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed in", __func__); return QDF_STATUS_E_FAULT; } if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: uninitialized lock", __func__); return QDF_STATUS_E_INVAL; } if (in_interrupt()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s cannot be called from interrupt context!!!", __func__); return QDF_STATUS_E_FAULT; @@ -318,7 +318,7 @@ QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) /* check if lock is released */ if (!mutex_trylock(&lock->m_lock)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: lock is not released", __func__); return QDF_STATUS_E_BUSY; } @@ -509,11 +509,11 @@ QDF_STATUS cdf_runtime_pm_get(void) void *ol_sc; int ret; - ol_sc = cds_get_context(CDF_MODULE_ID_HIF); + ol_sc = cds_get_context(QDF_MODULE_ID_HIF); if (ol_sc == NULL) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); return QDF_STATUS_E_INVAL; } @@ -541,11 +541,11 @@ QDF_STATUS cdf_runtime_pm_put(void) void *ol_sc; int ret; - ol_sc = cds_get_context(CDF_MODULE_ID_HIF); + ol_sc = cds_get_context(QDF_MODULE_ID_HIF); if (ol_sc == NULL) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); return QDF_STATUS_E_INVAL; } @@ -571,11 +571,11 @@ QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) void *ol_sc; int ret; - ol_sc = cds_get_context(CDF_MODULE_ID_HIF); + ol_sc = cds_get_context(QDF_MODULE_ID_HIF); if (ol_sc == NULL) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); return QDF_STATUS_E_INVAL; } @@ -601,11 +601,11 @@ QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) void *ol_sc; int ret; - ol_sc = cds_get_context(CDF_MODULE_ID_HIF); + ol_sc = cds_get_context(QDF_MODULE_ID_HIF); if (ol_sc == NULL) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: HIF context is null!", __func__); return QDF_STATUS_E_INVAL; } diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 74997544a0f4..4fb4b5dfda8c 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/core/cdf/src/cdf_mc_timer.c @@ -61,9 +61,9 @@ static cdf_mutex_t persistent_timer_count_lock; * * Return: none */ -static void try_allowing_sleep(CDF_TIMER_TYPE type) +static void try_allowing_sleep(QDF_TIMER_TYPE type) { - if (CDF_TIMER_TYPE_WAKE_APPS == type) { + if (QDF_TIMER_TYPE_WAKE_APPS == type) { /* cdf_mutex_acquire(&persistent_timer_count_lock); */ persistent_timer_count--; if (0 == persistent_timer_count) { @@ -102,12 +102,12 @@ static void cdf_linux_timer_callback(unsigned long data) cdf_mc_timer_callback_t callback = NULL; void *userData = NULL; int threadId; - CDF_TIMER_TYPE type = CDF_TIMER_TYPE_SW; + QDF_TIMER_TYPE type = QDF_TIMER_TYPE_SW; CDF_ASSERT(timer); if (timer == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s Null pointer passed in!", __func__); return; } @@ -158,7 +158,7 @@ static void cdf_linux_timer_callback(unsigned long data) spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); if (QDF_STATUS_SUCCESS != vStatus) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "TIMER callback called in a wrong state=%d", timer->state); return; @@ -168,12 +168,12 @@ static void cdf_linux_timer_callback(unsigned long data) if (callback == NULL) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: No TIMER callback, Could not enqueue timer to any queue", __func__); return; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "TIMER callback: running on MC thread"); /* serialize to the MC thread */ @@ -185,7 +185,7 @@ static void cdf_linux_timer_callback(unsigned long data) if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS) return; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Could not enqueue timer to any queue", __func__); CDF_ASSERT(0); } @@ -226,7 +226,7 @@ CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer) */ void cdf_timer_module_init(void) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "Initializing the CDF timer module"); cdf_mutex_init(&persistent_timer_count_lock); } @@ -271,7 +271,7 @@ static void cdf_timer_clean(void) QDF_STATUS qdf_status; cdf_mc_timer_node_t *ptimerNode; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: List is not Empty. listSize %d ", __func__, (int)listSize); @@ -282,7 +282,7 @@ static void cdf_timer_clean(void) cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS == qdf_status) { ptimerNode = (cdf_mc_timer_node_t *) pNode; - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Timer Leak@ File %s, @Line %d", ptimerNode->fileName, @@ -340,7 +340,7 @@ void cdf_mc_timer_exit(void) */ #ifdef TIMER_MANAGER QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, - CDF_TIMER_TYPE timerType, + QDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData, char *fileName, uint32_t lineNum) @@ -349,7 +349,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, /* check for invalid pointer */ if ((timer == NULL) || (callback == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; @@ -358,7 +358,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, timer->ptimerNode = cdf_mem_malloc(sizeof(cdf_mc_timer_node_t)); if (timer->ptimerNode == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for timeNode", __func__); CDF_ASSERT(0); @@ -376,7 +376,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, &timer->ptimerNode->pNode); cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } @@ -385,7 +385,7 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, * with arguments passed or with default values */ spin_lock_init(&timer->platformInfo.spinlock); - if (CDF_TIMER_TYPE_SW == timerType) + if (QDF_TIMER_TYPE_SW == timerType) init_timer_deferrable(&(timer->platformInfo.Timer)); else init_timer(&(timer->platformInfo.Timer)); @@ -401,13 +401,13 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, return QDF_STATUS_SUCCESS; } #else -QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, +QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType, cdf_mc_timer_callback_t callback, void *userData) { /* check for invalid pointer */ if ((timer == NULL) || (callback == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; @@ -417,7 +417,7 @@ QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, CDF_TIMER_TYPE timerType, * with arguments passed or with default values */ spin_lock_init(&timer->platformInfo.spinlock); - if (CDF_TIMER_TYPE_SW == timerType) + if (QDF_TIMER_TYPE_SW == timerType) init_timer_deferrable(&(timer->platformInfo.Timer)); else init_timer(&(timer->platformInfo.Timer)); @@ -463,7 +463,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) /* check for invalid pointer */ if (NULL == timer) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; @@ -471,7 +471,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) /* Check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -522,7 +522,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy timer in state = %d", __func__, timer->state); CDF_ASSERT(0); @@ -560,7 +560,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) /* check for invalid pointer */ if (NULL == timer) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null timer pointer being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAULT; @@ -568,7 +568,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) /* check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy uninitialized timer", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -609,7 +609,7 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot destroy timer in state = %d", __func__, timer->state); CDF_ASSERT(0); @@ -639,12 +639,12 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) { unsigned long flags; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "Timer Addr inside cds_enable : 0x%p ", timer); /* check for invalid pointer */ if (NULL == timer) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -652,7 +652,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) /* check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot start uninitialized timer", __func__); CDF_ASSERT(0); @@ -661,7 +661,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) /* check if timer has expiration time less than 10 ms */ if (expirationTime < 10) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot start a timer with expiration less than 10 ms", __func__); CDF_ASSERT(0); @@ -674,7 +674,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) /* ensure if the timer can be started */ if (CDF_TIMER_STATE_STOPPED != timer->state) { spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot start timer in state = %d ", __func__, timer->state); return QDF_STATUS_E_ALREADY; @@ -689,7 +689,7 @@ QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) /* get the thread ID on which the timer is being started */ timer->platformInfo.threadID = current->pid; - if (CDF_TIMER_TYPE_WAKE_APPS == timer->type) { + if (QDF_TIMER_TYPE_WAKE_APPS == timer->type) { persistent_timer_count++; if (1 == persistent_timer_count) { /* since we now have one persistent timer, @@ -721,12 +721,12 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) { unsigned long flags; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Timer Addr inside cds_disable : 0x%p", __func__, timer); /* check for invalid pointer */ if (NULL == timer) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s Null timer pointer being passed", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -734,7 +734,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) /* check if timer refers to an uninitialized object */ if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Cannot stop uninitialized timer", __func__); CDF_ASSERT(0); @@ -746,7 +746,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) if (CDF_TIMER_STATE_RUNNING != timer->state) { spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Cannot stop timer in state = %d", __func__, timer->state); return QDF_STATUS_SUCCESS; @@ -775,7 +775,7 @@ QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) * The current system tick count (in 10msec intervals). This * function cannot fail. */ -v_TIME_t cdf_mc_timer_get_system_ticks(void) +unsigned long cdf_mc_timer_get_system_ticks(void) { return jiffies_to_msecs(jiffies) / 10; } @@ -789,7 +789,7 @@ v_TIME_t cdf_mc_timer_get_system_ticks(void) * Return: * The current system time in milliseconds */ -v_TIME_t cdf_mc_timer_get_system_time(void) +unsigned long cdf_mc_timer_get_system_time(void) { struct timeval tv; do_gettimeofday(&tv); diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index de708861a1c4..0de58b57e298 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -111,7 +111,7 @@ static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct) static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct *mem_struct) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Call stack for the source of leaked memory:"); print_stack_trace(&mem_struct->trace, 1); @@ -164,7 +164,7 @@ void cdf_mem_clean(void) unsigned int prev_mleak_sz = 0; unsigned int mleak_cnt = 0; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: List is not Empty. listSize %d ", __func__, (int)listSize); @@ -182,7 +182,7 @@ void cdf_mem_clean(void) memStruct->lineNum) || (prev_mleak_sz != memStruct->size)) { if (mleak_cnt != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%d Time Memory Leak@ File %s, @Line %d, size %d", mleak_cnt, @@ -203,7 +203,7 @@ void cdf_mem_clean(void) /* Print last memory leak from the module */ if (mleak_cnt) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%d Time memory Leak@ File %s, @Line %d, size %d", mleak_cnt, prev_mleak_file, prev_mleak_lineNum, prev_mleak_sz); @@ -252,7 +252,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) unsigned long time_before_kzalloc; if (size > (1024 * 1024) || size == 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: called with invalid arg; passed in %zu !!!", __func__, size); return NULL; @@ -281,7 +281,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) */ if (cdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS at line %d", __func__, cdf_mc_timer_get_system_time() - time_before_kzalloc, @@ -306,7 +306,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) &memStruct->pNode); cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } @@ -347,7 +347,7 @@ void cdf_mem_free(void *ptr) if (0 == cdf_mem_compare(memStruct->header, &WLAN_MEM_HEADER[0], sizeof(WLAN_MEM_HEADER))) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Memory Header is corrupted. MemInfo: Filename %s, LineNum %d", memStruct->fileName, @@ -358,7 +358,7 @@ void cdf_mem_free(void *ptr) cdf_mem_compare((uint8_t *) ptr + memStruct->size, &WLAN_MEM_TAIL[0], sizeof(WLAN_MEM_TAIL))) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Memory Trailer is corrupted. MemInfo: Filename %s, LineNum %d", memStruct->fileName, @@ -367,7 +367,7 @@ void cdf_mem_free(void *ptr) } kfree((void *)memStruct); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Unallocated memory (double free?)", __func__); CDF_BUG(0); @@ -396,7 +396,7 @@ void *cdf_mem_malloc(size_t size) unsigned long time_before_kzalloc; if (size > (1024 * 1024) || size == 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: called with invalid arg; passed in %zu !!", __func__, size); return NULL; @@ -423,7 +423,7 @@ void *cdf_mem_malloc(size_t size) */ if (cdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS", __func__, cdf_mc_timer_get_system_time() - time_before_kzalloc, @@ -471,11 +471,11 @@ void cdf_mem_free(void *ptr) * * Return: None */ -void cdf_mem_multi_pages_alloc(cdf_device_t osdev, +void cdf_mem_multi_pages_alloc(qdf_device_t osdev, struct cdf_mem_multi_page_t *pages, size_t element_size, uint16_t element_num, - cdf_dma_context_t memctxt, + qdf_dma_context_t memctxt, bool cacheable) { uint16_t page_idx; @@ -487,7 +487,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, pages->num_element_per_page = PAGE_SIZE / element_size; if (!pages->num_element_per_page) { - cdf_print("Invalid page %d or element size %d", + qdf_print("Invalid page %d or element size %d", (int)PAGE_SIZE, (int)element_size); goto out_fail; } @@ -501,7 +501,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, pages->cacheable_pages = cdf_mem_malloc( pages->num_pages * sizeof(pages->cacheable_pages)); if (!pages->cacheable_pages) { - cdf_print("Cacheable page storage alloc fail"); + qdf_print("Cacheable page storage alloc fail"); goto out_fail; } @@ -509,7 +509,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, for (page_idx = 0; page_idx < pages->num_pages; page_idx++) { cacheable_pages[page_idx] = cdf_mem_malloc(PAGE_SIZE); if (!cacheable_pages[page_idx]) { - cdf_print("cacheable page alloc fail, pi %d", + qdf_print("cacheable page alloc fail, pi %d", page_idx); goto page_alloc_fail; } @@ -519,7 +519,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, pages->dma_pages = cdf_mem_malloc( pages->num_pages * sizeof(struct cdf_mem_dma_page_t)); if (!pages->dma_pages) { - cdf_print("dmaable page storage alloc fail"); + qdf_print("dmaable page storage alloc fail"); goto out_fail; } @@ -529,7 +529,7 @@ void cdf_mem_multi_pages_alloc(cdf_device_t osdev, cdf_os_mem_alloc_consistent(osdev, PAGE_SIZE, &dma_pages->page_p_addr, memctxt); if (!dma_pages->page_v_addr_start) { - cdf_print("dmaable page alloc fail pi %d", + qdf_print("dmaable page alloc fail pi %d", page_idx); goto page_alloc_fail; } @@ -575,9 +575,9 @@ out_fail: * * Return: None */ -void cdf_mem_multi_pages_free(cdf_device_t osdev, +void cdf_mem_multi_pages_free(qdf_device_t osdev, struct cdf_mem_multi_page_t *pages, - cdf_dma_context_t memctxt, + qdf_dma_context_t memctxt, bool cacheable) { unsigned int page_idx; @@ -618,7 +618,7 @@ void cdf_mem_multi_pages_free(cdf_device_t osdev, void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value) { if (ptr == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__); return; } @@ -646,7 +646,7 @@ void cdf_mem_zero(void *ptr, uint32_t numBytes) } if (ptr == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__); return; } @@ -678,7 +678,7 @@ void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes) } if ((pDst == NULL) || (pSrc == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, source:%p destination:%p", __func__, pSrc, pDst); CDF_ASSERT(0); @@ -708,7 +708,7 @@ void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes) } if ((pDst == NULL) || (pSrc == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, source:%p destination:%p", __func__, pSrc, pDst); CDF_ASSERT(0); @@ -740,7 +740,7 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2, } if ((pMemory1 == NULL) || (pMemory2 == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, p1:%p p2:%p", __func__, pMemory1, pMemory2); CDF_ASSERT(0); @@ -779,9 +779,9 @@ int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2, * * Return: pointer of allocated memory or null if memory alloc fails */ -inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size, - cdf_dma_addr_t *paddr, - cdf_dma_context_t memctx) +inline void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size, + qdf_dma_addr_t *paddr, + qdf_dma_context_t memctx) { #if defined(A_SIMOS_DEVHOST) static int first = 1; @@ -792,7 +792,7 @@ inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size, pr_err("Warning: bypassing %s\n", __func__); } vaddr = cdf_mem_malloc(size); - *paddr = ((cdf_dma_addr_t) vaddr); + *paddr = ((qdf_dma_addr_t) vaddr); return vaddr; #else int flags = GFP_KERNEL; @@ -819,10 +819,10 @@ inline void *cdf_os_mem_alloc_consistent(cdf_device_t osdev, cdf_size_t size, * Return: none */ inline void -cdf_os_mem_free_consistent(cdf_device_t osdev, - cdf_size_t size, +cdf_os_mem_free_consistent(qdf_device_t osdev, + qdf_size_t size, void *vaddr, - cdf_dma_addr_t paddr, cdf_dma_context_t memctx) + qdf_dma_addr_t paddr, qdf_dma_context_t memctx) { #if defined(A_SIMOS_DEVHOST) static int first = 1; @@ -853,9 +853,9 @@ cdf_os_mem_free_consistent(cdf_device_t osdev, */ inline void -cdf_os_mem_dma_sync_single_for_device(cdf_device_t osdev, - cdf_dma_addr_t bus_addr, - cdf_size_t size, +cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev, + qdf_dma_addr_t bus_addr, + qdf_size_t size, enum dma_data_direction direction) { dma_sync_single_for_device(osdev->dev, bus_addr, size, direction); diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 80fe56dbeda8..3f1bbb5f65b5 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -40,7 +40,7 @@ #include #include #endif /* FEATURE_TSO */ -#include +#include #include #include #include @@ -58,9 +58,9 @@ static uint32_t nbuf_tx_data[NBUF_TX_PKT_STATE_MAX]; */ void cdf_nbuf_tx_desc_count_display(void) { - cdf_print("Current Snapshot of the Driver:\n"); - cdf_print("Data Packets:\n"); - cdf_print("HDD %d TXRX_Q %d TXRX %d HTT %d", + qdf_print("Current Snapshot of the Driver:\n"); + qdf_print("Data Packets:\n"); + qdf_print("HDD %d TXRX_Q %d TXRX %d HTT %d", nbuf_tx_data[NBUF_TX_PKT_HDD] - (nbuf_tx_data[NBUF_TX_PKT_TXRX] + nbuf_tx_data[NBUF_TX_PKT_TXRX_ENQUEUE] - @@ -69,13 +69,13 @@ void cdf_nbuf_tx_desc_count_display(void) nbuf_tx_data[NBUF_TX_PKT_TXRX_DEQUEUE], nbuf_tx_data[NBUF_TX_PKT_TXRX] - nbuf_tx_data[NBUF_TX_PKT_HTT], nbuf_tx_data[NBUF_TX_PKT_HTT] - nbuf_tx_data[NBUF_TX_PKT_HTC]); - cdf_print(" HTC %d HIF %d CE %d TX_COMP %d\n", + qdf_print(" HTC %d HIF %d CE %d TX_COMP %d\n", nbuf_tx_data[NBUF_TX_PKT_HTC] - nbuf_tx_data[NBUF_TX_PKT_HIF], nbuf_tx_data[NBUF_TX_PKT_HIF] - nbuf_tx_data[NBUF_TX_PKT_CE], nbuf_tx_data[NBUF_TX_PKT_CE] - nbuf_tx_data[NBUF_TX_PKT_FREE], nbuf_tx_data[NBUF_TX_PKT_FREE]); - cdf_print("Mgmt Packets:\n"); - cdf_print("TXRX_Q %d TXRX %d HTT %d HTC %d HIF %d CE %d TX_COMP %d\n", + qdf_print("Mgmt Packets:\n"); + qdf_print("TXRX_Q %d TXRX %d HTT %d HTC %d HIF %d CE %d TX_COMP %d\n", nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_ENQUEUE] - nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_DEQUEUE], nbuf_tx_mgmt[NBUF_TX_PKT_TXRX] - nbuf_tx_mgmt[NBUF_TX_PKT_HTT], @@ -164,7 +164,7 @@ cdf_nbuf_trace_update_t trace_update_cb; * * Return: nbuf or %NULL if no memory */ -struct sk_buff *__cdf_nbuf_alloc(cdf_device_t osdev, size_t size, int reserve, +struct sk_buff *__cdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve, int align, int prio) { struct sk_buff *skb; @@ -233,13 +233,13 @@ void __cdf_nbuf_free(struct sk_buff *skb) * Return: QDF_STATUS */ QDF_STATUS -__cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) +__cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) { #ifdef CDF_OS_DEBUG struct skb_shared_info *sh = skb_shinfo(skb); #endif - cdf_assert((dir == CDF_DMA_TO_DEVICE) - || (dir == CDF_DMA_FROM_DEVICE)); + cdf_assert((dir == QDF_DMA_TO_DEVICE) + || (dir == QDF_DMA_FROM_DEVICE)); /* * Assume there's only a single fragment. @@ -264,13 +264,13 @@ __cdf_nbuf_map(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) * Return: none */ void -__cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) +__cdf_nbuf_unmap(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) { - cdf_assert((dir == CDF_DMA_TO_DEVICE) - || (dir == CDF_DMA_FROM_DEVICE)); + cdf_assert((dir == QDF_DMA_TO_DEVICE) + || (dir == QDF_DMA_FROM_DEVICE)); - cdf_assert(((dir == CDF_DMA_TO_DEVICE) - || (dir == CDF_DMA_FROM_DEVICE))); + cdf_assert(((dir == QDF_DMA_TO_DEVICE) + || (dir == QDF_DMA_FROM_DEVICE))); /* * Assume there's a single fragment. * If this is not true, the assertion in __cdf_nbuf_map will catch it. @@ -287,7 +287,7 @@ __cdf_nbuf_unmap(cdf_device_t osdev, struct sk_buff *skb, cdf_dma_dir_t dir) * Return: QDF_STATUS */ QDF_STATUS -__cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +__cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { cdf_dma_addr_t paddr; @@ -315,7 +315,7 @@ __cdf_nbuf_map_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) * Return: none */ void -__cdf_nbuf_unmap_single(cdf_device_t osdev, cdf_nbuf_t buf, cdf_dma_dir_t dir) +__cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { #if !defined(A_SIMOS_DEVHOST) dma_unmap_single(osdev->dev, NBUF_CB_PADDR(buf), @@ -536,7 +536,7 @@ void cdf_net_buf_debug_exit(void) while (p_node) { p_prev = p_node; p_node = p_node->p_next; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "SKB buf memory Leak@ File %s, @Line %d, size %zu\n", p_prev->file_name, p_prev->line_num, p_prev->size); @@ -632,7 +632,7 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, p_node = cdf_net_buf_debug_look_up(net_buf); if (p_node) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Double allocation of skb ! Already allocated from %s %d", p_node->file_name, p_node->line_num); CDF_ASSERT(0); @@ -647,7 +647,7 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, p_node->p_next = gp_cdf_net_buf_track_tbl[i]; gp_cdf_net_buf_track_tbl[i] = p_node; } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Mem alloc failed ! Could not track skb from %s %d of size %zu", file_name, line_num, size); CDF_ASSERT(0); @@ -706,7 +706,7 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf) done: if (!found) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Unallocated buffer ! Double free of net_buf %p ?", net_buf); CDF_ASSERT(0); @@ -771,7 +771,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, tso_info->ipv4_csum_en = 1; tso_info->tcp_ipv4_csum_en = 1; if (cdf_unlikely(ipv4_hdr->protocol != IPPROTO_TCP)) { - cdf_print("TSO IPV4 proto 0x%x not TCP\n", + qdf_print("TSO IPV4 proto 0x%x not TCP\n", ipv4_hdr->protocol); return 1; } @@ -779,7 +779,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, /* for IPv6, enable TCP csum. No IP ID or IP csum */ tso_info->tcp_ipv6_csum_en = 1; } else { - cdf_print("TSO: ethertype 0x%x is not supported!\n", + qdf_print("TSO: ethertype 0x%x is not supported!\n", tso_info->ethproto); return 1; } @@ -826,8 +826,8 @@ static inline void cdf_dmaaddr_to_32s(cdf_dma_addr_t dmaaddr, * * Return: number of TSO segments */ -uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, - struct cdf_tso_info_t *tso_info) +uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, + struct qdf_tso_info_t *tso_info) { /* common accross all segments */ struct cdf_tso_cmn_seg_info_t tso_cmn_info; @@ -848,7 +848,7 @@ uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, memset(&tso_cmn_info, 0x0, sizeof(tso_cmn_info)); if (cdf_unlikely(__cdf_nbuf_get_tso_cmn_seg_info(skb, &tso_cmn_info))) { - cdf_print("TSO: error getting common segment info\n"); + qdf_print("TSO: error getting common segment info\n"); return 0; } curr_seg = tso_info->tso_seg_list; diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c index f0ad0ec95661..2009859f310c 100644 --- a/core/cdf/src/cdf_trace.c +++ b/core/cdf/src/cdf_trace.c @@ -70,23 +70,23 @@ typedef struct { * information. This includes the trace level for the module and * the 3 character 'name' of the module for marking the trace logs */ -moduleTraceInfo g_cdf_trace_info[CDF_MODULE_ID_MAX] = { - [CDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"}, - [CDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"}, - [CDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"}, - [CDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"}, - [CDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "}, - [CDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"}, - [CDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"}, - [CDF_MODULE_ID_CDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"}, - [CDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"}, - [CDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"}, - [CDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"}, - [CDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"}, - [CDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"}, - [CDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"}, - [CDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"}, - [CDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"}, +moduleTraceInfo g_cdf_trace_info[QDF_MODULE_ID_MAX] = { + [QDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"}, + [QDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"}, + [QDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"}, + [QDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"}, + [QDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "}, + [QDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"}, + [QDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"}, + [QDF_MODULE_ID_QDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"}, + [QDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"}, + [QDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"}, + [QDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"}, + [QDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"}, + [QDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"}, + [QDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"}, + [QDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"}, + [QDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"}, }; /* Static and Global variables */ @@ -103,8 +103,8 @@ static t_cdf_trace_data g_cdf_trace_data; * cdf_trace_cb_table, we can certainly retrieve all the call back functions * back from Restore Table */ -static tp_cdf_trace_cb cdf_trace_cb_table[CDF_MODULE_ID_MAX]; -static tp_cdf_trace_cb cdf_trace_restore_cb_table[CDF_MODULE_ID_MAX]; +static tp_cdf_trace_cb cdf_trace_cb_table[QDF_MODULE_ID_MAX]; +static tp_cdf_trace_cb cdf_trace_restore_cb_table[QDF_MODULE_ID_MAX]; /* Static and Global variables */ static spinlock_t l_dp_trace_lock; @@ -135,7 +135,7 @@ static tp_cdf_dp_trace_cb cdf_dp_trace_cb_table[CDF_DP_TRACE_MAX]; * * Return: nothing */ -void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level) +void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level) { /* make sure the caller is passing in a valid LEVEL */ if (level >= CDF_TRACE_LEVEL_MAX) { @@ -167,16 +167,16 @@ void cdf_trace_set_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level) * * Return: None */ -void cdf_trace_set_module_trace_level(CDF_MODULE_ID module, uint32_t level) +void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level) { - if (module < 0 || module >= CDF_MODULE_ID_MAX) { + if (module < 0 || module >= QDF_MODULE_ID_MAX) { pr_err("%s: Invalid module id %d passed\n", __func__, module); return; } g_cdf_trace_info[module].moduleTraceLevel = level; } -void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, uint8_t on) { /* make sure the caller is passing in a valid LEVEL */ @@ -187,7 +187,7 @@ void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, } /* make sure the caller is passing in a valid module */ - if (module < 0 || module >= CDF_MODULE_ID_MAX) { + if (module < 0 || module >= QDF_MODULE_ID_MAX) { pr_err("%s: Invalid module id %d passed in!\n", __func__, module); return; @@ -234,7 +234,7 @@ void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, * false - the specified trace level for the specified module is OFF * true - the specified trace level for the specified module is ON */ -bool cdf_trace_get_level(CDF_MODULE_ID module, CDF_TRACE_LEVEL level) +bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level) { bool traceOn = false; @@ -262,7 +262,7 @@ void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...) /** * cdf_trace_msg() - externally called trace function - * @module : Module identifier a member of the CDF_MODULE_ID + * @module : Module identifier a member of the QDF_MODULE_ID * enumeration that identifies the module issuing the trace message. * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration * indicating the severity of the condition causing the trace message @@ -276,7 +276,7 @@ void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...) * Return: nothing * */ -void cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, char *strFormat, ...) { char strBuffer[CDF_TRACE_BUFFER_SIZE]; @@ -322,11 +322,11 @@ void cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, void cdf_trace_display(void) { - CDF_MODULE_ID moduleId; + QDF_MODULE_ID moduleId; pr_err (" 1)FATAL 2)ERROR 3)WARN 4)INFO 5)INFO_H 6)INFO_M 7)INFO_L 8)DEBUG\n"); - for (moduleId = 0; moduleId < CDF_MODULE_ID_MAX; ++moduleId) { + for (moduleId = 0; moduleId < QDF_MODULE_ID_MAX; ++moduleId) { pr_err ("%2d)%s %s %s %s %s %s %s %s %s\n", (int)moduleId, g_cdf_trace_info[moduleId].moduleNameStr, @@ -363,7 +363,7 @@ void cdf_trace_display(void) /** * cdf_trace_hex_dump() - externally called hex dump function - * @module : Module identifier a member of the CDF_MODULE_ID enumeration that + * @module : Module identifier a member of the QDF_MODULE_ID enumeration that * identifies the module issuing the trace message. * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration indicating * the severity of the condition causing the trace message to be @@ -375,7 +375,7 @@ void cdf_trace_display(void) * * Return : nothing */ -void cdf_trace_hex_dump(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, void *data, int buf_len) { const u8 *ptr = data; @@ -423,7 +423,7 @@ void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable) { int i; if (bitmask_of_moduleId) { - for (i = 0; i < CDF_MODULE_ID_MAX; i++) { + for (i = 0; i < QDF_MODULE_ID_MAX; i++) { if (((bitmask_of_moduleId >> i) & 1)) { if (enable) { if (NULL != @@ -440,14 +440,14 @@ void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable) } } else { if (enable) { - for (i = 0; i < CDF_MODULE_ID_MAX; i++) { + for (i = 0; i < QDF_MODULE_ID_MAX; i++) { if (NULL != cdf_trace_restore_cb_table[i]) { cdf_trace_cb_table[i] = cdf_trace_restore_cb_table[i]; } } } else { - for (i = 0; i < CDF_MODULE_ID_MAX; i++) { + for (i = 0; i < QDF_MODULE_ID_MAX; i++) { cdf_trace_restore_cb_table[i] = cdf_trace_cb_table[i]; cdf_trace_cb_table[i] = NULL; @@ -474,7 +474,7 @@ void cdf_trace_init(void) g_cdf_trace_data.dumpCount = DEFAULT_CDF_TRACE_DUMP_COUNT; g_cdf_trace_data.numSinceLastDump = 0; - for (i = 0; i < CDF_MODULE_ID_MAX; i++) { + for (i = 0; i < QDF_MODULE_ID_MAX; i++) { cdf_trace_cb_table[i] = NULL; cdf_trace_restore_cb_table[i] = NULL; } @@ -574,7 +574,7 @@ QDF_STATUS cdf_trace_spin_lock_init(void) * * Return : nothing */ -void cdf_trace_register(CDF_MODULE_ID moduleID, +void cdf_trace_register(QDF_MODULE_ID moduleID, tp_cdf_trace_cb cdf_trace_callback) { cdf_trace_cb_table[moduleID] = cdf_trace_callback; @@ -607,12 +607,12 @@ void cdf_trace_dump_all(void *pMac, uint8_t code, uint8_t session, int32_t i, tail; if (!g_cdf_trace_data.enable) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Tracing Disabled"); return; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Total Records: %d, Head: %d, Tail: %d", g_cdf_trace_data.num, g_cdf_trace_data.head, g_cdf_trace_data.tail); @@ -780,10 +780,10 @@ static void dump_hex_trace(uint8_t *buf, uint8_t buf_len) { uint8_t i = 0; /* Dump the bytes in the last line */ - cdf_print("DATA: "); + qdf_print("DATA: "); for (i = 0; i < buf_len; i++) - cdf_print("%02x ", buf[i]); - cdf_print("\n"); + qdf_print("%02x ", buf[i]); + qdf_print("\n"); } /** @@ -796,23 +796,23 @@ static void dump_hex_trace(uint8_t *buf, uint8_t buf_len) void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord, uint16_t recIndex) { - cdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex, + qdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex, pRecord->time, pRecord->code); switch (pRecord->code) { case CDF_DP_TRACE_HDD_TX_TIMEOUT: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "HDD TX Timeout\n"); break; case CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "HDD SoftAP TX Timeout\n"); break; case CDF_DP_TRACE_VDEV_PAUSE: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "VDEV Pause\n"); break; case CDF_DP_TRACE_VDEV_UNPAUSE: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "VDEV UnPause\n"); break; default: @@ -960,12 +960,12 @@ void cdf_dp_trace_dump_all(uint32_t count) int32_t i, tail; if (!g_cdf_dp_trace_data.enable) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Tracing Disabled"); return; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Total Records: %d, Head: %d, Tail: %d", g_cdf_dp_trace_data.num, g_cdf_dp_trace_data.head, g_cdf_dp_trace_data.tail); diff --git a/core/cdf/src/i_cdf_lock.h b/core/cdf/src/i_cdf_lock.h index 438b50aa5fc9..02c46f095762 100644 --- a/core/cdf/src/i_cdf_lock.h +++ b/core/cdf/src/i_cdf_lock.h @@ -36,7 +36,7 @@ */ /* Include Files */ -#include +#include #include #include #include @@ -116,7 +116,7 @@ static inline QDF_STATUS __cdf_semaphore_init(struct semaphore *m) * Return: 0 */ static inline int -__cdf_semaphore_acquire(cdf_device_t osdev, struct semaphore *m) +__cdf_semaphore_acquire(qdf_device_t osdev, struct semaphore *m) { down(m); return 0; @@ -129,7 +129,7 @@ __cdf_semaphore_acquire(cdf_device_t osdev, struct semaphore *m) * Return: result of UP operation in integer */ static inline void -__cdf_semaphore_release(cdf_device_t osdev, struct semaphore *m) +__cdf_semaphore_release(qdf_device_t osdev, struct semaphore *m) { up(m); } diff --git a/core/cdf/src/i_cdf_mc_timer.h b/core/cdf/src/i_cdf_mc_timer.h index 95634ff89589..91e94ab4230a 100644 --- a/core/cdf/src/i_cdf_mc_timer.h +++ b/core/cdf/src/i_cdf_mc_timer.h @@ -36,7 +36,7 @@ /* Include Files */ #include -#include +#include #include #include #include diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index fc45827af1a7..d4c9fa90a3e5 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include /* @@ -331,17 +331,17 @@ typedef void (*cdf_nbuf_trace_update_t)(char *); /* * prototypes. Implemented in cdf_nbuf.c */ -__cdf_nbuf_t __cdf_nbuf_alloc(__cdf_device_t osdev, size_t size, int reserve, +__cdf_nbuf_t __cdf_nbuf_alloc(__qdf_device_t osdev, size_t size, int reserve, int align, int prio); void __cdf_nbuf_free(struct sk_buff *skb); -QDF_STATUS __cdf_nbuf_map(__cdf_device_t osdev, - struct sk_buff *skb, cdf_dma_dir_t dir); -void __cdf_nbuf_unmap(__cdf_device_t osdev, - struct sk_buff *skb, cdf_dma_dir_t dir); -QDF_STATUS __cdf_nbuf_map_single(__cdf_device_t osdev, - struct sk_buff *skb, cdf_dma_dir_t dir); -void __cdf_nbuf_unmap_single(__cdf_device_t osdev, - struct sk_buff *skb, cdf_dma_dir_t dir); +QDF_STATUS __cdf_nbuf_map(__qdf_device_t osdev, + struct sk_buff *skb, qdf_dma_dir_t dir); +void __cdf_nbuf_unmap(__qdf_device_t osdev, + struct sk_buff *skb, qdf_dma_dir_t dir); +QDF_STATUS __cdf_nbuf_map_single(__qdf_device_t osdev, + struct sk_buff *skb, qdf_dma_dir_t dir); +void __cdf_nbuf_unmap_single(__qdf_device_t osdev, + struct sk_buff *skb, qdf_dma_dir_t dir); void __cdf_nbuf_reg_trace_cb(cdf_nbuf_trace_update_t cb_func_ptr); #ifdef QCA_PKT_PROTO_TRACE @@ -825,8 +825,8 @@ __cdf_nbuf_set_protocol(struct sk_buff *skb, uint16_t protocol) NBUF_CB_TX_HL_HTT2_FRM(skb) #if defined(FEATURE_TSO) -uint32_t __cdf_nbuf_get_tso_info(cdf_device_t osdev, struct sk_buff *skb, - struct cdf_tso_info_t *tso_info); +uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, + struct qdf_tso_info_t *tso_info); uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb); diff --git a/core/cdf/src/i_cdf_trace.h b/core/cdf/src/i_cdf_trace.h index a3b36ee8c55c..99973f2d5a56 100644 --- a/core/cdf/src/i_cdf_trace.h +++ b/core/cdf/src/i_cdf_trace.h @@ -43,7 +43,7 @@ /** * cdf_trace_msg()- logging API - * @module: Module identifier. A member of the CDF_MODULE_ID enumeration that + * @module: Module identifier. A member of the QDF_MODULE_ID enumeration that * identifies the module issuing the trace message. * @level: Trace level. A member of the CDF_TRACE_LEVEL enumeration indicating * the severity of the condition causing the trace message to be issued. @@ -59,18 +59,18 @@ * Return: nothing * */ -void __printf(3, 4) cdf_trace_msg(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void __printf(3, 4) cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, char *strFormat, ...); -void cdf_trace_hex_dump(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, void *data, int buf_len); void cdf_trace_display(void); -void cdf_trace_set_value(CDF_MODULE_ID module, CDF_TRACE_LEVEL level, +void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, uint8_t on); -void cdf_trace_set_module_trace_level(CDF_MODULE_ID module, uint32_t level); +void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level); /* CDF_TRACE is the macro invoked to add trace messages to code. See the * documenation for cdf_trace_msg() for the parameters etc. for this function. @@ -110,7 +110,7 @@ void __printf(3, 4) cdf_snprintf(char *strBuffer, unsigned int size, /* This code will be used for compilation if tracing is to be compiled out */ /* of the code so these functions/macros are 'do nothing' */ -CDF_INLINE_FN void cdf_trace_msg(CDF_MODULE_ID module, ...) +static inline void cdf_trace_msg(QDF_MODULE_ID module, ...) { } diff --git a/core/cdf/src/i_cdf_types.h b/core/cdf/src/i_cdf_types.h deleted file mode 100644 index febbaff2352c..000000000000 --- a/core/cdf/src/i_cdf_types.h +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: i_cdf_types.h - * - * Connectivity driver framework (CDF) types - */ - -#if !defined(__I_CDF_TYPES_H) -#define __I_CDF_TYPES_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef __KERNEL__ -#define __iomem -#endif -#include -#include -#include - -#ifdef __KERNEL__ -#include -#include -#include -#include -#include -#else - -/* - * Hack - coexist with prior defs of dma_addr_t. - * Eventually all other defs of dma_addr_t should be removed. - * At that point, the "already_defined" wrapper can be removed. - */ -#ifndef __dma_addr_t_already_defined__ -#define __dma_addr_t_already_defined__ -typedef unsigned long dma_addr_t; -#endif - -#define SIOCGIWAP 0 -#define IWEVCUSTOM 0 -#define IWEVREGISTERED 0 -#define IWEVEXPIRED 0 -#define SIOCGIWSCAN 0 -#define DMA_TO_DEVICE 0 -#define DMA_FROM_DEVICE 0 -#define __iomem -#endif /* __KERNEL__ */ - -/** - * max sg that we support - */ -#define __CDF_OS_MAX_SCATTER 1 - -#if defined(__LITTLE_ENDIAN_BITFIELD) -#define CDF_LITTLE_ENDIAN_MACHINE -#elif defined (__BIG_ENDIAN_BITFIELD) -#define CDF_BIG_ENDIAN_MACHINE -#else -#error "Please fix " -#endif - -#define __cdf_packed __attribute__ ((packed)) - -typedef int (*__cdf_os_intr)(void *); -/** - * Private definitions of general data types - */ -typedef dma_addr_t __cdf_dma_addr_t; -typedef dma_addr_t __cdf_dma_context_t; - -#define cdf_dma_mem_context(context) dma_addr_t context -#define cdf_get_dma_mem_context(var, field) ((cdf_dma_context_t)(var->field)) - -/** - * typedef struct __cdf_resource_t - cdf resource type - * @paddr: Physical address - * @paddr: Virtual address - * @len: Length - */ -typedef struct __cdf_os_resource { - unsigned long paddr; - void __iomem *vaddr; - unsigned long len; -} __cdf_resource_t; - -/** - * struct __cdf_device - generic cdf device type - * @drv: Pointer to driver - * @drv_hdl: Pointer to driver handle - * @drv_name: Pointer to driver name - * @irq: IRQ - * @dev: Pointer to device - * @res: CDF resource - * @func: Interrupt handler - */ -struct __cdf_device { - void *drv; - void *drv_hdl; - char *drv_name; - int irq; - struct device *dev; - __cdf_resource_t res; - __cdf_os_intr func; -}; - -typedef struct __cdf_device *__cdf_device_t; - -typedef size_t __cdf_size_t; -typedef uint8_t __iomem *__cdf_iomem_t; - -/** - * typedef struct __cdf_segment_t - cdf segment - * @daddr: DMA address - * @len: Length - */ -typedef struct __cdf_segment { - dma_addr_t daddr; - uint32_t len; -} __cdf_segment_t; - -/** - * struct __cdf_dma_map - dma map - * @mapped: dma is mapped or not - * @nsegs: Number of segments - * @coherent: Coherent - * @seg: Segment array - */ -struct __cdf_dma_map { - uint32_t mapped; - uint32_t nsegs; - uint32_t coherent; - __cdf_segment_t seg[__CDF_OS_MAX_SCATTER]; -}; -typedef struct __cdf_dma_map *__cdf_dma_map_t; -typedef uint32_t ath_dma_addr_t; - -#define __cdf_print printk -#define __cdf_vprint vprintk -#define __cdf_snprint snprintf -#define __cdf_vsnprint vsnprintf - -#define __CDF_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL -#define __CDF_DMA_TO_DEVICE DMA_TO_DEVICE -#define __CDF_DMA_FROM_DEVICE DMA_FROM_DEVICE -#define __cdf_inline inline - -/* - * 1. GNU C/C++ Compiler - * - * How to detect gcc : __GNUC__ - * How to detect gcc version : - * major version : __GNUC__ (2 = 2.x, 3 = 3.x, 4 = 4.x) - * minor version : __GNUC_MINOR__ - * - * 2. Microsoft C/C++ Compiler - * - * How to detect msc : _MSC_VER - * How to detect msc version : - * _MSC_VER (1200 = MSVC 6.0, 1300 = MSVC 7.0, ...) - * - */ - -/* MACROs to help with compiler and OS specifics. May need to get a little - * more sophisticated than this and define these to specific 'VERSIONS' of - * the compiler and OS. Until we have a need for that, lets go with this - */ -#if defined(_MSC_VER) - -#define CDF_COMPILER_MSC -/* assuming that if we build with MSC, OS is WinMobile */ -#define CDF_OS_WINMOBILE - -#elif defined(__GNUC__) - -#define CDF_COMPILER_GNUC -#define CDF_OS_LINUX /* assuming if building with GNUC, OS is Linux */ - -#endif - -#if defined(CDF_COMPILER_MSC) - -#define CDF_INLINE_FN __inline - -/* Does nothing on Windows. packing individual structs is not - * supported on the Windows compiler - */ -#define CDF_PACK_STRUCT_1 -#define CDF_PACK_STRUCT_2 -#define CDF_PACK_STRUCT_4 -#define CDF_PACK_STRUCT_8 -#define CDF_PACK_STRUCT_16 - -#elif defined(CDF_COMPILER_GNUC) - -#define CDF_INLINE_FN static inline - -#else -#error "Compiling with an unknown compiler!!" -#endif - -#endif /* __I_CDF_TYPES_H */ diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h index bd34f4a5127b..5c3bdc77cfe7 100644 --- a/core/cdf/src/i_cdf_util.h +++ b/core/cdf/src/i_cdf_util.h @@ -35,7 +35,7 @@ #include -#include +#include #include #include /* diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 2292ac7f95a4..456261b19357 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -34,7 +34,7 @@ * */ -#include +#include #include #include #include @@ -199,17 +199,17 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context); void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper); -void *cds_get_context(CDF_MODULE_ID moduleId); +void *cds_get_context(QDF_MODULE_ID moduleId); v_CONTEXT_t cds_get_global_context(void); -QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size); -QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, void *pModuleContext); -QDF_STATUS cds_set_context(CDF_MODULE_ID moduleID, void *context); +QDF_STATUS cds_set_context(QDF_MODULE_ID moduleID, void *context); QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 33ec1a8c781a..aca9537316c6 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -465,8 +465,8 @@ struct cds_conc_connection_info { bool cds_is_connection_in_progress(void); void cds_dump_concurrency_info(void); -void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode); -void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode); +void cds_set_concurrency_mode(enum tQDF_ADAPTER_MODE mode); +void cds_clear_concurrency_mode(enum tQDF_ADAPTER_MODE mode); uint32_t cds_get_connection_count(void); bool cds_is_sta_connection_pending(void); void cds_change_sta_conn_pending_status(bool value); @@ -549,11 +549,11 @@ static inline void cds_check_and_restart_sap_with_non_dfs_acs(void) } #endif /* FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE */ -void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode, +void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, uint8_t sessionId); -void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode, +void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, uint8_t sessionId); -void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, +void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, uint8_t session_id); QDF_STATUS cds_init_policy_mgr(void); QDF_STATUS cds_deinit_policy_mgr(void); @@ -638,12 +638,12 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, void cds_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status, uint32_t scan_config, uint32_t fw_mode_config); -bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, +bool cds_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode, enum cds_con_mode *new_mode); QDF_STATUS cds_get_channel_from_scan_result(hdd_adapter_t *adapter, tCsrRoamProfile *roam_profile, uint8_t *channel); -enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void); +enum tQDF_GLOBAL_CON_MODE cds_get_conparam(void); bool cds_concurrent_open_sessions_running(void); bool cds_max_concurrent_connections_reached(void); void cds_clear_concurrent_session_count(void); diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index d1fdb08eec8e..a94ae3c936c6 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -34,7 +34,7 @@ * */ -#include +#include #include #include #include diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index c8ab965bff3f..ab8c4d36dd48 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- @@ -92,16 +92,16 @@ typedef struct cds_msg_s { /* Message Queue IDs */ typedef enum { /* Message Queue ID for messages bound for SME */ - CDS_MQ_ID_SME = CDF_MODULE_ID_SME, + CDS_MQ_ID_SME = QDF_MODULE_ID_SME, /* Message Queue ID for messages bound for PE */ - CDS_MQ_ID_PE = CDF_MODULE_ID_PE, + CDS_MQ_ID_PE = QDF_MODULE_ID_PE, /* Message Queue ID for messages bound for WMA */ - CDS_MQ_ID_WMA = CDF_MODULE_ID_WMA, + CDS_MQ_ID_WMA = QDF_MODULE_ID_WMA, /* Message Queue ID for messages bound for the SYS module */ - CDS_MQ_ID_SYS = CDF_MODULE_ID_SYS, + CDS_MQ_ID_SYS = QDF_MODULE_ID_SYS, } CDS_MQ_ID; diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 87dce8ddd39c..44ce1efde30d 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index f08115adccf3..f19c9ed12aaf 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -40,13 +40,13 @@ Include Files ------------------------------------------------------------------------*/ #include -#include "i_cdf_types.h" +#include #include #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) #include #endif #include -#include +#include #include "cdf_lock.h" #define TX_POST_EVENT_MASK 0x001 @@ -269,7 +269,7 @@ typedef struct _cds_context_type { * while allocating dma memory * to access dev information. */ - cdf_device_t cdf_ctx; + qdf_device_t cdf_ctx; void *pdev_txrx_ctx; diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index 24d8b5af4eb5..f14feb9b622f 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include #include #include "ani_global.h" @@ -66,7 +66,7 @@ #define CDS_CHAN_15_FREQ (2512) #define CDS_CHAN_170_FREQ (5852) -#define cds_log(level, args...) CDF_TRACE(CDF_MODULE_ID_CDF, level, ## args) +#define cds_log(level, args...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) #define cds_logfl(level, format, args...) cds_log(level, FL(format), ## args) #define cds_alert(format, args...) \ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index b1455353f0bb..bc04928043af 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -69,7 +69,7 @@ /* Data definitions */ static cds_context_type g_cds_context; static p_cds_contextType gp_cds_context; -static struct __cdf_device g_cdf_ctx; +static struct __qdf_device g_cdf_ctx; /* Debug variable to detect MC thread stuck */ static atomic_t cds_wrapper_empty_count; @@ -94,7 +94,7 @@ v_CONTEXT_t cds_init(void) gp_cds_context = &g_cds_context; - gp_cds_context->cdf_ctx = &g_cdf_ctx; + gp_cds_context->qdf_ctx = &g_cdf_ctx; cdf_mem_zero(&g_cdf_ctx, sizeof(g_cdf_ctx)); cdf_trace_spin_lock_init(); @@ -119,7 +119,7 @@ void cds_deinit(void) if (gp_cds_context == NULL) return; - gp_cds_context->cdf_ctx = NULL; + gp_cds_context->qdf_ctx = NULL; gp_cds_context = NULL; cdf_mem_zero(&g_cds_context, sizeof(g_cds_context)); @@ -170,18 +170,18 @@ QDF_STATUS cds_open(void) int iter = 0; tSirRetStatus sirStatus = eSIR_SUCCESS; tMacOpenParameters mac_openParms; - cdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; HTC_INIT_INFO htcInfo; struct ol_context *ol_ctx; struct hif_opaque_softc *scn; void *HTCHandle; hdd_context_t *pHddCtx; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); if (NULL == gp_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -195,14 +195,14 @@ QDF_STATUS cds_open(void) /* Initialize the probe event */ if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Unable to init wmaCompleteEvent", __func__); CDF_ASSERT(0); goto err_probe_event; @@ -212,7 +212,7 @@ QDF_STATUS cds_open(void) qdf_status = cds_mq_init(&gp_cds_context->freeVosMq); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to initialize CDS free message queue", __func__); CDF_ASSERT(0); @@ -233,7 +233,7 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open CDS Scheduler", __func__); CDF_ASSERT(0); goto err_msg_queue; @@ -242,26 +242,26 @@ QDF_STATUS cds_open(void) pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Hdd Context is Null", __func__); CDF_ASSERT(0); goto err_sched_close; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); goto err_sched_close; } hdd_update_config(pHddCtx); - ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); /* Initialize BMI and Download firmware */ qdf_status = bmi_download_firmware(ol_ctx); if (qdf_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "BMI FIALED status:%d", qdf_status); goto err_bmi_close; } @@ -269,19 +269,19 @@ QDF_STATUS cds_open(void) htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge; - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(scn, &htcInfo, cdf_ctx); + htc_create(scn, &htcInfo, qdf_ctx); if (!gp_cds_context->htc_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); goto err_bmi_close; } if (bmi_done(ol_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; } @@ -373,7 +373,7 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open WMA module", __func__); CDF_ASSERT(0); goto err_htc_close; @@ -385,14 +385,14 @@ QDF_STATUS cds_open(void) * config entry pHddCtx->config->maxNumberOfPeers has adjusted value */ pHddCtx->config->maxNumberOfPeers = mac_openParms.maxStation; - HTCHandle = cds_get_context(CDF_MODULE_ID_HTC); + HTCHandle = cds_get_context(QDF_MODULE_ID_HTC); if (!HTCHandle) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is null!", __func__); goto err_wma_close; } if (htc_wait_target(HTCHandle)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_wma_close; } @@ -410,7 +410,7 @@ QDF_STATUS cds_open(void) if (eSIR_SUCCESS != sirStatus) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open MAC", __func__); CDF_ASSERT(0); goto err_wma_close; @@ -420,7 +420,7 @@ QDF_STATUS cds_open(void) qdf_status = sme_open(gp_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open SME", __func__); CDF_ASSERT(0); goto err_mac_close; @@ -429,16 +429,16 @@ QDF_STATUS cds_open(void) gp_cds_context->pdev_txrx_ctx = ol_txrx_pdev_alloc(gp_cds_context->cfg_ctx, gp_cds_context->htc_ctx, - gp_cds_context->cdf_ctx); + gp_cds_context->qdf_ctx); if (!gp_cds_context->pdev_txrx_ctx) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to open TXRX", __func__); CDF_ASSERT(0); goto err_sme_close; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); return QDF_STATUS_SUCCESS; @@ -490,32 +490,32 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Context mismatch", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pMACContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pWMAContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return QDF_STATUS_E_FAILURE; } @@ -526,7 +526,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) /*call WMA pre start */ qdf_status = wma_pre_start(gp_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to WMA prestart"); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -537,15 +537,15 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDS_WMA_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: wma_pre_start reporting other error", __func__); } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Test MC thread by posting a probe message to SYS", __func__); wlan_sys_probe(); @@ -556,14 +556,14 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) qdf_status = htc_start(gp_cds_context->htc_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); @@ -572,7 +572,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) } if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "Failed to attach pdev"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); @@ -599,12 +599,12 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; tHalMacStartParameters halStartParams; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Starting Libra SW", __func__); /* We support only one instance for now ... */ if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); return QDF_STATUS_E_FAILURE; } @@ -612,10 +612,10 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) if ((p_cds_context->pWMAContext == NULL) || (p_cds_context->pMACContext == NULL)) { if (p_cds_context->pWMAContext == NULL) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); else - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); return QDF_STATUS_E_FAILURE; @@ -624,11 +624,11 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) /* Start the wma */ qdf_status = wma_start(p_cds_context); if (qdf_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start wma", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: wma correctly started", __func__); /* Start the MAC */ @@ -640,36 +640,36 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) mac_start(p_cds_context->pMACContext, &halStartParams); if (eSIR_SUCCESS != sirStatus) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start MAC", __func__); goto err_wma_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: MAC correctly started", __func__); /* START SME */ qdf_status = sme_start(p_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to start SME", __func__); goto err_mac_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: SME correctly started", __func__); if (ol_txrx_pdev_attach_target (p_cds_context->pdev_txrx_ctx) != A_OK) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed attach target", __func__); goto err_sme_stop; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "TL correctly started"); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: CDS Start is successful!!", __func__); return QDF_STATUS_SUCCESS; @@ -684,7 +684,7 @@ err_wma_stop: qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); @@ -694,12 +694,12 @@ err_wma_stop: CDS_WMA_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Timeout occurred before WMA_stop complete", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: WMA_stop reporting other error", __func__); @@ -731,7 +731,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); @@ -743,7 +743,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) /* SYS STOP will stop SME and MAC */ qdf_status = sys_stop(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop SYS", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -764,7 +764,7 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = wma_wmi_work_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work", __func__); CDF_ASSERT(0); } @@ -776,19 +776,19 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) } ol_txrx_pdev_detach(gp_cds_context->pdev_txrx_ctx, 1); - cds_free_context(cds_context, CDF_MODULE_ID_TXRX, + cds_free_context(cds_context, QDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -796,12 +796,12 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) ((p_cds_contextType) cds_context)->pMACContext = NULL; if (true == wma_needshutdown(cds_context)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -809,7 +809,7 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -818,14 +818,14 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -850,76 +850,76 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) * specified, or NULL if the context data is not allocated for * the module ID specified */ -void *cds_get_context(CDF_MODULE_ID moduleId) +void *cds_get_context(QDF_MODULE_ID moduleId) { void *pModContext = NULL; if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context pointer is null", __func__); return NULL; } switch (moduleId) { - case CDF_MODULE_ID_HDD: + case QDF_MODULE_ID_HDD: { pModContext = gp_cds_context->pHDDContext; break; } - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: { /* In all these cases, we just return the MAC Context */ pModContext = gp_cds_context->pMACContext; break; } - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { /* For wma module */ pModContext = gp_cds_context->pWMAContext; break; } - case CDF_MODULE_ID_CDF: + case QDF_MODULE_ID_QDF: { /* For SYS this is CDS itself */ pModContext = gp_cds_context; break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pModContext = gp_cds_context->pHIFContext; break; } - case CDF_MODULE_ID_HTC: + case QDF_MODULE_ID_HTC: { pModContext = gp_cds_context->htc_ctx; break; } - case CDF_MODULE_ID_CDF_DEVICE: + case QDF_MODULE_ID_QDF_DEVICE: { - pModContext = gp_cds_context->cdf_ctx; + pModContext = gp_cds_context->qdf_ctx; break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pModContext = gp_cds_context->g_ol_context; break; } - case CDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_TXRX: { pModContext = gp_cds_context->pdev_txrx_ctx; break; } - case CDF_MODULE_ID_CFG: + case QDF_MODULE_ID_CFG: { pModContext = gp_cds_context->cfg_ctx; break; @@ -927,7 +927,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context maintained by CDS", __func__, moduleId); CDF_ASSERT(0); @@ -936,7 +936,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) } if (pModContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context is Null", __func__, moduleId); } @@ -956,7 +956,7 @@ void *cds_get_context(CDF_MODULE_ID moduleId) v_CONTEXT_t cds_get_global_context(void) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); } @@ -973,7 +973,7 @@ v_CONTEXT_t cds_get_global_context(void) enum cds_driver_state cds_get_driver_state(void) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); return CDS_DRIVER_STATE_UNINITIALIZED; @@ -995,7 +995,7 @@ enum cds_driver_state cds_get_driver_state(void) void cds_set_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1017,7 +1017,7 @@ void cds_set_driver_state(enum cds_driver_state state) void cds_clear_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1041,51 +1041,51 @@ void cds_clear_driver_state(enum cds_driver_state state) * * Return: CDF status */ -QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size) { void **pGpModContext = NULL; if (p_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is null", __func__); return QDF_STATUS_E_FAILURE; } if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: context mismatch or null param passed", __func__); return QDF_STATUS_E_FAILURE; } switch (moduleID) { - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { pGpModContext = &(gp_cds_context->pWMAContext); break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pGpModContext = &(gp_cds_context->pHIFContext); break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pGpModContext = &(gp_cds_context->g_ol_context); break; } - case CDF_MODULE_ID_EPPING: - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: - case CDF_MODULE_ID_HDD: - case CDF_MODULE_ID_HDD_SOFTAP: + case QDF_MODULE_ID_EPPING: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: + case QDF_MODULE_ID_HDD: + case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); @@ -1098,7 +1098,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, /* Context has already been allocated! * Prevent double allocation */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context has already been allocated", __func__, moduleID); return QDF_STATUS_E_EXISTS; @@ -1109,14 +1109,14 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, *ppModuleContext = cdf_mem_malloc(size); if (*ppModuleContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to " "allocate Context for module ID %i", __func__, moduleID); CDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } - if (moduleID == CDF_MODULE_ID_TLSHIM) + if (moduleID == QDF_MODULE_ID_TLSHIM) cdf_mem_zero(*ppModuleContext, size); *pGpModContext = *ppModuleContext; @@ -1133,22 +1133,22 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, CDF_MODULE_ID moduleID, * * Return: QDF_STATUS */ -QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) +QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) { p_cds_contextType p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return QDF_STATUS_NOT_INITIALIZED; } switch (module_id) { - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: p_cds_context->pHIFContext = context; break; default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context " "allocated by CDS", __func__, module_id); CDF_ASSERT(0); @@ -1170,51 +1170,51 @@ QDF_STATUS cds_set_context(CDF_MODULE_ID module_id, void *context) * * Return: CDF status */ -QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, +QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, void *pModuleContext) { void **pGpModContext = NULL; if ((p_cds_context == NULL) || (gp_cds_context != p_cds_context) || (pModuleContext == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or context mismatch", __func__); return QDF_STATUS_E_FAILURE; } switch (moduleID) { - case CDF_MODULE_ID_WMA: + case QDF_MODULE_ID_WMA: { pGpModContext = &(gp_cds_context->pWMAContext); break; } - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HIF: { pGpModContext = &(gp_cds_context->pHIFContext); break; } - case CDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_TXRX: { pGpModContext = &(gp_cds_context->pdev_txrx_ctx); break; } - case CDF_MODULE_ID_BMI: + case QDF_MODULE_ID_BMI: { pGpModContext = &(gp_cds_context->g_ol_context); break; } - case CDF_MODULE_ID_EPPING: - case CDF_MODULE_ID_HDD: - case CDF_MODULE_ID_SME: - case CDF_MODULE_ID_PE: - case CDF_MODULE_ID_HDD_SOFTAP: + case QDF_MODULE_ID_EPPING: + case QDF_MODULE_ID_HDD: + case QDF_MODULE_ID_SME: + case QDF_MODULE_ID_PE: + case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); @@ -1225,7 +1225,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, if (NULL == *pGpModContext) { /* Context has not been allocated or freed already! */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "context has not been allocated or freed already", __func__, moduleID); @@ -1233,7 +1233,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, CDF_MODULE_ID moduleID, } if (*pGpModContext != pModuleContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pGpModContext != pModuleContext", __func__); return QDF_STATUS_E_FAILURE; } @@ -1265,7 +1265,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) uint32_t debug_count = 0; if ((gp_cds_context == NULL) || (pMsg == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params or global cds context is null", __func__); CDF_ASSERT(0); @@ -1302,7 +1302,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) } default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("%s: Trying to queue msg into unknown MC Msg queue ID %d"), __func__, msgQueueId); @@ -1311,7 +1311,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) CDF_ASSERT(NULL != pTargetMq); if (pTargetMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pTargetMq == NULL", __func__); return QDF_STATUS_E_FAILURE; } @@ -1322,7 +1322,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) if (NULL == pMsgWrapper) { debug_count = atomic_inc_return(&cds_wrapper_empty_count); if (1 == debug_count) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: CDS Core run out of message wrapper %d", __func__, debug_count); @@ -1355,13 +1355,13 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) void cds_sys_probe_thread_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: qdf_event_set failed", __func__); return; } @@ -1376,14 +1376,14 @@ void cds_sys_probe_thread_cback(void *pUserData) void cds_wma_complete_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&gp_cds_context->wmaCompleteEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: qdf_event_set failed", __func__); return; } @@ -1403,7 +1403,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) CDF_ASSERT(gp_cds_context == p_cds_context); if (gp_cds_context != p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != p_cds_context", __func__); return; } @@ -1411,7 +1411,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) CDF_ASSERT(NULL != pMsgWrapper); if (pMsgWrapper == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper == NULL in function", __func__); return; } @@ -1437,12 +1437,12 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); ol_txrx_pdev_detach(gp_cds_context->pdev_txrx_ctx, 1); - cds_free_context(cds_context, CDF_MODULE_ID_TXRX, + cds_free_context(cds_context, QDF_MODULE_ID_TXRX, gp_cds_context->pdev_txrx_ctx); qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1460,7 +1460,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1471,7 +1471,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma!", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1479,7 +1479,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_wmi_work_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work!", __func__); CDF_ASSERT(0); } @@ -1492,7 +1492,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service!", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1501,14 +1501,14 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -1524,7 +1524,7 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) * * Return: WMI vdev type */ -QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *sub_type) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -1532,29 +1532,29 @@ QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, *sub_type = 0; switch (mode) { - case CDF_STA_MODE: + case QDF_STA_MODE: *type = WMI_VDEV_TYPE_STA; break; - case CDF_SAP_MODE: + case QDF_SAP_MODE: *type = WMI_VDEV_TYPE_AP; break; - case CDF_P2P_DEVICE_MODE: + case QDF_P2P_DEVICE_MODE: *type = WMI_VDEV_TYPE_AP; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE; break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: *type = WMI_VDEV_TYPE_STA; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT; break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: *type = WMI_VDEV_TYPE_AP; *sub_type = WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO; break; - case CDF_OCB_MODE: + case QDF_OCB_MODE: *type = WMI_VDEV_TYPE_OCB; break; default: - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); status = QDF_STATUS_E_INVAL; break; @@ -1603,7 +1603,7 @@ bool cds_is_packet_log_enabled(void) pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Hdd Context is Null", __func__); return false; } @@ -1618,11 +1618,11 @@ bool cds_is_packet_log_enabled(void) */ void cds_trigger_recovery(void) { - tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); QDF_STATUS status = QDF_STATUS_SUCCESS; if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "WMA context is invald!"); return; } @@ -1633,11 +1633,11 @@ void cds_trigger_recovery(void) WMA_CRASH_INJECT_TIMEOUT); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "CRASH_INJECT command is timed out!"); #ifdef CONFIG_CNSS if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Recovery is in progress, ignore!"); return; } @@ -1683,7 +1683,7 @@ void cds_set_wakelock_logging(bool value) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return; } @@ -1704,7 +1704,7 @@ bool cds_is_wakelock_enabled(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return false; } @@ -1728,7 +1728,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return; } @@ -1781,7 +1781,7 @@ enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return WLAN_LOG_LEVEL_OFF; } @@ -1843,7 +1843,7 @@ void cds_init_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1872,7 +1872,7 @@ void cds_deinit_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1899,7 +1899,7 @@ QDF_STATUS cds_set_log_completion(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } @@ -1931,7 +1931,7 @@ void cds_get_log_completion(uint32_t *is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1957,7 +1957,7 @@ bool cds_is_log_report_in_progress(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return true; } @@ -1987,13 +1987,13 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } if (cds_is_log_report_in_progress() == true) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); return QDF_STATUS_E_FAILURE; @@ -2001,18 +2001,18 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, status = cds_set_log_completion(is_fatal, indicator, reason_code); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set log trigger params", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Triggering bug report: type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); ret = sme_send_flush_logs_cmd_to_fw(p_cds_context->pMACContext); if (0 != ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to send flush FW log", __func__); cds_init_log_completion(); return QDF_STATUS_E_FAILURE; diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 2c33fd545202..603a1011b1ec 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -43,7 +43,7 @@ #include "wlan_hdd_trace.h" #include "wlan_hdd_hostapd.h" #include "cds_concurrency.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include @@ -1921,7 +1921,7 @@ bool cds_is_sta_connection_pending(void) bool status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -1946,7 +1946,7 @@ void cds_change_sta_conn_pending_status(bool value) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -1970,7 +1970,7 @@ static bool cds_is_sap_restart_required(void) bool status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -1995,7 +1995,7 @@ void cds_change_sap_restart_required_status(bool value) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -2020,7 +2020,7 @@ bool cds_set_connection_in_progress(bool value) bool status = true; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -2197,7 +2197,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries, uint32_t i, conn_index, found; cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -2276,7 +2276,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, QDF_STATUS status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -2335,7 +2335,7 @@ void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs) QDF_STATUS status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -2537,7 +2537,7 @@ QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, QDF_STATUS status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); return QDF_STATUS_E_FAILURE; @@ -2585,7 +2585,7 @@ bool cds_is_connection_in_progress(void) uint8_t *sta_mac = NULL; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -3002,13 +3002,13 @@ static bool cds_current_concurrency_is_scc(void) */ static void cds_dump_legacy_concurrency( uint8_t sta_channel, uint8_t ap_channel, uint8_t p2p_channel, - struct cdf_mac_addr sta_bssid, struct cdf_mac_addr p2p_bssid, - struct cdf_mac_addr ap_bssid, const char *p2p_mode) + struct qdf_mac_addr sta_bssid, struct qdf_mac_addr p2p_bssid, + struct qdf_mac_addr ap_bssid, const char *p2p_mode) { const char *cc_mode = "Standalone"; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -3089,9 +3089,9 @@ void cds_dump_concurrency_info(void) hdd_station_ctx_t *pHddStaCtx; hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; - struct cdf_mac_addr staBssid = CDF_MAC_ADDR_ZERO_INITIALIZER; - struct cdf_mac_addr p2pBssid = CDF_MAC_ADDR_ZERO_INITIALIZER; - struct cdf_mac_addr apBssid = CDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr staBssid = QDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr p2pBssid = QDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr apBssid = QDF_MAC_ADDR_ZERO_INITIALIZER; uint8_t staChannel = 0, p2pChannel = 0, apChannel = 0; const char *p2pMode = "DEV"; hdd_context_t *hdd_ctx; @@ -3105,7 +3105,7 @@ void cds_dump_concurrency_info(void) hdd_adapter_t *adapter5 = NULL; #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -3377,22 +3377,22 @@ void cds_dump_concurrency_info(void) * * Return: NONE */ -void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode) +void cds_set_concurrency_mode(enum tQDF_ADAPTER_MODE mode) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } switch (mode) { - case CDF_STA_MODE: - case CDF_P2P_CLIENT_MODE: - case CDF_P2P_GO_MODE: - case CDF_SAP_MODE: - case CDF_IBSS_MODE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_GO_MODE: + case QDF_SAP_MODE: + case QDF_IBSS_MODE: hdd_ctx->concurrency_mode |= (1 << mode); hdd_ctx->no_of_open_sessions[mode]++; break; @@ -3412,21 +3412,21 @@ void cds_set_concurrency_mode(enum tCDF_ADAPTER_MODE mode) * * Return: NONE */ -void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode) +void cds_clear_concurrency_mode(enum tQDF_ADAPTER_MODE mode) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } switch (mode) { - case CDF_STA_MODE: - case CDF_P2P_CLIENT_MODE: - case CDF_P2P_GO_MODE: - case CDF_SAP_MODE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_GO_MODE: + case QDF_SAP_MODE: hdd_ctx->no_of_open_sessions[mode]--; if (!(hdd_ctx->no_of_open_sessions[mode])) hdd_ctx->concurrency_mode &= (~(1 << mode)); @@ -3449,14 +3449,14 @@ void cds_clear_concurrency_mode(enum tCDF_ADAPTER_MODE mode) * * Return: None */ -static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) +static void cds_soc_set_pcl(enum tQDF_ADAPTER_MODE mode) { QDF_STATUS status; enum cds_con_mode con_mode; struct sir_pcl_list pcl; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -3464,19 +3464,19 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) pcl.pcl_len = 0; switch (mode) { - case CDF_STA_MODE: + case QDF_STA_MODE: con_mode = CDS_STA_MODE; break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: con_mode = CDS_P2P_CLIENT_MODE; break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: con_mode = CDS_P2P_GO_MODE; break; - case CDF_SAP_MODE: + case QDF_SAP_MODE: con_mode = CDS_SAP_MODE; break; - case CDF_IBSS_MODE: + case QDF_IBSS_MODE: con_mode = CDS_IBSS_MODE; break; default: @@ -3511,19 +3511,19 @@ static void cds_soc_set_pcl(enum tCDF_ADAPTER_MODE mode) * * Return: None */ -void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode, +void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, uint8_t session_id) { hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -3535,11 +3535,11 @@ void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode, */ cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); switch (mode) { - case CDF_STA_MODE: - case CDF_P2P_CLIENT_MODE: - case CDF_P2P_GO_MODE: - case CDF_SAP_MODE: - case CDF_IBSS_MODE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_GO_MODE: + case QDF_SAP_MODE: + case QDF_IBSS_MODE: hdd_ctx->no_of_active_sessions[mode]++; break; default: @@ -3552,7 +3552,7 @@ void cds_incr_active_session(enum tCDF_ADAPTER_MODE mode, * Let us set the PCL to the FW before updating the connection * info structure about the new connection. */ - if (mode == CDF_STA_MODE) { + if (mode == QDF_STA_MODE) { /* Set PCL of STA to the FW */ cds_soc_set_pcl(mode); cds_info("Set PCL of STA to FW"); @@ -3578,7 +3578,7 @@ enum cds_conc_next_action cds_need_opportunistic_upgrade(void) #ifdef QCA_WIFI_3_0_EMU hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return upgrade; @@ -3638,23 +3638,23 @@ done: static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) { struct cds_conc_connection_info info; - enum tCDF_ADAPTER_MODE pcl_mode; + enum tQDF_ADAPTER_MODE pcl_mode; switch (mode) { case CDS_STA_MODE: - pcl_mode = CDF_STA_MODE; + pcl_mode = QDF_STA_MODE; break; case CDS_SAP_MODE: - pcl_mode = CDF_SAP_MODE; + pcl_mode = QDF_SAP_MODE; break; case CDS_P2P_CLIENT_MODE: - pcl_mode = CDF_P2P_CLIENT_MODE; + pcl_mode = QDF_P2P_CLIENT_MODE; break; case CDS_P2P_GO_MODE: - pcl_mode = CDF_P2P_GO_MODE; + pcl_mode = QDF_P2P_GO_MODE; break; case CDS_IBSS_MODE: - pcl_mode = CDF_IBSS_MODE; + pcl_mode = QDF_IBSS_MODE; break; default: cds_err("Invalid mode to set PCL"); @@ -3682,20 +3682,20 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) * * Return: None */ -void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, +void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, uint8_t session_id) { QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -3746,19 +3746,19 @@ void cds_decr_session_set_pcl(enum tCDF_ADAPTER_MODE mode, * * Return: None */ -void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode, +void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, uint8_t session_id) { hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -3770,11 +3770,11 @@ void cds_decr_active_session(enum tCDF_ADAPTER_MODE mode, */ cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); switch (mode) { - case CDF_STA_MODE: - case CDF_P2P_CLIENT_MODE: - case CDF_P2P_GO_MODE: - case CDF_SAP_MODE: - case CDF_IBSS_MODE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_GO_MODE: + case QDF_SAP_MODE: + case QDF_IBSS_MODE: if (hdd_ctx->no_of_active_sessions[mode]) hdd_ctx->no_of_active_sessions[mode]--; break; @@ -3801,7 +3801,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) enum cds_conc_next_action action = CDS_NOP; cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -3835,7 +3835,7 @@ QDF_STATUS cds_deinit_policy_mgr(void) { cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return QDF_STATUS_E_FAILURE; @@ -3862,13 +3862,13 @@ QDF_STATUS cds_init_policy_mgr(void) hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return QDF_STATUS_E_FAILURE; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return QDF_STATUS_E_FAILURE; @@ -3889,7 +3889,7 @@ QDF_STATUS cds_init_policy_mgr(void) sme_register_hw_mode_trans_cb(hdd_ctx->hHal, cds_hw_mode_transition_cb); status = cdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, cds_dbs_opportunistic_timer_handler, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -4020,13 +4020,13 @@ QDF_STATUS cds_incr_connection_count(uint32_t vdev_id) hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; @@ -4087,7 +4087,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) struct wma_txrx_node *wma_conn_table_entry; cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; @@ -4294,7 +4294,7 @@ void cds_update_with_safe_channel_list(uint8_t *pcl_channels, uint32_t *len) uint32_t safe_channel_count = 0, current_channel_count = 0; if (len) { - current_channel_count = CDF_MIN(*len, MAX_NUM_CHAN); + current_channel_count = QDF_MIN(*len, MAX_NUM_CHAN); } else { cds_err("invalid number of channel length"); return; @@ -4362,7 +4362,7 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, uint8_t channel_list_5[MAX_NUM_CHAN] = {0}; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; @@ -4556,26 +4556,26 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, * * Return: true or false */ -bool cds_map_concurrency_mode(enum tCDF_ADAPTER_MODE *old_mode, +bool cds_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode, enum cds_con_mode *new_mode) { bool status = true; switch (*old_mode) { - case CDF_STA_MODE: + case QDF_STA_MODE: *new_mode = CDS_STA_MODE; break; - case CDF_SAP_MODE: + case QDF_SAP_MODE: *new_mode = CDS_SAP_MODE; break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: *new_mode = CDS_P2P_CLIENT_MODE; break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: *new_mode = CDS_P2P_GO_MODE; break; - case CDF_IBSS_MODE: + case QDF_IBSS_MODE: *new_mode = CDS_IBSS_MODE; break; default: @@ -4612,7 +4612,7 @@ QDF_STATUS cds_get_pcl(enum cds_con_mode mode, enum cds_conc_priority_mode conc_system_pref = 0; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; @@ -4756,7 +4756,7 @@ bool cds_allow_new_home_channel(uint8_t channel, uint32_t num_connections) #ifdef QCA_WIFI_3_0_EMU hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -4866,13 +4866,13 @@ bool cds_allow_concurrency(enum cds_con_mode mode, hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; @@ -5083,7 +5083,7 @@ enum cds_conc_priority_mode cds_get_first_connection_pcl_table_index(void) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return CDS_THROUGHPUT; @@ -5551,13 +5551,13 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id, hdd_context_t *hdd_ctx; QDF_STATUS status = QDF_STATUS_E_FAILURE; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; } - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); return QDF_STATUS_E_FAILURE; @@ -5712,7 +5712,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, return; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -5777,7 +5777,7 @@ QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, uint32_t conn_index = 0; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; @@ -5960,7 +5960,7 @@ static int __cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { cds_err("Command not allowed in FTM mode"); return -EPERM; } @@ -5992,7 +5992,7 @@ static int __cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, WIFI_FEATURE_P2P; /* Add more feature combinations here */ - feature_sets = CDF_MIN(feature_sets, max_feature_sets); + feature_sets = QDF_MIN(feature_sets, max_feature_sets); cds_info("Number of feature sets (%d)", feature_sets); cds_info("Feature set matrix"); for (i = 0; i < feature_sets; i++) @@ -6053,7 +6053,7 @@ uint32_t cds_get_concurrency_mode(void) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != hdd_ctx) { cds_info("concurrency_mode = 0x%x", hdd_ctx->concurrency_mode); @@ -6062,7 +6062,7 @@ uint32_t cds_get_concurrency_mode(void) /* we are in an invalid state :( */ cds_err("Invalid context"); - return CDF_STA_MASK; + return QDF_STA_MASK; } /** @@ -6114,7 +6114,7 @@ QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, uint8_t default_sap_channel = 6; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return QDF_STATUS_E_FAILURE; @@ -6199,7 +6199,7 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, QDF_STATUS status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return are_cc_channels_same; @@ -6270,7 +6270,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, bool ret; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return are_cc_channels_same; @@ -6292,7 +6292,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, */ if (false == are_cc_channels_same) { if (true == cds_is_sta_connection_pending()) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CLEAR_JOIN_REQ, sta_adapter->sessionId, *roam_id)); ret = sme_clear_joinreq_param( @@ -6305,7 +6305,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, cds_change_sta_conn_pending_status(false); cds_info("===>Clear pending join req"); } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STORE_JOIN_REQ, sta_adapter->sessionId, *roam_id)); /* store the scan cache here */ @@ -6379,7 +6379,7 @@ void cds_handle_conc_rule1(hdd_adapter_t *adapter, bool ret; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -6420,7 +6420,7 @@ bool cds_handle_conc_rule2(hdd_adapter_t *adapter, { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return false; @@ -6487,7 +6487,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, hdd_adapter_t *adapter; bool ret; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); return channel; @@ -6535,7 +6535,7 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel) hdd_adapter_t *adapter; bool ret; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("Invalid HDD context"); return false; @@ -6613,7 +6613,7 @@ void cds_restart_softap(hdd_adapter_t *pHostapdAdapter) tHddAvoidFreqList hdd_avoid_freq_list; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -6647,7 +6647,7 @@ void cds_force_sap_on_scc(eCsrRoamResult roam_result, hdd_adapter_t *hostapd_adapter; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -6695,7 +6695,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) CDF_MCC_TO_SCC_SWITCH_DISABLE) || !(cds_concurrent_open_sessions_running() || !(cds_get_concurrency_mode() == - (CDF_STA_MASK | CDF_SAP_MASK)))) + (QDF_STA_MASK | QDF_SAP_MASK)))) return; ap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); @@ -6738,7 +6738,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; @@ -6784,7 +6784,7 @@ uint8_t cds_is_mcc_in_24G(void) hdd_hostapd_state_t *hostapd_state; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return 1; @@ -6950,8 +6950,8 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, * Check if concurrency mode is active. * Need to modify this code to support MCC modes other than STA/P2P */ - if ((concurrent_state == (CDF_STA_MASK | CDF_P2P_CLIENT_MASK)) || - (concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK))) { + if ((concurrent_state == (QDF_STA_MASK | QDF_P2P_CLIENT_MASK)) || + (concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK))) { cds_info("STA & P2P are both enabled"); /* * The channel numbers for both adapters and the time @@ -6985,7 +6985,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, * iwpriv cmd was issued on wlan0; * get p2p0 vdev channel */ - if ((concurrent_state & CDF_P2P_CLIENT_MASK) != 0) { + if ((concurrent_state & QDF_P2P_CLIENT_MASK) != 0) { /* The 2nd MCC vdev is P2P client */ sta_adapter = hdd_get_adapter( hostapd_adapater->pHddCtx, @@ -7102,7 +7102,7 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, */ concurrent_state = cds_get_concurrency_mode(); - if (concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK)) { + if (concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK)) { cds_info("STA & P2P are both enabled"); /* @@ -7134,7 +7134,7 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, if (hostapd_adapter->device_mode == WLAN_HDD_INFRA_STATION) { /* iwpriv cmd issued on wlan0; get p2p0 vdev chan */ - if ((concurrent_state & CDF_P2P_CLIENT_MASK) != 0) { + if ((concurrent_state & QDF_P2P_CLIENT_MASK) != 0) { /* The 2nd MCC vdev is P2P client */ sta_adapter = hdd_get_adapter ( @@ -7219,8 +7219,8 @@ void cds_set_mcc_latency(hdd_adapter_t *adapter, int set_value) * Need to modify this code to support MCC modes other than STA/P2P */ concurrent_state = cds_get_concurrency_mode(); - if ((concurrent_state == (CDF_STA_MASK | CDF_P2P_CLIENT_MASK)) || - (concurrent_state == (CDF_STA_MASK | CDF_P2P_GO_MASK))) { + if ((concurrent_state == (QDF_STA_MASK | QDF_P2P_CLIENT_MASK)) || + (concurrent_state == (QDF_STA_MASK | QDF_P2P_GO_MASK))) { cds_info("STA & P2P are both enabled"); /* * The channel number and latency are formatted in @@ -7354,19 +7354,19 @@ void cds_check_and_restart_sap_with_non_dfs_acs(void) hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; } - if (cds_get_concurrency_mode() != (CDF_STA_MASK | CDF_SAP_MASK)) { + if (cds_get_concurrency_mode() != (QDF_STA_MASK | QDF_SAP_MASK)) { cds_info("Concurrency mode is not SAP"); return; } @@ -7398,7 +7398,7 @@ QDF_STATUS cds_update_connection_info_utfw( uint32_t conn_index = 0, found = 0; cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; @@ -7441,13 +7441,13 @@ QDF_STATUS cds_incr_connection_count_utfw( hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { cds_err("HDD context is NULL"); return status; } - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return status; @@ -7479,7 +7479,7 @@ QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, QDF_STATUS status; cds_context_type *cds_ctx; - cds_ctx = cds_get_context(CDF_MODULE_ID_CDF); + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return QDF_STATUS_E_FAILURE; @@ -7589,11 +7589,11 @@ enum cds_con_mode cds_convert_device_mode_to_hdd_type( * Return the connection mode parameter set by insmod or set during statically * linked driver * - * Return: enum tCDF_GLOBAL_CON_MODE + * Return: enum tQDF_GLOBAL_CON_MODE */ -enum tCDF_GLOBAL_CON_MODE cds_get_conparam(void) +enum tQDF_GLOBAL_CON_MODE cds_get_conparam(void) { - enum tCDF_GLOBAL_CON_MODE con_mode; + enum tQDF_GLOBAL_CON_MODE con_mode; con_mode = hdd_get_conparam(); return con_mode; } @@ -7612,9 +7612,9 @@ bool cds_concurrent_open_sessions_running(void) uint8_t j = 0; hdd_context_t *pHddCtx; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + for (i = 0; i < QDF_MAX_NO_OF_MODE; i++) j += pHddCtx->no_of_open_sessions[i]; } @@ -7635,11 +7635,11 @@ bool cds_concurrent_beaconing_sessions_running(void) uint8_t i = 0; hdd_context_t *pHddCtx; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) { - i = pHddCtx->no_of_open_sessions[CDF_SAP_MODE] + - pHddCtx->no_of_open_sessions[CDF_P2P_GO_MODE] + - pHddCtx->no_of_open_sessions[CDF_IBSS_MODE]; + i = pHddCtx->no_of_open_sessions[QDF_SAP_MODE] + + pHddCtx->no_of_open_sessions[QDF_P2P_GO_MODE] + + pHddCtx->no_of_open_sessions[QDF_IBSS_MODE]; } return i > 1; } @@ -7664,9 +7664,9 @@ bool cds_max_concurrent_connections_reached(void) uint8_t i = 0, j = 0; hdd_context_t *pHddCtx; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + for (i = 0; i < QDF_MAX_NO_OF_MODE; i++) j += pHddCtx->no_of_active_sessions[i]; return j > (pHddCtx->config-> @@ -7688,9 +7688,9 @@ void cds_clear_concurrent_session_count(void) uint8_t i = 0; hdd_context_t *pHddCtx; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) { - for (i = 0; i < CDF_MAX_NO_OF_MODE; i++) + for (i = 0; i < QDF_MAX_NO_OF_MODE; i++) pHddCtx->no_of_active_sessions[i] = 0; } } @@ -7708,9 +7708,9 @@ bool cds_is_multiple_active_sta_sessions(void) hdd_context_t *pHddCtx; uint8_t j = 0; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) - j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; + j = pHddCtx->no_of_active_sessions[QDF_STA_MODE]; return j > 1; } @@ -7727,9 +7727,9 @@ bool cds_is_sta_active_connection_exists(void) hdd_context_t *pHddCtx; uint8_t j = 0; - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL != pHddCtx) - j = pHddCtx->no_of_active_sessions[CDF_STA_MODE]; + j = pHddCtx->no_of_active_sessions[QDF_STA_MODE]; return j ? true : false; } diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index 70ba1629ebc7..e78fbec41da6 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -59,7 +59,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) { if (pMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return QDF_STATUS_E_FAILURE; } @@ -84,7 +84,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) inline void cds_mq_deinit(p_cds_mq_type pMq) { if (pMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return; } @@ -104,7 +104,7 @@ inline void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper) unsigned long flags; if ((pMq == NULL) || (pMsgWrapper == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return; } @@ -131,7 +131,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq) unsigned long flags; if (pMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return NULL; } @@ -139,7 +139,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq) spin_lock_irqsave(&pMq->mqLock, flags); if (list_empty(&pMq->mqList)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_WARN, "%s: CDS Message Queue is empty", __func__); } else { listptr = pMq->mqList.next; @@ -168,7 +168,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) unsigned long flags; if (pMq == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return QDF_STATUS_E_FAILURE; } @@ -195,12 +195,12 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) cds_context = cds_get_global_context(); if (NULL == cds_context) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: invalid cds_context", __func__); } else { - hHal = cds_get_context(CDF_MODULE_ID_SME); + hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: invalid hHal", __func__); } else { sirStatus = u_mac_post_ctrl_msg(hHal, pBuf); diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 4b527948b739..088ec9d69b20 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -63,7 +63,7 @@ /* protocol Storage Structure */ typedef struct { uint32_t order; - v_TIME_t event_time; + unsigned long event_time; char event_string[CDS_PKT_TRAC_MAX_STRING_LEN]; } cds_pkt_proto_trace_t; @@ -115,7 +115,7 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) /* Validate the parameter pointers */ if (unlikely((pPacket == NULL) || (pPacketSize == NULL)) || (pPacket->pkt_buf == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "VPKT [%d]: NULL pointer", __LINE__); return QDF_STATUS_E_INVAL; } @@ -154,7 +154,7 @@ uint8_t cds_pkt_get_proto_type(struct sk_buff *skb, uint8_t tracking_map, ether_type = (uint16_t) (*(uint16_t *) (skb->data + CDS_PKT_TRAC_ETH_TYPE_OFFSET)); - if (CDS_PKT_TRAC_EAPOL_ETH_TYPE == CDF_SWAP_U16(ether_type)) { + if (CDS_PKT_TRAC_EAPOL_ETH_TYPE == QDF_SWAP_U16(ether_type)) { pkt_proto_type |= CDS_PKT_TRAC_TYPE_EAPOL; } } @@ -168,10 +168,10 @@ uint8_t cds_pkt_get_proto_type(struct sk_buff *skb, uint8_t tracking_map, (skb->data + CDS_PKT_TRAC_IP_OFFSET + CDS_PKT_TRAC_IP_HEADER_SIZE + sizeof(uint16_t))); - if (((CDS_PKT_TRAC_DHCP_SRV_PORT == CDF_SWAP_U16(SPort)) - && (CDS_PKT_TRAC_DHCP_CLI_PORT == CDF_SWAP_U16(DPort))) - || ((CDS_PKT_TRAC_DHCP_CLI_PORT == CDF_SWAP_U16(SPort)) - && (CDS_PKT_TRAC_DHCP_SRV_PORT == CDF_SWAP_U16(DPort)))) { + if (((CDS_PKT_TRAC_DHCP_SRV_PORT == QDF_SWAP_U16(SPort)) + && (CDS_PKT_TRAC_DHCP_CLI_PORT == QDF_SWAP_U16(DPort))) + || ((CDS_PKT_TRAC_DHCP_CLI_PORT == QDF_SWAP_U16(SPort)) + && (CDS_PKT_TRAC_DHCP_SRV_PORT == QDF_SWAP_U16(DPort)))) { pkt_proto_type |= CDS_PKT_TRAC_TYPE_DHCP; } } @@ -191,7 +191,7 @@ void cds_pkt_trace_buf_update(char *event_string) { uint32_t slot; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s %d, %s", __func__, __LINE__, event_string); cdf_spinlock_acquire(&trace_buffer_lock); slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF; @@ -218,14 +218,14 @@ void cds_pkt_trace_buf_dump(void) uint32_t slot, idx; cdf_spinlock_acquire(&trace_buffer_lock); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP START Current Timestamp %u", (unsigned int)cdf_mc_timer_get_system_time()); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ORDER : TIME : EVT"); if (CDS_PKT_TRAC_MAX_TRACE_BUF > trace_buffer_order) { for (slot = 0; slot < trace_buffer_order; slot++) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%5d :%12u : %s", trace_buffer[slot].order, (unsigned int)trace_buffer[slot].event_time, @@ -236,14 +236,14 @@ void cds_pkt_trace_buf_dump(void) slot = (trace_buffer_order + idx) % CDS_PKT_TRAC_MAX_TRACE_BUF; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%5d :%12u : %s", trace_buffer[slot].order, (unsigned int)trace_buffer[slot].event_time, trace_buffer[slot].event_string); } } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP END"); cdf_spinlock_release(&trace_buffer_lock); @@ -275,7 +275,7 @@ void cds_pkt_proto_trace_init(void) ---------------------------------------------------------------------------*/ void cds_pkt_proto_trace_close(void) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s %d", __func__, __LINE__); cdf_mem_free(trace_buffer); cdf_spinlock_destroy(&trace_buffer_lock); diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 3bd1b4b36894..71879692ebd4 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -32,7 +32,7 @@ ============================================================================*/ #include -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_reg_service.h" #include "cdf_trace.h" #include "sme_api.h" @@ -426,9 +426,9 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -437,7 +437,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country) hdd_ctx->reg.def_country, CDS_COUNTRY_CODE_LEN + 1); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "default country is %c%c\n", default_country[0], default_country[1]); @@ -459,7 +459,7 @@ static enum channel_enum cds_get_channel_enum(uint32_t chan_num) if (chan_mapping[loop].chan_num == chan_num) return loop; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "invalid channel number %d", chan_num); return INVALID_RF_CHANNEL; @@ -603,7 +603,7 @@ QDF_STATUS cds_set_dfs_region(uint8_t dfs_region) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) return QDF_STATUS_E_EXISTS; @@ -643,7 +643,7 @@ QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) return QDF_STATUS_E_EXISTS; @@ -669,7 +669,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, struct wiphy *wiphy = NULL; if (NULL == reg_domain_ptr) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Invalid reg domain pointer")); return QDF_STATUS_E_FAULT; } @@ -680,21 +680,21 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, return QDF_STATUS_SUCCESS; if (NULL == country_alpha2) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Country code array is NULL")); return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "SSR in progress, return"); return QDF_STATUS_SUCCESS; } - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); return QDF_STATUS_E_FAULT; } @@ -751,9 +751,9 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, struct ieee80211_channel *chan; struct regulatory_channel *temp_chan_k, *temp_chan_n, *temp_chan; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -761,7 +761,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, hdd_ctx->isVHT80Allowed = 0; if (band_capability == eCSR_BAND_24) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "band capability is set to 2G only"); for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) { @@ -808,7 +808,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_DFS)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Remove passive scan restriction for %u", __func__, @@ -819,7 +819,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Remove passive scan restriction for %u", __func__, @@ -830,7 +830,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_NO_IBSS)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Remove no ibss restriction for %u", __func__, @@ -972,7 +972,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy, bool vht80_allowed; bool reset = false; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, FL("country: %c%c, initiator %d, dfs_region: %d"), request->alpha2[0], request->alpha2[1], @@ -980,13 +980,13 @@ void __hdd_reg_notifier(struct wiphy *wiphy, request->dfs_region); if (NULL == hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); return; } if (cds_is_driver_unloading() || cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unloading or SSR in Progress, Ignore!!!", __func__); return; @@ -1055,7 +1055,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy, vht80_allowed = hdd_ctx->isVHT80Allowed; if (cds_process_regulatory_data(wiphy, band_capability, reset) == 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, (" regulatory entry created")); } if (hdd_ctx->isVHT80Allowed != vht80_allowed) @@ -1105,9 +1105,9 @@ QDF_STATUS cds_regulatory_init(void) int ret_val = 0; struct regulatory *reg_info; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -1121,7 +1121,7 @@ QDF_STATUS cds_regulatory_init(void) if (cds_process_regulatory_data(wiphy, hdd_ctx->config-> nBandCapability, true) != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Error while creating regulatory entry")); return QDF_STATUS_E_FAULT; } @@ -1130,7 +1130,7 @@ QDF_STATUS cds_regulatory_init(void) ret_val = cds_fill_some_regulatory_info(reg_info); if (ret_val) { - cdf_print(KERN_ERR "Error in getting country code\n"); + qdf_print(KERN_ERR "Error in getting country code\n"); return ret_val; } @@ -1154,7 +1154,7 @@ QDF_STATUS cds_regulatory_init(void) QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) { if (reg_domain >= REGDOMAIN_COUNT) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "CDS set reg domain, invalid REG domain ID %d", reg_domain); return QDF_STATUS_E_INVAL; @@ -1174,9 +1174,9 @@ QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, chan_params_t *ch_params) { - tHalHandle *hal_ctx = cds_get_context(CDF_MODULE_ID_PE); + tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE); if (!hal_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ("Invalid hal_ctx pointer")); return; } diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index e3c897c81c82..78dd45612119 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011,2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011,2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -65,7 +65,7 @@ * SUCH DAMAGES. */ -#include +#include #include "wma.h" #include "cds_regdomain.h" #include "cds_regdomain_common.h" @@ -74,89 +74,89 @@ static regdm_supp_op_classes regdm_curr_supp_opp_classes = { 0 }; /* Global Operating Classes */ regdm_op_class_map_t global_op_class[] = { - {81, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}}, - {82, 25, BW20, {14}}, - {83, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9}}, - {84, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13}}, - {115, 20, BW20, {36, 40, 44, 48}}, - {116, 40, BW40_LOW_PRIMARY, {36, 44}}, - {117, 40, BW40_HIGH_PRIMARY, {40, 48}}, - {118, 20, BW20, {52, 56, 60, 64}}, - {119, 40, BW40_LOW_PRIMARY, {52, 60}}, - {120, 40, BW40_HIGH_PRIMARY, {56, 64}}, + {81, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} }, + {82, 25, BW20, {14} }, + {83, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9} }, + {84, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13} }, + {115, 20, BW20, {36, 40, 44, 48} }, + {116, 40, BW40_LOW_PRIMARY, {36, 44} }, + {117, 40, BW40_HIGH_PRIMARY, {40, 48} }, + {118, 20, BW20, {52, 56, 60, 64} }, + {119, 40, BW40_LOW_PRIMARY, {52, 60} }, + {120, 40, BW40_HIGH_PRIMARY, {56, 64} }, {121, 20, BW20, - {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}}, - {122, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}}, - {123, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, - {125, 20, BW20, {149, 153, 157, 161, 165, 169}}, - {126, 40, BW40_LOW_PRIMARY, {149, 157}}, - {127, 40, BW40_HIGH_PRIMARY, {153, 161}}, + {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, + {122, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} }, + {123, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} }, + {125, 20, BW20, {149, 153, 157, 161, 165, 169} }, + {126, 40, BW40_LOW_PRIMARY, {149, 157} }, + {127, 40, BW40_HIGH_PRIMARY, {153, 161} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144, 149, 153, 157, 161} }, - {0, 0, 0, {0}}, + {0, 0, 0, {0} }, }; /* Operating Classes in US */ regdm_op_class_map_t us_op_class[] = { - {1, 20, BW20, {36, 40, 44, 48}}, - {2, 20, BW20, {52, 56, 60, 64}}, + {1, 20, BW20, {36, 40, 44, 48} }, + {2, 20, BW20, {52, 56, 60, 64} }, {4, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144} }, - {5, 20, BW20, {149, 153, 157, 161, 165}}, - {12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}}, - {22, 40, BW40_LOW_PRIMARY, {36, 44}}, - {23, 40, BW40_LOW_PRIMARY, {52, 60}}, - {24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}}, - {26, 40, BW40_LOW_PRIMARY, {149, 157}}, - {27, 40, BW40_HIGH_PRIMARY, {40, 48}}, - {28, 40, BW40_HIGH_PRIMARY, {56, 64}}, - {29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, - {31, 40, BW40_HIGH_PRIMARY, {153, 161}}, - {32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7}}, - {33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11}}, + {5, 20, BW20, {149, 153, 157, 161, 165} }, + {12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11} }, + {22, 40, BW40_LOW_PRIMARY, {36, 44} }, + {23, 40, BW40_LOW_PRIMARY, {52, 60} }, + {24, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} }, + {26, 40, BW40_LOW_PRIMARY, {149, 157} }, + {27, 40, BW40_HIGH_PRIMARY, {40, 48} }, + {28, 40, BW40_HIGH_PRIMARY, {56, 64} }, + {29, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} }, + {31, 40, BW40_HIGH_PRIMARY, {153, 161} }, + {32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7} }, + {33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144, 149, 153, 157, 161} }, - {0, 0, 0, {0}}, + {0, 0, 0, {0} }, }; /* Operating Classes in Europe */ regdm_op_class_map_t euro_op_class[] = { - {1, 20, BW20, {36, 40, 44, 48}}, - {2, 20, BW20, {52, 56, 60, 64}}, - {3, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}}, - {4, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}}, - {5, 40, BW40_LOW_PRIMARY, {36, 44}}, - {6, 40, BW40_LOW_PRIMARY, {52, 60}}, - {7, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}}, - {8, 40, BW40_HIGH_PRIMARY, {40, 48}}, - {9, 40, BW40_HIGH_PRIMARY, {56, 64}}, - {10, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, - {11, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9}}, - {12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13}}, - {17, 20, BW20, {149, 153, 157, 161, 165, 169}}, + {1, 20, BW20, {36, 40, 44, 48} }, + {2, 20, BW20, {52, 56, 60, 64} }, + {3, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, + {4, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} }, + {5, 40, BW40_LOW_PRIMARY, {36, 44} }, + {6, 40, BW40_LOW_PRIMARY, {52, 60} }, + {7, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} }, + {8, 40, BW40_HIGH_PRIMARY, {40, 48} }, + {9, 40, BW40_HIGH_PRIMARY, {56, 64} }, + {10, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} }, + {11, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9} }, + {12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13} }, + {17, 20, BW20, {149, 153, 157, 161, 165, 169} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128} }, - {0, 0, 0, {0}}, + {0, 0, 0, {0} }, }; /* Operating Classes in Japan */ regdm_op_class_map_t japan_op_class[] = { - {1, 20, BW20, {36, 40, 44, 48}}, - {30, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}}, - {31, 25, BW20, {14}}, - {32, 20, BW20, {52, 56, 60, 64}}, - {34, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}}, - {36, 40, BW40_LOW_PRIMARY, {36, 44}}, - {37, 40, BW40_LOW_PRIMARY, {52, 60}}, - {39, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132}}, - {41, 40, BW40_HIGH_PRIMARY, {40, 48}}, - {42, 40, BW40_HIGH_PRIMARY, {56, 64}}, - {44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136}}, + {1, 20, BW20, {36, 40, 44, 48} }, + {30, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} }, + {31, 25, BW20, {14} }, + {32, 20, BW20, {52, 56, 60, 64} }, + {34, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, + {36, 40, BW40_LOW_PRIMARY, {36, 44} }, + {37, 40, BW40_LOW_PRIMARY, {52, 60} }, + {39, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} }, + {41, 40, BW40_HIGH_PRIMARY, {40, 48} }, + {42, 40, BW40_HIGH_PRIMARY, {56, 64} }, + {44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128} }, - {0, 0, 0, {0}}, + {0, 0, 0, {0} }, }; /* @@ -168,9 +168,9 @@ HAL_REG_DMN_TABLES ol_regdmn_rdt = { ah_cmn_reg_domain_pairs, /* regDomainPairs */ ah_cmn_all_countries, /* allCountries */ ah_cmn_reg_domains, /* allRegDomains */ - CDF_ARRAY_SIZE(ah_cmn_reg_domain_pairs), /* regDomainPairsCt */ - CDF_ARRAY_SIZE(ah_cmn_all_countries), /* allCountriesCt */ - CDF_ARRAY_SIZE(ah_cmn_reg_domains), /* allRegDomainCt */ + QDF_ARRAY_SIZE(ah_cmn_reg_domain_pairs), /* regDomainPairsCt */ + QDF_ARRAY_SIZE(ah_cmn_all_countries), /* allCountriesCt */ + QDF_ARRAY_SIZE(ah_cmn_reg_domains), /* allRegDomainCt */ }; static uint16_t get_eeprom_rd(uint16_t rd) @@ -197,7 +197,7 @@ static bool regdmn_is_eeprom_valid(uint16_t rd) return true; } /* TODO: Bring it under debug level */ - cdf_print("%s: invalid regulatory domain/country code 0x%x\n", + qdf_print("%s: invalid regulatory domain/country code 0x%x\n", __func__, rd); return false; } @@ -329,7 +329,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) country = find_country(country_code); if (!country) { /* TODO: Bring it under debug level */ - cdf_print(KERN_ERR "Not a valid country code\n"); + qdf_print(KERN_ERR "Not a valid country code\n"); return -EINVAL; } regdmn = country->regDmnEnum; @@ -338,7 +338,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) reg->regpair = get_regdmn_pair(regdmn); if (!reg->regpair) { /* TODO: Bring it under debug level */ - cdf_print(KERN_ERR "No regpair is found, can not proceeed\n"); + qdf_print(KERN_ERR "No regpair is found, can not proceeed\n"); return -EINVAL; } reg->country_code = country_code; @@ -464,13 +464,13 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, regpair = reg->regpair; regdomain2G = get_regdmn(regpair->regDmn2GHz); if (!regdomain2G) { - cdf_print(KERN_ERR "Failed to get regdmn 2G"); + qdf_print(KERN_ERR "Failed to get regdmn 2G"); return; } regdomain5G = get_regdmn(regpair->regDmn5GHz); if (!regdomain5G) { - cdf_print(KERN_ERR "Failed to get regdmn 5G"); + qdf_print(KERN_ERR "Failed to get regdmn 5G"); return; } @@ -484,7 +484,7 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, modesAvail = regdmn_getwmodesnreg(modesAvail, country, regdomain5G); - for (cm = modes; cm < &modes[CDF_ARRAY_SIZE(modes)]; cm++) { + for (cm = modes; cm < &modes[QDF_ARRAY_SIZE(modes)]; cm++) { if ((cm->mode & modeSelect) == 0) continue; @@ -531,7 +531,7 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, ctl = rd->conformance_test_limit | CTL_108G; break; default: - cdf_print(KERN_ERR "%s: Unkonwn HAL mode 0x%x\n", + qdf_print(KERN_ERR "%s: Unkonwn HAL mode 0x%x\n", __func__, cm->mode); continue; } @@ -559,20 +559,20 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, */ void cds_set_wma_dfs_region(struct regulatory *reg) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { - cdf_print(KERN_ERR "%s: Unable to get WMA handle", __func__); + qdf_print(KERN_ERR "%s: Unable to get WMA handle", __func__); return; } - cdf_print("%s: dfs_region: %d", __func__, reg->dfs_region); + qdf_print("%s: dfs_region: %d", __func__, reg->dfs_region); wma_set_dfs_region(wma, reg->dfs_region); } void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); uint32_t modeSelect = 0xFFFFFFFF; if (!wma) { @@ -617,7 +617,7 @@ uint16_t cds_get_regdmn_5g(uint32_t reg_dmn) return ol_regdmn_rdt.regDomainPairs[i].regDmn5GHz; } } - cdf_print("%s: invalid regulatory domain/country code 0x%x\n", + qdf_print("%s: invalid regulatory domain/country code 0x%x\n", __func__, reg_dmn); return 0; } @@ -707,7 +707,7 @@ uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class) uint8_t i; if (SIR_MAC_MAX_SUPP_OPER_CLASSES < num_classes) { - cdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n", + qdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n", __func__, num_classes); return -1; } @@ -728,7 +728,7 @@ uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class) uint8_t i; if (!num_classes || !class) { - cdf_print(KERN_ERR "%s: Either num_classes or class is null\n", + qdf_print(KERN_ERR "%s: Either num_classes or class is null\n", __func__); return -1; } diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index ff22f1a8a8d9..9b331b3e7427 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -124,7 +124,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block, return NOTIFY_OK; num_cpus = num_possible_cpus(); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_LOW, "%s: RX CORE %d, STATE %d, NUM CPUS %d", __func__, (int)affine_cpu, (int)state, num_cpus); multi_cluster = (num_cpus > CDS_CORE_PER_CLUSTER) ? 1 : 0; @@ -191,16 +191,16 @@ QDF_STATUS cds_sched_open(void *p_cds_context, uint32_t SchedCtxSize) { QDF_STATUS vStatus = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening the CDS Scheduler", __func__); /* Sanity checks */ if ((p_cds_context == NULL) || (pSchedContext == NULL)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } if (sizeof(cds_sched_context) != SchedCtxSize) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Incorrect CDS Sched Context size passed", __func__); return QDF_STATUS_E_INVAL; @@ -209,7 +209,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context, pSchedContext->pVContext = p_cds_context; vStatus = cds_sched_init_mqs(pSchedContext); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS Scheduler MQs", __func__); return vStatus; @@ -252,13 +252,13 @@ QDF_STATUS cds_sched_open(void *p_cds_context, pSchedContext->McThread = kthread_create(cds_mc_thread, pSchedContext, "cds_mc_thread"); if (IS_ERR(pSchedContext->McThread)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Could not Create CDS Main Thread Controller", __func__); goto MC_THREAD_START_FAILURE; } wake_up_process(pSchedContext->McThread); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Main Controller thread Created", __func__); #ifdef QCA_CONFIG_SMP @@ -267,14 +267,14 @@ QDF_STATUS cds_sched_open(void *p_cds_context, "cds_ol_rx_thread"); if (IS_ERR(pSchedContext->ol_rx_thread)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Could not Create CDS OL RX Thread", __func__); goto OL_RX_THREAD_START_FAILURE; } wake_up_process(pSchedContext->ol_rx_thread); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, ("CDS OL RX thread Created")); #endif /* @@ -282,15 +282,15 @@ QDF_STATUS cds_sched_open(void *p_cds_context, * Each thread should normally ACK back when it starts. */ wait_for_completion_interruptible(&pSchedContext->McStartEvent); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS MC Thread has started", __func__); #ifdef QCA_CONFIG_SMP wait_for_completion_interruptible(&pSchedContext->ol_rx_start_event); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS OL Rx Thread has started", __func__); #endif /* We're good now: Let's get the ball rolling!!! */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Scheduler successfully Opened", __func__); return QDF_STATUS_SUCCESS; @@ -336,7 +336,7 @@ static int cds_mc_thread(void *Arg) v_CONTEXT_t p_cds_context = NULL; if (Arg == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Bad Args passed", __func__); return 0; } @@ -346,21 +346,21 @@ static int cds_mc_thread(void *Arg) * has been created */ complete(&pSchedContext->McStartEvent); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: MC Thread %d (%s) starting up", __func__, current->pid, current->comm); /* Get the Global CDS Context */ p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", __func__); return 0; } - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); return 0; } @@ -375,7 +375,7 @@ static int cds_mc_thread(void *Arg) &pSchedContext->mcEventFlag)); if (retWaitStatus == -ERESTARTSYS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: wait_event_interruptible returned -ERESTARTSYS", __func__); CDF_BUG(0); @@ -387,7 +387,7 @@ static int cds_mc_thread(void *Arg) if (test_bit (MC_SHUTDOWN_EVENT_MASK, &pSchedContext->mcEventFlag)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: MC thread signaled to shutdown", __func__); @@ -407,14 +407,14 @@ static int cds_mc_thread(void *Arg) /* Check the SYS queue first */ if (!cds_is_mq_empty(&pSchedContext->sysMcMq)) { /* Service the SYS message queue */ - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS SYS MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq); if (pMsgWrapper == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); @@ -425,7 +425,7 @@ static int cds_mc_thread(void *Arg) sys_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SYS message", __func__); @@ -438,14 +438,14 @@ static int cds_mc_thread(void *Arg) /* Check the WMA queue */ if (!cds_is_mq_empty(&pSchedContext->wmaMcMq)) { /* Service the WMA message queue */ - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS WMA MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq); if (pMsgWrapper == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); @@ -456,7 +456,7 @@ static int cds_mc_thread(void *Arg) wma_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing WMA message", __func__); @@ -469,14 +469,14 @@ static int cds_mc_thread(void *Arg) /* Check the PE queue */ if (!cds_is_mq_empty(&pSchedContext->peMcMq)) { /* Service the PE message queue */ - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS PE MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq); if (NULL == pMsgWrapper) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); @@ -486,9 +486,9 @@ static int cds_mc_thread(void *Arg) /* Need some optimization */ pMacContext = - cds_get_context(CDF_MODULE_ID_PE); + cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMacContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "MAC Context not ready yet"); cds_core_return_msg @@ -502,7 +502,7 @@ static int cds_mc_thread(void *Arg) (tSirMsgQ *) pMsgWrapper->pVosMsg); if (eSIR_SUCCESS != macStatus) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing PE message", __func__); @@ -515,14 +515,14 @@ static int cds_mc_thread(void *Arg) /** Check the SME queue **/ if (!cds_is_mq_empty(&pSchedContext->smeMcMq)) { /* Service the SME message queue */ - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS SME MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq); if (NULL == pMsgWrapper) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); @@ -532,9 +532,9 @@ static int cds_mc_thread(void *Arg) /* Need some optimization */ pMacContext = - cds_get_context(CDF_MODULE_ID_SME); + cds_get_context(QDF_MODULE_ID_SME); if (NULL == pMacContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "MAC Context not ready yet"); cds_core_return_msg @@ -547,7 +547,7 @@ static int cds_mc_thread(void *Arg) sme_process_msg((tHalHandle) pMacContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SME message", __func__); @@ -579,7 +579,7 @@ static int cds_mc_thread(void *Arg) } /* while message loop processing */ } /* while true */ /* If we get here the MC thread must exit */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: MC Thread exiting!!!!", __func__); complete_and_exit(&pSchedContext->McShutdown, 0); } /* cds_mc_thread() */ @@ -627,7 +627,7 @@ static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) for (i = 0; i < CDS_MAX_OL_RX_PKT; i++) { pkt = cdf_mem_malloc(sizeof(*pkt)); if (!pkt) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s Vos packet allocation for ol rx thread failed", __func__); goto free; @@ -822,7 +822,7 @@ static int cds_ol_rx_thread(void *arg) affine_cpu = pref_cpu; if (!arg) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Bad Args passed", __func__); return 0; } @@ -852,7 +852,7 @@ static int cds_ol_rx_thread(void *arg) complete (&pSchedContext->ol_suspend_rx_event); } - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Shutting down OL RX Thread", __func__); @@ -877,7 +877,7 @@ static int cds_ol_rx_thread(void *arg) } } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Exiting CDS OL rx thread", __func__); complete_and_exit(&pSchedContext->ol_rx_shutdown, 0); } @@ -897,10 +897,10 @@ static int cds_ol_rx_thread(void *arg) */ QDF_STATUS cds_sched_close(void *p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: invoked", __func__); if (gp_cds_sched_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); return QDF_STATUS_E_FAILURE; } @@ -944,38 +944,38 @@ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) { QDF_STATUS vStatus = QDF_STATUS_SUCCESS; /* Now intialize all the message queues */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the WMA MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->wmaMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init WMA MC Message queue", __func__); CDF_ASSERT(0); return vStatus; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the PE MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->peMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init PE MC Message queue", __func__); CDF_ASSERT(0); return vStatus; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SME MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->smeMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SME MC Message queue", __func__); CDF_ASSERT(0); return vStatus; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SYS MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->sysMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init SYS MC Message queue", __func__); CDF_ASSERT(0); return vStatus; @@ -995,19 +995,19 @@ void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext) /* Now de-intialize all message queues */ /* MC WMA */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the WMA MC Message queue", __func__); cds_mq_deinit(&pSchedContext->wmaMcMq); /* MC PE */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the PE MC Message queue", __func__); cds_mq_deinit(&pSchedContext->peMcMq); /* MC SME */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the SME MC Message queue", __func__); cds_mq_deinit(&pSchedContext->smeMcMq); /* MC SYS */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the SYS MC Message queue", __func__); cds_mq_deinit(&pSchedContext->sysMcMq); @@ -1028,26 +1028,26 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) * Core. Before returning a wrapper to the Core, the CDS message shall * be freed first */ - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, ("Flushing the MC Thread message queue")); if (NULL == pSchedContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: pSchedContext is NULL", __func__); return; } cds_ctx = (p_cds_contextType) (pSchedContext->pVContext); if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: cds_ctx is NULL", __func__); return; } /* Flush the SYS Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq))) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Freeing MC SYS message type %d ", __func__, pMsgWrapper->pVosMsg->type); @@ -1056,7 +1056,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) /* Flush the WMA Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq))) { if (pMsgWrapper->pVosMsg != NULL) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Freeing MC WMA MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); if (pMsgWrapper->pVosMsg->bodyptr) { @@ -1073,7 +1073,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) /* Flush the PE Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq))) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Freeing MC PE MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); @@ -1083,7 +1083,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) } /* Flush the SME Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq))) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Freeing MC SME MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); @@ -1101,7 +1101,7 @@ p_cds_sched_context get_cds_sched_ctxt(void) { /* Make sure that Vos Scheduler context has been initialized */ if (gp_cds_sched_context == NULL) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); return gp_cds_sched_context; @@ -1143,7 +1143,7 @@ static void cds_print_external_threads(void) while (i < MAX_SSR_PROTECT_LOG) { if (!ssr_protect_log[i].free) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PID %d is stuck at %s", ssr_protect_log[i].pid, ssr_protect_log[i].func); } @@ -1186,7 +1186,7 @@ void cds_ssr_protect(const char *caller_func) spin_unlock_irqrestore(&ssr_protect_lock, irq_flags); if (!status) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Could not track PID %d call %s: log is full", current->pid, caller_func); } @@ -1225,7 +1225,7 @@ void cds_ssr_unprotect(const char *caller_func) spin_unlock_irqrestore(&ssr_protect_lock, irq_flags); if (!status) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Untracked call %s", caller_func); } @@ -1247,7 +1247,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func) break; if (--count) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Waiting for active entry points to exit", __func__); msleep(SSR_WAIT_SLEEP_TIME); @@ -1259,7 +1259,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func) return false; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "Allowing SSR/Driver unload for %s", caller_func); return true; diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index 048061fe1383..2b232e37d6e0 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -358,7 +358,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, /* Check if frame is invalid length */ if (((efrm - frm) != frmLen) || (frmLen < sizeof(*wh))) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Invalid frame length", __func__); return false; } @@ -388,14 +388,14 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, if (IS_ERR(tfm)) { ret = PTR_ERR(tfm); tfm = NULL; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: crypto_alloc_cipher failed (%d)", __func__, ret); goto err_tfm; } ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: crypto_cipher_setkey failed (%d)", __func__, ret); goto err_tfm; @@ -418,7 +418,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, nBytes = AAD_LEN + (frmLen - sizeof(struct ieee80211_frame)); input = (uint8_t *) cdf_mem_malloc(nBytes); if (NULL == input) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation failed", __func__); ret = QDF_STATUS_E_NOMEM; goto err_tfm; @@ -439,7 +439,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, cds_cmac_calc_mic(tfm, input, nBytes, mic); cdf_mem_free(input); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); @@ -467,7 +467,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Check if frame is invalid length */ if ((efrm < frm) || ((efrm - frm) < sizeof(*wh))) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Invalid frame length"); return false; } @@ -477,7 +477,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Check Element ID */ if ((mmie->element_id != IEEE80211_ELEMID_MMIE) || (mmie->length != (sizeof(*mmie) - 2))) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "IE is not Mgmt MIC IE or Invalid length"); /* IE is not Mgmt MIC IE or invalid length */ return false; @@ -487,7 +487,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) rx_ipn = mmie->sequence_number; if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) <= 0) { /* Replay error */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Replay error mmie ipn %02X %02X %02X %02X %02X %02X" " drvr ipn %02X %02X %02X %02X %02X %02X", rx_ipn[0], rx_ipn[1], rx_ipn[2], rx_ipn[3], rx_ipn[4], @@ -499,14 +499,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) if (IS_ERR(tfm)) { ret = PTR_ERR(tfm); tfm = NULL; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_alloc_cipher failed (%d)", ret); goto err_tfm; } ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed (%d)", ret); goto err_tfm; } @@ -528,7 +528,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) nBytes = AAD_LEN + (efrm - (uint8_t *) (wh + 1)); input = (uint8_t *) cdf_mem_malloc(nBytes); if (NULL == input) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Memory allocation failed"); ret = QDF_STATUS_E_NOMEM; goto err_tfm; @@ -543,14 +543,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) cds_cmac_calc_mic(tfm, input, nBytes, mic); cdf_mem_free(input); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) != 0) { /* MMIE MIC mismatch */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "BC/MC MGMT frame MMIE MIC check Failed" " rmic %02X %02X %02X %02X %02X %02X %02X %02X" " cmic %02X %02X %02X %02X %02X %02X %02X %02X", @@ -630,7 +630,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, tfm = cds_crypto_alloc_ahash("hmac(sha1)", CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_AHASH_MASK); if (IS_ERR(tfm)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_alloc_ahash failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -638,7 +638,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, req = ahash_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "failed to allocate request for hmac(sha1)"); ret = -ENOMEM; goto err_req; @@ -649,7 +649,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, hash_buff = kzalloc(psize, GFP_KERNEL); if (!hash_buff) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "failed to kzalloc hash_buff"); ret = -ENOMEM; goto err_hash_buf; @@ -663,7 +663,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, crypto_ahash_clear_flags(tfm, ~0); ret = cds_crypto_ahash_setkey(tfm, key, ksize); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_ahash_setkey failed"); goto err_setkey; } @@ -671,7 +671,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, ahash_request_set_crypt(req, &sg, hash_result, psize); ret = cds_crypto_ahash_digest(req); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); switch (ret) { case 0: @@ -687,7 +687,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, INIT_COMPLETION(tresult.completion); break; } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "wait_for_completion_interruptible failed"); if (!ret) ret = tresult.err; @@ -726,7 +726,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ ); if (ret != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "hmac_sha1() call failed"); return QDF_STATUS_E_FAULT; } @@ -791,7 +791,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, tfm = cds_crypto_alloc_ahash("hmac(md5)", CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_AHASH_MASK); if (IS_ERR(tfm)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_alloc_ahash failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -799,7 +799,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, req = ahash_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "failed to allocate request for hmac(md5)"); ret = -ENOMEM; goto err_req; @@ -810,7 +810,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, hash_buff = kzalloc(psize, GFP_KERNEL); if (!hash_buff) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "failed to kzalloc hash_buff"); ret = -ENOMEM; goto err_hash_buf; @@ -824,7 +824,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, crypto_ahash_clear_flags(tfm, ~0); ret = cds_crypto_ahash_setkey(tfm, key, ksize); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_ahash_setkey failed"); goto err_setkey; } @@ -833,7 +833,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, ahash_request_set_crypt(req, &sg, hash_result, psize); ret = cds_crypto_ahash_digest(req); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); switch (ret) { case 0: @@ -847,7 +847,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, INIT_COMPLETION(tresult.completion); break; } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "wait_for_completion_interruptible failed"); if (!ret) ret = tresult.err; @@ -886,7 +886,7 @@ QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ ); if (ret != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "hmac_md5() call failed"); return QDF_STATUS_E_FAULT; } @@ -951,7 +951,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0); if (IS_ERR(tfm)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_alloc_ablkcipher failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -959,7 +959,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ req = ablkcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate request for cbc(aes)"); ret = -ENOMEM; goto err_req; @@ -972,7 +972,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed"); goto err_setkey; } @@ -995,7 +995,7 @@ err_req: err_tfm: /* return ret; */ if (ret != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); return QDF_STATUS_E_FAULT; } @@ -1047,7 +1047,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0); if (IS_ERR(tfm)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_alloc_ablkcipher failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -1055,7 +1055,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ req = ablkcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate request for cbc(aes)"); ret = -ENOMEM; goto err_req; @@ -1068,7 +1068,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed"); goto err_setkey; } @@ -1091,7 +1091,7 @@ err_req: err_tfm: /* return ret; */ if (ret != 0) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); return QDF_STATUS_E_FAULT; } diff --git a/core/cds/src/i_cds_packet.h b/core/cds/src/i_cds_packet.h index 0a0e3a69f757..c21c70ac5bac 100644 --- a/core/cds/src/i_cds_packet.h +++ b/core/cds/src/i_cds_packet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __I_CDS_PACKET_H ) +#if !defined(__I_CDS_PACKET_H) #define __I_CDS_PACKET_H /**========================================================================= @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_types.h" +#include "qdf_types.h" /** * Rx Packet Struct * Buffer for the packet received from WMA has pointers to 802.11 @@ -76,9 +76,9 @@ typedef struct { uint32_t mpdu_len; uint32_t mpdu_hdr_len; uint32_t mpdu_data_len; - uint8_t offloadScanLearn : 1; - uint8_t roamCandidateInd : 1; - uint8_t scan : 1; + uint8_t offloadScanLearn:1; + uint8_t roamCandidateInd:1; + uint8_t scan:1; uint8_t scan_src; uint8_t dpuFeedback; uint8_t sessionId; diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 8c570a048fbb..c4d4195e8de9 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -35,7 +35,7 @@ */ #include /* cdf_mem_malloc */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ #include /* htt_tx_msdu_desc_t */ #include @@ -127,7 +127,7 @@ void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev) while (pkt) { next = pkt->u.next; netbuf = (cdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext); - cdf_nbuf_unmap(pdev->osdev, netbuf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(netbuf); cdf_mem_free(pkt); pkt = next; @@ -148,7 +148,7 @@ void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev) htt_pdev_handle htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, ol_pdev_handle ctrl_pdev, - HTC_HANDLE htc_pdev, cdf_device_t osdev) + HTC_HANDLE htc_pdev, qdf_device_t osdev) { struct htt_pdev_t *pdev; @@ -171,12 +171,12 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, pdev->cfg.is_full_reorder_offload = ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev); - cdf_print("is_full_reorder_offloaded? %d\n", + qdf_print("is_full_reorder_offloaded? %d\n", (int)pdev->cfg.is_full_reorder_offload); pdev->cfg.ce_classify_enabled = ol_cfg_is_ce_classify_enabled(ctrl_pdev); - cdf_print("ce_classify_enabled %d\n", + qdf_print("ce_classify_enabled %d\n", pdev->cfg.ce_classify_enabled); pdev->targetdef = htc_get_targetdef(htc_pdev); @@ -254,7 +254,7 @@ htt_attach(struct htt_pdev_t *pdev, int desc_pool_size) } else if (frm_type == wlan_frm_fmt_802_3) { pdev->download_len = HTT_TX_HDR_SIZE_ETHERNET; } else { - cdf_print("Unexpected frame type spec: %d\n", frm_type); + qdf_print("Unexpected frame type spec: %d\n", frm_type); HTT_ASSERT0(0); } /* @@ -441,22 +441,22 @@ int htt_htc_attach(struct htt_pdev_t *pdev) #if HTT_DEBUG_LEVEL > 5 void htt_display(htt_pdev_handle pdev, int indent) { - cdf_print("%*s%s:\n", indent, " ", "HTT"); - cdf_print("%*stx desc pool: %d elems of %d bytes, %d allocated\n", + qdf_print("%*s%s:\n", indent, " ", "HTT"); + qdf_print("%*stx desc pool: %d elems of %d bytes, %d allocated\n", indent + 4, " ", pdev->tx_descs.pool_elems, pdev->tx_descs.size, pdev->tx_descs.alloc_cnt); - cdf_print("%*srx ring: space for %d elems, filled with %d buffers\n", + qdf_print("%*srx ring: space for %d elems, filled with %d buffers\n", indent + 4, " ", pdev->rx_ring.size, pdev->rx_ring.fill_level); - cdf_print("%*sat %p (%#x paddr)\n", indent + 8, " ", + qdf_print("%*sat %p (%#x paddr)\n", indent + 8, " ", pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr); - cdf_print("%*snetbuf ring @ %p\n", indent + 8, " ", + qdf_print("%*snetbuf ring @ %p\n", indent + 8, " ", pdev->rx_ring.buf.netbufs_ring); - cdf_print("%*sFW_IDX shadow register: vaddr = %p, paddr = %#x\n", + qdf_print("%*sFW_IDX shadow register: vaddr = %p, paddr = %#x\n", indent + 8, " ", pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.alloc_idx.paddr); - cdf_print("%*sSW enqueue idx= %d, SW dequeue idx: desc= %d, buf= %d\n", + qdf_print("%*sSW enqueue idx= %d, SW dequeue idx: desc= %d, buf= %d\n", indent + 8, " ", *pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.sw_rd_idx.msdu_desc, pdev->rx_ring.sw_rd_idx.msdu_payld); @@ -488,7 +488,7 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev) ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev), ol_cfg_ipa_uc_tx_partition_base(pdev->ctrl_pdev)); if (error) { - cdf_print("HTT IPA UC TX attach fail code %d\n", error); + qdf_print("HTT IPA UC TX attach fail code %d\n", error); HTT_ASSERT0(0); return error; } @@ -498,7 +498,7 @@ int htt_ipa_uc_attach(struct htt_pdev_t *pdev) pdev, ol_cfg_ipa_uc_rx_ind_ring_size(pdev->ctrl_pdev)); if (error) { - cdf_print("HTT IPA UC RX attach fail code %d\n", error); + qdf_print("HTT IPA UC RX attach fail code %d\n", error); htt_tx_ipa_uc_detach(pdev); HTT_ASSERT0(0); return error; @@ -544,19 +544,19 @@ void htt_ipa_uc_detach(struct htt_pdev_t *pdev) */ int htt_ipa_uc_get_resource(htt_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx_paddr, + qdf_dma_addr_t *rx2_proc_done_idx_paddr, void **rx2_proc_done_idx_vaddr) { /* Release allocated resource to client */ @@ -598,8 +598,8 @@ htt_ipa_uc_get_resource(htt_pdev_handle pdev, */ int htt_ipa_uc_set_doorbell_paddr(htt_pdev_handle pdev, - cdf_dma_addr_t ipa_uc_tx_doorbell_paddr, - cdf_dma_addr_t ipa_uc_rx_doorbell_paddr) + qdf_dma_addr_t ipa_uc_tx_doorbell_paddr, + qdf_dma_addr_t ipa_uc_rx_doorbell_paddr) { pdev->ipa_uc_tx_rsc.tx_comp_idx_paddr = ipa_uc_tx_doorbell_paddr; pdev->ipa_uc_rx_rsc.rx_rdy_idx_paddr = ipa_uc_rx_doorbell_paddr; diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c index aee627d0e617..da6324a8dae0 100644 --- a/core/dp/htt/htt_fw_stats.c +++ b/core/dp/htt/htt_fw_stats.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -62,11 +62,11 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"}; { \ int i; \ \ - cdf_print("TX Rate Info:\n"); \ + qdf_print("TX Rate Info:\n"); \ \ /* MCS */ \ - cdf_print("MCS counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("MCS counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _tx_rate_info->mcs[0], \ _tx_rate_info->mcs[1], \ _tx_rate_info->mcs[2], \ @@ -79,8 +79,8 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"}; _tx_rate_info->mcs[9]); \ \ /* SGI */ \ - cdf_print("SGI counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("SGI counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _tx_rate_info->sgi[0], \ _tx_rate_info->sgi[1], \ _tx_rate_info->sgi[2], \ @@ -93,32 +93,32 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"}; _tx_rate_info->sgi[9]); \ \ /* NSS */ \ - cdf_print("NSS counts: "); \ - cdf_print("1x1 %d, 2x2 %d, 3x3 %d\n", \ + qdf_print("NSS counts: "); \ + qdf_print("1x1 %d, 2x2 %d, 3x3 %d\n", \ _tx_rate_info->nss[0], \ _tx_rate_info->nss[1], _tx_rate_info->nss[2]);\ \ /* BW */ \ - cdf_print("BW counts: "); \ + qdf_print("BW counts: "); \ \ for (i = 0; \ i < sizeof(_tx_rate_info->bw) / sizeof(_tx_rate_info->bw[0]);\ i++) { \ - cdf_print("%s %d ", bw_str_arr[i], _tx_rate_info->bw[i]);\ + qdf_print("%s %d ", bw_str_arr[i], _tx_rate_info->bw[i]);\ } \ - cdf_print("\n"); \ + qdf_print("\n"); \ \ /* Preamble */ \ - cdf_print("Preamble (O C H V) counts: "); \ - cdf_print("%d, %d, %d, %d\n", \ + qdf_print("Preamble (O C H V) counts: "); \ + qdf_print("%d, %d, %d, %d\n", \ _tx_rate_info->pream[0], \ _tx_rate_info->pream[1], \ _tx_rate_info->pream[2], \ _tx_rate_info->pream[3]); \ \ /* STBC rate counts */ \ - cdf_print("STBC rate counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("STBC rate counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _tx_rate_info->stbc[0], \ _tx_rate_info->stbc[1], \ _tx_rate_info->stbc[2], \ @@ -131,12 +131,12 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"}; _tx_rate_info->stbc[9]); \ \ /* LDPC and TxBF counts */ \ - cdf_print("LDPC Counts: "); \ - cdf_print("%d\n", _tx_rate_info->ldpc); \ - cdf_print("RTS Counts: "); \ - cdf_print("%d\n", _tx_rate_info->rts_cnt); \ + qdf_print("LDPC Counts: "); \ + qdf_print("%d\n", _tx_rate_info->ldpc); \ + qdf_print("RTS Counts: "); \ + qdf_print("%d\n", _tx_rate_info->rts_cnt); \ /* RSSI Values for last ack frames */ \ - cdf_print("Ack RSSI: %d\n", _tx_rate_info->ack_rssi);\ + qdf_print("Ack RSSI: %d\n", _tx_rate_info->ack_rssi);\ } static void htt_t2h_stats_tx_rate_stats_print(wlan_dbg_tx_rate_info_t * @@ -165,11 +165,11 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * { \ int i; \ \ - cdf_print("RX Rate Info:\n"); \ + qdf_print("RX Rate Info:\n"); \ \ /* MCS */ \ - cdf_print("MCS counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("MCS counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _rx_phy_info->mcs[0], \ _rx_phy_info->mcs[1], \ _rx_phy_info->mcs[2], \ @@ -182,8 +182,8 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * _rx_phy_info->mcs[9]); \ \ /* SGI */ \ - cdf_print("SGI counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("SGI counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _rx_phy_info->sgi[0], \ _rx_phy_info->sgi[1], \ _rx_phy_info->sgi[2], \ @@ -196,7 +196,7 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * _rx_phy_info->sgi[9]); \ \ /* NSS */ \ - cdf_print("NSS counts: "); \ + qdf_print("NSS counts: "); \ /* nss[0] just holds the count of non-stbc frames that were sent at 1x1 \ * rates and nsts holds the count of frames sent with stbc. \ * It was decided to not include PPDUs sent w/ STBC in nss[0]\ @@ -204,28 +204,28 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * * printed (from "stbc+non-stbc count to only non-stbc count")\ * if needed in the future. Hence the addition in the host code\ * at this line. */ \ - cdf_print("1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d\n", \ + qdf_print("1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d\n", \ _rx_phy_info->nss[0] + _rx_phy_info->nsts, \ _rx_phy_info->nss[1], \ _rx_phy_info->nss[2], \ _rx_phy_info->nss[3]); \ \ /* NSTS */ \ - cdf_print("NSTS count: "); \ - cdf_print("%d\n", _rx_phy_info->nsts); \ + qdf_print("NSTS count: "); \ + qdf_print("%d\n", _rx_phy_info->nsts); \ \ /* BW */ \ - cdf_print("BW counts: "); \ + qdf_print("BW counts: "); \ for (i = 0; \ i < sizeof(_rx_phy_info->bw) / sizeof(_rx_phy_info->bw[0]); \ i++) { \ - cdf_print("%s %d ", bw_str_arr[i], _rx_phy_info->bw[i]);\ + qdf_print("%s %d ", bw_str_arr[i], _rx_phy_info->bw[i]);\ } \ - cdf_print("\n"); \ + qdf_print("\n"); \ \ /* Preamble */ \ - cdf_print("Preamble counts: "); \ - cdf_print("%d, %d, %d, %d, %d, %d\n", \ + qdf_print("Preamble counts: "); \ + qdf_print("%d, %d, %d, %d, %d, %d\n", \ _rx_phy_info->pream[0], \ _rx_phy_info->pream[1], \ _rx_phy_info->pream[2], \ @@ -234,8 +234,8 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * _rx_phy_info->pream[5]); \ \ /* STBC rate counts */ \ - cdf_print("STBC rate counts (0..9): "); \ - cdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ + qdf_print("STBC rate counts (0..9): "); \ + qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ _rx_phy_info->stbc[0], \ _rx_phy_info->stbc[1], \ _rx_phy_info->stbc[2], \ @@ -248,25 +248,25 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * _rx_phy_info->stbc[9]); \ \ /* LDPC and TxBF counts */ \ - cdf_print("LDPC TXBF Counts: "); \ - cdf_print("%d, %d\n", _rx_phy_info->ldpc, _rx_phy_info->txbf);\ + qdf_print("LDPC TXBF Counts: "); \ + qdf_print("%d, %d\n", _rx_phy_info->ldpc, _rx_phy_info->txbf);\ /* RSSI Values for last received frames */ \ - cdf_print("RSSI (data, mgmt): %d, %d\n", _rx_phy_info->data_rssi,\ + qdf_print("RSSI (data, mgmt): %d, %d\n", _rx_phy_info->data_rssi,\ _rx_phy_info->mgmt_rssi); \ \ - cdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + qdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ ((_rx_phy_info->rssi_chain0 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 8) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 0) & 0xff)); \ \ - cdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + qdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ ((_rx_phy_info->rssi_chain1 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 8) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 0) & 0xff)); \ \ - cdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + qdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ ((_rx_phy_info->rssi_chain2 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain2 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain2 >> 8) & 0xff), \ @@ -292,78 +292,78 @@ htt_t2h_stats_pdev_stats_print(struct wlan_dbg_stats *wlan_pdev_stats, struct wlan_dbg_tx_stats *tx = &wlan_pdev_stats->tx; struct wlan_dbg_rx_stats *rx = &wlan_pdev_stats->rx; - cdf_print("WAL Pdev stats:\n"); - cdf_print("\n### Tx ###\n"); + qdf_print("WAL Pdev stats:\n"); + qdf_print("\n### Tx ###\n"); /* Num HTT cookies queued to dispatch list */ - cdf_print("comp_queued :\t%d\n", tx->comp_queued); + qdf_print("comp_queued :\t%d\n", tx->comp_queued); /* Num HTT cookies dispatched */ - cdf_print("comp_delivered :\t%d\n", tx->comp_delivered); + qdf_print("comp_delivered :\t%d\n", tx->comp_delivered); /* Num MSDU queued to WAL */ - cdf_print("msdu_enqued :\t%d\n", tx->msdu_enqued); + qdf_print("msdu_enqued :\t%d\n", tx->msdu_enqued); /* Num MPDU queued to WAL */ - cdf_print("mpdu_enqued :\t%d\n", tx->mpdu_enqued); + qdf_print("mpdu_enqued :\t%d\n", tx->mpdu_enqued); /* Num MSDUs dropped by WMM limit */ - cdf_print("wmm_drop :\t%d\n", tx->wmm_drop); + qdf_print("wmm_drop :\t%d\n", tx->wmm_drop); /* Num Local frames queued */ - cdf_print("local_enqued :\t%d\n", tx->local_enqued); + qdf_print("local_enqued :\t%d\n", tx->local_enqued); /* Num Local frames done */ - cdf_print("local_freed :\t%d\n", tx->local_freed); + qdf_print("local_freed :\t%d\n", tx->local_freed); /* Num queued to HW */ - cdf_print("hw_queued :\t%d\n", tx->hw_queued); + qdf_print("hw_queued :\t%d\n", tx->hw_queued); /* Num PPDU reaped from HW */ - cdf_print("hw_reaped :\t%d\n", tx->hw_reaped); + qdf_print("hw_reaped :\t%d\n", tx->hw_reaped); /* Num underruns */ - cdf_print("mac underrun :\t%d\n", tx->underrun); + qdf_print("mac underrun :\t%d\n", tx->underrun); /* Num underruns */ - cdf_print("phy underrun :\t%d\n", tx->phy_underrun); + qdf_print("phy underrun :\t%d\n", tx->phy_underrun); /* Num PPDUs cleaned up in TX abort */ - cdf_print("tx_abort :\t%d\n", tx->tx_abort); + qdf_print("tx_abort :\t%d\n", tx->tx_abort); /* Num MPDUs requed by SW */ - cdf_print("mpdus_requed :\t%d\n", tx->mpdus_requed); + qdf_print("mpdus_requed :\t%d\n", tx->mpdus_requed); /* Excessive retries */ - cdf_print("excess retries :\t%d\n", tx->tx_ko); + qdf_print("excess retries :\t%d\n", tx->tx_ko); /* last data rate */ - cdf_print("last rc :\t%d\n", tx->data_rc); + qdf_print("last rc :\t%d\n", tx->data_rc); /* scheduler self triggers */ - cdf_print("sched self trig :\t%d\n", tx->self_triggers); + qdf_print("sched self trig :\t%d\n", tx->self_triggers); /* SW retry failures */ - cdf_print("ampdu retry failed:\t%d\n", tx->sw_retry_failure); + qdf_print("ampdu retry failed:\t%d\n", tx->sw_retry_failure); /* ilegal phy rate errirs */ - cdf_print("illegal rate errs :\t%d\n", tx->illgl_rate_phy_err); + qdf_print("illegal rate errs :\t%d\n", tx->illgl_rate_phy_err); /* pdev continous excessive retries */ - cdf_print("pdev cont xretry :\t%d\n", tx->pdev_cont_xretry); + qdf_print("pdev cont xretry :\t%d\n", tx->pdev_cont_xretry); /* pdev continous excessive retries */ - cdf_print("pdev tx timeout :\t%d\n", tx->pdev_tx_timeout); + qdf_print("pdev tx timeout :\t%d\n", tx->pdev_tx_timeout); /* pdev resets */ - cdf_print("pdev resets :\t%d\n", tx->pdev_resets); + qdf_print("pdev resets :\t%d\n", tx->pdev_resets); /* PPDU > txop duration */ - cdf_print("ppdu txop ovf :\t%d\n", tx->txop_ovf); + qdf_print("ppdu txop ovf :\t%d\n", tx->txop_ovf); - cdf_print("\n### Rx ###\n"); + qdf_print("\n### Rx ###\n"); /* Cnts any change in ring routing mid-ppdu */ - cdf_print("ppdu_route_change :\t%d\n", rx->mid_ppdu_route_change); + qdf_print("ppdu_route_change :\t%d\n", rx->mid_ppdu_route_change); /* Total number of statuses processed */ - cdf_print("status_rcvd :\t%d\n", rx->status_rcvd); + qdf_print("status_rcvd :\t%d\n", rx->status_rcvd); /* Extra frags on rings 0-3 */ - cdf_print("r0_frags :\t%d\n", rx->r0_frags); - cdf_print("r1_frags :\t%d\n", rx->r1_frags); - cdf_print("r2_frags :\t%d\n", rx->r2_frags); - cdf_print("r3_frags :\t%d\n", rx->r3_frags); + qdf_print("r0_frags :\t%d\n", rx->r0_frags); + qdf_print("r1_frags :\t%d\n", rx->r1_frags); + qdf_print("r2_frags :\t%d\n", rx->r2_frags); + qdf_print("r3_frags :\t%d\n", rx->r3_frags); /* MSDUs / MPDUs delivered to HTT */ - cdf_print("htt_msdus :\t%d\n", rx->htt_msdus); - cdf_print("htt_mpdus :\t%d\n", rx->htt_mpdus); + qdf_print("htt_msdus :\t%d\n", rx->htt_msdus); + qdf_print("htt_mpdus :\t%d\n", rx->htt_mpdus); /* MSDUs / MPDUs delivered to local stack */ - cdf_print("loc_msdus :\t%d\n", rx->loc_msdus); - cdf_print("loc_mpdus :\t%d\n", rx->loc_mpdus); + qdf_print("loc_msdus :\t%d\n", rx->loc_msdus); + qdf_print("loc_mpdus :\t%d\n", rx->loc_mpdus); /* AMSDUs that have more MSDUs than the status ring size */ - cdf_print("oversize_amsdu :\t%d\n", rx->oversize_amsdu); + qdf_print("oversize_amsdu :\t%d\n", rx->oversize_amsdu); /* Number of PHY errors */ - cdf_print("phy_errs :\t%d\n", rx->phy_errs); + qdf_print("phy_errs :\t%d\n", rx->phy_errs); /* Number of PHY errors dropped */ - cdf_print("phy_errs dropped :\t%d\n", rx->phy_err_drop); + qdf_print("phy_errs dropped :\t%d\n", rx->phy_err_drop); /* Number of mpdu errors - FCS, MIC, ENC etc. */ - cdf_print("mpdu_errs :\t%d\n", rx->mpdu_errs); + qdf_print("mpdu_errs :\t%d\n", rx->mpdu_errs); } @@ -371,112 +371,112 @@ static void htt_t2h_stats_rx_reorder_stats_print(struct rx_reorder_stats *stats_ptr, int concise) { - cdf_print("Rx reorder statistics:\n"); - cdf_print(" %u non-QoS frames received\n", stats_ptr->deliver_non_qos); - cdf_print(" %u frames received in-order\n", + qdf_print("Rx reorder statistics:\n"); + qdf_print(" %u non-QoS frames received\n", stats_ptr->deliver_non_qos); + qdf_print(" %u frames received in-order\n", stats_ptr->deliver_in_order); - cdf_print(" %u frames flushed due to timeout\n", + qdf_print(" %u frames flushed due to timeout\n", stats_ptr->deliver_flush_timeout); - cdf_print(" %u frames flushed due to moving out of window\n", + qdf_print(" %u frames flushed due to moving out of window\n", stats_ptr->deliver_flush_oow); - cdf_print(" %u frames flushed due to receiving DELBA\n", + qdf_print(" %u frames flushed due to receiving DELBA\n", stats_ptr->deliver_flush_delba); - cdf_print(" %u frames discarded due to FCS error\n", + qdf_print(" %u frames discarded due to FCS error\n", stats_ptr->fcs_error); - cdf_print(" %u frames discarded due to invalid peer\n", + qdf_print(" %u frames discarded due to invalid peer\n", stats_ptr->invalid_peer); - cdf_print + qdf_print (" %u frames discarded due to duplication (non aggregation)\n", stats_ptr->dup_non_aggr); - cdf_print(" %u frames discarded due to duplication in reorder queue\n", + qdf_print(" %u frames discarded due to duplication in reorder queue\n", stats_ptr->dup_in_reorder); - cdf_print(" %u frames discarded due to processed before\n", + qdf_print(" %u frames discarded due to processed before\n", stats_ptr->dup_past); - cdf_print(" %u times reorder timeout happened\n", + qdf_print(" %u times reorder timeout happened\n", stats_ptr->reorder_timeout); - cdf_print(" %u times incorrect bar received\n", + qdf_print(" %u times incorrect bar received\n", stats_ptr->invalid_bar_ssn); - cdf_print(" %u times bar ssn reset happened\n", + qdf_print(" %u times bar ssn reset happened\n", stats_ptr->ssn_reset); - cdf_print(" %u times flushed due to peer delete\n", + qdf_print(" %u times flushed due to peer delete\n", stats_ptr->deliver_flush_delpeer); - cdf_print(" %u times flushed due to offload\n", + qdf_print(" %u times flushed due to offload\n", stats_ptr->deliver_flush_offload); - cdf_print(" %u times flushed due to ouf of buffer\n", + qdf_print(" %u times flushed due to ouf of buffer\n", stats_ptr->deliver_flush_oob); - cdf_print(" %u MPDU's dropped due to PN check fail\n", + qdf_print(" %u MPDU's dropped due to PN check fail\n", stats_ptr->pn_fail); - cdf_print(" %u MPDU's dropped due to lack of memory\n", + qdf_print(" %u MPDU's dropped due to lack of memory\n", stats_ptr->store_fail); - cdf_print(" %u times tid pool alloc succeeded\n", + qdf_print(" %u times tid pool alloc succeeded\n", stats_ptr->tid_pool_alloc_succ); - cdf_print(" %u times MPDU pool alloc succeeded\n", + qdf_print(" %u times MPDU pool alloc succeeded\n", stats_ptr->mpdu_pool_alloc_succ); - cdf_print(" %u times MSDU pool alloc succeeded\n", + qdf_print(" %u times MSDU pool alloc succeeded\n", stats_ptr->msdu_pool_alloc_succ); - cdf_print(" %u times tid pool alloc failed\n", + qdf_print(" %u times tid pool alloc failed\n", stats_ptr->tid_pool_alloc_fail); - cdf_print(" %u times MPDU pool alloc failed\n", + qdf_print(" %u times MPDU pool alloc failed\n", stats_ptr->mpdu_pool_alloc_fail); - cdf_print(" %u times MSDU pool alloc failed\n", + qdf_print(" %u times MSDU pool alloc failed\n", stats_ptr->msdu_pool_alloc_fail); - cdf_print(" %u times tid pool freed\n", + qdf_print(" %u times tid pool freed\n", stats_ptr->tid_pool_free); - cdf_print(" %u times MPDU pool freed\n", + qdf_print(" %u times MPDU pool freed\n", stats_ptr->mpdu_pool_free); - cdf_print(" %u times MSDU pool freed\n", + qdf_print(" %u times MSDU pool freed\n", stats_ptr->msdu_pool_free); - cdf_print(" %u MSDUs undelivered to HTT, queued to Rx MSDU free list\n", + qdf_print(" %u MSDUs undelivered to HTT, queued to Rx MSDU free list\n", stats_ptr->msdu_queued); - cdf_print(" %u MSDUs released from Rx MSDU list to MAC ring\n", + qdf_print(" %u MSDUs released from Rx MSDU list to MAC ring\n", stats_ptr->msdu_recycled); - cdf_print(" %u MPDUs with invalid peer but A2 found in AST\n", + qdf_print(" %u MPDUs with invalid peer but A2 found in AST\n", stats_ptr->invalid_peer_a2_in_ast); - cdf_print(" %u MPDUs with invalid peer but A3 found in AST\n", + qdf_print(" %u MPDUs with invalid peer but A3 found in AST\n", stats_ptr->invalid_peer_a3_in_ast); - cdf_print(" %u MPDUs with invalid peer, Broadcast or Mulitcast frame\n", + qdf_print(" %u MPDUs with invalid peer, Broadcast or Mulitcast frame\n", stats_ptr->invalid_peer_bmc_mpdus); - cdf_print(" %u MSDUs with err attention word\n", + qdf_print(" %u MSDUs with err attention word\n", stats_ptr->rxdesc_err_att); - cdf_print(" %u MSDUs with flag of peer_idx_invalid\n", + qdf_print(" %u MSDUs with flag of peer_idx_invalid\n", stats_ptr->rxdesc_err_peer_idx_inv); - cdf_print(" %u MSDUs with flag of peer_idx_timeout\n", + qdf_print(" %u MSDUs with flag of peer_idx_timeout\n", stats_ptr->rxdesc_err_peer_idx_to); - cdf_print(" %u MSDUs with flag of overflow\n", + qdf_print(" %u MSDUs with flag of overflow\n", stats_ptr->rxdesc_err_ov); - cdf_print(" %u MSDUs with flag of msdu_length_err\n", + qdf_print(" %u MSDUs with flag of msdu_length_err\n", stats_ptr->rxdesc_err_msdu_len); - cdf_print(" %u MSDUs with flag of mpdu_length_err\n", + qdf_print(" %u MSDUs with flag of mpdu_length_err\n", stats_ptr->rxdesc_err_mpdu_len); - cdf_print(" %u MSDUs with flag of tkip_mic_err\n", + qdf_print(" %u MSDUs with flag of tkip_mic_err\n", stats_ptr->rxdesc_err_tkip_mic); - cdf_print(" %u MSDUs with flag of decrypt_err\n", + qdf_print(" %u MSDUs with flag of decrypt_err\n", stats_ptr->rxdesc_err_decrypt); - cdf_print(" %u MSDUs with flag of fcs_err\n", + qdf_print(" %u MSDUs with flag of fcs_err\n", stats_ptr->rxdesc_err_fcs); - cdf_print(" %u Unicast frames with invalid peer handler\n", + qdf_print(" %u Unicast frames with invalid peer handler\n", stats_ptr->rxdesc_uc_msdus_inv_peer); - cdf_print(" %u unicast frame directly to DUT with invalid peer handler\n", + qdf_print(" %u unicast frame directly to DUT with invalid peer handler\n", stats_ptr->rxdesc_direct_msdus_inv_peer); - cdf_print(" %u Broadcast/Multicast frames with invalid peer handler\n", + qdf_print(" %u Broadcast/Multicast frames with invalid peer handler\n", stats_ptr->rxdesc_bmc_msdus_inv_peer); - cdf_print(" %u MSDUs dropped due to no first MSDU flag\n", + qdf_print(" %u MSDUs dropped due to no first MSDU flag\n", stats_ptr->rxdesc_no_1st_msdu); - cdf_print(" %u MSDUs dropped due to ring overflow\n", + qdf_print(" %u MSDUs dropped due to ring overflow\n", stats_ptr->msdu_drop_ring_ov); - cdf_print(" %u MSDUs dropped due to FC mismatch\n", + qdf_print(" %u MSDUs dropped due to FC mismatch\n", stats_ptr->msdu_drop_fc_mismatch); - cdf_print(" %u MSDUs dropped due to mgt frame in Remote ring\n", + qdf_print(" %u MSDUs dropped due to mgt frame in Remote ring\n", stats_ptr->msdu_drop_mgmt_remote_ring); - cdf_print(" %u MSDUs dropped due to misc non error\n", + qdf_print(" %u MSDUs dropped due to misc non error\n", stats_ptr->msdu_drop_misc); - cdf_print(" %u MSDUs go to offload before reorder\n", + qdf_print(" %u MSDUs go to offload before reorder\n", stats_ptr->offload_msdu_wal); - cdf_print(" %u data frame dropped by offload after reorder\n", + qdf_print(" %u data frame dropped by offload after reorder\n", stats_ptr->offload_msdu_reorder); - cdf_print(" %u MPDUs with SN in the past & within BA window\n", + qdf_print(" %u MPDUs with SN in the past & within BA window\n", stats_ptr->dup_past_within_window); - cdf_print(" %u MPDUs with SN in the past & outside BA window\n", + qdf_print(" %u MPDUs with SN in the past & outside BA window\n", stats_ptr->dup_past_outside_window); } @@ -484,32 +484,32 @@ static void htt_t2h_stats_rx_rem_buf_stats_print( struct rx_remote_buffer_mgmt_stats *stats_ptr, int concise) { - cdf_print("Rx Remote Buffer Statistics:\n"); - cdf_print(" %u MSDU's reaped for Rx processing\n", + qdf_print("Rx Remote Buffer Statistics:\n"); + qdf_print(" %u MSDU's reaped for Rx processing\n", stats_ptr->remote_reaped); - cdf_print(" %u MSDU's recycled within firmware\n", + qdf_print(" %u MSDU's recycled within firmware\n", stats_ptr->remote_recycled); - cdf_print(" %u MSDU's stored by Data Rx\n", + qdf_print(" %u MSDU's stored by Data Rx\n", stats_ptr->data_rx_msdus_stored); - cdf_print(" %u HTT indications from WAL Rx MSDU\n", + qdf_print(" %u HTT indications from WAL Rx MSDU\n", stats_ptr->wal_rx_ind); - cdf_print(" %u HTT indications unconsumed from WAL Rx MSDU\n", + qdf_print(" %u HTT indications unconsumed from WAL Rx MSDU\n", stats_ptr->wal_rx_ind_unconsumed); - cdf_print(" %u HTT indications from Data Rx MSDU\n", + qdf_print(" %u HTT indications from Data Rx MSDU\n", stats_ptr->data_rx_ind); - cdf_print(" %u HTT indications unconsumed from Data Rx MSDU\n", + qdf_print(" %u HTT indications unconsumed from Data Rx MSDU\n", stats_ptr->data_rx_ind_unconsumed); - cdf_print(" %u HTT indications from ATHBUF\n", + qdf_print(" %u HTT indications from ATHBUF\n", stats_ptr->athbuf_rx_ind); - cdf_print(" %u Remote buffers requested for refill\n", + qdf_print(" %u Remote buffers requested for refill\n", stats_ptr->refill_buf_req); - cdf_print(" %u Remote buffers filled by host\n", + qdf_print(" %u Remote buffers filled by host\n", stats_ptr->refill_buf_rsp); - cdf_print(" %u times MAC has no buffers\n", + qdf_print(" %u times MAC has no buffers\n", stats_ptr->mac_no_bufs); - cdf_print(" %u times f/w write & read indices on MAC ring are equal\n", + qdf_print(" %u times f/w write & read indices on MAC ring are equal\n", stats_ptr->fw_indices_equal); - cdf_print(" %u times f/w has no remote buffers to post to MAC\n", + qdf_print(" %u times f/w has no remote buffers to post to MAC\n", stats_ptr->host_no_bufs); } @@ -517,9 +517,9 @@ static void htt_t2h_stats_txbf_info_buf_stats_print( struct wlan_dbg_txbf_data_stats *stats_ptr) { - cdf_print("TXBF data Statistics:\n"); - cdf_print("tx_txbf_vht (0..9): "); - cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %d\n", + qdf_print("TXBF data Statistics:\n"); + qdf_print("tx_txbf_vht (0..9): "); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %d\n", stats_ptr->tx_txbf_vht[0], stats_ptr->tx_txbf_vht[1], stats_ptr->tx_txbf_vht[2], @@ -530,8 +530,8 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_vht[7], stats_ptr->tx_txbf_vht[8], stats_ptr->tx_txbf_vht[9]); - cdf_print("rx_txbf_vht (0..9): "); - cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("rx_txbf_vht (0..9): "); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u\n", stats_ptr->rx_txbf_vht[0], stats_ptr->rx_txbf_vht[1], stats_ptr->rx_txbf_vht[2], @@ -542,8 +542,8 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->rx_txbf_vht[7], stats_ptr->rx_txbf_vht[8], stats_ptr->rx_txbf_vht[9]); - cdf_print("tx_txbf_ht (0..7): "); - cdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_ht (0..7): "); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", stats_ptr->tx_txbf_ht[0], stats_ptr->tx_txbf_ht[1], stats_ptr->tx_txbf_ht[2], @@ -552,8 +552,8 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_ht[5], stats_ptr->tx_txbf_ht[6], stats_ptr->tx_txbf_ht[7]); - cdf_print("tx_txbf_ofdm (0..7): "); - cdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_ofdm (0..7): "); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", stats_ptr->tx_txbf_ofdm[0], stats_ptr->tx_txbf_ofdm[1], stats_ptr->tx_txbf_ofdm[2], @@ -562,8 +562,8 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_ofdm[5], stats_ptr->tx_txbf_ofdm[6], stats_ptr->tx_txbf_ofdm[7]); - cdf_print("tx_txbf_cck (0..6): "); - cdf_print("%u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_cck (0..6): "); + qdf_print("%u, %u, %u, %u, %u, %u, %u\n", stats_ptr->tx_txbf_cck[0], stats_ptr->tx_txbf_cck[1], stats_ptr->tx_txbf_cck[2], @@ -577,27 +577,27 @@ static void htt_t2h_stats_txbf_snd_buf_stats_print( struct wlan_dbg_txbf_snd_stats *stats_ptr) { - cdf_print("TXBF snd Buffer Statistics:\n"); - cdf_print("cbf_20: "); - cdf_print("%u, %u, %u, %u\n", + qdf_print("TXBF snd Buffer Statistics:\n"); + qdf_print("cbf_20: "); + qdf_print("%u, %u, %u, %u\n", stats_ptr->cbf_20[0], stats_ptr->cbf_20[1], stats_ptr->cbf_20[2], stats_ptr->cbf_20[3]); - cdf_print("cbf_40: "); - cdf_print("%u, %u, %u, %u\n", + qdf_print("cbf_40: "); + qdf_print("%u, %u, %u, %u\n", stats_ptr->cbf_40[0], stats_ptr->cbf_40[1], stats_ptr->cbf_40[2], stats_ptr->cbf_40[3]); - cdf_print("cbf_80: "); - cdf_print("%u, %u, %u, %u\n", + qdf_print("cbf_80: "); + qdf_print("%u, %u, %u, %u\n", stats_ptr->cbf_80[0], stats_ptr->cbf_80[1], stats_ptr->cbf_80[2], stats_ptr->cbf_80[3]); - cdf_print("sounding: "); - cdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("sounding: "); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u\n", stats_ptr->sounding[0], stats_ptr->sounding[1], stats_ptr->sounding[2], @@ -613,34 +613,34 @@ static void htt_t2h_stats_tx_selfgen_buf_stats_print( struct wlan_dbg_tx_selfgen_stats *stats_ptr) { - cdf_print("Tx selfgen Buffer Statistics:\n"); - cdf_print(" %u su_ndpa\n", + qdf_print("Tx selfgen Buffer Statistics:\n"); + qdf_print(" %u su_ndpa\n", stats_ptr->su_ndpa); - cdf_print(" %u mu_ndp\n", + qdf_print(" %u mu_ndp\n", stats_ptr->mu_ndp); - cdf_print(" %u mu_ndpa\n", + qdf_print(" %u mu_ndpa\n", stats_ptr->mu_ndpa); - cdf_print(" %u mu_ndp\n", + qdf_print(" %u mu_ndp\n", stats_ptr->mu_ndp); - cdf_print(" %u mu_brpoll_1\n", + qdf_print(" %u mu_brpoll_1\n", stats_ptr->mu_brpoll_1); - cdf_print(" %u mu_brpoll_2\n", + qdf_print(" %u mu_brpoll_2\n", stats_ptr->mu_brpoll_2); - cdf_print(" %u mu_bar_1\n", + qdf_print(" %u mu_bar_1\n", stats_ptr->mu_bar_1); - cdf_print(" %u mu_bar_2\n", + qdf_print(" %u mu_bar_2\n", stats_ptr->mu_bar_2); - cdf_print(" %u cts_burst\n", + qdf_print(" %u cts_burst\n", stats_ptr->cts_burst); - cdf_print(" %u su_ndp_err\n", + qdf_print(" %u su_ndp_err\n", stats_ptr->su_ndp_err); - cdf_print(" %u su_ndpa_err\n", + qdf_print(" %u su_ndpa_err\n", stats_ptr->su_ndpa_err); - cdf_print(" %u mu_ndp_err\n", + qdf_print(" %u mu_ndp_err\n", stats_ptr->mu_ndp_err); - cdf_print(" %u mu_brp1_err\n", + qdf_print(" %u mu_brp1_err\n", stats_ptr->mu_brp1_err); - cdf_print(" %u mu_brp2_err\n", + qdf_print(" %u mu_brp2_err\n", stats_ptr->mu_brp2_err); } @@ -650,39 +650,39 @@ htt_t2h_stats_wifi2_error_stats_print( { int i; - cdf_print("Scheduler error Statistics:\n"); - cdf_print("urrn_stats: "); - cdf_print("%d, %d, %d\n", + qdf_print("Scheduler error Statistics:\n"); + qdf_print("urrn_stats: "); + qdf_print("%d, %d, %d\n", stats_ptr->urrn_stats[0], stats_ptr->urrn_stats[1], stats_ptr->urrn_stats[2]); - cdf_print("flush_errs (0..%d): ", + qdf_print("flush_errs (0..%d): ", WHAL_DBG_FLUSH_REASON_MAXCNT); for (i = 0; i < WHAL_DBG_FLUSH_REASON_MAXCNT; i++) - cdf_print(" %u", stats_ptr->flush_errs[i]); - cdf_print("\n"); - cdf_print("schd_stall_errs (0..3): "); - cdf_print("%d, %d, %d, %d\n", + qdf_print(" %u", stats_ptr->flush_errs[i]); + qdf_print("\n"); + qdf_print("schd_stall_errs (0..3): "); + qdf_print("%d, %d, %d, %d\n", stats_ptr->schd_stall_errs[0], stats_ptr->schd_stall_errs[1], stats_ptr->schd_stall_errs[2], stats_ptr->schd_stall_errs[3]); - cdf_print("schd_cmd_result (0..%d): ", + qdf_print("schd_cmd_result (0..%d): ", WHAL_DBG_CMD_RESULT_MAXCNT); for (i = 0; i < WHAL_DBG_CMD_RESULT_MAXCNT; i++) - cdf_print(" %u", stats_ptr->schd_cmd_result[i]); - cdf_print("\n"); - cdf_print("sifs_status (0..%d): ", + qdf_print(" %u", stats_ptr->schd_cmd_result[i]); + qdf_print("\n"); + qdf_print("sifs_status (0..%d): ", WHAL_DBG_SIFS_STATUS_MAXCNT); for (i = 0; i < WHAL_DBG_SIFS_STATUS_MAXCNT; i++) - cdf_print(" %u", stats_ptr->sifs_status[i]); - cdf_print("\n"); - cdf_print("phy_errs (0..%d): ", + qdf_print(" %u", stats_ptr->sifs_status[i]); + qdf_print("\n"); + qdf_print("phy_errs (0..%d): ", WHAL_DBG_PHY_ERR_MAXCNT); for (i = 0; i < WHAL_DBG_PHY_ERR_MAXCNT; i++) - cdf_print(" %u", stats_ptr->phy_errs[i]); - cdf_print("\n"); - cdf_print(" %u rx_rate_inval\n", + qdf_print(" %u", stats_ptr->phy_errs[i]); + qdf_print("\n"); + qdf_print(" %u rx_rate_inval\n", stats_ptr->rx_rate_inval); } @@ -690,16 +690,16 @@ static void htt_t2h_rx_musu_ndpa_pkts_stats_print( struct rx_txbf_musu_ndpa_pkts_stats *stats_ptr) { - cdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:\n"); - cdf_print(" %u Number of TXBF MU packets received\n", + qdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:\n"); + qdf_print(" %u Number of TXBF MU packets received\n", stats_ptr->number_mu_pkts); - cdf_print(" %u Number of TXBF SU packets received\n", + qdf_print(" %u Number of TXBF SU packets received\n", stats_ptr->number_su_pkts); - cdf_print(" %u Number of TXBF directed NDPA\n", + qdf_print(" %u Number of TXBF directed NDPA\n", stats_ptr->txbf_directed_ndpa_count); - cdf_print(" %u Number of TXBF retried NDPA\n", + qdf_print(" %u Number of TXBF retried NDPA\n", stats_ptr->txbf_ndpa_retry_count); - cdf_print(" %u Total number of TXBF NDPA\n", + qdf_print(" %u Total number of TXBF NDPA\n", stats_ptr->txbf_total_ndpa_count); } @@ -739,8 +739,8 @@ htt_t2h_tx_ppdu_bitmaps_pr(uint32_t *queued_ptr, uint32_t *acked_ptr) } queued_str[HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW] = '\0'; acked_str[HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW] = '\0'; - cdf_print("%s\n", queued_str); - cdf_print("%s\n", acked_str); + qdf_print("%s\n", queued_str); + qdf_print("%s\n", acked_str); } static inline uint16_t htt_msg_read16(uint16_t *p16) @@ -797,7 +797,7 @@ void htt_make_u8_list_str(uint32_t *aligned_data, /* not enough data to fill the reserved msg buffer*/ break; - bytes = cdf_snprint(buf_p, space, "%d,", val); + bytes = qdf_snprint(buf_p, space, "%d,", val); space -= bytes; if (space > 0) buf_p += bytes; @@ -825,7 +825,7 @@ void htt_make_u16_list_str(uint32_t *aligned_data, if (val == 0) /* not enough data to fill the reserved msg buffer */ break; - bytes = cdf_snprint(buf_p, space, "%d,", val); + bytes = qdf_snprint(buf_p, space, "%d,", val); space -= bytes; if (space > 0) buf_p += bytes; @@ -855,7 +855,7 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, hdr->mpdu_msdus_array_len * sizeof(uint8_t) + hdr->msdu_bytes_array_len * sizeof(uint16_t); num_records = (length - sizeof(*hdr)) / record_size; - cdf_print("Tx PPDU log elements:\n"); + qdf_print("Tx PPDU log elements:\n"); for (i = 0; i < num_records; i++) { uint16_t start_seq_num; @@ -924,34 +924,34 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, OL_FW_TX_DBG_PPDU_TRIES_M) >> OL_FW_TX_DBG_PPDU_TRIES_S; - cdf_print(" - PPDU tx to peer %d, TID %d\n", peer_id, + qdf_print(" - PPDU tx to peer %d, TID %d\n", peer_id, ext_tid); - cdf_print + qdf_print (" start seq num= %u, start PN LSBs= %#04x\n", start_seq_num, start_pn_lsbs); - cdf_print + qdf_print (" PPDU: %d MPDUs, (?) MSDUs, %d bytes\n", num_mpdus, /* num_msdus - not yet computed in target */ record->num_bytes); if (complete) { - cdf_print + qdf_print (" enqueued: %u, completed: %u usec)\n", time_enqueue_us, time_completion_us); - cdf_print + qdf_print (" %d tries, last tx used rate %d ", tries, rate_code); - cdf_print("on %d MHz chan (flags = %#x)\n", + qdf_print("on %d MHz chan (flags = %#x)\n", htt_rate_flags_to_mhz (rate_flags), rate_flags); - cdf_print + qdf_print (" enqueued and acked MPDU bitmaps:\n"); htt_t2h_tx_ppdu_bitmaps_pr(msg_word + OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16, msg_word + OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16); } else { - cdf_print + qdf_print (" enqueued: %d us, not yet completed\n", time_enqueue_us); } @@ -963,14 +963,14 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, BUF_SIZE, hdr-> mpdu_bytes_array_len); - cdf_print(" MPDU bytes: %s\n", buf); + qdf_print(" MPDU bytes: %s\n", buf); } p8 += hdr->mpdu_bytes_array_len * sizeof(uint16_t); if (hdr->mpdu_msdus_array_len) { htt_make_u8_list_str((uint32_t *) p8, buf, BUF_SIZE, hdr->mpdu_msdus_array_len); - cdf_print(" MPDU MSDUs: %s\n", buf); + qdf_print(" MPDU MSDUs: %s\n", buf); } p8 += hdr->mpdu_msdus_array_len * sizeof(uint8_t); if (hdr->msdu_bytes_array_len) { @@ -978,19 +978,19 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, BUF_SIZE, hdr-> msdu_bytes_array_len); - cdf_print(" MSDU bytes: %s\n", buf); + qdf_print(" MSDU bytes: %s\n", buf); } } else { /* concise */ - cdf_print("start seq num = %u ", start_seq_num); - cdf_print("enqueued and acked MPDU bitmaps:\n"); + qdf_print("start seq num = %u ", start_seq_num); + qdf_print("enqueued and acked MPDU bitmaps:\n"); if (complete) { htt_t2h_tx_ppdu_bitmaps_pr(msg_word + OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16, msg_word + OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16); } else { - cdf_print("(not completed)\n"); + qdf_print("(not completed)\n"); } } record = (struct ol_fw_tx_dbg_ppdu_base *) @@ -1013,10 +1013,10 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise) if (status == HTT_DBG_STATS_STATUS_SERIES_DONE) { return; } else if (status == HTT_DBG_STATS_STATUS_INVALID) { - cdf_print("Target doesn't support stats type %d\n", type); + qdf_print("Target doesn't support stats type %d\n", type); return; } else if (status == HTT_DBG_STATS_STATUS_ERROR) { - cdf_print("Target couldn't upload stats type %d (no mem?)\n", + qdf_print("Target couldn't upload stats type %d (no mem?)\n", type); return; } @@ -1068,7 +1068,7 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise) if (status == HTT_DBG_STATS_STATUS_PARTIAL && length == 0) { - cdf_print + qdf_print ("HTT_DBG_STATS_TX_PPDU_LOG -- length = 0!\n"); break; } diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index e7879b84f054..568dc2e2383e 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -333,10 +333,10 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) enable_ppdu_start = 1; enable_ppdu_end = 1; /* Disable ASPM when pkt log is enabled */ - cdf_print("Pkt log is enabled\n"); + qdf_print("Pkt log is enabled\n"); htt_htc_disable_aspm(pdev); } else { - cdf_print("Pkt log is disabled\n"); + qdf_print("Pkt log is disabled\n"); enable_ctrl_data = 0; enable_mgmt_data = 0; enable_null_data = 0; @@ -448,7 +448,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, if (stats_type_upload_mask >= 1 << HTT_DBG_NUM_STATS || stats_type_reset_mask >= 1 << HTT_DBG_NUM_STATS) { /* FIX THIS - add more details? */ - cdf_print("%#x %#x stats not supported\n", + qdf_print("%#x %#x stats not supported\n", stats_type_upload_mask, stats_type_reset_mask); return -EINVAL; /* failure */ } @@ -786,12 +786,12 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) msg_word++; *msg_word = 0; - /* TX COMP RING BASE LO */ + /* TX COMP RING BASE LO */ HTT_WDI_IPA_CFG_TX_COMP_RING_BASE_ADDR_LO_SET(*msg_word, (unsigned int)pdev->ipa_uc_tx_rsc.tx_comp_base.paddr); msg_word++; *msg_word = 0; - /* TX COMP RING BASE HI, NONE */ + /* TX COMP RING BASE HI, NONE */ msg_word++; *msg_word = 0; diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index e18985fed2de..8601985dd51f 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -152,31 +152,31 @@ static inline struct htt_host_rx_desc_base *htt_rx_desc(cdf_nbuf_t msdu) */ static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc) { - cdf_print + qdf_print ("----------------------RX DESC LRO----------------------\n"); - cdf_print("msdu_end.lro_eligible:0x%x\n", + qdf_print("msdu_end.lro_eligible:0x%x\n", rx_desc->msdu_end.lro_eligible); - cdf_print("msdu_start.tcp_only_ack:0x%x\n", + qdf_print("msdu_start.tcp_only_ack:0x%x\n", rx_desc->msdu_start.tcp_only_ack); - cdf_print("msdu_end.tcp_udp_chksum:0x%x\n", + qdf_print("msdu_end.tcp_udp_chksum:0x%x\n", rx_desc->msdu_end.tcp_udp_chksum); - cdf_print("msdu_end.tcp_seq_number:0x%x\n", + qdf_print("msdu_end.tcp_seq_number:0x%x\n", rx_desc->msdu_end.tcp_seq_number); - cdf_print("msdu_end.tcp_ack_number:0x%x\n", + qdf_print("msdu_end.tcp_ack_number:0x%x\n", rx_desc->msdu_end.tcp_ack_number); - cdf_print("msdu_start.tcp_proto:0x%x\n", + qdf_print("msdu_start.tcp_proto:0x%x\n", rx_desc->msdu_start.tcp_proto); - cdf_print("msdu_start.ipv6_proto:0x%x\n", + qdf_print("msdu_start.ipv6_proto:0x%x\n", rx_desc->msdu_start.ipv6_proto); - cdf_print("msdu_start.ipv4_proto:0x%x\n", + qdf_print("msdu_start.ipv4_proto:0x%x\n", rx_desc->msdu_start.ipv4_proto); - cdf_print("msdu_start.l3_offset:0x%x\n", + qdf_print("msdu_start.l3_offset:0x%x\n", rx_desc->msdu_start.l3_offset); - cdf_print("msdu_start.l4_offset:0x%x\n", + qdf_print("msdu_start.l4_offset:0x%x\n", rx_desc->msdu_start.l4_offset); - cdf_print("msdu_start.flow_id_toeplitz:0x%x\n", + qdf_print("msdu_start.flow_id_toeplitz:0x%x\n", rx_desc->msdu_start.flow_id_toeplitz); - cdf_print + qdf_print ("---------------------------------------------------------\n"); } @@ -218,29 +218,29 @@ static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu, static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) { - cdf_print + qdf_print ("----------------------RX DESC----------------------------\n"); - cdf_print("attention: %#010x\n", + qdf_print("attention: %#010x\n", (unsigned int)(*(uint32_t *) &rx_desc->attention)); - cdf_print("frag_info: %#010x\n", + qdf_print("frag_info: %#010x\n", (unsigned int)(*(uint32_t *) &rx_desc->frag_info)); - cdf_print("mpdu_start: %#010x %#010x %#010x\n", + qdf_print("mpdu_start: %#010x %#010x %#010x\n", (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[0]), (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[1]), (unsigned int)(((uint32_t *) &rx_desc->mpdu_start)[2])); - cdf_print("msdu_start: %#010x %#010x %#010x\n", + qdf_print("msdu_start: %#010x %#010x %#010x\n", (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[0]), (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[1]), (unsigned int)(((uint32_t *) &rx_desc->msdu_start)[2])); - cdf_print("msdu_end: %#010x %#010x %#010x %#010x %#010x\n", + qdf_print("msdu_end: %#010x %#010x %#010x %#010x %#010x\n", (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[0]), (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[1]), (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[2]), (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[3]), (unsigned int)(((uint32_t *) &rx_desc->msdu_end)[4])); - cdf_print("mpdu_end: %#010x\n", + qdf_print("mpdu_end: %#010x\n", (unsigned int)(*(uint32_t *) &rx_desc->mpdu_end)); - cdf_print("ppdu_start: " "%#010x %#010x %#010x %#010x %#010x\n" + qdf_print("ppdu_start: " "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x %#010x %#010x %#010x\n", (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[0]), (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[1]), @@ -252,7 +252,7 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[7]), (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[8]), (unsigned int)(((uint32_t *) &rx_desc->ppdu_start)[9])); - cdf_print("ppdu_end:" "%#010x %#010x %#010x %#010x %#010x\n" + qdf_print("ppdu_end:" "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x %#010x %#010x %#010x\n" "%#010x,%#010x %#010x %#010x %#010x\n" "%#010x %#010x %#010x %#010x %#010x\n" "%#010x %#010x\n", @@ -278,7 +278,7 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[19]), (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[20]), (unsigned int)(((uint32_t *) &rx_desc->ppdu_end)[21])); - cdf_print + qdf_print ("---------------------------------------------------------\n"); } @@ -536,7 +536,7 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev) HTT_RX_RING_BUFF_DBG_LIST * sizeof(struct rx_buf_debug)); if (!pdev->rx_buff_list) { - cdf_print("HTT: debug RX buffer allocation failed\n"); + qdf_print("HTT: debug RX buffer allocation failed\n"); CDF_ASSERT(0); } } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index c1749877021f..3cf9b0abc365 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -40,7 +40,7 @@ */ #include /* cdf_mem_malloc,free, etc. */ -#include /* cdf_print, bool */ +#include /* qdf_print, bool */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_timer_free */ @@ -129,10 +129,10 @@ void htt_rx_hash_deinit(struct htt_pdev_t *pdev) if (hash_entry->netbuf) { #ifdef DEBUG_DMA_DONE cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, - CDF_DMA_BIDIRECTIONAL); + QDF_DMA_BIDIRECTIONAL); #else cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, - CDF_DMA_FROM_DEVICE); + QDF_DMA_FROM_DEVICE); #endif cdf_nbuf_free(hash_entry->netbuf); hash_entry->paddr = 0; @@ -229,7 +229,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) idx = *(pdev->rx_ring.alloc_idx.vaddr); while (num > 0) { - cdf_dma_addr_t paddr; + qdf_dma_addr_t paddr; cdf_nbuf_t rx_netbuf; int headroom; @@ -278,11 +278,11 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) #ifdef DEBUG_DMA_DONE status = cdf_nbuf_map(pdev->osdev, rx_netbuf, - CDF_DMA_BIDIRECTIONAL); + QDF_DMA_BIDIRECTIONAL); #else status = cdf_nbuf_map(pdev->osdev, rx_netbuf, - CDF_DMA_FROM_DEVICE); + QDF_DMA_FROM_DEVICE); #endif if (status != QDF_STATUS_SUCCESS) { cdf_nbuf_free(rx_netbuf); @@ -293,14 +293,14 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) if (cdf_unlikely (htt_rx_hash_list_insert(pdev, paddr, rx_netbuf))) { - cdf_print("%s: hash insert failed!\n", + qdf_print("%s: hash insert failed!\n", __func__); #ifdef DEBUG_DMA_DONE cdf_nbuf_unmap(pdev->osdev, rx_netbuf, - CDF_DMA_BIDIRECTIONAL); + QDF_DMA_BIDIRECTIONAL); #else cdf_nbuf_unmap(pdev->osdev, rx_netbuf, - CDF_DMA_FROM_DEVICE); + QDF_DMA_FROM_DEVICE); #endif cdf_nbuf_free(rx_netbuf); goto fail; @@ -350,7 +350,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, - cdf_get_dma_mem_context((&pdev-> + qdf_get_dma_mem_context((&pdev-> rx_ring. target_idx), memctx)); @@ -363,12 +363,12 @@ void htt_rx_detach(struct htt_pdev_t *pdev) cdf_nbuf_unmap(pdev->osdev, pdev->rx_ring.buf. netbufs_ring[sw_rd_idx], - CDF_DMA_BIDIRECTIONAL); + QDF_DMA_BIDIRECTIONAL); #else cdf_nbuf_unmap(pdev->osdev, pdev->rx_ring.buf. netbufs_ring[sw_rd_idx], - CDF_DMA_FROM_DEVICE); + QDF_DMA_FROM_DEVICE); #endif cdf_nbuf_free(pdev->rx_ring.buf. netbufs_ring[sw_rd_idx]); @@ -382,15 +382,15 @@ void htt_rx_detach(struct htt_pdev_t *pdev) sizeof(uint32_t), pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.alloc_idx.paddr, - cdf_get_dma_mem_context((&pdev->rx_ring. + qdf_get_dma_mem_context((&pdev->rx_ring. alloc_idx), memctx)); cdf_os_mem_free_consistent(pdev->osdev, - pdev->rx_ring.size * sizeof(cdf_dma_addr_t), + pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, - cdf_get_dma_mem_context((&pdev->rx_ring.buf), + qdf_get_dma_mem_context((&pdev->rx_ring.buf), memctx)); } @@ -486,7 +486,7 @@ htt_rx_mpdu_desc_pn_ll(htt_pdev_handle pdev, ((uint64_t) rx_desc->msdu_end.ext_wapi_pn_127_96) << 32; break; default: - cdf_print("Error: invalid length spec (%d bits) for PN\n", + qdf_print("Error: invalid length spec (%d bits) for PN\n", pn_len_bits); }; } @@ -721,35 +721,35 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); - cdf_print + qdf_print ("------------------HTT RX IND-----------------------------\n"); - cdf_print("alloc idx paddr %x (*vaddr) %d\n", + qdf_print("alloc idx paddr %x (*vaddr) %d\n", pdev->rx_ring.alloc_idx.paddr, *pdev->rx_ring.alloc_idx.vaddr); - cdf_print("sw_rd_idx msdu_payld %d msdu_desc %d\n", + qdf_print("sw_rd_idx msdu_payld %d msdu_desc %d\n", pdev->rx_ring.sw_rd_idx.msdu_payld, pdev->rx_ring.sw_rd_idx.msdu_desc); - cdf_print("dbg_ring_idx %d\n", pdev->rx_ring.dbg_ring_idx); + qdf_print("dbg_ring_idx %d\n", pdev->rx_ring.dbg_ring_idx); - cdf_print("fill_level %d fill_cnt %d\n", pdev->rx_ring.fill_level, + qdf_print("fill_level %d fill_cnt %d\n", pdev->rx_ring.fill_level, pdev->rx_ring.fill_cnt); - cdf_print("initial msdu_payld %d curr mpdu range %d curr mpdu cnt %d\n", + qdf_print("initial msdu_payld %d curr mpdu range %d curr mpdu cnt %d\n", pdev->rx_ring.dbg_initial_msdu_payld, pdev->rx_ring.dbg_mpdu_range, pdev->rx_ring.dbg_mpdu_count); /* Print the RX_IND contents */ - cdf_print("peer id %x RV %x FV %x ext_tid %x msg_type %x\n", + qdf_print("peer id %x RV %x FV %x ext_tid %x msg_type %x\n", HTT_RX_IND_PEER_ID_GET(*msg_word), HTT_RX_IND_REL_VALID_GET(*msg_word), HTT_RX_IND_FLUSH_VALID_GET(*msg_word), HTT_RX_IND_EXT_TID_GET(*msg_word), HTT_T2H_MSG_TYPE_GET(*msg_word)); - cdf_print("num_mpdu_ranges %x rel_seq_num_end %x rel_seq_num_start %x\n" + qdf_print("num_mpdu_ranges %x rel_seq_num_end %x rel_seq_num_start %x\n" " flush_seq_num_end %x flush_seq_num_start %x\n", HTT_RX_IND_NUM_MPDU_RANGES_GET(*(msg_word + 1)), HTT_RX_IND_REL_SEQ_NUM_END_GET(*(msg_word + 1)), @@ -757,7 +757,7 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) HTT_RX_IND_FLUSH_SEQ_NUM_END_GET(*(msg_word + 1)), HTT_RX_IND_FLUSH_SEQ_NUM_START_GET(*(msg_word + 1))); - cdf_print("fw_rx_desc_bytes %x\n", + qdf_print("fw_rx_desc_bytes %x\n", HTT_RX_IND_FW_RX_DESC_BYTES_GET(* (msg_word + 2 + HTT_RX_PPDU_DESC_SIZE32))); @@ -767,7 +767,7 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) HTT_ENDIAN_BYTE_IDX_SWAP(HTT_RX_IND_FW_RX_DESC_BYTE_OFFSET + pdev->rx_ind_msdu_byte_idx); - cdf_print("msdu byte idx %x msdu desc %x\n", pdev->rx_ind_msdu_byte_idx, + qdf_print("msdu byte idx %x msdu desc %x\n", pdev->rx_ind_msdu_byte_idx, HTT_RX_IND_FW_RX_DESC_BYTES_GET(* (msg_word + 2 + HTT_RX_PPDU_DESC_SIZE32))); @@ -781,10 +781,10 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) htt_rx_ind_mpdu_range_info(pdev, rx_ind_msg, mpdu_range, &status, &num_mpdus); - cdf_print("mpdu_range %x status %x num_mpdus %x\n", + qdf_print("mpdu_range %x status %x num_mpdus %x\n", pdev->rx_ind_msdu_byte_idx, status, num_mpdus); } - cdf_print + qdf_print ("---------------------------------------------------------\n"); } #endif @@ -832,9 +832,9 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, */ cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); #endif /* cache consistency has been taken care of by cdf_nbuf_unmap */ @@ -872,7 +872,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, int dbg_iter = MAX_DONE_BIT_CHECK_ITER; - cdf_print("malformed frame\n"); + qdf_print("malformed frame\n"); while (dbg_iter && (!((*(uint32_t *) &rx_desc->attention) & @@ -883,7 +883,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, (void *)((char *)rx_desc + HTT_RX_STD_DESC_RESERVATION)); - cdf_print("debug iter %d success %d\n", + qdf_print("debug iter %d success %d\n", dbg_iter, pdev->rx_ring.dbg_sync_success); @@ -894,7 +894,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, & RX_ATTENTION_0_MSDU_DONE_MASK))) { #ifdef HTT_RX_RESTORE - cdf_print("RX done bit error detected!\n"); + qdf_print("RX done bit error detected!\n"); cdf_nbuf_set_next(msdu, NULL); *tail_msdu = msdu; pdev->rx_ring.rx_reset = 1; @@ -906,7 +906,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, #endif } pdev->rx_ring.dbg_sync_success++; - cdf_print("debug iter %d success %d\n", dbg_iter, + qdf_print("debug iter %d success %d\n", dbg_iter, pdev->rx_ring.dbg_sync_success); } #else @@ -1080,9 +1080,9 @@ htt_rx_offload_msdu_pop_ll(htt_pdev_handle pdev, htt_rx_mpdu_desc_list_next(pdev, NULL); cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_FROM_DEVICE); + cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); #endif msdu_hdr = (uint32_t *) cdf_nbuf_data(buf); @@ -1122,14 +1122,14 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, *head_buf = *tail_buf = buf = htt_rx_in_order_netbuf_pop(pdev, paddr); if (cdf_unlikely(NULL == buf)) { - cdf_print("%s: netbuf pop failed!\n", __func__); + qdf_print("%s: netbuf pop failed!\n", __func__); return 0; } cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, buf, CDF_DMA_FROM_DEVICE); + cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); #endif msdu_hdr = (uint32_t *) cdf_nbuf_data(buf); @@ -1195,7 +1195,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word)); if (cdf_unlikely(NULL == msdu)) { - cdf_print("%s: netbuf pop failed!\n", __func__); + qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; return 0; } @@ -1208,9 +1208,9 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, */ cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); #endif /* cache consistency has been taken care of by cdf_nbuf_unmap */ @@ -1274,7 +1274,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET( *msg_word)); if (cdf_unlikely(NULL == next)) { - cdf_print("%s: netbuf pop failed!\n", + qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; return 0; @@ -1306,7 +1306,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word)); if (cdf_unlikely(NULL == next)) { - cdf_print("%s: netbuf pop failed!\n", + qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; return 0; @@ -1921,7 +1921,7 @@ static inline void htt_list_remove(struct htt_list_node *node) #define HTT_RX_HASH_COUNT_RESET(hash_bucket) ((hash_bucket).count = 0) #define HTT_RX_HASH_COUNT_PRINT(hash_bucket) \ - RX_HASH_LOG(cdf_print(" count %d\n", (hash_bucket).count)) + RX_HASH_LOG(qdf_print(" count %d\n", (hash_bucket).count)) #else /* RX_HASH_DEBUG */ /* Hash cookie related macros */ #define HTT_RX_HASH_COOKIE_SET(hash_element) /* no-op */ @@ -1982,7 +1982,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, htt_list_add_tail(&pdev->rx_ring.hash_table[i].listhead, &hash_element->listnode); - RX_HASH_LOG(cdf_print("rx hash: %s: paddr 0x%x netbuf %p bucket %d\n", + RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x netbuf %p bucket %d\n", __func__, paddr, netbuf, (int)i)); HTT_RX_HASH_COUNT_INCR(pdev->rx_ring.hash_table[i]); @@ -2029,12 +2029,12 @@ cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr) } } - RX_HASH_LOG(cdf_print("rx hash: %s: paddr 0x%x, netbuf %p, bucket %d\n", + RX_HASH_LOG(qdf_print("rx hash: %s: paddr 0x%x, netbuf %p, bucket %d\n", __func__, paddr, netbuf, (int)i)); HTT_RX_HASH_COUNT_PRINT(pdev->rx_ring.hash_table[i]); if (netbuf == NULL) { - cdf_print("rx hash: %s: no entry found for 0x%x!!!\n", + qdf_print("rx hash: %s: no entry found for 0x%x!!!\n", __func__, paddr); HTT_ASSERT_ALWAYS(0); } @@ -2056,7 +2056,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) sizeof(struct htt_rx_hash_bucket)); if (NULL == pdev->rx_ring.hash_table) { - cdf_print("rx hash table allocation failed!\n"); + qdf_print("rx hash table allocation failed!\n"); return 1; } @@ -2075,7 +2075,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) sizeof(struct htt_rx_hash_entry)); if (NULL == pdev->rx_ring.hash_table[i].entries) { - cdf_print("rx hash bucket %d entries alloc failed\n", + qdf_print("rx hash bucket %d entries alloc failed\n", (int)i); while (i) { i--; @@ -2097,7 +2097,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) } pdev->rx_ring.listnode_offset = - cdf_offsetof(struct htt_rx_hash_entry, listnode); + qdf_offsetof(struct htt_rx_hash_entry, listnode); return 0; } @@ -2115,7 +2115,7 @@ void htt_rx_hash_dump_table(struct htt_pdev_t *pdev) (struct htt_rx_hash_entry *)((char *)list_iter - pdev->rx_ring. listnode_offset); - cdf_print("hash_table[%d]: netbuf %p paddr 0x%x\n", i, + qdf_print("hash_table[%d]: netbuf %p paddr 0x%x\n", i, hash_entry->netbuf, hash_entry->paddr); } } @@ -2128,8 +2128,8 @@ void htt_rx_hash_dump_table(struct htt_pdev_t *pdev) */ int htt_rx_attach(struct htt_pdev_t *pdev) { - cdf_dma_addr_t paddr; - uint32_t ring_elem_size = sizeof(cdf_dma_addr_t); + qdf_dma_addr_t paddr; + uint32_t ring_elem_size = sizeof(qdf_dma_addr_t); pdev->rx_ring.size = htt_rx_ring_size(pdev); HTT_ASSERT2(CDF_IS_PWR2(pdev->rx_ring.size)); @@ -2154,7 +2154,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) cdf_os_mem_alloc_consistent(pdev->osdev, sizeof(uint32_t), &paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&pdev->rx_ring.target_idx), memctx)); @@ -2178,7 +2178,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) pdev->osdev, pdev->rx_ring.size * ring_elem_size, &paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&pdev->rx_ring.buf), memctx)); if (!pdev->rx_ring.buf.paddrs_ring) @@ -2190,7 +2190,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) pdev->osdev, sizeof(uint32_t), &paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&pdev->rx_ring.alloc_idx), memctx)); @@ -2211,7 +2211,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) qdf_timer_init(pdev->osdev, &pdev->rx_ring.refill_retry_timer, htt_rx_ring_refill_retry, (void *)pdev, - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); pdev->rx_ring.fill_cnt = 0; #ifdef DEBUG_DMA_DONE @@ -2227,7 +2227,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) htt_rx_ring_fill_n(pdev, pdev->rx_ring.fill_level); if (pdev->cfg.is_full_reorder_offload) { - cdf_print("HTT: full reorder offload enabled\n"); + qdf_print("HTT: full reorder offload enabled\n"); htt_rx_amsdu_pop = htt_rx_amsdu_rx_in_order_pop_ll; htt_rx_frag_pop = htt_rx_amsdu_rx_in_order_pop_ll; htt_rx_mpdu_desc_list_next = @@ -2258,10 +2258,10 @@ int htt_rx_attach(struct htt_pdev_t *pdev) fail3: cdf_os_mem_free_consistent(pdev->osdev, - pdev->rx_ring.size * sizeof(cdf_dma_addr_t), + pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, - cdf_get_dma_mem_context((&pdev->rx_ring.buf), + qdf_get_dma_mem_context((&pdev->rx_ring.buf), memctx)); fail2: @@ -2270,7 +2270,7 @@ fail2: sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, - cdf_get_dma_mem_context((&pdev-> + qdf_get_dma_mem_context((&pdev-> rx_ring. target_idx), memctx)); @@ -2306,11 +2306,11 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t), &pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx2_ind_ring_base), memctx)); if (!pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) { - cdf_print("%s: RX IND RING alloc fail", __func__); + qdf_print("%s: RX IND RING alloc fail", __func__); return -ENOBUFS; } @@ -2326,17 +2326,17 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, pdev->osdev, 4, &pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx), memctx)); if (!pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) { - cdf_print("%s: RX PROC DONE IND alloc fail", __func__); + qdf_print("%s: RX PROC DONE IND alloc fail", __func__); cdf_os_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx2_ind_ring_base), memctx)); return -ENOBUFS; @@ -2374,11 +2374,11 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t), &pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ind_ring_base), memctx)); if (!pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) { - cdf_print("%s: RX IND RING alloc fail", __func__); + qdf_print("%s: RX IND RING alloc fail", __func__); return -ENOBUFS; } @@ -2394,17 +2394,17 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, pdev->osdev, 4, &pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx), memctx)); if (!pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) { - cdf_print("%s: RX PROC DONE IND alloc fail", __func__); + qdf_print("%s: RX PROC DONE IND alloc fail", __func__); cdf_os_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ind_ring_base), memctx)); return -ENOBUFS; @@ -2430,7 +2430,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx2_ind_ring_base), memctx)); } @@ -2442,7 +2442,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx.vaddr, pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx), memctx)); } @@ -2462,7 +2462,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx_ind_ring_base), memctx)); } @@ -2474,7 +2474,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx.vaddr, pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. rx2_ipa_prc_done_idx), memctx)); } diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 05756de03bf1..dc01ab8a4161 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -124,11 +124,11 @@ static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, cdf_nbuf_t msg) start_idx = pdev->rx_ring.sw_rd_idx.msdu_payld; msdu = pdev->rx_ring.buf.netbufs_ring[start_idx]; cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); rx_desc = htt_rx_desc(msdu); *((uint8_t *) &rx_desc->fw_desc.u.val) = *p_fw_msdu_rx_desc; rx_desc->msdu_end.last_msdu = 1; - cdf_nbuf_map(pdev->osdev, msdu, CDF_DMA_FROM_DEVICE); + cdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); } /* Target to host Msg/event handler for low priority messages*/ @@ -146,20 +146,20 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) cdf_runtime_pm_put(); pdev->tgt_ver.major = HTT_VER_CONF_MAJOR_GET(*msg_word); pdev->tgt_ver.minor = HTT_VER_CONF_MINOR_GET(*msg_word); - cdf_print + qdf_print ("target uses HTT version %d.%d; host uses %d.%d", pdev->tgt_ver.major, pdev->tgt_ver.minor, HTT_CURRENT_VERSION_MAJOR, HTT_CURRENT_VERSION_MINOR); if (pdev->tgt_ver.major != HTT_CURRENT_VERSION_MAJOR) - cdf_print + qdf_print ("*** Incompatible host/target HTT versions!"); /* abort if the target is incompatible with the host */ cdf_assert(pdev->tgt_ver.major == HTT_CURRENT_VERSION_MAJOR); if (pdev->tgt_ver.minor != HTT_CURRENT_VERSION_MINOR) { - cdf_print("*** Warning: host/target HTT versions are "); - cdf_print(" different, though compatible!"); + qdf_print("*** Warning: host/target HTT versions are "); + qdf_print(" different, though compatible!"); } break; } @@ -293,7 +293,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) cdf_runtime_pm_put(); HTT_TX_SCHED(pdev); } else { - cdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); + qdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); } break; } @@ -374,7 +374,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) (struct htt_wdi_ipa_op_response_t) + len); if (!op_msg_buffer) { - cdf_print("OPCODE messsage buffer alloc fail"); + qdf_print("OPCODE messsage buffer alloc fail"); break; } cdf_mem_copy(op_msg_buffer, @@ -435,7 +435,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) peer = ol_txrx_peer_find_by_id(pdev->txrx_pdev, peer_id); if (!peer) { - cdf_print("%s: invalid peer id %d\n", + qdf_print("%s: invalid peer id %d\n", __func__, peer_id); cdf_assert(0); break; @@ -461,7 +461,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) } default: { - cdf_print("%s: unhandled error type %d\n", + qdf_print("%s: unhandled error type %d\n", __func__, HTT_RX_OFLD_PKT_ERR_MSG_SUB_TYPE_GET(*msg_word)); break; @@ -497,7 +497,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) } #ifdef HTT_RX_RESTORE if (cdf_unlikely(pdev->rx_ring.rx_reset)) { - cdf_print("rx restore ..\n"); + qdf_print("rx restore ..\n"); cdf_nbuf_free(htt_t2h_msg); return; } @@ -510,7 +510,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s %d: msg_word 0x%x msg_type %d", + qdf_print("%s %d: msg_word 0x%x msg_type %d", __func__, __LINE__, *msg_word, msg_type); #endif @@ -523,15 +523,15 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) uint8_t tid; if (cdf_unlikely(pdev->cfg.is_full_reorder_offload)) { - cdf_print("HTT_T2H_MSG_TYPE_RX_IND not supported "); - cdf_print("with full reorder offload\n"); + qdf_print("HTT_T2H_MSG_TYPE_RX_IND not supported "); + qdf_print("with full reorder offload\n"); break; } peer_id = HTT_RX_IND_PEER_ID_GET(*msg_word); tid = HTT_RX_IND_EXT_TID_GET(*msg_word); if (tid >= OL_TXRX_NUM_EXT_TIDS) { - cdf_print("HTT_T2H_MSG_TYPE_RX_IND, invalid tid %d\n", + qdf_print("HTT_T2H_MSG_TYPE_RX_IND, invalid tid %d\n", tid); break; } @@ -650,9 +650,9 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) uint8_t offload_ind, frag_ind; if (cdf_unlikely(!pdev->cfg.is_full_reorder_offload)) { - cdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not "); - cdf_print("supported when full reorder offload is "); - cdf_print("disabled in the configuration.\n"); + qdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not "); + qdf_print("supported when full reorder offload is "); + qdf_print("disabled in the configuration.\n"); break; } @@ -662,7 +662,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) frag_ind = HTT_RX_IN_ORD_PADDR_IND_FRAG_GET(*msg_word); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s %d: peerid %d tid %d offloadind %d fragind %d\n", + qdf_print("%s %d: peerid %d tid %d offloadind %d fragind %d\n", __func__, __LINE__, peer_id, tid, offload_ind, frag_ind); #endif diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index d0255ca210fc..549b0ee062be 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -37,7 +37,7 @@ * tx frame to HTC. */ #include /* uint32_t, offsetof, etc. */ -#include /* cdf_dma_addr_t */ +#include /* qdf_dma_addr_t */ #include /* cdf_os_mem_alloc_consistent et al */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_mdelay */ @@ -83,7 +83,7 @@ do { \ uint32_t *g_dbg_htt_desc_end_addr, *g_dbg_htt_desc_start_addr; #endif -static cdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, +static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, char *target_vaddr); #ifdef HELIUMPLUS @@ -160,7 +160,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev, pdev->frag_descs.pool_elems = desc_pool_elems; cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->frag_descs.desc_pages, pdev->frag_descs.size, desc_pool_elems, - cdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); + qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); if ((0 == pdev->frag_descs.desc_pages.num_pages) || (NULL == pdev->frag_descs.desc_pages.dma_pages)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -181,7 +181,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev, static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev) { cdf_mem_multi_pages_free(pdev->osdev, &pdev->frag_descs.desc_pages, - cdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); + qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); } /** @@ -330,7 +330,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems) pool_size = pdev->tx_descs.pool_elems * pdev->tx_descs.size; cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_descs.desc_pages, pdev->tx_descs.size, pdev->tx_descs.pool_elems, - cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); + qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); if ((0 == pdev->tx_descs.desc_pages.num_pages) || (NULL == pdev->tx_descs.desc_pages.dma_pages)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -382,7 +382,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems) free_htt_desc: cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, - cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); + qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); out_fail: return -ENOBUFS; } @@ -390,13 +390,13 @@ out_fail: void htt_tx_detach(struct htt_pdev_t *pdev) { if (!pdev) { - cdf_print("htt tx detach invalid instance"); + qdf_print("htt tx detach invalid instance"); return; } htt_tx_frag_desc_detach(pdev); cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, - cdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); + qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); } /** @@ -407,7 +407,7 @@ void htt_tx_detach(struct htt_pdev_t *pdev) * * Return: Physical address of descriptor */ -static cdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, +static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, char *target_vaddr) { uint16_t i; @@ -646,7 +646,7 @@ htt_tx_resume_handler(void *context) { } cdf_nbuf_t htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) { - cdf_print("*** %s curently only applies for HL systems\n", __func__); + qdf_print("*** %s curently only applies for HL systems\n", __func__); cdf_assert(0); return head_msdu; @@ -821,28 +821,28 @@ void htt_tx_desc_display(void *tx_desc) htt_tx_desc = (struct htt_tx_msdu_desc_t *)tx_desc; /* only works for little-endian */ - cdf_print("HTT tx desc (@ %p):", htt_tx_desc); - cdf_print(" msg type = %d", htt_tx_desc->msg_type); - cdf_print(" pkt subtype = %d", htt_tx_desc->pkt_subtype); - cdf_print(" pkt type = %d", htt_tx_desc->pkt_type); - cdf_print(" vdev ID = %d", htt_tx_desc->vdev_id); - cdf_print(" ext TID = %d", htt_tx_desc->ext_tid); - cdf_print(" postponed = %d", htt_tx_desc->postponed); - cdf_print(" extension = %d", htt_tx_desc->extension); - cdf_print(" cksum_offload = %d", htt_tx_desc->cksum_offload); - cdf_print(" tx_compl_req= %d", htt_tx_desc->tx_compl_req); - cdf_print(" length = %d", htt_tx_desc->len); - cdf_print(" id = %d", htt_tx_desc->id); + qdf_print("HTT tx desc (@ %p):", htt_tx_desc); + qdf_print(" msg type = %d", htt_tx_desc->msg_type); + qdf_print(" pkt subtype = %d", htt_tx_desc->pkt_subtype); + qdf_print(" pkt type = %d", htt_tx_desc->pkt_type); + qdf_print(" vdev ID = %d", htt_tx_desc->vdev_id); + qdf_print(" ext TID = %d", htt_tx_desc->ext_tid); + qdf_print(" postponed = %d", htt_tx_desc->postponed); + qdf_print(" extension = %d", htt_tx_desc->extension); + qdf_print(" cksum_offload = %d", htt_tx_desc->cksum_offload); + qdf_print(" tx_compl_req= %d", htt_tx_desc->tx_compl_req); + qdf_print(" length = %d", htt_tx_desc->len); + qdf_print(" id = %d", htt_tx_desc->id); #if HTT_PADDR64 - cdf_print(" frag desc addr.lo = %#x", + qdf_print(" frag desc addr.lo = %#x", htt_tx_desc->frags_desc_ptr.lo); - cdf_print(" frag desc addr.hi = %#x", + qdf_print(" frag desc addr.hi = %#x", htt_tx_desc->frags_desc_ptr.hi); #else /* ! HTT_PADDR64 */ - cdf_print(" frag desc addr = %#x", htt_tx_desc->frags_desc_ptr); + qdf_print(" frag desc addr = %#x", htt_tx_desc->frags_desc_ptr); #endif /* HTT_PADDR64 */ - cdf_print(" peerid = %d", htt_tx_desc->peerid); - cdf_print(" chanfreq = %d", htt_tx_desc->chanfreq); + qdf_print(" peerid = %d", htt_tx_desc->peerid); + qdf_print(" chanfreq = %d", htt_tx_desc->chanfreq); } #endif @@ -866,7 +866,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, { unsigned int tx_buffer_count; cdf_nbuf_t buffer_vaddr; - cdf_dma_addr_t buffer_paddr; + qdf_dma_addr_t buffer_paddr; uint32_t *header_ptr; uint32_t *ring_vaddr; #define IPA_UC_TX_BUF_FRAG_DESC_OFFSET 16 @@ -879,7 +879,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, buffer_vaddr = cdf_nbuf_alloc(pdev->osdev, uc_tx_buf_sz, 0, 4, false); if (!buffer_vaddr) { - cdf_print("%s: TX BUF alloc fail, loop index: %d", + qdf_print("%s: TX BUF alloc fail, loop index: %d", __func__, tx_buffer_count); return tx_buffer_count; } @@ -896,7 +896,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, *header_ptr |= ((uint16_t) uc_tx_partition_base + tx_buffer_count) << 16; - cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; *header_ptr = (uint32_t) (buffer_paddr + @@ -939,7 +939,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, buffer_vaddr = cdf_nbuf_alloc(pdev->osdev, uc_tx_buf_sz, 0, 4, false); if (!buffer_vaddr) { - cdf_print("%s: TX BUF alloc fail, loop index: %d", + qdf_print("%s: TX BUF alloc fail, loop index: %d", __func__, tx_buffer_count); return tx_buffer_count; } @@ -956,7 +956,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, *header_ptr |= ((uint16_t) uc_tx_partition_base + tx_buffer_count) << 16; - cdf_nbuf_map(pdev->osdev, buffer_vaddr, CDF_DMA_BIDIRECTIONAL); + cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; @@ -1014,11 +1014,11 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, pdev->osdev, 4, &pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&pdev->ipa_uc_tx_rsc.tx_ce_idx), memctx)); if (!pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { - cdf_print("%s: CE Write Index WORD alloc fail", __func__); + qdf_print("%s: CE Write Index WORD alloc fail", __func__); return -ENOBUFS; } @@ -1029,11 +1029,11 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, pdev->osdev, tx_comp_ring_size, &pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. tx_comp_base), memctx)); if (!pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { - cdf_print("%s: TX COMP ring alloc fail", __func__); + qdf_print("%s: TX COMP ring alloc fail", __func__); return_code = -ENOBUFS; goto free_tx_ce_idx; } @@ -1045,7 +1045,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, (cdf_nbuf_t *) cdf_mem_malloc(uc_tx_buf_cnt * sizeof(cdf_nbuf_t)); if (!pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg) { - cdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__); + qdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__); return_code = -ENOBUFS; goto free_tx_comp_base; } @@ -1063,7 +1063,7 @@ free_tx_comp_base: tx_comp_ring_size, pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, - cdf_get_dma_mem_context((&pdev-> + qdf_get_dma_mem_context((&pdev-> ipa_uc_tx_rsc. tx_comp_base), memctx)); @@ -1072,7 +1072,7 @@ free_tx_ce_idx: 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, - cdf_get_dma_mem_context((&pdev-> + qdf_get_dma_mem_context((&pdev-> ipa_uc_tx_rsc. tx_ce_idx), memctx)); @@ -1089,7 +1089,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&pdev->ipa_uc_tx_rsc.tx_ce_idx), memctx)); } @@ -1100,7 +1100,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t), pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, - cdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. + qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. tx_comp_base), memctx)); } @@ -1111,7 +1111,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) cdf_nbuf_unmap(pdev->osdev, pdev->ipa_uc_tx_rsc. tx_buf_pool_vaddr_strg[idx], - CDF_DMA_FROM_DEVICE); + QDF_DMA_FROM_DEVICE); cdf_nbuf_free(pdev->ipa_uc_tx_rsc. tx_buf_pool_vaddr_strg[idx]); } @@ -1127,7 +1127,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) #if defined(FEATURE_TSO) void htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc, - struct cdf_tso_info_t *tso_info) + struct qdf_tso_info_t *tso_info) { u_int32_t *word; int i; diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 68a937c31157..0aa8fc26a4e1 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -29,7 +29,7 @@ #define _HTT_TYPES__H_ #include /* uint16_t, dma_addr_t */ -#include /* cdf_device_t */ +#include /* qdf_device_t */ #include /* cdf_spinlock_t */ #include /* qdf_timer_t */ #include /* qdf_atomic_inc */ @@ -122,8 +122,8 @@ struct htt_rx_hash_bucket { firmware shared memory structure */ struct uc_shared_mem_t { uint32_t *vaddr; - cdf_dma_addr_t paddr; - cdf_dma_mem_context(memctx); + qdf_dma_addr_t paddr; + qdf_dma_mem_context(memctx); }; /* Micro controller datapath offload @@ -149,13 +149,13 @@ struct htt_ipa_uc_tx_resource_t { * @rx2_ind_ring_size: rx process done ring size */ struct htt_ipa_uc_rx_resource_t { - cdf_dma_addr_t rx_rdy_idx_paddr; + qdf_dma_addr_t rx_rdy_idx_paddr; struct uc_shared_mem_t rx_ind_ring_base; struct uc_shared_mem_t rx_ipa_prc_done_idx; uint32_t rx_ind_ring_size; /* 2nd RX ring */ - cdf_dma_addr_t rx2_rdy_idx_paddr; + qdf_dma_addr_t rx2_rdy_idx_paddr; struct uc_shared_mem_t rx2_ind_ring_base; struct uc_shared_mem_t rx2_ipa_prc_done_idx; uint32_t rx2_ind_ring_size; @@ -168,7 +168,7 @@ struct htt_ipa_uc_rx_resource_t { * @rx_packet_leng: packet length */ struct ipa_uc_rx_ring_elem_t { - cdf_dma_addr_t rx_packet_paddr; + qdf_dma_addr_t rx_packet_paddr; uint32_t vdev_id; uint32_t rx_packet_leng; }; @@ -218,7 +218,7 @@ struct htt_pdev_t { ol_pdev_handle ctrl_pdev; ol_txrx_pdev_handle txrx_pdev; HTC_HANDLE htc_pdev; - cdf_device_t osdev; + qdf_device_t osdev; HTC_ENDPOINT_ID htc_endpoint; @@ -270,7 +270,7 @@ struct htt_pdev_t { #else /* ! HTT_PADDR64 */ uint32_t *paddrs_ring; #endif - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); } buf; /* * Base address of ring, as a "physical" device address rather @@ -294,7 +294,7 @@ struct htt_pdev_t { struct { uint32_t *vaddr; uint32_t paddr; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); } target_idx; /* @@ -310,7 +310,7 @@ struct htt_pdev_t { struct { uint32_t *vaddr; uint32_t paddr; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); } alloc_idx; /* sw_rd_idx - @@ -357,14 +357,14 @@ struct htt_pdev_t { uint16_t alloc_cnt; struct cdf_mem_multi_page_t desc_pages; uint32_t *freelist; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); } tx_descs; #if defined(HELIUMPLUS_PADDR64) struct { int size; /* of each Fragment/MSDU-Ext descriptor */ int pool_elems; struct cdf_mem_multi_page_t desc_pages; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); } frag_descs; #endif /* defined(HELIUMPLUS_PADDR64) */ diff --git a/core/dp/ol/inc/ol_cfg.h b/core/dp/ol/inc/ol_cfg.h index 4e59ea397d30..88224ccd812f 100644 --- a/core/dp/ol/inc/ol_cfg.h +++ b/core/dp/ol/inc/ol_cfg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,7 +28,7 @@ #ifndef _OL_CFG__H_ #define _OL_CFG__H_ -#include /* uint32_t */ +#include /* uint32_t */ #include /* ol_pdev_handle */ #include /* ieee80211_qosframe_htc_addr4 */ #include /* LLC_SNAP_HDR_LEN */ diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h index d8d2272f4643..0cf49b5ac212 100644 --- a/core/dp/ol/inc/ol_htt_api.h +++ b/core/dp/ol/inc/ol_htt_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,7 +35,7 @@ #ifndef _OL_HTT_API__H_ #define _OL_HTT_API__H_ -#include /* cdf_device_t */ +#include /* qdf_device_t */ #include /* cdf_nbuf_t */ #include /* A_STATUS */ #include /* HTC_HANDLE */ @@ -53,7 +53,7 @@ typedef struct htt_pdev_t *htt_pdev_handle; htt_pdev_handle htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, ol_pdev_handle ctrl_pdev, - HTC_HANDLE htc_pdev, cdf_device_t osdev); + HTC_HANDLE htc_pdev, qdf_device_t osdev); /** * @brief Allocate and initialize a HTT instance. @@ -218,25 +218,25 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev); int htt_ipa_uc_get_resource(htt_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx_paddr, + qdf_dma_addr_t *rx2_proc_done_idx_paddr, void **rx2_proc_done_idx_vaddr); int htt_ipa_uc_set_doorbell_paddr(htt_pdev_handle pdev, - cdf_dma_addr_t ipa_uc_tx_doorbell_paddr, - cdf_dma_addr_t ipa_uc_rx_doorbell_paddr); + qdf_dma_addr_t ipa_uc_tx_doorbell_paddr, + qdf_dma_addr_t ipa_uc_rx_doorbell_paddr); int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, bool uc_active, bool is_tx); @@ -280,19 +280,19 @@ static inline int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) */ static inline int htt_ipa_uc_get_resource(htt_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx_paddr, + qdf_dma_addr_t *rx2_proc_done_idx_paddr, void **rx2_proc_done_idx_vaddr) { return 0; diff --git a/core/dp/ol/inc/ol_htt_rx_api.h b/core/dp/ol/inc/ol_htt_rx_api.h index d94c707da432..230d87b4a1e8 100644 --- a/core/dp/ol/inc/ol_htt_rx_api.h +++ b/core/dp/ol/inc/ol_htt_rx_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -41,7 +41,7 @@ /* #include / * uint16_t, etc. * / */ #include /* uint16_t, etc. */ #include /* cdf_nbuf_t */ -#include /* bool */ +#include /* bool */ #include /* HTT_RX_IND_MPDU_STATUS */ #include /* htt_pdev_handle */ diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index b46f2ab72972..909267046d25 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -287,35 +287,35 @@ struct htt_msdu_info_t { static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "HTT MSDU info object (%p)\n", msdu_info); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " ethertype: %#x\n", msdu_info->info.ethertype); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " peer_id: %d\n", msdu_info->info.peer_id); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " vdev_id: %d\n", msdu_info->info.vdev_id); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " ext_tid: %d\n", msdu_info->info.ext_tid); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " l2_hdr_type: %d\n", msdu_info->info.l2_hdr_type); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " frame_type: %d\n", msdu_info->info.frame_type); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " frame_subtype: %d\n", msdu_info->info.frame_subtype); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " l3_hdr_offset: %u\n", msdu_info->info.l3_hdr_offset); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " use 6 Mbps: %d\n", msdu_info->action.use_6mbps); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " do_encrypt: %d\n", msdu_info->action.do_encrypt); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " do_tx_complete: %d\n", msdu_info->action.do_tx_complete); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); } @@ -533,7 +533,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, cdf_dma_addr_t htt_tx_desc_paddr, uint16_t msdu_id, cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info, - struct cdf_tso_info_t *tso_info, + struct qdf_tso_info_t *tso_info, struct ocb_tx_ctrl_hdr_t *tx_ctrl, uint8_t is_dsrc) { @@ -573,7 +573,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, ce_pkt_type = htt_to_ce_pkt_type[pkt_type]; if (0xffffffff == ce_pkt_type) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG, "Invalid HTT pkt type %d\n", pkt_type); return; } @@ -696,9 +696,9 @@ htt_tx_desc_init(htt_pdev_handle pdev, if (cdf_likely(pdev->cfg.ce_classify_enabled && (msdu_info->info.l2_hdr_type != htt_pkt_type_mgmt))) { uint32_t pkt_offset = cdf_nbuf_get_frag_len(msdu, 0); - data_attr = hw_classify << CDF_CE_TX_CLASSIFY_BIT_S; - data_attr |= ce_pkt_type << CDF_CE_TX_PKT_TYPE_BIT_S; - data_attr |= pkt_offset << CDF_CE_TX_PKT_OFFSET_BIT_S; + data_attr = hw_classify << QDF_CE_TX_CLASSIFY_BIT_S; + data_attr |= ce_pkt_type << QDF_CE_TX_PKT_TYPE_BIT_S; + data_attr |= pkt_offset << QDF_CE_TX_PKT_OFFSET_BIT_S; } cdf_nbuf_data_attr_set(msdu, data_attr); @@ -979,7 +979,7 @@ void htt_tx_desc_set_chanfreq(void *htt_tx_desc, uint16_t chanfreq) #if defined(FEATURE_TSO) void htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc, - struct cdf_tso_info_t *tso_info); + struct qdf_tso_info_t *tso_info); #else #define htt_tx_desc_fill_tso_info(pdev, desc, tso_info) #endif diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 88333fa6b0ef..f681c2917d6d 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -34,7 +34,7 @@ #include /* A_STATUS */ #include /* cdf_nbuf_t */ -#include /* cdf_device_t */ +#include /* qdf_device_t */ #include /* HTC_HANDLE */ #include /* ol_osif_vdev_handle */ @@ -139,7 +139,7 @@ enum netif_reason_type { ol_txrx_pdev_handle ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, - HTC_HANDLE htc_pdev, cdf_device_t osdev); + HTC_HANDLE htc_pdev, qdf_device_t osdev); /** * @brief Set up the data SW subsystem. @@ -897,7 +897,7 @@ struct txrx_pdev_cfg_param_t { * @param osdev - OS handle needed as an argument for some OS primitives * @return the control device object */ -ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev, +ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev, struct txrx_pdev_cfg_param_t cfg_param); QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); @@ -1092,26 +1092,26 @@ void ol_vdev_rx_set_intrabss_fwd(ol_txrx_vdev_handle vdev, bool val); #ifdef IPA_OFFLOAD void ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx_paddr, + qdf_dma_addr_t *rx2_proc_done_idx_paddr, void **rx2_proc_done_idx_vaddr); void ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t ipa_tx_uc_doorbell_paddr, - cdf_dma_addr_t ipa_rx_uc_doorbell_paddr); + qdf_dma_addr_t ipa_tx_uc_doorbell_paddr, + qdf_dma_addr_t ipa_rx_uc_doorbell_paddr); void ol_txrx_ipa_uc_set_active(ol_txrx_pdev_handle pdev, bool uc_active, bool is_tx); @@ -1151,19 +1151,19 @@ void ol_txrx_ipa_uc_get_stat(ol_txrx_pdev_handle pdev); */ static inline void ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx_paddr, + qdf_dma_addr_t *rx2_proc_done_idx_paddr, void **rx2_proc_done_idx_vaddr) { return; @@ -1182,8 +1182,8 @@ ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, */ static inline void ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t ipa_tx_uc_doorbell_paddr, - cdf_dma_addr_t ipa_rx_uc_doorbell_paddr) + qdf_dma_addr_t ipa_tx_uc_doorbell_paddr, + qdf_dma_addr_t ipa_rx_uc_doorbell_paddr) { return; } diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h index 09041cadf3ce..562167a116a0 100644 --- a/core/dp/ol/inc/ol_txrx_htt_api.h +++ b/core/dp/ol/inc/ol_txrx_htt_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -41,7 +41,7 @@ static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu) { cdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1)); - return (uint16_t *) (((cdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1); + return (uint16_t *) (((qdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1); } /** diff --git a/core/dp/ol/inc/ol_txrx_stats.h b/core/dp/ol/inc/ol_txrx_stats.h index 44b384d5b245..4a98a832818f 100644 --- a/core/dp/ol/inc/ol_txrx_stats.h +++ b/core/dp/ol/inc/ol_txrx_stats.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -50,7 +50,7 @@ struct ol_txrx_stats_elem { #define NUM_MAX_TSO_MSDUS_MASK (NUM_MAX_TSO_MSDUS - 1) struct ol_txrx_stats_tso_msdu { - struct cdf_tso_seg_t tso_segs[NUM_MAX_TSO_SEGS]; + struct qdf_tso_seg_t tso_segs[NUM_MAX_TSO_SEGS]; uint32_t num_seg; uint32_t tso_seg_idx; }; diff --git a/core/dp/txrx/ol_cfg.c b/core/dp/txrx/ol_cfg.c index c921e2dddaf9..29e4c1b345ce 100644 --- a/core/dp/txrx/ol_cfg.c +++ b/core/dp/txrx/ol_cfg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -75,7 +75,7 @@ uint8_t ol_defrag_timeout_check(void) * Many of these should actually be determined dynamically instead. */ -ol_pdev_handle ol_pdev_cfg_attach(cdf_device_t osdev, +ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev, struct txrx_pdev_cfg_param_t cfg_param) { struct txrx_pdev_cfg_t *cfg_ctx; diff --git a/core/dp/txrx/ol_osif_txrx_api.h b/core/dp/txrx/ol_osif_txrx_api.h index b47a0b6cdbbf..2014d4f407c5 100644 --- a/core/dp/txrx/ol_osif_txrx_api.h +++ b/core/dp/txrx/ol_osif_txrx_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,6 +46,6 @@ * @param osdev */ -void ol_osif_ath_tasklet(cdf_device_t osdev); +void ol_osif_ath_tasklet(qdf_device_t osdev); #endif /* _OL_OSIF_TXRX_API_H_ */ diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 310d13d842cb..ba1ed60b7645 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -27,7 +27,7 @@ #include /* cdf_nbuf_t, etc. */ #include /* cdf_os_cpu_to_le64 */ -#include /* bool */ +#include /* bool */ #include /* ieee80211_frame */ /* external API header files */ @@ -75,10 +75,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, static void ol_rx_restore_handler(struct work_struct *htt_rx) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cnss_device_self_recovery(); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "Exit: %s", __func__); } @@ -91,7 +91,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu, while (head_msdu) { next = cdf_nbuf_next(head_msdu); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "freeing %p\n", head_msdu); cdf_nbuf_free(head_msdu); head_msdu = next; @@ -1126,7 +1126,7 @@ DONE: type 0x8152 and push that to the front of the packet to indicate the RX stats header. */ - eth_header.ether_type = CDF_SWAP_U16( + eth_header.ether_type = QDF_SWAP_U16( ETHERTYPE_OCB_RX); cdf_nbuf_push_head(msdu, sizeof(eth_header)); @@ -1248,7 +1248,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, } #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s %d: rx_ind_msg 0x%p peer_id %d tid %d is_offload %d\n", + qdf_print("%s %d: rx_ind_msg 0x%p peer_id %d tid %d is_offload %d\n", __func__, __LINE__, rx_ind_msg, peer_id, tid, is_offload); #endif diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h index 512fa5dacb2c..85193ff33c6d 100644 --- a/core/dp/txrx/ol_rx_defrag.h +++ b/core/dp/txrx/ol_rx_defrag.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -125,9 +125,9 @@ ol_rx_reorder_flush_frag(htt_pdev_handle htt_pdev, struct ol_txrx_peer_t *peer, unsigned tid, int seq_num); -static inline void xor_block(uint8_t *b, const uint8_t *a, cdf_size_t len) +static inline void xor_block(uint8_t *b, const uint8_t *a, qdf_size_t len) { - cdf_size_t i; + qdf_size_t i; for (i = 0; i < len; i++) b[i] ^= a[i]; diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index e97f34f05717..64c700b3ed45 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/core/dp/txrx/ol_rx_fwd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -118,7 +118,7 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) * Map the netbuf, so it's accessible to the DMA that * sends it to the target. */ - cdf_nbuf_map_single(pdev->osdev, msdu, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); cdf_nbuf_set_next(msdu, NULL); /* add NULL terminator */ msdu = OL_TX_LL(vdev, msdu); @@ -129,7 +129,7 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) * We could store the frame and try again later, * but the simplest solution is to discard the frames. */ - cdf_nbuf_unmap_single(pdev->osdev, msdu, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); cdf_nbuf_tx_free(msdu, NBUF_PKT_ERROR); } } diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index a37125ae79a0..8740f79e58b8 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -329,12 +329,12 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once) } i = start; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " seq PN"); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " count idx peer tid uni num LSBs"); do { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " %6lld %4d %p %2d %d %4d %8d", cnt, i, pdev->rx_pn_trace.data[i].peer, diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index e6f3c1634998..debe0c493873 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -798,22 +798,22 @@ ol_rx_reorder_trace_display(ol_txrx_pdev_handle pdev, int just_once, int limit) } i = start; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " log array seq"); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " count idx tid idx num (LSBs)"); do { uint16_t seq_num, reorder_idx; seq_num = pdev->rx_reorder_trace.data[i].seq_num; reorder_idx = pdev->rx_reorder_trace.data[i].reorder_idx; if (seq_num < (1 << 14)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " %6lld %4d %3d %4d %4d (%d)", cnt, i, pdev->rx_reorder_trace.data[i].tid, reorder_idx, seq_num, seq_num & 63); } else { int err = TXRX_SEQ_NUM_ERR(seq_num); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " %6lld %4d err %d (%d MPDUs)", cnt, i, err, pdev->rx_reorder_trace.data[i].num_mpdus); diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index f908bd65b9b2..877516ae7a1c 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -172,7 +172,7 @@ void ol_rx_reorder_timeout_init(struct ol_txrx_pdev_t *pdev) { int i; - for (i = 0; i < CDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats); + for (i = 0; i < QDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats); i++) { struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac; rx_reorder_timeout_ac = @@ -206,7 +206,7 @@ void ol_rx_reorder_timeout_cleanup(struct ol_txrx_pdev_t *pdev) { int i; - for (i = 0; i < CDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats); + for (i = 0; i < QDF_ARRAY_SIZE(pdev->rx.reorder_timeout.access_cats); i++) { struct ol_tx_reorder_cat_timeout_t *rx_reorder_timeout_ac; rx_reorder_timeout_ac = diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 3ac0976aac65..71a1252155c9 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -111,7 +111,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, struct cdf_tso_seg_elem_t *next_seg; struct cdf_tso_seg_elem_t *free_seg = msdu_info->tso_info.tso_seg_list; - cdf_print("TSO seg alloc failed!\n"); + qdf_print("TSO seg alloc failed!\n"); while (free_seg) { next_seg = free_seg->next; ol_tso_free_segment(vdev->pdev, @@ -145,14 +145,14 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, uint8_t proto_type) { - void *cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_txrx_peer_t *peer; cdf_nbuf_t ret; QDF_STATUS status; if (cdf_unlikely(!pdev)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s:pdev is null", __func__); return skb; } @@ -163,27 +163,27 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, } if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s:Invalid sta id", __func__); return skb; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s:Invalid peer", __func__); return skb; } if (peer->state < ol_txrx_peer_state_conn) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: station to be yet registered..dropping pkt", __func__); return skb; } - status = cdf_nbuf_map_single(cdf_ctx, skb, CDF_DMA_TO_DEVICE); + status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE); if (cdf_unlikely(status != QDF_STATUS_SUCCESS)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; } @@ -199,9 +199,9 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, cdf_nbuf_set_next(skb, NULL); ret = OL_TX_LL(peer->vdev, skb); if (ret) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: Failed to tx", __func__); - cdf_nbuf_unmap_single(cdf_ctx, ret, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(cdf_ctx, ret, QDF_DMA_TO_DEVICE); return ret; } @@ -219,7 +219,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, cdf_nbuf_t skb) { - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); cdf_nbuf_t ret; if (cdf_unlikely(!pdev)) { @@ -270,7 +270,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.peer = NULL; if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { - cdf_print("ol_tx_prepare_tso failed\n"); + qdf_print("ol_tx_prepare_tso failed\n"); TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, tx.dropped.host_reject, msdu); return msdu; @@ -460,7 +460,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, msdu_info->tso_info.curr_seg->seg); } else { for (i = 1; i < num_frags; i++) { - cdf_size_t frag_len; + qdf_size_t frag_len; cdf_dma_addr_t frag_paddr; frag_len = cdf_nbuf_get_frag_len(msdu, i); @@ -469,7 +469,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu", + qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_paddr=0x%0llx len=%zu", __func__, __LINE__, tx_desc->htt_frag_desc, i-1, frag_paddr, frag_len); dump_pkt(netbuf, frag_paddr, 64); @@ -540,7 +540,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.peer = NULL; if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { - cdf_print("ol_tx_prepare_tso failed\n"); + qdf_print("ol_tx_prepare_tso failed\n"); TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, tx.dropped.host_reject, msdu); return msdu; @@ -732,7 +732,7 @@ static inline cdf_nbuf_t ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) { struct hif_opaque_softc *hif_device = - (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); + (struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF); if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device))) msdu_list = ol_tx_ll_fast(vdev, msdu_list); @@ -800,7 +800,7 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) */ if (tx_msdu) { cdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_tx_free(tx_msdu, NBUF_PKT_ERROR); } } @@ -979,7 +979,7 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) */ if (tx_msdu) { cdf_nbuf_unmap(pdev->osdev, tx_msdu, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_tx_free(tx_msdu, NBUF_PKT_ERROR); } @@ -1137,7 +1137,7 @@ bool parse_ocb_tx_header(cdf_nbuf_t msdu, /* Check if TX control header is present */ eth_hdr_p = (struct ether_header *) cdf_nbuf_data(msdu); - if (eth_hdr_p->ether_type != CDF_SWAP_U16(ETHERTYPE_OCB_TX)) + if (eth_hdr_p->ether_type != QDF_SWAP_U16(ETHERTYPE_OCB_TX)) /* TX control header is not present. Nothing to do.. */ return true; @@ -1195,11 +1195,11 @@ void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) uint32_t *frag_ptr_i_p; int i; - cdf_print("OL TX Descriptor 0x%p msdu_id %d\n", + qdf_print("OL TX Descriptor 0x%p msdu_id %d\n", tx_desc, tx_desc->id); - cdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%llx", + qdf_print("HTT TX Descriptor vaddr: 0x%p paddr: 0x%llx", tx_desc->htt_tx_desc, tx_desc->htt_tx_desc_paddr); - cdf_print("%s %d: Fragment Descriptor 0x%p (paddr=0x%llx)", + qdf_print("%s %d: Fragment Descriptor 0x%p (paddr=0x%llx)", __func__, __LINE__, tx_desc->htt_frag_desc, tx_desc->htt_frag_desc_paddr); /* it looks from htt_tx_desc_frag() that tx_desc->htt_frag_desc @@ -1287,7 +1287,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, tx_msdu_info.peer = NULL; - cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE); /* For LL tx_comp_req is not used so initialized to 0 */ tx_msdu_info.htt.action.tx_comp_req = 0; tx_desc = ol_tx_desc_ll(pdev, vdev, tx_mgmt_frm, &tx_msdu_info); @@ -1320,7 +1320,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, } if (!tx_desc) { cdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); return -EINVAL; /* can't accept the tx mgmt frame */ } TXRX_STATS_MSDU_INCR(pdev, tx.mgmt, tx_mgmt_frm); diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index a6aba47641f1..5f405f1dd8ec 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -233,7 +233,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) if (tx_desc->pkt_type == ol_tx_frm_tso) { if (cdf_unlikely(tx_desc->tso_desc == NULL)) { - cdf_print("%s %d TSO desc is NULL!\n", + qdf_print("%s %d TSO desc is NULL!\n", __func__, __LINE__); cdf_assert(0); } else { @@ -262,7 +262,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) #if defined(FEATURE_TSO) if (tx_desc->pkt_type == ol_tx_frm_tso) { if (cdf_unlikely(tx_desc->tso_desc == NULL)) - cdf_print("%s %d TSO desc is NULL!\n", + qdf_print("%s %d TSO desc is NULL!\n", __func__, __LINE__); else ol_tso_free_segment(pdev, tx_desc->tso_desc); @@ -286,7 +286,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) if (pool->avail_desc == pool->flow_pool_size) { cdf_spin_unlock_bh(&pool->flow_pool_lock); ol_tx_free_invalid_flow_pool(pool); - cdf_print("%s %d pool is INVALID State!!\n", + qdf_print("%s %d pool is INVALID State!!\n", __func__, __LINE__); return; } @@ -294,7 +294,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) case FLOW_POOL_ACTIVE_UNPAUSED: break; default: - cdf_print("%s %d pool is INACTIVE State!!\n", + qdf_print("%s %d pool is INACTIVE State!!\n", __func__, __LINE__); break; }; @@ -309,7 +309,7 @@ dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); void dump_pkt(cdf_nbuf_t nbuf, cdf_dma_addr_t nbuf_paddr, int len) { - cdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, + qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, cdf_nbuf_data(nbuf), nbuf_paddr, len); print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4, cdf_nbuf_data(nbuf), len, true); @@ -404,7 +404,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, msdu_info->tso_info.curr_seg->seg); } else { for (i = 1; i < num_frags; i++) { - cdf_size_t frag_len; + qdf_size_t frag_len; cdf_dma_addr_t frag_paddr; #ifdef HELIUMPLUS_DEBUG void *frag_vaddr; @@ -416,7 +416,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n", + qdf_print("%s:%d: htt_fdesc=%p frag=%d frag_vaddr=0x%p frag_paddr=0x%llx len=%zu\n", __func__, __LINE__, tx_desc->htt_frag_desc, i-1, frag_vaddr, frag_paddr, frag_len); dump_pkt(netbuf, frag_paddr, 64); @@ -448,7 +448,7 @@ void ol_tx_desc_frame_list_free(struct ol_txrx_pdev_t *pdev, /* restore original hdr offset */ OL_TX_RESTORE_HDR(tx_desc, msdu); #endif - cdf_nbuf_unmap(pdev->osdev, msdu, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); /* free the tx desc */ ol_tx_desc_free(pdev, tx_desc); /* link the netbuf into a list to free as a batch */ @@ -484,7 +484,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, } /* let the code below unmap and free the frame */ } - cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE); /* check the frame type to see what kind of special steps are needed */ if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) && (tx_desc->pkt_type != 0xff)) { @@ -502,7 +502,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, * table pointer needs to be reset. */ #if defined(HELIUMPLUS_DEBUG) - cdf_print("%s %d: Frag Descriptor Reset [%d] to 0x%x\n", + qdf_print("%s %d: Frag Descriptor Reset [%d] to 0x%x\n", __func__, __LINE__, tx_desc->id, frag_desc_paddr); #endif /* HELIUMPLUS_DEBUG */ diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index b60789c16fe3..ffc8de1277fb 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -39,7 +39,7 @@ #include /* ol_tx_vdev_ll_pause_queue_send */ #include #include /* ENABLE_TX_QUEUE_LOG */ -#include /* bool */ +#include /* bool */ #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) @@ -96,7 +96,7 @@ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); cdf_nbuf_unmap(vdev->pdev->osdev, vdev->ll_pause.txq.head, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_tx_free(vdev->ll_pause.txq.head, NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; @@ -414,13 +414,13 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev) qdf_timer_init(pdev->osdev, &pdev->tx_throttle.phase_timer, ol_tx_pdev_throttle_phase_timer, pdev, - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL qdf_timer_init(pdev->osdev, &pdev->tx_throttle.tx_timer, ol_tx_pdev_throttle_tx_timer, pdev, - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); #endif pdev->tx_throttle.tx_threshold = THROTTLE_TX_THRESHOLD; diff --git a/core/dp/txrx/ol_tx_queue.h b/core/dp/txrx/ol_tx_queue.h index be809134a1c0..5da4b9f3fcea 100644 --- a/core/dp/txrx/ol_tx_queue.h +++ b/core/dp/txrx/ol_tx_queue.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -34,7 +34,7 @@ #include /* cdf_nbuf_t */ #include /* ol_txrx_vdev_t, etc. */ -#include /* bool */ +#include /* bool */ /*--- function prototypes for optional queue log feature --------------------*/ #if defined(ENABLE_TX_QUEUE_LOG) diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 6ab22acf34cb..4e618f7161d8 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -363,7 +363,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, qdf_atomic_init(&(_tx_desc)->ref_cnt); \ /* restore orginal hdr offset */ \ OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \ - cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), CDF_DMA_TO_DEVICE); \ + cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ cdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ @@ -379,7 +379,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, do { \ /* restore orginal hdr offset */ \ OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \ - cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), CDF_DMA_TO_DEVICE); \ + cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ cdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ @@ -776,7 +776,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev, } else if (pdev->frame_format == wlan_frm_fmt_802_3) { hdr_ptr = datap; } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid standard frame type: %d", pdev->frame_format); cdf_assert(0); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 6dbf31c04b7e..219a41d8a05a 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -29,7 +29,7 @@ /* header files for OS primitives */ #include /* uint32_t, etc. */ #include /* cdf_mem_malloc,free */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ #include /* cdf_spinlock */ #include /* qdf_atomic_read */ @@ -89,9 +89,9 @@ */ void ol_tx_set_is_mgmt_over_wmi_enabled(uint8_t value) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - cdf_print("%s: pdev is NULL\n", __func__); + qdf_print("%s: pdev is NULL\n", __func__); return; } pdev->is_mgmt_over_wmi_enabled = value; @@ -105,9 +105,9 @@ void ol_tx_set_is_mgmt_over_wmi_enabled(uint8_t value) */ uint8_t ol_tx_get_is_mgmt_over_wmi_enabled(void) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - cdf_print("%s: pdev is NULL\n", __func__); + qdf_print("%s: pdev is NULL\n", __func__); return 0; } return pdev->is_mgmt_over_wmi_enabled; @@ -133,7 +133,7 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) { if (!peer) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "peer argument is null!!"); return QDF_STATUS_E_FAILURE; } @@ -148,21 +148,21 @@ void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id) ol_txrx_pdev_handle pdev = NULL; if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid sta id passed"); return NULL; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "PDEV not found for sta_id [%d]", sta_id); return NULL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "PEER [%d] not found", sta_id); return NULL; } @@ -311,9 +311,9 @@ static inline void setup_fastpath_ce_handles(struct hif_opaque_softc *osc, */ void ol_tx_set_desc_global_pool_size(uint32_t num_msdu_desc) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - cdf_print("%s: pdev is NULL\n", __func__); + qdf_print("%s: pdev is NULL\n", __func__); return; } pdev->num_msdu_desc = num_msdu_desc; @@ -399,7 +399,7 @@ uint32_t ol_tx_get_total_free_desc(struct ol_txrx_pdev_t *pdev) */ ol_txrx_pdev_handle ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, - HTC_HANDLE htc_pdev, cdf_device_t osdev) + HTC_HANDLE htc_pdev, qdf_device_t osdev) { struct ol_txrx_pdev_t *pdev; int i; @@ -500,7 +500,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) uint16_t fail_idx = 0; int ret = 0; uint16_t desc_pool_size; - struct hif_opaque_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *osc = cds_get_context(QDF_MODULE_ID_HIF); uint16_t desc_element_size = sizeof(union ol_tx_desc_list_elem_t); union ol_tx_desc_list_elem_t *c_element; @@ -555,7 +555,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true); if ((0 == pdev->tx_desc.desc_pages.num_pages) || (NULL == pdev->tx_desc.desc_pages.cacheable_pages)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Page alloc fail"); goto page_alloc_fail; } @@ -568,7 +568,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) desc_per_page = desc_per_page >> 1; } pdev->tx_desc.page_divider = (sig_bit - 1); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "page_divider 0x%x, offset_filter 0x%x num elem %d, ol desc num page %d, ol desc per page %d", pdev->tx_desc.page_divider, pdev->tx_desc.offset_filter, desc_pool_size, pdev->tx_desc.desc_pages.num_pages, @@ -588,8 +588,8 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) for (i = 0; i < desc_pool_size; i++) { void *htt_tx_desc; void *htt_frag_desc = NULL; - cdf_dma_addr_t frag_paddr = 0; - cdf_dma_addr_t paddr; + qdf_dma_addr_t frag_paddr = 0; + qdf_dma_addr_t paddr; if (i == (desc_pool_size - 1)) c_element->next = NULL; @@ -599,7 +599,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr, i); if (!htt_tx_desc) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "%s: failed to alloc HTT tx desc (%d of %d)", __func__, i, desc_pool_size); fail_idx = i; @@ -611,7 +611,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ret = htt_tx_frag_alloc(pdev->htt_pdev, i, &frag_paddr, &htt_frag_desc); if (ret) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: failed to alloc HTT frag dsc (%d/%d)", __func__, i, desc_pool_size); /* Is there a leak here, is this handling correct? */ @@ -625,7 +625,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) c_element->tx_desc.htt_frag_desc = htt_frag_desc; c_element->tx_desc.htt_frag_desc_paddr = frag_paddr; } - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%s:%d - %d FRAG VA 0x%p FRAG PA 0x%llx", __func__, __LINE__, i, c_element->tx_desc.htt_frag_desc, @@ -660,7 +660,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) else pdev->htt_pkt_type = htt_pkt_type_ethernet; } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s Invalid standard frame type: %d", __func__, pdev->frame_format); goto control_init_fail; @@ -727,7 +727,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ? 0 : 1; break; default: - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid std frame type; [en/de]cap: f:%x t:%x r:%x", pdev->frame_format, pdev->target_tx_tran_caps, pdev->target_rx_tran_caps); @@ -777,7 +777,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) } else { #define TRACESTR01 "invalid config: if rx PN check is on the host,"\ "rx->tx forwarding check needs to also be on the host" - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: %s", __func__, TRACESTR01); #undef TRACESTR01 @@ -961,7 +961,7 @@ A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle pdev) void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) { int i; - struct hif_opaque_softc *osc = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *osc = cds_get_context(QDF_MODULE_ID_HIF); /*checking to ensure txrx pdev structure is not NULL */ if (!pdev) { @@ -1111,7 +1111,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, qdf_timer_init(pdev->osdev, &vdev->ll_pause.timer, ol_tx_vdev_ll_pause_queue_send, vdev, - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); qdf_atomic_init(&vdev->os_q_paused); qdf_atomic_set(&vdev->os_q_paused, 0); vdev->tx_fl_lwm = 0; @@ -1622,7 +1622,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev, } default: { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "ERROR: unknown param %d in %s", select, __func__); break; @@ -1892,7 +1892,7 @@ static void ol_txrx_dump_tx_desc(ol_txrx_pdev_handle pdev_handle) */ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) { - ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (txrx_pdev == NULL) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -1976,11 +1976,11 @@ unsigned g_txrx_print_level = TXRX_PRINT_LEVEL_ERR; /* default */ void ol_txrx_print_level_set(unsigned level) { #ifndef TXRX_PRINT_ENABLE - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "The driver is compiled without TXRX prints enabled.\n" "To enable them, recompile with TXRX_PRINT_ENABLE defined"); #else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "TXRX printout level changed from %d to %d", g_txrx_print_level, level); g_txrx_print_level = level; @@ -2263,7 +2263,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(TXRX_DEBUG_LEVEL) && TXRX_DEBUG_LEVEL > 5 ol_txrx_pdev_display(vdev->pdev, 0); #else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "The pdev,vdev,peer display functions are disabled.\n" "To enable them, recompile with TXRX_DEBUG_LEVEL > 5"); #endif @@ -2275,7 +2275,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(ENABLE_TXRX_PROT_ANALYZE) ol_txrx_prot_ans_display(vdev->pdev); #else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "txrx protocol analysis is disabled.\n" "To enable it, recompile with " "ENABLE_TXRX_PROT_ANALYZE defined"); @@ -2285,7 +2285,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(ENABLE_RX_REORDER_TRACE) ol_rx_reorder_trace_display(vdev->pdev, 0, 0); #else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, "rx reorder seq num trace is disabled.\n" "To enable it, recompile with " "ENABLE_RX_REORDER_TRACE defined"); @@ -2308,20 +2308,20 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent) { struct ol_txrx_vdev_t *vdev; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*s%s:\n", indent, " ", "txrx pdev"); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*spdev object: %p", indent + 4, " ", pdev); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*svdev list:", indent + 4, " "); TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { ol_txrx_vdev_display(vdev, indent + 8); } ol_txrx_peer_find_display(pdev, indent + 4); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*stx desc pool: %d elems @ %p", indent + 4, " ", pdev->tx_desc.pool_size, pdev->tx_desc.array); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " "); + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " "); htt_display(pdev->htt_pdev, indent); } @@ -2329,17 +2329,17 @@ void ol_txrx_vdev_display(ol_txrx_vdev_handle vdev, int indent) { struct ol_txrx_peer_t *peer; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*stxrx vdev: %p\n", indent, " ", vdev); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*sID: %d\n", indent + 4, " ", vdev->vdev_id); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*sMAC addr: %d:%d:%d:%d:%d:%d", indent + 4, " ", vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*speer list:", indent + 4, " "); TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) { ol_txrx_peer_display(peer, indent + 8); @@ -2350,11 +2350,11 @@ void ol_txrx_peer_display(ol_txrx_peer_handle peer, int indent) { int i; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*stxrx peer: %p", indent, " ", peer); for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) { if (peer->peer_ids[i] != HTT_INVALID_PEER) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*sID: %d", indent + 4, " ", peer->peer_ids[i]); } @@ -2368,13 +2368,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) int msdu_idx; int seg_idx; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "TSO pkts %lld, bytes %lld\n", pdev->stats.pub.tx.tso.tso_pkts.pkts, pdev->stats.pub.tx.tso.tso_pkts.bytes); for (msdu_idx = 0; msdu_idx < NUM_MAX_TSO_MSDUS; msdu_idx++) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "curr msdu idx: %d curr seg idx: %d num segs %d\n", TXRX_STATS_TSO_MSDU_IDX(pdev), TXRX_STATS_TSO_SEG_IDX(pdev), @@ -2383,16 +2383,16 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) ((seg_idx < TXRX_STATS_TSO_MSDU_NUM_SEG(pdev, msdu_idx)) && (seg_idx < NUM_MAX_TSO_SEGS)); seg_idx++) { - struct cdf_tso_seg_t tso_seg = + struct qdf_tso_seg_t tso_seg = TXRX_STATS_TSO_SEG(pdev, msdu_idx, seg_idx); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "msdu idx: %d seg idx: %d\n", msdu_idx, seg_idx); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "tso_enable: %d\n", tso_seg.tso_flags.tso_enable); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "fin %d syn %d rst %d psh %d ack %d\n" "urg %d ece %d cwr %d ns %d\n", tso_seg.tso_flags.fin, tso_seg.tso_flags.syn, @@ -2400,7 +2400,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) tso_seg.tso_flags.ack, tso_seg.tso_flags.urg, tso_seg.tso_flags.ece, tso_seg.tso_flags.cwr, tso_seg.tso_flags.ns); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "tcp_seq_num: 0x%x ip_id: %d\n", tso_seg.tso_flags.tcp_seq_num, tso_seg.tso_flags.ip_id); @@ -2410,7 +2410,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) #else void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "TSO is not supported\n"); } #endif @@ -2430,7 +2430,7 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len) ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (!vdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: vdev is NULL", __func__); snprintf(buffer, buf_len, "vdev not found"); return len; @@ -2453,8 +2453,8 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len) void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:"); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:"); + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, " tx: sent %lld msdus (%lld B), " " rejected %lld (%lld B), dropped %lld (%lld B)", pdev->stats.pub.tx.delivered.pkts, @@ -2467,7 +2467,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.dropped.download_fail.bytes + pdev->stats.pub.tx.dropped.target_discard.bytes + pdev->stats.pub.tx.dropped.no_ack.bytes); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, " download fail: %lld (%lld B), " "target discard: %lld (%lld B), " "no ack: %lld (%lld B)", @@ -2477,7 +2477,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.dropped.target_discard.bytes, pdev->stats.pub.tx.dropped.no_ack.pkts, pdev->stats.pub.tx.dropped.no_ack.bytes); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Tx completion per interrupt:\n" "Single Packet %d\n" " 2-10 Packets %d\n" @@ -2495,7 +2495,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.comp_histogram.pkts_41_50, pdev->stats.pub.tx.comp_histogram.pkts_51_60, pdev->stats.pub.tx.comp_histogram.pkts_61_plus); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, " rx: %lld ppdus, %lld mpdus, %lld msdus, %lld bytes, %lld errs", pdev->stats.priv.rx.normal.ppdus, pdev->stats.priv.rx.normal.mpdus, @@ -2503,7 +2503,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.rx.delivered.bytes, pdev->stats.priv.rx.err.mpdu_bad); - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, " fwd to stack %d, fwd to fw %d, fwd to stack & fw %d\n", pdev->stats.pub.rx.intra_bss_fwd.packets_stack, pdev->stats.pub.rx.intra_bss_fwd.packets_fwd, @@ -2569,14 +2569,14 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id) ol_txrx_pdev_handle pdev = NULL; if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid sta id passed"); return NULL; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "PDEV not found for sta_id [%d]", sta_id); return NULL; } @@ -2584,7 +2584,7 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id) peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "PEER [%d] not found", sta_id); return NULL; } @@ -2606,7 +2606,7 @@ int ol_txrx_register_tx_flow_control (uint8_t vdev_id, { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id %d", __func__, vdev_id); return -EINVAL; } @@ -2628,7 +2628,7 @@ int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id) { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id", __func__); return -EINVAL; } @@ -2655,7 +2655,7 @@ ol_txrx_get_tx_resource(uint8_t sta_id, { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_sta_id(sta_id); if (NULL == vdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid sta_id %d", __func__, sta_id); /* Return true so caller do not understand that resource * is less than low_watermark. @@ -2692,7 +2692,7 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth) { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id %d", __func__, vdev_id); return -EINVAL; } @@ -2750,19 +2750,19 @@ inline void ol_txrx_flow_control_cb(ol_txrx_vdev_handle vdev, */ void ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t *ce_sr_base_paddr, + qdf_dma_addr_t *ce_sr_base_paddr, uint32_t *ce_sr_ring_size, - cdf_dma_addr_t *ce_reg_paddr, - cdf_dma_addr_t *tx_comp_ring_base_paddr, + qdf_dma_addr_t *ce_reg_paddr, + qdf_dma_addr_t *tx_comp_ring_base_paddr, uint32_t *tx_comp_ring_size, uint32_t *tx_num_alloc_buffer, - cdf_dma_addr_t *rx_rdy_ring_base_paddr, + qdf_dma_addr_t *rx_rdy_ring_base_paddr, uint32_t *rx_rdy_ring_size, - cdf_dma_addr_t *rx_proc_done_idx_paddr, + qdf_dma_addr_t *rx_proc_done_idx_paddr, void **rx_proc_done_idx_vaddr, - cdf_dma_addr_t *rx2_rdy_ring_base_paddr, + qdf_dma_addr_t *rx2_rdy_ring_base_paddr, uint32_t *rx2_rdy_ring_size, - cdf_dma_addr_t *rx2_proc_done_idx2_paddr, + qdf_dma_addr_t *rx2_proc_done_idx2_paddr, void **rx2_proc_done_idx2_vaddr) { htt_ipa_uc_get_resource(pdev->htt_pdev, @@ -2793,8 +2793,8 @@ ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, */ void ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev, - cdf_dma_addr_t ipa_tx_uc_doorbell_paddr, - cdf_dma_addr_t ipa_rx_uc_doorbell_paddr) + qdf_dma_addr_t ipa_tx_uc_doorbell_paddr, + qdf_dma_addr_t ipa_rx_uc_doorbell_paddr) { htt_ipa_uc_set_doorbell_paddr(pdev->htt_pdev, ipa_tx_uc_doorbell_paddr, @@ -2833,7 +2833,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; if (cdf_unlikely(!pdev)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); cdf_mem_free(rxpkt); return; @@ -2842,7 +2842,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, if (pdev->ipa_uc_op_cb) { pdev->ipa_uc_op_cb(rxpkt, pdev->osif_dev); } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: ipa_uc_op_cb NULL", __func__); cdf_mem_free(rxpkt); } @@ -2866,7 +2866,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg) pkt = cds_alloc_ol_rx_pkt(sched_ctx); if (cdf_unlikely(!pkt)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; } @@ -2884,7 +2884,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, if (pdev->ipa_uc_op_cb) { pdev->ipa_uc_op_cb(op_msg, pdev->osif_dev); } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: IPA callback function is not registered", __func__); cdf_mem_free(op_msg); return; @@ -2923,9 +2923,9 @@ void ol_txrx_display_stats(uint16_t value) { ol_txrx_pdev_handle pdev; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: pdev is NULL", __func__); return; } @@ -2944,7 +2944,7 @@ void ol_txrx_display_stats(uint16_t value) cdf_nbuf_tx_desc_count_display(); break; default: - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Unknown value", __func__); break; } @@ -2954,9 +2954,9 @@ void ol_txrx_clear_stats(uint16_t value) { ol_txrx_pdev_handle pdev; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: pdev is NULL", __func__); return; } @@ -2972,7 +2972,7 @@ void ol_txrx_clear_stats(uint16_t value) cdf_nbuf_tx_desc_count_clear(); break; default: - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Unknown value", __func__); break; } @@ -3050,7 +3050,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, * IPA kernel module API should not be called on SIRQ CTXT */ cdf_nbuf_t buf, next_buf; ol_rx_callback_fp data_rx = NULL; - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); if ((!peer) || (!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "peer/pdev is NULL"); @@ -3145,7 +3145,7 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc) { struct ol_txrx_peer_t *peer; - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); union ol_txrx_peer_update_param_t param; struct privacy_exemption privacy_filter; @@ -3194,7 +3194,7 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) { struct ol_txrx_peer_t *peer; - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", @@ -3251,7 +3251,7 @@ QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, return QDF_STATUS_E_FAILURE; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Unable to find pdev!", __func__); @@ -3326,7 +3326,7 @@ exit: */ QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev || !pause_cb) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "pdev or pause_cb is NULL"); return QDF_STATUS_E_INVAL; @@ -3356,7 +3356,7 @@ void ol_txrx_lro_flush_handler(void *context, ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; if (cdf_unlikely(!pdev)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); cdf_assert(0); return; @@ -3365,7 +3365,7 @@ void ol_txrx_lro_flush_handler(void *context, if (pdev->lro_info.lro_flush_cb) pdev->lro_info.lro_flush_cb(pdev->lro_info.lro_data); else - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: lro_flush_cb NULL", __func__); } @@ -3392,7 +3392,7 @@ void ol_txrx_lro_flush(void *data) } else { pkt = cds_alloc_ol_rx_pkt(sched_ctx); if (cdf_unlikely(!pkt)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; } @@ -3419,8 +3419,8 @@ void ol_txrx_lro_flush(void *data) void ol_register_lro_flush_cb(void (handler)(void *), void *data) { struct hif_opaque_softc *hif_device = - (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + (struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); pdev->lro_info.lro_flush_cb = handler; pdev->lro_info.lro_data = data; @@ -3440,8 +3440,8 @@ void ol_register_lro_flush_cb(void (handler)(void *), void *data) void ol_deregister_lro_flush_cb(void) { struct hif_opaque_softc *hif_device = - (struct hif_opaque_softc *)cds_get_context(CDF_MODULE_ID_HIF); - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + (struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); hif_lro_flush_cb_deregister(hif_device); diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index 4e77867ce37f..38d2ebe88329 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/core/dp/txrx/ol_txrx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,7 +48,7 @@ void ol_txrx_peer_unref_delete(struct ol_txrx_peer_t *peer); */ static inline ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id) { - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); ol_txrx_vdev_handle vdev = NULL; if (cdf_unlikely(!pdev)) { diff --git a/core/dp/txrx/ol_txrx_event.c b/core/dp/txrx/ol_txrx_event.c index 3410a14083a0..87c91ab253f8 100644 --- a/core/dp/txrx/ol_txrx_event.c +++ b/core/dp/txrx/ol_txrx_event.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -33,7 +33,7 @@ static inline wdi_event_subscribe *wdi_event_next_sub(wdi_event_subscribe * wdi_sub) { if (!wdi_sub) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid subscriber in %s\n", __func__); return NULL; } @@ -84,12 +84,12 @@ wdi_event_handler(enum WDI_EVENT event, * Input validation */ if (!event) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid WDI event in %s\n", __func__); return; } if (!txrx_pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid pdev in WDI event handler\n"); return; } @@ -113,17 +113,17 @@ wdi_event_sub(struct ol_txrx_pdev_t *txrx_pdev, wdi_event_subscribe *wdi_sub; /* Input validation */ if (!txrx_pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid txrx_pdev in %s", __func__); return A_ERROR; } if (!event_cb_sub) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid callback in %s", __func__); return A_ERROR; } if ((!event) || (event >= WDI_EVENT_LAST) || (event < WDI_EVENT_BASE)) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid event in %s", __func__); return A_ERROR; } @@ -157,7 +157,7 @@ wdi_event_unsub(struct ol_txrx_pdev_t *txrx_pdev, /* Input validation */ if (!event_cb_sub) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid callback in %s", __func__); return A_ERROR; } @@ -179,7 +179,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev) { /* Input validation */ if (!txrx_pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid device in %s\nWDI event attach failed", __func__); return A_ERROR; @@ -190,7 +190,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev) sizeof(wdi_event_subscribe *) * WDI_NUM_EVENTS); if (!txrx_pdev->wdi_event_list) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Insufficient memory for the WDI event lists\n"); return A_NO_MEMORY; } @@ -202,13 +202,13 @@ A_STATUS wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev) int i; wdi_event_subscribe *wdi_sub; if (!txrx_pdev) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid device in %s\nWDI detach failed", __func__); return A_ERROR; } if (!txrx_pdev->wdi_event_list) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: wdi_event_list is NULL", __func__); return A_ERROR; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index cd352e12b346..71163d8f4662 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -141,7 +141,7 @@ void ol_tx_deregister_flow_control(struct ol_txrx_pdev_t *pdev) */ void ol_tx_dump_flow_pool_info(void) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *pool = NULL; struct ol_tx_flow_pool_t tmp_pool; @@ -202,7 +202,7 @@ void ol_tx_dump_flow_pool_info(void) */ void ol_tx_clear_flow_pool_stats(void) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is null\n", @@ -277,7 +277,7 @@ static int ol_tx_move_desc_n(struct ol_tx_flow_pool_t *src_pool, int ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *dst_pool = NULL; uint16_t desc_count = src_pool->avail_desc; uint16_t desc_move_count = 0; @@ -321,7 +321,7 @@ ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool) struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, uint16_t flow_pool_size) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *pool; uint16_t size = 0, i; struct ol_tx_desc_t *tx_desc; @@ -392,7 +392,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, */ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); uint16_t i, size; union ol_tx_desc_list_elem_t *temp_list = NULL; struct ol_tx_desc_t *tx_desc = NULL; @@ -464,7 +464,7 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) */ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if ((!pdev) || (!pool) || (pool->status != FLOW_POOL_INVALID)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -495,7 +495,7 @@ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool) */ struct ol_tx_flow_pool_t *ol_tx_get_flow_pool(uint8_t flow_pool_id) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *pool = NULL; bool is_found = false; @@ -591,7 +591,7 @@ void ol_tx_flow_pool_vdev_unmap(struct ol_tx_flow_pool_t *pool, void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type, uint8_t flow_pool_id, uint16_t flow_pool_size) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *pool; uint8_t pool_create = 0; enum htt_flow_type type = flow_type; @@ -651,7 +651,7 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type, void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type, uint8_t flow_pool_id) { - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_tx_flow_pool_t *pool; enum htt_flow_type type = flow_type; diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 85da2683065e..6d6308fb96a3 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -103,14 +103,14 @@ extern unsigned g_txrx_print_level; #ifdef TXRX_PRINT_ENABLE #include /* va_list */ -#include /* cdf_vprint */ +#include /* qdf_vprint */ /* Supress 4296 - expression is always true * It will fire if level is TXRX_PRINT_LEVEL_FATAL_ERR (0) * because g_txrx_print_level is unsigned */ #define ol_txrx_print(level, fmt, ...) { \ if (level <= g_txrx_print_level) \ - cdf_print(fmt, ## __VA_ARGS__); } + qdf_print(fmt, ## __VA_ARGS__); } #define TXRX_PRINT(level, fmt, ...) \ ol_txrx_print(level, "TXRX: " fmt, ## __VA_ARGS__) @@ -118,7 +118,7 @@ extern unsigned g_txrx_print_level; #define ol_txrx_print_verbose(fmt, ...) { \ if (TXRX_PRINT_LEVEL_INFO3 <= g_txrx_print_level) \ - cdf_print(fmt, ## __VA_ARGS__); } + qdf_print(fmt, ## __VA_ARGS__); } #define TXRX_PRINT_VERBOSE(fmt, ...) \ ol_txrx_print_verbose("TXRX: " fmt, ## __VA_ARGS__) #else @@ -141,7 +141,7 @@ extern unsigned g_txrx_print_level; #endif #if DEBUG_CREDIT -#define TX_CREDIT_DEBUG_PRINT(fmt, ...) cdf_print(fmt, ## __VA_ARGS__) +#define TX_CREDIT_DEBUG_PRINT(fmt, ...) qdf_print(fmt, ## __VA_ARGS__) #else #define TX_CREDIT_DEBUG_PRINT(fmt, ...) #endif @@ -149,11 +149,11 @@ extern unsigned g_txrx_print_level; /*--- tx scheduler debug printouts ---*/ #ifdef HOST_TX_SCHED_DEBUG -#define TX_SCHED_DEBUG_PRINT(fmt, ...) cdf_print(fmt, ## __VA_ARGS__) +#define TX_SCHED_DEBUG_PRINT(fmt, ...) qdf_print(fmt, ## __VA_ARGS__) #else #define TX_SCHED_DEBUG_PRINT(fmt, ...) #endif -#define TX_SCHED_DEBUG_PRINT_ALWAYS(fmt, ...) cdf_print(fmt, ## __VA_ARGS__) +#define TX_SCHED_DEBUG_PRINT_ALWAYS(fmt, ...) qdf_print(fmt, ## __VA_ARGS__) #define OL_TXRX_LIST_APPEND(head, tail, elem) \ do { \ @@ -381,7 +381,7 @@ ol_txrx_frms_dump(const char *name, uint8_t *p; if (name) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n", + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n", name); } while (frm) { @@ -435,7 +435,7 @@ ol_txrx_frms_dump(const char *name, ip_prot = ipv6_hdr->next_hdr; tcp_offset = l2_hdr_size + IPV6_HDR_LEN; } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "frame %p non-IP ethertype (%x)\n", frm, ethtype); @@ -451,12 +451,12 @@ ol_txrx_frms_dump(const char *name, (tcp_hdr->seq_num[1] << 16) | (tcp_hdr->seq_num[1] << 8) | (tcp_hdr->seq_num[1] << 0); - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "frame %p: TCP seq num = %d\n", frm, tcp_seq_num); #else - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "frame %p: TCP seq num = %d\n", frm, ((*(p + tcp_offset + 4)) << 24) | @@ -465,7 +465,7 @@ ol_txrx_frms_dump(const char *name, (*(p + tcp_offset + 7))); #endif } else { - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "frame %p non-TCP IP protocol (%x)\n", frm, ip_prot); @@ -502,12 +502,12 @@ NOT_IP_TCP: i += frag_bytes; } - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "frame %p data (%p), hex dump of bytes 0-%d of %d:\n", frm, p, len_lim - 1, (int)cdf_nbuf_len(frm)); p = local_buf; while (len_lim > 16) { - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " " /* indent */ "%02x %02x %02x %02x %02x %02x %02x %02x " @@ -521,15 +521,15 @@ NOT_IP_TCP: p += 16; len_lim -= 16; } - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, " " /* indent */); while (len_lim > 0) { - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%02x ", *p); p++; len_lim--; } - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "\n"); } frm = cdf_nbuf_next(frm); diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 495afa0e307b..2a6619e8eaf6 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -29,7 +29,7 @@ /* header files for OS primitives */ #include /* uint32_t, etc. */ #include /* cdf_mem_malloc, etc. */ -#include /* cdf_device_t, cdf_print */ +#include /* qdf_device_t, qdf_print */ /* header files for utilities */ #include /* TAILQ */ @@ -457,25 +457,25 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent) { int i, max_peers; - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*speer map:\n", indent, " "); max_peers = ol_cfg_max_peer_id(pdev->ctrl_pdev) + 1; for (i = 0; i < max_peers; i++) { if (pdev->peer_id_to_obj_map[i]) { - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*sid %d -> %p\n", indent + 4, " ", i, pdev->peer_id_to_obj_map[i]); } } - CDF_TRACE(CDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*speer hash table:\n", indent, " "); for (i = 0; i <= pdev->peer_hash.mask; i++) { if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) { struct ol_txrx_peer_t *peer; TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i], hash_list_elem) { - CDF_TRACE(CDF_MODULE_ID_TXRX, + CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, "%*shash idx %d -> %p (%02x:%02x:%02x:%02x:%02x:%02x)\n", indent + 4, " ", i, peer, diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 9f5e7fbf5ea2..86466f0a5e07 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -216,7 +216,7 @@ enum ol_tx_queue_status { struct ol_txrx_msdu_info_t { struct htt_msdu_info_t htt; struct ol_txrx_peer_t *peer; - struct cdf_tso_info_t tso_info; + struct qdf_tso_info_t tso_info; }; enum { @@ -447,7 +447,7 @@ struct ol_txrx_pdev_t { ol_pdev_handle ctrl_pdev; /* osdev - handle for mem alloc / free, map / unmap */ - cdf_device_t osdev; + qdf_device_t osdev; htt_pdev_handle htt_pdev; diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h index d5b8259a7335..5a1bfbef9f48 100644 --- a/core/hdd/inc/qc_sap_ioctl.h +++ b/core/hdd/inc/qc_sap_ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -109,7 +109,7 @@ struct sQcSapreq_wscie { * Retrieve the WPS PBC Probe Request IEs. */ typedef struct sQcSapreq_WPSPBCProbeReqIES { - struct cdf_mac_addr macaddr; + struct qdf_mac_addr macaddr; uint16_t probeReqIELen; uint8_t probeReqIE[512]; } sQcSapreq_WPSPBCProbeReqIES_t; diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 45f1a08e06af..768ee713abda 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -110,10 +110,10 @@ typedef enum { typedef struct connection_info_s { eConnectionState connState; eMib_dot11DesiredBssType connDot11DesiredBssType; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; tCsrSSIDInfo SSID; uint8_t staId[MAX_IBSS_PEERS]; - struct cdf_mac_addr peerMacAddress[MAX_IBSS_PEERS]; + struct qdf_mac_addr peerMacAddress[MAX_IBSS_PEERS]; eCsrAuthType authType; eCsrEncryptionType ucEncryptionType; eCsrEncryptionType mcEncryptionType; diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 31929225b221..3a7c2710981a 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -40,7 +40,7 @@ /* Include files */ #include #include -#include +#include #include #include #include @@ -2911,11 +2911,11 @@ struct hdd_config { uint32_t nScanAgeTimeCPS; uint8_t nRssiCatGap; bool fIsShortPreamble; - struct cdf_mac_addr IbssBssid; + struct qdf_mac_addr IbssBssid; uint32_t AdHocChannel5G; uint32_t AdHocChannel24G; uint8_t intfAddrMask; - struct cdf_mac_addr intfMacAddr[CDF_MAX_CONCURRENCY_PERSONA]; + struct qdf_mac_addr intfMacAddr[QDF_MAX_CONCURRENCY_PERSONA]; bool apUapsdEnabled; bool apRandomBssidEnabled; diff --git a/core/hdd/inc/wlan_hdd_ftm.h b/core/hdd/inc/wlan_hdd_ftm.h index 90280d377539..9ecccfe2683c 100644 --- a/core/hdd/inc/wlan_hdd_ftm.h +++ b/core/hdd/inc/wlan_hdd_ftm.h @@ -38,7 +38,7 @@ #include "cds_mq.h" #include "cds_api.h" #include "msg.h" -#include "cdf_types.h" +#include "qdf_types.h" #include enum wlan_hdd_ftm_state { diff --git a/core/hdd/inc/wlan_hdd_host_offload.h b/core/hdd/inc/wlan_hdd_host_offload.h index e0b4b4e99cb3..79d52ab3dbc9 100644 --- a/core/hdd/inc/wlan_hdd_host_offload.h +++ b/core/hdd/inc/wlan_hdd_host_offload.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ typedef struct { uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN]; uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN]; } params; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; } tHostOffloadRequest, *tpHostOffloadRequest; #endif /* __WLAN_HDD_HOST_OFFLOAD_H__ */ diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 40c3492e7c2d..f0c5268f3bae 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "sir_mac_prot_def.h" #include "csr_api.h" #include @@ -157,9 +157,9 @@ #define WLAN_CHIP_VERSION "WCNSS" #ifndef HDD_DISALLOW_LEGACY_HDDLOG -#define hddLog(level, args ...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) +#define hddLog(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) #endif -#define hdd_log(level, args...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) +#define hdd_log(level, args...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) #define hdd_logfl(level, format, args...) hdd_log(level, FL(format), ## args) #define hdd_alert(format, args...) \ @@ -512,7 +512,7 @@ typedef struct _WLAN_BKID_LIST *pWLAN_BKID_LIST; struct hdd_wapi_info_s { uint32_t nWapiMode; bool fIsWapiSta; - struct cdf_mac_addr cachedMacAddr; + struct qdf_mac_addr cachedMacAddr; uint8_t wapiAuthMode; } __packed; typedef struct hdd_wapi_info_s hdd_wapi_info_t; @@ -531,7 +531,7 @@ typedef struct beacon_data_s { } beacon_data_t; /** - * enum device_mode: Maintain one to one correspondence with tCDF_ADAPTER_MODE + * enum device_mode: Maintain one to one correspondence with tQDF_ADAPTER_MODE * @WLAN_HDD_INFRA_STATION: station mode * @WLAN_HDD_SOFTAP: sap mode * @WLAN_HDD_P2P_CLIENT: p2p client mode @@ -691,7 +691,7 @@ typedef struct { uint8_t ucSTAId; /** MAC address of the station */ - struct cdf_mac_addr macAddrSTA; + struct qdf_mac_addr macAddrSTA; /** Current Station state so HDD knows how to deal with packet * queue. Most recent states used to change TLSHIM STA state */ @@ -851,7 +851,7 @@ struct hdd_adapter_s { uint32_t ctw; /** Current MAC Address for the adapter */ - struct cdf_mac_addr macAddressCurrent; + struct qdf_mac_addr macAddressCurrent; /**Event Flags*/ unsigned long event_flags; @@ -997,10 +997,10 @@ struct hdd_adapter_s { int temperature; /* Time stamp for last completed RoC request */ - v_TIME_t last_roc_ts; + unsigned long last_roc_ts; /* Time stamp for start RoC request */ - v_TIME_t start_roc_ts; + unsigned long start_roc_ts; /* State for synchronous OCB requests to WMI */ struct sir_ocb_set_config_response ocb_set_config_resp; @@ -1009,7 +1009,7 @@ struct hdd_adapter_s { struct sir_dcc_update_ndl_response dcc_update_ndl_resp; /* MAC addresses used for OCB interfaces */ - struct cdf_mac_addr ocb_mac_address[CDF_MAX_CONCURRENCY_PERSONA]; + struct qdf_mac_addr ocb_mac_address[QDF_MAX_CONCURRENCY_PERSONA]; int ocb_mac_addr_count; /* BITMAP indicating pause reason */ @@ -1156,11 +1156,11 @@ struct hdd_context_s { /** Concurrency Parameters*/ uint32_t concurrency_mode; - uint8_t no_of_open_sessions[CDF_MAX_NO_OF_MODE]; - uint8_t no_of_active_sessions[CDF_MAX_NO_OF_MODE]; + uint8_t no_of_open_sessions[QDF_MAX_NO_OF_MODE]; + uint8_t no_of_active_sessions[QDF_MAX_NO_OF_MODE]; /** P2P Device MAC Address for the adapter */ - struct cdf_mac_addr p2pDeviceAddress; + struct qdf_mac_addr p2pDeviceAddress; #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK cdf_wake_lock_t rx_wake_lock; @@ -1387,7 +1387,7 @@ void wlan_hdd_release_intf_addr(hdd_context_t *pHddCtx, uint8_t *releaseAddr); uint8_t hdd_get_operating_channel(hdd_context_t *pHddCtx, device_mode_t mode); void hdd_set_conparam(uint32_t con_param); -enum tCDF_GLOBAL_CON_MODE hdd_get_conparam(void); +enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void); void hdd_abort_mac_scan(hdd_context_t *pHddCtx, uint8_t sessionId, eCsrAbortReason reason); @@ -1432,7 +1432,7 @@ void __hdd_wlan_exit(void); int hdd_wlan_notify_modem_power_state(int state); #ifdef QCA_HT_2040_COEX int hdd_wlan_set_ht2040_mode(hdd_adapter_t *pAdapter, uint16_t staId, - struct cdf_mac_addr macAddrSTA, int width); + struct qdf_mac_addr macAddrSTA, int width); #endif #ifdef WLAN_FEATURE_LPSS @@ -1480,7 +1480,7 @@ static inline bool hdd_is_memdump_supported(void) #endif /* WLAN_FEATURE_MEMDUMP */ void hdd_update_macaddr(struct hdd_config *config, - struct cdf_mac_addr hw_macaddr); + struct qdf_mac_addr hw_macaddr); void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter); void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter); diff --git a/core/hdd/inc/wlan_hdd_mib.h b/core/hdd/inc/wlan_hdd_mib.h index 8fe44a8e9600..6d9482d7708e 100644 --- a/core/hdd/inc/wlan_hdd_mib.h +++ b/core/hdd/inc/wlan_hdd_mib.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,7 +28,7 @@ #if !defined(WLAN_HDD_MIB_h__) #define WLAN_HDD_MIB_h__ -#include +#include typedef enum { eMib_dot11DesiredBssType_infrastructure = 1, @@ -45,7 +45,7 @@ typedef enum { typedef struct { uint32_t cEntries; - struct cdf_mac_addr BSSIDs[MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT]; + struct qdf_mac_addr BSSIDs[MIB_DOT11_DESIRED_BSSID_LIST_MAX_COUNT]; } sMib_dot11DesiredBssidList; @@ -119,7 +119,7 @@ typedef enum { typedef struct { uint32_t cEntries; - struct cdf_mac_addr macAddrs[MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT]; + struct qdf_mac_addr macAddrs[MIB_DOT11_MAC_EXCLUSION_LIST_MAX_COUNT]; } sMib_dot11MacExcludeList; diff --git a/core/hdd/inc/wlan_hdd_oemdata.h b/core/hdd/inc/wlan_hdd_oemdata.h index 2acf25590a88..c17ddedad5c2 100644 --- a/core/hdd/inc/wlan_hdd_oemdata.h +++ b/core/hdd/inc/wlan_hdd_oemdata.h @@ -77,7 +77,7 @@ typedef enum { * @patch: Version ID patch number * @build: Version ID build number */ -typedef struct cdf_packed { +typedef struct qdf_packed { uint8_t major; uint8_t minor; uint8_t patch; @@ -98,7 +98,7 @@ typedef struct cdf_packed { * @num_channels: Num of channels IDs to follow * @channel_list: List of channel IDs */ -typedef struct cdf_packed { +typedef struct qdf_packed { uint8_t oem_target_signature[OEM_TARGET_SIGNATURE_LEN]; uint32_t oem_target_type; uint32_t oem_fw_version; @@ -125,7 +125,7 @@ typedef struct cdf_packed { * max power, reg power and reg class id * @reg_info_2: regulatory information field 2 which contains antennamax */ -typedef struct cdf_packed { +typedef struct qdf_packed { uint32_t chan_id; uint32_t reserved0; uint32_t mhz; @@ -145,7 +145,7 @@ typedef struct cdf_packed { * @reserved0: reserved0 * @peer_chan_info: channel info on which peer is connected */ -typedef struct cdf_packed { +typedef struct qdf_packed { uint8_t peer_mac_addr[ETH_ALEN]; uint8_t peer_status; uint8_t vdev_id; @@ -174,7 +174,7 @@ struct oem_get_capability_rsp { struct sme_oem_capability cap; }; -void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, +void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, uint8_t peerStatus, uint8_t peerTimingMeasCap, uint8_t sessionId, diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 8d122c71a077..eff0fb1a705d 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -43,7 +43,7 @@ QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter); QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter); QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, - struct cdf_mac_addr *pmacAddrSTA); + struct qdf_mac_addr *pmacAddrSTA); QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId); QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, @@ -62,17 +62,17 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, uint8_t staId, uint8_t ucastSig, uint8_t bcastSig, - struct cdf_mac_addr *pPeerMacAddress, + struct qdf_mac_addr *pPeerMacAddress, bool fWmmEnabled); QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit); QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter); QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pHostapdAdapter); QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, - struct cdf_mac_addr *pDestMacAddress, + struct qdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state); QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, - struct cdf_mac_addr *pMacAddress, + struct qdf_mac_addr *pMacAddress, uint8_t *staId); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index db275de7c946..5e149a879e5a 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -361,7 +361,7 @@ typedef struct _hddTdlsPeer_t { typedef struct { uint8_t sessionId; uint8_t staId; - struct cdf_mac_addr peerMac; + struct qdf_mac_addr peerMac; } tdlsConnInfo_t; /** diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 704484401269..b12c198b96ce 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -66,7 +66,7 @@ QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, #endif /* IPA_OFFLOAD */ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, - struct cdf_mac_addr *pMacAddress, + struct qdf_mac_addr *pMacAddress, uint8_t *staId); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index 809d4b4dd96e..c91add39a758 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -229,7 +229,7 @@ typedef struct hdd_wext_state_s { tCsrRoamProfile roamProfile; /** BSSID to which connect request is received */ - struct cdf_mac_addr req_bssId; + struct qdf_mac_addr req_bssId; /** The association status code */ uint32_t statusCode; @@ -339,7 +339,7 @@ extern int hdd_priv_get_data(struct iw_point *p_priv_data, extern void *mem_alloc_copy_from_user_helper(const void *wrqu_data, size_t len); extern QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, - struct cdf_mac_addr mac_address); + struct qdf_mac_addr mac_address); void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter); uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size, diff --git a/core/hdd/inc/wlan_hdd_wowl.h b/core/hdd/inc/wlan_hdd_wowl.h index 3230f6a78794..2ca9755e8329 100644 --- a/core/hdd/inc/wlan_hdd_wowl.h +++ b/core/hdd/inc/wlan_hdd_wowl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -102,7 +102,7 @@ * attempt to BMPS fails, request for WoWL will be rejected. */ -#include +#include #define WOWL_PTRN_MAX_SIZE 146 #define WOWL_PTRN_MASK_MAX_SIZE 19 diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 211d092d10dd..07d4cb7ff76d 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -516,8 +516,8 @@ static void hdd_send_ft_event(hdd_adapter_t *pAdapter) ftEvent.target_ap = ftIe; - ftEvent.ies = (u8 *) (ftIe + CDF_MAC_ADDR_SIZE); - ftEvent.ies_len = auth_resp_len - CDF_MAC_ADDR_SIZE; + ftEvent.ies = (u8 *) (ftIe + QDF_MAC_ADDR_SIZE); + ftEvent.ies_len = auth_resp_len - QDF_MAC_ADDR_SIZE; hddLog(LOG1, FL("ftEvent.ies_len %zu"), ftEvent.ies_len); hddLog(LOG1, FL("ftEvent.ric_ies_len %zu"), ftEvent.ric_ies_len); @@ -664,7 +664,7 @@ hdd_send_update_beacon_ies_event(hdd_adapter_t *pAdapter, */ cdf_mem_zero(&buff[strLen + 1], IW_CUSTOM_MAX - (strLen + 1)); currentLen = - CDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1); + QDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1); cdf_mem_copy(&buff[strLen + 1], pBeaconIes + currentOffset, currentLen); currentOffset += currentLen; @@ -699,7 +699,7 @@ static void hdd_send_association_event(struct net_device *dev, union iwreq_data wrqu; int we_event; char *msg; - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr peerMacAddr; /* Added to find the auth type on the fly at run time */ /* rather than with cfg to see if FT is enabled */ @@ -893,9 +893,9 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) { /* Remove staId, bssId and peerMacAddress */ pHddStaCtx->conn_info.staId[0] = 0; - cdf_mem_zero(&pHddStaCtx->conn_info.bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&pHddStaCtx->conn_info.bssId, QDF_MAC_ADDR_SIZE); cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[0], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Clear all security settings */ pHddStaCtx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM; @@ -1107,7 +1107,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, */ pHddStaCtx->conn_info.staId[i] = 0; cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[i], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); if (sta_id < (WLAN_MAX_STA_COUNT + 3)) pHddCtx->sta_to_adapter[sta_id] = NULL; } @@ -1162,7 +1162,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, */ void hdd_set_peer_authorized_event(uint32_t vdev_id) { - hdd_context_t *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); hdd_adapter_t *adapter = NULL; adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id); @@ -1188,7 +1188,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, { struct ol_txrx_peer_t *peer; QDF_STATUS err; - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { hdd_err("Failed to get txrx context"); @@ -1263,7 +1263,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, uint8_t staId, - struct cdf_mac_addr *pPeerMacAddress, + struct qdf_mac_addr *pPeerMacAddress, tSirBssDescription *pBssDesc) { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; @@ -1437,7 +1437,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, roam_profile.SSID.length); ssid_ie_len = 2 + roam_profile.SSID.length; hdd_notice("SSIDIE:"); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, buf_ssid_ie, ssid_ie_len); final_req_ie = kmalloc(IW_GENERIC_IE_MAX, GFP_KERNEL); if (final_req_ie == NULL) @@ -1450,7 +1450,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength), IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength)); hdd_notice("Req RSN IE:"); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, final_req_ie, (ssid_ie_len + reqRsnLength)); cfg80211_roamed_bss(dev, bss, final_req_ie, (ssid_ie_len + reqRsnLength), @@ -1461,7 +1461,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, pCsrRoamInfo->nAssocReqLength); hdd_notice("ReAssoc Req IE dump"); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, assoc_req_ies, pCsrRoamInfo->nAssocReqLength); wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes, @@ -1666,9 +1666,9 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; cdf_mem_copy(roamInfo.bssid.bytes, - pHddStaCtx->roam_info.bssid, CDF_MAC_ADDR_SIZE); + pHddStaCtx->roam_info.bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(roamInfo.peerMac.bytes, - pHddStaCtx->roam_info.peerMac, CDF_MAC_ADDR_SIZE); + pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE); cdf_ret_status = hdd_roam_set_key_complete_handler(pAdapter, @@ -1950,7 +1950,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hdd_notice( "Reassoc Req IE dump"); CDF_TRACE_HEX_DUMP( - CDF_MODULE_ID_HDD, + QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, pFTAssocReq, assocReqlen); @@ -1986,11 +1986,11 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, cdf_mem_copy(pHddStaCtx-> roam_info.bssid, pRoamInfo->bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pHddStaCtx-> roam_info.peerMac, pRoamInfo->peerMac.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pHddStaCtx->roam_info.roamId = roamId; pHddStaCtx->roam_info. @@ -2340,8 +2340,8 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, (hdd_context_t *) pAdapter->pHddCtx; hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - struct cdf_mac_addr broadcastMacAddr = - CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr broadcastMacAddr = + QDF_MAC_ADDR_BROADCAST_INITIALIZER; if (NULL == pRoamInfo) { CDF_ASSERT(0); @@ -2464,7 +2464,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, * false otherwise. */ static bool roam_save_ibss_station(hdd_station_ctx_t *pHddStaCtx, uint8_t staId, - struct cdf_mac_addr *peerMacAddress) + struct qdf_mac_addr *peerMacAddress) { bool fSuccess = false; int idx = 0; @@ -3077,7 +3077,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, cdf_mem_zero(&pHddCtx-> tdlsConnInfo[staIdx]. peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); status = QDF_STATUS_SUCCESS; break; } @@ -3138,7 +3138,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, &pHddCtx-> tdlsConnInfo[staIdx]. peerMac.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); smeTdlsPeerStateParams.peerState = eSME_TDLS_PEER_STATE_TEARDOWN; @@ -3171,7 +3171,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, cdf_mem_zero(&pHddCtx-> tdlsConnInfo[staIdx]. peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pHddCtx->tdlsConnInfo[staIdx].staId = 0; pHddCtx->tdlsConnInfo[staIdx]. sessionId = 255; @@ -3184,12 +3184,12 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, case eCSR_ROAM_RESULT_TDLS_SHOULD_DISCOVER: { /* ignore TDLS_SHOULD_DISCOVER if any concurrency detected */ - if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) || - (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) { + if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) || + (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) { hddLog(LOG2, FL("concurrency detected. ignore SHOULD_DISCOVER concurrency_mode: 0x%x, active_sessions: %d"), pHddCtx->concurrency_mode, - pHddCtx->no_of_active_sessions[CDF_STA_MODE]); + pHddCtx->no_of_active_sessions[QDF_STA_MODE]); status = QDF_STATUS_E_FAILURE; break; } @@ -3498,9 +3498,9 @@ hdd_indicate_cckm_pre_auth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) pos += nBytes; freeBytes -= nBytes; - cdf_mem_copy(pos, pRoamInfo->bssid.bytes, CDF_MAC_ADDR_SIZE); - pos += CDF_MAC_ADDR_SIZE; - freeBytes -= CDF_MAC_ADDR_SIZE; + cdf_mem_copy(pos, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); + pos += QDF_MAC_ADDR_SIZE; + freeBytes -= QDF_MAC_ADDR_SIZE; nBytes = snprintf(pos, freeBytes, " %u:%u", pRoamInfo->timestamp[0], pRoamInfo->timestamp[1]); @@ -3861,7 +3861,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, pAdapter->sessionId, roamStatus)); switch (roamStatus) { @@ -4388,7 +4388,7 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter, * in the bssid. */ cdf_mem_copy(PMKIDCache[i].BSSID.bytes, - bssid, CDF_MAC_ADDR_SIZE); + bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(PMKIDCache[i].PMKID, dot11RSNIE.pmkid[i], CSR_RSN_PMKID_SIZE); } @@ -5381,7 +5381,7 @@ static int __iw_set_ap_address(struct net_device *dev, pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data; hddLog(LOG1, FL(" " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMacAddress)); cdf_mem_copy(pHddStaCtx->conn_info.bssId.bytes, pMacAddress, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); EXIT(); return 0; @@ -5440,7 +5440,7 @@ static int __iw_get_ap_address(struct net_device *dev, eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState) { cdf_mem_copy(wrqu->ap_addr.sa_data, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } else { memset(wrqu->ap_addr.sa_data, 0, sizeof(wrqu->ap_addr.sa_data)); } diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 194af13edd0f..dd95af03861f 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -3782,7 +3782,7 @@ static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, char configStr[CFG_ENTRY_MAX_LEN]; char *fmt; void *pField; - struct cdf_mac_addr *pMacAddr; + struct qdf_mac_addr *pMacAddr; char *pCur = pBuf; int curlen; @@ -3810,7 +3810,7 @@ static QDF_STATUS hdd_cfg_get_config(REG_TABLE_ENTRY *reg_table, snprintf(valueStr, CFG_VALUE_MAX_LEN, "%s", (char *)pField); } else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) { - pMacAddr = (struct cdf_mac_addr *) pField; + pMacAddr = (struct qdf_mac_addr *) pField; snprintf(valueStr, CFG_VALUE_MAX_LEN, "%02x:%02x:%02x:%02x:%02x:%02x", pMacAddr->bytes[0], @@ -3887,7 +3887,7 @@ static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, for (i = 0; i < entries; i++) { if (strcmp(iniTable[i].name, name) == 0) { *value = iniTable[i].value; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Found %s entry for Name=[%s] Value=[%s] ", WLAN_INI_FILE, name, *value); return QDF_STATUS_SUCCESS; @@ -3930,13 +3930,13 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, { int i = 0, j = 0, res = 0; char *candidate = NULL; - struct cdf_mac_addr macaddr[CDF_MAX_CONCURRENCY_PERSONA]; + struct qdf_mac_addr macaddr[QDF_MAX_CONCURRENCY_PERSONA]; memset(macaddr, 0, sizeof(macaddr)); for (i = 0; i < num; i++) { candidate = macTable[i].value; - for (j = 0; j < CDF_MAC_ADDR_SIZE; j++) { + for (j = 0; j < QDF_MAC_ADDR_SIZE; j++) { res = hex2bin(&macaddr[i].bytes[j], &candidate[(j << 1)], 1); @@ -3947,7 +3947,7 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, cdf_mem_copy((uint8_t *) &pHddCtx->config-> intfMacAddr[i].bytes[0], (uint8_t *) &macaddr[i].bytes[0], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } } @@ -3977,7 +3977,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, int32_t svalue; void *pStructBase = pHddCtx->config; REG_TABLE_ENTRY *pRegEntry = g_registry_table; - unsigned long cRegTableEntries = CDF_ARRAY_SIZE(g_registry_table); + unsigned long cRegTableEntries = QDF_ARRAY_SIZE(g_registry_table); uint32_t cbOutString; int i; int rv; @@ -4142,7 +4142,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* Handle string parameters */ else if (WLAN_PARAM_String == pRegEntry->RegType) { #ifdef WLAN_CFG_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s", pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, @@ -4184,7 +4184,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, ((uint8_t *) pField)[cbOutString] = '\0'; } } else if (WLAN_PARAM_MacAddr == pRegEntry->RegType) { - if (pRegEntry->VarSize != CDF_MAC_ADDR_SIZE) { + if (pRegEntry->VarSize != QDF_MAC_ADDR_SIZE) { hddLog(LOGE, "%s: Invalid VarSize %u for Name=[%s]", __func__, pRegEntry->VarSize, @@ -4194,7 +4194,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, candidate = (char *)pRegEntry->VarDefault; if (match_status == QDF_STATUS_SUCCESS) { len_value_str = strlen(value_str); - if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { + if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) { hddLog(LOGE, "%s: Invalid MAC addr [%s] specified for Name=[%s] in %s", __func__, value_str, @@ -4204,7 +4204,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, candidate = value_str; } /* parse the string and store it in the byte array */ - for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) { + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) { ((char *)pField)[i] = (char)(parse_hex_digit(candidate[i * 2]) * 16 + @@ -4416,17 +4416,17 @@ static QDF_STATUS hdd_execute_config_command(REG_TABLE_ENTRY *reg_table, case WLAN_PARAM_MacAddr: len_value_str = strlen(value_str); - if (len_value_str != (CDF_MAC_ADDR_SIZE * 2)) { + if (len_value_str != (QDF_MAC_ADDR_SIZE * 2)) { /* out of range */ hddLog(LOGE, "%s: invalid command, MAC address [%s] length " "%zu is not expected length %u", __func__, value_str, - len_value_str, (CDF_MAC_ADDR_SIZE * 2)); + len_value_str, (QDF_MAC_ADDR_SIZE * 2)); goto done; } /* parse the string and store it in the byte array */ - for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) { + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) { ((char *)pField)[i] = (char) ((parse_hex_digit(value_str[(i * 2)]) * 16) + parse_hex_digit(value_str[(i * 2) + 1])); @@ -4499,515 +4499,515 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) { int i; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "*********Config values in HDD Adapter*******"); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RTSThreshold] Value = %u", pHddCtx->config->RTSThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [OperatingChannel] Value = [%u]", pHddCtx->config->OperatingChannel); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [PowerUsageControl] Value = [%s]", pHddCtx->config->PowerUsageControl); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fIsImpsEnabled] Value = [%u]", pHddCtx->config->fIsImpsEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nVccRssiTrigger] Value = [%u]", pHddCtx->config->nVccRssiTrigger); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]", MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes)); - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]", i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes)); } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]", pHddCtx->config->apUapsdEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApProt] value = [%u]", pHddCtx->config->apProtEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]", pHddCtx->config->nAPAutoShutOff); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanMccToSccSwitchMode] Value = [%u]", pHddCtx->config->WlanMccToSccSwitchMode); #endif #ifdef FEATURE_WLAN_AUTO_SHUTDOWN - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanAutoShutdown] Value = [%u]", pHddCtx->config->WlanAutoShutdown); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]", pHddCtx->config->nEnableListenMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]", pHddCtx->config->apProtection); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]", pHddCtx->config->apOBSSProtEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS, pHddCtx->config->force_sap_acs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH, pHddCtx->config->force_sap_acs_st_ch); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH, pHddCtx->config->force_sap_acs_end_ch); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [sap_channel_avoidance] value = [%u]", pHddCtx->config->sap_channel_avoidance); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME, pHddCtx->config->sap_p2p_11ac_override); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode24GHz); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode5GHz); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [dot11Mode] Value = [%u]", pHddCtx->config->dot11Mode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [UapsdMask] Value = [0x%x] ", pHddCtx->config->UapsdMask); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ImplicitQosIsEnabled] Value = [%u]", (int)pHddCtx->config->bImplicitQosEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSuspIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSrvIntv); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSuspIntv); #ifdef FEATURE_WLAN_ESE - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraInactivityInterval] Value = [%u] ", pHddCtx->config->InfraInactivityInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [EseEnabled] Value = [%u] ", pHddCtx->config->isEseIniFeatureEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastTransitionEnabled] Value = [%u] ", pHddCtx->config->isFastTransitionEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTxPowerCap] Value = [%u] dBm ", pHddCtx->config->nTxPowerCap); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%u] ", pHddCtx->config->isFastRoamIniFeatureEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [MAWCEnabled] Value = [%u] ", pHddCtx->config->MAWCEnabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%u] ", pHddCtx->config->RoamRssiDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [isWESModeEnabled] Value = [%u] ", pHddCtx->config->isWESModeEnabled); #ifdef FEATURE_WLAN_OKC - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [OkcEnabled] Value = [%u] ", pHddCtx->config->isOkcIniFeatureEnabled); #endif #ifdef FEATURE_WLAN_SCAN_PNO - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanSupport] Value = [%u] ", pHddCtx->config->configPNOScanSupport); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanTimerRepeatValue] Value = [%u] ", pHddCtx->config->configPNOScanTimerRepeatValue); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gPNOSlowScanMultiplier] Value = [%u] ", pHddCtx->config->pno_slow_scan_multiplier); #endif #ifdef FEATURE_WLAN_TDLS - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSSupport] Value = [%u] ", pHddCtx->config->fEnableTDLSSupport); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSImplicitTrigger] Value = [%u] ", pHddCtx->config->fEnableTDLSImplicitTrigger); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSExternalControl] Value = [%u] ", pHddCtx->config->fTDLSExternalControl); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSUapsdMask] Value = [%u] ", pHddCtx->config->fTDLSUapsdMask); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSBufferSta] Value = [%u] ", pHddCtx->config->fEnableTDLSBufferSta); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSWmmMode] Value = [%u] ", pHddCtx->config->fEnableTDLSWmmMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enable_tdls_scan] Value = [%u]", pHddCtx->config->enable_tdls_scan); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVo] Value = [%u] ", pHddCtx->config->InfraDirAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVo] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVo); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVi] Value = [%u] ", pHddCtx->config->InfraDirAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVi] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVi); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBe] Value = [%u] ", pHddCtx->config->InfraDirAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBe] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBe); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBk] Value = [%u] ", pHddCtx->config->InfraDirAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBk] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBk); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [DelayedTriggerFrmInt] Value = [%u] ", pHddCtx->config->DelayedTriggerFrmInt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [mcastBcastFilterSetting] Value = [%u] ", pHddCtx->config->mcastBcastFilterSetting); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fhostArpOffload] Value = [%u] ", pHddCtx->config->fhostArpOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp); #ifdef FEATURE_WLAN_RA_FILTERING - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [RArateLimitInterval] Value = [%u] ", pHddCtx->config->RArateLimitInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IsRArateLimitEnabled] Value = [%u] ", pHddCtx->config->IsRArateLimitEnabled); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fFTResourceReqSupported] Value = [%u] ", pHddCtx->config->fFTResourceReqSupported); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborLookupRssiThreshold] Value = [%u] ", pHddCtx->config->nNeighborLookupRssiThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [delay_before_vdev_stop] Value = [%u] ", pHddCtx->config->delay_before_vdev_stop); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nOpportunisticThresholdDiff] Value = [%u] ", pHddCtx->config->nOpportunisticThresholdDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamRescanRssiDiff] Value = [%u] ", pHddCtx->config->nRoamRescanRssiDiff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMinChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMinChanTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMaxChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMaxChanTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nMaxNeighborRetries] Value = [%u] ", pHddCtx->config->nMaxNeighborReqTries); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanPeriod] Value = [%u] ", pHddCtx->config->nNeighborScanPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ", pHddCtx->config->nNeighborResultsRefreshPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nEmptyScanRefreshPeriod] Value = [%u] ", pHddCtx->config->nEmptyScanRefreshPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFirstBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFirstBcnt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFinalBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFinalBcnt); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBeaconRssiWeight] Value = [%u] ", pHddCtx->config->nRoamBeaconRssiWeight); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [allowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_max_count] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_max_count); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_delta); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_delay] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_delay); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_ub); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [burstSizeDefinition] Value = [0x%x] ", pHddCtx->config->burstSizeDefinition); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [tsInfoAckPolicy] Value = [0x%x] ", pHddCtx->config->tsInfoAckPolicy); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [rfSettlingTimeUs] Value = [%u] ", pHddCtx->config->rfSettlingTimeUs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [bSingleTidRc] Value = [%u] ", pHddCtx->config->bSingleTidRc); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDynamicPSPollvalue] Value = [%u] ", pHddCtx->config->dynamicPsPollValue); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAddTSWhenACMIsOff] Value = [%u] ", pHddCtx->config->AddTSWhenACMIsOff); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gValidateScanList] Value = [%u] ", pHddCtx->config->fValidateScanList); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gStaKeepAlivePeriod] Value = [%u] ", pHddCtx->config->infraStaKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [BandCapability] Value = [%u] ", pHddCtx->config->nBandCapability); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableBeaconEarlyTermination] Value = [%u] ", pHddCtx->config->fEnableBeaconEarlyTermination); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [teleBcnWakeupEnable] Value = [%u] ", pHddCtx->config->teleBcnWakeupEn); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [transListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnTransListenInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [transLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnTransLiNumIdleBeacons); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnMaxListenInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [bcnEarlyTermWakeInterval] Value = [%u] ", pHddCtx->config->bcnEarlyTermWakeInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableBypass11d] Value = [%u] ", pHddCtx->config->enableBypass11d); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSChnlScan] Value = [%u] ", pHddCtx->config->enableDFSChnlScan); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSPnoChnlScan] Value = [%u] ", pHddCtx->config->enable_dfs_pno_chnl_scan); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gReportMaxLinkSpeed] Value = [%u] ", pHddCtx->config->reportMaxLinkSpeed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [thermalMitigationEnable] Value = [%u] ", pHddCtx->config->thermalMitigationEnable); #ifdef WLAN_FEATURE_11AC - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]", pHddCtx->config->vhtChannelWidth); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableFirstScan2GOnly] Value = [%u] ", pHddCtx->config->enableFirstScan2GOnly); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [skipDfsChnlInP2pSearch] Value = [%u] ", pHddCtx->config->skipDfsChnlInP2pSearch); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ", pHddCtx->config->ignoreDynamicDtimInP2pMode); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableRxSTBC] Value = [%u] ", pHddCtx->config->enableRxSTBC); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpwrImgTransition] Value = [%u] ", pHddCtx->config->enableLpwrImgTransition); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSSR] Value = [%u] ", pHddCtx->config->enableSSR); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableVhtFor24GHzBand] Value = [%u] ", pHddCtx->config->enableVhtFor24GHzBand); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gFlexConnectPowerFactor] Value = [%u] ", pHddCtx->config->flexConnectPowerFactor); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableIbssHeartBeatOffload] Value = [%u] ", pHddCtx->config->enableIbssHeartBeatOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAntennaDiversity] Value = [%u] ", pHddCtx->config->antennaDiversity); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoLinkMonitorPeriod] Value = [%u]", pHddCtx->config->goLinkMonitorPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApLinkMonitorPeriod] Value = [%u]", pHddCtx->config->apLinkMonitorPeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoKeepAlivePeriod] Value = [%u]", pHddCtx->config->goKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApKeepAlivePeriod]Value = [%u]", pHddCtx->config->apKeepAlivePeriod); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAmsduSupportInAMPDU] Value = [%u] ", pHddCtx->config->isAmsduSupportInAMPDU); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [nSelect5GHzMargin] Value = [%u] ", pHddCtx->config->nSelect5GHzMargin); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gCoalesingInIBSS] Value = [%u] ", pHddCtx->config->isCoalesingInIBSSAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssATIMWinSize] Value = [%u] ", pHddCtx->config->ibssATIMWinSize); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerSaveAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerSaveAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerCollapseAllowed); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssAwakeOnTxRx] Value = [%u] ", pHddCtx->config->isIbssAwakeOnTxRx); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssInactivityTime] Value = [%u] ", pHddCtx->config->ibssInactivityCount); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssTxSpEndInactivityTime] Value = [%u] ", pHddCtx->config->ibssTxSpEndInactivityTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPsWarmupTime] Value = [%u] ", pHddCtx->config->ibssPsWarmupTime); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPs1RxChainInAtim] Value = [%u] ", pHddCtx->config->ibssPs1RxChainInAtimEnable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fDfsPhyerrFilterOffload] Value = [%u] ", pHddCtx->config->fDfsPhyerrFilterOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnorePeerErpInfo] Value = [%u] ", pHddCtx->config->ignore_peer_erp_info); #ifdef IPA_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPAConfig] Value = [0x%x] ", pHddCtx->config->IpaConfig); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPADescSize] Value = [%u] ", pHddCtx->config->IpaDescSize); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaHighBandwidthMbpsg] Value = [%u] ", pHddCtx->config->IpaHighBandwidthMbps); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaMediumBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaMediumBandwidthMbps); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaLowBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaLowBandwidthMbps); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableOverLapCh] Value = [%u] ", pHddCtx->config->gEnableOverLapCh); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadPeers] Value = [%u] ", pHddCtx->config->apMaxOffloadPeers); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadReorderBuffs] value = [%u] ", pHddCtx->config->apMaxOffloadReorderBuffs); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAllowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); hddLog(CDF_TRACE_LEVEL_INFO_HIGH, @@ -5015,184 +5015,184 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) pHddCtx->config->gMaxConcurrentActiveSessions); #ifdef MSM_PLATFORM - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthHighThreshold] Value = [%u] ", pHddCtx->config->busBandwidthHighThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthMediumThreshold] Value = [%u] ", pHddCtx->config->busBandwidthMediumThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthLowThreshold] Value = [%u] ", pHddCtx->config->busBandwidthLowThreshold); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gbusBandwidthComputeInterval] Value = [%u] ", pHddCtx->config->busBandwidthComputeInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdHigh] Value = [%u] ", pHddCtx->config->tcpDelackThresholdHigh); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdLow] Value = [%u] ", pHddCtx->config->tcpDelackThresholdLow); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u] ", CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME, pHddCtx->config->tcp_tx_high_tput_thres); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnoreCAC] Value = [%u] ", pHddCtx->config->ignoreCAC); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gSapPreferredChanLocation] Value = [%u] ", pHddCtx->config->gSapPreferredChanLocation); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDisableDfsJapanW53] Value = [%u] ", pHddCtx->config->gDisableDfsJapanW53); #ifdef FEATURE_GREEN_AP - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableGreenAp] Value = [%u] ", pHddCtx->config->enableGreenAP); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEenableEGAP] Value = [%u] ", pHddCtx->config->enable_egap); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPInactTime] Value = [%u] ", pHddCtx->config->egap_inact_time); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPWaitTime] Value = [%u] ", pHddCtx->config->egap_wait_time); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPFeatures] Value = [%u] ", pHddCtx->config->egap_feature_flag); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [isRoamOffloadEnabled] Value = [%u]", pHddCtx->config->isRoamOffloadEnabled); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSifsBurst] Value = [%u]", pHddCtx->config->enableSifsBurst); #ifdef WLAN_FEATURE_LPSS - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpassSupport] Value = [%u] ", pHddCtx->config->enable_lpass_support); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSelfRecovery] Value = [%u]", pHddCtx->config->enableSelfRecovery); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSapSuspend] Value = [%u]", pHddCtx->config->enableSapSuspend); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWgotoSuspend] Value = [%u]", pHddCtx->config->extWowGotoSuspend); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp1WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp1WakeupPinNumber); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp2WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp2WakeupPinNumber); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAInitPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMinPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMaxPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAIncPingInterval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpSrcPort] Value = [%u]", pHddCtx->config->extWowApp2TcpSrcPort); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpDstPort] Value = [%u]", pHddCtx->config->extWowApp2TcpDstPort); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpTxTimeout); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpRxTimeout); #endif #ifdef DHCP_SERVER_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerOffloadEnable] Value = [%u]", pHddCtx->config->enableDHCPServerOffload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPMaxNumClients] Value = [%u]", pHddCtx->config->dhcpMaxNumClients); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerIP] Value = [%s]", pHddCtx->config->dhcpServerIP); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDumpCollect] Value = [%u]", pHddCtx->config->is_ramdump_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [gP2PListenDeferInterval] Value = [%u]", pHddCtx->config->p2p_listen_defer_interval); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [is_ps_enabled] value = [%d]", pHddCtx->config->is_ps_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [policy_manager_enabled] value = [%d]", pHddCtx->config->policy_manager_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [tso_enable] value = [%d]", pHddCtx->config->tso_enable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [LROEnable] value = [%d]", pHddCtx->config->lro_enable); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [active_mode_offload] value = [%d]", pHddCtx->config->active_mode_offload); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [gfine_time_meas_cap] value = [%u]", pHddCtx->config->fine_time_meas_cap); #ifdef WLAN_FEATURE_FASTPATH - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [fastpath_enable] Value = [%u]", pHddCtx->config->fastpath_enable); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [max_scan_count] value = [%d]", pHddCtx->config->max_scan_count); #ifdef FEATURE_NAPI_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_ENABLE_RX_THREAD, pHddCtx->config->enableRxThread); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_NAPI_NAME, pHddCtx->config->napi_enable); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u]", CFG_CE_CLASSIFY_ENABLE_NAME, pHddCtx->config->ce_classify_enabled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%u]", CFG_DUAL_MAC_FEATURE_DISABLE, pHddCtx->config->dual_mac_feature_disable); @@ -5250,7 +5250,7 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) const struct firmware *fw = NULL; char *line, *buffer = NULL; char *name, *value; - tCfgIniEntry macTable[CDF_MAX_CONCURRENCY_PERSONA]; + tCfgIniEntry macTable[QDF_MAX_CONCURRENCY_PERSONA]; tSirMacAddr customMacAddr; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -5299,14 +5299,14 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) value = buffer; macTable[i].name = name; macTable[i++].value = value; - if (i >= CDF_MAX_CONCURRENCY_PERSONA) + if (i >= QDF_MAX_CONCURRENCY_PERSONA) break; } } } buffer = line; } - if (i <= CDF_MAX_CONCURRENCY_PERSONA) { + if (i <= QDF_MAX_CONCURRENCY_PERSONA) { hddLog(CDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided", __func__, i); } else { @@ -6045,7 +6045,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFFC) | pConfig->vhtTxMCS; if (pConfig->enable2x2) temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "vhtRxMCS2x2 - %x temp - %u enable2x2 %d", pConfig->vhtRxMCS2x2, temp, pConfig->enable2x2); @@ -6381,13 +6381,13 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig = cdf_mem_malloc(sizeof(*smeConfig)); if (NULL == smeConfig) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); return QDF_STATUS_E_NOMEM; } cdf_mem_zero(smeConfig, sizeof(*smeConfig)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d", __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled, pConfig->dot11Mode); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index ce41c1e2085c..70033c2aa470 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -60,7 +60,7 @@ #include "wlan_hdd_main.h" #include "wlan_hdd_power.h" #include "wlan_hdd_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "cds_sched.h" @@ -671,7 +671,7 @@ static int __wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy, struct sk_buff *skb; uint32_t set = 0; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1106,7 +1106,7 @@ static int __is_driver_dfs_capable(struct wiphy *wiphy, if (ret_val) return ret_val; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1346,7 +1346,7 @@ static int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter) acs_event_callback = hdd_hostapd_sap_event_cb; cdf_mem_copy(sap_config->self_macaddr.bytes, - adapter->macAddressCurrent.bytes, sizeof(struct cdf_mac_addr)); + adapter->macAddressCurrent.bytes, sizeof(struct qdf_mac_addr)); hddLog(LOG1, FL("ACS Started for wlan%d"), adapter->dev->ifindex); status = wlansap_acs_chselect( #ifdef WLAN_FEATURE_MBSSID @@ -1413,7 +1413,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, * [QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST] = { .type = NLA_NESTED }, */ - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1802,7 +1802,7 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1943,7 +1943,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2068,7 +2068,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, if (ret_val) return ret_val; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2187,7 +2187,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, uint32_t buf_len = 0; int ret; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2379,7 +2379,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } nla_memcpy(roam_params.bssid_favored[i].bytes, tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_BSSID], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(roam_params.bssid_favored[i].bytes)); /* Parse and fetch preference factor*/ @@ -2424,7 +2424,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } nla_memcpy(roam_params.bssid_avoid_list[i].bytes, tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_BSSID], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY( roam_params.bssid_avoid_list[i].bytes)); @@ -2717,7 +2717,7 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, hdd_context_t *hdd_ctx_ptr; int status; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2806,7 +2806,7 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy, int status; struct sk_buff *reply_skb = NULL; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2903,7 +2903,7 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy, uint32_t features; struct sk_buff *reply_skb = NULL; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3137,7 +3137,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u32 guard_time; QDF_STATUS status; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3256,7 +3256,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1]; struct sir_wifi_start_log start_log; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3380,7 +3380,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, struct nlattr *tb [QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX + 1]; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3556,7 +3556,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, QDF_STATUS status; uint32_t request_id, ret, len; uint8_t pattern_id = 0; - struct cdf_mac_addr dst_addr; + struct qdf_mac_addr dst_addr; uint16_t eth_type = htons(ETH_P_IP); if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { @@ -3599,7 +3599,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, goto fail; } nla_memcpy(add_req->mac_address.bytes, tb[PARAM_SRC_MAC_ADDR], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hddLog(LOG1, "input src mac address: "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(add_req->mac_address.bytes)); @@ -3613,7 +3613,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, hddLog(LOGE, FL("attr dst mac address failed")); goto fail; } - nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], CDF_MAC_ADDR_SIZE); + nla_memcpy(dst_addr.bytes, tb[PARAM_DST_MAC_ADDR], QDF_MAC_ADDR_SIZE); hddLog(LOG1, "input dst mac address: "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(dst_addr.bytes)); @@ -3633,11 +3633,11 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, } len = 0; - cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, CDF_MAC_ADDR_SIZE); - len += CDF_MAC_ADDR_SIZE; + cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, QDF_MAC_ADDR_SIZE); + len += QDF_MAC_ADDR_SIZE; cdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes, - CDF_MAC_ADDR_SIZE); - len += CDF_MAC_ADDR_SIZE; + QDF_MAC_ADDR_SIZE); + len += QDF_MAC_ADDR_SIZE; cdf_mem_copy(&add_req->ucPattern[len], ð_type, 2); len += 2; @@ -3766,15 +3766,15 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy, [PARAM_REQUEST_ID] = { .type = NLA_U32 }, [PARAM_CONTROL] = { .type = NLA_U32 }, [PARAM_SRC_MAC_ADDR] = { .type = NLA_BINARY, - .len = CDF_MAC_ADDR_SIZE }, + .len = QDF_MAC_ADDR_SIZE }, [PARAM_DST_MAC_ADDR] = { .type = NLA_BINARY, - .len = CDF_MAC_ADDR_SIZE }, + .len = QDF_MAC_ADDR_SIZE }, [PARAM_PERIOD] = { .type = NLA_U32 }, }; ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4317,7 +4317,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_station_ctx_t *hdd_sta_ctx; struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX+1]; - uint8_t peer_mac[CDF_MAC_ADDR_SIZE]; + uint8_t peer_mac[QDF_MAC_ADDR_SIZE]; uint32_t sta_id; struct sk_buff *reply_skb; uint32_t rate_flags = 0; @@ -4327,7 +4327,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4349,7 +4349,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, } cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hddLog(CDF_TRACE_LEVEL_INFO, FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"), MAC_ADDR_ARRAY(peer_mac), adapter->device_mode); @@ -4360,7 +4360,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, if ((hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) || !cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes, - peer_mac, CDF_MAC_ADDR_SIZE)) { + peer_mac, QDF_MAC_ADDR_SIZE)) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Not Associated to mac "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer_mac)); @@ -4380,7 +4380,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, &adapter->aStaInfo[sta_id].macAddrSTA) && cdf_mem_compare( &adapter->aStaInfo[sta_id].macAddrSTA.bytes, - peer_mac, CDF_MAC_ADDR_SIZE)) + peer_mac, QDF_MAC_ADDR_SIZE)) break; } @@ -4510,7 +4510,7 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, QDF_STATUS status; uint32_t current_roam_state; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -5368,7 +5368,7 @@ int wlan_hdd_cfg80211_init(struct device *dev, #endif /*FEATURE_WLAN_SCAN_PNO */ #if defined QCA_WIFI_FTM - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #endif /* even with WIPHY_FLAG_CUSTOM_REGULATORY, @@ -5473,7 +5473,7 @@ int wlan_hdd_cfg80211_init(struct device *dev, wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; wiphy->max_remain_on_channel_duration = MAX_REMAIN_ON_CHANNEL_DURATION; - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { wiphy->n_vendor_commands = ARRAY_SIZE(hdd_wiphy_vendor_commands); wiphy->vendor_commands = hdd_wiphy_vendor_commands; @@ -5683,7 +5683,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, if (!mac_addr || is_broadcast_ether_addr(mac_addr)) { cdf_set_macaddr_broadcast(&setKey.peerMac); } else { - cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } setKey.keyLength = key_Len; pKeyPtr = setKey.Key; @@ -5701,7 +5701,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, pAdapter->sessionId, &setKey, &roamId); } if (status != 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, status); pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; @@ -5861,12 +5861,12 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_BSS, pAdapter->sessionId, params->ap_isolate)); hddLog(LOG1, FL("Device_mode %s(%d), ap_isolate = %d"), @@ -6016,7 +6016,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -6026,7 +6026,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, if (0 != status) return status; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_IFACE, pAdapter->sessionId, type)); @@ -6120,7 +6120,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, ndev->dev_addr[3] |= 0xF0; memcpy(pAdapter->macAddressCurrent. bytes, ndev->dev_addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pr_info("wlan: Generated HotSpot BSSID " MAC_ADDRESS_STR "\n", MAC_ADDR_ARRAY(ndev->dev_addr)); @@ -6301,7 +6301,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx; hdd_station_ctx_t *pHddStaCtx; - struct cdf_mac_addr STAMacAddress; + struct qdf_mac_addr STAMacAddress; #ifdef FEATURE_WLAN_TDLS tCsrStaParams StaParams = { 0 }; uint8_t isBufSta = 0; @@ -6311,12 +6311,12 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CHANGE_STATION, pAdapter->sessionId, params->listen_interval)); @@ -6327,7 +6327,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - cdf_mem_copy(STAMacAddress.bytes, mac, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE); if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) || (pAdapter->device_mode == WLAN_HDD_P2P_GO)) { @@ -6358,7 +6358,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, * are an incremental of 1 else an incremental of 4 till the number * of channels. */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: params->supported_channels_len: %d", __func__, params->supported_channels_len); if (0 != params->supported_channels_len) { @@ -6385,7 +6385,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, no_of_channels = params->supported_channels[i + 1]; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d, wifi_chan_index: %d, no_of_channels: %d", __func__, i, j, k, j, @@ -6409,7 +6409,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, } else { continue; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d", __func__, i, j, k, @@ -6421,11 +6421,11 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, } } num_unique_channels = j + 1; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Unique Channel List", __func__); for (i = 0; i < num_unique_channels; i++) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: StaParams.supported_channels[%d]: %d,", __func__, i, @@ -6436,7 +6436,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, num_unique_channels = MAX_CHANNEL; StaParams.supported_channels_len = num_unique_channels; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: After removing duplcates StaParams.supported_channels_len: %d", __func__, @@ -6480,13 +6480,13 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, cdf_mem_copy(StaParams.supported_rates, params->supported_rates, StaParams.supported_rates_len); - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Supported Rates with Length %d", StaParams.supported_rates_len); for (i = 0; i < StaParams.supported_rates_len; i++) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "[%d]: %0x", i, StaParams.supported_rates[i]); @@ -6594,12 +6594,12 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_KEY, pAdapter->sessionId, params->key_len)); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -6722,16 +6722,16 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (!pairwise) { /* set group key */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s- %d: setting Broadcast key", __func__, __LINE__); setKey.keyDirection = eSIR_RX_ONLY; cdf_set_macaddr_broadcast(&setKey.peerMac); } else { /* set pairwise key */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s- %d: setting pairwise key", __func__, __LINE__); setKey.keyDirection = eSIR_TX_RX; - cdf_mem_copy(setKey.peerMac.bytes, mac_addr, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) { /* if a key is already installed, block all subsequent ones */ @@ -6772,7 +6772,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, status = wlansap_set_key_sta(p_cds_context, &setKey); #endif if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] wlansap_set_key_sta returned ERROR status= %d", __LINE__, status); @@ -6799,7 +6799,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (!pairwise) { /* set group key */ if (pHddStaCtx->roam_info.deferKeyComplete) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s- %d: Perform Set key Complete", __func__, __LINE__); @@ -6926,7 +6926,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -6971,7 +6971,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy, break; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_KEY, pAdapter->sessionId, params.cipher)); @@ -7078,12 +7078,12 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, pAdapter->sessionId, key_index)); @@ -7422,7 +7422,7 @@ wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter, bss_desc->rssi; /* Supplicant takes the signal strength in terms of mBm(100*dBm) */ - rssi = CDF_MIN(rssi, 0) * 100; + rssi = QDF_MIN(rssi, 0) * 100; hddLog(LOG1, FL("BSSID: " MAC_ADDRESS_STR " Channel:%d RSSI:%d"), MAC_ADDR_ARRAY(mgmt->bssid), chan->center_freq, @@ -7494,7 +7494,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy, ENTER(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_UPDATE_BSS, NO_SESSION, pAdapter->sessionId)); @@ -7850,29 +7850,29 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, if (bssid) { pRoamProfile->BSSIDs.numOfBSSIDs = 1; cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), - bssid, CDF_MAC_ADDR_SIZE); + bssid, QDF_MAC_ADDR_SIZE); /* Save BSSID in seperate variable as well, as RoamProfile BSSID is getting zeroed out in the association process. And in case of join failure we should send valid BSSID to supplicant */ cdf_mem_copy((void *)(pWextState->req_bssId.bytes), - bssid, CDF_MAC_ADDR_SIZE); + bssid, QDF_MAC_ADDR_SIZE); } else if (bssid_hint) { pRoamProfile->BSSIDs.numOfBSSIDs = 1; cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), - bssid_hint, CDF_MAC_ADDR_SIZE); + bssid_hint, QDF_MAC_ADDR_SIZE); /* Save BSSID in separate variable as well, as RoamProfile BSSID is getting zeroed out in the association process. And in case of join failure we should send valid BSSID to supplicant */ cdf_mem_copy((void *)(pWextState->req_bssId.bytes), - bssid_hint, CDF_MAC_ADDR_SIZE); + bssid_hint, QDF_MAC_ADDR_SIZE); hddLog(LOGW, FL(" bssid_hint "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(bssid_hint)); } else { cdf_mem_zero((void *)(pRoamProfile->BSSIDs.bssid), - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } hddLog(LOG1, FL("Connect to SSID: %.*s operating Channel: %u"), @@ -8817,12 +8817,12 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CONNECT, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), @@ -9080,12 +9080,12 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DISCONNECT, pAdapter->sessionId, reason)); hddLog(LOG1, FL("Device_mode %s(%d) reason code(%d)"), @@ -9309,17 +9309,17 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, int status; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; u8 channelNum = 0; ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_JOIN_IBSS, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), @@ -9425,7 +9425,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; } - cdf_mem_copy(bssid.bytes, params->bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(bssid.bytes, params->bssid, QDF_MAC_ADDR_SIZE); } else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) == QDF_STATUS_E_FAILURE) { @@ -9524,12 +9524,12 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_LEAVE_IBSS, pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE)); @@ -9621,12 +9621,12 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS, NO_SESSION, wiphy->rts_threshold)); status = wlan_hdd_validate_context(pHddCtx); @@ -9837,12 +9837,12 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DEL_STA, pAdapter->sessionId, pAdapter->device_mode)); @@ -9863,7 +9863,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, return 0; } - if (cdf_is_macaddr_broadcast((struct cdf_mac_addr *) mac)) { + if (cdf_is_macaddr_broadcast((struct qdf_mac_addr *) mac)) { uint16_t i; for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if ((pAdapter->aStaInfo[i].isUsed) && @@ -9873,7 +9873,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, mac, pAdapter->aStaInfo[i]. macAddrSTA.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (hdd_ipa_uc_is_enabled(pHddCtx)) { hdd_ipa_wlan_evt(pAdapter, pAdapter-> @@ -9915,7 +9915,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, } else { qdf_status = hdd_softap_get_sta_id(pAdapter, - (struct cdf_mac_addr *) mac, + (struct qdf_mac_addr *) mac, &staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOG1, @@ -10057,12 +10057,12 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_STA, pAdapter->sessionId, params->listen_interval)); @@ -10136,7 +10136,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -10162,14 +10162,14 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE); /* Add to the PMKSA ID Cache in CSR */ result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId, &pmk_id, 1, false); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_PMKSA, pAdapter->sessionId, result)); @@ -10217,7 +10217,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -10242,7 +10242,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DEL_PMKSA, pAdapter->sessionId, 0)); /* Delete the PMKID CSR cache */ @@ -10297,7 +10297,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -10368,12 +10368,12 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, if (status) return status; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, pAdapter->sessionId, pHddStaCtx->conn_info.connState)); /* Added for debug on reception of Re-assoc Req. */ @@ -10499,12 +10499,12 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA, pAdapter->sessionId, pAdapter->device_mode)); @@ -10611,7 +10611,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -10638,7 +10638,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, hddLog(LOGE, "acl policy: = %d no acl entries = %d", params->acl_policy, params->n_acl_entries); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, pAdapter->sessionId, pAdapter->device_mode)); if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { @@ -10824,7 +10824,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TESTMODE, NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD]))); switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) { @@ -10945,15 +10945,15 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) hdd_context_t *hdd_ctx; if (!buf || !buf_len) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: buf or buf_len invalid, buf = %p buf_len = %zu", __func__, buf, buf_len); return; } - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: hdd context invalid", __func__); return; } @@ -10961,7 +10961,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) skb = cfg80211_testmode_alloc_event_skb(hdd_ctx->wiphy, buf_len, GFP_KERNEL); if (!skb) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to allocate testmode rx skb!", __func__); return; } @@ -10977,7 +10977,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) nla_put_failure: kfree_skb(skb); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: nla_put failed on testmode rx skb!", __func__); } #endif @@ -11003,7 +11003,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, tSmeConfigParams sme_config; bool cbModeChange; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index c3cda33116af..69d1b13ee5a6 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -35,7 +35,7 @@ #include "wlan_hdd_trace.h" #include "cds_concurrency.h" #include "wlan_hdd_conc_ut.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "cds_reg_service.h" diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 9af633692f82..771d9bacdc7e 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -69,7 +69,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -83,7 +83,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, if (!sme_is_feature_supported_by_fw(WOW)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Wake-on-Wireless feature is not supported in firmware!", __func__); @@ -91,7 +91,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, } if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE); @@ -114,7 +114,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, /* Disable wow */ if (!wow_enable) { if (!hdd_exit_wowl(pAdapter)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: hdd_exit_wowl failed!", __func__); return -EFAULT; @@ -142,7 +142,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, wow_pbm = 1; if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: hdd_enter_wowl failed!", __func__); return -EFAULT; @@ -199,7 +199,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, ENTER(); if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -212,7 +212,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WOW)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Wake-on-Wireless feature is not supported in firmware!", __func__); @@ -220,7 +220,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, } if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN); @@ -328,7 +328,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -341,7 +341,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Periodic Tx Pattern Offload feature is not supported in firmware!", __func__); return -EINVAL; @@ -351,7 +351,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, if (count <= MAX_USER_COMMAND_SIZE_FRAME) cmd = cdf_mem_malloc(count + 1); else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_FRAME); @@ -359,7 +359,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, } if (!cmd) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation for cmd failed!")); return -ENOMEM; } @@ -379,7 +379,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, goto failure; if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Pattern index %d is not in the range (0 ~ %d).", __func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1); @@ -398,7 +398,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, delPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn)); if (!delPeriodicTxPtrnParams) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); cdf_mem_free(cmd); return -ENOMEM; @@ -412,7 +412,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_del_periodic_tx_ptrn(pHddCtx->hHal, delPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_del_periodic_tx_ptrn() failed!", __func__); @@ -432,7 +432,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, hdd_info("device mode %d", pAdapter->device_mode); if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) && (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Not in Connected state!", __func__); goto failure; } @@ -448,7 +448,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Since the pattern is a hex string, 2 characters represent 1 byte. */ if (pattern_len % 2) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern!", __func__); goto failure; @@ -456,7 +456,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, pattern_len >>= 1; if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Not an 802.3 frame!", __func__); goto failure; @@ -464,7 +464,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn)); if (!addPeriodicTxPtrnParams) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); cdf_mem_free(cmd); return -ENOMEM; @@ -490,7 +490,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_add_periodic_tx_ptrn(pHddCtx->hHal, addPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_add_periodic_tx_ptrn() failed!", __func__); cdf_mem_free(addPeriodicTxPtrnParams); @@ -548,7 +548,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file) adapter = (hdd_adapter_t *)file->private_data; if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index f09f1bad5d93..27537332d6f4 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -183,7 +183,7 @@ static int hdd_init_cds_hif_context(void *hif) { QDF_STATUS status; - status = cds_set_context(CDF_MODULE_ID_HIF, hif); + status = cds_set_context(QDF_MODULE_ID_HIF, hif); if (status) return -ENOENT; @@ -200,7 +200,7 @@ static void hdd_deinit_cds_hif_context(void) { QDF_STATUS status; - status = cds_set_context(CDF_MODULE_ID_HIF, NULL); + status = cds_set_context(QDF_MODULE_ID_HIF, NULL); if (status) hdd_err("Failed to reset CDS HIF Context"); @@ -368,7 +368,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, if (ret) goto err_epping_close; - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); status = ol_cds_init(cdf_dev, hif_ctx); @@ -455,7 +455,7 @@ static void wlan_hdd_remove(void) hdd_cnss_driver_unloading(); - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); hif_disable_power_management(hif_ctx); @@ -483,7 +483,7 @@ static void wlan_hdd_remove(void) */ static void wlan_hdd_shutdown(void) { - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (cds_is_load_or_unload_in_progress()) { hdd_err("Load/unload in progress, ignore SSR shutdown"); @@ -514,7 +514,7 @@ static void wlan_hdd_shutdown(void) */ void wlan_hdd_crash_shutdown(void) { - hif_crash_shutdown(cds_get_context(CDF_MODULE_ID_HIF)); + hif_crash_shutdown(cds_get_context(QDF_MODULE_ID_HIF)); } /** @@ -553,8 +553,8 @@ void wlan_hdd_notify_handler(int state) */ static int __wlan_hdd_bus_suspend(pm_message_t state) { - void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); int err = wlan_hdd_validate_context(hdd_ctx); int status; @@ -626,8 +626,8 @@ int wlan_hdd_bus_suspend(pm_message_t state) */ static int __wlan_hdd_bus_resume(void) { - void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); int status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -679,8 +679,8 @@ static int wlan_hdd_bus_resume(void) */ static int __wlan_hdd_runtime_suspend(void) { - void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); + void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); int status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) @@ -750,7 +750,7 @@ static int wlan_hdd_runtime_suspend(void) */ static int __wlan_hdd_runtime_resume(void) { - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); hif_pre_runtime_resume(hif_ctx); CDF_BUG(!cnss_auto_resume()); diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index d2179910cabc..f95bebbff0c8 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -721,7 +721,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind( if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_BSSID, - CDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) || + QDF_MAC_ADDR_SIZE, ap_info->bssid.bytes) || nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_EXTSCAN_RESULTS_SIGNIFICANT_CHANGE_RESULT_CHANNEL, ap_info->channel) || @@ -1718,7 +1718,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1852,7 +1852,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2000,7 +2000,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2075,7 +2075,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, nla_memcpy(pReqMsg->ap[i].bssid.bytes, tb2 [QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hddLog(LOG1, MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes)); @@ -2197,7 +2197,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2294,7 +2294,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, nla_memcpy(pReqMsg->ap[i].bssid.bytes, tb2 [QCA_WLAN_VENDOR_ATTR_EXTSCAN_AP_THRESHOLD_PARAM_BSSID], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); hddLog(LOG1, MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pReqMsg->ap[i].bssid.bytes)); @@ -2479,7 +2479,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -2534,7 +2534,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, return -EINVAL; } - num_channels = CDF_MIN(num_channels, maxChannels); + num_channels = QDF_MIN(num_channels, maxChannels); hdd_remove_dsrc_channels(wiphy, chan_list, &num_channels); @@ -2831,7 +2831,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( num_channels); req_msg->buckets[bkt_index].numChannels = - CDF_MIN(num_channels, + QDF_MIN(num_channels, (WLAN_EXTSCAN_MAX_CHANNELS - total_channels)); hdd_info("Adj Num channels/bucket: %d total_channels: %d", @@ -2926,7 +2926,7 @@ static int hdd_extscan_start_fill_bucket_channel_spec( req_msg->buckets[bkt_index].numChannels); req_msg->buckets[bkt_index].numChannels = - CDF_MIN(req_msg->buckets[bkt_index].numChannels, + QDF_MIN(req_msg->buckets[bkt_index].numChannels, (WLAN_EXTSCAN_MAX_CHANNELS - total_channels)); hdd_info("Num channels/bucket: %d total_channels: %d", req_msg->buckets[bkt_index].numChannels, @@ -3144,7 +3144,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3354,7 +3354,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3481,7 +3481,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3606,7 +3606,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3822,7 +3822,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, if (ret_val) return ret_val; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4028,7 +4028,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, if (ret) return ret; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4144,7 +4144,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, if (ret) return ret; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4270,7 +4270,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -4490,7 +4490,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 645e7a0cc06e..e9ff971d7a59 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -35,7 +35,7 @@ #include "cds_sched.h" #include #include "sir_types.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "sir_mac_prot_def.h" #include "sme_api.h" @@ -99,7 +99,7 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len) ftmMsg.bodyptr = (uint8_t *) cmd_ptr; ftmMsg.bodyval = 0; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &ftmMsg)) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL", __func__); @@ -176,7 +176,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, tMacOpenParameters mac_openParms; p_cds_contextType gp_cds_context = (p_cds_contextType) p_cds_context; #if defined(QCA_WIFI_FTM) - cdf_device_t cdf_ctx; + qdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; void *pHifContext = NULL; void *pHtcContext = NULL; @@ -184,11 +184,11 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #endif hdd_context_t *hdd_ctx; - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); if (NULL == gp_cds_context) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -196,7 +196,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, /* Initialize the probe event */ if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init probeEvent", __func__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -204,7 +204,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to init wmaCompleteEvent", __func__); CDF_ASSERT(0); @@ -216,7 +216,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS free message queue %d", __func__, vStatus); CDF_ASSERT(0); @@ -237,7 +237,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open CDS Scheduler %d", __func__, vStatus); CDF_ASSERT(0); @@ -245,16 +245,16 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, } #if defined(QCA_WIFI_FTM) /* Initialize BMI and Download firmware */ - pHifContext = cds_get_context(CDF_MODULE_ID_HIF); + pHifContext = cds_get_context(QDF_MODULE_ID_HIF); if (!pHifContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: failed to get HIF context", __func__); goto err_sched_close; } ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); if (bmi_download_firmware(ol_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); goto err_bmi_close; } @@ -262,19 +262,19 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge; - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = htc_create(pHifContext, &htcInfo, cdf_ctx); if (!gp_cds_context->htc_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); goto err_bmi_close; } if (bmi_done(ol_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; } @@ -287,7 +287,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == hdd_ctx) || (NULL == hdd_ctx->config)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Hdd Context is Null", __func__); CDF_ASSERT(0); goto err_htc_close; @@ -302,7 +302,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open WMA module %d", __func__, vStatus); CDF_ASSERT(0); @@ -311,14 +311,14 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #if defined(QCA_WIFI_FTM) hdd_update_config(hdd_ctx); - pHtcContext = cds_get_context(CDF_MODULE_ID_HTC); + pHtcContext = cds_get_context(QDF_MODULE_ID_HTC); if (!pHtcContext) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: failed to get HTC context", __func__); goto err_wma_close; } if (htc_wait_target(pHtcContext)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_wma_close; } @@ -338,7 +338,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (eSIR_SUCCESS != sirStatus) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open MAC %d", __func__, sirStatus); CDF_ASSERT(0); goto err_wma_close; @@ -348,7 +348,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_open(gp_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to open SME %d", __func__, vStatus); goto err_mac_close; } @@ -356,10 +356,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_init_chan_list(gp_cds_context->pMACContext, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to init sme channel list", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); return QDF_STATUS_SUCCESS; } @@ -417,7 +417,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) #ifndef QCA_WIFI_FTM qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME %d", __func__, qdf_status); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -425,7 +425,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC %d", __func__, qdf_status); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -435,7 +435,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close WMA %d", __func__, qdf_status); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -447,7 +447,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) } qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -459,7 +459,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy ProbeEvent %d", __func__, qdf_status); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); @@ -467,7 +467,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy wmaCompleteEvent %d", __func__, qdf_status); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); @@ -521,11 +521,11 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) HDD_FTM_WMA_PRE_START_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: wma_pre_start reporting other error", __func__); } @@ -676,7 +676,7 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) qdf_status = cds_sched_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to close CDS Scheduler", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -780,7 +780,7 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) vStatus = wma_start(p_cds_context); if (vStatus != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to start WMA", __func__); goto err_status_failure; } diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index c41e8f475774..57dc2c995850 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -162,7 +162,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx, break; case GREEN_AP_PS_STOP_EVENT: - if (!(cds_get_concurrency_mode() & CDF_SAP_MASK)) + if (!(cds_get_concurrency_mode() & QDF_SAP_MASK)) green_ap->ps_enable = 0; break; @@ -326,7 +326,7 @@ static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) green_ap->ps_delay_time = GREEN_AP_PS_DELAY_TIME; cdf_mc_timer_init(&green_ap->ps_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_wlan_green_ap_timer_fn, hdd_ctx); error: @@ -430,13 +430,13 @@ void hdd_wlan_green_ap_start_bss(struct hdd_context_s *hdd_ctx) */ } - if (!(CDF_STA_MASK & hdd_ctx->concurrency_mode) && + if (!(QDF_STA_MASK & hdd_ctx->concurrency_mode) && cfg->enable2x2 && cfg->enableGreenAP) { hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_START_EVENT); } else { hdd_wlan_green_ap_mc(hdd_ctx, GREEN_AP_PS_STOP_EVENT); hdd_notice("Green-AP: is disabled, due to sta_concurrency: %d, enable2x2: %d, enableGreenAP: %d", - CDF_STA_MASK & hdd_ctx->concurrency_mode, + QDF_STA_MASK & hdd_ctx->concurrency_mode, cfg->enable2x2, cfg->enableGreenAP); } exit: diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 85a6c92dd969..05e9328d36df 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -70,7 +70,7 @@ #include "wma_api.h" #endif #include "wlan_hdd_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "wlan_hdd_cfg.h" #include "cds_concurrency.h" @@ -219,7 +219,7 @@ static int __hdd_hostapd_open(struct net_device *dev) ENTER(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); if (cds_is_load_or_unload_in_progress()) { @@ -589,7 +589,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter, hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter); if (true == cds_is_sta_connection_pending()) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ISSUE_JOIN_REQ, sta_adapter->sessionId, roam_id)); if (QDF_STATUS_SUCCESS != @@ -980,7 +980,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, qdf_status = cdf_mc_timer_init(&pHddApCtx-> hdd_ap_inactivity_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_hostapd_inactivity_timer_cb, dev); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -1229,7 +1229,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, msg.src_addr.sa_family = ARPHRD_ETHER; memcpy(msg.src_addr.sa_data, &pSapEvent->sapevt.sapStationMICFailureEvent. - staMac, CDF_MAC_ADDR_SIZE); + staMac, QDF_MAC_ADDR_SIZE); hddLog(LOG1, "MIC MAC " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(msg.src_addr.sa_data)); if (pSapEvent->sapevt.sapStationMICFailureEvent. @@ -1265,7 +1265,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, wrqu.addr.sa_family = ARPHRD_ETHER; memcpy(wrqu.addr.sa_data, &pSapEvent->sapevt.sapStationAssocReassocCompleteEvent. - staMac, CDF_MAC_ADDR_SIZE); + staMac, QDF_MAC_ADDR_SIZE); hddLog(LOG1, " associated " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); we_event = IWEVREGISTERED; @@ -1294,7 +1294,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. staId, 0, 0, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) wrqu.addr.sa_data, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. @@ -1312,7 +1312,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. staId, 0, 0, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) wrqu.addr.sa_data, pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. @@ -1439,7 +1439,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, case eSAP_STA_DISASSOC_EVENT: memcpy(wrqu.addr.sa_data, &pSapEvent->sapevt.sapStationDisassocCompleteEvent. - staMac, CDF_MAC_ADDR_SIZE); + staMac, QDF_MAC_ADDR_SIZE); hddLog(LOG1, " disassociated " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); @@ -1900,9 +1900,9 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, return -EINVAL; } /* Validity checks */ - if ((gen_ie_len < CDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN)) + if ((gen_ie_len < QDF_MIN(DOT11F_IE_RSN_MIN_LEN, DOT11F_IE_WPA_MIN_LEN)) || (gen_ie_len > - CDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN))) + QDF_MAX(DOT11F_IE_RSN_MAX_LEN, DOT11F_IE_WPA_MAX_LEN))) return -EINVAL; /* Type check */ if (gen_ie[0] == DOT11F_EID_RSN) { @@ -2244,7 +2244,7 @@ static int iw_softap_set_two_ints_getnone(struct net_device *dev, return ret; } -static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size) +static void print_mac_list(struct qdf_mac_addr *macList, uint8_t size) { int i; uint8_t *macArray; @@ -2260,7 +2260,7 @@ static void print_mac_list(struct cdf_mac_addr *macList, uint8_t size) static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) { eSapMacAddrACL acl_mode; - struct cdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS]; + struct qdf_mac_addr MacList[MAX_ACL_MAC_ADDRESS]; uint8_t listnum; void *p_cds_gctx = NULL; @@ -3232,7 +3232,7 @@ int __iw_softap_modify_acl(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif uint8_t *value = (uint8_t *) extra; - uint8_t pPeerStaMac[CDF_MAC_ADDR_SIZE]; + uint8_t pPeerStaMac[QDF_MAC_ADDR_SIZE]; int listType, cmd, i; int ret; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -3248,13 +3248,13 @@ int __iw_softap_modify_acl(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Vos Context is NULL", __func__); return -EINVAL; } #endif - for (i = 0; i < CDF_MAC_ADDR_SIZE; i++) + for (i = 0; i < QDF_MAC_ADDR_SIZE; i++) pPeerStaMac[i] = *(value + i); listType = (int)(*(value + i)); @@ -3346,8 +3346,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, int *value = (int *)extra; int set_value; int ret; - struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER; - struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; ENTER(); @@ -3397,7 +3397,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, hdd_context_t *hdd_ctx; int *value = (int *)extra; int set_value; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; int ret; ENTER(); @@ -3494,13 +3494,13 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev, left = wrqu->data.length - maclist_index; spin_lock_bh(&pHostapdAdapter->staInfo_lock); - while ((cnt < WLAN_MAX_STA_COUNT) && (left >= CDF_MAC_ADDR_SIZE)) { + while ((cnt < WLAN_MAX_STA_COUNT) && (left >= QDF_MAC_ADDR_SIZE)) { if ((pStaInfo[cnt].isUsed) && (!IS_BROADCAST_MAC(pStaInfo[cnt].macAddrSTA.bytes))) { memcpy(&buf[maclist_index], &(pStaInfo[cnt].macAddrSTA), - CDF_MAC_ADDR_SIZE); - maclist_index += CDF_MAC_ADDR_SIZE; - left -= CDF_MAC_ADDR_SIZE; + QDF_MAC_ADDR_SIZE); + maclist_index += QDF_MAC_ADDR_SIZE; + left -= QDF_MAC_ADDR_SIZE; } cnt++; } @@ -3557,7 +3557,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -3780,7 +3780,7 @@ int __iw_get_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: vos context is not valid ", __func__); return -EINVAL; } @@ -3799,7 +3799,7 @@ int __iw_get_genie(struct net_device *dev, #endif &length, genIeBytes); if (status == QDF_STATUS_SUCCESS) { - length = CDF_MIN(length, DOT11F_IE_RSN_MAX_LEN); + length = QDF_MIN(length, DOT11F_IE_RSN_MAX_LEN); if (wrqu->data.length < length || copy_to_user(wrqu->data.pointer, (void *)genIeBytes, length)) { hddLog(LOG1, FL("failed to copy data to user buffer")); @@ -4009,7 +4009,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: pVosContext is NULL", __func__); return -EINVAL; } @@ -4041,12 +4041,12 @@ static int __iw_set_ap_encodeext(struct net_device *dev, setKey.keyDirection = eSIR_TX_RX; cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { setKey.keyDirection = eSIR_TX_DEFAULT; cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } /*For supplicant pae role is zero */ @@ -4455,7 +4455,7 @@ __iw_softap_setwpsie(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -4468,7 +4468,7 @@ __iw_softap_setwpsie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid ", __func__); return -EINVAL; } @@ -5139,7 +5139,7 @@ QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, ENTER(); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -5254,7 +5254,7 @@ static int __iw_set_ap_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: CDF Context is NULL", __func__); return -EINVAL; } @@ -5329,7 +5329,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, char *pLinkSpeed = (char *)extra; uint32_t link_speed = 0; int len = sizeof(uint32_t) + 1; - struct cdf_mac_addr macAddress; + struct qdf_mac_addr macAddress; char pmacAddress[MAC_ADDRESS_STR_LEN + 1]; QDF_STATUS status = QDF_STATUS_E_FAILURE; int rc, valid, i; @@ -5952,9 +5952,9 @@ static const iw_handler hostapd_private[] = { iw_softap_set_two_ints_getnone, }; const struct iw_handler_def hostapd_handler_def = { - .num_standard = CDF_ARRAY_SIZE(hostapd_handler), - .num_private = CDF_ARRAY_SIZE(hostapd_private), - .num_private_args = CDF_ARRAY_SIZE(hostapd_private_args), + .num_standard = QDF_ARRAY_SIZE(hostapd_handler), + .num_private = QDF_ARRAY_SIZE(hostapd_private), + .num_private_args = QDF_ARRAY_SIZE(hostapd_private_args), .standard = (iw_handler *) hostapd_handler, .private = (iw_handler *) hostapd_private, .private_args = hostapd_private_args, @@ -6046,7 +6046,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: Hostapd HDD stop bss event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); @@ -6352,7 +6352,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, } pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_CHANNEL, pAdapter->sessionId, channel_type)); @@ -7485,7 +7485,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, * */ status = hdd_softap_unpack_ie(cds_get_context - (CDF_MODULE_ID_SME), + (QDF_MODULE_ID_SME), &RSNEncryptType, &mcRSNEncryptType, &RSNAuthType, &MFPCapable, &MFPRequired, @@ -7533,7 +7533,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, "RSNWPA IE MAX Length exceeded; length =%d", pConfig->RSNWPAReqIELength); status = hdd_softap_unpack_ie - (cds_get_context(CDF_MODULE_ID_SME), + (cds_get_context(QDF_MODULE_ID_SME), &RSNEncryptType, &mcRSNEncryptType, &RSNAuthType, &MFPCapable, &MFPRequired, @@ -7591,7 +7591,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, cdf_mem_copy(pConfig->self_macaddr.bytes, pHostapdAdapter->macAddressCurrent.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* default value */ pConfig->SapMacaddr_acl = eSAP_ACCEPT_UNLESS_DENIED; @@ -7872,12 +7872,12 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_STOP_AP, pAdapter->sessionId, pAdapter->device_mode)); @@ -8100,12 +8100,12 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_START_AP, pAdapter->sessionId, params->beacon_interval)); if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { @@ -8258,12 +8258,12 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_BEACON, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index cf533547921b..0706e56e6134 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include /* Preprocessor definitions and constants */ diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 79e10689f3db..eb8f5b260ba2 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -558,7 +558,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, * then no need to proceed with reassoc */ if (!memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { hddLog(LOG1, FL("Reassoc BSSID is same as currently associated AP bssid")); ret = -EINVAL; @@ -581,7 +581,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, handoffInfo.channel = channel; handoffInfo.src = REASSOC; - cdf_mem_copy(handoffInfo.bssid.bytes, bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); } @@ -746,7 +746,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, * then no need to send action frame */ if (memcmp(bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { hddLog(LOG1, FL("STA is not associated to this AP")); ret = -EINVAL; goto exit; @@ -813,10 +813,10 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, hdr = (struct ieee80211_hdr_3addr *)frame; hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); - cdf_mem_copy(hdr->addr1, bssid, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes, - CDF_MAC_ADDR_SIZE); - cdf_mem_copy(hdr->addr3, bssid, CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); + cdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE); cdf_mem_copy(hdr + 1, payload, payload_len); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) @@ -1028,7 +1028,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, *pNumChannels = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Number of channels are: %d", *pNumChannels); for (j = 0; j < (*pNumChannels); j++) { @@ -1076,7 +1076,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, } pChannelList[j] = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Channel %d added to preferred channel list", pChannelList[j]); } @@ -1113,18 +1113,18 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, ret = hdd_parse_channellist(command, channel_list, &num_chan); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; @@ -1136,7 +1136,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1182,21 +1182,21 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, num_chan = *value++; if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); for (i = 0; i < num_chan; i++) { channel = *value++; if (channel > WNI_CFG_CURRENT_CHANNEL_STAMAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: index %d invalid channel %d", __func__, i, channel); ret = -EINVAL; @@ -1209,7 +1209,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1475,7 +1475,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) hddLog(CDF_TRACE_LEVEL_DEBUG, "desiredTxPwr %d", pPlmRequest->desiredTxPwr); - for (count = 0; count < CDF_MAC_ADDR_SIZE; count++) { + for (count = 0; count < QDF_MAC_ADDR_SIZE; count++) { cmdPtr = strpbrk(cmdPtr, " "); if (NULL == cmdPtr) @@ -1599,7 +1599,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, rc = wait_for_completion_timeout(&hdd_ctx->ready_to_extwow, msecs_to_jiffies(WLAN_WAIT_TIME_READY_TO_EXTWOW)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to get ready to extwow", __func__); return -EPERM; } @@ -1609,20 +1609,20 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, pm_message_t state; state.event = PM_EVENT_SUSPEND; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received ready to ExtWoW. Going to suspend", __func__); rc = wlan_hdd_cfg80211_suspend_wlan(hdd_ctx->wiphy, NULL); if (rc < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_cfg80211_suspend_wlan failed, error = %d", __func__, rc); return rc; } cdf_ret_status = wlan_hdd_bus_suspend(state); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", __func__, cdf_ret_status); wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy); @@ -1630,7 +1630,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, } } } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Received ready to ExtWoW failure", __func__); return -EPERM; } @@ -1716,7 +1716,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, } if (2 != sscanf(arg, "%8s %16s", id, password)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Invalid Number of arguments")); return -EINVAL; } @@ -1730,7 +1730,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, params.pass_length = strlen(password); cdf_mem_copy(params.password, password, params.pass_length); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: %d %pM %.8s %u %.16s %u", __func__, params.vdev_id, params.wakee_mac_addr.bytes, params.identification_id, params.id_length, @@ -1764,7 +1764,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); char mac_addr[20], rc4_key[20]; - unsigned int gateway_mac[CDF_MAC_ADDR_SIZE]; + unsigned int gateway_mac[QDF_MAC_ADDR_SIZE]; tSirAppType2Params params; int ret; @@ -1792,7 +1792,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, (unsigned int *)¶ms.tcp_rx_timeout_val); if (ret != 15 && ret != 7) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Number of arguments"); return -EINVAL; } @@ -1801,20 +1801,20 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &gateway_mac[0], &gateway_mac[1], &gateway_mac[2], &gateway_mac[3], &gateway_mac[4], &gateway_mac[5])) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid MacAddress Input %s", mac_addr); return -EINVAL; } if (params.tcp_src_port > WLAN_HDD_MAX_TCP_PORT || params.tcp_dst_port > WLAN_HDD_MAX_TCP_PORT) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid TCP Port Number"); return -EINVAL; } cdf_mem_copy(¶ms.gateway_mac.bytes, (uint8_t *) &gateway_mac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); params.rc4_key_len = strlen(rc4_key); cdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len); @@ -1848,7 +1848,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, params.tcp_rx_timeout_val : hdd_ctx->config->extWowApp2TcpRxTimeout; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: %pM %.16s %u %u %u %u %u %u %u %u %u %u %u %u %u", __func__, gateway_mac, rc4_key, params.ip_id, params.ip_device_ip, params.ip_server_ip, params.tcp_seq, @@ -1911,7 +1911,7 @@ static int hdd_parse_setmaxtxpower_command(uint8_t *pValue, int *pTxPower) *pTxPower = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "SETMAXTXPOWER: %d", *pTxPower); return 0; @@ -1923,7 +1923,7 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command, int ret = 0; if (!pCfg || !command || !extra || !len) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: argument passed for GETDWELLTIME is incorrect", __func__); ret = -EINVAL; @@ -2215,7 +2215,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, pEseBcnReq->numBcnReqIe = tempInt; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe); for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) { @@ -2252,7 +2252,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, switch (i) { case 0: /* Measurement token */ if (tempInt <= 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Measurement Token(%d)", tempInt); @@ -2266,7 +2266,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, if ((tempInt <= 0) || (tempInt > WNI_CFG_CURRENT_CHANNEL_STAMAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Channel Number(%d)", tempInt); @@ -2278,7 +2278,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, case 2: /* Scan mode */ if ((tempInt < eSIR_PASSIVE_SCAN) || (tempInt > eSIR_BEACON_TABLE)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Scan Mode(%d) Expected{0|1|2}", tempInt); @@ -2294,7 +2294,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, ((tempInt < 0) && (pEseBcnReq->bcnReq[j].scanMode == eSIR_BEACON_TABLE))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid Measurement Duration(%d)", tempInt); @@ -2308,7 +2308,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, } for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Index(%d) Measurement Token(%u) Channel(%u) Scan Mode(%u) Measurement Duration(%u)", j, pEseBcnReq->bcnReq[j].measurementToken, @@ -2404,7 +2404,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) struct hdd_config *pConfig = NULL; if (pHddCtx == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is null", __func__); return -EINVAL; } @@ -2449,7 +2449,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter, { int ret = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL, adapter->sessionId, (unsigned)(*(hdd_ctx->p2pDeviceAddress.bytes + 2) @@ -2612,7 +2612,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2626,7 +2626,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, if ((lookUpThreshold < CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN) || (lookUpThreshold > CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Neighbor lookup threshold value %d is out of range (Min: %d Max: %d)", lookUpThreshold, @@ -2636,10 +2636,10 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam trigger (Neighbor lookup threshold) = %d", __func__, lookUpThreshold); @@ -2649,7 +2649,7 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, adapter->sessionId, lookUpThreshold); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to set roam trigger, try again", __func__); @@ -2674,14 +2674,14 @@ static int drv_cmd_get_roam_trigger(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -2715,7 +2715,7 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2727,7 +2727,7 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, if ((roamScanPeriod < (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000)) || (roamScanPeriod > (CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam scan period value %d is out of range (Min: %d Max: %d)", roamScanPeriod, @@ -2736,12 +2736,12 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL, adapter->sessionId, roamScanPeriod)); neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan period (Empty Scan refresh period) = %d", __func__, roamScanPeriod); @@ -2768,7 +2768,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL, adapter->sessionId, nEmptyScanRefreshPeriod)); @@ -2776,7 +2776,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter, "GETROAMSCANPERIOD", (nEmptyScanRefreshPeriod / 1000)); /* Returned value is in units of seconds */ - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("failed to copy data to user buffer")); @@ -2809,7 +2809,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, @@ -2823,7 +2823,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000)) || (roamScanRefreshPeriod > (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Neighbor scan results refresh period value %d is out of range (Min: %d Max: %d)", roamScanRefreshPeriod, @@ -2836,7 +2836,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, } neighborScanRefreshPeriod = roamScanRefreshPeriod * 1000; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan refresh period (Scan refresh period) = %d", __func__, roamScanRefreshPeriod); @@ -2867,9 +2867,9 @@ static int drv_cmd_get_roam_scan_refresh_period(hdd_adapter_t *adapter, "GETROAMSCANREFRESHPERIOD", (value / 1000)); /* Returned value is in units of seconds */ - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -2899,7 +2899,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, @@ -2909,7 +2909,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, } if ((roamMode < CFG_LFR_FEATURE_ENABLED_MIN) || (roamMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam Mode value %d is out of range (Min: %d Max: %d)", roamMode, @@ -2919,7 +2919,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, "%s: Received Command to Set Roam Mode = %d", __func__, roamMode); /* @@ -2981,9 +2981,9 @@ static int drv_cmd_get_roam_mode(hdd_adapter_t *adapter, roamMode = CFG_LFR_FEATURE_ENABLED_MIN; len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3013,7 +3013,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_RSSI_DIFF_MIN, @@ -3024,7 +3024,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, if ((roamRssiDiff < CFG_ROAM_RSSI_DIFF_MIN) || (roamRssiDiff > CFG_ROAM_RSSI_DIFF_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Roam rssi diff value %d is out of range (Min: %d Max: %d)", roamRssiDiff, @@ -3034,7 +3034,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam rssi diff = %d", __func__, roamRssiDiff); @@ -3059,16 +3059,16 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMDELTA_IOCTL, adapter->sessionId, roamRssiDiff)); len = scnprintf(extra, sizeof(extra), "%s %d", command, roamRssiDiff); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3091,15 +3091,15 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter, hdd_get_band_helper(hdd_ctx, &band); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETBAND_IOCTL, adapter->sessionId, band)); len = scnprintf(extra, sizeof(extra), "%s %d", command, band); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3136,7 +3136,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, &numChannels, adapter->sessionId)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: failed to get roam scan channel list", __func__); @@ -3144,7 +3144,7 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL, adapter->sessionId, numChannels)); /* @@ -3158,9 +3158,9 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, len += scnprintf(extra + len, sizeof(extra) - len, " %d", ChannelList[j]); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3190,7 +3190,7 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, if (eseMode && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -3200,9 +3200,9 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETCCXMODE", eseMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3232,7 +3232,7 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, if (okcMode && sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -3242,10 +3242,10 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETOKCMODE", okcMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3270,10 +3270,10 @@ static int drv_cmd_get_fast_roam(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETFASTROAM", lfrMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3296,10 +3296,10 @@ static int drv_cmd_get_fast_transition(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", "GETFASTTRANSITION", ft); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3329,7 +3329,7 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3341,7 +3341,7 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, if ((minTime < CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN) || (minTime > CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "scan min channel time value %d is out of range (Min: %d Max: %d)", minTime, @@ -3351,10 +3351,10 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, minTime)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel min time = %d", __func__, minTime); @@ -3391,14 +3391,14 @@ static int drv_cmd_get_roam_scan_channel_min_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANCHANNELMINTIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, val)); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3428,7 +3428,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, @@ -3440,7 +3440,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, if ((maxTime < CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN) || (maxTime > CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", maxTime, @@ -3450,7 +3450,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel max time = %d", __func__, maxTime); @@ -3478,10 +3478,10 @@ static int drv_cmd_get_scan_channel_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETSCANCHANNELTIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3511,7 +3511,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, @@ -3523,7 +3523,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, if ((val < CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN) || (val > CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "scan home time value %d is out of range (Min: %d Max: %d)", val, @@ -3533,7 +3533,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change scan home time = %d", __func__, val); @@ -3561,10 +3561,10 @@ static int drv_cmd_get_scan_home_time(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETSCANHOMETIME", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3594,7 +3594,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_INTRA_BAND_MIN, @@ -3605,7 +3605,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, if ((val < CFG_ROAM_INTRA_BAND_MIN) || (val > CFG_ROAM_INTRA_BAND_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "intra band mode value %d is out of range (Min: %d Max: %d)", val, @@ -3614,7 +3614,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change intra band = %d", __func__, val); @@ -3639,9 +3639,9 @@ static int drv_cmd_get_roam_intra_band(hdd_adapter_t *adapter, /* value is interms of msec */ len = scnprintf(extra, sizeof(extra), "%s %d", "GETROAMINTRABAND", val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3671,7 +3671,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_SCAN_N_PROBES_MIN, @@ -3682,7 +3682,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) || (nProbes > CFG_ROAM_SCAN_N_PROBES_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "NProbes value %d is out of range (Min: %d Max: %d)", nProbes, @@ -3692,7 +3692,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set nProbes = %d", __func__, nProbes); @@ -3716,9 +3716,9 @@ static int drv_cmd_get_scan_n_probes(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3750,7 +3750,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3762,7 +3762,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) || (homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "homeAwayTime value %d is out of range (Min: %d Max: %d)", homeAwayTime, @@ -3772,7 +3772,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set scan away time = %d", __func__, homeAwayTime); @@ -3801,10 +3801,10 @@ static int drv_cmd_get_scan_home_away_time(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3843,7 +3843,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -3855,7 +3855,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, if ((wesMode < CFG_ENABLE_WES_MODE_NAME_MIN) || (wesMode > CFG_ENABLE_WES_MODE_NAME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "WES Mode value %d is out of range (Min: %d Max: %d)", wesMode, @@ -3865,7 +3865,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set WES Mode rssi diff = %d", __func__, wesMode); @@ -3888,9 +3888,9 @@ static int drv_cmd_get_wes_mode(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, wesMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3921,14 +3921,14 @@ static int drv_cmd_set_opportunistic_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Opportunistic Threshold diff = %d", __func__, nOpportunisticThresholdDiff); @@ -3953,9 +3953,9 @@ static int drv_cmd_get_opportunistic_rssi_diff(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -3985,14 +3985,14 @@ static int drv_cmd_set_roam_rescan_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam Rescan RSSI Diff = %d", __func__, nRoamRescanRssiDiff); @@ -4016,9 +4016,9 @@ static int drv_cmd_get_roam_rescan_rssi_diff(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, val); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4048,7 +4048,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, @@ -4059,7 +4059,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, if ((lfrMode < CFG_LFR_FEATURE_ENABLED_MIN) || (lfrMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", lfrMode, @@ -4069,7 +4069,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change lfr mode = %d", __func__, lfrMode); @@ -4103,7 +4103,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, @@ -4115,7 +4115,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, if ((ft < CFG_FAST_TRANSITION_ENABLED_NAME_MIN) || (ft > CFG_FAST_TRANSITION_ENABLED_NAME_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "ft mode value %d is out of range (Min: %d Max: %d)", ft, @@ -4125,7 +4125,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change ft mode = %d", __func__, ft); @@ -4160,10 +4160,10 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, msg.type = SIR_HAL_ROAM_INVOKE; msg.reserved = 0; msg.bodyptr = fastreassoc; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(fastreassoc); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Not able to post ROAM_INVOKE_CMD message to WMA")); } } @@ -4196,7 +4196,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, /* if not associated, no need to proceed with reassoc */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s:Not associated!", __func__); ret = -EINVAL; @@ -4206,7 +4206,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, ret = hdd_parse_reassoc_command_v1_data(value, targetApBssid, &channel); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse reassoc command data", __func__); @@ -4219,7 +4219,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, */ if (true == cdf_mem_compare(targetApBssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { /* Reassoc to same AP, only supported for Open Security*/ if ((pHddStaCtx->conn_info.ucEncryptionType || pHddStaCtx->conn_info.mcEncryptionType)) { @@ -4321,7 +4321,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -4339,7 +4339,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ESE_FEATURE_ENABLED_MIN, @@ -4350,7 +4350,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) || (eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Ese mode value %d is out of range (Min: %d Max: %d)", eseMode, @@ -4359,7 +4359,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change ese mode = %d", __func__, eseMode); @@ -4393,14 +4393,14 @@ static int drv_cmd_set_roam_scan_control(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed ", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan control = %d", __func__, roamScanControl); @@ -4434,7 +4434,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); @@ -4452,7 +4452,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_OKC_FEATURE_ENABLED_MIN, @@ -4463,7 +4463,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if ((okcMode < CFG_OKC_FEATURE_ENABLED_MIN) || (okcMode > CFG_OKC_FEATURE_ENABLED_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Okc mode value %d is out of range (Min: %d Max: %d)", okcMode, @@ -4472,7 +4472,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to change okc mode = %d", __func__, okcMode); @@ -4495,9 +4495,9 @@ static int drv_cmd_get_roam_scan_control(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, roamScanControl); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4518,7 +4518,7 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, bcMode = command + 11; if ('1' == *bcMode) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = true; @@ -4528,7 +4528,7 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, FL("Failed to abort existing scan status:%d"), ret); } } else if ('2' == *bcMode) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = false; @@ -4571,9 +4571,9 @@ static int drv_cmd_get_dwell_time(hdd_adapter_t *adapter, memset(extra, 0, sizeof(extra)); ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4609,7 +4609,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, pHddCtx = WLAN_HDD_GET_CTX(adapter); if (0 != wlan_hdd_validate_context(pHddCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s pHddCtx is not valid, Unable to set miracast mode", __func__); return -EINVAL; @@ -4625,7 +4625,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range ", __func__); @@ -4635,7 +4635,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, if ((filterType < WLAN_HDD_DRIVER_MIRACAST_CFG_MIN_VAL) || (filterType > WLAN_HDD_DRIVER_MIRACAST_CFG_MAX_VAL)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Accepted Values are 0 to 2. 0-Disabled, 1-Source, 2-Sink ", __func__); @@ -4673,14 +4673,14 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ret = hdd_parse_channellist(value, ChannelList, &numChannels); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } if (numChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, @@ -4694,7 +4694,7 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, numChannels); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); @@ -4732,7 +4732,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, /* if not associated, return error */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:Not associated!", __func__); ret = -EINVAL; @@ -4749,7 +4749,7 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, TID_MIN_VALUE, @@ -4758,27 +4758,27 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, goto exit; } if ((tid < TID_MIN_VALUE) || (tid > TID_MAX_VALUE)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "tid value %d is out of range (Min: %d Max: %d)", tid, TID_MIN_VALUE, TID_MAX_VALUE); ret = -EINVAL; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to get tsm stats tid = %d", __func__, tid); if (QDF_STATUS_SUCCESS != hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to get tsm stats", __func__); ret = -EFAULT; goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "UplinkPktQueueDly(%d) UplinkPktQueueDlyHist[0](%d) UplinkPktQueueDlyHist[1](%d) UplinkPktQueueDlyHist[2](%d) UplinkPktQueueDlyHist[3](%d) UplinkPktTxDly(%u) UplinkPktLoss(%d) UplinkPktCount(%d) RoamingCount(%d) RoamingDly(%d)", tsm_metrics.UplinkPktQueueDly, @@ -4811,9 +4811,9 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, tsm_metrics.UplinkPktCount, tsm_metrics.RoamingCount, tsm_metrics.RoamingDly); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -4838,7 +4838,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, ret = hdd_parse_get_cckm_ie(value, &cckmIe, &cckmIeLen); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse cckm ie data", __func__); @@ -4846,7 +4846,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, } if (cckmIeLen > DOT11F_IE_RSN_MAX_LEN) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: CCKM Ie input length is more than max[%d]", __func__, DOT11F_IE_RSN_MAX_LEN); @@ -4889,7 +4889,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, ret = hdd_parse_ese_beacon_req(value, &eseBcnReq); if (ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Failed to parse ese beacon req", __func__); @@ -4916,7 +4916,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, ret = -EBUSY; goto exit; } else if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_ese_beacon_request failed (%d)", __func__, status); @@ -4963,14 +4963,14 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, QDF_STATUS qdf_status; QDF_STATUS smeStatus; uint8_t *value = command; - struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER; - struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; hdd_adapter_list_node_t *pAdapterNode = NULL; hdd_adapter_list_node_t *pNext = NULL; status = hdd_parse_setmaxtxpower_command(value, &txPower); if (status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid MAXTXPOWER command "); ret = -EINVAL; @@ -5034,7 +5034,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAMING_DFS_CHANNEL_MIN, @@ -5045,7 +5045,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, if ((dfsScanMode < CFG_ROAMING_DFS_CHANNEL_MIN) || (dfsScanMode > CFG_ROAMING_DFS_CHANNEL_MAX)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "dfsScanMode value %d is out of range (Min: %d Max: %d)", dfsScanMode, @@ -5055,7 +5055,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Command to Set DFS Scan Mode = %d", __func__, dfsScanMode); @@ -5091,9 +5091,9 @@ static int drv_cmd_get_dfs_scan_mode(hdd_adapter_t *adapter, uint8_t len = 0; len = scnprintf(extra, sizeof(extra), "%s %d", command, dfsScanMode); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -5115,9 +5115,9 @@ static int drv_cmd_get_link_status(hdd_adapter_t *adapter, uint8_t len; len = scnprintf(extra, sizeof(extra), "%s %d", command, value); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); @@ -5355,7 +5355,7 @@ static int drv_cmd_get_rssi(hdd_adapter_t *adapter, wlan_hdd_get_rssi(adapter, &rssi); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("Failed to copy data to user buffer")); @@ -5381,7 +5381,7 @@ static int drv_cmd_get_linkspeed(hdd_adapter_t *adapter, return ret; len = scnprintf(extra, sizeof(extra), "%s %d", command, link_speed); - len = CDF_MIN(priv_data->total_len, len + 1); + len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { hddLog(LOGE, FL("Failed to copy data to user buffer")); ret = -EFAULT; @@ -5598,12 +5598,12 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, if (0 != rc) { const char *msg = "unknown or badly formatted cmd\n%s"; - l = CDF_MIN(MAX_USER_COMMAND_SIZE, + l = QDF_MIN(MAX_USER_COMMAND_SIZE, strlen(msg)+strlen(synopsis)); n = scnprintf(reply, l, msg, synopsis); if (copy_to_user(priv_data->buf, reply, - CDF_MIN(priv_data->total_len, l))) + QDF_MIN(priv_data->total_len, l))) hdd_err("failed to copy data to user buffer"); hdd_debug("reply: %s", reply); @@ -5641,7 +5641,7 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, status_end: hdd_info("wlan: STATUS DATA:\n%s", reply); if (copy_to_user(priv_data->buf, reply, - CDF_MIN(n, priv_data->total_len))) + QDF_MIN(n, priv_data->total_len))) rc = -EINVAL; } else if (!strcmp(subcmd, "STATS")) { int n = 0; @@ -5655,7 +5655,7 @@ static int drv_cmd_napi(hdd_adapter_t *adapter, } if (n > 0) { if (copy_to_user(priv_data->buf, reply, - CDF_MIN(priv_data->total_len, + QDF_MIN(priv_data->total_len, n))) rc = -EINVAL; hdd_info("wlan: STATS_DATA\n%s\n", reply); @@ -5882,7 +5882,7 @@ static int drv_cmd_invalid(hdd_adapter_t *adapter, uint8_t command_len, hdd_priv_data_t *priv_data) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_UNSUPPORTED_IOCTL, adapter->sessionId, 0)); @@ -6235,7 +6235,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -6360,20 +6360,20 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ENTER(); if (dev != adapter->dev) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: HDD adapter/dev inconsistency", __func__); ret = -ENODEV; goto exit; } if ((!ifr) || (!ifr->ifr_data)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid data", __func__); ret = -EINVAL; goto exit; } #if defined(QCA_WIFI_FTM) && defined(LINUX_QCMBR) - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { if (SIOCIOCTLTX99 == cmd) { ret = wlan_hdd_qcmbr_unified_ioctl(adapter, ifr); goto exit; diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 6199d4d7b599..635433840d9d 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -322,7 +322,7 @@ struct ipa_uc_pending_event { hdd_adapter_t *adapter; enum ipa_wlan_event type; uint8_t sta_id; - uint8_t mac_addr[CDF_MAC_ADDR_SIZE]; + uint8_t mac_addr[QDF_MAC_ADDR_SIZE]; }; /** @@ -359,7 +359,7 @@ static uint8_t vdev_to_iface[CSR_ROAM_SESSION_MAX]; * @rx_destructor_call: IPA Rx packet destructor count */ struct uc_rt_debug_info { - v_TIME_t time; + unsigned long time; uint64_t ipa_excep_count; uint64_t rx_drop_count; uint64_t net_sent_count; @@ -443,30 +443,30 @@ struct hdd_ipa_priv { cdf_mutex_t ipa_lock; /* CE resources */ - cdf_dma_addr_t ce_sr_base_paddr; + qdf_dma_addr_t ce_sr_base_paddr; uint32_t ce_sr_ring_size; - cdf_dma_addr_t ce_reg_paddr; + qdf_dma_addr_t ce_reg_paddr; /* WLAN TX:IPA->WLAN */ - cdf_dma_addr_t tx_comp_ring_base_paddr; + qdf_dma_addr_t tx_comp_ring_base_paddr; uint32_t tx_comp_ring_size; uint32_t tx_num_alloc_buffer; /* WLAN RX:WLAN->IPA */ - cdf_dma_addr_t rx_rdy_ring_base_paddr; + qdf_dma_addr_t rx_rdy_ring_base_paddr; uint32_t rx_rdy_ring_size; - cdf_dma_addr_t rx_proc_done_idx_paddr; + qdf_dma_addr_t rx_proc_done_idx_paddr; void *rx_proc_done_idx_vaddr; /* WLAN RX2:WLAN->IPA */ - cdf_dma_addr_t rx2_rdy_ring_base_paddr; + qdf_dma_addr_t rx2_rdy_ring_base_paddr; uint32_t rx2_rdy_ring_size; - cdf_dma_addr_t rx2_proc_done_idx_paddr; + qdf_dma_addr_t rx2_proc_done_idx_paddr; void *rx2_proc_done_idx_vaddr; /* IPA UC doorbell registers paddr */ - cdf_dma_addr_t tx_comp_doorbell_paddr; - cdf_dma_addr_t rx_ready_doorbell_paddr; + qdf_dma_addr_t tx_comp_doorbell_paddr; + qdf_dma_addr_t rx_ready_doorbell_paddr; }; /** @@ -507,13 +507,13 @@ uint32_t wlan_hdd_stub_addr_to_priv(void *ptr) (((struct hdd_ipa_cld_hdr *) (_data))->iface_id) #define HDD_IPA_LOG(LVL, fmt, args ...) \ - CDF_TRACE(CDF_MODULE_ID_HDD, LVL, \ + CDF_TRACE(QDF_MODULE_ID_HDD, LVL, \ "%s:%d: "fmt, __func__, __LINE__, ## args) #define HDD_IPA_DBG_DUMP(_lvl, _prefix, _buf, _len) \ do { \ - CDF_TRACE(CDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \ - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_HDD, _lvl, _buf, _len); \ + CDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \ + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \ } while (0) #define HDD_IPA_IS_CONFIG_ENABLED(_hdd_ctx, _mask) \ @@ -902,7 +902,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; cdf_mutex_init(&hdd_ipa->rt_debug_lock); - cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx); hdd_ipa->rt_buf_fill_index = 0; cdf_mem_zero(hdd_ipa->rt_bug_buffer, @@ -923,7 +923,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) "%s: IPA RT debug is not enabled", __func__); return; } - cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_handler, (void *)hdd_ctx); cdf_mc_timer_start(&hdd_ipa->rt_debug_timer, HDD_IPA_UC_RT_DEBUG_PERIOD); @@ -1422,7 +1422,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) { /* STATs from host */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CE ====\n" "CE RING BASE: 0x%llx\n" "CE RING SIZE: %d\n" @@ -1430,7 +1430,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (unsigned long long)hdd_ipa->ce_sr_base_paddr, hdd_ipa->ce_sr_ring_size, (unsigned long long)hdd_ipa->ce_reg_paddr); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST TX ====\n" "COMP RING BASE: 0x%llx\n" "COMP RING SIZE: %d\n" @@ -1440,7 +1440,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->tx_comp_ring_size, hdd_ipa->tx_num_alloc_buffer, (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST RX ====\n" "IND RING BASE: 0x%llx\n" "IND RING SIZE: %d\n" @@ -1456,7 +1456,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->stats.num_rx_excep, hdd_ipa->stats.num_tx_bcmc, (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CONTROL ====\n" "SAP NUM STAs: %d\n" "STA CONNECTED: %d\n" @@ -1476,7 +1476,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) /* STATs from FW */ uc_fw_stat = (struct ipa_uc_fw_stats *) ((uint8_t *)op_msg + sizeof(struct op_msg_type)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW TX ====\n" "COMP RING BASE: 0x%x\n" "COMP RING SIZE: %d\n" @@ -1497,7 +1497,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->tx_pkts_enqueued, uc_fw_stat->tx_pkts_completed, uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW RX ====\n" "IND RING BASE: 0x%x\n" "IND RING SIZE: %d\n" @@ -1528,7 +1528,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved); /* STATs from IPA */ ipa_get_wdi_stats(&ipa_stat); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA TX ====\n" "NUM PROCD : %d\n" "CE DBELL : 0x%x\n" @@ -1564,7 +1564,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) num_bam_int_in_non_runnning_state, ipa_stat.tx_ch_stats.num_qmb_int_handled); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA RX ====\n" "MAX OST PKT : %d\n" "NUM PKT PRCSD : %d\n" @@ -1813,7 +1813,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) pipe_in.u.dl.comp_ring_base_pa = ipa_ctxt->tx_comp_ring_base_paddr; pipe_in.u.dl.comp_ring_size = - ipa_ctxt->tx_comp_ring_size * sizeof(cdf_dma_addr_t); + ipa_ctxt->tx_comp_ring_size * sizeof(qdf_dma_addr_t); pipe_in.u.dl.ce_ring_base_pa = ipa_ctxt->ce_sr_base_paddr; pipe_in.u.dl.ce_door_bell_pa = ipa_ctxt->ce_reg_paddr; pipe_in.u.dl.ce_ring_size = ipa_ctxt->ce_sr_ring_size; @@ -3675,7 +3675,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, pending_event->type = type; cdf_mem_copy(pending_event->mac_addr, mac_addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); qdf_list_insert_back(&hdd_ipa->pending_event, &pending_event->node); @@ -4023,7 +4023,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) ghdd_ipa = hdd_ipa; hdd_ipa->hdd_ctx = hdd_ctx; hdd_ipa->num_iface = 0; - ol_txrx_ipa_uc_get_resource(cds_get_context(CDF_MODULE_ID_TXRX), + ol_txrx_ipa_uc_get_resource(cds_get_context(QDF_MODULE_ID_TXRX), &hdd_ipa->ce_sr_base_paddr, &hdd_ipa->ce_sr_ring_size, &hdd_ipa->ce_reg_paddr, diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 1a51a05335b6..1ea7dd4bf8d2 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -34,7 +34,7 @@ #define HDD_DISALLOW_LEGACY_HDDLOG 1 #include -#include +#include #include #include #include @@ -503,7 +503,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { struct hdd_lro_s *hdd_lro; - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); size_t lro_mgr_sz, desc_arr_sz, desc_pool_sz, hash_table_sz; uint8_t *lro_mem_ptr; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ba20df84a534..3dc87356af5a 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -55,7 +55,7 @@ #include "wlan_hdd_ftm.h" #include "wlan_hdd_power.h" #include "wlan_hdd_stats.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include @@ -189,7 +189,7 @@ void wlan_hdd_auto_shutdown_cb(void); void wlan_hdd_txrx_pause_cb(uint8_t vdev_id, enum netif_action_type action, enum netif_reason_type reason) { - hdd_context_t *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); hdd_adapter_t *adapter; if (!hdd_ctx) { @@ -482,7 +482,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, * * Return: None */ -static void hdd_cdf_trace_enable(CDF_MODULE_ID moduleId, uint32_t bitmask) +static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) { CDF_TRACE_LEVEL level; @@ -744,16 +744,16 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) * Return: None */ void hdd_update_macaddr(struct hdd_config *config, - struct cdf_mac_addr hw_macaddr) + struct qdf_mac_addr hw_macaddr) { int8_t i; uint8_t macaddr_b3, tmp_br3; cdf_mem_copy(config->intfMacAddr[0].bytes, hw_macaddr.bytes, - CDF_MAC_ADDR_SIZE); - for (i = 1; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + QDF_MAC_ADDR_SIZE); + for (i = 1; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { cdf_mem_copy(config->intfMacAddr[i].bytes, hw_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); macaddr_b3 = config->intfMacAddr[i].bytes[3]; tmp_br3 = ((macaddr_b3 >> 4 & INTF_MACADDR_MASK) + i) & INTF_MACADDR_MASK; @@ -1441,7 +1441,7 @@ static int __hdd_open(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1497,7 +1497,7 @@ static int __hdd_stop(struct net_device *dev) ENTER(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1678,12 +1678,12 @@ static int hdd_set_mac_address(struct net_device *dev, void *addr) uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *hdd_ctx) { int i; - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { if (0 == ((hdd_ctx->config->intfAddrMask) & (1 << i))) break; } - if (CDF_MAX_CONCURRENCY_PERSONA == i) + if (QDF_MAX_CONCURRENCY_PERSONA == i) return NULL; hdd_ctx->config->intfAddrMask |= (1 << i); @@ -1693,7 +1693,7 @@ uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *hdd_ctx) void wlan_hdd_release_intf_addr(hdd_context_t *hdd_ctx, uint8_t *releaseAddr) { int i; - for (i = 0; i < CDF_MAX_CONCURRENCY_PERSONA; i++) { + for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { if (!memcmp(releaseAddr, &hdd_ctx->config->intfMacAddr[i].bytes[0], 6)) { @@ -1724,7 +1724,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) static const uint8_t ipv6_router_solicitation[] = {0x33, 0x33, 0x00, 0x00, 0x00, 0x02}; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; ENTER(); @@ -2522,7 +2522,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, cds_check_and_restart_sap_with_non_dfs_acs(); } - if ((cds_get_conparam() != CDF_GLOBAL_FTM_MODE) + if ((cds_get_conparam() != QDF_GLOBAL_FTM_MODE) && (!hdd_ctx->config->enable2x2)) { #define HDD_DTIM_1CHAIN_RX_ID 0x5 #define HDD_SMPS_PARAM_VALUE_S 29 @@ -2568,7 +2568,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #undef HDD_SMPS_PARAM_VALUE_S } - if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) { ret = wma_cli_set_command(adapter->sessionId, WMI_PDEV_PARAM_HYST_EN, hdd_ctx->config->enableMemDeepSleep, @@ -2585,7 +2585,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, #ifdef CONFIG_FW_LOGS_BASED_ON_INI /* Enable FW logs based on INI configuration */ - if ((CDF_GLOBAL_FTM_MODE != cds_get_conparam()) && + if ((QDF_GLOBAL_FTM_MODE != cds_get_conparam()) && (hdd_ctx->config->enable_fw_log)) { uint8_t count = 0; uint32_t value = 0; @@ -2736,7 +2736,7 @@ QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) { - struct cdf_mac_addr *bssid = NULL; + struct qdf_mac_addr *bssid = NULL; tSirUpdateIE updateIE; switch (pHostapdAdapter->device_mode) { case WLAN_HDD_INFRA_STATION: @@ -3051,7 +3051,7 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) QDF_STATUS status; hdd_adapter_t *adapter; #ifndef MSM_PLATFORM - struct cdf_mac_addr bcastMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; #endif eConnectionState connState; @@ -3642,7 +3642,7 @@ static inline int hdd_logging_sock_deactivate_svc(hdd_context_t *hdd_ctx) */ static void hdd_free_context(hdd_context_t *hdd_ctx) { - if (CDF_GLOBAL_FTM_MODE != hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE != hdd_get_conparam()) hdd_logging_sock_deactivate_svc(hdd_ctx); cdf_mem_free(hdd_ctx->config); @@ -3674,7 +3674,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_unregister_wext_all_adapters(hdd_ctx); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_disable_ftm(hdd_ctx); hdd_alert("FTM driver unloaded"); @@ -3823,7 +3823,7 @@ void __hdd_wlan_exit(void) ENTER(); - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context")); EXIT(); @@ -3874,7 +3874,7 @@ void hdd_skip_acs_scan_timer_handler(void *data) * Return: 0 if successful, error number otherwise */ int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId, - struct cdf_mac_addr macAddrSTA, int channel_type) + struct qdf_mac_addr macAddrSTA, int channel_type) { int status; QDF_STATUS qdf_status; @@ -3915,7 +3915,7 @@ int hdd_wlan_notify_modem_power_state(int state) QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { hddLog(LOGE, FL("HDD context is not valid")); @@ -4614,7 +4614,7 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, } safe_channel_count = 0; - unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count, + unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count, (uint16_t)NUM_20MHZ_RF_CHANNELS); for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { @@ -4679,7 +4679,7 @@ void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind) } /* Get the HDD context.*/ hdd_ctx = - (hdd_context_t *)cds_get_context(CDF_MODULE_ID_HDD); + (hdd_context_t *)cds_get_context(QDF_MODULE_ID_HDD); if (0 != wlan_hdd_validate_context(hdd_ctx)) return; @@ -4929,7 +4929,7 @@ static void hdd_init_channel_avoidance(hdd_context_t *hdd_ctx) hddLog(CDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"), hdd_ctx->unsafe_channel_count); - unsafe_channel_count = CDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, + unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, (uint16_t)NUM_20MHZ_RF_CHANNELS); for (index = 0; index < unsafe_channel_count; index++) { @@ -5016,41 +5016,41 @@ static void hdd_override_ini_config(hdd_context_t *hdd_ctx) */ static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx) { - hdd_cdf_trace_enable(CDF_MODULE_ID_WMI, + hdd_cdf_trace_enable(QDF_MODULE_ID_WMI, hdd_ctx->config->cdf_trace_enable_wdi); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD, hdd_ctx->config->cdf_trace_enable_hdd); - hdd_cdf_trace_enable(CDF_MODULE_ID_SME, + hdd_cdf_trace_enable(QDF_MODULE_ID_SME, hdd_ctx->config->cdf_trace_enable_sme); - hdd_cdf_trace_enable(CDF_MODULE_ID_PE, + hdd_cdf_trace_enable(QDF_MODULE_ID_PE, hdd_ctx->config->cdf_trace_enable_pe); - hdd_cdf_trace_enable(CDF_MODULE_ID_WMA, + hdd_cdf_trace_enable(QDF_MODULE_ID_WMA, hdd_ctx->config->cdf_trace_enable_wma); - hdd_cdf_trace_enable(CDF_MODULE_ID_SYS, + hdd_cdf_trace_enable(QDF_MODULE_ID_SYS, hdd_ctx->config->cdf_trace_enable_sys); - hdd_cdf_trace_enable(CDF_MODULE_ID_CDF, + hdd_cdf_trace_enable(QDF_MODULE_ID_QDF, hdd_ctx->config->cdf_trace_enable_cdf); - hdd_cdf_trace_enable(CDF_MODULE_ID_SAP, + hdd_cdf_trace_enable(QDF_MODULE_ID_SAP, hdd_ctx->config->cdf_trace_enable_sap); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SOFTAP, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP, hdd_ctx->config->cdf_trace_enable_hdd_sap); - hdd_cdf_trace_enable(CDF_MODULE_ID_BMI, + hdd_cdf_trace_enable(QDF_MODULE_ID_BMI, hdd_ctx->config->cdf_trace_enable_bmi); - hdd_cdf_trace_enable(CDF_MODULE_ID_CFG, + hdd_cdf_trace_enable(QDF_MODULE_ID_CFG, hdd_ctx->config->cdf_trace_enable_cfg); - hdd_cdf_trace_enable(CDF_MODULE_ID_EPPING, + hdd_cdf_trace_enable(QDF_MODULE_ID_EPPING, hdd_ctx->config->cdf_trace_enable_epping); - hdd_cdf_trace_enable(CDF_MODULE_ID_CDF_DEVICE, + hdd_cdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE, hdd_ctx->config->cdf_trace_enable_cdf_devices); - hdd_cdf_trace_enable(CDF_MODULE_ID_TXRX, + hdd_cdf_trace_enable(QDF_MODULE_ID_TXRX, hdd_ctx->config->cfd_trace_enable_txrx); - hdd_cdf_trace_enable(CDF_MODULE_ID_HTC, + hdd_cdf_trace_enable(QDF_MODULE_ID_HTC, hdd_ctx->config->cdf_trace_enable_htc); - hdd_cdf_trace_enable(CDF_MODULE_ID_HIF, + hdd_cdf_trace_enable(QDF_MODULE_ID_HIF, hdd_ctx->config->cdf_trace_enable_hif); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_SAP_DATA, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA, hdd_ctx->config->cdf_trace_enable_hdd_sap_data); - hdd_cdf_trace_enable(CDF_MODULE_ID_HDD_DATA, + hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_DATA, hdd_ctx->config->cdf_trace_enable_hdd_data); hdd_cfg_print(hdd_ctx); @@ -5158,7 +5158,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) /* Uses to enabled logging after SSR */ hdd_ctx->fw_log_settings.enable = hdd_ctx->config->enable_fw_log; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) goto skip_multicast_logging; cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs); @@ -5226,7 +5226,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) } cdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_P2P_DEVICE, "p2p%d", @@ -5459,7 +5459,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (IS_ERR(hdd_ctx)) return PTR_ERR(hdd_ctx); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { ret = hdd_enable_ftm(hdd_ctx); if (ret) @@ -5478,7 +5478,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) wlan_hdd_update_wiphy(hdd_ctx->wiphy, hdd_ctx->config); - hdd_ctx->hHal = cds_get_context(CDF_MODULE_ID_SME); + hdd_ctx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == hdd_ctx->hHal) { hddLog(CDF_TRACE_LEVEL_FATAL, FL("HAL context is null")); @@ -5694,7 +5694,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE status = cdf_mc_timer_init(&hdd_ctx->skip_acs_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_skip_acs_scan_timer_handler, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -5727,7 +5727,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef MSM_PLATFORM spin_lock_init(&hdd_ctx->bus_bw_lock); cdf_mc_timer_init(&hdd_ctx->bus_bw_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_bus_bw_compute_cbk, (void *)hdd_ctx); #endif @@ -5992,10 +5992,10 @@ int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data, pHddStaCtx->conn_info.SSID.SSID.ssId, pHddStaCtx->conn_info.SSID.SSID.length); } - if (CDF_MAC_ADDR_SIZE >= + if (QDF_MAC_ADDR_SIZE >= sizeof(pHddStaCtx->conn_info.bssId)) memcpy(data->bssid, pHddStaCtx->conn_info.bssId.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } return 0; } @@ -6203,7 +6203,7 @@ void wlan_hdd_send_status_pkg(hdd_adapter_t *adapter, int ret = 0; struct wlan_status_data data; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; memset(&data, 0, sizeof(struct wlan_status_data)); @@ -6235,7 +6235,7 @@ void wlan_hdd_send_version_pkg(uint32_t fw_version, return; #endif - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; memset(&data, 0, sizeof(struct wlan_version_data)); @@ -6960,11 +6960,11 @@ static int con_mode_handler(const char *kmessage, struct kernel_param *kp) * * This is the driver exit point (invoked when module is unloaded using rmmod) * - * Return: enum tCDF_GLOBAL_CON_MODE + * Return: enum tQDF_GLOBAL_CON_MODE */ -enum tCDF_GLOBAL_CON_MODE hdd_get_conparam(void) +enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void) { - return (enum tCDF_GLOBAL_CON_MODE) curr_con_mode; + return (enum tQDF_GLOBAL_CON_MODE) curr_con_mode; } void hdd_set_conparam(uint32_t con_param) diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 80951ccd1213..841efc28650b 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -67,9 +67,9 @@ static void memdump_cleanup_timer_cb(void *data) { int status; hdd_context_t *hdd_ctx = data; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -82,7 +82,7 @@ static void memdump_cleanup_timer_cb(void *data) return; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; @@ -202,9 +202,9 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, struct fw_dump_req fw_mem_dump_req; struct fw_dump_seg_req *seg_req; uint8_t loop; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; unsigned long rc; struct hdd_fw_dump_context *context; @@ -214,7 +214,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, return status; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; @@ -393,9 +393,9 @@ static ssize_t memdump_read(struct file *file, char __user *buf, { int status; hdd_context_t *hdd_ctx; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; hdd_ctx = memdump_get_file_data(file); @@ -405,7 +405,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, hddLog(LOGE, FL("HDD context is not valid")); return -EINVAL; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; @@ -481,7 +481,7 @@ static int memdump_procfs_init(void) { hdd_context_t *hdd_ctx; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(LOGE , FL("Invalid HDD context")); return -EINVAL; @@ -542,13 +542,13 @@ int memdump_init(void) QDF_STATUS cb_status; QDF_STATUS qdf_status; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(LOGE , FL("Invalid HDD context")); return -EINVAL; } - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Not initializing memdump in FTM mode")); return -EINVAL; } @@ -569,7 +569,7 @@ int memdump_init(void) init_completion(&fw_dump_context.response_event); qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, - CDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, + QDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to init memdump cleanup timer")); @@ -591,23 +591,23 @@ int memdump_init(void) void memdump_deinit(void) { hdd_context_t *hdd_ctx; - cdf_dma_addr_t paddr; - cdf_dma_addr_t dma_ctx = 0; - cdf_device_t cdf_ctx; + qdf_dma_addr_t paddr; + qdf_dma_addr_t dma_ctx = 0; + qdf_device_t cdf_ctx; QDF_STATUS qdf_status; - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { hddLog(LOGE , FL("Invalid HDD context")); return; } - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Not deinitializing memdump in FTM mode")); return; } - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!cdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index 9fe3aee14dc5..d95413da31bc 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -68,7 +68,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, if (ret_val) return ret_val; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 15d372d393c3..29c857962a2e 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -36,7 +36,7 @@ #include "cds_api.h" /* cds_get_context */ #include "hif.h" /* hif_map_service...*/ #include "wlan_hdd_main.h" /* hdd_err/warn... */ -#include "cdf_types.h" /* CDF_MODULE_ID_... */ +#include "qdf_types.h" /* QDF_MODULE_ID_... */ #include "ce_api.h" /* guaranteed to be initialized to zero/NULL by the standard */ @@ -58,7 +58,7 @@ struct qca_napi_data *hdd_napi_get_all(void) NAPI_DEBUG("-->"); - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(NULL != hif); /* WARN */ else @@ -110,7 +110,7 @@ int hdd_napi_create(void) NAPI_DEBUG("-->"); - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) { CDF_ASSERT(NULL != hif_ctx); rc = -EFAULT; @@ -166,7 +166,7 @@ int hdd_napi_destroy(int force) if (hdd_napi_map) { struct hif_opaque_softc *hif_ctx; - hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); + hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) CDF_ASSERT(NULL != hif_ctx); else @@ -210,7 +210,7 @@ int hdd_napi_enabled(int id) struct hif_opaque_softc *hif; int rc = 0; /* NOT enabled */ - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */ else if (-1 == id) @@ -243,7 +243,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data) NAPI_DEBUG("-->(event=%d, aux=%p)", event, data); - hif = cds_get_context(CDF_MODULE_ID_HIF); + hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) CDF_ASSERT(hif != NULL); else @@ -269,5 +269,5 @@ int hdd_napi_event(enum qca_napi_event event, void *data) */ int hdd_napi_poll(struct napi_struct *napi, int budget) { - return hif_napi_poll(cds_get_context(CDF_MODULE_ID_HIF), napi, budget); + return hif_napi_poll(cds_get_context(QDF_MODULE_ID_HIF), napi, budget); } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index cc8543e0ded3..9b17d2fcc658 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -546,7 +546,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, /* Save the mac address to release later */ cdf_mem_copy(adapter->ocb_mac_address[ adapter->ocb_mac_addr_count].bytes, - mac_addr, CDF_MAC_ADDR_SIZE); + mac_addr, QDF_MAC_ADDR_SIZE); adapter->ocb_mac_addr_count++; } @@ -886,7 +886,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, goto fail; } cdf_mem_copy(config->channels[i].mac_address.bytes, - mac_addr, CDF_MAC_ADDR_SIZE); + mac_addr, QDF_MAC_ADDR_SIZE); /* Save the mac address to release later */ cdf_copy_macaddr(&adapter->ocb_mac_address[ adapter->ocb_mac_addr_count], diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 187cdc45b9d9..d877d4e180d3 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -183,14 +183,14 @@ static void send_oem_reg_rsp_nlink_msg(void) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -223,7 +223,7 @@ static void send_oem_reg_rsp_nlink_msg(void) *deviceMode = pAdapter->device_mode; *vdevId = pAdapter->sessionId; (*numInterfaces)++; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: numInterfaces: %d, deviceMode: %d, vdevId: %d", __func__, *numInterfaces, *deviceMode, *vdevId); @@ -238,7 +238,7 @@ static void send_oem_reg_rsp_nlink_msg(void) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending App Reg Response length (%d) to process pid (%d)", __func__, aniHdr->length, p_hdd_ctx->oem_pid); @@ -265,7 +265,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -286,7 +286,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + aniHdr->length)); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending oem error response to process pid (%d)", __func__, app_pid); @@ -314,13 +314,13 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } if (length > OEM_DATA_RSP_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid length of Oem Data response", __func__); return; } @@ -328,7 +328,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + OEM_DATA_RSP_SIZE), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -348,7 +348,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending Oem Data Response of len (%d) to process pid (%d)", __func__, length, p_hdd_ctx->oem_pid); @@ -376,13 +376,13 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) /* for now, STA interface only */ pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); return QDF_STATUS_E_FAILURE; } if (!oemData) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: oemData is null", __func__); return QDF_STATUS_E_FAILURE; } @@ -398,7 +398,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) oemDataReqConfig.data_len = oemDataLen; cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: calling sme_oem_data_req", __func__); status = sme_oem_data_req(p_hdd_ctx->hHal, @@ -437,7 +437,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return -EPERM; } @@ -446,7 +446,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) numOfChannels * sizeof(tHddChannelInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return -ENOMEM; } @@ -498,7 +498,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* channel info is not returned, fill in zeros in channel * info struct */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_get_reg_info failed for chan (%d), return info 0", __func__, chanId); hddChanInfo.chan_id = chanId; @@ -516,7 +516,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sending channel info resp for num channels (%d) to pid (%d)", __func__, numOfChannels, p_hdd_ctx->oem_pid); @@ -662,7 +662,7 @@ static int oem_process_get_cap_req_msg(void) * * Return: none */ -void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, +void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, uint8_t peerStatus, uint8_t peerTimingMeasCap, uint8_t sessionId, @@ -674,7 +674,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, tPeerStatusInfo *pPeerInfo; if (!p_hdd_ctx || !p_hdd_ctx->hHal) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Either HDD Ctx is null or Hal Ctx is null", __func__); return; @@ -682,7 +682,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, /* check if oem app has registered and pid is valid */ if ((!p_hdd_ctx->oem_app_registered) || (p_hdd_ctx->oem_pid == 0)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: OEM app is not registered(%d) or pid is invalid(%d)", __func__, p_hdd_ctx->oem_app_registered, p_hdd_ctx->oem_pid); @@ -693,7 +693,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, sizeof(tPeerStatusInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -741,7 +741,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct cdf_mac_addr *peerMac, } skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: sending peer " MAC_ADDRESS_STR " status(%d), peerTimingMeasCap(%d), vdevId(%d), chanId(%d)" " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d)," @@ -787,14 +787,14 @@ static int oem_msg_callback(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (!nlh) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Netlink header null", __func__); return -EPERM; } ret = wlan_hdd_validate_context(p_hdd_ctx); if (0 != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return ret; } @@ -802,7 +802,7 @@ static int oem_msg_callback(struct sk_buff *skb) msg_hdr = NLMSG_DATA(nlh); if (!msg_hdr) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Message header null", __func__); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, OEM_ERR_NULL_MESSAGE_HEADER); @@ -811,7 +811,7 @@ static int oem_msg_callback(struct sk_buff *skb) if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr) + msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid nl msg len, nlh->nlmsg_len (%d), msg_hdr->len (%d)", __func__, nlh->nlmsg_len, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -822,7 +822,7 @@ static int oem_msg_callback(struct sk_buff *skb) switch (msg_hdr->type) { case ANI_MSG_APP_REG_REQ: /* Registration request is only allowed for Qualcomm Application */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received App Req Req from App process pid(%d), len(%d)", __func__, nlh->nlmsg_pid, msg_hdr->length); @@ -830,7 +830,7 @@ static int oem_msg_callback(struct sk_buff *skb) if ((OEM_APP_SIGNATURE_LEN == msg_hdr->length) && (0 == strncmp(sign_str, OEM_APP_SIGNATURE_STR, OEM_APP_SIGNATURE_LEN))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Valid App Req Req from oem app process pid(%d)", __func__, nlh->nlmsg_pid); @@ -838,7 +838,7 @@ static int oem_msg_callback(struct sk_buff *skb) p_hdd_ctx->oem_pid = nlh->nlmsg_pid; send_oem_reg_rsp_nlink_msg(); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid signature in App Reg Request from pid(%d)", __func__, nlh->nlmsg_pid); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -848,14 +848,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_OEM_DATA_REQ: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received Oem Data Request length(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: OEM DataReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -865,7 +865,7 @@ static int oem_msg_callback(struct sk_buff *skb) } if ((!msg_hdr->length) || (OEM_DATA_REQ_SIZE < msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in Oem Data Request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -878,14 +878,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_CHANNEL_INFO_REQ: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received channel info request, num channel(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Chan InfoReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -897,7 +897,7 @@ static int oem_msg_callback(struct sk_buff *skb) /* message length contains list of channel ids */ if ((!msg_hdr->length) || (WNI_CFG_VALID_CHANNEL_LIST_LEN < msg_hdr->length)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in channel info request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -958,7 +958,7 @@ static int oem_msg_callback(struct sk_buff *skb) break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Received Invalid message type (%d), length (%d)", __func__, msg_hdr->type, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index fb48f5f27314..f38678d591ea 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -48,7 +48,7 @@ #include #include "wlan_hdd_tdls.h" #include "wlan_hdd_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_sched.h" #include "cds_concurrency.h" @@ -400,7 +400,7 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter) unsigned long rc; hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: ROC completion is not received.!!!", __func__); @@ -438,7 +438,7 @@ wait: msecs_to_jiffies (WAIT_CANCEL_REM_CHAN)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred while waiting for RoC Cancellation", __func__); @@ -472,7 +472,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(hdd_adapter_t *pAdapter) mutex_lock(&cfgState->remain_on_chan_ctx_lock); while (pAdapter->is_roc_inprogress) { mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: ROC in progress for session %d!!!", __func__, pAdapter->sessionId); msleep(500); @@ -567,7 +567,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, /* Initialize Remain on chan timer */ qdf_status = cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -673,7 +673,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, #endif (SIR_MAC_MGMT_FRAME << 2) | (SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("wlansap_register_mgmt_frame return fail")); wlansap_cancel_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -949,12 +949,12 @@ int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy, if (0 != ret) return ret; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_REMAIN_ON_CHANNEL, pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST)); @@ -1000,7 +1000,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, mutex_lock(&cfgState->remain_on_chan_ctx_lock); pRemainChanCtx = cfgState->remain_on_chan_ctx; if (pRemainChanCtx != NULL) { - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_REMAINCHANREADYHANDLER, pAdapter->sessionId, pRemainChanCtx->duration)); @@ -1094,7 +1094,7 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -1255,12 +1255,12 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ACTION, pAdapter->sessionId, pAdapter->device_mode)); status = wlan_hdd_validate_context(pHddCtx); @@ -1576,7 +1576,7 @@ send_frame: sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, buf, len, extendedWait, noack, current_freq)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_send_action returned fail", __func__); goto err; } @@ -1723,19 +1723,19 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimeter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &count, &start_time, &duration); if (ret != 3) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO NoA: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO NoA: count=%d start_time=%d duration=%d", __func__, count, start_time, duration); duration = MS_TO_MUS(duration); @@ -1758,7 +1758,7 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) NoA.count = count; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1801,19 +1801,19 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimiter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow); if (ret != 3) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO PS: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d", __func__, legacy_ps, opp_ps, ctwindow); @@ -1831,7 +1831,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) */ if (ctwindow != -1) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Opportunistic Power Save is %s", (true == pAdapter->ops) ? "Enable" : "Disable"); @@ -1849,7 +1849,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " @@ -1878,7 +1878,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1952,7 +1952,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return ERR_PTR(-EINVAL); } @@ -1961,7 +1961,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, if (0 != ret) return ERR_PTR(ret); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type)); /* * Allow addition multiple interfaces for WLAN_HDD_P2P_GO, @@ -2004,7 +2004,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, * Generate the P2P Interface Address. this address must be * different from the P2P Device Address. */ - struct cdf_mac_addr p2pDeviceAddress = + struct qdf_mac_addr p2pDeviceAddress = pHddCtx->p2pDeviceAddress; p2pDeviceAddress.bytes[4] ^= 0x80; pAdapter = hdd_open_adapter(pHddCtx, @@ -2048,12 +2048,12 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) int status; ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_DEL_VIRTUAL_INTF, pVirtAdapter->sessionId, pVirtAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 68e69c9f557c..ff0cbc5e25a9 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -41,7 +41,7 @@ #if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) #include #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "sme_api.h" #include #include @@ -120,14 +120,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_set_gtk_offload failed, returned %d", __func__, ret); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_set_gtk_offload successfull", __func__); } @@ -146,13 +146,13 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) wlan_hdd_cfg80211_update_replay_counter_callback, pAdapter, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_get_gtk_offload failed, returned %d", __func__, ret); return; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: sme_get_gtk_offload successful", __func__); @@ -169,13 +169,13 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to dissable GTK offload, returned %d", __func__, ret); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: successfully dissabled GTK offload request to HAL", __func__); @@ -1097,7 +1097,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), hdd_info("%s: WLAN being suspended by OS", __func__); - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1154,7 +1154,7 @@ static void hdd_resume_wlan(void) hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", __func__); - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1288,7 +1288,7 @@ QDF_STATUS hdd_wlan_shutdown(void) } /* Get the HDD context. */ - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1346,7 +1346,7 @@ QDF_STATUS hdd_wlan_shutdown(void) qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop WMA", __func__); CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(p_cds_context); @@ -1358,7 +1358,7 @@ QDF_STATUS hdd_wlan_shutdown(void) */ qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop sme %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1367,7 +1367,7 @@ QDF_STATUS hdd_wlan_shutdown(void) /* Stop MAC (PE and HAL) */ qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Failed to stop mac %d", __func__, qdf_status); CDF_ASSERT(0); } @@ -1420,7 +1420,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) } /* Get the HDD context */ - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); @@ -1445,7 +1445,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) } /* Save the hal context in Adapter */ - pHddCtx->hHal = cds_get_context(CDF_MODULE_ID_SME); + pHddCtx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == pHddCtx->hHal) { hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HAL context is null", __func__); @@ -1726,7 +1726,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -1752,7 +1752,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) #endif hdd_resume_wlan(); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_RESUME_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); cdf_spin_lock(&pHddCtx->sched_scan_lock); @@ -1862,7 +1862,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2015,7 +2015,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, } pHddCtx->is_ol_rx_thread_suspended = true; #endif - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); pHddCtx->isWiphySuspended = true; @@ -2082,12 +2082,12 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT, pAdapter->sessionId, timeout)); @@ -2169,18 +2169,18 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, { hdd_context_t *pHddCtx = (hdd_context_t *) wiphy_priv(wiphy); tHalHandle hHal = NULL; - struct cdf_mac_addr bssid = CDF_MAC_ADDR_BROADCAST_INITIALIZER; - struct cdf_mac_addr selfMac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; int status; ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_TXPOWER, NO_SESSION, type)); @@ -2267,7 +2267,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2284,7 +2284,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return -ENOENT; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_TXPOWER, pAdapter->sessionId, pAdapter->device_mode)); wlan_hdd_get_class_astats(pAdapter); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 48ba11ed2c8b..71a0e3e13ea5 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -408,7 +408,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, * doesn't exceed IW_MAX_BITRATES */ - maxNumRates = CDF_MIN(maxNumRates, IW_MAX_BITRATES); + maxNumRates = QDF_MIN(maxNumRates, IW_MAX_BITRATES); if ((maxNumRates - numBasicRates) > MAX_RATES) { no_of_rates = MAX_RATES; @@ -473,7 +473,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, event.cmd = IWEVQUAL; event.u.qual.qual = descriptor->rssi; event.u.qual.noise = descriptor->sinr; - event.u.qual.level = CDF_MIN((descriptor->rssi + descriptor->sinr), 0); + event.u.qual.level = QDF_MIN((descriptor->rssi + descriptor->sinr), 0); event.u.qual.updated = IW_QUAL_ALL_UPDATED; @@ -748,7 +748,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, /* set bssid using sockaddr from iw_scan_req */ cdf_mem_copy(scanRequest.bssid.bytes, &scanReq->bssid.sa_data, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { @@ -766,7 +766,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanReq->essid_len); } else { scanRequest.SSIDs.numOfSSIDs = 0; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Unable to allocate memory", __func__); @@ -833,7 +833,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:sme_scan_request fail %d!!!", __func__, status); goto error; } @@ -904,12 +904,12 @@ static int __iw_get_scan(struct net_device *dev, if (0 != ret) return ret; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: enter buffer length %d!!!", __func__, (wrqu->data.length) ? wrqu->data.length : IW_SCAN_MAX_DATA); if (true == pAdapter->scan_info.mScanPending) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:mScanPending is true !!!", __func__); return -EAGAIN; } @@ -945,7 +945,7 @@ static int __iw_get_scan(struct net_device *dev, sme_scan_result_purge(hHal, pResult); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: exit total %d BSS reported !!!", __func__, i); EXIT(); return status; @@ -1245,12 +1245,12 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCAN, pAdapter->sessionId, request->n_channels)); @@ -2031,7 +2031,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2059,7 +2059,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -EBUSY; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START, pAdapter->sessionId, pAdapter->device_mode)); /* @@ -2132,7 +2132,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, && (CHANNEL_STATE_DFS == cds_get_channel_state( channels_allowed[indx]))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : Dropping DFS channel : %d", __func__, @@ -2157,7 +2157,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, * then ignore the PNO request */ if (num_ignore_dfs_ch == request->n_channels) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : All requested channels are DFS channels", __func__); ret = -EINVAL; @@ -2306,7 +2306,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2355,7 +2355,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, pPnoRequest->enable = 0; /* Disable PNO */ pPnoRequest->ucNetworksCount = 0; - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP, pAdapter->sessionId, pAdapter->device_mode)); status = sme_set_preferred_network_list(hHal, pPnoRequest, diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 1dddcd699c4b..e95a24e8b4b3 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -32,9 +32,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -58,25 +58,25 @@ */ static void hdd_softap_dump_sk_buff(struct sk_buff *skb) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: head = %p ", __func__, skb->head); - /* CDF_TRACE( CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + /* CDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: tail = %p ", __func__, skb->tail); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: end = %p ", __func__, skb->end); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: len = %d ", __func__, skb->len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: data_len = %d ", __func__, skb->data_len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: mac_len = %d", __func__, skb->mac_len); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5], skb->data[6], skb->data[7]); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], skb->data[13], skb->data[14], skb->data[15]); @@ -103,7 +103,7 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -129,7 +129,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -168,7 +168,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) sme_ac_enum_type ac = SME_AC_BE; hdd_adapter_t *pAdapter = (hdd_adapter_t *) netdev_priv(dev); hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); - struct cdf_mac_addr *pDestMacAddress; + struct qdf_mac_addr *pDestMacAddress; uint8_t STAId; uint8_t proto_type = 0; #ifdef QCA_PKT_PROTO_TRACE @@ -181,7 +181,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * lead to a crash. */ if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Recovery in Progress. Ignore!!!", __func__); goto drop_pkt; } @@ -198,7 +198,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto drop_pkt; } - pDestMacAddress = (struct cdf_mac_addr *) skb->data; + pDestMacAddress = (struct qdf_mac_addr *) skb->data; if (cdf_is_macaddr_broadcast(pDestMacAddress) || cdf_is_macaddr_group(pDestMacAddress)) { @@ -211,19 +211,19 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &STAId)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } else if (false == pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: STA %d is unregistered", __func__, STAId); @@ -234,14 +234,14 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pAdapter->aStaInfo[STAId].tlSTAState) && (ol_txrx_peer_state_auth != pAdapter->aStaInfo[STAId].tlSTAState)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Station not connected yet", __func__); goto drop_pkt; } else if (ol_txrx_peer_state_conn == pAdapter->aStaInfo[STAId].tlSTAState) { if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: NON-EAPOL packet in non-Authenticated state", __func__); @@ -314,7 +314,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (ol_tx_send_data_frame(STAId, skb, proto_type) != NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); ++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac]; @@ -358,7 +358,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT, NULL, 0)); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred", __func__); /* Getting here implies we disabled the TX queues for too * long. Queues are disabled either because of disassociation @@ -368,7 +368,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) */ hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Recovery in Progress. Ignore!!!", __func__); return; } @@ -436,11 +436,11 @@ QDF_STATUS hdd_softap_deinit_tx_rx(hdd_adapter_t *pAdapter) * QDF_STATUS_SUCCESS otherwise */ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, - struct cdf_mac_addr *pmacAddrSTA) + struct qdf_mac_addr *pmacAddrSTA) { spin_lock_bh(&pAdapter->staInfo_lock); if (pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId); spin_unlock_bh(&pAdapter->staInfo_lock); return QDF_STATUS_E_FAILURE; @@ -475,7 +475,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) if (false == pAdapter->aStaInfo[STAId].isUsed) { spin_unlock_bh(&pAdapter->staInfo_lock); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Deinit station not inited %d", __func__, STAId); return QDF_STATUS_E_FAILURE; } @@ -514,14 +514,14 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -543,7 +543,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, if (skb->dev == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); return QDF_STATUS_E_FAILURE; } @@ -608,13 +608,13 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) hdd_context_t *pHddCtx; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pAdapter magic", __func__); return QDF_STATUS_E_INVAL; } @@ -626,7 +626,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) */ qdf_status = ol_txrx_clear_peer(staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "ol_txrx_clear_peer() failed to for staID %d. " "Status= %d [0x%08X]", staId, qdf_status, qdf_status); } @@ -661,7 +661,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, uint8_t staId, uint8_t ucastSig, uint8_t bcastSig, - struct cdf_mac_addr *pPeerMacAddress, + struct qdf_mac_addr *pPeerMacAddress, bool fWmmEnabled) { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; @@ -672,7 +672,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * Clean up old entry if it is not cleaned up properly */ if (pAdapter->aStaInfo[staId].isUsed) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "clean up old entry for STA %d", staId); hdd_softap_deregister_sta(pAdapter, staId); } @@ -688,7 +688,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pPeerMacAddress); staDesc.is_qos_enabled = fWmmEnabled; - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "HDD SOFTAP register TL QoS_enabled=%d", staDesc.is_qos_enabled); @@ -697,7 +697,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, ol_txrx_register_peer(hdd_softap_rx_packet_cbk, &staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", qdf_status, qdf_status); return qdf_status; @@ -713,7 +713,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled; if (!fAuthRequired) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -727,7 +727,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->sessionCtx.ap.uIsAuthenticated = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -760,8 +760,8 @@ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - struct cdf_mac_addr broadcastMacAddr = - CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr broadcastMacAddr = + QDF_MAC_ADDR_BROADCAST_INITIALIZER; hdd_ap_ctx_t *pHddApCtx; pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); @@ -810,7 +810,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * unloading */ if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); return QDF_STATUS_E_PERM; @@ -819,7 +819,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) qdf_status = hdd_softap_deregister_bc_sta(pAdapter); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId); } @@ -829,7 +829,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) if (pAdapter->aStaInfo[staId].isUsed) { qdf_status = hdd_softap_deregister_sta(pAdapter, staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister sta Id %d", __func__, staId); @@ -848,19 +848,19 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error */ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, - struct cdf_mac_addr *pDestMacAddress, + struct qdf_mac_addr *pDestMacAddress, enum ol_txrx_peer_state state) { uint8_t ucSTAId = WLAN_MAX_STA_COUNT; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: enter", __func__); if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &ucSTAId)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Failed to find right station", __func__); return QDF_STATUS_E_FAILURE; } @@ -868,7 +868,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, if (false == cdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, pDestMacAddress)) { - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", __func__); return QDF_STATUS_E_FAILURE; @@ -876,7 +876,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, qdf_status = hdd_change_peer_state(pAdapter, ucSTAId, state, false); - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s: change station to state %d succeed", __func__, state); if (QDF_STATUS_SUCCESS == qdf_status) { @@ -884,7 +884,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, ol_txrx_peer_state_auth; } - CDF_TRACE(CDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, "%s exit", __func__); return qdf_status; @@ -901,7 +901,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, * not found */ QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, - struct cdf_mac_addr *pMacAddress, + struct qdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t i; @@ -909,7 +909,7 @@ QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if (cdf_mem_compare (&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress, - CDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { + QDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { *staId = i; return QDF_STATUS_SUCCESS; } diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index af723a434ac3..ad81149f513c 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -261,7 +261,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats, stats->type) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_MAC_ADDRESS, - CDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) || + QDF_MAC_ADDR_SIZE, &stats->peerMacAddress.bytes[0]) || nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_CAPABILITIES, stats->capabilities) || @@ -385,7 +385,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats, stats->mode) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_MAC_ADDR, - CDF_MAC_ADDR_SIZE, stats->macAddr.bytes) || + QDF_MAC_ADDR_SIZE, stats->macAddr.bytes) || nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_STATE, stats->state) || @@ -400,7 +400,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats, strlen(stats->ssid), stats->ssid) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_BSSID, - CDF_MAC_ADDR_SIZE, stats->bssid.bytes) || + QDF_MAC_ADDR_SIZE, stats->bssid.bytes) || nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_AP_COUNTRY_STR, WNI_CFG_COUNTRY_CODE_LEN, stats->apCountryStr) || @@ -1002,13 +1002,13 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, linkLayerStatsResults->ifaceId); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, linkLayerStatsResults->ifaceId); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Link Layer Indication indType: %d", __func__, indType); switch (indType) { @@ -1144,7 +1144,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1270,7 +1270,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1401,7 +1401,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1546,7 +1546,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, if (ret_val) return ret_val; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -1607,7 +1607,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid", __func__); return; } @@ -1615,7 +1615,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, pAdapter = hdd_get_adapter_by_vdev(pHddCtx, data->vdev_id); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, data->vdev_id); return; @@ -1630,7 +1630,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, GFP_KERNEL); if (!vendor_event) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: cfg80211_vendor_event_alloc failed", __func__); return; } @@ -1638,7 +1638,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, ret_val = nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_IFINDEX, pAdapter->dev->ifindex); if (ret_val) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_IFINDEX put fail", __func__); kfree_skb(vendor_event); @@ -1650,7 +1650,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, data->event_data_len, data->event_data); if (ret_val) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_STATS_EXT put fail", __func__); kfree_skb(vendor_event); @@ -1723,7 +1723,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2161,7 +2161,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.mcs, sinfo->txrate.flags, sinfo->tx_packets, sinfo->rx_packets); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_STA, pAdapter->sessionId, maxRate)); EXIT(); @@ -2234,7 +2234,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } @@ -2272,7 +2272,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, wlan_hdd_get_snr(pAdapter, &snr); wlan_hdd_get_rssi(pAdapter, &rssi); - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DUMP_SURVEY, pAdapter->sessionId, pAdapter->device_mode)); diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 96d0377a5a4c..205865e159ad 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -46,15 +46,15 @@ static const struct nla_policy policy[QCA_WLAN_VENDOR_ATTR_GW_PARAM_CONFIG_MAX + 1] = { [PARAM_MAC_ADDR] = { .type = NLA_BINARY, - .len = CDF_MAC_ADDR_SIZE + .len = QDF_MAC_ADDR_SIZE }, [PARAM_IPV4_ADDR] = { .type = NLA_BINARY, - .len = CDF_IPV4_ADDR_SIZE + .len = QDF_IPV4_ADDR_SIZE }, [PARAM_IPV6_ADDR] = { .type = NLA_BINARY, - .len = CDF_IPV6_ADDR_SIZE + .len = QDF_IPV6_ADDR_SIZE } }; @@ -121,20 +121,20 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, return -EINVAL; } nla_memcpy(req.gw_mac_addr.bytes, tb[PARAM_MAC_ADDR], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* req ipv4_addr_type and ipv6_addr_type are initially false due * to zeroing the struct */ if (tb[PARAM_IPV4_ADDR]) { nla_memcpy(req.ipv4_addr, tb[PARAM_IPV4_ADDR], - CDF_IPV4_ADDR_SIZE); + QDF_IPV4_ADDR_SIZE); req.ipv4_addr_type = true; } if (tb[PARAM_IPV6_ADDR]) { nla_memcpy(&req.ipv6_addr, tb[PARAM_IPV6_ADDR], - CDF_IPV6_ADDR_SIZE); + QDF_IPV6_ADDR_SIZE); req.ipv6_addr_type = true; } diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index cd6d9f7e7ef9..375e547ed54e 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -196,7 +196,7 @@ void wlan_hdd_tdls_pre_setup_init_work(tdlsCtx_t *pHddTdlsCtx, hddTdlsPeer_t *curr_candidate) { if (!pHddTdlsCtx || !curr_candidate) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: either pHddTdlsCtx or curr_candidate is null", __func__); return; @@ -266,7 +266,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddTdlsCtx) || (NULL == pHddCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -293,7 +293,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) static void wlan_hdd_tdls_free_scan_request(tdls_scan_context_t *tdls_scan_ctx) { if (NULL == tdls_scan_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("tdls_scan_ctx is NULL")); return; } @@ -325,7 +325,7 @@ static void wlan_hdd_tdls_discovery_timeout_peer_cb(void *userData) pHddTdlsCtx = (tdlsCtx_t *) userData; if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx or pAdapter points to NULL")); return; } @@ -381,7 +381,7 @@ static void wlan_hdd_tdls_free_list(tdlsCtx_t *pHddTdlsCtx) struct list_head *pos, *q; if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -408,7 +408,7 @@ static void wlan_hdd_tdls_schedule_scan(struct work_struct *work) container_of(work, tdls_scan_context_t, tdls_scan_work.work); if (NULL == scan_ctx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("scan_ctx is NULL")); return; } @@ -584,7 +584,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) cdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t)); cdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wlan_hdd_tdls_discovery_timeout_peer_cb, pHddTdlsCtx); @@ -624,7 +624,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) pHddCtx->tdlsConnInfo[staIdx].staId = 0; pHddCtx->tdlsConnInfo[staIdx].sessionId = 255; cdf_mem_zero(&pHddCtx->tdlsConnInfo[staIdx].peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } pHddTdlsCtx->pAdapter = pAdapter; @@ -748,7 +748,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is NULL")); return; } @@ -972,19 +972,19 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, int32_t res = 0; hdd_context_t *pHddCtx; if (curr_peer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } if (curr_peer->pHddTdlsCtx == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer->pHddTdlsCtx is NULL")); return; } pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } @@ -1041,13 +1041,13 @@ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (curr_peer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } @@ -1943,7 +1943,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, list_for_each(pos, head) { curr_peer = list_entry(pos, hddTdlsPeer_t, node); if (!memcmp(mac, curr_peer->peerMac, 6)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "findTdlsPeer: found staId %d", curr_peer->staId); if (mutexLock) @@ -2081,7 +2081,7 @@ uint16_t wlan_hdd_tdls_connected_peers(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return 0; } @@ -2167,7 +2167,7 @@ void wlan_hdd_tdls_connection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2201,7 +2201,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2212,7 +2212,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) if (NULL == pHddTdlsCtx) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -2322,7 +2322,7 @@ static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);; if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return NULL; } @@ -2409,13 +2409,13 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) ENTER(); if (NULL == pHddTdlsCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: tdls magic number mis-match %u", __func__, pHddTdlsCtx->magic); return; @@ -2431,7 +2431,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) curr_peer = pHddTdlsCtx->curr_candidate; if (NULL == curr_peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); goto done; } @@ -2463,7 +2463,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) if (false == curr_peer->isForcedPeer) { if (curr_peer->discovery_attempt >= pHddTdlsCtx->threshold_config.discovery_tries_n) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: discovery attempt (%d) reached max (%d) for peer " MAC_ADDRESS_STR ", ignore discovery trigger from fw", @@ -2865,7 +2865,7 @@ void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter, hddTdlsPeer_t *curr_peer, uint16_t reason) { if (NULL == pAdapter || NULL == curr_peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("parameters passed are invalid")); return; } @@ -2978,7 +2978,7 @@ int wlan_hdd_tdls_get_status(hdd_adapter_t *pAdapter, curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, false); if (curr_peer == NULL) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); *state = QCA_WIFI_HAL_TDLS_DISABLED; *reason = eTDLS_LINK_UNSPECIFIED; @@ -3064,7 +3064,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3192,7 +3192,7 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac, reason, state, global_operating_class, channel, MAC_ADDR_ARRAY(mac)); if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_MAC_ADDR, - CDF_MAC_ADDR_SIZE, mac) || + QDF_MAC_ADDR_SIZE, mac) || nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_NEW_STATE, state) || nla_put_s32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_REASON, @@ -3243,7 +3243,7 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3362,7 +3362,7 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1]; QDF_STATUS status; - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; } @@ -3501,7 +3501,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, but need to check if any other errno fit into this category. */ numCurrTdlsPeers = wlan_hdd_tdls_connected_peers(pAdapter); if (pHddCtx->max_num_tdls_sta <= numCurrTdlsPeers) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. Request declined." " Num of peers (%d), Max allowed (%d).", @@ -3512,7 +3512,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, hddTdlsPeer_t *pTdlsPeer; pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " already connected. Request declined.", __func__, MAC_ADDR_ARRAY(mac)); @@ -3552,7 +3552,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } { int i = 0; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Supported rates:"); for (i = 0; i < sizeof(StaParams->supported_rates); i++) hddLog(LOG1, "[%d]: %x ", i, @@ -3560,7 +3560,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } } /* end debug code */ else if ((1 == update) && (NULL == StaParams)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s : update is true, but staParams is NULL. Error!", __func__); return -EPERM; @@ -3582,14 +3582,14 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, (WAIT_TIME_TDLS_ADD_STA)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: timeout waiting for tdls add station indication", __func__); return -EPERM; } if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Add Station is unsuccessful", __func__); return -EPERM; } @@ -3670,7 +3670,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); hdd_station_ctx_t *hdd_sta_ctx; - u8 peerMac[CDF_MAC_ADDR_SIZE]; + u8 peerMac[QDF_MAC_ADDR_SIZE]; QDF_STATUS status; int max_sta_failed = 0; int responder; @@ -3683,17 +3683,17 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, #endif #endif - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TDLS_MGMT, pAdapter->sessionId, action_code)); if (0 != wlan_hdd_validate_context(pHddCtx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid", __func__); return -EINVAL; } @@ -3722,14 +3722,14 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, } /* If any concurrency is detected */ - if (((1 << CDF_STA_MODE) != pHddCtx->concurrency_mode) || - (pHddCtx->no_of_active_sessions[CDF_STA_MODE] > 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) || + (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) { + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Multiple STA OR Concurrency detected. Ignore TDLS MGMT frame. action_code=%d, concurrency_mode: 0x%x, active_sessions: %d", __func__, action_code, pHddCtx->concurrency_mode, - pHddCtx->no_of_active_sessions[CDF_STA_MODE]); + pHddCtx->no_of_active_sessions[QDF_STA_MODE]); return -EPERM; } /* other than teardown frame, mgmt frames are not sent if disabled */ @@ -3746,7 +3746,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (WLAN_IS_TDLS_SETUP_ACTION(action_code)) { if (NULL != wlan_hdd_tdls_is_progress(pHddCtx, peer, true)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS setup is ongoing. action %d declined.", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3763,7 +3763,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, check again in addtion to add_station(). Anyway, there is no hard to double-check. */ if (SIR_MAC_TDLS_SETUP_REQ == action_code) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).", @@ -3775,7 +3775,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* maximum reached. tweak to send error code to peer and return error code to supplicant */ status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).", @@ -3791,7 +3791,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:" MAC_ADDRESS_STR " already connected. action %d declined.", @@ -3819,7 +3819,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) responder = pTdlsPeer->is_responder; else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " peer doesn't exist or not connected %d dialog_token %d status %d, len = %zu", __func__, MAC_ADDR_ARRAY(peer), @@ -3843,7 +3843,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* make sure doesn't call send_mgmt() while it is pending */ if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3860,7 +3860,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, !responder); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_send_tdls_mgmt_frame failed!", __func__); pAdapter->mgmtTxCompletionStatus = false; return -EINVAL; @@ -3882,7 +3882,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, msecs_to_jiffies(WAIT_TIME_TDLS_MGMT)); if ((0 == rc) || (true != pAdapter->mgmtTxCompletionStatus)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Mgmt Tx Completion timed out TxCompletion %u", __func__, pAdapter->mgmtTxCompletionStatus); @@ -4028,25 +4028,25 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_SETUP for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; } pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer); if (pTdlsPeer == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer " MAC_ADDRESS_STR " does not exist", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, true)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS Add Force Peer Failed", __func__); return -EINVAL; } @@ -4070,13 +4070,13 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, if (0 != wlan_hdd_tdls_set_extctrl_param(pAdapter, peer, chan, max_latency, op_class, min_bandwidth)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS Set Peer's External Ctrl Parameter Failed", __func__); return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, callback)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4096,12 +4096,12 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_TEARDOWN for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; @@ -4117,7 +4117,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON); } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, false)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Failed", __func__); return -EINVAL; } @@ -4131,7 +4131,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, NULL)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4162,16 +4162,16 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, ENTER(); - if (CDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hddLog(LOGE, FL("Command not allowed in FTM mode")); return -EINVAL; } - MTRACE(cdf_trace(CDF_MODULE_ID_HDD, + MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TDLS_OPER, pAdapter->sessionId, oper)); if (NULL == peer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid arguments", __func__); return -EINVAL; } @@ -4185,7 +4185,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, * received from target, so HDD config gives combined intersected result */ if (false == pHddCtx->config->fEnableTDLSSupport) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "TDLS Disabled in INI OR not enabled in FW. " "Cannot process TDLS commands"); return -ENOTSUPP; @@ -4202,7 +4202,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_ENABLE_LINK", @@ -4210,14 +4210,14 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_ENABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), pTdlsPeer->link_status); if (!TDLS_STA_INDEX_VALID(pTdlsPeer->staId)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: invalid sta index %u for " MAC_ADDRESS_STR @@ -4253,7 +4253,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_LINK_ESTABLISH_REQ)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Link Establish Request timed out", __func__); @@ -4327,7 +4327,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, CFG_TDLS_PREFERRED_OFF_CHANNEL_NUM_DEFAULT; } - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Peer " MAC_ADDRESS_STR "vdevId: %d, peerState: %d, isPeerResponder: %d, uapsdQueues: 0x%x, maxSp: 0x%x, peerBuffStaSupport: %d, peerOffChanSupport: %d, peerCurrOperClass: %d, selfCurrOperClass: %d, peerChanLen: %d, peerOperClassLen: %d, prefOffChanNum: %d, prefOffChanBandwidth: %d, op_class_for_pref_off_chan: %d", @@ -4390,7 +4390,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, &smeTdlsPeerStateParams); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_update_tdls_peer_state failed for " MAC_ADDRESS_STR, @@ -4432,7 +4432,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_DISABLE_LINK", @@ -4440,7 +4440,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -EINVAL; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_DISABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), @@ -4462,7 +4462,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_DEL_STA)); if (!rc) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Del station timed out", __func__); @@ -4475,7 +4475,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, eTDLS_LINK_UNSPECIFIED : eTDLS_LINK_DROPPED_BY_REMOTE); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: TDLS Peer Station doesn't exist.", __func__); @@ -4488,7 +4488,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer); if (0 != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Teardown", __func__); @@ -4502,7 +4502,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, peer, NULL, pHddCtx->config->fTDLSPrefOffChanNum, 0, 0, 0); if (0 != status) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Setup", __func__); return status; @@ -4511,12 +4511,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, break; case NL80211_TDLS_DISCOVERY_REQ: /* We don't support in-driver setup/teardown/discovery */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "%s: We don't support in-driver setup/teardown/discovery", __func__); return -ENOTSUPP; default: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: unsupported event", __func__); return -ENOTSUPP; } diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c index a5cec605bd16..41d51fb247e9 100644 --- a/core/hdd/src/wlan_hdd_trace.c +++ b/core/hdd/src/wlan_hdd_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,7 +35,7 @@ */ #include "cdf_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wlan_hdd_trace.h" #include "wlan_hdd_main.h" @@ -69,7 +69,7 @@ hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index) */ void hdd_trace_init(void) { - cdf_trace_register(CDF_MODULE_ID_HDD, hdd_trace_dump); + cdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump); } #endif /* ifdef HDD_TRACE_RECORD */ diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 3826d725c048..dc7565c66104 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -159,7 +159,7 @@ void hdd_register_tx_flow_control(hdd_adapter_t *adapter, { if (adapter->tx_flow_timer_initialized == false) { cdf_mc_timer_init(&adapter->tx_flow_control_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, timer_callback, adapter); adapter->tx_flow_timer_initialized = true; @@ -242,7 +242,7 @@ static bool wlan_hdd_is_eapol(struct sk_buff *skb) ether_type = (uint16_t)(*(uint16_t *) (skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET)); - if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X)) + if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X)) return true; return false; @@ -271,8 +271,8 @@ static bool wlan_hdd_is_eapol_or_wai(struct sk_buff *skb) ether_type = (uint16_t)(*(uint16_t *) (skb->data + HDD_ETHERTYPE_802_1_X_FRAME_OFFSET)); - if (ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) || - ether_type == CDF_SWAP_U16(HDD_ETHERTYPE_WAI)) + if (ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_802_1_X) || + ether_type == QDF_SWAP_U16(HDD_ETHERTYPE_WAI)) return true; /* No error msg handled since this will happen often */ @@ -305,7 +305,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) #endif /* QCA_PKT_PROTO_TRACE */ #ifdef QCA_WIFI_FTM - if (hdd_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) { kfree_skb(skb); return NETDEV_TX_OK; } @@ -313,7 +313,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled; if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "Recovery in progress, dropping the packet"); ++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped; @@ -322,8 +322,8 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } if (WLAN_HDD_IBSS == pAdapter->device_mode) { - struct cdf_mac_addr *pDestMacAddress = - (struct cdf_mac_addr *) skb->data; + struct qdf_mac_addr *pDestMacAddress = + (struct qdf_mac_addr *) skb->data; if (QDF_STATUS_SUCCESS != hdd_ibss_get_sta_id(&pAdapter->sessionCtx.station, @@ -334,11 +334,11 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (cdf_is_macaddr_broadcast(pDestMacAddress) || cdf_is_macaddr_group(pDestMacAddress))) { STAId = pHddStaCtx->broadcast_ibss_staid; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet", __func__); } else if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "%s: Received Unicast frame with invalid staID", __func__); ++pAdapter->stats.tx_dropped; @@ -350,7 +350,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (WLAN_HDD_OCB != pAdapter->device_mode && eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, FL("Tx frame in not associated state in %d context"), pAdapter->device_mode); ++pAdapter->stats.tx_dropped; @@ -391,7 +391,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "%s: Classified as ac %d up %d", __func__, ac, up); #endif /* HDD_WMM_DEBUG */ @@ -491,7 +491,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb, proto_type) != NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); goto drop_pkt; @@ -526,13 +526,13 @@ drop_pkt: */ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, - struct cdf_mac_addr *pMacAddress, uint8_t *staId) + struct qdf_mac_addr *pMacAddress, uint8_t *staId) { uint8_t idx; for (idx = 0; idx < MAX_IBSS_PEERS; idx++) { if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx], - pMacAddress, CDF_MAC_ADDR_SIZE)) { + pMacAddress, QDF_MAC_ADDR_SIZE)) { *staId = pHddStaCtx->conn_info.staId[idx]; return QDF_STATUS_SUCCESS; } @@ -556,7 +556,7 @@ static void __hdd_tx_timeout(struct net_device *dev) struct netdev_queue *txq; int i = 0; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred jiffies %lu trans_start %lu", __func__, jiffies, dev->trans_start); DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_TX_TIMEOUT, @@ -571,12 +571,12 @@ static void __hdd_tx_timeout(struct net_device *dev) for (i = 0; i < NUM_TX_QUEUES; i++) { txq = netdev_get_tx_queue(dev, i); - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "Queue%d status: %d txq->trans_start %lu", i, netif_tx_queue_stopped(txq), txq->trans_start); } - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "carrier state: %d", netif_carrier_ok(dev)); } @@ -609,7 +609,7 @@ QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -630,7 +630,7 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -666,14 +666,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(CDF_MODULE_ID_HDD); + pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -690,7 +690,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) skb = (struct sk_buff *)rxBuf; if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, "Magic cookie(%x) for adapter sanity verification is invalid", pAdapter->magic); return QDF_STATUS_E_FAILURE; @@ -700,7 +700,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) if ((pHddStaCtx->conn_info.proxyARPService) && cfg80211_is_gratuitous_arp_unsolicited_na(skb)) { ++pAdapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index]; - CDF_TRACE(CDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, "%s: Dropping HS 2.0 Gratuitous ARP or Unsolicited NA", __func__); /* Remove SKB from internal tracking table before submitting diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index ecb1fcfaf5e6..f710d2dd002c 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -510,20 +510,20 @@ void *mem_alloc_copy_from_user_helper(const __user void *wrqu_data, size_t len) * (4096 bytes). So we use 4096 as the upper boundary for now. */ if (len > MAX_USER_COMMAND_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Invalid length"); return NULL; } ptr = kmalloc(len + 1, GFP_KERNEL); if (NULL == ptr) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "unable to allocate memory"); return NULL; } if (copy_from_user(ptr, wrqu_data, len)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); kfree(ptr); return NULL; @@ -738,7 +738,7 @@ void hdd_wlan_get_version(hdd_adapter_t *pAdapter, union iwreq_data *wrqu, pHddContext = WLAN_HDD_GET_CTX(pAdapter); if (!pHddContext) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s:Invalid context, HDD context is null", __func__); goto error; } @@ -789,7 +789,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) ENTER(); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -801,14 +801,14 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } wrqu->rts.value = threshold; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Rts-Threshold=%d!!"), wrqu->rts.value); EXIT(); @@ -836,7 +836,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, ENTER(); if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -848,14 +848,14 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } wrqu->frag.value = threshold; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Frag-Threshold=%d!!"), wrqu->frag.value); EXIT(); @@ -881,7 +881,7 @@ int hdd_wlan_get_freq(uint32_t channel, uint32_t *pfreq) } } } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Invalid channel no=%d!!"), channel); return -EINVAL; } @@ -1330,7 +1330,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * otherwise a CDF_STATUS_E_* error. */ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, - struct cdf_mac_addr macAddress) { + struct qdf_mac_addr macAddress) { QDF_STATUS status; unsigned long rc; struct linkspeedContext context; @@ -1342,7 +1342,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, } linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); return QDF_STATUS_E_NOMEM; } @@ -1419,7 +1419,7 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) *link_speed = 0; } else { QDF_STATUS status; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); @@ -1962,7 +1962,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; } @@ -2051,7 +2051,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) { if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("failed to get operating channel %u"), pAdapter->sessionId); return -EIO; @@ -2182,7 +2182,7 @@ static int __iw_set_tx_power(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, wrqu->txpower.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL")); return -EIO; } @@ -2390,7 +2390,7 @@ static int __iw_set_bitrate(struct net_device *dev, } if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FIXED_RATE")); return -EIO; } @@ -2456,7 +2456,7 @@ static int __iw_set_genie(struct net_device *dev, base_genie = mem_alloc_copy_from_user_helper(wrqu->data.pointer, wrqu->data.length); if (NULL == base_genie) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } @@ -2639,7 +2639,7 @@ static int __iw_get_genie(struct net_device *dev, status = csr_roam_get_wpa_rsn_req_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &length, genIeBytes); - length = CDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN); + length = QDF_MIN((uint16_t) length, DOT11F_IE_RSN_MAX_LEN); if (wrqu->data.length < length) { hddLog(LOG1, "%s: failed to copy data to user buffer", __func__); @@ -2825,7 +2825,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } @@ -2955,7 +2955,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, if (sme_cfg_set_int (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } @@ -3129,7 +3129,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_DOT11_MODE, &active_phy_mode) == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "active_phy_mode = %d", active_phy_mode); if (active_phy_mode == WNI_CFG_DOT11_MODE_11A @@ -3191,7 +3191,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels, &num_channels) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; @@ -3771,7 +3771,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, } if (wrqu->data.flags & IW_ENCODE_DISABLED) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "****iwconfig wlan0 key off*****"); if (!fKeyPresent) { @@ -4071,7 +4071,7 @@ static int __iw_set_encodeext(struct net_device *dev, (IW_ENCODE_ALG_WEP == ext->alg)) { if (IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Invalid Configuration:%s"), __func__); return -EINVAL; } else { @@ -4112,7 +4112,7 @@ static int __iw_set_encodeext(struct net_device *dev, setKey.keyDirection = eSIR_TX_RX; cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } /*For supplicant pae role is zero */ @@ -4179,7 +4179,7 @@ static int __iw_set_encodeext(struct net_device *dev, break; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"), __func__, (int)ext->alg, (int)ext->key_len, setKey.encType); @@ -4206,7 +4206,7 @@ static int __iw_set_encodeext(struct net_device *dev, &setKey, &roamId); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, cdf_ret_status); @@ -4265,7 +4265,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN || wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Invalid Retry-Limit=%d!!"), wrqu->retry.value); return -EINVAL; @@ -4277,7 +4277,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4286,7 +4286,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4296,7 +4296,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Set Retry-Limit=%d!!"), wrqu->retry.value); EXIT(); @@ -4356,7 +4356,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4368,7 +4368,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4379,7 +4379,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), retry); EXIT(); @@ -4573,7 +4573,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, } vhtchanwidth = phddctx->config->vhtChannelWidth; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " "ch_bond5g=%d band_24=%d band_5g=%d VHT_ch_width=%u"), ch_bond24, ch_bond5g, band_24, band_5g, vhtchanwidth); @@ -4808,7 +4808,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, smeconfig.csrConfig.channelBondingMode5GHz; phddctx->config->vhtChannelWidth = vhtchanwidth; if (hdd_update_config_dat(phddctx) == false) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not update config_dat", __func__); return -EIO; } @@ -4819,7 +4819,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, phddctx->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "New_Phymode= %d ch_bonding=%d band=%d VHT_ch_width=%u", phymode, chwidth, curr_band, vhtchanwidth); } @@ -4957,7 +4957,7 @@ static int __iw_setint_getnone(struct net_device *dev, smeConfig.csrConfig.Is11dSupportEnabled = (bool) set_value; - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), smeConfig.csrConfig. @@ -5033,7 +5033,7 @@ static int __iw_setint_getnone(struct net_device *dev, } else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; @@ -5070,7 +5070,7 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_TX_POWER: { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; cdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); if (sme_set_tx_power @@ -5085,8 +5085,8 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_MAX_TX_POWER: { - struct cdf_mac_addr bssid; - struct cdf_mac_addr selfMac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr selfMac; hddLog(CDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm", __func__, @@ -5273,7 +5273,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5292,7 +5292,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set LDPC value"); @@ -5311,7 +5311,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5329,7 +5329,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set TX STBC value"); @@ -5349,7 +5349,7 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -5369,7 +5369,7 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set RX STBC value"); break; @@ -5382,7 +5382,7 @@ static int __iw_setint_getnone(struct net_device *dev, WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ, set_value); if (ret) - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Failed to set ShortGI value"); break; @@ -6185,7 +6185,7 @@ static int __iw_setchar_getnone(struct net_device *dev, struct iw_point s_priv_data; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -6212,23 +6212,23 @@ static int __iw_setchar_getnone(struct net_device *dev, pBuffer = mem_alloc_copy_from_user_helper(s_priv_data.pointer, s_priv_data.length); if (NULL == pBuffer) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received length %d", __func__, s_priv_data.length); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, pBuffer); switch (sub_cmd) { case WE_WOWL_ADD_PTRN: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN"); + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN"); hdd_add_wowl_ptrn(pAdapter, pBuffer); break; case WE_WOWL_DEL_PTRN: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN"); + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN"); hdd_del_wowl_ptrn(pAdapter, pBuffer); break; #if defined WLAN_FEATURE_VOWIFI @@ -6238,7 +6238,7 @@ static int __iw_setchar_getnone(struct net_device *dev, tRrmNeighborRspCallbackInfo callbackInfo; if (pConfig->fRrmEnable) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "Neighbor Request"); neighborReq.no_ssid = @@ -6340,14 +6340,14 @@ static int __iw_setnone_getint(struct net_device *dev, *value = smeConfig.csrConfig.Is11dSupportEnabled; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), *value); break; } case WE_IBSS_STATUS: - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "****Return IBSS Status*****"); break; @@ -6362,7 +6362,7 @@ static int __iw_setnone_getint(struct net_device *dev, if (sme_cfg_get_int (hHal, WNI_CFG_ASSOC_STA_LIMIT, (uint32_t *) value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; @@ -6378,7 +6378,7 @@ static int __iw_setnone_getint(struct net_device *dev, { *value = cds_get_concurrency_mode(); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("concurrency mode=%d"), *value); break; } @@ -7118,7 +7118,7 @@ static int __iw_get_char_setnone(struct net_device *dev, case WE_GET_CFG: { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Printing CLD global INI Config", __func__); hdd_cfg_get_global_config(WLAN_HDD_GET_CTX(pAdapter), @@ -7293,7 +7293,7 @@ static int __iw_get_char_setnone(struct net_device *dev, phymode = sme_get_phy_mode(hal); if ((QDF_STATUS_SUCCESS != sme_get_freq_band(hal, &currBand))) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); @@ -7919,9 +7919,9 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, msg.reserved = 0; msg.bodyptr = unitTestArgs; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(unitTestArgs); - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post UNIT_TEST_CMD message to WMA")); @@ -7981,7 +7981,7 @@ static int iw_hdd_set_var_ints_getnone(struct net_device *dev, int ret, num_args; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -8152,7 +8152,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, return 0; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s:TS_INFO PSB %d UP %d !!!", __func__, tSpec.ts_info.psb, tSpec.ts_info.up); @@ -8425,7 +8425,7 @@ static int __iw_set_host_offload(struct net_device *dev, return ret; if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:LOGP dev is not in CONNECTED state, ignore!!!", __func__); return -EINVAL; @@ -8745,7 +8745,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, struct pkt_filter_cfg *request = NULL; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -9282,19 +9282,19 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) band = eCSR_BAND_MAX; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: change band to %u", __func__, band); if (band == eCSR_BAND_MAX) { /* Received change band request with invalid band value */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid band value %u", __func__, ui_band); return -EINVAL; } if ((band == eCSR_BAND_24 && pHddCtx->config->nBandCapability == 2) || (band == eCSR_BAND_5G && pHddCtx->config->nBandCapability == 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: band value %u violate INI settings %u", __func__, band, pHddCtx->config->nBandCapability); return -EIO; @@ -9308,7 +9308,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) } if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; } @@ -9318,7 +9318,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) * Abort pending scan requests, flush the existing scan results, * and change the band capability */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Current band value = %u, new setting %u ", __func__, currBand, band); @@ -9388,7 +9388,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) if (QDF_STATUS_SUCCESS != sme_set_freq_band(hHal, pAdapter->sessionId, band)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, FL("Failed to set the band value to %u"), band); return -EINVAL; @@ -9423,7 +9423,7 @@ static int __iw_set_band_config(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -10692,9 +10692,9 @@ static const struct iw_priv_args we_private_args[] = { }; const struct iw_handler_def we_handler_def = { - .num_standard = CDF_ARRAY_SIZE(we_handler), - .num_private = CDF_ARRAY_SIZE(we_private), - .num_private_args = CDF_ARRAY_SIZE(we_private_args), + .num_standard = QDF_ARRAY_SIZE(we_handler), + .num_private = QDF_ARRAY_SIZE(we_private), + .num_private_args = QDF_ARRAY_SIZE(we_private_args), .standard = (iw_handler *) we_handler, .private = (iw_handler *) we_private, @@ -10765,19 +10765,19 @@ int hdd_register_wext(struct net_device *dev) if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 3cbff0221040..8f9dc21e9899 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -166,7 +166,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) /* The TSPEC must be valid */ if (pAc->wmmAcTspecValid == false) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invoked with invalid TSPEC", __func__); return; } @@ -178,7 +178,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) } else { /* no service interval is present in the TSPEC */ /* this is OK, there just won't be U-APSD */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No service interval supplied", __func__); service_interval = 0; } @@ -194,7 +194,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) (pAc->wmmAcUapsdSuspensionInterval == suspension_interval) && (pAc->wmmAcUapsdDirection == direction) && (pAc->wmmAcIsUapsdEnabled == psb)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No change in U-APSD parameters", __func__); return; } @@ -210,7 +210,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pHddCtx->config->DelayedTriggerFrmInt); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to enable U-APSD for AC=%d", __func__, acType); return; @@ -222,7 +222,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pAc->wmmAcUapsdDirection = direction; pAc->wmmAcIsUapsdEnabled = psb; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Enabled UAPSD in TL srv_int=%d " "susp_int=%d dir=%d AC=%d", __func__, @@ -255,13 +255,13 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) acType, pAdapter->sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to disable U-APSD for AC=%d", __func__, acType); } else { /* TL no longer has valid UAPSD info */ pAc->wmmAcUapsdInfoValid = false; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Disabled UAPSD in TL for AC=%d", __func__, acType); } @@ -281,7 +281,7 @@ static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext) { hdd_adapter_t *pAdapter; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || @@ -325,12 +325,12 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) union iwreq_data wrqu; char buf[MAX_NOTIFY_LEN + 1]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -350,7 +350,7 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) pAdapter = pQosContext->pAdapter; /* send the event */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Sending [%s]", __func__, buf); wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf); } @@ -388,7 +388,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext-> acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL( "WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d" ), @@ -396,7 +396,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) { /* there is no traffic activity, delete the TSPEC for this AC */ status = hdd_wmm_delts(pAdapter, pQosContext->handle); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL( "Deleted TS on AC %d, due to inactivity with status = %d!!!" ), @@ -409,7 +409,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) cdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL( "Restarting inactivity timer failed on AC %d" @@ -452,11 +452,11 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, hdd_wmm_inactivity_timer_cb, pQosContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Initializing inactivity timer failed on AC %d"), acType); return qdf_status; @@ -465,7 +465,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Starting inactivity timer failed on AC %d"), acType); qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); @@ -549,12 +549,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, sme_ac_enum_type acType; hdd_wmm_ac_status_t *pAc; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return QDF_STATUS_E_FAILURE; } @@ -563,14 +563,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: status %d flowid %d info %p", __func__, smeStatus, qosFlowId, pCurrentQosInfo); switch (smeStatus) { case SME_QOS_STATUS_SETUP_SUCCESS_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete", __func__); /* there will always be a TSPEC returned with this @@ -588,7 +588,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -601,7 +601,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, #ifdef FEATURE_WLAN_ESE /* Check if the inactivity interval is specified */ if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Inactivity timer value = %d for AC=%d", __func__, pCurrentQosInfo->inactivity_interval, acType); @@ -617,7 +617,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup is complete (U-APSD set previously)", __func__); @@ -627,7 +627,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -640,7 +640,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_FAILURE_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed", __func__); /* QoS setup failed */ @@ -649,7 +649,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = false; if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -672,7 +672,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup Invalid Params, notify TL", __func__); /* QoS setup failed */ pAc->wmmAcAccessAllowed = false; @@ -689,7 +689,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -701,10 +701,10 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed, not a QoS AP", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -716,13 +716,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_SETUP_MODIFIED_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup modified", __func__); if (pCurrentQosInfo) { /* update the TSPEC */ @@ -731,7 +731,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pCurrentQosInfo, sizeof(pAc->wmmAcTspecInfo)); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -757,7 +757,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -773,7 +773,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup successful but U-APSD failed", __func__); if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) { @@ -789,7 +789,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessPending = false; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -807,11 +807,11 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_SUCCESS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release is complete", __func__); if (pCurrentQosInfo) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: flows still active", __func__); /* there is still at least one flow active for @@ -823,7 +823,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, /* need to tell TL to update its UAPSD handling */ hdd_wmm_enable_tl_uapsd(pQosContext); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: last flow", __func__); /* this is the last flow active for this AC so @@ -839,7 +839,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, } if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -853,14 +853,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_FAILURE_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release failure", __func__); /* we don't need to update our state or TL since * nothing has changed */ if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -873,7 +873,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_QOS_LOST_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: QOS Lost indication received", __func__); /* current TSPEC is no longer valid */ @@ -889,7 +889,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessGranted = false; pAc->wmmAcAccessFailed = false; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Explicit Qos, notifying user space", __func__); @@ -903,13 +903,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Release pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Release Invalid Params", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { /* this was triggered by an application */ @@ -920,7 +920,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Modification is complete, notify TL", __func__); /* there will always be a TSPEC returned with this @@ -966,7 +966,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: modification pending", __func__); /* not a callback status -- ignore if we get it */ break; @@ -999,7 +999,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Modify successful but U-APSD failed", __func__); /* QoS modification was successful but setting U=APSD @@ -1035,7 +1035,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); } @@ -1055,7 +1055,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: complete, access for TL AC %d is%sallowed", __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not "); @@ -1074,12 +1074,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr) { if (NULL == pAdapter) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return -EINVAL; } if (NULL == ptr) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ptr is NULL", __func__); return -EINVAL; } @@ -1110,11 +1110,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) sme_QosWmmTspecInfo qosInfo; hdd_context_t *hdd_ctx; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic)) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -1130,11 +1130,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: pAdapter %p acType %d", __func__, pAdapter, acType); if (!pAc->wmmAcAccessNeeded) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: AC %d doesn't need service", __func__, acType); pQosContext->magic = 0; kfree(pQosContext); @@ -1298,7 +1298,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) qosInfo.ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -1309,7 +1309,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* setup is pending, so no more work to do now. all * further work will be done in hdd_wmm_sme_callback() */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is pending, no further work", __func__); break; @@ -1332,7 +1332,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* for these cases everything is already setup so we * can signal TL that it has work to do */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete, notify TL", __func__); pAc->wmmAcAccessAllowed = true; @@ -1342,7 +1342,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); } @@ -1378,7 +1378,7 @@ QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap; uint8_t dscp; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* DSCP to User Priority Lookup Table @@ -1409,7 +1409,7 @@ QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); pAdapter->hddWmmStatus.wmmQap = false; @@ -1447,7 +1447,7 @@ QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); for (acType = 0; acType < WLAN_MAX_AC; acType++) { pAcStatus = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; @@ -1476,7 +1476,7 @@ QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* free any context records that we still have linked */ @@ -1526,7 +1526,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1534,7 +1534,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, eth_hdr = (union generic_ethhdr *)pkt; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: proto is 0x%04x", __func__, skb->protocol); #endif /* HDD_WMM_DEBUG */ @@ -1543,7 +1543,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_II)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1552,7 +1552,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ipv6hdr = ipv6_hdr(skb); tos = ntohs(*(const __be16 *)ipv6hdr) >> 4; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IPv6 Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1565,7 +1565,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_8023)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1580,7 +1580,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_IIv)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1602,7 +1602,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_8023v)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1610,7 +1610,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: VLAN tagged Unhandled Protocol, using default tos", __func__); @@ -1620,7 +1620,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: Unhandled Protocol, using default tos", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1637,7 +1637,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, *user_pri = adapter->hddWmmDscpToUpMap[dscp]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: tos is %d, dscp is %d, up is %d", __func__, tos, dscp, *user_pri); #endif /* HDD_WMM_DEBUG */ @@ -1777,7 +1777,7 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, pAdapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK; break; default: - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid AC Type", __func__); break; } @@ -1799,7 +1799,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered for AC %d", __func__, acType); if (!hdd_wmm_is_active(pAdapter) || @@ -1808,7 +1808,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* either we don't want QoS or the AP doesn't support * QoS or we don't want to do implicit QoS */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: QoS not configured on both ends ", __func__); *pGranted = @@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request already pending so we need to wait for that * response */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d already scheduled", __func__, acType); @@ -1838,7 +1838,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request previously failed * allow access, but we'll be downgraded */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d previously failed", __func__, acType); @@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p", __func__, acType, pAdapter); @@ -1867,7 +1867,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* no memory for QoS context. Nothing we can do but * let data flow */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate context", __func__); pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; @@ -1889,7 +1889,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos); #endif - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Scheduling work for AC %d, context %p", __func__, acType, pQosContext); @@ -1923,7 +1923,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * enable UAPSD for any access categories */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if (pRoamInfo->fReassocReq) { @@ -1936,7 +1936,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * parameters will be updated there */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Reassoc so no work, Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -1945,7 +1945,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, uapsdMask = pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: U-APSD mask is 0x%02x", __func__, (int)uapsdMask); if (uapsdMask & HDD_AC_VO) { @@ -2020,7 +2020,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, hdd_wmm_init(pAdapter); } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2051,7 +2051,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, bool qosConnection; uint8_t acmMask; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) && @@ -2065,7 +2065,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, acmMask = 0x0; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: qap is %d, qosConnection is %d, acmMask is 0x%x", __func__, qap, qosConnection, acmMask); @@ -2074,7 +2074,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, for (ac = 0; ac < WLAN_MAX_AC; ac++) { if (qap && qosConnection && (acmMask & acm_mask_bit[ac])) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d on", __func__, ac); /* admission is required */ @@ -2094,7 +2094,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, wmmAcAccessAllowed = true; } } else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d off", __func__, ac); /* admission is not required so access is allowed */ pAdapter->hddWmmStatus.wmmAcStatus[ac]. @@ -2105,7 +2105,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2199,7 +2199,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, #endif bool found = false; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* see if a context already exists with the given handle */ @@ -2214,7 +2214,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, mutex_unlock(&pAdapter->hddWmmStatus.wmmLock); if (found) { /* record with that handle already exists */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Record already exists with handle 0x%x", __func__, handle); @@ -2250,7 +2250,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, /* we didn't get back one of the * SME_QOS_STATUS_MODIFY_* status codes */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); @@ -2269,7 +2269,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext = kmalloc(sizeof(*pQosContext), GFP_KERNEL); if (NULL == pQosContext) { /* no memory for QoS context. Nothing we can do */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate QoS context", __func__); return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE; } @@ -2279,7 +2279,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, if (pTspec->ts_info.up < HDD_WMM_UP_TO_AC_MAP_SIZE) pQosContext->acType = hdd_wmm_up_to_ac_map[pTspec->ts_info.up]; else { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ts_info.up (%d) larger than max value (%d), use default acType (%d)", __func__, pTspec->ts_info.up, HDD_WMM_UP_TO_AC_MAP_SIZE - 1, hdd_wmm_up_to_ac_map[0]); @@ -2289,7 +2289,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext->qosFlowId = 0; pQosContext->magic = HDD_WMM_CTX_MAGIC; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setting up QoS, context %p", __func__, pQosContext); mutex_lock(&pAdapter->hddWmmStatus.wmmLock); @@ -2305,7 +2305,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pTspec->ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -2342,7 +2342,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, * SME_QOS_STATUS_SETUP_* status codes */ hdd_wmm_free_context(pQosContext); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); return HDD_WLAN_WMM_STATUS_SETUP_FAILED; @@ -2378,7 +2378,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) sme_QosStatusType smeStatus; #endif - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2396,12 +2396,12 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) if (false == found) { /* we didn't find the handle */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: handle 0x%x not found", __func__, handle); return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM; } - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, flow %d, AC %d, context %p", __func__, handle, qosFlowId, acType, pQosContext); @@ -2409,7 +2409,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) smeStatus = sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId); - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: SME flow %d released, SME status %d", __func__, qosFlowId, smeStatus); @@ -2455,7 +2455,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) /* we didn't get back one of the * SME_QOS_STATUS_RELEASE_* status codes */ - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); CDF_ASSERT(0); status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED; @@ -2484,7 +2484,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) hdd_wmm_qos_context_t *pQosContext; hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST; - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2492,7 +2492,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) list_for_each_entry(pQosContext, &pAdapter->hddWmmStatus.wmmContextList, node) { if (pQosContext->handle == handle) { - CDF_TRACE(CDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, context %p", __func__, handle, pQosContext); diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index fc1992a506da..def8b33625f0 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -59,7 +59,7 @@ static inline int find_ptrn_len(const char *ptrn) static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Return code = (%d)", __func__, cdf_ret_status); } @@ -67,7 +67,7 @@ static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) static void hdd_wowl_wake_indication_callback(void *pContext, tpSirWakeReasonInd wake_reason_ind) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", __func__, wake_reason_ind->ulReason); hdd_exit_wowl((hdd_adapter_t *) pContext); } @@ -83,25 +83,25 @@ static void dump_hdd_wowl_ptrn(struct wow_add_pattern *ptrn) { int i; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Patetrn Id = 0x%x", __func__, ptrn->pattern_id); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern Byte Offset = 0x%x", __func__, ptrn->pattern_byte_offset); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_size = 0x%x", __func__, ptrn->pattern_size); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask_size = 0x%x", __func__, ptrn->pattern_mask_size); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ", __func__); for (i = 0; i < ptrn->pattern_size; i++) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X", ptrn->pattern[i]); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", __func__); for (i = 0; i < ptrn->pattern_mask_size; i++) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X", + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X", ptrn->pattern_mask[i]); } @@ -139,7 +139,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Pattern Already configured, skip to * next pattern */ - CDF_TRACE(CDF_MODULE_ID_HDD, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Trying to add duplicate WoWL pattern. Skip it!"); ptrn += len; @@ -159,7 +159,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Maximum number of patterns have been configured already */ if (first_empty_slot == -1) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Cannot add anymore patterns. No free slot!", __func__); return false; @@ -167,7 +167,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Validate the pattern */ if (ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER || ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string. Skip!", __func__); ptrn += len; @@ -186,7 +186,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE || localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Invalid length specified. Skip!", __func__); ptrn += len; @@ -196,7 +196,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = 5 + 2 * localPattern.pattern_size + 1; if ((offset >= len) || (ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string..skip!", __func__); ptrn += len; @@ -206,7 +206,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = offset + 2 * localPattern.pattern_mask_size; if (offset + 1 != len) { /* offset begins with 0 */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string...skip!", __func__); ptrn += len; @@ -241,7 +241,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) g_hdd_wowl_ptrns[first_empty_slot] = kmalloc(len + 1, GFP_KERNEL); if (g_hdd_wowl_ptrns[first_empty_slot] == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: kmalloc failure", __func__); return false; } @@ -258,7 +258,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Add failed, so invalidate the local storage */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", cdf_ret_status); kfree(g_hdd_wowl_ptrns[first_empty_slot]); @@ -316,7 +316,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Remove from local storage as well */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, g_hdd_wowl_ptrns[id]); @@ -350,7 +350,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, uint16_t pattern_len, mask_len, i; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is out of range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -361,7 +361,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, /* Since the pattern is a hex string, 2 characters represent 1 byte. */ if (pattern_len % 2) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed WoW pattern!", __func__); return false; @@ -369,7 +369,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, pattern_len >>= 1; if (!pattern_len || pattern_len > WOWL_PTRN_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern length %d is out of range (1 ~ %d).", __func__, pattern_len, WOWL_PTRN_MAX_SIZE); @@ -382,7 +382,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, localPattern.session_id = session_id; if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern size (%d) greater than max (%d)", __func__, localPattern.pattern_size, SIR_WOWL_BCAST_PATTERN_MAX_SIZE); @@ -406,13 +406,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, mask_len = strlen(pattern_mask); if ((mask_len % 2) || (localPattern.pattern_mask_size != (mask_len >> 1))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Malformed WoW pattern mask!", __func__); return false; } if (localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern mask size (%d) greater than max (%d)", __func__, localPattern.pattern_mask_size, WOWL_PTRN_MASK_MAX_SIZE); @@ -433,7 +433,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, sme_wow_add_pattern(hHal, &localPattern, session_id); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -467,7 +467,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is not in the range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -475,7 +475,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) } if (!g_hdd_wowl_ptrns_debugfs[pattern_idx]) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: WoW pattern %d is not in the table.", __func__, pattern_idx); @@ -488,7 +488,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -544,7 +544,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { /* We failed to enter WoWL */ - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", cdf_ret_status); return false; @@ -569,7 +569,7 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) cdf_ret_status = sme_exit_wowl(hHal, &wowParams); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", cdf_ret_status); return false; diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index cb22f9a2a7cf..5e9e82046d4d 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -34,7 +34,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_common.h" #include "ani_system_defs.h" #include "sys_def.h" diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h index 578d0b833911..ebaa1311bc85 100644 --- a/core/mac/inc/ani_system_defs.h +++ b/core/mac/inc/ani_system_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -198,7 +198,7 @@ typedef struct sTrafStrmMetrics { uint16_t UplinkPktCount; uint8_t RoamingCount; uint16_t RoamingDly; -} cdf_packed tTrafStrmMetrics, *tpTrafStrmMetrics; +} qdf_packed tTrafStrmMetrics, *tpTrafStrmMetrics; typedef struct sBcnReportFields { uint8_t ChanNum; @@ -211,6 +211,6 @@ typedef struct sBcnReportFields { uint32_t TargetTsf[2]; uint16_t BcnInterval; uint16_t CapabilityInfo; -} cdf_packed tBcnReportFields, *tpBcnReportFields; +} qdf_packed tBcnReportFields, *tpBcnReportFields; #endif /* __ANI_SYSTEM_DEFS_H */ diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 878ce5f883db..91deff13aea8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -403,7 +403,7 @@ typedef struct sSirRemainOnChnReq { uint16_t messageType; uint16_t length; uint8_t sessionId; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t chnNum; uint8_t phyMode; uint32_t duration; @@ -544,7 +544,7 @@ typedef enum eSirNwType { /* / Definition for new iBss peer info */ typedef struct sSirNewIbssPeerInfo { - struct cdf_mac_addr peerAddr; + struct qdf_mac_addr peerAddr; uint16_t aid; } tSirNewIbssPeerInfo, *tpSirNewIbssPeerInfo; @@ -559,7 +559,7 @@ typedef struct sSirHtConfig { /* Enable/Disable SGI */ uint32_t ht_sgi:1; uint32_t unused:27; -} cdf_packed tSirHTConfig, *tpSirHTConfig; +} qdf_packed tSirHTConfig, *tpSirHTConfig; typedef struct sSirAddIeParams { uint16_t probeRespDataLen; @@ -592,8 +592,8 @@ typedef struct sSirSmeStartBssReq { uint16_t length; uint8_t sessionId; /* Added for BT-AMP Support */ uint16_t transactionId; /* Added for BT-AMP Support */ - struct cdf_mac_addr bssid; /* Added for BT-AMP Support */ - struct cdf_mac_addr self_macaddr; /* Added for BT-AMP Support */ + struct qdf_mac_addr bssid; /* Added for BT-AMP Support */ + struct qdf_mac_addr self_macaddr; /* Added for BT-AMP Support */ uint16_t beaconInterval; /* Added for BT-AMP Support */ uint8_t dot11mode; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH @@ -621,7 +621,7 @@ typedef struct sSirSmeStartBssReq { uint32_t dtimPeriod; uint8_t wps_state; uint8_t isCoalesingInIBSSAllowed; /* Coalesing on/off knob */ - enum tCDF_ADAPTER_MODE bssPersona; + enum tQDF_ADAPTER_MODE bssPersona; uint8_t txLdpcIniFeatureEnabled; @@ -655,7 +655,7 @@ typedef struct sSirBssDescription { /* offset of the ieFields from bssId. */ uint16_t length; tSirMacAddr bssId; - v_TIME_t scanSysTimeMsec; + unsigned long scanSysTimeMsec; uint32_t timeStamp[2]; uint16_t beaconInterval; uint16_t capabilityInfo; @@ -783,9 +783,9 @@ typedef struct sSirSmeScanReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID]; - struct cdf_mac_addr selfMacAddr; /* Added For BT-AMP Support */ + struct qdf_mac_addr selfMacAddr; /* Added For BT-AMP Support */ tSirBssType bssType; uint8_t dot11mode; tSirScanType scanType; @@ -909,7 +909,7 @@ typedef struct sSirSmeScanChanReq { typedef struct sSirOemDataReq { uint16_t messageType; /* eWNI_SME_OEM_DATA_REQ */ uint16_t messageLen; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t data_len; uint8_t *data; } tSirOemDataReq, *tpSirOemDataReq; @@ -952,7 +952,7 @@ typedef struct sSirSmeJoinReq { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH uint8_t cc_switch_mode; #endif - enum tCDF_ADAPTER_MODE staPersona; /* Persona */ + enum tQDF_ADAPTER_MODE staPersona; /* Persona */ ePhyChanBondState cbMode; /* Pass CB mode value in Join. */ /*This contains the UAPSD Flag for all 4 AC @@ -1084,7 +1084,7 @@ typedef struct sSirSmeProbereq { uint16_t messageType; uint16_t length; uint8_t sessionId; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t devicePasswdId; } tSirSmeProbeReq, *tpSirSmeProbeReq; @@ -1145,10 +1145,10 @@ typedef struct sSirSmeAssocCnf { uint16_t messageType; /* eWNI_SME_ASSOC_CNF */ uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr bssid; /* Self BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t aid; - struct cdf_mac_addr alternate_bssid; + struct qdf_mac_addr alternate_bssid; uint8_t alternateChannelId; } tSirSmeAssocCnf, *tpSirSmeAssocCnf; @@ -1169,7 +1169,7 @@ typedef enum eSirSmeStatusChangeCode { } tSirSmeStatusChangeCode; typedef struct sSirSmeNewBssInfo { - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t channelNumber; uint8_t reserved; tSirMacSSid ssId; @@ -1177,7 +1177,7 @@ typedef struct sSirSmeNewBssInfo { typedef struct sSirSmeApNewCaps { uint16_t capabilityInfo; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t channelId; uint8_t reserved[3]; tSirMacSSid ssId; @@ -1213,7 +1213,7 @@ typedef struct sSirSmeWmStatusChangeNtf { uint16_t length; uint8_t sessionId; /* Session ID */ tSirSmeStatusChangeCode statusChangeCode; - struct cdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr bssid; /* Self BSSID */ union { uint16_t deAuthReasonCode; /* eSIR_SME_DEAUTH_FROM_PEER */ /* eSIR_SME_DISASSOC_FROM_PEER */ @@ -1236,13 +1236,13 @@ typedef struct sSirSmeDisassocReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* Peer BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* Peer BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; /* This flag tells LIM whether to send the disassoc OTA or not */ /* This will be set in while handing off from one AP to other */ uint8_t doNotSendOverTheAir; -} cdf_packed tSirSmeDisassocReq, *tpSirSmeDisassocReq; +} qdf_packed tSirSmeDisassocReq, *tpSirSmeDisassocReq; /* / Definition for Tkip countermeasures request */ typedef struct sSirSmeTkipCntrMeasReq { @@ -1250,9 +1250,9 @@ typedef struct sSirSmeTkipCntrMeasReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssId; /* Peer BSSID */ + struct qdf_mac_addr bssId; /* Peer BSSID */ bool bEnable; /* Start/stop countermeasures */ -} cdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq; +} qdf_packed tSirSmeTkipCntrMeasReq, *tpSirSmeTkipCntrMeasReq; typedef struct sAni64BitCounters { uint32_t Hi; @@ -1372,10 +1372,10 @@ typedef struct sSirSmeDisassocRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; tAniStaStatStruct perStaStats; /* STA stats */ uint16_t staId; -} cdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp; +} qdf_packed tSirSmeDisassocRsp, *tpSirSmeDisassocRsp; /* / Definition for Disassociation indication from peer */ typedef struct sSirSmeDisassocInd { @@ -1384,8 +1384,8 @@ typedef struct sSirSmeDisassocInd { uint8_t sessionId; /* Session Identifier */ uint16_t transactionId; /* Transaction Identifier with PE */ tSirResultCodes statusCode; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; tAniStaStatStruct perStaStats; /* STA stats */ uint16_t staId; uint32_t reasonCode; @@ -1397,8 +1397,8 @@ typedef struct sSirSmeDisassocCnf { uint16_t messageType; /* eWNI_SME_DISASSOC_CNF */ uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; } tSirSmeDisassocCnf, *tpSirSmeDisassocCnf, tSirSmeDeauthCnf, *tpSirSmeDeauthCnf; @@ -1408,8 +1408,8 @@ typedef struct sSirSmeDeauthReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* AP BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* AP BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; } tSirSmeDeauthReq, *tpSirSmeDeauthReq; @@ -1420,7 +1420,7 @@ typedef struct sSirSmeDeauthRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; } tSirSmeDeauthRsp, *tpSirSmeDeauthRsp; /* / Definition for Deauthetication indication from peer */ @@ -1430,8 +1430,8 @@ typedef struct sSirSmeDeauthInd { uint8_t sessionId; /* Added for BT-AMP */ uint16_t transactionId; /* Added for BT-AMP */ tSirResultCodes statusCode; - struct cdf_mac_addr bssid; /* AP BSSID */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* AP BSSID */ + struct qdf_mac_addr peer_macaddr; uint16_t staId; uint32_t reasonCode; @@ -1445,7 +1445,7 @@ typedef struct sSirSmeStopBssReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* tranSaction ID for cmd */ tSirResultCodes reasonCode; - struct cdf_mac_addr bssid; /* Self BSSID */ + struct qdf_mac_addr bssid; /* Self BSSID */ } tSirSmeStopBssReq, *tpSirSmeStopBssReq; /* / Definition for stop BSS response message */ @@ -1464,7 +1464,7 @@ typedef struct sSirSmeSwitchChannelInd { uint16_t length; uint8_t sessionId; uint16_t newChannelId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ } tSirSmeSwitchChannelInd, *tpSirSmeSwitchChannelInd; /* / Definition for Neighbor BSS indication */ @@ -1484,7 +1484,7 @@ typedef struct sSirSmeMicFailureInd { uint16_t messageType; /* eWNI_SME_MIC_FAILURE_IND */ uint16_t length; uint8_t sessionId; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; tSirMicFailureInfo info; } tSirSmeMicFailureInd, *tpSirSmeMicFailureInd; @@ -1501,8 +1501,8 @@ typedef struct sSirSmeSetContextReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr peer_macaddr; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; /* BSSID */ tSirKeyMaterial keyMaterial; } tSirSmeSetContextReq, *tpSirSmeSetContextReq; @@ -1514,7 +1514,7 @@ typedef struct sSirSmeSetContextRsp { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; } tSirSmeSetContextRsp, *tpSirSmeSetContextRsp; /* / Statistic definitions */ @@ -1711,7 +1711,7 @@ typedef struct sAniGetTsmStatsReq { uint16_t msgLen; /* length of the entire request */ uint8_t staId; uint8_t tid; /* traffic id */ - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; void *tsmStatsCallback; void *pDevContext; /* device context */ void *p_cds_context; /* cds context */ @@ -1835,8 +1835,8 @@ typedef struct sAniDHCPStopInd { uint16_t msgType; uint16_t msgLen; uint8_t device_mode; - struct cdf_mac_addr adapterMacAddr; - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr adapterMacAddr; + struct qdf_mac_addr peerMacAddr; } tAniDHCPInd, *tpAniDHCPInd; typedef enum eTxRateInfo { @@ -1908,8 +1908,8 @@ typedef struct sSirTclasInfo { tSirMacTclasParamIPv4 ipv4; tSirMacTclasParamIPv6 ipv6; tSirMacTclasParam8021dq t8021dq; - } cdf_packed tclasParams; -} cdf_packed tSirTclasInfo; + } qdf_packed tclasParams; +} qdf_packed tSirTclasInfo; #if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) #define TSRS_11AG_RATE_6MBPS 0xC @@ -1925,7 +1925,7 @@ typedef struct sSirMacESETSMIE { } tSirMacESETSMIE; typedef struct sTSMStats { uint8_t tid; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tTrafStrmMetrics tsmMetrics; } tTSMStats, *tpTSMStats; typedef struct sEseTSMContext { @@ -1990,7 +1990,7 @@ typedef struct sSirAddtsReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint32_t timeout; /* in ms */ uint8_t rspReqd; tSirAddtsReqInfo req; @@ -2010,9 +2010,9 @@ typedef struct sSirDeltsReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint16_t aid; /* use 0 if macAddr is being specified */ - struct cdf_mac_addr macaddr; /* only on AP to specify the STA */ + struct qdf_mac_addr macaddr; /* only on AP to specify the STA */ uint8_t rspReqd; tSirDeltsReqInfo req; } tSirDeltsReq, *tpSirDeltsReq; @@ -2024,7 +2024,7 @@ typedef struct sSirDeltsRsp { uint16_t transactionId; /* sme transaction Id - for BT-AMP Support */ uint32_t rc; uint16_t aid; /* use 0 if macAddr is being specified */ - struct cdf_mac_addr macaddr; /* only on AP to specify the STA */ + struct qdf_mac_addr macaddr; /* only on AP to specify the STA */ tSirDeltsReqInfo rsp; } tSirDeltsRsp, *tpSirDeltsRsp; @@ -2038,7 +2038,7 @@ typedef struct sSirPlmReq { /* no of times the STA should cycle through PLM ch list */ uint8_t burstLen; int8_t desiredTxPwr; /* desired tx power */ - struct cdf_mac_addr mac_addr; /* MC dest addr */ + struct qdf_mac_addr mac_addr; /* MC dest addr */ /* no of channels */ uint8_t plmNumCh; /* channel numbers */ @@ -2061,7 +2061,7 @@ typedef struct sSirAggrQosReq { uint16_t length; uint8_t sessionId; /* Session ID */ uint16_t transactionId; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint32_t timeout; /* in ms */ uint8_t rspReqd; tSirAggrQosReqInfo aggrInfo; @@ -2092,7 +2092,7 @@ typedef struct sSmeIbssPeerInd { uint16_t mesgLen; uint8_t sessionId; - struct cdf_mac_addr peer_addr; + struct qdf_mac_addr peer_addr; uint16_t staId; /* @@ -2111,7 +2111,7 @@ typedef struct sSmeIbssPeerInd { typedef struct sSirIbssPeerInactivityInd { uint8_t bssIdx; uint8_t staIdx; - struct cdf_mac_addr peer_addr; + struct qdf_mac_addr peer_addr; } tSirIbssPeerInactivityInd, *tpSirIbssPeerInactivityInd; typedef struct sLimScanChn { @@ -2137,7 +2137,7 @@ typedef struct sLimScanChnInfo { typedef struct sSirSmeGetAssocSTAsReq { uint16_t messageType; /* eWNI_SME_GET_ASSOC_STAS_REQ */ uint16_t length; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint16_t modId; void *pUsrContext; void *pSapEventCallback; @@ -2150,13 +2150,13 @@ typedef struct sSmeMaxAssocInd { uint16_t mesgLen; uint8_t sessionId; /* the new peer that got rejected max assoc limit reached */ - struct cdf_mac_addr peer_mac; + struct qdf_mac_addr peer_mac; } tSmeMaxAssocInd, *tpSmeMaxAssocInd; typedef struct sSmeCsaOffloadInd { uint16_t mesgType; /* eWNI_SME_CSA_OFFLOAD_EVENT */ uint16_t mesgLen; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ } tSmeCsaOffloadInd, *tpSmeCsaOffloadInd; /* WOW related structures */ @@ -2201,7 +2201,7 @@ typedef struct sSirSmeWowlEnterParams { uint8_t ucMagicPktEnable; /* Magic pattern */ - struct cdf_mac_addr magic_ptrn; + struct qdf_mac_addr magic_ptrn; /* Enables/disables packet pattern filtering */ uint8_t ucPatternFilteringEnable; @@ -2234,7 +2234,7 @@ typedef struct sSirSmeWowlEnterParams { uint8_t ucWoWBSSConnLoss; #endif /* WLAN_WAKEUP_EVENTS */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirSmeWowlEnterParams, *tpSirSmeWowlEnterParams; /* PE<->HAL: Enter WOWLAN parameters */ @@ -2245,7 +2245,7 @@ typedef struct sSirHalWowlEnterParams { uint8_t ucMagicPktEnable; /* Magic pattern */ - struct cdf_mac_addr magic_ptrn; + struct qdf_mac_addr magic_ptrn; /* Enables/disables packet pattern filtering in firmware. Enabling this flag enables broadcast pattern matching @@ -2458,7 +2458,7 @@ typedef struct sSirUpdateAPWPSIEsReq { uint16_t messageType; /* eWNI_SME_UPDATE_APWPSIE_REQ */ uint16_t length; uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint8_t sessionId; /* Session ID */ tSirAPWPSIEs APWPSIEs; } tSirUpdateAPWPSIEsReq, *tpSirUpdateAPWPSIEsReq; @@ -2475,7 +2475,7 @@ typedef struct sSirChangeBIParams { uint16_t messageType; uint16_t length; uint16_t beaconInterval; /* Beacon Interval */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t sessionId; /* Session ID */ } tSirChangeBIParams, *tpSirChangeBIParams; @@ -2485,7 +2485,7 @@ typedef struct sSirSetHT2040Mode { uint16_t length; uint8_t cbMode; bool obssEnabled; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t sessionId; /* Session ID */ } tSirSetHT2040Mode, *tpSirSetHT2040Mode; #endif @@ -2494,7 +2494,7 @@ typedef struct sSirSetHT2040Mode { typedef struct sSirWPSPBCSession { struct sSirWPSPBCSession *next; - struct cdf_mac_addr addr; + struct qdf_mac_addr addr; uint8_t uuid_e[SIR_WPS_UUID_LEN]; uint32_t timestamp; } tSirWPSPBCSession; @@ -2504,13 +2504,13 @@ typedef struct sSirSmeGetWPSPBCSessionsReq { uint16_t length; void *pUsrContext; void *pSapEventCallback; - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ /* MAC Address of STA in WPS Session to be removed */ - struct cdf_mac_addr remove_mac; + struct qdf_mac_addr remove_mac; } tSirSmeGetWPSPBCSessionsReq, *tpSirSmeGetWPSPBCSessionsReq; typedef struct sSirWPSPBCProbeReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t probeReqIELen; uint8_t probeReqIE[512]; } tSirWPSPBCProbeReq, *tpSirWPSPBCProbeReq; @@ -2520,7 +2520,7 @@ typedef struct sSirSmeProbeReqInd { uint16_t messageType; /* eWNI_SME_WPS_PBC_PROBE_REQ_IND */ uint16_t length; uint8_t sessionId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirWPSPBCProbeReq WPSPBCProbeReq; } tSirSmeProbeReqInd, *tpSirSmeProbeReqInd; @@ -2528,7 +2528,7 @@ typedef struct sSirUpdateAPWPARSNIEsReq { uint16_t messageType; /* eWNI_SME_SET_APWPARSNIEs_REQ */ uint16_t length; uint16_t transactionId; /* Transaction ID for cmd */ - struct cdf_mac_addr bssid; /* BSSID */ + struct qdf_mac_addr bssid; /* BSSID */ uint8_t sessionId; /* Session ID */ tSirRSNie APWPARSNIEs; } tSirUpdateAPWPARSNIEsReq, *tpSirUpdateAPWPARSNIEsReq; @@ -2567,7 +2567,7 @@ typedef struct sSirNsOffloadReq { uint8_t srcIPv6Addr[SIR_MAC_IPV6_ADDR_LEN]; uint8_t selfIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; uint8_t targetIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; - struct cdf_mac_addr self_macaddr; + struct qdf_mac_addr self_macaddr; uint8_t srcIPv6AddrValid; uint8_t targetIPv6AddrValid[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA]; uint8_t slotIdx; @@ -2585,7 +2585,7 @@ typedef struct sSirHostOffloadReq { #ifdef WLAN_NS_OFFLOAD tSirNsOffloadReq nsOffloadInfo; #endif /* WLAN_NS_OFFLOAD */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirHostOffloadReq, *tpSirHostOffloadReq; /* Packet Types. */ @@ -2598,8 +2598,8 @@ typedef struct sSirKeepAliveReq { uint32_t timePeriod; tSirIpv4Addr hostIpv4Addr; tSirIpv4Addr destIpv4Addr; - struct cdf_mac_addr dest_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr dest_macaddr; + struct qdf_mac_addr bssid; uint8_t sessionId; } tSirKeepAliveReq, *tpSirKeepAliveReq; @@ -2674,7 +2674,7 @@ typedef struct { typedef struct { uint8_t vdev_id; - struct cdf_mac_addr wakee_mac_addr; + struct qdf_mac_addr wakee_mac_addr; uint8_t identification_id[8]; uint8_t password[16]; uint32_t id_length; @@ -2703,7 +2703,7 @@ typedef struct { uint32_t keepalive_max; /* Maximum ping interval */ uint32_t keepalive_inc; /* Increment of ping interval */ - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; uint32_t tcp_tx_timeout_val; uint32_t tcp_rx_timeout_val; } tSirAppType2Params, *tpSirAppType2Params; @@ -2718,8 +2718,8 @@ typedef struct sSirWlanSetRxpFilters { #define ANI_MAX_IBSS_ROUTE_TABLE_ENTRY 100 typedef struct sAniDestIpNextHopMacPair { - uint8_t destIpv4Addr[CDF_IPV4_ADDR_SIZE]; - uint8_t nextHopMacAddr[CDF_MAC_ADDR_SIZE]; + uint8_t destIpv4Addr[QDF_IPV4_ADDR_SIZE]; + uint8_t nextHopMacAddr[QDF_MAC_ADDR_SIZE]; } tAniDestIpNextHopMacPair; typedef struct sAniIbssRouteTable { @@ -2837,7 +2837,7 @@ typedef struct { typedef struct { tSirMacSSid ssId; - uint8_t currAPbssid[CDF_MAC_ADDR_SIZE]; + uint8_t currAPbssid[QDF_MAC_ADDR_SIZE]; uint32_t authentication; uint8_t encryption; uint8_t mcencryption; @@ -2904,8 +2904,8 @@ struct roam_ext_params { uint8_t num_ssid_allowed_list; uint8_t num_bssid_favored; tSirMacSSid ssid_allowed_list[MAX_SSID_ALLOWED_LIST]; - struct cdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST]; - struct cdf_mac_addr bssid_favored[MAX_BSSID_FAVORED]; + struct qdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST]; + struct qdf_mac_addr bssid_favored[MAX_BSSID_FAVORED]; uint8_t bssid_favored_factor[MAX_BSSID_FAVORED]; int raise_rssi_thresh_5g; int drop_rssi_thresh_5g; @@ -3053,8 +3053,8 @@ typedef struct sSirRcvPktFilterCfg { eSirReceivePacketFilterType filterType; uint32_t numFieldParams; uint32_t coalesceTime; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; /* Bssid of the connected AP */ + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; /* Bssid of the connected AP */ tSirRcvPktFilterFieldParams paramsData[SIR_MAX_NUM_TESTS_PER_FILTER]; } tSirRcvPktFilterCfgType, *tpSirRcvPktFilterCfgType; @@ -3073,7 +3073,7 @@ typedef struct sSirRcvFltPktMatchRsp { /* Success or Failure */ uint32_t status; tSirRcvFltPktMatchCnt filterMatchCnt[SIR_MAX_NUM_FILTERS]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirRcvFltPktMatchRsp, *tpSirRcvFltPktMatchRsp; /* */ @@ -3082,8 +3082,8 @@ typedef struct sSirRcvFltPktMatchRsp { typedef struct sSirRcvFltPktClearParam { uint32_t status; /* only valid for response message */ uint8_t filterId; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; } tSirRcvFltPktClearParam, *tpSirRcvFltPktClearParam; /* */ @@ -3091,9 +3091,9 @@ typedef struct sSirRcvFltPktClearParam { /* */ typedef struct sSirRcvFltMcAddrList { uint32_t ulMulticastAddrCnt; - struct cdf_mac_addr multicastAddr[SIR_MAX_NUM_MULTICAST_ADDRESS]; - struct cdf_mac_addr self_macaddr; - struct cdf_mac_addr bssid; + struct qdf_mac_addr multicastAddr[SIR_MAX_NUM_MULTICAST_ADDRESS]; + struct qdf_mac_addr self_macaddr; + struct qdf_mac_addr bssid; uint8_t action; } tSirRcvFltMcAddrList, *tpSirRcvFltMcAddrList; #endif /* WLAN_FEATURE_PACKET_FILTERING */ @@ -3117,7 +3117,7 @@ typedef struct { uint8_t aKCK[16]; /* Key confirmation key */ uint8_t aKEK[16]; /* key encryption key */ uint64_t ullKeyReplayCounter; /* replay counter */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirGtkOffloadParams, *tpSirGtkOffloadParams; /*--------------------------------------------------------------------------- @@ -3132,7 +3132,7 @@ typedef struct { uint32_t ulTotalRekeyCount; /* total rekey attempts */ uint32_t ulGTKRekeyCount; /* successful GTK rekeys */ uint32_t ulIGTKRekeyCount; /* successful iGTK rekeys */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirGtkOffloadGetInfoRspParams, *tpSirGtkOffloadGetInfoRspParams; #endif /* WLAN_FEATURE_GTK_OFFLOAD */ @@ -3359,8 +3359,8 @@ typedef struct sSirTdlsSendMgmtReq { uint8_t responder; uint32_t peerCapability; /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_mac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_mac; /* Variable length. Dont add any field after this. */ uint8_t addIe[1]; } tSirTdlsSendMgmtReq, *tpSirSmeTdlsSendMgmtReq; @@ -3378,9 +3378,9 @@ typedef struct sSirTdlsAddStaReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eTdlsAddOper tdlsAddOper; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t capability; uint8_t extn_capability[SIR_MAC_MAX_EXTN_CAP]; uint8_t supported_rates_length; @@ -3398,7 +3398,7 @@ typedef struct sSirTdlsAddStaRsp { uint16_t messageType; uint16_t length; tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint8_t sessionId; /* Session ID */ uint16_t staId; uint16_t staType; @@ -3420,8 +3420,8 @@ typedef struct { uint8_t isOffChannelSupported; uint8_t isResponder; /* Is Peer a responder. */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peermac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peermac; uint8_t supportedChannelsLen; uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supportedOperClassesLen; @@ -3435,7 +3435,7 @@ typedef struct { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; } tSirTdlsLinkEstablishReqRsp, *tpSirTdlsLinkEstablishReqRsp; /* TDLS Request struct SME-->PE */ @@ -3445,8 +3445,8 @@ typedef struct sSirTdlsDelStaReq { uint8_t sessionId; /* Session ID */ uint16_t transactionId; /* Transaction ID for cmd */ /* For multi-session, for PE to locate peSession ID */ - struct cdf_mac_addr bssid; - struct cdf_mac_addr peermac; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peermac; } tSirTdlsDelStaReq, *tpSirSmeTdlsDelStaReq; /* TDLS Response struct PE-->SME */ typedef struct sSirTdlsDelStaRsp { @@ -3454,7 +3454,7 @@ typedef struct sSirTdlsDelStaRsp { uint16_t length; uint8_t sessionId; /* Session ID */ tSirResultCodes statusCode; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t staId; } tSirTdlsDelStaRsp, *tpSirTdlsDelStaRsp; /* TDLS Delete Indication struct PE-->SME */ @@ -3462,7 +3462,7 @@ typedef struct sSirTdlsDelStaInd { uint16_t messageType; uint16_t length; uint8_t sessionId; /* Session ID */ - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t staId; uint16_t reasonCode; } tSirTdlsDelStaInd, *tpSirTdlsDelStaInd; @@ -3480,7 +3480,7 @@ typedef struct sSirMgmtTxCompletionInd { typedef struct sSirTdlsEventnotify { uint8_t sessionId; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t messageType; uint32_t peer_reason; } tSirTdlsEventnotify; @@ -3496,7 +3496,7 @@ typedef struct sSirActiveModeSetBcnFilterReq { typedef struct sSirResetAPCapsChange { uint16_t messageType; uint16_t length; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; } tSirResetAPCapsChange, *tpSirResetAPCapsChange; /* / Definition for Candidate found indication from FW */ @@ -3509,7 +3509,7 @@ typedef struct sSirSmeCandidateFoundInd { #ifdef WLAN_FEATURE_11W typedef struct sSirWlanExcludeUnencryptParam { bool excludeUnencrypt; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tSirWlanExcludeUnencryptParam, *tpSirWlanExcludeUnencryptParam; #endif @@ -3523,7 +3523,7 @@ typedef struct sAniHandoffReq { uint16_t msgType; /* message type is same as the request type */ uint16_t msgLen; /* length of the entire request */ uint8_t sessionId; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; uint8_t channel; uint8_t handoff_src; } tAniHandoffReq, *tpAniHandoffReq; @@ -3547,11 +3547,11 @@ typedef struct sAniHandoffReq { typedef struct sSirScanOffloadReq { uint8_t sessionId; - struct cdf_mac_addr bssId; + struct qdf_mac_addr bssId; uint8_t numSsid; tSirMacSSid ssId[SIR_SCAN_MAX_NUM_SSID]; uint8_t hiddenSsid; - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; tSirBssType bssType; uint8_t dot11mode; tSirScanType scanType; @@ -3658,7 +3658,7 @@ typedef struct sSirLPHBTcpParamStruct { uint16_t dst_port; uint16_t timeout; uint8_t session; - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; uint16_t timePeriodSec; /* in seconds */ uint32_t tcpSn; } tSirLPHBTcpParamStruct; @@ -3678,7 +3678,7 @@ typedef struct sSirLPHBUdpParamStruct { uint16_t interval; uint16_t timeout; uint8_t session; - struct cdf_mac_addr gateway_mac; + struct qdf_mac_addr gateway_mac; } tSirLPHBUdpParamStruct; typedef struct sSirLPHBUdpFilterStruct { @@ -3715,13 +3715,13 @@ typedef struct sSirChAvoidUpdateReq { typedef struct sSirLinkSpeedInfo { /* MAC Address for the peer */ - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint32_t estLinkSpeed; /* Linkspeed from firmware */ } tSirLinkSpeedInfo, *tpSirLinkSpeedInfo; typedef struct sSirAddPeriodicTxPtrn { /* MAC Address for the adapter */ - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; uint8_t ucPtrnId; /* Pattern ID */ uint16_t ucPtrnSize; /* Pattern size */ uint32_t usPtrnIntervalMs; /* In msec */ @@ -3730,7 +3730,7 @@ typedef struct sSirAddPeriodicTxPtrn { typedef struct sSirDelPeriodicTxPtrn { /* MAC Address for the adapter */ - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; /* Bitmap of pattern IDs that need to be deleted */ uint32_t ucPatternIdBitmap; uint8_t ucPtrnId; /* Pattern ID */ @@ -3750,8 +3750,8 @@ typedef struct { #endif typedef struct sSirRateUpdateInd { uint8_t nss; /* 0: 1x1, 1: 2x2 */ - struct cdf_mac_addr bssid; - enum tCDF_ADAPTER_MODE dev_mode; + struct qdf_mac_addr bssid; + enum tQDF_ADAPTER_MODE dev_mode; int32_t bcastDataRate; /* bcast rate unit Mbpsx10, -1:not used */ /* * 0 implies RA, positive value implies fixed rate, -1 implies ignore @@ -3828,7 +3828,7 @@ typedef struct sSirChanChangeRequest { phy_ch_width ch_width; uint8_t center_freq_seg_0; uint8_t center_freq_seg_1; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; uint32_t dot11mode; tSirMacRateSet operational_rateset; tSirMacRateSet extended_rateset; @@ -3845,7 +3845,7 @@ typedef struct sSirStartBeaconIndication { uint16_t messageType; uint16_t messageLen; uint8_t beaconStartStatus; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; } tSirStartBeaconIndication, *tpSirStartBeaconIndication; /* additional IE type */ @@ -3863,7 +3863,7 @@ typedef enum tUpdateIEsType { /* Modify particular IE in addition IE for prob resp Bcn */ typedef struct sSirModifyIE { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint16_t smeSessionId; bool notify; uint8_t ieID; @@ -3883,7 +3883,7 @@ typedef struct sSirModifyIEsInd { /* Message format for Update IE message sent to PE */ typedef struct sSirUpdateIE { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint16_t smeSessionId; bool append; bool notify; @@ -3905,7 +3905,7 @@ typedef struct sSirDfsCsaIeRequest { uint16_t msgLen; uint8_t targetChannel; uint8_t csaIeRequired; - uint8_t bssid[CDF_MAC_ADDR_SIZE]; + uint8_t bssid[QDF_MAC_ADDR_SIZE]; struct ch_params_s ch_params; } tSirDfsCsaIeRequest, *tpSirDfsCsaIeRequest; @@ -3983,7 +3983,7 @@ typedef struct sSirSmeRoamOffloadSynchInd { uint16_t reassoc_req_length; uint8_t isBeacon; uint8_t roamedVdevId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; int8_t txMgmtPower; uint32_t authStatus; uint8_t rssi; @@ -4052,7 +4052,7 @@ enum extscan_configuration_flags { }; typedef struct { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Low threshold */ int32_t low; @@ -4130,7 +4130,7 @@ typedef struct { /* Null terminated SSID */ uint8_t ssid[SIR_MAC_MAX_SSID_LENGTH + 1]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Frequency in MHz */ uint32_t channel; @@ -4443,7 +4443,7 @@ typedef struct { } tSirExtScanSetSigChangeReqParams, *tpSirExtScanSetSigChangeReqParams; typedef struct { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint32_t channel; uint32_t numOfRssi; @@ -4659,7 +4659,7 @@ typedef struct { /* interface mode */ uint8_t mode; /* interface mac address (self) */ - struct cdf_mac_addr macAddr; + struct qdf_mac_addr macAddr; /* tSirWifiConnectionState */ /* connection state (valid for STA, CLI only) */ uint8_t state; @@ -4671,7 +4671,7 @@ typedef struct { /* null terminated SSID */ uint8_t ssid[33]; /* bssid */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* country string advertised by AP */ uint8_t apCountryStr[WNI_CFG_COUNTRY_CODE_LEN]; /* country string for this association */ @@ -4804,7 +4804,7 @@ typedef struct { /* peer type (AP, TDLS, GO etc.) */ tSirWifiPeerType type; /* mac address */ - struct cdf_mac_addr peerMacAddress; + struct qdf_mac_addr peerMacAddress; /* peer WIFI_CAPABILITY_XXX */ uint32_t capabilities; /* number of rates */ @@ -5072,7 +5072,7 @@ struct rssi_breach_event { uint32_t request_id; uint32_t session_id; int8_t curr_rssi; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; }; #define MAX_NUM_FW_SEGMENTS 4 @@ -5235,7 +5235,7 @@ typedef void (*dcc_stats_event_callback_t)(void *hdd_ctx, uint32_t vdev_id, struct sir_ocb_config_channel { uint32_t chan_freq; uint32_t bandwidth; - struct cdf_mac_addr mac_address; + struct qdf_mac_addr mac_address; struct sir_qos_params qos_params[MAX_NUM_AC]; uint32_t max_pwr; uint32_t min_pwr; @@ -5462,9 +5462,9 @@ struct gateway_param_update_req { uint32_t timeout; uint32_t ipv4_addr_type; uint32_t ipv6_addr_type; - struct cdf_mac_addr gw_mac_addr; - uint8_t ipv4_addr[CDF_IPV4_ADDR_SIZE]; - uint8_t ipv6_addr[CDF_IPV6_ADDR_SIZE]; + struct qdf_mac_addr gw_mac_addr; + uint8_t ipv4_addr[QDF_IPV4_ADDR_SIZE]; + uint8_t ipv6_addr[QDF_IPV6_ADDR_SIZE]; }; #else struct gateway_param_update_req; diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 144aa89d9487..ed4fa0b7b362 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -800,7 +800,7 @@ typedef struct sSirMacFrameCtl { #endif -} cdf_packed tSirMacFrameCtl, *tpSirMacFrameCtl; +} qdf_packed tSirMacFrameCtl, *tpSirMacFrameCtl; /* / Sequence control field */ typedef struct sSirMacSeqCtl { @@ -819,7 +819,7 @@ typedef struct sSirMacSeqCtl { uint8_t seqNumHi:8; #endif -} cdf_packed tSirMacSeqCtl, *tpSirMacSeqCtl; +} qdf_packed tSirMacSeqCtl, *tpSirMacSeqCtl; /* / QoS control field */ typedef struct sSirMacQosCtl { @@ -843,7 +843,7 @@ typedef struct sSirMacQosCtl { uint8_t txop:8; #endif -} cdf_packed tSirMacQosCtl, *tpSirMacQosCtl; +} qdf_packed tSirMacQosCtl, *tpSirMacQosCtl; /* / Length (in bytes) of MAC header in 3 address format */ #define SIR_MAC_HDR_LEN_3A 24 @@ -855,7 +855,7 @@ typedef struct sSirMacDot3Hdr { tSirMacAddr da; tSirMacAddr sa; uint16_t length; -} cdf_packed tSirMacDot3Hdr, *tpSirMacDot3Hdr; +} qdf_packed tSirMacDot3Hdr, *tpSirMacDot3Hdr; /* / 3 address MAC data header format (24/26 bytes) */ typedef struct sSirMacDataHdr3a { @@ -867,7 +867,7 @@ typedef struct sSirMacDataHdr3a { tSirMacAddr addr3; tSirMacSeqCtl seqControl; tSirMacQosCtl qosControl; -} cdf_packed tSirMacDataHdr3a, *tpSirMacDataHdr3a; +} qdf_packed tSirMacDataHdr3a, *tpSirMacDataHdr3a; /* / Management header format */ typedef struct sSirMacMgmtHdr { @@ -878,7 +878,7 @@ typedef struct sSirMacMgmtHdr { tSirMacAddr sa; tSirMacAddr bssId; tSirMacSeqCtl seqControl; -} cdf_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; +} qdf_packed tSirMacMgmtHdr, *tpSirMacMgmtHdr; /* / ERP information field */ typedef struct sSirMacErpInfo { @@ -893,7 +893,7 @@ typedef struct sSirMacErpInfo { uint8_t barkerPreambleMode:1; uint8_t reserved:5; #endif -} cdf_packed tSirMacErpInfo, *tpSirMacErpInfo; +} qdf_packed tSirMacErpInfo, *tpSirMacErpInfo; /* / Capability information field */ typedef struct sSirMacCapabilityInfo { @@ -932,14 +932,14 @@ typedef struct sSirMacCapabilityInfo { uint16_t delayedBA:1; uint16_t immediateBA:1; #endif -} cdf_packed tSirMacCapabilityInfo, *tpSirMacCapabilityInfo; +} qdf_packed tSirMacCapabilityInfo, *tpSirMacCapabilityInfo; typedef struct sSirMacCfParamSet { uint8_t cfpCount; uint8_t cfpPeriod; uint16_t cfpMaxDuration; uint16_t cfpDurRemaining; -} cdf_packed tSirMacCfParamSet; +} qdf_packed tSirMacCfParamSet; typedef struct sSirMacTim { uint8_t dtimCount; @@ -947,7 +947,7 @@ typedef struct sSirMacTim { uint8_t bitmapControl; uint8_t bitmapLength; uint8_t bitmap[251]; -} cdf_packed tSirMacTim; +} qdf_packed tSirMacTim; /* 12 Bytes long because this structure can be used to represent rate */ /* and extended rate set IEs */ @@ -955,22 +955,22 @@ typedef struct sSirMacTim { typedef struct sSirMacRateSet { uint8_t numRates; uint8_t rate[SIR_MAC_RATESET_EID_MAX]; -} cdf_packed tSirMacRateSet; +} qdf_packed tSirMacRateSet; typedef struct sSirMacSSid { uint8_t length; uint8_t ssId[SIR_MAC_MAX_SSID_LENGTH]; -} cdf_packed tSirMacSSid; +} qdf_packed tSirMacSSid; typedef struct sSirMacWpaInfo { uint8_t length; uint8_t info[SIR_MAC_MAX_IE_LENGTH]; -} cdf_packed tSirMacWpaInfo, *tpSirMacWpaInfo, +} qdf_packed tSirMacWpaInfo, *tpSirMacWpaInfo, tSirMacRsnInfo, *tpSirMacRsnInfo; typedef struct sSirMacWapiInfo { uint8_t length; uint8_t info[SIR_MAC_MAX_IE_LENGTH]; -} cdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo, +} qdf_packed tSirMacWapiInfo, *tpSirMacWapiInfo, tSirMacWapiInfo, *tpSirMacWapiInfo; typedef struct sSirMacFHParamSet { @@ -1082,7 +1082,7 @@ typedef struct sSirMacAciAifsn { uint8_t aci:2; uint8_t rsvd:1; #endif -} cdf_packed tSirMacAciAifsn; +} qdf_packed tSirMacAciAifsn; /* contention window size */ typedef struct sSirMacCW { @@ -1093,13 +1093,13 @@ typedef struct sSirMacCW { uint8_t min:4; uint8_t max:4; #endif -} cdf_packed tSirMacCW; +} qdf_packed tSirMacCW; typedef struct sSirMacEdcaParamRecord { tSirMacAciAifsn aci; tSirMacCW cw; uint16_t txoplimit; -} cdf_packed tSirMacEdcaParamRecord; +} qdf_packed tSirMacEdcaParamRecord; typedef struct sSirMacQosInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1115,7 +1115,7 @@ typedef struct sSirMacQosInfo { uint8_t txopreq:1; uint8_t uapsd:1; #endif -} cdf_packed tSirMacQosInfo; +} qdf_packed tSirMacQosInfo; typedef struct sSirMacQosInfoStation { #ifdef ANI_LITTLE_BIT_ENDIAN @@ -1135,7 +1135,7 @@ typedef struct sSirMacQosInfoStation { uint8_t acvi_uapsd:1; uint8_t acvo_uapsd:1; #endif -} cdf_packed tSirMacQosInfoStation, *tpSirMacQosInfoStation; +} qdf_packed tSirMacQosInfoStation, *tpSirMacQosInfoStation; typedef struct sSirMacEdcaParamSetIE { uint8_t type; @@ -1146,14 +1146,14 @@ typedef struct sSirMacEdcaParamSetIE { tSirMacEdcaParamRecord acbk; /* background */ tSirMacEdcaParamRecord acvi; /* video */ tSirMacEdcaParamRecord acvo; /* voice */ -} cdf_packed tSirMacEdcaParamSetIE; +} qdf_packed tSirMacEdcaParamSetIE; typedef struct sSirMacQoSParams { uint8_t count; uint16_t limit; uint8_t CWmin[8]; uint8_t AIFS[8]; -} cdf_packed tSirMacQoSParams; +} qdf_packed tSirMacQoSParams; /* ts info direction field can take any of these values */ #define SIR_MAC_DIRECTION_UPLINK 0 @@ -1195,7 +1195,7 @@ typedef struct sSirMacTSInfoTfc { uint16_t userPrio:3; uint16_t ackPolicy:2; #endif -} cdf_packed tSirMacTSInfoTfc; +} qdf_packed tSirMacTSInfoTfc; typedef struct sSirMacTSInfoSch { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1205,12 +1205,12 @@ typedef struct sSirMacTSInfoSch { uint8_t schedule:1; uint8_t rsvd:7; #endif -} cdf_packed tSirMacTSInfoSch; +} qdf_packed tSirMacTSInfoSch; typedef struct sSirMacTSInfo { tSirMacTSInfoTfc traffic; tSirMacTSInfoSch schedule; -} cdf_packed tSirMacTSInfo; +} qdf_packed tSirMacTSInfo; typedef struct sSirMacTspecIE { uint8_t type; @@ -1231,7 +1231,7 @@ typedef struct sSirMacTspecIE { uint32_t minPhyRate; uint16_t surplusBw; uint16_t mediumTime; -} cdf_packed tSirMacTspecIE; +} qdf_packed tSirMacTspecIE; /* frame classifier types */ #define SIR_MAC_TCLASTYPE_ETHERNET 0 @@ -1243,7 +1243,7 @@ typedef struct sSirMacTclasParamEthernet { tSirMacAddr srcAddr; tSirMacAddr dstAddr; uint16_t type; -} cdf_packed tSirMacTclasParamEthernet; +} qdf_packed tSirMacTclasParamEthernet; typedef struct sSirMacTclasParamIPv4 { uint8_t version; @@ -1254,7 +1254,7 @@ typedef struct sSirMacTclasParamIPv4 { uint8_t dscp; uint8_t protocol; uint8_t rsvd; -} cdf_packed tSirMacTclasParamIPv4; +} qdf_packed tSirMacTclasParamIPv4; #define SIR_MAC_TCLAS_IPV4 4 #define SIR_MAC_TCLAS_IPV6 6 @@ -1266,11 +1266,11 @@ typedef struct sSirMacTclasParamIPv6 { uint16_t srcPort; uint16_t dstPort; uint8_t flowLabel[3]; -} cdf_packed tSirMacTclasParamIPv6; +} qdf_packed tSirMacTclasParamIPv6; typedef struct sSirMacTclasParam8021dq { uint16_t tag; -} cdf_packed tSirMacTclasParam8021dq; +} qdf_packed tSirMacTclasParam8021dq; typedef struct sSirMacTclasIE { uint8_t type; @@ -1278,13 +1278,13 @@ typedef struct sSirMacTclasIE { uint8_t userPrio; uint8_t classifierType; uint8_t classifierMask; -} cdf_packed tSirMacTclasIE; +} qdf_packed tSirMacTclasIE; typedef struct sSirMacTsDelayIE { uint8_t type; uint8_t length; uint32_t delay; -} cdf_packed tSirMacTsDelayIE; +} qdf_packed tSirMacTsDelayIE; typedef struct sSirMacScheduleInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1298,7 +1298,7 @@ typedef struct sSirMacScheduleInfo { uint16_t direction:2; uint16_t rsvd:9; #endif -} cdf_packed tSirMacScheduleInfo; +} qdf_packed tSirMacScheduleInfo; typedef struct sSirMacScheduleIE { uint8_t type; @@ -1308,19 +1308,19 @@ typedef struct sSirMacScheduleIE { uint32_t svcInterval; uint16_t maxSvcDuration; uint16_t specInterval; -} cdf_packed tSirMacScheduleIE; +} qdf_packed tSirMacScheduleIE; typedef struct sSirMacQosCapabilityIE { uint8_t type; uint8_t length; tSirMacQosInfo qosInfo; -} cdf_packed tSirMacQosCapabilityIE; +} qdf_packed tSirMacQosCapabilityIE; typedef struct sSirMacQosCapabilityStaIE { uint8_t type; uint8_t length; tSirMacQosInfoStation qosInfo; -} cdf_packed tSirMacQosCapabilityStaIE; +} qdf_packed tSirMacQosCapabilityStaIE; typedef uint32_t tSirMacTimeStamp[2]; @@ -1334,36 +1334,36 @@ typedef uint8_t tSirMacChanNum; typedef struct sSirMacSSidIE { uint8_t type; tSirMacSSid ssId; -} cdf_packed tSirMacSSidIE; +} qdf_packed tSirMacSSidIE; typedef struct sSirMacRateSetIE { uint8_t type; tSirMacRateSet supportedRateSet; -} cdf_packed tSirMacRateSetIE; +} qdf_packed tSirMacRateSetIE; typedef struct sSirMacDsParamSetIE { uint8_t type; uint8_t length; tSirMacChanNum channelNumber; -} cdf_packed tSirMacDsParamSetIE; +} qdf_packed tSirMacDsParamSetIE; typedef struct sSirMacCfParamSetIE { uint8_t type; uint8_t length; tSirMacCfParamSet cfParams; -} cdf_packed tSirMacCfParamSetIE; +} qdf_packed tSirMacCfParamSetIE; typedef struct sSirMacChanInfo { tSirMacChanNum firstChanNum; uint8_t numChannels; int8_t maxTxPower; -} cdf_packed tSirMacChanInfo; +} qdf_packed tSirMacChanInfo; typedef struct sSirMacNonErpPresentIE { uint8_t type; uint8_t length; uint8_t erp; -} cdf_packed tSirMacNonErpPresentIE; +} qdf_packed tSirMacNonErpPresentIE; typedef struct sSirMacPowerCapabilityIE { uint8_t type; @@ -1444,7 +1444,7 @@ typedef struct sSirMacVHTCapabilityInfo { uint32_t txAntPattern:1; uint32_t reserved1:2; #endif -} cdf_packed tSirMacVHTCapabilityInfo; +} qdf_packed tSirMacVHTCapabilityInfo; typedef struct sSirMacVHTTxSupDataRateInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1454,7 +1454,7 @@ typedef struct sSirMacVHTTxSupDataRateInfo { uint16_t txSupDataRate:13; uint16_t reserved:3; #endif -} cdf_packed tSirMacVHTTxSupDataRateInfo; +} qdf_packed tSirMacVHTTxSupDataRateInfo; typedef struct sSirMacVHTRxSupDataRateInfo { #ifndef ANI_LITTLE_BIT_ENDIAN @@ -1464,7 +1464,7 @@ typedef struct sSirMacVHTRxSupDataRateInfo { uint16_t rxSupDataRate:13; uint16_t reserved:3; #endif -} cdf_packed tSirMacVHTRxSupDataRateInfo; +} qdf_packed tSirMacVHTRxSupDataRateInfo; /** * struct sSirVhtMcsInfo - VHT MCS information @@ -1604,7 +1604,7 @@ typedef struct sHtCaps { uint8_t txSoundingPPDUs:1; uint8_t reserved5:1; -} cdf_packed tHtCaps; +} qdf_packed tHtCaps; /* During 11h channel switch, the AP can indicate if the * STA needs to stop the transmission or continue until the @@ -1636,7 +1636,7 @@ typedef struct _BarControl { #endif -} cdf_packed barCtrlType; +} qdf_packed barCtrlType; typedef struct _BARFrmStruct { tSirMacFrameCtl fc; @@ -1645,7 +1645,7 @@ typedef struct _BARFrmStruct { tSirMacAddr txAddr; barCtrlType barControl; tSirMacSeqCtl ssnCtrl; -} cdf_packed BARFrmType; +} qdf_packed BARFrmType; /* Supported MCS set */ #define SIZE_OF_SUPPORTED_MCS_SET 16 @@ -1727,7 +1727,7 @@ typedef struct sSirMacHTCapabilityInfo { uint16_t stbcControlFrame:1; uint16_t lsigTXOPProtection:1; #endif -} cdf_packed tSirMacHTCapabilityInfo; +} qdf_packed tSirMacHTCapabilityInfo; /* HT Parameters Info */ typedef struct sSirMacHTParametersInfo { @@ -1740,7 +1740,7 @@ typedef struct sSirMacHTParametersInfo { uint8_t mpduDensity:3; uint8_t reserved:3; #endif -} cdf_packed tSirMacHTParametersInfo; +} qdf_packed tSirMacHTParametersInfo; /* Extended HT Capabilities Info */ typedef struct sSirMacExtendedHTCapabilityInfo { @@ -1757,7 +1757,7 @@ typedef struct sSirMacExtendedHTCapabilityInfo { uint16_t mcsFeedback:2; uint16_t reserved2:6; #endif -} cdf_packed tSirMacExtendedHTCapabilityInfo; +} qdf_packed tSirMacExtendedHTCapabilityInfo; /* IEEE 802.11n/D7.0 - 7.3.2.57.4 */ /* Part of the "supported MCS set field" */ @@ -1769,7 +1769,7 @@ typedef struct sSirMacRxHighestSupportRate { uint16_t rate:10; uint16_t reserved:6; #endif -} cdf_packed tSirMacRxHighestSupportRate, *tpSirMacRxHighestSupportRate; +} qdf_packed tSirMacRxHighestSupportRate, *tpSirMacRxHighestSupportRate; /* Transmit Beam Forming Capabilities Info */ typedef struct sSirMacTxBFCapabilityInfo { @@ -1811,7 +1811,7 @@ typedef struct sSirMacTxBFCapabilityInfo { uint32_t compressedSteeringMatrixBFAntennae:2; uint32_t reserved:7; #endif -} cdf_packed tSirMacTxBFCapabilityInfo; +} qdf_packed tSirMacTxBFCapabilityInfo; /* Antenna Selection Capability Info */ typedef struct sSirMacASCapabilityInfo { @@ -1834,7 +1834,7 @@ typedef struct sSirMacASCapabilityInfo { uint8_t txSoundingPPDUs:1; uint8_t reserved2:1; #endif -} cdf_packed tSirMacASCapabilityInfo; +} qdf_packed tSirMacASCapabilityInfo; /* Additional HT IE Field1 */ typedef struct sSirMacHTInfoField1 { @@ -1851,7 +1851,7 @@ typedef struct sSirMacHTInfoField1 { uint8_t controlledAccessOnly:1; uint8_t serviceIntervalGranularity:3; #endif -} cdf_packed tSirMacHTInfoField1; +} qdf_packed tSirMacHTInfoField1; /* Additional HT IE Field2 */ typedef struct sSirMacHTInfoField2 { @@ -1868,7 +1868,7 @@ typedef struct sSirMacHTInfoField2 { uint16_t obssNonHTStaPresent:1; /*added for Obss */ uint16_t reserved:11; #endif -} cdf_packed tSirMacHTInfoField2; +} qdf_packed tSirMacHTInfoField2; /* Additional HT IE Field3 */ typedef struct sSirMacHTInfoField3 { @@ -1889,13 +1889,13 @@ typedef struct sSirMacHTInfoField3 { uint16_t pcoPhase:1; uint16_t reserved:4; #endif -} cdf_packed tSirMacHTInfoField3; +} qdf_packed tSirMacHTInfoField3; typedef struct sSirMacProbeReqFrame { tSirMacSSidIE ssIdIE; tSirMacRateSetIE rateSetIE; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacProbeReqFrame, *tpSirMacProbeReqFrame; +} qdf_packed tSirMacProbeReqFrame, *tpSirMacProbeReqFrame; typedef struct sSirMacProbeRspFrame { tSirMacTimeStamp ts; @@ -1907,7 +1907,7 @@ typedef struct sSirMacProbeRspFrame { tSirMacNonErpPresentIE nonErpPresent; tSirMacDsParamSetIE dsParamsIE; tSirMacCfParamSetIE cfParamsIE; -} cdf_packed tSirMacProbeRspFrame, *tpSirMacProbeRspFrame; +} qdf_packed tSirMacProbeRspFrame, *tpSirMacProbeRspFrame; typedef struct sSirMacAuthFrameBody { uint16_t authAlgoNumber; @@ -1916,11 +1916,11 @@ typedef struct sSirMacAuthFrameBody { uint8_t type; /* = SIR_MAC_CHALLENGE_TEXT_EID */ uint8_t length; /* = SIR_MAC_AUTH_CHALLENGE_LENGTH */ uint8_t challengeText[SIR_MAC_AUTH_CHALLENGE_LENGTH]; -} cdf_packed tSirMacAuthFrameBody, *tpSirMacAuthFrameBody; +} qdf_packed tSirMacAuthFrameBody, *tpSirMacAuthFrameBody; typedef struct sSirMacAuthenticationFrame { tSirMacAuthFrameBody authFrameBody; -} cdf_packed tSirMacAuthFrame, *tpSirMacAuthFrame; +} qdf_packed tSirMacAuthFrame, *tpSirMacAuthFrame; typedef struct sSirMacAssocReqFrame { tSirMacCapabilityInfo capabilityInfo; @@ -1928,7 +1928,7 @@ typedef struct sSirMacAssocReqFrame { tSirMacSSidIE ssIdIE; tSirMacRateSetIE rateSetIE; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacAssocReqFrame, *tpSirMacAssocReqFrame; +} qdf_packed tSirMacAssocReqFrame, *tpSirMacAssocReqFrame; typedef struct sSirMacAssocRspFrame { tSirMacCapabilityInfo capabilityInfo; @@ -1936,26 +1936,26 @@ typedef struct sSirMacAssocRspFrame { uint16_t aid; tSirMacRateSetIE supportedRates; tSirMacRateSetIE extendedRateSetIE; -} cdf_packed tSirMacAssocRspFrame, *tpSirMacAssocRspFrame; +} qdf_packed tSirMacAssocRspFrame, *tpSirMacAssocRspFrame; typedef struct sSirMacDisassocFrame { uint16_t reasonCode; -} cdf_packed tSirMacDisassocFrame, *tpSirMacDisassocFrame; +} qdf_packed tSirMacDisassocFrame, *tpSirMacDisassocFrame; typedef struct sDSirMacDeauthFrame { uint16_t reasonCode; -} cdf_packed tSirMacDeauthFrame, *tpSirMacDeauthFrame; +} qdf_packed tSirMacDeauthFrame, *tpSirMacDeauthFrame; /* / Common header for all action frames */ typedef struct sSirMacActionFrameHdr { uint8_t category; uint8_t actionID; -} cdf_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr; +} qdf_packed tSirMacActionFrameHdr, *tpSirMacActionFrameHdr; typedef struct sSirMacVendorSpecificFrameHdr { uint8_t category; uint8_t Oui[4]; -} cdf_packed tSirMacVendorSpecificFrameHdr, +} qdf_packed tSirMacVendorSpecificFrameHdr, *tpSirMacVendorSpecificFrameHdr; typedef struct sSirMacVendorSpecificPublicActionFrameHdr { @@ -1964,7 +1964,7 @@ typedef struct sSirMacVendorSpecificPublicActionFrameHdr { uint8_t Oui[4]; uint8_t OuiSubType; uint8_t dialogToken; -} cdf_packed tSirMacVendorSpecificPublicActionFrameHdr, +} qdf_packed tSirMacVendorSpecificPublicActionFrameHdr, *tpSirMacVendorSpecificPublicActionFrameHdr; typedef struct sSirMacP2PActionFrameHdr { @@ -1972,7 +1972,7 @@ typedef struct sSirMacP2PActionFrameHdr { uint8_t Oui[4]; uint8_t OuiSubType; uint8_t dialogToken; -} cdf_packed tSirMacP2PActionFrameHdr, *tpSirMacP2PActionFrameHdr; +} qdf_packed tSirMacP2PActionFrameHdr, *tpSirMacP2PActionFrameHdr; typedef struct sSirMacMeasActionFrameHdr { uint8_t category; diff --git a/core/mac/inc/sir_types.h b/core/mac/inc/sir_types.h index 84032abae6e1..9580745ebb5f 100644 --- a/core/mac/inc/sir_types.h +++ b/core/mac/inc/sir_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -36,7 +36,7 @@ #ifndef __SIR_TYPES_H #define __SIR_TYPES_H -#include "cdf_types.h" +#include /** ------------------------------------------------------------------------ * diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index 97ee82f9fc83..ebc8506be4e4 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1821,7 +1821,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg) /* Use type[7:0] as index to function table */ index = CFG_GET_FUNC_INDX(pMsg->type); - if (index >= CDF_ARRAY_SIZE(g_cfg_func)) { + if (index >= QDF_ARRAY_SIZE(g_cfg_func)) { cdf_mem_free(pMsg); return; } @@ -2490,7 +2490,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) uint32_t index; uint8_t *pDstTest, *pSrcTest; uint8_t len; - cfgstatic_string *pStrCfg; + cfgstatic_string * pStrCfg; uint32_t bufStart, bufEnd; uint32_t logLevel, retVal; uint32_t iCount = 0; @@ -2499,7 +2499,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) for (i = 0; i < CFG_PARAM_MAX_NUM ; i++) { if ((cfg_static[i].control & CFG_CTL_VALID) != 0) { if (!(cfg_static[i].control & CFG_CTL_INT)) { - pStrCfg = (cfgstatic_string *)cfg_static[i]. + pStrCfg = (cfgstatic_string*)cfg_static[i]. pStrData; if (pStrCfg == NULL) { PELOGE(cfg_log(pMac, LOGE, @@ -2552,7 +2552,7 @@ process_cfg_download_req(tpAniSirGlobal pMac) continue; pDstTest = &pMac->cfg.gCfgSBuf[index]; - pStrCfg = (cfgstatic_string *)cfg_static[i].pStrData; + pStrCfg = (cfgstatic_string*)cfg_static[i].pStrData; pSrcTest = pStrCfg->data; if ((pDstTest == NULL) || (pStrCfg == NULL) || (pSrcTest == NULL)) diff --git a/core/mac/src/include/cfg_api.h b/core/mac/src/include/cfg_api.h index b6ed90796e01..2240dd482293 100644 --- a/core/mac/src/include/cfg_api.h +++ b/core/mac/src/include/cfg_api.h @@ -57,7 +57,7 @@ typedef enum eCfgStatusTypes { /* WEP key mapping table row structure */ typedef struct { - uint8_t keyMappingAddr[CDF_MAC_ADDR_SIZE]; + uint8_t keyMappingAddr[QDF_MAC_ADDR_SIZE]; uint32_t wepOn; uint8_t key[SIR_MAC_KEY_LENGTH]; uint32_t status; diff --git a/core/mac/src/include/dph_global.h b/core/mac/src/include/dph_global.h index 30a8e2903b07..f10e6cba9bad 100644 --- a/core/mac/src/include/dph_global.h +++ b/core/mac/src/include/dph_global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -224,9 +224,9 @@ typedef struct sDphHashNode { uint16_t pmfSaQueryCurrentTransId; uint16_t pmfSaQueryStartTransId; TX_TIMER pmfSaQueryTimer; - v_TIME_t last_unprot_deauth_disassoc; + unsigned long last_unprot_deauth_disassoc; uint8_t proct_deauh_disassoc_cnt; - v_TIME_t last_assoc_received_time; + unsigned long last_assoc_received_time; #endif uint8_t htLdpcCapable; uint8_t vhtLdpcCapable; diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h index 09ed064abbc6..95dfa3730dfb 100644 --- a/core/mac/src/pe/include/lim_ft_defs.h +++ b/core/mac/src/pe/include/lim_ft_defs.h @@ -93,7 +93,7 @@ typedef struct sSirFTUpdateKeyInfo { uint16_t messageType; uint16_t length; uint32_t smeSessionId; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirKeyMaterial keyMaterial; } tSirFTUpdateKeyInfo, *tpSirFTUpdateKeyInfo; diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 8ee02bc3c708..657518f808b7 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -300,7 +300,7 @@ struct tLimScanResultNode { /* OEM Data related structure definitions */ typedef struct sLimMlmOemDataReq { - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; uint8_t data_len; uint8_t *data; } tLimMlmOemDataReq, *tpLimMlmOemDataReq; @@ -325,7 +325,7 @@ typedef struct tLimPreAuthNode { uint8_t rsvd:5; TX_TIMER timer; uint16_t seq_num; - v_TIME_t timestamp; + unsigned long timestamp; } tLimPreAuthNode, *tpLimPreAuthNode; /* Pre-authentication table definition */ @@ -570,7 +570,7 @@ typedef struct sLimTspecInfo { uint8_t tclasProc; /* tclassProc is valid only if this is set to 1. */ uint8_t tclasProcPresent:1; -} cdf_packed tLimTspecInfo, *tpLimTspecInfo; +} qdf_packed tLimTspecInfo, *tpLimTspecInfo; typedef struct sLimAdmitPolicyInfo { /* admit control policy type */ diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index a38f2f9239be..ba0332f93b4f 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -275,7 +275,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint32_t lim11hEnable; int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */ - enum tCDF_ADAPTER_MODE pePersona; + enum tQDF_ADAPTER_MODE pePersona; #if defined WLAN_FEATURE_VOWIFI int8_t txMgmtPower; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index fc694a5eead4..cd5689c24370 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -68,7 +68,7 @@ #endif #include -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #include "cds_utils.h" #include "sys_startup.h" @@ -655,13 +655,13 @@ void lim_cleanup(tpAniSirGlobal pMac) struct mgmt_frm_reg_info *pLimMgmtRegistration = NULL; - if (CDF_GLOBAL_FTM_MODE != cds_get_conparam()) { + if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) { cdf_mutex_acquire(&pMac->lim.lim_frame_register_lock); while (qdf_list_remove_front( &pMac->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &pLimMgmtRegistration) == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Fixing leak! Deallocating pLimMgmtRegistration node")); cdf_mem_free(pLimMgmtRegistration); } @@ -1001,7 +1001,7 @@ QDF_STATUS pe_handle_mgmt_frame(void *p_cds_gctx, void *cds_buff) return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { /* cannot log a failure without a valid pMac */ cds_pkt_return_packet(pVosPkt); @@ -1601,7 +1601,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, pBeacon->ssId.length + 1; cdf_mem_copy(apNewCaps.bssId.bytes, - psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + psessionEntry->bssId, QDF_MAC_ADDR_SIZE); if (newChannel != psessionEntry->currentOperChannel) { PELOGE(lim_log (pMac, LOGE, @@ -1857,16 +1857,16 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, if (roam_offload_synch_ind_ptr->beaconProbeRespLength <= SIR_MAC_HDR_LEN_3A) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very" + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very" "few bytes in synchInd beacon / probe resp frame! length=%d", __func__, roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "LFR3:Beacon/Prb Rsp:%d", roam_offload_synch_ind_ptr->isBeacon); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, bcn_proberesp_ptr, roam_offload_synch_ind_ptr->beaconProbeRespLength); if (roam_offload_synch_ind_ptr->isBeacon) { if (sir_parse_beacon_ie(pMac, parsed_frm_ptr, @@ -1875,7 +1875,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Parse error Beacon, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1887,7 +1887,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A, parsed_frm_ptr) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Parse error ProbeResponse, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1969,11 +1969,11 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (uint8_t *)parsed_frm_ptr->mdie, SIR_MDIE_SIZE); } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:%s:BssDescr Info:", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, bss_desc_ptr->bssId, sizeof(tSirMacAddr)); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "chan=%d, rssi=%d", bss_desc_ptr->channelId, bss_desc_ptr->rssi); if (ie_len) { @@ -2104,7 +2104,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, mac_ctx->roam.reassocRespLen); lim_log(mac_ctx, LOG1, FL("LFR3:the reassoc resp frame data:")); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, mac_ctx->roam.pReassocResp, mac_ctx->roam.reassocRespLen); ft_session_ptr->bRoamSynchInProgress = true; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index e9cdcd7c155a..d8dae1f1b803 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -60,7 +60,7 @@ #endif #include "lim_session.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wma_types.h" #include "lim_types.h" @@ -681,7 +681,7 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs, * Return: None */ void -lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, +lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext, tSirResultCodes statusCode, tpPESession psessionEntry) { @@ -735,7 +735,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, mlmStaContext.cleanupTrigger); cdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, - (uint8_t *) sta_dsaddr.bytes, CDF_MAC_ADDR_SIZE); + (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmDisassocCnf.resultCode = statusCode; mlmDisassocCnf.disassocTrigger = mlmStaContext.cleanupTrigger; /* Update PE session Id */ @@ -775,7 +775,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, FL("Lim Posting PURGE_STA_IND to Sme. Trigger: %d"), mlmStaContext.cleanupTrigger); cdf_mem_copy((uint8_t *) &mlmPurgeStaInd.peerMacAddr, - (uint8_t *) sta_dsaddr.bytes, CDF_MAC_ADDR_SIZE); + (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmPurgeStaInd.reasonCode = (uint8_t) mlmStaContext.disassocReason; mlmPurgeStaInd.aid = staDsAssocId; @@ -1547,10 +1547,10 @@ tSirRetStatus lim_populate_vht_mcs_set(tpAniSirGlobal mac_ctx, return eSIR_SUCCESS; rates->vhtTxHighestDataRate = - CDF_MIN(rates->vhtTxHighestDataRate, + QDF_MIN(rates->vhtTxHighestDataRate, peer_vht_caps->txSupDataRate); rates->vhtRxHighestDataRate = - CDF_MIN(rates->vhtRxHighestDataRate, + QDF_MIN(rates->vhtRxHighestDataRate, peer_vht_caps->rxHighSupDataRate); if (mac_ctx->roam.configParam.enable2x2) { @@ -2816,7 +2816,7 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, msg_q.bodyptr = add_sta_params; msg_q.bodyval = 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "Sending WMA_ADD_STA_REQ (aid %d)", add_sta_params->assocId); MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId, @@ -3090,7 +3090,7 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, lim_log(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL")); pAddStaParams->listenInterval = (uint16_t) listenInterval; - if (CDF_P2P_CLIENT_MODE == psessionEntry->pePersona) { + if (QDF_P2P_CLIENT_MODE == psessionEntry->pePersona) { pAddStaParams->p2pCapableSta = 1; } @@ -3393,7 +3393,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, lim_deactivate_and_change_timer(mac_ctx, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); - if (CDF_P2P_CLIENT_MODE == session_entry->pePersona && + if (QDF_P2P_CLIENT_MODE == session_entry->pePersona && beacon_probe_rsp->P2PProbeRes.NoticeOfAbsence.present) { noa_duration_from_beacon = (uint32_t *) @@ -4218,7 +4218,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, /* update persona */ pAddBssParams->halPersona = (uint8_t) psessionEntry->pePersona; - if (CDF_P2P_CLIENT_MODE == psessionEntry->pePersona) + if (QDF_P2P_CLIENT_MODE == psessionEntry->pePersona) pAddBssParams->staContext.p2pCapableSta = 1; pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; @@ -4841,7 +4841,7 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry) { uint16_t staDsAssocId = 0; - struct cdf_mac_addr sta_dsaddr; + struct qdf_mac_addr sta_dsaddr; tLimMlmStaContext mlmStaContext; if (pStaDs == NULL) { @@ -4850,7 +4850,7 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, } staDsAssocId = pStaDs->assocId; cdf_mem_copy((uint8_t *) sta_dsaddr.bytes, - pStaDs->staAddr, CDF_MAC_ADDR_SIZE); + pStaDs->staAddr, QDF_MAC_ADDR_SIZE); mlmStaContext = pStaDs->mlmStaContext; if (LIM_IS_AP_ROLE(psessionEntry) || diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index fe9a393759e6..8b6df1cf5d82 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -68,7 +68,7 @@ tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, tpSirSupportedRates pRates, @@ -83,7 +83,7 @@ tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, @@ -101,7 +101,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac, tSirMacRateSet *pExtRateSet, uint8_t *pSupportedMCSSet, tpPESession psessionEntry, - tDot11fIEVHTCaps *pVHTCaps); + tDot11fIEVHTCaps * pVHTCaps); #else tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal, tpDphHashNode, @@ -134,7 +134,7 @@ void lim_post_reassoc_failure(tpAniSirGlobal, tSirResultCodes, uint16_t, tpPESession); bool lim_is_reassoc_in_progress(tpAniSirGlobal, tpPESession); void -lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct cdf_mac_addr sta_dsaddr, +lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext, tSirResultCodes statusCode, tpPESession psessionEntry); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 8941504ba4a9..b0c042ce038a 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -125,7 +125,7 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry if (pReAssocSessionEntry->valid && pReAssocSessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Deleting Preauth session(%d)"), pReAssocSessionEntry->peSessionId); @@ -941,7 +941,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, lim_get_max_tx_power(regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap); #else - pftSessionEntry->maxTxPower = CDF_MIN(regMax, (localPowerConstraint)); + pftSessionEntry->maxTxPower = QDF_MIN(regMax, (localPowerConstraint)); #endif lim_log(pMac, LOG1, diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index 4d674fd8c568..9a4a436db4a7 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1179,7 +1179,7 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, sizeof(uint8_t) + pBeacon->ssId.length + 1; cdf_mem_set((void *)&newBssInfo, sizeof(newBssInfo), 0); - cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, QDF_MAC_ADDR_SIZE); newBssInfo.channelNumber = (tSirMacChanNum) pAddBss->currentOperChannel; cdf_mem_copy((uint8_t *) &newBssInfo.ssId, (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1); @@ -1354,7 +1354,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, * we set IBSS state to inactive. */ if (0 == pMac->lim.gLimNumIbssPeers) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "Last STA from IBSS walked out"); psessionEntry->limIbssActive = false; } diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index f7ed04f2723d..8ef95ccd3c25 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -70,7 +70,7 @@ /**----------------------------------------------------------------- \fn lim_stop_tx_and_switch_channel \brief Stops the transmission if channel switch mode is silent and - starts the channel switch timer. + starts the channel switch timer. \param pMac \return NONE @@ -124,8 +124,8 @@ void lim_stop_tx_and_switch_channel(tpAniSirGlobal pMac, uint8_t sessionId) /**------------------------------------------------------------ \fn lim_start_channel_switch \brief Switches the channel if switch count == 0, otherwise - starts the timer for channel switch and stops BG scan - and heartbeat timer tempororily. + starts the timer for channel switch and stops BG scan + and heartbeat timer tempororily. \param pMac \param psessionEntry @@ -1141,10 +1141,9 @@ __lim_process_basic_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log (pMac, LOGE, FL("fail to send Basic Meas report ")); ) @@ -1156,10 +1155,9 @@ __lim_process_cca_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log(pMac, LOGE, FL("fail to send CCA Meas report "));) return; } @@ -1169,10 +1167,9 @@ __lim_process_rpi_meas_req(tpAniSirGlobal pMac, tpSirMacMeasReqActionFrame pMeasReqFrame, tSirMacAddr peerMacAddr, tpPESession psessionEntry) { - if (lim_send_meas_report_frame(pMac, - pMeasReqFrame, - peerMacAddr, psessionEntry) != eSIR_SUCCESS) - { + if (lim_send_meas_report_frame(pMac, pMeasReqFrame, + peerMacAddr, psessionEntry) != + eSIR_SUCCESS) { PELOGE(lim_log(pMac, LOGE, FL("fail to send RPI Meas report "));) return; } @@ -1607,7 +1604,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac, pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("SA Query Response received...")); /* When a station, supplicant handles SA Query Response. @@ -2053,7 +2050,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("Public Action TDLS Discovery RSP ..")); lim_send_sme_mgmt_frame_ind(mac_ctx, mac_hdr->fc.subType, (uint8_t *) mac_hdr, diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index aa7cf8db3487..aa5b4eb73957 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ #include "cds_packet.h" #include "lim_session_utils.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_utils.h" /** @@ -167,7 +167,7 @@ void lim_check_sta_in_pe_entries(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr) for (i = 0; i < pMac->lim.maxBssId; i++) { if ((&pMac->lim.gpSession[i] != NULL) && (pMac->lim.gpSession[i].valid) && - (pMac->lim.gpSession[i].pePersona == CDF_SAP_MODE)) { + (pMac->lim.gpSession[i].pePersona == QDF_SAP_MODE)) { psessionEntry = &pMac->lim.gpSession[i]; pStaDs = dph_lookup_hash_entry(pMac, pHdr->sa, &assocId, @@ -394,10 +394,9 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } lim_copy_u16((uint8_t *) &localCapabilities, temp); - if (lim_compare_capabilities(pMac, - pAssocReq, - &localCapabilities, psessionEntry) == false) - { + if (lim_compare_capabilities(pMac, pAssocReq, + &localCapabilities, psessionEntry) == + false) { lim_log(pMac, LOGE, FL("local caps mismatch received caps")); lim_log(pMac, LOGE, FL("Received %s Req with unsupported " "capabilities from" MAC_ADDRESS_STR), @@ -482,8 +481,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, if (LIM_IS_AP_ROLE(psessionEntry) && (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) && - (pAssocReq->HTCaps.present)) - { + (pAssocReq->HTCaps.present)) { lim_log(pMac, LOGE, FL("SOFTAP was in 11G only mode, rejecting legacy " "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHdr->sa)); @@ -721,16 +719,13 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, if (SIR_MAC_OUI_VERSION_1 == Dot11fIERSN.version) { /* check the groupwise and pairwise cipher suites */ - if (eSIR_SUCCESS != - (status = - lim_check_rx_rsn_ie_match(pMac, - Dot11fIERSN, - psessionEntry, - pAssocReq-> - HTCaps. - present, - &pmfConnection))) - { + status = lim_check_rx_rsn_ie_match(pMac, + Dot11fIERSN, + psessionEntry, + pAssocReq-> + HTCaps.present, + &pmfConnection); + if (eSIR_SUCCESS != status) { lim_log(pMac, LOGE, FL("RSN Mismatch." "Rejecting Re/Assoc req from " @@ -795,14 +790,13 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pAssocReq->wpa.length, &Dot11fIEWPA); /* check the groupwise and pairwise cipher suites */ - if (eSIR_SUCCESS != - (status = - lim_check_rx_wpa_ie_match(pMac, - Dot11fIEWPA, - psessionEntry, - pAssocReq-> - HTCaps. - present))) { + status = lim_check_rx_wpa_ie_match(pMac, + Dot11fIEWPA, + psessionEntry, + pAssocReq-> + HTCaps. + present); + if (eSIR_SUCCESS != status) { lim_log(pMac, LOGW, FL("WPA IE mismatch" "Rejecting Re/Assoc req from " diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 1723a7b9d457..fadc5edd82e1 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -292,7 +292,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, if (pMlmDisassocReq && cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDisassocReq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for disassoc frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -306,7 +306,7 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, if (pMlmDeauthReq && cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDeauthReq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for deauth frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -1104,7 +1104,7 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info); /* Restore default failure timeout */ - if (CDF_P2P_CLIENT_MODE == pe_session->pePersona && + if (QDF_P2P_CLIENT_MODE == pe_session->pePersona && pe_session->defaultAuthFailureTimeout) { lim_log(mac_ctx, LOG1, FL("Restore default failure timeout")); cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index aa8f16ceabaf..70e16b1c2a76 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -65,7 +65,7 @@ #include "lim_ft.h" #endif -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #include "cdf_memory.h" @@ -261,7 +261,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) { /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -316,7 +316,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) ) /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -426,7 +426,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->ap.ssid[frame->ssId.length] = '\0'; cdf_mem_copy((uint8_t *) &result->ap.bssid.bytes, (uint8_t *) hdr->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Copy IE fields */ cdf_mem_copy((uint8_t *) &result->ap.ieData, body + SIR_MAC_B_PR_SSID_OFFSET, ie_len); @@ -598,12 +598,12 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer); if (lim_is_group_addr(mac_hdr->addr2)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, FL("Ignoring A2 Invalid Packet received for MC/BC:")); lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2); return; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("type=0x%x, subtype=0x%x"), mac_hdr->fc.type, mac_hdr->fc.subType); /* Currently only following type and subtype are handled. @@ -663,7 +663,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, if ((type == SIR_MAC_MGMT_FRAME) && (fc.type == SIR_MAC_MGMT_FRAME) && (sub_type == SIR_MAC_MGMT_RESERVED15)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, FL ("rcvd frm match for SIR_MAC_MGMT_RESERVED15")); match = true; @@ -695,7 +695,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, } if (match) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("rcvd frame match with registered frame params")); /* Indicate this to SME */ lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType, @@ -761,7 +761,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"), fc.protVer, fc.type, fc.subType, WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo)); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr, WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo)); #endif if (pMac->fEnableDebugLog & 0x1) { @@ -1218,7 +1218,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) */ if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { if (!(mac_ctx->lim.deferredMsgCnt & 0xF)) - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); lim_print_msg_name(mac_ctx, LOGE, msg->type); @@ -1280,10 +1280,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg); if (defer_msg == true) { - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("Defer Msg type=%x"), msg->type); if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGE, + CDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); cds_pkt_return_packet(body_ptr); @@ -1402,7 +1402,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) for (i = 0; i < mac_ctx->lim.maxBssId; i++) { session_entry = &mac_ctx->lim.gpSession[i]; if ((session_entry != NULL) && (session_entry->valid) && - (session_entry->pePersona == CDF_P2P_GO_MODE)) { + (session_entry->pePersona == QDF_P2P_GO_MODE)) { /* Save P2P NOA start attribute for Go persona*/ p2p_go_exists = 1; cdf_mem_copy(&session_entry->p2pGoPsNoaStartInd, @@ -1410,7 +1410,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_status = session_entry->p2pGoPsNoaStartInd.status; if (qdf_status != QDF_STATUS_SUCCESS) - CDF_TRACE(CDF_MODULE_ID_PE, LOGW, + CDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO NOA start status %d by FW"), qdf_status); @@ -1419,7 +1419,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } if (p2p_go_exists == 0) - CDF_TRACE(CDF_MODULE_ID_PE, LOGW, + CDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO is removed by the time NOA start recvd")); @@ -1470,7 +1470,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session_entry = &mac_ctx->lim.gpSession[i]; if ((session_entry != NULL) && (session_entry->valid) && (session_entry->pePersona == - CDF_P2P_GO_MODE)) { /* Save P2P attr for Go */ + QDF_P2P_GO_MODE)) { /* Save P2P attr for Go */ cdf_mem_copy( &session_entry->p2pGoPsUpdate, msg->bodyptr, @@ -1600,7 +1600,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_HAL_TDLS_SHOULD_DISCOVER: case SIR_HAL_TDLS_SHOULD_TEARDOWN: case SIR_HAL_TDLS_PEER_DISCONNECTED: - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, ("%s received tdls event: 0x%x"), __func__, msg->type); lim_send_sme_tdls_event_notify(mac_ctx, msg->type, (void *)msg->bodyptr); @@ -2080,10 +2080,10 @@ void lim_log_session_states(tpAniSirGlobal mac_ctx) for (i = 0; i < mac_ctx->lim.maxBssId; i++) { if (mac_ctx->lim.gpSession[i].valid) { - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("sysRole(%d) Session (%d)"), mac_ctx->lim.gLimSystemRole, i); - CDF_TRACE(CDF_MODULE_ID_PE, LOG1, + CDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"), lim_sme_state_str( mac_ctx->lim.gpSession[i].limSmeState), diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 649402b4aeda..8bc3232a265e 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -571,7 +571,7 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, sta_param->lsigTxopProtection, sta_param->fDsssCckMode40Mhz, sta_param->fShortGI20Mhz, sta_param->fShortGI40Mhz); - if (CDF_P2P_GO_MODE == session_entry->pePersona) + if (QDF_P2P_GO_MODE == session_entry->pePersona) sta_param->p2pCapableSta = 1; } @@ -1581,7 +1581,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, QDF_STATUS suspend_status, uint32_t *msg) { uint16_t aid; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; tpDphHashNode stads; tLimMlmDisassocReq *mlm_disassocreq; tLimMlmDisassocCnf mlm_disassoccnf; @@ -1613,7 +1613,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, session->limMlmState, MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); - cdf_mem_copy(curr_bssid.bytes, session->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -1759,7 +1759,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, end: cdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr, (uint8_t *) mlm_disassocreq->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mlm_disassoccnf.aid = mlm_disassocreq->aid; mlm_disassoccnf.disassocTrigger = mlm_disassocreq->disassocTrigger; @@ -1794,10 +1794,10 @@ bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx, deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; if ((disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) || + QDF_MAC_ADDR_SIZE))) || (deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)))) { + QDF_MAC_ADDR_SIZE)))) { PELOG1(lim_log(mac_ctx, LOG1, FL("Disassoc/Deauth ack pending"));) return true; @@ -1828,7 +1828,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, if (mlm_disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &mlm_disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) { + QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { lim_process_disassoc_ack_timeout(mac_ctx); } else { @@ -1847,7 +1847,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, if (mlm_deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, (uint8_t *) &mlm_deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE))) { + QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { lim_process_deauth_ack_timeout(mac_ctx); } else { @@ -1973,7 +1973,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, case eLIM_MLM_WT_ASSOC_RSP_STATE: case eLIM_MLM_LINK_ESTABLISHED_STATE: if (!cdf_mem_compare(mlm_deauth_req->peer_macaddr.bytes, - curr_bssId, CDF_MAC_ADDR_SIZE)) { + curr_bssId, QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("received MLM_DEAUTH_REQ with invalid BSS id " "Peer MAC: "MAC_ADDRESS_STR @@ -2011,7 +2011,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, cdf_mem_copy(sme_deauth_rsp->peer_macaddr.bytes, mlm_deauth_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msg_buf = (uint32_t *)sme_deauth_rsp; @@ -2233,7 +2233,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) uint16_t aid; uint16_t sta_idx = 0; uint32_t default_key_id = 0; - struct cdf_mac_addr curr_bssid; + struct qdf_mac_addr curr_bssid; tpDphHashNode sta_ds; tLimMlmSetKeysReq *mlm_set_keys_req; tLimMlmSetKeysCnf mlm_set_keys_cnf; @@ -2261,7 +2261,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_set_keys_req->aid, mlm_set_keys_req->edType, mlm_set_keys_req->numKeys); lim_print_mac_addr(mac_ctx, mlm_set_keys_req->peer_macaddr.bytes, LOGW); - cdf_mem_copy(curr_bssid.bytes, session->bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -2647,7 +2647,7 @@ static void lim_process_auth_failure_timeout(tpAniSirGlobal mac_ctx) * Failure timeout. Issue MLM auth confirm with timeout reason * code. Restore default failure timeout */ - if (CDF_P2P_CLIENT_MODE == session->pePersona + if (QDF_P2P_CLIENT_MODE == session->pePersona && session->defaultAuthFailureTimeout) cfg_set_int(mac_ctx, WNI_CFG_AUTHENTICATE_FAILURE_TIMEOUT, diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 03c3c601235c..ea57afd4322b 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -302,7 +302,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf) (cds_get_channel_state(channelId) != CHANNEL_STATE_DFS))) { /* Configure beacon and send beacons to HAL */ - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -840,7 +840,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->bRoamSynchInProgress) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress")); session->bRoamSynchInProgress = false; } @@ -850,7 +850,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) lim_mlm_reassoc_cnf->resultCode); if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) { /* Successful Reassociation */ - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("*** Reassociated with new BSS ***")); session->limSmeState = eLIM_SME_LINK_EST_STATE; @@ -2752,7 +2752,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, psessionEntry); #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:Do not activate timer and dont send the reassoc req"); } #endif @@ -2876,7 +2876,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (psessionEntry->bRoamSynchInProgress) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp"); lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp, LIM_REASSOC, psessionEntry); @@ -2976,7 +2976,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, goto end; #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session_entry->bRoamSynchInProgress) - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "LFR3:lim_process_sta_mlm_add_bss_rsp"); #endif @@ -3572,7 +3572,7 @@ static void lim_process_switch_channel_join_req( session_entry->pLimJoinReq->addIEScan.length, session_entry->pLimJoinReq->addIEScan.addIEdata); - if (session_entry->pePersona == CDF_P2P_CLIENT_MODE) { + if (session_entry->pePersona == QDF_P2P_CLIENT_MODE) { /* Activate Join Periodic Probe Req timer */ if (tx_timer_activate (&mac_ctx->lim.limTimers.gLimPeriodicJoinProbeReqTimer) @@ -4096,7 +4096,7 @@ void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry) } cdf_mem_set(pBeaconGenParams, sizeof(*pBeaconGenParams), 0); cdf_mem_copy((void *)pBeaconGenParams->bssId, - (void *)psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + (void *)psessionEntry->bssId, QDF_MAC_ADDR_SIZE); limMsg.bodyptr = pBeaconGenParams; sch_process_pre_beacon_ind(pMac, &limMsg); return; @@ -4131,8 +4131,8 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId) msg.bodyval = sessionId; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA", __func__); } @@ -4154,7 +4154,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) { tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId, pScanEvent->requestor); switch (pScanEvent->event) { @@ -4212,7 +4212,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) case SCAN_EVENT_DEQUEUED: case SCAN_EVENT_PREEMPTED: default: - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, "Received unhandled scan event %u", pScanEvent->event); } diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 6e45cd54057b..2812253e6fb5 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -71,7 +71,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, * @return None */ -void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, +void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, uint8_t *uuid_e, eWPSPBCOverlap *overlap, tpPESession session) { @@ -80,7 +80,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, uint32_t cur_time; cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() / - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); cdf_zero_macaddr(&addr); cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); for (pbc = session->pAPWPSPBCSession; pbc; pbc = pbc->next) { @@ -105,7 +105,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct cdf_mac_addr addr, lim_log(mac_ctx, LOGE, FL("overlap = %d"), *overlap); sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, addr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOGE, uuid_e, SIR_WPS_UUID_LEN); return; @@ -152,7 +152,7 @@ static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac, * * Return: none */ -void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct cdf_mac_addr remove_mac, +void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac, tpPESession session_entry) { tSirWPSPBCSession *pbc, *prev = NULL; @@ -205,7 +205,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, curTime = (uint32_t) (cdf_mc_timer_get_system_ticks() / - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); PELOG4(lim_log (pMac, LOG4, FL("Receive WPS probe reques curTime=%d"), curTime); @@ -222,7 +222,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, while (pbc) { if (cdf_mem_compare ((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, - CDF_MAC_ADDR_SIZE) + QDF_MAC_ADDR_SIZE) && cdf_mem_compare((uint8_t *) pbc->uuid_e, (uint8_t *) uuid_e, SIR_WPS_UUID_LEN)) { if (prev) @@ -244,7 +244,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, return; } cdf_mem_copy((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (uuid_e) cdf_mem_copy((uint8_t *) pbc->uuid_e, @@ -366,7 +366,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, * Don't send probe response if P2P go is scanning till scan * come to idle state. */ - if ((session->pePersona == CDF_P2P_GO_MODE) && + if ((session->pePersona == QDF_P2P_GO_MODE) && ((mac_ctx->lim.gpLimRemainOnChanReq) || (mac_ctx->lim.gLimHalScanState != eLIM_HAL_IDLE_SCAN_STATE))) { lim_log(mac_ctx, LOG3, @@ -398,7 +398,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, mac_ctx->sys.probeError++; return; } - if (session->pePersona == CDF_P2P_GO_MODE) { + if (session->pePersona == QDF_P2P_GO_MODE) { uint8_t i = 0, rate_11b = 0, other_rates = 0; /* Check 11b rates in supported rates */ for (i = 0; i < probe_req.supportedRates.numRates; @@ -473,7 +473,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, probe_req.p2pIePresent); return; } else if (session->pePersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { uint8_t direct_ssid[7] = "DIRECT-"; uint8_t direct_ssid_len = 7; if (cdf_mem_compare((uint8_t *) &direct_ssid, @@ -669,9 +669,9 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, pSirSmeProbeReqInd->sessionId = psessionEntry->smeSessionId; cdf_mem_copy(pSirSmeProbeReqInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes, - peerMacAddr, CDF_MAC_ADDR_SIZE); + peerMacAddr, QDF_MAC_ADDR_SIZE); MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIELen = diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c index 16b960cf5e8d..911b59fd9bf9 100644 --- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -125,7 +125,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), @@ -345,7 +345,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 060eea4caeb7..47b4b71baa0a 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -316,7 +316,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results) ((((mac_ctx->lim.gpSession[i].bssType == eSIR_INFRA_AP_MODE) && (mac_ctx->lim.gpSession[i].pePersona == - CDF_P2P_GO_MODE)) || + QDF_P2P_GO_MODE)) || (mac_ctx->lim.gpSession[i].limSystemRole == eLIM_AP_ROLE)) && (mac_ctx->lim.gpSession[i].limSmeState == @@ -521,7 +521,7 @@ lim_configure_ap_start_bss_session(tpAniSirGlobal mac_ctx, tpPESession session, session->dtimPeriod = (uint8_t) sme_start_bss_req->dtimPeriod; /* Enable/disable UAPSD */ session->apUapsdEnable = sme_start_bss_req->apUapsdEnable; - if (session->pePersona == CDF_P2P_GO_MODE) { + if (session->pePersona == QDF_P2P_GO_MODE) { session->proxyProbeRspEn = 0; } else { /* @@ -694,7 +694,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /* Store Persona */ session->pePersona = sme_start_bss_req->bssPersona; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d"), session->pePersona); /* Update the phymode */ @@ -713,7 +713,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) IS_DOT11_MODE_HT(session->dot11mode); session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("*****session->vhtCapability = %d"), session->vhtCapability); session->txLdpcIniFeatureEnabled = @@ -740,7 +740,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) case eSIR_INFRA_AP_MODE: lim_configure_ap_start_bss_session(mac_ctx, session, sme_start_bss_req); - if (session->pePersona == CDF_SAP_MODE) { + if (session->pePersona == QDF_SAP_MODE) { session->txBFIniFeatureEnabled = sme_start_bss_req->txbf_ini_enabled; session->txbf_csn_value = @@ -820,7 +820,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_start_bss_req->sec_ch_offset; session->htRecommendedTxWidthSet = (session->htSecondaryChannelOffset) ? 1 : 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("cbMode %u"), sme_start_bss_req->cbMode); if (session->vhtCapability || session->htCapability) { chanwidth = sme_start_bss_req->vht_channel_width; @@ -1692,7 +1692,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /*Store Persona */ session->pePersona = sme_join_req->staPersona; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d cbMode %u"), session->pePersona, sme_join_req->cbMode); if (mac_ctx->roam.configParam.enable2x2) @@ -1702,11 +1702,11 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_11AC session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "***__lim_process_sme_join_req: vhtCapability=%d****", session->vhtCapability); if (session->vhtCapability) { - if (session->pePersona == CDF_STA_MODE) { + if (session->pePersona == QDF_STA_MODE) { session->txBFIniFeatureEnabled = sme_join_req->txBFIniFeatureEnabled; } else { @@ -1718,7 +1718,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->enableVhtGid = sme_join_req->enableVhtGid; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, FL("***txBFIniFeatureEnabled=%d***"), session->txBFIniFeatureEnabled); if (wlan_cfg_get_int(mac_ctx, @@ -1743,7 +1743,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) ret_code = eSIR_LOGP_EXCEPTION; goto end; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "%s: txBFCsnValue=%d", __func__, sme_join_req->txBFCsnValue); session->txbf_csn_value = sme_join_req->txBFCsnValue; @@ -1908,7 +1908,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mac_ctx->roam.configParam.nTxPowerCap); #else session->maxTxPower = - CDF_MIN(reg_max, (local_power_constraint)); + QDF_MIN(reg_max, (local_power_constraint)); #endif #if defined WLAN_VOWIFI_DEBUG lim_log(mac_ctx, LOGE, @@ -2026,8 +2026,8 @@ uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower, uint8_t iniTxPower) { uint8_t maxTxPower = 0; - uint8_t txPower = CDF_MIN(regMax, (apTxPower)); - txPower = CDF_MIN(txPower, iniTxPower); + uint8_t txPower = QDF_MIN(regMax, (apTxPower)); + txPower = QDF_MIN(txPower, iniTxPower); if ((txPower >= MIN_TX_PWR_CAP) && (txPower <= MAX_TX_PWR_CAP)) maxTxPower = txPower; else if (txPower < MIN_TX_PWR_CAP) @@ -2188,7 +2188,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, &session_entry->limReassocBssPropCap, &session_entry->gLimCurrentBssUapsd, &local_pwr_constraint, session_entry); - session_entry->maxTxPower = CDF_MIN(reg_max, (local_pwr_constraint)); + session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint)); #if defined WLAN_VOWIFI_DEBUG lim_log(mac_ctx, LOGE, "Regulatory max = %d, local pwr constraint = %d, max tx = %d", @@ -3114,7 +3114,7 @@ void lim_process_sme_get_assoc_sta_info(tpAniSirGlobal mac_ctx, if (sta_ds->valid) { cdf_mem_copy((uint8_t *) &assoc_sta_tmp->staMac, (uint8_t *) &sta_ds->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); assoc_sta_tmp->assocId = (uint8_t) sta_ds->assocId; assoc_sta_tmp->staId = (uint8_t) sta_ds->staIndex; @@ -3146,7 +3146,7 @@ lim_assoc_sta_end: if (sap_event_cb != NULL) { sap_event.sapHddEventCode = eSAP_ASSOC_STA_CALLBACK_EVENT; sap_event.sapevt.sapAssocStaListEvent.module = - CDF_MODULE_ID_PE; + QDF_MODULE_ID_PE; sap_event.sapevt.sapAssocStaListEvent.noOfAssocSta = sta_cnt; sap_event.sapevt.sapAssocStaListEvent.pAssocStas = (tpSap_AssocMacAddr)get_assoc_stas_req.pAssocStasArray; @@ -3209,7 +3209,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, * WPS PBC overlap information */ sap_event.sapHddEventCode = eSAP_GET_WPSPBC_SESSION_EVENT; - sap_get_wpspbc_event->module = CDF_MODULE_ID_PE; + sap_get_wpspbc_event->module = QDF_MODULE_ID_PE; if (cdf_is_macaddr_zero(&get_wps_pbc_sessions_req.remove_mac)) { lim_get_wpspbc_sessions(mac_ctx, @@ -3554,7 +3554,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type, } if (!cdf_mem_compare((uint8_t *)sta_ds->staAddr, (uint8_t *) assoc_cnf.peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOG1, FL( "peerMacAddr mismatched for aid %d, peer "), assoc_cnf.aid); @@ -4351,7 +4351,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, msg.reserved = 0; msg.bodyptr = pHtOpMode; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { lim_log(pMac, LOGE, FL ("%s: Not able to post WMA_UPDATE_OP_MODE message to WMA"), @@ -4456,10 +4456,10 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, } pMaxTxParams->power = txPower; cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; msgQ.bodyptr = pMaxTxParams; @@ -4998,7 +4998,7 @@ static void lim_process_sme_start_beacon_req(tpAniSirGlobal pMac, uint32_t *pMsg * Tx right after the WMA_ADD_BSS_RSP. */ lim_apply_configuration(pMac, psessionEntry); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -5263,7 +5263,7 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, case eUPDATE_IE_ASSOC_RESP: /* assoc resp IE */ if (add_ie_params->assocRespDataLen == 0) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL( "assoc resp add ie not present %d"), add_ie_params->assocRespDataLen); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 498ab623f036..d373967f78a2 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -92,7 +92,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, tSirTdlsAddStaReq * pAddStaReq, tpPESession psessionEntry); void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIELinkIdentifier *linkIden, - struct cdf_mac_addr peer_mac, uint8_t reqType); + struct qdf_mac_addr peer_mac, uint8_t reqType); void populate_dot11f_tdls_ext_capability(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIEExtCap *extCapability); @@ -344,7 +344,7 @@ QDF_STATUS lim_mgmt_tx_complete(tpAniSirGlobal pMac, uint32_t txCompleteSuccess) * We are not differentiating it here, it will all depnds on peer MAC address, */ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry) { @@ -593,7 +593,7 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac, */ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, uint8_t *addIe, @@ -814,7 +814,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, * lim_send_tdls_setup_rsp_frame to populate the AID if device is 11ac capable. */ static void populate_dotf_tdls_vht_aid(tpAniSirGlobal pMac, uint32_t selfDot11Mode, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tDot11fIEAID *Aid, tpPESession psessionEntry) { @@ -853,7 +853,7 @@ static void populate_dotf_tdls_vht_aid(tpAniSirGlobal pMac, uint32_t selfDot11Mo */ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, uint8_t *addIe, @@ -1135,7 +1135,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, */ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint16_t reason, uint8_t responder, tpPESession psessionEntry, @@ -1335,7 +1335,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, * Send Setup RSP frame on AP link. */ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, tpPESession psessionEntry, etdlsLinkSetupStatus setupStatus, @@ -1614,7 +1614,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, */ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_mac, + struct qdf_mac_addr peer_mac, uint8_t dialog, uint32_t peerCapability, tpPESession psessionEntry, @@ -2442,7 +2442,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, * Del STA, after Link is teardown or discovery response sent on direct link */ static tpDphHashNode lim_tdls_del_sta(tpAniSirGlobal pMac, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tpPESession psessionEntry) { tSirRetStatus status = eSIR_SUCCESS; @@ -2495,7 +2495,7 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, } if (peerMac) { cdf_mem_copy(addStaRsp->peermac.bytes, - (uint8_t *) peerMac, CDF_MAC_ADDR_SIZE); + (uint8_t *) peerMac, QDF_MAC_ADDR_SIZE); } if (updateSta) addStaRsp->tdlsAddOper = TDLS_OPER_UPDATE; @@ -2668,7 +2668,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIELinkIdentifier *linkIden, - struct cdf_mac_addr peer_mac, uint8_t reqType) + struct qdf_mac_addr peer_mac, uint8_t reqType) { uint8_t *initStaAddr = NULL; uint8_t *respStaAddr = NULL; @@ -2678,13 +2678,13 @@ void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, : ((respStaAddr = linkIden->InitStaAddr), (initStaAddr = linkIden->RespStaAddr)); cdf_mem_copy((uint8_t *) linkIden->bssid, - (uint8_t *) psessionEntry->bssId, CDF_MAC_ADDR_SIZE); + (uint8_t *) psessionEntry->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy((uint8_t *) initStaAddr, - psessionEntry->selfMacAddr, CDF_MAC_ADDR_SIZE); + psessionEntry->selfMacAddr, QDF_MAC_ADDR_SIZE); cdf_mem_copy((uint8_t *) respStaAddr, (uint8_t *) peer_mac.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); linkIden->present = 1; return; @@ -2754,7 +2754,7 @@ tSirRetStatus lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("send mgmt received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_send_mgmt_error; @@ -2847,7 +2847,7 @@ lim_tdls_send_mgmt_error: */ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr *peermac, + struct qdf_mac_addr *peermac, tDphHashNode *pStaDs, uint8_t status) { tSirMsgQ mmhMsg = { 0 }; @@ -2878,7 +2878,7 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, */ static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr peerMac, + struct qdf_mac_addr peerMac, tDphHashNode *pStaDs, uint8_t status) { tSirMsgQ mmhMsg = { 0 }; @@ -2937,7 +2937,7 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "send mgmt received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_add_sta_error; @@ -3005,7 +3005,7 @@ tSirRetStatus lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "Del sta received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_del_sta_error; @@ -3103,13 +3103,13 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, uint32_t self_num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint8_t self_supp_chan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("Send Mgmt Recieved")); session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes, &session_id); if (NULL == session_entry) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("PE Session does not exist for sme session_id %d"), tdls_req->sessionId); lim_send_sme_tdls_link_establish_req_rsp(mac_ctx, @@ -3120,7 +3120,7 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("TDLS Link Establish Request received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_link_establish_error; diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 2ec7b318a14e..5fcf9bac0f33 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -117,11 +117,11 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, mac_ctx->lim.htCapabilityPresentInBeacon = 0; #ifdef WLAN_FEATURE_11AC - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d", beacon_struct->VHTCaps.present, IS_BSS_VHT_CAPABLE(beacon_struct->VHTCaps)); - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, "***beacon.SU Beamformer Capable*****=%d", beacon_struct->VHTCaps.suBeamFormerCap); @@ -165,7 +165,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, beacon_struct->VHTOperation.chanWidth) { /* If VHT is supported min 80 MHz support is must */ uint32_t fw_vht_ch_wd = wma_get_vht_ch_width(); - uint32_t vht_ch_wd = CDF_MIN(fw_vht_ch_wd, + uint32_t vht_ch_wd = QDF_MIN(fw_vht_ch_wd, beacon_struct->VHTOperation.chanWidth); if (vht_ch_wd == beacon_struct->VHTOperation.chanWidth || vht_ch_wd >= WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ) { diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index b04183adb753..44eb43356775 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -56,7 +56,7 @@ #include "lim_ft_defs.h" #endif #include "lim_session.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "sme_trace.h" @@ -271,7 +271,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, (((mac_ctx->lim.gpLimMlmScanReq != NULL) && mac_ctx->lim.gpLimMlmScanReq->p2pSearch) || ((pesession != NULL) && - (CDF_P2P_CLIENT_MODE == pesession->pePersona)) + (QDF_P2P_CLIENT_MODE == pesession->pePersona)) ) ) { /* @@ -417,7 +417,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, * is pePersona is P2P_CLIENT or not */ || ((pesession != NULL) && - (CDF_P2P_CLIENT_MODE == pesession->pePersona)) + (QDF_P2P_CLIENT_MODE == pesession->pePersona)) ) { txflag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -553,10 +553,10 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, * In case when cac timer is running for this SAP session then * avoid sending probe rsp out. It is violation of dfs specification. */ - if (((pe_session->pePersona == CDF_SAP_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) && + if (((pe_session->pePersona == QDF_SAP_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) && (true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("CAC timer is running, probe response dropped")); return; } @@ -835,8 +835,8 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) - || (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE) + || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE) ) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; @@ -1059,13 +1059,13 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) - || (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) + || (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Addts Response frame in high priority WQ */ @@ -1074,7 +1074,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -1384,11 +1384,11 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) || - (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) + (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); /* Queue Association Response frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes, @@ -1396,7 +1396,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_session, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ @@ -1546,20 +1546,20 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) - || (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) + || (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -1867,7 +1867,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, bytes); pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); @@ -1936,13 +1936,13 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) - || (pe_session->pePersona == CDF_P2P_CLIENT_MODE) - || (pe_session->pePersona == CDF_P2P_GO_MODE) + || (pe_session->pePersona == QDF_P2P_CLIENT_MODE) + || (pe_session->pePersona == QDF_P2P_GO_MODE) ) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - if (pe_session->pePersona == CDF_P2P_CLIENT_MODE || - pe_session->pePersona == CDF_STA_MODE) + if (pe_session->pePersona == QDF_P2P_CLIENT_MODE || + pe_session->pePersona == QDF_STA_MODE) tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK; #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -1950,7 +1950,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif mac_hdr = (tpSirMacMgmtHdr) frame; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, @@ -1958,7 +1958,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -2279,7 +2279,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, (void **)&frame, (void **)&packet); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes); @@ -2350,8 +2350,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, (uint8_t *) frame, (bytes + ft_ies_length)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(pe_session->currentOperChannel)) || - (pe_session->pePersona == CDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == CDF_P2P_GO_MODE)) { + (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) { tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -2384,14 +2384,14 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (bytes + ft_ies_length), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -2425,7 +2425,7 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = psessionEntry->peSessionId; /* Start reassociation failure timer */ - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer) != TX_SUCCESS) { @@ -2645,7 +2645,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, (void **)&pPacket); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { psessionEntry->limMlmState = psessionEntry->limPrevMlmState; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState)); lim_log(pMac, LOGP, @@ -2706,21 +2706,21 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - if (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE || - psessionEntry->pePersona == CDF_STA_MODE) + if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE || + psessionEntry->pePersona == QDF_STA_MODE) txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; #ifdef FEATURE_WLAN_DIAG_SUPPORT lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT, psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -2728,7 +2728,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3003,8 +3003,8 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2, frame, frame_len); if ((SIR_BAND_5_GHZ == lim_get_rf_band(session->currentOperChannel)) - || (session->pePersona == CDF_P2P_CLIENT_MODE) - || (session->pePersona == CDF_P2P_GO_MODE) + || (session->pePersona == QDF_P2P_CLIENT_MODE) + || (session->pePersona == QDF_P2P_GO_MODE) || ((NULL != session->ftPEContext.pFTPreAuthReq) && (SIR_BAND_5_GHZ == lim_get_rf_band(session->ftPEContext.pFTPreAuthReq-> @@ -3012,18 +3012,18 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - if (session->pePersona == CDF_P2P_CLIENT_MODE || - session->pePersona == CDF_STA_MODE) + if (session->pePersona == QDF_P2P_CLIENT_MODE || + session->pePersona == QDF_STA_MODE) tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK; - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session->peSessionId, mac_hdr->fc.subType)); /* Queue Authentication frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, @@ -3222,7 +3222,7 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) end: cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, (uint8_t *) disassoc_req->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); disassoc_cnf.aid = disassoc_req->aid; disassoc_cnf.disassocTrigger = disassoc_req->disassocTrigger; @@ -3290,10 +3290,10 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, * In case when cac timer is running for this SAP session then * avoid sending disassoc out. It is violation of dfs specification. */ - if (((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) && + if (((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop disassoc from going out")); return; @@ -3363,8 +3363,8 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(psessionEntry->selfMacAddr)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -3372,7 +3372,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; if (waitForAck) { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3384,7 +3384,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, pFrame, lim_disassoc_tx_complete_cnf, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); val = SYS_MS_TO_TICKS(LIM_DISASSOC_DEAUTH_ACK_TIMEOUT); @@ -3405,7 +3405,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3416,7 +3416,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3469,10 +3469,10 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, * In case when cac timer is running for this SAP session then * avoid deauth frame out. It is violation of dfs specification. */ - if (((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) && + if (((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop the deauth from going out")); return; @@ -3540,8 +3540,8 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(psessionEntry->selfMacAddr)); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -3554,7 +3554,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #endif if (waitForAck) { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3565,7 +3565,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, pFrame, lim_deauth_tx_complete_cnf, txFlag, smeSessionId, false, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback lim_tx_complete */ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3598,7 +3598,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); #ifdef FEATURE_WLAN_TDLS @@ -3621,7 +3621,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_TDLS } #endif - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3745,7 +3745,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, "easurement Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3753,7 +3753,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3848,7 +3848,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, "PC Request (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3856,7 +3856,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3955,7 +3955,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, "PC Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = @@ -3963,7 +3963,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); MTRACE(cdf_trace - (CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -4083,20 +4083,20 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4210,8 +4210,8 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, if ((SIR_BAND_5_GHZ == lim_get_rf_band(session_entry->currentOperChannel)) || - (session_entry->pePersona == CDF_P2P_CLIENT_MODE) || - (session_entry->pePersona == CDF_P2P_GO_MODE)) { + (session_entry->pePersona == QDF_P2P_CLIENT_MODE) || + (session_entry->pePersona == QDF_P2P_GO_MODE)) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } @@ -4223,7 +4223,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, frm.ext_chan_switch_ann_action.new_channel, frm.ext_chan_switch_ann_action.op_class); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session_entry->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes, TXRX_FRM_802_11_MGMT, @@ -4231,7 +4231,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 7, lim_tx_complete, frame, txFlag, sme_session_id, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session_entry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -4300,7 +4300,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, cdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ - if (psessionEntry->pePersona == CDF_SAP_MODE) + if (psessionEntry->pePersona == QDF_SAP_MODE) lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer, psessionEntry->selfMacAddr); @@ -4326,20 +4326,20 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, " (0x%08x)."), nStatus); } if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4470,13 +4470,13 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4485,7 +4485,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4628,12 +4628,12 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4642,7 +4642,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4822,13 +4822,13 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, lim_print_mac_addr(pMac, peer, LOGW); if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4837,7 +4837,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4969,8 +4969,8 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) #ifdef WLAN_FEATURE_P2P - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) #endif ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; @@ -5109,14 +5109,14 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) #ifdef WLAN_FEATURE_P2P - || (psessionEntry->pePersona == CDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE) #endif ) { txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -5125,7 +5125,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(CDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 264cf02c800f..05ad92f3aa01 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -834,7 +834,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, pExcludeUnencryptParam->excludeUnencrypt = excludeUnenc; cdf_mem_copy(pExcludeUnencryptParam->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_EXCLUDE_UNENCRYPTED_IND; msgQ.reserved = 0; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 13f86dacf742..54dcee72e735 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -36,7 +36,7 @@ * -------------------------------------------------------------------- */ -#include "cdf_types.h" +#include "qdf_types.h" #include "wni_api.h" #include "sir_common.h" #include "ani_global.h" @@ -91,7 +91,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp)); if (NULL == sme_rsp) { /* Buffer not available. Log error */ - CDF_TRACE(CDF_MODULE_ID_PE, LOGP, + CDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } @@ -149,7 +149,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp)); if (NULL == sme_rsp) { - CDF_TRACE(CDF_MODULE_ID_PE, LOGP, + CDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } @@ -1058,10 +1058,10 @@ lim_send_sme_disassoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, pSirSmeDisassocInd->reasonCode = pStaDs->mlmStaContext.disassocReason; cdf_mem_copy(pSirSmeDisassocInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSirSmeDisassocInd->peer_macaddr.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSirSmeDisassocInd->staId = pStaDs->staIndex; @@ -1120,10 +1120,10 @@ lim_send_sme_deauth_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, } /* BSSID */ cdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* peerMacAddr */ cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSirSmeDeauthInd->reasonCode = pStaDs->mlmStaContext.disassocReason; pSirSmeDeauthInd->staId = pStaDs->staIndex; @@ -1188,7 +1188,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, /* peerMacAddr */ cdf_mem_copy(pSirTdlsDelStaInd->peermac.bytes, pStaDs->staAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* staId */ lim_copy_u16((uint8_t *) (&pSirTdlsDelStaInd->staId), @@ -1446,7 +1446,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, /* peerMacAddr */ cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(pMac, WLAN_PE_DIAG_DEAUTH_IND_EVENT, @@ -1559,7 +1559,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx, */ void lim_send_sme_set_context_rsp(tpAniSirGlobal pMac, - struct cdf_mac_addr peer_macaddr, uint16_t aid, + struct qdf_mac_addr peer_macaddr, uint16_t aid, tSirResultCodes resultCode, tpPESession psessionEntry, uint8_t smesessionId, uint16_t smetransactionId) @@ -1974,7 +1974,7 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, 0); cdf_mem_copy((uint8_t *) pNewPeerInd->peer_addr.bytes, - peerMacAddr, CDF_MAC_ADDR_SIZE); + peerMacAddr, QDF_MAC_ADDR_SIZE); pNewPeerInd->staId = staIndex; pNewPeerInd->ucastSig = ucastIdx; pNewPeerInd->bcastSig = bcastIdx; @@ -2192,7 +2192,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) csa_offload_ind->mesgType = eWNI_SME_CSA_OFFLOAD_EVENT; csa_offload_ind->mesgLen = sizeof(tSmeCsaOffloadInd); cdf_mem_copy(csa_offload_ind->bssid.bytes, session_entry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mmh_msg.type = eWNI_SME_CSA_OFFLOAD_EVENT; mmh_msg.bodyptr = csa_offload_ind; mmh_msg.bodyval = 0; @@ -2285,7 +2285,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa } cdf_mem_set((void *)pSmeMaxAssocInd, sizeof(tSmeMaxAssocInd), 0); cdf_mem_copy((uint8_t *) pSmeMaxAssocInd->peer_mac.bytes, - (uint8_t *) peerMacAddr, CDF_MAC_ADDR_SIZE); + (uint8_t *) peerMacAddr, QDF_MAC_ADDR_SIZE); pSmeMaxAssocInd->mesgType = eWNI_SME_MAX_ASSOC_EXCEEDED; pSmeMaxAssocInd->mesgLen = sizeof(tSmeMaxAssocInd); pSmeMaxAssocInd->sessionId = smesessionId; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index e4ec6ea2a793..81049bcbfb83 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -67,7 +67,7 @@ void lim_send_sme_deauth_ind(tpAniSirGlobal, tpDphHashNode, tpPESession psessionEntry); void lim_send_sme_wm_status_change_ntf(tpAniSirGlobal, tSirSmeStatusChangeCode, uint32_t *, uint16_t, uint8_t); -void lim_send_sme_set_context_rsp(tpAniSirGlobal, struct cdf_mac_addr, uint16_t, +void lim_send_sme_set_context_rsp(tpAniSirGlobal, struct qdf_mac_addr, uint16_t, tSirResultCodes, tpPESession, uint8_t, uint16_t); void lim_send_sme_neighbor_bss_ind(tpAniSirGlobal, tLimScanResultNode *); void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ); @@ -109,7 +109,7 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa uint8_t smesessionId); #ifdef FEATURE_WLAN_TDLS void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, uint8_t sessionId, - struct cdf_mac_addr *peermac, + struct qdf_mac_addr *peermac, tDphHashNode *pStaDs, uint8_t status); void lim_send_sme_tdls_event_notify(tpAniSirGlobal pMac, uint16_t msgType, void *events); diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 4885b6006645..810565200d3d 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -114,7 +114,7 @@ void pe_reset_protection_callback(void *ptr) bool bcn_prms_changed = false; if (pe_session_entry->valid == false) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("session already deleted. exiting timer callback")); return; @@ -127,7 +127,7 @@ void pe_reset_protection_callback(void *ptr) pe_session_entry->gLimOverlapNonGfParams.protectionEnabled << 3 | pe_session_entry->gLimOlbcParams.protectionEnabled << 4; - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("old protection state: 0x%04X, new protection state: 0x%04X\n"), pe_session_entry->old_protection_state, @@ -177,7 +177,7 @@ void pe_reset_protection_callback(void *ptr) if ((current_protection_state != pe_session_entry->old_protection_state) && (false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("protection changed, update beacon template\n")); /* update beacon fix params and send update to FW */ @@ -217,7 +217,7 @@ void pe_reset_protection_callback(void *ptr) protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME) != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } @@ -326,7 +326,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->fWaitForProbeRsp = 0; session_ptr->fIgnoreCapsChange = 0; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"), session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta); @@ -368,7 +368,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->mac_ctx = (void *)pMac; status = cdf_mc_timer_init( &session_ptr->protection_fields_reset_timer, - CDF_TIMER_TYPE_SW, pe_reset_protection_callback, + QDF_TIMER_TYPE_SW, pe_reset_protection_callback, (void *)&pMac->lim.gpSession[i]); if (status == QDF_STATUS_SUCCESS) { status = cdf_mc_timer_start( @@ -376,14 +376,14 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, SCH_PROTECTION_RESET_TIME); } if (status != QDF_STATUS_SUCCESS) - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } session_ptr->pmfComebackTimerInfo.pMac = pMac; session_ptr->pmfComebackTimerInfo.sessionID = *sessionId; status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer, - CDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, + QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, (void *)&session_ptr->pmfComebackTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) lim_log(pMac, LOGE, FL("cannot init pmf comeback timer.")); @@ -532,12 +532,12 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) TX_TIMER *timer_ptr; if (!session || (session && !session->valid)) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("session is not valid")); return; } - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, FL("Trying to delete PE session %d Opmode %d BssIdx %d BSSID: "MAC_ADDRESS_STR), session->peSessionId, session->operMode, session->bssIdx, diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 35f23a80ae1a..a5c76fa11eeb 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -82,7 +82,7 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId) CASE_RETURN_STRING(eLIM_INSERT_SINGLESHOT_NOA_TIMER); CASE_RETURN_STRING(eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } @@ -99,14 +99,14 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason) CASE_RETURN_STRING(eMGMT_DROP_SCAN_MODE_FRAME); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } void lim_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(CDF_MODULE_ID_PE, (tp_cdf_trace_cb) & lim_trace_dump); + cdf_trace_register(QDF_MODULE_ID_PE, (tp_cdf_trace_cb) &lim_trace_dump); } void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, @@ -440,7 +440,7 @@ uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState) CASE_RETURN_STRING(eLIM_MLM_WT_SET_STA_BCASTKEY_STATE); CASE_RETURN_STRING(eLIM_MLM_WT_SET_MIMOPS_STATE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } @@ -472,7 +472,7 @@ uint8_t *lim_trace_get_sme_state_string(uint32_t smeState) CASE_RETURN_STRING(eLIM_SME_CHANNEL_SCAN_STATE); CASE_RETURN_STRING(eLIM_SME_NORMAL_CHANNEL_SCAN_STATE); default: - return ("UNKNOWN"); + return "UNKNOWN"; break; } } diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 3a3161fcd22f..40e91cf1eceb 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -309,7 +309,7 @@ typedef struct sLimMlmAuthCnf { } tLimMlmAuthCnf, *tpLimMlmAuthCnf; typedef struct sLimMlmDeauthReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; uint16_t deauthTrigger; uint16_t aid; @@ -318,7 +318,7 @@ typedef struct sLimMlmDeauthReq { } tLimMlmDeauthReq, *tpLimMlmDeauthReq; typedef struct sLimMlmDeauthCnf { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; tSirResultCodes resultCode; uint16_t deauthTrigger; uint16_t aid; @@ -333,7 +333,7 @@ typedef struct sLimMlmDeauthInd { } tLimMlmDeauthInd, *tpLimMlmDeauthInd; typedef struct sLimMlmDisassocReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t reasonCode; uint16_t disassocTrigger; uint16_t aid; @@ -371,7 +371,7 @@ typedef struct sLimMlmPurgeStaInd { } tLimMlmPurgeStaInd, *tpLimMlmPurgeStaInd; typedef struct sLimMlmSetKeysCnf { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint16_t resultCode; uint16_t aid; uint8_t sessionId; @@ -799,13 +799,13 @@ void lim_send_vdev_restart(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t sessionId); -void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct cdf_mac_addr addr, +void lim_get_wpspbc_sessions(tpAniSirGlobal pMac, struct qdf_mac_addr addr, uint8_t *uuid_e, eWPSPBCOverlap *overlap, tpPESession psessionEntry); void limWPSPBCTimeout(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_wpspbc_close(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_remove_pbc_sessions(tpAniSirGlobal pMac, - struct cdf_mac_addr pRemoveMac, + struct qdf_mac_addr pRemoveMac, tpPESession psessionEntry); #define LIM_WPS_OVERLAP_TIMER_MS 10000 diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index c53efd09af6e..8d9dac0b1545 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -593,7 +593,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry, if (NULL == sta_ds) continue; - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("Deleting pmfSaQueryTimer for staid[%d]"), sta_ds->staIndex); tx_timer_deactivate(&sta_ds->pmfSaQueryTimer); @@ -735,7 +735,7 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) * the pmfSaQueryTimer for it */ if (cds_is_driver_recovering()) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, FL("SSR is detected, proceed to clean up pmfSaQueryTimer")); for (bss_entry = 0; bss_entry < mac_ctx->lim.maxBssId; bss_entry++) { @@ -2684,7 +2684,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, psessionEntry->gLimChannelSwitch.primaryChannel; pSirSmeSwitchChInd->sessionId = psessionEntry->smeSessionId; cdf_mem_copy(pSirSmeSwitchChInd->bssid.bytes, psessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); mmhMsg.bodyptr = pSirSmeSwitchChInd; mmhMsg.bodyval = 0; @@ -6330,7 +6330,7 @@ uint8_t lim_get_noa_attr_stream(tpAniSirGlobal pMac, uint8_t *pNoaStream, uint8_t *pBody = pNoaStream; if ((psessionEntry != NULL) && (psessionEntry->valid) && - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { if ((!(psessionEntry->p2pGoPsUpdate.uNoa1Duration)) && (!(psessionEntry->p2pGoPsUpdate.uNoa2Duration)) && (!psessionEntry->p2pGoPsUpdate.oppPsFlag) @@ -6422,7 +6422,7 @@ bool lim_is_noa_insert_reqd(tpAniSirGlobal pMac) if (pMac->lim.gpSession[i].valid == true) { if ((eLIM_AP_ROLE == pMac->lim.gpSession[i].limSystemRole) - && (CDF_P2P_GO_MODE == + && (QDF_P2P_GO_MODE == pMac->lim.gpSession[i].pePersona) ) { return true; @@ -6577,9 +6577,9 @@ void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionE /* only 2.4G band should have short slot enable, rest it should be default */ if (phyMode == WNI_CFG_PHY_MODE_11G) { /* short slot is default in all other modes */ - if ((psessionEntry->pePersona == CDF_SAP_MODE) || - (psessionEntry->pePersona == CDF_IBSS_MODE) || - (psessionEntry->pePersona == CDF_P2P_GO_MODE)) { + if ((psessionEntry->pePersona == QDF_SAP_MODE) || + (psessionEntry->pePersona == QDF_IBSS_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) { val = true; } /* Program Polaris based on AP capability */ @@ -6812,7 +6812,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, tSirMacAddr a1, tpPESession session) { if (mac_ctx == NULL || session == NULL) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, "mac or session context is null"); /* let main routine handle it */ return true; @@ -6956,7 +6956,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, msg.reserved = 0; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { lim_log(mac_ctx, LOGE, FL("Not able to post WMA_SET_IE_INFO to WDA")); cdf_mem_free(vdev_ie); diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index b4f499bc0edf..2971942dc816 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -58,7 +58,7 @@ rrm_get_min_of_max_tx_power(tpAniSirGlobal pMac, int8_t regMax, int8_t apTxPower) { uint8_t maxTxPower = 0; - uint8_t txPower = CDF_MIN(regMax, (apTxPower)); + uint8_t txPower = QDF_MIN(regMax, (apTxPower)); if ((txPower >= RRM_MIN_TX_PWR_CAP) && (txPower <= RRM_MAX_TX_PWR_CAP)) maxTxPower = txPower; else if (txPower < RRM_MIN_TX_PWR_CAP) @@ -166,10 +166,10 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, /* Allocated memory for pMaxTxParams...will be freed in other module */ pMaxTxParams->power = txPower; cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); msgQ.type = WMA_SET_MAX_TX_POWER_REQ; msgQ.reserved = 0; @@ -181,7 +181,8 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, txPower); MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { lim_log(pMac, LOGP, FL ("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X"), @@ -224,10 +225,10 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ) } } } else { - if ((pSessionEntry = - pe_find_session_by_bssid(pMac, - pMaxTxParams->bssId.bytes, - &sessionId)) == NULL) { + pSessionEntry = pe_find_session_by_bssid(pMac, + pMaxTxParams->bssId.bytes, + &sessionId); + if (pSessionEntry == NULL) { PELOGE(lim_log (pMac, LOGE, FL("Unable to find session:")); ) @@ -476,9 +477,9 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac, PELOGE(lim_log(pMac, LOGE, "NeighborReq is NULL");) return eSIR_FAILURE; } - if ((pSessionEntry = - pe_find_session_by_bssid(pMac, pNeighborReq->bssId, - &sessionId)) == NULL) { + pSessionEntry = pe_find_session_by_bssid(pMac, pNeighborReq->bssId, + &sessionId); + if (pSessionEntry == NULL) { PELOGE(lim_log (pMac, LOGE, FL("session does not exist for given bssId")); @@ -827,11 +828,10 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, RRM_BCN_RPT_NO_BSS_INFO) ? RRM_BCN_RPT_MIN_RPT : pBcnReport->numBssDesc; - if (NULL == (pSessionEntry = pe_find_session_by_bssid(pMac, - pBcnReport-> - bssId, - &sessionId))) - { + pSessionEntry = pe_find_session_by_bssid(pMac, + pBcnReport->bssId, + &sessionId); + if (NULL == pSessionEntry) { PELOGE(lim_log (pMac, LOGE, FL("session does not exist for given bssId")); @@ -1140,8 +1140,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, case SIR_MAC_RRM_BEACON_TYPE: /* Process beacon request. */ if (pCurrentReq) { - if (pReport == NULL) /* Allocate memory to send reports for any subsequent requests. */ - { + if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = cdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) @@ -1222,8 +1221,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, break; default: /* Send a report with incapabale bit set. */ - if (pReport == NULL) /* Allocate memory to send reports for any subsequent requests. */ - { + if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = cdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 344ac544c306..a7175651663e 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -553,7 +553,7 @@ int sch_gen_timing_advert_frame(tpAniSirGlobal mac_ctx, tSirMacAddr self_addr, tDot11fTimingAdvertisementFrame frame; uint32_t payload_size, buf_size; int status; - struct cdf_mac_addr wildcard_bssid = { + struct qdf_mac_addr wildcard_bssid = { {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, }; diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index ca769bfc5764..93c78d501d2d 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -135,7 +135,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, return; #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) - CDF_TRACE(CDF_MODULE_ID_PE, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, @@ -162,7 +162,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (tmp_exp) { #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) { - CDF_TRACE(CDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, bcn_struct->erpIEInfo.useProtection, @@ -296,7 +296,8 @@ static void __sch_beacon_process_no_session(tpAniSirGlobal pMac, { tpPESession psessionEntry = NULL; - if ((psessionEntry = lim_is_ibss_session_active(pMac)) != NULL) { + psessionEntry = lim_is_ibss_session_active(pMac); + if (psessionEntry != NULL) { lim_handle_ibss_coalescing(pMac, pBeacon, pRxPacketInfo, psessionEntry); } diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c index 47c0714a83db..3f4f987526c8 100644 --- a/core/mac/src/pe/sch/sch_debug.c +++ b/core/mac/src/pe/sch/sch_debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) /* extracting arguments from pstring */ va_start(marker, pString); vsnprintf(logBuffer, LOG_SIZE, pString, marker); - CDF_TRACE(CDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); + CDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); va_end(marker); } diff --git a/core/mac/src/sys/common/inc/wlan_qct_sys.h b/core/mac/src/sys/common/inc/wlan_qct_sys.h index d4521b8fe3bb..0ebafee064a4 100644 --- a/core/mac/src/sys/common/inc/wlan_qct_sys.h +++ b/core/mac/src/sys/common/inc/wlan_qct_sys.h @@ -41,7 +41,7 @@ /*--------------------------------------------------------------------------- Include files -------------------------------------------------------------------------*/ -#include +#include #include #include diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 7c950e115af9..d1eaad913d10 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -138,7 +138,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) void *hHal; if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: NULL pointer to cds_msg_t", __func__); CDF_ASSERT(0); return QDF_STATUS_E_INVAL; @@ -159,20 +159,20 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) * Handling for this message is not needed now so adding * debug print and CDF_ASSERT */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_START msgType= %d [0x%08x]", pMsg->type, pMsg->type); CDF_ASSERT(0); break; case SYS_MSG_ID_MC_STOP: - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Processing SYS MC STOP"); /* get the HAL context... */ - hHal = cds_get_context(CDF_MODULE_ID_PE); + hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal", __func__); } else { @@ -195,7 +195,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) * Process MC thread probe. Just callback to the * function that is in the message. */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_THR_PROBE msgType=%d[0x%08x]", pMsg->type, pMsg->type); break; @@ -207,9 +207,9 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) break; case SYS_MSG_ID_FTM_RSP: - hHal = cds_get_context(CDF_MODULE_ID_PE); + hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_mem_free(pMsg->bodyptr); @@ -217,14 +217,14 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) } mac_ctx = PMAC_STRUCT(hHal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("Invalid mac context")); cdf_mem_free(pMsg->bodyptr); break; } if (NULL == mac_ctx->ftm_msg_processor_callback) { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, FL("callback pointer is NULL")); cdf_mem_free(pMsg->bodyptr); @@ -236,14 +236,14 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) break; default: - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Unknown message type msgType= %d [0x%08x]", pMsg->type, pMsg->type); break; } } else { - CDF_TRACE(CDF_MODULE_ID_SYS, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Rx SYS unknown MC msgtype= %d [0x%08X]", pMsg->type, pMsg->type); @@ -275,7 +275,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * It is up to the callee to free it */ if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL Message Pointer"); CDF_ASSERT(0); return; @@ -289,7 +289,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_CNF: /* Forward this message to the SYS module */ targetMQ = CDS_MQ_ID_SYS; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed in SYS", pMsg->type); CDF_ASSERT(0); @@ -301,7 +301,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_RSP: /* Forward this message to the HAL module */ targetMQ = CDS_MQ_ID_WMA; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed as no HAL", pMsg->type); @@ -329,7 +329,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) break; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Message of ID %d is not yet handled by SYS", pMsg->type); CDF_ASSERT(0); diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index 8a4a2c010186..03debc17b1b7 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -48,7 +48,7 @@ extern "C" { #include "sir_params.h" #include "sys_def.h" #include "cdf_mc_timer.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cdf_memory.h" diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index 10c993efc8bc..a965a63b0b87 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -135,23 +135,23 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) /* Check for an uninitialized timer */ CDF_ASSERT(0 != strlen(TIMER_NAME)); - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s being activated\n", TIMER_NAME); status = cdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); if (QDF_STATUS_SUCCESS == status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; } else if (QDF_STATUS_E_ALREADY == status) { /* starting timer fails because timer is already started; this is okay */ - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s is already running\n", TIMER_NAME); return TX_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Timer %s fails to activate\n", TIMER_NAME); return TX_TIMER_ERROR; } @@ -262,7 +262,7 @@ static void tx_main_timer_func(void *functionContext) return; } - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s triggered", TIMER_NAME); /* Now call the actual timer function, taking the function pointer, */ @@ -277,7 +277,7 @@ static void tx_main_timer_func(void *functionContext) timer_ptr->rescheduleTimeInMsecs = 0; if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, "Unable to reschedule timer %s; status=%d", TIMER_NAME, status); } @@ -298,7 +298,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, QDF_STATUS status; if (NULL == expiration_function) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL timer expiration"); CDF_ASSERT(0); return TX_TIMER_ERROR; @@ -306,7 +306,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, if (NULL == name_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "NULL name pointer for timer"); CDF_ASSERT(0); return TX_TIMER_ERROR; @@ -335,17 +335,17 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, #endif /* Store the timer name, for Debug build only */ status = - cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -394,16 +394,16 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName)); #endif /* Store the timer name, for Debug build only */ - status = cdf_mc_timer_init(&timer_ptr->cdf_timer, CDF_TIMER_TYPE_SW, + status = cdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -435,7 +435,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) { QDF_STATUS vStatus; - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -445,7 +445,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) /* if the timer is not running then we do not need to do anything here */ vStatus = cdf_mc_timer_stop(&timer_ptr->cdf_timer); if (QDF_STATUS_SUCCESS != vStatus) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", TIMER_NAME, vStatus); } @@ -456,7 +456,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) uint32_t tx_timer_delete(TX_TIMER *timer_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_delete() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -486,7 +486,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr) */ bool tx_timer_running(TX_TIMER *timer_ptr) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "tx_timer_running() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index a748f85ddb8d..88bac6af63e5 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ tSirRetStatus postPTTMsgApi(tpAniSirGlobal pMac, tSirMsgQ *pMsg); -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_packet.h" #define MAX_DEAUTH_ALLOWED 5 @@ -136,8 +136,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, mac_hdr->bssId, &sessionid); if (pe_session && - (pe_session->pePersona == CDF_SAP_MODE)) { - CDF_TRACE(CDF_MODULE_ID_SYS, + (pe_session->pePersona == QDF_SAP_MODE)) { + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, FL("CAC timer is running, dropping the mgmt frame")); goto fail; @@ -152,7 +152,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, (!lim_is_system_in_scan_state(mac_ctx)) && (GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true) && !mac_ctx->lim.gLimSystemInScanLearnMode) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, FL("dropping received beacon in deffered state")); goto fail; } diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c index 8ec7b8c9e8be..3b3581b0bc55 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -154,11 +154,11 @@ CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel) } } -static inline CDF_MODULE_ID get_vos_module_id(uint8_t modId) +static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId) { switch (modId) { case SIR_HAL_MODULE_ID: - return CDF_MODULE_ID_WMA; + return QDF_MODULE_ID_WMA; case SIR_LIM_MODULE_ID: case SIR_SCH_MODULE_ID: @@ -166,16 +166,16 @@ static inline CDF_MODULE_ID get_vos_module_id(uint8_t modId) case SIR_MNT_MODULE_ID: case SIR_DPH_MODULE_ID: case SIR_DBG_MODULE_ID: - return CDF_MODULE_ID_PE; + return QDF_MODULE_ID_PE; case SIR_SYS_MODULE_ID: - return CDF_MODULE_ID_SYS; + return QDF_MODULE_ID_SYS; case SIR_SMS_MODULE_ID: - return CDF_MODULE_ID_SME; + return QDF_MODULE_ID_SME; default: - return CDF_MODULE_ID_SYS; + return QDF_MODULE_ID_SYS; } } @@ -184,7 +184,7 @@ void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, const char *pStr, va_list marker) { CDF_TRACE_LEVEL cdf_debug_level; - CDF_MODULE_ID cdf_module_id; + QDF_MODULE_ID cdf_module_id; char logBuffer[LOG_SIZE]; cdf_debug_level = get_vos_debug_level(debugLevel); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 2c5e1026ed79..08024a248185 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -731,7 +731,7 @@ void mac_trace(tpAniSirGlobal mac_ctx, uint8_t code, * Today mac_trace is being invoked by PE only, need to remove this * function once PE is migrated to using new trace API. */ - mac_trace_new(mac_ctx, CDF_MODULE_ID_PE, code, session, data); + mac_trace_new(mac_ctx, QDF_MODULE_ID_PE, code, session, data); } /** diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index 6516e15aa9ec..e2354eca65ae 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -81,7 +81,7 @@ if (((dfs) == NULL) || \ ((dfs) != NULL && \ ((_m) & (dfs)->dfs_debug_mask))) { \ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \ + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \ _fmt, __VA_ARGS__); \ } \ } while (0) @@ -231,7 +231,7 @@ struct dfs_pulseparams { uint64_t p_time; /* time for start of pulse in usecs */ uint8_t p_dur; /* Duration of pulse in usecs */ uint8_t p_rssi; /* Duration of pulse in usecs */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_pulseparams) #endif @@ -245,7 +245,7 @@ struct dfs_pulseline { uint32_t pl_firstelem; /* Index of the first element */ uint32_t pl_lastelem; /* Index of the last element */ uint32_t pl_numelems; /* Number of elements in the delay line */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_pulseline) #endif @@ -287,7 +287,7 @@ struct dfs_event { int sidx; /* Pulse Index as in radar summary report */ int radar_80p80_segid; /* 80p80 segment ID as in radar sum report */ STAILQ_ENTRY(dfs_event) re_list; /* List of radar events */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_event) #endif @@ -329,7 +329,7 @@ struct dfs_delayelem { uint8_t de_rssi; /* time stamp for this delay element */ uint64_t de_ts; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_delayelem) #endif @@ -350,7 +350,7 @@ struct dfs_delayline { uint32_t dl_lastelem; /* Number of elements in the delay line */ uint32_t dl_numelems; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_delayline) #endif @@ -384,7 +384,7 @@ struct dfs_filter { uint32_t rf_ignore_pri_window; /* Unique ID corresponding to the original filter ID */ uint32_t rf_pulseid; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_filter) #endif @@ -441,7 +441,7 @@ struct dfs_nolelem { uint32_t nol_timeout_ms; /* NOL timeout value in msec */ os_timer_t nol_timer; /* per element NOL timer */ struct dfs_nolelem *nol_next; /* next element pointer */ -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_nolelem) #endif @@ -484,7 +484,7 @@ struct dfs_info { uint64_t dfs_bin5_chirp_ts; uint8_t dfs_last_bin5_dur; uint8_t dfs_last_bin5_dur_ext_seg; -} cdf_packed; +} qdf_packed; #ifdef WIN32 #pragma pack(pop, dfs_info) #endif diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 22ba6f405b0a..24b43b1def8a 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs.c + dfs.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -260,10 +260,10 @@ int dfs_attach(struct ieee80211com *ic) dfs_clear_stats(ic); dfs->dfs_event_log_on = 0; OS_INIT_TIMER(NULL, &(dfs->ath_dfs_task_timer), dfs_task, (void *)(ic), - CDF_TIMER_TYPE_SW); + QDF_TIMER_TYPE_SW); #ifndef ATH_DFS_RADAR_DETECTION_ONLY OS_INIT_TIMER(NULL, &(dfs->ath_dfstesttimer), dfs_testtimer_task, - (void *)ic, CDF_TIMER_TYPE_SW); + (void *)ic, QDF_TIMER_TYPE_SW); dfs->ath_dfs_cac_time = ATH_DFS_WAIT_MS; dfs->ath_dfstesttime = ATH_DFS_TEST_RETURN_PERIOD_MS; #endif @@ -314,7 +314,7 @@ int dfs_attach(struct ieee80211com *ic) dfs->events = NULL; OS_FREE(dfs); ic->ic_dfs = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pulse buffer allocation failed", __func__, __LINE__); return 1; @@ -341,7 +341,7 @@ int dfs_attach(struct ieee80211com *ic) } /* Allocate memory for radar table */ dfs->dfs_radartable = - (int8_t * *) os_malloc(NULL, 256 * sizeof(int8_t *), GFP_ATOMIC); + (int8_t **) os_malloc(NULL, 256 * sizeof(int8_t *), GFP_ATOMIC); if (dfs->dfs_radartable == NULL) { DFS_PRINTK("%s: cannot allocate memory for radar table\n", __func__); @@ -607,7 +607,7 @@ int dfs_radar_enable(struct ieee80211com *ic, * 0 on success. */ if (DFS_STATUS_FAIL == radar_filters_init_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: DFS Radar Filters Initialization Failed", __func__, __LINE__); return -EIO; diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c index 7ab7df12a9cb..434b016eca2c 100644 --- a/core/sap/dfs/src/dfs_init.c +++ b/core/sap/dfs/src/dfs_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_init.c + dfs_init.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -75,7 +75,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) int i, j; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: sc_dfs is NULL", __func__, __LINE__); return; } @@ -86,7 +86,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) pl = dfs->pulses; if (pl == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, dfs=%p", __func__, __LINE__, dfs); return; } @@ -103,7 +103,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) } } else { if (dfs->dfs_b5radars == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__, dfs->dfs_b5radars); return; @@ -220,7 +220,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, uint32_t b5_maxdur; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return DFS_STATUS_FAIL; } @@ -234,7 +234,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, * the rest of the radar configuration as suspect. */ if (radar_info == NULL || radar_info->dfsdomain == 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: Unknown dfs domain %d ", __func__, __LINE__, dfs->dfsdomain); /* Disable radar detection since we don't have a radar domain */ @@ -245,7 +245,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, return DFS_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:dfsdomain=%d, numradars=%d, numb5radars=%d", __func__, __LINE__, radar_info->dfsdomain, radar_info->numradars, radar_info->numb5radars); @@ -368,12 +368,12 @@ int dfs_init_radar_filters(struct ieee80211com *ic, rf->rf_threshold = dfs_radars[p].rp_threshold; rf->rf_filterlen = rf->rf_maxpri * rf->rf_numpulses; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: minprf = %d maxprf = %d pulsevar = %d thresh=%d", __func__, __LINE__, dfs_radars[p].rp_pulsefreq, dfs_radars[p].rp_max_pulsefreq, dfs_radars[p].rp_pulsevar, rf->rf_threshold); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:minpri = %d maxpri = %d filterlen = %d filterID = %d", __func__, __LINE__, rf->rf_minpri, rf->rf_maxpri, rf->rf_filterlen, rf->rf_pulseid); @@ -405,7 +405,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, sizeof(struct dfs_bin5radars), GFP_KERNEL); if (dfs->dfs_b5radars_ext_seg == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s:Fail allocate memory for ext bin5 radars", __func__); goto bad4; @@ -456,10 +456,10 @@ int dfs_init_radar_filters(struct ieee80211com *ic, dfs_round((int32_t) ((max_pulsedur * 100 / 80) * 100)); /* relax the max pulse duration a little bit due to inaccuracy caused by chirping. */ dfs->dfs_rinfo.rn_maxpulsedur = dfs->dfs_rinfo.rn_maxpulsedur + 20; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: DFS min filter rssiThresh = %d", __func__, __LINE__, min_rssithresh); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:DFS max pulse dur = %d ticks", __func__, __LINE__, dfs->dfs_rinfo.rn_maxpulsedur); return DFS_STATUS_SUCCESS; diff --git a/core/sap/dfs/src/dfs_nol.c b/core/sap/dfs/src/dfs_nol.c index 400e5159ea16..85810bcd2b05 100644 --- a/core/sap/dfs/src/dfs_nol.c +++ b/core/sap/dfs/src/dfs_nol.c @@ -242,7 +242,7 @@ dfs_nol_addchan(struct ath_dfs *dfs, struct dfs_ieee80211_channel *chan, dfs_nol_arg->delchwidth = elem->nol_chwidth; OS_INIT_TIMER(NULL, &elem->nol_timer, dfs_remove_from_nol, - dfs_nol_arg, CDF_TIMER_TYPE_SW); + dfs_nol_arg, QDF_TIMER_TYPE_SW); OS_SET_TIMER(&elem->nol_timer, dfs_nol_timeout * TIME_IN_MS); /* Update the NOL counter */ diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.c b/core/sap/dfs/src/dfs_phyerr_tlv.c index aaf568636282..3ba5a9dcffde 100644 --- a/core/sap/dfs/src/dfs_phyerr_tlv.c +++ b/core/sap/dfs/src/dfs_phyerr_tlv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -154,52 +154,52 @@ radar_summary_print(struct ath_dfs *dfs, else is_chip_oversampling = PERE_IS_OVERSAMPLING(dfs); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n ############ Radar Summary ############\n"); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - pulsedur = %d micro seconds\n", __func__, rsu->pulse_duration); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - rssi = %d dbm\n", __func__, rsu->rssi); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - ischirp = %d\n", __func__, rsu->is_chirp); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - sidx = %d\n", __func__, rsu->sidx); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_peak = %d\n", __func__, rsu->delta_peak); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_diff = %d\n", __func__, rsu->delta_diff); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - raw tsf = %d\n", __func__, rsu->raw_tsf); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - tsf_offset = %d micro seconds\n", __func__, rsu->tsf_offset); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Radar Summary - cooked tsf = %d\n", __func__, (rsu->raw_tsf - rsu->tsf_offset)); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: frequency offset = %d.%d MHz (oversampling = %d)\n", __func__, (int) (rsu->freq_offset / 1000), (int) abs(rsu->freq_offset % 1000), is_chip_oversampling); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n ###################################\n"); } @@ -223,12 +223,12 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, */ if ((dfs->ic->dfs_hw_bd_id == DFS_HWBD_QCA6174) && (len < sizeof(rs))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: DFS-2 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(rs)); } else if ((dfs->ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) && (len < sizeof(dfs3_rs))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: DFS-3 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(dfs3_rs)); } @@ -859,7 +859,7 @@ dfs_process_phyerr_bb_tlv(struct ath_dfs *dfs, void *buf, uint16_t datalen, * in noisy environments. */ if (!(invalid_phyerr_count & 0xFF)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, "%s[%d]:parse failed invalid phyerror cnt = %d", __func__, __LINE__, invalid_phyerr_count); } diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c index 0a806b4db8c4..ba1ba1f9bdd6 100644 --- a/core/sap/dfs/src/dfs_process_phyerr.c +++ b/core/sap/dfs/src/dfs_process_phyerr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -463,7 +463,7 @@ static void dump_phyerr_contents(const char *d, int len) * Print the final line if we didn't print it above. */ if (n != 0) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n", __func__, buf); #endif /* def CONFIG_ENABLE_DUMP_PHYERR_CONTENTS */ } @@ -480,7 +480,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, int empty; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: sc_dfs is NULL\n", __func__); return; } @@ -509,7 +509,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, dump_phyerr_contents(buf, datalen); if (chan == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: chan is NULL\n", __func__); return; } @@ -588,7 +588,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n %s: Frequency at which the phyerror was injected = %d", __func__, e.freq); /* diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 3c05d322707a..7ea5cecb15ca 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_radarevent.c + dfs_radarevent.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -127,7 +127,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, uint64_t deltafull_ts = 0, this_ts, deltaT; struct dfs_ieee80211_channel *thischan; struct dfs_pulseline *pl; - static uint32_t diff_ts = 0; + static uint32_t diff_ts; int ext_chan_event_flag = 0; #if 0 int pri_multiplier = 2; @@ -137,7 +137,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, struct dfs_delayline *dl; if (dfs == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return 0; } @@ -216,7 +216,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, if (event == NULL) { empty = 1; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]: event is NULL ", __func__, __LINE__); break; } @@ -404,7 +404,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, dfs->radar_log[i].dur = re.re_dur; dfs->dfs_event_log_count++; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:xxxxx ts =%u re.re_dur=%u re.re_rssi =%u diff =%u pl->pl_lastelem.p_time=%llu xxxxx", __func__, __LINE__, (uint32_t) this_ts, re.re_dur, re.re_rssi, diff_ts, @@ -436,9 +436,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (diff_ts > 500 || diff_ts <= 305) && (re.sidx == -4)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s: Rejecting on Peak Index = %d,re.re_dur = %d,diff_ts = %d\n", - __func__,re.sidx, re.re_dur, diff_ts); + __func__, re.sidx, re.re_dur, diff_ts); ATH_DFSQ_LOCK(dfs); empty = STAILQ_EMPTY(&(dfs->dfs_radarq)); @@ -465,16 +465,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, re.re_dur < DFS_TYPE4_WAR_PULSE_DURATION_UPPER_LIMIT) && (diff_ts > DFS_TYPE4_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_TYPE4_WAR_PRI_UPPER_LIMIT)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:chan->ic_flags=0x%x, MHz separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: Peak Idx =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s: Modify pulse dur to fit valid range \n", __func__); @@ -502,16 +502,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, diff_ts < DFS_ETSI_TYPE2_WAR_PRI_UPPER_LIMIT) || (diff_ts > DFS_ETSI_TYPE3_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_ETSI_TYPE3_WAR_PRI_UPPER_LIMIT))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "\n%s:chan->ic_flags=0x%x,MHz Separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:Peak Index =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s:Modify ETSI pulse dur to valid range \n", __func__); @@ -598,7 +598,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "%s : Rejecting on rssi rssi=%u thresh=%u", __func__, re.re_rssi, ft->ft_rssithresh); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]: Rejecting on rssi rssi=%u thresh=%u", __func__, __LINE__, re.re_rssi, @@ -623,7 +623,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, __func__, (unsigned long long)deltaT, ft->ft_minpri); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:Rejecting on pri pri=%lld minpri=%u", __func__, __LINE__, @@ -657,7 +657,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (unsigned long long) deltaT, rf->rf_minpri); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d::Rejecting on individual filter min PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -681,7 +681,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, rf-> rf_minpri); CDF_TRACE - (CDF_MODULE_ID_SAP, + (QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -720,7 +720,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, rf-> rf_minpri); CDF_TRACE - (CDF_MODULE_ID_SAP, + (QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, @@ -770,9 +770,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "Found on channel minDur = %d, filterId = %d", ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, - "%s[%d]:### Found on channel minDur = %d,filterId = %d seg_id = %d ###", - __func__,__LINE__,ft->ft_mindur, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + "%s[%d]:### Found on channel minDur = %d, filterId = %d seg_id = %d ###", + __func__, __LINE__, ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1, seg_id); } @@ -798,7 +798,7 @@ dfsfound: */ dfs->ic->ic_curchan->ic_radar_found_segid = seg_id; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s[%d]:### RADAR FOUND ON CHANNEL %d (%d MHz),seg_id=%d ###", __func__, __LINE__, thischan->ic_ieee, thischan->ic_freq, seg_id); @@ -861,7 +861,7 @@ dfsfound: dfs->dfs_phyerr_freq_max = 0; dfs->dfs_phyerr_w53_counter = 0; } - /* CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ + /* CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ return retval; /* #endif */ /* return 1; */ diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index b58fdd937010..9fa88e5d0c32 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -42,7 +42,7 @@ * -------------------------------------------------------------------------*/ #include "cds_api.h" #include "cds_packet.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "p2p_api.h" #include "sme_api.h" @@ -249,7 +249,7 @@ typedef struct sap_StopBssCompleteEvent_s { } tSap_StopBssCompleteEvent; typedef struct sap_StationAssocIndication_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t assoId; uint8_t staId; uint8_t status; @@ -266,7 +266,7 @@ typedef struct sap_StationAssocIndication_s { } tSap_StationAssocIndication; typedef struct sap_StationAssocReassocCompleteEvent_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t staId; uint8_t status; uint8_t ies[MAX_ASSOC_IND_IE_LEN]; @@ -286,7 +286,7 @@ typedef struct sap_StationAssocReassocCompleteEvent_s { } tSap_StationAssocReassocCompleteEvent; typedef struct sap_StationDisassocCompleteEvent_s { - struct cdf_mac_addr staMac; + struct qdf_mac_addr staMac; uint8_t staId; /* STAID should not be used */ uint8_t status; uint32_t statusCode; @@ -295,14 +295,14 @@ typedef struct sap_StationDisassocCompleteEvent_s { typedef struct sap_StationSetKeyCompleteEvent_s { uint8_t status; - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr peerMacAddr; } tSap_StationSetKeyCompleteEvent; /*struct corresponding to SAP_STA_MIC_FAILURE_EVENT */ typedef struct sap_StationMICFailureEvent_s { - struct cdf_mac_addr srcMacAddr; /* address used to compute MIC */ - struct cdf_mac_addr staMac; /* taMacAddr transmitter address */ - struct cdf_mac_addr dstMacAddr; + struct qdf_mac_addr srcMacAddr; /* address used to compute MIC */ + struct qdf_mac_addr staMac; /* taMacAddr transmitter address */ + struct qdf_mac_addr dstMacAddr; eSapBool multicast; uint8_t IV1; /* first byte of IV */ uint8_t keyId; /* second byte of IV */ @@ -311,7 +311,7 @@ typedef struct sap_StationMICFailureEvent_s { } tSap_StationMICFailureEvent; /*Structure to return MAC address of associated stations */ typedef struct sap_AssocMacAddr_s { - struct cdf_mac_addr staMac; /* Associated station's MAC address */ + struct qdf_mac_addr staMac; /* Associated station's MAC address */ uint8_t assocId; /* Associated station's Association ID */ uint8_t staId; /* Allocated station Id */ uint8_t ShortGI40Mhz; @@ -323,7 +323,7 @@ typedef struct sap_AssocMacAddr_s { /*struct corresponding to SAP_ASSOC_STA_CALLBACK_EVENT */ typedef struct sap_AssocStaListEvent_s { - CDF_MODULE_ID module; + QDF_MODULE_ID module; /* module id that was passed in wlansap_get_assoc_stations API */ uint8_t noOfAssocSta; /* Number of associated stations */ tpSap_AssocMacAddr pAssocStas; @@ -336,16 +336,16 @@ typedef struct sap_AssocStaListEvent_s { typedef struct sap_GetWPSPBCSessionEvent_s { uint8_t status; /* module id that was passed in wlansap_get_assoc_stations API */ - CDF_MODULE_ID module; + QDF_MODULE_ID module; uint8_t UUID_E[16]; /* Unique identifier of the AP. */ - struct cdf_mac_addr addr; + struct qdf_mac_addr addr; eWPSPBCOverlap wpsPBCOverlap; } tSap_GetWPSPBCSessionEvent; typedef struct sap_WPSPBCProbeReqEvent_s { uint8_t status; /* module id that was passed in wlansap_get_assoc_stations API */ - CDF_MODULE_ID module; + QDF_MODULE_ID module; tSirWPSPBCProbeReq WPSPBCProbeReq; } tSap_WPSPBCProbeReqEvent; @@ -366,11 +366,11 @@ typedef struct sap_SendActionCnf_s { } tSap_SendActionCnf; typedef struct sap_UnknownSTAJoinEvent_s { - struct cdf_mac_addr macaddr; + struct qdf_mac_addr macaddr; } tSap_UnknownSTAJoinEvent; typedef struct sap_MaxAssocExceededEvent_s { - struct cdf_mac_addr macaddr; + struct qdf_mac_addr macaddr; } tSap_MaxAssocExceededEvent; typedef struct sap_DfsNolInfo_s { @@ -460,13 +460,13 @@ typedef struct sap_Event_s { typedef struct sap_SSID { uint8_t length; uint8_t ssId[MAX_SSID_LEN]; -} cdf_packed tSap_SSID_t; +} qdf_packed tSap_SSID_t; typedef struct sap_SSIDInfo { tSap_SSID_t ssid; /* SSID of the AP */ /* SSID should/shouldn't be bcast in probe RSP & beacon */ uint8_t ssidHidden; -} cdf_packed tSap_SSIDInfo_t; +} qdf_packed tSap_SSIDInfo_t; struct sap_acs_cfg { /* ACS Algo Input */ @@ -498,13 +498,13 @@ typedef struct sap_Config { tSap_SSIDInfo_t SSIDinfo; eCsrPhyMode SapHw_mode; /* Wireless Mode */ eSapMacAddrACL SapMacaddr_acl; - struct cdf_mac_addr accept_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ + struct qdf_mac_addr accept_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ bool ieee80211d; /* Specify if 11D is enabled or disabled */ bool protEnabled; /* Specify if protection is enabled or disabled */ /* Specify if OBSS protection is enabled or disabled */ bool obssProtEnabled; - struct cdf_mac_addr deny_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ - struct cdf_mac_addr self_macaddr; /* self macaddress or BSSID */ + struct qdf_mac_addr deny_mac[MAX_ACL_MAC_ADDRESS]; /* MAC filtering */ + struct qdf_mac_addr self_macaddr; /* self macaddress or BSSID */ uint8_t channel; /* Operation channel */ uint8_t sec_ch; chan_params_t ch_params; @@ -532,7 +532,7 @@ typedef struct sap_Config { uint32_t ap_table_max_size; uint32_t ap_table_expiration_time; uint32_t ht_op_mode_fixed; - enum tCDF_ADAPTER_MODE persona; /* Tells us which persona, GO or AP */ + enum tQDF_ADAPTER_MODE persona; /* Tells us which persona, GO or AP */ uint8_t disableDFSChSwitch; bool enOverLapCh; #ifdef WLAN_FEATURE_11W @@ -663,7 +663,7 @@ typedef struct sSapDfsInfo { typedef struct tagSapCtxList { uint8_t sessionID; void *pSapContext; - enum tCDF_ADAPTER_MODE sapPersona; + enum tQDF_ADAPTER_MODE sapPersona; } tSapCtxList, tpSapCtxList; typedef struct tagSapStruct { @@ -831,18 +831,18 @@ QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, - CDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); + QDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS wlansap_get_wps_session_overlap(void *p_cds_gctx); QDF_STATUS wlansap_set_counter_measure(void *p_cds_gctx, bool bEnable); QDF_STATUS wlan_sap_getstation_ie_information(void *p_cds_gctx, uint32_t *pLen, uint8_t *pBuf); QDF_STATUS wlansap_clear_acl(void *p_cds_gctx); QDF_STATUS wlansap_get_acl_accept_list(void *p_cds_gctx, - struct cdf_mac_addr *pAcceptList, uint8_t *nAcceptList); + struct qdf_mac_addr *pAcceptList, uint8_t *nAcceptList); QDF_STATUS wlansap_get_acl_deny_list(void *pCtx, - struct cdf_mac_addr *pDenyList, uint8_t *nDenyList); + struct qdf_mac_addr *pDenyList, uint8_t *nDenyList); QDF_STATUS wlansap_set_mode(void *p_cds_gctx, uint32_t mode); QDF_STATUS wlansap_get_acl_mode(void *p_cds_gctx, eSapMacAddrACL *mode); QDF_STATUS wlansap_modify_acl(void *p_cds_gctx, diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 32977d9f6b47..1273a6bd4dd8 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -108,12 +108,12 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, #endif if (NULL == hal_handle) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAILURE; } if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "In %s BSS already stopped", __func__); return QDF_STATUS_E_FAILURE; } @@ -121,7 +121,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, switch (scan_status) { case eCSR_SCAN_SUCCESS: /* sapScanCompleteCallback with eCSR_SCAN_SUCCESS */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_SUCCESS", scan_status); @@ -138,20 +138,20 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if ((get_result_status != QDF_STATUS_SUCCESS) && (get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* No scan results */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Get scan result failed! ret = %d", __func__, get_result_status); break; } #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scan_id != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Sending ACS Scan skip event", __func__); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: ACS scan id: %d (skipped ACS SCAN)", __func__, scan_id); #endif @@ -162,7 +162,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, default: event = eSAP_CHANNEL_SELECTION_FAILED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_ABORT/FAILURE", scan_status); } @@ -170,7 +170,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (operChannel == SAP_CHANNEL_NOT_SELECTED) #ifdef SOFTAP_CHANNEL_RANGE { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: No suitable channel selected due to DFS, LTE" "COEX and concurrent mode restrictions", __func__); @@ -199,7 +199,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, } #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel selected = %d", __func__, sap_ctx->channel); @@ -276,7 +276,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) ptSapContext sap_ctx = (struct sSapContext *)ctx; QDF_STATUS status; if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sap context is not valid")); return QDF_STATUS_E_FAILURE; } @@ -313,7 +313,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, QDF_STATUS status = QDF_STATUS_E_FAILURE; if (eCSR_SCAN_SUCCESS != scan_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"), scan_status); #ifdef SOFTAP_CHANNEL_RANGE @@ -328,7 +328,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->sap_status = eSAP_STATUS_SUCCESS; goto close_session; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status); /* * Now do @@ -346,19 +346,19 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, * to allow the default channel to be set when reporting to HDD */ oper_channel = SAP_CHANNEL_NOT_SELECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Get scan result failed! ret = %d"), scan_get_result_status); } else { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scanid != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Sending ACS Scan skip event")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("ACS scanid: %d (skipped ACS SCAN)"), scanid); } @@ -369,7 +369,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, if (oper_channel == SAP_CHANNEL_NOT_SELECTED) { #ifdef SOFTAP_CHANNEL_RANGE - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("No suitable channel selected")); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; @@ -398,7 +398,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->channelList = NULL; } #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel selected = %d"), sap_ctx->channel); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; sap_ctx->sap_status = eSAP_STATUS_SUCCESS; @@ -407,7 +407,7 @@ close_session: sap_ctx->sessionId, sap_hdd_signal_event_handler, sap_ctx); if (QDF_STATUS_SUCCESS != status) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession failed")); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -438,7 +438,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: changing target channel to [%d]"), mac_ctx->sap.SapDfsInfo.target_channel); sap_ctx->channel = mac_ctx->sap.SapDfsInfo.target_channel; @@ -452,7 +452,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, && (eSAP_DFS_DO_NOT_SKIP_CAC == mac_ctx->sap.SapDfsInfo.cac_state)) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%p]"), sap_ctx); /* DFS Channel */ @@ -461,7 +461,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u1 = 0; sap_event.u2 = 0; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%p]"), sap_ctx); @@ -476,7 +476,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u2 = eCSR_ROAM_RESULT_INFRA_STARTED; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%p]"), sap_ctx); /* non-DFS channel */ @@ -517,7 +517,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, uint8_t dfs_beacon_start_req = 0; if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: DFS channel switch disabled")); /* @@ -537,14 +537,14 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (eSAP_STARTED != sap_ctx->sapsMachine) { /* Further actions to be taken here */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); return; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_STARTED => eSAP_DISCONNECTING")); /* SAP to be moved to DISCONNECTING state */ sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -576,7 +576,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM")); /* Handle event */ @@ -596,7 +596,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (false == is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: sapctx[%p] ready but not concurrent sap"), sap_ctx); *ret_status = QDF_STATUS_SUCCESS; @@ -606,12 +606,12 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, /* Issue channel change req for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext; - if (!((CDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) + if (!((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) && (mac_ctx->sap.sapCtxList[intf].pSapContext != NULL))) continue; pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:issue chnl change for sapctx[%p]"), pSapContext); /* Send channel switch request */ @@ -622,7 +622,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, /* Handle event */ qdf_status = sap_fsm(pSapContext, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("post chnl chng req failed, sap[%p]"), sap_ctx); *ret_status = QDF_STATUS_E_FAILURE; @@ -652,14 +652,14 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, tWLAN_SAPEvent sap_event; if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) { if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "sapdfs: DFS channel switch disabled"); return; } if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status) return; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND")); /* @@ -679,7 +679,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Failed to send CAC end")); /* Want to still proceed and try to switch channel. * Lets try not to be on the DFS channel @@ -697,7 +697,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } if (eSAP_STARTED == sap_ctx->sapsMachine) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START")); /* @@ -715,7 +715,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } /* Further actions to be taken here */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); @@ -740,7 +740,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, QDF_STATUS *ret_status) { QDF_STATUS qdf_status; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -767,14 +767,14 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), roam_result, MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), roam_result, MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); @@ -812,18 +812,18 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, uint8_t intf; if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_ret_status = QDF_STATUS_E_NOMEM; return cdf_ret_status; } mac_ctx = PMAC_STRUCT(hal); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_status = %d\n"), roam_status); switch (roam_status) { case eCSR_ROAM_SESSION_OPENED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP")); sap_ctx->isSapSessionOpen = eSAP_TRUE; cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, @@ -831,7 +831,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, &sap_ctx->csr_roamId); break; case eCSR_ROAM_INFRA_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) { @@ -847,17 +847,17 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_LOSTLINK: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)\n"), roam_status); break; case eCSR_ROAM_MIC_ERROR_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)\n"), roam_status); break; case eCSR_ROAM_SET_KEY_COMPLETE: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -866,7 +866,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_ASSOCIATION_COMPLETION: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -875,7 +875,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_DISASSOCIATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE) @@ -884,7 +884,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_status); break; @@ -908,16 +908,16 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_SEND_P2P_STOP_BSS: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received stopbss")); sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAC_TRIG_STOP_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_DFS_RADAR_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received Radar Indication")); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT, (void *) eSAP_STATUS_SUCCESS); @@ -945,15 +945,15 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Issue stopbss for each sapctx */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: no available channel for sapctx[%p], StopBss"), pSapContext); @@ -962,26 +962,26 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_DFS_CHAN_SW_NOTIFY: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received Chan Sw Update Notification")); break; case eCSR_ROAM_SET_CHANNEL_RSP: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel response")); break; case eCSR_ROAM_EXT_CHG_CHNL_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel Indication")); break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_status not handled roam_status = %s (%d)\n"), get_e_roam_cmd_status_str(roam_status), roam_status); break; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_result = %d\n"), roam_result); switch (roam_result) { @@ -990,7 +990,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, csr_roam_info, &cdf_ret_status); break; case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -1015,7 +1015,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1026,7 +1026,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH_IND (%d)\n"), roam_result); /* @@ -1041,7 +1041,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)\n"), roam_result); /* @@ -1055,7 +1055,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)\n"), roam_result); /* @@ -1071,7 +1071,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_RESULT_AUTHENTICATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1082,7 +1082,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1091,7 +1091,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_INFRA_STARTED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)\n"), roam_result); /* @@ -1109,7 +1109,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1123,7 +1123,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_result); /* @@ -1137,7 +1137,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)\n"), roam_result); /* @@ -1150,7 +1150,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_NONE: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)\n"), roam_result); /* @@ -1164,7 +1164,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1204,7 +1204,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = %s (%d) not handled\n"), get_e_csr_roam_result_str(roam_result), roam_result); diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 4ed3b3636314..8bad4308903b 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -27,7 +27,7 @@ /*=========================================================================== - s a p C h S e l e c t . C + s a p C h S e l e c t . C OVERVIEW: This software unit holds the implementation of the WLAN SAP modules @@ -358,7 +358,7 @@ void sap_process_avoid_ie(tHalHandle hal, continue; sap_ctx->sap_detected_avoid_ch_ie.present = 1; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, "Q2Q IE - avoid ch %d", avoid_ch_ie->channel); @@ -425,7 +425,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) if (pSapCtx->dfs_ch_disable == true) { if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) { safe_channels[i].isSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: DFS Ch %d is not safe in" " Concurrent mode", @@ -446,7 +446,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) unsafe_channel_list[i]) { /* Found unsafe channel, update it */ safe_channels[j].isSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CH %d is not safe"), unsafe_channel_list[i]); @@ -460,7 +460,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) #else void sap_update_unsafe_channel_list(ptSapContext pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Not implemented", __func__); return; } @@ -490,18 +490,18 @@ void sap_cleanup_channel_list(void *p_cds_gctx) { ptSapContext pSapCtx; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Cleaning up the channel list structure"); if (NULL == p_cds_gctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "SAP Global Context is NULL"); return; } pSapCtx = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "SAP Context is NULL"); return; } @@ -552,7 +552,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl, /* Select the best channel from allowed list */ for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) { if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "Best channel is: %d", best_chnl); @@ -568,7 +568,7 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl, DESCRIPTION Function sap_chan_sel_init allocates the memory, intializes the - structures used by the channel selection algorithm + structures used by the channel selection algorithm DEPENDENCIES NA. @@ -599,7 +599,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, uint32_t dfs_master_cap_enabled; bool include_dfs_ch = true; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); pSpectInfoParams->numSpectChans = @@ -611,7 +611,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, * sizeof(*pSpectCh)); if (pSpectCh == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, CDF_MALLOC_ERR", __func__); return eSAP_FALSE; } @@ -642,7 +642,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* check if the channel is in NOL blacklist */ if (sap_dfs_is_channel_in_nol_list(pSapCtx, *pChans, PHY_SINGLE_CHANNEL_CENTERED)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is in NOL list", __func__, *pChans); chSafe = false; @@ -652,7 +652,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, if (include_dfs_ch == false) { if (CDS_IS_DFS_CH(*pChans)) { chSafe = false; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, DFS Ch %d not considered for ACS", __func__, *pChans); @@ -664,7 +664,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { if ((safe_channels[i].channelNumber == *pChans) && (false == safe_channels[i].isSafe)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is not safe", __func__, *pChans); @@ -695,7 +695,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, DESCRIPTION Function weightRssiCount calculates the channel weight due to rssi - and data count(here number of BSS observed) + and data count(here number of BSS observed) DEPENDENCIES NA. @@ -735,7 +735,7 @@ uint32_t sapweight_rssi_count(int8_t rssi, uint16_t count) rssicountWeight = rssiWeight + countWeight; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d", __func__, rssiWeight, countWeight, rssicountWeight); @@ -837,7 +837,7 @@ void sap_upd_chan_spec_params(tSirProbeRespBeacon *pBeaconStruct, uint16_t *centerFreq_2) { if (NULL == pBeaconStruct) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("pBeaconStruct is NULL")); return; } @@ -924,7 +924,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, uint16_t num_ch; int32_t offset = 0; if (NULL == spect_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("spect_ch is NULL")); return; } @@ -1006,7 +1006,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, void sap_interference_rssi_count(tSapSpectChInfo *spect_ch) { if (NULL == spect_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: spect_ch is NULL", __func__); return; } @@ -1170,11 +1170,11 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == pBeaconStruct) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to allocate memory in sap_compute_spect_weight\n"); return; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Computing spectral weight", __func__); /** @@ -1262,7 +1262,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, break; } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d \n", __func__, @@ -1286,7 +1286,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, /* Calculate the weights for all channels in the spectrum pSpectCh */ pSpectCh = pSpectInfoParams->pSpectCh; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Spectrum Channels Weight", __func__); for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans); @@ -1308,7 +1308,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pSpectCh->weight_copy = pSpectCh->weight; /* ------ Debug Info ------ */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1480,7 +1480,7 @@ void sap_sort_chl_weight_ht80(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1617,7 +1617,7 @@ void sap_sort_chl_weight_vht160(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1794,7 +1794,7 @@ void sap_sort_chl_weight_ht40_5_g(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1885,11 +1885,11 @@ void sap_sort_chl_weight_all(ptSapContext pSapCtx, #endif /* For testing */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Sorted Spectrum Channels Weight", __func__); pSpectCh = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1969,7 +1969,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, uint32_t tmpChNum; uint8_t count; #endif - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __func__); #ifdef FEATURE_WLAN_CH_AVOID @@ -1977,7 +1977,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, #endif if (NULL == pScanResult) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: No external AP present\n", __func__); #ifndef SOFTAP_CHANNEL_RANGE @@ -1987,7 +1987,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, endChannelNum = pSapCtx->acs_cfg->end_ch; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: start - end: %d - %d\n", __func__, startChannelNum, endChannelNum); @@ -2025,7 +2025,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; if (safe_channels[i].isSafe == true) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is safe\n", __func__, @@ -2036,7 +2036,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, break; } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is unsafe\n", __func__, @@ -2052,7 +2052,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Initialize the structure pointed by pSpectInfoParams */ if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, Ch Select initialization failed", __func__); return SAP_CHANNEL_NOT_SELECTED; } @@ -2171,7 +2171,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; #endif bestChNum = pSpectInfoParams->pSpectCh[count].chNum; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "change best channel to %d in PCL", bestChNum); @@ -2218,7 +2218,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Free all the allocated memory */ sap_chan_sel_exit(pSpectInfoParams); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch select Completed, Ch=%d", __func__, bestChNum); if (bestChNum > 0 && bestChNum <= 252) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 621169cdf7de..1ee12118004f 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -903,22 +903,22 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, case CH_WIDTH_20MHZ: /* HT20 */ pchan_matrix = ht20_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht20_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht20_chan); break; case CH_WIDTH_40MHZ: /* HT40 */ pchan_matrix = ht40_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht40_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht40_chan); break; case CH_WIDTH_80MHZ: /* HT80 */ pchan_matrix = ht80_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht80_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht80_chan); break; default: /* handle exception and fall back to HT20 table */ pchan_matrix = ht20_chan; - nchan_matrix = CDF_ARRAY_SIZE(ht20_chan); + nchan_matrix = QDF_ARRAY_SIZE(ht20_chan); break; } @@ -976,7 +976,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, /* not present in NOL */ continue; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing NOL channel: %d"), dfs_nol_channel); if (false == sap_find_target_channel_in_channel_matrix( @@ -986,7 +986,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * should never happen, we should always find a table * here, if we don't, need a fix here! */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Couldn't find target channel matrix!")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -1016,7 +1016,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * bad leakage in NOL channel, * remove from temp list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: channel: %d will have bad leakage due to channel: %d\n"), dfs_nol_channel, temp_ch_lst[j]); @@ -1051,7 +1051,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel) return; } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel=%d is not in the bitmap"), channel); } @@ -1106,7 +1106,7 @@ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, } break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid case.")); break; } @@ -1136,7 +1136,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID) pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return false; } @@ -1174,14 +1174,14 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return true; } if ((SAP_CHAN_PREFERRED_INDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_OUTDOOR(channelID))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Outdoor so invalid,preferred Indoor only"), channelID); @@ -1189,7 +1189,7 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID } else if ((SAP_CHAN_PREFERRED_OUTDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_INDOOR(channelID))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Indoor so invalid,preferred Outdoor only"), channelID); @@ -1251,14 +1251,14 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) uint8_t dfs_region; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return target_channel; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return target_channel; } @@ -1277,7 +1277,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } if (sap_get5_g_hz_channel_list(sapContext)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Getting 5Ghz channel list failed")); return target_channel; } @@ -1315,7 +1315,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Check for JAPAN W53 Channel operation capability */ if (true == sap_dfs_is_w53_invalid(hHal, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index:%d, Channel=%d Invalid,Japan W53 Disabled"), @@ -1336,7 +1336,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (false == sap_dfs_is_channel_in_preferred_location(hHal, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is invalid,preferred Channel Location %d Only"), @@ -1361,7 +1361,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Mark this channel invalid since it is still * in DFS Non-Occupancy-Period which is 30 mins. */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d Present in NOL LIST"), @@ -1378,7 +1378,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (pMac->sap.sap_channel_avoidance && sapContext->sap_detected_avoid_ch_ie.present) { if (sap_check_in_avoid_ch_list(sapContext, channelID)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."), i, channelID); @@ -1395,7 +1395,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * mark this channel invalid since it is out of ACS * channel range */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d out of ACS channel range"), i, channelID); @@ -1408,7 +1408,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* valid_chnl_count now have number of valid channels */ tmp_ch_lst = cdf_mem_malloc(valid_chnl_count); if (tmp_ch_lst == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: memory alloc failed")); return target_channel; } @@ -1422,7 +1422,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* prepare temp list of just the valid channels */ for (i = 0; i < sapContext->SapAllChnlList.numChannel; i++) { if (sapContext->SapAllChnlList.channelList[i].valid) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Adding Channel = %d to temp List"), @@ -1434,7 +1434,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Processing temp channel list against NOL.") @@ -1458,7 +1458,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) channelBitmap.chanBondingSet[3].startChannel = 132; channelBitmap.chanBondingSet[4].startChannel = 149; /* now loop through whatever is left of channel list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapdfs: Moving temp channel list to final.")); for (i = 0; i < valid_chnl_count; i++) { @@ -1467,7 +1467,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list (in case of 20MHz width) */ if (tmp_ch_lst[i] != 0) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing channel: %d "), tmp_ch_lst[i]); @@ -1476,7 +1476,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list */ if (ch_width == CH_WIDTH_20MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL ("sapdfs: Channel=%d added to available list"), @@ -1484,7 +1484,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) availableChannels[available_ch_cnt++] = tmp_ch_lst[i]; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sapdfs: Channel=%d added to bitmap"), tmp_ch_lst[i]); @@ -1509,11 +1509,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) */ if (available_ch_cnt == 0) { if (ch_width == CH_WIDTH_80MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 80MHz cb found, falling to 40MHz")); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), @@ -1523,11 +1523,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* continue to start of do loop */ continue; } else if (ch_width == CH_WIDTH_40MHZ) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 40MHz cb found, falling to 20MHz")); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), @@ -1557,7 +1557,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("No target channel found")); } @@ -1580,11 +1580,11 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } pMac->sap.SapDfsInfo.new_chanWidth = ch_width; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: New Channel width = %d"), pMac->sap.SapDfsInfo.new_chanWidth); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: target_channel = %d"), target_channel); @@ -1639,13 +1639,13 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, if (NULL == channels) return; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return; } @@ -1670,7 +1670,7 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, */ if (psapDfsChannelNolList[j].radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d already in NOL"), channels[i]); @@ -1685,7 +1685,7 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, psapDfsChannelNolList[j].radar_status_flag = eSAP_DFS_CHANNEL_UNAVAILABLE; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Added to NOL LIST"), channels[i]); @@ -1716,7 +1716,7 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel, } else return 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("cbmode: %d, channel: %d"), chanBondState, channel); switch (chanBondState) { @@ -1797,7 +1797,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * SAP operation since it is past * Non-Occupancy-Period so, return false. */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL,CHAN AVAILABLE"), nol->dfs_channel_number); return true; @@ -1830,7 +1830,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) nol->radar_status_flag = eSAP_DFS_CHANNEL_AVAILABLE; nol->radar_found_timestamp = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL, Channel AVAILABLE"), nol->dfs_channel_number); return true; @@ -1841,13 +1841,13 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * Channel is still in * Non-occupancy-Period. */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d in NOL, Channel UNAVAILBLE"), nol->dfs_channel_number); return false; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid Radar Status Flag")); } return true; @@ -1879,7 +1879,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, bool channel_available; if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("invalid h_hal")); return false; } else { @@ -1890,7 +1890,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if ((dfs_info->numCurrentRegDomainDfsChannels == 0) || (dfs_info->numCurrentRegDomainDfsChannels > NUM_5GHZ_CHANNELS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("invalid dfs channel count %d"), dfs_info->numCurrentRegDomainDfsChannels); return false; @@ -1927,7 +1927,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if (j < num_channels && i < dfs_info->numCurrentRegDomainDfsChannels) { if (num_channels > MAX_BONDED_CHANNELS) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("num_channel>MAX_BONDED_CHANNEL, reset")); num_channels = MAX_BONDED_CHANNELS; } @@ -1974,10 +1974,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, tHalHandle h_hal; uint8_t con_ch; - h_hal = cds_get_context(CDF_MODULE_ID_SME); + h_hal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == h_hal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("invalid h_hal")); return QDF_STATUS_E_FAULT; } @@ -1990,7 +1990,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->dfs_ch_disable = true; } else if (con_ch && sap_context->channel != con_ch && CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("MCC DFS not supported in AP_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2003,7 +2003,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); @@ -2013,12 +2013,12 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif } - if (cds_get_concurrency_mode() == (CDF_STA_MASK | CDF_SAP_MASK)) { + if (cds_get_concurrency_mode() == (QDF_STA_MASK | QDF_SAP_MASK)) { #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE if (sap_context->channel == AUTO_CHANNEL_SELECT) sap_context->dfs_ch_disable = true; else if (CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("DFS not supported in STA_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2031,7 +2031,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch && !CDS_IS_DFS_CH(con_ch)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); @@ -2043,7 +2043,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->channel == AUTO_CHANNEL_SELECT) { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("%s skip_acs_status = %d "), __func__, sap_context->acs_cfg->skip_scan_status); if (sap_context->acs_cfg->skip_scan_status != @@ -2095,7 +2095,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif /* Set requestType to Full scan */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("calling sme_scan_request")); #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (sap_context->acs_cfg->skip_scan_status == @@ -2128,10 +2128,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context); } if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), cdf_ret_status); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Configuring default channel, Ch=%d"), sap_context->channel); /* In case of error, switch to default channel */ @@ -2160,7 +2160,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, qdf_status = sap_fsm(sap_context, sap_event); } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("return sme_ScanReq, scanID=%d, Ch=%d"), scan_request.scan_id, sap_context->channel); } @@ -2171,18 +2171,18 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, } if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("## %s SKIPPED ACS SCAN"), __func__); wlansap_scan_callback(h_hal, sap_context, sap_context->sessionId, 0, eCSR_SCAN_SUCCESS); } #endif } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("for configured channel, Ch= %d"), sap_context->channel); if (sap_do_acs_pre_start_bss == true) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("ACS end due to Ch override. Sel Ch = %d"), sap_context->channel); sap_context->acs_cfg->pri_ch = sap_context->channel; @@ -2209,7 +2209,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * Have to wait for the call back to be called to get the * channel cannot advance state machine here as said above */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("before exiting sap_goto_channel_sel channel=%d"), sap_context->channel); @@ -2245,13 +2245,13 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - if (sapContext->csr_roamProfile.csrPersona == CDF_P2P_GO_MODE) - status = cds_get_vdev_types(CDF_P2P_GO_MODE, &type, &subType); + if (sapContext->csr_roamProfile.csrPersona == QDF_P2P_GO_MODE) + status = cds_get_vdev_types(QDF_P2P_GO_MODE, &type, &subType); else - status = cds_get_vdev_types(CDF_SAP_MODE, &type, &subType); + status = cds_get_vdev_types(QDF_SAP_MODE, &type, &subType); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "failed to get vdev type"); return QDF_STATUS_E_FAILURE; } @@ -2263,7 +2263,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) &sapContext->sessionId, type, subType); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", __func__, cdf_ret_status); @@ -2317,12 +2317,12 @@ sap_goto_starting sapContext->key_length = 32; cdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2330,7 +2330,7 @@ sap_goto_starting cdf_ret_status = sap_open_session(hHal, sapContext); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2369,7 +2369,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2377,7 +2377,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) sap_free_roam_profile(&sapContext->csr_roamProfile); cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2467,18 +2467,18 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, return QDF_STATUS_E_FAILURE; } if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP event callback event = %s"), sap_hdd_event_to_string(sap_hddevent)); @@ -2517,7 +2517,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, else bss_complete->staId = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("(eSAP_START_BSS_EVENT): staId = %d"), bss_complete->staId); @@ -2702,7 +2702,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_ap_event.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN; cdf_mem_copy((void *) sap_ap_event.sapevt.sapUnknownSTAJoin. macaddr.bytes, (void *) context, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); break; case eSAP_MAX_ASSOC_EXCEEDED: @@ -2750,7 +2750,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, (&mac_ctx->sap.SapDfsInfo.sapDfsChannelNolList[0]); break; case eSAP_ECSA_CHANGE_CHAN_IND: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s", __func__, "eSAP_ECSA_CHANGE_CHAN_IND"); sap_ap_event.sapHddEventCode = eSAP_ECSA_CHANGE_CHAN_IND; @@ -2758,7 +2758,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, csr_roaminfo->target_channel; break; default: - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("SAP Unknown callback event = %d"), sap_hddevent); break; @@ -2793,9 +2793,9 @@ ptSapContext sap_find_valid_concurrent_session(tHalHandle hHal) uint8_t intf = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { return pMac->sap.sapCtxList[intf].pSapContext; } @@ -2849,7 +2849,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal, if (NULL == sap_find_valid_concurrent_session(hHal)) { /* If timer is running then stop the timer and destory it */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: no session are valid, so clearing dfs global structure"); /* * CAC timer will be initiated and started only when SAP starts @@ -2893,9 +2893,9 @@ void sap_cac_reset_notify(tHalHandle hHal) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext->isCacStartNotified = false; pSapContext->isCacEndNotified = false; @@ -2925,12 +2925,12 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacStartNotified)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]", pSapContext); @@ -2939,7 +2939,7 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacStartNotified on interface[%d]", __func__, intf); @@ -2979,9 +2979,9 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf].pSapContext; - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacEndNotified)) { pSapContext = pMac->sap.sapCtxList[intf].pSapContext; @@ -2990,7 +2990,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); @@ -2998,7 +2998,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) } pSapContext->isCacEndNotified = true; pMac->sap.SapDfsInfo.sap_radar_found_status = false; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Start beacon request on sapctx[%p]", pSapContext); @@ -3008,7 +3008,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: channel[%d] from state %s => %s", pSapContext->channel, "eSAP_STARTING", "eSAP_STARTED"); @@ -3021,7 +3021,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); @@ -3031,7 +3031,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "eSAP_DFS_CAC_WAIT", "eSAP_STARTED"); @@ -3072,13 +3072,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("new from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); /* There can be one SAP Session for softap */ if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SME Session is already opened")); return QDF_STATUS_E_EXISTS; } @@ -3089,13 +3089,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, (sap_ctx->isScanSessionOpen == eSAP_FALSE)) { uint32_t type, subtype; if (QDF_STATUS_SUCCESS == cds_get_vdev_types( - CDF_STA_MODE, &type, &subtype)) { + QDF_STA_MODE, &type, &subtype)) { /* Open SME Session for scan */ qdf_status = sme_open_session(hal, NULL, sap_ctx, sap_ctx->self_mac_addr, &sap_ctx->sessionId, type, subtype); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Error: calling sme_open_session")); } else { @@ -3119,7 +3119,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); } else if (msg == eSAP_DFS_CHANNEL_CAC_START) { @@ -3129,10 +3129,10 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ sap_ctx->sapsMachine = eSAP_DFS_CAC_WAIT; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("from state eSAP_DISCONNECTED => SAP_DFS_CAC_WAIT")); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: starting dfs cac timer on sapctx[%p]"), sap_ctx); sap_start_dfs_cac_timer(sap_ctx); @@ -3149,7 +3149,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, event msg %d"), "eSAP_DISCONNECTED", msg); } @@ -3186,7 +3186,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, qdf_status = sme_close_session(hal, sap_ctx->sessionId, NULL, NULL); if (QDF_STATUS_SUCCESS != qdf_status) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("CloseSession error event msg %d"), msg); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -3227,7 +3227,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, ch = sap_random_channel_sel(sap_ctx); if (ch == 0) { /* No available channel found */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("No available channel found!!!")); sap_signal_hdd_event(sap_ctx, NULL, @@ -3236,7 +3236,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("channel %d is in NOL, StartBss on new channel %d"), sap_ctx->channel, ch); @@ -3269,7 +3269,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, * Transition from eSAP_CH_SELECT to eSAP_STARTING * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_STARTING"); /* Channel selected. Now can sap_goto_starting */ @@ -3289,7 +3289,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_ctx->ch_params.center_freq_seg1; sap_ctx->csr_roamProfile.ch_params.sec_ch_offset = sap_ctx->ch_params.sec_ch_offset; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("notify hostapd about channel selection: %d"), sap_ctx->channel); sap_signal_hdd_event(sap_ctx, NULL, @@ -3299,16 +3299,16 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, eCSR_BSS_TYPE_INFRA_AP); } else if (msg == eSAP_CHANNEL_SELECTION_FAILED) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Cannot start BSS, ACS Fail")); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_FAILURE); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: BSS stopped when Ch select in Progress", __func__); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_CH_SELECT", msg); } @@ -3336,7 +3336,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_DFS_CHANNEL_CAC_START) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT"); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) @@ -3349,7 +3349,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * check, need to switch the channel again */ eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n"); if (mac_ctx->sap.SapDfsInfo.target_channel) { sme_set_ch_params(hal, phymode, @@ -3359,9 +3359,9 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext t_sap_ctx; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { t_sap_ctx = @@ -3389,7 +3389,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, qdf_status = sap_cac_end_notify(hal, roam_info); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DFS_CAC_WAIT", "eSAP_DISCONNECTING"); @@ -3400,7 +3400,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * all APs are down. */ if (NULL == sap_find_valid_concurrent_session(hal)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: no sessions are valid, stopping timer")); sap_stop_dfs_cac_timer(sap_ctx); @@ -3409,7 +3409,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_DISCONNECTING; qdf_status = sap_goto_disconnecting(sap_ctx); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DFS_CAC_WAIT", msg); } @@ -3442,7 +3442,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state channel = %d %s => %s"), sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED"); sap_ctx->sapsMachine = eSAP_STARTED; @@ -3486,7 +3486,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from STARTING to DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3502,7 +3502,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3526,7 +3526,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_STARTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_STARTED"); @@ -3535,7 +3535,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTING", msg); } @@ -3564,7 +3564,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, * Transition from eSAP_STARTED to eSAP_DISCONNECTING * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTED", "eSAP_DISCONNECTING"); sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -3578,14 +3578,14 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, */ for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { ptSapContext temp_sap_ctx; - if (((CDF_SAP_MODE == + if (((QDF_SAP_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == + (QDF_P2P_GO_MODE == mac_ctx->sap.sapCtxList[intf].sapPersona)) && mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { temp_sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Sending CSAIE for sapctx[%p]"), temp_sap_ctx); @@ -3595,7 +3595,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, } } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTED", msg); } @@ -3625,7 +3625,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTING", "eSAP_DISCONNECTED"); sap_ctx->sapsMachine = eSAP_DISCONNECTED; @@ -3642,7 +3642,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, } } } else if (msg == eWNI_SME_CHANNEL_CHANGE_REQ) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Send channel change request on sapctx[%p]"), sap_ctx); /* @@ -3652,10 +3652,10 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, qdf_status = wlansap_channel_change_request((void *) sap_ctx, mac_ctx->sap.SapDfsInfo.target_channel); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("Sending DFS eWNI_SME_CHANNEL_CHANGE_REQ")); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DISCONNECTING", msg); } @@ -3686,19 +3686,19 @@ QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) tpAniSirGlobal mac_ctx; if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("sap_ctx=%p, state_var=%d, msg=0x%x"), sap_ctx, state_var, msg); @@ -3807,7 +3807,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->pRSNReqIE = cdf_mem_malloc(pconfig_params->RSNWPAReqIELength); if (NULL == profile->pRSNReqIE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__); return eSAP_STATUS_FAILURE; } @@ -3896,14 +3896,14 @@ void sap_free_roam_profile(tCsrRoamProfile *profile) } } -void sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size) +void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size) { uint8_t outer, inner; - struct cdf_mac_addr temp; + struct qdf_mac_addr temp; int32_t nRes = -1; if ((NULL == macList) || (size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more"), size); return; } @@ -3913,23 +3913,23 @@ void sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size) nRes = cdf_mem_compare2((macList + inner)->bytes, (macList + inner + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (nRes > 0) { cdf_mem_copy(temp.bytes, (macList + inner + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy((macList + inner + 1)->bytes, (macList + inner)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy((macList + inner)->bytes, - temp.bytes, CDF_MAC_ADDR_SIZE); + temp.bytes, QDF_MAC_ADDR_SIZE); } } } } eSapBool -sap_search_mac_list(struct cdf_mac_addr *macList, +sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index) { @@ -3938,7 +3938,7 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nEnd = num_mac - 1; if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more."), num_mac); return eSAP_FALSE; } @@ -3947,16 +3947,16 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nMiddle = (nStart + nEnd) / 2; nRes = cdf_mem_compare2(&macList[nMiddle], peerMac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (0 == nRes) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "search SUCC"); /* "index equals NULL" means the caller does not need the */ /* index value of the peerMac being searched */ if (index != NULL) { *index = (uint8_t) nMiddle; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "index %d", *index); } @@ -3968,22 +3968,22 @@ sap_search_mac_list(struct cdf_mac_addr *macList, nEnd = nMiddle - 1; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "search not succ"); return eSAP_FALSE; } -void sap_add_mac_to_acl(struct cdf_mac_addr *macList, +void sap_add_mac_to_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t *peerMac) { int32_t nRes = -1; int i; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "add acl entered"); if (NULL == macList || *size == 0 || *size > MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is incorrect."), *size); return; @@ -3991,28 +3991,28 @@ void sap_add_mac_to_acl(struct cdf_mac_addr *macList, for (i = ((*size) - 1); i >= 0; i--) { nRes = - cdf_mem_compare2(&macList[i], peerMac, CDF_MAC_ADDR_SIZE); + cdf_mem_compare2(&macList[i], peerMac, QDF_MAC_ADDR_SIZE); if (nRes > 0) { /* Move alphabetically greater mac addresses one index down to allow for insertion of new mac in sorted order */ cdf_mem_copy((macList + i + 1)->bytes, - (macList + i)->bytes, CDF_MAC_ADDR_SIZE); + (macList + i)->bytes, QDF_MAC_ADDR_SIZE); } else { break; } } /* This should also take care of if the element is the first to be added in the list */ - cdf_mem_copy((macList + i + 1)->bytes, peerMac, CDF_MAC_ADDR_SIZE); + cdf_mem_copy((macList + i + 1)->bytes, peerMac, QDF_MAC_ADDR_SIZE); /* increment the list size */ (*size)++; } -void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, +void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t index) { int i; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "remove acl entered"); /* * Return if the list passed is empty. Ideally this should never happen @@ -4022,7 +4022,7 @@ void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, */ if ((macList == NULL) || (*size == 0) || (*size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size %d is incorrect."), *size); return; @@ -4031,23 +4031,23 @@ void sap_remove_mac_from_acl(struct cdf_mac_addr *macList, /* Move mac addresses starting from "index" passed one index up to delete the void created by deletion of a mac address in ACL */ cdf_mem_copy((macList + i)->bytes, (macList + i + 1)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } /* The last space should be made empty since all mac addesses moved one step up */ - cdf_mem_zero((macList + (*size) - 1)->bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero((macList + (*size) - 1)->bytes, QDF_MAC_ADDR_SIZE); /* reduce the list size by 1 */ (*size)--; } -void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) +void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) { int i; uint8_t *macArray; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "print acl entered"); if ((NULL == macList) || (size == 0) || (size >= MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, either buffer is NULL or size %d is incorrect.", __func__, size); return; @@ -4055,7 +4055,7 @@ void sap_print_acl(struct cdf_mac_addr *macList, uint8_t size) for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "** ACL entry %i - " MAC_ADDRESS_STR, i, MAC_ADDR_ARRAY(macArray)); } @@ -4073,7 +4073,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (sap_search_mac_list (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " in deny list", __func__, MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; @@ -4084,7 +4084,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4097,7 +4097,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode) { sap_signal_hdd_event(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (void *) peerMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4134,7 +4134,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); if (NULL == hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid HAL pointer from p_cds_gctx")); *num_ch = 0; *ch_list = NULL; @@ -4143,7 +4143,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, start_ch_num = sap_ctx->acs_cfg->start_ch; end_ch_num = sap_ctx->acs_cfg->end_ch; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("startChannel %d, EndChannel %d, HW:%d"), start_ch_num, end_ch_num, sap_ctx->acs_cfg->hw_mode); @@ -4151,11 +4151,11 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, wlansap_extend_to_acs_range(&start_ch_num, &end_ch_num, &band_start_ch, &band_end_ch); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("expanded startChannel %d,EndChannel %d"), start_ch_num, end_ch_num); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("band_start_ch %d, band_end_ch %d"), band_start_ch, band_end_ch); @@ -4172,7 +4172,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list = (uint8_t *) cdf_mem_malloc(NUM_5GHZ_CHANNELS + NUM_24GHZ_CHANNELS); if (NULL == list) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Unable to allocate channel list")); *num_ch = 0; *ch_list = NULL; @@ -4218,12 +4218,12 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("%d %d skipped from ACS ch range"), ch_count, ch); @@ -4232,7 +4232,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); @@ -4249,14 +4249,14 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, #endif } if (0 == ch_count) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("No active channels present for the current region")); /* * LTE COEX: channel range outside the restricted 2.4GHz * band limits */ if (en_lte_coex && (start_ch_num > band_end_ch)) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, FL("SAP can't be started as due to LTE COEX")); } @@ -4270,7 +4270,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, } for (loop_count = 0; loop_count < ch_count; loop_count++) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, FL("channel number: %d"), list[loop_count]); } return QDF_STATUS_SUCCESS; @@ -4286,7 +4286,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) uint8_t count = 0; int i; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); return QDF_STATUS_E_FAULT; } @@ -4300,7 +4300,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) (tChannelInfo *) cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN * sizeof(tChannelInfo)); if (NULL == sapContext->SapAllChnlList.channelList) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, " Memory Allocation failed sap_get_channel_list"); return QDF_STATUS_E_NOMEM; } @@ -4310,7 +4310,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { sapContext->SapAllChnlList.channelList[count].channel = CDS_CHANNEL_NUM(i); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] CHANNEL = %d", __func__, __LINE__, sapContext->SapAllChnlList.channelList[count]. channel); @@ -4321,7 +4321,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) } sapContext->SapAllChnlList.numChannel = count; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF CHANNELS count = %d" "sapContext->SapAllChnlList.numChannel = %d", __func__, __LINE__, count, @@ -4350,7 +4350,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4378,7 +4378,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, sap_get5_g_hz_channel_list(sapContext); if (dfs_event->chan_list.nchannels > SIR_DFS_MAX_20M_SUB_CH) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("nchannels >SIR_DFS_MAX_20M_SUB_CH so resetting")); dfs_event->chan_list.nchannels = SIR_DFS_MAX_20M_SUB_CH; } @@ -4402,7 +4402,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *) eSAP_STATUS_SUCCESS); } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, FL("sapdfs: New selected target channel is [%d]"), target_channel); return target_channel; @@ -4420,7 +4420,7 @@ void sap_dfs_cac_timer_callback(void *data) tpAniSirGlobal pMac; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return; } @@ -4428,7 +4428,7 @@ void sap_dfs_cac_timer_callback(void *data) sapContext = sap_find_valid_concurrent_session(hHal); if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s no SAP contexts are found", __func__); return; } @@ -4441,7 +4441,7 @@ void sap_dfs_cac_timer_callback(void *data) /* * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%p]", sapContext->channel, sapContext); @@ -4467,7 +4467,7 @@ static int sap_stop_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4523,7 +4523,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4545,12 +4545,12 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) (sap_is_channel_bonding_etsi_weather_channel(sapContext)))) { cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec", sapContext->channel, cacTimeOut / 1000); cdf_mc_timer_init(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sap_dfs_cac_timer_callback, (void *) hHal); /*Start the CAC timer */ @@ -4579,14 +4579,14 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) tpAniSirGlobal pMac; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_init_dfs_channel_nol_list"); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -4608,7 +4608,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) .dfs_channel_number = CDS_CHANNEL_NUM(i); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s: CHANNEL = %d", __func__, pMac->sap.SapDfsInfo. @@ -4627,7 +4627,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels = count; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF DFS CHANNELS = %d", __func__, __LINE__, pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels); @@ -4646,9 +4646,9 @@ uint8_t sap_get_total_number_sap_intf(tHalHandle hHal) uint8_t intf_count = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { intf_count++; } @@ -4668,21 +4668,21 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal, uint8_t intf = 0; for (intf = 0; intf < SAP_MAX_NUM_SESSION; intf++) { - if (((CDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) + if (((QDF_SAP_MODE == pMac->sap.sapCtxList[intf].sapPersona) || - (CDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) + (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL) { pSapContext = (ptSapContext) pMac->sap.sapCtxList[intf]. pSapContext; if (pSapContext == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("sapCtx matched [%p]"), sapContext); continue; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("concurrent sapCtx[%p] didn't matche with [%p]"), diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 86f278114304..46bb79e86891 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -62,7 +62,7 @@ extern "C" { /* When MBSSID feature is enabled, SAP context is directly passed to SAP APIs */ #define CDS_GET_SAP_CB(ctx) (ptSapContext)(ctx) -#define CDS_GET_HAL_CB(ctx) cds_get_context(CDF_MODULE_ID_PE) +#define CDS_GET_HAL_CB(ctx) cds_get_context(QDF_MODULE_ID_PE) /* MAC Address length */ #define ANI_EAPOL_KEY_RSN_NONCE_SIZE 32 @@ -183,13 +183,13 @@ typedef struct sSapContext { tCsrSSIDInfo SSIDList[2]; /* Actual storage for AP bssid */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* Mac filtering settings */ eSapMacAddrACL eSapMacAddrAclMode; - struct cdf_mac_addr acceptMacList[MAX_ACL_MAC_ADDRESS]; + struct qdf_mac_addr acceptMacList[MAX_ACL_MAC_ADDRESS]; uint8_t nAcceptMac; - struct cdf_mac_addr denyMacList[MAX_ACL_MAC_ADDRESS]; + struct qdf_mac_addr denyMacList[MAX_ACL_MAC_ADDRESS]; uint8_t nDenyMac; /* QOS config */ @@ -339,21 +339,21 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac); void -sap_sort_mac_list(struct cdf_mac_addr *macList, uint8_t size); +sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size); void -sap_add_mac_to_acl(struct cdf_mac_addr *macList, uint8_t *size, +sap_add_mac_to_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t *peerMac); void -sap_remove_mac_from_acl(struct cdf_mac_addr *macList, uint8_t *size, +sap_remove_mac_from_acl(struct qdf_mac_addr *macList, uint8_t *size, uint8_t index); void -sap_print_acl(struct cdf_mac_addr *macList, uint8_t size); +sap_print_acl(struct qdf_mac_addr *macList, uint8_t size); eSapBool -sap_search_mac_list(struct cdf_mac_addr *macList, uint8_t num_mac, +sap_search_mac_list(struct qdf_mac_addr *macList, uint8_t num_mac, uint8_t *peerMac, uint8_t *index); QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 1e23e8749216..1e2c3b887c74 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -109,13 +109,13 @@ void *wlansap_open(void *p_cds_gctx) pSapCtx = (ptSapContext) cdf_mem_malloc(sizeof(tSapContext)); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return NULL; } /* Clean up SAP control block, initialize all values */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); wlansap_clean_cb(pSapCtx, 0); /*do not empty */ @@ -149,7 +149,7 @@ QDF_STATUS wlansap_start(void *pCtx) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start invoked successfully"); /*------------------------------------------------------------------------ Sanity check @@ -158,7 +158,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -186,7 +186,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); return QDF_STATUS_E_FAULT; } @@ -214,12 +214,12 @@ QDF_STATUS wlansap_stop(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_stop invoked successfully "); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -227,7 +227,7 @@ QDF_STATUS wlansap_stop(void *pCtx) sap_free_roam_profile(&pSapCtx->csr_roamProfile); if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); return QDF_STATUS_E_FAULT; } @@ -254,18 +254,18 @@ QDF_STATUS wlansap_close(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close invoked"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } /* Cleanup SAP control block */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close"); /* empty queues/lists/pkts if any */ @@ -300,7 +300,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -308,7 +308,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / /*------------------------------------------------------------------------ Clean up SAP control block, initialize all values ------------------------------------------------------------------------*/ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_clean_cb"); cdf_mem_zero(pSapCtx, sizeof(tSapContext)); @@ -317,7 +317,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d, sapContext value = %p", __func__, pSapCtx->sapsMachine, pSapCtx); pSapCtx->sessionId = 0; @@ -352,7 +352,7 @@ wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status) if (QDF_IS_STATUS_SUCCESS(status)) { /* If success what else to be handled??? */ } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "wlansap_pmc_full_pwr_req_cb: PMC failed to put the chip in Full power"); } @@ -376,7 +376,7 @@ uint8_t wlansap_get_state(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -407,7 +407,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx) hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from p_cds_gctx", __func__); return 0; } @@ -438,13 +438,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, tHalHandle h_hal = NULL; if (NULL == pconfig) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } if (NULL == psap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } @@ -469,13 +469,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, /* Save a copy to SAP context */ cdf_mem_copy(psap_ctx->csr_roamProfile.BSSIDs.bssid, - pconfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(psap_ctx->self_mac_addr, - pconfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); h_hal = (tHalHandle)CDS_GET_HAL_CB(psap_ctx->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from pvosGCtx", __func__); } else { /* @@ -507,7 +507,7 @@ uint32_t wlan_sap_get_vht_ch_width(void *ctx) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return 0; } @@ -529,7 +529,7 @@ void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return; } @@ -601,11 +601,11 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ ------------------------------------------------------------------------*/ pSapCtx = CDS_GET_SAP_CB(pCtx); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start_bss: sapContext=%p", pSapCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -632,20 +632,20 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ from Configuation ITEM received from HDD */ pSapCtx->csr_roamProfile.BSSIDs.numOfBSSIDs = 1; cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, - pSapCtx->self_mac_addr, sizeof(struct cdf_mac_addr)); + pSapCtx->self_mac_addr, sizeof(struct qdf_mac_addr)); /* Save a copy to SAP context */ cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, - pConfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(pSapCtx->self_mac_addr, - pConfig->self_macaddr.bytes, CDF_MAC_ADDR_SIZE); + pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); /* copy the configuration items to csrProfile */ sapconvert_to_csr_profile(pConfig, eCSR_BSS_TYPE_INFRA_AP, &pSapCtx->csr_roamProfile); hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -664,7 +664,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ pmac = PMAC_STRUCT(hHal); if (NULL == pmac) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -719,12 +719,12 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_set_mac_acl"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -776,7 +776,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Global CDS handle", __func__); return QDF_STATUS_E_FAULT; } @@ -784,7 +784,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -806,7 +806,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) * SAP context is directly passed to SAP APIs. * @modId: Module from whom list of associtated stations is supposed to be * probed. If an invalid module is passed then by default - * CDF_MODULE_ID_PE will be probed + * QDF_MODULE_ID_PE will be probed * @pAssocStas: Pointer to list of associated stations that are known to the * module specified in mod parameter * @@ -819,7 +819,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) */ QDF_STATUS wlansap_get_assoc_stations - (void *pCtx, CDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { + (void *pCtx, QDF_MODULE_ID modId, tpSap_AssocMacAddr pAssocStas) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); /*------------------------------------------------------------------------ @@ -827,7 +827,7 @@ wlansap_get_assoc_stations Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -846,7 +846,7 @@ wlansap_get_assoc_stations * @pCtx: Pointer to the global cds context; a handle to SAP's control block * can be extracted from its context. When MBSSID feature is enabled, * SAP context is directly passed to SAP APIs. - * @pRemoveMac: pointer to struct cdf_mac_addr for session MAC address + * @pRemoveMac: pointer to struct qdf_mac_addr for session MAC address * * This api function provides for Ap App/HDD to remove an entry from session * overlap info. @@ -858,7 +858,7 @@ wlansap_get_assoc_stations */ QDF_STATUS wlansap_remove_wps_session_overlap(void *pCtx, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -867,7 +867,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -893,7 +893,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, */ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) { - struct cdf_mac_addr pRemoveMac = CDF_MAC_ADDR_ZERO_INITIALIZER; + struct qdf_mac_addr pRemoveMac = QDF_MAC_ADDR_ZERO_INITIALIZER; ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -902,7 +902,7 @@ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -921,7 +921,7 @@ QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -936,7 +936,7 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -947,36 +947,36 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) /* API to get ACL Accept List */ QDF_STATUS -wlansap_get_acl_accept_list(void *pCtx, struct cdf_mac_addr *pAcceptList, +wlansap_get_acl_accept_list(void *pCtx, struct qdf_mac_addr *pAcceptList, uint8_t *nAcceptList) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } memcpy((void *)pAcceptList, (void *)pSapCtx->acceptMacList, - (pSapCtx->nAcceptMac * CDF_MAC_ADDR_SIZE)); + (pSapCtx->nAcceptMac * QDF_MAC_ADDR_SIZE)); *nAcceptList = pSapCtx->nAcceptMac; return QDF_STATUS_SUCCESS; } /* API to get Deny List */ QDF_STATUS -wlansap_get_acl_deny_list(void *pCtx, struct cdf_mac_addr *pDenyList, +wlansap_get_acl_deny_list(void *pCtx, struct qdf_mac_addr *pDenyList, uint8_t *nDenyList) { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } memcpy((void *)pDenyList, (void *)pSapCtx->denyMacList, - (pSapCtx->nDenyMac * CDF_MAC_ADDR_SIZE)); + (pSapCtx->nDenyMac * QDF_MAC_ADDR_SIZE)); *nDenyList = pSapCtx->nDenyMac; return QDF_STATUS_SUCCESS; } @@ -995,7 +995,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->denyMacList != NULL) { for (i = 0; i < (pSapCtx->nDenyMac - 1); i++) { cdf_mem_zero((pSapCtx->denyMacList + i)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } @@ -1005,7 +1005,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->acceptMacList != NULL) { for (i = 0; i < (pSapCtx->nAcceptMac - 1); i++) { cdf_mem_zero((pSapCtx->acceptMacList + i)->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } } @@ -1038,19 +1038,19 @@ wlansap_modify_acl ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP Context", __func__); return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "Modify ACL entered\n" "Before modification of ACL\n" "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); @@ -1064,7 +1064,7 @@ wlansap_modify_acl peer_sta_mac, &staBLIndex); if (sta_white_list && sta_black_list) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Peer mac " MAC_ADDRESS_STR " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", @@ -1072,7 +1072,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "cmd %d", cmd); switch (list_type) { @@ -1081,7 +1081,7 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nAcceptMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "White list is already maxed out. Cannot accept " MAC_ADDRESS_STR, @@ -1090,7 +1090,7 @@ wlansap_modify_acl } if (sta_white_list) { /* Do nothing if already present in white list. Just print a warning */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address already present in white list " MAC_ADDRESS_STR, @@ -1099,7 +1099,7 @@ wlansap_modify_acl } if (sta_black_list) { /* remove it from black list before adding to the white list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "STA present in black list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> @@ -1107,13 +1107,13 @@ wlansap_modify_acl &sap_ctx->nDenyMac, staBLIndex); } - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "... Now add to the white list"); sap_add_mac_to_acl(sap_ctx->acceptMacList, &sap_ctx->nAcceptMac, peer_sta_mac); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, @@ -1123,7 +1123,7 @@ wlansap_modify_acl struct tagCsrDelStaParams delStaParams; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Delete from white list"); sap_remove_mac_from_acl(sap_ctx->acceptMacList, @@ -1135,13 +1135,13 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the white list " MAC_ADDRESS_STR, @@ -1149,7 +1149,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1162,7 +1162,7 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nDenyMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Black list is already maxed out. Cannot accept " MAC_ADDRESS_STR, @@ -1171,7 +1171,7 @@ wlansap_modify_acl } if (sta_black_list) { /* Do nothing if already present in white list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address already present in black list " MAC_ADDRESS_STR, @@ -1180,7 +1180,7 @@ wlansap_modify_acl } if (sta_white_list) { /* remove it from white list before adding to the black list */ - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "Present in white list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> @@ -1195,31 +1195,31 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "... Now add to black list"); sap_add_mac_to_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, peer_sta_mac); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else if (cmd == DELETE_STA_FROM_ACL) { if (sta_black_list) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "Delete from black list"); sap_remove_mac_from_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, staBLIndex); - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "no accept and deny mac %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the black list " MAC_ADDRESS_STR, @@ -1227,7 +1227,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1235,17 +1235,17 @@ wlansap_modify_acl default: { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Invalid list type passed %d", list_type); return QDF_STATUS_E_FAILURE; } } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, "After modification of ACL"); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); return QDF_STATUS_SUCCESS; @@ -1272,7 +1272,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1308,7 +1308,7 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return qdf_status; } @@ -1370,7 +1370,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, hal = CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (!hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hal pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1449,7 +1449,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sapContext = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1457,7 +1457,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1480,7 +1480,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, valid = wlan_sap_validate_channel_switch(hHal, targetChannel, sapContext); if (!valid) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Channel switch to %u is not allowed due to concurrent channel interference"), targetChannel); return QDF_STATUS_E_FAULT; @@ -1520,7 +1520,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, * user input is used for the bandwidth */ if (target_bw != CH_WIDTH_MAX) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: target bw:%d new width:%d", __func__, target_bw, @@ -1528,7 +1528,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, new_ch_params.ch_width); pMac->sap.SapDfsInfo.new_ch_params.ch_width = pMac->sap.SapDfsInfo.new_chanWidth = - CDF_MIN(pMac->sap.SapDfsInfo. + QDF_MIN(pMac->sap.SapDfsInfo. new_ch_params.ch_width, target_bw); } @@ -1571,21 +1571,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sap_fsm(sapContext, &sapEvent); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Failed to request Channel Change, since" "SAP is not in eSAP_STARTED state", __func__); return QDF_STATUS_E_FAULT; } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel = %d is not valid in the current" "regulatory domain", __func__, targetChannel); return QDF_STATUS_E_FAULT; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Posted eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START" "successfully to sap_fsm for Channel = %d", __func__, targetChannel); @@ -1624,7 +1624,7 @@ QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1657,14 +1657,14 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1702,7 +1702,7 @@ wlan_sap_getstation_ie_information sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from pCtx")); return QDF_STATUS_E_FAULT; } @@ -1710,13 +1710,13 @@ wlan_sap_getstation_ie_information if (len) { ie_len = *len; *len = sap_ctx->nStaWPARSnReqIeLength; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("WPAIE len : %x"), *len); if ((buf) && (ie_len >= sap_ctx->nStaWPARSnReqIeLength)) { cdf_mem_copy(buf, sap_ctx->pStaWpaRsnReqIE, sap_ctx->nStaWPARSnReqIeLength); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); @@ -1743,12 +1743,12 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1756,7 +1756,7 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1803,12 +1803,12 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1816,7 +1816,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1852,12 +1852,12 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1865,7 +1865,7 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1931,7 +1931,7 @@ QDF_STATUS wlansap_set_wparsn_ies pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1939,7 +1939,7 @@ QDF_STATUS wlansap_set_wparsn_ies hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1983,14 +1983,14 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2004,7 +2004,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Send Action Frame"); return QDF_STATUS_E_FAULT; @@ -2037,14 +2037,14 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2058,7 +2058,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Set Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2084,7 +2084,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -2092,7 +2092,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2106,7 +2106,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Cancel Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2135,14 +2135,14 @@ QDF_STATUS wlansap_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2156,7 +2156,7 @@ QDF_STATUS wlansap_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Register MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2185,14 +2185,14 @@ QDF_STATUS wlansap_de_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2206,7 +2206,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Failed to Deregister MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2251,14 +2251,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2328,14 +2328,14 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2385,14 +2385,14 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2439,7 +2439,7 @@ QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2476,7 +2476,7 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2506,7 +2506,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2519,14 +2519,14 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) */ if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"), pMac->sap.SapDfsInfo.is_dfs_w53_disabled); status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("Regdomain not japan, set disable JP W53 not valid")); @@ -2553,7 +2553,7 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) if (NULL != hal) mac_ctx = PMAC_STRUCT(hal); if (mac_ctx == NULL || hal == NULL) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("hal or mac_ctx pointer NULL")); return QDF_STATUS_E_FAULT; @@ -2590,7 +2590,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2605,7 +2605,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location = dfs_Preferred_Channels_location; - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, FL ("sapdfs:Set Preferred Operating Channel location=%d"), @@ -2614,7 +2614,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location")); @@ -2653,7 +2653,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2688,7 +2688,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, bufferLength = additionIELength; pBuffer = cdf_mem_malloc(bufferLength); if (NULL == pBuffer) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); return QDF_STATUS_E_NOMEM; @@ -2707,7 +2707,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); pConfig->probeRespBcnIEsLen = 0; pConfig->pProbeRespBcnIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Probe Resp beacone IE received in set beacon")); } @@ -2720,7 +2720,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespIEsBuffer); pConfig->probeRespIEsBufferLen = 0; pConfig->pProbeRespIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Probe Response IE received in set beacon")); } @@ -2733,13 +2733,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pAssocRespIEsBuffer); pConfig->assocRespIEsLen = 0; pConfig->pAssocRespIEsBuffer = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("No Assoc Response IE received in set beacon")); } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("No matching buffer type %d"), updateType); if (pBuffer != NULL) cdf_mem_free(pBuffer); @@ -2753,7 +2753,7 @@ QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType) { if (NULL == pConfig) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Config pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2783,7 +2783,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp default: if (eUPDATE_IE_ALL != updateType) - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Invalid buffer type %d"), updateType); break; } @@ -2893,20 +2893,20 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) bool bAvailable = false; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } @@ -2914,7 +2914,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList; if (!dfs_nol) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL context is null", __func__); return QDF_STATUS_E_FAULT; } @@ -2944,7 +2944,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) eSAP_DFS_CHANNEL_AVAILABLE; dfs_nol[i].radar_found_timestamp = 0; - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is AVAILABLE", __func__, dfs_nol[i].dfs_channel_number); } else { @@ -2953,7 +2953,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) left_time = SAP_DFS_NON_OCCUPANCY_PERIOD - elapsed_time; left_time = left_time / (60 * 1000 * 1000); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is UNAVAILABLE [%lu min left]", __func__, dfs_nol[i].dfs_channel_number, left_time); @@ -2991,26 +2991,26 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) tpAniSirGlobal pMac = NULL; if (NULL == sapContext) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } if (conf == eSAP_DFS_NOL_CLEAR) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: clear the DFS NOL", __func__); for (i = 0; @@ -3027,7 +3027,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) sapDfsChannelNolList[i].radar_found_timestamp = 0; } } else if (conf == eSAP_DFS_NOL_RANDOMIZE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Randomize the DFS NOL", __func__); /* random 1/0 to decide to put the channel into NOL */ @@ -3063,7 +3063,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) [i].radar_found_timestamp = 0; } - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Set channel[%d] %s", __func__, pMac->sap.SapDfsInfo.sapDfsChannelNolList[i] @@ -3074,7 +3074,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) "AVAILABLE"); } } else { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: unsupport type %d", __func__, conf); } @@ -3106,7 +3106,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, cdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); else cdf_mem_copy(pDelStaParams->peerMacAddr.bytes, mac, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (reason_code == 0) pDelStaParams->reason_code = eSIR_MAC_DEAUTH_LEAVING_BSS_REASON; @@ -3119,7 +3119,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, else pDelStaParams->subtype = (SIR_MAC_MGMT_DEAUTH >> 4); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, FL( "Delete STA with RC:%hu subtype:%hhu MAC::" MAC_ADDRESS_STR), @@ -3155,7 +3155,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context = CDS_GET_SAP_CB(pvos_gctx); if (NULL == sap_context) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pvos_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -3163,13 +3163,13 @@ wlansap_acs_chselect(void *pvos_gctx, h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from pvosGCtx", __func__); return QDF_STATUS_E_FAULT; } if (sap_context->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, "%s:SME Session is already opened\n", __func__); return QDF_STATUS_E_EXISTS; } @@ -3192,7 +3192,7 @@ wlansap_acs_chselect(void *pvos_gctx, pusr_context); if (QDF_STATUS_SUCCESS == - cds_get_vdev_types(CDF_STA_MODE, &type, &subType)) { + cds_get_vdev_types(QDF_STA_MODE, &type, &subType)) { /* * Open SME Session for scan */ @@ -3201,7 +3201,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->self_mac_addr, &sap_context->sessionId, type, subType)) { - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_OpenSession", __func__); @@ -3237,7 +3237,7 @@ wlansap_acs_chselect(void *pvos_gctx, qdf_status = sap_goto_channel_sel(sap_context, NULL, true); if (QDF_STATUS_E_ABORTED == qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); return QDF_STATUS_E_FAILURE; @@ -3247,9 +3247,9 @@ wlansap_acs_chselect(void *pvos_gctx, * failed or ACS is overridden due to other constrainst * So send selected channel to HDD */ - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Scan Req Failed/ACS Overridden")); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, FL("Selected channel = %d"), sap_context->channel); if (sap_context->isScanSessionOpen == eSAP_TRUE) { @@ -3265,7 +3265,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->isScanSessionOpen = eSAP_FALSE; else - CDF_TRACE(CDF_MODULE_ID_SAP, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "ACS Scan Session close fail"); sap_context->sessionId = 0xff; @@ -3275,7 +3275,7 @@ wlansap_acs_chselect(void *pvos_gctx, eSAP_ACS_CHANNEL_SELECTED, (void *) eSAP_STATUS_SUCCESS); } else if (QDF_STATUS_SUCCESS == qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); } } @@ -3316,7 +3316,7 @@ wlansap_get_phymode(void *pctx) sap_context = CDS_GET_SAP_CB(pctx); if (NULL == sap_context) { - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pctx", __func__); return eCSR_DOT11_MODE_AUTO; } diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 34934654962c..a359244f55cb 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -245,7 +245,7 @@ typedef struct tagCsrSSIDs { typedef struct tagCsrBSSIDs { uint32_t numOfBSSIDs; - struct cdf_mac_addr *bssid; + struct qdf_mac_addr *bssid; } tCsrBSSIDs; typedef struct tagCsrStaParams { @@ -267,7 +267,7 @@ typedef struct tagCsrStaParams { typedef struct tagCsrScanRequest { tSirScanType scanType; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eCsrRoamBssType BSSType; tCsrSSIDs SSIDs; tCsrChannelInfo ChannelInfo; @@ -291,7 +291,7 @@ typedef struct tagCsrScanResultInfo { */ void *pvIes; tAniSSID ssId; - v_TIME_t timer; /* timer is variable for hidden SSID timer */ + unsigned long timer; /* timer is variable for hidden SSID timer */ /* * This member must be the last in the structure because the * end of tSirBssDescription is an @@ -385,7 +385,7 @@ typedef struct tagCsrScanResultFilter { */ uint8_t scan_filter_for_roam; struct sCsrChannel_ pcl_channels; - enum tCDF_ADAPTER_MODE csrPersona; + enum tQDF_ADAPTER_MODE csrPersona; } tCsrScanResultFilter; typedef struct sCsrChnPower_ { @@ -804,23 +804,23 @@ enum csr_hi_rssi_scan_id { }; typedef struct tagPmkidCandidateInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; bool preAuthSupported; } tPmkidCandidateInfo; typedef struct tagPmkidCacheInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; uint8_t PMKID[CSR_RSN_PMKID_SIZE]; } tPmkidCacheInfo; #ifdef FEATURE_WLAN_WAPI typedef struct tagBkidCandidateInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; bool preAuthSupported; } tBkidCandidateInfo; typedef struct tagBkidCacheInfo { - struct cdf_mac_addr BSSID; + struct qdf_mac_addr BSSID; uint8_t BKID[CSR_WAPI_BKID_SIZE]; } tBkidCacheInfo; #endif /* FEATURE_WLAN_WAPI */ @@ -925,7 +925,7 @@ typedef struct tagCsrRoamProfile { uint16_t cfg_protection; uint8_t wps_state; tCsrMobilityDomainInfo MDID; - enum tCDF_ADAPTER_MODE csrPersona; + enum tQDF_ADAPTER_MODE csrPersona; uint8_t disableDFSChSwitch; /* addIe params */ tSirAddIeParams addIeParams; @@ -951,7 +951,7 @@ typedef struct tagCsrRoamConnectedProfile { tSirMacSSid SSID; bool handoffPermitted; bool ssidHidden; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; eCsrRoamBssType BSSType; eCsrAuthType AuthType; tCsrAuthList AuthInfo; @@ -1253,12 +1253,12 @@ typedef struct tagCsrRoamInfo { uint8_t *pbFrames; bool fReassocReq; /* set to true if for re-association */ bool fReassocRsp; /* set to true if for re-association */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; /* * Only valid in IBSS. this is the peers MAC address for * eCSR_ROAM_RESULT_IBSS_NEW_PEER or PEER_DEPARTED */ - struct cdf_mac_addr peerMac; + struct qdf_mac_addr peerMac; tSirResultCodes statusCode; /* this'd be our own defined or sent from otherBSS(per 802.11spec) */ uint32_t reasonCode; @@ -1447,7 +1447,7 @@ typedef struct tagCsrPerStaStatsInfo { typedef struct tagCsrRoamSetKey { eCsrEncryptionType encType; tAniKeyDirection keyDirection; /* Tx, Rx or Tx-and-Rx */ - struct cdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ + struct qdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ uint8_t paeRole; /* 0 for supplicant */ uint8_t keyId; /* Key index */ uint16_t keyLength; /* Number of bytes containing the key in pKey */ @@ -1457,7 +1457,7 @@ typedef struct tagCsrRoamSetKey { typedef struct tagCsrRoamRemoveKey { eCsrEncryptionType encType; - struct cdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ + struct qdf_mac_addr peerMac; /* Peer MAC. ALL 1's for group key */ uint8_t keyId; /* key index */ } tCsrRoamRemoveKey; @@ -1497,7 +1497,7 @@ typedef enum { } handoff_src; typedef struct tagCsrHandoffRequest { - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t channel; uint8_t src; /* To check if its a REASSOC or a FASTREASSOC IOCTL */ } tCsrHandoffRequest; @@ -1517,7 +1517,7 @@ typedef struct tagCsrEseBeaconReq { #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ struct tagCsrDelStaParams { - struct cdf_mac_addr peerMacAddr; + struct qdf_mac_addr peerMacAddr; uint16_t reason_code; uint8_t subtype; }; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1ce867970021..1c2aa01cc73f 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -295,7 +295,7 @@ typedef struct tagScanProfile { uint8_t bReturnAfter1stMatch; uint8_t fUniqueResult; uint8_t freshScan; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; } tScanProfile; typedef struct tagBssConfigParam { @@ -327,7 +327,7 @@ typedef struct tagCsrRoamStartBssParams { * This is the BSSID for the party we want to * join (only use for IBSS or WDS). */ - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; tSirNwType sirNwType; ePhyChanBondState cbMode; tSirMacRateSet operationalRateSet; @@ -346,7 +346,7 @@ typedef struct tagCsrRoamStartBssParams { uint8_t ApUapsdEnable; uint8_t ssidHidden; uint8_t wps_state; - enum tCDF_ADAPTER_MODE bssPersona; + enum tQDF_ADAPTER_MODE bssPersona; uint16_t nRSNIELength; /* If 0, pRSNIE is ignored. */ uint8_t *pRSNIE; /* If not null, it has IE byte stream for RSN */ /* Flag used to indicate update beaconInterval */ @@ -409,7 +409,7 @@ typedef struct tagSetKeyCmd { eCsrEncryptionType encType; eCsrAuthType authType; tAniKeyDirection keyDirection; /* Tx, Rx or Tx-and-Rx */ - struct cdf_mac_addr peermac; /* Peer's MAC address. ALL 1's for group key */ + struct qdf_mac_addr peermac; /* Peer's MAC address. ALL 1's for group key */ uint8_t paeRole; /* 0 for supplicant */ uint8_t keyId; /* Kye index */ uint8_t keyLength; /* Number of bytes containing the key in pKey */ @@ -429,7 +429,7 @@ typedef struct tagWmStatusChangeCmd { typedef struct tagAddStaForSessionCmd { /* Session self mac addr */ tSirMacAddr selfMacAddr; - enum tCDF_ADAPTER_MODE currDeviceMode; + enum tQDF_ADAPTER_MODE currDeviceMode; uint32_t type; uint32_t subType; uint8_t sessionId; @@ -706,7 +706,7 @@ typedef struct tagCsrScanStruct { v_REGDOMAIN_t domainIdCurrent; /* current regulatory domain */ /* Bssid for current country code */ - struct cdf_mac_addr currentCountryBssid; + struct qdf_mac_addr currentCountryBssid; int8_t currentCountryRSSI; /* RSSI for current country code */ bool fCancelIdleScan; @@ -841,7 +841,7 @@ typedef struct tagCsrRoamOffloadSynchStruct { uint8_t nss; /* no of spatial streams */ uint16_t chainMask; /* chainmask */ uint16_t smpsMode; /* smps.mode */ - struct cdf_mac_addr bssid; /* MAC address of roamed AP */ + struct qdf_mac_addr bssid; /* MAC address of roamed AP */ tCsrRoamOffloadAuthStatus authStatus; /* auth status */ uint8_t kck[SIR_KCK_KEY_LEN]; uint8_t kek[SIR_KEK_KEY_LEN]; @@ -865,7 +865,7 @@ typedef struct tagCsrRoamSession { bool sessionActive; /* true if it is used */ /* For BT-AMP station, this serve as BSSID for self-BSS. */ - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; csr_roam_completeCallback callback; void *pContext; @@ -944,7 +944,7 @@ typedef struct tagCsrRoamSession { tCsrEseCckmInfo eseCckmInfo; bool isPrevApInfoValid; tSirMacSSid prevApSSID; - struct cdf_mac_addr prevApBssid; + struct qdf_mac_addr prevApBssid; uint8_t prevOpChannel; uint16_t clientDissSecs; uint32_t roamTS1; @@ -1232,15 +1232,15 @@ QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, uint32_t periodicity, bool cache, uint8_t staId, void *pContext, uint8_t sessionId); QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext); + uint8_t staId, struct qdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); @@ -1324,15 +1324,15 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); /* Post Channel Change Indication */ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); /* Post Beacon Tx Start Indication */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); QDF_STATUS -csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct cdf_mac_addr bssid, +csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); QDF_STATUS @@ -1397,6 +1397,6 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal pMac, bool csr_wait_for_connection_update(tpAniSirGlobal mac, bool do_release_reacquire_lock); -enum tCDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, +enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, uint32_t session_id); #endif diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index c65f19563327..aeafbad84d09 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -141,7 +141,7 @@ typedef struct sCsrNeighborRoamControlInfo { eCsrNeighborRoamState neighborRoamState; eCsrNeighborRoamState prevNeighborRoamState; tCsrNeighborRoamCfgParams cfgParams; - struct cdf_mac_addr currAPbssid; /* current assoc AP */ + struct qdf_mac_addr currAPbssid; /* current assoc AP */ uint8_t currAPoperationChannel; /* current assoc AP */ tCsrNeighborRoamChannelInfo roamChannelInfo; uint8_t currentNeighborLookupThreshold; diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index d937ba0e8015..e5dfa58ebbf6 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -131,7 +131,7 @@ typedef enum { typedef struct sDot11IEHeader { uint8_t ElementID; uint8_t Length; -} cdf_packed tDot11IEHeader; +} qdf_packed tDot11IEHeader; typedef struct tagCsrWpaIe { tDot11IEHeader IeHeader; @@ -141,15 +141,15 @@ typedef struct tagCsrWpaIe { uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_WPA_OUI_SIZE]; - } cdf_packed UnicastOui[1]; -} cdf_packed tCsrWpaIe; + } qdf_packed UnicastOui[1]; +} qdf_packed tCsrWpaIe; typedef struct tagCsrWpaAuthIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_WPA_OUI_SIZE]; - } cdf_packed AuthOui[1]; -} cdf_packed tCsrWpaAuthIe; + } qdf_packed AuthOui[1]; +} qdf_packed tCsrWpaAuthIe; typedef struct tagCsrRSNIe { tDot11IEHeader IeHeader; @@ -158,15 +158,15 @@ typedef struct tagCsrRSNIe { uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_RSN_OUI_SIZE]; - } cdf_packed UnicastOui[1]; -} cdf_packed tCsrRSNIe; + } qdf_packed UnicastOui[1]; +} qdf_packed tCsrRSNIe; typedef struct tagCsrRSNAuthIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_RSN_OUI_SIZE]; - } cdf_packed AuthOui[1]; -} cdf_packed tCsrRSNAuthIe; + } qdf_packed AuthOui[1]; +} qdf_packed tCsrRSNAuthIe; typedef struct tagCsrRSNCapabilities { uint16_t PreAuthSupported:1; @@ -176,19 +176,19 @@ typedef struct tagCsrRSNCapabilities { uint16_t MFPRequired:1; uint16_t MFPCapable:1; uint16_t Reserved:8; -} cdf_packed tCsrRSNCapabilities; +} qdf_packed tCsrRSNCapabilities; typedef struct tagCsrRSNPMKIe { uint16_t cPMKIDs; struct { uint8_t PMKID[CSR_RSN_PMKID_SIZE]; - } cdf_packed PMKIDList[1]; -} cdf_packed tCsrRSNPMKIe; + } qdf_packed PMKIDList[1]; +} qdf_packed tCsrRSNPMKIe; typedef struct tCsrIELenInfo { uint8_t min; uint8_t max; -} cdf_packed tCsrIELenInfo; +} qdf_packed tCsrIELenInfo; #ifdef FEATURE_WLAN_WAPI typedef struct tagCsrWapiIe { @@ -197,17 +197,17 @@ typedef struct tagCsrWapiIe { uint16_t cAuthenticationSuites; struct { uint8_t Oui[CSR_WAPI_OUI_SIZE]; - } cdf_packed AuthOui[1]; + } qdf_packed AuthOui[1]; uint16_t cUnicastCyphers; struct { uint8_t Oui[CSR_WAPI_OUI_SIZE]; - } cdf_packed UnicastOui[1]; + } qdf_packed UnicastOui[1]; uint8_t MulticastOui[CSR_WAPI_OUI_SIZE]; struct { uint16_t PreAuthSupported:1; uint16_t Reserved:15; - } cdf_packed tCsrWapiCapabilities; -} cdf_packed tCsrWapiIe; + } qdf_packed tCsrWapiCapabilities; +} qdf_packed tCsrWapiIe; #endif /* FEATURE_WLAN_WAPI */ typedef struct tagRoamingTimerInfo { @@ -225,7 +225,7 @@ typedef struct tagRoamingTimerInfo { ((pIes)->WMMInfoAp.present && (pIes)->WMMInfoAp.uapsd)) bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, - struct cdf_mac_addr *pBssId); + struct qdf_mac_addr *pBssId); bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2); eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, @@ -316,8 +316,8 @@ bool csr_match_bss(tHalHandle hHal, tSirBssDescription *pBssDesc, tCsrScanResultFilter *pFilter, eCsrAuthType *pNegAuth, eCsrEncryptionType *pNegUc, eCsrEncryptionType *pNegMc, tDot11fBeaconIEs **ppIes); -bool csr_is_bssid_match(tHalHandle hHal, struct cdf_mac_addr *pProfBssid, - struct cdf_mac_addr *BssBssid); +bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, + struct qdf_mac_addr *BssBssid); bool csr_match_bss_to_connect_profile(tHalHandle hHal, tCsrRoamConnectedProfile *pProfile, tSirBssDescription *pBssDesc, tDot11fBeaconIEs *pIes); @@ -356,11 +356,11 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t *pRoamId, bool fForce); QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal pMac, - uint32_t cursessionId, enum tCDF_ADAPTER_MODE currBssPersona); + uint32_t cursessionId, enum tQDF_ADAPTER_MODE currBssPersona); /* BeaconInterval validation for MCC support */ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, - enum tCDF_ADAPTER_MODE currBssPersona); + enum tQDF_ADAPTER_MODE currBssPersona); bool csr_is_profile11r(tCsrRoamProfile *pProfile); bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent); #ifdef FEATURE_WLAN_ESE diff --git a/core/sme/inc/nan_api.h b/core/sme/inc/nan_api.h index 0d68a3fe8e8b..1c0722b2ae94 100644 --- a/core/sme/inc/nan_api.h +++ b/core/sme/inc/nan_api.h @@ -36,8 +36,7 @@ #ifndef __NAN_API_H__ #define __NAN_API_H__ -#include "cdf_types.h" -#include "cdf_types.h" +#include "qdf_types.h" typedef struct sNanRequestReq { uint16_t request_data_len; diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 7519f1a41726..7b57e5dd31af 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -37,8 +37,7 @@ #ifndef __P2P_API_H__ #define __P2P_API_H__ -#include "cdf_types.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_mc_timer.h" #include "cdf_lock.h" diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index f41d9747e894..963ef871d82b 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -40,7 +40,7 @@ #include "csr_api.h" #include "cds_mq.h" #include "cdf_lock.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "cds_reg_service.h" #include "p2p_api.h" @@ -216,7 +216,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, uint8_t *pbSessionId, uint32_t type, uint32_t subType); void sme_set_curr_device_mode(tHalHandle hHal, - enum tCDF_ADAPTER_MODE currDeviceMode); + enum tQDF_ADAPTER_MODE currDeviceMode); QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); @@ -291,7 +291,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, eCsrRoamDisconnectReason reason); QDF_STATUS sme_roam_stop_bss(tHalHandle hHal, uint8_t sessionId); QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, @@ -303,7 +303,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS sme_roam_get_connect_state(tHalHandle hHal, uint8_t sessionId, eCsrConnectState *pState); QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, @@ -336,15 +336,15 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal, void *pContext, uint8_t sessionId); QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context); QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext); + uint8_t staId, struct qdf_mac_addr bssId, void *pContext); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, + uint8_t staId, struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid); QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, @@ -543,12 +543,12 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hal_ctx, #endif /* WLAN_FEATURE_GTK_OFFLOAD */ uint16_t sme_chn_to_freq(uint8_t chanNum); bool sme_is_channel_valid(tHalHandle hHal, uint8_t channel); -QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, - struct cdf_mac_addr pSelfMacAddress, int8_t dB); +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, + struct qdf_mac_addr pSelfMacAddress, int8_t dB); QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db); QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, - struct cdf_mac_addr bssid, - enum tCDF_ADAPTER_MODE dev_mode, int power); + struct qdf_mac_addr bssid, + enum tQDF_ADAPTER_MODE dev_mode, int power); QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr); QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden); @@ -738,7 +738,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab); #ifdef QCA_HT_2040_COEX QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, - struct cdf_mac_addr macAddrSTA, + struct qdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type); QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, @@ -775,11 +775,11 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); #endif QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile); QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, - struct cdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params); QDF_STATUS sme_init_thermal_info(tHalHandle hHal, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index d1ee264cce9e..91a686a2045d 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -41,7 +41,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "csr_internal.h" #include "sme_qos_api.h" @@ -109,7 +109,7 @@ typedef struct TdlsSendMgmtInfo { } tTdlsSendMgmtCmdInfo; typedef struct TdlsLinkEstablishInfo { - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint8_t uapsdQueues; uint8_t maxSp; uint8_t isBufSta; @@ -123,7 +123,7 @@ typedef struct TdlsLinkEstablishInfo { typedef struct TdlsAddStaInfo { eTdlsAddOper tdlsAddOper; - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; uint16_t capability; uint8_t extnCapability[SIR_MAC_MAX_EXTN_CAP]; uint8_t supportedRatesLen; @@ -137,7 +137,7 @@ typedef struct TdlsAddStaInfo { } tTdlsAddStaCmdInfo; typedef struct TdlsDelStaInfo { - struct cdf_mac_addr peermac; + struct qdf_mac_addr peermac; } tTdlsDelStaCmdInfo; /* * TDLS cmd info, CMD from SME to PE. diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 88286266d767..a3b1e4c9209c 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -41,7 +41,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "host_diag_core_event.h" #include "csr_link_list.h" #include "sme_power_save.h" @@ -148,7 +148,7 @@ typedef struct tagSmeStruct { tDblLinkList smeCmdActiveList; tDblLinkList smeCmdPendingList; tDblLinkList smeCmdFreeList; /* preallocated roam cmd list */ - enum tCDF_ADAPTER_MODE currDeviceMode; + enum tQDF_ADAPTER_MODE currDeviceMode; #ifdef FEATURE_WLAN_LPHB void (*pLphbIndCb)(void *pHddCtx, tSirLPHBInd *indParam); #endif /* FEATURE_WLAN_LPHB */ diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 7965e6d6274b..731edc0e6a0d 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -30,7 +30,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_system_defs.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index f3a18a409109..8add99a0b4c2 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index 7e24a2976d4a..ae09e6e90d5f 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" #include "sme_qos_api.h" diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index 1720d3b6c323..49b02625abf5 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" #include "sme_internal.h" diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index fdcb5e1ba7a5..312e295b0be6 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -40,7 +40,7 @@ #include "cdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "rrm_global.h" /*-------------------------------------------------------------------------- @@ -71,7 +71,7 @@ typedef struct sRrmNeighborRequestControlInfo { typedef struct sRrmSMEContext { uint16_t token; - struct cdf_mac_addr sessionBssId; + struct qdf_mac_addr sessionBssId; uint8_t regClass; /* list of all channels to be measured. */ tCsrChannelInfo channelList; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 5c7169a65d9d..af364d0246bf 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -46,7 +46,7 @@ #include "wma_if.h" #include "cdf_trace.h" #include "sme_trace.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cdf_trace.h" #include "cds_utils.h" #include "sap_api.h" @@ -374,11 +374,11 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; qdf_status = cdf_mc_timer_init(pMac->sme.smeCmdActiveList. - cmdTimeoutTimer, CDF_TIMER_TYPE_SW, + cmdTimeoutTimer, QDF_TIMER_TYPE_SW, active_list_cmd_timeout_handle, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); cdf_mem_free(pMac->sme.smeCmdActiveList. cmdTimeoutTimer); @@ -903,7 +903,7 @@ sme_process_cmd: csr_ll_insert_head(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_NOLOCK); /* .... and process the command. */ - MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, pCommand->sessionId, pCommand->command)); switch (pCommand->command) { @@ -974,7 +974,7 @@ sme_process_cmd: case eSmeCommandTdlsAddPeer: case eSmeCommandTdlsDelPeer: case eSmeCommandTdlsLinkEstablish: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("sending TDLS Command 0x%x to PE"), pCommand->command); csr_ll_unlock(&pMac->sme.smeCmdActiveList); @@ -1047,7 +1047,7 @@ QDF_STATUS sme_open(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.state = SME_STATE_STOP; - pMac->sme.currDeviceMode = CDF_STA_MODE; + pMac->sme.currDeviceMode = QDF_STA_MODE; if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( &pMac->sme.lkSmeGlobalLock))) { sms_log(pMac, LOGE, FL("sme_open failed init lock")); @@ -1141,7 +1141,7 @@ QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_11DINFO, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { sms_log(pMac, LOGE, @@ -1193,7 +1193,7 @@ QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_GET_SOFTAP_DOMAIN, NO_SESSION, 0)); if (NULL == domainIdSoftAp) { @@ -1212,7 +1212,7 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_REGINFO, NO_SESSION, 0)); if (NULL == apCntryCode) { sms_log(pMac, LOGE, "Empty Country Code, nothing to update"); @@ -1250,7 +1250,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid Sessionid")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1267,7 +1267,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) /* DFS channel is provided, no PLM bursts can be * transmitted. Ignoring these channels. */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("DFS channel %d ignored for PLM"), pPlmReq->plmChList[count]); @@ -1275,7 +1275,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } } else if (!ret) { /* Not supported, ignore the channel */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Unsupported channel %d ignored for PLM"), pPlmReq->plmChList[count]); continue; @@ -1301,9 +1301,9 @@ send_plm_start: msg.reserved = 0; msg.bodyptr = pPlmReq; - if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PLM_REQ to WMA")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1340,7 +1340,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_UPDATE_CONFIG, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { @@ -1381,7 +1381,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); } return status; @@ -1451,7 +1451,7 @@ QDF_STATUS sme_update_roam_params(tHalHandle hal, break; case REASON_ROAM_SET_BLACKLIST_BSSID: cdf_mem_set(&roam_params_dst->bssid_avoid_list, 0, - CDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST); + QDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST); roam_params_dst->num_bssid_avoid_list = roam_params_src.num_bssid_avoid_list; for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { @@ -1479,12 +1479,12 @@ void sme_process_get_gtk_info_rsp(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } if (pMac->sme.gtk_offload_get_info_cb == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: HDD callback is null", __func__); return; } @@ -1516,7 +1516,7 @@ void sme_process_ready_to_suspend(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1547,7 +1547,7 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1631,7 +1631,7 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_HDDREADYIND, NO_SESSION, 0)); do { @@ -1844,7 +1844,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu roamStatus = eCSR_ROAM_DFS_RADAR_IND; roamResult = eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Radar indication event occurred"); break; } @@ -1861,7 +1861,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sessionId = csaIeTxCompleteRsp->sessionId; roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY; roamResult = eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND for session id [%d]", sessionId); break; @@ -2178,7 +2178,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) switch (pMsg->type) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD case eWNI_SME_HO_FAIL_IND: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("LFR3: Rcvd eWNI_SME_HO_FAIL_IND")); csr_process_ho_fail_ind(pMac, pMsg->bodyptr); cdf_mem_free(pMsg->bodyptr); @@ -2431,7 +2431,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) /* channel avoid message arrived, send IND to client */ case eWNI_SME_CH_AVOID_IND: if (pMac->sme.pChAvoidNotificationCb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CH avoid notification")); pMac->sme.pChAvoidNotificationCb(pMac->hHdd, pMsg->bodyptr); @@ -2442,7 +2442,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) #ifdef FEATURE_WLAN_AUTO_SHUTDOWN case eWNI_SME_AUTO_SHUTDOWN_IND: if (pMac->sme.pAutoShutdownNotificationCb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Auto shutdown notification")); pMac->sme.pAutoShutdownNotificationCb(); } @@ -2936,7 +2936,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, cds_msg_t msg; uint32_t scan_req_id, scan_count; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, session_id, scan_req->scanType)); if (!mac_ctx->scan.fScanEnable) { @@ -3011,7 +3011,7 @@ QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); @@ -3050,13 +3050,13 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, tSirBssDescription first_ap_profile; if (NULL == mac_ctx) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("mac_ctx is NULL")); return QDF_STATUS_E_FAILURE; } scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); return QDF_STATUS_E_FAILURE; } else { @@ -3086,7 +3086,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, scan_filter->bOSENAssociation = 0; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); cdf_mem_free(scan_filter); return QDF_STATUS_E_FAILURE; @@ -3102,7 +3102,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, *scan_cache = filtered_scan_result; if (0 != first_ap_profile.channelId) { *ap_chnl_id = first_ap_profile.channelId; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Found best AP & its on chnl[%d]"), first_ap_profile.channelId); @@ -3113,20 +3113,20 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, * take of zero channel id case. */ *ap_chnl_id = 0; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan is empty, set chnl to 0")); status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get scan get result")); status = QDF_STATUS_E_FAILURE; } csr_free_scan_filter(mac_ctx, scan_filter); sme_release_global_lock(&mac_ctx->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); status = QDF_STATUS_E_FAILURE; } @@ -3160,7 +3160,7 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3195,7 +3195,7 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3232,7 +3232,7 @@ QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS ret_status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3261,7 +3261,7 @@ QDF_STATUS sme_scan_flush_result(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, 0, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3286,7 +3286,7 @@ QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3303,7 +3303,7 @@ QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3330,7 +3330,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3358,7 +3358,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3385,7 +3385,7 @@ QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3491,7 +3491,7 @@ QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3531,7 +3531,7 @@ QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -3566,7 +3566,7 @@ QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3603,7 +3603,7 @@ QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3633,7 +3633,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DISCONNECT, sessionId, reason)); sms_log(pMac, LOG2, FL("enter")); @@ -3733,7 +3733,7 @@ QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, return status; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, sessionId, pDelStaParams->reason_code)); status = sme_acquire_global_lock(&pMac->sme); @@ -3792,7 +3792,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \param sessionId - sessionId of SoftAP \param modId - Module from whom list of associtated stations is to be probed. If an invalid module is passed then - by default CDF_MODULE_ID_PE will be probed. + by default QDF_MODULE_ID_PE will be probed. \param pUsrContext - Opaque HDD context \param pfnSapEventCallback - Sap event callback in HDD \param pAssocBuf - Caller allocated memory to be filled with associatd @@ -3800,7 +3800,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, \return QDF_STATUS -------------------------------------------------------------------------------*/ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { @@ -3842,7 +3842,7 @@ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -3912,7 +3912,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3939,7 +3939,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, */ void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) { - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE, NO_SESSION, 0)); csr_roam_free_connect_profile(profile); @@ -3970,7 +3970,7 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId, numItems)); status = sme_acquire_global_lock(&pMac->sme); @@ -3994,7 +3994,7 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_acquire_global_lock(&pMac->sme); @@ -4158,7 +4158,7 @@ QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4189,7 +4189,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4319,7 +4319,7 @@ QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4347,7 +4347,7 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag) tpAniSirGlobal mac = PMAC_STRUCT(hal); struct ps_global_info *ps_global_info = &mac->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_DHCP_FLAG, NO_SESSION, flag)); /* Set/Clear the DHCP flag which will disable/enable auto PS */ @@ -4494,7 +4494,7 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal, struct wow_add_pattern *ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_ADDBCAST_PATTERN, session_id, 0)); ptrn = cdf_mem_malloc(sizeof(*ptrn)); @@ -4535,7 +4535,7 @@ QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, struct wow_delete_pattern *delete_ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_DELBCAST_PATTERN, sessionId, 0)); delete_ptrn = cdf_mem_malloc(sizeof(*delete_ptrn)); @@ -4612,7 +4612,7 @@ QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ENTER_WOWL, session_id, 0)); /* cache the WOWL information */ @@ -4651,7 +4651,7 @@ QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); uint8_t session_id; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_EXIT_WOWL, NO_SESSION, 0)); session_id = wowl_exit_params->sessionId; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_WOWL_EXIT); @@ -4681,7 +4681,7 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, tCsrRoamSession *session = NULL; struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, session_id, 0)); if (set_key->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("Invalid key length %d"), @@ -4749,13 +4749,13 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_rssi(tHalHandle hHal, tCsrRssiCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, int8_t lastRSSI, + uint8_t staId, struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4780,7 +4780,7 @@ QDF_STATUS sme_get_rssi(tHalHandle hHal, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext) + uint8_t staId, struct qdf_mac_addr bssId, void *pContext) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -4806,7 +4806,7 @@ QDF_STATUS sme_get_snr(tHalHandle hHal, ---------------------------------------------------------------------------*/ QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, + uint8_t staId, struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -4849,7 +4849,7 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION, periodicity)); status = sme_acquire_global_lock(&pMac->sme); @@ -4878,7 +4878,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, if (QDF_IS_STATUS_SUCCESS(status)) { pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", __func__); sme_release_global_lock(&pMac->sme); @@ -4896,8 +4896,8 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, cds_message.reserved = 0; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); cdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; @@ -4938,7 +4938,7 @@ QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CNTRYCODE, NO_SESSION, 0)); return csr_get_country_code(pMac, pBuf, pbLen); @@ -5012,7 +5012,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, cds_msg_t msg; tAniChangeCountryCodeReq *pMsg; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -5093,7 +5093,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, tAniGenericChangeCountryCodeReq *pMsg; if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return status; } @@ -5176,7 +5176,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp start", __func__); sme_release_global_lock(&pMac->sme); @@ -5186,7 +5186,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5196,7 +5196,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5246,7 +5246,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp stop", __func__); sme_release_global_lock(&pMac->sme); @@ -5257,7 +5257,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5267,7 +5267,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5291,7 +5291,7 @@ void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { csr_set_cfg_privacy(pMac, pProfile, fPrivacy); @@ -5317,7 +5317,7 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION, 0)); @@ -5585,7 +5585,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "%s: type=%d, subType=%d", __func__, type, subType); if (NULL == pbSessionId) { @@ -5602,7 +5602,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, } } if (NULL != pbSessionId) - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_OPEN_SESSION, *pbSessionId, 0)); @@ -5633,7 +5633,7 @@ QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5753,7 +5753,7 @@ QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_E_FAILURE; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5791,19 +5791,19 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: KeyReplayCounter: %lld", __func__, pGtkOffload->ullKeyReplayCounter); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found ", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5817,8 +5817,8 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5845,18 +5845,18 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered", __func__); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5884,8 +5884,8 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, pMac->sme.gtk_offload_get_info_cb_context = callback_context; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5910,17 +5910,17 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, FL("WMA_SET_KEEP_ALIVE message")); if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session not Found")); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); return QDF_STATUS_E_NOMEM; } @@ -5928,7 +5928,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, "buff TP %d input TP %d ", request_buf->timePeriod, request->timePeriod); request_buf->sessionId = session_id; @@ -5937,8 +5937,8 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5966,7 +5966,7 @@ QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, sessionId, request->ucNetworksCount)); status = sme_acquire_global_lock(&pMac->sme); @@ -5997,7 +5997,7 @@ QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6101,7 +6101,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6117,7 +6117,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6162,7 +6162,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6179,7 +6179,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6233,7 +6233,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, cds_msg_t msg; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REMAIN_ONCHAN, session_id, 0)); scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); @@ -6322,7 +6322,7 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6373,7 +6373,7 @@ QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6395,7 +6395,7 @@ QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6451,7 +6451,7 @@ QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6498,7 +6498,7 @@ QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_SUSPENDIND, NO_SESSION, 0)); @@ -6547,7 +6547,7 @@ QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6589,7 +6589,7 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0)); pMac->readyToExtWoWCallback = callback; @@ -6647,7 +6647,7 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION, 0)); @@ -6698,7 +6698,7 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION, 0)); @@ -6791,7 +6791,7 @@ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal) if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_concurrent_operation_channel(pMac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " " Other Concurrent Channel = %d", __func__, channel); sme_release_global_lock(&pMac->sme); } @@ -7077,7 +7077,7 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) FL ("Clearing currentCountryBssid, countryCode11d")); cdf_mem_zero(&pMac->scan.currentCountryBssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_zero(pMac->scan.countryCode11d, sizeof(pMac->scan.countryCode11d)); } @@ -7177,7 +7177,7 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGW, FL("Clearing currentCountryBssid, countryCode11d")); cdf_mem_zero(&mac_ctx->scan.currentCountryBssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_zero(mac_ctx->scan.countryCode11d, sizeof(mac_ctx->scan.countryCode11d)); } @@ -7268,7 +7268,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: " "ulMulticastAddrCnt=%d, multicastAddr[0]=%p", __func__, pMulticastAddrs->ulMulticastAddrCnt, pMulticastAddrs->multicastAddr[0].bytes); @@ -7282,7 +7282,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: Unable to find the session Id: %d", __func__, sessionId); return QDF_STATUS_E_FAILURE; @@ -7290,7 +7290,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for 8023 Multicast List request", __func__); @@ -7298,7 +7298,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (!csr_is_conn_state_connected_infra(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Ignoring the " "indication as we are not connected", __func__); cdf_mem_free(request_buf); @@ -7315,8 +7315,8 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, msg.type = WMA_8023_MULTICAST_LIST_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "post WMA_8023_MULTICAST_LIST message to WMA", __func__); @@ -7338,7 +7338,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); uint8_t idx = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " "filterId = %d", __func__, pRcvPktFilterCfg->filterType, pRcvPktFilterCfg->filterId); @@ -7347,7 +7347,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf = cdf_mem_malloc(allocSize); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for Receive Filter Set Filter request", __func__); @@ -7355,7 +7355,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -7371,27 +7371,27 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "FT %d FID %d ", request_buf->filterType, request_buf->filterId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "params %d CT %d", request_buf->numFieldParams, request_buf->coalesceTime); for (idx = 0; idx < request_buf->numFieldParams; idx++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d ", request_buf->paramsData[idx].protocolLayer, request_buf->paramsData[idx].cmpFlag); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Data Offset %d Data Len %d", request_buf->paramsData[idx].dataOffset, request_buf->paramsData[idx].dataLength); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "CData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].compareData[0], request_buf->paramsData[idx].compareData[1], @@ -7400,7 +7400,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf->paramsData[idx].compareData[4], request_buf->paramsData[idx].compareData[5]); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "MData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].dataMask[0], request_buf->paramsData[idx].dataMask[1], @@ -7411,8 +7411,8 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); @@ -7432,18 +7432,18 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d", __func__, pRcvFltPktClearParam->filterId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Session Not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " "Clear Filter request", __func__); return QDF_STATUS_E_NOMEM; @@ -7460,8 +7460,8 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, msg.type = WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ; msg.reserved = 0; msg.bodyptr = request_buf; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); @@ -7563,7 +7563,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) pMaxTxPowerPerBandParams = cdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams)); if (NULL == pMaxTxPowerPerBandParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7576,8 +7576,8 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) msg.reserved = 0; msg.bodyptr = pMaxTxPowerPerBandParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); cdf_mem_free(pMaxTxPowerPerBandParams); @@ -7601,17 +7601,17 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) \- return QDF_STATUS -------------------------------------------------------------------------------*/ -QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, - struct cdf_mac_addr pSelfMacAddress, int8_t dB) +QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, + struct qdf_mac_addr pSelfMacAddress, int8_t dB) { cds_msg_t msg; tpMaxTxPowerParams pMaxTxParams = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_MAXTXPOW, NO_SESSION, 0)); pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7625,8 +7625,8 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct cdf_mac_addr pBssid, msg.reserved = 0; msg.bodyptr = pMaxTxParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA", __func__); cdf_mem_free(pMaxTxParams); @@ -7653,7 +7653,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) pBaseMacAddr = cdf_mem_malloc(sizeof(tSirMacAddr)); if (NULL == pBaseMacAddr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); return QDF_STATUS_E_NOMEM; } @@ -7664,8 +7664,8 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) msg.reserved = 0; msg.bodyptr = pBaseMacAddr; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); cdf_mem_free(pBaseMacAddr); @@ -7686,26 +7686,26 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) \- return QDF_STATUS ---------------------------------------------------------------------------*/ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, - struct cdf_mac_addr pBSSId, - enum tCDF_ADAPTER_MODE dev_mode, int dBm) + struct qdf_mac_addr pBSSId, + enum tQDF_ADAPTER_MODE dev_mode, int dBm) { cds_msg_t msg; tpMaxTxPowerParams pTxParams = NULL; int8_t power = (int8_t) dBm; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TXPOW, sessionId, 0)); /* make sure there is no overflow */ if ((int)power != dBm) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: error, invalid power = %d", __func__, dBm); return QDF_STATUS_E_FAILURE; } pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pTxParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7718,8 +7718,8 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, msg.reserved = 0; msg.bodyptr = pTxParams; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); cdf_mem_free(pTxParams); @@ -7799,7 +7799,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_msg_t cds_message; tAniSetTmLevelReq *setTmLevelReq = NULL; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -7807,7 +7807,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod (tAniSetTmLevelReq *) cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); if (NULL == setTmLevelReq) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for sme_set_tm_level", __func__); sme_release_global_lock(&pMac->sme); @@ -7822,7 +7822,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_message.type = WMA_SET_TM_LEVEL_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); cdf_mem_free(setTmLevelReq); status = QDF_STATUS_E_FAILURE; @@ -7845,7 +7845,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod void sme_feature_caps_exchange(tHalHandle hHal) { MTRACE(cdf_trace - (CDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION, + (QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION, 0)); } @@ -7872,7 +7872,7 @@ void sme_disable_feature_capablity(uint8_t feature_index) void sme_reset_power_values_for5_g(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_RESET_PW5G, NO_SESSION, 0)); csr_save_channel_power_for_band(pMac, true); csr_apply_power2_current(pMac); /* Store the channel+power info in the global place: Cfg */ @@ -7893,11 +7893,11 @@ QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamPrefer5GHz is changed from %d to %d", __func__, pMac->roam.configParam.nRoamPrefer5GHz, nRoamPrefer5GHz); @@ -7922,11 +7922,11 @@ QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamIntraBand is changed from %d to %d", __func__, pMac->roam.configParam.nRoamIntraBand, nRoamIntraBand); @@ -7953,12 +7953,12 @@ QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanNProbes is changed from %d to %d", __func__, pMac->roam.configParam.nProbes, nProbes); pMac->roam.configParam.nProbes = nProbes; @@ -7992,12 +7992,12 @@ QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHomeAwayTime is changed from %d to %d", __func__, pMac->roam.configParam.nRoamScanHomeAwayTime, @@ -8062,7 +8062,7 @@ QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, bool sme_get_roam_intra_band(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_ROAMIBAND, NO_SESSION, 0)); return pMac->roam.configParam.nRoamIntraBand; } @@ -8112,7 +8112,7 @@ QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s", RoamRssiDiff, pMac->roam.configParam.RoamRssiDiff, @@ -8149,12 +8149,12 @@ QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: FastTransitionEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastTransitionEnabled, @@ -8187,7 +8187,7 @@ QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s", isWESModeEnabled, pMac->roam.configParam.isWESModeEnabled, @@ -8219,11 +8219,11 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s", roamScanControl, pMac->roam.configParam.nRoamScanControl, @@ -8233,7 +8233,7 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, neighborRoamState)); pMac->roam.configParam.nRoamScanControl = roamScanControl; if (0 == roamScanControl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully cleared roam scan cache"); csr_flush_cfg_bg_scan_roam_channel_list(pMac, sessionId); if (pMac->roam.configParam.isRoamOffloadScanEnabled) { @@ -8267,7 +8267,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled if (pMac->roam.configParam.isFastRoamIniFeatureEnabled == isFastRoamIniFeatureEnabled) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: FastRoam is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, @@ -8275,7 +8275,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: FastRoamEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, isFastRoamIniFeatureEnabled); @@ -8306,7 +8306,7 @@ QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MAWCEnabled is changed from %d to %d", __func__, pMac->roam.configParam.MAWCEnabled, MAWCEnabled); pMac->roam.configParam.MAWCEnabled = MAWCEnabled; @@ -8417,7 +8417,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled if (pMac->roam.configParam.isEseIniFeatureEnabled == isEseIniFeatureEnabled) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, @@ -8425,7 +8425,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: EseEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, isEseIniFeatureEnabled); @@ -8466,7 +8466,7 @@ QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { cdf_ret_status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } @@ -8499,7 +8499,7 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, sessionId, nOpportunisticThresholdDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8556,7 +8556,7 @@ QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId, nRoamRescanRssiDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8611,7 +8611,7 @@ QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId, nRoamBmissFirstBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss first beacon count to %d" " - old value is %d - roam state is %d", @@ -8664,7 +8664,7 @@ QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId, nRoamBmissFinalBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8719,7 +8719,7 @@ QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId, nRoamBeaconRssiWeight); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8770,7 +8770,7 @@ QDF_STATUS sme_set_neighbor_lookup_rssi_threshold status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId, neighborLookupRssiThreshold); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s", neighborLookupRssiThreshold, pMac->roam.configParam.neighborRoamConfig. @@ -8806,7 +8806,7 @@ QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR param delay_before_vdev_stop changed from %d to %d"), pMac->roam.configParam.neighborRoamConfig. @@ -8860,7 +8860,7 @@ QDF_STATUS sme_set_neighbor_scan_refresh_period pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan refresh period to %d- old value is %d - roam state is %s", neighborScanResultsRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -8904,7 +8904,7 @@ QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("gRoamScanOffloadEnabled is changed from %d to %d"), pMac->roam.configParam.isRoamOffloadScanEnabled, @@ -8973,7 +8973,7 @@ QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan period to %d -old value is %d - roam state is %s", nEmptyScanRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -9018,7 +9018,7 @@ QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s", nNeighborScanMinChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9064,7 +9064,7 @@ QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionI pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel max dwell time to %d - old value is %d - roam state is %s", nNeighborScanMaxChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9247,7 +9247,7 @@ QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set neighbor scan period to %d" " - old value is %d - roam state is %s", nNeighborScanPeriod, @@ -9364,7 +9364,7 @@ QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, break; } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR runtime successfully set roam scan channels to %s - old value is %s - roam state is %d"), newChannelList, oldChannelList, pMac->roam.neighborRoamInfo[sessionId].neighborRoamState); @@ -9432,7 +9432,7 @@ QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, curchnl_list_info->ChannelList[i]); } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d", newChannelList, oldChannelList, pNeighborRoamInfo->neighborRoamState); @@ -9472,7 +9472,7 @@ QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Roam Scan channel list is NOT yet initialized")); *pNumChannels = 0; sme_release_global_lock(&pMac->sme); @@ -9592,7 +9592,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM, sessionId, tdlsLinkEstablishParams->isOffChannelSupported)); @@ -9631,7 +9631,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt sendTdlsReq = { {0} }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); @@ -9670,11 +9670,11 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pstaParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s :pstaParams is NULL", __func__); return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, pstaParams->capability)); status = sme_acquire_global_lock(&pMac->sme); @@ -9702,7 +9702,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9729,7 +9729,7 @@ QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9835,7 +9835,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, return status; pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -9872,7 +9872,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invalid peer state param (%d)"), peerStateParams->peerState); cdf_mem_free(pTdlsPeerStateParams); @@ -9958,7 +9958,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, tdls_chan_switch_params *chan_switch_params = NULL; cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, ch_switch_params->tdls_off_channel)); status = sme_acquire_global_lock(&mac->sme); @@ -9966,7 +9966,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, return status; chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); return QDF_STATUS_E_FAILURE; @@ -9983,7 +9983,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invalid off channel command (%d)"), ch_switch_params->tdls_off_ch_mode); cdf_mem_free(chan_switch_params); @@ -10000,7 +10000,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, chan_switch_params->is_responder = ch_switch_params->is_responder; chan_switch_params->oper_class = ch_switch_params->opclass; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Country Code=%s, Req offset=%d, Selected Operate Class=%d"), mac->scan.countryCodeCurrent, chan_switch_params->tdls_off_ch_bw_offset, @@ -10012,7 +10012,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), qdf_status); cdf_mem_free(chan_switch_params); @@ -10038,7 +10038,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pLinkSpeedIndCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10052,7 +10052,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, cds_message.type = WMA_GET_LINK_SPEED; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Link Speed msg fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10072,7 +10072,7 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "SSR level is changed %d", enableSSR); /* not serializing this messsage, as this is only going * to set a variable in WMA/WDI @@ -10200,7 +10200,7 @@ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) || ch_params->ch_width == CH_WIDTH_20MHZ || QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel/phymode config: CB Mode disabled", __func__); ch_params->ch_width = CH_WIDTH_20MHZ; @@ -10289,7 +10289,7 @@ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value) --------------------------------------------------------------------------*/ void sme_set_curr_device_mode(tHalHandle hHal, - enum tCDF_ADAPTER_MODE currDeviceMode) + enum tQDF_ADAPTER_MODE currDeviceMode) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); pMac->sme.currDeviceMode = currDeviceMode; @@ -10318,7 +10318,7 @@ QDF_STATUS sme_handoff_request(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: invoked", __func__); status = csr_handoff_request(pMac, sessionId, pHandoffInfo); sme_release_global_lock(&pMac->sme); @@ -10348,7 +10348,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, if (QDF_STATUS_SUCCESS == status) { request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ IPA_OFFLOAD_ENABLE_DISABLE")); sme_release_global_lock(&pMac->sme); @@ -10364,7 +10364,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); cdf_mem_free(request_buf); @@ -10411,14 +10411,14 @@ QDF_STATUS sme_lphb_config_req tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(CDF_MODULE_ID_SME, + MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, NO_SESSION, lphdReq->cmd)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) && (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10432,7 +10432,7 @@ QDF_STATUS sme_lphb_config_req cds_message.type = WMA_LPHB_CONF_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Config LPHB MSG fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10458,7 +10458,7 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, pMac->roam.configParam.nNumStaChanCombinedConc = nNumStaChan; pMac->roam.configParam.nNumP2PChanCombinedConc = nNumP2PChan; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SCAN nNumStaChanCombinedConc : %d," "nNumP2PChanCombinedConc : %d ", __func__, nNumStaChan, nNumP2PChan); @@ -10505,7 +10505,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, /* Serialize the req through MC thread */ msg.bodyptr = req_msg; msg.type = WMA_ADD_PERIODIC_TX_PTRN_IND; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), @@ -10554,7 +10554,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, /* Serialize the req through MC thread */ msg.bodyptr = req_msg; msg.type = WMA_DEL_PERIODIC_TX_PTRN_IND; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), @@ -10572,7 +10572,7 @@ void sme_get_command_q_status(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pMac is NULL", __func__); return; } @@ -10703,9 +10703,9 @@ QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; @@ -10740,7 +10740,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10750,9 +10750,9 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) msg.type = WMA_OCB_SET_UTC_TIME_CMD; msg.reserved = 0; msg.bodyptr = sme_utc; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); cdf_mem_free(utc); goto end; @@ -10788,7 +10788,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + timing_advert->template_length); if (!buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for start TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10803,9 +10803,9 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, msg.type = WMA_OCB_START_TIMING_ADVERT_CMD; msg.reserved = 0; msg.bodyptr = buf; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10838,7 +10838,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10848,9 +10848,9 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, msg.type = WMA_OCB_STOP_TIMING_ADVERT_CMD; msg.reserved = 0; msg.bodyptr = sme_timing_advert; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10923,9 +10923,9 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, pMac->sme.ocb_get_tsf_timer_context = context; /* Post the message to WDA */ - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; pMac->sme.ocb_get_tsf_timer_context = NULL; @@ -10981,9 +10981,9 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; @@ -11020,7 +11020,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11033,9 +11033,9 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, msg.type = WMA_DCC_CLEAR_STATS_CMD; msg.bodyptr = request; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); cdf_mem_free(request); goto end; @@ -11075,7 +11075,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, request->dcc_ndl_chan_list_len + request->dcc_ndl_active_state_list_len); if (!msg_body) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11099,9 +11099,9 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, pMac->sme.dcc_update_ndl_callback = callback; pMac->sme.dcc_update_ndl_context = context; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; pMac->sme.dcc_update_ndl_context = NULL; @@ -11142,12 +11142,12 @@ void sme_get_recovery_stats(tHalHandle hHal) { uint8_t i; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Self Recovery Stats"); for (i = 0; i < MAX_ACTIVE_CMD_STATS; i++) { if (eSmeNoCommand != g_self_recovery_stats.activeCmdStats[i].command) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "timestamp %llu: command 0x%0X: reason %d: session %d", g_self_recovery_stats.activeCmdStats[i]. timestamp, @@ -11176,7 +11176,7 @@ void sme_save_active_cmd_stats(tHalHandle hHal) tActiveCmdStats *actv_cmd_stat = NULL; if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } @@ -11212,7 +11212,7 @@ void active_list_cmd_timeout_handle(void *userData) { if (NULL == userData) return; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Active List command timeout Cmd List Count %d", __func__, csr_ll_count(&((tpAniSirGlobal) userData)->sme. smeCmdActiveList)); @@ -11238,7 +11238,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", __func__); return QDF_STATUS_E_NOMEM; @@ -11250,8 +11250,8 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_MODEM_POWER_STATE_IND message" " to WMA", __func__); cdf_mem_free(request_buf); @@ -11263,7 +11263,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) #ifdef QCA_HT_2040_COEX QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, - struct cdf_mac_addr macAddrSTA, + struct qdf_mac_addr macAddrSTA, uint8_t sessionId, uint8_t channel_type) { @@ -11277,7 +11277,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pHtOpMode) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", __func__); return QDF_STATUS_E_NOMEM; @@ -11294,7 +11294,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP mode", __func__); return QDF_STATUS_E_FAILURE; } @@ -11308,15 +11308,15 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, msg.reserved = 0; msg.bodyptr = pHtOpMode; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); cdf_mem_free(pHtOpMode); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Notifed FW about OP mode: %d for staId=%d", __func__, pHtOpMode->opMode, staId); @@ -11343,7 +11343,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); ePhyChanBondState cbMode; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Update HT operation beacon IE, channel_type=%d", __func__, channel_type); @@ -11358,7 +11358,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Error!!! Invalid HT20/40 mode !", __func__); return QDF_STATUS_E_FAILURE; } @@ -11389,7 +11389,7 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -11408,20 +11408,20 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tHalHandle hHal, uint32_t value) { - void *wmaContext = cds_get_context(CDF_MODULE_ID_WMA); + void *wmaContext = cds_get_context(QDF_MODULE_ID_WMA); tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == wmaContext) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: wmaContext is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, " Idle Ps Set Value %d", value); pMac->imps_enabled = false; if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " Failed to Set Idle Ps Value %d", value); return QDF_STATUS_E_FAILURE; } @@ -11436,7 +11436,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } @@ -11451,7 +11451,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ: return pSession->htConfig.ht_sgi; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "invalid ht capability"); return -EIO; } @@ -11464,13 +11464,13 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to set ht capability in target"); return -EIO; } @@ -11511,7 +11511,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Rate update struct alloc failed"); return QDF_STATUS_E_FAILURE; } @@ -11531,8 +11531,8 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, msg.bodyptr = rate_upd; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able " "to post WMA_SET_RMC_RATE_IND to WMA!", __func__); @@ -11605,7 +11605,7 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in Auto shutdown event callback", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11639,7 +11639,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) auto_sh_cmd = (tSirAutoShutdownCmdParams *) cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11652,13 +11652,13 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); cdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Auto shutdown MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11683,7 +11683,7 @@ QDF_STATUS sme_add_ch_avoid_callback QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Plug in CH AVOID CB", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11717,7 +11717,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cauReq = (tSirChAvoidUpdateReq *) cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11730,14 +11730,14 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cds_message.type = WMA_CH_AVOID_UPDATE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); cdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Posted Ch Avoid Update MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11765,7 +11765,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) val = cdf_mem_malloc(sizeof(*val)); if (NULL == val || NULL == mac_ptr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); return QDF_STATUS_E_NOMEM; } @@ -11777,8 +11777,8 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) msg.bodyptr = val; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(val); @@ -11806,7 +11806,7 @@ QDF_STATUS sme_set_mas(uint32_t val) ptr_val = cdf_mem_malloc(sizeof(*ptr_val)); if (NULL == ptr_val) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); return QDF_STATUS_E_NOMEM; } @@ -11818,8 +11818,8 @@ QDF_STATUS sme_set_mas(uint32_t val) msg.bodyptr = ptr_val; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(ptr_val); @@ -11840,7 +11840,7 @@ QDF_STATUS sme_set_mas(uint32_t val) * Return: QDF_STATUS */ QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct cdf_mac_addr bssid, chan_params_t *ch_params, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -11887,14 +11887,14 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, pChnlParams->ch_width; if (pChnlParams->status == QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = 1; roamResult = eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received failure eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = @@ -11924,7 +11924,7 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, \param dfsCacWaitStatus - CAC WAIT status flag \return QDF_STATUS ---------------------------------------------------------------------------*/ -QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -11948,7 +11948,7 @@ QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct cdf_mac_addr bssid, * * Return: QDF_STATUS */ -QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct cdf_mac_addr bssid, +QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, chan_params_t *ch_params) { @@ -11978,7 +11978,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam pWmaParam = (t_thermal_mgmt *) cdf_mem_malloc(sizeof(t_thermal_mgmt)); if (NULL == pWmaParam) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); return QDF_STATUS_E_NOMEM; } @@ -12009,8 +12009,8 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam msg.bodyptr = pWmaParam; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!", __func__); cdf_mem_free(pWmaParam); @@ -12059,9 +12059,9 @@ QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) msg.type = WMA_SET_THERMAL_LEVEL; msg.bodyval = level; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!", __func__); sme_release_global_lock(&pMac->sme); @@ -12090,7 +12090,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) tx_power_limit = cdf_mem_malloc(sizeof(*tx_power_limit)); if (!tx_power_limit) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", __func__); return QDF_STATUS_E_FAILURE; @@ -12106,7 +12106,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_TX_POWER_LIMIT", __func__); status = QDF_STATUS_E_FAILURE; @@ -12232,8 +12232,8 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA", __func__); cdf_mem_free(data); @@ -12298,7 +12298,7 @@ QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set AllowDFSChannelRoam Mode to " "%d - old value is %d - roam state is %s", allowDFSChannelRoam, @@ -12424,13 +12424,13 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, return status; pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (pCsrSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session lookup fails for CSR session")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid session Id %u"), sessionId); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12441,14 +12441,14 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, &peSessionId); if (pSession == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" Session lookup fails for BSSID")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!pSession->QosMapSet.present) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("QOS Mapping IE not present")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12461,7 +12461,7 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, && (pSession->QosMapSet.dscp_range[i][1] == 255)) { dscpmapping[j] = 0; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("User Priority %d isn't used"), i); break; @@ -13149,18 +13149,18 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_msg_t cds_message; tSirLLStatsClearReq *clear_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "staId = %u", pclearStatsReq->staId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "statsClearReqMask = 0x%X", pclearStatsReq->statsClearReqMask); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "stopReq = %u", pclearStatsReq->stopReq); clear_stats_req = cdf_mem_malloc(sizeof(*clear_stats_req)); if (!clear_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13174,7 +13174,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); cdf_mem_free(clear_stats_req); @@ -13182,7 +13182,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(clear_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13206,17 +13206,17 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_msg_t cds_message; tSirLLStatsSetReq *set_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: MPDU Size = %u", __func__, psetStatsReq->mpduSizeThreshold); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, " Aggressive Stats Collections = %u", psetStatsReq->aggressiveStatisticsGathering); set_stats_req = cdf_mem_malloc(sizeof(*set_stats_req)); if (!set_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13230,7 +13230,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); cdf_mem_free(set_stats_req); @@ -13238,7 +13238,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(set_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13262,17 +13262,17 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_msg_t cds_message; tSirLLStatsGetReq *get_stats_req; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "reqId = %u", pgetStatsReq->reqId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "staId = %u", pgetStatsReq->staId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Stats Type = %u", pgetStatsReq->paramIdMask); get_stats_req = cdf_mem_malloc(sizeof(*get_stats_req)); if (!get_stats_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13286,7 +13286,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); @@ -13296,7 +13296,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(get_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13325,7 +13325,7 @@ QDF_STATUS sme_set_link_layer_stats_ind_cb pMac->sme.pLinkLayerStatsIndCallback = callback_routine; sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); } @@ -13357,7 +13357,7 @@ QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, pmac->sme.fw_dump_callback = callback_routine; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13392,7 +13392,7 @@ QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) pmac->sme.fw_dump_callback = NULL; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13424,7 +13424,7 @@ QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isRoamOffloadEnabled, nRoamOffloadEnabled); @@ -13458,7 +13458,7 @@ QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: LFR3: KeyMgmtOffloadEnabled changed to %d", __func__, nRoamKeyMgmtOffloadEnabled); status = csr_roam_set_key_mgmt_offload(pMac, @@ -13496,7 +13496,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pGetTemperatureCb)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Indication Call back did not registered")); sme_release_global_lock(&pMac->sme); @@ -13510,7 +13510,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, cds_message.type = WMA_GET_TEMPERATURE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Post Get Temperature msg fail")); status = QDF_STATUS_E_FAILURE; } @@ -13540,7 +13540,7 @@ QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Msg post Set Scan Mac OUI failed")); status = QDF_STATUS_E_FAILURE; } @@ -13568,7 +13568,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); if (!pSmeDhcpSrvInfo) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD", __func__); return QDF_STATUS_E_NOMEM; @@ -13583,8 +13583,8 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, cds_message.bodyptr = pSmeDhcpSrvInfo; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); @@ -13592,7 +13592,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); } @@ -13620,7 +13620,7 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, ledflashing = cdf_mem_malloc(sizeof(*ledflashing)); if (!ledflashing) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to allocate memory for WMA_LED_TIMING_REQ")); return QDF_STATUS_E_NOMEM; @@ -13702,7 +13702,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, cc_switch_mode); sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error!")); session->ch_switch_in_progress = false; return false; @@ -13734,7 +13734,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, stats_factor = cdf_mem_malloc(sizeof(*stats_factor)); if (!stats_factor) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR", __func__); return QDF_STATUS_E_NOMEM; @@ -13752,8 +13752,8 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, msg.bodyptr = stats_factor; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); cdf_mem_free(stats_factor); @@ -13761,7 +13761,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(stats_factor); @@ -13791,7 +13791,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, g_time = cdf_mem_malloc(sizeof(*g_time)); if (!g_time) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME", __func__); return QDF_STATUS_E_NOMEM; @@ -13809,8 +13809,8 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, msg.bodyptr = g_time; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); cdf_mem_free(g_time); @@ -13818,7 +13818,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(g_time); @@ -13847,7 +13847,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); if (NULL == iwcmd) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed", __func__); return QDF_STATUS_E_NOMEM; @@ -13867,8 +13867,8 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, msg.bodyptr = (void *)iwcmd; if (!QDF_IS_STATUS_SUCCESS( - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); cdf_mem_free(iwcmd); @@ -13876,7 +13876,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(iwcmd); @@ -14025,14 +14025,14 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, enum uapsd_ac access_category; if (!psb) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "No need to configure auto trigger:psb is 0"); return QDF_STATUS_SUCCESS; } - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14062,7 +14062,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, if (QDF_STATUS_SUCCESS != wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger Uapsd params for sessionId %d", sessionId); return QDF_STATUS_E_FAILURE; @@ -14103,15 +14103,15 @@ QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, return QDF_STATUS_E_FAILURE; } - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to disable uapsd for ac %d for sessionId %d", ac, sessionId); return QDF_STATUS_E_FAILURE; @@ -14291,26 +14291,26 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) send_req = cdf_mem_malloc(sizeof(*send_req)); if (!send_req) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); return QDF_STATUS_E_FAILURE; } cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request_id:%d num_seg:%d"), send_req->request_id, send_req->num_seg); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Segment Information")); for (loop = 0; loop < send_req->num_seg; loop++) { seg_req = send_req->segment[loop]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_number:%d"), loop); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_id:%d start_addr_lo:0x%x start_addr_hi:0x%x"), seg_req.seg_id, seg_req.seg_start_addr_lo, seg_req.seg_start_addr_hi); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("seg_length:%d dst_addr_lo:0x%x dst_addr_hi:0x%x"), seg_req.seg_length, seg_req.dst_addr_lo, seg_req.dst_addr_hi); @@ -14321,16 +14321,16 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) msg.type = WMA_FW_MEM_DUMP_REQ; msg.reserved = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; @@ -14570,7 +14570,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); return QDF_STATUS_E_NOMEM; } @@ -14582,7 +14582,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_message.bodyptr = request_buf; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -14606,9 +14606,9 @@ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, { void *wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14687,7 +14687,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, nr_info = &mac_ctx->roam.neighborRoamInfo[session_id]; switch (notify_id) { case eCSR_HI_RSSI_SCAN_MAXCOUNT_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: gRoamScanHirssiMaxCount %d => %d", __func__, nr_config->nhi_rssi_scan_max_count, val); @@ -14697,7 +14697,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_DELTA_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelta %d => %d"), nr_config->nhi_rssi_scan_rssi_delta, val); @@ -14707,7 +14707,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_DELAY_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelay %d => %d"), nr_config->nhi_rssi_scan_delay, val); @@ -14717,7 +14717,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_UB_ID: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiUpperBound %d => %d"), nr_config->nhi_rssi_scan_rssi_ub, val); @@ -14727,7 +14727,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("invalid parameter notify_id %d"), notify_id); status = QDF_STATUS_E_INVAL; @@ -14762,7 +14762,7 @@ void sme_update_tgt_services(tHalHandle hal, struct wma_tgt_services *cfg) mac_ctx->lteCoexAntShare = cfg->lte_coex_ant_share; mac_ctx->beacon_offload = cfg->beacon_offload; mac_ctx->pmf_offload = cfg->pmf_offload; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("mac_ctx->pmf_offload: %d"), mac_ctx->pmf_offload); return; @@ -14833,7 +14833,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, egap_params = cdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); return QDF_STATUS_E_NOMEM; } @@ -14845,9 +14845,9 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, message.type = WMA_SET_EGAP_CONF_PARAMS; message.bodyptr = egap_params; - status = cds_mq_post_message(CDF_MODULE_ID_WMA, &message); + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &message); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); cdf_mem_free(egap_params); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 76bf27333a18..55f16d851fdd 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -55,7 +55,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) status = cdf_mc_timer_init(&pSession->ftSmeContext. preAuthReassocIntvlTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sme_preauth_reassoc_intvl_timer_callback, (void *)pSession->ftSmeContext.pUsrCtx); @@ -449,7 +449,7 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, return; /* All or nothing - proceed only if both BSSID and FT IE fit */ - if ((CDF_MAC_ADDR_SIZE + + if ((QDF_MAC_ADDR_SIZE + pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length) > ft_ies_ip_len) { sme_release_global_lock(&pMac->sme); @@ -458,14 +458,14 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, /* hdd needs to pack the bssid also along with the */ /* auth response to supplicant */ cdf_mem_copy(ft_ies, pSession->ftSmeContext.preAuthbssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Copy the auth resp FTIEs */ - cdf_mem_copy(&(ft_ies[CDF_MAC_ADDR_SIZE]), + cdf_mem_copy(&(ft_ies[QDF_MAC_ADDR_SIZE]), pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies, pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length); - *ft_ies_length = CDF_MAC_ADDR_SIZE + + *ft_ies_length = QDF_MAC_ADDR_SIZE + pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length; pSession->ftSmeContext.FTState = eFT_REASSOC_REQ_WAIT; @@ -548,7 +548,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) tCsrRoamSession *pSession = NULL; if (pMac == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } @@ -584,7 +584,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) pSession->ftSmeContext.setFTPTKState = false; cdf_mem_zero(pSession->ftSmeContext.preAuthbssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pSession->ftSmeContext.FTState = eFT_START_READY; } } diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 50731edac06e..7dbc3dfa51fd 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -29,7 +29,7 @@ #include "sme_power_save_api.h" #include "sms_debug.h" #include "cdf_memory.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "wma_types.h" #include "wmm_apsd.h" #include "cfg_api.h" @@ -52,8 +52,8 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) msg.bodyval = 0; if (QDF_STATUS_SUCCESS != cds_mq_post_message( - CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); cdf_mem_free(body); @@ -87,7 +87,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -118,7 +118,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -190,7 +190,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -222,7 +222,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -329,7 +329,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, hal_wowl_params)){ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } else @@ -364,7 +364,7 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, hal_wowl_msg)){ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -391,7 +391,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id); return eSIR_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Power Save command %d"), command); switch (command) { case SME_PS_ENABLE: @@ -420,7 +420,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, break; } if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to enter in PS, Command: %d"), command); } return status; @@ -699,14 +699,14 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, */ status = dot11f_get_packed_probe_request_size(mac_ctx, &pr, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to calculate the packed size for a Probe Request (0x%08x)."), status); /* We'll fall back on the worst case scenario: */ payload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("There were warnings while calculating the packed size for a Probe Request (0x%08x)."), status); } @@ -722,7 +722,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, self_mac_addr); if (eSIR_SUCCESS != sir_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to populate the buffer descriptor for a Probe Request (%d)."), sir_status); return sir_status; /* allocated! */ @@ -732,11 +732,11 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, sizeof(tSirMacMgmtHdr), payload, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).", status); return eSIR_FAILURE; /* allocated! */ } else if (DOT11F_WARNED(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request"); } @@ -764,11 +764,11 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, mac_ctx->roam.configParam.stationary_thresh; request_buf->channel_prediction_full_scan = mac_ctx->roam.configParam.channel_prediction_full_scan; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("channel_prediction: %d, top_k_num_of_channels: %d"), request_buf->pno_channel_prediction, request_buf->top_k_num_of_channels); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("stationary_thresh: %d, ch_predict_full_scan: %d"), request_buf->stationary_thresh, request_buf->channel_prediction_full_scan); @@ -786,11 +786,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, uint8_t uc_dot11_mode; if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__, *((uint32_t *) &request->aNetworks[0].ssId.ssId[0]), *((uint32_t *) &request->aNetworks[0].ssId.ssId[4]), @@ -810,14 +810,14 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, *((uint32_t *) &request->aNetworks[1].ssId.ssId[28])); if (!session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); return QDF_STATUS_E_NOMEM; } @@ -854,12 +854,12 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us24GProbeTemplateLen); request_buf->us24GProbeTemplateLen += request->us24GProbeTemplateLen; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request->us24GProbeTemplateLen = %d"), request->us24GProbeTemplateLen); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Extra ie discarded on 2.4G, IE len = %d"), request->us24GProbeTemplateLen); @@ -887,11 +887,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us5GProbeTemplateLen); request_buf->us5GProbeTemplateLen += request->us5GProbeTemplateLen; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("request_buf->us5GProbeTemplateLen = %d"), request->us5GProbeTemplateLen); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Extra IE discarded on 5G, IE length = %d"), request->us5GProbeTemplateLen); } @@ -932,8 +932,8 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -945,7 +945,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, mac_ctx->sme.preferred_network_found_ind_cb_ctx = callback_context; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); return QDF_STATUS_SUCCESS; } @@ -969,7 +969,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: IP address = %d.%d.%d.%d", __func__, request->params.hostIpv4Addr[0], request->params.hostIpv4Addr[1], @@ -977,14 +977,14 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, request->params.hostIpv4Addr[3]); if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: SESSION not Found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); return QDF_STATUS_E_NOMEM; } @@ -997,8 +997,8 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -1035,7 +1035,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); return QDF_STATUS_E_NOMEM; } @@ -1045,8 +1045,8 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -1173,7 +1173,7 @@ QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) /* Allocate a timer to enable ps automatically */ if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( &ps_param->auto_ps_enable_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, sme_auto_ps_entry_timer_expired, ps_param))) { sms_log(mac_ctx, LOGE, diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c index 07562c601e2a..fd7d617e7513 100644 --- a/core/sme/src/common/sme_trace.c +++ b/core/sme/src/common/sme_trace.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -219,6 +219,6 @@ static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, void sme_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(CDF_MODULE_ID_SME, (tp_cdf_trace_cb) & sme_trace_dump); + cdf_trace_register(QDF_MODULE_ID_SME, (tp_cdf_trace_cb) &sme_trace_dump); } #endif diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 15913d61f4f1..b1924db12a91 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -213,7 +213,7 @@ static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, tCsrRoamConnectedInfo * pConnectedInfo); QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr peer_macaddr, + struct qdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, tAniKeyDirection aniKeyDirection, @@ -227,7 +227,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile); void csr_roamStatisticsTimerHandler(void *pv); void csr_roamStatsGlobalClassDTimerHandler(void *pv); -static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid); +static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid); static void csr_roam_link_down(tpAniSirGlobal pMac, uint32_t sessionId); void csr_roam_vcc_trigger(tpAniSirGlobal pMac); QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, @@ -264,7 +264,7 @@ tListElem *csr_roam_find_in_pe_stats_req_list(tpAniSirGlobal pMac, uint32_t stat QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac); static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac); static uint32_t csr_find_session_by_type(tpAniSirGlobal, - enum tCDF_ADAPTER_MODE); + enum tQDF_ADAPTER_MODE); static bool csr_is_conn_allow_2g_band(tpAniSirGlobal pMac, uint32_t chnl); static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac, uint32_t chnl); static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, @@ -592,7 +592,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, chan_list_greedy = cdf_mem_malloc(buf_size); chan_list_non_greedy = cdf_mem_malloc(buf_size); if (!chan_list_greedy || !chan_list_non_greedy) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return; } @@ -646,11 +646,11 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, } } } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_DEBUG, "greedy=%d, non-greedy=%d, tot=%d", num_greedy_chan, num_non_greedy_chan, num_channel); if ((num_greedy_chan + num_non_greedy_chan) != num_channel) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "incorrect sorting of channels"); goto scan_list_sort_error; } @@ -698,7 +698,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_init_operating_classes((tHalHandle) pMac); pChanList = (tSirUpdateChanList *) cdf_mem_malloc(bufLen); if (!pChanList) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return QDF_STATUS_E_NOMEM; } @@ -730,7 +730,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) else pChanList->chanParam[num_channel].dfsSet = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "channel:%d, pwr=%d, DFS=%d\n", pChanList->chanParam[num_channel].chanId, pChanList->chanParam[num_channel].pwr, @@ -757,7 +757,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_roam_sort_channel_for_early_stop(pMac, pChanList, num_channel); else - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Early Stop Scan Feature not supported")); msg.type = WMA_UPDATE_CHAN_LIST_REQ; @@ -765,8 +765,8 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) msg.bodyptr = pChanList; pChanList->numChan = num_channel; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); cdf_mem_free(pChanList); return QDF_STATUS_E_FAILURE; @@ -805,7 +805,7 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac) break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); status = csr_update_channel_list(pMac); } while (0); @@ -919,7 +919,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) CSR_SESSION_ID_INVALID; status = cdf_mc_timer_init(&pMac->roam.hTimerWaitForKey, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_wait_for_key_time_out_handler, &pMac->roam.WaitForKeyTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -930,7 +930,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) } status = cdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_tl_stats_timer_handler, pMac); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, @@ -1020,7 +1020,7 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, pProfile->operationChannel = connected_prof->operationChannel; pProfile->CBMode = connected_prof->CBMode; cdf_mem_copy(&pProfile->bssid, &connected_prof->bssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); cdf_mem_copy(&pProfile->SSID, &connected_prof->SSID, sizeof(tSirMacSSid)); if (connected_prof->MDID.mdiePresent) { @@ -1528,7 +1528,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "Invalid band, No operation carried out (Band %d)", eBand); return QDF_STATUS_E_INVAL; @@ -1560,7 +1560,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, currChannelListInfo->ChannelList = cdf_mem_malloc(outNumChannels * sizeof(uint8_t)); if (NULL == currChannelListInfo->ChannelList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; return QDF_STATUS_E_NOMEM; @@ -1579,7 +1579,7 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) { /* DOT11 mode configured to 11a only and received request to change the band to 2.4 GHz */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band cfg80211 = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; @@ -1588,12 +1588,12 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) { /* DOT11 mode configured to 11b/11g only and received request to change the band to 5 GHz */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to set band dot11mode = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand); pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.bandCapability = eBand; @@ -2462,7 +2462,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) if ((dfsChan->dfs_channel_number == chnNum) && (dfsChan->radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is in dfs nol"), chnNum); @@ -2473,7 +2473,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) } if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel %d is not available"), chnNum); } @@ -2605,7 +2605,7 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) pChanInfo->numChannels = ps11dinfo->ChnPower[index].numChannels; pChanInfo->maxTxPower = - CDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, + QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, pMac->roam.configParam.nTxPowerCap); pChanInfo++; count++; @@ -2667,7 +2667,7 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din pChanInfo->numChannels = ps11dinfo->ChnPower[index].numChannels; pChanInfo->maxTxPower = - CDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, + QDF_MIN(ps11dinfo->ChnPower[index].maxtxPower, pMac->roam.configParam.nTxPowerCap); pChanInfo++; count++; @@ -2722,7 +2722,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, (cdf_mem_compare (pDupCommand->u.roamCmd.peerMac, pCommand->u.roamCmd.peerMac, - CDF_MAC_ADDR_SIZE)) + QDF_MAC_ADDR_SIZE)) && (pCommand->u.roamCmd.roamReason == pDupCommand->u.roamCmd.roamReason || eCsrForcedDisassoc == @@ -3024,7 +3024,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, bool fMICFailure) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; uint16_t reasonCode; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); @@ -3040,7 +3040,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, } else if (eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT == NewSubstate) { reasonCode = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("set to reason code eSIR_MAC_DISASSOC_LEAVING_BSS_REASON" " and set back NewSubstate")); @@ -3056,7 +3056,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, bssid); } else if (pSession->pConnectBssDesc) { cdf_mem_copy(&bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } sms_log(pMac, LOG2, @@ -3172,7 +3172,7 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, static QDF_STATUS csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable, - struct cdf_mac_addr *bssId) + struct qdf_mac_addr *bssId) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeTkipCntrMeasReq *pMsg; @@ -3201,7 +3201,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, bool bEnable) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, @@ -3210,7 +3210,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_issue_tkip_counter_measures:Connected BSS Description in CSR Session not found"); @@ -3227,11 +3227,11 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, @@ -3240,7 +3240,7 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_get_associated_stas:Connected BSS Description in CSR Session not found"); @@ -3261,10 +3261,10 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac) + struct qdf_mac_addr pRemoveMac) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3274,7 +3274,7 @@ csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, "csr_roam_get_wps_session_overlap:Connected BSS Description in CSR Session not found"); @@ -3294,7 +3294,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, eCsrRoamSubState NewSubstate) { QDF_STATUS status = QDF_STATUS_SUCCESS; - struct cdf_mac_addr bssId = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bssId = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -3304,7 +3304,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, if (pSession->pConnectBssDesc) { cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } sms_log(pMac, LOG2, "CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(bssId.bytes)); @@ -3475,7 +3475,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, if (pBssDesc->beaconInterval) /* Make sure it is bigger than the minimal */ pBssConfig->uJoinTimeOut = - CDF_MAX(10 * pBssDesc->beaconInterval, + QDF_MAX(10 * pBssDesc->beaconInterval, CSR_JOIN_FAILURE_TIMEOUT_MIN); else pBssConfig->uJoinTimeOut = @@ -3605,7 +3605,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "csr_roam_get_qos_info_from_bss() failed"); break; } @@ -4155,7 +4155,7 @@ void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result) #ifdef WLAN_FEATURE_ROAM_OFFLOAD pSession = &pMac->roam.roamSession[sessionId]; if (pSession->roam_synch_in_progress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:csr_roam_cfg_set_callback"); } #endif @@ -4213,7 +4213,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, /* Make sure we have the domain info for the BSS we try to connect to. */ /* Do we need to worry about sequence for OSs that are not Windows?? */ if (pBssDesc) { - if ((CDF_SAP_MODE != + if ((QDF_SAP_MODE != csr_get_session_persona(pMac, sessionId)) && csr_learn_11dcountry_information( pMac, pBssDesc, pIes, true)) { @@ -5243,7 +5243,7 @@ void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, tListElem *pEntry; tSmeCmd *pCommand; bool fReleaseCommand = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Roam Completion ...", __func__); pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (pEntry) { @@ -5562,7 +5562,7 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId) pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession->pCurRoamProfile) { if (pSession->pCurRoamProfile->csrPersona != - CDF_STA_MODE) { + QDF_STA_MODE) { return false; } } @@ -5654,14 +5654,14 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) tCsrRoamSession *session = &mac->roam.roamSession[session_id]; /* Clean up the roam synch in progress for LFR3 */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Roam Synch Failed, Clean Up", __func__); session->roam_synch_in_progress = false; roam_offload_failed = cdf_mem_malloc( sizeof(struct roam_offload_synch_fail)); if (NULL == roam_offload_failed) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: unable to allocate memory for roam synch fail" , __func__); return; @@ -5671,9 +5671,9 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) msg.type = WMA_ROAM_OFFLOAD_SYNCH_FAIL; msg.reserved = 0; msg.bodyptr = roam_offload_failed; - if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(CDF_MODULE_ID_WMA, + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", __func__); cdf_mem_free(roam_offload_failed); @@ -5762,7 +5762,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, roam_info.reasonCode = session->joinFailStatusCode.reasonCode; cdf_mem_copy(&roam_info.bssid, &session->joinFailStatusCode.bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); /* * If Join fails while Handoff is in progress, indicate @@ -5987,7 +5987,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, csr_roam_save_connected_infomation(mac_ctx, session_id, profile, bss_desc, ies_ptr); cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } /* We are done with the IEs so free it */ cdf_mem_free(ies_ptr); @@ -6009,7 +6009,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, } if (bss_desc) { cdf_mem_copy(ibss_log->bssid.bytes, - bss_desc->bssId, CDF_MAC_ADDR_SIZE); + bss_desc->bssId, QDF_MAC_ADDR_SIZE); ibss_log->operatingChannel = bss_desc->channelId; } @@ -6071,7 +6071,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, roam_info.pBssDesc = bss_desc; roam_info.staId = (uint8_t) start_bss_rsp->staId; cdf_mem_copy(roam_info.bssid.bytes, bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); if (!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) && (csr_is_concurrent_session_running(mac_ctx))) { mac_ctx->roam.configParam.doBMPSWorkaround = 1; @@ -6171,7 +6171,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, bss_desc = session->pConnectBssDesc; if (bss_desc) cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } else { if (cmd->u.roamCmd.pRoamBssEntry) { scan_res = GET_BASE_ADDR(cmd->u.roamCmd.pRoamBssEntry, @@ -6181,7 +6181,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, ies_ptr = (tDot11fBeaconIEs *) (scan_res->Result.pvIes); cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); } } } @@ -6259,7 +6259,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (session->roam_synch_in_progress && (roam_offload_params->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, @@ -6319,7 +6319,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (context) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); #endif @@ -6472,7 +6472,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info.replay_ctr, roam_offload_params->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("LFR3: Copy KCK, KEK and Replay Ctr")); @@ -6504,7 +6504,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); @@ -6593,7 +6593,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (roam_info.pBssDesc) cdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); /* * Since there is no change in the current state, simply pass * back no result otherwise HDD may be mistakenly mark to @@ -6620,7 +6620,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (roam_info.pBssDesc) cdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info.statusCode = session->joinFailStatusCode.statusCode; roam_info.reasonCode = session->joinFailStatusCode.reasonCode; roam_info.nBeaconLength = session->connectedInfo.nBeaconLength; @@ -6671,7 +6671,7 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); if (pSrcProfile->BSSIDs.numOfBSSIDs) { - size = sizeof(struct cdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; + size = sizeof(struct qdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; pDstProfile->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; @@ -6850,7 +6850,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); - pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); + pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -6968,7 +6968,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->u.roamCmd.roamProfile.EncryptionType. encryptionType[0] = eCSR_ENCRYPT_TYPE_NONE; pCommand->u.roamCmd.roamProfile.csrPersona = - CDF_STA_MODE; + QDF_STA_MODE; } else { /* make a copy of the profile */ status = @@ -6988,7 +6988,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* We need to free the BssList when the command is done */ pCommand->u.roamCmd.fReleaseBssList = true; pCommand->u.roamCmd.fUpdateCurRoamProfile = true; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d"), pCommand->u.roamCmd.roamProfile.csrPersona); status = csr_queue_sme_command(pMac, pCommand, fImediate); @@ -7255,8 +7255,8 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, if (QDF_IS_STATUS_SUCCESS(status)) { /* check if set hw mode needs to be done */ if ((pMac->policy_manager_enabled) && - ((pScanFilter->csrPersona == CDF_STA_MODE) || - (pScanFilter->csrPersona == CDF_P2P_CLIENT_MODE))) { + ((pScanFilter->csrPersona == QDF_STA_MODE) || + (pScanFilter->csrPersona == QDF_P2P_CLIENT_MODE))) { csr_get_bssdescr_from_scan_handle(hBSSList, &first_ap_profile); status = cds_handle_conc_multiport(sessionId, @@ -7553,7 +7553,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma && (eSIR_MAC_DISASSOC_LEAVING_BSS_REASON == pCommand->u.roamCmd.reason)) { NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("set to substate eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT")); } @@ -7698,7 +7698,7 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session pCommand->u.roamCmd.roamReason = eCsrForcedDisassoc; pCommand->u.roamCmd.reason = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL ("SME convert to internal reason code eCsrStaHasLeft")); break; @@ -7811,7 +7811,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -7977,12 +7977,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, if (pSmeJoinRsp) { session_ptr = CSR_GET_SESSION(pMac, pSmeJoinRsp->sessionId); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Sme Join Response is NULL")); return; } if (!session_ptr) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), pSmeJoinRsp->sessionId); return; } @@ -8055,12 +8055,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, * ***************************************************/ if (session_ptr->join_bssid_count >= CSR_MAX_BSSID_COUNT) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Excessive Join Req Failures")); if (is_dis_pending) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("disconnect is pending, complete roam")); @@ -8097,7 +8097,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); /* Set the roaming substate to 'join attempt'... */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); /* attempt to Join this BSS... */ return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, pIes, @@ -8539,7 +8539,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, uint32_t roamId = 0; if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("CSR SmeReassocReq Successful")); result = eCsrReassocSuccess; /* @@ -8786,7 +8786,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, csr_ser_des_unpack_diassoc_rsp((uint8_t *) pSmeRsp, &SmeDisassocRsp); sessionId = SmeDisassocRsp.sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), sessionId); if (csr_is_conn_state_infra(pMac, sessionId)) { @@ -8815,7 +8815,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, } csr_roam_complete(pMac, eCsrNothingToJoin, NULL); } else if (CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("CSR SmeDisassocReq due to HO on session %d"), sessionId); pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9014,7 +9014,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) pSmeRsp->sessionId) || CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, pSmeRsp->sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("eWNI_SME_DISASSOC_RSP subState = %s"), mac_trace_getcsr_roam_sub_state( pMac->roam.curSubState[pSmeRsp->sessionId])); @@ -9101,7 +9101,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) pUpperLayerAssocCnf-> bssId, &sessionId); pSession = CSR_GET_SESSION(pMac, sessionId); @@ -9136,7 +9136,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) sizeof(tSirMacAddr)); cdf_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; pRoamInfo->timingMeasCap = @@ -9192,7 +9192,7 @@ QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, tCsrRoamSetKey setKey; setKey.encType = EncryptType; setKey.keyDirection = aniKeyDirection; - cdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct qdf_mac_addr)); /* 0 for supplicant */ setKey.paeRole = paeRole; /* Key index */ @@ -9378,7 +9378,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI) tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -9484,7 +9484,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma } cdf_mem_copy(setKeyEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (CSR_IS_ENC_TYPE_STATIC(pCommand->u.setKeyCmd.encType)) { uint32_t defKeyId; /* It has to be static WEP here */ @@ -9584,7 +9584,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, roam_params = &mac_ctx->roam.configParam.roam_params; if (profile->BSSIDs.numOfBSSIDs) { - size = sizeof(struct cdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; + size = sizeof(struct qdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; scan_fltr->BSSIDs.bssid = cdf_mem_malloc(size); if (NULL == scan_fltr->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; @@ -9597,7 +9597,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, if (profile->SSIDs.numOfSSIDs) { scan_fltr->SSIDs.numOfSSIDs = profile->SSIDs.numOfSSIDs; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("No of Allowed List:%d"), roam_params->num_ssid_allowed_list); if (scan_fltr->scan_filter_for_roam @@ -9776,16 +9776,16 @@ static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) { void *wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_send_snr_request(wma_handle, pGetRssiReq)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to Trigger wma stats request"); return QDF_STATUS_E_FAILURE; } @@ -9918,7 +9918,7 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssId) + struct qdf_mac_addr *bssId) { tpSirResetAPCapsChange pMsg; uint16_t len; @@ -9961,7 +9961,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) sms_log(mac_ctx, LOG1, FL("Receive WNI_SME_ASSOC_IND from SME")); pAssocInd = (tSirSmeAssocInd *) msg_ptr; status = csr_roam_get_session_id_from_bssid(mac_ctx, - (struct cdf_mac_addr *) pAssocInd->bssId, &sessionId); + (struct qdf_mac_addr *) pAssocInd->bssId, &sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOG1, FL("Couldn't find session_id for given BSSID")); @@ -9994,7 +9994,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) sizeof(tSirMacAddr)); cdf_mem_copy(roam_info_ptr->bssid.bytes, pAssocInd->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info_ptr->wmmEnabledSta = pAssocInd->wmmEnabledSta; roam_info_ptr->timingMeasCap = pAssocInd->timingMeasCap; cdf_mem_copy(&roam_info_ptr->chan_info, @@ -10129,7 +10129,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cmd.u.roamCmd.roamReason = eCsrForcedDeauthSta; cdf_mem_copy(cmd.u.roamCmd.peerMac, pDisassocInd->peer_macaddr.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); csr_roam_remove_duplicate_command(mac_ctx, sessionId, &cmd, eCsrForcedDeauthSta); } @@ -10325,7 +10325,7 @@ csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) (uint8_t) diag_auth_type_from_csr_type( session->connectedProfile.AuthType); cdf_mem_copy(secEvent.bssid, session->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); } #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ @@ -10442,7 +10442,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, if (session->pConnectBssDesc) { cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info.u.pConnectedProfile = &session->connectedProfile; roam_info_ptr = &roam_info; @@ -10504,12 +10504,12 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, result = eCSR_ROAM_RESULT_IBSS_COALESCED; roamStatus = eCSR_ROAM_IBSS_IND; cdf_mem_copy(&roam_info.bssid, &pNewBss->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); roam_info_ptr = &roam_info; /* This BSSID is the real BSSID, save it */ if (session->pConnectBssDesc) cdf_mem_copy(session->pConnectBssDesc->bssId, - &pNewBss->bssId, sizeof(struct cdf_mac_addr)); + &pNewBss->bssId, sizeof(struct qdf_mac_addr)); break; /* @@ -10608,7 +10608,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } cdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); if (pIbssPeerInd->mesgLen > sizeof(tSmeIbssPeerInd)) { roam_info.pbFrames = cdf_mem_malloc((pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd))); @@ -10734,7 +10734,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, (uint8_t) diag_enc_type_from_csr_type( session->connectedProfile.EncryptionType); cdf_mem_copy(setKeyEvent.bssid, session->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); setKeyEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( session->connectedProfile.AuthType); @@ -10990,7 +10990,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, bool fCompleted = true; uint32_t roamTime = (uint32_t) (pMac->roam.configParam.nRoamingTime * - CDF_TICKS_PER_SECOND); + QDF_TICKS_PER_SECOND); uint32_t curTime = (uint32_t) cdf_mc_timer_get_system_ticks(); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -11859,7 +11859,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) else status = QDF_STATUS_SUCCESS; if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("%s: failed to allocate memory, status = %d"), __FUNCTION__, status); goto error; @@ -12352,11 +12352,11 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, pParam->uCfgDot11Mode = csr_roam_get_phy_mode_band_for_bss(pMac, pProfile, tmp_opr_ch, &band); - if (((pProfile->csrPersona == CDF_P2P_CLIENT_MODE) - || (pProfile->csrPersona == CDF_P2P_GO_MODE)) + if (((pProfile->csrPersona == QDF_P2P_CLIENT_MODE) + || (pProfile->csrPersona == QDF_P2P_GO_MODE)) && (pParam->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11B)) { /* This should never happen */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("For P2P (persona %d) dot11_mode is 11B"), pProfile->csrPersona); CDF_ASSERT(0); @@ -12399,8 +12399,8 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, break; case eSIR_11G_NW_TYPE: /* For P2P Client and P2P GO, disable 11b rates */ - if ((pProfile->csrPersona == CDF_P2P_CLIENT_MODE) - || (pProfile->csrPersona == CDF_P2P_GO_MODE) + if ((pProfile->csrPersona == QDF_P2P_CLIENT_MODE) + || (pProfile->csrPersona == QDF_P2P_GO_MODE) || (eCSR_CFG_DOT11_MODE_11G_ONLY == pParam->uCfgDot11Mode)) { csr_populate_basic_rates(opr_rates, true, true); @@ -12440,7 +12440,7 @@ csr_roam_get_bss_start_parms_from_bss_desc(tpAniSirGlobal pMac, pParam->sirNwType = pBssDesc->nwType; pParam->cbMode = PHY_SINGLE_CHANNEL_CENTERED; pParam->operationChn = pBssDesc->channelId; - cdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct qdf_mac_addr)); if (!pIes) { pParam->ssId.length = 0; @@ -12525,7 +12525,7 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, pIbssLog->eventId = WLAN_IBSS_EVENT_JOIN_IBSS_REQ; cdf_mem_copy(pIbssLog->bssid.bytes, - pBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pBssDesc->bssId, QDF_MAC_ADDR_SIZE); } else { pIbssLog->eventId = WLAN_IBSS_EVENT_START_IBSS_REQ; @@ -12634,10 +12634,10 @@ static void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, /* Use the first BSSID */ cdf_mem_copy(&pSession->bssParams.bssid, pProfile->BSSIDs.bssid, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); else cdf_mem_set(&pSession->bssParams.bssid, - sizeof(struct cdf_mac_addr), 0); + sizeof(struct qdf_mac_addr), 0); } Channel = pSession->bssParams.operationChn; /* Set operating channel in pProfile which will be used */ @@ -12753,7 +12753,7 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, pNewBss->channelNumber; /* move the BSSId from the BSS description into the connected state information. */ cdf_mem_copy(&pSession->connectedProfile.bssid.bytes, - &(pNewBss->bssId), sizeof(struct cdf_mac_addr)); + &(pNewBss->bssId), sizeof(struct qdf_mac_addr)); } return; } @@ -12790,7 +12790,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) pSession->connectedProfile.EncryptionType); cdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( pSession->connectedProfile.AuthType); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); @@ -12892,7 +12892,7 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, /* !flush_cache - so look up in the cache */ for (Index = 0; Index < CSR_MAX_PMKID_ALLOWED; Index++) { if (cdf_mem_compare(pSession->PmkidCacheInfo[Index].BSSID.bytes, - pBSSId, CDF_MAC_ADDR_SIZE)) { + pBSSId, QDF_MAC_ADDR_SIZE)) { fMatchFound = 1; /* Clear this - the matched entry */ @@ -13139,13 +13139,13 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, return QDF_STATUS_E_NOMEM; cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); - pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct cdf_mac_addr)); + pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pScanFilter->BSSIDs.bssid) { cdf_mem_free(pScanFilter); return QDF_STATUS_E_NOMEM; } cdf_mem_copy(pScanFilter->BSSIDs.bssid, - &pConnProfile->bssid, sizeof(struct cdf_mac_addr)); + &pConnProfile->bssid, sizeof(struct qdf_mac_addr)); pScanFilter->BSSIDs.numOfBSSIDs = 1; if (!csr_is_nullssid(pConnProfile->SSID.ssId, pConnProfile->SSID.length)) { @@ -13446,7 +13446,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, #endif csr_join_req->staPersona = (uint8_t) pProfile->csrPersona; csr_join_req->cbMode = (uint8_t) pSession->bssParams.cbMode; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d CSR CbMode %d"), pProfile->csrPersona, pSession->bssParams.cbMode); csr_join_req->uapsdPerAcBitmask = pProfile->uapsd_mask; @@ -13824,11 +13824,11 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, (uint8_t)pMac->roam.configParam.txBFCsnValue; if (IS_BSS_VHT_CAPABLE(pIes->VHTCaps) && pIes->VHTCaps.numSoundingDim) - txBFCsnValue = CDF_MIN(txBFCsnValue, + txBFCsnValue = QDF_MIN(txBFCsnValue, pIes->VHTCaps.numSoundingDim); else if (IS_BSS_VHT_CAPABLE(pIes->vendor2_ie.VHTCaps) && pIes->vendor2_ie.VHTCaps.numSoundingDim) - txBFCsnValue = CDF_MIN(txBFCsnValue, + txBFCsnValue = QDF_MIN(txBFCsnValue, pIes->vendor2_ie.VHTCaps.numSoundingDim); } csr_join_req->txBFCsnValue = txBFCsnValue; @@ -13926,7 +13926,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, roam.configParam.is_sta_connection_in_5gz_enabled) && CDS_IS_CHANNEL_5GHZ(pBssDescription-> channelId)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("STA-conn on 5G isn't allowed")); status = QDF_STATUS_E_FAILURE; @@ -13969,7 +13969,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (eWNI_SME_JOIN_REQ == messageType) { /* Notify QoS module that join happening */ pSession->join_bssid_count++; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "BSSID Count = %d", pSession->join_bssid_count); @@ -14015,15 +14015,15 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { cdf_mem_copy(&pMsg->bssid.bytes, &pSession->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } else { cdf_mem_copy(&pMsg->bssid.bytes, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->peer_macaddr.bytes, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); } pMsg->reasonCode = reasonCode; /* @@ -14041,8 +14041,8 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, - struct cdf_mac_addr bssid, + QDF_MODULE_ID modId, + struct qdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf) @@ -14069,9 +14069,9 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, void *pUsrContext, + struct qdf_mac_addr bssid, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr remove_mac) + struct qdf_mac_addr remove_mac) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetWPSPBCSessionsReq *pMsg; @@ -14207,14 +14207,14 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { cdf_mem_copy(&pMsg->bssid, &pSession->selfMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); } else { cdf_mem_copy(&pMsg->bssid, - bssId, CDF_MAC_ADDR_SIZE); + bssId, QDF_MAC_ADDR_SIZE); } /* Set the peer MAC address before sending the message to LIM */ - cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); pMsg->reasonCode = reasonCode; return cds_send_mb_message_to_mac(pMsg); @@ -14314,15 +14314,15 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn pMsg->statusCode = eSIR_SME_ASSOC_REFUSED; /* bssId */ cdf_mem_copy(pMsg->bssid.bytes, pAssocInd->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* peerMacAddr */ cdf_mem_copy(pMsg->peer_macaddr.bytes, pAssocInd->peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* aid */ pMsg->aid = pAssocInd->aid; /* alternateBssId */ cdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* alternateChannelId */ pMsg->alternateChannelId = 11; /* pMsg is freed by cds_send_mb_message_to_mac in anycase*/ @@ -14414,7 +14414,7 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr peer_macaddr, + struct qdf_mac_addr peer_macaddr, uint8_t numKeys, tAniEdType edType, bool fUnicast, tAniKeyDirection aniKeyDirection, @@ -14831,11 +14831,11 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, pSession->callback = callback; pSession->pContext = pContext; cdf_mem_copy(&pSession->selfMacAddr, pSelfMacAddr, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); *pbSessionId = (uint8_t) i; status = cdf_mc_timer_init(&pSession->hTimerRoaming, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_roaming_timer_handler, &pSession->roamingTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -14847,7 +14847,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, /* get the HT capability info */ if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &value) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_CDF, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); @@ -14855,7 +14855,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_BTAMP_UT_RF status = cdf_mc_timer_init(&pSession->hTimerJoinRetry, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_join_retry_timer_handler, &pSession-> joinRetryTimerInfo); @@ -15112,7 +15112,7 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) csr_roam_free_connected_info(pMac, &pSession->connectedInfo); csr_free_connect_bss_desc(pMac, sessionId); csr_scan_enable(pMac); - cdf_mem_set(&pSession->selfMacAddr, sizeof(struct cdf_mac_addr), 0); + cdf_mem_set(&pSession->selfMacAddr, sizeof(struct qdf_mac_addr), 0); if (pSession->pWpaRsnReqIE) { cdf_mem_free(pSession->pWpaRsnReqIE); pSession->pWpaRsnReqIE = NULL; @@ -15148,7 +15148,7 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) } QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, uint32_t *pSessionId) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -15190,7 +15190,7 @@ static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac) return nRet; } -static void csr_roam_link_up(tpAniSirGlobal pMac, struct cdf_mac_addr bssid) +static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid) { uint32_t sessionId = 0; @@ -15366,7 +15366,7 @@ void csr_roam_stats_client_timer_handler(void *pv) tCsrStatsClientReqInfo *pStaEntry = (tCsrStatsClientReqInfo *) pv; if (CDF_TIMER_STATE_STOPPED == cdf_mc_timer_get_current_state(&pStaEntry->timer)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("roam stats client timer is stopped")); } } @@ -15758,7 +15758,7 @@ tCsrPeStatsReqInfo *csr_roam_insert_entry_into_pe_stats_req_list(tpAniSirGlobal QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, int8_t lastRSSI, void *pContext, void *p_cds_context) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -15808,7 +15808,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, - uint8_t staId, struct cdf_mac_addr bssId, void *pContext) + uint8_t staId, struct qdf_mac_addr bssId, void *pContext) { QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t msg; @@ -15851,7 +15851,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pContext, void *p_cds_context, uint8_t tid) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -15965,7 +15965,7 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, ptr_sta_entry->periodicity = periodicity; if (ptr_sta_entry->periodicity) { status = cdf_mc_timer_init(&ptr_sta_entry->timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_stats_client_timer_handler, ptr_sta_entry); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -16010,7 +16010,7 @@ csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, /* update periodicity */ if (mac_ctx->roam.tlStatsReqInfo.periodicity) mac_ctx->roam.tlStatsReqInfo.periodicity = - CDF_MIN(periodicity, + QDF_MIN(periodicity, mac_ctx->roam.tlStatsReqInfo.periodicity); else mac_ctx->roam.tlStatsReqInfo.periodicity = periodicity; @@ -16221,13 +16221,13 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, nStatus = dot11f_get_packed_probe_request_size(pMac, &pr, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to calculate the packed size f" "or a Probe Request (0x%08x).\n", nStatus); nPayload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while calculating" "the packed size for a Probe Request (" "0x%08x).\n", nStatus); @@ -16245,7 +16245,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, selfMacAddr); if (eSIR_SUCCESS != nSirStatus) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to populate the buffer descriptor for a Probe Request (%d).\n", nSirStatus); return nSirStatus; @@ -16255,12 +16255,12 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, sizeof(tSirMacMgmtHdr), nPayload, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).\n", nStatus); return eSIR_FAILURE; } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request (0x%08x).\n", nStatus); } @@ -16300,7 +16300,7 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, cdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, sizeof(req_buf->PSK_PMK)); req_buf->pmk_len = session->pmk_len; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3: PMK Length = %d", req_buf->pmk_len); req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; cdf_mem_copy(req_buf->R0KH_ID, @@ -16384,7 +16384,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, band = mac_ctx->roam.configParam.bandCapability; if ((eCSR_BAND_24 != band) && (eCSR_BAND_5G != band) && (eCSR_BAND_ALL != band)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid band(%d), roam scan offload req aborted"), band); return QDF_STATUS_E_FAILURE; @@ -16432,7 +16432,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, uint8_t num_channels = 0; uint8_t *ch_lst = mac_ctx->scan.occupiedChannels[session_id].channelList; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Num of channels before filtering=%d", mac_ctx->scan.occupiedChannels[session_id].numChannels); for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels; @@ -16445,7 +16445,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, *ch_lst; } if (*ch_lst) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "DFSRoam=%d, ChnlState=%d, Chnl=%d, num_ch=%d", mac_ctx->roam.configParam.allowDFSChannelRoam, cds_get_channel_state(*ch_lst), *ch_lst, @@ -16533,7 +16533,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, mac_ctx->roam.validChannelList, &host_channels); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to get the valid channel list")); return status; } @@ -16592,7 +16592,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, req_buf = cdf_mem_malloc(sizeof(tSirRoamOffloadScanReq)); if (NULL == req_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Mem alloc for roam scan offload req failed.")); return NULL; } @@ -16619,7 +16619,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.isRoamOffloadScanEnabled; } cdf_mem_copy(req_buf->ConnectedNetwork.currAPbssid, - roam_info->currAPbssid.bytes, sizeof(struct cdf_mac_addr)); + roam_info->currAPbssid.bytes, sizeof(struct qdf_mac_addr)); req_buf->ConnectedNetwork.ssId.length = mac_ctx->roam.roamSession[session_id]. connectedProfile.SSID.length; @@ -16672,7 +16672,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, eCSR_AUTH_TYPE_OPEN_SYSTEM) || (csr_is_auth_type_ese(req_buf-> ConnectedNetwork.authentication))); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:IsEseAssoc=%d\n"), req_buf->IsESEAssoc); #endif if (ese_neighbor_list_recvd || curr_ch_lst_info->numOfChannels == 0) { @@ -16712,7 +16712,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, } else break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("ChnlCacheType:%d, No of Chnls:%d,Channels: %s"), req_buf->ChannelCacheType, req_buf->ConnectedNetwork.ChannelCount, ch_cache_str); @@ -16741,14 +16741,14 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, */ if (req_buf->HomeAwayTime < (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d). Hence enforcing home away time to disable (0)"), req_buf->HomeAwayTime, (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))); req_buf->HomeAwayTime = 0; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("HomeAwayTime:%d"), req_buf->HomeAwayTime); /*Prepare a probe request for 2.4GHz band and one for 5GHz band */ @@ -16773,7 +16773,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.early_stop_scan_min_threshold; req_buf->early_stop_scan_max_threshold = mac_ctx->roam.configParam.early_stop_scan_max_threshold; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("EarlyStopFeature Enable=%d, MinThresh=%d, MaxThresh=%d"), req_buf->early_stop_scan_enable, req_buf->early_stop_scan_min_threshold, @@ -16812,7 +16812,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, cdf_mem_compare(roam_params->ssid_allowed_list[i].ssId, req_buffer->ConnectedNetwork.ssId.ssId, roam_params->ssid_allowed_list[i].length)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist contains connected profile SSID"); match = true; break; @@ -16821,11 +16821,11 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, if (!match) { if (roam_params->num_ssid_allowed_list >= MAX_SSID_ALLOWED_LIST) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist is FULL. Cannot Add another entry"); return; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Adding Connected profile SSID to whitelist"); /* i is the next available index to add the entry.*/ i = roam_params->num_ssid_allowed_list; @@ -16893,7 +16893,7 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command, desiredMask = RSO_ABORT_SCAN_ALLOW_MASK; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Wrong RSO command %d, not allowed"), command); return 0;/*Cmd Not allowed*/ } @@ -16930,7 +16930,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, uint8_t op_channel; if (NULL == session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session is null")); return QDF_STATUS_E_FAILURE; } @@ -16952,7 +16952,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, } if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) && reason != REASON_ROAM_SET_BLACKLIST_BSSID) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RSO out-of-sync command %d lastSentCmd %d"), command, roam_info->last_sent_cmd); return QDF_STATUS_E_FAILURE; @@ -16979,7 +16979,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, (reason != REASON_ROAM_SET_BLACKLIST_BSSID)) { state = mac_trace_get_neighbour_roam_state( roam_info->neighborRoamState); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan Command not sent to FW state=%s and cmd=%d"), state, command); return QDF_STATUS_E_FAILURE; @@ -16989,7 +16989,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, session_id, reason, session, roam_info); if (!req_buf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to create req packet")); return QDF_STATUS_E_FAILURE; } @@ -17016,7 +17016,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, */ if (roam_params_src->rssi_diff) req_buf->RoamRssiDiff = roam_params_src->rssi_diff; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "num_bssid_avoid_list: %d, num_ssid_allowed_list: %d, " "num_bssid_favored: %d, raise_rssi_thresh_5g: %d, " "drop_rssi_thresh_5g: %d, raise_rssi_type_5g: %d, " @@ -17037,18 +17037,18 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, req_buf->RoamRssiDiff, roam_params_dst->alert_rssi_threshold); for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Blacklist Bssid: ("MAC_ADDRESS_STR")", MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes)); } for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Whitelist: %.*s", roam_params_dst->ssid_allowed_list[i].length, roam_params_dst->ssid_allowed_list[i].ssId); } for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Preferred Bssid: ("MAC_ADDRESS_STR") score: %d", MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes), roam_params_dst->bssid_favored_factor[i]); @@ -17068,14 +17068,14 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, * to connect to a better 5GHz AP is available. */ if (CDS_IS_CHANNEL_5GHZ(op_channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Disabling HI_RSSI feature as connected AP is 5GHz"); req_buf->hi_rssi_scan_rssi_delta = 0; } else { req_buf->hi_rssi_scan_rssi_delta = roam_info->cfgParams.hi_rssi_scan_rssi_delta; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "hi_rssi:delta=%d, max_count=%d, delay=%d, ub=%d", req_buf->hi_rssi_scan_rssi_delta, req_buf->hi_rssi_scan_max_count, @@ -17086,8 +17086,8 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, msg.reserved = 0; msg.bodyptr = req_buf; if (!QDF_IS_STATUS_SUCCESS - (cds_mq_post_message(CDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Not able to post message to WMA", __func__); cdf_mem_free(req_buf); @@ -17101,7 +17101,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, /* update the last sent cmd */ roam_info->last_sent_cmd = command; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Roam Scan Offload Command %d, Reason %d", command, reason); return status; } @@ -17111,7 +17111,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, { switch (scanOffloadRsp->reason) { case 0: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Rsp for Roam Scan Offload with failure status"); break; case REASON_OS_REQUESTED_ROAMING_NOW: @@ -17120,7 +17120,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Rsp for Roam Scan Offload with reason %d", scanOffloadRsp->reason); } @@ -17147,7 +17147,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, GET_BASE_ADDR(pStaEntry, tCsrPeStatsReqInfo, link); if (pTempStaEntry->periodicity) { pTempStaEntry->periodicity = - CDF_MIN(periodicity, + QDF_MIN(periodicity, pTempStaEntry->periodicity); } else { pTempStaEntry->periodicity = periodicity; @@ -17200,7 +17200,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, qdf_status = cdf_mc_timer_init(&pTempStaEntry-> hPeStatsTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_roam_pe_stats_timer_handler, pTempStaEntry); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -17745,7 +17745,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, } /* Save the received response */ cdf_mem_copy((void *)&pSession->ftSmeContext.preAuthbssId, - (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct cdf_mac_addr)); + (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId)) csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, eCSR_ROAM_FT_RESPONSE, @@ -17759,7 +17759,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* Save the bssid from the received response */ cdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0); @@ -17772,7 +17772,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* Save the bssid from the received response */ cdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, &roamInfo, 0, eCSR_ROAM_PMK_NOTIFY, 0); } @@ -17842,11 +17842,11 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pR pBuf += 2; cdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); pBuf += 4; - cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, QDF_MAC_ADDR_SIZE); } } -/* Returns whether a session is in CDF_STA_MODE...or not */ +/* Returns whether a session is in QDF_STA_MODE...or not */ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) { tCsrRoamSession *pSession = NULL; @@ -17871,7 +17871,7 @@ bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId) * really in STA Mode.*/ if (NULL != pSession->pCurRoamProfile) { - if (pSession->pCurRoamProfile->csrPersona == CDF_STA_MODE) { + if (pSession->pCurRoamProfile->csrPersona == QDF_STA_MODE) { return true; } else { return false; @@ -17900,7 +17900,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, pMsg->sessionId = sessionId; pMsg->channel = pHandoffInfo->channel; pMsg->handoff_src = pHandoffInfo->src; - cdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); msg.type = eWNI_SME_HANDOFF_REQ; msg.bodyptr = pMsg; msg.reserved = 0; @@ -17984,7 +17984,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * Return: QDF_STATUS */ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, chan_params_t *ch_params, tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18008,7 +18008,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, pMac->roam.configParam.uCfgDot11Mode); pMsg->center_freq_seg_0 = ch_params->center_freq_seg0; pMsg->center_freq_seg_1 = ch_params->center_freq_seg1; - cdf_mem_copy(pMsg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pMsg->operational_rateset, ¶m.operationalRateSet, sizeof(pMsg->operational_rateset)); cdf_mem_copy(&pMsg->extended_rateset, @@ -18024,7 +18024,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, * completed without any RADAR indications. */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18040,7 +18040,7 @@ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, pMsg->messageType = eWNI_SME_START_BEACON_REQ; pMsg->messageLen = sizeof(tSirStartBeaconIndication); pMsg->beaconStartStatus = dfsCacWaitStatus; - cdf_mem_copy(pMsg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); status = cds_send_mb_message_to_mac(pMsg); @@ -18217,7 +18217,7 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, **/ QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, - struct cdf_mac_addr bssid, uint8_t target_channel, + struct qdf_mac_addr bssid, uint8_t target_channel, uint8_t csa_ie_reqd, chan_params_t *ch_params) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18234,7 +18234,7 @@ csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, msg->targetChannel = target_channel; msg->csaIeRequired = csa_ie_reqd; - cdf_mem_copy(msg->bssid, bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&msg->ch_params, ch_params, sizeof(chan_params_t)); status = cds_send_mb_message_to_mac(msg); @@ -18305,13 +18305,13 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) if (pSmeHOFailInd) sessionId = pSmeHOFailInd->sessionId; else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3: Hand-Off Failure Ind is NULL"); return; } /* Roaming is supported only on Infra STA Mode. */ if (!csr_roam_is_sta_mode(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:HO Fail cannot be handled for session %d", sessionId); return; @@ -18319,7 +18319,7 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) csr_roam_synch_clean_up(pMac, sessionId); csr_roaming_report_diag_event(pMac, NULL, eCSR_REASON_ROAM_HO_FAIL); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Issue Disconnect on session %d", sessionId); csr_roam_disconnect(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); } @@ -18440,7 +18440,7 @@ void csr_init_operating_classes(tHalHandle hHal) * Return: session id for give session type. **/ static uint32_t -csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum tCDF_ADAPTER_MODE type) +csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum tQDF_ADAPTER_MODE type) { uint32_t i, session_id = CSR_SESSION_ID_INVALID; tCsrRoamSession *session_ptr; @@ -18475,19 +18475,19 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *sap_session; if (0 == chnl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("channel is zero, connection not allowed")); return false; } - sap_session_id = csr_find_session_by_type(mac_ctx, CDF_SAP_MODE); + sap_session_id = csr_find_session_by_type(mac_ctx, QDF_SAP_MODE); if (CSR_SESSION_ID_INVALID != sap_session_id) { sap_session = CSR_GET_SESSION(mac_ctx, sap_session_id); if ((0 != sap_session->bssParams.operationChn) && (sap_session->bssParams.operationChn != chnl)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18515,13 +18515,13 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *p2pgo_session; if (0 == chnl) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("channel is zero, connection not allowed")); return false; } - p2pgo_session_id = csr_find_session_by_type(mac_ctx, CDF_P2P_GO_MODE); + p2pgo_session_id = csr_find_session_by_type(mac_ctx, QDF_P2P_GO_MODE); if (CSR_SESSION_ID_INVALID != p2pgo_session_id) { p2pgo_session = CSR_GET_SESSION(mac_ctx, p2pgo_session_id); if ((0 != p2pgo_session->bssParams.operationChn) && @@ -18530,7 +18530,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) (p2pgo_session->bssParams.operationChn != chnl)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18570,7 +18570,7 @@ bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, if (NULL != bss_list) { csr_scan_result_purge(mac_ctx, sta_session->stored_roam_profile.bsslist_handle); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("bss list is released for session %d"), session_id); sta_session->stored_roam_profile.bsslist_handle = NULL; } @@ -18659,7 +18659,7 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, sta_session->stored_roam_profile.imediate_flag, sta_session->stored_roam_profile.clear_flag); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("CSR failed issuing connect cmd with status = 0x%08X"), status); @@ -18944,7 +18944,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, tCsrRoamInfo *roam_info; tCsrRoamConnectedProfile *conn_profile = NULL; sme_QosAssocInfo assoc_info; - struct cdf_mac_addr bcast_mac = CDF_MAC_ADDR_BROADCAST_INITIALIZER; + struct qdf_mac_addr bcast_mac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tpAddBssParams add_bss_params; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -18982,7 +18982,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, session->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED; roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo)); if (NULL == roam_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3: Mem Alloc failed for roam info")); session->roam_synch_in_progress = false; sme_release_global_lock(&mac_ctx->sme); @@ -18996,7 +18996,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, roam_info, 0, eCSR_ROAM_TDLS_STATUS_UPDATE, eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND); cdf_mem_copy(&roam_info->bssid.bytes, &bss_desc->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_save_connected_infomation(mac_ctx, session_id, session->pCurRoamProfile, bss_desc, @@ -19030,7 +19030,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } if ((roam_synch_data->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, @@ -19081,7 +19081,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, SIR_MAC_HDR_LEN_3A, roam_info->nAssocRspLength); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); csr_roam_free_connected_info(mac_ctx, @@ -19153,7 +19153,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN); cdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("LFR3: Copy KCK, KEK and Replay Ctr")); roam_info->subnet_change_status = CSR_GET_SUBNET_STATUS(roam_synch_data->roamReason); @@ -19164,7 +19164,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, csr_reset_bkid_candidate_list(mac_ctx, session_id); #endif if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2c6a37034570..88a27787a248 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -172,7 +172,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) mac_ctx->scan.nBssLimit = CSR_MAX_BSS_SUPPORT; #ifdef WLAN_AP_STA_CONCURRENCY status = cdf_mc_timer_init(&mac_ctx->scan.hTimerStaApConcTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_sta_ap_conc_timer_handler, mac_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -182,7 +182,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) } #endif status = cdf_mc_timer_init(&mac_ctx->scan.hTimerResultCfgAging, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_result_cfg_aging_timer_handler, mac_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -425,7 +425,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tmp_rq.scan_id = scan_11d_cmd->u.scanCmd.scanID; status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_11d_cmd); if (csr_is11d_supported(mac_ctx)) { @@ -611,7 +611,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, pMac->scan.scanProfile.numOfChannels = pTempScanReq->ChannelInfo.numOfChannels; status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, scan_cmd); sms_log(pMac, LOG1, FL("SId=%d scanId=%d Scan reason=%u numSSIDs=%d numChan=%d P2P search=%d minCT=%d maxCT=%d uIEFieldLen=%d"), @@ -808,7 +808,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; @@ -935,7 +935,7 @@ csr_scan_request_lost_link1(tpAniSirGlobal mac_ctx, uint32_t session_id) goto release_lost_link1_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, - sizeof(struct cdf_mac_addr), 0xFF); + sizeof(struct qdf_mac_addr), 0xFF); status = csr_queue_sme_command(mac_ctx, cmd, false); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, @@ -979,7 +979,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (!session->pCurRoamProfile) return QDF_STATUS_SUCCESS; status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_fltr) @@ -1062,7 +1062,7 @@ csr_scan_request_lost_link2(tpAniSirGlobal mac_ctx, uint32_t session_id) goto release_lost_link2_cmd; cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, - sizeof(struct cdf_mac_addr), 0xFF); + sizeof(struct qdf_mac_addr), 0xFF); /* Put to the head in pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -1114,7 +1114,7 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; @@ -1375,21 +1375,21 @@ static bool is_channel_found_in_pcl(tpAniSirGlobal mac_ctx, int channel_id, * Return: The modified RSSI Value */ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, - uint8_t channel_id, struct cdf_mac_addr *bssid) + uint8_t channel_id, struct qdf_mac_addr *bssid) { int modified_rssi; int boost_factor; int penalty_factor; int i; struct roam_ext_params *roam_params; - struct cdf_mac_addr fav_bssid; - struct cdf_mac_addr local_bssid; + struct qdf_mac_addr fav_bssid; + struct qdf_mac_addr local_bssid; modified_rssi = rssi; - cdf_mem_zero(&local_bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&local_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid) cdf_mem_copy(local_bssid.bytes, bssid->bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); roam_params = &mac_ctx->roam.configParam.roam_params; /* * If the 5G pref feature is enabled, apply the roaming @@ -1421,12 +1421,12 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, * Check if there are preferred bssid and then apply the * preferred score */ - cdf_mem_zero(&fav_bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&fav_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid && roam_params->num_bssid_favored) { for (i = 0; i < roam_params->num_bssid_favored; i++) { cdf_mem_copy(fav_bssid.bytes, &roam_params->bssid_favored[i], - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (!cdf_is_macaddr_equal(&fav_bssid, bssid)) continue; modified_rssi += roam_params->bssid_favored_factor[i]; @@ -1453,7 +1453,7 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, * Return: Preference value for the BSSID */ static uint32_t csr_get_bss_prefer_value(tpAniSirGlobal mac_ctx, int rssi, - struct cdf_mac_addr *bssid, int channel_id) + struct qdf_mac_addr *bssid, int channel_id) { uint32_t ret = 0; int modified_rssi; @@ -1518,7 +1518,7 @@ static bool csr_is_better_rssi(tpAniSirGlobal mac_ctx, { bool ret; int rssi1, rssi2; - struct cdf_mac_addr local_mac; + struct qdf_mac_addr local_mac; rssi1 = bss1->Result.BssDescriptor.rssi; rssi2 = bss2->Result.BssDescriptor.rssi; @@ -1526,14 +1526,14 @@ static bool csr_is_better_rssi(tpAniSirGlobal mac_ctx, * Apply the boost and penlty logic and check * which is the best RSSI */ - cdf_mem_zero(&local_mac.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&local_mac.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(&local_mac.bytes, - &bss1->Result.BssDescriptor.bssId, CDF_MAC_ADDR_SIZE); + &bss1->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi1 = csr_get_altered_rssi(mac_ctx, rssi1, bss1->Result.BssDescriptor.channelId, &local_mac); cdf_mem_copy(&local_mac.bytes, - &bss2->Result.BssDescriptor.bssId, CDF_MAC_ADDR_SIZE); + &bss2->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi2 = csr_get_altered_rssi(mac_ctx, rssi2, bss2->Result.BssDescriptor.channelId, &local_mac); @@ -1624,11 +1624,11 @@ static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult, tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - struct cdf_mac_addr bssid; + struct qdf_mac_addr bssid; uint8_t channel_id = pResult->Result.BssDescriptor.channelId; - cdf_mem_zero(&bssid.bytes, CDF_MAC_ADDR_SIZE); + cdf_mem_zero(&bssid.bytes, QDF_MAC_ADDR_SIZE); cdf_mem_copy(bssid.bytes, &pResult->Result.BssDescriptor.bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pResult->preferValue = csr_get_bss_prefer_value(pMac, (int)pResult->Result.BssDescriptor.rssi, &bssid, channel_id); @@ -1739,7 +1739,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) pMac->scan.inScanResultBestAPRssi = -128; roam_params = &pMac->roam.configParam.roam_params; #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("nSelect5GHzMargin")); #endif csr_ll_lock(&pMac->scan.scanResultList); @@ -1772,7 +1772,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) */ pBssDesc->preferValue = csr_get_bss_prefer_value(pMac, (int)pBssDesc->Result.BssDescriptor.rssi, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) &pBssDesc->Result.BssDescriptor.bssId, pBssDesc->Result.BssDescriptor.channelId); @@ -1809,7 +1809,7 @@ csr_save_ies(tpAniSirGlobal pMac, *fMatch = csr_match_bss(pMac, &pBssDesc->Result.BssDescriptor, pFilter, auth, uc, mc, &pIes); #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("csr_match_bss fmatch %d"), *fMatch); #endif if (NULL == pIes) @@ -2169,7 +2169,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, while (pEntry != NULL) { pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(pBssDesc->Result.BssDescriptor.bssId, - pCsaOffloadInd->bssid.bytes, CDF_MAC_ADDR_SIZE)) { + pCsaOffloadInd->bssid.bytes, QDF_MAC_ADDR_SIZE)) { pFreeElem = pEntry; pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK); csr_ll_remove_entry(pList, pFreeElem, LL_ACCESS_NOLOCK); @@ -2434,7 +2434,7 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, pRoamInfo = &roamInfo; pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *)pUpperLayerAssocCnf->bssId, &sessionId); + (struct qdf_mac_addr *)pUpperLayerAssocCnf->bssId, &sessionId); pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { @@ -2452,9 +2452,9 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata; cdf_mem_copy(pRoamInfo->peerMac.bytes, pUpperLayerAssocCnf->peerMacAddr, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); cdf_mem_copy(&pRoamInfo->bssid.bytes, pUpperLayerAssocCnf->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; if (CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile)) { pMac->roam.roamSession[sessionId].connectState = @@ -2508,7 +2508,7 @@ void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDes bool csr_remove_dup_bss_description(tpAniSirGlobal pMac, tSirBssDescription *bss_dscp, tDot11fBeaconIEs *pIes, tAniSSID *pSsid, - v_TIME_t *timer, bool fForced) + unsigned long *timer, bool fForced) { tListElem *pEntry; tCsrScanResult *scan_entry; @@ -2627,7 +2627,7 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, secEvent.encryptionModeUnicast = (uint8_t)diag_enc_type_from_csr_type( pSession->connectedProfile.EncryptionType); cdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t)diag_auth_type_from_csr_type( pSession->connectedProfile.AuthType); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); @@ -2636,7 +2636,7 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, pmkid_info = &pSession->PmkidCandidateInfo[pSession->NumPmkidCandidate]; /* if yes, then add to PMKIDCandidateList */ cdf_mem_copy(pmkid_info->BSSID.bytes, pBssDesc->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); /* Bit 0 offirst byte - PreAuthentication Capability */ if ((pIes->RSN.RSN_Cap[0] >> 0) & 0x1) pmkid_info->preAuthSupported = true; @@ -2721,7 +2721,7 @@ QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, BkidCandidateInfo[pSession-> NumBkidCandidate]. BSSID.bytes, pBssDesc->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (pIes->WAPI.preauth) { pSession->BkidCandidateInfo[pSession-> NumBkidCandidate]. @@ -2796,7 +2796,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, tDot11fBeaconIEs *local_ie = NULL; bool dup_bss; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; tmpSsid.length = 0; while ((entry = csr_ll_remove_tail(&mac_ctx->scan.tempScanResults, @@ -2858,7 +2858,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, * hidden ssid from the profile i.e., forget the SSID * via GUI that SSID shouldn't see in the profile */ - v_TIME_t time_gap = cdf_mc_timer_get_system_time() - + unsigned long time_gap = cdf_mc_timer_get_system_time() - timer; if ((0 == bss_dscp->Result.ssId.length) && (time_gap <= HIDDEN_TIMER) @@ -2968,7 +2968,7 @@ tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, { tCsrScanResult *pCsrBssDescription = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; int result; tmpSsid.length = 0; @@ -3074,7 +3074,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, cdf_mem_free(pChannelSet); return QDF_STATUS_E_FAILURE; } - pChannelSet->txPower = CDF_MIN(pChannelInfo->maxTxPower, + pChannelSet->txPower = QDF_MIN(pChannelInfo->maxTxPower, pMac->roam.configParam.nTxPowerCap); if (f2GHzInfoFound) { if (!f2GListPurged) { @@ -3203,7 +3203,7 @@ static void csr_diag_reset_country_information(tpAniSirGlobal pMac) for (Index = 0; Index < pMac->scan.base_channels.numChannels; Index++) { - p11dLog->TxPwr[Index] = CDF_MIN( + p11dLog->TxPwr[Index] = QDF_MIN( pMac->scan.defaultPowerTable[Index].power, pMac->roam.configParam.nTxPowerCap); } @@ -3322,7 +3322,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) * pick random.we can put some more intelligence - TBD */ if (maxVotes < pMac->scan.votes11d[i].votes) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, " Votes for Country %c%c : %d\n", pMac->scan.votes11d[i].countryCode[0], pMac->scan.votes11d[i].countryCode[1], @@ -3341,7 +3341,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) cdf_mem_copy(pMac->scan.countryCode11d, pMac->scan.votes11d[j].countryCode, WNI_CFG_COUNTRY_CODE_LEN); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Selected Country is %c%c With count %d\n", pMac->scan.votes11d[j].countryCode[0], pMac->scan.votes11d[j].countryCode[1], @@ -3537,7 +3537,7 @@ void csr_save_channel_power_for_band(tpAniSirGlobal pMac, bool fill_5f) pMac->scan.defaultPowerTable[idx].chan_num; chan_info->numChannels = 1; chan_info->maxTxPower = - CDF_MIN(pMac->scan.defaultPowerTable[idx].power, + QDF_MIN(pMac->scan.defaultPowerTable[idx].power, pMac->roam.configParam.nTxPowerCap); chan_info++; count++; @@ -4308,8 +4308,8 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, goto free_ies; if (pCap1->ess && - cdf_is_macaddr_equal((struct cdf_mac_addr *) pSirBssDesc1->bssId, - (struct cdf_mac_addr *) pSirBssDesc2->bssId) + cdf_is_macaddr_equal((struct qdf_mac_addr *) pSirBssDesc1->bssId, + (struct qdf_mac_addr *) pSirBssDesc2->bssId) && (fForced || (cds_chan_to_band(pSirBssDesc1->channelId) == cds_chan_to_band((pSirBssDesc2->channelId))))) { @@ -4359,8 +4359,8 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, /* In case of P2P devices, ess and ibss will be set to zero */ else if (!pCap1->ess && cdf_is_macaddr_equal( - (struct cdf_mac_addr *) pSirBssDesc1->bssId, - (struct cdf_mac_addr *) pSirBssDesc2->bssId)) { + (struct qdf_mac_addr *) pSirBssDesc1->bssId, + (struct qdf_mac_addr *) pSirBssDesc2->bssId)) { fMatch = true; } @@ -4568,9 +4568,9 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - uint8_t bssid[CDF_MAC_ADDR_SIZE] = {0}; + uint8_t bssid[QDF_MAC_ADDR_SIZE] = {0}; bool f = cdf_mem_compare(pCommand->u.scanCmd.u.scanRequest.bssid.bytes, - bssid, sizeof(struct cdf_mac_addr)); + bssid, sizeof(struct qdf_mac_addr)); /* * It is not a wild card scan if the bssid is not broadcast and * the number of SSID is 1. @@ -4702,7 +4702,7 @@ tCsrScanResultInfo *csr_scan_result_get_next(tpAniSirGlobal pMac, * head of the result */ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, tScanResultHandle hScanResult) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -4718,7 +4718,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, while (pEntry) { pResult = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); if (cdf_mem_compare(bssid, pResult->Result.BssDescriptor.bssId, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { status = QDF_STATUS_SUCCESS; csr_ll_remove_entry(&pResultList->List, pEntry, LL_ACCESS_NOLOCK); @@ -4783,8 +4783,8 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) if (csr_ll_remove_entry(&pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_NOLOCK)) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) &pResult->Result.BssDescriptor.bssId, - (struct cdf_mac_addr *) &pMac->scan.currentCountryBssid)) { + (struct qdf_mac_addr *) &pResult->Result.BssDescriptor.bssId, + (struct qdf_mac_addr *) &pMac->scan.currentCountryBssid)) { sms_log(pMac, LOGW, FL("Aging out 11d BSS " MAC_ADDRESS_STR), MAC_ADDR_ARRAY( @@ -4853,7 +4853,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, uint32_t minChnTime; /* in units of milliseconds */ uint32_t maxChnTime; /* in units of milliseconds */ uint32_t i; - struct cdf_mac_addr selfmac; + struct qdf_mac_addr selfmac; msgLen = (uint16_t) (sizeof(tSirSmeScanReq) - sizeof(pMsg->channelList.channelNumber) + @@ -4919,11 +4919,11 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, } } if (CSR_ROAM_SESSION_MAX == i) { - uint32_t len = CDF_MAC_ADDR_SIZE; + uint32_t len = QDF_MAC_ADDR_SIZE; status = wlan_cfg_get_str(pMac, WNI_CFG_STA_ID, selfmac.bytes, &len); if (!QDF_IS_STATUS_SUCCESS(status) - || (len < CDF_MAC_ADDR_SIZE)) { + || (len < QDF_MAC_ADDR_SIZE)) { sms_log(pMac, LOGE, FL("Can't get self MAC address = %d"), status); @@ -5810,7 +5810,7 @@ static void csr_scan_result_cfg_aging_timer_handler(void *pv) tListElem *entry, *tmp_entry; tCsrScanResult *result; uint32_t ageout_time = - mac_ctx->scan.scanResultCfgAgingTime * CDF_TICKS_PER_SECOND/10; + mac_ctx->scan.scanResultCfgAgingTime * QDF_TICKS_PER_SECOND/10; uint32_t cur_time = (uint32_t) cdf_mc_timer_get_system_ticks(); uint8_t *bssId; @@ -6163,7 +6163,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, cdf_mem_set(&scan_cmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest), 0); status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_cmd); scan_req = &scan_cmd->u.scanCmd.u.scanRequest; scan_req->scanType = eSIR_ACTIVE_SCAN; @@ -6173,7 +6173,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, * To avoid 11b rate in probe request Set p2pSearch * flag as 1 for P2P Client Mode */ - if (CDF_P2P_CLIENT_MODE == profile->csrPersona) + if (QDF_P2P_CLIENT_MODE == profile->csrPersona) scan_req->p2pSearch = 1; /* Allocate memory for IE field */ @@ -6300,15 +6300,15 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint32_t dataLen = sizeof(uint8_t) * NumChannels; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump valid channel list(NumChannels(%d))", __func__, NumChannels); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, pChannelList, NumChannels); cfg_set_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, pChannelList, dataLen); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); /* * disable fcc constraint since new country code @@ -6317,7 +6317,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, pMac->scan.fcc_constraint = false; status = csr_update_channel_list(pMac); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "failed to update the supported channel list"); } return; @@ -6382,7 +6382,7 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, ch_pwr_set->firstChanNum); ch_pwr_set->numChannels = 1; ch_pwr_set->maxTxPower = - CDF_MIN(ch_set->txPower, + QDF_MIN(ch_set->txPower, pMac->roam.configParam.nTxPowerCap); sms_log(pMac, LOG3, FL("Setting Max Transmit Power %d"), @@ -6404,7 +6404,7 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, sms_log(pMac, LOG3, FL("Setting Channel Number %d"), ch_pwr_set->firstChanNum); ch_pwr_set->numChannels = ch_set->numChannels; - ch_pwr_set->maxTxPower = CDF_MIN(ch_set->txPower, + ch_pwr_set->maxTxPower = QDF_MIN(ch_set->txPower, pMac->roam.configParam.nTxPowerCap); sms_log(pMac, LOG3, FL("Setting Max Tx Power %d, nTxPower %d"), @@ -6507,9 +6507,9 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: dump scan control list", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_SME, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, pControlList, len); @@ -6827,7 +6827,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, bool fDupBss; tDot11fBeaconIEs *local_ie = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; QDF_STATUS status; tpSirMacMgmtHdr macHeader = @@ -7014,7 +7014,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t channel) { QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -7110,7 +7110,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, bool dup_bss; tDot11fBeaconIEs *ies_local_ptr = NULL; tAniSSID tmpSsid; - v_TIME_t timer = 0; + unsigned long timer = 0; tCsrScanResult *scan_res_ptr = NULL; uint8_t session_id = roam_sync_ind_ptr->roamedVdevId; @@ -7118,7 +7118,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET); scan_res_ptr = cdf_mem_malloc(sizeof(tCsrScanResult) + length); if (scan_res_ptr == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); return QDF_STATUS_E_NOMEM; } @@ -7133,7 +7133,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, pMac, &scan_res_ptr->Result. BssDescriptor, &ies_local_ptr)))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:Cannot Parse IEs", __func__); csr_free_scan_result_entry(pMac, scan_res_ptr); return QDF_STATUS_E_RESOURCES; @@ -7143,7 +7143,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, &scan_res_ptr->Result.BssDescriptor, ies_local_ptr, &tmpSsid, &timer, true); if (CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s:BSS Limit Exceed", __func__); if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr) cdf_mem_free(ies_local_ptr); @@ -7174,12 +7174,12 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, tScanResultList *bss_list = (tScanResultList *)result_handle; if (NULL == bss_list) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Empty bss_list")); return NULL; } if (csr_ll_is_list_empty(&bss_list->List, LL_ACCESS_NOLOCK)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("bss_list->List is empty")); cdf_mem_free(bss_list); return NULL; @@ -7207,7 +7207,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, void csr_scan_active_list_timeout_handle(void *userData) { tSmeCmd *scan_cmd = (tSmeCmd *) userData; - tHalHandle *hal_ctx = cds_get_context(CDF_MODULE_ID_PE); + tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE); tpAniSirGlobal mac_ctx; uint16_t scan_id; tSirSmeScanAbortReq *msg; @@ -7215,12 +7215,12 @@ void csr_scan_active_list_timeout_handle(void *userData) QDF_STATUS status = QDF_STATUS_SUCCESS; if (scan_cmd == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Scan Timeout: Scan command is NULL")); return; } if (hal_ctx == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("HAL Context is NULL")); return; } diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index e21cde84b5e1..b3ba204237e2 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -402,7 +402,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel); void csr_free_roam_profile(tpAniSirGlobal pMac, uint32_t sessionId); void csr_free_connect_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId); QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, - struct cdf_mac_addr *bssid, + struct qdf_mac_addr *bssid, tScanResultHandle hScanResult); bool csr_check_ps_ready(void *pv); bool csr_check_ps_offload_ready(void *pv, uint32_t sessionId); @@ -464,7 +464,7 @@ QDF_STATUS csr_roam_close_session(tpAniSirGlobal pMac, uint32_t sessionId, csr_roamSessionCloseCallback callback, void *pContext); void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId); -QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct cdf_mac_addr *bssid, +QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, struct qdf_mac_addr *bssid, uint32_t *pSessionId); eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode); @@ -955,14 +955,14 @@ QDF_STATUS csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, \return QDF_STATUS ---------------------------------------------------------------------------*/ QDF_STATUS csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, void *pUsrContext, + QDF_MODULE_ID modId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, - CDF_MODULE_ID modId, - struct cdf_mac_addr bssId, + QDF_MODULE_ID modId, + struct qdf_mac_addr bssId, void *pUsrContext, void *pfnSapEventCallback, uint8_t *pAssocStasBuf); @@ -979,14 +979,14 @@ QDF_STATUS csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, QDF_STATUS csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssId, + struct qdf_mac_addr bssId, void *pUsrContext, void *pfnSapEventCallback, - struct cdf_mac_addr pRemoveMac); + struct qdf_mac_addr pRemoveMac); /* --------------------------------------------------------------------------- \fn csr_send_chng_mcc_beacon_interval @@ -1023,7 +1023,7 @@ bool csr_neighbor_roam_connected_profile_match(tpAniSirGlobal pMac, QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, uint32_t sessionId, - struct cdf_mac_addr bssid, + struct qdf_mac_addr bssid, uint8_t channel); QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac); diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index da01816d0249..58b34196ae65 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -38,12 +38,12 @@ #include "cdf_trace.h" #include "cdf_mc_timer.h" -CDF_INLINE_FN void csr_list_init(tListElem *pList) +static inline void csr_list_init(tListElem *pList) { pList->last = pList->next = pList; } -CDF_INLINE_FN void csr_list_remove_entry(tListElem *pEntry) +static inline void csr_list_remove_entry(tListElem *pEntry) { tListElem *pLast; tListElem *pNext; @@ -54,7 +54,7 @@ CDF_INLINE_FN void csr_list_remove_entry(tListElem *pEntry) pNext->last = pLast; } -CDF_INLINE_FN tListElem *csr_list_remove_head(tListElem *pHead) +static inline tListElem *csr_list_remove_head(tListElem *pHead) { tListElem *pEntry; tListElem *pNext; @@ -67,7 +67,7 @@ CDF_INLINE_FN tListElem *csr_list_remove_head(tListElem *pHead) return pEntry; } -CDF_INLINE_FN tListElem *csr_list_remove_tail(tListElem *pHead) +static inline tListElem *csr_list_remove_tail(tListElem *pHead) { tListElem *pEntry; tListElem *pLast; @@ -80,7 +80,7 @@ CDF_INLINE_FN tListElem *csr_list_remove_tail(tListElem *pHead) return pEntry; } -CDF_INLINE_FN void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) +static inline void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) { tListElem *pLast; @@ -91,7 +91,7 @@ CDF_INLINE_FN void csr_list_insert_tail(tListElem *pHead, tListElem *pEntry) pHead->last = pEntry; } -CDF_INLINE_FN void csr_list_insert_head(tListElem *pHead, tListElem *pEntry) +static inline void csr_list_insert_head(tListElem *pHead, tListElem *pEntry) { tListElem *pNext; @@ -107,7 +107,7 @@ void csr_list_insert_entry(tListElem *pEntry, tListElem *pNewEntry) { tListElem *pLast; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pEntry is Null", __func__); return; } @@ -124,7 +124,7 @@ uint32_t csr_ll_count(tDblLinkList *pList) uint32_t c = 0; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return c; } @@ -140,7 +140,7 @@ void csr_ll_lock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -154,7 +154,7 @@ void csr_ll_unlock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -169,7 +169,7 @@ bool csr_ll_is_list_empty(tDblLinkList *pList, bool fInterlocked) bool fEmpty = true; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fEmpty; } @@ -194,7 +194,7 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -223,7 +223,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) QDF_STATUS qdf_status; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -247,7 +247,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) void csr_ll_close(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -264,7 +264,7 @@ void csr_ll_insert_tail(tDblLinkList *pList, tListElem *pEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -286,7 +286,7 @@ void csr_ll_insert_head(tDblLinkList *pList, tListElem *pEntry, { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -312,7 +312,7 @@ void csr_ll_insert_entry(tDblLinkList *pList, tListElem *pEntry, tListElem *pNewEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -334,7 +334,7 @@ tListElem *csr_ll_remove_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -362,7 +362,7 @@ tListElem *csr_ll_peek_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -388,7 +388,7 @@ tListElem *csr_ll_remove_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -416,7 +416,7 @@ tListElem *csr_ll_peek_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -442,7 +442,7 @@ void csr_ll_purge(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -468,7 +468,7 @@ bool csr_ll_remove_entry(tDblLinkList *pList, tListElem *pEntryToRemove, tListElem *pEntry; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -510,7 +510,7 @@ tListElem *csr_ll_next(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } @@ -543,7 +543,7 @@ tListElem *csr_ll_previous(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 41034a8d8e4a..6a73d176da1a 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -66,7 +66,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; \ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \ + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \ FL("Sessionid (%d) NeighborRoam transition from %s to %s"), \ session, csr_neighbor_roam_state_to_string( \ mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState),\ @@ -1170,7 +1170,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id) neighbor_roam_info_ptr->FTRoamInfo.numPreAuthRetries = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); return QDF_STATUS_SUCCESS; @@ -1232,7 +1232,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, &nbr_roam_info->handoffReqInfo.bssid); } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("No of Allowed SSID List:%d"), roam_params->num_ssid_allowed_list); if (roam_params->num_ssid_allowed_list) { @@ -1445,7 +1445,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if (NULL == scan_result) break; descr = &scan_result->BssDescriptor; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Scan result: BSSID " MAC_ADDRESS_STR " (Rssi %ld, Ch:%d)"), MAC_ADDR_ARRAY(descr->bssId), @@ -1458,7 +1458,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * currently associated AP. Do not have this * in the roamable AP list */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "SKIP-currently associated AP"); continue; @@ -1474,7 +1474,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, sizeof(tSirMacAddr))) || (descr->channelId != n_roam_info->handoffReqInfo.channel))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "SKIP-not a candidate AP for OS requested roam"); continue; @@ -1508,14 +1508,14 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, n_roam_info->MinQBssLoadRequired); if (voadmitted && qpresent && (qavail < n_roam_info->MinQBssLoadRequired)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no bandwidth, ignoring", MAC_ADDR_ARRAY(descr->bssId)); continue; } if (voadmitted && !qpresent) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no QBSS LOAD IE, ignoring", MAC_ADDR_ARRAY(descr->bssId)); @@ -1541,7 +1541,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, descr->nReceivedTime; if (age_constraint == true && age_ticks > limit_ticks) { num_dropped++; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Old AP (probe rsp/beacon) skipped.") ); @@ -1587,7 +1587,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * iterations and no candidate were found */ if (age_constraint == false) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: No roam able candidates found", __func__); break; @@ -1713,7 +1713,7 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1774,13 +1774,13 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; } if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Output Channels %d", __func__, outputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1793,7 +1793,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } if (j == outputNumOfChannels) { if (pInputChannelList[i]) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding extra %d to Neighbor channel list", __func__, pInputChannelList[i]); @@ -1803,7 +1803,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } } if (numChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Merge Neighbor channel list reached Max " "limit %d", __func__, numChannels); break; @@ -1885,7 +1885,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba get_rf_band(pNeighborBssDesc-> pNeighborBssDescription-> channel)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list (Same band)\n", __func__, @@ -1899,7 +1899,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba numChannels++; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list\n", __func__, @@ -2212,7 +2212,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) * clear all the whitelist parameters and remaining * needs to be retained across connections. */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("Roaming parameters are reset")); roam_params = &mac_ctx->roam.configParam.roam_params; roam_params->num_ssid_allowed_list = 0; @@ -2246,7 +2246,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("pSession is NULL")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Disconn ind on session %d in state %d from bss :" MAC_ADDRESS_STR), sessionId, pNeighborRoamInfo->neighborRoamState, @@ -2265,7 +2265,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, csr_roam_reset_roam_params(pMac); if (NULL != pSession) { roam_session = &pMac->roam.roamSession[sessionId]; - if (NULL != pSession->pCurRoamProfile && (CDF_STA_MODE != + if (NULL != pSession->pCurRoamProfile && (QDF_STA_MODE != roam_session->pCurRoamProfile->csrPersona)) { sms_log(pMac, LOGE, FL("Ignore disconn ind rcvd from nonSTA persona" @@ -2454,7 +2454,7 @@ static void csr_neighbor_roam_info_ctx_init( * down to firmware.Do not send the START command for * other session connections.*/ if (!csr_roam_is_sta_mode(pMac, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Wrong Mode %d", session->connectedProfile.BSSType); return; @@ -2463,7 +2463,7 @@ static void csr_neighbor_roam_info_ctx_init( #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { if (pMac->roam.pReassocResp != NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "Free Reassoc Rsp"); cdf_mem_free(pMac->roam.pReassocResp); @@ -2515,7 +2515,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( /* Bail out if this is NOT a STA persona */ if (pMac->roam.roamSession[session_id].pCurRoamProfile->csrPersona != - CDF_STA_MODE) { + QDF_STA_MODE) { sms_log(pMac, LOGE, FL("Ignoring Connect ind received from a non STA." "session_id: %d, csrPersonna %d"), session_id, @@ -2535,11 +2535,11 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( if (session->roam_synch_in_progress && (eSIR_ROAM_AUTH_STATUS_AUTHENTICATED == session->roam_synch_data->authStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "LFR3:csr_neighbor_roam_indicate_connect"); msg = cdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq)); if (msg == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); return QDF_STATUS_E_NOMEM; } @@ -2905,7 +2905,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, uint32_t roamid = 0; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", __func__, session_id); if (neighbor_roam_info->neighborRoamState != @@ -2919,11 +2919,11 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx, &handoff_node, session_id)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("failed to obtain handoff AP")); return; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); @@ -2949,7 +2949,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, status = csr_roam_copy_connected_profile(mac_ctx, session_id, &neighbor_roam_info->csrNeighborRoamProfile); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("csr_roam_copy_connected_profile failed %d"), status); return; @@ -2975,7 +2975,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info.bssid.bytes, handoff_node.pBssDescription->bssId, - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); csr_roam_call_callback(mac_ctx, session_id, &roam_info, 0, eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE); @@ -3124,7 +3124,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM tCsrRoamSession *session = CSR_GET_SESSION(pMac, sessionId); if (!session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("session is NULL")); return; } @@ -3425,7 +3425,7 @@ QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( roam_ctrl_info->handoffReqInfo.src = handoff_req->handoff_src; cdf_mem_copy(&roam_ctrl_info->handoffReqInfo.bssid.bytes, - &handoff_req->bssid, CDF_MAC_ADDR_SIZE); + &handoff_req->bssid, QDF_MAC_ADDR_SIZE); roam_ctrl_info->uOsRequestedHandoff = 1; status = csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_STOP, diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index d99bd997cd1e..69c37cf5a8b6 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -159,7 +159,7 @@ QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->sessionId = sessionId; cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmdInfo->capability = pstaParams->capability; tdlsAddStaCmdInfo->uapsdQueues = pstaParams->uapsd_queues; @@ -233,7 +233,7 @@ QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishCmd->sessionId = sessionId; cdf_mem_copy(tdlsLinkEstablishCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsLinkEstablishCmdInfo->isBufSta = tdlsLinkEstablishParams->isBufSta; tdlsLinkEstablishCmdInfo->isResponder = @@ -301,7 +301,7 @@ QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD; cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer; tdlsAddStaCmd->u.tdlsCmd.size = @@ -337,7 +337,7 @@ QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsDelStaCmd->sessionId = sessionId; cdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes, - peerMac, CDF_MAC_ADDR_SIZE); + peerMac, QDF_MAC_ADDR_SIZE); tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer; tdlsDelStaCmd->u.tdlsCmd.size = @@ -361,7 +361,7 @@ QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, pMsg->type = msg_type; pMsg->msgLen = (uint16_t) (msg_size); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, ("sending msg = %d"), pMsg->type); /* Send message. */ if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) { @@ -412,10 +412,10 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsSendMgmtReq->peerCapability = tdlsSendMgmtCmdInfo->peerCapability; cdf_mem_copy(tdlsSendMgmtReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(tdlsSendMgmtReq->peer_mac.bytes, - tdlsSendMgmtCmdInfo->peerMac, CDF_MAC_ADDR_SIZE); + tdlsSendMgmtCmdInfo->peerMac, QDF_MAC_ADDR_SIZE); if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { cdf_mem_copy(tdlsSendMgmtReq->addIe, tdlsSendMgmtCmdInfo->buf, @@ -476,7 +476,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsAddStaReq->transactionId = 0; cdf_mem_copy(tdlsAddStaReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&tdlsAddStaReq->peermac, &tdlsAddStaCmdInfo->peermac); @@ -546,7 +546,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsDelStaReq->transactionId = 0; cdf_mem_copy(tdlsDelStaReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_copy_macaddr(&tdlsDelStaReq->peermac, &tdlsDelStaCmdInfo->peermac); @@ -640,7 +640,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) cdf_copy_macaddr(&tdlsLinkEstablishReq->peermac, &tdlsLinkEstablishCmdInfo->peermac); cdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes, - pSession->pConnectBssDesc->bssId, CDF_MAC_ADDR_SIZE); + pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); cdf_mem_copy(tdlsLinkEstablishReq->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannelsLen); @@ -772,7 +772,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_DISCOVER: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -784,7 +784,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_TEARDOWN: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -796,7 +796,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_PEER_DISCONNECTED: cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 562048d4445d..08b2a7c99dcb 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -256,10 +256,10 @@ const char *get_e_csr_roam_result_str(eCsrRoamResult val) } bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, - struct cdf_mac_addr *pBssId) + struct qdf_mac_addr *pBssId) { cdf_mem_copy(pBssId, &pSirBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); return true; } @@ -268,8 +268,8 @@ bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); bool fEqual = false; - struct cdf_mac_addr bssId1; - struct cdf_mac_addr bssId2; + struct qdf_mac_addr bssId1; + struct qdf_mac_addr bssId2; do { if (!pSirBssDesc1) @@ -422,9 +422,9 @@ bool csr_is_session_client_and_connected(tpAniSirGlobal pMac, uint8_t sessionId) pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession->pCurRoamProfile) { if ((pSession->pCurRoamProfile->csrPersona == - CDF_STA_MODE) + QDF_STA_MODE) || (pSession->pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) + QDF_P2P_CLIENT_MODE)) return true; } } @@ -445,7 +445,7 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) { tCsrRoamSession *session = NULL; uint8_t i = 0; - enum tCDF_ADAPTER_MODE persona; + enum tQDF_ADAPTER_MODE persona; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (!CSR_IS_SESSION_VALID(mac_ctx, i)) @@ -454,12 +454,12 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx) if (NULL == session->pCurRoamProfile) continue; persona = session->pCurRoamProfile->csrPersona; - if ((((persona == CDF_STA_MODE) || - (persona == CDF_P2P_CLIENT_MODE)) && + if ((((persona == QDF_STA_MODE) || + (persona == QDF_P2P_CLIENT_MODE)) && (session->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) || - (((persona == CDF_P2P_GO_MODE) || - (persona == CDF_SAP_MODE)) + (((persona == QDF_P2P_GO_MODE) || + (persona == QDF_SAP_MODE)) && (session->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED))) return session->connectedProfile.operationChannel; @@ -675,7 +675,7 @@ static void csr_handle_conc_chnl_overlap_for_sap_go(tpAniSirGlobal mac_ctx, } } else if (*sap_ch == 0 && (session->pCurRoamProfile->csrPersona == - CDF_SAP_MODE)) { + QDF_SAP_MODE)) { *sap_ch = session->connectedProfile.operationChannel; csr_get_ch_from_ht_profile(mac_ctx, &session->connectedProfile.HTProfile, @@ -731,9 +731,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, session = CSR_GET_SESSION(mac_ctx, i); if (NULL == session->pCurRoamProfile) continue; - if (((session->pCurRoamProfile->csrPersona == CDF_STA_MODE) || + if (((session->pCurRoamProfile->csrPersona == QDF_STA_MODE) || (session->pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) && + QDF_P2P_CLIENT_MODE)) && (session->connectState == eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED)) { intf_ch = session->connectedProfile.operationChannel; @@ -741,9 +741,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, &session->connectedProfile.HTProfile, intf_ch, &intf_cfreq, &intf_hbw); } else if (((session->pCurRoamProfile->csrPersona == - CDF_P2P_GO_MODE) || + QDF_P2P_GO_MODE) || (session->pCurRoamProfile->csrPersona == - CDF_SAP_MODE)) && + QDF_SAP_MODE)) && (session->connectState != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { if (session->ch_switch_in_progress) @@ -827,7 +827,7 @@ bool csr_is_sta_session_connected(tpAniSirGlobal mac_ctx) pSession = CSR_GET_SESSION(mac_ctx, i); if ((NULL != pSession->pCurRoamProfile) && - (CDF_STA_MODE == + (QDF_STA_MODE == pSession->pCurRoamProfile->csrPersona)) return true; } @@ -849,7 +849,7 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal pMac) { uint32_t i; tCsrRoamSession *pSession = NULL; - enum tCDF_ADAPTER_MODE persona; + enum tQDF_ADAPTER_MODE persona; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i) @@ -857,8 +857,8 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal pMac) pSession = CSR_GET_SESSION(pMac, i); persona = pSession->pCurRoamProfile->csrPersona; if ((NULL != pSession->pCurRoamProfile) && - ((CDF_P2P_CLIENT_MODE == persona) || - (CDF_P2P_GO_MODE == persona))) { + ((QDF_P2P_CLIENT_MODE == persona) || + (QDF_P2P_GO_MODE == persona))) { return true; } } @@ -1880,10 +1880,10 @@ bool csr_is_profile_rsn(tCsrRoamProfile *pProfile) */ QDF_STATUS csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, - enum tCDF_ADAPTER_MODE cur_bss_persona) + enum tQDF_ADAPTER_MODE cur_bss_persona) { uint32_t sessionid = 0; - enum tCDF_ADAPTER_MODE bss_persona; + enum tQDF_ADAPTER_MODE bss_persona; eCsrConnectState connect_state, temp; tCsrRoamSession *roam_session; @@ -1897,19 +1897,19 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, connect_state = roam_session->connectState; switch (cur_bss_persona) { - case CDF_STA_MODE: - CDF_TRACE(CDF_MODULE_ID_SME, + case QDF_STA_MODE: + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("** STA session **")); return QDF_STATUS_SUCCESS; - case CDF_SAP_MODE: + case QDF_SAP_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; - if ((bss_persona == CDF_IBSS_MODE) + if ((bss_persona == QDF_IBSS_MODE) && (connect_state != temp)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; @@ -1917,44 +1917,44 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, } break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; - if ((bss_persona == CDF_IBSS_MODE) + if ((bss_persona == QDF_IBSS_MODE) && (connect_state != temp)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; } break; - case CDF_IBSS_MODE: - if ((bss_persona == CDF_IBSS_MODE) && + case QDF_IBSS_MODE: + if ((bss_persona == QDF_IBSS_MODE) && (connect_state == eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("IBSS mode already exist")); return QDF_STATUS_E_FAILURE; - } else if (((bss_persona == CDF_P2P_GO_MODE) || - (bss_persona == CDF_SAP_MODE)) && + } else if (((bss_persona == QDF_P2P_GO_MODE) || + (bss_persona == QDF_SAP_MODE)) && (connect_state != eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Can't start GO/SAP")); return QDF_STATUS_E_FAILURE; #endif } break; - case CDF_P2P_CLIENT_MODE: - CDF_TRACE(CDF_MODULE_ID_SME, + case QDF_P2P_CLIENT_MODE: + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("**P2P-Client session**")); return QDF_STATUS_SUCCESS; default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Persona not handled = %d"), cur_bss_persona); @@ -1988,7 +1988,7 @@ QDF_STATUS csr_update_mcc_p2p_beacon_interval(tpAniSirGlobal mac_ctx) * change the BI of the P2P-GO */ roam_session = &mac_ctx->roam.roamSession[session_id]; - if (roam_session->bssParams.bssPersona != CDF_P2P_GO_MODE) + if (roam_session->bssParams.bssPersona != QDF_P2P_GO_MODE) continue; /* * Handle different BI scneario based on the @@ -2072,7 +2072,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId, uint16_t *beaconInterval, uint32_t cursessionId, - enum tCDF_ADAPTER_MODE currBssPersona) + enum tQDF_ADAPTER_MODE currBssPersona) { uint32_t sessionId = 0; uint16_t new_beaconInterval = 0; @@ -2089,12 +2089,12 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } switch (currBssPersona) { - case CDF_STA_MODE: + case QDF_STA_MODE: if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE)) { + QDF_P2P_CLIENT_MODE)) { /* check for P2P client mode */ sms_log(pMac, LOG1, FL @@ -2108,7 +2108,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, */ else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_SAP_MODE) { + QDF_SAP_MODE) { if (pMac->roam.roamSession[sessionId]. bssParams.operationChn != channelId) { @@ -2119,7 +2119,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { /* * Check for P2P go scenario * if GO in MCC support different @@ -2229,19 +2229,19 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } break; - case CDF_P2P_CLIENT_MODE: + case QDF_P2P_CLIENT_MODE: if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_STA_MODE)) { + QDF_STA_MODE)) { /* check for P2P client mode */ sms_log(pMac, LOG1, FL (" Ignore Beacon Interval Validation...")); } else if (pMac->roam.roamSession[sessionId]. bssParams.bssPersona == - CDF_P2P_GO_MODE) { + QDF_P2P_GO_MODE) { /* Check for P2P go scenario */ if ((pMac->roam.roamSession[sessionId]. bssParams.operationChn != @@ -2258,20 +2258,20 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, } break; - case CDF_SAP_MODE: - case CDF_IBSS_MODE: + case QDF_SAP_MODE: + case QDF_IBSS_MODE: break; - case CDF_P2P_GO_MODE: + case QDF_P2P_GO_MODE: { if (pMac->roam.roamSession[sessionId]. pCurRoamProfile && ((pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_P2P_CLIENT_MODE) || + QDF_P2P_CLIENT_MODE) || (pMac->roam.roamSession[sessionId]. pCurRoamProfile->csrPersona == - CDF_STA_MODE))) { + QDF_STA_MODE))) { /* check for P2P_client scenario */ if ((pMac->roam. roamSession[sessionId]. @@ -2902,7 +2902,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, apProfileMFPRequired = (pRSNIe->RSN_Cap[0] >> 6) & 0x1; if (*pFilterMFPEnabled && *pFilterMFPCapable && *pFilterMFPRequired && (apProfileMFPCapable == 0)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "AP is not capable to make PMF connection"); return false; } else if (*pFilterMFPEnabled && *pFilterMFPCapable && @@ -2915,7 +2915,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * so if AP is not capable of PMF then drop it. * Don't try to connect with it. */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "we need PMF connection & AP isn't capable to make PMF connection"); return false; } else if (!(*pFilterMFPCapable) && @@ -2926,12 +2926,12 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * requires mandatory PMF connections and we are not * capable so this AP is not good choice to connect */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "AP needs PMF connection and we are not capable of pmf connection"); return false; } else if (!(*pFilterMFPEnabled) && *pFilterMFPCapable && (apProfileMFPCapable == 1)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "we don't need PMF connection even though both parties are capable"); return false; } @@ -2987,7 +2987,7 @@ bool csr_lookup_pmkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, MAC_ADDR_ARRAY(pBSSId)); if (cdf_mem_compare (pBSSId, pSession->PmkidCacheInfo[Index].BSSID.bytes, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { /* match found */ fMatchFound = true; break; @@ -3324,7 +3324,7 @@ bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, MAC_ADDR_ARRAY(pBSSId)); if (cdf_mem_compare (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes, - sizeof(struct cdf_mac_addr))) { + sizeof(struct qdf_mac_addr))) { /* match found */ fMatchFound = true; break; @@ -4329,15 +4329,15 @@ bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, return fMatch; } -bool csr_is_bssid_match(tHalHandle hHal, struct cdf_mac_addr *pProfBssid, - struct cdf_mac_addr *BssBssid) +bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, + struct qdf_mac_addr *BssBssid) { bool fMatch = false; - struct cdf_mac_addr ProfileBssid; + struct qdf_mac_addr ProfileBssid; /* for efficiency of the MAC_ADDRESS functions, move the */ /* Bssid's into MAC_ADDRESS structs. */ - cdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct cdf_mac_addr)); + cdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct qdf_mac_addr)); do { @@ -4724,9 +4724,9 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, /* Check for Blacklist BSSID's and avoid connections */ blacklist_check = false; for (i = 0; i < roam_params->num_bssid_avoid_list; i++) { - if (cdf_is_macaddr_equal((struct cdf_mac_addr *) + if (cdf_is_macaddr_equal((struct qdf_mac_addr *) &roam_params->bssid_avoid_list[i], - (struct cdf_mac_addr *)bss_descr->bssId)) { + (struct qdf_mac_addr *)bss_descr->bssId)) { blacklist_check = true; break; } @@ -4754,16 +4754,16 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, p2p_macaddr = ie_ptr->P2PBeaconProbeRes.P2PDeviceInfo.P2PDeviceAddress; for (i = 0; i < filter->BSSIDs.numOfBSSIDs; i++) { check = csr_is_bssid_match(mac_ctx, - (struct cdf_mac_addr *)&filter->BSSIDs.bssid[i], - (struct cdf_mac_addr *)bss_descr->bssId); + (struct qdf_mac_addr *)&filter->BSSIDs.bssid[i], + (struct qdf_mac_addr *)bss_descr->bssId); if (check) break; if (filter->p2pResult && ie_ptr->P2PBeaconProbeRes.present) { check = csr_is_bssid_match(mac_ctx, - (struct cdf_mac_addr *) + (struct qdf_mac_addr *) &filter->BSSIDs.bssid[i], - (struct cdf_mac_addr *)p2p_macaddr); + (struct qdf_mac_addr *)p2p_macaddr); if (check) break; } @@ -5696,16 +5696,16 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, * * This function is to return the persona of a session * - * Reture: enum tCDF_ADAPTER_MODE persona + * Reture: enum tQDF_ADAPTER_MODE persona */ -enum tCDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, +enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, uint32_t session_id) { tCsrRoamSession *session = NULL; session = CSR_GET_SESSION(pmac, session_id); if (NULL == session || NULL == session->pCurRoamProfile) - return CDF_MAX_NO_OF_MODE; + return QDF_MAX_NO_OF_MODE; return session->pCurRoamProfile->csrPersona; } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index 12252ec80dd6..489e6713ec9f 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -51,7 +51,7 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback) tpAniSirGlobal pMac = NULL; if (NULL == hHal) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("hHal is not valid")); return; } @@ -82,7 +82,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) data = cdf_mem_malloc(data_len); if (data == NULL) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Memory allocation failure")); return QDF_STATUS_E_NOMEM; } @@ -98,8 +98,8 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) msg.reserved = 0; msg.bodyptr = data; - if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); cdf_mem_free(data); @@ -129,11 +129,11 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("msg ptr is NULL")); status = QDF_STATUS_E_FAILURE; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, FL("SME: Received sme_nan_event")); if (pMac->sme.nanCallback) { pMac->sme.nanCallback(pMac->hHdd, diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 05d23ae58466..97703854f462 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -74,7 +74,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, if (NULL == pMsg) goto error; else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call", + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call", __func__); cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; @@ -311,7 +311,7 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, tSirMbMsgP2p *pMsg; uint16_t msgLen; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, " %s sends action frame", __func__); msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); pMsg = cdf_mem_malloc(msgLen); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 1672a8d49855..0342026ab51f 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -516,7 +516,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; uint8_t sessionId; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ /* (note that this will make all sessions invalid) */ @@ -527,7 +527,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* init flow list */ status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize Flow List", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -541,7 +541,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* initialize the session's buffered command list */ status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize cmd list for session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -549,7 +549,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) pSession->readyForPowerSave = true; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: done initializing SME-QoS module", __func__, __LINE__); return QDF_STATUS_SUCCESS; @@ -568,7 +568,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; uint8_t sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closing down SME-QoS", __func__, __LINE__); /* cleanup control block */ @@ -606,7 +606,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) pSession->sessionActive = false; pSession->readyForPowerSave = true; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closed down QoS", __func__, __LINE__); return QDF_STATUS_SUCCESS; } @@ -650,18 +650,18 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Setup requested by client on session %d", __func__, __LINE__, sessionId); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_SETUP_FAILURE_RSP; } /* Make sure the session is valid */ if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is invalid", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; @@ -669,14 +669,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, /* Make sure the session is active */ pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is inactive", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; } else { /* Assign a Flow ID */ *pQosFlowID = sme_qos_assign_flow_id(); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS request on session %d assigned Flow ID %d", __func__, __LINE__, sessionId, *pQosFlowID); /* Call the internal function for QoS setup, */ @@ -690,7 +690,7 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, } } sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS setup return status on session %d is %d", __func__, __LINE__, sessionId, status); return status; @@ -722,19 +722,19 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } /* Call the internal function for QoS modify, adding a layer of abstraction */ status = sme_qos_internal_modify_req(pMac, pQoSInfo, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -759,19 +759,19 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } /* Call the internal function for QoS release, adding a layer of abstraction */ status = sme_qos_internal_release_req(pMac, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -800,7 +800,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *entry = NULL; tSmeCmd *command; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" msg = %d for QoS"), msg_type); /* switch on the msg type & make the state transition accordingly */ switch (msg_type) { @@ -845,7 +845,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, break; default: /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("unknown msg type = %d"), msg_type); break; @@ -869,14 +869,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, { tDot11fBeaconIEs *pIes = NULL; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validation for QAP & APSD", __func__, __LINE__); do { if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); break; @@ -884,7 +884,7 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, /* check if the AP is QAP & it supports APSD */ if (!CSR_IS_QOS_BSS(pIes)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support QoS", __func__, __LINE__); @@ -893,14 +893,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support APSD", __func__, __LINE__); break; } status = QDF_STATUS_SUCCESS; } while (0); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validated with status = %d", __func__, __LINE__, status); if (pIes) { @@ -926,7 +926,7 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, sme_qos_csr_event_indType ind, void *pEvent_info) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d Event %d received from CSR", __func__, __LINE__, sessionId, ind); switch (ind) { @@ -992,12 +992,12 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, break; default: /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On Session %d Unknown Event %d received from CSR", __func__, __LINE__, sessionId, ind); break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d processed Event %d with status %d", __func__, __LINE__, sessionId, ind, status); return status; @@ -1020,7 +1020,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes { sme_QosEdcaAcType ac; uint8_t acm_mask = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { if (sme_qos_is_acm(pMac, pSirBssDesc, ac, pIes)) { @@ -1028,7 +1028,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: mask is %d", __func__, __LINE__, acm_mask); return acm_mask; } @@ -1086,19 +1086,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, uint8_t new_tmask = 0; sme_QosSearchInfo search_key; QDF_STATUS hstatus; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for flow %d", __func__, __LINE__, sessionId, QosFlowID); pSession = &sme_qos_cb.sessionInfo[sessionId]; /* if caller sent an empty TSPEC, fill up with the default one */ if (!pQoSInfo) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: caller sent an empty QoS param list, using defaults", __func__, __LINE__); /* find the AC with UPType passed in */ ac = sme_qos_up_to_ac(UPType); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, UPType); @@ -1109,7 +1109,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* find the AC */ ac = sme_qos_up_to_ac(pQoSInfo->ts_info.up); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, pQoSInfo->ts_info.up); @@ -1117,7 +1117,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, } /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP; } @@ -1133,7 +1133,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the setup request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1149,7 +1149,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the setup request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1157,7 +1157,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_SETUP_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered setup request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -1168,7 +1168,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* call the internal qos setup logic to decide on if the */ /* request is NOP, or need reassoc for APSD and/or need to send out ADDTS */ status = sme_qos_setup(pMac, sessionId, &Tspec_Info, ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1185,7 +1185,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* create an entry in the flow list */ pentry = cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, @@ -1205,7 +1205,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) { if (pACInfo->tspec_mask_status && !pACInfo->reassoc_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d with AC %d in state " "SME_QOS_LINK_UP tspec_mask_status is %d " @@ -1250,7 +1250,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = pACInfo->tspec_mask_status; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating entry on session %d at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1258,7 +1258,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1274,7 +1274,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering setup request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1289,7 +1289,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d couldn't buffer the setup " "request for flow %d in state = %d", __func__, __LINE__, @@ -1311,13 +1311,13 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac) || sme_qos_is_acm(pMac, pSession->assocInfo.pBssDesc, ac, NULL)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); if (!pACInfo->tspec_mask_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: tspec_mask_status can't be 0 for ac = %d in " "state = %d", __func__, @@ -1402,7 +1402,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_1_SET; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: wrong tmask = %d", __func__, __LINE__, @@ -1414,11 +1414,11 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* to aggregate to calculate trigger frame parameters */ tmask = SME_QOS_TSPEC_MASK_BIT_1_SET; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tmask = %d, new_tmask = %d in state = %d", __func__, __LINE__, tmask, new_tmask, pACInfo->curr_state); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); @@ -1460,7 +1460,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: failed to aggregate params", __func__, __LINE__); @@ -1480,7 +1480,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, Tspec_Info; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no flows running for ac = %d while in state = %d", __func__, __LINE__, ac, pACInfo->curr_state); CDF_ASSERT(0); @@ -1501,7 +1501,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, status = sme_qos_setup(pMac, sessionId, &pACInfo->requested_QoSInfo[tmask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1520,7 +1520,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, @@ -1533,7 +1533,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pentry->hoRenewal = hoRenewal; pentry->QosFlowID = QosFlowID; pentry->sessionId = sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating flow %d", __func__, __LINE__, QosFlowID); if ((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == @@ -1571,7 +1571,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -1594,7 +1594,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = tmask; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating entry at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1602,7 +1602,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1612,7 +1612,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: setup requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -1678,7 +1678,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_QosCmdInfo cmd; uint8_t sessionId; QDF_STATUS hstatus; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -1690,7 +1690,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pEntry = sme_qos_find_in_flow_list(search_key); if (!pEntry) { /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; @@ -1705,7 +1705,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; } @@ -1714,7 +1714,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.ts_info.direction) || (pQoSInfo->ts_info.up != flow_info->QoSInfo.ts_info.up) || (pQoSInfo->ts_info.tid != flow_info->QoSInfo.ts_info.tid)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Modification of direction/tid/up is not allowed", __func__, __LINE__); @@ -1742,7 +1742,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.suspension_interval) && (pQoSInfo->surplus_bw_allowance == flow_info->QoSInfo.surplus_bw_allowance)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: the addts parameters are same as last request," "dropping the current request", __func__, __LINE__); @@ -1758,7 +1758,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the modify request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1770,7 +1770,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1778,7 +1778,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered modify request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP; @@ -1792,7 +1792,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry = (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pNewEntry)); if (!pNewEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, __LINE__); /* unable to service the request */ @@ -1812,7 +1812,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry->QoSInfo = *pQoSInfo; /* update the entry from Flow List which needed to be modified */ flow_info->reason = SME_QOS_REASON_MODIFY; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating modified " "entry at %p with flowID %d", __func__, __LINE__, @@ -1833,7 +1833,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, requested_QoSInfo[pNewEntry-> tspec_mask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1893,7 +1893,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -1923,7 +1923,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, @@ -1932,7 +1932,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); /* unable to service the request */ @@ -1953,7 +1953,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering modify request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1964,7 +1964,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1978,7 +1978,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, case SME_QOS_INIT: case SME_QOS_LINK_UP: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: modify requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2028,7 +2028,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, bool uplinkFlowsPresent = false; bool downlinkFlowsPresent = false; tListElem *pResult = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -2041,7 +2041,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!pEntry) { /* Err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP; @@ -2061,7 +2061,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the release request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -2072,7 +2072,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -2080,7 +2080,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered release request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP; @@ -2088,7 +2088,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, /* get into the stat m/c to see if the request can be granted */ switch (pACInfo->curr_state) { case SME_QOS_QOS_ON: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d with " "entry tspec_mask = %d", __func__, __LINE__, @@ -2171,7 +2171,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_2_SET, &Aggr_Tspec_Info); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " @@ -2200,7 +2200,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, (sme_qos_buffer_cmd (&cmd, false))) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d", @@ -2242,7 +2242,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo [flow_info->tspec_mask - 1], ac); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", @@ -2272,7 +2272,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, @@ -2296,7 +2296,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (hstatus)) { CDF_TRACE - (CDF_MODULE_ID_SME, + (QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", @@ -2321,7 +2321,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", @@ -2336,7 +2336,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at " "%p with flowID %d", __func__, @@ -2361,7 +2361,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); @@ -2428,7 +2428,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, tspec_mask); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_del_ts_req() failed", __func__, __LINE__); @@ -2477,7 +2477,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Reassoc failed", __func__, __LINE__); @@ -2492,7 +2492,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pACInfo->tspec_pending = 0; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: nothing to do for AC = %d", __func__, __LINE__, ac); @@ -2511,7 +2511,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, @@ -2541,7 +2541,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, new_state = SME_QOS_LINK_UP; } } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->num_flows", __func__, __LINE__); @@ -2562,7 +2562,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); pACInfo->num_flows[flow_info->tspec_mask - 1]--; /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at %p with flowID %d", __func__, __LINE__, sessionId, flow_info, QosFlowID); @@ -2591,7 +2591,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2606,7 +2606,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, case SME_QOS_LINK_UP: default: /* print error msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: release request in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); CDF_ASSERT(0); @@ -2671,20 +2671,20 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, tCsrRoamModifyProfileFields modifyProfileFields; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return status; } pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return status; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return status; @@ -2693,7 +2693,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return status; @@ -2702,7 +2702,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* success so pIes was allocated */ if (!CSR_IS_QOS_BSS(pIes)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support QoS", __func__, __LINE__, sessionId); cdf_mem_free(pIes); @@ -2710,7 +2710,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, return SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s: %d: UAPSD/PSB set %d: ", __func__, __LINE__, pTspec_Info->ts_info.psb); @@ -2726,7 +2726,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); @@ -2744,13 +2744,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qos_issue_command(pMac, sessionId, eSmeCommandAddTs, pTspec_Info, ac, 0); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_add_ts_req() failed", __func__, __LINE__); break; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTS on AC %d is pending", __func__, __LINE__, sessionId, ac); status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -2768,7 +2768,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, apsdMask & (1 << (SME_QOS_EDCA_AC_VO - ac))) { /* APSD was formerly enabled on this AC but is no longer required */ /* so we must reassociate */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassoc needed " "to disable APSD on AC %d", __func__, @@ -2785,13 +2785,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassociation to enable " "APSD on AC %d is pending", @@ -2804,7 +2804,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else { /* we don't need APSD on this AC */ /* and we don't currently have APSD on this AC */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is not looking for APSD & Admission " "Control isn't mandatory for the AC", @@ -2817,7 +2817,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); break; @@ -2826,7 +2826,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* and it is already enabled on this AC */ status = SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is looking for APSD and it is already " "set for the AC", __func__, __LINE__); break; @@ -2834,7 +2834,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* but it is not enabled on this AC */ /* so we need to reassociate */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassoc needed to enable APSD on AC %d"), sessionId, ac); @@ -2853,13 +2853,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassociation to enable APSD on AC %d is pending"), sessionId, ac); @@ -2883,7 +2883,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "########### Set Key Complete #############"); (void)sme_qos_process_buffered_cmd(sessionId); return QDF_STATUS_SUCCESS; @@ -2921,7 +2921,7 @@ QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI pAddtsRsp->rsp.dialogToken = 0; pAddtsRsp->rsp.status = eSIR_SUCCESS; pAddtsRsp->rsp.wmeTspecPresent = pTspec->present; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d", __func__, ac, tspecIndex); @@ -2963,7 +2963,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pCsrSession) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -2983,13 +2983,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, /* should be atleast equal to the one TSPEC IE */ tspecIeLen = pCsrConnectedInfo->nTspecIeLength; if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ESE Tspec IE len %d less than min %zu"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "TspecLen = %d, pbFrames = %p, pTspecIE = %p", tspecIeLen, pCsrConnectedInfo->pbFrames, pTspecIE); @@ -2997,13 +2997,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, for (cnt = 0; cnt < numTspec; cnt++) { ac = sme_qos_up_to_ac(pTspecIE->user_priority); if (ac >= SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ac %d more than it`s max value"), ac); return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; tspec_mask_status = pACInfo->tspec_mask_status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("UP=%d, ac=%d, tspec_mask_status=%x"), pTspecIE->user_priority, ac, tspec_mask_status); @@ -3011,7 +3011,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) { if (tspec_mask_status & (1 << tspec_flow_index)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL ("Found Tspec entry flow = %d AC = %d"), @@ -3020,7 +3020,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pTspecIE, ac, tspec_flow_index); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL ("Not found Tspec entry flow = %d AC = %d"), @@ -3088,7 +3088,7 @@ static void sme_qos_copy_tspec_info(tpAniSirGlobal pMac, pTspec->tsinfo.traffic.ackPolicy = pTspec_Info->ts_info.ack_policy; pTspec->type = SME_QOS_TSPEC_IE_TYPE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3217,7 +3217,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3258,7 +3258,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3286,7 +3286,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( sme_QosFlowInfoEntry *flow_info = NULL; tListElem *entry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), sessionId); session = &sme_qos_cb.sessionInfo[sessionId]; @@ -3306,7 +3306,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( && !ac_info->tspec_pending) || (ac_info-> tspec_mask_status & (1 << tspec_index))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Copying the currentQos to " "requestedQos for AC=%d, flow=%d"), @@ -3332,7 +3332,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( SME_QOS_REQUESTED); break; default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("FT Reassoc req event in" " unexpected state %d"), @@ -3357,7 +3357,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( */ entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -3365,7 +3365,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( do { flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); if (sessionId == flow_info->sessionId) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Changing FlowID %d reason to SETUP" "and HO renewal to false"), flow_info->QosFlowID); @@ -3397,7 +3397,7 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, tSirAggrQosReq *msg, sme_QosSessionInfo *session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, FL("Found tspec entry AC=%d, flow=%d, direction = %d"), ac_id, ts_id, direction); @@ -3447,7 +3447,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) int i, j = 0; uint8_t direction; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), session_id); session = &sme_qos_cb.sessionInfo[session_id]; @@ -3456,7 +3456,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) if (!aggr_req) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't allocate memory for the msg buffer")); return QDF_STATUS_E_NOMEM; } @@ -3470,14 +3470,14 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) aggr_req->rspReqd = true; cdf_mem_copy(&aggr_req->bssid.bytes[0], &session->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); for (i = 0; i < SME_QOS_EDCA_AC_MAX; i++) { for (j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("ac=%d, tspec_mask_staus=%x, tspec_index=%d"), i, session->ac_info[i].tspec_mask_status, j); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("direction = %d"), session->ac_info[i].addTsRsp[j].rsp.tspec. tsinfo.traffic.direction); @@ -3497,13 +3497,13 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) } } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Sending aggregated message to HAL 0x%x"), aggr_req->aggrInfo.tspecIdx); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sent down a AGGR QoS req to PE")); } @@ -3585,7 +3585,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) int i, j = 0; uint8_t sessionid = rsp->sessionId; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Received AGGR_QOS resp from LIM")); /* Copy the updated response information for TSPEC of all the ACs */ @@ -3599,7 +3599,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) ac_info[i].addTsRsp[j].rsp.tspec.tsinfo.traffic. direction; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Addts rsp from LIM AC=%d, flow=%d dir=%d, tspecIdx=%x"), i, j, direction, rsp->aggrInfo.tspecIdx); @@ -3617,7 +3617,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) addtsrsp.rsp.status = rsp->aggrInfo.aggrRsp[i].status; addtsrsp.rsp.tspec = rsp->aggrInfo.aggrRsp[i].tspec; - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Processing Addts rsp from LIM AC=%d, flow=%d"), i, j); @@ -3661,7 +3661,7 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, continue; if (!*ric_rsplen) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC Response not received for AC %d on " "TSPEC Index %d, RIC Req Identifier = %d"), ac, tspec_flow_index, @@ -3677,14 +3677,14 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, if (ric_data_desc->RICData.Identifier != ac_info->ricIdentifier[tspec_flow_index]) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC response order not same as request sent. " "Request ID = %d, Response ID = %d"), ac_info->ricIdentifier[tspec_flow_index], ric_data_desc->RICData.Identifier); CDF_ASSERT(0); } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("Processing RIC Response for AC %d, " "TSPEC Flow index %d with RIC ID %d "), @@ -3694,7 +3694,7 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, sessionid, ric_data_desc, ac, tspec_flow_index); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d in " "TSPEC Flow index = %d"), @@ -3749,7 +3749,7 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, ac1 = sme_qos_up_to_ac( ric_data->WMMTSPEC.user_priority); if (ac == SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Invalid AC %d UP %d"), ac, ric_data->WMMTSPEC.user_priority); @@ -3762,7 +3762,7 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, sessionid, ric_data, ac, tspec_flow_idx); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d " "in TSPEC Flow index = %d"), @@ -3800,14 +3800,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, #endif if (NULL == csr_session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("The Session pointer is NULL")); return QDF_STATUS_E_FAILURE; } csr_conn_info = &csr_session->connectedInfo; ric_rsplen = csr_conn_info->nRICRspLength; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); qos_session = &sme_qos_cb.sessionInfo[sessionid]; @@ -3827,14 +3827,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, } if (ric_rsplen) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("RIC Resp still follows . Rem len = %d"), ric_rsplen); CDF_ASSERT(0); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("LFR3-11r Compare RIC in Reassoc Resp to find" " matching tspec in host.")); ric_data = ric_data_desc; @@ -3848,7 +3848,7 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, ric_len); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("LFR3-11r ric_rsplen is zero or ric_data_desc is" " not present or wmmtspec is not present")); } @@ -3887,12 +3887,12 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); if (sessionId >= CSR_ROAM_SESSION_MAX) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sessionId(%d) is invalid", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -3902,7 +3902,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg = (tSirAddtsReq *) cdf_mem_malloc(sizeof(tSirAddtsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -3953,7 +3953,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -3961,8 +3961,8 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + sizeof(struct qdf_mac_addr)); + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3974,7 +3974,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #endif if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sent down a ADDTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4013,13 +4013,13 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); pMsg = (tSirDeltsReq *) cdf_mem_malloc(sizeof(tSirDeltsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -4063,7 +4063,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -4071,9 +4071,9 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, } cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], - sizeof(struct cdf_mac_addr)); + sizeof(struct qdf_mac_addr)); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); @@ -4081,7 +4081,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4126,14 +4126,14 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); @@ -4149,7 +4149,7 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) return QDF_STATUS_SUCCESS; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, paddts_rsp->rc); /* our outstanding request has been serviced */ @@ -4191,7 +4191,7 @@ QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) sme_QosSessionInfo *pSession; uint8_t sessionId = pDeltsRsp->sessionId; /* msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, pDeltsRsp->rc); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4229,13 +4229,13 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -4252,7 +4252,7 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) /* through the callback it registered per request */ if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for ac = %d", __func__, __LINE__, search_key.key.ac_type); CDF_ASSERT(0); @@ -4285,7 +4285,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio sme_QosACInfo *pACInfo; QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4300,31 +4300,31 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio /* get the association info */ if (!pEvent_info) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pEvent_info is NULL", __func__, __LINE__); return status; } if (!((sme_QosAssocInfo *) pEvent_info)->pBssDesc) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pBssDesc is NULL", __func__, __LINE__); return status; } if ((pSession->assocInfo.pBssDesc) && (csr_is_bssid_match - (pMac, (struct cdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId, - (struct cdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)-> + (pMac, (struct qdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId, + (struct qdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)-> pBssDesc->bssId)))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: assoc with the same BSS, no update needed", __func__, __LINE__); } else { status = sme_qos_save_assoc_info(pSession, pEvent_info); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d", __func__, __LINE__, pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state, @@ -4355,7 +4355,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio case SME_QOS_HANDOFF: case SME_QOS_CLOSED: default: - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, @@ -4384,13 +4384,13 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -4405,7 +4405,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } if (pSession->handoffRequested) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4424,7 +4424,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4454,7 +4454,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4547,7 +4547,7 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, status = sme_qos_find_all_in_flow_list(mac_ctx, search_key, sme_qos_reassoc_success_ev_fnp); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no match found for ac = %d"), search_key.key.ac_type); CDF_ASSERT(0); @@ -4582,11 +4582,11 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); if (CSR_ROAM_SESSION_MAX <= sessionid) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("invoked on session %d"), sessionid); return status; } @@ -4602,19 +4602,19 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, /* get the association info */ if (!event_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("event_info is NULL")); return status; } if (!((sme_QosAssocInfo *) event_info)->pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("pBssDesc is NULL")); return status; } status = sme_qos_save_assoc_info(qos_session, event_info); if (status) - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_save_assoc_info() failed")); /* @@ -4670,7 +4670,7 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); CDF_ASSERT(0); @@ -4697,7 +4697,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4737,7 +4737,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4766,7 +4766,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4781,7 +4781,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_HANDOFF: /* print error msg */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in " "SME_QOS_HANDOFF state with FT in progress", @@ -4792,7 +4792,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4834,7 +4834,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, sme_QosACInfo *pACInfo; uint8_t ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4865,7 +4865,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, state may be SME_QOS_REQUESTED */ if (pSession->ftHandoffInProgress) break; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4892,7 +4892,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4925,7 +4925,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); @@ -4958,7 +4958,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4968,7 +4968,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, */ if ((pSession->handoffRequested) && !pSession->ftHandoffInProgress) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -5019,12 +5019,12 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, { sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->handoffRequested) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -5077,11 +5077,11 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, uint8_t tspec_mask_status = 0; uint8_t tspec_pending_status = 0; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on SME session %d"), sessionid); if (NULL == sme_session) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_session is NULL")); return QDF_STATUS_E_INVAL; } @@ -5102,7 +5102,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); CDF_ASSERT(0); @@ -5118,7 +5118,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, /* Data is accessed from saved PreAuth Rsp */ if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("psavedFTPreAuthRsp is NULL")); return QDF_STATUS_E_INVAL; } @@ -5144,7 +5144,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, tspec_pending_status = ac_info->tspec_pending; tspec_mask_status = ac_info->tspec_mask_status; cdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("AC %d ==> TSPEC status = %d, tspec pending = %d"), ac, tspec_mask_status, tspec_pending_status); @@ -5206,13 +5206,13 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t tspec_pending; sme_QosWmmUpType up = (sme_QosWmmUpType) pRsp->tspec.tsinfo.traffic.userPrio; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5222,7 +5222,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); CDF_ASSERT(0); @@ -5237,7 +5237,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_failure_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac = %d", __func__, __LINE__, sessionId, search_key.key.ac_type); @@ -5281,7 +5281,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d for AC %d TSPEC %d"), sessionid, search_key.key.ac_type, new_tspec_mask); @@ -5290,7 +5290,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if (search_key.key.ac_type < SME_QOS_EDCA_AC_MAX) { ac_info = &qos_session->ac_info[search_key.key.ac_type]; } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Exceeded the array bounds")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -5298,7 +5298,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -5317,7 +5317,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; @@ -5327,7 +5327,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_5) { if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; @@ -5374,14 +5374,14 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); host_log_qos_tspec_pkt_type *log_ptr = NULL; #endif /* FEATURE_WLAN_DIAG_SUPPORT */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); pSession = &sme_qos_cb.sessionInfo[sessionId]; ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5390,7 +5390,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); return QDF_STATUS_E_FAILURE; @@ -5412,7 +5412,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, ~(1 << (SME_QOS_EDCA_AC_VO - ac)); } } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo", __func__, __LINE__); CDF_ASSERT(0); @@ -5464,7 +5464,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, pACInfo->curr_QoSInfo[tspec_pending - 1].medium_time = pRsp->tspec.mediumTime; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTspec Medium Time %d", __func__, __LINE__, sessionId, pRsp->tspec.mediumTime); @@ -5510,7 +5510,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_success_fnp))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac %d", __func__, __LINE__, sessionId, search_key.key.ac_type); @@ -5609,16 +5609,16 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info) { sme_QosWmmTspecInfo TspecInfo; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); if (!pInput_Tspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: input is NULL, nothing to aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } if (!pCurrent_Tspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Current is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5634,7 +5634,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, (pCurrent_Tspec_Info->ts_info.direction != pInput_Tspec_Info->ts_info.direction)) { TspecInfo.min_service_interval = - CDF_MIN(pCurrent_Tspec_Info->min_service_interval, + QDF_MIN(pCurrent_Tspec_Info->min_service_interval, pInput_Tspec_Info->min_service_interval); } else if (pInput_Tspec_Info->min_service_interval) { TspecInfo.min_service_interval = @@ -5645,7 +5645,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, (pCurrent_Tspec_Info->ts_info.direction != pInput_Tspec_Info->ts_info.direction)) { TspecInfo.max_service_interval = - CDF_MIN(pCurrent_Tspec_Info->max_service_interval, + QDF_MIN(pCurrent_Tspec_Info->max_service_interval, pInput_Tspec_Info->max_service_interval); } else { TspecInfo.max_service_interval = @@ -5664,14 +5664,14 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, Max MSDU size : these sizes are `maxed' -------------------------------------------------------------------------*/ TspecInfo.maximum_msdu_size = - CDF_MAX(pCurrent_Tspec_Info->maximum_msdu_size, + QDF_MAX(pCurrent_Tspec_Info->maximum_msdu_size, pInput_Tspec_Info->maximum_msdu_size); /*------------------------------------------------------------------------- Inactivity interval : these sizes are `maxed' -------------------------------------------------------------------------*/ TspecInfo.inactivity_interval = - CDF_MAX(pCurrent_Tspec_Info->inactivity_interval, + QDF_MAX(pCurrent_Tspec_Info->inactivity_interval, pInput_Tspec_Info->inactivity_interval); /*------------------------------------------------------------------------- @@ -5680,12 +5680,12 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, -------------------------------------------------------------------------*/ if (pCurrent_Tspec_Info->delay_bound) { TspecInfo.delay_bound = - CDF_MIN(pCurrent_Tspec_Info->delay_bound, + QDF_MIN(pCurrent_Tspec_Info->delay_bound, pInput_Tspec_Info->delay_bound); } else { TspecInfo.delay_bound = pInput_Tspec_Info->delay_bound; } - TspecInfo.max_burst_size = CDF_MAX(pCurrent_Tspec_Info->max_burst_size, + TspecInfo.max_burst_size = QDF_MAX(pCurrent_Tspec_Info->max_burst_size, pInput_Tspec_Info->max_burst_size); /*------------------------------------------------------------------------- @@ -5696,7 +5696,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, These sizes are not added: but `maxed' -------------------------------------------------------------------------*/ TspecInfo.nominal_msdu_size = - CDF_MAX(pCurrent_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB, + QDF_MAX(pCurrent_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB, pInput_Tspec_Info->nominal_msdu_size & ~SME_QOS_16BIT_MSB); if (((pCurrent_Tspec_Info->nominal_msdu_size == 0) || @@ -5788,11 +5788,11 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosACInfo *pACInfo; sme_QosFlowInfoEntry *flow_info = NULL; sme_QosWmmTspecInfo Tspec_Info; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d TSPEC %d", __func__, __LINE__, sessionId, ac, tspec_mask); if (!pTspec_Info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: output is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5800,7 +5800,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, nothing to update", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5820,14 +5820,14 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, if ((sessionId == flow_info->sessionId) && (ac == flow_info->ac_type) && (tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow %d matches", __func__, __LINE__, flow_info->QosFlowID); if ((SME_QOS_REASON_RELEASE == flow_info->reason) || (SME_QOS_REASON_MODIFY == flow_info->reason)) { /* msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Skipping Flow %d as it is marked " "for release/modify", __func__, @@ -5837,7 +5837,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, (sme_qos_aggregate_params (&flow_info->QoSInfo, &Tspec_Info, NULL))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_aggregate_params() failed", __func__, __LINE__); @@ -5866,7 +5866,7 @@ sme_QosWmmUpType sme_qos_ac_to_up(sme_QosEdcaAcType ac) if (ac >= 0 && ac < SME_QOS_EDCA_AC_MAX) { up = sme_qos_a_cto_up_map[ac]; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: ac = %d up = %d returned", __func__, __LINE__, ac, up); return up; @@ -5886,7 +5886,7 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up) if (up >= 0 && up < SME_QOS_WMM_UP_MAX) { ac = sme_qos_u_pto_ac_map[up]; } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: up = %d ac = %d returned", __func__, __LINE__, up, ac); return ac; @@ -5914,7 +5914,7 @@ static void sme_qos_state_transition(uint8_t sessionId, pACInfo = &pSession->ac_info[ac]; pACInfo->prev_state = pACInfo->curr_state; pACInfo->curr_state = new_state; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d new state=%d, old state=%d, for AC=%d", __func__, __LINE__, sessionId, pACInfo->curr_state, pACInfo->prev_state, ac); @@ -5940,7 +5940,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return NULL; } @@ -5958,21 +5958,21 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) { if (search_key.key.QosFlowID == flow_info->QosFlowID) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) { if (search_key.key.ac_type == flow_info->ac_type) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_3) { if (search_key.key.reason == flow_info->reason) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; @@ -5981,7 +5981,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; @@ -6019,7 +6019,7 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return QDF_STATUS_E_FAILURE; } @@ -6037,25 +6037,25 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) && (search_key.key.QosFlowID == flow_info->QosFlowID)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; } } else if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) && (search_key.key.ac_type == flow_info->ac_type)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); ac_type = flow_info->ac_type; flow_info->hoRenewal = qos_session->ac_info[ac_type].hoRenewal; status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; @@ -6082,7 +6082,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, bool ret_val = false; tDot11fBeaconIEs *pIesLocal; if (!pSirBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pSirBssDesc is NULL", __func__, __LINE__); return false; } @@ -6096,7 +6096,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal))) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); return false; @@ -6124,7 +6124,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, ret_val = true; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: unknown AC = %d", __func__, __LINE__, ac); /* Assert */ @@ -6132,7 +6132,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, break; } } /* IS_QOS_BSS */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: ACM = %d for AC = %d", __func__, __LINE__, ret_val, ac); if (NULL == pIes) { @@ -6163,7 +6163,7 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, list_entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Flow List empty, nothing to buffer")); return QDF_STATUS_E_FAILURE; } @@ -6198,13 +6198,13 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the setup request" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a setup request for " "flow %d in handoff state"), @@ -6216,13 +6216,13 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the release req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a release request for " "flow %d in handoff state"), @@ -6236,20 +6236,20 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the modify req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a modify request for " "flow %d in handoff state"), flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting original entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, list_entry, true); @@ -6278,7 +6278,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, sme_QosFlowInfoEntry *flow_info = NULL; pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, true); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Flow List empty, nothing to delete", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -6297,7 +6297,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); } - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); @@ -6326,13 +6326,13 @@ QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) { sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pentry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked", __func__, __LINE__); pentry = (sme_QosCmdInfoEntry *) cdf_mem_malloc(sizeof(sme_QosCmdInfoEntry)); if (!pentry) { /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Memory allocation failure", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6369,14 +6369,14 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), session_id); qos_session = &sme_qos_cb.sessionInfo[session_id]; if (!csr_ll_is_list_empty(&qos_session->bufferedCommandList, false)) { list_elt = csr_ll_remove_head(&qos_session->bufferedCommandList, true); if (!list_elt) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("no more buffered commands on session %d"), session_id); qos_session->readyForPowerSave = true; @@ -6395,7 +6395,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.setupCmdInfo.QosFlowID, true, qos_cmd->u.setupCmdInfo.hoRenewal); if (SME_QOS_STATUS_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); @@ -6407,7 +6407,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.releaseCmdInfo.QosFlowID, true); if (SME_QOS_STATUS_RELEASE_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); @@ -6421,7 +6421,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) true); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); @@ -6436,7 +6436,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.resendCmdInfo.tspecMask); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); @@ -6444,7 +6444,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unknown cmd = %d"), session_id, qos_cmd->command); CDF_ASSERT(0); @@ -6453,7 +6453,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) /* buffered command has been processed, reclaim the memory */ cdf_mem_free(pcmd); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("cmd buffer empty")); qos_session->readyForPowerSave = true; } @@ -6475,13 +6475,13 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pcmd = NULL; tListElem *pEntry = NULL, *pNextEntry = NULL; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; pEntry = csr_ll_peek_head(&pSession->bufferedCommandList, true); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, "%s: %d: Buffered List empty, nothing to delete on session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -6489,7 +6489,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, while (pEntry) { pNextEntry = csr_ll_next(&pSession->bufferedCommandList, pEntry, true); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: deleting entry from buffered List", __func__, __LINE__); /* delete the entry from Flow List */ @@ -6522,7 +6522,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, tSirBssDescription *pBssDesc = NULL; uint32_t bssLen = 0; if (NULL == pAssoc_info) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: pAssoc_info is NULL", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } @@ -6536,7 +6536,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, /* save the bss Descriptor */ pBssDesc = (tSirBssDescription *) cdf_mem_malloc(bssLen); if (!pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6570,7 +6570,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6585,7 +6585,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6611,7 +6611,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6626,7 +6626,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6648,7 +6648,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosFlowInfoEntry *flow_info = NULL; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6661,7 +6661,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) break; case SME_QOS_REASON_MODIFY: /* delete the original entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting original entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6696,7 +6696,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType status; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6710,7 +6710,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } @@ -6718,7 +6718,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) status = sme_qos_internal_release_req(pMac, flow_info->QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, flow_info->QosFlowID, status); @@ -6749,7 +6749,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6843,7 +6843,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, } } else { /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true); @@ -6880,7 +6880,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6930,7 +6930,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6977,7 +6977,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, uint8_t tspec_index; if (!entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Entry is NULL")); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -6988,7 +6988,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, ac_info = &qos_session->ac_info[ac]; tspec_index = ac_info->tspec_pending - 1; if (flow_info->tspec_mask != ac_info->tspec_pending) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" No need to notify the HDD, the ADDTS " "success is not for index = %d of the AC = %d"), flow_info->tspec_mask, ac); @@ -7110,7 +7110,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, } } if (delete_entry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); /* delete the entry from Flow List */ @@ -7168,7 +7168,7 @@ void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff) { sme_QosSessionInfo *pSession; pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, "%s: %d: handoffRequested %d updateHandOff %d", __func__, __LINE__, pSession->handoffRequested, updateHandOff); @@ -7242,7 +7242,7 @@ QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7277,7 +7277,7 @@ QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7348,7 +7348,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return false; @@ -7357,14 +7357,14 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return false; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return false; @@ -7374,7 +7374,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return false; @@ -7385,7 +7385,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, if (!pIes->HTCaps.present && pQoSInfo->ts_info.ack_policy == SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ", __func__, __LINE__, sessionId); @@ -7424,7 +7424,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, do { pCommand = sme_get_command_buffer(pMac); if (!pCommand) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: fail to get command buffer for command %d", __func__, __LINE__, cmdType); break; @@ -7438,7 +7438,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspecInfo = *pQoSInfo; pCommand->u.qosCmd.ac = ac; } else { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: NULL pointer passed", __func__, __LINE__); @@ -7451,7 +7451,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspec_mask = tspec_mask; break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, cmdType); status = QDF_STATUS_E_INVAL; @@ -7492,7 +7492,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) } break; default: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, pCommand->command); break; @@ -7524,7 +7524,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, sme_QosStatusType status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; sme_QosCmdInfo cmd; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" Invoked on session %d for AC %d TSPEC %d"), session_id, ac, tspec_mask); session = &sme_qos_cb.sessionInfo[session_id]; @@ -7541,7 +7541,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, * followed by Reassoc. */ if (sme_qos_is_rsp_pending(session_id, ac)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " "on other AC or waiting for full power"), @@ -7555,7 +7555,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(CDF_MODULE_ID_SME, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d"), @@ -7576,9 +7576,9 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, /* if ACM, send out a new ADDTS */ ac_info->hoRenewal = true; status = sme_qos_setup(mac_ctx, session_id, qos_info, ac); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup returned in SME_QOS_QOS_ON state")); - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup AC %d with status =%d"), ac, status); if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status) { /* we aren't waiting for a response from the AP */ @@ -7594,11 +7594,11 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, status) || (SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING == status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("UAPSD is setup already status = %d "), status); } else { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_qos_setup return status = %d "), status); } @@ -7606,7 +7606,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Re-Add request in state = %d buffer the request"), ac_info->curr_state); cmd.command = SME_QOS_RESEND_REQ; @@ -7616,7 +7616,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL(" couldn't buf the read request state = %d"), ac_info->curr_state); /* unable to buffer the request @@ -7631,7 +7631,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, case SME_QOS_LINK_UP: default: /* print error msg, */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("ReAdd request in unexpected state = %d"), ac_info->curr_state); /* unable to service the request @@ -7666,7 +7666,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; QDF_STATUS status; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with UAPSD mask 0x%X", __func__, __LINE__, sessionId, pModFields->uapsd_mask); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -7678,7 +7678,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosEdcaAcType ac; for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: %d: AC[%d] is in state [%d]", __func__, __LINE__, ac, pACInfo->curr_state); /* If it is already in HANDOFF state, don't do anything since we */ @@ -7700,7 +7700,7 @@ static uint32_t sme_qos_assign_flow_id(void) if (SME_QOS_MAX_FLOW_ID == flowId) { /* The Flow ID wrapped. This is obviously not a real life scenario */ /* but handle it to keep the software test folks happy */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, "%s: %d: Software Test made the flow counter wrap, " "QoS may no longer be functional", __func__, __LINE__); diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index f6fa055d233a..a29ca9648970 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -72,7 +72,7 @@ #define RRM_ROAM_SCORE_NEIGHBOR_IAPP_LIST 30 #endif -v_TIME_t rrm_scan_timer; +unsigned long rrm_scan_timer; /** * rrm_ll_purge_neighbor_cache() -Purges all the entries in the neighbor cache @@ -209,7 +209,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, beacon_rep->duration = rrm_ctx->duration[0]; beacon_rep->regClass = rrm_ctx->regClass; cdf_mem_copy(beacon_rep->bssId, rrm_ctx->sessionBssId.bytes, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); i = 0; while (cur_result) { @@ -446,7 +446,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, cdf_mem_zero(scanresults_arr, sizeof(next_result) * SIR_BCN_REPORT_MAX_BSS_DESC); filter.BSSIDs.numOfBSSIDs = 1; - filter.BSSIDs.bssid = (struct cdf_mac_addr *)&rrm_ctx->bssId; + filter.BSSIDs.bssid = (struct qdf_mac_addr *)&rrm_ctx->bssId; if (rrm_ctx->ssId.length) { filter.SSIDs.SSIDList = @@ -679,7 +679,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) scan_req.bcnRptReqScan = true; scan_req.scanType = scan_type; cdf_mem_copy(&scan_req.bssid.bytes, sme_rrm_ctx->bssId, - CDF_MAC_ADDR_SIZE); + QDF_MAC_ADDR_SIZE); if (sme_rrm_ctx->ssId.length) { scan_req.SSIDs.numOfSSIDs = 1; scan_req.SSIDs.SSIDList = @@ -905,7 +905,7 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->token = pBeaconReq->uDialogToken; pSmeRrmContext->regClass = pBeaconReq->channelInfo.regulatoryClass; pSmeRrmContext->randnIntvl = - CDF_MAX(pBeaconReq->randomizationInterval, + QDF_MAX(pBeaconReq->randomizationInterval, pSmeRrmContext->rrmConfig.max_randn_interval); pSmeRrmContext->currentIndex = 0; pSmeRrmContext->msgSource = pBeaconReq->msgSource; @@ -1183,7 +1183,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) /* Get the session id */ status = csr_roam_get_session_id_from_bssid(pMac, - (struct cdf_mac_addr *) pNeighborRpt->bssId, + (struct qdf_mac_addr *) pNeighborRpt->bssId, (uint32_t *) &sessionId); if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE @@ -1278,7 +1278,7 @@ end: QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, FL(" Msg = %d for RRM measurement"), msg_type); /* switch on the msg type & make the state transition accordingly */ @@ -1293,7 +1293,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, default: /* err msg */ - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("sme_rrm_msg_processor:unknown msg type = %d"), msg_type); @@ -1360,12 +1360,12 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ qdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, rrm_iter_meas_timer_handle, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1373,12 +1373,12 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) qdf_status = cdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. - neighborRspWaitTimer, CDF_TIMER_TYPE_SW, + neighborRspWaitTimer, QDF_TIMER_TYPE_SW, rrm_neighbor_rsp_timeout_handler, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1389,7 +1389,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) cdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); return QDF_STATUS_E_FAILURE; } @@ -1418,7 +1418,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } @@ -1426,7 +1426,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Fail to destroy timer")); } @@ -1439,7 +1439,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Timer stop fail")); } } @@ -1448,7 +1448,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) cdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, FL("Fail to destroy timer")); } diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 2675c703dcd0..49a62fc35b64 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -68,7 +68,7 @@ -------------------------------------------------------------------------*/ #define EPPING_MAX_ADAPTERS 1 -#define EPPING_LOG(level, args ...) CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) +#define EPPING_LOG(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) struct epping_cookie { HTC_PACKET HtcPkt; /* HTC packet wrapper */ @@ -135,10 +135,10 @@ typedef enum { typedef struct epping_adapter_s { epping_context_t *pEpping_ctx; - enum tCDF_ADAPTER_MODE device_mode; + enum tQDF_ADAPTER_MODE device_mode; /** Handle to the network device */ struct net_device *dev; - struct cdf_mac_addr macAddressCurrent; + struct qdf_mac_addr macAddressCurrent; uint8_t sessionId; /* for mboxping */ cdf_spinlock_t data_lock; @@ -183,7 +183,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint); /* epping_txrx signatures */ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, tSirMacAddr macAddr, - enum tCDF_ADAPTER_MODE device_mode); + enum tQDF_ADAPTER_MODE device_mode); void epping_destroy_adapter(epping_adapter_t *pAdapter); int epping_connect_service(epping_context_t *pEpping_ctx); #ifdef HIF_PCI diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 0e8e3ecd2f0b..12602324fb69 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -165,9 +165,9 @@ void epping_hex_dump(void *data, int buf_len, const char *str) void *epping_get_cdf_ctx(void) { - cdf_device_t *p_cdf_ctx; + qdf_device_t *p_cdf_ctx; - p_cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + p_cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); return p_cdf_ctx; } diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 1171134da2b8..5bb56dcc5961 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -121,11 +121,11 @@ void epping_disable(void) epping_destroy_adapter(pEpping_ctx->epping_adapter); pEpping_ctx->epping_adapter = NULL; } - hif_disable_isr(cds_get_context(CDF_MODULE_ID_HIF)); - hif_reset_soc(cds_get_context(CDF_MODULE_ID_HIF)); - htc_stop(cds_get_context(CDF_MODULE_ID_HTC)); + hif_disable_isr(cds_get_context(QDF_MODULE_ID_HIF)); + hif_reset_soc(cds_get_context(QDF_MODULE_ID_HIF)); + htc_stop(cds_get_context(QDF_MODULE_ID_HTC)); epping_cookie_cleanup(pEpping_ctx); - htc_destroy(cds_get_context(CDF_MODULE_ID_HTC)); + htc_destroy(cds_get_context(QDF_MODULE_ID_HTC)); } /** @@ -177,7 +177,7 @@ int epping_enable(struct device *parent_dev) int ret = 0; epping_context_t *pEpping_ctx = NULL; cds_context_type *p_cds_context = NULL; - cdf_device_t cdf_ctx; + qdf_device_t cdf_ctx; HTC_INIT_INFO htcInfo; struct hif_opaque_softc *scn; tSirMacAddr adapter_macAddr; @@ -208,9 +208,9 @@ int epping_enable(struct device *parent_dev) /* Initialize the timer module */ cdf_timer_module_init(); - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return -1; } @@ -224,7 +224,7 @@ int epping_enable(struct device *parent_dev) #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ if (bmi_download_firmware(ol_ctx)) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); bmi_cleanup(ol_ctx); return -1; @@ -236,18 +236,18 @@ int epping_enable(struct device *parent_dev) htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = epping_target_suspend_acknowledge; - cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx); if (!p_cds_context->htc_ctx) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); bmi_cleanup(ol_ctx); return -1; } pEpping_ctx->HTCHandle = - cds_get_context(CDF_MODULE_ID_HTC); + cds_get_context(QDF_MODULE_ID_HTC); if (pEpping_ctx->HTCHandle == NULL) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is NULL", __func__); @@ -284,7 +284,7 @@ int epping_enable(struct device *parent_dev) if (ret == 0) { pEpping_ctx->epping_adapter = epping_add_adapter(pEpping_ctx, adapter_macAddr, - CDF_STA_MODE); + QDF_STA_MODE); } if (ret < 0 || pEpping_ctx->epping_adapter == NULL) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index d703ac9c4e13..0f8bbaab67dd 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -343,7 +343,7 @@ static struct net_device_ops epping_drv_ops = { epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, tSirMacAddr macAddr, - enum tCDF_ADAPTER_MODE device_mode) + enum tQDF_ADAPTER_MODE device_mode) { struct net_device *dev; epping_adapter_t *pAdapter; @@ -371,7 +371,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, cdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, - epping_timer_expire, dev, CDF_TIMER_TYPE_SW); + epping_timer_expire, dev, QDF_TIMER_TYPE_SW); dev->type = ARPHRD_IEEE80211; dev->netdev_ops = &epping_drv_ops; dev->watchdog_timeo = 5 * HZ; /* XXX */ diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index a2eaf57fca29..6de19c5ec3c7 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -55,11 +55,11 @@ #if defined(DEBUG) -static bool appstarted = false; -static bool senddriverstatus = false; +static bool appstarted; +static bool senddriverstatus; static int cnss_diag_pid = INVALID_PID; -static int get_version = 0; -static int gprint_limiter = 0; +static int get_version; +static int gprint_limiter; static ATH_DEBUG_MASK_DESCRIPTION g_fwlog_debug_description[] = { {FWLOG_DEBUG, "fwlog"}, @@ -1869,7 +1869,7 @@ static int diag_fw_handler(ol_scn_t scn, uint8_t *data, uint32_t datalen) gprint_limiter = true; } /* Always returns zero */ - return (0); + return 0; } /* @@ -1953,7 +1953,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) A_UINT32 moduleid; A_UINT16 vapid; A_UINT16 numargs; - cdf_size_t length; + qdf_size_t length; A_UINT32 dropped; WMI_DEBUG_MESG_EVENTID_param_tlvs *param_buf; uint8_t *datap; @@ -2053,7 +2053,7 @@ int dbglog_parse_debug_logs(ol_scn_t scn, uint8_t *data, uint32_t datalen) count += numargs + 2; /* 32 bit Time stamp + 32 bit Dbg header */ } /* Always returns zero */ - return (0); + return 0; } void dbglog_reg_modprint(A_UINT32 mod_id, module_dbg_print printfn) @@ -2191,8 +2191,8 @@ dbglog_sta_powersave_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "STA PS", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case PS_STA_PM_ARB_REQUEST: if (numargs == 4) { @@ -2298,7 +2298,7 @@ dbglog_sta_powersave_print_handler(A_UINT32 mod_id, A_UINT32 param = args[0]; A_UINT32 value = args[1]; - if (param < CDF_ARRAY_SIZE(params)) { + if (param < QDF_ARRAY_SIZE(params)) { if (params[param].is_time_param) { dbglog_printf(timestamp, vap_id, "STA PS SET_PARAM %s => %u (us)", @@ -2411,20 +2411,20 @@ dbglog_ibss_powersave_print_handler(A_UINT32 mod_id, case WLAN_IBSS_PS_SUB_MODULE_IBSS_NW_SM: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS NW", nw_states, - CDF_ARRAY_SIZE(nw_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(nw_states), events, + QDF_ARRAY_SIZE(events)); break; case WLAN_IBSS_PS_SUB_MODULE_IBSS_SELF_PS: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS Self", ps_states, - CDF_ARRAY_SIZE(ps_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(ps_states), events, + QDF_ARRAY_SIZE(events)); break; case WLAN_IBSS_PS_SUB_MODULE_IBSS_PEER_PS: dbglog_sm_print(timestamp, vap_id, numargs, args, "IBSS PS Peer", peer_ps_states, - CDF_ARRAY_SIZE(peer_ps_states), events, - CDF_ARRAY_SIZE(events)); + QDF_ARRAY_SIZE(peer_ps_states), events, + QDF_ARRAY_SIZE(events)); break; default: break; @@ -3049,8 +3049,8 @@ dbglog_wal_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "TID PAUSE", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case WAL_DBGID_SET_POWER_STATE: if (numargs == 3) { @@ -3188,8 +3188,8 @@ dbglog_scan_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "SCAN", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -3719,8 +3719,8 @@ dbglog_beacon_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "EARLY_RX", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case BEACON_EVENT_EARLY_RX_BMISS_STATUS: if (numargs == 3) { @@ -3826,8 +3826,8 @@ A_BOOL dbglog_smps_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "STA_SMPS SM", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; case STA_SMPS_DBGID_CREATE_PDEV_INSTANCE: dbglog_printf(timestamp, vap_id, "STA_SMPS Create PDEV ctx %#x", @@ -3944,8 +3944,8 @@ dbglog_p2p_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "P2P GO PS", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -3984,8 +3984,8 @@ dbglog_pcielp_print_handler(A_UINT32 mod_id, switch (dbg_id) { case DBGLOG_DBGID_SM_FRAMEWORK_PROXY_DBGLOG_MSG: dbglog_sm_print(timestamp, vap_id, numargs, args, "PCIELP", - states, CDF_ARRAY_SIZE(states), events, - CDF_ARRAY_SIZE(events)); + states, QDF_ARRAY_SIZE(states), events, + QDF_ARRAY_SIZE(events)); break; default: return false; @@ -4235,7 +4235,7 @@ int cnss_diag_msg_callback(struct sk_buff *skb) \return - 0 for success, non zero for failure --------------------------------------------------------------------------*/ -int cnss_diag_notify_wlan_close() +int cnss_diag_notify_wlan_close(void) { /* Send nl msg about the wlan close */ if (INVALID_PID != cnss_diag_pid) { @@ -4257,7 +4257,7 @@ int cnss_diag_notify_wlan_close() \return - 0 for success, non zero for failure --------------------------------------------------------------------------*/ -int cnss_diag_activate_service() +int cnss_diag_activate_service(void) { int ret = 0; @@ -4283,7 +4283,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "Enable NS offload, for sender %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); @@ -4315,7 +4315,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS requested from %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); @@ -4327,7 +4327,7 @@ dbglog_wow_print_handler(A_UINT32 mod_id, if (4 == numargs) { dbglog_printf(timestamp, vap_id, "NS replied to %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\ - :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), + :%02x%02x:%02x%02x:%02x%02x", *(A_UINT8 *) &args[0], *((A_UINT8 *) &args[0] + 1), *((A_UINT8 *) &args[0] + 2), *((A_UINT8 *) &args[0] + 3), *(A_UINT8 *) &args[1], *((A_UINT8 *) &args[1] + 1), *((A_UINT8 *) &args[1] + 2), *((A_UINT8 *) &args[1] + 3), *(A_UINT8 *) &args[2], *((A_UINT8 *) &args[2] + 1), *((A_UINT8 *) &args[2] + 2), *((A_UINT8 *) &args[2] + 3), *(A_UINT8 *) &args[3], *((A_UINT8 *) &args[3] + 1), *((A_UINT8 *) &args[3] + 2), *((A_UINT8 *) &args[3] + 3)); diff --git a/core/utils/host_diag_log/inc/host_diag_core_event.h b/core/utils/host_diag_log/inc/host_diag_core_event.h index 623db35d7e3d..0c8d963e7389 100644 --- a/core/utils/host_diag_log/inc/host_diag_core_event.h +++ b/core/utils/host_diag_log/inc/host_diag_core_event.h @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __HOST_DIAG_CORE_EVENT_H ) +#if !defined(__HOST_DIAG_CORE_EVENT_H) #define __HOST_DIAG_CORE_EVENT_H /**========================================================================= @@ -43,7 +43,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "cds_pack_align.h" #include "i_host_diag_core_event.h" diff --git a/core/utils/host_diag_log/inc/host_diag_core_log.h b/core/utils/host_diag_log/inc/host_diag_core_log.h index a5090113cbf0..6d53539aea8e 100644 --- a/core/utils/host_diag_log/inc/host_diag_core_log.h +++ b/core/utils/host_diag_log/inc/host_diag_core_log.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __HOST_DIAG_CORE_LOG_H ) +#if !defined(__HOST_DIAG_CORE_LOG_H) #define __HOST_DIAG_CORE_LOG_H /**========================================================================= @@ -43,7 +43,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "i_host_diag_core_log.h" /*-------------------------------------------------------------------------- @@ -98,8 +98,8 @@ typedef struct { log_hdr_type hdr; uint8_t eventId; uint8_t channelSetting; - struct cdf_mac_addr bssid; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr bssid; + struct qdf_mac_addr peer_macaddr; uint8_t ssid[HOST_LOG_MAX_SSID_SIZE]; uint8_t operatingChannel; uint8_t beaconInterval; diff --git a/core/utils/host_diag_log/inc/log_codes.h b/core/utils/host_diag_log/inc/log_codes.h index 462ce9cc83e0..4683349982cd 100644 --- a/core/utils/host_diag_log/inc/log_codes.h +++ b/core/utils/host_diag_log/inc/log_codes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -30,7 +30,7 @@ /*=========================================================================== - Log Code Definitions + Log Code Definitions General Description This file contains log code definitions and is shared with the tools. @@ -52,7 +52,7 @@ /*=========================================================================== - Edit History + Edit History $Header: //source/qcom/qct/core/services/diag/api/inc/main/latest/log_codes.h#9 $ @@ -72,12 +72,12 @@ 05/16/01 sfh Reserved log code 155. 05/08/01 sfh Reserved log codes 150 - 154. 04/06/01 lad Added definitions of base IDs (such as LOG_WCDMA_BASE_C). - This is currently using temporary ID values in the 0x1000 - range. + This is currently using temporary ID values in the 0x1000 + range. 02/23/01 lad Created file from DMSS log.h. Log codes only ===========================================================================*/ -#include +#include /* ------------------------------------------------------------------------- * Data Declarations @@ -2014,7 +2014,7 @@ #define LOG_1X_LAST_C ((0x8E0) + LOG_1X_BASE_C) /* This is only here for old (pre equipment ID update) logging code */ -#define LOG_LAST_C ( LOG_1X_LAST_C & 0xFFF ) +#define LOG_LAST_C (LOG_1X_LAST_C & 0xFFF) /* ------------------------------------------------------------------------- * APPS LOG definition: diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c index 168ccd7decda..0e1c570fe1ce 100644 --- a/core/utils/host_diag_log/src/host_diag_log.c +++ b/core/utils/host_diag_log/src/host_diag_log.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -33,7 +33,7 @@ DEPENDENCIES: ============================================================================*/ -#include "cdf_types.h" +#include "qdf_types.h" #include "i_host_diag_core_log.h" #include "host_diag_core_event.h" #include "wlan_nlink_common.h" @@ -62,7 +62,7 @@ typedef struct event_report_s { This function sets the logging code in the given log record. \param - ptr - Pointer to the log header type. - - code - log code. + - code - log code. \return - None --------------------------------------------------------------------------*/ @@ -82,7 +82,7 @@ void host_diag_log_set_code(void *ptr, uint16_t code) This function sets the length field in the given log record. \param - ptr - Pointer to the log header type. - - length - log length. + - length - log length. \return - None @@ -117,7 +117,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -134,7 +134,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -214,7 +214,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -229,7 +229,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -250,7 +250,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, if (ptt_sock_send_msg_to_app (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID) < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "Ptt Socket error sending message to the app!!"); cdf_mem_free((void *)wmsg); return; diff --git a/core/utils/host_diag_log/src/i_host_diag_core_event.h b/core/utils/host_diag_log/src/i_host_diag_core_event.h index cd4d0c3d5523..3a411c46bea1 100644 --- a/core/utils/host_diag_log/src/i_host_diag_core_event.h +++ b/core/utils/host_diag_log/src/i_host_diag_core_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __I_HOST_DIAG_CORE_EVENT_H ) +#if !defined(__I_HOST_DIAG_CORE_EVENT_H) #define __I_HOST_DIAG_CORE_EVENT_H /**========================================================================= @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #ifdef FEATURE_WLAN_DIAG_SUPPORT #include #endif @@ -61,23 +61,23 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, /*--------------------------------------------------------------------------- Allocate an event payload holder ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_EVENT_DEF( payload_name, payload_type ) \ +#define WLAN_HOST_DIAG_EVENT_DEF(payload_name, payload_type) \ payload_type(payload_name) /*--------------------------------------------------------------------------- Report the event ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_EVENT_REPORT( payload_ptr, ev_id ) \ +#define WLAN_HOST_DIAG_EVENT_REPORT(payload_ptr, ev_id) \ do { \ - host_diag_event_report_payload( ev_id, \ - sizeof( *(payload_ptr) ), \ - (void *)(payload_ptr) ); \ + host_diag_event_report_payload(ev_id, \ + sizeof(*(payload_ptr)), \ + (void *)(payload_ptr)); \ } while (0) #else /* FEATURE_WLAN_DIAG_SUPPORT */ -#define WLAN_HOST_DIAG_EVENT_DEF( payload_name, payload_type ) -#define WLAN_HOST_DIAG_EVENT_REPORT( payload_ptr, ev_id ) +#define WLAN_HOST_DIAG_EVENT_DEF(payload_name, payload_type) +#define WLAN_HOST_DIAG_EVENT_REPORT(payload_ptr, ev_id) #endif /* FEATURE_WLAN_DIAG_SUPPORT */ diff --git a/core/utils/host_diag_log/src/i_host_diag_core_log.h b/core/utils/host_diag_log/src/i_host_diag_core_log.h index d670d5339f75..8695171022ef 100644 --- a/core/utils/host_diag_log/src/i_host_diag_core_log.h +++ b/core/utils/host_diag_log/src/i_host_diag_core_log.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#if !defined( __I_HOST_DIAG_CORE_LOG_H ) +#if !defined(__I_HOST_DIAG_CORE_LOG_H) #define __I_HOST_DIAG_CORE_LOG_H #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -45,7 +45,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include +#include #include /*-------------------------------------------------------------------------- @@ -81,10 +81,10 @@ void host_diag_log_submit(void *plog_hdr_ptr); Allocate an event payload holder ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_ALLOC( payload_ptr, payload_type, log_code ) \ +#define WLAN_HOST_DIAG_LOG_ALLOC(payload_ptr, payload_type, log_code) \ do { \ - payload_ptr = ( payload_type *)cdf_mem_malloc(sizeof(payload_type)); \ - if(payload_ptr) { \ + payload_ptr = (payload_type *)cdf_mem_malloc(sizeof(payload_type)); \ + if (payload_ptr) { \ cdf_mem_zero(payload_ptr, sizeof(payload_type)); \ host_diag_log_set_code(payload_ptr, log_code); \ host_diag_log_set_length(payload_ptr, sizeof(payload_type)); \ @@ -94,10 +94,10 @@ void host_diag_log_submit(void *plog_hdr_ptr); /*--------------------------------------------------------------------------- Report the event ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_REPORT( payload_ptr ) \ +#define WLAN_HOST_DIAG_LOG_REPORT(payload_ptr) \ do { \ - if(payload_ptr) { \ - host_diag_log_submit( payload_ptr); \ + if (payload_ptr) { \ + host_diag_log_submit(payload_ptr); \ cdf_mem_free(payload_ptr); \ } \ } while (0) @@ -105,20 +105,18 @@ void host_diag_log_submit(void *plog_hdr_ptr); /*--------------------------------------------------------------------------- Free the payload ---------------------------------------------------------------------------*/ -#define WLAN_HOST_DIAG_LOG_FREE( payload_ptr ) \ - do \ - { \ - if( payload_ptr) \ - { \ +#define WLAN_HOST_DIAG_LOG_FREE(payload_ptr) \ + do { \ + if (payload_ptr) { \ cdf_mem_free(payload_ptr); \ } \ } while (0) #else /* FEATURE_WLAN_DIAG_SUPPORT */ -#define WLAN_HOST_DIAG_LOG_ALLOC( payload_ptr, payload_type, log_code ) -#define WLAN_HOST_DIAG_LOG_REPORT( payload_ptr ) -#define WLAN_HOST_DIAG_LOG_FREE( payload_ptr ) +#define WLAN_HOST_DIAG_LOG_ALLOC(payload_ptr, payload_type, log_code) +#define WLAN_HOST_DIAG_LOG_REPORT(payload_ptr) +#define WLAN_HOST_DIAG_LOG_FREE(payload_ptr) #endif /* FEATURE_WLAN_DIAG_SUPPORT */ diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 09fec12a8890..0e3e1d3a003a 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -41,7 +41,7 @@ #include #define LOGGING_TRACE(level, args ...) \ - CDF_TRACE(CDF_MODULE_ID_HDD, level, ## args) + CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) /* Global variables */ @@ -162,14 +162,14 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, * * Return: True if the module belongs to data path, false otherwise */ -static bool is_data_path_module(CDF_MODULE_ID mod_id) +static bool is_data_path_module(QDF_MODULE_ID mod_id) { switch (mod_id) { - case CDF_MODULE_ID_HDD_DATA: - case CDF_MODULE_ID_HDD_SAP_DATA: - case CDF_MODULE_ID_HTC: - case CDF_MODULE_ID_TXRX: - case CDF_MODULE_ID_HIF: + case QDF_MODULE_ID_HDD_DATA: + case QDF_MODULE_ID_HDD_SAP_DATA: + case QDF_MODULE_ID_HTC: + case QDF_MODULE_ID_TXRX: + case QDF_MODULE_ID_HIF: return true; default: return false; @@ -181,7 +181,7 @@ static void set_default_logtoapp_log_level(void) int i; /* module id 0 is reserved */ - for (i = 1; i < CDF_MODULE_ID_MAX; i++) { + for (i = 1; i < QDF_MODULE_ID_MAX; i++) { if (is_data_path_module(i)) cdf_trace_set_module_trace_level(i, CDF_DATA_PATH_TRACE_LEVEL); @@ -194,13 +194,13 @@ static void clear_default_logtoapp_log_level(void) { int module; - for (module = 0; module < CDF_MODULE_ID_MAX; module++) { + for (module = 0; module < QDF_MODULE_ID_MAX; module++) { cdf_trace_set_value(module, CDF_TRACE_LEVEL_NONE, false); cdf_trace_set_value(module, CDF_TRACE_LEVEL_FATAL, true); cdf_trace_set_value(module, CDF_TRACE_LEVEL_ERROR, true); } - cdf_trace_set_value(CDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE, + cdf_trace_set_value(QDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE, false); } diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c index c9f78f6fa4e5..e1134049877c 100644 --- a/core/utils/nlink/src/wlan_nlink_srv.c +++ b/core/utils/nlink/src/wlan_nlink_srv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -71,7 +71,7 @@ int nl_srv_init(void) if (nl_srv_sock != NULL) { memset(nl_srv_msg_handler, 0, sizeof(nl_srv_msg_handler)); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "NLINK: netlink_kernel_create failed"); retcode = -ECONNREFUSED; } @@ -103,7 +103,7 @@ int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) msg_handler != NULL) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = msg_handler; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_register failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -123,7 +123,7 @@ int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) (nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] == msg_handler)) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = NULL; } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_unregister failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -147,7 +147,7 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag) err = netlink_unicast(nl_srv_sock, skb, dst_pid, flag); if (err < 0) - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: netlink_unicast to pid[%d] failed, ret[0x%X]", dst_pid, err); @@ -174,7 +174,7 @@ int nl_srv_bcast(struct sk_buff *skb) WLAN_NLINK_MCAST_GRP_ID, flags); if (err < 0) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: netlink_broadcast failed err = %d", err); } return err; @@ -207,7 +207,7 @@ static void nl_srv_rcv_skb(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Invalid " "Netlink message: skb[%p], len[%d], nlhdr[%p], nlmsg_len[%d]", skb, skb->len, nlh, nlh->nlmsg_len); @@ -232,7 +232,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Only requests are handled by kernel now */ if (!(nlh->nlmsg_flags & NLM_F_REQUEST)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Req type [%x]", nlh->nlmsg_flags); return; @@ -242,7 +242,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Unknown message */ if (type < WLAN_NL_MSG_BASE || type >= WLAN_NL_MSG_MAX) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Msg type [%x]", type); return; } @@ -252,13 +252,13 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) * Drop any message with invalid length */ if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr))) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: Received NL Msg with invalid len[%x]", nlh->nlmsg_len); return; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "NLINK: Received NL msg type [%d]", type); /* turn type into dispatch table offset */ @@ -268,7 +268,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if (nl_srv_msg_handler[type] != NULL) { (nl_srv_msg_handler[type])(skb); } else { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, "NLINK: No handler for Netlink Msg [0x%X]", type); } } @@ -282,7 +282,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) * Return: Return -EPERM if the service is not initialized * */ -int nl_srv_is_initialized() +int nl_srv_is_initialized(void) { if (nl_srv_sock) return 0; diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index a514ea3c257c..a7f6d6a3e140 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -85,8 +85,8 @@ static ssize_t pktlog_read(struct file *file, char *buf, size_t nbytes, static struct file_operations pktlog_fops = { open: pktlog_open, release:pktlog_release, - mmap: pktlog_mmap, - read: pktlog_read, + mmap : pktlog_mmap, + read : pktlog_read, }; /* @@ -96,7 +96,7 @@ static struct file_operations pktlog_fops = { static struct ol_pktlog_dev_t *get_pl_handle(struct hif_opaque_softc *scn) { ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle) return NULL; return pdev_txrx_handle->pl_dev; @@ -105,7 +105,7 @@ static struct ol_pktlog_dev_t *get_pl_handle(struct hif_opaque_softc *scn) void ol_pl_set_name(hif_opaque_softc_handle scn, net_device_handle dev) { ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev_txrx_handle && pdev_txrx_handle->pl_dev && dev) pdev_txrx_handle->pl_dev->name = dev->name; } @@ -124,7 +124,7 @@ int pktlog_alloc_buf(struct hif_opaque_softc *scn) struct page *vpg; struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle || !pdev_txrx_handle->pl_dev) { printk(PKTLOG_TAG @@ -138,7 +138,8 @@ int pktlog_alloc_buf(struct hif_opaque_softc *scn) page_cnt = (sizeof(*(pl_info->buf)) + pl_info->buf_size) / PAGE_SIZE; - if ((pl_info->buf = vmalloc((page_cnt + 2) * PAGE_SIZE)) == NULL) { + pl_info->buf = vmalloc((page_cnt + 2) * PAGE_SIZE); + if (pl_info->buf == NULL) { printk(PKTLOG_TAG "%s: Unable to allocate buffer " "(%d pages)\n", __func__, page_cnt); @@ -166,7 +167,7 @@ void pktlog_release_buf(struct hif_opaque_softc *scn) struct page *vpg; struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev_txrx_handle || !pdev_txrx_handle->pl_dev) { printk(PKTLOG_TAG @@ -527,7 +528,7 @@ static int pktlog_release(struct inode *i, struct file *f) } #ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif /** @@ -544,7 +545,7 @@ int pktlog_send_per_pkt_stats_to_user(void) ssize_t ret_val; struct host_log_pktlog_info *pktlog = NULL; ol_txrx_pdev_handle txrx_pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ath_pktlog_info *pl_info; bool read_complete; uint32_t num_bytes_read = 0; @@ -848,7 +849,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) count = 0; if (*ppos < bufhdr_size) { - count = CDF_MIN((bufhdr_size - *ppos), rem_len); + count = QDF_MIN((bufhdr_size - *ppos), rem_len); if (copy_to_user(buf, ((char *)&log_buf->bufhdr) + *ppos, count)) return -EFAULT; @@ -894,7 +895,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) if (ppos_data > end_offset) goto rd_done; - count = CDF_MIN(rem_len, (end_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (end_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; @@ -902,7 +903,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) rem_len -= count; } else { if (ppos_data <= fold_offset) { - count = CDF_MIN(rem_len, (fold_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (fold_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; @@ -918,7 +919,7 @@ pktlog_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos) (fold_offset - start_offset + 1)); if (ppos_data <= end_offset) { - count = CDF_MIN(rem_len, (end_offset - ppos_data + 1)); + count = QDF_MIN(rem_len, (end_offset - ppos_data + 1)); if (copy_to_user(buf + ret_val, log_buf->log_data + ppos_data, count)) return -EFAULT; diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index dfde60ddd663..842ecb5c20b6 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -265,7 +265,7 @@ wdi_pktlog_unsubscribe(struct ol_txrx_pdev_t *txrx_pdev, uint32_t log_state) int pktlog_disable(struct hif_opaque_softc *scn) { struct ol_txrx_pdev_t *txrx_pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; @@ -294,7 +294,7 @@ void pktlog_init(struct hif_opaque_softc *scn) { struct ath_pktlog_info *pl_info; ol_txrx_pdev_handle pdev_txrx_handle; - pdev_txrx_handle = cds_get_context(CDF_MODULE_ID_TXRX); + pdev_txrx_handle = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev_txrx_handle == NULL || pdev_txrx_handle->pl_dev == NULL || @@ -339,7 +339,7 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) return -1; } - txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!txrx_pdev) { printk("%s: Invalid txrx_pdev context\n", __func__); ASSERT(0); @@ -414,7 +414,7 @@ int pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state) int pktlog_setsize(struct hif_opaque_softc *scn, int32_t size) { ol_txrx_pdev_handle pdev_txrx_handle = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; diff --git a/core/utils/pktlog/pktlog_internal.c b/core/utils/pktlog/pktlog_internal.c index 23c01b456ff5..c2f7b0758e82 100644 --- a/core/utils/pktlog/pktlog_internal.c +++ b/core/utils/pktlog/pktlog_internal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -439,7 +439,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) cdf_nbuf_peek_header(netbuf, &addr, &len); if (len < (2 * IEEE80211_ADDR_LEN)) { - cdf_print("TX frame does not have a valid" + qdf_print("TX frame does not have a valid" " address\n"); return -1; } @@ -589,11 +589,11 @@ A_STATUS process_rate_find(void *pdev, void *data) uint32_t *pl_tgt_hdr; if (!pdev) { - cdf_print("Invalid pdev in %s\n", __func__); + qdf_print("Invalid pdev in %s\n", __func__); return A_ERROR; } if (!data) { - cdf_print("Invalid data in %s\n", __func__); + qdf_print("Invalid data in %s\n", __func__); return A_ERROR; } diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index c59b92fcef87..07ec6f7c5a42 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -32,7 +32,7 @@ #ifndef PTT_SOCK_SVC_H #define PTT_SOCK_SVC_H #include -#include +#include #include #include #include diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index dce3cfd80f80..b63799e1cbbd 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -31,17 +31,17 @@ ******************************************************************************/ #ifdef PTT_SOCK_SVC_ENABLE #include -#include +#include #include #include #include #include -#include +#include #include #define PTT_SOCK_DEBUG #ifdef PTT_SOCK_DEBUG -#define PTT_TRACE(level, args ...) CDF_TRACE(CDF_MODULE_ID_CDF, level, ## args) +#define PTT_TRACE(level, args ...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) #else #define PTT_TRACE(level, args ...) #endif @@ -56,13 +56,13 @@ static void ptt_sock_dump_buf(const unsigned char *pbuf, int cnt) int i; for (i = 0; i < cnt; i++) { if ((i % 16) == 0) - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n%p:", pbuf); - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, " %02X", + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, " %02X", *pbuf); pbuf++; } - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_INFO, "\n"); + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n"); } #endif diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 478d3d71b9e2..fb396a75b7ff 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -29,14 +29,14 @@ #define WMA_H #include "a_types.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "osapi_linux.h" #include "htc_packet.h" #include "i_qdf_event.h" #include "wmi_services.h" #include "wmi_unified.h" #include "wmi_version.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "cfg_api.h" #include "qdf_status.h" #include "cds_sched.h" @@ -93,21 +93,21 @@ #define WMA_11P_CHANNEL_END (184) #define WMA_LOGD(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args) #define WMA_LOGI(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args) #define WMA_LOGW(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args) #define WMA_LOGE(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args) #define WMA_LOGP(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) #define WMA_DEBUG_ALWAYS #ifdef WMA_DEBUG_ALWAYS #define WMA_LOGA(args ...) \ - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) #else #define WMA_LOGA(args ...) #endif @@ -466,7 +466,7 @@ enum wma_tdls_peer_reason { struct wma_mem_chunk { uint32_t *vaddr; uint32_t paddr; - cdf_dma_mem_context(memctx); + qdf_dma_mem_context(memctx); uint32_t len; uint32_t req_id; }; @@ -928,7 +928,7 @@ typedef struct { struct utf_event_info { uint8_t *data; uint32_t length; - cdf_size_t offset; + qdf_size_t offset; uint8_t currentSeq; uint8_t expectedSeq; }; @@ -1197,7 +1197,7 @@ typedef struct { #endif bool wmi_ready; uint32_t wlan_init_status; - cdf_device_t cdf_dev; + qdf_device_t cdf_dev; uint32_t phy_capability; uint32_t max_frag_entry; uint32_t wmi_service_bitmap[WMI_SERVICE_BM_SIZE]; @@ -1215,7 +1215,7 @@ typedef struct { qdf_event_t tx_queue_empty_event; pWMAAckFnTxComp umac_ota_ack_cb[SIR_MAC_MGMT_RESERVED15]; pWMAAckFnTxComp umac_data_ota_ack_cb; - v_TIME_t last_umac_data_ota_timestamp; + unsigned long last_umac_data_ota_timestamp; cdf_nbuf_t last_umac_data_nbuf; bool needShutdown; uint32_t num_mem_chunks; @@ -1399,7 +1399,7 @@ typedef enum { * @driverType: driver type (production/FTM) * @uConfigBufferLen: length of config buffer */ -typedef struct cdf_packed sHalMacStartParameter { +typedef struct qdf_packed sHalMacStartParameter { tDriverType driverType; uint32_t uConfigBufferLen; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 554e915b6fc1..104739325a53 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -28,7 +28,7 @@ #ifndef _HALMSGAPI_H_ #define _HALMSGAPI_H_ -#include "cdf_types.h" +#include "qdf_types.h" #include "sir_api.h" #include "sir_params.h" @@ -155,7 +155,7 @@ typedef enum { typedef struct sAniBeaconStruct { uint32_t beaconLength; tSirMacMgmtHdr macHdr; -} cdf_packed tAniBeaconStruct, *tpAniBeaconStruct; +} qdf_packed tAniBeaconStruct, *tpAniBeaconStruct; /** * struct sAniProbeRspStruct - probeRsp template structure @@ -164,7 +164,7 @@ typedef struct sAniBeaconStruct { typedef struct sAniProbeRspStruct { tSirMacMgmtHdr macHdr; /* probeRsp body follows here */ -} cdf_packed tAniProbeRspStruct, *tpAniProbeRspStruct; +} qdf_packed tAniProbeRspStruct, *tpAniProbeRspStruct; /** * struct tAddStaParams - add sta related parameters @@ -373,7 +373,7 @@ typedef struct { tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS]; uint8_t singleTidRc; uint8_t smesessionId; - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; QDF_STATUS status; uint8_t sessionId; uint8_t sendRsp; @@ -390,7 +390,7 @@ typedef struct { * @key: key data */ typedef struct sLimMlmSetKeysReq { - struct cdf_mac_addr peer_macaddr; + struct qdf_mac_addr peer_macaddr; uint8_t sessionId; /* Added For BT-AMP Support */ uint8_t smesessionId; /* Added for drivers based on wmi interface */ uint16_t aid; @@ -678,7 +678,7 @@ typedef struct { * @oemDataReq: OEM Data request */ typedef struct { - struct cdf_mac_addr selfMacAddr; + struct qdf_mac_addr selfMacAddr; QDF_STATUS status; uint8_t data_len; uint8_t *data; @@ -1155,15 +1155,15 @@ typedef struct sControlTxParams { * Request Type = SIR_HAL_SET_MAX_TX_POWER_REQ */ typedef struct sMaxTxPowerParams { - struct cdf_mac_addr bssId; - struct cdf_mac_addr selfStaMacAddr; + struct qdf_mac_addr bssId; + struct qdf_mac_addr selfStaMacAddr; /* In request, * power == MaxTx power to be used. * In response, * power == tx power used for management frames. */ int8_t power; - enum tCDF_ADAPTER_MODE dev_mode; + enum tQDF_ADAPTER_MODE dev_mode; } tMaxTxPowerParams, *tpMaxTxPowerParams; /** @@ -1187,7 +1187,7 @@ typedef struct sMaxTxPowerPerBandParams { */ struct add_sta_self_params { tSirMacAddr self_mac_addr; - enum tCDF_ADAPTER_MODE curr_device_mode; + enum tQDF_ADAPTER_MODE curr_device_mode; uint32_t type; uint32_t sub_type; uint8_t session_id; @@ -1382,7 +1382,7 @@ typedef struct sBeaconFilterMsg { uint16_t ieNum; uint8_t bssIdx; uint8_t reserved; -} cdf_packed tBeaconFilterMsg, *tpBeaconFilterMsg; +} qdf_packed tBeaconFilterMsg, *tpBeaconFilterMsg; /** * struct tEidByteInfo - Eid byte info @@ -1396,7 +1396,7 @@ typedef struct sEidByteInfo { uint8_t value; uint8_t bitMask; uint8_t ref; -} cdf_packed tEidByteInfo, *tpEidByteInfo; +} qdf_packed tEidByteInfo, *tpEidByteInfo; /** * struct tBeaconFilterIe - beacon filter IE @@ -1408,7 +1408,7 @@ typedef struct sBeaconFilterIe { uint8_t elementId; uint8_t checkIePresence; tEidByteInfo byte; -} cdf_packed tBeaconFilterIe, *tpBeaconFilterIe; +} qdf_packed tBeaconFilterIe, *tpBeaconFilterIe; /** * struct tDisableIntraBssFwd - intra bss forward parameters @@ -1418,7 +1418,7 @@ typedef struct sBeaconFilterIe { typedef struct sDisableIntraBssFwd { uint16_t sessionId; bool disableintrabssfwd; -} cdf_packed tDisableIntraBssFwd, *tpDisableIntraBssFwd; +} qdf_packed tDisableIntraBssFwd, *tpDisableIntraBssFwd; #ifdef WLAN_FEATURE_STATS_EXT /** diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 66015f67d522..c822ffcbbb3b 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -988,7 +988,7 @@ static inline int wma_get_wow_bus_suspend(tp_wma_handle wma) return qdf_atomic_read(&wma->is_wow_bus_suspended); } -QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type); QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn); @@ -1000,7 +1000,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info); QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info); -QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type); +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type); void wma_calculate_and_update_conn_state(tp_wma_handle wma); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); void wma_update_conn_state(tp_wma_handle wma, uint32_t conn_mask); diff --git a/core/wma/inc/wma_tgt_cfg.h b/core/wma/inc/wma_tgt_cfg.h index 1d834b5d53e9..6b4cf5c3ffa4 100644 --- a/core/wma/inc/wma_tgt_cfg.h +++ b/core/wma/inc/wma_tgt_cfg.h @@ -154,7 +154,7 @@ struct wma_tgt_cfg { uint8_t band_cap; uint32_t reg_domain; uint32_t eeprom_rd_ext; - struct cdf_mac_addr hw_macaddr; + struct qdf_mac_addr hw_macaddr; struct wma_tgt_services services; struct wma_tgt_ht_cap ht_cap; #ifdef WLAN_FEATURE_11AC diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 8180e06e328d..2b4e72ff2bba 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -463,7 +463,7 @@ #define wma_tx_frame(hHal, pFrmBuf, frmLen, frmType, txDir, tid, pCompFunc, \ pData, txFlag, sessionid, channel_freq) \ (QDF_STATUS)( wma_tx_packet( \ - cds_get_context(CDF_MODULE_ID_WMA), \ + cds_get_context(QDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ (frmType), \ @@ -481,7 +481,7 @@ pCompFunc, pData, pCBackFnTxComp, txFlag, sessionid, tdlsflag, \ channel_freq) \ (QDF_STATUS)( wma_tx_packet( \ - cds_get_context(CDF_MODULE_ID_WMA), \ + cds_get_context(QDF_MODULE_ID_WMA), \ (pFrmBuf), \ (frmLen), \ (frmType), \ diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index cb2c41a56228..3b655d8ca73a 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -856,7 +856,7 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) return; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -897,7 +897,7 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) free_nbuf: /* unmap and freeing the tx buf as txrx is not taking care */ - cdf_nbuf_unmap_single(pdev->osdev, netbuf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(netbuf); } @@ -1001,7 +1001,7 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t uint16_t len = sizeof(wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param); - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s : Failed to get wma", __func__); return QDF_STATUS_E_FAULT; @@ -1066,7 +1066,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -1190,7 +1190,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -1299,7 +1299,7 @@ void wma_set_linkstate(tp_wma_handle wma, tpLinkStateParams params) goto out; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Unable to get TXRX context", __func__); @@ -1812,7 +1812,7 @@ QDF_STATUS wma_process_init_thermal_info(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAILURE; @@ -1898,7 +1898,7 @@ static void wma_set_thermal_level_ind(u_int8_t level) sme_msg.bodyptr = NULL; sme_msg.bodyval = level; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGE(FL( "Fail to post set thermal level ind msg")); @@ -1925,7 +1925,7 @@ QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAILURE; @@ -2081,7 +2081,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, param_buf = (WMI_THERMAL_MGMT_EVENTID_param_tlvs *) event; - curr_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + curr_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == curr_pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return -EINVAL; @@ -2354,7 +2354,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, int32_t cmd_len; uint64_t dma_addr; struct wmi_desc_t *wmi_desc = NULL; - void *cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); uint8_t *bufp; int32_t bufp_len = (frmLen < mgmt_tx_dl_frm_len) ? frmLen : mgmt_tx_dl_frm_len; @@ -2393,7 +2393,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, sizeof(uint32_t))); bufp += WMI_TLV_HDR_SIZE; cdf_mem_copy(bufp, pData, bufp_len); - cdf_nbuf_map_single(cdf_ctx, tx_frame, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(cdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); #if defined(HELIUMPLUS_PADDR64) @@ -2481,7 +2481,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, return QDF_STATUS_E_FAILURE; } - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("pMac Handle is NULL"); return QDF_STATUS_E_FAILURE; @@ -2598,12 +2598,12 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, cdf_nbuf_t ret; cdf_nbuf_t skb = (cdf_nbuf_t) tx_frame; ol_txrx_pdev_handle pdev = - cds_get_context(CDF_MODULE_ID_TXRX); + cds_get_context(QDF_MODULE_ID_TXRX); struct wma_decap_info_t decap_info; struct ieee80211_frame *wh = (struct ieee80211_frame *)cdf_nbuf_data(skb); - v_TIME_t curr_timestamp = cdf_mc_timer_get_system_ticks(); + unsigned long curr_timestamp = cdf_mc_timer_get_system_ticks(); if (pdev == NULL) { WMA_LOGE("%s: pdev pointer is not available", __func__); @@ -2654,7 +2654,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, cdf_mem_set(skb->cb, sizeof(skb->cb), 0); /* Do the DMA Mapping */ - cdf_nbuf_map_single(pdev->osdev, skb, CDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); /* Terminate the (single-element) list of tx frames */ skb->next = NULL; @@ -2672,7 +2672,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (ret) { WMA_LOGE("TxRx Rejected. Fail to do Tx"); cdf_nbuf_unmap_single(pdev->osdev, skb, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); /* Call Download Cb so that umac can free the buffer */ if (tx_frm_download_comp_cb) tx_frm_download_comp_cb(wma_handle->mac_context, @@ -2896,7 +2896,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, enum ol_rx_err_type err_type, cdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); tpSirSmeMicFailureInd mic_err_ind; struct ether_header *eth_hdr; cds_msg_t cds_msg; @@ -2924,15 +2924,15 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, mic_err_ind->length = sizeof(*mic_err_ind); mic_err_ind->sessionId = vdev_id; cdf_copy_macaddr(&mic_err_ind->bssId, - (struct cdf_mac_addr *) &wma->interfaces[vdev_id].bssid); + (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); cdf_mem_copy(mic_err_ind->info.taMacAddr, - (struct cdf_mac_addr *) peer_mac_addr, + (struct qdf_mac_addr *) peer_mac_addr, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.srcMacAddr, - (struct cdf_mac_addr *) eth_hdr->ether_shost, + (struct qdf_mac_addr *) eth_hdr->ether_shost, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.dstMacAddr, - (struct cdf_mac_addr *) eth_hdr->ether_dhost, + (struct qdf_mac_addr *) eth_hdr->ether_dhost, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = key_id; mic_err_ind->info.multicast = @@ -2966,7 +2966,7 @@ void wma_tx_abort(uint8_t vdev_id) uint32_t peer_tid_bitmap = PEER_ALL_TID_BITMASK; struct wma_txrx_node *iface; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: wma is NULL", __func__); return; @@ -3096,7 +3096,7 @@ wma_indicate_err( switch (err_type) { case OL_RX_ERR_TKIP_MIC: { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); tpSirSmeMicFailureInd mic_err_ind; cds_msg_t cds_msg; uint8_t vdev_id; @@ -3120,19 +3120,19 @@ wma_indicate_err( mic_err_ind->length = sizeof(*mic_err_ind); vdev_id = err_info->u.mic_err.vdev_id; cdf_copy_macaddr(&mic_err_ind->bssId, - (struct cdf_mac_addr *) &wma->interfaces[vdev_id].bssid); + (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); WMA_LOGE("MIC error: BSSID:%02x:%02x:%02x:%02x:%02x:%02x\n", mic_err_ind->bssId.bytes[0], mic_err_ind->bssId.bytes[1], mic_err_ind->bssId.bytes[2], mic_err_ind->bssId.bytes[3], mic_err_ind->bssId.bytes[4], mic_err_ind->bssId.bytes[5]); cdf_mem_copy(mic_err_ind->info.taMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.ta, + (struct qdf_mac_addr *) err_info->u.mic_err.ta, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.srcMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.sa, + (struct qdf_mac_addr *) err_info->u.mic_err.sa, sizeof(tSirMacAddr)); cdf_mem_copy(mic_err_ind->info.dstMacAddr, - (struct cdf_mac_addr *) err_info->u.mic_err.da, + (struct qdf_mac_addr *) err_info->u.mic_err.da, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = err_info->u.mic_err.key_id; mic_err_ind->info.multicast = diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2372a7a6eabf..32d26b4ebe33 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -87,8 +87,8 @@ void *wma_find_vdev_by_addr(tp_wma_handle wma, uint8_t *addr, for (i = 0; i < wma->max_bssid; i++) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) wma->interfaces[i].addr, - (struct cdf_mac_addr *) addr) == true) { + (struct qdf_mac_addr *) wma->interfaces[i].addr, + (struct qdf_mac_addr *) addr) == true) { *vdev_id = i; return wma->interfaces[i].handle; } @@ -168,8 +168,8 @@ void *wma_find_vdev_by_bssid(tp_wma_handle wma, uint8_t *bssid, for (i = 0; i < wma->max_bssid; i++) { if (cdf_is_macaddr_equal( - (struct cdf_mac_addr *) wma->interfaces[i].bssid, - (struct cdf_mac_addr *) bssid) == true) { + (struct qdf_mac_addr *) wma->interfaces[i].bssid, + (struct qdf_mac_addr *) bssid) == true) { *vdev_id = i; return wma->interfaces[i].handle; } @@ -485,7 +485,7 @@ void wma_vdev_detach_callback(void *ctx) QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma || !iface->del_staself_req) { WMA_LOGP("%s: wma %p iface %p", __func__, wma, @@ -521,7 +521,7 @@ void wma_vdev_detach_callback(void *ctx) sme_msg.bodyptr = param; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(param); @@ -552,7 +552,7 @@ static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, WMA_LOGE("P2P Device: removing self peer %pM", del_sta_self_req_param->self_mac_addr); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); return QDF_STATUS_E_FAULT; @@ -664,7 +664,7 @@ out: sme_msg.bodyptr = del_sta_self_req_param; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP"); cdf_mem_free(del_sta_self_req_param); @@ -906,7 +906,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, struct wma_target_req *req_msg; struct wma_txrx_node *iface; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); return -EINVAL; @@ -1526,8 +1526,8 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, } cdf_copy_macaddr( - (struct cdf_mac_addr *) &(add_sta_self_param.self_mac_addr), - (struct cdf_mac_addr *) &(vdev->mac_addr)); + (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), + (struct qdf_mac_addr *) &(vdev->mac_addr)); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; add_sta_self_param.sub_type = 0; @@ -1536,7 +1536,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* delete old ibss vdev */ del_sta_param.session_id = vdev_id; cdf_mem_copy((void *)del_sta_param.self_mac_addr, - (void *)&(vdev->mac_addr), CDF_MAC_ADDR_SIZE); + (void *)&(vdev->mac_addr), QDF_MAC_ADDR_SIZE); wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ @@ -1676,7 +1676,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, struct wma_txrx_node *iface; int32_t status = 0; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); return -EINVAL; @@ -1710,7 +1710,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, __func__, resp_event->vdev_id); return -EINVAL; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); status = -EINVAL; @@ -1780,7 +1780,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma->interfaces[resp_event->vdev_id].beacon = NULL; @@ -1835,10 +1835,10 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, uint8_t generateRsp) { ol_txrx_vdev_handle txrx_vdev_handle = NULL; - ol_txrx_pdev_handle txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); enum wlan_op_mode txrx_vdev_type; QDF_STATUS status = QDF_STATUS_SUCCESS; - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t cfg_val; uint16_t val16; int ret; @@ -2060,7 +2060,7 @@ end: sme_msg.bodyptr = self_sta_req; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(self_sta_req); @@ -2090,7 +2090,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, tpAniSirGlobal mac_ctx = NULL; struct ath_dfs *dfs; - mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (mac_ctx == NULL) { WMA_LOGE("%s: vdev start failed as mac_ctx is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2552,7 +2552,7 @@ void wma_hold_req_timer(void *data) struct wma_target_req *tgt_req = (struct wma_target_req *)data; struct wma_target_req *msg; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE(FL("Failed to get wma")); goto free_tgt_req; @@ -2630,7 +2630,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_hold_req_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); @@ -2688,21 +2688,21 @@ void wma_vdev_resp_timer(void *data) QDF_STATUS status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - tpAniSirGlobal mac_ctx = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { WMA_LOGE("%s: Failed to get mac_ctx", __func__); goto free_tgt_req; } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); goto free_tgt_req; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -2788,7 +2788,7 @@ void wma_vdev_resp_timer(void *data) "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma->interfaces[tgt_req->vdev_id].beacon = NULL; @@ -2827,7 +2827,7 @@ void wma_vdev_resp_timer(void *data) sme_msg.bodyptr = iface->del_staself_req; sme_msg.bodyval = 0; - status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); cdf_mem_free(iface->del_staself_req); @@ -2938,7 +2938,7 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, CDF_TIMER_TYPE_SW, + cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_vdev_resp_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); cdf_spin_lock_bh(&wma->vdev_respq_lock); @@ -3068,7 +3068,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) #endif /* WLAN_FEATURE_11W */ struct sir_hw_mode_params hw_mode = {0}; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -3210,7 +3210,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) goto send_fail_resp; } WMA_LOGD("%s: add_bss->sessionId = %d", __func__, vdev_id); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -3235,17 +3235,17 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) /* remove the non-ibss vdev */ cdf_copy_macaddr( - (struct cdf_mac_addr *) &(del_sta_param.self_mac_addr), - (struct cdf_mac_addr *) &(vdev->mac_addr)); + (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), + (struct qdf_mac_addr *) &(vdev->mac_addr)); del_sta_param.session_id = vdev_id; del_sta_param.status = 0; wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ - cdf_copy_macaddr((struct cdf_mac_addr *) & + cdf_copy_macaddr((struct qdf_mac_addr *) & (add_sta_self_param.self_mac_addr), - (struct cdf_mac_addr *) &(add_bss->selfMacAddr)); + (struct qdf_mac_addr *) &(add_bss->selfMacAddr)); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; add_sta_self_param.sub_type = 0; @@ -3402,7 +3402,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) int ret = 0; int pps_val = 0; bool roam_synch_in_progress = false; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct sir_hw_mode_params hw_mode = {0}; bool peer_assoc_sent = false; @@ -3411,7 +3411,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) goto send_fail_resp; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s Failed to get pdev", __func__); @@ -3699,8 +3699,8 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) switch (params->halPersona) { - case CDF_SAP_MODE: - case CDF_P2P_GO_MODE: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: /*If current bring up SAP/P2P channel matches the previous *radar found channel then reset the last_radar_found_chan *variable to avoid race conditions. @@ -3713,7 +3713,7 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) break; #ifdef QCA_IBSS_SUPPORT - case CDF_IBSS_MODE: + case QDF_IBSS_MODE: wma_add_bss_ibss_mode(wma, params); break; #endif @@ -3784,7 +3784,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) struct wma_target_req *msg; bool peer_assoc_cnf = false; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -3986,7 +3986,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) __func__, add_sta->staType, add_sta->staIdx, add_sta->updateSta, add_sta->bssId, add_sta->staMac); - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -4132,7 +4132,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) } #endif - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Unable to get pdev", __func__); @@ -4347,7 +4347,7 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, struct ol_txrx_peer_t *peer; struct wma_target_req *msg; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -4415,7 +4415,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) struct ol_txrx_peer_t *peer; tTdlsPeerStateParams *peerStateParams; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); @@ -4641,7 +4641,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) ol_txrx_vdev_handle txrx_vdev = NULL; bool roam_synch_in_progress = false; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s:Unable to get TXRX context", __func__); diff --git a/core/wma/src/wma_dfs_interface.c b/core/wma/src/wma_dfs_interface.c index a9bc97b85711..be1022d21c8c 100644 --- a/core/wma/src/wma_dfs_interface.c +++ b/core/wma/src/wma_dfs_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -51,7 +51,7 @@ int ol_if_dfs_attach(struct ieee80211com *ic, void *ptr, void *radar_info) { struct ath_dfs_caps *pCap = (struct ath_dfs_caps *)ptr; - cdf_print("%s: called; ptr=%p, radar_info=%p\n", + qdf_print("%s: called; ptr=%p, radar_info=%p\n", __func__, ptr, radar_info); pCap->ath_chip_is_bb_tlv = 1; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 57736436a1a1..0c032b2b442b 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -128,7 +128,7 @@ static int wma_post_auto_shutdown_msg(void) sme_msg.bodyptr = auto_sh_evt; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME"); cdf_mem_free(auto_sh_evt); @@ -217,7 +217,7 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) tp_wma_handle wma_handle = NULL; struct wma_txrx_node *intr; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s : Failed to get wma_handle", __func__); @@ -1308,7 +1308,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) sme_msg.bodyptr = slphb_indication; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME"); cdf_mem_free(slphb_indication); @@ -2178,13 +2178,13 @@ static int wma_unified_phyerr_rx_event_handler(void *handle, uint8_t *bufp; wmi_single_phyerr_rx_event *ev; struct ieee80211com *ic = wma->dfs_ic; - cdf_size_t n; + qdf_size_t n; A_UINT64 tsf64 = 0; int phy_err_code = 0; A_UINT32 phy_err_mask = 0; int error = 0; tpAniSirGlobal mac_ctx = - (tpAniSirGlobal)cds_get_context(CDF_MODULE_ID_PE); + (tpAniSirGlobal)cds_get_context(QDF_MODULE_ID_PE); bool enable_log = false; int max_dfs_buf_length = 0; @@ -2946,7 +2946,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len, WOW_REASON_PATTERN_MATCH_FOUND); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len); @@ -2970,7 +2970,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((uint8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); @@ -3003,7 +3003,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(CDF_MODULE_ID_WMA, + cdf_trace_hex_dump(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); if (wow_buf_pkt_len >= sizeof(param)) { @@ -3252,11 +3252,11 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, bitmap_pattern->pattern_offset, user); WMA_LOGI("Pattern : "); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, &bitmap_pattern->patternbuf[0], bitmap_pattern->pattern_len); WMA_LOGI("Mask : "); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, &bitmap_pattern->bitmaskbuf[0], bitmap_pattern->pattern_len); buf_ptr += sizeof(WOW_BITMAP_PATTERN_T); @@ -3545,7 +3545,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) int host_credits; int wmi_pending_cmds; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); @@ -3652,7 +3652,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) WMA_LOGD("WOW enabled successfully in fw: credits:%d" "pending_cmds: %d", host_credits, wmi_pending_cmds); - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); @@ -3678,9 +3678,9 @@ error: * * Return: CDF status */ -QDF_STATUS wma_resume_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) { - if (type == CDF_SYSTEM_SUSPEND) { + if (type == QDF_SYSTEM_SUSPEND) { wma->no_of_resume_ind++; if (wma->no_of_resume_ind < wma_get_vdev_count(wma)) @@ -4196,11 +4196,11 @@ void wma_apply_lphb(tp_wma_handle wma) {} #endif /* FEATURE_WLAN_LPHB */ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, - enum cdf_suspend_type type) + enum qdf_suspend_type type) { - if (type == CDF_SYSTEM_SUSPEND) + if (type == QDF_SYSTEM_SUSPEND) wma_send_status_to_suspend_ind(wma, true); - else if (type == CDF_RUNTIME_SUSPEND) + else if (type == QDF_RUNTIME_SUSPEND) qdf_event_set(&wma->runtime_suspend); } @@ -4214,9 +4214,9 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, * * Return: CDF status */ -QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum cdf_suspend_type type) +QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type) { - if (type == CDF_RUNTIME_SUSPEND) + if (type == QDF_RUNTIME_SUSPEND) wmi_set_runtime_pm_inprogress(wma->wmi_handle, true); if (wma_is_wow_applicable(wma)) { @@ -4259,7 +4259,7 @@ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) int32_t len; int ret; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); return QDF_STATUS_E_FAILURE; @@ -4559,7 +4559,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) * interval_miliseconds overflow 32 bit */ uint32_t intervalMiliseconds; - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); goto err; @@ -4692,7 +4692,7 @@ static int wma_config_packet_filter(tp_wma_handle wma, cmd->filter_action = PACKET_FILTER_SET_INACTIVE; if (enable) { - cmd->num_params = CDF_MIN( + cmd->num_params = QDF_MIN( WMI_PACKET_FILTER_MAX_CMP_PER_PACKET_FILTER, rcv_filter_param->numFieldParams); cmd->filter_type = rcv_filter_param->filterType; @@ -4823,7 +4823,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, */ uint16_t bin_values[QCA_TX_DELAY_HIST_REPORT_BINS] = { 0, }; - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -4840,7 +4840,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, pTsmRspParams = (tpAniGetTsmStatsRsp) cdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if (NULL == pTsmRspParams) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "%s: CDF MEM Alloc Failure", __func__); CDF_ASSERT(0); cdf_mem_free(pTsmStatsMsg); @@ -4885,7 +4885,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, * Return: 0 for success or error code */ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, - struct cdf_mac_addr multicast_addr, + struct qdf_mac_addr multicast_addr, bool clearList) { WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param *cmd; @@ -6191,7 +6191,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = sca_indication; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME"); cdf_mem_free(sca_indication); @@ -6287,7 +6287,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, wmi_buf_t buf; wmi_pdev_set_regdomain_cmd_fixed_param *cmd; int32_t len = sizeof(*cmd); - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int32_t cck_mask_val = 0; int ret = 0; @@ -6349,7 +6349,7 @@ static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) resume_msg.bodyptr = NULL; resume_msg.type = WMA_RUNTIME_PM_RESUME_IND; - return cds_mq_post_message(CDF_MODULE_ID_WMA, &resume_msg); + return cds_mq_post_message(QDF_MODULE_ID_WMA, &resume_msg); } /** @@ -6371,7 +6371,7 @@ static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) cds_msg.bodyptr = NULL; cds_msg.type = WMA_RUNTIME_PM_SUSPEND_IND; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_WMA, &cds_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_msg); if (qdf_status != QDF_STATUS_SUCCESS) goto failure; @@ -6398,9 +6398,9 @@ failure: * * Return: 0 for success or error code */ -static int __wma_bus_suspend(enum cdf_suspend_type type) +static int __wma_bus_suspend(enum qdf_suspend_type type) { - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6411,13 +6411,13 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) return -EBUSY; } - if (type == CDF_RUNTIME_SUSPEND) { + if (type == QDF_RUNTIME_SUSPEND) { QDF_STATUS status = wma_post_runtime_suspend_msg(handle); if (status) return qdf_status_to_os_return(status); } - if (type == CDF_SYSTEM_SUSPEND) + if (type == QDF_SYSTEM_SUSPEND) WMA_LOGE("%s: wow mode selected %d", __func__, wma_is_wow_mode_selected(handle)); @@ -6444,7 +6444,7 @@ static int __wma_bus_suspend(enum cdf_suspend_type type) */ int wma_runtime_suspend(void) { - return __wma_bus_suspend(CDF_RUNTIME_SUSPEND); + return __wma_bus_suspend(QDF_RUNTIME_SUSPEND); } /** @@ -6457,7 +6457,7 @@ int wma_runtime_suspend(void) int wma_bus_suspend(void) { - return __wma_bus_suspend(CDF_SYSTEM_SUSPEND); + return __wma_bus_suspend(QDF_SYSTEM_SUSPEND); } /** @@ -6490,7 +6490,7 @@ int wma_runtime_resume(void) { int ret; QDF_STATUS status; - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6514,7 +6514,7 @@ int wma_runtime_resume(void) */ int wma_bus_resume(void) { - WMA_HANDLE handle = cds_get_context(CDF_MODULE_ID_WMA); + WMA_HANDLE handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == handle) { WMA_LOGE("%s: wma context is NULL", __func__); return -EFAULT; @@ -6539,7 +6539,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) struct hif_opaque_softc *scn; int ret; #ifdef CONFIG_CNSS - tpAniSirGlobal pmac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pmac = cds_get_context(QDF_MODULE_ID_PE); #endif if (!wma_handle || !wma_handle->wmi_handle) { @@ -6602,7 +6602,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) return -EFAULT; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); @@ -6623,7 +6623,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) */ void wma_target_suspend_acknowledge(void *context) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int wow_nack = *((int *)context); if (NULL == wma) { @@ -6653,7 +6653,7 @@ int wma_resume_target(WMA_HANDLE handle) wmi_pdev_resume_cmd_fixed_param *cmd; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); return -EINVAL; @@ -7230,7 +7230,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, /* in case of teardown, remove peer from fw */ if (WMA_TDLS_PEER_STATE_TEARDOWN == peerStateParams->peerState) { - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); ret = -EIO; @@ -7363,15 +7363,15 @@ void wma_dfs_configure(struct ieee80211com *ic) WMA_LOGI("%s: DFS-FCC domain", __func__); rinfo.dfsdomain = DFS_FCC_DOMAIN; rinfo.dfs_radars = dfs_fcc_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_fcc_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_fcc_radars); rinfo.b5pulses = dfs_fcc_bin5pulses; - rinfo.numb5radars = CDF_ARRAY_SIZE(dfs_fcc_bin5pulses); + rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_fcc_bin5pulses); break; case DFS_ETSI_DOMAIN: WMA_LOGI("%s: DFS-ETSI domain", __func__); rinfo.dfsdomain = DFS_ETSI_DOMAIN; rinfo.dfs_radars = dfs_etsi_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_etsi_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars); rinfo.b5pulses = NULL; rinfo.numb5radars = 0; break; @@ -7379,9 +7379,9 @@ void wma_dfs_configure(struct ieee80211com *ic) WMA_LOGI("%s: DFS-MKK4 domain", __func__); rinfo.dfsdomain = DFS_MKK4_DOMAIN; rinfo.dfs_radars = dfs_mkk4_radars; - rinfo.numradars = CDF_ARRAY_SIZE(dfs_mkk4_radars); + rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars); rinfo.b5pulses = dfs_jpn_bin5pulses; - rinfo.numb5radars = CDF_ARRAY_SIZE(dfs_jpn_bin5pulses); + rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_jpn_bin5pulses); break; default: WMA_LOGI("%s: DFS-UNINT domain", __func__); @@ -7605,15 +7605,15 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, tpAniSirGlobal pmac = NULL; bool indication_status; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (wma == NULL) { WMA_LOGE("%s: DFS- Invalid wma", __func__); return -ENOENT; } - hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); pmac = (tpAniSirGlobal) - cds_get_context(CDF_MODULE_ID_PE); + cds_get_context(QDF_MODULE_ID_PE); if (!pmac) { WMA_LOGE("%s: Invalid MAC handle", __func__); @@ -7809,7 +7809,7 @@ static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) sme_msg.bodyptr = dump_rsp; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post fw mem dump ind msg")); cdf_mem_free(dump_rsp); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 76ae27d22bcf..a4de6d9d0bb5 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -48,7 +48,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -158,7 +158,7 @@ static uint8_t wma_get_number_of_peers_supported(tp_wma_handle wma) struct hif_target_info *tgt_info; struct wma_ini_config *cfg = wma_get_ini_handle(wma); uint8_t max_no_of_peers = cfg ? cfg->max_no_of_peers : MIN_NO_OF_PEERS; - struct hif_opaque_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { WMA_LOGE("%s: Invalid wma handle", __func__); @@ -270,7 +270,7 @@ int wma_cli_get_command(int vdev_id, int param_id, int vpdev) tp_wma_handle wma; struct wma_txrx_node *intr = NULL; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: Invalid wma handle", __func__); @@ -522,7 +522,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, msg.bodyptr = iwcmd; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg", __func__); cdf_mem_free(iwcmd); @@ -732,7 +732,7 @@ static int32_t wma_set_priv_cfg(tp_wma_handle wma_handle, { ol_txrx_pdev_handle pdev; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("pdev NULL for uc stat"); return -EINVAL; @@ -853,7 +853,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, { int ret = 0, vid = privcmd->param_vdev_id, pps_val = 0; struct wma_txrx_node *intr = wma->interfaces; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct qpower_params *qparams = &intr[vid].config.qpower_params; WMA_LOGD("wmihandle %p", wma->wmi_handle); @@ -1593,7 +1593,7 @@ QDF_STATUS wma_open(void *cds_context, { tp_wma_handle wma_handle; HTC_HANDLE htc_handle; - cdf_device_t cdf_dev; + qdf_device_t qdf_dev; void *wmi_handle; QDF_STATUS qdf_status; QDF_STATUS qdf_status; @@ -1601,8 +1601,8 @@ QDF_STATUS wma_open(void *cds_context, WMA_LOGD("%s: Enter", __func__); - cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); - htc_handle = cds_get_context(CDF_MODULE_ID_HTC); + qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + htc_handle = cds_get_context(QDF_MODULE_ID_HTC); if (!htc_handle) { WMA_LOGP("%s: Invalid HTC handle", __func__); @@ -1610,7 +1610,7 @@ QDF_STATUS wma_open(void *cds_context, } /* Alloc memory for WMA Context */ - qdf_status = cds_alloc_context(cds_context, CDF_MODULE_ID_WMA, + qdf_status = cds_alloc_context(cds_context, QDF_MODULE_ID_WMA, (void **)&wma_handle, sizeof(t_wma_handle)); @@ -1622,7 +1622,7 @@ QDF_STATUS wma_open(void *cds_context, cdf_mem_zero(wma_handle, sizeof(t_wma_handle)); - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_init(&wma_handle->pno_wake_lock, "wlan_pno_wl"); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -1648,7 +1648,7 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->wmi_handle = wmi_handle; wma_handle->htc_handle = htc_handle; wma_handle->cds_context = cds_context; - wma_handle->cdf_dev = cdf_dev; + wma_handle->qdf_dev = qdf_dev; wma_handle->max_scan = mac_params->max_scan; /* initialize default target config */ @@ -1709,7 +1709,7 @@ QDF_STATUS wma_open(void *cds_context, goto err_wmi_handle; } #if defined(QCA_WIFI_FTM) - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) wma_utf_attach(wma_handle); #endif /* QCA_WIFI_FTM */ wma_init_max_no_of_peers(wma_handle, mac_params->maxStation); @@ -1784,7 +1784,7 @@ QDF_STATUS wma_open(void *cds_context, } qdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -2029,7 +2029,7 @@ err_wmi_handle: err_wma_handle: - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -2038,7 +2038,7 @@ err_wma_handle: #endif /* FEATURE_WLAN_EXTSCAN */ cdf_wake_lock_destroy(&wma_handle->wow_wake_lock); } - cds_free_context(cds_context, CDF_MODULE_ID_WMA, wma_handle); + cds_free_context(cds_context, QDF_MODULE_ID_WMA, wma_handle); WMA_LOGD("%s: Exit", __func__); @@ -2060,7 +2060,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* Validate the wma_handle */ if (NULL == wma_handle) { @@ -2109,7 +2109,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, { tSirMsgQ msg = { 0 }; uint32_t status = QDF_STATUS_SUCCESS; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); msg.type = msg_type; msg.bodyval = body_val; msg.bodyptr = body_ptr; @@ -2628,7 +2628,7 @@ QDF_STATUS wma_start(void *cds_ctx) int status; WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -2754,7 +2754,7 @@ QDF_STATUS wma_start(void *cds_ctx) * Tx mgmt attach requires TXRX context which is not created * in FTM mode. So skip the TX mgmt attach. */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) goto end; #endif /* QCA_WIFI_FTM */ @@ -2766,7 +2766,7 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize log completion timeout */ qdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, - CDF_TIMER_TYPE_SW, + QDF_TIMER_TYPE_SW, wma_log_completion_timeout, wma_handle); if (qdf_status != QDF_STATUS_SUCCESS) { @@ -2842,7 +2842,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) tp_wma_handle wma_handle; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int i; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); WMA_LOGD("%s: Enter", __func__); @@ -2857,7 +2857,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) * Tx mgmt detach requires TXRX context which is not created * in FTM mode. So skip the TX mgmt detach. */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) { qdf_status = QDF_STATUS_SUCCESS; goto end; } @@ -2990,7 +2990,7 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3014,8 +3014,8 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) if (bcn) { if (bcn->dma_mapped) - cdf_nbuf_unmap_single(wma_handle->cdf_dev, - bcn->buf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(wma_handle->qdf_dev, + bcn->buf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); cdf_mem_free(bcn); wma_handle->interfaces[i].beacon = NULL; @@ -3040,7 +3040,7 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) cdf_mem_free(wma_handle->interfaces); /* free the wma_handle */ - cds_free_context(wma_handle->cds_context, CDF_MODULE_ID_WMA, + cds_free_context(wma_handle->cds_context, QDF_MODULE_ID_WMA, wma_handle); cdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); @@ -3064,7 +3064,7 @@ QDF_STATUS wma_wmi_work_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3101,7 +3101,7 @@ QDF_STATUS wma_close(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); /* validate the wma_handle */ if (NULL == wma_handle) { @@ -3133,7 +3133,7 @@ QDF_STATUS wma_close(void *cds_ctx) wma_handle->saved_wmi_init_cmd.buf = NULL; } - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -3164,18 +3164,18 @@ QDF_STATUS wma_close(void *cds_ctx) cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); cdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { - cdf_os_mem_free_consistent(wma_handle->cdf_dev, + cdf_os_mem_free_consistent(wma_handle->qdf_dev, wma_handle->mem_chunks[idx].len, wma_handle->mem_chunks[idx].vaddr, wma_handle->mem_chunks[idx].paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&(wma_handle->mem_chunks[idx])), memctx)); } #if defined(QCA_WIFI_FTM) /* Detach UTF and unregister the handler */ - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) wma_utf_detach(wma_handle); #endif /* QCA_WIFI_FTM */ @@ -3213,7 +3213,7 @@ static void wma_update_fw_config(tp_wma_handle wma_handle, */ /* Override the no. of max fragments as per platform configuration */ tgt_cap->wlan_resource_config.max_frag_entries = - CDF_MIN(QCA_OL_11AC_TX_MAX_FRAGS, + QDF_MIN(QCA_OL_11AC_TX_MAX_FRAGS, wma_handle->max_frag_entry); wma_handle->max_frag_entry = tgt_cap->wlan_resource_config.max_frag_entries; @@ -3237,7 +3237,7 @@ static uint32_t wma_alloc_host_mem_chunk(tp_wma_handle wma_handle, uint32_t req_id, uint32_t idx, uint32_t num_units, uint32_t unit_len) { - cdf_dma_addr_t paddr; + qdf_dma_addr_t paddr; if (!num_units || !unit_len) { return 0; } @@ -3245,9 +3245,9 @@ static uint32_t wma_alloc_host_mem_chunk(tp_wma_handle wma_handle, /** reduce the requested allocation by half until allocation succeeds */ while (wma_handle->mem_chunks[idx].vaddr == NULL && num_units) { wma_handle->mem_chunks[idx].vaddr = - cdf_os_mem_alloc_consistent(wma_handle->cdf_dev, + cdf_os_mem_alloc_consistent(wma_handle->qdf_dev, num_units * unit_len, &paddr, - cdf_get_dma_mem_context( + qdf_get_dma_mem_context( (&(wma_handle->mem_chunks[idx])), memctx)); if (wma_handle->mem_chunks[idx].vaddr == NULL) { @@ -3513,7 +3513,7 @@ static inline void wma_update_target_vht_cap(tp_wma_handle wh, static void wma_update_hdd_cfg(tp_wma_handle wma_handle) { struct wma_tgt_cfg tgt_cfg; - void *hdd_ctx = cds_get_context(CDF_MODULE_ID_HDD); + void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); cdf_mem_zero(&tgt_cfg, sizeof(struct wma_tgt_cfg)); tgt_cfg.reg_domain = wma_handle->reg_cap.eeprom_rd; @@ -3736,7 +3736,7 @@ void wma_init_scan_fw_mode_config(tp_wma_handle wma_handle, uint32_t scan_config, uint32_t fw_config) { - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -4221,7 +4221,7 @@ void wma_setneedshutdown(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); @@ -4245,7 +4245,7 @@ bool wma_needshutdown(void *cds_ctx) WMA_LOGD("%s: Enter", __func__); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); @@ -4291,7 +4291,7 @@ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int val) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int ret = -EIO; uint32_t pps_val; @@ -4625,7 +4625,7 @@ void wma_set_wifi_start_packet_stats(void *wma_handle, return; } - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); log_state = ATH_PKTLOG_ANI | ATH_PKTLOG_RCUPDATE | ATH_PKTLOG_RCFIND | ATH_PKTLOG_RX | ATH_PKTLOG_TX | ATH_PKTLOG_TEXT; @@ -4712,7 +4712,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) WMA_LOGD("msg->type = %x %s", msg->type, mac_trace_get_wma_msg_string(msg->type)); - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGP("%s: wma_handle is NULL", __func__); @@ -4960,16 +4960,16 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_RUNTIME_PM_SUSPEND_IND: wma_calculate_and_update_conn_state(wma_handle); - wma_suspend_req(wma_handle, CDF_RUNTIME_SUSPEND); + wma_suspend_req(wma_handle, QDF_RUNTIME_SUSPEND); break; case WMA_RUNTIME_PM_RESUME_IND: - wma_resume_req(wma_handle, CDF_RUNTIME_SUSPEND); + wma_resume_req(wma_handle, QDF_RUNTIME_SUSPEND); break; case WMA_WLAN_SUSPEND_IND: wma_update_conn_state(wma_handle, msg->bodyval); - wma_suspend_req(wma_handle, CDF_SYSTEM_SUSPEND); + wma_suspend_req(wma_handle, QDF_SYSTEM_SUSPEND); break; case WMA_8023_MULTICAST_LIST_REQ: wma_process_mcbc_set_filter_req(wma_handle, @@ -5108,7 +5108,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) cdf_mem_free(msg->bodyptr); break; case WMA_WLAN_RESUME_REQ: - wma_resume_req(wma_handle, CDF_SYSTEM_SUSPEND); + wma_resume_req(wma_handle, QDF_SYSTEM_SUSPEND); break; #ifdef WLAN_FEATURE_STATS_EXT @@ -5670,7 +5670,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) msg.bodyptr = iwcmd; if (QDF_STATUS_SUCCESS != - cds_mq_post_message(CDF_MODULE_ID_WMA, &msg)) { + cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!"); cdf_mem_free(iwcmd); return -EAGAIN; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 02cbc2ebe638..9a2278374774 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -200,10 +200,10 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, } if (bcn->dma_mapped) { - cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); bcn->dma_mapped = 0; } - ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, CDF_DMA_TO_DEVICE); + ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); if (ret != QDF_STATUS_SUCCESS) { cdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); @@ -268,7 +268,7 @@ int wma_beacon_swba_handler(void *handle, uint8_t *event, uint32_t len) swba_event = param_buf->fixed_param; vdev_map = swba_event->vdev_map; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); return -EINVAL; @@ -310,7 +310,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) WMA_LOGD("%s: Enter", __func__); param_buf = (WMI_PEER_STA_KICKOUT_EVENTID_param_tlvs *) event; kickout_event = param_buf->fixed_param; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); return -EINVAL; @@ -565,7 +565,7 @@ static inline void wma_get_link_probe_timeout(struct sAniSirGlobal *mac, void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) { uint32_t min_inactive_time, max_inactive_time, max_unresponsive_time; - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac) { WMA_LOGE("%s: Failed to get mac", __func__); @@ -610,7 +610,7 @@ void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) void wma_set_sta_sa_query_param(tp_wma_handle wma, uint8_t vdev_id) { - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t max_retries, retry_interval; wmi_buf_t buf; WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param *cmd; @@ -850,7 +850,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, } intr = &wma->interfaces[params->smesessionId]; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); @@ -1327,7 +1327,7 @@ void wma_update_cfg_params(tp_wma_handle wma, tSirMsgQ *cfgParam) return; } - pmac = cds_get_context(CDF_MODULE_ID_PE); + pmac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pmac) { WMA_LOGE("%s: Failed to get pmac", __func__); @@ -1806,7 +1806,7 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, */ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, tpSetBssKeyParams key_info, - struct cdf_mac_addr peer_macaddr) + struct qdf_mac_addr peer_macaddr) { struct wma_set_key_params key_params; wmi_buf_t buf; @@ -1904,7 +1904,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) WMA_LOGD("STA key setup"); /* Get the txRx Pdev handle */ - txrx_pdev = cds_get_context(CDF_MODULE_ID_TXRX); + txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!txrx_pdev) { WMA_LOGE("%s:Invalid txrx pdev handle", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -2086,7 +2086,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, WMI_VDEV_SET_WMM_PARAMS_CMDID)) goto fail; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (pdev) ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param); else @@ -2679,7 +2679,7 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, wmi_mgmt_tx_compl_event_fixed_param *cmpl_params; struct wmi_desc_t *wmi_desc; - ol_txrx_pdev_handle pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); param_buf = (WMI_MGMT_TX_COMPLETION_EVENTID_param_tlvs *) cmpl_event_params; @@ -2702,7 +2702,7 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, if (wmi_desc->nbuf) cdf_nbuf_unmap_single(pdev->osdev, wmi_desc->nbuf, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); if (wmi_desc->tx_cmpl_cb) wmi_desc->tx_cmpl_cb(wma_handle->mac_context, wmi_desc->nbuf, 1); @@ -2812,7 +2812,7 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, */ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int ret = -EIO; if (NULL == wma) { @@ -2953,7 +2953,7 @@ wma_is_ccmp_pn_replay_attack(void *cds_ctx, struct ieee80211_frame *wh, uint64_t *last_pn, new_pn; uint32_t *rmf_pn_replays; - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { WMA_LOGE("%s: Failed to find pdev", __func__); return true; @@ -3311,11 +3311,11 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) tp_wma_handle wma_handle; #ifdef QCA_WIFI_FTM - if (cds_get_conparam() == CDF_GLOBAL_FTM_MODE) + if (cds_get_conparam() == QDF_GLOBAL_FTM_MODE) return QDF_STATUS_SUCCESS; #endif - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); return QDF_STATUS_E_FAILURE; @@ -3350,7 +3350,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, tpSirBssDescription bss_desc_ptr)) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Failed to get WMA context", __func__); @@ -3371,7 +3371,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, QDF_STATUS wma_register_mgmt_frm_client( void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx) { - tp_wma_handle wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { WMA_LOGE("%s: Failed to get WMA context", __func__); diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 1bc71f8ae13c..def726d12568 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -93,7 +93,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) msg.type = eWNI_SME_OCB_SET_CONFIG_RSP; msg.bodyptr = resp; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post msg to SME")); cdf_mem_free(resp); @@ -691,7 +691,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_OCB_GET_TSF_TIMER_RSP; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); @@ -814,7 +814,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_GET_STATS_RSP; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); @@ -1012,7 +1012,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_UPDATE_NDL_RSP; msg.bodyptr = resp; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(resp); @@ -1058,7 +1058,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, msg.type = eWNI_SME_DCC_STATS_EVENT; msg.bodyptr = response; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); cdf_mem_free(response); diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 846e9e7878f1..1326e28e7724 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -125,7 +125,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, tp_wma_handle wma; struct wma_txrx_node *iface; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: wma is NULL", __func__); return -EIO; @@ -415,8 +415,8 @@ void wma_set_tx_power(WMA_HANDLE handle, int ret = -1; void *pdev; - if (tx_pwr_params->dev_mode == CDF_SAP_MODE || - tx_pwr_params->dev_mode == CDF_P2P_GO_MODE) { + if (tx_pwr_params->dev_mode == QDF_SAP_MODE || + tx_pwr_params->dev_mode == QDF_P2P_GO_MODE) { pdev = wma_find_vdev_by_addr(wma_handle, tx_pwr_params->bssId.bytes, &vdev_id); @@ -638,7 +638,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t rx_wake_policy; uint32_t tx_wake_threshold; uint32_t pspoll_count; @@ -655,7 +655,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Tx/Rx Data InActivity Timeout */ if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT"); cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME; } @@ -668,7 +668,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) @@ -681,7 +681,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Ps Poll Wake Policy */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -771,7 +771,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -802,7 +802,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t pspoll_count = WMA_DEFAULT_MAX_PSPOLL_BEFORE_WAKE; WMA_LOGE("Set QPower Force(1)/Normal(0) Sleep vdevId %d val %d", @@ -816,7 +816,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Get Configured Ps Poll Count */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -883,7 +883,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -1405,7 +1405,7 @@ int wma_pdev_temperature_evt_handler(void *handle, uint8_t *event, sme_msg.bodyptr = NULL; sme_msg.bodyval = wmi_event->value; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post get temperature ind msg")); } @@ -2183,13 +2183,13 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) int32_t ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ - struct sAniSirGlobal *mac = cds_get_context(CDF_MODULE_ID_PE); + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); /* Set Listen Interval */ if ((NULL == mac) || (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS)) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get value for listen interval"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -2263,7 +2263,7 @@ QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) { int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = - (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); + (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2293,7 +2293,7 @@ QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) { int ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = - (tp_wma_handle)cds_get_context(CDF_MODULE_ID_WMA); + (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 6dff2ec28f80..e4824c3bcd93 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -47,7 +47,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -188,7 +188,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, uint8_t SSID_num; int i; int len = sizeof(*cmd); - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGP("%s: pMac is NULL!", __func__); @@ -341,7 +341,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, * the dwell time. */ cmd->dwell_time_active = - CDF_MIN(scan_req->maxChannelTime, + QDF_MIN(scan_req->maxChannelTime, (WMA_CTS_DURATION_MS_MAX - WMA_ROAM_SCAN_CHANNEL_SWITCH_TIME)); cmd->dwell_time_passive = @@ -497,7 +497,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, if (wma_is_sap_active(wma_handle)) { SSID_num = cmd->num_ssids * cmd->num_bssid; cmd->repeat_probe_time = probe_time_dwell_time_map[ - CDF_MIN(SSID_num, + QDF_MIN(SSID_num, WMA_DWELL_TIME_PROBE_TIME_MAP_SIZE - 1)].probe_time; } @@ -1717,13 +1717,13 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, * duration. */ scan_params->burst_duration = - CDF_MAX(scan_params->burst_duration, + QDF_MAX(scan_params->burst_duration, scan_params->dwell_time_passive); } scan_params->min_rest_time = roam_req->NeighborScanTimerPeriod; scan_params->max_rest_time = roam_req->NeighborScanTimerPeriod; scan_params->repeat_probe_time = (roam_req->nProbes > 0) ? - CDF_MAX(scan_params->dwell_time_active / roam_req->nProbes, + QDF_MAX(scan_params->dwell_time_active / roam_req->nProbes, 1) : 0; scan_params->probe_spacing_time = 0; scan_params->probe_delay = 0; @@ -1964,7 +1964,7 @@ QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, roam_params->ssid_allowed_list[i].length); ssid_ptr->ssid_len = roam_params->ssid_allowed_list[i].length; WMA_LOGD("%s: SSID length=%d", __func__, ssid_ptr->ssid_len); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, (uint8_t *)ssid_ptr->ssid, ssid_ptr->ssid_len); ssid_ptr++; @@ -2118,7 +2118,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; wmi_start_scan_cmd_fixed_param scan_params; wmi_ap_profile ap_profile; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); uint32_t mode = 0; struct wma_txrx_node *intr = NULL; @@ -2285,7 +2285,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(scan_offload_rsp); - CDF_TRACE(CDF_MODULE_ID_WMA, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, "%s: Failed to post Scan Offload Rsp to UMAC", __func__); @@ -2589,13 +2589,13 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, cdf_mem_copy(roam_synch_ind_ptr->replay_ctr, key->replay_counter, SIR_REPLAY_CTR_LEN); WMA_LOGD("%s: KCK dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->kck, SIR_KCK_KEY_LEN); WMA_LOGD("%s: KEK dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->kek, SIR_KEK_KEY_LEN); WMA_LOGD("%s: Key Replay Counter dump", __func__); - CDF_TRACE_HEX_DUMP(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, key->replay_counter, SIR_REPLAY_CTR_LEN); } } @@ -2778,7 +2778,7 @@ int wma_rssi_breached_event_handler(void *handle, WMI_RSSI_BREACH_EVENTID_param_tlvs *param_buf; wmi_rssi_breach_event_fixed_param *event; struct rssi_breach_event rssi; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac context", __func__); @@ -2840,7 +2840,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, cdf_mem_set(&macQosInfoSta, sizeof(tSirMacQosInfoStation), 0); /* Roaming is done only for INFRA STA type. * So, ess will be one and ibss will be Zero */ - pMac = cds_get_context(CDF_MODULE_ID_PE); + pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); CDF_ASSERT(0); @@ -2848,7 +2848,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, } if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PRIVACY_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2857,7 +2857,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (val) selfCaps.privacy = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SHORT_PREAMBLE"); return QDF_STATUS_E_FAILURE; } @@ -2868,28 +2868,28 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, selfCaps.channelAgility = 0; if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortSlotTime = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11H_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.spectrumMgt = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_QOS_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.qos = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_APSD_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2900,7 +2900,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_BLOCK_ACK_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2913,7 +2913,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2922,7 +2922,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_AMPDU_PARAMS"); return QDF_STATUS_E_FAILURE; } @@ -2934,13 +2934,13 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_str(pMac, WNI_CFG_SUPPORTED_MCS_SET, (uint8_t *) roam_offload_params->mcsset, &val) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SUPPORTED_MCS_SET"); return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_EXT_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2950,7 +2950,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_TX_BF_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2958,7 +2958,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, nCfgValue8 = (uint8_t) nCfgValue; roam_offload_params->ht_txbf = nCfgValue8 & 0xFF; if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_AS_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2969,7 +2969,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, /* QOS Info */ if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_SP_LENGTH, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_MAX_SP_LENGTH"); return QDF_STATUS_E_FAILURE; } @@ -3167,7 +3167,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) sme_msg.bodyptr = ho_failure_ind; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME"); cdf_mem_free(ho_failure_ind); @@ -3247,7 +3247,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) status = QDF_STATUS_E_FAILURE; goto send_resp; } - pdev = cds_get_context(CDF_MODULE_ID_TXRX); + pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); status = QDF_STATUS_E_FAILURE; @@ -3390,10 +3390,10 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE; - len += sizeof(uint32_t) * CDF_MIN(pno->aNetworks[0].ucChannelCount, + len += sizeof(uint32_t) * QDF_MIN(pno->aNetworks[0].ucChannelCount, WMI_NLO_MAX_CHAN); len += sizeof(nlo_configured_parameters) * - CDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); + QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); len += sizeof(nlo_channel_prediction_cfg); buf = wmi_buf_alloc(wma->wmi_handle, len); @@ -3426,7 +3426,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - cmd->no_of_ssids = CDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); + cmd->no_of_ssids = QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); WMA_LOGD("SSID count : %d", cmd->no_of_ssids); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, cmd->no_of_ssids * sizeof(nlo_configured_parameters)); @@ -3467,7 +3467,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters); /* Copy channel info */ - cmd->num_of_channels = CDF_MIN(pno->aNetworks[0].ucChannelCount, + cmd->num_of_channels = QDF_MIN(pno->aNetworks[0].ucChannelCount, WMI_NLO_MAX_CHAN); WMA_LOGD("Channel count: %d", cmd->num_of_channels); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, @@ -4179,7 +4179,7 @@ int wma_extscan_start_stop_event_handler(void *handle, wmi_extscan_start_stop_event_fixed_param *event; struct sir_extscan_generic_response *extscan_ind; uint16_t event_type; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4280,7 +4280,7 @@ int wma_extscan_operations_event_handler(void *handle, WMI_EXTSCAN_OPERATION_EVENTID_param_tlvs *param_buf; wmi_extscan_operation_event_fixed_param *oprn_event; tSirExtScanOnScanEventIndParams *oprn_ind; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4355,7 +4355,7 @@ int wma_extscan_table_usage_event_handler(void *handle, WMI_EXTSCAN_TABLE_USAGE_EVENTID_param_tlvs *param_buf; wmi_extscan_table_usage_event_fixed_param *event; tSirExtScanResultsAvailableIndParams *tbl_usg_ind; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4409,7 +4409,7 @@ int wma_extscan_capabilities_event_handler(void *handle, wmi_extscan_wlan_change_monitor_capabilities *src_change; struct ext_scan_capabilities_response *dest_capab; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4515,7 +4515,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, tSirWifiScanResult *dest_ap; wmi_extscan_wlan_descriptor *src_hotlist; int numap, j, ap_found = 0; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); @@ -4782,7 +4782,7 @@ int wma_extscan_cached_results_event_handler(void *handle, wmi_extscan_rssi_info *src_rssi; int numap, i, moredata, scan_ids_cnt, buf_len; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4891,7 +4891,7 @@ int wma_extscan_change_results_event_handler(void *handle, int count = 0; int moredata; int rssi_num = 0; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s: Invalid pMac", __func__); return -EINVAL; @@ -4979,7 +4979,7 @@ int wma_passpoint_match_event_handler(void *handle, struct wifi_passpoint_match *dest_match; tSirWifiScanResult *dest_ap; uint8_t *buf_ptr; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac", __func__); @@ -5058,7 +5058,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, wmi_extscan_wlan_descriptor *src_hotlist; int numap, j; bool ssid_found = false; - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac", __func__); @@ -5542,7 +5542,7 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, * requests if the buffer reaches the maximum request size */ while (index < numap) { - min_entries = CDF_MIN(num_entries, numap); + min_entries = QDF_MIN(num_entries, numap); len += min_entries * sizeof(wmi_extscan_hotlist_entry); buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { @@ -6154,7 +6154,7 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, * nlo_configured_parameters(nlo_list) */ len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; len += sizeof(nlo_configured_parameters) * - CDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); + QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); len += WMI_TLV_HDR_SIZE; /* TLV for channel_list */ len += WMI_TLV_HDR_SIZE; /* TLV for channel prediction cfg*/ @@ -6176,7 +6176,7 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - cmd->no_of_ssids = CDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); + cmd->no_of_ssids = QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); WMA_LOGD("SSID count: %d", cmd->no_of_ssids); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, cmd->no_of_ssids * sizeof(nlo_configured_parameters)); @@ -6671,13 +6671,13 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) cds_msg.type = eWNI_SME_CANDIDATE_FOUND_IND; cds_msg.bodyptr = candidate_ind; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, FL("posting candidate ind to SME")); if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(candidate_ind); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, FL("Failed to post candidate ind to SME")); } } @@ -6812,7 +6812,7 @@ QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, QDF_STATUS wma_get_scan_id(uint32_t *scan_id) { - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!scan_id) { WMA_LOGE("Scan_id is NULL"); @@ -6863,9 +6863,9 @@ QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, cmd->vdev_id = req->session_id; cdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, - CDF_IPV4_ADDR_SIZE); + QDF_IPV4_ADDR_SIZE); cdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr, - CDF_IPV6_ADDR_SIZE); + QDF_IPV6_ADDR_SIZE); WMI_CHAR_ARRAY_TO_MAC_ADDR(req->gw_mac_addr.bytes, &cmd->inet_gw_mac_addr); cmd->max_retries = req->max_retries; diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 3d72314f1278..cac3d6d5463b 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -46,7 +46,7 @@ #include "wlan_tgt_def_config.h" #include "cdf_nbuf.h" -#include "cdf_types.h" +#include "qdf_types.h" #include "ol_txrx_api.h" #include "cdf_memory.h" #include "ol_txrx_types.h" @@ -413,9 +413,9 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, buf_ptr = buf_ptr + sizeof(wmi_wlan_profile_ctx_t) + WMI_TLV_HDR_SIZE; profile_data = (wmi_wlan_profile_t *) buf_ptr; entries = profile_ctx->bin_count; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Profile data stats\n"); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "TOT: %d\n" "tx_msdu_cnt: %d\n" "tx_mpdu_cnt: %d\n" @@ -434,7 +434,7 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, for (i = 0; i < entries; i++) { if (i == WMI_WLAN_PROFILE_MAX_BIN_CNT) break; - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, "Profile ID: %d\n" "Profile Count: %d\n" "Profile TOT: %d\n" @@ -483,7 +483,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, size_t peer_info_size, peer_stats_size, rate_stats_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -634,7 +634,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, size_t radio_stats_size, chan_stats_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -985,7 +985,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, size_t link_stats_size, ac_stats_size, iface_info_size; size_t link_stats_results_size; - tpAniSirGlobal pMac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGD("%s: NULL pMac ptr. Exiting", __func__); @@ -1268,7 +1268,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, sme_msg.bodyptr = p_snr_req; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post snr ind msg", __func__); cdf_mem_free(p_snr_req); @@ -1386,7 +1386,7 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, sme_msg.bodyptr = pGetLinkStatus; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post link status ind msg", __func__); cdf_mem_free(pGetLinkStatus); @@ -1537,7 +1537,7 @@ QDF_STATUS wma_send_link_speed(uint32_t link_speed) sme_msg.bodyptr = ls_ind; sme_msg.bodyval = 0; - qdf_status = cds_mq_post_message(CDF_MODULE_ID_SME, &sme_msg); + qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post linkspeed ind msg", __func__); @@ -1585,7 +1585,7 @@ int wma_link_speed_event_handler(void *handle, uint8_t *cmd_param_info, QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - void *mac = cds_get_context(CDF_MODULE_ID_PE); + void *mac = cds_get_context(QDF_MODULE_ID_PE); WMA_LOGD("%s: Enter", __func__); @@ -1941,7 +1941,7 @@ int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, break; default: - cdf_print("%s %d Invalid value %d\n", + qdf_print("%s %d Invalid value %d\n", __func__, __LINE__, value); return 0; } @@ -2147,7 +2147,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) uint8_t *buf; uint32_t buf_size; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2201,7 +2201,7 @@ uint8_t *wma_get_vdev_address_by_vdev_id(uint8_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2225,7 +2225,7 @@ struct wma_txrx_node *wma_get_interface_by_vdev_id(uint8_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return NULL; @@ -2550,7 +2550,7 @@ wma_process_ftm_command(tp_wma_handle wma_handle, if (!msg_buffer) return QDF_STATUS_E_INVAL; - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE) { + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { WMA_LOGE("FTM command issued in non-FTM mode"); cdf_mem_free(msg_buffer->data); cdf_mem_free(msg_buffer); @@ -2585,7 +2585,7 @@ QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, uint32_t versionBufferSize) { tp_wma_handle wma_handle; - wma_handle = cds_get_context(CDF_MODULE_ID_WMA); + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma_handle) { WMA_LOGE("%s: Failed to get wma", __func__); @@ -2748,7 +2748,7 @@ int8_t wma_get_hw_mode_idx_from_dbs_hw_list(enum hw_mode_ss_config mac0_ss, uint32_t mac0_tx_ss, mac0_rx_ss; uint32_t mac1_tx_ss, mac1_rx_ss; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2786,7 +2786,7 @@ QDF_STATUS wma_get_hw_mode_from_idx(uint32_t idx, tp_wma_handle wma; uint32_t param; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -2827,7 +2827,7 @@ int8_t wma_get_num_dbs_hw_modes(void) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2847,7 +2847,7 @@ bool wma_is_hw_dbs_capable(void) tp_wma_handle wma; uint32_t param, i, found = 0; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -2898,7 +2898,7 @@ bool wma_is_hw_agile_dfs_capable(void) tp_wma_handle wma; uint32_t param, i, found = 0; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -2950,7 +2950,7 @@ int8_t wma_get_mac_id_of_vdev(uint32_t vdev_id) { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return -EINVAL; @@ -2980,7 +2980,7 @@ QDF_STATUS wma_get_old_and_new_hw_index(uint32_t *old_hw_mode_index, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_INVAL; @@ -3008,7 +3008,7 @@ void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id, tp_wma_handle wma; uint32_t param; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return; @@ -3073,7 +3073,7 @@ QDF_STATUS wma_get_dbs_hw_modes(bool *one_by_one_dbs, bool *two_by_two_dbs) } - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3192,7 +3192,7 @@ bool wma_is_dbs_enable(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -3222,7 +3222,7 @@ bool wma_is_agile_dfs_enable(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return false; @@ -3265,7 +3265,7 @@ QDF_STATUS wma_get_updated_scan_config(uint32_t *scan_config, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3300,7 +3300,7 @@ QDF_STATUS wma_get_updated_fw_mode_config(uint32_t *fw_mode_config, { tp_wma_handle wma; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return QDF_STATUS_E_FAILURE; @@ -3329,7 +3329,7 @@ bool wma_get_dbs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3355,7 +3355,7 @@ bool wma_get_agile_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3381,7 +3381,7 @@ bool wma_get_dbs_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3407,7 +3407,7 @@ bool wma_get_dbs_plus_agile_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3433,7 +3433,7 @@ bool wma_get_single_mac_scan_with_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3453,7 +3453,7 @@ bool wma_get_single_mac_scan_with_dfs_config(void) */ bool wma_is_dual_mac_disabled_in_ini(void) { - tpAniSirGlobal mac = cds_get_context(CDF_MODULE_ID_PE); + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); if (!mac) { WMA_LOGE("%s: Invalid mac pointer", __func__); @@ -3481,7 +3481,7 @@ bool wma_get_prev_dbs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3507,7 +3507,7 @@ bool wma_get_prev_agile_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3533,7 +3533,7 @@ bool wma_get_prev_dbs_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3559,7 +3559,7 @@ bool wma_get_prev_dbs_plus_agile_scan_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3586,7 +3586,7 @@ bool wma_get_prev_single_mac_scan_with_dfs_config(void) if (wma_is_dual_mac_disabled_in_ini()) return false; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); /* We take that it is disabled and proceed */ @@ -3622,7 +3622,7 @@ bool wma_is_scan_simultaneous_capable(void) uint32_t wma_get_vht_ch_width(void) { uint32_t fw_ch_wd = WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ; - tp_wma_handle wm_hdl = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wm_hdl = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wm_hdl) return fw_ch_wd; diff --git a/core/wma/src/wma_utils_ut.c b/core/wma/src/wma_utils_ut.c index d36c6ca54c8f..845a39b36469 100644 --- a/core/wma/src/wma_utils_ut.c +++ b/core/wma/src/wma_utils_ut.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -50,7 +50,7 @@ void wma_set_dbs_capability_ut(uint32_t dbs) tp_wma_handle wma; uint32_t i; - wma = cds_get_context(CDF_MODULE_ID_WMA); + wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { WMA_LOGE("%s: Invalid WMA handle", __func__); return; diff --git a/core/wmi/wmi_tlv_helper.c b/core/wmi/wmi_tlv_helper.c index 0e35755536c3..f965f44b0131 100644 --- a/core/wmi/wmi_tlv_helper.c +++ b/core/wmi/wmi_tlv_helper.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -49,7 +49,7 @@ #define WMITLV_GET_CMD_EVT_ATTRB_LIST(id) \ WMITLV_SET_ATTRB0(id), \ - WMITLV_TABLE(id,SET_TLV_ATTRIB,NULL,0) + WMITLV_TABLE(id, SET_TLV_ATTRIB, NULL, 0) A_UINT32 cmd_attr_list[] = { WMITLV_ALL_CMD_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) @@ -60,7 +60,7 @@ A_UINT32 evt_attr_list[] = { }; #ifdef NO_DYNAMIC_MEM_ALLOC -static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf = NULL; +static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf; A_UINT32 g_wmi_static_max_cmd_param_tlvs = 0; #endif @@ -101,10 +101,10 @@ A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id, if (is_cmd_id) { pAttrArrayList = &cmd_attr_list[0]; - num_entries = CDF_ARRAY_SIZE(cmd_attr_list); + num_entries = QDF_ARRAY_SIZE(cmd_attr_list); } else { pAttrArrayList = &evt_attr_list[0]; - num_entries = CDF_ARRAY_SIZE(evt_attr_list); + num_entries = QDF_ARRAY_SIZE(evt_attr_list); } for (i = 0; i < num_entries; i++) { @@ -175,6 +175,7 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, { wmitlv_attributes_struc attr_struct_ptr; A_UINT32 buf_idx = 0; + A_UINT32 ret = -1; A_UINT32 tlv_index = 0; A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; A_UINT32 expected_num_tlvs, expected_tlv_len; @@ -345,8 +346,7 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, || (curr_tlv_tag == WMITLV_TAG_ARRAY_BYTE) || (curr_tlv_tag == - WMITLV_TAG_ARRAY_FIXED_STRUC)) - { + WMITLV_TAG_ARRAY_FIXED_STRUC)) { /* Nothing to verify here */ } else { wmi_tlv_print_error @@ -392,9 +392,9 @@ wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, __func__, wmi_cmd_event_id, tlv_index, expected_num_tlvs); } - return (0); + return 0; Error_wmitlv_check_tlv_params: - return (-1); + return ret; } /* @@ -407,9 +407,9 @@ wmitlv_check_event_tlv_params(void *os_handle, void *param_struc_ptr, A_UINT32 param_buf_len, A_UINT32 wmi_cmd_event_id) { A_UINT32 is_cmd_id = 0; - return (wmitlv_check_tlv_params + return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id)); + wmi_cmd_event_id); } /* @@ -423,15 +423,15 @@ wmitlv_check_command_tlv_params(void *os_handle, void *param_struc_ptr, A_UINT32 wmi_cmd_event_id) { A_UINT32 is_cmd_id = 1; - return (wmitlv_check_tlv_params + return wmitlv_check_tlv_params (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id)); + wmi_cmd_event_id); } /* * Helper Function to vaidate the TLV's coming for an event/command and also pads data to TLV's if necessary * Return 0 if success. - <0 if failure. + * <0 if failure. */ static int wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, @@ -440,6 +440,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, { wmitlv_attributes_struc attr_struct_ptr; A_UINT32 buf_idx = 0; + A_UINT32 ret = -1; A_UINT32 tlv_index = 0; A_UINT32 num_of_elems = 0; int tlv_size_diff = 0; @@ -861,7 +862,7 @@ wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, buf_idx += curr_tlv_len + num_padding_bytes; } - return (0); + return 0; Error_wmitlv_check_and_pad_tlvs: if (is_cmd_id) { wmitlv_free_allocated_command_tlvs(wmi_cmd_event_id, @@ -871,13 +872,13 @@ Error_wmitlv_check_and_pad_tlvs: wmi_cmd_struct_ptr); } *wmi_cmd_struct_ptr = NULL; - return (-1); + return ret; } /* * Helper Function to validate and pad(if necessary) for incoming WMI Event TLVs * Return 0 if success. - <0 if failure. + * <0 if failure. */ int wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, @@ -886,15 +887,15 @@ wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, void **wmi_cmd_struct_ptr) { A_UINT32 is_cmd_id = 0; - return (wmitlv_check_and_pad_tlvs + return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr)); + wmi_cmd_event_id, wmi_cmd_struct_ptr); } /* * Helper Function to validate and pad(if necessary) for incoming WMI Command TLVs * Return 0 if success. - <0 if failure. + * <0 if failure. */ int wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, @@ -903,9 +904,9 @@ wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, void **wmi_cmd_struct_ptr) { A_UINT32 is_cmd_id = 1; - return (wmitlv_check_and_pad_tlvs + return wmitlv_check_and_pad_tlvs (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr)); + wmi_cmd_event_id, wmi_cmd_struct_ptr); } /* @@ -927,10 +928,9 @@ static void wmitlv_free_allocated_tlvs(A_UINT32 is_cmd_id, /* macro to free that previously allocated memory for this TLV. When (op==FREE_TLV_ELEM). */ #define WMITLV_OP_FREE_TLV_ELEM_macro(param_ptr, param_len, wmi_cmd_event_id, elem_tlv_tag, elem_struc_type, elem_name, var_len, arr_size) \ - if ((((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->WMITLV_FIELD_BUF_IS_ALLOCATED(elem_name)) && \ - (((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->elem_name != NULL)) \ - { \ - wmi_tlv_os_mem_free(((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id) *)ptr)->elem_name); \ + if ((((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->WMITLV_FIELD_BUF_IS_ALLOCATED(elem_name)) && \ + (((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name != NULL)) { \ + wmi_tlv_os_mem_free(((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name); \ } #define WMITLV_FREE_TLV_ELEMS(id) \ diff --git a/core/wmi/wmi_tlv_platform.c b/core/wmi/wmi_tlv_platform.c index f3c20be4f05b..3351b01510e3 100644 --- a/core/wmi/wmi_tlv_platform.c +++ b/core/wmi/wmi_tlv_platform.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -44,7 +44,7 @@ Pronto and its future platforms) specific APIs */ #define dummy_print(fmt, ...) {} #define wmi_tlv_print_verbose dummy_print -#define wmi_tlv_print_error cdf_print +#define wmi_tlv_print_error qdf_print #define wmi_tlv_OS_MEMCPY OS_MEMCPY #define wmi_tlv_OS_MEMZERO OS_MEMZERO #define wmi_tlv_OS_MEMMOVE OS_MEMMOVE diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 8bf451ce76df..5dd95378ae2f 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -817,7 +817,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, if (wmitlv_check_command_tlv_params(NULL, buf_ptr, len, cmd_id) != 0) { - cdf_print + qdf_print ("\nERROR: %s: Invalid WMI Parameter Buffer for Cmd:%d\n", __func__, cmd_id); return -1; @@ -834,7 +834,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, qdf_atomic_inc(&wmi_handle->pending_cmds); if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { - scn = cds_get_context(CDF_MODULE_ID_HIF); + scn = cds_get_context(QDF_MODULE_ID_HIF); pr_err("\n%s: hostcredits = %d\n", __func__, wmi_get_host_credits(wmi_handle)); htc_dump_counter_info(wmi_handle->htc_handle); @@ -1266,7 +1266,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) { wmi_buf_t buf; - CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cds_flush_work(&wmi_handle->rx_event_work); cdf_spin_lock_bh(&wmi_handle->eventq_lock); @@ -1276,7 +1276,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); } cdf_spin_unlock_bh(&wmi_handle->eventq_lock); - CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, "Done: %s", __func__); } diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 4fa05bbb57e9..75c69b794e58 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -72,11 +72,11 @@ #define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len)) #define A_LOGGER(mask, mod, args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF_LOG(args ...) \ - CDF_TRACE(CDF_MODULE_ID_CDF, CDF_TRACE_LEVEL_ERROR, ## args) + CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) #define A_SNPRINTF(buf, len, args ...) snprintf (buf, len, args) /* @@ -132,13 +132,13 @@ typedef struct timer_list A_TIMER; extern unsigned int panic_on_assert; #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ if (panic_on_assert) panic(# expr); \ } #else #define A_ASSERT(expr) \ if (!(expr)) { \ - printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,# expr); \ + printk(KERN_ALERT "Debug Assert Caught, File %s, Line: %d, Test:%s \n", __FILE__, __LINE__, # expr); \ } #endif #else @@ -170,13 +170,13 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T; a_netbuf_push(bufPtr, len) #define A_NETBUF_PUT(bufPtr, len) \ a_netbuf_put(bufPtr, len) -#define A_NETBUF_TRIM(bufPtr,len) \ +#define A_NETBUF_TRIM(bufPtr, len) \ a_netbuf_trim(bufPtr, len) #define A_NETBUF_PULL(bufPtr, len) \ a_netbuf_pull(bufPtr, len) #define A_NETBUF_HEADROOM(bufPtr) \ a_netbuf_headroom(bufPtr) -#define A_NETBUF_SETLEN(bufPtr,len) \ +#define A_NETBUF_SETLEN(bufPtr, len) \ a_netbuf_setlen(bufPtr, len) /* Add data to end of a buffer */ @@ -197,7 +197,7 @@ typedef struct sk_buff_head A_NETBUF_QUEUE_T; /* View data as "size" contiguous bytes of type "t" */ #define A_NETBUF_VIEW_DATA(bufPtr, t, size) \ - (t )( ((struct skbuf *)(bufPtr))->data) + (t)(((struct skbuf *)(bufPtr))->data) /* return the beginning of the headroom for the buffer */ #define A_NETBUF_HEAD(bufPtr) \ -- cgit v1.2.3 From a37b5b783a4c5e20f666c83c1be3abcfb05b18e3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sun, 21 Feb 2016 14:53:42 +0530 Subject: qcacld-3.0: Add QDF lock API's Replace CDF lock API's with QDF lock API's. Change-Id: I7c4a59920e17915f077c87457c513e763738c062 CRs-Fixed: 981188 --- core/bmi/inc/ol_if_athvar.h | 2 +- core/cdf/inc/cdf_lock.h | 306 ---------- core/cdf/inc/cdf_mc_timer.h | 4 +- core/cdf/inc/cdf_nbuf.h | 2 +- core/cdf/inc/osdep.h | 2 +- core/cdf/src/cdf_lock.c | 648 --------------------- core/cdf/src/cdf_mc_timer.c | 26 +- core/cdf/src/cdf_memory.c | 18 +- core/cdf/src/cdf_nbuf.c | 2 +- core/cdf/src/i_cdf_lock.h | 255 -------- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/cds/inc/cds_sched.h | 6 +- core/cds/src/cds_api.c | 12 +- core/cds/src/cds_concurrency.c | 66 +-- core/cds/src/cds_packet.c | 14 +- core/dp/htt/htt_internal.h | 10 +- core/dp/htt/htt_t2h.c | 8 +- core/dp/htt/htt_types.h | 4 +- core/dp/ol/inc/ol_txrx_dbg.h | 4 +- core/dp/txrx/ol_rx_reorder_timeout.c | 4 +- core/dp/txrx/ol_rx_reorder_timeout.h | 6 +- core/dp/txrx/ol_tx.c | 32 +- core/dp/txrx/ol_tx.h | 2 +- core/dp/txrx/ol_tx_desc.c | 32 +- core/dp/txrx/ol_tx_queue.c | 18 +- core/dp/txrx/ol_tx_send.c | 30 +- core/dp/txrx/ol_txrx.c | 181 +++--- core/dp/txrx/ol_txrx_flow_control.c | 92 +-- core/dp/txrx/ol_txrx_internal.h | 8 +- core/dp/txrx/ol_txrx_peer_find.c | 24 +- core/dp/txrx/ol_txrx_types.h | 28 +- core/hdd/inc/wlan_hdd_lro.h | 6 +- core/hdd/inc/wlan_hdd_main.h | 16 +- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- core/hdd/src/wlan_hdd_ftm.c | 34 +- core/hdd/src/wlan_hdd_hostapd.c | 12 +- core/hdd/src/wlan_hdd_ipa.c | 214 +++---- core/hdd/src/wlan_hdd_lro.c | 32 +- core/hdd/src/wlan_hdd_main.c | 56 +- core/hdd/src/wlan_hdd_p2p.c | 20 +- core/hdd/src/wlan_hdd_power.c | 6 +- core/hdd/src/wlan_hdd_scan.c | 30 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 2 +- core/hdd/src/wlan_hdd_tx_rx.c | 2 +- core/mac/inc/ani_global.h | 4 +- core/mac/src/pe/lim/lim_api.c | 14 +- core/mac/src/pe/lim/lim_process_message_queue.c | 8 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 16 +- core/sap/dfs/inc/dfs.h | 22 +- core/sap/dfs/src/dfs.c | 4 +- core/sap/dfs/src/dfs_fcc_bin5.c | 24 +- core/sap/dfs/src/dfs_misc.c | 24 +- core/sap/dfs/src/dfs_phyerr_tlv.c | 8 +- core/sap/dfs/src/dfs_process_phyerr.c | 34 +- core/sap/dfs/src/dfs_process_radarevent.c | 18 +- core/sap/src/sap_internal.h | 2 +- core/sap/src/sap_module.c | 8 +- core/sme/inc/csr_internal.h | 2 +- core/sme/inc/csr_link_list.h | 4 +- core/sme/inc/p2p_api.h | 2 +- core/sme/inc/sme_api.h | 2 +- core/sme/inc/sme_inside.h | 2 +- core/sme/inc/sme_internal.h | 4 +- core/sme/inc/sme_power_save.h | 2 +- core/sme/inc/sme_qos_api.h | 2 +- core/sme/inc/sme_qos_internal.h | 2 +- core/sme/inc/sme_rrm_api.h | 2 +- core/sme/inc/sme_rrm_internal.h | 2 +- core/sme/src/common/sme_api.c | 12 +- core/sme/src/csr/csr_link_list.c | 10 +- core/utils/epping/inc/epping_internal.h | 4 +- core/utils/epping/inc/epping_main.h | 4 +- core/utils/epping/src/epping_helper.c | 14 +- core/utils/epping/src/epping_tx.c | 12 +- core/utils/epping/src/epping_txrx.c | 4 +- core/wma/inc/wma.h | 18 +- core/wma/inc/wma_dfs_interface.h | 8 +- core/wma/src/wma_data.c | 16 +- core/wma/src/wma_dev_if.c | 82 +-- core/wma/src/wma_features.c | 24 +- core/wma/src/wma_main.c | 54 +- core/wma/src/wma_mgmt.c | 14 +- core/wma/src/wma_scan_roam.c | 10 +- core/wma/src/wma_utils.c | 6 +- core/wmi/wmi_unified.c | 40 +- core/wmi/wmi_unified_priv.h | 4 +- 87 files changed, 810 insertions(+), 2020 deletions(-) delete mode 100644 core/cdf/inc/cdf_lock.h delete mode 100644 core/cdf/src/cdf_lock.c delete mode 100644 core/cdf/src/i_cdf_lock.h diff --git a/core/bmi/inc/ol_if_athvar.h b/core/bmi/inc/ol_if_athvar.h index cb7774c2a31a..c9d45d81abdb 100644 --- a/core/bmi/inc/ol_if_athvar.h +++ b/core/bmi/inc/ol_if_athvar.h @@ -33,7 +33,7 @@ #include #include "qdf_types.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "wmi_unified_api.h" #include "htc_api.h" #include "bmi_msg.h" diff --git a/core/cdf/inc/cdf_lock.h b/core/cdf/inc/cdf_lock.h deleted file mode 100644 index e1f1846d3def..000000000000 --- a/core/cdf/inc/cdf_lock.h +++ /dev/null @@ -1,306 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_LOCK_H) -#define __CDF_LOCK_H - -/** - * - * @file cdf_lock.h - * - * @brief Connectivity driver framework (CDF) lock APIs - * - * Definitions for CDF locks - * - */ - -/* Include Files */ -#include "qdf_status.h" -#include "i_cdf_lock.h" - -/* Preprocessor definitions and constants */ - -/* Type declarations */ -/** - * @brief Platform spinlock object - */ -typedef __cdf_spinlock_t cdf_spinlock_t; -/** - * @brief Platform mutex object - */ -typedef __cdf_semaphore_t cdf_semaphore_t; - -/* Function declarations and documenation */ - -/** - * cdf_semaphore_init() - initialize a semaphore - * @m: Semaphore to initialize - * - * Return: None - */ - -static inline void cdf_semaphore_init(cdf_semaphore_t *m) -{ - __cdf_semaphore_init(m); -} - -/** - * cdf_semaphore_acquire() - take the semaphore - * @m: Semaphore to take - * - * Return: None - */ -static inline int cdf_semaphore_acquire(qdf_device_t osdev, cdf_semaphore_t *m) -{ - return __cdf_semaphore_acquire(osdev, m); -} - -/** - * cdf_semaphore_release () - give the semaphore - * @m: Semaphore to give - * - * Return: None - */ -static inline void -cdf_semaphore_release(qdf_device_t osdev, cdf_semaphore_t *m) -{ - __cdf_semaphore_release(osdev, m); -} - -/** - * cdf_mutex_init() - initialize a CDF lock - * @lock: Pointer to the opaque lock object to initialize - * - * cdf_mutex_init() function initializes the specified lock. Upon - * successful initialization, the state of the lock becomes initialized - * and unlocked. - * - * A lock must be initialized by calling cdf_mutex_init() before it - * may be used in any other lock functions. - * - * Attempting to initialize an already initialized lock results in - * a failure. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock); - -/** - * cdf_mutex_acquire () - acquire a CDF lock - * @lock: Pointer to the opaque lock object to acquire - * - * A lock object is acquired by calling cdf_mutex_acquire(). If the lock - * is already locked, the calling thread shall block until the lock becomes - * available. This operation shall return with the lock object referenced by - * lock in the locked state with the calling thread as its owner. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock); - -/** - * cdf_mutex_release() - release a CDF lock - * @lock: Pointer to the opaque lock object to be released - * - * cdf_mutex_release() function shall release the lock object - * referenced by 'lock'. - * - * If a thread attempts to release a lock that it unlocked or is not - * initialized, an error is returned. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock); - -/** - * cdf_mutex_destroy() - destroy a CDF lock - * @lock: Pointer to the opaque lock object to be destroyed - * - * cdf_mutex_destroy() function shall destroy the lock object - * referenced by lock. After a successful return from \a cdf_mutex_destroy() - * the lock object becomes, in effect, uninitialized. - * - * A destroyed lock object can be reinitialized using cdf_mutex_init(); - * the results of otherwise referencing the object after it has been destroyed - * are undefined. Calls to CDF lock functions to manipulate the lock such - * as cdf_mutex_acquire() will fail if the lock is destroyed. Therefore, - * don't use the lock after it has been destroyed until it has - * been re-initialized. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock); - -/** - * cdf_spinlock_init() - initialize a spinlock - * @lock: Spinlock object pointer - * - * Return: None - */ -static inline void cdf_spinlock_init(cdf_spinlock_t *lock) -{ - __cdf_spinlock_init(lock); -} - -/** - * cdf_spinlock_destroy() - delete a spinlock - * @lock: Spinlock object pointer - * - * Return: None - */ -static inline void cdf_spinlock_destroy(cdf_spinlock_t *lock) -{ - __cdf_spinlock_destroy(lock); -} - -/** - * cdf_spin_lock_bh() - locks the spinlock semaphore in soft irq context - * @lock: Spinlock object pointer - * - * Return: None - */ -static inline void cdf_spin_lock_bh(cdf_spinlock_t *lock) -{ - __cdf_spin_lock_bh(lock); -} - -/** - * cdf_spin_lock_bh() - unlocks the spinlock semaphore in soft irq context - * @lock: Spinlock object pointer - * - * Return: None - */ -static inline void cdf_spin_unlock_bh(cdf_spinlock_t *lock) -{ - __cdf_spin_unlock_bh(lock); -} - -/** - * cdf_wake_lock_init() - initializes a CDF wake lock - * @lock: The wake lock to initialize - * @name: Name of wake lock - * - * Return: - * CDF status success : if wake lock is initialized - * CDF status fialure : if wake lock was not initialized - */ -QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *lock, const char *name); - -/** - * cdf_wake_lock_acquire() - acquires a wake lock - * @lock: The wake lock to acquire - * @reason: Reason for taking wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason); - -/** - * cdf_wake_lock_timeout_acquire() - acquires a wake lock with a timeout - * @lock: The wake lock to acquire - * @reason: Reason for taking wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, - uint32_t msec, uint32_t reason); - -/** - * cdf_wake_lock_release() - releases a wake lock - * @lock: the wake lock to release - * @@reason: Reason for taking wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason); - -/** - * cdf_wake_lock_destroy() - destroys a wake lock - * @lock: The wake lock to destroy - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock); - -struct hif_pm_runtime_lock; -typedef struct hif_pm_runtime_lock *cdf_runtime_lock_t; - -QDF_STATUS cdf_runtime_pm_get(void); -QDF_STATUS cdf_runtime_pm_put(void); -QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock); -QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock); -cdf_runtime_lock_t cdf_runtime_lock_init(const char *name); -void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock); - -/** - * cdf_spinlock_acquire() - acquires a spin lock - * @lock: Spin lock to acquire - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock); - -/** - * cdf_spinlock_release() - release a spin lock - * @lock: Spin lock to release - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status fialure : if wake lock was not acquired - */ -QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock); - -#define cdf_spin_lock(_lock) __cdf_spin_lock(_lock) -#define cdf_spin_unlock(_lock) __cdf_spin_unlock(_lock) -#define cdf_spin_lock_irqsave(_lock) __cdf_spin_lock_irqsave(_lock) -#define cdf_spin_unlock_irqrestore(_lock) \ - __cdf_spin_unlock_irqrestore(_lock) -#define cdf_spin_lock_irq(_pLock, _flags) __cdf_spin_lock_irq(_pLock, _flags) -#define cdf_spin_unlock_irq(_pLock, _flags) \ - __cdf_spin_unlock_irq(_pLock, _flags) - -#define cdf_in_softirq() __cdf_in_softirq() - -#endif /* __CDF_LOCK_H */ diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h index e93b9b6dce23..7f7744304902 100644 --- a/core/cdf/inc/cdf_mc_timer.h +++ b/core/cdf/inc/cdf_mc_timer.h @@ -37,7 +37,7 @@ /* Include Files */ #include #include -#include +#include #include #ifdef TIMER_MANAGER @@ -79,7 +79,7 @@ typedef struct cdf_mc_timer_s { cdf_mc_timer_platform_t platformInfo; cdf_mc_timer_callback_t callback; void *userData; - cdf_mutex_t lock; + qdf_mutex_t lock; QDF_TIMER_TYPE type; CDF_TIMER_STATE state; } cdf_mc_timer_t; diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 403a09edcda0..4bfb678f2344 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index 6a7bce092536..2760566efcc8 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/cdf/src/cdf_lock.c b/core/cdf/src/cdf_lock.c deleted file mode 100644 index 25fa695a63da..000000000000 --- a/core/cdf/src/cdf_lock.c +++ /dev/null @@ -1,648 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_lock.c - * - * OVERVIEW: This source file contains definitions for CDF lock APIs - * The four APIs mentioned in this file are used for - * initializing, acquiring, releasing and destroying a lock. - * the lock are implemented using critical sections - */ - -/* Include Files */ - -#include "cdf_lock.h" -#include "cdf_memory.h" -#include "cdf_trace.h" -#include -#ifdef CONFIG_CNSS -#include -#endif -#include "i_host_diag_core_event.h" -#include "cds_api.h" -#include "ani_global.h" -#include "hif.h" - -/* Preprocessor Definitions and Constants */ -#define LINUX_LOCK_COOKIE 0x12345678 - -#define WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT 0 -#define WIFI_POWER_EVENT_WAKELOCK_TAKEN 0 -#define WIFI_POWER_EVENT_WAKELOCK_RELEASED 1 - -/* Type Declarations */ - -enum { - LOCK_RELEASED = 0x11223344, - LOCK_ACQUIRED, - LOCK_DESTROYED -}; - -/* Global Data Definitions */ - -/* Function Definitions and Documentation */ - -/** - * cdf_mutex_init() - initialize a CDF lock - * @lock: Pointer to the opaque lock object to initialize - * - * cdf_mutex_init() function initializes the specified lock. Upon - * successful initialization, the state of the lock becomes initialized - * and unlocked. - * - * A lock must be initialized by calling cdf_mutex_init() before it - * may be used in any other lock functions. - * - * Attempting to initialize an already initialized lock results in - * a failure. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_init(cdf_mutex_t *lock) -{ - /* check for invalid pointer */ - if (lock == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: NULL pointer passed in", __func__); - return QDF_STATUS_E_FAULT; - } - /* check for 'already initialized' lock */ - if (LINUX_LOCK_COOKIE == lock->cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: already initialized lock", __func__); - return QDF_STATUS_E_BUSY; - } - - if (in_interrupt()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return QDF_STATUS_E_FAULT; - } - - /* initialize new lock */ - mutex_init(&lock->m_lock); - lock->cookie = LINUX_LOCK_COOKIE; - lock->state = LOCK_RELEASED; - lock->processID = 0; - lock->refcount = 0; - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_mutex_acquire() - acquire a CDF lock - * @lock: Pointer to the opaque lock object to acquire - * - * A lock object is acquired by calling cdf_mutex_acquire(). If the lock - * is already locked, the calling thread shall block until the lock becomes - * available. This operation shall return with the lock object referenced by - * lock in the locked state with the calling thread as its owner. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_acquire(cdf_mutex_t *lock) -{ - int rc; - /* check for invalid pointer */ - if (lock == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: NULL pointer passed in", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - /* check if lock refers to an initialized object */ - if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: uninitialized lock", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - if (in_interrupt()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - if ((lock->processID == current->pid) && - (lock->state == LOCK_ACQUIRED)) { - lock->refcount++; -#ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "%s: %x %d %d", __func__, lock, current->pid, - lock->refcount); -#endif - return QDF_STATUS_SUCCESS; - } - /* acquire a Lock */ - mutex_lock(&lock->m_lock); - rc = mutex_is_locked(&lock->m_lock); - if (rc == 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: unable to lock mutex (rc = %d)", __func__, rc); - CDF_ASSERT(0); - return QDF_STATUS_E_FAILURE; - } -#ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "%s: %x %d", __func__, lock, current->pid); -#endif - if (LOCK_DESTROYED != lock->state) { - lock->processID = current->pid; - lock->refcount++; - lock->state = LOCK_ACQUIRED; - return QDF_STATUS_SUCCESS; - } else { - /* lock is already destroyed */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Lock is already destroyed", __func__); - mutex_unlock(&lock->m_lock); - CDF_ASSERT(0); - return QDF_STATUS_E_FAILURE; - } -} - -/** - * cdf_mutex_release() - release a CDF lock - * @lock: Pointer to the opaque lock object to be released - * - * cdf_mutex_release() function shall release the lock object - * referenced by 'lock'. - * - * If a thread attempts to release a lock that it unlocked or is not - * initialized, an error is returned. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_release(cdf_mutex_t *lock) -{ - /* check for invalid pointer */ - if (lock == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: NULL pointer passed in", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - /* check if lock refers to an uninitialized object */ - if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: uninitialized lock", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - if (in_interrupt()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - /* CurrentThread = GetCurrentThreadId(); - * Check thread ID of caller against thread ID - * of the thread which acquire the lock - */ - if (lock->processID != current->pid) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: current task pid does not match original task pid!!", - __func__); -#ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "%s: Lock held by=%d being released by=%d", - __func__, lock->processID, current->pid); -#endif - CDF_ASSERT(0); - return QDF_STATUS_E_PERM; - } - if ((lock->processID == current->pid) && - (lock->state == LOCK_ACQUIRED)) { - if (lock->refcount > 0) - lock->refcount--; - } -#ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "%s: %x %d %d", __func__, lock, lock->processID, - lock->refcount); -#endif - if (lock->refcount) - return QDF_STATUS_SUCCESS; - - lock->processID = 0; - lock->refcount = 0; - lock->state = LOCK_RELEASED; - /* release a Lock */ - mutex_unlock(&lock->m_lock); -#ifdef CDF_NESTED_LOCK_DEBUG - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "%s: Freeing lock %x %d %d", lock, lock->processID, - lock->refcount); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_mutex_destroy() - destroy a CDF lock - * @lock: Pointer to the opaque lock object to be destroyed - * - * cdf_mutex_destroy() function shall destroy the lock object - * referenced by lock. After a successful return from cdf_mutex_destroy() - * the lock object becomes, in effect, uninitialized. - * - * A destroyed lock object can be reinitialized using cdf_mutex_init(); - * the results of otherwise referencing the object after it has been destroyed - * are undefined. Calls to CDF lock functions to manipulate the lock such - * as cdf_mutex_acquire() will fail if the lock is destroyed. Therefore, - * don't use the lock after it has been destroyed until it has - * been re-initialized. - * - * Return: - * QDF_STATUS_SUCCESS: lock was successfully initialized - * CDF failure reason codes: lock is not initialized and can't be used - */ -QDF_STATUS cdf_mutex_destroy(cdf_mutex_t *lock) -{ - /* check for invalid pointer */ - if (NULL == lock) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: NULL pointer passed in", __func__); - return QDF_STATUS_E_FAULT; - } - - if (LINUX_LOCK_COOKIE != lock->cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: uninitialized lock", __func__); - return QDF_STATUS_E_INVAL; - } - - if (in_interrupt()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s cannot be called from interrupt context!!!", - __func__); - return QDF_STATUS_E_FAULT; - } - - /* check if lock is released */ - if (!mutex_trylock(&lock->m_lock)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: lock is not released", __func__); - return QDF_STATUS_E_BUSY; - } - lock->cookie = 0; - lock->state = LOCK_DESTROYED; - lock->processID = 0; - lock->refcount = 0; - - mutex_unlock(&lock->m_lock); - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_spinlock_acquire() - acquires a spin lock - * @pLock: Spin lock to acquire - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_spinlock_acquire(cdf_spinlock_t *pLock) -{ - spin_lock(&pLock->spinlock); - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_spinlock_release() - release a spin lock - * @pLock: Spin lock to release - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_spinlock_release(cdf_spinlock_t *pLock) -{ - spin_unlock(&pLock->spinlock); - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_wake_lock_name() - This function returns the name of the wakelock - * @pLock: Pointer to the wakelock - * - * This function returns the name of the wakelock - * - * Return: Pointer to the name if it is valid or a default string - * - */ -static const char *cdf_wake_lock_name(cdf_wake_lock_t *pLock) -{ -#if defined CONFIG_CNSS - if (pLock->name) - return pLock->name; -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - if (pLock->ws.name) - return pLock->ws.name; -#endif - return "UNNAMED_WAKELOCK"; -} - -/** - * cdf_wake_lock_init() - initializes a CDF wake lock - * @pLock: The wake lock to initialize - * @name: Name of wake lock - * - * Return: - * CDF status success : if wake lock is initialized - * CDF status failure : if wake lock was not initialized - */ -QDF_STATUS cdf_wake_lock_init(cdf_wake_lock_t *pLock, const char *name) -{ -#if defined CONFIG_CNSS - cnss_pm_wake_lock_init(pLock, name); -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - wake_lock_init(pLock, WAKE_LOCK_SUSPEND, name); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_wake_lock_acquire() - acquires a wake lock - * @pLock: The wake lock to acquire - * @reason: Reason for wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_acquire(cdf_wake_lock_t *pLock, uint32_t reason) -{ - host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), - WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, - WIFI_POWER_EVENT_WAKELOCK_TAKEN); -#if defined CONFIG_CNSS - cnss_pm_wake_lock(pLock); -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - wake_lock(pLock); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_wake_lock_timeout_acquire() - acquires a wake lock with a timeout - * @pLock: The wake lock to acquire - * @reason: Reason for wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_timeout_acquire(cdf_wake_lock_t *pLock, uint32_t msec, - uint32_t reason) -{ - /* Wakelock for Rx is frequent. - * It is reported only during active debug - */ - if (((cds_get_ring_log_level(RING_ID_WAKELOCK) >= WLAN_LOG_LEVEL_ACTIVE) - && (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX == reason)) || - (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX != reason)) { - host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), msec, - WIFI_POWER_EVENT_WAKELOCK_TAKEN); - } -#if defined CONFIG_CNSS - cnss_pm_wake_lock_timeout(pLock, msec); -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - wake_lock_timeout(pLock, msecs_to_jiffies(msec)); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_wake_lock_release() - releases a wake lock - * @pLock: the wake lock to release - * @reason: Reason for wakelock - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_release(cdf_wake_lock_t *pLock, uint32_t reason) -{ - host_diag_log_wlock(reason, cdf_wake_lock_name(pLock), - WIFI_POWER_EVENT_DEFAULT_WAKELOCK_TIMEOUT, - WIFI_POWER_EVENT_WAKELOCK_RELEASED); -#if defined CONFIG_CNSS - cnss_pm_wake_lock_release(pLock); -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - wake_unlock(pLock); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_wake_lock_destroy() - destroys a wake lock - * @pLock: The wake lock to destroy - * - * Return: - * CDF status success : if wake lock is acquired - * CDF status failure : if wake lock was not acquired - */ -QDF_STATUS cdf_wake_lock_destroy(cdf_wake_lock_t *pLock) -{ -#if defined CONFIG_CNSS - cnss_pm_wake_lock_destroy(pLock); -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) - wake_lock_destroy(pLock); -#endif - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_runtime_pm_get() - do a get opperation on the device - * - * A get opperation will prevent a runtime suspend untill a - * corresponding put is done. This api should be used when sending - * data. - * - * CONTRARY TO THE REGULAR RUNTIME PM, WHEN THE BUS IS SUSPENDED, - * THIS API WILL ONLY REQUEST THE RESUME AND NOT TO A GET!!! - * - * return: success if the bus is up and a get has been issued - * otherwise an error code. - */ -QDF_STATUS cdf_runtime_pm_get(void) -{ - void *ol_sc; - int ret; - - ol_sc = cds_get_context(QDF_MODULE_ID_HIF); - - if (ol_sc == NULL) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: HIF context is null!", __func__); - return QDF_STATUS_E_INVAL; - } - - ret = hif_pm_runtime_get(ol_sc); - - if (ret) - return QDF_STATUS_E_FAILURE; - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_runtime_pm_put() - do a put opperation on the device - * - * A put opperation will allow a runtime suspend after a corresponding - * get was done. This api should be used when sending data. - * - * This api will return a failure if the hif module hasn't been initialized - * - * return: QDF_STATUS_SUCCESS if the put is performed - */ -QDF_STATUS cdf_runtime_pm_put(void) -{ - void *ol_sc; - int ret; - - ol_sc = cds_get_context(QDF_MODULE_ID_HIF); - - if (ol_sc == NULL) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: HIF context is null!", __func__); - return QDF_STATUS_E_INVAL; - } - - ret = hif_pm_runtime_put(ol_sc); - - if (ret) - return QDF_STATUS_E_FAILURE; - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_runtime_pm_prevent_suspend() - prevent a runtime bus suspend - * @lock: an opaque context for tracking - * - * The lock can only be acquired once per lock context and is tracked. - * - * return: QDF_STATUS_SUCCESS or failure code. - */ -QDF_STATUS cdf_runtime_pm_prevent_suspend(cdf_runtime_lock_t lock) -{ - void *ol_sc; - int ret; - - ol_sc = cds_get_context(QDF_MODULE_ID_HIF); - - if (ol_sc == NULL) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: HIF context is null!", __func__); - return QDF_STATUS_E_INVAL; - } - - ret = hif_pm_runtime_prevent_suspend(ol_sc, lock); - - if (ret) - return QDF_STATUS_E_FAILURE; - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_runtime_pm_prevent_suspend() - prevent a runtime bus suspend - * @lock: an opaque context for tracking - * - * The lock can only be acquired once per lock context and is tracked. - * - * return: QDF_STATUS_SUCCESS or failure code. - */ -QDF_STATUS cdf_runtime_pm_allow_suspend(cdf_runtime_lock_t lock) -{ - void *ol_sc; - int ret; - - ol_sc = cds_get_context(QDF_MODULE_ID_HIF); - - if (ol_sc == NULL) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: HIF context is null!", __func__); - return QDF_STATUS_E_INVAL; - } - - ret = hif_pm_runtime_allow_suspend(ol_sc, lock); - - if (ret) - return QDF_STATUS_E_FAILURE; - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_runtime_lock_init() - initialize runtime lock - * @name: name of the runtime lock - * - * Initialize a runtime pm lock. This lock can be used - * to prevent the runtime pm system from putting the bus - * to sleep. - * - * Return: runtime_pm_lock_t - */ -cdf_runtime_lock_t cdf_runtime_lock_init(const char *name) -{ - return hif_runtime_lock_init(name); -} - -/** - * cdf_runtime_lock_deinit() - deinitialize runtime pm lock - * @lock: the lock to deinitialize - * - * Ensures the lock is released. Frees the runtime lock. - * - * Return: void - */ -void cdf_runtime_lock_deinit(cdf_runtime_lock_t lock) -{ - void *hif_ctx = cds_get_context(CDF_MODULE_ID_HIF); - hif_runtime_lock_deinit(hif_ctx, lock); -} diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c index 4fb4b5dfda8c..97f9efeabd25 100644 --- a/core/cdf/src/cdf_mc_timer.c +++ b/core/cdf/src/cdf_mc_timer.c @@ -33,7 +33,7 @@ /* Include Files */ #include -#include +#include #include #include "wlan_qct_sys.h" #include "cds_sched.h" @@ -48,7 +48,7 @@ /* Static Variable Definitions */ static unsigned int persistent_timer_count; -static cdf_mutex_t persistent_timer_count_lock; +static qdf_mutex_t persistent_timer_count_lock; /* Function declarations and documenation */ @@ -64,14 +64,14 @@ static cdf_mutex_t persistent_timer_count_lock; static void try_allowing_sleep(QDF_TIMER_TYPE type) { if (QDF_TIMER_TYPE_WAKE_APPS == type) { - /* cdf_mutex_acquire(&persistent_timer_count_lock); */ + /* qdf_mutex_acquire(&persistent_timer_count_lock); */ persistent_timer_count--; if (0 == persistent_timer_count) { /* since the number of persistent timers has decreased from 1 to 0, the timer should allow sleep sleep_assert_okts( sleepClientHandle ); */ } - /* cdf_mutex_release(&persistent_timer_count_lock); */ + /* qdf_mutex_release(&persistent_timer_count_lock); */ } } @@ -228,13 +228,13 @@ void cdf_timer_module_init(void) { CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "Initializing the CDF timer module"); - cdf_mutex_init(&persistent_timer_count_lock); + qdf_mutex_create(&persistent_timer_count_lock); } #ifdef TIMER_MANAGER qdf_list_t cdf_timer_list; -cdf_spinlock_t cdf_timer_list_lock; +qdf_spinlock_t cdf_timer_list_lock; static void cdf_timer_clean(void); @@ -248,7 +248,7 @@ static void cdf_timer_clean(void); void cdf_mc_timer_manager_init(void) { qdf_list_create(&cdf_timer_list, 1000); - cdf_spinlock_init(&cdf_timer_list_lock); + qdf_spinlock_create(&cdf_timer_list_lock); return; } @@ -276,10 +276,10 @@ static void cdf_timer_clean(void) __func__, (int)listSize); do { - cdf_spin_lock_irqsave(&cdf_timer_list_lock); + qdf_spin_lock_irqsave(&cdf_timer_list_lock); qdf_status = qdf_list_remove_front(&cdf_timer_list, &pNode); - cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); + qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS == qdf_status) { ptimerNode = (cdf_mc_timer_node_t *) pNode; CDF_TRACE(QDF_MODULE_ID_QDF, @@ -371,10 +371,10 @@ QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, timer->ptimerNode->lineNum = lineNum; timer->ptimerNode->cdf_timer = timer; - cdf_spin_lock_irqsave(&cdf_timer_list_lock); + qdf_spin_lock_irqsave(&cdf_timer_list_lock); qdf_status = qdf_list_insert_front(&cdf_timer_list, &timer->ptimerNode->pNode); - cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); + qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List qdf_status %d", @@ -477,10 +477,10 @@ QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) return QDF_STATUS_E_INVAL; } - cdf_spin_lock_irqsave(&cdf_timer_list_lock); + qdf_spin_lock_irqsave(&cdf_timer_list_lock); status = qdf_list_remove_node(&cdf_timer_list, &timer->ptimerNode->pNode); - cdf_spin_unlock_irqrestore(&cdf_timer_list_lock); + qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); if (status != QDF_STATUS_SUCCESS) { CDF_ASSERT(0); return QDF_STATUS_E_INVAL; diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 0de58b57e298..746f7913841a 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -35,7 +35,7 @@ #include "cdf_memory.h" #include "cdf_nbuf.h" #include "cdf_trace.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_mc_timer.h" #if defined(CONFIG_CNSS) @@ -51,7 +51,7 @@ #include qdf_list_t cdf_mem_list; -cdf_spinlock_t cdf_mem_list_lock; +qdf_spinlock_t cdf_mem_list_lock; static uint8_t WLAN_MEM_HEADER[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68 }; @@ -137,7 +137,7 @@ void cdf_mem_init(void) { /* Initalizing the list with maximum size of 60000 */ qdf_list_create(&cdf_mem_list, 60000); - cdf_spinlock_init(&cdf_mem_list_lock); + qdf_spinlock_create(&cdf_mem_list_lock); cdf_net_buf_debug_init(); return; } @@ -169,10 +169,10 @@ void cdf_mem_clean(void) __func__, (int)listSize); do { - cdf_spin_lock(&cdf_mem_list_lock); + qdf_spin_lock(&cdf_mem_list_lock); qdf_status = qdf_list_remove_front(&cdf_mem_list, &pNode); - cdf_spin_unlock(&cdf_mem_list_lock); + qdf_spin_unlock(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS == qdf_status) { memStruct = (struct s_cdf_mem_struct *)pNode; /* Take care to log only once multiple memory @@ -301,10 +301,10 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) cdf_mem_copy((uint8_t *) (memStruct + 1) + size, &WLAN_MEM_TAIL[0], sizeof(WLAN_MEM_TAIL)); - cdf_spin_lock_irqsave(&cdf_mem_list_lock); + qdf_spin_lock_irqsave(&cdf_mem_list_lock); qdf_status = qdf_list_insert_front(&cdf_mem_list, &memStruct->pNode); - cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); + qdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List qdf_status %d", @@ -338,10 +338,10 @@ void cdf_mem_free(void *ptr) return; #endif - cdf_spin_lock_irqsave(&cdf_mem_list_lock); + qdf_spin_lock_irqsave(&cdf_mem_list_lock); qdf_status = qdf_list_remove_node(&cdf_mem_list, &memStruct->pNode); - cdf_spin_unlock_irqrestore(&cdf_mem_list_lock); + qdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS == qdf_status) { if (0 == cdf_mem_compare(memStruct->header, diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 3f1bbb5f65b5..095a0c7b968a 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -45,7 +45,7 @@ #include #include #include -#include +#include /* Packet Counter */ static uint32_t nbuf_tx_mgmt[NBUF_TX_PKT_STATE_MAX]; diff --git a/core/cdf/src/i_cdf_lock.h b/core/cdf/src/i_cdf_lock.h deleted file mode 100644 index 02c46f095762..000000000000 --- a/core/cdf/src/i_cdf_lock.h +++ /dev/null @@ -1,255 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__I_CDF_LOCK_H) -#define __I_CDF_LOCK_H - -/** - * DOC: i_cdf_lock.h - * - * Linux-specific definitions for CDF Locks - * - */ - -/* Include Files */ -#include -#include -#include -#include -#include -#include -#include -#if defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) -#include -#endif - -/* Preprocessor definitions and constants */ - -/* define for flag */ -#define ADF_OS_LINUX_UNLOCK_BH 1 - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * typedef struct - cdf_mutex_t - * @m_lock: Mutex lock - * @cookie: Lock cookie - * @processID: Process ID to track lock - * @state: Lock status - * @refcount: Reference count for recursive lock - */ -typedef struct cdf_lock_s { - struct mutex m_lock; - uint32_t cookie; - int processID; - uint32_t state; - uint8_t refcount; -} cdf_mutex_t; - -/** - * typedef struct - cdf_spinlock_t - * @spinlock: Spin lock - * @flags: Lock flag - * @_flags: Internal lock flag - */ -typedef struct __cdf_spinlock { - spinlock_t spinlock; - unsigned int flags; - unsigned long _flags; -} cdf_spinlock_t; - -typedef cdf_spinlock_t __cdf_spinlock_t; -typedef struct semaphore __cdf_semaphore_t; - -#if defined CONFIG_CNSS -typedef struct wakeup_source cdf_wake_lock_t; -#elif defined(WLAN_OPEN_SOURCE) && defined(CONFIG_HAS_WAKELOCK) -typedef struct wake_lock cdf_wake_lock_t; -#else -typedef int cdf_wake_lock_t; -#endif - -/* Function declarations and documenation */ - -/** - * __cdf_semaphore_init() - initialize the semaphore - * @m: Semaphore object - * - * Return: QDF_STATUS_SUCCESS - */ -static inline QDF_STATUS __cdf_semaphore_init(struct semaphore *m) -{ - sema_init(m, 1); - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_semaphore_acquire() - acquire semaphore - * @m: Semaphore object - * - * Return: 0 - */ -static inline int -__cdf_semaphore_acquire(qdf_device_t osdev, struct semaphore *m) -{ - down(m); - return 0; -} - -/** - * __cdf_semaphore_release() - release semaphore - * @m: Semaphore object - * - * Return: result of UP operation in integer - */ -static inline void -__cdf_semaphore_release(qdf_device_t osdev, struct semaphore *m) -{ - up(m); -} - -/** - * __cdf_spinlock_init() - initialize spin lock - * @lock: Spin lock object - * - * Return: QDF_STATUS_SUCCESS - */ -static inline QDF_STATUS __cdf_spinlock_init(__cdf_spinlock_t *lock) -{ - spin_lock_init(&lock->spinlock); - lock->flags = 0; - - return QDF_STATUS_SUCCESS; -} - -#define __cdf_spinlock_destroy(lock) -/** - * __cdf_spin_lock() - Acquire a Spinlock(SMP) & disable Preemption (Preemptive) - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_lock(__cdf_spinlock_t *lock) -{ - spin_lock(&lock->spinlock); -} - -/** - * __cdf_spin_unlock() - Unlock the spinlock and enables the Preemption - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_unlock(__cdf_spinlock_t *lock) -{ - spin_unlock(&lock->spinlock); -} - -/** - * __cdf_spin_lock_irqsave() - Acquire a Spinlock (SMP) & disable Preemption - * (Preemptive) and disable IRQs - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_lock_irqsave(__cdf_spinlock_t *lock) -{ - spin_lock_irqsave(&lock->spinlock, lock->_flags); -} -/** - * __cdf_spin_unlock_irqrestore() - Unlock the spinlock and enables the - * Preemption and enable IRQ - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_unlock_irqrestore(__cdf_spinlock_t *lock) -{ - spin_unlock_irqrestore(&lock->spinlock, lock->_flags); -} - -/* - * Synchronous versions - only for OS' that have interrupt disable - */ -#define __cdf_spin_lock_irq(_pLock, _flags) spin_lock_irqsave(_pLock, _flags) -#define __cdf_spin_unlock_irq(_pLock, _flags) spin_unlock_irqrestore(_pLock, _flags) - -/** - * __cdf_spin_lock_bh() - Acquire the spinlock and disable bottom halves - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_lock_bh(__cdf_spinlock_t *lock) -{ - if (likely(irqs_disabled() || in_softirq())) { - spin_lock(&lock->spinlock); - } else { - spin_lock_bh(&lock->spinlock); - lock->flags |= ADF_OS_LINUX_UNLOCK_BH; - } - -} - -/** - * __cdf_spin_unlock_bh() - Release the spinlock and enable bottom halves - * @lock: Lock object - * - * Return: none - */ -static inline void -__cdf_spin_unlock_bh(__cdf_spinlock_t *lock) -{ - if (unlikely(lock->flags & ADF_OS_LINUX_UNLOCK_BH)) { - lock->flags &= ~ADF_OS_LINUX_UNLOCK_BH; - spin_unlock_bh(&lock->spinlock); - } else - spin_unlock(&lock->spinlock); -} - -/** - * __cdf_in_softirq() - in soft irq context - * - * Return: true if in softirs context else false - */ -static inline bool __cdf_in_softirq(void) -{ - return in_softirq(); -} - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __I_CDF_LOCK_H */ diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 456261b19357..d6c4afdb82cc 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index a94ae3c936c6..4b506c9a1b19 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index f19c9ed12aaf..0f5e2f7f9eee 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -47,7 +47,7 @@ #endif #include #include -#include "cdf_lock.h" +#include "qdf_lock.h" #define TX_POST_EVENT_MASK 0x001 #define TX_SUSPEND_EVENT_MASK 0x002 @@ -283,9 +283,9 @@ typedef struct _cds_context_type { uint32_t driver_debug_log_level; uint32_t fw_debug_log_level; struct cds_log_complete log_complete; - cdf_spinlock_t bug_report_lock; + qdf_spinlock_t bug_report_lock; qdf_event_t connection_update_done_evt; - cdf_mutex_t cdf_conc_list_lock; + qdf_mutex_t cdf_conc_list_lock; } cds_context_type, *p_cds_contextType; diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index bc04928043af..f52ec524e346 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1855,7 +1855,7 @@ void cds_init_log_completion(void) /* Attempting to initialize an already initialized lock * results in a failure. This must be ok here. */ - cdf_spinlock_init(&p_cds_context->bug_report_lock); + qdf_spinlock_create(&p_cds_context->bug_report_lock); } /** @@ -1877,7 +1877,7 @@ void cds_deinit_log_completion(void) return; } - cdf_spinlock_destroy(&p_cds_context->bug_report_lock); + qdf_spinlock_destroy(&p_cds_context->bug_report_lock); } /** @@ -1904,12 +1904,12 @@ QDF_STATUS cds_set_log_completion(uint32_t is_fatal, return QDF_STATUS_E_FAILURE; } - cdf_spinlock_acquire(&p_cds_context->bug_report_lock); + qdf_spinlock_acquire(&p_cds_context->bug_report_lock); p_cds_context->log_complete.is_fatal = is_fatal; p_cds_context->log_complete.indicator = indicator; p_cds_context->log_complete.reason_code = reason_code; p_cds_context->log_complete.is_report_in_progress = true; - cdf_spinlock_release(&p_cds_context->bug_report_lock); + qdf_spinlock_release(&p_cds_context->bug_report_lock); return QDF_STATUS_SUCCESS; } @@ -1936,12 +1936,12 @@ void cds_get_log_completion(uint32_t *is_fatal, return; } - cdf_spinlock_acquire(&p_cds_context->bug_report_lock); + qdf_spinlock_acquire(&p_cds_context->bug_report_lock); *is_fatal = p_cds_context->log_complete.is_fatal; *indicator = p_cds_context->log_complete.indicator; *reason_code = p_cds_context->log_complete.reason_code; p_cds_context->log_complete.is_report_in_progress = false; - cdf_spinlock_release(&p_cds_context->bug_report_lock); + qdf_spinlock_release(&p_cds_context->bug_report_lock); } /** diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 603a1011b1ec..e6d410dca757 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2026,7 +2026,7 @@ bool cds_set_connection_in_progress(bool value) return false; } - cdf_spin_lock(&hdd_ctx->connection_status_lock); + qdf_spin_lock(&hdd_ctx->connection_status_lock); /* * if the value is set to true previously and if someone is * trying to make it true again then it could be some race @@ -2037,7 +2037,7 @@ bool cds_set_connection_in_progress(bool value) status = false; else hdd_ctx->connection_in_progress = value; - cdf_spin_unlock(&hdd_ctx->connection_status_lock); + qdf_spin_unlock(&hdd_ctx->connection_status_lock); return status; } @@ -2203,7 +2203,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries, return; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); for (i = 0; i < num_vdev_mac_entries; i++) { conn_index = 0; found = 0; @@ -2236,7 +2236,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries, conc_connection_list[conn_index].rx_spatial_stream); } } - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } /** @@ -3533,7 +3533,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, * Need to aquire mutex as entire functionality in this function * is in critical section */ - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); switch (mode) { case QDF_STA_MODE: case QDF_P2P_CLIENT_MODE: @@ -3558,7 +3558,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, cds_info("Set PCL of STA to FW"); } cds_incr_connection_count(session_id); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } /** @@ -3716,7 +3716,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, * given to the FW. After setting the PCL, we need to restore * the entry that we have saved before. */ - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); cds_set_pcl_for_existing_combo(CDS_STA_MODE); /* do we need to change the HW mode */ if (cds_need_opportunistic_upgrade()) { @@ -3729,7 +3729,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) cds_err("Failed to start dbs opportunistic timer"); } - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return; } @@ -3768,7 +3768,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, * Need to aquire mutex as entire functionality in this function * is in critical section */ - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); switch (mode) { case QDF_STA_MODE: case QDF_P2P_CLIENT_MODE: @@ -3784,7 +3784,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, cds_info("No.# of active sessions for mode %d = %d", mode, hdd_ctx->no_of_active_sessions[mode]); cds_decr_connection_count(session_id); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } /** @@ -3807,7 +3807,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) return; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); /* if we still need it */ action = cds_need_opportunistic_upgrade(); if (action) { @@ -3819,7 +3819,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) cds_next_actions(0, action, CDS_UPDATE_REASON_OPPORTUNISTIC); } - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } @@ -3840,7 +3840,7 @@ QDF_STATUS cds_deinit_policy_mgr(void) cds_err("Invalid CDS Context"); return QDF_STATUS_E_FAILURE; } - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy( + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to destroy cdf_conc_list_lock"); return QDF_STATUS_E_FAILURE; @@ -3879,7 +3879,7 @@ QDF_STATUS cds_init_policy_mgr(void) /* init conc_connection_list */ cdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( &cds_ctx->cdf_conc_list_lock))) { cds_err("Failed to init cdf_conc_list_lock"); /* Lets us not proceed further */ @@ -4093,7 +4093,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) return status; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) { if (vdev_id == conc_connection_list[conn_index].vdev_id) { /* debug msg */ @@ -4104,7 +4104,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) } if (!found) { /* err msg */ - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); cds_err("can't find vdev_id %d in conc_connection_list", vdev_id); return status; @@ -4114,7 +4114,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) if (NULL == wma_conn_table_entry) { /* err msg*/ - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); cds_err("can't find vdev_id %d in WMA table", vdev_id); return status; } @@ -4129,7 +4129,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) wma_conn_table_entry->tx_streams, wma_conn_table_entry->rx_streams, wma_conn_table_entry->nss, vdev_id, true); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -4878,7 +4878,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, return status; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); /* find the current connection state from conc_connection_list*/ num_connections = cds_get_connection_count(); @@ -5065,7 +5065,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, status = true; done: - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return status; } @@ -5572,7 +5572,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id, else band = CDS_BAND_5; - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); num_connections = cds_get_connection_count(); cds_debug("num_connections=%d channel=%d", @@ -5629,7 +5629,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id, reason, session_id); done: - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return status; } @@ -5721,10 +5721,10 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, /* * Check if we are ok to request for HW mode change now */ - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); conn_index = cds_get_connection_for_vdev_id(vdev_id); if (MAX_NUMBER_OF_CONC_CONNECTIONS == conn_index) { - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); cds_err("connection not found for vdev %d", vdev_id); return; } @@ -5747,7 +5747,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, cds_next_actions(vdev_id, next_action, CDS_UPDATE_REASON_NSS_UPDATE); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return; } @@ -7404,7 +7404,7 @@ QDF_STATUS cds_update_connection_info_utfw( return status; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) { if (vdev_id == conc_connection_list[conn_index].vdev_id) { /* debug msg */ @@ -7415,7 +7415,7 @@ QDF_STATUS cds_update_connection_info_utfw( } if (!found) { /* err msg */ - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); cds_err("can't find vdev_id %d in conc_connection_list", vdev_id); return status; @@ -7426,7 +7426,7 @@ QDF_STATUS cds_update_connection_info_utfw( cds_get_mode(type, sub_type), channelid, mac_id, chain_mask, tx_streams, rx_streams, 0, vdev_id, true); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -7453,11 +7453,11 @@ QDF_STATUS cds_incr_connection_count_utfw( return status; } - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); conn_index = cds_get_connection_count(); if (MAX_NUMBER_OF_CONC_CONNECTIONS <= conn_index) { /* err msg */ - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); cds_err("exceeded max connection limit %d", MAX_NUMBER_OF_CONC_CONNECTIONS); return status; @@ -7468,7 +7468,7 @@ QDF_STATUS cds_incr_connection_count_utfw( cds_get_mode(type, sub_type), channelid, mac_id, chain_mask, tx_streams, rx_streams, 0, vdev_id, true); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -7492,9 +7492,9 @@ QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, return QDF_STATUS_E_FAILURE; } } else { - cdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); cds_decr_connection_count(vdev_id); - cdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); } return QDF_STATUS_SUCCESS; diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 088ec9d69b20..5c7f400c8cae 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -69,7 +69,7 @@ typedef struct { cds_pkt_proto_trace_t *trace_buffer = NULL; unsigned int trace_buffer_order = 0; -cdf_spinlock_t trace_buffer_lock; +qdf_spinlock_t trace_buffer_lock; #endif /* QCA_PKT_PROTO_TRACE */ /** @@ -193,7 +193,7 @@ void cds_pkt_trace_buf_update(char *event_string) CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "%s %d, %s", __func__, __LINE__, event_string); - cdf_spinlock_acquire(&trace_buffer_lock); + qdf_spinlock_acquire(&trace_buffer_lock); slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF; trace_buffer[slot].order = trace_buffer_order; trace_buffer[slot].event_time = cdf_mc_timer_get_system_time(); @@ -204,7 +204,7 @@ void cds_pkt_trace_buf_update(char *event_string) (CDS_PKT_TRAC_MAX_STRING_LEN < strlen(event_string)) ? CDS_PKT_TRAC_MAX_STRING_LEN : strlen(event_string)); trace_buffer_order++; - cdf_spinlock_release(&trace_buffer_lock); + qdf_spinlock_release(&trace_buffer_lock); return; } @@ -217,7 +217,7 @@ void cds_pkt_trace_buf_dump(void) { uint32_t slot, idx; - cdf_spinlock_acquire(&trace_buffer_lock); + qdf_spinlock_acquire(&trace_buffer_lock); CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP START Current Timestamp %u", (unsigned int)cdf_mc_timer_get_system_time()); @@ -245,7 +245,7 @@ void cds_pkt_trace_buf_dump(void) CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP END"); - cdf_spinlock_release(&trace_buffer_lock); + qdf_spinlock_release(&trace_buffer_lock); return; } @@ -257,7 +257,7 @@ void cds_pkt_trace_buf_dump(void) void cds_pkt_proto_trace_init(void) { /* Init spin lock to protect global memory */ - cdf_spinlock_init(&trace_buffer_lock); + qdf_spinlock_create(&trace_buffer_lock); trace_buffer_order = 0; trace_buffer = cdf_mem_malloc(CDS_PKT_TRAC_MAX_TRACE_BUF * @@ -278,7 +278,7 @@ void cds_pkt_proto_trace_close(void) CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s %d", __func__, __LINE__); cdf_mem_free(trace_buffer); - cdf_spinlock_destroy(&trace_buffer_lock); + qdf_spinlock_destroy(&trace_buffer_lock); return; } diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 8601985dd51f..b9e9c6bf7327 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -362,16 +362,16 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) #endif #define HTT_TX_MUTEX_INIT(_mutex) \ - cdf_spinlock_init(_mutex) + qdf_spinlock_create(_mutex) #define HTT_TX_MUTEX_ACQUIRE(_mutex) \ - cdf_spin_lock_bh(_mutex) + qdf_spin_lock_bh(_mutex) #define HTT_TX_MUTEX_RELEASE(_mutex) \ - cdf_spin_unlock_bh(_mutex) + qdf_spin_unlock_bh(_mutex) #define HTT_TX_MUTEX_DESTROY(_mutex) \ - cdf_spinlock_destroy(_mutex) + qdf_spinlock_destroy(_mutex) #define HTT_TX_DESC_PADDR(_pdev, _tx_desc_vaddr) \ ((_pdev)->tx_descs.pool_paddr + (uint32_t) \ @@ -381,7 +381,7 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) #ifdef ATH_11AC_TXCOMPACT #define HTT_TX_NBUF_QUEUE_MUTEX_INIT(_pdev) \ - cdf_spinlock_init(&_pdev->txnbufq_mutex) + qdf_spinlock_create(&_pdev->txnbufq_mutex) #define HTT_TX_NBUF_QUEUE_MUTEX_DESTROY(_pdev) \ HTT_TX_MUTEX_DESTROY(&_pdev->txnbufq_mutex) diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index dc01ab8a4161..9b1262804ab1 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -143,7 +143,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) switch (msg_type) { case HTT_T2H_MSG_TYPE_VERSION_CONF: { - cdf_runtime_pm_put(); + qdf_runtime_pm_put(); pdev->tgt_ver.major = HTT_VER_CONF_MAJOR_GET(*msg_word); pdev->tgt_ver.minor = HTT_VER_CONF_MINOR_GET(*msg_word); qdf_print @@ -290,7 +290,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) ol_tx_single_completion_handler(pdev->txrx_pdev, compl_msg->status, compl_msg->desc_id); - cdf_runtime_pm_put(); + qdf_runtime_pm_put(); HTT_TX_SCHED(pdev); } else { qdf_print("Ignoring HTT_T2H_MSG_TYPE_MGMT_TX_COMPL_IND indication"); @@ -306,7 +306,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) cookie |= ((uint64_t) (*(msg_word + 2))) << 32; stats_info_list = (uint8_t *) (msg_word + 3); - cdf_runtime_pm_put(); + qdf_runtime_pm_put(); ol_txrx_fw_stats_handler(pdev->txrx_pdev, cookie, stats_info_list); break; @@ -362,7 +362,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) uint8_t *op_msg_buffer; uint8_t *msg_start_ptr; - cdf_runtime_pm_put(); + qdf_runtime_pm_put(); msg_start_ptr = (uint8_t *) msg_word; op_code = HTT_WDI_IPA_OP_RESPONSE_OP_CODE_GET(*msg_word); diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 0aa8fc26a4e1..cb337dae37fb 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -30,7 +30,7 @@ #include /* uint16_t, dma_addr_t */ #include /* qdf_device_t */ -#include /* cdf_spinlock_t */ +#include /* qdf_spinlock_t */ #include /* qdf_timer_t */ #include /* qdf_atomic_inc */ #include /* cdf_nbuf_t */ @@ -41,7 +41,7 @@ #define DEBUG_DMA_DONE -#define HTT_TX_MUTEX_TYPE cdf_spinlock_t +#define HTT_TX_MUTEX_TYPE qdf_spinlock_t #ifdef QCA_TX_HTT2_SUPPORT #ifndef HTC_TX_HTT2_MAX_SIZE diff --git a/core/dp/ol/inc/ol_txrx_dbg.h b/core/dp/ol/inc/ol_txrx_dbg.h index 138e1ed0df21..976415f00ae0 100644 --- a/core/dp/ol/inc/ol_txrx_dbg.h +++ b/core/dp/ol/inc/ol_txrx_dbg.h @@ -33,7 +33,7 @@ #define _OL_TXRX_DBG__H_ #include /* A_STATUS, uint64_t */ -#include /* cdf_semaphore_t */ +#include /* qdf_semaphore_t */ #include /* htt_dbg_stats_type */ #include /* ol_txrx_stats */ @@ -70,7 +70,7 @@ struct ol_txrx_stats_req { */ struct { int blocking; - cdf_semaphore_t *sem_ptr; + qdf_semaphore_t *sem_ptr; } wait; }; diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index 877516ae7a1c..3175dc5dc9a0 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -136,7 +136,7 @@ static void ol_rx_reorder_timeout(void *arg) time_now_ms = qdf_system_ticks_to_msecs(qdf_system_ticks()); pdev = rx_reorder_timeout_ac->pdev; - cdf_spin_lock(&pdev->rx.mutex); + qdf_spin_lock(&pdev->rx.mutex); /* TODO: conditionally take mutex lock during regular rx */ TAILQ_FOREACH_SAFE(list_elem, &rx_reorder_timeout_ac->virtual_timer_list, @@ -165,7 +165,7 @@ static void ol_rx_reorder_timeout(void *arg) if (!TAILQ_EMPTY(&rx_reorder_timeout_ac->virtual_timer_list)) ol_rx_reorder_timeout_start(rx_reorder_timeout_ac, time_now_ms); - cdf_spin_unlock(&pdev->rx.mutex); + qdf_spin_unlock(&pdev->rx.mutex); } void ol_rx_reorder_timeout_init(struct ol_txrx_pdev_t *pdev) diff --git a/core/dp/txrx/ol_rx_reorder_timeout.h b/core/dp/txrx/ol_rx_reorder_timeout.h index 1f43871eeb64..768ee6fe4561 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.h +++ b/core/dp/txrx/ol_rx_reorder_timeout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -46,9 +46,9 @@ void ol_rx_reorder_timeout_peer_cleanup(struct ol_txrx_peer_t *peer); #define OL_RX_REORDER_TIMEOUT_PEER_TID_INIT(peer, tid) \ (peer)->tids_rx_reorder[(tid)].timeout.active = 0 #define OL_RX_REORDER_TIMEOUT_MUTEX_LOCK(pdev) \ - cdf_spin_lock(&(pdev)->rx.mutex) + qdf_spin_lock(&(pdev)->rx.mutex) #define OL_RX_REORDER_TIMEOUT_MUTEX_UNLOCK(pdev) \ - cdf_spin_unlock(&(pdev)->rx.mutex) + qdf_spin_unlock(&(pdev)->rx.mutex) #else diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 71a1252155c9..fde5aa45b0c5 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -757,9 +757,9 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) { int max_to_accept; - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); if (vdev->ll_pause.paused_reason) { - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); return; } @@ -814,14 +814,14 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) vdev->ll_pause.q_overflow_cnt++; } - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } static cdf_nbuf_t ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu_list, uint8_t start_timer) { - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); while (msdu_list && vdev->ll_pause.txq.depth < vdev->ll_pause.max_q_depth) { cdf_nbuf_t next = cdf_nbuf_next(msdu_list); @@ -851,7 +851,7 @@ ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, OL_TX_VDEV_PAUSE_QUEUE_SEND_PERIOD_MS); vdev->ll_pause.is_q_timer_on = true; } - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); return msdu_list; } @@ -942,17 +942,17 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) more = 0; TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); if (vdev->ll_pause.txq.depth) { if (vdev->ll_pause.paused_reason) { - cdf_spin_unlock_bh(&vdev->ll_pause. + qdf_spin_unlock_bh(&vdev->ll_pause. mutex); continue; } tx_msdu = vdev->ll_pause.txq.head; if (NULL == tx_msdu) { - cdf_spin_unlock_bh(&vdev->ll_pause. + qdf_spin_unlock_bh(&vdev->ll_pause. mutex); continue; } @@ -987,22 +987,22 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) /*check if there are more msdus to transmit */ if (vdev->ll_pause.txq.depth) more = 1; - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } } while (more && max_to_send); vdev = NULL; TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); if (vdev->ll_pause.txq.depth) { qdf_timer_stop(&pdev->tx_throttle.tx_timer); qdf_timer_start( &pdev->tx_throttle.tx_timer, OL_TX_VDEV_PAUSE_QUEUE_SEND_PERIOD_MS); - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); return; } - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } } @@ -1376,7 +1376,7 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg) c_element->next = NULL; } pdev->tso_seg_pool.pool_size = num_seg; - cdf_spinlock_init(&pdev->tso_seg_pool.tso_mutex); + qdf_spinlock_create(&pdev->tso_seg_pool.tso_mutex); } void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) @@ -1385,7 +1385,7 @@ void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) struct cdf_tso_seg_elem_t *c_element; struct cdf_tso_seg_elem_t *temp; - cdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); c_element = pdev->tso_seg_pool.freelist; for (i = 0; i < pdev->tso_seg_pool.pool_size; i++) { temp = c_element->next; @@ -1398,7 +1398,7 @@ void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) pdev->tso_seg_pool.freelist = NULL; pdev->tso_seg_pool.num_free = 0; pdev->tso_seg_pool.pool_size = 0; - cdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); - cdf_spinlock_destroy(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spinlock_destroy(&pdev->tso_seg_pool.tso_mutex); } #endif /* FEATURE_TSO */ diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index e60d8831fc81..f0c0a7fe1a3a 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -33,7 +33,7 @@ #define _OL_TX__H_ #include /* cdf_nbuf_t */ -#include +#include #include /* ol_txrx_vdev_handle */ #include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 5f405f1dd8ec..efd2a8234fab 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -28,7 +28,7 @@ #include /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ #include /* cdf_assert */ -#include /* cdf_spinlock */ +#include /* cdf_spinlock */ #ifdef QCA_COMPUTE_TX_DELAY #include /* qdf_system_ticks */ #endif @@ -120,13 +120,13 @@ struct ol_tx_desc_t *ol_tx_desc_alloc(struct ol_txrx_pdev_t *pdev, { struct ol_tx_desc_t *tx_desc = NULL; - cdf_spin_lock_bh(&pdev->tx_mutex); + qdf_spin_lock_bh(&pdev->tx_mutex); if (pdev->tx_desc.freelist) { tx_desc = ol_tx_get_desc_global_pool(pdev); ol_tx_desc_sanity_checks(pdev, tx_desc); ol_tx_desc_compute_delay(tx_desc); } - cdf_spin_unlock_bh(&pdev->tx_mutex); + qdf_spin_unlock_bh(&pdev->tx_mutex); return tx_desc; } @@ -163,23 +163,23 @@ struct ol_tx_desc_t *ol_tx_desc_alloc(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc = NULL; if (pool) { - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); if (pool->avail_desc) { tx_desc = ol_tx_get_desc_flow_pool(pool); if (cdf_unlikely(pool->avail_desc < pool->stop_th)) { pool->status = FLOW_POOL_ACTIVE_PAUSED; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); /* pause network queues */ pdev->pause_cb(vdev->vdev_id, WLAN_STOP_ALL_NETIF_QUEUE, WLAN_DATA_FLOW_CONTROL); } else { - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); } ol_tx_desc_sanity_checks(pdev, tx_desc); ol_tx_desc_compute_delay(tx_desc); } else { - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); pdev->pool_stats.pkt_drop_no_desc++; } } else { @@ -229,7 +229,7 @@ ol_tx_desc_alloc_wrapper(struct ol_txrx_pdev_t *pdev, */ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) { - cdf_spin_lock_bh(&pdev->tx_mutex); + qdf_spin_lock_bh(&pdev->tx_mutex); if (tx_desc->pkt_type == ol_tx_frm_tso) { if (cdf_unlikely(tx_desc->tso_desc == NULL)) { @@ -244,7 +244,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) ol_tx_desc_reset_timestamp(tx_desc); ol_tx_put_desc_global_pool(pdev, tx_desc); - cdf_spin_unlock_bh(&pdev->tx_mutex); + qdf_spin_unlock_bh(&pdev->tx_mutex); } #else @@ -271,7 +271,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) ol_tx_desc_reset_pkt_type(tx_desc); ol_tx_desc_reset_timestamp(tx_desc); - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); ol_tx_put_desc_flow_pool(pool, tx_desc); switch (pool->status) { case FLOW_POOL_ACTIVE_PAUSED: @@ -284,7 +284,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) break; case FLOW_POOL_INVALID: if (pool->avail_desc == pool->flow_pool_size) { - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); ol_tx_free_invalid_flow_pool(pool); qdf_print("%s %d pool is INVALID State!!\n", __func__, __LINE__); @@ -298,7 +298,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) __func__, __LINE__); break; }; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); } #endif @@ -550,13 +550,13 @@ struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev) { struct cdf_tso_seg_elem_t *tso_seg = NULL; - cdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); if (pdev->tso_seg_pool.freelist) { pdev->tso_seg_pool.num_free--; tso_seg = pdev->tso_seg_pool.freelist; pdev->tso_seg_pool.freelist = pdev->tso_seg_pool.freelist->next; } - cdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); return tso_seg; } @@ -576,10 +576,10 @@ struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev) void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev, struct cdf_tso_seg_elem_t *tso_seg) { - cdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); tso_seg->next = pdev->tso_seg_pool.freelist; pdev->tso_seg_pool.freelist = tso_seg; pdev->tso_seg_pool.num_free++; - cdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); + qdf_spin_unlock_bh(&pdev->tso_seg_pool.tso_mutex); } #endif diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index ffc8de1277fb..47f0f19b4296 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -49,11 +49,11 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) /* acquire the mutex lock, since we'll be modifying the queues */ TX_SCHED_DEBUG_PRINT("Enter %s\n", __func__); - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); vdev->ll_pause.paused_reason |= reason; vdev->ll_pause.q_pause_cnt++; vdev->ll_pause.is_q_paused = true; - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_PAUSE, NULL, 0)); @@ -66,19 +66,19 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) /* acquire the mutex lock, since we'll be modifying the queues */ TX_SCHED_DEBUG_PRINT("Enter %s\n", __func__); - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); if (vdev->ll_pause.paused_reason & reason) { vdev->ll_pause.paused_reason &= ~reason; if (!vdev->ll_pause.paused_reason) { vdev->ll_pause.is_q_paused = false; vdev->ll_pause.q_unpause_cnt++; - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); ol_tx_vdev_ll_pause_queue_send(vdev); } else { - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } } else { - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_UNPAUSE, NULL, 0)); @@ -87,7 +87,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) { - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); qdf_timer_stop(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; while (vdev->ll_pause.txq.head) { @@ -103,7 +103,7 @@ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) } vdev->ll_pause.txq.tail = NULL; vdev->ll_pause.txq.depth = 0; - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } #endif /* defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) */ @@ -405,7 +405,7 @@ void ol_tx_throttle_init(struct ol_txrx_pdev_t *pdev) pdev->tx_throttle.current_throttle_level = THROTTLE_LEVEL_0; pdev->tx_throttle.current_throttle_phase = THROTTLE_PHASE_OFF; - cdf_spinlock_init(&pdev->tx_throttle.mutex); + qdf_spinlock_create(&pdev->tx_throttle.mutex); throttle_period = ol_cfg_throttle_period_ms(pdev->ctrl_pdev); diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 4e618f7161d8..1c085016a905 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -26,7 +26,7 @@ */ #include /* qdf_atomic_inc, etc. */ -#include /* cdf_os_spinlock */ +#include /* cdf_os_spinlock */ #include /* qdf_system_ticks, etc. */ #include /* cdf_nbuf_t */ #include /* ADF_NBUF_TX_EXT_TID_INVALID */ @@ -114,15 +114,15 @@ TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { \ if (qdf_atomic_read(&vdev->os_q_paused) && \ (vdev->tx_fl_hwm != 0)) { \ - cdf_spin_lock(&pdev->tx_mutex); \ + qdf_spin_lock(&pdev->tx_mutex); \ if (pdev->tx_desc.num_free > \ vdev->tx_fl_hwm) { \ qdf_atomic_set(&vdev->os_q_paused, 0); \ - cdf_spin_unlock(&pdev->tx_mutex); \ + qdf_spin_unlock(&pdev->tx_mutex); \ ol_txrx_flow_control_cb(vdev, true);\ } \ else { \ - cdf_spin_unlock(&pdev->tx_mutex); \ + qdf_spin_unlock(&pdev->tx_mutex); \ } \ } \ } \ @@ -504,7 +504,7 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev, tx_desc->status = status; netbuf = tx_desc->netbuf; - cdf_runtime_pm_put(); + qdf_runtime_pm_put(); cdf_nbuf_trace_update(netbuf, trace_str); /* Per SDU update of byte count */ byte_cnt += cdf_nbuf_len(netbuf); @@ -529,11 +529,11 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev, /* One shot protected access to pdev freelist, when setup */ if (lcl_freelist) { - cdf_spin_lock(&pdev->tx_mutex); + qdf_spin_lock(&pdev->tx_mutex); tx_desc_last->next = pdev->tx_desc.freelist; pdev->tx_desc.freelist = lcl_freelist; pdev->tx_desc.num_free += (uint16_t) num_msdus; - cdf_spin_unlock(&pdev->tx_mutex); + qdf_spin_unlock(&pdev->tx_mutex); } else { ol_tx_desc_frame_list_free(pdev, &tx_descs, status != htt_tx_status_ok); @@ -634,10 +634,10 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, } if (lcl_freelist) { - cdf_spin_lock(&pdev->tx_mutex); + qdf_spin_lock(&pdev->tx_mutex); tx_desc_last->next = pdev->tx_desc.freelist; pdev->tx_desc.freelist = lcl_freelist; - cdf_spin_unlock(&pdev->tx_mutex); + qdf_spin_unlock(&pdev->tx_mutex); } else { ol_tx_desc_frame_list_free(pdev, &tx_descs, htt_tx_status_discard); @@ -697,7 +697,7 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, cdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); - cdf_spin_lock_bh(&pdev->tx_delay.mutex); + qdf_spin_lock_bh(&pdev->tx_delay.mutex); index = 1 - pdev->tx_delay.cats[category].in_progress_idx; data = &pdev->tx_delay.cats[category].copies[index]; @@ -729,7 +729,7 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, *queue_delay_microsec = 0; } - cdf_spin_unlock_bh(&pdev->tx_delay.mutex); + qdf_spin_unlock_bh(&pdev->tx_delay.mutex); } void @@ -741,7 +741,7 @@ ol_tx_delay_hist(ol_txrx_pdev_handle pdev, cdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); - cdf_spin_lock_bh(&pdev->tx_delay.mutex); + qdf_spin_lock_bh(&pdev->tx_delay.mutex); index = 1 - pdev->tx_delay.cats[category].in_progress_idx; data = &pdev->tx_delay.cats[category].copies[index]; @@ -755,7 +755,7 @@ ol_tx_delay_hist(ol_txrx_pdev_handle pdev, } report_bin_values[i] = data->hist_bins_queue[j]; /* overflow */ - cdf_spin_unlock_bh(&pdev->tx_delay.mutex); + qdf_spin_unlock_bh(&pdev->tx_delay.mutex); } #ifdef QCA_COMPUTE_TX_DELAY_PER_TID @@ -917,7 +917,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, } /* since we may switch the ping-pong index, provide mutex w. readers */ - cdf_spin_lock_bh(&pdev->tx_delay.mutex); + qdf_spin_lock_bh(&pdev->tx_delay.mutex); index = pdev->tx_delay.cats[cat].in_progress_idx; data = &pdev->tx_delay.cats[cat].copies[index]; @@ -962,7 +962,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, sizeof(pdev->tx_delay.cats[cat].copies[index])); } - cdf_spin_unlock_bh(&pdev->tx_delay.mutex); + qdf_spin_unlock_bh(&pdev->tx_delay.mutex); } #endif /* QCA_COMPUTE_TX_DELAY */ diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 219a41d8a05a..fb09688bc85d 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -30,7 +30,7 @@ #include /* uint32_t, etc. */ #include /* cdf_mem_malloc,free */ #include /* qdf_device_t, qdf_print */ -#include /* cdf_spinlock */ +#include /* cdf_spinlock */ #include /* qdf_atomic_read */ /* Required for WLAN_FEATURE_FASTPATH */ @@ -199,9 +199,9 @@ ol_txrx_peer_find_by_local_id(struct ol_txrx_pdev_t *pdev, return NULL; } - cdf_spin_lock_bh(&pdev->local_peer_ids.lock); + qdf_spin_lock_bh(&pdev->local_peer_ids.lock); peer = pdev->local_peer_ids.map[local_peer_id]; - cdf_spin_unlock_bh(&pdev->local_peer_ids.lock); + qdf_spin_unlock_bh(&pdev->local_peer_ids.lock); return peer; } @@ -222,7 +222,7 @@ static void ol_txrx_local_peer_id_pool_init(struct ol_txrx_pdev_t *pdev) i = OL_TXRX_NUM_LOCAL_PEER_IDS; pdev->local_peer_ids.pool[i] = i; - cdf_spinlock_init(&pdev->local_peer_ids.lock); + qdf_spinlock_create(&pdev->local_peer_ids.lock); } static void @@ -231,7 +231,7 @@ ol_txrx_local_peer_id_alloc(struct ol_txrx_pdev_t *pdev, { int i; - cdf_spin_lock_bh(&pdev->local_peer_ids.lock); + qdf_spin_lock_bh(&pdev->local_peer_ids.lock); i = pdev->local_peer_ids.freelist; if (pdev->local_peer_ids.pool[i] == i) { /* the list is empty, except for the list-end marker */ @@ -242,7 +242,7 @@ ol_txrx_local_peer_id_alloc(struct ol_txrx_pdev_t *pdev, pdev->local_peer_ids.freelist = pdev->local_peer_ids.pool[i]; pdev->local_peer_ids.map[i] = peer; } - cdf_spin_unlock_bh(&pdev->local_peer_ids.lock); + qdf_spin_unlock_bh(&pdev->local_peer_ids.lock); } static void @@ -255,16 +255,16 @@ ol_txrx_local_peer_id_free(struct ol_txrx_pdev_t *pdev, return; } /* put this ID on the head of the freelist */ - cdf_spin_lock_bh(&pdev->local_peer_ids.lock); + qdf_spin_lock_bh(&pdev->local_peer_ids.lock); pdev->local_peer_ids.pool[i] = pdev->local_peer_ids.freelist; pdev->local_peer_ids.freelist = i; pdev->local_peer_ids.map[i] = NULL; - cdf_spin_unlock_bh(&pdev->local_peer_ids.lock); + qdf_spin_unlock_bh(&pdev->local_peer_ids.lock); } static void ol_txrx_local_peer_id_cleanup(struct ol_txrx_pdev_t *pdev) { - cdf_spinlock_destroy(&pdev->local_peer_ids.lock); + qdf_spinlock_destroy(&pdev->local_peer_ids.lock); } #else @@ -349,14 +349,14 @@ uint32_t ol_tx_get_total_free_desc(struct ol_txrx_pdev_t *pdev) uint32_t free_desc; free_desc = pdev->tx_desc.num_free; - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_FOREACH(pool, &pdev->tx_desc.flow_pool_list, flow_pool_list_elem) { - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); free_desc += pool->avail_desc; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); } - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); return free_desc; } @@ -802,10 +802,10 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) } /* initialize mutexes for tx desc alloc and peer lookup */ - cdf_spinlock_init(&pdev->tx_mutex); - cdf_spinlock_init(&pdev->peer_ref_mutex); - cdf_spinlock_init(&pdev->rx.mutex); - cdf_spinlock_init(&pdev->last_real_peer_mutex); + qdf_spinlock_create(&pdev->tx_mutex); + qdf_spinlock_create(&pdev->peer_ref_mutex); + qdf_spinlock_create(&pdev->rx.mutex); + qdf_spinlock_create(&pdev->last_real_peer_mutex); OL_TXRX_PEER_STATS_MUTEX_INIT(pdev); if (OL_RX_REORDER_TRACE_ATTACH(pdev) != A_OK) @@ -871,7 +871,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) #ifdef QCA_COMPUTE_TX_DELAY cdf_mem_zero(&pdev->tx_delay, sizeof(pdev->tx_delay)); - cdf_spinlock_init(&pdev->tx_delay.mutex); + qdf_spinlock_create(&pdev->tx_delay.mutex); /* initialize compute interval with 5 seconds (ESE default) */ pdev->tx_delay.avg_period_ticks = qdf_system_msecs_to_ticks(5000); @@ -928,10 +928,10 @@ pn_trace_attach_fail: OL_RX_REORDER_TRACE_DETACH(pdev); reorder_trace_attach_fail: - cdf_spinlock_destroy(&pdev->tx_mutex); - cdf_spinlock_destroy(&pdev->peer_ref_mutex); - cdf_spinlock_destroy(&pdev->rx.mutex); - cdf_spinlock_destroy(&pdev->last_real_peer_mutex); + qdf_spinlock_destroy(&pdev->tx_mutex); + qdf_spinlock_destroy(&pdev->peer_ref_mutex); + qdf_spinlock_destroy(&pdev->rx.mutex); + qdf_spinlock_destroy(&pdev->last_real_peer_mutex); OL_TXRX_PEER_STATS_MUTEX_DESTROY(pdev); control_init_fail: @@ -1045,13 +1045,13 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) ol_txrx_peer_find_detach(pdev); - cdf_spinlock_destroy(&pdev->tx_mutex); - cdf_spinlock_destroy(&pdev->peer_ref_mutex); - cdf_spinlock_destroy(&pdev->last_real_peer_mutex); - cdf_spinlock_destroy(&pdev->rx.mutex); + qdf_spinlock_destroy(&pdev->tx_mutex); + qdf_spinlock_destroy(&pdev->peer_ref_mutex); + qdf_spinlock_destroy(&pdev->last_real_peer_mutex); + qdf_spinlock_destroy(&pdev->rx.mutex); #ifdef QCA_SUPPORT_TX_THROTTLE /* Thermal Mitigation */ - cdf_spinlock_destroy(&pdev->tx_throttle.mutex); + qdf_spinlock_destroy(&pdev->tx_throttle.mutex); #endif OL_TXRX_PEER_STATS_MUTEX_DESTROY(pdev); @@ -1064,7 +1064,7 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) ol_txrx_local_peer_id_cleanup(pdev); #ifdef QCA_COMPUTE_TX_DELAY - cdf_spinlock_destroy(&pdev->tx_delay.mutex); + qdf_spinlock_destroy(&pdev->tx_delay.mutex); #endif } @@ -1104,7 +1104,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, vdev->ibss_peer_heart_beat_timer = 0; #endif - cdf_spinlock_init(&vdev->ll_pause.mutex); + qdf_spinlock_create(&vdev->ll_pause.mutex); vdev->ll_pause.paused_reason = 0; vdev->ll_pause.txq.head = vdev->ll_pause.txq.tail = NULL; vdev->ll_pause.txq.depth = 0; @@ -1117,7 +1117,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, vdev->tx_fl_lwm = 0; vdev->tx_fl_hwm = 0; vdev->wait_on_peer_id = OL_TXRX_INVALID_LOCAL_PEER_ID; - cdf_spinlock_init(&vdev->flow_control_lock); + qdf_spinlock_create(&vdev->flow_control_lock); vdev->osif_flow_control_cb = NULL; vdev->osif_fc_ctx = NULL; @@ -1185,7 +1185,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, /* preconditions */ TXRX_ASSERT2(vdev); - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); qdf_timer_stop(&vdev->ll_pause.timer); qdf_timer_free(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; @@ -1197,14 +1197,14 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, cdf_nbuf_tx_free(vdev->ll_pause.txq.head, NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); - cdf_spinlock_destroy(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spinlock_destroy(&vdev->ll_pause.mutex); - cdf_spin_lock_bh(&vdev->flow_control_lock); + qdf_spin_lock_bh(&vdev->flow_control_lock); vdev->osif_flow_control_cb = NULL; vdev->osif_fc_ctx = NULL; - cdf_spin_unlock_bh(&vdev->flow_control_lock); - cdf_spinlock_destroy(&vdev->flow_control_lock); + qdf_spin_unlock_bh(&vdev->flow_control_lock); + qdf_spinlock_destroy(&vdev->flow_control_lock); /* remove the vdev from its parent pdev's list */ TAILQ_REMOVE(&pdev->vdev_list, vdev, vdev_list_elem); @@ -1213,7 +1213,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, * Use peer_ref_mutex while accessing peer_list, in case * a peer is in the process of being removed from the list. */ - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); /* check that the vdev has no peers allocated */ if (!TAILQ_EMPTY(&vdev->peer_list)) { /* debug print - will be removed later */ @@ -1228,10 +1228,10 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, vdev->delete.pending = 1; vdev->delete.callback = callback; vdev->delete.context = context; - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return; } - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "%s: deleting vdev obj %p (%02x:%02x:%02x:%02x:%02x:%02x)\n", @@ -1273,19 +1273,19 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, } cdf_assert(cds_ctx); - cdf_spin_lock_bh(&peer->peer_info_lock); + qdf_spin_lock_bh(&peer->peer_info_lock); if (peer->state >= ol_txrx_peer_state_conn) data_rx = peer->osif_rx; else drop = true; - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); - cdf_spin_lock_bh(&peer->bufq_lock); + qdf_spin_lock_bh(&peer->bufq_lock); cache_buf = list_entry((&peer->cached_bufq)->next, typeof(*cache_buf), list); while (!list_empty(&peer->cached_bufq)) { list_del(&cache_buf->list); - cdf_spin_unlock_bh(&peer->bufq_lock); + qdf_spin_unlock_bh(&peer->bufq_lock); if (drop) { cdf_nbuf_free(cache_buf->buf); } else { @@ -1295,11 +1295,11 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, cdf_nbuf_free(cache_buf->buf); } cdf_mem_free(cache_buf); - cdf_spin_lock_bh(&peer->bufq_lock); + qdf_spin_lock_bh(&peer->bufq_lock); cache_buf = list_entry((&peer->cached_bufq)->next, typeof(*cache_buf), list); } - cdf_spin_unlock_bh(&peer->bufq_lock); + qdf_spin_unlock_bh(&peer->bufq_lock); qdf_atomic_dec(&peer->flush_in_progress); } @@ -1319,7 +1319,7 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, TXRX_ASSERT2(vdev); TXRX_ASSERT2(peer_mac_addr); - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); /* check for duplicate exsisting peer */ TAILQ_FOREACH(temp_peer, &vdev->peer_list, peer_list_elem) { if (!ol_txrx_peer_find_mac_addr_cmp(&temp_peer->mac_addr, @@ -1335,12 +1335,12 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, qdf_event_create(&vdev->wait_delete_comp); wait_on_deletion = true; } else { - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return NULL; } } } - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); if (wait_on_deletion) { /* wait for peer deletion */ @@ -1366,10 +1366,10 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, OL_TXRX_MAC_ADDR_LEN); INIT_LIST_HEAD(&peer->cached_bufq); - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); /* add this peer into the vdev's list */ TAILQ_INSERT_TAIL(&vdev->peer_list, peer, peer_list_elem); - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); /* check whether this is a real peer (peer mac addr != vdev mac addr) */ if (ol_txrx_peer_find_mac_addr_cmp(&vdev->mac_addr, &peer->mac_addr)) vdev->last_real_peer = peer; @@ -1384,8 +1384,8 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, peer->osif_rx = NULL; - cdf_spinlock_init(&peer->peer_info_lock); - cdf_spinlock_init(&peer->bufq_lock); + qdf_spinlock_create(&peer->peer_info_lock); + qdf_spinlock_create(&peer->bufq_lock); qdf_atomic_init(&peer->delete_in_progress); qdf_atomic_init(&peer->flush_in_progress); @@ -1700,7 +1700,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) * vdev's list of peers is empty, to make sure that list is not modified * concurrently with the empty check. */ - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); if (qdf_atomic_dec_and_test(&peer->ref_cnt)) { u_int16_t peer_id; @@ -1749,7 +1749,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) * Now that there are no references to the peer, * we can release the peer reference lock. */ - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "%s: deleting vdev object %p " @@ -1767,10 +1767,10 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) if (vdev_delete_cb) vdev_delete_cb(vdev_delete_context); } else { - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); } } else { - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); } /* @@ -1795,7 +1795,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) cdf_mem_free(peer); } else { - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); } } @@ -1824,14 +1824,14 @@ void ol_txrx_peer_detach(ol_txrx_peer_handle peer) if (peer->vdev->last_real_peer == peer) peer->vdev->last_real_peer = NULL; - cdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); + qdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); if (vdev->last_real_peer == peer) vdev->last_real_peer = NULL; - cdf_spin_unlock_bh(&vdev->pdev->last_real_peer_mutex); + qdf_spin_unlock_bh(&vdev->pdev->last_real_peer_mutex); htt_rx_reorder_log_print(peer->vdev->pdev->htt_pdev); - cdf_spinlock_destroy(&peer->peer_info_lock); - cdf_spinlock_destroy(&peer->bufq_lock); + qdf_spinlock_destroy(&peer->peer_info_lock); + qdf_spinlock_destroy(&peer->bufq_lock); /* set delete_in_progress to identify that wma * is waiting for unmap massage for this peer */ qdf_atomic_set(&peer->delete_in_progress, 1); @@ -2056,7 +2056,7 @@ ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, struct ol_txrx_stats_req *req, } if (req->wait.blocking) - while (cdf_semaphore_acquire(pdev->osdev, req->wait.sem_ptr)) + while (qdf_semaphore_acquire(req->wait.sem_ptr)) ; if (response_expected == false) @@ -2250,8 +2250,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (!more) { if (req->base.wait.blocking) - cdf_semaphore_release(pdev->osdev, - req->base.wait.sem_ptr); + qdf_semaphore_release(req->base.wait.sem_ptr); cdf_mem_free(req); } } @@ -2539,9 +2538,9 @@ ol_txrx_peer_stats_copy(ol_txrx_pdev_handle pdev, ol_txrx_peer_handle peer, ol_txrx_peer_stats_t *stats) { cdf_assert(pdev && peer && stats); - cdf_spin_lock_bh(&pdev->peer_stat_mutex); + qdf_spin_lock_bh(&pdev->peer_stat_mutex); cdf_mem_copy(stats, &peer->stats, sizeof(*stats)); - cdf_spin_unlock_bh(&pdev->peer_stat_mutex); + qdf_spin_unlock_bh(&pdev->peer_stat_mutex); return A_OK; } #endif /* QCA_ENABLE_OL_TXRX_PEER_STATS */ @@ -2611,10 +2610,10 @@ int ol_txrx_register_tx_flow_control (uint8_t vdev_id, return -EINVAL; } - cdf_spin_lock_bh(&vdev->flow_control_lock); + qdf_spin_lock_bh(&vdev->flow_control_lock); vdev->osif_flow_control_cb = flowControl; vdev->osif_fc_ctx = osif_fc_ctx; - cdf_spin_unlock_bh(&vdev->flow_control_lock); + qdf_spin_unlock_bh(&vdev->flow_control_lock); return 0; } @@ -2633,10 +2632,10 @@ int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id) return -EINVAL; } - cdf_spin_lock_bh(&vdev->flow_control_lock); + qdf_spin_lock_bh(&vdev->flow_control_lock); vdev->osif_flow_control_cb = NULL; vdev->osif_fc_ctx = NULL; - cdf_spin_unlock_bh(&vdev->flow_control_lock); + qdf_spin_unlock_bh(&vdev->flow_control_lock); return 0; } @@ -2666,17 +2665,17 @@ ol_txrx_get_tx_resource(uint8_t sta_id, return true; } - cdf_spin_lock_bh(&vdev->pdev->tx_mutex); + qdf_spin_lock_bh(&vdev->pdev->tx_mutex); if (vdev->pdev->tx_desc.num_free < (uint16_t) low_watermark) { vdev->tx_fl_lwm = (uint16_t) low_watermark; vdev->tx_fl_hwm = (uint16_t) (low_watermark + high_watermark_offset); /* Not enough free resource, stop TX OS Q */ qdf_atomic_set(&vdev->os_q_paused, 1); - cdf_spin_unlock_bh(&vdev->pdev->tx_mutex); + qdf_spin_unlock_bh(&vdev->pdev->tx_mutex); return false; } - cdf_spin_unlock_bh(&vdev->pdev->tx_mutex); + qdf_spin_unlock_bh(&vdev->pdev->tx_mutex); return true; } @@ -2697,9 +2696,9 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth) return -EINVAL; } - cdf_spin_lock_bh(&vdev->ll_pause.mutex); + qdf_spin_lock_bh(&vdev->ll_pause.mutex); vdev->ll_pause.max_q_depth = pause_q_depth; - cdf_spin_unlock_bh(&vdev->ll_pause.mutex); + qdf_spin_unlock_bh(&vdev->ll_pause.mutex); return 0; } @@ -2714,10 +2713,10 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth) inline void ol_txrx_flow_control_cb(ol_txrx_vdev_handle vdev, bool tx_resume) { - cdf_spin_lock_bh(&vdev->flow_control_lock); + qdf_spin_lock_bh(&vdev->flow_control_lock); if ((vdev->osif_flow_control_cb) && (vdev->osif_fc_ctx)) vdev->osif_flow_control_cb(vdev->osif_fc_ctx, tx_resume); - cdf_spin_unlock_bh(&vdev->flow_control_lock); + qdf_spin_unlock_bh(&vdev->flow_control_lock); return; } @@ -2996,21 +2995,21 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, if (cdf_unlikely(!cds_ctx)) goto free_buf; - cdf_spin_lock_bh(&peer->peer_info_lock); + qdf_spin_lock_bh(&peer->peer_info_lock); if (cdf_unlikely(!(peer->state >= ol_txrx_peer_state_conn))) { - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); goto free_buf; } data_rx = peer->osif_rx; - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); - cdf_spin_lock_bh(&peer->bufq_lock); + qdf_spin_lock_bh(&peer->bufq_lock); if (!list_empty(&peer->cached_bufq)) { - cdf_spin_unlock_bh(&peer->bufq_lock); + qdf_spin_unlock_bh(&peer->bufq_lock); /* Flush the cached frames to HDD before passing new rx frame */ ol_txrx_flush_rx_frames(peer, 0); } else - cdf_spin_unlock_bh(&peer->bufq_lock); + qdf_spin_unlock_bh(&peer->bufq_lock); buf = buf_list; while (buf) { @@ -3057,10 +3056,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, goto drop_rx_buf; } - cdf_spin_lock_bh(&peer->peer_info_lock); + qdf_spin_lock_bh(&peer->peer_info_lock); if (peer->state >= ol_txrx_peer_state_conn) data_rx = peer->osif_rx; - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); /* * If there is a data frame from peer before the peer is @@ -3081,10 +3080,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, /* Add NULL terminator */ cdf_nbuf_set_next(buf, NULL); cache_buf->buf = buf; - cdf_spin_lock_bh(&peer->bufq_lock); + qdf_spin_lock_bh(&peer->bufq_lock); list_add_tail(&cache_buf->list, &peer->cached_bufq); - cdf_spin_unlock_bh(&peer->bufq_lock); + qdf_spin_unlock_bh(&peer->bufq_lock); } buf = next_buf; } @@ -3164,10 +3163,10 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, if (!peer) return QDF_STATUS_E_FAULT; - cdf_spin_lock_bh(&peer->peer_info_lock); + qdf_spin_lock_bh(&peer->peer_info_lock); peer->osif_rx = rxcb; peer->state = ol_txrx_peer_state_conn; - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); param.qos_capable = sta_desc->is_qos_enabled; ol_txrx_peer_update(peer->vdev, peer->mac_addr.raw, ¶m, @@ -3223,10 +3222,10 @@ QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) /* Purge the cached rx frame queue */ ol_txrx_flush_rx_frames(peer, 1); - cdf_spin_lock_bh(&peer->peer_info_lock); + qdf_spin_lock_bh(&peer->peer_info_lock); peer->osif_rx = NULL; peer->state = ol_txrx_peer_state_disc; - cdf_spin_unlock_bh(&peer->peer_info_lock); + qdf_spin_unlock_bh(&peer->peer_info_lock); return QDF_STATUS_SUCCESS; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 71163d8f4662..ba194c58d042 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -109,7 +109,7 @@ ol_tx_deregister_global_mgmt_pool(struct ol_txrx_pdev_t *pdev) */ void ol_tx_register_flow_control(struct ol_txrx_pdev_t *pdev) { - cdf_spinlock_init(&pdev->tx_desc.flow_pool_list_lock); + qdf_spinlock_create(&pdev->tx_desc.flow_pool_list_lock); TAILQ_INIT(&pdev->tx_desc.flow_pool_list); if (!ol_tx_get_is_mgmt_over_wmi_enabled()) @@ -127,7 +127,7 @@ void ol_tx_deregister_flow_control(struct ol_txrx_pdev_t *pdev) if (!ol_tx_get_is_mgmt_over_wmi_enabled()) ol_tx_deregister_global_mgmt_pool(pdev); - cdf_spinlock_destroy(&pdev->tx_desc.flow_pool_list_lock); + qdf_spinlock_destroy(&pdev->tx_desc.flow_pool_list_lock); if (!TAILQ_EMPTY(&pdev->tx_desc.flow_pool_list)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "flow pool list is not empty!!!\n"); @@ -168,13 +168,13 @@ void ol_tx_dump_flow_pool_info(void) * Always take in below order. * flow_pool_list_lock -> flow_pool_lock */ - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_FOREACH(pool, &pdev->tx_desc.flow_pool_list, flow_pool_list_elem) { - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); cdf_mem_copy(&tmp_pool, pool, sizeof(tmp_pool)); - cdf_spin_unlock_bh(&pool->flow_pool_lock); - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Flow_pool_id %d :: status %d\n", tmp_pool.flow_pool_id, tmp_pool.status); @@ -188,9 +188,9 @@ void ol_tx_dump_flow_pool_info(void) TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Member flow_id %d :: flow_type %d\n", tmp_pool.member_flow_id, tmp_pool.flow_type); - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); } - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); return; } @@ -229,17 +229,17 @@ static int ol_tx_move_desc_n(struct ol_tx_flow_pool_t *src_pool, union ol_tx_desc_list_elem_t *temp_list = NULL; /* Take descriptors from source pool and put it in temp_list */ - cdf_spin_lock_bh(&src_pool->flow_pool_lock); + qdf_spin_lock_bh(&src_pool->flow_pool_lock); for (i = 0; i < desc_move_count; i++) { tx_desc = ol_tx_get_desc_flow_pool(src_pool); ((union ol_tx_desc_list_elem_t *)tx_desc)->next = temp_list; temp_list = (union ol_tx_desc_list_elem_t *)tx_desc; } - cdf_spin_unlock_bh(&src_pool->flow_pool_lock); + qdf_spin_unlock_bh(&src_pool->flow_pool_lock); /* Take descriptors from temp_list and put it in destination pool */ - cdf_spin_lock_bh(&dst_pool->flow_pool_lock); + qdf_spin_lock_bh(&dst_pool->flow_pool_lock); for (i = 0; i < desc_move_count; i++) { if (dst_pool->deficient_desc) dst_pool->deficient_desc--; @@ -250,16 +250,16 @@ static int ol_tx_move_desc_n(struct ol_tx_flow_pool_t *src_pool, ol_tx_put_desc_flow_pool(dst_pool, tx_desc); count++; } - cdf_spin_unlock_bh(&dst_pool->flow_pool_lock); + qdf_spin_unlock_bh(&dst_pool->flow_pool_lock); /* If anything is there in temp_list put it back to source pool */ - cdf_spin_lock_bh(&src_pool->flow_pool_lock); + qdf_spin_lock_bh(&src_pool->flow_pool_lock); while (temp_list) { tx_desc = &temp_list->tx_desc; temp_list = temp_list->next; ol_tx_put_desc_flow_pool(src_pool, tx_desc); } - cdf_spin_unlock_bh(&src_pool->flow_pool_lock); + qdf_spin_unlock_bh(&src_pool->flow_pool_lock); return count; } @@ -287,25 +287,25 @@ ol_tx_distribute_descs_to_deficient_pools(struct ol_tx_flow_pool_t *src_pool) "%s: pdev is NULL\n", __func__); return -EINVAL; } - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_FOREACH(dst_pool, &pdev->tx_desc.flow_pool_list, flow_pool_list_elem) { - cdf_spin_lock_bh(&dst_pool->flow_pool_lock); + qdf_spin_lock_bh(&dst_pool->flow_pool_lock); if (dst_pool->deficient_desc) { desc_move_count = (dst_pool->deficient_desc > desc_count) ? desc_count : dst_pool->deficient_desc; - cdf_spin_unlock_bh(&dst_pool->flow_pool_lock); + qdf_spin_unlock_bh(&dst_pool->flow_pool_lock); desc_move_count = ol_tx_move_desc_n(src_pool, dst_pool, desc_move_count); desc_count -= desc_move_count; - cdf_spin_lock_bh(&dst_pool->flow_pool_lock); + qdf_spin_lock_bh(&dst_pool->flow_pool_lock); } - cdf_spin_unlock_bh(&dst_pool->flow_pool_lock); + qdf_spin_unlock_bh(&dst_pool->flow_pool_lock); if (desc_count == 0) break; } - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); return 0; } @@ -349,10 +349,10 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, pool->status = FLOW_POOL_ACTIVE_UNPAUSED; pool->start_th = (start_threshold * flow_pool_size)/100; pool->stop_th = (stop_threshold * flow_pool_size)/100; - cdf_spinlock_init(&pool->flow_pool_lock); + qdf_spinlock_create(&pool->flow_pool_lock); /* Take TX descriptor from global_pool and put it in temp_list*/ - cdf_spin_lock_bh(&pdev->tx_mutex); + qdf_spin_lock_bh(&pdev->tx_mutex); if (pdev->tx_desc.num_free >= pool->flow_pool_size) size = pool->flow_pool_size; else @@ -365,7 +365,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, temp_list = (union ol_tx_desc_list_elem_t *)tx_desc; } - cdf_spin_unlock_bh(&pdev->tx_mutex); + qdf_spin_unlock_bh(&pdev->tx_mutex); /* put temp_list to flow_pool */ pool->freelist = temp_list; @@ -373,10 +373,10 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, pool->deficient_desc = pool->flow_pool_size - pool->avail_desc; /* Add flow_pool to flow_pool_list */ - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_INSERT_TAIL(&pdev->tx_desc.flow_pool_list, pool, flow_pool_list_elem); - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); return pool; } @@ -403,11 +403,11 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) return -ENOMEM; } - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_REMOVE(&pdev->tx_desc.flow_pool_list, pool, flow_pool_list_elem); - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); if (pool->avail_desc == pool->flow_pool_size) pool->status = FLOW_POOL_INACTIVE; else @@ -420,14 +420,14 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) pool->avail_desc = 0; if (pool->status == FLOW_POOL_INACTIVE) { - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); /* Free flow_pool */ - cdf_spinlock_destroy(&pool->flow_pool_lock); + qdf_spinlock_destroy(&pool->flow_pool_lock); cdf_mem_free(pool); } else { /* FLOW_POOL_INVALID case*/ pool->flow_pool_size -= size; pool->flow_pool_id = INVALID_FLOW_ID; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); pdev->tx_desc.num_invalid_bin++; TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -436,21 +436,21 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) if (pdev->tx_desc.num_invalid_bin > MAX_INVALID_BIN) ASSERT(0); - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_INSERT_TAIL(&pdev->tx_desc.flow_pool_list, pool, flow_pool_list_elem); - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); } /* put free descriptors to global pool */ - cdf_spin_lock_bh(&pdev->tx_mutex); + qdf_spin_lock_bh(&pdev->tx_mutex); for (i = 0; i < size; i++) { tx_desc = &temp_list->tx_desc; temp_list = temp_list->next; ol_tx_put_desc_global_pool(pdev, tx_desc); } - cdf_spin_unlock_bh(&pdev->tx_mutex); + qdf_spin_unlock_bh(&pdev->tx_mutex); return 0; } @@ -475,9 +475,9 @@ int ol_tx_free_invalid_flow_pool(struct ol_tx_flow_pool_t *pool) /* direclty distribute to other deficient pools */ ol_tx_distribute_descs_to_deficient_pools(pool); - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); pool->flow_pool_size = pool->avail_desc; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); pdev->tx_desc.num_invalid_bin--; TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -499,18 +499,18 @@ struct ol_tx_flow_pool_t *ol_tx_get_flow_pool(uint8_t flow_pool_id) struct ol_tx_flow_pool_t *pool = NULL; bool is_found = false; - cdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_lock_bh(&pdev->tx_desc.flow_pool_list_lock); TAILQ_FOREACH(pool, &pdev->tx_desc.flow_pool_list, flow_pool_list_elem) { - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); if (pool->flow_pool_id == flow_pool_id) { - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); is_found = true; break; } - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); } - cdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); + qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); if (is_found == false) pool = NULL; @@ -541,9 +541,9 @@ void ol_tx_flow_pool_vdev_map(struct ol_tx_flow_pool_t *pool, } vdev->pool = pool; - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); pool->member_flow_id = vdev_id; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); return; } @@ -569,9 +569,9 @@ void ol_tx_flow_pool_vdev_unmap(struct ol_tx_flow_pool_t *pool, } vdev->pool = NULL; - cdf_spin_lock_bh(&pool->flow_pool_lock); + qdf_spin_lock_bh(&pool->flow_pool_lock); pool->member_flow_id = INVALID_FLOW_ID; - cdf_spin_unlock_bh(&pool->flow_pool_lock); + qdf_spin_unlock_bh(&pool->flow_pool_lock); return; } diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 6d6308fb96a3..6d72059ea9a4 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -611,10 +611,10 @@ NOT_IP_TCP: #ifdef QCA_ENABLE_OL_TXRX_PEER_STATS #define OL_TXRX_PEER_STATS_UPDATE_BASE(peer, tx_or_rx, type, msdu) \ do { \ - cdf_spin_lock_bh(&peer->vdev->pdev->peer_stat_mutex); \ + qdf_spin_lock_bh(&peer->vdev->pdev->peer_stat_mutex); \ peer->stats.tx_or_rx.frms.type += 1; \ peer->stats.tx_or_rx.bytes.type += cdf_nbuf_len(msdu); \ - cdf_spin_unlock_bh(&peer->vdev->pdev->peer_stat_mutex); \ + qdf_spin_unlock_bh(&peer->vdev->pdev->peer_stat_mutex); \ } while (0) #define OL_TXRX_PEER_STATS_UPDATE(peer, tx_or_rx, msdu) \ do { \ @@ -648,9 +648,9 @@ NOT_IP_TCP: #define OL_RX_PEER_STATS_UPDATE(peer, msdu) \ OL_TXRX_PEER_STATS_UPDATE(peer, rx, msdu) #define OL_TXRX_PEER_STATS_MUTEX_INIT(pdev) \ - cdf_spinlock_init(&pdev->peer_stat_mutex) + qdf_spinlock_create(&pdev->peer_stat_mutex) #define OL_TXRX_PEER_STATS_MUTEX_DESTROY(pdev) \ - cdf_spinlock_destroy(&pdev->peer_stat_mutex) + qdf_spinlock_destroy(&pdev->peer_stat_mutex) #else #define OL_TX_PEER_STATS_UPDATE(peer, msdu) /* no-op */ #define OL_RX_PEER_STATS_UPDATE(peer, msdu) /* no-op */ diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 2a6619e8eaf6..54607e5db77d 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -157,7 +157,7 @@ ol_txrx_peer_find_hash_add(struct ol_txrx_pdev_t *pdev, unsigned index; index = ol_txrx_peer_find_hash_index(pdev, &peer->mac_addr); - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); /* * It is important to add the new peer at the tail of the peer list * with the bin index. Together with having the hash_find function @@ -166,7 +166,7 @@ ol_txrx_peer_find_hash_add(struct ol_txrx_pdev_t *pdev, * found first. */ TAILQ_INSERT_TAIL(&pdev->peer_hash.bins[index], peer, hash_list_elem); - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); } struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev, @@ -187,7 +187,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev, mac_addr = &local_mac_addr_aligned; } index = ol_txrx_peer_find_hash_index(pdev, mac_addr); - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); TAILQ_FOREACH(peer, &pdev->peer_hash.bins[index], hash_list_elem) { if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) == 0 && (check_valid == 0 || peer->valid) @@ -195,11 +195,11 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev, /* found it - increment the ref count before releasing the lock */ qdf_atomic_inc(&peer->ref_cnt); - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return peer; } } - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return NULL; /* failure */ } @@ -220,18 +220,18 @@ struct ol_txrx_peer_t *ol_txrx_peer_find_hash_find(struct ol_txrx_pdev_t *pdev, mac_addr = &local_mac_addr_aligned; } index = ol_txrx_peer_find_hash_index(pdev, mac_addr); - cdf_spin_lock_bh(&pdev->peer_ref_mutex); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); TAILQ_FOREACH(peer, &pdev->peer_hash.bins[index], hash_list_elem) { if (ol_txrx_peer_find_mac_addr_cmp(mac_addr, &peer->mac_addr) == 0 && (check_valid == 0 || peer->valid)) { /* found it - increment the ref count before releasing the lock */ qdf_atomic_inc(&peer->ref_cnt); - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return peer; } } - cdf_spin_unlock_bh(&pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&pdev->peer_ref_mutex); return NULL; /* failure */ } @@ -256,9 +256,9 @@ ol_txrx_peer_find_hash_remove(struct ol_txrx_pdev_t *pdev, * peer ref count is decremented to zero, but just before the peer * object reference is removed from the hash table. */ - /* cdf_spin_lock_bh(&pdev->peer_ref_mutex); */ + /* qdf_spin_lock_bh(&pdev->peer_ref_mutex); */ TAILQ_REMOVE(&pdev->peer_hash.bins[index], peer, hash_list_elem); - /* cdf_spin_unlock_bh(&pdev->peer_ref_mutex); */ + /* qdf_spin_unlock_bh(&pdev->peer_ref_mutex); */ } void ol_txrx_peer_find_hash_erase(struct ol_txrx_pdev_t *pdev) @@ -434,7 +434,7 @@ struct ol_txrx_peer_t *ol_txrx_assoc_peer_find(struct ol_txrx_vdev_t *vdev) { struct ol_txrx_peer_t *peer; - cdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); + qdf_spin_lock_bh(&vdev->pdev->last_real_peer_mutex); /* * Check the TXRX Peer is itself valid And also * if HTT Peer ID has been setup for this peer @@ -446,7 +446,7 @@ struct ol_txrx_peer_t *ol_txrx_assoc_peer_find(struct ol_txrx_vdev_t *vdev) } else { peer = NULL; } - cdf_spin_unlock_bh(&vdev->pdev->last_real_peer_mutex); + qdf_spin_unlock_bh(&vdev->pdev->last_real_peer_mutex); return peer; } diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 86466f0a5e07..b205a1c8314c 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -40,7 +40,7 @@ #include /* qdf_atomic_t */ #include /* wdi_event_subscribe */ #include /* qdf_timer_t */ -#include /* cdf_spinlock */ +#include /* cdf_spinlock */ #include /* ol_pktlog_dev_handle */ #include #include @@ -76,8 +76,8 @@ #define OL_TXRX_MGMT_TYPE_BASE htt_pkt_num_types #define OL_TXRX_MGMT_NUM_TYPES 8 -#define OL_TX_MUTEX_TYPE cdf_spinlock_t -#define OL_RX_MUTEX_TYPE cdf_spinlock_t +#define OL_TX_MUTEX_TYPE qdf_spinlock_t +#define OL_RX_MUTEX_TYPE qdf_spinlock_t /* TXRX Histogram defines */ #define TXRX_DATA_HISTROGRAM_GRANULARITY 1000 @@ -374,7 +374,7 @@ struct ol_txrx_pool_stats { */ struct ol_tx_flow_pool_t { TAILQ_ENTRY(ol_tx_flow_pool_t) flow_pool_list_elem; - cdf_spinlock_t flow_pool_lock; + qdf_spinlock_t flow_pool_lock; uint8_t flow_pool_id; uint16_t flow_pool_size; uint16_t avail_desc; @@ -530,7 +530,7 @@ struct ol_txrx_pdev_t { struct ol_tx_reorder_cat_timeout_t access_cats[TXRX_NUM_WMM_AC]; } reorder_timeout; - cdf_spinlock_t mutex; + qdf_spinlock_t mutex; } rx; /* rx proc function */ @@ -559,7 +559,7 @@ struct ol_txrx_pdev_t { union ol_tx_desc_list_elem_t *freelist; #ifdef QCA_LL_TX_FLOW_CONTROL_V2 uint8_t num_invalid_bin; - cdf_spinlock_t flow_pool_list_lock; + qdf_spinlock_t flow_pool_list_lock; TAILQ_HEAD(flow_pool_list_t, ol_tx_flow_pool_t) flow_pool_list; #endif uint32_t page_size; @@ -686,7 +686,7 @@ struct ol_txrx_pdev_t { } tx_queue; #ifdef QCA_ENABLE_OL_TXRX_PEER_STATS - cdf_spinlock_t peer_stat_mutex; + qdf_spinlock_t peer_stat_mutex; #endif int rssi_update_shift; @@ -695,7 +695,7 @@ struct ol_txrx_pdev_t { struct { ol_txrx_local_peer_id_t pool[OL_TXRX_NUM_LOCAL_PEER_IDS + 1]; ol_txrx_local_peer_id_t freelist; - cdf_spinlock_t lock; + qdf_spinlock_t lock; ol_txrx_peer_handle map[OL_TXRX_NUM_LOCAL_PEER_IDS]; } local_peer_ids; #endif @@ -708,7 +708,7 @@ struct ol_txrx_pdev_t { #define QCA_TX_DELAY_NUM_CATEGORIES 1 #endif struct { - cdf_spinlock_t mutex; + qdf_spinlock_t mutex; struct { struct ol_tx_delay_data copies[2]; /* ping-pong */ int in_progress_idx; @@ -726,7 +726,7 @@ struct ol_txrx_pdev_t { #endif /* QCA_COMPUTE_TX_DELAY */ struct { - cdf_spinlock_t mutex; + qdf_spinlock_t mutex; /* timer used to monitor the throttle "on" phase and "off" phase */ qdf_timer_t phase_timer; @@ -832,7 +832,7 @@ struct ol_txrx_vdev_t { int depth; } txq; uint32_t paused_reason; - cdf_spinlock_t mutex; + qdf_spinlock_t mutex; qdf_timer_t timer; int max_q_depth; bool is_q_paused; @@ -845,7 +845,7 @@ struct ol_txrx_vdev_t { qdf_atomic_t os_q_paused; uint16_t tx_fl_lwm; uint16_t tx_fl_hwm; - cdf_spinlock_t flow_control_lock; + qdf_spinlock_t flow_control_lock; ol_txrx_tx_flow_control_fp osif_flow_control_cb; void *osif_fc_ctx; uint16_t wait_on_peer_id; @@ -924,9 +924,9 @@ struct ol_txrx_peer_t { * for all systems. */ enum ol_txrx_peer_state state; - cdf_spinlock_t peer_info_lock; + qdf_spinlock_t peer_info_lock; ol_rx_callback_fp osif_rx; - cdf_spinlock_t bufq_lock; + qdf_spinlock_t bufq_lock; struct list_head cached_bufq; ol_tx_filter_func tx_filter; diff --git a/core/hdd/inc/wlan_hdd_lro.h b/core/hdd/inc/wlan_hdd_lro.h index db4ea2778105..bb58b973c2b7 100644 --- a/core/hdd/inc/wlan_hdd_lro.h +++ b/core/hdd/inc/wlan_hdd_lro.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -72,7 +72,7 @@ struct hdd_lro_desc_entry { struct hdd_lro_desc_pool { struct hdd_lro_desc_entry *lro_desc_array; struct list_head lro_free_list_head; - cdf_spinlock_t lro_pool_lock; + qdf_spinlock_t lro_pool_lock; }; /** @@ -93,7 +93,7 @@ struct hdd_lro_desc_table { */ struct hdd_lro_desc_info { struct hdd_lro_desc_table *lro_hash_table; - cdf_spinlock_t lro_hash_lock; + qdf_spinlock_t lro_hash_lock; struct hdd_lro_desc_pool lro_desc_pool; }; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index f0c5268f3bae..2307ae40fd10 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1105,7 +1105,7 @@ struct hdd_context_s { struct wiphy *wiphy; /* TODO Remove this from here. */ - cdf_spinlock_t hdd_adapter_lock; + qdf_spinlock_t hdd_adapter_lock; qdf_list_t hddAdapters; /* List of adapters */ /* One per STA: 1 for BCMC_STA_ID, 1 for each SAP_SELF_STA_ID, 1 for WDS_STAID */ @@ -1163,10 +1163,10 @@ struct hdd_context_s { struct qdf_mac_addr p2pDeviceAddress; #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK - cdf_wake_lock_t rx_wake_lock; + qdf_wake_lock_t rx_wake_lock; #endif - cdf_wake_lock_t sap_wake_lock; + qdf_wake_lock_t sap_wake_lock; #ifdef FEATURE_WLAN_TDLS eTDLSSupportMode tdls_mode; @@ -1202,7 +1202,7 @@ struct hdd_context_s { /* Use below lock to protect access to isSchedScanUpdatePending * since it will be accessed in two different contexts. */ - cdf_spinlock_t sched_scan_lock; + qdf_spinlock_t sched_scan_lock; /* Flag keeps track of wiphy suspend/resume */ bool isWiphySuspended; @@ -1274,7 +1274,7 @@ struct hdd_context_s { uint8_t skip_acs_scan_status; #endif - cdf_wake_lock_t sap_dfs_wakelock; + qdf_wake_lock_t sap_dfs_wakelock; atomic_t sap_dfs_ref_cnt; #ifdef WLAN_FEATURE_EXTWOW_SUPPORT @@ -1289,9 +1289,9 @@ struct hdd_context_s { unsigned long g_event_flags; /* RoC request queue and work */ struct delayed_work roc_req_work; - cdf_spinlock_t hdd_roc_req_q_lock; + qdf_spinlock_t hdd_roc_req_q_lock; qdf_list_t hdd_roc_req_q; - cdf_spinlock_t hdd_scan_req_q_lock; + qdf_spinlock_t hdd_scan_req_q_lock; qdf_list_t hdd_scan_req_q; uint8_t miracast_value; #ifdef WLAN_NS_OFFLOAD @@ -1319,7 +1319,7 @@ struct hdd_context_s { cdf_mc_timer_t dbs_opportunistic_timer; bool connection_in_progress; - cdf_spinlock_t connection_status_lock; + qdf_spinlock_t connection_status_lock; uint16_t hdd_txrx_hist_idx; struct hdd_tx_rx_histogram hdd_txrx_hist[NUM_TX_RX_HISTOGRAM]; diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 27537332d6f4..4d269aaa3bed 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -39,7 +39,7 @@ #endif /* HIF_PCI */ #include "cds_api.h" #include "qdf_status.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cds_sched.h" #include "osdep.h" #include "hif.h" diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index e9ff971d7a59..fd0a799d3042 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -252,7 +252,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, goto err_sched_close; } - ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); if (bmi_download_firmware(ol_ctx)) { CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); @@ -496,10 +496,10 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) cds_get_global_context(); #endif - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); if (NULL == p_cds_context->pWMAContext) { CDF_ASSERT(0); - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); return QDF_STATUS_E_FAILURE; } @@ -510,7 +510,7 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) /*call WMA pre start */ vStatus = wma_pre_start(p_cds_context); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, "Failed to WMA prestart "); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -535,7 +535,7 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) #if defined(QCA_WIFI_FTM) vStatus = htc_start(gp_cds_context->htc_ctx); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(CDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); CDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -560,13 +560,13 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = NULL; - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); p_cds_context = cds_get_global_context(); if (NULL == p_cds_context) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); CDF_ASSERT(0); goto err_cdf_status_failure; @@ -585,7 +585,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) /* Save the hal context in Adapter */ hdd_ctx->hHal = - (tHalHandle) cds_get_context(CDF_MODULE_ID_SME); + (tHalHandle) cds_get_context(QDF_MODULE_ID_SME); if (NULL == hdd_ctx->hHal) { hddLog(CDF_TRACE_LEVEL_ERROR, "%s: HAL context is null", @@ -661,13 +661,13 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM); ENTER(); if (adapter == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s:adapter is NULL", __func__); return -ENXIO; } if (WLAN_FTM_STARTED == hdd_ctx->ftm.ftm_state) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, "%s: Ftm has been started. stopping ftm", __func__); wlan_ftm_stop(hdd_ctx); } @@ -753,18 +753,18 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) return 0; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Starting CLD SW", __func__); /* We support only one instance for now ... */ if (p_cds_context == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); goto err_status_failure; } if (p_cds_context->pMACContext == NULL) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); goto err_status_failure; } @@ -785,11 +785,11 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) goto err_status_failure; } - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: MAC correctly started", __func__); if (hdd_ftm_service_registration(hdd_ctx)) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, "%s: failed", __func__); goto err_ftm_service_reg; } @@ -1022,7 +1022,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) cdf_mem_malloc(sizeof(*cmd_data)); if (!cmd_data) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data")); return QDF_STATUS_E_NOMEM; } @@ -1030,7 +1030,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) cmd_data->data = cdf_mem_malloc(len); if (!cmd_data->data) { - CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data buffer")); cdf_mem_free(cmd_data); return QDF_STATUS_E_NOMEM; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 05e9328d36df..7f8b8ea754b6 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -108,7 +108,7 @@ void hdd_hostapd_channel_wakelock_init(hdd_context_t *pHddCtx) { /* Initialize the wakelock */ - cdf_wake_lock_init(&pHddCtx->sap_dfs_wakelock, "sap_dfs_wakelock"); + qdf_wake_lock_create(&pHddCtx->sap_dfs_wakelock, "sap_dfs_wakelock"); atomic_set(&pHddCtx->sap_dfs_ref_cnt, 0); } @@ -142,7 +142,7 @@ void hdd_hostapd_channel_allow_suspend(hdd_adapter_t *pAdapter, if (atomic_dec_and_test(&pHddCtx->sap_dfs_ref_cnt)) { hddLog(LOGE, FL("DFS: allowing suspend (chan %d)"), channel); - cdf_wake_lock_release(&pHddCtx->sap_dfs_wakelock, + qdf_wake_lock_release(&pHddCtx->sap_dfs_wakelock, WIFI_POWER_EVENT_WAKELOCK_DFS); } } @@ -178,7 +178,7 @@ void hdd_hostapd_channel_prevent_suspend(hdd_adapter_t *pAdapter, if (atomic_inc_return(&pHddCtx->sap_dfs_ref_cnt) == 1) { hddLog(LOGE, FL("DFS: preventing suspend (chan %d)"), channel); - cdf_wake_lock_acquire(&pHddCtx->sap_dfs_wakelock, + qdf_wake_lock_acquire(&pHddCtx->sap_dfs_wakelock, WIFI_POWER_EVENT_WAKELOCK_DFS); } } @@ -195,7 +195,7 @@ void hdd_hostapd_channel_wakelock_deinit(hdd_context_t *pHddCtx) { if (atomic_read(&pHddCtx->sap_dfs_ref_cnt)) { /* Release wakelock */ - cdf_wake_lock_release(&pHddCtx->sap_dfs_wakelock, + qdf_wake_lock_release(&pHddCtx->sap_dfs_wakelock, WIFI_POWER_EVENT_WAKELOCK_DRIVER_EXIT); /* Reset the reference count */ atomic_set(&pHddCtx->sap_dfs_ref_cnt, 0); @@ -203,7 +203,7 @@ void hdd_hostapd_channel_wakelock_deinit(hdd_context_t *pHddCtx) } /* Destroy lock */ - cdf_wake_lock_destroy(&pHddCtx->sap_dfs_wakelock); + qdf_wake_lock_destroy(&pHddCtx->sap_dfs_wakelock); } /** @@ -1386,7 +1386,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(pHddCtx, false); #endif - cdf_wake_lock_timeout_acquire(&pHddCtx->sap_wake_lock, + qdf_wake_lock_timeout_acquire(&pHddCtx->sap_wake_lock, HDD_SAP_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_SAP); { diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 635433840d9d..963ffd3398d0 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -241,7 +241,7 @@ struct hdd_ipa_iface_context { uint8_t iface_id; /* This iface ID */ uint8_t sta_id; /* This iface station ID */ - cdf_spinlock_t interface_lock; + qdf_spinlock_t interface_lock; uint32_t ifa_address; struct hdd_ipa_iface_stats stats; }; @@ -380,10 +380,10 @@ struct hdd_ipa_priv { * APIs as it is taken care gracefully. Without this, kernel would throw * an warning if spin_lock_bh is used while IRQ is disabled */ - cdf_spinlock_t rm_lock; + qdf_spinlock_t rm_lock; struct uc_rm_work_struct uc_rm_work; struct uc_op_work_struct uc_op_work[HDD_IPA_UC_OPCODE_MAX]; - cdf_wake_lock_t wake_lock; + qdf_wake_lock_t wake_lock; struct delayed_work wake_lock_work; bool wake_lock_released; @@ -392,7 +392,7 @@ struct hdd_ipa_priv { atomic_t tx_ref_cnt; cdf_nbuf_queue_t pm_queue_head; struct work_struct pm_work; - cdf_spinlock_t pm_lock; + qdf_spinlock_t pm_lock; bool suspended; uint32_t pending_hw_desc_cnt; @@ -423,7 +423,7 @@ struct hdd_ipa_priv { bool pending_cons_req; struct ipa_uc_stas_map assoc_stas_map[WLAN_MAX_STA_COUNT]; qdf_list_t pending_event; - cdf_mutex_t event_lock; + qdf_mutex_t event_lock; bool ipa_pipes_down; uint32_t ipa_tx_packets_diff; uint32_t ipa_rx_packets_diff; @@ -439,8 +439,8 @@ struct hdd_ipa_priv { struct uc_rt_debug_info rt_bug_buffer[HDD_IPA_UC_RT_DEBUG_BUF_COUNT]; unsigned int rt_buf_fill_index; cdf_mc_timer_t rt_debug_fill_timer; - cdf_mutex_t rt_debug_lock; - cdf_mutex_t ipa_lock; + qdf_mutex_t rt_debug_lock; + qdf_mutex_t ipa_lock; /* CE resources */ qdf_dma_addr_t ce_sr_base_paddr; @@ -724,7 +724,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext) hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; - cdf_mutex_acquire(&hdd_ipa->rt_debug_lock); + qdf_mutex_acquire(&hdd_ipa->rt_debug_lock); dump_info = &hdd_ipa->rt_bug_buffer[ hdd_ipa->rt_buf_fill_index % HDD_IPA_UC_RT_DEBUG_BUF_COUNT]; @@ -737,7 +737,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext) dump_info->tx_fwd_count = hdd_ipa->ipa_tx_forward; dump_info->rx_destructor_call = hdd_ipa->ipa_rx_destructor_count; hdd_ipa->rt_buf_fill_index++; - cdf_mutex_release(&hdd_ipa->rt_debug_lock); + qdf_mutex_release(&hdd_ipa->rt_debug_lock); cdf_mc_timer_start(&hdd_ipa->rt_debug_fill_timer, HDD_IPA_UC_RT_DEBUG_FILL_INTERVAL); @@ -773,7 +773,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx) HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, " TM : EXEP : DROP : NETS : MCBC : TXFD : DSTR : DSCD\n"); - cdf_mutex_acquire(&hdd_ipa->rt_debug_lock); + qdf_mutex_acquire(&hdd_ipa->rt_debug_lock); for (dump_count = 0; dump_count < HDD_IPA_UC_RT_DEBUG_BUF_COUNT; dump_count++) { @@ -788,7 +788,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx) dump_info->rx_destructor_call, dump_info->rx_discard_count); } - cdf_mutex_release(&hdd_ipa->rt_debug_lock); + qdf_mutex_release(&hdd_ipa->rt_debug_lock); HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "======= WLAN-IPA DEBUG BUF DUMP END ========\n"); } @@ -874,7 +874,7 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx) cdf_mc_timer_stop(&hdd_ipa->rt_debug_fill_timer); } cdf_mc_timer_destroy(&hdd_ipa->rt_debug_fill_timer); - cdf_mutex_destroy(&hdd_ipa->rt_debug_lock); + qdf_mutex_destroy(&hdd_ipa->rt_debug_lock); if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, @@ -901,7 +901,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; - cdf_mutex_init(&hdd_ipa->rt_debug_lock); + qdf_mutex_create(&hdd_ipa->rt_debug_lock); cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx); hdd_ipa->rt_buf_fill_index = 0; @@ -954,7 +954,7 @@ void hdd_ipa_uc_stat_query(hdd_context_t *pHddCtx, return; } - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); if ((HDD_IPA_UC_NUM_WDI_PIPE == hdd_ipa->activated_fw_pipe) && (false == hdd_ipa->resource_loading)) { *ipa_tx_diff = hdd_ipa->ipa_tx_packets_diff; @@ -962,7 +962,7 @@ void hdd_ipa_uc_stat_query(hdd_context_t *pHddCtx, HDD_IPA_LOG(LOG1, "STAT Query TX DIFF %d, RX DIFF %d", *ipa_tx_diff, *ipa_rx_diff); } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); return; } @@ -990,7 +990,7 @@ void hdd_ipa_uc_stat_request(hdd_adapter_t *adapter, uint8_t reason) } HDD_IPA_LOG(LOG1, "STAT REQ Reason %d", reason); - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); if ((HDD_IPA_UC_NUM_WDI_PIPE == hdd_ipa->activated_fw_pipe) && (false == hdd_ipa->resource_loading)) { hdd_ipa->stat_req_reason = reason; @@ -999,7 +999,7 @@ void hdd_ipa_uc_stat_request(hdd_adapter_t *adapter, uint8_t reason) (int)WMA_VDEV_TXRX_GET_IPA_UC_FW_STATS_CMDID, 0, VDEV_CMD); } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); } /** @@ -1255,12 +1255,12 @@ hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) case IPA_RM_RESOURCE_GRANTED: /* Differed RM Granted */ hdd_ipa_uc_enable_pipes(hdd_ipa); - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); if ((false == hdd_ipa->resource_unloading) && (!hdd_ipa->activated_fw_pipe)) { hdd_ipa_uc_enable_pipes(hdd_ipa); } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); break; case IPA_RM_RESOURCE_RELEASED: @@ -1386,7 +1386,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) if ((HDD_IPA_UC_OPCODE_TX_RESUME == msg->op_code) || (HDD_IPA_UC_OPCODE_RX_RESUME == msg->op_code)) { - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); hdd_ipa->activated_fw_pipe++; if (HDD_IPA_UC_NUM_WDI_PIPE == hdd_ipa->activated_fw_pipe) { hdd_ipa->resource_loading = false; @@ -1397,12 +1397,12 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) IPA_RM_RESOURCE_WLAN_CONS); hdd_ipa->pending_cons_req = false; } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); } if ((HDD_IPA_UC_OPCODE_TX_SUSPEND == msg->op_code) || (HDD_IPA_UC_OPCODE_RX_SUSPEND == msg->op_code)) { - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); hdd_ipa->activated_fw_pipe--; if (!hdd_ipa->activated_fw_pipe) { hdd_ipa_uc_disable_pipes(hdd_ipa); @@ -1415,7 +1415,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa_uc_proc_pending_event(hdd_ipa); hdd_ipa->pending_cons_req = false; } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); } if ((HDD_IPA_UC_OPCODE_STATS == msg->op_code) && @@ -1599,7 +1599,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) /* STATs from FW */ uc_fw_stat = (struct ipa_uc_fw_stats *) ((uint8_t *)op_msg + sizeof(struct op_msg_type)); - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); hdd_ipa->ipa_tx_packets_diff = HDD_BW_GET_DIFF( uc_fw_stat->tx_pkts_completed, hdd_ipa->ipa_p_tx_packets); @@ -1614,7 +1614,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (uc_fw_stat->rx_num_ind_drop_no_space + uc_fw_stat->rx_num_ind_drop_no_buf + uc_fw_stat->rx_num_pkts_indicated); - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); } else { HDD_IPA_LOG(LOGE, "INVALID REASON %d", hdd_ipa->stat_req_reason); @@ -1789,8 +1789,8 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) cdf_mem_zero(&pipe_out, sizeof(struct ipa_wdi_out_params)); qdf_list_create(&ipa_ctxt->pending_event, 1000); - cdf_mutex_init(&ipa_ctxt->event_lock); - cdf_mutex_init(&ipa_ctxt->ipa_lock); + qdf_mutex_create(&ipa_ctxt->event_lock); + qdf_mutex_create(&ipa_ctxt->ipa_lock); /* TX PIPE */ pipe_in.sys.ipa_ep_cfg.nat.nat_en = IPA_BYPASS_NAT; @@ -1945,12 +1945,12 @@ int hdd_ipa_uc_ssr_deinit(void) if (!hdd_ipa->ipa_pipes_down) hdd_ipa_uc_disable_pipes(hdd_ipa); - cdf_mutex_acquire(&hdd_ipa->ipa_lock); + qdf_mutex_acquire(&hdd_ipa->ipa_lock); for (idx = 0; idx < WLAN_MAX_STA_COUNT; idx++) { hdd_ipa->assoc_stas_map[idx].is_reserved = false; hdd_ipa->assoc_stas_map[idx].sta_id = 0xFF; } - cdf_mutex_release(&hdd_ipa->ipa_lock); + qdf_mutex_release(&hdd_ipa->ipa_lock); /* Full IPA driver cleanup not required since wlan driver is now * unloaded and reloaded after SSR. @@ -2042,17 +2042,17 @@ static void hdd_ipa_wake_lock_timer_func(struct work_struct *work) struct hdd_ipa_priv, wake_lock_work); - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); if (hdd_ipa->rm_state != HDD_IPA_RM_RELEASED) goto end; hdd_ipa->wake_lock_released = true; - cdf_wake_lock_release(&hdd_ipa->wake_lock, + qdf_wake_lock_release(&hdd_ipa->wake_lock, WIFI_POWER_EVENT_WAKELOCK_IPA); end: - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); } /** @@ -2068,26 +2068,26 @@ static int hdd_ipa_rm_request(struct hdd_ipa_priv *hdd_ipa) if (!hdd_ipa_is_rm_enabled(hdd_ipa->hdd_ctx)) return 0; - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); switch (hdd_ipa->rm_state) { case HDD_IPA_RM_GRANTED: - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return 0; case HDD_IPA_RM_GRANT_PENDING: - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return -EINPROGRESS; case HDD_IPA_RM_RELEASED: hdd_ipa->rm_state = HDD_IPA_RM_GRANT_PENDING; break; } - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); ret = ipa_rm_inactivity_timer_request_resource( IPA_RM_RESOURCE_WLAN_PROD); - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); if (ret == 0) { hdd_ipa->rm_state = HDD_IPA_RM_GRANTED; hdd_ipa->stats.num_rm_grant_imm++; @@ -2095,11 +2095,11 @@ static int hdd_ipa_rm_request(struct hdd_ipa_priv *hdd_ipa) cancel_delayed_work(&hdd_ipa->wake_lock_work); if (hdd_ipa->wake_lock_released) { - cdf_wake_lock_acquire(&hdd_ipa->wake_lock, + qdf_wake_lock_acquire(&hdd_ipa->wake_lock, WIFI_POWER_EVENT_WAKELOCK_IPA); hdd_ipa->wake_lock_released = false; } - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return ret; } @@ -2128,23 +2128,23 @@ static int hdd_ipa_rm_try_release(struct hdd_ipa_priv *hdd_ipa) } spin_unlock_bh(&hdd_ipa->q_lock); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); if (!cdf_nbuf_is_queue_empty(&hdd_ipa->pm_queue_head)) { - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); return -EAGAIN; } - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); switch (hdd_ipa->rm_state) { case HDD_IPA_RM_GRANTED: break; case HDD_IPA_RM_GRANT_PENDING: - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return -EINPROGRESS; case HDD_IPA_RM_RELEASED: - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return 0; } @@ -2153,12 +2153,12 @@ static int hdd_ipa_rm_try_release(struct hdd_ipa_priv *hdd_ipa) */ hdd_ipa->rm_state = HDD_IPA_RM_RELEASED; hdd_ipa->stats.num_rm_release++; - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); ret = ipa_rm_inactivity_timer_release_resource(IPA_RM_RESOURCE_WLAN_PROD); - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); if (unlikely(ret != 0)) { hdd_ipa->rm_state = HDD_IPA_RM_GRANTED; WARN_ON(1); @@ -2174,7 +2174,7 @@ static int hdd_ipa_rm_try_release(struct hdd_ipa_priv *hdd_ipa) msecs_to_jiffies (HDD_IPA_RX_INACTIVITY_MSEC_DELAY)); - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return ret; } @@ -2211,9 +2211,9 @@ static void hdd_ipa_rm_notify(void *user_data, enum ipa_rm_event event, schedule_work(&hdd_ipa->uc_rm_work.work); break; } - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); hdd_ipa->rm_state = HDD_IPA_RM_GRANTED; - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); hdd_ipa->stats.num_rm_grant++; break; @@ -2434,7 +2434,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) goto set_perf_failed; } - cdf_wake_lock_init(&hdd_ipa->wake_lock, "wlan_ipa"); + qdf_wake_lock_create(&hdd_ipa->wake_lock, "wlan_ipa"); #ifdef CONFIG_CNSS cnss_init_delayed_work(&hdd_ipa->wake_lock_work, hdd_ipa_wake_lock_timer_func); @@ -2442,7 +2442,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) INIT_DELAYED_WORK(&hdd_ipa->wake_lock_work, hdd_ipa_wake_lock_timer_func); #endif - cdf_spinlock_init(&hdd_ipa->rm_lock); + qdf_spinlock_create(&hdd_ipa->rm_lock); hdd_ipa->rm_state = HDD_IPA_RM_RELEASED; hdd_ipa->wake_lock_released = true; atomic_set(&hdd_ipa->tx_ref_cnt, 0); @@ -2478,12 +2478,12 @@ static void hdd_ipa_destroy_rm_resource(struct hdd_ipa_priv *hdd_ipa) return; cancel_delayed_work_sync(&hdd_ipa->wake_lock_work); - cdf_wake_lock_destroy(&hdd_ipa->wake_lock); + qdf_wake_lock_destroy(&hdd_ipa->wake_lock); #ifdef WLAN_OPEN_SOURCE cancel_work_sync(&hdd_ipa->uc_rm_work.work); #endif - cdf_spinlock_destroy(&hdd_ipa->rm_lock); + qdf_spinlock_destroy(&hdd_ipa->rm_lock); ipa_rm_inactivity_timer_destroy(IPA_RM_RESOURCE_WLAN_PROD); @@ -2705,13 +2705,13 @@ static void hdd_ipa_send_pkt_to_tl( hdd_adapter_t *adapter = NULL; cdf_nbuf_t skb; - cdf_spin_lock_bh(&iface_context->interface_lock); + qdf_spin_lock_bh(&iface_context->interface_lock); adapter = iface_context->adapter; if (!adapter) { HDD_IPA_LOG(CDF_TRACE_LEVEL_WARN, "Interface Down"); ipa_free_skb(ipa_tx_desc); iface_context->stats.num_tx_drop++; - cdf_spin_unlock_bh(&iface_context->interface_lock); + qdf_spin_unlock_bh(&iface_context->interface_lock); hdd_ipa_rm_try_release(hdd_ipa); return; } @@ -2722,7 +2722,7 @@ static void hdd_ipa_send_pkt_to_tl( */ if (WLAN_HDD_GET_AP_CTX_PTR(adapter)->dfs_cac_block_tx) { ipa_free_skb(ipa_tx_desc); - cdf_spin_unlock_bh(&iface_context->interface_lock); + qdf_spin_unlock_bh(&iface_context->interface_lock); iface_context->stats.num_tx_cac_drop++; hdd_ipa_rm_try_release(hdd_ipa); return; @@ -2731,7 +2731,7 @@ static void hdd_ipa_send_pkt_to_tl( interface_id = adapter->sessionId; ++adapter->stats.tx_packets; - cdf_spin_unlock_bh(&iface_context->interface_lock); + qdf_spin_unlock_bh(&iface_context->interface_lock); skb = ipa_tx_desc->skb; @@ -2788,10 +2788,10 @@ static void hdd_ipa_pm_send_pkt_to_tl(struct work_struct *work) cdf_nbuf_t skb; uint32_t dequeued = 0; - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); while (((skb = cdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) != NULL)) { - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; @@ -2800,10 +2800,10 @@ static void hdd_ipa_pm_send_pkt_to_tl(struct work_struct *work) hdd_ipa_send_pkt_to_tl(pm_tx_cb->iface_context, pm_tx_cb->ipa_tx_desc); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); } - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); hdd_ipa->stats.num_tx_dequeued += dequeued; if (dequeued > hdd_ipa->stats.num_max_pm_queue) @@ -2867,7 +2867,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, */ hdd_ipa_rm_request(hdd_ipa); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); /* * If host is still suspended then queue the packets and these will be * drained later when resume completes. When packet is arrived here and @@ -2882,11 +2882,11 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, cdf_nbuf_queue_add(&hdd_ipa->pm_queue_head, skb); hdd_ipa->stats.num_tx_queued++; - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); return; } - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); /* * If we are here means, host is not suspended, wait for the work queue @@ -2921,17 +2921,17 @@ int hdd_ipa_suspend(hdd_context_t *hdd_ctx) if (atomic_read(&hdd_ipa->tx_ref_cnt)) return -EAGAIN; - cdf_spin_lock_bh(&hdd_ipa->rm_lock); + qdf_spin_lock_bh(&hdd_ipa->rm_lock); if (hdd_ipa->rm_state != HDD_IPA_RM_RELEASED) { - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); return -EAGAIN; } - cdf_spin_unlock_bh(&hdd_ipa->rm_lock); + qdf_spin_unlock_bh(&hdd_ipa->rm_lock); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); hdd_ipa->suspended = true; - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); return 0; } @@ -2951,9 +2951,9 @@ int hdd_ipa_resume(hdd_context_t *hdd_ctx) schedule_work(&hdd_ipa->pm_work); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); hdd_ipa->suspended = false; - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); return 0; } @@ -3399,11 +3399,11 @@ static void hdd_ipa_cleanup_iface(struct hdd_ipa_iface_context *iface_context) hdd_ipa_clean_hdr(iface_context->adapter); - cdf_spin_lock_bh(&iface_context->interface_lock); + qdf_spin_lock_bh(&iface_context->interface_lock); iface_context->adapter->ipa_context = NULL; iface_context->adapter = NULL; iface_context->tl_context = NULL; - cdf_spin_unlock_bh(&iface_context->interface_lock); + qdf_spin_unlock_bh(&iface_context->interface_lock); iface_context->ifa_address = 0; if (!iface_context->hdd_ipa->num_iface) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, @@ -3651,7 +3651,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, hdd_err("IPA resource %s inprogress", hdd_ipa->resource_loading ? "load":"unload"); - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); pending_event_count = qdf_list_size(&hdd_ipa->pending_event); if (pending_event_count >= HDD_IPA_MAX_PENDING_EVENT_COUNT) { @@ -3666,7 +3666,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, if (!pending_event) { hdd_err("Pending event memory alloc fail"); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); return -ENOMEM; } @@ -3679,7 +3679,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, qdf_list_insert_back(&hdd_ipa->pending_event, &pending_event->node); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); return 0; } @@ -3699,7 +3699,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, hdd_ipa_uc_offload_enable_disable(adapter, SIR_STA_RX_DATA_OFFLOAD, 1); - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, @@ -3710,7 +3710,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, /* Enable IPA UC TX PIPE when STA connected */ ret = hdd_ipa_uc_handle_first_con(hdd_ipa); if (ret) { - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "handle 1st con ret %d", ret); hdd_ipa_uc_offload_enable_disable(adapter, @@ -3720,7 +3720,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, } ret = hdd_ipa_setup_iface(hdd_ipa, adapter, sta_id); if (ret) { - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); hdd_ipa_uc_offload_enable_disable(adapter, SIR_STA_RX_DATA_OFFLOAD, 0); goto end; @@ -3732,7 +3732,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, #endif /* IPA_UC_OFFLOAD */ } - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); hdd_ipa->sta_connected = 1; break; @@ -3751,13 +3751,13 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, hdd_ipa_uc_offload_enable_disable(adapter, SIR_AP_RX_DATA_OFFLOAD, 1); } - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); ret = hdd_ipa_setup_iface(hdd_ipa, adapter, sta_id); if (ret) { HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d, Interface setup failed", msg_ex->name, meta.msg_type); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); goto end; #ifdef IPA_UC_OFFLOAD @@ -3766,18 +3766,18 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, (adapter->ipa_context))->iface_id; #endif /* IPA_UC_OFFLOAD */ } - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); break; case WLAN_STA_DISCONNECT: - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); hdd_ipa_cleanup_iface(adapter->ipa_context); if (!hdd_ipa->sta_connected) { HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d, STA already disconnected", msg_ex->name, meta.msg_type); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); return -EINVAL; } hdd_ipa->sta_connected = 0; @@ -3801,7 +3801,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, vdev_to_iface[adapter->sessionId] = HDD_IPA_MAX_IFACE; } - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); break; case WLAN_AP_DISCONNECT: @@ -3812,7 +3812,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, return -EINVAL; } - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); hdd_ipa_cleanup_iface(adapter->ipa_context); if ((!hdd_ipa->num_iface) && (HDD_IPA_UC_NUM_WDI_PIPE == @@ -3837,7 +3837,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, SIR_AP_RX_DATA_OFFLOAD, 0); vdev_to_iface[adapter->sessionId] = HDD_IPA_MAX_IFACE; } - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); break; case WLAN_CLIENT_CONNECT_EX: @@ -3851,13 +3851,13 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, return 0; } - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); if (hdd_ipa_uc_find_add_assoc_sta(hdd_ipa, true, sta_id)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s: STA ID %d found, not valid", adapter->dev->name, sta_id); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); return 0; } @@ -3867,7 +3867,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, !hdd_ipa->sta_connected)) { ret = hdd_ipa_uc_handle_first_con(hdd_ipa); if (ret) { - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s: handle 1st con ret %d", adapter->dev->name, ret); @@ -3877,7 +3877,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, hdd_ipa->sap_num_connected_sta++; - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); meta.msg_type = type; meta.msg_len = (sizeof(struct ipa_wlan_msg_ex) + @@ -3922,12 +3922,12 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, return 0; } - cdf_mutex_acquire(&hdd_ipa->event_lock); + qdf_mutex_acquire(&hdd_ipa->event_lock); if (!hdd_ipa_uc_find_add_assoc_sta(hdd_ipa, false, sta_id)) { HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s: STA ID %d NOT found, not valid", msg_ex->name, sta_id); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); return 0; } hdd_ipa->sap_num_connected_sta--; @@ -3939,7 +3939,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, && (HDD_IPA_UC_NUM_WDI_PIPE == hdd_ipa->activated_fw_pipe)) hdd_ipa_uc_handle_last_discon(hdd_ipa); - cdf_mutex_release(&hdd_ipa->event_lock); + qdf_mutex_release(&hdd_ipa->event_lock); break; default: @@ -4057,7 +4057,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) hdd_ipa_adapter_2_client[i].prod_client; iface_context->iface_id = i; iface_context->adapter = NULL; - cdf_spinlock_init(&iface_context->interface_lock); + qdf_spinlock_create(&iface_context->interface_lock); } #ifdef CONFIG_CNSS @@ -4065,7 +4065,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) #else INIT_WORK(&hdd_ipa->pm_work, hdd_ipa_pm_send_pkt_to_tl); #endif - cdf_spinlock_init(&hdd_ipa->pm_lock); + qdf_spinlock_create(&hdd_ipa->pm_lock); cdf_nbuf_queue_init(&hdd_ipa->pm_queue_head); ret = hdd_ipa_setup_rm(hdd_ipa); @@ -4102,7 +4102,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) fail_create_sys_pipe: hdd_ipa_destroy_rm_resource(hdd_ipa); fail_setup_rm: - cdf_spinlock_destroy(&hdd_ipa->pm_lock); + qdf_spinlock_destroy(&hdd_ipa->pm_lock); fail_get_resource: cdf_mem_free(hdd_ipa); hdd_ctx->hdd_ipa = NULL; @@ -4161,24 +4161,24 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) cancel_work_sync(&hdd_ipa->pm_work); #endif - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); while (((skb = cdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) != NULL)) { - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; ipa_free_skb(pm_tx_cb->ipa_tx_desc); - cdf_spin_lock_bh(&hdd_ipa->pm_lock); + qdf_spin_lock_bh(&hdd_ipa->pm_lock); } - cdf_spin_unlock_bh(&hdd_ipa->pm_lock); + qdf_spin_unlock_bh(&hdd_ipa->pm_lock); - cdf_spinlock_destroy(&hdd_ipa->pm_lock); + qdf_spinlock_destroy(&hdd_ipa->pm_lock); /* destory the interface lock */ for (i = 0; i < HDD_IPA_MAX_IFACE; i++) { iface_context = &hdd_ipa->iface_context[i]; - cdf_spinlock_destroy(&iface_context->interface_lock); + qdf_spinlock_destroy(&iface_context->interface_lock); } /* This should never hit but still make sure that there are no pending @@ -4207,8 +4207,8 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disconnect RX PIPE", __func__); ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle); - cdf_mutex_destroy(&hdd_ipa->event_lock); - cdf_mutex_destroy(&hdd_ipa->ipa_lock); + qdf_mutex_destroy(&hdd_ipa->event_lock); + qdf_mutex_destroy(&hdd_ipa->ipa_lock); hdd_ipa_cleanup_pending_event(hdd_ipa); #ifdef WLAN_OPEN_SOURCE diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 1ea7dd4bf8d2..36bea4f1a510 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -101,7 +101,7 @@ static void hdd_lro_desc_pool_init(struct hdd_lro_desc_pool *lro_desc_pool, list_add_tail(&lro_desc_pool->lro_desc_array[i].lro_node, &lro_desc_pool->lro_free_list_head); } - cdf_spinlock_init(&lro_desc_pool->lro_pool_lock); + qdf_spinlock_create(&lro_desc_pool->lro_pool_lock); } /** @@ -128,7 +128,7 @@ static void hdd_lro_desc_info_init(struct hdd_lro_s *hdd_info) lro_hash_table[i].lro_desc_list); } - cdf_spinlock_init(&hdd_info->lro_desc_info.lro_hash_lock); + qdf_spinlock_create(&hdd_info->lro_desc_info.lro_hash_lock); } /** @@ -142,7 +142,7 @@ static void hdd_lro_desc_info_init(struct hdd_lro_s *hdd_info) static void hdd_lro_desc_pool_deinit(struct hdd_lro_desc_pool *lro_desc_pool) { INIT_LIST_HEAD(&lro_desc_pool->lro_free_list_head); - cdf_spinlock_destroy(&lro_desc_pool->lro_pool_lock); + qdf_spinlock_destroy(&lro_desc_pool->lro_pool_lock); } /** @@ -160,7 +160,7 @@ static void hdd_lro_desc_info_deinit(struct hdd_lro_s *hdd_info) struct hdd_lro_desc_info *desc_info = &hdd_info->lro_desc_info; hdd_lro_desc_pool_deinit(&desc_info->lro_desc_pool); - cdf_spinlock_destroy(&desc_info->lro_hash_lock); + qdf_spinlock_destroy(&desc_info->lro_hash_lock); } /** @@ -225,7 +225,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, return -EINVAL; } - cdf_spin_lock_bh(&desc_info->lro_hash_lock); + qdf_spin_lock_bh(&desc_info->lro_hash_lock); /* Check if this flow exists in the descriptor list */ list_for_each(ptr, &lro_hash_table->lro_desc_list) { struct net_lro_desc *tmp_lro_desc = NULL; @@ -234,27 +234,27 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, if (tmp_lro_desc->active) { if (hdd_lro_tcp_flow_match(tmp_lro_desc, iph, tcph)) { *lro_desc = entry->lro_desc; - cdf_spin_unlock_bh(&desc_info->lro_hash_lock); + qdf_spin_unlock_bh(&desc_info->lro_hash_lock); return 0; } } } - cdf_spin_unlock_bh(&desc_info->lro_hash_lock); + qdf_spin_unlock_bh(&desc_info->lro_hash_lock); /* no existing flow found, a new LRO desc needs to be allocated */ free_pool = adapter->lro_info.lro_desc_info.lro_desc_pool; - cdf_spin_lock_bh(&free_pool.lro_pool_lock); + qdf_spin_lock_bh(&free_pool.lro_pool_lock); entry = list_first_entry_or_null( &free_pool.lro_free_list_head, struct hdd_lro_desc_entry, lro_node); if (NULL == entry) { hdd_err("Could not allocate LRO desc!"); - cdf_spin_unlock_bh(&free_pool.lro_pool_lock); + qdf_spin_unlock_bh(&free_pool.lro_pool_lock); return -ENOMEM; } list_del_init(&entry->lro_node); - cdf_spin_unlock_bh(&free_pool.lro_pool_lock); + qdf_spin_unlock_bh(&free_pool.lro_pool_lock); if (NULL == entry->lro_desc) { hdd_err("entry->lro_desc is NULL!\n"); @@ -267,10 +267,10 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, * lro_desc->active should be 0 and lro_desc->tcp_rcv_tsval * should be 0 for newly allocated lro descriptors */ - cdf_spin_lock_bh(&desc_info->lro_hash_lock); + qdf_spin_lock_bh(&desc_info->lro_hash_lock); list_add_tail(&entry->lro_node, &lro_hash_table->lro_desc_list); - cdf_spin_unlock_bh(&desc_info->lro_hash_lock); + qdf_spin_unlock_bh(&desc_info->lro_hash_lock); *lro_desc = entry->lro_desc; return 0; @@ -386,14 +386,14 @@ static void hdd_lro_desc_free(struct net_lro_desc *desc, entry = &desc_info->lro_desc_pool.lro_desc_array[i]; - cdf_spin_lock_bh(&desc_info->lro_hash_lock); + qdf_spin_lock_bh(&desc_info->lro_hash_lock); list_del_init(&entry->lro_node); - cdf_spin_unlock_bh(&desc_info->lro_hash_lock); + qdf_spin_unlock_bh(&desc_info->lro_hash_lock); - cdf_spin_lock_bh(&desc_info->lro_desc_pool.lro_pool_lock); + qdf_spin_lock_bh(&desc_info->lro_desc_pool.lro_pool_lock); list_add_tail(&entry->lro_node, &desc_info-> lro_desc_pool.lro_free_list_head); - cdf_spin_unlock_bh(&desc_info->lro_desc_pool.lro_pool_lock); + qdf_spin_unlock_bh(&desc_info->lro_desc_pool.lro_pool_lock); } /** diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 3dc87356af5a..c43b7beece3c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -147,7 +147,7 @@ static int wlan_hdd_inited; */ DEFINE_SPINLOCK(hdd_context_lock); -static cdf_wake_lock_t wlan_wake_lock; +static qdf_wake_lock_t wlan_wake_lock; #define WOW_MAX_FILTER_LISTS 1 #define WOW_MAX_FILTERS_PER_LIST 4 @@ -3149,10 +3149,10 @@ QDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_peek_front(&hdd_ctx->hddAdapters, (qdf_list_node_t **) padapterNode); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3161,12 +3161,12 @@ QDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **pNextAdapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_peek_next(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode, (qdf_list_node_t **) pNextAdapterNode); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3174,10 +3174,10 @@ QDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_remove_node(&hdd_ctx->hddAdapters, &adapterNode->node); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3185,10 +3185,10 @@ QDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_remove_front(&hdd_ctx->hddAdapters, (qdf_list_node_t **) padapterNode); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3196,10 +3196,10 @@ QDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_back(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3207,10 +3207,10 @@ QDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - cdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_front(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); - cdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3774,10 +3774,10 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) } #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK /* Destroy the wake lock */ - cdf_wake_lock_destroy(&hdd_ctx->rx_wake_lock); + qdf_wake_lock_destroy(&hdd_ctx->rx_wake_lock); #endif /* Destroy the wake lock */ - cdf_wake_lock_destroy(&hdd_ctx->sap_wake_lock); + qdf_wake_lock_destroy(&hdd_ctx->sap_wake_lock); hdd_hostapd_channel_wakelock_deinit(hdd_ctx); @@ -3965,17 +3965,17 @@ QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) /* wake lock APIs for HDD */ void hdd_prevent_suspend(uint32_t reason) { - cdf_wake_lock_acquire(&wlan_wake_lock, reason); + qdf_wake_lock_acquire(&wlan_wake_lock, reason); } void hdd_allow_suspend(uint32_t reason) { - cdf_wake_lock_release(&wlan_wake_lock, reason); + qdf_wake_lock_release(&wlan_wake_lock, reason); } void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason) { - cdf_wake_lock_timeout_acquire(&wlan_wake_lock, timeout, reason); + qdf_wake_lock_timeout_acquire(&wlan_wake_lock, timeout, reason); } /** @@ -5119,10 +5119,10 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) init_completion(&hdd_ctx->mc_sus_event_var); init_completion(&hdd_ctx->ready_to_suspend); - cdf_spinlock_init(&hdd_ctx->connection_status_lock); - cdf_spinlock_init(&hdd_ctx->sched_scan_lock); + qdf_spinlock_create(&hdd_ctx->connection_status_lock); + qdf_spinlock_create(&hdd_ctx->sched_scan_lock); - cdf_spinlock_init(&hdd_ctx->hdd_adapter_lock); + qdf_spinlock_create(&hdd_ctx->hdd_adapter_lock); qdf_list_create(&hdd_ctx->hddAdapters, MAX_NUMBER_OF_ADAPTERS); wlan_hdd_cfg80211_extscan_init(hdd_ctx); @@ -5670,10 +5670,10 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK /* Initialize the wake lcok */ - cdf_wake_lock_init(&hdd_ctx->rx_wake_lock, "qcom_rx_wakelock"); + qdf_wake_lock_create(&hdd_ctx->rx_wake_lock, "qcom_rx_wakelock"); #endif /* Initialize the wake lcok */ - cdf_wake_lock_init(&hdd_ctx->sap_wake_lock, "qcom_sap_wakelock"); + qdf_wake_lock_create(&hdd_ctx->sap_wake_lock, "qcom_sap_wakelock"); hdd_hostapd_channel_wakelock_init(hdd_ctx); @@ -5746,9 +5746,9 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_ctx->target_hw_version, hdd_ctx->target_hw_name); - cdf_spinlock_init(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spinlock_create(&hdd_ctx->hdd_roc_req_q_lock); qdf_list_create((&hdd_ctx->hdd_roc_req_q), MAX_ROC_REQ_QUEUE_ENTRY); - cdf_spinlock_init(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spinlock_create(&hdd_ctx->hdd_scan_req_q_lock); qdf_list_create((&hdd_ctx->hdd_scan_req_q), CFG_MAX_SCAN_COUNT_MAX); #ifdef CONFIG_CNSS cnss_init_delayed_work(&hdd_ctx->roc_req_work, @@ -6809,7 +6809,7 @@ static int __hdd_module_init(void) pr_info("%s: Loading driver v%s\n", WLAN_MODULE_NAME, QWLAN_VERSIONSTR TIMER_MANAGER_STR MEMORY_DEBUG_STR); - cdf_wake_lock_init(&wlan_wake_lock, "wlan"); + qdf_wake_lock_create(&wlan_wake_lock, "wlan"); hdd_set_conparam((uint32_t) con_mode); @@ -6823,7 +6823,7 @@ static int __hdd_module_init(void) return 0; out: - cdf_wake_lock_destroy(&wlan_wake_lock); + qdf_wake_lock_destroy(&wlan_wake_lock); return ret; } @@ -6839,7 +6839,7 @@ static void __hdd_module_exit(void) wlan_hdd_unregister_driver(); - cdf_wake_lock_destroy(&wlan_wake_lock); + qdf_wake_lock_destroy(&wlan_wake_lock); return; } diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index f38678d591ea..05aaf1c2e700 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -720,10 +720,10 @@ static int wlan_hdd_roc_request_enqueue(hdd_adapter_t *adapter, hdd_roc_req->pRemainChanCtx = remain_chan_ctx; /* Enqueue this RoC request */ - cdf_spin_lock(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spin_lock(&hdd_ctx->hdd_roc_req_q_lock); status = qdf_list_insert_back(&hdd_ctx->hdd_roc_req_q, &hdd_roc_req->node); - cdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("Not able to enqueue RoC Req context")); @@ -790,15 +790,15 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) * that any pending roc in the queue will be scheduled * on the current roc completion by scheduling the work queue. */ - cdf_spin_lock(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spin_lock(&hdd_ctx->hdd_roc_req_q_lock); if (list_empty(&hdd_ctx->hdd_roc_req_q.anchor)) { - cdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); hdd_debug("list is empty"); return; } status = qdf_list_remove_front(&hdd_ctx->hdd_roc_req_q, (qdf_list_node_t **) &hdd_roc_req); - cdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_roc_req_q_lock); if (QDF_STATUS_SUCCESS != status) { hdd_debug("unable to remove roc element from list"); return; @@ -894,9 +894,9 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, } } - cdf_spin_lock(&pHddCtx->hdd_roc_req_q_lock); + qdf_spin_lock(&pHddCtx->hdd_roc_req_q_lock); size = qdf_list_size(&(pHddCtx->hdd_roc_req_q)); - cdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); + qdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); if ((isBusy == false) && (!size)) { status = wlan_hdd_execute_remain_on_channel(pAdapter, pRemainChanCtx); @@ -1103,14 +1103,14 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, if (0 != status) return status; - cdf_spin_lock(&pHddCtx->hdd_roc_req_q_lock); + qdf_spin_lock(&pHddCtx->hdd_roc_req_q_lock); list_for_each_safe(tmp, q, &pHddCtx->hdd_roc_req_q.anchor) { curr_roc_req = list_entry(tmp, hdd_roc_req_t, node); if ((uintptr_t) curr_roc_req->pRemainChanCtx == cookie) { qdf_status = qdf_list_remove_node(&pHddCtx->hdd_roc_req_q, (qdf_list_node_t *) curr_roc_req); - cdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); + qdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); if (qdf_status == QDF_STATUS_SUCCESS) { cdf_mem_free(curr_roc_req->pRemainChanCtx); cdf_mem_free(curr_roc_req); @@ -1118,7 +1118,7 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, return 0; } } - cdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); + qdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); /* FIXME cancel currently running remain on chan. * Need to check cookie and cancel accordingly */ diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index ff0cbc5e25a9..bccdda97cd98 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1755,16 +1755,16 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_RESUME_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); - cdf_spin_lock(&pHddCtx->sched_scan_lock); + qdf_spin_lock(&pHddCtx->sched_scan_lock); pHddCtx->isWiphySuspended = false; if (true != pHddCtx->isSchedScanUpdatePending) { - cdf_spin_unlock(&pHddCtx->sched_scan_lock); + qdf_spin_unlock(&pHddCtx->sched_scan_lock); hddLog(LOG1, FL("Return resume is not due to PNO indication")); return 0; } /* Reset flag to avoid updatating cfg80211 data old results again */ pHddCtx->isSchedScanUpdatePending = false; - cdf_spin_unlock(&pHddCtx->sched_scan_lock); + qdf_spin_unlock(&pHddCtx->sched_scan_lock); status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 71a0e3e13ea5..97348a9b972b 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -538,10 +538,10 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, hdd_scan_req->scan_id = scan_id; hdd_scan_req->timestamp = timestamp; - cdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); status = qdf_list_insert_back(&hdd_ctx->hdd_scan_req_q, &hdd_scan_req->node); - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); if (QDF_STATUS_SUCCESS != status) { hdd_err("Failed to enqueue Scan Req"); @@ -575,16 +575,16 @@ QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, if ((source == NULL) && (timestamp == NULL) && (req == NULL)) return QDF_STATUS_E_NULL_VALUE; - cdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); if (list_empty(&hdd_ctx->hdd_scan_req_q.anchor)) { - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&hdd_ctx->hdd_scan_req_q, &ppNode)) { - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to remove Scan Req from queue"); return QDF_STATUS_E_FAILURE; } @@ -600,12 +600,12 @@ QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, *source = hdd_scan_req->source; *timestamp = hdd_scan_req->timestamp; cdf_mem_free(hdd_scan_req); - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_info("removed Scan id: %d, req = %p", scan_id, req); return QDF_STATUS_SUCCESS; } else { - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to remove node scan id %d", scan_id); return status; @@ -614,7 +614,7 @@ QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, } while (QDF_STATUS_SUCCESS == qdf_list_peek_next(&hdd_ctx->hdd_scan_req_q, pNode, &ppNode)); - cdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_err("Failed to find scan id %d", scan_id); return status; } @@ -673,12 +673,12 @@ hdd_scan_request_callback(tHalHandle halHandle, void *pContext, hdd_err("Got unexpected request struct for Scan id %d", scanId); - cdf_spin_lock(&hddctx->hdd_scan_req_q_lock); + qdf_spin_lock(&hddctx->hdd_scan_req_q_lock); size = qdf_list_size(&(hddctx->hdd_scan_req_q)); if (!size) /* Scan is no longer pending */ pAdapter->scan_info.mScanPending = false; - cdf_spin_unlock(&hddctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hddctx->hdd_scan_req_q_lock); /* notify any applications that may be interested */ memset(&wrqu, '\0', sizeof(wrqu)); @@ -1141,14 +1141,14 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, aborted = true; } - cdf_spin_lock(&hddctx->hdd_scan_req_q_lock); + qdf_spin_lock(&hddctx->hdd_scan_req_q_lock); size = qdf_list_size(&(hddctx->hdd_scan_req_q)); if (!size) { /* Scan is no longer pending */ pScanInfo->mScanPending = false; complete(&pScanInfo->abortscan_event_var); } - cdf_spin_unlock(&hddctx->hdd_scan_req_q_lock); + qdf_spin_unlock(&hddctx->hdd_scan_req_q_lock); /* * Scan can be triggred from NL or vendor scan * - If scan is triggered from NL then cfg80211 scan done should be @@ -1955,15 +1955,15 @@ hdd_sched_scan_callback(void *callbackContext, return; } - cdf_spin_lock(&pHddCtx->sched_scan_lock); + qdf_spin_lock(&pHddCtx->sched_scan_lock); if (true == pHddCtx->isWiphySuspended) { pHddCtx->isSchedScanUpdatePending = true; - cdf_spin_unlock(&pHddCtx->sched_scan_lock); + qdf_spin_unlock(&pHddCtx->sched_scan_lock); hddLog(LOG1, FL("Update cfg80211 scan database after it resume")); return; } - cdf_spin_unlock(&pHddCtx->sched_scan_lock); + qdf_spin_unlock(&pHddCtx->sched_scan_lock); ret = wlan_hdd_cfg80211_update_bss(pHddCtx->wiphy, pAdapter, 0); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index e95a24e8b4b3..e278ca7e9fee 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -570,7 +570,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, skb->protocol = eth_type_trans(skb, skb->dev); #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK - cdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, + qdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, HDD_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); #endif diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index dc7565c66104..6a0162ec5bcd 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -732,7 +732,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) ++pAdapter->stats.rx_packets; pAdapter->stats.rx_bytes += skb->len; #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK - cdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, + qdf_wake_lock_timeout_acquire(&pHddCtx->rx_wake_lock, HDD_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_HOLD_RX); #endif diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 5e9e82046d4d..f1c580312a1f 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -637,7 +637,7 @@ typedef struct sAniSirLim { /* admission control policy information */ tLimAdmitPolicyInfo admitPolicyInfo; - cdf_mutex_t lkPeGlobalLock; + qdf_mutex_t lkPeGlobalLock; uint8_t disableLDPCWithTxbfAP; #ifdef FEATURE_WLAN_TDLS uint8_t gLimTDLSBufStaEnabled; @@ -825,7 +825,7 @@ typedef struct sAniSirLim { #endif tSirRemainOnChnReq *gpLimRemainOnChanReq; /* hold remain on chan request in this buf */ - cdf_mutex_t lim_frame_register_lock; + qdf_mutex_t lim_frame_register_lock; qdf_list_t gLimMgmtFrameRegistratinQueue; uint32_t mgmtFrameSessionId; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index cd5689c24370..f9e8f8440af9 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -606,7 +606,7 @@ tSirRetStatus lim_initialize(tpAniSirGlobal pMac) rrm_initialize(pMac); #endif - cdf_mutex_init(&pMac->lim.lim_frame_register_lock); + qdf_mutex_create(&pMac->lim.lim_frame_register_lock); qdf_list_create(&pMac->lim.gLimMgmtFrameRegistratinQueue, 0); /* Initialize the configurations needed by PE */ @@ -656,7 +656,7 @@ void lim_cleanup(tpAniSirGlobal pMac) struct mgmt_frm_reg_info *pLimMgmtRegistration = NULL; if (QDF_GLOBAL_FTM_MODE != cds_get_conparam()) { - cdf_mutex_acquire(&pMac->lim.lim_frame_register_lock); + qdf_mutex_acquire(&pMac->lim.lim_frame_register_lock); while (qdf_list_remove_front( &pMac->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &pLimMgmtRegistration) == @@ -665,7 +665,7 @@ void lim_cleanup(tpAniSirGlobal pMac) FL("Fixing leak! Deallocating pLimMgmtRegistration node")); cdf_mem_free(pLimMgmtRegistration); } - cdf_mutex_release(&pMac->lim.lim_frame_register_lock); + qdf_mutex_release(&pMac->lim.lim_frame_register_lock); qdf_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue); } @@ -766,7 +766,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) pMac->lim.mgmtFrameSessionId = 0xff; pMac->lim.deferredMsgCnt = 0; - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pMac->lim.lkPeGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(&pMac->lim.lkPeGlobalLock))) { PELOGE(lim_log(pMac, LOGE, FL("pe lock init failed!"));) status = eSIR_FAILURE; goto pe_open_lock_fail; @@ -830,7 +830,7 @@ tSirRetStatus pe_close(tpAniSirGlobal pMac) cdf_mem_free(pMac->lim.gpSession); pMac->lim.gpSession = NULL; if (!QDF_IS_STATUS_SUCCESS - (cdf_mutex_destroy(&pMac->lim.lkPeGlobalLock))) { + (qdf_mutex_destroy(&pMac->lim.lkPeGlobalLock))) { return eSIR_FAILURE; } return eSIR_SUCCESS; @@ -2265,7 +2265,7 @@ QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe) if (psPe) { if (QDF_IS_STATUS_SUCCESS - (cdf_mutex_acquire(&psPe->lkPeGlobalLock))) { + (qdf_mutex_acquire(&psPe->lkPeGlobalLock))) { status = QDF_STATUS_SUCCESS; } } @@ -2277,7 +2277,7 @@ QDF_STATUS pe_release_global_lock(tAniSirLim *psPe) QDF_STATUS status = QDF_STATUS_E_INVAL; if (psPe) { if (QDF_IS_STATUS_SUCCESS - (cdf_mutex_release(&psPe->lkPeGlobalLock))) { + (qdf_mutex_release(&psPe->lkPeGlobalLock))) { status = QDF_STATUS_SUCCESS; } } diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 70e16b1c2a76..7b16ae7f9ac2 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -652,10 +652,10 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, body = WMA_GET_RX_MPDU_DATA(buff_desc); frm_len = WMA_GET_RX_PAYLOAD_LEN(buff_desc); - cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); qdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &mgmt_frame); - cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); while (mgmt_frame != NULL) { type = (mgmt_frame->frameType >> 2) & 0x03; @@ -683,13 +683,13 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, } } - cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); qdf_status = qdf_list_peek_next( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t *) mgmt_frame, (qdf_list_node_t **) &next_frm); - cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); mgmt_frame = next_frm; next_frm = NULL; } diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 47b4b71baa0a..4111fbb5176b 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -4502,10 +4502,10 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, sme_req->registerFrame, sme_req->frameType, sme_req->matchLen); /* First check whether entry exists already */ - cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); qdf_list_peek_front(&mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &lim_mgmt_regn); - cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); while (lim_mgmt_regn != NULL) { if (lim_mgmt_regn->frameType != sme_req->frameType) @@ -4525,21 +4525,21 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, break; } skip_match: - cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); qdf_status = qdf_list_peek_next( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t *)lim_mgmt_regn, (qdf_list_node_t **)&next); - cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); lim_mgmt_regn = next; next = NULL; } if (match) { - cdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_acquire(&mac_ctx->lim.lim_frame_register_lock); qdf_list_remove_node( &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t *)lim_mgmt_regn); - cdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); + qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); cdf_mem_free(lim_mgmt_regn); } @@ -4559,12 +4559,12 @@ skip_match: sme_req->matchData, sme_req->matchLen); } - cdf_mutex_acquire( + qdf_mutex_acquire( &mac_ctx->lim.lim_frame_register_lock); qdf_list_insert_front(&mac_ctx->lim. gLimMgmtFrameRegistratinQueue, &lim_mgmt_regn->node); - cdf_mutex_release( + qdf_mutex_release( &mac_ctx->lim.lim_frame_register_lock); } } diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index e2354eca65ae..eea5579b49ce 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -51,7 +51,7 @@ #include /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ #include /* cdf_assert */ -#include /* cdf_spinlock */ +#include /* cdf_spinlock */ #include /* TAILQ */ #include #include @@ -131,18 +131,18 @@ #define DFS_EXT_CHAN_LOADING_THRESH 30 #define DFS_DEFAULT_PRI_MARGIN 6 #define DFS_DEFAULT_FIXEDPATTERN_PRI_MARGIN 4 -#define ATH_DFSQ_LOCK(_dfs) cdf_spin_lock_bh((&(_dfs)->dfs_radarqlock)) -#define ATH_DFSQ_UNLOCK(_dfs) cdf_spin_unlock_bh((&(_dfs)->dfs_radarqlock)) -#define ATH_DFSQ_LOCK_INIT(_dfs) cdf_spinlock_init(&(_dfs)->dfs_radarqlock) +#define ATH_DFSQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_radarqlock)) +#define ATH_DFSQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_radarqlock)) +#define ATH_DFSQ_LOCK_INIT(_dfs) qdf_spinlock_create(&(_dfs)->dfs_radarqlock) -#define ATH_ARQ_LOCK(_dfs) cdf_spin_lock_bh((&(_dfs)->dfs_arqlock)) -#define ATH_ARQ_UNLOCK(_dfs) cdf_spin_unlock_bh((&(_dfs)->dfs_arqlock)) -#define ATH_ARQ_LOCK_INIT(_dfs) cdf_spinlock_init(&(_dfs)->dfs_arqlock) +#define ATH_ARQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_arqlock)) +#define ATH_ARQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_arqlock)) +#define ATH_ARQ_LOCK_INIT(_dfs) qdf_spinlock_create(&(_dfs)->dfs_arqlock) -#define ATH_DFSEVENTQ_LOCK(_dfs) cdf_spin_lock_bh((&(_dfs)->dfs_eventqlock)) -#define ATH_DFSEVENTQ_UNLOCK(_dfs) cdf_spin_unlock_bh((&(_dfs)->dfs_eventqlock)) +#define ATH_DFSEVENTQ_LOCK(_dfs) qdf_spin_lock_bh((&(_dfs)->dfs_eventqlock)) +#define ATH_DFSEVENTQ_UNLOCK(_dfs) qdf_spin_unlock_bh((&(_dfs)->dfs_eventqlock)) #define ATH_DFSEVENTQ_LOCK_INIT(_dfs) \ - cdf_spinlock_init((&(_dfs)->dfs_eventqlock)) + qdf_spinlock_create((&(_dfs)->dfs_eventqlock)) /* Mask for time stamp from descriptor */ #define DFS_TSMASK 0xFFFFFFFF /* Shift for time stamp from descriptor */ @@ -222,7 +222,7 @@ #define DFS_ETSI_TYPE3_WAR_PRI_UPPER_LIMIT 435 #define DFS_ETSI_WAR_VALID_PULSE_DURATION 15 -typedef cdf_spinlock_t dfsq_lock_t; +typedef qdf_spinlock_t dfsq_lock_t; #ifdef WIN32 #pragma pack(push, dfs_pulseparams, 1) diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 24b43b1def8a..58568f2bf790 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -169,9 +169,9 @@ static os_timer_func(dfs_task) */ OS_CANCEL_TIMER(&dfs->ath_dfstesttimer); dfs->ath_dfstest = 1; - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); dfs->ath_dfstest_ieeechan = ic->ic_curchan->ic_ieee; - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); dfs->ath_dfstesttime = 1; /* 1ms */ OS_SET_TIMER(&dfs->ath_dfstesttimer, dfs->ath_dfstesttime); diff --git a/core/sap/dfs/src/dfs_fcc_bin5.c b/core/sap/dfs/src/dfs_fcc_bin5.c index 027e3211866e..9d8dd76c5a34 100644 --- a/core/sap/dfs/src/dfs_fcc_bin5.c +++ b/core/sap/dfs/src/dfs_fcc_bin5.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_fcc_bin5.c + dfs_fcc_bin5.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -95,15 +95,15 @@ dfs_bin5_check_pulse(struct ath_dfs *dfs, struct dfs_event *re, !!(re->re_flags & DFS_EVENT_CHECKCHIRP), !!(re->re_flags & DFS_EVENT_HW_CHIRP), !!(re->re_flags & DFS_EVENT_SW_CHIRP)); - return (0); + return 0; } /* Adjust the filter threshold for rssi in non TURBO mode */ - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (!(dfs->ic->ic_curchan->ic_flags & CHANNEL_TURBO)) b5_rssithresh += br->br_pulse.b5_rssimargin; - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); /* * Check if the pulse is within duration and rssi @@ -115,7 +115,7 @@ dfs_bin5_check_pulse(struct ath_dfs *dfs, struct dfs_event *re, DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5, "%s: dur=%d, rssi=%d - adding!\n", __func__, (int)re->re_dur, (int)re->re_rssi); - return (1); + return 1; } DFS_DPRINTK(dfs, ATH_DEBUG_DFS_BIN5, @@ -124,7 +124,7 @@ dfs_bin5_check_pulse(struct ath_dfs *dfs, struct dfs_event *re, (unsigned long long)re->re_full_ts, (int)re->re_dur, (int)re->re_rssi); - return (0); + return 0; } int dfs_bin5_addpulse(struct ath_dfs *dfs, struct dfs_bin5radars *br, @@ -567,7 +567,7 @@ dfs_check_chirping_merlin(struct ath_dfs *dfs, void *buf, uint16_t datalen, int same_sign; int temp; - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (IS_CHAN_HT40(dfs->ic->ic_curchan)) { num_fft_bytes = NUM_FFT_BYTES_HT40; num_bin_bytes = NUM_BIN_BYTES_HT40; @@ -598,7 +598,7 @@ dfs_check_chirping_merlin(struct ath_dfs *dfs, void *buf, uint16_t datalen, upper_mag_byte = UPPER_MAG_BYTE_HT20; } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); ptr = (uint8_t *) buf; /* * sanity check for FFT buffer @@ -634,7 +634,7 @@ dfs_check_chirping_merlin(struct ath_dfs *dfs, void *buf, uint16_t datalen, max_index_upper[i] = (ptr[fft_start + upper_index_byte] >> 2) + num_subchan_bins; - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (!IS_CHAN_HT40(dfs->ic->ic_curchan)) { /* * for HT20 mode indices are 6 bit signed number @@ -643,7 +643,7 @@ dfs_check_chirping_merlin(struct ath_dfs *dfs, void *buf, uint16_t datalen, max_index_upper[i] = 0; } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); /* * Reconstruct the maximum magnitude for each sub-channel. Also select * and flag the max overall magnitude between the two sub-channels. diff --git a/core/sap/dfs/src/dfs_misc.c b/core/sap/dfs/src/dfs_misc.c index c6b8834a8b6e..c06d790d4833 100644 --- a/core/sap/dfs/src/dfs_misc.c +++ b/core/sap/dfs/src/dfs_misc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2002-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -27,7 +27,7 @@ /*=========================================================================== - dfs_misc.c + dfs_misc.c OVERVIEW: @@ -41,7 +41,7 @@ /*=========================================================================== - EDIT HISTORY FOR FILE + EDIT HISTORY FOR FILE This section contains comments describing changes made to the module. Notice that changes are listed in reverse chronological order. @@ -107,9 +107,9 @@ dfs_get_pri_margin(struct ath_dfs *dfs, int is_extchan_detect, else pri_margin = DFS_DEFAULT_PRI_MARGIN; - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (IS_CHAN_HT40(dfs->ic->ic_curchan)) { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); ext_chan_busy = dfs->ic->ic_get_ext_busy(dfs->ic); if (ext_chan_busy >= 0) { dfs->dfs_rinfo.ext_chan_busy_ts = @@ -134,7 +134,7 @@ dfs_get_pri_margin(struct ath_dfs *dfs, int is_extchan_detect, pri_margin -= adjust_pri; } else { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); } return pri_margin; } @@ -150,9 +150,9 @@ int dfs_get_filter_threshold(struct ath_dfs *dfs, struct dfs_filter *rf, thresh = rf->rf_threshold; - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (IS_CHAN_HT40(dfs->ic->ic_curchan)) { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); ext_chan_busy = dfs->ic->ic_get_ext_busy(dfs->ic); if (ext_chan_busy >= 0) { dfs->dfs_rinfo.ext_chan_busy_ts = @@ -186,7 +186,7 @@ int dfs_get_filter_threshold(struct ath_dfs *dfs, struct dfs_filter *rf, thresh += adjust_thresh; } else { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); } return thresh; } @@ -202,7 +202,7 @@ uint32_t dfs_round(int32_t val) if (rem < 50) return ival; else - return (ival + 1); + return ival + 1; } struct dfs_ieee80211_channel *ieee80211_get_extchan(struct ieee80211com *ic) @@ -273,12 +273,12 @@ struct dfs_state *dfs_getchanstate(struct ath_dfs *dfs, uint8_t *index, if (index != NULL) *index = (uint8_t) i; - return (rs); + return rs; } } DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, "%s: No more radar states left.\n", __func__); - return (NULL); + return NULL; } #endif /* ATH_SUPPORT_DFS */ diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.c b/core/sap/dfs/src/dfs_phyerr_tlv.c index 3ba5a9dcffde..1df4e5dde783 100644 --- a/core/sap/dfs/src/dfs_phyerr_tlv.c +++ b/core/sap/dfs/src/dfs_phyerr_tlv.c @@ -388,7 +388,7 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, * Set pulse duration to 20 us */ - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); freq = ieee80211_chan2freq(dfs->ic, dfs->ic->ic_curchan); freq_centre = dfs->ic->ic_curchan->ic_vhtop_ch_freq_seg1; @@ -399,7 +399,7 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, rsu->pulse_duration = 20; } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); } static void @@ -599,7 +599,7 @@ static int tlv_calc_freq_info(struct ath_dfs *dfs, struct rx_radar_status *rs) return 0; } - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); /* * calculate the channel center frequency for * 160MHz and 80p80 MHz including the legacy @@ -644,7 +644,7 @@ static int tlv_calc_freq_info(struct ath_dfs *dfs, struct rx_radar_status *rs) chan_centre += (chan_offset / 2); } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); /* * XXX half/quarter rate support! */ diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c index ba1ba1f9bdd6..b07c4cfca6b0 100644 --- a/core/sap/dfs/src/dfs_process_phyerr.c +++ b/core/sap/dfs/src/dfs_process_phyerr.c @@ -88,7 +88,7 @@ dfs_get_event_freqcentre(struct ath_dfs *dfs, int is_pri, int is_ext, int is_dc) * based on whether it's an upper or lower channel. */ chan_width = dfs_get_event_freqwidth(dfs); - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); if (IEEE80211_IS_CHAN_11N_HT40PLUS(ic->ic_curchan)) chan_offset = chan_width; else if (IEEE80211_IS_CHAN_11N_HT40MINUS(ic->ic_curchan)) @@ -96,7 +96,7 @@ dfs_get_event_freqcentre(struct ath_dfs *dfs, int is_pri, int is_ext, int is_dc) else chan_offset = 0; - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); /* * Check for DC events first - the sowl code may just set all @@ -106,10 +106,10 @@ dfs_get_event_freqcentre(struct ath_dfs *dfs, int is_pri, int is_ext, int is_dc) /* * XXX TODO: Should DC events be considered 40MHz wide here? */ - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); freq = ieee80211_chan2freq(ic, ic->ic_curchan) + (chan_offset / 2); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return freq; } @@ -118,23 +118,23 @@ dfs_get_event_freqcentre(struct ath_dfs *dfs, int is_pri, int is_ext, int is_dc) * The centre frequency for pri events is still ic_freq. */ if (is_pri) { - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); freq = ieee80211_chan2freq(ic, ic->ic_curchan); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return freq; } if (is_ext) { - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); freq = ieee80211_chan2freq(ic, ic->ic_curchan) + chan_width; - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return freq; } /* XXX shouldn't get here */ - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); freq = ieee80211_chan2freq(ic, ic->ic_curchan); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return freq; } @@ -514,16 +514,16 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, return; } - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); if (IEEE80211_IS_CHAN_RADAR(chan)) { - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, "%s: Radar already found in the channel, " " do not queue radar data\n", __func__); return; } - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); dfs->ath_dfs_stats.total_phy_errors++; DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, "%s[%d] phyerr %d len %d\n", @@ -711,9 +711,9 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, * for the adaptive radio (AR) pattern matching rather than * radar detection. */ - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); if ((chan->ic_flags & CHANNEL_108G) == CHANNEL_108G) { - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); if (!(dfs->dfs_proc_phyerr & DFS_AR_EN)) { DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, "%s: DFS_AR_EN not enabled\n", __func__); @@ -763,7 +763,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, ATH_ARQ_UNLOCK(dfs); } else { if (IEEE80211_IS_CHAN_DFS(chan)) { - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); if (!(dfs->dfs_proc_phyerr & DFS_RADAR_EN)) { DFS_DPRINTK(dfs, ATH_DEBUG_DFS3, "%s: DFS_RADAR_EN not enabled\n", @@ -857,7 +857,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, STAILQ_INSERT_TAIL(&(dfs->dfs_radarq), event, re_list); ATH_DFSQ_UNLOCK(dfs); } else { - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); } } diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 7ea5cecb15ca..0cbed7eca11e 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -141,9 +141,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "%s[%d]: dfs is NULL", __func__, __LINE__); return 0; } - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (!(IEEE80211_IS_CHAN_DFS(dfs->ic->ic_curchan))) { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); DFS_DPRINTK(dfs, ATH_DEBUG_DFS2, "%s: radar event on non-DFS chan", __func__); dfs_reset_radarq(dfs); @@ -155,7 +155,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, return 0; } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); #ifndef ATH_DFS_RADAR_DETECTION_ONLY /* TEST : Simulate radar bang, make sure we add the channel to NOL (bug 29968) */ if (dfs->dfs_bangradar) { @@ -235,16 +235,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, ATH_DFSEVENTQ_UNLOCK(dfs); found = 0; - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if (dfs->ic->disable_phy_err_processing) { ATH_DFSQ_LOCK(dfs); empty = STAILQ_EMPTY(&(dfs->dfs_radarq)); ATH_DFSQ_UNLOCK(dfs); - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); continue; } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); if (re.re_chanindex < DFS_NUM_RADAR_STATES) rs = &dfs->dfs_radar[re.re_chanindex]; else { @@ -848,15 +848,15 @@ dfsfound: DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, "Primary channel freq = %u flags=0x%x", chan->ic_freq, chan->ic_flagext); - cdf_spin_lock_bh(&dfs->ic->chan_lock); + qdf_spin_lock_bh(&dfs->ic->chan_lock); if ((dfs->ic->ic_curchan->ic_freq != thischan->ic_freq)) { - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, "Ext channel freq = %u flags=0x%x", thischan->ic_freq, thischan->ic_flagext); } - cdf_spin_unlock_bh(&dfs->ic->chan_lock); + qdf_spin_unlock_bh(&dfs->ic->chan_lock); dfs->dfs_phyerr_freq_min = 0x7fffffff; dfs->dfs_phyerr_freq_max = 0; dfs->dfs_phyerr_w53_counter = 0; diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 46bb79e86891..d52d4f6d0059 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -136,7 +136,7 @@ struct sap_avoid_channels_info { typedef struct sSapContext { - cdf_mutex_t SapGlobalLock; + qdf_mutex_t SapGlobalLock; /* Include the current channel of AP */ uint32_t channel; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 1e2c3b887c74..a049ee9ee2b3 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -185,7 +185,7 @@ QDF_STATUS wlansap_start(void *pCtx) /* Now configure the auth type in the roaming profile. To open. */ pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(&pSapCtx->SapGlobalLock))) { CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); return QDF_STATUS_E_FAULT; @@ -226,7 +226,7 @@ QDF_STATUS wlansap_stop(void *pCtx) sap_free_roam_profile(&pSapCtx->csr_roamProfile); - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); return QDF_STATUS_E_FAULT; @@ -1891,7 +1891,7 @@ QDF_STATUS sap_acquire_global_lock(ptSapContext pSapCtx) { QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (QDF_IS_STATUS_SUCCESS(cdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { + if (QDF_IS_STATUS_SUCCESS(qdf_mutex_acquire(&pSapCtx->SapGlobalLock))) { qdf_status = QDF_STATUS_SUCCESS; } @@ -1902,7 +1902,7 @@ QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) { QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; - if (QDF_IS_STATUS_SUCCESS(cdf_mutex_release(&pSapCtx->SapGlobalLock))) { + if (QDF_IS_STATUS_SUCCESS(qdf_mutex_release(&pSapCtx->SapGlobalLock))) { qdf_status = QDF_STATUS_SUCCESS; } diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 1c2aa01cc73f..a36b513e3906 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -34,7 +34,7 @@ #define CSRINTERNAL_H__ #include "qdf_status.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_mc_timer.h" #include "csr_support.h" diff --git a/core/sme/inc/csr_link_list.h b/core/sme/inc/csr_link_list.h index 8776006535e5..6b0b2f2be4f3 100644 --- a/core/sme/inc/csr_link_list.h +++ b/core/sme/inc/csr_link_list.h @@ -34,7 +34,7 @@ #ifndef CSR_LINK_LIST_H__ #define CSR_LINK_LIST_H__ -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_mc_timer.h" #include "cds_api.h" #include "sir_types.h" @@ -55,7 +55,7 @@ typedef enum { /* This is a circular double link list */ typedef struct tagDblLinkList { tListElem ListHead; - cdf_mutex_t Lock; + qdf_mutex_t Lock; uint32_t Count; tHddHandle hHdd; tListFlag Flag; diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 7b57e5dd31af..8ac385cd7491 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -39,7 +39,7 @@ #include "qdf_types.h" #include "cdf_mc_timer.h" -#include "cdf_lock.h" +#include "qdf_lock.h" typedef struct sP2pPsConfig { uint8_t opp_ps; diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 963ef871d82b..f706d45aa737 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "csr_api.h" #include "cds_mq.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "qdf_types.h" #include "sir_api.h" #include "cds_reg_service.h" diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 91a686a2045d..f954514f73ae 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_status.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index a3b1e4c9209c..1872ad4ce832 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_status.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" @@ -141,7 +141,7 @@ typedef void (*sme_set_thermal_level_callback)(void *context, u_int8_t level); typedef struct tagSmeStruct { eSmeState state; - cdf_mutex_t lkSmeGlobalLock; + qdf_mutex_t lkSmeGlobalLock; uint32_t totalSmeCmd; /* following pointer contains array of pointers for tSmeCmd* */ void **pSmeCmdBufAddr; diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 731edc0e6a0d..54e9f16f3ff1 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -27,7 +27,7 @@ #if !defined(__SME_POWER_SAVE_H) #define __SME_POWER_SAVE_H -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index 8add99a0b4c2..473ef1774c94 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -37,7 +37,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index ae09e6e90d5f..7dd26da6a4a9 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -37,7 +37,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index 49b02625abf5..8c159f0e563b 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -37,7 +37,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index 312e295b0be6..fcb52ee721dd 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -37,7 +37,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index af364d0246bf..80a43d5792a1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -116,7 +116,7 @@ QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme) if (psSme) { if (QDF_IS_STATUS_SUCCESS - (cdf_mutex_acquire(&psSme->lkSmeGlobalLock))) { + (qdf_mutex_acquire(&psSme->lkSmeGlobalLock))) { status = QDF_STATUS_SUCCESS; } } @@ -130,7 +130,7 @@ QDF_STATUS sme_release_global_lock(tSmeStruct *psSme) if (psSme) { if (QDF_IS_STATUS_SUCCESS - (cdf_mutex_release(&psSme->lkSmeGlobalLock))) { + (qdf_mutex_release(&psSme->lkSmeGlobalLock))) { status = QDF_STATUS_SUCCESS; } } @@ -477,7 +477,7 @@ static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) cdf_mem_free(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; - status = cdf_mutex_acquire(&pMac->sme.lkSmeGlobalLock); + status = qdf_mutex_acquire(&pMac->sme.lkSmeGlobalLock); if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to acquire the lock status = %d"), status); @@ -486,7 +486,7 @@ static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) free_sme_cmds(pMac); - status = cdf_mutex_release(&pMac->sme.lkSmeGlobalLock); + status = qdf_mutex_release(&pMac->sme.lkSmeGlobalLock); if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGE, FL("Failed to release the lock status = %d"), status); @@ -1048,7 +1048,7 @@ QDF_STATUS sme_open(tHalHandle hHal) pMac->sme.state = SME_STATE_STOP; pMac->sme.currDeviceMode = QDF_STA_MODE; - if (!QDF_IS_STATUS_SUCCESS(cdf_mutex_init( + if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( &pMac->sme.lkSmeGlobalLock))) { sms_log(pMac, LOGE, FL("sme_open failed init lock")); return QDF_STATUS_E_FAILURE; @@ -2899,7 +2899,7 @@ QDF_STATUS sme_close(tHalHandle hHal) free_sme_cmd_list(pMac); if (!QDF_IS_STATUS_SUCCESS - (cdf_mutex_destroy(&pMac->sme.lkSmeGlobalLock))) { + (qdf_mutex_destroy(&pMac->sme.lkSmeGlobalLock))) { fail_status = QDF_STATUS_E_FAILURE; } diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 58b34196ae65..ed9db8b13491 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -33,7 +33,7 @@ ========================================================================== */ #include "csr_link_list.h" -#include "cdf_lock.h" +#include "qdf_lock.h" #include "cdf_memory.h" #include "cdf_trace.h" #include "cdf_mc_timer.h" @@ -146,7 +146,7 @@ void csr_ll_lock(tDblLinkList *pList) } if (LIST_FLAG_OPEN == pList->Flag) { - cdf_mutex_acquire(&pList->Lock); + qdf_mutex_acquire(&pList->Lock); } } @@ -160,7 +160,7 @@ void csr_ll_unlock(tDblLinkList *pList) } if (LIST_FLAG_OPEN == pList->Flag) { - cdf_mutex_release(&pList->Lock); + qdf_mutex_release(&pList->Lock); } } @@ -231,7 +231,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) if (LIST_FLAG_OPEN != pList->Flag) { pList->Count = 0; pList->cmdTimeoutTimer = NULL; - qdf_status = cdf_mutex_init(&pList->Lock); + qdf_status = qdf_mutex_create(&pList->Lock); if (QDF_IS_STATUS_SUCCESS(qdf_status)) { csr_list_init(&pList->ListHead); @@ -255,7 +255,7 @@ void csr_ll_close(tDblLinkList *pList) if (LIST_FLAG_OPEN == pList->Flag) { /* Make sure the list is empty... */ csr_ll_purge(pList, LL_ACCESS_LOCK); - cdf_mutex_destroy(&pList->Lock); + qdf_mutex_destroy(&pList->Lock); pList->Flag = LIST_FLAG_CLOSE; } } diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 49a62fc35b64..f815204c7148 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -125,7 +125,7 @@ typedef struct epping_context { struct epping_cookie *cookie_list; int cookie_count; struct epping_cookie *s_cookie_mem[MAX_COOKIE_SLOTS_NUM]; - cdf_spinlock_t cookie_lock; + qdf_spinlock_t cookie_lock; } epping_context_t; typedef enum { @@ -141,7 +141,7 @@ typedef struct epping_adapter_s { struct qdf_mac_addr macAddressCurrent; uint8_t sessionId; /* for mboxping */ - cdf_spinlock_t data_lock; + qdf_spinlock_t data_lock; cdf_nbuf_queue_t nodrop_queue; qdf_timer_t epping_timer; epping_tx_timer_state_t epping_timer_state; diff --git a/core/utils/epping/inc/epping_main.h b/core/utils/epping/inc/epping_main.h index e65e3dfba211..d267b714c46e 100644 --- a/core/utils/epping/inc/epping_main.h +++ b/core/utils/epping/inc/epping_main.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -38,7 +38,7 @@ /*--------------------------------------------------------------------------- Include files -------------------------------------------------------------------------*/ -#include +#include #define WLAN_EPPING_ENABLE_BIT (1 << 8) #define WLAN_EPPING_IRQ_BIT (1 << 9) diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 12602324fb69..32fa3e56341b 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -72,7 +72,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) sizeof(struct epping_cookie) * MAX_COOKIE_SLOT_SIZE); } - cdf_spinlock_init(&pEpping_ctx->cookie_lock); + qdf_spinlock_create(&pEpping_ctx->cookie_lock); for (i = 0; i < MAX_COOKIE_SLOTS_NUM; i++) { struct epping_cookie *cookie_mem = pEpping_ctx->s_cookie_mem[i]; @@ -95,10 +95,10 @@ error: void epping_cookie_cleanup(epping_context_t *pEpping_ctx) { int i; - cdf_spin_lock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_lock_bh(&pEpping_ctx->cookie_lock); pEpping_ctx->cookie_list = NULL; pEpping_ctx->cookie_count = 0; - cdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); for (i = 0; i < MAX_COOKIE_SLOTS_NUM; i++) { if (pEpping_ctx->s_cookie_mem[i]) { cdf_mem_free(pEpping_ctx->s_cookie_mem[i]); @@ -110,24 +110,24 @@ void epping_cookie_cleanup(epping_context_t *pEpping_ctx) void epping_free_cookie(epping_context_t *pEpping_ctx, struct epping_cookie *cookie) { - cdf_spin_lock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_lock_bh(&pEpping_ctx->cookie_lock); cookie->next = pEpping_ctx->cookie_list; pEpping_ctx->cookie_list = cookie; pEpping_ctx->cookie_count++; - cdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); } struct epping_cookie *epping_alloc_cookie(epping_context_t *pEpping_ctx) { struct epping_cookie *cookie; - cdf_spin_lock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_lock_bh(&pEpping_ctx->cookie_lock); cookie = pEpping_ctx->cookie_list; if (cookie != NULL) { pEpping_ctx->cookie_list = cookie->next; pEpping_ctx->cookie_count--; } - cdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); + qdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); return cookie; } diff --git a/core/utils/epping/src/epping_tx.c b/core/utils/epping/src/epping_tx.c index a1f0f4e3feab..96e6b357f62f 100644 --- a/core/utils/epping/src/epping_tx.c +++ b/core/utils/epping/src/epping_tx.c @@ -200,14 +200,14 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) /* if nodrop queue is not empty, continue to arm timer */ if (nodrop_skb) { - cdf_spin_lock_bh(&pAdapter->data_lock); + qdf_spin_lock_bh(&pAdapter->data_lock); /* if nodrop queue is not empty, continue to arm timer */ if (pAdapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { pAdapter->epping_timer_state = EPPING_TX_TIMER_RUNNING; qdf_timer_mod(&pAdapter->epping_timer, TX_RETRY_TIMEOUT_IN_MS); } - cdf_spin_unlock_bh(&pAdapter->data_lock); + qdf_spin_unlock_bh(&pAdapter->data_lock); } else { pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; } @@ -288,13 +288,13 @@ tx_fail: EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p queued\n", __func__, skb); cdf_nbuf_queue_add(&pAdapter->nodrop_queue, skb); - cdf_spin_lock_bh(&pAdapter->data_lock); + qdf_spin_lock_bh(&pAdapter->data_lock); if (pAdapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { pAdapter->epping_timer_state = EPPING_TX_TIMER_RUNNING; qdf_timer_mod(&pAdapter->epping_timer, TX_RETRY_TIMEOUT_IN_MS); } - cdf_spin_unlock_bh(&pAdapter->data_lock); + qdf_spin_unlock_bh(&pAdapter->data_lock); } return 0; @@ -325,7 +325,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) cdf_nbuf_queue_init(&skb_queue); - cdf_spin_lock_bh(&pAdapter->data_lock); + qdf_spin_lock_bh(&pAdapter->data_lock); while (!HTC_QUEUE_EMPTY(pPacketQueue)) { htc_pkt = htc_packet_dequeue(pPacketQueue); @@ -367,7 +367,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) epping_free_cookie(pAdapter->pEpping_ctx, cookie); } - cdf_spin_unlock_bh(&pAdapter->data_lock); + qdf_spin_unlock_bh(&pAdapter->data_lock); /* free all skbs in our local list */ while (cdf_nbuf_queue_len(&skb_queue)) { diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index 0f8bbaab67dd..0cfe95687128 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -308,7 +308,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter) pEpping_ctx = pAdapter->pEpping_ctx; epping_unregister_adapter(pAdapter); - cdf_spinlock_destroy(&pAdapter->data_lock); + qdf_spinlock_destroy(&pAdapter->data_lock); qdf_timer_free(&pAdapter->epping_timer); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; @@ -367,7 +367,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, cdf_mem_copy(dev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr)); cdf_mem_copy(pAdapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr)); - cdf_spinlock_init(&pAdapter->data_lock); + qdf_spinlock_create(&pAdapter->data_lock); cdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index fb396a75b7ff..c52c726fb3ca 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -519,7 +519,7 @@ struct beacon_info { uint16_t noa_sub_ie_len; uint8_t *noa_ie; uint16_t p2p_ie_offset; - cdf_spinlock_t lock; + qdf_spinlock_t lock; }; /** @@ -1227,9 +1227,9 @@ typedef struct { struct wma_txrx_node *interfaces; pdev_cli_config_t pdevconfig; qdf_list_t vdev_resp_queue; - cdf_spinlock_t vdev_respq_lock; + qdf_spinlock_t vdev_respq_lock; qdf_list_t wma_hold_req_queue; - cdf_spinlock_t wma_hold_req_q_lock; + qdf_spinlock_t wma_hold_req_q_lock; uint32_t ht_cap_info; #ifdef WLAN_FEATURE_11AC uint32_t vht_cap_info; @@ -1266,12 +1266,12 @@ typedef struct { struct ieee80211com *dfs_ic; #ifdef FEATURE_WLAN_SCAN_PNO - cdf_wake_lock_t pno_wake_lock; + qdf_wake_lock_t pno_wake_lock; #endif #ifdef FEATURE_WLAN_EXTSCAN - cdf_wake_lock_t extscan_wake_lock; + qdf_wake_lock_t extscan_wake_lock; #endif - cdf_wake_lock_t wow_wake_lock; + qdf_wake_lock_t wow_wake_lock; int wow_nack; qdf_atomic_t is_wow_bus_suspended; cdf_mc_timer_t wma_scan_comp_timer; @@ -1327,7 +1327,7 @@ typedef struct { uint16_t num_free; union wmi_desc_elem_t *array; union wmi_desc_elem_t *freelist; - cdf_spinlock_t wmi_desc_pool_lock; + qdf_spinlock_t wmi_desc_pool_lock; } wmi_desc_pool; uint8_t max_scan; struct wmi_init_cmd saved_wmi_init_cmd; @@ -1349,8 +1349,8 @@ typedef struct { QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr); - cdf_wake_lock_t wmi_cmd_rsp_wake_lock; - cdf_runtime_lock_t wmi_cmd_rsp_runtime_lock; + qdf_wake_lock_t wmi_cmd_rsp_wake_lock; + qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock; uint32_t fine_time_measurement_cap; struct wma_ini_config ini_config; } t_wma_handle, *tp_wma_handle; diff --git a/core/wma/inc/wma_dfs_interface.h b/core/wma/inc/wma_dfs_interface.h index 39f031740270..4c4e2eacdac9 100644 --- a/core/wma/inc/wma_dfs_interface.h +++ b/core/wma/inc/wma_dfs_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -26,7 +26,7 @@ */ #include "ath_dfs_structs.h" -#include +#include #include "cds_ieee80211_common.h" #define IEEE80211_CHAN_MAX 255 @@ -177,7 +177,7 @@ struct ieee80211_dfs_state { const struct dfs_ieee80211_channel *lastchan; struct dfs_ieee80211_channel *newchan; int cac_timeout_override; - uint8_t enable : 1, cac_timer_running : 1, ignore_dfs : 1, ignore_cac : 1; + uint8_t enable:1, cac_timer_running:1, ignore_dfs:1, ignore_cac:1; }; /** @@ -262,7 +262,7 @@ typedef struct ieee80211com { uint8_t vdev_id; uint8_t last_radar_found_chan; int32_t dfs_pri_multiplier; - cdf_spinlock_t chan_lock; + qdf_spinlock_t chan_lock; bool disable_phy_err_processing; DFS_HWBD_ID dfs_hw_bd_id; } IEEE80211COM, *PIEEE80211COM; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 3b655d8ca73a..ac24aada7c42 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2275,7 +2275,7 @@ int wmi_desc_pool_init(tp_wma_handle wma_handle, uint32_t pool_size) wma_handle->wmi_desc_pool.array[i].next = NULL; wma_handle->wmi_desc_pool.array[i].wmi_desc.desc_id = i; - cdf_spinlock_init(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spinlock_create(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); return 0; } @@ -2287,7 +2287,7 @@ int wmi_desc_pool_init(tp_wma_handle wma_handle, uint32_t pool_size) */ void wmi_desc_pool_deinit(tp_wma_handle wma_handle) { - cdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); if (wma_handle->wmi_desc_pool.array) { cdf_mem_free(wma_handle->wmi_desc_pool.array); wma_handle->wmi_desc_pool.array = NULL; @@ -2298,8 +2298,8 @@ void wmi_desc_pool_deinit(tp_wma_handle wma_handle) wma_handle->wmi_desc_pool.freelist = NULL; wma_handle->wmi_desc_pool.pool_size = 0; wma_handle->wmi_desc_pool.num_free = 0; - cdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); - cdf_spinlock_destroy(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spinlock_destroy(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); } /** @@ -2312,14 +2312,14 @@ struct wmi_desc_t *wmi_desc_get(tp_wma_handle wma_handle) { struct wmi_desc_t *wmi_desc = NULL; - cdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); if (wma_handle->wmi_desc_pool.freelist) { wma_handle->wmi_desc_pool.num_free--; wmi_desc = &wma_handle->wmi_desc_pool.freelist->wmi_desc; wma_handle->wmi_desc_pool.freelist = wma_handle->wmi_desc_pool.freelist->next; } - cdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); return wmi_desc; } @@ -2333,12 +2333,12 @@ struct wmi_desc_t *wmi_desc_get(tp_wma_handle wma_handle) */ void wmi_desc_put(tp_wma_handle wma_handle, struct wmi_desc_t *wmi_desc) { - cdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); ((union wmi_desc_elem_t *)wmi_desc)->next = wma_handle->wmi_desc_pool.freelist; wma_handle->wmi_desc_pool.freelist = (union wmi_desc_elem_t *)wmi_desc; wma_handle->wmi_desc_pool.num_free++; - cdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); + qdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); } #define mgmt_tx_dl_frm_len 64 diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 32d26b4ebe33..6432a25f0f5a 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -310,10 +310,10 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, qdf_list_node_t *node1 = NULL, *node2 = NULL; QDF_STATUS status; - cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_lock_bh(&wma->wma_hold_req_q_lock); if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->wma_hold_req_queue, &node2)) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("unable to get msg node from request queue")); return NULL; } @@ -329,7 +329,7 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, found = true; status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGD(FL("Failed to remove request for vdev_id %d type %d"), vdev_id, type); return NULL; @@ -339,7 +339,7 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, qdf_list_peek_next(&wma->wma_hold_req_queue, node1, &node2)); - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); if (!found) { WMA_LOGE(FL("target request not found for vdev_id %d type %d"), vdev_id, type); @@ -371,10 +371,10 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, qdf_list_node_t *node1 = NULL, *node2 = NULL; QDF_STATUS status; - cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_lock_bh(&wma->wma_hold_req_q_lock); if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->wma_hold_req_queue, &node2)) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("unable to get msg node from request queue")); return NULL; } @@ -390,7 +390,7 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, found = true; status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGD(FL("Failed to remove request. vdev_id %d type %d"), vdev_id, msg_type); return NULL; @@ -400,7 +400,7 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, qdf_list_peek_next(&wma->wma_hold_req_queue, node1, &node2)); - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); if (!found) { WMA_LOGE(FL("target request not found for vdev_id %d type %d"), vdev_id, msg_type); @@ -430,10 +430,10 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, qdf_list_node_t *node1 = NULL, *node2 = NULL; QDF_STATUS status; - cdf_spin_lock_bh(&wma->vdev_respq_lock); + qdf_spin_lock_bh(&wma->vdev_respq_lock); if (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->vdev_resp_queue, &node2)) { - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("unable to get target req from vdev resp queue")); return NULL; } @@ -449,7 +449,7 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, found = true; status = qdf_list_remove_node(&wma->vdev_resp_queue, node1); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGD(FL("Failed to target req for vdev_id %d type %d"), vdev_id, type); return NULL; @@ -459,7 +459,7 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, qdf_list_peek_next(&wma->vdev_resp_queue, node1, &node2)); - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); if (!found) { WMA_LOGP(FL("target request not found for vdev_id %d type %d"), vdev_id, type); @@ -632,11 +632,11 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, /* Acquire wake lock only when you expect a response from firmware */ if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { - cdf_wake_lock_timeout_acquire( + qdf_wake_lock_timeout_acquire( &wma_handle->wmi_cmd_rsp_wake_lock, WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); - cdf_runtime_pm_prevent_suspend( + qdf_runtime_pm_prevent_suspend( wma_handle->wmi_cmd_rsp_runtime_lock); } WMA_LOGD("Call txrx detach with callback for vdev %d", vdev_id); @@ -811,7 +811,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, goto send_fail_resp; } bcn->seq_no = MIN_SW_SEQ; - cdf_spinlock_init(&bcn->lock); + qdf_spinlock_create(&bcn->lock); qdf_atomic_set(&wma->interfaces[resp_event->vdev_id].bss_status, WMA_BSS_STATUS_STARTED); WMA_LOGD("%s: AP mode (type %d subtype %d) BSS is started", @@ -927,9 +927,9 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, } if (wma_is_vdev_in_ap_mode(wma, resp_event->vdev_id)) { - cdf_spin_lock_bh(&wma->dfs_ic->chan_lock); + qdf_spin_lock_bh(&wma->dfs_ic->chan_lock); wma->dfs_ic->disable_phy_err_processing = false; - cdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); + qdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); } if (resp_event->status == QDF_STATUS_SUCCESS) { @@ -1403,17 +1403,17 @@ static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) return; /* remove all remote peers of IBSS */ - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); temp = NULL; TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, peer_list_elem) { if (temp) { - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); if (qdf_atomic_read(&temp->delete_in_progress) == 0) { wma_remove_peer(wma, temp->mac_addr.raw, vdev_id, temp, false); } - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); } /* self peer is deleted last */ if (peer == TAILQ_FIRST(&vdev->peer_list)) { @@ -1422,7 +1422,7 @@ static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) } else temp = peer; } - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); /* remove IBSS bss peer last */ peer = TAILQ_FIRST(&vdev->peer_list); @@ -1473,18 +1473,18 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) WMA_LOGE("%s: vdev_id - %d", __func__, vdev_id); /* remove all remote peers of SAP */ - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); temp = NULL; TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, peer_list_elem) { if (temp) { - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); if (qdf_atomic_read(&temp->delete_in_progress) == 0) { wma_remove_peer(wma, temp->mac_addr.raw, vdev_id, temp, false); } - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); } /* self peer is deleted by caller */ if (peer == TAILQ_FIRST(&vdev->peer_list)) { @@ -1494,7 +1494,7 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) temp = peer; } - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); } #ifdef QCA_IBSS_SUPPORT @@ -2215,7 +2215,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - cdf_spin_lock_bh(&wma->dfs_ic->chan_lock); + qdf_spin_lock_bh(&wma->dfs_ic->chan_lock); if (isRestart) wma->dfs_ic->disable_phy_err_processing = true; @@ -2223,7 +2223,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, wma->dfs_ic->ic_curchan = wma_dfs_configure_channel(wma->dfs_ic, chan, chanmode, req); - cdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); + qdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); wma_unified_dfs_phyerr_filter_offload_enable(wma); dfs->disable_dfs_ch_switch = @@ -2460,9 +2460,9 @@ int wma_vdev_delete_handler(void *handle, uint8_t *cmd_param_info, event->vdev_id); return -EINVAL; } - cdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, + qdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); - cdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); + qdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); /* Send response to upper layers */ wma_vdev_detach_callback(req_msg->user_data); cdf_mc_timer_stop(&req_msg->event_timeout); @@ -2513,9 +2513,9 @@ int wma_peer_delete_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } - cdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, + qdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); - cdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); + qdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); /* Cleanup timeout handler */ cdf_mc_timer_stop(&req_msg->event_timeout); cdf_mc_timer_destroy(&req_msg->event_timeout); @@ -2633,15 +2633,15 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_hold_req_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); - cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_lock_bh(&wma->wma_hold_req_q_lock); status = qdf_list_insert_back(&wma->wma_hold_req_queue, &req->node); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("Failed add request in queue")); cdf_mem_free(req); return NULL; } - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); return req; } @@ -2815,9 +2815,9 @@ void wma_vdev_resp_timer(void *data) if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { - cdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, + qdf_wake_lock_release(&wma->wmi_cmd_rsp_wake_lock, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); - cdf_runtime_pm_allow_suspend( + qdf_runtime_pm_allow_suspend( wma->wmi_cmd_rsp_runtime_lock); } params->status = QDF_STATUS_E_TIMEOUT; @@ -2941,17 +2941,17 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_vdev_resp_timer, req); cdf_mc_timer_start(&req->event_timeout, timeout); - cdf_spin_lock_bh(&wma->vdev_respq_lock); + qdf_spin_lock_bh(&wma->vdev_respq_lock); status = qdf_list_insert_back(&wma->vdev_resp_queue, &req->node); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("Failed add request in queue for vdev_id %d type %d"), vdev_id, type); cdf_mem_free(req); return NULL; } - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); return req; } @@ -4385,10 +4385,10 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, * Acquire wake lock and bus lock till * firmware sends the response */ - cdf_wake_lock_timeout_acquire(&wma->wmi_cmd_rsp_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->wmi_cmd_rsp_wake_lock, WMA_FW_RSP_EVENT_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); - cdf_runtime_pm_prevent_suspend(wma->wmi_cmd_rsp_runtime_lock); + qdf_runtime_pm_prevent_suspend(wma->wmi_cmd_rsp_runtime_lock); return; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 0c032b2b442b..0902ba66d574 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2034,12 +2034,12 @@ static int wma_unified_dfs_radar_rx_event_handler(void *handle, radar_event = param_tlvs->fixed_param; - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); chan = ic->ic_curchan; if (ic->disable_phy_err_processing) { WMA_LOGD("%s: radar indication done,drop phyerror event", __func__); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return 0; } @@ -2047,11 +2047,11 @@ static int wma_unified_dfs_radar_rx_event_handler(void *handle, WMA_LOGE ("%s: Invalid DFS Phyerror event. Channel=%d is Non-DFS", __func__, chan->ic_ieee); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return 0; } - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); dfs->ath_dfs_stats.total_phy_errors++; if (dfs->dfs_caps.ath_chip_is_bb_tlv) { @@ -2890,7 +2890,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, if (node) { WMA_LOGD("NLO match happened"); node->nlo_match_evt_received = true; - cdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_PNO); } @@ -3065,7 +3065,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, } if (wake_lock_duration) { - cdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, wake_lock_duration, WIFI_POWER_EVENT_WAKELOCK_WOW); WMA_LOGA("Holding %d msec wake_lock", wake_lock_duration); @@ -6634,7 +6634,7 @@ void wma_target_suspend_acknowledge(void *context) wma->wow_nack = wow_nack; qdf_event_set(&wma->target_suspend); if (wow_nack) - cdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->wow_wake_lock, WMA_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_WOW); } @@ -7301,7 +7301,7 @@ struct ieee80211com *wma_dfs_attach(struct ieee80211com *dfs_ic) * and shared DFS code */ dfs_ic->ic_dfs_notify_radar = ieee80211_mark_dfs; - cdf_spinlock_init(&dfs_ic->chan_lock); + qdf_spinlock_create(&dfs_ic->chan_lock); /* Initializes DFS Data Structures and queues */ dfs_attach(dfs_ic); @@ -7318,7 +7318,7 @@ void wma_dfs_detach(struct ieee80211com *dfs_ic) { dfs_detach(dfs_ic); - cdf_spinlock_destroy(&dfs_ic->chan_lock); + qdf_spinlock_destroy(&dfs_ic->chan_lock); if (NULL != dfs_ic->ic_curchan) { OS_FREE(dfs_ic->ic_curchan); dfs_ic->ic_curchan = NULL; @@ -7636,7 +7636,7 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, * But, when DFS test mode is enabled, allow multiple dfs * radar events to be posted on the same channel. */ - cdf_spin_lock_bh(&ic->chan_lock); + qdf_spin_lock_bh(&ic->chan_lock); if (!pmac->sap.SapDfsInfo.disable_dfs_ch_switch) wma->dfs_ic->disable_phy_err_processing = true; @@ -7652,7 +7652,7 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, WMA_LOGE("%s:Application triggered channel switch in progress!.. drop radar event indiaction to SAP", __func__); cdf_mem_free(radar_event); - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return 0; } @@ -7670,7 +7670,7 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, wma_send_msg(wma, WMA_DFS_RADAR_IND, (void *)radar_event, 0); WMA_LOGE("%s:DFS- WMA_DFS_RADAR_IND Message Posted", __func__); } - cdf_spin_unlock_bh(&ic->chan_lock); + qdf_spin_unlock_bh(&ic->chan_lock); return 0; } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index a4de6d9d0bb5..f92d1129af78 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1624,13 +1624,13 @@ QDF_STATUS wma_open(void *cds_context, if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO - cdf_wake_lock_init(&wma_handle->pno_wake_lock, "wlan_pno_wl"); + qdf_wake_lock_create(&wma_handle->pno_wake_lock, "wlan_pno_wl"); #endif /* FEATURE_WLAN_SCAN_PNO */ #ifdef FEATURE_WLAN_EXTSCAN - cdf_wake_lock_init(&wma_handle->extscan_wake_lock, + qdf_wake_lock_create(&wma_handle->extscan_wake_lock, "wlan_extscan_wl"); #endif /* FEATURE_WLAN_EXTSCAN */ - cdf_wake_lock_init(&wma_handle->wow_wake_lock, "wlan_wow_wl"); + qdf_wake_lock_create(&wma_handle->wow_wake_lock, "wlan_wow_wl"); } /* attach the wmi */ @@ -1836,10 +1836,10 @@ QDF_STATUS wma_open(void *cds_context, qdf_list_create(&wma_handle->vdev_resp_queue, MAX_ENTRY_VDEV_RESP_QUEUE); - cdf_spinlock_init(&wma_handle->vdev_respq_lock); + qdf_spinlock_create(&wma_handle->vdev_respq_lock); qdf_list_create(&wma_handle->wma_hold_req_queue, MAX_ENTRY_HOLD_REQ_QUEUE); - cdf_spinlock_init(&wma_handle->wma_hold_req_q_lock); + qdf_spinlock_create(&wma_handle->wma_hold_req_q_lock); qdf_atomic_init(&wma_handle->is_wow_bus_suspended); qdf_atomic_init(&wma_handle->scan_id_counter); @@ -1992,10 +1992,10 @@ QDF_STATUS wma_open(void *cds_context, WMI_RSSI_BREACH_EVENTID, wma_rssi_breached_event_handler); - cdf_wake_lock_init(&wma_handle->wmi_cmd_rsp_wake_lock, + qdf_wake_lock_create(&wma_handle->wmi_cmd_rsp_wake_lock, "wlan_fw_rsp_wakelock"); wma_handle->wmi_cmd_rsp_runtime_lock = - cdf_runtime_lock_init("wlan_fw_rsp_runtime_lock"); + qdf_runtime_lock_init("wlan_fw_rsp_runtime_lock"); /* Register peer assoc conf event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, @@ -2010,10 +2010,10 @@ QDF_STATUS wma_open(void *cds_context, return QDF_STATUS_SUCCESS; err_dbglog_init: - cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); - cdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); - cdf_spinlock_destroy(&wma_handle->vdev_respq_lock); - cdf_spinlock_destroy(&wma_handle->wma_hold_req_q_lock); + qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); + qdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); + qdf_spinlock_destroy(&wma_handle->vdev_respq_lock); + qdf_spinlock_destroy(&wma_handle->wma_hold_req_q_lock); err_event_init: wmi_unified_unregister_event_handler(wma_handle->wmi_handle, WMI_DEBUG_PRINT_EVENTID); @@ -2031,12 +2031,12 @@ err_wma_handle: if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO - cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); + qdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ #ifdef FEATURE_WLAN_EXTSCAN - cdf_wake_lock_destroy(&wma_handle->extscan_wake_lock); + qdf_wake_lock_destroy(&wma_handle->extscan_wake_lock); #endif /* FEATURE_WLAN_EXTSCAN */ - cdf_wake_lock_destroy(&wma_handle->wow_wake_lock); + qdf_wake_lock_destroy(&wma_handle->wow_wake_lock); } cds_free_context(cds_context, QDF_MODULE_ID_WMA, wma_handle); @@ -2918,9 +2918,9 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) qdf_list_node_t *node1 = NULL; QDF_STATUS status; - cdf_spin_lock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_lock_bh(&wma->wma_hold_req_q_lock); if (!qdf_list_size(&wma->wma_hold_req_queue)) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGI(FL("request queue is empty")); return; } @@ -2930,7 +2930,7 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) req_msg = cdf_container_of(node1, struct wma_target_req, node); status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("Failed to remove request for vdev_id %d type %d"), req_msg->vdev_id, req_msg->type); return; @@ -2938,7 +2938,7 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) cdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } - cdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); + qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); } /** @@ -2953,9 +2953,9 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) qdf_list_node_t *node1 = NULL; QDF_STATUS status; - cdf_spin_lock_bh(&wma->vdev_respq_lock); + qdf_spin_lock_bh(&wma->vdev_respq_lock); if (!qdf_list_size(&wma->vdev_resp_queue)) { - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGI(FL("request queue maybe empty")); return; } @@ -2965,7 +2965,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) req_msg = cdf_container_of(node1, struct wma_target_req, node); status = qdf_list_remove_node(&wma->vdev_resp_queue, node1); if (QDF_STATUS_SUCCESS != status) { - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("Failed to remove request for vdev_id %d type %d"), req_msg->vdev_id, req_msg->type); return; @@ -2973,7 +2973,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) cdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } - cdf_spin_unlock_bh(&wma->vdev_respq_lock); + qdf_spin_unlock_bh(&wma->vdev_respq_lock); } /** @@ -3135,12 +3135,12 @@ QDF_STATUS wma_close(void *cds_ctx) if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO - cdf_wake_lock_destroy(&wma_handle->pno_wake_lock); + qdf_wake_lock_destroy(&wma_handle->pno_wake_lock); #endif /* FEATURE_WLAN_SCAN_PNO */ #ifdef FEATURE_WLAN_EXTSCAN - cdf_wake_lock_destroy(&wma_handle->extscan_wake_lock); + qdf_wake_lock_destroy(&wma_handle->extscan_wake_lock); #endif /* FEATURE_WLAN_EXTSCAN */ - cdf_wake_lock_destroy(&wma_handle->wow_wake_lock); + qdf_wake_lock_destroy(&wma_handle->wow_wake_lock); } /* unregister Firmware debug log */ @@ -3161,8 +3161,8 @@ QDF_STATUS wma_close(void *cds_ctx) cdf_event_destroy(&wma_handle->recovery_event); wma_cleanup_vdev_resp(wma_handle); wma_cleanup_hold_req(wma_handle); - cdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); - cdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); + qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); + qdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { cdf_os_mem_free_consistent(wma_handle->qdf_dev, wma_handle->mem_chunks[idx].len, diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 9a2278374774..fdd319520433 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -109,7 +109,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, return; } - cdf_spin_lock_bh(&bcn->lock); + qdf_spin_lock_bh(&bcn->lock); bcn_payload = cdf_nbuf_data(bcn->buf); @@ -207,7 +207,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, if (ret != QDF_STATUS_SUCCESS) { cdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); - cdf_spin_unlock_bh(&bcn->lock); + qdf_spin_unlock_bh(&bcn->lock); return; } @@ -237,7 +237,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, WMA_LOGE("Failed to send WMI_PDEV_SEND_BCN_CMDID command"); wmi_buf_free(wmi_buf); } - cdf_spin_unlock_bh(&bcn->lock); + qdf_spin_unlock_bh(&bcn->lock); } /** @@ -2320,7 +2320,7 @@ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, } WMA_LOGD("%s: Storing received beacon template buf to local buffer", __func__); - cdf_spin_lock_bh(&bcn->lock); + qdf_spin_lock_bh(&bcn->lock); /* * Copy received beacon template content in local buffer. @@ -2358,7 +2358,7 @@ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, cdf_nbuf_put_tail(bcn->buf, len); bcn->len = len; - cdf_spin_unlock_bh(&bcn->lock); + qdf_spin_unlock_bh(&bcn->lock); return QDF_STATUS_SUCCESS; } @@ -2419,13 +2419,13 @@ int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, /* Save the adjusted TSF */ intf[if_id].tsfadjust = adjusted_tsf[if_id]; - cdf_spin_lock_bh(&bcn->lock); + qdf_spin_lock_bh(&bcn->lock); cdf_mem_zero(&bcn_info, sizeof(bcn_info)); bcn_info.beacon = cdf_nbuf_data(bcn->buf); bcn_info.p2pIeOffset = bcn->p2p_ie_offset; bcn_info.beaconLength = bcn->len; bcn_info.timIeOffset = bcn->tim_ie_offset; - cdf_spin_unlock_bh(&bcn->lock); + qdf_spin_unlock_bh(&bcn->lock); /* Update beacon template in firmware */ wmi_unified_bcn_tmpl_send(wma, if_id, &bcn_info, 0); diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index e4824c3bcd93..dc94eba0c8eb 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -4033,7 +4033,7 @@ int wma_nlo_match_evt_handler(void *handle, uint8_t *event, if (node) node->nlo_match_evt_received = true; - cdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, WMA_PNO_MATCH_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_PNO); @@ -4078,7 +4078,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, goto skip_pno_cmp_ind; } - cdf_wake_lock_release(&wma->pno_wake_lock, + qdf_wake_lock_release(&wma->pno_wake_lock, WIFI_POWER_EVENT_WAKELOCK_PNO); scan_event = (tSirScanOffloadEvent *) @@ -4087,7 +4087,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, /* Posting scan completion msg would take scan cache result * from LIM module and update in scan cache maintained in SME.*/ WMA_LOGE("Posting PNO Scan completion to umac"); - cdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_PNO); cdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); @@ -4313,14 +4313,14 @@ int wma_extscan_operations_event_handler(void *handle, case WMI_EXTSCAN_CYCLE_STARTED_EVENT: WMA_LOGD("%s: received WMI_EXTSCAN_CYCLE_STARTED_EVENT", __func__); - cdf_wake_lock_timeout_acquire(&wma->extscan_wake_lock, + qdf_wake_lock_timeout_acquire(&wma->extscan_wake_lock, WMA_EXTSCAN_CYCLE_WAKE_LOCK_DURATION, WIFI_POWER_EVENT_WAKELOCK_EXT_SCAN); goto exit_handler; case WMI_EXTSCAN_CYCLE_COMPLETED_EVENT: WMA_LOGD("%s: received WMI_EXTSCAN_CYCLE_COMPLETED_EVENT", __func__); - cdf_wake_lock_release(&wma->extscan_wake_lock, + qdf_wake_lock_release(&wma->extscan_wake_lock, WIFI_POWER_EVENT_WAKELOCK_EXT_SCAN); goto exit_handler; default: diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index cac3d6d5463b..eabec8b36e65 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -2170,20 +2170,20 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) return NULL; } - cdf_spin_lock_bh(&beacon->lock); + qdf_spin_lock_bh(&beacon->lock); buf_size = cdf_nbuf_len(beacon->buf); buf = cdf_mem_malloc(buf_size); if (!buf) { - cdf_spin_unlock_bh(&beacon->lock); + qdf_spin_unlock_bh(&beacon->lock); WMA_LOGE("%s: alloc failed for beacon buf", __func__); return NULL; } cdf_mem_copy(buf, cdf_nbuf_data(beacon->buf), buf_size); - cdf_spin_unlock_bh(&beacon->lock); + qdf_spin_unlock_bh(&beacon->lock); if (buffer_size) *buffer_size = buf_size; diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 5dd95378ae2f..59a1fb1180c7 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -863,7 +863,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, wma_log_cmd_id(cmd_id); #ifdef WMI_INTERFACE_EVENT_LOGGING - cdf_spin_lock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); /*Record 16 bytes of WMI cmd data - exclude TLV and WMI headers */ if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { WMI_MGMT_COMMAND_RECORD(cmd_id, @@ -873,7 +873,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, 2)); } - cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); #endif status = htc_send_pkt(wmi_handle->htc_handle, pkt); @@ -1027,13 +1027,13 @@ static void wmi_process_fw_event_worker_thread_ctx id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); data = cdf_nbuf_data(evt_buf); - cdf_spin_lock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); /* Exclude 4 bytes of TLV header */ WMI_RX_EVENT_RECORD(id, ((uint8_t *) data + 4)); - cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); - cdf_spin_lock_bh(&wmi_handle->eventq_lock); + qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_lock_bh(&wmi_handle->eventq_lock); cdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf); - cdf_spin_unlock_bh(&wmi_handle->eventq_lock); + qdf_spin_unlock_bh(&wmi_handle->eventq_lock); schedule_work(&wmi_handle->rx_event_work); return; } @@ -1127,14 +1127,14 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) goto end; } #ifdef WMI_INTERFACE_EVENT_LOGGING - cdf_spin_lock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); /* Exclude 4 bytes of TLV header */ if (id == WMI_MGMT_TX_COMPLETION_EVENTID) { WMI_MGMT_EVENT_RECORD(id, ((uint8_t *) data + 4)); } else { WMI_EVENT_RECORD(id, ((uint8_t *) data + 4)); } - cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); #endif /* Call the WMI registered event handler */ wmi_handle->event_handler[idx] (wmi_handle->scn_handle, @@ -1173,14 +1173,14 @@ void wmi_rx_event_work(struct work_struct *work) rx_event_work); wmi_buf_t buf; - cdf_spin_lock_bh(&wmi->eventq_lock); + qdf_spin_lock_bh(&wmi->eventq_lock); buf = cdf_nbuf_queue_remove(&wmi->event_queue); - cdf_spin_unlock_bh(&wmi->eventq_lock); + qdf_spin_unlock_bh(&wmi->eventq_lock); while (buf) { __wmi_control_rx(wmi, buf); - cdf_spin_lock_bh(&wmi->eventq_lock); + qdf_spin_lock_bh(&wmi->eventq_lock); buf = cdf_nbuf_queue_remove(&wmi->event_queue); - cdf_spin_unlock_bh(&wmi->eventq_lock); + qdf_spin_unlock_bh(&wmi->eventq_lock); } } @@ -1218,7 +1218,7 @@ void *wmi_unified_attach(ol_scn_t scn_handle, qdf_atomic_init(&wmi_handle->pending_cmds); qdf_atomic_init(&wmi_handle->is_target_suspended); wmi_runtime_pm_init(wmi_handle); - cdf_spinlock_init(&wmi_handle->eventq_lock); + qdf_spinlock_create(&wmi_handle->eventq_lock); cdf_nbuf_queue_init(&wmi_handle->event_queue); #ifdef CONFIG_CNSS cnss_init_work(&wmi_handle->rx_event_work, wmi_rx_event_work); @@ -1226,7 +1226,7 @@ void *wmi_unified_attach(ol_scn_t scn_handle, INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work); #endif #ifdef WMI_INTERFACE_EVENT_LOGGING - cdf_spinlock_init(&wmi_handle->wmi_record_lock); + qdf_spinlock_create(&wmi_handle->wmi_record_lock); #endif wmi_handle->wma_process_fw_event_handler_cbk = func; return wmi_handle; @@ -1237,13 +1237,13 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle) wmi_buf_t buf; cds_flush_work(&wmi_handle->rx_event_work); - cdf_spin_lock_bh(&wmi_handle->eventq_lock); + qdf_spin_lock_bh(&wmi_handle->eventq_lock); buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); while (buf) { cdf_nbuf_free(buf); buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); } - cdf_spin_unlock_bh(&wmi_handle->eventq_lock); + qdf_spin_unlock_bh(&wmi_handle->eventq_lock); if (wmi_handle != NULL) { OS_FREE(wmi_handle); wmi_handle = NULL; @@ -1269,13 +1269,13 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) CDF_TRACE(QDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cds_flush_work(&wmi_handle->rx_event_work); - cdf_spin_lock_bh(&wmi_handle->eventq_lock); + qdf_spin_lock_bh(&wmi_handle->eventq_lock); buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); while (buf) { cdf_nbuf_free(buf); buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); } - cdf_spin_unlock_bh(&wmi_handle->eventq_lock); + qdf_spin_unlock_bh(&wmi_handle->eventq_lock); CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, "Done: %s", __func__); } @@ -1298,7 +1298,7 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) get_wmi_cmd_string(cmd_id), cmd_id); #endif - cdf_spin_lock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); /* Record 16 bytes of WMI cmd tx complete data - exclude TLV and WMI headers */ if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { @@ -1309,7 +1309,7 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) ((uint32_t *) cdf_nbuf_data(wmi_cmd_buf) + 2)); } - cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); + qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); #endif cdf_nbuf_free(wmi_cmd_buf); cdf_mem_free(htc_pkt); diff --git a/core/wmi/wmi_unified_priv.h b/core/wmi/wmi_unified_priv.h index 3787a9441dec..9c46dce1437e 100644 --- a/core/wmi/wmi_unified_priv.h +++ b/core/wmi/wmi_unified_priv.h @@ -76,7 +76,7 @@ struct wmi_unified { wmi_unified_event_handler event_handler[WMI_UNIFIED_MAX_EVENT]; uint32_t max_event_idx; void *htc_handle; - cdf_spinlock_t eventq_lock; + qdf_spinlock_t eventq_lock; cdf_nbuf_queue_t event_queue; struct work_struct rx_event_work; #ifdef WLAN_OPEN_SOURCE @@ -85,7 +85,7 @@ struct wmi_unified { #endif /* WLAN_OPEN_SOURCE */ #ifdef WMI_INTERFACE_EVENT_LOGGING - cdf_spinlock_t wmi_record_lock; + qdf_spinlock_t wmi_record_lock; #endif /*WMI_INTERFACE_EVENT_LOGGING */ qdf_atomic_t is_target_suspended; -- cgit v1.2.3 From c73697b4daf62499eba01f4a4360def821b28b6b Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sun, 21 Feb 2016 15:05:43 +0530 Subject: qcacld-3.0: Add QDF net types Replace CDF net types with QDF net types API's. Change-Id: I0599a2f0cfe7c9a9b7fe589f7619f88fd5a72518 CRs-Fixed: 981188 --- core/cdf/inc/cdf_nbuf.h | 10 ++-- core/cdf/inc/cdf_net_types.h | 117 ----------------------------------------- core/cdf/src/cdf_nbuf.c | 20 +++---- core/cdf/src/i_cdf_nbuf.h | 4 +- core/dp/htt/htt_rx.c | 30 +++++------ core/dp/ol/inc/ol_htt_tx_api.h | 4 +- core/dp/txrx/ol_rx_fwd.c | 2 +- core/dp/txrx/ol_tx.c | 12 ++--- core/dp/txrx/ol_tx_desc.c | 8 +-- core/dp/txrx/ol_tx_send.c | 10 ++-- core/sap/dfs/inc/dfs.h | 2 +- 11 files changed, 51 insertions(+), 168 deletions(-) delete mode 100644 core/cdf/inc/cdf_net_types.h diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 4bfb678f2344..278502c43048 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -34,7 +34,7 @@ #define _CDF_NBUF_H #include #include -#include +#include #include #include #include @@ -827,15 +827,15 @@ cdf_nbuf_append_ext_list(cdf_nbuf_t head_buf, cdf_nbuf_t ext_list, * cdf_nbuf_get_tx_cksum() - gets the tx checksum offload demand * @buf: Network buffer * - * Return: cdf_nbuf_tx_cksum_t checksum offload demand for the frame + * Return: qdf_nbuf_tx_cksum_t checksum offload demand for the frame */ -static inline cdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) +static inline qdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) { return __cdf_nbuf_get_tx_cksum(buf); } /** - * cdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to + * qdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to * indicate checksum info to the stack. * @buf: Network buffer * @cksum: Checksum @@ -843,7 +843,7 @@ static inline cdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) * Return: none */ static inline void -cdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, cdf_nbuf_rx_cksum_t *cksum) +qdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, qdf_nbuf_rx_cksum_t *cksum) { __cdf_nbuf_set_rx_cksum(buf, cksum); } diff --git a/core/cdf/inc/cdf_net_types.h b/core/cdf/inc/cdf_net_types.h deleted file mode 100644 index 4a6cbfda4b9b..000000000000 --- a/core/cdf/inc/cdf_net_types.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_net_types - * This file defines types used in the networking stack abstraction. - */ - -#ifndef _CDF_NET_TYPES_H -#define _CDF_NET_TYPES_H - -#include /* uint8_t, etc. */ - -#define ADF_NET_MAC_ADDR_MAX_LEN 6 -#define ADF_NET_IF_NAME_SIZE 64 -#define ADF_NET_ETH_LEN ADF_NET_MAC_ADDR_MAX_LEN -#define ADF_NET_MAX_MCAST_ADDR 64 - -/* Extended Traffic ID passed to target if the TID is unknown */ -#define ADF_NBUF_TX_EXT_TID_INVALID 0x1f - -/** - * cdf_nbuf_exemption_type - CDF net buf exemption types for encryption - * @CDF_NBUF_EXEMPT_NO_EXEMPTION: No exemption - * @CDF_NBUF_EXEMPT_ALWAYS: Exempt always - * @CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: Exempt on key mapping - */ -enum cdf_nbuf_exemption_type { - CDF_NBUF_EXEMPT_NO_EXEMPTION = 0, - CDF_NBUF_EXEMPT_ALWAYS, - CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE -}; - -/** - * typedef cdf_nbuf_tx_cksum_t - transmit checksum offload types - * @CDF_NBUF_TX_CKSUM_NONE: No checksum offload - * @CDF_NBUF_TX_CKSUM_IP: IP header checksum offload - * @CDF_NBUF_TX_CKSUM_TCP_UDP: TCP/UDP checksum offload - * @CDF_NBUF_TX_CKSUM_TCP_UDP_IP: TCP/UDP and IP header checksum offload - */ - -typedef enum { - CDF_NBUF_TX_CKSUM_NONE, - CDF_NBUF_TX_CKSUM_IP, - CDF_NBUF_TX_CKSUM_TCP_UDP, - CDF_NBUF_TX_CKSUM_TCP_UDP_IP, - -} cdf_nbuf_tx_cksum_t; - -/** - * typedef cdf_nbuf_l4_rx_cksum_type_t - receive checksum API types - * @CDF_NBUF_RX_CKSUM_TCP: Rx checksum TCP - * @CDF_NBUF_RX_CKSUM_UDP: Rx checksum UDP - * @CDF_NBUF_RX_CKSUM_TCPIPV6: Rx checksum TCP IPV6 - * @CDF_NBUF_RX_CKSUM_UDPIPV6: Rx checksum UDP IPV6 - * @CDF_NBUF_RX_CKSUM_TCP_NOPSEUDOHEADER: Rx checksum TCP no pseudo header - * @CDF_NBUF_RX_CKSUM_UDP_NOPSEUDOHEADER: Rx checksum UDP no pseudo header - * @CDF_NBUF_RX_CKSUM_TCPSUM16: Rx checksum TCP SUM16 - */ -typedef enum { - CDF_NBUF_RX_CKSUM_TCP = 0x0001, - CDF_NBUF_RX_CKSUM_UDP = 0x0002, - CDF_NBUF_RX_CKSUM_TCPIPV6 = 0x0010, - CDF_NBUF_RX_CKSUM_UDPIPV6 = 0x0020, - CDF_NBUF_RX_CKSUM_TCP_NOPSEUDOHEADER = 0x0100, - CDF_NBUF_RX_CKSUM_UDP_NOPSEUDOHEADER = 0x0200, - CDF_NBUF_RX_CKSUM_TCPSUM16 = 0x1000, -} cdf_nbuf_l4_rx_cksum_type_t; - -/** - * typedef cdf_nbuf_l4_rx_cksum_result_t - receive checksum status types - * @CDF_NBUF_RX_CKSUM_NONE: Device failed to checksum - * @CDF_NBUF_RX_CKSUM_TCP_UDP_HW: TCP/UDP cksum successful and value returned - * @CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY: TCP/UDP cksum successful, no value - */ -typedef enum { - CDF_NBUF_RX_CKSUM_NONE = 0x0000, - CDF_NBUF_RX_CKSUM_TCP_UDP_HW = 0x0010, - CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY = 0x0020, -} cdf_nbuf_l4_rx_cksum_result_t; - -/** - * typedef cdf_nbuf_rx_cksum_t - receive checksum type - * @l4_type: L4 type - * @l4_result: L4 result - */ -typedef struct { - cdf_nbuf_l4_rx_cksum_type_t l4_type; - cdf_nbuf_l4_rx_cksum_result_t l4_result; - uint32_t val; -} cdf_nbuf_rx_cksum_t; - -#endif /*_CDF_NET_TYPES_H*/ diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 095a0c7b968a..6ce5cda8c5cb 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -331,16 +331,16 @@ __cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) * Return: QDF_STATUS */ QDF_STATUS -__cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) +__cdf_nbuf_set_rx_cksum(struct sk_buff *skb, qdf_nbuf_rx_cksum_t *cksum) { switch (cksum->l4_result) { - case CDF_NBUF_RX_CKSUM_NONE: + case QDF_NBUF_RX_CKSUM_NONE: skb->ip_summed = CHECKSUM_NONE; break; - case CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY: + case QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY: skb->ip_summed = CHECKSUM_UNNECESSARY; break; - case CDF_NBUF_RX_CKSUM_TCP_UDP_HW: + case QDF_NBUF_RX_CKSUM_TCP_UDP_HW: skb->ip_summed = CHECKSUM_PARTIAL; skb->csum = cksum->val; break; @@ -358,19 +358,19 @@ __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum) * * Return: TX checksum value */ -cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb) +qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb) { switch (skb->ip_summed) { case CHECKSUM_NONE: - return CDF_NBUF_TX_CKSUM_NONE; + return QDF_NBUF_TX_CKSUM_NONE; case CHECKSUM_PARTIAL: /* XXX ADF and Linux checksum don't map with 1-to-1. This is * not 100% correct */ - return CDF_NBUF_TX_CKSUM_TCP_UDP; + return QDF_NBUF_TX_CKSUM_TCP_UDP; case CHECKSUM_COMPLETE: - return CDF_NBUF_TX_CKSUM_TCP_UDP_IP; + return QDF_NBUF_TX_CKSUM_TCP_UDP_IP; default: - return CDF_NBUF_TX_CKSUM_NONE; + return QDF_NBUF_TX_CKSUM_NONE; } } @@ -404,7 +404,7 @@ void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid) */ uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb) { - return CDF_NBUF_EXEMPT_NO_EXEMPTION; + return QDF_NBUF_EXEMPT_NO_EXEMPTION; } /** diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index d4c9fa90a3e5..25d55d65258e 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -519,9 +519,9 @@ static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size) /* * prototypes. Implemented in cdf_nbuf.c */ -cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb); +qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb); QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, - cdf_nbuf_rx_cksum_t *cksum); + qdf_nbuf_rx_cksum_t *cksum); uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb); void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid); uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb); diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 3cf9b0abc365..ea2239672c39 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -668,43 +668,43 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu, /* * HW supports TCP & UDP checksum offload for ipv4 and ipv6 */ - static const cdf_nbuf_l4_rx_cksum_type_t + static const qdf_nbuf_l4_rx_cksum_type_t cksum_table[][MAX_PROTO_VAL][MAX_IP_VER] = { { /* non-fragmented IP packet */ /* non TCP/UDP packet */ - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, /* TCP packet */ - {CDF_NBUF_RX_CKSUM_TCP, CDF_NBUF_RX_CKSUM_TCPIPV6}, + {QDF_NBUF_RX_CKSUM_TCP, QDF_NBUF_RX_CKSUM_TCPIPV6}, /* UDP packet */ - {CDF_NBUF_RX_CKSUM_UDP, CDF_NBUF_RX_CKSUM_UDPIPV6}, + {QDF_NBUF_RX_CKSUM_UDP, QDF_NBUF_RX_CKSUM_UDPIPV6}, /* invalid packet type */ - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, }, { /* fragmented IP packet */ - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, - {CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, + {QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE}, } }; - cdf_nbuf_rx_cksum_t cksum = { + qdf_nbuf_rx_cksum_t cksum = { cksum_table[rx_msdu->ip_frag][proto][rx_msdu->ipv6_proto], - CDF_NBUF_RX_CKSUM_NONE, + QDF_NBUF_RX_CKSUM_NONE, 0 }; if (cksum.l4_type != - (cdf_nbuf_l4_rx_cksum_type_t) CDF_NBUF_RX_CKSUM_NONE) { + (qdf_nbuf_l4_rx_cksum_type_t) QDF_NBUF_RX_CKSUM_NONE) { cksum.l4_result = ((*(uint32_t *) &rx_desc->attention) & RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK) ? - CDF_NBUF_RX_CKSUM_NONE : - CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY; + QDF_NBUF_RX_CKSUM_NONE : + QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY; } - cdf_nbuf_set_rx_cksum(msdu, &cksum); + qdf_nbuf_set_rx_cksum(msdu, &cksum); #undef MAX_IP_VER #undef MAX_PROTO_VAL } diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index 909267046d25..8b3b07409cc9 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -43,7 +43,7 @@ #include /* wlan_frm_fmt */ #include /* needed by inline functions */ -#include +#include #include /* htt_pdev_handle */ #include #include @@ -281,7 +281,7 @@ struct htt_msdu_info_t { * 0x2 - L4 checksum only * 0x3 - L3 header checksum + L4 checksum */ - cdf_nbuf_tx_cksum_t cksum_offload; + qdf_nbuf_tx_cksum_t cksum_offload; } action; }; diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index 64c700b3ed45..9e52c074ec4c 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/core/dp/txrx/ol_rx_fwd.c @@ -185,7 +185,7 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_set_tid(msdu, tid); } else { cdf_nbuf_set_tid(msdu, - ADF_NBUF_TX_EXT_TID_INVALID); + QDF_NBUF_TX_EXT_TID_INVALID); } /* * This MSDU needs to be forwarded to the tx path. diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index fde5aa45b0c5..14b5c9455c78 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -577,12 +577,12 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.action.cksum_offload = cdf_nbuf_get_tx_cksum(msdu); switch (cdf_nbuf_get_exemption_type(msdu)) { - case CDF_NBUF_EXEMPT_NO_EXEMPTION: - case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: + case QDF_NBUF_EXEMPT_NO_EXEMPTION: + case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ msdu_info.htt.action.do_encrypt = 1; break; - case CDF_NBUF_EXEMPT_ALWAYS: + case QDF_NBUF_EXEMPT_ALWAYS: /* We don't want to encrypt this frame */ msdu_info.htt.action.do_encrypt = 0; break; @@ -671,12 +671,12 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.action.cksum_offload = cdf_nbuf_get_tx_cksum(msdu); switch (cdf_nbuf_get_exemption_type(msdu)) { - case CDF_NBUF_EXEMPT_NO_EXEMPTION: - case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: + case QDF_NBUF_EXEMPT_NO_EXEMPTION: + case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ msdu_info.htt.action.do_encrypt = 1; break; - case CDF_NBUF_EXEMPT_ALWAYS: + case QDF_NBUF_EXEMPT_ALWAYS: /* We don't want to encrypt this frame */ msdu_info.htt.action.do_encrypt = 0; break; diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index efd2a8234fab..b4c04e65d1fd 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#include /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ +#include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ #include /* cdf_assert */ #include /* cdf_spinlock */ @@ -336,12 +336,12 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, msdu_info->htt.info.vdev_id = vdev->vdev_id; msdu_info->htt.action.cksum_offload = cdf_nbuf_get_tx_cksum(netbuf); switch (cdf_nbuf_get_exemption_type(netbuf)) { - case CDF_NBUF_EXEMPT_NO_EXEMPTION: - case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: + case QDF_NBUF_EXEMPT_NO_EXEMPTION: + case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ msdu_info->htt.action.do_encrypt = 1; break; - case CDF_NBUF_EXEMPT_ALWAYS: + case QDF_NBUF_EXEMPT_ALWAYS: /* We don't want to encrypt this frame */ msdu_info->htt.action.do_encrypt = 0; break; diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 1c085016a905..9df4e8c6418c 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -29,7 +29,7 @@ #include /* cdf_os_spinlock */ #include /* qdf_system_ticks, etc. */ #include /* cdf_nbuf_t */ -#include /* ADF_NBUF_TX_EXT_TID_INVALID */ +#include /* QDF_NBUF_TX_EXT_TID_INVALID */ #include /* TAILQ */ #ifdef QCA_COMPUTE_TX_DELAY @@ -796,7 +796,7 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev, dest_addr = ol_tx_dest_addr_find(pdev, msdu); if (NULL == dest_addr) - return ADF_NBUF_TX_EXT_TID_INVALID; + return QDF_NBUF_TX_EXT_TID_INVALID; is_mcast = IEEE80211_IS_MULTICAST(dest_addr); is_mgmt = tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE; @@ -839,7 +839,7 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev, return (ipv6_traffic_class((struct ipv6_hdr_t *)l3_hdr) >> 5) & 0x7; } else { - return ADF_NBUF_TX_EXT_TID_INVALID; + return QDF_NBUF_TX_EXT_TID_INVALID; } } #endif @@ -852,9 +852,9 @@ static int ol_tx_delay_category(struct ol_txrx_pdev_t *pdev, uint16_t msdu_id) cdf_nbuf_t msdu = tx_desc->netbuf; tid = cdf_nbuf_get_tid(msdu); - if (tid == ADF_NBUF_TX_EXT_TID_INVALID) { + if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc); - if (tid == ADF_NBUF_TX_EXT_TID_INVALID) { + if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { /* TID could not be determined (this is not an IP frame?) */ return -EINVAL; diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index eea5579b49ce..34066be04e44 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -48,7 +48,7 @@ */ /*DFS New Include Start*/ -#include /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ +#include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ #include /* cdf_assert */ #include /* cdf_spinlock */ -- cgit v1.2.3 From c5548423273c42c530886a94e007e8c1c8753487 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Wed, 24 Feb 2016 18:33:27 +0530 Subject: qcacld-3.0: Add QDF utils Replace CDF utils with QDF utils. Change-Id: Ib6b3ad56b3268b1be438f3204f91d995f8bb3900 CRs-Fixed: 981188 --- core/bmi/src/ol_fw.c | 2 +- core/cdf/inc/cdf_nbuf.h | 6 +- core/cdf/inc/cdf_util.h | 355 --------------------- core/cdf/inc/osdep.h | 2 +- core/cdf/src/cdf_nbuf.c | 14 +- core/cdf/src/i_cdf_nbuf.h | 4 +- core/cdf/src/i_cdf_util.h | 110 ------- core/cds/src/cds_concurrency.c | 8 +- core/dp/htt/htt_internal.h | 12 +- core/dp/htt/htt_rx.c | 28 +- core/dp/htt/htt_t2h.c | 12 +- core/dp/htt/htt_tx.c | 6 +- core/dp/ol/inc/ol_htt_tx_api.h | 8 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 2 +- core/dp/ol/inc/ol_txrx_htt_api.h | 2 +- core/dp/txrx/ol_rx.c | 10 +- core/dp/txrx/ol_rx_defrag.c | 24 +- core/dp/txrx/ol_rx_defrag.h | 2 +- core/dp/txrx/ol_rx_pn.c | 2 +- core/dp/txrx/ol_rx_reorder.c | 6 +- core/dp/txrx/ol_tx.c | 32 +- core/dp/txrx/ol_tx_desc.c | 20 +- core/dp/txrx/ol_tx_queue.c | 4 +- core/dp/txrx/ol_tx_send.c | 24 +- core/dp/txrx/ol_txrx.c | 30 +- core/dp/txrx/ol_txrx.h | 2 +- core/dp/txrx/ol_txrx_flow_control.c | 6 +- core/dp/txrx/ol_txrx_internal.h | 10 +- core/dp/txrx/ol_txrx_peer_find.c | 2 +- core/hdd/src/wlan_hdd_assoc.c | 22 +- core/hdd/src/wlan_hdd_cfg.c | 2 +- core/hdd/src/wlan_hdd_cfg80211.c | 20 +- core/hdd/src/wlan_hdd_debugfs.c | 4 +- core/hdd/src/wlan_hdd_driver_ops.c | 4 +- core/hdd/src/wlan_hdd_ftm.c | 2 +- core/hdd/src/wlan_hdd_hostapd.c | 22 +- core/hdd/src/wlan_hdd_ioctl.c | 8 +- core/hdd/src/wlan_hdd_main.c | 8 +- core/hdd/src/wlan_hdd_ocb.c | 8 +- core/hdd/src/wlan_hdd_oemdata.c | 2 +- core/hdd/src/wlan_hdd_power.c | 4 +- core/hdd/src/wlan_hdd_scan.c | 2 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 8 +- core/hdd/src/wlan_hdd_stats.c | 4 +- core/hdd/src/wlan_hdd_tx_rx.c | 6 +- core/hdd/src/wlan_hdd_wext.c | 14 +- core/hdd/src/wlan_hdd_wmm.c | 2 +- core/hdd/src/wlan_hdd_wowl.c | 2 +- core/mac/src/pe/lim/lim_assoc_utils.c | 2 +- core/mac/src/pe/lim/lim_ft.c | 4 +- core/mac/src/pe/lim/lim_p2p.c | 4 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 16 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 4 +- core/mac/src/pe/lim/lim_process_probe_req_frame.c | 6 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 16 +- core/mac/src/pe/lim/lim_process_tdls.c | 4 +- core/mac/src/pe/lim/lim_security_utils.c | 17 +- core/mac/src/pe/lim/lim_send_management_frames.c | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 4 +- core/mac/src/pe/lim/lim_sme_req_utils.c | 16 +- core/mac/src/pe/rrm/rrm_api.c | 2 +- core/sap/dfs/inc/dfs.h | 2 +- core/sap/src/sap_fsm.c | 12 +- core/sap/src/sap_module.c | 4 +- core/sme/src/common/sme_api.c | 30 +- core/sme/src/common/sme_ft_api.c | 2 +- core/sme/src/common/sme_power_save.c | 6 +- core/sme/src/csr/csr_api_roam.c | 106 +++--- core/sme/src/csr/csr_api_scan.c | 28 +- core/sme/src/csr/csr_neighbor_roam.c | 14 +- core/sme/src/csr/csr_tdls_process.c | 18 +- core/sme/src/csr/csr_util.c | 16 +- core/sme/src/oem_data/oem_data_api.c | 4 +- core/sme/src/p2p/p2p_api.c | 2 +- core/utils/pktlog/pktlog_internal.c | 18 +- core/wma/src/wma_data.c | 6 +- core/wma/src/wma_dev_if.c | 16 +- core/wma/src/wma_main.c | 4 +- target/inc/htt_isoc.h | 48 +-- 79 files changed, 429 insertions(+), 893 deletions(-) delete mode 100644 core/cdf/inc/cdf_util.h delete mode 100644 core/cdf/src/i_cdf_util.h diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index c4baf314546b..af516956201b 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -1428,7 +1428,7 @@ static int ol_ath_get_reg_table(uint32_t target_version, int section_len = 0; if (!reg_table) { - cdf_assert(0); + qdf_assert(0); return section_len; } diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 278502c43048..bd92c7728164 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -32,7 +32,7 @@ #ifndef _CDF_NBUF_H #define _CDF_NBUF_H -#include +#include #include #include #include @@ -347,7 +347,7 @@ cdf_nbuf_alloc_debug(qdf_device_t osdev, qdf_size_t size, int reserve, net_buf = __cdf_nbuf_alloc(osdev, size, reserve, align, prio); /* Store SKB in internal CDF tracking table */ - if (cdf_likely(net_buf)) + if (qdf_likely(net_buf)) cdf_net_buf_debug_add_node(net_buf, size, file_name, line_num); return net_buf; @@ -362,7 +362,7 @@ cdf_nbuf_alloc_debug(qdf_device_t osdev, qdf_size_t size, int reserve, static inline void cdf_nbuf_free(cdf_nbuf_t net_buf) { /* Remove SKB from internal CDF tracking table */ - if (cdf_likely(net_buf)) + if (qdf_likely(net_buf)) cdf_net_buf_debug_delete_node(net_buf); __cdf_nbuf_free(net_buf); diff --git a/core/cdf/inc/cdf_util.h b/core/cdf/inc/cdf_util.h deleted file mode 100644 index c1bffd7a79d3..000000000000 --- a/core/cdf/inc/cdf_util.h +++ /dev/null @@ -1,355 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_util.h - * - * This file defines utility functions. - */ - -#ifndef _CDF_UTIL_H -#define _CDF_UTIL_H - -#include - -/** - * cdf_unlikely - Compiler-dependent macro denoting code likely to execute - * @_expr: expression to be checked - */ -#define cdf_unlikely(_expr) __cdf_unlikely(_expr) - -/** - * cdf_likely - Compiler-dependent macro denoting code unlikely to execute - * @_expr: expression to be checked - */ -#define cdf_likely(_expr) __cdf_likely(_expr) - -static inline int cdf_status_to_os_return(QDF_STATUS status) -{ - return __cdf_status_to_os_return(status); -} - -/** - * cdf_assert - assert "expr" evaluates to false - * @expr: assert expression - */ -#ifdef CDF_OS_DEBUG -#define cdf_assert(expr) __cdf_assert(expr) -#else -#define cdf_assert(expr) -#endif /* CDF_OS_DEBUG */ - -/** - * @cdf_assert_always- alway assert "expr" evaluates to false - * @expr: assert expression - */ -#define cdf_assert_always(expr) __cdf_assert(expr) - -/** - * cdf_os_cpu_to_le64 - Convert a 64-bit value from CPU byte order to - * little-endian byte order - * @x: value to be converted - */ -#define cdf_os_cpu_to_le64(x) __cdf_os_cpu_to_le64(x) - -/** - * cdf_le16_to_cpu - Convert a 16-bit value from little-endian byte order - * to CPU byte order - * @x: value to be converted - */ -#define cdf_le16_to_cpu(x) __cdf_le16_to_cpu(x) - -/** - * cdf_le32_to_cpu - Convert a 32-bit value from little-endian byte order to - * CPU byte order - * @x: value to be converted - */ -#define cdf_le32_to_cpu(x) __cdf_le32_to_cpu(x) - -/** - * cdf_in_interrupt - returns true if in interrupt context - */ -#define cdf_in_interrupt in_interrupt - -/** - * cdf_container_of - cast a member of a structure out to the containing - * structure - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. - * - */ -#define cdf_container_of(ptr, type, member) \ - __cdf_container_of(ptr, type, member) - -/** - * cdf_is_pwr2 - test input value is power of 2 integer - * - * @value: input integer - * - */ -#define CDF_IS_PWR2(value) (((value) ^ ((value)-1)) == ((value) << 1) - 1) - -/** - * cdf_is_macaddr_equal() - compare two CDF MacAddress - * @pMacAddr1: Pointer to one cdf MacAddress to compare - * @pMacAddr2: Pointer to the other cdf MacAddress to compare - * - * This function returns a bool that tells if a two CDF MacAddress' - * are equivalent. - * - * Return: true if the MacAddress's are equal - * not true if the MacAddress's are not equal - */ -static inline bool cdf_is_macaddr_equal(struct qdf_mac_addr *pMacAddr1, - struct qdf_mac_addr *pMacAddr2) -{ - return 0 == memcmp(pMacAddr1, pMacAddr2, QDF_MAC_ADDR_SIZE); -} - -/** - * cdf_is_macaddr_zero() - check for a MacAddress of all zeros. - * @pMacAddr - pointer to the struct qdf_mac_addr to check. - * - * This function returns a bool that tells if a MacAddress is made up of - * all zeros. - * - * - * Return: true if the MacAddress is all Zeros - * false if the MacAddress is not all Zeros. - * - */ -static inline bool cdf_is_macaddr_zero(struct qdf_mac_addr *pMacAddr) -{ - struct qdf_mac_addr zeroMacAddr = QDF_MAC_ADDR_ZERO_INITIALIZER; - - return cdf_is_macaddr_equal(pMacAddr, &zeroMacAddr); -} - -/** - * cdf_zero_macaddr() - zero out a MacAddress - * @pMacAddr: pointer to the struct qdf_mac_addr to zero. - * - * This function zeros out a CDF MacAddress type. - * - * Return: nothing - */ -static inline void cdf_zero_macaddr(struct qdf_mac_addr *pMacAddr) -{ - memset(pMacAddr, 0, QDF_MAC_ADDR_SIZE); -} - -/** - * cdf_is_macaddr_group() - check for a MacAddress is a 'group' address - * @pMacAddr1: pointer to the cdf MacAddress to check - * - * This function returns a bool that tells if a the input CDF MacAddress - * is a "group" address. Group addresses have the 'group address bit' turned - * on in the MacAddress. Group addresses are made up of Broadcast and - * Multicast addresses. - * - * Return: true if the input MacAddress is a Group address - * false if the input MacAddress is not a Group address - */ -static inline bool cdf_is_macaddr_group(struct qdf_mac_addr *pMacAddr) -{ - return pMacAddr->bytes[0] & 0x01; -} - -/** - * cdf_is_macaddr_broadcast() - check for a MacAddress is a broadcast address - * - * This function returns a bool that tells if a the input CDF MacAddress - * is a "broadcast" address. - * - * @pMacAddr: Pointer to the cdf MacAddress to check - * - * Return: true if the input MacAddress is a broadcast address - * false if the input MacAddress is not a broadcast address - */ -static inline bool cdf_is_macaddr_broadcast(struct qdf_mac_addr *pMacAddr) -{ - struct qdf_mac_addr broadcastMacAddr = - QDF_MAC_ADDR_BROADCAST_INITIALIZER; - - return cdf_is_macaddr_equal(pMacAddr, &broadcastMacAddr); -} - -/** - * cdf_copy_macaddr() - copy a CDF MacAddress - * @pDst - pointer to the cdf MacAddress to copy TO (the destination) - * @pSrc - pointer to the cdf MacAddress to copy FROM (the source) - * - * This function copies a CDF MacAddress into another CDF MacAddress. - * - * - * Return: nothing - */ -static inline void cdf_copy_macaddr(struct qdf_mac_addr *pDst, - struct qdf_mac_addr *pSrc) -{ - *pDst = *pSrc; -} - -/** - * cdf_set_macaddr_broadcast() - set a CDF MacAddress to the 'broadcast' - * @pMacAddr: pointer to the cdf MacAddress to set to broadcast - * - * This function sets a CDF MacAddress to the 'broadcast' MacAddress. Broadcast - * MacAddress contains all 0xFF bytes. - * - * Return: nothing - */ -static inline void cdf_set_macaddr_broadcast(struct qdf_mac_addr *pMacAddr) -{ - memset(pMacAddr, 0xff, QDF_MAC_ADDR_SIZE); -} - -#if defined(ANI_LITTLE_BYTE_ENDIAN) - -/** - * i_cdf_htonl() - convert from host byte order to network byte order - * @ul: input to be converted - * - * Return: converted network byte order - */ -static inline unsigned long i_cdf_htonl(unsigned long ul) -{ - return ((ul & 0x000000ff) << 24) | - ((ul & 0x0000ff00) << 8) | - ((ul & 0x00ff0000) >> 8) | ((ul & 0xff000000) >> 24); -} - -/** - * i_cdf_ntohl() - convert network byte order to host byte order - * @ul: input to be converted - * - * Return: converted host byte order - */ -static inline unsigned long i_cdf_ntohl(unsigned long ul) -{ - return i_cdf_htonl(ul); -} - -#endif - -/** - * cdf_set_u16() - Assign 16-bit unsigned value to a byte array base on CPU's - * endianness. - * @ptr: Starting address of a byte array - * @value: The value to assign to the byte array - * - * Caller must validate the byte array has enough space to hold the vlaue - * - * Return: The address to the byte after the assignment. This may or may not - * be valid. Caller to verify. - */ -static inline uint8_t *cdf_set_u16(uint8_t *ptr, uint16_t value) -{ -#if defined(ANI_BIG_BYTE_ENDIAN) - *(ptr) = (uint8_t) (value >> 8); - *(ptr + 1) = (uint8_t) (value); -#else - *(ptr + 1) = (uint8_t) (value >> 8); - *(ptr) = (uint8_t) (value); -#endif - - return ptr + 2; -} - -/** - * cdf_get_u16() - Retrieve a 16-bit unsigned value from a byte array base on - * CPU's endianness. - * @ptr: Starting address of a byte array - * @pValue: Pointer to a caller allocated buffer for 16 bit value. Value is to - * assign to this location. - * - * Caller must validate the byte array has enough space to hold the vlaue - * - * Return: The address to the byte after the assignment. This may or may not - * be valid. Caller to verify. - */ -static inline uint8_t *cdf_get_u16(uint8_t *ptr, uint16_t *pValue) -{ -#if defined(ANI_BIG_BYTE_ENDIAN) - *pValue = (((uint16_t) (*ptr << 8)) | ((uint16_t) (*(ptr + 1)))); -#else - *pValue = (((uint16_t) (*(ptr + 1) << 8)) | ((uint16_t) (*ptr))); -#endif - - return ptr + 2; -} - -/** - * cdf_get_u32() - retrieve a 32-bit unsigned value from a byte array base on - * CPU's endianness. - * @ptr: Starting address of a byte array - * @pValue: Pointer to a caller allocated buffer for 32 bit value. Value is to - * assign to this location. - * - * Caller must validate the byte array has enough space to hold the vlaue - * - * Return: The address to the byte after the assignment. This may or may not - * be valid. Caller to verify. - */ -static inline uint8_t *cdf_get_u32(uint8_t *ptr, uint32_t *pValue) -{ -#if defined(ANI_BIG_BYTE_ENDIAN) - *pValue = ((uint32_t) (*(ptr) << 24) | - (uint32_t) (*(ptr + 1) << 16) | - (uint32_t) (*(ptr + 2) << 8) | (uint32_t) (*(ptr + 3))); -#else - *pValue = ((uint32_t) (*(ptr + 3) << 24) | - (uint32_t) (*(ptr + 2) << 16) | - (uint32_t) (*(ptr + 1) << 8) | (uint32_t) (*(ptr))); -#endif - return ptr + 4; -} - -/** - * cdf_get_pwr2() - get next power of 2 integer from input value - * @value: input value to find next power of 2 integer - * - * Get next power of 2 integer from input value - * - * Return: Power of 2 integer - */ -static inline int cdf_get_pwr2(int value) -{ - int log2; - if (CDF_IS_PWR2(value)) - return value; - - log2 = 0; - while (value) { - value >>= 1; - log2++; - } - return 1 << log2; -} - -#endif /*_CDF_UTIL_H*/ diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h index 2760566efcc8..466db4d1d561 100644 --- a/core/cdf/inc/osdep.h +++ b/core/cdf/inc/osdep.h @@ -77,7 +77,7 @@ typedef struct hal_bus_context { #if ATH_DEBUG #ifndef ASSERT -#define ASSERT(expr) cdf_assert(expr) +#define ASSERT(expr) qdf_assert(expr) #endif #else #define ASSERT(expr) diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 6ce5cda8c5cb..7ecaafa3d90f 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -238,7 +238,7 @@ __cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) #ifdef CDF_OS_DEBUG struct skb_shared_info *sh = skb_shinfo(skb); #endif - cdf_assert((dir == QDF_DMA_TO_DEVICE) + qdf_assert((dir == QDF_DMA_TO_DEVICE) || (dir == QDF_DMA_FROM_DEVICE)); /* @@ -248,7 +248,7 @@ __cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) * (including the bus address for each fragment) and a pointer * to the underlying sk_buff. */ - cdf_assert(sh->nr_frags == 0); + qdf_assert(sh->nr_frags == 0); return __cdf_nbuf_map_single(osdev, skb, dir); @@ -266,10 +266,10 @@ __cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) void __cdf_nbuf_unmap(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) { - cdf_assert((dir == QDF_DMA_TO_DEVICE) + qdf_assert((dir == QDF_DMA_TO_DEVICE) || (dir == QDF_DMA_FROM_DEVICE)); - cdf_assert(((dir == QDF_DMA_TO_DEVICE) + qdf_assert(((dir == QDF_DMA_TO_DEVICE) || (dir == QDF_DMA_FROM_DEVICE))); /* * Assume there's a single fragment. @@ -346,7 +346,7 @@ __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, qdf_nbuf_rx_cksum_t *cksum) break; default: pr_err("ADF_NET:Unknown checksum type\n"); - cdf_assert(0); + qdf_assert(0); return QDF_STATUS_E_NOSUPPORT; } return QDF_STATUS_SUCCESS; @@ -770,7 +770,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, tso_info->ip_id = ntohs(ipv4_hdr->id); tso_info->ipv4_csum_en = 1; tso_info->tcp_ipv4_csum_en = 1; - if (cdf_unlikely(ipv4_hdr->protocol != IPPROTO_TCP)) { + if (qdf_unlikely(ipv4_hdr->protocol != IPPROTO_TCP)) { qdf_print("TSO IPV4 proto 0x%x not TCP\n", ipv4_hdr->protocol); return 1; @@ -847,7 +847,7 @@ uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, memset(&tso_cmn_info, 0x0, sizeof(tso_cmn_info)); - if (cdf_unlikely(__cdf_nbuf_get_tso_cmn_seg_info(skb, &tso_cmn_info))) { + if (qdf_unlikely(__cdf_nbuf_get_tso_cmn_seg_info(skb, &tso_cmn_info))) { qdf_print("TSO: error getting common segment info\n"); return 0; } diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index 25d55d65258e..69453d334058 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -405,7 +405,7 @@ __cdf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src) { QDF_STATUS error = 0; - cdf_assert(dst && src); + qdf_assert(dst && src); /* * Since pskb_expand_head unconditionally reallocates the skb->head @@ -799,7 +799,7 @@ static inline void __cdf_nbuf_set_pktlen(struct sk_buff *skb, uint32_t len) len - skb->len - skb_tailroom(skb), GFP_ATOMIC))) { dev_kfree_skb_any(skb); - cdf_assert(0); + qdf_assert(0); } } skb_put(skb, (len - skb->len)); diff --git a/core/cdf/src/i_cdf_util.h b/core/cdf/src/i_cdf_util.h deleted file mode 100644 index 5c3bdc77cfe7..000000000000 --- a/core/cdf/src/i_cdf_util.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _I_CDF_UTIL_H -#define _I_CDF_UTIL_H - -#include -#include -#include -#include - -#include - -#include -#include -#include -/* - * Generic compiler-dependent macros if defined by the OS - */ - -#define __cdf_unlikely(_expr) unlikely(_expr) -#define __cdf_likely(_expr) likely(_expr) - -/** - * cdf_status_to_os_return(): translates qdf_status types to linux return types - * @status: status to translate - * - * Translates error types that linux may want to handle specially. - * - * return: 0 or the linux error code that most closely matches the QDF_STATUS. - * defaults to -1 (EPERM) - */ -static inline int __cdf_status_to_os_return(QDF_STATUS status) -{ - switch (status) { - case QDF_STATUS_SUCCESS: - return 0; - case QDF_STATUS_E_NULL_VALUE: - case QDF_STATUS_E_FAULT: - return -EFAULT; - case QDF_STATUS_E_TIMEOUT: - case QDF_STATUS_E_BUSY: - return -EBUSY; - case QDF_STATUS_NOT_INITIALIZED: - case QDF_STATUS_E_AGAIN: - return -EAGAIN; - case QDF_STATUS_E_NOSUPPORT: - return -ENOSYS; - case QDF_STATUS_E_ALREADY: - return -EALREADY; - case QDF_STATUS_E_NOMEM: - return -ENOMEM; - case QDF_STATUS_E_FAILURE: - case QDF_STATUS_E_INVAL: - return -EINVAL; - default: - return -EPERM; - } -} - - -/** - * @brief memory barriers. - */ - -#define __cdf_min(_a, _b) ((_a) < (_b) ? _a : _b) -#define __cdf_max(_a, _b) ((_a) > (_b) ? _a : _b) - -/** - * @brief Assert - */ -#define __cdf_assert(expr) do { \ - if (unlikely(!(expr))) { \ - pr_err("Assertion failed! %s:%s %s:%d\n", \ - # expr, __func__, __FILE__, __LINE__); \ - dump_stack(); \ - BUG_ON(1); \ - } \ -} while (0) - -#define __cdf_os_cpu_to_le64 cpu_to_le64 -#define __cdf_le16_to_cpu le16_to_cpu -#define __cdf_le32_to_cpu le32_to_cpu -#define __cdf_container_of(ptr, type, member) container_of(ptr, type, member) - -#endif /*_I_CDF_UTIL_H*/ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index e6d410dca757..f6ddb6310126 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3121,7 +3121,7 @@ void cds_dump_concurrency_info(void) pHddStaCtx->conn_info.connState) { staChannel = pHddStaCtx->conn_info.operationChannel; - cdf_copy_macaddr(&staBssid, + qdf_copy_macaddr(&staBssid, &pHddStaCtx->conn_info.bssId); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL targetChannel = staChannel; @@ -3134,7 +3134,7 @@ void cds_dump_concurrency_info(void) pHddStaCtx->conn_info.connState) { p2pChannel = pHddStaCtx->conn_info.operationChannel; - cdf_copy_macaddr(&p2pBssid, + qdf_copy_macaddr(&p2pBssid, &pHddStaCtx->conn_info.bssId); p2pMode = "CLI"; #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL @@ -3149,7 +3149,7 @@ void cds_dump_concurrency_info(void) && hostapd_state->qdf_status == QDF_STATUS_SUCCESS) { p2pChannel = hdd_ap_ctx->operatingChannel; - cdf_copy_macaddr(&p2pBssid, + qdf_copy_macaddr(&p2pBssid, &adapter->macAddressCurrent); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL targetChannel = p2pChannel; @@ -3164,7 +3164,7 @@ void cds_dump_concurrency_info(void) && hostapd_state->qdf_status == QDF_STATUS_SUCCESS) { apChannel = hdd_ap_ctx->operatingChannel; - cdf_copy_macaddr(&apBssid, + qdf_copy_macaddr(&apBssid, &adapter->macAddressCurrent); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL targetChannel = apChannel; diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index b9e9c6bf7327..4e3b91a6e4c6 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -30,7 +30,7 @@ #include /* A_STATUS */ #include /* cdf_nbuf_t */ -#include /* cdf_assert */ +#include /* qdf_assert */ #include /* HTC_PACKET */ #include @@ -286,23 +286,23 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) #define HTT_ASSERT_LEVEL 3 #endif -#define HTT_ASSERT_ALWAYS(condition) cdf_assert_always((condition)) +#define HTT_ASSERT_ALWAYS(condition) qdf_assert_always((condition)) -#define HTT_ASSERT0(condition) cdf_assert((condition)) +#define HTT_ASSERT0(condition) qdf_assert((condition)) #if HTT_ASSERT_LEVEL > 0 -#define HTT_ASSERT1(condition) cdf_assert((condition)) +#define HTT_ASSERT1(condition) qdf_assert((condition)) #else #define HTT_ASSERT1(condition) #endif #if HTT_ASSERT_LEVEL > 1 -#define HTT_ASSERT2(condition) cdf_assert((condition)) +#define HTT_ASSERT2(condition) qdf_assert((condition)) #else #define HTT_ASSERT2(condition) #endif #if HTT_ASSERT_LEVEL > 2 -#define HTT_ASSERT3(condition) cdf_assert((condition)) +#define HTT_ASSERT3(condition) qdf_assert((condition)) #else #define HTT_ASSERT3(condition) #endif diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index ea2239672c39..34c29a1b6cec 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -193,7 +193,7 @@ static int htt_rx_ring_size(struct htt_pdev_t *pdev) else if (size > HTT_RX_RING_SIZE_MAX) size = HTT_RX_RING_SIZE_MAX; - size = cdf_get_pwr2(size); + size = qdf_get_pwr2(size); return size; } @@ -290,7 +290,7 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) } paddr = cdf_nbuf_get_frag_paddr(rx_netbuf, 0); if (pdev->cfg.is_full_reorder_offload) { - if (cdf_unlikely + if (qdf_unlikely (htt_rx_hash_list_insert(pdev, paddr, rx_netbuf))) { qdf_print("%s: hash insert failed!\n", @@ -812,7 +812,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); - if (cdf_unlikely(HTT_T2H_MSG_TYPE_RX_FRAG_IND == msg_type)) { + if (qdf_unlikely(HTT_T2H_MSG_TYPE_RX_FRAG_IND == msg_type)) { num_msdu_bytes = HTT_RX_FRAG_IND_FW_RX_DESC_BYTES_GET( *(msg_word + HTT_RX_FRAG_IND_HDR_PREFIX_SIZE32)); } else { @@ -867,7 +867,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, */ #ifdef DEBUG_DMA_DONE - if (cdf_unlikely(!((*(uint32_t *) &rx_desc->attention) + if (qdf_unlikely(!((*(uint32_t *) &rx_desc->attention) & RX_ATTENTION_0_MSDU_DONE_MASK))) { int dbg_iter = MAX_DONE_BIT_CHECK_ITER; @@ -890,7 +890,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, dbg_iter--; } - if (cdf_unlikely(!((*(uint32_t *) &rx_desc->attention) + if (qdf_unlikely(!((*(uint32_t *) &rx_desc->attention) & RX_ATTENTION_0_MSDU_DONE_MASK))) { #ifdef HTT_RX_RESTORE @@ -929,7 +929,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, * upload.) */ if (pdev->rx_ind_msdu_byte_idx < num_msdu_bytes) { - if (cdf_unlikely + if (qdf_unlikely (HTT_T2H_MSG_TYPE_RX_FRAG_IND == msg_type)) byte_offset = HTT_ENDIAN_BYTE_IDX_SWAP @@ -957,7 +957,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, * the RX_IND message format, then the following * assertion can be restored. */ - /* cdf_assert((rx_ind_data[byte_offset] & + /* qdf_assert((rx_ind_data[byte_offset] & FW_RX_DESC_EXT_M) == 0); */ pdev->rx_ind_msdu_byte_idx += 1; /* or more, if there's ext data */ @@ -1121,7 +1121,7 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, paddr = HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*curr_msdu); *head_buf = *tail_buf = buf = htt_rx_in_order_netbuf_pop(pdev, paddr); - if (cdf_unlikely(NULL == buf)) { + if (qdf_unlikely(NULL == buf)) { qdf_print("%s: netbuf pop failed!\n", __func__); return 0; } @@ -1194,7 +1194,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word)); - if (cdf_unlikely(NULL == msdu)) { + if (qdf_unlikely(NULL == msdu)) { qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; return 0; @@ -1243,7 +1243,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, msdu_count--; - if (cdf_unlikely((*((u_int8_t *) &rx_desc->fw_desc.u.val)) & + if (qdf_unlikely((*((u_int8_t *) &rx_desc->fw_desc.u.val)) & FW_RX_DESC_MIC_ERR_M)) { u_int8_t tid = HTT_RX_IN_ORD_PADDR_IND_EXT_TID_GET( @@ -1273,7 +1273,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET( *msg_word)); - if (cdf_unlikely(NULL == next)) { + if (qdf_unlikely(NULL == next)) { qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; @@ -1305,7 +1305,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, next = htt_rx_in_order_netbuf_pop( pdev, HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*msg_word)); - if (cdf_unlikely(NULL == next)) { + if (qdf_unlikely(NULL == next)) { qdf_print("%s: netbuf pop failed!\n", __func__); *tail_msdu = NULL; @@ -1960,7 +1960,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, (char *) pdev->rx_ring.hash_table[i].freepool.next - pdev->rx_ring.listnode_offset); - if (cdf_unlikely(NULL == hash_element)) { + if (qdf_unlikely(NULL == hash_element)) { HTT_ASSERT_ALWAYS(0); return 1; } @@ -1968,7 +1968,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, htt_list_remove(pdev->rx_ring.hash_table[i].freepool.next); } else { hash_element = cdf_mem_malloc(sizeof(struct htt_rx_hash_entry)); - if (cdf_unlikely(NULL == hash_element)) { + if (qdf_unlikely(NULL == hash_element)) { HTT_ASSERT_ALWAYS(0); return 1; } diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 9b1262804ab1..18855b9d8907 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -155,7 +155,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) qdf_print ("*** Incompatible host/target HTT versions!"); /* abort if the target is incompatible with the host */ - cdf_assert(pdev->tgt_ver.major == + qdf_assert(pdev->tgt_ver.major == HTT_CURRENT_VERSION_MAJOR); if (pdev->tgt_ver.minor != HTT_CURRENT_VERSION_MINOR) { qdf_print("*** Warning: host/target HTT versions are "); @@ -437,7 +437,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) if (!peer) { qdf_print("%s: invalid peer id %d\n", __func__, peer_id); - cdf_assert(0); + qdf_assert(0); break; } vdev = peer->vdev; @@ -496,7 +496,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) return; } #ifdef HTT_RX_RESTORE - if (cdf_unlikely(pdev->rx_ring.rx_reset)) { + if (qdf_unlikely(pdev->rx_ring.rx_reset)) { qdf_print("rx restore ..\n"); cdf_nbuf_free(htt_t2h_msg); return; @@ -522,7 +522,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) uint16_t peer_id; uint8_t tid; - if (cdf_unlikely(pdev->cfg.is_full_reorder_offload)) { + if (qdf_unlikely(pdev->cfg.is_full_reorder_offload)) { qdf_print("HTT_T2H_MSG_TYPE_RX_IND not supported "); qdf_print("with full reorder offload\n"); break; @@ -649,7 +649,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) uint8_t tid; uint8_t offload_ind, frag_ind; - if (cdf_unlikely(!pdev->cfg.is_full_reorder_offload)) { + if (qdf_unlikely(!pdev->cfg.is_full_reorder_offload)) { qdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not "); qdf_print("supported when full reorder offload is "); qdf_print("disabled in the configuration.\n"); @@ -666,7 +666,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) __func__, __LINE__, peer_id, tid, offload_ind, frag_ind); #endif - if (cdf_unlikely(frag_ind)) { + if (qdf_unlikely(frag_ind)) { ol_rx_frag_indication_handler(pdev->txrx_pdev, htt_t2h_msg, peer_id, tid); diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 549b0ee062be..f6e09fd1e2bc 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -417,7 +417,7 @@ static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, for (i = 0; i < pdev->tx_descs.desc_pages.num_pages; i++) { page_info = pdev->tx_descs.desc_pages.dma_pages + i; if (!page_info->page_v_addr_start) { - cdf_assert(0); + qdf_assert(0); return 0; } if ((target_vaddr >= page_info->page_v_addr_start) && @@ -647,7 +647,7 @@ cdf_nbuf_t htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) { qdf_print("*** %s curently only applies for HL systems\n", __func__); - cdf_assert(0); + qdf_assert(0); return head_msdu; } @@ -670,7 +670,7 @@ htt_tx_send_nonstd(htt_pdev_handle pdev, + HTT_TX_HDR_SIZE_802_1Q + HTT_TX_HDR_SIZE_LLC_SNAP + ol_cfg_tx_download_size(pdev->ctrl_pdev); - cdf_assert(download_len <= pdev->download_len); + qdf_assert(download_len <= pdev->download_len); return htt_tx_send_std(pdev, msdu, msdu_id); } diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index 8b3b07409cc9..ab27b2ca895b 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -565,8 +565,8 @@ htt_tx_desc_init(htt_pdev_handle pdev, pkt_type = msdu_info->info.l2_hdr_type; - if (cdf_likely(pdev->cfg.ce_classify_enabled)) { - if (cdf_likely(pkt_type == htt_pkt_type_eth2 || + if (qdf_likely(pdev->cfg.ce_classify_enabled)) { + if (qdf_likely(pkt_type == htt_pkt_type_eth2 || pkt_type == htt_pkt_type_ethernet)) cdf_nbuf_tx_info_get(msdu, pkt_type, pkt_subtype, hw_classify); @@ -693,7 +693,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, */ cdf_nbuf_set_frag_is_wordstream(msdu, 0, 1); - if (cdf_likely(pdev->cfg.ce_classify_enabled && + if (qdf_likely(pdev->cfg.ce_classify_enabled && (msdu_info->info.l2_hdr_type != htt_pkt_type_mgmt))) { uint32_t pkt_offset = cdf_nbuf_get_frag_len(msdu, 0); data_attr = hw_classify << QDF_CE_TX_CLASSIFY_BIT_S; @@ -830,7 +830,7 @@ htt_tx_desc_frag(htt_pdev_handle pdev, *word32++ = 0; *word32++ = 0; - cdf_assert_always(word32 == (uint32_t *) + qdf_assert_always(word32 == (uint32_t *) &(((struct msdu_ext_desc_t *)desc)->frags[0])); /* Each fragment consumes 2 DWORDS */ diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index f681c2917d6d..60c9f91c714e 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -1044,7 +1044,7 @@ static inline void ol_tx_delay_hist(ol_txrx_pdev_handle pdev, uint16_t *bin_values, int category) { /* no-op version if QCA_COMPUTE_TX_DELAY is not set */ - cdf_assert(bin_values); + qdf_assert(bin_values); cdf_mem_zero(bin_values, QCA_TX_DELAY_HIST_REPORT_BINS * sizeof(*bin_values)); } diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h index 562167a116a0..d84b3ee1f202 100644 --- a/core/dp/ol/inc/ol_txrx_htt_api.h +++ b/core/dp/ol/inc/ol_txrx_htt_api.h @@ -40,7 +40,7 @@ static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu) { - cdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1)); + qdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1)); return (uint16_t *) (((qdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1); } diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index ba1ed60b7645..3b02e827e0dd 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -26,7 +26,7 @@ */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_os_cpu_to_le64 */ +#include /* qdf_cpu_to_le64 */ #include /* bool */ #include /* ieee80211_frame */ @@ -636,10 +636,10 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, (uint8_t *) rx_pn, sizeof(union htt_rx_pn_t)); peer->tids_last_pn[i].pn128[1] = - cdf_os_cpu_to_le64( + qdf_cpu_to_le64( peer->tids_last_pn[i].pn128[1]); peer->tids_last_pn[i].pn128[0] = - cdf_os_cpu_to_le64( + qdf_cpu_to_le64( peer->tids_last_pn[i].pn128[0]); } } @@ -1243,7 +1243,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, } else { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: Invalid pdev passed!\n", __func__); - cdf_assert_always(pdev); + qdf_assert_always(pdev); return; } @@ -1258,7 +1258,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, * corresponding rx MSDU network buffer. */ status = htt_rx_amsdu_pop(htt_pdev, rx_ind_msg, &head_msdu, &tail_msdu); - if (cdf_unlikely(0 == status)) { + if (qdf_unlikely(0 == status)) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "%s: Pop status is 0, returning here\n", __func__); return; diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index 74cbe897998a..78e0ad003db6 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev, if (peer) { htt_rx_frag_pop(htt_pdev, rx_frag_ind_msg, &head_msdu, &tail_msdu); - cdf_assert(head_msdu == tail_msdu); + qdf_assert(head_msdu == tail_msdu); if (ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev)) { rx_mpdu_desc = htt_rx_mpdu_desc_list_next(htt_pdev, head_msdu); @@ -222,14 +222,14 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, htt_pdev_handle htt_pdev = pdev->htt_pdev; seq = seq_num & peer->tids_rx_reorder[tid].win_sz_mask; - cdf_assert(seq == 0); + qdf_assert(seq == 0); rx_reorder_array_elem = &peer->tids_rx_reorder[tid].array[seq]; mac_hdr = (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, frag); - rxseq = cdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) >> + rxseq = qdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; - fragno = cdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) & + fragno = qdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; more_frag = mac_hdr->i_fc[1] & IEEE80211_FC1_MORE_FRAG; @@ -246,7 +246,7 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, fmac_hdr = (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, rx_reorder_array_elem->head); - frxseq = cdf_le16_to_cpu(*(uint16_t *) fmac_hdr->i_seq) >> + frxseq = qdf_le16_to_cpu(*(uint16_t *) fmac_hdr->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; if (rxseq != frxseq || !DEFRAG_IEEE80211_ADDR_EQ(mac_hdr->i_addr1, @@ -302,13 +302,13 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, uint8_t last_morefrag = 1, count = 0; cdf_nbuf_t frag_clone; - cdf_assert(frag); + qdf_assert(frag); frag_clone = OL_RX_FRAG_CLONE(frag); frag = frag_clone ? frag_clone : frag; mac_hdr = (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, frag); - fragno = cdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) & + fragno = qdf_le16_to_cpu(*(uint16_t *) mac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; if (!(*head_addr)) { @@ -320,7 +320,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, /* For efficiency, compare with tail first */ lmac_hdr = (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, *tail_addr); - lfragno = cdf_le16_to_cpu(*(uint16_t *) lmac_hdr->i_seq) & + lfragno = qdf_le16_to_cpu(*(uint16_t *) lmac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; if (fragno > lfragno) { cdf_nbuf_set_next(*tail_addr, frag); @@ -331,7 +331,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, cmac_hdr = (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, cur); cur_fragno = - cdf_le16_to_cpu(*(uint16_t *) cmac_hdr->i_seq) & + qdf_le16_to_cpu(*(uint16_t *) cmac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; prev = cur; cur = cdf_nbuf_next(cur); @@ -356,7 +356,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, (struct ieee80211_frame *) ol_rx_frag_get_mac_hdr(htt_pdev, next); next_fragno = - cdf_le16_to_cpu(*(uint16_t *) next_hdr->i_seq) & + qdf_le16_to_cpu(*(uint16_t *) next_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; count++; if (next_fragno != count) @@ -494,7 +494,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, wh = (struct ieee80211_frame *)ol_rx_frag_get_mac_hdr(htt_pdev, cur); hdr_space = ol_rx_frag_hdrsize(wh); rx_desc = htt_rx_msdu_desc_retrieve(htt_pdev, frag_list); - cdf_assert(htt_rx_msdu_has_wlan_mcast_flag(htt_pdev, rx_desc)); + qdf_assert(htt_rx_msdu_has_wlan_mcast_flag(htt_pdev, rx_desc)); index = htt_rx_msdu_is_wlan_mcast(htt_pdev, rx_desc) ? txrx_sec_mcast : txrx_sec_ucast; diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h index 85193ff33c6d..d0467625dd4d 100644 --- a/core/dp/txrx/ol_rx_defrag.h +++ b/core/dp/txrx/ol_rx_defrag.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 8740f79e58b8..05b59f24a7f5 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -103,7 +103,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, /* First, check whether the PN check applies */ rx_desc = htt_rx_msdu_desc_retrieve(pdev->htt_pdev, msdu_list); - cdf_assert(htt_rx_msdu_has_wlan_mcast_flag(pdev->htt_pdev, rx_desc)); + qdf_assert(htt_rx_msdu_has_wlan_mcast_flag(pdev->htt_pdev, rx_desc)); index = htt_rx_msdu_is_wlan_mcast(pdev->htt_pdev, rx_desc) ? txrx_sec_mcast : txrx_sec_ucast; pn_len = pdev->rx_pn[peer->security[index].sec_type].len; diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index debe0c493873..81694d2113b3 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -178,13 +178,13 @@ ol_rx_seq_num_check(struct ol_txrx_pdev_t *pdev, /* For mcast packets, we only the dup-detection, not re-order check */ - if (cdf_unlikely(OL_RX_MCAST_TID == tid)) { + if (qdf_unlikely(OL_RX_MCAST_TID == tid)) { pkt_tid = htt_rx_mpdu_desc_tid(pdev->htt_pdev, rx_mpdu_desc); /* Invalid packet TID, expected only for HL */ /* Pass the packet on */ - if (cdf_unlikely(pkt_tid >= OL_TXRX_NUM_EXT_TIDS)) + if (qdf_unlikely(pkt_tid >= OL_TXRX_NUM_EXT_TIDS)) return htt_rx_status_ok; retry = htt_rx_mpdu_desc_retry(pdev->htt_pdev, rx_mpdu_desc); @@ -197,7 +197,7 @@ ol_rx_seq_num_check(struct ol_txrx_pdev_t *pdev, * or out-of-order check for multicast frames as per discussions & spec * Hence "seq_num <= last_seq_num" check is not necessary. */ - if (cdf_unlikely(retry && + if (qdf_unlikely(retry && (seq_num == peer->tids_mcast_last_seq[pkt_tid]))) {/* drop mcast */ TXRX_STATS_INCR(pdev, priv.rx.err.msdu_mc_dup_drop); return htt_rx_status_err_replay; diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 14b5c9455c78..c8b227ab0b99 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -28,7 +28,7 @@ /* OS abstraction libraries */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_atomic_read, etc. */ -#include /* cdf_unlikely */ +#include /* qdf_unlikely */ /* APIs for other modules */ #include /* HTT_TX_EXT_TID_MGMT */ @@ -73,7 +73,7 @@ int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, struct ol_txrx_pdev_t *pdev = vdev->pdev; \ (msdu_info)->htt.info.frame_type = pdev->htt_pkt_type; \ tx_desc = ol_tx_desc_ll(pdev, vdev, msdu, msdu_info); \ - if (cdf_unlikely(!tx_desc)) { \ + if (qdf_unlikely(!tx_desc)) { \ TXRX_STATS_MSDU_LIST_INCR( \ pdev, tx.dropped.host_reject, msdu); \ return msdu; /* the list of unaccepted MSDUs */ \ @@ -151,12 +151,12 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, cdf_nbuf_t ret; QDF_STATUS status; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s:pdev is null", __func__); return skb; } - if (cdf_unlikely(!cdf_ctx)) { + if (qdf_unlikely(!cdf_ctx)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s:cdf_ctx is null", __func__); return skb; @@ -182,7 +182,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, } status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE); - if (cdf_unlikely(status != QDF_STATUS_SUCCESS)) { + if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; @@ -222,7 +222,7 @@ cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); cdf_nbuf_t ret; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is NULL", __func__); return skb; @@ -269,7 +269,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; - if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { + if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { qdf_print("ol_tx_prepare_tso failed\n"); TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, tx.dropped.host_reject, msdu); @@ -404,7 +404,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, u_int32_t num_frags, i; tx_desc = ol_tx_desc_alloc_wrapper(pdev, vdev, msdu_info); - if (cdf_unlikely(!tx_desc)) + if (qdf_unlikely(!tx_desc)) return NULL; tx_desc->netbuf = msdu; @@ -491,7 +491,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, /* * TODO : Can we remove this check and always download a fixed length ? * */ - if (cdf_unlikely(cdf_nbuf_len(msdu) < pkt_download_len)) + if (qdf_unlikely(cdf_nbuf_len(msdu) < pkt_download_len)) pkt_download_len = cdf_nbuf_len(msdu); /* Fill the HTC header information */ @@ -539,7 +539,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; - if (cdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { + if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { qdf_print("ol_tx_prepare_tso failed\n"); TXRX_STATS_MSDU_LIST_INCR(vdev->pdev, tx.dropped.host_reject, msdu); @@ -588,7 +588,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) break; default: msdu_info.htt.action.do_encrypt = 1; - cdf_assert(0); + qdf_assert(0); break; } @@ -596,7 +596,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) pkt_download_len, ep_id, &msdu_info); - if (cdf_likely(tx_desc)) { + if (qdf_likely(tx_desc)) { /* * If debug display is enabled, show the meta * data being downloaded to the target via the @@ -682,7 +682,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) break; default: msdu_info.htt.action.do_encrypt = 1; - cdf_assert(0); + qdf_assert(0); break; } @@ -690,7 +690,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) pkt_download_len, ep_id, &msdu_info); - if (cdf_likely(tx_desc)) { + if (qdf_likely(tx_desc)) { /* * If debug display is enabled, show the meta-data being * downloaded to the target via the HTT tx descriptor. @@ -734,7 +734,7 @@ ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) struct hif_opaque_softc *hif_device = (struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF); - if (cdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device))) + if (qdf_likely(hif_device && hif_is_fastpath_mode_enabled(hif_device))) msdu_list = ol_tx_ll_fast(vdev, msdu_list); else msdu_list = ol_tx_ll(vdev, msdu_list); @@ -870,7 +870,7 @@ cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) paused_reason = vdev->ll_pause.paused_reason; if (paused_reason) { - if (cdf_unlikely((paused_reason & + if (qdf_unlikely((paused_reason & OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED) == paused_reason)) { eth_type = (((struct ethernet_hdr_t *) diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index b4c04e65d1fd..951e30213bab 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -27,7 +27,7 @@ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_assert */ +#include /* qdf_assert */ #include /* cdf_spinlock */ #ifdef QCA_COMPUTE_TX_DELAY #include /* qdf_system_ticks */ @@ -55,7 +55,7 @@ static inline void ol_tx_desc_sanity_checks(struct ol_txrx_pdev_t *pdev, TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s Potential tx_desc corruption pkt_type:0x%x pdev:0x%p", __func__, tx_desc->pkt_type, pdev); - cdf_assert(0); + qdf_assert(0); } if ((uint32_t *) tx_desc->htt_tx_desc < g_dbg_htt_desc_start_addr @@ -64,7 +64,7 @@ static inline void ol_tx_desc_sanity_checks(struct ol_txrx_pdev_t *pdev, TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s Potential htt_desc curruption:0x%p pdev:0x%p\n", __func__, tx_desc->htt_tx_desc, pdev); - cdf_assert(0); + qdf_assert(0); } } static inline void ol_tx_desc_reset_pkt_type(struct ol_tx_desc_t *tx_desc) @@ -77,7 +77,7 @@ static inline void ol_tx_desc_compute_delay(struct ol_tx_desc_t *tx_desc) if (tx_desc->entry_timestamp_ticks != 0xffffffff) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s Timestamp:0x%x\n", __func__, tx_desc->entry_timestamp_ticks); - cdf_assert(0); + qdf_assert(0); } tx_desc->entry_timestamp_ticks = qdf_system_ticks(); } @@ -166,7 +166,7 @@ struct ol_tx_desc_t *ol_tx_desc_alloc(struct ol_txrx_pdev_t *pdev, qdf_spin_lock_bh(&pool->flow_pool_lock); if (pool->avail_desc) { tx_desc = ol_tx_get_desc_flow_pool(pool); - if (cdf_unlikely(pool->avail_desc < pool->stop_th)) { + if (qdf_unlikely(pool->avail_desc < pool->stop_th)) { pool->status = FLOW_POOL_ACTIVE_PAUSED; qdf_spin_unlock_bh(&pool->flow_pool_lock); /* pause network queues */ @@ -203,7 +203,7 @@ ol_tx_desc_alloc_wrapper(struct ol_txrx_pdev_t *pdev, struct ol_txrx_vdev_t *vdev, struct ol_txrx_msdu_info_t *msdu_info) { - if (cdf_unlikely(msdu_info->htt.info.frame_type == htt_pkt_type_mgmt)) + if (qdf_unlikely(msdu_info->htt.info.frame_type == htt_pkt_type_mgmt)) return ol_tx_desc_alloc(pdev, vdev, pdev->mgmt_pool); else return ol_tx_desc_alloc(pdev, vdev, vdev->pool); @@ -232,10 +232,10 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) qdf_spin_lock_bh(&pdev->tx_mutex); if (tx_desc->pkt_type == ol_tx_frm_tso) { - if (cdf_unlikely(tx_desc->tso_desc == NULL)) { + if (qdf_unlikely(tx_desc->tso_desc == NULL)) { qdf_print("%s %d TSO desc is NULL!\n", __func__, __LINE__); - cdf_assert(0); + qdf_assert(0); } else { ol_tso_free_segment(pdev, tx_desc->tso_desc); } @@ -261,7 +261,7 @@ void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc) #if defined(FEATURE_TSO) if (tx_desc->pkt_type == ol_tx_frm_tso) { - if (cdf_unlikely(tx_desc->tso_desc == NULL)) + if (qdf_unlikely(tx_desc->tso_desc == NULL)) qdf_print("%s %d TSO desc is NULL!\n", __func__, __LINE__); else @@ -346,7 +346,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, msdu_info->htt.action.do_encrypt = 0; break; default: - cdf_assert(0); + qdf_assert(0); break; } diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index 47f0f19b4296..d846a6b504e1 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -150,7 +150,7 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) struct ol_txrx_pdev_t *pdev = vdev->pdev; enum netif_reason_type netif_reason; - if (cdf_unlikely((!pdev) || (!pdev->pause_cb))) { + if (qdf_unlikely((!pdev) || (!pdev->pause_cb))) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: invalid pdev\n", __func__); return; @@ -175,7 +175,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) struct ol_txrx_pdev_t *pdev = vdev->pdev; enum netif_reason_type netif_reason; - if (cdf_unlikely((!pdev) || (!pdev->pause_cb))) { + if (qdf_unlikely((!pdev) || (!pdev->pause_cb))) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: invalid pdev\n", __func__); return; diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 9df4e8c6418c..18e4b36603ec 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -187,7 +187,7 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev, (uint8_t *)(cdf_nbuf_data(msdu)), sizeof(cdf_nbuf_data(msdu)))); failed = htt_tx_send_std(pdev->htt_pdev, msdu, id); - if (cdf_unlikely(failed)) { + if (qdf_unlikely(failed)) { OL_TX_TARGET_CREDIT_INCR_INT(pdev, msdu_credit_consumed); ol_tx_desc_frame_free_nonstd(pdev, tx_desc, 1 /* had error */); } @@ -201,7 +201,7 @@ ol_tx_send_batch(struct ol_txrx_pdev_t *pdev, OL_TX_CREDIT_RECLAIM(pdev); rejected = htt_tx_send_batch(pdev->htt_pdev, head_msdu, num_msdus); - while (cdf_unlikely(rejected)) { + while (qdf_unlikely(rejected)) { struct ol_tx_desc_t *tx_desc; uint16_t *msdu_id_storage; cdf_nbuf_t next; @@ -245,7 +245,7 @@ ol_tx_download_done_base(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc; tx_desc = ol_tx_desc_find(pdev, msdu_id); - cdf_assert(tx_desc); + qdf_assert(tx_desc); /* * If the download is done for @@ -306,7 +306,7 @@ ol_tx_download_done_hl_free(void *txrx_pdev, struct ol_tx_desc_t *tx_desc; tx_desc = ol_tx_desc_find(pdev, msdu_id); - cdf_assert(tx_desc); + qdf_assert(tx_desc); ol_tx_download_done_base(pdev, status, msdu, msdu_id); @@ -367,7 +367,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, cdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ - if (cdf_unlikely(!lcl_freelist)) { \ + if (qdf_unlikely(!lcl_freelist)) { \ (_tx_desc_last) = (union ol_tx_desc_list_elem_t *)\ (_tx_desc); \ } \ @@ -383,7 +383,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, cdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ - if (cdf_unlikely(!lcl_freelist)) { \ + if (qdf_unlikely(!lcl_freelist)) { \ (_tx_desc_last) = (union ol_tx_desc_list_elem_t *)\ (_tx_desc); \ } \ @@ -405,7 +405,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, _netbuf, _lcl_freelist, \ _tx_desc_last, _status) \ do { \ - if (cdf_likely((_tx_desc)->pkt_type == ol_tx_frm_std)) { \ + if (qdf_likely((_tx_desc)->pkt_type == ol_tx_frm_std)) { \ ol_tx_msdu_complete_single((_pdev), (_tx_desc),\ (_netbuf), (_lcl_freelist), \ (_tx_desc_last)); \ @@ -427,7 +427,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, _netbuf, _lcl_freelist, \ _tx_desc_last, _status) \ do { \ - if (cdf_likely((_tx_desc)->pkt_type == ol_tx_frm_std)) { \ + if (qdf_likely((_tx_desc)->pkt_type == ol_tx_frm_std)) { \ ol_tx_msdu_complete_batch((_pdev), (_tx_desc), \ (_tx_descs), (_status)); \ } else { \ @@ -695,7 +695,7 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, uint32_t avg_delay_ticks; struct ol_tx_delay_data *data; - cdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); + qdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); qdf_spin_lock_bh(&pdev->tx_delay.mutex); index = 1 - pdev->tx_delay.cats[category].in_progress_idx; @@ -739,7 +739,7 @@ ol_tx_delay_hist(ol_txrx_pdev_handle pdev, int index, i, j; struct ol_tx_delay_data *data; - cdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); + qdf_assert(category >= 0 && category < QCA_TX_DELAY_NUM_CATEGORIES); qdf_spin_lock_bh(&pdev->tx_delay.mutex); index = 1 - pdev->tx_delay.cats[category].in_progress_idx; @@ -779,7 +779,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev, CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "Invalid standard frame type: %d", pdev->frame_format); - cdf_assert(0); + qdf_assert(0); hdr_ptr = NULL; } return hdr_ptr; @@ -894,7 +894,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, uint32_t avg_time_ticks; struct ol_tx_delay_data *data; - cdf_assert(num_msdus > 0); + qdf_assert(num_msdus > 0); /* * keep static counters for total packet and lost packets diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index fb09688bc85d..9f88de09f850 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -550,7 +550,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) goto uc_attach_fail; /* Calculate single element reserved size power of 2 */ - pdev->tx_desc.desc_reserved_size = cdf_get_pwr2(desc_element_size); + pdev->tx_desc.desc_reserved_size = qdf_get_pwr2(desc_element_size); cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_desc.desc_pages, pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true); if ((0 == pdev->tx_desc.desc_pages.num_pages) || @@ -1272,7 +1272,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, return; } - cdf_assert(cds_ctx); + qdf_assert(cds_ctx); qdf_spin_lock_bh(&peer->peer_info_lock); if (peer->state >= ol_txrx_peer_state_conn) data_rx = peer->osif_rx; @@ -1472,9 +1472,9 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, { struct ol_txrx_peer_t *peer; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Pdev is NULL"); - cdf_assert(0); + qdf_assert(0); return QDF_STATUS_E_INVAL; } @@ -1686,7 +1686,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) if (0 == qdf_atomic_read(&(peer->ref_cnt))) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "The Peer is not present anymore\n"); - cdf_assert(0); + qdf_assert(0); return; } @@ -2537,7 +2537,7 @@ A_STATUS ol_txrx_peer_stats_copy(ol_txrx_pdev_handle pdev, ol_txrx_peer_handle peer, ol_txrx_peer_stats_t *stats) { - cdf_assert(pdev && peer && stats); + qdf_assert(pdev && peer && stats); qdf_spin_lock_bh(&pdev->peer_stat_mutex); cdf_mem_copy(stats, &peer->stats, sizeof(*stats)); qdf_spin_unlock_bh(&pdev->peer_stat_mutex); @@ -2831,7 +2831,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, { ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); cdf_mem_free(rxpkt); @@ -2860,11 +2860,11 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg) p_cds_sched_context sched_ctx = get_cds_sched_ctxt(); struct cds_ol_rx_pkt *pkt; - if (cdf_unlikely(!sched_ctx)) + if (qdf_unlikely(!sched_ctx)) return; pkt = cds_alloc_ol_rx_pkt(sched_ctx); - if (cdf_unlikely(!pkt)) { + if (qdf_unlikely(!pkt)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; @@ -2992,11 +2992,11 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; - if (cdf_unlikely(!cds_ctx)) + if (qdf_unlikely(!cds_ctx)) goto free_buf; qdf_spin_lock_bh(&peer->peer_info_lock); - if (cdf_unlikely(!(peer->state >= ol_txrx_peer_state_conn))) { + if (qdf_unlikely(!(peer->state >= ol_txrx_peer_state_conn))) { qdf_spin_unlock_bh(&peer->peer_info_lock); goto free_buf; } @@ -3354,10 +3354,10 @@ void ol_txrx_lro_flush_handler(void *context, { ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); - cdf_assert(0); + qdf_assert(0); return; } @@ -3383,14 +3383,14 @@ void ol_txrx_lro_flush(void *data) struct cds_ol_rx_pkt *pkt; ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)data; - if (cdf_unlikely(!sched_ctx)) + if (qdf_unlikely(!sched_ctx)) return; if (!ol_cfg_is_rx_thread_enabled(pdev->ctrl_pdev)) { ol_txrx_lro_flush_handler((void *)pdev, NULL, 0); } else { pkt = cds_alloc_ol_rx_pkt(sched_ctx); - if (cdf_unlikely(!pkt)) { + if (qdf_unlikely(!pkt)) { CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index 38d2ebe88329..760850f8f30c 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/core/dp/txrx/ol_txrx.h @@ -51,7 +51,7 @@ static inline ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id) ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); ol_txrx_vdev_handle vdev = NULL; - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { return NULL; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index ba194c58d042..66f42d293624 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -28,7 +28,7 @@ /* OS abstraction libraries */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_atomic_read, etc. */ -#include /* cdf_unlikely */ +#include /* qdf_unlikely */ /* APIs for other modules */ #include /* HTT_TX_EXT_TID_MGMT */ @@ -601,7 +601,7 @@ void ol_tx_flow_pool_map_handler(uint8_t flow_id, uint8_t flow_type, "%s: flow_id %d flow_type %d flow_pool_id %d flow_pool_size %d\n", __func__, flow_id, flow_type, flow_pool_id, flow_pool_size); - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is NULL", __func__); return; @@ -659,7 +659,7 @@ void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type, "%s: flow_id %d flow_type %d flow_pool_id %d\n", __func__, flow_id, flow_type, flow_pool_id); - if (cdf_unlikely(!pdev)) { + if (qdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: pdev is NULL", __func__); return; diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 6d72059ea9a4..25d25f09d5d7 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -28,7 +28,7 @@ #ifndef _OL_TXRX_INTERNAL__H_ #define _OL_TXRX_INTERNAL__H_ -#include /* cdf_assert */ +#include /* qdf_assert */ #include /* cdf_nbuf_t */ #include /* cdf_mem_set */ #include /* ieee80211_frame */ @@ -63,13 +63,13 @@ #else /* #ifdef __KLOCWORK__ */ #if TXRX_ASSERT_LEVEL > 0 -#define TXRX_ASSERT1(condition) cdf_assert((condition)) +#define TXRX_ASSERT1(condition) qdf_assert((condition)) #else #define TXRX_ASSERT1(condition) #endif #if TXRX_ASSERT_LEVEL > 1 -#define TXRX_ASSERT2(condition) cdf_assert((condition)) +#define TXRX_ASSERT2(condition) qdf_assert((condition)) #else #define TXRX_ASSERT2(condition) #endif @@ -632,10 +632,10 @@ NOT_IP_TCP: dest_addr = (uint8_t *) &(frm->i_addr3[0]); \ } \ } \ - if (cdf_unlikely(IEEE80211_IS_BROADCAST(dest_addr))) { \ + if (qdf_unlikely(IEEE80211_IS_BROADCAST(dest_addr))) { \ OL_TXRX_PEER_STATS_UPDATE_BASE(peer, tx_or_rx, \ bcast, msdu); \ - } else if (cdf_unlikely(IEEE80211_IS_MULTICAST(dest_addr))) { \ + } else if (qdf_unlikely(IEEE80211_IS_MULTICAST(dest_addr))) { \ OL_TXRX_PEER_STATS_UPDATE_BASE(peer, tx_or_rx, \ mcast, msdu); \ } else { \ diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 54607e5db77d..7e8c38d44b54 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -359,7 +359,7 @@ ol_txrx_peer_find_add_id(struct ol_txrx_pdev_t *pdev, } if (ol_txrx_peer_find_add_id_to_obj(peer, peer_id)) { /* TBDXXX: assert for now */ - cdf_assert(0); + qdf_assert(0); } return; } diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 07d4cb7ff76d..dcfb2e69a420 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -330,7 +330,7 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, /* Save the BSSID for the connection */ if (eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) { CDF_ASSERT(pRoamInfo->pBssDesc); - cdf_copy_macaddr(&pHddStaCtx->conn_info.bssId, + qdf_copy_macaddr(&pHddStaCtx->conn_info.bssId, &pRoamInfo->bssid); /* @@ -345,7 +345,7 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, pRoamInfo->staId; } } else if (eCSR_BSS_TYPE_IBSS == eBssType) { - cdf_copy_macaddr(&pHddStaCtx->conn_info.bssId, + qdf_copy_macaddr(&pHddStaCtx->conn_info.bssId, &pRoamInfo->bssid); } else { /* @@ -771,7 +771,7 @@ static void hdd_send_association_event(struct net_device *dev, } if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { tSirSmeChanInfo chan_info; - cdf_copy_macaddr(&peerMacAddr, + qdf_copy_macaddr(&peerMacAddr, &pHddStaCtx->conn_info.bssId); chan_info.chan_id = pCsrRoamInfo->chan_info.chan_id; chan_info.mhz = pCsrRoamInfo->chan_info.mhz; @@ -824,7 +824,7 @@ static void hdd_send_association_event(struct net_device *dev, #endif if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { - cdf_copy_macaddr(&peerMacAddr, + qdf_copy_macaddr(&peerMacAddr, &pHddStaCtx->conn_info.bssId); /* send peer status indication to oem app */ @@ -1575,7 +1575,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, if (WLAN_HDD_IBSS == pAdapter->device_mode) { uint8_t staId; - if (cdf_is_macaddr_broadcast(&pRoamInfo->peerMac)) { + if (qdf_is_macaddr_broadcast(&pRoamInfo->peerMac)) { pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; } else { @@ -2473,7 +2473,7 @@ static bool roam_save_ibss_station(hdd_station_ctx_t *pHddStaCtx, uint8_t staId, if (0 == pHddStaCtx->conn_info.staId[idx]) { pHddStaCtx->conn_info.staId[idx] = staId; - cdf_copy_macaddr(&pHddStaCtx->conn_info. + qdf_copy_macaddr(&pHddStaCtx->conn_info. peerMacAddress[idx], peerMacAddress); fSuccess = true; @@ -2506,7 +2506,7 @@ static bool roam_remove_ibss_station(hdd_adapter_t *pAdapter, uint8_t staId) if (staId == pHddStaCtx->conn_info.staId[idx]) { pHddStaCtx->conn_info.staId[idx] = 0; - cdf_zero_macaddr(&pHddStaCtx->conn_info. + qdf_zero_macaddr(&pHddStaCtx->conn_info. peerMacAddress[idx]); fSuccess = true; @@ -2540,13 +2540,13 @@ static bool roam_remove_ibss_station(hdd_adapter_t *pAdapter, uint8_t staId) if (pHddStaCtx->conn_info.staId[valid_idx] != 0) { pHddStaCtx->conn_info.staId[0] = pHddStaCtx->conn_info.staId[valid_idx]; - cdf_copy_macaddr(&pHddStaCtx->conn_info. + qdf_copy_macaddr(&pHddStaCtx->conn_info. peerMacAddress[0], &pHddStaCtx->conn_info. peerMacAddress[valid_idx]); pHddStaCtx->conn_info.staId[valid_idx] = 0; - cdf_zero_macaddr(&pHddStaCtx->conn_info. + qdf_zero_macaddr(&pHddStaCtx->conn_info. peerMacAddress[valid_idx]); } } @@ -2731,7 +2731,7 @@ roam_roam_connect_status_update_handler(hdd_adapter_t *pAdapter, pHddStaCtx->ibss_enc_key.encType) { pHddStaCtx->ibss_enc_key.keyDirection = eSIR_TX_RX; - cdf_copy_macaddr(&pHddStaCtx->ibss_enc_key.peerMac, + qdf_copy_macaddr(&pHddStaCtx->ibss_enc_key.peerMac, &pRoamInfo->peerMac); hddLog(LOG2, "New peer joined set PTK encType=%d", @@ -2972,7 +2972,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, MAC_ADDR_ARRAY (pRoamInfo->peerMac.bytes)); - cdf_copy_macaddr(&pHddCtx-> + qdf_copy_macaddr(&pHddCtx-> tdlsConnInfo [staIdx]. peerMac, diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index dd95af03861f..a107cb83e644 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3943,7 +3943,7 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, if (res < 0) break; } - if (res == 0 && !cdf_is_macaddr_zero(&macaddr[i])) { + if (res == 0 && !qdf_is_macaddr_zero(&macaddr[i])) { cdf_mem_copy((uint8_t *) &pHddCtx->config-> intfMacAddr[i].bytes[0], (uint8_t *) &macaddr[i].bytes[0], diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 70033c2aa470..80cd4b532a44 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -3603,7 +3603,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, hddLog(LOG1, "input src mac address: "MAC_ADDRESS_STR, MAC_ADDR_ARRAY(add_req->mac_address.bytes)); - if (!cdf_is_macaddr_equal(&add_req->mac_address, + if (!qdf_is_macaddr_equal(&add_req->mac_address, &adapter->macAddressCurrent)) { hdd_err("input src mac address and connected ap bssid are different"); goto fail; @@ -3718,7 +3718,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, return -ENOMEM; } - cdf_copy_macaddr(&del_req->mac_address, &adapter->macAddressCurrent); + qdf_copy_macaddr(&del_req->mac_address, &adapter->macAddressCurrent); hdd_info(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->mac_address.bytes)); del_req->ucPtrnId = pattern_id; hddLog(LOG1, FL("Request Id: %u Pattern id: %d"), @@ -4376,7 +4376,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) { if (adapter->aStaInfo[sta_id].isUsed && - !cdf_is_macaddr_broadcast( + !qdf_is_macaddr_broadcast( &adapter->aStaInfo[sta_id].macAddrSTA) && cdf_mem_compare( &adapter->aStaInfo[sta_id].macAddrSTA.bytes, @@ -5681,7 +5681,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, setKey.keyDirection = eSIR_TX_RX; /* Key Directionn both TX and RX */ setKey.paeRole = 0; /* the PAE role */ if (!mac_addr || is_broadcast_ether_addr(mac_addr)) { - cdf_set_macaddr_broadcast(&setKey.peerMac); + qdf_set_macaddr_broadcast(&setKey.peerMac); } else { cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } @@ -6725,7 +6725,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s- %d: setting Broadcast key", __func__, __LINE__); setKey.keyDirection = eSIR_RX_ONLY; - cdf_set_macaddr_broadcast(&setKey.peerMac); + qdf_set_macaddr_broadcast(&setKey.peerMac); } else { /* set pairwise key */ CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, @@ -6867,7 +6867,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, ) ) { setKey.keyDirection = eSIR_RX_ONLY; - cdf_set_macaddr_broadcast(&setKey.peerMac); + qdf_set_macaddr_broadcast(&setKey.peerMac); hddLog(LOG2, FL("Set key peerMac "MAC_ADDRESS_STR" direction %d"), @@ -7128,7 +7128,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, setKey.keyDirection = eSIR_TX_RX; - cdf_copy_macaddr(&setKey.peerMac, + qdf_copy_macaddr(&setKey.peerMac, &pHddStaCtx->conn_info.bssId); if (Keys->KeyLength[key_index] == CSR_WEP40_KEY_LEN && @@ -9433,7 +9433,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; } - cdf_copy_macaddr(&bssid, &pHddCtx->config->IbssBssid); + qdf_copy_macaddr(&bssid, &pHddCtx->config->IbssBssid); } if ((params->beacon_interval > CFG_BEACON_INTERVAL_MIN) && (params->beacon_interval <= CFG_BEACON_INTERVAL_MAX)) @@ -9863,7 +9863,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, return 0; } - if (cdf_is_macaddr_broadcast((struct qdf_mac_addr *) mac)) { + if (qdf_is_macaddr_broadcast((struct qdf_mac_addr *) mac)) { uint16_t i; for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if ((pAdapter->aStaInfo[i].isUsed) && @@ -10525,7 +10525,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, NL80211_KCK_LEN); memcpy(pHddStaCtx->gtkOffloadReqParams.aKEK, data->kek, NL80211_KEK_LEN); - cdf_copy_macaddr(&pHddStaCtx->gtkOffloadReqParams.bssid, + qdf_copy_macaddr(&pHddStaCtx->gtkOffloadReqParams.bssid, &pHddStaCtx->conn_info.bssId); { /* changing from big to little endian since driver diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 771d9bacdc7e..eb56cb09e540 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -405,7 +405,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, } delPeriodicTxPtrnParams->ucPtrnId = pattern_idx; delPeriodicTxPtrnParams->ucPatternIdBitmap = 1 << pattern_idx; - cdf_copy_macaddr(&delPeriodicTxPtrnParams->mac_address, + qdf_copy_macaddr(&delPeriodicTxPtrnParams->mac_address, &pAdapter->macAddressCurrent); /* Delete pattern */ @@ -473,7 +473,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, addPeriodicTxPtrnParams->ucPtrnId = pattern_idx; addPeriodicTxPtrnParams->usPtrnIntervalMs = pattern_duration * 500; addPeriodicTxPtrnParams->ucPtrnSize = pattern_len; - cdf_copy_macaddr(&addPeriodicTxPtrnParams->mac_address, + qdf_copy_macaddr(&addPeriodicTxPtrnParams->mac_address, &pAdapter->macAddressCurrent); /* Extract the pattern */ diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 4d269aaa3bed..f3f0e066b5a4 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -261,7 +261,7 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("hif_enable error = %d, reinit = %d", status, reinit); - ret = cdf_status_to_os_return(status); + ret = qdf_status_to_os_return(status); goto err_napi_destroy; } @@ -563,7 +563,7 @@ static int __wlan_hdd_bus_suspend(pm_message_t state) if (err) goto done; - err = cdf_status_to_os_return( + err = qdf_status_to_os_return( ol_txrx_bus_suspend()); if (err) goto done; diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index fd0a799d3042..1125d4d502a4 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -127,7 +127,7 @@ static void wlan_hdd_ftm_update_tgt_cfg(void *context, void *param) hdd_context_t *hdd_ctx = (hdd_context_t *) context; struct wma_tgt_cfg *cfg = (struct wma_tgt_cfg *)param; - if (!cdf_is_macaddr_zero(&cfg->hw_macaddr)) { + if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) { hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr); } else { hddLog(CDF_TRACE_LEVEL_ERROR, diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 7f8b8ea754b6..0da6f0d4d275 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1577,7 +1577,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, WPSPBCProbeReq.probeReqIE, pHddApCtx->WPSPBCProbeReq.probeReqIELen); - cdf_copy_macaddr(&pHddApCtx->WPSPBCProbeReq.peer_macaddr, + qdf_copy_macaddr(&pHddApCtx->WPSPBCProbeReq.peer_macaddr, &pSapEvent->sapevt.sapPBCProbeReqEvent. WPSPBCProbeReq.peer_macaddr); hddLog(LOG1, "WPS PBC probe req " MAC_ADDRESS_STR, @@ -2453,7 +2453,7 @@ static __iw_softap_setparam(struct net_device *dev, struct hdd_config *pConfig = hdd_ctx->config; hddLog(LOG1, "MC Target rate %d", set_value); - cdf_copy_macaddr(&rateUpdate.bssid, + qdf_copy_macaddr(&rateUpdate.bssid, &pHostapdAdapter->macAddressCurrent); rateUpdate.nss = (pConfig->enable2x2 == 0) ? 0 : 1; rateUpdate.dev_mode = pHostapdAdapter->device_mode; @@ -3360,8 +3360,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, return ret; /* Assign correct slef MAC address */ - cdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); - cdf_copy_macaddr(&selfMac, &pHostapdAdapter->macAddressCurrent); + qdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); + qdf_copy_macaddr(&selfMac, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; if (QDF_STATUS_SUCCESS != @@ -3410,7 +3410,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, if (NULL == value) return -ENOMEM; - cdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); + qdf_copy_macaddr(&bssid, &pHostapdAdapter->macAddressCurrent); set_value = value[0]; if (QDF_STATUS_SUCCESS != @@ -3857,7 +3857,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev, cdf_mem_copy(&WPSPBCProbeReqIEs.probeReqIE, pHddApCtx->WPSPBCProbeReq.probeReqIE, WPSPBCProbeReqIEs.probeReqIELen); - cdf_copy_macaddr(&WPSPBCProbeReqIEs.macaddr, + qdf_copy_macaddr(&WPSPBCProbeReqIEs.macaddr, &pHddApCtx->WPSPBCProbeReq.peer_macaddr); if (copy_to_user(wrqu->data.pointer, (void *)&WPSPBCProbeReqIEs, @@ -4036,7 +4036,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { /*Key direction for group is RX only */ setKey.keyDirection = eSIR_RX_ONLY; - cdf_set_macaddr_broadcast(&setKey.peerMac); + qdf_set_macaddr_broadcast(&setKey.peerMac); } else { setKey.keyDirection = eSIR_TX_RX; @@ -5362,9 +5362,9 @@ int __iw_get_softap_linkspeed(struct net_device *dev, if (wrqu->data.length < 17 || !QDF_IS_STATUS_SUCCESS(status)) { for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { if (pHostapdAdapter->aStaInfo[i].isUsed && - (!cdf_is_macaddr_broadcast + (!qdf_is_macaddr_broadcast (&pHostapdAdapter->aStaInfo[i].macAddrSTA))) { - cdf_copy_macaddr( + qdf_copy_macaddr( &macAddress, &pHostapdAdapter->aStaInfo[i]. macAddrSTA); @@ -6907,7 +6907,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) WLAN_EID_OVERLAP_BSS_SCAN_PARAM); } #endif - cdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent); + qdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent); updateIE.smeSessionId = adapter->sessionId; if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) { @@ -7993,7 +7993,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, return -EINVAL; } - cdf_copy_macaddr(&updateIE.bssid, &pAdapter->macAddressCurrent); + qdf_copy_macaddr(&updateIE.bssid, &pAdapter->macAddressCurrent); updateIE.smeSessionId = pAdapter->sessionId; updateIE.ieBufferlength = 0; updateIE.pAdditionIEBuffer = NULL; diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index eb8f5b260ba2..626a19ebfb08 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -1723,7 +1723,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, memset(¶ms, 0, sizeof(tSirAppType1Params)); params.vdev_id = adapter->sessionId; - cdf_copy_macaddr(¶ms.wakee_mac_addr, &adapter->macAddressCurrent); + qdf_copy_macaddr(¶ms.wakee_mac_addr, &adapter->macAddressCurrent); params.id_length = strlen(id); cdf_mem_copy(params.identification_id, id, params.id_length); @@ -2426,7 +2426,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) rateUpdate.mcastDataRate24GHzTxFlag = 1; rateUpdate.mcastDataRate5GHz = targetRate; rateUpdate.bcastDataRate = -1; - cdf_copy_macaddr(&rateUpdate.bssid, &pAdapter->macAddressCurrent); + qdf_copy_macaddr(&rateUpdate.bssid, &pAdapter->macAddressCurrent); hddLog(LOG1, FL("MC Target rate %d, mac = %pM, dev_mode %s(%d)"), rateUpdate.mcastDataRate24GHz, rateUpdate.bssid.bytes, @@ -4982,9 +4982,9 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, && QDF_STATUS_SUCCESS == qdf_status) { adapter = pAdapterNode->pAdapter; /* Assign correct self MAC address */ - cdf_copy_macaddr(&bssid, + qdf_copy_macaddr(&bssid, &adapter->macAddressCurrent); - cdf_copy_macaddr(&selfMac, + qdf_copy_macaddr(&selfMac, &adapter->macAddressCurrent); hddLog(CDF_TRACE_LEVEL_INFO, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index c43b7beece3c..1a484a471c0a 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1299,7 +1299,7 @@ void hdd_update_tgt_cfg(void *context, void *param) /* This can be extended to other configurations like ht, vht cap... */ - if (!cdf_is_macaddr_zero(&cfg->hw_macaddr)) { + if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) { hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr); } else { hddLog(CDF_TRACE_LEVEL_ERROR, @@ -2767,7 +2767,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) return; } - cdf_copy_macaddr(&updateIE.bssid, bssid); + qdf_copy_macaddr(&updateIE.bssid, bssid); updateIE.smeSessionId = pHostapdAdapter->sessionId; updateIE.ieBufferlength = 0; updateIE.pAdditionIEBuffer = NULL; @@ -2942,7 +2942,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, adapter->device_mode, adapter->sessionId); - cdf_copy_macaddr(&updateIE.bssid, + qdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent); updateIE.smeSessionId = adapter->sessionId; updateIE.ieBufferlength = 0; @@ -5389,7 +5389,7 @@ static int hdd_init_thermal_info(hdd_context_t *hdd_ctx) status = sme_init_thermal_info(hdd_ctx->hHal, thermal_param); if (!QDF_IS_STATUS_SUCCESS(status)) - return cdf_status_to_os_return(status); + return qdf_status_to_os_return(status); sme_add_set_thermal_level_callback(hdd_ctx->hHal, hdd_set_thermal_level_cb); diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 9b17d2fcc658..428ced7da3ce 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -274,7 +274,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) } pHddStaCtx->conn_info.staId[0] = peer_id; - cdf_copy_macaddr(&pHddStaCtx->conn_info.peerMacAddress[0], + qdf_copy_macaddr(&pHddStaCtx->conn_info.peerMacAddress[0], &adapter->macAddressCurrent); return 0; @@ -531,7 +531,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, * First channel uses the adapter's address. */ if (i == 0) { - cdf_copy_macaddr(&curr_chan->mac_address, + qdf_copy_macaddr(&curr_chan->mac_address, &adapter->macAddressCurrent); } else { mac_addr = wlan_hdd_get_intf_addr(adapter->pHddCtx); @@ -877,7 +877,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, */ for (i = 0; i < config->channel_count; i++) { if (i == 0) { - cdf_copy_macaddr(&config->channels[i].mac_address, + qdf_copy_macaddr(&config->channels[i].mac_address, &adapter->macAddressCurrent); } else { mac_addr = wlan_hdd_get_intf_addr(adapter->pHddCtx); @@ -888,7 +888,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, cdf_mem_copy(config->channels[i].mac_address.bytes, mac_addr, QDF_MAC_ADDR_SIZE); /* Save the mac address to release later */ - cdf_copy_macaddr(&adapter->ocb_mac_address[ + qdf_copy_macaddr(&adapter->ocb_mac_address[ adapter->ocb_mac_addr_count], &config->channels[i].mac_address); adapter->ocb_mac_addr_count++; diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index d877d4e180d3..f2247e247b7f 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -554,7 +554,7 @@ static int oem_process_set_cap_req_msg(int oem_cap_len, (struct sme_oem_capability *)oem_cap); if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("error updating rm capability, status: %d", status); - error_code = cdf_status_to_os_return(status); + error_code = qdf_status_to_os_return(status); skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index bccdda97cd98..73ed40953d24 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -135,7 +135,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) } else { if ((eConnectionState_Associated == pHddStaCtx->conn_info.connState) - && (cdf_is_macaddr_equal(&pHddStaCtx->gtkOffloadReqParams.bssid, + && (qdf_is_macaddr_equal(&pHddStaCtx->gtkOffloadReqParams.bssid, &pHddStaCtx->conn_info.bssId)) && (GTK_OFFLOAD_ENABLE == pHddStaCtx->gtkOffloadReqParams.ulFlags)) { @@ -387,7 +387,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) } offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD; offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE; - cdf_copy_macaddr(&offLoadRequest.nsOffloadInfo.self_macaddr, + qdf_copy_macaddr(&offLoadRequest.nsOffloadInfo.self_macaddr, &pAdapter->macAddressCurrent); /* set number of ns offload address count */ offLoadRequest.num_ns_offload_count = count; diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 97348a9b972b..cf5dee07d2b4 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -787,7 +787,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanRequest.scanType = eSIR_PASSIVE_SCAN; } - cdf_set_macaddr_broadcast(&scanRequest.bssid); + qdf_set_macaddr_broadcast(&scanRequest.bssid); /* set min and max channel time to zero */ scanRequest.minChnTime = 0; diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index e278ca7e9fee..32eed9c5f51e 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -200,8 +200,8 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pDestMacAddress = (struct qdf_mac_addr *) skb->data; - if (cdf_is_macaddr_broadcast(pDestMacAddress) || - cdf_is_macaddr_group(pDestMacAddress)) { + if (qdf_is_macaddr_broadcast(pDestMacAddress) || + qdf_is_macaddr_group(pDestMacAddress)) { /* The BC/MC station ID is assigned during BSS * starting phase. SAP will return the station ID * used for BC/MC traffic. @@ -450,7 +450,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, pAdapter->aStaInfo[STAId].isUsed = true; pAdapter->aStaInfo[STAId].isDeauthInProgress = false; - cdf_copy_macaddr(&pAdapter->aStaInfo[STAId].macAddrSTA, pmacAddrSTA); + qdf_copy_macaddr(&pAdapter->aStaInfo[STAId].macAddrSTA, pmacAddrSTA); spin_unlock_bh(&pAdapter->staInfo_lock); return QDF_STATUS_SUCCESS; @@ -866,7 +866,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, } if (false == - cdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, + qdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, pDestMacAddress)) { CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index ad81149f513c..19d1d98ef447 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -553,7 +553,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, pInfo->mode = hdd_map_device_to_ll_iface_mode(pAdapter->device_mode); - cdf_copy_macaddr(&pInfo->macAddr, &pAdapter->macAddressCurrent); + qdf_copy_macaddr(&pInfo->macAddr, &pAdapter->macAddressCurrent); if (((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || @@ -585,7 +585,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, if (eConnectionState_Associated == pHddStaCtx->conn_info.connState) { pInfo->state = WIFI_ASSOCIATED; - cdf_copy_macaddr(&pInfo->bssid, + qdf_copy_macaddr(&pInfo->bssid, &pHddStaCtx->conn_info.bssId); cdf_mem_copy(pInfo->ssid, pHddStaCtx->conn_info.SSID.SSID.ssId, diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 6a0162ec5bcd..209947de7612 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -132,7 +132,7 @@ void hdd_tx_resume_cb(void *adapter_context, bool tx_resume) tx_flow_control_timer)) { cdf_mc_timer_stop(&pAdapter->tx_flow_control_timer); } - if (cdf_unlikely(hdd_sta_ctx->hdd_ReassocScenario)) { + if (qdf_unlikely(hdd_sta_ctx->hdd_ReassocScenario)) { hddLog(LOGW, FL("flow control, tx queues un-pause avoided as we are in REASSOCIATING state")); return; @@ -331,8 +331,8 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) STAId = HDD_WLAN_INVALID_STA_ID; if ((STAId == HDD_WLAN_INVALID_STA_ID) && - (cdf_is_macaddr_broadcast(pDestMacAddress) || - cdf_is_macaddr_group(pDestMacAddress))) { + (qdf_is_macaddr_broadcast(pDestMacAddress) || + qdf_is_macaddr_group(pDestMacAddress))) { STAId = pHddStaCtx->broadcast_ibss_staid; CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet", diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index f710d2dd002c..d2441109d8ff 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1350,7 +1350,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, context.pAdapter = pAdapter; context.magic = LINK_CONTEXT_MAGIC; - cdf_copy_macaddr(&linkspeed_req->peer_macaddr, &macAddress); + qdf_copy_macaddr(&linkspeed_req->peer_macaddr, &macAddress); status = sme_get_link_speed(WLAN_HDD_GET_HAL_CTX(pAdapter), linkspeed_req, &context, hdd_get_link_speed_cb); @@ -1421,7 +1421,7 @@ int wlan_hdd_get_link_speed(hdd_adapter_t *sta_adapter, uint32_t *link_speed) QDF_STATUS status; struct qdf_mac_addr bssid; - cdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); + qdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId); status = wlan_hdd_get_linkspeed_for_peermac(sta_adapter, bssid); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -1554,7 +1554,7 @@ void hdd_clear_roam_profile_ie(hdd_adapter_t *pAdapter) pAdapter->wapi_info.nWapiMode = 0; #endif - cdf_zero_macaddr(&pWextState->req_bssId); + qdf_zero_macaddr(&pWextState->req_bssId); } @@ -4107,7 +4107,7 @@ static int __iw_set_encodeext(struct net_device *dev, if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { /*Key direction for group is RX only */ setKey.keyDirection = eSIR_RX_ONLY; - cdf_set_macaddr_broadcast(&setKey.peerMac); + qdf_set_macaddr_broadcast(&setKey.peerMac); } else { setKey.keyDirection = eSIR_TX_RX; @@ -5072,7 +5072,7 @@ static int __iw_setint_getnone(struct net_device *dev, { struct qdf_mac_addr bssid; - cdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); + qdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); if (sme_set_tx_power (hHal, pAdapter->sessionId, bssid, pAdapter->device_mode, @@ -5091,8 +5091,8 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(CDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm", __func__, set_value); - cdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); - cdf_copy_macaddr(&selfMac, &pHddStaCtx->conn_info.bssId); + qdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); + qdf_copy_macaddr(&selfMac, &pHddStaCtx->conn_info.bssId); if (sme_set_max_tx_power(hHal, bssid, selfMac, set_value) != QDF_STATUS_SUCCESS) { diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 8f9dc21e9899..e8298e5a69a4 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -1656,7 +1656,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, static uint16_t hdd_get_queue_index(uint16_t up, bool is_eapol) { - if (cdf_unlikely(is_eapol == true)) + if (qdf_unlikely(is_eapol == true)) return HDD_LINUX_AC_HI_PRIO; else return hdd_linux_up_to_ac_map[up]; diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index def8b33625f0..85ed2390751d 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -522,7 +522,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) wowParams.ucMagicPktEnable = enable_mp; wowParams.sessionId = pAdapter->sessionId; if (enable_mp) { - cdf_copy_macaddr(&wowParams.magic_ptrn, + qdf_copy_macaddr(&wowParams.magic_ptrn, &pAdapter->macAddressCurrent); } #ifdef WLAN_WAKEUP_EVENTS diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index d8dae1f1b803..074ba2f353ff 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -755,7 +755,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, lim_log(pMac, LOGW, FL("Lim Posting DEAUTH_CNF to Sme. Trigger: %d"), mlmStaContext.cleanupTrigger); - cdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &sta_dsaddr); + qdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &sta_dsaddr); mlmDeauthCnf.resultCode = statusCode; mlmDeauthCnf.deauthTrigger = mlmStaContext.cleanupTrigger; /* PE session Id */ diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index b0c042ce038a..ea9da9df20e3 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -1494,7 +1494,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf) extSetStaKeyParam; cdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq)); - cdf_copy_macaddr(&pMlmSetKeysReq->peer_macaddr, + qdf_copy_macaddr(&pMlmSetKeysReq->peer_macaddr, &pKeyInfo->bssid); pMlmSetKeysReq->sessionId = psessionEntry->peSessionId; pMlmSetKeysReq->smesessionId = psessionEntry->smeSessionId; @@ -1545,7 +1545,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf) FL("BSSID = " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pKeyInfo->bssid.bytes));) - cdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr, + qdf_copy_macaddr(&pAddBssParams->extSetStaKeyParam.peer_macaddr, &pKeyInfo->bssid); pAddBssParams->extSetStaKeyParam.sendRsp = false; diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 3a7dba6e0164..443f932ad38c 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -98,10 +98,10 @@ static QDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, msg.bodyptr = pScanOffloadReq; msg.bodyval = 0; - cdf_copy_macaddr(&pScanOffloadReq->selfMacAddr, + qdf_copy_macaddr(&pScanOffloadReq->selfMacAddr, &pRemOnChnReq->selfMacAddr); - cdf_set_macaddr_broadcast(&pScanOffloadReq->bssId); + qdf_set_macaddr_broadcast(&pScanOffloadReq->bssId); pScanOffloadReq->scanType = eSIR_PASSIVE_SCAN; pScanOffloadReq->p2pScanType = P2P_SCAN_TYPE_LISTEN; pScanOffloadReq->minChannelTime = pRemOnChnReq->duration; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 8bc3232a265e..8b11676d0a93 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -389,7 +389,7 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx) } /* Now copy over the information to the OEM DATA REQ to HAL */ - cdf_copy_macaddr(&start_oem_data_req->selfMacAddr, + qdf_copy_macaddr(&start_oem_data_req->selfMacAddr, &mac_ctx->lim.gpLimMlmOemDataReq->selfMacAddr); start_oem_data_req->data_len = @@ -1618,7 +1618,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: case eLIM_BT_AMP_STA_ROLE: - if (!cdf_is_macaddr_equal(&mlm_disassocreq->peer_macaddr, + if (!qdf_is_macaddr_equal(&mlm_disassocreq->peer_macaddr, &curr_bssid)) { lim_log(mac_ctx, LOGW, FL("received MLM_DISASSOC_REQ with invalid BSS id")); @@ -1650,7 +1650,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, sme_disassoc_rsp->transactionId = 0; sme_disassoc_rsp->statusCode = eSIR_SME_DEAUTH_STATUS; - cdf_copy_macaddr(&sme_disassoc_rsp->peer_macaddr, + qdf_copy_macaddr(&sme_disassoc_rsp->peer_macaddr, &mlm_disassocreq->peer_macaddr); msg = (uint32_t *)sme_disassoc_rsp; @@ -2147,7 +2147,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, session, true); return; end: - cdf_copy_macaddr(&mlm_deauth_cnf.peer_macaddr, + qdf_copy_macaddr(&mlm_deauth_cnf.peer_macaddr, &mlm_deauth_req->peer_macaddr); mlm_deauth_cnf.deauthTrigger = mlm_deauth_req->deauthTrigger; mlm_deauth_cnf.aid = mlm_deauth_req->aid; @@ -2271,9 +2271,9 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * check if TDLS is enabled. */ #ifndef FEATURE_WLAN_TDLS - if ((!cdf_is_macaddr_broadcast( + if ((!qdf_is_macaddr_broadcast( &mlm_set_keys_req->peer_macaddr)) && - (!cdf_is_macaddr_equal(&mlm_set_keys_req->peer_macaddr, + (!qdf_is_macaddr_equal(&mlm_set_keys_req->peer_macaddr, &curr_bssid))) { lim_log(mac_ctx, LOGW, FL("Received MLM_SETKEYS_REQ with invalid BSSID" @@ -2306,7 +2306,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * mlm_set_keys_req->key.unicast = 0 -> Multicast/broadcast * mlm_set_keys_req->key.unicast - 1 -> Unicast keys are being set */ - if (cdf_is_macaddr_broadcast(&mlm_set_keys_req->peer_macaddr)) { + if (qdf_is_macaddr_broadcast(&mlm_set_keys_req->peer_macaddr)) { lim_log(mac_ctx, LOG1, FL("Trying to set Group Keys...%d "), mlm_set_keys_req->sessionId); /* @@ -2379,7 +2379,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) FL("Trying to set keys for STA Index [%d], using default_key_id [%d]"), sta_idx, default_key_id); - if (cdf_is_macaddr_broadcast(&mlm_set_keys_req->peer_macaddr)) { + if (qdf_is_macaddr_broadcast(&mlm_set_keys_req->peer_macaddr)) { session->limPrevMlmState = session->limMlmState; session->limMlmState = eLIM_MLM_WT_SET_BSS_KEY_STATE; MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index ea57afd4322b..04edc0c4eaab 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -3260,7 +3260,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx, (tpLimMlmSetKeysReq) mac_ctx->lim.gpLimMlmSetKeysReq; /* Prepare and Send LIM_MLM_SETKEYS_CNF */ if (NULL != lpLimMlmSetKeysReq) { - cdf_copy_macaddr(&mlm_set_key_cnf.peer_macaddr, + qdf_copy_macaddr(&mlm_set_key_cnf.peer_macaddr, &lpLimMlmSetKeysReq->peer_macaddr); /* * Free the buffer cached for the global @@ -3348,7 +3348,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, /* Prepare and Send LIM_MLM_SETKEYS_CNF */ if (NULL != set_key_req) { - cdf_copy_macaddr(&set_key_cnf.peer_macaddr, + qdf_copy_macaddr(&set_key_cnf.peer_macaddr, &set_key_req->peer_macaddr); /* * Free the buffer cached for the diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 2812253e6fb5..b270237434a0 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -81,7 +81,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() / QDF_TICKS_PER_SECOND); - cdf_zero_macaddr(&addr); + qdf_zero_macaddr(&addr); cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); for (pbc = session->pAPWPSPBCSession; pbc; pbc = pbc->next) { if (cur_time > pbc->timestamp + SIR_WPS_PBC_WALK_TIME) @@ -89,7 +89,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, count++; if (count > 1) break; - cdf_copy_macaddr(&addr, &pbc->addr); + qdf_copy_macaddr(&addr, &pbc->addr); cdf_mem_copy((uint8_t *) uuid_e, (uint8_t *) pbc->uuid_e, SIR_WPS_UUID_LEN); } @@ -159,7 +159,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac, prev = pbc = session_entry->pAPWPSPBCSession; while (pbc) { - if (cdf_is_macaddr_equal(&pbc->addr, &remove_mac)) { + if (qdf_is_macaddr_equal(&pbc->addr, &remove_mac)) { prev->next = pbc->next; if (pbc == session_entry->pAPWPSPBCSession) session_entry->pAPWPSPBCSession = pbc->next; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 4111fbb5176b..60cd82f72f4f 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -358,7 +358,7 @@ __lim_fresh_scan_reqd(tpAniSirGlobal mac_ctx, uint8_t return_fresh_results) static inline uint8_t __lim_is_sme_assoc_cnf_valid(tpSirSmeAssocCnf pAssocCnf) { - if (cdf_is_macaddr_group(&pAssocCnf->peer_macaddr)) + if (qdf_is_macaddr_group(&pAssocCnf->peer_macaddr)) return false; else return true; @@ -1232,7 +1232,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, msg.bodyptr = pScanOffloadReq; msg.bodyval = 0; - cdf_copy_macaddr(&pScanOffloadReq->bssId, &pScanReq->bssId); + qdf_copy_macaddr(&pScanOffloadReq->bssId, &pScanReq->bssId); if (pScanReq->numSsid > SIR_SCAN_MAX_NUM_SSID) { lim_log(pMac, LOGE, @@ -1251,7 +1251,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, } pScanOffloadReq->hiddenSsid = pScanReq->hiddenSsid; - cdf_copy_macaddr(&pScanOffloadReq->selfMacAddr, &pScanReq->selfMacAddr); + qdf_copy_macaddr(&pScanOffloadReq->selfMacAddr, &pScanReq->selfMacAddr); pScanOffloadReq->bssType = pScanReq->bssType; pScanOffloadReq->dot11mode = pScanReq->dot11mode; pScanOffloadReq->scanType = pScanReq->scanType; @@ -1461,7 +1461,7 @@ static void __lim_process_sme_oem_data_req(tpAniSirGlobal pMac, uint32_t *pMsgBu return; } - cdf_copy_macaddr(&pMlmOemDataReq->selfMacAddr, + qdf_copy_macaddr(&pMlmOemDataReq->selfMacAddr, &pOemDataReq->selfMacAddr); pMlmOemDataReq->data_len = pOemDataReq->data_len; cdf_mem_copy(pMlmOemDataReq->data, pOemDataReq->data, @@ -2538,7 +2538,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu return; } - cdf_copy_macaddr(&pMlmDisassocReq->peer_macaddr, + qdf_copy_macaddr(&pMlmDisassocReq->peer_macaddr, &smeDisassocReq.peer_macaddr); pMlmDisassocReq->reasonCode = reasonCode; @@ -2874,7 +2874,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx, return; } - cdf_copy_macaddr(&mlm_deauth_req->peer_macaddr, + qdf_copy_macaddr(&mlm_deauth_req->peer_macaddr, &sme_deauth_req.peer_macaddr); mlm_deauth_req->reasonCode = reason_code; @@ -2990,7 +2990,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) "no.of keys exceeded max num of default keys limit")); goto end; } - cdf_copy_macaddr(&mlm_set_key_req->peer_macaddr, + qdf_copy_macaddr(&mlm_set_key_req->peer_macaddr, &set_context_req->peer_macaddr); cdf_mem_copy((uint8_t *) &mlm_set_key_req->key, @@ -3211,7 +3211,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, sap_event.sapHddEventCode = eSAP_GET_WPSPBC_SESSION_EVENT; sap_get_wpspbc_event->module = QDF_MODULE_ID_PE; - if (cdf_is_macaddr_zero(&get_wps_pbc_sessions_req.remove_mac)) { + if (qdf_is_macaddr_zero(&get_wps_pbc_sessions_req.remove_mac)) { lim_get_wpspbc_sessions(mac_ctx, sap_get_wpspbc_event->addr, sap_get_wpspbc_event->UUID_E, diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index d373967f78a2..ed749a919bcc 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2862,7 +2862,7 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, } pTdlsLinkEstablishReqRsp->statusCode = status; if (peermac) - cdf_copy_macaddr(&pTdlsLinkEstablishReqRsp->peermac, peermac); + qdf_copy_macaddr(&pTdlsLinkEstablishReqRsp->peermac, peermac); pTdlsLinkEstablishReqRsp->sessionId = sessionId; mmhMsg.type = eWNI_SME_TDLS_LINK_ESTABLISH_RSP; @@ -2898,7 +2898,7 @@ static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, } else pDelSta->staId = STA_INVALID_IDX; - cdf_copy_macaddr(&pDelSta->peermac, &peerMac); + qdf_copy_macaddr(&pDelSta->peermac, &peerMac); pDelSta->length = sizeof(tSirTdlsDelStaRsp); pDelSta->messageType = eWNI_SME_TDLS_DEL_STA_RSP; diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 40d51323688b..aa1f8ff87f67 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -108,7 +108,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType, return false; } else - return ((algoEnable > 0 ? true : false)); + return algoEnable > 0 ? true : false; } else { if (LIM_IS_AP_ROLE(psessionEntry)) { @@ -138,8 +138,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType, } else if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, - &privacyOptImp) != eSIR_SUCCESS) - { + &privacyOptImp) != eSIR_SUCCESS) { /** * Could not get PrivacyOptionImplemented value * from CFG. Log error. @@ -150,7 +149,7 @@ lim_is_auth_algo_supported(tpAniSirGlobal pMac, tAniAuthType authType, return false; } - return (algoEnable && privacyOptImp); + return algoEnable && privacyOptImp; } } /****** end lim_is_auth_algo_supported() ******/ @@ -775,7 +774,7 @@ void lim_post_sme_set_keys_cnf(tpAniSirGlobal pMac, tLimMlmSetKeysCnf *mlmSetKeysCnf) { /* Prepare and Send LIM_MLM_SETKEYS_CNF */ - cdf_copy_macaddr(&mlmSetKeysCnf->peer_macaddr, + qdf_copy_macaddr(&mlmSetKeysCnf->peer_macaddr, &pMlmSetKeysReq->peer_macaddr); /* Free up buffer allocated for mlmSetKeysReq */ @@ -882,7 +881,8 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac, lim_log(pMac, LOGW, FL("Sending WMA_SET_BSSKEY_REQ...")); MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { lim_log(pMac, LOGE, FL("Posting SET_BSSKEY to HAL failed, reason=%X"), retCode); @@ -964,7 +964,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, pSetStaKeyParams->defWEPIdx = defWEPIdx; pSetStaKeyParams->smesessionId = pMlmSetKeysReq->smesessionId; - cdf_copy_macaddr(&pSetStaKeyParams->peer_macaddr, + qdf_copy_macaddr(&pSetStaKeyParams->peer_macaddr, &pMlmSetKeysReq->peer_macaddr); if (sendRsp == true) { @@ -1056,7 +1056,8 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("Sending WMA_SET_STAKEY_REQ...")); MTRACE(mac_trace_msg_tx(pMac, sessionEntry->peSessionId, msgQ.type)); - if (eSIR_SUCCESS != (retCode = wma_post_ctrl_msg(pMac, &msgQ))) { + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { lim_log(pMac, LOGE, FL("Posting SET_STAKEY to HAL failed, reason=%X"), retCode); diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 44eb43356775..b108064d5793 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -3111,7 +3111,7 @@ QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) } return QDF_STATUS_SUCCESS; end: - cdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, + qdf_copy_macaddr(&mlmDeauthCnf.peer_macaddr, &pMlmDeauthReq->peer_macaddr); mlmDeauthCnf.deauthTrigger = pMlmDeauthReq->deauthTrigger; mlmDeauthCnf.aid = pMlmDeauthReq->aid; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 54dcee72e735..f7934499483a 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -1581,7 +1581,7 @@ lim_send_sme_set_context_rsp(tpAniSirGlobal pMac, pSirSmeSetContextRsp->length = sizeof(tSirSmeSetContextRsp); pSirSmeSetContextRsp->statusCode = resultCode; - cdf_copy_macaddr(&pSirSmeSetContextRsp->peer_macaddr, &peer_macaddr); + qdf_copy_macaddr(&pSirSmeSetContextRsp->peer_macaddr, &peer_macaddr); /* Update SME session and transaction Id */ pSirSmeSetContextRsp->sessionId = smesessionId; @@ -1769,7 +1769,7 @@ lim_send_sme_delts_rsp(tpAniSirGlobal pMac, tpSirDeltsReq delts, uint32_t status if (psessionEntry != NULL) { rsp->aid = delts->aid; - cdf_copy_macaddr(&rsp->macaddr, &delts->macaddr); + qdf_copy_macaddr(&rsp->macaddr, &delts->macaddr); cdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) &delts->req, sizeof(tSirDeltsReqInfo)); } diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c index 9f3825150ee5..88c021efee9e 100644 --- a/core/mac/src/pe/lim/lim_sme_req_utils.c +++ b/core/mac/src/pe/lim/lim_sme_req_utils.c @@ -585,8 +585,8 @@ lim_is_sme_disassoc_req_valid(tpAniSirGlobal pMac, tpSirSmeDisassocReq pDisassocReq, tpPESession psessionEntry) { - if (cdf_is_macaddr_group(&pDisassocReq->peer_macaddr) && - !cdf_is_macaddr_broadcast(&pDisassocReq->peer_macaddr)) + if (qdf_is_macaddr_group(&pDisassocReq->peer_macaddr) && + !qdf_is_macaddr_broadcast(&pDisassocReq->peer_macaddr)) return false; return true; @@ -618,7 +618,7 @@ lim_is_sme_disassoc_cnf_valid(tpAniSirGlobal pMac, tpSirSmeDisassocCnf pDisassocCnf, tpPESession psessionEntry) { - if (cdf_is_macaddr_group(&pDisassocCnf->peer_macaddr)) + if (qdf_is_macaddr_group(&pDisassocCnf->peer_macaddr)) return false; return true; @@ -648,8 +648,8 @@ uint8_t lim_is_sme_deauth_req_valid(tpAniSirGlobal pMac, tpSirSmeDeauthReq pDeauthReq, tpPESession psessionEntry) { - if (cdf_is_macaddr_group(&pDeauthReq->peer_macaddr) && - !cdf_is_macaddr_broadcast(&pDeauthReq->peer_macaddr)) + if (qdf_is_macaddr_group(&pDeauthReq->peer_macaddr) && + !qdf_is_macaddr_broadcast(&pDeauthReq->peer_macaddr)) return false; return true; @@ -699,8 +699,8 @@ uint8_t lim_is_sme_scan_req_valid(tpAniSirGlobal pMac, tpSirSmeScanReq pScanReq) lim_log(pMac, LOGE, FL("Invalid BSS Type")); valid = false; } - if (cdf_is_macaddr_group(&pScanReq->bssId) && - !cdf_is_macaddr_broadcast(&pScanReq->bssId)) { + if (qdf_is_macaddr_group(&pScanReq->bssId) && + !qdf_is_macaddr_broadcast(&pScanReq->bssId)) { valid = false; lim_log(pMac, LOGE, FL("BSSID is group addr and is not Broadcast Addr")); @@ -923,5 +923,5 @@ uint8_t *lim_get_bss_id_from_sme_join_req_msg(uint8_t *pBuf) pBuf += sizeof(uint16_t); /* skip length of BSS description */ - return (pBuf); + return pBuf; } /*** end lim_get_bss_id_from_sme_join_req_msg() ***/ diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 2971942dc816..05af857782c0 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -216,7 +216,7 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ) tpPESession pSessionEntry; uint8_t sessionId, i; - if (cdf_is_macaddr_broadcast(&pMaxTxParams->bssId)) { + if (qdf_is_macaddr_broadcast(&pMaxTxParams->bssId)) { for (i = 0; i < pMac->lim.maxBssId; i++) { if ((pMac->lim.gpSession[i].valid == true)) { pSessionEntry = &pMac->lim.gpSession[i]; diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index 34066be04e44..28030a6d98a1 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -50,7 +50,7 @@ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_assert */ +#include /* qdf_assert */ #include /* cdf_spinlock */ #include /* TAILQ */ #include diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 1ee12118004f..fea29a4f7a6d 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -49,7 +49,7 @@ #include "cds_utils.h" #include "cds_ieee80211_common_i.h" #include "cds_reg_service.h" -#include "cdf_util.h" +#include "qdf_util.h" #include "cds_concurrency.h" /*---------------------------------------------------------------------------- @@ -2488,7 +2488,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_ap_event.sapHddEventCode = eSAP_STA_ASSOC_IND; assoc_ind = &sap_ap_event.sapevt.sapAssocIndication; - cdf_copy_macaddr(&assoc_ind->staMac, &csr_roaminfo->peerMac); + qdf_copy_macaddr(&assoc_ind->staMac, &csr_roaminfo->peerMac); assoc_ind->staId = csr_roaminfo->staId; assoc_ind->status = 0; /* Required for indicating the frames to upper layer */ @@ -2569,7 +2569,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, else sap_ap_event.sapHddEventCode = eSAP_STA_ASSOC_EVENT; - cdf_copy_macaddr(&reassoc_complete->staMac, + qdf_copy_macaddr(&reassoc_complete->staMac, &csr_roaminfo->peerMac); reassoc_complete->staId = csr_roaminfo->staId; reassoc_complete->statusCode = csr_roaminfo->statusCode; @@ -2621,7 +2621,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, disassoc_comp = &sap_ap_event.sapevt.sapStationDisassocCompleteEvent; - cdf_copy_macaddr(&disassoc_comp->staMac, + qdf_copy_macaddr(&disassoc_comp->staMac, &csr_roaminfo->peerMac); disassoc_comp->staId = csr_roaminfo->staId; if (csr_roaminfo->reasonCode == eCSR_ROAM_RESULT_FORCED) @@ -2638,7 +2638,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, key_complete = &sap_ap_event.sapevt.sapStationSetKeyCompleteEvent; key_complete->status = (eSapStatus) context; - cdf_copy_macaddr(&key_complete->peerMacAddr, + qdf_copy_macaddr(&key_complete->peerMacAddr, &csr_roaminfo->peerMac); break; @@ -2707,7 +2707,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, case eSAP_MAX_ASSOC_EXCEEDED: sap_ap_event.sapHddEventCode = eSAP_MAX_ASSOC_EXCEEDED; - cdf_copy_macaddr(&sap_ap_event.sapevt. + qdf_copy_macaddr(&sap_ap_event.sapevt. sapMaxAssocExceeded.macaddr, &csr_roaminfo->peerMac); break; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index a049ee9ee2b3..a84d010820ed 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -43,7 +43,7 @@ * Include Files * -------------------------------------------------------------------------*/ #include "cdf_trace.h" -#include "cdf_util.h" +#include "qdf_util.h" /* Pick up the sme callback registration API */ #include "sme_api.h" @@ -3103,7 +3103,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, struct tagCsrDelStaParams *pDelStaParams) { if (NULL == mac) - cdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); + qdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); else cdf_mem_copy(pDelStaParams->peerMacAddr.bytes, mac, QDF_MAC_ADDR_SIZE); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 80a43d5792a1..d1f0c5324d11 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1455,7 +1455,7 @@ QDF_STATUS sme_update_roam_params(tHalHandle hal, roam_params_dst->num_bssid_avoid_list = roam_params_src.num_bssid_avoid_list; for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { - cdf_copy_macaddr(&roam_params_dst->bssid_avoid_list[i], + qdf_copy_macaddr(&roam_params_dst->bssid_avoid_list[i], &roam_params_src.bssid_avoid_list[i]); } break; @@ -5187,7 +5187,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, QDF_MAC_ADDR_SIZE); - cdf_copy_macaddr(&pMsg->peerMacAddr, + qdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); cds_message.type = WMA_DHCP_START_IND; @@ -5258,7 +5258,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg->device_mode = device_mode; cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, QDF_MAC_ADDR_SIZE); - cdf_copy_macaddr(&pMsg->peerMacAddr, + qdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); cds_message.type = WMA_DHCP_STOP_IND; @@ -5808,7 +5808,7 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&pGtkOffload->bssid, + qdf_copy_macaddr(&pGtkOffload->bssid, &pSession->connectedProfile.bssid); *request_buf = *pGtkOffload; @@ -5861,7 +5861,7 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&request_buf->bssid, + qdf_copy_macaddr(&request_buf->bssid, &pSession->connectedProfile.bssid); msg.type = WMA_GTK_OFFLOAD_GETINFO_REQ; @@ -5925,7 +5925,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); + qdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, @@ -7308,8 +7308,8 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, cdf_mem_copy(request_buf, pMulticastAddrs, sizeof(tSirRcvFltMcAddrList)); - cdf_copy_macaddr(&request_buf->self_macaddr, &pSession->selfMacAddr); - cdf_copy_macaddr(&request_buf->bssid, + qdf_copy_macaddr(&request_buf->self_macaddr, &pSession->selfMacAddr); + qdf_copy_macaddr(&request_buf->bssid, &pSession->connectedProfile.bssid); msg.type = WMA_8023_MULTICAST_LIST_REQ; @@ -7361,9 +7361,9 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - cdf_copy_macaddr(&pRcvPktFilterCfg->self_macaddr, + qdf_copy_macaddr(&pRcvPktFilterCfg->self_macaddr, &pSession->selfMacAddr); - cdf_copy_macaddr(&pRcvPktFilterCfg->bssid, + qdf_copy_macaddr(&pRcvPktFilterCfg->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, pRcvPktFilterCfg, allocSize); @@ -7449,9 +7449,9 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&pRcvFltPktClearParam->self_macaddr, + qdf_copy_macaddr(&pRcvFltPktClearParam->self_macaddr, &pSession->selfMacAddr); - cdf_copy_macaddr(&pRcvFltPktClearParam->bssid, + qdf_copy_macaddr(&pRcvFltPktClearParam->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, pRcvFltPktClearParam, @@ -7617,8 +7617,8 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&pMaxTxParams->bssId, &pBssid); - cdf_copy_macaddr(&pMaxTxParams->selfStaMacAddr, &pSelfMacAddress); + qdf_copy_macaddr(&pMaxTxParams->bssId, &pBssid); + qdf_copy_macaddr(&pMaxTxParams->selfStaMacAddr, &pSelfMacAddress); pMaxTxParams->power = dB; msg.type = WMA_SET_MAX_TX_POWER_REQ; @@ -7711,7 +7711,7 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&pTxParams->bssId, &pBSSId); + qdf_copy_macaddr(&pTxParams->bssId, &pBSSId); pTxParams->power = power; /* unit is dBm */ pTxParams->dev_mode = dev_mode; msg.type = WMA_SET_TX_POWER_REQ; diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 55f16d851fdd..8c752f6830ad 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -329,7 +329,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, } } - cdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); + qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); msg->smeSessionId = session_id; sms_log(mac_ctx, LOG1, "BSSID = " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(msg->bssid.bytes)); diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 7dbc3dfa51fd..6ab06edc32e7 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -257,7 +257,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, hal_wowl_params->ucMagicPktEnable = sme_wowl_params->ucMagicPktEnable; hal_wowl_params->ucPatternFilteringEnable = sme_wowl_params->ucPatternFilteringEnable; - cdf_copy_macaddr(&hal_wowl_params->magic_ptrn, + qdf_copy_macaddr(&hal_wowl_params->magic_ptrn, &sme_wowl_params->magic_ptrn); #ifdef WLAN_WAKEUP_EVENTS @@ -989,7 +989,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, return QDF_STATUS_E_NOMEM; } - cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); + qdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); cdf_mem_copy(request_buf, request, sizeof(tSirHostOffloadReq)); @@ -1031,7 +1031,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, return QDF_STATUS_E_FAILURE; } - cdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); + qdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b1924db12a91..cea2f1280b2f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -3051,7 +3051,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, (NewSubstate != eCSR_ROAM_SUBSTATE_DISASSOC_HANDOFF)) { tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - cdf_copy_macaddr(&bssId, + qdf_copy_macaddr(&bssId, pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs. bssid); } else if (pSession->pConnectBssDesc) { @@ -3189,7 +3189,7 @@ csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, pMsg->length = sizeof(tSirSmeTkipCntrMeasReq); pMsg->sessionId = sessionId; pMsg->transactionId = 0; - cdf_copy_macaddr(&pMsg->bssId, bssId); + qdf_copy_macaddr(&pMsg->bssId, bssId); pMsg->bEnable = bEnable; status = cds_send_mb_message_to_mac(pMsg); } while (0); @@ -6860,7 +6860,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, goto end; } pDstProfile->BSSIDs.numOfBSSIDs = 1; - cdf_copy_macaddr(pDstProfile->BSSIDs.bssid, &pSrcProfile->bssid); + qdf_copy_macaddr(pDstProfile->BSSIDs.bssid, &pSrcProfile->bssid); if (pSrcProfile->SSID.ssId) { pDstProfile->SSIDs.SSIDList = @@ -8836,7 +8836,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, /* notify HDD about handoff and provide the BSSID too */ roamInfo.reasonCode = eCsrRoamReasonBetterAP; - cdf_copy_macaddr(&roamInfo.bssid, + qdf_copy_macaddr(&roamInfo.bssid, pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs.bssid); csr_roam_call_callback(pMac, sessionId, &roamInfo, 0, @@ -9046,7 +9046,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) roamInfo.staId = (uint8_t) pIbssPeerInd->staId; roamInfo.ucastSig = (uint8_t) pIbssPeerInd->ucastSig; roamInfo.bcastSig = (uint8_t) pIbssPeerInd->bcastSig; - cdf_copy_macaddr(&roamInfo.peerMac, &pIbssPeerInd->peer_addr); + qdf_copy_macaddr(&roamInfo.peerMac, &pIbssPeerInd->peer_addr); csr_roam_call_callback(pMac, pSmeRsp->sessionId, &roamInfo, 0, eCSR_ROAM_CONNECT_STATUS_UPDATE, eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED); @@ -9408,7 +9408,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, pCommand->u.setKeyCmd.roamId = roamId; pCommand->u.setKeyCmd.encType = pSetKey->encType; pCommand->u.setKeyCmd.keyDirection = pSetKey->keyDirection; - cdf_copy_macaddr(&pCommand->u.setKeyCmd.peermac, + qdf_copy_macaddr(&pCommand->u.setKeyCmd.peermac, &pSetKey->peerMac); /* 0 for supplicant */ pCommand->u.setKeyCmd.paeRole = pSetKey->paeRole; @@ -9463,7 +9463,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma if (eSIR_ED_NONE != edType) { cdf_mem_set(&setKeyEvent, sizeof(host_event_wlan_security_payload_type), 0); - if (cdf_is_macaddr_group(&pCommand->u.setKeyCmd.peermac)) { + if (qdf_is_macaddr_group(&pCommand->u.setKeyCmd.peermac)) { setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_GTK_REQ; setKeyEvent.encryptionModeMulticast = (uint8_t) diag_enc_type_from_csr_type(pCommand->u. @@ -9532,7 +9532,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma eCSR_ROAM_RESULT_FAILURE); #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR if (eSIR_ED_NONE != edType) { - if (cdf_is_macaddr_group( + if (qdf_is_macaddr_group( &pCommand->u.setKeyCmd.peermac)) { setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_GTK_RSP; @@ -9936,7 +9936,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; - cdf_copy_macaddr(&pMsg->bssId, bssId); + qdf_copy_macaddr(&pMsg->bssId, bssId); sms_log(pMac, LOG1, FL("CSR reset caps change for Bssid= " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssId.bytes)); @@ -10112,9 +10112,9 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info_ptr->reasonCode = pDisassocInd->reasonCode; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; roam_info_ptr->staId = (uint8_t) pDisassocInd->staId; - cdf_copy_macaddr(&roam_info_ptr->peerMac, + qdf_copy_macaddr(&roam_info_ptr->peerMac, &pDisassocInd->peer_macaddr); - cdf_copy_macaddr(&roam_info_ptr->bssid, + qdf_copy_macaddr(&roam_info_ptr->bssid, &pDisassocInd->bssid); status = csr_roam_call_callback(mac_ctx, sessionId, roam_info_ptr, 0, @@ -10194,9 +10194,9 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info_ptr->reasonCode = pDeauthInd->reasonCode; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; roam_info_ptr->staId = (uint8_t) pDeauthInd->staId; - cdf_copy_macaddr(&roam_info_ptr->peerMac, + qdf_copy_macaddr(&roam_info_ptr->peerMac, &pDeauthInd->peer_macaddr); - cdf_copy_macaddr(&roam_info_ptr->bssid, + qdf_copy_macaddr(&roam_info_ptr->bssid, &pDeauthInd->bssid); status = csr_roam_call_callback(mac_ctx, sessionId, roam_info_ptr, 0, @@ -10256,7 +10256,7 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) if (CSR_IS_INFRA_AP(&session->connectedProfile)) { roam_info_ptr = &roam_info; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; - cdf_copy_macaddr(&roam_info_ptr->peerMac, + qdf_copy_macaddr(&roam_info_ptr->peerMac, &pDeauthRsp->peer_macaddr); roam_info_ptr->reasonCode = eCSR_ROAM_RESULT_FORCED; roam_info_ptr->statusCode = pDeauthRsp->statusCode; @@ -10290,7 +10290,7 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) if (CSR_IS_INFRA_AP(&session->connectedProfile)) { roam_info_ptr = &roam_info; roam_info_ptr->u.pConnectedProfile = &session->connectedProfile; - cdf_copy_macaddr(&roam_info_ptr->peerMac, + qdf_copy_macaddr(&roam_info_ptr->peerMac, &pDisassocRsp->peer_macaddr); roam_info_ptr->reasonCode = eCSR_ROAM_RESULT_FORCED; roam_info_ptr->statusCode = pDisassocRsp->statusCode; @@ -10394,7 +10394,7 @@ csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx, return; pIbssLog->eventId = WLAN_IBSS_EVENT_COALESCING; if (pNewBss) { - cdf_copy_macaddr(&pIbssLog->bssid, &pNewBss->bssId); + qdf_copy_macaddr(&pIbssLog->bssid, &pNewBss->bssId); if (pNewBss->ssId.length) cdf_mem_copy(pIbssLog->ssid, pNewBss->ssId.ssId, pNewBss->ssId.length); @@ -10583,7 +10583,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) LOG_WLAN_IBSS_C); if (pIbssLog) { pIbssLog->eventId = WLAN_IBSS_EVENT_PEER_JOIN; - cdf_copy_macaddr(&pIbssLog->peer_macaddr, + qdf_copy_macaddr(&pIbssLog->peer_macaddr, &pIbssPeerInd->peer_addr); WLAN_HOST_DIAG_LOG_REPORT(pIbssLog); } @@ -10606,7 +10606,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) sms_log(mac_ctx, LOGW, FL("CSR: connected BSS is empty")); goto callback_and_free; } - cdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); + qdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); if (pIbssPeerInd->mesgLen > sizeof(tSmeIbssPeerInd)) { @@ -10692,7 +10692,7 @@ csr_roam_chk_lnk_ibss_peer_departed_ind(tpAniSirGlobal mac_ctx, if (pIbssLog) { pIbssLog->eventId = WLAN_IBSS_EVENT_PEER_LEAVE; if (pIbssPeerInd) { - cdf_copy_macaddr(&pIbssLog->peer_macaddr, + qdf_copy_macaddr(&pIbssLog->peer_macaddr, &pIbssPeerInd->peer_addr); } WLAN_HOST_DIAG_LOG_REPORT(pIbssLog); @@ -10703,7 +10703,7 @@ csr_roam_chk_lnk_ibss_peer_departed_ind(tpAniSirGlobal mac_ctx, roam_info.staId = (uint8_t) pIbssPeerInd->staId; roam_info.ucastSig = (uint8_t) pIbssPeerInd->ucastSig; roam_info.bcastSig = (uint8_t) pIbssPeerInd->bcastSig; - cdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); + qdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); csr_roam_call_callback(mac_ctx, sessionId, &roam_info, 0, eCSR_ROAM_CONNECT_STATUS_UPDATE, eCSR_ROAM_RESULT_IBSS_PEER_DEPARTED); @@ -10723,7 +10723,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, return; cdf_mem_set(&setKeyEvent, sizeof(host_event_wlan_security_payload_type), 0); - if (cdf_is_macaddr_group(&pRsp->peer_macaddr)) + if (qdf_is_macaddr_group(&pRsp->peer_macaddr)) setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_GTK_RSP; else setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_PTK_RSP; @@ -10792,12 +10792,12 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) session->connectedProfile.bssid); } if (eSIR_SME_SUCCESS == pRsp->statusCode) { - cdf_copy_macaddr(&roam_info.peerMac, &pRsp->peer_macaddr); + qdf_copy_macaddr(&roam_info.peerMac, &pRsp->peer_macaddr); /* Make sure we install the GTK before indicating to HDD as * authenticated. This is to prevent broadcast packets go out * after PTK and before GTK. */ - if (cdf_is_macaddr_broadcast(&pRsp->peer_macaddr)) { + if (qdf_is_macaddr_broadcast(&pRsp->peer_macaddr)) { tpSirSetActiveModeSetBncFilterReq pMsg; pMsg = cdf_mem_malloc( sizeof(tSirSetActiveModeSetBncFilterReq)); @@ -10859,7 +10859,7 @@ csr_roam_chk_lnk_max_assoc_exceeded(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) FL("max assoc have been reached, new peer cannot be accepted")); sessionId = pSmeMaxAssocInd->sessionId; roam_info.sessionId = sessionId; - cdf_copy_macaddr(&roam_info.peerMac, &pSmeMaxAssocInd->peer_mac); + qdf_copy_macaddr(&roam_info.peerMac, &pSmeMaxAssocInd->peer_mac); csr_roam_call_callback(mac_ctx, sessionId, &roam_info, 0, eCSR_ROAM_INFRA_IND, eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED); @@ -11342,13 +11342,13 @@ QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode; if (eWNI_SME_DISASSOC_IND == type) { /* staMacAddr */ - cdf_copy_macaddr(&roamInfo.peerMac, + qdf_copy_macaddr(&roamInfo.peerMac, &pDisassocIndMsg->peer_macaddr); roamInfo.staId = (uint8_t) pDisassocIndMsg->staId; roamInfo.reasonCode = pDisassocIndMsg->reasonCode; } else if (eWNI_SME_DEAUTH_IND == type) { /* staMacAddr */ - cdf_copy_macaddr(&roamInfo.peerMac, + qdf_copy_macaddr(&roamInfo.peerMac, &pDeauthIndMsg->peer_macaddr); roamInfo.staId = (uint8_t) pDeauthIndMsg->staId; roamInfo.reasonCode = pDeauthIndMsg->reasonCode; @@ -12838,7 +12838,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, pmksa->BSSID.bytes, false); /* Add entry to the cache */ - cdf_copy_macaddr( + qdf_copy_macaddr( &pSession->PmkidCacheInfo[pSession->curr_cache_idx].BSSID, &pmksa->BSSID); cdf_mem_copy( @@ -12981,7 +12981,7 @@ QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, (i < CSR_MAX_PMKID_ALLOWED)); i++) { /* Fill the valid entries */ pmksa = &pSession->PmkidCacheInfo[i]; - if (!cdf_is_macaddr_zero(&pmksa->BSSID)) { + if (!qdf_is_macaddr_zero(&pmksa->BSSID)) { cdf_mem_copy(pPmkidCache, pmksa, sizeof(tPmkidCacheInfo)); pPmkidCache++; @@ -13127,8 +13127,8 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, tDot11fBeaconIEs *pIes; bool fMatch; - if ((cdf_is_macaddr_zero(&pConnProfile->bssid) || - cdf_is_macaddr_broadcast(&pConnProfile->bssid))) + if ((qdf_is_macaddr_zero(&pConnProfile->bssid) || + qdf_is_macaddr_broadcast(&pConnProfile->bssid))) return status; /* * Prepare the filter. Only fill in the necessary fields. Not all fields @@ -13248,7 +13248,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, } cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); /* Assume HDD provide bssid in profile */ - cdf_copy_macaddr(&pSession->bssParams.bssid, + qdf_copy_macaddr(&pSession->bssParams.bssid, pProfile->BSSIDs.bssid); /* there is no Bss description before we start an WDS so we need */ /* to adopt all Bss configuration parameters from the Profile. */ @@ -14055,7 +14055,7 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_GET_ASSOC_STAS_REQ; - cdf_copy_macaddr(&pMsg->bssid, &bssid); + qdf_copy_macaddr(&pMsg->bssid, &bssid); pMsg->modId = modId; cdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); cdf_mem_copy(pMsg->pSapEventCallback, @@ -14089,8 +14089,8 @@ csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, cdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); cdf_mem_copy(pMsg->pSapEventCallback, pfnSapEventCallback, sizeof(void *)); - cdf_copy_macaddr(&pMsg->bssid, &bssid); - cdf_copy_macaddr(&pMsg->remove_mac, &remove_mac); + qdf_copy_macaddr(&pMsg->bssid, &bssid); + qdf_copy_macaddr(&pMsg->remove_mac, &remove_mac); pMsg->length = sizeof(struct sSirSmeGetWPSPBCSessionsReq); status = cds_send_mb_message_to_mac(pMsg); } while (0); @@ -14127,7 +14127,7 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi pMsg->messageType = eWNI_SME_CHNG_MCC_BEACON_INTERVAL; pMsg->length = len; - cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); sms_log(pMac, LOG1, FL("CSR Attempting to change BI for Bssid= " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssid.bytes)); @@ -14169,7 +14169,7 @@ QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, pMsg->messageType = eWNI_SME_SET_HT_2040_MODE; pMsg->length = len; - cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); sms_log(pMac, LOG1, FL("CSR Attempting to set HT20/40 mode for Bssid= " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMsg->bssid.bytes)); @@ -14237,7 +14237,7 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, pMsg->messageType = eWNI_SME_DISASSOC_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDisassocCnf); - cdf_copy_macaddr(&pMsg->peer_macaddr, + qdf_copy_macaddr(&pMsg->peer_macaddr, &pDisassocInd->peer_macaddr); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -14245,7 +14245,7 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, break; } - cdf_copy_macaddr(&pMsg->bssid, &pDisassocInd->bssid); + qdf_copy_macaddr(&pMsg->bssid, &pDisassocInd->bssid); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); @@ -14274,13 +14274,13 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, pMsg->messageType = eWNI_SME_DEAUTH_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDeauthCnf); - cdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid); + qdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { cdf_mem_free(pMsg); break; } - cdf_copy_macaddr(&pMsg->peer_macaddr, + qdf_copy_macaddr(&pMsg->peer_macaddr, &pDeauthInd->peer_macaddr); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -14446,8 +14446,8 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, pMsg->length = msgLen; pMsg->sessionId = (uint8_t) sessionId; pMsg->transactionId = 0; - cdf_copy_macaddr(&pMsg->peer_macaddr, &peer_macaddr); - cdf_copy_macaddr(&pMsg->bssid, + qdf_copy_macaddr(&pMsg->peer_macaddr, &peer_macaddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->connectedProfile.bssid); /** @@ -14511,9 +14511,9 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId pMsg->sessionId = sessionId; pMsg->length = sizeof(tSirSmeStartBssReq); pMsg->transactionId = 0; - cdf_copy_macaddr(&pMsg->bssid, &pParam->bssid); + qdf_copy_macaddr(&pMsg->bssid, &pParam->bssid); /* selfMacAddr */ - cdf_copy_macaddr(&pMsg->self_macaddr, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->self_macaddr, &pSession->selfMacAddr); /* beaconInterval */ if (pBssDesc && pBssDesc->beaconInterval) wTmp = pBssDesc->beaconInterval; @@ -14622,7 +14622,7 @@ QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) pMsg->length = sizeof(tSirSmeStopBssReq); pMsg->transactionId = 0; pMsg->reasonCode = 0; - cdf_copy_macaddr(&pMsg->bssid, &pSession->connectedProfile.bssid); + qdf_copy_macaddr(&pMsg->bssid, &pSession->connectedProfile.bssid); return cds_send_mb_message_to_mac(pMsg); } @@ -15155,7 +15155,7 @@ QDF_STATUS csr_roam_get_session_id_from_bssid(tpAniSirGlobal pMac, uint32_t i; for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i)) { - if (cdf_is_macaddr_equal(bssid, + if (qdf_is_macaddr_equal(bssid, &pMac->roam.roamSession[i].connectedProfile. bssid)) { /* Found it */ @@ -15867,7 +15867,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, pMsg->msgLen = (uint16_t) sizeof(tAniGetTsmStatsReq); pMsg->staId = staId; pMsg->tid = tid; - cdf_copy_macaddr(&pMsg->bssId, &bssId); + qdf_copy_macaddr(&pMsg->bssId, &bssId); pMsg->tsmStatsCallback = callback; pMsg->pDevContext = pContext; pMsg->p_cds_context = p_cds_context; @@ -17577,7 +17577,7 @@ QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, pMsg->messageType = eWNI_SME_UPDATE_APWPSIE_REQ; pMsg->transactionId = 0; - cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); pMsg->sessionId = sessionId; cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs)); pMsg->length = sizeof(*pMsg); @@ -17605,7 +17605,7 @@ QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPARSNIEsReq), 0); pMsg->messageType = eWNI_SME_SET_APWPARSNIEs_REQ; pMsg->transactionId = 0; - cdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); pMsg->sessionId = sessionId; cdf_mem_copy(&pMsg->APWPARSNIEs, pAPSirRSNie, sizeof(tSirRSNie)); @@ -17838,9 +17838,9 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pR if (pBuf && pRsp) { pBuf += 4; /* skip type and length */ pRsp->sessionId = *pBuf++; - cdf_get_u16(pBuf, (uint16_t *) &pRsp->transactionId); + qdf_get_u16(pBuf, (uint16_t *) &pRsp->transactionId); pBuf += 2; - cdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); + qdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); pBuf += 4; cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, QDF_MAC_ADDR_SIZE); } @@ -18086,7 +18086,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, pModifyAddIEInd->msgType = eWNI_SME_MODIFY_ADDITIONAL_IES; pModifyAddIEInd->msgLen = sizeof(tSirModifyIEsInd); - cdf_copy_macaddr(&pModifyAddIEInd->modifyIE.bssid, &pModifyIE->bssid); + qdf_copy_macaddr(&pModifyAddIEInd->modifyIE.bssid, &pModifyIE->bssid); pModifyAddIEInd->modifyIE.smeSessionId = pModifyIE->smeSessionId; pModifyAddIEInd->modifyIE.notify = pModifyIE->notify; @@ -18152,7 +18152,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, pUpdateAddIEs->msgType = eWNI_SME_UPDATE_ADDITIONAL_IES; pUpdateAddIEs->msgLen = sizeof(tSirUpdateIEsInd); - cdf_copy_macaddr(&pUpdateAddIEs->updateIE.bssid, &pUpdateIE->bssid); + qdf_copy_macaddr(&pUpdateAddIEs->updateIE.bssid, &pUpdateIE->bssid); pUpdateAddIEs->updateIE.smeSessionId = pUpdateIE->smeSessionId; pUpdateAddIEs->updateIE.append = pUpdateIE->append; diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 88a27787a248..7baca987c797 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -1118,7 +1118,7 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = cmd->u.scanCmd.scanID; - cdf_set_macaddr_broadcast(&cmd->u.scanCmd.u.scanRequest.bssid); + qdf_set_macaddr_broadcast(&cmd->u.scanCmd.u.scanRequest.bssid); /* Put to the head of pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -1427,7 +1427,7 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, cdf_mem_copy(fav_bssid.bytes, &roam_params->bssid_favored[i], QDF_MAC_ADDR_SIZE); - if (!cdf_is_macaddr_equal(&fav_bssid, bssid)) + if (!qdf_is_macaddr_equal(&fav_bssid, bssid)) continue; modified_rssi += roam_params->bssid_favored_factor[i]; sms_log(mac_ctx, LOG2, @@ -4308,7 +4308,7 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, goto free_ies; if (pCap1->ess && - cdf_is_macaddr_equal((struct qdf_mac_addr *) pSirBssDesc1->bssId, + qdf_is_macaddr_equal((struct qdf_mac_addr *) pSirBssDesc1->bssId, (struct qdf_mac_addr *) pSirBssDesc2->bssId) && (fForced || (cds_chan_to_band(pSirBssDesc1->channelId) == @@ -4358,7 +4358,7 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, } /* In case of P2P devices, ess and ibss will be set to zero */ else if (!pCap1->ess && - cdf_is_macaddr_equal( + qdf_is_macaddr_equal( (struct qdf_mac_addr *) pSirBssDesc1->bssId, (struct qdf_mac_addr *) pSirBssDesc2->bssId)) { fMatch = true; @@ -4782,7 +4782,7 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) */ if (csr_ll_remove_entry(&pMac->scan.scanResultList, &pResult->Link, LL_ACCESS_NOLOCK)) { - if (cdf_is_macaddr_equal( + if (qdf_is_macaddr_equal( (struct qdf_mac_addr *) &pResult->Result.BssDescriptor.bssId, (struct qdf_mac_addr *) &pMac->scan.currentCountryBssid)) { sms_log(pMac, LOGW, @@ -4904,7 +4904,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, pMsg->bssType = csr_translate_bsstype_to_mac_type(pScanReq->BSSType); if (CSR_IS_SESSION_VALID(pMac, sessionId)) { - cdf_copy_macaddr(&selfmac, + qdf_copy_macaddr(&selfmac, &pMac->roam.roamSession[sessionId].selfMacAddr); } else { /* @@ -4913,7 +4913,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, */ for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (CSR_IS_SESSION_VALID(pMac, i)) { - cdf_copy_macaddr(&selfmac, + qdf_copy_macaddr(&selfmac, &pMac->roam.roamSession[i].selfMacAddr); break; } @@ -4933,13 +4933,13 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, } } } - cdf_copy_macaddr(&pMsg->selfMacAddr, &selfmac); + qdf_copy_macaddr(&pMsg->selfMacAddr, &selfmac); - cdf_copy_macaddr(&pMsg->bssId, &pScanReq->bssid); - if (cdf_is_macaddr_zero(&pScanReq->bssid)) - cdf_set_macaddr_broadcast(&pMsg->bssId); + qdf_copy_macaddr(&pMsg->bssId, &pScanReq->bssid); + if (qdf_is_macaddr_zero(&pScanReq->bssid)) + qdf_set_macaddr_broadcast(&pMsg->bssId); else - cdf_copy_macaddr(&pMsg->bssId, &pScanReq->bssid); + qdf_copy_macaddr(&pMsg->bssId, &pScanReq->bssid); minChnTime = pScanReq->minChnTime; maxChnTime = pScanReq->maxChnTime; @@ -6228,10 +6228,10 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, } if (profile->BSSIDs.numOfBSSIDs == 1) - cdf_copy_macaddr(&scan_req->bssid, + qdf_copy_macaddr(&scan_req->bssid, profile->BSSIDs.bssid); else - cdf_set_macaddr_broadcast(&scan_req->bssid); + qdf_set_macaddr_broadcast(&scan_req->bssid); if (profile->ChannelInfo.numOfChannels) { scan_req->ChannelInfo.ChannelList = diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 6a73d176da1a..66d05dbf93ff 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -698,7 +698,7 @@ void csr_neighbor_roam_reset_report_scan_state_control_info(tpAniSirGlobal pMac, tpCsrNeighborRoamControlInfo pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - cdf_zero_macaddr(&pNeighborRoamInfo->currAPbssid); + qdf_zero_macaddr(&pNeighborRoamInfo->currAPbssid); #ifdef FEATURE_WLAN_ESE pNeighborRoamInfo->isESEAssoc = false; pNeighborRoamInfo->isVOAdmitted = false; @@ -1228,7 +1228,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, /* Populate the BSSID from handoff info received from HDD */ for (i = 0; i < pScanFilter->BSSIDs.numOfBSSIDs; i++) { - cdf_copy_macaddr(&pScanFilter->BSSIDs.bssid[i], + qdf_copy_macaddr(&pScanFilter->BSSIDs.bssid[i], &nbr_roam_info->handoffReqInfo.bssid); } } @@ -2279,7 +2279,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, cdf_mem_copy(&pSession->prevApSSID, &pSession->connectedProfile.SSID, sizeof(tSirMacSSid)); - cdf_copy_macaddr(&pSession->prevApBssid, + qdf_copy_macaddr(&pSession->prevApBssid, &pSession->connectedProfile.bssid); pSession->prevOpChannel = pSession->connectedProfile.operationChannel; @@ -2392,7 +2392,7 @@ static void csr_neighbor_roam_info_ctx_init( CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id); - cdf_copy_macaddr(&ngbr_roam_info->currAPbssid, + qdf_copy_macaddr(&ngbr_roam_info->currAPbssid, &session->connectedProfile.bssid); ngbr_roam_info->currAPoperationChannel = session->connectedProfile.operationChannel; @@ -2547,7 +2547,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( msg->length = sizeof(uint8_t); msg->seesionId = session_id; status = cds_send_mb_message_to_mac(msg); - cdf_copy_macaddr(&roamInfo.peerMac, + qdf_copy_macaddr(&roamInfo.peerMac, &session->connectedProfile.bssid); roamInfo.roamSynchInProgress = session->roam_synch_in_progress; @@ -2764,7 +2764,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pMac->roam.configParam.neighborRoamConfig. nhi_rssi_scan_rssi_ub; - cdf_zero_macaddr(&pNeighborRoamInfo->currAPbssid); + qdf_zero_macaddr(&pNeighborRoamInfo->currAPbssid); pNeighborRoamInfo->currentNeighborLookupThreshold = pNeighborRoamInfo->cfgParams.neighborLookupThreshold; pNeighborRoamInfo->currentOpportunisticThresholdDiff = @@ -3281,7 +3281,7 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( /* Populate the BSSID from handoff info received from HDD */ for (i = 0; i < profile->BSSIDs.numOfBSSIDs; i++) { - cdf_copy_macaddr(&profile->BSSIDs.bssid[i], + qdf_copy_macaddr(&profile->BSSIDs.bssid[i], &roam_ctrl_info->handoffReqInfo.bssid); } diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index 69c37cf5a8b6..b6e2476d7698 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -478,7 +478,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) cdf_mem_copy(tdlsAddStaReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); - cdf_copy_macaddr(&tdlsAddStaReq->peermac, + qdf_copy_macaddr(&tdlsAddStaReq->peermac, &tdlsAddStaCmdInfo->peermac); tdlsAddStaReq->capability = tdlsAddStaCmdInfo->capability; @@ -548,7 +548,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) cdf_mem_copy(tdlsDelStaReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); - cdf_copy_macaddr(&tdlsDelStaReq->peermac, + qdf_copy_macaddr(&tdlsDelStaReq->peermac, &tdlsDelStaCmdInfo->peermac); /* Send the request to PE. */ @@ -637,7 +637,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsLinkEstablishReq->sessionId = cmd->sessionId; /* Using dialog as transactionId. This can be used to match response with request */ tdlsLinkEstablishReq->transactionId = 0; - cdf_copy_macaddr(&tdlsLinkEstablishReq->peermac, + qdf_copy_macaddr(&tdlsLinkEstablishReq->peermac, &tdlsLinkEstablishCmdInfo->peermac); cdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); @@ -695,7 +695,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsSendMgmt); break; case eWNI_SME_TDLS_ADD_STA_RSP: - cdf_copy_macaddr(&roamInfo.peerMac, &addStaRsp->peermac); + qdf_copy_macaddr(&roamInfo.peerMac, &addStaRsp->peermac); roamInfo.staId = addStaRsp->staId; roamInfo.ucastSig = addStaRsp->ucastSig; roamInfo.bcastSig = addStaRsp->bcastSig; @@ -716,7 +716,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsAddPeer); break; case eWNI_SME_TDLS_DEL_STA_RSP: - cdf_copy_macaddr(&roamInfo.peerMac, &delStaRsp->peermac); + qdf_copy_macaddr(&roamInfo.peerMac, &delStaRsp->peermac); roamInfo.staId = delStaRsp->staId; roamInfo.statusCode = delStaRsp->statusCode; /* @@ -731,7 +731,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsDelPeer); break; case eWNI_SME_TDLS_DEL_STA_IND: - cdf_copy_macaddr(&roamInfo.peerMac, + qdf_copy_macaddr(&roamInfo.peerMac, &pSirTdlsDelStaInd->peermac); roamInfo.staId = pSirTdlsDelStaInd->staId; roamInfo.reasonCode = pSirTdlsDelStaInd->reasonCode; @@ -770,7 +770,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, csr_tdls_remove_sme_cmd(pMac, eSmeCommandTdlsLinkEstablish); break; case eWNI_SME_TDLS_SHOULD_DISCOVER: - cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); + qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: " @@ -782,7 +782,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, eCSR_ROAM_RESULT_TDLS_SHOULD_DISCOVER); break; case eWNI_SME_TDLS_SHOULD_TEARDOWN: - cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); + qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: " @@ -794,7 +794,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, eCSR_ROAM_RESULT_TDLS_SHOULD_TEARDOWN); break; case eWNI_SME_TDLS_PEER_DISCONNECTED: - cdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); + qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: " diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 08b2a7c99dcb..87dba98af6f4 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -282,7 +282,7 @@ bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, if (!csr_get_bss_id_bss_desc(pMac, pSirBssDesc2, &bssId2)) break; - fEqual = cdf_is_macaddr_equal(&bssId1, &bssId2); + fEqual = qdf_is_macaddr_equal(&bssId1, &bssId2); } while (0); return fEqual; @@ -1030,7 +1030,7 @@ static tSirMacCapabilityInfo csr_get_bss_capabilities(tSirBssDescription * tSirMacCapabilityInfo dot11Caps; /* tSirMacCapabilityInfo is 16-bit */ - cdf_get_u16((uint8_t *) &pSirBssDesc->capabilityInfo, + qdf_get_u16((uint8_t *) &pSirBssDesc->capabilityInfo, (uint16_t *) &dot11Caps); return dot11Caps; @@ -4344,13 +4344,13 @@ bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, /* Give the profile the benefit of the doubt... accept either all 0 or */ /* the real broadcast Bssid (all 0xff) as broadcast Bssids (meaning to */ /* match any Bssids). */ - if (cdf_is_macaddr_zero(&ProfileBssid) || - cdf_is_macaddr_broadcast(&ProfileBssid)) { + if (qdf_is_macaddr_zero(&ProfileBssid) || + qdf_is_macaddr_broadcast(&ProfileBssid)) { fMatch = true; break; } - if (cdf_is_macaddr_equal(BssBssid, &ProfileBssid)) { + if (qdf_is_macaddr_equal(BssBssid, &ProfileBssid)) { fMatch = true; break; } @@ -4724,7 +4724,7 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, /* Check for Blacklist BSSID's and avoid connections */ blacklist_check = false; for (i = 0; i < roam_params->num_bssid_avoid_list; i++) { - if (cdf_is_macaddr_equal((struct qdf_mac_addr *) + if (qdf_is_macaddr_equal((struct qdf_mac_addr *) &roam_params->bssid_avoid_list[i], (struct qdf_mac_addr *)bss_descr->bssId)) { blacklist_check = true; @@ -5254,7 +5254,7 @@ tSirResultCodes csr_get_disassoc_rsp_status_code(tSirSmeDisassocRsp * pBuffer += (sizeof(uint16_t) + sizeof(uint16_t) + sizeof(tSirMacAddr)); /* tSirResultCodes is an enum, assuming is 32bit */ /* If we cannot make this assumption, use copymemory */ - cdf_get_u32(pBuffer, &ret); + qdf_get_u32(pBuffer, &ret); return (tSirResultCodes) ret; } @@ -5269,7 +5269,7 @@ tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp) sizeof(uint16_t)); /* tSirResultCodes is an enum, assuming is 32bit */ /* If we cannot make this assumption, use copymemory */ - cdf_get_u32(pBuffer, &ret); + qdf_get_u32(pBuffer, &ret); return (tSirResultCodes) ret; } diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index f38cdbdd8ffd..5474e8cc8d92 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -38,7 +38,7 @@ #include "cds_mq.h" #include "sme_inside.h" #include "sms_debug.h" -#include "cdf_util.h" +#include "qdf_util.h" #include "csr_support.h" @@ -229,7 +229,7 @@ QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, msgLen = (uint16_t) (sizeof(*pMsg) + pOemDataReq->data_len); pMsg->messageType = eWNI_SME_OEM_DATA_REQ; pMsg->messageLen = msgLen; - cdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); pMsg->data_len = pOemDataReq->data_len; pMsg->data = pOemDataReq->data; /* Incoming buffer ptr saved, set to null to avoid free by caller */ diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 97703854f462..1cab83d7e2b7 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -79,7 +79,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; pMsg->length = (uint16_t) len; - cdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); + qdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); pMsg->chnNum = p2pRemainonChn->u.remainChlCmd.chn; pMsg->phyMode = p2pRemainonChn->u.remainChlCmd.phyMode; pMsg->duration = p2pRemainonChn->u.remainChlCmd.duration; diff --git a/core/utils/pktlog/pktlog_internal.c b/core/utils/pktlog/pktlog_internal.c index c2f7b0758e82..cdc416fbbba5 100644 --- a/core/utils/pktlog/pktlog_internal.c +++ b/core/utils/pktlog/pktlog_internal.c @@ -276,8 +276,8 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) printk("Invalid pdev in %s\n", __func__); return A_ERROR; } - cdf_assert(txrx_pdev->pl_dev); - cdf_assert(data); + qdf_assert(txrx_pdev->pl_dev); + qdf_assert(data); pl_dev = txrx_pdev->pl_dev; pl_tgt_hdr = (uint32_t *) data; @@ -358,11 +358,11 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) * Add capability to include the fmr hdr for remote frames */ txctl_log.priv.frm_hdr = frm_hdr; - cdf_assert(txctl_log.priv.txdesc_ctl); + qdf_assert(txctl_log.priv.txdesc_ctl); cdf_mem_copy((void *)&txctl_log.priv.txdesc_ctl, ((void *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); - cdf_assert(txctl_log.txdesc_hdr_ctl); + qdf_assert(txctl_log.txdesc_hdr_ctl); cdf_mem_copy(txctl_log.txdesc_hdr_ctl, &txctl_log.priv, sizeof(txctl_log.priv)); /* Add Protocol information and HT specific information */ @@ -370,8 +370,8 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) size_t log_size = sizeof(frm_hdr) + pl_hdr.size; void *txdesc_hdr_ctl = (void *) pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_assert(txdesc_hdr_ctl); - cdf_assert(pl_hdr.size < (370 * sizeof(u_int32_t))); + qdf_assert(txdesc_hdr_ctl); + qdf_assert(pl_hdr.size < (370 * sizeof(u_int32_t))); cdf_mem_copy(txdesc_hdr_ctl, &frm_hdr, sizeof(frm_hdr)); cdf_mem_copy((char *)txdesc_hdr_ctl + sizeof(frm_hdr), @@ -386,7 +386,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) txstat_log.ds_status = (void *) pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_assert(txstat_log.ds_status); + qdf_assert(txstat_log.ds_status); cdf_mem_copy(txstat_log.ds_status, ((void *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); @@ -431,10 +431,10 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) msdu_id += 1; } tx_desc = ol_tx_desc_find(txrx_pdev, tx_desc_id); - cdf_assert(tx_desc); + qdf_assert(tx_desc); netbuf = tx_desc->netbuf; htt_tx_desc = (uint32_t *) tx_desc->htt_tx_desc; - cdf_assert(htt_tx_desc); + qdf_assert(htt_tx_desc); cdf_nbuf_peek_header(netbuf, &addr, &len); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index ac24aada7c42..ca0df47c172e 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2251,7 +2251,7 @@ int wmi_desc_pool_init(tp_wma_handle wma_handle, uint32_t pool_size) if (!pool_size) { WMA_LOGE("%s: failed to allocate desc pool", __func__); - cdf_assert_always(pool_size); + qdf_assert_always(pool_size); return -EINVAL; } WMA_LOGE("%s: initialize desc pool of size %d", __func__, pool_size); @@ -2923,7 +2923,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, mic_err_ind->messageType = eWNI_SME_MIC_FAILURE_IND; mic_err_ind->length = sizeof(*mic_err_ind); mic_err_ind->sessionId = vdev_id; - cdf_copy_macaddr(&mic_err_ind->bssId, + qdf_copy_macaddr(&mic_err_ind->bssId, (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); cdf_mem_copy(mic_err_ind->info.taMacAddr, (struct qdf_mac_addr *) peer_mac_addr, @@ -3119,7 +3119,7 @@ wma_indicate_err( mic_err_ind->messageType = eWNI_SME_MIC_FAILURE_IND; mic_err_ind->length = sizeof(*mic_err_ind); vdev_id = err_info->u.mic_err.vdev_id; - cdf_copy_macaddr(&mic_err_ind->bssId, + qdf_copy_macaddr(&mic_err_ind->bssId, (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); WMA_LOGE("MIC error: BSSID:%02x:%02x:%02x:%02x:%02x:%02x\n", mic_err_ind->bssId.bytes[0], mic_err_ind->bssId.bytes[1], diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 6432a25f0f5a..749d357cca84 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -86,7 +86,7 @@ void *wma_find_vdev_by_addr(tp_wma_handle wma, uint8_t *addr, uint8_t i; for (i = 0; i < wma->max_bssid; i++) { - if (cdf_is_macaddr_equal( + if (qdf_is_macaddr_equal( (struct qdf_mac_addr *) wma->interfaces[i].addr, (struct qdf_mac_addr *) addr) == true) { *vdev_id = i; @@ -167,7 +167,7 @@ void *wma_find_vdev_by_bssid(tp_wma_handle wma, uint8_t *bssid, int i; for (i = 0; i < wma->max_bssid; i++) { - if (cdf_is_macaddr_equal( + if (qdf_is_macaddr_equal( (struct qdf_mac_addr *) wma->interfaces[i].bssid, (struct qdf_mac_addr *) bssid) == true) { *vdev_id = i; @@ -320,7 +320,7 @@ static struct wma_target_req *wma_find_req(tp_wma_handle wma, do { node1 = node2; - req_msg = cdf_container_of(node1, struct wma_target_req, node); + req_msg = qdf_container_of(node1, struct wma_target_req, node); if (req_msg->vdev_id != vdev_id) continue; if (req_msg->type != type) @@ -381,7 +381,7 @@ static struct wma_target_req *wma_find_remove_req_msgtype(tp_wma_handle wma, do { node1 = node2; - req_msg = cdf_container_of(node1, struct wma_target_req, node); + req_msg = qdf_container_of(node1, struct wma_target_req, node); if (req_msg->vdev_id != vdev_id) continue; if (req_msg->msg_type != msg_type) @@ -440,7 +440,7 @@ static struct wma_target_req *wma_find_vdev_req(tp_wma_handle wma, do { node1 = node2; - req_msg = cdf_container_of(node1, struct wma_target_req, node); + req_msg = qdf_container_of(node1, struct wma_target_req, node); if (req_msg->vdev_id != vdev_id) continue; if (req_msg->type != type) @@ -1525,7 +1525,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, return; } - cdf_copy_macaddr( + qdf_copy_macaddr( (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), (struct qdf_mac_addr *) &(vdev->mac_addr)); add_sta_self_param.session_id = vdev_id; @@ -3234,7 +3234,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) } /* remove the non-ibss vdev */ - cdf_copy_macaddr( + qdf_copy_macaddr( (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), (struct qdf_mac_addr *) &(vdev->mac_addr)); del_sta_param.session_id = vdev_id; @@ -3243,7 +3243,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ - cdf_copy_macaddr((struct qdf_mac_addr *) & + qdf_copy_macaddr((struct qdf_mac_addr *) & (add_sta_self_param.self_mac_addr), (struct qdf_mac_addr *) &(add_bss->selfMacAddr)); add_sta_self_param.session_id = vdev_id; diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index f92d1129af78..5b6ad6917c87 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -2927,7 +2927,7 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) while (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->wma_hold_req_queue, &node1)) { - req_msg = cdf_container_of(node1, struct wma_target_req, node); + req_msg = qdf_container_of(node1, struct wma_target_req, node); status = qdf_list_remove_node(&wma->wma_hold_req_queue, node1); if (QDF_STATUS_SUCCESS != status) { qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); @@ -2962,7 +2962,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) while (QDF_STATUS_SUCCESS != qdf_list_peek_front(&wma->vdev_resp_queue, &node1)) { - req_msg = cdf_container_of(node1, struct wma_target_req, node); + req_msg = qdf_container_of(node1, struct wma_target_req, node); status = qdf_list_remove_node(&wma->vdev_resp_queue, node1); if (QDF_STATUS_SUCCESS != status) { qdf_spin_unlock_bh(&wma->vdev_respq_lock); diff --git a/target/inc/htt_isoc.h b/target/inc/htt_isoc.h index c149192211a7..fe6f6863eb9e 100644 --- a/target/inc/htt_isoc.h +++ b/target/inc/htt_isoc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,7 +40,7 @@ #include /* A_UINT32, A_UINT8 */ #ifdef ATHR_WIN_NWF -#pragma warning( disable:4214 ) /* bit field types other than int */ +#pragma warning(disable:4214) /* bit field types other than int */ #endif #include "htt_common.h" @@ -102,7 +102,7 @@ htt_isoc_t2h_field_set(A_UINT32 *msg_addr32, unsigned mask, unsigned shift, unsigned value) { /* sanity check: make sure the value fits within the field */ - /* cdf_assert(value << shift == (value << shift) | mask); */ + /* qdf_assert(value << shift == (value << shift) | mask); */ msg_addr32 += offset32; /* clear the field */ @@ -245,13 +245,13 @@ enum { */ typedef struct htt_isoc_t2h_peer_info_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_INFO */ - dpu_idx : 8, bcast_dpu_idx : 8, mgmt_dpu_idx : 8; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_INFO */ + dpu_idx:8, bcast_dpu_idx:8, mgmt_dpu_idx:8; /* word 1 */ - A_UINT32 peer_id : 11, dpu_sig : 7, bcast_dpu_sig : 7, mgmt_dpu_sig : 7; + A_UINT32 peer_id:11, dpu_sig:7, bcast_dpu_sig:7, mgmt_dpu_sig:7; /* word 2 */ A_UINT32 - peer_type : 6, rmf_enabled : 1, reserved0 : 1, vdev_id : 8, mac_addr_l16 : 16; + peer_type:6, rmf_enabled:1, reserved0:1, vdev_id:8, mac_addr_l16:16; /* word 3 */ A_UINT32 mac_addr_u32; } htt_isoc_t2h_peer_info_t; @@ -422,8 +422,8 @@ typedef struct htt_isoc_t2h_peer_info_s { */ typedef struct htt_isoc_t2h_peer_unmap_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_UNMAP */ - peer_id : 11, reserved0 : 13; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_UNMAP */ + peer_id:11, reserved0:13; } htt_isoc_t2h_peer_unmap_t; /* word 0 */ @@ -512,10 +512,10 @@ enum { */ typedef struct htt_isoc_t2h_addba_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_ADDBA */ - win_size : 8, tid : 4, peer_id : 12; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_ADDBA */ + win_size:8, tid:4, peer_id:12; /* word 1 */ - A_UINT32 start_seq_num : 12, status : 1, reserved0 : 19; + A_UINT32 start_seq_num:12, status:1, reserved0:19; } htt_isoc_t2h_addba_t; /* word 0 */ @@ -623,8 +623,8 @@ typedef struct htt_isoc_t2h_addba_s { */ typedef struct htt_isoc_t2h_delba_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_DELBA */ - status : 1, reserved0 : 7, tid : 4, peer_id : 12; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_DELBA */ + status:1, reserved0:7, tid:4, peer_id:12; } htt_isoc_t2h_delba_t; /* word 0 */ @@ -725,8 +725,8 @@ typedef struct htt_isoc_t2h_delba_s { */ typedef struct htt_isoc_t2h_sec_ind_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_SEC_IND */ - peer_id : 8, sec_type : 8, is_unicast : 8; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_SEC_IND */ + peer_id:8, sec_type:8, is_unicast:8; /* word 1 */ A_UINT32 mic_key1; /* word 2 */ @@ -830,8 +830,8 @@ typedef struct htt_isoc_t2h_sec_ind_s { */ typedef struct htt_isoc_t2h_peer_tx_ready_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_TX_READY */ - peer_id : 11, reserved0 : 13; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_PEER_TX_READY */ + peer_id:11, reserved0:13; } htt_isoc_t2h_peer_tx_ready_t; /* word 0 */ @@ -950,14 +950,14 @@ typedef struct htt_isoc_t2h_peer_tx_ready_s { */ typedef struct htt_isoc_t2h_rx_err_s { /* word 0 */ - A_UINT32 msg_type : 8, /* HTT_ISOC_T2H_MSG_TYPE_RX_ERR */ - rx_err_type : 8, peer_id : 16; + A_UINT32 msg_type:8, /* HTT_ISOC_T2H_MSG_TYPE_RX_ERR */ + rx_err_type:8, peer_id:16; /* word 1 */ A_UINT32 - ext_tid : 5, - reserved1 : 1, - mcast : 1, - l2_hdr_is_80211 : 1, l2_hdr_bytes : 8, sec_hdr_bytes : 8, rx_err_cnt : 8; + ext_tid:5, + reserved1:1, + mcast:1, + l2_hdr_is_80211:1, l2_hdr_bytes:8, sec_hdr_bytes:8, rx_err_cnt:8; /* words 2 - M-1: L2 header */ /* words M - N: security header */ } htt_isoc_t2h_rx_err_t; -- cgit v1.2.3 From 2ed1fced922b3d372073149b3d2d7ef56d77f5c3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Mon, 22 Feb 2016 15:07:01 +0530 Subject: qcacld-3.0: Add QDF osdep changes Replace CDF osdep with QDF osdep Change-Id: Id2ba89c75df1fb8c4973a87219785353c3c2ff3c CRs-Fixed: 981188 --- core/cdf/inc/cdf_nbuf.h | 4 +- core/cdf/inc/osdep.h | 300 ------------------------------------- core/dp/htt/htt_rx.c | 2 +- core/dp/htt/htt_tx.c | 2 +- core/hdd/src/wlan_hdd_driver_ops.c | 12 +- core/sap/dfs/src/dfs.c | 5 +- core/utils/pktlog/linux_ac.c | 12 +- core/wma/inc/wma_dfs_interface.h | 2 +- target/inc/htt_isoc.h | 10 +- target/inc/wmi_unified.h | 250 ++++++++++++++++--------------- uapi/linux/osapi_linux.h | 8 +- 11 files changed, 154 insertions(+), 453 deletions(-) delete mode 100644 core/cdf/inc/osdep.h diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index bd92c7728164..454dcc375d97 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -835,7 +835,7 @@ static inline qdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) } /** - * qdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to + * cdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to * indicate checksum info to the stack. * @buf: Network buffer * @cksum: Checksum @@ -843,7 +843,7 @@ static inline qdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) * Return: none */ static inline void -qdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, qdf_nbuf_rx_cksum_t *cksum) +cdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, qdf_nbuf_rx_cksum_t *cksum) { __cdf_nbuf_set_rx_cksum(buf, cksum); } diff --git a/core/cdf/inc/osdep.h b/core/cdf/inc/osdep.h deleted file mode 100644 index 466db4d1d561..000000000000 --- a/core/cdf/inc/osdep.h +++ /dev/null @@ -1,300 +0,0 @@ -/* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#ifndef _OSDEP_H -#define _OSDEP_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -/** - * enum ath_hal_bus_type - Supported Bus types - * @HAL_BUS_TYPE_PCI: PCI Bus - * @HAL_BUS_TYPE_AHB: AHB Bus - * @HAL_BUS_TYPE_SNOC: SNOC Bus - * @HAL_BUS_TYPE_SIM: Simulator - */ -enum ath_hal_bus_type { - HAL_BUS_TYPE_PCI, - HAL_BUS_TYPE_AHB, - HAL_BUS_TYPE_SNOC, - HAL_BUS_TYPE_SIM -}; - -/** - * sturct hal_bus_context - Bus to hal context handoff - * @bc_tag: bus context tag - * @bc_handle: bus context handle - * @bc_bustype: bus type - */ -typedef struct hal_bus_context { - int bc_tag; - char *bc_handle; - enum ath_hal_bus_type bc_bustype; -} HAL_BUS_CONTEXT; - -#define INLINE inline - -/* ATH_DEBUG - - * Control whether debug features (printouts, assertions) are compiled - * into the driver. - */ -#ifndef ATH_DEBUG -#define ATH_DEBUG 1 /* default: include debug code */ -#endif - -#if ATH_DEBUG -#ifndef ASSERT -#define ASSERT(expr) qdf_assert(expr) -#endif -#else -#define ASSERT(expr) -#endif /* ATH_DEBUG */ - -/* - * Need to define byte order based on the CPU configuration. - */ -#ifndef _LITTLE_ENDIAN -#define _LITTLE_ENDIAN 1234 -#endif -#ifndef _BIG_ENDIAN -#define _BIG_ENDIAN 4321 -#endif -#ifdef __BIG_ENDIAN -#define _BYTE_ORDER _BIG_ENDIAN -#else -#define _BYTE_ORDER _LITTLE_ENDIAN -#endif - -/* - * Deduce if tasklets are available. If not then - * fall back to using the immediate work queue. - */ -#define ath_sysctl_decl(f, ctl, write, filp, buffer, lenp, ppos) \ - f(struct ctl_table *ctl, int write, void *buffer, \ - size_t *lenp, loff_t *ppos) -#define ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos) \ - proc_dointvec(ctl, write, buffer, lenp, ppos) -#define ATH_SYSCTL_PROC_DOSTRING(ctl, write, filp, buffer, lenp, ppos) \ - proc_dostring(ctl, write, filp, buffer, lenp, ppos) - -/* - * Byte Order stuff - */ -#define le16toh(_x) le16_to_cpu(_x) -#define htole16(_x) cpu_to_le16(_x) -#define htobe16(_x) cpu_to_be16(_x) -#define le32toh(_x) le32_to_cpu(_x) -#define htole32(_x) cpu_to_le32(_x) -#define be16toh(_x) be16_to_cpu(_x) -#define be32toh(_x) be32_to_cpu(_x) -#define htobe32(_x) cpu_to_be32(_x) - -#define EOK (0) - -#ifndef false -#define false 0 -#endif -#ifndef true -#define true 1 -#endif - -#ifndef ARPHRD_IEEE80211 -#define ARPHRD_IEEE80211 801 /* IEEE 802.11. */ -#endif - -/* - * Normal Delay functions. Time specified in microseconds. - */ -#define OS_DELAY(_us) qdf_udelay(_us) - -/* - * memory data manipulation functions. - */ -#define OS_MEMCPY(_dst, _src, _len) cdf_mem_copy(_dst, _src, _len) -#define OS_MEMMOVE(_dst, _src, _len) cdf_mem_move(_dst, _src, _len) -#define OS_MEMZERO(_buf, _len) cdf_mem_zero(_buf, _len) -#define OS_MEMSET(_buf, _ch, _len) cdf_mem_set(_buf, _len, _ch) -#define OS_MEMCMP(_mem1, _mem2, _len) cdf_mem_compare(_mem1, _mem2, _len) - -#ifdef CONFIG_SMP -/* Undo the one provided by the kernel to debug spin locks */ -#undef spin_lock -#undef spin_unlock -#undef spin_trylock - -#define spin_lock(x) \ - do { \ - spin_lock_bh(x); \ - } while (0) - -#define spin_unlock(x) \ - do { \ - if (!spin_is_locked(x)) { \ - WARN_ON(1); \ - printk(KERN_EMERG " %s:%d unlock addr=%p, %s \n", __func__, __LINE__, x, \ - !spin_is_locked(x) ? "Not locked" : ""); \ - } \ - spin_unlock_bh(x); \ - } while (0) - -#define spin_trylock(x) spin_trylock_bh(x) - -#define OS_SUPPORT_ASYNC_Q 1 /* support for handling asyn function calls */ - -#else -#define OS_SUPPORT_ASYNC_Q 0 -#endif /* ifdef CONFIG_SMP */ - - -/* - * System time interface - */ -typedef qdf_time_t systime_t; -typedef qdf_time_t systick_t; - -static INLINE qdf_time_t os_get_timestamp(void) -{ - return qdf_system_ticks(); /* Fix double conversion from jiffies to ms */ -} - -struct _NIC_DEV; - -typedef struct _NIC_DEV *osdev_t; - -typedef struct timer_list os_timer_t; - -typedef struct _os_mesg_t { - STAILQ_ENTRY(_os_mesg_t) mesg_next; - uint16_t mesg_type; - uint16_t mesg_len; - /* followed by mesg_len bytes */ -} os_mesg_t; - -typedef void (*os_mesg_handler_t)(void *ctx, - uint16_t mesg_type, - uint16_t mesg_len, void *mesg); - -typedef struct { - osdev_t dev_handle; - int32_t num_queued; - int32_t mesg_len; - uint8_t *mesg_queue_buf; - STAILQ_HEAD(, _os_mesg_t) mesg_head; /* queued mesg buffers */ - STAILQ_HEAD(, _os_mesg_t) mesg_free_head; /* free mesg buffers */ - spinlock_t lock; - spinlock_t ev_handler_lock; -#ifdef USE_SOFTINTR - void *_task; -#else - os_timer_t _timer; -#endif - os_mesg_handler_t handler; - void *ctx; - uint8_t is_synchronous : 1; -} os_mesg_queue_t; - -/* - * Definition of OS-dependent device structure. - * It'll be opaque to the actual ATH layer. - */ -struct _NIC_DEV { - void *bdev; /* bus device handle */ - struct net_device *netdev; /* net device handle (wifi%d) */ - qdf_bh_t intr_tq; /* tasklet */ - struct net_device_stats devstats; /* net device statisitics */ - HAL_BUS_CONTEXT bc; -#ifdef ATH_PERF_PWR_OFFLOAD - struct device *device; /* generic device */ - wait_queue_head_t event_queue; -#endif /* PERF_PWR_OFFLOAD */ -#if OS_SUPPORT_ASYNC_Q - os_mesg_queue_t async_q; /* mesgq to handle async calls */ -#endif -#ifdef ATH_BUS_PM - uint8_t isDeviceAsleep; -#endif /* ATH_BUS_PM */ -}; - -static INLINE unsigned char *os_malloc(osdev_t pNicDev, - unsigned long ulSizeInBytes, int gfp) -{ - return cdf_mem_malloc(ulSizeInBytes); -} - -#define OS_FREE(_p) cdf_mem_free(_p) - -#define OS_DMA_MEM_CONTEXT(context) \ - dma_addr_t context; - -#define OS_GET_DMA_MEM_CONTEXT(var, field) \ - &(var->field) - -#define OS_COPY_DMA_MEM_CONTEXT(dst, src) \ - *dst = *src - -#define OS_ZERO_DMA_MEM_CONTEXT(context) \ - *context = 0 - -/* - * Timer Interfaces. Use these macros to declare timer - * and retrieve timer argument. This is mainly for resolving - * different argument types for timer function in different OS. - */ -#define OS_DECLARE_TIMER(_fn) void _fn(void *) - -#define os_timer_func(_fn) \ - void _fn(void *timer_arg) - -#define OS_GET_TIMER_ARG(_arg, _type) \ - (_arg) = (_type)(timer_arg) - -#define OS_INIT_TIMER(_osdev, _timer, _fn, _ctx, type) \ - qdf_timer_init(_osdev, _timer, _fn, _ctx, type) - -#define OS_SET_TIMER(_timer, _ms) qdf_timer_mod(_timer, _ms) - -#define OS_CANCEL_TIMER(_timer) qdf_timer_stop(_timer) - -#define OS_FREE_TIMER(_timer) qdf_timer_stop(_timer) - -/* - * These are required for network manager support - */ -#ifndef SET_NETDEV_DEV -#define SET_NETDEV_DEV(ndev, pdev) -#endif - -#endif /* end of _OSDEP_H */ diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 34c29a1b6cec..1ccc9aa5609b 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -704,7 +704,7 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu, QDF_NBUF_RX_CKSUM_NONE : QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY; } - qdf_nbuf_set_rx_cksum(msdu, &cksum); + cdf_nbuf_set_rx_cksum(msdu, &cksum); #undef MAX_IP_VER #undef MAX_PROTO_VAL } diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index f6e09fd1e2bc..13f1de7cefe0 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -525,7 +525,7 @@ void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, } } -/* PUT THESE AS INLINE IN ol_htt_tx_api.h */ +/* PUT THESE AS inline IN ol_htt_tx_api.h */ void htt_tx_desc_flag_postponed(htt_pdev_handle pdev, void *desc) { diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index f3f0e066b5a4..1face696b292 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -221,7 +221,7 @@ static void hdd_deinit_cds_hif_context(void) * Return: 0 on success and errno on failure. */ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, - enum ath_hal_bus_type bus_type, bool reinit) + enum qdf_bus_type bus_type, bool reinit) { QDF_STATUS status; int ret = 0; @@ -324,7 +324,7 @@ void hdd_init_cdf_ctx(struct device *dev, void *bdev) * Return: 0 on successfull probe */ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, - enum ath_hal_bus_type bus_type, bool reinit) + enum qdf_bus_type bus_type, bool reinit) { void *hif_ctx; QDF_STATUS status; @@ -792,7 +792,7 @@ static int wlan_hdd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { return wlan_hdd_probe(&pdev->dev, pdev, (void *)id, - HAL_BUS_TYPE_PCI, false); + QDF_BUS_TYPE_PCI, false); } /** @@ -816,7 +816,7 @@ int wlan_hdd_pci_reinit(struct pci_dev *pdev, const struct pci_device_id *id) { return wlan_hdd_probe(&pdev->dev, pdev, id, - HAL_BUS_TYPE_PCI, true); + QDF_BUS_TYPE_PCI, true); } /** @@ -910,7 +910,7 @@ static int wlan_hdd_pci_runtime_resume(struct pci_dev *pdev) */ static int wlan_hdd_snoc_probe(struct device *dev) { - return wlan_hdd_probe(dev, NULL, NULL, HAL_BUS_TYPE_SNOC, false); + return wlan_hdd_probe(dev, NULL, NULL, QDF_BUS_TYPE_SNOC, false); } /** @@ -943,7 +943,7 @@ void wlan_hdd_snoc_shutdown(struct device *dev) */ int wlan_hdd_snoc_reinit(struct device *dev) { - return wlan_hdd_probe(dev, NULL, NULL, HAL_BUS_TYPE_SNOC, true); + return wlan_hdd_probe(dev, NULL, NULL, QDF_BUS_TYPE_SNOC, true); } /** diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 58568f2bf790..f807c3c74f63 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -229,9 +229,8 @@ int dfs_attach(struct ieee80211com *ic) return 1; } - dfs = - (struct ath_dfs *)os_malloc(NULL, sizeof(struct ath_dfs), - GFP_ATOMIC); + dfs = (struct ath_dfs *)os_malloc(NULL, sizeof(struct ath_dfs), + GFP_ATOMIC); if (dfs == NULL) { /*DFS_DPRINTK(dfs, ATH_DEBUG_DFS1, diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index a7f6d6a3e140..3297c000e41e 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -201,7 +201,7 @@ void pktlog_cleanup(struct ath_pktlog_info *pl_info) /* sysctl procfs handler to enable pktlog */ static int -ath_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) +qdf_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) { int ret, enable; ol_ath_generic_softc_handle scn; @@ -227,7 +227,7 @@ ath_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) ctl->maxlen = sizeof(enable); if (write) { - ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, + ret = QDF_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); if (ret == 0) ret = pl_dev->pl_funcs->pktlog_enable( @@ -236,7 +236,7 @@ ath_sysctl_decl(ath_sysctl_pktlog_enable, ctl, write, filp, buffer, lenp, ppos) printk(PKTLOG_TAG "%s:proc_dointvec failed\n", __func__); } else { - ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, + ret = QDF_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); if (ret) printk(PKTLOG_TAG "%s:proc_dointvec failed\n", @@ -256,7 +256,7 @@ static int get_pktlog_bufsize(struct ol_pktlog_dev_t *pl_dev) /* sysctl procfs handler to set/get pktlog size */ static int -ath_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) +qdf_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) { int ret, size; ol_ath_generic_softc_handle scn; @@ -282,14 +282,14 @@ ath_sysctl_decl(ath_sysctl_pktlog_size, ctl, write, filp, buffer, lenp, ppos) ctl->maxlen = sizeof(size); if (write) { - ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, + ret = QDF_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); if (ret == 0) ret = pl_dev->pl_funcs->pktlog_setsize( (struct hif_opaque_softc *)scn, size); } else { size = get_pktlog_bufsize(pl_dev); - ret = ATH_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, + ret = QDF_SYSCTL_PROC_DOINTVEC(ctl, write, filp, buffer, lenp, ppos); } diff --git a/core/wma/inc/wma_dfs_interface.h b/core/wma/inc/wma_dfs_interface.h index 4c4e2eacdac9..abb3490c4921 100644 --- a/core/wma/inc/wma_dfs_interface.h +++ b/core/wma/inc/wma_dfs_interface.h @@ -274,7 +274,7 @@ typedef struct ieee80211com { * * Return: freqency in MHz */ -static INLINE u_int +static inline u_int ieee80211_chan2freq(struct ieee80211com *ic, const struct dfs_ieee80211_channel *c) { diff --git a/target/inc/htt_isoc.h b/target/inc/htt_isoc.h index fe6f6863eb9e..cfd259c6fbc7 100644 --- a/target/inc/htt_isoc.h +++ b/target/inc/htt_isoc.h @@ -90,13 +90,13 @@ typedef enum htt_isoc_t2h_msg_type { #define HTT_ISOC_T2H_MSG_TYPE_GET(msg_addr) \ (*((A_UINT8 *) msg_addr)) -#ifndef INLINE +#ifndef inline /* target FW */ -#define INLINE __inline +#define inline __inline #define HTT_ISOC_INLINE_DEF -#endif /* INLINE */ +#endif /* inline */ -static INLINE void +static inline void htt_isoc_t2h_field_set(A_UINT32 *msg_addr32, unsigned offset32, unsigned mask, unsigned shift, unsigned value) @@ -113,7 +113,7 @@ htt_isoc_t2h_field_set(A_UINT32 *msg_addr32, #ifdef HTT_ISOC_INLINE_DEF #undef HTT_ISOC_INLINE_DEF -#undef INLINE +#undef inline #endif #define HTT_ISOC_T2H_FIELD_GET(msg_addr32, offset32, mask, shift) \ diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 869c68f11113..183a074303ad 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -89,7 +89,7 @@ extern "C" { * ar6000_internal.h to be included, it may not be defined as yet. */ #define WMI_F_MS(_v, _f) \ - ( ((_v) & (_f)) >> (_f ## _S) ) + (((_v) & (_f)) >> (_f ## _S)) /* * This breaks the "good macro practice" of only referencing each @@ -98,7 +98,7 @@ extern "C" { #define WMI_F_RMW(_var, _v, _f) \ do { \ (_var) &= ~(_f); \ - (_var) |= ( ((_v) << (_f ## _S)) & (_f)); \ + (_var) |= (((_v) << (_f ## _S)) & (_f)); \ } while (0) #define WMI_GET_BITS(_val, _index, _num_bits) \ @@ -121,7 +121,7 @@ extern "C" { (((num_entries) / (32 / (bits_per_entry))) + \ (((num_entries) % (32 / (bits_per_entry))) ? 1 : 0)) -static INLINE A_UINT32 wmi_packed_arr_get_bits(A_UINT32 * arr, +static inline A_UINT32 wmi_packed_arr_get_bits(A_UINT32 *arr, A_UINT32 entry_index, A_UINT32 bits_per_entry) { A_UINT32 entries_per_uint = (32 / bits_per_entry); @@ -129,11 +129,11 @@ static INLINE A_UINT32 wmi_packed_arr_get_bits(A_UINT32 * arr, A_UINT32 num_entries_in_prev_uints = (uint_index * entries_per_uint); A_UINT32 index_in_uint = (entry_index - num_entries_in_prev_uints); A_UINT32 start_bit_in_uint = (index_in_uint * bits_per_entry); - return ((arr[uint_index] >> start_bit_in_uint) & - ((1 << bits_per_entry) - 1)); + return (arr[uint_index] >> start_bit_in_uint) & + ((1 << bits_per_entry) - 1); } -static INLINE void wmi_packed_arr_set_bits(A_UINT32 *arr, A_UINT32 entry_index, +static inline void wmi_packed_arr_set_bits(A_UINT32 *arr, A_UINT32 entry_index, A_UINT32 bits_per_entry, A_UINT32 val) { A_UINT32 entries_per_uint = (32 / bits_per_entry); @@ -156,23 +156,23 @@ typedef struct { } wmi_mac_addr; /** macro to convert MAC address from WMI word format to char array */ -#define WMI_MAC_ADDR_TO_CHAR_ARRAY(pwmi_mac_addr,c_macaddr) do { \ +#define WMI_MAC_ADDR_TO_CHAR_ARRAY(pwmi_mac_addr, c_macaddr) do { \ (c_macaddr)[0] = ((pwmi_mac_addr)->mac_addr31to0) & 0xff; \ - (c_macaddr)[1] = ( ((pwmi_mac_addr)->mac_addr31to0) >> 8) & 0xff; \ - (c_macaddr)[2] = ( ((pwmi_mac_addr)->mac_addr31to0) >> 16) & 0xff; \ - (c_macaddr)[3] = ( ((pwmi_mac_addr)->mac_addr31to0) >> 24) & 0xff; \ + (c_macaddr)[1] = (((pwmi_mac_addr)->mac_addr31to0) >> 8) & 0xff; \ + (c_macaddr)[2] = (((pwmi_mac_addr)->mac_addr31to0) >> 16) & 0xff; \ + (c_macaddr)[3] = (((pwmi_mac_addr)->mac_addr31to0) >> 24) & 0xff; \ (c_macaddr)[4] = ((pwmi_mac_addr)->mac_addr47to32) & 0xff; \ - (c_macaddr)[5] = ( ((pwmi_mac_addr)->mac_addr47to32) >> 8) & 0xff; \ -} while(0) + (c_macaddr)[5] = (((pwmi_mac_addr)->mac_addr47to32) >> 8) & 0xff; \ +} while (0) /** macro to convert MAC address from char array to WMI word format */ -#define WMI_CHAR_ARRAY_TO_MAC_ADDR(c_macaddr,pwmi_mac_addr) do { \ +#define WMI_CHAR_ARRAY_TO_MAC_ADDR(c_macaddr, pwmi_mac_addr) do { \ (pwmi_mac_addr)->mac_addr31to0 = \ - ( (c_macaddr)[0] | ((c_macaddr)[1] << 8) \ - | ((c_macaddr)[2] << 16) | ((c_macaddr)[3] << 24) ); \ + ((c_macaddr)[0] | ((c_macaddr)[1] << 8) \ + | ((c_macaddr)[2] << 16) | ((c_macaddr)[3] << 24)); \ (pwmi_mac_addr)->mac_addr47to32 = \ - ( (c_macaddr)[4] | ((c_macaddr)[5] << 8)); \ -} while(0) + ((c_macaddr)[4] | ((c_macaddr)[5] << 8)); \ +} while (0) /* * wmi command groups. @@ -978,10 +978,10 @@ typedef enum { WMI_TBTTOFFSET_UPDATE_EVENTID, /** event after the first beacon is transmitted following - a change in the template.*/ + a change in the template.*/ WMI_OFFLOAD_BCN_TX_STATUS_EVENTID, /** event after the first probe response is transmitted following - a change in the template.*/ + a change in the template.*/ WMI_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID, /** Event for Mgmt TX completion event */ WMI_MGMT_TX_COMPLETION_EVENTID, @@ -1265,12 +1265,12 @@ typedef enum { /** channel info consists of 6 bits of channel mode */ -#define WMI_SET_CHANNEL_MODE(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_MODE(pwmi_channel, val) do { \ (pwmi_channel)->info &= 0xffffffc0; \ (pwmi_channel)->info |= (val); \ -} while(0) +} while (0) -#define WMI_GET_CHANNEL_MODE(pwmi_channel) ((pwmi_channel)->info & 0x0000003f ) +#define WMI_GET_CHANNEL_MODE(pwmi_channel) ((pwmi_channel)->info & 0x0000003f) #define WMI_CHAN_FLAG_HT40_PLUS 6 #define WMI_CHAN_FLAG_PASSIVE 7 @@ -1283,48 +1283,48 @@ typedef enum { #define WMI_CHAN_FLAG_HALF_RATE 14 /* Indicates half rate channel */ #define WMI_CHAN_FLAG_QUARTER_RATE 15 /* Indicates quarter rate channel */ -#define WMI_SET_CHANNEL_FLAG(pwmi_channel,flag) do { \ +#define WMI_SET_CHANNEL_FLAG(pwmi_channel, flag) do { \ (pwmi_channel)->info |= (1 << flag); \ -} while(0) +} while (0) -#define WMI_GET_CHANNEL_FLAG(pwmi_channel,flag) \ +#define WMI_GET_CHANNEL_FLAG(pwmi_channel, flag) \ (((pwmi_channel)->info & (1 << flag)) >> flag) -#define WMI_SET_CHANNEL_MIN_POWER(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_MIN_POWER(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_1 &= 0xffffff00; \ (pwmi_channel)->reg_info_1 |= (val&0xff); \ -} while(0) -#define WMI_GET_CHANNEL_MIN_POWER(pwmi_channel) ((pwmi_channel)->reg_info_1 & 0xff ) +} while (0) +#define WMI_GET_CHANNEL_MIN_POWER(pwmi_channel) ((pwmi_channel)->reg_info_1 & 0xff) -#define WMI_SET_CHANNEL_MAX_POWER(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_MAX_POWER(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_1 &= 0xffff00ff; \ (pwmi_channel)->reg_info_1 |= ((val&0xff) << 8); \ -} while(0) -#define WMI_GET_CHANNEL_MAX_POWER(pwmi_channel) ( (((pwmi_channel)->reg_info_1) >> 8) & 0xff ) +} while (0) +#define WMI_GET_CHANNEL_MAX_POWER(pwmi_channel) ((((pwmi_channel)->reg_info_1) >> 8) & 0xff) -#define WMI_SET_CHANNEL_REG_POWER(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_REG_POWER(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_1 &= 0xff00ffff; \ (pwmi_channel)->reg_info_1 |= ((val&0xff) << 16); \ -} while(0) -#define WMI_GET_CHANNEL_REG_POWER(pwmi_channel) ( (((pwmi_channel)->reg_info_1) >> 16) & 0xff ) -#define WMI_SET_CHANNEL_REG_CLASSID(pwmi_channel,val) do { \ +} while (0) +#define WMI_GET_CHANNEL_REG_POWER(pwmi_channel) ((((pwmi_channel)->reg_info_1) >> 16) & 0xff) +#define WMI_SET_CHANNEL_REG_CLASSID(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_1 &= 0x00ffffff; \ (pwmi_channel)->reg_info_1 |= ((val&0xff) << 24); \ -} while(0) -#define WMI_GET_CHANNEL_REG_CLASSID(pwmi_channel) ( (((pwmi_channel)->reg_info_1) >> 24) & 0xff ) +} while (0) +#define WMI_GET_CHANNEL_REG_CLASSID(pwmi_channel) ((((pwmi_channel)->reg_info_1) >> 24) & 0xff) -#define WMI_SET_CHANNEL_ANTENNA_MAX(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_ANTENNA_MAX(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_2 &= 0xffffff00; \ (pwmi_channel)->reg_info_2 |= (val&0xff); \ -} while(0) -#define WMI_GET_CHANNEL_ANTENNA_MAX(pwmi_channel) ((pwmi_channel)->reg_info_2 & 0xff ) +} while (0) +#define WMI_GET_CHANNEL_ANTENNA_MAX(pwmi_channel) ((pwmi_channel)->reg_info_2 & 0xff) /* max tx power is in 1 dBm units */ -#define WMI_SET_CHANNEL_MAX_TX_POWER(pwmi_channel,val) do { \ +#define WMI_SET_CHANNEL_MAX_TX_POWER(pwmi_channel, val) do { \ (pwmi_channel)->reg_info_2 &= 0xffff00ff; \ (pwmi_channel)->reg_info_2 |= ((val&0xff)<<8); \ -} while(0) -#define WMI_GET_CHANNEL_MAX_TX_POWER(pwmi_channel) ( (((pwmi_channel)->reg_info_2)>>8) & 0xff ) +} while (0) +#define WMI_GET_CHANNEL_MAX_TX_POWER(pwmi_channel) ((((pwmi_channel)->reg_info_2)>>8) & 0xff) /** HT Capabilities*/ @@ -1417,7 +1417,7 @@ typedef enum { /* Interested readers refer to Rx/Tx MCS Map definition as defined in 802.11ac */ -#define WMI_VHT_MAX_MCS_4_SS_MASK(r,ss) ((3 & (r)) << (((ss) - 1) << 1)) +#define WMI_VHT_MAX_MCS_4_SS_MASK(r, ss) ((3 & (r)) << (((ss) - 1) << 1)) #define WMI_VHT_MAX_SUPP_RATE_MASK 0x1fff0000 #define WMI_VHT_MAX_SUPP_RATE_MASK_SHIFT 16 @@ -2617,10 +2617,10 @@ typedef struct { * assumptions; don't be clever with them. */ #define WMI_UNIFIED_FREQ_INFO_GET(hdr, f) \ - ( WMI_F_MS( (hdr)->freq_info_1, \ - WMI_UNIFIED_FREQINFO_ ## f ## _LO ) \ - | (WMI_F_MS( (hdr)->freq_info_1, \ - WMI_UNIFIED_FREQINFO_ ## f ## _HI ) << 8) ) + (WMI_F_MS((hdr)->freq_info_1, \ + WMI_UNIFIED_FREQINFO_ ## f ## _LO) \ + | (WMI_F_MS((hdr)->freq_info_1, \ + WMI_UNIFIED_FREQINFO_ ## f ## _HI) << 8)) #define WMI_UNIFIED_FREQ_INFO_SET(hdr, f, v) \ do { \ @@ -2638,7 +2638,7 @@ typedef struct { #define WMI_UNIFIED_FREQINFO_2_PHYERRCODE_S 16 #define WMI_UNIFIED_RSSI_COMB_GET(hdr) \ - ( (int8_t) (WMI_F_MS((hdr)->freq_info_2, \ + ((int8_t) (WMI_F_MS((hdr)->freq_info_2, \ WMI_UNIFIED_FREQINFO_2_RSSI_COMB))) #define WMI_UNIFIED_RSSI_COMB_SET(hdr, v) \ @@ -2714,7 +2714,7 @@ typedef struct { /* PHY ERROR MASK 0 */ /* bits 1:0 defined but not published */ -#define WMI_PHY_ERROR_MASK0_RADAR (1<<2 ) +#define WMI_PHY_ERROR_MASK0_RADAR (1<<2) /* bits 23:3 defined but not published */ #define WMI_PHY_ERROR_MASK0_FALSE_RADAR_EXT (1<<24) /* bits 25:24 defined but not published */ @@ -4112,7 +4112,7 @@ typedef struct { A_UINT32 tx_frm_cnt[WLAN_MAX_AC]; /* Total number of packets(per AC) that were successfully transmitted(with and without retries, including multi-cast, broadcast) */ A_UINT32 rx_frm_cnt; /* Total number of packets that were successfully received (after appropriate filter rules including multi-cast, broadcast) */ A_UINT32 multiple_retry_cnt[WLAN_MAX_AC]; /*The number of MSDU packets and MMPDU frames per AC - that the 802.11 station successfully transmitted after more than one retransmission attempt */ + that the 802.11 station successfully transmitted after more than one retransmission attempt */ A_UINT32 fail_cnt[WLAN_MAX_AC]; /*Total number packets(per AC) failed to transmit */ A_UINT32 rts_fail_cnt; /*Total number of RTS/CTS sequence failures for transmission of a packet */ A_UINT32 rts_succ_cnt; /*Total number of RTS/CTS sequence success for transmission of a packet */ @@ -4686,11 +4686,11 @@ enum wmi_pkt_type { }; typedef struct { - A_UINT8 sutxbfee : 1, mutxbfee : 1, sutxbfer : 1, mutxbfer : 1, + A_UINT8 sutxbfee:1, mutxbfee:1, sutxbfer:1, mutxbfer:1, #if defined(AR900B) - txb_sts_cap : 3, implicit_bf : 1; + txb_sts_cap:3, implicit_bf:1; #else - reserved : 4; + reserved:4; #endif } wmi_vdev_txbf_en; @@ -4956,7 +4956,11 @@ enum wmi_sta_ps_param_pspoll_count { #define WMI_UAPSD_AC_TYPE_DELI 0 #define WMI_UAPSD_AC_TYPE_TRIG 1 -#define WMI_UAPSD_AC_BIT_MASK(ac,type) (type == WMI_UAPSD_AC_TYPE_DELI) ? (1<<(ac<<1)) : (1<<((ac<<1)+1)) +#define WMI_UAPSD_AC_BIT_MASK(ac, type) \ + do { \ + (type == WMI_UAPSD_AC_TYPE_DELI) ? (1<<(ac<<1)) : \ + (1<<((ac<<1)+1)) \ + } while (0) enum wmi_sta_ps_param_uapsd { WMI_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0), @@ -5436,7 +5440,7 @@ enum wmi_peer_type { WMI_PEER_TYPE_TDLS = 2, /* Peer is a TDLS Peer */ WMI_PEER_TYPE_OCB = 3, /* Peer is a OCB Peer */ WMI_PEER_TYPE_HOST_MAX = 127, /* Host <-> Target Peer type - * is assigned up to 127 */ + * is assigned up to 127 */ /* Reserved from 128 - 255 for * target internal use.*/ WMI_PEER_TYPE_ROAMOFFLOAD_TEMP = 128, /* Temporarily created during offload roam */ @@ -6355,8 +6359,8 @@ typedef struct { A_UINT32 qos_caps; A_UINT32 wmm_caps; A_UINT32 mcsset[ROAM_OFFLOAD_NUM_MCS_SET >> 2]; /* since this 4 byte aligned, - * we don't declare it as - * tlv array */ + * we don't declare it as + * tlv array */ } wmi_roam_offload_tlv_param; /* flags for 11i offload */ @@ -6365,11 +6369,11 @@ typedef struct { #define WMI_SET_ROAM_OFFLOAD_OKC_ENABLED(flag) do { \ (flag) |= (1 << WMI_ROAM_OFFLOAD_FLAG_OKC_ENABLED); \ -} while(0) +} while (0) #define WMI_SET_ROAM_OFFLOAD_OKC_DISABLED(flag) do { \ (flag) &= ~(1 << WMI_ROAM_OFFLOAD_FLAG_OKC_ENABLED); \ -} while(0) +} while (0) #define WMI_GET_ROAM_OFFLOAD_OKC_ENABLED(flag) \ ((flag) & (1 << WMI_ROAM_OFFLOAD_FLAG_OKC_ENABLED)) @@ -6428,9 +6432,9 @@ typedef struct { #define WMI_ROAM_REASON_DEAUTH 0x2 /** deauth/disassoc received */ #define WMI_ROAM_REASON_LOW_RSSI 0x3 /** connected AP's low rssi condition detected */ #define WMI_ROAM_REASON_SUITABLE_AP 0x4 /** found another AP that matches - SSID and Security profile in - WMI_ROAM_AP_PROFILE, found during scan - triggered upon FINAL_BMISS **/ + SSID and Security profile in + WMI_ROAM_AP_PROFILE, found during scan + triggered upon FINAL_BMISS **/ #define WMI_ROAM_REASON_HO_FAILED 0x5 /** LFR3.0 roaming failed, indicate the disconnection to host */ /* reserved up through 0xF */ @@ -6499,14 +6503,14 @@ typedef struct { #define WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE(flag) do { \ (flag) |= (1 << WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE); \ - } while(0) + } while (0) #define WMI_CLEAR_ROAM_INVOKE_ADD_CH_TO_CACHE(flag) do { \ (flag) &= ~(1 << WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE); \ - } while(0) + } while (0) #define WMI_GET_ROAM_INVOKE_ADD_CH_TO_CACHE(flag) \ - ((flag) & (1 << WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE)) + ((flag) & (1 << WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE)) #define WMI_ROAM_INVOKE_SCAN_MODE_FIXED_CH 0 /* scan given channel only */ @@ -6889,7 +6893,7 @@ typedef struct { #define WOW_EXTEND_PATTERN_MATCH_CNT 16 #define WOW_SHORT_PATTERN_MATCH_CNT 8 #define WOW_DEFAULT_EVT_BUF_SIZE 148 /* Maximum 148 bytes of the data is copied starting from header incase if the match is found. - The 148 comes from (128 - 14 ) payload size + 8bytes LLC + 26bytes MAC header */ + The 148 comes from (128 - 14 ) payload size + 8bytes LLC + 26bytes MAC header */ #define WOW_DEFAULT_IOAC_PATTERN_SIZE 6 #define WOW_DEFAULT_IOAC_PATTERN_SIZE_DWORD 2 #define WOW_DEFAULT_IOAC_RANDOM_SIZE 6 @@ -7612,14 +7616,14 @@ typedef struct { */ typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals - WMITLV_TAG_STRUC_wmi_ba_req_ssn_cmd_sub_struct_param */ + WMITLV_TAG_STRUC_wmi_ba_req_ssn_cmd_sub_struct_param */ wmi_mac_addr peer_macaddr; A_UINT32 tidBitmap; } wmi_ba_req_ssn; typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals - WMITLV_TAG_STRUC_wmi_ba_req_ssn_cmd_fixed_param */ + WMITLV_TAG_STRUC_wmi_ba_req_ssn_cmd_fixed_param */ /** unique id identifying the VDEV, generated by the caller */ A_UINT32 vdev_id; /** Number of requested SSN In the TLV wmi_ba_req_ssn[] */ @@ -7643,7 +7647,7 @@ typedef struct { */ typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals - WMITLV_TAG_STRUC_wmi_ba_req_ssn_event_sub_struct_param */ + WMITLV_TAG_STRUC_wmi_ba_req_ssn_event_sub_struct_param */ wmi_mac_addr peer_macaddr; /* A bool to indicate if ssn is present */ A_UINT32 ssn_present_for_tid[WMI_MAX_TC]; @@ -7655,7 +7659,7 @@ typedef struct { typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals - WMITLV_TAG_STRUC_wmi_ba_rsp_ssn_event_fixed_param */ + WMITLV_TAG_STRUC_wmi_ba_rsp_ssn_event_fixed_param */ /** unique id identifying the VDEV, generated by the caller */ A_UINT32 vdev_id; /** Event status, success or failure of the overall operation */ @@ -7880,7 +7884,7 @@ typedef struct wmi_nlo_event { * array will end on a 4-byte boundary. * (This 4-byte alignment simplifies endianness-correction byte swapping.) */ -A_COMPILE_TIME_ASSERT(check_passpoint_realm_size,(PASSPOINT_REALM_LEN % sizeof(A_UINT32)) == 0); +A_COMPILE_TIME_ASSERT(check_passpoint_realm_size, (PASSPOINT_REALM_LEN % sizeof(A_UINT32)) == 0); /* * Confirm the product of PASSPOINT_ROAMING_CONSORTIUM_ID_NUM and @@ -8586,10 +8590,10 @@ typedef struct { #define WMI_TDLS_QOS_SP_FLAG 5 #define WMI_TDLS_QOS_MOREDATA_FLAG 7 -#define WMI_TDLS_PEER_SET_QOS_FLAG(ppeer_caps,flag) do { \ +#define WMI_TDLS_PEER_SET_QOS_FLAG(ppeer_caps, flag) do { \ (ppeer_caps)->peer_qos |= (1 << flag); \ -} while(0) -#define WMI_TDLS_PEER_GET_QOS_FLAG(ppeer_caps,flag) \ +} while (0) +#define WMI_TDLS_PEER_GET_QOS_FLAG(ppeer_caps, flag) \ (((ppeer_caps)->peer_qos & (1 << flag)) >> flag) #define WMI_SET_TDLS_PEER_VO_UAPSD(ppeer_caps) \ @@ -8613,9 +8617,9 @@ typedef struct { #define WMI_GET_TDLS_PEER_ACK_UAPSD(ppeer_caps) \ WMI_TDLS_PEER_GET_QOS_FLAG(ppeer_caps, WMI_TDLS_QOS_ACK_FLAG) /* SP has 2 bits */ -#define WMI_SET_TDLS_PEER_SP_UAPSD(ppeer_caps,val) do { \ +#define WMI_SET_TDLS_PEER_SP_UAPSD(ppeer_caps, val) do { \ (ppeer_caps)->peer_qos |= (((val)&0x3) << WMI_TDLS_QOS_SP_FLAG); \ -} while(0) +} while (0) #define WMI_GET_TDLS_PEER_SP_UAPSD(ppeer_caps) \ (((ppeer_caps)->peer_qos & (0x3 << WMI_TDLS_QOS_SP_FLAG)) >> WMI_TDLS_QOS_SP_FLAG) @@ -8624,10 +8628,10 @@ typedef struct { #define WMI_GET_TDLS_PEER_MORE_DATA_ACK_UAPSD(ppeer_caps) \ WMI_TDLS_PEER_GET_QOS_FLAG(ppeer_caps, WMI_TDLS_QOS_MOREDATA_FLAG) -#define WMI_TDLS_SELF_SET_QOS_FLAG(pset_cmd,flag) do { \ +#define WMI_TDLS_SELF_SET_QOS_FLAG(pset_cmd, flag) do { \ (pset_cmd)->tdls_puapsd_mask |= (1 << flag); \ -} while(0) -#define WMI_TDLS_SELF_GET_QOS_FLAG(pset_cmd,flag) \ +} while (0) +#define WMI_TDLS_SELF_GET_QOS_FLAG(pset_cmd, flag) \ (((pset_cmd)->tdls_puapsd_mask & (1 << flag)) >> flag) #define WMI_SET_TDLS_SELF_VO_UAPSD(pset_cmd) \ @@ -8651,9 +8655,9 @@ typedef struct { #define WMI_GET_TDLS_SELF_ACK_UAPSD(pset_cmd) \ WMI_TDLS_SELF_GET_QOS_FLAG(pset_cmd, WMI_TDLS_QOS_ACK_FLAG) /* SP has 2 bits */ -#define WMI_SET_TDLS_SELF_SP_UAPSD(pset_cmd,val) do { \ +#define WMI_SET_TDLS_SELF_SP_UAPSD(pset_cmd, val) do { \ (pset_cmd)->tdls_puapsd_mask |= (((val)&0x3) << WMI_TDLS_QOS_SP_FLAG); \ -} while(0) +} while (0) #define WMI_GET_TDLS_SELF_SP_UAPSD(pset_cmd) \ (((pset_cmd)->tdls_puapsd_mask & (0x3 << WMI_TDLS_QOS_SP_FLAG)) >> WMI_TDLS_QOS_SP_FLAG) @@ -9615,43 +9619,43 @@ typedef struct { /** Bit map definition for basic_config_info starts */ #define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_S 0 #define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET (0x1f << WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_S) -#define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET) -#define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_SET(x,z) WMI_F_RMW(x,(z) & 0x1f,WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET) +#define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET) +#define WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET_SET(x, z) WMI_F_RMW(x, (z) & 0x1f, WMI_TPC_CHAINMASK_CONFIG_TPC_OFFSET) #define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_S 5 #define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET (0x1f << WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_S) -#define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET) -#define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_SET(x,z) WMI_F_RMW(x, (z) & 0x1f, WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET) +#define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET) +#define WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET_SET(x, z) WMI_F_RMW(x, (z) & 0x1f, WMI_TPC_CHAINMASK_CONFIG_ACK_OFFSET) #define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_S 10 #define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK (0x3 << WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_S) -#define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_CHAINMASK) -#define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_SET(x,z) WMI_F_RMW(x, (z)&0x3, WMI_TPC_CHAINMASK_CONFIG_CHAINMASK) +#define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_CHAINMASK) +#define WMI_TPC_CHAINMASK_CONFIG_CHAINMASK_SET(x, z) WMI_F_RMW(x, (z)&0x3, WMI_TPC_CHAINMASK_CONFIG_CHAINMASK) #define WMI_TPC_CHAINMASK_CONFIG_BT_S 12 #define WMI_TPC_CHAINMASK_CONFIG_BT (0x3 << WMI_TPC_CHAINMASK_CONFIG_BT_S) -#define WMI_TPC_CHAINMASK_CONFIG_BT_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_BT) -#define WMI_TPC_CHAINMASK_CONFIG_BT_SET(x,z) WMI_F_RMW(x, (z)&0x3, WMI_TPC_CHAINMASK_CONFIG_BT) +#define WMI_TPC_CHAINMASK_CONFIG_BT_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_BT) +#define WMI_TPC_CHAINMASK_CONFIG_BT_SET(x, z) WMI_F_RMW(x, (z)&0x3, WMI_TPC_CHAINMASK_CONFIG_BT) #define WMI_TPC_CHAINMASK_CONFIG_STBC_S 14 #define WMI_TPC_CHAINMASK_CONFIG_STBC (0x3 << WMI_TPC_CHAINMASK_CONFIG_STBC_S) -#define WMI_TPC_CHAINMASK_CONFIG_STBC_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_STBC) -#define WMI_TPC_CHAINMASK_CONFIG_STBC_SET(x,z) WMI_F_RMW(x, (z)& 0x3, WMI_TPC_CHAINMASK_CONFIG_STBC) +#define WMI_TPC_CHAINMASK_CONFIG_STBC_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_STBC) +#define WMI_TPC_CHAINMASK_CONFIG_STBC_SET(x, z) WMI_F_RMW(x, (z) & 0x3, WMI_TPC_CHAINMASK_CONFIG_STBC) #define WMI_TPC_CHAINMASK_CONFIG_BAND_S 16 #define WMI_TPC_CHAINMASK_CONFIG_BAND (0x1 << WMI_TPC_CHAINMASK_CONFIG_BAND_S) -#define WMI_TPC_CHAINMASK_CONFIG_BAND_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_BAND) -#define WMI_TPC_CHAINMASK_CONFIG_BAND_SET(x,z) WMI_F_RMW(x, (z) &0x1, WMI_TPC_CHAINMASK_CONFIG_BAND) +#define WMI_TPC_CHAINMASK_CONFIG_BAND_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_BAND) +#define WMI_TPC_CHAINMASK_CONFIG_BAND_SET(x, z) WMI_F_RMW(x, (z) & 0x1, WMI_TPC_CHAINMASK_CONFIG_BAND) #define WMI_TPC_CHAINMASK_CONFIG_STREAM_S 17 #define WMI_TPC_CHAINMASK_CONFIG_STREAM (0x1 << WMI_TPC_CHAINMASK_CONFIG_STREAM_S) -#define WMI_TPC_CHAINMASK_CONFIG_STREAM_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_STREAM) -#define WMI_TPC_CHAINMASK_CONFIG_STREAM_SET(x,z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_STREAM) +#define WMI_TPC_CHAINMASK_CONFIG_STREAM_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_STREAM) +#define WMI_TPC_CHAINMASK_CONFIG_STREAM_SET(x, z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_STREAM) #define WMI_TPC_CHAINMASK_CONFIG_PHY_MODE_S 18 #define WMI_TPC_CHAINMASK_CONFIG_PHY_MODE (0x7 << WMI_TPC_CHAINMASK_CONFIG_PHY_MODE_S) -#define WMI_TPC_CHAINMASK_CONFIG_PHY_MODE_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_PHY_MODE) -#define WMI_TPC_CHAINAMSK_CONFIG_PHY_MODE_SET(x,z) WMI_F_RMW(x, (z)&0x7, WMI_TPC_CHAINMASK_CONFIG_PHY_MODE) +#define WMI_TPC_CHAINMASK_CONFIG_PHY_MODE_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_PHY_MODE) +#define WMI_TPC_CHAINAMSK_CONFIG_PHY_MODE_SET(x, z) WMI_F_RMW(x, (z)&0x7, WMI_TPC_CHAINMASK_CONFIG_PHY_MODE) #define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_S 21 /* @@ -9661,8 +9665,8 @@ typedef struct { */ #define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_EXIST WMI_TPC_CHAINMASK_CONFIG_CHANNEL #define WMI_TPC_CHAINMASK_CONFIG_CHANNEL (0x1 << WMI_TPC_CHAINMASK_CONFIG_CHANNEL_S) -#define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_GET(x) WMI_F_MS(x,WMI_TPC_CHAINMASK_CONFIG_CHANNEL) -#define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_SET(x,z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_CHANNEL) +#define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_CHANNEL) +#define WMI_TPC_CHAINMASK_CONFIG_CHANNEL_SET(x, z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_CHANNEL) #define WMI_TPC_CHAINMASK_CONFIG_RATE_S 22 /* @@ -9673,7 +9677,7 @@ typedef struct { #define WMI_TPC_CHAINMASK_CONFIG_RATE_EXIST WMI_TPC_CHAINMASK_CONFIG_RATE #define WMI_TPC_CHAINMASK_CONFIG_RATE (0x1 << WMI_TPC_CHAINMASK_CONFIG_RATE_S) #define WMI_TPC_CHAINMASK_CONFIG_RATE_GET(x) WMI_F_MS(x, WMI_TPC_CHAINMASK_CONFIG_RATE) -#define WMI_TPC_CHAINMASK_CONFIG_RATE_SET(x,z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_RATE) +#define WMI_TPC_CHAINMASK_CONFIG_RATE_SET(x, z) WMI_F_RMW(x, (z)&0x1, WMI_TPC_CHAINMASK_CONFIG_RATE) /** Bit map definition for basic_config_info ends */ @@ -9821,9 +9825,9 @@ enum { generated whenever firmware roamed to new AP silently and (a) If the host is awake, FW sends the event to the host immediately . (b) If host is in sleep then either - (1) FW waits until host sends WMI_PDEV_RESUME_CMDID or WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID + (1) FW waits until host sends WMI_PDEV_RESUME_CMDID or WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID command to FW (part of host wake up sequence from low power mode) before sending the event host. - (2) data/mgmt frame is received from roamed AP, which needs to return to host + (2) data/mgmt frame is received from roamed AP, which needs to return to host */ typedef struct { @@ -10380,7 +10384,7 @@ typedef struct { /** table ID - to allow support for multiple simultaneous tables */ A_UINT32 table_id; /** operation mode: start/stop */ - A_UINT32 mode; // wmi_extscan_operation_mode + A_UINT32 mode; /* wmi_extscan_operation_mode */ /**total number of ssids (in all pages) */ A_UINT32 total_entries; /**index of the first ssid entry found in the TLV extscan_hotlist_ssid_entry*/ @@ -10841,17 +10845,17 @@ typedef struct { */ #define WMI_DEBUG_LOG_PARAM_LOG_LEVEL 0x1 -#define WMI_DBGLOG_SET_LOG_LEVEL(val,lvl) do { \ +#define WMI_DBGLOG_SET_LOG_LEVEL(val, lvl) do { \ (val) |= (lvl & 0xff); \ -} while(0) +} while (0) #define WMI_DBGLOG_GET_LOG_LEVEL(val) ((val) & 0xff) -#define WMI_DBGLOG_SET_MODULE_ID(val,mid) do { \ +#define WMI_DBGLOG_SET_MODULE_ID(val, mid) do { \ (val) |= ((mid & 0xffff) << 16); \ -} while(0) +} while (0) -#define WMI_DBGLOG_GET_MODULE_ID(val) (( (val) >> 16) & 0xffff) +#define WMI_DBGLOG_GET_MODULE_ID(val) (((val) >> 16) & 0xffff) /** * Enable the debug log for a given vdev. Value is vdev id @@ -10881,17 +10885,17 @@ typedef struct { #define NUM_MODULES_PER_ENTRY ((sizeof(A_UINT32)) << 3) -#define WMI_MODULE_ENABLE(pmid_bitmap,mod_id) \ - ( (pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY] |= \ - (1 << ((mod_id)%NUM_MODULES_PER_ENTRY)) ) +#define WMI_MODULE_ENABLE(pmid_bitmap, mod_id) \ + ((pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY] |= \ + (1 << ((mod_id)%NUM_MODULES_PER_ENTRY))) -#define WMI_MODULE_DISABLE(pmid_bitmap,mod_id) \ - ( (pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY] &= \ - ( ~(1 << ((mod_id)%NUM_MODULES_PER_ENTRY)) ) ) +#define WMI_MODULE_DISABLE(pmid_bitmap, mod_id) \ + ((pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY] &= \ + (~(1 << ((mod_id)%NUM_MODULES_PER_ENTRY)))) -#define WMI_MODULE_IS_ENABLED(pmid_bitmap,mod_id) \ - ( ((pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY ] & \ - (1 << ((mod_id)%NUM_MODULES_PER_ENTRY)) ) != 0) +#define WMI_MODULE_IS_ENABLED(pmid_bitmap, mod_id) \ + (((pmid_bitmap)[(mod_id)/NUM_MODULES_PER_ENTRY] & \ + (1 << ((mod_id)%NUM_MODULES_PER_ENTRY))) != 0) #define MAX_MODULE_ID_BITMAP_WORDS 16 /* 16*32=512 module ids. should be more than sufficient */ typedef struct { @@ -12614,8 +12618,7 @@ typedef struct wmi_bpf_del_vdev_instructions_cmd_s { /* NOTE: Make sure these data structures are identical to those 9235 * defined in sirApi.h */ -typedef struct -{ +typedef struct { /** Arbitration Inter-Frame Spacing. Range: 2-15 */ A_UINT32 aifsn; /** Contention Window minimum. Range: 1 - 10 */ @@ -12624,8 +12627,7 @@ typedef struct A_UINT32 cwmax; } wmi_qos_params_t; -typedef struct -{ +typedef struct { /** Channel frequency in MHz */ A_UINT32 chan_freq; /** Channel duration in ms */ @@ -12655,7 +12657,7 @@ typedef struct { /** The array of channels */ wmi_ocb_channel_t channels[OCB_CHANNEL_MAX]; /** 1 to allow off-channel tx, 0 otherwise */ - A_UINT32 off_channel_tx; // Not supported + A_UINT32 off_channel_tx; /* Not supported */ } wmi_ocb_set_sched_cmd_fixed_param; typedef struct { diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 75c69b794e58..27f74f2f3662 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -237,15 +237,15 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q); #define __ATTRIB_PACK __attribute__ ((packed)) #define __ATTRIB_PRINTF __attribute__ ((format (printf, 1, 2))) #define __ATTRIB_NORETURN __attribute__ ((noreturn)) -#ifndef INLINE -#define INLINE __inline__ +#ifndef inline +#define inline __inline__ #endif #else /* Not GCC */ #define __ATTRIB_PACK #define __ATTRIB_PRINTF #define __ATTRIB_NORETURN -#ifndef INLINE -#define INLINE __inline +#ifndef inline +#define inline __inline #endif #endif /* End __GNUC__ */ -- cgit v1.2.3 From 210db076445d76b4ea3ab959e861159c3dc26fe3 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Mon, 22 Feb 2016 18:42:15 +0530 Subject: qcacld-3.0: Add QDF MC timer API's Replace CDF MC timer API's with QDF MC timer API's Change-Id: If18069e9cb8dbd24c5cdc8bd8def6932f55c0168 CRs-Fixed: 981188 --- core/cdf/inc/cdf_mc_timer.h | 253 ------- core/cdf/src/cdf_mc_timer.c | 797 --------------------- core/cdf/src/cdf_memory.c | 14 +- core/cdf/src/i_cdf_mc_timer.h | 61 -- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/cds/inc/cds_sched.h | 2 +- core/cds/src/cds_api.c | 10 +- core/cds/src/cds_concurrency.c | 6 +- core/cds/src/cds_packet.c | 6 +- core/hdd/inc/wlan_hdd_main.h | 14 +- core/hdd/inc/wlan_hdd_tdls.h | 4 +- core/hdd/inc/wlan_hdd_tx_rx.h | 4 +- core/hdd/inc/wlan_hdd_wmm.h | 2 +- core/hdd/src/wlan_hdd_cfg80211.c | 2 +- core/hdd/src/wlan_hdd_green_ap.c | 18 +- core/hdd/src/wlan_hdd_hostapd.c | 28 +- core/hdd/src/wlan_hdd_ipa.c | 34 +- core/hdd/src/wlan_hdd_main.c | 42 +- core/hdd/src/wlan_hdd_memdump.c | 24 +- core/hdd/src/wlan_hdd_p2p.c | 50 +- core/hdd/src/wlan_hdd_scan.c | 6 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 6 +- core/hdd/src/wlan_hdd_tdls.c | 20 +- core/hdd/src/wlan_hdd_tx_rx.c | 20 +- core/hdd/src/wlan_hdd_wmm.c | 18 +- core/mac/src/pe/include/lim_session.h | 4 +- core/mac/src/pe/lim/lim_api.c | 10 +- core/mac/src/pe/lim/lim_assoc_utils.c | 2 +- core/mac/src/pe/lim/lim_p2p.c | 2 +- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 2 +- core/mac/src/pe/lim/lim_process_auth_frame.c | 8 +- core/mac/src/pe/lim/lim_process_message_queue.c | 4 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 6 +- core/mac/src/pe/lim/lim_process_probe_req_frame.c | 4 +- core/mac/src/pe/lim/lim_scan_result_utils.c | 4 +- core/mac/src/pe/lim/lim_security_utils.c | 6 +- core/mac/src/pe/lim/lim_session.c | 20 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 2 +- .../src/sys/legacy/src/platform/inc/sys_wrapper.h | 4 +- .../src/sys/legacy/src/platform/src/sys_wrapper.c | 27 +- core/sap/inc/sap_api.h | 2 +- core/sap/src/sap_api_link_cntl.c | 4 +- core/sap/src/sap_fsm.c | 22 +- core/sme/inc/csr_internal.h | 20 +- core/sme/inc/csr_link_list.h | 4 +- core/sme/inc/p2p_api.h | 2 +- core/sme/inc/sme_ft_api.h | 2 +- core/sme/inc/sme_power_save.h | 2 +- core/sme/inc/sme_rrm_internal.h | 4 +- core/sme/src/common/sme_api.c | 10 +- core/sme/src/common/sme_ft_api.c | 10 +- core/sme/src/common/sme_power_save.c | 24 +- core/sme/src/csr/csr_api_roam.c | 92 +-- core/sme/src/csr/csr_api_scan.c | 44 +- core/sme/src/csr/csr_inside_api.h | 8 +- core/sme/src/csr/csr_link_list.c | 6 +- core/sme/src/csr/csr_neighbor_roam.c | 8 +- core/sme/src/rrm/sme_rrm.c | 34 +- core/utils/epping/src/epping_main.c | 2 +- core/utils/logging/src/wlan_logging_sock_svc.c | 2 +- core/wma/inc/wma.h | 8 +- core/wma/src/wma_data.c | 2 +- core/wma/src/wma_dev_if.c | 52 +- core/wma/src/wma_main.c | 20 +- 65 files changed, 411 insertions(+), 1523 deletions(-) delete mode 100644 core/cdf/inc/cdf_mc_timer.h delete mode 100644 core/cdf/src/cdf_mc_timer.c delete mode 100644 core/cdf/src/i_cdf_mc_timer.h diff --git a/core/cdf/inc/cdf_mc_timer.h b/core/cdf/inc/cdf_mc_timer.h deleted file mode 100644 index 7f7744304902..000000000000 --- a/core/cdf/inc/cdf_mc_timer.h +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_MC_TIMER_H) -#define __CDF_MC_TIMER_H - -/** - * DOC: cdf_mc_timer - * - * Connectivity driver framework timer APIs serialized to MC thread - */ - -/* Include Files */ -#include -#include -#include -#include - -#ifdef TIMER_MANAGER -#include -#endif - -/* Preprocessor definitions and constants */ -#define CDF_TIMER_STATE_COOKIE (0x12) -#define CDF_MC_TIMER_TO_MS_UNIT (1000) -#define CDF_MC_TIMER_TO_SEC_UNIT (1000000) - -/* Type declarations */ -/* cdf Timer callback function prototype (well, actually a prototype for - a pointer to this callback function) */ -typedef void (*cdf_mc_timer_callback_t)(void *userData); - -typedef enum { - CDF_TIMER_STATE_UNUSED = CDF_TIMER_STATE_COOKIE, - CDF_TIMER_STATE_STOPPED, - CDF_TIMER_STATE_STARTING, - CDF_TIMER_STATE_RUNNING, -} CDF_TIMER_STATE; - -#ifdef TIMER_MANAGER -struct cdf_mc_timer_s; -typedef struct cdf_mc_timer_node_s { - qdf_list_node_t pNode; - char *fileName; - unsigned int lineNum; - struct cdf_mc_timer_s *cdf_timer; -} cdf_mc_timer_node_t; -#endif - -typedef struct cdf_mc_timer_s { -#ifdef TIMER_MANAGER - cdf_mc_timer_node_t *ptimerNode; -#endif - - cdf_mc_timer_platform_t platformInfo; - cdf_mc_timer_callback_t callback; - void *userData; - qdf_mutex_t lock; - QDF_TIMER_TYPE type; - CDF_TIMER_STATE state; -} cdf_mc_timer_t; - -/* Function declarations and documenation */ -#ifdef TIMER_MANAGER -void cdf_mc_timer_manager_init(void); -void cdf_mc_timer_exit(void); -#else -/** - * cdf_mc_timer_manager_init() - initialize CDF debug timer manager - * - * This API initializes CDF timer debug functionality. - * - * Return: none - */ -static inline void cdf_mc_timer_manager_init(void) -{ -} - -/** - * cdf_mc_timer_exit() - exit CDF timer debug functionality - * - * This API exists CDF timer debug functionality - * - * Return: none - */ -static inline void cdf_mc_timer_exit(void) -{ -} -#endif -/** - * cdf_mc_timer_get_current_state() - get the current state of the timer - * @pTimer: Pointer to timer object - * - * Return: - * CDF_TIMER_STATE - cdf timer state - */ - -CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer); - -/** - * cdf_mc_timer_init() - initialize a CDF timer - * @pTimer: Pointer to timer object - * @timerType: Type of timer - * @callback: Callback to be called after timer expiry - * @serData: User data which will be passed to callback function - * - * This API initializes a CDF Timer object. - * - * cdf_mc_timer_init() initializes a CDF Timer object. A timer must be - * initialized by calling cdf_mc_timer_initialize() before it may be used in - * any other timer functions. - * - * Attempting to initialize timer that is already initialized results in - * a failure. A destroyed timer object can be re-initialized with a call to - * cdf_mc_timer_init(). The results of otherwise referencing the object - * after it has been destroyed are undefined. - * - * Calls to CDF timer functions to manipulate the timer such - * as cdf_mc_timer_set() will fail if the timer is not initialized or has - * been destroyed. Therefore, don't use the timer after it has been - * destroyed until it has been re-initialized. - * - * All callback will be executed within the CDS main thread unless it is - * initialized from the Tx thread flow, in which case it will be executed - * within the tx thread flow. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -#ifdef TIMER_MANAGER -#define cdf_mc_timer_init(timer, timerType, callback, userdata) \ - cdf_mc_timer_init_debug(timer, timerType, callback, userdata, \ - __FILE__, __LINE__) - -QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, - QDF_TIMER_TYPE timerType, - cdf_mc_timer_callback_t callback, - void *userData, char *fileName, - uint32_t lineNum); -#else -QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType, - cdf_mc_timer_callback_t callback, - void *userData); -#endif - -/** - * cdf_mc_timer_destroy() - destroy CDF timer - * @timer: Pointer to timer object - * - * cdf_mc_timer_destroy() function shall destroy the timer object. - * After a successful return from \a cdf_mc_timer_destroy() the timer - * object becomes, in effect, uninitialized. - * - * A destroyed timer object can be re-initialized by calling - * cdf_mc_timer_init(). The results of otherwise referencing the object - * after it has been destroyed are undefined. - * - * Calls to CDF timer functions to manipulate the timer, such - * as cdf_mc_timer_set() will fail if the lock is destroyed. Therefore, - * don't use the timer after it has been destroyed until it has - * been re-initialized. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer); - -/** - * cdf_mc_timer_start() - start a CDF Timer object - * @timer: Pointer to timer object - * @expirationTime: Time to expire - * - * cdf_mc_timer_start() function starts a timer to expire after the - * specified interval, thus running the timer callback function when - * the interval expires. - * - * A timer only runs once (a one-shot timer). To re-start the - * timer, cdf_mc_timer_start() has to be called after the timer runs - * or has been cancelled. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime); - -/** - * cdf_mc_timer_stop() - stop a CDF Timer - * @timer: Pointer to timer object - * cdf_mc_timer_stop() function stops a timer that has been started but - * has not expired, essentially cancelling the 'start' request. - * - * After a timer is stopped, it goes back to the state it was in after it - * was created and can be started again via a call to cdf_mc_timer_start(). - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer); - -/** - * cdf_mc_timer_get_system_ticks() - get the system time in 10ms ticks - - * cdf_mc_timer_get_system_ticks() function returns the current number - * of timer ticks in 10msec intervals. This function is suitable timestamping - * and calculating time intervals by calculating the difference between two - * timestamps. - * - * Return: - * The current system tick count (in 10msec intervals). This - * function cannot fail. - */ -unsigned long cdf_mc_timer_get_system_ticks(void); - -/** - * cdf_mc_timer_get_system_time() - Get the system time in milliseconds - * - * cdf_mc_timer_get_system_time() function returns the number of milliseconds - * that have elapsed since the system was started - * - * Return: - * The current system time in milliseconds - */ -unsigned long cdf_mc_timer_get_system_time(void); - -#endif /* #if !defined __CDF_MC_TIMER_H */ diff --git a/core/cdf/src/cdf_mc_timer.c b/core/cdf/src/cdf_mc_timer.c deleted file mode 100644 index 97f9efeabd25..000000000000 --- a/core/cdf/src/cdf_mc_timer.c +++ /dev/null @@ -1,797 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_mc_timer - * - * Connectivity driver framework timer APIs serialized to MC thread - */ - -/* Include Files */ -#include -#include -#include -#include "wlan_qct_sys.h" -#include "cds_sched.h" - -/* Preprocessor definitions and constants */ - -#define LINUX_TIMER_COOKIE 0x12341234 -#define LINUX_INVALID_TIMER_COOKIE 0xfeedface -#define TMR_INVALID_ID (0) - -/* Type declarations */ - -/* Static Variable Definitions */ -static unsigned int persistent_timer_count; -static qdf_mutex_t persistent_timer_count_lock; - -/* Function declarations and documenation */ - -/** - * try_allowing_sleep() - clean up timer states after it has been deactivated - * @type: Timer type - * - * Clean up timer states after it has been deactivated check and try to allow - * sleep after a timer has been stopped or expired. - * - * Return: none - */ -static void try_allowing_sleep(QDF_TIMER_TYPE type) -{ - if (QDF_TIMER_TYPE_WAKE_APPS == type) { - /* qdf_mutex_acquire(&persistent_timer_count_lock); */ - persistent_timer_count--; - if (0 == persistent_timer_count) { - /* since the number of persistent timers has - decreased from 1 to 0, the timer should allow - sleep sleep_assert_okts( sleepClientHandle ); */ - } - /* qdf_mutex_release(&persistent_timer_count_lock); */ - } -} - -/** - * cdf_linux_timer_callback() - internal cdf entry point which is - * called when the timer interval expires - * @data: pointer to the timer control block which describes the - * timer that expired - * - * This function in turn calls the CDF client callback and changes the - * state of the timer from running (ACTIVE) to expired (INIT). - * - * Note: function signature is defined by the Linux kernel. The fact - * that the argument is "unsigned long" instead of "void *" is - * unfortunately imposed upon us. But we can safely pass a pointer via - * this parameter for LP32 and LP64 architectures. - * - * Return: nothing - */ - -static void cdf_linux_timer_callback(unsigned long data) -{ - cdf_mc_timer_t *timer = (cdf_mc_timer_t *) data; - cds_msg_t msg; - QDF_STATUS vStatus; - unsigned long flags; - - cdf_mc_timer_callback_t callback = NULL; - void *userData = NULL; - int threadId; - QDF_TIMER_TYPE type = QDF_TIMER_TYPE_SW; - - CDF_ASSERT(timer); - - if (timer == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s Null pointer passed in!", __func__); - return; - } - - threadId = timer->platformInfo.threadID; - spin_lock_irqsave(&timer->platformInfo.spinlock, flags); - - switch (timer->state) { - case CDF_TIMER_STATE_STARTING: - /* we are in this state because someone just started the timer, - * MC timer got started and expired, but the time content have - * not been updated this is a rare race condition! - */ - timer->state = CDF_TIMER_STATE_STOPPED; - vStatus = QDF_STATUS_E_ALREADY; - break; - - case CDF_TIMER_STATE_STOPPED: - vStatus = QDF_STATUS_E_ALREADY; - break; - - case CDF_TIMER_STATE_UNUSED: - vStatus = QDF_STATUS_E_EXISTS; - break; - - case CDF_TIMER_STATE_RUNNING: - /* need to go to stop state here because the call-back function - * may restart timer (to emulate periodic timer) - */ - timer->state = CDF_TIMER_STATE_STOPPED; - /* copy the relevant timer information to local variables; - * once we exist from this critical section, the timer content - * may be modified by other tasks - */ - callback = timer->callback; - userData = timer->userData; - threadId = timer->platformInfo.threadID; - type = timer->type; - vStatus = QDF_STATUS_SUCCESS; - break; - - default: - CDF_ASSERT(0); - vStatus = QDF_STATUS_E_FAULT; - break; - } - - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - - if (QDF_STATUS_SUCCESS != vStatus) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "TIMER callback called in a wrong state=%d", - timer->state); - return; - } - - try_allowing_sleep(type); - - if (callback == NULL) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: No TIMER callback, Could not enqueue timer to any queue", - __func__); - return; - } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "TIMER callback: running on MC thread"); - - /* serialize to the MC thread */ - sys_build_message_header(SYS_MSG_ID_MC_TIMER, &msg); - msg.callback = callback; - msg.bodyptr = userData; - msg.bodyval = 0; - - if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS) - return; - - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Could not enqueue timer to any queue", __func__); - CDF_ASSERT(0); -} - -/** - * cdf_mc_timer_get_current_state() - get the current state of the timer - * @pTimer: Pointer to timer object - * - * Return: - * CDF_TIMER_STATE - cdf timer state - */ -CDF_TIMER_STATE cdf_mc_timer_get_current_state(cdf_mc_timer_t *pTimer) -{ - if (NULL == pTimer) { - CDF_ASSERT(0); - return CDF_TIMER_STATE_UNUSED; - } - - switch (pTimer->state) { - case CDF_TIMER_STATE_STOPPED: - case CDF_TIMER_STATE_STARTING: - case CDF_TIMER_STATE_RUNNING: - case CDF_TIMER_STATE_UNUSED: - return pTimer->state; - default: - CDF_ASSERT(0); - return CDF_TIMER_STATE_UNUSED; - } -} - -/** - * cdf_timer_module_init() - initializes a CDF timer module. - * - * This API initializes the CDF timer module. This needs to be called - * exactly once prior to using any CDF timers. - * - * Return: none - */ -void cdf_timer_module_init(void) -{ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, - "Initializing the CDF timer module"); - qdf_mutex_create(&persistent_timer_count_lock); -} - -#ifdef TIMER_MANAGER - -qdf_list_t cdf_timer_list; -qdf_spinlock_t cdf_timer_list_lock; - -static void cdf_timer_clean(void); - -/** - * cdf_mc_timer_manager_init() - initialize CDF debug timer manager - * - * This API initializes CDF timer debug functionality. - * - * Return: none - */ -void cdf_mc_timer_manager_init(void) -{ - qdf_list_create(&cdf_timer_list, 1000); - qdf_spinlock_create(&cdf_timer_list_lock); - return; -} - -/** - * cdf_timer_clean() - clean up CDF timer debug functionality - * - * This API cleans up CDF timer debug functionality and prints which CDF timers - * are leaked. This is called during driver unload. - * - * Return: none - */ -static void cdf_timer_clean(void) -{ - uint32_t listSize; - - listSize = qdf_list_size(&cdf_timer_list); - - if (listSize) { - qdf_list_node_t *pNode; - QDF_STATUS qdf_status; - - cdf_mc_timer_node_t *ptimerNode; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: List is not Empty. listSize %d ", - __func__, (int)listSize); - - do { - qdf_spin_lock_irqsave(&cdf_timer_list_lock); - qdf_status = - qdf_list_remove_front(&cdf_timer_list, &pNode); - qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (QDF_STATUS_SUCCESS == qdf_status) { - ptimerNode = (cdf_mc_timer_node_t *) pNode; - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, - "Timer Leak@ File %s, @Line %d", - ptimerNode->fileName, - (int)ptimerNode->lineNum); - cdf_mem_free(ptimerNode); - } - } while (qdf_status == QDF_STATUS_SUCCESS); - } -} - -/** - * cdf_mc_timer_exit() - exit CDF timer debug functionality - * - * This API exists CDF timer debug functionality - * - * Return: none - */ -void cdf_mc_timer_exit(void) -{ - cdf_timer_clean(); - qdf_list_destroy(&cdf_timer_list); -} -#endif - -/** - * cdf_mc_timer_init() - initialize a CDF timer - * @pTimer: Pointer to timer object - * @timerType: Type of timer - * @callback: Callback to be called after timer expiry - * @serData: User data which will be passed to callback function - * - * This API initializes a CDF Timer object. - * - * cdf_mc_timer_init() initializes a CDF Timer object. A timer must be - * initialized by calling cdf_mc_timer_initialize() before it may be used in - * any other timer functions. - * - * Attempting to initialize timer that is already initialized results in - * a failure. A destroyed timer object can be re-initialized with a call to - * cdf_mc_timer_init(). The results of otherwise referencing the object - * after it has been destroyed are undefined. - * - * Calls to CDF timer functions to manipulate the timer such - * as cdf_mc_timer_set() will fail if the timer is not initialized or has - * been destroyed. Therefore, don't use the timer after it has been - * destroyed until it has been re-initialized. - * - * All callback will be executed within the CDS main thread unless it is - * initialized from the Tx thread flow, in which case it will be executed - * within the tx thread flow. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -#ifdef TIMER_MANAGER -QDF_STATUS cdf_mc_timer_init_debug(cdf_mc_timer_t *timer, - QDF_TIMER_TYPE timerType, - cdf_mc_timer_callback_t callback, - void *userData, char *fileName, - uint32_t lineNum) -{ - QDF_STATUS qdf_status; - - /* check for invalid pointer */ - if ((timer == NULL) || (callback == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Null params being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - timer->ptimerNode = cdf_mem_malloc(sizeof(cdf_mc_timer_node_t)); - - if (timer->ptimerNode == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Not able to allocate memory for timeNode", - __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_NOMEM; - } - - cdf_mem_set(timer->ptimerNode, sizeof(cdf_mc_timer_node_t), 0); - - timer->ptimerNode->fileName = fileName; - timer->ptimerNode->lineNum = lineNum; - timer->ptimerNode->cdf_timer = timer; - - qdf_spin_lock_irqsave(&cdf_timer_list_lock); - qdf_status = qdf_list_insert_front(&cdf_timer_list, - &timer->ptimerNode->pNode); - qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List qdf_status %d", - __func__, qdf_status); - } - - /* set the various members of the timer structure - * with arguments passed or with default values - */ - spin_lock_init(&timer->platformInfo.spinlock); - if (QDF_TIMER_TYPE_SW == timerType) - init_timer_deferrable(&(timer->platformInfo.Timer)); - else - init_timer(&(timer->platformInfo.Timer)); - timer->platformInfo.Timer.function = cdf_linux_timer_callback; - timer->platformInfo.Timer.data = (unsigned long)timer; - timer->callback = callback; - timer->userData = userData; - timer->type = timerType; - timer->platformInfo.cookie = LINUX_TIMER_COOKIE; - timer->platformInfo.threadID = 0; - timer->state = CDF_TIMER_STATE_STOPPED; - - return QDF_STATUS_SUCCESS; -} -#else -QDF_STATUS cdf_mc_timer_init(cdf_mc_timer_t *timer, QDF_TIMER_TYPE timerType, - cdf_mc_timer_callback_t callback, - void *userData) -{ - /* check for invalid pointer */ - if ((timer == NULL) || (callback == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Null params being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - /* set the various members of the timer structure - * with arguments passed or with default values - */ - spin_lock_init(&timer->platformInfo.spinlock); - if (QDF_TIMER_TYPE_SW == timerType) - init_timer_deferrable(&(timer->platformInfo.Timer)); - else - init_timer(&(timer->platformInfo.Timer)); - timer->platformInfo.Timer.function = cdf_linux_timer_callback; - timer->platformInfo.Timer.data = (unsigned long)timer; - timer->callback = callback; - timer->userData = userData; - timer->type = timerType; - timer->platformInfo.cookie = LINUX_TIMER_COOKIE; - timer->platformInfo.threadID = 0; - timer->state = CDF_TIMER_STATE_STOPPED; - - return QDF_STATUS_SUCCESS; -} -#endif - -/** - * cdf_mc_timer_destroy() - destroy CDF timer - * @timer: Pointer to timer object - * - * cdf_mc_timer_destroy() function shall destroy the timer object. - * After a successful return from \a cdf_mc_timer_destroy() the timer - * object becomes, in effect, uninitialized. - * - * A destroyed timer object can be re-initialized by calling - * cdf_mc_timer_init(). The results of otherwise referencing the object - * after it has been destroyed are undefined. - * - * Calls to CDF timer functions to manipulate the timer, such - * as cdf_mc_timer_set() will fail if the lock is destroyed. Therefore, - * don't use the timer after it has been destroyed until it has - * been re-initialized. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -#ifdef TIMER_MANAGER -QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - unsigned long flags; - - /* check for invalid pointer */ - if (NULL == timer) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Null timer pointer being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - /* Check if timer refers to an uninitialized object */ - if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot destroy uninitialized timer", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - qdf_spin_lock_irqsave(&cdf_timer_list_lock); - status = qdf_list_remove_node(&cdf_timer_list, - &timer->ptimerNode->pNode); - qdf_spin_unlock_irqrestore(&cdf_timer_list_lock); - if (status != QDF_STATUS_SUCCESS) { - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - cdf_mem_free(timer->ptimerNode); - - spin_lock_irqsave(&timer->platformInfo.spinlock, flags); - - switch (timer->state) { - - case CDF_TIMER_STATE_STARTING: - status = QDF_STATUS_E_BUSY; - break; - - case CDF_TIMER_STATE_RUNNING: - /* Stop the timer first */ - del_timer(&(timer->platformInfo.Timer)); - status = QDF_STATUS_SUCCESS; - break; - case CDF_TIMER_STATE_STOPPED: - status = QDF_STATUS_SUCCESS; - break; - - case CDF_TIMER_STATE_UNUSED: - status = QDF_STATUS_E_ALREADY; - break; - - default: - status = QDF_STATUS_E_FAULT; - break; - } - - if (QDF_STATUS_SUCCESS == status) { - timer->platformInfo.cookie = LINUX_INVALID_TIMER_COOKIE; - timer->state = CDF_TIMER_STATE_UNUSED; - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - return status; - } - - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot destroy timer in state = %d", __func__, - timer->state); - CDF_ASSERT(0); - - return status; -} - -#else - -/** - * cdf_mc_timer_destroy() - destroy CDF timer - * @timer: Pointer to timer object - * - * cdf_mc_timer_destroy() function shall destroy the timer object. - * After a successful return from \a cdf_mc_timer_destroy() the timer - * object becomes, in effect, uninitialized. - * - * A destroyed timer object can be re-initialized by calling - * cdf_mc_timer_init(). The results of otherwise referencing the object - * after it has been destroyed are undefined. - * - * Calls to CDF timer functions to manipulate the timer, such - * as cdf_mc_timer_set() will fail if the lock is destroyed. Therefore, - * don't use the timer after it has been destroyed until it has - * been re-initialized. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_destroy(cdf_mc_timer_t *timer) -{ - QDF_STATUS vStatus = QDF_STATUS_SUCCESS; - unsigned long flags; - - /* check for invalid pointer */ - if (NULL == timer) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Null timer pointer being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_FAULT; - } - - /* check if timer refers to an uninitialized object */ - if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot destroy uninitialized timer", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - spin_lock_irqsave(&timer->platformInfo.spinlock, flags); - - switch (timer->state) { - - case CDF_TIMER_STATE_STARTING: - vStatus = QDF_STATUS_E_BUSY; - break; - - case CDF_TIMER_STATE_RUNNING: - /* Stop the timer first */ - del_timer(&(timer->platformInfo.Timer)); - vStatus = QDF_STATUS_SUCCESS; - break; - - case CDF_TIMER_STATE_STOPPED: - vStatus = QDF_STATUS_SUCCESS; - break; - - case CDF_TIMER_STATE_UNUSED: - vStatus = QDF_STATUS_E_ALREADY; - break; - - default: - vStatus = QDF_STATUS_E_FAULT; - break; - } - - if (QDF_STATUS_SUCCESS == vStatus) { - timer->platformInfo.cookie = LINUX_INVALID_TIMER_COOKIE; - timer->state = CDF_TIMER_STATE_UNUSED; - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - return vStatus; - } - - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot destroy timer in state = %d", __func__, - timer->state); - CDF_ASSERT(0); - - return vStatus; -} -#endif - -/** - * cdf_mc_timer_start() - start a CDF Timer object - * @timer: Pointer to timer object - * @expirationTime: Time to expire - * - * cdf_mc_timer_start() function starts a timer to expire after the - * specified interval, thus running the timer callback function when - * the interval expires. - * - * A timer only runs once (a one-shot timer). To re-start the - * timer, cdf_mc_timer_start() has to be called after the timer runs - * or has been cancelled. - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_start(cdf_mc_timer_t *timer, uint32_t expirationTime) -{ - unsigned long flags; - - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, - "Timer Addr inside cds_enable : 0x%p ", timer); - - /* check for invalid pointer */ - if (NULL == timer) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s Null timer pointer being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - /* check if timer refers to an uninitialized object */ - if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot start uninitialized timer", __func__); - CDF_ASSERT(0); - - return QDF_STATUS_E_INVAL; - } - - /* check if timer has expiration time less than 10 ms */ - if (expirationTime < 10) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot start a timer with expiration less than 10 ms", - __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - /* make sure the remainer of the logic isn't interrupted */ - spin_lock_irqsave(&timer->platformInfo.spinlock, flags); - - /* ensure if the timer can be started */ - if (CDF_TIMER_STATE_STOPPED != timer->state) { - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, - "%s: Cannot start timer in state = %d ", __func__, - timer->state); - return QDF_STATUS_E_ALREADY; - } - - /* start the timer */ - mod_timer(&(timer->platformInfo.Timer), - jiffies + msecs_to_jiffies(expirationTime)); - - timer->state = CDF_TIMER_STATE_RUNNING; - - /* get the thread ID on which the timer is being started */ - timer->platformInfo.threadID = current->pid; - - if (QDF_TIMER_TYPE_WAKE_APPS == timer->type) { - persistent_timer_count++; - if (1 == persistent_timer_count) { - /* since we now have one persistent timer, - * we need to disallow sleep - * sleep_negate_okts(sleepClientHandle); - */ - } - } - - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_mc_timer_stop() - stop a CDF Timer - * @timer: Pointer to timer object - * cdf_mc_timer_stop() function stops a timer that has been started but - * has not expired, essentially cancelling the 'start' request. - * - * After a timer is stopped, it goes back to the state it was in after it - * was created and can be started again via a call to cdf_mc_timer_start(). - * - * Return: - * QDF_STATUS_SUCCESS - Timer is initialized successfully - * CDF failure status - Timer initialization failed - */ -QDF_STATUS cdf_mc_timer_stop(cdf_mc_timer_t *timer) -{ - unsigned long flags; - - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, - "%s: Timer Addr inside cds_disable : 0x%p", __func__, timer); - - /* check for invalid pointer */ - if (NULL == timer) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s Null timer pointer being passed", __func__); - CDF_ASSERT(0); - return QDF_STATUS_E_INVAL; - } - - /* check if timer refers to an uninitialized object */ - if (LINUX_TIMER_COOKIE != timer->platformInfo.cookie) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "%s: Cannot stop uninitialized timer", __func__); - CDF_ASSERT(0); - - return QDF_STATUS_E_INVAL; - } - - /* ensure the timer state is correct */ - spin_lock_irqsave(&timer->platformInfo.spinlock, flags); - - if (CDF_TIMER_STATE_RUNNING != timer->state) { - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, - "%s: Cannot stop timer in state = %d", - __func__, timer->state); - return QDF_STATUS_SUCCESS; - } - - timer->state = CDF_TIMER_STATE_STOPPED; - - del_timer(&(timer->platformInfo.Timer)); - - spin_unlock_irqrestore(&timer->platformInfo.spinlock, flags); - - try_allowing_sleep(timer->type); - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_mc_timer_get_system_ticks() - get the system time in 10ms ticks - - * cdf_mc_timer_get_system_ticks() function returns the current number - * of timer ticks in 10msec intervals. This function is suitable timestamping - * and calculating time intervals by calculating the difference between two - * timestamps. - * - * Return: - * The current system tick count (in 10msec intervals). This - * function cannot fail. - */ -unsigned long cdf_mc_timer_get_system_ticks(void) -{ - return jiffies_to_msecs(jiffies) / 10; -} - -/** - * cdf_mc_timer_get_system_time() - Get the system time in milliseconds - * - * cdf_mc_timer_get_system_time() function returns the number of milliseconds - * that have elapsed since the system was started - * - * Return: - * The current system time in milliseconds - */ -unsigned long cdf_mc_timer_get_system_time(void) -{ - struct timeval tv; - do_gettimeofday(&tv); - return tv.tv_sec * 1000 + tv.tv_usec / 1000; -} diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 746f7913841a..0c4de4378690 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -36,7 +36,7 @@ #include "cdf_nbuf.h" #include "cdf_trace.h" #include "qdf_lock.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" #if defined(CONFIG_CNSS) #include @@ -273,18 +273,18 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) flags = GFP_ATOMIC; new_size = size + sizeof(struct s_cdf_mem_struct) + 8; - time_before_kzalloc = cdf_mc_timer_get_system_time(); + time_before_kzalloc = qdf_mc_timer_get_system_time(); memStruct = (struct s_cdf_mem_struct *)kzalloc(new_size, flags); /** * If time taken by kmalloc is greater than * CDF_GET_MEMORY_TIME_THRESHOLD msec */ - if (cdf_mc_timer_get_system_time() - time_before_kzalloc >= + if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS at line %d", __func__, - cdf_mc_timer_get_system_time() - time_before_kzalloc, + qdf_mc_timer_get_system_time() - time_before_kzalloc, size, (void *)_RET_IP_, lineNum); if (memStruct != NULL) { @@ -415,18 +415,18 @@ void *cdf_mem_malloc(size_t size) if (in_interrupt() || irqs_disabled() || in_atomic()) flags = GFP_ATOMIC; - time_before_kzalloc = cdf_mc_timer_get_system_time(); + time_before_kzalloc = qdf_mc_timer_get_system_time(); memPtr = kzalloc(size, flags); /** * If time taken by kmalloc is greater than * CDF_GET_MEMORY_TIME_THRESHOLD msec */ - if (cdf_mc_timer_get_system_time() - time_before_kzalloc >= + if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS", __func__, - cdf_mc_timer_get_system_time() - time_before_kzalloc, + qdf_mc_timer_get_system_time() - time_before_kzalloc, size, (void *)_RET_IP_); return memPtr; } diff --git a/core/cdf/src/i_cdf_mc_timer.h b/core/cdf/src/i_cdf_mc_timer.h deleted file mode 100644 index 91e94ab4230a..000000000000 --- a/core/cdf/src/i_cdf_mc_timer.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__I_CDF_MC_TIMER_H) -#define __I_CDF_MC_TIMER_H - -/** - * DOC: i_cdf_mc_timer.h - * - * Linux-specific definitions for CDF timers serialized to MC thread - */ - -/* Include Files */ -#include -#include -#include -#include -#include - -/* Preprocessor definitions and constants */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ -/* Type declarations */ - -typedef struct cdf_mc_timer_platform_s { - struct timer_list Timer; - int threadID; - uint32_t cookie; - spinlock_t spinlock; -} cdf_mc_timer_platform_t; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* __I_CDF_MC_TIMER_H */ diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index d6c4afdb82cc..92773f5a88b8 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include /* Amount of time to wait for WMA to perform an asynchronous activity. diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 4b506c9a1b19..4827a49a5903 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 0f5e2f7f9eee..d0c6bbfb6e3f 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -433,7 +433,7 @@ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext); void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext); void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext); -void cdf_timer_module_init(void); +void qdf_timer_module_init(void); void cds_ssr_protect_init(void); void cds_ssr_protect(const char *caller_func); void cds_ssr_unprotect(const char *caller_func); diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index f52ec524e346..3f2c4890456f 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -89,7 +89,7 @@ void cds_sys_probe_thread_cback(void *pUserData); */ v_CONTEXT_t cds_init(void) { - cdf_mc_timer_manager_init(); + qdf_mc_timer_manager_init(); cdf_mem_init(); gp_cds_context = &g_cds_context; @@ -124,7 +124,7 @@ void cds_deinit(void) cdf_mem_zero(&g_cds_context, sizeof(g_cds_context)); - cdf_mc_timer_exit(); + qdf_mc_timer_manager_exit(); cdf_mem_exit(); return; @@ -188,7 +188,7 @@ QDF_STATUS cds_open(void) } /* Initialize the timer module */ - cdf_timer_module_init(); + qdf_timer_module_init(); /* Initialize bug reporting structure */ cds_init_log_completion(); @@ -1453,9 +1453,9 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) * destroyed after stop */ if (pmac->sap.SapDfsInfo.is_dfs_cac_timer_running) { - cdf_mc_timer_stop(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_stop(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); pmac->sap.SapDfsInfo.is_dfs_cac_timer_running = 0; - cdf_mc_timer_destroy(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_destroy(&pmac->sap.SapDfsInfo.sap_dfs_cac_timer); } qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index f6ddb6310126..b8fbd6b3ed27 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3721,8 +3721,8 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, /* do we need to change the HW mode */ if (cds_need_opportunistic_upgrade()) { /* let's start the timer */ - cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); - qdf_status = cdf_mc_timer_start( + qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); + qdf_status = qdf_mc_timer_start( &hdd_ctx->dbs_opportunistic_timer, DBS_OPPORTUNISTIC_TIME * 1000); @@ -3888,7 +3888,7 @@ QDF_STATUS cds_init_policy_mgr(void) sme_register_hw_mode_trans_cb(hdd_ctx->hHal, cds_hw_mode_transition_cb); - status = cdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer, + status = qdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer, QDF_TIMER_TYPE_SW, cds_dbs_opportunistic_timer_handler, (void *)hdd_ctx); diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index 5c7f400c8cae..c95cc3b83370 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -40,7 +40,7 @@ ------------------------------------------------------------------------*/ #include #include -#include +#include #include #include #include "cdf_nbuf.h" @@ -196,7 +196,7 @@ void cds_pkt_trace_buf_update(char *event_string) qdf_spinlock_acquire(&trace_buffer_lock); slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF; trace_buffer[slot].order = trace_buffer_order; - trace_buffer[slot].event_time = cdf_mc_timer_get_system_time(); + trace_buffer[slot].event_time = qdf_mc_timer_get_system_time(); cdf_mem_zero(trace_buffer[slot].event_string, sizeof(trace_buffer[slot].event_string)); cdf_mem_copy(trace_buffer[slot].event_string, @@ -220,7 +220,7 @@ void cds_pkt_trace_buf_dump(void) qdf_spinlock_acquire(&trace_buffer_lock); CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP START Current Timestamp %u", - (unsigned int)cdf_mc_timer_get_system_time()); + (unsigned int)qdf_mc_timer_get_system_time()); CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ORDER : TIME : EVT"); if (CDS_PKT_TRAC_MAX_TRACE_BUF > trace_buffer_order) { diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 2307ae40fd10..cf4a76ce355f 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -570,7 +570,7 @@ typedef struct hdd_remain_on_chan_ctx { unsigned int duration; u64 cookie; rem_on_channel_request_type_t rem_on_chan_request; - cdf_mc_timer_t hdd_remain_on_chan_timer; + qdf_mc_timer_t hdd_remain_on_chan_timer; action_pkt_buffer_t action_pkt_buff; bool hdd_remain_on_chan_cancel_in_progress; uint32_t scan_id; @@ -734,7 +734,7 @@ struct hdd_ap_ctx_s { bool apDisableIntraBssFwd; - cdf_mc_timer_t hdd_ap_inactivity_timer; + qdf_mc_timer_t hdd_ap_inactivity_timer; uint8_t operatingChannel; @@ -978,7 +978,7 @@ struct hdd_adapter_s { bool is_roc_inprogress; #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL - cdf_mc_timer_t tx_flow_control_timer; + qdf_mc_timer_t tx_flow_control_timer; bool tx_flow_timer_initialized; unsigned int tx_flow_low_watermark; unsigned int tx_flow_high_watermark_offset; @@ -1213,7 +1213,7 @@ struct hdd_context_s { #ifdef MSM_PLATFORM /* DDR bus bandwidth compute timer */ - cdf_mc_timer_t bus_bw_timer; + qdf_mc_timer_t bus_bw_timer; int cur_vote_level; spinlock_t bus_bw_lock; int cur_rx_level; @@ -1270,7 +1270,7 @@ struct hdd_context_s { #endif fw_log_info fw_log_settings; #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - cdf_mc_timer_t skip_acs_scan_timer; + qdf_mc_timer_t skip_acs_scan_timer; uint8_t skip_acs_scan_status; #endif @@ -1312,12 +1312,12 @@ struct hdd_context_s { #ifdef WLAN_FEATURE_MEMDUMP uint8_t *fw_dump_loc; uint32_t dump_loc_paddr; - cdf_mc_timer_t memdump_cleanup_timer; + qdf_mc_timer_t memdump_cleanup_timer; struct mutex memdump_lock; bool memdump_in_progress; #endif /* WLAN_FEATURE_MEMDUMP */ - cdf_mc_timer_t dbs_opportunistic_timer; + qdf_mc_timer_t dbs_opportunistic_timer; bool connection_in_progress; qdf_spinlock_t connection_status_lock; diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index 5e149a879e5a..03c7ff1c3db0 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -280,7 +280,7 @@ struct _hddTdlsPeer_t; typedef struct { struct list_head peer_list[TDLS_PEER_LIST_SIZE]; hdd_adapter_t *pAdapter; - cdf_mc_timer_t peerDiscoveryTimeoutTimer; + qdf_mc_timer_t peerDiscoveryTimeoutTimer; tdls_config_params_t threshold_config; int32_t discovery_peer_cnt; uint32_t discovery_sent_cnt; @@ -491,7 +491,7 @@ int wlan_hdd_tdls_scan_callback(hdd_adapter_t *pAdapter, struct wiphy *wiphy, void wlan_hdd_tdls_scan_done_callback(hdd_adapter_t *pAdapter); void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, - cdf_mc_timer_t *timer, + qdf_mc_timer_t *timer, uint32_t expirationTime); void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter, hddTdlsPeer_t *curr_peer, diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index b12c198b96ce..881a78849f4c 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -73,7 +73,7 @@ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, void hdd_tx_resume_cb(void *adapter_context, bool tx_resume); void hdd_tx_resume_timer_expired_handler(void *adapter_context); void hdd_register_tx_flow_control(hdd_adapter_t *adapter, - cdf_mc_timer_callback_t timer_callback, + qdf_mc_timer_callback_t timer_callback, ol_txrx_tx_flow_control_fp flowControl); void hdd_deregister_tx_flow_control(hdd_adapter_t *adapter); void hdd_get_tx_resource(hdd_adapter_t *adapter, @@ -89,7 +89,7 @@ static inline void hdd_tx_resume_timer_expired_handler(void *adapter_context) return; } static inline void hdd_register_tx_flow_control(hdd_adapter_t *adapter, - cdf_mc_timer_callback_t timer_callback, + qdf_mc_timer_callback_t timer_callback, ol_txrx_tx_flow_control_fp flowControl) { return; diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h index b2171653210c..3194d10bb8ac 100644 --- a/core/hdd/inc/wlan_hdd_wmm.h +++ b/core/hdd/inc/wlan_hdd_wmm.h @@ -178,7 +178,7 @@ typedef struct hdd_wmm_ac_status { #ifdef FEATURE_WLAN_ESE uint32_t wmmInactivityTime; uint32_t wmmPrevTrafficCnt; - cdf_mc_timer_t wmmInactivityTimer; + qdf_mc_timer_t wmmInactivityTimer; #endif } hdd_wmm_ac_status_t; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 80cd4b532a44..960c073fa85f 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -7357,7 +7357,7 @@ wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter, qie_age->oui_3 = QCOM_OUI3; qie_age->type = QCOM_VENDOR_IE_AGE_TYPE; qie_age->age = - cdf_mc_timer_get_system_ticks() - bss_desc->nReceivedTime; + qdf_mc_timer_get_system_ticks() - bss_desc->nReceivedTime; qie_age->tsf_delta = bss_desc->tsf_delta; #endif diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index 57dc2c995850..7149bb468de1 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -91,7 +91,7 @@ struct hdd_green_ap_ctx { enum hdd_green_ap_ps_state ps_state; enum hdd_green_ap_event ps_event; - cdf_mc_timer_t ps_timer; + qdf_mc_timer_t ps_timer; bool egap_support; }; @@ -212,7 +212,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx, hdd_wlan_green_ap_update(hdd_ctx, GREEN_AP_PS_WAIT_STATE, GREEN_AP_PS_WAIT_EVENT); - cdf_mc_timer_start(&green_ap->ps_timer, + qdf_mc_timer_start(&green_ap->ps_timer, green_ap->ps_delay_time); } break; @@ -229,7 +229,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx, hdd_wlan_green_ap_update(hdd_ctx, 0, GREEN_AP_PS_WAIT_EVENT); - cdf_mc_timer_start(&green_ap->ps_timer, + qdf_mc_timer_start(&green_ap->ps_timer, green_ap->ps_on_time); } } else { @@ -261,7 +261,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx, goto done; } - cdf_mc_timer_start(&green_ap->ps_timer, + qdf_mc_timer_start(&green_ap->ps_timer, green_ap->ps_delay_time); } break; @@ -325,7 +325,7 @@ static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) green_ap->ps_on_time = GREEN_AP_PS_ON_TIME; green_ap->ps_delay_time = GREEN_AP_PS_DELAY_TIME; - cdf_mc_timer_init(&green_ap->ps_timer, + qdf_mc_timer_init(&green_ap->ps_timer, QDF_TIMER_TYPE_SW, hdd_wlan_green_ap_timer_fn, hdd_ctx); @@ -356,12 +356,12 @@ static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) } /* check if the timer status is destroyed */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&green_ap->ps_timer)) - cdf_mc_timer_stop(&green_ap->ps_timer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&green_ap->ps_timer)) + qdf_mc_timer_stop(&green_ap->ps_timer); /* Destroy the Green AP timer */ - if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_destroy(&green_ap->ps_timer))) + if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_destroy(&green_ap->ps_timer))) hdd_notice("Cannot deallocate Green-AP's timer"); /* release memory */ diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0da6f0d4d275..eae9e175a609 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -484,7 +484,7 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) pHostapdAdapter = netdev_priv(dev); pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); qdf_status = - cdf_mc_timer_start(&pHddApCtx->hdd_ap_inactivity_timer, + qdf_mc_timer_start(&pHddApCtx->hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX(pHostapdAdapter))-> config->nAPAutoShutOff * 1000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -978,7 +978,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, nAPAutoShutOff) { /* AP Inactivity timer init and start */ qdf_status = - cdf_mc_timer_init(&pHddApCtx-> + qdf_mc_timer_init(&pHddApCtx-> hdd_ap_inactivity_timer, QDF_TIMER_TYPE_SW, hdd_hostapd_inactivity_timer_cb, @@ -988,7 +988,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, FL("Failed to init inactivity timer")); qdf_status = - cdf_mc_timer_start(&pHddApCtx-> + qdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX (pHostapdAdapter))->config-> @@ -1374,9 +1374,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHddApCtx->bApActive = true; /* Stop AP inactivity timer */ if (pHddApCtx->hdd_ap_inactivity_timer.state == - CDF_TIMER_STATE_RUNNING) { + QDF_TIMER_STATE_RUNNING) { qdf_status = - cdf_mc_timer_stop(&pHddApCtx-> + qdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, @@ -1504,9 +1504,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, nAPAutoShutOff)) { if (pHddApCtx->bApActive == false) { if (pHddApCtx->hdd_ap_inactivity_timer.state == - CDF_TIMER_STATE_STOPPED) { + QDF_TIMER_STATE_STOPPED) { qdf_status = - cdf_mc_timer_start(&pHddApCtx-> + qdf_mc_timer_start(&pHddApCtx-> hdd_ap_inactivity_timer, (WLAN_HDD_GET_CTX (pHostapdAdapter))-> @@ -1518,10 +1518,10 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, FL("Failed to init AP inactivity timer")); } else CDF_ASSERT - (cdf_mc_timer_get_current_state + (qdf_mc_timer_get_current_state (&pHddApCtx-> hdd_ap_inactivity_timer) == - CDF_TIMER_STATE_STOPPED); + QDF_TIMER_STATE_STOPPED); } } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN @@ -1715,8 +1715,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHddCtx->skip_acs_scan_status = eSAP_SKIP_ACS_SCAN; hddLog(LOG1, FL("Reusing Last ACS scan result for %d sec"), ACS_SCAN_EXPIRY_TIMEOUT_S); - cdf_mc_timer_stop(&pHddCtx->skip_acs_scan_timer); - qdf_status = cdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, + qdf_mc_timer_stop(&pHddCtx->skip_acs_scan_timer); + qdf_status = qdf_mc_timer_start(&pHddCtx->skip_acs_scan_timer, ACS_SCAN_EXPIRY_TIMEOUT_S * 1000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -1826,10 +1826,10 @@ stopbss: if (0 != (WLAN_HDD_GET_CTX(pHostapdAdapter))->config-> nAPAutoShutOff) { - if (CDF_TIMER_STATE_RUNNING == + if (QDF_TIMER_STATE_RUNNING == pHddApCtx->hdd_ap_inactivity_timer.state) { qdf_status = - cdf_mc_timer_stop(&pHddApCtx-> + qdf_mc_timer_stop(&pHddApCtx-> hdd_ap_inactivity_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, @@ -1838,7 +1838,7 @@ stopbss: } qdf_status = - cdf_mc_timer_destroy(&pHddApCtx-> + qdf_mc_timer_destroy(&pHddApCtx-> hdd_ap_inactivity_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to Destroy AP inactivity timer")); diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 963ffd3398d0..8f228d128386 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -435,10 +435,10 @@ struct hdd_ipa_priv { uint64_t ipa_rx_net_send_count; uint64_t ipa_rx_internel_drop_count; uint64_t ipa_rx_destructor_count; - cdf_mc_timer_t rt_debug_timer; + qdf_mc_timer_t rt_debug_timer; struct uc_rt_debug_info rt_bug_buffer[HDD_IPA_UC_RT_DEBUG_BUF_COUNT]; unsigned int rt_buf_fill_index; - cdf_mc_timer_t rt_debug_fill_timer; + qdf_mc_timer_t rt_debug_fill_timer; qdf_mutex_t rt_debug_lock; qdf_mutex_t ipa_lock; @@ -728,7 +728,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext) dump_info = &hdd_ipa->rt_bug_buffer[ hdd_ipa->rt_buf_fill_index % HDD_IPA_UC_RT_DEBUG_BUF_COUNT]; - dump_info->time = cdf_mc_timer_get_system_time(); + dump_info->time = qdf_mc_timer_get_system_time(); dump_info->ipa_excep_count = hdd_ipa->stats.num_rx_excep; dump_info->rx_drop_count = hdd_ipa->ipa_rx_internel_drop_count; dump_info->net_sent_count = hdd_ipa->ipa_rx_net_send_count; @@ -739,7 +739,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext) hdd_ipa->rt_buf_fill_index++; qdf_mutex_release(&hdd_ipa->rt_debug_lock); - cdf_mc_timer_start(&hdd_ipa->rt_debug_fill_timer, + qdf_mc_timer_start(&hdd_ipa->rt_debug_fill_timer, HDD_IPA_UC_RT_DEBUG_FILL_INTERVAL); } @@ -833,7 +833,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext) kfree(dummy_ptr); } - cdf_mc_timer_start(&hdd_ipa->rt_debug_timer, + qdf_mc_timer_start(&hdd_ipa->rt_debug_timer, HDD_IPA_UC_RT_DEBUG_PERIOD); } @@ -869,11 +869,11 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx) { struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; - if (CDF_TIMER_STATE_STOPPED != - cdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_fill_timer)) { - cdf_mc_timer_stop(&hdd_ipa->rt_debug_fill_timer); + if (QDF_TIMER_STATE_STOPPED != + qdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_fill_timer)) { + qdf_mc_timer_stop(&hdd_ipa->rt_debug_fill_timer); } - cdf_mc_timer_destroy(&hdd_ipa->rt_debug_fill_timer); + qdf_mc_timer_destroy(&hdd_ipa->rt_debug_fill_timer); qdf_mutex_destroy(&hdd_ipa->rt_debug_lock); if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) { @@ -882,11 +882,11 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx) return; } - if (CDF_TIMER_STATE_STOPPED != - cdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_timer)) { - cdf_mc_timer_stop(&hdd_ipa->rt_debug_timer); + if (QDF_TIMER_STATE_STOPPED != + qdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_timer)) { + qdf_mc_timer_stop(&hdd_ipa->rt_debug_timer); } - cdf_mc_timer_destroy(&hdd_ipa->rt_debug_timer); + qdf_mc_timer_destroy(&hdd_ipa->rt_debug_timer); } /** @@ -902,7 +902,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; qdf_mutex_create(&hdd_ipa->rt_debug_lock); - cdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx); hdd_ipa->rt_buf_fill_index = 0; cdf_mem_zero(hdd_ipa->rt_bug_buffer, @@ -914,7 +914,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) hdd_ipa->ipa_rx_internel_drop_count = 0; hdd_ipa->ipa_rx_destructor_count = 0; - cdf_mc_timer_start(&hdd_ipa->rt_debug_fill_timer, + qdf_mc_timer_start(&hdd_ipa->rt_debug_fill_timer, HDD_IPA_UC_RT_DEBUG_FILL_INTERVAL); /* Reatime debug enable on feature enable */ @@ -923,9 +923,9 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) "%s: IPA RT debug is not enabled", __func__); return; } - cdf_mc_timer_init(&hdd_ipa->rt_debug_timer, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init(&hdd_ipa->rt_debug_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_handler, (void *)hdd_ctx); - cdf_mc_timer_start(&hdd_ipa->rt_debug_timer, + qdf_mc_timer_start(&hdd_ipa->rt_debug_timer, HDD_IPA_UC_RT_DEBUG_PERIOD); } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 1a484a471c0a..965ef7b036a7 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3699,38 +3699,38 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_abort_mac_scan_all_adapters(hdd_ctx); #ifdef MSM_PLATFORM - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) { - cdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) { + qdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); } if (!QDF_IS_STATUS_SUCCESS - (cdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) { + (qdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate Bus bandwidth timer")); } #endif #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&hdd_ctx->skip_acs_scan_timer)) { - cdf_mc_timer_stop(&hdd_ctx->skip_acs_scan_timer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&hdd_ctx->skip_acs_scan_timer)) { + qdf_mc_timer_stop(&hdd_ctx->skip_acs_scan_timer); } if (!QDF_IS_STATUS_SUCCESS - (cdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) { + (qdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate ACS Skip timer")); } #endif - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &hdd_ctx->dbs_opportunistic_timer)) { - cdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); + qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); } if (!QDF_IS_STATUS_SUCCESS - (cdf_mc_timer_destroy( + (qdf_mc_timer_destroy( &hdd_ctx->dbs_opportunistic_timer))) { hdd_err("Cannot deallocate dbs opportunistic timer"); } @@ -4339,7 +4339,7 @@ static void hdd_bus_bw_compute_cbk(void *priv) hdd_ipa_set_perf_level(hdd_ctx, tx_packets, rx_packets); hdd_ipa_uc_stat_request(adapter, 2); - cdf_mc_timer_start(&hdd_ctx->bus_bw_timer, + qdf_mc_timer_start(&hdd_ctx->bus_bw_timer, hdd_ctx->config->busBandwidthComputeInterval); } #endif @@ -5693,7 +5693,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #endif #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - status = cdf_mc_timer_init(&hdd_ctx->skip_acs_scan_timer, + status = qdf_mc_timer_init(&hdd_ctx->skip_acs_scan_timer, QDF_TIMER_TYPE_SW, hdd_skip_acs_scan_timer_handler, (void *)hdd_ctx); @@ -5726,7 +5726,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) #ifdef MSM_PLATFORM spin_lock_init(&hdd_ctx->bus_bw_lock); - cdf_mc_timer_init(&hdd_ctx->bus_bw_timer, + qdf_mc_timer_init(&hdd_ctx->bus_bw_timer, QDF_TIMER_TYPE_SW, hdd_bus_bw_compute_cbk, (void *)hdd_ctx); #endif @@ -6422,11 +6422,11 @@ void hdd_start_bus_bw_compute_timer(hdd_adapter_t *adapter) { hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) return; - cdf_mc_timer_start(&hdd_ctx->bus_bw_timer, + qdf_mc_timer_start(&hdd_ctx->bus_bw_timer, hdd_ctx->config->busBandwidthComputeInterval); } @@ -6437,8 +6437,8 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) bool can_stop = true; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - if (CDF_TIMER_STATE_RUNNING != - cdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) { + if (QDF_TIMER_STATE_RUNNING != + qdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) { /* trying to stop timer, when not running is not good */ hddLog(CDF_TRACE_LEVEL_ERROR, FL("bus band width compute timer is not running")); @@ -6475,7 +6475,7 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) } if (can_stop == true) - cdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); + qdf_mc_timer_stop(&hdd_ctx->bus_bw_timer); } #endif diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 841efc28650b..4200f2360375 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -285,7 +285,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, * User space will not be able to access the dump after this time. * New request should be issued to get the dump again. */ - cdf_mc_timer_start(&hdd_ctx->memdump_cleanup_timer, + qdf_mc_timer_start(&hdd_ctx->memdump_cleanup_timer, MEMDUMP_COMPLETION_TIME_MS); hdd_ctx->memdump_in_progress = true; @@ -304,10 +304,10 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, hdd_ctx->fw_dump_loc = NULL; mutex_unlock(&hdd_ctx->memdump_lock); hdd_ctx->memdump_in_progress = false; - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &hdd_ctx->memdump_cleanup_timer)) { - cdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); + qdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); } return -EINVAL; } @@ -447,10 +447,10 @@ static ssize_t memdump_read(struct file *file, char __user *buf, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &hdd_ctx->memdump_cleanup_timer)) { - cdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); + qdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); } mutex_unlock(&hdd_ctx->memdump_lock); } @@ -568,7 +568,7 @@ int memdump_init(void) init_completion(&fw_dump_context.response_event); - qdf_status = cdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, + qdf_status = qdf_mc_timer_init(&hdd_ctx->memdump_cleanup_timer, QDF_TIMER_TYPE_SW, memdump_cleanup_timer_cb, (void *)hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -626,12 +626,12 @@ void memdump_deinit(void) } mutex_unlock(&hdd_ctx->memdump_lock); - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&hdd_ctx->memdump_cleanup_timer)) { - cdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&hdd_ctx->memdump_cleanup_timer)) { + qdf_mc_timer_stop(&hdd_ctx->memdump_cleanup_timer); } - qdf_status = cdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); + qdf_status = qdf_mc_timer_destroy(&hdd_ctx->memdump_cleanup_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, FL("Failed to deallocate timer")); } diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 05aaf1c2e700..6751a5170f70 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -185,8 +185,8 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, } hddLog(LOG1, "Received remain on channel rsp"); - cdf_mc_timer_stop(&pRemainChanCtx->hdd_remain_on_chan_timer); - cdf_mc_timer_destroy(&pRemainChanCtx->hdd_remain_on_chan_timer); + qdf_mc_timer_stop(&pRemainChanCtx->hdd_remain_on_chan_timer); + qdf_mc_timer_destroy(&pRemainChanCtx->hdd_remain_on_chan_timer); cfgState->remain_on_chan_ctx = NULL; /* @@ -217,7 +217,7 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, cookie, &pRemainChanCtx->chan, GFP_KERNEL); - pAdapter->last_roc_ts = cdf_mc_timer_get_system_time(); + pAdapter->last_roc_ts = qdf_mc_timer_get_system_time(); } /* Schedule any pending RoC: Any new roc request during this time @@ -281,9 +281,9 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) if (cfgState->remain_on_chan_ctx != NULL) { hddLog(LOGE, "Cancel Existing Remain on Channel"); - if (CDF_TIMER_STATE_RUNNING == cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state( &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer)) - cdf_mc_timer_stop(&cfgState->remain_on_chan_ctx-> + qdf_mc_timer_stop(&cfgState->remain_on_chan_ctx-> hdd_remain_on_chan_timer); pRemainChanCtx = cfgState->remain_on_chan_ctx; @@ -446,8 +446,8 @@ wait: roc_ctx = cfg_state->remain_on_chan_ctx; if (roc_ctx != NULL) { cfg_state->remain_on_chan_ctx = NULL; - cdf_mc_timer_stop(&roc_ctx->hdd_remain_on_chan_timer); - cdf_mc_timer_destroy( + qdf_mc_timer_stop(&roc_ctx->hdd_remain_on_chan_timer); + qdf_mc_timer_destroy( &roc_ctx->hdd_remain_on_chan_timer); if (roc_ctx->action_pkt_buff.frame_ptr != NULL && roc_ctx->action_pkt_buff.frame_length != 0) { @@ -566,7 +566,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, /* Initialize Remain on chan timer */ qdf_status = - cdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, + qdf_mc_timer_init(&pRemainChanCtx->hdd_remain_on_chan_timer, QDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); if (qdf_status != QDF_STATUS_SUCCESS) { @@ -622,7 +622,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, cfgState->remain_on_chan_ctx = NULL; pAdapter->is_roc_inprogress = false; mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - cdf_mc_timer_destroy( + qdf_mc_timer_destroy( &pRemainChanCtx->hdd_remain_on_chan_timer); cdf_mem_free(pRemainChanCtx); hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC); @@ -658,7 +658,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, cfgState->remain_on_chan_ctx = NULL; pAdapter->is_roc_inprogress = false; mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - cdf_mc_timer_destroy( + qdf_mc_timer_destroy( &pRemainChanCtx->hdd_remain_on_chan_timer); cdf_mem_free(pRemainChanCtx); hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC); @@ -875,7 +875,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, hdd_conn_is_connected( WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter))) { if (pAdapter->last_roc_ts != 0 && - ((cdf_mc_timer_get_system_time() - + ((qdf_mc_timer_get_system_time() - pAdapter->last_roc_ts) < pHddCtx->config->p2p_listen_defer_interval)) { if (pRemainChanCtx->duration > HDD_P2P_MAX_ROC_DURATION) @@ -996,7 +996,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); hddLog(LOG1, "Ready on chan ind %d", scan_id); - pAdapter->start_roc_ts = cdf_mc_timer_get_system_time(); + pAdapter->start_roc_ts = qdf_mc_timer_get_system_time(); mutex_lock(&cfgState->remain_on_chan_ctx_lock); pRemainChanCtx = cfgState->remain_on_chan_ctx; if (pRemainChanCtx != NULL) { @@ -1005,15 +1005,15 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, pAdapter->sessionId, pRemainChanCtx->duration)); /* start timer for actual duration */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &pRemainChanCtx->hdd_remain_on_chan_timer)) { hddLog(LOGE, "Timer Started before ready event!!!"); - cdf_mc_timer_stop(&pRemainChanCtx-> + qdf_mc_timer_stop(&pRemainChanCtx-> hdd_remain_on_chan_timer); } status = - cdf_mc_timer_start(&pRemainChanCtx-> + qdf_mc_timer_start(&pRemainChanCtx-> hdd_remain_on_chan_timer, (pRemainChanCtx->duration + COMPLETE_EVENT_PROPOGATE_TIME)); @@ -1134,7 +1134,7 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, } if (NULL != cfgState->remain_on_chan_ctx) { - cdf_mc_timer_stop(&cfgState->remain_on_chan_ctx-> + qdf_mc_timer_stop(&cfgState->remain_on_chan_ctx-> hdd_remain_on_chan_timer); if (true == pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress) { @@ -1317,7 +1317,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, mutex_lock(&cfgState->remain_on_chan_ctx_lock); if (cfgState->remain_on_chan_ctx) { - uint32_t current_time = cdf_mc_timer_get_system_time(); + uint32_t current_time = qdf_mc_timer_get_system_time(); int remaining_roc_time = ((int) cfgState->remain_on_chan_ctx->duration - (current_time - pAdapter->start_roc_ts)); @@ -1418,15 +1418,15 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, [WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET]) && cfgState->remain_on_chan_ctx && cfgState->current_freq == chan->center_freq) { - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&cfgState-> + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&cfgState-> remain_on_chan_ctx-> hdd_remain_on_chan_timer)) { - cdf_mc_timer_stop(&cfgState-> + qdf_mc_timer_stop(&cfgState-> remain_on_chan_ctx-> hdd_remain_on_chan_timer); status = - cdf_mc_timer_start(&cfgState-> + qdf_mc_timer_start(&cfgState-> remain_on_chan_ctx-> hdd_remain_on_chan_timer, wait); @@ -2260,12 +2260,12 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, if (completion_done (&pAdapter-> rem_on_chan_ready_event)) { - if (CDF_TIMER_STATE_RUNNING == cdf_mc_timer_get_current_state(&pRemainChanCtx->hdd_remain_on_chan_timer)) { - cdf_mc_timer_stop + if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state(&pRemainChanCtx->hdd_remain_on_chan_timer)) { + qdf_mc_timer_stop (&pRemainChanCtx-> hdd_remain_on_chan_timer); status = - cdf_mc_timer_start + qdf_mc_timer_start (&pRemainChanCtx-> hdd_remain_on_chan_timer, extend_time); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index cf5dee07d2b4..20c3853d9236 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -489,7 +489,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, event.cmd = IWEVCUSTOM; p = custom; p += scnprintf(p, MAX_CUSTOM_LEN, " Age: %lu", - cdf_mc_timer_get_system_ticks() - + qdf_mc_timer_get_system_ticks() - descriptor->nReceivedTime); event.u.data.length = p - custom; current_event = iwe_stream_add_point(scanInfo->info, current_event, end, @@ -828,7 +828,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanRequest.uIEFieldLen = pAdapter->scan_info.scanAddIE.length; scanRequest.pIEField = pAdapter->scan_info.scanAddIE.addIEdata; } - scanRequest.timestamp = cdf_mc_timer_get_system_ticks(); + scanRequest.timestamp = qdf_mc_timer_get_system_ticks(); status = sme_scan_request((WLAN_HDD_GET_CTX(pAdapter))->hHal, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); @@ -1349,7 +1349,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, cdf_mem_zero(&scan_req, sizeof(scan_req)); hddLog(LOG1, "scan request for ssid = %d", request->n_ssids); - scan_req.timestamp = cdf_mc_timer_get_system_ticks(); + scan_req.timestamp = qdf_mc_timer_get_system_ticks(); /* Even though supplicant doesn't provide any SSIDs, n_ssids is * set to 1. Because of this, driver is assuming that this is not diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 32eed9c5f51e..56134c54e2a8 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -137,10 +137,10 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume) /* Resume TX */ if (true == tx_resume) { - if (CDF_TIMER_STATE_STOPPED != - cdf_mc_timer_get_current_state(&pAdapter-> + if (QDF_TIMER_STATE_STOPPED != + qdf_mc_timer_get_current_state(&pAdapter-> tx_flow_control_timer)) { - cdf_mc_timer_stop(&pAdapter->tx_flow_control_timer); + qdf_mc_timer_stop(&pAdapter->tx_flow_control_timer); } hddLog(LOG1, FL("Enabling queues")); diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 375e547ed54e..8509892cc967 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -463,7 +463,7 @@ static void dump_tdls_state_param_setting(tdlsInfo_t *info) */ static void wlan_hdd_tdls_monitor_timers_stop(tdlsCtx_t *hdd_tdls_ctx) { - cdf_mc_timer_stop(&hdd_tdls_ctx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_stop(&hdd_tdls_ctx->peerDiscoveryTimeoutTimer); } /** @@ -583,7 +583,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) /* initialize TDLS pAdater context */ cdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t)); - cdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer, + qdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer, QDF_TIMER_TYPE_SW, wlan_hdd_tdls_discovery_timeout_peer_cb, pHddTdlsCtx); @@ -681,7 +681,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) if (NULL == tInfo) { hddLog(CDF_TRACE_LEVEL_ERROR, FL("cdf_mem_alloc failed for tInfo")); - cdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); cdf_mem_free(pHddTdlsCtx); return -ENOMEM; } @@ -725,7 +725,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); if (QDF_STATUS_SUCCESS != cdf_ret_status) { cdf_mem_free(tInfo); - cdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); cdf_mem_free(pHddTdlsCtx); return -EINVAL; } @@ -854,8 +854,8 @@ done: */ static void wlan_hdd_tdls_monitor_timers_destroy(tdlsCtx_t *pHddTdlsCtx) { - cdf_mc_timer_stop(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); - cdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_stop(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); } /** @@ -1120,7 +1120,7 @@ int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, mutex_unlock(&pHddCtx->tdls_lock); if (0 == pHddTdlsCtx->discovery_sent_cnt) { - cdf_mc_timer_stop(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); + qdf_mc_timer_stop(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); } hddLog(LOG1, @@ -2836,7 +2836,7 @@ void wlan_hdd_tdls_scan_done_callback(hdd_adapter_t *pAdapter) * Return: Void */ void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, - cdf_mc_timer_t *timer, + qdf_mc_timer_t *timer, uint32_t expirationTime) { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); @@ -2848,8 +2848,8 @@ void wlan_hdd_tdls_timer_restart(hdd_adapter_t *pAdapter, } if (hdd_conn_is_connected(pHddStaCtx)) { - cdf_mc_timer_stop(timer); - cdf_mc_timer_start(timer, expirationTime); + qdf_mc_timer_stop(timer); + qdf_mc_timer_start(timer, expirationTime); } } diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 209947de7612..2d67457cd3e1 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -127,10 +127,10 @@ void hdd_tx_resume_cb(void *adapter_context, bool tx_resume) /* Resume TX */ if (true == tx_resume) { - if (CDF_TIMER_STATE_STOPPED != - cdf_mc_timer_get_current_state(&pAdapter-> + if (QDF_TIMER_STATE_STOPPED != + qdf_mc_timer_get_current_state(&pAdapter-> tx_flow_control_timer)) { - cdf_mc_timer_stop(&pAdapter->tx_flow_control_timer); + qdf_mc_timer_stop(&pAdapter->tx_flow_control_timer); } if (qdf_unlikely(hdd_sta_ctx->hdd_ReassocScenario)) { hddLog(LOGW, @@ -154,11 +154,11 @@ void hdd_tx_resume_cb(void *adapter_context, bool tx_resume) * Return: none */ void hdd_register_tx_flow_control(hdd_adapter_t *adapter, - cdf_mc_timer_callback_t timer_callback, + qdf_mc_timer_callback_t timer_callback, ol_txrx_tx_flow_control_fp flow_control_fp) { if (adapter->tx_flow_timer_initialized == false) { - cdf_mc_timer_init(&adapter->tx_flow_control_timer, + qdf_mc_timer_init(&adapter->tx_flow_control_timer, QDF_TIMER_TYPE_SW, timer_callback, adapter); @@ -180,8 +180,8 @@ void hdd_deregister_tx_flow_control(hdd_adapter_t *adapter) { ol_txrx_deregister_tx_flow_control_cb(adapter->sessionId); if (adapter->tx_flow_timer_initialized == true) { - cdf_mc_timer_stop(&adapter->tx_flow_control_timer); - cdf_mc_timer_destroy(&adapter->tx_flow_control_timer); + qdf_mc_timer_stop(&adapter->tx_flow_control_timer); + qdf_mc_timer_destroy(&adapter->tx_flow_control_timer); adapter->tx_flow_timer_initialized = false; } } @@ -207,10 +207,10 @@ void hdd_get_tx_resource(hdd_adapter_t *adapter, wlan_hdd_netif_queue_control(adapter, WLAN_STOP_ALL_NETIF_QUEUE, WLAN_DATA_FLOW_CONTROL); if ((adapter->tx_flow_timer_initialized == true) && - (CDF_TIMER_STATE_STOPPED == - cdf_mc_timer_get_current_state(&adapter-> + (QDF_TIMER_STATE_STOPPED == + qdf_mc_timer_get_current_state(&adapter-> tx_flow_control_timer))) { - cdf_mc_timer_start(&adapter->tx_flow_control_timer, + qdf_mc_timer_start(&adapter->tx_flow_control_timer, timer_value); adapter->hdd_stats.hddTxRxStats.txflow_timer_cnt++; adapter->hdd_stats.hddTxRxStats.txflow_pause_cnt++; diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index e8298e5a69a4..b09c0244261e 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -403,10 +403,10 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) acType, status); } else { pAc->wmmPrevTrafficCnt = currentTrafficCnt; - if (pAc->wmmInactivityTimer.state == CDF_TIMER_STATE_STOPPED) { + if (pAc->wmmInactivityTimer.state == QDF_TIMER_STATE_STOPPED) { /* Restart the timer */ qdf_status = - cdf_mc_timer_start(&pAc->wmmInactivityTimer, + qdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_HDD, @@ -417,9 +417,9 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) acType); } } else { - CDF_ASSERT(cdf_mc_timer_get_current_state + CDF_ASSERT(qdf_mc_timer_get_current_state (&pAc->wmmInactivityTimer) == - CDF_TIMER_STATE_STOPPED); + QDF_TIMER_STATE_STOPPED); } } @@ -451,7 +451,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, pAdapter = pQosContext->pAdapter; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - qdf_status = cdf_mc_timer_init(&pAc->wmmInactivityTimer, + qdf_status = qdf_mc_timer_init(&pAc->wmmInactivityTimer, QDF_TIMER_TYPE_SW, hdd_wmm_inactivity_timer_cb, pQosContext); @@ -462,13 +462,13 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, return qdf_status; } /* Start the inactivity timer */ - qdf_status = cdf_mc_timer_start(&pAc->wmmInactivityTimer, + qdf_status = qdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL("Starting inactivity timer failed on AC %d"), acType); - qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + qdf_status = qdf_mc_timer_destroy(&pAc->wmmInactivityTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to destroy inactivity timer"); } @@ -508,12 +508,12 @@ hdd_wmm_disable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext) if (pQosContext->is_inactivity_timer_running == true) { pQosContext->is_inactivity_timer_running = false; - qdf_status = cdf_mc_timer_stop(&pAc->wmmInactivityTimer); + qdf_status = qdf_mc_timer_stop(&pAc->wmmInactivityTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hdd_err("Failed to stop inactivity timer"); return qdf_status; } - qdf_status = cdf_mc_timer_destroy(&pAc->wmmInactivityTimer); + qdf_status = qdf_mc_timer_destroy(&pAc->wmmInactivityTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hdd_err("Failed to destroy inactivity timer:Timer started"); } diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index ba0332f93b4f..c7013e18425e 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -453,12 +453,12 @@ typedef struct sPESession /* Added to Support BT-AMP */ #endif bool isNonRoamReassoc; #ifdef WLAN_FEATURE_11W - cdf_mc_timer_t pmfComebackTimer; + qdf_mc_timer_t pmfComebackTimer; tComebackTimerInfo pmfComebackTimerInfo; #endif /* WLAN_FEATURE_11W */ uint8_t is_key_installed; /* timer for reseting protection fileds at regular intervals */ - cdf_mc_timer_t protection_fields_reset_timer; + qdf_mc_timer_t protection_fields_reset_timer; void *mac_ctx; /* * variable to store state of various protection struct like diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index f9e8f8440af9..e62c655ae3ff 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1180,11 +1180,11 @@ bool lim_is_assoc_req_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info) return true; if (sta_ds->last_assoc_received_time && - ((cdf_mc_timer_get_system_ticks() - + ((qdf_mc_timer_get_system_ticks() - sta_ds->last_assoc_received_time) < 1000)) return true; - sta_ds->last_assoc_received_time = cdf_mc_timer_get_system_ticks(); + sta_ds->last_assoc_received_time = qdf_mc_timer_get_system_ticks(); return false; } #endif @@ -1237,12 +1237,12 @@ bool lim_is_deauth_diassoc_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info) * AP. So process all deauth/diassoc frames with * a time difference of 1 sec. */ - if ((cdf_mc_timer_get_system_ticks() - + if ((qdf_mc_timer_get_system_ticks() - sta_ds->last_unprot_deauth_disassoc) < 1000) return true; sta_ds->last_unprot_deauth_disassoc = - cdf_mc_timer_get_system_ticks(); + qdf_mc_timer_get_system_ticks(); } else { /* PMF enabed, Management frames are protected */ if (sta_ds->proct_deauh_disassoc_cnt) @@ -1962,7 +1962,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (uint8_t *) mac_hdr->bssId, sizeof(tSirMacAddr)); bss_desc_ptr->nReceivedTime = - (uint32_t)cdf_mc_timer_get_system_ticks(); + (uint32_t)qdf_mc_timer_get_system_ticks(); if (parsed_frm_ptr->mdiePresent) { bss_desc_ptr->mdiePresent = parsed_frm_ptr->mdiePresent; cdf_mem_copy((uint8_t *)bss_desc_ptr->mdie, diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 074ba2f353ff..3326796d98eb 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -911,7 +911,7 @@ lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr, auth_node->fTimerStarted = 0; auth_node->mlmState = eLIM_MLM_AUTHENTICATED_STATE; auth_node->authType = (tAniAuthType) auth_type; - auth_node->timestamp = cdf_mc_timer_get_system_ticks(); + auth_node->timestamp = qdf_mc_timer_get_system_ticks(); lim_add_pre_auth_node(mac_ctx, auth_node); } } diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 443f932ad38c..1c8b8c73d815 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -181,7 +181,7 @@ void lim_convert_active_channel_to_passive_channel(tpAniSirGlobal pMac) uint32_t lastTime = 0; uint32_t timeDiff; uint8_t i; - currentTime = cdf_mc_timer_get_system_time(); + currentTime = qdf_mc_timer_get_system_time(); for (i = 1; i < SIR_MAX_24G_5G_CHANNEL_RANGE; i++) { if ((pMac->lim.dfschannelList.timeStamp[i]) != 0) { lastTime = pMac->lim.dfschannelList.timeStamp[i]; diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 19b3889f60b8..876233f83d1f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -893,7 +893,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, " recvd.Starting timer to wait timeout=%d."), timeout_value); if (QDF_STATUS_SUCCESS != - cdf_mc_timer_start( + qdf_mc_timer_start( &session_entry->pmfComebackTimer, timeout_value)) { lim_log(mac_ctx, LOGE, diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index fadc5edd82e1..803d0e676ef8 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -164,7 +164,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, auth_node->fTimerStarted = 0; auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) | (mac_hdr->seqControl.seqNumLo)); - auth_node->timestamp = cdf_mc_timer_get_system_ticks(); + auth_node->timestamp = qdf_mc_timer_get_system_ticks(); lim_add_pre_auth_node(mac_ctx, auth_node); lim_log(mac_ctx, LOG1, FL("Alloc new data: %p id %d peer "), @@ -253,7 +253,7 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx, auth_node->fTimerStarted = 0; auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) | (mac_hdr->seqControl.seqNumLo)); - auth_node->timestamp = cdf_mc_timer_get_system_ticks(); + auth_node->timestamp = qdf_mc_timer_get_system_ticks(); lim_add_pre_auth_node(mac_ctx, auth_node); /* * Send Authenticaton frame with Success @@ -641,7 +641,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) | (mac_hdr->seqControl.seqNumLo)); - auth_node->timestamp = cdf_mc_timer_get_system_ticks(); + auth_node->timestamp = qdf_mc_timer_get_system_ticks(); lim_add_pre_auth_node(mac_ctx, auth_node); lim_restore_from_auth_state(mac_ctx, eSIR_SME_SUCCESS, rx_auth_frm_body->authStatusCode, pe_session); @@ -1003,7 +1003,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx, auth_node->authType = mac_ctx->lim.gpLimMlmAuthReq->authType; auth_node->seq_num = ((mac_hdr->seqControl.seqNumHi << 4) | (mac_hdr->seqControl.seqNumLo)); - auth_node->timestamp = cdf_mc_timer_get_system_ticks(); + auth_node->timestamp = qdf_mc_timer_get_system_ticks(); lim_add_pre_auth_node(mac_ctx, auth_node); lim_restore_from_auth_state(mac_ctx, eSIR_SME_SUCCESS, rx_auth_frm_body->authStatusCode, pe_session); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 7b16ae7f9ac2..b3e17baa129c 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -360,7 +360,7 @@ __lim_pno_match_fwd_bcn_probepsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->num_results = num_results; for (i = 0; i < result->num_results; i++) { - result->ap[i].ts = cdf_mc_timer_get_system_time(); + result->ap[i].ts = qdf_mc_timer_get_system_time(); result->ap[i].beaconPeriod = frame->beaconInterval; result->ap[i].capability = lim_get_u16((uint8_t *) &frame->capabilityInfo); @@ -411,7 +411,7 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->requestId = 0; result->moreData = 0; - result->ap.ts = cdf_mc_timer_get_system_time(); + result->ap.ts = qdf_mc_timer_get_system_time(); result->ap.beaconPeriod = frame->beaconInterval; result->ap.capability = lim_get_u16((uint8_t *) &frame->capabilityInfo); diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 8b11676d0a93..8b1e0d2e2b13 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -316,7 +316,7 @@ void lim_set_dfs_channel_list(tpAniSirGlobal mac_ctx, uint8_t chan_num, pass_to_active); } dfs_ch_list->timeStamp[chan_num] = - cdf_mc_timer_get_system_time(); + qdf_mc_timer_get_system_time(); } else { lim_log(mac_ctx, LOG1, FL("Channel %d is Active"), chan_num); return; @@ -2423,8 +2423,8 @@ static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx) TX_TIMER *probe_req_timer = &mac_ctx->lim.limTimers.gLimPeriodicProbeReqTimer; - if (cdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer) - != CDF_TIMER_STATE_STOPPED) { + if (qdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer) + != QDF_TIMER_STATE_STOPPED) { lim_log(mac_ctx, LOG1, FL("Invalid state of timer")); return; } diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index b270237434a0..0a75bd445916 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -79,7 +79,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, tSirWPSPBCSession *pbc; uint32_t cur_time; - cur_time = (uint32_t) (cdf_mc_timer_get_system_ticks() / + cur_time = (uint32_t) (qdf_mc_timer_get_system_ticks() / QDF_TICKS_PER_SECOND); qdf_zero_macaddr(&addr); cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); @@ -204,7 +204,7 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, uint32_t curTime; curTime = - (uint32_t) (cdf_mc_timer_get_system_ticks() / + (uint32_t) (qdf_mc_timer_get_system_ticks() / QDF_TICKS_PER_SECOND); PELOG4(lim_log diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 623a900719ab..283649fc3be8 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -127,7 +127,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, (uint8_t *) pHdr->bssId, sizeof(tSirMacAddr)); /* Copy Timestamp, Beacon Interval and Capability Info */ - pBssDescr->scanSysTimeMsec = cdf_mc_timer_get_system_time(); + pBssDescr->scanSysTimeMsec = qdf_mc_timer_get_system_time(); pBssDescr->timeStamp[0] = pBPR->timeStamp[0]; pBssDescr->timeStamp[1] = pBPR->timeStamp[1]; @@ -189,7 +189,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->rssi, pBssDescr->rssi_raw); - pBssDescr->nReceivedTime = (uint32_t) cdf_mc_timer_get_system_ticks(); + pBssDescr->nReceivedTime = (uint32_t) qdf_mc_timer_get_system_ticks(); pBssDescr->tsf_delta = WMA_GET_RX_TSF_DELTA(pRxPacketInfo); lim_log(pMac, LOG1, FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u"), diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index aa1f8ff87f67..1da781411b8f 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -273,9 +273,9 @@ lim_delete_open_auth_pre_auth_node(tpAniSirGlobal mac_ctx) while (temp_node != NULL) { if (temp_node->mlmState == eLIM_MLM_AUTHENTICATED_STATE && temp_node->authType == eSIR_OPEN_SYSTEM && - (cdf_mc_timer_get_system_ticks() > + (qdf_mc_timer_get_system_ticks() > (LIM_OPENAUTH_TIMEOUT + temp_node->timestamp) || - cdf_mc_timer_get_system_ticks() < temp_node->timestamp)) { + qdf_mc_timer_get_system_ticks() < temp_node->timestamp)) { /* Found node to be deleted */ auth_node_freed = true; found_node = temp_node; diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 810565200d3d..02e5b20b445f 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -213,7 +213,7 @@ void pe_reset_protection_callback(void *ptr) } pe_session_entry->old_protection_state = current_protection_state; - if (cdf_mc_timer_start(&pe_session_entry-> + if (qdf_mc_timer_start(&pe_session_entry-> protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME) != QDF_STATUS_SUCCESS) { @@ -366,12 +366,12 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, if (eSIR_INFRA_AP_MODE == bssType) { session_ptr->old_protection_state = 0; session_ptr->mac_ctx = (void *)pMac; - status = cdf_mc_timer_init( + status = qdf_mc_timer_init( &session_ptr->protection_fields_reset_timer, QDF_TIMER_TYPE_SW, pe_reset_protection_callback, (void *)&pMac->lim.gpSession[i]); if (status == QDF_STATUS_SUCCESS) { - status = cdf_mc_timer_start( + status = qdf_mc_timer_start( &session_ptr->protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME); } @@ -382,7 +382,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->pmfComebackTimerInfo.pMac = pMac; session_ptr->pmfComebackTimerInfo.sessionID = *sessionId; - status = cdf_mc_timer_init(&session_ptr->pmfComebackTimer, + status = qdf_mc_timer_init(&session_ptr->pmfComebackTimer, QDF_TIMER_TYPE_SW, lim_pmf_comeback_timer_callback, (void *)&session_ptr->pmfComebackTimerInfo); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -550,8 +550,8 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) } if (LIM_IS_AP_ROLE(session)) { - cdf_mc_timer_stop(&session->protection_fields_reset_timer); - cdf_mc_timer_destroy(&session->protection_fields_reset_timer); + qdf_mc_timer_stop(&session->protection_fields_reset_timer); + qdf_mc_timer_destroy(&session->protection_fields_reset_timer); } #if defined (WLAN_FEATURE_VOWIFI_11R) @@ -676,10 +676,10 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) session->addIeParams.probeRespBCNDataLen = 0; } #ifdef WLAN_FEATURE_11W - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&session->pmfComebackTimer)) - cdf_mc_timer_stop(&session->pmfComebackTimer); - cdf_mc_timer_destroy(&session->pmfComebackTimer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&session->pmfComebackTimer)) + qdf_mc_timer_stop(&session->pmfComebackTimer); + qdf_mc_timer_destroy(&session->pmfComebackTimer); #endif session->valid = false; diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index d1eaad913d10..dc42b0fda026 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -133,7 +133,7 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - cdf_mc_timer_callback_t timerCB; + qdf_mc_timer_callback_t timerCB; tpAniSirGlobal mac_ctx; void *hHal; diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index 03debc17b1b7..e6d71ea196c4 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h @@ -47,7 +47,7 @@ extern "C" { #include "sir_types.h" #include "sir_params.h" #include "sys_def.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" #include "qdf_types.h" #include "cdf_trace.h" #include "cdf_memory.h" @@ -110,7 +110,7 @@ typedef struct TX_TIMER_STRUCT { uint32_t expireInput; uint64_t initScheduleTimeInMsecs; uint64_t rescheduleTimeInMsecs; - cdf_mc_timer_t cdf_timer; + qdf_mc_timer_t cdf_timer; /* Pointer to the MAC global structure, which stores the context for the NIC, */ /* for which this timer is supposed to operate. */ diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index a965a63b0b87..f924d7ccb61e 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -89,7 +89,7 @@ */ uint64_t tx_time_get(void) { - return cdf_mc_timer_get_system_ticks(); + return qdf_mc_timer_get_system_ticks(); } /* * tx_time_get() */ @@ -138,7 +138,7 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "Timer %s being activated\n", TIMER_NAME); - status = cdf_mc_timer_start(&timer_ptr->cdf_timer, + status = qdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); if (QDF_STATUS_SUCCESS == status) { @@ -180,12 +180,11 @@ uint32_t tx_timer_change(TX_TIMER *timer_ptr, /* Put a check for the free builds */ if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) { CDF_ASSERT(timer_ptr->tmrSignature == 0); - return TX_TIMER_ERROR; } /* changes cannot be applied until timer stops running */ - if (CDF_TIMER_STATE_STOPPED == - cdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + if (QDF_TIMER_STATE_STOPPED == + qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { timer_ptr->initScheduleTimeInMsecs = TX_MSECS_IN_1_TICK * initScheduleTimeInTicks; timer_ptr->rescheduleTimeInMsecs = @@ -223,8 +222,8 @@ uint32_t tx_timer_change_context(TX_TIMER *timer_ptr, return TX_TIMER_ERROR; } /* changes cannot be applied until timer stops running */ - if (CDF_TIMER_STATE_STOPPED == - cdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + if (QDF_TIMER_STATE_STOPPED == + qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { timer_ptr->expireInput = expiration_input; return TX_SUCCESS; } else { @@ -272,7 +271,7 @@ static void tx_main_timer_func(void *functionContext) /* check if this needs to be rescheduled */ if (0 != timer_ptr->rescheduleTimeInMsecs) { QDF_STATUS status; - status = cdf_mc_timer_start(&timer_ptr->cdf_timer, + status = qdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->rescheduleTimeInMsecs); timer_ptr->rescheduleTimeInMsecs = 0; @@ -335,7 +334,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, #endif /* Store the timer name, for Debug build only */ status = - cdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); if (QDF_STATUS_SUCCESS != status) { @@ -394,7 +393,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName)); #endif /* Store the timer name, for Debug build only */ - status = cdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, + status = qdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); if (QDF_STATUS_SUCCESS != status) { CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, @@ -443,7 +442,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) return TX_TIMER_ERROR; } /* if the timer is not running then we do not need to do anything here */ - vStatus = cdf_mc_timer_stop(&timer_ptr->cdf_timer); + vStatus = qdf_mc_timer_stop(&timer_ptr->cdf_timer); if (QDF_STATUS_SUCCESS != vStatus) { CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", @@ -464,7 +463,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr) return TX_TIMER_ERROR; } - cdf_mc_timer_destroy(&timer_ptr->cdf_timer); + qdf_mc_timer_destroy(&timer_ptr->cdf_timer); return TX_SUCCESS; } /*** tx_timer_delete() ***/ @@ -493,8 +492,8 @@ bool tx_timer_running(TX_TIMER *timer_ptr) if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) return false; - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { return true; } return false; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 9fa88e5d0c32..c206ed5ebc06 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -597,7 +597,7 @@ typedef struct sSapDfsNolInfo { } tSapDfsNolInfo; typedef struct sSapDfsInfo { - cdf_mc_timer_t sap_dfs_cac_timer; + qdf_mc_timer_t sap_dfs_cac_timer; uint8_t sap_radar_found_status; /* * New channel to move to when a Radar is diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 1273a6bd4dd8..dadbaec9c363 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -667,8 +667,8 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, * and destroy the CAC timer and post a * eSAP_DFS_CHANNEL_CAC_RADAR_FOUND to sapFsm. */ - cdf_mc_timer_stop(&mac_ctx->sap.SapDfsInfo.sap_dfs_cac_timer); - cdf_mc_timer_destroy(&mac_ctx->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_stop(&mac_ctx->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_destroy(&mac_ctx->sap.SapDfsInfo.sap_dfs_cac_timer); /* * User space is already indicated the CAC start and if diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index fea29a4f7a6d..20bcc6ad14af 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1566,15 +1566,15 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* Give preference to non-DFS channel */ if (!pMac->f_prefer_non_dfs_on_radar) { - i = (random_byte + cdf_mc_timer_get_system_ticks()) % + i = (random_byte + qdf_mc_timer_get_system_ticks()) % available_ch_cnt; target_channel = availableChannels[i]; } else if (avail_non_dfs_chan_count) { - i = (random_byte + cdf_mc_timer_get_system_ticks()) % + i = (random_byte + qdf_mc_timer_get_system_ticks()) % avail_non_dfs_chan_count; target_channel = avail_non_dfs_chan_list[i]; } else { - i = (random_byte + cdf_mc_timer_get_system_ticks()) % + i = (random_byte + qdf_mc_timer_get_system_ticks()) % avail_dfs_chan_count; target_channel = avail_dfs_chan_list[i]; } @@ -2858,10 +2858,10 @@ QDF_STATUS sap_close_session(tHalHandle hHal, * as per design CAC timer should be destroyed after stop */ if (pMac->sap.SapDfsInfo.is_dfs_cac_timer_running) { - cdf_mc_timer_stop(&pMac->sap.SapDfsInfo. + qdf_mc_timer_stop(&pMac->sap.SapDfsInfo. sap_dfs_cac_timer); pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = 0; - cdf_mc_timer_destroy( + qdf_mc_timer_destroy( &pMac->sap.SapDfsInfo.sap_dfs_cac_timer); } pMac->sap.SapDfsInfo.cac_state = eSAP_DFS_DO_NOT_SKIP_CAC; @@ -4435,7 +4435,7 @@ void sap_dfs_cac_timer_callback(void *data) /* Check to ensure that SAP is in DFS WAIT state */ if (sapContext->sapsMachine == eSAP_DFS_CAC_WAIT) { - cdf_mc_timer_destroy(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_destroy(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer); pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = false; /* @@ -4473,13 +4473,13 @@ static int sap_stop_dfs_cac_timer(ptSapContext sapContext) } pMac = PMAC_STRUCT(hHal); - if (CDF_TIMER_STATE_RUNNING != - cdf_mc_timer_get_current_state(&pMac->sap.SapDfsInfo. + if (QDF_TIMER_STATE_RUNNING != + qdf_mc_timer_get_current_state(&pMac->sap.SapDfsInfo. sap_dfs_cac_timer)) { return 0; } - cdf_mc_timer_stop(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer); + qdf_mc_timer_stop(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer); pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = 0; return 0; @@ -4549,13 +4549,13 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec", sapContext->channel, cacTimeOut / 1000); - cdf_mc_timer_init(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, + qdf_mc_timer_init(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, QDF_TIMER_TYPE_SW, sap_dfs_cac_timer_callback, (void *) hHal); /*Start the CAC timer */ status = - cdf_mc_timer_start(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, + qdf_mc_timer_start(&pMac->sap.SapDfsInfo.sap_dfs_cac_timer, cacTimeOut); if (status == QDF_STATUS_SUCCESS) { pMac->sap.SapDfsInfo.is_dfs_cac_timer_running = true; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index a36b513e3906..fb6107f83a8b 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -36,7 +36,7 @@ #include "qdf_status.h" #include "qdf_lock.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" #include "csr_support.h" #include "cds_reg_service.h" @@ -374,7 +374,7 @@ typedef struct tagScanCmd { } u; /* This flag will be set while aborting the scan due to band change */ bool abortScanDueToBandChange; - cdf_mc_timer_t csr_scan_timer; + qdf_mc_timer_t csr_scan_timer; } tScanCmd; typedef struct tagRoamCmd { @@ -677,10 +677,10 @@ typedef struct tagCsrScanStruct { bool fScanEnable; bool fFullScanIssued; #ifdef WLAN_AP_STA_CONCURRENCY - cdf_mc_timer_t hTimerStaApConcTimer; + qdf_mc_timer_t hTimerStaApConcTimer; #endif - cdf_mc_timer_t hTimerIdleScan; - cdf_mc_timer_t hTimerResultCfgAging; + qdf_mc_timer_t hTimerIdleScan; + qdf_mc_timer_t hTimerResultCfgAging; /* * changes on every scan, it is used as a flag for whether 11d info is * found on every scan @@ -791,7 +791,7 @@ typedef struct tagCsrPeStatsReqInfo { uint32_t statsMask; uint32_t periodicity; bool rspPending; - cdf_mc_timer_t hPeStatsTimer; + qdf_mc_timer_t hPeStatsTimer; bool timerRunning; uint8_t staId; uint8_t numClient; @@ -811,7 +811,7 @@ typedef struct tagCsrStatsClientReqInfo { uint32_t statsMask; tCsrPeStatsReqInfo *pPeStaEntry; uint8_t staId; - cdf_mc_timer_t timer; + qdf_mc_timer_t timer; bool timerExpired; tpAniSirGlobal pMac; /* TODO: Confirm this change BTAMP */ uint8_t sessionId; @@ -820,7 +820,7 @@ typedef struct tagCsrStatsClientReqInfo { typedef struct tagCsrTlStatsReqInfo { uint32_t periodicity; bool timerRunning; - cdf_mc_timer_t hTlStatsTimer; + qdf_mc_timer_t hTlStatsTimer; uint8_t numClient; } tCsrTlStatsReqInfo; @@ -925,7 +925,7 @@ typedef struct tagCsrRoamSession { tCsrTimerInfo roamingTimerInfo; eCsrRoamingReason roamingReason; bool fCancelRoaming; - cdf_mc_timer_t hTimerRoaming; + qdf_mc_timer_t hTimerRoaming; /* the roamResult that is used when the roaming timer fires */ eCsrRoamResult roamResult; /* This is the reason code for join(assoc) failure */ @@ -990,7 +990,7 @@ typedef struct tagCsrRoamStruct { tSirMacChanNum validChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN]; uint32_t numValidChannels; /* total number of channels in CFG */ int32_t sPendingCommands; - cdf_mc_timer_t hTimerWaitForKey; /* support timeout for WaitForKey */ + qdf_mc_timer_t hTimerWaitForKey; /* support timeout for WaitForKey */ tCsrSummaryStatsInfo summaryStatsInfo; tCsrGlobalClassAStatsInfo classAStatsInfo; tCsrGlobalClassBStatsInfo classBStatsInfo; diff --git a/core/sme/inc/csr_link_list.h b/core/sme/inc/csr_link_list.h index 6b0b2f2be4f3..1944aceea2b5 100644 --- a/core/sme/inc/csr_link_list.h +++ b/core/sme/inc/csr_link_list.h @@ -35,7 +35,7 @@ #define CSR_LINK_LIST_H__ #include "qdf_lock.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" #include "cds_api.h" #include "sir_types.h" @@ -61,7 +61,7 @@ typedef struct tagDblLinkList { tListFlag Flag; /*command debugging */ uint32_t cmdTimeoutDuration; /* command timeout duration */ - cdf_mc_timer_t *cmdTimeoutTimer; /*command timeout Timer */ + qdf_mc_timer_t *cmdTimeoutTimer; /*command timeout Timer */ } tDblLinkList; /* diff --git a/core/sme/inc/p2p_api.h b/core/sme/inc/p2p_api.h index 8ac385cd7491..971496f8632e 100644 --- a/core/sme/inc/p2p_api.h +++ b/core/sme/inc/p2p_api.h @@ -38,7 +38,7 @@ #define __P2P_API_H__ #include "qdf_types.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" #include "qdf_lock.h" typedef struct sP2pPsConfig { diff --git a/core/sme/inc/sme_ft_api.h b/core/sme/inc/sme_ft_api.h index ba2a1a983863..57fb60655bb7 100644 --- a/core/sme/inc/sme_ft_api.h +++ b/core/sme/inc/sme_ft_api.h @@ -71,7 +71,7 @@ typedef struct sFTSMEContext { bool setFTPreAuthState; bool setFTPTKState; /* Time to trigger reassoc once pre-auth is successful */ - cdf_mc_timer_t preAuthReassocIntvlTimer; + qdf_mc_timer_t preAuthReassocIntvlTimer; bool addMDIE; #ifdef WLAN_FEATURE_ROAM_OFFLOAD uint32_t r0kh_id_len; diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 54e9f16f3ff1..b4fbdb221f60 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -111,7 +111,7 @@ struct ps_params { * Power Save Offload module will * try to enable sta mode ps */ - cdf_mc_timer_t auto_ps_enable_timer; + qdf_mc_timer_t auto_ps_enable_timer; }; diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index fcb52ee721dd..77ea6355de19 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -65,7 +65,7 @@ typedef struct sRrmNeighborRspCallbackInfo { typedef struct sRrmNeighborRequestControlInfo { /* To check whether a neighbor req is already sent & response pending */ bool isNeighborRspPending; - cdf_mc_timer_t neighborRspWaitTimer; + qdf_mc_timer_t neighborRspWaitTimer; tRrmNeighborRspCallbackInfo neighborRspCallbackInfo; } tRrmNeighborRequestControlInfo, *tpRrmNeighborRequestControlInfo; @@ -84,7 +84,7 @@ typedef struct sRrmSMEContext { uint16_t duration[SIR_ESE_MAX_MEAS_IE_REQS]; uint8_t measMode[SIR_ESE_MAX_MEAS_IE_REQS]; struct rrm_config_param rrmConfig; - cdf_mc_timer_t IterMeasTimer; + qdf_mc_timer_t IterMeasTimer; tDblLinkList neighborReportCache; tRrmNeighborRequestControlInfo neighborReqControlInfo; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index d1f0c5324d11..58968fc14adf 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -309,7 +309,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) tSmeCmd *pCmd; uint32_t cmd_idx; QDF_STATUS qdf_status; - cdf_mc_timer_t *cmdTimeoutTimer = NULL; + qdf_mc_timer_t *cmdTimeoutTimer = NULL; uint32_t sme_cmd_ptr_ary_sz; pMac->sme.totalSmeCmd = SME_TOTAL_COMMAND; @@ -369,11 +369,11 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) /* This timer is only to debug the active list command timeout */ cmdTimeoutTimer = - (cdf_mc_timer_t *) cdf_mem_malloc(sizeof(cdf_mc_timer_t)); + (qdf_mc_timer_t *) cdf_mem_malloc(sizeof(qdf_mc_timer_t)); if (cmdTimeoutTimer) { pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; qdf_status = - cdf_mc_timer_init(pMac->sme.smeCmdActiveList. + qdf_mc_timer_init(pMac->sme.smeCmdActiveList. cmdTimeoutTimer, QDF_TIMER_TYPE_SW, active_list_cmd_timeout_handle, (void *)pMac); @@ -473,7 +473,7 @@ static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) csr_ll_close(&pMac->sme.smeCmdFreeList); /*destroy active list command time out timer */ - cdf_mc_timer_destroy(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); + qdf_mc_timer_destroy(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); cdf_mem_free(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; @@ -768,7 +768,7 @@ bool sme_process_scan_queue(tpAniSirGlobal pMac) switch (pCommand->command) { case eSmeCommandScan: sms_log(pMac, LOG1, FL("Processing scan offload cmd.")); - cdf_mc_timer_start(&pCommand->u.scanCmd.csr_scan_timer, + qdf_mc_timer_start(&pCommand->u.scanCmd.csr_scan_timer, CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT); csr_process_scan_command(pMac, pCommand); break; diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 8c752f6830ad..c533602fef2b 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -53,7 +53,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) pSession->ftSmeContext.pUsrCtx->sessionId = sessionId; status = - cdf_mc_timer_init(&pSession->ftSmeContext. + qdf_mc_timer_init(&pSession->ftSmeContext. preAuthReassocIntvlTimer, QDF_TIMER_TYPE_SW, sme_preauth_reassoc_intvl_timer_callback, @@ -84,15 +84,15 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId) pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL != pSession) { /* check if the timer is running */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&pSession->ftSmeContext. + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&pSession->ftSmeContext. preAuthReassocIntvlTimer)) { - cdf_mc_timer_stop(&pSession->ftSmeContext. + qdf_mc_timer_stop(&pSession->ftSmeContext. preAuthReassocIntvlTimer); } if (QDF_STATUS_SUCCESS != - cdf_mc_timer_destroy(&pSession->ftSmeContext. + qdf_mc_timer_destroy(&pSession->ftSmeContext. preAuthReassocIntvlTimer)) { sms_log(pMac, LOGE, FL("preAuthReAssocTimer destroy failed")); diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 6ab06edc32e7..8c382fb3e906 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -1105,7 +1105,7 @@ QDF_STATUS sme_ps_enable_auto_ps_timer(tHalHandle hal_ctx, sms_log(mac_ctx, LOGE, FL("Start auto_ps_timer for %d is_reassoc:%d "), timer_value, is_reassoc); - qdf_status = cdf_mc_timer_start(&ps_param->auto_ps_enable_timer, + qdf_status = qdf_mc_timer_start(&ps_param->auto_ps_enable_timer, timer_value); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { if (QDF_STATUS_E_ALREADY == qdf_status) { @@ -1130,13 +1130,13 @@ QDF_STATUS sme_ps_disable_auto_ps_timer(tHalHandle hal_ctx, /* * Stop the auto ps entry timer if runnin */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &ps_param->auto_ps_enable_timer)) { sms_log(mac_ctx, LOGE, FL("Stop auto_ps_enable_timer Timer for session ID:%d "), session_id); - cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); + qdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } return QDF_STATUS_SUCCESS; } @@ -1171,7 +1171,7 @@ QDF_STATUS sme_ps_open_per_session(tHalHandle hal_ctx, uint32_t session_id) sms_log(mac_ctx, LOG1, FL("Enter")); /* Allocate a timer to enable ps automatically */ - if (!QDF_IS_STATUS_SUCCESS(cdf_mc_timer_init( + if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_init( &ps_param->auto_ps_enable_timer, QDF_TIMER_TYPE_SW, sme_auto_ps_entry_timer_expired, @@ -1197,7 +1197,7 @@ void sme_auto_ps_entry_timer_expired(void *data) SME_PS_ENABLE); } else { status = - cdf_mc_timer_start(&ps_params->auto_ps_enable_timer, + qdf_mc_timer_start(&ps_params->auto_ps_enable_timer, AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE); if (!QDF_IS_STATUS_SUCCESS(status) && (QDF_STATUS_E_ALREADY != status)) { @@ -1230,13 +1230,13 @@ QDF_STATUS sme_ps_close_per_session(tHalHandle hal_ctx, uint32_t session_id) /* * Stop the auto ps entry timer if running */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &ps_param->auto_ps_enable_timer)) { - cdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); + qdf_mc_timer_stop(&ps_param->auto_ps_enable_timer); } qdf_status = - cdf_mc_timer_destroy(&ps_param->auto_ps_enable_timer); + qdf_mc_timer_destroy(&ps_param->auto_ps_enable_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) sms_log(mac_ctx, LOGE, FL("Cannot deallocate suto PS timer")); return qdf_status; @@ -1252,8 +1252,8 @@ QDF_STATUS sme_is_auto_ps_timer_running(tHalHandle hal_ctx, /* * Check if the auto ps entry timer if running */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state( + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( &ps_param->auto_ps_enable_timer)) { status = true; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index cea2f1280b2f..62e38897eb20 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -59,9 +59,9 @@ #define CSR_NUM_IBSS_START_CHANNELS_50 4 #define CSR_NUM_IBSS_START_CHANNELS_24 3 /* 5 seconds, for WPA, WPA2, CCKM */ -#define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD (15 * CDF_MC_TIMER_TO_SEC_UNIT) +#define CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD (15 * QDF_MC_TIMER_TO_SEC_UNIT) /* 120 seconds, for WPS */ -#define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD (120 * CDF_MC_TIMER_TO_SEC_UNIT) +#define CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD (120 * QDF_MC_TIMER_TO_SEC_UNIT) /*--------------------------------------------------------------------------- OBIWAN recommends [8 10]% : pick 9% @@ -918,7 +918,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) pMac->roam.WaitForKeyTimerInfo.sessionId = CSR_SESSION_ID_INVALID; status = - cdf_mc_timer_init(&pMac->roam.hTimerWaitForKey, + qdf_mc_timer_init(&pMac->roam.hTimerWaitForKey, QDF_TIMER_TYPE_SW, csr_roam_wait_for_key_time_out_handler, &pMac->roam.WaitForKeyTimerInfo); @@ -929,7 +929,7 @@ QDF_STATUS csr_roam_open(tpAniSirGlobal pMac) break; } status = - cdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, + qdf_mc_timer_init(&pMac->roam.tlStatsReqInfo.hTlStatsTimer, QDF_TIMER_TYPE_SW, csr_roam_tl_stats_timer_handler, pMac); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -948,10 +948,10 @@ QDF_STATUS csr_roam_close(tpAniSirGlobal pMac) for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { csr_roam_close_session(pMac, sessionId, true, NULL, NULL); } - cdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey); - cdf_mc_timer_destroy(&pMac->roam.hTimerWaitForKey); - cdf_mc_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); - cdf_mc_timer_destroy(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); + qdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey); + qdf_mc_timer_destroy(&pMac->roam.hTimerWaitForKey); + qdf_mc_timer_stop(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); + qdf_mc_timer_destroy(&pMac->roam.tlStatsReqInfo.hTlStatsTimer); return QDF_STATUS_SUCCESS; } @@ -1117,8 +1117,8 @@ void csr_release_command_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) void csr_release_command_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - cdf_mc_timer_stop(&pCommand->u.scanCmd.csr_scan_timer); - cdf_mc_timer_destroy(&pCommand->u.scanCmd.csr_scan_timer); + qdf_mc_timer_stop(&pCommand->u.scanCmd.csr_scan_timer); + qdf_mc_timer_destroy(&pCommand->u.scanCmd.csr_scan_timer); csr_reinit_scan_cmd(pMac, pCommand); csr_release_command(pMac, pCommand); } @@ -9895,7 +9895,7 @@ void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSes return; } - roamTS2 = cdf_mc_timer_get_system_time(); + roamTS2 = qdf_mc_timer_get_system_time(); roamInfo.tsmRoamDelay = roamTS2 - pSession->roamTS1; sms_log(pMac, LOG1, "Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)", MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes), @@ -10991,7 +10991,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t roamTime = (uint32_t) (pMac->roam.configParam.nRoamingTime * QDF_TICKS_PER_SECOND); - uint32_t curTime = (uint32_t) cdf_mc_timer_get_system_ticks(); + uint32_t curTime = (uint32_t) qdf_mc_timer_get_system_ticks(); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (!pSession) { sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); @@ -11028,7 +11028,7 @@ bool csr_roam_complete_roaming(tpAniSirGlobal pMac, uint32_t sessionId, pSession->roamResult = roamResult; if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_roaming_timer - (pMac, sessionId, CDF_MC_TIMER_TO_SEC_UNIT))) { + (pMac, sessionId, QDF_MC_TIMER_TO_SEC_UNIT))) { csr_call_roaming_completion_callback(pMac, pSession, NULL, 0, roamResult); pSession->roamingReason = eCsrNotRoaming; @@ -11107,15 +11107,15 @@ QDF_STATUS csr_roam_start_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOG1, " csrScanStartRoamingTimer"); pSession->roamingTimerInfo.sessionId = (uint8_t) sessionId; - status = cdf_mc_timer_start(&pSession->hTimerRoaming, - interval / CDF_MC_TIMER_TO_MS_UNIT); + status = qdf_mc_timer_start(&pSession->hTimerRoaming, + interval / QDF_MC_TIMER_TO_MS_UNIT); return status; } QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId) { - return cdf_mc_timer_stop + return qdf_mc_timer_stop (&pMac->roam.roamSession[sessionId].hTimerRoaming); } @@ -11197,8 +11197,8 @@ QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t inter cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, 0); } sms_log(pMac, LOG1, " csrScanStartWaitForKeyTimer"); - status = cdf_mc_timer_start(&pMac->roam.hTimerWaitForKey, - interval / CDF_MC_TIMER_TO_MS_UNIT); + status = qdf_mc_timer_start(&pMac->roam.hTimerWaitForKey, + interval / QDF_MC_TIMER_TO_MS_UNIT); return status; } @@ -11230,7 +11230,7 @@ QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac) cfg_set_int(pMac, WNI_CFG_HEART_BEAT_THRESHOLD, pMac->roam.configParam.HeartbeatThresh24); } - return cdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey); + return qdf_mc_timer_stop(&pMac->roam.hTimerWaitForKey); } void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId, @@ -11397,7 +11397,7 @@ QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, type) ? eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc; pSession->roamingStartTime = - (uint32_t) cdf_mc_timer_get_system_ticks(); + (uint32_t) qdf_mc_timer_get_system_ticks(); csr_roam_call_callback(pMac, sessionId, pRoamInfo, 0, eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_LOSTLINK); @@ -14834,7 +14834,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, sizeof(struct qdf_mac_addr)); *pbSessionId = (uint8_t) i; status = - cdf_mc_timer_init(&pSession->hTimerRoaming, + qdf_mc_timer_init(&pSession->hTimerRoaming, QDF_TIMER_TYPE_SW, csr_roam_roaming_timer_handler, &pSession->roamingTimerInfo); @@ -14854,7 +14854,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, break; } #ifdef FEATURE_WLAN_BTAMP_UT_RF - status = cdf_mc_timer_init(&pSession->hTimerJoinRetry, + status = qdf_mc_timer_init(&pSession->hTimerJoinRetry, QDF_TIMER_TYPE_SW, csr_roam_join_retry_timer_handler, &pSession-> @@ -15050,9 +15050,9 @@ void csr_cleanup_session(tpAniSirGlobal pMac, uint32_t sessionId) csr_free_connect_bss_desc(pMac, sessionId); csr_roam_free_connect_profile(&pSession->connectedProfile); csr_roam_free_connected_info(pMac, &pSession->connectedInfo); - cdf_mc_timer_destroy(&pSession->hTimerRoaming); + qdf_mc_timer_destroy(&pSession->hTimerRoaming); #ifdef FEATURE_WLAN_BTAMP_UT_RF - cdf_mc_timer_destroy(&pSession->hTimerJoinRetry); + qdf_mc_timer_destroy(&pSession->hTimerJoinRetry); #endif purge_sme_session_cmd_list(pMac, sessionId, &pMac->sme.smeCmdPendingList); @@ -15275,7 +15275,7 @@ void csr_roam_tl_stats_timer_handler(void *pv) if (pMac->roam.tlStatsReqInfo.periodicity) { /* start timer */ status = - cdf_mc_timer_start(&pMac->roam.tlStatsReqInfo. + qdf_mc_timer_start(&pMac->roam.tlStatsReqInfo. hTlStatsTimer, pMac->roam.tlStatsReqInfo. periodicity); @@ -15303,7 +15303,7 @@ void csr_roam_pe_stats_timer_handler(void *pv) /* Destroy the timer */ qdf_status = - cdf_mc_timer_destroy(&pPeStatsReqListEntry->hPeStatsTimer); + qdf_mc_timer_destroy(&pPeStatsReqListEntry->hPeStatsTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL @@ -15332,8 +15332,8 @@ void csr_roam_pe_stats_timer_handler(void *pv) } /* send down a req */ if (pPeStatsReqListEntry->periodicity && - (CDF_TIMER_STATE_STOPPED == - cdf_mc_timer_get_current_state(&pPeStatsReqListEntry-> + (QDF_TIMER_STATE_STOPPED == + qdf_mc_timer_get_current_state(&pPeStatsReqListEntry-> hPeStatsTimer))) { if (pPeStatsReqListEntry->periodicity < pMac->roam.configParam. @@ -15344,7 +15344,7 @@ void csr_roam_pe_stats_timer_handler(void *pv) } /* start timer */ qdf_status = - cdf_mc_timer_start(&pPeStatsReqListEntry-> + qdf_mc_timer_start(&pPeStatsReqListEntry-> hPeStatsTimer, pPeStatsReqListEntry-> periodicity); @@ -15364,8 +15364,8 @@ void csr_roam_pe_stats_timer_handler(void *pv) void csr_roam_stats_client_timer_handler(void *pv) { tCsrStatsClientReqInfo *pStaEntry = (tCsrStatsClientReqInfo *) pv; - if (CDF_TIMER_STATE_STOPPED == - cdf_mc_timer_get_current_state(&pStaEntry->timer)) { + if (QDF_TIMER_STATE_STOPPED == + qdf_mc_timer_get_current_state(&pStaEntry->timer)) { CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, FL("roam stats client timer is stopped")); } @@ -15917,7 +15917,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.tlStatsReqInfo.numClient--; if (!mac_ctx->roam.tlStatsReqInfo.numClient) { if (mac_ctx->roam.tlStatsReqInfo.timerRunning) { - status = cdf_mc_timer_stop( + status = qdf_mc_timer_stop( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, @@ -15928,9 +15928,9 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.tlStatsReqInfo.periodicity = 0; mac_ctx->roam.tlStatsReqInfo.timerRunning = false; } - cdf_mc_timer_stop(&ptr_sta_entry->timer); + qdf_mc_timer_stop(&ptr_sta_entry->timer); /* Destroy the cdf timer... */ - status = cdf_mc_timer_destroy(&ptr_sta_entry->timer); + status = qdf_mc_timer_destroy(&ptr_sta_entry->timer); if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, FL("failed to destroy Client req timer")); @@ -15964,7 +15964,7 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, /* Init & start timer if needed */ ptr_sta_entry->periodicity = periodicity; if (ptr_sta_entry->periodicity) { - status = cdf_mc_timer_init(&ptr_sta_entry->timer, + status = qdf_mc_timer_init(&ptr_sta_entry->timer, QDF_TIMER_TYPE_SW, csr_roam_stats_client_timer_handler, ptr_sta_entry); @@ -15973,7 +15973,7 @@ csr_insert_stats_request_to_list(tpAniSirGlobal mac_ctx, FL("cannot init StatsClient timer")); return QDF_STATUS_E_FAILURE; } - status = cdf_mc_timer_start(&ptr_sta_entry->timer, + status = qdf_mc_timer_start(&ptr_sta_entry->timer, ptr_sta_entry->periodicity); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, @@ -16025,7 +16025,7 @@ csr_get_statistics_from_tl(tpAniSirGlobal mac_ctx, if (mac_ctx->roam.tlStatsReqInfo.periodicity) { /* start timer */ - status = cdf_mc_timer_start( + status = qdf_mc_timer_start( &mac_ctx->roam.tlStatsReqInfo.hTlStatsTimer, mac_ctx->roam.tlStatsReqInfo.periodicity); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -17198,7 +17198,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, if (!found) { qdf_status = - cdf_mc_timer_init(&pTempStaEntry-> + qdf_mc_timer_init(&pTempStaEntry-> hPeStatsTimer, QDF_TIMER_TYPE_SW, csr_roam_pe_stats_timer_handler, @@ -17215,7 +17215,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, "csr_roam_check_pe_stats_req_list:peStatsTimer period %d", pTempStaEntry->periodicity); qdf_status = - cdf_mc_timer_start(&pTempStaEntry->hPeStatsTimer, + qdf_mc_timer_start(&pTempStaEntry->hPeStatsTimer, pTempStaEntry->periodicity); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, @@ -17266,7 +17266,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, } sms_log(pMac, LOGW, FL("Match found")); if (pTempStaEntry->timerRunning) { - qdf_status = cdf_mc_timer_stop( + qdf_status = qdf_mc_timer_stop( &pTempStaEntry->hPeStatsTimer); /* * If we are not able to stop the timer here, just @@ -17277,7 +17277,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, /* the timer is successfully stopped */ pTempStaEntry->timerRunning = false; /* Destroy the timer */ - qdf_status = cdf_mc_timer_destroy( + qdf_status = qdf_mc_timer_destroy( &pTempStaEntry->hPeStatsTimer); } else { /* @@ -17438,7 +17438,7 @@ QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) if (!pMac->roam.tlStatsReqInfo.numClient) { if (pMac->roam.tlStatsReqInfo.timerRunning) { status = - cdf_mc_timer_stop(&pMac->roam. + qdf_mc_timer_stop(&pMac->roam. tlStatsReqInfo. hTlStatsTimer); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -17456,10 +17456,10 @@ QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) /* Initializing and starting timer only when periodicity is set. */ /* So Stop and Destroy timer only when periodicity is set. */ - cdf_mc_timer_stop(&pTempStaEntry->timer); + qdf_mc_timer_stop(&pTempStaEntry->timer); /* Destroy the cdf timer... */ qdf_status = - cdf_mc_timer_destroy(&pTempStaEntry->timer); + qdf_mc_timer_destroy(&pTempStaEntry->timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { sms_log(pMac, LOGE, FL @@ -17734,7 +17734,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* Start the pre-auth reassoc interval timer with a period of 400ms. When this expires, * actual transition from the current to handoff AP is triggered */ status = - cdf_mc_timer_start(&pSession->ftSmeContext.preAuthReassocIntvlTimer, + qdf_mc_timer_start(&pSession->ftSmeContext.preAuthReassocIntvlTimer, 60); if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, @@ -17960,7 +17960,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, pBssDescription = handoffNode.pBssDescription; /* Get the time diff in milli seconds */ timer_diff = - cdf_mc_timer_get_system_time() - pBssDescription->scanSysTimeMsec; + qdf_mc_timer_get_system_time() - pBssDescription->scanSysTimeMsec; /* Convert msec to micro sec timer */ timer_diff = (uint32_t) (timer_diff * SYSTEM_TIME_MSEC_TO_USEC); timeStamp[0] = pBssDescription->timeStamp[0]; diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 7baca987c797..b52a17ce1530 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -171,7 +171,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) mac_ctx->scan.fFullScanIssued = false; mac_ctx->scan.nBssLimit = CSR_MAX_BSS_SUPPORT; #ifdef WLAN_AP_STA_CONCURRENCY - status = cdf_mc_timer_init(&mac_ctx->scan.hTimerStaApConcTimer, + status = qdf_mc_timer_init(&mac_ctx->scan.hTimerStaApConcTimer, QDF_TIMER_TYPE_SW, csr_sta_ap_conc_timer_handler, mac_ctx); @@ -181,7 +181,7 @@ QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) return status; } #endif - status = cdf_mc_timer_init(&mac_ctx->scan.hTimerResultCfgAging, + status = qdf_mc_timer_init(&mac_ctx->scan.hTimerResultCfgAging, QDF_TIMER_TYPE_SW, csr_scan_result_cfg_aging_timer_handler, mac_ctx); @@ -209,9 +209,9 @@ QDF_STATUS csr_scan_close(tpAniSirGlobal pMac) csr_ll_close(&pMac->scan.channelPowerInfoList24); csr_ll_close(&pMac->scan.channelPowerInfoList5G); csr_scan_disable(pMac); - cdf_mc_timer_destroy(&pMac->scan.hTimerResultCfgAging); + qdf_mc_timer_destroy(&pMac->scan.hTimerResultCfgAging); #ifdef WLAN_AP_STA_CONCURRENCY - cdf_mc_timer_destroy(&pMac->scan.hTimerStaApConcTimer); + qdf_mc_timer_destroy(&pMac->scan.hTimerStaApConcTimer); #endif return QDF_STATUS_SUCCESS; } @@ -424,7 +424,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, tmp_rq.BSSType = eCSR_BSS_TYPE_ANY; tmp_rq.scan_id = scan_11d_cmd->u.scanCmd.scanID; - status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_11d_cmd); @@ -610,7 +610,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, pTempScanReq = &scan_cmd->u.scanCmd.u.scanRequest; pMac->scan.scanProfile.numOfChannels = pTempScanReq->ChannelInfo.numOfChannels; - status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, scan_cmd); sms_log(pMac, LOG1, @@ -807,7 +807,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, mac_ctx->roam.configParam.nActiveMinChnTime; cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); - status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = @@ -978,7 +978,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, cmd->u.scanCmd.scanID; if (!session->pCurRoamProfile) return QDF_STATUS_SUCCESS; - status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); @@ -1113,7 +1113,7 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) mac_ctx->roam.configParam.nActiveMinChnTime; cmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN; wma_get_scan_id(&cmd->u.scanCmd.scanID); - status = cdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); cmd->u.scanCmd.u.scanRequest.scan_id = @@ -2858,7 +2858,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, * hidden ssid from the profile i.e., forget the SSID * via GUI that SSID shouldn't see in the profile */ - unsigned long time_gap = cdf_mc_timer_get_system_time() - + unsigned long time_gap = qdf_mc_timer_get_system_time() - timer; if ((0 == bss_dscp->Result.ssId.length) && (time_gap <= HIDDEN_TIMER) @@ -2994,7 +2994,7 @@ tCsrScanResult *csr_scan_append_bss_description(tpAniSirGlobal pMac, * hidden ssid from the profile i.e., forget the SSID * via GUI that SSID shouldn't see in the profile */ - if ((cdf_mc_timer_get_system_time() - timer) <= + if ((qdf_mc_timer_get_system_time() - timer) <= HIDDEN_TIMER) { pCsrBssDescription->Result.ssId = tmpSsid; pCsrBssDescription->Result.timer = timer; @@ -4279,7 +4279,7 @@ tCsrScanResult *csr_scan_save_bss_description_to_interim_list(tpAniSirGlobal pMa } pCsrBssDescription->Result.ssId.length = len; pCsrBssDescription->Result.timer = - cdf_mc_timer_get_system_time(); + qdf_mc_timer_get_system_time(); cdf_mem_copy(pCsrBssDescription->Result.ssId.ssId, pIes->SSID.ssid, len); } @@ -4769,7 +4769,7 @@ bool csr_scan_age_out_bss(tpAniSirGlobal pMac, tCsrScanResult *pResult) MAC_ADDRESS_STR), pResult->AgingCount, MAC_ADDR_ARRAY(pResult->Result.BssDescriptor.bssId)); pResult->Result.BssDescriptor.nReceivedTime = - (uint32_t) cdf_mc_timer_get_system_ticks(); + (uint32_t) qdf_mc_timer_get_system_ticks(); return fRet; } sms_log(pMac, LOGW, @@ -5784,16 +5784,16 @@ QDF_STATUS csr_scan_start_result_cfg_aging_timer(tpAniSirGlobal pMac) if (pMac->scan.fScanEnable) { status = - cdf_mc_timer_start(&pMac->scan.hTimerResultCfgAging, + qdf_mc_timer_start(&pMac->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL / - CDF_MC_TIMER_TO_MS_UNIT); + QDF_MC_TIMER_TO_MS_UNIT); } return status; } QDF_STATUS csr_scan_stop_result_cfg_aging_timer(tpAniSirGlobal pMac) { - return cdf_mc_timer_stop(&pMac->scan.hTimerResultCfgAging); + return qdf_mc_timer_stop(&pMac->scan.hTimerResultCfgAging); } /** @@ -5811,7 +5811,7 @@ static void csr_scan_result_cfg_aging_timer_handler(void *pv) tCsrScanResult *result; uint32_t ageout_time = mac_ctx->scan.scanResultCfgAgingTime * QDF_TICKS_PER_SECOND/10; - uint32_t cur_time = (uint32_t) cdf_mc_timer_get_system_ticks(); + uint32_t cur_time = (uint32_t) qdf_mc_timer_get_system_ticks(); uint8_t *bssId; csr_ll_lock(&mac_ctx->scan.scanResultList); @@ -5821,7 +5821,7 @@ static void csr_scan_result_cfg_aging_timer_handler(void *pv) LL_ACCESS_NOLOCK); result = GET_BASE_ADDR(entry, tCsrScanResult, Link); /* - * cdf_mc_timer_get_system_ticks() returns in 10ms interval. + * qdf_mc_timer_get_system_ticks() returns in 10ms interval. * so ageout time value also updated to 10ms interval value. */ if ((cur_time - result->Result.BssDescriptor.nReceivedTime) > @@ -5835,9 +5835,9 @@ static void csr_scan_result_cfg_aging_timer_handler(void *pv) entry = tmp_entry; } csr_ll_unlock(&mac_ctx->scan.scanResultList); - cdf_mc_timer_start(&mac_ctx->scan.hTimerResultCfgAging, + qdf_mc_timer_start(&mac_ctx->scan.hTimerResultCfgAging, CSR_SCAN_RESULT_CFG_AGING_INTERVAL / - CDF_MC_TIMER_TO_MS_UNIT); + QDF_MC_TIMER_TO_MS_UNIT); } bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId) @@ -6162,7 +6162,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, wma_get_scan_id(&scan_cmd->u.scanCmd.scanID); cdf_mem_set(&scan_cmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest), 0); - status = cdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, + status = qdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &scan_cmd); scan_req = &scan_cmd->u.scanCmd.u.scanRequest; @@ -6914,7 +6914,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, pBssDescr->capabilityInfo = *((uint16_t *)&parsed_frm->capabilityInfo); cdf_mem_copy((uint8_t *) &pBssDescr->bssId, (uint8_t *) macHeader->bssId, sizeof(tSirMacAddr)); - pBssDescr->nReceivedTime = (uint32_t) cdf_mc_timer_get_system_ticks(); + pBssDescr->nReceivedTime = (uint32_t) qdf_mc_timer_get_system_ticks(); sms_log(pMac, LOG2, FL("Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = %d"), MAC_ADDR_ARRAY(pBssDescr->bssId), pBssDescr->channelId, pBssDescr->rssi); diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index b3ba204237e2..44bf688cbbf1 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -68,11 +68,11 @@ /* This number minus 1 means the number of times a channel is scanned before a BSS is remvoed from */ /* cache scan result */ #define CSR_AGING_COUNT 3 -#define CSR_SCAN_GET_RESULT_INTERVAL (5 * CDF_MC_TIMER_TO_SEC_UNIT) /* 5 seconds */ -#define CSR_MIC_ERROR_TIMEOUT (60 * CDF_MC_TIMER_TO_SEC_UNIT) /* 60 seconds */ -#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT (60 * CDF_MC_TIMER_TO_SEC_UNIT) /* 60 seconds */ +#define CSR_SCAN_GET_RESULT_INTERVAL (5 * QDF_MC_TIMER_TO_SEC_UNIT) /* 5 seconds */ +#define CSR_MIC_ERROR_TIMEOUT (60 * QDF_MC_TIMER_TO_SEC_UNIT) /* 60 seconds */ +#define CSR_TKIP_COUNTER_MEASURE_TIMEOUT (60 * QDF_MC_TIMER_TO_SEC_UNIT) /* 60 seconds */ -#define CSR_SCAN_RESULT_CFG_AGING_INTERVAL (CDF_MC_TIMER_TO_SEC_UNIT) /* 1 second */ +#define CSR_SCAN_RESULT_CFG_AGING_INTERVAL (QDF_MC_TIMER_TO_SEC_UNIT) /* 1 second */ /* the following defines are NOT used by palTimer */ #define CSR_SCAN_AGING_TIME_NOT_CONNECT_NO_PS 50 /* 50 seconds */ #define CSR_SCAN_AGING_TIME_NOT_CONNECT_W_PS 300 /* 300 seconds */ diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index ed9db8b13491..20b02f8685ab 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -36,7 +36,7 @@ #include "qdf_lock.h" #include "cdf_memory.h" #include "cdf_trace.h" -#include "cdf_mc_timer.h" +#include "qdf_mc_timer.h" static inline void csr_list_init(tListElem *pList) { @@ -302,7 +302,7 @@ void csr_ll_insert_head(tDblLinkList *pList, tListElem *pEntry, } if (pList->cmdTimeoutTimer && pList->cmdTimeoutDuration) { /* timer to detect pending command in activelist */ - cdf_mc_timer_start(pList->cmdTimeoutTimer, + qdf_mc_timer_start(pList->cmdTimeoutTimer, pList->cmdTimeoutDuration); } } @@ -497,7 +497,7 @@ bool csr_ll_remove_entry(tDblLinkList *pList, tListElem *pEntryToRemove, csr_ll_unlock(pList); } if (pList->cmdTimeoutTimer) { - cdf_mc_timer_stop(pList->cmdTimeoutTimer); + qdf_mc_timer_stop(pList->cmdTimeoutTimer); } } diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 66d05dbf93ff..1fad09f45e4b 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1537,7 +1537,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, } /* check the age of the AP */ - age_ticks = (uint32_t) cdf_mc_timer_get_system_ticks() - + age_ticks = (uint32_t) qdf_mc_timer_get_system_ticks() - descr->nReceivedTime; if (age_constraint == true && age_ticks > limit_ticks) { num_dropped++; @@ -2284,7 +2284,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, pSession->prevOpChannel = pSession->connectedProfile.operationChannel; pSession->isPrevApInfoValid = true; - pSession->roamTS1 = cdf_mc_timer_get_system_time(); + pSession->roamTS1 = qdf_mc_timer_get_system_time(); } #endif } @@ -2330,7 +2330,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, case eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE: /* Stop pre-auth to reassoc interval timer */ - cdf_mc_timer_stop(&pSession->ftSmeContext. + qdf_mc_timer_stop(&pSession->ftSmeContext. preAuthReassocIntvlTimer); case eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING: CSR_NEIGHBOR_ROAM_STATE_TRANSITION( @@ -3134,7 +3134,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM return; /* Stop timer */ - cdf_mc_timer_stop(&session->ftSmeContext.preAuthReassocIntvlTimer); + qdf_mc_timer_stop(&session->ftSmeContext.preAuthReassocIntvlTimer); /* Transition to init state */ CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index a29ca9648970..b827c68cfe78 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -124,12 +124,12 @@ void rrm_indicate_neighbor_report_result(tpAniSirGlobal pMac, QDF_STATUS qdf_sta false; /* Stop the timer if it is already running. The timer should be running only in the SUCCESS case. */ - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&pMac->rrm.rrmSmeContext. + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&pMac->rrm.rrmSmeContext. neighborReqControlInfo. neighborRspWaitTimer)) { sms_log(pMac, LOG1, FL("No entry in neighbor report cache")); - cdf_mc_timer_stop(&pMac->rrm.rrmSmeContext. + qdf_mc_timer_stop(&pMac->rrm.rrmSmeContext. neighborReqControlInfo.neighborRspWaitTimer); } callback = @@ -608,14 +608,14 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, pSmeRrmContext->currentIndex++; /* Advance the current index. */ /* start the timer to issue next request. */ /* From timer tick get a random number within 10ms and max randmization interval. */ - time_tick = cdf_mc_timer_get_system_ticks(); + time_tick = qdf_mc_timer_get_system_ticks(); interval = time_tick % (pSmeRrmContext->randnIntvl - 10 + 1) + 10; #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Set timer for interval %d ", interval); #endif - cdf_mc_timer_start(&pSmeRrmContext->IterMeasTimer, interval); + qdf_mc_timer_start(&pSmeRrmContext->IterMeasTimer, interval); } else { /* Done with the measurement. Clean up all context and send a message to PE with measurement done flag set. */ @@ -718,7 +718,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) sms_log(mac_ctx, LOG1, FL("Scan Type(%d) Max Dwell Time(%d)"), scan_req.scanType, scan_req.maxChnTime); - rrm_scan_timer = cdf_mc_timer_get_system_time(); + rrm_scan_timer = qdf_mc_timer_get_system_time(); #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("For Duration %d "), @@ -1002,7 +1002,7 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI true; /* Start neighbor response wait timer now */ - cdf_mc_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo. + qdf_mc_timer_start(&pMac->rrm.rrmSmeContext.neighborReqControlInfo. neighborRspWaitTimer, callbackInfo->timeout); return QDF_STATUS_SUCCESS; @@ -1359,7 +1359,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ - qdf_status = cdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, + qdf_status = qdf_mc_timer_init(&pSmeRrmContext->IterMeasTimer, QDF_TIMER_TYPE_SW, rrm_iter_meas_timer_handle, (void *)pMac); @@ -1372,7 +1372,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) } qdf_status = - cdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. + qdf_mc_timer_init(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer, QDF_TIMER_TYPE_SW, rrm_neighbor_rsp_timeout_handler, (void *)pMac); @@ -1414,16 +1414,16 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { - qdf_status = cdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { + qdf_status = qdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } - qdf_status = cdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); + qdf_status = qdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, @@ -1431,12 +1431,12 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) } - if (CDF_TIMER_STATE_RUNNING == - cdf_mc_timer_get_current_state(&pSmeRrmContext-> + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state(&pSmeRrmContext-> neighborReqControlInfo. neighborRspWaitTimer)) { qdf_status = - cdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. + qdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, @@ -1445,7 +1445,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) } qdf_status = - cdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. + qdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 5bb56dcc5961..096c586408d8 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -206,7 +206,7 @@ int epping_enable(struct device *parent_dev) epping_get_dummy_mac_addr(adapter_macAddr); /* Initialize the timer module */ - cdf_timer_module_init(); + qdf_timer_module_init(); scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 0e3e1d3a003a..04e367499820 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -290,7 +290,7 @@ static int wlan_add_user_log_time_stamp(char *tbuf, size_t tbuf_sz, uint64_t ts) int tlen; uint32_t rem; - rem = do_div(ts, CDF_MC_TIMER_TO_SEC_UNIT); + rem = do_div(ts, QDF_MC_TIMER_TO_SEC_UNIT); tlen = scnprintf(tbuf, tbuf_sz, "[%s][%lu.%06lu] ", current->comm, (unsigned long) ts, (unsigned long)rem); return tlen; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index c52c726fb3ca..b7bfb6c502ea 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1274,7 +1274,7 @@ typedef struct { qdf_wake_lock_t wow_wake_lock; int wow_nack; qdf_atomic_t is_wow_bus_suspended; - cdf_mc_timer_t wma_scan_comp_timer; + qdf_mc_timer_t wma_scan_comp_timer; uint8_t dfs_phyerr_filter_offload; bool suitable_ap_hb_failure; ibss_power_save_params wma_ibss_power_save_params; @@ -1295,7 +1295,7 @@ typedef struct { uint32_t hw_bd_id; uint32_t hw_bd_info[HW_BD_INFO_SIZE]; uint32_t miracast_value; - cdf_mc_timer_t log_completion_timer; + qdf_mc_timer_t log_completion_timer; wma_mgmt_frame_rx_callback mgmt_rx; uint32_t num_dbs_hw_modes; struct dbs_hw_mode_info hw_mode; @@ -1342,7 +1342,7 @@ typedef struct { * context. So, processing ready event and extended ready event in * the serialized MC thread context with a timer. */ - cdf_mc_timer_t service_ready_ext_timer; + qdf_mc_timer_t service_ready_ext_timer; void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); @@ -1457,7 +1457,7 @@ struct wma_tx_ack_work_ctx { * @type: type */ struct wma_target_req { - cdf_mc_timer_t event_timeout; + qdf_mc_timer_t event_timeout; qdf_list_node_t node; void *user_data; uint32_t msg_type; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index ca0df47c172e..592c1554c9db 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2603,7 +2603,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, struct wma_decap_info_t decap_info; struct ieee80211_frame *wh = (struct ieee80211_frame *)cdf_nbuf_data(skb); - unsigned long curr_timestamp = cdf_mc_timer_get_system_ticks(); + unsigned long curr_timestamp = qdf_mc_timer_get_system_ticks(); if (pdev == NULL) { WMA_LOGE("%s: pdev pointer is not available", __func__); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 749d357cca84..1da4dfb47e35 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -502,8 +502,8 @@ void wma_vdev_detach_callback(void *ctx) if (req_msg) { WMA_LOGD("%s: Found vdev request for vdev id %d", __func__, param->session_id); - cdf_mc_timer_stop(&req_msg->event_timeout); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } } @@ -978,7 +978,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } - cdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE if (resp_event->status == QDF_STATUS_SUCCESS @@ -1043,7 +1043,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, wma->interfaces[resp_event->vdev_id].vdev_up) wma_set_sap_keepalive(wma, resp_event->vdev_id); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); return 0; @@ -1714,11 +1714,11 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, if (!pdev) { WMA_LOGE("%s: pdev is NULL", __func__); status = -EINVAL; - cdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); goto free_req_msg; } - cdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); if (req_msg->msg_type == WMA_DELETE_BSS_REQ) { tpDeleteBssParams params = (tpDeleteBssParams) req_msg->user_data; @@ -1813,7 +1813,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, } } free_req_msg: - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); return status; } @@ -2377,7 +2377,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, return -EINVAL; } - cdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); if (req_msg->msg_type == WMA_ADD_STA_REQ) { tpAddStaParams params = (tpAddStaParams)req_msg->user_data; @@ -2417,7 +2417,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, } free_req_msg: - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); return status; @@ -2465,8 +2465,8 @@ int wma_vdev_delete_handler(void *handle, uint8_t *cmd_param_info, qdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); /* Send response to upper layers */ wma_vdev_detach_callback(req_msg->user_data); - cdf_mc_timer_stop(&req_msg->event_timeout); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); return status; @@ -2517,8 +2517,8 @@ int wma_peer_delete_handler(void *handle, uint8_t *cmd_param_info, WIFI_POWER_EVENT_WAKELOCK_WMI_CMD_RSP); qdf_runtime_pm_allow_suspend(wma->wmi_cmd_rsp_runtime_lock); /* Cleanup timeout handler */ - cdf_mc_timer_stop(&req_msg->event_timeout); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); if (req_msg->type == WMA_DELETE_STA_RSP_START) { del_sta = req_msg->user_data; @@ -2595,7 +2595,7 @@ void wma_hold_req_timer(void *data) CDF_ASSERT(0); } free_tgt_req: - cdf_mc_timer_destroy(&tgt_req->event_timeout); + qdf_mc_timer_destroy(&tgt_req->event_timeout); cdf_mem_free(tgt_req); } @@ -2630,9 +2630,9 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_hold_req_timer, req); - cdf_mc_timer_start(&req->event_timeout, timeout); + qdf_mc_timer_start(&req->event_timeout, timeout); qdf_spin_lock_bh(&wma->wma_hold_req_q_lock); status = qdf_list_insert_back(&wma->wma_hold_req_queue, &req->node); if (QDF_STATUS_SUCCESS != status) { @@ -2666,8 +2666,8 @@ void wma_remove_req(tp_wma_handle wma, uint8_t vdev_id, return; } - cdf_mc_timer_stop(&req_msg->event_timeout); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } @@ -2706,7 +2706,7 @@ void wma_vdev_resp_timer(void *data) if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - cdf_mc_timer_stop(&tgt_req->event_timeout); + qdf_mc_timer_stop(&tgt_req->event_timeout); goto free_tgt_req; } @@ -2735,7 +2735,7 @@ void wma_vdev_resp_timer(void *data) if (tgt_req->vdev_id > wma->max_bssid) { WMA_LOGE("%s: Invalid vdev_id %d", __func__, tgt_req->vdev_id); - cdf_mc_timer_stop(&tgt_req->event_timeout); + qdf_mc_timer_stop(&tgt_req->event_timeout); goto free_tgt_req; } @@ -2743,7 +2743,7 @@ void wma_vdev_resp_timer(void *data) if (iface->handle == NULL) { WMA_LOGE("%s vdev id %d is already deleted", __func__, tgt_req->vdev_id); - cdf_mc_timer_stop(&tgt_req->event_timeout); + qdf_mc_timer_stop(&tgt_req->event_timeout); goto free_tgt_req; } if (wma_is_vdev_in_ibss_mode(wma, tgt_req->vdev_id)) @@ -2904,7 +2904,7 @@ error0: wma_ocb_set_config_resp(wma, QDF_STATUS_E_TIMEOUT); } free_tgt_req: - cdf_mc_timer_destroy(&tgt_req->event_timeout); + qdf_mc_timer_destroy(&tgt_req->event_timeout); cdf_mem_free(tgt_req); } @@ -2938,9 +2938,9 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, req->msg_type = msg_type; req->type = type; req->user_data = params; - cdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init(&req->event_timeout, QDF_TIMER_TYPE_SW, wma_vdev_resp_timer, req); - cdf_mc_timer_start(&req->event_timeout, timeout); + qdf_mc_timer_start(&req->event_timeout, timeout); qdf_spin_lock_bh(&wma->vdev_respq_lock); status = qdf_list_insert_back(&wma->vdev_resp_queue, &req->node); if (QDF_STATUS_SUCCESS != status) { @@ -2972,8 +2972,8 @@ void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id, if (!req_msg) return; - cdf_mc_timer_stop(&req_msg->event_timeout); - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_stop(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 5b6ad6917c87..66f3696fc1f3 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1783,7 +1783,7 @@ QDF_STATUS wma_open(void *cds_context, goto err_event_init; } - qdf_status = cdf_mc_timer_init(&wma_handle->service_ready_ext_timer, + qdf_status = qdf_mc_timer_init(&wma_handle->service_ready_ext_timer, QDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); @@ -2321,7 +2321,7 @@ static int wma_flush_complete_evt_handler(void *handle, } else if (!reason_code && cds_is_log_report_in_progress() == true) { /* Flush event in response to flush command */ WMA_LOGI("Received WMI flush event in response to flush CMD"); - status = cdf_mc_timer_stop(&wma->log_completion_timer); + status = qdf_mc_timer_stop(&wma->log_completion_timer); if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to stop the log completion timeout"); cds_logging_set_fw_flush_complete(); @@ -2765,7 +2765,7 @@ QDF_STATUS wma_start(void *cds_ctx) } /* Initialize log completion timeout */ - qdf_status = cdf_mc_timer_init(&wma_handle->log_completion_timer, + qdf_status = qdf_mc_timer_init(&wma_handle->log_completion_timer, QDF_TIMER_TYPE_SW, wma_log_completion_timeout, wma_handle); @@ -2870,7 +2870,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) } /* Destroy the timer for log completion */ - qdf_status = cdf_mc_timer_destroy(&wma_handle->log_completion_timer); + qdf_status = qdf_mc_timer_destroy(&wma_handle->log_completion_timer); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to destroy the log completion timer"); } @@ -2935,7 +2935,7 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) req_msg->vdev_id, req_msg->type); return; } - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); @@ -2970,7 +2970,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) req_msg->vdev_id, req_msg->type); return; } - cdf_mc_timer_destroy(&req_msg->event_timeout); + qdf_mc_timer_destroy(&req_msg->event_timeout); cdf_mem_free(req_msg); } qdf_spin_unlock_bh(&wma->vdev_respq_lock); @@ -3150,7 +3150,7 @@ QDF_STATUS wma_close(void *cds_ctx) /* close the cdf events */ cdf_event_destroy(&wma_handle->wma_ready_event); - qdf_status = cdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); + qdf_status = qdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); if (!CDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGP("%s: Failed to destroy service ready ext event timer", __func__); @@ -4048,7 +4048,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) /* The saved 'buf' will be freed after sending INIT command or * in other cases as required */ - ret = cdf_mc_timer_start(&wma_handle->service_ready_ext_timer, + ret = qdf_mc_timer_start(&wma_handle->service_ready_ext_timer, WMA_SERVICE_READY_EXT_TIMEOUT); if (!CDF_IS_STATUS_SUCCESS(ret)) WMA_LOGP("Failed to start the service ready ext timer"); @@ -4103,7 +4103,7 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) __func__, ev->default_conc_scan_config_bits, ev->default_fw_config_bits); - ret = cdf_mc_timer_stop(&wma_handle->service_ready_ext_timer); + ret = qdf_mc_timer_stop(&wma_handle->service_ready_ext_timer); if (!CDF_IS_STATUS_SUCCESS(ret)) { WMA_LOGP("Failed to stop the service ready ext timer"); return; @@ -4681,7 +4681,7 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) } WMA_LOGI("Sent WMI_DEBUG_MESG_FLUSH_CMDID to FW"); - status = cdf_mc_timer_start(&wma_handle->log_completion_timer, + status = qdf_mc_timer_start(&wma_handle->log_completion_timer, WMA_LOG_COMPLETION_TIMER); if (status != QDF_STATUS_SUCCESS) WMA_LOGE("Failed to start the log completion timer"); -- cgit v1.2.3 From b2dc16fefeed3acc78d721cd01c5891de43bd3b0 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Thu, 25 Feb 2016 11:47:37 +0530 Subject: qcacld-3.0: Add QDF trace API's Replace CDF trace API's with QDF trace API's. Change-Id: I5b99dce73297f7de8f0755fa0b47dc3f84c78747 CRs-Fixed: 981188 --- core/bmi/inc/bmi.h | 2 +- core/bmi/src/ol_fw.c | 4 +- core/cdf/inc/cdf_trace.h | 283 ------ core/cdf/src/cdf_memory.c | 54 +- core/cdf/src/cdf_nbuf.c | 16 +- core/cdf/src/cdf_trace.c | 1012 -------------------- core/cdf/src/i_cdf_trace.h | 145 --- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/cds/inc/cds_utils.h | 14 +- core/cds/src/cds_api.c | 324 +++---- core/cds/src/cds_concurrency.c | 6 +- core/cds/src/cds_mq.c | 16 +- core/cds/src/cds_packet.c | 18 +- core/cds/src/cds_reg_service.c | 48 +- core/cds/src/cds_sched.c | 186 ++-- core/cds/src/cds_utils.c | 72 +- core/dp/htt/htt_internal.h | 2 +- core/dp/htt/htt_tx.c | 4 +- core/dp/ol/inc/ol_htt_tx_api.h | 36 +- core/dp/txrx/ol_rx.c | 6 +- core/dp/txrx/ol_rx_defrag.c | 2 +- core/dp/txrx/ol_rx_pn.c | 6 +- core/dp/txrx/ol_rx_reorder.c | 8 +- core/dp/txrx/ol_tx.c | 16 +- core/dp/txrx/ol_tx_queue.c | 4 +- core/dp/txrx/ol_tx_send.c | 4 +- core/dp/txrx/ol_txrx.c | 124 +-- core/dp/txrx/ol_txrx_event.c | 22 +- core/dp/txrx/ol_txrx_internal.h | 32 +- core/dp/txrx/ol_txrx_peer_find.c | 10 +- core/hdd/inc/wlan_hdd_main.h | 20 +- core/hdd/src/wlan_hdd_assoc.c | 24 +- core/hdd/src/wlan_hdd_cfg.c | 446 ++++----- core/hdd/src/wlan_hdd_cfg80211.c | 252 ++--- core/hdd/src/wlan_hdd_conc_ut.c | 2 +- core/hdd/src/wlan_hdd_debugfs.c | 42 +- core/hdd/src/wlan_hdd_driver_ops.c | 24 +- core/hdd/src/wlan_hdd_ftm.c | 138 +-- core/hdd/src/wlan_hdd_hostapd.c | 46 +- core/hdd/src/wlan_hdd_ioctl.c | 588 ++++++------ core/hdd/src/wlan_hdd_ipa.c | 276 +++--- core/hdd/src/wlan_hdd_lro.c | 2 +- core/hdd/src/wlan_hdd_main.c | 330 +++---- core/hdd/src/wlan_hdd_napi.c | 12 +- core/hdd/src/wlan_hdd_oemdata.c | 70 +- core/hdd/src/wlan_hdd_p2p.c | 72 +- core/hdd/src/wlan_hdd_power.c | 152 +-- core/hdd/src/wlan_hdd_scan.c | 36 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 120 +-- core/hdd/src/wlan_hdd_stats.c | 94 +- core/hdd/src/wlan_hdd_tdls.c | 236 ++--- core/hdd/src/wlan_hdd_trace.c | 6 +- core/hdd/src/wlan_hdd_tx_rx.c | 62 +- core/hdd/src/wlan_hdd_wext.c | 344 +++---- core/hdd/src/wlan_hdd_wmm.c | 260 ++--- core/hdd/src/wlan_hdd_wowl.c | 64 +- core/mac/src/include/utils_api.h | 4 +- core/mac/src/pe/include/lim_trace.h | 6 +- core/mac/src/pe/lim/lim_api.c | 24 +- core/mac/src/pe/lim/lim_assoc_utils.c | 2 +- core/mac/src/pe/lim/lim_ft.c | 6 +- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 2 +- core/mac/src/pe/lim/lim_process_action_frame.c | 4 +- core/mac/src/pe/lim/lim_process_message_queue.c | 34 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 18 +- core/mac/src/pe/lim/lim_process_probe_rsp_frame.c | 4 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 22 +- core/mac/src/pe/lim/lim_process_tdls.c | 18 +- core/mac/src/pe/lim/lim_prop_exts_utils.c | 4 +- core/mac/src/pe/lim/lim_scan_result_utils.c | 2 +- core/mac/src/pe/lim/lim_send_management_frames.c | 100 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 4 +- core/mac/src/pe/lim/lim_session.c | 24 +- core/mac/src/pe/lim/lim_trace.c | 6 +- core/mac/src/pe/lim/lim_utils.c | 6 +- core/mac/src/pe/sch/sch_api.c | 2 +- core/mac/src/pe/sch/sch_beacon_process.c | 6 +- core/mac/src/pe/sch/sch_debug.c | 6 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 64 +- .../src/sys/legacy/src/platform/inc/sys_wrapper.h | 2 +- .../src/sys/legacy/src/platform/src/sys_wrapper.c | 48 +- .../src/sys/legacy/src/system/src/mac_init_api.c | 4 +- .../src/sys/legacy/src/system/src/sys_entry_func.c | 6 +- core/mac/src/sys/legacy/src/utils/src/log_api.c | 26 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 4 +- core/sap/dfs/inc/dfs.h | 2 +- core/sap/dfs/src/dfs.c | 4 +- core/sap/dfs/src/dfs_init.c | 22 +- core/sap/dfs/src/dfs_phyerr_tlv.c | 30 +- core/sap/dfs/src/dfs_process_phyerr.c | 8 +- core/sap/dfs/src/dfs_process_radarevent.c | 46 +- core/sap/src/sap_api_link_cntl.c | 156 +-- core/sap/src/sap_ch_select.c | 92 +- core/sap/src/sap_fsm.c | 394 ++++---- core/sap/src/sap_module.c | 356 +++---- core/sme/inc/sme_inside.h | 2 +- core/sme/inc/sme_internal.h | 2 +- core/sme/inc/sme_power_save.h | 2 +- core/sme/inc/sme_qos_api.h | 2 +- core/sme/inc/sme_qos_internal.h | 2 +- core/sme/inc/sme_rrm_api.h | 2 +- core/sme/inc/sme_rrm_internal.h | 2 +- core/sme/src/common/sme_api.c | 712 +++++++------- core/sme/src/common/sme_ft_api.c | 2 +- core/sme/src/common/sme_power_save.c | 68 +- core/sme/src/common/sme_trace.c | 4 +- core/sme/src/csr/csr_api_roam.c | 254 ++--- core/sme/src/csr/csr_api_scan.c | 46 +- core/sme/src/csr/csr_cmd_process.c | 4 +- core/sme/src/csr/csr_link_list.c | 40 +- core/sme/src/csr/csr_neighbor_roam.c | 80 +- core/sme/src/csr/csr_tdls_process.c | 18 +- core/sme/src/csr/csr_util.c | 40 +- core/sme/src/nan/nan_api.c | 10 +- core/sme/src/p2p/p2p_api.c | 4 +- core/sme/src/qos/sme_qos.c | 842 ++++++++-------- core/sme/src/rrm/sme_rrm.c | 26 +- core/utils/epping/inc/epping_internal.h | 2 +- core/utils/epping/src/epping_helper.c | 6 +- core/utils/epping/src/epping_main.c | 40 +- core/utils/epping/src/epping_rx.c | 10 +- core/utils/epping/src/epping_tx.c | 34 +- core/utils/epping/src/epping_txrx.c | 49 +- core/utils/host_diag_log/src/host_diag_log.c | 10 +- core/utils/logging/inc/wlan_logging_sock_svc.h | 4 +- core/utils/logging/src/wlan_logging_sock_svc.c | 40 +- core/utils/nlink/src/wlan_nlink_srv.c | 24 +- core/utils/ptt/inc/wlan_ptt_sock_svc.h | 2 +- core/utils/ptt/src/wlan_ptt_sock_svc.c | 30 +- core/wma/inc/wma.h | 12 +- core/wma/src/wma_data.c | 22 +- core/wma/src/wma_dev_if.c | 8 +- core/wma/src/wma_features.c | 40 +- core/wma/src/wma_main.c | 18 +- core/wma/src/wma_mgmt.c | 2 +- core/wma/src/wma_power.c | 14 +- core/wma/src/wma_scan_roam.c | 52 +- core/wma/src/wma_utils.c | 10 +- core/wmi/wmi_unified.c | 12 +- uapi/linux/osapi_linux.h | 6 +- 141 files changed, 4469 insertions(+), 5908 deletions(-) delete mode 100644 core/cdf/inc/cdf_trace.h delete mode 100644 core/cdf/src/cdf_trace.c delete mode 100644 core/cdf/src/i_cdf_trace.h diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index 7ceb675a0e2a..eb0431e6c359 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -33,7 +33,7 @@ #ifndef _BMI_H_ #define _BMI_H_ #include "bmi_msg.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "ol_if_athvar.h" #include "hif.h" diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index af516956201b..77cc3f713a94 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -120,9 +120,9 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) if (cdf_mem_compare(hash, digest, SHA256_DIGEST_SIZE) != 0) { BMI_ERR("Hash Mismatch"); - cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + qdf_trace_hex_dump(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, digest, SHA256_DIGEST_SIZE); - cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + qdf_trace_hex_dump(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, hash, SHA256_DIGEST_SIZE); ret = QDF_STATUS_E_FAILURE; } diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h deleted file mode 100644 index 4d198abaa75d..000000000000 --- a/core/cdf/inc/cdf_trace.h +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_TRACE_H) -#define __CDF_TRACE_H - -/** - * DOC: cdf_trace - * - * Connectivity driver framework trace APIs - * - * Trace, logging, and debugging definitions and APIs - * - */ - -/* Include Files */ -#include /* For QDF_MODULE_ID... */ -#include /* For va_list... */ -#include -#include -#include -#include - -/* Type declarations */ - -typedef enum { - /* NONE means NO traces will be logged. This value is in place - * for the cdf_trace_setlevel() to allow the user to turn off - * all traces - */ - CDF_TRACE_LEVEL_NONE = 0, - - /* Following trace levels are the ones that 'callers' of CDF_TRACE() - * can specify in for the CDF_TRACE_LEVEL parameter. Traces are - * classified by severity. FATAL being more serious than INFO for - * example - */ - CDF_TRACE_LEVEL_FATAL, - CDF_TRACE_LEVEL_ERROR, - CDF_TRACE_LEVEL_WARN, - CDF_TRACE_LEVEL_INFO, - CDF_TRACE_LEVEL_INFO_HIGH, - CDF_TRACE_LEVEL_INFO_MED, - CDF_TRACE_LEVEL_INFO_LOW, - CDF_TRACE_LEVEL_DEBUG, - - /* All means all trace levels will be active. This value is in place - * for the cdf_trace_setlevel() to allow the user to turn ON all traces - */ - CDF_TRACE_LEVEL_ALL, - - /* Not a real level. Used to identify the maximum number of - * CDF_TRACE_LEVELs defined - */ - CDF_TRACE_LEVEL_MAX -} CDF_TRACE_LEVEL; - -/* By default Data Path module will have all log levels enabled, except debug - * log level. Debug level will be left up to the framework or user space modules - * to be enabled when issue is detected - */ -#define CDF_DATA_PATH_TRACE_LEVEL \ - ((1 << CDF_TRACE_LEVEL_FATAL) | (1 << CDF_TRACE_LEVEL_ERROR) | \ - (1 << CDF_TRACE_LEVEL_WARN) | (1 << CDF_TRACE_LEVEL_INFO) | \ - (1 << CDF_TRACE_LEVEL_INFO_HIGH) | (1 << CDF_TRACE_LEVEL_INFO_MED) | \ - (1 << CDF_TRACE_LEVEL_INFO_LOW)) - -/* Preprocessor definitions and constants */ -#define ASSERT_BUFFER_SIZE (512) - -#define CDF_ENABLE_TRACING -#define MAX_CDF_TRACE_RECORDS 4000 -#define INVALID_CDF_TRACE_ADDR 0xffffffff -#define DEFAULT_CDF_TRACE_DUMP_COUNT 0 - -#include - -#ifdef TRACE_RECORD - -#define MTRACE(p) p -#define NO_SESSION 0xFF - -#else -#define MTRACE(p) { } - -#endif - -/* Structure definition */ -typedef struct cdf_trace_record_s { - uint64_t time; - uint8_t module; - uint8_t code; - uint16_t session; - uint32_t data; - uint32_t pid; -} cdf_trace_record_t, *tp_cdf_trace_record; - -typedef struct s_cdf_trace_data { - /* MTRACE logs are stored in ring buffer where head represents the - * position of first record, tail represents the position of last record - * added till now and num is the count of total record added - */ - uint32_t head; - uint32_t tail; - uint32_t num; - uint16_t numSinceLastDump; - - /* config for controlling the trace */ - uint8_t enable; - /* Dump after number of records reach this number */ - uint16_t dumpCount; -} t_cdf_trace_data; - -#define CASE_RETURN_STRING(str) case ((str)): return (uint8_t *)(# str); - -/* DP Trace Implementation */ -#define DPTRACE(p) p - -#define MAX_CDF_DP_TRACE_RECORDS 4000 -#define CDF_DP_TRACE_RECORD_SIZE 16 -#define INVALID_CDF_DP_TRACE_ADDR 0xffffffff -#define CDF_DP_TRACE_VERBOSITY_HIGH 3 -#define CDF_DP_TRACE_VERBOSITY_MEDIUM 2 -#define CDF_DP_TRACE_VERBOSITY_LOW 1 -#define CDF_DP_TRACE_VERBOSITY_DEFAULT 0 - -/** - * enum CDF_DP_TRACE_ID - Generic ID to identify various events in data path - * @CDF_DP_TRACE_INVALID: Invalid ID - * @CDF_DP_TRACE_DROP_PACKET_RECORD: Dropped packet stored with this id - * @CDF_DP_TRACE_HDD_PACKET_PTR_RECORD: nbuf->data ptr of HDD - * @CDF_DP_TRACE_HDD_PACKET_RECORD: nbuf->data stored with this id - * @CDF_DP_TRACE_CE_PACKET_PTR_RECORD: nbuf->data ptr of CE - * @CDF_DP_TRACE_CE_PACKET_RECORD: nbuf->data stored with this id - * @CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD: nbuf->data ptr of txrx queue - * @CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD: nbuf->data ptr of txrx - * @CDF_DP_TRACE_HTT_PACKET_PTR_RECORD: nbuf->data ptr of htt - * @CDF_DP_TRACE_HTC_PACKET_PTR_RECORD: nbuf->data ptr of htc - * @CDF_DP_TRACE_HIF_PACKET_PTR_RECORD: nbuf->data ptr of hif - * @CDF_DP_TRACE_HDD_TX_TIMEOUT: hdd tx timeout event - * @CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT: hdd tx softap timeout event - * @CDF_DP_TRACE_VDEV_PAUSE: vdev pause event - * @CDF_DP_TRACE_VDEV_UNPAUSE: vdev unpause event - * - */ -enum CDF_DP_TRACE_ID { - CDF_DP_TRACE_INVALID = 0, - CDF_DP_TRACE_DROP_PACKET_RECORD = 1, - CDF_DP_TRACE_HDD_PACKET_PTR_RECORD = 2, - CDF_DP_TRACE_HDD_PACKET_RECORD = 3, - CDF_DP_TRACE_CE_PACKET_PTR_RECORD = 4, - CDF_DP_TRACE_CE_PACKET_RECORD = 5, - CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD = 6, - CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD = 7, - CDF_DP_TRACE_HTT_PACKET_PTR_RECORD = 8, - CDF_DP_TRACE_HTC_PACKET_PTR_RECORD = 9, - CDF_DP_TRACE_HIF_PACKET_PTR_RECORD = 10, - CDF_DP_TRACE_HDD_TX_TIMEOUT = 11, - CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT = 12, - CDF_DP_TRACE_VDEV_PAUSE = 13, - CDF_DP_TRACE_VDEV_UNPAUSE = 14, - CDF_DP_TRACE_MAX - -}; - -/** - * struct cdf_dp_trace_record_s - Describes a record in DP trace - * @time: time when it got stored - * @code: Describes the particular event - * @data: buffer to store data - * @size: Length of the valid data stored in this record - * @pid : process id which stored the data in this record - */ -struct cdf_dp_trace_record_s { - uint64_t time; - uint8_t code; - uint8_t data[CDF_DP_TRACE_RECORD_SIZE]; - uint8_t size; - uint32_t pid; -}; - -/** - * struct cdf_dp_trace_data - Parameters to configure/control DP trace - * @head: Position of first record - * @tail: Position of last record - * @num: Current index - * @proto_bitmap: defines which protocol to be traced - * @no_of_record: defines every nth packet to be traced - * @verbosity : defines verbosity level - * @enable: enable/disable DP trace - * @count: current packet number - */ -struct s_cdf_dp_trace_data { - uint32_t head; - uint32_t tail; - uint32_t num; - - /* config for controlling the trace */ - uint8_t proto_bitmap; - uint8_t no_of_record; - uint8_t verbosity; - bool enable; - uint32_t count; -}; -/* Function declarations and documenation */ - -/** - * cdf_trace_set_level() - Set the trace level for a particular module - * @level : trace level - * - * Trace level is a member of the CDF_TRACE_LEVEL enumeration indicating - * the severity of the condition causing the trace message to be issued. - * More severe conditions are more likely to be logged. - * - * This is an external API that allows trace levels to be set for each module. - * - * Return: nothing - */ -void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level); - -/** - * cdf_trace_get_level() - get the trace level - * @level : trace level - * - * This is an external API that returns a bool value to signify if a - * particular trace level is set for the specified module. - * A member of the CDF_TRACE_LEVEL enumeration indicating the severity - * of the condition causing the trace message to be issued. - * - * Note that individual trace levels are the only valid values - * for this API. CDF_TRACE_LEVEL_NONE and CDF_TRACE_LEVEL_ALL - * are not valid input and will return false - * - * Return: - * false - the specified trace level for the specified module is OFF - * true - the specified trace level for the specified module is ON - */ -bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level); - -typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t); -void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data); -void cdf_trace_register(QDF_MODULE_ID, tp_cdf_trace_cb); -QDF_STATUS cdf_trace_spin_lock_init(void); -void cdf_trace_init(void); -void cdf_trace_enable(uint32_t, uint8_t enable); -void cdf_trace_dump_all(void *, uint8_t, uint8_t, uint32_t, uint32_t); - -void cdf_dp_trace_spin_lock_init(void); -void cdf_dp_trace_init(void); -void cdf_dp_trace_set_value(uint8_t proto_bitmap, uint8_t no_of_records, - uint8_t verbosity); -void cdf_dp_trace_set_track(cdf_nbuf_t nbuf); -void cdf_dp_trace(cdf_nbuf_t nbuf, enum CDF_DP_TRACE_ID code, - uint8_t *data, uint8_t size); -void cdf_dp_trace_dump_all(uint32_t count); -typedef void (*tp_cdf_dp_trace_cb)(struct cdf_dp_trace_record_s* , uint16_t); -void cdf_dp_display_record(struct cdf_dp_trace_record_s *record, - uint16_t index); -#endif diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 0c4de4378690..547a3b68c050 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -34,7 +34,7 @@ /* Include Files */ #include "cdf_memory.h" #include "cdf_nbuf.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "qdf_lock.h" #include "qdf_mc_timer.h" @@ -111,7 +111,7 @@ static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct) static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct *mem_struct) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Call stack for the source of leaked memory:"); print_stack_trace(&mem_struct->trace, 1); @@ -164,7 +164,7 @@ void cdf_mem_clean(void) unsigned int prev_mleak_sz = 0; unsigned int mleak_cnt = 0; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: List is not Empty. listSize %d ", __func__, (int)listSize); @@ -182,8 +182,8 @@ void cdf_mem_clean(void) memStruct->lineNum) || (prev_mleak_sz != memStruct->size)) { if (mleak_cnt != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_FATAL, "%d Time Memory Leak@ File %s, @Line %d, size %d", mleak_cnt, prev_mleak_file, @@ -203,7 +203,7 @@ void cdf_mem_clean(void) /* Print last memory leak from the module */ if (mleak_cnt) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%d Time memory Leak@ File %s, @Line %d, size %d", mleak_cnt, prev_mleak_file, prev_mleak_lineNum, prev_mleak_sz); @@ -252,7 +252,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) unsigned long time_before_kzalloc; if (size > (1024 * 1024) || size == 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: called with invalid arg; passed in %zu !!!", __func__, size); return NULL; @@ -281,7 +281,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) */ if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS at line %d", __func__, qdf_mc_timer_get_system_time() - time_before_kzalloc, @@ -306,7 +306,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) &memStruct->pNode); qdf_spin_unlock_irqrestore(&cdf_mem_list_lock); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Unable to insert node into List qdf_status %d", __func__, qdf_status); } @@ -347,30 +347,30 @@ void cdf_mem_free(void *ptr) if (0 == cdf_mem_compare(memStruct->header, &WLAN_MEM_HEADER[0], sizeof(WLAN_MEM_HEADER))) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_FATAL, "Memory Header is corrupted. MemInfo: Filename %s, LineNum %d", memStruct->fileName, (int)memStruct->lineNum); - CDF_BUG(0); + QDF_BUG(0); } if (0 == cdf_mem_compare((uint8_t *) ptr + memStruct->size, &WLAN_MEM_TAIL[0], sizeof(WLAN_MEM_TAIL))) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_FATAL, "Memory Trailer is corrupted. MemInfo: Filename %s, LineNum %d", memStruct->fileName, (int)memStruct->lineNum); - CDF_BUG(0); + QDF_BUG(0); } kfree((void *)memStruct); } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Unallocated memory (double free?)", __func__); - CDF_BUG(0); + QDF_BUG(0); } } } @@ -396,7 +396,7 @@ void *cdf_mem_malloc(size_t size) unsigned long time_before_kzalloc; if (size > (1024 * 1024) || size == 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: called with invalid arg; passed in %zu !!", __func__, size); return NULL; @@ -423,7 +423,7 @@ void *cdf_mem_malloc(size_t size) */ if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= CDF_GET_MEMORY_TIME_THRESHOLD) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: kzalloc took %lu msec for size %zu called from %pS", __func__, qdf_mc_timer_get_system_time() - time_before_kzalloc, @@ -618,7 +618,7 @@ void cdf_mem_multi_pages_free(qdf_device_t osdev, void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value) { if (ptr == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__); return; } @@ -646,7 +646,7 @@ void cdf_mem_zero(void *ptr, uint32_t numBytes) } if (ptr == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter ptr", __func__); return; } @@ -678,10 +678,10 @@ void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes) } if ((pDst == NULL) || (pSrc == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, source:%p destination:%p", __func__, pSrc, pDst); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } memcpy(pDst, pSrc, numBytes); @@ -708,10 +708,10 @@ void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes) } if ((pDst == NULL) || (pSrc == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, source:%p destination:%p", __func__, pSrc, pDst); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } memmove(pDst, pSrc, numBytes); @@ -740,10 +740,10 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2, } if ((pMemory1 == NULL) || (pMemory2 == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s called with NULL parameter, p1:%p p2:%p", __func__, pMemory1, pMemory2); - CDF_ASSERT(0); + QDF_ASSERT(0); return false; } return memcmp(pMemory1, pMemory2, numBytes) ? false : true; diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 7ecaafa3d90f..af56eda6e002 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -536,7 +536,7 @@ void cdf_net_buf_debug_exit(void) while (p_node) { p_prev = p_node; p_node = p_node->p_next; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "SKB buf memory Leak@ File %s, @Line %d, size %zu\n", p_prev->file_name, p_prev->line_num, p_prev->size); @@ -632,10 +632,10 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, p_node = cdf_net_buf_debug_look_up(net_buf); if (p_node) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Double allocation of skb ! Already allocated from %s %d", p_node->file_name, p_node->line_num); - CDF_ASSERT(0); + QDF_ASSERT(0); goto done; } else { p_node = (CDF_NBUF_TRACK *) cdf_mem_malloc(sizeof(*p_node)); @@ -647,10 +647,10 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, p_node->p_next = gp_cdf_net_buf_track_tbl[i]; gp_cdf_net_buf_track_tbl[i] = p_node; } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Mem alloc failed ! Could not track skb from %s %d of size %zu", file_name, line_num, size); - CDF_ASSERT(0); + QDF_ASSERT(0); } } @@ -706,10 +706,10 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf) done: if (!found) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Unallocated buffer ! Double free of net_buf %p ?", net_buf); - CDF_ASSERT(0); + QDF_ASSERT(0); } spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c deleted file mode 100644 index 2009859f310c..000000000000 --- a/core/cdf/src/cdf_trace.c +++ /dev/null @@ -1,1012 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_trace - * - * Connectivity driver framework (CDF) trace APIs - * - * Trace, logging, and debugging definitions and APIs - * - */ - -/* Include Files */ -#include -#include -#include -#include "qdf_time.h" -/* Preprocessor definitions and constants */ - -#define CDF_TRACE_BUFFER_SIZE (512) - -enum qdf_timestamp_unit qdf_log_timestamp_type = QDF_LOG_TIMESTAMP_UNIT; - -/* macro to map cdf trace levels into the bitmask */ -#define CDF_TRACE_LEVEL_TO_MODULE_BITMASK(_level) ((1 << (_level))) - -typedef struct { - /* Trace level for a module, as a bitmask. The bits in this mask - * are ordered by CDF_TRACE_LEVEL. For example, each bit represents - * one of the bits in CDF_TRACE_LEVEL that may be turned on to have - * traces at that level logged, i.e. if CDF_TRACE_LEVEL_ERROR is - * == 2, then if bit 2 (low order) is turned ON, then ERROR traces - * will be printed to the trace log. - * Note that all bits turned OFF means no traces - */ - uint16_t moduleTraceLevel; - - /* 3 character string name for the module */ - unsigned char moduleNameStr[4]; /* 3 chars plus the NULL */ -} moduleTraceInfo; - -#define CDF_DEFAULT_TRACE_LEVEL \ - ((1 << CDF_TRACE_LEVEL_FATAL) | (1 << CDF_TRACE_LEVEL_ERROR)) - -/* Array of static data that contains all of the per module trace - * information. This includes the trace level for the module and - * the 3 character 'name' of the module for marking the trace logs - */ -moduleTraceInfo g_cdf_trace_info[QDF_MODULE_ID_MAX] = { - [QDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"}, - [QDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"}, - [QDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"}, - [QDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"}, - [QDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "}, - [QDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"}, - [QDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"}, - [QDF_MODULE_ID_QDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"}, - [QDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"}, - [QDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"}, - [QDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"}, - [QDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"}, - [QDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"}, - [QDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"}, - [QDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"}, - [QDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"}, -}; - -/* Static and Global variables */ -static spinlock_t ltrace_lock; - -static cdf_trace_record_t g_cdf_trace_tbl[MAX_CDF_TRACE_RECORDS]; -/* global cdf trace data */ -static t_cdf_trace_data g_cdf_trace_data; -/* - * all the call back functions for dumping MTRACE messages from ring buffer - * are stored in cdf_trace_cb_table,these callbacks are initialized during init - * only so, we will make a copy of these call back functions and maintain in to - * cdf_trace_restore_cb_table. Incase if we make modifications to - * cdf_trace_cb_table, we can certainly retrieve all the call back functions - * back from Restore Table - */ -static tp_cdf_trace_cb cdf_trace_cb_table[QDF_MODULE_ID_MAX]; -static tp_cdf_trace_cb cdf_trace_restore_cb_table[QDF_MODULE_ID_MAX]; - -/* Static and Global variables */ -static spinlock_t l_dp_trace_lock; - -static struct cdf_dp_trace_record_s - g_cdf_dp_trace_tbl[MAX_CDF_DP_TRACE_RECORDS]; - -/* - * all the options to configure/control DP trace are - * defined in this structure - */ -static struct s_cdf_dp_trace_data g_cdf_dp_trace_data; -/* - * all the call back functions for dumping DPTRACE messages from ring buffer - * are stored in cdf_dp_trace_cb_table, callbacks are initialized during init - */ -static tp_cdf_dp_trace_cb cdf_dp_trace_cb_table[CDF_DP_TRACE_MAX]; - -/** - * cdf_trace_set_level() - Set the trace level for a particular module - * @level : trace level - * - * Trace level is a member of the CDF_TRACE_LEVEL enumeration indicating - * the severity of the condition causing the trace message to be issued. - * More severe conditions are more likely to be logged. - * - * This is an external API that allows trace levels to be set for each module. - * - * Return: nothing - */ -void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level) -{ - /* make sure the caller is passing in a valid LEVEL */ - if (level >= CDF_TRACE_LEVEL_MAX) { - pr_err("%s: Invalid trace level %d passed in!\n", __func__, - level); - return; - } - - /* Treat 'none' differently. NONE means we have to run off all - * the bits in the bit mask so none of the traces appear. Anything - * other than 'none' means we need to turn ON a bit in the bitmask - */ - if (CDF_TRACE_LEVEL_NONE == level) - g_cdf_trace_info[module].moduleTraceLevel = - CDF_TRACE_LEVEL_NONE; - else - /* set the desired bit in the bit mask for the module trace - * level */ - g_cdf_trace_info[module].moduleTraceLevel |= - CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level); -} - -/** - * cdf_trace_set_module_trace_level() - Set module trace level - * @module: Module id - * @level: Trace level for a module, as a bitmask as per 'moduleTraceInfo' - * - * Sets the module trace level where the trace level is given as a bit mask - * - * Return: None - */ -void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level) -{ - if (module < 0 || module >= QDF_MODULE_ID_MAX) { - pr_err("%s: Invalid module id %d passed\n", __func__, module); - return; - } - g_cdf_trace_info[module].moduleTraceLevel = level; -} - -void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - uint8_t on) -{ - /* make sure the caller is passing in a valid LEVEL */ - if (level < 0 || level >= CDF_TRACE_LEVEL_MAX) { - pr_err("%s: Invalid trace level %d passed in!\n", __func__, - level); - return; - } - - /* make sure the caller is passing in a valid module */ - if (module < 0 || module >= QDF_MODULE_ID_MAX) { - pr_err("%s: Invalid module id %d passed in!\n", __func__, - module); - return; - } - - /* Treat 'none' differently. NONE means we have to turn off all - the bits in the bit mask so none of the traces appear */ - if (CDF_TRACE_LEVEL_NONE == level) { - g_cdf_trace_info[module].moduleTraceLevel = - CDF_TRACE_LEVEL_NONE; - } - /* Treat 'All' differently. All means we have to turn on all - the bits in the bit mask so all of the traces appear */ - else if (CDF_TRACE_LEVEL_ALL == level) { - g_cdf_trace_info[module].moduleTraceLevel = 0xFFFF; - } else { - if (on) - /* set the desired bit in the bit mask for the module - trace level */ - g_cdf_trace_info[module].moduleTraceLevel |= - CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level); - else - /* clear the desired bit in the bit mask for the module - trace level */ - g_cdf_trace_info[module].moduleTraceLevel &= - ~(CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)); - } -} - -/** - * cdf_trace_get_level() - get the trace level - * @level : trace level - * - * This is an external API that returns a bool value to signify if a - * particular trace level is set for the specified module. - * A member of the CDF_TRACE_LEVEL enumeration indicating the severity - * of the condition causing the trace message to be issued. - * - * Note that individual trace levels are the only valid values - * for this API. CDF_TRACE_LEVEL_NONE and CDF_TRACE_LEVEL_ALL - * are not valid input and will return false - * - * Return: - * false - the specified trace level for the specified module is OFF - * true - the specified trace level for the specified module is ON - */ -bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level) -{ - bool traceOn = false; - - if ((CDF_TRACE_LEVEL_NONE == level) || - (CDF_TRACE_LEVEL_ALL == level) || (level >= CDF_TRACE_LEVEL_MAX)) { - traceOn = false; - } else { - traceOn = (level & g_cdf_trace_info[module].moduleTraceLevel) - ? true : false; - } - - return traceOn; -} - -void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...) -{ - va_list val; - - va_start(val, strFormat); - snprintf(strBuffer, size, strFormat, val); - va_end(val); -} - -#ifdef CDF_ENABLE_TRACING - -/** - * cdf_trace_msg() - externally called trace function - * @module : Module identifier a member of the QDF_MODULE_ID - * enumeration that identifies the module issuing the trace message. - * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration - * indicating the severity of the condition causing the trace message - * to be issued. More severe conditions are more likely to be logged. - * @strFormat : Format string in which the message to be logged. This format - * string contains printf-like replacement parameters, which follow - * this parameter in the variable argument list. - * - * Checks the level of severity and accordingly prints the trace messages - * - * Return: nothing - * - */ -void cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - char *strFormat, ...) -{ - char strBuffer[CDF_TRACE_BUFFER_SIZE]; - int n; - - /* Print the trace message when the desired level bit is set in - the module tracel level mask */ - if (g_cdf_trace_info[module].moduleTraceLevel & - CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)) { - /* the trace level strings in an array. these are ordered in - * the same order as the trace levels are defined in the enum - * (see CDF_TRACE_LEVEL) so we can index into this array with - * the level and get the right string. The cdf trace levels - * are... none, Fatal, Error, Warning, Info, InfoHigh, InfoMed, - * InfoLow, Debug - */ - static const char *TRACE_LEVEL_STR[] = { " ", "F ", "E ", "W ", - "I ", "IH", "IM", "IL", "D" }; - va_list val; - va_start(val, strFormat); - - /* print the prefix string into the string buffer... */ - n = snprintf(strBuffer, CDF_TRACE_BUFFER_SIZE, - "wlan: [%d:%2s:%3s] ", - in_interrupt() ? 0 : current->pid, - (char *)TRACE_LEVEL_STR[level], - (char *)g_cdf_trace_info[module].moduleNameStr); - - /* print the formatted log message after the prefix string */ - if ((n >= 0) && (n < CDF_TRACE_BUFFER_SIZE)) { - vsnprintf(strBuffer + n, CDF_TRACE_BUFFER_SIZE - n, - strFormat, val); -#if defined(WLAN_LOGGING_SOCK_SVC_ENABLE) - wlan_log_to_user(level, (char *)strBuffer, - strlen(strBuffer)); -#else - pr_err("%s\n", strBuffer); -#endif - } - va_end(val); - } -} - -void cdf_trace_display(void) -{ - QDF_MODULE_ID moduleId; - - pr_err - (" 1)FATAL 2)ERROR 3)WARN 4)INFO 5)INFO_H 6)INFO_M 7)INFO_L 8)DEBUG\n"); - for (moduleId = 0; moduleId < QDF_MODULE_ID_MAX; ++moduleId) { - pr_err - ("%2d)%s %s %s %s %s %s %s %s %s\n", - (int)moduleId, g_cdf_trace_info[moduleId].moduleNameStr, - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_FATAL)) ? "X" : - " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_ERROR)) ? "X" : - " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_WARN)) ? "X" : - " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO)) ? "X" : - " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_HIGH)) ? "X" - : " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_MED)) ? "X" - : " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_LOW)) ? "X" - : " ", - (g_cdf_trace_info[moduleId]. - moduleTraceLevel & (1 << CDF_TRACE_LEVEL_DEBUG)) ? "X" : - " "); - } -} - -#define ROW_SIZE 16 -/* Buffer size = data bytes(2 hex chars plus space) + NULL */ -#define BUFFER_SIZE ((ROW_SIZE * 3) + 1) - -/** - * cdf_trace_hex_dump() - externally called hex dump function - * @module : Module identifier a member of the QDF_MODULE_ID enumeration that - * identifies the module issuing the trace message. - * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration indicating - * the severity of the condition causing the trace message to be - * issued. More severe conditions are more likely to be logged. - * @data : The base address of the buffer to be logged. - * @buf_len : The size of the buffer to be logged. - * - * Checks the level of severity and accordingly prints the trace messages - * - * Return : nothing - */ -void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - void *data, int buf_len) -{ - const u8 *ptr = data; - int i, linelen, remaining = buf_len; - unsigned char linebuf[BUFFER_SIZE]; - - if (!(g_cdf_trace_info[module].moduleTraceLevel & - CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level))) - return; - - for (i = 0; i < buf_len; i += ROW_SIZE) { - linelen = min(remaining, ROW_SIZE); - remaining -= ROW_SIZE; - - hex_dump_to_buffer(ptr + i, linelen, ROW_SIZE, 1, - linebuf, sizeof(linebuf), false); - - cdf_trace_msg(module, level, "%.8x: %s", i, linebuf); - } -} - -#endif - -/** - * cdf_trace_enable() - Enable MTRACE for specific modules - * @bitmask_of_moduleId : Bitmask according to enum of the modules. - * 32 [dec] = 0010 0000 [bin] - * 64 [dec] = 0100 0000 [bin] - * 128 [dec] = 1000 0000 [bin] - * @enable : can be true or false true implies enabling MTRACE false implies - * disabling MTRACE. - * - * Enable MTRACE for specific modules whose bits are set in bitmask and enable - * is true. if enable is false it disables MTRACE for that module. set the - * bitmask according to enum value of the modules. - * This functions will be called when you issue ioctl as mentioned following - * [iwpriv wlan0 setdumplog ]. - * - Decimal number, i.e. 64 decimal value shows only SME module, - * 128 decimal value shows only PE module, 192 decimal value shows PE and SME. - * - * - * Return : nothing - */ -void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable) -{ - int i; - if (bitmask_of_moduleId) { - for (i = 0; i < QDF_MODULE_ID_MAX; i++) { - if (((bitmask_of_moduleId >> i) & 1)) { - if (enable) { - if (NULL != - cdf_trace_restore_cb_table[i]) { - cdf_trace_cb_table[i] = - cdf_trace_restore_cb_table[i]; - } - } else { - cdf_trace_restore_cb_table[i] = - cdf_trace_cb_table[i]; - cdf_trace_cb_table[i] = NULL; - } - } - } - } else { - if (enable) { - for (i = 0; i < QDF_MODULE_ID_MAX; i++) { - if (NULL != cdf_trace_restore_cb_table[i]) { - cdf_trace_cb_table[i] = - cdf_trace_restore_cb_table[i]; - } - } - } else { - for (i = 0; i < QDF_MODULE_ID_MAX; i++) { - cdf_trace_restore_cb_table[i] = - cdf_trace_cb_table[i]; - cdf_trace_cb_table[i] = NULL; - } - } - } -} - -/** - * cdf_trace_init() - initializes cdf trace structures and variables - * - * Called immediately after cds_preopen, so that we can start recording HDD - * events ASAP. - * - * Return : nothing - */ -void cdf_trace_init(void) -{ - uint8_t i; - g_cdf_trace_data.head = INVALID_CDF_TRACE_ADDR; - g_cdf_trace_data.tail = INVALID_CDF_TRACE_ADDR; - g_cdf_trace_data.num = 0; - g_cdf_trace_data.enable = true; - g_cdf_trace_data.dumpCount = DEFAULT_CDF_TRACE_DUMP_COUNT; - g_cdf_trace_data.numSinceLastDump = 0; - - for (i = 0; i < QDF_MODULE_ID_MAX; i++) { - cdf_trace_cb_table[i] = NULL; - cdf_trace_restore_cb_table[i] = NULL; - } -} - -/** - * cdf_trace() - puts the messages in to ring-buffer - * @module : Enum of module, basically module id. - * @param : Code to be recorded - * @session : Session ID of the log - * @data : Actual message contents - * - * This function will be called from each module who wants record the messages - * in circular queue. Before calling this functions make sure you have - * registered your module with cdf through cdf_trace_register function. - * - * - * Return : nothing - */ -void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data) -{ - tp_cdf_trace_record rec = NULL; - unsigned long flags; - - if (!g_cdf_trace_data.enable) - return; - - /* if module is not registered, don't record for that module */ - if (NULL == cdf_trace_cb_table[module]) - return; - - /* Aquire the lock so that only one thread at a time can fill the ring - * buffer - */ - spin_lock_irqsave(<race_lock, flags); - - g_cdf_trace_data.num++; - - if (g_cdf_trace_data.num > MAX_CDF_TRACE_RECORDS) - g_cdf_trace_data.num = MAX_CDF_TRACE_RECORDS; - - if (INVALID_CDF_TRACE_ADDR == g_cdf_trace_data.head) { - /* first record */ - g_cdf_trace_data.head = 0; - g_cdf_trace_data.tail = 0; - } else { - /* queue is not empty */ - uint32_t tail = g_cdf_trace_data.tail + 1; - - if (MAX_CDF_TRACE_RECORDS == tail) - tail = 0; - - if (g_cdf_trace_data.head == tail) { - /* full */ - if (MAX_CDF_TRACE_RECORDS == ++g_cdf_trace_data.head) - g_cdf_trace_data.head = 0; - } - g_cdf_trace_data.tail = tail; - } - - rec = &g_cdf_trace_tbl[g_cdf_trace_data.tail]; - rec->code = code; - rec->session = session; - rec->data = data; - rec->time = qdf_get_log_timestamp(); - rec->module = module; - rec->pid = (in_interrupt() ? 0 : current->pid); - g_cdf_trace_data.numSinceLastDump++; - spin_unlock_irqrestore(<race_lock, flags); -} - -/** - * cdf_trace_spin_lock_init() - initializes the lock variable before use - * - * This function will be called from cds_alloc_global_context, we will have lock - * available to use ASAP - * - * Return : nothing - */ -QDF_STATUS cdf_trace_spin_lock_init(void) -{ - spin_lock_init(<race_lock); - - return QDF_STATUS_SUCCESS; -} - -/** - * cdf_trace_register() - registers the call back functions - * @moduleID - enum value of module - * @cdf_trace_callback - call back functions to display the messages in - * particular format. - * - * Registers the call back functions to display the messages in particular - * format mentioned in these call back functions. This functions should be - * called by interested module in their init part as we will be ready to - * register as soon as modules are up. - * - * Return : nothing - */ -void cdf_trace_register(QDF_MODULE_ID moduleID, - tp_cdf_trace_cb cdf_trace_callback) -{ - cdf_trace_cb_table[moduleID] = cdf_trace_callback; -} - -/** - * cdf_trace_dump_all() - Dump data from ring buffer via call back functions - * registered with CDF - * @pMac : Context of particular module - * @code : Reason code - * @session : Session id of log - * @count : Number of lines to dump starting from tail to head - * - * This function will be called up on issueing ioctl call as mentioned following - * [iwpriv wlan0 dumplog 0 0 ] - * - * - number lines to dump starting from tail to head. - * - * - if anybody wants to know how many messages were - * recorded for particular module/s mentioned by setbit in bitmask from last - * messages. It is optional, if you don't provide then it will dump - * everything from buffer. - * - * Return : nothing - */ -void cdf_trace_dump_all(void *pMac, uint8_t code, uint8_t session, - uint32_t count, uint32_t bitmask_of_module) -{ - cdf_trace_record_t pRecord; - int32_t i, tail; - - if (!g_cdf_trace_data.enable) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, "Tracing Disabled"); - return; - } - - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, - "Total Records: %d, Head: %d, Tail: %d", - g_cdf_trace_data.num, g_cdf_trace_data.head, - g_cdf_trace_data.tail); - - /* aquire the lock so that only one thread at a time can read - * the ring buffer - */ - spin_lock(<race_lock); - - if (g_cdf_trace_data.head != INVALID_CDF_TRACE_ADDR) { - i = g_cdf_trace_data.head; - tail = g_cdf_trace_data.tail; - - if (count) { - if (count > g_cdf_trace_data.num) - count = g_cdf_trace_data.num; - if (tail >= (count - 1)) - i = tail - count + 1; - else if (count != MAX_CDF_TRACE_RECORDS) - i = MAX_CDF_TRACE_RECORDS - ((count - 1) - - tail); - } - - pRecord = g_cdf_trace_tbl[i]; - /* right now we are not using numSinceLastDump member but - * in future we might re-visit and use this member to track - * how many latest messages got added while we were dumping - * from ring buffer - */ - g_cdf_trace_data.numSinceLastDump = 0; - spin_unlock(<race_lock); - for (;; ) { - if ((code == 0 || (code == pRecord.code)) && - (cdf_trace_cb_table[pRecord.module] != NULL)) { - if (0 == bitmask_of_module) { - cdf_trace_cb_table[pRecord. - module] (pMac, - &pRecord, - (uint16_t) - i); - } else { - if (bitmask_of_module & - (1 << pRecord.module)) { - cdf_trace_cb_table[pRecord. - module] - (pMac, &pRecord, - (uint16_t) i); - } - } - } - - if (i == tail) - break; - i += 1; - - spin_lock(<race_lock); - if (MAX_CDF_TRACE_RECORDS == i) { - i = 0; - pRecord = g_cdf_trace_tbl[0]; - } else { - pRecord = g_cdf_trace_tbl[i]; - } - spin_unlock(<race_lock); - } - } else { - spin_unlock(<race_lock); - } -} - -/** - * cdf_dp_trace_init() - enables the DP trace - * Called during driver load and it enables DP trace - * - * Return: None - */ -void cdf_dp_trace_init(void) -{ - uint8_t i; - - cdf_dp_trace_spin_lock_init(); - g_cdf_dp_trace_data.head = INVALID_CDF_DP_TRACE_ADDR; - g_cdf_dp_trace_data.tail = INVALID_CDF_DP_TRACE_ADDR; - g_cdf_dp_trace_data.num = 0; - g_cdf_dp_trace_data.proto_bitmap = 0; - g_cdf_dp_trace_data.no_of_record = 0; - g_cdf_dp_trace_data.verbosity = CDF_DP_TRACE_VERBOSITY_DEFAULT; - g_cdf_dp_trace_data.enable = true; - - for (i = 0; i < CDF_DP_TRACE_MAX; i++) - cdf_dp_trace_cb_table[i] = cdf_dp_display_record; -} - -/** - * cdf_dp_trace_set_value() - Configure the value to control DP trace - * @proto_bitmap : defines the protocol to be tracked - * @no_of_records : defines the nth packet which is traced - * @verbosity : defines the verbosity level - * - * Return: None - */ -void cdf_dp_trace_set_value(uint8_t proto_bitmap, uint8_t no_of_record, - uint8_t verbosity) -{ - g_cdf_dp_trace_data.proto_bitmap = proto_bitmap; - g_cdf_dp_trace_data.no_of_record = no_of_record; - g_cdf_dp_trace_data.verbosity = verbosity; - return; -} - -/** - * cdf_dp_trace_enable_track() - enable the tracing for netbuf - * @code : defines the event - * - * Return: true or false depends on whether tracing enabled - */ -static bool cdf_dp_trace_enable_track(enum CDF_DP_TRACE_ID code) -{ - if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_HIGH) - return true; - if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_MEDIUM - && (code <= CDF_DP_TRACE_HIF_PACKET_PTR_RECORD)) - return true; - if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_LOW - && (code <= CDF_DP_TRACE_CE_PACKET_RECORD)) - return true; - if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_DEFAULT - && (code == CDF_DP_TRACE_DROP_PACKET_RECORD)) - return true; - return false; -} - -/** - * cdf_dp_trace_set_track() - Marks whether the packet needs to be traced - * @nbuf : defines the netbuf - * - * Return: None - */ -void cdf_dp_trace_set_track(cdf_nbuf_t nbuf) -{ - spin_lock_bh(&l_dp_trace_lock); - g_cdf_dp_trace_data.count++; - if (g_cdf_dp_trace_data.proto_bitmap != 0) { - if (cds_pkt_get_proto_type(nbuf, - g_cdf_dp_trace_data.proto_bitmap, 0)) { - NBUF_CB_TX_DP_TRACE(nbuf) = 1; - } - } - if ((g_cdf_dp_trace_data.no_of_record != 0) && - (g_cdf_dp_trace_data.count % - g_cdf_dp_trace_data.no_of_record == 0)) { - NBUF_CB_TX_DP_TRACE(nbuf) = 1; - } - spin_unlock_bh(&l_dp_trace_lock); - return; -} - -/** - * dump_hex_trace() - Display the data in buffer - * @buf: buffer which contains data to be displayed - * @buf_len: defines the size of the data to be displayed - * - * Return: None - */ -static void dump_hex_trace(uint8_t *buf, uint8_t buf_len) -{ - uint8_t i = 0; - /* Dump the bytes in the last line */ - qdf_print("DATA: "); - for (i = 0; i < buf_len; i++) - qdf_print("%02x ", buf[i]); - qdf_print("\n"); -} - -/** - * cdf_dp_display_trace() - Displays a record in DP trace - * @pRecord : pointer to a record in DP trace - * @recIndex : record index - * - * Return: None - */ -void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord, - uint16_t recIndex) -{ - qdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex, - pRecord->time, pRecord->code); - switch (pRecord->code) { - case CDF_DP_TRACE_HDD_TX_TIMEOUT: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "HDD TX Timeout\n"); - break; - case CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "HDD SoftAP TX Timeout\n"); - break; - case CDF_DP_TRACE_VDEV_PAUSE: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "VDEV Pause\n"); - break; - case CDF_DP_TRACE_VDEV_UNPAUSE: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, - "VDEV UnPause\n"); - break; - default: - dump_hex_trace(pRecord->data, pRecord->size); - } - return; -} - -/** - * cdf_dp_trace() - Stores the data in buffer - * @nbuf : defines the netbuf - * @code : defines the event - * @data : defines the data to be stored - * @size : defines the size of the data record - * - * Return: None - */ -void cdf_dp_trace(cdf_nbuf_t nbuf, enum CDF_DP_TRACE_ID code, - uint8_t *data, uint8_t size) -{ - struct cdf_dp_trace_record_s *rec = NULL; - - /* Return when Dp trace is not enabled */ - if (!g_cdf_dp_trace_data.enable) - return; - - /* If nbuf is NULL, check for VDEV PAUSE, UNPAUSE, TIMEOUT */ - if (!nbuf) { - switch (code) { - case CDF_DP_TRACE_HDD_TX_TIMEOUT: - case CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT: - case CDF_DP_TRACE_VDEV_PAUSE: - case CDF_DP_TRACE_VDEV_UNPAUSE: - if (cdf_dp_trace_enable_track(code)) - goto register_record; - else - return; - - default: - return; - } - } - - /* Return when the packet is not a data packet */ - if (NBUF_CB_TX_PACKET_TRACK(nbuf) != NBUF_TX_PKT_DATA_TRACK) - return; - - /* Return when nbuf is not marked for dp tracing or - * verbosity does not allow - */ - if ((cdf_dp_trace_enable_track(code) == false) || - !NBUF_CB_TX_DP_TRACE(nbuf)) - return; - - /* Acquire the lock so that only one thread at a time can fill the ring - * buffer - */ - -register_record: - - spin_lock_bh(&l_dp_trace_lock); - - g_cdf_dp_trace_data.num++; - - if (g_cdf_dp_trace_data.num > MAX_CDF_DP_TRACE_RECORDS) - g_cdf_dp_trace_data.num = MAX_CDF_DP_TRACE_RECORDS; - - if (INVALID_CDF_DP_TRACE_ADDR == g_cdf_dp_trace_data.head) { - /* first record */ - g_cdf_dp_trace_data.head = 0; - g_cdf_dp_trace_data.tail = 0; - } else { - /* queue is not empty */ - g_cdf_dp_trace_data.tail++; - - if (MAX_CDF_DP_TRACE_RECORDS == g_cdf_dp_trace_data.tail) - g_cdf_dp_trace_data.tail = 0; - - if (g_cdf_dp_trace_data.head == g_cdf_dp_trace_data.tail) { - /* full */ - if (MAX_CDF_DP_TRACE_RECORDS == - ++g_cdf_dp_trace_data.head) - g_cdf_dp_trace_data.head = 0; - } - } - - rec = &g_cdf_dp_trace_tbl[g_cdf_dp_trace_data.tail]; - rec->code = code; - rec->size = 0; - if (data != NULL && size > 0) { - if (size > CDF_DP_TRACE_RECORD_SIZE) - size = CDF_DP_TRACE_RECORD_SIZE; - - rec->size = size; - switch (code) { - case CDF_DP_TRACE_HDD_PACKET_PTR_RECORD: - case CDF_DP_TRACE_CE_PACKET_PTR_RECORD: - case CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD: - case CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD: - case CDF_DP_TRACE_HTT_PACKET_PTR_RECORD: - case CDF_DP_TRACE_HTC_PACKET_PTR_RECORD: - case CDF_DP_TRACE_HIF_PACKET_PTR_RECORD: - cdf_mem_copy(rec->data, (uint8_t *)(&data), size); - break; - - case CDF_DP_TRACE_DROP_PACKET_RECORD: - case CDF_DP_TRACE_HDD_PACKET_RECORD: - case CDF_DP_TRACE_CE_PACKET_RECORD: - cdf_mem_copy(rec->data, data, size); - break; - default: - break; - } - } - rec->time = qdf_get_log_timestamp(); - rec->pid = (in_interrupt() ? 0 : current->pid); - spin_unlock_bh(&l_dp_trace_lock); -} - -/** - * cdf_dp_trace_spin_lock_init() - initializes the lock variable before use - * This function will be called from cds_alloc_global_context, we will have lock - * available to use ASAP - * - * Return : nothing - */ -void cdf_dp_trace_spin_lock_init(void) -{ - spin_lock_init(&l_dp_trace_lock); - - return; -} - -/** - * cdf_dp_trace_dump_all() - Dump data from ring buffer via call back functions - * registered with CDF - * @code : Reason code - * @count : Number of lines to dump starting from tail to head - * - * Return : nothing - */ -void cdf_dp_trace_dump_all(uint32_t count) -{ - struct cdf_dp_trace_record_s pRecord; - int32_t i, tail; - - if (!g_cdf_dp_trace_data.enable) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, "Tracing Disabled"); - return; - } - - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, - "Total Records: %d, Head: %d, Tail: %d", - g_cdf_dp_trace_data.num, g_cdf_dp_trace_data.head, - g_cdf_dp_trace_data.tail); - - /* aquire the lock so that only one thread at a time can read - * the ring buffer - */ - spin_lock_bh(&l_dp_trace_lock); - - if (g_cdf_dp_trace_data.head != INVALID_CDF_DP_TRACE_ADDR) { - i = g_cdf_dp_trace_data.head; - tail = g_cdf_dp_trace_data.tail; - - if (count) { - if (count > g_cdf_dp_trace_data.num) - count = g_cdf_dp_trace_data.num; - if (tail >= (count - 1)) - i = tail - count + 1; - else if (count != MAX_CDF_DP_TRACE_RECORDS) - i = MAX_CDF_DP_TRACE_RECORDS - ((count - 1) - - tail); - } - - pRecord = g_cdf_dp_trace_tbl[i]; - spin_unlock_bh(&l_dp_trace_lock); - for (;; ) { - - cdf_dp_trace_cb_table[pRecord. - code] (&pRecord, (uint16_t)i); - if (i == tail) - break; - i += 1; - - spin_lock_bh(&l_dp_trace_lock); - if (MAX_CDF_DP_TRACE_RECORDS == i) - i = 0; - - pRecord = g_cdf_dp_trace_tbl[i]; - spin_unlock_bh(&l_dp_trace_lock); - } - } else { - spin_unlock_bh(&l_dp_trace_lock); - } -} diff --git a/core/cdf/src/i_cdf_trace.h b/core/cdf/src/i_cdf_trace.h deleted file mode 100644 index 99973f2d5a56..000000000000 --- a/core/cdf/src/i_cdf_trace.h +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__I_CDF_TRACE_H) -#define __I_CDF_TRACE_H - -#if !defined(__printf) -#define __printf(a, b) -#endif - -/** - * DOC: i_cdf_trace.h - * - * Linux-specific definitions for CDF trace - * - */ - -/* Include Files */ - -/** - * cdf_trace_msg()- logging API - * @module: Module identifier. A member of the QDF_MODULE_ID enumeration that - * identifies the module issuing the trace message. - * @level: Trace level. A member of the CDF_TRACE_LEVEL enumeration indicating - * the severity of the condition causing the trace message to be issued. - * More severe conditions are more likely to be logged. - * @strFormat: Format string. The message to be logged. This format string - * contains printf-like replacement parameters, which follow this - * parameter in the variable argument list. - * - * Users wishing to add tracing information to their code should use - * CDF_TRACE. CDF_TRACE() will compile into a call to cdf_trace_msg() when - * tracing is enabled. - * - * Return: nothing - * - */ -void __printf(3, 4) cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - char *strFormat, ...); - -void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - void *data, int buf_len); - -void cdf_trace_display(void); - -void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level, - uint8_t on); - -void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level); - -/* CDF_TRACE is the macro invoked to add trace messages to code. See the - * documenation for cdf_trace_msg() for the parameters etc. for this function. - * - * NOTE: Code CDF_TRACE() macros into the source code. Do not code directly - * to the cdf_trace_msg() function. - * - * NOTE 2: cdf tracing is totally turned off if WLAN_DEBUG is *not* defined. - * This allows us to build 'performance' builds where we can measure performance - * without being bogged down by all the tracing in the code - */ - -#if defined(WLAN_DEBUG) -#define CDF_TRACE cdf_trace_msg -#define CDF_TRACE_HEX_DUMP cdf_trace_hex_dump -#else -#define CDF_TRACE(arg ...) -#define CDF_TRACE_HEX_DUMP(arg ...) -#endif - -void __printf(3, 4) cdf_snprintf(char *strBuffer, unsigned int size, - char *strFormat, ...); -#define CDF_SNPRINTF cdf_snprintf - -#ifdef CDF_ENABLE_TRACING - -#define CDF_ASSERT(_condition) \ - do { \ - if (!(_condition)) { \ - pr_err("CDF ASSERT in %s Line %d\n", \ - __func__, __LINE__); \ - WARN_ON(1); \ - } \ - } while (0) - -#else - -/* This code will be used for compilation if tracing is to be compiled out */ -/* of the code so these functions/macros are 'do nothing' */ -static inline void cdf_trace_msg(QDF_MODULE_ID module, ...) -{ -} - -#define CDF_ASSERT(_condition) - -#endif - -#ifdef PANIC_ON_BUG - -#define CDF_BUG(_condition) \ - do { \ - if (!(_condition)) { \ - pr_err("CDF BUG in %s Line %d\n", \ - __func__, __LINE__); \ - BUG_ON(1); \ - } \ - } while (0) - -#else - -#define CDF_BUG(_condition) \ - do { \ - if (!(_condition)) { \ - pr_err("CDF BUG in %s Line %d\n", \ - __func__, __LINE__); \ - WARN_ON(1); \ - } \ - } while (0) - -#endif - -#endif diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 92773f5a88b8..225dedec8708 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index 4827a49a5903..b0a4087a8090 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h index f14feb9b622f..66a30b38d587 100644 --- a/core/cds/inc/cds_utils.h +++ b/core/cds/inc/cds_utils.h @@ -66,21 +66,21 @@ #define CDS_CHAN_15_FREQ (2512) #define CDS_CHAN_170_FREQ (5852) -#define cds_log(level, args...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) +#define cds_log(level, args...) QDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) #define cds_logfl(level, format, args...) cds_log(level, FL(format), ## args) #define cds_alert(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_FATAL, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args) #define cds_err(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_ERROR, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args) #define cds_warn(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_WARN, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_WARN, format, ## args) #define cds_notice(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_INFO, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_INFO, format, ## args) #define cds_info(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_INFO_HIGH, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args) #define cds_debug(format, args...) \ - cds_logfl(CDF_TRACE_LEVEL_DEBUG, format, ## args) + cds_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) /*-------------------------------------------------------------------------- Type declarations ------------------------------------------------------------------------*/ diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 3f2c4890456f..d846d28f86dc 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -50,7 +50,7 @@ #endif #include "sap_api.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "bmi.h" #include "ol_fw.h" #include "ol_if_athvar.h" @@ -97,12 +97,12 @@ v_CONTEXT_t cds_init(void) gp_cds_context->qdf_ctx = &g_cdf_ctx; cdf_mem_zero(&g_cdf_ctx, sizeof(g_cdf_ctx)); - cdf_trace_spin_lock_init(); + qdf_trace_spin_lock_init(); #if defined(TRACE_RECORD) - cdf_trace_init(); + qdf_trace_init(); #endif - cdf_dp_trace_init(); + qdf_dp_trace_init(); cds_ssr_protect_init(); @@ -177,13 +177,13 @@ QDF_STATUS cds_open(void) void *HTCHandle; hdd_context_t *pHddCtx; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); if (NULL == gp_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Trying to open CDS without a PreOpen", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -195,16 +195,16 @@ QDF_STATUS cds_open(void) /* Initialize the probe event */ if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Unable to init probeEvent", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Unable to init wmaCompleteEvent", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_probe_event; } @@ -212,10 +212,10 @@ QDF_STATUS cds_open(void) qdf_status = cds_mq_init(&gp_cds_context->freeVosMq); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to initialize CDS free message queue", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_wma_complete_event; } @@ -233,24 +233,24 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to open CDS Scheduler", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_msg_queue; } pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Hdd Context is Null", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_sched_close; } scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); goto err_sched_close; } @@ -261,7 +261,7 @@ QDF_STATUS cds_open(void) /* Initialize BMI and Download firmware */ qdf_status = bmi_download_firmware(ol_ctx); if (qdf_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "BMI FIALED status:%d", qdf_status); goto err_bmi_close; } @@ -275,13 +275,13 @@ QDF_STATUS cds_open(void) gp_cds_context->htc_ctx = htc_create(scn, &htcInfo, qdf_ctx); if (!gp_cds_context->htc_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); goto err_bmi_close; } if (bmi_done(ol_ctx)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; } @@ -373,9 +373,9 @@ QDF_STATUS cds_open(void) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to open WMA module", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_htc_close; } @@ -387,12 +387,12 @@ QDF_STATUS cds_open(void) pHddCtx->config->maxNumberOfPeers = mac_openParms.maxStation; HTCHandle = cds_get_context(QDF_MODULE_ID_HTC); if (!HTCHandle) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is null!", __func__); goto err_wma_close; } if (htc_wait_target(HTCHandle)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_wma_close; } @@ -410,9 +410,9 @@ QDF_STATUS cds_open(void) if (eSIR_SUCCESS != sirStatus) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to open MAC", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_wma_close; } @@ -420,9 +420,9 @@ QDF_STATUS cds_open(void) qdf_status = sme_open(gp_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to open SME", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_mac_close; } @@ -432,13 +432,13 @@ QDF_STATUS cds_open(void) gp_cds_context->qdf_ctx); if (!gp_cds_context->pdev_txrx_ctx) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to open TXRX", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_sme_close; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); return QDF_STATUS_SUCCESS; @@ -490,32 +490,32 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "cds prestart"); if (gp_cds_context != p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Context mismatch", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pMACContext == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } if (p_cds_context->pWMAContext == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return QDF_STATUS_E_FAILURE; } @@ -526,9 +526,9 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) /*call WMA pre start */ qdf_status = wma_pre_start(gp_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL, "Failed to WMA prestart"); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -537,46 +537,46 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) CDS_WMA_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: wma_pre_start reporting other error", __func__); } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Test MC thread by posting a probe message to SYS", __func__); wlan_sys_probe(); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } qdf_status = htc_start(gp_cds_context->htc_ctx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Failed to attach pdev"); htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -599,12 +599,12 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; tHalMacStartParameters halStartParams; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Starting Libra SW", __func__); /* We support only one instance for now ... */ if (gp_cds_context != p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); return QDF_STATUS_E_FAILURE; } @@ -612,10 +612,10 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) if ((p_cds_context->pWMAContext == NULL) || (p_cds_context->pMACContext == NULL)) { if (p_cds_context->pWMAContext == NULL) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); else - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); return QDF_STATUS_E_FAILURE; @@ -624,11 +624,11 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) /* Start the wma */ qdf_status = wma_start(p_cds_context); if (qdf_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to start wma", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: wma correctly started", __func__); /* Start the MAC */ @@ -640,36 +640,36 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) mac_start(p_cds_context->pMACContext, &halStartParams); if (eSIR_SUCCESS != sirStatus) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to start MAC", __func__); goto err_wma_stop; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: MAC correctly started", __func__); /* START SME */ qdf_status = sme_start(p_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to start SME", __func__); goto err_mac_stop; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: SME correctly started", __func__); if (ol_txrx_pdev_attach_target (p_cds_context->pdev_txrx_ctx) != A_OK) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed attach target", __func__); goto err_sme_stop; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "TL correctly started"); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: CDS Start is successful!!", __func__); return QDF_STATUS_SUCCESS; @@ -684,9 +684,9 @@ err_wma_stop: qdf_event_reset(&(gp_cds_context->wmaCompleteEvent)); qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } else { qdf_status = @@ -694,17 +694,17 @@ err_wma_stop: CDS_WMA_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_FATAL, "%s: Timeout occurred before WMA_stop complete", __func__); } else { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_FATAL, "%s: WMA_stop reporting other error", __func__); } - CDF_ASSERT(0); + QDF_ASSERT(0); wma_setneedshutdown(cds_context); } } @@ -731,9 +731,9 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop wma", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(cds_context); } @@ -743,9 +743,9 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) /* SYS STOP will stop SME and MAC */ qdf_status = sys_stop(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop SYS", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } return QDF_STATUS_SUCCESS; @@ -764,9 +764,9 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = wma_wmi_work_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); } if (gp_cds_context->htc_ctx) { @@ -781,53 +781,53 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context) qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; if (true == wma_needshutdown(cds_context)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to shutdown wma", __func__); } else { qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_deinit_log_completion(); @@ -855,7 +855,7 @@ void *cds_get_context(QDF_MODULE_ID moduleId) void *pModContext = NULL; if (gp_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context pointer is null", __func__); return NULL; } @@ -927,16 +927,16 @@ void *cds_get_context(QDF_MODULE_ID moduleId) default: { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context maintained by CDS", __func__, moduleId); - CDF_ASSERT(0); + QDF_ASSERT(0); return NULL; } } if (pModContext == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context is Null", __func__, moduleId); } @@ -956,7 +956,7 @@ void *cds_get_context(QDF_MODULE_ID moduleId) v_CONTEXT_t cds_get_global_context(void) { if (gp_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); } @@ -973,7 +973,7 @@ v_CONTEXT_t cds_get_global_context(void) enum cds_driver_state cds_get_driver_state(void) { if (gp_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL", __func__); return CDS_DRIVER_STATE_UNINITIALIZED; @@ -995,7 +995,7 @@ enum cds_driver_state cds_get_driver_state(void) void cds_set_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1017,7 +1017,7 @@ void cds_set_driver_state(enum cds_driver_state state) void cds_clear_driver_state(enum cds_driver_state state) { if (gp_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: global cds context is NULL: %x", __func__, state); @@ -1047,13 +1047,13 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, void **pGpModContext = NULL; if (p_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is null", __func__); return QDF_STATUS_E_FAILURE; } if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: context mismatch or null param passed", __func__); return QDF_STATUS_E_FAILURE; @@ -1085,11 +1085,11 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } } @@ -1098,7 +1098,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, /* Context has already been allocated! * Prevent double allocation */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i context has already been allocated", __func__, moduleID); return QDF_STATUS_E_EXISTS; @@ -1109,10 +1109,10 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, *ppModuleContext = cdf_mem_malloc(size); if (*ppModuleContext == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to " "allocate Context for module ID %i", __func__, moduleID); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } @@ -1138,7 +1138,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) p_cds_contextType p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return QDF_STATUS_NOT_INITIALIZED; } @@ -1148,10 +1148,10 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) p_cds_context->pHIFContext = context; break; default: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i does not have its context " "allocated by CDS", __func__, module_id); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } @@ -1177,7 +1177,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, if ((p_cds_context == NULL) || (gp_cds_context != p_cds_context) || (pModuleContext == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Null params or context mismatch", __func__); return QDF_STATUS_E_FAILURE; } @@ -1214,18 +1214,18 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, case QDF_MODULE_ID_HDD_SOFTAP: default: { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "does not have its context allocated by CDS", __func__, moduleID); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } } if (NULL == *pGpModContext) { /* Context has not been allocated or freed already! */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Module ID %i " "context has not been allocated or freed already", __func__, moduleID); @@ -1233,7 +1233,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, } if (*pGpModContext != pModuleContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: pGpModContext != pModuleContext", __func__); return QDF_STATUS_E_FAILURE; } @@ -1265,10 +1265,10 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) uint32_t debug_count = 0; if ((gp_cds_context == NULL) || (pMsg == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Null params or global cds context is null", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -1302,16 +1302,16 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) } default: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("%s: Trying to queue msg into unknown MC Msg queue ID %d"), __func__, msgQueueId); return QDF_STATUS_E_FAILURE; } - CDF_ASSERT(NULL != pTargetMq); + QDF_ASSERT(NULL != pTargetMq); if (pTargetMq == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: pTargetMq == NULL", __func__); return QDF_STATUS_E_FAILURE; } @@ -1322,12 +1322,12 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) if (NULL == pMsgWrapper) { debug_count = atomic_inc_return(&cds_wrapper_empty_count); if (1 == debug_count) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: CDS Core run out of message wrapper %d", __func__, debug_count); if (CDS_WRAPPER_MAX_FAIL_COUNT == debug_count) - CDF_BUG(0); + QDF_BUG(0); return QDF_STATUS_E_RESOURCES; } @@ -1355,13 +1355,13 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) void cds_sys_probe_thread_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: qdf_event_set failed", __func__); return; } @@ -1376,14 +1376,14 @@ void cds_sys_probe_thread_cback(void *pUserData) void cds_wma_complete_cback(void *pUserData) { if (gp_cds_context != pUserData) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != pUserData", __func__); return; } if (qdf_event_set(&gp_cds_context->wmaCompleteEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: qdf_event_set failed", __func__); return; } @@ -1400,18 +1400,18 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) { p_cds_contextType p_cds_context = (p_cds_contextType) pVContext; - CDF_ASSERT(gp_cds_context == p_cds_context); + QDF_ASSERT(gp_cds_context == p_cds_context); if (gp_cds_context != p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: gp_cds_context != p_cds_context", __func__); return; } - CDF_ASSERT(NULL != pMsgWrapper); + QDF_ASSERT(NULL != pMsgWrapper); if (pMsgWrapper == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper == NULL in function", __func__); return; } @@ -1442,9 +1442,9 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* * CAC timer will be initiated and started only when SAP starts on @@ -1460,9 +1460,9 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; @@ -1471,17 +1471,17 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma!", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } } qdf_status = wma_wmi_work_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_work!", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); } if (gp_cds_context->htc_ctx) { @@ -1492,25 +1492,25 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service!", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq); qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: failed to destroy wmaCompleteEvent", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: failed to destroy ProbeEvent", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } return QDF_STATUS_SUCCESS; @@ -1554,7 +1554,7 @@ QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, *type = WMI_VDEV_TYPE_OCB; break; default: - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); status = QDF_STATUS_E_INVAL; break; @@ -1603,7 +1603,7 @@ bool cds_is_packet_log_enabled(void) pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Hdd Context is Null", __func__); return false; } @@ -1622,7 +1622,7 @@ void cds_trigger_recovery(void) QDF_STATUS status = QDF_STATUS_SUCCESS; if (!wma_handle) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "WMA context is invald!"); return; } @@ -1633,11 +1633,11 @@ void cds_trigger_recovery(void) WMA_CRASH_INJECT_TIMEOUT); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "CRASH_INJECT command is timed out!"); #ifdef CONFIG_CNSS if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Recovery is in progress, ignore!"); return; } @@ -1683,7 +1683,7 @@ void cds_set_wakelock_logging(bool value) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return; } @@ -1704,7 +1704,7 @@ bool cds_is_wakelock_enabled(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "cds context is Invald"); return false; } @@ -1728,7 +1728,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return; } @@ -1781,7 +1781,7 @@ enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invald", __func__); return WLAN_LOG_LEVEL_OFF; } @@ -1843,7 +1843,7 @@ void cds_init_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1872,7 +1872,7 @@ void cds_deinit_log_completion(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1899,7 +1899,7 @@ QDF_STATUS cds_set_log_completion(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } @@ -1931,7 +1931,7 @@ void cds_get_log_completion(uint32_t *is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return; } @@ -1957,7 +1957,7 @@ bool cds_is_log_report_in_progress(void) p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return true; } @@ -1987,13 +1987,13 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds context is Invalid", __func__); return QDF_STATUS_E_FAILURE; } if (cds_is_log_report_in_progress() == true) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); return QDF_STATUS_E_FAILURE; @@ -2001,18 +2001,18 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal, status = cds_set_log_completion(is_fatal, indicator, reason_code); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to set log trigger params", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Triggering bug report: type:%d, indicator=%d reason_code=%d", __func__, is_fatal, indicator, reason_code); ret = sme_send_flush_logs_cmd_to_fw(p_cds_context->pMACContext); if (0 != ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to send flush FW log", __func__); cds_init_log_completion(); return QDF_STATUS_E_FAILURE; diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index b8fbd6b3ed27..65d96ef2a918 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -44,7 +44,7 @@ #include "wlan_hdd_hostapd.h" #include "cds_concurrency.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include #include @@ -6292,7 +6292,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, */ if (false == are_cc_channels_same) { if (true == cds_is_sta_connection_pending()) { - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CLEAR_JOIN_REQ, sta_adapter->sessionId, *roam_id)); ret = sme_clear_joinreq_param( @@ -6305,7 +6305,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, cds_change_sta_conn_pending_status(false); cds_info("===>Clear pending join req"); } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STORE_JOIN_REQ, sta_adapter->sessionId, *roam_id)); /* store the scan cache here */ diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index e78fbec41da6..f622f395baf1 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -59,7 +59,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) { if (pMq == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return QDF_STATUS_E_FAILURE; } @@ -84,7 +84,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) inline void cds_mq_deinit(p_cds_mq_type pMq) { if (pMq == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return; } @@ -104,7 +104,7 @@ inline void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper) unsigned long flags; if ((pMq == NULL) || (pMsgWrapper == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return; } @@ -131,7 +131,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq) unsigned long flags; if (pMq == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return NULL; } @@ -139,7 +139,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq) spin_lock_irqsave(&pMq->mqLock, flags); if (list_empty(&pMq->mqList)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_WARN, "%s: CDS Message Queue is empty", __func__); } else { listptr = pMq->mqList.next; @@ -168,7 +168,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) unsigned long flags; if (pMq == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer passed", __func__); return QDF_STATUS_E_FAILURE; } @@ -195,12 +195,12 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) cds_context = cds_get_global_context(); if (NULL == cds_context) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "%s: invalid cds_context", __func__); } else { hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "%s: invalid hHal", __func__); } else { sirStatus = u_mac_post_ctrl_msg(hHal, pBuf); diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index c95cc3b83370..bd4764542870 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include "cdf_nbuf.h" #include "cdf_memory.h" @@ -115,7 +115,7 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) /* Validate the parameter pointers */ if (unlikely((pPacket == NULL) || (pPacketSize == NULL)) || (pPacket->pkt_buf == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "VPKT [%d]: NULL pointer", __LINE__); return QDF_STATUS_E_INVAL; } @@ -191,7 +191,7 @@ void cds_pkt_trace_buf_update(char *event_string) { uint32_t slot; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s %d, %s", __func__, __LINE__, event_string); qdf_spinlock_acquire(&trace_buffer_lock); slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF; @@ -218,14 +218,14 @@ void cds_pkt_trace_buf_dump(void) uint32_t slot, idx; qdf_spinlock_acquire(&trace_buffer_lock); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP START Current Timestamp %u", (unsigned int)qdf_mc_timer_get_system_time()); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "ORDER : TIME : EVT"); if (CDS_PKT_TRAC_MAX_TRACE_BUF > trace_buffer_order) { for (slot = 0; slot < trace_buffer_order; slot++) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%5d :%12u : %s", trace_buffer[slot].order, (unsigned int)trace_buffer[slot].event_time, @@ -236,14 +236,14 @@ void cds_pkt_trace_buf_dump(void) slot = (trace_buffer_order + idx) % CDS_PKT_TRAC_MAX_TRACE_BUF; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%5d :%12u : %s", trace_buffer[slot].order, (unsigned int)trace_buffer[slot].event_time, trace_buffer[slot].event_string); } } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "PACKET TRACE DUMP END"); qdf_spinlock_release(&trace_buffer_lock); @@ -275,7 +275,7 @@ void cds_pkt_proto_trace_init(void) ---------------------------------------------------------------------------*/ void cds_pkt_proto_trace_close(void) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s %d", __func__, __LINE__); cdf_mem_free(trace_buffer); qdf_spinlock_destroy(&trace_buffer_lock); diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 71879692ebd4..a2d3f7066e35 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -34,7 +34,7 @@ #include #include "qdf_types.h" #include "cds_reg_service.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "sme_api.h" #include "wlan_hdd_main.h" #include "cds_regdomain.h" @@ -428,7 +428,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -437,7 +437,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country) hdd_ctx->reg.def_country, CDS_COUNTRY_CODE_LEN + 1); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "default country is %c%c\n", default_country[0], default_country[1]); @@ -459,7 +459,7 @@ static enum channel_enum cds_get_channel_enum(uint32_t chan_num) if (chan_mapping[loop].chan_num == chan_num) return loop; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid channel number %d", chan_num); return INVALID_RF_CHANNEL; @@ -669,7 +669,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, struct wiphy *wiphy = NULL; if (NULL == reg_domain_ptr) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Invalid reg domain pointer")); return QDF_STATUS_E_FAULT; } @@ -680,13 +680,13 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, return QDF_STATUS_SUCCESS; if (NULL == country_alpha2) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Country code array is NULL")); return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "SSR in progress, return"); return QDF_STATUS_SUCCESS; } @@ -694,7 +694,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); return QDF_STATUS_E_FAULT; } @@ -753,7 +753,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -761,7 +761,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, hdd_ctx->isVHT80Allowed = 0; if (band_capability == eCSR_BAND_24) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "band capability is set to 2G only"); for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) { @@ -808,8 +808,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_DFS)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Remove passive scan restriction for %u", __func__, chan->center_freq); @@ -819,8 +819,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Remove passive scan restriction for %u", __func__, chan->center_freq); @@ -830,8 +830,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy, if (!(reg_rule->flags & NL80211_RRF_NO_IBSS)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Remove no ibss restriction for %u", __func__, chan->center_freq); @@ -972,7 +972,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy, bool vht80_allowed; bool reset = false; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, FL("country: %c%c, initiator %d, dfs_region: %d"), request->alpha2[0], request->alpha2[1], @@ -980,13 +980,13 @@ void __hdd_reg_notifier(struct wiphy *wiphy, request->dfs_region); if (NULL == hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Invalid pHddCtx pointer")); return; } if (cds_is_driver_unloading() || cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Unloading or SSR in Progress, Ignore!!!", __func__); return; @@ -1055,7 +1055,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy, vht80_allowed = hdd_ctx->isVHT80Allowed; if (cds_process_regulatory_data(wiphy, band_capability, reset) == 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, (" regulatory entry created")); } if (hdd_ctx->isVHT80Allowed != vht80_allowed) @@ -1107,7 +1107,7 @@ QDF_STATUS cds_regulatory_init(void) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid hdd_ctx pointer"); return QDF_STATUS_E_FAULT; } @@ -1121,7 +1121,7 @@ QDF_STATUS cds_regulatory_init(void) if (cds_process_regulatory_data(wiphy, hdd_ctx->config-> nBandCapability, true) != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Error while creating regulatory entry")); return QDF_STATUS_E_FAULT; } @@ -1154,7 +1154,7 @@ QDF_STATUS cds_regulatory_init(void) QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) { if (reg_domain >= REGDOMAIN_COUNT) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "CDS set reg domain, invalid REG domain ID %d", reg_domain); return QDF_STATUS_E_INVAL; @@ -1176,7 +1176,7 @@ void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, { tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE); if (!hal_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ("Invalid hal_ctx pointer")); return; } diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index 9b331b3e7427..bf65868a0d26 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -124,7 +124,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block, return NOTIFY_OK; num_cpus = num_possible_cpus(); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_LOW, "%s: RX CORE %d, STATE %d, NUM CPUS %d", __func__, (int)affine_cpu, (int)state, num_cpus); multi_cluster = (num_cpus > CDS_CORE_PER_CLUSTER) ? 1 : 0; @@ -191,16 +191,16 @@ QDF_STATUS cds_sched_open(void *p_cds_context, uint32_t SchedCtxSize) { QDF_STATUS vStatus = QDF_STATUS_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening the CDS Scheduler", __func__); /* Sanity checks */ if ((p_cds_context == NULL) || (pSchedContext == NULL)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } if (sizeof(cds_sched_context) != SchedCtxSize) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Incorrect CDS Sched Context size passed", __func__); return QDF_STATUS_E_INVAL; @@ -209,7 +209,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context, pSchedContext->pVContext = p_cds_context; vStatus = cds_sched_init_mqs(pSchedContext); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS Scheduler MQs", __func__); return vStatus; @@ -252,13 +252,13 @@ QDF_STATUS cds_sched_open(void *p_cds_context, pSchedContext->McThread = kthread_create(cds_mc_thread, pSchedContext, "cds_mc_thread"); if (IS_ERR(pSchedContext->McThread)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Could not Create CDS Main Thread Controller", __func__); goto MC_THREAD_START_FAILURE; } wake_up_process(pSchedContext->McThread); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Main Controller thread Created", __func__); #ifdef QCA_CONFIG_SMP @@ -267,14 +267,14 @@ QDF_STATUS cds_sched_open(void *p_cds_context, "cds_ol_rx_thread"); if (IS_ERR(pSchedContext->ol_rx_thread)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Could not Create CDS OL RX Thread", __func__); goto OL_RX_THREAD_START_FAILURE; } wake_up_process(pSchedContext->ol_rx_thread); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, ("CDS OL RX thread Created")); #endif /* @@ -282,15 +282,15 @@ QDF_STATUS cds_sched_open(void *p_cds_context, * Each thread should normally ACK back when it starts. */ wait_for_completion_interruptible(&pSchedContext->McStartEvent); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS MC Thread has started", __func__); #ifdef QCA_CONFIG_SMP wait_for_completion_interruptible(&pSchedContext->ol_rx_start_event); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS OL Rx Thread has started", __func__); #endif /* We're good now: Let's get the ball rolling!!! */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS Scheduler successfully Opened", __func__); return QDF_STATUS_SUCCESS; @@ -336,7 +336,7 @@ static int cds_mc_thread(void *Arg) v_CONTEXT_t p_cds_context = NULL; if (Arg == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Bad Args passed", __func__); return 0; } @@ -346,21 +346,21 @@ static int cds_mc_thread(void *Arg) * has been created */ complete(&pSchedContext->McStartEvent); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: MC Thread %d (%s) starting up", __func__, current->pid, current->comm); /* Get the Global CDS Context */ p_cds_context = cds_get_global_context(); if (!p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", __func__); return 0; } pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); return 0; } @@ -375,10 +375,10 @@ static int cds_mc_thread(void *Arg) &pSchedContext->mcEventFlag)); if (retWaitStatus == -ERESTARTSYS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: wait_event_interruptible returned -ERESTARTSYS", __func__); - CDF_BUG(0); + QDF_BUG(0); } clear_bit(MC_POST_EVENT_MASK, &pSchedContext->mcEventFlag); @@ -387,8 +387,8 @@ static int cds_mc_thread(void *Arg) if (test_bit (MC_SHUTDOWN_EVENT_MASK, &pSchedContext->mcEventFlag)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: MC thread signaled to shutdown", __func__); shutdown = true; @@ -407,26 +407,26 @@ static int cds_mc_thread(void *Arg) /* Check the SYS queue first */ if (!cds_is_mq_empty(&pSchedContext->sysMcMq)) { /* Service the SYS message queue */ - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS SYS MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq); if (pMsgWrapper == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } vStatus = sys_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SYS message", __func__); } @@ -438,26 +438,26 @@ static int cds_mc_thread(void *Arg) /* Check the WMA queue */ if (!cds_is_mq_empty(&pSchedContext->wmaMcMq)) { /* Service the WMA message queue */ - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS WMA MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq); if (pMsgWrapper == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } vStatus = wma_mc_process_msg(pSchedContext->pVContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: Issue Processing WMA message", __func__); } @@ -469,18 +469,18 @@ static int cds_mc_thread(void *Arg) /* Check the PE queue */ if (!cds_is_mq_empty(&pSchedContext->peMcMq)) { /* Service the PE message queue */ - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS PE MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq); if (NULL == pMsgWrapper) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } @@ -488,8 +488,8 @@ static int cds_mc_thread(void *Arg) pMacContext = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMacContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "MAC Context not ready yet"); cds_core_return_msg (pSchedContext->pVContext, @@ -502,8 +502,8 @@ static int cds_mc_thread(void *Arg) (tSirMsgQ *) pMsgWrapper->pVosMsg); if (eSIR_SUCCESS != macStatus) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: Issue Processing PE message", __func__); } @@ -515,18 +515,18 @@ static int cds_mc_thread(void *Arg) /** Check the SME queue **/ if (!cds_is_mq_empty(&pSchedContext->smeMcMq)) { /* Service the SME message queue */ - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Servicing the CDS SME MC Message queue", __func__); pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq); if (NULL == pMsgWrapper) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: pMsgWrapper is NULL", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } @@ -534,8 +534,8 @@ static int cds_mc_thread(void *Arg) pMacContext = cds_get_context(QDF_MODULE_ID_SME); if (NULL == pMacContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "MAC Context not ready yet"); cds_core_return_msg (pSchedContext->pVContext, @@ -547,8 +547,8 @@ static int cds_mc_thread(void *Arg) sme_process_msg((tHalHandle) pMacContext, pMsgWrapper->pVosMsg); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: Issue Processing SME message", __func__); } @@ -579,7 +579,7 @@ static int cds_mc_thread(void *Arg) } /* while message loop processing */ } /* while true */ /* If we get here the MC thread must exit */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: MC Thread exiting!!!!", __func__); complete_and_exit(&pSchedContext->McShutdown, 0); } /* cds_mc_thread() */ @@ -627,7 +627,7 @@ static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) for (i = 0; i < CDS_MAX_OL_RX_PKT; i++) { pkt = cdf_mem_malloc(sizeof(*pkt)); if (!pkt) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s Vos packet allocation for ol rx thread failed", __func__); goto free; @@ -822,7 +822,7 @@ static int cds_ol_rx_thread(void *arg) affine_cpu = pref_cpu; if (!arg) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Bad Args passed", __func__); return 0; } @@ -852,8 +852,8 @@ static int cds_ol_rx_thread(void *arg) complete (&pSchedContext->ol_suspend_rx_event); } - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Shutting down OL RX Thread", __func__); shutdown = true; @@ -877,7 +877,7 @@ static int cds_ol_rx_thread(void *arg) } } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Exiting CDS OL rx thread", __func__); complete_and_exit(&pSchedContext->ol_rx_shutdown, 0); } @@ -897,10 +897,10 @@ static int cds_ol_rx_thread(void *arg) */ QDF_STATUS cds_sched_close(void *p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: invoked", __func__); if (gp_cds_sched_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); return QDF_STATUS_E_FAILURE; } @@ -944,40 +944,40 @@ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) { QDF_STATUS vStatus = QDF_STATUS_SUCCESS; /* Now intialize all the message queues */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the WMA MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->wmaMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to init WMA MC Message queue", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return vStatus; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the PE MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->peMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to init PE MC Message queue", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return vStatus; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SME MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->smeMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to init SME MC Message queue", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return vStatus; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing the SYS MC Message queue", __func__); vStatus = cds_mq_init(&pSchedContext->sysMcMq); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to init SYS MC Message queue", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return vStatus; } @@ -995,19 +995,19 @@ void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext) /* Now de-intialize all message queues */ /* MC WMA */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the WMA MC Message queue", __func__); cds_mq_deinit(&pSchedContext->wmaMcMq); /* MC PE */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the PE MC Message queue", __func__); cds_mq_deinit(&pSchedContext->peMcMq); /* MC SME */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the SME MC Message queue", __func__); cds_mq_deinit(&pSchedContext->smeMcMq); /* MC SYS */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s De-Initializing the SYS MC Message queue", __func__); cds_mq_deinit(&pSchedContext->sysMcMq); @@ -1028,27 +1028,27 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) * Core. Before returning a wrapper to the Core, the CDS message shall * be freed first */ - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, ("Flushing the MC Thread message queue")); if (NULL == pSchedContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: pSchedContext is NULL", __func__); return; } cds_ctx = (p_cds_contextType) (pSchedContext->pVContext); if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: cds_ctx is NULL", __func__); return; } /* Flush the SYS Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq))) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Freeing MC SYS message type %d ", __func__, pMsgWrapper->pVosMsg->type); cds_core_return_msg(pSchedContext->pVContext, pMsgWrapper); @@ -1056,7 +1056,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) /* Flush the WMA Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq))) { if (pMsgWrapper->pVosMsg != NULL) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Freeing MC WMA MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); if (pMsgWrapper->pVosMsg->bodyptr) { @@ -1073,8 +1073,8 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) /* Flush the PE Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq))) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Freeing MC PE MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); pe_free_msg(cds_ctx->pMACContext, @@ -1083,8 +1083,8 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) } /* Flush the SME Mq */ while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq))) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_INFO, "%s: Freeing MC SME MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); sme_free_msg(cds_ctx->pMACContext, pMsgWrapper->pVosMsg); @@ -1101,7 +1101,7 @@ p_cds_sched_context get_cds_sched_ctxt(void) { /* Make sure that Vos Scheduler context has been initialized */ if (gp_cds_sched_context == NULL) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: gp_cds_sched_context == NULL", __func__); return gp_cds_sched_context; @@ -1143,7 +1143,7 @@ static void cds_print_external_threads(void) while (i < MAX_SSR_PROTECT_LOG) { if (!ssr_protect_log[i].free) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "PID %d is stuck at %s", ssr_protect_log[i].pid, ssr_protect_log[i].func); } @@ -1186,7 +1186,7 @@ void cds_ssr_protect(const char *caller_func) spin_unlock_irqrestore(&ssr_protect_lock, irq_flags); if (!status) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Could not track PID %d call %s: log is full", current->pid, caller_func); } @@ -1225,7 +1225,7 @@ void cds_ssr_unprotect(const char *caller_func) spin_unlock_irqrestore(&ssr_protect_lock, irq_flags); if (!status) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Untracked call %s", caller_func); } @@ -1247,7 +1247,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func) break; if (--count) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Waiting for active entry points to exit", __func__); msleep(SSR_WAIT_SLEEP_TIME); @@ -1259,7 +1259,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func) return false; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "Allowing SSR/Driver unload for %s", caller_func); return true; diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index 2b232e37d6e0..a68c0d276371 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -49,7 +49,7 @@ * Include Files * -------------------------------------------------------------------------*/ -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_utils.h" #include "cdf_memory.h" #include "cds_crypto.h" @@ -358,7 +358,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, /* Check if frame is invalid length */ if (((efrm - frm) != frmLen) || (frmLen < sizeof(*wh))) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Invalid frame length", __func__); return false; } @@ -388,14 +388,14 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, if (IS_ERR(tfm)) { ret = PTR_ERR(tfm); tfm = NULL; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: crypto_alloc_cipher failed (%d)", __func__, ret); goto err_tfm; } ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: crypto_cipher_setkey failed (%d)", __func__, ret); goto err_tfm; @@ -418,7 +418,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, nBytes = AAD_LEN + (frmLen - sizeof(struct ieee80211_frame)); input = (uint8_t *) cdf_mem_malloc(nBytes); if (NULL == input) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Memory allocation failed", __func__); ret = QDF_STATUS_E_NOMEM; goto err_tfm; @@ -439,7 +439,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, cds_cmac_calc_mic(tfm, input, nBytes, mic); cdf_mem_free(input); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); @@ -467,7 +467,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Check if frame is invalid length */ if ((efrm < frm) || ((efrm - frm) < sizeof(*wh))) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Invalid frame length"); return false; } @@ -477,7 +477,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Check Element ID */ if ((mmie->element_id != IEEE80211_ELEMID_MMIE) || (mmie->length != (sizeof(*mmie) - 2))) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "IE is not Mgmt MIC IE or Invalid length"); /* IE is not Mgmt MIC IE or invalid length */ return false; @@ -487,7 +487,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) rx_ipn = mmie->sequence_number; if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) <= 0) { /* Replay error */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Replay error mmie ipn %02X %02X %02X %02X %02X %02X" " drvr ipn %02X %02X %02X %02X %02X %02X", rx_ipn[0], rx_ipn[1], rx_ipn[2], rx_ipn[3], rx_ipn[4], @@ -499,14 +499,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) if (IS_ERR(tfm)) { ret = PTR_ERR(tfm); tfm = NULL; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_alloc_cipher failed (%d)", ret); goto err_tfm; } ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed (%d)", ret); goto err_tfm; } @@ -528,7 +528,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) nBytes = AAD_LEN + (efrm - (uint8_t *) (wh + 1)); input = (uint8_t *) cdf_mem_malloc(nBytes); if (NULL == input) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Memory allocation failed"); ret = QDF_STATUS_E_NOMEM; goto err_tfm; @@ -543,14 +543,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) cds_cmac_calc_mic(tfm, input, nBytes, mic); cdf_mem_free(input); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) != 0) { /* MMIE MIC mismatch */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "BC/MC MGMT frame MMIE MIC check Failed" " rmic %02X %02X %02X %02X %02X %02X %02X %02X" " cmic %02X %02X %02X %02X %02X %02X %02X %02X", @@ -630,7 +630,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, tfm = cds_crypto_alloc_ahash("hmac(sha1)", CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_AHASH_MASK); if (IS_ERR(tfm)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_alloc_ahash failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -638,7 +638,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, req = ahash_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "failed to allocate request for hmac(sha1)"); ret = -ENOMEM; goto err_req; @@ -649,7 +649,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, hash_buff = kzalloc(psize, GFP_KERNEL); if (!hash_buff) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "failed to kzalloc hash_buff"); ret = -ENOMEM; goto err_hash_buf; @@ -663,7 +663,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, crypto_ahash_clear_flags(tfm, ~0); ret = cds_crypto_ahash_setkey(tfm, key, ksize); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_ahash_setkey failed"); goto err_setkey; } @@ -671,7 +671,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, ahash_request_set_crypt(req, &sg, hash_result, psize); ret = cds_crypto_ahash_digest(req); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); switch (ret) { case 0: @@ -687,7 +687,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, INIT_COMPLETION(tresult.completion); break; } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "wait_for_completion_interruptible failed"); if (!ret) ret = tresult.err; @@ -726,7 +726,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ ); if (ret != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "hmac_sha1() call failed"); return QDF_STATUS_E_FAULT; } @@ -791,7 +791,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, tfm = cds_crypto_alloc_ahash("hmac(md5)", CRYPTO_ALG_TYPE_AHASH, CRYPTO_ALG_TYPE_AHASH_MASK); if (IS_ERR(tfm)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_alloc_ahash failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -799,7 +799,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, req = ahash_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "failed to allocate request for hmac(md5)"); ret = -ENOMEM; goto err_req; @@ -810,7 +810,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, hash_buff = kzalloc(psize, GFP_KERNEL); if (!hash_buff) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "failed to kzalloc hash_buff"); ret = -ENOMEM; goto err_hash_buf; @@ -824,7 +824,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, crypto_ahash_clear_flags(tfm, ~0); ret = cds_crypto_ahash_setkey(tfm, key, ksize); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_ahash_setkey failed"); goto err_setkey; } @@ -833,7 +833,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, ahash_request_set_crypt(req, &sg, hash_result, psize); ret = cds_crypto_ahash_digest(req); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret); switch (ret) { case 0: @@ -847,7 +847,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize, INIT_COMPLETION(tresult.completion); break; } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "wait_for_completion_interruptible failed"); if (!ret) ret = tresult.err; @@ -886,7 +886,7 @@ QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle, /* Handle */ ); if (ret != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "hmac_md5() call failed"); return QDF_STATUS_E_FAULT; } @@ -951,7 +951,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0); if (IS_ERR(tfm)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_alloc_ablkcipher failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -959,7 +959,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ req = ablkcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate request for cbc(aes)"); ret = -ENOMEM; goto err_req; @@ -972,7 +972,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle, /* Handle */ ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed"); goto err_setkey; } @@ -995,7 +995,7 @@ err_req: err_tfm: /* return ret; */ if (ret != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); return QDF_STATUS_E_FAULT; } @@ -1047,7 +1047,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0); if (IS_ERR(tfm)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_alloc_ablkcipher failed"); ret = PTR_ERR(tfm); goto err_tfm; @@ -1055,7 +1055,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ req = ablkcipher_request_alloc(tfm, GFP_KERNEL); if (!req) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate request for cbc(aes)"); ret = -ENOMEM; goto err_req; @@ -1068,7 +1068,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle, /* Handle */ ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128); if (ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "crypto_cipher_setkey failed"); goto err_setkey; } @@ -1091,7 +1091,7 @@ err_req: err_tfm: /* return ret; */ if (ret != 0) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s() call failed", __func__); return QDF_STATUS_E_FAULT; } diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 4e3b91a6e4c6..5055a6c8212f 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -537,7 +537,7 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev) sizeof(struct rx_buf_debug)); if (!pdev->rx_buff_list) { qdf_print("HTT: debug RX buffer allocation failed\n"); - CDF_ASSERT(0); + QDF_ASSERT(0); } } /** diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 13f1de7cefe0..04bba5d686e4 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -606,7 +606,7 @@ int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) } NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT); - DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_HTT_PACKET_PTR_RECORD, + DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD, (uint8_t *)(cdf_nbuf_data(msdu)), sizeof(cdf_nbuf_data(msdu)))); if (cdf_nbuf_queue_len(&pdev->txnbufq) > 0) { @@ -748,7 +748,7 @@ htt_tx_send_base(htt_pdev_handle pdev, cdf_nbuf_trace_update(msdu, "HT:T:"); NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT); - DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_HTT_PACKET_PTR_RECORD, + DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD, (uint8_t *)(cdf_nbuf_data(msdu)), sizeof(cdf_nbuf_data(msdu)))); htc_send_data_pkt(pdev->htc_pdev, &pkt->htc_pkt, more_data); diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index ab27b2ca895b..9fd32f61d989 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -46,7 +46,7 @@ #include #include /* htt_pdev_handle */ #include -#include +#include /* Remove these macros when they get added to htt.h. */ #ifndef HTT_TX_DESC_EXTENSION_GET @@ -287,35 +287,35 @@ struct htt_msdu_info_t { static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "HTT MSDU info object (%p)\n", msdu_info); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " ethertype: %#x\n", msdu_info->info.ethertype); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " peer_id: %d\n", msdu_info->info.peer_id); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " vdev_id: %d\n", msdu_info->info.vdev_id); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " ext_tid: %d\n", msdu_info->info.ext_tid); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " l2_hdr_type: %d\n", msdu_info->info.l2_hdr_type); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " frame_type: %d\n", msdu_info->info.frame_type); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " frame_subtype: %d\n", msdu_info->info.frame_subtype); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " l3_hdr_offset: %u\n", msdu_info->info.l3_hdr_offset); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " use 6 Mbps: %d\n", msdu_info->action.use_6mbps); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " do_encrypt: %d\n", msdu_info->action.do_encrypt); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " do_tx_complete: %d\n", msdu_info->action.do_tx_complete); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " is_unicast: %u\n", msdu_info->info.is_unicast); } @@ -573,7 +573,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, ce_pkt_type = htt_to_ce_pkt_type[pkt_type]; if (0xffffffff == ce_pkt_type) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, "Invalid HTT pkt type %d\n", pkt_type); return; } @@ -844,7 +844,7 @@ htt_tx_desc_frag(htt_pdev_handle pdev, *word32 |= (frag_len << 16); } else { /* For Helium+, this block cannot exist */ - CDF_ASSERT(0); + QDF_ASSERT(0); } #else /* !defined(HELIUMPLUS_PADDR64) */ { diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 3b02e827e0dd..5b86ca97c49b 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -75,10 +75,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, static void ol_rx_restore_handler(struct work_struct *htt_rx) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cnss_device_self_recovery(); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "Exit: %s", __func__); } @@ -91,7 +91,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu, while (head_msdu) { next = cdf_nbuf_next(head_msdu); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "freeing %p\n", head_msdu); cdf_nbuf_free(head_msdu); head_msdu = next; diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index 78e0ad003db6..8c05c6098a0e 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -403,7 +403,7 @@ void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned tid) } else if (rx_reorder->defrag_waitlist_elem.tqe_next != NULL) { TXRX_PRINT(TXRX_PRINT_LEVEL_FATAL_ERR, "waitlist->tqe_prv = NULL\n"); - CDF_ASSERT(0); + QDF_ASSERT(0); rx_reorder->defrag_waitlist_elem.tqe_next = NULL; } } diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 05b59f24a7f5..1d5a4acbc88e 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -329,12 +329,12 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once) } i = start; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " seq PN"); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " count idx peer tid uni num LSBs"); do { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " %6lld %4d %p %2d %d %4d %8d", cnt, i, pdev->rx_pn_trace.data[i].peer, diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 81694d2113b3..7c3a8171d0b3 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -798,22 +798,22 @@ ol_rx_reorder_trace_display(ol_txrx_pdev_handle pdev, int just_once, int limit) } i = start; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " log array seq"); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " count idx tid idx num (LSBs)"); do { uint16_t seq_num, reorder_idx; seq_num = pdev->rx_reorder_trace.data[i].seq_num; reorder_idx = pdev->rx_reorder_trace.data[i].reorder_idx; if (seq_num < (1 << 14)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " %6lld %4d %3d %4d %4d (%d)", cnt, i, pdev->rx_reorder_trace.data[i].tid, reorder_idx, seq_num, seq_num & 63); } else { int err = TXRX_SEQ_NUM_ERR(seq_num); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " %6lld %4d err %d (%d MPDUs)", cnt, i, err, pdev->rx_reorder_trace.data[i].num_mpdus); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index c8b227ab0b99..decec2339d41 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -152,7 +152,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, QDF_STATUS status; if (qdf_unlikely(!pdev)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s:pdev is null", __func__); return skb; } @@ -163,27 +163,27 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, } if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s:Invalid sta id", __func__); return skb; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s:Invalid peer", __func__); return skb; } if (peer->state < ol_txrx_peer_state_conn) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: station to be yet registered..dropping pkt", __func__); return skb; } status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE); if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; } @@ -199,7 +199,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, cdf_nbuf_set_next(skb, NULL); ret = OL_TX_LL(peer->vdev, skb); if (ret) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: Failed to tx", __func__); cdf_nbuf_unmap_single(cdf_ctx, ret, QDF_DMA_TO_DEVICE); return ret; @@ -826,8 +826,8 @@ ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, vdev->ll_pause.txq.depth < vdev->ll_pause.max_q_depth) { cdf_nbuf_t next = cdf_nbuf_next(msdu_list); NBUF_UPDATE_TX_PKT_COUNT(msdu_list, NBUF_TX_PKT_TXRX_ENQUEUE); - DPTRACE(cdf_dp_trace(msdu_list, - CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD, + DPTRACE(qdf_dp_trace(msdu_list, + QDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD, (uint8_t *)(cdf_nbuf_data(msdu_list)), sizeof(cdf_nbuf_data(msdu_list)))); diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index d846a6b504e1..99f3584964f2 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -55,7 +55,7 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) vdev->ll_pause.is_q_paused = true; qdf_spin_unlock_bh(&vdev->ll_pause.mutex); - DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_PAUSE, + DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_VDEV_PAUSE, NULL, 0)); TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__); } @@ -80,7 +80,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) } else { qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } - DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_UNPAUSE, + DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_VDEV_UNPAUSE, NULL, 0)); TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__); } diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 18e4b36603ec..918917a5ae22 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -183,7 +183,7 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev, msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu); id = ol_tx_desc_id(pdev, tx_desc); NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX); - DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD, + DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_TXRX_PACKET_PTR_RECORD, (uint8_t *)(cdf_nbuf_data(msdu)), sizeof(cdf_nbuf_data(msdu)))); failed = htt_tx_send_std(pdev->htt_pdev, msdu, id); @@ -776,7 +776,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev, } else if (pdev->frame_format == wlan_frm_fmt_802_3) { hdr_ptr = datap; } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid standard frame type: %d", pdev->frame_format); qdf_assert(0); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 9f88de09f850..e8646c8c7331 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -133,7 +133,7 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id) { if (!peer) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "peer argument is null!!"); return QDF_STATUS_E_FAILURE; } @@ -148,21 +148,21 @@ void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id) ol_txrx_pdev_handle pdev = NULL; if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid sta id passed"); return NULL; } pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "PDEV not found for sta_id [%d]", sta_id); return NULL; } peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "PEER [%d] not found", sta_id); return NULL; } @@ -555,7 +555,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true); if ((0 == pdev->tx_desc.desc_pages.num_pages) || (NULL == pdev->tx_desc.desc_pages.cacheable_pages)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Page alloc fail"); goto page_alloc_fail; } @@ -568,7 +568,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) desc_per_page = desc_per_page >> 1; } pdev->tx_desc.page_divider = (sig_bit - 1); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "page_divider 0x%x, offset_filter 0x%x num elem %d, ol desc num page %d, ol desc per page %d", pdev->tx_desc.page_divider, pdev->tx_desc.offset_filter, desc_pool_size, pdev->tx_desc.desc_pages.num_pages, @@ -599,7 +599,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr, i); if (!htt_tx_desc) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL, "%s: failed to alloc HTT tx desc (%d of %d)", __func__, i, desc_pool_size); fail_idx = i; @@ -611,7 +611,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ret = htt_tx_frag_alloc(pdev->htt_pdev, i, &frag_paddr, &htt_frag_desc); if (ret) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: failed to alloc HTT frag dsc (%d/%d)", __func__, i, desc_pool_size); /* Is there a leak here, is this handling correct? */ @@ -625,7 +625,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) c_element->tx_desc.htt_frag_desc = htt_frag_desc; c_element->tx_desc.htt_frag_desc_paddr = frag_paddr; } - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%s:%d - %d FRAG VA 0x%p FRAG PA 0x%llx", __func__, __LINE__, i, c_element->tx_desc.htt_frag_desc, @@ -660,7 +660,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) else pdev->htt_pkt_type = htt_pkt_type_ethernet; } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s Invalid standard frame type: %d", __func__, pdev->frame_format); goto control_init_fail; @@ -727,7 +727,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ? 0 : 1; break; default: - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid std frame type; [en/de]cap: f:%x t:%x r:%x", pdev->frame_format, pdev->target_tx_tran_caps, pdev->target_rx_tran_caps); @@ -777,8 +777,8 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) } else { #define TRACESTR01 "invalid config: if rx PN check is on the host,"\ "rx->tx forwarding check needs to also be on the host" - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_ERROR, "%s: %s", __func__, TRACESTR01); #undef TRACESTR01 goto control_init_fail; @@ -1622,7 +1622,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev, } default: { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "ERROR: unknown param %d in %s", select, __func__); break; @@ -1976,11 +1976,11 @@ unsigned g_txrx_print_level = TXRX_PRINT_LEVEL_ERR; /* default */ void ol_txrx_print_level_set(unsigned level) { #ifndef TXRX_PRINT_ENABLE - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL, "The driver is compiled without TXRX prints enabled.\n" "To enable them, recompile with TXRX_PRINT_ENABLE defined"); #else - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "TXRX printout level changed from %d to %d", g_txrx_print_level, level); g_txrx_print_level = level; @@ -2262,7 +2262,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(TXRX_DEBUG_LEVEL) && TXRX_DEBUG_LEVEL > 5 ol_txrx_pdev_display(vdev->pdev, 0); #else - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL, "The pdev,vdev,peer display functions are disabled.\n" "To enable them, recompile with TXRX_DEBUG_LEVEL > 5"); #endif @@ -2274,7 +2274,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(ENABLE_TXRX_PROT_ANALYZE) ol_txrx_prot_ans_display(vdev->pdev); #else - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL, "txrx protocol analysis is disabled.\n" "To enable it, recompile with " "ENABLE_TXRX_PROT_ANALYZE defined"); @@ -2284,7 +2284,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs) #if defined(ENABLE_RX_REORDER_TRACE) ol_rx_reorder_trace_display(vdev->pdev, 0, 0); #else - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL, "rx reorder seq num trace is disabled.\n" "To enable it, recompile with " "ENABLE_RX_REORDER_TRACE defined"); @@ -2307,20 +2307,20 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent) { struct ol_txrx_vdev_t *vdev; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*s%s:\n", indent, " ", "txrx pdev"); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*spdev object: %p", indent + 4, " ", pdev); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*svdev list:", indent + 4, " "); TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { ol_txrx_vdev_display(vdev, indent + 8); } ol_txrx_peer_find_display(pdev, indent + 4); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*stx desc pool: %d elems @ %p", indent + 4, " ", pdev->tx_desc.pool_size, pdev->tx_desc.array); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " "); + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " "); htt_display(pdev->htt_pdev, indent); } @@ -2328,17 +2328,17 @@ void ol_txrx_vdev_display(ol_txrx_vdev_handle vdev, int indent) { struct ol_txrx_peer_t *peer; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*stxrx vdev: %p\n", indent, " ", vdev); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*sID: %d\n", indent + 4, " ", vdev->vdev_id); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*sMAC addr: %d:%d:%d:%d:%d:%d", indent + 4, " ", vdev->mac_addr.raw[0], vdev->mac_addr.raw[1], vdev->mac_addr.raw[2], vdev->mac_addr.raw[3], vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*speer list:", indent + 4, " "); TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) { ol_txrx_peer_display(peer, indent + 8); @@ -2349,11 +2349,11 @@ void ol_txrx_peer_display(ol_txrx_peer_handle peer, int indent) { int i; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*stxrx peer: %p", indent, " ", peer); for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) { if (peer->peer_ids[i] != HTT_INVALID_PEER) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*sID: %d", indent + 4, " ", peer->peer_ids[i]); } @@ -2367,13 +2367,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) int msdu_idx; int seg_idx; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "TSO pkts %lld, bytes %lld\n", pdev->stats.pub.tx.tso.tso_pkts.pkts, pdev->stats.pub.tx.tso.tso_pkts.bytes); for (msdu_idx = 0; msdu_idx < NUM_MAX_TSO_MSDUS; msdu_idx++) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "curr msdu idx: %d curr seg idx: %d num segs %d\n", TXRX_STATS_TSO_MSDU_IDX(pdev), TXRX_STATS_TSO_SEG_IDX(pdev), @@ -2385,13 +2385,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) struct qdf_tso_seg_t tso_seg = TXRX_STATS_TSO_SEG(pdev, msdu_idx, seg_idx); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "msdu idx: %d seg idx: %d\n", msdu_idx, seg_idx); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "tso_enable: %d\n", tso_seg.tso_flags.tso_enable); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "fin %d syn %d rst %d psh %d ack %d\n" "urg %d ece %d cwr %d ns %d\n", tso_seg.tso_flags.fin, tso_seg.tso_flags.syn, @@ -2399,7 +2399,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) tso_seg.tso_flags.ack, tso_seg.tso_flags.urg, tso_seg.tso_flags.ece, tso_seg.tso_flags.cwr, tso_seg.tso_flags.ns); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "tcp_seq_num: 0x%x ip_id: %d\n", tso_seg.tso_flags.tcp_seq_num, tso_seg.tso_flags.ip_id); @@ -2409,7 +2409,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) #else void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "TSO is not supported\n"); } #endif @@ -2429,7 +2429,7 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len) ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (!vdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: vdev is NULL", __func__); snprintf(buffer, buf_len, "vdev not found"); return len; @@ -2452,8 +2452,8 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len) void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:"); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "txrx stats:"); + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, " tx: sent %lld msdus (%lld B), " " rejected %lld (%lld B), dropped %lld (%lld B)", pdev->stats.pub.tx.delivered.pkts, @@ -2466,7 +2466,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.dropped.download_fail.bytes + pdev->stats.pub.tx.dropped.target_discard.bytes + pdev->stats.pub.tx.dropped.no_ack.bytes); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, " download fail: %lld (%lld B), " "target discard: %lld (%lld B), " "no ack: %lld (%lld B)", @@ -2476,7 +2476,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.dropped.target_discard.bytes, pdev->stats.pub.tx.dropped.no_ack.pkts, pdev->stats.pub.tx.dropped.no_ack.bytes); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Tx completion per interrupt:\n" "Single Packet %d\n" " 2-10 Packets %d\n" @@ -2494,7 +2494,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.tx.comp_histogram.pkts_41_50, pdev->stats.pub.tx.comp_histogram.pkts_51_60, pdev->stats.pub.tx.comp_histogram.pkts_61_plus); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, " rx: %lld ppdus, %lld mpdus, %lld msdus, %lld bytes, %lld errs", pdev->stats.priv.rx.normal.ppdus, pdev->stats.priv.rx.normal.mpdus, @@ -2502,7 +2502,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) pdev->stats.pub.rx.delivered.bytes, pdev->stats.priv.rx.err.mpdu_bad); - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, " fwd to stack %d, fwd to fw %d, fwd to stack & fw %d\n", pdev->stats.pub.rx.intra_bss_fwd.packets_stack, pdev->stats.pub.rx.intra_bss_fwd.packets_fwd, @@ -2568,14 +2568,14 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id) ol_txrx_pdev_handle pdev = NULL; if (sta_id >= WLAN_MAX_STA_COUNT) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid sta id passed"); return NULL; } pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "PDEV not found for sta_id [%d]", sta_id); return NULL; } @@ -2583,7 +2583,7 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id) peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); if (!peer) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "PEER [%d] not found", sta_id); return NULL; } @@ -2605,7 +2605,7 @@ int ol_txrx_register_tx_flow_control (uint8_t vdev_id, { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id %d", __func__, vdev_id); return -EINVAL; } @@ -2627,7 +2627,7 @@ int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id) { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id", __func__); return -EINVAL; } @@ -2654,7 +2654,7 @@ ol_txrx_get_tx_resource(uint8_t sta_id, { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_sta_id(sta_id); if (NULL == vdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid sta_id %d", __func__, sta_id); /* Return true so caller do not understand that resource * is less than low_watermark. @@ -2691,7 +2691,7 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth) { ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id); if (NULL == vdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid vdev_id %d", __func__, vdev_id); return -EINVAL; } @@ -2832,7 +2832,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; if (qdf_unlikely(!pdev)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); cdf_mem_free(rxpkt); return; @@ -2841,7 +2841,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, if (pdev->ipa_uc_op_cb) { pdev->ipa_uc_op_cb(rxpkt, pdev->osif_dev); } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: ipa_uc_op_cb NULL", __func__); cdf_mem_free(rxpkt); } @@ -2865,7 +2865,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg) pkt = cds_alloc_ol_rx_pkt(sched_ctx); if (qdf_unlikely(!pkt)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; } @@ -2883,7 +2883,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, if (pdev->ipa_uc_op_cb) { pdev->ipa_uc_op_cb(op_msg, pdev->osif_dev); } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: IPA callback function is not registered", __func__); cdf_mem_free(op_msg); return; @@ -2924,7 +2924,7 @@ void ol_txrx_display_stats(uint16_t value) pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: pdev is NULL", __func__); return; } @@ -2943,7 +2943,7 @@ void ol_txrx_display_stats(uint16_t value) cdf_nbuf_tx_desc_count_display(); break; default: - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Unknown value", __func__); break; } @@ -2955,7 +2955,7 @@ void ol_txrx_clear_stats(uint16_t value) pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (!pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: pdev is NULL", __func__); return; } @@ -2971,7 +2971,7 @@ void ol_txrx_clear_stats(uint16_t value) cdf_nbuf_tx_desc_count_clear(); break; default: - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Unknown value", __func__); break; } @@ -3355,7 +3355,7 @@ void ol_txrx_lro_flush_handler(void *context, ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context; if (qdf_unlikely(!pdev)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); qdf_assert(0); return; @@ -3364,7 +3364,7 @@ void ol_txrx_lro_flush_handler(void *context, if (pdev->lro_info.lro_flush_cb) pdev->lro_info.lro_flush_cb(pdev->lro_info.lro_data); else - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: lro_flush_cb NULL", __func__); } @@ -3391,7 +3391,7 @@ void ol_txrx_lro_flush(void *data) } else { pkt = cds_alloc_ol_rx_pkt(sched_ctx); if (qdf_unlikely(!pkt)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate context", __func__); return; } diff --git a/core/dp/txrx/ol_txrx_event.c b/core/dp/txrx/ol_txrx_event.c index 87c91ab253f8..0743a00ed4b4 100644 --- a/core/dp/txrx/ol_txrx_event.c +++ b/core/dp/txrx/ol_txrx_event.c @@ -33,7 +33,7 @@ static inline wdi_event_subscribe *wdi_event_next_sub(wdi_event_subscribe * wdi_sub) { if (!wdi_sub) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid subscriber in %s\n", __func__); return NULL; } @@ -84,12 +84,12 @@ wdi_event_handler(enum WDI_EVENT event, * Input validation */ if (!event) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid WDI event in %s\n", __func__); return; } if (!txrx_pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid pdev in WDI event handler\n"); return; } @@ -113,17 +113,17 @@ wdi_event_sub(struct ol_txrx_pdev_t *txrx_pdev, wdi_event_subscribe *wdi_sub; /* Input validation */ if (!txrx_pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid txrx_pdev in %s", __func__); return A_ERROR; } if (!event_cb_sub) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid callback in %s", __func__); return A_ERROR; } if ((!event) || (event >= WDI_EVENT_LAST) || (event < WDI_EVENT_BASE)) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid event in %s", __func__); return A_ERROR; } @@ -157,7 +157,7 @@ wdi_event_unsub(struct ol_txrx_pdev_t *txrx_pdev, /* Input validation */ if (!event_cb_sub) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid callback in %s", __func__); return A_ERROR; } @@ -179,7 +179,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev) { /* Input validation */ if (!txrx_pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid device in %s\nWDI event attach failed", __func__); return A_ERROR; @@ -190,7 +190,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev) sizeof(wdi_event_subscribe *) * WDI_NUM_EVENTS); if (!txrx_pdev->wdi_event_list) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Insufficient memory for the WDI event lists\n"); return A_NO_MEMORY; } @@ -202,13 +202,13 @@ A_STATUS wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev) int i; wdi_event_subscribe *wdi_sub; if (!txrx_pdev) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "Invalid device in %s\nWDI detach failed", __func__); return A_ERROR; } if (!txrx_pdev->wdi_event_list) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: wdi_event_list is NULL", __func__); return A_ERROR; } diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 25d25f09d5d7..243e1212b159 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -381,7 +381,7 @@ ol_txrx_frms_dump(const char *name, uint8_t *p; if (name) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n", + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "%s\n", name); } while (frm) { @@ -435,8 +435,8 @@ ol_txrx_frms_dump(const char *name, ip_prot = ipv6_hdr->next_hdr; tcp_offset = l2_hdr_size + IPV6_HDR_LEN; } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, "frame %p non-IP ethertype (%x)\n", frm, ethtype); goto NOT_IP_TCP; @@ -451,13 +451,13 @@ ol_txrx_frms_dump(const char *name, (tcp_hdr->seq_num[1] << 16) | (tcp_hdr->seq_num[1] << 8) | (tcp_hdr->seq_num[1] << 0); - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, "frame %p: TCP seq num = %d\n", frm, tcp_seq_num); #else - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, "frame %p: TCP seq num = %d\n", frm, ((*(p + tcp_offset + 4)) << 24) | ((*(p + tcp_offset + 5)) << 16) | @@ -465,8 +465,8 @@ ol_txrx_frms_dump(const char *name, (*(p + tcp_offset + 7))); #endif } else { - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, "frame %p non-TCP IP protocol (%x)\n", frm, ip_prot); } @@ -502,13 +502,13 @@ NOT_IP_TCP: i += frag_bytes; } - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "frame %p data (%p), hex dump of bytes 0-%d of %d:\n", frm, p, len_lim - 1, (int)cdf_nbuf_len(frm)); p = local_buf; while (len_lim > 16) { - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, " " /* indent */ "%02x %02x %02x %02x %02x %02x %02x %02x " "%02x %02x %02x %02x %02x %02x %02x %02x\n", @@ -521,15 +521,15 @@ NOT_IP_TCP: p += 16; len_lim -= 16; } - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, " " /* indent */); while (len_lim > 0) { - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO, "%02x ", *p); + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO, "%02x ", *p); p++; len_lim--; } - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "\n"); } frm = cdf_nbuf_next(frm); diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index 7e8c38d44b54..ea6dee8b22f0 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -457,26 +457,26 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent) { int i, max_peers; - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*speer map:\n", indent, " "); max_peers = ol_cfg_max_peer_id(pdev->ctrl_pdev) + 1; for (i = 0; i < max_peers; i++) { if (pdev->peer_id_to_obj_map[i]) { - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*sid %d -> %p\n", indent + 4, " ", i, pdev->peer_id_to_obj_map[i]); } } - CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, "%*speer hash table:\n", indent, " "); for (i = 0; i <= pdev->peer_hash.mask; i++) { if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) { struct ol_txrx_peer_t *peer; TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i], hash_list_elem) { - CDF_TRACE(QDF_MODULE_ID_TXRX, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_TXRX, + QDF_TRACE_LEVEL_INFO_LOW, "%*shash idx %d -> %p (%02x:%02x:%02x:%02x:%02x:%02x)\n", indent + 4, " ", i, peer, peer->mac_addr.raw[0], diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index cf4a76ce355f..e9e44cae717e 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -157,26 +157,26 @@ #define WLAN_CHIP_VERSION "WCNSS" #ifndef HDD_DISALLOW_LEGACY_HDDLOG -#define hddLog(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) +#define hddLog(level, args ...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) #endif -#define hdd_log(level, args...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) +#define hdd_log(level, args...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) #define hdd_logfl(level, format, args...) hdd_log(level, FL(format), ## args) #define hdd_alert(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_FATAL, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args) #define hdd_err(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_ERROR, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args) #define hdd_warn(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_WARN, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_WARN, format, ## args) #define hdd_notice(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_INFO, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_INFO, format, ## args) #define hdd_info(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_INFO_HIGH, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args) #define hdd_debug(format, args...) \ - hdd_logfl(CDF_TRACE_LEVEL_DEBUG, format, ## args) + hdd_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) -#define ENTER() hdd_logfl(CDF_TRACE_LEVEL_INFO_LOW, "enter") -#define EXIT() hdd_logfl(CDF_TRACE_LEVEL_INFO_LOW, "exit") +#define ENTER() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "enter") +#define EXIT() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "exit") #define WLAN_HDD_GET_PRIV_PTR(__dev__) (hdd_adapter_t *)(netdev_priv((__dev__))) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index dcfb2e69a420..45f89606363c 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -304,7 +304,7 @@ hdd_conn_save_connected_bss_type(hdd_station_ctx_t *pHddStaCtx, so CSR should never send this back to us.*/ case eCSR_BSS_TYPE_ANY: default: - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -324,12 +324,12 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); eCsrEncryptionType encryptType = eCSR_ENCRYPT_TYPE_NONE; - CDF_ASSERT(pRoamInfo); + QDF_ASSERT(pRoamInfo); if (pRoamInfo) { /* Save the BSSID for the connection */ if (eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) { - CDF_ASSERT(pRoamInfo->pBssDesc); + QDF_ASSERT(pRoamInfo->pBssDesc); qdf_copy_macaddr(&pHddStaCtx->conn_info.bssId, &pRoamInfo->bssid); @@ -352,14 +352,14 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, * can't happen. We need a valid IBSS or Infra setting * in the BSSDescription or we can't function. */ - CDF_ASSERT(0); + QDF_ASSERT(0); } /* notify WMM */ hdd_wmm_connect(pAdapter, pRoamInfo, eBssType); if (!pRoamInfo->u.pConnectedProfile) { - CDF_ASSERT(pRoamInfo->u.pConnectedProfile); + QDF_ASSERT(pRoamInfo->u.pConnectedProfile); } else { /* Get Multicast Encryption Type */ encryptType = @@ -1437,7 +1437,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, roam_profile.SSID.length); ssid_ie_len = 2 + roam_profile.SSID.length; hdd_notice("SSIDIE:"); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, buf_ssid_ie, ssid_ie_len); final_req_ie = kmalloc(IW_GENERIC_IE_MAX, GFP_KERNEL); if (final_req_ie == NULL) @@ -1450,7 +1450,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength), IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength)); hdd_notice("Req RSN IE:"); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, final_req_ie, (ssid_ie_len + reqRsnLength)); cfg80211_roamed_bss(dev, bss, final_req_ie, (ssid_ie_len + reqRsnLength), @@ -1461,7 +1461,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, pCsrRoamInfo->nAssocReqLength); hdd_notice("ReAssoc Req IE dump"); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, assoc_req_ies, pCsrRoamInfo->nAssocReqLength); wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes, @@ -1949,9 +1949,9 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, hdd_notice( "Reassoc Req IE dump"); - CDF_TRACE_HEX_DUMP( + QDF_TRACE_HEX_DUMP( QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_DEBUG, pFTAssocReq, assocReqlen); @@ -2344,7 +2344,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter, QDF_MAC_ADDR_BROADCAST_INITIALIZER; if (NULL == pRoamInfo) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -3861,7 +3861,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG, pAdapter->sessionId, roamStatus)); switch (roamStatus) { diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index a107cb83e644..b85921b889be 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3887,7 +3887,7 @@ static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries, for (i = 0; i < entries; i++) { if (strcmp(iniTable[i].name, name) == 0) { *value = iniTable[i].value; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Found %s entry for Name=[%s] Value=[%s] ", WLAN_INI_FILE, name, *value); return QDF_STATUS_SUCCESS; @@ -4082,7 +4082,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, if (QDF_STATUS_SUCCESS == match_status) { rv = kstrtos32(value_str, 10, &svalue); if (rv < 0) { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Reg Parameter %s invalid. Enforcing Default", __func__, pRegEntry->RegName); svalue = @@ -4142,7 +4142,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx, /* Handle string parameters */ else if (WLAN_PARAM_String == pRegEntry->RegType) { #ifdef WLAN_CFG_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "RegName = %s, VarOffset %u VarSize %u VarDefault %s", pRegEntry->RegName, pRegEntry->VarOffset, pRegEntry->VarSize, @@ -4499,700 +4499,700 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) { int i; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "*********Config values in HDD Adapter*******"); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [RTSThreshold] Value = %u", pHddCtx->config->RTSThreshold); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [OperatingChannel] Value = [%u]", pHddCtx->config->OperatingChannel); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [PowerUsageControl] Value = [%s]", pHddCtx->config->PowerUsageControl); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fIsImpsEnabled] Value = [%u]", pHddCtx->config->fIsImpsEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nVccRssiTrigger] Value = [%u]", pHddCtx->config->nVccRssiTrigger); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]", MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes)); for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]", i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes)); } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApEnableUapsd] value = [%u]", pHddCtx->config->apUapsdEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApProt] value = [%u]", pHddCtx->config->apProtEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAPAutoShutOff] Value = [%u]", pHddCtx->config->nAPAutoShutOff); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanMccToSccSwitchMode] Value = [%u]", pHddCtx->config->WlanMccToSccSwitchMode); #endif #ifdef FEATURE_WLAN_AUTO_SHUTDOWN - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gWlanAutoShutdown] Value = [%u]", pHddCtx->config->WlanAutoShutdown); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableListenMode] Value = [%u]", pHddCtx->config->nEnableListenMode); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApProtection] value = [%u]", pHddCtx->config->apProtection); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableApOBSSProt] value = [%u]", pHddCtx->config->apOBSSProtEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS, pHddCtx->config->force_sap_acs); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH, pHddCtx->config->force_sap_acs_st_ch); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH, pHddCtx->config->force_sap_acs_end_ch); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO_HIGH, "Name = [sap_channel_avoidance] value = [%u]", pHddCtx->config->sap_channel_avoidance); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME, pHddCtx->config->sap_p2p_11ac_override); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode24GHz); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ChannelBondingMode] Value = [%u]", pHddCtx->config->nChannelBondingMode5GHz); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [dot11Mode] Value = [%u]", pHddCtx->config->dot11Mode); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [UapsdMask] Value = [0x%x] ", pHddCtx->config->UapsdMask); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ImplicitQosIsEnabled] Value = [%u]", (int)pHddCtx->config->bImplicitQosEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSrvIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdVoSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdVoSuspIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSrvIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdViSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdViSuspIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSrvIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBeSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBeSuspIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSrvIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSrvIntv); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraUapsdBkSuspIntv] Value = [%u] ", pHddCtx->config->InfraUapsdBkSuspIntv); #ifdef FEATURE_WLAN_ESE - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraInactivityInterval] Value = [%u] ", pHddCtx->config->InfraInactivityInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [EseEnabled] Value = [%u] ", pHddCtx->config->isEseIniFeatureEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastTransitionEnabled] Value = [%u] ", pHddCtx->config->isFastTransitionEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTxPowerCap] Value = [%u] dBm ", pHddCtx->config->nTxPowerCap); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [FastRoamEnabled] Value = [%u] ", pHddCtx->config->isFastRoamIniFeatureEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [MAWCEnabled] Value = [%u] ", pHddCtx->config->MAWCEnabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [RoamRssiDiff] Value = [%u] ", pHddCtx->config->RoamRssiDiff); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [isWESModeEnabled] Value = [%u] ", pHddCtx->config->isWESModeEnabled); #ifdef FEATURE_WLAN_OKC - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [OkcEnabled] Value = [%u] ", pHddCtx->config->isOkcIniFeatureEnabled); #endif #ifdef FEATURE_WLAN_SCAN_PNO - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanSupport] Value = [%u] ", pHddCtx->config->configPNOScanSupport); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [configPNOScanTimerRepeatValue] Value = [%u] ", pHddCtx->config->configPNOScanTimerRepeatValue); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gPNOSlowScanMultiplier] Value = [%u] ", pHddCtx->config->pno_slow_scan_multiplier); #endif #ifdef FEATURE_WLAN_TDLS - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSSupport] Value = [%u] ", pHddCtx->config->fEnableTDLSSupport); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSImplicitTrigger] Value = [%u] ", pHddCtx->config->fEnableTDLSImplicitTrigger); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSExternalControl] Value = [%u] ", pHddCtx->config->fTDLSExternalControl); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fTDLSUapsdMask] Value = [%u] ", pHddCtx->config->fTDLSUapsdMask); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSBufferSta] Value = [%u] ", pHddCtx->config->fEnableTDLSBufferSta); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableTDLSWmmMode] Value = [%u] ", pHddCtx->config->fEnableTDLSWmmMode); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [enable_tdls_scan] Value = [%u]", pHddCtx->config->enable_tdls_scan); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVo] Value = [%u] ", pHddCtx->config->InfraDirAcVo); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVo); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVo); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVo] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVo); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVo] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVo); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcVi] Value = [%u] ", pHddCtx->config->InfraDirAcVi); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcVi); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcVi); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcVi] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcVi); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcVi] Value = [0x%x] ", pHddCtx->config->InfraSbaAcVi); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBe] Value = [%u] ", pHddCtx->config->InfraDirAcBe); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBe); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBe); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBe] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBe); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBe] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBe); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraDirAcBk] Value = [%u] ", pHddCtx->config->InfraDirAcBk); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ", pHddCtx->config->InfraNomMsduSizeAcBk); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMeanDataRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMeanDataRateAcBk); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ", pHddCtx->config->InfraMinPhyRateAcBk); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [InfraSbaAcBk] Value = [0x%x] ", pHddCtx->config->InfraSbaAcBk); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [DelayedTriggerFrmInt] Value = [%u] ", pHddCtx->config->DelayedTriggerFrmInt); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [mcastBcastFilterSetting] Value = [%u] ", pHddCtx->config->mcastBcastFilterSetting); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fhostArpOffload] Value = [%u] ", pHddCtx->config->fhostArpOffload); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp); #ifdef FEATURE_WLAN_RA_FILTERING - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [RArateLimitInterval] Value = [%u] ", pHddCtx->config->RArateLimitInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [IsRArateLimitEnabled] Value = [%u] ", pHddCtx->config->IsRArateLimitEnabled); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fFTResourceReqSupported] Value = [%u] ", pHddCtx->config->fFTResourceReqSupported); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborLookupRssiThreshold] Value = [%u] ", pHddCtx->config->nNeighborLookupRssiThreshold); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [delay_before_vdev_stop] Value = [%u] ", pHddCtx->config->delay_before_vdev_stop); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nOpportunisticThresholdDiff] Value = [%u] ", pHddCtx->config->nOpportunisticThresholdDiff); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamRescanRssiDiff] Value = [%u] ", pHddCtx->config->nRoamRescanRssiDiff); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMinChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMinChanTime); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanMaxChanTime] Value = [%u] ", pHddCtx->config->nNeighborScanMaxChanTime); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nMaxNeighborRetries] Value = [%u] ", pHddCtx->config->nMaxNeighborReqTries); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanPeriod] Value = [%u] ", pHddCtx->config->nNeighborScanPeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ", pHddCtx->config->nNeighborResultsRefreshPeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nEmptyScanRefreshPeriod] Value = [%u] ", pHddCtx->config->nEmptyScanRefreshPeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFirstBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFirstBcnt); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBmissFinalBcnt] Value = [%u] ", pHddCtx->config->nRoamBmissFinalBcnt); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nRoamBeaconRssiWeight] Value = [%u] ", pHddCtx->config->nRoamBeaconRssiWeight); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [allowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_max_count] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_max_count); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_delta); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_delay] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_delay); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ", pHddCtx->config->nhi_rssi_scan_rssi_ub); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [burstSizeDefinition] Value = [0x%x] ", pHddCtx->config->burstSizeDefinition); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [tsInfoAckPolicy] Value = [0x%x] ", pHddCtx->config->tsInfoAckPolicy); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [rfSettlingTimeUs] Value = [%u] ", pHddCtx->config->rfSettlingTimeUs); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [bSingleTidRc] Value = [%u] ", pHddCtx->config->bSingleTidRc); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDynamicPSPollvalue] Value = [%u] ", pHddCtx->config->dynamicPsPollValue); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAddTSWhenACMIsOff] Value = [%u] ", pHddCtx->config->AddTSWhenACMIsOff); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gValidateScanList] Value = [%u] ", pHddCtx->config->fValidateScanList); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gStaKeepAlivePeriod] Value = [%u] ", pHddCtx->config->infraStaKeepAlivePeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [BandCapability] Value = [%u] ", pHddCtx->config->nBandCapability); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fEnableBeaconEarlyTermination] Value = [%u] ", pHddCtx->config->fEnableBeaconEarlyTermination); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [teleBcnWakeupEnable] Value = [%u] ", pHddCtx->config->teleBcnWakeupEn); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [transListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnTransListenInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [transLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnTransLiNumIdleBeacons); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxListenInterval] Value = [%u] ", pHddCtx->config->nTeleBcnMaxListenInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [maxLiNumIdleBeacons] Value = [%u] ", pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [bcnEarlyTermWakeInterval] Value = [%u] ", pHddCtx->config->bcnEarlyTermWakeInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApDataAvailPollInterVal] Value = [%u] ", pHddCtx->config->apDataAvailPollPeriodInMs); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableBypass11d] Value = [%u] ", pHddCtx->config->enableBypass11d); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSChnlScan] Value = [%u] ", pHddCtx->config->enableDFSChnlScan); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDFSPnoChnlScan] Value = [%u] ", pHddCtx->config->enable_dfs_pno_chnl_scan); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gReportMaxLinkSpeed] Value = [%u] ", pHddCtx->config->reportMaxLinkSpeed); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [thermalMitigationEnable] Value = [%u] ", pHddCtx->config->thermalMitigationEnable); #ifdef WLAN_FEATURE_11AC - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]", pHddCtx->config->vhtChannelWidth); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableFirstScan2GOnly] Value = [%u] ", pHddCtx->config->enableFirstScan2GOnly); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [skipDfsChnlInP2pSearch] Value = [%u] ", pHddCtx->config->skipDfsChnlInP2pSearch); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ", pHddCtx->config->ignoreDynamicDtimInP2pMode); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableRxSTBC] Value = [%u] ", pHddCtx->config->enableRxSTBC); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpwrImgTransition] Value = [%u] ", pHddCtx->config->enableLpwrImgTransition); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSSR] Value = [%u] ", pHddCtx->config->enableSSR); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableVhtFor24GHzBand] Value = [%u] ", pHddCtx->config->enableVhtFor24GHzBand); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gFlexConnectPowerFactor] Value = [%u] ", pHddCtx->config->flexConnectPowerFactor); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableIbssHeartBeatOffload] Value = [%u] ", pHddCtx->config->enableIbssHeartBeatOffload); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAntennaDiversity] Value = [%u] ", pHddCtx->config->antennaDiversity); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoLinkMonitorPeriod] Value = [%u]", pHddCtx->config->goLinkMonitorPeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApLinkMonitorPeriod] Value = [%u]", pHddCtx->config->apLinkMonitorPeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gGoKeepAlivePeriod] Value = [%u]", pHddCtx->config->goKeepAlivePeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gApKeepAlivePeriod]Value = [%u]", pHddCtx->config->apKeepAlivePeriod); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAmsduSupportInAMPDU] Value = [%u] ", pHddCtx->config->isAmsduSupportInAMPDU); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [nSelect5GHzMargin] Value = [%u] ", pHddCtx->config->nSelect5GHzMargin); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gCoalesingInIBSS] Value = [%u] ", pHddCtx->config->isCoalesingInIBSSAllowed); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssATIMWinSize] Value = [%u] ", pHddCtx->config->ibssATIMWinSize); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerSaveAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerSaveAllowed); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ", pHddCtx->config->isIbssPowerCollapseAllowed); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssAwakeOnTxRx] Value = [%u] ", pHddCtx->config->isIbssAwakeOnTxRx); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssInactivityTime] Value = [%u] ", pHddCtx->config->ibssInactivityCount); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssTxSpEndInactivityTime] Value = [%u] ", pHddCtx->config->ibssTxSpEndInactivityTime); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPsWarmupTime] Value = [%u] ", pHddCtx->config->ibssPsWarmupTime); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIbssPs1RxChainInAtim] Value = [%u] ", pHddCtx->config->ibssPs1RxChainInAtimEnable); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fDfsPhyerrFilterOffload] Value = [%u] ", pHddCtx->config->fDfsPhyerrFilterOffload); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnorePeerErpInfo] Value = [%u] ", pHddCtx->config->ignore_peer_erp_info); #ifdef IPA_OFFLOAD - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPAConfig] Value = [0x%x] ", pHddCtx->config->IpaConfig); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIPADescSize] Value = [%u] ", pHddCtx->config->IpaDescSize); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaHighBandwidthMbpsg] Value = [%u] ", pHddCtx->config->IpaHighBandwidthMbps); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaMediumBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaMediumBandwidthMbps); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [IpaLowBandwidthMbps] Value = [%u] ", pHddCtx->config->IpaLowBandwidthMbps); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableOverLapCh] Value = [%u] ", pHddCtx->config->gEnableOverLapCh); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadPeers] Value = [%u] ", pHddCtx->config->apMaxOffloadPeers); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxOffloadReorderBuffs] value = [%u] ", pHddCtx->config->apMaxOffloadReorderBuffs); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gAllowDFSChannelRoam] Value = [%u] ", pHddCtx->config->allowDFSChannelRoam); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gMaxConcurrentActiveSessions] Value = [%u] ", pHddCtx->config->gMaxConcurrentActiveSessions); #ifdef MSM_PLATFORM - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthHighThreshold] Value = [%u] ", pHddCtx->config->busBandwidthHighThreshold); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthMediumThreshold] Value = [%u] ", pHddCtx->config->busBandwidthMediumThreshold); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gBusBandwidthLowThreshold] Value = [%u] ", pHddCtx->config->busBandwidthLowThreshold); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gbusBandwidthComputeInterval] Value = [%u] ", pHddCtx->config->busBandwidthComputeInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdHigh] Value = [%u] ", pHddCtx->config->tcpDelackThresholdHigh); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gTcpDelAckThresholdLow] Value = [%u] ", pHddCtx->config->tcpDelackThresholdLow); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u] ", CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME, pHddCtx->config->tcp_tx_high_tput_thres); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gIgnoreCAC] Value = [%u] ", pHddCtx->config->ignoreCAC); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gSapPreferredChanLocation] Value = [%u] ", pHddCtx->config->gSapPreferredChanLocation); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDisableDfsJapanW53] Value = [%u] ", pHddCtx->config->gDisableDfsJapanW53); #ifdef FEATURE_GREEN_AP - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableGreenAp] Value = [%u] ", pHddCtx->config->enableGreenAP); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEenableEGAP] Value = [%u] ", pHddCtx->config->enable_egap); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPInactTime] Value = [%u] ", pHddCtx->config->egap_inact_time); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPWaitTime] Value = [%u] ", pHddCtx->config->egap_wait_time); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEGAPFeatures] Value = [%u] ", pHddCtx->config->egap_feature_flag); #endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [isRoamOffloadEnabled] Value = [%u]", pHddCtx->config->isRoamOffloadEnabled); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSifsBurst] Value = [%u]", pHddCtx->config->enableSifsBurst); #ifdef WLAN_FEATURE_LPSS - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableLpassSupport] Value = [%u] ", pHddCtx->config->enable_lpass_support); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSelfRecovery] Value = [%u]", pHddCtx->config->enableSelfRecovery); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableSapSuspend] Value = [%u]", pHddCtx->config->enableSapSuspend); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWgotoSuspend] Value = [%u]", pHddCtx->config->extWowGotoSuspend); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp1WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp1WakeupPinNumber); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWowApp2WakeupPinNumber] Value = [%u]", pHddCtx->config->extWowApp2WakeupPinNumber); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAInitPingInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMinPingInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAMaxPingInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]", pHddCtx->config->extWowApp2KAIncPingInterval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpSrcPort] Value = [%u]", pHddCtx->config->extWowApp2TcpSrcPort); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpDstPort] Value = [%u]", pHddCtx->config->extWowApp2TcpDstPort); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpTxTimeout); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]", pHddCtx->config->extWowApp2TcpRxTimeout); #endif #ifdef DHCP_SERVER_OFFLOAD - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerOffloadEnable] Value = [%u]", pHddCtx->config->enableDHCPServerOffload); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPMaxNumClients] Value = [%u]", pHddCtx->config->dhcpMaxNumClients); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gDHCPServerIP] Value = [%s]", pHddCtx->config->dhcpServerIP); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gEnableDumpCollect] Value = [%u]", pHddCtx->config->is_ramdump_enabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gP2PListenDeferInterval] Value = [%u]", pHddCtx->config->p2p_listen_defer_interval); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [is_ps_enabled] value = [%d]", pHddCtx->config->is_ps_enabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [policy_manager_enabled] value = [%d]", pHddCtx->config->policy_manager_enabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [tso_enable] value = [%d]", pHddCtx->config->tso_enable); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [LROEnable] value = [%d]", pHddCtx->config->lro_enable); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [active_mode_offload] value = [%d]", pHddCtx->config->active_mode_offload); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [gfine_time_meas_cap] value = [%u]", pHddCtx->config->fine_time_meas_cap); #ifdef WLAN_FEATURE_FASTPATH - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [fastpath_enable] Value = [%u]", pHddCtx->config->fastpath_enable); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [max_scan_count] value = [%d]", pHddCtx->config->max_scan_count); #ifdef FEATURE_NAPI_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_ENABLE_RX_THREAD, pHddCtx->config->enableRxThread); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%d]", CFG_NAPI_NAME, pHddCtx->config->napi_enable); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [%s] Value = [%u]", CFG_CE_CLASSIFY_ENABLE_NAME, pHddCtx->config->ce_classify_enabled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Name = [%s] value = [%u]", CFG_DUAL_MAC_FEATURE_DISABLE, pHddCtx->config->dual_mac_feature_disable); @@ -5259,13 +5259,13 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev); if (status) { - hddLog(CDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d", + hddLog(QDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d", __func__, status); qdf_status = QDF_STATUS_E_FAILURE; return qdf_status; } if (!fw || !fw->data || !fw->size) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__); qdf_status = QDF_STATUS_E_INVAL; goto config_exit; } @@ -5307,10 +5307,10 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) buffer = line; } if (i <= QDF_MAX_CONCURRENCY_PERSONA) { - hddLog(CDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided", + hddLog(QDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided", __func__, i); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: invalid number of Mac address provided, nMac = %d", __func__, i); qdf_status = QDF_STATUS_E_INVAL; @@ -5356,13 +5356,13 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) status = request_firmware(&fw, WLAN_INI_FILE, pHddCtx->parent_dev); if (status) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d", __func__, status); qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; } if (!fw || !fw->data || !fw->size) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: %s download failed", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: %s download failed", __func__, WLAN_INI_FILE); qdf_status = QDF_STATUS_E_FAILURE; goto config_exit; @@ -5373,7 +5373,7 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) buffer = (char *)cdf_mem_malloc(fw->size); if (NULL == buffer) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure")); release_firmware(fw); return QDF_STATUS_E_NOMEM; } @@ -6045,7 +6045,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) temp = (temp & 0xFFFC) | pConfig->vhtTxMCS; if (pConfig->enable2x2) temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "vhtRxMCS2x2 - %x temp - %u enable2x2 %d", pConfig->vhtRxMCS2x2, temp, pConfig->enable2x2); @@ -6381,13 +6381,13 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig = cdf_mem_malloc(sizeof(*smeConfig)); if (NULL == smeConfig) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); return QDF_STATUS_E_NOMEM; } cdf_mem_zero(smeConfig, sizeof(*smeConfig)); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d", __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled, pConfig->dot11Mode); @@ -6724,7 +6724,7 @@ QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf, bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx) { if (NULL == pHddCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: pHddCtx is NULL", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: pHddCtx is NULL", __func__); return -EINVAL; } #ifdef FEATURE_WLAN_OKC diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 960c073fa85f..bfa18537c8d1 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include #ifdef CONFIG_CNSS #include #endif @@ -61,7 +61,7 @@ #include "wlan_hdd_power.h" #include "wlan_hdd_trace.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_utils.h" #include "cds_sched.h" #include "wlan_hdd_scan.h" @@ -1434,12 +1434,12 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, status = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ACS_MAX, data, data_len, NULL); if (status) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); goto out; } if (!tb[QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Attr hw_mode failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Attr hw_mode failed")); goto out; } sap_config->acs_cfg.hw_mode = nla_get_u8( @@ -1978,7 +1978,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, pReqMsg->oui[1], pReqMsg->oui[2]); status = sme_set_scanning_mac_oui(pHddCtx->hHal, pReqMsg); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_set_scanning_mac_oui failed(err=%d)"), status); goto fail; } @@ -2218,8 +2218,8 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } req_id = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_REQ_ID]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Req Id (%d)"), req_id); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Cmd Type (%d)"), cmd_type); + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Req Id (%d)"), req_id); + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Cmd Type (%d)"), cmd_type); switch (cmd_type) { case QCA_WLAN_VENDOR_ATTR_ROAM_SUBCMD_SSID_WHITE_LIST: i = 0; @@ -2254,7 +2254,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, buf_len - 1); roam_params.ssid_allowed_list[i].length = buf_len - 1; - hddLog(CDF_TRACE_LEVEL_DEBUG, + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("SSID[%d]: %.*s,length = %d"), i, roam_params.ssid_allowed_list[i].length, roam_params.ssid_allowed_list[i].ssId, @@ -2265,7 +2265,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } } roam_params.num_ssid_allowed_list = i; - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of Allowed SSID %d"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of Allowed SSID %d"), roam_params.num_ssid_allowed_list); sme_update_roam_params(pHddCtx->hHal, session_id, roam_params, REASON_ROAM_SET_SSID_ALLOWED); @@ -2278,7 +2278,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.raise_rssi_thresh_5g = nla_get_s32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_THRESHOLD]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Boost Threshold (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Boost Threshold (%d)"), roam_params.raise_rssi_thresh_5g); /* Parse and fetch 5G Penalty Threshold */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_THRESHOLD]) { @@ -2287,7 +2287,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.drop_rssi_thresh_5g = nla_get_s32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_THRESHOLD]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Penalty Threshold (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Penalty Threshold (%d)"), roam_params.drop_rssi_thresh_5g); /* Parse and fetch 5G Boost Factor */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_FACTOR]) { @@ -2296,7 +2296,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.raise_factor_5g = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_FACTOR]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Boost Factor (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Boost Factor (%d)"), roam_params.raise_factor_5g); /* Parse and fetch 5G Penalty factor */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_FACTOR]) { @@ -2305,7 +2305,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.drop_factor_5g = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_FACTOR]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Penalty factor (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Penalty factor (%d)"), roam_params.drop_factor_5g); /* Parse and fetch 5G Max Boost */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_MAX_BOOST]) { @@ -2314,7 +2314,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.max_raise_rssi_5g = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_MAX_BOOST]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Max Boost (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Max Boost (%d)"), roam_params.max_raise_rssi_5g); /* Parse and fetch Rssi Diff */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_LAZY_ROAM_HISTERESYS]) { @@ -2323,7 +2323,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.rssi_diff = nla_get_s32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_LAZY_ROAM_HISTERESYS]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("RSSI Diff (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("RSSI Diff (%d)"), roam_params.rssi_diff); /* Parse and fetch Alert Rssi Threshold */ if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_ALERT_ROAM_RSSI_TRIGGER]) { @@ -2332,7 +2332,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.alert_rssi_threshold = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_ALERT_ROAM_RSSI_TRIGGER]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Alert RSSI Threshold (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Alert RSSI Threshold (%d)"), roam_params.alert_rssi_threshold); sme_update_roam_params(pHddCtx->hHal, session_id, roam_params, @@ -2346,7 +2346,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.good_rssi_roam = nla_get_s32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_ENABLE]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Activate Good Rssi Roam (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Activate Good Rssi Roam (%d)"), roam_params.good_rssi_roam); sme_update_roam_params(pHddCtx->hHal, session_id, roam_params, REASON_ROAM_GOOD_RSSI_CHANGED); @@ -2359,7 +2359,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.num_bssid_favored = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_NUM_BSSID]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of Preferred BSSID (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of Preferred BSSID (%d)"), roam_params.num_bssid_favored); i = 0; nla_for_each_nested(curr_attr, @@ -2389,7 +2389,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.bssid_favored_factor[i] = nla_get_u32( tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_RSSI_MODIFIER]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("BSSID Preference score (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("BSSID Preference score (%d)"), roam_params.bssid_favored_factor[i]); i++; } @@ -2404,7 +2404,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, } roam_params.num_bssid_avoid_list = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_NUM_BSSID]); - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of blacklist BSSID (%d)"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of blacklist BSSID (%d)"), roam_params.num_bssid_avoid_list); i = 0; nla_for_each_nested(curr_attr, @@ -2507,7 +2507,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, if (CHANNEL_STATE_DFS == cds_get_channel_state( ap_ctx->operatingChannel)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP running on DFS channel")); return true; } @@ -2603,7 +2603,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, } } else { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL(" the DFS flag has not changed")); ret_val = 0; } @@ -3001,7 +3001,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, ENTER(); if (wlan_hdd_validate_context(hdd_ctx_ptr)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid ")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid ")); return -EINVAL; } @@ -3019,7 +3019,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, GFP_KERNEL); if (!skb) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("cfg80211_vendor_event_alloc failed")); return -EINVAL; } @@ -3030,14 +3030,14 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, req_rsn_len, req_rsn_ie) || nla_put(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_RESP_IE, rsp_rsn_len, rsp_rsn_ie)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail")); goto nla_put_failure; } - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Auth Status = %d"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Auth Status = %d"), roam_info_ptr->synchAuthStatus); if (roam_info_ptr->synchAuthStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED) { - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Include Auth Params TLV's")); + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Include Auth Params TLV's")); if (nla_put_u8(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_AUTHORIZED, true)) { hdd_err("nla put fail"); @@ -3064,15 +3064,15 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, goto nla_put_failure; } } else { - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("No Auth Params TLV's")); + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("No Auth Params TLV's")); if (nla_put_u8(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_AUTHORIZED, false)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail")); goto nla_put_failure; } } - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Subnet Change Status = %d"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Subnet Change Status = %d"), roam_info_ptr->subnet_change_status); /* @@ -3085,7 +3085,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, if (nla_put_u8(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_SUBNET_STATUS, roam_info_ptr->subnet_change_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail")); goto nla_put_failure; } } @@ -4337,12 +4337,12 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len, qca_wlan_vendor_attr_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid attribute")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid attribute")); return -EINVAL; } if (!tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Attribute peerMac not provided for mode=%d"), adapter->device_mode); return -EINVAL; @@ -4350,7 +4350,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), QDF_MAC_ADDR_SIZE); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"), MAC_ADDR_ARRAY(peer_mac), adapter->device_mode); @@ -4361,7 +4361,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, eConnectionState_Associated) || !cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes, peer_mac, QDF_MAC_ADDR_SIZE)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Not Associated to mac "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; @@ -4385,7 +4385,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, } if (WLAN_MAX_STA_COUNT == sta_id) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("No active peer with mac="MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; @@ -4396,7 +4396,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, (WLAN_HDD_GET_AP_CTX_PTR(adapter))->operatingChannel); rate_flags = adapter->aStaInfo[sta_id].rate_flags; } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Not Associated! with mac "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer_mac)); return -EINVAL; @@ -4430,7 +4430,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, sizeof(u8) + sizeof(u8) + sizeof(u32) + NLMSG_HDRLEN); if (NULL == reply_skb) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("getLinkProperties: skb alloc failed")); return -EINVAL; } @@ -4444,7 +4444,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, nla_put_u32(reply_skb, QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_FREQ, freq)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla_put failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla_put failed")); kfree_skb(reply_skb); return -EINVAL; } @@ -5517,7 +5517,7 @@ int wlan_hdd_cfg80211_register(struct wiphy *wiphy) /* Register our wiphy dev with cfg80211 */ if (0 > wiphy_register(wiphy)) { /* print error */ - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: wiphy register failed", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: wiphy register failed", __func__); return -EIO; } @@ -5689,10 +5689,10 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, pKeyPtr = setKey.Key; memcpy(pKeyPtr, key, key_Len); - hddLog(CDF_TRACE_LEVEL_INFO, "%s: WAPI KEY LENGTH:0x%04x", + hddLog(QDF_TRACE_LEVEL_INFO, "%s: WAPI KEY LENGTH:0x%04x", __func__, key_Len); for (n = 0; n < key_Len; n++) - hddLog(CDF_TRACE_LEVEL_INFO, "%s WAPI KEY Data[%d]:%02x ", + hddLog(QDF_TRACE_LEVEL_INFO, "%s WAPI KEY Data[%d]:%02x ", __func__, n, setKey.Key[n]); pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_SETTING_KEY; @@ -5701,7 +5701,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, pAdapter->sessionId, &setKey, &roamId); } if (status != 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, status); pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; @@ -5721,7 +5721,7 @@ uint8_t *wlan_hdd_cfg80211_get_ie_ptr(const uint8_t *ies_ptr, int length, elem_len = ptr[1]; left -= 2; if (elem_len > left) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid IEs eid = %d elem_len=%d left=%d"), eid, elem_len, left); return NULL; @@ -5765,14 +5765,14 @@ QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, } } if (fValidChannel != true) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); return QDF_STATUS_E_FAILURE; } } else { if (0 != sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, valid_ch, &num_ch)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: failed to get valid channel list", __func__); return QDF_STATUS_E_FAILURE; @@ -5784,7 +5784,7 @@ QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, } if (indx >= num_ch) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel [%d]", __func__, channel); return QDF_STATUS_E_FAILURE; } @@ -5804,7 +5804,7 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) uint32_t temp; pDhcpSrvInfo = cdf_mem_malloc(sizeof(*pDhcpSrvInfo)); if (NULL == pDhcpSrvInfo) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: could not allocate tDhcpSrvOffloadInfo!", __func__); return; } @@ -5815,19 +5815,19 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) hdd_string_to_u8_array(pHddCtx->config->dhcpServerIP, srv_ip, &numEntries, IPADDR_NUM_ENTRIES); if (numEntries != IPADDR_NUM_ENTRIES) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: incorrect IP address (%s) assigned for DHCP server!", __func__, pHddCtx->config->dhcpServerIP); goto end; } if ((srv_ip[0] >= 224) && (srv_ip[0] <= 239)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: invalid IP address (%s)! It could NOT be multicast IP address!", __func__, pHddCtx->config->dhcpServerIP); goto end; } if (srv_ip[IPADDR_NUM_ENTRIES - 1] >= 100) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: invalid IP address (%s)! The last field must be less than 100!", __func__, pHddCtx->config->dhcpServerIP); goto end; @@ -5838,11 +5838,11 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) } if (QDF_STATUS_SUCCESS != sme_set_dhcp_srv_offload(pHddCtx->hHal, pDhcpSrvInfo)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_setDHCPSrvOffload fail!", __func__); goto end; } - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "%s: enable DHCP Server offload successfully!", __func__); end: cdf_mem_free(pDhcpSrvInfo); @@ -5866,7 +5866,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_BSS, pAdapter->sessionId, params->ap_isolate)); hddLog(LOG1, FL("Device_mode %s(%d), ap_isolate = %d"), @@ -6026,17 +6026,17 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, if (0 != status) return status; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_IFACE, pAdapter->sessionId, type)); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Device_mode = %d, IFTYPE = 0x%x"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Device_mode = %d, IFTYPE = 0x%x"), pAdapter->device_mode, type); if (!cds_allow_concurrency( wlan_hdd_convert_nl_iftype_to_hdd_type(type), 0, HW_MODE_20_MHZ)) { - hddLog(CDF_TRACE_LEVEL_DEBUG, + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("This concurrency combination is not allowed")); return -EINVAL; } @@ -6083,7 +6083,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: { - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Setting interface Type to %s"), (type == NL80211_IFTYPE_AP) ? "SoftAP" : @@ -6316,7 +6316,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CHANGE_STATION, pAdapter->sessionId, params->listen_interval)); @@ -6338,7 +6338,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, ol_txrx_peer_state_auth); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL ("Not able to change TL state to AUTHENTICATED")); return -EINVAL; @@ -6358,7 +6358,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, * are an incremental of 1 else an incremental of 4 till the number * of channels. */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: params->supported_channels_len: %d", __func__, params->supported_channels_len); if (0 != params->supported_channels_len) { @@ -6385,8 +6385,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, no_of_channels = params->supported_channels[i + 1]; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d, wifi_chan_index: %d, no_of_channels: %d", __func__, i, j, k, j, StaParams. @@ -6409,8 +6409,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, } else { continue; } - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d", __func__, i, j, k, j + 1, @@ -6421,12 +6421,12 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, } } num_unique_channels = j + 1; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: Unique Channel List", __func__); for (i = 0; i < num_unique_channels; i++) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: StaParams.supported_channels[%d]: %d,", __func__, i, StaParams. @@ -6436,8 +6436,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, num_unique_channels = MAX_CHANNEL; StaParams.supported_channels_len = num_unique_channels; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: After removing duplcates StaParams.supported_channels_len: %d", __func__, StaParams.supported_channels_len); @@ -6480,14 +6480,14 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, cdf_mem_copy(StaParams.supported_rates, params->supported_rates, StaParams.supported_rates_len); - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "Supported Rates with Length %d", StaParams.supported_rates_len); for (i = 0; i < StaParams.supported_rates_len; i++) - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "[%d]: %0x", i, StaParams.supported_rates[i]); } @@ -6515,7 +6515,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, isBufSta, isOffChannelSupported); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL ("wlan_hdd_tdls_set_peer_caps failed!")); return -EINVAL; @@ -6525,7 +6525,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, wlan_hdd_tdls_add_station(wiphy, dev, mac, 1, &StaParams); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("wlan_hdd_tdls_add_station failed!")); return -EINVAL; } @@ -6599,7 +6599,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_KEY, pAdapter->sessionId, params->key_len)); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); @@ -6613,20 +6613,20 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, pAdapter->device_mode); if (CSR_MAX_NUM_KEY <= key_index) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid key index %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid key index %d", __func__, key_index); return -EINVAL; } if (CSR_MAX_KEY_LEN < params->key_len) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid key length %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid key length %d", __func__, params->key_len); return -EINVAL; } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: called with key index = %d & key length %d", __func__, key_index, params->key_len); @@ -6712,23 +6712,23 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, #endif default: - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: unsupported cipher type %u", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: unsupported cipher type %u", __func__, params->cipher); return -EOPNOTSUPP; } - hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: encryption type %d", + hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: encryption type %d", __func__, setKey.encType); if (!pairwise) { /* set group key */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s- %d: setting Broadcast key", __func__, __LINE__); setKey.keyDirection = eSIR_RX_ONLY; qdf_set_macaddr_broadcast(&setKey.peerMac); } else { /* set pairwise key */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s- %d: setting pairwise key", __func__, __LINE__); setKey.keyDirection = eSIR_TX_RX; cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); @@ -6736,7 +6736,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) { /* if a key is already installed, block all subsequent ones */ if (pAdapter->sessionCtx.station.ibss_enc_key_installed) { - hddLog(CDF_TRACE_LEVEL_INFO_MED, + hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: IBSS key installed already", __func__); return 0; } @@ -6747,7 +6747,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, pAdapter->sessionId, &setKey, &roamId); if (0 != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_roam_set_key failed, returned %d", __func__, status); return -EINVAL; @@ -6772,8 +6772,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, status = wlansap_set_key_sta(p_cds_context, &setKey); #endif if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "[%4d] wlansap_set_key_sta returned ERROR status= %d", __LINE__, status); } @@ -6799,8 +6799,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (!pairwise) { /* set group key */ if (pHddStaCtx->roam_info.deferKeyComplete) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s- %d: Perform Set key Complete", __func__, __LINE__); hdd_perform_roam_set_key_complete(pAdapter); @@ -6829,11 +6829,11 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_INFO_MED, + hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; } @@ -6843,7 +6843,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, pAdapter->sessionId, &setKey, &roamId); if (0 != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_roam_set_key failed, returned %d", __func__, status); pHddStaCtx->roam_info.roamingState = @@ -6879,7 +6879,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, &roamId); if (0 != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_roam_set_key failed for group key (IBSS), returned %d", __func__, status); pHddStaCtx->roam_info.roamingState = @@ -6938,7 +6938,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy, memset(¶ms, 0, sizeof(params)); if (CSR_MAX_NUM_KEY <= key_index) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("invalid key index %d"), + hddLog(QDF_TRACE_LEVEL_ERROR, FL("invalid key index %d"), key_index); return -EINVAL; } @@ -6971,7 +6971,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy, break; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_KEY, pAdapter->sessionId, params.cipher)); @@ -7083,7 +7083,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, pAdapter->sessionId, key_index)); @@ -7494,7 +7494,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy, ENTER(); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_UPDATE_BSS, NO_SESSION, pAdapter->sessionId)); @@ -8314,7 +8314,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE. Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } /* WSC IE is saved to Additional IE ; it should be accumulated to handle WPS IE + P2P IE */ @@ -8348,7 +8348,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } /* P2P IE is saved to Additional IE ; it should be accumulated to handle WPS IE + P2P IE */ @@ -8376,7 +8376,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } /* WFD IE is saved to Additional IE ; it should @@ -8404,7 +8404,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } memcpy(pWextState->assocAddIE.addIEdata + @@ -8428,7 +8428,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } memcpy(pWextState->assocAddIE.addIEdata + @@ -8449,7 +8449,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, if (SIR_MAC_MAX_ADD_IE_LENGTH < (pWextState->assocAddIE.length + eLen)) { hdd_err("Cannot accommodate assocAddIE Need bigger buffer space"); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } @@ -8493,7 +8493,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, if (SIR_MAC_MAX_ADD_IE_LENGTH < (pWextState->assocAddIE.length + eLen)) { hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -ENOMEM; } memcpy(pWextState->assocAddIE.addIEdata + @@ -8522,7 +8522,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, } else { hddLog(LOGE, FL("Invalid akmSuite count")); - CDF_ASSERT(0); + QDF_ASSERT(0); return -EINVAL; } @@ -8575,7 +8575,7 @@ static bool hdd_is_wpaie_present(const uint8_t *ie, uint8_t ie_len) eLen = *ie++; remLen -= 2; if (eLen > remLen) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: IE length is wrong %d", __func__, eLen); return false; } @@ -8822,7 +8822,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CONNECT, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), @@ -9085,7 +9085,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DISCONNECT, pAdapter->sessionId, reason)); hddLog(LOG1, FL("Device_mode %s(%d) reason code(%d)"), @@ -9319,7 +9319,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_JOIN_IBSS, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), @@ -9529,7 +9529,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_LEAVE_IBSS, pAdapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE)); @@ -9626,7 +9626,7 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS, NO_SESSION, wiphy->rts_threshold)); status = wlan_hdd_validate_context(pHddCtx); @@ -9842,7 +9842,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DEL_STA, pAdapter->sessionId, pAdapter->device_mode)); @@ -10062,7 +10062,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_ADD_STA, pAdapter->sessionId, params->listen_interval)); @@ -10169,7 +10169,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId, &pmk_id, 1, false); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_PMKSA, pAdapter->sessionId, result)); @@ -10232,7 +10232,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, return -EINVAL; } - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Deleting PMKSA for " MAC_ADDRESS_STR), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Deleting PMKSA for " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pmksa->bssid)); status = wlan_hdd_validate_context(pHddCtx); @@ -10242,7 +10242,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DEL_PMKSA, pAdapter->sessionId, 0)); /* Delete the PMKID CSR cache */ @@ -10373,7 +10373,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, pAdapter->sessionId, pHddStaCtx->conn_info.connState)); /* Added for debug on reception of Re-assoc Req. */ @@ -10504,7 +10504,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA, pAdapter->sessionId, pAdapter->device_mode)); @@ -10638,7 +10638,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, hddLog(LOGE, "acl policy: = %d no acl entries = %d", params->acl_policy, params->n_acl_entries); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, pAdapter->sessionId, pAdapter->device_mode)); if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { @@ -10824,7 +10824,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TESTMODE, NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD]))); switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) { @@ -10945,7 +10945,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) hdd_context_t *hdd_ctx; if (!buf || !buf_len) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: buf or buf_len invalid, buf = %p buf_len = %zu", __func__, buf, buf_len); return; @@ -10953,7 +10953,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: hdd context invalid", __func__); return; } @@ -10961,7 +10961,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) skb = cfg80211_testmode_alloc_event_skb(hdd_ctx->wiphy, buf_len, GFP_KERNEL); if (!skb) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: failed to allocate testmode rx skb!", __func__); return; } @@ -10977,7 +10977,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len) nla_put_failure: kfree_skb(skb); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: nla_put failed on testmode rx skb!", __func__); } #endif diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index 69d1b13ee5a6..1a9354eab607 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -36,7 +36,7 @@ #include "cds_concurrency.h" #include "wlan_hdd_conc_ut.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_utils.h" #include "cds_reg_service.h" #include "wma_types.h" diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index eb56cb09e540..80a18ddf7f6a 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -69,7 +69,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -83,7 +83,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, if (!sme_is_feature_supported_by_fw(WOW)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Wake-on-Wireless feature is not supported in firmware!", __func__); @@ -91,7 +91,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, } if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE); @@ -114,7 +114,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, /* Disable wow */ if (!wow_enable) { if (!hdd_exit_wowl(pAdapter)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: hdd_exit_wowl failed!", __func__); return -EFAULT; @@ -142,7 +142,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, wow_pbm = 1; if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: hdd_enter_wowl failed!", __func__); return -EFAULT; @@ -199,7 +199,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, ENTER(); if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -212,7 +212,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WOW)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Wake-on-Wireless feature is not supported in firmware!", __func__); @@ -220,7 +220,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, } if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN); @@ -328,7 +328,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); @@ -341,7 +341,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Periodic Tx Pattern Offload feature is not supported in firmware!", __func__); return -EINVAL; @@ -351,7 +351,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, if (count <= MAX_USER_COMMAND_SIZE_FRAME) cmd = cdf_mem_malloc(count + 1); else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", __func__, MAX_USER_COMMAND_SIZE_FRAME); @@ -359,7 +359,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, } if (!cmd) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation for cmd failed!")); return -ENOMEM; } @@ -379,7 +379,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, goto failure; if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Pattern index %d is not in the range (0 ~ %d).", __func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1); @@ -398,7 +398,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, delPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn)); if (!delPeriodicTxPtrnParams) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); cdf_mem_free(cmd); return -ENOMEM; @@ -412,7 +412,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_del_periodic_tx_ptrn(pHddCtx->hHal, delPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_del_periodic_tx_ptrn() failed!", __func__); @@ -432,7 +432,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, hdd_info("device mode %d", pAdapter->device_mode); if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) && (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Not in Connected state!", __func__); goto failure; } @@ -448,7 +448,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Since the pattern is a hex string, 2 characters represent 1 byte. */ if (pattern_len % 2) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern!", __func__); goto failure; @@ -456,7 +456,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, pattern_len >>= 1; if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Not an 802.3 frame!", __func__); goto failure; @@ -464,7 +464,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn)); if (!addPeriodicTxPtrnParams) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); cdf_mem_free(cmd); return -ENOMEM; @@ -490,7 +490,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_add_periodic_tx_ptrn(pHddCtx->hHal, addPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_add_periodic_tx_ptrn() failed!", __func__); cdf_mem_free(addPeriodicTxPtrnParams); @@ -548,7 +548,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file) adapter = (hdd_adapter_t *)file->private_data; if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: Invalid adapter or adapter has invalid magic.", __func__); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 1face696b292..8b674b9358a9 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -581,10 +581,10 @@ static int __wlan_hdd_bus_suspend(pm_message_t state) resume_wma: status = wma_bus_resume(); - CDF_BUG(!status); + QDF_BUG(!status); resume_oltxrx: status = ol_txrx_bus_resume(); - CDF_BUG(!status); + QDF_BUG(!status); done: hdd_err("suspend done, status = %d", err); return err; @@ -636,13 +636,13 @@ static int __wlan_hdd_bus_resume(void) } status = hif_bus_resume(hif_ctx); - CDF_BUG(!status); + QDF_BUG(!status); status = wma_bus_resume(); - CDF_BUG(!status); + QDF_BUG(!status); status = ol_txrx_bus_resume(); - CDF_BUG(!status); + QDF_BUG(!status); hdd_info("resume done"); return status; @@ -710,11 +710,11 @@ static int __wlan_hdd_runtime_suspend(void) return status; resume_hif: - CDF_BUG(!hif_runtime_resume(hif_ctx)); + QDF_BUG(!hif_runtime_resume(hif_ctx)); resume_wma: - CDF_BUG(!wma_runtime_resume()); + QDF_BUG(!wma_runtime_resume()); resume_htc: - CDF_BUG(!htc_runtime_resume()); + QDF_BUG(!htc_runtime_resume()); process_failure: hif_process_runtime_suspend_failure(hif_ctx); return status; @@ -753,10 +753,10 @@ static int __wlan_hdd_runtime_resume(void) void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); hif_pre_runtime_resume(hif_ctx); - CDF_BUG(!cnss_auto_resume()); - CDF_BUG(!hif_runtime_resume(hif_ctx)); - CDF_BUG(!wma_runtime_resume()); - CDF_BUG(!htc_runtime_resume()); + QDF_BUG(!cnss_auto_resume()); + QDF_BUG(!hif_runtime_resume(hif_ctx)); + QDF_BUG(!wma_runtime_resume()); + QDF_BUG(!htc_runtime_resume()); hif_process_runtime_resume_success(hif_ctx); return 0; } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 1125d4d502a4..7145e2e58cd8 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -101,7 +101,7 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len) if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &ftmMsg)) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL", __func__); return QDF_STATUS_E_FAILURE; @@ -130,7 +130,7 @@ static void wlan_hdd_ftm_update_tgt_cfg(void *context, void *param) if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) { hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC passed from target, using MAC from ini file" MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(hdd_ctx->config->intfMacAddr[0].bytes)); @@ -184,29 +184,29 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #endif hdd_context_t *hdd_ctx; - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); if (NULL == gp_cds_context) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* Initialize the probe event */ if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Unable to init probeEvent", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Unable to init wmaCompleteEvent", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_probe_event; } @@ -216,10 +216,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to initialize CDS free message queue %d", __func__, vStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_wma_complete_event; } @@ -237,24 +237,24 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to open CDS Scheduler %d", __func__, vStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_msg_queue; } #if defined(QCA_WIFI_FTM) /* Initialize BMI and Download firmware */ pHifContext = cds_get_context(QDF_MODULE_ID_HIF); if (!pHifContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: failed to get HIF context", __func__); goto err_sched_close; } ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); if (bmi_download_firmware(ol_ctx)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); goto err_bmi_close; } @@ -268,13 +268,13 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, gp_cds_context->htc_ctx = htc_create(pHifContext, &htcInfo, cdf_ctx); if (!gp_cds_context->htc_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); goto err_bmi_close; } if (bmi_done(ol_ctx)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_htc_close; } @@ -287,9 +287,9 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext); if ((NULL == hdd_ctx) || (NULL == hdd_ctx->config)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Hdd Context is Null", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_htc_close; } @@ -302,10 +302,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to open WMA module %d", __func__, vStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_htc_close; } #if defined(QCA_WIFI_FTM) @@ -313,12 +313,12 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, pHtcContext = cds_get_context(QDF_MODULE_ID_HTC); if (!pHtcContext) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: failed to get HTC context", __func__); goto err_wma_close; } if (htc_wait_target(pHtcContext)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto err_wma_close; } @@ -338,9 +338,9 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, if (eSIR_SUCCESS != sirStatus) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to open MAC %d", __func__, sirStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_wma_close; } #ifndef QCA_WIFI_FTM @@ -348,7 +348,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_open(gp_cds_context->pMACContext); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { /* Critical Error ... Cannot proceed further */ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to open SME %d", __func__, vStatus); goto err_mac_close; } @@ -356,10 +356,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, vStatus = sme_init_chan_list(gp_cds_context->pMACContext, hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to init sme channel list", __func__); } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "%s: CDS successfully Opened", __func__); return QDF_STATUS_SUCCESS; } @@ -417,17 +417,17 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) #ifndef QCA_WIFI_FTM qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close SME %d", __func__, qdf_status); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #endif qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close MAC %d", __func__, qdf_status); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } ((p_cds_contextType) cds_context)->pMACContext = NULL; @@ -435,9 +435,9 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = wma_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close WMA %d", __func__, qdf_status); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #if defined(QCA_WIFI_FTM) if (gp_cds_context->htc_ctx) { @@ -447,9 +447,9 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) } qdf_status = wma_wmi_service_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close wma_wmi_service", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } hif_disable_isr(gp_cds_context->pHIFContext); @@ -459,18 +459,18 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy ProbeEvent %d", __func__, qdf_status); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to destroy wmaCompleteEvent %d", __func__, qdf_status); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } return QDF_STATUS_SUCCESS; @@ -496,10 +496,10 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) cds_get_global_context(); #endif - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart"); + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "cds prestart"); if (NULL == p_cds_context->pWMAContext) { - CDF_ASSERT(0); - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_ASSERT(0); + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "%s: WMA NULL context", __func__); return QDF_STATUS_E_FAILURE; } @@ -510,9 +510,9 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) /*call WMA pre start */ vStatus = wma_pre_start(p_cds_context); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Failed to WMA prestart "); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -521,23 +521,23 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) HDD_FTM_WMA_PRE_START_TIMEOUT); if (qdf_status != QDF_STATUS_SUCCESS) { if (qdf_status == QDF_STATUS_E_TIMEOUT) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred before WMA complete", __func__); } else { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: wma_pre_start reporting other error", __func__); } - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } #if defined(QCA_WIFI_FTM) vStatus = htc_start(gp_cds_context->htc_ctx); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL, "Failed to Start HTC"); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } wma_wait_for_ready_event(gp_cds_context->pWMAContext); @@ -560,22 +560,22 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) QDF_STATUS vStatus = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = NULL; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Opening CDS", __func__); p_cds_context = cds_get_global_context(); if (NULL == p_cds_context) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); goto err_cdf_status_failure; } vStatus = wlan_ftm_cds_open(p_cds_context, 0); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_cdf_status_failure; } @@ -588,7 +588,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) (tHalHandle) cds_get_context(QDF_MODULE_ID_SME); if (NULL == hdd_ctx->hHal) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: HAL context is null", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: HAL context is null", __func__); goto err_ftm_close; } @@ -614,7 +614,7 @@ static int hdd_ftm_service_registration(hdd_context_t *hdd_ctx) adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_FTM, "wlan%d", wlan_hdd_get_intf_addr(hdd_ctx), false); if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", __func__); goto err_adapter_open_failure; } @@ -661,13 +661,13 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM); ENTER(); if (adapter == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s:adapter is NULL", __func__); return -ENXIO; } if (WLAN_FTM_STARTED == hdd_ctx->ftm.ftm_state) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: Ftm has been started. stopping ftm", __func__); wlan_ftm_stop(hdd_ctx); } @@ -676,9 +676,9 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) qdf_status = cds_sched_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to close CDS Scheduler", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* Close CDS */ wlan_ftm_cds_close(cds_context); @@ -753,25 +753,25 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) return 0; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Starting CLD SW", __func__); /* We support only one instance for now ... */ if (p_cds_context == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: mismatch in context", __func__); goto err_status_failure; } if (p_cds_context->pMACContext == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: MAC NULL context", __func__); goto err_status_failure; } /* Vos preStart is calling */ if (!QDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed", __func__); goto err_status_failure; } @@ -780,16 +780,16 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx) vStatus = wma_start(p_cds_context); if (vStatus != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to start WMA", __func__); goto err_status_failure; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: MAC correctly started", __func__); if (hdd_ftm_service_registration(hdd_ctx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: failed", __func__); goto err_ftm_service_reg; } @@ -1022,7 +1022,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) cdf_mem_malloc(sizeof(*cmd_data)); if (!cmd_data) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data")); return QDF_STATUS_E_NOMEM; } @@ -1030,7 +1030,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) cmd_data->data = cdf_mem_malloc(len); if (!cmd_data->data) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data buffer")); cdf_mem_free(cmd_data); return QDF_STATUS_E_NOMEM; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index eae9e175a609..bab97b7775ab 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -71,7 +71,7 @@ #endif #include "wlan_hdd_trace.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "wlan_hdd_cfg.h" #include "cds_concurrency.h" #include "wlan_hdd_green_ap.h" @@ -219,7 +219,7 @@ static int __hdd_hostapd_open(struct net_device *dev) ENTER(); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); if (cds_is_load_or_unload_in_progress()) { @@ -589,7 +589,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter, hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter); if (true == cds_is_sta_connection_pending()) { - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ISSUE_JOIN_REQ, sta_adapter->sessionId, roam_id)); if (QDF_STATUS_SUCCESS != @@ -1517,7 +1517,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOGE, FL("Failed to init AP inactivity timer")); } else - CDF_ASSERT + QDF_ASSERT (qdf_mc_timer_get_current_state (&pHddApCtx-> hdd_ap_inactivity_timer) == @@ -2207,7 +2207,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev, hdd_info("WE_DUMP_DP_TRACE: %d %d", value[1], value[2]); if (value[1] == DUMP_DP_TRACE) - cdf_dp_trace_dump_all(value[2]); + qdf_dp_trace_dump_all(value[2]); break; case QCSAP_ENABLE_FW_PROFILE: hddLog(LOG1, "QCSAP_ENABLE_FW_PROFILE: %d %d", @@ -3020,7 +3020,7 @@ static __iw_softap_getparam(struct net_device *dev, case QCSAP_PARAM_GET_WLAN_DBG: { - cdf_trace_display(); + qdf_trace_display(); *value = 0; break; } @@ -3248,7 +3248,7 @@ int __iw_softap_modify_acl(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Vos Context is NULL", __func__); return -EINVAL; } @@ -3557,7 +3557,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -3780,7 +3780,7 @@ int __iw_get_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: vos context is not valid ", __func__); return -EINVAL; } @@ -4009,7 +4009,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: pVosContext is NULL", __func__); return -EINVAL; } @@ -4455,7 +4455,7 @@ __iw_softap_setwpsie(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -4468,7 +4468,7 @@ __iw_softap_setwpsie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid ", __func__); return -EINVAL; } @@ -5067,7 +5067,7 @@ __iw_softap_stopbss(struct net_device *dev, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("wait for single_event failed!!")); - CDF_ASSERT(0); + QDF_ASSERT(0); } } clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags); @@ -5139,7 +5139,7 @@ QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf, ENTER(); if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -5254,7 +5254,7 @@ static int __iw_set_ap_genie(struct net_device *dev, #ifndef WLAN_FEATURE_MBSSID cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: CDF Context is NULL", __func__); return -EINVAL; } @@ -6046,7 +6046,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("ERROR: Hostapd HDD stop bss event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); @@ -6352,7 +6352,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, } pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_CHANNEL, pAdapter->sessionId, channel_type)); @@ -7812,7 +7812,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, #else wlansap_stop_bss(p_cds_context); #endif - CDF_ASSERT(0); + QDF_ASSERT(0); return -EINVAL; } /* Succesfully started Bss update the state bit. */ @@ -7877,7 +7877,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_STOP_AP, pAdapter->sessionId, pAdapter->device_mode)); @@ -7918,7 +7918,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (!rc) { hddLog(LOGE, FL("Timeout occurred while waiting for abortscan")); - CDF_ASSERT(pScanInfo->mScanPending); + QDF_ASSERT(pScanInfo->mScanPending); } } } @@ -7976,7 +7976,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("HDD cdf wait for single_event failed!!")); - CDF_ASSERT(0); + QDF_ASSERT(0); } } clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags); @@ -8105,7 +8105,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_START_AP, pAdapter->sessionId, params->beacon_interval)); if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { @@ -8263,7 +8263,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_CHANGE_BEACON, pAdapter->sessionId, pAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 626a19ebfb08..27f74c7f3d70 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -127,7 +127,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, hdd_adapter_t *adapter = NULL; if (NULL == context) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, context [%p]", __func__, context); return; } @@ -149,7 +149,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, * nothing we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, adapter [%p] magic [%08x]", __func__, adapter, stats_context->magic); return; @@ -192,7 +192,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx = NULL; if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: adapter is NULL", __func__); return QDF_STATUS_E_FAULT; } @@ -211,7 +211,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, hdd_sta_ctx->conn_info.bssId, &context, hdd_ctx->pcds_context, tid); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); vstatus = QDF_STATUS_E_FAULT; } else { @@ -219,7 +219,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, rc = wait_for_completion_timeout(&context.completion, msecs_to_jiffies(WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME timed out while retrieving statistics", __func__); vstatus = QDF_STATUS_E_TIMEOUT; @@ -279,7 +279,7 @@ static void hdd_get_band_helper(hdd_context_t *hdd_ctx, int *pBand) break; default: - hddLog(CDF_TRACE_LEVEL_WARN, "%s: Invalid Band %d", __func__, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid Band %d", __func__, band); *pBand = -1; break; @@ -548,7 +548,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, /* if not associated, no need to proceed with reassoc */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__); ret = -EINVAL; goto exit; } @@ -568,7 +568,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, /* Check channel number is a valid channel number */ if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, channel)) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d", __func__, channel); ret = -EINVAL; goto exit; @@ -614,7 +614,7 @@ static int hdd_parse_reassoc_v1(hdd_adapter_t *adapter, const char *command) ret = hdd_parse_reassoc_command_v1_data(command, bssid, &channel); if (ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse reassoc command data", __func__); } else { ret = hdd_reassoc(adapter, bssid, channel); @@ -736,7 +736,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, /* if not associated, no need to send action frame */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__); ret = -EINVAL; goto exit; } @@ -765,7 +765,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, if (channel != 0) { if (channel != pHddStaCtx->conn_info.operationChannel) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: channel(%d) is different from operating channel(%d)", __func__, channel, pHddStaCtx->conn_info. @@ -795,7 +795,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, } } if (chan.center_freq == 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s:invalid channel number %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s:invalid channel number %d", __func__, channel); ret = -EINVAL; goto exit; @@ -874,7 +874,7 @@ hdd_parse_sendactionframe_v1(hdd_adapter_t *adapter, const char *command) &dwell_time, &payload, &payload_len); if (ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse send action frame data", __func__); } else { ret = hdd_sendactionframe(adapter, bssid, channel, @@ -1028,7 +1028,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, *pNumChannels = tempInt; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Number of channels are: %d", *pNumChannels); for (j = 0; j < (*pNumChannels); j++) { @@ -1076,7 +1076,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList, } pChannelList[j] = tempInt; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Channel %d added to preferred channel list", pChannelList[j]); } @@ -1113,18 +1113,18 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, ret = hdd_parse_channellist(command, channel_list, &num_chan); if (ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; @@ -1136,7 +1136,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1182,21 +1182,21 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, num_chan = *value++; if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN); ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL, adapter->sessionId, num_chan)); for (i = 0; i < num_chan; i++) { channel = *value++; if (channel > WNI_CFG_CURRENT_CHANNEL_STAMAX) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: index %d invalid channel %d", __func__, i, channel); ret = -EINVAL; @@ -1209,7 +1209,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter, adapter->sessionId, channel_list, num_chan); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); ret = -EINVAL; @@ -1326,7 +1326,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->diag_token = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "diag token %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "diag token %d", pPlmRequest->diag_token); cmdPtr = strpbrk(cmdPtr, " "); @@ -1347,10 +1347,10 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->meas_token = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "meas token %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "meas token %d", pPlmRequest->meas_token); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "PLM req %s", pPlmRequest->enable ? "START" : "STOP"); if (pPlmRequest->enable) { @@ -1376,7 +1376,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->numBursts = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "num burst %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "num burst %d", pPlmRequest->numBursts); cmdPtr = strpbrk(cmdPtr, " "); @@ -1400,7 +1400,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->burstInt = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "burst Int %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "burst Int %d", pPlmRequest->burstInt); cmdPtr = strpbrk(cmdPtr, " "); @@ -1424,7 +1424,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->measDuration = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "measDur %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "measDur %d", pPlmRequest->measDuration); cmdPtr = strpbrk(cmdPtr, " "); @@ -1448,7 +1448,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->burstLen = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "burstLen %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "burstLen %d", pPlmRequest->burstLen); cmdPtr = strpbrk(cmdPtr, " "); @@ -1472,7 +1472,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->desiredTxPwr = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, + hddLog(QDF_TRACE_LEVEL_DEBUG, "desiredTxPwr %d", pPlmRequest->desiredTxPwr); for (count = 0; count < QDF_MAC_ADDR_SIZE; count++) { @@ -1522,7 +1522,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->plmNumCh = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, "numch %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, "numch %d", pPlmRequest->plmNumCh); /* Channel numbers */ @@ -1549,7 +1549,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest) return QDF_STATUS_E_FAILURE; pPlmRequest->plmChList[count] = content; - hddLog(CDF_TRACE_LEVEL_DEBUG, " ch- %d", + hddLog(QDF_TRACE_LEVEL_DEBUG, " ch- %d", pPlmRequest->plmChList[count]); } } @@ -1566,7 +1566,7 @@ static void wlan_hdd_ready_to_extwow(void *callbackContext, bool is_success) rc = wlan_hdd_validate_context(hdd_ctx); if (0 != rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return; } hdd_ctx->ext_wow_should_suspend = is_success; @@ -1590,7 +1590,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, &wlan_hdd_ready_to_extwow, hdd_ctx); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_ext_wow returned failure %d"), cdf_ret_status); return -EPERM; @@ -1599,7 +1599,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, rc = wait_for_completion_timeout(&hdd_ctx->ready_to_extwow, msecs_to_jiffies(WLAN_WAIT_TIME_READY_TO_EXTWOW)); if (!rc) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Failed to get ready to extwow", __func__); return -EPERM; } @@ -1609,20 +1609,20 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, pm_message_t state; state.event = PM_EVENT_SUSPEND; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received ready to ExtWoW. Going to suspend", __func__); rc = wlan_hdd_cfg80211_suspend_wlan(hdd_ctx->wiphy, NULL); if (rc < 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_cfg80211_suspend_wlan failed, error = %d", __func__, rc); return rc; } cdf_ret_status = wlan_hdd_bus_suspend(state); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", __func__, cdf_ret_status); wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy); @@ -1630,7 +1630,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, } } } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Received ready to ExtWoW failure", __func__); return -EPERM; } @@ -1647,13 +1647,13 @@ static int hdd_enable_ext_wow_parser(hdd_adapter_t *adapter, int vdev_id, rc = wlan_hdd_validate_context(hdd_ctx); if (0 != rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return -EINVAL; } if (value < EXT_WOW_TYPE_APP_TYPE1 || value > EXT_WOW_TYPE_APP_TYPE1_2) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid type")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid type")); return -EINVAL; } @@ -1668,7 +1668,7 @@ static int hdd_enable_ext_wow_parser(hdd_adapter_t *adapter, int vdev_id, hdd_ctx->is_extwow_app_type2_param_set) params.type = value; else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Set app params before enable it value %d"), value); return -EINVAL; } @@ -1691,7 +1691,7 @@ static int hdd_set_app_type1_params(tHalHandle hHal, cdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type1_params returned failure %d"), cdf_ret_status); return -EPERM; @@ -1711,12 +1711,12 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, rc = wlan_hdd_validate_context(hdd_ctx); if (0 != rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return -EINVAL; } if (2 != sscanf(arg, "%8s %16s", id, password)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Invalid Number of arguments")); return -EINVAL; } @@ -1730,7 +1730,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, params.pass_length = strlen(password); cdf_mem_copy(params.password, password, params.pass_length); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: %d %pM %.8s %u %.16s %u", __func__, params.vdev_id, params.wakee_mac_addr.bytes, params.identification_id, params.id_length, @@ -1749,7 +1749,7 @@ static int hdd_set_app_type2_params(tHalHandle hHal, cdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type2_params returned failure %d"), cdf_ret_status); return -EPERM; @@ -1770,7 +1770,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return -EINVAL; } @@ -1792,7 +1792,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, (unsigned int *)¶ms.tcp_rx_timeout_val); if (ret != 15 && ret != 7) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Invalid Number of arguments"); return -EINVAL; } @@ -1801,14 +1801,14 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &gateway_mac[0], &gateway_mac[1], &gateway_mac[2], &gateway_mac[3], &gateway_mac[4], &gateway_mac[5])) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Invalid MacAddress Input %s", mac_addr); return -EINVAL; } if (params.tcp_src_port > WLAN_HDD_MAX_TCP_PORT || params.tcp_dst_port > WLAN_HDD_MAX_TCP_PORT) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Invalid TCP Port Number"); return -EINVAL; } @@ -1848,7 +1848,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, params.tcp_rx_timeout_val : hdd_ctx->config->extWowApp2TcpRxTimeout; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: %pM %.16s %u %u %u %u %u %u %u %u %u %u %u %u %u", __func__, gateway_mac, rc4_key, params.ip_id, params.ip_device_ip, params.ip_server_ip, params.tcp_seq, @@ -1911,7 +1911,7 @@ static int hdd_parse_setmaxtxpower_command(uint8_t *pValue, int *pTxPower) *pTxPower = tempInt; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "SETMAXTXPOWER: %d", *pTxPower); return 0; @@ -1923,7 +1923,7 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command, int ret = 0; if (!pCfg || !command || !extra || !len) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: argument passed for GETDWELLTIME is incorrect", __func__); ret = -EINVAL; @@ -2049,7 +2049,7 @@ static void hdd_get_link_status_cb(uint8_t status, void *context) hdd_adapter_t *adapter; if (NULL == context) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Bad context [%p]", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad context [%p]", __func__, context); return; } @@ -2066,7 +2066,7 @@ static void hdd_get_link_status_cb(uint8_t status, void *context) * nothing we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, adapter [%p] magic [%08x]", __func__, adapter, pLinkContext->magic); return; @@ -2138,7 +2138,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) hdd_get_link_status_cb, &context, adapter->sessionId); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve link status", __func__); /* return a cached value */ } else { @@ -2146,7 +2146,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) rc = wait_for_completion_timeout(&context.completion, msecs_to_jiffies(WLAN_WAIT_TIME_LINK_STATUS)); if (!rc) - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SME timed out while retrieving link status")); } @@ -2215,7 +2215,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, pEseBcnReq->numBcnReqIe = tempInt; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe); for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) { @@ -2252,8 +2252,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, switch (i) { case 0: /* Measurement token */ if (tempInt <= 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Invalid Measurement Token(%d)", tempInt); return -EINVAL; @@ -2266,8 +2266,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, if ((tempInt <= 0) || (tempInt > WNI_CFG_CURRENT_CHANNEL_STAMAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Invalid Channel Number(%d)", tempInt); return -EINVAL; @@ -2278,8 +2278,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, case 2: /* Scan mode */ if ((tempInt < eSIR_PASSIVE_SCAN) || (tempInt > eSIR_BEACON_TABLE)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Invalid Scan Mode(%d) Expected{0|1|2}", tempInt); return -EINVAL; @@ -2294,8 +2294,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, ((tempInt < 0) && (pEseBcnReq->bcnReq[j].scanMode == eSIR_BEACON_TABLE))) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Invalid Measurement Duration(%d)", tempInt); return -EINVAL; @@ -2308,7 +2308,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, } for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "Index(%d) Measurement Token(%u) Channel(%u) Scan Mode(%u) Measurement Duration(%u)", j, pEseBcnReq->bcnReq[j].measurementToken, @@ -2404,7 +2404,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) struct hdd_config *pConfig = NULL; if (pHddCtx == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is null", __func__); return -EINVAL; } @@ -2434,7 +2434,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) pAdapter->device_mode); status = sme_send_rate_update_ind(pHddCtx->hHal, &rateUpdate); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed", __func__); return -EFAULT; } @@ -2449,7 +2449,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter, { int ret = 0; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL, adapter->sessionId, (unsigned)(*(hdd_ctx->p2pDeviceAddress.bytes + 2) @@ -2461,7 +2461,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter, if (copy_to_user(priv_data->buf, hdd_ctx->p2pDeviceAddress.bytes, sizeof(tSirMacAddr))) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -2530,7 +2530,7 @@ static int drv_cmd_set_band(hdd_adapter_t *adapter, * First 8 bytes will have "SETBAND " and * 9 byte will have band setting value */ - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: SetBandCommand Info comm %s UL %d, TL %d", __func__, command, priv_data->used_len, priv_data->total_len); @@ -2577,11 +2577,11 @@ static int drv_cmd_country(hdd_adapter_t *adapter, &adapter->change_country_code, msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY)); if (!rc) - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME while setting country code timed out", __func__); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME Change Country code fail, status=%d", __func__, status); ret = -EINVAL; @@ -2612,8 +2612,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN, @@ -2626,8 +2626,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, if ((lookUpThreshold < CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN) || (lookUpThreshold > CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Neighbor lookup threshold value %d is out of range (Min: %d Max: %d)", lookUpThreshold, CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN, @@ -2636,10 +2636,10 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam trigger (Neighbor lookup threshold) = %d", __func__, lookUpThreshold); @@ -2649,8 +2649,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter, adapter->sessionId, lookUpThreshold); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to set roam trigger, try again", __func__); ret = -EPERM; @@ -2674,15 +2674,15 @@ static int drv_cmd_get_roam_trigger(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL, adapter->sessionId, lookUpThreshold)); len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -2715,8 +2715,8 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000), @@ -2727,8 +2727,8 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, if ((roamScanPeriod < (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000)) || (roamScanPeriod > (CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Roam scan period value %d is out of range (Min: %d Max: %d)", roamScanPeriod, (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000), @@ -2736,12 +2736,12 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL, adapter->sessionId, roamScanPeriod)); neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan period (Empty Scan refresh period) = %d", __func__, roamScanPeriod); @@ -2768,7 +2768,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL, adapter->sessionId, nEmptyScanRefreshPeriod)); @@ -2809,8 +2809,8 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed Input value may be out of range[%d - %d]", __func__, CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000, @@ -2823,8 +2823,8 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000)) || (roamScanRefreshPeriod > (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX / 1000))) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Neighbor scan results refresh period value %d is out of range (Min: %d Max: %d)", roamScanRefreshPeriod, (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN @@ -2836,7 +2836,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter, } neighborScanRefreshPeriod = roamScanRefreshPeriod * 1000; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan refresh period (Scan refresh period) = %d", __func__, roamScanRefreshPeriod); @@ -2869,8 +2869,8 @@ static int drv_cmd_get_roam_scan_refresh_period(hdd_adapter_t *adapter, /* Returned value is in units of seconds */ len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -2899,8 +2899,8 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, CFG_LFR_FEATURE_ENABLED_MAX); @@ -2909,8 +2909,8 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, } if ((roamMode < CFG_LFR_FEATURE_ENABLED_MIN) || (roamMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Roam Mode value %d is out of range (Min: %d Max: %d)", roamMode, CFG_LFR_FEATURE_ENABLED_MIN, @@ -2919,7 +2919,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, "%s: Received Command to Set Roam Mode = %d", __func__, roamMode); /* @@ -2983,8 +2983,8 @@ static int drv_cmd_get_roam_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3013,8 +3013,8 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_RSSI_DIFF_MIN, CFG_ROAM_RSSI_DIFF_MAX); @@ -3024,8 +3024,8 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, if ((roamRssiDiff < CFG_ROAM_RSSI_DIFF_MIN) || (roamRssiDiff > CFG_ROAM_RSSI_DIFF_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Roam rssi diff value %d is out of range (Min: %d Max: %d)", roamRssiDiff, CFG_ROAM_RSSI_DIFF_MIN, @@ -3034,7 +3034,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam rssi diff = %d", __func__, roamRssiDiff); @@ -3059,7 +3059,7 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter, char extra[32]; uint8_t len = 0; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMDELTA_IOCTL, adapter->sessionId, roamRssiDiff)); @@ -3068,8 +3068,8 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3091,7 +3091,7 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter, hdd_get_band_helper(hdd_ctx, &band); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETBAND_IOCTL, adapter->sessionId, band)); @@ -3099,8 +3099,8 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3136,15 +3136,15 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, &numChannels, adapter->sessionId)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_FATAL, "%s: failed to get roam scan channel list", __func__); ret = -EFAULT; goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL, adapter->sessionId, numChannels)); /* @@ -3160,8 +3160,8 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3190,8 +3190,8 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, if (eseMode && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); ret = -EPERM; @@ -3202,8 +3202,8 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter, "GETCCXMODE", eseMode); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3232,8 +3232,8 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, if (okcMode && sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); ret = -EPERM; @@ -3245,8 +3245,8 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3273,8 +3273,8 @@ static int drv_cmd_get_fast_roam(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3299,8 +3299,8 @@ static int drv_cmd_get_fast_transition(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3329,8 +3329,8 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN, @@ -3341,8 +3341,8 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, if ((minTime < CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN) || (minTime > CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "scan min channel time value %d is out of range (Min: %d Max: %d)", minTime, CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN, @@ -3351,10 +3351,10 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter, goto exit; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, minTime)); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel min time = %d", __func__, minTime); @@ -3393,13 +3393,13 @@ static int drv_cmd_get_roam_scan_channel_min_time(hdd_adapter_t *adapter, "GETROAMSCANCHANNELMINTIME", val); len = QDF_MIN(priv_data->total_len, len + 1); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL, adapter->sessionId, val)); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3428,8 +3428,8 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN, @@ -3440,8 +3440,8 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, if ((maxTime < CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN) || (maxTime > CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", maxTime, CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN, @@ -3450,7 +3450,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change channel max time = %d", __func__, maxTime); @@ -3481,8 +3481,8 @@ static int drv_cmd_get_scan_channel_time(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3511,8 +3511,8 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou16 failed range [%d - %d]", __func__, CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN, @@ -3523,8 +3523,8 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, if ((val < CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN) || (val > CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "scan home time value %d is out of range (Min: %d Max: %d)", val, CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN, @@ -3533,7 +3533,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change scan home time = %d", __func__, val); @@ -3564,8 +3564,8 @@ static int drv_cmd_get_scan_home_time(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3594,8 +3594,8 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_INTRA_BAND_MIN, CFG_ROAM_INTRA_BAND_MAX); @@ -3605,8 +3605,8 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, if ((val < CFG_ROAM_INTRA_BAND_MIN) || (val > CFG_ROAM_INTRA_BAND_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "intra band mode value %d is out of range (Min: %d Max: %d)", val, CFG_ROAM_INTRA_BAND_MIN, @@ -3614,7 +3614,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change intra band = %d", __func__, val); @@ -3641,8 +3641,8 @@ static int drv_cmd_get_roam_intra_band(hdd_adapter_t *adapter, "GETROAMINTRABAND", val); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3671,8 +3671,8 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_SCAN_N_PROBES_MIN, CFG_ROAM_SCAN_N_PROBES_MAX); @@ -3682,8 +3682,8 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) || (nProbes > CFG_ROAM_SCAN_N_PROBES_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "NProbes value %d is out of range (Min: %d Max: %d)", nProbes, CFG_ROAM_SCAN_N_PROBES_MIN, @@ -3692,7 +3692,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set nProbes = %d", __func__, nProbes); @@ -3718,8 +3718,8 @@ static int drv_cmd_get_scan_n_probes(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, val); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3750,8 +3750,8 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN, @@ -3762,8 +3762,8 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) || (homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "homeAwayTime value %d is out of range (Min: %d Max: %d)", homeAwayTime, CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN, @@ -3772,7 +3772,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set scan away time = %d", __func__, homeAwayTime); @@ -3804,8 +3804,8 @@ static int drv_cmd_get_scan_home_away_time(hdd_adapter_t *adapter, len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3843,8 +3843,8 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ENABLE_WES_MODE_NAME_MIN, @@ -3855,8 +3855,8 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, if ((wesMode < CFG_ENABLE_WES_MODE_NAME_MIN) || (wesMode > CFG_ENABLE_WES_MODE_NAME_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "WES Mode value %d is out of range (Min: %d Max: %d)", wesMode, CFG_ENABLE_WES_MODE_NAME_MIN, @@ -3865,7 +3865,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set WES Mode rssi diff = %d", __func__, wesMode); @@ -3890,8 +3890,8 @@ static int drv_cmd_get_wes_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, wesMode); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3921,14 +3921,14 @@ static int drv_cmd_set_opportunistic_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Opportunistic Threshold diff = %d", __func__, nOpportunisticThresholdDiff); @@ -3955,8 +3955,8 @@ static int drv_cmd_get_opportunistic_rssi_diff(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, val); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -3985,14 +3985,14 @@ static int drv_cmd_set_roam_rescan_rssi_diff(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed.", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set Roam Rescan RSSI Diff = %d", __func__, nRoamRescanRssiDiff); @@ -4018,8 +4018,8 @@ static int drv_cmd_get_roam_rescan_rssi_diff(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, val); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -4048,8 +4048,8 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_LFR_FEATURE_ENABLED_MIN, CFG_LFR_FEATURE_ENABLED_MAX); @@ -4059,8 +4059,8 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, if ((lfrMode < CFG_LFR_FEATURE_ENABLED_MIN) || (lfrMode > CFG_LFR_FEATURE_ENABLED_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "lfr mode value %d is out of range (Min: %d Max: %d)", lfrMode, CFG_LFR_FEATURE_ENABLED_MIN, @@ -4069,7 +4069,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change lfr mode = %d", __func__, lfrMode); @@ -4103,8 +4103,8 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_FAST_TRANSITION_ENABLED_NAME_MIN, @@ -4115,8 +4115,8 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, if ((ft < CFG_FAST_TRANSITION_ENABLED_NAME_MIN) || (ft > CFG_FAST_TRANSITION_ENABLED_NAME_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "ft mode value %d is out of range (Min: %d Max: %d)", ft, CFG_FAST_TRANSITION_ENABLED_NAME_MIN, @@ -4125,7 +4125,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change ft mode = %d", __func__, ft); @@ -4163,7 +4163,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(fastreassoc); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Not able to post ROAM_INVOKE_CMD message to WMA")); } } @@ -4196,8 +4196,8 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, /* if not associated, no need to proceed with reassoc */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s:Not associated!", __func__); ret = -EINVAL; goto exit; @@ -4206,8 +4206,8 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, ret = hdd_parse_reassoc_command_v1_data(value, targetApBssid, &channel); if (ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse reassoc command data", __func__); goto exit; @@ -4321,8 +4321,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); ret = -EPERM; @@ -4339,8 +4339,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ESE_FEATURE_ENABLED_MIN, CFG_ESE_FEATURE_ENABLED_MAX); @@ -4350,8 +4350,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) || (eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Ese mode value %d is out of range (Min: %d Max: %d)", eseMode, CFG_ESE_FEATURE_ENABLED_MIN, @@ -4359,7 +4359,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change ese mode = %d", __func__, eseMode); @@ -4393,14 +4393,14 @@ static int drv_cmd_set_roam_scan_control(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed ", __func__); ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set roam scan control = %d", __func__, roamScanControl); @@ -4434,8 +4434,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && hdd_is_okc_mode_enabled(hdd_ctx) && sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_WARN, "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", __func__); ret = -EPERM; @@ -4452,8 +4452,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_OKC_FEATURE_ENABLED_MIN, CFG_OKC_FEATURE_ENABLED_MAX); @@ -4463,8 +4463,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, if ((okcMode < CFG_OKC_FEATURE_ENABLED_MIN) || (okcMode > CFG_OKC_FEATURE_ENABLED_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Okc mode value %d is out of range (Min: %d Max: %d)", okcMode, CFG_OKC_FEATURE_ENABLED_MIN, @@ -4472,7 +4472,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter, ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to change okc mode = %d", __func__, okcMode); @@ -4497,8 +4497,8 @@ static int drv_cmd_get_roam_scan_control(hdd_adapter_t *adapter, command, roamScanControl); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -4518,8 +4518,8 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, bcMode = command + 11; if ('1' == *bcMode) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = true; ret = wlan_hdd_scan_abort(adapter); @@ -4528,8 +4528,8 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter, FL("Failed to abort existing scan status:%d"), ret); } } else if ('2' == *bcMode) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_DEBUG, FL("BTCOEXMODE %d"), *bcMode); hdd_ctx->btCoexModeSet = false; } @@ -4573,8 +4573,8 @@ static int drv_cmd_get_dwell_time(hdd_adapter_t *adapter, ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len); len = QDF_MIN(priv_data->total_len, len + 1); if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -4609,7 +4609,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, pHddCtx = WLAN_HDD_GET_CTX(adapter); if (0 != wlan_hdd_validate_context(pHddCtx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s pHddCtx is not valid, Unable to set miracast mode", __func__); return -EINVAL; @@ -4625,8 +4625,8 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range ", __func__); ret = -EINVAL; @@ -4635,8 +4635,8 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter, if ((filterType < WLAN_HDD_DRIVER_MIRACAST_CFG_MIN_VAL) || (filterType > WLAN_HDD_DRIVER_MIRACAST_CFG_MAX_VAL)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Accepted Values are 0 to 2. 0-Disabled, 1-Source, 2-Sink ", __func__); ret = -EINVAL; @@ -4673,15 +4673,15 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ret = hdd_parse_channellist(value, ChannelList, &numChannels); if (ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse channel list information", __func__); goto exit; } if (numChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: number of channels (%d) supported exceeded max (%d)", __func__, numChannels, @@ -4694,8 +4694,8 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, ChannelList, numChannels); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to update channel list information", __func__); ret = -EINVAL; @@ -4732,8 +4732,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, /* if not associated, return error */ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s:Not associated!", __func__); ret = -EINVAL; goto exit; @@ -4749,8 +4749,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, TID_MIN_VALUE, TID_MAX_VALUE); @@ -4758,28 +4758,28 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, goto exit; } if ((tid < TID_MIN_VALUE) || (tid > TID_MAX_VALUE)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "tid value %d is out of range (Min: %d Max: %d)", tid, TID_MIN_VALUE, TID_MAX_VALUE); ret = -EINVAL; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: Received Command to get tsm stats tid = %d", __func__, tid); if (QDF_STATUS_SUCCESS != hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to get tsm stats", __func__); ret = -EFAULT; goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "UplinkPktQueueDly(%d) UplinkPktQueueDlyHist[0](%d) UplinkPktQueueDlyHist[1](%d) UplinkPktQueueDlyHist[2](%d) UplinkPktQueueDlyHist[3](%d) UplinkPktTxDly(%u) UplinkPktLoss(%d) UplinkPktCount(%d) RoamingCount(%d) RoamingDly(%d)", tsm_metrics.UplinkPktQueueDly, tsm_metrics.UplinkPktQueueDlyHist[0], @@ -4813,8 +4813,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, tsm_metrics.RoamingDly); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -4838,16 +4838,16 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, ret = hdd_parse_get_cckm_ie(value, &cckmIe, &cckmIeLen); if (ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse cckm ie data", __func__); goto exit; } if (cckmIeLen > DOT11F_IE_RSN_MAX_LEN) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: CCKM Ie input length is more than max[%d]", __func__, DOT11F_IE_RSN_MAX_LEN); if (NULL != cckmIe) { @@ -4889,15 +4889,15 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, ret = hdd_parse_ese_beacon_req(value, &eseBcnReq); if (ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to parse ese beacon req", __func__); goto exit; } if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { - hddLog(CDF_TRACE_LEVEL_INFO, FL("Not associated")); + hddLog(QDF_TRACE_LEVEL_INFO, FL("Not associated")); hdd_indicate_ese_bcn_report_no_results(adapter, eseBcnReq.bcnReq[0].measurementToken, 0x02, /* BIT(1) set for measurement done */ @@ -4910,14 +4910,14 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, &eseBcnReq); if (QDF_STATUS_E_RESOURCES == status) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("sme_set_ese_beacon_request failed (%d), a request already in progress"), status); ret = -EBUSY; goto exit; } else if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: sme_set_ese_beacon_request failed (%d)", __func__, status); ret = -EINVAL; @@ -4970,8 +4970,8 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, status = hdd_parse_setmaxtxpower_command(value, &txPower); if (status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Invalid MAXTXPOWER command "); ret = -EINVAL; goto exit; @@ -4987,7 +4987,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, qdf_copy_macaddr(&selfMac, &adapter->macAddressCurrent); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "Device mode %d max tx power %d selfMac: " MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR " ", adapter->device_mode, txPower, MAC_ADDR_ARRAY(selfMac.bytes), @@ -4996,13 +4996,13 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter, smeStatus = sme_set_max_tx_power(hdd_ctx->hHal, bssid, selfMac, txPower); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s:Set max tx power failed", __func__); ret = -EINVAL; goto exit; } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Set max tx power success", __func__); qdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode, @@ -5034,8 +5034,8 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, * If the input value is greater than max value of datatype, * then also kstrtou8 fails */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: kstrtou8 failed range [%d - %d]", __func__, CFG_ROAMING_DFS_CHANNEL_MIN, CFG_ROAMING_DFS_CHANNEL_MAX); @@ -5045,8 +5045,8 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, if ((dfsScanMode < CFG_ROAMING_DFS_CHANNEL_MIN) || (dfsScanMode > CFG_ROAMING_DFS_CHANNEL_MAX)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "dfsScanMode value %d is out of range (Min: %d Max: %d)", dfsScanMode, CFG_ROAMING_DFS_CHANNEL_MIN, @@ -5055,7 +5055,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter, goto exit; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Command to Set DFS Scan Mode = %d", __func__, dfsScanMode); @@ -5093,8 +5093,8 @@ static int drv_cmd_get_dfs_scan_mode(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, dfsScanMode); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -5117,8 +5117,8 @@ static int drv_cmd_get_link_status(hdd_adapter_t *adapter, len = scnprintf(extra, sizeof(extra), "%s %d", command, value); len = QDF_MIN(priv_data->total_len, len + 1); if (copy_to_user(priv_data->buf, &extra, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); ret = -EFAULT; @@ -5882,7 +5882,7 @@ static int drv_cmd_invalid(hdd_adapter_t *adapter, uint8_t command_len, hdd_priv_data_t *priv_data) { - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_UNSUPPORTED_IOCTL, adapter->sessionId, 0)); @@ -6190,7 +6190,7 @@ static int hdd_drv_cmd_process(hdd_adapter_t *adapter, int len = 0; if (!adapter || !cmd || !priv_data) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: at least 1 param is NULL", __func__); return -EINVAL; } @@ -6204,7 +6204,7 @@ static int hdd_drv_cmd_process(hdd_adapter_t *adapter, len = strlen(cmd_i); if (!handler) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: no. %d handler is NULL", __func__, i); return -EINVAL; } @@ -6247,7 +6247,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter, /* copy to local struct to avoid numerous changes to legacy code */ if (priv_data->total_len <= 0 || priv_data->total_len > WLAN_PRIV_DATA_MAX_LEN) { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s:invalid priv_data.total_len(%d)!!!", __func__, priv_data->total_len); ret = -EINVAL; @@ -6257,7 +6257,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter, /* Allocate +1 for '\0' */ command = kmalloc(priv_data->total_len + 1, GFP_KERNEL); if (!command) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: failed to allocate memory", __func__); ret = -ENOMEM; goto exit; @@ -6360,14 +6360,14 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ENTER(); if (dev != adapter->dev) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s: HDD adapter/dev inconsistency", __func__); ret = -ENODEV; goto exit; } if ((!ifr) || (!ifr->ifr_data)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: invalid data", __func__); ret = -EINVAL; goto exit; @@ -6394,7 +6394,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ret = hdd_driver_ioctl(adapter, ifr); break; default: - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d", __func__, cmd); ret = -EINVAL; break; diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 8f228d128386..d206f92c7736 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -507,13 +507,13 @@ uint32_t wlan_hdd_stub_addr_to_priv(void *ptr) (((struct hdd_ipa_cld_hdr *) (_data))->iface_id) #define HDD_IPA_LOG(LVL, fmt, args ...) \ - CDF_TRACE(QDF_MODULE_ID_HDD, LVL, \ + QDF_TRACE(QDF_MODULE_ID_HDD, LVL, \ "%s:%d: "fmt, __func__, __LINE__, ## args) #define HDD_IPA_DBG_DUMP(_lvl, _prefix, _buf, _len) \ do { \ - CDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \ - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \ + QDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \ + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \ } while (0) #define HDD_IPA_IS_CONFIG_ENABLED(_hdd_ctx, _mask) \ @@ -717,7 +717,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext) return; if (!hdd_ctx->hdd_ipa || !hdd_ipa_uc_is_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA UC is not enabled", __func__); return; } @@ -763,14 +763,14 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx) hdd_ipa = hdd_ctx->hdd_ipa; if (!hdd_ipa || !hdd_ipa_uc_is_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA UC is not enabled", __func__); return; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "========= WLAN-IPA DEBUG BUF DUMP ==========\n"); - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, " TM : EXEP : DROP : NETS : MCBC : TXFD : DSTR : DSCD\n"); qdf_mutex_acquire(&hdd_ipa->rt_debug_lock); @@ -780,7 +780,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx) dump_index = (hdd_ipa->rt_buf_fill_index + dump_count) % HDD_IPA_UC_RT_DEBUG_BUF_COUNT; dump_info = &hdd_ipa->rt_bug_buffer[dump_index]; - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%12lu:%10llu:%10llu:%10llu:%10llu:%10llu:%10llu:%10llu\n", dump_info->time, dump_info->ipa_excep_count, dump_info->rx_drop_count, dump_info->net_sent_count, @@ -789,7 +789,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx) dump_info->rx_discard_count); } qdf_mutex_release(&hdd_ipa->rt_debug_lock); - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "======= WLAN-IPA DEBUG BUF DUMP END ========\n"); } @@ -813,7 +813,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext) return; if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA RT debug is not enabled", __func__); return; } @@ -824,7 +824,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext) dummy_ptr = kmalloc(HDD_IPA_UC_DEBUG_DUMMY_MEM_SIZE, GFP_KERNEL | GFP_ATOMIC); if (!dummy_ptr) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, + HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Dummy alloc fail", __func__); hdd_ipa_uc_rt_debug_host_dump(hdd_ctx); hdd_ipa_uc_stat_request( @@ -849,7 +849,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext) void hdd_ipa_uc_rt_debug_destructor(struct sk_buff *skb) { if (!ghdd_ipa) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: invalid hdd context", __func__); return; } @@ -877,7 +877,7 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx) qdf_mutex_destroy(&hdd_ipa->rt_debug_lock); if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA RT debug is not enabled", __func__); return; } @@ -919,7 +919,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) /* Reatime debug enable on feature enable */ if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA RT debug is not enabled", __func__); return; } @@ -1023,7 +1023,7 @@ static bool hdd_ipa_uc_find_add_assoc_sta(struct hdd_ipa_priv *hdd_ipa, } } if (sta_add && sta_found) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: STA ID %d already exist, cannot add", __func__, sta_id); return sta_found; @@ -1038,7 +1038,7 @@ static bool hdd_ipa_uc_find_add_assoc_sta(struct hdd_ipa_priv *hdd_ipa, } } if (!sta_add && !sta_found) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: STA ID %d does not exist, cannot delete", __func__, sta_id); return sta_found; @@ -1069,19 +1069,19 @@ static int hdd_ipa_uc_enable_pipes(struct hdd_ipa_priv *hdd_ipa) p_cds_contextType cds_ctx = hdd_ipa->hdd_ctx->pcds_context; /* ACTIVATE TX PIPE */ - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Enable TX PIPE(tx_pipe_handle=%d)", __func__, hdd_ipa->tx_pipe_handle); result = ipa_enable_wdi_pipe(hdd_ipa->tx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Enable TX PIPE fail, code %d", __func__, result); return result; } result = ipa_resume_wdi_pipe(hdd_ipa->tx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Resume TX PIPE fail, code %d", __func__, result); return result; @@ -1089,19 +1089,19 @@ static int hdd_ipa_uc_enable_pipes(struct hdd_ipa_priv *hdd_ipa) ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, true, true); /* ACTIVATE RX PIPE */ - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Enable RX PIPE(rx_pipe_handle=%d)", __func__, hdd_ipa->rx_pipe_handle); result = ipa_enable_wdi_pipe(hdd_ipa->rx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Enable RX PIPE fail, code %d", __func__, result); return result; } result = ipa_resume_wdi_pipe(hdd_ipa->rx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Resume RX PIPE fail, code %d", __func__, result); return result; @@ -1123,33 +1123,33 @@ static int hdd_ipa_uc_disable_pipes(struct hdd_ipa_priv *hdd_ipa) hdd_ipa->ipa_pipes_down = true; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable RX PIPE", __func__); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable RX PIPE", __func__); result = ipa_suspend_wdi_pipe(hdd_ipa->rx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Suspend RX PIPE fail, code %d", __func__, result); return result; } result = ipa_disable_wdi_pipe(hdd_ipa->rx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Disable RX PIPE fail, code %d", __func__, result); return result; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable TX PIPE", __func__); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable TX PIPE", __func__); result = ipa_suspend_wdi_pipe(hdd_ipa->tx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Suspend TX PIPE fail, code %d", __func__, result); return result; } result = ipa_disable_wdi_pipe(hdd_ipa->tx_pipe_handle); if (result) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Disable TX PIPE fail, code %d", __func__, result); return result; @@ -1178,7 +1178,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa) * enable pipe immediately */ if (hdd_ipa_uc_enable_pipes(hdd_ipa)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: IPA WDI Pipe activation failed", __func__); hdd_ipa->resource_loading = false; @@ -1190,7 +1190,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa) * Just enabled all the PIPEs */ if (hdd_ipa_uc_enable_pipes(hdd_ipa)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: IPA WDI Pipe activation failed", __func__); hdd_ipa->resource_loading = false; @@ -1199,7 +1199,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa) hdd_ipa->resource_loading = false; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA WDI Pipes activated successfully", __func__); return 0; } @@ -1215,9 +1215,9 @@ static void hdd_ipa_uc_handle_last_discon(struct hdd_ipa_priv *hdd_ipa) p_cds_contextType cds_ctx = hdd_ipa->hdd_ctx->pcds_context; hdd_ipa->resource_unloading = true; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable FW RX PIPE", __func__); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable FW RX PIPE", __func__); ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, false, false); - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable FW TX PIPE", __func__); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable FW TX PIPE", __func__); ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, false, true); } @@ -1241,14 +1241,14 @@ hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) */ status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx); if (0 != status) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); return; } if (!hdd_ipa_is_rm_enabled(hdd_ipa->hdd_ctx)) return; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s, event code %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s, event code %d", __func__, event); switch (event) { @@ -1269,7 +1269,7 @@ hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event) break; default: - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s, invalid event code %d", __func__, event); break; } @@ -1296,7 +1296,7 @@ static void hdd_ipa_uc_rm_notify_defer(struct work_struct *work) cds_ssr_protect(__func__); event = uc_rm_work->event; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s, posted event %d", __func__, event); hdd_ipa_uc_rm_notify_handler(hdd_ipa, event); @@ -1317,10 +1317,10 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa) struct ipa_uc_pending_event *pending_event = NULL; pending_event_count = qdf_list_size(&hdd_ipa->pending_event); - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s, Pending Event Count %d", __func__, pending_event_count); if (!pending_event_count) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s, No Pending Event", __func__); return; } @@ -1357,12 +1357,12 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) QDF_STATUS status = QDF_STATUS_SUCCESS; if (!op_msg || !usr_ctxt) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__); return; } if (HDD_IPA_UC_OPCODE_MAX <= msg->op_code) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s, INVALID OPCODE %d", __func__, msg->op_code); return; } @@ -1374,14 +1374,14 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) */ status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); cdf_mem_free(op_msg); return; } hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; - HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, + HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "%s, OPCODE %s", __func__, op_string[msg->op_code]); if ((HDD_IPA_UC_OPCODE_TX_RESUME == msg->op_code) || @@ -1422,7 +1422,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) { /* STATs from host */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CE ====\n" "CE RING BASE: 0x%llx\n" "CE RING SIZE: %d\n" @@ -1430,7 +1430,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (unsigned long long)hdd_ipa->ce_sr_base_paddr, hdd_ipa->ce_sr_ring_size, (unsigned long long)hdd_ipa->ce_reg_paddr); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST TX ====\n" "COMP RING BASE: 0x%llx\n" "COMP RING SIZE: %d\n" @@ -1440,7 +1440,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->tx_comp_ring_size, hdd_ipa->tx_num_alloc_buffer, (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST RX ====\n" "IND RING BASE: 0x%llx\n" "IND RING SIZE: %d\n" @@ -1456,7 +1456,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->stats.num_rx_excep, hdd_ipa->stats.num_tx_bcmc, (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CONTROL ====\n" "SAP NUM STAs: %d\n" "STA CONNECTED: %d\n" @@ -1476,7 +1476,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) /* STATs from FW */ uc_fw_stat = (struct ipa_uc_fw_stats *) ((uint8_t *)op_msg + sizeof(struct op_msg_type)); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW TX ====\n" "COMP RING BASE: 0x%x\n" "COMP RING SIZE: %d\n" @@ -1497,7 +1497,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->tx_pkts_enqueued, uc_fw_stat->tx_pkts_completed, uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW RX ====\n" "IND RING BASE: 0x%x\n" "IND RING SIZE: %d\n" @@ -1528,7 +1528,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved); /* STATs from IPA */ ipa_get_wdi_stats(&ipa_stat); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA TX ====\n" "NUM PROCD : %d\n" "CE DBELL : 0x%x\n" @@ -1564,7 +1564,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) num_bam_int_in_non_runnning_state, ipa_stat.tx_ch_stats.num_qmb_int_handled); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA RX ====\n" "MAX OST PKT : %d\n" "NUM PKT PRCSD : %d\n" @@ -1658,7 +1658,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, ipa_offload_enable_disable.vdev_id = adapter->sessionId; ipa_offload_enable_disable.enable = enable; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: offload_type=%d, vdev_id=%d, enable=%d", __func__, ipa_offload_enable_disable.offload_type, ipa_offload_enable_disable.vdev_id, @@ -1667,7 +1667,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, if (QDF_STATUS_SUCCESS != sme_ipa_offload_enable_disable(WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, &ipa_offload_enable_disable)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Failure to enable IPA offload \ (offload_type=%d, vdev_id=%d, enable=%d)", __func__, ipa_offload_enable_disable.offload_type, @@ -1693,7 +1693,7 @@ static void hdd_ipa_uc_fw_op_event_handler(struct work_struct *work) msg = uc_op_work->msg; uc_op_work->msg = NULL; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s, posted msg %d", __func__, msg->op_code); hdd_ipa_uc_op_cb(msg, hdd_ipa->hdd_ctx); @@ -1720,7 +1720,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx) status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); goto end; } @@ -1731,7 +1731,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx) goto end; if (HDD_IPA_UC_OPCODE_MAX <= msg->op_code) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP Code (%d)", + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Invalid OP Code (%d)", __func__, msg->op_code); goto end; } @@ -1806,7 +1806,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) pipe_in.sys.ipa_ep_cfg.hdr_ext.hdr_little_endian = true; pipe_in.sys.notify = hdd_ipa_i2w_cb; if (!hdd_ipa_is_rm_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA RM DISABLED, IPA AWAKE", __func__); pipe_in.sys.keep_ipa_awake = true; } @@ -1825,7 +1825,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) ipa_ctxt->tx_comp_doorbell_paddr = pipe_out.uc_door_bell_pa; /* WLAN TX PIPE Handle */ ipa_ctxt->tx_pipe_handle = pipe_out.clnt_hdl; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "TX : CRBPA 0x%x, CRS %d, CERBPA 0x%x, CEDPA 0x%x," " CERZ %d, NB %d, CDBPAD 0x%x", (unsigned int)pipe_in.u.dl.comp_ring_base_pa, @@ -1847,7 +1847,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) sizeof(struct sps_iovec); pipe_in.sys.notify = hdd_ipa_w2i_cb; if (!hdd_ipa_is_rm_enabled(hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: IPA RM DISABLED, IPA AWAKE", __func__); pipe_in.sys.keep_ipa_awake = true; } @@ -1859,7 +1859,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) ipa_connect_wdi_pipe(&pipe_in, &pipe_out); ipa_ctxt->rx_ready_doorbell_paddr = pipe_out.uc_door_bell_pa; ipa_ctxt->rx_pipe_handle = pipe_out.clnt_hdl; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "RX : RRBPA 0x%x, RRS %d, PDIPA 0x%x, RDY_DB_PAD 0x%x", (unsigned int)pipe_in.u.ul.rdy_ring_base_pa, pipe_in.u.ul.rdy_ring_size, @@ -1902,11 +1902,11 @@ void hdd_ipa_uc_force_pipe_shutdown(hdd_context_t *hdd_ctx) hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa; if (false == hdd_ipa->ipa_pipes_down) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA pipes are not down yet, force shutdown"); hdd_ipa_uc_disable_pipes(hdd_ipa); } else { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "IPA pipes are down, do nothing"); } @@ -2198,7 +2198,7 @@ static void hdd_ipa_rm_notify(void *user_data, enum ipa_rm_event event, if (!hdd_ipa_is_rm_enabled(hdd_ipa->hdd_ctx)) return; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Evt: %d", event); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Evt: %d", event); switch (event) { case IPA_RM_RESOURCE_GRANTED: @@ -2218,12 +2218,12 @@ static void hdd_ipa_rm_notify(void *user_data, enum ipa_rm_event event, break; case IPA_RM_RESOURCE_RELEASED: - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "RM Release"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "RM Release"); hdd_ipa->resource_unloading = false; break; default: - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Unknown RM Evt: %d", event); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Unknown RM Evt: %d", event); break; } } @@ -2254,13 +2254,13 @@ static int hdd_ipa_rm_cons_request(void) int ret = 0; if (ghdd_ipa->resource_loading) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, + HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "%s: IPA resource loading in progress", __func__); ghdd_ipa->pending_cons_req = true; ret = -EINPROGRESS; } else if (ghdd_ipa->resource_unloading) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, + HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "%s: IPA resource unloading in progress", __func__); ghdd_ipa->pending_cons_req = true; @@ -2316,14 +2316,14 @@ int hdd_ipa_set_perf_level(hdd_context_t *hdd_ctx, uint64_t tx_packets, hdd_ipa->curr_prod_bw, next_prod_bw); if (hdd_ipa->curr_cons_bw != next_cons_bw) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Requesting CONS perf curr: %d, next: %d", hdd_ipa->curr_cons_bw, next_cons_bw); profile.max_supported_bandwidth_mbps = next_cons_bw; ret = ipa_rm_set_perf_profile(IPA_RM_RESOURCE_WLAN_CONS, &profile); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "RM CONS set perf profile failed: %d", ret); return ret; @@ -2333,14 +2333,14 @@ int hdd_ipa_set_perf_level(hdd_context_t *hdd_ctx, uint64_t tx_packets, } if (hdd_ipa->curr_prod_bw != next_prod_bw) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Requesting PROD perf curr: %d, next: %d", hdd_ipa->curr_prod_bw, next_prod_bw); profile.max_supported_bandwidth_mbps = next_prod_bw; ret = ipa_rm_set_perf_profile(IPA_RM_RESOURCE_WLAN_PROD, &profile); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "RM PROD set perf profile failed: %d", ret); return ret; } @@ -2396,7 +2396,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) ret = ipa_rm_create_resource(&create_params); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Create RM resource failed: %d", ret); goto setup_rm_fail; } @@ -2409,7 +2409,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) ret = ipa_rm_create_resource(&create_params); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Create RM CONS resource failed: %d", ret); goto delete_prod; } @@ -2420,7 +2420,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) ret = ipa_rm_inactivity_timer_init(IPA_RM_RESOURCE_WLAN_PROD, HDD_IPA_RX_INACTIVITY_MSEC_DELAY); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Timer init failed: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Timer init failed: %d", ret); goto timer_init_failed; } @@ -2429,7 +2429,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa) ret = hdd_ipa_set_perf_level(hdd_ipa->hdd_ctx, 0, 0); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Set perf level failed: %d", ret); goto set_perf_failed; } @@ -2489,12 +2489,12 @@ static void hdd_ipa_destroy_rm_resource(struct hdd_ipa_priv *hdd_ipa) ret = ipa_rm_delete_resource(IPA_RM_RESOURCE_WLAN_PROD); if (ret) - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "RM PROD resource delete failed %d", ret); ret = ipa_rm_delete_resource(IPA_RM_RESOURCE_WLAN_CONS); if (ret) - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "RM CONS resource delete failed %d", ret); } @@ -2515,7 +2515,7 @@ static void hdd_ipa_send_skb_to_network(cdf_nbuf_t skb, unsigned int cpu_index; if (!adapter || adapter->magic != WLAN_HDD_ADAPTER_MAGIC) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_LOW, "Invalid adapter: 0x%p", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_LOW, "Invalid adapter: 0x%p", adapter); HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); cdf_nbuf_free(skb); @@ -2575,7 +2575,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { session_id = (uint8_t)skb->cb[0]; iface_id = vdev_to_iface[session_id]; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "IPA_RECEIVE: session_id=%u, iface_id=%u", session_id, iface_id); } else { @@ -2583,10 +2583,10 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, } if (iface_id >= HDD_IPA_MAX_IFACE) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA_RECEIVE: Invalid iface_id: %u", iface_id); - HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_INFO_HIGH, "w2i -- skb", skb->data, 8); HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); cdf_nbuf_free(skb); @@ -2596,7 +2596,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, iface_context = &hdd_ipa->iface_context[iface_id]; adapter = iface_context->adapter; - HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_DEBUG, + HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_DEBUG, "w2i -- skb", skb->data, 8); if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { hdd_ipa->stats.num_rx_excep++; @@ -2625,7 +2625,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, if (fw_desc & HDD_IPA_FW_RX_DESC_FORWARD_M) { HDD_IPA_LOG( - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_DEBUG, "Forward packet to Tx (fw_desc=%d)", fw_desc); copy = cdf_nbuf_copy(skb); @@ -2636,7 +2636,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, adapter->dev); if (ret) { HDD_IPA_LOG( - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_LEVEL_DEBUG, "Forward packet tx fail"); hdd_ipa->stats. num_tx_bcmc_err++; @@ -2654,7 +2654,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, } } else { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "Intra-BSS FWD is disabled-skip forward to Tx"); } @@ -2662,7 +2662,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, break; default: - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "w2i cb wrong event: 0x%x", evt); return; } @@ -2678,7 +2678,7 @@ void hdd_ipa_nbuf_cb(cdf_nbuf_t skb) { struct hdd_ipa_priv *hdd_ipa = ghdd_ipa; - HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); + HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); /* FIXME: This is broken; PRIV_DATA is now 31 bits */ ipa_free_skb((struct ipa_rx_data *)wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); @@ -2708,7 +2708,7 @@ static void hdd_ipa_send_pkt_to_tl( qdf_spin_lock_bh(&iface_context->interface_lock); adapter = iface_context->adapter; if (!adapter) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_WARN, "Interface Down"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_WARN, "Interface Down"); ipa_free_skb(ipa_tx_desc); iface_context->stats.num_tx_drop++; qdf_spin_unlock_bh(&iface_context->interface_lock); @@ -2757,7 +2757,7 @@ static void hdd_ipa_send_pkt_to_tl( skb = ol_tx_send_ipa_data_frame(iface_context->tl_context, ipa_tx_desc->skb); if (skb) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "TLSHIM tx fail"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "TLSHIM tx fail"); ipa_free_skb(ipa_tx_desc); iface_context->stats.num_tx_err++; hdd_ipa_rm_try_release(hdd_ipa); @@ -2848,7 +2848,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, */ status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx); if (0 != status) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); ipa_free_skb(ipa_tx_desc); iface_context->stats.num_tx_drop++; return; @@ -2856,7 +2856,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, skb = ipa_tx_desc->skb; - HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_DEBUG, "i2w", skb->data, 8); + HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_DEBUG, "i2w", skb->data, 8); /* * If PROD resource is not requested here then there may be cases where @@ -3010,7 +3010,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa) ret = ipa_setup_sys_pipe(ipa, &(hdd_ipa->sys_pipe[i].conn_hdl)); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Failed for pipe %d" + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Failed for pipe %d" " ret: %d", i, ret); goto setup_sys_pipe_fail; } @@ -3043,7 +3043,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa) ret = ipa_setup_sys_pipe(ipa, &(hdd_ipa->sys_pipe[i].conn_hdl)); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Failed for RX pipe: %d", ret); goto setup_sys_pipe_fail; } @@ -3078,7 +3078,7 @@ static void hdd_ipa_teardown_sys_pipe(struct hdd_ipa_priv *hdd_ipa) ipa_teardown_sys_pipe(hdd_ipa->sys_pipe[i]. conn_hdl); if (ret) - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Failed: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Failed: %d", ret); hdd_ipa->sys_pipe[i].conn_hdl_valid = 0; @@ -3116,7 +3116,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa, tx_prop = cdf_mem_malloc(sizeof(struct ipa_ioc_tx_intf_prop) * num_prop); if (!tx_prop) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "tx_prop allocation failed"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "tx_prop allocation failed"); goto register_interface_fail; } @@ -3124,7 +3124,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa, rx_prop = cdf_mem_malloc(sizeof(struct ipa_ioc_rx_intf_prop) * num_prop); if (!rx_prop) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "rx_prop allocation failed"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "rx_prop allocation failed"); goto register_interface_fail; } @@ -3208,16 +3208,16 @@ static void hdd_ipa_remove_header(char *name) strlcpy(hdrlookup.name, name, sizeof(hdrlookup.name)); ret = ipa_get_hdr(&hdrlookup); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Hdr deleted already %s, %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Hdr deleted already %s, %d", name, ret); return; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "hdl: 0x%x", hdrlookup.hdl); + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "hdl: 0x%x", hdrlookup.hdl); len = sizeof(struct ipa_ioc_del_hdr) + sizeof(struct ipa_hdr_del) * 1; ipa_hdr = (struct ipa_ioc_del_hdr *)cdf_mem_malloc(len); if (ipa_hdr == NULL) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "ipa_hdr allocation failed"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "ipa_hdr allocation failed"); return; } ipa_hdr->num_hdls = 1; @@ -3226,7 +3226,7 @@ static void hdd_ipa_remove_header(char *name) ipa_hdr->hdl[0].status = -1; ret = ipa_del_hdr(ipa_hdr); if (ret != 0) - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Delete header failed: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Delete header failed: %d", ret); cdf_mem_free(ipa_hdr); @@ -3253,14 +3253,14 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ifname = adapter->dev->name; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Add Partial hdr: %s, %pM", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Add Partial hdr: %s, %pM", ifname, mac_addr); /* dynamically allocate the memory to add the hdrs */ ipa_hdr = cdf_mem_malloc(sizeof(struct ipa_ioc_add_hdr) + sizeof(struct ipa_hdr_add)); if (!ipa_hdr) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: ipa_hdr allocation failed", ifname); ret = -ENOMEM; goto end; @@ -3274,7 +3274,7 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, memcpy(uc_tx_hdr, &ipa_uc_tx_hdr, HDD_IPA_UC_WLAN_TX_HDR_LEN); memcpy(uc_tx_hdr->eth.h_source, mac_addr, ETH_ALEN); uc_tx_hdr->ipa_hd.vdev_id = iface_context->adapter->sessionId; - HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, + HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "ifname=%s, vdev_id=%d", ifname, uc_tx_hdr->ipa_hd.vdev_id); snprintf(ipa_hdr->hdr[0].name, IPA_RESOURCE_NAME_MAX, "%s%s", @@ -3308,12 +3308,12 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ret = ipa_add_hdr(ipa_hdr); } if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s IPv4 add hdr failed: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s IPv4 add hdr failed: %d", ifname, ret); goto end; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: IPv4 hdr_hdl: 0x%x", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPv4 hdr_hdl: 0x%x", ipa_hdr->hdr[0].name, ipa_hdr->hdr[0].hdr_hdl); if (hdd_ipa_is_ipv6_enabled(hdd_ipa->hdd_ctx)) { @@ -3332,12 +3332,12 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ret = ipa_add_hdr(ipa_hdr); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: IPv6 add hdr failed: %d", ifname, ret); goto clean_ipv4_hdr; } - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: IPv6 hdr_hdl: 0x%x", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPv6 hdr_hdl: 0x%x", ipa_hdr->hdr[0].name, ipa_hdr->hdr[0].hdr_hdl); } @@ -3381,7 +3381,7 @@ static void hdd_ipa_clean_hdr(hdd_adapter_t *adapter) /* unregister the interface with IPA */ ret = ipa_deregister_intf(adapter->dev->name); if (ret) - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: ipa_deregister_intf fail: %d", adapter->dev->name, ret); } @@ -3406,7 +3406,7 @@ static void hdd_ipa_cleanup_iface(struct hdd_ipa_iface_context *iface_context) qdf_spin_unlock_bh(&iface_context->interface_lock); iface_context->ifa_address = 0; if (!iface_context->hdd_ipa->num_iface) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "NUM INTF 0, Invalid"); CDF_ASSERT(0); } @@ -3444,7 +3444,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa, } if (iface_context == NULL) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "All the IPA interfaces are in use"); ret = -ENOMEM; goto end; @@ -3456,7 +3456,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa, tl_context = ol_txrx_get_vdev_by_sta_id(sta_id); if (tl_context == NULL) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Not able to get TL context sta_id: %d", sta_id); ret = -EINVAL; goto end; @@ -3527,7 +3527,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) pAdapter = adapter_node->pAdapter; if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || pAdapter->device_mode == WLAN_HDD_SOFTAP) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "MCC->SCC: Flush TxRx queue(d_mode=%d)", pAdapter->device_mode); hdd_deinit_tx_rx(pAdapter); @@ -3617,7 +3617,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, struct ipa_wlan_msg_ex *msg_ex = NULL; int ret; - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: %s evt, MAC: %pM sta_id: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: %s evt, MAC: %pM sta_id: %d", adapter->dev->name, hdd_ipa_wlan_event_to_str(type), mac_addr, sta_id); @@ -3628,7 +3628,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, return -EINVAL; if (!hdd_ipa || !hdd_ipa_is_enabled(hdd_ipa->hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "IPA OFFLOAD NOT ENABLED"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA OFFLOAD NOT ENABLED"); return -EINVAL; } @@ -3702,7 +3702,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, qdf_mutex_acquire(&hdd_ipa->event_lock); if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d, IPA UC OFFLOAD NOT ENABLED", msg_ex->name, meta.msg_type); } else if ((!hdd_ipa->sap_num_connected_sta) && @@ -3711,7 +3711,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, ret = hdd_ipa_uc_handle_first_con(hdd_ipa); if (ret) { qdf_mutex_release(&hdd_ipa->event_lock); - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "handle 1st con ret %d", ret); hdd_ipa_uc_offload_enable_disable(adapter, SIR_STA_RX_DATA_OFFLOAD, 0); @@ -3754,7 +3754,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, qdf_mutex_acquire(&hdd_ipa->event_lock); ret = hdd_ipa_setup_iface(hdd_ipa, adapter, sta_id); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d, Interface setup failed", msg_ex->name, meta.msg_type); qdf_mutex_release(&hdd_ipa->event_lock); @@ -3774,7 +3774,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, hdd_ipa_cleanup_iface(adapter->ipa_context); if (!hdd_ipa->sta_connected) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d, STA already disconnected", msg_ex->name, meta.msg_type); qdf_mutex_release(&hdd_ipa->event_lock); @@ -3782,7 +3782,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, } hdd_ipa->sta_connected = 0; if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA UC OFFLOAD NOT ENABLED", msg_ex->name); } else { @@ -3806,7 +3806,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, case WLAN_AP_DISCONNECT: if (!adapter->ipa_context) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d, SAP already disconnected", msg_ex->name, meta.msg_type); return -EINVAL; @@ -3826,7 +3826,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, */ hdd_ipa_uc_disable_pipes(hdd_ipa); } else { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "NO INTF left but still pipe clean up"); hdd_ipa_uc_handle_last_discon(hdd_ipa); } @@ -3841,11 +3841,11 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, break; case WLAN_CLIENT_CONNECT_EX: - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%d %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%d %d", adapter->dev->ifindex, sta_id); if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d, IPA UC OFFLOAD NOT ENABLED", adapter->dev->name, meta.msg_type); return 0; @@ -3854,7 +3854,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, qdf_mutex_acquire(&hdd_ipa->event_lock); if (hdd_ipa_uc_find_add_assoc_sta(hdd_ipa, true, sta_id)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: STA ID %d found, not valid", adapter->dev->name, sta_id); qdf_mutex_release(&hdd_ipa->event_lock); @@ -3868,7 +3868,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, ret = hdd_ipa_uc_handle_first_con(hdd_ipa); if (ret) { qdf_mutex_release(&hdd_ipa->event_lock); - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: handle 1st con ret %d", adapter->dev->name, ret); return ret; @@ -3885,7 +3885,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, msg_ex = cdf_mem_malloc(meta.msg_len); if (msg_ex == NULL) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "msg_ex allocation failed"); return -ENOMEM; } @@ -3906,7 +3906,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, ret = ipa_send_msg(&meta, msg_ex, hdd_ipa_msg_free_fn); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d : %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d : %d", msg_ex->name, meta.msg_type, ret); cdf_mem_free(msg_ex); return ret; @@ -3916,7 +3916,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, case WLAN_CLIENT_DISCONNECT: if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPA UC OFFLOAD NOT ENABLED", msg_ex->name); return 0; @@ -3924,7 +3924,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, qdf_mutex_acquire(&hdd_ipa->event_lock); if (!hdd_ipa_uc_find_add_assoc_sta(hdd_ipa, false, sta_id)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: STA ID %d NOT found, not valid", msg_ex->name, sta_id); qdf_mutex_release(&hdd_ipa->event_lock); @@ -3949,7 +3949,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, meta.msg_len = sizeof(struct ipa_wlan_msg); msg = cdf_mem_malloc(meta.msg_len); if (msg == NULL) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "msg allocation failed"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "msg allocation failed"); return -ENOMEM; } @@ -3957,13 +3957,13 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, strlcpy(msg->name, adapter->dev->name, IPA_RESOURCE_NAME_MAX); memcpy(msg->mac_addr, mac_addr, ETH_ALEN); - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d", msg->name, meta.msg_type); ret = ipa_send_msg(&meta, msg, hdd_ipa_msg_free_fn); if (ret) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d", + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d", msg->name, meta.msg_type, ret); cdf_mem_free(msg); return ret; @@ -4015,7 +4015,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) hdd_ipa = cdf_mem_malloc(sizeof(*hdd_ipa)); if (!hdd_ipa) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, "hdd_ipa allocation failed"); + HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "hdd_ipa allocation failed"); goto fail_return; } @@ -4042,7 +4042,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) (0 == hdd_ipa->tx_comp_ring_base_paddr) || (0 == hdd_ipa->rx_rdy_ring_base_paddr) || (0 == hdd_ipa->rx2_rdy_ring_base_paddr)) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, + HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "IPA UC resource alloc fail"); goto fail_get_resource; } @@ -4185,7 +4185,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) * descriptor in IPA hardware */ if (hdd_ipa->pending_hw_desc_cnt != 0) { - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA Pending write done: %d Waiting!", hdd_ipa->pending_hw_desc_cnt); @@ -4193,7 +4193,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) usleep_range(100, 100); } - HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, + HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA Pending write done: desc: %d %s(%d)!", hdd_ipa->pending_hw_desc_cnt, hdd_ipa->pending_hw_desc_cnt == 0 ? "completed" @@ -4201,10 +4201,10 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) } if (hdd_ipa_uc_is_enabled(hdd_ctx)) { hdd_ipa_uc_rt_debug_deinit(hdd_ctx); - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disconnect TX PIPE", __func__); ipa_disconnect_wdi_pipe(hdd_ipa->tx_pipe_handle); - HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, + HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disconnect RX PIPE", __func__); ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle); qdf_mutex_destroy(&hdd_ipa->event_lock); diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 36bea4f1a510..7cba52d751ae 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -221,7 +221,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, if (!lro_hash_table) { hdd_err("Invalid hash entry"); - CDF_ASSERT(0); + QDF_ASSERT(0); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 965ef7b036a7..88374037a620 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -56,7 +56,7 @@ #include "wlan_hdd_power.h" #include "wlan_hdd_stats.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include #include @@ -333,14 +333,14 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb, hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (NULL == hdd_ctx) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("HDD Context Null Pointer")); - CDF_ASSERT(0); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("HDD Context Null Pointer")); + QDF_ASSERT(0); return NOTIFY_DONE; } if (cds_is_driver_recovering()) return NOTIFY_DONE; - hddLog(CDF_TRACE_LEVEL_INFO, FL("%s New Net Device State = %lu"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("%s New Net Device State = %lu"), dev->name, state); switch (state) { @@ -378,7 +378,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb, FL("Timeout occurred while waiting for abortscan")); } } else { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("Scan is not Pending from user")); } break; @@ -484,7 +484,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, */ static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) { - CDF_TRACE_LEVEL level; + QDF_TRACE_LEVEL level; /* * if the bitmask is the default value, then a bitmask was not @@ -496,13 +496,13 @@ static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) } /* a mask was specified. start by disabling all logging */ - cdf_trace_set_value(moduleId, CDF_TRACE_LEVEL_NONE, 0); + qdf_trace_set_value(moduleId, QDF_TRACE_LEVEL_NONE, 0); /* now cycle through the bitmask until all "set" bits are serviced */ - level = CDF_TRACE_LEVEL_FATAL; + level = QDF_TRACE_LEVEL_FATAL; while (0 != bitmask) { if (bitmask & 1) { - cdf_trace_set_value(moduleId, level, 1); + qdf_trace_set_value(moduleId, level, 1); } level++; bitmask >>= 1; @@ -544,13 +544,13 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) struct hdd_config *cfg_param = NULL; if (NULL == hdd_ctx) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("HDD Context is null !!")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("HDD Context is null !!")); return; } adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION); if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("adapter is null !!")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("adapter is null !!")); return; } @@ -558,7 +558,7 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) cfg_param = hdd_ctx->config; if (NULL == cfg_param) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cfg_params not available !!")); return; } @@ -569,7 +569,7 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) if ((eCSR_DOT11_MODE_AUTO == phyMode) || (eCSR_DOT11_MODE_11ac == phyMode) || (eCSR_DOT11_MODE_11ac_ONLY == phyMode)) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("Setting phymode to 11n!!")); sme_set_phy_mode(WLAN_HDD_GET_HAL_CTX(adapter), eCSR_DOT11_MODE_11n); @@ -627,7 +627,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (hdd_ctx == NULL) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is null")); return QDF_STATUS_E_FAILURE; } @@ -637,7 +637,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->ibssATIMWinSize, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_ATIM_WINDOW_SIZE failed %d"), ret); return QDF_STATUS_E_FAILURE; } @@ -647,7 +647,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->isIbssPowerSaveAllowed, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_SAVE_ALLOWED failed %d"), ret); return QDF_STATUS_E_FAILURE; @@ -658,7 +658,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config-> isIbssPowerCollapseAllowed, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_POWER_COLLAPSE_ALLOWED failed %d"), ret); return QDF_STATUS_E_FAILURE; @@ -669,7 +669,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->isIbssAwakeOnTxRx, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_AWAKE_ON_TX_RX failed %d"), ret); return QDF_STATUS_E_FAILURE; } @@ -679,7 +679,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->ibssInactivityCount, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_SET_INACTIVITY_TIME failed %d"), ret); return QDF_STATUS_E_FAILURE; } @@ -689,7 +689,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->ibssTxSpEndInactivityTime, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "WMA_VDEV_IBSS_SET_TXSP_END_INACTIVITY_TIME failed %d" ), @@ -702,7 +702,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->ibssPsWarmupTime, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMA_VDEV_IBSS_PS_SET_WARMUP_TIME_SECS failed %d"), ret); return QDF_STATUS_E_FAILURE; @@ -713,7 +713,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter) hdd_ctx->config->ibssPs1RxChainInAtimEnable, VDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "WMA_VDEV_IBSS_PS_SET_1RX_CHAIN_IN_ATIM_WINDOW failed %d" ), @@ -767,7 +767,7 @@ void hdd_update_macaddr(struct hdd_config *config, /* Set locally administered bit */ config->intfMacAddr[i].bytes[0] |= 0x02; config->intfMacAddr[i].bytes[3] = macaddr_b3; - hddLog(CDF_TRACE_LEVEL_INFO, "config->intfMacAddr[%d]: " + hddLog(QDF_TRACE_LEVEL_INFO, "config->intfMacAddr[%d]: " MAC_ADDRESS_STR, i, MAC_ADDR_ARRAY(config->intfMacAddr[i].bytes)); } @@ -793,7 +793,7 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, #ifdef FEATURE_WLAN_SCAN_PNO /* PNO offload */ - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("PNO Capability in f/w = %d"), cfg->pno_offload); if (cfg->pno_offload) config->PnoOffload = true; @@ -834,7 +834,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get MPDU DENSITY")); value = 0; } @@ -849,14 +849,14 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, cfg->mpdu_density); if (status == QDF_STATUS_E_FAILURE) - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set MPDU DENSITY to CCM")); } /* get the HT capability info */ status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, &val32); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get HT capability info")); return; } @@ -914,13 +914,13 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, val32 = val16; status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, val32); if (status != QDF_STATUS_SUCCESS) - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set HT capability to CCM")); #define WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES 0xff value = SIZE_OF_SUPPORTED_MCS_SET; if (sme_cfg_get_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set, &value) == QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_INFO, FL("Read MCS rate set")); + hddLog(QDF_TRACE_LEVEL_INFO, FL("Read MCS rate set")); if (pconfig->enable2x2) { for (value = 0; value < cfg->num_rf_chains; value++) @@ -933,7 +933,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, mcs_set, SIZE_OF_SUPPORTED_MCS_SET); if (status == QDF_STATUS_E_FAILURE) - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set MCS SET to CCM")); } } @@ -957,7 +957,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; } @@ -972,7 +972,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_max_mpdu); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set VHT MAX MPDU LENGTH")); } } @@ -983,7 +983,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH")); value = 0; } @@ -994,7 +994,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT LDPC CODING CAP")); value = 0; } @@ -1006,7 +1006,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_rx_ldpc); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set VHT LDPC CODING CAP to CCM")); } } @@ -1016,7 +1016,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80MHZ")); value = 0; } @@ -1028,7 +1028,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_short_gi_80); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set SHORT GI 80MHZ to CCM")); } } @@ -1039,7 +1039,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get SHORT GI 80 & 160")); value = 0; } @@ -1048,7 +1048,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT TX STBC")); value = 0; } @@ -1059,7 +1059,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_tx_stbc); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TX STBC to CCM")); } } @@ -1068,7 +1068,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT RX STBC")); value = 0; } @@ -1079,7 +1079,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_rx_stbc); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set the VHT RX STBC to CCM")); } } @@ -1089,7 +1089,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT SU BEAMFORMER CAP")); value = 0; } @@ -1101,7 +1101,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_su_bformer); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMER CAP")); } } @@ -1115,7 +1115,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, pconfig->enableTxBF); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set VHT SU BEAMFORMEE CAP")); } @@ -1124,7 +1124,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMER CAP")); value = 0; } @@ -1136,7 +1136,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_mu_bformer); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL( "could not set the VHT MU BEAMFORMER CAP to CCM" )); @@ -1148,7 +1148,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT MU BEAMFORMEE CAP")); value = 0; } @@ -1160,7 +1160,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_mu_bformee); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set VHT MU BEAMFORMER CAP")); } } @@ -1170,7 +1170,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT AMPDU LEN")); value = 0; } @@ -1189,7 +1189,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_max_ampdu_len_exp); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set the VHT AMPDU LEN EXP")); } } @@ -1198,7 +1198,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, &value); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get VHT TXOP PS")); value = 0; } @@ -1209,7 +1209,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, cfg->vht_txop_ps); if (status == QDF_STATUS_E_FAILURE) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("could not set the VHT TXOP PS")); } } @@ -1288,7 +1288,7 @@ void hdd_update_tgt_cfg(void *context, void *param) else if ((hdd_ctx->config->nBandCapability != eCSR_BAND_ALL) && (temp_band_cap != eCSR_BAND_ALL) && (hdd_ctx->config->nBandCapability != temp_band_cap)) { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, FL("ini BandCapability not supported by the target")); } @@ -1302,7 +1302,7 @@ void hdd_update_tgt_cfg(void *context, void *param) if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) { hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "Invalid MAC passed from target, using MAC from ini file" MAC_ADDRESS_STR), @@ -1441,7 +1441,7 @@ static int __hdd_open(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1497,7 +1497,7 @@ static int __hdd_stop(struct net_device *dev) ENTER(); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->sessionId, adapter->device_mode)); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1506,14 +1506,14 @@ static int __hdd_stop(struct net_device *dev) /* Nothing to be done if the interface is not opened */ if (false == test_bit(DEVICE_IFACE_OPENED, &adapter->event_flags)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("NETDEV Interface is not OPENED")); return -ENODEV; } /* Make sure the interface is marked as closed */ clear_bit(DEVICE_IFACE_OPENED, &adapter->event_flags); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Disabling OS Tx queues")); + hddLog(QDF_TRACE_LEVEL_INFO, FL("Disabling OS Tx queues")); /* * Disable TX on the interface, after this hard_start_xmit() will not @@ -1734,15 +1734,15 @@ static void __hdd_set_multicast_list(struct net_device *dev) return; if (dev->flags & IFF_ALLMULTI) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("allow all multicast frames")); adapter->mc_addr_list.mc_cnt = 0; } else { mc_count = netdev_mc_count(dev); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("mc_count = %u"), mc_count); if (mc_count > WLAN_HDD_MAX_MC_ADDR_LIST) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL( "No free filter available; allow all multicast frames" )); @@ -1776,7 +1776,7 @@ static void __hdd_set_multicast_list(struct net_device *dev) ETH_ALEN); memcpy(&(adapter->mc_addr_list.addr[i][0]), ha->addr, ETH_ALEN); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("mlist[%d] = " MAC_ADDRESS_STR), i, MAC_ADDR_ARRAY(adapter->mc_addr_list.addr[i])); i++; @@ -1942,19 +1942,19 @@ QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, if (rtnl_held) { if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) { if (dev_alloc_name(pWlanDev, pWlanDev->name) < 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Failed:dev_alloc_name")); return QDF_STATUS_E_FAILURE; } } if (register_netdevice(pWlanDev)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); return QDF_STATUS_E_FAILURE; } } else { if (register_netdev(pWlanDev)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Failed:register_netdev")); return QDF_STATUS_E_FAILURE; } @@ -1969,12 +1969,12 @@ static QDF_STATUS hdd_sme_close_session_callback(void *pContext) hdd_adapter_t *adapter = pContext; if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("NULL adapter")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("NULL adapter")); return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid magic")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid magic")); return QDF_STATUS_NOT_INITIALIZED; } @@ -2163,7 +2163,7 @@ void hdd_cleanup_actionframe(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) &adapter->tx_action_cnf_event, msecs_to_jiffies(ACTION_FRAME_TX_TIMEOUT)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD Wait for Action Confirmation Failed!!")); /* * Inform tx status as FAILURE to upper layer and free @@ -2299,7 +2299,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, * Max limit reached on the number of vdevs configured by the * host. Return error */ - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "Unable to add virtual intf: currentVdevCnt=%d,hostConfiguredVdevCnt=%d" ), @@ -2309,7 +2309,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, if (macAddr == NULL) { /* Not received valid macAddr */ - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "Unable to add virtual intf: Not able to get valid mac address" )); @@ -2317,7 +2317,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, } status = hdd_check_for_existing_macaddr(hdd_ctx, macAddr); if (QDF_STATUS_E_FAILURE == status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "Duplicate MAC addr: " MAC_ADDRESS_STR " already exists", MAC_ADDR_ARRAY(macAddr)); @@ -2337,7 +2337,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name); if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("failed to allocate adapter for session %d"), session_type); return NULL; @@ -2409,7 +2409,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, hdd_wlan_create_ap_dev(hdd_ctx, macAddr, (uint8_t *) iface_name); if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("failed to allocate adapter for session %d"), session_type); return NULL; @@ -2444,7 +2444,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name); if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("failed to allocate adapter for session %d"), session_type); return NULL; @@ -2469,10 +2469,10 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, break; default: { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid session type %d"), session_type); - CDF_ASSERT(0); + QDF_ASSERT(0); return NULL; } } @@ -2508,7 +2508,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, /* Initialize the WoWL service */ if (!hdd_init_wowl(adapter)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("hdd_init_wowl failed")); goto err_lro_cleanup; } @@ -2516,7 +2516,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, /* Adapter successfully added. Increment the vdev count */ hdd_ctx->current_intf_count++; - hddLog(CDF_TRACE_LEVEL_DEBUG, FL("current_intf_count=%d"), + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("current_intf_count=%d"), hdd_ctx->current_intf_count); cds_check_and_restart_sap_with_non_dfs_acs(); @@ -2539,7 +2539,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, VDEV_CMD); if (ret != 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("DTIM 1 chain set failed %d"), ret); goto err_lro_cleanup; } @@ -2549,7 +2549,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, hdd_ctx->config->txchainmask1x1, PDEV_CMD); if (ret != 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMI_PDEV_PARAM_TX_CHAIN_MASK set failed %d"), ret); goto err_lro_cleanup; @@ -2559,7 +2559,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, hdd_ctx->config->rxchainmask1x1, PDEV_CMD); if (ret != 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMI_PDEV_PARAM_RX_CHAIN_MASK set failed %d"), ret); goto err_lro_cleanup; @@ -2575,7 +2575,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, PDEV_CMD); if (ret != 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WMI_PDEV_PARAM_HYST_EN set failed %d"), ret); goto err_lro_cleanup; @@ -2673,7 +2673,7 @@ QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, status = hdd_get_front_adapter(hdd_ctx, &pCurrent); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"), + hddLog(QDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"), status); return status; } @@ -2821,7 +2821,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "wait on disconnect_comp_var failed" )); @@ -2893,7 +2893,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, * is no sap restart work pending. */ cds_flush_work(&hdd_ctx->sap_start_work); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Canceled the pending SAP restart work")); cds_change_sap_restart_required_status(false); } @@ -3119,11 +3119,11 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) case WLAN_HDD_P2P_GO: #ifdef MSM_PLATFORM - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("[SSR] send stop ap to supplicant")); cfg80211_ap_stopped(adapter->dev, GFP_KERNEL); #else - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("[SSR] send restart supplicant")); /* event supplicant to restart */ cfg80211_del_sta(adapter->dev, @@ -3259,7 +3259,7 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *hdd_ctx, adapterNode = pNext; } - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("vdev_id %d does not exist with host"), vdev_id); return NULL; @@ -3517,7 +3517,7 @@ static void hdd_disable_ftm(hdd_context_t *hdd_ctx) if (hdd_ftm_stop(hdd_ctx)) { hdd_alert("hdd_ftm_stop Failed!"); - CDF_ASSERT(0); + QDF_ASSERT(0); } hdd_ctx->ftm.ftm_state = WLAN_FTM_STOPPED; @@ -3706,7 +3706,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) if (!QDF_IS_STATUS_SUCCESS (qdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate Bus bandwidth timer")); } #endif @@ -3719,7 +3719,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) if (!QDF_IS_STATUS_SUCCESS (qdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Cannot deallocate ACS Skip timer")); } #endif @@ -3756,9 +3756,9 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) /* Stop all the modules */ qdf_status = cds_disable(p_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed to stop CDS")); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } /* @@ -3768,9 +3768,9 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) */ qdf_status = cds_sched_close(p_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK /* Destroy the wake lock */ @@ -3825,7 +3825,7 @@ void __hdd_wlan_exit(void) hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); if (!hdd_ctx) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context")); EXIT(); return; } @@ -3951,7 +3951,7 @@ QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) */ cdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL( "sme_hdd_ready_ind() failed with status code %08d [x%08x]" ), @@ -4013,7 +4013,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_compiled_version(hdd_ctx->hHal, &versionCompiled); if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN compiled version" )); @@ -4023,7 +4023,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) vstatus = sme_get_wcnss_wlan_reported_version(hdd_ctx->hHal, &versionReported); if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS WLAN reported version" )); @@ -4058,7 +4058,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) versionString, sizeof(versionString)); if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS software version string" )); @@ -4072,7 +4072,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx) versionString, sizeof(versionString)); if (!QDF_IS_STATUS_SUCCESS(vstatus)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL( "unable to retrieve WCNSS hardware version string" )); @@ -4153,7 +4153,7 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) */ status = cds_regulatory_init(); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_init_wiphy failed")); return status; } @@ -4178,7 +4178,7 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) /* registration of wiphy dev with cfg80211 */ if (0 > wlan_hdd_cfg80211_register(wiphy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("wiphy register failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("wiphy register failed")); status = QDF_STATUS_E_FAILURE; } @@ -4211,7 +4211,7 @@ void hdd_cnss_request_bus_bandwidth(hdd_context_t *hdd_ctx, next_vote_level; if (hdd_ctx->cur_vote_level != next_vote_level) { - hddLog(CDF_TRACE_LEVEL_DEBUG, + hddLog(QDF_TRACE_LEVEL_DEBUG, FL( "trigger level %d, tx_packets: %lld, rx_packets: %lld" ), @@ -4233,7 +4233,7 @@ void hdd_cnss_request_bus_bandwidth(hdd_context_t *hdd_ctx, next_rx_level; if (hdd_ctx->cur_rx_level != next_rx_level) { - hddLog(CDF_TRACE_LEVEL_DEBUG, + hddLog(QDF_TRACE_LEVEL_DEBUG, FL("TCP DELACK trigger level %d, average_rx: %llu"), next_rx_level, temp_rx); hdd_ctx->cur_rx_level = next_rx_level; @@ -4329,7 +4329,7 @@ static void hdd_bus_bw_compute_cbk(void *priv) rx_packets += (uint64_t)ipa_rx_packets; if (!connected) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("bus bandwidth timer running in disconnected state")); return; } @@ -4355,24 +4355,24 @@ void wlan_hdd_display_tx_rx_histogram(hdd_context_t *hdd_ctx) int i; #ifdef MSM_PLATFORM - hddLog(CDF_TRACE_LEVEL_ERROR, "BW Interval: %d curr_index %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "BW Interval: %d curr_index %d", hdd_ctx->config->busBandwidthComputeInterval, hdd_ctx->hdd_txrx_hist_idx); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "BW High TH: %d BW Med TH: %d BW Low TH: %d", hdd_ctx->config->busBandwidthHighThreshold, hdd_ctx->config->busBandwidthMediumThreshold, hdd_ctx->config->busBandwidthLowThreshold); - hddLog(CDF_TRACE_LEVEL_ERROR, "TCP DEL High TH: %d TCP DEL Low TH: %d", + hddLog(QDF_TRACE_LEVEL_ERROR, "TCP DEL High TH: %d TCP DEL Low TH: %d", hdd_ctx->config->tcpDelackThresholdHigh, hdd_ctx->config->tcpDelackThresholdLow); #endif - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "index, total_rx, interval_rx, total_tx, interval_tx, next_vote_level, next_rx_level, next_tx_level"); for (i = 0; i < NUM_TX_RX_HISTOGRAM; i++) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%d: %llu, %llu, %llu, %llu, %d, %d, %d", i, hdd_ctx->hdd_txrx_hist[i].total_rx, hdd_ctx->hdd_txrx_hist[i].interval_rx, @@ -4415,33 +4415,33 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx) while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "Session_id %d device mode %d current index %d", adapter->sessionId, adapter->device_mode, adapter->history_index); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "Netif queue operation statistics:"); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "Current pause_map value %x", adapter->pause_map); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, " reason_type: pause_cnt: unpause_cnt"); for (i = 0; i < WLAN_REASON_TYPE_MAX; i++) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: %d: %d", hdd_reason_type_to_string(i), adapter->queue_oper_stats[i].pause_count, adapter->queue_oper_stats[i].unpause_count); } - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "Netif queue operation history:"); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "index: time: action_type: reason_type: pause_map"); for (i = 0; i < WLAN_HDD_MAX_HISTORY_ENTRY; i++) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%d: %u: %s: %s: %x", i, qdf_system_ticks_to_msecs( adapter->queue_oper_history[i].time), @@ -4630,13 +4630,13 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, if (!is_unsafe) { safe_channels[safe_channel_count] = CDS_CHANNEL_NUM(i); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("safe channel %d"), safe_channels[safe_channel_count]); safe_channel_count++; } } - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("perferred range %d - %d"), ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch, ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch); @@ -4645,7 +4645,7 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch && safe_channels[i] <= ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch) { - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("safe channel %d is in perferred range"), safe_channels[i]); return 1; @@ -4735,7 +4735,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) /* Basic sanity */ if (!hdd_context || !indi_param) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid arguments")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid arguments")); return; } @@ -4744,7 +4744,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) cds_context = hdd_ctxt->pcds_context; /* Make unsafe channel list */ - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("band count %d"), ch_avoid_indi->avoid_range_count); @@ -4829,7 +4829,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) } } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("number of unsafe channels is %d "), hdd_ctxt->unsafe_channel_count); @@ -4847,7 +4847,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) for (channel_loop = 0; channel_loop < hdd_ctxt->unsafe_channel_count; channel_loop++) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("channel %d is not safe "), hdd_ctxt->unsafe_channel_list[channel_loop]); } @@ -4869,7 +4869,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) hostapd_adapter))) return; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL( "Current operation channel %d, sessionCtx.ap.sapConfig.channel %d" ), @@ -4888,7 +4888,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) sapConfig.acs_cfg.acs_mode == true) && !restart_sap_in_progress) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("Restarting SAP")); wlan_hdd_send_svc_nlink_msg (WLAN_SVC_LTE_COEX_IND, NULL, 0); @@ -4926,14 +4926,14 @@ static void hdd_init_channel_avoidance(hdd_context_t *hdd_ctx) &(hdd_ctx->unsafe_channel_count), sizeof(uint16_t) * NUM_20MHZ_RF_CHANNELS); - hddLog(CDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"), hdd_ctx->unsafe_channel_count); unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, (uint16_t)NUM_20MHZ_RF_CHANNELS); for (index = 0; index < unsafe_channel_count; index++) { - hddLog(CDF_TRACE_LEVEL_INFO, FL("channel %d is not safe"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("channel %d is not safe"), hdd_ctx->unsafe_channel_list[index]); } @@ -5472,7 +5472,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = cds_open(); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_open failed")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_open failed")); goto err_hdd_free_context; } @@ -5481,13 +5481,13 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_ctx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == hdd_ctx->hHal) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("HAL context is null")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("HAL context is null")); goto err_cds_close; } status = cds_pre_enable(hdd_ctx->pcds_context); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed")); goto err_cds_close; } @@ -5496,7 +5496,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = wlan_hdd_regulatory_init(hdd_ctx); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_cds_close; } @@ -5518,7 +5518,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = hdd_set_sme_config(hdd_ctx); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config")); goto err_wiphy_unregister; } @@ -5526,27 +5526,27 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) hdd_ctx->config->tx_chain_mask_1ss, PDEV_CMD); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: WMI_PDEV_PARAM_TX_CHAIN_MASK_1SS failed %d", __func__, ret); } status = hdd_set_sme_chan_list(hdd_ctx); if (status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed to init channel list")); goto err_wiphy_unregister; } /* Apply the cfg.ini to cfg.dat */ if (false == hdd_update_config_dat(hdd_ctx)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("config update failed")); goto err_wiphy_unregister; } if (QDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, FL("can't update mac config, using MAC from ini file")); } @@ -5574,7 +5574,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) */ status = cds_enable(hdd_ctx->pcds_context); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_enable failed")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_enable failed")); goto err_ipa_cleanup; } @@ -5582,7 +5582,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) status = hdd_post_cds_enable_config(hdd_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("hdd_post_cds_enable_config failed")); goto err_cds_disable; } @@ -5629,7 +5629,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) /* Initialize the nlink service */ if (nl_srv_init() != 0) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("nl_srv_init failed")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("nl_srv_init failed")); goto err_close_adapter; } @@ -5824,15 +5824,15 @@ err_wiphy_unregister: err_cds_close: status = cds_sched_close(hdd_ctx->pcds_context); if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed to close CDS Scheduler")); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } cds_close(hdd_ctx->pcds_context); err_hdd_free_context: hdd_free_context(hdd_ctx); - CDF_BUG(1); + QDF_BUG(1); return -EIO; @@ -6144,7 +6144,7 @@ void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len) skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), flags); if (skb == NULL) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("alloc_skb failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("alloc_skb failed")); return; } @@ -6183,7 +6183,7 @@ void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len) break; default: - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("WLAN SVC: Attempt to send unknown nlink message %d"), type); kfree_skb(skb); @@ -6226,7 +6226,7 @@ void wlan_hdd_send_version_pkg(uint32_t fw_version, ret = cnss_get_platform_cap(&cap); if (ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("platform capability info from CNSS not available")); return; } @@ -6256,7 +6256,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) QDF_STATUS status; if (!hdd_ctx) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("NULL pointer for hdd_ctx")); return; } @@ -6440,7 +6440,7 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) if (QDF_TIMER_STATE_RUNNING != qdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) { /* trying to stop timer, when not running is not good */ - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("bus band width compute timer is not running")); return; } @@ -6517,14 +6517,14 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, (channel_id < SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { *concurrent_chnl_same = false; - hddLog(CDF_TRACE_LEVEL_INFO_MED, + hddLog(QDF_TRACE_LEVEL_INFO_MED, FL("channels are different")); } } else if ((WLAN_HDD_P2P_GO == device_mode) && (channel_id >= SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { *concurrent_chnl_same = false; - hddLog(CDF_TRACE_LEVEL_INFO_MED, + hddLog(QDF_TRACE_LEVEL_INFO_MED, FL("channels are different")); } } @@ -6536,7 +6536,7 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, * Return the status as failure so caller function could know * that scan look up is failed. */ - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Finding AP from scan cache failed")); return QDF_STATUS_E_FAILURE; } @@ -6563,7 +6563,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) #endif if (NULL == ap_adapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("ap_adapter is NULL here")); return; } @@ -6571,7 +6571,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); if (0 != wlan_hdd_validate_context(hdd_ctx)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return; } @@ -6591,7 +6591,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) #endif hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Now doing SAP STOPBSS")); qdf_event_reset(&hostapd_state->cdf_stop_bss_event); if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> @@ -6601,7 +6601,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { mutex_unlock(&hdd_ctx->sap_lock); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP Stop Failed")); return; } @@ -6609,10 +6609,10 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags); cds_decr_session_set_pcl(ap_adapter->device_mode, ap_adapter->sessionId); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Stop Success")); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Can't stop ap because its not started")); } mutex_unlock(&hdd_ctx->sap_lock); @@ -6636,7 +6636,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) tsap_Config_t *sap_config; if (NULL == ap_adapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("ap_adapter is NULL here")); return; } @@ -6652,7 +6652,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) sap_config = &ap_adapter->sessionCtx.ap.sapConfig; if (0 != wlan_hdd_validate_context(hdd_ctx)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return; } @@ -6672,15 +6672,15 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) != QDF_STATUS_SUCCESS) goto end; - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Waiting for SAP to start")); qdf_status = qdf_wait_single_event(&hostapd_state->cdf_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("SAP Start failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP Start failed")); goto end; } - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Start Success")); + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Start Success")); set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags); cds_incr_active_session(ap_adapter->device_mode, ap_adapter->sessionId); diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index 29c857962a2e..f1907e2f8389 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -60,7 +60,7 @@ struct qca_napi_data *hdd_napi_get_all(void) hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) - CDF_ASSERT(NULL != hif); /* WARN */ + QDF_ASSERT(NULL != hif); /* WARN */ else rp = hif_napi_get_all(hif); @@ -112,7 +112,7 @@ int hdd_napi_create(void) hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) { - CDF_ASSERT(NULL != hif_ctx); + QDF_ASSERT(NULL != hif_ctx); rc = -EFAULT; } else { /* @@ -168,7 +168,7 @@ int hdd_napi_destroy(int force) hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif_ctx)) - CDF_ASSERT(NULL != hif_ctx); + QDF_ASSERT(NULL != hif_ctx); else for (i = 0; i < CE_COUNT_MAX; i++) if (hdd_napi_map & (0x01 << i)) { @@ -189,7 +189,7 @@ int hdd_napi_destroy(int force) * to be removed */ if (force) - CDF_ASSERT(hdd_napi_map == 0); + QDF_ASSERT(hdd_napi_map == 0); if (0 == hdd_napi_map) hdd_napi_ctx = NULL; @@ -212,7 +212,7 @@ int hdd_napi_enabled(int id) hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) - CDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */ + QDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */ else if (-1 == id) rc = hif_napi_enabled(hif, id); else @@ -245,7 +245,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data) hif = cds_get_context(QDF_MODULE_ID_HIF); if (unlikely(NULL == hif)) - CDF_ASSERT(hif != NULL); + QDF_ASSERT(hif != NULL); else rc = hif_napi_event(hif, event, data); diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index f2247e247b7f..d310bb391cea 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -183,14 +183,14 @@ static void send_oem_reg_rsp_nlink_msg(void) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -223,7 +223,7 @@ static void send_oem_reg_rsp_nlink_msg(void) *deviceMode = pAdapter->device_mode; *vdevId = pAdapter->sessionId; (*numInterfaces)++; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: numInterfaces: %d, deviceMode: %d, vdevId: %d", __func__, *numInterfaces, *deviceMode, *vdevId); @@ -238,7 +238,7 @@ static void send_oem_reg_rsp_nlink_msg(void) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sending App Reg Response length (%d) to process pid (%d)", __func__, aniHdr->length, p_hdd_ctx->oem_pid); @@ -265,7 +265,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -286,7 +286,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code) skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + aniHdr->length)); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sending oem error response to process pid (%d)", __func__, app_pid); @@ -314,13 +314,13 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return; } if (length > OEM_DATA_RSP_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: invalid length of Oem Data response", __func__); return; } @@ -328,7 +328,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + OEM_DATA_RSP_SIZE), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -348,7 +348,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sending Oem Data Response of len (%d) to process pid (%d)", __func__, length, p_hdd_ctx->oem_pid); @@ -376,13 +376,13 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) /* for now, STA interface only */ pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); if (!pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); return QDF_STATUS_E_FAILURE; } if (!oemData) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: oemData is null", __func__); return QDF_STATUS_E_FAILURE; } @@ -398,7 +398,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) oemDataReqConfig.data_len = oemDataLen; cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: calling sme_oem_data_req", __func__); status = sme_oem_data_req(p_hdd_ctx->hHal, @@ -437,7 +437,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* OEM message is always to a specific process and cannot be a broadcast */ if (p_hdd_ctx->oem_pid == 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: invalid dest pid", __func__); return -EPERM; } @@ -446,7 +446,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) numOfChannels * sizeof(tHddChannelInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return -ENOMEM; } @@ -498,7 +498,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) /* channel info is not returned, fill in zeros in channel * info struct */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sme_get_reg_info failed for chan (%d), return info 0", __func__, chanId); hddChanInfo.chan_id = chanId; @@ -516,7 +516,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sending channel info resp for num channels (%d) to pid (%d)", __func__, numOfChannels, p_hdd_ctx->oem_pid); @@ -674,7 +674,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, tPeerStatusInfo *pPeerInfo; if (!p_hdd_ctx || !p_hdd_ctx->hHal) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Either HDD Ctx is null or Hal Ctx is null", __func__); return; @@ -682,7 +682,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, /* check if oem app has registered and pid is valid */ if ((!p_hdd_ctx->oem_app_registered) || (p_hdd_ctx->oem_pid == 0)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s: OEM app is not registered(%d) or pid is invalid(%d)", __func__, p_hdd_ctx->oem_app_registered, p_hdd_ctx->oem_pid); @@ -693,7 +693,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, sizeof(tPeerStatusInfo)), GFP_KERNEL); if (skb == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: alloc_skb failed", __func__); return; } @@ -741,7 +741,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, } skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s: sending peer " MAC_ADDRESS_STR " status(%d), peerTimingMeasCap(%d), vdevId(%d), chanId(%d)" " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d)," @@ -787,14 +787,14 @@ static int oem_msg_callback(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (!nlh) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Netlink header null", __func__); return -EPERM; } ret = wlan_hdd_validate_context(p_hdd_ctx); if (0 != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return ret; } @@ -802,7 +802,7 @@ static int oem_msg_callback(struct sk_buff *skb) msg_hdr = NLMSG_DATA(nlh); if (!msg_hdr) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Message header null", __func__); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, OEM_ERR_NULL_MESSAGE_HEADER); @@ -811,7 +811,7 @@ static int oem_msg_callback(struct sk_buff *skb) if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr) + msg_hdr->length)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid nl msg len, nlh->nlmsg_len (%d), msg_hdr->len (%d)", __func__, nlh->nlmsg_len, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -822,7 +822,7 @@ static int oem_msg_callback(struct sk_buff *skb) switch (msg_hdr->type) { case ANI_MSG_APP_REG_REQ: /* Registration request is only allowed for Qualcomm Application */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received App Req Req from App process pid(%d), len(%d)", __func__, nlh->nlmsg_pid, msg_hdr->length); @@ -830,7 +830,7 @@ static int oem_msg_callback(struct sk_buff *skb) if ((OEM_APP_SIGNATURE_LEN == msg_hdr->length) && (0 == strncmp(sign_str, OEM_APP_SIGNATURE_STR, OEM_APP_SIGNATURE_LEN))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Valid App Req Req from oem app process pid(%d)", __func__, nlh->nlmsg_pid); @@ -838,7 +838,7 @@ static int oem_msg_callback(struct sk_buff *skb) p_hdd_ctx->oem_pid = nlh->nlmsg_pid; send_oem_reg_rsp_nlink_msg(); } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid signature in App Reg Request from pid(%d)", __func__, nlh->nlmsg_pid); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -848,14 +848,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_OEM_DATA_REQ: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received Oem Data Request length(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: OEM DataReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -865,7 +865,7 @@ static int oem_msg_callback(struct sk_buff *skb) } if ((!msg_hdr->length) || (OEM_DATA_REQ_SIZE < msg_hdr->length)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in Oem Data Request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -878,14 +878,14 @@ static int oem_msg_callback(struct sk_buff *skb) break; case ANI_MSG_CHANNEL_INFO_REQ: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received channel info request, num channel(%d) from pid: %d", __func__, msg_hdr->length, nlh->nlmsg_pid); if ((!p_hdd_ctx->oem_app_registered) || (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) { /* either oem app is not registered yet or pid is different */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Chan InfoReq: app not registered(%d) or incorrect pid(%d)", __func__, p_hdd_ctx->oem_app_registered, nlh->nlmsg_pid); @@ -897,7 +897,7 @@ static int oem_msg_callback(struct sk_buff *skb) /* message length contains list of channel ids */ if ((!msg_hdr->length) || (WNI_CFG_VALID_CHANNEL_LIST_LEN < msg_hdr->length)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid length (%d) in channel info request", __func__, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, @@ -958,7 +958,7 @@ static int oem_msg_callback(struct sk_buff *skb) break; default: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Received Invalid message type (%d), length (%d)", __func__, msg_hdr->type, msg_hdr->length); send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid, diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 6751a5170f70..391bcde2a2b0 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -41,7 +41,7 @@ #include "wlan_hdd_p2p.h" #include "sap_api.h" #include "wlan_hdd_main.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include #include #include @@ -49,7 +49,7 @@ #include "wlan_hdd_tdls.h" #include "wlan_hdd_trace.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_sched.h" #include "cds_concurrency.h" @@ -400,7 +400,7 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter) unsigned long rc; hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: ROC completion is not received.!!!", __func__); @@ -438,8 +438,8 @@ wait: msecs_to_jiffies (WAIT_CANCEL_REM_CHAN)); if (!rc) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Timeout occurred while waiting for RoC Cancellation", __func__); mutex_lock(&cfg_state->remain_on_chan_ctx_lock); @@ -472,7 +472,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(hdd_adapter_t *pAdapter) mutex_lock(&cfgState->remain_on_chan_ctx_lock); while (pAdapter->is_roc_inprogress) { mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: ROC in progress for session %d!!!", __func__, pAdapter->sessionId); msleep(500); @@ -554,7 +554,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, mutex_lock(&cfgState->remain_on_chan_ctx_lock); if (pAdapter->is_roc_inprogress == true) { mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("remain on channel request is in execution")); return -EBUSY; } @@ -570,7 +570,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, QDF_TIMER_TYPE_SW, wlan_hdd_remain_on_chan_timeout, pAdapter); if (qdf_status != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Not able to initialize remain_on_chan timer")); mutex_lock(&cfgState->remain_on_chan_ctx_lock); cfgState->remain_on_chan_ctx = NULL; @@ -673,7 +673,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, #endif (SIR_MAC_MGMT_FRAME << 2) | (SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("wlansap_register_mgmt_frame return fail")); wlansap_cancel_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -807,7 +807,7 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) hdd_roc_req->pAdapter, hdd_roc_req->pRemainChanCtx); if (ret == -EBUSY) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("dropping RoC request")); wlan_hdd_indicate_roc_drop(hdd_roc_req->pAdapter, hdd_roc_req->pRemainChanCtx); @@ -851,7 +851,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, } pRemainChanCtx = cdf_mem_malloc(sizeof(hdd_remain_on_chan_ctx_t)); if (NULL == pRemainChanCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Not able to allocate memory for Channel context", __func__); return -ENOMEM; @@ -954,7 +954,7 @@ int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_REMAIN_ON_CHANNEL, pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST)); @@ -1000,7 +1000,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, mutex_lock(&cfgState->remain_on_chan_ctx_lock); pRemainChanCtx = cfgState->remain_on_chan_ctx; if (pRemainChanCtx != NULL) { - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_REMAINCHANREADYHANDLER, pAdapter->sessionId, pRemainChanCtx->duration)); @@ -1260,7 +1260,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ACTION, pAdapter->sessionId, pAdapter->device_mode)); status = wlan_hdd_validate_context(pHddCtx); @@ -1279,13 +1279,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, [WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET])) { actionFrmType = buf[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET]; if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "[P2P] unknown[%d] ---> OTA to " MAC_ADDRESS_STR, actionFrmType, MAC_ADDR_ARRAY(&buf [WLAN_HDD_80211_FRM_DA_OFFSET])); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, "[P2P] %s ---> OTA to " + hddLog(QDF_TRACE_LEVEL_ERROR, "[P2P] %s ---> OTA to " MAC_ADDRESS_STR, p2p_action_frame_type[actionFrmType], MAC_ADDR_ARRAY(&buf @@ -1362,7 +1362,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, memcpy(&dstMac, &buf[WLAN_HDD_80211_FRM_DA_OFFSET], ETH_ALEN); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Deauth/Disassoc received for STA:" MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(dstMac)); @@ -1444,7 +1444,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, true) { mutex_unlock(&cfgState-> remain_on_chan_ctx_lock); - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "action frame tx: waiting for completion of ROC "); rc = wait_for_completion_timeout @@ -1576,7 +1576,7 @@ send_frame: sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, buf, len, extendedWait, noack, current_freq)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_send_action returned fail", __func__); goto err; } @@ -1723,19 +1723,19 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimeter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &count, &start_time, &duration); if (ret != 3) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO NoA: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO NoA: count=%d start_time=%d duration=%d", __func__, count, start_time, duration); duration = MS_TO_MUS(duration); @@ -1758,7 +1758,7 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command) NoA.count = count; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1801,19 +1801,19 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) param = strnchr(command, strlen(command), ' '); if (param == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: strnchr failed to find delimiter", __func__); return -EINVAL; } param++; ret = sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow); if (ret != 3) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: P2P_SET GO PS: fail to read params, ret=%d", __func__, ret); return -EINVAL; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d", __func__, legacy_ps, opp_ps, ctwindow); @@ -1831,7 +1831,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) */ if (ctwindow != -1) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "Opportunistic Power Save is %s", (true == pAdapter->ops) ? "Enable" : "Disable"); @@ -1849,8 +1849,8 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, @@ -1878,7 +1878,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command) NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC; NoA.sessionid = pAdapter->sessionId; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d " "interval %d count %d single noa duration %d " "PsSelection %x", __func__, NoA.opp_ps, @@ -1961,7 +1961,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, if (0 != ret) return ERR_PTR(ret); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type)); /* * Allow addition multiple interfaces for WLAN_HDD_P2P_GO, @@ -2018,7 +2018,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, } if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", __func__); return ERR_PTR(-ENOSPC); } @@ -2053,7 +2053,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_DEL_VIRTUAL_INTF, pVirtAdapter->sessionId, pVirtAdapter->device_mode)); hddLog(LOG1, FL("Device_mode %s(%d)"), @@ -2100,7 +2100,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL; hdd_context_t *pHddCtx; - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d", + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d", __func__, frameType, nFrameLength); if (NULL == pAdapter) { @@ -2187,13 +2187,13 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, actionFrmType); #ifdef WLAN_FEATURE_P2P_DEBUG if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "[P2P] unknown[%d] <--- OTA" " from " MAC_ADDRESS_STR, actionFrmType, MAC_ADDR_ARRAY(macFrom)); } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "[P2P] %s <--- OTA" " from " MAC_ADDRESS_STR, p2p_action_frame_type diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 73ed40953d24..b26c9e8e36c7 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -120,14 +120,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: sme_set_gtk_offload failed, returned %d", __func__, ret); return; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: sme_set_gtk_offload successfull", __func__); } @@ -146,14 +146,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) wlan_hdd_cfg80211_update_replay_counter_callback, pAdapter, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: sme_get_gtk_offload failed, returned %d", __func__, ret); return; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: sme_get_gtk_offload successful", __func__); @@ -169,14 +169,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) &hddGtkOffloadReqParams, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: failed to dissable GTK offload, returned %d", __func__, ret); return; } - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: successfully dissabled GTK offload request to HAL", __func__); } @@ -719,7 +719,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD; offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE; - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Enabled", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Enabled", __func__); if (((HDD_MCASTBCASTFILTER_FILTER_ALL_BROADCAST == pHddCtx->sus_res_mcastbcast_filter) || @@ -729,11 +729,11 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) pHddCtx->sus_res_mcastbcast_filter_valid)) { offLoadRequest.enableOrDisable = SIR_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "offload: inside arp offload conditional check"); } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "offload: arp filter programmed = %d", offLoadRequest.enableOrDisable); @@ -742,7 +742,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.params.hostIpv4Addr[i] = (ifa->ifa_local >> (i * 8)) & 0xFF; } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, " Enable SME HostOffload: %d.%d.%d.%d", offLoadRequest.params.hostIpv4Addr[0], offLoadRequest.params.hostIpv4Addr[1], @@ -753,13 +753,13 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to enable HostOffload feature", __func__); return QDF_STATUS_E_FAILURE; } } else { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("IP Address is not assigned")); } @@ -773,7 +773,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offLoadRequest)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failure to disable host " "offload feature", __func__); return QDF_STATUS_E_FAILURE; @@ -796,7 +796,7 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx, uint8_t *pMcBcFilter) { if (NULL == pHddCtx) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("NULL HDD context passed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("NULL HDD context passed")); return; } @@ -836,11 +836,11 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) tpSirWlanSetRxpFilters wlanRxpFilterParam = cdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); if (NULL == wlanRxpFilterParam) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed ", __func__); return; } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Configuring Mcast/Bcast Filter Setting. setfilter %d", __func__, setfilter); if (true == setfilter) { @@ -885,27 +885,27 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set) hdd_context_t *pHddCtx = (hdd_context_t *) pAdapter->pHddCtx; if (NULL == pHddCtx) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD CTX is NULL")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD CTX is NULL")); return; } hHal = pHddCtx->hHal; if (NULL == hHal) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HAL Handle is NULL")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HAL Handle is NULL")); return; } /* Check if INI is enabled or not, other wise just return */ if (!pHddCtx->config->fEnableMCAddrList) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, FL("gMCAddrListEnable is not enabled in INI")); return; } pMulticastAddrs = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == pMulticastAddrs) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Could not allocate Memory")); return; } @@ -958,7 +958,7 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set) } /* MAddrCnt is MulticastAddrCnt */ - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "smeSessionId:%d; set:%d; MCAdddrCnt :%d", pAdapter->sessionId, set, pMulticastAddrs->ulMulticastAddrCnt); @@ -1012,7 +1012,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, if (QDF_STATUS_SUCCESS == cdf_ret_status) { pHddCtx->hdd_mcastbcast_filter_set = true; } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_suspend_ind returned failure %d"), cdf_ret_status); } @@ -1032,13 +1032,13 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter) cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_configure_resume_req return failure %d", __func__, cdf_ret_status); } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: send wlan resume indication", __func__); /* Disable supported OffLoads */ hdd_conf_hostoffload(pAdapter, false); @@ -1050,9 +1050,9 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter) pHddCtx->sus_res_mcastbcast_filter_valid = false; } - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "offload: in hdd_conf_resume_ind, restoring configuredMcastBcastFilter"); - hddLog(CDF_TRACE_LEVEL_INFO, "configuredMcastBcastFilter = %d", + hddLog(QDF_TRACE_LEVEL_INFO, "configuredMcastBcastFilter = %d", pHddCtx->configuredMcastBcastFilter); } @@ -1099,7 +1099,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended), pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); return; } @@ -1151,12 +1151,12 @@ static void hdd_resume_wlan(void) hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL; QDF_STATUS status; - hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", + hddLog(QDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS", __func__); pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); return; } @@ -1197,7 +1197,7 @@ static void hdd_resume_wlan(void) * When SSR is initiated, an SSR timer is started. Under normal * circumstances SSR should complete amd the timer should be deleted * before it fires. If the SSR timer does fire, it indicates SSR has - * taken too long, and our only recourse is to invoke the CDF_BUG() + * taken too long, and our only recourse is to invoke the QDF_BUG() * API which can allow a crashdump to be captured. */ @@ -1230,8 +1230,8 @@ static void hdd_ssr_timer_del(void) */ static void hdd_ssr_timer_cb(unsigned long data) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD SSR timer expired!", __func__); - CDF_BUG(0); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD SSR timer expired!", __func__); + QDF_BUG(0); } /** @@ -1243,7 +1243,7 @@ static void hdd_ssr_timer_cb(unsigned long data) static void hdd_ssr_timer_start(int msec) { if (ssr_timer_started) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Trying to start SSR timer when " "it's running!", __func__); } @@ -1268,7 +1268,7 @@ QDF_STATUS hdd_wlan_shutdown(void) hdd_context_t *pHddCtx; p_cds_sched_context cds_sched_context = NULL; - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutting down!", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutting down!", __func__); #ifdef WLAN_FEATURE_LPSS @@ -1282,7 +1282,7 @@ QDF_STATUS hdd_wlan_shutdown(void) /* Get the global CDS context. */ p_cds_context = cds_get_global_context(); if (!p_cds_context) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -1290,7 +1290,7 @@ QDF_STATUS hdd_wlan_shutdown(void) /* Get the HDD context. */ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -1322,7 +1322,7 @@ QDF_STATUS hdd_wlan_shutdown(void) * gracefully. */ /* Wait for MC to exit */ - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Shutting down MC thread", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Shutting down MC thread", __func__); set_bit(MC_SHUTDOWN_EVENT_MASK, &cds_sched_context->mcEventFlag); set_bit(MC_POST_EVENT_MASK, &cds_sched_context->mcEventFlag); wake_up_interruptible(&cds_sched_context->mcWaitQueue); @@ -1330,7 +1330,7 @@ QDF_STATUS hdd_wlan_shutdown(void) #ifdef QCA_CONFIG_SMP /* Wait for OL RX to exit */ - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Shutting down OL RX thread", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Shutting down OL RX thread", __func__); unregister_hotcpu_notifier(cds_sched_context->cpu_hot_plug_notifier); set_bit(RX_SHUTDOWN_EVENT_MASK, &cds_sched_context->ol_rx_event_flag); @@ -1342,44 +1342,44 @@ QDF_STATUS hdd_wlan_shutdown(void) cds_free_ol_rx_pkt_freeq(cds_sched_context); #endif - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__); qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop WMA", __func__); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); wma_setneedshutdown(p_cds_context); } - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing SME STOP", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing SME STOP", __func__); /* Stop SME - Cannot invoke cds_disable as cds_disable relies * on threads being running to process the SYS Stop */ qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop sme %d", __func__, qdf_status); - CDF_ASSERT(0); + QDF_ASSERT(0); } - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__); /* Stop MAC (PE and HAL) */ qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Failed to stop mac %d", __func__, qdf_status); - CDF_ASSERT(0); + QDF_ASSERT(0); } - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Flush Queues", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Flush Queues", __func__); /* Clean up message queues of TX, RX and MC thread */ cds_sched_flush_mc_mqs(cds_sched_context); /* Deinit all the TX, RX and MC queues */ cds_sched_deinit_mqs(cds_sched_context); - hddLog(CDF_TRACE_LEVEL_INFO, "%s: Doing CDS Shutdown", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Doing CDS Shutdown", __func__); /* shutdown CDS */ cds_shutdown(p_cds_context); @@ -1387,7 +1387,7 @@ QDF_STATUS hdd_wlan_shutdown(void) so setting it to NULL in hdd context */ pHddCtx->hHal = (tHalHandle) NULL; - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete", __func__); return QDF_STATUS_SUCCESS; } @@ -1414,7 +1414,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Get the CDS context */ p_cds_context = cds_get_global_context(); if (p_cds_context == NULL) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Failed cds_get_global_context", __func__); goto err_re_init; } @@ -1422,13 +1422,13 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Get the HDD context */ pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (!pHddCtx) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null", __func__); goto err_re_init; } if (!hif_sc) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: hif_sc is NULL", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: hif_sc is NULL", __func__); goto err_re_init; } @@ -1440,14 +1440,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Re-open CDS, it is a re-open b'se control transport was never closed. */ qdf_status = cds_open(); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); goto err_re_init; } /* Save the hal context in Adapter */ pHddCtx->hHal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == pHddCtx->hHal) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HAL context is null", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HAL context is null", __func__); goto err_cds_close; } @@ -1474,14 +1474,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) qdf_status = hdd_set_sme_chan_list(pHddCtx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Failed to init channel list", __func__); goto err_cds_close; } /* Apply the cfg.ini to cfg.dat */ if (false == hdd_update_config_dat(pHddCtx)) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: config update failed", + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: config update failed", __func__); goto err_cds_close; } @@ -1493,7 +1493,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) intfMacAddr[0], sizeof(pHddCtx->config->intfMacAddr[0])); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. " + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. " "HALStatus is %08d [x%08x]", __func__, cdf_ret_status, cdf_ret_status); goto err_cds_close; @@ -1503,13 +1503,13 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) Note: Firmware image will be read and downloaded inside cds_enable API */ qdf_status = cds_enable(p_cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__); + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__); goto err_cds_close; } qdf_status = hdd_post_cds_enable_config(pHddCtx); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: hdd_post_cds_enable_config failed", __func__); goto err_cds_disable; } @@ -1521,7 +1521,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) if (!pAdapter) { pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_IBSS); if (!pAdapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Failed to get Adapter!", __func__); } } @@ -1637,7 +1637,7 @@ err_cds_close: err_re_init: /* Allow the phone to go to sleep */ hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_DRIVER_REINIT); - CDF_BUG(0); + QDF_BUG(0); return -EPERM; success: @@ -1658,7 +1658,7 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode) hdd_context_t *hdd_ctx; if (NULL == adapter) { - hddLog(CDF_TRACE_LEVEL_FATAL, FL("Adapter NULL")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("Adapter NULL")); return -ENODEV; } @@ -1668,12 +1668,12 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode) return -EINVAL; } - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("power mode=%d"), mode); + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("power mode=%d"), mode); hal = WLAN_HDD_GET_HAL_CTX(adapter); if (DRIVER_POWER_MODE_ACTIVE == mode) { - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Wlan driver Entering Full Power")); /* @@ -1699,7 +1699,7 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode) sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_ENABLE); } else { - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Power Save is not enabled in the cfg")); } } @@ -1752,7 +1752,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) #endif hdd_resume_wlan(); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_RESUME_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); qdf_spin_lock(&pHddCtx->sched_scan_lock); @@ -2015,7 +2015,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, } pHddCtx->is_ol_rx_thread_suspended = true; #endif - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN, NO_SESSION, pHddCtx->isWiphySuspended)); pHddCtx->isWiphySuspended = true; @@ -2087,7 +2087,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT, pAdapter->sessionId, timeout)); @@ -2180,7 +2180,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_TXPOWER, NO_SESSION, type)); @@ -2284,7 +2284,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return -ENOENT; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_TXPOWER, pAdapter->sessionId, pAdapter->device_mode)); wlan_hdd_get_class_astats(pAdapter); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 20c3853d9236..b965b7a7a5ec 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -766,11 +766,11 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanReq->essid_len); } else { scanRequest.SSIDs.numOfSSIDs = 0; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Unable to allocate memory", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); } } } @@ -833,7 +833,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, pAdapter->sessionId, &scanRequest, &hdd_scan_request_callback, dev); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s:sme_scan_request fail %d!!!", __func__, status); goto error; } @@ -904,12 +904,12 @@ static int __iw_get_scan(struct net_device *dev, if (0 != ret) return ret; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: enter buffer length %d!!!", __func__, (wrqu->data.length) ? wrqu->data.length : IW_SCAN_MAX_DATA); if (true == pAdapter->scan_info.mScanPending) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s:mScanPending is true !!!", __func__); return -EAGAIN; } @@ -945,7 +945,7 @@ static int __iw_get_scan(struct net_device *dev, sme_scan_result_purge(hHal, pResult); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: exit total %d BSS reported !!!", __func__, i); EXIT(); return status; @@ -1110,14 +1110,14 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, if (0 != ret) return QDF_STATUS_E_INVAL; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s called with hal = %p, pContext = %p, ID = %d, status = %d", __func__, halHandle, pContext, (int)scanId, (int)status); pScanInfo->mScanPendingCounter = 0; if (pScanInfo->mScanPending != true) { - CDF_ASSERT(pScanInfo->mScanPending); + QDF_ASSERT(pScanInfo->mScanPending); goto allow_suspend; } @@ -1131,7 +1131,7 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, ret = wlan_hdd_cfg80211_update_bss((WLAN_HDD_GET_CTX(pAdapter))->wiphy, pAdapter, scan_time); if (0 > ret) - hddLog(CDF_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__); + hddLog(QDF_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__); /* * cfg80211_scan_done informing NL80211 about completion @@ -1250,7 +1250,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCAN, pAdapter->sessionId, request->n_channels)); @@ -1450,7 +1450,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, */ if (request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN) { - hddLog(CDF_TRACE_LEVEL_DEBUG, "Flushing P2P Results"); + hddLog(QDF_TRACE_LEVEL_DEBUG, "Flushing P2P Results"); sme_scan_flush_p2p_result(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId); } @@ -1505,7 +1505,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, /* no_cck will be set during p2p find to disable 11b rates */ if (request->no_cck) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: This is a P2P Search", __func__); scan_req.p2pSearch = 1; @@ -2059,7 +2059,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -EBUSY; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START, pAdapter->sessionId, pAdapter->device_mode)); /* @@ -2132,8 +2132,8 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, && (CHANNEL_STATE_DFS == cds_get_channel_state( channels_allowed[indx]))) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s : Dropping DFS channel : %d", __func__, channels_allowed[indx]); @@ -2157,7 +2157,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, * then ignore the PNO request */ if (num_ignore_dfs_ch == request->n_channels) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s : All requested channels are DFS channels", __func__); ret = -EINVAL; @@ -2355,7 +2355,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, pPnoRequest->enable = 0; /* Disable PNO */ pPnoRequest->ucNetworksCount = 0; - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP, pAdapter->sessionId, pAdapter->device_mode)); status = sme_set_preferred_network_list(hHal, pPnoRequest, diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 56134c54e2a8..5404b3321eb0 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -58,25 +58,25 @@ */ static void hdd_softap_dump_sk_buff(struct sk_buff *skb) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: head = %p ", __func__, skb->head); - /* CDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + /* QDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */ + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: tail = %p ", __func__, skb->tail); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: end = %p ", __func__, skb->end); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: len = %d ", __func__, skb->len); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: data_len = %d ", __func__, skb->data_len); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: mac_len = %d", __func__, skb->mac_len); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", skb->data[0], skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5], skb->data[6], skb->data[7]); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", skb->data[8], skb->data[9], skb->data[10], skb->data[11], skb->data[12], skb->data[13], skb->data[14], skb->data[15]); @@ -103,7 +103,7 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -129,7 +129,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume) hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context; if (!pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: INV ARG", __func__); /* INVALID ARG */ return; @@ -181,7 +181,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) * lead to a crash. */ if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Recovery in Progress. Ignore!!!", __func__); goto drop_pkt; } @@ -211,20 +211,20 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &STAId)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_WARN, "%s: Failed to find right station", __func__); goto drop_pkt; } else if (false == pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_WARN, "%s: STA %d is unregistered", __func__, STAId); goto drop_pkt; @@ -234,15 +234,15 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pAdapter->aStaInfo[STAId].tlSTAState) && (ol_txrx_peer_state_auth != pAdapter->aStaInfo[STAId].tlSTAState)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_WARN, "%s: Station not connected yet", __func__); goto drop_pkt; } else if (ol_txrx_peer_state_conn == pAdapter->aStaInfo[STAId].tlSTAState) { if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_WARN, "%s: NON-EAPOL packet in non-Authenticated state", __func__); goto drop_pkt; @@ -302,19 +302,19 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); - cdf_dp_trace_set_track(skb); - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_PTR_RECORD, + qdf_dp_trace_set_track(skb); + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD, (uint8_t *)skb->data, sizeof(skb->data))); - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD, + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE) - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD, - (uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE))); + if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, + (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], + (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); if (ol_tx_send_data_frame(STAId, skb, proto_type) != NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); ++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac]; @@ -326,12 +326,12 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) drop_pkt: - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD, + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE) - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD, - (uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE))); + if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, + (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], + (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); kfree_skb(skb); drop_pkt_accounting: @@ -356,9 +356,9 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; - DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT, + DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT, NULL, 0)); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred", __func__); /* Getting here implies we disabled the TX queues for too * long. Queues are disabled either because of disassociation @@ -368,7 +368,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) */ hdd_ctx = WLAN_HDD_GET_CTX(adapter); if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Recovery in Progress. Ignore!!!", __func__); return; } @@ -440,7 +440,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, { spin_lock_bh(&pAdapter->staInfo_lock); if (pAdapter->aStaInfo[STAId].isUsed) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Reinit station %d", __func__, STAId); spin_unlock_bh(&pAdapter->staInfo_lock); return QDF_STATUS_E_FAILURE; @@ -475,7 +475,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) if (false == pAdapter->aStaInfo[STAId].isUsed) { spin_unlock_bh(&pAdapter->staInfo_lock); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Deinit station not inited %d", __func__, STAId); return QDF_STATUS_E_FAILURE; } @@ -514,14 +514,14 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -543,7 +543,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, if (skb->dev == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); return QDF_STATUS_E_FAILURE; } @@ -608,13 +608,13 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) hdd_context_t *pHddCtx; if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_INVAL; } if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Invalid pAdapter magic", __func__); return QDF_STATUS_E_INVAL; } @@ -626,7 +626,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) */ qdf_status = ol_txrx_clear_peer(staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "ol_txrx_clear_peer() failed to for staID %d. " "Status= %d [0x%08X]", staId, qdf_status, qdf_status); } @@ -672,7 +672,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * Clean up old entry if it is not cleaned up properly */ if (pAdapter->aStaInfo[staId].isUsed) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "clean up old entry for STA %d", staId); hdd_softap_deregister_sta(pAdapter, staId); } @@ -688,7 +688,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pPeerMacAddress); staDesc.is_qos_enabled = fWmmEnabled; - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "HDD SOFTAP register TL QoS_enabled=%d", staDesc.is_qos_enabled); @@ -697,7 +697,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, ol_txrx_register_peer(hdd_softap_rx_packet_cbk, &staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", qdf_status, qdf_status); return qdf_status; @@ -713,7 +713,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled; if (!fAuthRequired) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "open/shared auth StaId= %d. Changing TL state to AUTHENTICATED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -727,7 +727,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->sessionCtx.ap.uIsAuthenticated = true; } else { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "ULA auth StaId= %d. Changing TL state to CONNECTED at Join time", pAdapter->aStaInfo[staId].ucSTAId); @@ -810,7 +810,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * unloading */ if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!", __func__, cds_get_driver_state()); return QDF_STATUS_E_PERM; @@ -819,7 +819,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) qdf_status = hdd_softap_deregister_bc_sta(pAdapter); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister BC sta Id %d", __func__, (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId); } @@ -829,8 +829,8 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) if (pAdapter->aStaInfo[staId].isUsed) { qdf_status = hdd_softap_deregister_sta(pAdapter, staId); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, + QDF_TRACE_LEVEL_ERROR, "%s: Failed to deregister sta Id %d", __func__, staId); } @@ -854,13 +854,13 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, uint8_t ucSTAId = WLAN_MAX_STA_COUNT; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "%s: enter", __func__); if (QDF_STATUS_SUCCESS != hdd_softap_get_sta_id(pAdapter, pDestMacAddress, &ucSTAId)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Failed to find right station", __func__); return QDF_STATUS_E_FAILURE; } @@ -868,7 +868,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, if (false == qdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA, pDestMacAddress)) { - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Station MAC address does not matching", __func__); return QDF_STATUS_E_FAILURE; @@ -876,7 +876,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, qdf_status = hdd_change_peer_state(pAdapter, ucSTAId, state, false); - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "%s: change station to state %d succeed", __func__, state); if (QDF_STATUS_SUCCESS == qdf_status) { @@ -884,7 +884,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, ol_txrx_peer_state_auth; } - CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, "%s exit", __func__); return qdf_status; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 19d1d98ef447..93333ba91d2b 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -235,7 +235,7 @@ static bool put_wifi_rate_stat(tpSirWifiRateStat stats, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_LONG, stats->retriesLong)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; } @@ -268,7 +268,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_NUM_RATES, stats->numRate)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); goto error; } @@ -294,7 +294,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats, if (false == put_wifi_rate_stat(pRateStats, vendor_event)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; } @@ -362,7 +362,7 @@ static bool put_wifi_wmm_ac_stat(tpSirWifiWmmAcStat stats, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_NUM_SAMPLES, stats->contentionNumSamples)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; } @@ -407,7 +407,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats, nla_put(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_COUNTRY_STR, WNI_CFG_COUNTRY_CODE_LEN, stats->countryStr)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; } @@ -433,7 +433,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat, if (false == put_wifi_interface_info(&pWifiIfaceStat->info, vendor_event)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; @@ -482,7 +482,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat, nla_put_u64(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_AVERAGE_TSF_OFFSET, average_tsf_offset)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); return false; } @@ -500,7 +500,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat, if (false == put_wifi_wmm_ac_stat(&pWifiIfaceStat->AccessclassStats[i], vendor_event)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("put_wifi_wmm_ac_stat Fail")); return false; } @@ -565,7 +565,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, } if (eConnectionState_Connecting == pHddStaCtx->conn_info.connState) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Session ID %d, Connection is in progress", __func__, pAdapter->sessionId); pInfo->state = WIFI_ASSOCIATING; @@ -576,7 +576,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, staMac = (uint8_t *) &(pAdapter->macAddressCurrent. bytes[0]); - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: client " MAC_ADDRESS_STR " is in the middle of WPS/EAPOL exchange.", __func__, MAC_ADDR_ARRAY(staMac)); @@ -638,7 +638,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter, if (0 != status) return; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS_PEER_ALL : numPeers %u, more data = %u", pWifiPeerStat->numPeers, more_data); @@ -668,7 +668,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS, pWifiPeerStat->numPeers)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR put fail", __func__); kfree_skb(vendor_event); @@ -700,7 +700,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter, if (false == put_wifi_peer_info(pWifiPeerInfo, vendor_event)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("put_wifi_peer_info fail")); kfree_skb(vendor_event); return; @@ -765,15 +765,15 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter, LL_STATS_EVENT_BUF_SIZE); if (!vendor_event) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("cfg80211_vendor_cmd_alloc_reply_skb failed")); return; } - hddLog(CDF_TRACE_LEVEL_INFO, "WMI_LINK_STATS_IFACE Data"); + hddLog(QDF_TRACE_LEVEL_INFO, "WMI_LINK_STATS_IFACE Data"); if (false == hdd_get_interface_info(pAdapter, &pWifiIfaceStat->info)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("hdd_get_interface_info get fail")); kfree_skb(vendor_event); return; @@ -781,7 +781,7 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter, if (false == put_wifi_iface_stats(pWifiIfaceStat, num_peers, vendor_event)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("put_wifi_iface_stats fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("put_wifi_iface_stats fail")); kfree_skb(vendor_event); return; } @@ -822,7 +822,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter, if (0 != status) return; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS_RADIO" " number of radios = %u" " radio is %d onTime is %u" @@ -903,7 +903,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS, pWifiRadioStat->numChannels)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("QCA_WLAN_VENDOR_ATTR put fail")); kfree_skb(vendor_event); @@ -957,7 +957,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter, nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_CCA_BUSY_TIME, pWifiChannelStats->ccaBusyTime)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla_put failed")); kfree_skb(vendor_event); return; @@ -994,7 +994,7 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return; } @@ -1002,19 +1002,19 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, linkLayerStatsResults->ifaceId); if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, linkLayerStatsResults->ifaceId); return; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Link Layer Indication indType: %d", __func__, indType); switch (indType) { case SIR_HAL_LL_STATS_RESULTS_RSP: { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS RESP paramID = 0x%x, ifaceId = %u, respId= %u , moreResultToFollow = %u, num radio = %u result = %p", linkLayerStatsResults->paramId, linkLayerStatsResults->ifaceId, @@ -1092,7 +1092,7 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx, break; } default: - hddLog(CDF_TRACE_LEVEL_ERROR, "invalid event type %d", indType); + hddLog(QDF_TRACE_LEVEL_ERROR, "invalid event type %d", indType); break; } @@ -1156,20 +1156,20 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_MAX, (struct nlattr *)data, data_len, qca_wlan_vendor_ll_set_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("maximum attribute not present")); return -EINVAL; } if (!tb_vendor [QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_MPDU_SIZE_THRESHOLD]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("MPDU size Not present")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("MPDU size Not present")); return -EINVAL; } if (!tb_vendor [QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_AGGRESSIVE_STATS_GATHERING]) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Stats Gathering Not Present")); return -EINVAL; } @@ -1187,7 +1187,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, LinkLayerStatsSetReq.staId = pAdapter->sessionId; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS_SET reqId = %d, staId = %d, mpduSizeThreshold = %d, Statistics Gathering = %d", LinkLayerStatsSetReq.reqId, LinkLayerStatsSetReq.staId, LinkLayerStatsSetReq.mpduSizeThreshold, @@ -1195,7 +1195,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal, &LinkLayerStatsSetReq)) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" + hddLog(QDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_set_req Failed", __func__); return -EINVAL; } @@ -1287,17 +1287,17 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_MAX, (struct nlattr *)data, data_len, qca_wlan_vendor_ll_get_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("max attribute not present")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("max attribute not present")); return -EINVAL; } if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_ID]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Request Id Not present")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Request Id Not present")); return -EINVAL; } if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_MASK]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Req Mask Not present")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Req Mask Not present")); return -EINVAL; } @@ -1310,7 +1310,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, LinkLayerStatsGetReq.staId = pAdapter->sessionId; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS_GET reqId = %d, staId = %d, paramIdMask = %d", LinkLayerStatsGetReq.reqId, LinkLayerStatsGetReq.staId, @@ -1325,7 +1325,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal, &LinkLayerStatsGetReq)) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s:" + hddLog(QDF_TRACE_LEVEL_ERROR, "%s:" "sme_ll_stats_get_req Failed", __func__); return -EINVAL; } @@ -1411,7 +1411,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, return -EINVAL; if (!pAdapter->isLinkLayerStatsSet) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "%s: isLinkLayerStatsSet : %d", __func__, pAdapter->isLinkLayerStatsSet); return -EINVAL; @@ -1420,14 +1420,14 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_MAX, (struct nlattr *)data, data_len, qca_wlan_vendor_ll_clr_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("STATS_CLR_MAX is not present")); return -EINVAL; } if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_REQ_MASK] || !tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_REQ]) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Error in LL_STATS CLR CONFIG PARA")); return -EINVAL; } @@ -1447,7 +1447,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, LinkLayerStatsClearReq.staId = pAdapter->sessionId; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "LL_STATS_CLEAR reqId = %d, staId = %d, statsClearReqMask = 0x%X, stopReq = %d", LinkLayerStatsClearReq.reqId, LinkLayerStatsClearReq.staId, @@ -1468,7 +1468,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, nla_put_u32(temp_skbuff, QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_RSP, stopReq)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("LL_STATS_CLR put fail")); kfree_skb(temp_skbuff); return -EINVAL; @@ -1607,7 +1607,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, status = wlan_hdd_validate_context(pHddCtx); if (0 != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid", __func__); return; } @@ -1615,7 +1615,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, pAdapter = hdd_get_adapter_by_vdev(pHddCtx, data->vdev_id); if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: vdev_id %d does not exist with host", __func__, data->vdev_id); return; @@ -1630,7 +1630,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, GFP_KERNEL); if (!vendor_event) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: cfg80211_vendor_event_alloc failed", __func__); return; } @@ -1638,7 +1638,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, ret_val = nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_IFINDEX, pAdapter->dev->ifindex); if (ret_val) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_IFINDEX put fail", __func__); kfree_skb(vendor_event); @@ -1650,7 +1650,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx, data->event_data_len, data->event_data); if (ret_val) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: QCA_WLAN_VENDOR_ATTR_STATS_EXT put fail", __func__); kfree_skb(vendor_event); @@ -2161,7 +2161,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.mcs, sinfo->txrate.flags, sinfo->tx_packets, sinfo->rx_packets); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_GET_STA, pAdapter->sessionId, maxRate)); EXIT(); @@ -2272,7 +2272,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy, wlan_hdd_get_snr(pAdapter, &snr); wlan_hdd_get_rssi(pAdapter, &rssi); - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_DUMP_SURVEY, pAdapter->sessionId, pAdapter->device_mode)); diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 8509892cc967..67e0c26d70e9 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -196,7 +196,7 @@ void wlan_hdd_tdls_pre_setup_init_work(tdlsCtx_t *pHddTdlsCtx, hddTdlsPeer_t *curr_candidate) { if (!pHddTdlsCtx || !curr_candidate) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: either pHddTdlsCtx or curr_candidate is null", __func__); return; @@ -266,7 +266,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddTdlsCtx) || (NULL == pHddCtx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -293,7 +293,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter) static void wlan_hdd_tdls_free_scan_request(tdls_scan_context_t *tdls_scan_ctx) { if (NULL == tdls_scan_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("tdls_scan_ctx is NULL")); return; } @@ -325,7 +325,7 @@ static void wlan_hdd_tdls_discovery_timeout_peer_cb(void *userData) pHddTdlsCtx = (tdlsCtx_t *) userData; if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx or pAdapter points to NULL")); return; } @@ -381,7 +381,7 @@ static void wlan_hdd_tdls_free_list(tdlsCtx_t *pHddTdlsCtx) struct list_head *pos, *q; if (NULL == pHddTdlsCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -408,7 +408,7 @@ static void wlan_hdd_tdls_schedule_scan(struct work_struct *work) container_of(work, tdls_scan_context_t, tdls_scan_work.work); if (NULL == scan_ctx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("scan_ctx is NULL")); return; } @@ -650,7 +650,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) if (false == pHddCtx->config->fEnableTDLSImplicitTrigger) { pHddCtx->tdls_mode = eTDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY; - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s TDLS Implicit trigger not enabled!", __func__); } else if (true == pHddCtx->config->fTDLSExternalControl) { pHddCtx->tdls_mode = eTDLS_SUPPORT_EXTERNAL_CONTROL; @@ -679,7 +679,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) mutex_unlock(&pHddCtx->tdls_lock); tInfo = cdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tInfo) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("cdf_mem_alloc failed for tInfo")); qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); cdf_mem_free(pHddTdlsCtx); @@ -748,7 +748,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx is NULL")); return; } @@ -830,7 +830,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) cdf_mem_free(tInfo); } } else { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: cdf_mem_alloc failed for tInfo", __func__); } } @@ -899,7 +899,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac) /* not found, allocate and add the list */ peer = cdf_mem_malloc(sizeof(hddTdlsPeer_t)); if (NULL == peer) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s peer malloc failed!", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s peer malloc failed!", __func__); return NULL; } @@ -972,23 +972,23 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, int32_t res = 0; hdd_context_t *pHddCtx; if (curr_peer == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } if (curr_peer->pHddTdlsCtx == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("curr_peer->pHddTdlsCtx is NULL")); return; } pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "tdls set peer " MAC_ADDRESS_STR " link status to %u", MAC_ADDR_ARRAY(curr_peer->peerMac), status); @@ -1041,13 +1041,13 @@ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return; } curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (curr_peer == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); return; } @@ -1630,7 +1630,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, tdlsParams = cdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tdlsParams) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: cdf_mem_alloc failed for tdlsParams", __func__); return -ENOMEM; } @@ -1701,13 +1701,13 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, if (!hdd_tdls_ctx) { /* may be TDLS is not applicable for this adapter */ - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD TDLS context is null")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD TDLS context is null")); return; } /* If TDLS support is disabled then no need to update target */ if (false == hdd_ctx->config->fEnableTDLSSupport) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("TDLS not enabled")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("TDLS not enabled")); return; } @@ -1726,7 +1726,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, mutex_unlock(&hdd_ctx->tdls_lock); tdls_param = cdf_mem_malloc(sizeof(*tdls_param)); if (!tdls_param) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("memory allocation failed for tdlsParams")); return; } @@ -1943,7 +1943,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter, list_for_each(pos, head) { curr_peer = list_entry(pos, hddTdlsPeer_t, node); if (!memcmp(mac, curr_peer->peerMac, 6)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "findTdlsPeer: found staId %d", curr_peer->staId); if (mutexLock) @@ -2081,7 +2081,7 @@ uint16_t wlan_hdd_tdls_connected_peers(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (0 != (wlan_hdd_validate_context(pHddCtx))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); return 0; } @@ -2167,7 +2167,7 @@ void wlan_hdd_tdls_connection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2201,7 +2201,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx or pHddTdlsCtx points to NULL")); return; } @@ -2212,7 +2212,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter) if (NULL == pHddTdlsCtx) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } @@ -2322,7 +2322,7 @@ static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);; if (NULL == pHddTdlsCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return NULL; } @@ -2409,13 +2409,13 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) ENTER(); if (NULL == pHddTdlsCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddTdlsCtx is NULL")); return; } if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: tdls magic number mis-match %u", __func__, pHddTdlsCtx->magic); return; @@ -2431,7 +2431,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) curr_peer = pHddTdlsCtx->curr_candidate; if (NULL == curr_peer) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("pHddCtx is not valid")); goto done; } @@ -2463,7 +2463,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) if (false == curr_peer->isForcedPeer) { if (curr_peer->discovery_attempt >= pHddTdlsCtx->threshold_config.discovery_tries_n) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: discovery attempt (%d) reached max (%d) for peer " MAC_ADDRESS_STR ", ignore discovery trigger from fw", @@ -2865,7 +2865,7 @@ void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter, hddTdlsPeer_t *curr_peer, uint16_t reason) { if (NULL == pAdapter || NULL == curr_peer) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("parameters passed are invalid")); return; } @@ -2978,7 +2978,7 @@ int wlan_hdd_tdls_get_status(hdd_adapter_t *pAdapter, curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, false); if (curr_peer == NULL) { mutex_unlock(&pHddCtx->tdls_lock); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("curr_peer is NULL")); *state = QCA_WIFI_HAL_TDLS_DISABLED; *reason = eTDLS_LINK_UNSPECIFIED; @@ -3077,32 +3077,32 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAX, data, data_len, wlan_hdd_tdls_config_get_status_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid attribute")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid attribute")); return -EINVAL; } if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAC_ADDR]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); return -EINVAL; } memcpy(peer, nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAC_ADDR]), sizeof(peer)); - hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); + hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); ret = wlan_hdd_tdls_get_status(pAdapter, peer, &global_operating_class, &channel, &state, &reason); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("get status Failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("get status Failed")); return -EINVAL; } skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 4 * sizeof(int32_t) + NLMSG_HDRLEN); if (!skb) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("cfg80211_vendor_cmd_alloc_reply_skb failed")); return -EINVAL; } - hddLog(CDF_TRACE_LEVEL_INFO, FL("Reason %d Status %d class %d channel %d peer " MAC_ADDRESS_STR), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Reason %d Status %d class %d channel %d peer " MAC_ADDRESS_STR), reason, state, global_operating_class, channel, MAC_ADDR_ARRAY(peer)); if (nla_put_u32(skb, @@ -3117,7 +3117,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_CHANNEL, channel)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail")); goto nla_put_failure; } ret = cfg80211_vendor_cmd_reply(skb); @@ -3184,11 +3184,11 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac, QCA_NL80211_VENDOR_SUBCMD_TDLS_STATE_CHANGE_INDEX, GFP_KERNEL); if (!skb) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("cfg80211_vendor_event_alloc failed")); return -EINVAL; } - hddLog(CDF_TRACE_LEVEL_INFO, FL("Reason: %d Status: %d Class: %d Channel: %d tdls peer " MAC_ADDRESS_STR), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Reason: %d Status: %d Class: %d Channel: %d tdls peer " MAC_ADDRESS_STR), reason, state, global_operating_class, channel, MAC_ADDR_ARRAY(mac)); if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_MAC_ADDR, @@ -3202,7 +3202,7 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac, nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_GLOBAL_OPERATING_CLASS, global_operating_class)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail")); goto nla_put_failure; } cfg80211_vendor_event(skb, GFP_KERNEL); @@ -3252,55 +3252,55 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, if (0 != status) return -EINVAL; if (pHddCtx->config->fTDLSExternalControl == false) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("TDLS External Control is not enabled")); return -ENOTSUPP; } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX, data, data_len, wlan_hdd_tdls_config_enable_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); return -EINVAL; } if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); return -EINVAL; } memcpy(peer, nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR]), sizeof(peer)); - hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); + hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_CHANNEL]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr channel failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr channel failed")); return -EINVAL; } pReqMsg.channel = nla_get_s32(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_CHANNEL]); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Channel Num (%d)"), pReqMsg.channel); + hddLog(QDF_TRACE_LEVEL_INFO, FL("Channel Num (%d)"), pReqMsg.channel); if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_GLOBAL_OPERATING_CLASS]) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr operating class failed")); return -EINVAL; } pReqMsg.global_operating_class = nla_get_s32(tb [QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_GLOBAL_OPERATING_CLASS]); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Operating class (%d)"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Operating class (%d)"), pReqMsg.global_operating_class); if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX_LATENCY_MS]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr latency failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr latency failed")); return -EINVAL; } pReqMsg.max_latency_ms = nla_get_s32(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX_LATENCY_MS]); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Latency (%d)"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Latency (%d)"), pReqMsg.max_latency_ms); if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MIN_BANDWIDTH_KBPS]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr bandwidth failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr bandwidth failed")); return -EINVAL; } pReqMsg.min_bandwidth_kbps = nla_get_s32(tb [QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MIN_BANDWIDTH_KBPS]); - hddLog(CDF_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"), + hddLog(QDF_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"), pReqMsg.min_bandwidth_kbps); ret = wlan_hdd_tdls_extctrl_config_peer( pAdapter, @@ -3375,16 +3375,16 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, } if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX, data, data_len, wlan_hdd_tdls_config_disable_policy)) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR")); return -EINVAL; } if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAC_ADDR]) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed")); return -EINVAL; } memcpy(peer, nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAC_ADDR]), sizeof(peer)); - hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); + hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer)); status = wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer); EXIT(); return status; @@ -3439,7 +3439,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, ret = wlan_hdd_validate_context(pHddCtx); if (0 != ret) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid")); return ret; } @@ -3501,7 +3501,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, but need to check if any other errno fit into this category. */ numCurrTdlsPeers = wlan_hdd_tdls_connected_peers(pAdapter); if (pHddCtx->max_num_tdls_sta <= numCurrTdlsPeers) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. Request declined." " Num of peers (%d), Max allowed (%d).", @@ -3512,7 +3512,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, hddTdlsPeer_t *pTdlsPeer; pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " already connected. Request declined.", __func__, MAC_ADDR_ARRAY(mac)); @@ -3552,7 +3552,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } { int i = 0; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "Supported rates:"); for (i = 0; i < sizeof(StaParams->supported_rates); i++) hddLog(LOG1, "[%d]: %x ", i, @@ -3560,7 +3560,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, } } /* end debug code */ else if ((1 == update) && (NULL == StaParams)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s : update is true, but staParams is NULL. Error!", __func__); return -EPERM; @@ -3582,14 +3582,14 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, (WAIT_TIME_TDLS_ADD_STA)); if (!rc) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: timeout waiting for tdls add station indication", __func__); return -EPERM; } if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Add Station is unsuccessful", __func__); return -EPERM; } @@ -3688,12 +3688,12 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TDLS_MGMT, pAdapter->sessionId, action_code)); if (0 != wlan_hdd_validate_context(pHddCtx)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is not valid", __func__); return -EINVAL; } @@ -3724,7 +3724,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* If any concurrency is detected */ if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) || (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Multiple STA OR Concurrency detected. Ignore TDLS MGMT frame. action_code=%d, concurrency_mode: 0x%x, active_sessions: %d", __func__, action_code, @@ -3746,7 +3746,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (WLAN_IS_TDLS_SETUP_ACTION(action_code)) { if (NULL != wlan_hdd_tdls_is_progress(pHddCtx, peer, true)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS setup is ongoing. action %d declined.", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3763,8 +3763,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, check again in addtion to add_station(). Anyway, there is no hard to double-check. */ if (SIR_MAC_TDLS_SETUP_REQ == action_code) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).", __func__, MAC_ADDR_ARRAY(peer), @@ -3775,8 +3775,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* maximum reached. tweak to send error code to peer and return error code to supplicant */ status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).", __func__, MAC_ADDR_ARRAY(peer), @@ -3791,8 +3791,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s:" MAC_ADDRESS_STR " already connected. action %d declined.", __func__, MAC_ADDR_ARRAY(peer), @@ -3819,7 +3819,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) responder = pTdlsPeer->is_responder; else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " peer doesn't exist or not connected %d dialog_token %d status %d, len = %zu", __func__, MAC_ADDR_ARRAY(peer), @@ -3843,7 +3843,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, /* make sure doesn't call send_mgmt() while it is pending */ if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: " MAC_ADDRESS_STR " action %d couldn't sent, as one is pending. return EBUSY", __func__, MAC_ADDR_ARRAY(peer), action_code); @@ -3860,7 +3860,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, !responder); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_send_tdls_mgmt_frame failed!", __func__); pAdapter->mgmtTxCompletionStatus = false; return -EINVAL; @@ -3882,7 +3882,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, msecs_to_jiffies(WAIT_TIME_TDLS_MGMT)); if ((0 == rc) || (true != pAdapter->mgmtTxCompletionStatus)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Mgmt Tx Completion timed out TxCompletion %u", __func__, pAdapter->mgmtTxCompletionStatus); @@ -4028,25 +4028,25 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_SETUP for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; } pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer); if (pTdlsPeer == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: peer " MAC_ADDRESS_STR " does not exist", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, true)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s TDLS Add Force Peer Failed", __func__); return -EINVAL; } @@ -4070,13 +4070,13 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter, if (0 != wlan_hdd_tdls_set_extctrl_param(pAdapter, peer, chan, max_latency, op_class, min_bandwidth)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s TDLS Set Peer's External Ctrl Parameter Failed", __func__); return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, callback)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4096,19 +4096,19 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, { hddTdlsPeer_t *pTdlsPeer; hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s : NL80211_TDLS_TEARDOWN for " MAC_ADDRESS_STR, __func__, MAC_ADDR_ARRAY(peer)); if ((false == pHddCtx->config->fTDLSExternalControl) || (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s TDLS External control or Implicit Trigger not enabled ", __func__); return -ENOTSUPP; } pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - hddLog(CDF_TRACE_LEVEL_INFO, "%s: " MAC_ADDRESS_STR + hddLog(QDF_TRACE_LEVEL_INFO, "%s: " MAC_ADDRESS_STR "peer matching MAC_ADDRESS_STR not found", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; @@ -4117,7 +4117,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON); } if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, false)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Failed", __func__); return -EINVAL; } @@ -4131,7 +4131,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter, return -EINVAL; } if (0 != wlan_hdd_set_callback(pTdlsPeer, NULL)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s TDLS set callback Failed", __func__); return -EINVAL; } @@ -4167,11 +4167,11 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return -EINVAL; } - MTRACE(cdf_trace(QDF_MODULE_ID_HDD, + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_TDLS_OPER, pAdapter->sessionId, oper)); if (NULL == peer) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid arguments", __func__); return -EINVAL; } @@ -4185,7 +4185,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, * received from target, so HDD config gives combined intersected result */ if (false == pHddCtx->config->fEnableTDLSSupport) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "TDLS Disabled in INI OR not enabled in FW. " "Cannot process TDLS commands"); return -ENOTSUPP; @@ -4202,23 +4202,23 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_ENABLE_LINK", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_ENABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), pTdlsPeer->link_status); if (!TDLS_STA_INDEX_VALID(pTdlsPeer->staId)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: invalid sta index %u for " MAC_ADDRESS_STR " TDLS_ENABLE_LINK failed", __func__, @@ -4253,8 +4253,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_LINK_ESTABLISH_REQ)); if (!rc) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Link Establish Request timed out", __func__); return -EINVAL; @@ -4327,8 +4327,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, CFG_TDLS_PREFERRED_OFF_CHANNEL_NUM_DEFAULT; } - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: Peer " MAC_ADDRESS_STR "vdevId: %d, peerState: %d, isPeerResponder: %d, uapsdQueues: 0x%x, maxSp: 0x%x, peerBuffStaSupport: %d, peerOffChanSupport: %d, peerCurrOperClass: %d, selfCurrOperClass: %d, peerChanLen: %d, peerOperClassLen: %d, prefOffChanNum: %d, prefOffChanBandwidth: %d, op_class_for_pref_off_chan: %d", __func__, @@ -4390,8 +4390,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, &smeTdlsPeerStateParams); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: sme_update_tdls_peer_state failed for " MAC_ADDRESS_STR, __func__, @@ -4432,15 +4432,15 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_find_peer(pAdapter, peer, true); if (NULL == pTdlsPeer) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: peer matching " MAC_ADDRESS_STR " not found, ignore NL80211_TDLS_DISABLE_LINK", __func__, MAC_ADDR_ARRAY(peer)); return -EINVAL; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: NL80211_TDLS_DISABLE_LINK for peer " MAC_ADDRESS_STR " link_status: %d", __func__, MAC_ADDR_ARRAY(peer), @@ -4462,8 +4462,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, msecs_to_jiffies (WAIT_TIME_TDLS_DEL_STA)); if (!rc) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Del station timed out", __func__); return -EPERM; @@ -4475,8 +4475,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, eTDLS_LINK_UNSPECIFIED : eTDLS_LINK_DROPPED_BY_REMOTE); } else { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: TDLS Peer Station doesn't exist.", __func__); } @@ -4488,8 +4488,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer); if (0 != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Teardown", __func__); return status; @@ -4502,8 +4502,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, peer, NULL, pHddCtx->config->fTDLSPrefOffChanNum, 0, 0, 0); if (0 != status) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: Error in TDLS Setup", __func__); return status; } @@ -4511,12 +4511,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, break; case NL80211_TDLS_DISCOVERY_REQ: /* We don't support in-driver setup/teardown/discovery */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "%s: We don't support in-driver setup/teardown/discovery", __func__); return -ENOTSUPP; default: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: unsupported event", __func__); return -ENOTSUPP; } @@ -4566,7 +4566,7 @@ int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, struct net_device *dev, u8 *peer) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "tdls send discover req: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer)); #if TDLS_MGMT_VERSION2 diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c index 41d51fb247e9..0da7f7338442 100644 --- a/core/hdd/src/wlan_hdd_trace.c +++ b/core/hdd/src/wlan_hdd_trace.c @@ -34,7 +34,7 @@ * */ -#include "cdf_trace.h" +#include "qdf_trace.h" #include "qdf_types.h" #include "wlan_hdd_trace.h" #include "wlan_hdd_main.h" @@ -48,7 +48,7 @@ * Return: none */ static void -hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index) +hdd_trace_dump(void *mac, tp_qdf_trace_record record, uint16_t index) { if (TRACE_CODE_HDD_RX_SME_MSG == record->code) hddLog(LOGE, "%04d %012llu S%d %-14s %-30s(0x%x) ", @@ -69,7 +69,7 @@ hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index) */ void hdd_trace_init(void) { - cdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump); + qdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump); } #endif /* ifdef HDD_TRACE_RECORD */ diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 2d67457cd3e1..749ebddee640 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -313,7 +313,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled; if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, "Recovery in progress, dropping the packet"); ++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped; @@ -334,11 +334,11 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (qdf_is_macaddr_broadcast(pDestMacAddress) || qdf_is_macaddr_group(pDestMacAddress))) { STAId = pHddStaCtx->broadcast_ibss_staid; - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, - CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet", + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, + QDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet", __func__); } else if (STAId == HDD_WLAN_INVALID_STA_ID) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, "%s: Received Unicast frame with invalid staID", __func__); ++pAdapter->stats.tx_dropped; @@ -350,7 +350,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (WLAN_HDD_OCB != pAdapter->device_mode && eConnectionState_Associated != pHddStaCtx->conn_info.connState) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, FL("Tx frame in not associated state in %d context"), pAdapter->device_mode); ++pAdapter->stats.tx_dropped; @@ -391,7 +391,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL, "%s: Classified as ac %d up %d", __func__, ac, up); #endif /* HDD_WMM_DEBUG */ @@ -479,19 +479,19 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); - cdf_dp_trace_set_track(skb); - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_PTR_RECORD, + qdf_dp_trace_set_track(skb); + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD, (uint8_t *)skb->data, sizeof(skb->data))); - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD, + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE) - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD, - (uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE))); + if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, + (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], + (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb, proto_type) != NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); goto drop_pkt; @@ -502,12 +502,12 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) drop_pkt: - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD, + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE) - DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD, - (uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE))); + if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, + (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], + (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); ++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped; @@ -556,10 +556,10 @@ static void __hdd_tx_timeout(struct net_device *dev) struct netdev_queue *txq; int i = 0; - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred jiffies %lu trans_start %lu", __func__, jiffies, dev->trans_start); - DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_TX_TIMEOUT, + DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_HDD_TX_TIMEOUT, NULL, 0)); /* Getting here implies we disabled the TX queues for too @@ -571,12 +571,12 @@ static void __hdd_tx_timeout(struct net_device *dev) for (i = 0; i < NUM_TX_QUEUES; i++) { txq = netdev_get_tx_queue(dev, i); - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, "Queue%d status: %d txq->trans_start %lu", i, netif_tx_queue_stopped(txq), txq->trans_start); } - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, "carrier state: %d", netif_carrier_ok(dev)); } @@ -609,9 +609,9 @@ QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -630,9 +630,9 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -666,14 +666,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) /* Sanity check on inputs */ if ((NULL == cds_context) || (NULL == rxBuf)) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); if (NULL == pHddCtx) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -690,7 +690,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) skb = (struct sk_buff *)rxBuf; if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL, "Magic cookie(%x) for adapter sanity verification is invalid", pAdapter->magic); return QDF_STATUS_E_FAILURE; @@ -700,7 +700,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) if ((pHddStaCtx->conn_info.proxyARPService) && cfg80211_is_gratuitous_arp_unsolicited_na(skb)) { ++pAdapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index]; - CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, "%s: Dropping HS 2.0 Gratuitous ARP or Unsolicited NA", __func__); /* Remove SKB from internal tracking table before submitting diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index d2441109d8ff..b91a1f354bce 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -74,7 +74,7 @@ #include "qc_sap_ioctl.h" #include "sme_api.h" #include "wma_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "wlan_hdd_assoc.h" #include "wlan_hdd_ioctl.h" #include "wlan_hdd_scan.h" @@ -471,7 +471,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { __p += __size; \ __tlen += __size + 2; \ } else { \ - hddLog(CDF_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!"); \ + hddLog(QDF_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!"); \ } \ } while (0) @@ -510,20 +510,20 @@ void *mem_alloc_copy_from_user_helper(const __user void *wrqu_data, size_t len) * (4096 bytes). So we use 4096 as the upper boundary for now. */ if (len > MAX_USER_COMMAND_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Invalid length"); return NULL; } ptr = kmalloc(len + 1, GFP_KERNEL); if (NULL == ptr) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "unable to allocate memory"); return NULL; } if (copy_from_user(ptr, wrqu_data, len)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: failed to copy data to user buffer", __func__); kfree(ptr); return NULL; @@ -738,7 +738,7 @@ void hdd_wlan_get_version(hdd_adapter_t *pAdapter, union iwreq_data *wrqu, pHddContext = WLAN_HDD_GET_CTX(pAdapter); if (!pHddContext) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s:Invalid context, HDD context is null", __func__); goto error; } @@ -789,7 +789,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) ENTER(); if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -801,14 +801,14 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu) if (QDF_STATUS_SUCCESS != sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } wrqu->rts.value = threshold; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Rts-Threshold=%d!!"), wrqu->rts.value); EXIT(); @@ -836,7 +836,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, ENTER(); if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Adapter is NULL", __func__); return -EINVAL; } @@ -848,14 +848,14 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter, if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } wrqu->frag.value = threshold; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Frag-Threshold=%d!!"), wrqu->frag.value); EXIT(); @@ -881,7 +881,7 @@ int hdd_wlan_get_freq(uint32_t channel, uint32_t *pfreq) } } } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Invalid channel no=%d!!"), channel); return -EINVAL; } @@ -969,7 +969,7 @@ static void hdd_get_rssi_cb(int8_t rssi, uint32_t staId, void *pContext) } if (NULL == pContext) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, pContext [%p]", __func__, pContext); return; } @@ -990,7 +990,7 @@ static void hdd_get_rssi_cb(int8_t rssi, uint32_t staId, void *pContext) * we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter [%p] magic [%08x]", __func__, pAdapter, pStatsContext->magic); if (ioctl_debug) { @@ -1038,7 +1038,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext) } if (NULL == pContext) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, pContext [%p]", __func__, pContext); return; } @@ -1058,7 +1058,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext) * we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter [%p] magic [%08x]", __func__, pAdapter, pStatsContext->magic); if (ioctl_debug) { @@ -1099,7 +1099,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) unsigned long rc; if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter", __func__); return QDF_STATUS_E_FAULT; } @@ -1135,7 +1135,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) pHddStaCtx->conn_info.bssId, pAdapter->rssi, &context, pHddCtx->pcds_context); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ } else { @@ -1144,7 +1144,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) msecs_to_jiffies (WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SME timed out while retrieving RSSI")); /* we'll now returned a cached value below */ } @@ -1191,7 +1191,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) ENTER(); if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid context, pAdapter", __func__); return QDF_STATUS_E_FAULT; } @@ -1212,7 +1212,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) pHddStaCtx->conn_info.staId[0], pHddStaCtx->conn_info.bssId, &context); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI", __func__); /* we'll returned a cached value below */ } else { @@ -1221,7 +1221,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) msecs_to_jiffies (WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SME timed out while retrieving SNR")); /* we'll now returned a cached value below */ } @@ -1272,7 +1272,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) hdd_adapter_t *pAdapter; if ((NULL == pLinkSpeed) || (NULL == pContext)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, pLinkSpeed [%p] pContext [%p]", __func__, pLinkSpeed, pContext); return; @@ -1293,7 +1293,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter [%p] magic [%08x]", __func__, pAdapter, pLinkSpeedContext->magic); if (ioctl_debug) { @@ -1337,12 +1337,12 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, tSirLinkSpeedInfo *linkspeed_req; if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_FAULT; } linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); return QDF_STATUS_E_NOMEM; } @@ -1355,7 +1355,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, linkspeed_req, &context, hdd_get_link_speed_cb); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics for link speed", __func__); cdf_mem_free(linkspeed_req); @@ -1364,7 +1364,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, (&context.completion, msecs_to_jiffies(WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME timed out while retrieving link speed", __func__); } @@ -1586,7 +1586,7 @@ uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size, elem_len = ptr[1]; left -= 2; if (elem_len > left) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, FL ("****Invalid IEs eid = %d elem_len=%d left=%d*****"), eid, elem_len, left); @@ -1786,7 +1786,7 @@ static int __iw_set_mode(struct net_device *dev, msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); if (!rc) - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL ("failed wait on disconnect_comp_var")); } @@ -1962,7 +1962,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; } @@ -2051,7 +2051,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) { if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("failed to get operating channel %u"), pAdapter->sessionId); return -EIO; @@ -2182,7 +2182,7 @@ static int __iw_set_tx_power(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL, wrqu->txpower.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL")); return -EIO; } @@ -2266,7 +2266,7 @@ static int __iw_get_bitrate(struct net_device *dev, pAdapter, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); return status; } @@ -2278,7 +2278,7 @@ static int __iw_get_bitrate(struct net_device *dev, WLAN_WAIT_TIME_STATS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); return QDF_STATUS_E_FAILURE; @@ -2390,7 +2390,7 @@ static int __iw_set_bitrate(struct net_device *dev, } if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter), WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FIXED_RATE")); return -EIO; } @@ -2456,7 +2456,7 @@ static int __iw_set_genie(struct net_device *dev, base_genie = mem_alloc_copy_from_user_helper(wrqu->data.pointer, wrqu->data.length); if (NULL == base_genie) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } @@ -2478,7 +2478,7 @@ static int __iw_set_genie(struct net_device *dev, eLen = *genie++; remLen -= 2; - hddLog(CDF_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]", + hddLog(QDF_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]", __func__, elementId, eLen); switch (elementId) { @@ -2490,17 +2490,17 @@ static int __iw_set_genie(struct net_device *dev, if (0 == memcmp(&genie[0], "\x00\x50\xf2\x04", 4)) { uint16_t curGenIELen = pWextState->genIE.length; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s Set WPS OUI(%02x %02x %02x %02x) IE(len %d)", __func__, genie[0], genie[1], genie[2], genie[3], eLen + 2); if (SIR_MAC_MAX_IE_LENGTH < (pWextState->genIE.length + eLen)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "Cannot accommodate genIE. " "Need bigger buffer space"); - CDF_ASSERT(0); + QDF_ASSERT(0); kfree(base_genie); return -ENOMEM; } @@ -2509,7 +2509,7 @@ static int __iw_set_genie(struct net_device *dev, curGenIELen, genie - 2, eLen + 2); pWextState->genIE.length += eLen + 2; } else if (0 == memcmp(&genie[0], "\x00\x50\xf2", 3)) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s Set WPA IE (len %d)", __func__, eLen + 2); memset(pWextState->WPARSNIE, 0, @@ -2523,17 +2523,17 @@ static int __iw_set_genie(struct net_device *dev, } else { /* any vendorId except WPA IE should be accumulated to genIE */ uint16_t curGenIELen = pWextState->genIE.length; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s Set OUI(%02x %02x %02x %02x) IE(len %d)", __func__, genie[0], genie[1], genie[2], genie[3], eLen + 2); if (SIR_MAC_MAX_IE_LENGTH < (pWextState->genIE.length + eLen)) { - hddLog(CDF_TRACE_LEVEL_FATAL, + hddLog(QDF_TRACE_LEVEL_FATAL, "Cannot accommodate genIE. " "Need bigger buffer space"); - CDF_ASSERT(0); + QDF_ASSERT(0); kfree(base_genie); return -ENOMEM; } @@ -2825,7 +2825,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD")); return -EIO; } @@ -2955,7 +2955,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, if (sme_cfg_set_int (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD")); return -EIO; } @@ -3129,7 +3129,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_DOT11_MODE, &active_phy_mode) == QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "active_phy_mode = %d", active_phy_mode); if (active_phy_mode == WNI_CFG_DOT11_MODE_11A @@ -3191,7 +3191,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_str ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels, &num_channels) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST")); return -EIO; @@ -3281,7 +3281,7 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext) } if ((NULL == pStats) || (NULL == pContext)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, pStats [%p] pContext [%p]", __func__, pStats, pContext); return; @@ -3304,7 +3304,7 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext) * we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter [%p] magic [%08x]", __func__, pAdapter, pStatsContext->magic); if (ioctl_debug) { @@ -3343,7 +3343,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) struct statsContext context; if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_FAULT; } if (cds_is_driver_recovering()) { @@ -3365,7 +3365,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve Class A statistics", __func__); /* we'll returned a cached value below */ } else { @@ -3374,7 +3374,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter) (&context.completion, msecs_to_jiffies(WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SME timed out while retrieving Class A statistics")); } } @@ -3420,7 +3420,7 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext) } if ((NULL == pStats) || (NULL == pContext)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad param, pStats [%p] pContext [%p]", __func__, pStats, pContext); return; @@ -3443,7 +3443,7 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext) * we can do */ spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid context, pAdapter [%p] magic [%08x]", __func__, pAdapter, pStatsContext->magic); if (ioctl_debug) { @@ -3483,7 +3483,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) struct statsContext context; if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_SUCCESS; } @@ -3503,7 +3503,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) pHddStaCtx->conn_info.staId[0], &context, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != hstatus) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics", __func__); /* we'll return with cached values */ } else { @@ -3513,7 +3513,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter) msecs_to_jiffies(WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("SME timed out while retrieving statistics")); } } @@ -3576,7 +3576,7 @@ static int __iw_get_linkspeed(struct net_device *dev, rc = snprintf(pLinkSpeed, len, "%u", link_speed); if ((rc < 0) || (rc >= len)) { /* encoding or length error? */ - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Unable to encode link speed")); return -EIO; } @@ -3771,7 +3771,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, } if (wrqu->data.flags & IW_ENCODE_DISABLED) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "****iwconfig wlan0 key off*****"); if (!fKeyPresent) { @@ -3806,7 +3806,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); if (!rc) - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL ("failed wait on disconnect_comp_var")); } @@ -3817,7 +3817,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, } if (wrqu->data.flags & (IW_ENCODE_OPEN | IW_ENCODE_RESTRICTED)) { - hddLog(CDF_TRACE_LEVEL_INFO, "iwconfig wlan0 key on"); + hddLog(QDF_TRACE_LEVEL_INFO, "iwconfig wlan0 key on"); pHddStaCtx->conn_info.authType = (encoderq-> @@ -3827,7 +3827,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, } if (wrqu->data.length > 0) { - hddLog(CDF_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d", + hddLog(QDF_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d", __func__, wrqu->data.length); key_length = wrqu->data.length; @@ -3835,7 +3835,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, /* IW_ENCODING_TOKEN_MAX is the value that is set for wrqu->data.length by iwconfig.c when 'iwconfig wlan0 key on' is issued. */ if (5 == key_length) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Call with WEP40,key_len=%d", __func__, key_length); @@ -3848,7 +3848,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, eCSR_ENCRYPT_TYPE_WEP40_STATICKEY; } } else if (13 == key_length) { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s:Call with WEP104,key_len:%d", __func__, key_length); @@ -3861,7 +3861,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, eCSR_ENCRYPT_TYPE_WEP104_STATICKEY; } } else { - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid WEP key length :%d", __func__, key_length); return -EINVAL; @@ -4071,7 +4071,7 @@ static int __iw_set_encodeext(struct net_device *dev, (IW_ENCODE_ALG_WEP == ext->alg)) { if (IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("Invalid Configuration:%s"), __func__); return -EINVAL; } else { @@ -4179,7 +4179,7 @@ static int __iw_set_encodeext(struct net_device *dev, break; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"), __func__, (int)ext->alg, (int)ext->key_len, setKey.encType); @@ -4190,11 +4190,11 @@ static int __iw_set_encodeext(struct net_device *dev, cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_INFO_MED, + hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; } @@ -4206,7 +4206,7 @@ static int __iw_set_encodeext(struct net_device *dev, &setKey, &roamId); if (cdf_ret_status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", __LINE__, cdf_ret_status); @@ -4265,7 +4265,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN || wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("Invalid Retry-Limit=%d!!"), wrqu->retry.value); return -EINVAL; @@ -4277,8 +4277,8 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; } @@ -4286,8 +4286,8 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT, wrqu->retry.value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; } @@ -4296,7 +4296,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Set Retry-Limit=%d!!"), wrqu->retry.value); EXIT(); @@ -4356,7 +4356,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4368,7 +4368,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT")); return -EIO; @@ -4379,7 +4379,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, return -EOPNOTSUPP; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"), retry); EXIT(); @@ -4462,7 +4462,7 @@ static int __iw_set_mlme(struct net_device *dev, msecs_to_jiffies (WLAN_WAIT_TIME_DISCONNECT)); if (!rc) - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL ("failed wait on disconnect_comp_var")); } else @@ -4573,7 +4573,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, } vhtchanwidth = phddctx->config->vhtChannelWidth; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, ("ch_bond24=%d " "ch_bond5g=%d band_24=%d band_5g=%d VHT_ch_width=%u"), ch_bond24, ch_bond5g, band_24, band_5g, vhtchanwidth); @@ -4808,7 +4808,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, smeconfig.csrConfig.channelBondingMode5GHz; phddctx->config->vhtChannelWidth = vhtchanwidth; if (hdd_update_config_dat(phddctx) == false) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: could not update config_dat", __func__); return -EIO; } @@ -4819,7 +4819,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, phddctx->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "New_Phymode= %d ch_bonding=%d band=%d VHT_ch_width=%u", phymode, chwidth, curr_band, vhtchanwidth); } @@ -4844,7 +4844,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext) hdd_adapter_t *pAdapter; ENTER(); if (NULL == pContext) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("pContext is NULL")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("pContext is NULL")); return; } pTempContext = pContext; @@ -4852,7 +4852,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext) spin_lock(&hdd_context_lock); if ((NULL == pAdapter) || (TEMP_CONTEXT_MAGIC != pTempContext->magic)) { spin_unlock(&hdd_context_lock); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, FL("Invalid context, pAdapter [%p] magic [%08x]"), pAdapter, pTempContext->magic); return; @@ -4882,7 +4882,7 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) ENTER(); if (NULL == pAdapter) { - hddLog(CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); + hddLog(QDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL")); return -EPERM; } init_completion(&tempContext.completion); @@ -4891,14 +4891,14 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature) status = sme_get_temperature(WLAN_HDD_GET_HAL_CTX(pAdapter), &tempContext, hdd_get_temperature_cb); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL("Unable to retrieve temperature")); } else { rc = wait_for_completion_timeout(&tempContext.completion, msecs_to_jiffies (WLAN_WAIT_TIME_STATS)); if (!rc) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, FL ("SME timed out while retrieving temperature")); } @@ -4957,8 +4957,8 @@ static int __iw_setint_getnone(struct net_device *dev, smeConfig.csrConfig.Is11dSupportEnabled = (bool) set_value; - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), smeConfig.csrConfig. Is11dSupportEnabled); @@ -5033,8 +5033,8 @@ static int __iw_setint_getnone(struct net_device *dev, } else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT, set_value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, FL + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, FL ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; } @@ -5077,7 +5077,7 @@ static int __iw_setint_getnone(struct net_device *dev, (hHal, pAdapter->sessionId, bssid, pAdapter->device_mode, set_value) != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Setting tx power failed", __func__); return -EIO; } @@ -5088,7 +5088,7 @@ static int __iw_setint_getnone(struct net_device *dev, struct qdf_mac_addr bssid; struct qdf_mac_addr selfMac; - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm", __func__, set_value); qdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId); @@ -5096,7 +5096,7 @@ static int __iw_setint_getnone(struct net_device *dev, if (sme_set_max_tx_power(hHal, bssid, selfMac, set_value) != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed", __func__); return -EIO; @@ -5106,12 +5106,12 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_MAX_TX_POWER_2_4: { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm for 2.4 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_24, set_value) != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 2.4 GHz band", __func__); return -EIO; @@ -5121,12 +5121,12 @@ static int __iw_setint_getnone(struct net_device *dev, } case WE_SET_MAX_TX_POWER_5_0: { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "%s: Setting maximum tx power %d dBm for 5.0 GHz band", __func__, set_value); if (sme_set_max_tx_power_per_band(eCSR_BAND_5G, set_value) != QDF_STATUS_SUCCESS) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Setting maximum tx power failed for 5.0 GHz band", __func__); return -EIO; @@ -5156,7 +5156,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_SET_TM_LEVEL: { - hddLog(CDF_TRACE_LEVEL_INFO, + hddLog(QDF_TRACE_LEVEL_INFO, "Set Thermal Mitigation Level %d", set_value); (void)sme_set_thermal_level(hHal, set_value); break; @@ -5273,8 +5273,8 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); return -EIO; @@ -5292,8 +5292,8 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Failed to set LDPC value"); break; @@ -5311,8 +5311,8 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); return -EIO; @@ -5329,8 +5329,8 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Failed to set TX STBC value"); break; @@ -5349,8 +5349,8 @@ static int __iw_setint_getnone(struct net_device *dev, /* get the HT capability info */ ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value); if (QDF_STATUS_SUCCESS != ret) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); return -EIO; @@ -5369,8 +5369,8 @@ static int __iw_setint_getnone(struct net_device *dev, } if (ret) - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Failed to set RX STBC value"); break; } @@ -5382,8 +5382,8 @@ static int __iw_setint_getnone(struct net_device *dev, WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ, set_value); if (ret) - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Failed to set ShortGI value"); break; } @@ -6185,7 +6185,7 @@ static int __iw_setchar_getnone(struct net_device *dev, struct iw_point s_priv_data; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -6212,23 +6212,23 @@ static int __iw_setchar_getnone(struct net_device *dev, pBuffer = mem_alloc_copy_from_user_helper(s_priv_data.pointer, s_priv_data.length); if (NULL == pBuffer) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "mem_alloc_copy_from_user_helper fail"); return -ENOMEM; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received length %d", __func__, s_priv_data.length); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Received data %s", __func__, pBuffer); switch (sub_cmd) { case WE_WOWL_ADD_PTRN: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN"); + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "ADD_PTRN"); hdd_add_wowl_ptrn(pAdapter, pBuffer); break; case WE_WOWL_DEL_PTRN: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN"); + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "DEL_PTRN"); hdd_del_wowl_ptrn(pAdapter, pBuffer); break; #if defined WLAN_FEATURE_VOWIFI @@ -6238,8 +6238,8 @@ static int __iw_setchar_getnone(struct net_device *dev, tRrmNeighborRspCallbackInfo callbackInfo; if (pConfig->fRrmEnable) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "Neighbor Request"); neighborReq.no_ssid = (s_priv_data.length - 1) ? false : true; @@ -6340,20 +6340,20 @@ static int __iw_setnone_getint(struct net_device *dev, *value = smeConfig.csrConfig.Is11dSupportEnabled; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("11D state=%d!!"), *value); break; } case WE_IBSS_STATUS: - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "****Return IBSS Status*****"); break; case WE_GET_WLAN_DBG: { - cdf_trace_display(); + qdf_trace_display(); *value = 0; break; } @@ -6362,8 +6362,8 @@ static int __iw_setnone_getint(struct net_device *dev, if (sme_cfg_get_int (hHal, WNI_CFG_ASSOC_STA_LIMIT, (uint32_t *) value) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_WARN, FL + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_WARN, FL ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT")); ret = -EIO; } @@ -6378,7 +6378,7 @@ static int __iw_setnone_getint(struct net_device *dev, { *value = cds_get_concurrency_mode(); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("concurrency mode=%d"), *value); break; } @@ -6783,7 +6783,7 @@ static int __iw_setnone_getint(struct net_device *dev, case WE_GET_TEMPERATURE: { - hddLog(CDF_TRACE_LEVEL_INFO, "WE_GET_TEMPERATURE"); + hddLog(QDF_TRACE_LEVEL_INFO, "WE_GET_TEMPERATURE"); ret = wlan_hdd_get_temperature(pAdapter, value); break; } @@ -6839,10 +6839,10 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, switch (sub_cmd) { case WE_SET_WLAN_DBG: - cdf_trace_set_value(value[1], value[2], value[3]); + qdf_trace_set_value(value[1], value[2], value[3]); break; case WE_SET_DP_TRACE: - cdf_dp_trace_set_value(value[1], value[2], value[3]); + qdf_dp_trace_set_value(value[1], value[2], value[3]); break; /* value[3] the acs band is not required as start and end channels are @@ -7118,7 +7118,7 @@ static int __iw_get_char_setnone(struct net_device *dev, case WE_GET_CFG: { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Printing CLD global INI Config", __func__); hdd_cfg_get_global_config(WLAN_HDD_GET_CTX(pAdapter), @@ -7293,8 +7293,8 @@ static int __iw_get_char_setnone(struct net_device *dev, phymode = sme_get_phy_mode(hal); if ((QDF_STATUS_SUCCESS != sme_get_freq_band(hal, &currBand))) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; @@ -7662,7 +7662,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, { hddLog(LOG1, "%s: SELECTIVE_MODULE_LOG %d arg1 %d arg2", __func__, apps_args[0], apps_args[1]); - cdf_trace_enable(apps_args[0], apps_args[1]); + qdf_trace_enable(apps_args[0], apps_args[1]); } break; @@ -7672,7 +7672,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, "%s: MTRACE_DUMP code %d session %d count %d " "bitmask_of_module %d ", __func__, apps_args[0], apps_args[1], apps_args[2], apps_args[3]); - cdf_trace_dump_all((void *)hHal, apps_args[0], + qdf_trace_dump_all((void *)hHal, apps_args[0], apps_args[1], apps_args[2], apps_args[3]); @@ -7921,8 +7921,8 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { cdf_mem_free(unitTestArgs); - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, FL ("Not able to post UNIT_TEST_CMD message to WMA")); return -EINVAL; @@ -7981,7 +7981,7 @@ static int iw_hdd_set_var_ints_getnone(struct net_device *dev, int ret, num_args; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -8148,11 +8148,11 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, } tSpec.ts_info.up = params[HDD_WLAN_WMM_PARAM_USER_PRIORITY]; if (0 > tSpec.ts_info.up || SME_QOS_WMM_UP_MAX < tSpec.ts_info.up) { - hddLog(CDF_TRACE_LEVEL_ERROR, "***ts_info.up out of bounds***"); + hddLog(QDF_TRACE_LEVEL_ERROR, "***ts_info.up out of bounds***"); return 0; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s:TS_INFO PSB %d UP %d !!!", __func__, tSpec.ts_info.psb, tSpec.ts_info.up); @@ -8425,7 +8425,7 @@ static int __iw_set_host_offload(struct net_device *dev, return ret; if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, "%s:LOGP dev is not in CONNECTED state, ignore!!!", __func__); return -EINVAL; @@ -8434,17 +8434,17 @@ static int __iw_set_host_offload(struct net_device *dev, /* Debug display of request components. */ switch (pRequest->offloadType) { case WLAN_IPV4_ARP_REPLY_OFFLOAD: - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "%s: Host offload request: ARP reply", __func__); switch (pRequest->enableOrDisable) { case WLAN_OFFLOAD_DISABLE: - hddLog(CDF_TRACE_LEVEL_WARN, " disable"); + hddLog(QDF_TRACE_LEVEL_WARN, " disable"); break; case WLAN_OFFLOAD_ARP_AND_BC_FILTER_ENABLE: - hddLog(CDF_TRACE_LEVEL_WARN, " BC Filtering enable"); + hddLog(QDF_TRACE_LEVEL_WARN, " BC Filtering enable"); case WLAN_OFFLOAD_ENABLE: - hddLog(CDF_TRACE_LEVEL_WARN, " ARP offload enable"); - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, " ARP offload enable"); + hddLog(QDF_TRACE_LEVEL_WARN, " IP address: %d.%d.%d.%d", pRequest->params.hostIpv4Addr[0], pRequest->params.hostIpv4Addr[1], @@ -8454,16 +8454,16 @@ static int __iw_set_host_offload(struct net_device *dev, break; case WLAN_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD: - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Host offload request: neighbor discovery", __func__); switch (pRequest->enableOrDisable) { case WLAN_OFFLOAD_DISABLE: - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, " disable"); + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, " disable"); break; case WLAN_OFFLOAD_ENABLE: - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, " enable"); - hddLog(CDF_TRACE_LEVEL_INFO_HIGH, + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, " enable"); + hddLog(QDF_TRACE_LEVEL_INFO_HIGH, " IP address: %x:%x:%x:%x:%x:%x:%x:%x", *(uint16_t *) (pRequest->params.hostIpv6Addr), *(uint16_t *) (pRequest->params.hostIpv6Addr + @@ -8493,7 +8493,7 @@ static int __iw_set_host_offload(struct net_device *dev, if (QDF_STATUS_SUCCESS != sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &offloadRequest)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failure to execute host offload request", __func__); return -EINVAL; } @@ -8745,7 +8745,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, struct pkt_filter_cfg *request = NULL; if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -8848,7 +8848,7 @@ static int __iw_get_statistics(struct net_device *dev, pAdapter, pAdapter->sessionId); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve SME statistics", __func__); return -EINVAL; @@ -8860,7 +8860,7 @@ static int __iw_get_statistics(struct net_device *dev, qdf_wait_single_event(&pWextState->hdd_cdf_event, WLAN_WAIT_TIME_STATS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SME timeout while retrieving statistics", __func__); /*Remove the SME statistics list by passing NULL in callback argument */ @@ -8992,7 +8992,7 @@ void found_pref_network_cb(void *callbackContext, union iwreq_data wrqu; char buf[MAX_PNO_NOTIFY_LEN + 1]; - hddLog(CDF_TRACE_LEVEL_WARN, + hddLog(QDF_TRACE_LEVEL_WARN, "A preferred network was found: %s with rssi: -%d", pPrefNetworkFoundInd->ssId.ssId, pPrefNetworkFoundInd->rssi); @@ -9282,19 +9282,19 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) band = eCSR_BAND_MAX; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: change band to %u", __func__, band); if (band == eCSR_BAND_MAX) { /* Received change band request with invalid band value */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid band value %u", __func__, ui_band); return -EINVAL; } if ((band == eCSR_BAND_24 && pHddCtx->config->nBandCapability == 2) || (band == eCSR_BAND_5G && pHddCtx->config->nBandCapability == 1)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: band value %u violate INI settings %u", __func__, band, pHddCtx->config->nBandCapability); return -EIO; @@ -9308,7 +9308,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) } if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Failed to get current band config", __func__); return -EIO; } @@ -9318,7 +9318,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) * Abort pending scan requests, flush the existing scan results, * and change the band capability */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Current band value = %u, new setting %u ", __func__, currBand, band); @@ -9359,7 +9359,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) eCSR_DISCONNECT_REASON_UNSPECIFIED); if (QDF_STATUS_SUCCESS != status) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s csr_roam_disconnect failure, returned %d", __func__, (int)status); return -EINVAL; @@ -9372,7 +9372,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) (WLAN_WAIT_TIME_DISCONNECT)); if (lrc == 0) { - hddLog(CDF_TRACE_LEVEL_ERROR, + hddLog(QDF_TRACE_LEVEL_ERROR, "%s:Timeout while waiting for csr_roam_disconnect", __func__); return -ETIMEDOUT; @@ -9388,7 +9388,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) if (QDF_STATUS_SUCCESS != sme_set_freq_band(hHal, pAdapter->sessionId, band)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, FL("Failed to set the band value to %u"), band); return -EINVAL; @@ -9423,7 +9423,7 @@ static int __iw_set_band_config(struct net_device *dev, ENTER(); if (!capable(CAP_NET_ADMIN)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } @@ -9505,7 +9505,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, hdd_info("WE_DUMP_DP_TRACE_LEVEL: %d %d", value[1], value[2]); if (value[1] == DUMP_DP_TRACE) - cdf_dp_trace_dump_all(value[2]); + qdf_dp_trace_dump_all(value[2]); break; default: hddLog(LOGE, "%s: Invalid IOCTL command %d", __func__, sub_cmd); @@ -10765,19 +10765,19 @@ int hdd_register_wext(struct net_device *dev) if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("ERROR: hdd_set_wext failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("ERROR: HDD cdf event init failed!!")); return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("ERROR: HDD scan event init failed!!")); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index b09c0244261e..0e0a49dd77ec 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -64,19 +64,19 @@ /* change logging behavior based upon debug flag */ #ifdef HDD_WMM_DEBUG -#define WMM_TRACE_LEVEL_FATAL CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_ERROR CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_WARN CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_INFO CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_INFO_HIGH CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_INFO_LOW CDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_FATAL QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_ERROR QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_WARN QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_INFO QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_INFO_HIGH QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_INFO_LOW QDF_TRACE_LEVEL_FATAL #else -#define WMM_TRACE_LEVEL_FATAL CDF_TRACE_LEVEL_FATAL -#define WMM_TRACE_LEVEL_ERROR CDF_TRACE_LEVEL_ERROR -#define WMM_TRACE_LEVEL_WARN CDF_TRACE_LEVEL_WARN -#define WMM_TRACE_LEVEL_INFO CDF_TRACE_LEVEL_INFO -#define WMM_TRACE_LEVEL_INFO_HIGH CDF_TRACE_LEVEL_INFO_HIGH -#define WMM_TRACE_LEVEL_INFO_LOW CDF_TRACE_LEVEL_INFO_LOW +#define WMM_TRACE_LEVEL_FATAL QDF_TRACE_LEVEL_FATAL +#define WMM_TRACE_LEVEL_ERROR QDF_TRACE_LEVEL_ERROR +#define WMM_TRACE_LEVEL_WARN QDF_TRACE_LEVEL_WARN +#define WMM_TRACE_LEVEL_INFO QDF_TRACE_LEVEL_INFO +#define WMM_TRACE_LEVEL_INFO_HIGH QDF_TRACE_LEVEL_INFO_HIGH +#define WMM_TRACE_LEVEL_INFO_LOW QDF_TRACE_LEVEL_INFO_LOW #endif #define WLAN_HDD_MAX_DSCP 0x3f @@ -166,7 +166,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) /* The TSPEC must be valid */ if (pAc->wmmAcTspecValid == false) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invoked with invalid TSPEC", __func__); return; } @@ -178,7 +178,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) } else { /* no service interval is present in the TSPEC */ /* this is OK, there just won't be U-APSD */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No service interval supplied", __func__); service_interval = 0; } @@ -194,7 +194,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) (pAc->wmmAcUapsdSuspensionInterval == suspension_interval) && (pAc->wmmAcUapsdDirection == direction) && (pAc->wmmAcIsUapsdEnabled == psb)) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: No change in U-APSD parameters", __func__); return; } @@ -210,7 +210,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pHddCtx->config->DelayedTriggerFrmInt); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to enable U-APSD for AC=%d", __func__, acType); return; @@ -222,7 +222,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) pAc->wmmAcUapsdDirection = direction; pAc->wmmAcIsUapsdEnabled = psb; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Enabled UAPSD in TL srv_int=%d " "susp_int=%d dir=%d AC=%d", __func__, @@ -255,13 +255,13 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext) acType, pAdapter->sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Failed to disable U-APSD for AC=%d", __func__, acType); } else { /* TL no longer has valid UAPSD info */ pAc->wmmAcUapsdInfoValid = false; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Disabled UAPSD in TL for AC=%d", __func__, acType); } @@ -281,7 +281,7 @@ static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext) { hdd_adapter_t *pAdapter; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || @@ -325,12 +325,12 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) union iwreq_data wrqu; char buf[MAX_NOTIFY_LEN + 1]; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -350,7 +350,7 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext) pAdapter = pQosContext->pAdapter; /* send the event */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Sending [%s]", __func__, buf); wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf); } @@ -388,7 +388,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext-> acType]; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL( "WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d" ), @@ -396,7 +396,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) { /* there is no traffic activity, delete the TSPEC for this AC */ status = hdd_wmm_delts(pAdapter, pQosContext->handle); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL( "Deleted TS on AC %d, due to inactivity with status = %d!!!" ), @@ -409,15 +409,15 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data) qdf_mc_timer_start(&pAc->wmmInactivityTimer, pAc->wmmInactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, FL( "Restarting inactivity timer failed on AC %d" ), acType); } } else { - CDF_ASSERT(qdf_mc_timer_get_current_state + QDF_ASSERT(qdf_mc_timer_get_current_state (&pAc->wmmInactivityTimer) == QDF_TIMER_STATE_STOPPED); } @@ -456,7 +456,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, hdd_wmm_inactivity_timer_cb, pQosContext); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Initializing inactivity timer failed on AC %d"), acType); return qdf_status; @@ -465,7 +465,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext, qdf_status = qdf_mc_timer_start(&pAc->wmmInactivityTimer, inactivityTime); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Starting inactivity timer failed on AC %d"), acType); qdf_status = qdf_mc_timer_destroy(&pAc->wmmInactivityTimer); @@ -549,12 +549,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, sme_ac_enum_type acType; hdd_wmm_ac_status_t *pAc; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely((NULL == pQosContext) || (HDD_WMM_CTX_MAGIC != pQosContext->magic))) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return QDF_STATUS_E_FAILURE; } @@ -563,14 +563,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: status %d flowid %d info %p", __func__, smeStatus, qosFlowId, pCurrentQosInfo); switch (smeStatus) { case SME_QOS_STATUS_SETUP_SUCCESS_IND: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete", __func__); /* there will always be a TSPEC returned with this @@ -588,7 +588,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -601,7 +601,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, #ifdef FEATURE_WLAN_ESE /* Check if the inactivity interval is specified */ if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Inactivity timer value = %d for AC=%d", __func__, pCurrentQosInfo->inactivity_interval, acType); @@ -617,7 +617,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup is complete (U-APSD set previously)", __func__); @@ -627,7 +627,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -640,7 +640,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_FAILURE_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed", __func__); /* QoS setup failed */ @@ -649,7 +649,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = false; if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -672,7 +672,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup Invalid Params, notify TL", __func__); /* QoS setup failed */ pAc->wmmAcAccessAllowed = false; @@ -689,7 +689,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -701,10 +701,10 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup failed, not a QoS AP", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -716,13 +716,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_SETUP_MODIFIED_IND: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setup modified", __func__); if (pCurrentQosInfo) { /* update the TSPEC */ @@ -731,7 +731,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pCurrentQosInfo, sizeof(pAc->wmmAcTspecInfo)); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -757,7 +757,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -773,7 +773,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Setup successful but U-APSD failed", __func__); if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) { @@ -789,7 +789,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessPending = false; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -807,11 +807,11 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_SUCCESS_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release is complete", __func__); if (pCurrentQosInfo) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: flows still active", __func__); /* there is still at least one flow active for @@ -823,7 +823,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, /* need to tell TL to update its UAPSD handling */ hdd_wmm_enable_tl_uapsd(pQosContext); } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: last flow", __func__); /* this is the last flow active for this AC so @@ -839,7 +839,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, } if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -853,14 +853,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_FAILURE_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Release failure", __func__); /* we don't need to update our state or TL since * nothing has changed */ if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Explicit Qos, notifying user space", __func__); @@ -873,7 +873,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_QOS_LOST_IND: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: QOS Lost indication received", __func__); /* current TSPEC is no longer valid */ @@ -889,7 +889,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessGranted = false; pAc->wmmAcAccessFailed = false; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Explicit Qos, notifying user space", __func__); @@ -903,13 +903,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Release pending", __func__); /* not a callback status -- ignore if we get it */ break; case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Release Invalid Params", __func__); if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) { /* this was triggered by an application */ @@ -920,7 +920,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Modification is complete, notify TL", __func__); /* there will always be a TSPEC returned with this @@ -966,7 +966,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: modification pending", __func__); /* not a callback status -- ignore if we get it */ break; @@ -999,7 +999,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Modify successful but U-APSD failed", __func__); /* QoS modification was successful but setting U=APSD @@ -1035,9 +1035,9 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, break; default: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); } /* if Tspec only allows downstream traffic then access is not @@ -1055,7 +1055,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, pAc->wmmAcAccessAllowed = true; } - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: complete, access for TL AC %d is%sallowed", __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not "); @@ -1074,12 +1074,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal, int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr) { if (NULL == pAdapter) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return -EINVAL; } if (NULL == ptr) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ptr is NULL", __func__); return -EINVAL; } @@ -1110,11 +1110,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) sme_QosWmmTspecInfo qosInfo; hdd_context_t *hdd_ctx; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered, context %p", __func__, pQosContext); if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic)) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid QoS Context", __func__); return; } @@ -1130,11 +1130,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) acType = pQosContext->acType; pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: pAdapter %p acType %d", __func__, pAdapter, acType); if (!pAc->wmmAcAccessNeeded) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: AC %d doesn't need service", __func__, acType); pQosContext->magic = 0; kfree(pQosContext); @@ -1298,7 +1298,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) qosInfo.ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -1309,7 +1309,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* setup is pending, so no more work to do now. all * further work will be done in hdd_wmm_sme_callback() */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is pending, no further work", __func__); break; @@ -1332,7 +1332,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) /* for these cases everything is already setup so we * can signal TL that it has work to do */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Setup is complete, notify TL", __func__); pAc->wmmAcAccessAllowed = true; @@ -1342,9 +1342,9 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work) break; default: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); } #endif @@ -1378,7 +1378,7 @@ QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter) sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap; uint8_t dscp; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* DSCP to User Priority Lookup Table @@ -1409,7 +1409,7 @@ QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter) hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); pAdapter->hddWmmStatus.wmmQap = false; @@ -1447,7 +1447,7 @@ QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter) { hdd_wmm_ac_status_t *pAcStatus; sme_ac_enum_type acType; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); for (acType = 0; acType < WLAN_MAX_AC; acType++) { pAcStatus = &pAdapter->hddWmmStatus.wmmAcStatus[acType]; @@ -1476,7 +1476,7 @@ QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter) { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); /* free any context records that we still have linked */ @@ -1526,7 +1526,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1534,7 +1534,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, eth_hdr = (union generic_ethhdr *)pkt; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: proto is 0x%04x", __func__, skb->protocol); #endif /* HDD_WMM_DEBUG */ @@ -1543,7 +1543,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_II)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1552,7 +1552,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ipv6hdr = ipv6_hdr(skb); tos = ntohs(*(const __be16 *)ipv6hdr) >> 4; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II IPv6 Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1565,7 +1565,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_8023)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP IP Packet, tos is %d", __func__, tos); #endif /* HDD_WMM_DEBUG */ @@ -1580,7 +1580,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_IIv)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Ethernet II VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1602,7 +1602,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, &pkt[sizeof(eth_hdr->eth_8023v)]; tos = ip_hdr->tos; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d", __func__, tos); @@ -1610,7 +1610,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: VLAN tagged Unhandled Protocol, using default tos", __func__); @@ -1620,7 +1620,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, } else { /* default */ #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN, "%s: Unhandled Protocol, using default tos", __func__); #endif /* HDD_WMM_DEBUG */ @@ -1637,7 +1637,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter, *user_pri = adapter->hddWmmDscpToUpMap[dscp]; #ifdef HDD_WMM_DEBUG - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: tos is %d, dscp is %d, up is %d", __func__, tos, dscp, *user_pri); #endif /* HDD_WMM_DEBUG */ @@ -1777,7 +1777,7 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter, pAdapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK; break; default: - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Invalid AC Type", __func__); break; } @@ -1799,7 +1799,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, { hdd_wmm_qos_context_t *pQosContext; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered for AC %d", __func__, acType); if (!hdd_wmm_is_active(pAdapter) || @@ -1808,7 +1808,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* either we don't want QoS or the AP doesn't support * QoS or we don't want to do implicit QoS */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: QoS not configured on both ends ", __func__); *pGranted = @@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request already pending so we need to wait for that * response */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d already scheduled", __func__, acType); @@ -1838,7 +1838,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request previously failed * allow access, but we'll be downgraded */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Implicit QoS for TL AC %d previously failed", __func__, acType); @@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p", __func__, acType, pAdapter); @@ -1867,7 +1867,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* no memory for QoS context. Nothing we can do but * let data flow */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate context", __func__); pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; @@ -1889,7 +1889,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos); #endif - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Scheduling work for AC %d, context %p", __func__, acType, pQosContext); @@ -1923,7 +1923,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * enable UAPSD for any access categories */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if (pRoamInfo->fReassocReq) { @@ -1936,7 +1936,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, * parameters will be updated there */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Reassoc so no work, Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -1945,7 +1945,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, uapsdMask = pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: U-APSD mask is 0x%02x", __func__, (int)uapsdMask); if (uapsdMask & HDD_AC_VO) { @@ -1961,7 +1961,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_VI) { @@ -1977,7 +1977,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BK) { @@ -1993,7 +1993,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } if (uapsdMask & HDD_AC_BE) { @@ -2009,7 +2009,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, pAdapter->sessionId, pHddCtx->config->DelayedTriggerFrmInt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status)); } status = sme_update_dsc_pto_up_mapping(pHddCtx->hHal, @@ -2020,7 +2020,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter, hdd_wmm_init(pAdapter); } - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2051,7 +2051,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, bool qosConnection; uint8_t acmMask; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered", __func__); if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) && @@ -2065,7 +2065,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, acmMask = 0x0; } - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: qap is %d, qosConnection is %d, acmMask is 0x%x", __func__, qap, qosConnection, acmMask); @@ -2074,7 +2074,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, for (ac = 0; ac < WLAN_MAX_AC; ac++) { if (qap && qosConnection && (acmMask & acm_mask_bit[ac])) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d on", __func__, ac); /* admission is required */ @@ -2094,7 +2094,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, wmmAcAccessAllowed = true; } } else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: ac %d off", __func__, ac); /* admission is not required so access is allowed */ pAdapter->hddWmmStatus.wmmAcStatus[ac]. @@ -2105,7 +2105,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter, } - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Exiting", __func__); return QDF_STATUS_SUCCESS; @@ -2199,7 +2199,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, #endif bool found = false; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* see if a context already exists with the given handle */ @@ -2214,7 +2214,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, mutex_unlock(&pAdapter->hddWmmStatus.wmmLock); if (found) { /* record with that handle already exists */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Record already exists with handle 0x%x", __func__, handle); @@ -2250,10 +2250,10 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, /* we didn't get back one of the * SME_QOS_STATUS_MODIFY_* status codes */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); return HDD_WLAN_WMM_STATUS_MODIFY_FAILED; } @@ -2269,7 +2269,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext = kmalloc(sizeof(*pQosContext), GFP_KERNEL); if (NULL == pQosContext) { /* no memory for QoS context. Nothing we can do */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate QoS context", __func__); return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE; } @@ -2279,7 +2279,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, if (pTspec->ts_info.up < HDD_WMM_UP_TO_AC_MAP_SIZE) pQosContext->acType = hdd_wmm_up_to_ac_map[pTspec->ts_info.up]; else { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: ts_info.up (%d) larger than max value (%d), use default acType (%d)", __func__, pTspec->ts_info.up, HDD_WMM_UP_TO_AC_MAP_SIZE - 1, hdd_wmm_up_to_ac_map[0]); @@ -2289,7 +2289,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pQosContext->qosFlowId = 0; pQosContext->magic = HDD_WMM_CTX_MAGIC; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: Setting up QoS, context %p", __func__, pQosContext); mutex_lock(&pAdapter->hddWmmStatus.wmmLock); @@ -2305,7 +2305,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, pTspec->ts_info.up, &pQosContext->qosFlowId); - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, "%s: sme_qos_setup_req returned %d flowid %d", __func__, smeStatus, pQosContext->qosFlowId); @@ -2342,9 +2342,9 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter, * SME_QOS_STATUS_SETUP_* status codes */ hdd_wmm_free_context(pQosContext); - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); return HDD_WLAN_WMM_STATUS_SETUP_FAILED; } #endif @@ -2378,7 +2378,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) sme_QosStatusType smeStatus; #endif - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2396,12 +2396,12 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) if (false == found) { /* we didn't find the handle */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: handle 0x%x not found", __func__, handle); return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM; } - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, flow %d, AC %d, context %p", __func__, handle, qosFlowId, acType, pQosContext); @@ -2409,7 +2409,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) smeStatus = sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId); - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: SME flow %d released, SME status %d", __func__, qosFlowId, smeStatus); @@ -2455,9 +2455,9 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) /* we didn't get back one of the * SME_QOS_STATUS_RELEASE_* status codes */ - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, "%s: unexpected SME Status=%d", __func__, smeStatus); - CDF_ASSERT(0); + QDF_ASSERT(0); status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED; } @@ -2484,7 +2484,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) hdd_wmm_qos_context_t *pQosContext; hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST; - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: Entered with handle 0x%x", __func__, handle); /* locate the context with the given handle */ @@ -2492,7 +2492,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle) list_for_each_entry(pQosContext, &pAdapter->hddWmmStatus.wmmContextList, node) { if (pQosContext->handle == handle) { - CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, "%s: found handle 0x%x, context %p", __func__, handle, pQosContext); diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 85ed2390751d..9f516fd8aa71 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -59,7 +59,7 @@ static inline int find_ptrn_len(const char *ptrn) static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Return code = (%d)", __func__, cdf_ret_status); } @@ -67,7 +67,7 @@ static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) static void hdd_wowl_wake_indication_callback(void *pContext, tpSirWakeReasonInd wake_reason_ind) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d", __func__, wake_reason_ind->ulReason); hdd_exit_wowl((hdd_adapter_t *) pContext); } @@ -83,25 +83,25 @@ static void dump_hdd_wowl_ptrn(struct wow_add_pattern *ptrn) { int i; - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Patetrn Id = 0x%x", __func__, ptrn->pattern_id); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Pattern Byte Offset = 0x%x", __func__, ptrn->pattern_byte_offset); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: pattern_size = 0x%x", __func__, ptrn->pattern_size); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: pattern_mask_size = 0x%x", __func__, ptrn->pattern_mask_size); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ", + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Pattern: ", __func__); for (i = 0; i < ptrn->pattern_size; i++) - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X", + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, " %02X", ptrn->pattern[i]); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ", __func__); for (i = 0; i < ptrn->pattern_mask_size; i++) - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X", + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%02X", ptrn->pattern_mask[i]); } @@ -139,8 +139,8 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Pattern Already configured, skip to * next pattern */ - CDF_TRACE(QDF_MODULE_ID_HDD, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, "Trying to add duplicate WoWL pattern. Skip it!"); ptrn += len; goto next_ptrn; @@ -159,7 +159,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Maximum number of patterns have been configured already */ if (first_empty_slot == -1) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Cannot add anymore patterns. No free slot!", __func__); return false; @@ -167,7 +167,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) /* Validate the pattern */ if (ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER || ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string. Skip!", __func__); ptrn += len; @@ -186,7 +186,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE || localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Invalid length specified. Skip!", __func__); ptrn += len; @@ -196,7 +196,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = 5 + 2 * localPattern.pattern_size + 1; if ((offset >= len) || (ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string..skip!", __func__); ptrn += len; @@ -206,7 +206,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) offset = offset + 2 * localPattern.pattern_mask_size; if (offset + 1 != len) { /* offset begins with 0 */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed pattern string...skip!", __func__); ptrn += len; @@ -241,7 +241,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) g_hdd_wowl_ptrns[first_empty_slot] = kmalloc(len + 1, GFP_KERNEL); if (g_hdd_wowl_ptrns[first_empty_slot] == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: kmalloc failure", __func__); return false; } @@ -258,7 +258,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Add failed, so invalidate the local storage */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", cdf_ret_status); kfree(g_hdd_wowl_ptrns[first_empty_slot]); @@ -316,7 +316,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) sessionId); if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { /* Remove from local storage as well */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, g_hdd_wowl_ptrns[id]); @@ -350,7 +350,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, uint16_t pattern_len, mask_len, i; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is out of range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -361,7 +361,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, /* Since the pattern is a hex string, 2 characters represent 1 byte. */ if (pattern_len % 2) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed WoW pattern!", __func__); return false; @@ -369,7 +369,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, pattern_len >>= 1; if (!pattern_len || pattern_len > WOWL_PTRN_MAX_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern length %d is out of range (1 ~ %d).", __func__, pattern_len, WOWL_PTRN_MAX_SIZE); @@ -382,7 +382,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, localPattern.session_id = session_id; if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern size (%d) greater than max (%d)", __func__, localPattern.pattern_size, SIR_WOWL_BCAST_PATTERN_MAX_SIZE); @@ -406,13 +406,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, mask_len = strlen(pattern_mask); if ((mask_len % 2) || (localPattern.pattern_mask_size != (mask_len >> 1))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Malformed WoW pattern mask!", __func__); return false; } if (localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern mask size (%d) greater than max (%d)", __func__, localPattern.pattern_mask_size, WOWL_PTRN_MASK_MAX_SIZE); @@ -433,7 +433,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, sme_wow_add_pattern(hHal, &localPattern, session_id); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -467,7 +467,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern index %d is not in the range (0 ~ %d).", __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1); @@ -475,7 +475,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) } if (!g_hdd_wowl_ptrns_debugfs[pattern_idx]) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: WoW pattern %d is not in the table.", __func__, pattern_idx); @@ -488,7 +488,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) sessionId); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", __func__, cdf_ret_status); @@ -544,7 +544,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { /* We failed to enter WoWL */ - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", cdf_ret_status); return false; @@ -569,7 +569,7 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) cdf_ret_status = sme_exit_wowl(hHal, &wowParams); if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", cdf_ret_status); return false; diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h index 6a344befe9f2..445b545c2eee 100644 --- a/core/mac/src/include/utils_api.h +++ b/core/mac/src/include/utils_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -59,7 +59,7 @@ extern void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, extern uint32_t gPktAllocCnt, gPktFreeCnt; -extern CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel); +extern QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel); /* / Log initialization */ extern tSirRetStatus log_init(tpAniSirGlobal); diff --git a/core/mac/src/pe/include/lim_trace.h b/core/mac/src/pe/include/lim_trace.h index 494edc8703b5..dbd4ed714e4f 100644 --- a/core/mac/src/pe/include/lim_trace.h +++ b/core/mac/src/pe/include/lim_trace.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -40,7 +40,7 @@ #include "lim_global.h" #include "mac_trace.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #ifdef LIM_TRACE_RECORD #define LIM_TRACE_GET_SSN(data) (((data) >> 16) & 0xff) @@ -85,7 +85,7 @@ void limTraceUpdateMgmtStat(tpAniSirGlobal pMac, uint8_t subtype); void lim_trace_dumpMgmtStat(tpAniSirGlobal pMac, uint8_t subtype); uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState); uint8_t *lim_trace_get_sme_state_string(uint32_t smeState); -void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, +void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord, uint16_t recIndex); void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data); void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data); diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index e62c655ae3ff..4bdfe04f661f 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -661,7 +661,7 @@ void lim_cleanup(tpAniSirGlobal pMac) &pMac->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t **) &pLimMgmtRegistration) == QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Fixing leak! Deallocating pLimMgmtRegistration node")); cdf_mem_free(pLimMgmtRegistration); } @@ -1857,16 +1857,16 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, if (roam_offload_synch_ind_ptr->beaconProbeRespLength <= SIR_MAC_HDR_LEN_3A) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very" + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "%s: very" "few bytes in synchInd beacon / probe resp frame! length=%d", __func__, roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, "LFR3:Beacon/Prb Rsp:%d", roam_offload_synch_ind_ptr->isBeacon); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, bcn_proberesp_ptr, roam_offload_synch_ind_ptr->beaconProbeRespLength); if (roam_offload_synch_ind_ptr->isBeacon) { if (sir_parse_beacon_ie(pMac, parsed_frm_ptr, @@ -1875,7 +1875,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "Parse error Beacon, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1887,7 +1887,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespLength - SIR_MAC_HDR_LEN_3A, parsed_frm_ptr) != eSIR_SUCCESS || !parsed_frm_ptr->ssidPresent) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "Parse error ProbeResponse, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); cdf_mem_free(parsed_frm_ptr); @@ -1969,11 +1969,11 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, (uint8_t *)parsed_frm_ptr->mdie, SIR_MDIE_SIZE); } - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "LFR3:%s:BssDescr Info:", __func__); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, bss_desc_ptr->bssId, sizeof(tSirMacAddr)); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "chan=%d, rssi=%d", bss_desc_ptr->channelId, bss_desc_ptr->rssi); if (ie_len) { @@ -2015,10 +2015,10 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, return status; } lim_log(mac_ctx, LOGE, FL("LFR3:Received WMA_ROAM_OFFLOAD_SYNCH_IND")); - lim_log(mac_ctx, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"), + lim_log(mac_ctx, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"), roam_sync_ind_ptr->authStatus, roam_sync_ind_ptr->roamedVdevId); lim_print_mac_addr(mac_ctx, roam_sync_ind_ptr->bssid.bytes, - CDF_TRACE_LEVEL_DEBUG); + QDF_TRACE_LEVEL_DEBUG); session_ptr = pe_find_session_by_sme_session_id(mac_ctx, roam_sync_ind_ptr->roamedVdevId); if (session_ptr == NULL) { @@ -2104,7 +2104,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, mac_ctx->roam.reassocRespLen); lim_log(mac_ctx, LOG1, FL("LFR3:the reassoc resp frame data:")); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, mac_ctx->roam.pReassocResp, mac_ctx->roam.reassocRespLen); ft_session_ptr->bRoamSynchInProgress = true; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 3326796d98eb..43917d0efcb2 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -2816,7 +2816,7 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, msg_q.bodyptr = add_sta_params; msg_q.bodyval = 0; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "Sending WMA_ADD_STA_REQ (aid %d)", add_sta_params->assocId); MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId, diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index ea9da9df20e3..2122371999eb 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -125,8 +125,8 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry if (pReAssocSessionEntry->valid && pReAssocSessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, FL("Deleting Preauth session(%d)"), pReAssocSessionEntry->peSessionId); pe_delete_session(pMac, pReAssocSessionEntry); @@ -1062,7 +1062,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, ft_pre_auth_rsp = (tpSirFTPreAuthRsp) cdf_mem_malloc(rsp_len); if (NULL == ft_pre_auth_rsp) { lim_log(mac_ctx, LOGE, "Failed to allocate memory"); - CDF_ASSERT(ft_pre_auth_rsp != NULL); + QDF_ASSERT(ft_pre_auth_rsp != NULL); return; } cdf_mem_zero(ft_pre_auth_rsp, rsp_len); diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index 9a4a436db4a7..697532dd8af5 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1354,7 +1354,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, * we set IBSS state to inactive. */ if (0 == pMac->lim.gLimNumIbssPeers) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, "Last STA from IBSS walked out"); psessionEntry->limIbssActive = false; } diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 8ef95ccd3c25..09b833413aae 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -1604,7 +1604,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac, pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, ("SA Query Response received...")); /* When a station, supplicant handles SA Query Response. @@ -2050,7 +2050,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, ("Public Action TDLS Discovery RSP ..")); lim_send_sme_mgmt_frame_ind(mac_ctx, mac_hdr->fc.subType, (uint8_t *) mac_hdr, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index b3e17baa129c..7cd2a9dd7713 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -261,7 +261,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) { /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_PE, LOGE, + QDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -316,7 +316,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg) ) /* Defer processsing this message */ if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_PE, LOGE, + QDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(pMac); lim_handle_defer_msg_error(pMac, limMsg); @@ -598,12 +598,12 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer); if (lim_is_group_addr(mac_hdr->addr2)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH, FL("Ignoring A2 Invalid Packet received for MC/BC:")); lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2); return; } - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("type=0x%x, subtype=0x%x"), mac_hdr->fc.type, mac_hdr->fc.subType); /* Currently only following type and subtype are handled. @@ -663,7 +663,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, if ((type == SIR_MAC_MGMT_FRAME) && (fc.type == SIR_MAC_MGMT_FRAME) && (sub_type == SIR_MAC_MGMT_RESERVED15)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH, FL ("rcvd frm match for SIR_MAC_MGMT_RESERVED15")); match = true; @@ -695,7 +695,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, } if (match) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("rcvd frame match with registered frame params")); /* Indicate this to SME */ lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType, @@ -761,7 +761,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"), fc.protVer, fc.type, fc.subType, WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo)); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, pHdr, WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo)); #endif if (pMac->fEnableDebugLog & 0x1) { @@ -1194,7 +1194,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } if (msg == NULL) { lim_log(mac_ctx, LOGE, FL("Message pointer is Null")); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } #ifdef WLAN_DEBUG @@ -1218,7 +1218,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) */ if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { if (!(mac_ctx->lim.deferredMsgCnt & 0xF)) - CDF_TRACE(QDF_MODULE_ID_PE, LOGE, + QDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); lim_print_msg_name(mac_ctx, LOGE, msg->type); @@ -1253,7 +1253,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) */ if (msg->bodyptr == NULL) { lim_log(mac_ctx, LOGE, FL("Message bodyptr is Null")); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } cdf_mem_copy((uint8_t *) &new_msg, @@ -1280,10 +1280,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg); if (defer_msg == true) { - CDF_TRACE(QDF_MODULE_ID_PE, LOG1, + QDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("Defer Msg type=%x"), msg->type); if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_PE, LOGE, + QDF_TRACE(QDF_MODULE_ID_PE, LOGE, FL("Unable to Defer Msg")); lim_log_session_states(mac_ctx); cds_pkt_return_packet(body_ptr); @@ -1410,7 +1410,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_status = session_entry->p2pGoPsNoaStartInd.status; if (qdf_status != QDF_STATUS_SUCCESS) - CDF_TRACE(QDF_MODULE_ID_PE, LOGW, + QDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO NOA start status %d by FW"), qdf_status); @@ -1419,7 +1419,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } if (p2p_go_exists == 0) - CDF_TRACE(QDF_MODULE_ID_PE, LOGW, + QDF_TRACE(QDF_MODULE_ID_PE, LOGW, FL( "GO is removed by the time NOA start recvd")); @@ -1600,7 +1600,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_HAL_TDLS_SHOULD_DISCOVER: case SIR_HAL_TDLS_SHOULD_TEARDOWN: case SIR_HAL_TDLS_PEER_DISCONNECTED: - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, ("%s received tdls event: 0x%x"), __func__, msg->type); lim_send_sme_tdls_event_notify(mac_ctx, msg->type, (void *)msg->bodyptr); @@ -2080,10 +2080,10 @@ void lim_log_session_states(tpAniSirGlobal mac_ctx) for (i = 0; i < mac_ctx->lim.maxBssId; i++) { if (mac_ctx->lim.gpSession[i].valid) { - CDF_TRACE(QDF_MODULE_ID_PE, LOG1, + QDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("sysRole(%d) Session (%d)"), mac_ctx->lim.gLimSystemRole, i); - CDF_TRACE(QDF_MODULE_ID_PE, LOG1, + QDF_TRACE(QDF_MODULE_ID_PE, LOG1, FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"), lim_sme_state_str( mac_ctx->lim.gpSession[i].limSmeState), diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 04edc0c4eaab..9ec47dc98a30 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -302,7 +302,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf) (cds_get_channel_state(channelId) != CHANNEL_STATE_DFS))) { /* Configure beacon and send beacons to HAL */ - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -840,7 +840,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->bRoamSynchInProgress) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress")); session->bRoamSynchInProgress = false; } @@ -850,7 +850,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) lim_mlm_reassoc_cnf->resultCode); if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) { /* Successful Reassociation */ - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("*** Reassociated with new BSS ***")); session->limSmeState = eLIM_SME_LINK_EST_STATE; @@ -2752,7 +2752,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, psessionEntry); #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "LFR3:Do not activate timer and dont send the reassoc req"); } #endif @@ -2876,7 +2876,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (psessionEntry->bRoamSynchInProgress) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp"); lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp, LIM_REASSOC, psessionEntry); @@ -2976,7 +2976,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, goto end; #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session_entry->bRoamSynchInProgress) - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "LFR3:lim_process_sta_mlm_add_bss_rsp"); #endif @@ -4132,7 +4132,7 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId) if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA", __func__); } @@ -4154,7 +4154,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) { tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId, pScanEvent->requestor); switch (pScanEvent->event) { @@ -4212,7 +4212,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) case SCAN_EVENT_DEQUEUED: case SCAN_EVENT_PREEMPTED: default: - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "Received unhandled scan event %u", pScanEvent->event); } diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c index 911b59fd9bf9..195e223b6c07 100644 --- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c @@ -125,7 +125,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), @@ -345,7 +345,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, } frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Probe Resp Frame Received: BSSID " MAC_ADDRESS_STR " (RSSI %d)"), MAC_ADDR_ARRAY(header->bssId), diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 60cd82f72f4f..99b5795c6f45 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -694,7 +694,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /* Store Persona */ session->pePersona = sme_start_bss_req->bssPersona; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d"), session->pePersona); /* Update the phymode */ @@ -713,7 +713,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) IS_DOT11_MODE_HT(session->dot11mode); session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("*****session->vhtCapability = %d"), session->vhtCapability); session->txLdpcIniFeatureEnabled = @@ -820,7 +820,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_start_bss_req->sec_ch_offset; session->htRecommendedTxWidthSet = (session->htSecondaryChannelOffset) ? 1 : 0; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("cbMode %u"), sme_start_bss_req->cbMode); if (session->vhtCapability || session->htCapability) { chanwidth = sme_start_bss_req->vht_channel_width; @@ -1692,7 +1692,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /*Store Persona */ session->pePersona = sme_join_req->staPersona; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("PE PERSONA=%d cbMode %u"), session->pePersona, sme_join_req->cbMode); if (mac_ctx->roam.configParam.enable2x2) @@ -1702,7 +1702,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef WLAN_FEATURE_11AC session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, "***__lim_process_sme_join_req: vhtCapability=%d****", session->vhtCapability); if (session->vhtCapability) { @@ -1718,7 +1718,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->enableVhtGid = sme_join_req->enableVhtGid; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, FL("***txBFIniFeatureEnabled=%d***"), session->txBFIniFeatureEnabled); if (wlan_cfg_get_int(mac_ctx, @@ -1743,7 +1743,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) ret_code = eSIR_LOGP_EXCEPTION; goto end; } - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, "%s: txBFCsnValue=%d", __func__, sme_join_req->txBFCsnValue); session->txbf_csn_value = sme_join_req->txBFCsnValue; @@ -3414,7 +3414,7 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) } else { lim_log(pMac, LOGE, FL("lim_del_sta failed with Status : %d"), status); - CDF_ASSERT(0); + QDF_ASSERT(0); } } /* send a delBss to HAL and wait for a response */ @@ -4998,7 +4998,7 @@ static void lim_process_sme_start_beacon_req(tpAniSirGlobal pMac, uint32_t *pMsg * Tx right after the WMA_ADD_BSS_RSP. */ lim_apply_configuration(pMac, psessionEntry); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), psessionEntry->ssId.ssId, psessionEntry->currentOperChannel); @@ -5263,8 +5263,8 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, case eUPDATE_IE_ASSOC_RESP: /* assoc resp IE */ if (add_ie_params->assocRespDataLen == 0) { - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_ERROR, FL( + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_ERROR, FL( "assoc resp add ie not present %d"), add_ie_params->assocRespDataLen); } diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index ed749a919bcc..c4653bee86de 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2417,7 +2417,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, if (NULL == pStaDs) { lim_log(pMac, LOGE, FL("add hash entry failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return eSIR_FAILURE; } } @@ -2433,7 +2433,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac, if (eSIR_SUCCESS != status) { /* should not fail */ - CDF_ASSERT(0); + QDF_ASSERT(0); } return status; } @@ -2529,7 +2529,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg, MAC_ADDR_ARRAY(pAddStaParams->staMac)); if (pAddStaParams->status != QDF_STATUS_SUCCESS) { - CDF_ASSERT(0); + QDF_ASSERT(0); lim_log(pMac, LOGE, FL("Add sta failed ")); status = eSIR_FAILURE; goto add_sta_error; @@ -2754,7 +2754,7 @@ tSirRetStatus lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("send mgmt received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_send_mgmt_error; @@ -2937,7 +2937,7 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "send mgmt received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_add_sta_error; @@ -3005,7 +3005,7 @@ tSirRetStatus lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(psessionEntry)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "Del sta received in wrong system Role %d", GET_LIM_SYSTEM_ROLE(psessionEntry)); goto lim_tdls_del_sta_error; @@ -3103,13 +3103,13 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, uint32_t self_num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN; uint8_t self_supp_chan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Send Mgmt Recieved")); session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes, &session_id); if (NULL == session_entry) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("PE Session does not exist for sme session_id %d"), tdls_req->sessionId); lim_send_sme_tdls_link_establish_req_rsp(mac_ctx, @@ -3120,7 +3120,7 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, /* check if we are in proper state to work as TDLS client */ if (!LIM_IS_STA_ROLE(session_entry)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("TDLS Link Establish Request received in wrong system Role %d"), GET_LIM_SYSTEM_ROLE(session_entry)); goto lim_tdls_link_establish_error; diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 5fcf9bac0f33..ac882aeab1ba 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -117,11 +117,11 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, mac_ctx->lim.htCapabilityPresentInBeacon = 0; #ifdef WLAN_FEATURE_11AC - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d", beacon_struct->VHTCaps.present, IS_BSS_VHT_CAPABLE(beacon_struct->VHTCaps)); - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, "***beacon.SU Beamformer Capable*****=%d", beacon_struct->VHTCaps.suBeamFormerCap); diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 283649fc3be8..2bc0f2047a50 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -98,7 +98,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); if (SIR_MAC_B_PR_SSID_OFFSET > WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)) { - CDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >= + QDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >= SIR_MAC_B_PR_SSID_OFFSET); return QDF_STATUS_E_FAILURE; } diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index b108064d5793..bc12d9a21bde 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -57,7 +57,7 @@ #endif #include "lim_session.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_utils.h" #include "sme_trace.h" #if defined WLAN_FEATURE_VOWIFI @@ -556,7 +556,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, if (((pe_session->pePersona == QDF_SAP_MODE) || (pe_session->pePersona == QDF_P2P_GO_MODE)) && (true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("CAC timer is running, probe response dropped")); return; } @@ -1065,7 +1065,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Addts Response frame in high priority WQ */ @@ -1074,7 +1074,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -1388,7 +1388,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, (pe_session->pePersona == QDF_P2P_GO_MODE)) tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); /* Queue Association Response frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes, @@ -1396,7 +1396,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_session, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ @@ -1552,14 +1552,14 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback */ if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -1867,7 +1867,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, bytes); pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); @@ -1950,14 +1950,14 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif mac_hdr = (tpSirMacMgmtHdr) frame; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (sizeof(tSirMacMgmtHdr) + payload), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -2279,7 +2279,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, (void **)&frame, (void **)&packet); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, pe_session->peSessionId, pe_session->limMlmState)); lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes); @@ -2384,14 +2384,14 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT, pe_session, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, pe_session->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) (bytes + ft_ies_length), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, pe_session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -2425,7 +2425,7 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = psessionEntry->peSessionId; /* Start reassociation failure timer */ - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer) != TX_SUCCESS) { @@ -2645,7 +2645,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, (void **)&pPacket); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { psessionEntry->limMlmState = psessionEntry->limPrevMlmState; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, psessionEntry->limMlmState)); lim_log(pMac, LOGP, @@ -2720,14 +2720,14 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT, psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); #endif - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload), TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3016,14 +3016,14 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, session->pePersona == QDF_STA_MODE) tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK; - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session->peSessionId, mac_hdr->fc.subType)); /* Queue Authentication frame in high priority WQ */ qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, frame, tx_flag, sme_sessionid, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) lim_log(mac_ctx, LOGE, @@ -3293,7 +3293,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, if (((psessionEntry->pePersona == QDF_SAP_MODE) || (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop disassoc from going out")); return; @@ -3372,7 +3372,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; if (waitForAck) { - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3383,7 +3383,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, lim_disassoc_tx_complete_cnf, txFlag, smeSessionId, false, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); @@ -3405,7 +3405,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3415,7 +3415,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3472,7 +3472,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, if (((psessionEntry->pePersona == QDF_SAP_MODE) || (psessionEntry->pePersona == QDF_P2P_GO_MODE)) && (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL ("CAC timer is running, drop the deauth from going out")); return; @@ -3554,7 +3554,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #endif if (waitForAck) { - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); /* Queue Disassociation frame in high priority WQ */ @@ -3564,7 +3564,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, lim_deauth_tx_complete_cnf, txFlag, smeSessionId, false, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); /* Pkt will be freed up by the callback lim_tx_complete */ @@ -3598,7 +3598,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, return; } } else { - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); #ifdef FEATURE_WLAN_TDLS @@ -3621,7 +3621,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_TDLS } #endif - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -3745,14 +3745,14 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, "easurement Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); @@ -3848,14 +3848,14 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, "PC Request (0x%08x)."), nStatus); } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); @@ -3955,14 +3955,14 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, "PC Report (0x%08x)."), nStatus); } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, ((psessionEntry) ? psessionEntry-> peSessionId : NO_SESSION), pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, 0, 0); - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION), qdf_status)); @@ -4089,14 +4089,14 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4223,7 +4223,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, frm.ext_chan_switch_ann_action.new_channel, frm.ext_chan_switch_ann_action.op_class); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session_entry->peSessionId, mac_hdr->fc.subType)); qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes, TXRX_FRM_802_11_MGMT, @@ -4231,7 +4231,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, 7, lim_tx_complete, frame, txFlag, sme_session_id, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, session_entry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(mac_ctx, LOGE, @@ -4332,14 +4332,14 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes, TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { lim_log(pMac, LOGE, @@ -4476,7 +4476,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4485,7 +4485,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4633,7 +4633,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4642,7 +4642,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -4828,7 +4828,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -4837,7 +4837,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log @@ -5116,7 +5116,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; } - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, psessionEntry->peSessionId, pMacHdr->fc.subType)); qdf_status = wma_tx_frame(pMac, pPacket, @@ -5125,7 +5125,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, ANI_TXDIR_TODS, 7, lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, psessionEntry->peSessionId, qdf_status)); if (QDF_STATUS_SUCCESS != qdf_status) { PELOGE(lim_log diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index f7934499483a..49248017322c 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -91,7 +91,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp)); if (NULL == sme_rsp) { /* Buffer not available. Log error */ - CDF_TRACE(QDF_MODULE_ID_PE, LOGP, + QDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } @@ -149,7 +149,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp)); if (NULL == sme_rsp) { - CDF_TRACE(QDF_MODULE_ID_PE, LOGP, + QDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); return; } diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 02e5b20b445f..c2e5dc0f4144 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -114,8 +114,8 @@ void pe_reset_protection_callback(void *ptr) bool bcn_prms_changed = false; if (pe_session_entry->valid == false) { - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_ERROR, FL("session already deleted. exiting timer callback")); return; } @@ -127,8 +127,8 @@ void pe_reset_protection_callback(void *ptr) pe_session_entry->gLimOverlapNonGfParams.protectionEnabled << 3 | pe_session_entry->gLimOlbcParams.protectionEnabled << 4; - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_INFO, FL("old protection state: 0x%04X, new protection state: 0x%04X\n"), pe_session_entry->old_protection_state, current_protection_state); @@ -177,8 +177,8 @@ void pe_reset_protection_callback(void *ptr) if ((current_protection_state != pe_session_entry->old_protection_state) && (false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) { - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_ERROR, FL("protection changed, update beacon template\n")); /* update beacon fix params and send update to FW */ cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); @@ -217,8 +217,8 @@ void pe_reset_protection_callback(void *ptr) protection_fields_reset_timer, SCH_PROTECTION_RESET_TIME) != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } } @@ -326,7 +326,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->fWaitForProbeRsp = 0; session_ptr->fIgnoreCapsChange = 0; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"), session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta); @@ -376,7 +376,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, SCH_PROTECTION_RESET_TIME); } if (status != QDF_STATUS_SUCCESS) - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("cannot create or start protectionFieldsResetTimer\n")); } @@ -532,12 +532,12 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) TX_TIMER *timer_ptr; if (!session || (session && !session->valid)) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("session is not valid")); return; } - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, FL("Trying to delete PE session %d Opmode %d BssIdx %d BSSID: "MAC_ADDRESS_STR), session->peSessionId, session->operMode, session->bssIdx, diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index a5c76fa11eeb..10b8232e37a7 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -43,7 +43,7 @@ #include "lim_trace.h" #include "lim_timer_utils.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #ifdef LIM_TRACE_RECORD uint32_t g_mgmt_frame_stats[14]; @@ -106,10 +106,10 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason) void lim_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(QDF_MODULE_ID_PE, (tp_cdf_trace_cb) &lim_trace_dump); + qdf_trace_register(QDF_MODULE_ID_PE, (tp_qdf_trace_cb) &lim_trace_dump); } -void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, +void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord, uint16_t recIndex) { diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 8d9dac0b1545..2e71821d0baf 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -593,7 +593,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry, if (NULL == sta_ds) continue; - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("Deleting pmfSaQueryTimer for staid[%d]"), sta_ds->staIndex); tx_timer_deactivate(&sta_ds->pmfSaQueryTimer); @@ -735,7 +735,7 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) * the pmfSaQueryTimer for it */ if (cds_is_driver_recovering()) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, FL("SSR is detected, proceed to clean up pmfSaQueryTimer")); for (bss_entry = 0; bss_entry < mac_ctx->lim.maxBssId; bss_entry++) { @@ -6812,7 +6812,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, tSirMacAddr a1, tpPESession session) { if (mac_ctx == NULL || session == NULL) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, "mac or session context is null"); /* let main routine handle it */ return true; diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index a7175651663e..5a6744da8f9f 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -270,7 +270,7 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, psessionEntry->schBeaconOffsetBegin)) { sch_log(pMac, LOGE, FL("Invalid p2pIeOffset:[%d]"), pMac->sch.schObject.p2pIeOffset); - CDF_ASSERT(0); + QDF_ASSERT(0); cdf_mem_free(beaconParams); return eSIR_FAILURE; } diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index 93c78d501d2d..10809e6b372f 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -135,8 +135,8 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, return; #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) - CDF_TRACE(QDF_MODULE_ID_PE, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, bcn_struct->erpIEInfo.useProtection, @@ -162,7 +162,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (tmp_exp) { #ifdef FEATURE_WLAN_ESE if (session->isESEconnection) { - CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"), bcn_struct->erpPresent, bcn_struct->erpIEInfo.useProtection, diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c index 3f4f987526c8..d637ce3f0230 100644 --- a/core/mac/src/pe/sch/sch_debug.c +++ b/core/mac/src/pe/sch/sch_debug.c @@ -37,14 +37,14 @@ * */ -#include "cdf_trace.h" +#include "qdf_trace.h" #include "sch_debug.h" #define LOG_SIZE 256 void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { - CDF_TRACE_LEVEL cdf_debug_level; + QDF_TRACE_LEVEL cdf_debug_level; char logBuffer[LOG_SIZE]; va_list marker; @@ -54,7 +54,7 @@ void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) /* extracting arguments from pstring */ va_start(marker, pString); vsnprintf(logBuffer, LOG_SIZE, pString, marker); - CDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); + QDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); va_end(marker); } diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index dc42b0fda026..059dbcdd3aef 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -77,7 +77,7 @@ void sys_stop_complete_cb(void *pUserData) qdf_event_t *pStopEvt = (qdf_event_t *) pUserData; QDF_STATUS qdf_status = qdf_event_set(pStopEvt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } @@ -113,10 +113,10 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context) qdf_status = QDF_STATUS_E_BADMSG; qdf_status = qdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); qdf_status = qdf_event_destroy(&g_stop_evt); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); return qdf_status; } @@ -138,9 +138,9 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) void *hHal; if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "%s: NULL pointer to cds_msg_t", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } @@ -157,31 +157,31 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) case SYS_MSG_ID_MC_START: /* * Handling for this message is not needed now so adding - * debug print and CDF_ASSERT + * debug print and QDF_ASSERT */ - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_START msgType= %d [0x%08x]", pMsg->type, pMsg->type); - CDF_ASSERT(0); + QDF_ASSERT(0); break; case SYS_MSG_ID_MC_STOP: - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Processing SYS MC STOP"); /* get the HAL context... */ hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal", __func__); } else { qdf_status = sme_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); qdf_status = mac_stop(hHal, HAL_STOP_TYPE_SYS_DEEP_SLEEP); - CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); + QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); ((sysResponseCback) pMsg->callback)( (void *)pMsg->bodyptr); @@ -195,7 +195,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) * Process MC thread probe. Just callback to the * function that is in the message. */ - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Rx SYS_MSG_ID_MC_THR_PROBE msgType=%d[0x%08x]", pMsg->type, pMsg->type); break; @@ -209,23 +209,23 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) case SYS_MSG_ID_FTM_RSP: hHal = cds_get_context(QDF_MODULE_ID_PE); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_mem_free(pMsg->bodyptr); break; } mac_ctx = PMAC_STRUCT(hHal); if (NULL == mac_ctx) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_ERROR, FL("Invalid mac context")); cdf_mem_free(pMsg->bodyptr); break; } if (NULL == mac_ctx->ftm_msg_processor_callback) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_ERROR, FL("callback pointer is NULL")); cdf_mem_free(pMsg->bodyptr); break; @@ -236,18 +236,18 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) break; default: - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Unknown message type msgType= %d [0x%08x]", pMsg->type, pMsg->type); break; } } else { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_ERROR, "Rx SYS unknown MC msgtype= %d [0x%08X]", pMsg->type, pMsg->type); - CDF_ASSERT(0); + QDF_ASSERT(0); qdf_status = QDF_STATUS_E_BADMSG; if (pMsg->bodyptr) @@ -275,9 +275,9 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * It is up to the callee to free it */ if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "NULL Message Pointer"); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -289,10 +289,10 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_CNF: /* Forward this message to the SYS module */ targetMQ = CDS_MQ_ID_SYS; - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed in SYS", pMsg->type); - CDF_ASSERT(0); + QDF_ASSERT(0); break; /* @@ -301,11 +301,11 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) case WNI_CFG_DNLD_RSP: /* Forward this message to the HAL module */ targetMQ = CDS_MQ_ID_WMA; - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Handling for the Message ID %d is removed as no HAL", pMsg->type); - CDF_ASSERT(0); + QDF_ASSERT(0); break; case WNI_CFG_GET_REQ: @@ -329,10 +329,10 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) break; } - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Message of ID %d is not yet handled by SYS", pMsg->type); - CDF_ASSERT(0); + QDF_ASSERT(0); } /* diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index e6d71ea196c4..ab955b42ff2d 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h @@ -49,7 +49,7 @@ extern "C" { #include "sys_def.h" #include "qdf_mc_timer.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" /* Interlocked Compare Exchange related definitions */ diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index f924d7ccb61e..82603e9b29c8 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -127,31 +127,31 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) /* Put a check for the free builds */ if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) { - CDF_ASSERT(timer_ptr->tmrSignature == 0); + QDF_ASSERT(timer_ptr->tmrSignature == 0); return TX_TIMER_ERROR; } /* Check for an uninitialized timer */ - CDF_ASSERT(0 != strlen(TIMER_NAME)); + QDF_ASSERT(0 != strlen(TIMER_NAME)); - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Timer %s being activated\n", TIMER_NAME); status = qdf_mc_timer_start(&timer_ptr->cdf_timer, timer_ptr->initScheduleTimeInMsecs); if (QDF_STATUS_SUCCESS == status) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Timer %s now activated\n", TIMER_NAME); return TX_SUCCESS; } else if (QDF_STATUS_E_ALREADY == status) { /* starting timer fails because timer is already started; this is okay */ - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Timer %s is already running\n", TIMER_NAME); return TX_SUCCESS; } else { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Timer %s fails to activate\n", TIMER_NAME); return TX_TIMER_ERROR; } @@ -179,7 +179,7 @@ uint32_t tx_timer_change(TX_TIMER *timer_ptr, { /* Put a check for the free builds */ if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) { - CDF_ASSERT(timer_ptr->tmrSignature == 0); + QDF_ASSERT(timer_ptr->tmrSignature == 0); return TX_TIMER_ERROR; } /* changes cannot be applied until timer stops running */ @@ -217,7 +217,7 @@ uint32_t tx_timer_change_context(TX_TIMER *timer_ptr, /* Put a check for the free builds */ if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) { - CDF_ASSERT(timer_ptr->tmrSignature == 0); + QDF_ASSERT(timer_ptr->tmrSignature == 0); return TX_TIMER_ERROR; } @@ -252,16 +252,16 @@ static void tx_main_timer_func(void *functionContext) TX_TIMER *timer_ptr = (TX_TIMER *) functionContext; if (NULL == timer_ptr) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } if (NULL == timer_ptr->pExpireFunc) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Timer %s triggered", TIMER_NAME); /* Now call the actual timer function, taking the function pointer, */ @@ -276,7 +276,7 @@ static void tx_main_timer_func(void *functionContext) timer_ptr->rescheduleTimeInMsecs = 0; if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_WARN, "Unable to reschedule timer %s; status=%d", TIMER_NAME, status); } @@ -297,17 +297,17 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, QDF_STATUS status; if (NULL == expiration_function) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "NULL timer expiration"); - CDF_ASSERT(0); + QDF_ASSERT(0); return TX_TIMER_ERROR; } if (NULL == name_ptr) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "NULL name pointer for timer"); - CDF_ASSERT(0); + QDF_ASSERT(0); return TX_TIMER_ERROR; } if (!initScheduleTimeInTicks) @@ -338,13 +338,13 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -396,13 +396,13 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, status = qdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, "Cannot create timer for %s\n", TIMER_NAME); return TX_TIMER_ERROR; } if (0 != rescheduleTimeInTicks) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Creating periodic timer for %s\n", TIMER_NAME); } /* Activate this timer if required */ @@ -434,7 +434,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) { QDF_STATUS vStatus; - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "tx_timer_deactivate() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -444,7 +444,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) /* if the timer is not running then we do not need to do anything here */ vStatus = qdf_mc_timer_stop(&timer_ptr->cdf_timer); if (QDF_STATUS_SUCCESS != vStatus) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", TIMER_NAME, vStatus); } @@ -455,7 +455,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) uint32_t tx_timer_delete(TX_TIMER *timer_ptr) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "tx_timer_delete() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ @@ -485,7 +485,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr) */ bool tx_timer_running(TX_TIMER *timer_ptr) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "tx_timer_running() called for timer %s\n", TIMER_NAME); /* Put a check for the free builds */ diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c index 5c0877a90647..02a46f51fb50 100644 --- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c +++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -58,7 +58,7 @@ tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams) tpAniSirGlobal pMac = (tpAniSirGlobal) hHal; if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); status = eSIR_FAILURE; return status; } diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 88bac6af63e5..97703dc45994 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -137,8 +137,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, &sessionid); if (pe_session && (pe_session->pePersona == QDF_SAP_MODE)) { - CDF_TRACE(QDF_MODULE_ID_SYS, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SYS, + QDF_TRACE_LEVEL_INFO_HIGH, FL("CAC timer is running, dropping the mgmt frame")); goto fail; } @@ -152,7 +152,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg, (!lim_is_system_in_scan_state(mac_ctx)) && (GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true) && !mac_ctx->lim.gLimSystemInScanLearnMode) { - CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH, FL("dropping received beacon in deffered state")); goto fail; } diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c index 3b3581b0bc55..8efbd6b4eb8c 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c @@ -45,7 +45,7 @@ #include "utils_global.h" #include "mac_init_api.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #ifdef ANI_OS_TYPE_ANDROID #include @@ -132,25 +132,25 @@ void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, #endif } -CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel) +QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel) { switch (debugLevel) { case LOGP: - return CDF_TRACE_LEVEL_FATAL; + return QDF_TRACE_LEVEL_FATAL; case LOGE: - return CDF_TRACE_LEVEL_ERROR; + return QDF_TRACE_LEVEL_ERROR; case LOGW: - return CDF_TRACE_LEVEL_WARN; + return QDF_TRACE_LEVEL_WARN; case LOG1: - return CDF_TRACE_LEVEL_INFO; + return QDF_TRACE_LEVEL_INFO; case LOG2: - return CDF_TRACE_LEVEL_INFO_HIGH; + return QDF_TRACE_LEVEL_INFO_HIGH; case LOG3: - return CDF_TRACE_LEVEL_INFO_MED; + return QDF_TRACE_LEVEL_INFO_MED; case LOG4: - return CDF_TRACE_LEVEL_INFO_LOW; + return QDF_TRACE_LEVEL_INFO_LOW; default: - return CDF_TRACE_LEVEL_INFO_LOW; + return QDF_TRACE_LEVEL_INFO_LOW; } } @@ -183,7 +183,7 @@ static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId) void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, const char *pStr, va_list marker) { - CDF_TRACE_LEVEL cdf_debug_level; + QDF_TRACE_LEVEL cdf_debug_level; QDF_MODULE_ID cdf_module_id; char logBuffer[LOG_SIZE]; @@ -191,10 +191,10 @@ void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, cdf_module_id = get_vos_module_id(modId); vsnprintf(logBuffer, LOG_SIZE - 1, pStr, marker); - CDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer); + QDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer); /* The caller must check loglevel */ - CDF_ASSERT((debugLevel <= + QDF_ASSERT((debugLevel <= pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(modId)]) && (LOGP != debugLevel)); } /*** end log_debug() ***/ diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 08024a248185..0c2038a3aafa 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -45,7 +45,7 @@ #include "csr_internal.h" #include "lim_global.h" #include "cdf_memory.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "wma_if.h" #ifdef TRACE_RECORD @@ -746,7 +746,7 @@ void mac_trace(tpAniSirGlobal mac_ctx, uint8_t code, void mac_trace_new(tpAniSirGlobal mac_ctx, uint8_t module, uint8_t code, uint16_t session, uint32_t data) { - cdf_trace(module, code, session, data); + qdf_trace(module, code, session, data); } #endif diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index 28030a6d98a1..a9acc64154b5 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -81,7 +81,7 @@ if (((dfs) == NULL) || \ ((dfs) != NULL && \ ((_m) & (dfs)->dfs_debug_mask))) { \ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \ + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, \ _fmt, __VA_ARGS__); \ } \ } while (0) diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index f807c3c74f63..85266dc37eb0 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -313,7 +313,7 @@ int dfs_attach(struct ieee80211com *ic) dfs->events = NULL; OS_FREE(dfs); ic->ic_dfs = NULL; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: pulse buffer allocation failed", __func__, __LINE__); return 1; @@ -606,7 +606,7 @@ int dfs_radar_enable(struct ieee80211com *ic, * 0 on success. */ if (DFS_STATUS_FAIL == radar_filters_init_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: DFS Radar Filters Initialization Failed", __func__, __LINE__); return -EIO; diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c index 434b016eca2c..b4db534a0ade 100644 --- a/core/sap/dfs/src/dfs_init.c +++ b/core/sap/dfs/src/dfs_init.c @@ -75,7 +75,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) int i, j; if (dfs == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: sc_dfs is NULL", __func__, __LINE__); return; } @@ -86,7 +86,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) pl = dfs->pulses; if (pl == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, dfs=%p", __func__, __LINE__, dfs); return; } @@ -103,7 +103,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) } } else { if (dfs->dfs_b5radars == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__, dfs->dfs_b5radars); return; @@ -220,7 +220,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, uint32_t b5_maxdur; if (dfs == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return DFS_STATUS_FAIL; } @@ -234,7 +234,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, * the rest of the radar configuration as suspect. */ if (radar_info == NULL || radar_info->dfsdomain == 0) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: Unknown dfs domain %d ", __func__, __LINE__, dfs->dfsdomain); /* Disable radar detection since we don't have a radar domain */ @@ -245,7 +245,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, return DFS_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]:dfsdomain=%d, numradars=%d, numb5radars=%d", __func__, __LINE__, radar_info->dfsdomain, radar_info->numradars, radar_info->numb5radars); @@ -368,12 +368,12 @@ int dfs_init_radar_filters(struct ieee80211com *ic, rf->rf_threshold = dfs_radars[p].rp_threshold; rf->rf_filterlen = rf->rf_maxpri * rf->rf_numpulses; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]: minprf = %d maxprf = %d pulsevar = %d thresh=%d", __func__, __LINE__, dfs_radars[p].rp_pulsefreq, dfs_radars[p].rp_max_pulsefreq, dfs_radars[p].rp_pulsevar, rf->rf_threshold); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]:minpri = %d maxpri = %d filterlen = %d filterID = %d", __func__, __LINE__, rf->rf_minpri, rf->rf_maxpri, rf->rf_filterlen, rf->rf_pulseid); @@ -405,7 +405,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, sizeof(struct dfs_bin5radars), GFP_KERNEL); if (dfs->dfs_b5radars_ext_seg == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s:Fail allocate memory for ext bin5 radars", __func__); goto bad4; @@ -456,10 +456,10 @@ int dfs_init_radar_filters(struct ieee80211com *ic, dfs_round((int32_t) ((max_pulsedur * 100 / 80) * 100)); /* relax the max pulse duration a little bit due to inaccuracy caused by chirping. */ dfs->dfs_rinfo.rn_maxpulsedur = dfs->dfs_rinfo.rn_maxpulsedur + 20; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]: DFS min filter rssiThresh = %d", __func__, __LINE__, min_rssithresh); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]:DFS max pulse dur = %d ticks", __func__, __LINE__, dfs->dfs_rinfo.rn_maxpulsedur); return DFS_STATUS_SUCCESS; diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.c b/core/sap/dfs/src/dfs_phyerr_tlv.c index 1df4e5dde783..3ac1d08c1071 100644 --- a/core/sap/dfs/src/dfs_phyerr_tlv.c +++ b/core/sap/dfs/src/dfs_phyerr_tlv.c @@ -154,52 +154,52 @@ radar_summary_print(struct ath_dfs *dfs, else is_chip_oversampling = PERE_IS_OVERSAMPLING(dfs); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n ############ Radar Summary ############\n"); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - pulsedur = %d micro seconds\n", __func__, rsu->pulse_duration); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - rssi = %d dbm\n", __func__, rsu->rssi); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - ischirp = %d\n", __func__, rsu->is_chirp); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - sidx = %d\n", __func__, rsu->sidx); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_peak = %d\n", __func__, rsu->delta_peak); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - delta_diff = %d\n", __func__, rsu->delta_diff); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - raw tsf = %d\n", __func__, rsu->raw_tsf); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - tsf_offset = %d micro seconds\n", __func__, rsu->tsf_offset); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Radar Summary - cooked tsf = %d\n", __func__, (rsu->raw_tsf - rsu->tsf_offset)); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: frequency offset = %d.%d MHz (oversampling = %d)\n", __func__, (int) (rsu->freq_offset / 1000), (int) abs(rsu->freq_offset % 1000), is_chip_oversampling); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n ###################################\n"); } @@ -223,12 +223,12 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len, */ if ((dfs->ic->dfs_hw_bd_id == DFS_HWBD_QCA6174) && (len < sizeof(rs))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: DFS-2 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(rs)); } else if ((dfs->ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) && (len < sizeof(dfs3_rs))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: DFS-3 radar summary len = (%zu) wrong, expected = (%zu)", __func__, len, sizeof(dfs3_rs)); } @@ -859,7 +859,7 @@ dfs_process_phyerr_bb_tlv(struct ath_dfs *dfs, void *buf, uint16_t datalen, * in noisy environments. */ if (!(invalid_phyerr_count & 0xFF)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, "%s[%d]:parse failed invalid phyerror cnt = %d", __func__, __LINE__, invalid_phyerr_count); } diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c index b07c4cfca6b0..f91aa6464629 100644 --- a/core/sap/dfs/src/dfs_process_phyerr.c +++ b/core/sap/dfs/src/dfs_process_phyerr.c @@ -463,7 +463,7 @@ static void dump_phyerr_contents(const char *d, int len) * Print the final line if we didn't print it above. */ if (n != 0) - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n", + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: %s\n", __func__, buf); #endif /* def CONFIG_ENABLE_DUMP_PHYERR_CONTENTS */ } @@ -480,7 +480,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, int empty; if (dfs == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: sc_dfs is NULL\n", __func__); return; } @@ -509,7 +509,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, dump_phyerr_contents(buf, datalen); if (chan == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: chan is NULL\n", __func__); return; } @@ -588,7 +588,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, } } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n %s: Frequency at which the phyerror was injected = %d", __func__, e.freq); /* diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 0cbed7eca11e..6c4613b19a82 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -137,7 +137,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, struct dfs_delayline *dl; if (dfs == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: dfs is NULL", __func__, __LINE__); return 0; } @@ -216,7 +216,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, if (event == NULL) { empty = 1; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]: event is NULL ", __func__, __LINE__); break; } @@ -404,7 +404,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, dfs->radar_log[i].dur = re.re_dur; dfs->dfs_event_log_count++; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]:xxxxx ts =%u re.re_dur=%u re.re_rssi =%u diff =%u pl->pl_lastelem.p_time=%llu xxxxx", __func__, __LINE__, (uint32_t) this_ts, re.re_dur, re.re_rssi, diff_ts, @@ -436,7 +436,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (diff_ts > 500 || diff_ts <= 305) && (re.sidx == -4)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n%s: Rejecting on Peak Index = %d,re.re_dur = %d,diff_ts = %d\n", __func__, re.sidx, re.re_dur, diff_ts); @@ -465,16 +465,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, re.re_dur < DFS_TYPE4_WAR_PULSE_DURATION_UPPER_LIMIT) && (diff_ts > DFS_TYPE4_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_TYPE4_WAR_PRI_UPPER_LIMIT)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s:chan->ic_flags=0x%x, MHz separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: Peak Idx =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n%s: Modify pulse dur to fit valid range \n", __func__); @@ -502,16 +502,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs, diff_ts < DFS_ETSI_TYPE2_WAR_PRI_UPPER_LIMIT) || (diff_ts > DFS_ETSI_TYPE3_WAR_PRI_LOWER_LIMIT && diff_ts < DFS_ETSI_TYPE3_WAR_PRI_UPPER_LIMIT))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "\n%s:chan->ic_flags=0x%x,MHz Separation=%d\n", __func__, chan->ic_flags, chan->ic_pri_freq_center_freq_mhz_separation); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s:Peak Index =%d,re.re_dur =%d,diff_ts =%d\n", __func__, re.sidx, re.re_dur, diff_ts); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s:Modify ETSI pulse dur to valid range \n", __func__); @@ -598,8 +598,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "%s : Rejecting on rssi rssi=%u thresh=%u", __func__, re.re_rssi, ft->ft_rssithresh); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "%s[%d]: Rejecting on rssi rssi=%u thresh=%u", __func__, __LINE__, re.re_rssi, ft->ft_rssithresh); @@ -623,8 +623,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, __func__, (unsigned long long)deltaT, ft->ft_minpri); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "%s[%d]:Rejecting on pri pri=%lld minpri=%u", __func__, __LINE__, (unsigned long long)deltaT, @@ -657,8 +657,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, (unsigned long long) deltaT, rf->rf_minpri); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d::Rejecting on individual filter min PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, rf->rf_pulseid, @@ -680,9 +680,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, deltaT, rf-> rf_minpri); - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, rf->rf_pulseid, @@ -719,9 +719,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs, deltaT, rf-> rf_minpri); - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE_LEVEL_INFO, "%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u", __func__, __LINE__, rf->rf_pulseid, @@ -770,7 +770,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, "Found on channel minDur = %d, filterId = %d", ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s[%d]:### Found on channel minDur = %d, filterId = %d seg_id = %d ###", __func__, __LINE__, ft->ft_mindur, rf != NULL ? rf->rf_pulseid : -1, @@ -798,7 +798,7 @@ dfsfound: */ dfs->ic->ic_curchan->ic_radar_found_segid = seg_id; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s[%d]:### RADAR FOUND ON CHANNEL %d (%d MHz),seg_id=%d ###", __func__, __LINE__, thischan->ic_ieee, thischan->ic_freq, seg_id); @@ -861,7 +861,7 @@ dfsfound: dfs->dfs_phyerr_freq_max = 0; dfs->dfs_phyerr_w53_counter = 0; } - /* CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ + /* QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */ return retval; /* #endif */ /* return 1; */ diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index dadbaec9c363..086864b823f4 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -45,7 +45,7 @@ /*---------------------------------------------------------------------------- * Include Files * -------------------------------------------------------------------------*/ -#include "cdf_trace.h" +#include "qdf_trace.h" /* Pick up the CSR callback definition */ #include "csr_api.h" #include "sme_api.h" @@ -108,12 +108,12 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, #endif if (NULL == hal_handle) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAILURE; } if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, "In %s BSS already stopped", __func__); return QDF_STATUS_E_FAILURE; } @@ -121,7 +121,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, switch (scan_status) { case eCSR_SCAN_SUCCESS: /* sapScanCompleteCallback with eCSR_SCAN_SUCCESS */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_SUCCESS", scan_status); @@ -138,20 +138,20 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if ((get_result_status != QDF_STATUS_SUCCESS) && (get_result_status != QDF_STATUS_E_NULL_VALUE)) { /* No scan results */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s, Get scan result failed! ret = %d", __func__, get_result_status); break; } #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scan_id != 0) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Sending ACS Scan skip event", __func__); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: ACS scan id: %d (skipped ACS SCAN)", __func__, scan_id); #endif @@ -162,7 +162,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, default: event = eSAP_CHANNEL_SELECTION_FAILED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, CSR scanStatus = %s (%d)", __func__, "eCSR_SCAN_ABORT/FAILURE", scan_status); } @@ -170,7 +170,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (operChannel == SAP_CHANNEL_NOT_SELECTED) #ifdef SOFTAP_CHANNEL_RANGE { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: No suitable channel selected due to DFS, LTE" "COEX and concurrent mode restrictions", __func__); @@ -199,7 +199,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, } #endif - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel selected = %d", __func__, sap_ctx->channel); @@ -276,7 +276,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx) ptSapContext sap_ctx = (struct sSapContext *)ctx; QDF_STATUS status; if (NULL == sap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sap context is not valid")); return QDF_STATUS_E_FAILURE; } @@ -313,7 +313,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, QDF_STATUS status = QDF_STATUS_E_FAILURE; if (eCSR_SCAN_SUCCESS != scan_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"), scan_status); #ifdef SOFTAP_CHANNEL_RANGE @@ -328,7 +328,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->sap_status = eSAP_STATUS_SUCCESS; goto close_session; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status); /* * Now do @@ -346,19 +346,19 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, * to allow the default channel to be set when reporting to HDD */ oper_channel = SAP_CHANNEL_NOT_SELECTED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Get scan result failed! ret = %d"), scan_get_result_status); } else { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (scanid != 0) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Sending ACS Scan skip event")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_ACS_SCAN_SUCCESS_EVENT, (void *) eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("ACS scanid: %d (skipped ACS SCAN)"), scanid); } @@ -369,7 +369,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, if (oper_channel == SAP_CHANNEL_NOT_SELECTED) { #ifdef SOFTAP_CHANNEL_RANGE - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("No suitable channel selected")); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; @@ -398,7 +398,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->channelList = NULL; } #endif - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Channel selected = %d"), sap_ctx->channel); sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; sap_ctx->sap_status = eSAP_STATUS_SUCCESS; @@ -407,7 +407,7 @@ close_session: sap_ctx->sessionId, sap_hdd_signal_event_handler, sap_ctx); if (QDF_STATUS_SUCCESS != status) - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CloseSession failed")); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -438,7 +438,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: changing target channel to [%d]"), mac_ctx->sap.SapDfsInfo.target_channel); sap_ctx->channel = mac_ctx->sap.SapDfsInfo.target_channel; @@ -452,7 +452,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, && (eSAP_DFS_DO_NOT_SKIP_CAC == mac_ctx->sap.SapDfsInfo.cac_state)) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%p]"), sap_ctx); /* DFS Channel */ @@ -461,8 +461,8 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u1 = 0; sap_event.u2 = 0; } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%p]"), sap_ctx); @@ -476,7 +476,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, sap_event.u2 = eCSR_ROAM_RESULT_INFRA_STARTED; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%p]"), sap_ctx); /* non-DFS channel */ @@ -517,8 +517,8 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, uint8_t dfs_beacon_start_req = 0; if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("sapdfs: DFS channel switch disabled")); /* * Send a beacon start request to PE. CSA IE required flag from @@ -537,14 +537,14 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (eSAP_STARTED != sap_ctx->sapsMachine) { /* Further actions to be taken here */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); return; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: from state eSAP_STARTED => eSAP_DISCONNECTING")); /* SAP to be moved to DISCONNECTING state */ sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -576,8 +576,8 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, sap_event.params = 0; sap_event.u1 = 0; sap_event.u2 = 0; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM")); /* Handle event */ qdf_status = sap_fsm(sap_ctx, &sap_event); @@ -596,7 +596,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, */ if (false == is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: sapctx[%p] ready but not concurrent sap"), sap_ctx); *ret_status = QDF_STATUS_SUCCESS; @@ -611,7 +611,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, continue; pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:issue chnl change for sapctx[%p]"), pSapContext); /* Send channel switch request */ @@ -622,7 +622,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, /* Handle event */ qdf_status = sap_fsm(pSapContext, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("post chnl chng req failed, sap[%p]"), sap_ctx); *ret_status = QDF_STATUS_E_FAILURE; @@ -652,15 +652,15 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, tWLAN_SAPEvent sap_event; if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) { if (sap_ctx->csr_roamProfile.disableDFSChSwitch) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "sapdfs: DFS channel switch disabled"); return; } if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status) return; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND")); /* * If Radar is found, while in DFS CAC WAIT State then post stop @@ -679,7 +679,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, eSAP_DFS_CAC_INTERRUPTED, (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Failed to send CAC end")); /* Want to still proceed and try to switch channel. * Lets try not to be on the DFS channel @@ -697,7 +697,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } if (eSAP_STARTED == sap_ctx->sapsMachine) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START")); /* @@ -715,7 +715,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx, return; } /* Further actions to be taken here */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"), sap_ctx->sapsMachine); @@ -740,7 +740,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, QDF_STATUS *ret_status) { QDF_STATUS qdf_status; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -767,14 +767,14 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, csr_roam_info, eSAP_STA_ASSOC_IND, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"), roam_result, MAC_ADDR_ARRAY( csr_roam_info->peerMac.bytes)); *ret_status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"), roam_result, MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes)); @@ -812,18 +812,18 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, uint8_t intf; if (NULL == hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); cdf_ret_status = QDF_STATUS_E_NOMEM; return cdf_ret_status; } mac_ctx = PMAC_STRUCT(hal); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_status = %d\n"), roam_status); switch (roam_status) { case eCSR_ROAM_SESSION_OPENED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP")); sap_ctx->isSapSessionOpen = eSAP_TRUE; cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, @@ -831,7 +831,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, &sap_ctx->csr_roamId); break; case eCSR_ROAM_INFRA_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) { @@ -847,17 +847,17 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_LOSTLINK: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)\n"), roam_status); break; case eCSR_ROAM_MIC_ERROR_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)\n"), roam_status); break; case eCSR_ROAM_SET_KEY_COMPLETE: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -866,7 +866,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_ASSOCIATION_COMPLETION: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_FAILURE) @@ -875,7 +875,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_DISASSOCIATED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)\n"), roam_status); if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE) @@ -884,7 +884,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_FAILURE); break; case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_status); break; @@ -908,16 +908,16 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_SEND_P2P_STOP_BSS: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received stopbss")); sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_MAC_TRIG_STOP_BSS_EVENT, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_DFS_RADAR_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received Radar Indication")); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT, (void *) eSAP_STATUS_SUCCESS); @@ -953,8 +953,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, NULL) { pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("sapdfs: no available channel for sapctx[%p], StopBss"), pSapContext); wlansap_stop_bss(pSapContext); @@ -962,26 +962,26 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_DFS_CHAN_SW_NOTIFY: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received Chan Sw Update Notification")); break; case eCSR_ROAM_SET_CHANNEL_RSP: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel response")); break; case eCSR_ROAM_EXT_CHG_CHNL_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel Indication")); break; default: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CSR roam_status not handled roam_status = %s (%d)\n"), get_e_roam_cmd_status_str(roam_status), roam_status); break; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Before switch on roam_result = %d\n"), roam_result); switch (roam_result) { @@ -990,7 +990,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, csr_roam_info, &cdf_ret_status); break; case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)\n"), roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; @@ -1015,7 +1015,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1026,7 +1026,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH_IND (%d)\n"), roam_result); /* @@ -1041,7 +1041,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)\n"), roam_result); /* @@ -1055,7 +1055,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)\n"), roam_result); /* @@ -1071,7 +1071,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, } break; case eCSR_ROAM_RESULT_AUTHENTICATED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1082,7 +1082,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1091,7 +1091,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_INFRA_STARTED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)\n"), roam_result); /* @@ -1109,7 +1109,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1123,7 +1123,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)\n"), roam_result); /* @@ -1137,7 +1137,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)\n"), roam_result); /* @@ -1150,7 +1150,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_NONE: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)\n"), roam_result); /* @@ -1164,7 +1164,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, (void *) eSAP_STATUS_SUCCESS); break; case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"), roam_result); /* Fill in the event structure */ @@ -1204,7 +1204,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, cdf_ret_status = QDF_STATUS_E_FAILURE; break; default: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CSR roam_result = %s (%d) not handled\n"), get_e_csr_roam_result_str(roam_result), roam_result); diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 8bad4308903b..41f4c63031e4 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -41,7 +41,7 @@ /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ -#include "cdf_trace.h" +#include "qdf_trace.h" #include "csr_api.h" #include "sme_api.h" #include "sap_ch_select.h" @@ -358,8 +358,8 @@ void sap_process_avoid_ie(tHalHandle hal, continue; sap_ctx->sap_detected_avoid_ch_ie.present = 1; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_DEBUG, "Q2Q IE - avoid ch %d", avoid_ch_ie->channel); /* add this channel to to_avoid channel list */ @@ -425,8 +425,8 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) if (pSapCtx->dfs_ch_disable == true) { if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) { safe_channels[i].isSafe = false; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: DFS Ch %d is not safe in" " Concurrent mode", __func__, @@ -446,8 +446,8 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) unsafe_channel_list[i]) { /* Found unsafe channel, update it */ safe_channels[j].isSafe = false; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("CH %d is not safe"), unsafe_channel_list[i]); break; @@ -460,7 +460,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) #else void sap_update_unsafe_channel_list(ptSapContext pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Not implemented", __func__); return; } @@ -490,18 +490,18 @@ void sap_cleanup_channel_list(void *p_cds_gctx) { ptSapContext pSapCtx; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "Cleaning up the channel list structure"); if (NULL == p_cds_gctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "SAP Global Context is NULL"); return; } pSapCtx = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "SAP Context is NULL"); return; } @@ -552,8 +552,8 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl, /* Select the best channel from allowed list */ for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) { if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "Best channel is: %d", best_chnl); return best_chnl; @@ -599,7 +599,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, uint32_t dfs_master_cap_enabled; bool include_dfs_ch = true; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); pSpectInfoParams->numSpectChans = @@ -611,7 +611,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, * sizeof(*pSpectCh)); if (pSpectCh == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s, CDF_MALLOC_ERR", __func__); return eSAP_FALSE; } @@ -642,7 +642,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* check if the channel is in NOL blacklist */ if (sap_dfs_is_channel_in_nol_list(pSapCtx, *pChans, PHY_SINGLE_CHANNEL_CENTERED)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is in NOL list", __func__, *pChans); chSafe = false; @@ -652,8 +652,8 @@ bool sap_chan_sel_init(tHalHandle halHandle, if (include_dfs_ch == false) { if (CDS_IS_DFS_CH(*pChans)) { chSafe = false; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "In %s, DFS Ch %d not considered for ACS", __func__, *pChans); continue; @@ -664,8 +664,8 @@ bool sap_chan_sel_init(tHalHandle halHandle, for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { if ((safe_channels[i].channelNumber == *pChans) && (false == safe_channels[i].isSafe)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Ch %d is not safe", __func__, *pChans); chSafe = false; @@ -735,7 +735,7 @@ uint32_t sapweight_rssi_count(int8_t rssi, uint16_t count) rssicountWeight = rssiWeight + countWeight; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d", __func__, rssiWeight, countWeight, rssicountWeight); @@ -837,7 +837,7 @@ void sap_upd_chan_spec_params(tSirProbeRespBeacon *pBeaconStruct, uint16_t *centerFreq_2) { if (NULL == pBeaconStruct) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("pBeaconStruct is NULL")); return; } @@ -924,7 +924,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, uint16_t num_ch; int32_t offset = 0; if (NULL == spect_ch) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("spect_ch is NULL")); return; } @@ -1006,7 +1006,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch, void sap_interference_rssi_count(tSapSpectChInfo *spect_ch) { if (NULL == spect_ch) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: spect_ch is NULL", __func__); return; } @@ -1170,11 +1170,11 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == pBeaconStruct) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "Unable to allocate memory in sap_compute_spect_weight\n"); return; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Computing spectral weight", __func__); /** @@ -1262,8 +1262,8 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, break; } - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d \n", __func__, pScanResult->BssDescriptor. @@ -1286,7 +1286,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, /* Calculate the weights for all channels in the spectrum pSpectCh */ pSpectCh = pSpectInfoParams->pSpectCh; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Spectrum Channels Weight", __func__); for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans); @@ -1308,7 +1308,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, pSpectCh->weight_copy = pSpectCh->weight; /* ------ Debug Info ------ */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1480,7 +1480,7 @@ void sap_sort_chl_weight_ht80(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1617,7 +1617,7 @@ void sap_sort_chl_weight_vht160(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Weight= %d rssi=%d bssCount=%d"), pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1794,7 +1794,7 @@ void sap_sort_chl_weight_ht40_5_g(tSapChSelSpectInfo *pSpectInfoParams) pSpectInfo = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectInfo->chNum, pSpectInfo->weight, pSpectInfo->rssiAgr, pSpectInfo->bssCount); @@ -1885,11 +1885,11 @@ void sap_sort_chl_weight_all(ptSapContext pSapCtx, #endif /* For testing */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Sorted Spectrum Channels Weight", __func__); pSpectCh = pSpectInfoParams->pSpectCh; for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d", __func__, pSpectCh->chNum, pSpectCh->weight, pSpectCh->rssiAgr, pSpectCh->bssCount); @@ -1969,7 +1969,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, uint32_t tmpChNum; uint8_t count; #endif - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __func__); #ifdef FEATURE_WLAN_CH_AVOID @@ -1977,7 +1977,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, #endif if (NULL == pScanResult) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: No external AP present\n", __func__); #ifndef SOFTAP_CHANNEL_RANGE @@ -1987,7 +1987,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, endChannelNum = pSapCtx->acs_cfg->end_ch; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: start - end: %d - %d\n", __func__, startChannelNum, endChannelNum); @@ -2025,8 +2025,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; if (safe_channels[i].isSafe == true) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is safe\n", __func__, safe_channels[i]. @@ -2036,8 +2036,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, break; } - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: channel %d in the configuration is unsafe\n", __func__, safe_channels[i].channelNumber); @@ -2052,7 +2052,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Initialize the structure pointed by pSpectInfoParams */ if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s, Ch Select initialization failed", __func__); return SAP_CHANNEL_NOT_SELECTED; } @@ -2171,8 +2171,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, continue; #endif bestChNum = pSpectInfoParams->pSpectCh[count].chNum; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "change best channel to %d in PCL", bestChNum); break; @@ -2218,7 +2218,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, /* Free all the allocated memory */ sap_chan_sel_exit(pSpectInfoParams); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch select Completed, Ch=%d", __func__, bestChNum); if (bestChNum > 0 && bestChNum <= 252) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 20bcc6ad14af..f2ce213ccb93 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -976,7 +976,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, /* not present in NOL */ continue; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing NOL channel: %d"), dfs_nol_channel); if (false == sap_find_target_channel_in_channel_matrix( @@ -986,9 +986,9 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * should never happen, we should always find a table * here, if we don't, need a fix here! */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Couldn't find target channel matrix!")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* @@ -1016,8 +1016,8 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, * bad leakage in NOL channel, * remove from temp list */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: channel: %d will have bad leakage due to channel: %d\n"), dfs_nol_channel, temp_ch_lst[j]); temp_ch_lst[j] = 0; @@ -1051,7 +1051,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel) return; } } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Channel=%d is not in the bitmap"), channel); } @@ -1106,7 +1106,7 @@ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, } break; default: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid case.")); break; } @@ -1136,7 +1136,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID) pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return false; } @@ -1174,14 +1174,14 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return true; } if ((SAP_CHAN_PREFERRED_INDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_OUTDOOR(channelID))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Outdoor so invalid,preferred Indoor only"), channelID); @@ -1189,7 +1189,7 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID } else if ((SAP_CHAN_PREFERRED_OUTDOOR == pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) && (true == IS_CHAN_JAPAN_INDOOR(channelID))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is Indoor so invalid,preferred Outdoor only"), channelID); @@ -1251,14 +1251,14 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) uint8_t dfs_region; if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return target_channel; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return target_channel; } @@ -1277,7 +1277,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } if (sap_get5_g_hz_channel_list(sapContext)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("Getting 5Ghz channel list failed")); return target_channel; } @@ -1315,8 +1315,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Check for JAPAN W53 Channel operation capability */ if (true == sap_dfs_is_w53_invalid(hHal, channelID)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL ("index:%d, Channel=%d Invalid,Japan W53 Disabled"), i, channelID); @@ -1336,8 +1336,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (false == sap_dfs_is_channel_in_preferred_location(hHal, channelID)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL ("CHAN=%d is invalid,preferred Channel Location %d Only"), channelID, @@ -1361,8 +1361,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * Mark this channel invalid since it is still * in DFS Non-Occupancy-Period which is 30 mins. */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d Present in NOL LIST"), i, channelID); @@ -1378,8 +1378,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) if (pMac->sap.sap_channel_avoidance && sapContext->sap_detected_avoid_ch_ie.present) { if (sap_check_in_avoid_ch_list(sapContext, channelID)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."), i, channelID); sapContext->SapAllChnlList.channelList[i]. @@ -1395,7 +1395,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * mark this channel invalid since it is out of ACS * channel range */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL ("index: %d, Channel = %d out of ACS channel range"), i, channelID); @@ -1408,7 +1408,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* valid_chnl_count now have number of valid channels */ tmp_ch_lst = cdf_mem_malloc(valid_chnl_count); if (tmp_ch_lst == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sapdfs: memory alloc failed")); return target_channel; } @@ -1422,8 +1422,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* prepare temp list of just the valid channels */ for (i = 0; i < sapContext->SapAllChnlList.numChannel; i++) { if (sapContext->SapAllChnlList.channelList[i].valid) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Adding Channel = %d to temp List"), sapContext->SapAllChnlList. @@ -1434,8 +1434,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL ("sapdfs: Processing temp channel list against NOL.") ); @@ -1458,8 +1458,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) channelBitmap.chanBondingSet[3].startChannel = 132; channelBitmap.chanBondingSet[4].startChannel = 149; /* now loop through whatever is left of channel list */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("sapdfs: Moving temp channel list to final.")); for (i = 0; i < valid_chnl_count; i++) { /* @@ -1467,8 +1467,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list (in case of 20MHz width) */ if (tmp_ch_lst[i] != 0) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_DEBUG, FL("sapdfs: processing channel: %d "), tmp_ch_lst[i]); /* @@ -1476,16 +1476,16 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list */ if (ch_width == CH_WIDTH_20MHZ) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_DEBUG, FL ("sapdfs: Channel=%d added to available list"), tmp_ch_lst[i]); availableChannels[available_ch_cnt++] = tmp_ch_lst[i]; } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_DEBUG, FL("sapdfs: Channel=%d added to bitmap"), tmp_ch_lst[i]); sap_set_bitmap(&channelBitmap, @@ -1509,12 +1509,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) */ if (available_ch_cnt == 0) { if (ch_width == CH_WIDTH_80MHZ) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 80MHz cb found, falling to 40MHz")); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), ch_width, @@ -1523,12 +1523,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) /* continue to start of do loop */ continue; } else if (ch_width == CH_WIDTH_40MHZ) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, FL ("sapdfs:No 40MHz cb found, falling to 20MHz")); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, FL ("sapdfs:Changing chanWidth from [%d] to [%d]"), ch_width, @@ -1557,8 +1557,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("No target channel found")); } @@ -1580,12 +1580,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } pMac->sap.SapDfsInfo.new_chanWidth = ch_width; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: New Channel width = %d"), pMac->sap.SapDfsInfo.new_chanWidth); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: target_channel = %d"), target_channel); break; @@ -1639,13 +1639,13 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, if (NULL == channels) return; if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid hHal")); return; } pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid pMac")); return; } @@ -1670,8 +1670,8 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, */ if (psapDfsChannelNolList[j].radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d already in NOL"), channels[i]); continue; @@ -1685,8 +1685,8 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels, psapDfsChannelNolList[j].radar_status_flag = eSAP_DFS_CHANNEL_UNAVAILABLE; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, FL("Channel=%d Added to NOL LIST"), channels[i]); } @@ -1716,7 +1716,7 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel, } else return 0; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("cbmode: %d, channel: %d"), chanBondState, channel); switch (chanBondState) { @@ -1797,7 +1797,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * SAP operation since it is past * Non-Occupancy-Period so, return false. */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL,CHAN AVAILABLE"), nol->dfs_channel_number); return true; @@ -1830,7 +1830,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) nol->radar_status_flag = eSAP_DFS_CHANNEL_AVAILABLE; nol->radar_found_timestamp = 0; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d not in NOL, Channel AVAILABLE"), nol->dfs_channel_number); return true; @@ -1841,13 +1841,13 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol) * Channel is still in * Non-occupancy-Period. */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("Chan=%d in NOL, Channel UNAVAILBLE"), nol->dfs_channel_number); return false; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid Radar Status Flag")); } return true; @@ -1879,7 +1879,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, bool channel_available; if (NULL == h_hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("invalid h_hal")); return false; } else { @@ -1890,7 +1890,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if ((dfs_info->numCurrentRegDomainDfsChannels == 0) || (dfs_info->numCurrentRegDomainDfsChannels > NUM_5GHZ_CHANNELS)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("invalid dfs channel count %d"), dfs_info->numCurrentRegDomainDfsChannels); return false; @@ -1927,7 +1927,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context, if (j < num_channels && i < dfs_info->numCurrentRegDomainDfsChannels) { if (num_channels > MAX_BONDED_CHANNELS) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("num_channel>MAX_BONDED_CHANNEL, reset")); num_channels = MAX_BONDED_CHANNELS; } @@ -1977,7 +1977,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, h_hal = cds_get_context(QDF_MODULE_ID_SME); if (NULL == h_hal) { /* we have a serious problem */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, FL("invalid h_hal")); return QDF_STATUS_E_FAULT; } @@ -1990,7 +1990,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->dfs_ch_disable = true; } else if (con_ch && sap_context->channel != con_ch && CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("MCC DFS not supported in AP_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2003,8 +2003,8 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); sap_context->channel = con_ch; @@ -2018,7 +2018,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->channel == AUTO_CHANNEL_SELECT) sap_context->dfs_ch_disable = true; else if (CDS_IS_DFS_CH(sap_context->channel)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("DFS not supported in STA_AP Mode")); return QDF_STATUS_E_ABORTED; } @@ -2031,8 +2031,8 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context->csr_roamProfile.phyMode, sap_context->cc_switch_mode); if (con_ch && !CDS_IS_DFS_CH(con_ch)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "%s: Override ch %d to %d due to CC Intf", __func__, sap_context->channel, con_ch); sap_context->channel = con_ch; @@ -2043,7 +2043,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->channel == AUTO_CHANNEL_SELECT) { #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("%s skip_acs_status = %d "), __func__, sap_context->acs_cfg->skip_scan_status); if (sap_context->acs_cfg->skip_scan_status != @@ -2095,7 +2095,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif /* Set requestType to Full scan */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("calling sme_scan_request")); #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE if (sap_context->acs_cfg->skip_scan_status == @@ -2128,10 +2128,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, sap_context); } if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), cdf_ret_status); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Configuring default channel, Ch=%d"), sap_context->channel); /* In case of error, switch to default channel */ @@ -2160,7 +2160,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, qdf_status = sap_fsm(sap_context, sap_event); } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("return sme_ScanReq, scanID=%d, Ch=%d"), scan_request.scan_id, sap_context->channel); } @@ -2171,18 +2171,18 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, } if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("## %s SKIPPED ACS SCAN"), __func__); wlansap_scan_callback(h_hal, sap_context, sap_context->sessionId, 0, eCSR_SCAN_SUCCESS); } #endif } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("for configured channel, Ch= %d"), sap_context->channel); if (sap_do_acs_pre_start_bss == true) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("ACS end due to Ch override. Sel Ch = %d"), sap_context->channel); sap_context->acs_cfg->pri_ch = sap_context->channel; @@ -2209,7 +2209,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * Have to wait for the call back to be called to get the * channel cannot advance state machine here as said above */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("before exiting sap_goto_channel_sel channel=%d"), sap_context->channel); @@ -2251,7 +2251,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) status = cds_get_vdev_types(QDF_SAP_MODE, &type, &subType); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "failed to get vdev type"); return QDF_STATUS_E_FAILURE; } @@ -2263,7 +2263,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) &sapContext->sessionId, type, subType); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", __func__, cdf_ret_status); @@ -2317,12 +2317,12 @@ sap_goto_starting sapContext->key_length = 32; cdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s", + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2330,7 +2330,7 @@ sap_goto_starting cdf_ret_status = sap_open_session(hHal, sapContext); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2369,7 +2369,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { /* we have a serious problem */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s, invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -2377,7 +2377,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) sap_free_roam_profile(&sapContext->csr_roamProfile); cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", __func__, cdf_ret_status); return QDF_STATUS_E_FAILURE; @@ -2463,22 +2463,22 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, /* Format the Start BSS Complete event to return... */ if (NULL == sap_ctx->pfnSapEventCallback) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (NULL == hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP event callback event = %s"), sap_hdd_event_to_string(sap_hddevent)); @@ -2517,7 +2517,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, else bss_complete->staId = 0; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("(eSAP_START_BSS_EVENT): staId = %d"), bss_complete->staId); @@ -2750,7 +2750,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, (&mac_ctx->sap.SapDfsInfo.sapDfsChannelNolList[0]); break; case eSAP_ECSA_CHANGE_CHAN_IND: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, SAP event callback event = %s", __func__, "eSAP_ECSA_CHANGE_CHAN_IND"); sap_ap_event.sapHddEventCode = eSAP_ECSA_CHANGE_CHAN_IND; @@ -2758,7 +2758,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, csr_roaminfo->target_channel; break; default: - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("SAP Unknown callback event = %d"), sap_hddevent); break; @@ -2849,7 +2849,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal, if (NULL == sap_find_valid_concurrent_session(hHal)) { /* If timer is running then stop the timer and destory it */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: no session are valid, so clearing dfs global structure"); /* * CAC timer will be initiated and started only when SAP starts @@ -2930,7 +2930,7 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona)) && pMac->sap.sapCtxList[intf].pSapContext != NULL && (false == pSapContext->isCacStartNotified)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]", pSapContext); @@ -2939,8 +2939,8 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacStartNotified on interface[%d]", __func__, intf); return qdf_status; @@ -2990,15 +2990,15 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); return qdf_status; } pSapContext->isCacEndNotified = true; pMac->sap.SapDfsInfo.sap_radar_found_status = false; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Start beacon request on sapctx[%p]", pSapContext); @@ -3008,7 +3008,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: channel[%d] from state %s => %s", pSapContext->channel, "eSAP_STARTING", "eSAP_STARTED"); @@ -3021,8 +3021,8 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) (void *) eSAP_STATUS_SUCCESS); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "In %s, failed setting isCacEndNotified on interface[%d]", __func__, intf); return qdf_status; @@ -3031,7 +3031,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo) /* Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, from state %s => %s", __func__, "eSAP_DFS_CAC_WAIT", "eSAP_STARTED"); @@ -3072,13 +3072,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("new from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); /* There can be one SAP Session for softap */ if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, FL("SME Session is already opened")); return QDF_STATUS_E_EXISTS; } @@ -3095,8 +3095,8 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, sap_ctx, sap_ctx->self_mac_addr, &sap_ctx->sessionId, type, subtype); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("Error: calling sme_open_session")); } else { sap_ctx->isScanSessionOpen = eSAP_TRUE; @@ -3119,7 +3119,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); } else if (msg == eSAP_DFS_CHANNEL_CAC_START) { @@ -3129,10 +3129,10 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ sap_ctx->sapsMachine = eSAP_DFS_CAC_WAIT; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("from state eSAP_DISCONNECTED => SAP_DFS_CAC_WAIT")); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: starting dfs cac timer on sapctx[%p]"), sap_ctx); sap_start_dfs_cac_timer(sap_ctx); @@ -3149,7 +3149,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, */ qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, event msg %d"), "eSAP_DISCONNECTED", msg); } @@ -3186,7 +3186,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, qdf_status = sme_close_session(hal, sap_ctx->sessionId, NULL, NULL); if (QDF_STATUS_SUCCESS != qdf_status) - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("CloseSession error event msg %d"), msg); else sap_ctx->isScanSessionOpen = eSAP_FALSE; @@ -3227,8 +3227,8 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, ch = sap_random_channel_sel(sap_ctx); if (ch == 0) { /* No available channel found */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("No available channel found!!!")); sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_NO_AVAILABLE_CHANNEL, @@ -3236,7 +3236,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, return QDF_STATUS_E_FAULT; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("channel %d is in NOL, StartBss on new channel %d"), sap_ctx->channel, ch); @@ -3269,7 +3269,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, * Transition from eSAP_CH_SELECT to eSAP_STARTING * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_STARTING"); /* Channel selected. Now can sap_goto_starting */ @@ -3289,7 +3289,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, sap_ctx->ch_params.center_freq_seg1; sap_ctx->csr_roamProfile.ch_params.sec_ch_offset = sap_ctx->ch_params.sec_ch_offset; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("notify hostapd about channel selection: %d"), sap_ctx->channel); sap_signal_hdd_event(sap_ctx, NULL, @@ -3299,16 +3299,16 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, eCSR_BSS_TYPE_INFRA_AP); } else if (msg == eSAP_CHANNEL_SELECTION_FAILED) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Cannot start BSS, ACS Fail")); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { sap_ctx->sapsMachine = eSAP_DISCONNECTED; sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_FAILURE); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: BSS stopped when Ch select in Progress", __func__); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_CH_SELECT", msg); } @@ -3336,7 +3336,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; if (msg == eSAP_DFS_CHANNEL_CAC_START) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT"); if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) @@ -3349,7 +3349,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * check, need to switch the channel again */ eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n"); if (mac_ctx->sap.SapDfsInfo.target_channel) { sme_set_ch_params(hal, phymode, @@ -3389,7 +3389,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, qdf_status = sap_cac_end_notify(hal, roam_info); } else if (msg == eSAP_HDD_STOP_INFRA_BSS) { /* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DFS_CAC_WAIT", "eSAP_DISCONNECTING"); @@ -3400,8 +3400,8 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, * all APs are down. */ if (NULL == sap_find_valid_concurrent_session(hal)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: no sessions are valid, stopping timer")); sap_stop_dfs_cac_timer(sap_ctx); } @@ -3409,7 +3409,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_DISCONNECTING; qdf_status = sap_goto_disconnecting(sap_ctx); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DFS_CAC_WAIT", msg); } @@ -3442,7 +3442,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_STARTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state channel = %d %s => %s"), sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED"); sap_ctx->sapsMachine = eSAP_STARTED; @@ -3486,7 +3486,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from STARTING to DISCONNECTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3502,7 +3502,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * Transition from eSAP_STARTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_DISCONNECTED"); @@ -3526,7 +3526,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, sap_ctx->sapsMachine = eSAP_STARTED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTING", "eSAP_STARTED"); @@ -3535,7 +3535,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, eSAP_START_BSS_EVENT, (void *)eSAP_STATUS_SUCCESS); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTING", msg); } @@ -3564,7 +3564,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, * Transition from eSAP_STARTED to eSAP_DISCONNECTING * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_STARTED", "eSAP_DISCONNECTING"); sap_ctx->sapsMachine = eSAP_DISCONNECTING; @@ -3585,8 +3585,8 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) { temp_sap_ctx = mac_ctx->sap.sapCtxList[intf].pSapContext; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Sending CSAIE for sapctx[%p]"), temp_sap_ctx); @@ -3595,7 +3595,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, } } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_STARTED", msg); } @@ -3625,7 +3625,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, * Transition from eSAP_DISCONNECTING to eSAP_DISCONNECTED * (both without substates) */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("from state %s => %s"), "eSAP_DISCONNECTING", "eSAP_DISCONNECTED"); sap_ctx->sapsMachine = eSAP_DISCONNECTED; @@ -3642,7 +3642,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, } } } else if (msg == eWNI_SME_CHANNEL_CHANGE_REQ) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, FL("sapdfs: Send channel change request on sapctx[%p]"), sap_ctx); /* @@ -3652,10 +3652,10 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx, qdf_status = wlansap_channel_change_request((void *) sap_ctx, mac_ctx->sap.SapDfsInfo.target_channel); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("Sending DFS eWNI_SME_CHANNEL_CHANGE_REQ")); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), "eSAP_DISCONNECTING", msg); } @@ -3686,19 +3686,19 @@ QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event) tpAniSirGlobal mac_ctx; if (NULL == hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); return QDF_STATUS_E_FAILURE; } mac_ctx = PMAC_STRUCT(hal); if (NULL == mac_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid MAC context")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL("sap_ctx=%p, state_var=%d, msg=0x%x"), sap_ctx, state_var, msg); @@ -3807,7 +3807,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->pRSNReqIE = cdf_mem_malloc(pconfig_params->RSNWPAReqIELength); if (NULL == profile->pRSNReqIE) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__); return eSAP_STATUS_FAILURE; } @@ -3903,7 +3903,7 @@ void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size) int32_t nRes = -1; if ((NULL == macList) || (size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more"), size); return; } @@ -3938,7 +3938,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, nEnd = num_mac - 1; if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is more."), num_mac); return eSAP_FALSE; } @@ -3950,14 +3950,14 @@ sap_search_mac_list(struct qdf_mac_addr *macList, QDF_MAC_ADDR_SIZE); if (0 == nRes) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "search SUCC"); /* "index equals NULL" means the caller does not need the */ /* index value of the peerMac being searched */ if (index != NULL) { *index = (uint8_t) nMiddle; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, "index %d", + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, "index %d", *index); } return eSAP_TRUE; @@ -3968,7 +3968,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, nEnd = nMiddle - 1; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "search not succ"); return eSAP_FALSE; } @@ -3979,11 +3979,11 @@ void sap_add_mac_to_acl(struct qdf_mac_addr *macList, int32_t nRes = -1; int i; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "add acl entered"); if (NULL == macList || *size == 0 || *size > MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size = %d is incorrect."), *size); return; @@ -4012,7 +4012,7 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, { int i; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "remove acl entered"); /* * Return if the list passed is empty. Ideally this should never happen @@ -4022,7 +4022,7 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, */ if ((macList == NULL) || (*size == 0) || (*size > MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("either buffer is NULL or size %d is incorrect."), *size); return; @@ -4043,11 +4043,11 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) { int i; uint8_t *macArray; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "print acl entered"); if ((NULL == macList) || (size == 0) || (size >= MAX_ACL_MAC_ADDRESS)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, either buffer is NULL or size %d is incorrect.", __func__, size); return; @@ -4055,7 +4055,7 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size) for (i = 0; i < size; i++) { macArray = (macList + i)->bytes; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "** ACL entry %i - " MAC_ADDRESS_STR, i, MAC_ADDR_ARRAY(macArray)); } @@ -4073,7 +4073,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (sap_search_mac_list (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " in deny list", __func__, MAC_ADDR_ARRAY(peerMac)); return QDF_STATUS_E_FAILURE; @@ -4084,7 +4084,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) /* A new station CANNOT associate, unless in accept list. More stringent mode */ if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4097,7 +4097,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac) if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode) { sap_signal_hdd_event(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN, (void *) peerMac); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Peer " MAC_ADDRESS_STR " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY", __func__, MAC_ADDR_ARRAY(peerMac)); @@ -4134,7 +4134,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); if (NULL == hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid HAL pointer from p_cds_gctx")); *num_ch = 0; *ch_list = NULL; @@ -4143,7 +4143,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, start_ch_num = sap_ctx->acs_cfg->start_ch; end_ch_num = sap_ctx->acs_cfg->end_ch; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("startChannel %d, EndChannel %d, HW:%d"), start_ch_num, end_ch_num, sap_ctx->acs_cfg->hw_mode); @@ -4151,11 +4151,11 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, wlansap_extend_to_acs_range(&start_ch_num, &end_ch_num, &band_start_ch, &band_end_ch); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("expanded startChannel %d,EndChannel %d"), start_ch_num, end_ch_num); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("band_start_ch %d, band_end_ch %d"), band_start_ch, band_end_ch); @@ -4172,7 +4172,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list = (uint8_t *) cdf_mem_malloc(NUM_5GHZ_CHANNELS + NUM_24GHZ_CHANNELS); if (NULL == list) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Unable to allocate channel list")); *num_ch = 0; *ch_list = NULL; @@ -4218,13 +4218,13 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_HIGH, FL("%d %d skipped from ACS ch range"), ch_count, ch); } @@ -4232,8 +4232,8 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, list[ch_count] = CDS_CHANNEL_NUM(loop_count); ch_count++; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, FL("%d %d added to ACS ch range"), ch_count, ch); } @@ -4249,14 +4249,14 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, #endif } if (0 == ch_count) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("No active channels present for the current region")); /* * LTE COEX: channel range outside the restricted 2.4GHz * band limits */ if (en_lte_coex && (start_ch_num > band_end_ch)) - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, FL("SAP can't be started as due to LTE COEX")); } @@ -4270,7 +4270,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, } for (loop_count = 0; loop_count < ch_count; loop_count++) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, FL("channel number: %d"), list[loop_count]); } return QDF_STATUS_SUCCESS; @@ -4286,7 +4286,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) uint8_t count = 0; int i; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); return QDF_STATUS_E_FAULT; } @@ -4300,7 +4300,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) (tChannelInfo *) cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN * sizeof(tChannelInfo)); if (NULL == sapContext->SapAllChnlList.channelList) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, " Memory Allocation failed sap_get_channel_list"); return QDF_STATUS_E_NOMEM; } @@ -4310,7 +4310,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { sapContext->SapAllChnlList.channelList[count].channel = CDS_CHANNEL_NUM(i); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "%s[%d] CHANNEL = %d", __func__, __LINE__, sapContext->SapAllChnlList.channelList[count]. channel); @@ -4321,7 +4321,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) } sapContext->SapAllChnlList.numChannel = count; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF CHANNELS count = %d" "sapContext->SapAllChnlList.numChannel = %d", __func__, __LINE__, count, @@ -4350,7 +4350,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4378,7 +4378,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, sap_get5_g_hz_channel_list(sapContext); if (dfs_event->chan_list.nchannels > SIR_DFS_MAX_20M_SUB_CH) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("nchannels >SIR_DFS_MAX_20M_SUB_CH so resetting")); dfs_event->chan_list.nchannels = SIR_DFS_MAX_20M_SUB_CH; } @@ -4402,7 +4402,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, eSAP_DFS_NO_AVAILABLE_CHANNEL, (void *) eSAP_STATUS_SUCCESS); } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("sapdfs: New selected target channel is [%d]"), target_channel); return target_channel; @@ -4420,7 +4420,7 @@ void sap_dfs_cac_timer_callback(void *data) tpAniSirGlobal pMac; if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return; } @@ -4428,7 +4428,7 @@ void sap_dfs_cac_timer_callback(void *data) sapContext = sap_find_valid_concurrent_session(hHal); if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s no SAP contexts are found", __func__); return; } @@ -4441,7 +4441,7 @@ void sap_dfs_cac_timer_callback(void *data) /* * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%p]", sapContext->channel, sapContext); @@ -4467,7 +4467,7 @@ static int sap_stop_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4523,7 +4523,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return 0; } @@ -4545,7 +4545,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) (sap_is_channel_bonding_etsi_weather_channel(sapContext)))) { cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec", sapContext->channel, cacTimeOut / 1000); @@ -4579,14 +4579,14 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) tpAniSirGlobal pMac; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_init_dfs_channel_nol_list"); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s invalid hHal", __func__); return QDF_STATUS_E_FAULT; } @@ -4608,8 +4608,8 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) .dfs_channel_number = CDS_CHANNEL_NUM(i); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, "%s: CHANNEL = %d", __func__, pMac->sap.SapDfsInfo. sapDfsChannelNolList[count]. @@ -4627,7 +4627,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels = count; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "%s[%d] NUMBER OF DFS CHANNELS = %d", __func__, __LINE__, pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels); @@ -4676,14 +4676,14 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal, (ptSapContext) pMac->sap.sapCtxList[intf]. pSapContext; if (pSapContext == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("sapCtx matched [%p]"), sapContext); continue; } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL ("concurrent sapCtx[%p] didn't matche with [%p]"), pSapContext, sapContext); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index a84d010820ed..e14f19edcf75 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -42,7 +42,7 @@ /*---------------------------------------------------------------------------- * Include Files * -------------------------------------------------------------------------*/ -#include "cdf_trace.h" +#include "qdf_trace.h" #include "qdf_util.h" /* Pick up the sme callback registration API */ #include "sme_api.h" @@ -109,13 +109,13 @@ void *wlansap_open(void *p_cds_gctx) pSapCtx = (ptSapContext) cdf_mem_malloc(sizeof(tSapContext)); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return NULL; } /* Clean up SAP control block, initialize all values */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open"); wlansap_clean_cb(pSapCtx, 0); /*do not empty */ @@ -149,7 +149,7 @@ QDF_STATUS wlansap_start(void *pCtx) /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start invoked successfully"); /*------------------------------------------------------------------------ Sanity check @@ -158,7 +158,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -186,7 +186,7 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "wlansap_start failed init lock"); return QDF_STATUS_E_FAULT; } @@ -214,12 +214,12 @@ QDF_STATUS wlansap_stop(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_stop invoked successfully "); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -227,7 +227,7 @@ QDF_STATUS wlansap_stop(void *pCtx) sap_free_roam_profile(&pSapCtx->csr_roamProfile); if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(&pSapCtx->SapGlobalLock))) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "wlansap_stop failed destroy lock"); return QDF_STATUS_E_FAULT; } @@ -254,18 +254,18 @@ QDF_STATUS wlansap_close(void *pCtx) ptSapContext pSapCtx = NULL; /* Sanity check - Extract SAP control block */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close invoked"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } /* Cleanup SAP control block */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_close"); /* empty queues/lists/pkts if any */ @@ -300,7 +300,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -308,7 +308,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / /*------------------------------------------------------------------------ Clean up SAP control block, initialize all values ------------------------------------------------------------------------*/ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_clean_cb"); cdf_mem_zero(pSapCtx, sizeof(tSapContext)); @@ -317,7 +317,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->sapsMachine = eSAP_DISCONNECTED; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Initializing State: %d, sapContext value = %p", __func__, pSapCtx->sapsMachine, pSapCtx); pSapCtx->sessionId = 0; @@ -352,7 +352,7 @@ wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status) if (QDF_IS_STATUS_SUCCESS(status)) { /* If success what else to be handled??? */ } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "wlansap_pmc_full_pwr_req_cb: PMC failed to put the chip in Full power"); } @@ -376,7 +376,7 @@ uint8_t wlansap_get_state(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -407,7 +407,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx) hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from p_cds_gctx", __func__); return 0; } @@ -438,13 +438,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, tHalHandle h_hal = NULL; if (NULL == pconfig) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } if (NULL == psap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid pconfig passed ", __func__); return QDF_STATUS_E_FAULT; } @@ -475,7 +475,7 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, h_hal = (tHalHandle)CDS_GET_HAL_CB(psap_ctx->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from pvosGCtx", __func__); } else { /* @@ -507,7 +507,7 @@ uint32_t wlan_sap_get_vht_ch_width(void *ctx) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return 0; } @@ -529,7 +529,7 @@ void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width) ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (!sap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from ctx")); return; } @@ -601,11 +601,11 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ ------------------------------------------------------------------------*/ pSapCtx = CDS_GET_SAP_CB(pCtx); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_start_bss: sapContext=%p", pSapCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -645,7 +645,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ &pSapCtx->csr_roamProfile); hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -664,7 +664,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ pmac = PMAC_STRUCT(hHal); if (NULL == pmac) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid MAC context from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -719,12 +719,12 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_set_mac_acl"); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -776,7 +776,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid Global CDS handle", __func__); return QDF_STATUS_E_FAULT; } @@ -784,7 +784,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -827,7 +827,7 @@ wlansap_get_assoc_stations Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -867,7 +867,7 @@ wlansap_remove_wps_session_overlap(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -902,7 +902,7 @@ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -921,7 +921,7 @@ QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -936,7 +936,7 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode) ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -952,7 +952,7 @@ wlansap_get_acl_accept_list(void *pCtx, struct qdf_mac_addr *pAcceptList, { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -970,7 +970,7 @@ wlansap_get_acl_deny_list(void *pCtx, struct qdf_mac_addr *pDenyList, { ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1038,19 +1038,19 @@ wlansap_modify_acl ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP Context", __func__); return QDF_STATUS_E_FAULT; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "Modify ACL entered\n" "Before modification of ACL\n" "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); @@ -1064,7 +1064,7 @@ wlansap_modify_acl peer_sta_mac, &staBLIndex); if (sta_white_list && sta_black_list) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Peer mac " MAC_ADDRESS_STR " found in white and black lists." "Initial lists passed incorrect. Cannot execute this command.", @@ -1072,7 +1072,7 @@ wlansap_modify_acl return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "cmd %d", cmd); switch (list_type) { @@ -1081,8 +1081,8 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nAcceptMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "White list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); @@ -1090,8 +1090,8 @@ wlansap_modify_acl } if (sta_white_list) { /* Do nothing if already present in white list. Just print a warning */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "MAC address already present in white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); @@ -1099,22 +1099,22 @@ wlansap_modify_acl } if (sta_black_list) { /* remove it from black list before adding to the white list */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "STA present in black list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> denyMacList, &sap_ctx->nDenyMac, staBLIndex); } - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "... Now add to the white list"); sap_add_mac_to_acl(sap_ctx->acceptMacList, &sap_ctx->nAcceptMac, peer_sta_mac); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); @@ -1123,8 +1123,8 @@ wlansap_modify_acl struct tagCsrDelStaParams delStaParams; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "Delete from white list"); sap_remove_mac_from_acl(sap_ctx->acceptMacList, &sap_ctx->nAcceptMac, @@ -1135,21 +1135,21 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the white list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1162,8 +1162,8 @@ wlansap_modify_acl /* error check */ /* if list is already at max, return failure */ if (sap_ctx->nDenyMac == MAX_ACL_MAC_ADDRESS) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "Black list is already maxed out. Cannot accept " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); @@ -1171,8 +1171,8 @@ wlansap_modify_acl } if (sta_black_list) { /* Do nothing if already present in white list */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "MAC address already present in black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); @@ -1180,8 +1180,8 @@ wlansap_modify_acl } if (sta_white_list) { /* remove it from white list before adding to the black list */ - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "Present in white list so first remove from it"); sap_remove_mac_from_acl(sap_ctx-> acceptMacList, @@ -1195,39 +1195,39 @@ wlansap_modify_acl (SIR_MAC_MGMT_DEAUTH >> 4), &delStaParams); wlansap_deauth_sta(ctx, &delStaParams); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "... Now add to black list"); sap_add_mac_to_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, peer_sta_mac); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, "size of accept and deny lists %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else if (cmd == DELETE_STA_FROM_ACL) { if (sta_black_list) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "Delete from black list"); sap_remove_mac_from_acl(sap_ctx->denyMacList, &sap_ctx->nDenyMac, staBLIndex); - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, "no accept and deny mac %d %d", sap_ctx->nAcceptMac, sap_ctx->nDenyMac); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, "MAC address to be deleted is not present in the black list " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(peer_sta_mac)); return QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid cmd type passed"); return QDF_STATUS_E_FAILURE; } @@ -1235,17 +1235,17 @@ wlansap_modify_acl default: { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid list type passed %d", list_type); return QDF_STATUS_E_FAILURE; } } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "After modification of ACL"); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "*** WHITE LIST ***"); sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "*** BLACK LIST ***"); sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac); return QDF_STATUS_SUCCESS; @@ -1272,7 +1272,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1308,7 +1308,7 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx, Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return qdf_status; } @@ -1370,7 +1370,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, hal = CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (!hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hal pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1449,7 +1449,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sapContext = CDS_GET_SAP_CB(p_cds_gctx); if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1457,7 +1457,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -1480,7 +1480,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, valid = wlan_sap_validate_channel_switch(hHal, targetChannel, sapContext); if (!valid) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Channel switch to %u is not allowed due to concurrent channel interference"), targetChannel); return QDF_STATUS_E_FAULT; @@ -1520,8 +1520,8 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, * user input is used for the bandwidth */ if (target_bw != CH_WIDTH_MAX) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO, "%s: target bw:%d new width:%d", __func__, target_bw, pMac->sap.SapDfsInfo. @@ -1571,21 +1571,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sap_fsm(sapContext, &sapEvent); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Failed to request Channel Change, since" "SAP is not in eSAP_STARTED state", __func__); return QDF_STATUS_E_FAULT; } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Channel = %d is not valid in the current" "regulatory domain", __func__, targetChannel); return QDF_STATUS_E_FAULT; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: Posted eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START" "successfully to sap_fsm for Channel = %d", __func__, targetChannel); @@ -1624,7 +1624,7 @@ QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable) Extract SAP control block ------------------------------------------------------------------------*/ if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } @@ -1657,14 +1657,14 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1702,7 +1702,7 @@ wlan_sap_getstation_ie_information sap_ctx = CDS_GET_SAP_CB(ctx); if (NULL == sap_ctx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid SAP pointer from pCtx")); return QDF_STATUS_E_FAULT; } @@ -1710,13 +1710,13 @@ wlan_sap_getstation_ie_information if (len) { ie_len = *len; *len = sap_ctx->nStaWPARSnReqIeLength; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("WPAIE len : %x"), *len); if ((buf) && (ie_len >= sap_ctx->nStaWPARSnReqIeLength)) { cdf_mem_copy(buf, sap_ctx->pStaWpaRsnReqIE, sap_ctx->nStaWPARSnReqIeLength); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"), buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]); @@ -1743,12 +1743,12 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1756,7 +1756,7 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1803,12 +1803,12 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1816,7 +1816,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1852,12 +1852,12 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) ptSapContext pSapCtx = NULL; void *hHal = NULL; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s, %d", __func__, __LINE__); pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1865,7 +1865,7 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState) hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1931,7 +1931,7 @@ QDF_STATUS wlansap_set_wparsn_ies pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -1939,7 +1939,7 @@ QDF_STATUS wlansap_set_wparsn_ies hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -1983,14 +1983,14 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2004,7 +2004,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Failed to Send Action Frame"); return QDF_STATUS_E_FAULT; @@ -2037,14 +2037,14 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2058,7 +2058,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Failed to Set Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2084,7 +2084,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; @@ -2092,7 +2092,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2106,7 +2106,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Failed to Cancel Remain on Channel"); return QDF_STATUS_E_FAULT; @@ -2135,14 +2135,14 @@ QDF_STATUS wlansap_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2156,7 +2156,7 @@ QDF_STATUS wlansap_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Failed to Register MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2185,14 +2185,14 @@ QDF_STATUS wlansap_de_register_mgmt_frame pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pCtx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: HAL pointer (%p) NULL OR SME session is not open (%d)", __func__, hHal, pSapCtx->isSapSessionOpen); return QDF_STATUS_E_FAULT; @@ -2206,7 +2206,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Failed to Deregister MGMT frame"); return QDF_STATUS_E_FAULT; @@ -2251,14 +2251,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2328,14 +2328,14 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2385,14 +2385,14 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } @@ -2439,7 +2439,7 @@ QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2476,7 +2476,7 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2506,7 +2506,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2519,14 +2519,14 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) */ if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"), pMac->sap.SapDfsInfo.is_dfs_w53_disabled); status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL ("Regdomain not japan, set disable JP W53 not valid")); @@ -2553,8 +2553,8 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance) if (NULL != hal) mac_ctx = PMAC_STRUCT(hal); if (mac_ctx == NULL || hal == NULL) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, FL("hal or mac_ctx pointer NULL")); return QDF_STATUS_E_FAULT; } @@ -2590,7 +2590,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2605,8 +2605,8 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, if (DFS_MKK4_DOMAIN == dfs_region) { pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location = dfs_Preferred_Channels_location; - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, FL ("sapdfs:Set Preferred Operating Channel location=%d"), pMac->sap.SapDfsInfo. @@ -2614,7 +2614,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, status = QDF_STATUS_SUCCESS; } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location")); @@ -2653,7 +2653,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel) if (NULL != hHal) { pMac = PMAC_STRUCT(hHal); } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid hHal pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2688,8 +2688,8 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, bufferLength = additionIELength; pBuffer = cdf_mem_malloc(bufferLength); if (NULL == pBuffer) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); return QDF_STATUS_E_NOMEM; } @@ -2707,7 +2707,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); pConfig->probeRespBcnIEsLen = 0; pConfig->pProbeRespBcnIEsBuffer = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("No Probe Resp beacone IE received in set beacon")); } @@ -2720,7 +2720,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pProbeRespIEsBuffer); pConfig->probeRespIEsBufferLen = 0; pConfig->pProbeRespIEsBuffer = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("No Probe Response IE received in set beacon")); } @@ -2733,13 +2733,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, cdf_mem_free(pConfig->pAssocRespIEsBuffer); pConfig->assocRespIEsLen = 0; pConfig->pAssocRespIEsBuffer = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("No Assoc Response IE received in set beacon")); } break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("No matching buffer type %d"), updateType); if (pBuffer != NULL) cdf_mem_free(pBuffer); @@ -2753,7 +2753,7 @@ QDF_STATUS wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType) { if (NULL == pConfig) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid Config pointer", __func__); return QDF_STATUS_E_FAULT; } @@ -2783,7 +2783,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp default: if (eUPDATE_IE_ALL != updateType) - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid buffer type %d"), updateType); break; } @@ -2893,20 +2893,20 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) bool bAvailable = false; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } @@ -2914,7 +2914,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList; if (!dfs_nol) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: DFS NOL context is null", __func__); return QDF_STATUS_E_FAULT; } @@ -2944,7 +2944,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) eSAP_DFS_CHANNEL_AVAILABLE; dfs_nol[i].radar_found_timestamp = 0; - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is AVAILABLE", __func__, dfs_nol[i].dfs_channel_number); } else { @@ -2953,7 +2953,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx) left_time = SAP_DFS_NON_OCCUPANCY_PERIOD - elapsed_time; left_time = left_time / (60 * 1000 * 1000); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Channel[%d] is UNAVAILABLE [%lu min left]", __func__, dfs_nol[i].dfs_channel_number, left_time); @@ -2991,26 +2991,26 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) tpAniSirGlobal pMac = NULL; if (NULL == sapContext) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid HAL pointer from p_cds_gctx", __func__); return QDF_STATUS_E_FAULT; } pMac = PMAC_STRUCT(hHal); if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: DFS NOL is empty", __func__); return QDF_STATUS_SUCCESS; } if (conf == eSAP_DFS_NOL_CLEAR) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: clear the DFS NOL", __func__); for (i = 0; @@ -3027,7 +3027,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) sapDfsChannelNolList[i].radar_found_timestamp = 0; } } else if (conf == eSAP_DFS_NOL_RANDOMIZE) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Randomize the DFS NOL", __func__); /* random 1/0 to decide to put the channel into NOL */ @@ -3063,7 +3063,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) [i].radar_found_timestamp = 0; } - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Set channel[%d] %s", __func__, pMac->sap.SapDfsInfo.sapDfsChannelNolList[i] @@ -3074,7 +3074,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf) "AVAILABLE"); } } else { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: unsupport type %d", __func__, conf); } @@ -3119,7 +3119,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, else pDelStaParams->subtype = (SIR_MAC_MGMT_DEAUTH >> 4); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL( "Delete STA with RC:%hu subtype:%hhu MAC::" MAC_ADDRESS_STR), @@ -3155,7 +3155,7 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context = CDS_GET_SAP_CB(pvos_gctx); if (NULL == sap_context) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pvos_gctx", __func__); return QDF_STATUS_E_FAULT; @@ -3163,13 +3163,13 @@ wlansap_acs_chselect(void *pvos_gctx, h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx); if (NULL == h_hal) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid MAC context from pvosGCtx", __func__); return QDF_STATUS_E_FAULT; } if (sap_context->isSapSessionOpen == eSAP_TRUE) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, "%s:SME Session is already opened\n", __func__); return QDF_STATUS_E_EXISTS; } @@ -3201,8 +3201,8 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->self_mac_addr, &sap_context->sessionId, type, subType)) { - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_OpenSession", __func__); return QDF_STATUS_E_FAILURE; @@ -3237,7 +3237,7 @@ wlansap_acs_chselect(void *pvos_gctx, qdf_status = sap_goto_channel_sel(sap_context, NULL, true); if (QDF_STATUS_E_ABORTED == qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); return QDF_STATUS_E_FAILURE; @@ -3247,9 +3247,9 @@ wlansap_acs_chselect(void *pvos_gctx, * failed or ACS is overridden due to other constrainst * So send selected channel to HDD */ - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Scan Req Failed/ACS Overridden")); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Selected channel = %d"), sap_context->channel); if (sap_context->isScanSessionOpen == eSAP_TRUE) { @@ -3265,8 +3265,8 @@ wlansap_acs_chselect(void *pvos_gctx, sap_context->isScanSessionOpen = eSAP_FALSE; else - CDF_TRACE(QDF_MODULE_ID_SAP, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, "ACS Scan Session close fail"); sap_context->sessionId = 0xff; } @@ -3275,7 +3275,7 @@ wlansap_acs_chselect(void *pvos_gctx, eSAP_ACS_CHANNEL_SELECTED, (void *) eSAP_STATUS_SUCCESS); } else if (QDF_STATUS_SUCCESS == qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); } } @@ -3316,7 +3316,7 @@ wlansap_get_phymode(void *pctx) sap_context = CDS_GET_SAP_CB(pctx); if (NULL == sap_context) { - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "%s: Invalid SAP pointer from pctx", __func__); return eCSR_DOT11_MODE_AUTO; } diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index f954514f73ae..04b9be37358e 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_status.h" #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 1872ad4ce832..61f7d82b1061 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_status.h" #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "host_diag_core_event.h" diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index b4fbdb221f60..6c3c1450a903 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -28,7 +28,7 @@ #if !defined(__SME_POWER_SAVE_H) #define __SME_POWER_SAVE_H #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "ani_system_defs.h" diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index 473ef1774c94..59515080bb95 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "ani_global.h" diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index 7dd26da6a4a9..61570d4c8abd 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "ani_global.h" diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index 8c159f0e563b..9e8d56f16382 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "ani_global.h" diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index 77ea6355de19..9814e48a5794 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -38,7 +38,7 @@ Include Files ------------------------------------------------------------------------*/ #include "qdf_lock.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cdf_memory.h" #include "qdf_types.h" #include "rrm_global.h" diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 58968fc14adf..6b35228b4efa 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -44,10 +44,10 @@ #include "csr_internal.h" #include "wma_types.h" #include "wma_if.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "sme_trace.h" #include "qdf_types.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "cds_utils.h" #include "sap_api.h" #include "mac_trace.h" @@ -378,7 +378,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) active_list_cmd_timeout_handle, (void *)pMac); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); cdf_mem_free(pMac->sme.smeCmdActiveList. cmdTimeoutTimer); @@ -610,7 +610,7 @@ tSmeCmd *sme_get_command_buffer(tpAniSirGlobal pMac) csr_ll_unlock(&pMac->roam.roamCmdPendingList); /* panic with out-of-command */ - CDF_BUG(0); + QDF_BUG(0); } /* memset to zero */ @@ -629,7 +629,7 @@ void sme_push_command(tpAniSirGlobal pMac, tSmeCmd *pCmd, bool fHighPriority) { if (!SME_IS_START(pMac)) { sms_log(pMac, LOGE, FL("Sme in stop state")); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -903,7 +903,7 @@ sme_process_cmd: csr_ll_insert_head(&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_NOLOCK); /* .... and process the command. */ - MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND, pCommand->sessionId, pCommand->command)); switch (pCommand->command) { @@ -974,7 +974,7 @@ sme_process_cmd: case eSmeCommandTdlsAddPeer: case eSmeCommandTdlsDelPeer: case eSmeCommandTdlsLinkEstablish: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("sending TDLS Command 0x%x to PE"), pCommand->command); csr_ll_unlock(&pMac->sme.smeCmdActiveList); @@ -1141,7 +1141,7 @@ QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_11DINFO, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { sms_log(pMac, LOGE, @@ -1193,7 +1193,7 @@ QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_GET_SOFTAP_DOMAIN, NO_SESSION, 0)); if (NULL == domainIdSoftAp) { @@ -1212,7 +1212,7 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SET_REGINFO, NO_SESSION, 0)); if (NULL == apCntryCode) { sms_log(pMac, LOGE, "Empty Country Code, nothing to update"); @@ -1250,7 +1250,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } if (!pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Invalid Sessionid")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1267,15 +1267,15 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) /* DFS channel is provided, no PLM bursts can be * transmitted. Ignoring these channels. */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("DFS channel %d ignored for PLM"), pPlmReq->plmChList[count]); continue; } } else if (!ret) { /* Not supported, ignore the channel */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Unsupported channel %d ignored for PLM"), pPlmReq->plmChList[count]); continue; @@ -1303,7 +1303,7 @@ send_plm_start: if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PLM_REQ to WMA")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -1340,7 +1340,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_UPDATE_CONFIG, NO_SESSION, 0)); if (NULL == pSmeConfigParams) { @@ -1381,7 +1381,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG"); } return status; @@ -1479,12 +1479,12 @@ void sme_process_get_gtk_info_rsp(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } if (pMac->sme.gtk_offload_get_info_cb == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: HDD callback is null", __func__); return; } @@ -1516,7 +1516,7 @@ void sme_process_ready_to_suspend(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1547,7 +1547,7 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return; } @@ -1631,7 +1631,7 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_HDDREADYIND, NO_SESSION, 0)); do { @@ -1844,7 +1844,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu roamStatus = eCSR_ROAM_DFS_RADAR_IND; roamResult = eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Radar indication event occurred"); break; } @@ -1861,7 +1861,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu sessionId = csaIeTxCompleteRsp->sessionId; roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY; roamResult = eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND for session id [%d]", sessionId); break; @@ -2178,7 +2178,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) switch (pMsg->type) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD case eWNI_SME_HO_FAIL_IND: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("LFR3: Rcvd eWNI_SME_HO_FAIL_IND")); csr_process_ho_fail_ind(pMac, pMsg->bodyptr); cdf_mem_free(pMsg->bodyptr); @@ -2431,7 +2431,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) /* channel avoid message arrived, send IND to client */ case eWNI_SME_CH_AVOID_IND: if (pMac->sme.pChAvoidNotificationCb) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("CH avoid notification")); pMac->sme.pChAvoidNotificationCb(pMac->hHdd, pMsg->bodyptr); @@ -2442,7 +2442,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) #ifdef FEATURE_WLAN_AUTO_SHUTDOWN case eWNI_SME_AUTO_SHUTDOWN_IND: if (pMac->sme.pAutoShutdownNotificationCb) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Auto shutdown notification")); pMac->sme.pAutoShutdownNotificationCb(); } @@ -2936,7 +2936,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, cds_msg_t msg; uint32_t scan_req_id, scan_count; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, session_id, scan_req->scanType)); if (!mac_ctx->scan.fScanEnable) { @@ -3011,7 +3011,7 @@ QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); @@ -3050,13 +3050,13 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, tSirBssDescription first_ap_profile; if (NULL == mac_ctx) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("mac_ctx is NULL")); return QDF_STATUS_E_FAILURE; } scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); return QDF_STATUS_E_FAILURE; } else { @@ -3086,7 +3086,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, scan_filter->bOSENAssociation = 0; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); cdf_mem_free(scan_filter); return QDF_STATUS_E_FAILURE; @@ -3102,8 +3102,8 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, *scan_cache = filtered_scan_result; if (0 != first_ap_profile.channelId) { *ap_chnl_id = first_ap_profile.channelId; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Found best AP & its on chnl[%d]"), first_ap_profile.channelId); } else { @@ -3113,20 +3113,20 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, * take of zero channel id case. */ *ap_chnl_id = 0; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Scan is empty, set chnl to 0")); status = QDF_STATUS_E_FAILURE; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to get scan get result")); status = QDF_STATUS_E_FAILURE; } csr_free_scan_filter(mac_ctx, scan_filter); sme_release_global_lock(&mac_ctx->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); status = QDF_STATUS_E_FAILURE; } @@ -3160,7 +3160,7 @@ bool sme_store_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3195,7 +3195,7 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; bool ret_status = true; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3232,7 +3232,7 @@ QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle, QDF_STATUS status = QDF_STATUS_E_FAILURE; QDF_STATUS ret_status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ, session_id, 0)); status = sme_acquire_global_lock(&mac_ctx->sme); @@ -3261,7 +3261,7 @@ QDF_STATUS sme_scan_flush_result(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, 0, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3286,7 +3286,7 @@ QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3303,7 +3303,7 @@ QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3330,7 +3330,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3358,7 +3358,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrScanResultInfo *pRet = NULL; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3385,7 +3385,7 @@ QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3491,7 +3491,7 @@ QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3531,7 +3531,7 @@ QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -3566,7 +3566,7 @@ QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0)); sms_log(pMac, LOG2, FL("enter")); status = sme_acquire_global_lock(&pMac->sme); @@ -3603,7 +3603,7 @@ QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3633,7 +3633,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DISCONNECT, sessionId, reason)); sms_log(pMac, LOG2, FL("enter")); @@ -3691,7 +3691,7 @@ QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } @@ -3729,11 +3729,11 @@ QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA, sessionId, pDelStaParams->reason_code)); status = sme_acquire_global_lock(&pMac->sme); @@ -3765,7 +3765,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } @@ -3808,7 +3808,7 @@ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } @@ -3848,7 +3848,7 @@ QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } @@ -3912,7 +3912,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -3939,7 +3939,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId, */ void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) { - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE, NO_SESSION, 0)); csr_roam_free_connect_profile(profile); @@ -3970,7 +3970,7 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId, numItems)); status = sme_acquire_global_lock(&pMac->sme); @@ -3994,7 +3994,7 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE, sessionId, flush_cache)); status = sme_acquire_global_lock(&pMac->sme); @@ -4158,7 +4158,7 @@ QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4189,7 +4189,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4319,7 +4319,7 @@ QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -4347,7 +4347,7 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag) tpAniSirGlobal mac = PMAC_STRUCT(hal); struct ps_global_info *ps_global_info = &mac->sme.ps_global_info; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_DHCP_FLAG, NO_SESSION, flag)); /* Set/Clear the DHCP flag which will disable/enable auto PS */ @@ -4494,7 +4494,7 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal, struct wow_add_pattern *ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_ADDBCAST_PATTERN, session_id, 0)); ptrn = cdf_mem_malloc(sizeof(*ptrn)); @@ -4535,7 +4535,7 @@ QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, struct wow_delete_pattern *delete_ptrn; tSirRetStatus ret_code = eSIR_SUCCESS; tSirMsgQ msg_q; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_DELBCAST_PATTERN, sessionId, 0)); delete_ptrn = cdf_mem_malloc(sizeof(*delete_ptrn)); @@ -4612,7 +4612,7 @@ QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ENTER_WOWL, session_id, 0)); /* cache the WOWL information */ @@ -4651,7 +4651,7 @@ QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); uint8_t session_id; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_EXIT_WOWL, NO_SESSION, 0)); session_id = wowl_exit_params->sessionId; status = sme_ps_process_command(mac_ctx, session_id, SME_PS_WOWL_EXIT); @@ -4681,7 +4681,7 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal, uint8_t session_id, tCsrRoamSession *session = NULL; struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY, session_id, 0)); if (set_key->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("Invalid key length %d"), @@ -4755,7 +4755,7 @@ QDF_STATUS sme_get_rssi(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4849,7 +4849,7 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION, periodicity)); status = sme_acquire_global_lock(&pMac->sme); @@ -4878,7 +4878,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, if (QDF_IS_STATUS_SUCCESS(status)) { pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", __func__); sme_release_global_lock(&pMac->sme); @@ -4897,7 +4897,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); cdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; @@ -4938,7 +4938,7 @@ QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_CNTRYCODE, NO_SESSION, 0)); return csr_get_country_code(pMac, pBuf, pbLen); @@ -5012,7 +5012,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, cds_msg_t msg; tAniChangeCountryCodeReq *pMsg; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -5093,7 +5093,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, tAniGenericChangeCountryCodeReq *pMsg; if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: pMac is null", __func__); return status; } @@ -5176,7 +5176,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp start", __func__); sme_release_global_lock(&pMac->sme); @@ -5196,7 +5196,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5246,7 +5246,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp stop", __func__); sme_release_global_lock(&pMac->sme); @@ -5267,7 +5267,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); cdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; @@ -5291,7 +5291,7 @@ void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0)); if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { csr_set_cfg_privacy(pMac, pProfile, fPrivacy); @@ -5317,7 +5317,7 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION, 0)); @@ -5585,7 +5585,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "%s: type=%d, subType=%d", __func__, type, subType); if (NULL == pbSessionId) { @@ -5602,7 +5602,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, } } if (NULL != pbSessionId) - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_OPEN_SESSION, *pbSessionId, 0)); @@ -5633,7 +5633,7 @@ QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5753,7 +5753,7 @@ QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_E_FAILURE; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -5791,19 +5791,19 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: KeyReplayCounter: %lld", __func__, pGtkOffload->ullKeyReplayCounter); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Session not found ", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5818,7 +5818,7 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5845,18 +5845,18 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered", + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Entered", __func__); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Session not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); return QDF_STATUS_E_NOMEM; } @@ -5885,7 +5885,7 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5910,17 +5910,17 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_LOW, FL("WMA_SET_KEEP_ALIVE message")); if (pSession == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Session not Found")); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); return QDF_STATUS_E_NOMEM; } @@ -5928,7 +5928,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, qdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_LOW, "buff TP %d input TP %d ", request_buf->timePeriod, request->timePeriod); request_buf->sessionId = session_id; @@ -5938,7 +5938,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -5966,7 +5966,7 @@ QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_PREF_NET_LIST, sessionId, request->ucNetworksCount)); status = sme_acquire_global_lock(&pMac->sme); @@ -5997,7 +5997,7 @@ QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6101,7 +6101,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6117,7 +6117,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6162,7 +6162,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6179,7 +6179,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, } if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s Invalid Sessionid", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -6233,7 +6233,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, cds_msg_t msg; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_REMAIN_ONCHAN, session_id, 0)); scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList); @@ -6322,7 +6322,7 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6373,7 +6373,7 @@ QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0)); /* acquire the lock for the sme object */ status = sme_acquire_global_lock(&pMac->sme); @@ -6395,7 +6395,7 @@ QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6451,7 +6451,7 @@ QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -6498,7 +6498,7 @@ QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_SUSPENDIND, NO_SESSION, 0)); @@ -6547,7 +6547,7 @@ QDF_STATUS sme_configure_resume_req(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -6589,7 +6589,7 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0)); pMac->readyToExtWoWCallback = callback; @@ -6647,7 +6647,7 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION, 0)); @@ -6698,7 +6698,7 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, if (!MsgPtr) return QDF_STATUS_E_NOMEM; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION, 0)); @@ -6791,7 +6791,7 @@ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal) if (QDF_IS_STATUS_SUCCESS(status)) { channel = csr_get_concurrent_operation_channel(pMac); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: " " Other Concurrent Channel = %d", __func__, channel); sme_release_global_lock(&pMac->sme); } @@ -7268,7 +7268,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: " "ulMulticastAddrCnt=%d, multicastAddr[0]=%p", __func__, pMulticastAddrs->ulMulticastAddrCnt, pMulticastAddrs->multicastAddr[0].bytes); @@ -7282,7 +7282,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (pSession == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "%s: Unable to find the session Id: %d", __func__, sessionId); return QDF_STATUS_E_FAILURE; @@ -7290,7 +7290,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for 8023 Multicast List request", __func__); @@ -7298,7 +7298,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, } if (!csr_is_conn_state_connected_infra(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Ignoring the " "indication as we are not connected", __func__); cdf_mem_free(request_buf); @@ -7316,7 +7316,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to " "post WMA_8023_MULTICAST_LIST message to WMA", __func__); @@ -7338,7 +7338,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); uint8_t idx = 0; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: filterType=%d, " "filterId = %d", __func__, pRcvPktFilterCfg->filterType, pRcvPktFilterCfg->filterId); @@ -7347,7 +7347,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf = cdf_mem_malloc(allocSize); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to " "allocate memory for Receive Filter Set Filter request", __func__); @@ -7355,7 +7355,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -7371,27 +7371,27 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "FT %d FID %d ", request_buf->filterType, request_buf->filterId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Pkt Flt Req : " "params %d CT %d", request_buf->numFieldParams, request_buf->coalesceTime); for (idx = 0; idx < request_buf->numFieldParams; idx++) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Proto %d Comp Flag %d ", request_buf->paramsData[idx].protocolLayer, request_buf->paramsData[idx].cmpFlag); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Data Offset %d Data Len %d", request_buf->paramsData[idx].dataOffset, request_buf->paramsData[idx].dataLength); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "CData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].compareData[0], request_buf->paramsData[idx].compareData[1], @@ -7400,7 +7400,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, request_buf->paramsData[idx].compareData[4], request_buf->paramsData[idx].compareData[5]); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "MData: %d:%d:%d:%d:%d:%d", request_buf->paramsData[idx].dataMask[0], request_buf->paramsData[idx].dataMask[1], @@ -7412,7 +7412,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, } if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); @@ -7432,18 +7432,18 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d", + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: filterId = %d", __func__, pRcvFltPktClearParam->filterId); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Session Not found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " "Clear Filter request", __func__); return QDF_STATUS_E_NOMEM; @@ -7461,7 +7461,7 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, msg.reserved = 0; msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post " "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); @@ -7563,7 +7563,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) pMaxTxPowerPerBandParams = cdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams)); if (NULL == pMaxTxPowerPerBandParams) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7577,7 +7577,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) msg.bodyptr = pMaxTxPowerPerBandParams; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); cdf_mem_free(pMaxTxPowerPerBandParams); @@ -7607,11 +7607,11 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, cds_msg_t msg; tpMaxTxPowerParams pMaxTxParams = NULL; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_MAXTXPOW, NO_SESSION, 0)); pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7626,7 +7626,7 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, msg.bodyptr = pMaxTxParams; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA", __func__); cdf_mem_free(pMaxTxParams); @@ -7653,7 +7653,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) pBaseMacAddr = cdf_mem_malloc(sizeof(tSirMacAddr)); if (NULL == pBaseMacAddr) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); return QDF_STATUS_E_NOMEM; } @@ -7665,7 +7665,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) msg.bodyptr = pBaseMacAddr; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); cdf_mem_free(pBaseMacAddr); @@ -7693,19 +7693,19 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, tpMaxTxPowerParams pTxParams = NULL; int8_t power = (int8_t) dBm; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TXPOW, sessionId, 0)); /* make sure there is no overflow */ if ((int)power != dBm) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: error, invalid power = %d", __func__, dBm); return QDF_STATUS_E_FAILURE; } pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pTxParams) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", __func__); return QDF_STATUS_E_NOMEM; @@ -7719,7 +7719,7 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, msg.bodyptr = pTxParams; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); cdf_mem_free(pTxParams); @@ -7761,7 +7761,7 @@ QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) } if (!pSession->sessionActive) - CDF_ASSERT(0); + QDF_ASSERT(0); /* Create the message and send to lim */ len = sizeof(tSirUpdateParams); @@ -7799,7 +7799,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_msg_t cds_message; tAniSetTmLevelReq *setTmLevelReq = NULL; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -7807,7 +7807,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod (tAniSetTmLevelReq *) cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); if (NULL == setTmLevelReq) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for sme_set_tm_level", __func__); sme_release_global_lock(&pMac->sme); @@ -7822,7 +7822,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod cds_message.type = WMA_SET_TM_LEVEL_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); cdf_mem_free(setTmLevelReq); status = QDF_STATUS_E_FAILURE; @@ -7844,7 +7844,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod ---------------------------------------------------------------------------*/ void sme_feature_caps_exchange(tHalHandle hHal) { - MTRACE(cdf_trace + MTRACE(qdf_trace (QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION, 0)); } @@ -7872,7 +7872,7 @@ void sme_disable_feature_capablity(uint8_t feature_index) void sme_reset_power_values_for5_g(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_RESET_PW5G, NO_SESSION, 0)); csr_save_channel_power_for_band(pMac, true); csr_apply_power2_current(pMac); /* Store the channel+power info in the global place: Cfg */ @@ -7893,11 +7893,11 @@ QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: gRoamPrefer5GHz is changed from %d to %d", __func__, pMac->roam.configParam.nRoamPrefer5GHz, nRoamPrefer5GHz); @@ -7922,11 +7922,11 @@ QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: gRoamIntraBand is changed from %d to %d", __func__, pMac->roam.configParam.nRoamIntraBand, nRoamIntraBand); @@ -7953,12 +7953,12 @@ QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: gRoamScanNProbes is changed from %d to %d", __func__, pMac->roam.configParam.nProbes, nProbes); pMac->roam.configParam.nProbes = nProbes; @@ -7992,12 +7992,12 @@ QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: gRoamScanHomeAwayTime is changed from %d to %d", __func__, pMac->roam.configParam.nRoamScanHomeAwayTime, @@ -8062,7 +8062,7 @@ QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel, bool sme_get_roam_intra_band(tHalHandle hHal) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_GET_ROAMIBAND, NO_SESSION, 0)); return pMac->roam.configParam.nRoamIntraBand; } @@ -8112,7 +8112,7 @@ QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s", RoamRssiDiff, pMac->roam.configParam.RoamRssiDiff, @@ -8149,12 +8149,12 @@ QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: FastTransitionEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastTransitionEnabled, @@ -8187,7 +8187,7 @@ QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s", isWESModeEnabled, pMac->roam.configParam.isWESModeEnabled, @@ -8219,11 +8219,11 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s", roamScanControl, pMac->roam.configParam.nRoamScanControl, @@ -8233,7 +8233,7 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId, neighborRoamState)); pMac->roam.configParam.nRoamScanControl = roamScanControl; if (0 == roamScanControl) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully cleared roam scan cache"); csr_flush_cfg_bg_scan_roam_channel_list(pMac, sessionId); if (pMac->roam.configParam.isRoamOffloadScanEnabled) { @@ -8267,7 +8267,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled if (pMac->roam.configParam.isFastRoamIniFeatureEnabled == isFastRoamIniFeatureEnabled) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: FastRoam is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, @@ -8275,7 +8275,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: FastRoamEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isFastRoamIniFeatureEnabled, isFastRoamIniFeatureEnabled); @@ -8306,7 +8306,7 @@ QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: MAWCEnabled is changed from %d to %d", __func__, pMac->roam.configParam.MAWCEnabled, MAWCEnabled); pMac->roam.configParam.MAWCEnabled = MAWCEnabled; @@ -8417,7 +8417,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled if (pMac->roam.configParam.isEseIniFeatureEnabled == isEseIniFeatureEnabled) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, @@ -8425,7 +8425,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: EseEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isEseIniFeatureEnabled, isEseIniFeatureEnabled); @@ -8466,7 +8466,7 @@ QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { cdf_ret_status = QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } @@ -8499,7 +8499,7 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal, sessionId, nOpportunisticThresholdDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8556,7 +8556,7 @@ QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal, status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId, nRoamRescanRssiDiff); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "opportunistic threshold diff to %d" " - old value is %d - roam state is %d", @@ -8611,7 +8611,7 @@ QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId, nRoamBmissFirstBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss first beacon count to %d" " - old value is %d - roam state is %d", @@ -8664,7 +8664,7 @@ QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal, status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId, nRoamBmissFinalBcnt); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8719,7 +8719,7 @@ QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal, status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId, nRoamBeaconRssiWeight); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set " "beacon miss final beacon count to %d" " - old value is %d - roam state is %d", @@ -8770,7 +8770,7 @@ QDF_STATUS sme_set_neighbor_lookup_rssi_threshold status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId, neighborLookupRssiThreshold); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s", neighborLookupRssiThreshold, pMac->roam.configParam.neighborRoamConfig. @@ -8806,8 +8806,8 @@ QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal, QDF_STATUS status = QDF_STATUS_SUCCESS; status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL("LFR param delay_before_vdev_stop changed from %d to %d"), pMac->roam.configParam.neighborRoamConfig. delay_before_vdev_stop, @@ -8860,7 +8860,7 @@ QDF_STATUS sme_set_neighbor_scan_refresh_period pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan refresh period to %d- old value is %d - roam state is %s", neighborScanResultsRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -8904,7 +8904,7 @@ QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL ("gRoamScanOffloadEnabled is changed from %d to %d"), pMac->roam.configParam.isRoamOffloadScanEnabled, @@ -8973,7 +8973,7 @@ QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set roam scan period to %d -old value is %d - roam state is %s", nEmptyScanRefreshPeriod, pMac->roam.configParam.neighborRoamConfig. @@ -9018,7 +9018,7 @@ QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s", nNeighborScanMinChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9064,7 +9064,7 @@ QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionI pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set channel max dwell time to %d - old value is %d - roam state is %s", nNeighborScanMaxChanTime, pMac->roam.configParam.neighborRoamConfig. @@ -9247,7 +9247,7 @@ QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId, pNeighborRoamConfig = &pMac->roam.configParam.neighborRoamConfig; pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set neighbor scan period to %d" " - old value is %d - roam state is %s", nNeighborScanPeriod, @@ -9364,7 +9364,7 @@ QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, break; } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR runtime successfully set roam scan channels to %s - old value is %s - roam state is %d"), newChannelList, oldChannelList, pMac->roam.neighborRoamInfo[sessionId].neighborRoamState); @@ -9432,7 +9432,7 @@ QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, curchnl_list_info->ChannelList[i]); } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d", newChannelList, oldChannelList, pNeighborRoamInfo->neighborRoamState); @@ -9472,7 +9472,7 @@ QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(status)) return status; if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("Roam Scan channel list is NOT yet initialized")); *pNumChannels = 0; sme_release_global_lock(&pMac->sme); @@ -9592,7 +9592,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM, sessionId, tdlsLinkEstablishParams->isOffChannelSupported)); @@ -9631,7 +9631,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, tCsrTdlsSendMgmt sendTdlsReq = { {0} }; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); @@ -9670,11 +9670,11 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pstaParams) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s :pstaParams is NULL", __func__); return QDF_STATUS_E_FAILURE; } - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA, sessionId, pstaParams->capability)); status = sme_acquire_global_lock(&pMac->sme); @@ -9702,7 +9702,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9729,7 +9729,7 @@ QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA, sessionId, 0)); status = sme_acquire_global_lock(&pMac->sme); @@ -9835,7 +9835,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, return status; pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -9872,7 +9872,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("invalid peer state param (%d)"), peerStateParams->peerState); cdf_mem_free(pTdlsPeerStateParams); @@ -9958,7 +9958,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, tdls_chan_switch_params *chan_switch_params = NULL; cds_msg_t cds_message; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ, NO_SESSION, ch_switch_params->tdls_off_channel)); status = sme_acquire_global_lock(&mac->sme); @@ -9966,7 +9966,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, return status; chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); return QDF_STATUS_E_FAILURE; @@ -9983,7 +9983,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("invalid off channel command (%d)"), ch_switch_params->tdls_off_ch_mode); cdf_mem_free(chan_switch_params); @@ -10000,7 +10000,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, chan_switch_params->is_responder = ch_switch_params->is_responder; chan_switch_params->oper_class = ch_switch_params->opclass; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Country Code=%s, Req offset=%d, Selected Operate Class=%d"), mac->scan.countryCodeCurrent, chan_switch_params->tdls_off_ch_bw_offset, @@ -10012,7 +10012,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), qdf_status); cdf_mem_free(chan_switch_params); @@ -10038,7 +10038,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pLinkSpeedIndCb)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10052,7 +10052,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, cds_message.type = WMA_GET_LINK_SPEED; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Link Speed msg fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10072,7 +10072,7 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR) status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "SSR level is changed %d", enableSSR); /* not serializing this messsage, as this is only going * to set a variable in WMA/WDI @@ -10200,7 +10200,7 @@ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) || ch_params->ch_width == CH_WIDTH_20MHZ || QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel/phymode config: CB Mode disabled", __func__); ch_params->ch_width = CH_WIDTH_20MHZ; @@ -10318,7 +10318,7 @@ QDF_STATUS sme_handoff_request(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: invoked", __func__); status = csr_handoff_request(pMac, sessionId, pHandoffInfo); sme_release_global_lock(&pMac->sme); @@ -10348,7 +10348,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, if (QDF_STATUS_SUCCESS == status) { request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ IPA_OFFLOAD_ENABLE_DISABLE")); sme_release_global_lock(&pMac->sme); @@ -10364,7 +10364,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); cdf_mem_free(request_buf); @@ -10411,14 +10411,14 @@ QDF_STATUS sme_lphb_config_req tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - MTRACE(cdf_trace(QDF_MODULE_ID_SME, + MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ, NO_SESSION, lphdReq->cmd)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) && (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Indication Call back did not registered", __func__); sme_release_global_lock(&pMac->sme); @@ -10432,7 +10432,7 @@ QDF_STATUS sme_lphb_config_req cds_message.type = WMA_LPHB_CONF_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Config LPHB MSG fail", __func__); status = QDF_STATUS_E_FAILURE; } @@ -10458,7 +10458,7 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan, pMac->roam.configParam.nNumStaChanCombinedConc = nNumStaChan; pMac->roam.configParam.nNumP2PChanCombinedConc = nNumP2PChan; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: SCAN nNumStaChanCombinedConc : %d," "nNumP2PChanCombinedConc : %d ", __func__, nNumStaChan, nNumP2PChan); @@ -10572,7 +10572,7 @@ void sme_get_command_q_status(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: pMac is NULL", __func__); return; } @@ -10705,7 +10705,7 @@ QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; @@ -10740,7 +10740,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10752,7 +10752,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) msg.bodyptr = sme_utc; status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); cdf_mem_free(utc); goto end; @@ -10788,7 +10788,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + timing_advert->template_length); if (!buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for start TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10805,7 +10805,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, msg.bodyptr = buf; status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10838,7 +10838,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); status = QDF_STATUS_E_NOMEM; goto end; @@ -10850,7 +10850,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, msg.bodyptr = sme_timing_advert; status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); goto end; } @@ -10925,7 +10925,7 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, /* Post the message to WDA */ status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; pMac->sme.ocb_get_tsf_timer_context = NULL; @@ -10983,7 +10983,7 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; @@ -11020,7 +11020,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11035,7 +11035,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); cdf_mem_free(request); goto end; @@ -11075,7 +11075,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, request->dcc_ndl_chan_list_len + request->dcc_ndl_active_state_list_len); if (!msg_body) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to allocate memory")); status = QDF_STATUS_E_NOMEM; goto end; @@ -11101,7 +11101,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; pMac->sme.dcc_update_ndl_context = NULL; @@ -11142,12 +11142,12 @@ void sme_get_recovery_stats(tHalHandle hHal) { uint8_t i; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Self Recovery Stats"); for (i = 0; i < MAX_ACTIVE_CMD_STATS; i++) { if (eSmeNoCommand != g_self_recovery_stats.activeCmdStats[i].command) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "timestamp %llu: command 0x%0X: reason %d: session %d", g_self_recovery_stats.activeCmdStats[i]. timestamp, @@ -11176,7 +11176,7 @@ void sme_save_active_cmd_stats(tHalHandle hHal) tActiveCmdStats *actv_cmd_stat = NULL; if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } @@ -11212,7 +11212,7 @@ void active_list_cmd_timeout_handle(void *userData) { if (NULL == userData) return; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Active List command timeout Cmd List Count %d", __func__, csr_ll_count(&((tpAniSirGlobal) userData)->sme. smeCmdActiveList)); @@ -11222,7 +11222,7 @@ void active_list_cmd_timeout_handle(void *userData) sme_save_active_cmd_stats((tHalHandle) userData); cds_trigger_recovery(); } else { - CDF_BUG(0); + QDF_BUG(0); } } @@ -11238,7 +11238,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", __func__); return QDF_STATUS_E_NOMEM; @@ -11251,7 +11251,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_MODEM_POWER_STATE_IND message" " to WMA", __func__); cdf_mem_free(request_buf); @@ -11277,7 +11277,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pHtOpMode) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", __func__); return QDF_STATUS_E_NOMEM; @@ -11294,7 +11294,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Invalid OP mode", __func__); return QDF_STATUS_E_FAILURE; } @@ -11309,14 +11309,14 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, msg.bodyptr = pHtOpMode; if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); cdf_mem_free(pHtOpMode); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Notifed FW about OP mode: %d for staId=%d", __func__, pHtOpMode->opMode, staId); @@ -11343,7 +11343,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); ePhyChanBondState cbMode; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Update HT operation beacon IE, channel_type=%d", __func__, channel_type); @@ -11358,7 +11358,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId, cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY; break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Error!!! Invalid HT20/40 mode !", __func__); return QDF_STATUS_E_FAILURE; } @@ -11389,7 +11389,7 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == pMac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: invalid context", __func__); return QDF_STATUS_E_FAILURE; } @@ -11412,16 +11412,16 @@ QDF_STATUS sme_set_idle_powersave_config(void *cds_context, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (NULL == wmaContext) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: wmaContext is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, " Idle Ps Set Value %d", value); pMac->imps_enabled = false; if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, " Failed to Set Idle Ps Value %d", value); return QDF_STATUS_E_FAILURE; } @@ -11436,7 +11436,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } @@ -11451,7 +11451,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ: return pSession->htConfig.ht_sgi; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "invalid ht capability"); return -EIO; } @@ -11464,13 +11464,13 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab, tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: pSession is NULL", __func__); return -EIO; } if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to set ht capability in target"); return -EIO; } @@ -11511,7 +11511,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Rate update struct alloc failed"); return QDF_STATUS_E_FAILURE; } @@ -11532,7 +11532,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able " "to post WMA_SET_RMC_RATE_IND to WMA!", __func__); @@ -11605,7 +11605,7 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Plug in Auto shutdown event callback", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11639,7 +11639,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) auto_sh_cmd = (tSirAutoShutdownCmdParams *) cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11652,13 +11652,13 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); cdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Posted Auto shutdown MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11683,7 +11683,7 @@ QDF_STATUS sme_add_ch_avoid_callback QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Plug in CH AVOID CB", __func__); status = sme_acquire_global_lock(&pMac->sme); @@ -11717,7 +11717,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cauReq = (tSirChAvoidUpdateReq *) cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_NOMEM; @@ -11730,14 +11730,14 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) cds_message.type = WMA_CH_AVOID_UPDATE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); cdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Posted Ch Avoid Update MSG", __func__); sme_release_global_lock(&pMac->sme); } @@ -11765,7 +11765,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) val = cdf_mem_malloc(sizeof(*val)); if (NULL == val || NULL == mac_ptr) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); return QDF_STATUS_E_NOMEM; } @@ -11778,7 +11778,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(val); @@ -11806,7 +11806,7 @@ QDF_STATUS sme_set_mas(uint32_t val) ptr_val = cdf_mem_malloc(sizeof(*ptr_val)); if (NULL == ptr_val) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); return QDF_STATUS_E_NOMEM; } @@ -11819,7 +11819,7 @@ QDF_STATUS sme_set_mas(uint32_t val) if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); cdf_mem_free(ptr_val); @@ -11887,14 +11887,14 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, pChnlParams->ch_width; if (pChnlParams->status == QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = 1; roamResult = eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS; } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "sapdfs: Received failure eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]", SessionId); proam_info.channelChangeRespEvent->channelChangeStatus = @@ -11978,7 +11978,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam pWmaParam = (t_thermal_mgmt *) cdf_mem_malloc(sizeof(t_thermal_mgmt)); if (NULL == pWmaParam) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); return QDF_STATUS_E_NOMEM; } @@ -12010,7 +12010,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!", __func__); cdf_mem_free(pWmaParam); @@ -12061,7 +12061,7 @@ QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!", __func__); sme_release_global_lock(&pMac->sme); @@ -12090,7 +12090,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) tx_power_limit = cdf_mem_malloc(sizeof(*tx_power_limit)); if (!tx_power_limit) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", __func__); return QDF_STATUS_E_FAILURE; @@ -12106,7 +12106,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_TX_POWER_LIMIT", __func__); status = QDF_STATUS_E_FAILURE; @@ -12233,7 +12233,7 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) msg.bodyptr = data; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA", __func__); cdf_mem_free(data); @@ -12298,7 +12298,7 @@ QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR runtime successfully set AllowDFSChannelRoam Mode to " "%d - old value is %d - roam state is %s", allowDFSChannelRoam, @@ -12424,13 +12424,13 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, return status; pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (pCsrSession == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Session lookup fails for CSR session")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Invalid session Id %u"), sessionId); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12441,14 +12441,14 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, &peSessionId); if (pSession == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL(" Session lookup fails for BSSID")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } if (!pSession->QosMapSet.present) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("QOS Mapping IE not present")); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; @@ -12461,8 +12461,8 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal, && (pSession->QosMapSet.dscp_range[i][1] == 255)) { dscpmapping[j] = 0; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("User Priority %d isn't used"), i); break; } else { @@ -12533,13 +12533,13 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, uint32_t totValidChannels = WNI_CFG_VALID_CHANNEL_LIST_LEN; if (!aValidChannels || !pNumChannels) { - sms_log(pMac, CDF_TRACE_LEVEL_ERROR, + sms_log(pMac, QDF_TRACE_LEVEL_ERROR, FL("Output channel list/NumChannels is NULL")); return QDF_STATUS_E_INVAL; } if ((wifiBand < WIFI_BAND_UNSPECIFIED) || (wifiBand >= WIFI_BAND_MAX)) { - sms_log(pMac, CDF_TRACE_LEVEL_ERROR, + sms_log(pMac, QDF_TRACE_LEVEL_ERROR, FL("Invalid wifiBand (%d)"), wifiBand); return QDF_STATUS_E_INVAL; } @@ -12547,14 +12547,14 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, status = sme_get_cfg_valid_channels(hHal, &chanList[0], &totValidChannels); if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, CDF_TRACE_LEVEL_ERROR, + sms_log(pMac, QDF_TRACE_LEVEL_ERROR, FL("Fail to get valid channel list (err=%d)"), status); return status; } switch (wifiBand) { case WIFI_BAND_UNSPECIFIED: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("Unspec Band, return all (%d) valid channels"), totValidChannels); numChannels = totValidChannels; @@ -12564,7 +12564,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_BG: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_BG (2.4 GHz)")); for (i = 0; i < totValidChannels; i++) { if (CDS_IS_CHANNEL_24GHZ(chanList[i])) { @@ -12575,7 +12575,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_A: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_A (5 GHz without DFS)")); for (i = 0; i < totValidChannels; i++) { if (CDS_IS_CHANNEL_5GHZ(chanList[i]) && @@ -12587,7 +12587,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_ABG: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_ABG (2.4 GHz + 5 GHz; no DFS)")); for (i = 0; i < totValidChannels; i++) { if ((CDS_IS_CHANNEL_24GHZ(chanList[i]) || @@ -12600,7 +12600,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_A_DFS_ONLY: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_A_DFS (5 GHz DFS only)")); for (i = 0; i < totValidChannels; i++) { if (CDS_IS_CHANNEL_5GHZ(chanList[i]) && @@ -12612,7 +12612,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_A_WITH_DFS: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_A_WITH_DFS (5 GHz with DFS)")); for (i = 0; i < totValidChannels; i++) { if (CDS_IS_CHANNEL_5GHZ(chanList[i])) { @@ -12623,7 +12623,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; case WIFI_BAND_ABG_WITH_DFS: - sms_log(pMac, CDF_TRACE_LEVEL_INFO, + sms_log(pMac, QDF_TRACE_LEVEL_INFO, FL("WIFI_BAND_ABG_WITH_DFS (2.4 GHz+5 GHz with DFS)")); for (i = 0; i < totValidChannels; i++) { if (CDS_IS_CHANNEL_24GHZ(chanList[i]) || @@ -12635,7 +12635,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal, break; default: - sms_log(pMac, CDF_TRACE_LEVEL_ERROR, + sms_log(pMac, QDF_TRACE_LEVEL_ERROR, FL("Unknown wifiBand (%d))"), wifiBand); return QDF_STATUS_E_INVAL; break; @@ -13149,18 +13149,18 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_msg_t cds_message; tSirLLStatsClearReq *clear_stats_req; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "staId = %u", pclearStatsReq->staId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "statsClearReqMask = 0x%X", pclearStatsReq->statsClearReqMask); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "stopReq = %u", pclearStatsReq->stopReq); clear_stats_req = cdf_mem_malloc(sizeof(*clear_stats_req)); if (!clear_stats_req) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13174,7 +13174,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); cdf_mem_free(clear_stats_req); @@ -13182,7 +13182,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(clear_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13206,17 +13206,17 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_msg_t cds_message; tSirLLStatsSetReq *set_stats_req; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: MPDU Size = %u", __func__, psetStatsReq->mpduSizeThreshold); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, " Aggressive Stats Collections = %u", psetStatsReq->aggressiveStatisticsGathering); set_stats_req = cdf_mem_malloc(sizeof(*set_stats_req)); if (!set_stats_req) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13230,7 +13230,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); cdf_mem_free(set_stats_req); @@ -13238,7 +13238,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(set_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13262,17 +13262,17 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_msg_t cds_message; tSirLLStatsGetReq *get_stats_req; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "reqId = %u", pgetStatsReq->reqId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "staId = %u", pgetStatsReq->staId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Stats Type = %u", pgetStatsReq->paramIdMask); get_stats_req = cdf_mem_malloc(sizeof(*get_stats_req)); if (!get_stats_req) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ", __func__); return QDF_STATUS_E_NOMEM; @@ -13286,7 +13286,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); @@ -13296,7 +13296,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); cdf_mem_free(get_stats_req); status = QDF_STATUS_E_FAILURE; @@ -13325,7 +13325,7 @@ QDF_STATUS sme_set_link_layer_stats_ind_cb pMac->sme.pLinkLayerStatsIndCallback = callback_routine; sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: " + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); } @@ -13357,7 +13357,7 @@ QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal, pmac->sme.fw_dump_callback = callback_routine; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13392,7 +13392,7 @@ QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal) pmac->sme.fw_dump_callback = NULL; sme_release_global_lock(&pmac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error")); } @@ -13424,7 +13424,7 @@ QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d", __func__, pMac->roam.configParam.isRoamOffloadEnabled, nRoamOffloadEnabled); @@ -13458,7 +13458,7 @@ QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: LFR3: KeyMgmtOffloadEnabled changed to %d", __func__, nRoamKeyMgmtOffloadEnabled); status = csr_roam_set_key_mgmt_offload(pMac, @@ -13496,7 +13496,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, if (QDF_STATUS_SUCCESS == status) { if ((NULL == pCallbackfn) && (NULL == pMac->sme.pGetTemperatureCb)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Indication Call back did not registered")); sme_release_global_lock(&pMac->sme); @@ -13510,7 +13510,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal, cds_message.type = WMA_GET_TEMPERATURE_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Post Get Temperature msg fail")); status = QDF_STATUS_E_FAILURE; } @@ -13540,7 +13540,7 @@ QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Msg post Set Scan Mac OUI failed")); status = QDF_STATUS_E_FAILURE; } @@ -13568,7 +13568,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); if (!pSmeDhcpSrvInfo) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD", __func__); return QDF_STATUS_E_NOMEM; @@ -13584,7 +13584,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); @@ -13592,7 +13592,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(pSmeDhcpSrvInfo); } @@ -13620,7 +13620,7 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, ledflashing = cdf_mem_malloc(sizeof(*ledflashing)); if (!ledflashing) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Not able to allocate memory for WMA_LED_TIMING_REQ")); return QDF_STATUS_E_NOMEM; @@ -13702,7 +13702,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, cc_switch_mode); sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_acquire_global_lock error!")); session->ch_switch_in_progress = false; return false; @@ -13734,7 +13734,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, stats_factor = cdf_mem_malloc(sizeof(*stats_factor)); if (!stats_factor) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR", __func__); return QDF_STATUS_E_NOMEM; @@ -13753,7 +13753,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); cdf_mem_free(stats_factor); @@ -13761,7 +13761,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(stats_factor); @@ -13791,7 +13791,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, g_time = cdf_mem_malloc(sizeof(*g_time)); if (!g_time) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME", __func__); return QDF_STATUS_E_NOMEM; @@ -13810,7 +13810,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); cdf_mem_free(g_time); @@ -13818,7 +13818,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(g_time); @@ -13847,8 +13847,8 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); if (NULL == iwcmd) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -13868,7 +13868,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, if (!QDF_IS_STATUS_SUCCESS( cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); cdf_mem_free(iwcmd); @@ -13876,7 +13876,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, } sme_release_global_lock(&mac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); cdf_mem_free(iwcmd); @@ -14025,14 +14025,14 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, enum uapsd_ac access_category; if (!psb) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "No need to configure auto trigger:psb is 0"); return QDF_STATUS_SUCCESS; } wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14062,7 +14062,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, if (QDF_STATUS_SUCCESS != wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to Trigger Uapsd params for sessionId %d", sessionId); return QDF_STATUS_E_FAILURE; @@ -14105,13 +14105,13 @@ QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to disable uapsd for ac %d for sessionId %d", ac, sessionId); return QDF_STATUS_E_FAILURE; @@ -14291,26 +14291,26 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) send_req = cdf_mem_malloc(sizeof(*send_req)); if (!send_req) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); return QDF_STATUS_E_FAILURE; } cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("request_id:%d num_seg:%d"), send_req->request_id, send_req->num_seg); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Segment Information")); for (loop = 0; loop < send_req->num_seg; loop++) { seg_req = send_req->segment[loop]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("seg_number:%d"), loop); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("seg_id:%d start_addr_lo:0x%x start_addr_hi:0x%x"), seg_req.seg_id, seg_req.seg_start_addr_lo, seg_req.seg_start_addr_hi); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("seg_length:%d dst_addr_lo:0x%x dst_addr_hi:0x%x"), seg_req.seg_length, seg_req.dst_addr_lo, seg_req.dst_addr_hi); @@ -14323,14 +14323,14 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg); if (QDF_STATUS_SUCCESS != qdf_status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); cdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; @@ -14570,7 +14570,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); return QDF_STATUS_E_NOMEM; } @@ -14582,7 +14582,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_message.bodyptr = request_buf; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -14608,7 +14608,7 @@ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "wma handle is NULL"); return QDF_STATUS_E_FAILURE; } @@ -14687,7 +14687,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, nr_info = &mac_ctx->roam.neighborRoamInfo[session_id]; switch (notify_id) { case eCSR_HI_RSSI_SCAN_MAXCOUNT_ID: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: gRoamScanHirssiMaxCount %d => %d", __func__, nr_config->nhi_rssi_scan_max_count, val); @@ -14697,7 +14697,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_DELTA_ID: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelta %d => %d"), nr_config->nhi_rssi_scan_rssi_delta, val); @@ -14707,7 +14707,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_DELAY_ID: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiDelay %d => %d"), nr_config->nhi_rssi_scan_delay, val); @@ -14717,7 +14717,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; case eCSR_HI_RSSI_SCAN_RSSI_UB_ID: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("gRoamScanHiRssiUpperBound %d => %d"), nr_config->nhi_rssi_scan_rssi_ub, val); @@ -14727,7 +14727,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("invalid parameter notify_id %d"), notify_id); status = QDF_STATUS_E_INVAL; @@ -14762,7 +14762,7 @@ void sme_update_tgt_services(tHalHandle hal, struct wma_tgt_services *cfg) mac_ctx->lteCoexAntShare = cfg->lte_coex_ant_share; mac_ctx->beacon_offload = cfg->beacon_offload; mac_ctx->pmf_offload = cfg->pmf_offload; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("mac_ctx->pmf_offload: %d"), mac_ctx->pmf_offload); return; @@ -14833,7 +14833,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, egap_params = cdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); return QDF_STATUS_E_NOMEM; } @@ -14847,7 +14847,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, message.bodyptr = egap_params; status = cds_mq_post_message(QDF_MODULE_ID_WMA, &message); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); cdf_mem_free(egap_params); diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index c533602fef2b..3b9aba549253 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -548,7 +548,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) tCsrRoamSession *pSession = NULL; if (pMac == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("pMac is NULL")); return; } diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 8c382fb3e906..78ccd346e5a4 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -53,7 +53,7 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) if (QDF_STATUS_SUCCESS != cds_mq_post_message( QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); cdf_mem_free(body); @@ -87,7 +87,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -118,7 +118,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params); if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -190,7 +190,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -222,7 +222,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS(status)) return QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -329,7 +329,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ, hal_wowl_params)){ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } else @@ -364,7 +364,7 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ, hal_wowl_msg)){ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA")); return QDF_STATUS_SUCCESS; } @@ -391,7 +391,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id); return eSIR_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Power Save command %d"), command); switch (command) { case SME_PS_ENABLE: @@ -420,7 +420,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id, break; } if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to enter in PS, Command: %d"), command); } return status; @@ -699,14 +699,14 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, */ status = dot11f_get_packed_probe_request_size(mac_ctx, &pr, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to calculate the packed size for a Probe Request (0x%08x)."), status); /* We'll fall back on the worst case scenario: */ payload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("There were warnings while calculating the packed size for a Probe Request (0x%08x)."), status); } @@ -722,7 +722,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, self_mac_addr); if (eSIR_SUCCESS != sir_status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to populate the buffer descriptor for a Probe Request (%d)."), sir_status); return sir_status; /* allocated! */ @@ -732,11 +732,11 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, sizeof(tSirMacMgmtHdr), payload, &payload); if (DOT11F_FAILED(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).", status); return eSIR_FAILURE; /* allocated! */ } else if (DOT11F_WARNED(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request"); } @@ -764,11 +764,11 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf, mac_ctx->roam.configParam.stationary_thresh; request_buf->channel_prediction_full_scan = mac_ctx->roam.configParam.channel_prediction_full_scan; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("channel_prediction: %d, top_k_num_of_channels: %d"), request_buf->pno_channel_prediction, request_buf->top_k_num_of_channels); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("stationary_thresh: %d, ch_predict_full_scan: %d"), request_buf->stationary_thresh, request_buf->channel_prediction_full_scan); @@ -786,11 +786,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, uint8_t uc_dot11_mode; if (NULL == session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__, *((uint32_t *) &request->aNetworks[0].ssId.ssId[0]), *((uint32_t *) &request->aNetworks[0].ssId.ssId[4]), @@ -810,14 +810,14 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, *((uint32_t *) &request->aNetworks[1].ssId.ssId[28])); if (!session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: session is NULL", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); return QDF_STATUS_E_NOMEM; } @@ -854,13 +854,13 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us24GProbeTemplateLen); request_buf->us24GProbeTemplateLen += request->us24GProbeTemplateLen; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("request->us24GProbeTemplateLen = %d"), request->us24GProbeTemplateLen); } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("Extra ie discarded on 2.4G, IE len = %d"), request->us24GProbeTemplateLen); } @@ -887,11 +887,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, request->us5GProbeTemplateLen); request_buf->us5GProbeTemplateLen += request->us5GProbeTemplateLen; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("request_buf->us5GProbeTemplateLen = %d"), request->us5GProbeTemplateLen); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Extra IE discarded on 5G, IE length = %d"), request->us5GProbeTemplateLen); } @@ -933,7 +933,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, msg.bodyptr = request_buf; if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -945,7 +945,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, mac_ctx->sme.preferred_network_found_ind_cb_ctx = callback_context; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__); + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "-%s", __func__); return QDF_STATUS_SUCCESS; } @@ -969,7 +969,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: IP address = %d.%d.%d.%d", __func__, request->params.hostIpv4Addr[0], request->params.hostIpv4Addr[1], @@ -977,14 +977,14 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, request->params.hostIpv4Addr[3]); if (NULL == session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: SESSION not Found", __func__); return QDF_STATUS_E_FAILURE; } request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); return QDF_STATUS_E_NOMEM; } @@ -998,7 +998,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; @@ -1035,7 +1035,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, request_buf = cdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); return QDF_STATUS_E_NOMEM; } @@ -1046,7 +1046,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, msg.bodyptr = request_buf; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); cdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c index fd7d617e7513..074d0d4f3166 100644 --- a/core/sme/src/common/sme_trace.c +++ b/core/sme/src/common/sme_trace.c @@ -202,7 +202,7 @@ static uint8_t *sme_trace_get_command_string(uint32_t command) } } -static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, +static void sme_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord, uint16_t recIndex) { if (TRACE_CODE_SME_COMMAND == pRecord->code) { @@ -219,6 +219,6 @@ static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord, void sme_trace_init(tpAniSirGlobal pMac) { - cdf_trace_register(QDF_MODULE_ID_SME, (tp_cdf_trace_cb) &sme_trace_dump); + qdf_trace_register(QDF_MODULE_ID_SME, (tp_qdf_trace_cb) &sme_trace_dump); } #endif diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 62e38897eb20..8c2c4bbdf82f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -475,7 +475,7 @@ static int8_t csr_find_channel_pwr(struct channel_power * } /* could not find the channel list in default list */ /* this should not have occured */ - CDF_ASSERT(0); + QDF_ASSERT(0); return 0; } @@ -592,7 +592,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, chan_list_greedy = cdf_mem_malloc(buf_size); chan_list_non_greedy = cdf_mem_malloc(buf_size); if (!chan_list_greedy || !chan_list_non_greedy) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return; } @@ -646,11 +646,11 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, } } } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG, "greedy=%d, non-greedy=%d, tot=%d", num_greedy_chan, num_non_greedy_chan, num_channel); if ((num_greedy_chan + num_non_greedy_chan) != num_channel) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "incorrect sorting of channels"); goto scan_list_sort_error; } @@ -698,7 +698,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_init_operating_classes((tHalHandle) pMac); pChanList = (tSirUpdateChanList *) cdf_mem_malloc(bufLen); if (!pChanList) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return QDF_STATUS_E_NOMEM; } @@ -730,7 +730,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) else pChanList->chanParam[num_channel].dfsSet = true; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "channel:%d, pwr=%d, DFS=%d\n", pChanList->chanParam[num_channel].chanId, pChanList->chanParam[num_channel].pwr, @@ -757,7 +757,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) csr_roam_sort_channel_for_early_stop(pMac, pChanList, num_channel); else - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Early Stop Scan Feature not supported")); msg.type = WMA_UPDATE_CHAN_LIST_REQ; @@ -766,7 +766,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) pChanList->numChan = num_channel; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); cdf_mem_free(pChanList); return QDF_STATUS_E_FAILURE; @@ -805,7 +805,7 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac) break; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); status = csr_update_channel_list(pMac); } while (0); @@ -1528,7 +1528,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "Invalid band, No operation carried out (Band %d)", eBand); return QDF_STATUS_E_INVAL; @@ -1560,7 +1560,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, currChannelListInfo->ChannelList = cdf_mem_malloc(outNumChannels * sizeof(uint8_t)); if (NULL == currChannelListInfo->ChannelList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; return QDF_STATUS_E_NOMEM; @@ -1579,7 +1579,7 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) { /* DOT11 mode configured to 11a only and received request to change the band to 2.4 GHz */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "failed to set band cfg80211 = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; @@ -1588,12 +1588,12 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) { /* DOT11 mode configured to 11b/11g only and received request to change the band to 5 GHz */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "failed to set band dot11mode = %u, band = %u", pMac->roam.configParam.uCfgDot11Mode, eBand); return QDF_STATUS_E_INVAL; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand); pMac->roam.configParam.eBand = eBand; pMac->roam.configParam.bandCapability = eBand; @@ -2462,8 +2462,8 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) if ((dfsChan->dfs_channel_number == chnNum) && (dfsChan->radar_status_flag == eSAP_DFS_CHANNEL_UNAVAILABLE)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("channel %d is in dfs nol"), chnNum); status = QDF_STATUS_E_FAILURE; @@ -2473,7 +2473,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum) } if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("channel %d is not available"), chnNum); } @@ -2824,7 +2824,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, "Session ID:%d is not valid", sessionId); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } pSession = CSR_GET_SESSION(pMac, sessionId); @@ -3040,7 +3040,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, } else if (eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT == NewSubstate) { reasonCode = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("set to reason code eSIR_MAC_DISASSOC_LEAVING_BSS_REASON" " and set back NewSubstate")); @@ -3369,7 +3369,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, tDot11fBeaconIEs *pIes) { eCsrCfgDot11Mode cfgDot11Mode; - CDF_ASSERT(pIes != NULL); + QDF_ASSERT(pIes != NULL); if (pIes == NULL) return QDF_STATUS_E_FAILURE; @@ -3605,7 +3605,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "csr_roam_get_qos_info_from_bss() failed"); break; } @@ -3854,7 +3854,7 @@ static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, uint16_t rateBitmap = 0; cdf_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0); cdf_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0); - CDF_ASSERT(pIes != NULL); + QDF_ASSERT(pIes != NULL); if (NULL == pIes) { sms_log(pMac, LOGE, FL("failed to parse BssDesc")); @@ -3927,7 +3927,7 @@ static void csr_set_cfg_rate_set(tpAniSirGlobal pMac, eCsrPhyMode phyMode, uint32_t ExtendedOperationalRatesLength = 0; uint8_t MCSRateIdxSet[SIZE_OF_SUPPORTED_MCS_SET]; uint32_t MCSRateLength = 0; - CDF_ASSERT(pIes != NULL); + QDF_ASSERT(pIes != NULL); if (NULL != pIes) { csr_is_phy_mode_match(pMac, phyMode, pBssDesc, pProfile, &cfgDot11Mode, pIes); @@ -4155,7 +4155,7 @@ void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result) #ifdef WLAN_FEATURE_ROAM_OFFLOAD pSession = &pMac->roam.roamSession[sessionId]; if (pSession->roam_synch_in_progress) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3:csr_roam_cfg_set_callback"); } #endif @@ -5243,7 +5243,7 @@ void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result, tListElem *pEntry; tSmeCmd *pCommand; bool fReleaseCommand = true; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: Roam Completion ...", __func__); pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (pEntry) { @@ -5654,14 +5654,14 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) tCsrRoamSession *session = &mac->roam.roamSession[session_id]; /* Clean up the roam synch in progress for LFR3 */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Roam Synch Failed, Clean Up", __func__); session->roam_synch_in_progress = false; roam_offload_failed = cdf_mem_malloc( sizeof(struct roam_offload_synch_fail)); if (NULL == roam_offload_failed) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: unable to allocate memory for roam synch fail" , __func__); return; @@ -5673,7 +5673,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) msg.bodyptr = roam_offload_failed; if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", __func__); cdf_mem_free(roam_offload_failed); @@ -6259,8 +6259,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (session->roam_synch_in_progress && (roam_offload_params->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE, session_id); @@ -6319,8 +6319,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (context) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); #endif csr_roam_free_connected_info(mac_ctx, @@ -6472,8 +6472,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info.replay_ctr, roam_offload_params->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL ("LFR3: Copy KCK, KEK and Replay Ctr")); } @@ -6504,8 +6504,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); } @@ -6632,7 +6632,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, roam_info.staId = session->connectedInfo.staId; roam_info.u.pConnectedProfile = &session->connectedProfile; if (0 == roam_info.staId) - CDF_ASSERT(0); + QDF_ASSERT(0); session->bRefAssocStartCnt--; csr_roam_call_callback(mac_ctx, session_id, &roam_info, @@ -6988,7 +6988,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId, /* We need to free the BssList when the command is done */ pCommand->u.roamCmd.fReleaseBssList = true; pCommand->u.roamCmd.fUpdateCurRoamProfile = true; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d"), pCommand->u.roamCmd.roamProfile.csrPersona); status = csr_queue_sme_command(pMac, pCommand, fImediate); @@ -7553,7 +7553,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma && (eSIR_MAC_DISASSOC_LEAVING_BSS_REASON == pCommand->u.roamCmd.reason)) { NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("set to substate eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT")); } @@ -7698,7 +7698,7 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session pCommand->u.roamCmd.roamReason = eCsrForcedDisassoc; pCommand->u.roamCmd.reason = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL ("SME convert to internal reason code eCsrStaHasLeft")); break; @@ -7811,7 +7811,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -7977,12 +7977,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, if (pSmeJoinRsp) { session_ptr = CSR_GET_SESSION(pMac, pSmeJoinRsp->sessionId); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Sme Join Response is NULL")); return; } if (!session_ptr) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session %d not found"), pSmeJoinRsp->sessionId); return; } @@ -8055,13 +8055,13 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, * ***************************************************/ if (session_ptr->join_bssid_count >= CSR_MAX_BSSID_COUNT) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Excessive Join Req Failures")); if (is_dis_pending) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("disconnect is pending, complete roam")); session_ptr->join_bssid_count = 0; @@ -8097,7 +8097,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); /* Set the roaming substate to 'join attempt'... */ csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); /* attempt to Join this BSS... */ return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, pIes, @@ -8436,7 +8436,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, if (NULL == scan_result) { /* If we are roaming TO an Infrastructure BSS... */ - CDF_ASSERT(scan_result != NULL); + QDF_ASSERT(scan_result != NULL); return; } @@ -8539,7 +8539,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, uint32_t roamId = 0; if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("CSR SmeReassocReq Successful")); result = eCsrReassocSuccess; /* @@ -8786,7 +8786,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, csr_ser_des_unpack_diassoc_rsp((uint8_t *) pSmeRsp, &SmeDisassocRsp); sessionId = SmeDisassocRsp.sessionId; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"), sessionId); if (csr_is_conn_state_infra(pMac, sessionId)) { @@ -8815,7 +8815,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, } csr_roam_complete(pMac, eCsrNothingToJoin, NULL); } else if (CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("CSR SmeDisassocReq due to HO on session %d"), sessionId); pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId]; @@ -9014,7 +9014,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) pSmeRsp->sessionId) || CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, pSmeRsp->sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("eWNI_SME_DISASSOC_RSP subState = %s"), mac_trace_getcsr_roam_sub_state( pMac->roam.curSubState[pSmeRsp->sessionId])); @@ -9378,7 +9378,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI) tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -9597,7 +9597,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, if (profile->SSIDs.numOfSSIDs) { scan_fltr->SSIDs.numOfSSIDs = profile->SSIDs.numOfSSIDs; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("No of Allowed List:%d"), roam_params->num_ssid_allowed_list); if (scan_fltr->scan_filter_for_roam @@ -9778,14 +9778,14 @@ static QDF_STATUS csr_send_snr_request(void *pGetRssiReq) wma_handle = cds_get_context(QDF_MODULE_ID_WMA); if (!wma_handle) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "wma_handle is NULL"); return QDF_STATUS_E_FAILURE; } if (QDF_STATUS_SUCCESS != wma_send_snr_request(wma_handle, pGetRssiReq)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to Trigger wma stats request"); return QDF_STATUS_E_FAILURE; } @@ -10955,7 +10955,7 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac, pSession->bRefAssocStartCnt--; if (0 != pSession->bRefAssocStartCnt) { - CDF_ASSERT(pSession->bRefAssocStartCnt == 0); + QDF_ASSERT(pSession->bRefAssocStartCnt == 0); return; } /* Need to call association_completion because there is an assoc_start pending. */ @@ -11249,7 +11249,7 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId, if (pCommand) { roamId = pCommand->u.roamCmd.roamId; if (sessionId != pCommand->sessionId) { - CDF_ASSERT(sessionId == pCommand->sessionId); + QDF_ASSERT(sessionId == pCommand->sessionId); return; } } @@ -11258,7 +11258,7 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_complete_roaming(pMac, sessionId, fSuccess, roamResult); } else { if (pSession->bRefAssocStartCnt != 0) { - CDF_ASSERT(pSession->bRefAssocStartCnt == 0); + QDF_ASSERT(pSession->bRefAssocStartCnt == 0); return; } sms_log(pMac, LOGW, @@ -11859,7 +11859,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) else status = QDF_STATUS_SUCCESS; if (status != QDF_STATUS_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("%s: failed to allocate memory, status = %d"), __FUNCTION__, status); goto error; @@ -12356,10 +12356,10 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac, || (pProfile->csrPersona == QDF_P2P_GO_MODE)) && (pParam->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11B)) { /* This should never happen */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, FL("For P2P (persona %d) dot11_mode is 11B"), pProfile->csrPersona); - CDF_ASSERT(0); + QDF_ASSERT(0); } nw_type = csr_convert_mode_to_nw_type(pParam->uCfgDot11Mode, band); @@ -13243,7 +13243,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, /* send stop_bss to PE, before we can continue. */ if (csr_is_conn_state_wds(pMac, sessionId)) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); @@ -13446,7 +13446,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, #endif csr_join_req->staPersona = (uint8_t) pProfile->csrPersona; csr_join_req->cbMode = (uint8_t) pSession->bssParams.cbMode; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("CSR PERSONA=%d CSR CbMode %d"), pProfile->csrPersona, pSession->bssParams.cbMode); csr_join_req->uapsdPerAcBitmask = pProfile->uapsd_mask; @@ -13926,8 +13926,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, roam.configParam.is_sta_connection_in_5gz_enabled) && CDS_IS_CHANNEL_5GHZ(pBssDescription-> channelId)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("STA-conn on 5G isn't allowed")); status = QDF_STATUS_E_FAILURE; break; @@ -13969,8 +13969,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (eWNI_SME_JOIN_REQ == messageType) { /* Notify QoS module that join happening */ pSession->join_bssid_count++; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, "BSSID Count = %d", pSession->join_bssid_count); sme_qos_csr_event_ind(pMac, (uint8_t) sessionId, @@ -14847,8 +14847,8 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, /* get the HT capability info */ if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &value) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_QDF, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_QDF, + QDF_TRACE_LEVEL_ERROR, "%s: could not get HT capability info", __func__); break; @@ -15366,7 +15366,7 @@ void csr_roam_stats_client_timer_handler(void *pv) tCsrStatsClientReqInfo *pStaEntry = (tCsrStatsClientReqInfo *) pv; if (QDF_TIMER_STATE_STOPPED == qdf_mc_timer_get_current_state(&pStaEntry->timer)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("roam stats client timer is stopped")); } } @@ -15450,7 +15450,7 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, } else { sms_log(mac, LOGE, FL("out bound staId:%d. failed to copy PerSta stats"), sme_stats_rsp->staId); - CDF_ASSERT(0); + QDF_ASSERT(0); } *stats += sizeof(tCsrPerStaStatsInfo); *length -= sizeof(tCsrPerStaStatsInfo); @@ -15660,7 +15660,7 @@ void csr_roam_vcc_trigger(tpAniSirGlobal pMac) ul_mac_loss_trigger_threshold = pMac->roam.configParam.vccUlMacLossThreshold; if (0 == ul_mac_loss_trigger_threshold) { - CDF_ASSERT(ul_mac_loss_trigger_threshold != 0); + QDF_ASSERT(ul_mac_loss_trigger_threshold != 0); return; } sms_log(pMac, LOGW, "csr_roam_vcc_trigger: UL_MAC_LOSS_THRESHOLD is %d", @@ -16221,13 +16221,13 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, nStatus = dot11f_get_packed_probe_request_size(pMac, &pr, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to calculate the packed size f" "or a Probe Request (0x%08x).\n", nStatus); nPayload = sizeof(tDot11fProbeRequest); } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "There were warnings while calculating" "the packed size for a Probe Request (" "0x%08x).\n", nStatus); @@ -16245,7 +16245,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, selfMacAddr); if (eSIR_SUCCESS != nSirStatus) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to populate the buffer descriptor for a Probe Request (%d).\n", nSirStatus); return nSirStatus; @@ -16255,12 +16255,12 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, sizeof(tSirMacMgmtHdr), nPayload, &nPayload); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Failed to pack a Probe Request (0x%08x).\n", nStatus); return eSIR_FAILURE; } else if (DOT11F_WARNED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "There were warnings while packing a Probe Request (0x%08x).\n", nStatus); } @@ -16300,7 +16300,7 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, cdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, sizeof(req_buf->PSK_PMK)); req_buf->pmk_len = session->pmk_len; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3: PMK Length = %d", req_buf->pmk_len); req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; cdf_mem_copy(req_buf->R0KH_ID, @@ -16384,7 +16384,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx, band = mac_ctx->roam.configParam.bandCapability; if ((eCSR_BAND_24 != band) && (eCSR_BAND_5G != band) && (eCSR_BAND_ALL != band)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Invalid band(%d), roam scan offload req aborted"), band); return QDF_STATUS_E_FAILURE; @@ -16432,7 +16432,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, uint8_t num_channels = 0; uint8_t *ch_lst = mac_ctx->scan.occupiedChannels[session_id].channelList; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Num of channels before filtering=%d", mac_ctx->scan.occupiedChannels[session_id].numChannels); for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels; @@ -16445,7 +16445,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, *ch_lst; } if (*ch_lst) - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "DFSRoam=%d, ChnlState=%d, Chnl=%d, num_ch=%d", mac_ctx->roam.configParam.allowDFSChannelRoam, cds_get_channel_state(*ch_lst), *ch_lst, @@ -16533,7 +16533,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx, mac_ctx->roam.validChannelList, &host_channels); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to get the valid channel list")); return status; } @@ -16592,7 +16592,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, req_buf = cdf_mem_malloc(sizeof(tSirRoamOffloadScanReq)); if (NULL == req_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Mem alloc for roam scan offload req failed.")); return NULL; } @@ -16672,7 +16672,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, eCSR_AUTH_TYPE_OPEN_SYSTEM) || (csr_is_auth_type_ese(req_buf-> ConnectedNetwork.authentication))); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:IsEseAssoc=%d\n"), req_buf->IsESEAssoc); #endif if (ese_neighbor_list_recvd || curr_ch_lst_info->numOfChannels == 0) { @@ -16712,7 +16712,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, } else break; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("ChnlCacheType:%d, No of Chnls:%d,Channels: %s"), req_buf->ChannelCacheType, req_buf->ConnectedNetwork.ChannelCount, ch_cache_str); @@ -16741,14 +16741,14 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, */ if (req_buf->HomeAwayTime < (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d). Hence enforcing home away time to disable (0)"), req_buf->HomeAwayTime, (req_buf->NeighborScanChannelMaxTime + (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))); req_buf->HomeAwayTime = 0; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("HomeAwayTime:%d"), req_buf->HomeAwayTime); /*Prepare a probe request for 2.4GHz band and one for 5GHz band */ @@ -16773,7 +16773,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.early_stop_scan_min_threshold; req_buf->early_stop_scan_max_threshold = mac_ctx->roam.configParam.early_stop_scan_max_threshold; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("EarlyStopFeature Enable=%d, MinThresh=%d, MaxThresh=%d"), req_buf->early_stop_scan_enable, req_buf->early_stop_scan_min_threshold, @@ -16812,7 +16812,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, cdf_mem_compare(roam_params->ssid_allowed_list[i].ssId, req_buffer->ConnectedNetwork.ssId.ssId, roam_params->ssid_allowed_list[i].length)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Whitelist contains connected profile SSID"); match = true; break; @@ -16821,11 +16821,11 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, if (!match) { if (roam_params->num_ssid_allowed_list >= MAX_SSID_ALLOWED_LIST) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Whitelist is FULL. Cannot Add another entry"); return; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Adding Connected profile SSID to whitelist"); /* i is the next available index to add the entry.*/ i = roam_params->num_ssid_allowed_list; @@ -16893,7 +16893,7 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command, desiredMask = RSO_ABORT_SCAN_ALLOW_MASK; break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Wrong RSO command %d, not allowed"), command); return 0;/*Cmd Not allowed*/ } @@ -16930,7 +16930,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, uint8_t op_channel; if (NULL == session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session is null")); return QDF_STATUS_E_FAILURE; } @@ -16952,7 +16952,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, } if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) && reason != REASON_ROAM_SET_BLACKLIST_BSSID) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("RSO out-of-sync command %d lastSentCmd %d"), command, roam_info->last_sent_cmd); return QDF_STATUS_E_FAILURE; @@ -16979,7 +16979,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, (reason != REASON_ROAM_SET_BLACKLIST_BSSID)) { state = mac_trace_get_neighbour_roam_state( roam_info->neighborRoamState); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("Scan Command not sent to FW state=%s and cmd=%d"), state, command); return QDF_STATUS_E_FAILURE; @@ -16989,7 +16989,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, session_id, reason, session, roam_info); if (!req_buf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to create req packet")); return QDF_STATUS_E_FAILURE; } @@ -17016,7 +17016,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, */ if (roam_params_src->rssi_diff) req_buf->RoamRssiDiff = roam_params_src->rssi_diff; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "num_bssid_avoid_list: %d, num_ssid_allowed_list: %d, " "num_bssid_favored: %d, raise_rssi_thresh_5g: %d, " "drop_rssi_thresh_5g: %d, raise_rssi_type_5g: %d, " @@ -17037,18 +17037,18 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, req_buf->RoamRssiDiff, roam_params_dst->alert_rssi_threshold); for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Blacklist Bssid: ("MAC_ADDRESS_STR")", MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes)); } for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Whitelist: %.*s", roam_params_dst->ssid_allowed_list[i].length, roam_params_dst->ssid_allowed_list[i].ssId); } for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Preferred Bssid: ("MAC_ADDRESS_STR") score: %d", MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes), roam_params_dst->bssid_favored_factor[i]); @@ -17068,14 +17068,14 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, * to connect to a better 5GHz AP is available. */ if (CDS_IS_CHANNEL_5GHZ(op_channel)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Disabling HI_RSSI feature as connected AP is 5GHz"); req_buf->hi_rssi_scan_rssi_delta = 0; } else { req_buf->hi_rssi_scan_rssi_delta = roam_info->cfgParams.hi_rssi_scan_rssi_delta; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "hi_rssi:delta=%d, max_count=%d, delay=%d, ub=%d", req_buf->hi_rssi_scan_rssi_delta, req_buf->hi_rssi_scan_max_count, @@ -17087,7 +17087,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, msg.bodyptr = req_buf; if (!QDF_IS_STATUS_SUCCESS (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post message to WMA", __func__); cdf_mem_free(req_buf); @@ -17101,7 +17101,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, /* update the last sent cmd */ roam_info->last_sent_cmd = command; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Roam Scan Offload Command %d, Reason %d", command, reason); return status; } @@ -17111,7 +17111,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, { switch (scanOffloadRsp->reason) { case 0: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Rsp for Roam Scan Offload with failure status"); break; case REASON_OS_REQUESTED_ROAMING_NOW: @@ -17120,7 +17120,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Rsp for Roam Scan Offload with reason %d", scanOffloadRsp->reason); } @@ -17505,7 +17505,7 @@ void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) sme_release_command(pMac, pCommand); } else { sms_log(pMac, LOGE, FL("no pending commands")); - CDF_ASSERT(0); + QDF_ASSERT(0); } } @@ -17517,7 +17517,7 @@ QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand, if (!SME_IS_START(pMac)) { sms_log(pMac, LOGE, FL("Sme in stop state")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_PERM; } @@ -18305,13 +18305,13 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) if (pSmeHOFailInd) sessionId = pSmeHOFailInd->sessionId; else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "LFR3: Hand-Off Failure Ind is NULL"); return; } /* Roaming is supported only on Infra STA Mode. */ if (!csr_roam_is_sta_mode(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "LFR3:HO Fail cannot be handled for session %d", sessionId); return; @@ -18319,7 +18319,7 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf) csr_roam_synch_clean_up(pMac, sessionId); csr_roaming_report_diag_event(pMac, NULL, eCSR_REASON_ROAM_HO_FAIL); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "LFR3:Issue Disconnect on session %d", sessionId); csr_roam_disconnect(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); } @@ -18475,7 +18475,7 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *sap_session; if (0 == chnl) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("channel is zero, connection not allowed")); return false; @@ -18487,7 +18487,7 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) if ((0 != sap_session->bssParams.operationChn) && (sap_session->bssParams.operationChn != chnl)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18515,7 +18515,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) tCsrRoamSession *p2pgo_session; if (0 == chnl) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("channel is zero, connection not allowed")); return false; @@ -18530,7 +18530,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl) (p2pgo_session->bssParams.operationChn != chnl)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Can't allow STA to connect, chnls not same")); return false; @@ -18570,7 +18570,7 @@ bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx, if (NULL != bss_list) { csr_scan_result_purge(mac_ctx, sta_session->stored_roam_profile.bsslist_handle); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("bss list is released for session %d"), session_id); sta_session->stored_roam_profile.bsslist_handle = NULL; } @@ -18659,7 +18659,7 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx, sta_session->stored_roam_profile.imediate_flag, sta_session->stored_roam_profile.clear_flag); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("CSR failed issuing connect cmd with status = 0x%08X"), status); @@ -18982,7 +18982,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, session->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED; roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo)); if (NULL == roam_info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR3: Mem Alloc failed for roam info")); session->roam_synch_in_progress = false; sme_release_global_lock(&mac_ctx->sme); @@ -19030,8 +19030,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } if ((roam_synch_data->authStatus == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL("LFR3:Don't start waitforkey timer")); csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE, session_id); @@ -19081,8 +19081,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, SIR_MAC_HDR_LEN_3A, roam_info->nAssocRspLength); - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL("LFR3:Clear Connected info")); csr_roam_free_connected_info(mac_ctx, &session->connectedInfo); @@ -19153,7 +19153,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, cdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN); cdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr, SIR_REPLAY_CTR_LEN); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR3: Copy KCK, KEK and Replay Ctr")); roam_info->subnet_change_status = CSR_GET_SUBNET_STATUS(roam_synch_data->roamReason); @@ -19164,8 +19164,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, csr_reset_bkid_candidate_list(mac_ctx, session_id); #endif if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, FL ("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up")); csr_roam_link_up(mac_ctx, conn_profile->bssid); diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index b52a17ce1530..c587ca589e13 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -303,7 +303,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, { uint8_t idx, lst_sz = 0; - CDF_ASSERT(scan_cmd && scan_req); + QDF_ASSERT(scan_cmd && scan_req); /* To silence the KW tool null check is added */ if ((scan_cmd == NULL) || (scan_req == NULL)) { sms_log(mac_ctx, LOGE, @@ -388,7 +388,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, if (csr_session == NULL) { sms_log(mac_ctx, LOGE, FL("session %d not found"), session_id); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -492,7 +492,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, if (scan_req == NULL) { sms_log(pMac, LOGE, FL("scan_req is NULL")); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } @@ -1739,7 +1739,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter) pMac->scan.inScanResultBestAPRssi = -128; roam_params = &pMac->roam.configParam.roam_params; #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("nSelect5GHzMargin")); #endif csr_ll_lock(&pMac->scan.scanResultList); @@ -1809,7 +1809,7 @@ csr_save_ies(tpAniSirGlobal pMac, *fMatch = csr_match_bss(pMac, &pBssDesc->Result.BssDescriptor, pFilter, auth, uc, mc, &pIes); #ifdef WLAN_DEBUG_ROAM_OFFLOAD - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("csr_match_bss fmatch %d"), *fMatch); #endif if (NULL == pIes) @@ -2006,7 +2006,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac, } if (QDF_STATUS_E_FAILURE == status) - sms_log(pMac, CDF_TRACE_LEVEL_ERROR, + sms_log(pMac, QDF_TRACE_LEVEL_ERROR, FL("Retrieving pcl failed from HDD")); pEntry = csr_ll_peek_head(&pMac->scan.scanResultList, LL_ACCESS_NOLOCK); while (pEntry) { @@ -2949,7 +2949,7 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac, pBSSDescription, cbBSSDesc); #if defined(CDF_ENSBALED) if (NULL != pCsrBssDescription->Result.pvIes) { - CDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL); + QDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL); return NULL; } #endif @@ -3322,7 +3322,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) * pick random.we can put some more intelligence - TBD */ if (maxVotes < pMac->scan.votes11d[i].votes) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, " Votes for Country %c%c : %d\n", pMac->scan.votes11d[i].countryCode[0], pMac->scan.votes11d[i].countryCode[1], @@ -3341,7 +3341,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) cdf_mem_copy(pMac->scan.countryCode11d, pMac->scan.votes11d[j].countryCode, WNI_CFG_COUNTRY_CODE_LEN); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Selected Country is %c%c With count %d\n", pMac->scan.votes11d[j].countryCode[0], pMac->scan.votes11d[j].countryCode[1], @@ -6300,15 +6300,15 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, uint32_t dataLen = sizeof(uint8_t) * NumChannels; QDF_STATUS status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: dump valid channel list(NumChannels(%d))", __func__, NumChannels); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, pChannelList, NumChannels); cfg_set_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, pChannelList, dataLen); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Scan offload is enabled, update default chan list"); /* * disable fcc constraint since new country code @@ -6317,7 +6317,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList, pMac->scan.fcc_constraint = false; status = csr_update_channel_list(pMac); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "failed to update the supported channel list"); } return; @@ -6507,10 +6507,10 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: dump scan control list", __func__); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, pControlList, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, pControlList, len); cfg_set_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, @@ -7118,7 +7118,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET); scan_res_ptr = cdf_mem_malloc(sizeof(tCsrScanResult) + length); if (scan_res_ptr == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); return QDF_STATUS_E_NOMEM; } @@ -7133,7 +7133,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, pMac, &scan_res_ptr->Result. BssDescriptor, &ies_local_ptr)))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Cannot Parse IEs", __func__); csr_free_scan_result_entry(pMac, scan_res_ptr); return QDF_STATUS_E_RESOURCES; @@ -7143,7 +7143,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, &scan_res_ptr->Result.BssDescriptor, ies_local_ptr, &tmpSsid, &timer, true); if (CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:BSS Limit Exceed", __func__); if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr) cdf_mem_free(ies_local_ptr); @@ -7174,12 +7174,12 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, tScanResultList *bss_list = (tScanResultList *)result_handle; if (NULL == bss_list) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Empty bss_list")); return NULL; } if (csr_ll_is_list_empty(&bss_list->List, LL_ACCESS_NOLOCK)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("bss_list->List is empty")); cdf_mem_free(bss_list); return NULL; @@ -7215,12 +7215,12 @@ void csr_scan_active_list_timeout_handle(void *userData) QDF_STATUS status = QDF_STATUS_SUCCESS; if (scan_cmd == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Scan Timeout: Scan command is NULL")); return; } if (hal_ctx == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("HAL Context is NULL")); return; } diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c index 0eb96e2d1ea9..436593606097 100644 --- a/core/sme/src/csr/csr_cmd_process.c +++ b/core/sme/src/csr/csr_cmd_process.c @@ -173,7 +173,7 @@ bool csr_check_ps_ready(void *pv) tpAniSirGlobal pMac = PMAC_STRUCT(pv); if (pMac->roam.sPendingCommands < 0) { - CDF_ASSERT(pMac->roam.sPendingCommands >= 0); + QDF_ASSERT(pMac->roam.sPendingCommands >= 0); return 0; } return pMac->roam.sPendingCommands == 0; @@ -183,7 +183,7 @@ bool csr_check_ps_offload_ready(void *pv, uint32_t sessionId) { tpAniSirGlobal pMac = PMAC_STRUCT(pv); - CDF_ASSERT(pMac->roam.sPendingCommands >= 0); + QDF_ASSERT(pMac->roam.sPendingCommands >= 0); return pMac->roam.sPendingCommands == 0; } diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 20b02f8685ab..4241ee51ef44 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -35,7 +35,7 @@ #include "csr_link_list.h" #include "qdf_lock.h" #include "cdf_memory.h" -#include "cdf_trace.h" +#include "qdf_trace.h" #include "qdf_mc_timer.h" static inline void csr_list_init(tListElem *pList) @@ -107,7 +107,7 @@ void csr_list_insert_entry(tListElem *pEntry, tListElem *pNewEntry) { tListElem *pLast; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pEntry is Null", __func__); return; } @@ -124,7 +124,7 @@ uint32_t csr_ll_count(tDblLinkList *pList) uint32_t c = 0; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return c; } @@ -140,7 +140,7 @@ void csr_ll_lock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -154,7 +154,7 @@ void csr_ll_unlock(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -169,7 +169,7 @@ bool csr_ll_is_list_empty(tDblLinkList *pList, bool fInterlocked) bool fEmpty = true; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fEmpty; } @@ -194,7 +194,7 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) tListElem *pEntry; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -223,7 +223,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) QDF_STATUS qdf_status; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -247,7 +247,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList) void csr_ll_close(tDblLinkList *pList) { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -264,7 +264,7 @@ void csr_ll_insert_tail(tDblLinkList *pList, tListElem *pEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -286,7 +286,7 @@ void csr_ll_insert_head(tDblLinkList *pList, tListElem *pEntry, { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -312,7 +312,7 @@ void csr_ll_insert_entry(tDblLinkList *pList, tListElem *pEntry, tListElem *pNewEntry, bool fInterlocked) { if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -334,7 +334,7 @@ tListElem *csr_ll_remove_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -362,7 +362,7 @@ tListElem *csr_ll_peek_tail(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -388,7 +388,7 @@ tListElem *csr_ll_remove_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -416,7 +416,7 @@ tListElem *csr_ll_peek_head(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pEntry; } @@ -442,7 +442,7 @@ void csr_ll_purge(tDblLinkList *pList, bool fInterlocked) tListElem *pEntry; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return; } @@ -468,7 +468,7 @@ bool csr_ll_remove_entry(tDblLinkList *pList, tListElem *pEntryToRemove, tListElem *pEntry; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return fFound; } @@ -510,7 +510,7 @@ tListElem *csr_ll_next(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } @@ -543,7 +543,7 @@ tListElem *csr_ll_previous(tDblLinkList *pList, tListElem *pEntry, tListElem *pNextEntry = NULL; if (!pList) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Error!! pList is Null", __func__); return pNextEntry; } diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 1fad09f45e4b..60599908bd22 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -66,7 +66,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; \ mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; \ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \ + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, \ FL("Sessionid (%d) NeighborRoam transition from %s to %s"), \ session, csr_neighbor_roam_state_to_string( \ mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState),\ @@ -876,7 +876,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, if (false != neighbor_roam_info->FTRoamInfo.preauthRspPending) { /* This must not be true here */ - CDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == + QDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == false); return QDF_STATUS_E_FAILURE; } @@ -1170,7 +1170,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, CSR_NEIGHBOR_ROAM_STATE_TRANSITION (pMac, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id) neighbor_roam_info_ptr->FTRoamInfo.numPreAuthRetries = 0; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); return QDF_STATUS_SUCCESS; @@ -1201,7 +1201,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, struct roam_ext_params *roam_params; uint8_t num_ch = 0; - CDF_ASSERT(pScanFilter != NULL); + QDF_ASSERT(pScanFilter != NULL); if (pScanFilter == NULL) return QDF_STATUS_E_FAILURE; @@ -1232,7 +1232,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, &nbr_roam_info->handoffReqInfo.bssid); } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("No of Allowed SSID List:%d"), roam_params->num_ssid_allowed_list); if (roam_params->num_ssid_allowed_list) { @@ -1445,7 +1445,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, if (NULL == scan_result) break; descr = &scan_result->BssDescriptor; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("Scan result: BSSID " MAC_ADDRESS_STR " (Rssi %ld, Ch:%d)"), MAC_ADDR_ARRAY(descr->bssId), @@ -1458,8 +1458,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * currently associated AP. Do not have this * in the roamable AP list */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "SKIP-currently associated AP"); continue; } @@ -1474,8 +1474,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, sizeof(tSirMacAddr))) || (descr->channelId != n_roam_info->handoffReqInfo.channel))) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "SKIP-not a candidate AP for OS requested roam"); continue; } @@ -1508,15 +1508,15 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, n_roam_info->MinQBssLoadRequired); if (voadmitted && qpresent && (qavail < n_roam_info->MinQBssLoadRequired)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no bandwidth, ignoring", MAC_ADDR_ARRAY(descr->bssId)); continue; } if (voadmitted && !qpresent) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "BSSID : " MAC_ADDRESS_STR " has no QBSS LOAD IE, ignoring", MAC_ADDR_ARRAY(descr->bssId)); continue; @@ -1541,8 +1541,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, descr->nReceivedTime; if (age_constraint == true && age_ticks > limit_ticks) { num_dropped++; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_WARN, FL("Old AP (probe rsp/beacon) skipped.") ); continue; @@ -1587,7 +1587,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * iterations and no candidate were found */ if (age_constraint == false) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: No roam able candidates found", __func__); break; @@ -1713,7 +1713,7 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1774,13 +1774,13 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, return QDF_STATUS_E_INVAL; if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Input Channels %d", __func__, inputNumOfChannels); return QDF_STATUS_E_INVAL; } if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Wrong Number of Output Channels %d", __func__, outputNumOfChannels); return QDF_STATUS_E_INVAL; @@ -1793,8 +1793,8 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } if (j == outputNumOfChannels) { if (pInputChannelList[i]) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding extra %d to Neighbor channel list", __func__, pInputChannelList[i]); pOutputChannelList[numChannels] = @@ -1803,7 +1803,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac, } } if (numChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Merge Neighbor channel list reached Max " "limit %d", __func__, numChannels); break; @@ -1885,8 +1885,8 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba get_rf_band(pNeighborBssDesc-> pNeighborBssDescription-> channel)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list (Same band)\n", __func__, pNeighborBssDesc-> @@ -1899,8 +1899,8 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba numChannels++; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "%s: [INFOLOG] Adding %d to Neighbor channel list\n", __func__, pNeighborBssDesc-> @@ -2212,7 +2212,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) * clear all the whitelist parameters and remaining * needs to be retained across connections. */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("Roaming parameters are reset")); roam_params = &mac_ctx->roam.configParam.roam_params; roam_params->num_ssid_allowed_list = 0; @@ -2246,7 +2246,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("pSession is NULL")); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Disconn ind on session %d in state %d from bss :" MAC_ADDRESS_STR), sessionId, pNeighborRoamInfo->neighborRoamState, @@ -2454,7 +2454,7 @@ static void csr_neighbor_roam_info_ctx_init( * down to firmware.Do not send the START command for * other session connections.*/ if (!csr_roam_is_sta_mode(pMac, session_id)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Wrong Mode %d", session->connectedProfile.BSSType); return; @@ -2463,8 +2463,8 @@ static void csr_neighbor_roam_info_ctx_init( #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (session->roam_synch_in_progress) { if (pMac->roam.pReassocResp != NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_DEBUG, "Free Reassoc Rsp"); cdf_mem_free(pMac->roam.pReassocResp); pMac->roam.pReassocResp = NULL; @@ -2535,11 +2535,11 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( if (session->roam_synch_in_progress && (eSIR_ROAM_AUTH_STATUS_AUTHENTICATED == session->roam_synch_data->authStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3:csr_neighbor_roam_indicate_connect"); msg = cdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq)); if (msg == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); return QDF_STATUS_E_NOMEM; } @@ -2905,7 +2905,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, uint32_t roamid = 0; QDF_STATUS status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", __func__, session_id); if (neighbor_roam_info->neighborRoamState != @@ -2919,11 +2919,11 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx, &handoff_node, session_id)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("failed to obtain handoff AP")); return; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); @@ -2949,7 +2949,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, status = csr_roam_copy_connected_profile(mac_ctx, session_id, &neighbor_roam_info->csrNeighborRoamProfile); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("csr_roam_copy_connected_profile failed %d"), status); return; @@ -3037,7 +3037,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo bss_node = NULL; if (NULL == hand_off_node) { - CDF_ASSERT(NULL != hand_off_node); + QDF_ASSERT(NULL != hand_off_node); return false; } if (ngbr_roam_info->is11rAssoc) { @@ -3124,7 +3124,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM tCsrRoamSession *session = CSR_GET_SESSION(pMac, sessionId); if (!session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("session is NULL")); return; } diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index b6e2476d7698..fa9657931d6a 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -114,7 +114,7 @@ QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, if (NULL == tdlsSendMgmtCmdInfo->buf) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("Alloc Failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } cdf_mem_copy(tdlsSendMgmtCmdInfo->buf, tdlsSendMgmt->buf, @@ -361,7 +361,7 @@ QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type, pMsg->type = msg_type; pMsg->msgLen = (uint16_t) (msg_size); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, ("sending msg = %d"), pMsg->type); /* Send message. */ if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) { @@ -399,7 +399,7 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } tdlsSendMgmtReq->sessionId = cmd->sessionId; @@ -467,7 +467,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } tdlsAddStaReq->sessionId = cmd->sessionId; @@ -538,7 +538,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("alloc failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } tdlsDelStaReq->sessionId = cmd->sessionId; @@ -631,7 +631,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) if (tdlsLinkEstablishReq == NULL) { sms_log(pMac, LOGE, FL("alloc failed")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } tdlsLinkEstablishReq->sessionId = cmd->sessionId; @@ -772,7 +772,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_DISCOVER: qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -784,7 +784,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_SHOULD_TEARDOWN: qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), @@ -796,7 +796,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, case eWNI_SME_TDLS_PEER_DISCONNECTED: qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac); roamInfo.reasonCode = tevent->peer_reason; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: " MAC_ADDRESS_STR " peer_reason: %d", __func__, MAC_ADDR_ARRAY(tevent->peermac.bytes), diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 87dba98af6f4..3107e086de4e 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1185,7 +1185,7 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, eCsrMediaAccessType qosType = eCSR_MEDIUM_ACCESS_DCF; if (NULL == pIes) { - CDF_ASSERT(pIes != NULL); + QDF_ASSERT(pIes != NULL); return qosType; } @@ -1259,7 +1259,7 @@ QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, } } else { sms_log(pMac, LOGE, FL(" failed to allocate memory")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } } @@ -1898,8 +1898,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, switch (cur_bss_persona) { case QDF_STA_MODE: - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("** STA session **")); return QDF_STATUS_SUCCESS; @@ -1909,8 +1909,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, && (connect_state != temp)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; #endif @@ -1921,8 +1921,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; if ((bss_persona == QDF_IBSS_MODE) && (connect_state != temp)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Can't start SAP")); return QDF_STATUS_E_FAILURE; } @@ -1931,8 +1931,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, if ((bss_persona == QDF_IBSS_MODE) && (connect_state == eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("IBSS mode already exist")); return QDF_STATUS_E_FAILURE; } else if (((bss_persona == QDF_P2P_GO_MODE) || @@ -1941,21 +1941,21 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid, eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) { /* allow IBSS+SAP for Emulation only */ #ifndef QCA_WIFI_3_0_EMU - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Can't start GO/SAP")); return QDF_STATUS_E_FAILURE; #endif } break; case QDF_P2P_CLIENT_MODE: - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("**P2P-Client session**")); return QDF_STATUS_SUCCESS; default: - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Persona not handled = %d"), cur_bss_persona); break; @@ -2902,7 +2902,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, apProfileMFPRequired = (pRSNIe->RSN_Cap[0] >> 6) & 0x1; if (*pFilterMFPEnabled && *pFilterMFPCapable && *pFilterMFPRequired && (apProfileMFPCapable == 0)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "AP is not capable to make PMF connection"); return false; } else if (*pFilterMFPEnabled && *pFilterMFPCapable && @@ -2915,7 +2915,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * so if AP is not capable of PMF then drop it. * Don't try to connect with it. */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "we need PMF connection & AP isn't capable to make PMF connection"); return false; } else if (!(*pFilterMFPCapable) && @@ -2926,12 +2926,12 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal, * requires mandatory PMF connections and we are not * capable so this AP is not good choice to connect */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "AP needs PMF connection and we are not capable of pmf connection"); return false; } else if (!(*pFilterMFPEnabled) && *pFilterMFPCapable && (apProfileMFPCapable == 1)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "we don't need PMF connection even though both parties are capable"); return false; } diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index 489e6713ec9f..849d5fb88ace 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -51,7 +51,7 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback) tpAniSirGlobal pMac = NULL; if (NULL == hHal) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("hHal is not valid")); return; } @@ -82,7 +82,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) data = cdf_mem_malloc(data_len); if (data == NULL) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failure")); return QDF_STATUS_E_NOMEM; } @@ -99,7 +99,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) msg.bodyptr = data; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); cdf_mem_free(data); @@ -129,11 +129,11 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg) QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == pMsg) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("msg ptr is NULL")); status = QDF_STATUS_E_FAILURE; } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, FL("SME: Received sme_nan_event")); if (pMac->sme.nanCallback) { pMac->sme.nanCallback(pMac->hHdd, diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 1cab83d7e2b7..3f84dfbc1b6e 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -74,7 +74,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, if (NULL == pMsg) goto error; else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call", + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s call", __func__); cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; @@ -311,7 +311,7 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, tSirMbMsgP2p *pMsg; uint16_t msgLen; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, " %s sends action frame", __func__); msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); pMsg = cdf_mem_malloc(msgLen); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 0342026ab51f..64eb0feacaca 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -516,7 +516,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; uint8_t sessionId; QDF_STATUS status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ /* (note that this will make all sessions invalid) */ @@ -527,7 +527,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* init flow list */ status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize Flow List", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -541,7 +541,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* initialize the session's buffered command list */ status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: %d: cannot initialize cmd list for session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -549,7 +549,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) pSession->readyForPowerSave = true; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: done initializing SME-QoS module", __func__, __LINE__); return QDF_STATUS_SUCCESS; @@ -568,7 +568,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; uint8_t sessionId; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closing down SME-QoS", __func__, __LINE__); /* cleanup control block */ @@ -606,7 +606,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) pSession->sessionActive = false; pSession->readyForPowerSave = true; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: closed down QoS", __func__, __LINE__); return QDF_STATUS_SUCCESS; } @@ -650,18 +650,18 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Setup requested by client on session %d", __func__, __LINE__, sessionId); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_SETUP_FAILURE_RSP; } /* Make sure the session is valid */ if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is invalid", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; @@ -669,14 +669,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, /* Make sure the session is active */ pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Supplied Session ID %d is inactive", __func__, __LINE__, sessionId); status = SME_QOS_STATUS_SETUP_FAILURE_RSP; } else { /* Assign a Flow ID */ *pQosFlowID = sme_qos_assign_flow_id(); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS request on session %d assigned Flow ID %d", __func__, __LINE__, sessionId, *pQosFlowID); /* Call the internal function for QoS setup, */ @@ -690,7 +690,7 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId, } } sme_release_global_lock(&pMac->sme); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS setup return status on session %d is %d", __func__, __LINE__, sessionId, status); return status; @@ -722,19 +722,19 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal, QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } /* Call the internal function for QoS modify, adding a layer of abstraction */ status = sme_qos_internal_modify_req(pMac, pQoSInfo, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Modify return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -759,19 +759,19 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) QDF_STATUS lock_status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sme_QosStatusType status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release requested by client for Flow %d", __func__, __LINE__, QosFlowID); lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } /* Call the internal function for QoS release, adding a layer of abstraction */ status = sme_qos_internal_release_req(pMac, QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, QosFlowID, status); return status; @@ -800,7 +800,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tListElem *entry = NULL; tSmeCmd *command; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL(" msg = %d for QoS"), msg_type); /* switch on the msg type & make the state transition accordingly */ switch (msg_type) { @@ -845,7 +845,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx, break; default: /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("unknown msg type = %d"), msg_type); break; @@ -869,14 +869,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, { tDot11fBeaconIEs *pIes = NULL; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validation for QAP & APSD", __func__, __LINE__); do { if (!QDF_IS_STATUS_SUCCESS( csr_get_parsed_bss_description_ies( pMac, pBssDesc, &pIes))) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); break; @@ -884,7 +884,7 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, /* check if the AP is QAP & it supports APSD */ if (!CSR_IS_QOS_BSS(pIes)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support QoS", __func__, __LINE__); @@ -893,14 +893,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: AP doesn't support APSD", __func__, __LINE__); break; } status = QDF_STATUS_SUCCESS; } while (0); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: validated with status = %d", __func__, __LINE__, status); if (pIes) { @@ -926,7 +926,7 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, sme_qos_csr_event_indType ind, void *pEvent_info) { QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d Event %d received from CSR", __func__, __LINE__, sessionId, ind); switch (ind) { @@ -992,12 +992,12 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac, break; default: /* Err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On Session %d Unknown Event %d received from CSR", __func__, __LINE__, sessionId, ind); break; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On Session %d processed Event %d with status %d", __func__, __LINE__, sessionId, ind, status); return status; @@ -1020,7 +1020,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes { sme_QosEdcaAcType ac; uint8_t acm_mask = 0; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { if (sme_qos_is_acm(pMac, pSirBssDesc, ac, pIes)) { @@ -1028,7 +1028,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: mask is %d", __func__, __LINE__, acm_mask); return acm_mask; } @@ -1086,19 +1086,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, uint8_t new_tmask = 0; sme_QosSearchInfo search_key; QDF_STATUS hstatus; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for flow %d", __func__, __LINE__, sessionId, QosFlowID); pSession = &sme_qos_cb.sessionInfo[sessionId]; /* if caller sent an empty TSPEC, fill up with the default one */ if (!pQoSInfo) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "%s: %d: caller sent an empty QoS param list, using defaults", __func__, __LINE__); /* find the AC with UPType passed in */ ac = sme_qos_up_to_ac(UPType); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, UPType); @@ -1109,7 +1109,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* find the AC */ ac = sme_qos_up_to_ac(pQoSInfo->ts_info.up); if (SME_QOS_EDCA_AC_MAX == ac) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, pQoSInfo->ts_info.up); @@ -1117,7 +1117,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, } /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP; } @@ -1133,7 +1133,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the setup request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1149,7 +1149,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the setup request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1157,7 +1157,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_SETUP_FAILURE_RSP; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered setup request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -1168,7 +1168,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* call the internal qos setup logic to decide on if the */ /* request is NOP, or need reassoc for APSD and/or need to send out ADDTS */ status = sme_qos_setup(pMac, sessionId, &Tspec_Info, ac); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1185,8 +1185,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* create an entry in the flow list */ pentry = cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, __LINE__); @@ -1205,15 +1205,15 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) { if (pACInfo->tspec_mask_status && !pACInfo->reassoc_pending) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d with AC %d in state " "SME_QOS_LINK_UP tspec_mask_status is %d " "but should not be set yet", __func__, __LINE__, sessionId, ac, pACInfo->tspec_mask_status); - CDF_ASSERT(0); + QDF_ASSERT(0); cdf_mem_free(pentry); return SME_QOS_STATUS_SETUP_FAILURE_RSP; } @@ -1250,7 +1250,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = pACInfo->tspec_mask_status; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating entry on session %d at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1258,7 +1258,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1274,7 +1274,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering setup request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1289,7 +1289,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, cmd.u.setupCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d couldn't buffer the setup " "request for flow %d in state = %d", __func__, __LINE__, @@ -1311,19 +1311,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac) || sme_qos_is_acm(pMac, pSession->assocInfo.pBssDesc, ac, NULL)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); if (!pACInfo->tspec_mask_status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: tspec_mask_status can't be 0 for ac = %d in " "state = %d", __func__, __LINE__, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); /* unable to service the request */ /* nothing is pending so vote powersave back on */ pSession->readyForPowerSave = true; @@ -1402,8 +1402,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_1_SET; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_MED, "%s: %d: wrong tmask = %d", __func__, __LINE__, pACInfo->tspec_mask_status); @@ -1414,11 +1414,11 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* to aggregate to calculate trigger frame parameters */ tmask = SME_QOS_TSPEC_MASK_BIT_1_SET; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: tmask = %d, new_tmask = %d in state = %d", __func__, __LINE__, tmask, new_tmask, pACInfo->curr_state); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d", __func__, __LINE__, pACInfo->tspec_mask_status, ac); @@ -1460,8 +1460,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: failed to aggregate params", __func__, __LINE__); /* unable to service the request */ @@ -1480,10 +1480,10 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, Tspec_Info; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: no flows running for ac = %d while in state = %d", __func__, __LINE__, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); /* unable to service the request */ /* nothing is pending so vote powersave back on */ pSession->readyForPowerSave = true; @@ -1501,7 +1501,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, status = sme_qos_setup(pMac, sessionId, &pACInfo->requested_QoSInfo[tmask - 1], ac); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1520,8 +1520,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pentry)); if (!pentry) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, __LINE__); @@ -1533,7 +1533,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, pentry->hoRenewal = hoRenewal; pentry->QosFlowID = QosFlowID; pentry->sessionId = sessionId; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Creating flow %d", __func__, __LINE__, QosFlowID); if ((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP == @@ -1570,9 +1570,9 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, sme_qos_setup_fnp); if (!QDF_IS_STATUS_SUCCESS (hstatus)) { - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", __func__, __LINE__, @@ -1594,7 +1594,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* Flow List at the end */ pentry->tspec_mask = tmask; pentry->QoSInfo = Tspec_Info; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating entry at %p with flowID %d", __func__, __LINE__, sessionId, pentry, QosFlowID); @@ -1602,7 +1602,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, true); } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1612,13 +1612,13 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: setup requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ /* nothing is pending so vote powersave back on */ pSession->readyForPowerSave = true; - CDF_ASSERT(0); + QDF_ASSERT(0); new_state = pACInfo->curr_state; } /* if current state is same as previous no need for transistion, @@ -1678,7 +1678,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_QosCmdInfo cmd; uint8_t sessionId; QDF_STATUS hstatus; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -1690,7 +1690,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pEntry = sme_qos_find_in_flow_list(search_key); if (!pEntry) { /* Err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; @@ -1705,7 +1705,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, /* validate QoS params */ if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid params", __func__, __LINE__); return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP; } @@ -1714,7 +1714,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.ts_info.direction) || (pQoSInfo->ts_info.up != flow_info->QoSInfo.ts_info.up) || (pQoSInfo->ts_info.tid != flow_info->QoSInfo.ts_info.tid)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Modification of direction/tid/up is not allowed", __func__, __LINE__); @@ -1742,7 +1742,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, flow_info->QoSInfo.suspension_interval) && (pQoSInfo->surplus_bw_allowance == flow_info->QoSInfo.surplus_bw_allowance)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: the addts parameters are same as last request," "dropping the current request", __func__, __LINE__); @@ -1758,7 +1758,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the modify request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -1770,7 +1770,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1778,7 +1778,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered modify request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP; @@ -1792,7 +1792,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry = (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pNewEntry)); if (!pNewEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " "entry in the Flow List", __func__, __LINE__); /* unable to service the request */ @@ -1812,7 +1812,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, pNewEntry->QoSInfo = *pQoSInfo; /* update the entry from Flow List which needed to be modified */ flow_info->reason = SME_QOS_REASON_MODIFY; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d creating modified " "entry at %p with flowID %d", __func__, __LINE__, @@ -1833,7 +1833,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, requested_QoSInfo[pNewEntry-> tspec_mask - 1], ac); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, status); @@ -1892,9 +1892,9 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, sme_qos_modification_notify_fnp); if (!QDF_IS_STATUS_SUCCESS (hstatus)) { - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", __func__, __LINE__, @@ -1923,8 +1923,8 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, status); @@ -1932,7 +1932,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); /* unable to service the request */ @@ -1953,7 +1953,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: Buffering modify request for flow %d in state = %d", __func__, __LINE__, QosFlowID, pACInfo->curr_state); /* buffer cmd */ @@ -1964,7 +1964,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the modify request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -1978,7 +1978,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, case SME_QOS_INIT: case SME_QOS_LINK_UP: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: modify requested in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2028,7 +2028,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, bool uplinkFlowsPresent = false; bool downlinkFlowsPresent = false; tListElem *pResult = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); @@ -2041,7 +2041,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!pEntry) { /* Err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for flowID = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP; @@ -2061,7 +2061,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, * confuse PE with back to back Addts or Addts followed by Reassoc */ if (sme_qos_is_rsp_pending(sessionId, ac)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: buffering the release request for flow %d in state %d " "since another request is pending", __func__, __LINE__, QosFlowID, pACInfo->curr_state); @@ -2072,7 +2072,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to buffer the request */ @@ -2080,7 +2080,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pSession->readyForPowerSave = true; return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Buffered release request for flow = %d", __func__, __LINE__, QosFlowID); return SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP; @@ -2088,7 +2088,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, /* get into the stat m/c to see if the request can be granted */ switch (pACInfo->curr_state) { case SME_QOS_QOS_ON: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: tspec_mask_status = %d for AC = %d with " "entry tspec_mask = %d", __func__, __LINE__, @@ -2171,8 +2171,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_2_SET, &Aggr_Tspec_Info); - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " "on other Tspec index of this AC", @@ -2199,9 +2199,9 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd (&cmd, false))) { - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d", __func__, __LINE__, @@ -2242,8 +2242,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo [flow_info->tspec_mask - 1], ac); - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON " "sme_qos_setup returned with status %d", __func__, __LINE__, sessionId, ac, @@ -2272,8 +2272,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, QosFlowID); @@ -2295,9 +2295,9 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sme_qos_setup_fnp); if (!QDF_IS_STATUS_SUCCESS (hstatus)) { - CDF_TRACE + QDF_TRACE (QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't notify other " "entries on this AC =%d", __func__, __LINE__, @@ -2321,8 +2321,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* unexpected status returned by sme_qos_setup() */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unexpected status %d " "returned by sme_qos_setup", __func__, __LINE__, sessionId, @@ -2336,8 +2336,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, requested_QoSInfo[flow_info-> tspec_mask - 1]; /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at " "%p with flowID %d", __func__, __LINE__, sessionId, @@ -2361,8 +2361,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } } else { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_update_params() failed", __func__, __LINE__); /* unable to service the request */ @@ -2428,8 +2428,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, tspec_mask); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_del_ts_req() failed", __func__, __LINE__); status = @@ -2477,8 +2477,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: Reassoc failed", __func__, __LINE__); status = @@ -2492,8 +2492,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pACInfo->tspec_pending = 0; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: nothing to do for AC = %d", __func__, __LINE__, ac); /* we won't be waiting for a response from the AP */ @@ -2511,8 +2511,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); @@ -2541,11 +2541,11 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, new_state = SME_QOS_LINK_UP; } } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->num_flows", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP; } @@ -2562,7 +2562,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); pACInfo->num_flows[flow_info->tspec_mask - 1]--; /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d deleting entry at %p with flowID %d", __func__, __LINE__, sessionId, flow_info, QosFlowID); @@ -2591,7 +2591,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, cmd.u.releaseCmdInfo.QosFlowID = QosFlowID; hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't buffer the release request in state = %d", __func__, __LINE__, pACInfo->curr_state); /* unable to service the request */ @@ -2606,10 +2606,10 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, case SME_QOS_LINK_UP: default: /* print error msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: release request in unexpected state = %d", __func__, __LINE__, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); /* unable to service the request */ /* nothing is pending so vote powersave back on */ pSession->readyForPowerSave = true; @@ -2671,20 +2671,20 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, tCsrRoamModifyProfileFields modifyProfileFields; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return status; } pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return status; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return status; @@ -2693,7 +2693,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return status; @@ -2702,7 +2702,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* success so pIes was allocated */ if (!CSR_IS_QOS_BSS(pIes)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support QoS", __func__, __LINE__, sessionId); cdf_mem_free(pIes); @@ -2710,7 +2710,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, return SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: %d: UAPSD/PSB set %d: ", __func__, __LINE__, pTspec_Info->ts_info.psb); @@ -2726,8 +2726,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); break; @@ -2744,13 +2744,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, qos_issue_command(pMac, sessionId, eSmeCommandAddTs, pTspec_Info, ac, 0); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_add_ts_req() failed", __func__, __LINE__); break; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTS on AC %d is pending", __func__, __LINE__, sessionId, ac); status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP; @@ -2768,8 +2768,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, apsdMask & (1 << (SME_QOS_EDCA_AC_VO - ac))) { /* APSD was formerly enabled on this AC but is no longer required */ /* so we must reassociate */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassoc needed " "to disable APSD on AC %d", __func__, __LINE__, sessionId, ac); @@ -2785,14 +2785,14 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d reassociation to enable " "APSD on AC %d is pending", __func__, __LINE__, sessionId, @@ -2804,8 +2804,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else { /* we don't need APSD on this AC */ /* and we don't currently have APSD on this AC */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is not looking for APSD & Admission " "Control isn't mandatory for the AC", __func__, __LINE__); @@ -2817,7 +2817,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } else if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) && !(pIes->WMMInfoAp.uapsd)) { /* application is looking for APSD but AP doesn't support it */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support APSD", __func__, __LINE__, sessionId); break; @@ -2826,7 +2826,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* and it is already enabled on this AC */ status = SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Request is looking for APSD and it is already " "set for the AC", __func__, __LINE__); break; @@ -2834,8 +2834,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, /* application is looking for APSD */ /* but it is not enabled on this AC */ /* so we need to reassociate */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassoc needed to enable APSD on AC %d"), sessionId, ac); /* reassoc logic */ @@ -2853,14 +2853,14 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, false); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to request reassociation", __func__, __LINE__); break; } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("On session %d reassociation to enable APSD on AC %d is pending"), sessionId, ac); status = @@ -2883,7 +2883,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "########### Set Key Complete #############"); (void)sme_qos_process_buffered_cmd(sessionId); return QDF_STATUS_SUCCESS; @@ -2921,7 +2921,7 @@ QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI pAddtsRsp->rsp.dialogToken = 0; pAddtsRsp->rsp.status = eSIR_SUCCESS; pAddtsRsp->rsp.wmeTspecPresent = pTspec->present; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d", __func__, ac, tspecIndex); @@ -2963,7 +2963,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pCsrSession = CSR_GET_SESSION(pMac, sessionId); if (NULL == pCsrSession) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } @@ -2983,13 +2983,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, /* should be atleast equal to the one TSPEC IE */ tspecIeLen = pCsrConnectedInfo->nTspecIeLength; if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("ESE Tspec IE len %d less than min %zu"), tspecIeLen, sizeof(tDot11fIEWMMTSPEC)); return QDF_STATUS_E_FAILURE; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "TspecLen = %d, pbFrames = %p, pTspecIE = %p", tspecIeLen, pCsrConnectedInfo->pbFrames, pTspecIE); @@ -2997,13 +2997,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, for (cnt = 0; cnt < numTspec; cnt++) { ac = sme_qos_up_to_ac(pTspecIE->user_priority); if (ac >= SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("ac %d more than it`s max value"), ac); return QDF_STATUS_E_FAILURE; } pACInfo = &pSession->ac_info[ac]; tspec_mask_status = pACInfo->tspec_mask_status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("UP=%d, ac=%d, tspec_mask_status=%x"), pTspecIE->user_priority, ac, tspec_mask_status); @@ -3011,8 +3011,8 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX; tspec_flow_index++) { if (tspec_mask_status & (1 << tspec_flow_index)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_WARN, FL ("Found Tspec entry flow = %d AC = %d"), tspec_flow_index, ac); @@ -3020,8 +3020,8 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac, pTspecIE, ac, tspec_flow_index); } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_WARN, FL ("Not found Tspec entry flow = %d AC = %d"), tspec_flow_index, ac); @@ -3088,7 +3088,7 @@ static void sme_qos_copy_tspec_info(tpAniSirGlobal pMac, pTspec->tsinfo.traffic.ackPolicy = pTspec_Info->ts_info.ack_policy; pTspec->type = SME_QOS_TSPEC_IE_TYPE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3172,7 +3172,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, uint32_t nStatus; if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength == NULL) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -3217,7 +3217,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3258,7 +3258,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE), pRICLength); if (DOT11F_FAILED(nStatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Packing of RIC Data of length %d failed with status %d"), *pRICLength, nStatus); @@ -3286,7 +3286,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( sme_QosFlowInfoEntry *flow_info = NULL; tListElem *entry = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), sessionId); session = &sme_qos_cb.sessionInfo[sessionId]; @@ -3306,8 +3306,8 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( && !ac_info->tspec_pending) || (ac_info-> tspec_mask_status & (1 << tspec_index))) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("Copying the currentQos to " "requestedQos for AC=%d, flow=%d"), ac, tspec_index); @@ -3332,12 +3332,12 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( SME_QOS_REQUESTED); break; default: - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("FT Reassoc req event in" " unexpected state %d"), ac_info->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); } } } @@ -3357,7 +3357,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( */ entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!entry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -3365,7 +3365,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( do { flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); if (sessionId == flow_info->sessionId) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Changing FlowID %d reason to SETUP" "and HO renewal to false"), flow_info->QosFlowID); @@ -3397,7 +3397,7 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, tSirAggrQosReq *msg, sme_QosSessionInfo *session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, FL("Found tspec entry AC=%d, flow=%d, direction = %d"), ac_id, ts_id, direction); @@ -3447,7 +3447,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) int i, j = 0; uint8_t direction; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), session_id); session = &sme_qos_cb.sessionInfo[session_id]; @@ -3456,7 +3456,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) if (!aggr_req) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("couldn't allocate memory for the msg buffer")); return QDF_STATUS_E_NOMEM; } @@ -3474,10 +3474,10 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) for (i = 0; i < SME_QOS_EDCA_AC_MAX; i++) { for (j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("ac=%d, tspec_mask_staus=%x, tspec_index=%d"), i, session->ac_info[i].tspec_mask_status, j); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("direction = %d"), session->ac_info[i].addTsRsp[j].rsp.tspec. tsinfo.traffic.direction); @@ -3497,13 +3497,13 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) } } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Sending aggregated message to HAL 0x%x"), aggr_req->aggrInfo.tspecIdx); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("sent down a AGGR QoS req to PE")); } @@ -3585,7 +3585,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) int i, j = 0; uint8_t sessionid = rsp->sessionId; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Received AGGR_QOS resp from LIM")); /* Copy the updated response information for TSPEC of all the ACs */ @@ -3599,7 +3599,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) ac_info[i].addTsRsp[j].rsp.tspec.tsinfo.traffic. direction; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Addts rsp from LIM AC=%d, flow=%d dir=%d, tspecIdx=%x"), i, j, direction, rsp->aggrInfo.tspecIdx); @@ -3617,8 +3617,8 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf) addtsrsp.rsp.status = rsp->aggrInfo.aggrRsp[i].status; addtsrsp.rsp.tspec = rsp->aggrInfo.aggrRsp[i].tspec; - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("Processing Addts rsp from LIM AC=%d, flow=%d"), i, j); /* post ADD TS response for each */ @@ -3661,12 +3661,12 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, continue; if (!*ric_rsplen) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("RIC Response not received for AC %d on " "TSPEC Index %d, RIC Req Identifier = %d"), ac, tspec_flow_index, ac_info->ricIdentifier[tspec_flow_index]); - CDF_ASSERT(0); + QDF_ASSERT(0); continue; } /* Now we got response for this identifier. Process it. */ @@ -3677,15 +3677,15 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, if (ric_data_desc->RICData.Identifier != ac_info->ricIdentifier[tspec_flow_index]) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("RIC response order not same as request sent. " "Request ID = %d, Response ID = %d"), ac_info->ricIdentifier[tspec_flow_index], ric_data_desc->RICData.Identifier); - CDF_ASSERT(0); + QDF_ASSERT(0); } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, FL("Processing RIC Response for AC %d, " "TSPEC Flow index %d with RIC ID %d "), ac, tspec_flow_index, @@ -3694,8 +3694,8 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx, sessionid, ric_data_desc, ac, tspec_flow_index); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d in " "TSPEC Flow index = %d"), status, ac, tspec_flow_index); @@ -3749,8 +3749,8 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, ac1 = sme_qos_up_to_ac( ric_data->WMMTSPEC.user_priority); if (ac == SME_QOS_EDCA_AC_MAX) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Invalid AC %d UP %d"), ac, ric_data->WMMTSPEC.user_priority); break; @@ -3762,8 +3762,8 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx, sessionid, ric_data, ac, tspec_flow_idx); if (QDF_STATUS_SUCCESS != status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Failed with status %d for AC %d " "in TSPEC Flow index = %d"), status, ac, tspec_flow_idx); @@ -3800,14 +3800,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, #endif if (NULL == csr_session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("The Session pointer is NULL")); return QDF_STATUS_E_FAILURE; } csr_conn_info = &csr_session->connectedInfo; ric_rsplen = csr_conn_info->nRICRspLength; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); qos_session = &sme_qos_cb.sessionInfo[sessionid]; @@ -3827,14 +3827,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, } if (ric_rsplen) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("RIC Resp still follows . Rem len = %d"), ric_rsplen); - CDF_ASSERT(0); + QDF_ASSERT(0); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("LFR3-11r Compare RIC in Reassoc Resp to find" " matching tspec in host.")); ric_data = ric_data_desc; @@ -3848,7 +3848,7 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx, ric_len); } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("LFR3-11r ric_rsplen is zero or ric_data_desc is" " not present or wmmtspec is not present")); } @@ -3887,12 +3887,12 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); if (sessionId >= CSR_ROAM_SESSION_MAX) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: sessionId(%d) is invalid", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -3902,7 +3902,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg = (tSirAddtsReq *) cdf_mem_malloc(sizeof(tSirAddtsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -3953,7 +3953,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -3962,7 +3962,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, cdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid); @@ -3974,7 +3974,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, #endif if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sent down a ADDTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4013,13 +4013,13 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); pMsg = (tSirDeltsReq *) cdf_mem_malloc(sizeof(tSirDeltsReq)); if (!pMsg) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the msg buffer", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -4063,7 +4063,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE; /*Fill the BSSID pMsg->req.bssId */ if (NULL == pSession->assocInfo.pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); cdf_mem_free(pMsg); @@ -4073,7 +4073,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, &pSession->assocInfo.pBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); @@ -4081,7 +4081,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, sizeof(sme_QosWmmTspecInfo)); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE", __func__, __LINE__); /* event: EVENT_WLAN_QOS */ @@ -4126,14 +4126,14 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); @@ -4149,7 +4149,7 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) return QDF_STATUS_SUCCESS; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, paddts_rsp->rc); /* our outstanding request has been serviced */ @@ -4191,7 +4191,7 @@ QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf) sme_QosSessionInfo *pSession; uint8_t sessionId = pDeltsRsp->sessionId; /* msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with return code %d", __func__, __LINE__, sessionId, pDeltsRsp->rc); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4229,13 +4229,13 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) #ifdef FEATURE_WLAN_DIAG_SUPPORT WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); #endif - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -4252,10 +4252,10 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) /* through the callback it registered per request */ if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: no match found for ac = %d", __func__, __LINE__, search_key.key.ac_type); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* event: EVENT_WLAN_QOS */ @@ -4285,7 +4285,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio sme_QosACInfo *pACInfo; QDF_STATUS status = QDF_STATUS_E_FAILURE; sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4300,14 +4300,14 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio /* get the association info */ if (!pEvent_info) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: pEvent_info is NULL", __func__, __LINE__); return status; } if (!((sme_QosAssocInfo *) pEvent_info)->pBssDesc) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: pBssDesc is NULL", __func__, __LINE__); return status; @@ -4317,21 +4317,21 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio (pMac, (struct qdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId, (struct qdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)-> pBssDesc->bssId)))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: assoc with the same BSS, no update needed", __func__, __LINE__); } else { status = sme_qos_save_assoc_info(pSession, pEvent_info); } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d", __func__, __LINE__, pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state, pSession->ac_info[SME_QOS_EDCA_AC_BK].curr_state, pSession->ac_info[SME_QOS_EDCA_AC_VI].curr_state, pSession->ac_info[SME_QOS_EDCA_AC_VO].curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); return status; } /* the session is active */ @@ -4355,12 +4355,12 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio case SME_QOS_HANDOFF: case SME_QOS_CLOSED: default: - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4384,20 +4384,20 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->ftHandoffInProgress) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } sme_qos_process_ft_reassoc_req_ev(sessionId); @@ -4405,7 +4405,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } if (pSession->handoffRequested) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4413,7 +4413,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* buffer the existing flows to be renewed after handoff is done */ @@ -4424,7 +4424,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId } /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); @@ -4432,7 +4432,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -4454,11 +4454,11 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4547,10 +4547,10 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, status = sme_qos_find_all_in_flow_list(mac_ctx, search_key, sme_qos_reassoc_success_ev_fnp); if (!QDF_IS_STATUS_SUCCESS(status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("no match found for ac = %d"), search_key.key.ac_type); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } ac_info->hoRenewal = false; @@ -4582,11 +4582,11 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d"), sessionid); if (CSR_ROAM_SESSION_MAX <= sessionid) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("invoked on session %d"), sessionid); return status; } @@ -4602,19 +4602,19 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, /* get the association info */ if (!event_info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("event_info is NULL")); return status; } if (!((sme_QosAssocInfo *) event_info)->pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("pBssDesc is NULL")); return status; } status = sme_qos_save_assoc_info(qos_session, event_info); if (status) - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_qos_save_assoc_info() failed")); /* @@ -4670,10 +4670,10 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4697,7 +4697,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; sme_QosEdcaAcType ac; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4737,11 +4737,11 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4766,7 +4766,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4781,8 +4781,8 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_HANDOFF: /* print error msg */ if (pSession->ftHandoffInProgress) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, "%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in " "SME_QOS_HANDOFF state with FT in progress", __func__, __LINE__); @@ -4792,11 +4792,11 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4834,7 +4834,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, sme_QosACInfo *pACInfo; uint8_t ac; QDF_STATUS status = QDF_STATUS_E_FAILURE; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4865,11 +4865,11 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac, state may be SME_QOS_REQUESTED */ if (pSession->ftHandoffInProgress) break; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4892,7 +4892,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; uint8_t ac; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4925,11 +4925,11 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, case SME_QOS_REQUESTED: case SME_QOS_QOS_ON: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AC %d is in wrong state %d", __func__, __LINE__, sessionId, ac, pACInfo->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -4958,7 +4958,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, void *pEvent_info) { sme_QosSessionInfo *pSession; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -4968,14 +4968,14 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, */ if ((pSession->handoffRequested) && !pSession->ftHandoffInProgress) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_SUCCESS; } @@ -5019,12 +5019,12 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, { sme_QosSessionInfo *pSession; sme_QosEdcaAcType ac; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; if (pSession->handoffRequested) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: no need for state transition, should " "already be in handoff state", __func__, __LINE__); if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) || @@ -5032,7 +5032,7 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) || (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) { /* just print */ - CDF_ASSERT(0); + QDF_ASSERT(0); } /* buffer the existing flows to be renewed after handoff is done */ sme_qos_buffer_existing_flows(pMac, sessionId); @@ -5077,11 +5077,11 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, uint8_t tspec_mask_status = 0; uint8_t tspec_pending_status = 0; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on SME session %d"), sessionid); if (NULL == sme_session) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_session is NULL")); return QDF_STATUS_E_INVAL; } @@ -5102,10 +5102,10 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, case SME_QOS_CLOSED: case SME_QOS_INIT: default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Session %d AC %d is in wrong state %d"), sessionid, ac, ac_info->curr_state); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } @@ -5118,7 +5118,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, /* Data is accessed from saved PreAuth Rsp */ if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("psavedFTPreAuthRsp is NULL")); return QDF_STATUS_E_INVAL; } @@ -5144,7 +5144,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, tspec_pending_status = ac_info->tspec_pending; tspec_mask_status = ac_info->tspec_mask_status; cdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("AC %d ==> TSPEC status = %d, tspec pending = %d"), ac, tspec_mask_status, tspec_pending_status); @@ -5206,13 +5206,13 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, uint8_t tspec_pending; sme_QosWmmUpType up = (sme_QosWmmUpType) pRsp->tspec.tsinfo.traffic.userPrio; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5222,10 +5222,10 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -5237,11 +5237,11 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_failure_fnp))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac = %d", __func__, __LINE__, sessionId, search_key.key.ac_type); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], @@ -5281,7 +5281,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, sme_QosSessionInfo *qos_session; sme_QosACInfo *ac_info; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("invoked on session %d for AC %d TSPEC %d"), sessionid, search_key.key.ac_type, new_tspec_mask); @@ -5290,15 +5290,15 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if (search_key.key.ac_type < SME_QOS_EDCA_AC_MAX) { ac_info = &qos_session->ac_info[search_key.key.ac_type]; } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Exceeded the array bounds")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Flow List empty, nothing to update")); return QDF_STATUS_E_FAILURE; } @@ -5317,8 +5317,8 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; ac_info->num_flows[new_tspec_mask - 1]++; @@ -5327,8 +5327,8 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid, } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_5) { if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("Flow %d matches"), flow_info->QosFlowID); ac_info->num_flows[flow_info->tspec_mask - 1]--; ac_info->num_flows[new_tspec_mask - 1]++; @@ -5374,14 +5374,14 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type); host_log_qos_tspec_pkt_type *log_ptr = NULL; #endif /* FEATURE_WLAN_DIAG_SUPPORT */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for UP %d", __func__, __LINE__, sessionId, up); pSession = &sme_qos_cb.sessionInfo[sessionId]; ac = sme_qos_up_to_ac(up); if (SME_QOS_EDCA_AC_MAX == ac) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid AC %d from UP %d", __func__, __LINE__, ac, up); return QDF_STATUS_E_FAILURE; @@ -5390,7 +5390,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, /* is there a TSPEC request pending on this AC? */ tspec_pending = pACInfo->tspec_pending; if (!tspec_pending) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d an AddTS is not pending on AC %d", __func__, __LINE__, sessionId, ac); return QDF_STATUS_E_FAILURE; @@ -5412,10 +5412,10 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, ~(1 << (SME_QOS_EDCA_AC_VO - ac)); } } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } } @@ -5464,7 +5464,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, pACInfo->curr_QoSInfo[tspec_pending - 1].medium_time = pRsp->tspec.mediumTime; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d AddTspec Medium Time %d", __func__, __LINE__, sessionId, pRsp->tspec.mediumTime); @@ -5510,11 +5510,11 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, if (!QDF_IS_STATUS_SUCCESS (sme_qos_find_all_in_flow_list (pMac, search_key, sme_qos_add_ts_success_fnp))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d no match found for ac %d", __func__, __LINE__, sessionId, search_key.key.ac_type); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } pACInfo->hoRenewal = false; @@ -5609,16 +5609,16 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, sme_QosWmmTspecInfo *pUpdated_Tspec_Info) { sme_QosWmmTspecInfo TspecInfo; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked", __func__, __LINE__); if (!pInput_Tspec_Info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: input is NULL, nothing to aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } if (!pCurrent_Tspec_Info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Current is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5788,11 +5788,11 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, sme_QosACInfo *pACInfo; sme_QosFlowInfoEntry *flow_info = NULL; sme_QosWmmTspecInfo Tspec_Info; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d TSPEC %d", __func__, __LINE__, sessionId, ac, tspec_mask); if (!pTspec_Info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: output is NULL, can't aggregate", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5800,7 +5800,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, nothing to update", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -5820,15 +5820,15 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, if ((sessionId == flow_info->sessionId) && (ac == flow_info->ac_type) && (tspec_mask == flow_info->tspec_mask)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow %d matches", __func__, __LINE__, flow_info->QosFlowID); if ((SME_QOS_REASON_RELEASE == flow_info->reason) || (SME_QOS_REASON_MODIFY == flow_info->reason)) { /* msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Skipping Flow %d as it is marked " "for release/modify", __func__, __LINE__, flow_info->QosFlowID); @@ -5837,8 +5837,8 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, (sme_qos_aggregate_params (&flow_info->QoSInfo, &Tspec_Info, NULL))) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: sme_qos_aggregate_params() failed", __func__, __LINE__); } @@ -5866,7 +5866,7 @@ sme_QosWmmUpType sme_qos_ac_to_up(sme_QosEdcaAcType ac) if (ac >= 0 && ac < SME_QOS_EDCA_AC_MAX) { up = sme_qos_a_cto_up_map[ac]; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: ac = %d up = %d returned", __func__, __LINE__, ac, up); return up; @@ -5886,7 +5886,7 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up) if (up >= 0 && up < SME_QOS_WMM_UP_MAX) { ac = sme_qos_u_pto_ac_map[up]; } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: up = %d ac = %d returned", __func__, __LINE__, up, ac); return ac; @@ -5914,7 +5914,7 @@ static void sme_qos_state_transition(uint8_t sessionId, pACInfo = &pSession->ac_info[ac]; pACInfo->prev_state = pACInfo->curr_state; pACInfo->curr_state = new_state; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: On session %d new state=%d, old state=%d, for AC=%d", __func__, __LINE__, sessionId, pACInfo->curr_state, pACInfo->prev_state, ac); @@ -5940,7 +5940,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return NULL; } @@ -5958,22 +5958,22 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) { if (search_key.key.QosFlowID == flow_info->QosFlowID) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) { if (search_key.key.ac_type == flow_info->ac_type) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); break; } } else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_3) { if (search_key.key.reason == flow_info->reason) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; } @@ -5981,8 +5981,8 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key) if ((search_key.key.ac_type == flow_info->ac_type) && (search_key.direction == flow_info->QoSInfo.ts_info.direction)) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on reason, ending search")); break; } @@ -6019,7 +6019,7 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_elt) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Flow List empty, can't search")); return QDF_STATUS_E_FAILURE; } @@ -6037,26 +6037,26 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx, if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) && (search_key.key.QosFlowID == flow_info->QosFlowID)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on flowID, ending search")); status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; } } else if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) && (search_key.key.ac_type == flow_info->ac_type)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("match found on ac, ending search")); ac_type = flow_info->ac_type; flow_info->hoRenewal = qos_session->ac_info[ac_type].hoRenewal; status = fnp(mac_ctx, list_elt); if (QDF_STATUS_E_FAILURE == status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("Failed to process entry")); break; } @@ -6082,7 +6082,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, bool ret_val = false; tDot11fBeaconIEs *pIesLocal; if (!pSirBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: pSirBssDesc is NULL", __func__, __LINE__); return false; } @@ -6096,7 +6096,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, (csr_get_parsed_bss_description_ies (pMac, pSirBssDesc, &pIesLocal))) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: csr_get_parsed_bss_description_ies() failed", __func__, __LINE__); return false; @@ -6124,15 +6124,15 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, ret_val = true; break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: unknown AC = %d", __func__, __LINE__, ac); /* Assert */ - CDF_ASSERT(0); + QDF_ASSERT(0); break; } } /* IS_QOS_BSS */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: ACM = %d for AC = %d", __func__, __LINE__, ret_val, ac); if (NULL == pIes) { @@ -6163,7 +6163,7 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, list_entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!list_entry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Flow List empty, nothing to buffer")); return QDF_STATUS_E_FAILURE; } @@ -6198,14 +6198,14 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the setup request" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a setup request for " "flow %d in handoff state"), flow_info->QosFlowID); @@ -6216,14 +6216,14 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the release req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a release request for " "flow %d in handoff state"), flow_info->QosFlowID); @@ -6236,20 +6236,20 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo; if (!QDF_IS_STATUS_SUCCESS (sme_qos_buffer_cmd(&cmd, true))) - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("couldn't buffer the modify req" " for flow %d in handoff state"), flow_info->QosFlowID); else - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO_HIGH, FL("buffered a modify request for " "flow %d in handoff state"), flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting original entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, list_entry, true); @@ -6278,7 +6278,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, sme_QosFlowInfoEntry *flow_info = NULL; pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, true); if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "%s: %d: Flow List empty, nothing to delete", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -6297,7 +6297,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, SME_QOS_STATUS_RELEASE_QOS_LOST_IND, flow_info->QosFlowID); } - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); @@ -6326,13 +6326,13 @@ QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) { sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pentry = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked", __func__, __LINE__); pentry = (sme_QosCmdInfoEntry *) cdf_mem_malloc(sizeof(sme_QosCmdInfoEntry)); if (!pentry) { /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Memory allocation failure", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6369,14 +6369,14 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Invoked on session %d"), session_id); qos_session = &sme_qos_cb.sessionInfo[session_id]; if (!csr_ll_is_list_empty(&qos_session->bufferedCommandList, false)) { list_elt = csr_ll_remove_head(&qos_session->bufferedCommandList, true); if (!list_elt) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("no more buffered commands on session %d"), session_id); qos_session->readyForPowerSave = true; @@ -6395,8 +6395,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.setupCmdInfo.QosFlowID, true, qos_cmd->u.setupCmdInfo.hoRenewal); if (SME_QOS_STATUS_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); cdf_ret_status = QDF_STATUS_E_FAILURE; @@ -6407,8 +6407,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.releaseCmdInfo.QosFlowID, true); if (SME_QOS_STATUS_RELEASE_FAILURE_RSP == hdd_status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); cdf_ret_status = QDF_STATUS_E_FAILURE; @@ -6421,8 +6421,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) true); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); cdf_ret_status = QDF_STATUS_E_FAILURE; @@ -6436,24 +6436,24 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) qos_cmd->u.resendCmdInfo.tspecMask); if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP == hdd_status) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); cdf_ret_status = QDF_STATUS_E_FAILURE; } break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("On session %d unknown cmd = %d"), session_id, qos_cmd->command); - CDF_ASSERT(0); + QDF_ASSERT(0); break; } /* buffered command has been processed, reclaim the memory */ cdf_mem_free(pcmd); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("cmd buffer empty")); qos_session->readyForPowerSave = true; } @@ -6475,13 +6475,13 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; sme_QosCmdInfoEntry *pcmd = NULL; tListElem *pEntry = NULL, *pNextEntry = NULL; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d", __func__, __LINE__, sessionId); pSession = &sme_qos_cb.sessionInfo[sessionId]; pEntry = csr_ll_peek_head(&pSession->bufferedCommandList, true); if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN, "%s: %d: Buffered List empty, nothing to delete on session %d", __func__, __LINE__, sessionId); return QDF_STATUS_E_FAILURE; @@ -6489,7 +6489,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, while (pEntry) { pNextEntry = csr_ll_next(&pSession->bufferedCommandList, pEntry, true); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: %d: deleting entry from buffered List", __func__, __LINE__); /* delete the entry from Flow List */ @@ -6522,7 +6522,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, tSirBssDescription *pBssDesc = NULL; uint32_t bssLen = 0; if (NULL == pAssoc_info) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: pAssoc_info is NULL", __func__, __LINE__); return QDF_STATUS_E_FAILURE; } @@ -6536,7 +6536,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, /* save the bss Descriptor */ pBssDesc = (tSirBssDescription *) cdf_mem_malloc(bssLen); if (!pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); return QDF_STATUS_E_NOMEM; @@ -6570,9 +6570,9 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6585,7 +6585,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry) &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6611,9 +6611,9 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6626,7 +6626,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr &pACInfo->curr_QoSInfo[flow_info-> tspec_mask - 1], hdd_status, flow_info->QosFlowID); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Entry with flowID = %d getting notified", __func__, __LINE__, flow_info->QosFlowID); } @@ -6648,9 +6648,9 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) { sme_QosFlowInfoEntry *flow_info = NULL; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6661,7 +6661,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) break; case SME_QOS_REASON_MODIFY: /* delete the original entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting original entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6696,9 +6696,9 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType status; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* delete the entry from Flow List */ @@ -6710,7 +6710,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) lock_status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(lock_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Unable to obtain lock", __func__, __LINE__); return SME_QOS_STATUS_RELEASE_FAILURE_RSP; } @@ -6718,7 +6718,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry) status = sme_qos_internal_release_req(pMac, flow_info->QosFlowID, false); sme_release_global_lock(&pMac->sme); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: QoS Release return status on Flow %d is %d", __func__, __LINE__, flow_info->QosFlowID, status); @@ -6749,9 +6749,9 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, sme_QosEdcaAcType ac; QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE; if (!entry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); @@ -6843,7 +6843,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, } } else { /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true); @@ -6880,9 +6880,9 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; sme_QosEdcaAcType ac; if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Entry is NULL", __func__, __LINE__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link); @@ -6930,7 +6930,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) flow_info->QosFlowID); } /* delete the entry from Flow List */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Deleting entry at %p with flowID %d", __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); @@ -6977,9 +6977,9 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, uint8_t tspec_index; if (!entry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Entry is NULL")); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link); @@ -6988,7 +6988,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, ac_info = &qos_session->ac_info[ac]; tspec_index = ac_info->tspec_pending - 1; if (flow_info->tspec_mask != ac_info->tspec_pending) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL(" No need to notify the HDD, the ADDTS " "success is not for index = %d of the AC = %d"), flow_info->tspec_mask, ac); @@ -7110,7 +7110,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, } } if (delete_entry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("Deleting entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); /* delete the entry from Flow List */ @@ -7168,7 +7168,7 @@ void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff) { sme_QosSessionInfo *pSession; pSession = &sme_qos_cb.sessionInfo[sessionId]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, "%s: %d: handoffRequested %d updateHandOff %d", __func__, __LINE__, pSession->handoffRequested, updateHandOff); @@ -7242,7 +7242,7 @@ QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7277,7 +7277,7 @@ QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Flow List empty, can't search", __func__, __LINE__); return QDF_STATUS_E_FAILURE; @@ -7348,7 +7348,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, sme_QosSessionInfo *pSession; QDF_STATUS hstatus; if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session Id %d is invalid", __func__, __LINE__, sessionId); return false; @@ -7357,14 +7357,14 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession = &sme_qos_cb.sessionInfo[sessionId]; if (!pSession->sessionActive) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d is inactive", __func__, __LINE__, sessionId); return false; } if (!pSession->assocInfo.pBssDesc) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: Session %d has an Invalid BSS Descriptor", __func__, __LINE__, sessionId); return false; @@ -7374,7 +7374,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, pSession->assocInfo.pBssDesc, &pIes); if (!QDF_IS_STATUS_SUCCESS(hstatus)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d unable to parse BSS IEs", __func__, __LINE__, sessionId); return false; @@ -7385,7 +7385,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, if (!pIes->HTCaps.present && pQoSInfo->ts_info.ack_policy == SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ", __func__, __LINE__, sessionId); @@ -7424,7 +7424,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, do { pCommand = sme_get_command_buffer(pMac); if (!pCommand) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: fail to get command buffer for command %d", __func__, __LINE__, cmdType); break; @@ -7438,8 +7438,8 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspecInfo = *pQoSInfo; pCommand->u.qosCmd.ac = ac; } else { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, "%s: %d: NULL pointer passed", __func__, __LINE__); status = QDF_STATUS_E_INVAL; @@ -7451,7 +7451,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId, pCommand->u.qosCmd.tspec_mask = tspec_mask; break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, cmdType); status = QDF_STATUS_E_INVAL; @@ -7492,7 +7492,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) } break; default: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: invalid command type %d", __func__, __LINE__, pCommand->command); break; @@ -7524,7 +7524,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, sme_QosStatusType status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP; sme_QosCmdInfo cmd; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL(" Invoked on session %d for AC %d TSPEC %d"), session_id, ac, tspec_mask); session = &sme_qos_cb.sessionInfo[session_id]; @@ -7541,7 +7541,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, * followed by Reassoc. */ if (sme_qos_is_rsp_pending(session_id, ac)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL(" On session %d buffering the AddTS request " "for AC %d in state %d as Addts is pending " "on other AC or waiting for full power"), @@ -7555,8 +7555,8 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(QDF_MODULE_ID_SME, - CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_ERROR, FL("On session %d unable to buffer the AddTS " "request for AC %d TSPEC %d in state %d"), session_id, ac, tspec_mask, @@ -7576,9 +7576,9 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, /* if ACM, send out a new ADDTS */ ac_info->hoRenewal = true; status = sme_qos_setup(mac_ctx, session_id, qos_info, ac); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup returned in SME_QOS_QOS_ON state")); - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("sme_qos_setup AC %d with status =%d"), ac, status); if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status) { /* we aren't waiting for a response from the AP */ @@ -7594,11 +7594,11 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, status) || (SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING == status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("UAPSD is setup already status = %d "), status); } else { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_qos_setup return status = %d "), status); } @@ -7606,7 +7606,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, break; case SME_QOS_HANDOFF: case SME_QOS_REQUESTED: - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Re-Add request in state = %d buffer the request"), ac_info->curr_state); cmd.command = SME_QOS_RESEND_REQ; @@ -7616,7 +7616,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, cmd.u.resendCmdInfo.tspecMask = tspec_mask; cmd.u.resendCmdInfo.QoSInfo = *qos_info; if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL(" couldn't buf the read request state = %d"), ac_info->curr_state); /* unable to buffer the request @@ -7631,7 +7631,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx, case SME_QOS_LINK_UP: default: /* print error msg, */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("ReAdd request in unexpected state = %d"), ac_info->curr_state); /* unable to service the request @@ -7666,7 +7666,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosSessionInfo *pSession; sme_QosACInfo *pACInfo; QDF_STATUS status; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked on session %d with UAPSD mask 0x%X", __func__, __LINE__, sessionId, pModFields->uapsd_mask); pSession = &sme_qos_cb.sessionInfo[sessionId]; @@ -7678,7 +7678,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId sme_QosEdcaAcType ac; for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: %d: AC[%d] is in state [%d]", __func__, __LINE__, ac, pACInfo->curr_state); /* If it is already in HANDOFF state, don't do anything since we */ @@ -7700,7 +7700,7 @@ static uint32_t sme_qos_assign_flow_id(void) if (SME_QOS_MAX_FLOW_ID == flowId) { /* The Flow ID wrapped. This is obviously not a real life scenario */ /* but handle it to keep the software test folks happy */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: %d: Software Test made the flow counter wrap, " "QoS may no longer be functional", __func__, __LINE__); diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index b827c68cfe78..31728178ef34 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -1030,12 +1030,12 @@ rrm_calculate_neighbor_ap_roam_score(tpAniSirGlobal mac_ctx, uint8_t session_id; #endif if (NULL == nbr_report_desc) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } if (NULL == nbr_report_desc->pNeighborBssDescription) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -1112,11 +1112,11 @@ void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac, tRrmNeighborReportDesc *pTempNeighborReportDesc; if (NULL == pNeighborReportDesc) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } if (NULL == pNeighborReportDesc->pNeighborBssDescription) { - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -1278,7 +1278,7 @@ end: QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void *pMsgBuf) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL(" Msg = %d for RRM measurement"), msg_type); /* switch on the msg type & make the state transition accordingly */ @@ -1293,7 +1293,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, default: /* err msg */ - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("sme_rrm_msg_processor:unknown msg type = %d"), msg_type); @@ -1365,7 +1365,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1378,7 +1378,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to init timer"); return QDF_STATUS_E_FAILURE; @@ -1389,7 +1389,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) cdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); return QDF_STATUS_E_FAILURE; } @@ -1418,7 +1418,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) { qdf_status = qdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Timer stop fail")); } } @@ -1426,7 +1426,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_status = qdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Fail to destroy timer")); } @@ -1439,7 +1439,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, FL("Timer stop fail")); } } @@ -1448,7 +1448,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac) qdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo. neighborRspWaitTimer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, FL("Fail to destroy timer")); } diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index f815204c7148..0c980de6b759 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -68,7 +68,7 @@ -------------------------------------------------------------------------*/ #define EPPING_MAX_ADAPTERS 1 -#define EPPING_LOG(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) +#define EPPING_LOG(level, args ...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) struct epping_cookie { HTC_PACKET HtcPkt; /* HTC packet wrapper */ diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 32fa3e56341b..278693326847 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -63,7 +63,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) cdf_mem_malloc(sizeof(struct epping_cookie) * MAX_COOKIE_SLOT_SIZE); if (pEpping_ctx->s_cookie_mem == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: no mem for cookie (idx = %d)", __func__, i); goto error; @@ -175,7 +175,7 @@ void epping_log_packet(epping_adapter_t *pAdapter, EPPING_HEADER *eppingHdr, int ret, const char *str) { if (eppingHdr->Cmd_h & EPPING_LOG_MASK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: cmd = %d, seqNo = %u, flag = 0x%x, ret = %d, " "txCount = %lu, txDrop = %lu, txBytes = %lu," "rxCount = %lu, rxDrop = %lu, rxBytes = %lu\n", @@ -192,7 +192,7 @@ void epping_log_packet(epping_adapter_t *pAdapter, void epping_log_stats(epping_adapter_t *pAdapter, const char *str) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: txCount = %lu, txDrop = %lu, tx_bytes = %lu, " "rxCount = %lu, rxDrop = %lu, rx_bytes = %lu, tx_acks = %u\n", str, diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 096c586408d8..f33fbe80e1b4 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -85,12 +85,12 @@ static struct epping_context *g_epping_ctx; */ int epping_open(void) { - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); g_epping_ctx = cdf_mem_malloc(sizeof(*g_epping_ctx)); if (g_epping_ctx == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_ERROR, + EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: cannot alloc epping context", __func__); return -ENOMEM; } @@ -113,7 +113,7 @@ void epping_disable(void) pEpping_ctx = g_epping_ctx; if (pEpping_ctx == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: error: pEpping_ctx = NULL", __func__); return; } @@ -141,7 +141,7 @@ void epping_close(void) if (g_epping_ctx == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: error: g_epping_ctx = NULL", __func__); return; } @@ -156,7 +156,7 @@ static void epping_target_suspend_acknowledge(void *context) int wow_nack = *((int *)context); if (NULL == g_epping_ctx) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: epping_ctx is NULL", __func__); return; } @@ -184,12 +184,12 @@ int epping_enable(struct device *parent_dev) struct hif_target_info *tgt_info; struct ol_context *ol_ctx; - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); p_cds_context = cds_get_global_context(); if (p_cds_context == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Failed cds_get_global_context", __func__); ret = -1; return ret; @@ -197,7 +197,7 @@ int epping_enable(struct device *parent_dev) pEpping_ctx = g_epping_ctx; if (pEpping_ctx == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Failed to get pEpping_ctx", __func__); ret = -1; return ret; @@ -210,7 +210,7 @@ int epping_enable(struct device *parent_dev) scn = cds_get_context(QDF_MODULE_ID_HIF); if (!scn) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: scn is null!", __func__); return -1; } @@ -224,13 +224,13 @@ int epping_enable(struct device *parent_dev) #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ if (bmi_download_firmware(ol_ctx)) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: BMI failed to download target", __func__); bmi_cleanup(ol_ctx); return -1; } #endif - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: bmi_download_firmware done", __func__); htcInfo.pContext = ol_ctx; @@ -241,7 +241,7 @@ int epping_enable(struct device *parent_dev) /* Create HTC */ p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx); if (!p_cds_context->htc_ctx) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); bmi_cleanup(ol_ctx); return -1; @@ -249,35 +249,35 @@ int epping_enable(struct device *parent_dev) pEpping_ctx->HTCHandle = cds_get_context(QDF_MODULE_ID_HTC); if (pEpping_ctx->HTCHandle == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: HTCHandle is NULL", __func__); return -1; } if (bmi_done(ol_ctx)) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); goto error_end; } /* start HIF */ if (htc_wait_target(pEpping_ctx->HTCHandle) != A_OK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: htc_wait_target error", __func__); goto error_end; } - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC ready", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC ready", __func__); ret = epping_connect_service(pEpping_ctx); if (ret != 0) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: htc_wait_targetdone", __func__); goto error_end; } if (htc_start(pEpping_ctx->HTCHandle) != A_OK) { goto error_end; } - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC started", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC started", __func__); /* init the tx cookie resource */ ret = epping_cookie_init(pEpping_ctx); @@ -287,14 +287,14 @@ int epping_enable(struct device *parent_dev) QDF_STA_MODE); } if (ret < 0 || pEpping_ctx->epping_adapter == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: epping_add_adaptererror error", __func__); htc_stop(pEpping_ctx->HTCHandle); epping_cookie_cleanup(pEpping_ctx); goto error_end; } - EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Exit", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Exit", __func__); return ret; error_end: diff --git a/core/utils/epping/src/epping_rx.c b/core/utils/epping/src/epping_rx.c index 15928e120b8d..ea2d32311c37 100644 --- a/core/utils/epping/src/epping_rx.c +++ b/core/utils/epping/src/epping_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -56,7 +56,7 @@ #define AR6000_BUFFER_SIZE 1664 #define AR6000_MIN_HEAD_ROOM 64 -static bool enb_rx_dump = 0; +static bool enb_rx_dump; #ifdef HIF_SDIO void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint) @@ -78,7 +78,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint) INIT_HTC_PACKET_QUEUE(&queue); - EPPING_LOG(CDF_TRACE_LEVEL_INFO, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: providing htc with %d buffers at eid=%d\n", __func__, buffersToRefill, Endpoint); @@ -116,7 +116,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) HTC_ENDPOINT_ID eid = pPacket->Endpoint; struct sk_buff *pktSkb = (struct sk_buff *)pPacket->pPktContext; - EPPING_LOG(CDF_TRACE_LEVEL_INFO, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: pAdapter = 0x%p eid=%d, skb=0x%p, data=0x%p, len=0x%x status:%d", __func__, pAdapter, eid, pktSkb, pPacket->pBuffer, pPacket->ActualLength, status); @@ -148,7 +148,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) netif_rx_ni(pktSkb); if ((pAdapter->stats.rx_packets % EPPING_STATS_LOG_COUNT) == 0) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: total_rx_pkts = %lu", __func__, pAdapter->stats.rx_packets); diff --git a/core/utils/epping/src/epping_tx.c b/core/utils/epping/src/epping_tx.c index 96e6b357f62f..814f4438dfa3 100644 --- a/core/utils/epping/src/epping_tx.c +++ b/core/utils/epping/src/epping_tx.c @@ -64,14 +64,14 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter, cookie = epping_alloc_cookie(pAdapter->pEpping_ctx); if (cookie == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: epping_alloc_cookie returns no resource\n", __func__); return; } new_skb = cdf_nbuf_copy(skb); if (!new_skb) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: cdf_nbuf_copy returns no resource\n", __func__); epping_free_cookie(pAdapter->pEpping_ctx, cookie); return; @@ -84,7 +84,7 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter, /* send the packet */ ret = htc_send_pkt(pAdapter->pEpping_ctx->HTCHandle, &cookie->HtcPkt); if (ret != A_OK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: htc_send_pkt failed, ret = %d\n", __func__, ret); epping_free_cookie(pAdapter->pEpping_ctx, cookie); cdf_nbuf_free(new_skb); @@ -113,7 +113,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) cookie = epping_alloc_cookie(pAdapter->pEpping_ctx); /* no resource */ if (cookie == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: epping_alloc_cookie returns no resource\n", __func__); return -1; @@ -133,7 +133,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) ac = eppingHdr->StreamNo_h; eid = pAdapter->pEpping_ctx->EppingEndpoint[ac]; if (eid < 0 || eid >= EPPING_MAX_NUM_EPIDS) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: invalid eid = %d, ac = %d\n", __func__, eid, ac); return -1; @@ -151,7 +151,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) ret = htc_send_pkt(pAdapter->pEpping_ctx->HTCHandle, &cookie->HtcPkt); epping_log_packet(pAdapter, &tmpHdr, ret, __func__); if (ret != A_OK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: htc_send_pkt failed, status = %d\n", __func__, ret); epping_free_cookie(pAdapter->pEpping_ctx, cookie); @@ -172,7 +172,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) { cdf_nbuf_t nodrop_skb; - EPPING_LOG(CDF_TRACE_LEVEL_INFO, "%s: queue len: %d\n", __func__, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: queue len: %d\n", __func__, cdf_nbuf_queue_len(&pAdapter->nodrop_queue)); if (!cdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { @@ -184,7 +184,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) /* try to flush nodrop queue */ while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { if (epping_tx_send_int(nodrop_skb, pAdapter)) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p xmit fail in timer\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ @@ -192,7 +192,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) nodrop_skb); break; } else { - EPPING_LOG(CDF_TRACE_LEVEL_INFO, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: nodrop: %p xmit ok in timer\n", __func__, nodrop_skb); } @@ -222,7 +222,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) eppingHdr = (EPPING_HEADER *) cdf_nbuf_data(skb); if (!IS_EPPING_PACKET(eppingHdr)) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Recived non endpoint ping packets\n", __func__); /* no packet to send, cleanup */ cdf_nbuf_free(skb); @@ -233,7 +233,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) ac = eppingHdr->StreamNo_h; /* hard coded two ep ids */ if (ac != 0 && ac != 1) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: ac %d is not mapped to mboxping service\n", __func__, ac); cdf_nbuf_free(skb); @@ -254,7 +254,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) /* check the nodrop queue first */ while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { if (epping_tx_send_int(nodrop_skb, pAdapter)) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p xmit fail\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ @@ -263,7 +263,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) /* no cookie so free the current skb */ goto tx_fail; } else { - EPPING_LOG(CDF_TRACE_LEVEL_INFO, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: nodrop: %p xmit ok\n", __func__, nodrop_skb); } @@ -280,12 +280,12 @@ tx_fail: /* allow to drop the skb so drop it */ cdf_nbuf_free(skb); ++pAdapter->stats.tx_dropped; - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Tx skb %p dropped, stats.tx_dropped = %ld\n", __func__, skb, pAdapter->stats.tx_dropped); return -ENOMEM; } else { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p queued\n", __func__, skb); cdf_nbuf_queue_add(&pAdapter->nodrop_queue, skb); qdf_spin_lock_bh(&pAdapter->data_lock); @@ -345,7 +345,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) if (A_SUCCESS(status)) { ASSERT(htc_pkt->ActualLength == cdf_nbuf_len(pktSkb)); } - EPPING_LOG(CDF_TRACE_LEVEL_INFO, + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s skb=%p data=%p len=0x%x eid=%d ", __func__, pktSkb, htc_pkt->pBuffer, htc_pkt->ActualLength, eid); @@ -360,7 +360,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) __func__, status); } } else { - EPPING_LOG(CDF_TRACE_LEVEL_INFO, "%s: OK\n", __func__); + EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: OK\n", __func__); flushing = false; } diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index 0cfe95687128..4012af562a1f 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -62,14 +62,14 @@ static void epping_timer_expire(void *data) epping_adapter_t *pAdapter; if (dev == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: netdev = NULL", __func__); return; } pAdapter = netdev_priv(dev); if (pAdapter == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: adapter = NULL", __func__); return; } @@ -94,7 +94,7 @@ static int epping_ndev_stop(struct net_device *dev) pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: EPPING adapter context is Null", __func__); ret = -ENODEV; goto end; @@ -110,7 +110,7 @@ static void epping_ndev_uninit(struct net_device *dev) pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: EPPING adapter context is Null", __func__); goto end; } @@ -125,12 +125,12 @@ void epping_tx_queue_timeout(struct net_device *dev) pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: EPPING adapter context is Null", __func__); goto end; } - EPPING_LOG(CDF_TRACE_LEVEL_ERROR, + EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Transmission timeout occurred, pAdapter->started= %d", __func__, pAdapter->started); @@ -153,7 +153,7 @@ int epping_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: EPPING adapter context is Null", __func__); ret = -ENODEV; goto end; @@ -168,7 +168,7 @@ struct net_device_stats *epping_get_stats(struct net_device *dev) epping_adapter_t *pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter = NULL", + EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter = NULL", __func__); return NULL; } @@ -183,13 +183,13 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) pAdapter = netdev_priv(dev); if (NULL == pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: EPPING adapter context is Null", __func__); ret = -ENODEV; goto end; } if (dev != pAdapter->dev) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: HDD adapter/dev inconsistency", __func__); ret = -ENODEV; goto end; @@ -202,12 +202,12 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) switch (cmd) { case (SIOCDEVPRIVATE + 1): - EPPING_LOG(CDF_TRACE_LEVEL_ERROR, + EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: do not support ioctl %d (SIOCDEVPRIVATE + 1)", __func__, cmd); break; default: - EPPING_LOG(CDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d", + EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d", __func__, cmd); ret = -EINVAL; break; @@ -243,7 +243,7 @@ static void epping_stop_adapter(epping_adapter_t *pAdapter) static int epping_start_adapter(epping_adapter_t *pAdapter) { if (!pAdapter) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: pAdapter= NULL\n", __func__); return -1; } @@ -256,7 +256,7 @@ static int epping_start_adapter(epping_adapter_t *pAdapter) netif_tx_start_all_queues(pAdapter->dev); pAdapter->started = true; } else { - EPPING_LOG(CDF_TRACE_LEVEL_WARN, + EPPING_LOG(QDF_TRACE_LEVEL_WARN, "%s: pAdapter %p already started\n", __func__, pAdapter); } @@ -269,7 +269,7 @@ static int epping_register_adapter(epping_adapter_t *pAdapter) ret = register_netdev(pAdapter->dev); if (ret != 0) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: unable to register device\n", pAdapter->dev->name); } else { @@ -287,7 +287,7 @@ static void epping_unregister_adapter(epping_adapter_t *pAdapter) pAdapter->registered = false; } } else { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: pAdapter = NULL, unable to unregister device\n", __func__); } @@ -299,7 +299,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter) epping_context_t *pEpping_ctx; if (!pAdapter || !pAdapter->pEpping_ctx) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: pAdapter = NULL\n", __func__); return; } @@ -321,7 +321,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter) free_netdev(dev); if (!pEpping_ctx) - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: pEpping_ctx = NULL\n", __func__); else pEpping_ctx->epping_adapter = NULL; @@ -354,7 +354,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, #endif ether_setup); if (dev == NULL) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Cannot allocate epping_adapter_t\n", __func__); return NULL; } @@ -390,6 +390,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, int epping_connect_service(epping_context_t *pEpping_ctx) { int status, i; + int ret = -1; HTC_SERVICE_CONNECT_REQ connect; HTC_SERVICE_CONNECT_RESP response; @@ -419,12 +420,12 @@ int epping_connect_service(epping_context_t *pEpping_ctx) connect.service_id = WMI_DATA_BE_SVC; status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response); if (status != EOK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "Failed to connect to Endpoint Ping BE service status:%d \n", status); return -1;; } else { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "eppingtest BE endpoint:%d\n", response.Endpoint); } pEpping_ctx->EppingEndpoint[0] = response.Endpoint; @@ -433,12 +434,12 @@ int epping_connect_service(epping_context_t *pEpping_ctx) connect.service_id = WMI_DATA_BK_SVC; status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response); if (status != EOK) { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "Failed to connect to Endpoint Ping BK service status:%d \n", status); - return -1;; + return ret; } else { - EPPING_LOG(CDF_TRACE_LEVEL_FATAL, + EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "eppingtest BK endpoint:%d\n", response.Endpoint); } pEpping_ctx->EppingEndpoint[1] = response.Endpoint; diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c index 0e1c570fe1ce..0ad80713f3f7 100644 --- a/core/utils/host_diag_log/src/host_diag_log.c +++ b/core/utils/host_diag_log/src/host_diag_log.c @@ -117,7 +117,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -134,7 +134,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -214,7 +214,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, uint16_t total_len; if (cds_is_load_or_unload_in_progress()) { - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "%s: Unloading/Loading in Progress. Ignore!!!", __func__); return; @@ -229,7 +229,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, pBuf = (uint8_t *) cdf_mem_malloc(total_len); if (!pBuf) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "cdf_mem_malloc failed"); return; } @@ -250,7 +250,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, if (ptt_sock_send_msg_to_app (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID) < 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Ptt Socket error sending message to the app!!"); cdf_mem_free((void *)wmsg); return; diff --git a/core/utils/logging/inc/wlan_logging_sock_svc.h b/core/utils/logging/inc/wlan_logging_sock_svc.h index d6c94930ba49..1850a0138466 100644 --- a/core/utils/logging/inc/wlan_logging_sock_svc.h +++ b/core/utils/logging/inc/wlan_logging_sock_svc.h @@ -35,14 +35,14 @@ #include #include -#include +#include #include int wlan_logging_sock_init_svc(void); int wlan_logging_sock_deinit_svc(void); int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf); int wlan_logging_sock_deactivate_svc(void); -int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length); +int wlan_log_to_user(QDF_TRACE_LEVEL log_level, char *to_be_sent, int length); void wlan_logging_set_per_pkt_stats(void); void wlan_logging_set_log_level(void); void wlan_logging_set_fw_flush_complete(void); diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 04e367499820..55eefa96d4a7 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -41,7 +41,7 @@ #include #define LOGGING_TRACE(level, args ...) \ - CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) + QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args) /* Global variables */ @@ -119,7 +119,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, static int nlmsg_seq; if (radio < 0 || radio > ANI_MAX_RADIOS) { - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]", __func__, radio); return -EINVAL; } @@ -128,7 +128,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, tot_msg_len = NLMSG_SPACE(payload_len); skb = dev_alloc_skb(tot_msg_len); if (skb == NULL) { - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: dev_alloc_skb() failed for msg size[%d]", __func__, tot_msg_len); return -ENOMEM; @@ -136,7 +136,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, nlh = nlmsg_put(skb, pid, nlmsg_seq++, src_mod, payload_len, NLM_F_REQUEST); if (NULL == nlh) { - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: nlmsg_put() failed for msg size[%d]", __func__, tot_msg_len); kfree_skb(skb); @@ -146,7 +146,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio, wnl = (tAniNlHdr *) nlh; wnl->radio = radio; memcpy(&wnl->wmsg, wmsg, wmsg_length); - LOGGING_TRACE(CDF_TRACE_LEVEL_INFO, + LOGGING_TRACE(QDF_TRACE_LEVEL_INFO, "%s: Sending Msg Type [0x%X] to pid[%d]\n", __func__, be16_to_cpu(wmsg->type), pid); @@ -183,10 +183,10 @@ static void set_default_logtoapp_log_level(void) /* module id 0 is reserved */ for (i = 1; i < QDF_MODULE_ID_MAX; i++) { if (is_data_path_module(i)) - cdf_trace_set_module_trace_level(i, - CDF_DATA_PATH_TRACE_LEVEL); + qdf_trace_set_module_trace_level(i, + QDF_DATA_PATH_TRACE_LEVEL); else - cdf_trace_set_value(i, CDF_TRACE_LEVEL_ALL, true); + qdf_trace_set_value(i, QDF_TRACE_LEVEL_ALL, true); } } @@ -195,12 +195,12 @@ static void clear_default_logtoapp_log_level(void) int module; for (module = 0; module < QDF_MODULE_ID_MAX; module++) { - cdf_trace_set_value(module, CDF_TRACE_LEVEL_NONE, false); - cdf_trace_set_value(module, CDF_TRACE_LEVEL_FATAL, true); - cdf_trace_set_value(module, CDF_TRACE_LEVEL_ERROR, true); + qdf_trace_set_value(module, QDF_TRACE_LEVEL_NONE, false); + qdf_trace_set_value(module, QDF_TRACE_LEVEL_FATAL, true); + qdf_trace_set_value(module, QDF_TRACE_LEVEL_ERROR, true); } - cdf_trace_set_value(QDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE, + qdf_trace_set_value(QDF_MODULE_ID_RSV4, QDF_TRACE_LEVEL_NONE, false); } @@ -297,7 +297,7 @@ static int wlan_add_user_log_time_stamp(char *tbuf, size_t tbuf_sz, uint64_t ts) } #endif -int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length) +int wlan_log_to_user(QDF_TRACE_LEVEL log_level, char *to_be_sent, int length) { /* Add the current time stamp */ char *ptr; @@ -352,13 +352,13 @@ int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length) /* Assumption here is that we receive logs which is always less than * MAX_LOGMSG_LENGTH, where we can accomodate the * tAniNlHdr + [context][timestamp] + log - * CDF_ASSERT if we cannot accomodate the the complete log into + * QDF_ASSERT if we cannot accomodate the the complete log into * the available buffer. * * Continue and copy logs to the available length and discard the rest. */ if (MAX_LOGMSG_LENGTH < (sizeof(tAniNlHdr) + total_log_len)) { - CDF_ASSERT(0); + QDF_ASSERT(0); total_log_len = MAX_LOGMSG_LENGTH - sizeof(tAniNlHdr) - 2; } @@ -378,8 +378,8 @@ int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length) } if (gwlan_logging.log_fe_to_console - && ((CDF_TRACE_LEVEL_FATAL == log_level) - || (CDF_TRACE_LEVEL_ERROR == log_level))) { + && ((QDF_TRACE_LEVEL_FATAL == log_level) + || (QDF_TRACE_LEVEL_ERROR == log_level))) { pr_info("%s\n", to_be_sent); } @@ -509,7 +509,7 @@ void send_flush_completion_to_user(void) cds_get_log_completion(&is_fatal, &indicator, &reason_code); /* Error on purpose, so that it will get logged in the kmsg */ - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: Sending flush done to userspace", __func__); wlan_report_log_completion(is_fatal, indicator, reason_code); @@ -616,7 +616,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb) type = wnl->nlh.nlmsg_type; if (radio < 0 || radio > ANI_MAX_RADIOS) { - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n", __func__, radio); return -EINVAL; } @@ -644,7 +644,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb) ret = wlan_send_sock_msg_to_app(&wnl->wmsg, 0, ANI_NL_MSG_LOG, wnl->nlh.nlmsg_pid); if (ret < 0) { - LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR, + LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR, "wlan_send_sock_msg_to_app: failed"); } diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c index e1134049877c..80055a64f656 100644 --- a/core/utils/nlink/src/wlan_nlink_srv.c +++ b/core/utils/nlink/src/wlan_nlink_srv.c @@ -41,7 +41,7 @@ #include #include #include -#include +#include /* Global variables */ static DEFINE_MUTEX(nl_srv_sem); @@ -71,7 +71,7 @@ int nl_srv_init(void) if (nl_srv_sock != NULL) { memset(nl_srv_msg_handler, 0, sizeof(nl_srv_msg_handler)); } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "NLINK: netlink_kernel_create failed"); retcode = -ECONNREFUSED; } @@ -103,7 +103,7 @@ int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) msg_handler != NULL) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = msg_handler; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_register failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -123,7 +123,7 @@ int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) (nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] == msg_handler)) { nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = NULL; } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: nl_srv_unregister failed for msg_type %d", msg_type); retcode = -EINVAL; @@ -147,7 +147,7 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag) err = netlink_unicast(nl_srv_sock, skb, dst_pid, flag); if (err < 0) - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: netlink_unicast to pid[%d] failed, ret[0x%X]", dst_pid, err); @@ -174,7 +174,7 @@ int nl_srv_bcast(struct sk_buff *skb) WLAN_NLINK_MCAST_GRP_ID, flags); if (err < 0) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: netlink_broadcast failed err = %d", err); } return err; @@ -207,7 +207,7 @@ static void nl_srv_rcv_skb(struct sk_buff *skb) nlh = (struct nlmsghdr *)skb->data; if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: Invalid " "Netlink message: skb[%p], len[%d], nlhdr[%p], nlmsg_len[%d]", skb, skb->len, nlh, nlh->nlmsg_len); @@ -232,7 +232,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Only requests are handled by kernel now */ if (!(nlh->nlmsg_flags & NLM_F_REQUEST)) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Req type [%x]", nlh->nlmsg_flags); return; @@ -242,7 +242,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* Unknown message */ if (type < WLAN_NL_MSG_BASE || type >= WLAN_NL_MSG_MAX) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: Received Invalid NL Msg type [%x]", type); return; } @@ -252,13 +252,13 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) * Drop any message with invalid length */ if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr))) { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: Received NL Msg with invalid len[%x]", nlh->nlmsg_len); return; } - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "NLINK: Received NL msg type [%d]", type); /* turn type into dispatch table offset */ @@ -268,7 +268,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if (nl_srv_msg_handler[type] != NULL) { (nl_srv_msg_handler[type])(skb); } else { - CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, "NLINK: No handler for Netlink Msg [0x%X]", type); } } diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h index 07ec6f7c5a42..08c149053446 100644 --- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h +++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include /* * Quarky Message Format: diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c index b63799e1cbbd..fe81e8c2d7c7 100644 --- a/core/utils/ptt/src/wlan_ptt_sock_svc.c +++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c @@ -33,15 +33,15 @@ #include #include #include -#include +#include #include #include #include -#include +#include #define PTT_SOCK_DEBUG #ifdef PTT_SOCK_DEBUG -#define PTT_TRACE(level, args ...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) +#define PTT_TRACE(level, args ...) QDF_TRACE(QDF_MODULE_ID_QDF, level, ## args) #else #define PTT_TRACE(level, args ...) #endif @@ -56,13 +56,13 @@ static void ptt_sock_dump_buf(const unsigned char *pbuf, int cnt) int i; for (i = 0; i < cnt; i++) { if ((i % 16) == 0) - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "\n%p:", pbuf); - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, " %02X", + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, " %02X", *pbuf); pbuf++; } - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n"); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "\n"); } #endif @@ -90,7 +90,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid) static int nlmsg_seq; if (radio < 0 || radio > ANI_MAX_RADIOS) { - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n", + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n", __func__, radio); return -EINVAL; } @@ -98,7 +98,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid) tot_msg_len = NLMSG_SPACE(payload_len); skb = dev_alloc_skb(tot_msg_len); if (skb == NULL) { - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: dev_alloc_skb() failed for msg size[%d]\n", __func__, tot_msg_len); return -ENOMEM; @@ -107,7 +107,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid) nlmsg_put(skb, pid, nlmsg_seq++, src_mod, payload_len, NLM_F_REQUEST); if (NULL == nlh) { - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: nlmsg_put() failed for msg size[%d]\n", __func__, tot_msg_len); kfree_skb(skb); @@ -116,7 +116,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid) wnl = (tAniNlHdr *) nlh; wnl->radio = radio; memcpy(&wnl->wmsg, wmsg, wmsg_length); - PTT_TRACE(CDF_TRACE_LEVEL_INFO, + PTT_TRACE(QDF_TRACE_LEVEL_INFO, "%s: Sending Msg Type [0x%X] to pid[%d]\n", __func__, be16_to_cpu(wmsg->type), pid); #ifdef PTT_SOCK_DEBUG_VERBOSE @@ -151,7 +151,7 @@ static void ptt_sock_proc_reg_req(tAniHdr *wmsg, int radio) rspmsg.wniHdr.length = cpu_to_be16(sizeof(rspmsg)); if (ptt_sock_send_msg_to_app((tAniHdr *) &rspmsg.wniHdr, radio, ANI_NL_MSG_PUMAC, ptt_pid) < 0) { - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: Error sending ANI_MSG_APP_REG_RSP to pid[%d]\n", __func__, ptt_pid); } @@ -165,13 +165,13 @@ static void ptt_proc_pumac_msg(struct sk_buff *skb, tAniHdr *wmsg, int radio) u16 ani_msg_type = be16_to_cpu(wmsg->type); switch (ani_msg_type) { case ANI_MSG_APP_REG_REQ: - PTT_TRACE(CDF_TRACE_LEVEL_INFO, + PTT_TRACE(QDF_TRACE_LEVEL_INFO, "%s: Received ANI_MSG_APP_REG_REQ [0x%X]\n", __func__, ani_msg_type); ptt_sock_proc_reg_req(wmsg, radio); break; default: - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: Received Unknown Msg Type[0x%X]\n", __func__, ani_msg_type); break; @@ -191,13 +191,13 @@ static int ptt_sock_rx_nlink_msg(struct sk_buff *skb) type = wnl->nlh.nlmsg_type; switch (type) { case ANI_NL_MSG_PUMAC: /* Message from the PTT socket APP */ - PTT_TRACE(CDF_TRACE_LEVEL_INFO, + PTT_TRACE(QDF_TRACE_LEVEL_INFO, "%s: Received ANI_NL_MSG_PUMAC Msg [0x%X]\n", __func__, type); ptt_proc_pumac_msg(skb, &wnl->wmsg, radio); break; default: - PTT_TRACE(CDF_TRACE_LEVEL_ERROR, "%s: Unknown NL Msg [0x%X]\n", + PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: Unknown NL Msg [0x%X]\n", __func__, type); break; } diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index b7bfb6c502ea..7832672223c6 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -93,21 +93,21 @@ #define WMA_11P_CHANNEL_END (184) #define WMA_LOGD(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, ## args) #define WMA_LOGI(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, ## args) #define WMA_LOGW(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_WARN, ## args) #define WMA_LOGE(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, ## args) #define WMA_LOGP(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_FATAL, ## args) #define WMA_DEBUG_ALWAYS #ifdef WMA_DEBUG_ALWAYS #define WMA_LOGA(args ...) \ - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args) + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_FATAL, ## args) #else #define WMA_LOGA(args ...) #endif diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 592c1554c9db..78cd55ecbe1a 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1063,20 +1063,20 @@ QDF_STATUS wma_set_mcc_channel_time_latency if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGE("%s: MCC is not active. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* Confirm MCC adaptive scheduler feature is disabled */ @@ -1090,7 +1090,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency } else { WMA_LOGE("%s: Failed to get value for MCC_ADAPTIVE_SCHED, " "Exit w/o setting latency", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* If 0ms latency is provided, then FW will set to a default. @@ -1135,7 +1135,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency WMA_LOGE("%s: Failed to send MCC Channel Time Latency command", __func__); cdf_nbuf_free(buf); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -1187,20 +1187,20 @@ QDF_STATUS wma_set_mcc_channel_time_quota if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } /* First step is to confirm if MCC is active */ if (!lim_is_in_mcc(pMac)) { WMA_LOGD("%s: MCC is not active. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -1216,7 +1216,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota } else { WMA_LOGE("%s: Failed to retrieve " "WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED. Exit", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -1236,7 +1236,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_NOMEM; } buf_ptr = (uint8_t *) wmi_buf_data(buf); @@ -1267,7 +1267,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota if (ret) { WMA_LOGE("Failed to send MCC Channel Time Quota command"); cdf_nbuf_free(buf); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 1da4dfb47e35..a4ce0beab19f 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -113,7 +113,7 @@ bool wma_is_vdev_in_ap_mode(tp_wma_handle wma, uint8_t vdev_id) if (vdev_id > wma->max_bssid) { WMA_LOGP("%s: Invalid vdev_id %hu", __func__, vdev_id); - CDF_ASSERT(0); + QDF_ASSERT(0); return false; } @@ -142,7 +142,7 @@ bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id) if (vdev_id > wma->max_bssid) { WMA_LOGP("%s: Invalid vdev_id %hu", __func__, vdev_id); - CDF_ASSERT(0); + QDF_ASSERT(0); return false; } @@ -2587,12 +2587,12 @@ void wma_hold_req_timer(void *data) * Assert in development build only. * Send response in production builds. */ - CDF_ASSERT(0); + QDF_ASSERT(0); wma_send_msg(wma, WMA_DELETE_STA_RSP, (void *)params, 0); } else if ((tgt_req->msg_type == WMA_DELETE_STA_REQ) && (tgt_req->type == WMA_DEL_P2P_SELF_STA_RSP_START)) { WMA_LOGA(FL("wma delete sta p2p request timed out")); - CDF_ASSERT(0); + QDF_ASSERT(0); } free_tgt_req: qdf_mc_timer_destroy(&tgt_req->event_timeout); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 0902ba66d574..c3ae9572d088 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2946,8 +2946,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len, WOW_REASON_PATTERN_MATCH_FOUND); - cdf_trace_hex_dump(QDF_MODULE_ID_WMA, - CDF_TRACE_LEVEL_DEBUG, + qdf_trace_hex_dump(QDF_MODULE_ID_WMA, + QDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer + 4, wow_buf_pkt_len); } else { @@ -2970,8 +2970,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((uint8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(QDF_MODULE_ID_WMA, - CDF_TRACE_LEVEL_DEBUG, + qdf_trace_hex_dump(QDF_MODULE_ID_WMA, + QDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); if (wow_buf_pkt_len >= sizeof(param)) { @@ -3003,8 +3003,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); - cdf_trace_hex_dump(QDF_MODULE_ID_WMA, - CDF_TRACE_LEVEL_DEBUG, + qdf_trace_hex_dump(QDF_MODULE_ID_WMA, + QDF_TRACE_LEVEL_DEBUG, param_buf->wow_packet_buffer, wow_buf_pkt_len); if (wow_buf_pkt_len >= sizeof(param)) { param.fixed_param = (wmi_peer_sta_kickout_event_fixed_param *) @@ -3252,11 +3252,11 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, bitmap_pattern->pattern_offset, user); WMA_LOGI("Pattern : "); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, &bitmap_pattern->patternbuf[0], bitmap_pattern->pattern_len); WMA_LOGI("Mask : "); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, &bitmap_pattern->bitmaskbuf[0], bitmap_pattern->pattern_len); buf_ptr += sizeof(WOW_BITMAP_PATTERN_T); @@ -3615,10 +3615,10 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (pMac->sme.enableSelfRecovery) { cds_trigger_recovery(); } else { - CDF_BUG(0); + QDF_BUG(0); } #else - CDF_BUG(0); + QDF_BUG(0); #endif /* CONFIG_CNSS */ } else { WMA_LOGE("%s: LOGP is in progress, ignore!", __func__); @@ -3643,7 +3643,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) wmi_pending_cmds); htc_dump_counter_info(wma->htc_handle); if (!cds_is_driver_recovering()) - CDF_BUG(0); + QDF_BUG(0); else WMA_LOGE("%s: SSR in progress, ignore no credit issue", __func__); @@ -3656,7 +3656,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAULT; } @@ -4306,10 +4306,10 @@ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) if (pMac->sme.enableSelfRecovery) { cds_trigger_recovery(); } else { - CDF_BUG(0); + QDF_BUG(0); } #else - CDF_BUG(0); + QDF_BUG(0); #endif /* CONFIG_CNSS */ } else { WMA_LOGE("%s: SSR in progress, ignore resume timeout", @@ -4840,9 +4840,9 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, pTsmRspParams = (tpAniGetTsmStatsRsp) cdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if (NULL == pTsmRspParams) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "%s: CDF MEM Alloc Failure", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); cdf_mem_free(pTsmStatsMsg); return QDF_STATUS_E_NOMEM; } @@ -6593,7 +6593,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) if (pmac->sme.enableSelfRecovery) { cds_trigger_recovery(); } else { - CDF_BUG(0); + QDF_BUG(0); } } else { WMA_LOGE("%s: LOGP is in progress, ignore!", __func__); @@ -6606,7 +6606,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return -EFAULT; } @@ -6691,10 +6691,10 @@ int wma_resume_target(WMA_HANDLE handle) if (pMac->sme.enableSelfRecovery) { cds_trigger_recovery(); } else { - CDF_BUG(0); + QDF_BUG(0); } #else - CDF_BUG(0); + QDF_BUG(0); #endif /* CONFIG_CNSS */ } else { WMA_LOGE("%s: SSR in progress, ignore resume timeout", diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 66f3696fc1f3..8c853a4b0d98 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -122,7 +122,7 @@ static void wma_service_ready_ext_evt_timeout(void *data) } end: /* Panic so that we can debug why FW is not responding */ - CDF_BUG(0); + QDF_BUG(0); } /** @@ -2087,7 +2087,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx) qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg); if (QDF_STATUS_SUCCESS != qdf_status) { WMA_LOGP("%s: Failed to post WNI_CFG_DNLD_REQ msg", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); qdf_status = QDF_STATUS_E_FAILURE; } end: @@ -2117,7 +2117,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, if (QDF_STATUS_SUCCESS != status) { if (NULL != body_ptr) cdf_mem_free(body_ptr); - CDF_ASSERT(0); + QDF_ASSERT(0); } return; } @@ -3610,7 +3610,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, /* allocate memory requested by FW */ if (ev->num_mem_reqs > WMI_MAX_MEM_REQS) { - CDF_ASSERT(0); + QDF_ASSERT(0); cdf_nbuf_free(buf); return NULL; } @@ -4148,7 +4148,7 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) param_buf = (WMI_READY_EVENTID_param_tlvs *) cmd_param_info; if (!(wma_handle && param_buf)) { WMA_LOGP("%s: Invalid arguments", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -4225,7 +4225,7 @@ void wma_setneedshutdown(void *cds_ctx) if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return; } @@ -4249,7 +4249,7 @@ bool wma_needshutdown(void *cds_ctx) if (NULL == wma_handle) { WMA_LOGP("%s: Invalid arguments", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return false; } @@ -4704,7 +4704,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) WMA_LOGI("%s: Enter", __func__); if (NULL == msg) { WMA_LOGE("msg is NULL"); - CDF_ASSERT(0); + QDF_ASSERT(0); qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4716,7 +4716,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) if (NULL == wma_handle) { WMA_LOGP("%s: wma_handle is NULL", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); cdf_mem_free(msg->bodyptr); qdf_status = QDF_STATUS_E_INVAL; goto end; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index fdd319520433..fce66cc66d06 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2090,7 +2090,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, if (pdev) ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param); else - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_SUCCESS; diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 1326e28e7724..9d9a987cc22b 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -655,7 +655,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Tx/Rx Data InActivity Timeout */ if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT"); cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME; } @@ -668,7 +668,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) @@ -681,7 +681,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Ps Poll Wake Policy */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -771,7 +771,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -816,7 +816,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Get Configured Ps Poll Count */ if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_MAX_PS_POLL"); } if (cfg_data_val) { @@ -883,7 +883,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Set Listen Interval */ if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for WNI_CFG_LISTEN_INTERVAL"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } @@ -2189,7 +2189,7 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) WNI_CFG_LISTEN_INTERVAL, &cfg_data_val) != eSIR_SUCCESS)) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get value for listen interval"); cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index dc94eba0c8eb..55586707e1ad 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1964,7 +1964,7 @@ QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, roam_params->ssid_allowed_list[i].length); ssid_ptr->ssid_len = roam_params->ssid_allowed_list[i].length; WMA_LOGD("%s: SSID length=%d", __func__, ssid_ptr->ssid_len); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, (uint8_t *)ssid_ptr->ssid, ssid_ptr->ssid_len); ssid_ptr++; @@ -2285,8 +2285,8 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(scan_offload_rsp); - CDF_TRACE(QDF_MODULE_ID_WMA, - CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_WMA, + QDF_TRACE_LEVEL_INFO, "%s: Failed to post Scan Offload Rsp to UMAC", __func__); } @@ -2589,13 +2589,13 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, cdf_mem_copy(roam_synch_ind_ptr->replay_ctr, key->replay_counter, SIR_REPLAY_CTR_LEN); WMA_LOGD("%s: KCK dump", __func__); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, key->kck, SIR_KCK_KEY_LEN); WMA_LOGD("%s: KEK dump", __func__); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, key->kek, SIR_KEK_KEY_LEN); WMA_LOGD("%s: Key Replay Counter dump", __func__); - CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, + QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, key->replay_counter, SIR_REPLAY_CTR_LEN); } } @@ -2720,7 +2720,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, if (!roam_synch_ind_ptr) { WMA_LOGE("%s: failed to allocate memory for roam_synch_event", __func__); - CDF_ASSERT(roam_synch_ind_ptr != NULL); + QDF_ASSERT(roam_synch_ind_ptr != NULL); return -ENOMEM; } cdf_mem_zero(roam_synch_ind_ptr, len); @@ -2739,8 +2739,8 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, roam_synch_ind_ptr->join_rsp = cdf_mem_malloc(sizeof(tSirSmeJoinRsp)); if ((NULL == roam_synch_ind_ptr->join_rsp) || (NULL == bss_desc_ptr)) { WMA_LOGE("LFR3: mem alloc failed!"); - CDF_ASSERT(bss_desc_ptr != NULL); - CDF_ASSERT(roam_synch_ind_ptr->join_rsp != NULL); + QDF_ASSERT(bss_desc_ptr != NULL); + QDF_ASSERT(roam_synch_ind_ptr->join_rsp != NULL); status = -ENOMEM; goto cleanup_label; } @@ -2843,12 +2843,12 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_PRIVACY_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2857,7 +2857,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (val) selfCaps.privacy = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SHORT_PREAMBLE"); return QDF_STATUS_E_FAILURE; } @@ -2868,28 +2868,28 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, selfCaps.channelAgility = 0; if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.shortSlotTime = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_11H_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.spectrumMgt = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_QOS_ENABLED"); return QDF_STATUS_E_FAILURE; } if (val) selfCaps.qos = 1; if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_APSD_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2900,7 +2900,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_BLOCK_ACK_ENABLED"); return QDF_STATUS_E_FAILURE; } @@ -2913,7 +2913,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2922,7 +2922,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_HT_AMPDU_PARAMS"); return QDF_STATUS_E_FAILURE; } @@ -2934,13 +2934,13 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, if (wlan_cfg_get_str(pMac, WNI_CFG_SUPPORTED_MCS_SET, (uint8_t *) roam_offload_params->mcsset, &val) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_SUPPORTED_MCS_SET"); return QDF_STATUS_E_FAILURE; } if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_EXT_HT_CAP_INFO"); return QDF_STATUS_E_FAILURE; } @@ -2950,7 +2950,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, uHTCapabilityInfo.nCfgValue16 & 0xFFFF; if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_TX_BF_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2958,7 +2958,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, nCfgValue8 = (uint8_t) nCfgValue; roam_offload_params->ht_txbf = nCfgValue8 & 0xFF; if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_AS_CAP"); return QDF_STATUS_E_FAILURE; } @@ -2969,7 +2969,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, /* QOS Info */ if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_SP_LENGTH, &nCfgValue) != eSIR_SUCCESS) { - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Failed to get WNI_CFG_MAX_SP_LENGTH"); return QDF_STATUS_E_FAILURE; } @@ -6671,13 +6671,13 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) cds_msg.type = eWNI_SME_CANDIDATE_FOUND_IND; cds_msg.bodyptr = candidate_ind; - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, FL("posting candidate ind to SME")); if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { cdf_mem_free(candidate_ind); - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, FL("Failed to post candidate ind to SME")); } } diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index eabec8b36e65..907b50bde005 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -413,9 +413,9 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, buf_ptr = buf_ptr + sizeof(wmi_wlan_profile_ctx_t) + WMI_TLV_HDR_SIZE; profile_data = (wmi_wlan_profile_t *) buf_ptr; entries = profile_ctx->bin_count; - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Profile data stats\n"); - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "TOT: %d\n" "tx_msdu_cnt: %d\n" "tx_mpdu_cnt: %d\n" @@ -434,7 +434,7 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, for (i = 0; i < entries; i++) { if (i == WMI_WLAN_PROFILE_MAX_BIN_CNT) break; - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "Profile ID: %d\n" "Profile Count: %d\n" "Profile TOT: %d\n" @@ -1591,7 +1591,7 @@ QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle) if (NULL == mac) { WMA_LOGP("%s: Invalid context", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -2038,7 +2038,7 @@ static tAniGetPEStatsRsp *wma_get_stats_rsp_buf stats_rsp_params = (tAniGetPEStatsRsp *) cdf_mem_malloc(len); if (!stats_rsp_params) { WMA_LOGE("memory allocation failed for tAniGetPEStatsRsp"); - CDF_ASSERT(0); + QDF_ASSERT(0); return NULL; } diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 59a1fb1180c7..e80a0299a144 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -173,7 +173,7 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name, wmi_buf_t wmi_buf; if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) { - CDF_ASSERT(0); + QDF_ASSERT(0); return NULL; } @@ -206,7 +206,7 @@ wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len) wmi_buf_t wmi_buf; if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) { - CDF_ASSERT(0); + QDF_ASSERT(0); return NULL; } @@ -807,7 +807,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, (WMI_PDEV_RESUME_CMDID != cmd_id))) { pr_err("%s: Target is suspended could not send WMI command\n", __func__); - CDF_ASSERT(0); + QDF_ASSERT(0); return -EBUSY; } @@ -840,7 +840,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, htc_dump_counter_info(wmi_handle->htc_handle); qdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s: MAX 1024 WMI Pending cmds reached.\n", __func__); - CDF_BUG(0); + QDF_BUG(0); return -EBUSY; } @@ -1266,7 +1266,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) { wmi_buf_t buf; - CDF_TRACE(QDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO, "Enter: %s", __func__); cds_flush_work(&wmi_handle->rx_event_work); qdf_spin_lock_bh(&wmi_handle->eventq_lock); @@ -1276,7 +1276,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); } qdf_spin_unlock_bh(&wmi_handle->eventq_lock); - CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, "Done: %s", __func__); } diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index 27f74f2f3662..a62b96d3f613 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -72,11 +72,11 @@ #define A_MEMCMP(addr1, addr2, len) memcmp((addr1), (addr2), (len)) #define A_LOGGER(mask, mod, args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF(args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) #define A_PRINTF_LOG(args ...) \ - CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args) + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args) #define A_SNPRINTF(buf, len, args ...) snprintf (buf, len, args) /* -- cgit v1.2.3 From df2b26883dba2ebd84b2830d75d06acdbfff7219 Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Mon, 29 Feb 2016 14:15:27 +0530 Subject: qcacld-3.0: Fix compilation issues after rebase Remove the compilation issues for references to cdf after rebase Change-Id: Ia39c5c72fe5c95f9a91d5f6967ea60904b46f756 CRs-Fixed: 981188 --- core/bmi/inc/bmi.h | 2 +- core/bmi/src/bmi.c | 32 +++++++++++++------------- core/bmi/src/bmi_1.c | 16 ++++++------- core/bmi/src/bmi_2.c | 26 ++++++++++----------- core/bmi/src/i_bmi.h | 4 ++-- core/bmi/src/ol_fw.c | 8 +++---- core/cdf/inc/cdf_nbuf.h | 8 +++---- core/cdf/src/cdf_memory.c | 2 +- core/cdf/src/cdf_nbuf.c | 10 ++++----- core/cdf/src/i_cdf_nbuf.h | 4 ++-- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_sched.h | 4 ++-- core/cds/src/cds_api.c | 10 +++------ core/dp/htt/htt_tx.c | 12 +++++----- core/dp/ol/inc/ol_htt_tx_api.h | 14 ++++++------ core/dp/txrx/ol_tx.c | 12 +++++----- core/dp/txrx/ol_tx_desc.c | 6 ++--- core/dp/txrx/ol_txrx.c | 8 +++---- core/dp/txrx/ol_txrx_types.h | 4 ++-- core/hdd/src/wlan_hdd_driver_ops.c | 10 ++++----- core/hdd/src/wlan_hdd_ftm.c | 6 ++--- core/hdd/src/wlan_hdd_ipa.c | 18 +++++++-------- core/hdd/src/wlan_hdd_main.c | 6 ++--- core/hdd/src/wlan_hdd_memdump.c | 34 ++++++++++++++-------------- core/utils/epping/src/epping_main.c | 8 +++---- core/wma/inc/wma.h | 2 +- core/wma/src/wma_data.c | 4 ++-- core/wma/src/wma_main.c | 45 ++++++++++++++++++------------------- 28 files changed, 156 insertions(+), 161 deletions(-) diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index eb0431e6c359..538ed0be99b7 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -38,7 +38,7 @@ #include "hif.h" struct ol_context; -QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx); +QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx); void ol_cds_free(void); /** diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 3e72c76af96c..ffc6966a09e6 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -60,7 +60,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); struct hif_opaque_softc *scn = ol_ctx->scn; - cdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!scn) { BMI_ERR("Invalid scn Context"); @@ -105,7 +105,7 @@ end: void bmi_cleanup(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); - cdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t cdf_dev = ol_ctx->cdf_dev; if (!cdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); @@ -153,8 +153,8 @@ bmi_get_target_info(struct bmi_target_info *targ_info, uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t cid, length; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("BMI Phase is Already Done"); @@ -239,8 +239,8 @@ QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); @@ -284,8 +284,8 @@ QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(size)); cdf_mem_set(bmi_cmd_buff, 0, size); @@ -329,8 +329,8 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); @@ -386,8 +386,8 @@ QDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint32_t remaining, txlen; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); @@ -449,8 +449,8 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) struct hif_opaque_softc *scn = ol_ctx->scn; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); @@ -522,7 +522,7 @@ end: * * Return: Success/Failure */ -QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) +QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx) { struct ol_context *ol_info; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -543,7 +543,7 @@ QDF_STATUS ol_cds_init(cdf_device_t cdf_dev, void *hif_ctx) ol_info->scn = hif_ctx; ol_info->tgt_def.targetdef = hif_get_targetdef(hif_ctx); - cdf_create_work(&ol_info->ramdump_work, ramdump_work_handler, ol_info); + qdf_create_work(cdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info); return status; } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index d95dbe75b1bb..adcf117c2f45 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -43,8 +43,8 @@ bmi_read_memory(uint32_t address, uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t align; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_DBG("command disallowed"); @@ -119,8 +119,8 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, uint8_t *src; struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -193,8 +193,8 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(param); - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -289,8 +289,8 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) int status; uint32_t cid; struct bmi_info *info; - cdf_device_t cdf_dev = ol_ctx->cdf_dev; - cdf_dma_addr_t cmd, rsp; + qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_dma_addr_t cmd, rsp; if (!scn) { BMI_ERR("Invalid scn context"); diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index ef697ecf6412..e2a3c291d2d5 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -44,8 +44,8 @@ bmi_no_command(struct ol_context *ol_ctx) struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed: BMI DONE ALREADY"); @@ -88,9 +88,9 @@ bmi_done_local(struct ol_context *ol_ctx) struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_device_t cdf_dev = ol_ctx->cdf_dev; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -159,8 +159,8 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -235,8 +235,8 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, /* note we reuse the same buffer to receive on */ uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; uint32_t size = sizeof(cid) + sizeof(address) + sizeof(length); - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -307,8 +307,8 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -355,8 +355,8 @@ bmi_load_image(dma_addr_t address, struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - cdf_dma_addr_t cmd = info->bmi_cmd_da; - cdf_dma_addr_t rsp = info->bmi_rsp_da; + qdf_dma_addr_t cmd = info->bmi_cmd_da; + qdf_dma_addr_t rsp = info->bmi_rsp_da; uint32_t addr_h, addr_l; diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 2638981efcb2..23f5936e2ac0 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -157,8 +157,8 @@ struct ol_context { struct bmi_info bmi; struct ol_config_info cfg_info; uint8_t *cal_in_flash; - cdf_device_t cdf_dev; - cdf_work_t ramdump_work; + qdf_device_t cdf_dev; + qdf_work_t ramdump_work; struct hif_opaque_softc *scn; struct targetdef_t { struct targetdef_s *targetdef; diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 77cc3f713a94..ccae3469e492 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -151,7 +151,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); uint32_t target_type = tgt_info->target_type; struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx); - cdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t cdf_dev = ol_ctx->cdf_dev; switch (file) { default: @@ -611,13 +611,13 @@ void ol_target_failure(void *instance, QDF_STATUS status) { struct ol_context *ol_ctx = instance; struct hif_opaque_softc *scn = ol_ctx->scn; - tp_wma_handle wma = cds_get_context(CDF_MODULE_ID_WMA); + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); struct ol_config_info *ini_cfg = ol_get_ini_handle(ol_ctx); int ret; ol_target_status target_status = hif_get_target_status(scn); - cdf_event_set(&wma->recovery_event); + qdf_event_set(&wma->recovery_event); if (OL_TRGET_STATUS_RESET == target_status) { BMI_ERR("Target is already asserted, ignore!"); @@ -655,7 +655,7 @@ void ol_target_failure(void *instance, QDF_STATUS status) #if defined(CONFIG_CNSS) /* Collect the RAM dump through a workqueue */ if (ini_cfg->enable_ramdump_collection) - cdf_schedule_work(&ol_ctx->ramdump_work); + qdf_sched_work(0, &ol_ctx->ramdump_work); else pr_debug("%s: athdiag read for target reg\n", __func__); #endif diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h index 454dcc375d97..01771c6cea9f 100644 --- a/core/cdf/inc/cdf_nbuf.h +++ b/core/cdf/inc/cdf_nbuf.h @@ -188,7 +188,7 @@ static inline unsigned char *cdf_nbuf_get_frag_vaddr(cdf_nbuf_t buf, * * Return: Fragment physical address */ -static inline cdf_dma_addr_t cdf_nbuf_get_frag_paddr(cdf_nbuf_t buf, int frag_num) +static inline qdf_dma_addr_t cdf_nbuf_get_frag_paddr(cdf_nbuf_t buf, int frag_num) { BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); return __cdf_nbuf_get_frag_paddr(buf, frag_num); @@ -273,7 +273,7 @@ static inline void cdf_nbuf_ipa_priv_set(cdf_nbuf_t buf, uint32_t priv) * * Return: none */ -static inline cdf_dma_addr_t +static inline qdf_dma_addr_t cdf_nbuf_mapped_paddr_get(cdf_nbuf_t buf) { return __cdf_nbuf_mapped_paddr_get(buf); @@ -286,7 +286,7 @@ cdf_nbuf_mapped_paddr_get(cdf_nbuf_t buf) * Return: none */ static inline void -cdf_nbuf_mapped_paddr_set(cdf_nbuf_t buf, cdf_dma_addr_t paddr) +cdf_nbuf_mapped_paddr_set(cdf_nbuf_t buf, qdf_dma_addr_t paddr) { __cdf_nbuf_mapped_paddr_set(buf, paddr); } @@ -305,7 +305,7 @@ static inline void cdf_nbuf_frag_push_head(cdf_nbuf_t buf, int frag_len, char *frag_vaddr, - cdf_dma_addr_t frag_paddr) + qdf_dma_addr_t frag_paddr) { __cdf_nbuf_frag_push_head(buf, frag_len, frag_vaddr, frag_paddr); } diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c index 547a3b68c050..eee883efc5a0 100644 --- a/core/cdf/src/cdf_memory.c +++ b/core/cdf/src/cdf_memory.c @@ -483,7 +483,7 @@ void cdf_mem_multi_pages_alloc(qdf_device_t osdev, void **cacheable_pages = NULL; uint16_t i; - CDF_BUG(PAGE_SIZE >= element_size); + QDF_BUG(PAGE_SIZE >= element_size); pages->num_element_per_page = PAGE_SIZE / element_size; if (!pages->num_element_per_page) { diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index af56eda6e002..10e55dce8ea1 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -218,7 +218,7 @@ void __cdf_nbuf_free(struct sk_buff *skb) { if (cdf_nbuf_ipa_owned_get(skb)) /* IPA cleanup function will need to be called here */ - CDF_BUG(1); + QDF_BUG(1); else dev_kfree_skb_any(skb); } @@ -289,7 +289,7 @@ __cdf_nbuf_unmap(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) QDF_STATUS __cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) { - cdf_dma_addr_t paddr; + qdf_dma_addr_t paddr; /* tempory hack for simulation */ #ifdef A_SIMOS_DEVHOST @@ -802,7 +802,7 @@ uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, * * Return: N/A */ -static inline void cdf_dmaaddr_to_32s(cdf_dma_addr_t dmaaddr, +static inline void cdf_dmaaddr_to_32s(qdf_dma_addr_t dmaaddr, uint32_t *lo, uint32_t *hi) { if (sizeof(dmaaddr) > sizeof(uint32_t)) { @@ -834,7 +834,7 @@ uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, /* segment specific */ char *tso_frag_vaddr; - cdf_dma_addr_t tso_frag_paddr = 0; + qdf_dma_addr_t tso_frag_paddr = 0; uint32_t tso_frag_paddr_lo, tso_frag_paddr_hi; uint32_t num_seg = 0; struct cdf_tso_seg_elem_t *curr_seg; @@ -917,7 +917,7 @@ uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, curr_seg->seg.tso_frags[0].length = tso_cmn_info.eit_hdr_len; tso_info->total_len = curr_seg->seg.tso_frags[0].length; { - cdf_dma_addr_t mapped; + qdf_dma_addr_t mapped; uint32_t lo, hi; mapped = dma_map_single(osdev->dev, tso_cmn_info.eit_hdr, diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h index 69453d334058..160a5ff47f7c 100644 --- a/core/cdf/src/i_cdf_nbuf.h +++ b/core/cdf/src/i_cdf_nbuf.h @@ -59,11 +59,11 @@ typedef struct sk_buff *__cdf_nbuf_t; #define NBUF_CB_TX_MAX_EXTRA_FRAGS 2 /* - * Make sure that cdf_dma_addr_t in the cb block is always 64 bit aligned + * Make sure that qdf_dma_addr_t in the cb block is always 64 bit aligned */ typedef union { uint64_t u64; - cdf_dma_addr_t dma_addr; + qdf_dma_addr_t dma_addr; } cdf_paddr_t; /** diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 225dedec8708..5349e9f5cc34 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -211,7 +211,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, QDF_STATUS cds_set_context(QDF_MODULE_ID moduleID, void *context); -QDF_STATUS cds_get_vdev_types(enum tCDF_ADAPTER_MODE mode, uint32_t *type, +QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); void cds_flush_work(void *work); diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index d0c6bbfb6e3f..652e63e79165 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -265,11 +265,11 @@ typedef struct _cds_context_type { void *g_ol_context; /* - * cdf_ctx will be used by cdf + * qdf_ctx will be used by cdf * while allocating dma memory * to access dev information. */ - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; void *pdev_txrx_ctx; diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index d846d28f86dc..f7e442471c85 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -69,7 +69,7 @@ /* Data definitions */ static cds_context_type g_cds_context; static p_cds_contextType gp_cds_context; -static struct __qdf_device g_cdf_ctx; +static struct __qdf_device g_qdf_ctx; /* Debug variable to detect MC thread stuck */ static atomic_t cds_wrapper_empty_count; @@ -94,8 +94,8 @@ v_CONTEXT_t cds_init(void) gp_cds_context = &g_cds_context; - gp_cds_context->qdf_ctx = &g_cdf_ctx; - cdf_mem_zero(&g_cdf_ctx, sizeof(g_cdf_ctx)); + gp_cds_context->qdf_ctx = &g_qdf_ctx; + cdf_mem_zero(&g_qdf_ctx, sizeof(g_qdf_ctx)); qdf_trace_spin_lock_init(); @@ -486,7 +486,6 @@ err_probe_event: */ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; void *scn; @@ -593,7 +592,6 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) */ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tSirRetStatus sirStatus = eSIR_SUCCESS; p_cds_contextType p_cds_context = (p_cds_contextType) cds_context; @@ -760,7 +758,6 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) QDF_STATUS cds_close(v_CONTEXT_t cds_context) { QDF_STATUS qdf_status; - QDF_STATUS qdf_status; qdf_status = wma_wmi_work_close(cds_context); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -1432,7 +1429,6 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) */ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) { - QDF_STATUS qdf_status; QDF_STATUS qdf_status; tpAniSirGlobal pmac = (((p_cds_contextType)cds_context)->pMACContext); diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 04bba5d686e4..640d0288b118 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -196,7 +196,7 @@ static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev) * Return: None */ int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr) + u_int16_t index, qdf_dma_addr_t *frag_paddr, void **frag_ptr) { uint16_t frag_page_index; uint16_t frag_elem_index; @@ -436,7 +436,7 @@ static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, /*--- descriptor allocation functions ---------------------------------------*/ -void *htt_tx_desc_alloc(htt_pdev_handle pdev, cdf_dma_addr_t *paddr, +void *htt_tx_desc_alloc(htt_pdev_handle pdev, qdf_dma_addr_t *paddr, uint16_t index) { struct htt_host_tx_desc_t *htt_host_tx_desc; /* includes HTC hdr */ @@ -477,7 +477,7 @@ void *htt_tx_desc_alloc(htt_pdev_handle pdev, cdf_dma_addr_t *paddr, * Include the headroom for the HTC frame header when specifying the * physical address for the HTT tx descriptor. */ - *paddr = (cdf_dma_addr_t)htt_tx_get_paddr(pdev, (char *)htt_host_tx_desc); + *paddr = (qdf_dma_addr_t)htt_tx_get_paddr(pdev, (char *)htt_host_tx_desc); /* * The allocated tx descriptor space includes headroom for a * HTC frame header. Hide this headroom, so that we don't have @@ -504,8 +504,8 @@ void htt_tx_desc_free(htt_pdev_handle pdev, void *tx_desc) void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, void *htt_tx_desc, - cdf_dma_addr_t paddr, - cdf_dma_addr_t frag_desc_paddr, + qdf_dma_addr_t paddr, + qdf_dma_addr_t frag_desc_paddr, int reset) { uint32_t *fragmentation_descr_field_ptr; @@ -925,7 +925,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, { unsigned int tx_buffer_count; cdf_nbuf_t buffer_vaddr; - cdf_dma_addr_t buffer_paddr; + qdf_dma_addr_t buffer_paddr; uint32_t *header_ptr; uint32_t *ring_vaddr; #define IPA_UC_TX_BUF_FRAG_DESC_OFFSET 20 diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index 9fd32f61d989..e0f63e5d5c6e 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -357,7 +357,7 @@ uint16_t htt_tx_compl_desc_id(void *iterator, int num); * @param[OUT] paddr_lo - physical address of the HTT descriptor * @return success -> descriptor handle, -OR- failure -> NULL */ -void *htt_tx_desc_alloc(htt_pdev_handle pdev, cdf_dma_addr_t *paddr, +void *htt_tx_desc_alloc(htt_pdev_handle pdev, qdf_dma_addr_t *paddr, uint16_t index); /** @@ -381,10 +381,10 @@ void htt_tx_desc_free(htt_pdev_handle htt_pdev, void *htt_tx_desc); * @return success 0 */ int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr); + u_int16_t index, qdf_dma_addr_t *frag_paddr, void **frag_ptr); #else static inline int htt_tx_frag_alloc(htt_pdev_handle pdev, - u_int16_t index, cdf_dma_addr_t *frag_paddr, void **frag_ptr) + u_int16_t index, qdf_dma_addr_t *frag_paddr, void **frag_ptr) { *frag_ptr = NULL; return 0; @@ -530,7 +530,7 @@ static inline void htt_tx_desc_init(htt_pdev_handle pdev, void *htt_tx_desc, - cdf_dma_addr_t htt_tx_desc_paddr, + qdf_dma_addr_t htt_tx_desc_paddr, uint16_t msdu_id, cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info, struct qdf_tso_info_t *tso_info, @@ -807,7 +807,7 @@ static inline void htt_tx_desc_frag(htt_pdev_handle pdev, void *desc, - int frag_num, cdf_dma_addr_t frag_phys_addr, uint16_t frag_len) + int frag_num, qdf_dma_addr_t frag_phys_addr, uint16_t frag_len) { uint32_t *word32; #if defined(HELIUMPLUS_PADDR64) @@ -864,8 +864,8 @@ htt_tx_desc_frag(htt_pdev_handle pdev, void htt_tx_desc_frags_table_set(htt_pdev_handle pdev, void *desc, - cdf_dma_addr_t paddr, - cdf_dma_addr_t frag_desc_paddr, + qdf_dma_addr_t paddr, + qdf_dma_addr_t frag_desc_paddr, int reset); /** diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index decec2339d41..d50bc45390d8 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -145,7 +145,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, uint8_t proto_type) { - void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_txrx_peer_t *peer; cdf_nbuf_t ret; @@ -156,9 +156,9 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, "%s:pdev is null", __func__); return skb; } - if (qdf_unlikely(!cdf_ctx)) { + if (qdf_unlikely(!qdf_ctx)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, - "%s:cdf_ctx is null", __func__); + "%s:qdf_ctx is null", __func__); return skb; } @@ -181,7 +181,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, return skb; } - status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE); + status = cdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE); if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); @@ -201,7 +201,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, if (ret) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: Failed to tx", __func__); - cdf_nbuf_unmap_single(cdf_ctx, ret, QDF_DMA_TO_DEVICE); + cdf_nbuf_unmap_single(qdf_ctx, ret, QDF_DMA_TO_DEVICE); return ret; } @@ -461,7 +461,7 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, } else { for (i = 1; i < num_frags; i++) { qdf_size_t frag_len; - cdf_dma_addr_t frag_paddr; + qdf_dma_addr_t frag_paddr; frag_len = cdf_nbuf_get_frag_len(msdu, i); frag_paddr = cdf_nbuf_get_frag_paddr(msdu, i); diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 951e30213bab..a0a1b18057cb 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -307,7 +307,7 @@ extern void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); void -dump_pkt(cdf_nbuf_t nbuf, cdf_dma_addr_t nbuf_paddr, int len) +dump_pkt(cdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len) { qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, cdf_nbuf_data(nbuf), nbuf_paddr, len); @@ -405,7 +405,7 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, } else { for (i = 1; i < num_frags; i++) { qdf_size_t frag_len; - cdf_dma_addr_t frag_paddr; + qdf_dma_addr_t frag_paddr; #ifdef HELIUMPLUS_DEBUG void *frag_vaddr; frag_vaddr = cdf_nbuf_get_frag_vaddr(netbuf, i); @@ -488,7 +488,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, /* check the frame type to see what kind of special steps are needed */ if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) && (tx_desc->pkt_type != 0xff)) { - cdf_dma_addr_t frag_desc_paddr = 0; + qdf_dma_addr_t frag_desc_paddr = 0; #if defined(HELIUMPLUS_PADDR64) frag_desc_paddr = tx_desc->htt_frag_desc_paddr; diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index e8646c8c7331..1472cbc12c0f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -456,11 +456,11 @@ void htt_pkt_log_init(struct ol_txrx_pdev_t *handle, void *scn) if (handle->pkt_log_init) return; - if (cds_get_conparam() != CDF_GLOBAL_FTM_MODE && + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE && !WLAN_IS_EPPING_ENABLED(cds_get_conparam())) { ol_pl_sethandle(&handle->pl_dev, scn); if (pktlogmod_init(scn)) - cdf_print("%s: pktlogmod_init failed", __func__); + qdf_print("%s: pktlogmod_init failed", __func__); else handle->pkt_log_init = true; } @@ -475,7 +475,7 @@ void htt_pkt_log_init(struct ol_txrx_pdev_t *handle, void *scn) */ void htt_pktlogmod_exit(struct ol_txrx_pdev_t *handle, void *scn) { - if (scn && cds_get_conparam() != CDF_GLOBAL_FTM_MODE && + if (scn && cds_get_conparam() != QDF_GLOBAL_FTM_MODE && !WLAN_IS_EPPING_ENABLED(cds_get_conparam()) && handle->pkt_log_init) { pktlogmod_exit(scn); @@ -1193,7 +1193,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, cdf_nbuf_t next = cdf_nbuf_next(vdev->ll_pause.txq.head); cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); cdf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head, - CDF_DMA_TO_DEVICE); + QDF_DMA_TO_DEVICE); cdf_nbuf_tx_free(vdev->ll_pause.txq.head, NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index b205a1c8314c..f54d7784029f 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -130,9 +130,9 @@ struct ol_tx_desc_t { cdf_nbuf_t netbuf; void *htt_tx_desc; uint16_t id; - cdf_dma_addr_t htt_tx_desc_paddr; + qdf_dma_addr_t htt_tx_desc_paddr; void *htt_frag_desc; /* struct msdu_ext_desc_t * */ - cdf_dma_addr_t htt_frag_desc_paddr; + qdf_dma_addr_t htt_frag_desc_paddr; qdf_atomic_t ref_cnt; enum htt_tx_status status; diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 8b674b9358a9..51c00d795680 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -226,13 +226,13 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, QDF_STATUS status; int ret = 0; struct hif_opaque_softc *hif_ctx; - cdf_device_t cdf_ctx = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + qdf_device_t qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); struct hif_callbacks cbk; uint32_t mode = cds_get_conparam(); hdd_hif_init_cds_callbacks(dev, &cbk); - hif_ctx = hif_open(cdf_ctx, mode, bus_type, &cbk); + hif_ctx = hif_open(qdf_ctx, mode, bus_type, &cbk); if (!hif_ctx) { hdd_err("hif_open error"); return -ENOMEM; @@ -304,7 +304,7 @@ static void hdd_hif_close(void *hif_ctx) */ void hdd_init_cdf_ctx(struct device *dev, void *bdev) { - cdf_device_t cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + qdf_device_t cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); cdf_dev->dev = dev; cdf_dev->drv_hdl = bdev; @@ -329,7 +329,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, void *hif_ctx; QDF_STATUS status; int ret = 0; - cdf_device_t cdf_dev; + qdf_device_t cdf_dev; uint32_t mode = cds_get_conparam(); pr_info("%s: %sprobing driver v%s\n", WLAN_MODULE_NAME, @@ -369,7 +369,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_epping_close; hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); - cdf_dev = cds_get_context(CDF_MODULE_ID_CDF_DEVICE); + cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); status = ol_cds_init(cdf_dev, hif_ctx); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 7145e2e58cd8..8b33ca827389 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -176,7 +176,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, tMacOpenParameters mac_openParms; p_cds_contextType gp_cds_context = (p_cds_contextType) p_cds_context; #if defined(QCA_WIFI_FTM) - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; HTC_INIT_INFO htcInfo; void *pHifContext = NULL; void *pHtcContext = NULL; @@ -262,11 +262,11 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = wma_target_suspend_acknowledge; - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(pHifContext, &htcInfo, cdf_ctx); + htc_create(pHifContext, &htcInfo, qdf_ctx); if (!gp_cds_context->htc_ctx) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index d206f92c7736..8ff2d3c5e4ee 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -1422,7 +1422,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) { /* STATs from host */ - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CE ====\n" "CE RING BASE: 0x%llx\n" "CE RING SIZE: %d\n" @@ -1430,7 +1430,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) (unsigned long long)hdd_ipa->ce_sr_base_paddr, hdd_ipa->ce_sr_ring_size, (unsigned long long)hdd_ipa->ce_reg_paddr); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST TX ====\n" "COMP RING BASE: 0x%llx\n" "COMP RING SIZE: %d\n" @@ -1440,7 +1440,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->tx_comp_ring_size, hdd_ipa->tx_num_alloc_buffer, (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST RX ====\n" "IND RING BASE: 0x%llx\n" "IND RING SIZE: %d\n" @@ -1456,7 +1456,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) hdd_ipa->stats.num_rx_excep, hdd_ipa->stats.num_tx_bcmc, (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CONTROL ====\n" "SAP NUM STAs: %d\n" "STA CONNECTED: %d\n" @@ -1476,7 +1476,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) /* STATs from FW */ uc_fw_stat = (struct ipa_uc_fw_stats *) ((uint8_t *)op_msg + sizeof(struct op_msg_type)); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW TX ====\n" "COMP RING BASE: 0x%x\n" "COMP RING SIZE: %d\n" @@ -1497,7 +1497,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->tx_pkts_enqueued, uc_fw_stat->tx_pkts_completed, uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_FW RX ====\n" "IND RING BASE: 0x%x\n" "IND RING SIZE: %d\n" @@ -1528,7 +1528,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved); /* STATs from IPA */ ipa_get_wdi_stats(&ipa_stat); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA TX ====\n" "NUM PROCD : %d\n" "CE DBELL : 0x%x\n" @@ -1564,7 +1564,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) num_bam_int_in_non_runnning_state, ipa_stat.tx_ch_stats.num_qmb_int_handled); - CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC IPA RX ====\n" "MAX OST PKT : %d\n" "NUM PKT PRCSD : %d\n" @@ -3408,7 +3408,7 @@ static void hdd_ipa_cleanup_iface(struct hdd_ipa_iface_context *iface_context) if (!iface_context->hdd_ipa->num_iface) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "NUM INTF 0, Invalid"); - CDF_ASSERT(0); + QDF_ASSERT(0); } iface_context->hdd_ipa->num_iface--; } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 88374037a620..5117ab63b0b9 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6819,7 +6819,7 @@ static int __hdd_module_init(void) goto out; } - pr_info("%s: driver loaded\n", WLAN_MODULE_NAME); + pr_info("%s: qdf driver loaded\n", WLAN_MODULE_NAME); return 0; out: @@ -6993,7 +6993,7 @@ static inline bool hdd_is_lpass_supported(hdd_context_t *hdd_ctx) static void hdd_update_ol_config(hdd_context_t *hdd_ctx) { struct ol_config_info cfg; - struct ol_context *ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + struct ol_context *ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); if (!ol_ctx) return; @@ -7015,7 +7015,7 @@ static void hdd_update_ol_config(hdd_context_t *hdd_ctx) */ static void hdd_update_hif_config(hdd_context_t *hdd_ctx) { - struct hif_opaque_softc *scn = cds_get_context(CDF_MODULE_ID_HIF); + struct hif_opaque_softc *scn = cds_get_context(QDF_MODULE_ID_HIF); struct hif_config_info cfg; if (!scn) diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 4200f2360375..623c0f4ee07e 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -69,7 +69,7 @@ static void memdump_cleanup_timer_cb(void *data) hdd_context_t *hdd_ctx = data; qdf_dma_addr_t paddr; qdf_dma_addr_t dma_ctx = 0; - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { @@ -82,15 +82,15 @@ static void memdump_cleanup_timer_cb(void *data) return; } - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - if (!cdf_ctx) { + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + if (!qdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; } paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(cdf_ctx, + cdf_os_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -204,7 +204,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, uint8_t loop; qdf_dma_addr_t paddr; qdf_dma_addr_t dma_ctx = 0; - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; unsigned long rc; struct hdd_fw_dump_context *context; @@ -214,8 +214,8 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, return status; } - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - if (!cdf_ctx) { + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + if (!qdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; } @@ -235,7 +235,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, mutex_lock(&hdd_ctx->memdump_lock); if (!hdd_ctx->fw_dump_loc) { hdd_ctx->fw_dump_loc = cdf_os_mem_alloc_consistent( - cdf_ctx, FW_MEM_DUMP_SIZE, &paddr, dma_ctx); + qdf_ctx, FW_MEM_DUMP_SIZE, &paddr, dma_ctx); if (!hdd_ctx->fw_dump_loc) { mutex_unlock(&hdd_ctx->memdump_lock); hddLog(LOGE, FL("cdf_os_mem_alloc_consistent failed")); @@ -299,7 +299,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS != sme_status) { hddLog(LOGE, FL("sme_fw_mem_dump Failed")); mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(cdf_ctx, + cdf_os_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; mutex_unlock(&hdd_ctx->memdump_lock); @@ -395,7 +395,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, hdd_context_t *hdd_ctx; qdf_dma_addr_t paddr; qdf_dma_addr_t dma_ctx = 0; - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; hdd_ctx = memdump_get_file_data(file); @@ -405,8 +405,8 @@ static ssize_t memdump_read(struct file *file, char __user *buf, hddLog(LOGE, FL("HDD context is not valid")); return -EINVAL; } - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - if (!cdf_ctx) { + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + if (!qdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return -EINVAL; } @@ -443,7 +443,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, if (*pos >= FW_MEM_DUMP_SIZE) { paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(cdf_ctx, + cdf_os_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -593,7 +593,7 @@ void memdump_deinit(void) hdd_context_t *hdd_ctx; qdf_dma_addr_t paddr; qdf_dma_addr_t dma_ctx = 0; - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; QDF_STATUS qdf_status; hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); @@ -607,8 +607,8 @@ void memdump_deinit(void) return; } - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - if (!cdf_ctx) { + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + if (!qdf_ctx) { hddLog(LOGE, FL("CDF context is NULL")); return; } @@ -619,7 +619,7 @@ void memdump_deinit(void) mutex_lock(&hdd_ctx->memdump_lock); if (hdd_ctx->fw_dump_loc) { paddr = hdd_ctx->dump_loc_paddr; - cdf_os_mem_free_consistent(cdf_ctx, + cdf_os_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index f33fbe80e1b4..ee8fef1fff02 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -177,7 +177,7 @@ int epping_enable(struct device *parent_dev) int ret = 0; epping_context_t *pEpping_ctx = NULL; cds_context_type *p_cds_context = NULL; - qdf_device_t cdf_ctx; + qdf_device_t qdf_ctx; HTC_INIT_INFO htcInfo; struct hif_opaque_softc *scn; tSirMacAddr adapter_macAddr; @@ -220,7 +220,7 @@ int epping_enable(struct device *parent_dev) /* store target type and target version info in hdd ctx */ pEpping_ctx->target_type = tgt_info->target_type; - ol_ctx = cds_get_context(CDF_MODULE_ID_BMI); + ol_ctx = cds_get_context(QDF_MODULE_ID_BMI); #ifndef FEATURE_BMI_2 /* Initialize BMI and Download firmware */ if (bmi_download_firmware(ol_ctx)) { @@ -236,10 +236,10 @@ int epping_enable(struct device *parent_dev) htcInfo.pContext = ol_ctx; htcInfo.TargetFailure = ol_target_failure; htcInfo.TargetSendSuspendComplete = epping_target_suspend_acknowledge; - cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ - p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx); + p_cds_context->htc_ctx = htc_create(scn, &htcInfo, qdf_ctx); if (!p_cds_context->htc_ctx) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 7832672223c6..21d915353753 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1197,7 +1197,7 @@ typedef struct { #endif bool wmi_ready; uint32_t wlan_init_status; - qdf_device_t cdf_dev; + qdf_device_t qdf_dev; uint32_t phy_capability; uint32_t max_frag_entry; uint32_t wmi_service_bitmap[WMI_SERVICE_BM_SIZE]; diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 78cd55ecbe1a..aa56cb9c4cef 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2354,7 +2354,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, int32_t cmd_len; uint64_t dma_addr; struct wmi_desc_t *wmi_desc = NULL; - void *cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); uint8_t *bufp; int32_t bufp_len = (frmLen < mgmt_tx_dl_frm_len) ? frmLen : mgmt_tx_dl_frm_len; @@ -2393,7 +2393,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, sizeof(uint32_t))); bufp += WMI_TLV_HDR_SIZE; cdf_mem_copy(bufp, pData, bufp_len); - cdf_nbuf_map_single(cdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); + cdf_nbuf_map_single(qdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); #if defined(HELIUMPLUS_PADDR64) diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 8c853a4b0d98..b54a3625f1e4 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1596,7 +1596,6 @@ QDF_STATUS wma_open(void *cds_context, qdf_device_t qdf_dev; void *wmi_handle; QDF_STATUS qdf_status; - QDF_STATUS qdf_status; struct txrx_pdev_cfg_param_t olCfg = { 0 }; WMA_LOGD("%s: Enter", __func__); @@ -1683,7 +1682,7 @@ QDF_STATUS wma_open(void *cds_context, ol_cfg_set_flow_control_parameters(&olCfg, mac_params); ((p_cds_contextType) cds_context)->cfg_ctx = - ol_pdev_cfg_attach(((p_cds_contextType) cds_context)->cdf_ctx, + ol_pdev_cfg_attach(((p_cds_contextType) cds_context)->qdf_ctx, olCfg); if (!(((p_cds_contextType) cds_context)->cfg_ctx)) { WMA_LOGP("%s: failed to init cfg handle", __func__); @@ -1777,7 +1776,7 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->new_hw_mode_index = WMA_DEFAULT_HW_MODE_INDEX; wma_handle->saved_wmi_init_cmd.buf = NULL; - qdf_status = cdf_event_init(&wma_handle->wma_ready_event); + qdf_status = qdf_event_create(&wma_handle->wma_ready_event); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_ready_event initialization failed", __func__); goto err_event_init; @@ -1787,12 +1786,12 @@ QDF_STATUS wma_open(void *cds_context, QDF_TIMER_TYPE_SW, wma_service_ready_ext_evt_timeout, wma_handle); - if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Failed to initialize service ready ext timeout"); goto err_event_init; } - qdf_status = cdf_event_init(&wma_handle->target_suspend); + qdf_status = qdf_event_create(&wma_handle->target_suspend); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: target suspend event initialization failed", __func__); @@ -1800,35 +1799,35 @@ QDF_STATUS wma_open(void *cds_context, } /* Init Tx Frame Complete event */ - qdf_status = cdf_event_init(&wma_handle->tx_frm_download_comp_event); - if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { + qdf_status = qdf_event_create(&wma_handle->tx_frm_download_comp_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_frm_download_comp_event", __func__); goto err_event_init; } /* Init tx queue empty check event */ - qdf_status = cdf_event_init(&wma_handle->tx_queue_empty_event); - if (!CDF_IS_STATUS_SUCCESS(qdf_status)) { + qdf_status = qdf_event_create(&wma_handle->tx_queue_empty_event); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGP("%s: failed to init tx_queue_empty_event", __func__); goto err_event_init; } - qdf_status = cdf_event_init(&wma_handle->wma_resume_event); + qdf_status = qdf_event_create(&wma_handle->wma_resume_event); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: wma_resume_event initialization failed", __func__); goto err_event_init; } - qdf_status = cdf_event_init(&wma_handle->runtime_suspend); + qdf_status = qdf_event_create(&wma_handle->runtime_suspend); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: runtime_suspend event initialization failed", __func__); goto err_event_init; } - qdf_status = cdf_event_init(&wma_handle->recovery_event); + qdf_status = qdf_event_create(&wma_handle->recovery_event); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: recovery event initialization failed", __func__); goto err_event_init; @@ -3149,16 +3148,16 @@ QDF_STATUS wma_close(void *cds_ctx) WMA_LOGP("%s: dbglog_deinit failed", __func__); /* close the cdf events */ - cdf_event_destroy(&wma_handle->wma_ready_event); + qdf_event_destroy(&wma_handle->wma_ready_event); qdf_status = qdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); - if (!CDF_IS_STATUS_SUCCESS(qdf_status)) + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) WMA_LOGP("%s: Failed to destroy service ready ext event timer", __func__); - cdf_event_destroy(&wma_handle->target_suspend); - cdf_event_destroy(&wma_handle->wma_resume_event); - cdf_event_destroy(&wma_handle->runtime_suspend); - cdf_event_destroy(&wma_handle->recovery_event); + qdf_event_destroy(&wma_handle->target_suspend); + qdf_event_destroy(&wma_handle->wma_resume_event); + qdf_event_destroy(&wma_handle->runtime_suspend); + qdf_event_destroy(&wma_handle->recovery_event); wma_cleanup_vdev_resp(wma_handle); wma_cleanup_hold_req(wma_handle); qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); @@ -4050,7 +4049,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) */ ret = qdf_mc_timer_start(&wma_handle->service_ready_ext_timer, WMA_SERVICE_READY_EXT_TIMEOUT); - if (!CDF_IS_STATUS_SUCCESS(ret)) + if (!QDF_IS_STATUS_SUCCESS(ret)) WMA_LOGP("Failed to start the service ready ext timer"); WMA_LOGA("%s: WMA waiting for WMI_SERVICE_READY_EXT_EVENTID", @@ -4104,7 +4103,7 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) ev->default_fw_config_bits); ret = qdf_mc_timer_stop(&wma_handle->service_ready_ext_timer); - if (!CDF_IS_STATUS_SUCCESS(ret)) { + if (!QDF_IS_STATUS_SUCCESS(ret)) { WMA_LOGP("Failed to stop the service ready ext timer"); return; } @@ -4204,7 +4203,7 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) wma_update_hdd_cfg(wma_handle); - cdf_event_set(&wma_handle->wma_ready_event); + qdf_event_set(&wma_handle->wma_ready_event); WMA_LOGD("Exit"); } @@ -4269,7 +4268,7 @@ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) QDF_STATUS qdf_status; /* wait until WMI_READY_EVENTID received from FW */ - qdf_status = cdf_wait_single_event(&(wma_handle->wma_ready_event), + qdf_status = qdf_wait_single_event(&(wma_handle->wma_ready_event), WMA_READY_EVENTID_TIMEOUT); if (QDF_STATUS_SUCCESS != qdf_status) { @@ -4742,7 +4741,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WNI_CFG_DNLD_REQ: WMA_LOGA("McThread: WNI_CFG_DNLD_REQ"); qdf_status = wma_wni_cfg_dnld(wma_handle); - if (CDF_IS_STATUS_SUCCESS(qdf_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_wma_complete_cback(cds_context); } else { WMA_LOGD("config download failure"); -- cgit v1.2.3 From 600c3a00be1b7a73e72c94bbb4a2c6f2446c8b6e Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Tue, 1 Mar 2016 10:33:54 +0530 Subject: qcacld-3.0: Add QDF mem API's Replace CDF mem API's with QDF mem API's Change-Id: Icf247b4dc5b26f4b960dcb98e323b096c1d6076c CRs-Fixed: 981188 --- core/bmi/src/bmi.c | 62 +- core/bmi/src/bmi_1.c | 44 +- core/bmi/src/bmi_2.c | 54 +- core/bmi/src/ol_fw.c | 18 +- core/cdf/inc/cdf_memory.h | 262 ----- core/cdf/src/cdf_memory.c | 863 -------------- core/cdf/src/cdf_nbuf.c | 20 +- core/cds/inc/cds_api.h | 2 +- core/cds/inc/cds_crypto.h | 2 +- core/cds/src/cds_api.c | 20 +- core/cds/src/cds_concurrency.c | 54 +- core/cds/src/cds_mq.c | 2 +- core/cds/src/cds_packet.c | 12 +- core/cds/src/cds_regdomain.c | 12 +- core/cds/src/cds_sched.c | 10 +- core/cds/src/cds_utils.c | 42 +- core/dp/htt/htt.c | 22 +- core/dp/htt/htt_fw_stats.c | 6 +- core/dp/htt/htt_h2t.c | 2 +- core/dp/htt/htt_internal.h | 4 +- core/dp/htt/htt_rx.c | 123 +- core/dp/htt/htt_t2h.c | 12 +- core/dp/htt/htt_tx.c | 59 +- core/dp/htt/htt_types.h | 4 +- core/dp/ol/inc/ol_htt_tx_api.h | 2 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 2 +- core/dp/txrx/ol_cfg.c | 2 +- core/dp/txrx/ol_rx.c | 38 +- core/dp/txrx/ol_rx_defrag.c | 36 +- core/dp/txrx/ol_rx_defrag.h | 2 +- core/dp/txrx/ol_rx_fwd.c | 6 +- core/dp/txrx/ol_rx_pn.c | 4 +- core/dp/txrx/ol_rx_reorder.c | 12 +- core/dp/txrx/ol_tx.c | 8 +- core/dp/txrx/ol_tx_send.c | 2 +- core/dp/txrx/ol_txrx.c | 85 +- core/dp/txrx/ol_txrx_encap.c | 78 +- core/dp/txrx/ol_txrx_event.c | 8 +- core/dp/txrx/ol_txrx_flow_control.c | 8 +- core/dp/txrx/ol_txrx_internal.h | 6 +- core/dp/txrx/ol_txrx_peer_find.c | 16 +- core/dp/txrx/ol_txrx_types.h | 4 +- core/hdd/src/wlan_hdd_assoc.c | 88 +- core/hdd/src/wlan_hdd_cfg.c | 18 +- core/hdd/src/wlan_hdd_cfg80211.c | 150 +-- core/hdd/src/wlan_hdd_conc_ut.c | 12 +- core/hdd/src/wlan_hdd_debugfs.c | 26 +- core/hdd/src/wlan_hdd_ext_scan.c | 96 +- core/hdd/src/wlan_hdd_ftm.c | 14 +- core/hdd/src/wlan_hdd_green_ap.c | 8 +- core/hdd/src/wlan_hdd_hostapd.c | 96 +- core/hdd/src/wlan_hdd_ioctl.c | 68 +- core/hdd/src/wlan_hdd_ipa.c | 74 +- core/hdd/src/wlan_hdd_lro.c | 8 +- core/hdd/src/wlan_hdd_main.c | 46 +- core/hdd/src/wlan_hdd_memdump.c | 14 +- core/hdd/src/wlan_hdd_ocb.c | 62 +- core/hdd/src/wlan_hdd_oemdata.c | 32 +- core/hdd/src/wlan_hdd_p2p.c | 50 +- core/hdd/src/wlan_hdd_power.c | 24 +- core/hdd/src/wlan_hdd_scan.c | 72 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 12 +- core/hdd/src/wlan_hdd_stats.c | 6 +- core/hdd/src/wlan_hdd_tdls.c | 60 +- core/hdd/src/wlan_hdd_tx_rx.c | 12 +- core/hdd/src/wlan_hdd_wext.c | 46 +- core/hdd/src/wlan_hdd_wowl.c | 2 +- core/mac/src/cfg/cfg_api.c | 14 +- core/mac/src/cfg/cfg_proc_msg.c | 4 +- core/mac/src/cfg/cfg_send_msg.c | 6 +- core/mac/src/dph/dph_hash_table.c | 8 +- core/mac/src/pe/lim/lim_admit_control.c | 32 +- core/mac/src/pe/lim/lim_api.c | 120 +- core/mac/src/pe/lim/lim_assoc_utils.c | 188 ++-- core/mac/src/pe/lim/lim_assoc_utils.h | 2 +- core/mac/src/pe/lim/lim_ft.c | 128 +-- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 90 +- core/mac/src/pe/lim/lim_link_monitoring_algo.c | 31 +- core/mac/src/pe/lim/lim_p2p.c | 38 +- core/mac/src/pe/lim/lim_process_action_frame.c | 60 +- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 54 +- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 94 +- core/mac/src/pe/lim/lim_process_auth_frame.c | 42 +- core/mac/src/pe/lim/lim_process_beacon_frame.c | 22 +- core/mac/src/pe/lim/lim_process_cfg_updates.c | 6 +- core/mac/src/pe/lim/lim_process_deauth_frame.c | 10 +- core/mac/src/pe/lim/lim_process_disassoc_frame.c | 6 +- core/mac/src/pe/lim/lim_process_message_queue.c | 122 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 114 +- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 160 +-- core/mac/src/pe/lim/lim_process_probe_req_frame.c | 36 +- core/mac/src/pe/lim/lim_process_probe_rsp_frame.c | 26 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 264 ++--- core/mac/src/pe/lim/lim_process_tdls.c | 74 +- core/mac/src/pe/lim/lim_prop_exts_utils.c | 6 +- core/mac/src/pe/lim/lim_scan_result_utils.c | 14 +- core/mac/src/pe/lim/lim_security_utils.c | 40 +- core/mac/src/pe/lim/lim_send_management_frames.c | 248 ++-- core/mac/src/pe/lim/lim_send_messages.c | 76 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 168 +-- core/mac/src/pe/lim/lim_session.c | 118 +- core/mac/src/pe/lim/lim_sme_req_utils.c | 2 +- core/mac/src/pe/lim/lim_timer_utils.c | 15 +- core/mac/src/pe/lim/lim_types.h | 4 +- core/mac/src/pe/lim/lim_utils.c | 144 +-- core/mac/src/pe/rrm/rrm_api.c | 92 +- core/mac/src/pe/sch/sch_api.c | 52 +- core/mac/src/pe/sch/sch_beacon_gen.c | 106 +- core/mac/src/pe/sch/sch_beacon_process.c | 6 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 12 +- .../src/sys/legacy/src/platform/inc/sys_wrapper.h | 2 +- .../src/sys/legacy/src/system/src/mac_init_api.c | 12 +- .../src/sys/legacy/src/system/src/sys_entry_func.c | 2 +- core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h | 6 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 2 +- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 348 +++--- .../src/sys/legacy/src/utils/src/utils_parser.c | 89 +- core/sap/dfs/inc/ath_dfs_structs.h | 6 +- core/sap/dfs/inc/dfs.h | 2 +- core/sap/src/sap_api_link_cntl.c | 14 +- core/sap/src/sap_ch_select.c | 28 +- core/sap/src/sap_fsm.c | 76 +- core/sap/src/sap_module.c | 56 +- core/sme/inc/sme_inside.h | 2 +- core/sme/inc/sme_internal.h | 2 +- core/sme/inc/sme_power_save.h | 2 +- core/sme/inc/sme_qos_api.h | 2 +- core/sme/inc/sme_qos_internal.h | 2 +- core/sme/inc/sme_rrm_api.h | 2 +- core/sme/inc/sme_rrm_internal.h | 2 +- core/sme/src/common/sme_api.c | 630 +++++------ core/sme/src/common/sme_ft_api.c | 42 +- core/sme/src/common/sme_power_save.c | 52 +- core/sme/src/csr/csr_api_roam.c | 1190 ++++++++++---------- core/sme/src/csr/csr_api_scan.c | 464 ++++---- core/sme/src/csr/csr_link_list.c | 2 +- core/sme/src/csr/csr_neighbor_roam.c | 136 +-- core/sme/src/csr/csr_tdls_process.c | 66 +- core/sme/src/csr/csr_util.c | 163 ++- core/sme/src/nan/nan_api.c | 8 +- core/sme/src/oem_data/oem_data_api.c | 20 +- core/sme/src/p2p/p2p_api.c | 28 +- core/sme/src/qos/sme_qos.c | 164 +-- core/sme/src/rrm/sme_rrm.c | 98 +- core/utils/epping/src/epping_helper.c | 8 +- core/utils/epping/src/epping_main.c | 4 +- core/utils/epping/src/epping_txrx.c | 14 +- core/utils/fwlog/dbglog_host.c | 6 +- core/utils/host_diag_log/src/host_diag_log.c | 16 +- .../utils/host_diag_log/src/i_host_diag_core_log.h | 10 +- core/utils/logging/src/wlan_logging_sock_svc.c | 2 +- core/utils/pktlog/linux_ac.c | 14 +- core/utils/pktlog/pktlog_ac.c | 6 +- core/utils/pktlog/pktlog_internal.c | 28 +- core/wma/src/wlan_qct_wma_legacy.c | 8 +- core/wma/src/wma_data.c | 96 +- core/wma/src/wma_dev_if.c | 152 +-- core/wma/src/wma_features.c | 202 ++-- core/wma/src/wma_main.c | 275 +++-- core/wma/src/wma_mgmt.c | 116 +- core/wma/src/wma_ocb.c | 70 +- core/wma/src/wma_power.c | 30 +- core/wma/src/wma_scan_roam.c | 226 ++-- core/wma/src/wma_utils.c | 90 +- core/wma/src/wma_utils_ut.c | 2 +- core/wmi/wmi_tlv_platform.c | 4 +- core/wmi/wmi_unified.c | 18 +- 167 files changed, 4972 insertions(+), 6125 deletions(-) delete mode 100644 core/cdf/inc/cdf_memory.h delete mode 100644 core/cdf/src/cdf_memory.c diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index ffc6966a09e6..36b44c976f3a 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -77,8 +77,8 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!info->bmi_cmd_buff) { info->bmi_cmd_buff = - cdf_os_mem_alloc_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, - &info->bmi_cmd_da, 0); + qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ, + &info->bmi_cmd_da); if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); return QDF_STATUS_E_NOMEM; @@ -87,8 +87,8 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!info->bmi_rsp_buff) { info->bmi_rsp_buff = - cdf_os_mem_alloc_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, - &info->bmi_rsp_da, 0); + qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ, + &info->bmi_rsp_da); if (!info->bmi_rsp_buff) { BMI_ERR("No Memory for BMI Response"); goto end; @@ -96,7 +96,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) } return QDF_STATUS_SUCCESS; end: - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; return QDF_STATUS_E_NOMEM; @@ -113,14 +113,14 @@ void bmi_cleanup(struct ol_context *ol_ctx) } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; @@ -167,7 +167,7 @@ bmi_get_target_info(struct bmi_target_info *targ_info, } cid = BMI_GET_TARGET_INFO; - cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); + qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(struct bmi_target_info); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), @@ -178,7 +178,7 @@ bmi_get_target_info(struct bmi_target_info *targ_info, return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(targ_info, bmi_rsp_buff, length); + qdf_mem_copy(targ_info, bmi_rsp_buff, length); return QDF_STATUS_SUCCESS; } @@ -243,8 +243,8 @@ QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); - cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); - cdf_mem_set(bmi_rsp_buff, 0, sizeof(cid) + sizeof(address)); + qdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); + qdf_mem_set(bmi_rsp_buff, 0, sizeof(cid) + sizeof(address)); if (info->bmi_done) { BMI_DBG("Command disallowed"); @@ -257,9 +257,9 @@ QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, cid = BMI_READ_SOC_REGISTER; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); param_len = sizeof(*param); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, @@ -268,7 +268,7 @@ QDF_STATUS bmi_read_soc_register(uint32_t address, uint32_t *param, BMI_DBG("Unable to read from the device; status:%d", status); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); + qdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Read SOC Register: Exit value: %d", *param); return QDF_STATUS_SUCCESS; @@ -288,7 +288,7 @@ QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(size)); - cdf_mem_set(bmi_cmd_buff, 0, size); + qdf_mem_set(bmi_cmd_buff, 0, size); if (info->bmi_done) { BMI_DBG("Command disallowed"); @@ -301,11 +301,11 @@ QDF_STATUS bmi_write_soc_register(uint32_t address, uint32_t param, cid = BMI_WRITE_SOC_REGISTER; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), ¶m, sizeof(param)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), ¶m, sizeof(param)); offset += sizeof(param); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, NULL, 0); @@ -333,7 +333,7 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -350,11 +350,11 @@ bmilz_data(uint8_t *buffer, uint32_t length, struct ol_context *ol_ctx) txlen = (remaining < (BMI_DATASZ_MAX - header)) ? remaining : (BMI_DATASZ_MAX - header); offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); offset += sizeof(txlen); - cdf_mem_copy(&(bmi_cmd_buff[offset]), + qdf_mem_copy(&(bmi_cmd_buff[offset]), &buffer[length - remaining], txlen); offset += txlen; status = hif_exchange_bmi_msg(scn, cmd, rsp, @@ -390,7 +390,7 @@ QDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); if (info->bmi_done) { BMI_ERR("Command disallowed"); @@ -416,14 +416,14 @@ QDF_STATUS bmi_sign_stream_start(uint32_t address, uint8_t *buffer, } offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(offset); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); offset += sizeof(txlen); - cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); + qdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, @@ -453,7 +453,7 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) qdf_dma_addr_t rsp = info->bmi_rsp_da; bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); - cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); + qdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); if (info->bmi_done) { BMI_DBG("Command disallowed"); @@ -464,9 +464,9 @@ bmilz_stream_start(uint32_t address, struct ol_context *ol_ctx) cid = BMI_LZ_STREAM_START; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, NULL, 0); @@ -494,7 +494,7 @@ bmi_fast_download(uint32_t address, uint8_t *buffer, /* copy the last word into a zero padded buffer */ if (unaligned_bytes) - cdf_mem_copy(&last_word, &buffer[last_word_offset], + qdf_mem_copy(&last_word, &buffer[last_word_offset], unaligned_bytes); status = bmilz_data(buffer, last_word_offset, ol_ctx); diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index adcf117c2f45..df51f625f6eb 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -58,9 +58,9 @@ bmi_read_memory(uint32_t address, bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length))); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + sizeof(cid) + + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)); - cdf_mem_set(bmi_rsp_buff, 0, BMI_DATASZ_MAX + sizeof(cid) + + qdf_mem_set(bmi_rsp_buff, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)); BMI_DBG("BMI Read: device: 0x%p, address: 0x%x, length: %d", @@ -74,12 +74,12 @@ bmi_read_memory(uint32_t address, rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &rxlen, sizeof(rxlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &rxlen, sizeof(rxlen)); offset += sizeof(length); /* note we reuse the same buffer to receive on */ @@ -91,11 +91,11 @@ bmi_read_memory(uint32_t address, return QDF_STATUS_E_FAILURE; } if (remaining == rxlen) { - cdf_mem_copy(&buffer[length - remaining + align], + qdf_mem_copy(&buffer[length - remaining + align], bmi_rsp_buff, rxlen - align); /* last align bytes are invalid */ } else { - cdf_mem_copy(&buffer[length - remaining + align], + qdf_mem_copy(&buffer[length - remaining + align], bmi_rsp_buff, rxlen); } remaining -= rxlen; @@ -133,7 +133,7 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); BMI_DBG("BMI Write Memory:device: 0x%p, address: 0x%x, length: %d", scn, address, length); @@ -155,14 +155,14 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, txlen = (BMI_DATASZ_MAX - header); } offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); offset += sizeof(txlen); - cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); + qdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, NULL, NULL, @@ -207,8 +207,8 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) } bmi_assert(BMI_COMMAND_FITS(size)); - cdf_mem_set(bmi_cmd_buff, 0, size); - cdf_mem_set(bmi_rsp_buff, 0, size); + qdf_mem_set(bmi_cmd_buff, 0, size); + qdf_mem_set(bmi_rsp_buff, 0, size); BMI_DBG("BMI Execute: device: 0x%p, address: 0x%x, param: %d", @@ -217,11 +217,11 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) cid = BMI_EXECUTE; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), param, sizeof(*param)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), param, sizeof(*param)); offset += sizeof(*param); param_len = sizeof(*param); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, @@ -231,7 +231,7 @@ bmi_execute(uint32_t address, A_UINT32 *param, struct ol_context *ol_ctx) return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); + qdf_mem_copy(param, bmi_rsp_buff, sizeof(*param)); BMI_DBG("BMI Execute: Exit (param: %d)", *param); return QDF_STATUS_SUCCESS; @@ -251,7 +251,7 @@ bmi_firmware_download(struct ol_context *ol_ctx) struct bmi_target_info targ_info; struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); - cdf_mem_zero(&targ_info, sizeof(targ_info)); + qdf_mem_zero(&targ_info, sizeof(targ_info)); /* Initialize BMI */ status = bmi_init(ol_ctx); if (status != QDF_STATUS_SUCCESS) { @@ -323,7 +323,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) return QDF_STATUS_NOT_INITIALIZED; } - cdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); + qdf_mem_copy(info->bmi_cmd_buff, &cid, sizeof(cid)); status = hif_exchange_bmi_msg(scn, cmd, rsp, info->bmi_cmd_buff, sizeof(cid), NULL, NULL, 0); @@ -333,14 +333,14 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index e2a3c291d2d5..9c1929b476fb 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -58,7 +58,7 @@ bmi_no_command(struct ol_context *ol_ctx) } cid = BMI_NO_COMMAND; - cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); + qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), @@ -69,7 +69,7 @@ bmi_no_command(struct ol_context *ol_ctx) return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, length); + qdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("bmi no command response error ret 0x%x", ret); return QDF_STATUS_E_FAILURE; @@ -109,7 +109,7 @@ bmi_done_local(struct ol_context *ol_ctx) cid = BMI_DONE; - cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); + qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), @@ -119,7 +119,7 @@ bmi_done_local(struct ol_context *ol_ctx) BMI_ERR("Failed to close BMI on target status:%d", status); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, length); + qdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("BMI DONE response failed:%d", ret); @@ -127,14 +127,14 @@ bmi_done_local(struct ol_context *ol_ctx) } if (info->bmi_cmd_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - cdf_os_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; @@ -173,7 +173,7 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header)); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header); cid = BMI_WRITE_MEMORY; rsp_len = sizeof(ret); @@ -193,14 +193,14 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, txlen = (BMI_DATASZ_MAX - header); } offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen)); offset += sizeof(txlen); - cdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); + qdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen); offset += txlen; status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset, bmi_rsp_buff, &rsp_len, @@ -209,7 +209,7 @@ QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length, BMI_ERR("BMI Write Memory Failed status:%d", status); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); + qdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("BMI Write memory response fail: %x", ret); return QDF_STATUS_E_FAILURE; @@ -248,8 +248,8 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, } bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + size)); - cdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + size); - cdf_mem_set(bmi_rsp_buff, 0, BMI_DATASZ_MAX + size); + qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + size); + qdf_mem_set(bmi_rsp_buff, 0, BMI_DATASZ_MAX + size); cid = BMI_READ_MEMORY; rsp_len = sizeof(ret); @@ -259,12 +259,12 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, rxlen = (remaining < BMI_DATASZ_MAX - rsp_len) ? remaining : (BMI_DATASZ_MAX - rsp_len); offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &address, + qdf_mem_copy(&(bmi_cmd_buff[offset]), &address, sizeof(address)); offset += sizeof(address); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &rxlen, sizeof(rxlen)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &rxlen, sizeof(rxlen)); offset += sizeof(length); total_len = rxlen + rsp_len; @@ -281,14 +281,14 @@ bmi_read_memory(uint32_t address, uint8_t *buffer, return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); + qdf_mem_copy(&ret, bmi_rsp_buff, rsp_len); if (ret != 0) { BMI_ERR("bmi read memory response fail %x", ret); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&buffer[length - remaining], + qdf_mem_copy(&buffer[length - remaining], (uint8_t *)bmi_rsp_buff + rsp_len, rxlen); remaining -= rxlen; address += rxlen; } @@ -322,7 +322,7 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) cid = BMI_EXECUTE; - cdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); + qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid)); length = sizeof(ret); status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid), @@ -333,7 +333,7 @@ bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx) return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, length); + qdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); @@ -371,7 +371,7 @@ bmi_load_image(dma_addr_t address, } bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address))); - cdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); + qdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address)); BMI_DBG("%s: Enter device: 0x%p, size %d", __func__, scn, size); @@ -379,15 +379,15 @@ bmi_load_image(dma_addr_t address, cid = BMI_LOAD_IMAGE; offset = 0; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid)); offset += sizeof(cid); addr_l = address & 0xffffffff; addr_h = 0x00; - cdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_l, sizeof(addr_l)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_l, sizeof(addr_l)); offset += sizeof(addr_l); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_h, sizeof(addr_h)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_h, sizeof(addr_h)); offset += sizeof(addr_h); - cdf_mem_copy(&(bmi_cmd_buff[offset]), &size, sizeof(size)); + qdf_mem_copy(&(bmi_cmd_buff[offset]), &size, sizeof(size)); offset += sizeof(size); length = sizeof(ret); @@ -399,7 +399,7 @@ bmi_load_image(dma_addr_t address, return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&ret, bmi_rsp_buff, length); + qdf_mem_copy(&ret, bmi_rsp_buff, length); if (ret != 0) { BMI_ERR("%s: ret 0x%x", __func__, ret); return QDF_STATUS_E_FAILURE; diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index ccae3469e492..42438da81f51 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -97,7 +97,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) goto end; } - if (!cdf_mem_compare(hash, temp, SHA256_DIGEST_SIZE)) { + if (qdf_mem_cmp(hash, temp, SHA256_DIGEST_SIZE)) { BMI_INFO("Download FW in non-secure mode:%d", file); goto end; } @@ -109,7 +109,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) ret = -1; goto end; } - cdf_mem_copy(fw_mem, data, fw_size); + qdf_mem_copy(fw_mem, data, fw_size); ret = cnss_get_sha_hash(fw_mem, fw_size, "sha256", digest); @@ -118,7 +118,7 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file) goto end; } - if (cdf_mem_compare(hash, digest, SHA256_DIGEST_SIZE) != 0) { + if (qdf_mem_cmp(hash, digest, SHA256_DIGEST_SIZE) == 0) { BMI_ERR("Hash Mismatch"); qdf_trace_hex_dump(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, digest, SHA256_DIGEST_SIZE); @@ -299,14 +299,14 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, uint32_t board_ext_address; int32_t board_ext_data_size; - temp_eeprom = cdf_mem_malloc(fw_entry_size); + temp_eeprom = qdf_mem_malloc(fw_entry_size); if (!temp_eeprom) { BMI_ERR("%s: Memory allocation failed", __func__); release_firmware(fw_entry); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(temp_eeprom, (uint8_t *) fw_entry->data, + qdf_mem_copy(temp_eeprom, (uint8_t *) fw_entry->data, fw_entry_size); switch (target_type) { @@ -444,7 +444,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, end: if (temp_eeprom) - cdf_mem_free(temp_eeprom); + qdf_mem_free(temp_eeprom); if (status != EOK) { BMI_ERR("%s, BMI operation failed: %d", __func__, __LINE__); @@ -507,7 +507,7 @@ int ol_copy_ramdump(struct hif_opaque_softc *scn) { int ret = -1; - struct ramdump_info *info = cdf_mem_malloc(sizeof(struct ramdump_info)); + struct ramdump_info *info = qdf_mem_malloc(sizeof(struct ramdump_info)); if (!info) { BMI_ERR("%s Memory for Ramdump Allocation failed", __func__); @@ -523,7 +523,7 @@ int ol_copy_ramdump(struct hif_opaque_softc *scn) ret = ol_target_coredump(scn, info->base, info->size); - cdf_mem_free(info); + qdf_mem_free(info); return ret; } @@ -1655,5 +1655,5 @@ struct ol_config_info *ol_get_ini_handle(struct ol_context *ol_ctx) void ol_init_ini_config(struct ol_context *ol_ctx, struct ol_config_info *cfg) { - cdf_mem_copy(&ol_ctx->cfg_info, cfg, sizeof(struct ol_config_info)); + qdf_mem_copy(&ol_ctx->cfg_info, cfg, sizeof(struct ol_config_info)); } diff --git a/core/cdf/inc/cdf_memory.h b/core/cdf/inc/cdf_memory.h deleted file mode 100644 index 8170a0f87dc9..000000000000 --- a/core/cdf/inc/cdf_memory.h +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -#if !defined(__CDF_MEMORY_H) -#define __CDF_MEMORY_H - -/** - * DOC: cdf_memory - * - * Connectivity driver framework (CDF) memory management APIs - */ - -/* Include Files */ -#include - -/** - * struct cdf_mem_dma_page_t - Allocated dmaable page - * @page_v_addr_start: Page start virtual address - * @page_v_addr_end: Page end virtual address - * @page_p_addr: Page start physical address - */ -struct cdf_mem_dma_page_t { - char *page_v_addr_start; - char *page_v_addr_end; - qdf_dma_addr_t page_p_addr; -}; - -/** - * struct cdf_mem_multi_page_t - multiple page allocation information storage - * @num_element_per_page: Number of element in single page - * @num_pages: Number of allocation needed pages - * @dma_pages: page information storage in case of coherent memory - * @cacheable_pages: page information storage in case of cacheable memory - */ -struct cdf_mem_multi_page_t { - uint16_t num_element_per_page; - uint16_t num_pages; - struct cdf_mem_dma_page_t *dma_pages; - void **cacheable_pages; -}; - -/* Preprocessor definitions and constants */ - -#ifdef MEMORY_DEBUG -void cdf_mem_clean(void); -void cdf_mem_init(void); -void cdf_mem_exit(void); -#else -/** - * cdf_mem_init() - initialize cdf memory debug functionality - * - * Return: none - */ -static inline void cdf_mem_init(void) -{ -} - -/** - * cdf_mem_exit() - exit cdf memory debug functionality - * - * Return: none - */ -static inline void cdf_mem_exit(void) -{ -} -#endif -/* Type declarations */ - -/* Function declarations and documenation */ - -/** - * cdf_mem_malloc() - allocation CDF memory - * @size: Number of bytes of memory to allocate. - * - * This function will dynamicallly allocate the specified number of bytes of - * memory. - * - * - * Return: - * Upon successful allocate, returns a non-NULL pointer to the allocated - * memory. If this function is unable to allocate the amount of memory - * specified (for any reason) it returns %NULL. - * - */ -#ifdef MEMORY_DEBUG -#define cdf_mem_malloc(size) cdf_mem_malloc_debug(size, __FILE__, __LINE__) -void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum); -#else -void *cdf_mem_malloc(size_t size); -#endif - -/** - * cdf_mem_free() - free CDF memory - * @ptr: Pointer to the starting address of the memory to be free'd. - * - * This function will free the memory pointed to by 'ptr'. - * - * Return: - * Nothing - * - */ -void cdf_mem_free(void *ptr); - -/** - * cdf_mem_set() - set (fill) memory with a specified byte value. - * @pMemory: Pointer to memory that will be set - * @numBytes: Number of bytes to be set - * @value: Byte set in memory - * - * Return: - * Nothing - * - */ -void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value); - -/** - * cdf_mem_zero() - zero out memory - * @pMemory: pointer to memory that will be set to zero - * @numBytes: number of bytes zero - * @value: byte set in memory - * - * This function sets the memory location to all zeros, essentially clearing - * the memory. - * - * Return: - * Nothing - * - */ -void cdf_mem_zero(void *ptr, uint32_t numBytes); - -/** - * cdf_mem_copy() - copy memory - * @pDst: Pointer to destination memory location (to copy to) - * @pSrc: Pointer to source memory location (to copy from) - * @numBytes: Number of bytes to copy. - * - * Copy host memory from one location to another, similar to memcpy in - * standard C. Note this function does not specifically handle overlapping - * source and destination memory locations. Calling this function with - * overlapping source and destination memory locations will result in - * unpredictable results. Use cdf_mem_move() if the memory locations - * for the source and destination are overlapping (or could be overlapping!) - * - * Return: - * Nothing - * - */ -void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes); - -/** - * cdf_mem_move() - move memory - * @pDst: pointer to destination memory location (to move to) - * @pSrc: pointer to source memory location (to move from) - * @numBytes: number of bytes to move. - * - * Move host memory from one location to another, similar to memmove in - * standard C. Note this function *does* handle overlapping - * source and destination memory locations. - - * Return: - * Nothing - */ -void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes); - -/** - * cdf_mem_compare() - memory compare - * @pMemory1: pointer to one location in memory to compare. - * @pMemory2: pointer to second location in memory to compare. - * @numBytes: the number of bytes to compare. - * - * Function to compare two pieces of memory, similar to memcmp function - * in standard C. - * - * Return: - * bool - returns a bool value that tells if the memory locations - * are equal or not equal. - * - */ -bool cdf_mem_compare(const void *pMemory1, const void *pMemory2, - uint32_t numBytes); - -/** - * cdf_mem_compare2() - memory compare - * @pMemory1: pointer to one location in memory to compare. - * @pMemory2: pointer to second location in memory to compare. - * @numBytes: the number of bytes to compare. - * - * Function to compare two pieces of memory, similar to memcmp function - * in standard C. - * Return: - * int32_t - returns a bool value that tells if the memory - * locations are equal or not equal. - * 0 -- equal - * < 0 -- *pMemory1 is less than *pMemory2 - * > 0 -- *pMemory1 is bigger than *pMemory2 - */ -int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2, - uint32_t numBytes); - -void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size, - qdf_dma_addr_t *paddr, - qdf_dma_context_t mctx); -void -cdf_os_mem_free_consistent(qdf_device_t osdev, - qdf_size_t size, - void *vaddr, - qdf_dma_addr_t paddr, qdf_dma_context_t memctx); - -void -cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev, - qdf_dma_addr_t bus_addr, - qdf_size_t size, - enum dma_data_direction direction); - -/** - * cdf_str_len() - returns the length of a string - * @str: input string - * - * Return: - * length of string - */ -static inline int32_t cdf_str_len(const char *str) -{ - return strlen(str); -} - -void cdf_mem_multi_pages_alloc(qdf_device_t osdev, - struct cdf_mem_multi_page_t *pages, - size_t element_size, - uint16_t element_num, - qdf_dma_context_t memctxt, - bool cacheable); - -void cdf_mem_multi_pages_free(qdf_device_t osdev, - struct cdf_mem_multi_page_t *pages, - qdf_dma_context_t memctxt, - bool cacheable); -#endif /* __CDF_MEMORY_H */ diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c deleted file mode 100644 index eee883efc5a0..000000000000 --- a/core/cdf/src/cdf_memory.c +++ /dev/null @@ -1,863 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_memory - * - * Connectivity driver framework (CDF) memory management APIs - */ - -/* Include Files */ -#include "cdf_memory.h" -#include "cdf_nbuf.h" -#include "qdf_trace.h" -#include "qdf_lock.h" -#include "qdf_mc_timer.h" - -#if defined(CONFIG_CNSS) -#include -#endif - -#ifdef CONFIG_WCNSS_MEM_PRE_ALLOC -#include -#endif - -#ifdef MEMORY_DEBUG -#include -#include - -qdf_list_t cdf_mem_list; -qdf_spinlock_t cdf_mem_list_lock; - -static uint8_t WLAN_MEM_HEADER[] = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, - 0x67, 0x68 }; -static uint8_t WLAN_MEM_TAIL[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, - 0x86, 0x87 }; - -#define CDF_MEM_MAX_STACK_TRACE 16 - -struct s_cdf_mem_struct { - qdf_list_node_t pNode; - char *fileName; - unsigned int lineNum; - unsigned int size; -#ifdef WLAN_OPEN_SOURCE - unsigned long stack_trace[CDF_MEM_MAX_STACK_TRACE]; - struct stack_trace trace; -#endif - uint8_t header[8]; -}; -#endif - -/* Preprocessor Definitions and Constants */ -#define CDF_GET_MEMORY_TIME_THRESHOLD 3000 - -/* Type Declarations */ - -/* Data definitions */ - -/* External Function implementation */ -#ifdef MEMORY_DEBUG -#ifdef WLAN_OPEN_SOURCE -/** - * cdf_mem_save_stack_trace() - Save stack trace of the caller - * @mem_struct: Pointer to the memory structure where to save the stack trace - * - * Return: None - */ -static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct) -{ - struct stack_trace *trace = &mem_struct->trace; - - trace->nr_entries = 0; - trace->max_entries = CDF_MEM_MAX_STACK_TRACE; - trace->entries = mem_struct->stack_trace; - trace->skip = 2; - - save_stack_trace(trace); -} - -/** - * cdf_mem_print_stack_trace() - Print saved stack trace - * @mem_struct: Pointer to the memory structure which has the saved stack trace - * to be printed - * - * Return: None - */ -static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct - *mem_struct) -{ - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, - "Call stack for the source of leaked memory:"); - - print_stack_trace(&mem_struct->trace, 1); -} -#else -static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct) -{ - -} -static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct - *mem_struct) -{ - -} -#endif - -/** - * cdf_mem_init() - initialize cdf memory debug functionality - * - * Return: none - */ -void cdf_mem_init(void) -{ - /* Initalizing the list with maximum size of 60000 */ - qdf_list_create(&cdf_mem_list, 60000); - qdf_spinlock_create(&cdf_mem_list_lock); - cdf_net_buf_debug_init(); - return; -} - -/** - * cdf_mem_clean() - display memory leak debug info and free leaked pointers - * - * Return: none - */ -void cdf_mem_clean(void) -{ - uint32_t listSize; - listSize = qdf_list_size(&cdf_mem_list); - - cdf_net_buf_debug_clean(); - - if (listSize) { - qdf_list_node_t *pNode; - QDF_STATUS qdf_status; - - struct s_cdf_mem_struct *memStruct; - char *prev_mleak_file = ""; - unsigned int prev_mleak_lineNum = 0; - unsigned int prev_mleak_sz = 0; - unsigned int mleak_cnt = 0; - - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: List is not Empty. listSize %d ", - __func__, (int)listSize); - - do { - qdf_spin_lock(&cdf_mem_list_lock); - qdf_status = - qdf_list_remove_front(&cdf_mem_list, &pNode); - qdf_spin_unlock(&cdf_mem_list_lock); - if (QDF_STATUS_SUCCESS == qdf_status) { - memStruct = (struct s_cdf_mem_struct *)pNode; - /* Take care to log only once multiple memory - leaks from the same place */ - if (strcmp(prev_mleak_file, memStruct->fileName) - || (prev_mleak_lineNum != - memStruct->lineNum) - || (prev_mleak_sz != memStruct->size)) { - if (mleak_cnt != 0) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_FATAL, - "%d Time Memory Leak@ File %s, @Line %d, size %d", - mleak_cnt, - prev_mleak_file, - prev_mleak_lineNum, - prev_mleak_sz); - } - prev_mleak_file = memStruct->fileName; - prev_mleak_lineNum = memStruct->lineNum; - prev_mleak_sz = memStruct->size; - mleak_cnt = 0; - } - mleak_cnt++; - cdf_mem_print_stack_trace(memStruct); - kfree((void *)memStruct); - } - } while (qdf_status == QDF_STATUS_SUCCESS); - - /* Print last memory leak from the module */ - if (mleak_cnt) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, - "%d Time memory Leak@ File %s, @Line %d, size %d", - mleak_cnt, prev_mleak_file, - prev_mleak_lineNum, prev_mleak_sz); - } -#ifdef CONFIG_HALT_KMEMLEAK - BUG_ON(0); -#endif - } -} - -/** - * cdf_mem_exit() - exit cdf memory debug functionality - * - * Return: none - */ -void cdf_mem_exit(void) -{ - cdf_net_buf_debug_exit(); - cdf_mem_clean(); - qdf_list_destroy(&cdf_mem_list); -} - -/** - * cdf_mem_malloc_debug() - debug version of CDF memory allocation API - * @size: Number of bytes of memory to allocate. - * @fileName: File name from which memory allocation is called - * @lineNum: Line number from which memory allocation is called - * - * This function will dynamicallly allocate the specified number of bytes of - * memory and ad it in cdf tracking list to check against memory leaks and - * corruptions - * - * - * Return: - * Upon successful allocate, returns a non-NULL pointer to the allocated - * memory. If this function is unable to allocate the amount of memory - * specified (for any reason) it returns %NULL. - * - */ -void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum) -{ - struct s_cdf_mem_struct *memStruct; - void *memPtr = NULL; - uint32_t new_size; - int flags = GFP_KERNEL; - unsigned long time_before_kzalloc; - - if (size > (1024 * 1024) || size == 0) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: called with invalid arg; passed in %zu !!!", - __func__, size); - return NULL; - } - -#if defined(CONFIG_CNSS) && defined(CONFIG_WCNSS_MEM_PRE_ALLOC) - if (size > WCNSS_PRE_ALLOC_GET_THRESHOLD) { - void *pmem; - pmem = wcnss_prealloc_get(size); - if (NULL != pmem) { - memset(pmem, 0, size); - return pmem; - } - } -#endif - - if (in_interrupt() || irqs_disabled() || in_atomic()) - flags = GFP_ATOMIC; - - new_size = size + sizeof(struct s_cdf_mem_struct) + 8; - time_before_kzalloc = qdf_mc_timer_get_system_time(); - memStruct = (struct s_cdf_mem_struct *)kzalloc(new_size, flags); - /** - * If time taken by kmalloc is greater than - * CDF_GET_MEMORY_TIME_THRESHOLD msec - */ - if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= - CDF_GET_MEMORY_TIME_THRESHOLD) - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: kzalloc took %lu msec for size %zu called from %pS at line %d", - __func__, - qdf_mc_timer_get_system_time() - time_before_kzalloc, - size, (void *)_RET_IP_, lineNum); - - if (memStruct != NULL) { - QDF_STATUS qdf_status; - - memStruct->fileName = fileName; - memStruct->lineNum = lineNum; - memStruct->size = size; - cdf_mem_save_stack_trace(memStruct); - - cdf_mem_copy(&memStruct->header[0], - &WLAN_MEM_HEADER[0], sizeof(WLAN_MEM_HEADER)); - - cdf_mem_copy((uint8_t *) (memStruct + 1) + size, - &WLAN_MEM_TAIL[0], sizeof(WLAN_MEM_TAIL)); - - qdf_spin_lock_irqsave(&cdf_mem_list_lock); - qdf_status = qdf_list_insert_front(&cdf_mem_list, - &memStruct->pNode); - qdf_spin_unlock_irqrestore(&cdf_mem_list_lock); - if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Unable to insert node into List qdf_status %d", - __func__, qdf_status); - } - - memPtr = (void *)(memStruct + 1); - } - return memPtr; -} - -/** - * cdf_mem_free() - debug version of CDF memory free API - * @ptr: Pointer to the starting address of the memory to be free'd. - * - * This function will free the memory pointed to by 'ptr'. It also checks - * is memory is corrupted or getting double freed and panic. - * - * Return: - * Nothing - */ -void cdf_mem_free(void *ptr) -{ - if (ptr != NULL) { - QDF_STATUS qdf_status; - struct s_cdf_mem_struct *memStruct = - ((struct s_cdf_mem_struct *)ptr) - 1; - -#if defined(CONFIG_CNSS) && defined(CONFIG_WCNSS_MEM_PRE_ALLOC) - if (wcnss_prealloc_put(ptr)) - return; -#endif - - qdf_spin_lock_irqsave(&cdf_mem_list_lock); - qdf_status = - qdf_list_remove_node(&cdf_mem_list, &memStruct->pNode); - qdf_spin_unlock_irqrestore(&cdf_mem_list_lock); - - if (QDF_STATUS_SUCCESS == qdf_status) { - if (0 == cdf_mem_compare(memStruct->header, - &WLAN_MEM_HEADER[0], - sizeof(WLAN_MEM_HEADER))) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_FATAL, - "Memory Header is corrupted. MemInfo: Filename %s, LineNum %d", - memStruct->fileName, - (int)memStruct->lineNum); - QDF_BUG(0); - } - if (0 == - cdf_mem_compare((uint8_t *) ptr + memStruct->size, - &WLAN_MEM_TAIL[0], - sizeof(WLAN_MEM_TAIL))) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_FATAL, - "Memory Trailer is corrupted. MemInfo: Filename %s, LineNum %d", - memStruct->fileName, - (int)memStruct->lineNum); - QDF_BUG(0); - } - kfree((void *)memStruct); - } else { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, - "%s: Unallocated memory (double free?)", - __func__); - QDF_BUG(0); - } - } -} -#else -/** - * cdf_mem_malloc() - allocation CDF memory - * @size: Number of bytes of memory to allocate. - * - * This function will dynamicallly allocate the specified number of bytes of - * memory. - * - * - * Return: - * Upon successful allocate, returns a non-NULL pointer to the allocated - * memory. If this function is unable to allocate the amount of memory - * specified (for any reason) it returns %NULL. - * - */ -void *cdf_mem_malloc(size_t size) -{ - int flags = GFP_KERNEL; - void *memPtr = NULL; - unsigned long time_before_kzalloc; - - if (size > (1024 * 1024) || size == 0) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: called with invalid arg; passed in %zu !!", - __func__, size); - return NULL; - } - -#if defined(CONFIG_CNSS) && defined(CONFIG_WCNSS_MEM_PRE_ALLOC) - if (size > WCNSS_PRE_ALLOC_GET_THRESHOLD) { - void *pmem; - pmem = wcnss_prealloc_get(size); - if (NULL != pmem) { - memset(pmem, 0, size); - return pmem; - } - } -#endif - - if (in_interrupt() || irqs_disabled() || in_atomic()) - flags = GFP_ATOMIC; - time_before_kzalloc = qdf_mc_timer_get_system_time(); - memPtr = kzalloc(size, flags); - /** - * If time taken by kmalloc is greater than - * CDF_GET_MEMORY_TIME_THRESHOLD msec - */ - if (qdf_mc_timer_get_system_time() - time_before_kzalloc >= - CDF_GET_MEMORY_TIME_THRESHOLD) - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: kzalloc took %lu msec for size %zu called from %pS", - __func__, - qdf_mc_timer_get_system_time() - time_before_kzalloc, - size, (void *)_RET_IP_); - return memPtr; -} - -/** - * cdf_mem_free() - free CDF memory - * @ptr: Pointer to the starting address of the memory to be free'd. - * - * This function will free the memory pointed to by 'ptr'. - * - * Return: - * Nothing - * - */ -void cdf_mem_free(void *ptr) -{ - if (ptr == NULL) - return; - -#if defined(CONFIG_CNSS) && defined(CONFIG_WCNSS_MEM_PRE_ALLOC) - if (wcnss_prealloc_put(ptr)) - return; -#endif - - kfree(ptr); -} -#endif - -/** - * cdf_mem_multi_pages_alloc() - allocate large size of kernel memory - * @osdev: OS device handle pointer - * @pages: Multi page information storage - * @element_size: Each element size - * @element_num: Total number of elements should be allocated - * @memctxt: Memory context - * @cacheable: Coherent memory or cacheable memory - * - * This function will allocate large size of memory over multiple pages. - * Large size of contiguous memory allocation will fail frequentely, then - * instead of allocate large memory by one shot, allocate through multiple, non - * contiguous memory and combine pages when actual usage - * - * Return: None - */ -void cdf_mem_multi_pages_alloc(qdf_device_t osdev, - struct cdf_mem_multi_page_t *pages, - size_t element_size, - uint16_t element_num, - qdf_dma_context_t memctxt, - bool cacheable) -{ - uint16_t page_idx; - struct cdf_mem_dma_page_t *dma_pages; - void **cacheable_pages = NULL; - uint16_t i; - - QDF_BUG(PAGE_SIZE >= element_size); - - pages->num_element_per_page = PAGE_SIZE / element_size; - if (!pages->num_element_per_page) { - qdf_print("Invalid page %d or element size %d", - (int)PAGE_SIZE, (int)element_size); - goto out_fail; - } - - pages->num_pages = element_num / pages->num_element_per_page; - if (element_num % pages->num_element_per_page) - pages->num_pages++; - - if (cacheable) { - /* Pages information storage */ - pages->cacheable_pages = cdf_mem_malloc( - pages->num_pages * sizeof(pages->cacheable_pages)); - if (!pages->cacheable_pages) { - qdf_print("Cacheable page storage alloc fail"); - goto out_fail; - } - - cacheable_pages = pages->cacheable_pages; - for (page_idx = 0; page_idx < pages->num_pages; page_idx++) { - cacheable_pages[page_idx] = cdf_mem_malloc(PAGE_SIZE); - if (!cacheable_pages[page_idx]) { - qdf_print("cacheable page alloc fail, pi %d", - page_idx); - goto page_alloc_fail; - } - } - pages->dma_pages = NULL; - } else { - pages->dma_pages = cdf_mem_malloc( - pages->num_pages * sizeof(struct cdf_mem_dma_page_t)); - if (!pages->dma_pages) { - qdf_print("dmaable page storage alloc fail"); - goto out_fail; - } - - dma_pages = pages->dma_pages; - for (page_idx = 0; page_idx < pages->num_pages; page_idx++) { - dma_pages->page_v_addr_start = - cdf_os_mem_alloc_consistent(osdev, PAGE_SIZE, - &dma_pages->page_p_addr, memctxt); - if (!dma_pages->page_v_addr_start) { - qdf_print("dmaable page alloc fail pi %d", - page_idx); - goto page_alloc_fail; - } - dma_pages->page_v_addr_end = - dma_pages->page_v_addr_start + PAGE_SIZE; - dma_pages++; - } - pages->cacheable_pages = NULL; - } - return; - -page_alloc_fail: - if (cacheable) { - for (i = 0; i < page_idx; i++) - cdf_mem_free(pages->cacheable_pages[i]); - cdf_mem_free(pages->cacheable_pages); - } else { - dma_pages = pages->dma_pages; - for (i = 0; i < page_idx; i++) { - cdf_os_mem_free_consistent(osdev, PAGE_SIZE, - dma_pages->page_v_addr_start, - dma_pages->page_p_addr, memctxt); - dma_pages++; - } - cdf_mem_free(pages->dma_pages); - } - -out_fail: - pages->cacheable_pages = NULL; - pages->dma_pages = NULL; - pages->num_pages = 0; - return; -} - -/** - * cdf_mem_multi_pages_free() - free large size of kernel memory - * @osdev: OS device handle pointer - * @pages: Multi page information storage - * @memctxt: Memory context - * @cacheable: Coherent memory or cacheable memory - * - * This function will free large size of memory over multiple pages. - * - * Return: None - */ -void cdf_mem_multi_pages_free(qdf_device_t osdev, - struct cdf_mem_multi_page_t *pages, - qdf_dma_context_t memctxt, - bool cacheable) -{ - unsigned int page_idx; - struct cdf_mem_dma_page_t *dma_pages; - - if (cacheable) { - for (page_idx = 0; page_idx < pages->num_pages; page_idx++) - cdf_mem_free(pages->cacheable_pages[page_idx]); - cdf_mem_free(pages->cacheable_pages); - } else { - dma_pages = pages->dma_pages; - for (page_idx = 0; page_idx < pages->num_pages; page_idx++) { - cdf_os_mem_free_consistent(osdev, PAGE_SIZE, - dma_pages->page_v_addr_start, - dma_pages->page_p_addr, memctxt); - dma_pages++; - } - cdf_mem_free(pages->dma_pages); - } - - pages->cacheable_pages = NULL; - pages->dma_pages = NULL; - pages->num_pages = 0; - return; -} - - -/** - * cdf_mem_set() - set (fill) memory with a specified byte value. - * @pMemory: Pointer to memory that will be set - * @numBytes: Number of bytes to be set - * @value: Byte set in memory - * - * Return: - * Nothing - * - */ -void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value) -{ - if (ptr == NULL) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter ptr", __func__); - return; - } - memset(ptr, value, numBytes); -} - -/** - * cdf_mem_zero() - zero out memory - * @pMemory: pointer to memory that will be set to zero - * @numBytes: number of bytes zero - * @value: byte set in memory - * - * This function sets the memory location to all zeros, essentially clearing - * the memory. - * - * Return: - * Nothing - * - */ -void cdf_mem_zero(void *ptr, uint32_t numBytes) -{ - if (0 == numBytes) { - /* special case where ptr can be NULL */ - return; - } - - if (ptr == NULL) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter ptr", __func__); - return; - } - memset(ptr, 0, numBytes); -} - -/** - * cdf_mem_copy() - copy memory - * @pDst: Pointer to destination memory location (to copy to) - * @pSrc: Pointer to source memory location (to copy from) - * @numBytes: Number of bytes to copy. - * - * Copy host memory from one location to another, similar to memcpy in - * standard C. Note this function does not specifically handle overlapping - * source and destination memory locations. Calling this function with - * overlapping source and destination memory locations will result in - * unpredictable results. Use cdf_mem_move() if the memory locations - * for the source and destination are overlapping (or could be overlapping!) - * - * Return: - * Nothing - * - */ -void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes) -{ - if (0 == numBytes) { - /* special case where pDst or pSrc can be NULL */ - return; - } - - if ((pDst == NULL) || (pSrc == NULL)) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter, source:%p destination:%p", - __func__, pSrc, pDst); - QDF_ASSERT(0); - return; - } - memcpy(pDst, pSrc, numBytes); -} - -/** - * cdf_mem_move() - move memory - * @pDst: pointer to destination memory location (to move to) - * @pSrc: pointer to source memory location (to move from) - * @numBytes: number of bytes to move. - * - * Move host memory from one location to another, similar to memmove in - * standard C. Note this function *does* handle overlapping - * source and destination memory locations. - - * Return: - * Nothing - */ -void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes) -{ - if (0 == numBytes) { - /* special case where pDst or pSrc can be NULL */ - return; - } - - if ((pDst == NULL) || (pSrc == NULL)) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter, source:%p destination:%p", - __func__, pSrc, pDst); - QDF_ASSERT(0); - return; - } - memmove(pDst, pSrc, numBytes); -} - -/** - * cdf_mem_compare() - memory compare - * @pMemory1: pointer to one location in memory to compare. - * @pMemory2: pointer to second location in memory to compare. - * @numBytes: the number of bytes to compare. - * - * Function to compare two pieces of memory, similar to memcmp function - * in standard C. - * - * Return: - * bool - returns a bool value that tells if the memory locations - * are equal or not equal. - * - */ -bool cdf_mem_compare(const void *pMemory1, const void *pMemory2, - uint32_t numBytes) -{ - if (0 == numBytes) { - /* special case where pMemory1 or pMemory2 can be NULL */ - return true; - } - - if ((pMemory1 == NULL) || (pMemory2 == NULL)) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s called with NULL parameter, p1:%p p2:%p", - __func__, pMemory1, pMemory2); - QDF_ASSERT(0); - return false; - } - return memcmp(pMemory1, pMemory2, numBytes) ? false : true; -} - -/** - * cdf_mem_compare2() - memory compare - * @pMemory1: pointer to one location in memory to compare. - * @pMemory2: pointer to second location in memory to compare. - * @numBytes: the number of bytes to compare. - * - * Function to compare two pieces of memory, similar to memcmp function - * in standard C. - * Return: - * int32_t - returns a bool value that tells if the memory - * locations are equal or not equal. - * 0 -- equal - * < 0 -- *pMemory1 is less than *pMemory2 - * > 0 -- *pMemory1 is bigger than *pMemory2 - */ -int32_t cdf_mem_compare2(const void *pMemory1, const void *pMemory2, - uint32_t numBytes) -{ - return (int32_t) memcmp(pMemory1, pMemory2, numBytes); -} - -/** - * cdf_os_mem_alloc_consistent() - allocates consistent cdf memory - * @osdev: OS device handle - * @size: Size to be allocated - * @paddr: Physical address - * @mctx: Pointer to DMA context - * - * Return: pointer of allocated memory or null if memory alloc fails - */ -inline void *cdf_os_mem_alloc_consistent(qdf_device_t osdev, qdf_size_t size, - qdf_dma_addr_t *paddr, - qdf_dma_context_t memctx) -{ -#if defined(A_SIMOS_DEVHOST) - static int first = 1; - void *vaddr; - - if (first) { - first = 0; - pr_err("Warning: bypassing %s\n", __func__); - } - vaddr = cdf_mem_malloc(size); - *paddr = ((qdf_dma_addr_t) vaddr); - return vaddr; -#else - int flags = GFP_KERNEL; - void *alloc_mem = NULL; - - if (in_interrupt() || irqs_disabled() || in_atomic()) - flags = GFP_ATOMIC; - - alloc_mem = dma_alloc_coherent(osdev->dev, size, paddr, flags); - if (alloc_mem == NULL) - pr_err("%s Warning: unable to alloc consistent memory of size %zu!\n", - __func__, size); - return alloc_mem; -#endif -} - -/** - * cdf_os_mem_free_consistent() - free consistent cdf memory - * @osdev: OS device handle - * @size: Size to be allocated - * @paddr: Physical address - * @mctx: Pointer to DMA context - * - * Return: none - */ -inline void -cdf_os_mem_free_consistent(qdf_device_t osdev, - qdf_size_t size, - void *vaddr, - qdf_dma_addr_t paddr, qdf_dma_context_t memctx) -{ -#if defined(A_SIMOS_DEVHOST) - static int first = 1; - - if (first) { - first = 0; - pr_err("Warning: bypassing %s\n", __func__); - } - cdf_mem_free(vaddr); - return; -#else - dma_free_coherent(osdev->dev, size, vaddr, paddr); -#endif -} - - -/** - * cdf_os_mem_dma_sync_single_for_device() - assign memory to device - * @osdev: OS device handle - * @bus_addr: dma address to give to the device - * @size: Size of the memory block - * @direction: direction data will be dma'ed - * - * Assgin memory to the remote device. - * The cache lines are flushed to ram or invalidated as needed. - * - * Return: none - */ - -inline void -cdf_os_mem_dma_sync_single_for_device(qdf_device_t osdev, - qdf_dma_addr_t bus_addr, - qdf_size_t size, - enum dma_data_direction direction) -{ - dma_sync_single_for_device(osdev->dev, bus_addr, size, direction); -} - diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c index 10e55dce8ea1..2968d9dadee8 100644 --- a/core/cdf/src/cdf_nbuf.c +++ b/core/cdf/src/cdf_nbuf.c @@ -42,7 +42,7 @@ #endif /* FEATURE_TSO */ #include #include -#include +#include #include #include #include @@ -443,17 +443,17 @@ void __cdf_nbuf_trace_update(struct sk_buff *buf, char *event_string) return; } - cdf_mem_zero(string_buf, NBUF_PKT_TRAC_MAX_STRING); - cdf_mem_copy(string_buf, event_string, cdf_str_len(event_string)); + qdf_mem_zero(string_buf, NBUF_PKT_TRAC_MAX_STRING); + qdf_mem_copy(string_buf, event_string, cdf_str_len(event_string)); if (NBUF_PKT_TRAC_TYPE_EAPOL & cdf_nbuf_trace_get_proto_type(buf)) { - cdf_mem_copy(string_buf + cdf_str_len(event_string), + qdf_mem_copy(string_buf + cdf_str_len(event_string), "EPL", NBUF_PKT_TRAC_PROTO_STRING); } else if (NBUF_PKT_TRAC_TYPE_DHCP & cdf_nbuf_trace_get_proto_type(buf)) { - cdf_mem_copy(string_buf + cdf_str_len(event_string), + qdf_mem_copy(string_buf + cdf_str_len(event_string), "DHC", NBUF_PKT_TRAC_PROTO_STRING); } else if (NBUF_PKT_TRAC_TYPE_MGMT_ACTION & cdf_nbuf_trace_get_proto_type(buf)) { - cdf_mem_copy(string_buf + cdf_str_len(event_string), + qdf_mem_copy(string_buf + cdf_str_len(event_string), "MACT", NBUF_PKT_TRAC_PROTO_STRING); } @@ -567,7 +567,7 @@ void cdf_net_buf_debug_clean(void) while (p_node) { p_prev = p_node; p_node = p_node->p_next; - cdf_mem_free(p_prev); + qdf_mem_free(p_prev); } } @@ -638,7 +638,7 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, QDF_ASSERT(0); goto done; } else { - p_node = (CDF_NBUF_TRACK *) cdf_mem_malloc(sizeof(*p_node)); + p_node = (CDF_NBUF_TRACK *) qdf_mem_malloc(sizeof(*p_node)); if (p_node) { p_node->net_buf = net_buf; p_node->file_name = file_name; @@ -687,7 +687,7 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf) /* Found at head of the table */ if (p_head->net_buf == net_buf) { gp_cdf_net_buf_track_tbl[i] = p_node->p_next; - cdf_mem_free((void *)p_node); + qdf_mem_free((void *)p_node); found = true; goto done; } @@ -698,7 +698,7 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf) p_node = p_node->p_next; if ((NULL != p_node) && (p_node->net_buf == net_buf)) { p_prev->p_next = p_node->p_next; - cdf_mem_free((void *)p_node); + qdf_mem_free((void *)p_node); found = true; break; } diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index 5349e9f5cc34..ee114622978a 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h index b0a4087a8090..4355ce2b0afa 100644 --- a/core/cds/inc/cds_crypto.h +++ b/core/cds/inc/cds_crypto.h @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index f7e442471c85..b63acbec1460 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -90,12 +90,12 @@ void cds_sys_probe_thread_cback(void *pUserData); v_CONTEXT_t cds_init(void) { qdf_mc_timer_manager_init(); - cdf_mem_init(); + qdf_mem_init(); gp_cds_context = &g_cds_context; gp_cds_context->qdf_ctx = &g_qdf_ctx; - cdf_mem_zero(&g_qdf_ctx, sizeof(g_qdf_ctx)); + qdf_mem_zero(&g_qdf_ctx, sizeof(g_qdf_ctx)); qdf_trace_spin_lock_init(); @@ -122,10 +122,10 @@ void cds_deinit(void) gp_cds_context->qdf_ctx = NULL; gp_cds_context = NULL; - cdf_mem_zero(&g_cds_context, sizeof(g_cds_context)); + qdf_mem_zero(&g_cds_context, sizeof(g_cds_context)); qdf_mc_timer_manager_exit(); - cdf_mem_exit(); + qdf_mem_exit(); return; } @@ -292,7 +292,7 @@ QDF_STATUS cds_open(void) */ /*Open the WMA module */ - cdf_mem_set(&mac_openParms, sizeof(mac_openParms), 0); + qdf_mem_set(&mac_openParms, sizeof(mac_openParms), 0); /* UMA is supported in hardware for performing the ** frame translation 802.11 <-> 802.3 */ @@ -630,7 +630,7 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) "%s: wma correctly started", __func__); /* Start the MAC */ - cdf_mem_zero(&halStartParams, + qdf_mem_zero(&halStartParams, sizeof(tHalMacStartParameters)); /* Start the MAC */ @@ -1103,7 +1103,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, /* Dynamically allocate the context for module */ - *ppModuleContext = cdf_mem_malloc(size); + *ppModuleContext = qdf_mem_malloc(size); if (*ppModuleContext == NULL) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, @@ -1114,7 +1114,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, } if (moduleID == QDF_MODULE_ID_TLSHIM) - cdf_mem_zero(*ppModuleContext, size); + qdf_mem_zero(*ppModuleContext, size); *pGpModContext = *ppModuleContext; @@ -1236,7 +1236,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, } if (pModuleContext != NULL) - cdf_mem_free(pModuleContext); + qdf_mem_free(pModuleContext); *pGpModContext = NULL; @@ -1332,7 +1332,7 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) atomic_set(&cds_wrapper_empty_count, 0); /* Copy the message now */ - cdf_mem_copy((void *)pMsgWrapper->pVosMsg, + qdf_mem_copy((void *)pMsgWrapper->pVosMsg, (void *)pMsg, sizeof(cds_msg_t)); cds_mq_put(pTargetMq, pMsgWrapper); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 65d96ef2a918..5423e0efb947 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3877,7 +3877,7 @@ QDF_STATUS cds_init_policy_mgr(void) cds_debug("Initializing the policy manager"); /* init conc_connection_list */ - cdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); + qdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( &cds_ctx->cdf_conc_list_lock))) { @@ -4189,7 +4189,7 @@ QDF_STATUS cds_decr_connection_count(uint32_t vdev_id) } /* clean up the entry */ - cdf_mem_zero(&conc_connection_list[next_conn_index - 1], + qdf_mem_zero(&conc_connection_list[next_conn_index - 1], sizeof(*conc_connection_list)); return QDF_STATUS_SUCCESS; } @@ -4305,9 +4305,9 @@ void cds_update_with_safe_channel_list(uint8_t *pcl_channels, uint32_t *len) sizeof(unsafe_channel_list)); if (unsafe_channel_count) { - cdf_mem_copy(current_channel_list, pcl_channels, + qdf_mem_copy(current_channel_list, pcl_channels, current_channel_count); - cdf_mem_zero(pcl_channels, + qdf_mem_zero(pcl_channels, sizeof(*pcl_channels)*current_channel_count); for (i = 0; i < current_channel_count; i++) { @@ -4414,13 +4414,13 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, num_channels = 0; switch (pcl) { case CDS_24G: - cdf_mem_copy(pcl_channels, channel_list_24, + qdf_mem_copy(pcl_channels, channel_list_24, chan_index_24); *len = chan_index_24; status = QDF_STATUS_SUCCESS; break; case CDS_5G: - cdf_mem_copy(pcl_channels, channel_list_5, + qdf_mem_copy(pcl_channels, channel_list_5, chan_index_5); *len = chan_index_5; status = QDF_STATUS_SUCCESS; @@ -4429,7 +4429,7 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_MCC_CH: cds_get_connection_channels( channel_list, &num_channels, 0); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; status = QDF_STATUS_SUCCESS; break; @@ -4437,9 +4437,9 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_MCC_CH_24G: cds_get_connection_channels( channel_list, &num_channels, 0); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; status = QDF_STATUS_SUCCESS; @@ -4448,34 +4448,34 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_MCC_CH_5G: cds_get_connection_channels( channel_list, &num_channels, 0); - cdf_mem_copy(pcl_channels, channel_list, + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; status = QDF_STATUS_SUCCESS; break; case CDS_24G_SCC_CH: case CDS_24G_MCC_CH: - cdf_mem_copy(pcl_channels, channel_list_24, + qdf_mem_copy(pcl_channels, channel_list_24, chan_index_24); *len = chan_index_24; cds_get_connection_channels( channel_list, &num_channels, 0); - cdf_mem_copy(&pcl_channels[chan_index_24], + qdf_mem_copy(&pcl_channels[chan_index_24], channel_list, num_channels); *len += num_channels; status = QDF_STATUS_SUCCESS; break; case CDS_5G_SCC_CH: case CDS_5G_MCC_CH: - cdf_mem_copy(pcl_channels, channel_list_5, + qdf_mem_copy(pcl_channels, channel_list_5, chan_index_5); *len = chan_index_5; cds_get_connection_channels( channel_list, &num_channels, 0); - cdf_mem_copy(&pcl_channels[chan_index_5], + qdf_mem_copy(&pcl_channels[chan_index_5], channel_list, num_channels); *len += num_channels; status = QDF_STATUS_SUCCESS; @@ -4483,7 +4483,7 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_SCC_ON_24_SCC_ON_5: cds_get_connection_channels( channel_list, &num_channels, 1); - cdf_mem_copy(pcl_channels, channel_list, + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; status = QDF_STATUS_SUCCESS; @@ -4491,16 +4491,16 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_SCC_ON_5_SCC_ON_24: cds_get_connection_channels( channel_list, &num_channels, 2); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; status = QDF_STATUS_SUCCESS; break; case CDS_SCC_ON_24_SCC_ON_5_24G: cds_get_connection_channels( channel_list, &num_channels, 1); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; status = QDF_STATUS_SUCCESS; @@ -4508,9 +4508,9 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_SCC_ON_24_SCC_ON_5_5G: cds_get_connection_channels( channel_list, &num_channels, 1); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; status = QDF_STATUS_SUCCESS; @@ -4518,9 +4518,9 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_SCC_ON_5_SCC_ON_24_24G: cds_get_connection_channels( channel_list, &num_channels, 2); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_24, chan_index_24); *len += chan_index_24; status = QDF_STATUS_SUCCESS; @@ -4528,9 +4528,9 @@ QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, case CDS_SCC_ON_5_SCC_ON_24_5G: cds_get_connection_channels( channel_list, &num_channels, 2); - cdf_mem_copy(pcl_channels, channel_list, num_channels); + qdf_mem_copy(pcl_channels, channel_list, num_channels); *len = num_channels; - cdf_mem_copy(&pcl_channels[num_channels], + qdf_mem_copy(&pcl_channels[num_channels], channel_list_5, chan_index_5); *len += chan_index_5; status = QDF_STATUS_SUCCESS; @@ -6336,7 +6336,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, p2pgo_channel_num, IEEE80211_BAND_5GHZ); } - cdf_mem_zero(&hdd_avoid_freq_list, + qdf_mem_zero(&hdd_avoid_freq_list, sizeof(hdd_avoid_freq_list)); hdd_avoid_freq_list.avoidFreqRangeCount = 1; hdd_avoid_freq_list.avoidFreqRange[0].startFreq = freq; @@ -6620,7 +6620,7 @@ void cds_restart_softap(hdd_adapter_t *pHostapdAdapter) } /* generate vendor specific event */ - cdf_mem_zero((void *)&hdd_avoid_freq_list, sizeof(tHddAvoidFreqList)); + qdf_mem_zero((void *)&hdd_avoid_freq_list, sizeof(tHddAvoidFreqList)); hdd_avoid_freq_list.avoidFreqRange[0].startFreq = cds_chan_to_freq(pHostapdAdapter->sessionCtx.ap. operatingChannel); diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index f622f395baf1..95b30cf6911b 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -209,7 +209,7 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) } } - cdf_mem_free(pBuf); + qdf_mem_free(pBuf); return cdf_ret_status; } diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index bd4764542870..b0f6fdc12a08 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -44,7 +44,7 @@ #include #include #include "cdf_nbuf.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #define TX_PKT_MIN_HEADROOM (64) @@ -89,7 +89,7 @@ QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) packet->pkt_buf = NULL; /* Free up the Rx packet */ - cdf_mem_free(packet); + qdf_mem_free(packet); return QDF_STATUS_SUCCESS; } @@ -197,9 +197,9 @@ void cds_pkt_trace_buf_update(char *event_string) slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF; trace_buffer[slot].order = trace_buffer_order; trace_buffer[slot].event_time = qdf_mc_timer_get_system_time(); - cdf_mem_zero(trace_buffer[slot].event_string, + qdf_mem_zero(trace_buffer[slot].event_string, sizeof(trace_buffer[slot].event_string)); - cdf_mem_copy(trace_buffer[slot].event_string, + qdf_mem_copy(trace_buffer[slot].event_string, event_string, (CDS_PKT_TRAC_MAX_STRING_LEN < strlen(event_string)) ? CDS_PKT_TRAC_MAX_STRING_LEN : strlen(event_string)); @@ -260,7 +260,7 @@ void cds_pkt_proto_trace_init(void) qdf_spinlock_create(&trace_buffer_lock); trace_buffer_order = 0; - trace_buffer = cdf_mem_malloc(CDS_PKT_TRAC_MAX_TRACE_BUF * + trace_buffer = qdf_mem_malloc(CDS_PKT_TRAC_MAX_TRACE_BUF * sizeof(cds_pkt_proto_trace_t)); /* Register callback function to NBUF @@ -277,7 +277,7 @@ void cds_pkt_proto_trace_close(void) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s %d", __func__, __LINE__); - cdf_mem_free(trace_buffer); + qdf_mem_free(trace_buffer); qdf_spinlock_destroy(&trace_buffer_lock); return; diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 78dd45612119..c75d61f0516e 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -641,11 +641,11 @@ uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, regdm_op_class_map_t *class; uint16_t i; - if (true == cdf_mem_compare(country, "US", 2)) + if (true != qdf_mem_cmp(country, "US", 2)) class = us_op_class; - else if (true == cdf_mem_compare(country, "EU", 2)) + else if (true != qdf_mem_cmp(country, "EU", 2)) class = euro_op_class; - else if (true == cdf_mem_compare(country, "JP", 2)) + else if (true != qdf_mem_cmp(country, "JP", 2)) class = japan_op_class; else class = global_op_class; @@ -675,11 +675,11 @@ uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, regdm_op_class_map_t *class = NULL; uint16_t i = 0; - if (true == cdf_mem_compare(country, "US", 2)) { + if (true != qdf_mem_cmp(country, "US", 2)) { class = us_op_class; - } else if (true == cdf_mem_compare(country, "EU", 2)) { + } else if (true != qdf_mem_cmp(country, "EU", 2)) { class = euro_op_class; - } else if (true == cdf_mem_compare(country, "JP", 2)) { + } else if (true != qdf_mem_cmp(country, "JP", 2)) { class = japan_op_class; } else { class = global_op_class; diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index bf65868a0d26..0d236484c35c 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -205,7 +205,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context, __func__); return QDF_STATUS_E_INVAL; } - cdf_mem_zero(pSchedContext, sizeof(cds_sched_context)); + qdf_mem_zero(pSchedContext, sizeof(cds_sched_context)); pSchedContext->pVContext = p_cds_context; vStatus = cds_sched_init_mqs(pSchedContext); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { @@ -604,7 +604,7 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) typeof(*pkt), list); list_del(&pkt->list); spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - cdf_mem_free(pkt); + qdf_mem_free(pkt); spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); @@ -625,7 +625,7 @@ static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext) int i; for (i = 0; i < CDS_MAX_OL_RX_PKT; i++) { - pkt = cdf_mem_malloc(sizeof(*pkt)); + pkt = qdf_mem_malloc(sizeof(*pkt)); if (!pkt) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s Vos packet allocation for ol rx thread failed", @@ -646,7 +646,7 @@ free: list) { list_del(&pkt->list); spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); - cdf_mem_free(pkt); + qdf_mem_free(pkt); spin_lock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); } spin_unlock_bh(&pSchedContext->cds_ol_rx_pkt_freeq_lock); @@ -1060,7 +1060,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext) "%s: Freeing MC WMA MSG message type %d", __func__, pMsgWrapper->pVosMsg->type); if (pMsgWrapper->pVosMsg->bodyptr) { - cdf_mem_free((void *)pMsgWrapper-> + qdf_mem_free((void *)pMsgWrapper-> pVosMsg->bodyptr); } diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index a68c0d276371..49b7962b0f15 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -51,7 +51,7 @@ #include "qdf_trace.h" #include "cds_utils.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "cds_crypto.h" #include @@ -298,7 +298,7 @@ static void cds_increase_seq(uint8_t *ipn) if (ipn) { value = (0xffffffffffff) & (*((uint64_t *) ipn)); value = value + 1; - cdf_mem_copy(ipn, &value, IEEE80211_MMIE_IPNLEN); + qdf_mem_copy(ipn, &value, IEEE80211_MMIE_IPNLEN); } } @@ -377,9 +377,9 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, * In case of error, revert back to original IPN * to do that copy the original IPN into previous_ipn */ - cdf_mem_copy(&previous_ipn[0], ipn, IEEE80211_MMIE_IPNLEN); + qdf_mem_copy(&previous_ipn[0], ipn, IEEE80211_MMIE_IPNLEN); cds_increase_seq(ipn); - cdf_mem_copy(mmie->sequence_number, ipn, IEEE80211_MMIE_IPNLEN); + qdf_mem_copy(mmie->sequence_number, ipn, IEEE80211_MMIE_IPNLEN); /* * Calculate MIC and then copy @@ -412,11 +412,11 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, aad[1] = wh->i_fc[1] & ~(IEEE80211_FC1_RETRY | IEEE80211_FC1_PWR_MGT | IEEE80211_FC1_MORE_DATA); /* A1 || A2 || A3 */ - cdf_mem_copy(aad + 2, wh->i_addr_all, 3 * IEEE80211_ADDR_LEN); + qdf_mem_copy(aad + 2, wh->i_addr_all, 3 * IEEE80211_ADDR_LEN); /* MIC = AES-128-CMAC(IGTK, AAD || Management Frame Body || MMIE, 64) */ nBytes = AAD_LEN + (frmLen - sizeof(struct ieee80211_frame)); - input = (uint8_t *) cdf_mem_malloc(nBytes); + input = (uint8_t *) qdf_mem_malloc(nBytes); if (NULL == input) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "%s: Memory allocation failed", __func__); @@ -428,26 +428,26 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id, * Copy the AAD, Management frame body, and * MMIE with 8 bit MIC zeroed out */ - cdf_mem_zero(input, nBytes); - cdf_mem_copy(input, aad, AAD_LEN); + qdf_mem_zero(input, nBytes); + qdf_mem_copy(input, aad, AAD_LEN); /* Copy Management Frame Body and MMIE without MIC */ - cdf_mem_copy(input + AAD_LEN, + qdf_mem_copy(input + AAD_LEN, (uint8_t *) (efrm - (frmLen - sizeof(struct ieee80211_frame))), nBytes - AAD_LEN - CMAC_TLEN); cds_cmac_calc_mic(tfm, input, nBytes, mic); - cdf_mem_free(input); + qdf_mem_free(input); QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); - cdf_mem_copy(mmie->mic, mic, IEEE80211_MMIE_MICLEN); + qdf_mem_copy(mmie->mic, mic, IEEE80211_MMIE_MICLEN); err_tfm: if (ret) { - cdf_mem_copy(ipn, previous_ipn, IEEE80211_MMIE_IPNLEN); + qdf_mem_copy(ipn, previous_ipn, IEEE80211_MMIE_IPNLEN); } if (tfm) @@ -485,7 +485,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Validate IPN */ rx_ipn = mmie->sequence_number; - if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) <= 0) { + if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) != 0) { /* Replay error */ QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Replay error mmie ipn %02X %02X %02X %02X %02X %02X" @@ -522,11 +522,11 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) aad[1] = wh->i_fc[1] & ~(IEEE80211_FC1_RETRY | IEEE80211_FC1_PWR_MGT | IEEE80211_FC1_MORE_DATA); /* A1 || A2 || A3 */ - cdf_mem_copy(aad + 2, wh->i_addr_all, 3 * IEEE80211_ADDR_LEN); + qdf_mem_copy(aad + 2, wh->i_addr_all, 3 * IEEE80211_ADDR_LEN); /* MIC = AES-128-CMAC(IGTK, AAD || Management Frame Body || MMIE, 64) */ nBytes = AAD_LEN + (efrm - (uint8_t *) (wh + 1)); - input = (uint8_t *) cdf_mem_malloc(nBytes); + input = (uint8_t *) qdf_mem_malloc(nBytes); if (NULL == input) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Memory allocation failed"); @@ -535,20 +535,20 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) } /* Copy the AAD, MMIE with 8 bit MIC zeroed out */ - cdf_mem_zero(input, nBytes); - cdf_mem_copy(input, aad, AAD_LEN); - cdf_mem_copy(input + AAD_LEN, (uint8_t *) (wh + 1), + qdf_mem_zero(input, nBytes); + qdf_mem_copy(input, aad, AAD_LEN); + qdf_mem_copy(input + AAD_LEN, (uint8_t *) (wh + 1), nBytes - AAD_LEN - CMAC_TLEN); cds_cmac_calc_mic(tfm, input, nBytes, mic); - cdf_mem_free(input); + qdf_mem_free(input); QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X", mic[0], mic[1], mic[2], mic[3], mic[4], mic[5], mic[6], mic[7]); - if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) != 0) { + if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) == 0) { /* MMIE MIC mismatch */ QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "BC/MC MGMT frame MMIE MIC check Failed" @@ -562,7 +562,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) } /* Update IPN */ - cdf_mem_copy(ipn, rx_ipn, CMAC_IPN_LEN); + qdf_mem_copy(ipn, rx_ipn, CMAC_IPN_LEN); err_tfm: if (tfm) diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index c4d4195e8de9..ea8a933ba89f 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -34,7 +34,7 @@ * connecting the HTT service with HTC; and deleting a HTT instance. */ -#include /* cdf_mem_malloc */ +#include /* qdf_mem_malloc */ #include /* qdf_device_t, qdf_print */ #include /* htt_tx_msdu_desc_t */ @@ -76,7 +76,7 @@ struct htt_htc_pkt *htt_htc_pkt_alloc(struct htt_pdev_t *pdev) HTT_TX_MUTEX_RELEASE(&pdev->htt_tx_mutex); if (pkt == NULL) - pkt = cdf_mem_malloc(sizeof(*pkt)); + pkt = qdf_mem_malloc(sizeof(*pkt)); return &pkt->u.pkt; /* not actually a dereference */ } @@ -97,7 +97,7 @@ void htt_htc_pkt_pool_free(struct htt_pdev_t *pdev) pkt = pdev->htt_htc_pkt_freelist; while (pkt) { next = pkt->u.next; - cdf_mem_free(pkt); + qdf_mem_free(pkt); pkt = next; } pdev->htt_htc_pkt_freelist = NULL; @@ -129,7 +129,7 @@ void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev) netbuf = (cdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext); cdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(netbuf); - cdf_mem_free(pkt); + qdf_mem_free(pkt); pkt = next; } pdev->htt_htc_pkt_misclist = NULL; @@ -152,7 +152,7 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, { struct htt_pdev_t *pdev; - pdev = cdf_mem_malloc(sizeof(*pdev)); + pdev = qdf_mem_malloc(sizeof(*pdev)); if (!pdev) goto fail1; @@ -161,7 +161,7 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, pdev->txrx_pdev = txrx_pdev; pdev->htc_pdev = htc_pdev; - cdf_mem_set(&pdev->stats, sizeof(pdev->stats), 0); + qdf_mem_set(&pdev->stats, sizeof(pdev->stats), 0); pdev->htt_htc_pkt_freelist = NULL; #ifdef ATH_11AC_TXCOMPACT pdev->htt_htc_pkt_misclist = NULL; @@ -200,7 +200,7 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, return pdev; fail2: - cdf_mem_free(pdev); + qdf_mem_free(pdev); fail1: return NULL; @@ -235,7 +235,7 @@ htt_attach(struct htt_pdev_t *pdev, int desc_pool_size) /* pre-allocate some HTC_PACKET objects */ for (i = 0; i < HTT_HTC_PKT_POOL_INIT_SIZE; i++) { struct htt_htc_pkt_union *pkt; - pkt = cdf_mem_malloc(sizeof(*pkt)); + pkt = qdf_mem_malloc(sizeof(*pkt)); if (!pkt) break; htt_htc_pkt_free(pdev, &pkt->u.pkt); @@ -362,7 +362,7 @@ void htt_detach(htt_pdev_handle pdev) */ void htt_pdev_free(htt_pdev_handle pdev) { - cdf_mem_free(pdev); + qdf_mem_free(pdev); } void htt_detach_target(htt_pdev_handle pdev) @@ -397,8 +397,8 @@ int htt_htc_attach(struct htt_pdev_t *pdev) HTC_SERVICE_CONNECT_RESP response; A_STATUS status; - cdf_mem_set(&connect, sizeof(connect), 0); - cdf_mem_set(&response, sizeof(response), 0); + qdf_mem_set(&connect, sizeof(connect), 0); + qdf_mem_set(&response, sizeof(response), 0); connect.pMetaData = NULL; connect.MetaDataLength = 0; diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c index da6324a8dae0..eb863208795c 100644 --- a/core/dp/htt/htt_fw_stats.c +++ b/core/dp/htt/htt_fw_stats.c @@ -33,7 +33,7 @@ #include /* HTC_PACKET */ #include /* HTT_T2H_MSG_TYPE, etc. */ #include /* cdf_nbuf_t */ -#include /* cdf_mem_set */ +#include /* qdf_mem_set */ #include /* ol_fw_tx_dbg_ppdu_base */ #include @@ -724,8 +724,8 @@ htt_t2h_tx_ppdu_bitmaps_pr(uint32_t *queued_ptr, uint32_t *acked_ptr) char acked_str[HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW + 1]; int i, j, word; - cdf_mem_set(queued_str, HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW, '0'); - cdf_mem_set(acked_str, HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW, '-'); + qdf_mem_set(queued_str, HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW, '0'); + qdf_mem_set(acked_str, HTT_FW_STATS_MAX_BLOCK_ACK_WINDOW, '-'); i = 0; for (word = 0; word < 2; word++) { uint32_t queued = *(queued_ptr + word); diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index 568dc2e2383e..bb8e7141ebaf 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -42,7 +42,7 @@ * from the host to the target. */ -#include /* cdf_mem_copy */ +#include /* qdf_mem_copy */ #include /* cdf_nbuf_map_single */ #include /* HTC_PACKET */ #include /* HTC_HDR_ALIGNMENT_PADDING */ diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 5055a6c8212f..8b1cb4c91687 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -532,7 +532,7 @@ static inline int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) static inline void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev) { - pdev->rx_buff_list = cdf_mem_malloc( + pdev->rx_buff_list = qdf_mem_malloc( HTT_RX_RING_BUFF_DBG_LIST * sizeof(struct rx_buf_debug)); if (!pdev->rx_buff_list) { @@ -598,7 +598,7 @@ static inline void htt_rx_dbg_rxbuf_deinit(struct htt_pdev_t *pdev) { if (pdev->rx_buff_list) - cdf_mem_free(pdev->rx_buff_list); + qdf_mem_free(pdev->rx_buff_list); } #else static inline diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 1ccc9aa5609b..eb532ce6fa55 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -39,7 +39,7 @@ * rx ring (applies to LL only). */ -#include /* cdf_mem_malloc,free, etc. */ +#include /* qdf_mem_malloc,free, etc. */ #include /* qdf_print, bool */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_timer_free */ @@ -140,13 +140,13 @@ void htt_rx_hash_deinit(struct htt_pdev_t *pdev) list_iter = list_iter->next; if (!hash_entry->fromlist) - cdf_mem_free(hash_entry); + qdf_mem_free(hash_entry); } - cdf_mem_free(pdev->rx_ring.hash_table[i].entries); + qdf_mem_free(pdev->rx_ring.hash_table[i].entries); } - cdf_mem_free(pdev->rx_ring.hash_table); + qdf_mem_free(pdev->rx_ring.hash_table); pdev->rx_ring.hash_table = NULL; } @@ -346,7 +346,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) qdf_timer_free(&pdev->rx_ring.refill_retry_timer); if (pdev->cfg.is_full_reorder_offload) { - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, @@ -375,10 +375,10 @@ void htt_rx_detach(struct htt_pdev_t *pdev) sw_rd_idx++; sw_rd_idx &= pdev->rx_ring.size_mask; } - cdf_mem_free(pdev->rx_ring.buf.netbufs_ring); + qdf_mem_free(pdev->rx_ring.buf.netbufs_ring); } - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, sizeof(uint32_t), pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.alloc_idx.paddr, @@ -386,7 +386,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) alloc_idx), memctx)); - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, @@ -1559,7 +1559,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, dest = cdf_nbuf_put_tail(prev_buf, wifi_hdr_len); if (!dest) goto mpdu_stitch_fail; - cdf_mem_copy(dest, hdr_desc, wifi_hdr_len); + qdf_mem_copy(dest, hdr_desc, wifi_hdr_len); hdr_desc += wifi_hdr_len; /* NOTE - This padding is present only in the RAW header status - not @@ -1602,7 +1602,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, /* Copy this buffers MSDU related status into the prev buffer */ dest = cdf_nbuf_put_tail(prev_buf, msdu_llc_len + amsdu_pad); dest += amsdu_pad; - cdf_mem_copy(dest, hdr_desc, msdu_llc_len); + qdf_mem_copy(dest, hdr_desc, msdu_llc_len); /* Push the MSDU buffer beyond the decap header */ cdf_nbuf_pull_head(msdu, decap_hdr_pull_bytes); @@ -1967,7 +1967,7 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, htt_list_remove(pdev->rx_ring.hash_table[i].freepool.next); } else { - hash_element = cdf_mem_malloc(sizeof(struct htt_rx_hash_entry)); + hash_element = qdf_mem_malloc(sizeof(struct htt_rx_hash_entry)); if (qdf_unlikely(NULL == hash_element)) { HTT_ASSERT_ALWAYS(0); return 1; @@ -2022,7 +2022,7 @@ cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr) freepool, &hash_entry->listnode); else - cdf_mem_free(hash_entry); + qdf_mem_free(hash_entry); htt_rx_dbg_rxbuf_reset(pdev, netbuf); break; @@ -2052,7 +2052,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) HTT_ASSERT2(CDF_IS_PWR2(RX_NUM_HASH_BUCKETS)); pdev->rx_ring.hash_table = - cdf_mem_malloc(RX_NUM_HASH_BUCKETS * + qdf_mem_malloc(RX_NUM_HASH_BUCKETS * sizeof(struct htt_rx_hash_bucket)); if (NULL == pdev->rx_ring.hash_table) { @@ -2071,7 +2071,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) /* pre-allocate a pool of entries for this bucket */ pdev->rx_ring.hash_table[i].entries = - cdf_mem_malloc(RX_ENTRIES_SIZE * + qdf_mem_malloc(RX_ENTRIES_SIZE * sizeof(struct htt_rx_hash_entry)); if (NULL == pdev->rx_ring.hash_table[i].entries) { @@ -2079,10 +2079,10 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) (int)i); while (i) { i--; - cdf_mem_free(pdev->rx_ring.hash_table[i]. + qdf_mem_free(pdev->rx_ring.hash_table[i]. entries); } - cdf_mem_free(pdev->rx_ring.hash_table); + qdf_mem_free(pdev->rx_ring.hash_table); pdev->rx_ring.hash_table = NULL; return 1; } @@ -2151,12 +2151,9 @@ int htt_rx_attach(struct htt_pdev_t *pdev) /* allocate the target index */ pdev->rx_ring.target_idx.vaddr = - cdf_os_mem_alloc_consistent(pdev->osdev, + qdf_mem_alloc_consistent(pdev->osdev, pdev->osdev->dev, sizeof(uint32_t), - &paddr, - qdf_get_dma_mem_context( - (&pdev->rx_ring.target_idx), - memctx)); + &paddr); if (!pdev->rx_ring.target_idx.vaddr) goto fail1; @@ -2165,7 +2162,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) *pdev->rx_ring.target_idx.vaddr = 0; } else { pdev->rx_ring.buf.netbufs_ring = - cdf_mem_malloc(pdev->rx_ring.size * sizeof(cdf_nbuf_t)); + qdf_mem_malloc(pdev->rx_ring.size * sizeof(cdf_nbuf_t)); if (!pdev->rx_ring.buf.netbufs_ring) goto fail1; @@ -2174,25 +2171,18 @@ int htt_rx_attach(struct htt_pdev_t *pdev) } pdev->rx_ring.buf.paddrs_ring = - cdf_os_mem_alloc_consistent( - pdev->osdev, + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, pdev->rx_ring.size * ring_elem_size, - &paddr, - qdf_get_dma_mem_context( - (&pdev->rx_ring.buf), - memctx)); + &paddr); if (!pdev->rx_ring.buf.paddrs_ring) goto fail2; pdev->rx_ring.base_paddr = paddr; pdev->rx_ring.alloc_idx.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, - sizeof(uint32_t), - &paddr, - qdf_get_dma_mem_context( - (&pdev->rx_ring.alloc_idx), - memctx)); + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, + sizeof(uint32_t), &paddr); if (!pdev->rx_ring.alloc_idx.vaddr) goto fail3; @@ -2257,7 +2247,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) return 0; /* success */ fail3: - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, @@ -2266,7 +2256,7 @@ fail3: fail2: if (pdev->cfg.is_full_reorder_offload) { - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, @@ -2276,7 +2266,7 @@ fail2: memctx)); htt_rx_hash_deinit(pdev); } else { - cdf_mem_free(pdev->rx_ring.buf.netbufs_ring); + qdf_mem_free(pdev->rx_ring.buf.netbufs_ring); } fail1: @@ -2301,14 +2291,11 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, * 2bytes: VDEV ID * 2bytes: length */ pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t), - &pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, - qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. - rx2_ind_ring_base), - memctx)); + &pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr); if (!pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) { qdf_print("%s: RX IND RING alloc fail", __func__); return -ENOBUFS; @@ -2317,21 +2304,17 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, /* RX indication ring size, by bytes */ pdev->ipa_uc_rx_rsc.rx2_ind_ring_size = rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t); - cdf_mem_zero(pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, + qdf_mem_zero(pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size); /* Allocate RX process done index */ pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, - 4, - &pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr, - qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. - rx_ipa_prc_done_idx), - memctx)); + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, 4, + &pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.paddr); if (!pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) { qdf_print("%s: RX PROC DONE IND alloc fail", __func__); - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, @@ -2341,7 +2324,7 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, memctx)); return -ENOBUFS; } - cdf_mem_zero(pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr, 4); + qdf_mem_zero(pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr, 4); return 0; } #else @@ -2369,14 +2352,12 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, * 2bytes: VDEV ID * 2bytes: length */ pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr = - cdf_os_mem_alloc_consistent( + qdf_mem_alloc_consistent( pdev->osdev, + pdev->osdev->dev, rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t), - &pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, - qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. - rx_ind_ring_base), - memctx)); + &pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr); if (!pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) { qdf_print("%s: RX IND RING alloc fail", __func__); return -ENOBUFS; @@ -2385,21 +2366,17 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, /* RX indication ring size, by bytes */ pdev->ipa_uc_rx_rsc.rx_ind_ring_size = rx_ind_ring_elements * sizeof(struct ipa_uc_rx_ring_elem_t); - cdf_mem_zero(pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, + qdf_mem_zero(pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx_ind_ring_size); /* Allocate RX process done index */ pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, - 4, - &pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr, - qdf_get_dma_mem_context((&pdev->ipa_uc_rx_rsc. - rx_ipa_prc_done_idx), - memctx)); + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, 4, + &pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.paddr); if (!pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) { qdf_print("%s: RX PROC DONE IND alloc fail", __func__); - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, @@ -2409,7 +2386,7 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, memctx)); return -ENOBUFS; } - cdf_mem_zero(pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr, 4); + qdf_mem_zero(pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr, 4); ret = htt_rx_ipa_uc_alloc_wdi2_rsc(pdev, rx_ind_ring_elements); return ret; @@ -2425,7 +2402,7 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) { if (pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, @@ -2436,7 +2413,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) } if (pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, 4, pdev->ipa_uc_rx_rsc. @@ -2457,7 +2434,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) { if (pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, @@ -2468,7 +2445,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) } if (pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, 4, pdev->ipa_uc_rx_rsc. diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 18855b9d8907..6cf12e972b31 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -370,14 +370,14 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) len = HTT_WDI_IPA_OP_RESPONSE_RSP_LEN_GET(*msg_word); op_msg_buffer = - cdf_mem_malloc(sizeof + qdf_mem_malloc(sizeof (struct htt_wdi_ipa_op_response_t) + len); if (!op_msg_buffer) { qdf_print("OPCODE messsage buffer alloc fail"); break; } - cdf_mem_copy(op_msg_buffer, + qdf_mem_copy(op_msg_buffer, msg_start_ptr, sizeof(struct htt_wdi_ipa_op_response_t) + len); @@ -445,15 +445,15 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) err_info.u.mic_err.key_id = HTT_RX_OFLD_PKT_ERR_MIC_ERR_KEYID_GET (*(msg_word + 1)); - cdf_mem_copy(err_info.u.mic_err.da, + qdf_mem_copy(err_info.u.mic_err.da, (uint8_t *)(msg_word + 2), OL_TXRX_MAC_ADDR_LEN); - cdf_mem_copy(err_info.u.mic_err.sa, + qdf_mem_copy(err_info.u.mic_err.sa, (uint8_t *)(msg_word + 4), OL_TXRX_MAC_ADDR_LEN); - cdf_mem_copy(&err_info.u.mic_err.pn, + qdf_mem_copy(&err_info.u.mic_err.pn, (uint8_t *)(msg_word + 6), 6); - cdf_mem_copy(err_info.u.mic_err.ta, + qdf_mem_copy(err_info.u.mic_err.ta, peer->mac_addr.raw, OL_TXRX_MAC_ADDR_LEN); wma_indicate_err(OL_RX_ERR_TKIP_MIC, &err_info); diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 640d0288b118..d53caf95ba26 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -38,7 +38,7 @@ */ #include /* uint32_t, offsetof, etc. */ #include /* qdf_dma_addr_t */ -#include /* cdf_os_mem_alloc_consistent et al */ +#include /* qdf_mem_alloc_consistent et al */ #include /* cdf_nbuf_t, etc. */ #include /* qdf_mdelay */ @@ -134,7 +134,7 @@ static void htt_tx_frag_desc_field_update(struct htt_pdev_t *pdev, { unsigned int target_page; unsigned int offset; - struct cdf_mem_dma_page_t *dma_page; + struct qdf_mem_dma_page_t *dma_page; target_page = index / pdev->frag_descs.desc_pages.num_element_per_page; offset = index % pdev->frag_descs.desc_pages.num_element_per_page; @@ -158,7 +158,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev, uint16_t desc_pool_elems) { pdev->frag_descs.pool_elems = desc_pool_elems; - cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->frag_descs.desc_pages, + qdf_mem_multi_pages_alloc(pdev->osdev, &pdev->frag_descs.desc_pages, pdev->frag_descs.size, desc_pool_elems, qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); if ((0 == pdev->frag_descs.desc_pages.num_pages) || @@ -180,7 +180,7 @@ static int htt_tx_frag_desc_attach(struct htt_pdev_t *pdev, */ static void htt_tx_frag_desc_detach(struct htt_pdev_t *pdev) { - cdf_mem_multi_pages_free(pdev->osdev, &pdev->frag_descs.desc_pages, + qdf_mem_multi_pages_free(pdev->osdev, &pdev->frag_descs.desc_pages, qdf_get_dma_mem_context((&pdev->frag_descs), memctx), false); } @@ -200,7 +200,7 @@ int htt_tx_frag_alloc(htt_pdev_handle pdev, { uint16_t frag_page_index; uint16_t frag_elem_index; - struct cdf_mem_dma_page_t *dma_page; + struct qdf_mem_dma_page_t *dma_page; /** Index should never be 0, since its used by the hardware to terminate the link. */ @@ -313,7 +313,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems) { int i, i_int, pool_size; uint32_t **p; - struct cdf_mem_dma_page_t *page_info; + struct qdf_mem_dma_page_t *page_info; uint32_t num_link = 0; uint16_t num_page, num_desc_per_page; @@ -328,7 +328,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems) pdev->tx_descs.pool_elems = desc_pool_elems; pdev->tx_descs.alloc_cnt = 0; pool_size = pdev->tx_descs.pool_elems * pdev->tx_descs.size; - cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_descs.desc_pages, + qdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_descs.desc_pages, pdev->tx_descs.size, pdev->tx_descs.pool_elems, qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); if ((0 == pdev->tx_descs.desc_pages.num_pages) || @@ -381,7 +381,7 @@ int htt_tx_attach(struct htt_pdev_t *pdev, int desc_pool_elems) return 0; free_htt_desc: - cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, + qdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); out_fail: return -ENOBUFS; @@ -395,7 +395,7 @@ void htt_tx_detach(struct htt_pdev_t *pdev) } htt_tx_frag_desc_detach(pdev); - cdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, + qdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_descs.desc_pages, qdf_get_dma_mem_context((&pdev->tx_descs), memctx), false); } @@ -411,7 +411,7 @@ static qdf_dma_addr_t htt_tx_get_paddr(htt_pdev_handle pdev, char *target_vaddr) { uint16_t i; - struct cdf_mem_dma_page_t *page_info = NULL; + struct qdf_mem_dma_page_t *page_info = NULL; uint64_t offset; for (i = 0; i < pdev->tx_descs.desc_pages.num_pages; i++) { @@ -885,7 +885,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, } /* Init buffer */ - cdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); + qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr); /* HTT control header */ @@ -945,7 +945,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, } /* Init buffer */ - cdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); + qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr); /* HTT control header */ @@ -1010,13 +1010,9 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, /* Allocate CE Write Index WORD */ pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, - 4, - &pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, - qdf_get_dma_mem_context( - (&pdev->ipa_uc_tx_rsc.tx_ce_idx), - memctx)); + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, + 4, &pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr); if (!pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { qdf_print("%s: CE Write Index WORD alloc fail", __func__); return -ENOBUFS; @@ -1025,31 +1021,28 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, /* Allocate TX COMP Ring */ tx_comp_ring_size = uc_tx_buf_cnt * sizeof(cdf_nbuf_t); pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr = - cdf_os_mem_alloc_consistent( - pdev->osdev, + qdf_mem_alloc_consistent( + pdev->osdev, pdev->osdev->dev, tx_comp_ring_size, - &pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, - qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. - tx_comp_base), - memctx)); + &pdev->ipa_uc_tx_rsc.tx_comp_base.paddr); if (!pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { qdf_print("%s: TX COMP ring alloc fail", __func__); return_code = -ENOBUFS; goto free_tx_ce_idx; } - cdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, tx_comp_ring_size); + qdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, tx_comp_ring_size); /* Allocate TX BUF vAddress Storage */ pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg = - (cdf_nbuf_t *) cdf_mem_malloc(uc_tx_buf_cnt * + (cdf_nbuf_t *) qdf_mem_malloc(uc_tx_buf_cnt * sizeof(cdf_nbuf_t)); if (!pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg) { qdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__); return_code = -ENOBUFS; goto free_tx_comp_base; } - cdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg, + qdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg, uc_tx_buf_cnt * sizeof(cdf_nbuf_t)); pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt = htt_tx_ipa_uc_wdi_tx_buf_alloc( @@ -1059,7 +1052,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, return 0; free_tx_comp_base: - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, tx_comp_ring_size, pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, @@ -1068,7 +1061,7 @@ free_tx_comp_base: tx_comp_base), memctx)); free_tx_ce_idx: - cdf_os_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, @@ -1084,7 +1077,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) uint16_t idx; if (pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, @@ -1095,7 +1088,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) } if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { - cdf_os_mem_free_consistent( + qdf_mem_free_consistent( pdev->osdev, ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t), pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, @@ -1118,7 +1111,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) } /* Free storage */ - cdf_mem_free(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg); + qdf_mem_free(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg); return 0; } diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index cb337dae37fb..671200c36291 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -355,7 +355,7 @@ struct htt_pdev_t { int size; /* of each HTT tx desc */ uint16_t pool_elems; uint16_t alloc_cnt; - struct cdf_mem_multi_page_t desc_pages; + struct qdf_mem_multi_page_t desc_pages; uint32_t *freelist; qdf_dma_mem_context(memctx); } tx_descs; @@ -363,7 +363,7 @@ struct htt_pdev_t { struct { int size; /* of each Fragment/MSDU-Ext descriptor */ int pool_elems; - struct cdf_mem_multi_page_t desc_pages; + struct qdf_mem_multi_page_t desc_pages; qdf_dma_mem_context(memctx); } frag_descs; #endif /* defined(HELIUMPLUS_PADDR64) */ diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index e0f63e5d5c6e..e2497f3b3a45 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -660,7 +660,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, local_desc_ext.is_dsrc = (is_dsrc != 0); cdf_nbuf_push_head(msdu, sizeof(local_desc_ext)); - cdf_mem_copy(cdf_nbuf_data(msdu), &local_desc_ext, + qdf_mem_copy(cdf_nbuf_data(msdu), &local_desc_ext, sizeof(local_desc_ext)); } diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 60c9f91c714e..b08c5dd7411e 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -1045,7 +1045,7 @@ ol_tx_delay_hist(ol_txrx_pdev_handle pdev, uint16_t *bin_values, int category) { /* no-op version if QCA_COMPUTE_TX_DELAY is not set */ qdf_assert(bin_values); - cdf_mem_zero(bin_values, + qdf_mem_zero(bin_values, QCA_TX_DELAY_HIST_REPORT_BINS * sizeof(*bin_values)); } #endif diff --git a/core/dp/txrx/ol_cfg.c b/core/dp/txrx/ol_cfg.c index 29e4c1b345ce..44e5f240cb83 100644 --- a/core/dp/txrx/ol_cfg.c +++ b/core/dp/txrx/ol_cfg.c @@ -80,7 +80,7 @@ ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev, { struct txrx_pdev_cfg_t *cfg_ctx; - cfg_ctx = cdf_mem_malloc(sizeof(*cfg_ctx)); + cfg_ctx = qdf_mem_malloc(sizeof(*cfg_ctx)); if (!cfg_ctx) { printk(KERN_ERR "cfg ctx allocation failed\n"); return NULL; diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 5b86ca97c49b..263341c7b8db 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -130,10 +130,10 @@ static void ol_rx_process_inv_peer(ol_txrx_pdev_handle pdev, return; /* ignore frames for non-existent bssids */ - cdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN); + qdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN); TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { - if (cdf_mem_compare(a1, vdev->mac_addr.raw, IEEE80211_ADDR_LEN) - == 0) { + if (qdf_mem_cmp(a1, vdev->mac_addr.raw, IEEE80211_ADDR_LEN) + != 0) { break; } } @@ -618,12 +618,12 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, peer->security[sec_index].sec_type = sec_type; /* michael key only valid for TKIP but for simplicity, copy it anyway */ - cdf_mem_copy(&peer->security[sec_index].michael_key[0], + qdf_mem_copy(&peer->security[sec_index].michael_key[0], michael_key, sizeof(peer->security[sec_index].michael_key)); if (sec_type != htt_sec_type_wapi) { - cdf_mem_set(peer->tids_last_pn_valid, + qdf_mem_set(peer->tids_last_pn_valid, OL_TXRX_NUM_EXT_TIDS, 0x00); } else if (sec_index == txrx_sec_mcast || peer->tids_last_pn_valid[0]) { for (i = 0; i < OL_TXRX_NUM_EXT_TIDS; i++) { @@ -632,7 +632,7 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, * since WAPI PN has to be started with predefined value */ peer->tids_last_pn_valid[i] = 1; - cdf_mem_copy((uint8_t *) &peer->tids_last_pn[i], + qdf_mem_copy((uint8_t *) &peer->tids_last_pn[i], (uint8_t *) rx_pn, sizeof(union htt_rx_pn_t)); peer->tids_last_pn[i].pn128[1] = @@ -662,9 +662,9 @@ static void transcap_nwifi_to_8023(cdf_nbuf_t msdu) uint8_t fc1; wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu); - cdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN); - cdf_mem_copy(a2, wh->i_addr2, IEEE80211_ADDR_LEN); - cdf_mem_copy(a3, wh->i_addr3, IEEE80211_ADDR_LEN); + qdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN); + qdf_mem_copy(a2, wh->i_addr2, IEEE80211_ADDR_LEN); + qdf_mem_copy(a3, wh->i_addr3, IEEE80211_ADDR_LEN); fc1 = wh->i_fc[1] & IEEE80211_FC1_DIR_MASK; /* Native Wifi header is 80211 non-QoS header */ hdrsize = sizeof(struct ieee80211_frame); @@ -682,16 +682,16 @@ static void transcap_nwifi_to_8023(cdf_nbuf_t msdu) eth_hdr = (struct ether_header *)(cdf_nbuf_data(msdu)); switch (fc1) { case IEEE80211_FC1_DIR_NODS: - cdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->ether_shost, a2, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_shost, a2, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_TODS: - cdf_mem_copy(eth_hdr->ether_dhost, a3, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->ether_shost, a2, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_dhost, a3, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_shost, a2, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_FROMDS: - cdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->ether_shost, a3, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->ether_shost, a3, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_DSTODS: break; @@ -973,7 +973,7 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev, bool filter = false; #ifdef QCA_SUPPORT_SW_TXRX_ENCAP struct ol_rx_decap_info_t info; - cdf_mem_set(&info, sizeof(info), 0); + qdf_mem_set(&info, sizeof(info), 0); #endif msdu = msdu_list; @@ -1070,7 +1070,7 @@ DONE: peer->last_pkt_center_freq; rx_header.rssi_cmb = peer->last_pkt_rssi_cmb; - cdf_mem_copy(rx_header.rssi, + qdf_mem_copy(rx_header.rssi, peer->last_pkt_rssi, sizeof(rx_header.rssi)); if (peer->last_pkt_legacy_rate_sel == @@ -1119,7 +1119,7 @@ DONE: cdf_nbuf_push_head(msdu, sizeof(rx_header)); - cdf_mem_copy(cdf_nbuf_data(msdu), + qdf_mem_copy(cdf_nbuf_data(msdu), &rx_header, sizeof(rx_header)); /* Construct the ethernet header with @@ -1130,7 +1130,7 @@ DONE: ETHERTYPE_OCB_RX); cdf_nbuf_push_head(msdu, sizeof(eth_header)); - cdf_mem_copy(cdf_nbuf_data(msdu), + qdf_mem_copy(cdf_nbuf_data(msdu), ð_header, sizeof(eth_header)); } diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index 8c05c6098a0e..58f5b90bf6e3 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -65,16 +65,16 @@ #include #include #include -#include +#include #include #include #include /* qdf_system_time */ #define DEFRAG_IEEE80211_ADDR_EQ(a1, a2) \ - (cdf_mem_compare(a1, a2, IEEE80211_ADDR_LEN) == 0) + (qdf_mem_cmp(a1, a2, IEEE80211_ADDR_LEN) != 0) #define DEFRAG_IEEE80211_ADDR_COPY(dst, src) \ - cdf_mem_copy(dst, src, IEEE80211_ADDR_LEN) + qdf_mem_copy(dst, src, IEEE80211_ADDR_LEN) #define DEFRAG_IEEE80211_QOS_HAS_SEQ(wh) \ (((wh)->i_fc[0] & \ @@ -562,7 +562,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, return; if (tkip_demic) { - cdf_mem_copy(key, + qdf_mem_copy(key, peer->security[index].michael_key, sizeof(peer->security[index].michael_key)); if (!ol_rx_frag_tkip_demic(pdev, key, msdu, hdr_space)) { @@ -608,7 +608,7 @@ ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev, if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) return OL_RX_DEFRAG_ERR; - cdf_mem_move(origHdr + f_tkip.ic_header, origHdr, hdrlen); + qdf_mem_move(origHdr + f_tkip.ic_header, origHdr, hdrlen); cdf_nbuf_pull_head(msdu, f_tkip.ic_header); cdf_nbuf_trim_tail(msdu, f_tkip.ic_trailer); return OL_RX_DEFRAG_OK; @@ -630,7 +630,7 @@ ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t hdrlen) &rx_desc_old_position, &ind_old_position, &rx_desc_len); origHdr = (uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len); - cdf_mem_move(origHdr + f_wep.ic_header, origHdr, hdrlen); + qdf_mem_move(origHdr + f_wep.ic_header, origHdr, hdrlen); cdf_nbuf_pull_head(msdu, f_wep.ic_header); cdf_nbuf_trim_tail(msdu, f_wep.ic_trailer); return OL_RX_DEFRAG_OK; @@ -665,7 +665,7 @@ ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, const uint8_t *key, ol_rx_defrag_copydata(msdu, pktlen - f_tkip.ic_miclen + rx_desc_len, f_tkip.ic_miclen, (caddr_t) mic0); - if (cdf_mem_compare(mic, mic0, f_tkip.ic_miclen)) + if (!qdf_mem_cmp(mic, mic0, f_tkip.ic_miclen)) return OL_RX_DEFRAG_ERR; cdf_nbuf_trim_tail(msdu, f_tkip.ic_miclen); @@ -694,7 +694,7 @@ ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev, if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) return OL_RX_DEFRAG_ERR; - cdf_mem_move(origHdr + f_ccmp.ic_header, origHdr, hdrlen); + qdf_mem_move(origHdr + f_ccmp.ic_header, origHdr, hdrlen); cdf_nbuf_pull_head(nbuf, f_ccmp.ic_header); return OL_RX_DEFRAG_OK; @@ -973,9 +973,9 @@ void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) &ind_old_position, &rx_desc_len); wh_ptr = (struct ieee80211_frame *)(cdf_nbuf_data(msdu) + rx_desc_len); - cdf_mem_copy(&wh, wh_ptr, sizeof(wh)); + qdf_mem_copy(&wh, wh_ptr, sizeof(wh)); hdrsize = sizeof(struct ieee80211_frame); - cdf_mem_copy(&llchdr, ((uint8_t *) (cdf_nbuf_data(msdu) + + qdf_mem_copy(&llchdr, ((uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len)) + hdrsize, sizeof(struct llc_snap_hdr_t)); @@ -989,25 +989,25 @@ void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) eth_hdr = (struct ethernet_hdr_t *)(cdf_nbuf_data(msdu)); switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: - cdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_TODS: - cdf_mem_copy(eth_hdr->dest_addr, wh.i_addr3, + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr3, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr2, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_FROMDS: - cdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, + qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, IEEE80211_ADDR_LEN); - cdf_mem_copy(eth_hdr->src_addr, wh.i_addr3, IEEE80211_ADDR_LEN); + qdf_mem_copy(eth_hdr->src_addr, wh.i_addr3, IEEE80211_ADDR_LEN); break; case IEEE80211_FC1_DIR_DSTODS: break; } - cdf_mem_copy(eth_hdr->ethertype, llchdr.ethertype, + qdf_mem_copy(eth_hdr->ethertype, llchdr.ethertype, sizeof(llchdr.ethertype)); } @@ -1038,7 +1038,7 @@ ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev, /* remove QoS filed from header */ hdrlen -= qoslen; - cdf_mem_move((uint8_t *) wh + qoslen, wh, hdrlen); + qdf_mem_move((uint8_t *) wh + qoslen, wh, hdrlen); wh = (struct ieee80211_frame *)cdf_nbuf_pull_head(nbuf, rx_desc_len + qoslen); diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h index d0467625dd4d..6ed90da22243 100644 --- a/core/dp/txrx/ol_rx_defrag.h +++ b/core/dp/txrx/ol_rx_defrag.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index 9e52c074ec4c..f85df9d2964a 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/core/dp/txrx/ol_rx_fwd.c @@ -27,7 +27,7 @@ /* standard header files */ #include /* cdf_nbuf_map */ -#include /* cdf_mem_compare */ +#include /* qdf_mem_cmp */ /* external header files */ #include /* wlan_op_mode_ap, etc. */ @@ -75,9 +75,9 @@ static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) if (type != IEEE80211_FC0_TYPE_DATA || subtype != 0x0 || ((tods != 1) || (fromds != 0)) || - (cdf_mem_compare + (qdf_mem_cmp (mac_header->i_addr3, vdev->mac_addr.raw, - IEEE80211_ADDR_LEN) == 0)) { + IEEE80211_ADDR_LEN) != 0)) { #ifdef DEBUG_HOST_RC TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "Exit: %s | Unnecessary to adjust mac header\n", diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 1d5a4acbc88e..4da66ef68b64 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -261,7 +261,7 @@ A_STATUS ol_rx_pn_trace_attach(ol_txrx_pdev_handle pdev) pdev->rx_pn_trace.cnt = 0; pdev->rx_pn_trace.mask = num_elems - 1; pdev->rx_pn_trace.data = - cdf_mem_malloc(sizeof(*pdev->rx_pn_trace.data) * num_elems); + qdf_mem_malloc(sizeof(*pdev->rx_pn_trace.data) * num_elems); if (!pdev->rx_pn_trace.data) return A_NO_MEMORY; return A_OK; @@ -269,7 +269,7 @@ A_STATUS ol_rx_pn_trace_attach(ol_txrx_pdev_handle pdev) void ol_rx_pn_trace_detach(ol_txrx_pdev_handle pdev) { - cdf_mem_free(pdev->rx_pn_trace.data); + qdf_mem_free(pdev->rx_pn_trace.data); } void diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 7c3a8171d0b3..42fd4fb6af7d 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -28,7 +28,7 @@ /*=== header file includes ===*/ /* generic utilities */ #include /* cdf_nbuf_t, etc. */ -#include /* cdf_mem_malloc */ +#include /* qdf_mem_malloc */ #include /* IEEE80211_SEQ_MAX */ @@ -492,9 +492,9 @@ ol_rx_addba_handler(ol_txrx_pdev_handle pdev, round_pwr2_win_sz = OL_RX_REORDER_ROUND_PWR2(win_sz); array_size = round_pwr2_win_sz * sizeof(struct ol_rx_reorder_array_elem_t); - rx_reorder->array = cdf_mem_malloc(array_size); + rx_reorder->array = qdf_mem_malloc(array_size); TXRX_ASSERT1(rx_reorder->array); - cdf_mem_set(rx_reorder->array, array_size, 0x0); + qdf_mem_set(rx_reorder->array, array_size, 0x0); rx_reorder->win_sz_mask = round_pwr2_win_sz - 1; rx_reorder->num_mpdus = 0; @@ -529,7 +529,7 @@ ol_rx_delba_handler(ol_txrx_pdev_handle pdev, uint16_t peer_id, uint8_t tid) if (rx_reorder->array != &rx_reorder->base) { TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "%s, delete reorder array, tid:%d\n", __func__, tid); - cdf_mem_free(rx_reorder->array); + qdf_mem_free(rx_reorder->array); } /* set up the TID with default parameters (ARQ window size = 1) */ @@ -733,7 +733,7 @@ A_STATUS ol_rx_reorder_trace_attach(ol_txrx_pdev_handle pdev) pdev->rx_reorder_trace.idx = 0; pdev->rx_reorder_trace.cnt = 0; pdev->rx_reorder_trace.mask = num_elems - 1; - pdev->rx_reorder_trace.data = cdf_mem_malloc( + pdev->rx_reorder_trace.data = qdf_mem_malloc( sizeof(*pdev->rx_reorder_trace.data) * num_elems); if (!pdev->rx_reorder_trace.data) return A_NO_MEMORY; @@ -746,7 +746,7 @@ A_STATUS ol_rx_reorder_trace_attach(ol_txrx_pdev_handle pdev) void ol_rx_reorder_trace_detach(ol_txrx_pdev_handle pdev) { - cdf_mem_free(pdev->rx_reorder_trace.data); + qdf_mem_free(pdev->rx_reorder_trace.data); } void diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index d50bc45390d8..6ac608a969da 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -1149,7 +1149,7 @@ bool parse_ocb_tx_header(cdf_nbuf_t msdu, if (tx_ctrl_hdr->version == OCB_HEADER_VERSION) { if (tx_ctrl) - cdf_mem_copy(tx_ctrl, tx_ctrl_hdr, + qdf_mem_copy(tx_ctrl, tx_ctrl_hdr, sizeof(*tx_ctrl_hdr)); } else { /* The TX control header is invalid. */ @@ -1367,11 +1367,11 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg) int i; struct cdf_tso_seg_elem_t *c_element; - c_element = cdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); + c_element = qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); pdev->tso_seg_pool.freelist = c_element; for (i = 0; i < (num_seg - 1); i++) { c_element->next = - cdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); + qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); c_element = c_element->next; c_element->next = NULL; } @@ -1389,7 +1389,7 @@ void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) c_element = pdev->tso_seg_pool.freelist; for (i = 0; i < pdev->tso_seg_pool.pool_size; i++) { temp = c_element->next; - cdf_mem_free(c_element); + qdf_mem_free(c_element); c_element = temp; if (!c_element) break; diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 918917a5ae22..ae2d77aad510 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -958,7 +958,7 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, pdev->tx_delay.cats[cat].avg_start_time_ticks = now_ticks; index = 1 - index; pdev->tx_delay.cats[cat].in_progress_idx = index; - cdf_mem_zero(&pdev->tx_delay.cats[cat].copies[index], + qdf_mem_zero(&pdev->tx_delay.cats[cat].copies[index], sizeof(pdev->tx_delay.cats[cat].copies[index])); } diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 1472cbc12c0f..208548f95355 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -28,7 +28,7 @@ /*=== includes ===*/ /* header files for OS primitives */ #include /* uint32_t, etc. */ -#include /* cdf_mem_malloc,free */ +#include /* qdf_mem_malloc,free */ #include /* qdf_device_t, qdf_print */ #include /* cdf_spinlock */ #include /* qdf_atomic_read */ @@ -404,10 +404,10 @@ ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, struct ol_txrx_pdev_t *pdev; int i; - pdev = cdf_mem_malloc(sizeof(*pdev)); + pdev = qdf_mem_malloc(sizeof(*pdev)); if (!pdev) goto fail0; - cdf_mem_zero(pdev, sizeof(*pdev)); + qdf_mem_zero(pdev, sizeof(*pdev)); pdev->cfg.default_tx_comp_req = !ol_cfg_tx_free_at_download(ctrl_pdev); @@ -437,7 +437,7 @@ fail2: ol_txrx_peer_find_detach(pdev); fail1: - cdf_mem_free(pdev); + qdf_mem_free(pdev); fail0: return NULL; @@ -551,7 +551,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) /* Calculate single element reserved size power of 2 */ pdev->tx_desc.desc_reserved_size = qdf_get_pwr2(desc_element_size); - cdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_desc.desc_pages, + qdf_mem_multi_pages_alloc(pdev->osdev, &pdev->tx_desc.desc_pages, pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true); if ((0 == pdev->tx_desc.desc_pages.num_pages) || (NULL == pdev->tx_desc.desc_pages.cacheable_pages)) { @@ -826,7 +826,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) /* * Initialize rx PN check characteristics for different security types. */ - cdf_mem_set(&pdev->rx_pn[0], sizeof(pdev->rx_pn), 0); + qdf_mem_set(&pdev->rx_pn[0], sizeof(pdev->rx_pn), 0); /* TKIP: 48-bit TSC, CCMP: 48-bit PN */ pdev->rx_pn[htt_sec_type_tkip].len = @@ -870,7 +870,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) ol_tx_cfg_max_tx_queue_depth_ll(pdev->ctrl_pdev); #ifdef QCA_COMPUTE_TX_DELAY - cdf_mem_zero(&pdev->tx_delay, sizeof(pdev->tx_delay)); + qdf_mem_zero(&pdev->tx_delay, sizeof(pdev->tx_delay)); qdf_spinlock_create(&pdev->tx_delay.mutex); /* initialize compute interval with 5 seconds (ESE default) */ @@ -940,7 +940,7 @@ desc_alloc_fail: htt_tx_desc_free(pdev->htt_pdev, (ol_tx_desc_find(pdev, i))->htt_tx_desc); - cdf_mem_multi_pages_free(pdev->osdev, + qdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_desc.desc_pages, 0, true); page_alloc_fail: @@ -1032,7 +1032,7 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) htt_tx_desc_free(pdev->htt_pdev, htt_tx_desc); } - cdf_mem_multi_pages_free(pdev->osdev, + qdf_mem_multi_pages_free(pdev->osdev, &pdev->tx_desc.desc_pages, 0, true); pdev->tx_desc.freelist = NULL; @@ -1079,7 +1079,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, TXRX_ASSERT2(pdev); TXRX_ASSERT2(vdev_mac_addr); - vdev = cdf_mem_malloc(sizeof(*vdev)); + vdev = qdf_mem_malloc(sizeof(*vdev)); if (!vdev) return NULL; /* failure */ @@ -1093,7 +1093,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, vdev->drop_unenc = 1; vdev->num_filters = 0; - cdf_mem_copy(&vdev->mac_addr.raw[0], vdev_mac_addr, + qdf_mem_copy(&vdev->mac_addr.raw[0], vdev_mac_addr, OL_TXRX_MAC_ADDR_LEN); TAILQ_INIT(&vdev->peer_list); @@ -1166,7 +1166,7 @@ void ol_txrx_set_privacy_filters(ol_txrx_vdev_handle vdev, void *filters, uint32_t num) { - cdf_mem_copy(vdev->privacy_filters, filters, + qdf_mem_copy(vdev->privacy_filters, filters, num * sizeof(struct privacy_exemption)); vdev->num_filters = num; } @@ -1247,7 +1247,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, * they will be freed once the target sends a tx completion * message for them. */ - cdf_mem_free(vdev); + qdf_mem_free(vdev); if (callback) callback(context); } @@ -1294,7 +1294,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, if (ret != QDF_STATUS_SUCCESS) cdf_nbuf_free(cache_buf->buf); } - cdf_mem_free(cache_buf); + qdf_mem_free(cache_buf); qdf_spin_lock_bh(&peer->bufq_lock); cache_buf = list_entry((&peer->cached_bufq)->next, typeof(*cache_buf), list); @@ -1355,14 +1355,14 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, } } - peer = cdf_mem_malloc(sizeof(*peer)); + peer = qdf_mem_malloc(sizeof(*peer)); if (!peer) return NULL; /* failure */ - cdf_mem_zero(peer, sizeof(*peer)); + qdf_mem_zero(peer, sizeof(*peer)); /* store provided params */ peer->vdev = vdev; - cdf_mem_copy(&peer->mac_addr.raw[0], peer_mac_addr, + qdf_mem_copy(&peer->mac_addr.raw[0], peer_mac_addr, OL_TXRX_MAC_ADDR_LEN); INIT_LIST_HEAD(&peer->cached_bufq); @@ -1411,10 +1411,9 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, /* * For every peer MAp message search and set if bss_peer */ - differs = - cdf_mem_compare(peer->mac_addr.raw, vdev->mac_addr.raw, + differs = qdf_mem_cmp(peer->mac_addr.raw, vdev->mac_addr.raw, OL_TXRX_MAC_ADDR_LEN); - if (!differs) + if (differs) peer->bss_peer = 1; /* @@ -1763,7 +1762,7 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]); /* all peers are gone, go ahead and delete it */ - cdf_mem_free(vdev); + qdf_mem_free(vdev); if (vdev_delete_cb) vdev_delete_cb(vdev_delete_context); } else { @@ -1787,13 +1786,13 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "%s, delete reorder arr, tid:%d\n", __func__, i); - cdf_mem_free(peer->tids_rx_reorder[i].array); + qdf_mem_free(peer->tids_rx_reorder[i].array); ol_rx_reorder_init(&peer->tids_rx_reorder[i], (uint8_t) i); } } - cdf_mem_free(peer); + qdf_mem_free(peer); } else { qdf_spin_unlock_bh(&pdev->peer_ref_mutex); } @@ -2034,7 +2033,7 @@ ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, struct ol_txrx_stats_req *req, * Allocate a non-transient stats request object. * (The one provided as an argument is likely allocated on the stack.) */ - non_volatile_req = cdf_mem_malloc(sizeof(*non_volatile_req)); + non_volatile_req = qdf_mem_malloc(sizeof(*non_volatile_req)); if (!non_volatile_req) return A_NO_MEMORY; @@ -2051,7 +2050,7 @@ ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, struct ol_txrx_stats_req *req, req->stats_type_reset_mask, HTT_H2T_STATS_REQ_CFG_STAT_TYPE_INVALID, 0, cookie)) { - cdf_mem_free(non_volatile_req); + qdf_mem_free(non_volatile_req); return A_ERROR; } @@ -2060,7 +2059,7 @@ ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, struct ol_txrx_stats_req *req, ; if (response_expected == false) - cdf_mem_free(non_volatile_req); + qdf_mem_free(non_volatile_req); return A_OK; } @@ -2105,7 +2104,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < lmt) lmt = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, lmt); + qdf_mem_copy(buf, stats_data, lmt); } break; case HTT_DBG_STATS_RX_REORDER: @@ -2117,7 +2116,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < lmt) lmt = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, lmt); + qdf_mem_copy(buf, stats_data, lmt); } break; case HTT_DBG_STATS_RX_RATE_INFO: @@ -2129,7 +2128,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < lmt) lmt = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, lmt); + qdf_mem_copy(buf, stats_data, lmt); } break; @@ -2142,7 +2141,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < lmt) lmt = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, lmt); + qdf_mem_copy(buf, stats_data, lmt); } break; @@ -2161,7 +2160,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, limit = req->base.copy.byte_limit; } buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2174,7 +2173,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < limit) limit = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2187,7 +2186,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < limit) limit = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2200,7 +2199,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < limit) limit = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2215,7 +2214,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (req->base.copy.byte_limit < limit) limit = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2231,7 +2230,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, limit = req->base.copy.byte_limit; buf = req->base.copy.buf + req->offset; - cdf_mem_copy(buf, stats_data, limit); + qdf_mem_copy(buf, stats_data, limit); } break; @@ -2251,7 +2250,7 @@ ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, if (!more) { if (req->base.wait.blocking) qdf_semaphore_release(req->base.wait.sem_ptr); - cdf_mem_free(req); + qdf_mem_free(req); } } @@ -2511,7 +2510,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev) void ol_txrx_stats_clear(ol_txrx_pdev_handle pdev) { - cdf_mem_zero(&pdev->stats, sizeof(pdev->stats)); + qdf_mem_zero(&pdev->stats, sizeof(pdev->stats)); } #if defined(ENABLE_TXRX_PROT_ANALYZE) @@ -2539,7 +2538,7 @@ ol_txrx_peer_stats_copy(ol_txrx_pdev_handle pdev, { qdf_assert(pdev && peer && stats); qdf_spin_lock_bh(&pdev->peer_stat_mutex); - cdf_mem_copy(stats, &peer->stats, sizeof(*stats)); + qdf_mem_copy(stats, &peer->stats, sizeof(*stats)); qdf_spin_unlock_bh(&pdev->peer_stat_mutex); return A_OK; } @@ -2834,7 +2833,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, if (qdf_unlikely(!pdev)) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: Invalid context", __func__); - cdf_mem_free(rxpkt); + qdf_mem_free(rxpkt); return; } @@ -2843,7 +2842,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context, } else { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: ipa_uc_op_cb NULL", __func__); - cdf_mem_free(rxpkt); + qdf_mem_free(rxpkt); } } @@ -2885,7 +2884,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, } else { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "%s: IPA callback function is not registered", __func__); - cdf_mem_free(op_msg); + qdf_mem_free(op_msg); return; } } @@ -3071,7 +3070,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, buf = rx_buf_list; while (buf) { next_buf = cdf_nbuf_queue_next(buf); - cache_buf = cdf_mem_malloc(sizeof(*cache_buf)); + cache_buf = qdf_mem_malloc(sizeof(*cache_buf)); if (!cache_buf) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Failed to allocate buf to cache the rx frames"); diff --git a/core/dp/txrx/ol_txrx_encap.c b/core/dp/txrx/ol_txrx_encap.c index a7471da73748..8deddebada03 100644 --- a/core/dp/txrx/ol_txrx_encap.c +++ b/core/dp/txrx/ol_txrx_encap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -54,7 +54,7 @@ if (cdf_nbuf_len(msdu) < hdsize) { \ return A_ERROR; \ } \ - cdf_mem_copy(localbuf, wh, hdsize); \ + qdf_mem_copy(localbuf, wh, hdsize); \ wh = (struct ieee80211_frame *)localbuf; \ } while (0) @@ -73,7 +73,7 @@ ol_tx_copy_native_wifi_header(cdf_nbuf_t msdu, if (cdf_nbuf_len(msdu) < *hdsize) return A_ERROR; - cdf_mem_copy(localbuf, wh, *hdsize); + qdf_mem_copy(localbuf, wh, *hdsize); return A_OK; } @@ -123,7 +123,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, /*add ht control field if needed */ /* copy new hd to bd */ - cdf_mem_copy((void *) + qdf_mem_copy((void *) htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, new_hdsize), localbuf, new_hdsize); @@ -147,7 +147,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, wh = (struct ieee80211_frame *) htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, hdsize); - cdf_mem_copy((void *)wh, localbuf, hdsize); + qdf_mem_copy((void *)wh, localbuf, hdsize); cdf_nbuf_pull_head(msdu, hdsize); tx_msdu_info->htt.info.l3_hdr_offset = hdsize; tx_desc->orig_l2_hdr_bytes = hdsize; @@ -193,34 +193,34 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, switch (vdev->opmode) { case wlan_op_mode_ap: /* DA , BSSID , SA */ - cdf_mem_copy(wh->i_addr1, eth_hdr->dest_addr, + qdf_mem_copy(wh->i_addr1, eth_hdr->dest_addr, IEEE80211_ADDR_LEN); - cdf_mem_copy(wh->i_addr2, &vdev->mac_addr.raw, + qdf_mem_copy(wh->i_addr2, &vdev->mac_addr.raw, IEEE80211_ADDR_LEN); - cdf_mem_copy(wh->i_addr3, eth_hdr->src_addr, + qdf_mem_copy(wh->i_addr3, eth_hdr->src_addr, IEEE80211_ADDR_LEN); wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS; new_hdsize = sizeof(struct ieee80211_frame); break; case wlan_op_mode_ibss: /* DA, SA, BSSID */ - cdf_mem_copy(wh->i_addr1, eth_hdr->dest_addr, + qdf_mem_copy(wh->i_addr1, eth_hdr->dest_addr, IEEE80211_ADDR_LEN); - cdf_mem_copy(wh->i_addr2, eth_hdr->src_addr, + qdf_mem_copy(wh->i_addr2, eth_hdr->src_addr, IEEE80211_ADDR_LEN); /* need to check the bssid behaviour for IBSS vdev */ - cdf_mem_copy(wh->i_addr3, &vdev->mac_addr.raw, + qdf_mem_copy(wh->i_addr3, &vdev->mac_addr.raw, IEEE80211_ADDR_LEN); wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; new_hdsize = sizeof(struct ieee80211_frame); break; case wlan_op_mode_sta: /* BSSID, SA , DA */ - cdf_mem_copy(wh->i_addr1, &peer->mac_addr.raw, + qdf_mem_copy(wh->i_addr1, &peer->mac_addr.raw, IEEE80211_ADDR_LEN); - cdf_mem_copy(wh->i_addr2, eth_hdr->src_addr, + qdf_mem_copy(wh->i_addr2, eth_hdr->src_addr, IEEE80211_ADDR_LEN); - cdf_mem_copy(wh->i_addr3, eth_hdr->dest_addr, + qdf_mem_copy(wh->i_addr3, eth_hdr->dest_addr, IEEE80211_ADDR_LEN); wh->i_fc[1] = IEEE80211_FC1_DIR_TODS; new_hdsize = sizeof(struct ieee80211_frame); @@ -256,7 +256,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, ether_type = (eth_hdr->ethertype[0] << 8) | (eth_hdr->ethertype[1]); if (ether_type >= IEEE8023_MAX_LEN) { - cdf_mem_copy(llc_hdr, + qdf_mem_copy(llc_hdr, ethernet_II_llc_snap_header_prefix, sizeof (ethernet_II_llc_snap_header_prefix)); @@ -273,7 +273,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, do we need to move to BD pdu? */ } } - cdf_mem_copy((void *) + qdf_mem_copy((void *) htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, new_l2_hdsize), localbuf, new_hdsize); @@ -325,33 +325,33 @@ ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev, wh = (struct ieee80211_frame_addr4 *)cdf_nbuf_push_head(msdu, hdsize); TXRX_ASSERT2(wh != NULL); TXRX_ASSERT2(hdsize <= info->hdr_len); - cdf_mem_copy((uint8_t *) wh, info->hdr, hdsize); + qdf_mem_copy((uint8_t *) wh, info->hdr, hdsize); /* amsdu subfrm handling if ethr_hdr is not NULL */ if (ethr_hdr != NULL) { switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: - cdf_mem_copy(wh->i_addr1, ethr_hdr->dest_addr, + qdf_mem_copy(wh->i_addr1, ethr_hdr->dest_addr, ETHERNET_ADDR_LEN); - cdf_mem_copy(wh->i_addr2, ethr_hdr->src_addr, + qdf_mem_copy(wh->i_addr2, ethr_hdr->src_addr, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_TODS: - cdf_mem_copy(wh->i_addr2, ethr_hdr->src_addr, + qdf_mem_copy(wh->i_addr2, ethr_hdr->src_addr, ETHERNET_ADDR_LEN); - cdf_mem_copy(wh->i_addr3, ethr_hdr->dest_addr, + qdf_mem_copy(wh->i_addr3, ethr_hdr->dest_addr, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_FROMDS: - cdf_mem_copy(wh->i_addr1, ethr_hdr->dest_addr, + qdf_mem_copy(wh->i_addr1, ethr_hdr->dest_addr, ETHERNET_ADDR_LEN); - cdf_mem_copy(wh->i_addr3, ethr_hdr->src_addr, + qdf_mem_copy(wh->i_addr3, ethr_hdr->src_addr, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_DSTODS: - cdf_mem_copy(wh->i_addr3, ethr_hdr->dest_addr, + qdf_mem_copy(wh->i_addr3, ethr_hdr->dest_addr, ETHERNET_ADDR_LEN); - cdf_mem_copy(wh->i_addr4, ethr_hdr->src_addr, + qdf_mem_copy(wh->i_addr4, ethr_hdr->src_addr, ETHERNET_ADDR_LEN); break; } @@ -414,27 +414,27 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, ethr_hdr = (struct ethernet_hdr_t *)local_buf; switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_TODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_FROMDS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr3, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_DSTODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr4, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr4, ETHERNET_ADDR_LEN); break; } @@ -451,7 +451,7 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, ethr_hdr->ethertype[0] = (ether_type >> 8) & 0xff; ethr_hdr->ethertype[1] = (ether_type) & 0xff; } - cdf_mem_copy(buf, ethr_hdr, ETHERNET_HDR_LEN); + qdf_mem_copy(buf, ethr_hdr, ETHERNET_HDR_LEN); } static inline A_STATUS @@ -466,7 +466,7 @@ ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev, subfrm_hdr = (uint8_t *) cdf_nbuf_data(msdu); if (pdev->frame_format == wlan_frm_fmt_native_wifi) { /* decap to native wifi */ - cdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); + qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); ol_rx_decap_to_native_wifi(vdev, msdu, info, ether_hdr); } else if (pdev->frame_format == wlan_frm_fmt_802_3) { @@ -474,7 +474,7 @@ ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev, /* remove llc snap hdr if it's necessary according to * 802.11 table P-3 */ - cdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); + qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); ol_rx_decap_to_8023(vdev, msdu, info, ether_hdr); } else { @@ -507,7 +507,7 @@ ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, if (IEEE80211_QOS_HAS_SEQ(wh)) { info->hdr_len = ol_txrx_ieee80211_hdrsize(wh); TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); - cdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ + qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ wh, info->hdr_len); cdf_nbuf_pull_head(msdu, info->hdr_len); ol_rx_decap_to_native_wifi(vdev, msdu, info, NULL); @@ -517,7 +517,7 @@ ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, if (pdev->sw_rx_llc_proc_enable) { info->hdr_len = ol_txrx_ieee80211_hdrsize(wh); TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); - cdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ + qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ wh, info->hdr_len); cdf_nbuf_pull_head(msdu, info->hdr_len); /* remove llc snap hdr if it's necessary according to @@ -564,7 +564,7 @@ ol_rx_decap(struct ol_txrx_vdev_t *vdev, ol_txrx_ieee80211_hdrsize(mpdu_hdr); TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); - cdf_mem_copy(info->hdr, mpdu_hdr, + qdf_mem_copy(info->hdr, mpdu_hdr, info->hdr_len); cdf_nbuf_pull_head(msdu, info->hdr_len); } diff --git a/core/dp/txrx/ol_txrx_event.c b/core/dp/txrx/ol_txrx_event.c index 0743a00ed4b4..ab85532715fe 100644 --- a/core/dp/txrx/ol_txrx_event.c +++ b/core/dp/txrx/ol_txrx_event.c @@ -57,7 +57,7 @@ wdi_event_del_subs(wdi_event_subscribe *wdi_sub, int event_index) } wdi_sub = next; } - /* cdf_mem_free(wdi_sub); */ + /* qdf_mem_free(wdi_sub); */ } static inline void @@ -170,7 +170,7 @@ wdi_event_unsub(struct ol_txrx_pdev_t *txrx_pdev, if (event_cb_sub->priv.next) event_cb_sub->priv.next->priv.prev = event_cb_sub->priv.prev; - /* cdf_mem_free(event_cb_sub); */ + /* qdf_mem_free(event_cb_sub); */ return A_OK; } @@ -186,7 +186,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev) } /* Separate subscriber list for each event */ txrx_pdev->wdi_event_list = (wdi_event_subscribe **) - cdf_mem_malloc( + qdf_mem_malloc( sizeof(wdi_event_subscribe *) * WDI_NUM_EVENTS); if (!txrx_pdev->wdi_event_list) { @@ -221,7 +221,7 @@ A_STATUS wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev) } } /* txrx_pdev->wdi_event_list would be non-null */ - cdf_mem_free(txrx_pdev->wdi_event_list); + qdf_mem_free(txrx_pdev->wdi_event_list); return A_OK; } diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 66f42d293624..157c0d4630c4 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -172,7 +172,7 @@ void ol_tx_dump_flow_pool_info(void) TAILQ_FOREACH(pool, &pdev->tx_desc.flow_pool_list, flow_pool_list_elem) { qdf_spin_lock_bh(&pool->flow_pool_lock); - cdf_mem_copy(&tmp_pool, pool, sizeof(tmp_pool)); + qdf_mem_copy(&tmp_pool, pool, sizeof(tmp_pool)); qdf_spin_unlock_bh(&pool->flow_pool_lock); qdf_spin_unlock_bh(&pdev->tx_desc.flow_pool_list_lock); TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -209,7 +209,7 @@ void ol_tx_clear_flow_pool_stats(void) __func__); return; } - cdf_mem_zero(&pdev->pool_stats, sizeof(pdev->pool_stats)); + qdf_mem_zero(&pdev->pool_stats, sizeof(pdev->pool_stats)); } /** @@ -337,7 +337,7 @@ struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, return NULL; } - pool = cdf_mem_malloc(sizeof(*pool)); + pool = qdf_mem_malloc(sizeof(*pool)); if (!pool) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "%s: malloc failed\n", __func__); @@ -423,7 +423,7 @@ int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) qdf_spin_unlock_bh(&pool->flow_pool_lock); /* Free flow_pool */ qdf_spinlock_destroy(&pool->flow_pool_lock); - cdf_mem_free(pool); + qdf_mem_free(pool); } else { /* FLOW_POOL_INVALID case*/ pool->flow_pool_size -= size; pool->flow_pool_id = INVALID_FLOW_ID; diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 243e1212b159..51d6a9490d43 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -30,7 +30,7 @@ #include /* qdf_assert */ #include /* cdf_nbuf_t */ -#include /* cdf_mem_set */ +#include /* qdf_mem_set */ #include /* ieee80211_frame */ #include /* htt_rx_msdu_desc_completes_mpdu, etc. */ @@ -197,7 +197,7 @@ ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, /* default conditional defs (may be undefed below) */ #define TXRX_STATS_INIT(_pdev) \ - cdf_mem_set(&((_pdev)->stats), sizeof((_pdev)->stats), 0x0) + qdf_mem_set(&((_pdev)->stats), sizeof((_pdev)->stats), 0x0) #define TXRX_STATS_ADD(_pdev, _field, _delta) { \ _pdev->stats._field += _delta; } #define TXRX_STATS_MSDU_INCR(pdev, field, netbuf) \ @@ -495,7 +495,7 @@ NOT_IP_TCP: if (frag_bytes > 0) { p = cdf_nbuf_get_frag_vaddr(frm, frag_num); - cdf_mem_copy(&local_buf[i], p, + qdf_mem_copy(&local_buf[i], p, frag_bytes); } frag_num++; diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c index ea6dee8b22f0..9646801fa982 100644 --- a/core/dp/txrx/ol_txrx_peer_find.c +++ b/core/dp/txrx/ol_txrx_peer_find.c @@ -28,7 +28,7 @@ /*=== includes ===*/ /* header files for OS primitives */ #include /* uint32_t, etc. */ -#include /* cdf_mem_malloc, etc. */ +#include /* qdf_mem_malloc, etc. */ #include /* qdf_device_t, qdf_print */ /* header files for utilities */ #include /* TAILQ */ @@ -119,7 +119,7 @@ static int ol_txrx_peer_find_hash_attach(struct ol_txrx_pdev_t *pdev) pdev->peer_hash.idx_bits = log2; /* allocate an array of TAILQ peer object lists */ pdev->peer_hash.bins = - cdf_mem_malloc(hash_elems * + qdf_mem_malloc(hash_elems * sizeof(TAILQ_HEAD(anonymous_tail_q, ol_txrx_peer_t))); if (!pdev->peer_hash.bins) @@ -133,7 +133,7 @@ static int ol_txrx_peer_find_hash_attach(struct ol_txrx_pdev_t *pdev) static void ol_txrx_peer_find_hash_detach(struct ol_txrx_pdev_t *pdev) { - cdf_mem_free(pdev->peer_hash.bins); + qdf_mem_free(pdev->peer_hash.bins); } static inline unsigned @@ -182,7 +182,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_vdev_find_hash(struct ol_txrx_pdev_t *pdev, if (mac_addr_is_aligned) { mac_addr = (union ol_txrx_align_mac_addr_t *)peer_mac_addr; } else { - cdf_mem_copy(&local_mac_addr_aligned.raw[0], + qdf_mem_copy(&local_mac_addr_aligned.raw[0], peer_mac_addr, OL_TXRX_MAC_ADDR_LEN); mac_addr = &local_mac_addr_aligned; } @@ -215,7 +215,7 @@ struct ol_txrx_peer_t *ol_txrx_peer_find_hash_find(struct ol_txrx_pdev_t *pdev, if (mac_addr_is_aligned) { mac_addr = (union ol_txrx_align_mac_addr_t *)peer_mac_addr; } else { - cdf_mem_copy(&local_mac_addr_aligned.raw[0], + qdf_mem_copy(&local_mac_addr_aligned.raw[0], peer_mac_addr, OL_TXRX_MAC_ADDR_LEN); mac_addr = &local_mac_addr_aligned; } @@ -310,7 +310,7 @@ static int ol_txrx_peer_find_map_attach(struct ol_txrx_pdev_t *pdev) /* allocate the peer ID -> peer object map */ max_peers = ol_cfg_max_peer_id(pdev->ctrl_pdev) + 1; peer_map_size = max_peers * sizeof(pdev->peer_id_to_obj_map[0]); - pdev->peer_id_to_obj_map = cdf_mem_malloc(peer_map_size); + pdev->peer_id_to_obj_map = qdf_mem_malloc(peer_map_size); if (!pdev->peer_id_to_obj_map) return 1; /* failure */ @@ -321,14 +321,14 @@ static int ol_txrx_peer_find_map_attach(struct ol_txrx_pdev_t *pdev) * However, it is convenient for debugging to have all elements * that are not in use set to 0. */ - cdf_mem_set(pdev->peer_id_to_obj_map, peer_map_size, 0); + qdf_mem_set(pdev->peer_id_to_obj_map, peer_map_size, 0); return 0; /* success */ } static void ol_txrx_peer_find_map_detach(struct ol_txrx_pdev_t *pdev) { - cdf_mem_free(pdev->peer_id_to_obj_map); + qdf_mem_free(pdev->peer_id_to_obj_map); } static inline void diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index f54d7784029f..90ad86b84a3f 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -33,7 +33,7 @@ #define _OL_TXRX_TYPES__H_ #include /* cdf_nbuf_t */ -#include +#include #include /* TAILQ */ #include /* A_UINT8 */ #include /* htt_sec_type, htt_pkt_type, etc. */ @@ -566,7 +566,7 @@ struct ol_txrx_pdev_t { uint16_t desc_reserved_size; uint8_t page_divider; uint32_t offset_filter; - struct cdf_mem_multi_page_t desc_pages; + struct qdf_mem_multi_page_t desc_pages; } tx_desc; uint8_t is_mgmt_over_wmi_enabled; diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 45f89606363c..72106ede5752 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -377,7 +377,7 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo, pRoamInfo->u.pConnectedProfile->operationChannel; /* Save the ssid for the connection */ - cdf_mem_copy(&pHddStaCtx->conn_info.SSID.SSID, + qdf_mem_copy(&pHddStaCtx->conn_info.SSID.SSID, &pRoamInfo->u.pConnectedProfile->SSID, sizeof(tSirMacSSid)); @@ -489,8 +489,8 @@ static void hdd_send_ft_event(hdd_adapter_t *pAdapter) #endif #if defined(KERNEL_SUPPORT_11R_CFG80211) - cdf_mem_zero(ftIe, DOT11F_IE_FTINFO_MAX_LEN); - cdf_mem_zero(ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN); + qdf_mem_zero(ftIe, DOT11F_IE_FTINFO_MAX_LEN); + qdf_mem_zero(ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN); sme_get_rici_es(pHddCtx->hHal, pAdapter->sessionId, (u8 *) ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN, &ric_ies_length); @@ -535,7 +535,7 @@ static void hdd_send_ft_event(hdd_adapter_t *pAdapter) hddLog(LOGE, FL("kmalloc unable to allocate memory")); return; } - cdf_mem_zero(buff, IW_CUSTOM_MAX); + qdf_mem_zero(buff, IW_CUSTOM_MAX); /* Sme needs to send the RIC IEs first */ str_len = strlcpy(buff, "RIC=", IW_CUSTOM_MAX); @@ -551,7 +551,7 @@ static void hdd_send_ft_event(hdd_adapter_t *pAdapter) } /* Sme needs to provide the Auth Resp */ - cdf_mem_zero(buff, IW_CUSTOM_MAX); + qdf_mem_zero(buff, IW_CUSTOM_MAX); str_len = strlcpy(buff, "AUTH=", IW_CUSTOM_MAX); sme_get_ft_pre_auth_response(pHddCtx->hHal, pAdapter->sessionId, (u8 *) &buff[str_len], @@ -650,7 +650,7 @@ hdd_send_update_beacon_ies_event(hdd_adapter_t *pAdapter, hddLog(LOGE, FL("kmalloc unable to allocate memory")); return; } - cdf_mem_zero(buff, IW_CUSTOM_MAX); + qdf_mem_zero(buff, IW_CUSTOM_MAX); strLen = strlcpy(buff, "BEACONIEs=", IW_CUSTOM_MAX); currentLen = strLen + 1; @@ -662,10 +662,10 @@ hdd_send_update_beacon_ies_event(hdd_adapter_t *pAdapter, * into chunks of CUSTOM event max size and send it to * supplicant. Changes are done in supplicant to handle this. */ - cdf_mem_zero(&buff[strLen + 1], IW_CUSTOM_MAX - (strLen + 1)); + qdf_mem_zero(&buff[strLen + 1], IW_CUSTOM_MAX - (strLen + 1)); currentLen = QDF_MIN(totalIeLen, IW_CUSTOM_MAX - (strLen + 1) - 1); - cdf_mem_copy(&buff[strLen + 1], pBeaconIes + currentOffset, + qdf_mem_copy(&buff[strLen + 1], pBeaconIes + currentOffset, currentLen); currentOffset += currentLen; totalIeLen -= currentLen; @@ -893,8 +893,8 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) { /* Remove staId, bssId and peerMacAddress */ pHddStaCtx->conn_info.staId[0] = 0; - cdf_mem_zero(&pHddStaCtx->conn_info.bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[0], + qdf_mem_zero(&pHddStaCtx->conn_info.bssId, QDF_MAC_ADDR_SIZE); + qdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[0], QDF_MAC_ADDR_SIZE); /* Clear all security settings */ @@ -902,14 +902,14 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx) pHddStaCtx->conn_info.mcEncryptionType = eCSR_ENCRYPT_TYPE_NONE; pHddStaCtx->conn_info.ucEncryptionType = eCSR_ENCRYPT_TYPE_NONE; - cdf_mem_zero(&pHddStaCtx->conn_info.Keys, sizeof(tCsrKeys)); - cdf_mem_zero(&pHddStaCtx->ibss_enc_key, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&pHddStaCtx->conn_info.Keys, sizeof(tCsrKeys)); + qdf_mem_zero(&pHddStaCtx->ibss_enc_key, sizeof(tCsrRoamSetKey)); /* Set not-connected state */ pHddStaCtx->conn_info.connDot11DesiredBssType = eCSR_BSS_TYPE_ANY; pHddStaCtx->conn_info.proxyARPService = 0; - cdf_mem_zero(&pHddStaCtx->conn_info.SSID, sizeof(tCsrSSIDInfo)); + qdf_mem_zero(&pHddStaCtx->conn_info.SSID, sizeof(tCsrSSIDInfo)); } /** @@ -1106,7 +1106,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, * reset are done in hdd_connRemoveConnectInfo. */ pHddStaCtx->conn_info.staId[i] = 0; - cdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[i], + qdf_mem_zero(&pHddStaCtx->conn_info.peerMacAddress[i], sizeof(struct qdf_mac_addr)); if (sta_id < (WLAN_MAX_STA_COUNT + 3)) pHddCtx->sta_to_adapter[sta_id] = NULL; @@ -1409,12 +1409,12 @@ static void hdd_send_re_assoc_event(struct net_device *dev, /* Send the Assoc Resp, the supplicant needs this for initial Auth */ len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET; rspRsnLength = len; - cdf_mem_copy(rspRsnIe, pFTAssocRsp, len); - cdf_mem_zero(rspRsnIe + len, IW_GENERIC_IE_MAX - len); + qdf_mem_copy(rspRsnIe, pFTAssocRsp, len); + qdf_mem_zero(rspRsnIe + len, IW_GENERIC_IE_MAX - len); chan = ieee80211_get_channel(pAdapter->wdev.wiphy, (int)pCsrRoamInfo->pBssDesc->channelId); - cdf_mem_zero(&roam_profile, sizeof(tCsrRoamConnectedProfile)); + qdf_mem_zero(&roam_profile, sizeof(tCsrRoamConnectedProfile)); sme_roam_get_connect_profile(hal_handle, pAdapter->sessionId, &roam_profile); bss = cfg80211_get_bss(pAdapter->wdev.wiphy, chan, @@ -1433,7 +1433,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, buf_ptr++; *buf_ptr = roam_profile.SSID.length; /*len of ssid*/ buf_ptr++; - cdf_mem_copy(buf_ptr, &roam_profile.SSID.ssId[0], + qdf_mem_copy(buf_ptr, &roam_profile.SSID.ssId[0], roam_profile.SSID.length); ssid_ie_len = 2 + roam_profile.SSID.length; hdd_notice("SSIDIE:"); @@ -1443,11 +1443,11 @@ static void hdd_send_re_assoc_event(struct net_device *dev, if (final_req_ie == NULL) goto done; buf_ptr = final_req_ie; - cdf_mem_copy(buf_ptr, buf_ssid_ie, ssid_ie_len); + qdf_mem_copy(buf_ptr, buf_ssid_ie, ssid_ie_len); buf_ptr += ssid_ie_len; - cdf_mem_copy(buf_ptr, reqRsnIe, reqRsnLength); - cdf_mem_copy(rspRsnIe, pFTAssocRsp, len); - cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength), + qdf_mem_copy(buf_ptr, reqRsnIe, reqRsnLength); + qdf_mem_copy(rspRsnIe, pFTAssocRsp, len); + qdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength), IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength)); hdd_notice("Req RSN IE:"); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG, @@ -1456,7 +1456,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, final_req_ie, (ssid_ie_len + reqRsnLength), rspRsnIe, rspRsnLength, GFP_KERNEL); - cdf_mem_copy(assoc_req_ies, + qdf_mem_copy(assoc_req_ies, (u8 *)pCsrRoamInfo->pbFrames + pCsrRoamInfo->nBeaconLength, pCsrRoamInfo->nAssocReqLength); @@ -1665,9 +1665,9 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; - cdf_mem_copy(roamInfo.bssid.bytes, + qdf_mem_copy(roamInfo.bssid.bytes, pHddStaCtx->roam_info.bssid, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(roamInfo.peerMac.bytes, + qdf_mem_copy(roamInfo.peerMac.bytes, pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE); cdf_ret_status = @@ -1983,11 +1983,11 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, pRoamInfo->fAuthRequired = false; - cdf_mem_copy(pHddStaCtx-> + qdf_mem_copy(pHddStaCtx-> roam_info.bssid, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pHddStaCtx-> + qdf_mem_copy(pHddStaCtx-> roam_info.peerMac, pRoamInfo->peerMac.bytes, QDF_MAC_ADDR_SIZE); @@ -2161,7 +2161,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, qdf_status, qdf_status); } #ifdef WLAN_FEATURE_11W - cdf_mem_zero(&pAdapter->hdd_stats.hddPmfStats, + qdf_mem_zero(&pAdapter->hdd_stats.hddPmfStats, sizeof(pAdapter->hdd_stats.hddPmfStats)); #endif } else { @@ -3074,7 +3074,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, pHddCtx->tdlsConnInfo[staIdx].staId = 0; pHddCtx->tdlsConnInfo[staIdx]. sessionId = 255; - cdf_mem_zero(&pHddCtx-> + qdf_mem_zero(&pHddCtx-> tdlsConnInfo[staIdx]. peerMac, QDF_MAC_ADDR_SIZE); @@ -3127,13 +3127,13 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, tdlsConnInfo [staIdx]. staId); - cdf_mem_zero(&smeTdlsPeerStateParams, + qdf_mem_zero(&smeTdlsPeerStateParams, sizeof (smeTdlsPeerStateParams)); smeTdlsPeerStateParams.vdevId = pHddCtx->tdlsConnInfo[staIdx]. sessionId; - cdf_mem_copy(&smeTdlsPeerStateParams. + qdf_mem_copy(&smeTdlsPeerStateParams. peerMacAddr, &pHddCtx-> tdlsConnInfo[staIdx]. @@ -3168,7 +3168,7 @@ hdd_roam_tdls_status_update_handler(hdd_adapter_t *pAdapter, wlan_hdd_tdls_decrement_peer_count (pAdapter); - cdf_mem_zero(&pHddCtx-> + qdf_mem_zero(&pHddCtx-> tdlsConnInfo[staIdx]. peerMac, QDF_MAC_ADDR_SIZE); @@ -3498,7 +3498,7 @@ hdd_indicate_cckm_pre_auth(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) pos += nBytes; freeBytes -= nBytes; - cdf_mem_copy(pos, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(pos, pRoamInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); pos += QDF_MAC_ADDR_SIZE; freeBytes -= QDF_MAC_ADDR_SIZE; @@ -3685,7 +3685,7 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter, freeBytes -= nBytes; /* Copy total Beacon report data length */ - cdf_mem_copy(pos, (char *)&tot_bcn_ieLen, + qdf_mem_copy(pos, (char *)&tot_bcn_ieLen, sizeof(tot_bcn_ieLen)); pos += sizeof(tot_bcn_ieLen); freeBytes -= sizeof(tot_bcn_ieLen); @@ -3767,7 +3767,7 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter, bcnRepBssInfo[i + lastSent]. bcnReportFields); - cdf_mem_copy(pos, + qdf_mem_copy(pos, (char *)&pRoamInfo-> pEseBcnReportRsp->bcnRepBssInfo[i + lastSent]. @@ -3779,12 +3779,12 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter, len = pRoamInfo->pEseBcnReportRsp-> bcnRepBssInfo[i + lastSent].ieLen; - cdf_mem_copy(pos, (char *)&len, sizeof(len)); + qdf_mem_copy(pos, (char *)&len, sizeof(len)); pos += sizeof(len); freeBytes -= sizeof(len); /* copy IE from scan results */ - cdf_mem_copy(pos, + qdf_mem_copy(pos, (char *)pRoamInfo-> pEseBcnReportRsp->bcnRepBssInfo[i + lastSent]. @@ -4387,9 +4387,9 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter, * For right now, I assume setASSOCIATE() has passed * in the bssid. */ - cdf_mem_copy(PMKIDCache[i].BSSID.bytes, + qdf_mem_copy(PMKIDCache[i].BSSID.bytes, bssid, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(PMKIDCache[i].PMKID, + qdf_mem_copy(PMKIDCache[i].PMKID, dot11RSNIE.pmkid[i], CSR_RSN_PMKID_SIZE); } @@ -4468,7 +4468,7 @@ int hdd_set_genie_to_csr(hdd_adapter_t *pAdapter, eCsrAuthType *RSNAuthType) u8 bssid[ETH_ALEN]; /* MAC address of assoc peer */ /* MAC address of assoc peer */ /* But, this routine is only called when we are NOT associated. */ - cdf_mem_copy(bssid, + qdf_mem_copy(bssid, pWextState->roamProfile.BSSIDs.bssid, sizeof(bssid)); if (pWextState->WPARSNIE[0] == DOT11F_EID_RSN @@ -4759,9 +4759,9 @@ static int __iw_set_essid(struct net_device *dev, pWextState->roamProfile.SSIDs.SSIDList->SSID.length = wrqu->essid.length; - cdf_mem_zero(pWextState->roamProfile.SSIDs.SSIDList->SSID.ssId, + qdf_mem_zero(pWextState->roamProfile.SSIDs.SSIDList->SSID.ssId, sizeof(pWextState->roamProfile.SSIDs.SSIDList->SSID.ssId)); - cdf_mem_copy((void *)(pWextState->roamProfile.SSIDs.SSIDList->SSID. + qdf_mem_copy((void *)(pWextState->roamProfile.SSIDs.SSIDList->SSID. ssId), extra, wrqu->essid.length); if (IW_AUTH_WPA_VERSION_WPA == pWextState->wpaVersion || IW_AUTH_WPA_VERSION_WPA2 == pWextState->wpaVersion) { @@ -5380,7 +5380,7 @@ static int __iw_set_ap_address(struct net_device *dev, pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data; hddLog(LOG1, FL(" " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pMacAddress)); - cdf_mem_copy(pHddStaCtx->conn_info.bssId.bytes, pMacAddress, + qdf_mem_copy(pHddStaCtx->conn_info.bssId.bytes, pMacAddress, sizeof(struct qdf_mac_addr)); EXIT(); @@ -5438,7 +5438,7 @@ static int __iw_get_ap_address(struct net_device *dev, if (pHddStaCtx->conn_info.connState == eConnectionState_Associated || eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState) { - cdf_mem_copy(wrqu->ap_addr.sa_data, + qdf_mem_copy(wrqu->ap_addr.sa_data, pHddStaCtx->conn_info.bssId.bytes, QDF_MAC_ADDR_SIZE); } else { diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index b85921b889be..daa65a04475e 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3944,7 +3944,7 @@ static void update_mac_from_string(hdd_context_t *pHddCtx, break; } if (res == 0 && !qdf_is_macaddr_zero(&macaddr[i])) { - cdf_mem_copy((uint8_t *) &pHddCtx->config-> + qdf_mem_copy((uint8_t *) &pHddCtx->config-> intfMacAddr[i].bytes[0], (uint8_t *) &macaddr[i].bytes[0], QDF_MAC_ADDR_SIZE); @@ -5319,7 +5319,7 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx) update_mac_from_string(pHddCtx, &macTable[0], i); - cdf_mem_copy(&customMacAddr, + qdf_mem_copy(&customMacAddr, &pHddCtx->config->intfMacAddr[0].bytes[0], sizeof(tSirMacAddr)); sme_set_custom_mac_addr(customMacAddr); @@ -5370,16 +5370,16 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) hddLog(LOG1, "%s: qcom_cfg.ini Size %zu", __func__, fw->size); - buffer = (char *)cdf_mem_malloc(fw->size); + buffer = (char *)qdf_mem_malloc(fw->size); if (NULL == buffer) { - hddLog(QDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure")); + hddLog(QDF_TRACE_LEVEL_FATAL, FL("qdf_mem_malloc failure")); release_firmware(fw); return QDF_STATUS_E_NOMEM; } pTemp = buffer; - cdf_mem_copy((void *)buffer, (void *)fw->data, fw->size); + qdf_mem_copy((void *)buffer, (void *)fw->data, fw->size); size = fw->size; while (buffer != NULL) { @@ -5435,7 +5435,7 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx) config_exit: release_firmware(fw); - cdf_mem_free(pTemp); + qdf_mem_free(pTemp); return qdf_status; } @@ -6379,13 +6379,13 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) struct hdd_config *pConfig = pHddCtx->config; - smeConfig = cdf_mem_malloc(sizeof(*smeConfig)); + smeConfig = qdf_mem_malloc(sizeof(*smeConfig)); if (NULL == smeConfig) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: unable to allocate smeConfig", __func__); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(smeConfig, sizeof(*smeConfig)); + qdf_mem_zero(smeConfig, sizeof(*smeConfig)); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d", @@ -6677,7 +6677,7 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) status); } - cdf_mem_free(smeConfig); + qdf_mem_free(smeConfig); return status; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index bfa18537c8d1..67e1a376e35d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1216,12 +1216,12 @@ int wlan_hdd_sap_cfg_dfs_override(hdd_adapter_t *adapter) * func for Sec AP and realloc for Pri AP ch list size */ if (sap_config->acs_cfg.ch_list) - cdf_mem_free(sap_config->acs_cfg.ch_list); + qdf_mem_free(sap_config->acs_cfg.ch_list); - cdf_mem_copy(&sap_config->acs_cfg, + qdf_mem_copy(&sap_config->acs_cfg, &con_sap_config->acs_cfg, sizeof(struct sap_acs_cfg)); - sap_config->acs_cfg.ch_list = cdf_mem_malloc( + sap_config->acs_cfg.ch_list = qdf_mem_malloc( sizeof(uint8_t) * con_sap_config->acs_cfg.ch_list_count); if (!sap_config->acs_cfg.ch_list) { @@ -1229,7 +1229,7 @@ int wlan_hdd_sap_cfg_dfs_override(hdd_adapter_t *adapter) return -ENOMEM; } - cdf_mem_copy(sap_config->acs_cfg.ch_list, + qdf_mem_copy(sap_config->acs_cfg.ch_list, con_sap_config->acs_cfg.ch_list, con_sap_config->acs_cfg.ch_list_count); @@ -1345,7 +1345,7 @@ static int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter) acs_event_callback = hdd_hostapd_sap_event_cb; - cdf_mem_copy(sap_config->self_macaddr.bytes, + qdf_mem_copy(sap_config->self_macaddr.bytes, adapter->macAddressCurrent.bytes, sizeof(struct qdf_mac_addr)); hddLog(LOG1, FL("ACS Started for wlan%d"), adapter->dev->ifindex); status = wlansap_acs_chselect( @@ -1429,7 +1429,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, goto out; } sap_config = &adapter->sessionCtx.ap.sapConfig; - cdf_mem_zero(&sap_config->acs_cfg, sizeof(struct sap_acs_cfg)); + qdf_mem_zero(&sap_config->acs_cfg, sizeof(struct sap_acs_cfg)); status = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ACS_MAX, data, data_len, NULL); @@ -1492,13 +1492,13 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, sap_config->acs_cfg.ch_list_count = nla_len( tb[QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST]); if (sap_config->acs_cfg.ch_list_count) { - sap_config->acs_cfg.ch_list = cdf_mem_malloc( + sap_config->acs_cfg.ch_list = qdf_mem_malloc( sizeof(uint8_t) * sap_config->acs_cfg.ch_list_count); if (sap_config->acs_cfg.ch_list == NULL) goto out; - cdf_mem_copy(sap_config->acs_cfg.ch_list, tmp, + qdf_mem_copy(sap_config->acs_cfg.ch_list, tmp, sap_config->acs_cfg.ch_list_count); } } else if (tb[QCA_WLAN_VENDOR_ATTR_ACS_FREQ_LIST]) { @@ -1508,7 +1508,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_ACS_FREQ_LIST]) / sizeof(uint32_t); if (sap_config->acs_cfg.ch_list_count) { - sap_config->acs_cfg.ch_list = cdf_mem_malloc( + sap_config->acs_cfg.ch_list = qdf_mem_malloc( sap_config->acs_cfg.ch_list_count); if (sap_config->acs_cfg.ch_list == NULL) { hddLog(LOGE, FL("ACS config alloc fail")); @@ -1962,9 +1962,9 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, hddLog(LOGE, FL("Invalid ATTR")); return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } if (!tb[QCA_WLAN_VENDOR_ATTR_SET_SCANNING_MAC_OUI]) { @@ -1984,7 +1984,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, } return 0; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -2210,7 +2210,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, goto fail; } session_id = pAdapter->sessionId; - cdf_mem_set(&roam_params, sizeof(roam_params), 0); + qdf_mem_set(&roam_params, sizeof(roam_params), 0); cmd_type = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_ROAMING_SUBCMD]); if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_REQ_ID]) { hddLog(LOGE, FL("attr request id failed")); @@ -2742,8 +2742,8 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, sme_update_roam_key_mgmt_offload_enabled(hdd_ctx_ptr->hHal, hdd_adapter_ptr->sessionId, true); - cdf_mem_zero(&local_pmk, SIR_ROAM_SCAN_PSK_SIZE); - cdf_mem_copy(local_pmk, data, data_len); + qdf_mem_zero(&local_pmk, SIR_ROAM_SCAN_PSK_SIZE); + qdf_mem_copy(local_pmk, data, data_len); sme_roam_set_psk_pmk(WLAN_HDD_GET_HAL_CTX(hdd_adapter_ptr), hdd_adapter_ptr->sessionId, local_pmk, data_len); return 0; @@ -3564,7 +3564,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, return -ENOTSUPP; } - add_req = cdf_mem_malloc(sizeof(*add_req)); + add_req = qdf_mem_malloc(sizeof(*add_req)); if (!add_req) { hddLog(LOGE, FL("memory allocation failed")); return -ENOMEM; @@ -3633,12 +3633,12 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, } len = 0; - cdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(&add_req->ucPattern[0], dst_addr.bytes, QDF_MAC_ADDR_SIZE); len += QDF_MAC_ADDR_SIZE; - cdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes, + qdf_mem_copy(&add_req->ucPattern[len], add_req->mac_address.bytes, QDF_MAC_ADDR_SIZE); len += QDF_MAC_ADDR_SIZE; - cdf_mem_copy(&add_req->ucPattern[len], ð_type, 2); + qdf_mem_copy(&add_req->ucPattern[len], ð_type, 2); len += 2; /* @@ -3647,7 +3647,7 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, * | 14 bytes Ethernet (802.3) header | IP header and payload | * ------------------------------------------------------------ */ - cdf_mem_copy(&add_req->ucPattern[len], + qdf_mem_copy(&add_req->ucPattern[len], nla_data(tb[PARAM_IP_PACKET]), add_req->ucPtrnSize); add_req->ucPtrnSize += len; @@ -3668,11 +3668,11 @@ wlan_hdd_add_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, } EXIT(); - cdf_mem_free(add_req); + qdf_mem_free(add_req); return 0; fail: - cdf_mem_free(add_req); + qdf_mem_free(add_req); return -EINVAL; } @@ -3712,7 +3712,7 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, return -EINVAL; } - del_req = cdf_mem_malloc(sizeof(*del_req)); + del_req = qdf_mem_malloc(sizeof(*del_req)); if (!del_req) { hddLog(LOGE, FL("memory allocation failed")); return -ENOMEM; @@ -3732,11 +3732,11 @@ wlan_hdd_del_tx_ptrn(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, } EXIT(); - cdf_mem_free(del_req); + qdf_mem_free(del_req); return 0; fail: - cdf_mem_free(del_req); + qdf_mem_free(del_req); return -EINVAL; } @@ -4348,7 +4348,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, return -EINVAL; } - cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), + qdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]), QDF_MAC_ADDR_SIZE); hddLog(QDF_TRACE_LEVEL_INFO, FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"), @@ -4359,7 +4359,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if ((hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) || - !cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes, + qdf_mem_cmp(hdd_sta_ctx->conn_info.bssId.bytes, peer_mac, QDF_MAC_ADDR_SIZE)) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("Not Associated to mac "MAC_ADDRESS_STR), @@ -4378,7 +4378,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, if (adapter->aStaInfo[sta_id].isUsed && !qdf_is_macaddr_broadcast( &adapter->aStaInfo[sta_id].macAddrSTA) && - cdf_mem_compare( + !qdf_mem_cmp( &adapter->aStaInfo[sta_id].macAddrSTA.bytes, peer_mac, QDF_MAC_ADDR_SIZE)) break; @@ -5675,7 +5675,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); setKey.keyId = key_index; /* Store Key ID */ setKey.encType = eCSR_ENCRYPT_TYPE_WPI; /* SET WAPI Encryption */ setKey.keyDirection = eSIR_TX_RX; /* Key Directionn both TX and RX */ @@ -5683,7 +5683,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index, if (!mac_addr || is_broadcast_ether_addr(mac_addr)) { qdf_set_macaddr_broadcast(&setKey.peerMac); } else { - cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } setKey.keyLength = key_Len; pKeyPtr = setKey.Key; @@ -5802,13 +5802,13 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) uint8_t srv_ip[IPADDR_NUM_ENTRIES]; uint8_t num; uint32_t temp; - pDhcpSrvInfo = cdf_mem_malloc(sizeof(*pDhcpSrvInfo)); + pDhcpSrvInfo = qdf_mem_malloc(sizeof(*pDhcpSrvInfo)); if (NULL == pDhcpSrvInfo) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: could not allocate tDhcpSrvOffloadInfo!", __func__); return; } - cdf_mem_zero(pDhcpSrvInfo, sizeof(*pDhcpSrvInfo)); + qdf_mem_zero(pDhcpSrvInfo, sizeof(*pDhcpSrvInfo)); pDhcpSrvInfo->vdev_id = pHostapdAdapter->sessionId; pDhcpSrvInfo->dhcpSrvOffloadEnabled = true; pDhcpSrvInfo->dhcpClientNum = pHddCtx->config->dhcpMaxNumClients; @@ -5845,7 +5845,7 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter) hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "%s: enable DHCP Server offload successfully!", __func__); end: - cdf_mem_free(pDhcpSrvInfo); + qdf_mem_free(pDhcpSrvInfo); return; } #endif /* DHCP_SERVER_OFFLOAD */ @@ -6327,7 +6327,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); - cdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE); if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) || (pAdapter->device_mode == WLAN_HDD_P2P_GO)) { @@ -6442,20 +6442,20 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, __func__, StaParams.supported_channels_len); } - cdf_mem_copy(StaParams.supported_oper_classes, + qdf_mem_copy(StaParams.supported_oper_classes, params->supported_oper_classes, params->supported_oper_classes_len); StaParams.supported_oper_classes_len = params->supported_oper_classes_len; if (0 != params->ext_capab_len) - cdf_mem_copy(StaParams.extn_capability, + qdf_mem_copy(StaParams.extn_capability, params->ext_capab, sizeof(StaParams.extn_capability)); if (NULL != params->ht_capa) { StaParams.htcap_present = 1; - cdf_mem_copy(&StaParams.HTCap, params->ht_capa, + qdf_mem_copy(&StaParams.HTCap, params->ht_capa, sizeof(tSirHTCap)); } @@ -6477,7 +6477,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, if (0 != StaParams.supported_rates_len) { int i = 0; - cdf_mem_copy(StaParams.supported_rates, + qdf_mem_copy(StaParams.supported_rates, params->supported_rates, StaParams.supported_rates_len); QDF_TRACE(QDF_MODULE_ID_HDD, @@ -6494,7 +6494,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, if (NULL != params->vht_capa) { StaParams.vhtcap_present = 1; - cdf_mem_copy(&StaParams.VHTCap, + qdf_mem_copy(&StaParams.VHTCap, params->vht_capa, sizeof(tSirVHTCap)); } @@ -6631,10 +6631,10 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, __func__, key_index, params->key_len); /*extract key idx, key len and key */ - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); setKey.keyId = key_index; setKey.keyLength = params->key_len; - cdf_mem_copy(&setKey.Key[0], params->key, params->key_len); + qdf_mem_copy(&setKey.Key[0], params->key, params->key_len); switch (params->cipher) { case WLAN_CIPHER_SUITE_WEP40: @@ -6650,7 +6650,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, u8 *pKey = &setKey.Key[0]; setKey.encType = eCSR_ENCRYPT_TYPE_TKIP; - cdf_mem_zero(pKey, CSR_MAX_KEY_LEN); + qdf_mem_zero(pKey, CSR_MAX_KEY_LEN); /*Supplicant sends the 32bytes key in this order @@ -6668,13 +6668,13 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, <---16bytes---><--8bytes--><--8bytes--> */ /* Copy the Temporal Key 1 (TK1) */ - cdf_mem_copy(pKey, params->key, 16); + qdf_mem_copy(pKey, params->key, 16); /*Copy the rx mic first */ - cdf_mem_copy(&pKey[16], ¶ms->key[24], 8); + qdf_mem_copy(&pKey[16], ¶ms->key[24], 8); /*Copy the tx mic */ - cdf_mem_copy(&pKey[24], ¶ms->key[16], 8); + qdf_mem_copy(&pKey[24], ¶ms->key[16], 8); break; } @@ -6686,7 +6686,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, #ifdef FEATURE_WLAN_WAPI case WLAN_CIPHER_SUITE_SMS4: { - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); wlan_hdd_cfg80211_set_key_wapi(pAdapter, key_index, mac_addr, params->key, params->key_len); @@ -6731,7 +6731,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s- %d: setting pairwise key", __func__, __LINE__); setKey.keyDirection = eSIR_TX_RX; - cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) { /* if a key is already installed, block all subsequent ones */ @@ -6754,7 +6754,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, } /*Save the keys here and call sme_roam_set_key for setting the PTK after peer joins the IBSS network */ - cdf_mem_copy(&pAdapter->sessionCtx.station.ibss_enc_key, + qdf_mem_copy(&pAdapter->sessionCtx.station.ibss_enc_key, &setKey, sizeof(tCsrRoamSetKey)); pAdapter->sessionCtx.station.ibss_enc_key_installed = 1; @@ -6783,10 +6783,10 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, if (pairwise || eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == setKey.encType || eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == setKey.encType) - cdf_mem_copy(&ap_ctx->wepKey[key_index], &setKey, + qdf_mem_copy(&ap_ctx->wepKey[key_index], &setKey, sizeof(tCsrRoamSetKey)); else - cdf_mem_copy(&ap_ctx->groupKey, &setKey, + qdf_mem_copy(&ap_ctx->groupKey, &setKey, sizeof(tCsrRoamSetKey)); } else if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) || @@ -6812,7 +6812,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, pWextState->roamProfile.Keys.defaultIndex = key_index; - cdf_mem_copy(&pWextState->roamProfile.Keys. + qdf_mem_copy(&pWextState->roamProfile.Keys. KeyMaterial[key_index][0], params->key, params->key_len); @@ -7118,11 +7118,11 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, hddLog(LOG2, FL("Default tx key index %d"), key_index); Keys->defaultIndex = (u8) key_index; - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); setKey.keyId = key_index; setKey.keyLength = Keys->KeyLength[key_index]; - cdf_mem_copy(&setKey.Key[0], + qdf_mem_copy(&setKey.Key[0], &Keys->KeyMaterial[key_index][0], Keys->KeyLength[key_index]); @@ -7842,36 +7842,36 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, pRoamProfile->SSIDs.numOfSSIDs = 1; pRoamProfile->SSIDs.SSIDList->SSID.length = ssid_len; - cdf_mem_zero(pRoamProfile->SSIDs.SSIDList->SSID.ssId, + qdf_mem_zero(pRoamProfile->SSIDs.SSIDList->SSID.ssId, sizeof(pRoamProfile->SSIDs.SSIDList->SSID.ssId)); - cdf_mem_copy((void *)(pRoamProfile->SSIDs.SSIDList->SSID.ssId), + qdf_mem_copy((void *)(pRoamProfile->SSIDs.SSIDList->SSID.ssId), ssid, ssid_len); if (bssid) { pRoamProfile->BSSIDs.numOfBSSIDs = 1; - cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), + qdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), bssid, QDF_MAC_ADDR_SIZE); /* Save BSSID in seperate variable as well, as RoamProfile BSSID is getting zeroed out in the association process. And in case of join failure we should send valid BSSID to supplicant */ - cdf_mem_copy((void *)(pWextState->req_bssId.bytes), + qdf_mem_copy((void *)(pWextState->req_bssId.bytes), bssid, QDF_MAC_ADDR_SIZE); } else if (bssid_hint) { pRoamProfile->BSSIDs.numOfBSSIDs = 1; - cdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), + qdf_mem_copy((void *)(pRoamProfile->BSSIDs.bssid), bssid_hint, QDF_MAC_ADDR_SIZE); /* Save BSSID in separate variable as well, as RoamProfile BSSID is getting zeroed out in the association process. And in case of join failure we should send valid BSSID to supplicant */ - cdf_mem_copy((void *)(pWextState->req_bssId.bytes), + qdf_mem_copy((void *)(pWextState->req_bssId.bytes), bssid_hint, QDF_MAC_ADDR_SIZE); hddLog(LOGW, FL(" bssid_hint "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(bssid_hint)); } else { - cdf_mem_zero((void *)(pRoamProfile->BSSIDs.bssid), + qdf_mem_zero((void *)(pRoamProfile->BSSIDs.bssid), QDF_MAC_ADDR_SIZE); } @@ -8011,12 +8011,12 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, return 0; } - sme_config = cdf_mem_malloc(sizeof(*sme_config)); + sme_config = qdf_mem_malloc(sizeof(*sme_config)); if (!sme_config) { hdd_err("unable to allocate sme_config"); return -ENOMEM; } - cdf_mem_zero(sme_config, sizeof(*sme_config)); + qdf_mem_zero(sme_config, sizeof(*sme_config)); sme_get_config_param(pHddCtx->hHal, sme_config); /* These values are not sessionized. So, any change in these SME * configs on an older or parallel interface will affect the @@ -8028,7 +8028,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, sme_config->csrConfig.channelBondingMode24GHz = pHddCtx->config->nChannelBondingMode24GHz; sme_update_config(pHddCtx->hHal, sme_config); - cdf_mem_free(sme_config); + qdf_mem_free(sme_config); status = sme_roam_connect(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, pRoamProfile, @@ -8704,7 +8704,7 @@ int wlan_hdd_cfg80211_set_privacy(hdd_adapter_t *pAdapter, hddLog(LOG1, FL("setting default wep key, key_idx = %hu key_len %hu"), key_idx, key_len); - cdf_mem_copy(&pWextState->roamProfile. + qdf_mem_copy(&pWextState->roamProfile. Keys. KeyMaterial[key_idx][0], req->key, key_len); @@ -9224,7 +9224,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(hdd_adapter_t *pAdapter, ENTER(); pWextState->wpaVersion = IW_AUTH_WPA_VERSION_DISABLED; - cdf_mem_zero(&pHddStaCtx->ibss_enc_key, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&pHddStaCtx->ibss_enc_key, sizeof(tCsrRoamSetKey)); pHddStaCtx->ibss_enc_key_installed = 0; if (params->ie_len && (NULL != params->ie)) { @@ -9425,7 +9425,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, FL("ccmCfgStInt failed for WNI_CFG_IBSS_AUTO_BSSID")); return -EIO; } - cdf_mem_copy(bssid.bytes, params->bssid, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(bssid.bytes, params->bssid, QDF_MAC_ADDR_SIZE); } else if (pHddCtx->config->isCoalesingInIBSSAllowed == 0) { if (sme_cfg_set_int(pHddCtx->hHal, WNI_CFG_IBSS_AUTO_BSSID, 0) == QDF_STATUS_E_FAILURE) { @@ -9869,7 +9869,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if ((pAdapter->aStaInfo[i].isUsed) && (!pAdapter->aStaInfo[i]. isDeauthInProgress)) { - cdf_mem_copy( + qdf_mem_copy( mac, pAdapter->aStaInfo[i]. macAddrSTA.bytes, @@ -10162,8 +10162,8 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter); - cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE); + qdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE); /* Add to the PMKSA ID Cache in CSR */ result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId, @@ -10675,7 +10675,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, MAC_ADDR_ARRAY( params->mac_addrs[i].addr)); - cdf_mem_copy(&pConfig->accept_mac[i], + qdf_mem_copy(&pConfig->accept_mac[i], params->mac_addrs[i].addr, sizeof(qcmacaddr)); } @@ -10688,7 +10688,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, MAC_ADDR_ARRAY( params->mac_addrs[i].addr)); - cdf_mem_copy(&pConfig->deny_mac[i], + qdf_mem_copy(&pConfig->deny_mac[i], params->mac_addrs[i].addr, sizeof(qcmacaddr)); } @@ -10853,20 +10853,20 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy, return -EINVAL; hb_params = - (tSirLPHBReq *) cdf_mem_malloc(sizeof(tSirLPHBReq)); + (tSirLPHBReq *) qdf_mem_malloc(sizeof(tSirLPHBReq)); if (NULL == hb_params) { hddLog(LOGE, FL("Request Buffer Alloc Fail")); return -ENOMEM; } - cdf_mem_copy(hb_params, buf, buf_len); + qdf_mem_copy(hb_params, buf, buf_len); smeStatus = sme_lphb_config_req((tHalHandle) (pHddCtx->hHal), hb_params, wlan_hdd_cfg80211_lphb_ind_handler); if (QDF_STATUS_SUCCESS != smeStatus) { hddLog(LOGE, "LPHB Config Fail, disable"); - cdf_mem_free(hb_params); + qdf_mem_free(hb_params); } return 0; } @@ -11016,7 +11016,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, return status; } - cdf_mem_zero(&sme_config, sizeof(tSmeConfigParams)); + qdf_mem_zero(&sme_config, sizeof(tSmeConfigParams)); sme_get_config_param(pHddCtx->hHal, &sme_config); switch (chandef->width) { case NL80211_CHAN_WIDTH_20: diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c index 1a9354eab607..8b7882e3990d 100644 --- a/core/hdd/src/wlan_hdd_conc_ut.c +++ b/core/hdd/src/wlan_hdd_conc_ut.c @@ -151,7 +151,7 @@ void clean_report(hdd_context_t *hdd_ctx) { uint32_t idx = 0; while (idx < NUMBER_OF_SCENARIO) { - cdf_mem_zero(&report[idx], sizeof(struct report_t)); + qdf_mem_zero(&report[idx], sizeof(struct report_t)); idx++; } report_idx = 0; @@ -229,12 +229,12 @@ void fill_report(hdd_context_t *hdd_ctx, char *title, MAX_ALLOWED_CHAR_IN_REPORT, reason); if (pcl) { - cdf_mem_zero(report[report_idx].pcl, + qdf_mem_zero(report[report_idx].pcl, sizeof(report[report_idx].pcl)); for (i = 0; i < MAX_NUM_CHAN; i++) { if (pcl[i] == 0) break; - cdf_mem_zero(buf, sizeof(buf)); + qdf_mem_zero(buf, sizeof(buf)); snprintf(buf, sizeof(buf), "%d ", pcl[i]); strlcat(report[report_idx].pcl, buf, sizeof(report[report_idx].pcl)); @@ -646,7 +646,7 @@ void wlan_hdd_one_connection_scenario(hdd_context_t *hdd_ctx) FL("Test failed - No. of connection is not 0")); return; } - cdf_mem_zero(pcl, sizeof(pcl)); + qdf_mem_zero(pcl, sizeof(pcl)); pcl_len = 0; pcl_type = get_pcl_from_first_conn_table(sub_type, system_pref); @@ -717,7 +717,7 @@ void wlan_hdd_two_connections_scenario(hdd_context_t *hdd_ctx, next_sub_type++; continue; } - cdf_mem_zero(pcl, sizeof(pcl)); + qdf_mem_zero(pcl, sizeof(pcl)); pcl_len = 0; pcl_type = get_pcl_from_second_conn_table(second_index, next_sub_type, system_pref, @@ -830,7 +830,7 @@ void wlan_hdd_three_connections_scenario(hdd_context_t *hdd_ctx, next_sub_type++; continue; } - cdf_mem_zero(pcl, sizeof(pcl)); + qdf_mem_zero(pcl, sizeof(pcl)); pcl_len = 0; pcl_type = get_pcl_from_third_conn_table( diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 80a18ddf7f6a..bf2239d8234d 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -349,7 +349,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Get command from user */ if (count <= MAX_USER_COMMAND_SIZE_FRAME) - cmd = cdf_mem_malloc(count + 1); + cmd = qdf_mem_malloc(count + 1); else { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Command length is larger than %d bytes.", @@ -365,7 +365,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, } if (copy_from_user(cmd, buf, count)) { - cdf_mem_free(cmd); + qdf_mem_free(cmd); return -EFAULT; } cmd[count] = '\0'; @@ -396,11 +396,11 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Delete pattern using index if duration is 0 */ if (!pattern_duration) { delPeriodicTxPtrnParams = - cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn)); + qdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn)); if (!delPeriodicTxPtrnParams) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); - cdf_mem_free(cmd); + qdf_mem_free(cmd); return -ENOMEM; } delPeriodicTxPtrnParams->ucPtrnId = pattern_idx; @@ -416,11 +416,11 @@ static ssize_t __wcnss_patterngen_write(struct file *file, "%s: sme_del_periodic_tx_ptrn() failed!", __func__); - cdf_mem_free(delPeriodicTxPtrnParams); + qdf_mem_free(delPeriodicTxPtrnParams); goto failure; } - cdf_mem_free(cmd); - cdf_mem_free(delPeriodicTxPtrnParams); + qdf_mem_free(cmd); + qdf_mem_free(delPeriodicTxPtrnParams); return count; } @@ -462,11 +462,11 @@ static ssize_t __wcnss_patterngen_write(struct file *file, goto failure; } - addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn)); + addPeriodicTxPtrnParams = qdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn)); if (!addPeriodicTxPtrnParams) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed!")); - cdf_mem_free(cmd); + qdf_mem_free(cmd); return -ENOMEM; } @@ -493,16 +493,16 @@ static ssize_t __wcnss_patterngen_write(struct file *file, QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_add_periodic_tx_ptrn() failed!", __func__); - cdf_mem_free(addPeriodicTxPtrnParams); + qdf_mem_free(addPeriodicTxPtrnParams); goto failure; } - cdf_mem_free(cmd); - cdf_mem_free(addPeriodicTxPtrnParams); + qdf_mem_free(cmd); + qdf_mem_free(addPeriodicTxPtrnParams); EXIT(); return count; failure: - cdf_mem_free(cmd); + qdf_mem_free(cmd); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index f95bebbff0c8..8cd8b414f8c0 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -1733,9 +1733,9 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -1778,7 +1778,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, EXIT(); return ret; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -1867,9 +1867,9 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -1923,7 +1923,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } /* @@ -2015,9 +2015,9 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -2136,7 +2136,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -2212,9 +2212,9 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -2333,7 +2333,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_set_significant_change failed(err=%d)"), status); - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -2356,7 +2356,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -3159,7 +3159,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { hddLog(LOGE, FL("memory allocation failed")); return -ENOMEM; @@ -3279,7 +3279,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } /* @@ -3369,9 +3369,9 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -3418,7 +3418,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } /* @@ -3496,9 +3496,9 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -3547,7 +3547,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -3621,9 +3621,9 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy return -EINVAL; } - pReqMsg = cdf_mem_malloc(sizeof(*pReqMsg)); + pReqMsg = qdf_mem_malloc(sizeof(*pReqMsg)); if (!pReqMsg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -3650,7 +3650,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, FL("sme_reset_significant_change failed(err=%d)"), status); - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -3673,7 +3673,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy return retval; fail: - cdf_mem_free(pReqMsg); + qdf_mem_free(pReqMsg); return -EINVAL; } @@ -3749,7 +3749,7 @@ static int hdd_extscan_epno_fill_network_list( req_msg->networks[index].ssid.length = ssid_len; hddLog(LOG1, FL("network ssid length %d"), ssid_len); ssid = nla_data(network[QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_EPNO_NETWORK_SSID]); - cdf_mem_copy(req_msg->networks[index].ssid.ssId, + qdf_mem_copy(req_msg->networks[index].ssid.ssId, ssid, ssid_len); hddLog(LOG1, FL("Ssid (%.*s)"), req_msg->networks[index].ssid.length, @@ -3845,12 +3845,12 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, len = sizeof(*req_msg) + (num_networks * sizeof(struct wifi_epno_network)); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->num_networks = num_networks; /* Parse and fetch request Id */ @@ -3875,11 +3875,11 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, } EXIT(); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return 0; fail: - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return -EINVAL; } @@ -3962,7 +3962,7 @@ static int hdd_extscan_passpoint_fill_network_list( hddLog(LOGE, FL("Invalid realm size %d"), len); return -EINVAL; } - cdf_mem_copy(req_msg->networks[index].realm, + qdf_mem_copy(req_msg->networks[index].realm, nla_data(network[QCA_WLAN_VENDOR_ATTR_PNO_PASSPOINT_NETWORK_PARAM_REALM]), len); hddLog(LOG1, FL("realm len %d"), len); @@ -4048,10 +4048,10 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, tb[QCA_WLAN_VENDOR_ATTR_PNO_PASSPOINT_LIST_PARAM_NUM]); hddLog(LOG1, FL("num networks %u"), num_networks); - req_msg = cdf_mem_malloc(sizeof(*req_msg) + + req_msg = qdf_mem_malloc(sizeof(*req_msg) + (num_networks * sizeof(req_msg->networks[0]))); if (!req_msg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } req_msg->num_networks = num_networks; @@ -4079,11 +4079,11 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, } EXIT(); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return 0; fail: - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return -EINVAL; } @@ -4155,9 +4155,9 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, return -EINVAL; } - req_msg = cdf_mem_malloc(sizeof(*req_msg)); + req_msg = qdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -4181,11 +4181,11 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, } EXIT(); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return 0; fail: - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return -EINVAL; } @@ -4286,9 +4286,9 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, return -EINVAL; } - request = cdf_mem_malloc(sizeof(*request)); + request = qdf_mem_malloc(sizeof(*request)); if (!request) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -4390,7 +4390,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, goto fail; } - cdf_mem_free(request); + qdf_mem_free(request); /* request was sent -- wait for the response */ rc = wait_for_completion_timeout(&context->response_event, @@ -4411,7 +4411,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(request); + qdf_mem_free(request); return -EINVAL; } @@ -4506,9 +4506,9 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, return -EINVAL; } - request = cdf_mem_malloc(sizeof(*request)); + request = qdf_mem_malloc(sizeof(*request)); if (!request) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -4540,7 +4540,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, goto fail; } - cdf_mem_free(request); + qdf_mem_free(request); /* request was sent -- wait for the response */ rc = wait_for_completion_timeout(&context->response_event, @@ -4561,7 +4561,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, return retval; fail: - cdf_mem_free(request); + qdf_mem_free(request); return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 8b33ca827389..5a3029318fda 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -281,7 +281,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, #endif /* QCA_WIFI_FTM */ /*Open the WMA module */ - cdf_mem_set(&mac_openParms, sizeof(mac_openParms), 0); + qdf_mem_set(&mac_openParms, sizeof(mac_openParms), 0); mac_openParms.driverType = eDRIVER_TYPE_MFG; hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext); @@ -1019,7 +1019,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) struct ar6k_testmode_cmd_data *cmd_data; cmd_data = (struct ar6k_testmode_cmd_data *) - cdf_mem_malloc(sizeof(*cmd_data)); + qdf_mem_malloc(sizeof(*cmd_data)); if (!cmd_data) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, @@ -1027,21 +1027,21 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) return QDF_STATUS_E_NOMEM; } - cmd_data->data = cdf_mem_malloc(len); + cmd_data->data = qdf_mem_malloc(len); if (!cmd_data->data) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("Failed to allocate FTM command data buffer")); - cdf_mem_free(cmd_data); + qdf_mem_free(cmd_data); return QDF_STATUS_E_NOMEM; } cmd_data->len = len; - cdf_mem_copy(cmd_data->data, data, len); + qdf_mem_copy(cmd_data->data, data, len); if (wlan_ftm_postmsg((uint8_t *) cmd_data, sizeof(*cmd_data))) { - cdf_mem_free(cmd_data->data); - cdf_mem_free(cmd_data); + qdf_mem_free(cmd_data->data); + qdf_mem_free(cmd_data); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index 7149bb468de1..5fbb8e4082b4 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -311,14 +311,14 @@ static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) ENTER(); - green_ap = cdf_mem_malloc(sizeof(*green_ap)); + green_ap = qdf_mem_malloc(sizeof(*green_ap)); if (!green_ap) { hdd_alert("Memory allocation for Green-AP failed!"); status = QDF_STATUS_E_NOMEM; goto error; } - cdf_mem_zero(green_ap, sizeof(*green_ap)); + qdf_mem_zero(green_ap, sizeof(*green_ap)); green_ap->ps_state = GREEN_AP_PS_OFF_STATE; green_ap->ps_event = 0; green_ap->num_nodes = 0; @@ -365,8 +365,8 @@ static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) hdd_notice("Cannot deallocate Green-AP's timer"); /* release memory */ - cdf_mem_zero(green_ap, sizeof(*green_ap)); - cdf_mem_free(green_ap); + qdf_mem_zero(green_ap, sizeof(*green_ap)); + qdf_mem_free(green_ap); hdd_ctx->green_ap_ctx = NULL; done: diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index bab97b7775ab..b181351c7078 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1572,7 +1572,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pSapEvent->sapevt.sapPBCProbeReqEvent. WPSPBCProbeReq.probeReqIELen; - cdf_mem_copy(pHddApCtx->WPSPBCProbeReq.probeReqIE, + qdf_mem_copy(pHddApCtx->WPSPBCProbeReq.probeReqIE, pSapEvent->sapevt.sapPBCProbeReqEvent. WPSPBCProbeReq.probeReqIE, pHddApCtx->WPSPBCProbeReq.probeReqIELen); @@ -1608,7 +1608,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pAssocStasArray++; } } - cdf_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas); /* Release caller allocated memory here */ + qdf_mem_free(pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas); /* Release caller allocated memory here */ pSapEvent->sapevt.sapAssocStaListEvent.pAssocStas = NULL; return QDF_STATUS_SUCCESS; case eSAP_REMAIN_CHAN_READY: @@ -2269,7 +2269,7 @@ static QDF_STATUS hdd_print_acl(hdd_adapter_t *pHostapdAdapter) #else p_cds_gctx = (WLAN_HDD_GET_CTX(pHostapdAdapter))->pcds_context; #endif - cdf_mem_zero(&MacList[0], sizeof(MacList)); + qdf_mem_zero(&MacList[0], sizeof(MacList)); if (QDF_STATUS_SUCCESS == wlansap_get_acl_mode(p_cds_gctx, &acl_mode)) { pr_info("******** ACL MODE *********\n"); switch (acl_mode) { @@ -3854,7 +3854,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev, WPSPBCProbeReqIEs.probeReqIELen = pHddApCtx->WPSPBCProbeReq.probeReqIELen; - cdf_mem_copy(&WPSPBCProbeReqIEs.probeReqIE, + qdf_mem_copy(&WPSPBCProbeReqIEs.probeReqIE, pHddApCtx->WPSPBCProbeReq.probeReqIE, WPSPBCProbeReqIEs.probeReqIELen); qdf_copy_macaddr(&WPSPBCProbeReqIEs.macaddr, @@ -4024,13 +4024,13 @@ static int __iw_set_ap_encodeext(struct net_device *dev, if (!ext->key_len) return ret; - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); setKey.keyId = key_index; setKey.keyLength = ext->key_len; if (ext->key_len <= CSR_MAX_KEY_LEN) { - cdf_mem_copy(&setKey.Key[0], ext->key, ext->key_len); + qdf_mem_copy(&setKey.Key[0], ext->key, ext->key_len); } if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { @@ -4040,12 +4040,12 @@ static int __iw_set_ap_encodeext(struct net_device *dev, } else { setKey.keyDirection = eSIR_TX_RX; - cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, + qdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, QDF_MAC_ADDR_SIZE); } if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { setKey.keyDirection = eSIR_TX_DEFAULT; - cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, + qdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, QDF_MAC_ADDR_SIZE); } @@ -4071,7 +4071,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, setKey.encType = eCSR_ENCRYPT_TYPE_TKIP; - cdf_mem_zero(pKey, CSR_MAX_KEY_LEN); + qdf_mem_zero(pKey, CSR_MAX_KEY_LEN); /*Supplicant sends the 32bytes key in this order @@ -4089,13 +4089,13 @@ static int __iw_set_ap_encodeext(struct net_device *dev, <---16bytes---><--8bytes--><--8bytes--> */ /* Copy the Temporal Key 1 (TK1) */ - cdf_mem_copy(pKey, ext->key, 16); + qdf_mem_copy(pKey, ext->key, 16); /*Copy the rx mic first */ - cdf_mem_copy(&pKey[16], &ext->key[24], 8); + qdf_mem_copy(&pKey[16], &ext->key[24], 8); /*Copy the tx mic */ - cdf_mem_copy(&pKey[24], &ext->key[16], 8); + qdf_mem_copy(&pKey[24], &ext->key[16], 8); } break; @@ -4494,13 +4494,13 @@ __iw_softap_setwpsie(struct net_device *dev, fwps_genie = wps_genie; - pSap_WPSIe = cdf_mem_malloc(sizeof(tSap_WPSIE)); + pSap_WPSIe = qdf_mem_malloc(sizeof(tSap_WPSIE)); if (NULL == pSap_WPSIe) { hddLog(LOGE, "CDF unable to allocate memory"); kfree(fwps_genie); return -ENOMEM; } - cdf_mem_zero(pSap_WPSIe, sizeof(tSap_WPSIE)); + qdf_mem_zero(pSap_WPSIe, sizeof(tSap_WPSIE)); hddLog(LOG1, FL("WPS IE type[0x%X] IE[0x%X], LEN[%d]"), wps_genie[0], wps_genie[1], wps_genie[2]); @@ -4511,7 +4511,7 @@ __iw_softap_setwpsie(struct net_device *dev, switch (wps_genie[0]) { case DOT11F_EID_WPA: if (wps_genie[1] < 2 + 4) { - cdf_mem_free(pSap_WPSIe); + qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); return -EINVAL; } else if (memcmp(&wps_genie[2], @@ -4623,7 +4623,7 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSBeaconIE. UUID_E, pos, @@ -4654,7 +4654,7 @@ __iw_softap_setwpsie(struct net_device *dev, "UNKNOWN TLV in WPS IE(%x)", (*pos << 8 | *(pos + 1))); - cdf_mem_free(pSap_WPSIe); + qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); return -EINVAL; } @@ -4667,7 +4667,7 @@ __iw_softap_setwpsie(struct net_device *dev, default: hddLog(LOGE, FL("Set UNKNOWN IE %X"), wps_genie[0]); - cdf_mem_free(pSap_WPSIe); + qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); return 0; } @@ -4677,7 +4677,7 @@ __iw_softap_setwpsie(struct net_device *dev, switch (wps_genie[0]) { case DOT11F_EID_WPA: if (wps_genie[1] < 2 + 4) { - cdf_mem_free(pSap_WPSIe); + qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); return -EINVAL; } else if (memcmp(&wps_genie[2], "\x00\x50\xf2\x04", 4) @@ -4806,7 +4806,7 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. UUID_E, pos, @@ -4826,7 +4826,7 @@ __iw_softap_setwpsie(struct net_device *dev, sapWPSProbeRspIE. Manufacture.num_name = length; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. Manufacture.name, @@ -4845,7 +4845,7 @@ __iw_softap_setwpsie(struct net_device *dev, pSap_WPSIe->sapwpsie. sapWPSProbeRspIE.ModelName. num_text = length; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. ModelName.text, @@ -4864,7 +4864,7 @@ __iw_softap_setwpsie(struct net_device *dev, sapWPSProbeRspIE. ModelNumber.num_text = length; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. ModelNumber.text, @@ -4883,7 +4883,7 @@ __iw_softap_setwpsie(struct net_device *dev, sapWPSProbeRspIE. SerialNumber.num_text = length; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. SerialNumber.text, @@ -4907,7 +4907,7 @@ __iw_softap_setwpsie(struct net_device *dev, PrimaryDeviceCategory); pos += 2; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. PrimaryDeviceOUI, @@ -4940,7 +4940,7 @@ __iw_softap_setwpsie(struct net_device *dev, pSap_WPSIe->sapwpsie. sapWPSProbeRspIE.DeviceName. num_text = length; - cdf_mem_copy(pSap_WPSIe-> + qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. DeviceName.text, @@ -5008,7 +5008,7 @@ __iw_softap_setwpsie(struct net_device *dev, #endif } - cdf_mem_free(pSap_WPSIe); + qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); EXIT(); return cdf_ret_status; @@ -6088,8 +6088,8 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) FL("WMI_PDEV_PARAM_BURST_ENABLE set failed %d"), ret); } pAdapter->sessionCtx.ap.sapConfig.acs_cfg.acs_mode = false; - cdf_mem_free(pAdapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); - cdf_mem_zero(&pAdapter->sessionCtx.ap.sapConfig.acs_cfg, + qdf_mem_free(pAdapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); + qdf_mem_zero(&pAdapter->sessionCtx.ap.sapConfig.acs_cfg, sizeof(struct sap_acs_cfg)); return status; @@ -6138,7 +6138,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, ether_setup(pWlanHostapdDev); /* Initialize the adapter context to zeros. */ - cdf_mem_zero(pHostapdAdapter, sizeof(hdd_adapter_t)); + qdf_mem_zero(pHostapdAdapter, sizeof(hdd_adapter_t)); pHostapdAdapter->dev = pWlanHostapdDev; pHostapdAdapter->pHddCtx = pHddCtx; pHostapdAdapter->magic = WLAN_HDD_ADAPTER_MAGIC; @@ -6159,9 +6159,9 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, pWlanHostapdDev->mtu = HDD_DEFAULT_MTU; pWlanHostapdDev->tx_queue_len = HDD_NETDEV_TX_QUEUE_LEN; - cdf_mem_copy(pWlanHostapdDev->dev_addr, (void *)macAddr, + qdf_mem_copy(pWlanHostapdDev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(pHostapdAdapter->macAddressCurrent.bytes, + qdf_mem_copy(pHostapdAdapter->macAddressCurrent.bytes, (void *)macAddr, sizeof(tSirMacAddr)); pHostapdAdapter->offloads_configured = false; @@ -6305,7 +6305,7 @@ static bool wlan_hdd_get_sap_obss(hdd_adapter_t *pHostapdAdapter) ie = wlan_hdd_cfg80211_get_ie_ptr(beacon->tail, beacon->tail_len, WLAN_EID_HT_CAPABILITY); if (ie && ie[1]) { - cdf_mem_copy(ht_cap_ie, &ie[2], DOT11F_IE_HTCAPS_MAX_LEN); + qdf_mem_copy(ht_cap_ie, &ie[2], DOT11F_IE_HTCAPS_MAX_LEN); dot11f_unpack_ie_ht_caps((tpAniSirGlobal)hdd_ctx->hHal, ht_cap_ie, ie[1], &dot11_ht_cap_ie); return dot11_ht_cap_ie.supportedChannelWidthSet; @@ -6464,7 +6464,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, sap_config->channel = channel; sap_config->ch_params.center_freq_seg1 = channel_seg2; - cdf_mem_zero(&smeConfig, sizeof(smeConfig)); + qdf_mem_zero(&smeConfig, sizeof(smeConfig)); sme_get_config_param(pHddCtx->hHal, &smeConfig); switch (channel_type) { case NL80211_CHAN_HT20: @@ -6590,7 +6590,7 @@ static int wlan_hdd_add_ie(hdd_adapter_t *pHostapdAdapter, uint8_t *genie, if (pIe) { ielen = pIe[1] + 2; if ((*total_ielen + ielen) <= MAX_GENIE_LEN) { - cdf_mem_copy(&genie[*total_ielen], pIe, ielen); + qdf_mem_copy(&genie[*total_ielen], pIe, ielen); } else { hddLog(LOGE, "**Ie Length is too big***"); @@ -6659,7 +6659,7 @@ static void wlan_hdd_add_hostapd_conf_vsie(hdd_adapter_t *pHostapdAdapter, != 0)) { ielen = ptr[1] + 2; if ((*total_ielen + ielen) <= MAX_GENIE_LEN) { - cdf_mem_copy(&genie[*total_ielen], ptr, + qdf_mem_copy(&genie[*total_ielen], ptr, ielen); *total_ielen += ielen; } else { @@ -6712,7 +6712,7 @@ static void wlan_hdd_add_extra_ie(hdd_adapter_t *pHostapdAdapter, if (temp_ie_id == elem_id) { ielen = ptr[1] + 2; if ((*total_ielen + ielen) <= MAX_GENIE_LEN) { - cdf_mem_copy(&genie[*total_ielen], ptr, ielen); + qdf_mem_copy(&genie[*total_ielen], ptr, ielen); *total_ielen += ielen; } else { hddLog(LOGE, @@ -6856,7 +6856,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) pConfig = &adapter->sessionCtx.ap.sapConfig; beacon = adapter->sessionCtx.ap.beacon; - genie = cdf_mem_malloc(MAX_GENIE_LEN); + genie = qdf_mem_malloc(MAX_GENIE_LEN); if (genie == NULL) return -ENOMEM; @@ -6898,7 +6898,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) #ifdef QCA_HT_2040_COEX if (WLAN_HDD_SOFTAP == adapter->device_mode) { tSmeConfigParams smeConfig; - cdf_mem_zero(&smeConfig, sizeof(smeConfig)); + qdf_mem_zero(&smeConfig, sizeof(smeConfig)); sme_get_config_param(WLAN_HDD_GET_HAL_CTX(adapter), &smeConfig); if (smeConfig.csrConfig.obssEnabled) @@ -6979,7 +6979,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) } done: - cdf_mem_free(genie); + qdf_mem_free(genie); return ret; } @@ -7373,7 +7373,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, WLAN_EID_COUNTRY); if (pIe) { pConfig->ieee80211d = 1; - cdf_mem_copy(pConfig->countryCode, &pIe[2], 3); + qdf_mem_copy(pConfig->countryCode, &pIe[2], 3); sme_set_reg_info(hHal, pConfig->countryCode); sme_apply_channel_power_info_to_fw(hHal); } else { @@ -7566,7 +7566,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->SSIDinfo.ssidHidden = false; if (ssid != NULL) { - cdf_mem_copy(pConfig->SSIDinfo.ssid.ssId, ssid, ssid_len); + qdf_mem_copy(pConfig->SSIDinfo.ssid.ssId, ssid, ssid_len); pConfig->SSIDinfo.ssid.length = ssid_len; switch (hidden_ssid) { @@ -7589,7 +7589,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, } } - cdf_mem_copy(pConfig->self_macaddr.bytes, + qdf_mem_copy(pConfig->self_macaddr.bytes, pHostapdAdapter->macAddressCurrent.bytes, QDF_MAC_ADDR_SIZE); @@ -7633,7 +7633,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->num_deny_mac = MAX_ACL_MAC_ADDRESS; acl_entry = (struct qc_mac_acl_entry *)(pIe + 8); for (i = 0; i < pConfig->num_deny_mac; i++) { - cdf_mem_copy(&pConfig->deny_mac[i], acl_entry->addr, + qdf_mem_copy(&pConfig->deny_mac[i], acl_entry->addr, sizeof(qcmacaddr)); acl_entry++; } @@ -7660,14 +7660,14 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, pConfig->num_accept_mac = MAX_ACL_MAC_ADDRESS; acl_entry = (struct qc_mac_acl_entry *)(pIe + 8); for (i = 0; i < pConfig->num_accept_mac; i++) { - cdf_mem_copy(&pConfig->accept_mac[i], acl_entry->addr, + qdf_mem_copy(&pConfig->accept_mac[i], acl_entry->addr, sizeof(qcmacaddr)); acl_entry++; } } wlan_hdd_set_sap_hwmode(pHostapdAdapter); - cdf_mem_zero(&sme_config, sizeof(tSmeConfigParams)); + qdf_mem_zero(&sme_config, sizeof(tSmeConfigParams)); sme_get_config_param(pHddCtx->hHal, &sme_config); /* Override hostapd.conf wmm_enabled only for 11n and 11AC configs (IOT) * As per spec 11N/AC STA are QOS STA and may not connect or throughput @@ -7941,8 +7941,8 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, } pAdapter->sessionCtx.ap.sapConfig.acs_cfg.acs_mode = false; if (pAdapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list) - cdf_mem_free(pAdapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); - cdf_mem_zero(&pAdapter->sessionCtx.ap.sapConfig.acs_cfg, + qdf_mem_free(pAdapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); + qdf_mem_zero(&pAdapter->sessionCtx.ap.sapConfig.acs_cfg, sizeof(struct sap_acs_cfg)); hdd_hostapd_stop(dev); diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 27f74c7f3d70..215f8048afa2 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -162,7 +162,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, /* copy over the tsm stats */ adapter->tsmStats.UplinkPktQueueDly = tsm_metrics.UplinkPktQueueDly; - cdf_mem_copy(adapter->tsmStats.UplinkPktQueueDlyHist, + qdf_mem_copy(adapter->tsmStats.UplinkPktQueueDlyHist, tsm_metrics.UplinkPktQueueDlyHist, sizeof(adapter->tsmStats.UplinkPktQueueDlyHist) / sizeof(adapter->tsmStats.UplinkPktQueueDlyHist[0])); @@ -246,7 +246,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, if (QDF_STATUS_SUCCESS == vstatus) { tsm_metrics->UplinkPktQueueDly = adapter->tsmStats.UplinkPktQueueDly; - cdf_mem_copy(tsm_metrics->UplinkPktQueueDlyHist, + qdf_mem_copy(tsm_metrics->UplinkPktQueueDlyHist, adapter->tsmStats.UplinkPktQueueDlyHist, sizeof(adapter->tsmStats.UplinkPktQueueDlyHist) / sizeof(adapter->tsmStats. @@ -472,7 +472,7 @@ hdd_parse_send_action_frame_v1_data(const uint8_t *pValue, * For example, if N = 18, then (18 + 1)/2 = 9 bytes are enough. * If N = 19, then we need 10 bytes, hence (19 + 1)/2 = 10 bytes */ - *pBuf = cdf_mem_malloc((*pBufLen + 1) / 2); + *pBuf = qdf_mem_malloc((*pBufLen + 1) / 2); if (NULL == *pBuf) { hddLog(LOGE, FL("cdf_mem_alloc failed")); return -ENOMEM; @@ -581,7 +581,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, handoffInfo.channel = channel; handoffInfo.src = REASSOC; - cdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(handoffInfo.bssid.bytes, bssid, QDF_MAC_ADDR_SIZE); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); } @@ -757,7 +757,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, if (pVendorSpecific->category == SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY) { static const uint8_t Oui[] = { 0x00, 0x00, 0xf0 }; - if (cdf_mem_compare(pVendorSpecific->Oui, (void *)Oui, 3)) { + if (!qdf_mem_cmp(pVendorSpecific->Oui, (void *)Oui, 3)) { /* * if the channel number is different from operating * channel then no need to send action frame @@ -802,22 +802,22 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, } frame_len = payload_len + 24; - frame = cdf_mem_malloc(frame_len); + frame = qdf_mem_malloc(frame_len); if (!frame) { hddLog(LOGE, FL("memory allocation failed")); ret = -ENOMEM; goto exit; } - cdf_mem_zero(frame, frame_len); + qdf_mem_zero(frame, frame_len); hdr = (struct ieee80211_hdr_3addr *)frame; hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); - cdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes, + qdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(hdr + 1, payload, payload_len); + qdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(hdr + 1, payload, payload_len); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) params.chan = &chan; @@ -836,7 +836,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, dwell_time, frame, frame_len, 1, 1, &cookie); #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */ - cdf_mem_free(frame); + qdf_mem_free(frame); exit: return ret; } @@ -879,7 +879,7 @@ hdd_parse_sendactionframe_v1(hdd_adapter_t *adapter, const char *command) } else { ret = hdd_sendactionframe(adapter, bssid, channel, dwell_time, payload_len, payload); - cdf_mem_free(payload); + qdf_mem_free(payload); } return ret; @@ -1582,7 +1582,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); int rc; - cdf_mem_copy(¶ms, arg_params, sizeof(params)); + qdf_mem_copy(¶ms, arg_params, sizeof(params)); INIT_COMPLETION(hdd_ctx->ready_to_extwow); @@ -1687,7 +1687,7 @@ static int hdd_set_app_type1_params(tHalHandle hHal, tSirAppType1Params params; QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; - cdf_mem_copy(¶ms, arg_params, sizeof(params)); + qdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); if (QDF_STATUS_SUCCESS != cdf_ret_status) { @@ -1726,9 +1726,9 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter, qdf_copy_macaddr(¶ms.wakee_mac_addr, &adapter->macAddressCurrent); params.id_length = strlen(id); - cdf_mem_copy(params.identification_id, id, params.id_length); + qdf_mem_copy(params.identification_id, id, params.id_length); params.pass_length = strlen(password); - cdf_mem_copy(params.password, password, params.pass_length); + qdf_mem_copy(params.password, password, params.pass_length); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: %d %pM %.8s %u %.16s %u", @@ -1745,7 +1745,7 @@ static int hdd_set_app_type2_params(tHalHandle hHal, tSirAppType2Params params; QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; - cdf_mem_copy(¶ms, arg_params, sizeof(params)); + qdf_mem_copy(¶ms, arg_params, sizeof(params)); cdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); if (QDF_STATUS_SUCCESS != cdf_ret_status) { @@ -1813,11 +1813,11 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter, return -EINVAL; } - cdf_mem_copy(¶ms.gateway_mac.bytes, (uint8_t *) &gateway_mac, + qdf_mem_copy(¶ms.gateway_mac.bytes, (uint8_t *) &gateway_mac, QDF_MAC_ADDR_SIZE); params.rc4_key_len = strlen(rc4_key); - cdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len); + qdf_mem_copy(params.rc4_key, rc4_key, params.rc4_key_len); params.vdev_id = adapter->sessionId; params.tcp_src_port = (params.tcp_src_port != 0) ? @@ -1973,7 +1973,7 @@ static int hdd_set_dwell_time(hdd_adapter_t *adapter, uint8_t *command) return -EINVAL; } - cdf_mem_zero(&smeConfig, sizeof(smeConfig)); + qdf_mem_zero(&smeConfig, sizeof(smeConfig)); sme_get_config_param(hHal, &smeConfig); if (strncmp(command, "SETDWELLTIME ACTIVE MAX", 23) == 0) { @@ -2374,12 +2374,12 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe, * For example, if N = 18, then (18 + 1) / 2 = 9 bytes are enough. * If N = 19, then we need 10 bytes, hence (19 + 1) / 2 = 10 bytes */ - *pCckmIe = cdf_mem_malloc((*pCckmIeLen + 1) / 2); + *pCckmIe = qdf_mem_malloc((*pCckmIeLen + 1) / 2); if (NULL == *pCckmIe) { hddLog(LOGE, FL("cdf_mem_alloc failed")); return -ENOMEM; } - cdf_mem_zero(*pCckmIe, (*pCckmIeLen + 1) / 2); + qdf_mem_zero(*pCckmIe, (*pCckmIeLen + 1) / 2); /* * the buffer received from the upper layer is character buffer, * we need to prepare the buffer taking 2 characters in to a U8 hex @@ -4143,7 +4143,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, struct wma_roam_invoke_cmd *fastreassoc; cds_msg_t msg = {0}; - fastreassoc = cdf_mem_malloc(sizeof(*fastreassoc)); + fastreassoc = qdf_mem_malloc(sizeof(*fastreassoc)); if (NULL == fastreassoc) { hddLog(LOGE, FL("cdf_mem_alloc failed for fastreassoc")); return; @@ -4162,7 +4162,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, msg.bodyptr = fastreassoc; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - cdf_mem_free(fastreassoc); + qdf_mem_free(fastreassoc); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("Not able to post ROAM_INVOKE_CMD message to WMA")); } @@ -4217,7 +4217,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, * if the target bssid is same as currently associated AP, * issue reassoc to same AP */ - if (true == cdf_mem_compare(targetApBssid, + if (true != qdf_mem_cmp(targetApBssid, pHddStaCtx->conn_info.bssId.bytes, QDF_MAC_ADDR_SIZE)) { /* Reassoc to same AP, only supported for Open Security*/ @@ -4253,7 +4253,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD handoffInfo.channel = channel; handoffInfo.src = FASTREASSOC; - cdf_mem_copy(handoffInfo.bssid, targetApBssid, + qdf_mem_copy(handoffInfo.bssid, targetApBssid, sizeof(tSirMacAddr)); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); @@ -4275,7 +4275,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, QDF_STATUS status = QDF_STATUS_SUCCESS; tpSirPlmReq pPlmRequest = NULL; - pPlmRequest = cdf_mem_malloc(sizeof(tSirPlmReq)); + pPlmRequest = qdf_mem_malloc(sizeof(tSirPlmReq)); if (NULL == pPlmRequest) { ret = -ENOMEM; goto exit; @@ -4283,7 +4283,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, status = hdd_parse_plm_cmd(value, pPlmRequest); if (QDF_STATUS_SUCCESS != status) { - cdf_mem_free(pPlmRequest); + qdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; goto exit; @@ -4292,7 +4292,7 @@ static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, status = sme_set_plm_request(hdd_ctx->hHal, pPlmRequest); if (QDF_STATUS_SUCCESS != status) { - cdf_mem_free(pPlmRequest); + qdf_mem_free(pPlmRequest); pPlmRequest = NULL; ret = -EINVAL; goto exit; @@ -4851,7 +4851,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, "%s: CCKM Ie input length is more than max[%d]", __func__, DOT11F_IE_RSN_MAX_LEN); if (NULL != cckmIe) { - cdf_mem_free(cckmIe); + qdf_mem_free(cckmIe); cckmIe = NULL; } ret = -EINVAL; @@ -4861,7 +4861,7 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter, sme_set_cckm_ie(hdd_ctx->hHal, adapter->sessionId, cckmIe, cckmIeLen); if (NULL != cckmIe) { - cdf_mem_free(cckmIe); + qdf_mem_free(cckmIe); cckmIe = NULL; } @@ -5736,7 +5736,7 @@ static int hdd_set_rx_filter(hdd_adapter_t *adapter, bool action, hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { - filter = cdf_mem_malloc(sizeof(*filter)); + filter = qdf_mem_malloc(sizeof(*filter)); if (NULL == filter) { hdd_err("Could not allocate Memory"); return -ENOMEM; @@ -5757,7 +5757,7 @@ static int hdd_set_rx_filter(hdd_adapter_t *adapter, bool action, } /* Set rx filter */ sme_8023_multicast_list(handle, adapter->sessionId, filter); - cdf_mem_free(filter); + qdf_mem_free(filter); } else { hdd_info("mode %d mc_cnt %d", adapter->device_mode, adapter->mc_addr_list.mc_cnt); diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 8ff2d3c5e4ee..4458819f3554 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -905,7 +905,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx) qdf_mc_timer_init(&hdd_ipa->rt_debug_fill_timer, QDF_TIMER_TYPE_SW, hdd_ipa_uc_rt_debug_host_fill, (void *)hdd_ctx); hdd_ipa->rt_buf_fill_index = 0; - cdf_mem_zero(hdd_ipa->rt_bug_buffer, + qdf_mem_zero(hdd_ipa->rt_bug_buffer, sizeof(struct uc_rt_debug_info) * HDD_IPA_UC_RT_DEBUG_BUF_COUNT); hdd_ipa->ipa_tx_forward = 0; @@ -1332,7 +1332,7 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa) pending_event->type, pending_event->sta_id, pending_event->mac_addr); - cdf_mem_free(pending_event); + qdf_mem_free(pending_event); pending_event = NULL; qdf_list_remove_front(&hdd_ipa->pending_event, (qdf_list_node_t **)&pending_event); @@ -1375,7 +1375,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid"); - cdf_mem_free(op_msg); + qdf_mem_free(op_msg); return; } @@ -1619,7 +1619,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) HDD_IPA_LOG(LOGE, "INVALID REASON %d", hdd_ipa->stat_req_reason); } - cdf_mem_free(op_msg); + qdf_mem_free(op_msg); } @@ -1652,7 +1652,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, if (adapter->ipa_context) return; - cdf_mem_zero(&ipa_offload_enable_disable, + qdf_mem_zero(&ipa_offload_enable_disable, sizeof(ipa_offload_enable_disable)); ipa_offload_enable_disable.offload_type = offload_type; ipa_offload_enable_disable.vdev_id = adapter->sessionId; @@ -1746,7 +1746,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx) return; end: - cdf_mem_free(op_msg); + qdf_mem_free(op_msg); } /** @@ -1785,8 +1785,8 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) p_cds_contextType cds_ctx = hdd_ctx->pcds_context; uint8_t i; - cdf_mem_zero(&pipe_in, sizeof(struct ipa_wdi_in_params)); - cdf_mem_zero(&pipe_out, sizeof(struct ipa_wdi_out_params)); + qdf_mem_zero(&pipe_in, sizeof(struct ipa_wdi_in_params)); + qdf_mem_zero(&pipe_out, sizeof(struct ipa_wdi_out_params)); qdf_list_create(&ipa_ctxt->pending_event, 1000); qdf_mutex_create(&ipa_ctxt->event_lock); @@ -2735,7 +2735,7 @@ static void hdd_ipa_send_pkt_to_tl( skb = ipa_tx_desc->skb; - cdf_mem_set(skb->cb, sizeof(skb->cb), 0); + qdf_mem_set(skb->cb, sizeof(skb->cb), 0); cdf_nbuf_ipa_owned_set(skb); /* FIXME: This is broken. No such field in cb any more: NBUF_CALLBACK_FN(skb) = hdd_ipa_nbuf_cb; */ @@ -2875,7 +2875,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, * progress. */ if (hdd_ipa->suspended) { - cdf_mem_set(skb->cb, sizeof(skb->cb), 0); + qdf_mem_set(skb->cb, sizeof(skb->cb), 0); pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; pm_tx_cb->iface_context = iface_context; pm_tx_cb->ipa_tx_desc = ipa_tx_desc; @@ -3056,7 +3056,7 @@ setup_sys_pipe_fail: while (--i >= 0) { ipa_teardown_sys_pipe(hdd_ipa->sys_pipe[i].conn_hdl); - cdf_mem_zero(&hdd_ipa->sys_pipe[i], + qdf_mem_zero(&hdd_ipa->sys_pipe[i], sizeof(struct hdd_ipa_sys_pipe)); } @@ -3114,7 +3114,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa, /* Allocate TX properties for TOS categories, 1 each for IPv4 & IPv6 */ tx_prop = - cdf_mem_malloc(sizeof(struct ipa_ioc_tx_intf_prop) * num_prop); + qdf_mem_malloc(sizeof(struct ipa_ioc_tx_intf_prop) * num_prop); if (!tx_prop) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "tx_prop allocation failed"); goto register_interface_fail; @@ -3122,14 +3122,14 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa, /* Allocate RX properties, 1 each for IPv4 & IPv6 */ rx_prop = - cdf_mem_malloc(sizeof(struct ipa_ioc_rx_intf_prop) * num_prop); + qdf_mem_malloc(sizeof(struct ipa_ioc_rx_intf_prop) * num_prop); if (!rx_prop) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "rx_prop allocation failed"); goto register_interface_fail; } - cdf_mem_zero(&tx_intf, sizeof(tx_intf)); - cdf_mem_zero(&rx_intf, sizeof(rx_intf)); + qdf_mem_zero(&tx_intf, sizeof(tx_intf)); + qdf_mem_zero(&rx_intf, sizeof(rx_intf)); snprintf(ipv4_hdr_name, IPA_RESOURCE_NAME_MAX, "%s%s", ifname, HDD_IPA_IPV4_NAME_EXT); @@ -3187,8 +3187,8 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa, ret = ipa_register_intf(ifname, &tx_intf, &rx_intf); register_interface_fail: - cdf_mem_free(tx_prop); - cdf_mem_free(rx_prop); + qdf_mem_free(tx_prop); + qdf_mem_free(rx_prop); return ret; } @@ -3204,7 +3204,7 @@ static void hdd_ipa_remove_header(char *name) int ret = 0, len; struct ipa_ioc_del_hdr *ipa_hdr; - cdf_mem_zero(&hdrlookup, sizeof(hdrlookup)); + qdf_mem_zero(&hdrlookup, sizeof(hdrlookup)); strlcpy(hdrlookup.name, name, sizeof(hdrlookup.name)); ret = ipa_get_hdr(&hdrlookup); if (ret) { @@ -3215,7 +3215,7 @@ static void hdd_ipa_remove_header(char *name) HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "hdl: 0x%x", hdrlookup.hdl); len = sizeof(struct ipa_ioc_del_hdr) + sizeof(struct ipa_hdr_del) * 1; - ipa_hdr = (struct ipa_ioc_del_hdr *)cdf_mem_malloc(len); + ipa_hdr = (struct ipa_ioc_del_hdr *)qdf_mem_malloc(len); if (ipa_hdr == NULL) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "ipa_hdr allocation failed"); return; @@ -3229,7 +3229,7 @@ static void hdd_ipa_remove_header(char *name) HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Delete header failed: %d", ret); - cdf_mem_free(ipa_hdr); + qdf_mem_free(ipa_hdr); } /** @@ -3257,7 +3257,7 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ifname, mac_addr); /* dynamically allocate the memory to add the hdrs */ - ipa_hdr = cdf_mem_malloc(sizeof(struct ipa_ioc_add_hdr) + ipa_hdr = qdf_mem_malloc(sizeof(struct ipa_ioc_add_hdr) + sizeof(struct ipa_hdr_add)); if (!ipa_hdr) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, @@ -3341,7 +3341,7 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ipa_hdr->hdr[0].name, ipa_hdr->hdr[0].hdr_hdl); } - cdf_mem_free(ipa_hdr); + qdf_mem_free(ipa_hdr); return ret; @@ -3351,7 +3351,7 @@ clean_ipv4_hdr: hdd_ipa_remove_header(ipa_hdr->hdr[0].name); end: if (ipa_hdr) - cdf_mem_free(ipa_hdr); + qdf_mem_free(ipa_hdr); return ret; } @@ -3499,7 +3499,7 @@ static void hdd_ipa_msg_free_fn(void *buff, uint32_t len, uint32_t type) { hddLog(LOG1, "msg type:%d, len:%d", type, len); ghdd_ipa->stats.num_free_msg++; - cdf_mem_free(buff); + qdf_mem_free(buff); } /** @@ -3540,7 +3540,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) /* Send SCC/MCC Switching event to IPA */ meta.msg_len = sizeof(*msg); - msg = cdf_mem_malloc(meta.msg_len); + msg = qdf_mem_malloc(meta.msg_len); if (msg == NULL) { hddLog(LOGE, "msg allocation failed"); return -ENOMEM; @@ -3555,7 +3555,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) if (ret) { hddLog(LOGE, "ipa_send_msg(Evt:%d) - fail=%d", meta.msg_type, ret); - cdf_mem_free(msg); + qdf_mem_free(msg); } return ret; @@ -3660,7 +3660,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, (qdf_list_node_t **)&pending_event); } else { pending_event = - (struct ipa_uc_pending_event *)cdf_mem_malloc( + (struct ipa_uc_pending_event *)qdf_mem_malloc( sizeof(struct ipa_uc_pending_event)); } @@ -3673,7 +3673,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, pending_event->adapter = adapter; pending_event->sta_id = sta_id; pending_event->type = type; - cdf_mem_copy(pending_event->mac_addr, + qdf_mem_copy(pending_event->mac_addr, mac_addr, QDF_MAC_ADDR_SIZE); qdf_list_insert_back(&hdd_ipa->pending_event, @@ -3882,7 +3882,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, meta.msg_type = type; meta.msg_len = (sizeof(struct ipa_wlan_msg_ex) + sizeof(struct ipa_wlan_hdr_attrib_val)); - msg_ex = cdf_mem_malloc(meta.msg_len); + msg_ex = qdf_mem_malloc(meta.msg_len); if (msg_ex == NULL) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, @@ -3908,7 +3908,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, if (ret) { HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d : %d", msg_ex->name, meta.msg_type, ret); - cdf_mem_free(msg_ex); + qdf_mem_free(msg_ex); return ret; } hdd_ipa->stats.num_send_msg++; @@ -3947,7 +3947,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, } meta.msg_len = sizeof(struct ipa_wlan_msg); - msg = cdf_mem_malloc(meta.msg_len); + msg = qdf_mem_malloc(meta.msg_len); if (msg == NULL) { HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "msg allocation failed"); return -ENOMEM; @@ -3965,7 +3965,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, if (ret) { HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d", msg->name, meta.msg_type, ret); - cdf_mem_free(msg); + qdf_mem_free(msg); return ret; } @@ -4013,7 +4013,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) if (!hdd_ipa_is_enabled(hdd_ctx)) return QDF_STATUS_SUCCESS; - hdd_ipa = cdf_mem_malloc(sizeof(*hdd_ipa)); + hdd_ipa = qdf_mem_malloc(sizeof(*hdd_ipa)); if (!hdd_ipa) { HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "hdd_ipa allocation failed"); goto fail_return; @@ -4074,7 +4074,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { hdd_ipa_uc_rt_debug_init(hdd_ctx); - cdf_mem_zero(&hdd_ipa->stats, sizeof(hdd_ipa->stats)); + qdf_mem_zero(&hdd_ipa->stats, sizeof(hdd_ipa->stats)); hdd_ipa->sap_num_connected_sta = 0; hdd_ipa->ipa_tx_packets_diff = 0; hdd_ipa->ipa_rx_packets_diff = 0; @@ -4104,7 +4104,7 @@ fail_create_sys_pipe: fail_setup_rm: qdf_spinlock_destroy(&hdd_ipa->pm_lock); fail_get_resource: - cdf_mem_free(hdd_ipa); + qdf_mem_free(hdd_ipa); hdd_ctx->hdd_ipa = NULL; ghdd_ipa = NULL; fail_return: @@ -4123,7 +4123,7 @@ void hdd_ipa_cleanup_pending_event(struct hdd_ipa_priv *hdd_ipa) while (qdf_list_remove_front(&hdd_ipa->pending_event, (qdf_list_node_t **)&pending_event) == QDF_STATUS_SUCCESS) { - cdf_mem_free(pending_event); + qdf_mem_free(pending_event); } qdf_list_destroy(&hdd_ipa->pending_event); @@ -4219,7 +4219,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) #endif } - cdf_mem_free(hdd_ipa); + qdf_mem_free(hdd_ipa); hdd_ctx->hdd_ipa = NULL; return QDF_STATUS_SUCCESS; diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 7cba52d751ae..77522bd106a1 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -261,7 +261,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, return -EINVAL; } - cdf_mem_zero((void *)entry->lro_desc, sizeof(struct net_lro_desc)); + qdf_mem_zero((void *)entry->lro_desc, sizeof(struct net_lro_desc)); /* * lro_desc->active should be 0 and lro_desc->tcp_rcv_tsval @@ -516,7 +516,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_info("LRO Enabled"); hdd_lro = &adapter->lro_info; - cdf_mem_zero((void *)hdd_lro, sizeof(struct hdd_lro_s)); + qdf_mem_zero((void *)hdd_lro, sizeof(struct hdd_lro_s)); /* * Allocate all the LRO data structures at once and then carve * them up as needed @@ -526,7 +526,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, desc_pool_sz = (LRO_DESC_POOL_SZ * sizeof(struct hdd_lro_desc_entry)); hash_table_sz = (sizeof(struct hdd_lro_desc_table) * LRO_DESC_TABLE_SZ); - lro_mem_ptr = cdf_mem_malloc(lro_mgr_sz + desc_arr_sz + desc_pool_sz + + lro_mem_ptr = qdf_mem_malloc(lro_mgr_sz + desc_arr_sz + desc_pool_sz + hash_table_sz); if (NULL == lro_mem_ptr) { @@ -597,7 +597,7 @@ void hdd_lro_disable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) if (adapter->lro_info.lro_mgr) { hdd_lro_desc_info_deinit(&adapter->lro_info); - cdf_mem_free(adapter->lro_info.lro_mgr); + qdf_mem_free(adapter->lro_info.lro_mgr); adapter->lro_info.lro_mgr = NULL; adapter->lro_info.lro_desc_info. lro_desc_pool.lro_desc_array = NULL; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 5117ab63b0b9..d6557cc36b80 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -749,10 +749,10 @@ void hdd_update_macaddr(struct hdd_config *config, int8_t i; uint8_t macaddr_b3, tmp_br3; - cdf_mem_copy(config->intfMacAddr[0].bytes, hw_macaddr.bytes, + qdf_mem_copy(config->intfMacAddr[0].bytes, hw_macaddr.bytes, QDF_MAC_ADDR_SIZE); for (i = 1; i < QDF_MAX_CONCURRENCY_PERSONA; i++) { - cdf_mem_copy(config->intfMacAddr[i].bytes, hw_macaddr.bytes, + qdf_mem_copy(config->intfMacAddr[i].bytes, hw_macaddr.bytes, QDF_MAC_ADDR_SIZE); macaddr_b3 = config->intfMacAddr[i].bytes[3]; tmp_br3 = ((macaddr_b3 >> 4 & INTF_MACADDR_MASK) + i) & @@ -1870,7 +1870,7 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, /* Save the pointer to the net_device in the HDD adapter */ adapter = (hdd_adapter_t *) netdev_priv(pWlanDev); - cdf_mem_zero(adapter, sizeof(hdd_adapter_t)); + qdf_mem_zero(adapter, sizeof(hdd_adapter_t)); adapter->dev = pWlanDev; adapter->pHddCtx = hdd_ctx; @@ -1902,9 +1902,9 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, /* Init the net_device structure */ strlcpy(pWlanDev->name, name, IFNAMSIZ); - cdf_mem_copy(pWlanDev->dev_addr, (void *)macAddr, + qdf_mem_copy(pWlanDev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(adapter->macAddressCurrent.bytes, macAddr, + qdf_mem_copy(adapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr)); pWlanDev->watchdog_timeo = HDD_TX_TIMEOUT; @@ -2273,7 +2273,7 @@ QDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter - && cdf_mem_compare(adapter->macAddressCurrent.bytes, + && !qdf_mem_cmp(adapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr))) { return QDF_STATUS_E_FAILURE; } @@ -2483,7 +2483,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, if (QDF_STATUS_SUCCESS == status) { /* Add it to the hdd's session list. */ pHddAdapterNode = - cdf_mem_malloc(sizeof(hdd_adapter_list_node_t)); + qdf_mem_malloc(sizeof(hdd_adapter_list_node_t)); if (NULL == pHddAdapterNode) { status = QDF_STATUS_E_NOMEM; } else { @@ -2498,7 +2498,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter = NULL; } if (NULL != pHddAdapterNode) { - cdf_mem_free(pHddAdapterNode); + qdf_mem_free(pHddAdapterNode); } return NULL; } @@ -2691,7 +2691,7 @@ QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, hdd_cleanup_adapter(hdd_ctx, adapterNode->pAdapter, rtnl_held); hdd_remove_adapter(hdd_ctx, adapterNode); - cdf_mem_free(adapterNode); + qdf_mem_free(adapterNode); adapterNode = NULL; /* Adapter removed. Decrement vdev count */ @@ -2725,7 +2725,7 @@ QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) if (pHddAdapterNode && QDF_STATUS_SUCCESS == status) { hdd_cleanup_adapter(hdd_ctx, pHddAdapterNode->pAdapter, rtnl_held); - cdf_mem_free(pHddAdapterNode); + qdf_mem_free(pHddAdapterNode); } } while (NULL != pHddAdapterNode && QDF_STATUS_E_EMPTY != status); @@ -3227,7 +3227,7 @@ hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *hdd_ctx, adapter = adapterNode->pAdapter; if (adapter - && cdf_mem_compare(adapter->macAddressCurrent.bytes, + && !qdf_mem_cmp(adapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr))) { return adapter; } @@ -3645,7 +3645,7 @@ static void hdd_free_context(hdd_context_t *hdd_ctx) if (QDF_GLOBAL_FTM_MODE != hdd_get_conparam()) hdd_logging_sock_deactivate_svc(hdd_ctx); - cdf_mem_free(hdd_ctx->config); + qdf_mem_free(hdd_ctx->config); hdd_ctx->config = NULL; wiphy_free(hdd_ctx->wiphy); @@ -4394,7 +4394,7 @@ void wlan_hdd_display_tx_rx_histogram(hdd_context_t *hdd_ctx) void wlan_hdd_clear_tx_rx_histogram(hdd_context_t *hdd_ctx) { hdd_ctx->hdd_txrx_hist_idx = 0; - cdf_mem_zero(hdd_ctx->hdd_txrx_hist, sizeof(hdd_ctx->hdd_txrx_hist)); + qdf_mem_zero(hdd_ctx->hdd_txrx_hist, sizeof(hdd_ctx->hdd_txrx_hist)); } /** @@ -4475,9 +4475,9 @@ void wlan_hdd_clear_netif_queue_history(hdd_context_t *hdd_ctx) while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { adapter = adapter_node->pAdapter; - cdf_mem_zero(adapter->queue_oper_stats, + qdf_mem_zero(adapter->queue_oper_stats, sizeof(adapter->queue_oper_stats)); - cdf_mem_zero(adapter->queue_oper_history, + qdf_mem_zero(adapter->queue_oper_history, sizeof(adapter->queue_oper_history)); status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); @@ -4749,7 +4749,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) ch_avoid_indi->avoid_range_count); /* generate vendor specific event */ - cdf_mem_zero((void *)&hdd_avoid_freq_list, sizeof(tHddAvoidFreqList)); + qdf_mem_zero((void *)&hdd_avoid_freq_list, sizeof(tHddAvoidFreqList)); for (i = 0; i < ch_avoid_indi->avoid_range_count; i++) { hdd_avoid_freq_list.avoidFreqRange[i].startFreq = ch_avoid_indi->avoid_freq_range[i].start_freq; @@ -4763,7 +4763,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) /* clear existing unsafe channel cache */ hdd_ctxt->unsafe_channel_count = 0; - cdf_mem_zero(hdd_ctxt->unsafe_channel_list, + qdf_mem_zero(hdd_ctxt->unsafe_channel_list, sizeof(hdd_ctxt->unsafe_channel_list)); for (range_loop = 0; range_loop < ch_avoid_indi->avoid_range_count; @@ -4839,7 +4839,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) /* clear existing unsafe channel cache */ hdd_ctxt->unsafe_channel_count = 0; - cdf_mem_zero(hdd_ctxt->unsafe_channel_list, + qdf_mem_zero(hdd_ctxt->unsafe_channel_list, sizeof(hdd_ctxt->unsafe_channel_list)); return; @@ -5092,7 +5092,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) hdd_ctx->pcds_context = p_cds_context; - hdd_ctx->config = cdf_mem_malloc(sizeof(struct hdd_config)); + hdd_ctx->config = qdf_mem_malloc(sizeof(struct hdd_config)); if (hdd_ctx->config == NULL) { hdd_alert("Failed to alloc memory for HDD config!"); ret = -ENOMEM; @@ -5181,7 +5181,7 @@ skip_multicast_logging: return hdd_ctx; err_free_config: - cdf_mem_free(hdd_ctx->config); + qdf_mem_free(hdd_ctx->config); err_free_hdd_context: wiphy_free(hdd_ctx->wiphy); @@ -5208,7 +5208,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) if (hdd_ctx->config->isP2pDeviceAddrAdministrated && !(hdd_ctx->config->intfMacAddr[0].bytes[0] & 0x02)) { - cdf_mem_copy(hdd_ctx->p2pDeviceAddress.bytes, + qdf_mem_copy(hdd_ctx->p2pDeviceAddress.bytes, hdd_ctx->config->intfMacAddr[0].bytes, sizeof(tSirMacAddr)); @@ -5225,7 +5225,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) return -ENOSPC; } - cdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr, + qdf_mem_copy(&hdd_ctx->p2pDeviceAddress.bytes[0], p2p_dev_addr, QDF_MAC_ADDR_SIZE); } @@ -6819,7 +6819,7 @@ static int __hdd_module_init(void) goto out; } - pr_info("%s: qdf driver loaded\n", WLAN_MODULE_NAME); + pr_info("%s: qdf converged driver loaded\n", WLAN_MODULE_NAME); return 0; out: diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 623c0f4ee07e..49a9a4a5a2f8 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -90,7 +90,7 @@ static void memdump_cleanup_timer_cb(void *data) paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -234,11 +234,11 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, */ mutex_lock(&hdd_ctx->memdump_lock); if (!hdd_ctx->fw_dump_loc) { - hdd_ctx->fw_dump_loc = cdf_os_mem_alloc_consistent( - qdf_ctx, FW_MEM_DUMP_SIZE, &paddr, dma_ctx); + hdd_ctx->fw_dump_loc = qdf_mem_alloc_consistent( + qdf_ctx, qdf_ctx->dev, FW_MEM_DUMP_SIZE, &paddr); if (!hdd_ctx->fw_dump_loc) { mutex_unlock(&hdd_ctx->memdump_lock); - hddLog(LOGE, FL("cdf_os_mem_alloc_consistent failed")); + hddLog(LOGE, FL("qdf_mem_alloc_consistent failed")); return -ENOMEM; } hdd_ctx->dump_loc_paddr = paddr; @@ -299,7 +299,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS != sme_status) { hddLog(LOGE, FL("sme_fw_mem_dump Failed")); mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; mutex_unlock(&hdd_ctx->memdump_lock); @@ -443,7 +443,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, if (*pos >= FW_MEM_DUMP_SIZE) { paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - cdf_os_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -619,7 +619,7 @@ void memdump_deinit(void) mutex_lock(&hdd_ctx->memdump_lock); if (hdd_ctx->fw_dump_loc) { paddr = hdd_ctx->dump_loc_paddr; - cdf_os_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 428ced7da3ce..62ff20ae9e02 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -308,11 +308,11 @@ static struct sir_ocb_config *hdd_ocb_config_new(int num_channels, ndl_chan_list_len + ndl_active_state_list_len; - cursor = cdf_mem_malloc(len); + cursor = qdf_mem_malloc(len); if (!cursor) goto fail; - cdf_mem_zero(cursor, len); + qdf_mem_zero(cursor, len); ret = cursor; cursor += sizeof(*ret); @@ -333,7 +333,7 @@ static struct sir_ocb_config *hdd_ocb_config_new(int num_channels, return ret; fail: - cdf_mem_free(ret); + qdf_mem_free(ret); return NULL; } @@ -540,11 +540,11 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, rc = -EINVAL; goto fail; } - cdf_mem_copy(config->channels[ + qdf_mem_copy(config->channels[ config->channel_count].mac_address.bytes, mac_addr, sizeof(tSirMacAddr)); /* Save the mac address to release later */ - cdf_mem_copy(adapter->ocb_mac_address[ + qdf_mem_copy(adapter->ocb_mac_address[ adapter->ocb_mac_addr_count].bytes, mac_addr, QDF_MAC_ADDR_SIZE); adapter->ocb_mac_addr_count++; @@ -583,7 +583,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, rc = 0; fail: - cdf_mem_free(config); + qdf_mem_free(config); return rc; } @@ -733,12 +733,12 @@ static void wlan_hdd_ocb_config_channel_to_sir_ocb_config_channel( { uint32_t i; - cdf_mem_zero(dest, channel_count * sizeof(*dest)); + qdf_mem_zero(dest, channel_count * sizeof(*dest)); for (i = 0; i < channel_count; i++) { dest[i].chan_freq = src[i].chan_freq; dest[i].bandwidth = src[i].bandwidth; - cdf_mem_copy(dest[i].qos_params, src[i].qos_params, + qdf_mem_copy(dest[i].qos_params, src[i].qos_params, sizeof(dest[i].qos_params)); /* * max_pwr and min_pwr are divided by 2 because @@ -885,7 +885,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, hddLog(LOGE, FL("Cannot obtain mac address")); goto fail; } - cdf_mem_copy(config->channels[i].mac_address.bytes, + qdf_mem_copy(config->channels[i].mac_address.bytes, mac_addr, QDF_MAC_ADDR_SIZE); /* Save the mac address to release later */ qdf_copy_macaddr(&adapter->ocb_mac_address[ @@ -905,13 +905,13 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, hddLog(LOGE, FL("SCHEDULE_ARRAY is not the correct size")); goto fail; } - cdf_mem_copy(config->schedule, nla_data(sched_array), + qdf_mem_copy(config->schedule, nla_data(sched_array), nla_len(sched_array)); /* Copy the NDL chan array */ if (ndl_chan_list_len) { config->dcc_ndl_chan_list_len = ndl_chan_list_len; - cdf_mem_copy(config->dcc_ndl_chan_list, nla_data(ndl_chan_list), + qdf_mem_copy(config->dcc_ndl_chan_list, nla_data(ndl_chan_list), nla_len(ndl_chan_list)); } @@ -919,7 +919,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, if (ndl_active_state_list_len) { config->dcc_ndl_active_state_list_len = ndl_active_state_list_len; - cdf_mem_copy(config->dcc_ndl_active_state_list, + qdf_mem_copy(config->dcc_ndl_active_state_list, nla_data(ndl_active_state_list), nla_len(ndl_active_state_list)); } @@ -929,7 +929,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, hddLog(LOGE, FL("Error while setting OCB config: %d"), rc); fail: - cdf_mem_free(config); + qdf_mem_free(config); return rc; } @@ -1026,14 +1026,14 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, return -EINVAL; } - utc = cdf_mem_malloc(sizeof(*utc)); + utc = qdf_mem_malloc(sizeof(*utc)); if (!utc) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } utc->vdev_id = adapter->sessionId; - cdf_mem_copy(utc->utc_time, nla_data(utc_attr), SIZE_UTC_TIME); - cdf_mem_copy(utc->time_error, nla_data(time_error_attr), + qdf_mem_copy(utc->utc_time, nla_data(utc_attr), SIZE_UTC_TIME); + qdf_mem_copy(utc->time_error, nla_data(time_error_attr), SIZE_UTC_TIME_ERROR); if (sme_ocb_set_utc_time(hdd_ctx->hHal, utc) != QDF_STATUS_SUCCESS) { @@ -1043,7 +1043,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, rc = 0; } - cdf_mem_free(utc); + qdf_mem_free(utc); return rc; } @@ -1109,12 +1109,12 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, return -EINVAL; } - timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); + timing_advert = qdf_mem_malloc(sizeof(*timing_advert)); if (!timing_advert) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } - cdf_mem_zero(timing_advert, sizeof(*timing_advert)); + qdf_mem_zero(timing_advert, sizeof(*timing_advert)); timing_advert->vdev_id = adapter->sessionId; /* Parse the netlink message */ @@ -1161,8 +1161,8 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, fail: if (timing_advert->template_value) - cdf_mem_free(timing_advert->template_value); - cdf_mem_free(timing_advert); + qdf_mem_free(timing_advert->template_value); + qdf_mem_free(timing_advert); return rc; } @@ -1229,12 +1229,12 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, return -EINVAL; } - timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); + timing_advert = qdf_mem_malloc(sizeof(*timing_advert)); if (!timing_advert) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } - cdf_mem_zero(timing_advert, sizeof(sizeof(*timing_advert))); + qdf_mem_zero(timing_advert, sizeof(sizeof(*timing_advert))); timing_advert->vdev_id = adapter->sessionId; /* Parse the netlink message */ @@ -1262,7 +1262,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, } fail: - cdf_mem_free(timing_advert); + qdf_mem_free(timing_advert); return rc; } @@ -1477,11 +1477,11 @@ static void hdd_dcc_get_stats_callback(void *context_ptr, void *response_ptr) * request, delete it */ if (context->adapter->dcc_get_stats_resp) { - cdf_mem_free( + qdf_mem_free( context->adapter->dcc_get_stats_resp); } context->adapter->dcc_get_stats_resp = - cdf_mem_malloc(sizeof( + qdf_mem_malloc(sizeof( *context->adapter->dcc_get_stats_resp) + response->channel_stats_array_len); if (context->adapter->dcc_get_stats_resp) { @@ -1489,7 +1489,7 @@ static void hdd_dcc_get_stats_callback(void *context_ptr, void *response_ptr) *hdd_resp = *response; hdd_resp->channel_stats_array = (void *)hdd_resp + sizeof(*hdd_resp); - cdf_mem_copy(hdd_resp->channel_stats_array, + qdf_mem_copy(hdd_resp->channel_stats_array, response->channel_stats_array, response->channel_stats_array_len); context->status = 0; @@ -1646,7 +1646,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, end: spin_lock(&hdd_context_lock); context.magic = 0; - cdf_mem_free(adapter->dcc_get_stats_resp); + qdf_mem_free(adapter->dcc_get_stats_resp); adapter->dcc_get_stats_resp = NULL; spin_unlock(&hdd_context_lock); if (nl_resp) diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index d310bb391cea..924ac2eb2fa7 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -69,7 +69,7 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter, hdd_err("HDD configuration is null"); return -EINVAL; } - chan_list = cdf_mem_malloc(sizeof(uint8_t) * OEM_CAP_MAX_NUM_CHANNELS); + chan_list = qdf_mem_malloc(sizeof(uint8_t) * OEM_CAP_MAX_NUM_CHANNELS); if (NULL == chan_list) { hdd_err("Memory allocation failed"); return -ENOMEM; @@ -99,7 +99,7 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter, &chan_list[0], &num_chan); if (QDF_STATUS_SUCCESS != status) { hdd_err("failed to get valid channel list, status: %d", status); - cdf_mem_free(chan_list); + qdf_mem_free(chan_list); return -EINVAL; } @@ -107,15 +107,15 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter, if (num_chan > OEM_CAP_MAX_NUM_CHANNELS) { hdd_err("Num of channels-%d > length-%d of chan_list", num_chan, OEM_CAP_MAX_NUM_CHANNELS); - cdf_mem_free(chan_list); + qdf_mem_free(chan_list); return -ENOMEM; } data_cap->num_channels = num_chan; - cdf_mem_copy(data_cap->channel_list, chan_list, + qdf_mem_copy(data_cap->channel_list, chan_list, sizeof(uint8_t) * num_chan); - cdf_mem_free(chan_list); + qdf_mem_free(chan_list); return 0; } @@ -344,7 +344,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp) aniHdr->length = length; nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr) + aniHdr->length)); oemData = (uint8_t *) ((char *)aniHdr + sizeof(tAniMsgHdr)); - cdf_mem_copy(oemData, oemDataRsp, length); + qdf_mem_copy(oemData, oemDataRsp, length); skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length))); @@ -387,16 +387,16 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&oemDataReqConfig, sizeof(tOemDataReqConfig)); + qdf_mem_zero(&oemDataReqConfig, sizeof(tOemDataReqConfig)); - oemDataReqConfig.data = cdf_mem_malloc(oemDataLen); + oemDataReqConfig.data = qdf_mem_malloc(oemDataLen); if (!oemDataReqConfig.data) { hddLog(LOGE, FL("malloc failed for data req buffer")); return QDF_STATUS_E_NOMEM; } oemDataReqConfig.data_len = oemDataLen; - cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen); + qdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: calling sme_oem_data_req", __func__); @@ -406,7 +406,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) &oemDataReqConfig, &oemDataReqID); - cdf_mem_free(oemDataReqConfig.data); + qdf_mem_free(oemDataReqConfig.data); oemDataReqConfig.data = NULL; return status; @@ -510,7 +510,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList) hddChanInfo.reg_info_1 = 0; hddChanInfo.reg_info_2 = 0; } - cdf_mem_copy(pHddChanInfo, &hddChanInfo, + qdf_mem_copy(pHddChanInfo, &hddChanInfo, sizeof(tHddChannelInfo)); } @@ -575,7 +575,7 @@ static int oem_process_set_cap_req_msg(int oem_cap_len, /* message body will contain only status code */ buf = (char *)((char *)ani_hdr + sizeof(tAniMsgHdr)); - cdf_mem_copy(buf, &error_code, ani_hdr->length); + qdf_mem_copy(buf, &error_code, ani_hdr->length); skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + ani_hdr->length)); @@ -636,12 +636,12 @@ static int oem_process_get_cap_req_msg(void) nlh->nlmsg_len = NLMSG_LENGTH((sizeof(tAniMsgHdr) + ani_hdr->length)); buf = (char *)((char *)ani_hdr + sizeof(tAniMsgHdr)); - cdf_mem_copy(buf, &data_cap, sizeof(data_cap)); + qdf_mem_copy(buf, &data_cap, sizeof(data_cap)); buf = (char *) buf + sizeof(data_cap); - cdf_mem_zero(&oem_cap, sizeof(oem_cap)); + qdf_mem_zero(&oem_cap, sizeof(oem_cap)); sme_oem_get_capability(p_hdd_ctx->hHal, &oem_cap); - cdf_mem_copy(buf, &oem_cap, sizeof(oem_cap)); + qdf_mem_copy(buf, &oem_cap, sizeof(oem_cap)); skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + ani_hdr->length))); hdd_info("send rsp to oem-pid:%d for get_capability", @@ -711,7 +711,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac, pPeerInfo = (tPeerStatusInfo *) ((char *)aniHdr + sizeof(tAniMsgHdr)); - cdf_mem_copy(pPeerInfo->peer_mac_addr, peerMac->bytes, + qdf_mem_copy(pPeerInfo->peer_mac_addr, peerMac->bytes, sizeof(peerMac->bytes)); pPeerInfo->peer_status = peerStatus; pPeerInfo->vdev_id = sessionId; diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 391bcde2a2b0..b82eaf02d974 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -260,11 +260,11 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, if (pRemainChanCtx->action_pkt_buff.frame_ptr != NULL && pRemainChanCtx->action_pkt_buff.frame_length != 0) { - cdf_mem_free(pRemainChanCtx->action_pkt_buff.frame_ptr); + qdf_mem_free(pRemainChanCtx->action_pkt_buff.frame_ptr); pRemainChanCtx->action_pkt_buff.frame_ptr = NULL; pRemainChanCtx->action_pkt_buff.frame_length = 0; } - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); complete(&pAdapter->cancel_rem_on_chan_var); if (QDF_STATUS_SUCCESS != status) complete(&pAdapter->rem_on_chan_ready_event); @@ -451,12 +451,12 @@ wait: &roc_ctx->hdd_remain_on_chan_timer); if (roc_ctx->action_pkt_buff.frame_ptr != NULL && roc_ctx->action_pkt_buff.frame_length != 0) { - cdf_mem_free( + qdf_mem_free( roc_ctx->action_pkt_buff.frame_ptr); roc_ctx->action_pkt_buff.frame_ptr = NULL; roc_ctx->action_pkt_buff.frame_length = 0; } - cdf_mem_free(roc_ctx); + qdf_mem_free(roc_ctx); adapter->is_roc_inprogress = false; } mutex_unlock(&cfg_state->remain_on_chan_ctx_lock); @@ -576,7 +576,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, cfgState->remain_on_chan_ctx = NULL; pAdapter->is_roc_inprogress = false; mutex_unlock(&cfgState->remain_on_chan_ctx_lock); - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); return -EINVAL; } @@ -624,7 +624,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, mutex_unlock(&cfgState->remain_on_chan_ctx_lock); qdf_mc_timer_destroy( &pRemainChanCtx->hdd_remain_on_chan_timer); - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC); return -EINVAL; } @@ -660,7 +660,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, mutex_unlock(&cfgState->remain_on_chan_ctx_lock); qdf_mc_timer_destroy( &pRemainChanCtx->hdd_remain_on_chan_timer); - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_ROC); return -EINVAL; } @@ -709,7 +709,7 @@ static int wlan_hdd_roc_request_enqueue(hdd_adapter_t *adapter, * so enqueue this RoC Request and execute sequentially later. */ - hdd_roc_req = cdf_mem_malloc(sizeof(*hdd_roc_req)); + hdd_roc_req = qdf_mem_malloc(sizeof(*hdd_roc_req)); if (NULL == hdd_roc_req) { hddLog(LOGP, FL("malloc failed for roc req context")); @@ -727,7 +727,7 @@ static int wlan_hdd_roc_request_enqueue(hdd_adapter_t *adapter, if (QDF_STATUS_SUCCESS != status) { hddLog(LOGP, FL("Not able to enqueue RoC Req context")); - cdf_mem_free(hdd_roc_req); + qdf_mem_free(hdd_roc_req); return -EINVAL; } @@ -811,9 +811,9 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work) FL("dropping RoC request")); wlan_hdd_indicate_roc_drop(hdd_roc_req->pAdapter, hdd_roc_req->pRemainChanCtx); - cdf_mem_free(hdd_roc_req->pRemainChanCtx); + qdf_mem_free(hdd_roc_req->pRemainChanCtx); } - cdf_mem_free(hdd_roc_req); + qdf_mem_free(hdd_roc_req); } static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, @@ -849,7 +849,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, hddLog(LOGE, FL("Connection is in progress")); isBusy = true; } - pRemainChanCtx = cdf_mem_malloc(sizeof(hdd_remain_on_chan_ctx_t)); + pRemainChanCtx = qdf_mem_malloc(sizeof(hdd_remain_on_chan_ctx_t)); if (NULL == pRemainChanCtx) { hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Not able to allocate memory for Channel context", @@ -857,8 +857,8 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, return -ENOMEM; } - cdf_mem_zero(pRemainChanCtx, sizeof(*pRemainChanCtx)); - cdf_mem_copy(&pRemainChanCtx->chan, chan, + qdf_mem_zero(pRemainChanCtx, sizeof(*pRemainChanCtx)); + qdf_mem_copy(&pRemainChanCtx->chan, chan, sizeof(struct ieee80211_channel)); pRemainChanCtx->duration = duration; pRemainChanCtx->dev = dev; @@ -903,14 +903,14 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, if (status == -EBUSY) { if (wlan_hdd_roc_request_enqueue(pAdapter, pRemainChanCtx)) { - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); return -EAGAIN; } } return 0; } else { if (wlan_hdd_roc_request_enqueue(pAdapter, pRemainChanCtx)) { - cdf_mem_free(pRemainChanCtx); + qdf_mem_free(pRemainChanCtx); return -EAGAIN; } } @@ -1063,7 +1063,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter, frame_length, GFP_ATOMIC); #endif /* LINUX_VERSION_CODE */ - cdf_mem_free(pRemainChanCtx->action_pkt_buff.frame_ptr); + qdf_mem_free(pRemainChanCtx->action_pkt_buff.frame_ptr); pRemainChanCtx->action_pkt_buff.frame_length = 0; pRemainChanCtx->action_pkt_buff.freq = 0; pRemainChanCtx->action_pkt_buff.frame_ptr = NULL; @@ -1112,8 +1112,8 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, curr_roc_req); qdf_spin_unlock(&pHddCtx->hdd_roc_req_q_lock); if (qdf_status == QDF_STATUS_SUCCESS) { - cdf_mem_free(curr_roc_req->pRemainChanCtx); - cdf_mem_free(curr_roc_req); + qdf_mem_free(curr_roc_req->pRemainChanCtx); + qdf_mem_free(curr_roc_req); } return 0; } @@ -1507,13 +1507,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, send_frame: if (!noack) { - cfgState->buf = cdf_mem_malloc(len); /* buf; */ + cfgState->buf = qdf_mem_malloc(len); /* buf; */ if (cfgState->buf == NULL) return -ENOMEM; cfgState->len = len; - cdf_mem_copy(cfgState->buf, buf, len); + qdf_mem_copy(cfgState->buf, buf, len); mutex_lock(&cfgState->remain_on_chan_ctx_lock); @@ -1685,7 +1685,7 @@ void hdd_send_action_cnf(hdd_adapter_t *pAdapter, bool actionSendSuccess) cfgState->buf, cfgState->len, actionSendSuccess, GFP_KERNEL); - cdf_mem_free(cfgState->buf); + qdf_mem_free(cfgState->buf); cfgState->buf = NULL; complete(&pAdapter->tx_action_cnf_event); @@ -2173,7 +2173,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, /* Public action frame */ if ((pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET + 1] == SIR_MAC_ACTION_VENDOR_SPECIFIC) && - cdf_mem_compare(&pbFrames + !qdf_mem_cmp(&pbFrames [WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET + 2], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE)) { @@ -2297,9 +2297,9 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter, pRemainChanCtx-> action_pkt_buff. frame_ptr = - cdf_mem_malloc + qdf_mem_malloc (nFrameLength); - cdf_mem_copy + qdf_mem_copy (pRemainChanCtx-> action_pkt_buff. frame_ptr, diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index b26c9e8e36c7..61802fa7216a 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -112,7 +112,7 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable) pHddStaCtx->conn_info.connState) && (GTK_OFFLOAD_ENABLE == pHddStaCtx->gtkOffloadReqParams.ulFlags)) { - cdf_mem_copy(&hddGtkOffloadReqParams, + qdf_mem_copy(&hddGtkOffloadReqParams, &pHddStaCtx->gtkOffloadReqParams, sizeof(tSirGtkOffloadParams)); @@ -317,7 +317,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) switch (scope) { case IPV6_ADDR_SCOPE_GLOBAL: case IPV6_ADDR_SCOPE_LINKLOCAL: - cdf_mem_copy(&selfIPv6Addr[count], + qdf_mem_copy(&selfIPv6Addr[count], &ifp->addr.s6_addr, sizeof(ifp->addr.s6_addr)); selfIPv6AddrValid[count] = @@ -335,7 +335,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) } } /* read_unlock_bh(&in6_dev->lock); */ - cdf_mem_zero(&offLoadRequest, sizeof(offLoadRequest)); + qdf_mem_zero(&offLoadRequest, sizeof(offLoadRequest)); for (i = 0; i < count; i++) { /* Filling up the request structure * Filling the selfIPv6Addr with solicited address @@ -358,7 +358,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.nsOffloadInfo.selfIPv6Addr[i][15] = selfIPv6Addr[i][15]; offLoadRequest.nsOffloadInfo.slotIdx = i; - cdf_mem_copy(&offLoadRequest.nsOffloadInfo.targetIPv6Addr[i], + qdf_mem_copy(&offLoadRequest.nsOffloadInfo.targetIPv6Addr[i], &selfIPv6Addr[i][0], SIR_MAC_IPV6_ADDR_LEN); offLoadRequest.nsOffloadInfo.targetIPv6AddrValid[i] = @@ -377,7 +377,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) SIR_OFFLOAD_NS_AND_MCAST_FILTER_ENABLE; } - cdf_mem_copy(&offLoadRequest.params.hostIpv6Addr, + qdf_mem_copy(&offLoadRequest.params.hostIpv6Addr, &offLoadRequest.nsOffloadInfo.targetIPv6Addr[i], SIR_MAC_IPV6_ADDR_LEN); @@ -404,7 +404,7 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) } } else { /* Disable NSOffload */ - cdf_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq)); + qdf_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq)); offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD; @@ -765,7 +765,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) return QDF_STATUS_SUCCESS; } else { - cdf_mem_zero((void *)&offLoadRequest, + qdf_mem_zero((void *)&offLoadRequest, sizeof(tSirHostOffloadReq)); offLoadRequest.enableOrDisable = SIR_OFFLOAD_DISABLE; offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD; @@ -834,7 +834,7 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) { QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; tpSirWlanSetRxpFilters wlanRxpFilterParam = - cdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); + qdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); if (NULL == wlanRxpFilterParam) { hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cdf_mem_alloc failed ", __func__); @@ -868,7 +868,7 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) wlanRxpFilterParam->setMcstBcstFilter); if (QDF_STATUS_SUCCESS != cdf_ret_status) - cdf_mem_free(wlanRxpFilterParam); + qdf_mem_free(wlanRxpFilterParam); } #ifdef WLAN_FEATURE_PACKET_FILTERING @@ -903,13 +903,13 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set) FL("gMCAddrListEnable is not enabled in INI")); return; } - pMulticastAddrs = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); + pMulticastAddrs = qdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == pMulticastAddrs) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("Could not allocate Memory")); return; } - cdf_mem_zero(pMulticastAddrs, sizeof(tSirRcvFltMcAddrList)); + qdf_mem_zero(pMulticastAddrs, sizeof(tSirRcvFltMcAddrList)); pMulticastAddrs->action = set; if (set) { @@ -964,7 +964,7 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set) pMulticastAddrs->ulMulticastAddrCnt); pAdapter->mc_addr_list.isFilterApplied = set ? true : false; - cdf_mem_free(pMulticastAddrs); + qdf_mem_free(pMulticastAddrs); return; } #endif diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index b965b7a7a5ec..be7d6df53f9a 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -112,7 +112,7 @@ static int hdd_add_iw_stream_event(int cmd, int length, char *data, struct iw_event event; *last_event = *current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); event.cmd = cmd; event.u.data.flags = 1; event.u.data.length = length; @@ -219,12 +219,12 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, error = 0; last_event = current_event; - cdf_mem_zero(&event, sizeof(event)); + qdf_mem_zero(&event, sizeof(event)); /* BSSID */ event.cmd = SIOCGIWAP; event.u.ap_addr.sa_family = ARPHRD_ETHER; - cdf_mem_copy(event.u.ap_addr.sa_data, descriptor->bssId, + qdf_mem_copy(event.u.ap_addr.sa_data, descriptor->bssId, sizeof(descriptor->bssId)); current_event = iwe_stream_add_event(scanInfo->info, current_event, end, &event, IW_EV_ADDR_LEN); @@ -237,7 +237,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, } last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); /* Protocol Name */ event.cmd = SIOCGIWNAME; @@ -273,7 +273,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, } last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); /*Freq */ event.cmd = SIOCGIWFREQ; @@ -291,7 +291,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, } last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); /* BSS Mode */ event.cmd = SIOCGIWMODE; @@ -341,7 +341,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, if (pDot11SSID->present) { last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); event.cmd = SIOCGIWESSID; event.u.data.flags = 1; @@ -369,7 +369,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, last_event = current_event; current_pad = current_event + IW_EV_LCP_LEN; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); /*Rates */ event.cmd = SIOCGIWRATE; @@ -444,7 +444,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, } last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); event.cmd = SIOCGIWENCODE; @@ -467,7 +467,7 @@ static int hdd_indicate_scan_result(hdd_scan_info_t *scanInfo, } last_event = current_event; - cdf_mem_zero(&event, sizeof(struct iw_event)); + qdf_mem_zero(&event, sizeof(struct iw_event)); /* RSSI */ event.cmd = IWEVQUAL; @@ -526,7 +526,7 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, QDF_STATUS status; ENTER(); - hdd_scan_req = cdf_mem_malloc(sizeof(*hdd_scan_req)); + hdd_scan_req = qdf_mem_malloc(sizeof(*hdd_scan_req)); if (NULL == hdd_scan_req) { hddLog(LOGP, FL("malloc failed for Scan req")); return -ENOMEM; @@ -545,7 +545,7 @@ static int wlan_hdd_scan_request_enqueue(hdd_adapter_t *adapter, if (QDF_STATUS_SUCCESS != status) { hdd_err("Failed to enqueue Scan Req"); - cdf_mem_free(hdd_scan_req); + qdf_mem_free(hdd_scan_req); return -EINVAL; } EXIT(); @@ -599,7 +599,7 @@ QDF_STATUS wlan_hdd_scan_request_dequeue(hdd_context_t *hdd_ctx, *req = hdd_scan_req->scan_request; *source = hdd_scan_req->source; *timestamp = hdd_scan_req->timestamp; - cdf_mem_free(hdd_scan_req); + qdf_mem_free(hdd_scan_req); qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); hdd_info("removed Scan id: %d, req = %p", scan_id, req); @@ -734,7 +734,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, } } - cdf_mem_zero(&scanRequest, sizeof(scanRequest)); + qdf_mem_zero(&scanRequest, sizeof(scanRequest)); if (NULL != wrqu->data.pointer) { /* set scanType, active or passive */ @@ -746,7 +746,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, } /* set bssid using sockaddr from iw_scan_req */ - cdf_mem_copy(scanRequest.bssid.bytes, + qdf_mem_copy(scanRequest.bssid.bytes, &scanReq->bssid.sa_data, QDF_MAC_ADDR_SIZE); @@ -756,11 +756,11 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, scanRequest.SSIDs.numOfSSIDs = 1; scanRequest.SSIDs.SSIDList = (tCsrSSIDInfo *) - cdf_mem_malloc(sizeof(tCsrSSIDInfo)); + qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (scanRequest.SSIDs.SSIDList) { scanRequest.SSIDs.SSIDList->SSID. length = scanReq->essid_len; - cdf_mem_copy(scanRequest.SSIDs. + qdf_mem_copy(scanRequest.SSIDs. SSIDList->SSID.ssId, scanReq->essid, scanReq->essid_len); @@ -845,7 +845,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, pAdapter->scan_info.mScanPending = true; error: if ((wrqu->data.flags & IW_SCAN_THIS_ESSID) && (scanReq->essid_len)) - cdf_mem_free(scanRequest.SSIDs.SSIDList); + qdf_mem_free(scanRequest.SSIDs.SSIDList); EXIT(); return status; } @@ -1014,7 +1014,7 @@ static void hdd_vendor_scan_callback(hdd_adapter_t *adapter, if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hdd_err("Invalid adapter magic"); - cdf_mem_free(req); + qdf_mem_free(req); return; } skb = cfg80211_vendor_event_alloc(hddctx->wiphy, NULL, @@ -1024,7 +1024,7 @@ static void hdd_vendor_scan_callback(hdd_adapter_t *adapter, if (!skb) { hdd_err("skb alloc failed"); - cdf_mem_free(req); + qdf_mem_free(req); return; } @@ -1069,12 +1069,12 @@ static void hdd_vendor_scan_callback(hdd_adapter_t *adapter, goto nla_put_failure; cfg80211_vendor_event(skb, GFP_KERNEL); - cdf_mem_free(req); + qdf_mem_free(req); return; nla_put_failure: kfree_skb(skb); - cdf_mem_free(req); + qdf_mem_free(req); return; } @@ -1346,7 +1346,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, return -EBUSY; } - cdf_mem_zero(&scan_req, sizeof(scan_req)); + qdf_mem_zero(&scan_req, sizeof(scan_req)); hddLog(LOG1, "scan request for ssid = %d", request->n_ssids); scan_req.timestamp = qdf_mc_timer_get_system_ticks(); @@ -1366,7 +1366,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, scan_req.SSIDs.numOfSSIDs = request->n_ssids; /* Allocate num_ssid tCsrSSIDInfo structure */ SsidInfo = scan_req.SSIDs.SSIDList = - cdf_mem_malloc(request->n_ssids * sizeof(tCsrSSIDInfo)); + qdf_mem_malloc(request->n_ssids * sizeof(tCsrSSIDInfo)); if (NULL == scan_req.SSIDs.SSIDList) { hddLog(LOGE, FL("memory alloc failed SSIDInfo buffer")); @@ -1377,7 +1377,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, for (j = 0; j < request->n_ssids; j++, SsidInfo++) { /* get the ssid length */ SsidInfo->SSID.length = request->ssids[j].ssid_len; - cdf_mem_copy(SsidInfo->SSID.ssId, + qdf_mem_copy(SsidInfo->SSID.ssId, &request->ssids[j].ssid[0], SsidInfo->SSID.length); SsidInfo->SSID.ssId[SsidInfo->SSID.length] = '\0'; @@ -1416,7 +1416,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, if (request->n_channels) { char chList[(request->n_channels * 5) + 1]; int len; - channelList = cdf_mem_malloc(request->n_channels); + channelList = qdf_mem_malloc(request->n_channels); if (NULL == channelList) { hddLog(LOGE, FL("channelList malloc failed channelList")); @@ -1573,10 +1573,10 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, free_mem: if (scan_req.SSIDs.SSIDList) - cdf_mem_free(scan_req.SSIDs.SSIDList); + qdf_mem_free(scan_req.SSIDs.SSIDList); if (channelList) - cdf_mem_free(channelList); + qdf_mem_free(channelList); EXIT(); return status; @@ -1759,7 +1759,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, len = sizeof(*request) + (sizeof(*request->ssids) * n_ssid) + (sizeof(*request->channels) * n_channels) + ie_len; - request = cdf_mem_malloc(len); + request = qdf_mem_malloc(len); if (!request) goto error; if (n_ssid) @@ -1864,7 +1864,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, return ret; error: hdd_err("Scan Request Failed"); - cdf_mem_free(request); + qdf_mem_free(request); return -EINVAL; } @@ -2084,9 +2084,9 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -ENOTSUPP; } - pPnoRequest = (tpSirPNOScanReq) cdf_mem_malloc(sizeof(tSirPNOScanReq)); + pPnoRequest = (tpSirPNOScanReq) qdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == pPnoRequest) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -2260,7 +2260,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, hddLog(LOG1, FL("PNO scanRequest offloaded")); error: - cdf_mem_free(pPnoRequest); + qdf_mem_free(pPnoRequest); EXIT(); return ret; } @@ -2345,9 +2345,9 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, return -EINVAL; } - pPnoRequest = (tpSirPNOScanReq) cdf_mem_malloc(sizeof(tSirPNOScanReq)); + pPnoRequest = (tpSirPNOScanReq) qdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == pPnoRequest) { - hddLog(LOGE, FL("cdf_mem_malloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -2368,7 +2368,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, hddLog(LOG1, FL("PNO scan disabled")); - cdf_mem_free(pPnoRequest); + qdf_mem_free(pPnoRequest); EXIT(); return ret; diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 5404b3321eb0..a39a5dc33cd0 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -298,7 +298,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->stats.tx_packets; /* Zero out skb's context buffer for the driver to use */ - cdf_mem_set(skb->cb, sizeof(skb->cb), 0); + qdf_mem_set(skb->cb, sizeof(skb->cb), 0); NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); @@ -400,12 +400,12 @@ QDF_STATUS hdd_softap_init_tx_rx(hdd_adapter_t *pAdapter) uint8_t STAId = 0; - cdf_mem_zero(&pAdapter->stats, sizeof(struct net_device_stats)); + qdf_mem_zero(&pAdapter->stats, sizeof(struct net_device_stats)); spin_lock_init(&pAdapter->staInfo_lock); for (STAId = 0; STAId < WLAN_MAX_STA_COUNT; STAId++) { - cdf_mem_zero(&pAdapter->aStaInfo[STAId], + qdf_mem_zero(&pAdapter->aStaInfo[STAId], sizeof(hdd_station_info_t)); } @@ -446,7 +446,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId, return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&pAdapter->aStaInfo[STAId], sizeof(hdd_station_info_t)); + qdf_mem_zero(&pAdapter->aStaInfo[STAId], sizeof(hdd_station_info_t)); pAdapter->aStaInfo[STAId].isUsed = true; pAdapter->aStaInfo[STAId].isDeauthInProgress = false; @@ -633,7 +633,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) if (pAdapter->aStaInfo[staId].isUsed) { spin_lock_bh(&pAdapter->staInfo_lock); - cdf_mem_zero(&pAdapter->aStaInfo[staId], + qdf_mem_zero(&pAdapter->aStaInfo[staId], sizeof(hdd_station_info_t)); spin_unlock_bh(&pAdapter->staInfo_lock); } @@ -907,7 +907,7 @@ QDF_STATUS hdd_softap_get_sta_id(hdd_adapter_t *pAdapter, uint8_t i; for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { - if (cdf_mem_compare + if (!qdf_mem_cmp (&pAdapter->aStaInfo[i].macAddrSTA, pMacAddress, QDF_MAC_ADDR_SIZE) && pAdapter->aStaInfo[i].isUsed) { *staId = i; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 93333ba91d2b..0ae9540a7d59 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -587,7 +587,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, pInfo->state = WIFI_ASSOCIATED; qdf_copy_macaddr(&pInfo->bssid, &pHddStaCtx->conn_info.bssId); - cdf_mem_copy(pInfo->ssid, + qdf_mem_copy(pInfo->ssid, pHddStaCtx->conn_info.SSID.SSID.ssId, pHddStaCtx->conn_info.SSID.SSID.length); /* @@ -597,10 +597,10 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, } } - cdf_mem_copy(pInfo->countryStr, + qdf_mem_copy(pInfo->countryStr, pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN); - cdf_mem_copy(pInfo->apCountryStr, + qdf_mem_copy(pInfo->apCountryStr, pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN); return true; diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 67e0c26d70e9..326194305046 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -390,7 +390,7 @@ static void wlan_hdd_tdls_free_list(tdlsCtx_t *pHddTdlsCtx) list_for_each_safe(pos, q, head) { tmp = list_entry(pos, hddTdlsPeer_t, node); list_del(pos); - cdf_mem_free(tmp); + qdf_mem_free(tmp); tmp = NULL; } } @@ -496,7 +496,7 @@ static void wlan_hdd_tdls_del_non_forced_peers(tdlsCtx_t *hdd_tdls_ctx) peer = list_entry(pos, hddTdlsPeer_t, node); if (false == peer->isForcedPeer) { list_del(pos); - cdf_mem_free(peer); + qdf_mem_free(peer); } else { peer->link_status = eTDLS_LINK_IDLE; peer->reason = eTDLS_LINK_UNSPECIFIED; @@ -572,7 +572,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) * with the memory allocations. */ if (NULL == pAdapter->sessionCtx.station.pHddTdlsCtx) { - pHddTdlsCtx = cdf_mem_malloc(sizeof(tdlsCtx_t)); + pHddTdlsCtx = qdf_mem_malloc(sizeof(tdlsCtx_t)); if (NULL == pHddTdlsCtx) { pAdapter->sessionCtx.station.pHddTdlsCtx = NULL; @@ -581,7 +581,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) return -ENOMEM; } /* initialize TDLS pAdater context */ - cdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t)); + qdf_mem_zero(pHddTdlsCtx, sizeof(tdlsCtx_t)); qdf_mc_timer_init(&pHddTdlsCtx->peerDiscoveryTimeoutTimer, QDF_TIMER_TYPE_SW, @@ -623,7 +623,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) for (staIdx = 0; staIdx < pHddCtx->max_num_tdls_sta; staIdx++) { pHddCtx->tdlsConnInfo[staIdx].staId = 0; pHddCtx->tdlsConnInfo[staIdx].sessionId = 255; - cdf_mem_zero(&pHddCtx->tdlsConnInfo[staIdx].peerMac, + qdf_mem_zero(&pHddCtx->tdlsConnInfo[staIdx].peerMac, QDF_MAC_ADDR_SIZE); } @@ -677,12 +677,12 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) * which would try to acquire sme lock. */ mutex_unlock(&pHddCtx->tdls_lock); - tInfo = cdf_mem_malloc(sizeof(tdlsInfo_t)); + tInfo = qdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tInfo) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("cdf_mem_alloc failed for tInfo")); qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); - cdf_mem_free(pHddTdlsCtx); + qdf_mem_free(pHddTdlsCtx); return -ENOMEM; } @@ -724,9 +724,9 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - cdf_mem_free(tInfo); + qdf_mem_free(tInfo); qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); - cdf_mem_free(pHddTdlsCtx); + qdf_mem_free(pHddTdlsCtx); return -EINVAL; } @@ -787,7 +787,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) /* No need to post message during driver unlaod because MC thread is already shutdown */ if (!cds_is_driver_unloading()) { - tInfo = cdf_mem_malloc(sizeof(tdlsInfo_t)); + tInfo = qdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL != tInfo) { tInfo->vdev_id = pAdapter->sessionId; tInfo->tdls_state = eTDLS_SUPPORT_DISABLED; @@ -827,7 +827,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, false); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - cdf_mem_free(tInfo); + qdf_mem_free(tInfo); } } else { hddLog(QDF_TRACE_LEVEL_ERROR, @@ -838,7 +838,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) pHddTdlsCtx->magic = 0; pHddTdlsCtx->pAdapter = NULL; - cdf_mem_free(pHddTdlsCtx); + qdf_mem_free(pHddTdlsCtx); pAdapter->sessionCtx.station.pHddTdlsCtx = NULL; pHddTdlsCtx = NULL; @@ -897,7 +897,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac) } /* not found, allocate and add the list */ - peer = cdf_mem_malloc(sizeof(hddTdlsPeer_t)); + peer = qdf_mem_malloc(sizeof(hddTdlsPeer_t)); if (NULL == peer) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s peer malloc failed!", __func__); @@ -909,7 +909,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac) pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); if (NULL == pHddTdlsCtx) { - cdf_mem_free(peer); + qdf_mem_free(peer); mutex_unlock(&pHddCtx->tdls_lock); hddLog(LOG1, FL("pHddTdlsCtx is NULL")); return NULL; @@ -918,8 +918,8 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac) key = wlan_hdd_tdls_hash_key(mac); head = &pHddTdlsCtx->peer_list[key]; - cdf_mem_zero(peer, sizeof(hddTdlsPeer_t)); - cdf_mem_copy(peer->peerMac, mac, sizeof(peer->peerMac)); + qdf_mem_zero(peer, sizeof(hddTdlsPeer_t)); + qdf_mem_copy(peer->peerMac, mac, sizeof(peer->peerMac)); peer->pHddTdlsCtx = pHddTdlsCtx; peer->pref_off_chan_num = pHddCtx->config->fTDLSPrefOffChanNum; peer->op_class_for_pref_off_chan = @@ -1201,13 +1201,13 @@ int wlan_hdd_tdls_set_peer_caps(hdd_adapter_t *pAdapter, curr_peer->isBufSta = isBufSta; curr_peer->isOffChannelSupported = isOffChannelSupported; - cdf_mem_copy(curr_peer->supported_channels, + qdf_mem_copy(curr_peer->supported_channels, StaParams->supported_channels, StaParams->supported_channels_len); curr_peer->supported_channels_len = StaParams->supported_channels_len; - cdf_mem_copy(curr_peer->supported_oper_classes, + qdf_mem_copy(curr_peer->supported_oper_classes, StaParams->supported_oper_classes, StaParams->supported_oper_classes_len); @@ -1245,14 +1245,14 @@ int wlan_hdd_tdls_get_link_establish_params(hdd_adapter_t *pAdapter, tdlsLinkEstablishParams->isOffChannelSupported = curr_peer->isOffChannelSupported; - cdf_mem_copy(tdlsLinkEstablishParams->supportedChannels, + qdf_mem_copy(tdlsLinkEstablishParams->supportedChannels, curr_peer->supported_channels, curr_peer->supported_channels_len); tdlsLinkEstablishParams->supportedChannelsLen = curr_peer->supported_channels_len; - cdf_mem_copy(tdlsLinkEstablishParams->supportedOperClasses, + qdf_mem_copy(tdlsLinkEstablishParams->supportedOperClasses, curr_peer->supported_oper_classes, curr_peer->supported_oper_classes_len); @@ -1628,7 +1628,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, wlan_hdd_tdls_set_mode(pHddCtx, req_tdls_mode, true); - tdlsParams = cdf_mem_malloc(sizeof(tdlsInfo_t)); + tdlsParams = qdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tdlsParams) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: cdf_mem_alloc failed for tdlsParams", __func__); @@ -1667,7 +1667,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - cdf_mem_free(tdlsParams); + qdf_mem_free(tdlsParams); return -EINVAL; } @@ -1724,7 +1724,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, hdd_ctx->tdls_mode = eTDLS_SUPPORT_ENABLED; } mutex_unlock(&hdd_ctx->tdls_lock); - tdls_param = cdf_mem_malloc(sizeof(*tdls_param)); + tdls_param = qdf_mem_malloc(sizeof(*tdls_param)); if (!tdls_param) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("memory allocation failed for tdlsParams")); @@ -1778,7 +1778,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, tdls_param, true); if (QDF_STATUS_SUCCESS != cdf_ret_status) { - cdf_mem_free(tdls_param); + qdf_mem_free(tdls_param); return; } return; @@ -1859,7 +1859,7 @@ int wlan_hdd_tdls_update_peer_mac(hdd_adapter_t *adapter, const uint8_t *mac, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); sme_tdls_peer_state_params.vdevId = adapter->sessionId; - cdf_mem_copy(&sme_tdls_peer_state_params.peerMacAddr, mac, + qdf_mem_copy(&sme_tdls_peer_state_params.peerMacAddr, mac, sizeof(sme_tdls_peer_state_params.peerMacAddr)); sme_tdls_peer_state_params.peerState = peer_state; status = sme_update_tdls_peer_state(hdd_ctx->hHal, @@ -2436,7 +2436,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work) goto done; } - cdf_mem_copy(&peer_mac, curr_peer->peerMac, sizeof(peer_mac)); + qdf_mem_copy(&peer_mac, curr_peer->peerMac, sizeof(peer_mac)); mutex_unlock(&pHddCtx->tdls_lock); @@ -3801,7 +3801,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, } } } - cdf_mem_copy(peerMac, peer, 6); + qdf_mem_copy(peerMac, peer, 6); hddLog(LOG1, "%s: " MAC_ADDRESS_STR @@ -4272,13 +4272,13 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS == status) { uint8_t i; - cdf_mem_zero(&smeTdlsPeerStateParams, + qdf_mem_zero(&smeTdlsPeerStateParams, sizeof (tSmeTdlsPeerStateParams)); smeTdlsPeerStateParams.vdevId = pAdapter->sessionId; - cdf_mem_copy(&smeTdlsPeerStateParams. + qdf_mem_copy(&smeTdlsPeerStateParams. peerMacAddr, &pTdlsPeer->peerMac, sizeof(tSirMacAddr)); @@ -4818,7 +4818,7 @@ int hdd_set_tdls_offchannelmode(hdd_adapter_t *adapter, int offchanmode) chan_switch_params.tdls_off_ch_mode = offchanmode; chan_switch_params.is_responder = conn_peer->is_responder; - cdf_mem_copy(&chan_switch_params.peer_mac_addr, + qdf_mem_copy(&chan_switch_params.peer_mac_addr, &conn_peer->peerMac, sizeof(tSirMacAddr)); hdd_log(LOG1, diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 749ebddee640..d176b819d0b7 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -475,7 +475,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->stats.tx_packets; /* Zero out skb's context buffer for the driver to use */ - cdf_mem_set(skb->cb, sizeof(skb->cb), 0); + qdf_mem_set(skb->cb, sizeof(skb->cb), 0); NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); @@ -531,7 +531,7 @@ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, uint8_t idx; for (idx = 0; idx < MAX_IBSS_PEERS; idx++) { - if (cdf_mem_compare(&pHddStaCtx->conn_info.peerMacAddress[idx], + if (!qdf_mem_cmp(&pHddStaCtx->conn_info.peerMacAddress[idx], pMacAddress, QDF_MAC_ADDR_SIZE)) { *staId = pHddStaCtx->conn_info.staId[idx]; return QDF_STATUS_SUCCESS; @@ -802,10 +802,10 @@ static int wlan_hdd_get_eapol_params(struct sk_buff *skb, eapol_params->event_sub_type = event_type; eapol_params->eapol_rate = 0;/* As of now, zero */ - cdf_mem_copy(eapol_params->dest_addr, + qdf_mem_copy(eapol_params->dest_addr, (skb->data + HDD_EAPOL_DEST_MAC_OFFSET), sizeof(eapol_params->dest_addr)); - cdf_mem_copy(eapol_params->src_addr, + qdf_mem_copy(eapol_params->src_addr, (skb->data + HDD_EAPOL_SRC_MAC_OFFSET), sizeof(eapol_params->src_addr)); return 0; @@ -828,10 +828,10 @@ static void wlan_hdd_event_eapol_log(struct host_event_wlan_eapol eapol_params) wlan_diag_event.eapol_packet_type = eapol_params.eapol_packet_type; wlan_diag_event.eapol_key_info = eapol_params.eapol_key_info; wlan_diag_event.eapol_rate = eapol_params.eapol_rate; - cdf_mem_copy(wlan_diag_event.dest_addr, + qdf_mem_copy(wlan_diag_event.dest_addr, eapol_params.dest_addr, sizeof(wlan_diag_event.dest_addr)); - cdf_mem_copy(wlan_diag_event.src_addr, + qdf_mem_copy(wlan_diag_event.src_addr, eapol_params.src_addr, sizeof(wlan_diag_event.src_addr)); diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index b91a1f354bce..daa2cb4ecd50 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1340,7 +1340,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__); return QDF_STATUS_E_FAULT; } - linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req)); + linkspeed_req = qdf_mem_malloc(sizeof(*linkspeed_req)); if (NULL == linkspeed_req) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); @@ -1358,7 +1358,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve statistics for link speed", __func__); - cdf_mem_free(linkspeed_req); + qdf_mem_free(linkspeed_req); } else { rc = wait_for_completion_timeout (&context.completion, @@ -1471,17 +1471,17 @@ void hdd_statistics_cb(void *pStats, void *pContext) /* copy the stats into the cache we keep in the * adapter instance structure */ - cdf_mem_copy(&pStatsCache->summary_stat, pSummaryStats, + qdf_mem_copy(&pStatsCache->summary_stat, pSummaryStats, sizeof(pStatsCache->summary_stat)); - cdf_mem_copy(&pStatsCache->ClassA_stat, pClassAStats, + qdf_mem_copy(&pStatsCache->ClassA_stat, pClassAStats, sizeof(pStatsCache->ClassA_stat)); - cdf_mem_copy(&pStatsCache->ClassB_stat, pClassBStats, + qdf_mem_copy(&pStatsCache->ClassB_stat, pClassBStats, sizeof(pStatsCache->ClassB_stat)); - cdf_mem_copy(&pStatsCache->ClassC_stat, pClassCStats, + qdf_mem_copy(&pStatsCache->ClassC_stat, pClassCStats, sizeof(pStatsCache->ClassC_stat)); - cdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, + qdf_mem_copy(&pStatsCache->ClassD_stat, pClassDStats, sizeof(pStatsCache->ClassD_stat)); - cdf_mem_copy(&pStatsCache->perStaStats, pPerStaStats, + qdf_mem_copy(&pStatsCache->perStaStats, pPerStaStats, sizeof(pStatsCache->perStaStats)); } @@ -2645,7 +2645,7 @@ static int __iw_get_genie(struct net_device *dev, __func__); return -EFAULT; } - cdf_mem_copy(extra, (void *)genIeBytes, length); + qdf_mem_copy(extra, (void *)genIeBytes, length); wrqu->data.length = length; hddLog(LOG1, "%s: RSN IE of %d bytes returned", __func__, @@ -2717,7 +2717,7 @@ static int __iw_get_encode(struct net_device *dev, if (pRoamProfile->Keys.KeyLength[keyId] > 0) { dwrq->flags |= IW_ENCODE_ENABLED; dwrq->length = pRoamProfile->Keys.KeyLength[keyId]; - cdf_mem_copy(extra, &(pRoamProfile->Keys.KeyMaterial[keyId][0]), + qdf_mem_copy(extra, &(pRoamProfile->Keys.KeyMaterial[keyId][0]), pRoamProfile->Keys.KeyLength[keyId]); dwrq->flags |= (keyId + 1); @@ -3884,7 +3884,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, || (eCSR_AUTH_TYPE_SHARED_KEY == pHddStaCtx->conn_info.authType))) { - cdf_mem_copy(&pWextState->roamProfile.Keys. + qdf_mem_copy(&pWextState->roamProfile.Keys. KeyMaterial[keyId][0], extra, key_length); pWextState->roamProfile.Keys.KeyLength[keyId] = @@ -3959,7 +3959,7 @@ static int __iw_get_encodeext(struct net_device *dev, if (pRoamProfile->Keys.KeyLength[keyId] > 0) { dwrq->flags |= IW_ENCODE_ENABLED; dwrq->length = pRoamProfile->Keys.KeyLength[keyId]; - cdf_mem_copy(extra, &(pRoamProfile->Keys.KeyMaterial[keyId][0]), + qdf_mem_copy(extra, &(pRoamProfile->Keys.KeyMaterial[keyId][0]), pRoamProfile->Keys.KeyLength[keyId]); } else { dwrq->flags |= IW_ENCODE_DISABLED; @@ -4080,7 +4080,7 @@ static int __iw_set_encodeext(struct net_device *dev, && (ext->key_len <= eCSR_SECURITY_WEP_KEYSIZE_MAX_BYTES) && key_index < CSR_MAX_NUM_KEY) { - cdf_mem_copy(&pRoamProfile->Keys. + qdf_mem_copy(&pRoamProfile->Keys. KeyMaterial[key_index][0], ext->key, ext->key_len); pRoamProfile->Keys.KeyLength[key_index] = @@ -4095,13 +4095,13 @@ static int __iw_set_encodeext(struct net_device *dev, return ret; } - cdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); + qdf_mem_zero(&setKey, sizeof(tCsrRoamSetKey)); setKey.keyId = key_index; setKey.keyLength = ext->key_len; if (ext->key_len <= CSR_MAX_KEY_LEN) { - cdf_mem_copy(&setKey.Key[0], ext->key, ext->key_len); + qdf_mem_copy(&setKey.Key[0], ext->key, ext->key_len); } if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) { @@ -4111,7 +4111,7 @@ static int __iw_set_encodeext(struct net_device *dev, } else { setKey.keyDirection = eSIR_TX_RX; - cdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, + qdf_mem_copy(setKey.peerMac.bytes, ext->addr.sa_data, QDF_MAC_ADDR_SIZE); } @@ -4135,7 +4135,7 @@ static int __iw_set_encodeext(struct net_device *dev, setKey.encType = eCSR_ENCRYPT_TYPE_TKIP; - cdf_mem_zero(pKey, CSR_MAX_KEY_LEN); + qdf_mem_zero(pKey, CSR_MAX_KEY_LEN); /* Supplicant sends the 32bytes key in this order * |--------------|----------|----------| @@ -4152,13 +4152,13 @@ static int __iw_set_encodeext(struct net_device *dev, */ /* Copy the Temporal Key 1 (TK1) */ - cdf_mem_copy(pKey, ext->key, 16); + qdf_mem_copy(pKey, ext->key, 16); /* Copy the rx mic first */ - cdf_mem_copy(&pKey[16], &ext->key[24], 8); + qdf_mem_copy(&pKey[16], &ext->key[24], 8); /* Copy the tx mic */ - cdf_mem_copy(&pKey[24], &ext->key[16], 8); + qdf_mem_copy(&pKey[24], &ext->key[16], 8); } break; @@ -6247,7 +6247,7 @@ static int __iw_setchar_getnone(struct net_device *dev, neighborReq.ssid.length = (s_priv_data.length - 1) > 32 ? 32 : (s_priv_data.length - 1); - cdf_mem_copy(neighborReq.ssid.ssId, + qdf_mem_copy(neighborReq.ssid.ssId, pBuffer, neighborReq.ssid.length); } @@ -7903,7 +7903,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, apps_args[1]); return -EINVAL; } - unitTestArgs = cdf_mem_malloc(sizeof(*unitTestArgs)); + unitTestArgs = qdf_mem_malloc(sizeof(*unitTestArgs)); if (NULL == unitTestArgs) { hddLog(LOGE, FL("cdf_mem_alloc failed for unitTestArgs")); @@ -7920,7 +7920,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, msg.bodyptr = unitTestArgs; if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { - cdf_mem_free(unitTestArgs); + qdf_mem_free(unitTestArgs); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 9f516fd8aa71..209e7fcfa345 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -516,7 +516,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) QDF_STATUS cdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - cdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams)); + qdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams)); wowParams.ucPatternFilteringEnable = enable_pbm; wowParams.ucMagicPktEnable = enable_mp; diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c index e5578431e907..1a62f21962ca 100644 --- a/core/mac/src/cfg/cfg_api.c +++ b/core/mac/src/cfg/cfg_api.c @@ -150,7 +150,7 @@ tSirRetStatus cfg_init(tpAniSirGlobal pMac) return eSIR_MEM_ALLOC_FAILED; } /* at this point pMac->cfg.gCfgSBuf starts */ - pMac->cfg.gCfgSBuf = cdf_mem_malloc(combined_buff_size); + pMac->cfg.gCfgSBuf = qdf_mem_malloc(combined_buff_size); if (NULL == pMac->cfg.gCfgSBuf) { cfg_log(pMac, LOGE, FL("Failed to allocate memory for cfg array")); @@ -163,13 +163,13 @@ tSirRetStatus cfg_init(tpAniSirGlobal pMac) /* after max_i_count integers, pMac->cfg.gCfgIBufMax starts */ pMac->cfg.gCfgIBufMax = &pMac->cfg.gCfgIBufMin[max_i_count]; - return (eSIR_SUCCESS); + return eSIR_SUCCESS; } /* ---------------------------------------------------------------------- */ void cfg_de_init(tpAniSirGlobal pMac) { - cdf_mem_free(pMac->cfg.gCfgSBuf); + qdf_mem_free(pMac->cfg.gCfgSBuf); pMac->cfg.gCfgIBufMin = NULL; pMac->cfg.gCfgIBufMax = NULL; pMac->cfg.gCfgIBuf = NULL; @@ -599,7 +599,7 @@ cfg_get_dot11d_transmit_power(tpAniSirGlobal pMac, uint16_t cfgId, goto error; } - pCountryInfo = cdf_mem_malloc(cfgLength); + pCountryInfo = qdf_mem_malloc(cfgLength); if (NULL == pCountryInfo) { cfg_log(pMac, LOGP, FL(" failed to allocate memory")); goto error; @@ -609,7 +609,7 @@ cfg_get_dot11d_transmit_power(tpAniSirGlobal pMac, uint16_t cfgId, */ if (wlan_cfg_get_str(pMac, cfgId, pCountryInfo, &cfgLength) != eSIR_SUCCESS) { - cdf_mem_free(pCountryInfo); + qdf_mem_free(pCountryInfo); pCountryInfo = NULL; cfg_log(pMac, LOGP, @@ -633,7 +633,7 @@ cfg_get_dot11d_transmit_power(tpAniSirGlobal pMac, uint16_t cfgId, error: if (NULL != pCountryInfo) - cdf_mem_free(pCountryInfo); + qdf_mem_free(pCountryInfo); return maxTxPwr; } @@ -694,7 +694,7 @@ int8_t cfg_get_regulatory_max_transmit_power(tpAniSirGlobal pMac, maxTxPwr = cfg_get_dot11d_transmit_power(pMac, cfgId, cfgLength, channel); - return (maxTxPwr); + return maxTxPwr; } /* --------------------------------------------------------------------- */ diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index ebc8506be4e4..4c9969b84ef3 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.c @@ -1822,7 +1822,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg) index = CFG_GET_FUNC_INDX(pMsg->type); if (index >= QDF_ARRAY_SIZE(g_cfg_func)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return; } len = pMsg->msgLen - WNI_CFG_MB_HDR_LEN; @@ -1832,7 +1832,7 @@ void cfg_process_mb_msg(tpAniSirGlobal pMac, tSirMbMsg *pMsg) g_cfg_func[index] (pMac, len, pParam); /* Free up buffer */ - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); } /*** end cfg_process_mb_msg() ***/ diff --git a/core/mac/src/cfg/cfg_send_msg.c b/core/mac/src/cfg/cfg_send_msg.c index ebad7c739f7b..a50652c063db 100644 --- a/core/mac/src/cfg/cfg_send_msg.c +++ b/core/mac/src/cfg/cfg_send_msg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -92,7 +92,7 @@ cfg_send_host_msg(tpAniSirGlobal pMac, uint16_t msgType, uint32_t msgLen, return; } /* Allocate message buffer */ - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) { PELOGE(cfg_log(pMac, LOGE, FL("Memory allocation failure!"));) return; @@ -129,7 +129,7 @@ cfg_send_host_msg(tpAniSirGlobal pMac, uint16_t msgType, uint32_t msgLen, default: PELOGE(cfg_log(pMac, LOGE, FL("Unknown msg %d!"), (int)msgType);) - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return; } diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c index e1bbe39f63ce..0e592d18a774 100644 --- a/core/mac/src/dph/dph_hash_table.c +++ b/core/mac/src/dph/dph_hash_table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -104,7 +104,7 @@ uint16_t hash_function(tpAniSirGlobal pMac, uint8_t staAddr[], uint16_t numSta) for (i = 0; i < 6; i++) sum += staAddr[i]; - return (sum % numSta); + return sum % numSta; } /* --------------------------------------------------------------------- */ @@ -250,7 +250,7 @@ tpDphHashNode dph_init_sta_state(tpAniSirGlobal pMac, tSirMacAddr staAddr, (pMac, LOG1, FL("Assoc Id %d, Addr %08X"), assocId, pStaDs); ) /* Clear the STA node except for the next pointer (last 4 bytes) */ - cdf_mem_set((uint8_t *) pStaDs, + qdf_mem_set((uint8_t *) pStaDs, sizeof(tDphHashNode) - sizeof(tpDphHashNode), 0); /* Initialize the assocId */ @@ -261,7 +261,7 @@ tpDphHashNode dph_init_sta_state(tpAniSirGlobal pMac, tSirMacAddr staAddr, pStaDs->staIndex = STA_INVALID_IDX; /* Initialize STA mac address */ - cdf_mem_copy(pStaDs->staAddr, staAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(pStaDs->staAddr, staAddr, sizeof(tSirMacAddr)); /* Initialize fragmentation threshold */ if (wlan_cfg_get_int(pMac, WNI_CFG_FRAGMENTATION_THRESHOLD, &val) != diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index 7dd6fca75246..a0644c3938c0 100644 --- a/core/mac/src/pe/lim/lim_admit_control.c +++ b/core/mac/src/pe/lim/lim_admit_control.c @@ -433,10 +433,10 @@ lim_tspec_find_by_sta_addr(tpAniSirGlobal pMac, for (ctspec = 0; ctspec < LIM_NUM_TSPEC_MAX; ctspec++, pTspecList++) { if ((pTspecList->inuse) && - (cdf_mem_compare + (!qdf_mem_cmp (pAddr, pTspecList->staAddr, sizeof(pTspecList->staAddr))) && - (cdf_mem_compare + (!qdf_mem_cmp ((uint8_t *) pTspecIE, (uint8_t *) &pTspecList->tspec, sizeof(tSirMacTspecIE)))) { *ppInfo = pTspecList; @@ -479,7 +479,7 @@ lim_tspec_find_by_assoc_id(tpAniSirGlobal pMac, if ((pTspecList->inuse) && (assocId == pTspecList->assocId) && - (cdf_mem_compare + (!qdf_mem_cmp ((uint8_t *) pTspecIE, (uint8_t *) &pTspecList->tspec, sizeof(tSirMacTspecIE)))) { *ppInfo = pTspecList; @@ -597,7 +597,7 @@ tSirRetStatus lim_tspec_add(tpAniSirGlobal pMac, /* update the tspec info */ pTspecList->tspec = *pTspec; pTspecList->assocId = assocId; - cdf_mem_copy(pTspecList->staAddr, pAddr, sizeof(pTspecList->staAddr)); + qdf_mem_copy(pTspecList->staAddr, pAddr, sizeof(pTspecList->staAddr)); /* for edca tspec's, we are all done */ if (pTspec->tsinfo.traffic.accessPolicy == SIR_MAC_ACCESSPOLICY_EDCA) { @@ -747,7 +747,7 @@ tSirRetStatus lim_admit_control_add_ts(tpAniSirGlobal pMac, uint8_t *pAddr, } /* fill in a schedule if requested */ if (pSch != NULL) { - cdf_mem_set((uint8_t *) pSch, sizeof(*pSch), 0); + qdf_mem_set((uint8_t *) pSch, sizeof(*pSch), 0); pSch->svcStartTime = pAddts->tspec.svcStartTime; pSch->svcInterval = svcInterval; pSch->maxSvcDuration = (uint16_t) pSch->svcInterval; /* use SP = SI */ @@ -854,7 +854,7 @@ tSirRetStatus lim_admit_control_delete_sta(tpAniSirGlobal pMac, uint16_t assocId -------------------------------------------------------------*/ tSirRetStatus lim_admit_control_init(tpAniSirGlobal pMac) { - cdf_mem_set(pMac->lim.tspecInfo, + qdf_mem_set(pMac->lim.tspecInfo, LIM_NUM_TSPEC_MAX * sizeof(tLimTspecInfo), 0); return eSIR_SUCCESS; } @@ -925,16 +925,16 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac, return eSIR_FAILURE; } - pAddTsParam = cdf_mem_malloc(sizeof(tAddTsParams)); + pAddTsParam = qdf_mem_malloc(sizeof(tAddTsParams)); if (NULL == pAddTsParam) { PELOGW(lim_log(pMac, LOGW, FL("AllocateMemory() failed"));) return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pAddTsParam, sizeof(tAddTsParams), 0); + qdf_mem_set((uint8_t *) pAddTsParam, sizeof(tAddTsParams), 0); pAddTsParam->staIdx = staIdx; pAddTsParam->tspecIdx = tspecIdx; - cdf_mem_copy(&pAddTsParam->tspec, &tspecIE, sizeof(tSirMacTspecIE)); + qdf_mem_copy(&pAddTsParam->tspec, &tspecIE, sizeof(tSirMacTspecIE)); pAddTsParam->sessionId = sessionId; pAddTsParam->sme_session_id = psessionEntry->smeSessionId; @@ -960,7 +960,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac, if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) { lim_log(pMac, LOGW, FL("wma_post_ctrl_msg() failed")); SET_LIM_PROCESS_DEFD_MESGS(pMac, true); - cdf_mem_free(pAddTsParam); + qdf_mem_free(pAddTsParam); return eSIR_FAILURE; } return eSIR_SUCCESS; @@ -986,7 +986,7 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac, tpDelTsParams pDelTsParam; tpPESession psessionEntry = NULL; - pDelTsParam = cdf_mem_malloc(sizeof(tDelTsParams)); + pDelTsParam = qdf_mem_malloc(sizeof(tDelTsParams)); if (NULL == pDelTsParam) { lim_log(pMac, LOGP, FL("AllocateMemory() failed")); return eSIR_MEM_ALLOC_FAILED; @@ -995,12 +995,12 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac, msg.type = WMA_DEL_TS_REQ; msg.bodyptr = pDelTsParam; msg.bodyval = 0; - cdf_mem_set((uint8_t *) pDelTsParam, sizeof(tDelTsParams), 0); + qdf_mem_set((uint8_t *) pDelTsParam, sizeof(tDelTsParams), 0); /* filling message parameters. */ pDelTsParam->staIdx = staIdx; pDelTsParam->tspecIdx = tspecIdx; - cdf_mem_copy(&pDelTsParam->bssId, bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(&pDelTsParam->bssId, bssId, sizeof(tSirMacAddr)); psessionEntry = pe_find_session_by_session_id(pMac, sessionId); if (psessionEntry == NULL) { @@ -1019,7 +1019,7 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (pMac->roam.configParam.isRoamOffloadEnabled && psessionEntry->is11Rconnection) { - cdf_mem_copy(&pDelTsParam->delTsInfo, &delts, + qdf_mem_copy(&pDelTsParam->delTsInfo, &delts, sizeof(tSirDeltsReqInfo)); pDelTsParam->setRICparams = 1; } @@ -1035,7 +1035,7 @@ lim_send_hal_msg_del_ts(tpAniSirGlobal pMac, return eSIR_SUCCESS; err: - cdf_mem_free(pDelTsParam); + qdf_mem_free(pDelTsParam); return eSIR_FAILURE; } @@ -1134,6 +1134,6 @@ void lim_process_hal_add_ts_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) end: if (pAddTsRspMsg != NULL) - cdf_mem_free(pAddTsRspMsg); + qdf_mem_free(pAddTsRspMsg); return; } diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 4bdfe04f661f..4281255e75f1 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -94,15 +94,15 @@ static void __lim_init_scan_vars(tpAniSirGlobal pMac) pMac->lim.gLimRestoreCBNumScanInterval = LIM_RESTORE_CB_NUM_SCAN_INTERVAL_DEFAULT; pMac->lim.gLimRestoreCBCount = 0; - cdf_mem_set(pMac->lim.gLimLegacyBssidList, + qdf_mem_set(pMac->lim.gLimLegacyBssidList, sizeof(pMac->lim.gLimLegacyBssidList), 0); /* Fill in default values */ /* abort scan is used to abort an on-going scan */ pMac->lim.abortScan = 0; - cdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0); - cdf_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0); + qdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0); + qdf_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0); /* WLAN_SUSPEND_LINK Related */ pMac->lim.gpLimSuspendCallback = NULL; @@ -112,7 +112,7 @@ static void __lim_init_scan_vars(tpAniSirGlobal pMac) static void __lim_init_bss_vars(tpAniSirGlobal pMac) { - cdf_mem_set((void *)pMac->lim.gpSession, + qdf_mem_set((void *)pMac->lim.gpSession, sizeof(*pMac->lim.gpSession) * pMac->lim.maxBssId, 0); /* This is for testing purposes only, be default should always be off */ @@ -133,14 +133,14 @@ static void __lim_init_stats_vars(tpAniSirGlobal pMac) /* Heart-Beat interval value */ pMac->lim.gLimHeartBeatCount = 0; - cdf_mem_zero(pMac->lim.gLimHeartBeatApMac[0], + qdf_mem_zero(pMac->lim.gLimHeartBeatApMac[0], sizeof(tSirMacAddr)); - cdf_mem_zero(pMac->lim.gLimHeartBeatApMac[1], + qdf_mem_zero(pMac->lim.gLimHeartBeatApMac[1], sizeof(tSirMacAddr)); pMac->lim.gLimHeartBeatApMacIndex = 0; /* Statistics to keep track of no. beacons rcvd in heart beat interval */ - cdf_mem_set(pMac->lim.gLimHeartBeatBeaconStats, + qdf_mem_set(pMac->lim.gLimHeartBeatBeaconStats, sizeof(pMac->lim.gLimHeartBeatBeaconStats), 0); #ifdef WLAN_DEBUG @@ -151,7 +151,7 @@ static void __lim_init_stats_vars(tpAniSirGlobal pMac) pMac->lim.numLearn = 0; pMac->lim.numLearnIgnore = 0; pMac->lim.numSme = 0; - cdf_mem_set(pMac->lim.numMAC, sizeof(pMac->lim.numMAC), 0); + qdf_mem_set(pMac->lim.numMAC, sizeof(pMac->lim.numMAC), 0); pMac->lim.gLimNumAssocReqDropInvldState = 0; pMac->lim.gLimNumAssocReqDropACRejectTS = 0; pMac->lim.gLimNumAssocReqDropACRejectSta = 0; @@ -195,22 +195,22 @@ static void __lim_init_states(tpAniSirGlobal pMac) * when SME_START_BSS_REQ is received. */ - cdf_mem_set(&pMac->lim.gLimOverlap11gParams, sizeof(tLimProtStaParams), + qdf_mem_set(&pMac->lim.gLimOverlap11gParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set(&pMac->lim.gLimOverlap11aParams, sizeof(tLimProtStaParams), + qdf_mem_set(&pMac->lim.gLimOverlap11aParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set(&pMac->lim.gLimOverlapHt20Params, sizeof(tLimProtStaParams), + qdf_mem_set(&pMac->lim.gLimOverlapHt20Params, sizeof(tLimProtStaParams), 0); - cdf_mem_set(&pMac->lim.gLimOverlapNonGfParams, + qdf_mem_set(&pMac->lim.gLimOverlapNonGfParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set(&pMac->lim.gLimNoShortParams, sizeof(tLimNoShortParams), 0); - cdf_mem_set(&pMac->lim.gLimNoShortSlotParams, + qdf_mem_set(&pMac->lim.gLimNoShortParams, sizeof(tLimNoShortParams), 0); + qdf_mem_set(&pMac->lim.gLimNoShortSlotParams, sizeof(tLimNoShortSlotParams), 0); pMac->lim.gLimPhyMode = 0; pMac->lim.scanStartTime = 0; /* used to measure scan time */ - cdf_mem_set(pMac->lim.gLimMyMacAddr, sizeof(pMac->lim.gLimMyMacAddr), + qdf_mem_set(pMac->lim.gLimMyMacAddr, sizeof(pMac->lim.gLimMyMacAddr), 0); pMac->lim.ackPolicy = 0; @@ -223,15 +223,15 @@ static void __lim_init_vars(tpAniSirGlobal pMac) /* Deferred Queue Paramters */ - cdf_mem_set(&pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq), 0); + qdf_mem_set(&pMac->lim.gLimDeferredMsgQ, sizeof(tSirAddtsReq), 0); /* addts request if any - only one can be outstanding at any time */ - cdf_mem_set(&pMac->lim.gLimAddtsReq, sizeof(tSirAddtsReq), 0); + qdf_mem_set(&pMac->lim.gLimAddtsReq, sizeof(tSirAddtsReq), 0); pMac->lim.gLimAddtsSent = 0; pMac->lim.gLimAddtsRspTimerCount = 0; /* protection related config cache */ - cdf_mem_set(&pMac->lim.cfgProtection, sizeof(tCfgProtection), 0); + qdf_mem_set(&pMac->lim.cfgProtection, sizeof(tCfgProtection), 0); pMac->lim.gLimProtectionControl = 0; SET_LIM_PROCESS_DEFD_MESGS(pMac, true); @@ -247,11 +247,11 @@ static void __lim_init_vars(tpAniSirGlobal pMac) pMac->lim.pDialogueTokenHead = NULL; pMac->lim.pDialogueTokenTail = NULL; - cdf_mem_set(&pMac->lim.tspecInfo, + qdf_mem_set(&pMac->lim.tspecInfo, sizeof(tLimTspecInfo) * LIM_NUM_TSPEC_MAX, 0); /* admission control policy information */ - cdf_mem_set(&pMac->lim.admitPolicyInfo, sizeof(tLimAdmitPolicyInfo), 0); + qdf_mem_set(&pMac->lim.admitPolicyInfo, sizeof(tLimAdmitPolicyInfo), 0); pMac->lim.gLastBeaconDtimCount = 0; pMac->lim.gLastBeaconDtimPeriod = 0; @@ -279,9 +279,9 @@ static void __lim_init_assoc_vars(tpAniSirGlobal pMac) /* / MAC level Pre-authentication related globals */ pMac->lim.gLimPreAuthChannelNumber = 0; pMac->lim.gLimPreAuthType = eSIR_OPEN_SYSTEM; - cdf_mem_set(&pMac->lim.gLimPreAuthPeerAddr, sizeof(tSirMacAddr), 0); + qdf_mem_set(&pMac->lim.gLimPreAuthPeerAddr, sizeof(tSirMacAddr), 0); pMac->lim.gLimNumPreAuthContexts = 0; - cdf_mem_set(&pMac->lim.gLimPreAuthTimerTable, sizeof(tLimPreAuthTable), + qdf_mem_set(&pMac->lim.gLimPreAuthTimerTable, sizeof(tLimPreAuthTable), 0); /* Placed holder to deauth reason */ @@ -296,9 +296,9 @@ static void __lim_init_assoc_vars(tpAniSirGlobal pMac) pMac->lim.gLimDisassocFrameCredit = 0; /* One cache for each overlap and associated case. */ - cdf_mem_set(pMac->lim.protStaOverlapCache, + qdf_mem_set(pMac->lim.protStaOverlapCache, sizeof(tCacheParams) * LIM_PROT_STA_OVERLAP_CACHE_SIZE, 0); - cdf_mem_set(pMac->lim.protStaCache, + qdf_mem_set(pMac->lim.protStaCache, sizeof(tCacheParams) * LIM_PROT_STA_CACHE_SIZE, 0); pMac->lim.pSessionEntry = NULL; @@ -663,7 +663,7 @@ void lim_cleanup(tpAniSirGlobal pMac) QDF_STATUS_SUCCESS) { QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Fixing leak! Deallocating pLimMgmtRegistration node")); - cdf_mem_free(pLimMgmtRegistration); + qdf_mem_free(pLimMgmtRegistration); } qdf_mutex_release(&pMac->lim.lim_frame_register_lock); qdf_list_destroy(&pMac->lim.gLimMgmtFrameRegistratinQueue); @@ -673,7 +673,7 @@ void lim_cleanup(tpAniSirGlobal pMac) /* free up preAuth table */ if (pMac->lim.gLimPreAuthTimerTable.pTable != NULL) { - cdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); + qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); pMac->lim.gLimPreAuthTimerTable.pTable = NULL; pMac->lim.gLimPreAuthTimerTable.numEntry = 0; } @@ -683,27 +683,27 @@ void lim_cleanup(tpAniSirGlobal pMac) } if (NULL != pMac->lim.pDialogueTokenTail) { - cdf_mem_free(pMac->lim.pDialogueTokenTail); + qdf_mem_free(pMac->lim.pDialogueTokenTail); pMac->lim.pDialogueTokenTail = NULL; } if (pMac->lim.gpLimMlmSetKeysReq != NULL) { - cdf_mem_free(pMac->lim.gpLimMlmSetKeysReq); + qdf_mem_free(pMac->lim.gpLimMlmSetKeysReq); pMac->lim.gpLimMlmSetKeysReq = NULL; } if (pMac->lim.gpLimMlmAuthReq != NULL) { - cdf_mem_free(pMac->lim.gpLimMlmAuthReq); + qdf_mem_free(pMac->lim.gpLimMlmAuthReq); pMac->lim.gpLimMlmAuthReq = NULL; } if (pMac->lim.gpDefdSmeMsgForNOA != NULL) { - cdf_mem_free(pMac->lim.gpDefdSmeMsgForNOA); + qdf_mem_free(pMac->lim.gpDefdSmeMsgForNOA); pMac->lim.gpDefdSmeMsgForNOA = NULL; } if (pMac->lim.gpLimMlmScanReq != NULL) { - cdf_mem_free(pMac->lim.gpLimMlmScanReq); + qdf_mem_free(pMac->lim.gpLimMlmScanReq); pMac->lim.gpLimMlmScanReq = NULL; } /* Now, finally reset the deferred message queue pointers */ @@ -744,7 +744,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) } pMac->lim.limTimers.gpLimCnfWaitTimer = - cdf_mem_malloc(sizeof(TX_TIMER) * (pMac->lim.maxStation + 1)); + qdf_mem_malloc(sizeof(TX_TIMER) * (pMac->lim.maxStation + 1)); if (NULL == pMac->lim.limTimers.gpLimCnfWaitTimer) { PELOGE(lim_log(pMac, LOGE, FL("gpLimCnfWaitTimer memory allocate failed!"));) @@ -752,7 +752,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) } pMac->lim.gpSession = - cdf_mem_malloc(sizeof(tPESession) * pMac->lim.maxBssId); + qdf_mem_malloc(sizeof(tPESession) * pMac->lim.maxBssId); if (NULL == pMac->lim.gpSession) { lim_log(pMac, LOGE, FL("gpSession memory allocate failed!")); @@ -760,7 +760,7 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) goto pe_open_psession_fail; } - cdf_mem_set(pMac->lim.gpSession, + qdf_mem_set(pMac->lim.gpSession, sizeof(tPESession) * pMac->lim.maxBssId, 0); pMac->lim.mgmtFrameSessionId = 0xff; @@ -786,10 +786,10 @@ tSirRetStatus pe_open(tpAniSirGlobal pMac, tMacOpenParameters *pMacOpenParam) return status; /* status here will be eSIR_SUCCESS */ pe_open_lock_fail: - cdf_mem_free(pMac->lim.gpSession); + qdf_mem_free(pMac->lim.gpSession); pMac->lim.gpSession = NULL; pe_open_psession_fail: - cdf_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer); + qdf_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer); pMac->lim.limTimers.gpLimCnfWaitTimer = NULL; return status; @@ -814,20 +814,20 @@ tSirRetStatus pe_close(tpAniSirGlobal pMac) pe_delete_session(pMac, &pMac->lim.gpSession[i]); } } - cdf_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer); + qdf_mem_free(pMac->lim.limTimers.gpLimCnfWaitTimer); pMac->lim.limTimers.gpLimCnfWaitTimer = NULL; if (pMac->lim.gpLimMlmOemDataReq) { if (pMac->lim.gpLimMlmOemDataReq->data) { - cdf_mem_free( + qdf_mem_free( pMac->lim.gpLimMlmOemDataReq->data); pMac->lim.gpLimMlmOemDataReq->data = NULL; } - cdf_mem_free(pMac->lim.gpLimMlmOemDataReq); + qdf_mem_free(pMac->lim.gpLimMlmOemDataReq); pMac->lim.gpLimMlmOemDataReq = NULL; } - cdf_mem_free(pMac->lim.gpSession); + qdf_mem_free(pMac->lim.gpSession); pMac->lim.gpSession = NULL; if (!QDF_IS_STATUS_SUCCESS (qdf_mutex_destroy(&pMac->lim.lkPeGlobalLock))) { @@ -883,7 +883,7 @@ void pe_free_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) cds_pkt_return_packet((cds_pkt_t *) pMsg-> bodyptr); } else { - cdf_mem_free((void *)pMsg->bodyptr); + qdf_mem_free((void *)pMsg->bodyptr); } } pMsg->bodyptr = 0; @@ -1301,7 +1301,7 @@ lim_update_overlap_sta_param(tpAniSirGlobal pMac, tSirMacAddr bssId, { int i; if (!pStaParams->numSta) { - cdf_mem_copy(pMac->lim.protStaOverlapCache[0].addr, + qdf_mem_copy(pMac->lim.protStaOverlapCache[0].addr, bssId, sizeof(tSirMacAddr)); pMac->lim.protStaOverlapCache[0].active = true; @@ -1312,7 +1312,7 @@ lim_update_overlap_sta_param(tpAniSirGlobal pMac, tSirMacAddr bssId, for (i = 0; i < LIM_PROT_STA_OVERLAP_CACHE_SIZE; i++) { if (pMac->lim.protStaOverlapCache[i].active) { - if (cdf_mem_compare + if (!qdf_mem_cmp (pMac->lim.protStaOverlapCache[i].addr, bssId, sizeof(tSirMacAddr))) { return; @@ -1324,7 +1324,7 @@ lim_update_overlap_sta_param(tpAniSirGlobal pMac, tSirMacAddr bssId, if (i == LIM_PROT_STA_OVERLAP_CACHE_SIZE) { PELOG1(lim_log(pMac, LOGW, FL("Overlap cache is full"));) } else { - cdf_mem_copy(pMac->lim.protStaOverlapCache[i].addr, + qdf_mem_copy(pMac->lim.protStaOverlapCache[i].addr, bssId, sizeof(tSirMacAddr)); pMac->lim.protStaOverlapCache[i].active = true; @@ -1415,7 +1415,7 @@ lim_handle_ibss_coalescing(tpAniSirGlobal pMac, 4. Encyption type in the beacon does not match with self station */ if ((!pBeacon->capabilityInfo.ibss) || - (lim_cmp_ssid(&pBeacon->ssId, psessionEntry) != true) || + (lim_cmp_ssid(&pBeacon->ssId, psessionEntry) == true) || (psessionEntry->currentOperChannel != pBeacon->channelNumber)) retCode = eSIR_LIM_IGNORE_BEACON; else if (lim_ibss_enc_type_matched(pBeacon, psessionEntry) != eSIR_TRUE) { @@ -1551,7 +1551,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, psessionEntry); if ((false == psessionEntry->limSentCapsChangeNtf) && (((!lim_is_null_ssid(&pBeacon->ssId)) && - (false == lim_cmp_ssid(&pBeacon->ssId, psessionEntry))) || + (false != lim_cmp_ssid(&pBeacon->ssId, psessionEntry))) || ((SIR_MAC_GET_ESS(apNewCaps.capabilityInfo) != SIR_MAC_GET_ESS(psessionEntry->limCurrentBssCaps)) || (SIR_MAC_GET_PRIVACY(apNewCaps.capabilityInfo) != @@ -1600,7 +1600,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, len = sizeof(tSirMacCapabilityInfo) + sizeof(tSirMacAddr) + sizeof(uint8_t) + 3 * sizeof(uint8_t) + /* reserved fields */ pBeacon->ssId.length + 1; - cdf_mem_copy(apNewCaps.bssId.bytes, + qdf_mem_copy(apNewCaps.bssId.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); if (newChannel != psessionEntry->currentOperChannel) { PELOGE(lim_log @@ -1632,7 +1632,7 @@ lim_detect_change_in_ap_capabilities(tpAniSirGlobal pMac, return; } else apNewCaps.channelId = psessionEntry->currentOperChannel; - cdf_mem_copy((uint8_t *) &apNewCaps.ssId, + qdf_mem_copy((uint8_t *) &apNewCaps.ssId, (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1); @@ -1849,7 +1849,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, roam_offload_synch_ind_ptr->beaconProbeRespOffset; mac_hdr = (tpSirMacMgmtHdr)bcn_proberesp_ptr; parsed_frm_ptr = - (tpSirProbeRespBeacon) cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + (tpSirProbeRespBeacon) qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == parsed_frm_ptr) { lim_log(pMac, LOGE, "fail to allocate memory for frame"); return QDF_STATUS_E_NOMEM; @@ -1860,7 +1860,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "%s: very" "few bytes in synchInd beacon / probe resp frame! length=%d", __func__, roam_offload_synch_ind_ptr->beaconProbeRespLength); - cdf_mem_free(parsed_frm_ptr); + qdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } @@ -1878,7 +1878,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "Parse error Beacon, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); - cdf_mem_free(parsed_frm_ptr); + qdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } } else { @@ -1890,7 +1890,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "Parse error ProbeResponse, length=%d", roam_offload_synch_ind_ptr->beaconProbeRespLength); - cdf_mem_free(parsed_frm_ptr); + qdf_mem_free(parsed_frm_ptr); return QDF_STATUS_E_FAILURE; } } @@ -1956,16 +1956,16 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, bss_desc_ptr->beaconInterval = parsed_frm_ptr->beaconInterval; bss_desc_ptr->timeStamp[0] = parsed_frm_ptr->timeStamp[0]; bss_desc_ptr->timeStamp[1] = parsed_frm_ptr->timeStamp[1]; - cdf_mem_copy(&bss_desc_ptr->capabilityInfo, + qdf_mem_copy(&bss_desc_ptr->capabilityInfo, &bcn_proberesp_ptr[SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_CAPAB_OFFSET], 2); - cdf_mem_copy((uint8_t *) &bss_desc_ptr->bssId, + qdf_mem_copy((uint8_t *) &bss_desc_ptr->bssId, (uint8_t *) mac_hdr->bssId, sizeof(tSirMacAddr)); bss_desc_ptr->nReceivedTime = (uint32_t)qdf_mc_timer_get_system_ticks(); if (parsed_frm_ptr->mdiePresent) { bss_desc_ptr->mdiePresent = parsed_frm_ptr->mdiePresent; - cdf_mem_copy((uint8_t *)bss_desc_ptr->mdie, + qdf_mem_copy((uint8_t *)bss_desc_ptr->mdie, (uint8_t *)parsed_frm_ptr->mdie, SIR_MDIE_SIZE); } @@ -1977,12 +1977,12 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac, "chan=%d, rssi=%d", bss_desc_ptr->channelId, bss_desc_ptr->rssi); if (ie_len) { - cdf_mem_copy(&bss_desc_ptr->ieFields, + qdf_mem_copy(&bss_desc_ptr->ieFields, bcn_proberesp_ptr + (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET), ie_len); } - cdf_mem_free(parsed_frm_ptr); + qdf_mem_free(parsed_frm_ptr); return QDF_STATUS_SUCCESS; } /** @@ -2092,13 +2092,13 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, add_bss_params->txMgmtPower, ft_session_ptr); mac_ctx->roam.reassocRespLen = roam_sync_ind_ptr->reassocRespLength; mac_ctx->roam.pReassocResp = - cdf_mem_malloc(mac_ctx->roam.reassocRespLen); + qdf_mem_malloc(mac_ctx->roam.reassocRespLen); if (NULL == mac_ctx->roam.pReassocResp) { lim_log(mac_ctx, LOGE, FL("LFR3:assoc resp mem alloc failed")); ft_session_ptr->bRoamSynchInProgress = false; return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(mac_ctx->roam.pReassocResp, + qdf_mem_copy(mac_ctx->roam.pReassocResp, (uint8_t *)roam_sync_ind_ptr + roam_sync_ind_ptr->reassocRespOffset, mac_ctx->roam.reassocRespLen); @@ -2135,7 +2135,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, ft_session_ptr->limSmeState = eLIM_SME_LINK_EST_STATE; ft_session_ptr->bRoamSynchInProgress = false; if (mac_ctx->roam.pReassocResp) - cdf_mem_free(mac_ctx->roam.pReassocResp); + qdf_mem_free(mac_ctx->roam.pReassocResp); mac_ctx->roam.pReassocResp = NULL; return QDF_STATUS_SUCCESS; } diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 43917d0efcb2..8d720cb21894 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -94,9 +94,9 @@ lim_fill_supported_rates_info(tpAniSirGlobal pMac, * * Return: true if SSID matched, false otherwise. */ -bool lim_cmp_ssid(tSirMacSSid *rx_ssid, tpPESession session_entry) +uint32_t lim_cmp_ssid(tSirMacSSid *rx_ssid, tpPESession session_entry) { - return cdf_mem_compare(rx_ssid, &session_entry->ssId, + return qdf_mem_cmp(rx_ssid, &session_entry->ssId, session_entry->ssId.length); } @@ -230,7 +230,7 @@ lim_check_rx_basic_rates(tpAniSirGlobal pMac, tSirMacRateSet rxRateSet, tSirMacRateSet *pRateSet, basicRate; uint8_t i, j, k, match; - pRateSet = cdf_mem_malloc(sizeof(tSirMacRateSet)); + pRateSet = qdf_mem_malloc(sizeof(tSirMacRateSet)); if (NULL == pRateSet) { lim_log(pMac, LOGP, FL("call to AllocateMemory failed for RATESET")); @@ -239,7 +239,7 @@ lim_check_rx_basic_rates(tpAniSirGlobal pMac, tSirMacRateSet rxRateSet, } /* Copy operational rate set from session Entry */ - cdf_mem_copy(pRateSet->rate, (psessionEntry->rateSet.rate), + qdf_mem_copy(pRateSet->rate, (psessionEntry->rateSet.rate), psessionEntry->rateSet.numRates); pRateSet->numRates = psessionEntry->rateSet.numRates; @@ -268,14 +268,14 @@ lim_check_rx_basic_rates(tpAniSirGlobal pMac, tSirMacRateSet rxRateSet, if (!match) { /* Free up memory allocated for rateset */ - cdf_mem_free((uint8_t *) pRateSet); + qdf_mem_free((uint8_t *) pRateSet); return false; } } /* Free up memory allocated for rateset */ - cdf_mem_free((uint8_t *) pRateSet); + qdf_mem_free((uint8_t *) pRateSet); return true; } /****** end lim_check_rx_basic_rates() ******/ @@ -401,7 +401,7 @@ lim_check_rx_rsn_ie_match(tpAniSirGlobal mac_ctx, tDot11fIERSN rx_rsn_ie, match = 0; for (i = 0; i < rx_rsn_ie.pwise_cipher_suite_count; i++) { for (j = 0; j < rsn_ie->pwise_cipher_suite_count; j++) { - if (cdf_mem_compare(&rx_rsn_ie.pwise_cipher_suites[i], + if (!qdf_mem_cmp(&rx_rsn_ie.pwise_cipher_suites[i], &rsn_ie->pwise_cipher_suites[j], sizeof(rsn_ie->pwise_cipher_suites[j]))) { match = 1; @@ -516,7 +516,7 @@ lim_check_rx_wpa_ie_match(tpAniSirGlobal mac, tDot11fIEWPA rx_wpaie, match = 0; for (i = 0; i < rx_wpaie.unicast_cipher_count; i++) { for (j = 0; j < wpa_ie->unicast_cipher_count; j++) { - if (cdf_mem_compare(rx_wpaie.unicast_ciphers[i], + if (!qdf_mem_cmp(rx_wpaie.unicast_ciphers[i], wpa_ie->unicast_ciphers[j], 4)) { match = 1; break; @@ -705,7 +705,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, /* Free up buffer allocated for JoinReq held by */ /* MLM state machine */ if (psessionEntry->pLimMlmJoinReq) { - cdf_mem_free(psessionEntry->pLimMlmJoinReq); + qdf_mem_free(psessionEntry->pLimMlmJoinReq); psessionEntry->pLimMlmJoinReq = NULL; } @@ -734,7 +734,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, FL("Lim Posting DISASSOC_CNF to Sme. Trigger: %d"), mlmStaContext.cleanupTrigger); - cdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmDisassocCnf.peerMacAddr, (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmDisassocCnf.resultCode = statusCode; mlmDisassocCnf.disassocTrigger = mlmStaContext.cleanupTrigger; @@ -774,7 +774,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, lim_log(pMac, LOGW, FL("Lim Posting PURGE_STA_IND to Sme. Trigger: %d"), mlmStaContext.cleanupTrigger); - cdf_mem_copy((uint8_t *) &mlmPurgeStaInd.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmPurgeStaInd.peerMacAddr, (uint8_t *) sta_dsaddr.bytes, QDF_MAC_ADDR_SIZE); mlmPurgeStaInd.reasonCode = (uint8_t) mlmStaContext.disassocReason; @@ -824,7 +824,7 @@ lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, psessionEntry, smesessionId, smetransactionId); } else { - cdf_mem_free(psessionEntry->pLimJoinReq); + qdf_mem_free(psessionEntry->pLimJoinReq); psessionEntry->pLimJoinReq = NULL; lim_log(pMac, LOG1, @@ -906,7 +906,7 @@ lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr, &mac_ctx->lim.gLimPreAuthTimerTable); if (auth_node) { - cdf_mem_copy((uint8_t *) auth_node->peerMacAddr, + qdf_mem_copy((uint8_t *) auth_node->peerMacAddr, peer_addr, sizeof(tSirMacAddr)); auth_node->fTimerStarted = 0; auth_node->mlmState = eLIM_MLM_AUTHENTICATED_STATE; @@ -964,11 +964,11 @@ lim_reject_association(tpAniSirGlobal mac_ctx, tSirMacAddr peer_addr, *free the copy of association request frame. */ if (assoc_req_frame) { - cdf_mem_free(assoc_req_frame); + qdf_mem_free(assoc_req_frame); assoc_req_frame = NULL; } - cdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]); + qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]); session_entry->parsedAssocReq[sta_ds->assocId] = NULL; } } @@ -1002,7 +1002,7 @@ lim_decide_ap_protection_on_ht20_delete(tpAniSirGlobal mac_ctx, if (!session_entry->protStaCache[i].active) continue; - if (cdf_mem_compare(session_entry->protStaCache[i].addr, + if (!qdf_mem_cmp(session_entry->protStaCache[i].addr, sta_ds->staAddr, sizeof(tSirMacAddr))) { session_entry->gLimHt20Params.numSta--; session_entry->protStaCache[i].active = @@ -1067,10 +1067,10 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx, session_entry->gLim11aParams.numSta, sta_ds->staAddr); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->protStaCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( session_entry->protStaCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->protStaCache[i].active = false; break; } @@ -1093,10 +1093,10 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx, session_entry->gLim11bParams.numSta, sta_ds->staAddr); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->protStaCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( session_entry->protStaCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->gLim11bParams.numSta--; session_entry->protStaCache[i].active = false; @@ -1123,10 +1123,10 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx, session_entry->gLim11bParams.numSta, sta_ds->staAddr); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->protStaCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( session_entry->protStaCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->gLim11gParams.numSta--; session_entry->protStaCache[i].active = false; break; @@ -1155,10 +1155,10 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx, session_entry->gLimNonGfParams.numSta, sta_ds->staAddr); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->protStaCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( session_entry->protStaCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->protStaCache[i].active = false; break; } @@ -1195,10 +1195,10 @@ lim_decide_ap_protection_on_delete(tpAniSirGlobal mac_ctx, sta_ds->staAddr); for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->protStaCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( session_entry->protStaCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->protStaCache[i].active = false; break; } @@ -1239,11 +1239,11 @@ void lim_decide_short_preamble(tpAniSirGlobal mac_ctx, for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->gLimNoShortParams. staNoShortCache[i].active && - cdf_mem_compare(session_entry-> + (!qdf_mem_cmp(session_entry-> gLimNoShortParams. staNoShortCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { session_entry->gLimNoShortParams. numNonShortPreambleSta--; session_entry->gLimNoShortParams. @@ -1259,7 +1259,7 @@ void lim_decide_short_preamble(tpAniSirGlobal mac_ctx, * enable short preamble * reset the cache */ - cdf_mem_set((uint8_t *) &session_entry->gLimNoShortParams, + qdf_mem_set((uint8_t *) &session_entry->gLimNoShortParams, sizeof(tLimNoShortParams), 0); if (lim_enable_short_preamble(mac_ctx, true, beacon_params, session_entry) != eSIR_SUCCESS) { @@ -1304,11 +1304,11 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (session_entry->gLimNoShortSlotParams. staNoShortSlotCache[i].active && - cdf_mem_compare(session_entry-> + (!qdf_mem_cmp(session_entry-> gLimNoShortSlotParams. staNoShortSlotCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { non_short_slot_sta_count--; session_entry->gLimNoShortSlotParams. staNoShortSlotCache[i].active = false; @@ -1321,7 +1321,7 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, * enable short slot time * reset the cache */ - cdf_mem_set((uint8_t *) &session_entry-> + qdf_mem_set((uint8_t *) &session_entry-> gLimNoShortSlotParams, sizeof(tLimNoShortSlotParams), 0); beacon_params->fShortSlotTime = true; @@ -1337,11 +1337,11 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (mac_ctx->lim.gLimNoShortSlotParams. staNoShortSlotCache[i].active && - cdf_mem_compare( + (!qdf_mem_cmp( mac_ctx->lim.gLimNoShortSlotParams. staNoShortSlotCache[i].addr, sta_ds->staAddr, - sizeof(tSirMacAddr))) { + sizeof(tSirMacAddr)))) { non_short_slot_sta_count--; mac_ctx->lim.gLimNoShortSlotParams. staNoShortSlotCache[i].active = false; @@ -1354,7 +1354,7 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, * enable short slot time * reset the cache */ - cdf_mem_set( + qdf_mem_set( (uint8_t *) &mac_ctx->lim.gLimNoShortSlotParams, sizeof(tLimNoShortSlotParams), 0); /*in case of AP set SHORT_SLOT_TIME to enable*/ @@ -1716,7 +1716,7 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, * put the result in pSupportedRates */ - cdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); + qdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); for (i = 0; i < temp_rate_set.numRates; i++) { min = 0; val = 0xff; @@ -1820,7 +1820,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, /* copy operational rate set from psessionEntry */ if (psessionEntry->rateSet.numRates <= SIR_MAC_RATESET_EID_MAX) { - cdf_mem_copy((uint8_t *) tempRateSet.rate, + qdf_mem_copy((uint8_t *) tempRateSet.rate, (uint8_t *) (psessionEntry->rateSet.rate), psessionEntry->rateSet.numRates); tempRateSet.numRates = psessionEntry->rateSet.numRates; @@ -1835,7 +1835,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11N)) { if (psessionEntry->extRateSet.numRates <= SIR_MAC_RATESET_EID_MAX) { - cdf_mem_copy((uint8_t *) tempRateSet2.rate, + qdf_mem_copy((uint8_t *) tempRateSet2.rate, (uint8_t *) (psessionEntry->extRateSet. rate), psessionEntry->extRateSet.numRates); @@ -1868,7 +1868,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, { uint8_t aRateIndex = 0; uint8_t bRateIndex = 0; - cdf_mem_set((uint8_t *) pRates, sizeof(tSirSupportedRates), 0); + qdf_mem_set((uint8_t *) pRates, sizeof(tSirSupportedRates), 0); for (i = 0; i < tempRateSet.numRates; i++) { min = 0; val = 0xff; @@ -2002,12 +2002,12 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, lim_get_phy_mode(mac_ctx, &phy_mode, session_entry); /* copy operational rate set from session_entry */ - cdf_mem_copy((temp_rate_set.rate), (session_entry->rateSet.rate), + qdf_mem_copy((temp_rate_set.rate), (session_entry->rateSet.rate), session_entry->rateSet.numRates); temp_rate_set.numRates = (uint8_t) session_entry->rateSet.numRates; if (phy_mode == WNI_CFG_PHY_MODE_11G) { - cdf_mem_copy((temp_rate_set2.rate), + qdf_mem_copy((temp_rate_set2.rate), (session_entry->extRateSet.rate), session_entry->extRateSet.numRates); temp_rate_set2.numRates = @@ -2108,7 +2108,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, rates = &sta_ds->supportedRates; - cdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); + qdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); for (i = 0; (i < temp_rate_set2.numRates && i < SIR_MAC_RATESET_EID_MAX); i++) { for (j = 0; (j < temp_rate_set.numRates && @@ -2269,13 +2269,13 @@ lim_add_sta(tpAniSirGlobal mac_ctx, session_entry->smeSessionId, update_entry, GET_LIM_SYSTEM_ROLE(session_entry)); - add_sta_params = cdf_mem_malloc(sizeof(tAddStaParams)); + add_sta_params = qdf_mem_malloc(sizeof(tAddStaParams)); if (NULL == add_sta_params) { lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during ADD_STA")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) add_sta_params, sizeof(tAddStaParams), 0); + qdf_mem_set((uint8_t *) add_sta_params, sizeof(tAddStaParams), 0); if (LIM_IS_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry) || LIM_IS_BT_AMP_AP_ROLE(session_entry)) @@ -2292,11 +2292,11 @@ lim_add_sta(tpAniSirGlobal mac_ctx, FL(MAC_ADDRESS_STR ": Subtype(Assoc/Reassoc): %d"), MAC_ADDR_ARRAY(*sta_Addr), sta_ds->mlmStaContext.subType); - cdf_mem_copy((uint8_t *) add_sta_params->staMac, + qdf_mem_copy((uint8_t *) add_sta_params->staMac, (uint8_t *) *sta_Addr, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) add_sta_params->bssId, + qdf_mem_copy((uint8_t *) add_sta_params->bssId, session_entry->bssId, sizeof(tSirMacAddr)); - cdf_mem_copy(&add_sta_params->capab_info, + qdf_mem_copy(&add_sta_params->capab_info, &sta_ds->mlmStaContext.capabilityInfo, sizeof(add_sta_params->capab_info)); @@ -2304,7 +2304,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, session_entry); /* Copy legacy rates */ - cdf_mem_copy((uint8_t *) &add_sta_params->supportedRates, + qdf_mem_copy((uint8_t *) &add_sta_params->supportedRates, (uint8_t *) &sta_ds->supportedRates, sizeof(tSirSupportedRates)); @@ -2496,7 +2496,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, add_sta_params->p2pCapableSta = (p2p_ie != NULL); if (assoc_req && add_sta_params->htCapable) { - cdf_mem_copy(&add_sta_params->ht_caps, + qdf_mem_copy(&add_sta_params->ht_caps, ((uint8_t *) &assoc_req->HTCaps) + 1, sizeof(add_sta_params->ht_caps)); } @@ -2648,7 +2648,7 @@ lim_add_sta(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("ADD_STA_REQ for aId %d failed (reason %X)"), sta_ds->assocId, ret_code); - cdf_mem_free(add_sta_params); + qdf_mem_free(add_sta_params); } return ret_code; @@ -2685,14 +2685,14 @@ lim_del_sta(tpAniSirGlobal pMac, tSirMsgQ msgQ; tSirRetStatus retCode = eSIR_SUCCESS; - pDelStaParams = cdf_mem_malloc(sizeof(tDeleteStaParams)); + pDelStaParams = qdf_mem_malloc(sizeof(tDeleteStaParams)); if (NULL == pDelStaParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_STA")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pDelStaParams, sizeof(tDeleteStaParams), 0); + qdf_mem_set((uint8_t *) pDelStaParams, sizeof(tDeleteStaParams), 0); /* */ /* DPH contains the STA index only for "peer" STA entries. */ @@ -2754,7 +2754,7 @@ lim_del_sta(tpAniSirGlobal pMac, pDelStaParams->smesessionId = psessionEntry->smeSessionId; pDelStaParams->staType = pStaDs->staType; - cdf_mem_copy((uint8_t *) pDelStaParams->staMac, + qdf_mem_copy((uint8_t *) pDelStaParams->staMac, (uint8_t *) pStaDs->staAddr, sizeof(tSirMacAddr)); pDelStaParams->status = QDF_STATUS_SUCCESS; @@ -2777,7 +2777,7 @@ lim_del_sta(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Posting DELETE_STA_REQ to HAL failed, reason=%X"), retCode); - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); } return retCode; @@ -2831,7 +2831,7 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, lim_log(mac_ctx, LOGE, FL("Posting WMA_ADD_STA_REQ to HAL failed, reason=%X"), ret_code); - cdf_mem_free(add_sta_params); + qdf_mem_free(add_sta_params); } session_entry->ftPEContext.pAddStaReq = NULL; @@ -2891,19 +2891,19 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, sir_copy_mac_addr(staMac, psessionEntry->selfMacAddr); lim_log(pMac, LOG1, FL(MAC_ADDRESS_STR ": "), MAC_ADDR_ARRAY(staMac)); - pAddStaParams = cdf_mem_malloc(sizeof(tAddStaParams)); + pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); if (NULL == pAddStaParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_STA")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); + qdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); /* / Add STA context at MAC HW (BMU, RHP & TFP) */ - cdf_mem_copy((uint8_t *) pAddStaParams->staMac, + qdf_mem_copy((uint8_t *) pAddStaParams->staMac, (uint8_t *) staMac, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) pAddStaParams->bssId, + qdf_mem_copy((uint8_t *) pAddStaParams->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); pAddStaParams->assocId = psessionEntry->limAID; @@ -3132,7 +3132,7 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, lim_log(pMac, LOGE, FL("Posting WMA_ADD_STA_REQ to HAL failed, reason=%X"), retCode); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); } return retCode; } @@ -3257,7 +3257,7 @@ lim_delete_dph_hash_entry(tpAniSirGlobal mac_ctx, tSirMacAddr sta_addr, tpDphHashNode sta_ds; tUpdateBeaconParams beacon_params; - cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); beacon_params.paramChangeBitmap = 0; lim_deactivate_and_change_per_sta_id_timer(mac_ctx, eLIM_CNF_WAIT_TIMER, sta_id); @@ -3352,7 +3352,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, uint32_t total_num_noa_desc = 0; uint32_t selfStaDot11Mode = 0; - cdf_mem_copy(current_ssid.ssId, + qdf_mem_copy(current_ssid.ssId, session_entry->ssId.ssId, session_entry->ssId.length); current_ssid.length = (uint8_t) session_entry->ssId.length; @@ -3364,7 +3364,7 @@ lim_check_and_announce_join_success(tpAniSirGlobal mac_ctx, if (((SIR_MAC_MGMT_FRAME == header->fc.type) && (SIR_MAC_MGMT_PROBE_RSP == header->fc.subType)) && current_ssid.length && - (!cdf_mem_compare((uint8_t *) &beacon_probe_rsp->ssId, + (qdf_mem_cmp((uint8_t *) &beacon_probe_rsp->ssId, (uint8_t *) ¤t_ssid, (uint8_t) (1 + current_ssid.length)))) { /* @@ -3506,7 +3506,7 @@ tSirRetStatus lim_extract_ap_capabilities(tpAniSirGlobal pMac, uint16_t ieLen, tpSirProbeRespBeacon beaconStruct) { - cdf_mem_set((uint8_t *) beaconStruct, sizeof(tSirProbeRespBeacon), 0); + qdf_mem_set((uint8_t *) beaconStruct, sizeof(tSirProbeRespBeacon), 0); PELOG3(lim_log(pMac, LOG3, FL @@ -3556,13 +3556,13 @@ lim_del_bss(tpAniSirGlobal pMac, tpDphHashNode pStaDs, uint16_t bssIdx, tSirMsgQ msgQ; tSirRetStatus retCode = eSIR_SUCCESS; - pDelBssParams = cdf_mem_malloc(sizeof(tDeleteBssParams)); + pDelBssParams = qdf_mem_malloc(sizeof(tDeleteBssParams)); if (NULL == pDelBssParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_BSS")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pDelBssParams, sizeof(tDeleteBssParams), 0); + qdf_mem_set((uint8_t *) pDelBssParams, sizeof(tDeleteBssParams), 0); pDelBssParams->sessionId = psessionEntry->peSessionId; /* update PE session Id */ @@ -3588,7 +3588,7 @@ lim_del_bss(tpAniSirGlobal pMac, tpDphHashNode pStaDs, uint16_t bssIdx, pDelBssParams->status = QDF_STATUS_SUCCESS; pDelBssParams->respReqd = 1; - cdf_mem_copy(pDelBssParams->bssid, psessionEntry->bssId, + qdf_mem_copy(pDelBssParams->bssid, psessionEntry->bssId, sizeof(tSirMacAddr)); pDelBssParams->smesessionId = psessionEntry->smeSessionId; PELOGW(lim_log @@ -3614,7 +3614,7 @@ lim_del_bss(tpAniSirGlobal pMac, tpDphHashNode pStaDs, uint16_t bssIdx, lim_log(pMac, LOGE, FL("Posting DELETE_BSS_REQ to HAL failed, reason=%X"), retCode); - cdf_mem_free(pDelBssParams); + qdf_mem_free(pDelBssParams); } return retCode; @@ -3756,20 +3756,20 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, tAddStaParams *sta_context; /* Package SIR_HAL_ADD_BSS_REQ message parameters */ - pAddBssParams = cdf_mem_malloc(sizeof(tAddBssParams)); + pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams)); if (NULL == pAddBssParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_BSS")); retCode = eSIR_MEM_ALLOC_FAILED; goto returnFailure; } else - cdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), + qdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); - cdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, + qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); /* Fill in tAddBssParams selfMacAddr */ - cdf_mem_copy(pAddBssParams->selfMacAddr, + qdf_mem_copy(pAddBssParams->selfMacAddr, psessionEntry->selfMacAddr, sizeof(tSirMacAddr)); lim_log(pMac, LOG1, @@ -3805,7 +3805,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, pBeaconStruct->cfParamSet.cfpDurRemaining; pAddBssParams->rateSet.numRates = pAssocRsp->supportedRates.numRates; - cdf_mem_copy(pAddBssParams->rateSet.rate, + qdf_mem_copy(pAddBssParams->rateSet.rate, pAssocRsp->supportedRates.rate, pAssocRsp->supportedRates.numRates); @@ -3943,7 +3943,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, /* Identifying AP as an STA */ pAddBssParams->staContext.staType = STA_ENTRY_OTHER; - cdf_mem_copy(pAddBssParams->staContext.bssId, + qdf_mem_copy(pAddBssParams->staContext.bssId, bssDescription->bssId, sizeof(tSirMacAddr)); pAddBssParams->staContext.listenInterval = bssDescription->beaconInterval; @@ -4178,10 +4178,10 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, if ((!pAddBssParams->staContext.wpa_rsn) && (psessionEntry->isOSENConnection)) pAddBssParams->staContext.wpa_rsn = 1; - cdf_mem_copy(&pAddBssParams->staContext.capab_info, + qdf_mem_copy(&pAddBssParams->staContext.capab_info, &pAssocRsp->capabilityInfo, sizeof(pAddBssParams->staContext.capab_info)); - cdf_mem_copy(&pAddBssParams->staContext.ht_caps, + qdf_mem_copy(&pAddBssParams->staContext.ht_caps, (uint8_t *) &pAssocRsp->HTCaps + sizeof(uint8_t), sizeof(pAddBssParams->staContext.ht_caps)); @@ -4199,7 +4199,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, lim_fill_supported_rates_info(pMac, pStaDs, &pStaDs->supportedRates, psessionEntry); - cdf_mem_copy((uint8_t *) &pAddBssParams->staContext. + qdf_mem_copy((uint8_t *) &pAddBssParams->staContext. supportedRates, (uint8_t *) &pStaDs->supportedRates, sizeof(tSirSupportedRates)); @@ -4285,7 +4285,7 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { SET_LIM_PROCESS_DEFD_MESGS(pMac, true); - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); lim_log(pMac, LOGE, FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), retCode); @@ -4315,7 +4315,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update tpSirBssDescription bssDescription = &psessionEntry->pLimJoinReq->bssDescription; - pBeaconStruct = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { lim_log(pMac, LOGE, FL("Unable to allocate memory during ADD_BSS")); @@ -4323,7 +4323,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update } /* Package SIR_HAL_ADD_BSS_REQ message parameters */ - pAddBssParams = cdf_mem_malloc(sizeof(tAddBssParams)); + pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams)); if (NULL == pAddBssParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_BSS")); @@ -4331,7 +4331,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update goto returnFailure; } - cdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); + qdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); lim_extract_ap_capabilities(pMac, (uint8_t *) bssDescription->ieFields, lim_get_ielen_from_bss_description(bssDescription), @@ -4341,11 +4341,11 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) lim_decide_sta_protection_on_assoc(pMac, pBeaconStruct, psessionEntry); - cdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, + qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); /* Fill in tAddBssParams selfMacAddr */ - cdf_mem_copy(pAddBssParams->selfMacAddr, + qdf_mem_copy(pAddBssParams->selfMacAddr, psessionEntry->selfMacAddr, sizeof(tSirMacAddr)); lim_log(pMac, LOG1, FL("sessionid: %d updateEntry = %d limsystemrole = %d "), @@ -4377,7 +4377,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->rateSet.numRates = pBeaconStruct->supportedRates.numRates; - cdf_mem_copy(pAddBssParams->rateSet.rate, + qdf_mem_copy(pAddBssParams->rateSet.rate, pBeaconStruct->supportedRates.rate, pBeaconStruct->supportedRates.numRates); @@ -4522,7 +4522,7 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update /* Identifying AP as an STA */ pAddBssParams->staContext.staType = STA_ENTRY_OTHER; - cdf_mem_copy(pAddBssParams->staContext.bssId, + qdf_mem_copy(pAddBssParams->staContext.bssId, bssDescription->bssId, sizeof(tSirMacAddr)); pAddBssParams->staContext.listenInterval = bssDescription->beaconInterval; @@ -4805,20 +4805,20 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { SET_LIM_PROCESS_DEFD_MESGS(pMac, true); - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); lim_log(pMac, LOGE, FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), retCode); goto returnFailure; } else { - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); return retCode; } returnFailure: /* Clean-up will be done by the caller... */ - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); return retCode; } @@ -4849,7 +4849,7 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, return; } staDsAssocId = pStaDs->assocId; - cdf_mem_copy((uint8_t *) sta_dsaddr.bytes, + qdf_mem_copy((uint8_t *) sta_dsaddr.bytes, pStaDs->staAddr, QDF_MAC_ADDR_SIZE); mlmStaContext = pStaDs->mlmStaContext; @@ -5088,19 +5088,19 @@ void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameT length = sizeof(tSirSmeUnprotMgmtFrameInd) + frameLen; - pSirSmeMgmtFrame = cdf_mem_malloc(length); + pSirSmeMgmtFrame = qdf_mem_malloc(length); if (NULL == pSirSmeMgmtFrame) { lim_log(pMac, LOGP, FL ("AllocateMemory failed for tSirSmeUnprotectedMgmtFrameInd")); return; } - cdf_mem_set((void *)pSirSmeMgmtFrame, length, 0); + qdf_mem_set((void *)pSirSmeMgmtFrame, length, 0); pSirSmeMgmtFrame->sessionId = sessionId; pSirSmeMgmtFrame->frameType = frameType; - cdf_mem_copy(pSirSmeMgmtFrame->frameBuf, frame, frameLen); + qdf_mem_copy(pSirSmeMgmtFrame->frameBuf, frame, frameLen); pSirSmeMgmtFrame->frameLen = frameLen; mmhMsg.type = eWNI_SME_UNPROT_MGMT_FRM_IND; @@ -5132,13 +5132,13 @@ void lim_send_sme_tsm_ie_ind(tpAniSirGlobal pMac, tpPESession psessionEntry, if (!pMac || !psessionEntry) return; - pSirSmeTsmIeInd = cdf_mem_malloc(sizeof(tSirSmeTsmIEInd)); + pSirSmeTsmIeInd = qdf_mem_malloc(sizeof(tSirSmeTsmIEInd)); if (NULL == pSirSmeTsmIeInd) { lim_log(pMac, LOGP, FL("AllocateMemory failed for tSirSmeTsmIEInd")); return; } - cdf_mem_set((void *)pSirSmeTsmIeInd, sizeof(tSirSmeTsmIEInd), 0); + qdf_mem_set((void *)pSirSmeTsmIeInd, sizeof(tSirSmeTsmIEInd), 0); pSirSmeTsmIeInd->sessionId = psessionEntry->smeSessionId; pSirSmeTsmIeInd->tsmIe.tsid = tid; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 8b6df1cf5d82..941513b241fd 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -45,7 +45,7 @@ #include "lim_types.h" -bool lim_cmp_ssid(tSirMacSSid *, tpPESession); +uint32_t lim_cmp_ssid(tSirMacSSid *, tpPESession); uint8_t lim_compare_capabilities(tpAniSirGlobal, tSirAssocReq *, tSirMacCapabilityInfo *, tpPESession); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 2122371999eb..ee0116256fb1 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -61,7 +61,7 @@ extern void lim_send_set_sta_key_req(tpAniSirGlobal pMac, void lim_ft_open(tpAniSirGlobal pMac, tpPESession psessionEntry) { if (psessionEntry) - cdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), + qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); } @@ -95,27 +95,27 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry psessionEntry->ftPEContext.pFTPreAuthReq); if (psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription) { - cdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription); psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription = NULL; } - cdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); psessionEntry->ftPEContext.pFTPreAuthReq = NULL; } if (psessionEntry->ftPEContext.pAddBssReq) { - cdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); + qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); psessionEntry->ftPEContext.pAddBssReq = NULL; } if (psessionEntry->ftPEContext.pAddStaReq) { - cdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); + qdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); psessionEntry->ftPEContext.pAddStaReq = NULL; } /* The session is being deleted, cleanup the contents */ - cdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); + qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); /* Delete the session created while handling pre-auth response */ if (pReAssocSessionEntry) { @@ -166,27 +166,27 @@ void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry) if (NULL != psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription) { - cdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription); psessionEntry->ftPEContext.pFTPreAuthReq-> pbssDescription = NULL; } - cdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); psessionEntry->ftPEContext.pFTPreAuthReq = NULL; } if (psessionEntry->ftPEContext.pAddBssReq) { - cdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); + qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); psessionEntry->ftPEContext.pAddBssReq = NULL; } if (psessionEntry->ftPEContext.pAddStaReq) { - cdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); + qdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); psessionEntry->ftPEContext.pAddStaReq = NULL; } /* The session is being deleted, cleanup the contents */ - cdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); + qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); } /* @@ -248,12 +248,12 @@ int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) /* Indicate that this is the session on which preauth is being done */ if (session->ftPEContext.pFTPreAuthReq) { if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { - cdf_mem_free( + qdf_mem_free( session->ftPEContext.pFTPreAuthReq->pbssDescription); session->ftPEContext.pFTPreAuthReq->pbssDescription = NULL; } - cdf_mem_free(session->ftPEContext.pFTPreAuthReq); + qdf_mem_free(session->ftPEContext.pFTPreAuthReq); session->ftPEContext.pFTPreAuthReq = NULL; } @@ -392,22 +392,22 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, return eSIR_FAILURE; } - pBeaconStruct = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { lim_log(pMac, LOGE, FL("Unable to allocate memory for creating ADD_BSS")); return eSIR_MEM_ALLOC_FAILED; } /* Package SIR_HAL_ADD_BSS_REQ message parameters */ - pAddBssParams = cdf_mem_malloc(sizeof(tAddBssParams)); + pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams)); if (NULL == pAddBssParams) { - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); lim_log(pMac, LOGP, FL("Unable to allocate memory for creating ADD_BSS")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); + qdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); lim_extract_ap_capabilities(pMac, (uint8_t *) bssDescription->ieFields, lim_get_ielen_from_bss_description(bssDescription), @@ -418,11 +418,11 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, lim_decide_sta_protection_on_assoc(pMac, pBeaconStruct, pftSessionEntry); - cdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, + qdf_mem_copy(pAddBssParams->bssId, bssDescription->bssId, sizeof(tSirMacAddr)); /* Fill in tAddBssParams selfMacAddr */ - cdf_mem_copy(pAddBssParams->selfMacAddr, pftSessionEntry->selfMacAddr, + qdf_mem_copy(pAddBssParams->selfMacAddr, pftSessionEntry->selfMacAddr, sizeof(tSirMacAddr)); pAddBssParams->bssType = pftSessionEntry->bssType; @@ -445,7 +445,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, pAddBssParams->rateSet.numRates = pBeaconStruct->supportedRates.numRates; - cdf_mem_copy(pAddBssParams->rateSet.rate, + qdf_mem_copy(pAddBssParams->rateSet.rate, pBeaconStruct->supportedRates.rate, pBeaconStruct->supportedRates.numRates); @@ -469,10 +469,10 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, if (IS_DOT11_MODE_HT(pftSessionEntry->dot11mode) && (pBeaconStruct->HTCaps.present)) { pAddBssParams->htCapable = pBeaconStruct->HTCaps.present; - cdf_mem_copy(&pAddBssParams->staContext.capab_info, + qdf_mem_copy(&pAddBssParams->staContext.capab_info, &pBeaconStruct->capabilityInfo, sizeof(pAddBssParams->staContext.capab_info)); - cdf_mem_copy(&pAddBssParams->staContext.ht_caps, + qdf_mem_copy(&pAddBssParams->staContext.ht_caps, (uint8_t *) &pBeaconStruct->HTCaps + sizeof(uint8_t), sizeof(pAddBssParams->staContext.ht_caps)); @@ -584,7 +584,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, { pAddBssParams->staContext.staType = STA_ENTRY_OTHER; - cdf_mem_copy(pAddBssParams->staContext.bssId, + qdf_mem_copy(pAddBssParams->staContext.bssId, bssDescription->bssId, sizeof(tSirMacAddr)); pAddBssParams->staContext.listenInterval = bssDescription->beaconInterval; @@ -748,7 +748,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap...")); - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); return 0; } @@ -769,7 +769,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, uint32_t selfDot11Mode; ePhyChanBondState cbEnabledMode; - pBeaconStruct = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { lim_log(pMac, LOGE, FL("No memory for creating lim_fill_ft_session")); @@ -795,18 +795,18 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->rateSet.numRates = pBeaconStruct->supportedRates.numRates; - cdf_mem_copy(pftSessionEntry->rateSet.rate, + qdf_mem_copy(pftSessionEntry->rateSet.rate, pBeaconStruct->supportedRates.rate, pBeaconStruct->supportedRates.numRates); pftSessionEntry->extRateSet.numRates = pBeaconStruct->extendedRates.numRates; - cdf_mem_copy(pftSessionEntry->extRateSet.rate, + qdf_mem_copy(pftSessionEntry->extRateSet.rate, pBeaconStruct->extendedRates.rate, pftSessionEntry->extRateSet.numRates); pftSessionEntry->ssId.length = pBeaconStruct->ssId.length; - cdf_mem_copy(pftSessionEntry->ssId.ssId, pBeaconStruct->ssId.ssId, + qdf_mem_copy(pftSessionEntry->ssId.ssId, pBeaconStruct->ssId.ssId, pftSessionEntry->ssId.length); wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfDot11Mode); @@ -962,7 +962,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->limRmfEnabled = psessionEntry->limRmfEnabled; #endif - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); } /*------------------------------------------------------------------ @@ -1059,13 +1059,13 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, tSirMsgQ mmh_msg; uint16_t rsp_len = sizeof(tSirFTPreAuthRsp); - ft_pre_auth_rsp = (tpSirFTPreAuthRsp) cdf_mem_malloc(rsp_len); + ft_pre_auth_rsp = (tpSirFTPreAuthRsp) qdf_mem_malloc(rsp_len); if (NULL == ft_pre_auth_rsp) { lim_log(mac_ctx, LOGE, "Failed to allocate memory"); QDF_ASSERT(ft_pre_auth_rsp != NULL); return; } - cdf_mem_zero(ft_pre_auth_rsp, rsp_len); + qdf_mem_zero(ft_pre_auth_rsp, rsp_len); lim_log(mac_ctx, LOG1, FL("Auth Rsp = %p"), ft_pre_auth_rsp); if (session) { @@ -1073,7 +1073,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, if (!LIM_IS_STA_ROLE(session)) { lim_log(mac_ctx, LOGE, FL("session is not in STA mode")); - cdf_mem_free(ft_pre_auth_rsp); + qdf_mem_free(ft_pre_auth_rsp); return; } ft_pre_auth_rsp->smeSessionId = session->smeSessionId; @@ -1091,7 +1091,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, ft_pre_auth_rsp->ft_ies_length = 0; if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { /* Only 11r assoc has FT IEs */ - cdf_mem_copy(ft_pre_auth_rsp->ft_ies, + qdf_mem_copy(ft_pre_auth_rsp->ft_ies, auth_rsp, auth_rsp_length); ft_pre_auth_rsp->ft_ies_length = auth_rsp_length; } @@ -1154,7 +1154,7 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, */ psessionEntry->ftPEContext.saved_auth_rsp_length = 0; if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { - cdf_mem_copy(psessionEntry->ftPEContext.saved_auth_rsp, + qdf_mem_copy(psessionEntry->ftPEContext.saved_auth_rsp, auth_rsp, auth_rsp_length); psessionEntry->ftPEContext.saved_auth_rsp_length = auth_rsp_length; @@ -1199,7 +1199,7 @@ void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, lim_log(pMac, LOGE, FL("Invalid bss type")); } pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState; - cdf_mem_copy(&(pftSessionEntry->htConfig), + qdf_mem_copy(&(pftSessionEntry->htConfig), &(psessionEntry->htConfig), sizeof(psessionEntry->htConfig)); pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; @@ -1270,14 +1270,14 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, lim_log(pMac, LOGE, FL("pAddBssReq is NULL")); return; } - pMlmReassocReq = cdf_mem_malloc(sizeof(tLimMlmReassocReq)); + pMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); if (NULL == pMlmReassocReq) { lim_log(pMac, LOGE, FL("call to AllocateMemory failed for mlmReassocReq")); return; } - cdf_mem_copy(pMlmReassocReq->peerMacAddr, + qdf_mem_copy(pMlmReassocReq->peerMacAddr, psessionEntry->bssId, sizeof(tSirMacAddr)); if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, @@ -1289,7 +1289,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, */ lim_log(pMac, LOGE, FL("could not retrieve ReassocFailureTimeout value")); - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } @@ -1299,7 +1299,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, * from CFG. Log error. */ lim_log(pMac, LOGE, FL("could not retrieve Capabilities value")); - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } pMlmReassocReq->capabilityInfo = caps; @@ -1314,7 +1314,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, eSIR_SUCCESS) { lim_log(pMac, LOGP, FL("Couldn't get WNI_CFG_TELE_BCN_WAKEUP_EN")); - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } @@ -1327,7 +1327,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, */ lim_log(pMac, LOGE, FL("could not retrieve ListenInterval")); - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } } else { @@ -1339,14 +1339,14 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, */ lim_log(pMac, LOGE, FL("could not retrieve ListenInterval")); - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } } if (lim_set_link_state (pMac, eSIR_LINK_PREASSOC_STATE, psessionEntry->bssId, psessionEntry->selfMacAddr, NULL, NULL) != eSIR_SUCCESS) { - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); return; } @@ -1365,7 +1365,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); + qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); lim_log(pMac, LOGE, FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), retCode); @@ -1493,14 +1493,14 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf) &psessionEntry->ftPEContext.PreAuthKeyInfo. extSetStaKeyParam; - cdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq)); + qdf_mem_zero(pMlmSetKeysReq, sizeof(tLimMlmSetKeysReq)); qdf_copy_macaddr(&pMlmSetKeysReq->peer_macaddr, &pKeyInfo->bssid); pMlmSetKeysReq->sessionId = psessionEntry->peSessionId; pMlmSetKeysReq->smesessionId = psessionEntry->smeSessionId; pMlmSetKeysReq->edType = pKeyInfo->keyMaterial.edType; pMlmSetKeysReq->numKeys = pKeyInfo->keyMaterial.numKeys; - cdf_mem_copy((uint8_t *) &pMlmSetKeysReq->key, + qdf_mem_copy((uint8_t *) &pMlmSetKeysReq->key, (uint8_t *) &pKeyInfo->keyMaterial.key, sizeof(tSirKeys)); @@ -1523,7 +1523,7 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf) pAddBssParams->extSetStaKeyParamValid = 1; pAddBssParams->extSetStaKeyParam.encType = pKeyInfo->keyMaterial.edType; - cdf_mem_copy((uint8_t *) &pAddBssParams->extSetStaKeyParam.key, + qdf_mem_copy((uint8_t *) &pAddBssParams->extSetStaKeyParam.key, (uint8_t *) &pKeyInfo->keyMaterial.key, sizeof(tSirKeys)); if (eSIR_SUCCESS != @@ -1602,13 +1602,13 @@ lim_ft_send_aggr_qos_rsp(tpAniSirGlobal pMac, uint8_t rspReqd, if (!rspReqd) { return; } - rsp = cdf_mem_malloc(sizeof(tSirAggrQosRsp)); + rsp = qdf_mem_malloc(sizeof(tSirAggrQosRsp)); if (NULL == rsp) { lim_log(pMac, LOGP, FL("AllocateMemory failed for tSirAggrQosRsp")); return; } - cdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); + qdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); rsp->messageType = eWNI_SME_FT_AGGR_QOS_RSP; rsp->sessionId = smesessionId; rsp->length = sizeof(*rsp); @@ -1646,7 +1646,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) FL("Cant find session entry for %s"), __func__); ) if (pAggrQosRspMsg != NULL) { - cdf_mem_free(pAggrQosRspMsg); + qdf_mem_free(pAggrQosRspMsg); } return; } @@ -1681,7 +1681,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) lim_ft_send_aggr_qos_rsp(pMac, rspReqd, pAggrQosRspMsg, psessionEntry->smeSessionId); if (pAggrQosRspMsg != NULL) { - cdf_mem_free(pAggrQosRspMsg); + qdf_mem_free(pAggrQosRspMsg); } return; } @@ -1698,7 +1698,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf uint8_t sessionId; int i; - pAggrAddTsParam = cdf_mem_malloc(sizeof(tAggrAddTsParams)); + pAggrAddTsParam = qdf_mem_malloc(sizeof(tAggrAddTsParams)); if (NULL == pAggrAddTsParam) { PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory() failed"));) return eSIR_MEM_ALLOC_FAILED; @@ -1713,14 +1713,14 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf FL("psession Entry Null for sessionId = %d"), aggrQosReq->sessionId); ) - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); return eSIR_FAILURE; } /* Nothing to be done if the session is not in STA mode */ if (!LIM_IS_STA_ROLE(psessionEntry)) { lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); return eSIR_FAILURE; } @@ -1731,11 +1731,11 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf FL ("Station context not found - ignoring AddTsRsp")); ) - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); return eSIR_FAILURE; } - cdf_mem_set((uint8_t *) pAggrAddTsParam, sizeof(tAggrAddTsParams), 0); + qdf_mem_set((uint8_t *) pAggrAddTsParam, sizeof(tAggrAddTsParams), 0); pAggrAddTsParam->staIdx = psessionEntry->staId; /* Fill in the sessionId specific to PE */ pAggrAddTsParam->sessionId = sessionId; @@ -1815,7 +1815,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf ("Adding entry in lim Tspec Table failed ")); ) pMac->lim.gLimAddtsSent = false; - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); return eSIR_FAILURE; } @@ -1845,7 +1845,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf (pMac, LOGW, FL("wma_post_ctrl_msg() failed")); ) SET_LIM_PROCESS_DEFD_MESGS(pMac, true); - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); return eSIR_FAILURE; } } @@ -1859,7 +1859,7 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf lim_ft_send_aggr_qos_rsp(pMac, true, pAggrAddTsParam, psessionEntry->smeSessionId); if (pAggrAddTsParam != NULL) { - cdf_mem_free(pAggrAddTsParam); + qdf_mem_free(pAggrAddTsParam); } } #endif @@ -1887,24 +1887,24 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, tSirRetStatus rc = eSIR_SUCCESS; tSirMsgQ msg; - scan_offload_req = cdf_mem_malloc(sizeof(tSirScanOffloadReq)); + scan_offload_req = qdf_mem_malloc(sizeof(tSirScanOffloadReq)); if (NULL == scan_offload_req) { lim_log(mac_ctx, LOGE, FL("Memory allocation failed for pScanOffloadReq")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq)); + qdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq)); msg.type = WMA_START_SCAN_OFFLOAD_REQ; msg.bodyptr = scan_offload_req; msg.bodyval = 0; - cdf_mem_copy((uint8_t *) &scan_offload_req->selfMacAddr.bytes, + qdf_mem_copy((uint8_t *) &scan_offload_req->selfMacAddr.bytes, (uint8_t *) ft_preauth_req->self_mac_addr, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) &scan_offload_req->bssId.bytes, + qdf_mem_copy((uint8_t *) &scan_offload_req->bssId.bytes, (uint8_t *) ft_preauth_req->currbssId, sizeof(tSirMacAddr)); scan_offload_req->scanType = eSIR_PASSIVE_SCAN; @@ -1932,7 +1932,7 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, rc = wma_post_ctrl_msg(mac_ctx, &msg); if (rc != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL("START_SCAN_OFFLOAD failed %u"), rc); - cdf_mem_free(scan_offload_req); + qdf_mem_free(scan_offload_req); return QDF_STATUS_E_FAILURE; } diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index 697532dd8af5..a8c26803d40c 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -68,7 +68,7 @@ static tLimIbssPeerNode *ibss_peer_find(tpAniSirGlobal pMac, tLimIbssPeerNode *pTempNode = pMac->lim.gLimIbssPeerList; while (pTempNode != NULL) { - if (cdf_mem_compare((uint8_t *) macAddr, + if (!qdf_mem_cmp((uint8_t *) macAddr, (uint8_t *) &pTempNode->peerMacAddr, sizeof(tSirMacAddr))) break; @@ -115,10 +115,10 @@ ibss_peer_add(tpAniSirGlobal pMac, tLimIbssPeerNode *pPeerNode) pTemp = pTemp->next; } if (pTemp->beacon) { - cdf_mem_free(pTemp->beacon); + qdf_mem_free(pTemp->beacon); } - cdf_mem_free(pTemp); + qdf_mem_free(pTemp); pPrev->next = NULL; } else #endif @@ -158,7 +158,7 @@ ibss_peer_collect(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr, tLimIbssPeerNode *pPeer, tpPESession psessionEntry) { - cdf_mem_copy(pPeer->peerMacAddr, pHdr->sa, sizeof(tSirMacAddr)); + qdf_mem_copy(pPeer->peerMacAddr, pHdr->sa, sizeof(tSirMacAddr)); pPeer->capabilityInfo = pBeacon->capabilityInfo; pPeer->extendedRatesPresent = pBeacon->extendedRatesPresent; @@ -174,7 +174,7 @@ ibss_peer_collect(tpAniSirGlobal pMac, if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && (pBeacon->HTCaps.present)) { pPeer->htCapable = pBeacon->HTCaps.present; - cdf_mem_copy((uint8_t *) pPeer->supportedMCSSet, + qdf_mem_copy((uint8_t *) pPeer->supportedMCSSet, (uint8_t *) pBeacon->HTCaps.supportedMCSSet, sizeof(pPeer->supportedMCSSet)); pPeer->htGreenfield = (uint8_t) pBeacon->HTCaps.greenField; @@ -203,18 +203,18 @@ ibss_peer_collect(tpAniSirGlobal pMac, pPeer->vhtCapable = pBeacon->VHTCaps.present; /* Collect VHT capabilities from beacon */ - cdf_mem_copy((uint8_t *) &pPeer->VHTCaps, + qdf_mem_copy((uint8_t *) &pPeer->VHTCaps, (uint8_t *) &pBeacon->VHTCaps, sizeof(tDot11fIEVHTCaps)); } #endif pPeer->erpIePresent = pBeacon->erpPresent; - cdf_mem_copy((uint8_t *) &pPeer->supportedRates, + qdf_mem_copy((uint8_t *) &pPeer->supportedRates, (uint8_t *) &pBeacon->supportedRates, pBeacon->supportedRates.numRates + 1); if (pPeer->extendedRatesPresent) - cdf_mem_copy((uint8_t *) &pPeer->extendedRates, + qdf_mem_copy((uint8_t *) &pPeer->extendedRates, (uint8_t *) &pBeacon->extendedRates, pBeacon->extendedRates.numRates + 1); else @@ -380,9 +380,9 @@ ibss_sta_info_update(tpAniSirGlobal pMac, static void ibss_coalesce_free(tpAniSirGlobal pMac) { if (pMac->lim.ibssInfo.pHdr != NULL) - cdf_mem_free(pMac->lim.ibssInfo.pHdr); + qdf_mem_free(pMac->lim.ibssInfo.pHdr); if (pMac->lim.ibssInfo.pBeacon != NULL) - cdf_mem_free(pMac->lim.ibssInfo.pBeacon); + qdf_mem_free(pMac->lim.ibssInfo.pBeacon); pMac->lim.ibssInfo.pHdr = NULL; pMac->lim.ibssInfo.pBeacon = NULL; @@ -398,12 +398,12 @@ ibss_coalesce_save(tpAniSirGlobal pMac, /* get rid of any saved info */ ibss_coalesce_free(pMac); - pMac->lim.ibssInfo.pHdr = cdf_mem_malloc(sizeof(*pHdr)); + pMac->lim.ibssInfo.pHdr = qdf_mem_malloc(sizeof(*pHdr)); if (NULL == pMac->lim.ibssInfo.pHdr) { PELOGE(lim_log(pMac, LOGE, FL("ibbs-save: Failed malloc pHdr"));) return; } - pMac->lim.ibssInfo.pBeacon = cdf_mem_malloc(sizeof(*pBeacon)); + pMac->lim.ibssInfo.pBeacon = qdf_mem_malloc(sizeof(*pBeacon)); if (NULL == pMac->lim.ibssInfo.pBeacon) { PELOGE(lim_log (pMac, LOGE, FL("ibbs-save: Failed malloc pBeacon")); @@ -412,8 +412,8 @@ ibss_coalesce_save(tpAniSirGlobal pMac, return; } - cdf_mem_copy(pMac->lim.ibssInfo.pHdr, pHdr, sizeof(*pHdr)); - cdf_mem_copy(pMac->lim.ibssInfo.pBeacon, pBeacon, sizeof(*pBeacon)); + qdf_mem_copy(pMac->lim.ibssInfo.pHdr, pHdr, sizeof(*pHdr)); + qdf_mem_copy(pMac->lim.ibssInfo.pBeacon, pBeacon, sizeof(*pBeacon)); } /* @@ -502,7 +502,7 @@ ibss_status_chg_notify(tpAniSirGlobal pMac, beacon, bcnLen, status, sessionId); if (beacon != NULL) { - cdf_mem_free(beacon); + qdf_mem_free(beacon); } } @@ -523,7 +523,7 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry) return; } - cdf_mem_copy(psessionEntry->bssId, pHdr->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(psessionEntry->bssId, pHdr->bssId, sizeof(tSirMacAddr)); sir_copy_mac_addr(pHdr->bssId, psessionEntry->bssId); @@ -544,7 +544,7 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry) psessionEntry->shortSlotTimeSupported = pBeacon->capabilityInfo.shortSlotTime; } - cdf_mem_copy((uint8_t *) &psessionEntry->pLimStartBssReq-> + qdf_mem_copy((uint8_t *) &psessionEntry->pLimStartBssReq-> operationalRateSet, (uint8_t *) &pBeacon->supportedRates, pBeacon->supportedRates.numRates); @@ -575,12 +575,12 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry) * even though all the nodes are capable of doing CB. * so it is decided to leave the self HT capabilties intact. This may change if some issues are found in interop. */ - cdf_mem_set((void *)&mlmStartReq, sizeof(mlmStartReq), 0); + qdf_mem_set((void *)&mlmStartReq, sizeof(mlmStartReq), 0); - cdf_mem_copy(mlmStartReq.bssId, pHdr->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(mlmStartReq.bssId, pHdr->bssId, sizeof(tSirMacAddr)); mlmStartReq.rateSet.numRates = psessionEntry->pLimStartBssReq->operationalRateSet.numRates; - cdf_mem_copy(&mlmStartReq.rateSet.rate[0], + qdf_mem_copy(&mlmStartReq.rateSet.rate[0], &psessionEntry->pLimStartBssReq->operationalRateSet. rate[0], mlmStartReq.rateSet.numRates); mlmStartReq.bssType = eSIR_IBSS_MODE; @@ -597,7 +597,7 @@ static void ibss_bss_add(tpAniSirGlobal pMac, tpPESession psessionEntry) mlmStartReq.cbMode = psessionEntry->pLimStartBssReq->cbMode; /* Copy the SSID for RxP filtering based on SSID. */ - cdf_mem_copy((uint8_t *) &mlmStartReq.ssId, + qdf_mem_copy((uint8_t *) &mlmStartReq.ssId, (uint8_t *) &psessionEntry->pLimStartBssReq->ssId, psessionEntry->pLimStartBssReq->ssId.length + 1); @@ -663,7 +663,7 @@ void lim_ibss_init(tpAniSirGlobal pMac) pMac->lim.gLimNumIbssPeers = 0; /* ibss info - params for which ibss to join while coalescing */ - cdf_mem_set(&pMac->lim.ibssInfo, sizeof(tAniSirLimIbss), 0); + qdf_mem_set(&pMac->lim.ibssInfo, sizeof(tAniSirLimIbss), 0); } /*** end lim_ibss_init() ***/ /** @@ -729,9 +729,9 @@ void lim_ibss_delete_all_peers(tpAniSirGlobal pMac, tpPESession psessionEntry) pMac->lim.gLimIbssPeerList = pTempNode; if (pCurrNode->beacon) { - cdf_mem_free(pCurrNode->beacon); + qdf_mem_free(pCurrNode->beacon); } - cdf_mem_free(pCurrNode); + qdf_mem_free(pCurrNode); if (pMac->lim.gLimNumIbssPeers > 0) /* be paranoid */ pMac->lim.gLimNumIbssPeers--; pCurrNode = pTempNode; @@ -838,7 +838,7 @@ lim_ibss_update_protection_params(tpAniSirGlobal pMac, (pMac, pMac->lim.protStaCache[i].addr, LOG1); ) - if (cdf_mem_compare(pMac->lim.protStaCache[i].addr, + if (!qdf_mem_cmp(pMac->lim.protStaCache[i].addr, peerMacAddr, sizeof(tSirMacAddr))) { PELOG1(lim_log @@ -862,7 +862,7 @@ lim_ibss_update_protection_params(tpAniSirGlobal pMac, return; } - cdf_mem_copy(pMac->lim.protStaCache[i].addr, + qdf_mem_copy(pMac->lim.protStaCache[i].addr, peerMacAddr, sizeof(tSirMacAddr)); pMac->lim.protStaCache[i].protStaCacheType = protStaCacheType; @@ -985,7 +985,7 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry) tSirMacAddr *pPeerAddr = (tSirMacAddr *) pBody; tUpdateBeaconParams beaconParams; - cdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); + qdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); if (pBody == 0) { PELOGE(lim_log(pMac, LOGE, FL("Invalid IBSS AddSta"));) @@ -1084,7 +1084,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) FL("IBSS: ADD_STA_RSP for unknown MAC addr ")); ) lim_print_mac_addr(pMac, pAddStaParams->staMac, LOGE); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); return eSIR_FAILURE; } @@ -1094,7 +1094,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) pAddStaParams->status); ) lim_print_mac_addr(pMac, pAddStaParams->staMac, LOGE); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); return eSIR_FAILURE; } @@ -1115,7 +1115,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) eWNI_SME_IBSS_NEW_PEER_IND, psessionEntry->smeSessionId); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); return eSIR_SUCCESS; } @@ -1151,7 +1151,7 @@ void lim_ibss_del_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, end: if (pDelBss != NULL) - cdf_mem_free(pDelBss); + qdf_mem_free(pDelBss); } void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, @@ -1178,10 +1178,10 @@ void lim_ibss_add_bss_rsp_when_coalescing(tpAniSirGlobal pMac, void *msg, infoLen = sizeof(tSirMacAddr) + sizeof(tSirMacChanNum) + sizeof(uint8_t) + pBeacon->ssId.length + 1; - cdf_mem_set((void *)&newBssInfo, sizeof(newBssInfo), 0); - cdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, QDF_MAC_ADDR_SIZE); + qdf_mem_set((void *)&newBssInfo, sizeof(newBssInfo), 0); + qdf_mem_copy(newBssInfo.bssId.bytes, pHdr->bssId, QDF_MAC_ADDR_SIZE); newBssInfo.channelNumber = (tSirMacChanNum) pAddBss->currentOperChannel; - cdf_mem_copy((uint8_t *) &newBssInfo.ssId, + qdf_mem_copy((uint8_t *) &newBssInfo.ssId, (uint8_t *) &pBeacon->ssId, pBeacon->ssId.length + 1); PELOGW(lim_log @@ -1274,7 +1274,7 @@ void lim_ibss_del_bss_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEn end: if (pDelBss != NULL) - cdf_mem_free(pDelBss); + qdf_mem_free(pDelBss); /* Delete PE session once BSS is deleted */ if (NULL != psessionEntry) { lim_send_sme_rsp(pMac, eWNI_SME_STOP_BSS_RSP, rc, @@ -1307,7 +1307,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, pTempNextNode = pTempNode->next; /* Delete the STA with MAC address */ - if (cdf_mem_compare((uint8_t *) macAddr, + if (!qdf_mem_cmp((uint8_t *) macAddr, (uint8_t *) &pTempNode->peerMacAddr, sizeof(tSirMacAddr))) { pStaDs = dph_lookup_hash_entry(pMac, macAddr, @@ -1339,7 +1339,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, } else pPrevNode->next = pTempNode->next; - cdf_mem_free(pTempNode); + qdf_mem_free(pTempNode); pMac->lim.gLimNumIbssPeers--; pTempNode = pTempNextNode; @@ -1393,7 +1393,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, tpDphHashNode pStaDs; tUpdateBeaconParams beaconParams; - cdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); + qdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); sir_copy_mac_addr(currentBssId, psessionEntry->bssId); @@ -1403,7 +1403,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, MAC_ADDR_ARRAY(pHdr->bssId)); /* Check for IBSS Coalescing only if Beacon is from different BSS */ - if (!cdf_mem_compare(currentBssId, pHdr->bssId, sizeof(tSirMacAddr)) + if (qdf_mem_cmp(currentBssId, pHdr->bssId, sizeof(tSirMacAddr)) && psessionEntry->isCoalesingInIBSSAllowed) { /* * If STA entry is already available in the LIM hash table, then it is @@ -1444,7 +1444,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, ibss_bss_delete(pMac, psessionEntry); return eSIR_SUCCESS; } else { - if (!cdf_mem_compare + if (qdf_mem_cmp (currentBssId, pHdr->bssId, sizeof(tSirMacAddr))) return eSIR_LIM_IGNORE_BEACON; } @@ -1480,7 +1480,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, frameLen = sizeof(tLimIbssPeerNode) + ieLen - sizeof(uint32_t); - pPeerNode = cdf_mem_malloc((uint16_t) frameLen); + pPeerNode = qdf_mem_malloc((uint16_t) frameLen); if (NULL == pPeerNode) { lim_log(pMac, LOGP, FL @@ -1494,7 +1494,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, ibss_peer_collect(pMac, pBeacon, pHdr, pPeerNode, psessionEntry); - pPeerNode->beacon = cdf_mem_malloc(ieLen); + pPeerNode->beacon = qdf_mem_malloc(ieLen); if (NULL == pPeerNode->beacon) { PELOGE(lim_log (pMac, LOGE, @@ -1502,7 +1502,7 @@ lim_ibss_coalesce(tpAniSirGlobal pMac, ("Unable to allocate memory to store beacon")); ) } else { - cdf_mem_copy(pPeerNode->beacon, pIEs, ieLen); + qdf_mem_copy(pPeerNode->beacon, pIEs, ieLen); pPeerNode->beaconLen = (uint16_t) ieLen; } ibss_peer_add(pMac, pPeerNode); @@ -1659,7 +1659,7 @@ void lim_ibss_heart_beat_handle(tpAniSirGlobal mac_ctx, tpPESession session) prevnode->next = tempnode->next; } - cdf_mem_free(tempnode); + qdf_mem_free(tempnode); mac_ctx->lim.gLimNumIbssPeers--; /* we deleted current node, so prevNode remains same. */ @@ -1753,7 +1753,7 @@ void lim_ibss_decide_protection_on_delete(tpAniSirGlobal mac_ctx, for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { if (!mac_ctx->lim.protStaCache[i].active) continue; - if (cdf_mem_compare(mac_ctx->lim.protStaCache[i].addr, + if (!qdf_mem_cmp(mac_ctx->lim.protStaCache[i].addr, stads->staAddr, sizeof(tSirMacAddr))) { session->gLim11bParams.numSta--; mac_ctx->lim.protStaCache[i].active = false; diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index c61e18930916..416edf1dd824 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -78,7 +78,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, msg->staId, msg->reasonCode); if (LIM_IS_IBSS_ROLE(session_entry)) { - cdf_mem_free(msg); + qdf_mem_free(msg); return; } @@ -89,7 +89,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, lim_log(mac_ctx, LOGE, FL("Invalid STA limSystemRole=%d"), GET_LIM_SYSTEM_ROLE(session_entry)); - cdf_mem_free(msg); + qdf_mem_free(msg); return; } stads->del_sta_ctx_rssi = msg->rssi; @@ -100,7 +100,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, if (stads->staIndex != msg->staId) { lim_log(mac_ctx, LOGE, FL("staid mismatch: %d vs %d "), stads->staIndex, msg->staId); - cdf_mem_free(msg); + qdf_mem_free(msg); return; } @@ -125,7 +125,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, lim_log(mac_ctx, LOGE, FL("Inv Del STA staId:%d, assocId:%d"), msg->staId, msg->assocId); - cdf_mem_free(msg); + qdf_mem_free(msg); return; } else { lim_send_disassoc_mgmt_frame(mac_ctx, @@ -172,7 +172,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, "in some transit state, Addr = " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(msg->bssId)); - cdf_mem_free(msg); + qdf_mem_free(msg); return; } @@ -182,7 +182,7 @@ static void lim_delete_sta_util(tpAniSirGlobal mac_ctx, tpDeleteStaContext msg, eLIM_LINK_MONITORING_DEAUTH; /* Issue Deauth Indication to SME. */ - cdf_mem_copy((uint8_t *) &mlm_deauth_ind.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlm_deauth_ind.peerMacAddr, stads->staAddr, sizeof(tSirMacAddr)); mlm_deauth_ind.reasonCode = (uint8_t) stads->mlmStaContext.disassocReason; @@ -229,7 +229,7 @@ void lim_delete_sta_context(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) &session_id); if (NULL == session_entry) { lim_log(mac_ctx, LOGE, FL("session does not exist")); - cdf_mem_free(msg); + qdf_mem_free(msg); return; } @@ -251,7 +251,7 @@ void lim_delete_sta_context(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) lim_log(mac_ctx, LOGE, FL(" Unknown reason code ")); break; } - cdf_mem_free(msg); + qdf_mem_free(msg); return; } @@ -289,7 +289,7 @@ lim_trigger_sta_deletion(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, sta_ds->mlmStaContext.disassocReason = eSIR_MAC_DISASSOC_DUE_TO_INACTIVITY_REASON; sta_ds->mlmStaContext.cleanupTrigger = eLIM_LINK_MONITORING_DISASSOC; - cdf_mem_copy(&mlm_disassoc_ind.peerMacAddr, sta_ds->staAddr, + qdf_mem_copy(&mlm_disassoc_ind.peerMacAddr, sta_ds->staAddr, sizeof(tSirMacAddr)); mlm_disassoc_ind.reasonCode = eSIR_MAC_DISASSOC_DUE_TO_INACTIVITY_REASON; @@ -329,7 +329,8 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId, /* tear down the following sessionEntry */ tpPESession psessionEntry; - if ((psessionEntry = pe_find_session_by_session_id(pMac, sessionId)) == NULL) { + psessionEntry = pe_find_session_by_session_id(pMac, sessionId); + if (psessionEntry == NULL) { lim_log(pMac, LOGP, FL("Session Does not exist for given sessionID")); return; @@ -377,7 +378,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId, eLIM_MLM_WT_DEL_STA_RSP_STATE; /* / Issue Deauth Indication to SME. */ - cdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, pStaDs->staAddr, sizeof(tSirMacAddr)); /* @@ -397,7 +398,7 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId, lim_log(pMac, LOGE, FL("HB Failure on MAC " MAC_ADDRESS_STR" Store it on Index %d"), - MAC_ADDR_ARRAY(pStaDs->staAddr),apCount); + MAC_ADDR_ARRAY(pStaDs->staAddr), apCount); sir_copy_mac_addr(pMac->lim.gLimHeartBeatApMac[apCount], pStaDs->staAddr); @@ -488,8 +489,8 @@ void lim_handle_heart_beat_failure(tpAniSirGlobal mac_ctx, if (curr_chan < SIR_MAX_24G_5G_CHANNEL_RANGE) { lim_covert_channel_scan_type(mac_ctx, curr_chan, false); - mac_ctx->lim.dfschannelList.timeStamp[curr_chan] - = 0; + mac_ctx->lim.dfschannelList. + timeStamp[curr_chan] = 0; } /* * Connected on DFS channel so should not send the diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index 1c8b8c73d815..bf79d48ba613 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -85,14 +85,14 @@ static QDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, tSirMsgQ msg; tSirRetStatus rc = eSIR_SUCCESS; - pScanOffloadReq = cdf_mem_malloc(sizeof(tSirScanOffloadReq)); + pScanOffloadReq = qdf_mem_malloc(sizeof(tSirScanOffloadReq)); if (NULL == pScanOffloadReq) { lim_log(pMac, LOGE, FL("Memory allocation failed for pScanOffloadReq")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pScanOffloadReq, sizeof(tSirScanOffloadReq)); + qdf_mem_zero(pScanOffloadReq, sizeof(tSirScanOffloadReq)); msg.type = WMA_START_SCAN_OFFLOAD_REQ; msg.bodyptr = pScanOffloadReq; @@ -121,7 +121,7 @@ static QDF_STATUS lim_send_hal_req_remain_on_chan_offload(tpAniSirGlobal pMac, if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure %u"), rc); - cdf_mem_free(pScanOffloadReq); + qdf_mem_free(pScanOffloadReq); return QDF_STATUS_E_FAILURE; } @@ -145,7 +145,7 @@ int lim_process_remain_on_chnl_req(tpAniSirGlobal pMac, uint32_t *pMsg) /* Post the meessage to Sme */ lim_send_sme_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, status, msgbuff->sessionId, msgbuff->scan_id); - cdf_mem_free(pMac->lim.gpLimRemainOnChanReq); + qdf_mem_free(pMac->lim.gpLimRemainOnChanReq); pMac->lim.gpLimRemainOnChanReq = NULL; } return false; @@ -356,7 +356,7 @@ void lim_remain_on_chn_rsp(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *dat status, MsgRemainonChannel->sessionId, 0); - cdf_mem_free(pMac->lim.gpLimRemainOnChanReq); + qdf_mem_free(pMac->lim.gpLimRemainOnChanReq); pMac->lim.gpLimRemainOnChanReq = NULL; pMac->lim.gLimMlmState = pMac->lim.gLimPrevMlmState; @@ -386,13 +386,13 @@ void lim_send_sme_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType, length = sizeof(tSirSmeMgmtFrameInd) + frameLen; - pSirSmeMgmtFrame = cdf_mem_malloc(length); + pSirSmeMgmtFrame = qdf_mem_malloc(length); if (NULL == pSirSmeMgmtFrame) { lim_log(pMac, LOGP, FL("AllocateMemory failed for eWNI_SME_LISTEN_RSP")); return; } - cdf_mem_set((void *)pSirSmeMgmtFrame, length, 0); + qdf_mem_set((void *)pSirSmeMgmtFrame, length, 0); pSirSmeMgmtFrame->frame_len = frameLen; pSirSmeMgmtFrame->sessionId = sessionId; @@ -400,15 +400,15 @@ void lim_send_sme_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType, pSirSmeMgmtFrame->rxRssi = rxRssi; pSirSmeMgmtFrame->rxChan = rxChannel; - cdf_mem_zero(pSirSmeMgmtFrame->frameBuf, frameLen); - cdf_mem_copy(pSirSmeMgmtFrame->frameBuf, frame, frameLen); + qdf_mem_zero(pSirSmeMgmtFrame->frameBuf, frameLen); + qdf_mem_copy(pSirSmeMgmtFrame->frameBuf, frame, frameLen); if (pMac->mgmt_frame_ind_cb) pMac->mgmt_frame_ind_cb(pSirSmeMgmtFrame); else lim_log(pMac, LOGW, FL("Management indication callback not registered!!")); - cdf_mem_free(pSirSmeMgmtFrame); + qdf_mem_free(pSirSmeMgmtFrame); return; } @@ -577,8 +577,8 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, tpSirMacP2PActionFrameHdr action_hdr = (tpSirMacP2PActionFrameHdr) ((uint8_t *) mb_msg->data + ACTION_OFFSET); - if (cdf_mem_compare(action_hdr->Oui, SIR_MAC_P2P_OUI, - SIR_MAC_P2P_OUI_SIZE) && + if ((!qdf_mem_cmp(action_hdr->Oui, SIR_MAC_P2P_OUI, + SIR_MAC_P2P_OUI_SIZE)) && (SIR_MAC_ACTION_P2P_SUBTYPE_PRESENCE_RSP == action_hdr->OuiSubType)) { @@ -663,7 +663,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, return; } /* Paranoia: */ - cdf_mem_set(frame, msg_len, 0); + qdf_mem_set(frame, msg_len, 0); /* * Add sequence number to action frames @@ -676,14 +676,14 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, /* Add 2 bytes for length and Arribute field */ uint32_t nBytesToCopy = ((p2p_ie + orig_len + 2) - (uint8_t *) mb_msg->data); - cdf_mem_copy(frame, mb_msg->data, nBytesToCopy); - cdf_mem_copy((frame + nBytesToCopy), noa_stream, noa_len); - cdf_mem_copy((frame + nBytesToCopy + noa_len), + qdf_mem_copy(frame, mb_msg->data, nBytesToCopy); + qdf_mem_copy((frame + nBytesToCopy), noa_stream, noa_len); + qdf_mem_copy((frame + nBytesToCopy + noa_len), mb_msg->data + nBytesToCopy, msg_len - nBytesToCopy - noa_len); } else { - cdf_mem_copy(frame, mb_msg->data, msg_len); + qdf_mem_copy(frame, mb_msg->data, msg_len); } #ifdef WLAN_FEATURE_11W @@ -760,14 +760,14 @@ tSirRetStatus __lim_process_sme_no_a_update(tpAniSirGlobal pMac, uint32_t *pMsgB pNoA = (tpP2pPsConfig) pMsgBuf; - pMsgNoA = cdf_mem_malloc(sizeof(tP2pPsConfig)); + pMsgNoA = qdf_mem_malloc(sizeof(tP2pPsConfig)); if (NULL == pMsgNoA) { lim_log(pMac, LOGE, FL("Unable to allocate memory during NoA Update")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pMsgNoA, sizeof(tP2pPsConfig), 0); + qdf_mem_set((uint8_t *) pMsgNoA, sizeof(tP2pPsConfig), 0); pMsgNoA->opp_ps = pNoA->opp_ps; pMsgNoA->ctWindow = pNoA->ctWindow; pMsgNoA->duration = pNoA->duration; diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 09b833413aae..af506051e44d 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -229,7 +229,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx, if (!session->lim11hEnable) return; - chnl_switch_frame = cdf_mem_malloc(sizeof(*chnl_switch_frame)); + chnl_switch_frame = qdf_mem_malloc(sizeof(*chnl_switch_frame)); if (NULL == chnl_switch_frame) { lim_log(mac_ctx, LOGE, FL("AllocateMemory failed")); return; @@ -243,7 +243,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Failed to unpack and parse (0x%08x, %d bytes)"), status, frame_len); - cdf_mem_free(chnl_switch_frame); + qdf_mem_free(chnl_switch_frame); return; } else if (DOT11F_WARNED(status)) { lim_log(mac_ctx, LOGW, @@ -251,11 +251,11 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx, status, frame_len); } - if (!(cdf_mem_compare((uint8_t *) &session->bssId, - (uint8_t *) &mac_hdr->sa, sizeof(tSirMacAddr)))) { + if (qdf_mem_cmp((uint8_t *) &session->bssId, + (uint8_t *) &mac_hdr->sa, sizeof(tSirMacAddr))) { lim_log(mac_ctx, LOG1, FL("Rcvd action frame not from our BSS, dropping...")); - cdf_mem_free(chnl_switch_frame); + qdf_mem_free(chnl_switch_frame); return; } /* copy the beacon interval from session */ @@ -334,7 +334,7 @@ static void __lim_process_channel_switch_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Could not start channel switch")); - cdf_mem_free(chnl_switch_frame); + qdf_mem_free(chnl_switch_frame); return; } @@ -368,7 +368,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Received EXT Channel switch action frame")); ext_channel_switch_frame = - cdf_mem_malloc(sizeof(*ext_channel_switch_frame)); + qdf_mem_malloc(sizeof(*ext_channel_switch_frame)); if (NULL == ext_channel_switch_frame) { lim_log(mac_ctx, LOGE, FL("AllocateMemory failed")); return; @@ -383,7 +383,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Failed to parse CHANSW action frame (0x%08x, len %d):"), status, frame_len); - cdf_mem_free(ext_channel_switch_frame); + qdf_mem_free(ext_channel_switch_frame); return; } else if (DOT11F_WARNED(status)) { @@ -396,7 +396,7 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx, ext_channel_switch_frame->ext_chan_switch_ann_action.new_channel; /* Free ext_channel_switch_frame here as its no longer needed */ - cdf_mem_free(ext_channel_switch_frame); + qdf_mem_free(ext_channel_switch_frame); /* * Now, validate if channel change is required for the passed * channel and if is valid in the current regulatory domain, @@ -417,14 +417,14 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx, struct sir_sme_ext_cng_chan_ind *ext_cng_chan_ind; tSirMsgQ mmh_msg; - ext_cng_chan_ind = cdf_mem_malloc(sizeof(*ext_cng_chan_ind)); + ext_cng_chan_ind = qdf_mem_malloc(sizeof(*ext_cng_chan_ind)); if (NULL == ext_cng_chan_ind) { lim_log(mac_ctx, LOGP, FL("AllocateMemory failed for ext_cng_chan_ind")); return; } - cdf_mem_zero(ext_cng_chan_ind, + qdf_mem_zero(ext_cng_chan_ind, sizeof(*ext_cng_chan_ind)); ext_cng_chan_ind->session_id = session_entry->smeSessionId; @@ -486,7 +486,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, FL("channel bonding disabled")); return; } - operating_mode_frm = cdf_mem_malloc(sizeof(*operating_mode_frm)); + operating_mode_frm = qdf_mem_malloc(sizeof(*operating_mode_frm)); if (NULL == operating_mode_frm) { lim_log(mac_ctx, LOGE, FL("AllocateMemory failed")); return; @@ -498,7 +498,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Failed to unpack and parse (0x%08x, %d bytes)"), status, frame_len); - cdf_mem_free(operating_mode_frm); + qdf_mem_free(operating_mode_frm); return; } else if (DOT11F_WARNED(status)) { lim_log(mac_ctx, LOGW, @@ -577,7 +577,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx, lim_set_nss_change(mac_ctx, session, sta_ptr->vhtSupportedRxNss, sta_ptr->staIndex, mac_hdr->sa); } - cdf_mem_free(operating_mode_frm); + qdf_mem_free(operating_mode_frm); return; } @@ -610,7 +610,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx, frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); lim_log(mac_ctx, LOG3, FL("Received GID Management action frame")); - gid_mgmt_frame = cdf_mem_malloc(sizeof(*gid_mgmt_frame)); + gid_mgmt_frame = qdf_mem_malloc(sizeof(*gid_mgmt_frame)); if (NULL == gid_mgmt_frame) { lim_log(mac_ctx, LOGE, FL("AllocateMemory failed")); return; @@ -623,7 +623,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Fail to parse an Grp id frame (0x%08x, %d bytes):"), status, frame_len); - cdf_mem_free(gid_mgmt_frame); + qdf_mem_free(gid_mgmt_frame); return; } else if (DOT11F_WARNED(status)) { lim_log(mac_ctx, LOGW, @@ -678,7 +678,7 @@ static void __lim_process_gid_management_action_frame(tpAniSirGlobal mac_ctx, lim_check_membership_user_position(mac_ctx, session, membership, usr_position, sta_ptr->staIndex); out: - cdf_mem_free(gid_mgmt_frame); + qdf_mem_free(gid_mgmt_frame); return; } @@ -816,7 +816,7 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, "TSM IE Present"); session->eseContext.tsm.tid = addts.tspec.tsinfo.traffic.userPrio; - cdf_mem_copy(&session->eseContext.tsm.tsmInfo, + qdf_mem_copy(&session->eseContext.tsm.tsmInfo, &addts.tsmIE, sizeof(tSirMacESETSMIE)); #ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(mac_ctx, session, addts.tsmIE.tsid, @@ -1188,7 +1188,7 @@ __lim_process_measurement_request_frame(tpAniSirGlobal pMac, pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); - pMeasReqFrame = cdf_mem_malloc(sizeof(tSirMacMeasReqActionFrame)); + pMeasReqFrame = qdf_mem_malloc(sizeof(tSirMacMeasReqActionFrame)); if (NULL == pMeasReqFrame) { lim_log(pMac, LOGE, FL @@ -1239,7 +1239,7 @@ __lim_process_tpc_request_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, (pMac, LOG1, FL("****LIM: Processing TPC Request from peer ****")); ) - pTpcReqFrame = cdf_mem_malloc(sizeof(tSirMacTpcReqActionFrame)); + pTpcReqFrame = qdf_mem_malloc(sizeof(tSirMacTpcReqActionFrame)); if (NULL == pTpcReqFrame) { PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory failed "));) return; @@ -1459,7 +1459,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); - pFrm = cdf_mem_malloc(sizeof(tDot11fNeighborReportResponse)); + pFrm = qdf_mem_malloc(sizeof(tDot11fNeighborReportResponse)); if (NULL == pFrm) { lim_log(pMac, LOGE, FL @@ -1468,7 +1468,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } if (psessionEntry == NULL) { - cdf_mem_free(pFrm); + qdf_mem_free(pFrm); return; } @@ -1484,7 +1484,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, PELOG2(sir_dump_buf (pMac, SIR_DBG_MODULE_ID, LOG2, pBody, frameLen); ) - cdf_mem_free(pFrm); + qdf_mem_free(pFrm); return; } else if (DOT11F_WARNED(nStatus)) { lim_log(pMac, LOGW, @@ -1498,7 +1498,7 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, /* Call rrm function to handle the request. */ rrm_process_neighbor_report_response(pMac, pFrm, psessionEntry); - cdf_mem_free(pFrm); + qdf_mem_free(pFrm); } #endif @@ -1556,7 +1556,7 @@ static void __lim_process_sa_query_request_action_frame(tpAniSirGlobal pMac, Category : 1 byte Action : 1 byte Transaction ID : 2 bytes */ - cdf_mem_copy(&transId[0], &pBody[2], 2); + qdf_mem_copy(&transId[0], &pBody[2], 2); /* Send 11w SA query response action frame */ if (lim_send_sa_query_response_frame(pMac, @@ -1643,7 +1643,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac, Category : 1 byte Action : 1 byte Transaction ID : 2 bytes */ - cdf_mem_copy(&transId, &pBody[2], 2); + qdf_mem_copy(&transId, &pBody[2], 2); /* If SA Query is in progress with the station and the station responds then the association request that triggered the SA @@ -1959,10 +1959,10 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, /* Check if it is a vendor specific action frame. */ if (LIM_IS_STA_ROLE(session) && - (true == cdf_mem_compare(session->selfMacAddr, + (true != qdf_mem_cmp(session->selfMacAddr, &mac_hdr->da[0], sizeof(tSirMacAddr))) && IS_WES_MODE_ENABLED(mac_ctx) - && cdf_mem_compare(vendor_specific->Oui, oui, 3)) { + && !qdf_mem_cmp(vendor_specific->Oui, oui, 3)) { lim_log(mac_ctx, LOGW, FL("Rcvd Vendor specific frame, OUI %x %x %x"), vendor_specific->Oui[0], @@ -2006,7 +2006,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); /* Check if it is a P2P public action frame. */ - if (cdf_mem_compare(pub_action->Oui, p2p_oui, 4)) { + if (!qdf_mem_cmp(pub_action->Oui, p2p_oui, 4)) { /* * Forward to the SME to HDD to wpa_supplicant * type is ACTION @@ -2185,7 +2185,7 @@ void lim_process_action_frame_no_session(tpAniSirGlobal pMac, uint8_t *pBd) frameLen = WMA_GET_RX_PAYLOAD_LEN(pBd); /* Check if it is a P2P public action frame. */ - if (cdf_mem_compare(pActionHdr->Oui, P2POui, 4)) { + if (!qdf_mem_cmp(pActionHdr->Oui, P2POui, 4)) { /* Forward to the SME to HDD to wpa_supplicant */ /* type is ACTION */ lim_send_sme_mgmt_frame_ind(pMac, diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index aa5b4eb73957..2754cbb7309c 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -328,7 +328,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG2, (uint8_t *) pBody, framelen); - if (cdf_mem_compare((uint8_t *) pHdr->sa, (uint8_t *) pHdr->da, + if (!qdf_mem_cmp((uint8_t *) pHdr->sa, (uint8_t *) pHdr->da, (uint8_t) (sizeof(tSirMacAddr)))) { lim_log(pMac, LOGE, FL("Rejected Assoc Req frame Since same mac as" @@ -349,12 +349,12 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, return; } /* Allocate memory for the Assoc Request frame */ - pAssocReq = cdf_mem_malloc(sizeof(*pAssocReq)); + pAssocReq = qdf_mem_malloc(sizeof(*pAssocReq)); if (NULL == pAssocReq) { lim_log(pMac, LOGP, FL("Allocate Memory failed in assoc_req")); return; } - cdf_mem_set((void *)pAssocReq, sizeof(*pAssocReq), 0); + qdf_mem_set((void *)pAssocReq, sizeof(*pAssocReq), 0); /* Parse Assoc Request frame */ if (subType == LIM_ASSOC) @@ -376,7 +376,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, goto error; } - pAssocReq->assocReqFrame = cdf_mem_malloc(framelen); + pAssocReq->assocReqFrame = qdf_mem_malloc(framelen); if (NULL == pAssocReq->assocReqFrame) { lim_log(pMac, LOGE, FL("Unable to allocate memory for the assoc req, " @@ -384,7 +384,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, goto error; } - cdf_mem_copy((uint8_t *) pAssocReq->assocReqFrame, + qdf_mem_copy((uint8_t *) pAssocReq->assocReqFrame, (uint8_t *) pBody, framelen); pAssocReq->assocReqFrameLength = framelen; @@ -417,7 +417,7 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, updateContext = false; - if (lim_cmp_ssid(&pAssocReq->ssId, psessionEntry) == false) { + if (lim_cmp_ssid(&pAssocReq->ssId, psessionEntry) != false) { lim_log(pMac, LOGE, FL("Received %s Req with unmatched ssid ( Received" " SSID: %.*s current SSID: %.*s ) from " @@ -684,8 +684,8 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } /* End if on HT caps turned on in lim. */ /* Clear the buffers so that frame parser knows that there isn't a previously decoded IE in these buffers */ - cdf_mem_set((uint8_t *) &Dot11fIERSN, sizeof(Dot11fIERSN), 0); - cdf_mem_set((uint8_t *) &Dot11fIEWPA, sizeof(Dot11fIEWPA), 0); + qdf_mem_set((uint8_t *) &Dot11fIERSN, sizeof(Dot11fIERSN), 0); + qdf_mem_set((uint8_t *) &Dot11fIEWPA, sizeof(Dot11fIEWPA), 0); /* if additional IE is present, check if it has WscIE */ if (pAssocReq->addIEPresent && pAssocReq->addIE.length) @@ -1008,8 +1008,8 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, #endif /* no change in the capability so drop the frame */ - if ((true == - cdf_mem_compare(&pStaDs->mlmStaContext.capabilityInfo, + if ((true != + qdf_mem_cmp(&pStaDs->mlmStaContext.capabilityInfo, &pAssocReq->capabilityInfo, sizeof(tSirMacCapabilityInfo))) && (subType == LIM_ASSOC)) { @@ -1158,11 +1158,11 @@ sendIndToSme: pTempAssocReq = psessionEntry->parsedAssocReq[pStaDs->assocId]; if (pTempAssocReq != NULL) { if (pTempAssocReq->assocReqFrame) { - cdf_mem_free(pTempAssocReq->assocReqFrame); + qdf_mem_free(pTempAssocReq->assocReqFrame); pTempAssocReq->assocReqFrame = NULL; pTempAssocReq->assocReqFrameLength = 0; } - cdf_mem_free(pTempAssocReq); + qdf_mem_free(pTempAssocReq); pTempAssocReq = NULL; } @@ -1598,12 +1598,12 @@ sendIndToSme: error: if (pAssocReq != NULL) { if (pAssocReq->assocReqFrame) { - cdf_mem_free(pAssocReq->assocReqFrame); + qdf_mem_free(pAssocReq->assocReqFrame); pAssocReq->assocReqFrame = NULL; pAssocReq->assocReqFrameLength = 0; } - cdf_mem_free(pAssocReq); + qdf_mem_free(pAssocReq); /* to avoid double free */ if (assoc_req_copied && psessionEntry->parsedAssocReq) psessionEntry->parsedAssocReq[pStaDs->assocId] = NULL; @@ -1617,12 +1617,12 @@ error: psessionEntry->parsedAssocReq[pStaDs->assocId]; if (pTempAssocReq != NULL) { if (pTempAssocReq->assocReqFrame) { - cdf_mem_free(pTempAssocReq-> + qdf_mem_free(pTempAssocReq-> assocReqFrame); pTempAssocReq->assocReqFrame = NULL; pTempAssocReq->assocReqFrameLength = 0; } - cdf_mem_free(pTempAssocReq); + qdf_mem_free(pTempAssocReq); psessionEntry-> parsedAssocReq[pStaDs->assocId] = NULL; } @@ -1656,7 +1656,7 @@ static void lim_fill_assoc_ind_wapi_info(tpAniSirGlobal mac_ctx, assoc_req->wapi.length); assoc_ind->wapiIE.wapiIEdata[0] = SIR_MAC_WAPI_EID; assoc_ind->wapiIE.wapiIEdata[1] = assoc_req->wapi.length; - cdf_mem_copy(&assoc_ind->wapiIE.wapiIEdata[2], + qdf_mem_copy(&assoc_ind->wapiIE.wapiIEdata[2], assoc_req->wapi.info, assoc_req->wapi.length); assoc_ind->wapiIE.length = 2 + assoc_req->wapi.length; @@ -1780,7 +1780,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, if (sub_type == LIM_ASSOC || sub_type == LIM_REASSOC) { temp = sizeof(tLimMlmAssocInd); - assoc_ind = cdf_mem_malloc(temp); + assoc_ind = qdf_mem_malloc(temp); if (NULL == assoc_ind) { lim_release_peer_idx(mac_ctx, sta_ds->assocId, session_entry); @@ -1788,11 +1788,11 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, FL("AllocateMemory failed for assoc_ind")); return; } - cdf_mem_set(assoc_ind, temp, 0); - cdf_mem_copy((uint8_t *) assoc_ind->peerMacAddr, + qdf_mem_set(assoc_ind, temp, 0); + qdf_mem_copy((uint8_t *) assoc_ind->peerMacAddr, (uint8_t *) sta_ds->staAddr, sizeof(tSirMacAddr)); assoc_ind->aid = sta_ds->assocId; - cdf_mem_copy((uint8_t *) &assoc_ind->ssId, + qdf_mem_copy((uint8_t *) &assoc_ind->ssId, (uint8_t *) &(assoc_req->ssId), assoc_req->ssId.length + 1); assoc_ind->sessionId = session_entry->peSessionId; @@ -1814,7 +1814,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, assoc_ind->rsnIE.rsnIEdata[0] = SIR_MAC_RSN_EID; assoc_ind->rsnIE.rsnIEdata[1] = assoc_req->rsn.length; - cdf_mem_copy(&assoc_ind->rsnIE.rsnIEdata[2], + qdf_mem_copy(&assoc_ind->rsnIE.rsnIEdata[2], assoc_req->rsn.info, assoc_req->rsn.length); } @@ -1840,14 +1840,14 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("rsnIEdata index out of bounds %d"), rsn_len); - cdf_mem_free(assoc_ind); + qdf_mem_free(assoc_ind); return; } assoc_ind->rsnIE.rsnIEdata[rsn_len] = SIR_MAC_WPA_EID; assoc_ind->rsnIE.rsnIEdata[rsn_len + 1] = assoc_req->wpa.length; - cdf_mem_copy( + qdf_mem_copy( &assoc_ind->rsnIE.rsnIEdata[rsn_len + 2], assoc_req->wpa.info, assoc_req->wpa.length); assoc_ind->rsnIE.length += 2 + assoc_req->wpa.length; @@ -1859,7 +1859,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, assoc_ind->addIE.length = 0; if (assoc_req->addIEPresent) { - cdf_mem_copy(&assoc_ind->addIE.addIEdata, + qdf_mem_copy(&assoc_ind->addIE.addIEdata, assoc_req->addIE.addIEdata, assoc_req->addIE.length); assoc_ind->addIE.length = assoc_req->addIE.length; @@ -1876,7 +1876,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, SIR_MAC_HT_CAPABILITIES_EID; assoc_ind->addIE.addIEdata[rsn_len + 1] = DOT11F_IE_HTCAPS_MIN_LEN; - cdf_mem_copy( + qdf_mem_copy( &assoc_ind->addIE.addIEdata[rsn_len+2], ((uint8_t *)&assoc_req->HTCaps) + 1, DOT11F_IE_HTCAPS_MIN_LEN); @@ -1932,7 +1932,7 @@ void lim_send_mlm_assoc_ind(tpAniSirGlobal mac_ctx, assoc_ind); lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_IND, (uint32_t *) assoc_ind); - cdf_mem_free(assoc_ind); + qdf_mem_free(assoc_ind); } return; } diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 876233f83d1f..510e3f2da3f2 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -335,7 +335,7 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, tpPESession psessionEntry) { /* Update the current Bss Information */ - cdf_mem_copy(psessionEntry->bssId, + qdf_mem_copy(psessionEntry->bssId, psessionEntry->limReAssocbssId, sizeof(tSirMacAddr)); psessionEntry->currentOperChannel = psessionEntry->limReassocChannelId; psessionEntry->htSecondaryChannelOffset = @@ -350,7 +350,7 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, psessionEntry->limCurrentBssPropCap = psessionEntry->limReassocBssPropCap; - cdf_mem_copy((uint8_t *) &psessionEntry->ssId, + qdf_mem_copy((uint8_t *) &psessionEntry->ssId, (uint8_t *) &psessionEntry->limReassocSSID, psessionEntry->limReassocSSID.length + 1); @@ -379,7 +379,7 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx, tpPESession session_entry, tpSirAssocRsp assoc_rsp) { if (session_entry->ricData != NULL) { - cdf_mem_free(session_entry->ricData); + qdf_mem_free(session_entry->ricData); session_entry->ricData = NULL; session_entry->RICDataLen = 0; } @@ -388,13 +388,13 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx, assoc_rsp->num_RICData * sizeof(tDot11fIERICDataDesc); if (session_entry->RICDataLen) { session_entry->ricData = - cdf_mem_malloc(session_entry->RICDataLen); + qdf_mem_malloc(session_entry->RICDataLen); if (NULL == session_entry->ricData) { lim_log(mac_ctx, LOGE, FL("No memory for RIC data")); session_entry->RICDataLen = 0; } else { - cdf_mem_copy(session_entry->ricData, + qdf_mem_copy(session_entry->ricData, &assoc_rsp->RICData[0], session_entry->RICDataLen); } @@ -428,7 +428,7 @@ static void lim_update_ese_tspec(tpAniSirGlobal mac_ctx, tpPESession session_entry, tpSirAssocRsp assoc_rsp) { if (session_entry->tspecIes != NULL) { - cdf_mem_free(session_entry->tspecIes); + qdf_mem_free(session_entry->tspecIes); session_entry->tspecIes = NULL; session_entry->tspecLen = 0; } @@ -438,13 +438,13 @@ static void lim_update_ese_tspec(tpAniSirGlobal mac_ctx, assoc_rsp->num_tspecs * sizeof(tDot11fIEWMMTSPEC); if (session_entry->tspecLen) { session_entry->tspecIes = - cdf_mem_malloc(session_entry->tspecLen); + qdf_mem_malloc(session_entry->tspecLen); if (NULL == session_entry->tspecIes) { lim_log(mac_ctx, LOGE, FL("Tspec IE:Fail to allocate memory")); session_entry->tspecLen = 0; } else { - cdf_mem_copy(session_entry->tspecIes, + qdf_mem_copy(session_entry->tspecIes, &assoc_rsp->TSPECInfo[0], session_entry->tspecLen); } @@ -496,7 +496,7 @@ static void lim_update_ese_tsm(tpAniSirGlobal mac_ctx, EDCA_AC_VO) { tsm_ctx->tid = assoc_rsp->TSPECInfo[cnt].user_priority; - cdf_mem_copy(&tsm_ctx->tsmInfo, + qdf_mem_copy(&tsm_ctx->tsmInfo, &assoc_rsp->tsmIE, sizeof(tSirMacESETSMIE)); #ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(mac_ctx, @@ -614,7 +614,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, (uint) abs((int8_t) WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info)), MAC_ADDR_ARRAY(hdr->sa)); - beacon = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + beacon = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == beacon) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); return; @@ -629,7 +629,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Should not recieved Re/Assoc Response in role %d "), GET_LIM_SYSTEM_ROLE(session_entry)); - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } #ifdef WLAN_FEATURE_ROAM_OFFLOAD @@ -667,12 +667,12 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, mac_ctx->lim.retry_packet_cnt++; } } - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } sir_copy_mac_addr(current_bssid, session_entry->bssId); if (subtype == LIM_ASSOC) { - if (!cdf_mem_compare + if (qdf_mem_cmp (hdr->sa, current_bssid, sizeof(tSirMacAddr))) { /* * Received Association Response frame from an entity @@ -683,11 +683,11 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, FL("received AssocRsp from unexpected peer " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } } else { - if (!cdf_mem_compare + if (qdf_mem_cmp (hdr->sa, session_entry->limReAssocbssId, sizeof(tSirMacAddr))) { /* @@ -699,16 +699,16 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, FL("received ReassocRsp from unexpected peer " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } } - assoc_rsp = cdf_mem_malloc(sizeof(*assoc_rsp)); + assoc_rsp = qdf_mem_malloc(sizeof(*assoc_rsp)); if (NULL == assoc_rsp) { lim_log(mac_ctx, LOGP, FL("Allocate Memory failed in AssocRsp")); - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } /* Get pointer to Re/Association Response frame body */ @@ -721,18 +721,18 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, /* parse Re/Association Response frame. */ if (sir_convert_assoc_resp_frame2_struct(mac_ctx, body, frame_len, assoc_rsp) == eSIR_FAILURE) { - cdf_mem_free(assoc_rsp); + qdf_mem_free(assoc_rsp); lim_log(mac_ctx, LOGE, FL("Parse error Assoc resp subtype %d," "length=%d"), frame_len, subtype); - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } if (!assoc_rsp->suppRatesPresent) { lim_log(mac_ctx, LOGE, FL("assoc response does not have supported rate set")); - cdf_mem_copy(&assoc_rsp->supportedRates, + qdf_mem_copy(&assoc_rsp->supportedRates, &session_entry->rateSet, sizeof(tSirMacRateSet)); } @@ -742,12 +742,12 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGW, FL("session_entry->assocRsp is not NULL freeing it " "and setting NULL")); - cdf_mem_free(session_entry->assocRsp); + qdf_mem_free(session_entry->assocRsp); session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } - session_entry->assocRsp = cdf_mem_malloc(frame_len); + session_entry->assocRsp = qdf_mem_malloc(frame_len); if (NULL == session_entry->assocRsp) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory for assoc res,len=%d"), @@ -757,7 +757,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, * Store the Assoc response. This is sent * to csr/hdd in join cnf response. */ - cdf_mem_copy(session_entry->assocRsp, body, frame_len); + qdf_mem_copy(session_entry->assocRsp, body, frame_len); session_entry->assocRspLen = frame_len; } @@ -771,12 +771,12 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, if (assoc_rsp->FTInfo.R0KH_ID.present) { roam_session->ftSmeContext.r0kh_id_len = assoc_rsp->FTInfo.R0KH_ID.num_PMK_R0_ID; - cdf_mem_copy(roam_session->ftSmeContext.r0kh_id, + qdf_mem_copy(roam_session->ftSmeContext.r0kh_id, assoc_rsp->FTInfo.R0KH_ID.PMK_R0_ID, roam_session->ftSmeContext.r0kh_id_len); } else { roam_session->ftSmeContext.r0kh_id_len = 0; - cdf_mem_zero(roam_session->ftSmeContext.r0kh_id, + qdf_mem_zero(roam_session->ftSmeContext.r0kh_id, SIR_ROAM_R0KH_ID_MAX_LEN); } #endif @@ -794,15 +794,15 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, */ lim_log(mac_ctx, LOGE, FL("received Re/AssocRsp frame with IBSS capability")); - cdf_mem_free(assoc_rsp); - cdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); return; } if (cfg_get_capability_info(mac_ctx, &caps, session_entry) != eSIR_SUCCESS) { - cdf_mem_free(assoc_rsp); - cdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); lim_log(mac_ctx, LOGP, FL("could not retrieve Capabilities ")); return; } @@ -817,7 +817,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, if ((NULL != mac_ctx->lim.pSessionEntry) && (NULL != mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq)) { - cdf_mem_free( + qdf_mem_free( mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq); mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq = NULL; @@ -904,8 +904,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, FL("ASSOC resp with try again event recvd. " "But try again time interval IE is wrong.")); } - cdf_mem_free(beacon); - cdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); return; } #endif @@ -920,8 +920,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, NULL) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL("Set link state to POSTASSOC failed")); - cdf_mem_free(beacon); - cdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); return; } } @@ -937,7 +937,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, lim_update_ese_tsm(mac_ctx, session_entry, assoc_rsp); #endif if (session_entry->pLimMlmJoinReq) { - cdf_mem_free(session_entry->pLimMlmJoinReq); + qdf_mem_free(session_entry->pLimMlmJoinReq); session_entry->pLimMlmJoinReq = NULL; } @@ -990,7 +990,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, #ifdef WLAN_FEATURE_ROAM_OFFLOAD } #endif - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } @@ -1023,7 +1023,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, goto assocReject; } } - cdf_mem_free(beacon); + qdf_mem_free(beacon); return; } lim_log(mac_ctx, LOG1, @@ -1047,8 +1047,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, assoc_cnf.protStatusCode = eSIR_SME_SUCCESS; lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, (uint32_t *) &assoc_cnf); - cdf_mem_free(assoc_rsp); - cdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); return; } /* Delete Pre-auth context for the associated BSS */ @@ -1084,10 +1084,10 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, eSIR_SUCCESS, eSIR_SUCCESS); #endif if (assoc_rsp->QosMapSet.present) - cdf_mem_copy(&session_entry->QosMapSet, + qdf_mem_copy(&session_entry->QosMapSet, &assoc_rsp->QosMapSet, sizeof(tSirQosMapSet)); else - cdf_mem_zero(&session_entry->QosMapSet, sizeof(tSirQosMapSet)); + qdf_mem_zero(&session_entry->QosMapSet, sizeof(tSirQosMapSet)); lim_update_stads_ext_cap(mac_ctx, session_entry, assoc_rsp, sta_ds); /* Update the BSS Entry, this entry was added during preassoc. */ @@ -1095,8 +1095,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, beacon, &session_entry->pLimJoinReq->bssDescription, true, session_entry)) { - cdf_mem_free(assoc_rsp); - cdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); return; } else { lim_log(mac_ctx, LOGE, FL("could not update the bss entry")); @@ -1123,7 +1123,7 @@ assocReject: session_entry->peSessionId, session_entry->limMlmState)); if (session_entry->pLimMlmJoinReq) { - cdf_mem_free(session_entry->pLimMlmJoinReq); + qdf_mem_free(session_entry->pLimMlmJoinReq); session_entry->pLimMlmJoinReq = NULL; } if (subtype == LIM_ASSOC) { @@ -1144,7 +1144,7 @@ assocReject: session_entry); } - cdf_mem_free(beacon); - cdf_mem_free(assoc_rsp); + qdf_mem_free(beacon); + qdf_mem_free(assoc_rsp); return; } diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 803d0e676ef8..41b4c9cf44a7 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -155,7 +155,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, return; } - cdf_mem_copy((uint8_t *) auth_node->peerMacAddr, mac_hdr->sa, + qdf_mem_copy((uint8_t *) auth_node->peerMacAddr, mac_hdr->sa, sizeof(tSirMacAddr)); auth_node->mlmState = eLIM_MLM_WT_AUTH_FRAME3_STATE; auth_node->authType = @@ -206,7 +206,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Challenge text preparation failed")); challenge = auth_node->challengeText; - cdf_mem_copy(challenge, (uint8_t *)challenge_txt_arr, + qdf_mem_copy(challenge, (uint8_t *)challenge_txt_arr, sizeof(challenge_txt_arr)); /* * Sending Authenticaton frame with challenge. @@ -217,7 +217,7 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS; auth_frame->type = SIR_MAC_CHALLENGE_TEXT_EID; auth_frame->length = SIR_MAC_AUTH_CHALLENGE_LENGTH; - cdf_mem_copy(auth_frame->challengeText, + qdf_mem_copy(auth_frame->challengeText, auth_node->challengeText, SIR_MAC_AUTH_CHALLENGE_LENGTH); lim_send_auth_mgmt_frame(mac_ctx, auth_frame, @@ -245,7 +245,7 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx, } lim_log(mac_ctx, LOG1, FL("Alloc new data: %p peer "), auth_node); lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1); - cdf_mem_copy((uint8_t *) auth_node->peerMacAddr, + qdf_mem_copy((uint8_t *) auth_node->peerMacAddr, mac_hdr->sa, sizeof(tSirMacAddr)); auth_node->mlmState = eLIM_MLM_AUTHENTICATED_STATE; auth_node->authType = (tAniAuthType) rx_auth_frm_body->authAlgoNumber; @@ -290,9 +290,9 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, pMlmDisassocReq = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; if (pMlmDisassocReq && - cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) + (!qdf_mem_cmp((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDisassocReq->peer_macaddr.bytes, - QDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE))) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for disassoc frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -304,9 +304,9 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, pMlmDeauthReq = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; if (pMlmDeauthReq && - cdf_mem_compare((uint8_t *) mac_hdr->sa, (uint8_t *) + (!qdf_mem_cmp((uint8_t *) mac_hdr->sa, (uint8_t *) &pMlmDeauthReq->peer_macaddr.bytes, - QDF_MAC_ADDR_SIZE)) { + QDF_MAC_ADDR_SIZE))) { lim_log(mac_ctx, LOGE, FL("TODO:Ack for deauth frame is pending Issue delsta for " MAC_ADDRESS_STR), @@ -386,10 +386,10 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, &pe_session->dph.dphHashTable); if (NULL == sta_ds_ptr) continue; - if (sta_ds_ptr->valid && cdf_mem_compare( + if (sta_ds_ptr->valid && (!qdf_mem_cmp( (uint8_t *)&sta_ds_ptr->staAddr, (uint8_t *) &(mac_hdr->sa), - (uint8_t) sizeof(tSirMacAddr))) + (uint8_t) sizeof(tSirMacAddr)))) break; sta_ds_ptr = NULL; } @@ -523,7 +523,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, (rx_auth_frm_body->authStatusCode == eSIR_MAC_SUCCESS_STATUS) && (pe_session->ftPEContext.pFTPreAuthReq != NULL) && - (cdf_mem_compare( + (!qdf_mem_cmp( pe_session->ftPEContext.pFTPreAuthReq->preAuthbssId, mac_hdr->sa, sizeof(tSirMacAddr)))) { @@ -534,7 +534,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, pe_session->ftPEContext.saved_auth_rsp_length = 0; if ((body_ptr != NULL) && (frame_len < MAX_FTIE_SIZE)) { - cdf_mem_copy( + qdf_mem_copy( pe_session->ftPEContext.saved_auth_rsp, body_ptr, frame_len); pe_session->ftPEContext.saved_auth_rsp_length = @@ -555,7 +555,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, return; } - if (!cdf_mem_compare((uint8_t *) mac_hdr->sa, + if (qdf_mem_cmp((uint8_t *) mac_hdr->sa, (uint8_t *) &mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr))) { /* @@ -632,7 +632,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Alloc new data: %p peer"), auth_node); lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1); - cdf_mem_copy((uint8_t *) auth_node->peerMacAddr, + qdf_mem_copy((uint8_t *) auth_node->peerMacAddr, mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr)); auth_node->fTimerStarted = 0; @@ -693,7 +693,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, if (LIM_IS_AP_ROLE(pe_session)) { tpSirKeys key_ptr = &pe_session->WEPKeyMaterial[key_id].key[0]; - cdf_mem_copy(defaultkey, key_ptr->key, + qdf_mem_copy(defaultkey, key_ptr->key, key_ptr->keyLength); } else if (wlan_cfg_get_str(mac_ctx, (uint16_t)(WNI_CFG_WEP_DEFAULT_KEY_1 + key_id), @@ -729,7 +729,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, SIR_MAC_CHALLENGE_TEXT_EID; ((tpSirMacAuthFrameBody)plainbody)->length = SIR_MAC_AUTH_CHALLENGE_LENGTH; - cdf_mem_copy((uint8_t *) ( + qdf_mem_copy((uint8_t *) ( (tpSirMacAuthFrameBody)plainbody)->challengeText, rx_auth_frm_body->challengeText, SIR_MAC_AUTH_CHALLENGE_LENGTH); @@ -864,7 +864,7 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, * Check if received challenge text is same as one sent in * Authentication frame3 */ - if (cdf_mem_compare(rx_auth_frm_body->challengeText, + if (!qdf_mem_cmp(rx_auth_frm_body->challengeText, auth_node->challengeText, SIR_MAC_AUTH_CHALLENGE_LENGTH)) { /* @@ -948,7 +948,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx, return; } - if (!cdf_mem_compare((uint8_t *) mac_hdr->sa, + if (qdf_mem_cmp((uint8_t *) mac_hdr->sa, (uint8_t *) &mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr))) { /* @@ -996,7 +996,7 @@ static void lim_process_auth_frame_type4(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Alloc new data: %p peer "), auth_node); lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG1); - cdf_mem_copy((uint8_t *) auth_node->peerMacAddr, + qdf_mem_copy((uint8_t *) auth_node->peerMacAddr, mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr)); auth_node->fTimerStarted = 0; @@ -1262,7 +1262,7 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (LIM_IS_AP_ROLE(pe_session)) { tpSirKeys key_ptr; key_ptr = &pe_session->WEPKeyMaterial[key_id].key[0]; - cdf_mem_copy(defaultkey, key_ptr->key, + qdf_mem_copy(defaultkey, key_ptr->key, key_ptr->keyLength); val = key_ptr->keyLength; } else if (wlan_cfg_get_str(mac_ctx, @@ -1438,7 +1438,7 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB (pHdr->seqControl.fragNum))); /* Check that its the same bssId we have for preAuth */ - if (!cdf_mem_compare + if (qdf_mem_cmp (psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId, pHdr->bssId, sizeof(tSirMacAddr))) { lim_log(pMac, LOGE, FL("Error: Same bssid as preauth BSSID")); diff --git a/core/mac/src/pe/lim/lim_process_beacon_frame.c b/core/mac/src/pe/lim/lim_process_beacon_frame.c index 6d8075149a71..114e56337969 100644 --- a/core/mac/src/pe/lim/lim_process_beacon_frame.c +++ b/core/mac/src/pe/lim/lim_process_beacon_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -83,7 +83,7 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, lim_print_mac_addr(mac_ctx, mac_hdr->sa, LOG2); /* Expect Beacon in any state as Scan is independent of LIM state */ - bcn_ptr = cdf_mem_malloc(sizeof(*bcn_ptr)); + bcn_ptr = qdf_mem_malloc(sizeof(*bcn_ptr)); if (NULL == bcn_ptr) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); @@ -102,7 +102,7 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, session->limMlmState); lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState); - cdf_mem_free(bcn_ptr); + qdf_mem_free(bcn_ptr); return; } /* @@ -113,7 +113,7 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if ((!session->lastBeaconDtimPeriod) && (sir_compare_mac_addr(session->bssId, bcn_ptr->bssid))) { - cdf_mem_copy((uint8_t *)&session->lastBeaconTimeStamp, + qdf_mem_copy((uint8_t *)&session->lastBeaconTimeStamp, (uint8_t *) bcn_ptr->timeStamp, sizeof(uint64_t)); session->lastBeaconDtimCount = @@ -148,12 +148,12 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, } else if (session->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE) { if (session->beacon != NULL) { - cdf_mem_free(session->beacon); + qdf_mem_free(session->beacon); session->beacon = NULL; session->bcnLen = 0; } session->bcnLen = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); - session->beacon = cdf_mem_malloc(session->bcnLen); + session->beacon = qdf_mem_malloc(session->bcnLen); if (NULL == session->beacon) { lim_log(mac_ctx, LOGE, FL("fail to alloc mem to store bcn")); @@ -162,14 +162,14 @@ lim_process_beacon_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, * Store the Beacon/ProbeRsp. This is sent to * csr/hdd in join cnf response. */ - cdf_mem_copy(session->beacon, + qdf_mem_copy(session->beacon, WMA_GET_RX_MPDU_DATA(rx_pkt_info), session->bcnLen); } lim_check_and_announce_join_success(mac_ctx, bcn_ptr, mac_hdr, session); } - cdf_mem_free(bcn_ptr); + qdf_mem_free(bcn_ptr); return; } @@ -204,7 +204,7 @@ lim_process_beacon_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo) if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) || (pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) || (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE)) { - pBeacon = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + pBeacon = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeacon) { lim_log(pMac, LOGE, FL @@ -221,7 +221,7 @@ lim_process_beacon_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo) ("Received invalid Beacon in global MLM state %X"), pMac->lim.gLimMlmState); lim_print_mlm_state(pMac, LOGW, pMac->lim.gLimMlmState); - cdf_mem_free(pBeacon); + qdf_mem_free(pBeacon); return; } @@ -236,7 +236,7 @@ lim_process_beacon_frame_no_session(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo) &pMac->lim.dfschannelList); } else if (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE) { } /* end of eLIM_MLM_LEARN_STATE) */ - cdf_mem_free(pBeacon); + qdf_mem_free(pBeacon); } /* end of (eLIM_MLM_WT_PROBE_RESP_STATE) || (eLIM_MLM_PASSIVE_SCAN_STATE) */ else { lim_log(pMac, LOG1, FL("Rcvd Beacon in unexpected MLM state %s (%d)"), diff --git a/core/mac/src/pe/lim/lim_process_cfg_updates.c b/core/mac/src/pe/lim/lim_process_cfg_updates.c index ae1cf2a3c804..ece95d4c100b 100644 --- a/core/mac/src/pe/lim/lim_process_cfg_updates.c +++ b/core/mac/src/pe/lim/lim_process_cfg_updates.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -78,7 +78,7 @@ void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry) if (pesessionEntry != NULL && LIM_IS_AP_ROLE(pesessionEntry)) { if (pesessionEntry->gLimProtectionControl == WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) - cdf_mem_set((void *)&pesessionEntry->cfgProtection, + qdf_mem_set((void *)&pesessionEntry->cfgProtection, sizeof(tCfgProtection), 0); else { lim_log(pMac, LOG1, @@ -112,7 +112,7 @@ void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry) if (pMac->lim.gLimProtectionControl == WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) - cdf_mem_set((void *)&pMac->lim.cfgProtection, + qdf_mem_set((void *)&pMac->lim.cfgProtection, sizeof(tCfgProtection), 0); else { pMac->lim.cfgProtection.fromlla = diff --git a/core/mac/src/pe/lim/lim_process_deauth_frame.c b/core/mac/src/pe/lim/lim_process_deauth_frame.c index 2cca55d9f6bd..ba26a694cfe3 100644 --- a/core/mac/src/pe/lim/lim_process_deauth_frame.c +++ b/core/mac/src/pe/lim/lim_process_deauth_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -373,7 +373,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, psessionEntry->limMlmState, reasonCode, MAC_ADDR_ARRAY(pHdr->sa)); /* / Issue Deauth Indication to SME. */ - cdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, pHdr->sa, sizeof(tSirMacAddr)); mlmDeauthInd.reasonCode = reasonCode; @@ -403,7 +403,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, lim_delete_pre_auth_node(pMac, pHdr->sa); if (psessionEntry->pLimMlmJoinReq) { - cdf_mem_free(psessionEntry->pLimMlmJoinReq); + qdf_mem_free(psessionEntry->pLimMlmJoinReq); psessionEntry->pLimMlmJoinReq = NULL; } @@ -548,7 +548,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pStaDs->mlmStaContext.cleanupTrigger = eLIM_PEER_ENTITY_DEAUTH; /* / Issue Deauth Indication to SME. */ - cdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, pStaDs->staAddr, sizeof(tSirMacAddr)); mlmDeauthInd.reasonCode = (uint8_t) pStaDs->mlmStaContext.disassocReason; @@ -570,7 +570,7 @@ lim_process_deauth_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, lim_delete_pre_auth_node(pMac, pHdr->sa); if (psessionEntry->limAssocResponseData) { - cdf_mem_free(psessionEntry->limAssocResponseData); + qdf_mem_free(psessionEntry->limAssocResponseData); psessionEntry->limAssocResponseData = NULL; } diff --git a/core/mac/src/pe/lim/lim_process_disassoc_frame.c b/core/mac/src/pe/lim/lim_process_disassoc_frame.c index 70a9a8d86c72..699b02cf5c9c 100644 --- a/core/mac/src/pe/lim/lim_process_disassoc_frame.c +++ b/core/mac/src/pe/lim/lim_process_disassoc_frame.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -360,7 +360,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pStaDs->mlmStaContext.disassocReason = (tSirMacReasonCodes) reasonCode; /* Issue Disassoc Indication to SME. */ - cdf_mem_copy((uint8_t *) &mlmDisassocInd.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmDisassocInd.peerMacAddr, (uint8_t *) pStaDs->staAddr, sizeof(tSirMacAddr)); mlmDisassocInd.reasonCode = (uint8_t) pStaDs->mlmStaContext.disassocReason; @@ -383,7 +383,7 @@ lim_process_disassoc_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, ) if (psessionEntry->limAssocResponseData) { - cdf_mem_free(psessionEntry->limAssocResponseData); + qdf_mem_free(psessionEntry->limAssocResponseData); psessionEntry->limAssocResponseData = NULL; } diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 7cd2a9dd7713..0e715472ff84 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -67,7 +67,7 @@ #include "qdf_types.h" #include "cds_packet.h" -#include "cdf_memory.h" +#include "qdf_mem.h" void lim_log_session_states(tpAniSirGlobal pMac); static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx, @@ -101,7 +101,7 @@ static void lim_process_dual_mac_cfg_resp(tpAniSirGlobal mac, void *body) len = sizeof(*param); - param = cdf_mem_malloc(len); + param = qdf_mem_malloc(len); if (!param) { lim_log(mac, LOGE, FL("Fail to allocate memory")); /* Memory allocation for param failed. @@ -155,7 +155,7 @@ static void lim_process_set_hw_mode_resp(tpAniSirGlobal mac, void *body) len = sizeof(*param); - param = cdf_mem_malloc(len); + param = qdf_mem_malloc(len); if (!param) { lim_log(mac, LOGE, FL("Fail to allocate memory")); /* Memory allocation for param failed. @@ -218,7 +218,7 @@ static void lim_process_hw_mode_trans_ind(tpAniSirGlobal mac, void *body) len = sizeof(*param); - param = cdf_mem_malloc(len); + param = qdf_mem_malloc(len); if (!param) { lim_log(mac, LOGE, FL("Fail to allocate memory")); return; @@ -345,14 +345,14 @@ __lim_pno_match_fwd_bcn_probepsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, len = sizeof(*result) + (num_results * sizeof(tSirWifiScanResult)) + ie_len; - result = cdf_mem_malloc(len); + result = qdf_mem_malloc(len); if (NULL == result) { lim_log(pmac, LOGE, FL("Memory allocation failed")); return; } hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); - cdf_mem_zero(result, sizeof(*result) + ie_len); + qdf_mem_zero(result, sizeof(*result) + ie_len); /* Received frame does not have request id, hence set 0 */ result->request_id = 0; @@ -369,14 +369,14 @@ __lim_pno_match_fwd_bcn_probepsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->ap[i].rtt = 0; result->ap[i].rtt_sd = 0; result->ap[i].ieLength = ie_len; - cdf_mem_copy((uint8_t *) &result->ap[i].ssid[0], + qdf_mem_copy((uint8_t *) &result->ap[i].ssid[0], (uint8_t *) frame->ssId.ssId, frame->ssId.length); result->ap[i].ssid[frame->ssId.length] = '\0'; - cdf_mem_copy((uint8_t *) &result->ap[i].bssid, + qdf_mem_copy((uint8_t *) &result->ap[i].bssid, (uint8_t *) hdr->bssId, sizeof(tSirMacAddr)); /* Copy IE fields */ - cdf_mem_copy((uint8_t *) &result->ap[i].ieData, + qdf_mem_copy((uint8_t *) &result->ap[i].ieData, body + SIR_MAC_B_PR_SSID_OFFSET, ie_len); } @@ -398,14 +398,14 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, tSirMsgQ mmh_msg; tpSirMacMgmtHdr hdr; - result = cdf_mem_malloc(sizeof(*result) + ie_len); + result = qdf_mem_malloc(sizeof(*result) + ie_len); if (NULL == result) { lim_log(pmac, LOGE, FL("Memory allocation failed")); return; } hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); - cdf_mem_zero(result, sizeof(*result) + ie_len); + qdf_mem_zero(result, sizeof(*result) + ie_len); /* Received frame does not have request id, hence set 0 */ result->requestId = 0; @@ -421,14 +421,14 @@ __lim_ext_scan_forward_bcn_probe_rsp(tpAniSirGlobal pmac, uint8_t *rx_pkt_info, result->ap.rtt_sd = 0; result->ap.ieLength = ie_len; - cdf_mem_copy((uint8_t *) &result->ap.ssid[0], + qdf_mem_copy((uint8_t *) &result->ap.ssid[0], (uint8_t *) frame->ssId.ssId, frame->ssId.length); result->ap.ssid[frame->ssId.length] = '\0'; - cdf_mem_copy((uint8_t *) &result->ap.bssid.bytes, + qdf_mem_copy((uint8_t *) &result->ap.bssid.bytes, (uint8_t *) hdr->bssId, QDF_MAC_ADDR_SIZE); /* Copy IE fields */ - cdf_mem_copy((uint8_t *) &result->ap.ieData, + qdf_mem_copy((uint8_t *) &result->ap.ieData, body + SIR_MAC_B_PR_SSID_OFFSET, ie_len); mmh_msg.type = msg_type; @@ -454,7 +454,7 @@ __lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac, return; } - frame = cdf_mem_malloc(sizeof(*frame)); + frame = qdf_mem_malloc(sizeof(*frame)); if (NULL == frame) { lim_log(pmac, LOGE, FL("Memory allocation failed")); return; @@ -471,13 +471,13 @@ __lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac, status = sir_convert_probe_frame2_struct(pmac, body, frm_len, frame); } else { - cdf_mem_free(frame); + qdf_mem_free(frame); return; } if (status != eSIR_SUCCESS) { lim_log(pmac, LOGE, FL("Frame parsing failed")); - cdf_mem_free(frame); + qdf_mem_free(frame); return; } @@ -491,7 +491,7 @@ __lim_process_ext_scan_beacon_probe_rsp(tpAniSirGlobal pmac, (frm_len - SIR_MAC_B_PR_SSID_OFFSET), eWNI_SME_EPNO_NETWORK_FOUND_IND); - cdf_mem_free(frame); + qdf_mem_free(frame); } #endif @@ -675,8 +675,8 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc, break; } if (mgmt_frame->matchLen <= frm_len && - cdf_mem_compare(mgmt_frame->matchData, body, - mgmt_frame->matchLen)) { + (!qdf_mem_cmp(mgmt_frame->matchData, body, + mgmt_frame->matchLen))) { /* found match! */ match = true; break; @@ -1027,7 +1027,7 @@ QDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, tSirRetStatus rc = eSIR_SUCCESS; tAbortScanParams *pAbortScanParams; - pAbortScanParams = cdf_mem_malloc(sizeof(tAbortScanParams)); + pAbortScanParams = qdf_mem_malloc(sizeof(tAbortScanParams)); if (NULL == pAbortScanParams) { lim_log(pMac, LOGP, FL("Memory allocation failed for AbortScanParams")); @@ -1044,7 +1044,7 @@ QDF_STATUS lim_send_stop_scan_offload_req(tpAniSirGlobal pMac, rc = wma_post_ctrl_msg(pMac, &msg); if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure")); - cdf_mem_free(pAbortScanParams); + qdf_mem_free(pAbortScanParams); return QDF_STATUS_E_FAILURE; } @@ -1120,7 +1120,7 @@ void lim_oem_data_rsp_handle_resume_link_rsp(tpAniSirGlobal pMac, QDF_STATUS sta } if (NULL != pMac->lim.gpLimMlmOemDataReq) { - cdf_mem_free(pMac->lim.gpLimMlmOemDataReq); + qdf_mem_free(pMac->lim.gpLimMlmOemDataReq); pMac->lim.gpLimMlmOemDataReq = NULL; } /* "Failure" status doesn't mean that Oem Data Rsp did not happen */ @@ -1188,7 +1188,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #endif tSirMbMsgP2p *p2p_msg = NULL; if (ANI_DRIVER_TYPE(mac_ctx) == eDRIVER_TYPE_MFG) { - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; return; } @@ -1256,7 +1256,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) QDF_ASSERT(0); break; } - cdf_mem_copy((uint8_t *) &new_msg, + qdf_mem_copy((uint8_t *) &new_msg, (uint8_t *) msg, sizeof(tSirMsgQ)); body_ptr = (cds_pkt_t *) new_msg.bodyptr; cds_pkt_get_packet_length(body_ptr, &pkt_len); @@ -1323,7 +1323,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) scan_id = req_msg->scan_id; lim_process_abort_scan_ind(mac_ctx, session_id, scan_id, USER_SCAN_REQUESTOR_ID); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; } break; @@ -1373,20 +1373,20 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case eWNI_PMC_SMPS_STATE_IND: if (msg->bodyptr) { - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; } break; case eWNI_SME_SEND_ACTION_FRAME_IND: lim_send_p2p_action_frame(mac_ctx, msg); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_ABORT_REMAIN_ON_CHAN_IND: p2p_msg = (tSirMbMsgP2p *) msg->bodyptr; lim_process_abort_scan_ind(mac_ctx, p2p_msg->sessionId, p2p_msg->scan_id, ROC_SCAN_REQUESTOR_ID); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; case SIR_HAL_P2P_NOA_START_IND: @@ -1405,7 +1405,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) (session_entry->pePersona == QDF_P2P_GO_MODE)) { /* Save P2P NOA start attribute for Go persona*/ p2p_go_exists = 1; - cdf_mem_copy(&session_entry->p2pGoPsNoaStartInd, + qdf_mem_copy(&session_entry->p2pGoPsNoaStartInd, msg->bodyptr, sizeof(tSirP2PNoaStart)); qdf_status = session_entry->p2pGoPsNoaStartInd.status; @@ -1426,7 +1426,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) /* We received the NOA start indication. Now we can send down * the SME request which requires off-channel operation */ lim_process_regd_defd_sme_req_after_noa_start(mac_ctx); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; #ifdef FEATURE_WLAN_TDLS @@ -1437,7 +1437,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) if (session_entry == NULL) { lim_log(mac_ctx, LOG1, FL("No session exist for given bssId")); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; return; } @@ -1446,7 +1446,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) if (sta_ds == NULL) { lim_log(mac_ctx, LOG1, FL("No sta_ds exist for given staId")); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; return; } @@ -1458,7 +1458,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_send_sme_tdls_del_sta_ind(mac_ctx, sta_ds, session_entry, tdls_ind->reasonCode); } - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; #endif @@ -1471,7 +1471,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) if ((session_entry != NULL) && (session_entry->valid) && (session_entry->pePersona == QDF_P2P_GO_MODE)) { /* Save P2P attr for Go */ - cdf_mem_copy( + qdf_mem_copy( &session_entry->p2pGoPsUpdate, msg->bodyptr, sizeof(tSirP2PNoaAttr)); @@ -1493,12 +1493,12 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; } } - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; case WMA_MISSED_BEACON_IND: lim_ps_offload_handle_missed_beacon_ind(mac_ctx, msg); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; case SIR_LIM_ADDTS_RSP_TIMEOUT: @@ -1634,7 +1634,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; case WMA_SET_MIMOPS_RSP: case WMA_SET_TX_POWER_RSP: - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case WMA_SET_MAX_TX_POWER_RSP: @@ -1642,7 +1642,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) rrm_set_max_tx_power_rsp(mac_ctx, msg); #endif if (msg->bodyptr != NULL) { - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; } break; @@ -1652,7 +1652,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) /* message from HAL indicating addr2 mismatch interrupt occurred * msg->bodyptr contains only pointer to 48-bit addr2 field */ - cdf_mem_free((void *)(msg->bodyptr)); + qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; #ifdef WLAN_FEATURE_VOWIFI_11R @@ -1677,7 +1677,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) link_state_param->callback(mac_ctx, link_state_param->callbackArg, link_state_param->status); - cdf_mem_free((void *)(msg->bodyptr)); + qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; case eWNI_SME_SET_BCN_FILTER_REQ: @@ -1688,7 +1688,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) eSIR_SUCCESS)) lim_log(mac_ctx, LOGE, FL("Failied to send Beacon Filter Info ")); - cdf_mem_free((void *)(msg->bodyptr)); + qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; #ifdef FEATURE_WLAN_TDLS @@ -1711,7 +1711,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session_entry->smeSessionId, NULL, NULL, tdls_link_params->status); } - cdf_mem_free((void *)(msg->bodyptr)); + qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; #endif @@ -1720,7 +1720,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; case WMA_IBSS_PEER_INACTIVITY_IND: lim_process_ibss_peer_inactivity(mac_ctx, msg->bodyptr); - cdf_mem_free((void *)(msg->bodyptr)); + qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; case WMA_DFS_RADAR_IND: @@ -1731,7 +1731,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case WMA_DFS_BEACON_TX_SUCCESS_IND: lim_process_beacon_tx_success_ind(mac_ctx, msg->type, (void *)msg->bodyptr); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case WMA_DISASSOC_TX_COMP: @@ -1742,7 +1742,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE case WMA_UPDATE_Q2Q_IE_IND: - cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); beacon_params.paramChangeBitmap = 0; for (i = 0; i < mac_ctx->lim.maxBssId; i++) { vdev_id = ((uint8_t *)msg->bodyptr)[i]; @@ -1778,65 +1778,65 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session_entry); } } - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; break; #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ case eWNI_SME_NSS_UPDATE_REQ: case eWNI_SME_DFS_BEACON_CHAN_SW_IE_REQ: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_CHANNEL_CHANGE_REQ: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_START_BEACON_REQ: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_UPDATE_ADDITIONAL_IES: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_MODIFY_ADDITIONAL_IES: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; #ifdef QCA_HT_2040_COEX case eWNI_SME_SET_HT_2040_MODE: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; #endif case SIR_HAL_SOC_SET_HW_MODE_RESP: lim_process_set_hw_mode_resp(mac_ctx, msg->bodyptr); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case SIR_HAL_SOC_HW_MODE_TRANS_IND: lim_process_hw_mode_trans_ind(mac_ctx, msg->bodyptr); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case SIR_HAL_SOC_DUAL_MAC_CFG_RESP: lim_process_dual_mac_cfg_resp(mac_ctx, msg->bodyptr); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; case eWNI_SME_SET_IE_REQ: lim_process_sme_req_messages(mac_ctx, msg); - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; default: - cdf_mem_free((void *)msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; /* Unwanted messages */ /* Log error */ @@ -1882,7 +1882,7 @@ void lim_process_deferred_message_queue(tpAniSirGlobal pMac) size = pMac->lim.gLimDeferredMsgQ.size; if (size > 0) { while ((readMsg = lim_read_deferred_msg_q(pMac)) != NULL) { - cdf_mem_copy((uint8_t *) &limMsg, + qdf_mem_copy((uint8_t *) &limMsg, (uint8_t *) readMsg, sizeof(tSirMsgQ)); size--; lim_process_messages(pMac, &limMsg); @@ -1949,7 +1949,7 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx, tSirMsgQ *msg, #endif lim_log_session_states(mac_ctx); /* Release body */ - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; } } else { @@ -1968,7 +1968,7 @@ static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx, tSirMsgQ *msg, * Release body. limProcessSmeReqMessage consumed the * buffer. We can free it. */ - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; } } diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 8b1e0d2e2b13..32b862b68ced 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -373,7 +373,7 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx) goto error; } - start_oem_data_req = cdf_mem_malloc(sizeof(*start_oem_data_req)); + start_oem_data_req = qdf_mem_malloc(sizeof(*start_oem_data_req)); if (NULL == start_oem_data_req) { lim_log(mac_ctx, LOGE, FL ("Could not allocate memory for start_oem_data_req")); @@ -381,10 +381,10 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx) } start_oem_data_req->data = - cdf_mem_malloc(mac_ctx->lim.gpLimMlmOemDataReq->data_len); + qdf_mem_malloc(mac_ctx->lim.gpLimMlmOemDataReq->data_len); if (!start_oem_data_req->data) { lim_log(mac_ctx, LOGE, FL("memory allocation failed")); - cdf_mem_free(start_oem_data_req); + qdf_mem_free(start_oem_data_req); goto error; } @@ -394,7 +394,7 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx) start_oem_data_req->data_len = mac_ctx->lim.gpLimMlmOemDataReq->data_len; - cdf_mem_copy(start_oem_data_req->data, + qdf_mem_copy(start_oem_data_req->data, mac_ctx->lim.gpLimMlmOemDataReq->data, mac_ctx->lim.gpLimMlmOemDataReq->data_len); @@ -411,8 +411,8 @@ void lim_send_hal_oem_data_req(tpAniSirGlobal mac_ctx) return; SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true); - cdf_mem_free(start_oem_data_req->data); - cdf_mem_free(start_oem_data_req); + qdf_mem_free(start_oem_data_req->data); + qdf_mem_free(start_oem_data_req); lim_log(mac_ctx, LOGE, FL("OEM_DATA: posting WMA_START_OEM_DATA_REQ to HAL failed")); @@ -421,7 +421,7 @@ error: MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, NO_SESSION, mac_ctx->lim.gLimMlmState)); - mlm_oem_data_rsp = cdf_mem_malloc(sizeof(tLimMlmOemDataRsp)); + mlm_oem_data_rsp = qdf_mem_malloc(sizeof(tLimMlmOemDataRsp)); if (NULL == mlm_oem_data_rsp) { lim_log(mac_ctx->hHdd, LOGP, FL ("memory allocation for mlm_oem_data_rsp")); @@ -431,11 +431,11 @@ error: if (NULL != mac_ctx->lim.gpLimMlmOemDataReq) { if (NULL != mac_ctx->lim.gpLimMlmOemDataReq->data) { - cdf_mem_free( + qdf_mem_free( mac_ctx->lim.gpLimMlmOemDataReq->data); mac_ctx->lim.gpLimMlmOemDataReq->data = NULL; } - cdf_mem_free(mac_ctx->lim.gpLimMlmOemDataReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmOemDataReq); mac_ctx->lim.gpLimMlmOemDataReq = NULL; } @@ -467,8 +467,8 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, wlan_cfg_get_int(mac_ctx, WNI_CFG_DOT11_MODE, &self_dot11mode); sta_param->staType = STA_ENTRY_SELF; /* Identifying self */ - cdf_mem_copy(sta_param->bssId, bssid, sizeof(tSirMacAddr)); - cdf_mem_copy(sta_param->staMac, session_entry->selfMacAddr, + qdf_mem_copy(sta_param->bssId, bssid, sizeof(tSirMacAddr)); + qdf_mem_copy(sta_param->staMac, session_entry->selfMacAddr, sizeof(tSirMacAddr)); /* Configuration related parameters to be changed to support BT-AMP */ @@ -594,7 +594,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, uint32_t retcode; /* Package WMA_ADD_BSS_REQ message parameters */ - addbss_param = cdf_mem_malloc(sizeof(tAddBssParams)); + addbss_param = qdf_mem_malloc(sizeof(tAddBssParams)); if (NULL == addbss_param) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory during ADD_BSS")); @@ -602,13 +602,13 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(addbss_param, sizeof(tAddBssParams), 0); + qdf_mem_set(addbss_param, sizeof(tAddBssParams), 0); /* Fill in tAddBssParams members */ - cdf_mem_copy(addbss_param->bssId, mlm_start_req->bssId, + qdf_mem_copy(addbss_param->bssId, mlm_start_req->bssId, sizeof(tSirMacAddr)); /* Fill in tAddBssParams selfMacAddr */ - cdf_mem_copy(addbss_param->selfMacAddr, + qdf_mem_copy(addbss_param->selfMacAddr, session->selfMacAddr, sizeof(tSirMacAddr)); addbss_param->bssType = mlm_start_req->bssType; @@ -633,7 +633,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, mlm_start_req->cfParamSet.cfpDurRemaining; addbss_param->rateSet.numRates = mlm_start_req->rateSet.numRates; - cdf_mem_copy(addbss_param->rateSet.rate, mlm_start_req->rateSet.rate, + qdf_mem_copy(addbss_param->rateSet.rate, mlm_start_req->rateSet.rate, mlm_start_req->rateSet.numRates); addbss_param->nwType = mlm_start_req->nwType; @@ -657,7 +657,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->sessionId = mlm_start_req->sessionId; /* Send the SSID to HAL to enable SSID matching for IBSS */ - cdf_mem_copy(&(addbss_param->ssId.ssId), + qdf_mem_copy(&(addbss_param->ssId.ssId), mlm_start_req->ssId.ssId, mlm_start_req->ssId.length); addbss_param->ssId.length = mlm_start_req->ssId.length; addbss_param->bHiddenSSIDEn = mlm_start_req->ssidHidden; @@ -708,7 +708,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), retcode); - cdf_mem_free(addbss_param); + qdf_mem_free(addbss_param); return eSIR_SME_HAL_SEND_MESSAGE_FAIL; } @@ -773,7 +773,7 @@ end: mlm_start_cnf.sessionId = mlm_start_req->sessionId; /* Free up buffer allocated for LimMlmScanReq */ - cdf_mem_free(msg_buf); + qdf_mem_free(msg_buf); /* * Respond immediately to LIM, only if MLME has not been @@ -814,12 +814,12 @@ static void lim_process_mlm_oem_data_req(tpAniSirGlobal mac_ctx, */ if (mac_ctx->lim.gpLimMlmOemDataReq) { if (mac_ctx->lim.gpLimMlmOemDataReq->data) { - cdf_mem_free( + qdf_mem_free( mac_ctx->lim.gpLimMlmOemDataReq->data); mac_ctx->lim.gpLimMlmOemDataReq->data = NULL; } - cdf_mem_free(mac_ctx->lim.gpLimMlmOemDataReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmOemDataReq); mac_ctx->lim.gpLimMlmOemDataReq = NULL; } @@ -838,15 +838,15 @@ static void lim_process_mlm_oem_data_req(tpAniSirGlobal mac_ctx, lim_print_mlm_state(mac_ctx, LOGW, mac_ctx->lim.gLimMlmState); /* Free up buffer allocated */ - cdf_mem_free(msg_buf); + qdf_mem_free(msg_buf); /* Return Meas confirm with INVALID_PARAMETERS */ - mlm_oem_data_rsp = cdf_mem_malloc(sizeof(tLimMlmOemDataRsp)); + mlm_oem_data_rsp = qdf_mem_malloc(sizeof(tLimMlmOemDataRsp)); if (mlm_oem_data_rsp != NULL) { mlm_oem_data_rsp->target_rsp = false; lim_post_sme_message(mac_ctx, LIM_MLM_OEM_DATA_CNF, (uint32_t *) mlm_oem_data_rsp); - cdf_mem_free(mlm_oem_data_rsp); + qdf_mem_free(mlm_oem_data_rsp); } else { lim_log(mac_ctx, LOGP, FL ("Could not allocate memory for mlm_oem_data_rsp")); @@ -1087,7 +1087,7 @@ static void lim_process_mlm_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg) } error: - cdf_mem_free(msg); + qdf_mem_free(msg); if (session != NULL) session->pLimMlmJoinReq = NULL; mlmjoin_cnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; @@ -1171,7 +1171,7 @@ static bool lim_is_preauth_ctx_exists(tpAniSirGlobal mac_ctx, ((stads != NULL) && (mac_ctx->lim.gpLimMlmAuthReq->authType == stads->mlmStaContext.authType)) && - (cdf_mem_compare(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, + (!qdf_mem_cmp(mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, curr_bssid, sizeof(tSirMacAddr)))) || ((preauth_node != NULL) && (preauth_node->authType == @@ -1303,14 +1303,14 @@ static void lim_process_mlm_auth_req(tpAniSirGlobal mac_ctx, uint32_t *msg) } return; end: - cdf_mem_copy((uint8_t *) &mlm_auth_cnf.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlm_auth_cnf.peerMacAddr, (uint8_t *) &mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr)); mlm_auth_cnf.authType = mac_ctx->lim.gpLimMlmAuthReq->authType; mlm_auth_cnf.sessionId = session_id; - cdf_mem_free(mac_ctx->lim.gpLimMlmAuthReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmAuthReq); mac_ctx->lim.gpLimMlmAuthReq = NULL; lim_log(mac_ctx, LOG1, "SessionId:%d LimPostSme LIM_MLM_AUTH_CNF ", session_id); @@ -1349,7 +1349,7 @@ static void lim_process_mlm_assoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) lim_log(mac_ctx, LOGP, FL("SessionId:%d Session Does not exist"), mlm_assoc_req->sessionId); - cdf_mem_free(mlm_assoc_req); + qdf_mem_free(mlm_assoc_req); return; } @@ -1359,7 +1359,7 @@ static void lim_process_mlm_assoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) !LIM_IS_BT_AMP_AP_ROLE(session_entry)) && (session_entry->limMlmState == eLIM_MLM_AUTHENTICATED_STATE || session_entry->limMlmState == eLIM_MLM_JOINED_STATE) && - (cdf_mem_compare(mlm_assoc_req->peerMacAddr, + (!qdf_mem_cmp(mlm_assoc_req->peerMacAddr, curr_bssId, sizeof(tSirMacAddr))))) { /* * Received Association request either in invalid state @@ -1435,7 +1435,7 @@ end: /* Update PE session Id */ mlm_assoc_cnf.sessionId = mlm_assoc_req->sessionId; /* Free up buffer allocated for assocReq */ - cdf_mem_free(mlm_assoc_req); + qdf_mem_free(mlm_assoc_req); lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, (uint32_t *) &mlm_assoc_cnf); } @@ -1471,7 +1471,7 @@ static void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) lim_log(mac_ctx, LOGE, FL("Session Does not exist for given sessionId %d"), reassoc_req->sessionId); - cdf_mem_free(reassoc_req); + qdf_mem_free(reassoc_req); return; } @@ -1501,7 +1501,7 @@ static void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) } if (session->pLimMlmReassocReq) - cdf_mem_free(session->pLimMlmReassocReq); + qdf_mem_free(session->pLimMlmReassocReq); /* * Hold Re-Assoc request as part of Session, knock-out mac_ctx @@ -1512,9 +1512,9 @@ static void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) /* See if we have pre-auth context with new AP */ auth_node = lim_search_pre_auth_list(mac_ctx, session->limReAssocbssId); - if (!auth_node && (!cdf_mem_compare(reassoc_req->peerMacAddr, + if (!auth_node && qdf_mem_cmp(reassoc_req->peerMacAddr, session->bssId, - sizeof(tSirMacAddr)))) { + sizeof(tSirMacAddr))) { /* * Either pre-auth context does not exist AND * we are not reassociating with currently @@ -1559,7 +1559,7 @@ end: /* Update PE sessio Id */ reassoc_cnf.sessionId = reassoc_req->sessionId; /* Free up buffer allocated for reassocReq */ - cdf_mem_free(reassoc_req); + qdf_mem_free(reassoc_req); session->pLimReAssocReq = NULL; lim_post_sme_message(mac_ctx, LIM_MLM_REASSOC_CNF, (uint32_t *) &reassoc_cnf); @@ -1613,7 +1613,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, session->limMlmState, MAC_ADDR_ARRAY(mlm_disassocreq->peer_macaddr.bytes)); - cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -1630,7 +1630,7 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, * disassociation */ sme_disassoc_rsp = - cdf_mem_malloc(sizeof(tSirSmeDisassocRsp)); + qdf_mem_malloc(sizeof(tSirSmeDisassocRsp)); if (NULL == sme_disassoc_rsp) { lim_log(mac_ctx, LOGP, FL("memory allocation failed for disassoc rsp")); @@ -1751,13 +1751,13 @@ lim_process_mlm_disassoc_req_ntf(tpAniSirGlobal mac_ctx, goto end; } /* Free up buffer allocated for mlmDisassocReq */ - cdf_mem_free(mlm_disassocreq); + qdf_mem_free(mlm_disassocreq); } return; end: - cdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlm_disassoccnf.peerMacAddr, (uint8_t *) mlm_disassocreq->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE); mlm_disassoccnf.aid = mlm_disassocreq->aid; @@ -1767,7 +1767,7 @@ end: mlm_disassoccnf.sessionId = mlm_disassocreq->sessionId; /* Free up buffer allocated for mlmDisassocReq */ - cdf_mem_free(mlm_disassocreq); + qdf_mem_free(mlm_disassocreq); lim_post_sme_message(mac_ctx, LIM_MLM_DISASSOC_CNF, (uint32_t *) &mlm_disassoccnf); @@ -1792,10 +1792,10 @@ bool lim_check_disassoc_deauth_ack_pending(tpAniSirGlobal mac_ctx, disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; - if ((disassoc_req && (cdf_mem_compare((uint8_t *) sta_mac, + if ((disassoc_req && (!qdf_mem_cmp((uint8_t *) sta_mac, (uint8_t *) &disassoc_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE))) || - (deauth_req && (cdf_mem_compare((uint8_t *) sta_mac, + (deauth_req && (!qdf_mem_cmp((uint8_t *) sta_mac, (uint8_t *) &deauth_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE)))) { PELOG1(lim_log(mac_ctx, LOG1, @@ -1826,7 +1826,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, tLimMlmDeauthReq *mlm_deauth_req; mlm_disassoc_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq; if (mlm_disassoc_req && - (cdf_mem_compare((uint8_t *) sta_mac, + (!qdf_mem_cmp((uint8_t *) sta_mac, (uint8_t *) &mlm_disassoc_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { @@ -1837,7 +1837,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, lim_deactivate_and_change_timer(mac_ctx, eLIM_DISASSOC_ACK_TIMER); } - cdf_mem_free(mlm_disassoc_req); + qdf_mem_free(mlm_disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; } @@ -1845,7 +1845,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, mlm_deauth_req = mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq; if (mlm_deauth_req && - (cdf_mem_compare((uint8_t *) sta_mac, + (!qdf_mem_cmp((uint8_t *) sta_mac, (uint8_t *) &mlm_deauth_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE))) { if (clean_rx_path) { @@ -1856,7 +1856,7 @@ void lim_clean_up_disassoc_deauth_req(tpAniSirGlobal mac_ctx, lim_deactivate_and_change_timer(mac_ctx, eLIM_DEAUTH_ACK_TIMER); } - cdf_mem_free(mlm_deauth_req); + qdf_mem_free(mlm_deauth_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL; } @@ -1947,7 +1947,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("session does not exist for given sessionId %d"), mlm_deauth_req->sessionId); - cdf_mem_free(mlm_deauth_req); + qdf_mem_free(mlm_deauth_req); return; } lim_log(mac_ctx, LOG1, FL("Process Deauth Req on sessionID %d Systemrole %d" @@ -1972,7 +1972,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, case eLIM_MLM_AUTHENTICATED_STATE: case eLIM_MLM_WT_ASSOC_RSP_STATE: case eLIM_MLM_LINK_ESTABLISHED_STATE: - if (!cdf_mem_compare(mlm_deauth_req->peer_macaddr.bytes, + if (qdf_mem_cmp(mlm_deauth_req->peer_macaddr.bytes, curr_bssId, QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOGE, FL("received MLM_DEAUTH_REQ with invalid BSS id " @@ -1986,7 +1986,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, * deauthentication */ sme_deauth_rsp = - cdf_mem_malloc(sizeof(tSirSmeDeauthRsp)); + qdf_mem_malloc(sizeof(tSirSmeDeauthRsp)); if (NULL == sme_deauth_rsp) { lim_log(mac_ctx, LOGP, FL("memory allocation failed for deauth rsp")); @@ -2009,7 +2009,7 @@ lim_process_mlm_deauth_req_ntf(tpAniSirGlobal mac_ctx, mlm_deauth_req->sessionId; sme_deauth_rsp->transactionId = 0; - cdf_mem_copy(sme_deauth_rsp->peer_macaddr.bytes, + qdf_mem_copy(sme_deauth_rsp->peer_macaddr.bytes, mlm_deauth_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE); @@ -2154,7 +2154,7 @@ end: mlm_deauth_cnf.sessionId = mlm_deauth_req->sessionId; /* Free up buffer allocated for mlmDeauthReq */ - cdf_mem_free(mlm_deauth_req); + qdf_mem_free(mlm_deauth_req); lim_post_sme_message(mac_ctx, LIM_MLM_DEAUTH_CNF, (uint32_t *) &mlm_deauth_cnf); } @@ -2261,7 +2261,7 @@ lim_process_mlm_set_keys_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_set_keys_req->aid, mlm_set_keys_req->edType, mlm_set_keys_req->numKeys); lim_print_mac_addr(mac_ctx, mlm_set_keys_req->peer_macaddr.bytes, LOGW); - cdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(curr_bssid.bytes, session->bssId, QDF_MAC_ADDR_SIZE); switch (GET_LIM_SYSTEM_ROLE(session)) { case eLIM_STA_ROLE: @@ -2535,7 +2535,7 @@ static void lim_process_join_failure_timeout(tpAniSirGlobal mac_ctx) mlm_join_cnf.sessionId = session->peSessionId; /* Freeup buffer allocated to join request */ if (session->pLimMlmJoinReq) { - cdf_mem_free(session->pLimMlmJoinReq); + qdf_mem_free(session->pLimMlmJoinReq); session->pLimMlmJoinReq = NULL; } lim_post_sme_message(mac_ctx, LIM_MLM_JOIN_CNF, @@ -2578,7 +2578,7 @@ static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal mac_ctx) if ((true == tx_timer_running(&mac_ctx->lim.limTimers.gLimJoinFailureTimer)) && (session->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE)) { - cdf_mem_copy(ssid.ssId, session->ssId.ssId, + qdf_mem_copy(ssid.ssId, session->ssId.ssId, session->ssId.length); ssid.length = session->ssId.length; lim_send_probe_req_mgmt_frame(mac_ctx, &ssid, @@ -2803,7 +2803,7 @@ lim_process_assoc_failure_timeout(tpAniSirGlobal mac_ctx, uint32_t msg_type) * MLM state machine */ if (session->pLimMlmJoinReq) { - cdf_mem_free(session->pLimMlmJoinReq); + qdf_mem_free(session->pLimMlmJoinReq); session->pLimMlmJoinReq = NULL; } /* To remove the preauth node in case of fail to associate */ @@ -2870,7 +2870,7 @@ void lim_complete_mlm_scan(tpAniSirGlobal mac_ctx, tSirResultCodes ret_code) lim_restore_pre_scan_state(mac_ctx); /* Free up mac_ctx->lim.gLimMlmScanReq */ if (NULL != mac_ctx->lim.gpLimMlmScanReq) { - cdf_mem_free(mac_ctx->lim.gpLimMlmScanReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmScanReq); mac_ctx->lim.gpLimMlmScanReq = NULL; } diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 9ec47dc98a30..ed6875cb1b06 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -405,7 +405,7 @@ void lim_send_mlm_assoc_req(tpAniSirGlobal mac_ctx, return; } - assoc_req = cdf_mem_malloc(sizeof(tLimMlmAssocReq)); + assoc_req = qdf_mem_malloc(sizeof(tLimMlmAssocReq)); if (NULL == assoc_req) { lim_log(mac_ctx, LOGP, FL("call to AllocateMemory failed for mlmAssocReq")); @@ -626,21 +626,21 @@ void lim_process_mlm_auth_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg) */ auth_mode = eSIR_SHARED_KEY; /* Trigger MAC based Authentication */ - auth_req = cdf_mem_malloc(sizeof(tLimMlmAuthReq)); + auth_req = qdf_mem_malloc(sizeof(tLimMlmAuthReq)); if (NULL == auth_req) { /* Log error */ lim_log(mac_ctx, LOGP, FL("mlmAuthReq :Memory alloc failed ")); return; } - cdf_mem_set((uint8_t *) auth_req, + qdf_mem_set((uint8_t *) auth_req, sizeof(tLimMlmAuthReq), 0); if (session_entry->limSmeState == eLIM_SME_WT_AUTH_STATE) { sir_copy_mac_addr(auth_req->peerMacAddr, session_entry->bssId); } else { - cdf_mem_copy((uint8_t *)&auth_req->peerMacAddr, + qdf_mem_copy((uint8_t *)&auth_req->peerMacAddr, (uint8_t *)&mac_ctx->lim.gLimPreAuthPeerAddr, sizeof(tSirMacAddr)); } @@ -815,7 +815,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) return; } if (session->pLimReAssocReq) { - cdf_mem_free(session->pLimReAssocReq); + qdf_mem_free(session->pLimReAssocReq); session->pLimReAssocReq = NULL; } @@ -828,12 +828,12 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) lim_log(mac_ctx, LOG1, FL("Freeing pFTPreAuthReq= %p"), session->ftPEContext.pFTPreAuthReq); if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { - cdf_mem_free( + qdf_mem_free( session->ftPEContext.pFTPreAuthReq->pbssDescription); session->ftPEContext.pFTPreAuthReq->pbssDescription = NULL; } - cdf_mem_free(session->ftPEContext.pFTPreAuthReq); + qdf_mem_free(session->ftPEContext.pFTPreAuthReq); session->ftPEContext.pFTPreAuthReq = NULL; session->ftPEContext.ftPreAuthSession = false; } @@ -921,32 +921,32 @@ lim_fill_assoc_ind_params(tpAniSirGlobal mac_ctx, sme_assoc_ind->beaconLength = session_entry->bcnLen; /* Fill in peerMacAddr */ - cdf_mem_copy(sme_assoc_ind->peerMacAddr, assoc_ind->peerMacAddr, + qdf_mem_copy(sme_assoc_ind->peerMacAddr, assoc_ind->peerMacAddr, sizeof(tSirMacAddr)); /* Fill in aid */ sme_assoc_ind->aid = assoc_ind->aid; /* Fill in bssId */ - cdf_mem_copy(sme_assoc_ind->bssId, session_entry->bssId, + qdf_mem_copy(sme_assoc_ind->bssId, session_entry->bssId, sizeof(tSirMacAddr)); /* Fill in authType */ sme_assoc_ind->authType = assoc_ind->authType; /* Fill in ssId */ - cdf_mem_copy((uint8_t *) &sme_assoc_ind->ssId, + qdf_mem_copy((uint8_t *) &sme_assoc_ind->ssId, (uint8_t *) &(assoc_ind->ssId), assoc_ind->ssId.length + 1); sme_assoc_ind->rsnIE.length = assoc_ind->rsnIE.length; - cdf_mem_copy((uint8_t *) &sme_assoc_ind->rsnIE.rsnIEdata, + qdf_mem_copy((uint8_t *) &sme_assoc_ind->rsnIE.rsnIEdata, (uint8_t *) &(assoc_ind->rsnIE.rsnIEdata), assoc_ind->rsnIE.length); #ifdef FEATURE_WLAN_WAPI sme_assoc_ind->wapiIE.length = assoc_ind->wapiIE.length; - cdf_mem_copy((uint8_t *) &sme_assoc_ind->wapiIE.wapiIEdata, + qdf_mem_copy((uint8_t *) &sme_assoc_ind->wapiIE.wapiIEdata, (uint8_t *) &(assoc_ind->wapiIE.wapiIEdata), assoc_ind->wapiIE.length); #endif sme_assoc_ind->addIE.length = assoc_ind->addIE.length; - cdf_mem_copy((uint8_t *) &sme_assoc_ind->addIE.addIEdata, + qdf_mem_copy((uint8_t *) &sme_assoc_ind->addIE.addIEdata, (uint8_t *) &(assoc_ind->addIE.addIEdata), assoc_ind->addIE.length); @@ -959,12 +959,12 @@ lim_fill_assoc_ind_params(tpAniSirGlobal mac_ctx, assoc_ind->powerCap.maxTxPower; sme_assoc_ind->supportedChannels.numChnl = assoc_ind->supportedChannels.numChnl; - cdf_mem_copy((uint8_t *) &sme_assoc_ind->supportedChannels. + qdf_mem_copy((uint8_t *) &sme_assoc_ind->supportedChannels. channelList, (uint8_t *) &(assoc_ind->supportedChannels.channelList), assoc_ind->supportedChannels.numChnl); } - cdf_mem_copy(&sme_assoc_ind->chan_info, &assoc_ind->chan_info, + qdf_mem_copy(&sme_assoc_ind->chan_info, &assoc_ind->chan_info, sizeof(tSirSmeChanInfo)); /* Fill in WmmInfo */ sme_assoc_ind->wmmEnabledSta = assoc_ind->WmmStaInfoPresent; @@ -1009,7 +1009,7 @@ void lim_process_mlm_assoc_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf) } /* / Inform Host of STA association */ len = sizeof(tSirSmeAssocInd); - pSirSmeAssocInd = cdf_mem_malloc(len); + pSirSmeAssocInd = qdf_mem_malloc(len); if (NULL == pSirSmeAssocInd) { /* Log error */ lim_log(pMac, LOGP, @@ -1032,7 +1032,7 @@ void lim_process_mlm_assoc_ind(tpAniSirGlobal pMac, uint32_t *pMsgBuf) FL ("MLM AssocInd: Station context no longer valid (aid %d)"), ((tpLimMlmAssocInd) pMsgBuf)->aid); - cdf_mem_free(pSirSmeAssocInd); + qdf_mem_free(pSirSmeAssocInd); return; } @@ -1553,13 +1553,13 @@ lim_handle_sme_join_result(tpAniSirGlobal mac_ctx, &session_entry->dph.dphHashTable); goto error; } - cdf_mem_free(session_entry->pLimJoinReq); + qdf_mem_free(session_entry->pLimJoinReq); session_entry->pLimJoinReq = NULL; return; } } error: - cdf_mem_free(session_entry->pLimJoinReq); + qdf_mem_free(session_entry->pLimJoinReq); session_entry->pLimJoinReq = NULL; /* Delete teh session if JOIN failure occurred. */ if (result_code != eSIR_SME_SUCCESS) { @@ -1825,7 +1825,7 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, } end: if (NULL != msg->bodyptr) { - cdf_mem_free(add_sta_params); + qdf_mem_free(add_sta_params); msg->bodyptr = NULL; } /* Updating PE session Id */ @@ -1921,7 +1921,7 @@ void lim_process_sta_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, } end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pDelBssParams); + qdf_mem_free(pDelBssParams); limMsgQ->bodyptr = NULL; } if (pStaDs == NULL) @@ -1956,7 +1956,7 @@ void lim_process_bt_amp_ap_mlm_del_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg if (psessionEntry == NULL) { lim_log(pMac, LOGE, FL("Session entry passed is NULL")); if (pDelBss != NULL) { - cdf_mem_free(pDelBss); + qdf_mem_free(pDelBss); limMsgQ->bodyptr = NULL; } return; @@ -2006,7 +2006,7 @@ end: pe_delete_session(pMac, psessionEntry); if (pDelBss != NULL) { - cdf_mem_free(pDelBss); + qdf_mem_free(pDelBss); limMsgQ->bodyptr = NULL; } } @@ -2046,7 +2046,7 @@ void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx, if (NULL == session_entry) { lim_log(mac_ctx, LOGP, FL("Session Doesn't exist")); - cdf_mem_free(del_sta_params); + qdf_mem_free(del_sta_params); msg->bodyptr = NULL; return; } @@ -2079,7 +2079,7 @@ void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg FL("DPH Entry for STA %X missing."), pDelStaParams->assocId); statusCode = eSIR_SME_REFUSED; - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); limMsgQ->bodyptr = NULL; return; @@ -2110,7 +2110,7 @@ void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg lim_print_mac_addr(pMac, pStaDs->staAddr, LOG1); if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE == pStaDs->mlmStaContext.mlmState) { - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); limMsgQ->bodyptr = NULL; if (lim_add_sta(pMac, pStaDs, false, psessionEntry) != eSIR_SUCCESS) { @@ -2160,7 +2160,7 @@ void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg statusCode = eSIR_SME_REFUSED; } end: - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); limMsgQ->bodyptr = NULL; if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE != pStaDs->mlmStaContext.mlmState) { @@ -2210,7 +2210,7 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, * calling limDelBSS. */ if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); limMsgQ->bodyptr = NULL; } /* Proceed to do DelBSS even if DelSta resulted in failure */ @@ -2219,7 +2219,7 @@ void lim_process_sta_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, return; end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pDelStaParams); + qdf_mem_free(pDelStaParams); limMsgQ->bodyptr = NULL; } return; @@ -2292,7 +2292,7 @@ void lim_process_ap_mlm_add_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, /* fall though to reclaim the original Add STA Response message */ end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); limMsgQ->bodyptr = NULL; } return; @@ -2350,7 +2350,7 @@ static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg FL("session does not exist for given sessionId")); ) if (NULL != pAddBssParams) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); limMsgQ->bodyptr = NULL; } return; @@ -2440,7 +2440,7 @@ static void lim_process_ap_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg lim_post_sme_message(pMac, LIM_MLM_START_CNF, (uint32_t *) &mlmStartCnf); end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); limMsgQ->bodyptr = NULL; } } @@ -2539,7 +2539,7 @@ lim_process_ibss_mlm_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_post_sme_message(pMac, LIM_MLM_START_CNF, (uint32_t *) &mlmStartCnf); end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); limMsgQ->bodyptr = NULL; } } @@ -2603,7 +2603,7 @@ lim_process_sta_add_bss_rsp_pre_assoc(tpAniSirGlobal mac_ctx, authMode = cfgAuthType; /* Trigger MAC based Authentication */ - pMlmAuthReq = cdf_mem_malloc(sizeof(tLimMlmAuthReq)); + pMlmAuthReq = qdf_mem_malloc(sizeof(tLimMlmAuthReq)); if (NULL == pMlmAuthReq) { lim_log(mac_ctx, LOGP, FL("Allocate Memory failed for mlmAuthReq")); @@ -2733,14 +2733,14 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) { /* Take a copy of reassoc request for retrying */ pMac->lim.pSessionEntry->pLimMlmReassocRetryReq = - cdf_mem_malloc(sizeof(tLimMlmReassocReq)); + qdf_mem_malloc(sizeof(tLimMlmReassocReq)); if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) goto end; - cdf_mem_set(pMac->lim.pSessionEntry-> + qdf_mem_set(pMac->lim.pSessionEntry-> pLimMlmReassocRetryReq, sizeof(tLimMlmReassocReq), 0); - cdf_mem_copy(pMac->lim.pSessionEntry-> + qdf_mem_copy(pMac->lim.pSessionEntry-> pLimMlmReassocRetryReq, psessionEntry->pLimMlmReassocReq, sizeof(tLimMlmReassocReq)); @@ -2779,20 +2779,20 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower, psessionEntry); #endif - pAddStaParams = cdf_mem_malloc(sizeof(tAddStaParams)); + pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); if (NULL == pAddStaParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during ADD_STA")); goto end; } - cdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); + qdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); /* / Add STA context at MAC HW (BMU, RHP & TFP) */ - cdf_mem_copy((uint8_t *) pAddStaParams->staMac, + qdf_mem_copy((uint8_t *) pAddStaParams->staMac, (uint8_t *) psessionEntry->selfMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) pAddStaParams->bssId, + qdf_mem_copy((uint8_t *) pAddStaParams->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); pAddStaParams->staType = STA_ENTRY_SELF; @@ -2870,7 +2870,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, psessionEntry->ftPEContext.pAddStaReq = pAddStaParams; if (pAddBssParams != NULL) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); pAddBssParams = NULL; limMsgQ->bodyptr = NULL; } @@ -2888,12 +2888,12 @@ end: /* Free up buffer allocated for reassocReq */ if (psessionEntry != NULL) if (psessionEntry->pLimMlmReassocReq != NULL) { - cdf_mem_free(psessionEntry->pLimMlmReassocReq); + qdf_mem_free(psessionEntry->pLimMlmReassocReq); psessionEntry->pLimMlmReassocReq = NULL; } if (pAddBssParams != NULL) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); pAddBssParams = NULL; limMsgQ->bodyptr = NULL; } @@ -3075,7 +3075,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, } end: if (0 != msg->bodyptr) { - cdf_mem_free(add_bss_params); + qdf_mem_free(add_bss_params); msg->bodyptr = NULL; } } @@ -3129,7 +3129,7 @@ void lim_process_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("SessionId:%d Session Doesn't exist"), add_bss_param->sessionId); if (NULL != add_bss_param) { - cdf_mem_free(add_bss_param); + qdf_mem_free(add_bss_param); msg->bodyptr = NULL; } return; @@ -3154,7 +3154,7 @@ void lim_process_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, mlm_start_cnf.resultCode = eSIR_SME_BSS_ALREADY_STARTED_OR_JOINED; if (0 != msg->bodyptr) { - cdf_mem_free(add_bss_param); + qdf_mem_free(add_bss_param); msg->bodyptr = NULL; } lim_post_sme_message(mac_ctx, LIM_MLM_START_CNF, @@ -3223,7 +3223,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx, tpPESession session_entry; SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true); - cdf_mem_set((void *)&mlm_set_key_cnf, sizeof(tLimMlmSetKeysCnf), 0); + qdf_mem_set((void *)&mlm_set_key_cnf, sizeof(tLimMlmSetKeysCnf), 0); if (NULL == msg->bodyptr) { PELOGE(lim_log(mac_ctx, LOGE, FL("msg bodyptr is NULL"));) return; @@ -3233,7 +3233,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx, if (session_entry == NULL) { PELOGE(lim_log(mac_ctx, LOGE, FL("session does not exist for given session_id"));) - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; return; } @@ -3249,7 +3249,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx, (uint16_t)(((tpSetStaKeyParams) msg->bodyptr)->status); } - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; /* Restore MLME state */ session_entry->limMlmState = session_entry->limPrevMlmState; @@ -3266,7 +3266,7 @@ void lim_process_mlm_set_sta_key_rsp(tpAniSirGlobal mac_ctx, * Free the buffer cached for the global * mac_ctx->lim.gpLimMlmSetKeysReq */ - cdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq); mac_ctx->lim.gpLimMlmSetKeysReq = NULL; } mlm_set_key_cnf.sessionId = session_id; @@ -3296,7 +3296,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, tpLimMlmSetKeysReq set_key_req; SET_LIM_PROCESS_DEFD_MESGS(mac_ctx, true); - cdf_mem_set((void *)&set_key_cnf, sizeof(tLimMlmSetKeysCnf), 0); + qdf_mem_set((void *)&set_key_cnf, sizeof(tLimMlmSetKeysCnf), 0); if (NULL == msg->bodyptr) { PELOGE(lim_log(mac_ctx, LOGE, FL("msg bodyptr is null"));) return; @@ -3307,7 +3307,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, PELOGE(lim_log(mac_ctx, LOGE, FL("session does not exist for given sessionId [%d]"), session_id);) - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; return; } @@ -3334,7 +3334,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, set_key_cnf.resultCode = result_status; } - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); msg->bodyptr = NULL; /* Restore MLME state */ session_entry->limMlmState = session_entry->limPrevMlmState; @@ -3354,7 +3354,7 @@ void lim_process_mlm_set_bss_key_rsp(tpAniSirGlobal mac_ctx, * Free the buffer cached for the * global mac_ctx->lim.gpLimMlmSetKeysReq */ - cdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq); + qdf_mem_free(mac_ctx->lim.gpLimMlmSetKeysReq); mac_ctx->lim.gpLimMlmSetKeysReq = NULL; } lim_post_sme_message(mac_ctx, LIM_MLM_SETKEYS_CNF, @@ -3426,7 +3426,7 @@ end: if (pMlmReassocReq != NULL) { /* Update PE session Id */ mlmReassocCnf.sessionId = pMlmReassocReq->sessionId; - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); psessionEntry->pLimMlmReassocReq = NULL; } else { mlmReassocCnf.sessionId = 0; @@ -3509,7 +3509,7 @@ static void lim_process_switch_channel_join_req( for (apCount = 0; apCount < 2; apCount++) { - if (cdf_mem_compare(session_entry->pLimMlmJoinReq->bssDescription.bssId, + if (!qdf_mem_cmp(session_entry->pLimMlmJoinReq->bssDescription.bssId, mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr))) { lim_log(mac_ctx, LOGE, FL("Index %d Sessionid: %d Send deauth on " @@ -3522,7 +3522,7 @@ static void lim_process_switch_channel_join_req( session_entry->pLimMlmJoinReq->bssDescription.bssId, session_entry, false); - cdf_mem_zero(mac_ctx->lim.gLimHeartBeatApMac[apCount], + qdf_mem_zero(mac_ctx->lim.gLimHeartBeatApMac[apCount], sizeof(tSirMacAddr)); break; } @@ -3530,7 +3530,7 @@ static void lim_process_switch_channel_join_req( } /* Wait for Beacon to announce join success */ - cdf_mem_copy(ssId.ssId, + qdf_mem_copy(ssId.ssId, session_entry->ssId.ssId, session_entry->ssId.length); ssId.length = session_entry->ssId.length; @@ -3586,11 +3586,11 @@ static void lim_process_switch_channel_join_req( error: if (NULL != session_entry) { if (session_entry->pLimMlmJoinReq) { - cdf_mem_free(session_entry->pLimMlmJoinReq); + qdf_mem_free(session_entry->pLimMlmJoinReq); session_entry->pLimMlmJoinReq = NULL; } if (session_entry->pLimJoinReq) { - cdf_mem_free(session_entry->pLimJoinReq); + qdf_mem_free(session_entry->pLimJoinReq); session_entry->pLimJoinReq = NULL; } join_cnf.sessionId = session_entry->peSessionId; @@ -3698,7 +3698,7 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) default: break; } - cdf_mem_free(body); + qdf_mem_free(body); } /** @@ -3736,7 +3736,7 @@ lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs tpDphHashNode pStaDs; tSirRetStatus retStatus = eSIR_SUCCESS; tpSchBeaconStruct beacon_struct; - beacon_struct = cdf_mem_malloc(sizeof(tSchBeaconStruct)); + beacon_struct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == beacon_struct) { lim_log(pMac, LOGE, FL("beaconStruct alloc failed")); mlmReassocCnf.resultCode = @@ -3767,7 +3767,7 @@ lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; - cdf_mem_free(beacon_struct); + qdf_mem_free(beacon_struct); goto error; } /* @@ -3812,13 +3812,13 @@ lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs eSIR_SME_RESOURCES_UNAVAILABLE; mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - cdf_mem_free(assocRsp); + qdf_mem_free(assocRsp); pMac->lim.gLimAssocResponseData = NULL; - cdf_mem_free(beacon_struct); + qdf_mem_free(beacon_struct); goto error; } - cdf_mem_free(assocRsp); - cdf_mem_free(beacon_struct); + qdf_mem_free(assocRsp); + qdf_mem_free(beacon_struct); psessionEntry->limAssocResponseData = NULL; } break; @@ -3907,7 +3907,7 @@ lim_process_btamp_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, lim_post_sme_message(pMac, LIM_MLM_START_CNF, (uint32_t *) &mlmStartCnf); end: if (0 != limMsgQ->bodyptr) { - cdf_mem_free(pAddBssParams); + qdf_mem_free(pAddBssParams); limMsgQ->bodyptr = NULL; } } @@ -3946,7 +3946,7 @@ lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs tSirRetStatus retStatus = eSIR_SUCCESS; tSchBeaconStruct *pBeaconStruct; pBeaconStruct = - cdf_mem_malloc(sizeof(tSchBeaconStruct)); + qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { lim_log(pMac, LOGE, FL @@ -3970,7 +3970,7 @@ lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); goto Error; } /** While Processing the ReAssoc Response Frame the ReAssocRsp Frame @@ -4021,14 +4021,14 @@ lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs eSIR_SME_RESOURCES_UNAVAILABLE; mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - cdf_mem_free(assocRsp); + qdf_mem_free(assocRsp); pMac->lim.gLimAssocResponseData = NULL; - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); goto Error; } - cdf_mem_free(assocRsp); + qdf_mem_free(assocRsp); psessionEntry->limAssocResponseData = NULL; - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); } break; case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: { @@ -4086,7 +4086,7 @@ void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry) ) return; } - pBeaconGenParams = cdf_mem_malloc(sizeof(*pBeaconGenParams)); + pBeaconGenParams = qdf_mem_malloc(sizeof(*pBeaconGenParams)); if (NULL == pBeaconGenParams) { PELOGE(lim_log(pMac, LOGP, FL @@ -4094,8 +4094,8 @@ void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry) ) return; } - cdf_mem_set(pBeaconGenParams, sizeof(*pBeaconGenParams), 0); - cdf_mem_copy((void *)pBeaconGenParams->bssId, + qdf_mem_set(pBeaconGenParams, sizeof(*pBeaconGenParams), 0); + qdf_mem_copy((void *)pBeaconGenParams->bssId, (void *)psessionEntry->bssId, QDF_MAC_ADDR_SIZE); limMsg.bodyptr = pBeaconGenParams; sch_process_pre_beacon_ind(pMac, &limMsg); @@ -4167,7 +4167,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) QDF_STATUS_SUCCESS, pScanEvent->sessionId, pScanEvent->scanId); - cdf_mem_free(pMac->lim.gpLimRemainOnChanReq); + qdf_mem_free(pMac->lim.gpLimRemainOnChanReq); pMac->lim.gpLimRemainOnChanReq = NULL; /* * If remain on channel timer expired and action frame @@ -4216,5 +4216,5 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) "Received unhandled scan event %u", pScanEvent->event); } - cdf_mem_free(buf); + qdf_mem_free(buf); } diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 0a75bd445916..91b887da46f4 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -82,7 +82,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, cur_time = (uint32_t) (qdf_mc_timer_get_system_ticks() / QDF_TICKS_PER_SECOND); qdf_zero_macaddr(&addr); - cdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); + qdf_mem_set((uint8_t *) uuid_e, SIR_WPS_UUID_LEN, 0); for (pbc = session->pAPWPSPBCSession; pbc; pbc = pbc->next) { if (cur_time > pbc->timestamp + SIR_WPS_PBC_WALK_TIME) break; @@ -90,7 +90,7 @@ void lim_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, struct qdf_mac_addr addr, if (count > 1) break; qdf_copy_macaddr(&addr, &pbc->addr); - cdf_mem_copy((uint8_t *) uuid_e, (uint8_t *) pbc->uuid_e, + qdf_mem_copy((uint8_t *) uuid_e, (uint8_t *) pbc->uuid_e, SIR_WPS_UUID_LEN); } if (count > 1) @@ -140,7 +140,7 @@ static void lim_remove_timeout_pbc_sessions(tpAniSirGlobal pMac, SIR_WPS_UUID_LEN); ) - cdf_mem_free(prev); + qdf_mem_free(prev); } } @@ -163,7 +163,7 @@ void lim_remove_pbc_sessions(tpAniSirGlobal mac, struct qdf_mac_addr remove_mac, prev->next = pbc->next; if (pbc == session_entry->pAPWPSPBCSession) session_entry->pAPWPSPBCSession = pbc->next; - cdf_mem_free(pbc); + qdf_mem_free(pbc); return; } prev = pbc; @@ -220,11 +220,11 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, pbc = psessionEntry->pAPWPSPBCSession; while (pbc) { - if (cdf_mem_compare + if ((!qdf_mem_cmp ((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, - QDF_MAC_ADDR_SIZE) - && cdf_mem_compare((uint8_t *) pbc->uuid_e, - (uint8_t *) uuid_e, SIR_WPS_UUID_LEN)) { + QDF_MAC_ADDR_SIZE)) + && (!qdf_mem_cmp((uint8_t *) pbc->uuid_e, + (uint8_t *) uuid_e, SIR_WPS_UUID_LEN))) { if (prev) prev->next = pbc->next; else @@ -236,18 +236,18 @@ static void lim_update_pbc_session_entry(tpAniSirGlobal pMac, } if (!pbc) { - pbc = cdf_mem_malloc(sizeof(tSirWPSPBCSession)); + pbc = qdf_mem_malloc(sizeof(tSirWPSPBCSession)); if (NULL == pbc) { PELOGE(lim_log (pMac, LOGE, FL("memory allocate failed!")); ) return; } - cdf_mem_copy((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, + qdf_mem_copy((uint8_t *) pbc->addr.bytes, (uint8_t *) addr, QDF_MAC_ADDR_SIZE); if (uuid_e) - cdf_mem_copy((uint8_t *) pbc->uuid_e, + qdf_mem_copy((uint8_t *) pbc->uuid_e, (uint8_t *) uuid_e, SIR_WPS_UUID_LEN); } @@ -451,7 +451,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, } ssid.length = session->ssId.length; /* Copy the SSID from sessio entry to local variable */ - cdf_mem_copy(ssid.ssId, session->ssId.ssId, + qdf_mem_copy(ssid.ssId, session->ssId.ssId, session->ssId.length); /* @@ -462,7 +462,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, if (!ssid.length) goto multipleSSIDcheck; - if (cdf_mem_compare((uint8_t *) &ssid, + if (!qdf_mem_cmp((uint8_t *) &ssid, (uint8_t *) &(probe_req.ssId), (uint8_t) (ssid.length + 1))) { lim_send_probe_rsp_mgmt_frame(mac_ctx, @@ -476,7 +476,7 @@ lim_process_probe_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, QDF_P2P_GO_MODE) { uint8_t direct_ssid[7] = "DIRECT-"; uint8_t direct_ssid_len = 7; - if (cdf_mem_compare((uint8_t *) &direct_ssid, + if (!qdf_mem_cmp((uint8_t *) &direct_ssid, (uint8_t *) &(probe_req.ssId.ssId), (uint8_t) (direct_ssid_len))) { lim_send_probe_rsp_mgmt_frame(mac_ctx, @@ -651,7 +651,7 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, tSirSmeProbeReqInd *pSirSmeProbeReqInd; tSirMsgQ msgQ; - pSirSmeProbeReqInd = cdf_mem_malloc(sizeof(tSirSmeProbeReqInd)); + pSirSmeProbeReqInd = qdf_mem_malloc(sizeof(tSirSmeProbeReqInd)); if (NULL == pSirSmeProbeReqInd) { /* Log error */ lim_log(pMac, LOGP, @@ -668,15 +668,15 @@ lim_send_sme_probe_req_ind(tpAniSirGlobal pMac, pSirSmeProbeReqInd->length = sizeof(tSirSmeProbeReq); pSirSmeProbeReqInd->sessionId = psessionEntry->smeSessionId; - cdf_mem_copy(pSirSmeProbeReqInd->bssid.bytes, psessionEntry->bssId, + qdf_mem_copy(pSirSmeProbeReqInd->bssid.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes, + qdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.peer_macaddr.bytes, peerMacAddr, QDF_MAC_ADDR_SIZE); MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIELen = (uint16_t) ProbeReqIELen; - cdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIE, pProbeReqIE, + qdf_mem_copy(pSirSmeProbeReqInd->WPSPBCProbeReq.probeReqIE, pProbeReqIE, ProbeReqIELen); if (lim_sys_process_mmh_msg_api(pMac, &msgQ, ePROT) != eSIR_SUCCESS) { diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c index 195e223b6c07..87783a0912e1 100644 --- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c @@ -97,7 +97,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, lim_log(mac_ctx, LOG1, "SessionId:%d ProbeRsp Frame is received", session_entry->peSessionId); - probe_rsp = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + probe_rsp = qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == probe_rsp) { lim_log(mac_ctx, LOGE, FL @@ -120,7 +120,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, eSIR_SUCCESS) { lim_log(mac_ctx, LOG1, FL("Parse error ProbeResponse, length=%d"), frame_len); - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } @@ -138,7 +138,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, !probe_rsp->ssidPresent) { lim_log(mac_ctx, LOG1, FL("Parse error ProbeResponse, length=%d"), frame_len); - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } lim_check_and_add_bss_description(mac_ctx, probe_rsp, @@ -159,14 +159,14 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, * Hence store it in same buffer. */ if (session_entry->beacon != NULL) { - cdf_mem_free(session_entry->beacon); + qdf_mem_free(session_entry->beacon); session_entry->beacon = NULL; session_entry->bcnLen = 0; } session_entry->bcnLen = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info); session_entry->beacon = - cdf_mem_malloc(session_entry->bcnLen); + qdf_mem_malloc(session_entry->bcnLen); if (NULL == session_entry->beacon) { lim_log(mac_ctx, LOGE, FL("No Memory to store beacon")); @@ -175,7 +175,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, * Store the Beacon/ProbeRsp. * This is sent to csr/hdd in join cnf response. */ - cdf_mem_copy(session_entry->beacon, + qdf_mem_copy(session_entry->beacon, WMA_GET_RX_MPDU_DATA (rx_Packet_info), session_entry->bcnLen); @@ -193,9 +193,9 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, * heart beat threshold */ sir_copy_mac_addr(current_bssid, session_entry->bssId); - if (!cdf_mem_compare(current_bssid, header->bssId, + if (qdf_mem_cmp(current_bssid, header->bssId, sizeof(tSirMacAddr))) { - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } if (!LIM_IS_CONNECTION_ACTIVE(session_entry)) { @@ -294,7 +294,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info, lim_handle_ibss_coalescing(mac_ctx, probe_rsp, rx_Packet_info, session_entry); } - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); /* Ignore Probe Response frame in all other states */ return; @@ -318,7 +318,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr header; tSirProbeRespBeacon *probe_rsp; - probe_rsp = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + probe_rsp = qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == probe_rsp) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); @@ -340,7 +340,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, eSIR_SUCCESS) { lim_log(mac_ctx, LOG1, FL("Parse error ProbeResponse, length=%d"), frame_len); - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } @@ -360,12 +360,12 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Parse error ProbeResponse, length=%d\n"), frame_len); - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } lim_log(mac_ctx, LOG2, FL("Save this probe rsp in LFR cache")); lim_check_and_add_bss_description(mac_ctx, probe_rsp, rx_packet_info, false, true); - cdf_mem_free(probe_rsp); + qdf_mem_free(probe_rsp); return; } diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 99b5795c6f45..d71fa9701f6b 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -148,16 +148,16 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) len = sizeof(*req_msg); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - lim_log(mac, LOGE, FL("cdf_mem_malloc failed")); + lim_log(mac, LOGE, FL("qdf_mem_malloc failed")); /* Free the active command list * Probably the malloc is going to fail there as well?! */ return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->hw_mode_index = buf->set_hw.hw_mode_index; req_msg->reason = buf->set_hw.reason; @@ -172,12 +172,12 @@ static QDF_STATUS lim_process_set_hw_mode(tpAniSirGlobal mac, uint32_t *msg) lim_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); goto fail; } return status; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { lim_log(mac, LOGE, FL("HW mode resp failed")); return QDF_STATUS_E_FAILURE; @@ -221,7 +221,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, len = sizeof(*req_msg); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { lim_log(mac, LOGE, FL("vos_mem_malloc failed")); /* Free the active command list @@ -230,7 +230,7 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->scan_config = buf->set_dual_mac.scan_config; req_msg->fw_mode_config = buf->set_dual_mac.fw_mode_config; @@ -247,12 +247,12 @@ static QDF_STATUS lim_process_set_dual_mac_cfg_req(tpAniSirGlobal mac, lim_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); goto fail; } return status; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { lim_log(mac, LOGE, FL("Dual mac config resp failed")); return QDF_STATUS_E_FAILURE; @@ -592,7 +592,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) (mac_ctx->lim.gLimSmeState == eLIM_SME_IDLE_STATE)) { size = sizeof(tSirSmeStartBssReq); - sme_start_bss_req = cdf_mem_malloc(size); + sme_start_bss_req = qdf_mem_malloc(size); if (NULL == sme_start_bss_req) { lim_log(mac_ctx, LOGE, FL("Allocate Memory fail for LimStartBssReq")); @@ -601,8 +601,8 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) goto end; } - cdf_mem_set((void *)sme_start_bss_req, size, 0); - cdf_mem_copy(sme_start_bss_req, msg_buf, + qdf_mem_set((void *)sme_start_bss_req, size, 0); + qdf_mem_copy(sme_start_bss_req, msg_buf, sizeof(tSirSmeStartBssReq)); if (!lim_is_sme_start_bss_req_valid(mac_ctx, sme_start_bss_req)) { @@ -669,7 +669,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->transactionId = sme_start_bss_req->transactionId; - cdf_mem_copy(&(session->htConfig), + qdf_mem_copy(&(session->htConfig), &(sme_start_bss_req->htConfig), sizeof(session->htConfig)); @@ -677,7 +677,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_start_bss_req->self_macaddr.bytes); /* Copy SSID to session table */ - cdf_mem_copy((uint8_t *) &session->ssId, + qdf_mem_copy((uint8_t *) &session->ssId, (uint8_t *) &sme_start_bss_req->ssId, (sme_start_bss_req->ssId.length + 1)); @@ -729,10 +729,10 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->limRmfEnabled); #endif - cdf_mem_copy((void *)&session->rateSet, + qdf_mem_copy((void *)&session->rateSet, (void *)&sme_start_bss_req->operationalRateSet, sizeof(tSirMacRateSet)); - cdf_mem_copy((void *)&session->extRateSet, + qdf_mem_copy((void *)&session->extRateSet, (void *)&sme_start_bss_req->extendedRateSet, sizeof(tSirMacRateSet)); @@ -788,7 +788,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) if ((sme_start_bss_req->bssType == eSIR_BTAMP_AP_MODE) || (sme_start_bss_req->bssType == eSIR_INFRA_AP_MODE)) { session->parsedAssocReq = - cdf_mem_malloc(session->dph.dphHashTable. + qdf_mem_malloc(session->dph.dphHashTable. size * sizeof(tpSirAssocReq)); if (NULL == session->parsedAssocReq) { lim_log(mac_ctx, LOGW, @@ -796,7 +796,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) ret_code = eSIR_SME_RESOURCES_UNAVAILABLE; goto free; } - cdf_mem_set(session->parsedAssocReq, + qdf_mem_set(session->parsedAssocReq, (session->dph.dphHashTable.size * sizeof(tpSirAssocReq)), 0); } @@ -878,14 +878,14 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * bit7 bit6 bit5 bit4 bit3 bit2 bit1 bit0 * reserved reserved RIFS Lsig n-GF ht20 11g 11b */ - cdf_mem_copy((void *)&session->cfgProtection, + qdf_mem_copy((void *)&session->cfgProtection, (void *)&sme_start_bss_req->ht_capab, sizeof(uint16_t)); /* Initialize WPS PBC session link list */ session->pAPWPSPBCSession = NULL; } /* Prepare and Issue LIM_MLM_START_REQ to MLM */ - mlm_start_req = cdf_mem_malloc(sizeof(tLimMlmStartReq)); + mlm_start_req = qdf_mem_malloc(sizeof(tLimMlmStartReq)); if (NULL == mlm_start_req) { lim_log(mac_ctx, LOGP, FL("Allocate Memory failed for mlmStartReq")); @@ -893,10 +893,10 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) goto free; } - cdf_mem_set((void *)mlm_start_req, sizeof(tLimMlmStartReq), 0); + qdf_mem_set((void *)mlm_start_req, sizeof(tLimMlmStartReq), 0); /* Copy SSID to the MLM start structure */ - cdf_mem_copy((uint8_t *) &mlm_start_req->ssId, + qdf_mem_copy((uint8_t *) &mlm_start_req->ssId, (uint8_t *) &sme_start_bss_req->ssId, sme_start_bss_req->ssId.length + 1); mlm_start_req->ssidHidden = sme_start_bss_req->ssidHidden; @@ -999,7 +999,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * as rateSet is now included in the * session entry and MLM has session context. */ - cdf_mem_copy((void *)&mlm_start_req->rateSet, + qdf_mem_copy((void *)&mlm_start_req->rateSet, (void *)&session->rateSet, sizeof(tSirMacRateSet)); @@ -1078,8 +1078,8 @@ free: (session->pLimStartBssReq == sme_start_bss_req)) { session->pLimStartBssReq = NULL; } - cdf_mem_free(sme_start_bss_req); - cdf_mem_free(mlm_start_req); + qdf_mem_free(sme_start_bss_req); + qdf_mem_free(mlm_start_req); end: if (sme_start_bss_req != NULL) { @@ -1147,7 +1147,7 @@ void lim_get_random_bssid(tpAniSirGlobal pMac, uint8_t *data) random[0] = tx_time_get(); random[0] |= (random[0] << 15); random[1] = random[0] >> 1; - cdf_mem_copy(data, (uint8_t *) random, sizeof(tSirMacAddr)); + qdf_mem_copy(data, (uint8_t *) random, sizeof(tSirMacAddr)); } static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, @@ -1219,14 +1219,14 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, } #endif /* WLAN_FEATURE_11AC */ - pScanOffloadReq = cdf_mem_malloc(len); + pScanOffloadReq = qdf_mem_malloc(len); if (NULL == pScanOffloadReq) { lim_log(pMac, LOGE, FL("AllocateMemory failed for pScanOffloadReq")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set((uint8_t *) pScanOffloadReq, len, 0); + qdf_mem_set((uint8_t *) pScanOffloadReq, len, 0); msg.type = WMA_START_SCAN_OFFLOAD_REQ; msg.bodyptr = pScanOffloadReq; @@ -1238,14 +1238,14 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Invalid value (%d) for numSsid"), SIR_SCAN_MAX_NUM_SSID); - cdf_mem_free(pScanOffloadReq); + qdf_mem_free(pScanOffloadReq); return QDF_STATUS_E_FAILURE; } pScanOffloadReq->numSsid = pScanReq->numSsid; for (i = 0; i < pScanOffloadReq->numSsid; i++) { pScanOffloadReq->ssId[i].length = pScanReq->ssId[i].length; - cdf_mem_copy((uint8_t *) pScanOffloadReq->ssId[i].ssId, + qdf_mem_copy((uint8_t *) pScanOffloadReq->ssId[i].ssId, (uint8_t *) pScanReq->ssId[i].ssId, pScanOffloadReq->ssId[i].length); } @@ -1281,7 +1281,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, pScanOffloadReq->uIEFieldLen = pScanReq->uIEFieldLen; pScanOffloadReq->uIEFieldOffset = len - addn_ie_len - pScanOffloadReq->uIEFieldLen; - cdf_mem_copy((uint8_t *) pScanOffloadReq + + qdf_mem_copy((uint8_t *) pScanOffloadReq + pScanOffloadReq->uIEFieldOffset, (uint8_t *) pScanReq + pScanReq->uIEFieldOffset, pScanReq->uIEFieldLen); @@ -1292,7 +1292,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, ht_cap_ie = (uint8_t *) pScanOffloadReq + pScanOffloadReq->uIEFieldOffset + pScanOffloadReq->uIEFieldLen; - cdf_mem_set(ht_cap_ie, ht_cap_len, 0); + qdf_mem_set(ht_cap_ie, ht_cap_len, 0); *ht_cap_ie = SIR_MAC_HT_CAPABILITIES_EID; *(ht_cap_ie + 1) = ht_cap_len - 2; lim_set_ht_caps(pMac, NULL, ht_cap_ie, ht_cap_len); @@ -1306,7 +1306,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, vht_cap_ie = (uint8_t *) pScanOffloadReq + pScanOffloadReq->uIEFieldOffset + pScanOffloadReq->uIEFieldLen; - cdf_mem_set(vht_cap_ie, vht_cap_len, 0); + qdf_mem_set(vht_cap_ie, vht_cap_len, 0); *vht_cap_ie = SIR_MAC_VHT_CAPABILITIES_EID; *(vht_cap_ie + 1) = vht_cap_len - 2; lim_set_vht_caps(pMac, NULL, vht_cap_ie, vht_cap_len); @@ -1317,7 +1317,7 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, rc = wma_post_ctrl_msg(pMac, &msg); if (rc != eSIR_SUCCESS) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() return failure")); - cdf_mem_free(pScanOffloadReq); + qdf_mem_free(pScanOffloadReq); return QDF_STATUS_E_FAILURE; } @@ -1448,26 +1448,26 @@ static void __lim_process_sme_oem_data_req(tpAniSirGlobal pMac, uint32_t *pMsgBu pOemDataReq = (tpSirOemDataReq) pMsgBuf; /* post the lim mlm message now */ - pMlmOemDataReq = cdf_mem_malloc(sizeof(*pMlmOemDataReq)); + pMlmOemDataReq = qdf_mem_malloc(sizeof(*pMlmOemDataReq)); if (NULL == pMlmOemDataReq) { lim_log(pMac, LOGP, FL("AllocateMemory failed for mlmOemDataReq")); return; } - pMlmOemDataReq->data = cdf_mem_malloc(pOemDataReq->data_len); + pMlmOemDataReq->data = qdf_mem_malloc(pOemDataReq->data_len); if (!pMlmOemDataReq->data) { lim_log(pMac, LOGP, FL("memory allocation failed")); - cdf_mem_free(pMlmOemDataReq); + qdf_mem_free(pMlmOemDataReq); return; } qdf_copy_macaddr(&pMlmOemDataReq->selfMacAddr, &pOemDataReq->selfMacAddr); pMlmOemDataReq->data_len = pOemDataReq->data_len; - cdf_mem_copy(pMlmOemDataReq->data, pOemDataReq->data, + qdf_mem_copy(pMlmOemDataReq->data, pOemDataReq->data, pOemDataReq->data_len); /* buffer from SME copied, free it now */ - cdf_mem_free(pOemDataReq->data); + qdf_mem_free(pOemDataReq->data); /* Issue LIM_MLM_OEM_DATA_REQ to MLM */ lim_post_mlm_message(pMac, LIM_MLM_OEM_DATA_REQ, (uint32_t *) pMlmOemDataReq); @@ -1497,7 +1497,7 @@ static void __lim_process_sme_oem_data_req(tpAniSirGlobal pMac, uint32_t *pMsgBu */ static void __lim_process_clear_dfs_channel_list(tpAniSirGlobal pMac, tpSirMsgQ pMsg) { - cdf_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0); + qdf_mem_set(&pMac->lim.dfschannelList, sizeof(tSirDFSChannelList), 0); } /** @@ -1548,15 +1548,15 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) n_size = __lim_get_sme_join_req_size_for_alloc((uint8_t *) msg_buf); - sme_join_req = cdf_mem_malloc(n_size); + sme_join_req = qdf_mem_malloc(n_size); if (NULL == sme_join_req) { lim_log(mac_ctx, LOGP, FL("AllocateMemory failed for sme_join_req")); ret_code = eSIR_SME_RESOURCES_UNAVAILABLE; return; } - (void)cdf_mem_set((void *)sme_join_req, n_size, 0); - (void)cdf_mem_copy((void *)sme_join_req, (void *)msg_buf, + (void)qdf_mem_set((void *)sme_join_req, n_size, 0); + (void)qdf_mem_copy((void *)sme_join_req, (void *)msg_buf, n_size); if (!lim_is_sme_join_req_valid(mac_ctx, sme_join_req)) { @@ -1652,7 +1652,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->beaconParams.beaconInterval = bss_desc.beaconInterval; - cdf_mem_copy(&(session->htConfig), &(sme_join_req->htConfig), + qdf_mem_copy(&(session->htConfig), &(sme_join_req->htConfig), sizeof(session->htConfig)); /* Copying of bssId is already done, while creating session */ @@ -1791,7 +1791,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /* Copy the SSID from smejoinreq to session entry */ session->ssId.length = sme_join_req->ssId.length; - cdf_mem_copy(session->ssId.ssId, sme_join_req->ssId.ssId, + qdf_mem_copy(session->ssId.ssId, sme_join_req->ssId.ssId, session->ssId.length); /* @@ -1830,22 +1830,22 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) } if (sme_join_req->addIEScan.length) - cdf_mem_copy(&session->pLimJoinReq->addIEScan, + qdf_mem_copy(&session->pLimJoinReq->addIEScan, &sme_join_req->addIEScan, sizeof(tSirAddie)); if (sme_join_req->addIEAssoc.length) - cdf_mem_copy(&session->pLimJoinReq->addIEAssoc, + qdf_mem_copy(&session->pLimJoinReq->addIEAssoc, &sme_join_req->addIEAssoc, sizeof(tSirAddie)); val = sizeof(tLimMlmJoinReq) + session->pLimJoinReq->bssDescription.length + 2; - mlm_join_req = cdf_mem_malloc(val); + mlm_join_req = qdf_mem_malloc(val); if (NULL == mlm_join_req) { lim_log(mac_ctx, LOGP, FL("AllocateMemory failed for mlmJoinReq")); return; } - (void)cdf_mem_set((void *)mlm_join_req, val, 0); + (void)qdf_mem_set((void *)mlm_join_req, val, 0); /* PE SessionId is stored as a part of JoinReq */ mlm_join_req->sessionId = session->peSessionId; @@ -1861,17 +1861,17 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) } /* copy operational rate from session */ - cdf_mem_copy((void *)&session->rateSet, + qdf_mem_copy((void *)&session->rateSet, (void *)&sme_join_req->operationalRateSet, sizeof(tSirMacRateSet)); - cdf_mem_copy((void *)&session->extRateSet, + qdf_mem_copy((void *)&session->extRateSet, (void *)&sme_join_req->extendedRateSet, sizeof(tSirMacRateSet)); /* * this may not be needed anymore now, as rateSet is now * included in the session entry and MLM has session context. */ - cdf_mem_copy((void *)&mlm_join_req->operationalRateSet, + qdf_mem_copy((void *)&mlm_join_req->operationalRateSet, (void *)&session->rateSet, sizeof(tSirMacRateSet)); @@ -1880,7 +1880,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) mlm_join_req->bssDescription.length = session->pLimJoinReq->bssDescription.length; - cdf_mem_copy((uint8_t *) &mlm_join_req->bssDescription.bssId, + qdf_mem_copy((uint8_t *) &mlm_join_req->bssDescription.bssId, (uint8_t *) &session->pLimJoinReq->bssDescription.bssId, session->pLimJoinReq->bssDescription.length + 2); @@ -2002,7 +2002,7 @@ end: sme_transaction_id = sme_join_req->transactionId; if (sme_join_req) { - cdf_mem_free(sme_join_req); + qdf_mem_free(sme_join_req); sme_join_req = NULL; if (NULL != session) session->pLimJoinReq = NULL; @@ -2070,7 +2070,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG3, FL("Received REASSOC_REQ")); size = __lim_get_sme_join_req_size_for_alloc((uint8_t *)msg_buf); - reassoc_req = cdf_mem_malloc(size); + reassoc_req = qdf_mem_malloc(size); if (NULL == reassoc_req) { lim_log(mac_ctx, LOGP, FL("call to AllocateMemory failed for reassoc_req")); @@ -2078,8 +2078,8 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, ret_code = eSIR_SME_RESOURCES_UNAVAILABLE; goto end; } - (void)cdf_mem_set((void *)reassoc_req, size, 0); - (void)cdf_mem_copy((void *)reassoc_req, (void *)msg_buf, size); + (void)qdf_mem_set((void *)reassoc_req, size, 0); + (void)qdf_mem_copy((void *)reassoc_req, (void *)msg_buf, size); if (!lim_is_sme_join_req_valid(mac_ctx, (tpSirSmeJoinReq)reassoc_req)) { @@ -2132,7 +2132,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, session_entry->peSessionId); /* Make sure its our preauth bssid */ - if (!cdf_mem_compare(reassoc_req->bssDescription.bssId, + if (qdf_mem_cmp(reassoc_req->bssDescription.bssId, session_entry->limReAssocbssId, 6)) { lim_print_mac_addr(mac_ctx, @@ -2160,7 +2160,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, goto end; } - cdf_mem_copy(session_entry->limReAssocbssId, + qdf_mem_copy(session_entry->limReAssocbssId, session_entry->pLimReAssocReq->bssDescription.bssId, sizeof(tSirMacAddr)); @@ -2197,7 +2197,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, #endif /* Copy the SSID from session entry to local variable */ session_entry->limReassocSSID.length = reassoc_req->ssId.length; - cdf_mem_copy(session_entry->limReassocSSID.ssId, + qdf_mem_copy(session_entry->limReassocSSID.ssId, reassoc_req->ssId.ssId, session_entry->limReassocSSID.length); if (session_entry->gLimCurrentBssUapsd) { @@ -2208,7 +2208,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, session_entry->gUapsdPerAcBitmask); } - mlm_reassoc_req = cdf_mem_malloc(sizeof(tLimMlmReassocReq)); + mlm_reassoc_req = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); if (NULL == mlm_reassoc_req) { lim_log(mac_ctx, LOGP, FL("call to AllocateMemory failed for mlmReassocReq")); @@ -2217,7 +2217,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, goto end; } - cdf_mem_copy(mlm_reassoc_req->peerMacAddr, + qdf_mem_copy(mlm_reassoc_req->peerMacAddr, session_entry->limReAssocbssId, sizeof(tSirMacAddr)); if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, @@ -2299,7 +2299,7 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, return; end: if (reassoc_req) { - cdf_mem_free(reassoc_req); + qdf_mem_free(reassoc_req); if (session_entry) session_entry->pLimReAssocReq = NULL; } @@ -2365,7 +2365,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu return; } - cdf_mem_copy(&smeDisassocReq, pMsgBuf, sizeof(tSirSmeDisassocReq)); + qdf_mem_copy(&smeDisassocReq, pMsgBuf, sizeof(tSirSmeDisassocReq)); smesessionId = smeDisassocReq.sessionId; smetransactionId = smeDisassocReq.transactionId; if (!lim_is_sme_disassoc_req_valid(pMac, @@ -2529,7 +2529,7 @@ static void __lim_process_sme_disassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBu " : %d, reasonCode : %d"), disassocTrigger, reasonCode); - pMlmDisassocReq = cdf_mem_malloc(sizeof(tLimMlmDisassocReq)); + pMlmDisassocReq = qdf_mem_malloc(sizeof(tLimMlmDisassocReq)); if (NULL == pMlmDisassocReq) { /* Log error */ lim_log(pMac, LOGP, @@ -2588,7 +2588,7 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu PELOG1(lim_log(pMac, LOG1, FL("received DISASSOC_CNF message"));) - cdf_mem_copy(&smeDisassocCnf, pMsgBuf, + qdf_mem_copy(&smeDisassocCnf, pMsgBuf, sizeof(struct sSirSmeDisassocCnf)); psessionEntry = pe_find_session_by_bssid(pMac, @@ -2709,7 +2709,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("received DEAUTH_REQ message")); - cdf_mem_copy(&sme_deauth_req, msg_buf, sizeof(tSirSmeDeauthReq)); + qdf_mem_copy(&sme_deauth_req, msg_buf, sizeof(tSirSmeDeauthReq)); sme_session_id = sme_deauth_req.sessionId; sme_transaction_id = sme_deauth_req.transactionId; @@ -2861,7 +2861,7 @@ static void __lim_process_sme_deauth_req(tpAniSirGlobal mac_ctx, } /* Trigger Deauthentication frame to peer MAC entity */ - mlm_deauth_req = cdf_mem_malloc(sizeof(tLimMlmDeauthReq)); + mlm_deauth_req = qdf_mem_malloc(sizeof(tLimMlmDeauthReq)); if (NULL == mlm_deauth_req) { lim_log(mac_ctx, LOGP, FL("call to AllocateMemory failed for mlmDeauthReq")); @@ -2922,13 +2922,13 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) return; } - set_context_req = cdf_mem_malloc(sizeof(struct sSirSmeSetContextReq)); + set_context_req = qdf_mem_malloc(sizeof(struct sSirSmeSetContextReq)); if (NULL == set_context_req) { lim_log(mac_ctx, LOGP, FL( "call to AllocateMemory failed for set_context_req")); return; } - cdf_mem_copy(set_context_req, msg_buf, + qdf_mem_copy(set_context_req, msg_buf, sizeof(struct sSirSmeSetContextReq)); sme_session_id = set_context_req->sessionId; sme_transaction_id = set_context_req->transactionId; @@ -2975,7 +2975,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) LIM_IS_BT_AMP_AP_ROLE(session_entry)) && (session_entry->limSmeState == eLIM_SME_NORMAL_STATE))) { /* Trigger MLM_SETKEYS_REQ */ - mlm_set_key_req = cdf_mem_malloc(sizeof(tLimMlmSetKeysReq)); + mlm_set_key_req = qdf_mem_malloc(sizeof(tLimMlmSetKeysReq)); if (NULL == mlm_set_key_req) { lim_log(mac_ctx, LOGP, FL( "mem alloc failed for mlmSetKeysReq")); @@ -2993,7 +2993,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) qdf_copy_macaddr(&mlm_set_key_req->peer_macaddr, &set_context_req->peer_macaddr); - cdf_mem_copy((uint8_t *) &mlm_set_key_req->key, + qdf_mem_copy((uint8_t *) &mlm_set_key_req->key, (uint8_t *) &set_context_req->keyMaterial.key, sizeof(tSirKeys) * (mlm_set_key_req->numKeys ? mlm_set_key_req-> @@ -3012,7 +3012,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) uint8_t key_id; key_id = set_context_req->keyMaterial.key[0].keyId; - cdf_mem_copy((uint8_t *) + qdf_mem_copy((uint8_t *) &session_entry->WEPKeyMaterial[key_id], (uint8_t *) &set_context_req->keyMaterial, sizeof(tSirKeyMaterial)); @@ -3020,7 +3020,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) uint32_t i; for (i = 0; i < SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS; i++) { - cdf_mem_copy((uint8_t *) + qdf_mem_copy((uint8_t *) &mlm_set_key_req->key[i], (uint8_t *)session_entry->WEPKeyMaterial[i].key, sizeof(tSirKeys)); @@ -3043,7 +3043,7 @@ __lim_process_sme_set_context_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_transaction_id); } end: - cdf_mem_free(set_context_req); + qdf_mem_free(set_context_req); return; } @@ -3077,7 +3077,7 @@ void lim_process_sme_get_assoc_sta_info(tpAniSirGlobal mac_ctx, return; } - cdf_mem_copy(&get_assoc_stas_req, msg_buf, + qdf_mem_copy(&get_assoc_stas_req, msg_buf, sizeof(struct sSirSmeGetAssocSTAsReq)); /* * Get Associated stations from PE. @@ -3112,13 +3112,13 @@ void lim_process_sme_get_assoc_sta_info(tpAniSirGlobal mac_ctx, if (NULL == sta_ds) continue; if (sta_ds->valid) { - cdf_mem_copy((uint8_t *) &assoc_sta_tmp->staMac, + qdf_mem_copy((uint8_t *) &assoc_sta_tmp->staMac, (uint8_t *) &sta_ds->staAddr, QDF_MAC_ADDR_SIZE); assoc_sta_tmp->assocId = (uint8_t) sta_ds->assocId; assoc_sta_tmp->staId = (uint8_t) sta_ds->staIndex; - cdf_mem_copy((uint8_t *)&assoc_sta_tmp->supportedRates, + qdf_mem_copy((uint8_t *)&assoc_sta_tmp->supportedRates, (uint8_t *)&sta_ds->supportedRates, sizeof(tSirSupportedRates)); assoc_sta_tmp->ShortGI40Mhz = sta_ds->htShortGI40Mhz; @@ -3184,7 +3184,7 @@ void lim_process_sme_get_wpspbc_sessions(tpAniSirGlobal mac_ctx, sap_get_wpspbc_event = &sap_event.sapevt.sapGetWPSPBCSessionEvent; sap_get_wpspbc_event->status = QDF_STATUS_E_FAULT; - cdf_mem_copy(&get_wps_pbc_sessions_req, msg_buf, + qdf_mem_copy(&get_wps_pbc_sessions_req, msg_buf, sizeof(struct sSirSmeGetWPSPBCSessionsReq)); /* * Get Associated stations from PE @@ -3274,7 +3274,7 @@ void lim_process_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t *pMsgBuf) tpPESession psessionEntry; uint8_t sessionId; /* PE sessionId */ - cdf_mem_copy(&tkipCntrMeasReq, pMsgBuf, + qdf_mem_copy(&tkipCntrMeasReq, pMsgBuf, sizeof(struct sSirSmeTkipCntrMeasReq)); psessionEntry = pe_find_session_by_bssid(pMac, @@ -3304,7 +3304,7 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) uint8_t i = 0; tpDphHashNode pStaDs = NULL; - cdf_mem_copy(&stopBssReq, pMsgBuf, sizeof(tSirSmeStopBssReq)); + qdf_mem_copy(&stopBssReq, pMsgBuf, sizeof(tSirSmeStopBssReq)); smesessionId = stopBssReq.sessionId; smetransactionId = stopBssReq.transactionId; @@ -3386,15 +3386,15 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) } /* Free the buffer allocated in START_BSS_REQ */ - cdf_mem_free(psessionEntry->addIeParams.probeRespData_buff); + qdf_mem_free(psessionEntry->addIeParams.probeRespData_buff); psessionEntry->addIeParams.probeRespDataLen = 0; psessionEntry->addIeParams.probeRespData_buff = NULL; - cdf_mem_free(psessionEntry->addIeParams.assocRespData_buff); + qdf_mem_free(psessionEntry->addIeParams.assocRespData_buff); psessionEntry->addIeParams.assocRespDataLen = 0; psessionEntry->addIeParams.assocRespData_buff = NULL; - cdf_mem_free(psessionEntry->addIeParams.probeRespBCNData_buff); + qdf_mem_free(psessionEntry->addIeParams.probeRespBCNData_buff); psessionEntry->addIeParams.probeRespBCNDataLen = 0; psessionEntry->addIeParams.probeRespBCNData_buff = NULL; @@ -3506,7 +3506,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type, goto end; } - cdf_mem_copy(&assoc_cnf, msg_buf, sizeof(struct sSirSmeAssocCnf)); + qdf_mem_copy(&assoc_cnf, msg_buf, sizeof(struct sSirSmeAssocCnf)); if (!__lim_is_sme_assoc_cnf_valid(&assoc_cnf)) { lim_log(mac_ctx, LOGE, FL("Received invalid SME_RE(ASSOC)_CNF message ")); @@ -3552,7 +3552,7 @@ void __lim_process_sme_assoc_cnf_new(tpAniSirGlobal mac_ctx, uint32_t msg_type, session_entry); goto end; } - if (!cdf_mem_compare((uint8_t *)sta_ds->staAddr, + if (qdf_mem_cmp((uint8_t *)sta_ds->staAddr, (uint8_t *) assoc_cnf.peer_macaddr.bytes, QDF_MAC_ADDR_SIZE)) { lim_log(mac_ctx, LOG1, FL( @@ -3623,10 +3623,10 @@ end: assoc_req = (tpSirAssocReq) session_entry->parsedAssocReq[sta_ds->assocId]; if (assoc_req->assocReqFrame) { - cdf_mem_free(assoc_req->assocReqFrame); + qdf_mem_free(assoc_req->assocReqFrame); assoc_req->assocReqFrame = NULL; } - cdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]); + qdf_mem_free(session_entry->parsedAssocReq[sta_ds->assocId]); session_entry->parsedAssocReq[sta_ds->assocId] = NULL; } } @@ -3757,7 +3757,7 @@ static void __lim_process_sme_addts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf) /* save the addts request */ pMac->lim.gLimAddtsSent = true; - cdf_mem_copy((uint8_t *) &pMac->lim.gLimAddtsReq, + qdf_mem_copy((uint8_t *) &pMac->lim.gLimAddtsReq, (uint8_t *) pSirAddts, sizeof(tSirAddtsReq)); /* ship out the message now */ @@ -3980,7 +3980,7 @@ __lim_process_sme_get_statistics_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); if (eSIR_SUCCESS != (wma_post_ctrl_msg(pMac, &msgQ))) { - cdf_mem_free(pMsgBuf); + qdf_mem_free(pMsgBuf); pMsgBuf = NULL; lim_log(pMac, LOGP, "Unable to forward request"); return; @@ -4011,7 +4011,7 @@ __lim_process_sme_get_tsm_stats_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); if (eSIR_SUCCESS != (wma_post_ctrl_msg(pMac, &msgQ))) { - cdf_mem_free(pMsgBuf); + qdf_mem_free(pMsgBuf); pMsgBuf = NULL; lim_log(pMac, LOGP, "Unable to forward request"); return; @@ -4033,14 +4033,14 @@ __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf) return; } - pUpdateAPWPSIEsReq = cdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq)); + pUpdateAPWPSIEsReq = qdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq)); if (NULL == pUpdateAPWPSIEsReq) { lim_log(pMac, LOGP, FL ("call to AllocateMemory failed for pUpdateAPWPSIEsReq")); return; } - cdf_mem_copy(pUpdateAPWPSIEsReq, pMsgBuf, + qdf_mem_copy(pUpdateAPWPSIEsReq, pMsgBuf, sizeof(struct sSirUpdateAPWPSIEsReq)); psessionEntry = pe_find_session_by_bssid(pMac, @@ -4052,14 +4052,14 @@ __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf) goto end; } - cdf_mem_copy(&psessionEntry->APWPSIEs, &pUpdateAPWPSIEsReq->APWPSIEs, + qdf_mem_copy(&psessionEntry->APWPSIEs, &pUpdateAPWPSIEsReq->APWPSIEs, sizeof(tSirAPWPSIEs)); sch_set_fixed_beacon_fields(pMac, psessionEntry); lim_send_beacon_ind(pMac, psessionEntry); end: - cdf_mem_free(pUpdateAPWPSIEsReq); + qdf_mem_free(pUpdateAPWPSIEsReq); return; } @@ -4080,7 +4080,7 @@ lim_send_vdev_restart(tpAniSirGlobal pMac, } pHalHiddenSsidVdevRestart = - cdf_mem_malloc(sizeof(tHalHiddenSsidVdevRestart)); + qdf_mem_malloc(sizeof(tHalHiddenSsidVdevRestart)); if (NULL == pHalHiddenSsidVdevRestart) { PELOGE(lim_log (pMac, LOGE, "%s:%d: Unable to allocate memory", @@ -4102,7 +4102,7 @@ lim_send_vdev_restart(tpAniSirGlobal pMac, (pMac, LOGE, "%s:%d: wma_post_ctrl_msg() failed", __func__, __LINE__); ) - cdf_mem_free(pHalHiddenSsidVdevRestart); + qdf_mem_free(pHalHiddenSsidVdevRestart); } } @@ -4153,14 +4153,14 @@ static void __lim_process_sme_set_wparsni_es(tpAniSirGlobal pMac, uint32_t *pMsg return; } - pUpdateAPWPARSNIEsReq = cdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq)); + pUpdateAPWPARSNIEsReq = qdf_mem_malloc(sizeof(tSirUpdateAPWPSIEsReq)); if (NULL == pUpdateAPWPARSNIEsReq) { lim_log(pMac, LOGP, FL ("call to AllocateMemory failed for pUpdateAPWPARSNIEsReq")); return; } - cdf_mem_copy(pUpdateAPWPARSNIEsReq, pMsgBuf, + qdf_mem_copy(pUpdateAPWPARSNIEsReq, pMsgBuf, sizeof(struct sSirUpdateAPWPARSNIEsReq)); psessionEntry = pe_find_session_by_bssid(pMac, @@ -4172,7 +4172,7 @@ static void __lim_process_sme_set_wparsni_es(tpAniSirGlobal pMac, uint32_t *pMsg goto end; } - cdf_mem_copy(&psessionEntry->pLimStartBssReq->rsnIE, + qdf_mem_copy(&psessionEntry->pLimStartBssReq->rsnIE, &pUpdateAPWPARSNIEsReq->APWPARSNIEs, sizeof(tSirRSNie)); lim_set_rs_nie_wp_aiefrom_sme_start_bss_req_message(pMac, @@ -4187,7 +4187,7 @@ static void __lim_process_sme_set_wparsni_es(tpAniSirGlobal pMac, uint32_t *pMsg lim_send_beacon_ind(pMac, psessionEntry); end: - cdf_mem_free(pUpdateAPWPARSNIEsReq); + qdf_mem_free(pUpdateAPWPARSNIEsReq); return; } /*** end __lim_process_sme_set_wparsni_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf) ***/ @@ -4210,7 +4210,7 @@ static void __lim_process_sme_change_bi(tpAniSirGlobal pMac, uint32_t *pMsgBuf) return; } - cdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); pChangeBIParams = (tpSirChangeBIParams) pMsgBuf; psessionEntry = pe_find_session_by_bssid(pMac, @@ -4330,7 +4330,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, continue; if (pStaDs->valid && pStaDs->htSupportedChannelWidthSet) { - pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); + pHtOpMode = qdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pHtOpMode) { lim_log(pMac, LOGE, FL @@ -4343,7 +4343,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, PHY_SINGLE_CHANNEL_CENTERED) ? eHT_CHANNEL_WIDTH_20MHZ : eHT_CHANNEL_WIDTH_40MHZ; pHtOpMode->staId = staId; - cdf_mem_copy(pHtOpMode->peer_mac, &pStaDs->staAddr, + qdf_mem_copy(pHtOpMode->peer_mac, &pStaDs->staAddr, sizeof(tSirMacAddr)); pHtOpMode->smesessionId = sessionId; @@ -4356,7 +4356,7 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, FL ("%s: Not able to post WMA_UPDATE_OP_MODE message to WMA"), __func__); - cdf_mem_free(pHtOpMode); + qdf_mem_free(pHtOpMode); return; } lim_log(pMac, LOG1, @@ -4439,7 +4439,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, return eSIR_FAILURE; } - pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); + pMaxTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory for pMaxTxParams ")); @@ -4455,9 +4455,9 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, return eSIR_FAILURE; } pMaxTxParams->power = txPower; - cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, + qdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, + qdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, QDF_MAC_ADDR_SIZE); @@ -4471,7 +4471,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { lim_log(pMac, LOGE, FL("wma_post_ctrl_msg() failed")); - cdf_mem_free(pMaxTxParams); + qdf_mem_free(pMaxTxParams); } return retCode; } @@ -4512,7 +4512,7 @@ static void __lim_process_sme_register_mgmt_frame_req(tpAniSirGlobal mac_ctx, goto skip_match; if (sme_req->matchLen) { if ((lim_mgmt_regn->matchLen == sme_req->matchLen) && - (cdf_mem_compare(lim_mgmt_regn->matchData, + (!qdf_mem_cmp(lim_mgmt_regn->matchData, sme_req->matchData, lim_mgmt_regn->matchLen))) { /* found match! */ @@ -4540,22 +4540,22 @@ skip_match: &mac_ctx->lim.gLimMgmtFrameRegistratinQueue, (qdf_list_node_t *)lim_mgmt_regn); qdf_mutex_release(&mac_ctx->lim.lim_frame_register_lock); - cdf_mem_free(lim_mgmt_regn); + qdf_mem_free(lim_mgmt_regn); } if (sme_req->registerFrame) { lim_mgmt_regn = - cdf_mem_malloc(sizeof(struct mgmt_frm_reg_info) + + qdf_mem_malloc(sizeof(struct mgmt_frm_reg_info) + sme_req->matchLen); if (lim_mgmt_regn != NULL) { - cdf_mem_set((void *)lim_mgmt_regn, + qdf_mem_set((void *)lim_mgmt_regn, sizeof(struct mgmt_frm_reg_info) + sme_req->matchLen, 0); lim_mgmt_regn->frameType = sme_req->frameType; lim_mgmt_regn->matchLen = sme_req->matchLen; lim_mgmt_regn->sessionId = sme_req->sessionId; if (sme_req->matchLen) { - cdf_mem_copy(lim_mgmt_regn->matchData, + qdf_mem_copy(lim_mgmt_regn->matchData, sme_req->matchData, sme_req->matchLen); } @@ -4578,7 +4578,7 @@ static void __lim_deregister_deferred_sme_req_after_noa_start(tpAniSirGlobal pMa pMac->lim.gDeferMsgTypeForNOA = 0; if (pMac->lim.gpDefdSmeMsgForNOA != NULL) { /* __lim_process_sme_scan_req consumed the buffer. We can free it. */ - cdf_mem_free(pMac->lim.gpDefdSmeMsgForNOA); + qdf_mem_free(pMac->lim.gpDefdSmeMsgForNOA); pMac->lim.gpDefdSmeMsgForNOA = NULL; } } @@ -4938,7 +4938,7 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) lim_process_ext_change_channel(pMac, pMsgBuf); break; default: - cdf_mem_free((void *)pMsg->bodyptr); + qdf_mem_free((void *)pMsg->bodyptr); pMsg->bodyptr = NULL; break; } /* switch (msgType) */ @@ -5096,10 +5096,10 @@ static void lim_process_sme_channel_change_request(tpAniSirGlobal mac_ctx, session_entry->lim11hEnable = val; session_entry->dot11mode = ch_change_req->dot11mode; - cdf_mem_copy(&session_entry->rateSet, + qdf_mem_copy(&session_entry->rateSet, &ch_change_req->operational_rateset, sizeof(session_entry->rateSet)); - cdf_mem_copy(&session_entry->extRateSet, + qdf_mem_copy(&session_entry->extRateSet, &ch_change_req->extended_rateset, sizeof(session_entry->extRateSet)); lim_set_channel(mac_ctx, ch_change_req->targetChannel, @@ -5139,14 +5139,14 @@ lim_start_bss_update_add_ie_buffer(tpAniSirGlobal pMac, if (srcDataLen > 0 && pSrcData_buff != NULL) { *pDstDataLen = srcDataLen; - *pDstData_buff = cdf_mem_malloc(*pDstDataLen); + *pDstData_buff = qdf_mem_malloc(*pDstDataLen); if (NULL == *pDstData_buff) { lim_log(pMac, LOGE, FL("AllocateMemory failed for pDstData_buff")); return; } - cdf_mem_copy(*pDstData_buff, pSrcData_buff, *pDstDataLen); + qdf_mem_copy(*pDstData_buff, pSrcData_buff, *pDstDataLen); } else { *pDstData_buff = NULL; *pDstDataLen = 0; @@ -5190,9 +5190,9 @@ lim_update_add_ie_buffer(tpAniSirGlobal pMac, if (srcDataLen > *pDstDataLen) { *pDstDataLen = srcDataLen; /* free old buffer */ - cdf_mem_free(*pDstData_buff); + qdf_mem_free(*pDstData_buff); /* allocate a new */ - *pDstData_buff = cdf_mem_malloc(*pDstDataLen); + *pDstData_buff = qdf_mem_malloc(*pDstDataLen); if (NULL == *pDstData_buff) { lim_log(pMac, LOGE, FL("Memory allocation failed.")); @@ -5204,7 +5204,7 @@ lim_update_add_ie_buffer(tpAniSirGlobal pMac, /* copy the content of buffer into dst buffer */ *pDstDataLen = srcDataLen; - cdf_mem_copy(*pDstData_buff, pSrcData_buff, *pDstDataLen); + qdf_mem_copy(*pDstData_buff, pSrcData_buff, *pDstDataLen); } @@ -5283,7 +5283,7 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, break; } end: - cdf_mem_free(modify_add_ies->modifyIE.pIEBuffer); + qdf_mem_free(modify_add_ies->modifyIE.pIEBuffer); modify_add_ies->modifyIE.pIEBuffer = NULL; } @@ -5328,17 +5328,17 @@ static void lim_process_update_add_ies(tpAniSirGlobal mac_ctx, if (0 == update_ie->ieBufferlength) { switch (update_add_ies->updateType) { case eUPDATE_IE_PROBE_RESP: - cdf_mem_free(addn_ie->probeRespData_buff); + qdf_mem_free(addn_ie->probeRespData_buff); addn_ie->probeRespData_buff = NULL; addn_ie->probeRespDataLen = 0; break; case eUPDATE_IE_ASSOC_RESP: - cdf_mem_free(addn_ie->assocRespData_buff); + qdf_mem_free(addn_ie->assocRespData_buff); addn_ie->assocRespData_buff = NULL; addn_ie->assocRespDataLen = 0; break; case eUPDATE_IE_PROBE_BCN: - cdf_mem_free(addn_ie->probeRespBCNData_buff); + qdf_mem_free(addn_ie->probeRespBCNData_buff); addn_ie->probeRespBCNData_buff = NULL; addn_ie->probeRespBCNDataLen = 0; @@ -5360,20 +5360,20 @@ static void lim_process_update_add_ies(tpAniSirGlobal mac_ctx, */ new_length = update_ie->ieBufferlength + addn_ie->probeRespDataLen; - new_ptr = cdf_mem_malloc(new_length); + new_ptr = qdf_mem_malloc(new_length); if (NULL == new_ptr) { lim_log(mac_ctx, LOGE, FL( "Memory allocation failed.")); goto end; } /* append buffer to end of local buffers */ - cdf_mem_copy(new_ptr, addn_ie->probeRespData_buff, + qdf_mem_copy(new_ptr, addn_ie->probeRespData_buff, addn_ie->probeRespDataLen); - cdf_mem_copy(&new_ptr[addn_ie->probeRespDataLen], + qdf_mem_copy(&new_ptr[addn_ie->probeRespDataLen], update_ie->pAdditionIEBuffer, update_ie->ieBufferlength); /* free old memory */ - cdf_mem_free(addn_ie->probeRespData_buff); + qdf_mem_free(addn_ie->probeRespData_buff); /* adjust length accordingly */ addn_ie->probeRespDataLen = new_length; /* save refernece of local buffer in PE session */ @@ -5409,7 +5409,7 @@ static void lim_process_update_add_ies(tpAniSirGlobal mac_ctx, break; } end: - cdf_mem_free(update_ie->pAdditionIEBuffer); + qdf_mem_free(update_ie->pAdditionIEBuffer); update_ie->pAdditionIEBuffer = NULL; } diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index c4653bee86de..26abe4dc5d71 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -277,12 +277,12 @@ static uint32_t lim_prepare_tdls_frame_header(tpAniSirGlobal pMac, uint8_t *pFra pMacHdr->fc.powerMgmt = 0; pMacHdr->fc.wep = (psessionEntry->encryptType == eSIR_ED_NONE) ? 0 : 1; - cdf_mem_copy((uint8_t *) pMacHdr->addr1, + qdf_mem_copy((uint8_t *) pMacHdr->addr1, (uint8_t *) addr1, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) pMacHdr->addr2, + qdf_mem_copy((uint8_t *) pMacHdr->addr2, (uint8_t *) staMac, sizeof(tSirMacAddr)); - cdf_mem_copy((uint8_t *) pMacHdr->addr3, + qdf_mem_copy((uint8_t *) pMacHdr->addr3, (uint8_t *) (addr3), sizeof(tSirMacAddr)); lim_log(pMac, LOG1, @@ -305,7 +305,7 @@ static uint32_t lim_prepare_tdls_frame_header(tpAniSirGlobal pMac, uint8_t *pFra /* * Now form RFC1042 header */ - cdf_mem_copy((uint8_t *) (pFrame + header_offset), + qdf_mem_copy((uint8_t *) (pFrame + header_offset), (uint8_t *) eth_890d_header, sizeof(eth_890d_header)); header_offset += sizeof(eth_890d_header); @@ -372,7 +372,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, * and then hand it off to 'dot11f_pack_probe_request' (for * serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &tdlsDisReq, sizeof(tDot11fTDLSDisReq), 0); + qdf_mem_set((uint8_t *) &tdlsDisReq, sizeof(tDot11fTDLSDisReq), 0); /* * setup Fixed fields, @@ -449,7 +449,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -496,7 +496,7 @@ tSirRetStatus lim_send_tdls_dis_req_frame(tpAniSirGlobal pMac, /* padding zero if more than 5 bytes are required */ if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE) - cdf_mem_set(pFrame + header_offset + nPayload + + qdf_mem_set(pFrame + header_offset + nPayload + MIN_VENDOR_SPECIFIC_IE_SIZE, padLen - MIN_VENDOR_SPECIFIC_IE_SIZE, 0); } @@ -626,7 +626,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, * and then hand it off to 'dot11f_pack_probe_request' (for * serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &tdlsDisRsp, sizeof(tDot11fTDLSDisRsp), 0); + qdf_mem_set((uint8_t *) &tdlsDisRsp, sizeof(tDot11fTDLSDisRsp), 0); /* * setup Fixed fields, @@ -729,7 +729,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -772,7 +772,7 @@ static tSirRetStatus lim_send_tdls_dis_rsp_frame(tpAniSirGlobal pMac, if (0 != addIeLen) { lim_log(pMac, LOG1, FL("Copy Additional Ie Len = %d"), addIeLen); - cdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, addIe, + qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, addIe, addIeLen); } lim_log(pMac, LOG1, @@ -883,7 +883,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, */ smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &tdlsSetupReq, sizeof(tDot11fTDLSSetupReq), 0); + qdf_mem_set((uint8_t *) &tdlsSetupReq, sizeof(tDot11fTDLSSetupReq), 0); tdlsSetupReq.Category.category = SIR_MAC_ACTION_TDLS; tdlsSetupReq.Action.action = SIR_MAC_TDLS_SETUP_REQ; tdlsSetupReq.DialogToken.token = dialog; @@ -1051,7 +1051,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -1098,7 +1098,7 @@ tSirRetStatus lim_send_tdls_link_setup_req_frame(tpAniSirGlobal pMac, if (addIeLen != 0) { lim_log(pMac, LOG1, FL("Copy Additional Ie Len = %d"), addIeLen); - cdf_mem_copy(pFrame + header_offset + nPayload, addIe, + qdf_mem_copy(pFrame + header_offset + nPayload, addIe, addIeLen); } @@ -1164,7 +1164,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, * and then hand it off to 'dot11f_pack_probe_request' (for * serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &teardown, sizeof(tDot11fTDLSTeardown), 0); + qdf_mem_set((uint8_t *) &teardown, sizeof(tDot11fTDLSTeardown), 0); teardown.Category.category = SIR_MAC_ACTION_TDLS; teardown.Action.action = SIR_MAC_TDLS_TEARDOWN; teardown.Reason.code = reason; @@ -1236,7 +1236,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -1277,7 +1277,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, if (addIeLen != 0) { lim_log(pMac, LOGW, FL("Copy Additional Ie Len = %d"), addIeLen); - cdf_mem_copy(pFrame + header_offset + nPayload, addIe, + qdf_mem_copy(pFrame + header_offset + nPayload, addIe, addIeLen); } #ifndef NO_PAD_TDLS_MIN_8023_SIZE @@ -1297,7 +1297,7 @@ tSirRetStatus lim_send_tdls_teardown_frame(tpAniSirGlobal pMac, /* padding zero if more than 5 bytes are required */ if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE) - cdf_mem_set(pFrame + header_offset + nPayload + + qdf_mem_set(pFrame + header_offset + nPayload + addIeLen + MIN_VENDOR_SPECIFIC_IE_SIZE, padLen - MIN_VENDOR_SPECIFIC_IE_SIZE, 0); } @@ -1370,7 +1370,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, * and then hand it off to 'dot11f_pack_probe_request' (for * serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &tdlsSetupRsp, sizeof(tDot11fTDLSSetupRsp), 0); + qdf_mem_set((uint8_t *) &tdlsSetupRsp, sizeof(tDot11fTDLSSetupRsp), 0); /* * setup Fixed fields, @@ -1533,7 +1533,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -1578,7 +1578,7 @@ static tSirRetStatus lim_send_tdls_setup_rsp_frame(tpAniSirGlobal pMac, /* follow the order. This should be ok, but we should consider changing this */ /* if there is any IOT issue. */ if (addIeLen != 0) { - cdf_mem_copy(pFrame + header_offset + nPayload, addIe, + qdf_mem_copy(pFrame + header_offset + nPayload, addIe, addIeLen); } @@ -1640,7 +1640,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, */ smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &tdlsSetupCnf, sizeof(tDot11fTDLSSetupCnf), 0); + qdf_mem_set((uint8_t *) &tdlsSetupCnf, sizeof(tDot11fTDLSSetupCnf), 0); /* * setup Fixed fields, @@ -1740,7 +1740,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, } /* zero out the memory */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* * IE formation, memory allocation is completed, Now form TDLS discovery @@ -1776,7 +1776,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, /* follow the order. This should be ok, but we should consider changing this */ /* if there is any IOT issue. */ if (addIeLen != 0) { - cdf_mem_copy(pFrame + header_offset + nPayload, addIe, + qdf_mem_copy(pFrame + header_offset + nPayload, addIe, addIeLen); } #ifndef NO_PAD_TDLS_MIN_8023_SIZE @@ -1796,7 +1796,7 @@ tSirRetStatus lim_send_tdls_link_setup_cnf_frame(tpAniSirGlobal pMac, /* padding zero if more than 5 bytes are required */ if (padLen > MIN_VENDOR_SPECIFIC_IE_SIZE) - cdf_mem_set(pFrame + header_offset + nPayload + + qdf_mem_set(pFrame + header_offset + nPayload + addIeLen + MIN_VENDOR_SPECIFIC_IE_SIZE, padLen - MIN_VENDOR_SPECIFIC_IE_SIZE, 0); } @@ -1913,7 +1913,7 @@ static tSirRetStatus lim_tdls_populate_dot11f_ht_caps(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("AMPDU Param: %x"), nCfgValue); - cdf_mem_copy(pDot11f->supportedMCSSet, pTdlsAddStaReq->htCap.suppMcsSet, + qdf_mem_copy(pDot11f->supportedMCSSet, pTdlsAddStaReq->htCap.suppMcsSet, SIZE_OF_SUPPORTED_MCS_SET); nCfgValue = pTdlsAddStaReq->htCap.extendedHtCapInfo; @@ -2157,7 +2157,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads, temp_rate_set.numRates = supp_rates_len; rates = &stads->supportedRates; - cdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); + qdf_mem_set((uint8_t *) rates, sizeof(tSirSupportedRates), 0); for (i = 0; i < temp_rate_set2.numRates; i++) { for (j = 0; j < temp_rate_set.numRates; j++) { @@ -2480,7 +2480,7 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, tSirTdlsAddStaRsp *addStaRsp = NULL; mmhMsg.type = eWNI_SME_TDLS_ADD_STA_RSP; - addStaRsp = cdf_mem_malloc(sizeof(tSirTdlsAddStaRsp)); + addStaRsp = qdf_mem_malloc(sizeof(tSirTdlsAddStaRsp)); if (NULL == addStaRsp) { lim_log(pMac, LOGE, FL("Failed to allocate memory")); return QDF_STATUS_E_NOMEM; @@ -2494,7 +2494,7 @@ static QDF_STATUS lim_send_sme_tdls_add_sta_rsp(tpAniSirGlobal pMac, addStaRsp->bcastSig = pStaDs->ucBcastSig; } if (peerMac) { - cdf_mem_copy(addStaRsp->peermac.bytes, + qdf_mem_copy(addStaRsp->peermac.bytes, (uint8_t *) peerMac, QDF_MAC_ADDR_SIZE); } if (updateSta) @@ -2554,7 +2554,7 @@ add_sta_error: pAddStaParams->staMac, pAddStaParams->updateSta, pStaDs, status); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); return status; } @@ -2677,13 +2677,13 @@ void populate_dot11f_link_iden(tpAniSirGlobal pMac, tpPESession psessionEntry, (respStaAddr = linkIden->RespStaAddr)) : ((respStaAddr = linkIden->InitStaAddr), (initStaAddr = linkIden->RespStaAddr)); - cdf_mem_copy((uint8_t *) linkIden->bssid, + qdf_mem_copy((uint8_t *) linkIden->bssid, (uint8_t *) psessionEntry->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy((uint8_t *) initStaAddr, + qdf_mem_copy((uint8_t *) initStaAddr, psessionEntry->selfMacAddr, QDF_MAC_ADDR_SIZE); - cdf_mem_copy((uint8_t *) respStaAddr, (uint8_t *) peer_mac.bytes, + qdf_mem_copy((uint8_t *) respStaAddr, (uint8_t *) peer_mac.bytes, QDF_MAC_ADDR_SIZE); linkIden->present = 1; @@ -2855,7 +2855,7 @@ void lim_send_sme_tdls_link_establish_req_rsp(tpAniSirGlobal pMac, tSirTdlsLinkEstablishReqRsp *pTdlsLinkEstablishReqRsp = NULL; pTdlsLinkEstablishReqRsp = - cdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReqRsp)); + qdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReqRsp)); if (NULL == pTdlsLinkEstablishReqRsp) { lim_log(pMac, LOGE, FL("Failed to allocate memory")); return; @@ -2885,7 +2885,7 @@ static QDF_STATUS lim_send_sme_tdls_del_sta_rsp(tpAniSirGlobal pMac, tSirTdlsDelStaRsp *pDelSta = NULL; mmhMsg.type = eWNI_SME_TDLS_DEL_STA_RSP; - pDelSta = cdf_mem_malloc(sizeof(tSirTdlsDelStaRsp)); + pDelSta = qdf_mem_malloc(sizeof(tSirTdlsDelStaRsp)); if (NULL == pDelSta) { lim_log(pMac, LOGE, FL("Failed to allocate memory")); return QDF_STATUS_E_NOMEM; @@ -3145,14 +3145,14 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("stads is NULL")); goto lim_tdls_link_establish_error; } - tdls_req_params = cdf_mem_malloc(sizeof(tTdlsLinkEstablishParams)); + tdls_req_params = qdf_mem_malloc(sizeof(tTdlsLinkEstablishParams)); if (NULL == tdls_req_params) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory TDLS Link Establish Request")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) tdls_req_params, + qdf_mem_set((uint8_t *) tdls_req_params, sizeof(tTdlsLinkEstablishParams), 0); tdls_req_params->staIdx = stads->staIndex; @@ -3195,7 +3195,7 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx, &tdls_req_params->validChannelsLen); send_tdls_establish_request: - cdf_mem_copy(tdls_req_params->validOperClasses, + qdf_mem_copy(tdls_req_params->validOperClasses, tdls_req->supportedOperClasses, tdls_req->supportedOperClassesLen); tdls_req_params->validOperClassesLen = diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index ac882aeab1ba..7f966339d55e 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -87,13 +87,13 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, tSirRetStatus cfg_set_status = eSIR_FAILURE; tSirRetStatus cfg_get_status = eSIR_FAILURE; - beacon_struct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + beacon_struct = qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == beacon_struct) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); return; } - cdf_mem_set((uint8_t *) beacon_struct, sizeof(tSirProbeRespBeacon), 0); + qdf_mem_set((uint8_t *) beacon_struct, sizeof(tSirProbeRespBeacon), 0); *qos_cap = 0; *prop_cap = 0; *uapsd = 0; @@ -239,7 +239,7 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, if (beacon_struct->countryInfoPresent) session->country_info_present = true; } - cdf_mem_free(beacon_struct); + qdf_mem_free(beacon_struct); return; } /****** end lim_extract_ap_capability() ******/ diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 2bc0f2047a50..e8a68131d938 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -123,7 +123,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, - sizeof(pBssDescr->length) + ieLen); /* Copy BSS Id */ - cdf_mem_copy((uint8_t *) &pBssDescr->bssId, + qdf_mem_copy((uint8_t *) &pBssDescr->bssId, (uint8_t *) pHdr->bssId, sizeof(tSirMacAddr)); /* Copy Timestamp, Beacon Interval and Capability Info */ @@ -227,7 +227,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac, } #endif /* Copy IE fields */ - cdf_mem_copy((uint8_t *) &pBssDescr->ieFields, + qdf_mem_copy((uint8_t *) &pBssDescr->ieFields, pBody + SIR_MAC_B_PR_SSID_OFFSET, ieLen); /*set channel number in beacon in case it is not present */ @@ -269,7 +269,7 @@ bool lim_is_scan_requested_ssid(tpAniSirGlobal pMac, tSirMacSSid *ssId) uint8_t i = 0; for (i = 0; i < pMac->lim.gpLimMlmScanReq->numSsid; i++) { - if (true == cdf_mem_compare((uint8_t *) ssId, + if (true != qdf_mem_cmp((uint8_t *) ssId, (uint8_t *) &pMac->lim. gpLimMlmScanReq->ssId[i], (uint8_t) (pMac->lim. @@ -317,7 +317,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, hdr = WMA_GET_RX_MPDUHEADER3A((uint8_t *) rx_packet_info); /* Check For Null BSSID and Skip in case of P2P */ - if (cdf_mem_compare(bssid_zero, &hdr->addr3, 6)) + if (!qdf_mem_cmp(bssid_zero, &hdr->addr3, 6)) return; /* @@ -388,12 +388,12 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, /* IEs will be overlap ieFields field. Adjust the length accordingly */ frame_len = sizeof(*bssdescr) + ie_len - sizeof(bssdescr->ieFields[1]); - bssdescr = (tSirBssDescription *) cdf_mem_malloc(frame_len); + bssdescr = (tSirBssDescription *) qdf_mem_malloc(frame_len); if (NULL == bssdescr) { /* Log error */ lim_log(mac_ctx, LOGE, - FL("cdf_mem_malloc(length=%d) failed"), frame_len); + FL("qdf_mem_malloc(length=%d) failed"), frame_len); return; } /* In scan state, store scan result. */ @@ -422,7 +422,7 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, status = QDF_STATUS_E_INVAL; } last: - cdf_mem_free(bssdescr); + qdf_mem_free(bssdescr); return; } diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 1da781411b8f..2283bf755b3a 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -238,7 +238,7 @@ struct tLimPreAuthNode *lim_search_pre_auth_list(tpAniSirGlobal pMac, struct tLimPreAuthNode *pTempNode = pMac->lim.pLimPreAuthList; while (pTempNode != NULL) { - if (cdf_mem_compare((uint8_t *) macAddr, + if (!qdf_mem_cmp((uint8_t *) macAddr, (uint8_t *) &pTempNode->peerMacAddr, sizeof(tSirMacAddr))) break; @@ -388,7 +388,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr) if (pTempNode == NULL) return; - if (cdf_mem_compare((uint8_t *) macAddr, + if (!qdf_mem_cmp((uint8_t *) macAddr, (uint8_t *) &pTempNode->peerMacAddr, sizeof(tSirMacAddr))) { /* First node to be deleted */ @@ -414,7 +414,7 @@ void lim_delete_pre_auth_node(tpAniSirGlobal pMac, tSirMacAddr macAddr) pTempNode = pTempNode->next; while (pTempNode != NULL) { - if (cdf_mem_compare((uint8_t *) macAddr, + if (!qdf_mem_cmp((uint8_t *) macAddr, (uint8_t *) &pTempNode->peerMacAddr, sizeof(tSirMacAddr))) { /* Found node to be deleted */ @@ -481,7 +481,7 @@ lim_restore_from_auth_state(tpAniSirGlobal pMac, tSirResultCodes resultCode, resultCode, protStatusCode); #endif - cdf_mem_copy((uint8_t *) &mlmAuthCnf.peerMacAddr, + qdf_mem_copy((uint8_t *) &mlmAuthCnf.peerMacAddr, (uint8_t *) &pMac->lim.gpLimMlmAuthReq->peerMacAddr, sizeof(tSirMacAddr)); mlmAuthCnf.authType = pMac->lim.gpLimMlmAuthReq->authType; @@ -493,7 +493,7 @@ lim_restore_from_auth_state(tpAniSirGlobal pMac, tSirResultCodes resultCode, /* / Free up buffer allocated */ /* / for pMac->lim.gLimMlmAuthReq */ - cdf_mem_free(pMac->lim.gpLimMlmAuthReq); + qdf_mem_free(pMac->lim.gpLimMlmAuthReq); pMac->lim.gpLimMlmAuthReq = NULL; sessionEntry->limMlmState = sessionEntry->limPrevMlmState; @@ -548,12 +548,12 @@ lim_encrypt_auth_frame(tpAniSirGlobal pMac, uint8_t keyId, uint8_t *pKey, keyLength += 3; /* Bytes 3-7 of seed is key */ - cdf_mem_copy((uint8_t *) &seed[3], pKey, keyLength - 3); + qdf_mem_copy((uint8_t *) &seed[3], pKey, keyLength - 3); /* Compute CRC-32 and place them in last 4 bytes of plain text */ lim_compute_crc32(icv, pPlainText, sizeof(tSirMacAuthFrameBody)); - cdf_mem_copy(pPlainText + sizeof(tSirMacAuthFrameBody), + qdf_mem_copy(pPlainText + sizeof(tSirMacAuthFrameBody), icv, SIR_MAC_WEP_ICV_LENGTH); /* Run RC4 on plain text with the seed */ @@ -732,10 +732,10 @@ lim_decrypt_auth_frame(tpAniSirGlobal pMac, uint8_t *pKey, uint8_t *pEncrBody, keyLength += 3; /* Bytes 0-2 of seed is received IV */ - cdf_mem_copy((uint8_t *) seed, pEncrBody, SIR_MAC_WEP_IV_LENGTH - 1); + qdf_mem_copy((uint8_t *) seed, pEncrBody, SIR_MAC_WEP_IV_LENGTH - 1); /* Bytes 3-7 of seed is key */ - cdf_mem_copy((uint8_t *) &seed[3], pKey, keyLength - 3); + qdf_mem_copy((uint8_t *) &seed[3], pKey, keyLength - 3); /* Run RC4 on encrypted text with the seed */ lim_rc4(pPlainBody, @@ -778,7 +778,7 @@ void lim_post_sme_set_keys_cnf(tpAniSirGlobal pMac, &pMlmSetKeysReq->peer_macaddr); /* Free up buffer allocated for mlmSetKeysReq */ - cdf_mem_free(pMlmSetKeysReq); + qdf_mem_free(pMlmSetKeysReq); pMac->lim.gpLimMlmSetKeysReq = NULL; lim_post_sme_message(pMac, @@ -827,7 +827,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac, } /* Package WMA_SET_BSSKEY_REQ message parameters */ - pSetBssKeyParams = cdf_mem_malloc(sizeof(tSetBssKeyParams)); + pSetBssKeyParams = qdf_mem_malloc(sizeof(tSetBssKeyParams)); if (NULL == pSetBssKeyParams) { lim_log(pMac, LOGE, FL("Unable to allocate memory during SET_BSSKEY")); @@ -836,7 +836,7 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac, mlmSetKeysCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; goto end; } else - cdf_mem_set((void *)pSetBssKeyParams, + qdf_mem_set((void *)pSetBssKeyParams, sizeof(tSetBssKeyParams), 0); /* Update the WMA_SET_BSSKEY_REQ parameters */ @@ -861,14 +861,14 @@ void lim_send_set_bss_key_req(tpAniSirGlobal pMac, /* IF the key id is non-zero and encryption type is WEP, Send all the 4 * keys to HAL with filling the key at right index in pSetBssKeyParams->key. */ pSetBssKeyParams->numKeys = SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS; - cdf_mem_copy((uint8_t *) &pSetBssKeyParams-> + qdf_mem_copy((uint8_t *) &pSetBssKeyParams-> key[pMlmSetKeysReq->key[0].keyId], (uint8_t *) &pMlmSetKeysReq->key[0], sizeof(pMlmSetKeysReq->key[0])); } else { pSetBssKeyParams->numKeys = pMlmSetKeysReq->numKeys; - cdf_mem_copy((uint8_t *) &pSetBssKeyParams->key, + qdf_mem_copy((uint8_t *) &pSetBssKeyParams->key, (uint8_t *) &pMlmSetKeysReq->key, sizeof(tSirKeys) * pMlmSetKeysReq->numKeys); } @@ -931,13 +931,13 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, uint32_t val = 0; /* Package WMA_SET_STAKEY_REQ message parameters */ - pSetStaKeyParams = cdf_mem_malloc(sizeof(tSetStaKeyParams)); + pSetStaKeyParams = qdf_mem_malloc(sizeof(tSetStaKeyParams)); if (NULL == pSetStaKeyParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during SET_BSSKEY")); return; } else - cdf_mem_set((void *)pSetStaKeyParams, sizeof(tSetStaKeyParams), + qdf_mem_set((void *)pSetStaKeyParams, sizeof(tSetStaKeyParams), 0); /* Update the WMA_SET_STAKEY_REQ parameters */ @@ -1002,7 +1002,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, uint32_t i; for (i = 0; i < SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS; i++) { - cdf_mem_copy((uint8_t *) &pSetStaKeyParams-> + qdf_mem_copy((uint8_t *) &pSetStaKeyParams-> key[i], (uint8_t *) &pMlmSetKeysReq-> key[i], sizeof(tSirKeys)); @@ -1018,7 +1018,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, /*This case the keys are coming from upper layer so need to fill the * key at the default wep key index and send to the HAL */ if (defWEPIdx < SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS) { - cdf_mem_copy((uint8_t *) &pSetStaKeyParams-> + qdf_mem_copy((uint8_t *) &pSetStaKeyParams-> key[defWEPIdx], (uint8_t *) &pMlmSetKeysReq-> key[0], @@ -1028,7 +1028,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, } else { lim_log(pMac, LOGE, FL("Wrong Key Index %d"), defWEPIdx); - cdf_mem_free(pSetStaKeyParams); + qdf_mem_free(pSetStaKeyParams); return; } } @@ -1039,7 +1039,7 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac, case eSIR_ED_WPI: #endif { - cdf_mem_copy((uint8_t *) &pSetStaKeyParams->key, + qdf_mem_copy((uint8_t *) &pSetStaKeyParams->key, (uint8_t *) &pMlmSetKeysReq->key[0], sizeof(tSirKeys)); } diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index bc12d9a21bde..52220506ebcd 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -163,14 +163,14 @@ void lim_populate_mac_header(tpAniSirGlobal mac_ctx, uint8_t *buf, mac_hdr->fc.subType = sub_type; /* Prepare Address 1 */ - cdf_mem_copy((uint8_t *) mac_hdr->da, + qdf_mem_copy((uint8_t *) mac_hdr->da, (uint8_t *) peer_addr, sizeof(tSirMacAddr)); /* Prepare Address 2 */ sir_copy_mac_addr(mac_hdr->sa, self_mac_addr); /* Prepare Address 3 */ - cdf_mem_copy((uint8_t *) mac_hdr->bssId, + qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) peer_addr, sizeof(tSirMacAddr)); /* Prepare sequence number */ @@ -255,7 +255,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, /* The scheme here is to fill out a 'tDot11fProbeRequest' structure */ /* and then hand it off to 'dot11f_pack_probe_request' (for */ /* serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); + qdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); /* & delegating to assorted helpers: */ populate_dot11f_ssid(mac_ctx, ssid, &pr.SSID); @@ -380,7 +380,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, return eSIR_MEM_ALLOC_FAILED; } /* Paranoia: */ - cdf_mem_set(frame, bytes, 0); + qdf_mem_set(frame, bytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -400,7 +400,7 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, } /* Append any AddIE if present. */ if (addn_ielen) { - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, additional_ie, addn_ielen); payload += addn_ielen; } @@ -456,7 +456,7 @@ tSirRetStatus lim_get_addn_ie_for_probe_resp(tpAniSirGlobal pMac, return eSIR_FAILURE; } - tempbuf = cdf_mem_malloc(left); + tempbuf = qdf_mem_malloc(left); if (NULL == tempbuf) { PELOGE(lim_log(pMac, LOGE, FL @@ -474,23 +474,23 @@ tSirRetStatus lim_get_addn_ie_for_probe_resp(tpAniSirGlobal pMac, FL ("****Invalid IEs eid = %d elem_len=%d left=%d*****"), elem_id, elem_len, left); - cdf_mem_free(tempbuf); + qdf_mem_free(tempbuf); return eSIR_FAILURE; } if (!((SIR_MAC_EID_VENDOR == elem_id) && (memcmp (&ptr[2], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE) == 0))) { - cdf_mem_copy(tempbuf + tempLen, &ptr[0], + qdf_mem_copy(tempbuf + tempLen, &ptr[0], elem_len + 2); tempLen += (elem_len + 2); } left -= elem_len; ptr += (elem_len + 2); } - cdf_mem_copy(addIE, tempbuf, tempLen); + qdf_mem_copy(addIE, tempbuf, tempLen); *addnIELen = tempLen; - cdf_mem_free(tempbuf); + qdf_mem_free(tempbuf); } return eSIR_SUCCESS; } @@ -561,20 +561,20 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, return; } sme_sessionid = pe_session->smeSessionId; - frm = cdf_mem_malloc(sizeof(tDot11fProbeResponse)); + frm = qdf_mem_malloc(sizeof(tDot11fProbeResponse)); if (NULL == frm) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); return; } - cdf_mem_zero(&extracted_ext_cap, sizeof(extracted_ext_cap)); + qdf_mem_zero(&extracted_ext_cap, sizeof(extracted_ext_cap)); /* * Fill out 'frm', after which we'll just hand the struct off to * 'dot11f_pack_probe_response'. */ - cdf_mem_set((uint8_t *) frm, sizeof(tDot11fProbeResponse), 0); + qdf_mem_set((uint8_t *) frm, sizeof(tDot11fProbeResponse), 0); /* * Timestamp to be updated by TFP, below. @@ -720,7 +720,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, if (addn_ie_present) { - add_ie = cdf_mem_malloc( + add_ie = qdf_mem_malloc( pe_session->addIeParams.probeRespDataLen); if (NULL == add_ie) { lim_log(mac_ctx, LOGE, @@ -728,7 +728,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, goto err_ret; } - cdf_mem_copy(add_ie, + qdf_mem_copy(add_ie, pe_session->addIeParams.probeRespData_buff, pe_session->addIeParams.probeRespDataLen); addn_ie_len = pe_session->addIeParams.probeRespDataLen; @@ -775,7 +775,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, goto err_ret; } /* Paranoia: */ - cdf_mem_set(frame, bytes, 0); + qdf_mem_set(frame, bytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -812,13 +812,13 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, mac_ctx->sys.probeRespond++; if (mac_ctx->lim.gpLimRemainOnChanReq) - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, mac_ctx->lim.gpLimRemainOnChanReq->probeRspIe, (mac_ctx->lim.gpLimRemainOnChanReq->length - sizeof(tSirRemainOnChnReq))); if (addn_ie_present) - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, &add_ie[0], addn_ie_len); if (noalen != 0) { @@ -829,7 +829,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, total_noalen); goto err_ret; } else { - cdf_mem_copy(&frame[bytes - (total_noalen)], + qdf_mem_copy(&frame[bytes - (total_noalen)], &noa_ie[0], total_noalen); } } @@ -853,16 +853,16 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Could not send Probe Response.")); if (add_ie != NULL) - cdf_mem_free(add_ie); + qdf_mem_free(add_ie); - cdf_mem_free(frm); + qdf_mem_free(frm); return; err_ret: if (add_ie != NULL) - cdf_mem_free(add_ie); + qdf_mem_free(add_ie); if (frm != NULL) - cdf_mem_free(frm); + qdf_mem_free(frm); if (packet != NULL) cds_packet_free((void *)packet); return; @@ -895,7 +895,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, smeSessionId = psessionEntry->smeSessionId; if (!pAddTS->wmeTspecPresent) { - cdf_mem_set((uint8_t *) &AddTSReq, sizeof(AddTSReq), 0); + qdf_mem_set((uint8_t *) &AddTSReq, sizeof(AddTSReq), 0); AddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ; AddTSReq.DialogToken.token = pAddTS->dialogToken; @@ -952,7 +952,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, " (0x%08x)."), nStatus); } } else { - cdf_mem_set((uint8_t *) &WMMAddTSReq, sizeof(WMMAddTSReq), 0); + qdf_mem_set((uint8_t *) &WMMAddTSReq, sizeof(WMMAddTSReq), 0); WMMAddTSReq.Action.action = SIR_MAC_QOS_ADD_TS_REQ; WMMAddTSReq.DialogToken.token = pAddTS->dialogToken; @@ -1005,7 +1005,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac, return; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -1136,7 +1136,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, sme_session = pe_session->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); limGetQosMode(pe_session, &qos_mode); limGetWmeMode(pe_session, &wme_mode); @@ -1257,7 +1257,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, #endif } - cdf_mem_set((uint8_t *) &beacon_params, sizeof(beacon_params), 0); + qdf_mem_set((uint8_t *) &beacon_params, sizeof(beacon_params), 0); if (LIM_IS_AP_ROLE(pe_session) && (pe_session->gLimProtectionControl != @@ -1305,11 +1305,11 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, /* Nonzero length indicates Assoc rsp IE available */ if (addn_ie_len <= WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN && (bytes + addn_ie_len) <= SIR_MAX_PACKET_SIZE) { - cdf_mem_copy(add_ie, + qdf_mem_copy(add_ie, pe_session->addIeParams.assocRespData_buff, pe_session->addIeParams.assocRespDataLen); - cdf_mem_set((uint8_t *) &extracted_ext_cap, + qdf_mem_set((uint8_t *) &extracted_ext_cap, sizeof(extracted_ext_cap), 0); stripoff_len = addn_ie_len; @@ -1337,7 +1337,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, return; } /* Paranoia: */ - cdf_mem_set(frame, bytes, 0); + qdf_mem_set(frame, bytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -1379,7 +1379,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, lim_print_mac_addr(mac_ctx, mac_hdr->da, LOG1); if (addn_ie_len && addn_ie_len <= WNI_CFG_ASSOC_RSP_ADDNIE_DATA_LEN) - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, &add_ie[0], addn_ie_len); if ((SIR_BAND_5_GHZ == @@ -1438,7 +1438,7 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, smeSessionId = psessionEntry->smeSessionId; if (!wmmTspecPresent) { - cdf_mem_set((uint8_t *) &DelTS, sizeof(DelTS), 0); + qdf_mem_set((uint8_t *) &DelTS, sizeof(DelTS), 0); DelTS.Category.category = SIR_MAC_ACTION_QOS_MGMT; DelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ; @@ -1458,7 +1458,7 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, " (0x%08x)."), nStatus); } } else { - cdf_mem_set((uint8_t *) &WMMDelTS, sizeof(WMMDelTS), 0); + qdf_mem_set((uint8_t *) &WMMDelTS, sizeof(WMMDelTS), 0); WMMDelTS.Category.category = SIR_MAC_ACTION_WME; WMMDelTS.Action.action = SIR_MAC_QOS_DEL_TS_REQ; @@ -1492,7 +1492,7 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac, return; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -1621,16 +1621,16 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, add_ie_len = pe_session->pLimJoinReq->addIEAssoc.length; add_ie = pe_session->pLimJoinReq->addIEAssoc.addIEdata; - frm = cdf_mem_malloc(sizeof(tDot11fAssocRequest)); + frm = qdf_mem_malloc(sizeof(tDot11fAssocRequest)); if (NULL == frm) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); return; } - cdf_mem_set((uint8_t *) frm, sizeof(tDot11fAssocRequest), 0); + qdf_mem_set((uint8_t *) frm, sizeof(tDot11fAssocRequest), 0); if (add_ie_len) { - cdf_mem_set((uint8_t *) &extr_ext_cap, sizeof(tDot11fIEExtCap), + qdf_mem_set((uint8_t *) &extr_ext_cap, sizeof(tDot11fIEExtCap), 0); sir_status = lim_strip_extcap_update_struct(mac_ctx, add_ie, &add_ie_len, &extr_ext_cap); @@ -1881,11 +1881,11 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, (uint32_t *) &assoc_cnf); - cdf_mem_free(frm); + qdf_mem_free(frm); return; } /* Paranoia: */ - cdf_mem_set(frame, bytes, 0); + qdf_mem_set(frame, bytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -1901,7 +1901,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Assoc request pack failure (0x%08x)"), status); cds_packet_free((void *)packet); - cdf_mem_free(frm); + qdf_mem_free(frm); return; } else if (DOT11F_WARNED(status)) { lim_log(mac_ctx, LOGW, @@ -1911,18 +1911,18 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("*** Sending Association Request length %d to "), bytes); if (pe_session->assocReq != NULL) { - cdf_mem_free(pe_session->assocReq); + qdf_mem_free(pe_session->assocReq); pe_session->assocReq = NULL; pe_session->assocReqLen = 0; } if (add_ie_len) { - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, add_ie, add_ie_len); payload += add_ie_len; } - pe_session->assocReq = cdf_mem_malloc(payload); + pe_session->assocReq = qdf_mem_malloc(payload); if (NULL == pe_session->assocReq) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); } else { @@ -1930,7 +1930,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, * Store the Assoc request. This is sent to csr/hdd in * join cnf response. */ - cdf_mem_copy(pe_session->assocReq, + qdf_mem_copy(pe_session->assocReq, frame + sizeof(tSirMacMgmtHdr), payload); pe_session->assocReqLen = payload; } @@ -1965,13 +1965,13 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, FL("Failed to send Association Request (%X)!"), qdf_status); /* Pkt will be freed up by the callback */ - cdf_mem_free(frm); + qdf_mem_free(frm); return; } /* Free up buffer allocated for mlm_assoc_req */ - cdf_mem_free(mlm_assoc_req); + qdf_mem_free(mlm_assoc_req); mlm_assoc_req = NULL; - cdf_mem_free(frm); + qdf_mem_free(frm); return; } @@ -2029,7 +2029,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("called in state (%d)."), pe_session->limMlmState); - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); caps = mlm_reassoc_req->capabilityInfo; #if defined(FEATURE_WLAN_WAPI) @@ -2053,7 +2053,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, * The previous ap bssid is stored in the FT Session * while creating the PE FT Session for reassociation. */ - cdf_mem_copy((uint8_t *)frm.CurrentAPAddress.mac, + qdf_mem_copy((uint8_t *)frm.CurrentAPAddress.mac, pe_session->prev_ap_bssid, sizeof(tSirMacAddr)); populate_dot11f_ssid2(mac_ctx, &frm.SSID); @@ -2286,7 +2286,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, goto end; } /* Paranoia: */ - cdf_mem_set(frame, bytes + ft_ies_length, 0); + qdf_mem_set(frame, bytes + ft_ies_length, 0); lim_print_mac_addr(mac_ctx, pe_session->limReAssocbssId, LOG1); /* Next, we fill out the buffer descriptor: */ @@ -2312,18 +2312,18 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, bytes, payload); if (pe_session->assocReq != NULL) { - cdf_mem_free(pe_session->assocReq); + qdf_mem_free(pe_session->assocReq); pe_session->assocReq = NULL; pe_session->assocReqLen = 0; } if (add_ie_len) { - cdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, add_ie, add_ie_len); payload += add_ie_len; } - pe_session->assocReq = cdf_mem_malloc(payload); + pe_session->assocReq = qdf_mem_malloc(payload); if (NULL == pe_session->assocReq) { lim_log(mac_ctx, LOGE, FL("Failed to alloc memory")); } else { @@ -2331,7 +2331,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, * Store the Assoc request. This is sent to csr/hdd in * join cnf response. */ - cdf_mem_copy(pe_session->assocReq, + qdf_mem_copy(pe_session->assocReq, frame + sizeof(tSirMacMgmtHdr), payload); pe_session->assocReqLen = payload; } @@ -2356,12 +2356,12 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, } if (NULL != pe_session->assocReq) { - cdf_mem_free(pe_session->assocReq); + qdf_mem_free(pe_session->assocReq); pe_session->assocReq = NULL; pe_session->assocReqLen = 0; } if (ft_ies_length) { - pe_session->assocReq = cdf_mem_malloc(ft_ies_length); + pe_session->assocReq = qdf_mem_malloc(ft_ies_length); if (NULL == pe_session->assocReq) { lim_log(mac_ctx, LOGE, FL("Failed to alloc memory for FT IEs")); @@ -2371,7 +2371,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, * Store the FT IEs. This is sent to csr/hdd in * join cnf response. */ - cdf_mem_copy(pe_session->assocReq, + qdf_mem_copy(pe_session->assocReq, ft_sme_context->reassoc_ft_ies, ft_ies_length); pe_session->assocReqLen = ft_ies_length; } @@ -2401,7 +2401,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, end: /* Free up buffer allocated for mlmAssocReq */ - cdf_mem_free(mlm_reassoc_req); + qdf_mem_free(mlm_reassoc_req); pe_session->pLimMlmReassocReq = NULL; } @@ -2413,11 +2413,11 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, tLimMlmReassocCnf mlmReassocCnf; /* keep sme */ tLimMlmReassocReq *pTmpMlmReassocReq = NULL; if (NULL == pTmpMlmReassocReq) { - pTmpMlmReassocReq = cdf_mem_malloc(sizeof(tLimMlmReassocReq)); + pTmpMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); if (NULL == pTmpMlmReassocReq) goto end; - cdf_mem_set(pTmpMlmReassocReq, sizeof(tLimMlmReassocReq), 0); - cdf_mem_copy(pTmpMlmReassocReq, pMlmReassocReq, + qdf_mem_set(pTmpMlmReassocReq, sizeof(tLimMlmReassocReq), 0); + qdf_mem_copy(pTmpMlmReassocReq, pMlmReassocReq, sizeof(tLimMlmReassocReq)); } /* Prepare and send Reassociation request frame */ @@ -2447,11 +2447,11 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, end: /* Free up buffer allocated for reassocReq */ if (pMlmReassocReq != NULL) { - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); pMlmReassocReq = NULL; } if (pTmpMlmReassocReq != NULL) { - cdf_mem_free(pTmpMlmReassocReq); + qdf_mem_free(pTmpMlmReassocReq); pTmpMlmReassocReq = NULL; } mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; @@ -2500,7 +2500,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, nAddIELen = psessionEntry->pLimReAssocReq->addIEAssoc.length; pAddIE = psessionEntry->pLimReAssocReq->addIEAssoc.addIEdata; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); caps = pMlmReassocReq->capabilityInfo; #if defined(FEATURE_WLAN_WAPI) @@ -2517,7 +2517,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, frm.ListenInterval.interval = pMlmReassocReq->listenInterval; - cdf_mem_copy((uint8_t *) frm.CurrentAPAddress.mac, + qdf_mem_copy((uint8_t *) frm.CurrentAPAddress.mac, (uint8_t *) psessionEntry->bssId, 6); populate_dot11f_ssid2(pMac, &frm.SSID); @@ -2654,7 +2654,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, goto end; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -2684,23 +2684,23 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, ) if (psessionEntry->assocReq != NULL) { - cdf_mem_free(psessionEntry->assocReq); + qdf_mem_free(psessionEntry->assocReq); psessionEntry->assocReq = NULL; psessionEntry->assocReqLen = 0; } if (nAddIELen) { - cdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, + qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, pAddIE, nAddIELen); nPayload += nAddIELen; } - psessionEntry->assocReq = cdf_mem_malloc(nPayload); + psessionEntry->assocReq = qdf_mem_malloc(nPayload); if (NULL == psessionEntry->assocReq) { lim_log(pMac, LOGE, FL("Unable to allocate mem for assoc req")); } else { /* Store the Assoc request. This is sent to csr/hdd in join cnf response. */ - cdf_mem_copy(psessionEntry->assocReq, + qdf_mem_copy(psessionEntry->assocReq, pFrame + sizeof(tSirMacMgmtHdr), nPayload); psessionEntry->assocReqLen = nPayload; } @@ -2739,7 +2739,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, end: /* Free up buffer allocated for mlmAssocReq */ - cdf_mem_free(pMlmReassocReq); + qdf_mem_free(pMlmReassocReq); psessionEntry->pLimMlmReassocReq = NULL; } /* lim_send_reassoc_req_mgmt_frame */ @@ -2910,7 +2910,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, return; } - cdf_mem_zero(frame, frame_len); + qdf_mem_zero(frame, frame_len); /* Prepare BD */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -2921,7 +2921,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, /* Prepare BSSId */ if (LIM_IS_AP_ROLE(session) || LIM_IS_BT_AMP_AP_ROLE(session)) - cdf_mem_copy((uint8_t *) mac_hdr->bssId, + qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) session->bssId, sizeof(tSirMacAddr)); @@ -2929,7 +2929,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, body = frame + sizeof(tSirMacMgmtHdr); if (wep_bit == LIM_WEP_IN_FC) { - cdf_mem_copy(body, (uint8_t *) auth_frame, body_len); + qdf_mem_copy(body, (uint8_t *) auth_frame, body_len); lim_log(mac_ctx, LOG1, FL("*** Sending Auth seq# 3 status %d (%d) to" @@ -2957,7 +2957,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, if (body_len <= (sizeof(auth_frame->type) + sizeof(auth_frame->length) + sizeof(auth_frame->challengeText))) - cdf_mem_copy(body, (uint8_t *) &auth_frame->type, + qdf_mem_copy(body, (uint8_t *) &auth_frame->type, body_len); #if defined WLAN_FEATURE_VOWIFI_11R @@ -2967,7 +2967,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, (session->ftPEContext.pFTPreAuthReq != NULL)) { if (ft_ies_length > 0) { - cdf_mem_copy(body, + qdf_mem_copy(body, session->ftPEContext. pFTPreAuthReq->ft_ies, ft_ies_length); @@ -2983,7 +2983,7 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, body++; *body = SIR_MDIE_SIZE; body++; - cdf_mem_copy(body, + qdf_mem_copy(body, &session->ftPEContext.pFTPreAuthReq-> pbssDescription->mdie[0], SIR_MDIE_SIZE); @@ -3106,7 +3106,7 @@ QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) } #endif /* / Free up buffer allocated for mlmDeauthReq */ - cdf_mem_free(pMlmDeauthReq); + qdf_mem_free(pMlmDeauthReq); pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL; } return QDF_STATUS_SUCCESS; @@ -3119,7 +3119,7 @@ end: /* Free up buffer allocated */ /* for mlmDeauthReq */ - cdf_mem_free(pMlmDeauthReq); + qdf_mem_free(pMlmDeauthReq); lim_post_sme_message(pMac, LIM_MLM_DEAUTH_CNF, (uint32_t *) &mlmDeauthCnf); @@ -3213,14 +3213,14 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) } #endif /* Free up buffer allocated for mlmDisassocReq */ - cdf_mem_free(disassoc_req); + qdf_mem_free(disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; return QDF_STATUS_SUCCESS; } else { return QDF_STATUS_SUCCESS; } end: - cdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, + qdf_mem_copy((uint8_t *) &disassoc_cnf.peerMacAddr, (uint8_t *) disassoc_req->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE); disassoc_cnf.aid = disassoc_req->aid; @@ -3231,7 +3231,7 @@ end: if (disassoc_req != NULL) { /* / Free up buffer allocated for mlmDisassocReq */ - cdf_mem_free(disassoc_req); + qdf_mem_free(disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; } @@ -3300,7 +3300,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, } smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Reason.code = nReason; @@ -3327,7 +3327,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac, return; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -3479,7 +3479,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, } smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Reason.code = nReason; @@ -3506,7 +3506,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac, return; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -3660,7 +3660,7 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, void *pPacket; QDF_STATUS qdf_status; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT; frm.Action.action = SIR_MAC_ACTION_MEASURE_REPORT_ID; @@ -3717,14 +3717,14 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer); pMacHdr = (tpSirMacMgmtHdr) pFrame; - cdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W lim_set_protected_bit(pMac, psessionEntry, peer, pMacHdr); @@ -3790,7 +3790,7 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, void *pPacket; QDF_STATUS qdf_status; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT; frm.Action.action = SIR_MAC_ACTION_TPC_REQUEST_ID; @@ -3821,14 +3821,14 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac, return; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer); pMacHdr = (tpSirMacMgmtHdr) pFrame; - cdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W lim_set_protected_bit(pMac, psessionEntry, peer, pMacHdr); @@ -3893,7 +3893,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, void *pPacket; QDF_STATUS qdf_status; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT; frm.Action.action = SIR_MAC_ACTION_TPC_REPORT_ID; @@ -3927,7 +3927,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -3935,7 +3935,7 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac, pMacHdr = (tpSirMacMgmtHdr) pFrame; - cdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(pMacHdr->bssId, psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W lim_set_protected_bit(pMac, psessionEntry, peer, pMacHdr); @@ -4021,7 +4021,7 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, } smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SPECTRUM_MGMT; frm.Action.action = SIR_MAC_ACTION_CHANNEL_SWITCH_ID; @@ -4054,14 +4054,14 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer, psessionEntry->selfMacAddr); pMacHdr = (tpSirMacMgmtHdr) pFrame; - cdf_mem_copy((uint8_t *) pMacHdr->bssId, + qdf_mem_copy((uint8_t *) pMacHdr->bssId, (uint8_t *) psessionEntry->bssId, sizeof(tSirMacAddr)); #ifdef WLAN_FEATURE_11W @@ -4146,7 +4146,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, sme_session_id = session_entry->smeSessionId; - cdf_mem_set(&frm, sizeof(frm), 0); + qdf_mem_set(&frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_PUBLIC_USAGE; frm.Action.action = SIR_MAC_ACTION_EXT_CHANNEL_SWITCH_ID; @@ -4184,13 +4184,13 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, } /* Paranoia*/ - cdf_mem_set(frame, num_bytes, 0); + qdf_mem_set(frame, num_bytes, 0); /* Next, we fill out the buffer descriptor */ lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, SIR_MAC_MGMT_ACTION, peer, session_entry->selfMacAddr); mac_hdr = (tpSirMacMgmtHdr) frame; - cdf_mem_copy((uint8_t *) mac_hdr->bssId, + qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) session_entry->bssId, sizeof(tSirMacAddr)); @@ -4264,7 +4264,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, } smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_VHT; frm.Action.action = SIR_MAC_VHT_OPMODE_NOTIFICATION; @@ -4297,7 +4297,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Next, we fill out the buffer descriptor: */ if (psessionEntry->pePersona == QDF_SAP_MODE) @@ -4309,7 +4309,7 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, SIR_MAC_MGMT_ACTION, psessionEntry->bssId, psessionEntry->selfMacAddr); pMacHdr = (tpSirMacMgmtHdr) pFrame; - cdf_mem_copy((uint8_t *) pMacHdr->bssId, + qdf_mem_copy((uint8_t *) pMacHdr->bssId, (uint8_t *) psessionEntry->bssId, sizeof(tSirMacAddr)); nStatus = dot11f_pack_operating_mode(pMac, &frm, pFrame + sizeof(tSirMacMgmtHdr), @@ -4393,7 +4393,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_RRM; frm.Action.action = SIR_MAC_RRM_NEIGHBOR_REQ; @@ -4429,7 +4429,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Copy necessary info to BD */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -4543,7 +4543,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_RRM; frm.Action.action = SIR_MAC_RRM_LINK_MEASUREMENT_RPT; @@ -4588,7 +4588,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Copy necessary info to BD */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -4701,7 +4701,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, uint8_t smeSessionId = 0; tDot11fRadioMeasurementReport *frm = - cdf_mem_malloc(sizeof(tDot11fRadioMeasurementReport)); + qdf_mem_malloc(sizeof(tDot11fRadioMeasurementReport)); if (!frm) { lim_log(pMac, LOGE, FL @@ -4713,10 +4713,10 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL ("(psession == NULL) in Request to send Beacon Report action frame")); - cdf_mem_free(frm); + qdf_mem_free(frm); return eSIR_FAILURE; } - cdf_mem_set((uint8_t *) frm, sizeof(*frm), 0); + qdf_mem_set((uint8_t *) frm, sizeof(*frm), 0); frm->Category.category = SIR_MAC_ACTION_RRM; frm->Action.action = SIR_MAC_RRM_RADIO_MEASURE_RPT; @@ -4761,7 +4761,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, nStatus); /* We'll fall back on the worst case scenario: */ nPayload = sizeof(tDot11fLinkMeasurementReport); - cdf_mem_free(frm); + qdf_mem_free(frm); return eSIR_FAILURE; } else if (DOT11F_WARNED(nStatus)) { lim_log(pMac, LOGW, FL("There were warnings while calculating " @@ -4778,11 +4778,11 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, lim_log(pMac, LOGP, FL("Failed to allocate %d bytes for a Radio Measure " "Report."), nBytes); - cdf_mem_free(frm); + qdf_mem_free(frm); return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Copy necessary info to BD */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -4846,15 +4846,15 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac, ) statusCode = eSIR_FAILURE; /* Pkt will be freed up by the callback */ - cdf_mem_free(frm); + qdf_mem_free(frm); return statusCode; } else { - cdf_mem_free(frm); + qdf_mem_free(frm); return eSIR_SUCCESS; } returnAfterError: - cdf_mem_free(frm); + qdf_mem_free(frm); cds_packet_free((void *)pPacket); return statusCode; } @@ -4895,14 +4895,14 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran uint8_t txFlag = 0; uint8_t smeSessionId = 0; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SA_QUERY; /* 11w action field is : action: 0 --> SA Query Request action frame action: 1 --> SA Query Response action frame */ frm.Action.action = SIR_MAC_SA_QUERY_REQ; /* 11w SA Query Request transId */ - cdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2); + qdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2); nStatus = dot11f_get_packed_sa_query_req_size(pMac, &frm, &nPayload); if (DOT11F_FAILED(nStatus)) { @@ -4927,7 +4927,7 @@ tSirRetStatus lim_send_sa_query_request_frame(tpAniSirGlobal pMac, uint8_t *tran return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Copy necessary info to BD */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, @@ -5036,7 +5036,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, smeSessionId = psessionEntry->smeSessionId; - cdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); frm.Category.category = SIR_MAC_ACTION_SA_QUERY; /*11w action field is : action: 0 --> SA query request action frame @@ -5044,7 +5044,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, frm.Action.action = SIR_MAC_SA_QUERY_RSP; /*11w SA query response transId is same as SA query request transId */ - cdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2); + qdf_mem_copy(&frm.TransactionId.transId[0], &transId[0], 2); nStatus = dot11f_get_packed_sa_query_rsp_size(pMac, &frm, &nPayload); if (DOT11F_FAILED(nStatus)) { @@ -5069,7 +5069,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Paranoia: */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); /* Copy necessary info to BD */ lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 05ad92f3aa01..ad53515619b5 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -99,14 +99,14 @@ tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pCFParams = cdf_mem_malloc(sizeof(tUpdateCFParams)); + pCFParams = qdf_mem_malloc(sizeof(tUpdateCFParams)); if (NULL == pCFParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update CF Params")); retCode = eSIR_MEM_ALLOC_FAILED; goto returnFailure; } - cdf_mem_set((uint8_t *) pCFParams, sizeof(tUpdateCFParams), 0); + qdf_mem_set((uint8_t *) pCFParams, sizeof(tUpdateCFParams), 0); pCFParams->cfpCount = cfpCount; pCFParams->cfpPeriod = cfpPeriod; pCFParams->bssIdx = bssIdx; @@ -119,7 +119,7 @@ tSirRetStatus lim_send_cf_params(tpAniSirGlobal pMac, uint8_t bssIdx, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pCFParams); + qdf_mem_free(pCFParams); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_CF_IND failed, reason=%X"), retCode); @@ -148,13 +148,13 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pBcnParams = cdf_mem_malloc(sizeof(*pBcnParams)); + pBcnParams = qdf_mem_malloc(sizeof(*pBcnParams)); if (NULL == pBcnParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update Beacon Params")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((uint8_t *) pBcnParams, pUpdatedBcnParams, + qdf_mem_copy((uint8_t *) pBcnParams, pUpdatedBcnParams, sizeof(*pBcnParams)); msgQ.type = WMA_UPDATE_BEACON_IND; msgQ.reserved = 0; @@ -164,7 +164,7 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac, FL("Sending WMA_UPDATE_BEACON_IND, paramChangeBitmap in hex = %x"), pUpdatedBcnParams->paramChangeBitmap);) if (NULL == psessionEntry) { - cdf_mem_free(pBcnParams); + qdf_mem_free(pBcnParams); MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); return eSIR_FAILURE; } else { @@ -175,7 +175,7 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac, pBcnParams->smeSessionId = psessionEntry->smeSessionId; retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pBcnParams); + qdf_mem_free(pBcnParams); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_BEACON_IND, reason=%X"), retCode); @@ -235,25 +235,25 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, peSessionId); return eSIR_FAILURE; } - pChnlParams = cdf_mem_malloc(sizeof(tSwitchChannelParams)); + pChnlParams = qdf_mem_malloc(sizeof(tSwitchChannelParams)); if (NULL == pChnlParams) { lim_log(pMac, LOGP, FL( "Unable to allocate memory for Switch Ch Params")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pChnlParams, sizeof(tSwitchChannelParams), 0); + qdf_mem_set((uint8_t *) pChnlParams, sizeof(tSwitchChannelParams), 0); pChnlParams->channelNumber = chnlNumber; pChnlParams->ch_center_freq_seg0 = ch_center_freq_seg0; pChnlParams->ch_center_freq_seg1 = ch_center_freq_seg1; pChnlParams->ch_width = ch_width; - cdf_mem_copy(pChnlParams->selfStaMacAddr, pSessionEntry->selfMacAddr, + qdf_mem_copy(pChnlParams->selfStaMacAddr, pSessionEntry->selfMacAddr, sizeof(tSirMacAddr)); #if defined WLAN_FEATURE_VOWIFI pChnlParams->maxTxPower = maxTxPower; #else pChnlParams->localPowerConstraint = localPwrConstraint; #endif - cdf_mem_copy(pChnlParams->bssId, pSessionEntry->bssId, + qdf_mem_copy(pChnlParams->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr)); pChnlParams->peSessionId = peSessionId; pChnlParams->vhtCapable = pSessionEntry->vhtCapability; @@ -291,7 +291,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, #endif MTRACE(mac_trace_msg_tx(pMac, peSessionId, msgQ.type)); if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msgQ)) { - cdf_mem_free(pChnlParams); + qdf_mem_free(pChnlParams); lim_log(pMac, LOGP, FL( "Posting CH_SWITCH_REQ to WMA failed")); return eSIR_FAILURE; @@ -329,7 +329,7 @@ tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac, tSirMsgQ msgQ; uint8_t i; - pEdcaParams = cdf_mem_malloc(sizeof(tEdcaParams)); + pEdcaParams = qdf_mem_malloc(sizeof(tEdcaParams)); if (NULL == pEdcaParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update EDCA Params")); @@ -359,7 +359,7 @@ tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pEdcaParams); + qdf_mem_free(pEdcaParams); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_EDCA_PROFILE_IND failed, reason=%X"), retCode); @@ -493,7 +493,7 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, tSirRetStatus retCode; tpLinkStateParams pLinkStateParams = NULL; /* Allocate memory. */ - pLinkStateParams = cdf_mem_malloc(sizeof(tLinkStateParams)); + pLinkStateParams = qdf_mem_malloc(sizeof(tLinkStateParams)); if (NULL == pLinkStateParams) { lim_log(pMac, LOGP, FL @@ -501,7 +501,7 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, retCode = eSIR_MEM_ALLOC_FAILED; return retCode; } - cdf_mem_set((uint8_t *) pLinkStateParams, sizeof(tLinkStateParams), 0); + qdf_mem_set((uint8_t *) pLinkStateParams, sizeof(tLinkStateParams), 0); pLinkStateParams->state = state; pLinkStateParams->callback = callback; pLinkStateParams->callbackArg = callbackArg; @@ -519,7 +519,7 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, retCode = (uint32_t) wma_post_ctrl_msg(pMac, &msgQ); if (retCode != eSIR_SUCCESS) { - cdf_mem_free(pLinkStateParams); + qdf_mem_free(pLinkStateParams); lim_log(pMac, LOGP, FL("Posting link state %d failed, reason = %x "), state, retCode); @@ -537,7 +537,7 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState tSirRetStatus retCode; tpLinkStateParams pLinkStateParams = NULL; /* Allocate memory. */ - pLinkStateParams = cdf_mem_malloc(sizeof(tLinkStateParams)); + pLinkStateParams = qdf_mem_malloc(sizeof(tLinkStateParams)); if (NULL == pLinkStateParams) { lim_log(pMac, LOGP, FL @@ -545,7 +545,7 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState retCode = eSIR_MEM_ALLOC_FAILED; return retCode; } - cdf_mem_set((uint8_t *) pLinkStateParams, sizeof(tLinkStateParams), 0); + qdf_mem_set((uint8_t *) pLinkStateParams, sizeof(tLinkStateParams), 0); pLinkStateParams->state = state; /* Copy Mac address */ sir_copy_mac_addr(pLinkStateParams->bssid, bssId); @@ -566,7 +566,7 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState retCode = (uint32_t) wma_post_ctrl_msg(pMac, &msgQ); if (retCode != eSIR_SUCCESS) { - cdf_mem_free(pLinkStateParams); + qdf_mem_free(pLinkStateParams); lim_log(pMac, LOGP, FL("Posting link state %d failed, reason = %x "), state, retCode); @@ -598,14 +598,14 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac, return retCode; } msgSize = sizeof(tBeaconFilterMsg) + sizeof(beacon_filter_table); - pBeaconFilterMsg = cdf_mem_malloc(msgSize); + pBeaconFilterMsg = qdf_mem_malloc(msgSize); if (NULL == pBeaconFilterMsg) { lim_log(pMac, LOGP, FL("Fail to allocate memory for beaconFiilterMsg ")); retCode = eSIR_MEM_ALLOC_FAILED; return retCode; } - cdf_mem_set((uint8_t *) pBeaconFilterMsg, msgSize, 0); + qdf_mem_set((uint8_t *) pBeaconFilterMsg, msgSize, 0); /* Fill in capability Info and mask */ /* Don't send this message if no active Infra session is found. */ pBeaconFilterMsg->capabilityInfo = psessionEntry->limCurrentBssCaps; @@ -638,7 +638,7 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac, MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pBeaconFilterMsg); + qdf_mem_free(pBeaconFilterMsg); lim_log(pMac, LOGP, FL("Posting WMA_BEACON_FILTER_IND failed, reason=%X"), retCode); @@ -656,13 +656,13 @@ tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pVhtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); + pVhtOpMode = qdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pVhtOpMode) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update Op Mode")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((uint8_t *) pVhtOpMode, pTempParam, + qdf_mem_copy((uint8_t *) pVhtOpMode, pTempParam, sizeof(tUpdateVHTOpMode)); msgQ.type = WMA_UPDATE_OP_MODE; msgQ.reserved = 0; @@ -679,7 +679,7 @@ tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pVhtOpMode); + qdf_mem_free(pVhtOpMode); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_OP_MODE failed, reason=%X"), retCode); @@ -696,13 +696,13 @@ tSirRetStatus lim_send_rx_nss_update(tpAniSirGlobal pMac, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pRxNss = cdf_mem_malloc(sizeof(tUpdateRxNss)); + pRxNss = qdf_mem_malloc(sizeof(tUpdateRxNss)); if (NULL == pRxNss) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update Rx Nss")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((uint8_t *) pRxNss, pTempParam, sizeof(tUpdateRxNss)); + qdf_mem_copy((uint8_t *) pRxNss, pTempParam, sizeof(tUpdateRxNss)); msgQ.type = WMA_UPDATE_RX_NSS; msgQ.reserved = 0; msgQ.bodyptr = pRxNss; @@ -716,7 +716,7 @@ tSirRetStatus lim_send_rx_nss_update(tpAniSirGlobal pMac, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pRxNss); + qdf_mem_free(pRxNss); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_RX_NSS failed, reason=%X"), retCode); @@ -733,13 +733,13 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pMembership = cdf_mem_malloc(sizeof(tUpdateMembership)); + pMembership = qdf_mem_malloc(sizeof(tUpdateMembership)); if (NULL == pMembership) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update Membership Mode")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((uint8_t *) pMembership, pTempParam, + qdf_mem_copy((uint8_t *) pMembership, pTempParam, sizeof(tUpdateMembership)); msgQ.type = WMA_UPDATE_MEMBERSHIP; @@ -755,7 +755,7 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pMembership); + qdf_mem_free(pMembership); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_MEMBERSHIP failed, reason=%X"), retCode); @@ -772,13 +772,13 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac, tSirRetStatus retCode = eSIR_SUCCESS; tSirMsgQ msgQ; - pUserPos = cdf_mem_malloc(sizeof(tUpdateUserPos)); + pUserPos = qdf_mem_malloc(sizeof(tUpdateUserPos)); if (NULL == pUserPos) { lim_log(pMac, LOGP, FL("Unable to allocate memory during Update User Position")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((uint8_t *) pUserPos, pTempParam, sizeof(tUpdateUserPos)); + qdf_mem_copy((uint8_t *) pUserPos, pTempParam, sizeof(tUpdateUserPos)); msgQ.type = WMA_UPDATE_USERPOS; msgQ.reserved = 0; @@ -793,7 +793,7 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pUserPos); + qdf_mem_free(pUserPos); lim_log(pMac, LOGP, FL("Posting WMA_UPDATE_USERPOS failed, reason=%X"), retCode); @@ -825,7 +825,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, tSirWlanExcludeUnencryptParam *pExcludeUnencryptParam; pExcludeUnencryptParam = - cdf_mem_malloc(sizeof(tSirWlanExcludeUnencryptParam)); + qdf_mem_malloc(sizeof(tSirWlanExcludeUnencryptParam)); if (NULL == pExcludeUnencryptParam) { lim_log(pMac, LOGP, FL("Unable to allocate memory during lim_send_exclude_unencrypt_ind")); @@ -833,7 +833,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, } pExcludeUnencryptParam->excludeUnencrypt = excludeUnenc; - cdf_mem_copy(pExcludeUnencryptParam->bssid.bytes, psessionEntry->bssId, + qdf_mem_copy(pExcludeUnencryptParam->bssid.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); msgQ.type = WMA_EXCLUDE_UNENCRYPTED_IND; @@ -844,7 +844,7 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { - cdf_mem_free(pExcludeUnencryptParam); + qdf_mem_free(pExcludeUnencryptParam); lim_log(pMac, LOGP, FL("Posting WMA_EXCLUDE_UNENCRYPTED_IND failed, reason=%X"), retCode); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 49248017322c..358016afc01c 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -88,7 +88,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, lim_log(mac_ctx, LOG1, FL("Sending message %s with reasonCode %s"), lim_msg_str(msg_type), lim_result_code_str(result_code)); - sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp)); + sme_rsp = qdf_mem_malloc(sizeof(tSirSmeRsp)); if (NULL == sme_rsp) { /* Buffer not available. Log error */ QDF_TRACE(QDF_MODULE_ID_PE, LOGP, @@ -147,7 +147,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, lim_msg_str(msg_type), lim_result_code_str(result_code), scan_id); - sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp)); + sme_rsp = qdf_mem_malloc(sizeof(struct sir_roc_rsp)); if (NULL == sme_rsp) { QDF_TRACE(QDF_MODULE_ID_PE, LOGP, FL("call to AllocateMemory failed for eWNI_SME_*_RSP")); @@ -266,10 +266,10 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, if (result_code == eSIR_SME_SUCCESS) { if (session_entry->beacon != NULL) { sme_join_rsp->beaconLength = session_entry->bcnLen; - cdf_mem_copy(sme_join_rsp->frames, + qdf_mem_copy(sme_join_rsp->frames, session_entry->beacon, sme_join_rsp->beaconLength); - cdf_mem_free(session_entry->beacon); + qdf_mem_free(session_entry->beacon); session_entry->beacon = NULL; session_entry->bcnLen = 0; lim_log(mac_ctx, LOG1, FL("Beacon=%d"), @@ -278,11 +278,11 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, if (session_entry->assocReq != NULL) { sme_join_rsp->assocReqLength = session_entry->assocReqLen; - cdf_mem_copy(sme_join_rsp->frames + + qdf_mem_copy(sme_join_rsp->frames + sme_join_rsp->beaconLength, session_entry->assocReq, sme_join_rsp->assocReqLength); - cdf_mem_free(session_entry->assocReq); + qdf_mem_free(session_entry->assocReq); session_entry->assocReq = NULL; session_entry->assocReqLen = 0; lim_log(mac_ctx, @@ -292,12 +292,12 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, if (session_entry->assocRsp != NULL) { sme_join_rsp->assocRspLength = session_entry->assocRspLen; - cdf_mem_copy(sme_join_rsp->frames + + qdf_mem_copy(sme_join_rsp->frames + sme_join_rsp->beaconLength + sme_join_rsp->assocReqLength, session_entry->assocRsp, sme_join_rsp->assocRspLength); - cdf_mem_free(session_entry->assocRsp); + qdf_mem_free(session_entry->assocRsp); session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } @@ -305,13 +305,13 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, if (session_entry->ricData != NULL) { sme_join_rsp->parsedRicRspLen = session_entry->RICDataLen; - cdf_mem_copy(sme_join_rsp->frames + + qdf_mem_copy(sme_join_rsp->frames + sme_join_rsp->beaconLength + sme_join_rsp->assocReqLength + sme_join_rsp->assocRspLength, session_entry->ricData, sme_join_rsp->parsedRicRspLen); - cdf_mem_free(session_entry->ricData); + qdf_mem_free(session_entry->ricData); session_entry->ricData = NULL; session_entry->RICDataLen = 0; lim_log(mac_ctx, LOG1, FL("RicLength=%d"), @@ -322,14 +322,14 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, if (session_entry->tspecIes != NULL) { sme_join_rsp->tspecIeLen = session_entry->tspecLen; - cdf_mem_copy(sme_join_rsp->frames + + qdf_mem_copy(sme_join_rsp->frames + sme_join_rsp->beaconLength + sme_join_rsp->assocReqLength + sme_join_rsp->assocRspLength + sme_join_rsp->parsedRicRspLen, session_entry->tspecIes, sme_join_rsp->tspecIeLen); - cdf_mem_free(session_entry->tspecIes); + qdf_mem_free(session_entry->tspecIes); session_entry->tspecIes = NULL; session_entry->tspecLen = 0; lim_log(mac_ctx, LOG1, FL("ESE-TspecLen=%d"), @@ -365,30 +365,30 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, #endif } else { if (session_entry->beacon != NULL) { - cdf_mem_free(session_entry->beacon); + qdf_mem_free(session_entry->beacon); session_entry->beacon = NULL; session_entry->bcnLen = 0; } if (session_entry->assocReq != NULL) { - cdf_mem_free(session_entry->assocReq); + qdf_mem_free(session_entry->assocReq); session_entry->assocReq = NULL; session_entry->assocReqLen = 0; } if (session_entry->assocRsp != NULL) { - cdf_mem_free(session_entry->assocRsp); + qdf_mem_free(session_entry->assocRsp); session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } #ifdef WLAN_FEATURE_VOWIFI_11R if (session_entry->ricData != NULL) { - cdf_mem_free(session_entry->ricData); + qdf_mem_free(session_entry->ricData); session_entry->ricData = NULL; session_entry->RICDataLen = 0; } #endif #ifdef FEATURE_WLAN_ESE if (session_entry->tspecIes != NULL) { - cdf_mem_free(session_entry->tspecIes); + qdf_mem_free(session_entry->tspecIes); session_entry->tspecIes = NULL; session_entry->tspecLen = 0; } @@ -436,14 +436,14 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, if (session_entry == NULL) { rsp_len = sizeof(tSirSmeJoinRsp); - sme_join_rsp = cdf_mem_malloc(rsp_len); + sme_join_rsp = qdf_mem_malloc(rsp_len); if (NULL == sme_join_rsp) { lim_log(mac_ctx, LOGP, FL("Mem Alloc fail - JOIN/REASSOC_RSP")); return; } - cdf_mem_set((uint8_t *) sme_join_rsp, rsp_len, 0); + qdf_mem_set((uint8_t *) sme_join_rsp, rsp_len, 0); sme_join_rsp->beaconLength = 0; sme_join_rsp->assocReqLength = 0; sme_join_rsp->assocRspLength = 0; @@ -457,13 +457,13 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, session_entry->tspecLen + #endif sizeof(tSirSmeJoinRsp) - sizeof(uint8_t); - sme_join_rsp = cdf_mem_malloc(rsp_len); + sme_join_rsp = qdf_mem_malloc(rsp_len); if (NULL == sme_join_rsp) { lim_log(mac_ctx, LOGP, FL("MemAlloc fail - JOIN/REASSOC_RSP")); return; } - cdf_mem_set((uint8_t *) sme_join_rsp, rsp_len, 0); + qdf_mem_set((uint8_t *) sme_join_rsp, rsp_len, 0); if (result_code == eSIR_SME_SUCCESS) { sta_ds = dph_get_hash_entry(mac_ctx, DPH_STA_HASH_INDEX_PEER, @@ -562,7 +562,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, size = sizeof(tSirSmeStartBssRsp); if (psessionEntry == NULL) { - pSirSmeRsp = cdf_mem_malloc(size); + pSirSmeRsp = qdf_mem_malloc(size); if (NULL == pSirSmeRsp) { /* / Buffer not available. Log error */ lim_log(pMac, LOGP, @@ -570,7 +570,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, ("call to AllocateMemory failed for eWNI_SME_START_BSS_RSP")); return; } - cdf_mem_set((uint8_t *) pSirSmeRsp, size, 0); + qdf_mem_set((uint8_t *) pSirSmeRsp, size, 0); } else { /* subtract size of beaconLength + Mac Hdr + Fixed Fields before SSID */ @@ -580,7 +580,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, /* calculate the memory size to allocate */ size += ieLen; - pSirSmeRsp = cdf_mem_malloc(size); + pSirSmeRsp = qdf_mem_malloc(size); if (NULL == pSirSmeRsp) { /* / Buffer not available. Log error */ lim_log(pMac, LOGP, @@ -589,7 +589,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, return; } - cdf_mem_set((uint8_t *) pSirSmeRsp, size, 0); + qdf_mem_set((uint8_t *) pSirSmeRsp, size, 0); size = sizeof(tSirSmeStartBssRsp); if (resultCode == eSIR_SME_SUCCESS) { @@ -618,12 +618,12 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, psessionEntry->currentOperChannel; curLen = psessionEntry->schBeaconOffsetBegin - ieOffset; - cdf_mem_copy((uint8_t *) &pSirSmeRsp->bssDescription. + qdf_mem_copy((uint8_t *) &pSirSmeRsp->bssDescription. ieFields, psessionEntry->pSchBeaconFrameBegin + ieOffset, (uint32_t) curLen); - cdf_mem_copy(((uint8_t *) &pSirSmeRsp->bssDescription. + qdf_mem_copy(((uint8_t *) &pSirSmeRsp->bssDescription. ieFields) + curLen, psessionEntry->pSchBeaconFrameEnd, (uint32_t) psessionEntry-> @@ -747,13 +747,13 @@ lim_post_sme_scan_rsp_message(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("send SME_SCAN_RSP (reasonCode %s)."), lim_result_code_str(resultCode)); - pSirSmeScanRsp = cdf_mem_malloc(sizeof(tSirSmeScanRsp)); + pSirSmeScanRsp = qdf_mem_malloc(sizeof(tSirSmeScanRsp)); if (NULL == pSirSmeScanRsp) { lim_log(pMac, LOGP, FL("AllocateMemory failed for eWNI_SME_SCAN_RSP")); return; } - cdf_mem_set((void *)pSirSmeScanRsp, sizeof(tSirSmeScanRsp), 0); + qdf_mem_set((void *)pSirSmeScanRsp, sizeof(tSirSmeScanRsp), 0); pSirSmeScanRsp->messageType = eWNI_SME_SCAN_RSP; pSirSmeScanRsp->statusCode = resultCode; @@ -820,7 +820,7 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, msgLength = sizeof(tSirOemDataRsp); /* now allocate memory for the char buffer */ - pSirSmeOemDataRsp = cdf_mem_malloc(msgLength); + pSirSmeOemDataRsp = qdf_mem_malloc(msgLength); if (NULL == pSirSmeOemDataRsp) { lim_log(pMac, LOGP, FL @@ -836,11 +836,11 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, pSirSmeOemDataRsp->messageType = eWNI_SME_OEM_DATA_RSP; #endif pSirSmeOemDataRsp->target_rsp = pMlmOemDataRsp->target_rsp; - cdf_mem_copy(pSirSmeOemDataRsp->oemDataRsp, pMlmOemDataRsp->oemDataRsp, + qdf_mem_copy(pSirSmeOemDataRsp->oemDataRsp, pMlmOemDataRsp->oemDataRsp, OEM_DATA_RSP_SIZE); /* Now free the memory from MLM Rsp Message */ - cdf_mem_free(pMlmOemDataRsp); + qdf_mem_free(pMlmOemDataRsp); mmhMsg.type = eWNI_SME_OEM_DATA_RSP; mmhMsg.bodyptr = pSirSmeOemDataRsp; @@ -928,7 +928,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac, * host triggered disassociation */ - pSirSmeDisassocRsp = cdf_mem_malloc(sizeof(tSirSmeDisassocRsp)); + pSirSmeDisassocRsp = qdf_mem_malloc(sizeof(tSirSmeDisassocRsp)); if (NULL == pSirSmeDisassocRsp) { /* Log error */ lim_log(pMac, LOGP, FL("Memory allocation failed")); @@ -954,7 +954,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac, pBuf += sizeof(tSirResultCodes); /* peerMacAddr */ - cdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); /* Clear Station Stats */ @@ -974,7 +974,7 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac, * frame reception from peer entity or due to * loss of link with peer entity. */ - pSirSmeDisassocInd = cdf_mem_malloc(sizeof(tSirSmeDisassocInd)); + pSirSmeDisassocInd = qdf_mem_malloc(sizeof(tSirSmeDisassocInd)); if (NULL == pSirSmeDisassocInd) { /* Log error */ lim_log(pMac, LOGP, FL("Memory allocation failed")); @@ -996,10 +996,10 @@ lim_send_sme_disassoc_ntf(tpAniSirGlobal pMac, lim_copy_u32(pBuf, reasonCode); pBuf += sizeof(tSirResultCodes); - cdf_mem_copy(pBuf, psessionEntry->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(pBuf, psessionEntry->bssId, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); - cdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(pMac, WLAN_PE_DIAG_DISASSOC_IND_EVENT, @@ -1042,7 +1042,7 @@ lim_send_sme_disassoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tSirMsgQ mmhMsg; tSirSmeDisassocInd *pSirSmeDisassocInd; - pSirSmeDisassocInd = cdf_mem_malloc(sizeof(tSirSmeDisassocInd)); + pSirSmeDisassocInd = qdf_mem_malloc(sizeof(tSirSmeDisassocInd)); if (NULL == pSirSmeDisassocInd) { lim_log(pMac, LOGP, FL("AllocateMemory failed for eWNI_SME_DISASSOC_IND")); @@ -1057,10 +1057,10 @@ lim_send_sme_disassoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, pSirSmeDisassocInd->statusCode = pStaDs->mlmStaContext.disassocReason; pSirSmeDisassocInd->reasonCode = pStaDs->mlmStaContext.disassocReason; - cdf_mem_copy(pSirSmeDisassocInd->bssid.bytes, psessionEntry->bssId, + qdf_mem_copy(pSirSmeDisassocInd->bssid.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pSirSmeDisassocInd->peer_macaddr.bytes, pStaDs->staAddr, + qdf_mem_copy(pSirSmeDisassocInd->peer_macaddr.bytes, pStaDs->staAddr, QDF_MAC_ADDR_SIZE); pSirSmeDisassocInd->staId = pStaDs->staIndex; @@ -1098,7 +1098,7 @@ lim_send_sme_deauth_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tSirMsgQ mmhMsg; tSirSmeDeauthInd *pSirSmeDeauthInd; - pSirSmeDeauthInd = cdf_mem_malloc(sizeof(tSirSmeDeauthInd)); + pSirSmeDeauthInd = qdf_mem_malloc(sizeof(tSirSmeDeauthInd)); if (NULL == pSirSmeDeauthInd) { lim_log(pMac, LOGP, FL("AllocateMemory failed for eWNI_SME_DEAUTH_IND ")); @@ -1119,10 +1119,10 @@ lim_send_sme_deauth_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, (tSirResultCodes) pStaDs->mlmStaContext.disassocReason; } /* BSSID */ - cdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, psessionEntry->bssId, + qdf_mem_copy(pSirSmeDeauthInd->bssid.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); /* peerMacAddr */ - cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, pStaDs->staAddr, + qdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, pStaDs->staAddr, QDF_MAC_ADDR_SIZE); pSirSmeDeauthInd->reasonCode = pStaDs->mlmStaContext.disassocReason; @@ -1172,7 +1172,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tSirMsgQ mmhMsg; tSirTdlsDelStaInd *pSirTdlsDelStaInd; - pSirTdlsDelStaInd = cdf_mem_malloc(sizeof(tSirTdlsDelStaInd)); + pSirTdlsDelStaInd = qdf_mem_malloc(sizeof(tSirTdlsDelStaInd)); if (NULL == pSirTdlsDelStaInd) { lim_log(pMac, LOGP, FL @@ -1187,7 +1187,7 @@ lim_send_sme_tdls_del_sta_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, pSirTdlsDelStaInd->sessionId = psessionEntry->smeSessionId; /* peerMacAddr */ - cdf_mem_copy(pSirTdlsDelStaInd->peermac.bytes, pStaDs->staAddr, + qdf_mem_copy(pSirTdlsDelStaInd->peermac.bytes, pStaDs->staAddr, QDF_MAC_ADDR_SIZE); /* staId */ @@ -1229,7 +1229,7 @@ lim_send_sme_tdls_delete_all_peer_ind(tpAniSirGlobal pMac, tpPESession psessionE tSirMsgQ mmhMsg; tSirTdlsDelAllPeerInd *pSirTdlsDelAllPeerInd; - pSirTdlsDelAllPeerInd = cdf_mem_malloc(sizeof(tSirTdlsDelAllPeerInd)); + pSirTdlsDelAllPeerInd = qdf_mem_malloc(sizeof(tSirTdlsDelAllPeerInd)); if (NULL == pSirTdlsDelAllPeerInd) { lim_log(pMac, LOGP, FL @@ -1278,7 +1278,7 @@ lim_send_sme_mgmt_tx_completion(tpAniSirGlobal pMac, tSirMgmtTxCompletionInd *pSirMgmtTxCompletionInd; pSirMgmtTxCompletionInd = - cdf_mem_malloc(sizeof(tSirMgmtTxCompletionInd)); + qdf_mem_malloc(sizeof(tSirMgmtTxCompletionInd)); if (NULL == pSirMgmtTxCompletionInd) { lim_log(pMac, LOGP, FL @@ -1377,7 +1377,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, * Deauthentication response to host triggered * deauthentication. */ - pSirSmeDeauthRsp = cdf_mem_malloc(sizeof(tSirSmeDeauthRsp)); + pSirSmeDeauthRsp = qdf_mem_malloc(sizeof(tSirSmeDeauthRsp)); if (NULL == pSirSmeDeauthRsp) { /* Log error */ lim_log(pMac, LOGP, @@ -1396,7 +1396,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, pSirSmeDeauthRsp->transactionId = smetransactionId; pBuf = (uint8_t *) pSirSmeDeauthRsp->peer_macaddr.bytes; - cdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(pBuf, peerMacAddr, sizeof(tSirMacAddr)); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ lim_diag_event_report(pMac, WLAN_PE_DIAG_DEAUTH_RSP_EVENT, @@ -1412,7 +1412,7 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, * frame reception from peer entity or due to * loss of link with peer entity. */ - pSirSmeDeauthInd = cdf_mem_malloc(sizeof(tSirSmeDeauthInd)); + pSirSmeDeauthInd = qdf_mem_malloc(sizeof(tSirSmeDeauthInd)); if (NULL == pSirSmeDeauthInd) { /* Log error */ lim_log(pMac, LOGP, @@ -1441,11 +1441,11 @@ lim_send_sme_deauth_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, pBuf += sizeof(tSirResultCodes); /* bssId */ - cdf_mem_copy(pBuf, psessionEntry->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy(pBuf, psessionEntry->bssId, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); /* peerMacAddr */ - cdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, peerMacAddr, + qdf_mem_copy(pSirSmeDeauthInd->peer_macaddr.bytes, peerMacAddr, QDF_MAC_ADDR_SIZE); #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ @@ -1490,7 +1490,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx, tSirMsgQ msg; tSirSmeWmStatusChangeNtf *wm_status_change_ntf; - wm_status_change_ntf = cdf_mem_malloc(sizeof(tSirSmeWmStatusChangeNtf)); + wm_status_change_ntf = qdf_mem_malloc(sizeof(tSirSmeWmStatusChangeNtf)); if (NULL == wm_status_change_ntf) { lim_log(mac_ctx, LOGE, FL("Mem Alloc failed - eWNI_SME_WM_STATUS_CHANGE_NTF")); @@ -1512,7 +1512,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx, wm_status_change_ntf->sessionId = session_id; if (sizeof(wm_status_change_ntf->statusChangeInfo) >= info_len) { - cdf_mem_copy( + qdf_mem_copy( (uint8_t *) &wm_status_change_ntf->statusChangeInfo, (uint8_t *) status_change_info, info_len); } @@ -1524,7 +1524,7 @@ lim_send_sme_wm_status_change_ntf(tpAniSirGlobal mac_ctx, MTRACE(mac_trace_msg_tx(mac_ctx, session_id, msg.type)); if (eSIR_SUCCESS != lim_sys_process_mmh_msg_api(mac_ctx, &msg, ePROT)) { - cdf_mem_free(wm_status_change_ntf); + qdf_mem_free(wm_status_change_ntf); lim_log(mac_ctx, LOGP, FL("lim_sys_process_mmh_msg_api failed")); } @@ -1567,7 +1567,7 @@ lim_send_sme_set_context_rsp(tpAniSirGlobal pMac, tSirMsgQ mmhMsg; tSirSmeSetContextRsp *pSirSmeSetContextRsp; - pSirSmeSetContextRsp = cdf_mem_malloc(sizeof(tSirSmeSetContextRsp)); + pSirSmeSetContextRsp = qdf_mem_malloc(sizeof(tSirSmeSetContextRsp)); if (NULL == pSirSmeSetContextRsp) { /* Log error */ lim_log(pMac, LOGP, @@ -1664,7 +1664,7 @@ lim_send_sme_neighbor_bss_ind(tpAniSirGlobal pMac, tLimScanResultNode *pBssDescr */ val = pBssDescr->bssDescription.length + sizeof(uint16_t) + sizeof(uint32_t) + sizeof(uint8_t); - pNewBssInd = cdf_mem_malloc(val); + pNewBssInd = qdf_mem_malloc(val); if (NULL == pNewBssInd) { /* Log error */ lim_log(pMac, LOGP, @@ -1678,7 +1678,7 @@ lim_send_sme_neighbor_bss_ind(tpAniSirGlobal pMac, tLimScanResultNode *pBssDescr pNewBssInd->length = (uint16_t) val; pNewBssInd->sessionId = 0; - cdf_mem_copy((uint8_t *) pNewBssInd->bssDescription, + qdf_mem_copy((uint8_t *) pNewBssInd->bssDescription, (uint8_t *) &pBssDescr->bssDescription, pBssDescr->bssDescription.length + sizeof(uint16_t)); @@ -1710,13 +1710,13 @@ lim_send_sme_addts_rsp(tpAniSirGlobal pMac, uint8_t rspReqd, uint32_t status, if (!rspReqd) return; - rsp = cdf_mem_malloc(sizeof(tSirAddtsRsp)); + rsp = qdf_mem_malloc(sizeof(tSirAddtsRsp)); if (NULL == rsp) { lim_log(pMac, LOGP, FL("AllocateMemory failed for ADDTS_RSP")); return; } - cdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); + qdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); rsp->messageType = eWNI_SME_ADDTS_RSP; rsp->rc = status; rsp->rsp.status = (enum eSirMacStatusCodes)status; @@ -1758,19 +1758,19 @@ lim_send_sme_delts_rsp(tpAniSirGlobal pMac, tpSirDeltsReq delts, uint32_t status if (!delts->rspReqd) return; - rsp = cdf_mem_malloc(sizeof(tSirDeltsRsp)); + rsp = qdf_mem_malloc(sizeof(tSirDeltsRsp)); if (NULL == rsp) { /* Log error */ lim_log(pMac, LOGP, FL("AllocateMemory failed for DELTS_RSP")); return; } - cdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); + qdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); if (psessionEntry != NULL) { rsp->aid = delts->aid; qdf_copy_macaddr(&rsp->macaddr, &delts->macaddr); - cdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) &delts->req, + qdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) &delts->req, sizeof(tSirDeltsReqInfo)); } @@ -1808,18 +1808,18 @@ lim_send_sme_delts_ind(tpAniSirGlobal pMac, tpSirDeltsReqInfo delts, uint16_t ai lim_log(pMac, LOGW, "SendSmeDeltsInd (aid %d, tsid %d, up %d)", aid, delts->tsinfo.traffic.tsid, delts->tsinfo.traffic.userPrio); - rsp = cdf_mem_malloc(sizeof(tSirDeltsRsp)); + rsp = qdf_mem_malloc(sizeof(tSirDeltsRsp)); if (NULL == rsp) { /* Log error */ lim_log(pMac, LOGP, FL("AllocateMemory failed for DELTS_IND")); return; } - cdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); + qdf_mem_set((uint8_t *) rsp, sizeof(*rsp), 0); rsp->messageType = eWNI_SME_DELTS_IND; rsp->rc = eSIR_SUCCESS; rsp->aid = aid; - cdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) delts, sizeof(*delts)); + qdf_mem_copy((uint8_t *) &rsp->rsp, (uint8_t *) delts, sizeof(*delts)); /* Update SME session Id and SME transaction Id */ @@ -1964,16 +1964,16 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, tSirMsgQ mmhMsg; tSmeIbssPeerInd *pNewPeerInd; - pNewPeerInd = cdf_mem_malloc(sizeof(tSmeIbssPeerInd) + beaconLen); + pNewPeerInd = qdf_mem_malloc(sizeof(tSmeIbssPeerInd) + beaconLen); if (NULL == pNewPeerInd) { PELOGE(lim_log(pMac, LOGE, FL("Failed to allocate memory"));) return; } - cdf_mem_set((void *)pNewPeerInd, (sizeof(tSmeIbssPeerInd) + beaconLen), + qdf_mem_set((void *)pNewPeerInd, (sizeof(tSmeIbssPeerInd) + beaconLen), 0); - cdf_mem_copy((uint8_t *) pNewPeerInd->peer_addr.bytes, + qdf_mem_copy((uint8_t *) pNewPeerInd->peer_addr.bytes, peerMacAddr, QDF_MAC_ADDR_SIZE); pNewPeerInd->staId = staIndex; pNewPeerInd->ucastSig = ucastIdx; @@ -1983,7 +1983,7 @@ lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, pNewPeerInd->sessionId = sessionId; if (beacon != NULL) { - cdf_mem_copy((void *)((uint8_t *) pNewPeerInd + + qdf_mem_copy((void *)((uint8_t *) pNewPeerInd + sizeof(tSmeIbssPeerInd)), (void *)beacon, beaconLen); } @@ -2181,17 +2181,17 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) session_entry->gLimChannelSwitch.ch_width); lim_prepare_for11h_channel_switch(mac_ctx, session_entry); - csa_offload_ind = cdf_mem_malloc(sizeof(tSmeCsaOffloadInd)); + csa_offload_ind = qdf_mem_malloc(sizeof(tSmeCsaOffloadInd)); if (NULL == csa_offload_ind) { lim_log(mac_ctx, LOGE, FL("memalloc fail eWNI_SME_CSA_OFFLOAD_EVENT")); goto err; } - cdf_mem_set(csa_offload_ind, sizeof(tSmeCsaOffloadInd), 0); + qdf_mem_set(csa_offload_ind, sizeof(tSmeCsaOffloadInd), 0); csa_offload_ind->mesgType = eWNI_SME_CSA_OFFLOAD_EVENT; csa_offload_ind->mesgLen = sizeof(tSmeCsaOffloadInd); - cdf_mem_copy(csa_offload_ind->bssid.bytes, session_entry->bssId, + qdf_mem_copy(csa_offload_ind->bssid.bytes, session_entry->bssId, QDF_MAC_ADDR_SIZE); mmh_msg.type = eWNI_SME_CSA_OFFLOAD_EVENT; mmh_msg.bodyptr = csa_offload_ind; @@ -2209,7 +2209,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } err: - cdf_mem_free(csa_params); + qdf_mem_free(csa_params); } /*-------------------------------------------------------------------------- @@ -2278,13 +2278,13 @@ void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMa tSirMsgQ mmhMsg; tSmeMaxAssocInd *pSmeMaxAssocInd; - pSmeMaxAssocInd = cdf_mem_malloc(sizeof(tSmeMaxAssocInd)); + pSmeMaxAssocInd = qdf_mem_malloc(sizeof(tSmeMaxAssocInd)); if (NULL == pSmeMaxAssocInd) { PELOGE(lim_log(pMac, LOGE, FL("Failed to allocate memory"));) return; } - cdf_mem_set((void *)pSmeMaxAssocInd, sizeof(tSmeMaxAssocInd), 0); - cdf_mem_copy((uint8_t *) pSmeMaxAssocInd->peer_mac.bytes, + qdf_mem_set((void *)pSmeMaxAssocInd, sizeof(tSmeMaxAssocInd), 0); + qdf_mem_copy((uint8_t *) pSmeMaxAssocInd->peer_mac.bytes, (uint8_t *) peerMacAddr, QDF_MAC_ADDR_SIZE); pSmeMaxAssocInd->mesgType = eWNI_SME_MAX_ASSOC_EXCEEDED; pSmeMaxAssocInd->mesgLen = sizeof(tSmeMaxAssocInd); @@ -2375,17 +2375,17 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac, uint8_t channelId; pSmeSwithChnlParams = (tSwitchChannelParams *) - cdf_mem_malloc(sizeof(tSwitchChannelParams)); + qdf_mem_malloc(sizeof(tSwitchChannelParams)); if (NULL == pSmeSwithChnlParams) { lim_log(pMac, LOGP, FL("AllocateMemory failed for pSmeSwithChnlParams\n")); return; } - cdf_mem_set((void *)pSmeSwithChnlParams, + qdf_mem_set((void *)pSmeSwithChnlParams, sizeof(tSwitchChannelParams), 0); - cdf_mem_copy(pSmeSwithChnlParams, pChnlParams, + qdf_mem_copy(pSmeSwithChnlParams, pChnlParams, sizeof(tSwitchChannelParams)); channelId = pSmeSwithChnlParams->channelNumber; @@ -2476,7 +2476,7 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e psessionEntry->dfsIncludeChanWrapperIe = false; pChanSwTxResponse = (tSirSmeCSAIeTxCompleteRsp *) - cdf_mem_malloc(length); + qdf_mem_malloc(length); if (NULL == pChanSwTxResponse) { lim_log(pMac, LOGP, @@ -2485,7 +2485,7 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e return; } - cdf_mem_set((void *)pChanSwTxResponse, length, 0); + qdf_mem_set((void *)pChanSwTxResponse, length, 0); pChanSwTxResponse->sessionId = psessionEntry->smeSessionId; pChanSwTxResponse->chanSwIeTxStatus = @@ -2503,14 +2503,14 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e /* Done with nss update, send response back to SME */ psessionEntry->gLimOperatingMode.present = 0; beacon_tx_comp_rsp_ptr = (struct sir_beacon_tx_complete_rsp *) - cdf_mem_malloc(sizeof(*beacon_tx_comp_rsp_ptr)); + qdf_mem_malloc(sizeof(*beacon_tx_comp_rsp_ptr)); if (NULL == beacon_tx_comp_rsp_ptr) { lim_log(pMac, LOGP, FL ("AllocateMemory failed for beacon_tx_comp_rsp_ptr")); return; } - cdf_mem_set((void *)beacon_tx_comp_rsp_ptr, + qdf_mem_set((void *)beacon_tx_comp_rsp_ptr, sizeof(*beacon_tx_comp_rsp_ptr), 0); beacon_tx_comp_rsp_ptr->session_id = psessionEntry->smeSessionId; diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index c2e5dc0f4144..7d85ec189f26 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -74,19 +74,19 @@ void pe_init_beacon_params(tpAniSirGlobal pMac, tpPESession psessionEntry) psessionEntry->beaconParams.gHTObssMode = 0; /* Number of legacy STAs associated */ - cdf_mem_set((void *)&psessionEntry->gLim11bParams, + qdf_mem_set((void *)&psessionEntry->gLim11bParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLim11aParams, + qdf_mem_set((void *)&psessionEntry->gLim11aParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLim11gParams, + qdf_mem_set((void *)&psessionEntry->gLim11gParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLimNonGfParams, + qdf_mem_set((void *)&psessionEntry->gLimNonGfParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLimHt20Params, + qdf_mem_set((void *)&psessionEntry->gLimHt20Params, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLimLsigTxopParams, + qdf_mem_set((void *)&psessionEntry->gLimLsigTxopParams, sizeof(tLimProtStaParams), 0); - cdf_mem_set((void *)&psessionEntry->gLimOlbcParams, + qdf_mem_set((void *)&psessionEntry->gLimOlbcParams, sizeof(tLimProtStaParams), 0); } @@ -133,34 +133,34 @@ void pe_reset_protection_callback(void *ptr) pe_session_entry->old_protection_state, current_protection_state); - cdf_mem_zero(&pe_session_entry->gLimOverlap11gParams, + qdf_mem_zero(&pe_session_entry->gLimOverlap11gParams, sizeof(pe_session_entry->gLimOverlap11gParams)); - cdf_mem_zero(&pe_session_entry->gLimOverlap11aParams, + qdf_mem_zero(&pe_session_entry->gLimOverlap11aParams, sizeof(pe_session_entry->gLimOverlap11aParams)); - cdf_mem_zero(&pe_session_entry->gLimOverlapHt20Params, + qdf_mem_zero(&pe_session_entry->gLimOverlapHt20Params, sizeof(pe_session_entry->gLimOverlapHt20Params)); - cdf_mem_zero(&pe_session_entry->gLimOverlapNonGfParams, + qdf_mem_zero(&pe_session_entry->gLimOverlapNonGfParams, sizeof(pe_session_entry->gLimOverlapNonGfParams)); - cdf_mem_zero(&pe_session_entry->gLimOlbcParams, + qdf_mem_zero(&pe_session_entry->gLimOlbcParams, sizeof(pe_session_entry->gLimOlbcParams)); - cdf_mem_zero(&pe_session_entry->beaconParams, + qdf_mem_zero(&pe_session_entry->beaconParams, sizeof(pe_session_entry->beaconParams)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlap11gParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlap11gParams, sizeof(mac_ctx->lim.gLimOverlap11gParams)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlap11aParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlap11aParams, sizeof(mac_ctx->lim.gLimOverlap11aParams)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlapHt20Params, + qdf_mem_zero(&mac_ctx->lim.gLimOverlapHt20Params, sizeof(mac_ctx->lim.gLimOverlapHt20Params)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlapNonGfParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlapNonGfParams, sizeof(mac_ctx->lim.gLimOverlapNonGfParams)); old_op_mode = pe_session_entry->htOperMode; pe_session_entry->htOperMode = eSIR_HT_OP_MODE_PURE; - cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); /* index 0, is self node, peers start from 1 */ for (i = 1 ; i <= mac_ctx->lim.gLimAssocStaLimit ; i++) { station_hash_node = dph_get_hash_entry(mac_ctx, i, @@ -181,7 +181,7 @@ void pe_reset_protection_callback(void *ptr) QDF_TRACE_LEVEL_ERROR, FL("protection changed, update beacon template\n")); /* update beacon fix params and send update to FW */ - cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams)); beacon_params.bssIdx = pe_session_entry->bssIdx; beacon_params.fShortPreamble = pe_session_entry->beaconParams.fShortPreamble; @@ -258,20 +258,20 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, } session_ptr = &pMac->lim.gpSession[i]; - cdf_mem_set((void *)session_ptr, sizeof(tPESession), 0); + qdf_mem_set((void *)session_ptr, sizeof(tPESession), 0); /* Allocate space for Station Table for this session. */ session_ptr->dph.dphHashTable.pHashTable = - cdf_mem_malloc(sizeof(tpDphHashNode) * (numSta + 1)); + qdf_mem_malloc(sizeof(tpDphHashNode) * (numSta + 1)); if (NULL == session_ptr->dph.dphHashTable.pHashTable) { lim_log(pMac, LOGE, FL("memory allocate failed!")); return NULL; } session_ptr->dph.dphHashTable.pDphNodeArray = - cdf_mem_malloc(sizeof(tDphHashNode) * (numSta + 1)); + qdf_mem_malloc(sizeof(tDphHashNode) * (numSta + 1)); if (NULL == session_ptr->dph.dphHashTable.pDphNodeArray) { lim_log(pMac, LOGE, FL("memory allocate failed!")); - cdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); + qdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); session_ptr->dph.dphHashTable. pHashTable = NULL; return NULL; @@ -279,17 +279,17 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->dph.dphHashTable.size = numSta + 1; dph_hash_table_class_init(pMac, &session_ptr->dph.dphHashTable); - session_ptr->gpLimPeerIdxpool = cdf_mem_malloc( + session_ptr->gpLimPeerIdxpool = qdf_mem_malloc( sizeof(*(session_ptr->gpLimPeerIdxpool)) * (numSta + 1)); if (NULL == session_ptr->gpLimPeerIdxpool) { lim_log(pMac, LOGE, FL("memory allocate failed!")); - cdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); - cdf_mem_free(session_ptr->dph.dphHashTable.pDphNodeArray); + qdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); + qdf_mem_free(session_ptr->dph.dphHashTable.pDphNodeArray); session_ptr->dph.dphHashTable.pHashTable = NULL; session_ptr->dph.dphHashTable.pDphNodeArray = NULL; return NULL; } - cdf_mem_set(session_ptr->gpLimPeerIdxpool, + qdf_mem_set(session_ptr->gpLimPeerIdxpool, sizeof(*session_ptr->gpLimPeerIdxpool) * (numSta + 1), 0); session_ptr->freePeerIdxHead = 0; @@ -318,7 +318,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->htRecommendedTxWidthSet = 0; session_ptr->htSecondaryChannelOffset = 0; #ifdef FEATURE_WLAN_TDLS - cdf_mem_set(session_ptr->peerAIDBitmap, + qdf_mem_set(session_ptr->peerAIDBitmap, sizeof(session_ptr->peerAIDBitmap), 0); session_ptr->tdls_prohibited = false; session_ptr->tdls_chan_swit_prohibited = false; @@ -334,21 +334,21 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, || eSIR_IBSS_MODE == bssType || eSIR_BTAMP_AP_MODE == bssType) { session_ptr->pSchProbeRspTemplate = - cdf_mem_malloc(SCH_MAX_PROBE_RESP_SIZE); + qdf_mem_malloc(SCH_MAX_PROBE_RESP_SIZE); session_ptr->pSchBeaconFrameBegin = - cdf_mem_malloc(SCH_MAX_BEACON_SIZE); + qdf_mem_malloc(SCH_MAX_BEACON_SIZE); session_ptr->pSchBeaconFrameEnd = - cdf_mem_malloc(SCH_MAX_BEACON_SIZE); + qdf_mem_malloc(SCH_MAX_BEACON_SIZE); if ((NULL == session_ptr->pSchProbeRspTemplate) || (NULL == session_ptr->pSchBeaconFrameBegin) || (NULL == session_ptr->pSchBeaconFrameEnd)) { lim_log(pMac, LOGE, FL("memory allocate failed!")); - cdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); - cdf_mem_free(session_ptr->dph.dphHashTable.pDphNodeArray); - cdf_mem_free(session_ptr->gpLimPeerIdxpool); - cdf_mem_free(session_ptr->pSchProbeRspTemplate); - cdf_mem_free(session_ptr->pSchBeaconFrameBegin); - cdf_mem_free(session_ptr->pSchBeaconFrameEnd); + qdf_mem_free(session_ptr->dph.dphHashTable.pHashTable); + qdf_mem_free(session_ptr->dph.dphHashTable.pDphNodeArray); + qdf_mem_free(session_ptr->gpLimPeerIdxpool); + qdf_mem_free(session_ptr->pSchProbeRspTemplate); + qdf_mem_free(session_ptr->pSchBeaconFrameBegin); + qdf_mem_free(session_ptr->pSchBeaconFrameEnd); session_ptr->dph.dphHashTable.pHashTable = NULL; session_ptr->dph.dphHashTable.pDphNodeArray = NULL; @@ -559,54 +559,54 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) lim_ft_cleanup(mac_ctx, session); #endif if (session->pLimStartBssReq != NULL) { - cdf_mem_free(session->pLimStartBssReq); + qdf_mem_free(session->pLimStartBssReq); session->pLimStartBssReq = NULL; } if (session->pLimJoinReq != NULL) { - cdf_mem_free(session->pLimJoinReq); + qdf_mem_free(session->pLimJoinReq); session->pLimJoinReq = NULL; } if (session->pLimReAssocReq != NULL) { - cdf_mem_free(session->pLimReAssocReq); + qdf_mem_free(session->pLimReAssocReq); session->pLimReAssocReq = NULL; } if (session->pLimMlmJoinReq != NULL) { - cdf_mem_free(session->pLimMlmJoinReq); + qdf_mem_free(session->pLimMlmJoinReq); session->pLimMlmJoinReq = NULL; } if (session->dph.dphHashTable.pHashTable != NULL) { - cdf_mem_free(session->dph.dphHashTable.pHashTable); + qdf_mem_free(session->dph.dphHashTable.pHashTable); session->dph.dphHashTable.pHashTable = NULL; } if (session->dph.dphHashTable.pDphNodeArray != NULL) { - cdf_mem_free(session->dph.dphHashTable.pDphNodeArray); + qdf_mem_free(session->dph.dphHashTable.pDphNodeArray); session->dph.dphHashTable.pDphNodeArray = NULL; } if (session->gpLimPeerIdxpool != NULL) { - cdf_mem_free(session->gpLimPeerIdxpool); + qdf_mem_free(session->gpLimPeerIdxpool); session->gpLimPeerIdxpool = NULL; } if (session->beacon != NULL) { - cdf_mem_free(session->beacon); + qdf_mem_free(session->beacon); session->beacon = NULL; session->bcnLen = 0; } if (session->assocReq != NULL) { - cdf_mem_free(session->assocReq); + qdf_mem_free(session->assocReq); session->assocReq = NULL; session->assocReqLen = 0; } if (session->assocRsp != NULL) { - cdf_mem_free(session->assocRsp); + qdf_mem_free(session->assocRsp); session->assocRsp = NULL; session->assocRspLen = 0; } @@ -620,58 +620,58 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) tmp_ptr = ((tpSirAssocReq) (session->parsedAssocReq[i])); if (tmp_ptr->assocReqFrame) { - cdf_mem_free(tmp_ptr->assocReqFrame); + qdf_mem_free(tmp_ptr->assocReqFrame); tmp_ptr->assocReqFrame = NULL; tmp_ptr->assocReqFrameLength = 0; } - cdf_mem_free(session->parsedAssocReq[i]); + qdf_mem_free(session->parsedAssocReq[i]); session->parsedAssocReq[i] = NULL; } /* Cleanup the whole block */ - cdf_mem_free(session->parsedAssocReq); + qdf_mem_free(session->parsedAssocReq); session->parsedAssocReq = NULL; } if (NULL != session->limAssocResponseData) { - cdf_mem_free(session->limAssocResponseData); + qdf_mem_free(session->limAssocResponseData); session->limAssocResponseData = NULL; } if (NULL != session->pLimMlmReassocRetryReq) { - cdf_mem_free(session->pLimMlmReassocRetryReq); + qdf_mem_free(session->pLimMlmReassocRetryReq); session->pLimMlmReassocRetryReq = NULL; } if (NULL != session->pLimMlmReassocReq) { - cdf_mem_free(session->pLimMlmReassocReq); + qdf_mem_free(session->pLimMlmReassocReq); session->pLimMlmReassocReq = NULL; } if (NULL != session->pSchProbeRspTemplate) { - cdf_mem_free(session->pSchProbeRspTemplate); + qdf_mem_free(session->pSchProbeRspTemplate); session->pSchProbeRspTemplate = NULL; } if (NULL != session->pSchBeaconFrameBegin) { - cdf_mem_free(session->pSchBeaconFrameBegin); + qdf_mem_free(session->pSchBeaconFrameBegin); session->pSchBeaconFrameBegin = NULL; } if (NULL != session->pSchBeaconFrameEnd) { - cdf_mem_free(session->pSchBeaconFrameEnd); + qdf_mem_free(session->pSchBeaconFrameEnd); session->pSchBeaconFrameEnd = NULL; } /* Must free the buffer before peSession invalid */ if (NULL != session->addIeParams.probeRespData_buff) { - cdf_mem_free(session->addIeParams.probeRespData_buff); + qdf_mem_free(session->addIeParams.probeRespData_buff); session->addIeParams.probeRespData_buff = NULL; session->addIeParams.probeRespDataLen = 0; } if (NULL != session->addIeParams.assocRespData_buff) { - cdf_mem_free(session->addIeParams.assocRespData_buff); + qdf_mem_free(session->addIeParams.assocRespData_buff); session->addIeParams.assocRespData_buff = NULL; session->addIeParams.assocRespDataLen = 0; } if (NULL != session->addIeParams.probeRespBCNData_buff) { - cdf_mem_free(session->addIeParams.probeRespBCNData_buff); + qdf_mem_free(session->addIeParams.probeRespBCNData_buff); session->addIeParams.probeRespBCNData_buff = NULL; session->addIeParams.probeRespBCNDataLen = 0; } diff --git a/core/mac/src/pe/lim/lim_sme_req_utils.c b/core/mac/src/pe/lim/lim_sme_req_utils.c index 88c021efee9e..fc2686306209 100644 --- a/core/mac/src/pe/lim/lim_sme_req_utils.c +++ b/core/mac/src/pe/lim/lim_sme_req_utils.c @@ -543,7 +543,7 @@ uint8_t lim_is_sme_join_req_valid(tpAniSirGlobal pMac, tpSirSmeJoinReq pJoinReq) Reject Join Req if the Self Mac Address and the Ap's Mac Address is same */ - if (cdf_mem_compare((uint8_t *) pJoinReq->selfMacAddr, + if (!qdf_mem_cmp((uint8_t *) pJoinReq->selfMacAddr, (uint8_t *) pJoinReq->bssDescription.bssId, (uint8_t) (sizeof(tSirMacAddr)))) { /* Log the event */ diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 185e6bbdb25e..92fa50434fca 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -300,7 +300,7 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("could not retrieve mac preauth value")); pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue; pMac->lim.gLimPreAuthTimerTable.pTable = - cdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode)); + qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode)); if (pMac->lim.gLimPreAuthTimerTable.pTable == NULL) { lim_log(pMac, LOGP, FL("AllocateMemory failed!")); @@ -427,7 +427,7 @@ err_timer: tx_timer_delete(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer); if (NULL != pMac->lim.gLimPreAuthTimerTable.pTable) { - cdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); + qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); pMac->lim.gLimPreAuthTimerTable.pTable = NULL; } return TX_TIMER_ERROR; @@ -471,7 +471,8 @@ void lim_timer_handler(void *pMacGlobal, uint32_t param) msg.bodyptr = NULL; msg.bodyval = 0; - if ((statusCode = lim_post_msg_api(pMac, &msg)) != eSIR_SUCCESS) + statusCode = lim_post_msg_api(pMac, &msg); + if (statusCode != eSIR_SUCCESS) lim_log(pMac, LOGE, FL("posting message %X to LIM failed, reason=%d"), msg.type, statusCode); @@ -583,7 +584,7 @@ void lim_assoc_failure_timer_handler(void *mac_global, uint32_t param) FL("Reassoc request retry MAX(%d) reached"), LIM_MAX_REASSOC_RETRY_LIMIT); if (NULL != session->pLimMlmReassocRetryReq) { - cdf_mem_free(session->pLimMlmReassocRetryReq); + qdf_mem_free(session->pLimMlmReassocRetryReq); session->pLimMlmReassocRetryReq = NULL; } } @@ -1274,7 +1275,8 @@ void lim_send_disassoc_frame_threshold_handler(void *pMacGlobal, uint32_t param) msg.bodyval = 0; msg.bodyptr = NULL; - if ((statusCode = lim_post_msg_api(pMac, &msg)) != eSIR_SUCCESS) + statusCode = lim_post_msg_api(pMac, &msg); + if (statusCode != eSIR_SUCCESS) lim_log(pMac, LOGE, FL("posting to LIM failed, reason=%d"), statusCode); @@ -1308,7 +1310,8 @@ void lim_cnf_wait_tmer_handler(void *pMacGlobal, uint32_t param) msg.bodyval = (uint32_t) param; msg.bodyptr = NULL; - if ((statusCode = lim_post_msg_api(pMac, &msg)) != eSIR_SUCCESS) + statusCode = lim_post_msg_api(pMac, &msg); + if (statusCode != eSIR_SUCCESS) lim_log(pMac, LOGE, FL("posting to LIM failed, reason=%d"), statusCode); diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 40e91cf1eceb..ed6e61c64ef6 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -114,11 +114,11 @@ #define LIM_MIN_MEM_ASSOC 4 /* / Verifies whether given mac addr matches the CURRENT Bssid */ -#define IS_CURRENT_BSSID(pMac, addr, psessionEntry) (cdf_mem_compare(addr, \ +#define IS_CURRENT_BSSID(pMac, addr, psessionEntry) (!qdf_mem_cmp(addr, \ psessionEntry->bssId, \ sizeof(psessionEntry->bssId))) /* / Verifies whether given addr matches the REASSOC Bssid */ -#define IS_REASSOC_BSSID(pMac, addr, psessionEntry) (cdf_mem_compare(addr, \ +#define IS_REASSOC_BSSID(pMac, addr, psessionEntry) (!qdf_mem_cmp(addr, \ psessionEntry->limReAssocbssId, \ sizeof(psessionEntry->limReAssocbssId))) diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 2e71821d0baf..d25964681a97 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -78,7 +78,7 @@ void lim_delete_dialogue_token_list(tpAniSirGlobal pMac) pCurrNode = pMac->lim.pDialogueTokenHead; pMac->lim.pDialogueTokenHead = pMac->lim.pDialogueTokenHead->next; - cdf_mem_free(pCurrNode); + qdf_mem_free(pCurrNode); pCurrNode = NULL; } pMac->lim.pDialogueTokenTail = NULL; @@ -956,7 +956,7 @@ uint8_t lim_write_deferred_msg_q(tpAniSirGlobal mac_ctx, tpSirMsgQ lim_msg) mac_ctx->lim.gLimDeferredMsgQ.write = 0; /* save the message to the queue and advanced the write pointer */ - cdf_mem_copy((uint8_t *) &mac_ctx->lim.gLimDeferredMsgQ. + qdf_mem_copy((uint8_t *) &mac_ctx->lim.gLimDeferredMsgQ. deferredQueue[mac_ctx->lim.gLimDeferredMsgQ.write++], (uint8_t *) lim_msg, sizeof(tSirMsgQ)); return TX_SUCCESS; @@ -1066,7 +1066,7 @@ void lim_handle_update_olbc_cache(tpAniSirGlobal mac_ctx) return; } - cdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); + qdf_mem_set((uint8_t *) &beaconParams, sizeof(tUpdateBeaconParams), 0); beaconParams.bssIdx = psessionEntry->bssIdx; beaconParams.paramChangeBitmap = 0; @@ -1212,7 +1212,7 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, LOG1); ) - if (cdf_mem_compare + if (!qdf_mem_cmp (psessionEntry->protStaCache[i].addr, peerMacAddr, sizeof(tSirMacAddr))) { PELOG1(lim_log @@ -1236,7 +1236,7 @@ lim_update_prot_sta_params(tpAniSirGlobal pMac, return; } - cdf_mem_copy(psessionEntry->protStaCache[i].addr, + qdf_mem_copy(psessionEntry->protStaCache[i].addr, peerMacAddr, sizeof(tSirMacAddr)); psessionEntry->protStaCache[i].protStaCacheType = protStaCacheType; @@ -1456,7 +1456,7 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, if (LIM_IS_AP_ROLE(psession_entry) && (psession_entry->gLimNoShortParams. staNoShortCache[i].active) && - (cdf_mem_compare + (!qdf_mem_cmp (psession_entry->gLimNoShortParams. staNoShortCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)))) @@ -1464,7 +1464,7 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, else if (!LIM_IS_AP_ROLE(psession_entry) && (mac_ctx->lim.gLimNoShortParams. staNoShortCache[i].active) && - (cdf_mem_compare(mac_ctx->lim.gLimNoShortParams. + (!qdf_mem_cmp(mac_ctx->lim.gLimNoShortParams. staNoShortCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)))) @@ -1503,14 +1503,14 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, } if (LIM_IS_AP_ROLE(psession_entry)) { - cdf_mem_copy(psession_entry->gLimNoShortParams. + qdf_mem_copy(psession_entry->gLimNoShortParams. staNoShortCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)); psession_entry->gLimNoShortParams.staNoShortCache[i]. active = true; psession_entry->gLimNoShortParams.numNonShortPreambleSta++; } else { - cdf_mem_copy(mac_ctx->lim.gLimNoShortParams. + qdf_mem_copy(mac_ctx->lim.gLimNoShortParams. staNoShortCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)); mac_ctx->lim.gLimNoShortParams.staNoShortCache[i].active = true; @@ -1573,7 +1573,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, if (LIM_IS_AP_ROLE(session_entry) && session_entry->gLimNoShortSlotParams. staNoShortSlotCache[i].active) { - if (cdf_mem_compare( + if (!qdf_mem_cmp( session_entry->gLimNoShortSlotParams. staNoShortSlotCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr))) @@ -1581,7 +1581,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, } else if (!LIM_IS_AP_ROLE(session_entry)) { if (mac_ctx->lim.gLimNoShortSlotParams. staNoShortSlotCache[i].active) { - if (cdf_mem_compare(mac_ctx->lim. + if (!qdf_mem_cmp(mac_ctx->lim. gLimNoShortSlotParams. staNoShortSlotCache[i]. addr, peer_mac_addr, @@ -1625,7 +1625,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, } if (LIM_IS_AP_ROLE(session_entry)) { - cdf_mem_copy(session_entry->gLimNoShortSlotParams. + qdf_mem_copy(session_entry->gLimNoShortSlotParams. staNoShortSlotCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)); session_entry->gLimNoShortSlotParams. @@ -1633,7 +1633,7 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, session_entry->gLimNoShortSlotParams. numNonShortSlotSta++; } else { - cdf_mem_copy(mac_ctx->lim.gLimNoShortSlotParams. + qdf_mem_copy(mac_ctx->lim.gLimNoShortSlotParams. staNoShortSlotCache[i].addr, peer_mac_addr, sizeof(tSirMacAddr)); mac_ctx->lim.gLimNoShortSlotParams. @@ -2671,7 +2671,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, } mmhMsg.type = eWNI_SME_SWITCH_CHL_IND; - pSirSmeSwitchChInd = cdf_mem_malloc(sizeof(tSirSmeSwitchChannelInd)); + pSirSmeSwitchChInd = qdf_mem_malloc(sizeof(tSirSmeSwitchChannelInd)); if (NULL == pSirSmeSwitchChInd) { lim_log(pMac, LOGP, FL("Failed to allocate buffer for buffer descriptor")); @@ -2683,7 +2683,7 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, pSirSmeSwitchChInd->newChannelId = psessionEntry->gLimChannelSwitch.primaryChannel; pSirSmeSwitchChInd->sessionId = psessionEntry->smeSessionId; - cdf_mem_copy(pSirSmeSwitchChInd->bssid.bytes, psessionEntry->bssId, + qdf_mem_copy(pSirSmeSwitchChInd->bssid.bytes, psessionEntry->bssId, QDF_MAC_ADDR_SIZE); mmhMsg.bodyptr = pSirSmeSwitchChInd; mmhMsg.bodyval = 0; @@ -5139,14 +5139,14 @@ tSirRetStatus lim_process_hal_ind_messages(tpAniSirGlobal pMac, uint32_t msgId, break; default: - cdf_mem_free(msgParam); + qdf_mem_free(msgParam); lim_log(pMac, LOGP, FL("invalid message id = %d received"), msgId); return eSIR_FAILURE; } if (lim_post_msg_api(pMac, &msg) != eSIR_SUCCESS) { - cdf_mem_free(msgParam); + qdf_mem_free(msgParam); lim_log(pMac, LOGP, FL("lim_post_msg_api failed for msgid = %d"), msg.type); return eSIR_FAILURE; @@ -5302,7 +5302,7 @@ void lim_register_hal_ind_call_back(tpAniSirGlobal pMac) tSirMsgQ msg; tpHalIndCB pHalCB; - pHalCB = cdf_mem_malloc(sizeof(tHalIndCB)); + pHalCB = qdf_mem_malloc(sizeof(tHalIndCB)); if (NULL == pHalCB) { lim_log(pMac, LOGP, FL("AllocateMemory() failed")); return; @@ -5316,7 +5316,7 @@ void lim_register_hal_ind_call_back(tpAniSirGlobal pMac) MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msg.type)); if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msg)) { - cdf_mem_free(pHalCB); + qdf_mem_free(pHalCB); lim_log(pMac, LOGP, FL("wma_post_ctrl_msg() failed")); } @@ -5351,7 +5351,7 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) if (psessionEntry == NULL) { lim_log(pMac, LOGE, FL("session does not exist for given BssId")); - cdf_mem_free(limMsg->bodyptr); + qdf_mem_free(limMsg->bodyptr); limMsg->bodyptr = NULL; return; } @@ -5376,19 +5376,19 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) goto error1; } - pDelTsReq = cdf_mem_malloc(sizeof(tSirDeltsReq)); + pDelTsReq = qdf_mem_malloc(sizeof(tSirDeltsReq)); if (NULL == pDelTsReq) { PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory() failed"));) goto error1; } - cdf_mem_set((uint8_t *) pDelTsReq, sizeof(tSirDeltsReq), 0); + qdf_mem_set((uint8_t *) pDelTsReq, sizeof(tSirDeltsReq), 0); if (pSta->wmeEnabled) - cdf_mem_copy(&(pDelTsReq->req.tspec), &(pTspecInfo->tspec), + qdf_mem_copy(&(pDelTsReq->req.tspec), &(pTspecInfo->tspec), sizeof(tSirMacTspecIE)); else - cdf_mem_copy(&(pDelTsReq->req.tsinfo), + qdf_mem_copy(&(pDelTsReq->req.tsinfo), &(pTspecInfo->tspec.tsinfo), sizeof(tSirMacTSInfo)); @@ -5409,29 +5409,29 @@ void lim_process_del_ts_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) &pDelTsReq->req.tspec, psessionEntry); /* prepare and send an sme indication to HDD */ - pDelTsReqInfo = cdf_mem_malloc(sizeof(tSirDeltsReqInfo)); + pDelTsReqInfo = qdf_mem_malloc(sizeof(tSirDeltsReqInfo)); if (NULL == pDelTsReqInfo) { PELOGE(lim_log(pMac, LOGE, FL("AllocateMemory() failed"));) goto error3; } - cdf_mem_set((uint8_t *) pDelTsReqInfo, sizeof(tSirDeltsReqInfo), 0); + qdf_mem_set((uint8_t *) pDelTsReqInfo, sizeof(tSirDeltsReqInfo), 0); if (pSta->wmeEnabled) - cdf_mem_copy(&(pDelTsReqInfo->tspec), &(pTspecInfo->tspec), + qdf_mem_copy(&(pDelTsReqInfo->tspec), &(pTspecInfo->tspec), sizeof(tSirMacTspecIE)); else - cdf_mem_copy(&(pDelTsReqInfo->tsinfo), + qdf_mem_copy(&(pDelTsReqInfo->tsinfo), &(pTspecInfo->tspec.tsinfo), sizeof(tSirMacTSInfo)); lim_send_sme_delts_ind(pMac, pDelTsReqInfo, pDelTsReq->aid, psessionEntry); error3: - cdf_mem_free(pDelTsReqInfo); + qdf_mem_free(pDelTsReqInfo); error2: - cdf_mem_free(pDelTsReq); + qdf_mem_free(pDelTsReq); error1: - cdf_mem_free(limMsg->bodyptr); + qdf_mem_free(limMsg->bodyptr); limMsg->bodyptr = NULL; return; } @@ -5466,7 +5466,7 @@ lim_post_sm_state_update(tpAniSirGlobal pMac, msgQ.type = WMA_SET_MIMOPS_REQ; /* Allocate for WMA_SET_MIMOPS_REQ */ - pMIMO_PSParams = cdf_mem_malloc(sizeof(tSetMIMOPS)); + pMIMO_PSParams = qdf_mem_malloc(sizeof(tSetMIMOPS)); if (NULL == pMIMO_PSParams) { lim_log(pMac, LOGP, FL(" AllocateMemory failed")); return eSIR_MEM_ALLOC_FAILED; @@ -5476,7 +5476,7 @@ lim_post_sm_state_update(tpAniSirGlobal pMac, pMIMO_PSParams->staIdx = staIdx; pMIMO_PSParams->fsendRsp = true; pMIMO_PSParams->sessionId = sessionId; - cdf_mem_copy(pMIMO_PSParams->peerMac, pPeerStaMac, sizeof(tSirMacAddr)); + qdf_mem_copy(pMIMO_PSParams->peerMac, pPeerStaMac, sizeof(tSirMacAddr)); msgQ.bodyptr = pMIMO_PSParams; msgQ.bodyval = 0; @@ -5490,7 +5490,7 @@ lim_post_sm_state_update(tpAniSirGlobal pMac, FL ("Posting WMA_SET_MIMOPS_REQ to HAL failed! Reason = %d"), retCode); - cdf_mem_free(pMIMO_PSParams); + qdf_mem_free(pMIMO_PSParams); return retCode; } @@ -5536,7 +5536,7 @@ lim_get_b_dfrom_rx_packet(tpAniSirGlobal pMac, void *body, uint32_t **pRxPacketI void lim_resset_scan_channel_info(tpAniSirGlobal pMac) { - cdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0); + qdf_mem_set(&pMac->lim.scanChnInfo, sizeof(tLimScanChnInfo), 0); } /** @@ -5663,16 +5663,16 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, * Make it to align to 4 byte boundary */ nBytes = (uint8_t) HALMSG_NUMBYTES_STATION_BITMAP(pMac->lim.maxStation); - pTxCtrlMsg = cdf_mem_malloc(sizeof(*pTxCtrlMsg) + nBytes); + pTxCtrlMsg = qdf_mem_malloc(sizeof(*pTxCtrlMsg) + nBytes); if (NULL == pTxCtrlMsg) { lim_log(pMac, LOGP, FL("AllocateMemory() failed")); return; } - cdf_mem_set((void *)pTxCtrlMsg, (sizeof(*pTxCtrlMsg) + nBytes), 0); + qdf_mem_set((void *)pTxCtrlMsg, (sizeof(*pTxCtrlMsg) + nBytes), 0); status = __lim_fill_tx_control_params(pMac, pTxCtrlMsg, type, mode); if (status != QDF_STATUS_SUCCESS) { - cdf_mem_free(pTxCtrlMsg); + qdf_mem_free(pTxCtrlMsg); lim_log(pMac, LOGP, FL("__lim_fill_tx_control_params failed, status = %d"), status); @@ -5686,7 +5686,7 @@ void lim_frame_transmission_control(tpAniSirGlobal pMac, tLimQuietTxMode type, MTRACE(mac_trace_msg_tx(pMac, NO_SESSION, msgQ.type)); if (wma_post_ctrl_msg(pMac, &msgQ) != eSIR_SUCCESS) { - cdf_mem_free(pTxCtrlMsg); + qdf_mem_free(pTxCtrlMsg); lim_log(pMac, LOGP, FL("Posting Message to HAL failed")); return; } @@ -6030,7 +6030,7 @@ void lim_process_add_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ) if (psessionEntry == NULL) { lim_log(pMac, LOGP, FL("Session Does not exist for given sessionID")); - cdf_mem_free(pAddStaParams); + qdf_mem_free(pAddStaParams); return; } psessionEntry->csaOffloadEnable = pAddStaParams->csaOffloadEnable; @@ -6200,7 +6200,7 @@ void lim_handle_defer_msg_error(tpAniSirGlobal pMac, tpSirMsgQ pLimMsg) cds_pkt_return_packet((cds_pkt_t *) pLimMsg->bodyptr); pLimMsg->bodyptr = NULL; } else if (pLimMsg->bodyptr != NULL) { - cdf_mem_free(pLimMsg->bodyptr); + qdf_mem_free(pLimMsg->bodyptr); pLimMsg->bodyptr = NULL; } @@ -6224,15 +6224,15 @@ void lim_diag_event_report(tpAniSirGlobal pMac, uint16_t eventType, tSirMacAddr nullBssid = { 0, 0, 0, 0, 0, 0 }; WLAN_HOST_DIAG_EVENT_DEF(peEvent, host_event_wlan_pe_payload_type); - cdf_mem_set(&peEvent, sizeof(host_event_wlan_pe_payload_type), 0); + qdf_mem_set(&peEvent, sizeof(host_event_wlan_pe_payload_type), 0); if (NULL == pSessionEntry) { - cdf_mem_copy(peEvent.bssid, nullBssid, sizeof(tSirMacAddr)); + qdf_mem_copy(peEvent.bssid, nullBssid, sizeof(tSirMacAddr)); peEvent.sme_state = (uint16_t) pMac->lim.gLimSmeState; peEvent.mlm_state = (uint16_t) pMac->lim.gLimMlmState; } else { - cdf_mem_copy(peEvent.bssid, pSessionEntry->bssId, + qdf_mem_copy(peEvent.bssid, pSessionEntry->bssId, sizeof(tSirMacAddr)); peEvent.sme_state = (uint16_t) pSessionEntry->limSmeState; peEvent.mlm_state = (uint16_t) pSessionEntry->limMlmState; @@ -6291,8 +6291,8 @@ uint8_t lim_build_p2p_ie(tpAniSirGlobal pMac, uint8_t *ie, uint8_t *data, ptr[length++] = SIR_MAC_EID_VENDOR; ptr[length++] = ie_len + SIR_MAC_P2P_OUI_SIZE; - cdf_mem_copy(&ptr[length], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE); - cdf_mem_copy(&ptr[length + SIR_MAC_P2P_OUI_SIZE], data, ie_len); + qdf_mem_copy(&ptr[length], SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE); + qdf_mem_copy(&ptr[length + SIR_MAC_P2P_OUI_SIZE], data, ie_len); return ie_len + SIR_P2P_IE_HEADER_LEN; } @@ -6306,14 +6306,14 @@ uint8_t lim_get_noa_attr_stream_in_mult_p2p_ies(tpAniSirGlobal pMac, if ((noaLen <= (SIR_MAX_NOA_ATTR_LEN + SIR_P2P_IE_HEADER_LEN)) && (noaLen >= overFlowLen) && (overFlowLen <= SIR_MAX_NOA_ATTR_LEN)) { - cdf_mem_copy(overFlowP2pStream, + qdf_mem_copy(overFlowP2pStream, noaStream + noaLen - overFlowLen, overFlowLen); noaStream[noaLen - overFlowLen] = SIR_MAC_EID_VENDOR; noaStream[noaLen - overFlowLen + 1] = overFlowLen + SIR_MAC_P2P_OUI_SIZE; - cdf_mem_copy(noaStream + noaLen - overFlowLen + 2, + qdf_mem_copy(noaStream + noaLen - overFlowLen + 2, SIR_MAC_P2P_OUI, SIR_MAC_P2P_OUI_SIZE); - cdf_mem_copy(noaStream + noaLen + 2 + SIR_MAC_P2P_OUI_SIZE - + qdf_mem_copy(noaStream + noaLen + 2 + SIR_MAC_P2P_OUI_SIZE - overFlowLen, overFlowP2pStream, overFlowLen); } @@ -6519,7 +6519,7 @@ bool lim_check_vht_op_mode_change(tpAniSirGlobal pMac, tpPESession psessionEntry tempParam.opMode = chanWidth; tempParam.staId = staId; tempParam.smesessionId = psessionEntry->smeSessionId; - cdf_mem_copy(tempParam.peer_mac, peerMac, sizeof(tSirMacAddr)); + qdf_mem_copy(tempParam.peer_mac, peerMac, sizeof(tSirMacAddr)); lim_send_mode_update(pMac, &tempParam, psessionEntry); @@ -6534,7 +6534,7 @@ bool lim_set_nss_change(tpAniSirGlobal pMac, tpPESession psessionEntry, tempParam.rxNss = rxNss; tempParam.staId = staId; tempParam.smesessionId = psessionEntry->smeSessionId; - cdf_mem_copy(tempParam.peer_mac, peerMac, sizeof(tSirMacAddr)); + qdf_mem_copy(tempParam.peer_mac, peerMac, sizeof(tSirMacAddr)); lim_send_rx_nss_update(pMac, &tempParam, psessionEntry); @@ -6552,7 +6552,7 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac, tempParamMembership.membership = membership; tempParamMembership.staId = staId; tempParamMembership.smesessionId = psessionEntry->smeSessionId; - cdf_mem_copy(tempParamMembership.peer_mac, psessionEntry->bssId, + qdf_mem_copy(tempParamMembership.peer_mac, psessionEntry->bssId, sizeof(tSirMacAddr)); lim_set_membership(pMac, &tempParamMembership, psessionEntry); @@ -6560,7 +6560,7 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac, tempParamUserPosition.userPos = userPosition; tempParamUserPosition.staId = staId; tempParamUserPosition.smesessionId = psessionEntry->smeSessionId; - cdf_mem_copy(tempParamUserPosition.peer_mac, psessionEntry->bssId, + qdf_mem_copy(tempParamUserPosition.peer_mac, psessionEntry->bssId, sizeof(tSirMacAddr)); lim_set_user_pos(pMac, &tempParamUserPosition, psessionEntry); @@ -6690,7 +6690,7 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, p_ht_cap->lsigTXOPProtection = dot11_ht_cap.lsigTXOPProtection; p_ht_cap->maxRxAMPDUFactor = dot11_ht_cap.maxRxAMPDUFactor; p_ht_cap->mpduDensity = dot11_ht_cap.mpduDensity; - cdf_mem_copy((void *)p_ht_cap->supportedMCSSet, + qdf_mem_copy((void *)p_ht_cap->supportedMCSSet, (void *)(dot11_ht_cap.supportedMCSSet), sizeof(p_ht_cap->supportedMCSSet)); p_ht_cap->pco = dot11_ht_cap.pco; @@ -6821,7 +6821,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, /* just for fail safe, don't handle MC/BC a1 in this routine */ return true; } - if (!cdf_mem_compare(a1, session->selfMacAddr, 6)) { + if (qdf_mem_cmp(a1, session->selfMacAddr, 6)) { lim_log(mac_ctx, LOGE, FL("Invalid A1 address in received frame")); return false; @@ -6842,13 +6842,13 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, void lim_check_and_reset_protection_params(tpAniSirGlobal mac_ctx) { if (!pe_get_active_session_count(mac_ctx)) { - cdf_mem_zero(&mac_ctx->lim.gLimOverlap11gParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlap11gParams, sizeof(mac_ctx->lim.gLimOverlap11gParams)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlap11aParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlap11aParams, sizeof(mac_ctx->lim.gLimOverlap11aParams)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlapHt20Params, + qdf_mem_zero(&mac_ctx->lim.gLimOverlapHt20Params, sizeof(mac_ctx->lim.gLimOverlapHt20Params)); - cdf_mem_zero(&mac_ctx->lim.gLimOverlapNonGfParams, + qdf_mem_zero(&mac_ctx->lim.gLimOverlapNonGfParams, sizeof(mac_ctx->lim.gLimOverlapNonGfParams)); mac_ctx->lim.gHTOperMode = eSIR_HT_OP_MODE_PURE; @@ -6932,7 +6932,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, } /* Allocate memory for the WMI request, and copy the parameter */ - vdev_ie = cdf_mem_malloc(sizeof(*vdev_ie) + num_bytes); + vdev_ie = qdf_mem_malloc(sizeof(*vdev_ie) + num_bytes); if (!vdev_ie) { lim_log(mac_ctx, LOGE, FL("Failed to allocate memory")); return QDF_STATUS_E_NOMEM; @@ -6949,7 +6949,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("%d byte is %02x"), i+1, *temp); vdev_ie->data = (uint8_t *)vdev_ie + sizeof(*vdev_ie); - cdf_mem_copy(vdev_ie->data, ext_cap_data.bytes, num_bytes); + qdf_mem_copy(vdev_ie->data, ext_cap_data.bytes, num_bytes); msg.type = WMA_SET_IE_INFO; msg.bodyptr = vdev_ie; @@ -6959,7 +6959,7 @@ QDF_STATUS lim_send_ext_cap_ie(tpAniSirGlobal mac_ctx, cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { lim_log(mac_ctx, LOGE, FL("Not able to post WMA_SET_IE_INFO to WDA")); - cdf_mem_free(vdev_ie); + qdf_mem_free(vdev_ie); return QDF_STATUS_E_FAILURE; } @@ -6992,7 +6992,7 @@ tSirRetStatus lim_strip_extcap_ie(tpAniSirGlobal mac_ctx, return eSIR_IGNORE_IE; } - tempbuf = cdf_mem_malloc(left); + tempbuf = qdf_mem_malloc(left); if (NULL == tempbuf) { lim_log(mac_ctx, LOGE, FL("Unable to allocate memory")); return eSIR_MEM_ALLOC_FAILED; @@ -7006,28 +7006,28 @@ tSirRetStatus lim_strip_extcap_ie(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("Invalid IEs eid = %d elem_len=%d left=%d"), elem_id, elem_len, left); - cdf_mem_free(tempbuf); + qdf_mem_free(tempbuf); return eSIR_FAILURE; } if (!(DOT11F_EID_EXTCAP == elem_id)) { - cdf_mem_copy(tempbuf + templen, &ptr[0], elem_len + 2); + qdf_mem_copy(tempbuf + templen, &ptr[0], elem_len + 2); templen += (elem_len + 2); } else { if (NULL != extracted_ie) { - cdf_mem_set(extracted_ie, + qdf_mem_set(extracted_ie, DOT11F_IE_EXTCAP_MAX_LEN + 2, 0); if (elem_len <= DOT11F_IE_EXTCAP_MAX_LEN) - cdf_mem_copy(extracted_ie, &ptr[0], + qdf_mem_copy(extracted_ie, &ptr[0], elem_len + 2); } } left -= elem_len; ptr += (elem_len + 2); } - cdf_mem_copy(addn_ie, tempbuf, templen); + qdf_mem_copy(addn_ie, tempbuf, templen); *addn_ielen = templen; - cdf_mem_free(tempbuf); + qdf_mem_free(tempbuf); return eSIR_SUCCESS; } @@ -7064,8 +7064,8 @@ void lim_update_extcap_struct(tpAniSirGlobal mac_ctx, return; } - cdf_mem_set((uint8_t *)&out[0], DOT11F_IE_EXTCAP_MAX_LEN, 0); - cdf_mem_copy(&out[0], &buf[2], DOT11F_IE_EXTCAP_MAX_LEN); + qdf_mem_set((uint8_t *)&out[0], DOT11F_IE_EXTCAP_MAX_LEN, 0); + qdf_mem_copy(&out[0], &buf[2], DOT11F_IE_EXTCAP_MAX_LEN); if (DOT11F_PARSE_SUCCESS != dot11f_unpack_ie_ext_cap(mac_ctx, &out[0], DOT11F_IE_EXTCAP_MAX_LEN, dst)) @@ -7091,7 +7091,7 @@ tSirRetStatus lim_strip_extcap_update_struct(tpAniSirGlobal mac_ctx, uint8_t extracted_buff[DOT11F_IE_EXTCAP_MAX_LEN + 2]; tSirRetStatus status; - cdf_mem_set((uint8_t *)&extracted_buff[0], DOT11F_IE_EXTCAP_MAX_LEN + 2, + qdf_mem_set((uint8_t *)&extracted_buff[0], DOT11F_IE_EXTCAP_MAX_LEN + 2, 0); status = lim_strip_extcap_ie(mac_ctx, addn_ie, addn_ielen, extracted_buff); diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 05af857782c0..ecad9b163cfd 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -156,7 +156,7 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, PELOGE(lim_log(pMac, LOGE, FL("Invalid parameters"));) return eSIR_FAILURE; } - pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); + pMaxTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { lim_log(pMac, LOGP, FL("Unable to allocate memory for pMaxTxParams ")); @@ -165,9 +165,9 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, } /* Allocated memory for pMaxTxParams...will be freed in other module */ pMaxTxParams->power = txPower; - cdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, + qdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, + qdf_mem_copy(pMaxTxParams->selfStaMacAddr.bytes, pSessionEntry->selfMacAddr, QDF_MAC_ADDR_SIZE); @@ -187,7 +187,7 @@ rrm_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, FL ("Posting WMA_SET_MAX_TX_POWER_REQ to HAL failed, reason=%X"), retCode); - cdf_mem_free(pMaxTxParams); + qdf_mem_free(pMaxTxParams); return retCode; } return retCode; @@ -239,7 +239,7 @@ tSirRetStatus rrm_set_max_tx_power_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ) } } - cdf_mem_free(limMsgQ->bodyptr); + qdf_mem_free(limMsgQ->bodyptr); limMsgQ->bodyptr = NULL; return retCode; } @@ -381,19 +381,19 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac, (pNeighborRep->num_NeighborReport - 1)); /* Prepare the request to send to SME. */ - pSmeNeighborRpt = cdf_mem_malloc(length); + pSmeNeighborRpt = qdf_mem_malloc(length); if (NULL == pSmeNeighborRpt) { PELOGE(lim_log(pMac, LOGP, FL("Unable to allocate memory"));) return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(pSmeNeighborRpt, length, 0); + qdf_mem_set(pSmeNeighborRpt, length, 0); /* Allocated memory for pSmeNeighborRpt...will be freed by other module */ for (i = 0; i < pNeighborRep->num_NeighborReport; i++) { pSmeNeighborRpt->sNeighborBssDescription[i].length = sizeof(tSirNeighborBssDescription); /*+ any optional ies */ - cdf_mem_copy(pSmeNeighborRpt->sNeighborBssDescription[i].bssId, + qdf_mem_copy(pSmeNeighborRpt->sNeighborBssDescription[i].bssId, pNeighborRep->NeighborReport[i].bssid, sizeof(tSirMacAddr)); pSmeNeighborRpt->sNeighborBssDescription[i].bssidInfo.rrmInfo. @@ -436,7 +436,7 @@ rrm_process_neighbor_report_response(tpAniSirGlobal pMac, pSmeNeighborRpt->length = length; pSmeNeighborRpt->sessionId = pSessionEntry->smeSessionId; pSmeNeighborRpt->numNeighborReports = pNeighborRep->num_NeighborReport; - cdf_mem_copy(pSmeNeighborRpt->bssId, pSessionEntry->bssId, + qdf_mem_copy(pSmeNeighborRpt->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr)); /* Send request to SME. */ @@ -489,12 +489,12 @@ rrm_process_neighbor_report_req(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("SSID present = %d "), pNeighborReq->noSSID); - cdf_mem_set(&NeighborReportReq, sizeof(tSirMacNeighborReportReq), 0); + qdf_mem_set(&NeighborReportReq, sizeof(tSirMacNeighborReportReq), 0); NeighborReportReq.dialogToken = ++pMac->rrm.rrmPEContext.DialogToken; NeighborReportReq.ssid_present = !pNeighborReq->noSSID; if (NeighborReportReq.ssid_present) { - cdf_mem_copy(&NeighborReportReq.ssid, &pNeighborReq->ucSSID, + qdf_mem_copy(&NeighborReportReq.ssid, &pNeighborReq->ucSSID, sizeof(tSirMacSSid)); PELOGE(sir_dump_buf (pMac, SIR_LIM_MODULE_ID, LOGE, @@ -601,7 +601,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, if (pBeaconReq->measurement_request.Beacon.RequestedInfo.present) { pCurrentReq->request.Beacon.reqIes.pElementIds = - cdf_mem_malloc(sizeof(uint8_t) * + qdf_mem_malloc(sizeof(uint8_t) * pBeaconReq->measurement_request.Beacon. RequestedInfo.num_requested_eids); if (NULL == pCurrentReq->request.Beacon.reqIes.pElementIds) { @@ -615,7 +615,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, pCurrentReq->request.Beacon.reqIes.num = pBeaconReq->measurement_request.Beacon.RequestedInfo. num_requested_eids; - cdf_mem_copy(pCurrentReq->request.Beacon.reqIes.pElementIds, + qdf_mem_copy(pCurrentReq->request.Beacon.reqIes.pElementIds, pBeaconReq->measurement_request.Beacon. RequestedInfo.requested_eids, pCurrentReq->request.Beacon.reqIes.num); @@ -631,7 +631,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, APChannelReport[num_APChanReport].num_channelList; } /* Prepare the request to send to SME. */ - pSmeBcnReportReq = cdf_mem_malloc(sizeof(tSirBeaconReportReqInd)); + pSmeBcnReportReq = qdf_mem_malloc(sizeof(tSirBeaconReportReqInd)); if (NULL == pSmeBcnReportReq) { lim_log(pMac, LOGP, FL @@ -641,10 +641,10 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, } - cdf_mem_set(pSmeBcnReportReq, sizeof(tSirBeaconReportReqInd), 0); + qdf_mem_set(pSmeBcnReportReq, sizeof(tSirBeaconReportReqInd), 0); /* Allocated memory for pSmeBcnReportReq....will be freed by other modulea */ - cdf_mem_copy(pSmeBcnReportReq->bssId, pSessionEntry->bssId, + qdf_mem_copy(pSmeBcnReportReq->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr)); pSmeBcnReportReq->messageType = eWNI_SME_BEACON_REPORT_REQ_IND; pSmeBcnReportReq->length = sizeof(tSirBeaconReportReqInd); @@ -659,14 +659,14 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, pSmeBcnReportReq->measurementDuration[0] = SYS_TU_TO_MS(measDuration); pSmeBcnReportReq->fMeasurementtype[0] = pBeaconReq->measurement_request.Beacon.meas_mode; - cdf_mem_copy(pSmeBcnReportReq->macaddrBssid, + qdf_mem_copy(pSmeBcnReportReq->macaddrBssid, pBeaconReq->measurement_request.Beacon.BSSID, sizeof(tSirMacAddr)); if (pBeaconReq->measurement_request.Beacon.SSID.present) { pSmeBcnReportReq->ssId.length = pBeaconReq->measurement_request.Beacon.SSID.num_ssid; - cdf_mem_copy(pSmeBcnReportReq->ssId.ssId, + qdf_mem_copy(pSmeBcnReportReq->ssId.ssId, pBeaconReq->measurement_request.Beacon.SSID.ssid, pSmeBcnReportReq->ssId.length); } @@ -681,7 +681,7 @@ rrm_process_beacon_report_req(tpAniSirGlobal pMac, num_APChanReport < pBeaconReq->measurement_request.Beacon.num_APChannelReport; num_APChanReport++) { - cdf_mem_copy(pChanList, + qdf_mem_copy(pChanList, pBeaconReq->measurement_request.Beacon. APChannelReport[num_APChanReport]. channelList, @@ -766,7 +766,7 @@ rrm_fill_beacon_ies(tpAniSirGlobal pMac, lim_log(pMac, LOG3, "Adding Eid %d, len=%d", *pBcnIes, len); - cdf_mem_copy(pIes, pBcnIes, len); + qdf_mem_copy(pIes, pBcnIes, len); pIes += len; *pNumIes += len; count++; @@ -839,7 +839,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, return eSIR_FAILURE; } - pReport = cdf_mem_malloc(pBcnReport->numBssDesc * + pReport = qdf_mem_malloc(pBcnReport->numBssDesc * sizeof(tSirMacRadioMeasureReport)); if (NULL == pReport) { @@ -850,7 +850,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_zero(pReport, + qdf_mem_zero(pReport, pBcnReport->numBssDesc * sizeof(tSirMacRadioMeasureReport)); @@ -879,7 +879,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, pBcnReport-> pBssDescription[bssDescCnt]-> channelId; - cdf_mem_copy(pReport[bssDescCnt].report. + qdf_mem_copy(pReport[bssDescCnt].report. beaconReport.measStartTime, pBcnReport-> pBssDescription @@ -913,7 +913,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, pBcnReport-> pBssDescription[bssDescCnt]-> parentTSF; - cdf_mem_copy(pReport[bssDescCnt].report. + qdf_mem_copy(pReport[bssDescCnt].report. beaconReport.bssid, pBcnReport-> pBssDescription @@ -1009,7 +1009,7 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, } if (NULL != pReport) - cdf_mem_free(pReport); + qdf_mem_free(pReport); return status; } @@ -1021,14 +1021,14 @@ void rrm_process_beacon_request_failure(tpAniSirGlobal pMac, tpSirMacRadioMeasureReport pReport = NULL; tpRRMReq pCurrentReq = pMac->rrm.rrmPEContext.pCurrentReq; - pReport = cdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); + pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); if (NULL == pReport) { lim_log(pMac, LOGP, FL ("Unable to allocate memory during RRM Req processing")); return; } - cdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); + qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); pReport->token = pCurrentReq->token; pReport->type = SIR_MAC_RRM_BEACON_TYPE; @@ -1045,14 +1045,14 @@ void rrm_process_beacon_request_failure(tpAniSirGlobal pMac, (" Beacon request processing failed no report sent with status %d "), status); ); - cdf_mem_free(pReport); + qdf_mem_free(pReport); return; } lim_send_radio_measure_report_action_frame(pMac, pCurrentReq->dialog_token, 1, pReport, peer, pSessionEntry); - cdf_mem_free(pReport); + qdf_mem_free(pReport); lim_log(pMac, LOG3, FL(" Free memory for pReport")); return; } @@ -1091,14 +1091,14 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, if (!pRRMReq->num_MeasurementRequest) { /* No measurement requests.... */ /* */ - pReport = cdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); + pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); if (NULL == pReport) { lim_log(pMac, LOGP, FL ("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); + qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); PELOGE(lim_log(pMac, LOGE, FL ("No requestIes in the measurement request, sending incapable report")); @@ -1109,7 +1109,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, pRRMReq->DialogToken.token, num_report, pReport, peer, pSessionEntry); - cdf_mem_free(pReport); + qdf_mem_free(pReport); return eSIR_FAILURE; } /* PF Fix */ @@ -1119,14 +1119,14 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, pRRMReq->NumOfRepetitions.repetitions); /* Send a report with incapable bit set. Not supporting repetitions. */ - pReport = cdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); + pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); if (NULL == pReport) { lim_log(pMac, LOGP, FL ("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); + qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); PELOGE(lim_log(pMac, LOGE, FL(" Allocated memory for pReport"));) pReport->incapable = 1; pReport->type = pRRMReq->MeasurementRequest[0].measurement_type; @@ -1142,7 +1142,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, if (pCurrentReq) { if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = - cdf_mem_malloc(sizeof + qdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) * (pRRMReq-> @@ -1154,7 +1154,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, ("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(pReport, + qdf_mem_set(pReport, sizeof (tSirMacRadioMeasureReport) * @@ -1177,17 +1177,17 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, continue; } else { pCurrentReq = - cdf_mem_malloc(sizeof(*pCurrentReq)); + qdf_mem_malloc(sizeof(*pCurrentReq)); if (NULL == pCurrentReq) { lim_log(pMac, LOGP, FL ("Unable to allocate memory during RRM Req processing")); - cdf_mem_free(pReport); + qdf_mem_free(pReport); return eSIR_MEM_ALLOC_FAILED; } lim_log(pMac, LOG3, FL(" Processing Beacon Report request")); - cdf_mem_set(pCurrentReq, sizeof(*pCurrentReq), + qdf_mem_set(pCurrentReq, sizeof(*pCurrentReq), 0); pCurrentReq->dialog_token = pRRMReq->DialogToken.token; @@ -1223,7 +1223,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, /* Send a report with incapabale bit set. */ if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ pReport = - cdf_mem_malloc(sizeof + qdf_mem_malloc(sizeof (tSirMacRadioMeasureReport) * (pRRMReq-> @@ -1235,7 +1235,7 @@ rrm_process_radio_measurement_request(tpAniSirGlobal pMac, ("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set(pReport, + qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport) * (pRRMReq->num_MeasurementRequest - i), 0); @@ -1261,7 +1261,7 @@ end: num_report, pReport, peer, pSessionEntry); - cdf_mem_free(pReport); + qdf_mem_free(pReport); lim_log(pMac, LOG3, FL(" Free memory for pReport")); } return status; @@ -1358,7 +1358,7 @@ tSirRetStatus rrm_initialize(tpAniSirGlobal pMac) pMac->rrm.rrmPEContext.rrmEnable = 0; - cdf_mem_set(pRRMCaps, sizeof(tRRMCaps), 0); + qdf_mem_set(pRRMCaps, sizeof(tRRMCaps), 0); pRRMCaps->LinkMeasurement = 1; pRRMCaps->NeighborRpt = 1; pRRMCaps->BeaconPassive = 1; @@ -1397,12 +1397,12 @@ tSirRetStatus rrm_cleanup(tpAniSirGlobal pMac) if (pMac->rrm.rrmPEContext.pCurrentReq) { if (pMac->rrm.rrmPEContext.pCurrentReq->request.Beacon.reqIes. pElementIds) { - cdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq-> + qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq-> request.Beacon.reqIes.pElementIds); lim_log(pMac, LOG4, FL(" Free memory for pElementIds")); } - cdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq); + qdf_mem_free(pMac->rrm.rrmPEContext.pCurrentReq); lim_log(pMac, LOG4, FL(" Free memory for pCurrentReq")); } @@ -1454,7 +1454,7 @@ void lim_update_rrm_capability(tpAniSirGlobal mac_ctx, tpSirSmeJoinReq join_req) { mac_ctx->rrm.rrmPEContext.rrmEnable = join_req->rrm_config.rrm_enabled; - cdf_mem_copy(&mac_ctx->rrm.rrmPEContext.rrmEnabledCaps, + qdf_mem_copy(&mac_ctx->rrm.rrmPEContext.rrmEnabledCaps, &join_req->rrm_config.rm_capability, RMENABLEDCAP_MAX_LEN); diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 5a6744da8f9f..48d6560be37b 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -245,7 +245,7 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, ("Indicating HAL to copy the beacon template [%d bytes] to memory"), size); - beaconParams = cdf_mem_malloc(sizeof(tSendbeaconParams)); + beaconParams = qdf_mem_malloc(sizeof(tSendbeaconParams)); if (NULL == beaconParams) return eSIR_MEM_ALLOC_FAILED; @@ -255,7 +255,7 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, msgQ.reserved = 0; /* Fill in tSendbeaconParams members */ - cdf_mem_copy(beaconParams->bssId, psessionEntry->bssId, + qdf_mem_copy(beaconParams->bssId, psessionEntry->bssId, sizeof(psessionEntry->bssId)); if (LIM_IS_IBSS_ROLE(psessionEntry)) { @@ -271,7 +271,7 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, sch_log(pMac, LOGE, FL("Invalid p2pIeOffset:[%d]"), pMac->sch.schObject.p2pIeOffset); QDF_ASSERT(0); - cdf_mem_free(beaconParams); + qdf_mem_free(beaconParams); return eSIR_FAILURE; } beaconParams->p2pIeOffset = pMac->sch.schObject.p2pIeOffset; @@ -288,15 +288,15 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload, /* free previous copy of the beacon */ if (psessionEntry->beacon) { - cdf_mem_free(psessionEntry->beacon); + qdf_mem_free(psessionEntry->beacon); } psessionEntry->bcnLen = 0; psessionEntry->beacon = NULL; - psessionEntry->beacon = cdf_mem_malloc(size); + psessionEntry->beacon = qdf_mem_malloc(size); if (psessionEntry->beacon != NULL) { - cdf_mem_copy(psessionEntry->beacon, beaconPayload, size); + qdf_mem_copy(psessionEntry->beacon, beaconPayload, size); psessionEntry->bcnLen = size; } @@ -341,7 +341,7 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, uint32_t offset = 0; uint8_t eid = 0xDD; - cdf_mem_copy(addIeWoP2pIe, ptr, left); + qdf_mem_copy(addIeWoP2pIe, ptr, left); *addnIELenWoP2pIe = left; if (addIeWoP2pIe != NULL) { @@ -354,11 +354,11 @@ uint32_t lim_remove_p2p_ie_from_add_ie(tpAniSirGlobal pMac, return eSIR_FAILURE; } if ((elem_id == eid) && - (cdf_mem_compare(&ptr[2], + (!qdf_mem_cmp(&ptr[2], "\x50\x6f\x9a\x09", 4))) { left -= elem_len; ptr += (elem_len + 2); - cdf_mem_copy(&addIeWoP2pIe[offset], ptr, left); + qdf_mem_copy(&addIeWoP2pIe[offset], ptr, left); *addnIELenWoP2pIe -= (2 + elem_len); } else { left -= elem_len; @@ -418,7 +418,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, * by the FW, may also have P2P IE which will fail * P2P cert case 6.1.3 */ - addIeWoP2pIe = cdf_mem_malloc(psessionEntry->addIeParams. + addIeWoP2pIe = qdf_mem_malloc(psessionEntry->addIeParams. probeRespDataLen); if (NULL == addIeWoP2pIe) { sch_log(pMac, LOGE, @@ -429,19 +429,19 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, retStatus = lim_remove_p2p_ie_from_add_ie(pMac, psessionEntry, addIeWoP2pIe, &addnIELenWoP2pIe); if (retStatus != eSIR_SUCCESS) { - cdf_mem_free(addIeWoP2pIe); + qdf_mem_free(addIeWoP2pIe); return eSIR_FAILURE; } /* Probe rsp IE available */ /*need to check the data length */ addIE = - cdf_mem_malloc(addnIELenWoP2pIe); + qdf_mem_malloc(addnIELenWoP2pIe); if (NULL == addIE) { sch_log(pMac, LOGE, FL ("Unable to get WNI_CFG_PROBE_RSP_ADDNIE_DATA1 length")); - cdf_mem_free(addIeWoP2pIe); + qdf_mem_free(addIeWoP2pIe); return eSIR_MEM_ALLOC_FAILED; } addnIELen = addnIELenWoP2pIe; @@ -449,11 +449,11 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, if (addnIELen <= WNI_CFG_PROBE_RSP_ADDNIE_DATA1_LEN && addnIELen && (nBytes + addnIELen) <= SIR_MAX_PACKET_SIZE) { - cdf_mem_copy(addIE, + qdf_mem_copy(addIE, addIeWoP2pIe, addnIELenWoP2pIe); } - cdf_mem_free(addIeWoP2pIe); + qdf_mem_free(addIeWoP2pIe); } if (addnIEPresent) { @@ -463,7 +463,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, addnIEPresent = false; /* Dont include the IE. */ } /* Paranoia: */ - cdf_mem_set(pFrame2Hal, nBytes, 0); + qdf_mem_set(pFrame2Hal, nBytes, 0); /* Next, we fill out the buffer descriptor: */ lim_populate_mac_header(pMac, pFrame2Hal, SIR_MAC_MGMT_FRAME, @@ -486,7 +486,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, FL("Failed to pack a Probe Response (0x%08x)."), nStatus); - cdf_mem_free(addIE); + qdf_mem_free(addIE); return retCode; /* allocated! */ } else if (DOT11F_WARNED(nStatus)) { sch_log(pMac, LOGE, FL("There were warnings while packing a P" @@ -494,14 +494,14 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, } if (addnIEPresent) { - cdf_mem_copy(&pFrame2Hal[nBytes - addnIELen], + qdf_mem_copy(&pFrame2Hal[nBytes - addnIELen], &addIE[0], addnIELen); } /* free the allocated Memory */ - cdf_mem_free(addIE); + qdf_mem_free(addIE); - pprobeRespParams = cdf_mem_malloc(sizeof(tSendProbeRespParams)); + pprobeRespParams = qdf_mem_malloc(sizeof(tSendProbeRespParams)); if (NULL == pprobeRespParams) { sch_log(pMac, LOGE, FL @@ -511,7 +511,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, sir_copy_mac_addr(pprobeRespParams->bssId, psessionEntry->bssId); pprobeRespParams->pProbeRespTemplate = pFrame2Hal; pprobeRespParams->probeRespTemplateLen = nBytes; - cdf_mem_copy(pprobeRespParams->ucProxyProbeReqValidIEBmap, + qdf_mem_copy(pprobeRespParams->ucProxyProbeReqValidIEBmap, IeBitmap, (sizeof(uint32_t) * 8)); msgQ.type = WMA_SEND_PROBE_RSP_TMPL; msgQ.reserved = 0; @@ -525,7 +525,7 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, FL ("lim_send_probe_rsp_template_to_hal: FAIL bytes %d retcode[%X]"), nBytes, retCode); - cdf_mem_free(pprobeRespParams); + qdf_mem_free(pprobeRespParams); } else { sch_log(pMac, LOG1, FL @@ -557,7 +557,7 @@ int sch_gen_timing_advert_frame(tpAniSirGlobal mac_ctx, tSirMacAddr self_addr, {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, }; - cdf_mem_zero((uint8_t *)&frame, sizeof(tDot11fTimingAdvertisementFrame)); + qdf_mem_zero((uint8_t *)&frame, sizeof(tDot11fTimingAdvertisementFrame)); /* Populate the TA fields */ status = populate_dot11f_timing_advert_frame(mac_ctx, &frame); @@ -578,12 +578,12 @@ int sch_gen_timing_advert_frame(tpAniSirGlobal mac_ctx, tSirMacAddr self_addr, } buf_size = sizeof(tSirMacMgmtHdr) + payload_size; - *buf = cdf_mem_malloc(buf_size); + *buf = qdf_mem_malloc(buf_size); if (*buf == NULL) { sch_log(mac_ctx, LOGE, FL("Cannot allocate memory")); return eSIR_FAILURE; } - cdf_mem_zero(*buf, buf_size); + qdf_mem_zero(*buf, buf_size); payload_size = 0; status = dot11f_pack_timing_advertisement_frame(mac_ctx, &frame, @@ -623,6 +623,6 @@ int sch_gen_timing_advert_frame(tpAniSirGlobal mac_ctx, tSirMacAddr self_addr, fail: if (*buf) - cdf_mem_free(*buf); + qdf_mem_free(*buf); return status; } diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index 28d19414a107..efb73f488d8c 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -73,7 +73,7 @@ tSirRetStatus sch_get_p2p_ie_offset(uint8_t *pExtraIe, uint32_t extraIeLen, /* Calculate the P2P IE Offset */ do { if (*pExtraIe == 0xDD) { - if (cdf_mem_compare + if (!qdf_mem_cmp ((void *)(pExtraIe + 2), &p2p_oui, sizeof(p2p_oui))) { status = eSIR_SUCCESS; break; @@ -117,7 +117,7 @@ sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session, ((len + *num_bytes) <= max_bcn_size))) return status; - cdf_mem_copy(&add_ie[0], session->addIeParams.probeRespBCNData_buff, + qdf_mem_copy(&add_ie[0], session->addIeParams.probeRespBCNData_buff, len); p2p_ie = limGetP2pIEPtr(mac_ctx, &add_ie[0], len); @@ -127,7 +127,7 @@ sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session, if (noa_len) { if ((noa_len + len) <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN) { - cdf_mem_copy(&add_ie[len], noa_strm, noa_len); + qdf_mem_copy(&add_ie[len], noa_strm, noa_len); len += noa_len; p2p_ie[1] += noa_len; } else { @@ -137,7 +137,7 @@ sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session, } } if (len <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN) { - cdf_mem_copy(frm, &add_ie[0], len); + qdf_mem_copy(frm, &add_ie[0], len); *num_bytes = *num_bytes + len; } else { sch_log(mac_ctx, LOGW, @@ -177,24 +177,24 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) tSirRetStatus status = eSIR_SUCCESS; bool is_vht_enabled = false; - bcn_1 = cdf_mem_malloc(sizeof(tDot11fBeacon1)); + bcn_1 = qdf_mem_malloc(sizeof(tDot11fBeacon1)); if (NULL == bcn_1) { sch_log(mac_ctx, LOGE, FL("Failed to allocate memory")); return eSIR_MEM_ALLOC_FAILED; } - bcn_2 = cdf_mem_malloc(sizeof(tDot11fBeacon2)); + bcn_2 = qdf_mem_malloc(sizeof(tDot11fBeacon2)); if (NULL == bcn_2) { sch_log(mac_ctx, LOGE, FL("Failed to allocate memory")); - cdf_mem_free(bcn_1); + qdf_mem_free(bcn_1); return eSIR_MEM_ALLOC_FAILED; } - wsc_prb_res = cdf_mem_malloc(sizeof(tDot11fIEWscProbeRes)); + wsc_prb_res = qdf_mem_malloc(sizeof(tDot11fIEWscProbeRes)); if (NULL == wsc_prb_res) { sch_log(mac_ctx, LOGE, FL("Failed to allocate memory")); - cdf_mem_free(bcn_1); - cdf_mem_free(bcn_2); + qdf_mem_free(bcn_1); + qdf_mem_free(bcn_2); return eSIR_MEM_ALLOC_FAILED; } @@ -204,7 +204,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) * First set the fixed fields: * set the TFP headers, set the mac header */ - cdf_mem_set((uint8_t *) &bcn_struct->macHdr, sizeof(tSirMacMgmtHdr), 0); + qdf_mem_set((uint8_t *) &bcn_struct->macHdr, sizeof(tSirMacMgmtHdr), 0); mac = (tpSirMacMgmtHdr) &bcn_struct->macHdr; mac->fc.type = SIR_MAC_MGMT_FRAME; mac->fc.subType = SIR_MAC_MGMT_BEACON; @@ -212,15 +212,15 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) for (i = 0; i < 6; i++) mac->da[i] = 0xff; - cdf_mem_copy(mac->sa, session->selfMacAddr, + qdf_mem_copy(mac->sa, session->selfMacAddr, sizeof(session->selfMacAddr)); - cdf_mem_copy(mac->bssId, session->bssId, sizeof(session->bssId)); + qdf_mem_copy(mac->bssId, session->bssId, sizeof(session->bssId)); mac->fc.fromDS = 0; mac->fc.toDS = 0; /* Now set the beacon body */ - cdf_mem_set((uint8_t *) bcn_1, sizeof(tDot11fBeacon1), 0); + qdf_mem_set((uint8_t *) bcn_1, sizeof(tDot11fBeacon1), 0); /* Skip over the timestamp (it'll be updated later). */ bcn_1->BeaconInterval.interval = @@ -247,11 +247,11 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) if (LIM_IS_AP_ROLE(session)) { /* Initialize the default IE bitmap to zero */ - cdf_mem_set((uint8_t *) &(session->DefProbeRspIeBitmap), + qdf_mem_set((uint8_t *) &(session->DefProbeRspIeBitmap), (sizeof(uint32_t) * 8), 0); /* Initialize the default IE bitmap to zero */ - cdf_mem_set((uint8_t *) &(session->probeRespFrame), + qdf_mem_set((uint8_t *) &(session->probeRespFrame), sizeof(session->probeRespFrame), 0); /* @@ -270,9 +270,9 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) sch_log(mac_ctx, LOGE, FL("Failed to packed a tDot11fBeacon1 (0x%08x.)."), n_status); - cdf_mem_free(bcn_1); - cdf_mem_free(bcn_2); - cdf_mem_free(wsc_prb_res); + qdf_mem_free(bcn_1); + qdf_mem_free(bcn_2); + qdf_mem_free(wsc_prb_res); return eSIR_FAILURE; } else if (DOT11F_WARNED(n_status)) { sch_log(mac_ctx, LOGE, @@ -280,7 +280,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) n_status); } /*changed to correct beacon corruption */ - cdf_mem_set((uint8_t *) bcn_2, sizeof(tDot11fBeacon2), 0); + qdf_mem_set((uint8_t *) bcn_2, sizeof(tDot11fBeacon2), 0); session->schBeaconOffsetBegin = offset + (uint16_t) n_bytes; sch_log(mac_ctx, LOG1, FL("Initialized beacon begin, offset %d"), offset); @@ -443,7 +443,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) set_probe_rsp_ie_bitmap( &session->DefProbeRspIeBitmap[0], SIR_MAC_WPA_EID); - cdf_mem_copy((void *) + qdf_mem_copy((void *) &session->probeRespFrame.WscProbeRes, (void *)wsc_prb_res, sizeof(tDot11fIEWscProbeRes)); @@ -459,9 +459,9 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) sch_log(mac_ctx, LOGE, FL("Failed to packed a tDot11fBeacon2 (0x%08x.)."), n_status); - cdf_mem_free(bcn_1); - cdf_mem_free(bcn_2); - cdf_mem_free(wsc_prb_res); + qdf_mem_free(bcn_1); + qdf_mem_free(bcn_2); + qdf_mem_free(wsc_prb_res); return eSIR_FAILURE; } else if (DOT11F_WARNED(n_status)) { sch_log(mac_ctx, LOGE, @@ -490,9 +490,9 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) sch_log(mac_ctx, LOG1, FL("Initialized beacon end, offset %d"), session->schBeaconOffsetEnd); mac_ctx->sch.schObject.fBeaconChanged = 1; - cdf_mem_free(bcn_1); - cdf_mem_free(bcn_2); - cdf_mem_free(wsc_prb_res); + qdf_mem_free(bcn_1); + qdf_mem_free(bcn_2); + qdf_mem_free(wsc_prb_res); return eSIR_SUCCESS; } @@ -510,7 +510,7 @@ tSirRetStatus lim_update_probe_rsp_template_ie_bitmap_beacon1(tpAniSirGlobal pMa DefProbeRspIeBitmap = &psessionEntry->DefProbeRspIeBitmap[0]; prb_rsp = &psessionEntry->probeRespFrame; prb_rsp->BeaconInterval = beacon1->BeaconInterval; - cdf_mem_copy((void *)&prb_rsp->Capabilities, + qdf_mem_copy((void *)&prb_rsp->Capabilities, (void *)&beacon1->Capabilities, sizeof(beacon1->Capabilities)); @@ -523,7 +523,7 @@ tSirRetStatus lim_update_probe_rsp_template_ie_bitmap_beacon1(tpAniSirGlobal pMa /* supported rates */ if (beacon1->SuppRates.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_RATESET_EID); - cdf_mem_copy((void *)&prb_rsp->SuppRates, + qdf_mem_copy((void *)&prb_rsp->SuppRates, (void *)&beacon1->SuppRates, sizeof(beacon1->SuppRates)); @@ -532,7 +532,7 @@ tSirRetStatus lim_update_probe_rsp_template_ie_bitmap_beacon1(tpAniSirGlobal pMa if (beacon1->DSParams.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_DS_PARAM_SET_EID); - cdf_mem_copy((void *)&prb_rsp->DSParams, + qdf_mem_copy((void *)&prb_rsp->DSParams, (void *)&beacon1->DSParams, sizeof(beacon1->DSParams)); @@ -551,7 +551,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* country */ if (beacon2->Country.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_COUNTRY_EID); - cdf_mem_copy((void *)&prb_rsp->Country, + qdf_mem_copy((void *)&prb_rsp->Country, (void *)&beacon2->Country, sizeof(beacon2->Country)); @@ -560,7 +560,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->PowerConstraints.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_PWR_CONSTRAINT_EID); - cdf_mem_copy((void *)&prb_rsp->PowerConstraints, + qdf_mem_copy((void *)&prb_rsp->PowerConstraints, (void *)&beacon2->PowerConstraints, sizeof(beacon2->PowerConstraints)); @@ -569,7 +569,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->ChanSwitchAnn.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_CHNL_SWITCH_ANN_EID); - cdf_mem_copy((void *)&prb_rsp->ChanSwitchAnn, + qdf_mem_copy((void *)&prb_rsp->ChanSwitchAnn, (void *)&beacon2->ChanSwitchAnn, sizeof(beacon2->ChanSwitchAnn)); @@ -579,7 +579,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->ext_chan_switch_ann.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_CHNL_EXTENDED_SWITCH_ANN_EID); - cdf_mem_copy((void *)&prb_rsp->ext_chan_switch_ann, + qdf_mem_copy((void *)&prb_rsp->ext_chan_switch_ann, (void *)&beacon2->ext_chan_switch_ann, sizeof(beacon2->ext_chan_switch_ann)); } @@ -588,7 +588,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->SuppOperatingClasses.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_OPERATING_CLASS_EID); - cdf_mem_copy((void *)&prb_rsp->SuppOperatingClasses, + qdf_mem_copy((void *)&prb_rsp->SuppOperatingClasses, (void *)&beacon2->SuppOperatingClasses, sizeof(beacon2->SuppOperatingClasses)); } @@ -597,7 +597,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->QComVendorIE.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_QCOM_VENDOR_EID); - cdf_mem_copy((void *)&prb_rsp->QComVendorIE, + qdf_mem_copy((void *)&prb_rsp->QComVendorIE, (void *)&beacon2->QComVendorIE, sizeof(beacon2->QComVendorIE)); } @@ -606,7 +606,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* ERP information */ if (beacon2->ERPInfo.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_ERP_INFO_EID); - cdf_mem_copy((void *)&prb_rsp->ERPInfo, + qdf_mem_copy((void *)&prb_rsp->ERPInfo, (void *)&beacon2->ERPInfo, sizeof(beacon2->ERPInfo)); @@ -615,7 +615,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->ExtSuppRates.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_EXTENDED_RATE_EID); - cdf_mem_copy((void *)&prb_rsp->ExtSuppRates, + qdf_mem_copy((void *)&prb_rsp->ExtSuppRates, (void *)&beacon2->ExtSuppRates, sizeof(beacon2->ExtSuppRates)); @@ -624,7 +624,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* WPA */ if (beacon2->WPA.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_WPA_EID); - cdf_mem_copy((void *)&prb_rsp->WPA, (void *)&beacon2->WPA, + qdf_mem_copy((void *)&prb_rsp->WPA, (void *)&beacon2->WPA, sizeof(beacon2->WPA)); } @@ -632,7 +632,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* RSN */ if (beacon2->RSNOpaque.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_RSN_EID); - cdf_mem_copy((void *)&prb_rsp->RSNOpaque, + qdf_mem_copy((void *)&prb_rsp->RSNOpaque, (void *)&beacon2->RSNOpaque, sizeof(beacon2->RSNOpaque)); } @@ -641,7 +641,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->EDCAParamSet.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_EDCA_PARAM_SET_EID); - cdf_mem_copy((void *)&prb_rsp->EDCAParamSet, + qdf_mem_copy((void *)&prb_rsp->EDCAParamSet, (void *)&beacon2->EDCAParamSet, sizeof(beacon2->EDCAParamSet)); @@ -652,34 +652,34 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, if (beacon2->HTCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_HT_CAPABILITIES_EID); - cdf_mem_copy((void *)&prb_rsp->HTCaps, (void *)&beacon2->HTCaps, + qdf_mem_copy((void *)&prb_rsp->HTCaps, (void *)&beacon2->HTCaps, sizeof(beacon2->HTCaps)); } /* HT Info IE */ if (beacon2->HTInfo.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_HT_INFO_EID); - cdf_mem_copy((void *)&prb_rsp->HTInfo, (void *)&beacon2->HTInfo, + qdf_mem_copy((void *)&prb_rsp->HTInfo, (void *)&beacon2->HTInfo, sizeof(beacon2->HTInfo)); } #ifdef WLAN_FEATURE_11AC if (beacon2->VHTCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_VHT_CAPABILITIES_EID); - cdf_mem_copy((void *)&prb_rsp->VHTCaps, + qdf_mem_copy((void *)&prb_rsp->VHTCaps, (void *)&beacon2->VHTCaps, sizeof(beacon2->VHTCaps)); } if (beacon2->VHTOperation.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_VHT_OPERATION_EID); - cdf_mem_copy((void *)&prb_rsp->VHTOperation, + qdf_mem_copy((void *)&prb_rsp->VHTOperation, (void *)&beacon2->VHTOperation, sizeof(beacon2->VHTOperation)); } if (beacon2->VHTExtBssLoad.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_VHT_EXT_BSS_LOAD_EID); - cdf_mem_copy((void *)&prb_rsp->VHTExtBssLoad, + qdf_mem_copy((void *)&prb_rsp->VHTExtBssLoad, (void *)&beacon2->VHTExtBssLoad, sizeof(beacon2->VHTExtBssLoad)); } @@ -688,14 +688,14 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* WMM IE */ if (beacon2->WMMParams.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_WPA_EID); - cdf_mem_copy((void *)&prb_rsp->WMMParams, + qdf_mem_copy((void *)&prb_rsp->WMMParams, (void *)&beacon2->WMMParams, sizeof(beacon2->WMMParams)); } /* WMM capability - most of the case won't be present */ if (beacon2->WMMCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_WPA_EID); - cdf_mem_copy((void *)&prb_rsp->WMMCaps, + qdf_mem_copy((void *)&prb_rsp->WMMCaps, (void *)&beacon2->WMMCaps, sizeof(beacon2->WMMCaps)); } @@ -703,7 +703,7 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, /* Extended Capability */ if (beacon2->ExtCap.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, DOT11F_EID_EXTCAP); - cdf_mem_copy((void *)&prb_rsp->ExtCap, + qdf_mem_copy((void *)&prb_rsp->ExtCap, (void *)&beacon2->ExtCap, sizeof(beacon2->ExtCap)); } @@ -878,8 +878,8 @@ void sch_process_pre_beacon_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) tpPESession psessionEntry; uint8_t sessionId; - if ((psessionEntry = - pe_find_session_by_bssid(pMac, pMsg->bssId, &sessionId)) == NULL) { + psessionEntry = pe_find_session_by_bssid(pMac, pMsg->bssId, &sessionId); + if (psessionEntry == NULL) { PELOGE(sch_log(pMac, LOGE, FL("session lookup fails"));) goto end; } @@ -945,6 +945,6 @@ void sch_process_pre_beacon_ind(tpAniSirGlobal pMac, tpSirMsgQ limMsg) } end: - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); } diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index 10809e6b372f..a8b8ed89ad0f 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -392,7 +392,7 @@ sch_bcn_process_sta_bt_amp_sta(tpAniSirGlobal mac_ctx, return false; beaconParams->bssIdx = *bssIdx; - cdf_mem_copy((uint8_t *) &session->lastBeaconTimeStamp, + qdf_mem_copy((uint8_t *) &session->lastBeaconTimeStamp, (uint8_t *) bcn->timeStamp, sizeof(uint64_t)); session->lastBeaconDtimCount = bcn->tim.dtimCount; session->lastBeaconDtimPeriod = bcn->tim.dtimPeriod; @@ -727,7 +727,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, #if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI int8_t regMax = 0, maxTxPower = 0; #endif - cdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); beaconParams.paramChangeBitmap = 0; if (LIM_IS_IBSS_ROLE(session)) { @@ -863,7 +863,7 @@ sch_beacon_process(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, tpPESession ap_session = NULL; uint8_t i; - cdf_mem_zero(&bcn_prm, sizeof(tUpdateBeaconParams)); + qdf_mem_zero(&bcn_prm, sizeof(tUpdateBeaconParams)); bcn_prm.paramChangeBitmap = 0; mac_ctx->sch.gSchBcnRcvCnt++; /* Convert the beacon frame into a structure */ diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index 059dbcdd3aef..aab767f6a159 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -212,7 +212,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; } mac_ctx = PMAC_STRUCT(hHal); @@ -220,19 +220,19 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, FL("Invalid mac context")); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; } if (NULL == mac_ctx->ftm_msg_processor_callback) { QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, FL("callback pointer is NULL")); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; } mac_ctx->ftm_msg_processor_callback( (void *)pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; default: @@ -251,7 +251,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg) qdf_status = QDF_STATUS_E_BADMSG; if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } return qdf_status; } @@ -345,7 +345,7 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg) * It allocate memory for bodyptr free the mem and return */ if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } } diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index ab955b42ff2d..b6109f0d97ac 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h @@ -50,7 +50,7 @@ extern "C" { #include "qdf_mc_timer.h" #include "qdf_types.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" /* Interlocked Compare Exchange related definitions */ diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c index 02a46f51fb50..387685742f88 100644 --- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c +++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c @@ -120,12 +120,12 @@ tSirRetStatus mac_open(tHalHandle *pHalHandle, tHddHandle hHdd, */ /* Allocate p_mac */ - p_mac = cdf_mem_malloc(sizeof(tAniSirGlobal)); + p_mac = qdf_mem_malloc(sizeof(tAniSirGlobal)); if (NULL == p_mac) return eSIR_MEM_ALLOC_FAILED; /* Initialize the p_mac structure */ - cdf_mem_set(p_mac, sizeof(tAniSirGlobal), 0); + qdf_mem_set(p_mac, sizeof(tAniSirGlobal), 0); /* * Set various global fields of p_mac here @@ -138,13 +138,13 @@ tSirRetStatus mac_open(tHalHandle *pHalHandle, tHddHandle hHdd, { /* Call various PE (and other layer init here) */ if (eSIR_SUCCESS != log_init(p_mac)) { - cdf_mem_free(p_mac); + qdf_mem_free(p_mac); return eSIR_FAILURE; } /* Call routine to initialize CFG data structures */ if (eSIR_SUCCESS != cfg_init(p_mac)) { - cdf_mem_free(p_mac); + qdf_mem_free(p_mac); return eSIR_FAILURE; } @@ -158,7 +158,7 @@ tSirRetStatus mac_open(tHalHandle *pHalHandle, tHddHandle hHdd, status = pe_open(p_mac, pMacOpenParms); if (eSIR_SUCCESS != status) { sys_log(p_mac, LOGE, FL("mac_open failure\n")); - cdf_mem_free(p_mac); + qdf_mem_free(p_mac); } return status; @@ -188,7 +188,7 @@ tSirRetStatus mac_close(tHalHandle hHal) log_deinit(pMac); /* Finally, de-allocate the global MAC datastructure: */ - cdf_mem_free(pMac); + qdf_mem_free(pMac); return eSIR_SUCCESS; } diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c index 97703dc45994..057de0544b15 100644 --- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c +++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c @@ -78,7 +78,7 @@ tSirRetStatus postPTTMsgApi(tpAniSirGlobal pMac, tSirMsgQ *pMsg); tSirRetStatus sys_init_globals(tpAniSirGlobal pMac) { - cdf_mem_set((uint8_t *) &pMac->sys, sizeof(pMac->sys), 0); + qdf_mem_set((uint8_t *) &pMac->sys, sizeof(pMac->sys), 0); pMac->sys.gSysEnableScanMode = 1; pMac->sys.gSysEnableLinkMonitorMode = 0; diff --git a/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h b/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h index 8cc4e9789910..7a155bf8cdee 100644 --- a/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h +++ b/core/mac/src/sys/legacy/src/utils/inc/dot11fdefs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -45,11 +45,11 @@ /* This controls how the "dot11f" code copies memory */ #define DOT11F_MEMCPY(ctx, dst, src, len) \ - cdf_mem_copy((uint8_t *)(dst), (uint8_t *)(src), (len)) + qdf_mem_copy((uint8_t *)(dst), (uint8_t *)(src), (len)) /* This controls how the "dot11f" code compares memory */ #define DOT11F_MEMCMP(ctx, lhs, rhs, len) \ - (!cdf_mem_compare((uint8_t *)(lhs), (uint8_t *)(rhs), (len))) + (qdf_mem_cmp((uint8_t *)(lhs), (uint8_t *)(rhs), (len))) #if defined(DBG) && (DBG != 0) diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 0c2038a3aafa..92c4280d8988 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -44,7 +44,7 @@ #include "csr_neighbor_roam.h" #include "csr_internal.h" #include "lim_global.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_trace.h" #include "wma_if.h" diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 30ea1a79bd8d..7a5e691a6859 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -415,7 +415,7 @@ populate_dot11f_country(tpAniSirGlobal pMac, CFG_GET_STR(nSirStatus, pMac, WNI_CFG_COUNTRY_CODE, code, codelen, 3); - cdf_mem_copy(pDot11f->country, code, codelen); + qdf_mem_copy(pDot11f->country, code, codelen); if (len > MAX_SIZE_OF_TRIPLETS_IN_COUNTRY_IE) { dot11f_log(pMac, LOGE, @@ -425,7 +425,7 @@ populate_dot11f_country(tpAniSirGlobal pMac, } pDot11f->num_triplets = (uint8_t) (len / 3); - cdf_mem_copy((uint8_t *) pDot11f->triplets, temp, len); + qdf_mem_copy((uint8_t *) pDot11f->triplets, temp, len); pDot11f->present = 1; } @@ -619,7 +619,7 @@ populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac, uint8_t nChannelNum, if (POPULATE_DOT11F_RATES_OPERATIONAL == nChannelNum) { if (psessionEntry != NULL) { nRates = psessionEntry->extRateSet.numRates; - cdf_mem_copy(rates, psessionEntry->extRateSet.rate, + qdf_mem_copy(rates, psessionEntry->extRateSet.rate, nRates); } else { dot11f_log(pMac, LOGE, @@ -634,7 +634,7 @@ populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac, uint8_t nChannelNum, if (0 != nRates) { pDot11f->num_rates = (uint8_t) nRates; - cdf_mem_copy(pDot11f->rates, rates, nRates); + qdf_mem_copy(pDot11f->rates, rates, nRates); pDot11f->present = 1; } @@ -663,7 +663,7 @@ populate_dot11f_ext_supp_rates1(tpAniSirGlobal pMac, if (0 != nRates) { pDot11f->num_rates = (uint8_t) nRates; - cdf_mem_copy(pDot11f->rates, rates, nRates); + qdf_mem_copy(pDot11f->rates, rates, nRates); pDot11f->present = 1; } @@ -1582,7 +1582,7 @@ tSirRetStatus populate_dot11f_rsn_opaque(tpAniSirGlobal pMac, if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; - cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ + qdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ pRsnIe->rsnIEdata[idx + 1]); } } @@ -1633,7 +1633,7 @@ tSirRetStatus populate_dot11f_wapi_opaque(tpAniSirGlobal pMac, if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1]; - cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ + qdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2, /* EID, len */ pRsnIe->rsnIEdata[idx + 1]); } } @@ -1651,7 +1651,7 @@ populate_dot11f_ssid(tpAniSirGlobal pMac, pDot11f->present = 1; pDot11f->num_ssid = pInternal->length; if (pInternal->length) { - cdf_mem_copy((uint8_t *) pDot11f->ssid, + qdf_mem_copy((uint8_t *) pDot11f->ssid, (uint8_t *) &pInternal->ssId, pInternal->length); } } /* End populate_dot11f_ssid. */ @@ -1731,7 +1731,7 @@ populate_dot11f_supp_rates(tpAniSirGlobal pMac, #endif /* TO SUPPORT BT-AMP */ if (psessionEntry != NULL) { nRates = psessionEntry->rateSet.numRates; - cdf_mem_copy(rates, psessionEntry->rateSet.rate, + qdf_mem_copy(rates, psessionEntry->rateSet.rate, nRates); } else { dot11f_log(pMac, LOGE, @@ -1749,7 +1749,7 @@ populate_dot11f_supp_rates(tpAniSirGlobal pMac, if (0 != nRates) { pDot11f->num_rates = (uint8_t) nRates; - cdf_mem_copy(pDot11f->rates, rates, nRates); + qdf_mem_copy(pDot11f->rates, rates, nRates); pDot11f->present = 1; } @@ -1832,18 +1832,18 @@ populate_dot11f_rates_tdls(tpAniSirGlobal p_mac, if (temp_rateset.numRates <= MAX_NUM_SUPPORTED_RATES) { p_supp_rates->num_rates = temp_rateset.numRates; - cdf_mem_copy(p_supp_rates->rates, temp_rateset.rate, + qdf_mem_copy(p_supp_rates->rates, temp_rateset.rate, p_supp_rates->num_rates); p_supp_rates->present = 1; } else { /* Populate extended capability as well */ p_supp_rates->num_rates = MAX_NUM_SUPPORTED_RATES; - cdf_mem_copy(p_supp_rates->rates, temp_rateset.rate, + qdf_mem_copy(p_supp_rates->rates, temp_rateset.rate, p_supp_rates->num_rates); p_supp_rates->present = 1; p_ext_supp_rates->num_rates = temp_rateset.numRates - MAX_NUM_SUPPORTED_RATES; - cdf_mem_copy(p_ext_supp_rates->rates, + qdf_mem_copy(p_ext_supp_rates->rates, (uint8_t *)temp_rateset.rate + MAX_NUM_SUPPORTED_RATES, p_ext_supp_rates->num_rates); @@ -2122,7 +2122,7 @@ tSirRetStatus populate_dot11f_wpa_opaque(tpAniSirGlobal pMac, if (0 <= idx) { pDot11f->present = 1; pDot11f->num_data = pRsnIe->rsnIEdata[idx + 1] - 4; - cdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, len, OUI */ + qdf_mem_copy(pDot11f->data, pRsnIe->rsnIEdata + idx + 2 + 4, /* EID, len, OUI */ pRsnIe->rsnIEdata[idx + 1] - 4); /* OUI */ } } @@ -2142,7 +2142,7 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, tDot11fProbeRequest pr; /* Ok, zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pProbeReq, sizeof(tSirProbeReq), 0); + qdf_mem_set((uint8_t *) pProbeReq, sizeof(tSirProbeReq), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_probe_request(pMac, pFrame, nFrame, &pr); @@ -2193,7 +2193,7 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, } if (pr.HTCaps.present) { - cdf_mem_copy(&pProbeReq->HTCaps, &pr.HTCaps, + qdf_mem_copy(&pProbeReq->HTCaps, &pr.HTCaps, sizeof(tDot11fIEHTCaps)); } @@ -2204,7 +2204,7 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, } #ifdef WLAN_FEATURE_11AC if (pr.VHTCaps.present) { - cdf_mem_copy(&pProbeReq->VHTCaps, &pr.VHTCaps, + qdf_mem_copy(&pProbeReq->VHTCaps, &pr.VHTCaps, sizeof(tDot11fIEVHTCaps)); } #endif @@ -2226,15 +2226,15 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, tDot11fProbeResponse *pr; /* Ok, zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pProbeResp, sizeof(tSirProbeRespBeacon), 0); + qdf_mem_set((uint8_t *) pProbeResp, sizeof(tSirProbeRespBeacon), 0); - pr = cdf_mem_malloc(sizeof(tDot11fProbeResponse)); + pr = qdf_mem_malloc(sizeof(tDot11fProbeResponse)); if (NULL == pr) { lim_log(pMac, LOGE, FL("Failed to allocate memory\n")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pr, sizeof(tDot11fProbeResponse), 0); + qdf_mem_set((uint8_t *) pr, sizeof(tDot11fProbeResponse), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_probe_response(pMac, pFrame, nFrame, pr); @@ -2246,7 +2246,7 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, PELOG2(sir_dump_buf (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame); ) - cdf_mem_free(pr); + qdf_mem_free(pr); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, @@ -2260,7 +2260,7 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, /* & "transliterate" from a 'tDot11fProbeResponse' to a 'tSirProbeRespBeacon'... */ /* Timestamp */ - cdf_mem_copy((uint8_t *) pProbeResp->timeStamp, + qdf_mem_copy((uint8_t *) pProbeResp->timeStamp, (uint8_t *) &pr->TimeStamp, sizeof(tSirMacTimeStamp)); /* Beacon Interval */ @@ -2332,57 +2332,57 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, if (pr->ChanSwitchAnn.present) { pProbeResp->channelSwitchPresent = 1; - cdf_mem_copy(&pProbeResp->channelSwitchIE, &pr->ChanSwitchAnn, + qdf_mem_copy(&pProbeResp->channelSwitchIE, &pr->ChanSwitchAnn, sizeof(pProbeResp->channelSwitchIE)); } if (pr->ext_chan_switch_ann.present) { pProbeResp->ext_chan_switch_present = 1; - cdf_mem_copy(&pProbeResp->ext_chan_switch, + qdf_mem_copy(&pProbeResp->ext_chan_switch, &pr->ext_chan_switch_ann, sizeof(tDot11fIEext_chan_switch_ann)); } if (pr->SuppOperatingClasses.present) { pProbeResp->supp_operating_class_present = 1; - cdf_mem_copy(&pProbeResp->supp_operating_classes, + qdf_mem_copy(&pProbeResp->supp_operating_classes, &pr->SuppOperatingClasses, sizeof(tDot11fIESuppOperatingClasses)); } if (pr->sec_chan_offset_ele.present) { pProbeResp->sec_chan_offset_present = 1; - cdf_mem_copy(&pProbeResp->sec_chan_offset, + qdf_mem_copy(&pProbeResp->sec_chan_offset, &pr->sec_chan_offset_ele, sizeof(pProbeResp->sec_chan_offset)); } if (pr->TPCReport.present) { pProbeResp->tpcReportPresent = 1; - cdf_mem_copy(&pProbeResp->tpcReport, &pr->TPCReport, + qdf_mem_copy(&pProbeResp->tpcReport, &pr->TPCReport, sizeof(tDot11fIETPCReport)); } if (pr->PowerConstraints.present) { pProbeResp->powerConstraintPresent = 1; - cdf_mem_copy(&pProbeResp->localPowerConstraint, + qdf_mem_copy(&pProbeResp->localPowerConstraint, &pr->PowerConstraints, sizeof(tDot11fIEPowerConstraints)); } if (pr->Quiet.present) { pProbeResp->quietIEPresent = 1; - cdf_mem_copy(&pProbeResp->quietIE, &pr->Quiet, + qdf_mem_copy(&pProbeResp->quietIE, &pr->Quiet, sizeof(tDot11fIEQuiet)); } if (pr->HTCaps.present) { - cdf_mem_copy(&pProbeResp->HTCaps, &pr->HTCaps, + qdf_mem_copy(&pProbeResp->HTCaps, &pr->HTCaps, sizeof(tDot11fIEHTCaps)); } if (pr->HTInfo.present) { - cdf_mem_copy(&pProbeResp->HTInfo, &pr->HTInfo, + qdf_mem_copy(&pProbeResp->HTInfo, &pr->HTInfo, sizeof(tDot11fIEHTInfo)); } @@ -2434,7 +2434,7 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, if (pr->MobilityDomain.present) { /* MobilityDomain */ pProbeResp->mdiePresent = 1; - cdf_mem_copy((uint8_t *) &(pProbeResp->mdie[0]), + qdf_mem_copy((uint8_t *) &(pProbeResp->mdie[0]), (uint8_t *) &(pr->MobilityDomain.MDID), sizeof(uint16_t)); pProbeResp->mdie[2] = @@ -2452,25 +2452,25 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, if (pr->ESEVersion.present) pProbeResp->is_ese_ver_ie_present = 1; if (pr->QBSSLoad.present) { - cdf_mem_copy(&pProbeResp->QBSSLoad, &pr->QBSSLoad, + qdf_mem_copy(&pProbeResp->QBSSLoad, &pr->QBSSLoad, sizeof(tDot11fIEQBSSLoad)); } #endif if (pr->P2PProbeRes.present) { - cdf_mem_copy(&pProbeResp->P2PProbeRes, &pr->P2PProbeRes, + qdf_mem_copy(&pProbeResp->P2PProbeRes, &pr->P2PProbeRes, sizeof(tDot11fIEP2PProbeRes)); } #ifdef WLAN_FEATURE_11AC if (pr->VHTCaps.present) { - cdf_mem_copy(&pProbeResp->VHTCaps, &pr->VHTCaps, + qdf_mem_copy(&pProbeResp->VHTCaps, &pr->VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pr->VHTOperation.present) { - cdf_mem_copy(&pProbeResp->VHTOperation, &pr->VHTOperation, + qdf_mem_copy(&pProbeResp->VHTOperation, &pr->VHTOperation, sizeof(tDot11fIEVHTOperation)); } if (pr->VHTExtBssLoad.present) { - cdf_mem_copy(&pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, + qdf_mem_copy(&pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, sizeof(tDot11fIEVHTExtBssLoad)); } #endif @@ -2483,16 +2483,16 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, pProbeResp->vendor2_ie.sub_type = pr->vendor2_ie.sub_type; } if (pr->vendor2_ie.VHTCaps.present) { - cdf_mem_copy(&pProbeResp->vendor2_ie.VHTCaps, + qdf_mem_copy(&pProbeResp->vendor2_ie.VHTCaps, &pr->vendor2_ie.VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pr->vendor2_ie.VHTOperation.present) { - cdf_mem_copy(&pProbeResp->vendor2_ie.VHTOperation, + qdf_mem_copy(&pProbeResp->vendor2_ie.VHTOperation, &pr->vendor2_ie.VHTOperation, sizeof(tDot11fIEVHTOperation)); } - cdf_mem_free(pr); + qdf_mem_free(pr); return eSIR_SUCCESS; } /* End sir_convert_probe_frame2_struct. */ @@ -2505,14 +2505,14 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, tDot11fAssocRequest *ar; uint32_t status; - ar = cdf_mem_malloc(sizeof(tDot11fAssocRequest)); + ar = qdf_mem_malloc(sizeof(tDot11fAssocRequest)); if (NULL == ar) { lim_log(pMac, LOGE, FL("Failed to allocate memory\n")); return eSIR_MEM_ALLOC_FAILED; } /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAssocReq, sizeof(tSirAssocReq), 0); - cdf_mem_set((uint8_t *) ar, sizeof(tDot11fAssocRequest), 0); + qdf_mem_set((uint8_t *) pAssocReq, sizeof(tSirAssocReq), 0); + qdf_mem_set((uint8_t *) ar, sizeof(tDot11fAssocRequest), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_assoc_request(pMac, pFrame, nFrame, ar); @@ -2524,7 +2524,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, PELOG2(sir_dump_buf (pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame); ) - cdf_mem_free(ar); + qdf_mem_free(ar); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, @@ -2634,13 +2634,13 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, } if (ar->HTCaps.present) { - cdf_mem_copy(&pAssocReq->HTCaps, &ar->HTCaps, + qdf_mem_copy(&pAssocReq->HTCaps, &ar->HTCaps, sizeof(tDot11fIEHTCaps)); } if (ar->WMMInfoStation.present) { pAssocReq->wmeInfoPresent = 1; - cdf_mem_copy(&pAssocReq->WMMInfoStation, &ar->WMMInfoStation, + qdf_mem_copy(&pAssocReq->WMMInfoStation, &ar->WMMInfoStation, sizeof(tDot11fIEWMMInfoStation)); } @@ -2652,7 +2652,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, PELOG2(lim_log (pMac, LOG2, FL("Received Assoc without SSID IE.\n")); ) - cdf_mem_free(ar); + qdf_mem_free(ar); return eSIR_FAILURE; } @@ -2661,18 +2661,18 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, (pMac, LOG2, FL("Received Assoc without supp rate IE.\n")); ) - cdf_mem_free(ar); + qdf_mem_free(ar); return eSIR_FAILURE; } #ifdef WLAN_FEATURE_11AC if (ar->VHTCaps.present) { - cdf_mem_copy(&pAssocReq->VHTCaps, &ar->VHTCaps, + qdf_mem_copy(&pAssocReq->VHTCaps, &ar->VHTCaps, sizeof(tDot11fIEVHTCaps)); lim_log(pMac, LOGW, FL("Received Assoc Req with VHT Cap\n")); lim_log_vht_cap(pMac, &pAssocReq->VHTCaps); } if (ar->OperatingMode.present) { - cdf_mem_copy(&pAssocReq->operMode, &ar->OperatingMode, + qdf_mem_copy(&pAssocReq->operMode, &ar->OperatingMode, sizeof(tDot11fIEOperatingMode)); lim_log(pMac, LOGW, FL("Received Assoc Req with Operating Mode IE\n")); @@ -2681,7 +2681,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, #endif if (ar->ExtCap.present) { struct s_ext_cap *ext_cap; - cdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar->ExtCap.bytes, + qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar->ExtCap.bytes, ar->ExtCap.num_bytes); ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes; @@ -2690,7 +2690,7 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, ext_cap->timing_meas, ext_cap->fine_time_meas_initiator, ext_cap->fine_time_meas_responder); } - cdf_mem_free(ar); + qdf_mem_free(ar); return eSIR_SUCCESS; } /* End sir_convert_assoc_req_frame2_struct. */ @@ -2705,7 +2705,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, uint8_t cnt = 0; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAssocRsp, sizeof(tSirAssocRsp), 0); + qdf_mem_set((uint8_t *) pAssocRsp, sizeof(tSirAssocRsp), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_assoc_response(pMac, pFrame, nFrame, &ar); @@ -2792,20 +2792,20 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.HTCaps.present) { lim_log(pMac, LOG1, FL("Received Assoc Resp with HT Cap")); - cdf_mem_copy(&pAssocRsp->HTCaps, &ar.HTCaps, + qdf_mem_copy(&pAssocRsp->HTCaps, &ar.HTCaps, sizeof(tDot11fIEHTCaps)); } if (ar.HTInfo.present) { lim_log(pMac, LOG1, FL("Received Assoc Resp with HT Info")); - cdf_mem_copy(&pAssocRsp->HTInfo, &ar.HTInfo, + qdf_mem_copy(&pAssocRsp->HTInfo, &ar.HTInfo, sizeof(tDot11fIEHTInfo)); } #ifdef WLAN_FEATURE_VOWIFI_11R if (ar.MobilityDomain.present) { /* MobilityDomain */ pAssocRsp->mdiePresent = 1; - cdf_mem_copy((uint8_t *) &(pAssocRsp->mdie[0]), + qdf_mem_copy((uint8_t *) &(pAssocRsp->mdie[0]), (uint8_t *) &(ar.MobilityDomain.MDID), sizeof(uint16_t)); pAssocRsp->mdie[2] = @@ -2823,7 +2823,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, ar.FTInfo.R0KH_ID.num_PMK_R0_ID, ar.FTInfo.R0KH_ID.present, ar.FTInfo.R1KH_ID.present); pAssocRsp->ftinfoPresent = 1; - cdf_mem_copy(&pAssocRsp->FTInfo, &ar.FTInfo, + qdf_mem_copy(&pAssocRsp->FTInfo, &ar.FTInfo, sizeof(tDot11fIEFTInfo)); } #endif @@ -2832,7 +2832,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.num_RICDataDesc) { for (cnt = 0; cnt < ar.num_RICDataDesc; cnt++) { if (ar.RICDataDesc[cnt].present) { - cdf_mem_copy(&pAssocRsp->RICData[cnt], + qdf_mem_copy(&pAssocRsp->RICData[cnt], &ar.RICDataDesc[cnt], sizeof(tDot11fIERICDataDesc)); } @@ -2846,7 +2846,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.num_WMMTSPEC) { pAssocRsp->num_tspecs = ar.num_WMMTSPEC; for (cnt = 0; cnt < ar.num_WMMTSPEC; cnt++) { - cdf_mem_copy(&pAssocRsp->TSPECInfo[cnt], + qdf_mem_copy(&pAssocRsp->TSPECInfo[cnt], &ar.WMMTSPEC[cnt], (sizeof(tDot11fIEWMMTSPEC) * ar.num_WMMTSPEC)); @@ -2856,20 +2856,20 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.ESETrafStrmMet.present) { pAssocRsp->tsmPresent = 1; - cdf_mem_copy(&pAssocRsp->tsmIE.tsid, + qdf_mem_copy(&pAssocRsp->tsmIE.tsid, &ar.ESETrafStrmMet.tsid, sizeof(tSirMacESETSMIE)); } #endif #ifdef WLAN_FEATURE_11AC if (ar.VHTCaps.present) { - cdf_mem_copy(&pAssocRsp->VHTCaps, &ar.VHTCaps, + qdf_mem_copy(&pAssocRsp->VHTCaps, &ar.VHTCaps, sizeof(tDot11fIEVHTCaps)); lim_log(pMac, LOG1, FL("Received Assoc Response with VHT Cap")); lim_log_vht_cap(pMac, &pAssocRsp->VHTCaps); } if (ar.VHTOperation.present) { - cdf_mem_copy(&pAssocRsp->VHTOperation, &ar.VHTOperation, + qdf_mem_copy(&pAssocRsp->VHTOperation, &ar.VHTOperation, sizeof(tDot11fIEVHTOperation)); lim_log(pMac, LOG1, FL("Received Assoc Response with VHT Operation")); @@ -2879,7 +2879,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; - cdf_mem_copy(&pAssocRsp->ExtCap.bytes, &ar.ExtCap.bytes, + qdf_mem_copy(&pAssocRsp->ExtCap.bytes, &ar.ExtCap.bytes, ar.ExtCap.num_bytes); ext_cap = (struct s_ext_cap *)&pAssocRsp->ExtCap.bytes; @@ -2905,7 +2905,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, } if (ar.vendor2_ie.VHTCaps.present) { - cdf_mem_copy(&pAssocRsp->vendor2_ie.VHTCaps, + qdf_mem_copy(&pAssocRsp->vendor2_ie.VHTCaps, &ar.vendor2_ie.VHTCaps, sizeof(tDot11fIEVHTCaps)); lim_log(pMac, LOG1, @@ -2913,7 +2913,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, lim_log_vht_cap(pMac, &pAssocRsp->VHTCaps); } if (ar.vendor2_ie.VHTOperation.present) { - cdf_mem_copy(&pAssocRsp->vendor2_ie.VHTOperation, + qdf_mem_copy(&pAssocRsp->vendor2_ie.VHTOperation, &ar.vendor2_ie.VHTOperation, sizeof(tDot11fIEVHTOperation)); lim_log(pMac, LOG1, @@ -2933,7 +2933,7 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, uint32_t status; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAssocReq, sizeof(tSirAssocReq), 0); + qdf_mem_set((uint8_t *) pAssocReq, sizeof(tSirAssocReq), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_re_assoc_request(pMac, pFrame, nFrame, &ar); @@ -3030,13 +3030,13 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, } if (ar.HTCaps.present) { - cdf_mem_copy(&pAssocReq->HTCaps, &ar.HTCaps, + qdf_mem_copy(&pAssocReq->HTCaps, &ar.HTCaps, sizeof(tDot11fIEHTCaps)); } if (ar.WMMInfoStation.present) { pAssocReq->wmeInfoPresent = 1; - cdf_mem_copy(&pAssocReq->WMMInfoStation, &ar.WMMInfoStation, + qdf_mem_copy(&pAssocReq->WMMInfoStation, &ar.WMMInfoStation, sizeof(tDot11fIEWMMInfoStation)); } @@ -3080,11 +3080,11 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_11AC if (ar.VHTCaps.present) { - cdf_mem_copy(&pAssocReq->VHTCaps, &ar.VHTCaps, + qdf_mem_copy(&pAssocReq->VHTCaps, &ar.VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (ar.OperatingMode.present) { - cdf_mem_copy(&pAssocReq->operMode, &ar.OperatingMode, + qdf_mem_copy(&pAssocReq->operMode, &ar.OperatingMode, sizeof(tDot11fIEOperatingMode)); lim_log(pMac, LOGW, FL("Received Assoc Req with Operating Mode IE\n")); @@ -3094,7 +3094,7 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; - cdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar.ExtCap.bytes, + qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar.ExtCap.bytes, ar.ExtCap.num_bytes); ext_cap = (struct s_ext_cap *)&pAssocReq->ExtCap.bytes; @@ -3125,9 +3125,9 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, uint8_t *pos = NULL; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) &eseBcnReportMandatoryIe, + qdf_mem_set((uint8_t *) &eseBcnReportMandatoryIe, sizeof(eseBcnReportMandatoryIe), 0); - pBies = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + pBies = qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == pBies) { lim_log(pMac, LOGE, FL("Failed to allocate memory\n")); return eSIR_MEM_ALLOC_FAILED; @@ -3139,7 +3139,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):\n"), status, nPayload); - cdf_mem_free(pBies); + qdf_mem_free(pBies); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, @@ -3214,16 +3214,16 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, if (pBies->RRMEnabledCap.present) { eseBcnReportMandatoryIe.rrmPresent = 1; - cdf_mem_copy(&eseBcnReportMandatoryIe.rmEnabledCapabilities, + qdf_mem_copy(&eseBcnReportMandatoryIe.rmEnabledCapabilities, &pBies->RRMEnabledCap, sizeof(tDot11fIERRMEnabledCap)); numBytes += 1 + 1 + SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; } - *outIeBuf = cdf_mem_malloc(numBytes); + *outIeBuf = qdf_mem_malloc(numBytes); if (NULL == *outIeBuf) { lim_log(pMac, LOGP, FL("Memory Allocation failure")); - cdf_mem_free(pBies); + qdf_mem_free(pBies); return eSIR_MEM_ALLOC_FAILED; } pos = *outIeBuf; @@ -3243,7 +3243,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = eseBcnReportMandatoryIe.ssId.length; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) eseBcnReportMandatoryIe.ssId.ssId, eseBcnReportMandatoryIe.ssId.length); pos += eseBcnReportMandatoryIe.ssId.length; @@ -3263,7 +3263,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = eseBcnReportMandatoryIe.supportedRates.numRates; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) eseBcnReportMandatoryIe.supportedRates. rate, eseBcnReportMandatoryIe.supportedRates.numRates); @@ -3284,7 +3284,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_FH_PARAM_SET_EID_MAX; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.fhParamSet, SIR_MAC_FH_PARAM_SET_EID_MAX); pos += SIR_MAC_FH_PARAM_SET_EID_MAX; @@ -3320,7 +3320,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_CF_PARAM_SET_EID_MAX; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.cfParamSet, SIR_MAC_CF_PARAM_SET_EID_MAX); pos += SIR_MAC_CF_PARAM_SET_EID_MAX; @@ -3339,7 +3339,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_IBSS_PARAM_SET_EID_MAX; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.ibssParamSet. atim, SIR_MAC_IBSS_PARAM_SET_EID_MAX); pos += SIR_MAC_IBSS_PARAM_SET_EID_MAX; @@ -3358,7 +3358,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_TIM_EID_MIN; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe.tim, SIR_MAC_TIM_EID_MIN); pos += SIR_MAC_TIM_EID_MIN; @@ -3377,7 +3377,7 @@ sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, pos++; *pos = SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX; pos++; - cdf_mem_copy(pos, + qdf_mem_copy(pos, (uint8_t *) &eseBcnReportMandatoryIe. rmEnabledCapabilities, SIR_MAC_RM_ENABLED_CAPABILITY_EID_MAX); @@ -3399,11 +3399,11 @@ err_bcnrep: * that is returning failure.On success, the caller would take * care of freeing up the memory*/ if (retStatus == eSIR_FAILURE) { - cdf_mem_free(*outIeBuf); + qdf_mem_free(*outIeBuf); *outIeBuf = NULL; } - cdf_mem_free(pBies); + qdf_mem_free(pBies); return retStatus; } @@ -3418,9 +3418,9 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, uint32_t status; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pBeaconStruct, sizeof(tSirProbeRespBeacon), 0); + qdf_mem_set((uint8_t *) pBeaconStruct, sizeof(tSirProbeRespBeacon), 0); - pBies = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + pBies = qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == pBies) { lim_log(pMac, LOGE, FL("Failed to allocate memory\n")); return eSIR_MEM_ALLOC_FAILED; @@ -3435,7 +3435,7 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, PELOG2(sir_dump_buf (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload); ) - cdf_mem_free(pBies); + qdf_mem_free(pBies); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, @@ -3492,13 +3492,13 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, /* 11h IEs */ if (pBies->TPCReport.present) { pBeaconStruct->tpcReportPresent = 1; - cdf_mem_copy(&pBeaconStruct->tpcReport, + qdf_mem_copy(&pBeaconStruct->tpcReport, &pBies->TPCReport, sizeof(tDot11fIETPCReport)); } if (pBies->PowerConstraints.present) { pBeaconStruct->powerConstraintPresent = 1; - cdf_mem_copy(&pBeaconStruct->localPowerConstraint, + qdf_mem_copy(&pBeaconStruct->localPowerConstraint, &pBies->PowerConstraints, sizeof(tDot11fIEPowerConstraints)); } @@ -3511,7 +3511,7 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, pBies->ESETxmitPower.power_limit; } if (pBies->QBSSLoad.present) { - cdf_mem_copy(&pBeaconStruct->QBSSLoad, &pBies->QBSSLoad, + qdf_mem_copy(&pBeaconStruct->QBSSLoad, &pBies->QBSSLoad, sizeof(tDot11fIEQBSSLoad)); } #endif @@ -3530,45 +3530,45 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, if (pBies->ChanSwitchAnn.present) { pBeaconStruct->channelSwitchPresent = 1; - cdf_mem_copy(&pBeaconStruct->channelSwitchIE, + qdf_mem_copy(&pBeaconStruct->channelSwitchIE, &pBies->ChanSwitchAnn, sizeof(pBeaconStruct->channelSwitchIE)); } if (pBies->SuppOperatingClasses.present) { pBeaconStruct->supp_operating_class_present = 1; - cdf_mem_copy(&pBeaconStruct->supp_operating_classes, + qdf_mem_copy(&pBeaconStruct->supp_operating_classes, &pBies->SuppOperatingClasses, sizeof(tDot11fIESuppOperatingClasses)); } if (pBies->ext_chan_switch_ann.present) { pBeaconStruct->ext_chan_switch_present = 1; - cdf_mem_copy(&pBeaconStruct->ext_chan_switch, + qdf_mem_copy(&pBeaconStruct->ext_chan_switch, &pBies->ext_chan_switch_ann, sizeof(tDot11fIEext_chan_switch_ann)); } if (pBies->sec_chan_offset_ele.present) { pBeaconStruct->sec_chan_offset_present = 1; - cdf_mem_copy(&pBeaconStruct->sec_chan_offset, + qdf_mem_copy(&pBeaconStruct->sec_chan_offset, &pBies->sec_chan_offset_ele, sizeof(pBeaconStruct->sec_chan_offset)); } if (pBies->Quiet.present) { pBeaconStruct->quietIEPresent = 1; - cdf_mem_copy(&pBeaconStruct->quietIE, &pBies->Quiet, + qdf_mem_copy(&pBeaconStruct->quietIE, &pBies->Quiet, sizeof(tDot11fIEQuiet)); } if (pBies->HTCaps.present) { - cdf_mem_copy(&pBeaconStruct->HTCaps, &pBies->HTCaps, + qdf_mem_copy(&pBeaconStruct->HTCaps, &pBies->HTCaps, sizeof(tDot11fIEHTCaps)); } if (pBies->HTInfo.present) { - cdf_mem_copy(&pBeaconStruct->HTInfo, &pBies->HTInfo, + qdf_mem_copy(&pBeaconStruct->HTInfo, &pBies->HTInfo, sizeof(tDot11fIEHTInfo)); } @@ -3611,23 +3611,23 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_11AC if (pBies->VHTCaps.present) { pBeaconStruct->VHTCaps.present = 1; - cdf_mem_copy(&pBeaconStruct->VHTCaps, &pBies->VHTCaps, + qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBies->VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pBies->VHTOperation.present) { pBeaconStruct->VHTOperation.present = 1; - cdf_mem_copy(&pBeaconStruct->VHTOperation, &pBies->VHTOperation, + qdf_mem_copy(&pBeaconStruct->VHTOperation, &pBies->VHTOperation, sizeof(tDot11fIEVHTOperation)); } if (pBies->VHTExtBssLoad.present) { pBeaconStruct->VHTExtBssLoad.present = 1; - cdf_mem_copy(&pBeaconStruct->VHTExtBssLoad, + qdf_mem_copy(&pBeaconStruct->VHTExtBssLoad, &pBies->VHTExtBssLoad, sizeof(tDot11fIEVHTExtBssLoad)); } if (pBies->OperatingMode.present) { pBeaconStruct->OperatingMode.present = 1; - cdf_mem_copy(&pBeaconStruct->OperatingMode, + qdf_mem_copy(&pBeaconStruct->OperatingMode, &pBies->OperatingMode, sizeof(tDot11fIEOperatingMode)); } @@ -3635,7 +3635,7 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, if (pBies->MobilityDomain.present) { pBeaconStruct->mdiePresent = 1; - cdf_mem_copy(pBeaconStruct->mdie, &pBies->MobilityDomain.MDID, + qdf_mem_copy(pBeaconStruct->mdie, &pBies->MobilityDomain.MDID, SIR_MDIE_SIZE); } @@ -3649,17 +3649,17 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, if (pBies->vendor2_ie.VHTCaps.present) { pBeaconStruct->vendor2_ie.VHTCaps.present = 1; - cdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTCaps, + qdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTCaps, &pBies->vendor2_ie.VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pBies->vendor2_ie.VHTOperation.present) { pBeaconStruct->vendor2_ie.VHTOperation.present = 1; - cdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTOperation, + qdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTOperation, &pBies->vendor2_ie.VHTOperation, sizeof(tDot11fIEVHTOperation)); } - cdf_mem_free(pBies); + qdf_mem_free(pBies); return eSIR_SUCCESS; } /* End sir_parse_beacon_ie. */ @@ -3682,18 +3682,18 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, rfBand = WMA_GET_RX_RFBAND(pFrame); /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pBeaconStruct, sizeof(tSirProbeRespBeacon), 0); + qdf_mem_set((uint8_t *) pBeaconStruct, sizeof(tSirProbeRespBeacon), 0); - pBeacon = cdf_mem_malloc(sizeof(tDot11fBeacon)); + pBeacon = qdf_mem_malloc(sizeof(tDot11fBeacon)); if (NULL == pBeacon) { lim_log(pMac, LOGE, FL("Failed to allocate memory\n")); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_set((uint8_t *) pBeacon, sizeof(tDot11fBeacon), 0); + qdf_mem_set((uint8_t *) pBeacon, sizeof(tDot11fBeacon), 0); /* get the MAC address out of the BD, */ - cdf_mem_copy(pBeaconStruct->bssid, pHdr->sa, 6); + qdf_mem_copy(pBeaconStruct->bssid, pHdr->sa, 6); /* delegate to the framesc-generated code, */ status = dot11f_unpack_beacon(pMac, pPayload, nPayload, pBeacon); @@ -3704,7 +3704,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, PELOG2(sir_dump_buf (pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload); ) - cdf_mem_free(pBeacon); + qdf_mem_free(pBeacon); return eSIR_FAILURE; } else if (DOT11F_WARNED(status)) { lim_log(pMac, LOGW, @@ -3717,7 +3717,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, } /* & "transliterate" from a 'tDot11fBeacon' to a 'tSirProbeRespBeacon'... */ /* Timestamp */ - cdf_mem_copy((uint8_t *) pBeaconStruct->timeStamp, + qdf_mem_copy((uint8_t *) pBeaconStruct->timeStamp, (uint8_t *) &pBeacon->TimeStamp, sizeof(tSirMacTimeStamp)); @@ -3807,51 +3807,51 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, if (pBeacon->ChanSwitchAnn.present) { pBeaconStruct->channelSwitchPresent = 1; - cdf_mem_copy(&pBeaconStruct->channelSwitchIE, + qdf_mem_copy(&pBeaconStruct->channelSwitchIE, &pBeacon->ChanSwitchAnn, sizeof(pBeaconStruct->channelSwitchIE)); } if (pBeacon->ext_chan_switch_ann.present) { pBeaconStruct->ext_chan_switch_present = 1; - cdf_mem_copy(&pBeaconStruct->ext_chan_switch, + qdf_mem_copy(&pBeaconStruct->ext_chan_switch, &pBeacon->ext_chan_switch_ann, sizeof(tDot11fIEext_chan_switch_ann)); } if (pBeacon->sec_chan_offset_ele.present) { pBeaconStruct->sec_chan_offset_present = 1; - cdf_mem_copy(&pBeaconStruct->sec_chan_offset, + qdf_mem_copy(&pBeaconStruct->sec_chan_offset, &pBeacon->sec_chan_offset_ele, sizeof(pBeaconStruct->sec_chan_offset)); } if (pBeacon->TPCReport.present) { pBeaconStruct->tpcReportPresent = 1; - cdf_mem_copy(&pBeaconStruct->tpcReport, &pBeacon->TPCReport, + qdf_mem_copy(&pBeaconStruct->tpcReport, &pBeacon->TPCReport, sizeof(tDot11fIETPCReport)); } if (pBeacon->PowerConstraints.present) { pBeaconStruct->powerConstraintPresent = 1; - cdf_mem_copy(&pBeaconStruct->localPowerConstraint, + qdf_mem_copy(&pBeaconStruct->localPowerConstraint, &pBeacon->PowerConstraints, sizeof(tDot11fIEPowerConstraints)); } if (pBeacon->Quiet.present) { pBeaconStruct->quietIEPresent = 1; - cdf_mem_copy(&pBeaconStruct->quietIE, &pBeacon->Quiet, + qdf_mem_copy(&pBeaconStruct->quietIE, &pBeacon->Quiet, sizeof(tDot11fIEQuiet)); } if (pBeacon->HTCaps.present) { - cdf_mem_copy(&pBeaconStruct->HTCaps, &pBeacon->HTCaps, + qdf_mem_copy(&pBeaconStruct->HTCaps, &pBeacon->HTCaps, sizeof(tDot11fIEHTCaps)); } if (pBeacon->HTInfo.present) { - cdf_mem_copy(&pBeaconStruct->HTInfo, &pBeacon->HTInfo, + qdf_mem_copy(&pBeaconStruct->HTInfo, &pBeacon->HTInfo, sizeof(tDot11fIEHTInfo)); } @@ -3908,7 +3908,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, if (pBeacon->MobilityDomain.present) { /* MobilityDomain */ pBeaconStruct->mdiePresent = 1; - cdf_mem_copy((uint8_t *) &(pBeaconStruct->mdie[0]), + qdf_mem_copy((uint8_t *) &(pBeaconStruct->mdie[0]), (uint8_t *) &(pBeacon->MobilityDomain.MDID), sizeof(uint16_t)); pBeaconStruct->mdie[2] = @@ -3926,39 +3926,39 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, if (pBeacon->ESETxmitPower.present) { /* copy ESE TPC info element */ pBeaconStruct->eseTxPwr.present = 1; - cdf_mem_copy(&pBeaconStruct->eseTxPwr, + qdf_mem_copy(&pBeaconStruct->eseTxPwr, &pBeacon->ESETxmitPower, sizeof(tDot11fIEESETxmitPower)); } if (pBeacon->QBSSLoad.present) { - cdf_mem_copy(&pBeaconStruct->QBSSLoad, + qdf_mem_copy(&pBeaconStruct->QBSSLoad, &pBeacon->QBSSLoad, sizeof(tDot11fIEQBSSLoad)); } #endif #ifdef WLAN_FEATURE_11AC if (pBeacon->VHTCaps.present) { - cdf_mem_copy(&pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, + qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pBeacon->VHTOperation.present) { - cdf_mem_copy(&pBeaconStruct->VHTOperation, + qdf_mem_copy(&pBeaconStruct->VHTOperation, &pBeacon->VHTOperation, sizeof(tDot11fIEVHTOperation)); } if (pBeacon->VHTExtBssLoad.present) { - cdf_mem_copy(&pBeaconStruct->VHTExtBssLoad, + qdf_mem_copy(&pBeaconStruct->VHTExtBssLoad, &pBeacon->VHTExtBssLoad, sizeof(tDot11fIEVHTExtBssLoad)); } if (pBeacon->OperatingMode.present) { - cdf_mem_copy(&pBeaconStruct->OperatingMode, + qdf_mem_copy(&pBeaconStruct->OperatingMode, &pBeacon->OperatingMode, sizeof(tDot11fIEOperatingMode)); } if (pBeacon->WiderBWChanSwitchAnn.present) { pBeaconStruct->WiderBWChanSwitchAnnPresent = 1; - cdf_mem_copy(&pBeaconStruct->WiderBWChanSwitchAnn, + qdf_mem_copy(&pBeaconStruct->WiderBWChanSwitchAnn, &pBeacon->WiderBWChanSwitchAnn, sizeof(tDot11fIEWiderBWChanSwitchAnn)); } @@ -3967,7 +3967,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, /* IBSS Peer Params */ if (pBeacon->IBSSParams.present) { pBeaconStruct->IBSSParams.present = 1; - cdf_mem_copy(&pBeaconStruct->IBSSParams, &pBeacon->IBSSParams, + qdf_mem_copy(&pBeaconStruct->IBSSParams, &pBeacon->IBSSParams, sizeof(tDot11fIEIBSSParams)); } @@ -3986,12 +3986,12 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, ) } if (pBeacon->vendor2_ie.VHTCaps.present) { - cdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTCaps, + qdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTCaps, &pBeacon->vendor2_ie.VHTCaps, sizeof(tDot11fIEVHTCaps)); } if (pBeacon->vendor2_ie.VHTOperation.present) { - cdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTOperation, + qdf_mem_copy(&pBeaconStruct->vendor2_ie.VHTOperation, &pBeacon->VHTOperation, sizeof(tDot11fIEVHTOperation)); } @@ -4007,7 +4007,7 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - cdf_mem_free(pBeacon); + qdf_mem_free(pBeacon); return eSIR_SUCCESS; } /* End sir_convert_beacon_frame2_struct. */ @@ -4021,7 +4021,7 @@ sir_convert_auth_frame2_struct(tpAniSirGlobal pMac, uint32_t status; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAuth, sizeof(tSirMacAuthFrameBody), 0); + qdf_mem_set((uint8_t *) pAuth, sizeof(tSirMacAuthFrameBody), 0); /* delegate to the framesc-generated code, */ status = dot11f_unpack_authentication(pMac, pFrame, nFrame, &auth); @@ -4051,7 +4051,7 @@ sir_convert_auth_frame2_struct(tpAniSirGlobal pMac, if (auth.ChallengeText.present) { pAuth->type = SIR_MAC_CHALLENGE_TEXT_EID; pAuth->length = auth.ChallengeText.num_text; - cdf_mem_copy(pAuth->challengeText, auth.ChallengeText.text, + qdf_mem_copy(pAuth->challengeText, auth.ChallengeText.text, auth.ChallengeText.num_text); } @@ -4078,7 +4078,7 @@ sir_convert_addts_req2_struct(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAddTs, sizeof(tSirAddtsReqInfo), 0); + qdf_mem_set((uint8_t *) pAddTs, sizeof(tSirAddtsReqInfo), 0); /* delegate to the framesc-generated code, */ switch (*pFrame) { @@ -4219,9 +4219,9 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pAddTs, sizeof(tSirAddtsRspInfo), 0); - cdf_mem_set((uint8_t *) &addts, sizeof(tDot11fAddTSResponse), 0); - cdf_mem_set((uint8_t *) &wmmaddts, sizeof(tDot11fWMMAddTSResponse), 0); + qdf_mem_set((uint8_t *) pAddTs, sizeof(tSirAddtsRspInfo), 0); + qdf_mem_set((uint8_t *) &addts, sizeof(tDot11fAddTSResponse), 0); + qdf_mem_set((uint8_t *) &wmmaddts, sizeof(tDot11fWMMAddTSResponse), 0); /* delegate to the framesc-generated code, */ switch (*pFrame) { @@ -4304,7 +4304,7 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_ESE if (addts.ESETrafStrmMet.present) { pAddTs->tsmPresent = 1; - cdf_mem_copy(&pAddTs->tsmIE.tsid, + qdf_mem_copy(&pAddTs->tsmIE.tsid, &addts.ESETrafStrmMet.tsid, sizeof(tSirMacESETSMIE)); } @@ -4373,7 +4373,7 @@ sir_convert_addts_rsp2_struct(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_ESE if (wmmaddts.ESETrafStrmMet.present) { pAddTs->tsmPresent = 1; - cdf_mem_copy(&pAddTs->tsmIE.tsid, + qdf_mem_copy(&pAddTs->tsmIE.tsid, &wmmaddts.ESETrafStrmMet.tsid, sizeof(tSirMacESETSMIE)); } @@ -4402,7 +4402,7 @@ sir_convert_delts_req2_struct(tpAniSirGlobal pMac, return eSIR_FAILURE; } /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pDelTs, sizeof(tSirDeltsReqInfo), 0); + qdf_mem_set((uint8_t *) pDelTs, sizeof(tSirDeltsReqInfo), 0); /* delegate to the framesc-generated code, */ switch (*pFrame) { @@ -4515,7 +4515,7 @@ sir_convert_tpc_req_frame2_struct(tpAniSirGlobal pMac, { tDot11fTPCRequest req; uint32_t status; - cdf_mem_set((uint8_t *) pTpcReqFrame, sizeof(tSirMacTpcReqActionFrame), + qdf_mem_set((uint8_t *) pTpcReqFrame, sizeof(tSirMacTpcReqActionFrame), 0); status = dot11f_unpack_tpc_request(pMac, pFrame, nFrame, &req); if (DOT11F_FAILED(status)) { @@ -4560,7 +4560,7 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac, uint32_t status; /* Zero-init our [out] parameter, */ - cdf_mem_set((uint8_t *) pMeasReqFrame, + qdf_mem_set((uint8_t *) pMeasReqFrame, sizeof(tpSirMacMeasReqActionFrame), 0); /* delegate to the framesc-generated code, */ @@ -4618,7 +4618,7 @@ sir_convert_meas_req_frame2_struct(tpAniSirGlobal pMac, pMeasReqFrame->measReqIE.measReqField.channelNumber = mr.MeasurementRequest[0].channel_no; - cdf_mem_copy(pMeasReqFrame->measReqIE.measReqField.measStartTime, + qdf_mem_copy(pMeasReqFrame->measReqIE.measReqField.measStartTime, mr.MeasurementRequest[0].meas_start_time, 8); pMeasReqFrame->measReqIE.measReqField.measDuration = @@ -4731,7 +4731,7 @@ tSirRetStatus populate_dot11f_ese_cckm_opaque(tpAniSirGlobal pMac, pDot11f->present = 1; /* Dont include OUI */ pDot11f->num_data = pCCKMie->cckmIEdata[idx + 1] - 4; - cdf_mem_copy(pDot11f->data, pCCKMie->cckmIEdata + idx + 2 + 4, /* EID,len,OUI */ + qdf_mem_copy(pDot11f->data, pCCKMie->cckmIEdata + idx + 2 + 4, /* EID,len,OUI */ pCCKMie->cckmIEdata[idx + 1] - 4); /* Skip OUI */ } } @@ -4744,7 +4744,7 @@ void populate_dot11_tsrsie(tpAniSirGlobal pMac, uint8_t rate_length) { pDot11f->tsid = pOld->tsid; - cdf_mem_copy(pDot11f->tsrates, pOld->rates, rate_length); + qdf_mem_copy(pDot11f->tsrates, pOld->rates, rate_length); pDot11f->num_tsrates = rate_length; pDot11f->present = 1; } @@ -4760,19 +4760,19 @@ populate_dot11f_tclas(tpAniSirGlobal pMac, switch (pDot11f->classifier_type) { case SIR_MAC_TCLASTYPE_ETHERNET: - cdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.source, + qdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.source, (uint8_t *) &pOld->tclasParams.eth.srcAddr, 6); - cdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.dest, + qdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.dest, (uint8_t *) &pOld->tclasParams.eth.dstAddr, 6); pDot11f->info.EthParams.type = pOld->tclasParams.eth.type; break; case SIR_MAC_TCLASTYPE_TCPUDPIP: pDot11f->info.IpParams.version = pOld->version; if (SIR_MAC_TCLAS_IPV4 == pDot11f->info.IpParams.version) { - cdf_mem_copy(pDot11f->info.IpParams.params.IpV4Params. + qdf_mem_copy(pDot11f->info.IpParams.params.IpV4Params. source, pOld->tclasParams.ipv4.srcIpAddr, 4); - cdf_mem_copy(pDot11f->info.IpParams.params.IpV4Params. + qdf_mem_copy(pDot11f->info.IpParams.params.IpV4Params. dest, pOld->tclasParams.ipv4.dstIpAddr, 4); pDot11f->info.IpParams.params.IpV4Params.src_port = pOld->tclasParams.ipv4.srcPort; @@ -4785,11 +4785,11 @@ populate_dot11f_tclas(tpAniSirGlobal pMac, pDot11f->info.IpParams.params.IpV4Params.reserved = pOld->tclasParams.ipv4.rsvd; } else { - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.source, (uint8_t *) pOld->tclasParams.ipv6. srcIpAddr, 16); - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.dest, (uint8_t *) pOld->tclasParams.ipv6. dstIpAddr, 16); @@ -4797,7 +4797,7 @@ populate_dot11f_tclas(tpAniSirGlobal pMac, pOld->tclasParams.ipv6.srcPort; pDot11f->info.IpParams.params.IpV6Params.dest_port = pOld->tclasParams.ipv6.dstPort; - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.flow_label, (uint8_t *) pOld->tclasParams.ipv6. flowLabel, 3); @@ -4831,20 +4831,20 @@ populate_dot11f_wmmtclas(tpAniSirGlobal pMac, switch (pDot11f->classifier_type) { case SIR_MAC_TCLASTYPE_ETHERNET: - cdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.source, + qdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.source, (uint8_t *) &pOld->tclasParams.eth.srcAddr, 6); - cdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.dest, + qdf_mem_copy((uint8_t *) &pDot11f->info.EthParams.dest, (uint8_t *) &pOld->tclasParams.eth.dstAddr, 6); pDot11f->info.EthParams.type = pOld->tclasParams.eth.type; break; case SIR_MAC_TCLASTYPE_TCPUDPIP: pDot11f->info.IpParams.version = pOld->version; if (SIR_MAC_TCLAS_IPV4 == pDot11f->info.IpParams.version) { - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV4Params.source, (uint8_t *) pOld->tclasParams.ipv4. srcIpAddr, 4); - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV4Params.dest, (uint8_t *) pOld->tclasParams.ipv4. dstIpAddr, 4); @@ -4859,11 +4859,11 @@ populate_dot11f_wmmtclas(tpAniSirGlobal pMac, pDot11f->info.IpParams.params.IpV4Params.reserved = pOld->tclasParams.ipv4.rsvd; } else { - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.source, (uint8_t *) pOld->tclasParams.ipv6. srcIpAddr, 16); - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.dest, (uint8_t *) pOld->tclasParams.ipv6. dstIpAddr, 16); @@ -4871,7 +4871,7 @@ populate_dot11f_wmmtclas(tpAniSirGlobal pMac, pOld->tclasParams.ipv6.srcPort; pDot11f->info.IpParams.params.IpV6Params.dest_port = pOld->tclasParams.ipv6.dstPort; - cdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. + qdf_mem_copy((uint8_t *) &pDot11f->info.IpParams. params.IpV6Params.flow_label, (uint8_t *) pOld->tclasParams.ipv6. flowLabel, 3); @@ -5038,7 +5038,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, if (pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_UUIDE_PRESENT) { pDot11f->UUID_E.present = 1; - cdf_mem_copy(pDot11f->UUID_E.uuid, pSirWPSProbeRspIE->UUID_E, + qdf_mem_copy(pDot11f->UUID_E.uuid, pSirWPSProbeRspIE->UUID_E, WNI_CFG_WPS_UUID_LEN); } else pDot11f->UUID_E.present = 0; @@ -5048,7 +5048,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, pDot11f->Manufacturer.present = 1; pDot11f->Manufacturer.num_name = pSirWPSProbeRspIE->Manufacture.num_name; - cdf_mem_copy(pDot11f->Manufacturer.name, + qdf_mem_copy(pDot11f->Manufacturer.name, pSirWPSProbeRspIE->Manufacture.name, pSirWPSProbeRspIE->Manufacture.num_name); } else @@ -5059,7 +5059,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, pDot11f->ModelName.present = 1; pDot11f->ModelName.num_text = pSirWPSProbeRspIE->ModelName.num_text; - cdf_mem_copy(pDot11f->ModelName.text, + qdf_mem_copy(pDot11f->ModelName.text, pSirWPSProbeRspIE->ModelName.text, pDot11f->ModelName.num_text); } else @@ -5070,7 +5070,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, pDot11f->ModelNumber.present = 1; pDot11f->ModelNumber.num_text = pSirWPSProbeRspIE->ModelNumber.num_text; - cdf_mem_copy(pDot11f->ModelNumber.text, + qdf_mem_copy(pDot11f->ModelNumber.text, pSirWPSProbeRspIE->ModelNumber.text, pDot11f->ModelNumber.num_text); } else @@ -5081,7 +5081,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, pDot11f->SerialNumber.present = 1; pDot11f->SerialNumber.num_text = pSirWPSProbeRspIE->SerialNumber.num_text; - cdf_mem_copy(pDot11f->SerialNumber.text, + qdf_mem_copy(pDot11f->SerialNumber.text, pSirWPSProbeRspIE->SerialNumber.text, pDot11f->SerialNumber.num_text); } else @@ -5090,7 +5090,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, if (pSirWPSProbeRspIE-> FieldPresent & SIR_WPS_PROBRSP_PRIMARYDEVICETYPE_PRESENT) { pDot11f->PrimaryDeviceType.present = 1; - cdf_mem_copy(pDot11f->PrimaryDeviceType.oui, + qdf_mem_copy(pDot11f->PrimaryDeviceType.oui, pSirWPSProbeRspIE->PrimaryDeviceOUI, sizeof(pSirWPSProbeRspIE->PrimaryDeviceOUI)); pDot11f->PrimaryDeviceType.primary_category = @@ -5105,7 +5105,7 @@ tSirRetStatus populate_dot11f_probe_res_wpsi_es(tpAniSirGlobal pMac, pDot11f->DeviceName.present = 1; pDot11f->DeviceName.num_text = pSirWPSProbeRspIE->DeviceName.num_text; - cdf_mem_copy(pDot11f->DeviceName.text, + qdf_mem_copy(pDot11f->DeviceName.text, pSirWPSProbeRspIE->DeviceName.text, pDot11f->DeviceName.num_text); } else @@ -5218,7 +5218,7 @@ tSirRetStatus populate_dot11f_beacon_wpsi_es(tpAniSirGlobal pMac, if (pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_UUIDE_PRESENT) { pDot11f->UUID_E.present = 1; - cdf_mem_copy(pDot11f->UUID_E.uuid, pSirWPSBeaconIE->UUID_E, + qdf_mem_copy(pDot11f->UUID_E.uuid, pSirWPSBeaconIE->UUID_E, WNI_CFG_WPS_UUID_LEN); } else pDot11f->UUID_E.present = 0; @@ -5519,7 +5519,7 @@ tSirRetStatus populate_dot11f_beacon_report(tpAniSirGlobal pMac, pDot11f->report.Beacon.regClass = pBeaconReport->regClass; pDot11f->report.Beacon.channel = pBeaconReport->channel; - cdf_mem_copy(pDot11f->report.Beacon.meas_start_time, + qdf_mem_copy(pDot11f->report.Beacon.meas_start_time, pBeaconReport->measStartTime, sizeof(pDot11f->report.Beacon.meas_start_time)); pDot11f->report.Beacon.meas_duration = pBeaconReport->measDuration; @@ -5528,14 +5528,14 @@ tSirRetStatus populate_dot11f_beacon_report(tpAniSirGlobal pMac, !pBeaconReport->bcnProbeRsp; pDot11f->report.Beacon.RCPI = pBeaconReport->rcpi; pDot11f->report.Beacon.RSNI = pBeaconReport->rsni; - cdf_mem_copy(pDot11f->report.Beacon.BSSID, pBeaconReport->bssid, + qdf_mem_copy(pDot11f->report.Beacon.BSSID, pBeaconReport->bssid, sizeof(tSirMacAddr)); pDot11f->report.Beacon.antenna_id = pBeaconReport->antennaId; pDot11f->report.Beacon.parent_TSF = pBeaconReport->parentTSF; if (pBeaconReport->numIes) { pDot11f->report.Beacon.BeaconReportFrmBody.present = 1; - cdf_mem_copy(pDot11f->report.Beacon.BeaconReportFrmBody. + qdf_mem_copy(pDot11f->report.Beacon.BeaconReportFrmBody. reportedFields, pBeaconReport->Ies, pBeaconReport->numIes); pDot11f->report.Beacon.BeaconReportFrmBody.num_reportedFields = @@ -5704,12 +5704,12 @@ tSirRetStatus populate_dot11f_timing_advert_frame(tpAniSirGlobal mac_ctx, WNI_CFG_MAX_TX_POWER_5_LEN); item = WNI_CFG_COUNTRY_CODE; CFG_GET_STR(nSirStatus, mac_ctx, item, code, codelen, 3); - cdf_mem_copy(&frame->Country, code, codelen); + qdf_mem_copy(&frame->Country, code, codelen); if (len > MAX_SIZE_OF_TRIPLETS_IN_COUNTRY_IE) len = MAX_SIZE_OF_TRIPLETS_IN_COUNTRY_IE; frame->Country.num_triplets = (uint8_t)(len / 3); - cdf_mem_copy((uint8_t *)&frame->Country.triplets, temp, len); + qdf_mem_copy((uint8_t *)&frame->Country.triplets, temp, len); frame->Country.present = 1; /* PowerConstraints */ diff --git a/core/mac/src/sys/legacy/src/utils/src/utils_parser.c b/core/mac/src/sys/legacy/src/utils/src/utils_parser.c index 9b91902ae7de..093e40430ff0 100644 --- a/core/mac/src/sys/legacy/src/utils/src/utils_parser.c +++ b/core/mac/src/sys/legacy/src/utils/src/utils_parser.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -44,21 +44,21 @@ void convert_ssid(tpAniSirGlobal pMac, tSirMacSSid *pOld, tDot11fIESSID *pNew) { pOld->length = pNew->num_ssid; - cdf_mem_copy(pOld->ssId, pNew->ssid, pNew->num_ssid); + qdf_mem_copy(pOld->ssId, pNew->ssid, pNew->num_ssid); } void convert_supp_rates(tpAniSirGlobal pMac, tSirMacRateSet *pOld, tDot11fIESuppRates *pNew) { pOld->numRates = pNew->num_rates; - cdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates); + qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates); } void convert_ext_supp_rates(tpAniSirGlobal pMac, tSirMacRateSet *pOld, tDot11fIEExtSuppRates *pNew) { pOld->numRates = pNew->num_rates; - cdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates); + qdf_mem_copy(pOld->rate, pNew->rates, pNew->num_rates); } void convert_qos_caps(tpAniSirGlobal pMac, @@ -101,7 +101,7 @@ tSirRetStatus convert_wpa(tpAniSirGlobal pMac, } pOld->length = (uint8_t) written - 2; - cdf_mem_copy(pOld->info, buffer + 2, pOld->length); + qdf_mem_copy(pOld->info, buffer + 2, pOld->length); return eSIR_SUCCESS; } @@ -116,7 +116,7 @@ tSirRetStatus convert_wpa_opaque(tpAniSirGlobal pMac, pOld->info[1] = 0x50; pOld->info[2] = 0xf2; pOld->info[3] = 0x01; - cdf_mem_copy(pOld->info + 4, pNew->data, pNew->num_data); + qdf_mem_copy(pOld->info + 4, pNew->data, pNew->num_data); return eSIR_SUCCESS; } @@ -129,7 +129,7 @@ tSirRetStatus convert_wapi_opaque(tpAniSirGlobal pMac, /* This is awful, I know, but the old code just rammed the IE into */ /* an opaque array. Note that we need to explicitly add the OUI! */ pOld->length = pNew->num_data; - cdf_mem_copy(pOld->info, pNew->data, pNew->num_data); + qdf_mem_copy(pOld->info, pNew->data, pNew->num_data); return eSIR_SUCCESS; } @@ -149,7 +149,7 @@ tSirRetStatus convert_wsc_opaque(tpAniSirGlobal pMac, pOld->addIEdata[curAddIELen++] = 0x50; pOld->addIEdata[curAddIELen++] = 0xf2; pOld->addIEdata[curAddIELen++] = 0x04; - cdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); + qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); return eSIR_SUCCESS; } @@ -168,7 +168,7 @@ tSirRetStatus convert_p2p_opaque(tpAniSirGlobal pMac, pOld->addIEdata[curAddIELen++] = 0x6f; pOld->addIEdata[curAddIELen++] = 0x9A; pOld->addIEdata[curAddIELen++] = 0x09; - cdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); + qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); return eSIR_SUCCESS; } @@ -188,7 +188,7 @@ tSirRetStatus convert_wfd_opaque(tpAniSirGlobal pMac, pOld->addIEdata[curAddIELen++] = 0x6f; pOld->addIEdata[curAddIELen++] = 0x9A; pOld->addIEdata[curAddIELen++] = 0x0a; - cdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); + qdf_mem_copy(pOld->addIEdata + curAddIELen, pNew->data, pNew->num_data); return eSIR_SUCCESS; } @@ -207,7 +207,7 @@ tSirRetStatus convert_rsn(tpAniSirGlobal pMac, } pOld->length = (uint8_t) written - 2; - cdf_mem_copy(pOld->info, buffer + 2, pOld->length); + qdf_mem_copy(pOld->info, buffer + 2, pOld->length); return eSIR_SUCCESS; } @@ -218,7 +218,7 @@ tSirRetStatus convert_rsn_opaque(tpAniSirGlobal pMac, /* This is awful, I know, but the old code just rammed the IE into */ /* an opaque array. */ pOld->length = pNew->num_data; - cdf_mem_copy(pOld->info, pNew->data, pOld->length); + qdf_mem_copy(pOld->info, pNew->data, pOld->length); return eSIR_SUCCESS; } @@ -239,7 +239,7 @@ void convert_supp_channels(tpAniSirGlobal pMac, { pOld->type = 36; pOld->length = (pNew->num_bands * 2); - cdf_mem_copy((uint8_t *) pOld->supportedChannels, + qdf_mem_copy((uint8_t *) pOld->supportedChannels, (uint8_t *) pNew->bands, pOld->length); } @@ -268,7 +268,7 @@ void convert_tim(tpAniSirGlobal pMac, tSirMacTim *pOld, tDot11fIETIM *pNew) pOld->bitmapControl = pNew->bmpctl; pOld->bitmapLength = pNew->num_vbmp; - cdf_mem_copy(pOld->bitmap, pNew->vbmp, pNew->num_vbmp); + qdf_mem_copy(pOld->bitmap, pNew->vbmp, pNew->num_vbmp); } void convert_country(tpAniSirGlobal pMac, @@ -276,7 +276,7 @@ void convert_country(tpAniSirGlobal pMac, { int i; - cdf_mem_copy(pOld->countryString, pNew->country, COUNTRY_STRING_LENGTH); + qdf_mem_copy(pOld->countryString, pNew->country, COUNTRY_STRING_LENGTH); pOld->numIntervals = pNew->num_triplets; @@ -295,7 +295,7 @@ void convert_wmm_params(tpAniSirGlobal pMac, pOld->type = 221; pOld->length = 24; - cdf_mem_copy((uint8_t *) &pOld->qosInfo, (uint8_t *) &pNew->qosInfo, + qdf_mem_copy((uint8_t *) &pOld->qosInfo, (uint8_t *) &pNew->qosInfo, 1); pOld->acbe.aci.aifsn = pNew->acbe_aifsn; @@ -342,7 +342,7 @@ void convert_edca_param(tpAniSirGlobal pMac, pOld->type = 12; pOld->length = 20; - cdf_mem_copy((uint8_t *) &pOld->qosInfo, (uint8_t *) &pNew->qos, 1); + qdf_mem_copy((uint8_t *) &pOld->qosInfo, (uint8_t *) &pNew->qos, 1); pOld->acbe.aci.aifsn = pNew->acbe_aifsn; pOld->acbe.aci.acm = pNew->acbe_acm; @@ -422,9 +422,9 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac, switch (pNew->classifier_type) { case 0: - cdf_mem_copy(pOld->tclasParams.eth.srcAddr, + qdf_mem_copy(pOld->tclasParams.eth.srcAddr, pNew->info.EthParams.source, 6); - cdf_mem_copy(pOld->tclasParams.eth.dstAddr, + qdf_mem_copy(pOld->tclasParams.eth.dstAddr, pNew->info.EthParams.dest, 6); pOld->tclasParams.eth.type = pNew->info.EthParams.type; break; @@ -432,10 +432,10 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac, pOld->version = pNew->info.IpParams.version; if (4 == pNew->info.IpParams.version) { pOld->tclasParams.ipv4.version = 4; - cdf_mem_copy(pOld->tclasParams.ipv4.srcIpAddr, + qdf_mem_copy(pOld->tclasParams.ipv4.srcIpAddr, pNew->info.IpParams.params.IpV4Params. source, 4); - cdf_mem_copy(pOld->tclasParams.ipv4.dstIpAddr, + qdf_mem_copy(pOld->tclasParams.ipv4.dstIpAddr, pNew->info.IpParams.params.IpV4Params.dest, 4); pOld->tclasParams.ipv4.srcPort = @@ -450,11 +450,11 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac, pNew->info.IpParams.params.IpV4Params.reserved; } else if (6 == pNew->info.IpParams.version) { pOld->tclasParams.ipv6.version = 6; - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. srcIpAddr, (uint8_t *) pNew->info.IpParams.params. IpV6Params.source, 16); - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. dstIpAddr, (uint8_t *) pNew->info.IpParams.params. IpV6Params.dest, 16); @@ -462,7 +462,7 @@ tSirRetStatus convert_tclas(tpAniSirGlobal pMac, pNew->info.IpParams.params.IpV6Params.src_port; pOld->tclasParams.ipv6.dstPort = pNew->info.IpParams.params.IpV6Params.dest_port; - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. flowLabel, (uint8_t *) pNew->info.IpParams.params. IpV6Params.flow_label, 3); @@ -526,9 +526,9 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac, switch (pNew->classifier_type) { case 0: - cdf_mem_copy(pOld->tclasParams.eth.srcAddr, + qdf_mem_copy(pOld->tclasParams.eth.srcAddr, pNew->info.EthParams.source, 6); - cdf_mem_copy(pOld->tclasParams.eth.dstAddr, + qdf_mem_copy(pOld->tclasParams.eth.dstAddr, pNew->info.EthParams.dest, 6); pOld->tclasParams.eth.type = pNew->info.EthParams.type; break; @@ -536,10 +536,10 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac, pOld->version = pNew->info.IpParams.version; if (4 == pNew->info.IpParams.version) { pOld->tclasParams.ipv4.version = 4; - cdf_mem_copy(pOld->tclasParams.ipv4.srcIpAddr, + qdf_mem_copy(pOld->tclasParams.ipv4.srcIpAddr, pNew->info.IpParams.params.IpV4Params. source, 4); - cdf_mem_copy(pOld->tclasParams.ipv4.dstIpAddr, + qdf_mem_copy(pOld->tclasParams.ipv4.dstIpAddr, pNew->info.IpParams.params.IpV4Params.dest, 4); pOld->tclasParams.ipv4.srcPort = @@ -554,11 +554,11 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac, pNew->info.IpParams.params.IpV4Params.reserved; } else if (6 == pNew->info.IpParams.version) { pOld->tclasParams.ipv6.version = 6; - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. srcIpAddr, (uint8_t *) pNew->info.IpParams.params. IpV6Params.source, 16); - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. dstIpAddr, (uint8_t *) pNew->info.IpParams.params. IpV6Params.dest, 16); @@ -566,7 +566,7 @@ tSirRetStatus convert_wmmtclas(tpAniSirGlobal pMac, pNew->info.IpParams.params.IpV6Params.src_port; pOld->tclasParams.ipv6.dstPort = pNew->info.IpParams.params.IpV6Params.dest_port; - cdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. + qdf_mem_copy((uint8_t *) pOld->tclasParams.ipv6. flowLabel, (uint8_t *) pNew->info.IpParams.params. IpV6Params.flow_label, 3); @@ -624,8 +624,9 @@ void convert_wmm_schedule(tpAniSirGlobal pMac, } /** - @brief : This functions converts the given buffer till given size to Big endian format assuming the - bus is 32 bit. The size should be four byte aligned. + @brief : This functions converts the given buffer till given size to + Big endian format assuming the bus is 32 bit. The size should + be four byte aligned. @param : ptr to be converted, size @return : void */ @@ -670,11 +671,11 @@ void create_scan_data_null_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr macMgmtHdr->seqControl.fragNum = 0; macMgmtHdr->seqControl.seqNumLo = 0; macMgmtHdr->seqControl.seqNumHi = 2; - cdf_mem_copy((void *)&macMgmtHdr->da, + qdf_mem_copy((void *)&macMgmtHdr->da, (void *)bssid, sizeof(tSirMacAddr)); - cdf_mem_copy((void *)&macMgmtHdr->sa, + qdf_mem_copy((void *)&macMgmtHdr->sa, (void *)selfMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy((void *)&macMgmtHdr->bssId, + qdf_mem_copy((void *)&macMgmtHdr->bssId, (void *)bssid, sizeof(tSirMacAddr)); return; @@ -697,7 +698,7 @@ void create_scan_cts_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, (uint8_t) (SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff); macMgmtHdr->durationHi = (uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >> 8); - cdf_mem_copy((void *)macMgmtHdr->da, (void *)selfMac, + qdf_mem_copy((void *)macMgmtHdr->da, (void *)selfMac, sizeof(tSirMacAddr)); return; @@ -754,9 +755,9 @@ void create_init_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, macMgmtHdr->seqControl.fragNum = 0; macMgmtHdr->seqControl.seqNumLo = 0; macMgmtHdr->seqControl.seqNumHi = 2; - cdf_mem_copy((void *)&macMgmtHdr->da, (void *)pSta[0].bssId, 6); - cdf_mem_copy(&macMgmtHdr->sa, pSta[0].staAddr, 6); - cdf_mem_copy((void *)&macMgmtHdr->bssId, (void *)pSta[0].bssId, + qdf_mem_copy((void *)&macMgmtHdr->da, (void *)pSta[0].bssId, 6); + qdf_mem_copy(&macMgmtHdr->sa, pSta[0].staAddr, 6); + qdf_mem_copy((void *)&macMgmtHdr->bssId, (void *)pSta[0].bssId, 6); } else if (role == eSYSTEM_AP_ROLE || role == eSYSTEM_STA_IN_IBSS_ROLE) { macMgmtHdr->fc.type = SIR_MAC_CTRL_FRAME; @@ -774,7 +775,7 @@ void create_init_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHdr, macMgmtHdr->durationHi = (uint8_t) ((SIR_MAC_MAX_DURATION_MICRO_SECONDS & 0xff00) >> 8); - cdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].staAddr, + qdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].staAddr, 6); } return; @@ -813,9 +814,9 @@ void create_finish_scan_raw_frame(tpAniSirGlobal pMac, tSirMacMgmtHdr *macMgmtHd macMgmtHdr->seqControl.fragNum = 0; macMgmtHdr->seqControl.seqNumLo = 0; macMgmtHdr->seqControl.seqNumHi = 2; - cdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].bssId, 6); - cdf_mem_copy(macMgmtHdr->sa, pSta[0].staAddr, 6); - cdf_mem_copy((void *)macMgmtHdr->bssId, (void *)pSta[0].bssId, + qdf_mem_copy((void *)macMgmtHdr->da, (void *)pSta[0].bssId, 6); + qdf_mem_copy(macMgmtHdr->sa, pSta[0].staAddr, 6); + qdf_mem_copy((void *)macMgmtHdr->bssId, (void *)pSta[0].bssId, 6); } diff --git a/core/sap/dfs/inc/ath_dfs_structs.h b/core/sap/dfs/inc/ath_dfs_structs.h index 8a3e8f853d2f..83c0655262ca 100644 --- a/core/sap/dfs/inc/ath_dfs_structs.h +++ b/core/sap/dfs/inc/ath_dfs_structs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -53,7 +53,7 @@ #ifndef _DFS__STRUCTS_H_ #define _DFS__STRUCTS_H_ -#include +#include #ifdef ANDROID #include @@ -228,7 +228,7 @@ struct ath_dfs_phyerr_param { static inline void ath_dfs_phyerr_param_copy(struct ath_dfs_phyerr_param *dst, struct ath_dfs_phyerr_param *src) { - cdf_mem_copy(dst, src, sizeof(*dst)); + qdf_mem_copy(dst, src, sizeof(*dst)); } static inline void ath_dfs_phyerr_init_noval(struct ath_dfs_phyerr_param *pe) diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index a9acc64154b5..a2f9ae28ffc9 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -55,7 +55,7 @@ #include /* TAILQ */ #include #include -#include +#include #include /*DFS Utility Include END*/ diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 086864b823f4..55f754f5de18 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -194,7 +194,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle, if (sap_ctx->channelList != NULL) { /* Always free up the memory for channel selection whatever * the result */ - cdf_mem_free(sap_ctx->channelList); + qdf_mem_free(sap_ctx->channelList); sap_ctx->channelList = NULL; } #endif @@ -394,7 +394,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, * channel selection whatever * the result */ - cdf_mem_free(sap_ctx->channelList); + qdf_mem_free(sap_ctx->channelList); sap_ctx->channelList = NULL; } #endif @@ -745,17 +745,17 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx, roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; if (sap_ctx->nStaWPARSnReqIeLength) - cdf_mem_copy(sap_ctx->pStaWpaRsnReqIE, csr_roam_info->prsnIE, + qdf_mem_copy(sap_ctx->pStaWpaRsnReqIE, csr_roam_info->prsnIE, sap_ctx->nStaWPARSnReqIeLength); #ifdef FEATURE_WLAN_WAPI sap_ctx->nStaWAPIReqIeLength = csr_roam_info->wapiIELen; if (sap_ctx->nStaWAPIReqIeLength) - cdf_mem_copy(sap_ctx->pStaWapiReqIE, csr_roam_info->pwapiIE, + qdf_mem_copy(sap_ctx->pStaWapiReqIE, csr_roam_info->pwapiIE, sap_ctx->nStaWAPIReqIeLength); #endif sap_ctx->nStaAddIeLength = csr_roam_info->addIELen; if (sap_ctx->nStaAddIeLength) - cdf_mem_copy(sap_ctx->pStaAddIE, csr_roam_info->paddIE, + qdf_mem_copy(sap_ctx->pStaAddIE, csr_roam_info->paddIE, sap_ctx->nStaAddIeLength); sap_ctx->SapQosCfg.WmmIsEnabled = csr_roam_info->wmmEnabledSta; /* MAC filtering */ @@ -995,13 +995,13 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, roam_result); sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen; if (sap_ctx->nStaWPARSnReqIeLength) - cdf_mem_copy(sap_ctx->pStaWpaRsnReqIE, + qdf_mem_copy(sap_ctx->pStaWpaRsnReqIE, csr_roam_info->prsnIE, sap_ctx->nStaWPARSnReqIeLength); sap_ctx->nStaAddIeLength = csr_roam_info->addIELen; if (sap_ctx->nStaAddIeLength) - cdf_mem_copy(sap_ctx->pStaAddIE, + qdf_mem_copy(sap_ctx->pStaAddIE, csr_roam_info->paddIE, sap_ctx->nStaAddIeLength); diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 41f4c63031e4..c06f974d4fda 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -508,13 +508,13 @@ void sap_cleanup_channel_list(void *p_cds_gctx) pSapCtx->SapChnlList.numChannel = 0; if (pSapCtx->SapChnlList.channelList) { - cdf_mem_free(pSapCtx->SapChnlList.channelList); + qdf_mem_free(pSapCtx->SapChnlList.channelList); pSapCtx->SapChnlList.channelList = NULL; } pSapCtx->SapAllChnlList.numChannel = 0; if (pSapCtx->SapAllChnlList.channelList) { - cdf_mem_free(pSapCtx->SapAllChnlList.channelList); + qdf_mem_free(pSapCtx->SapAllChnlList.channelList); pSapCtx->SapAllChnlList.channelList = NULL; } } @@ -607,7 +607,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, /* Allocate memory for weight computation of 2.4GHz */ pSpectCh = - (tSapSpectChInfo *) cdf_mem_malloc((pSpectInfoParams->numSpectChans) + (tSapSpectChInfo *) qdf_mem_malloc((pSpectInfoParams->numSpectChans) * sizeof(*pSpectCh)); if (pSpectCh == NULL) { @@ -616,7 +616,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, return eSAP_FALSE; } - cdf_mem_zero(pSpectCh, + qdf_mem_zero(pSpectCh, (pSpectInfoParams->numSpectChans) * sizeof(*pSpectCh)); /* Initialize the pointers in the DfsParams to the allocated memory */ @@ -1168,7 +1168,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, tSirProbeRespBeacon *pBeaconStruct; tpAniSirGlobal pMac = (tpAniSirGlobal) halHandle; - pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + pBeaconStruct = qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == pBeaconStruct) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "Unable to allocate memory in sap_compute_spect_weight\n"); @@ -1197,7 +1197,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, (pScanResult->BssDescriptor.length + sizeof(uint16_t) + sizeof(uint32_t) - sizeof(tSirBssDescription)); - cdf_mem_set((uint8_t *) pBeaconStruct, + qdf_mem_set((uint8_t *) pBeaconStruct, sizeof(tSirProbeRespBeacon), 0); if ((sir_parse_beacon_ie @@ -1315,7 +1315,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, /* ------ Debug Info ------ */ pSpectCh++; } - cdf_mem_free(pBeaconStruct); + qdf_mem_free(pBeaconStruct); } /*========================================================================== @@ -1341,7 +1341,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams, void sap_chan_sel_exit(tSapChSelSpectInfo *pSpectInfoParams) { /* Free all the allocated memory */ - cdf_mem_free(pSpectInfoParams->pSpectCh); + qdf_mem_free(pSpectInfoParams->pSpectCh); } /*========================================================================== @@ -1380,11 +1380,11 @@ void sap_sort_chl_weight(tSapChSelSpectInfo *pSpectInfoParams) } } if (minWeightIndex != i) { - cdf_mem_copy(&temp, &pSpectCh[minWeightIndex], + qdf_mem_copy(&temp, &pSpectCh[minWeightIndex], sizeof(*pSpectCh)); - cdf_mem_copy(&pSpectCh[minWeightIndex], &pSpectCh[i], + qdf_mem_copy(&pSpectCh[minWeightIndex], &pSpectCh[i], sizeof(*pSpectCh)); - cdf_mem_copy(&pSpectCh[i], &temp, sizeof(*pSpectCh)); + qdf_mem_copy(&pSpectCh[i], &temp, sizeof(*pSpectCh)); } } } @@ -1875,11 +1875,11 @@ void sap_sort_chl_weight_all(ptSapContext pSapCtx, } } if (minWeightIndex != i) { - cdf_mem_copy(&temp, &pSpectCh[minWeightIndex], + qdf_mem_copy(&temp, &pSpectCh[minWeightIndex], sizeof(*pSpectCh)); - cdf_mem_copy(&pSpectCh[minWeightIndex], &pSpectCh[i], + qdf_mem_copy(&pSpectCh[minWeightIndex], &pSpectCh[i], sizeof(*pSpectCh)); - cdf_mem_copy(&pSpectCh[i], &temp, sizeof(*pSpectCh)); + qdf_mem_copy(&pSpectCh[i], &temp, sizeof(*pSpectCh)); } } #endif diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index f2ce213ccb93..e7bcc38cb091 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1406,7 +1406,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) } /* end of check for NOL or ACS channels */ /* valid_chnl_count now have number of valid channels */ - tmp_ch_lst = cdf_mem_malloc(valid_chnl_count); + tmp_ch_lst = qdf_mem_malloc(valid_chnl_count); if (tmp_ch_lst == NULL) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sapdfs: memory alloc failed")); @@ -1445,12 +1445,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) nol, valid_chnl_count, tmp_ch_lst)) { - cdf_mem_free(tmp_ch_lst); + qdf_mem_free(tmp_ch_lst); return target_channel; } #endif - cdf_mem_zero(availableChannels, sizeof(availableChannels)); - cdf_mem_zero(&channelBitmap, sizeof(channelBitmap)); + qdf_mem_zero(availableChannels, sizeof(availableChannels)); + qdf_mem_zero(&channelBitmap, sizeof(channelBitmap)); channelBitmap.chanBondingSet[0].startChannel = 36; channelBitmap.chanBondingSet[1].startChannel = 52; channelBitmap.chanBondingSet[2].startChannel = 100; @@ -1591,7 +1591,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) break; /* this loop will iterate at max 3 times */ } while (1); - cdf_mem_free(tmp_ch_lst); + qdf_mem_free(tmp_ch_lst); return target_channel; } @@ -2049,7 +2049,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->acs_cfg->skip_scan_status != eSAP_SKIP_ACS_SCAN) { #endif - cdf_mem_zero(&scan_request, sizeof(scan_request)); + qdf_mem_zero(&scan_request, sizeof(scan_request)); /* * Set scanType to Active scan. FW takes care of using passive @@ -2141,7 +2141,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, if (sap_context->channelList != NULL) { sap_context->channel = sap_context->channelList[0]; - cdf_mem_free(sap_context-> + qdf_mem_free(sap_context-> channelList); sap_context->channelList = NULL; } @@ -2315,7 +2315,7 @@ sap_goto_starting 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, }; sapContext->key_type = 0x05; sapContext->key_length = 32; - cdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ + qdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); @@ -2574,14 +2574,14 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, reassoc_complete->staId = csr_roaminfo->staId; reassoc_complete->statusCode = csr_roaminfo->statusCode; reassoc_complete->iesLen = csr_roaminfo->rsnIELen; - cdf_mem_copy(reassoc_complete->ies, csr_roaminfo->prsnIE, + qdf_mem_copy(reassoc_complete->ies, csr_roaminfo->prsnIE, csr_roaminfo->rsnIELen); #ifdef FEATURE_WLAN_WAPI if (csr_roaminfo->wapiIELen) { uint8_t len = reassoc_complete->iesLen; reassoc_complete->iesLen += csr_roaminfo->wapiIELen; - cdf_mem_copy(&reassoc_complete->ies[len], + qdf_mem_copy(&reassoc_complete->ies[len], csr_roaminfo->pwapiIE, csr_roaminfo->wapiIELen); } @@ -2589,7 +2589,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, if (csr_roaminfo->addIELen) { uint8_t len = reassoc_complete->iesLen; reassoc_complete->iesLen += csr_roaminfo->addIELen; - cdf_mem_copy(&reassoc_complete->ies[len], + qdf_mem_copy(&reassoc_complete->ies[len], csr_roaminfo->paddIE, csr_roaminfo->addIELen); } @@ -2646,20 +2646,20 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, sap_ap_event.sapHddEventCode = eSAP_STA_MIC_FAILURE_EVENT; mic_failure = &sap_ap_event.sapevt.sapStationMICFailureEvent; - cdf_mem_copy(&mic_failure->srcMacAddr, + qdf_mem_copy(&mic_failure->srcMacAddr, csr_roaminfo->u.pMICFailureInfo->srcMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(&mic_failure->staMac.bytes, + qdf_mem_copy(&mic_failure->staMac.bytes, csr_roaminfo->u.pMICFailureInfo->taMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(&mic_failure->dstMacAddr.bytes, + qdf_mem_copy(&mic_failure->dstMacAddr.bytes, csr_roaminfo->u.pMICFailureInfo->dstMacAddr, sizeof(tSirMacAddr)); mic_failure->multicast = csr_roaminfo->u.pMICFailureInfo->multicast; mic_failure->IV1 = csr_roaminfo->u.pMICFailureInfo->IV1; mic_failure->keyId = csr_roaminfo->u.pMICFailureInfo->keyId; - cdf_mem_copy(mic_failure->TSC, + qdf_mem_copy(mic_failure->TSC, csr_roaminfo->u.pMICFailureInfo->TSC, SIR_CIPHER_SEQ_CTR_SIZE); break; @@ -2670,7 +2670,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, case eSAP_WPS_PBC_PROBE_REQ_EVENT: sap_ap_event.sapHddEventCode = eSAP_WPS_PBC_PROBE_REQ_EVENT; - cdf_mem_copy(&sap_ap_event.sapevt.sapPBCProbeReqEvent. + qdf_mem_copy(&sap_ap_event.sapevt.sapPBCProbeReqEvent. WPSPBCProbeReq, csr_roaminfo->u.pWPSPBCProbeReq, sizeof(tSirWPSPBCProbeReq)); break; @@ -2700,7 +2700,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx, case eSAP_UNKNOWN_STA_JOIN: sap_ap_event.sapHddEventCode = eSAP_UNKNOWN_STA_JOIN; - cdf_mem_copy((void *) sap_ap_event.sapevt.sapUnknownSTAJoin. + qdf_mem_copy((void *) sap_ap_event.sapevt.sapUnknownSTAJoin. macaddr.bytes, (void *) context, QDF_MAC_ADDR_SIZE); break; @@ -2866,7 +2866,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal, } pMac->sap.SapDfsInfo.cac_state = eSAP_DFS_DO_NOT_SKIP_CAC; sap_cac_reset_notify(hHal); - cdf_mem_zero(&pMac->sap, sizeof(pMac->sap)); + qdf_mem_zero(&pMac->sap, sizeof(pMac->sap)); } return qdf_status; @@ -3746,7 +3746,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->csrPersona = pconfig_params->persona; profile->disableDFSChSwitch = pconfig_params->disableDFSChSwitch; - cdf_mem_zero(profile->SSIDs.SSIDList[0].SSID.ssId, + qdf_mem_zero(profile->SSIDs.SSIDList[0].SSID.ssId, sizeof(profile->SSIDs.SSIDList[0].SSID.ssId)); /* Flag to not broadcast the SSID information */ @@ -3755,7 +3755,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->SSIDs.SSIDList[0].SSID.length = pconfig_params->SSIDinfo.ssid.length; - cdf_mem_copy(&profile->SSIDs.SSIDList[0].SSID.ssId, + qdf_mem_copy(&profile->SSIDs.SSIDList[0].SSID.ssId, pconfig_params->SSIDinfo.ssid.ssId, sizeof(pconfig_params->SSIDinfo.ssid.ssId)); @@ -3805,13 +3805,13 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength; if (pconfig_params->RSNWPAReqIELength) { profile->pRSNReqIE = - cdf_mem_malloc(pconfig_params->RSNWPAReqIELength); + qdf_mem_malloc(pconfig_params->RSNWPAReqIELength); if (NULL == profile->pRSNReqIE) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__); return eSAP_STATUS_FAILURE; } - cdf_mem_copy(profile->pRSNReqIE, pconfig_params->RSNWPAReqIE, + qdf_mem_copy(profile->pRSNReqIE, pconfig_params->RSNWPAReqIE, pconfig_params->RSNWPAReqIELength); profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength; } @@ -3839,7 +3839,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType /* country code */ if (pconfig_params->countryCode[0]) - cdf_mem_copy(profile->countryCode, pconfig_params->countryCode, + qdf_mem_copy(profile->countryCode, pconfig_params->countryCode, WNI_CFG_COUNTRY_CODE_LEN); profile->ieee80211d = pconfig_params->ieee80211d; /* wps config info */ @@ -3891,7 +3891,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType void sap_free_roam_profile(tCsrRoamProfile *profile) { if (profile->pRSNReqIE) { - cdf_mem_free(profile->pRSNReqIE); + qdf_mem_free(profile->pRSNReqIE); profile->pRSNReqIE = NULL; } } @@ -3911,17 +3911,17 @@ void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size) for (outer = 0; outer < size; outer++) { for (inner = 0; inner < size - 1; inner++) { nRes = - cdf_mem_compare2((macList + inner)->bytes, + qdf_mem_cmp((macList + inner)->bytes, (macList + inner + 1)->bytes, QDF_MAC_ADDR_SIZE); if (nRes > 0) { - cdf_mem_copy(temp.bytes, + qdf_mem_copy(temp.bytes, (macList + inner + 1)->bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy((macList + inner + 1)->bytes, + qdf_mem_copy((macList + inner + 1)->bytes, (macList + inner)->bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy((macList + inner)->bytes, + qdf_mem_copy((macList + inner)->bytes, temp.bytes, QDF_MAC_ADDR_SIZE); } } @@ -3946,7 +3946,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList, while (nStart <= nEnd) { nMiddle = (nStart + nEnd) / 2; nRes = - cdf_mem_compare2(&macList[nMiddle], peerMac, + qdf_mem_cmp(&macList[nMiddle], peerMac, QDF_MAC_ADDR_SIZE); if (0 == nRes) { @@ -3991,18 +3991,18 @@ void sap_add_mac_to_acl(struct qdf_mac_addr *macList, for (i = ((*size) - 1); i >= 0; i--) { nRes = - cdf_mem_compare2(&macList[i], peerMac, QDF_MAC_ADDR_SIZE); + qdf_mem_cmp(&macList[i], peerMac, QDF_MAC_ADDR_SIZE); if (nRes > 0) { /* Move alphabetically greater mac addresses one index down to allow for insertion of new mac in sorted order */ - cdf_mem_copy((macList + i + 1)->bytes, + qdf_mem_copy((macList + i + 1)->bytes, (macList + i)->bytes, QDF_MAC_ADDR_SIZE); } else { break; } } /* This should also take care of if the element is the first to be added in the list */ - cdf_mem_copy((macList + i + 1)->bytes, peerMac, QDF_MAC_ADDR_SIZE); + qdf_mem_copy((macList + i + 1)->bytes, peerMac, QDF_MAC_ADDR_SIZE); /* increment the list size */ (*size)++; } @@ -4030,11 +4030,11 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList, for (i = index; i < ((*size) - 1); i++) { /* Move mac addresses starting from "index" passed one index up to delete the void created by deletion of a mac address in ACL */ - cdf_mem_copy((macList + i)->bytes, (macList + i + 1)->bytes, + qdf_mem_copy((macList + i)->bytes, (macList + i + 1)->bytes, QDF_MAC_ADDR_SIZE); } /* The last space should be made empty since all mac addesses moved one step up */ - cdf_mem_zero((macList + (*size) - 1)->bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_zero((macList + (*size) - 1)->bytes, QDF_MAC_ADDR_SIZE); /* reduce the list size by 1 */ (*size)--; } @@ -4169,7 +4169,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, } /* Allocate the max number of channel supported */ - list = (uint8_t *) cdf_mem_malloc(NUM_5GHZ_CHANNELS + + list = (uint8_t *) qdf_mem_malloc(NUM_5GHZ_CHANNELS + NUM_24GHZ_CHANNELS); if (NULL == list) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -4266,7 +4266,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, *ch_list = list; } else { *ch_list = NULL; - cdf_mem_free(list); + qdf_mem_free(list); } for (loop_count = 0; loop_count < ch_count; loop_count++) { @@ -4292,12 +4292,12 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) } if (sapContext->SapAllChnlList.channelList) { - cdf_mem_free(sapContext->SapAllChnlList.channelList); + qdf_mem_free(sapContext->SapAllChnlList.channelList); sapContext->SapAllChnlList.channelList = NULL; } sapContext->SapAllChnlList.channelList = - (tChannelInfo *) cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN * + (tChannelInfo *) qdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN * sizeof(tChannelInfo)); if (NULL == sapContext->SapAllChnlList.channelList) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index e14f19edcf75..4cc8d44c556b 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -106,7 +106,7 @@ void *wlansap_open(void *p_cds_gctx) ptSapContext pSapCtx = NULL; /* dynamically allocate the sapContext */ - pSapCtx = (ptSapContext) cdf_mem_malloc(sizeof(tSapContext)); + pSapCtx = (ptSapContext) qdf_mem_malloc(sizeof(tSapContext)); if (NULL == pSapCtx) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -271,7 +271,7 @@ QDF_STATUS wlansap_close(void *pCtx) /* empty queues/lists/pkts if any */ wlansap_clean_cb(pSapCtx, true); - cdf_mem_free(pSapCtx); + qdf_mem_free(pSapCtx); return QDF_STATUS_SUCCESS; } /* wlansap_close */ @@ -311,7 +311,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_clean_cb"); - cdf_mem_zero(pSapCtx, sizeof(tSapContext)); + qdf_mem_zero(pSapCtx, sizeof(tSapContext)); pSapCtx->p_cds_gctx = NULL; @@ -468,9 +468,9 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig, psap_ctx->csr_roamProfile.BSSIDs.numOfBSSIDs = 1; /* Save a copy to SAP context */ - cdf_mem_copy(psap_ctx->csr_roamProfile.BSSIDs.bssid, + qdf_mem_copy(psap_ctx->csr_roamProfile.BSSIDs.bssid, pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(psap_ctx->self_mac_addr, + qdf_mem_copy(psap_ctx->self_mac_addr, pconfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); h_hal = (tHalHandle)CDS_GET_HAL_CB(psap_ctx->p_cds_gctx); @@ -631,13 +631,13 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ /* Set the BSSID to your "self MAC Addr" read the mac address from Configuation ITEM received from HDD */ pSapCtx->csr_roamProfile.BSSIDs.numOfBSSIDs = 1; - cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, + qdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, pSapCtx->self_mac_addr, sizeof(struct qdf_mac_addr)); /* Save a copy to SAP context */ - cdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, + qdf_mem_copy(pSapCtx->csr_roamProfile.BSSIDs.bssid, pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(pSapCtx->self_mac_addr, + qdf_mem_copy(pSapCtx->self_mac_addr, pConfig->self_macaddr.bytes, QDF_MAC_ADDR_SIZE); /* copy the configuration items to csrProfile */ @@ -678,11 +678,11 @@ QDF_STATUS wlansap_start_bss(void *pCtx, /* pwextCtx */ /* Copy MAC filtering settings to sap context */ pSapCtx->eSapMacAddrAclMode = pConfig->SapMacaddr_acl; - cdf_mem_copy(pSapCtx->acceptMacList, pConfig->accept_mac, + qdf_mem_copy(pSapCtx->acceptMacList, pConfig->accept_mac, sizeof(pConfig->accept_mac)); pSapCtx->nAcceptMac = pConfig->num_accept_mac; sap_sort_mac_list(pSapCtx->acceptMacList, pSapCtx->nAcceptMac); - cdf_mem_copy(pSapCtx->denyMacList, pConfig->deny_mac, + qdf_mem_copy(pSapCtx->denyMacList, pConfig->deny_mac, sizeof(pConfig->deny_mac)); pSapCtx->nDenyMac = pConfig->num_deny_mac; sap_sort_mac_list(pSapCtx->denyMacList, pSapCtx->nDenyMac); @@ -733,7 +733,7 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ pSapCtx->eSapMacAddrAclMode = pConfig->SapMacaddr_acl; if (eSAP_DENY_UNLESS_ACCEPTED == pSapCtx->eSapMacAddrAclMode) { - cdf_mem_copy(pSapCtx->acceptMacList, + qdf_mem_copy(pSapCtx->acceptMacList, pConfig->accept_mac, sizeof(pConfig->accept_mac)); pSapCtx->nAcceptMac = pConfig->num_accept_mac; @@ -741,7 +741,7 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx, /* pwextCtx */ pSapCtx->nAcceptMac); } else if (eSAP_ACCEPT_UNLESS_DENIED == pSapCtx->eSapMacAddrAclMode) { - cdf_mem_copy(pSapCtx->denyMacList, pConfig->deny_mac, + qdf_mem_copy(pSapCtx->denyMacList, pConfig->deny_mac, sizeof(pConfig->deny_mac)); pSapCtx->nDenyMac = pConfig->num_deny_mac; sap_sort_mac_list(pSapCtx->denyMacList, pSapCtx->nDenyMac); @@ -994,7 +994,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->denyMacList != NULL) { for (i = 0; i < (pSapCtx->nDenyMac - 1); i++) { - cdf_mem_zero((pSapCtx->denyMacList + i)->bytes, + qdf_mem_zero((pSapCtx->denyMacList + i)->bytes, QDF_MAC_ADDR_SIZE); } @@ -1004,7 +1004,7 @@ QDF_STATUS wlansap_clear_acl(void *pCtx) if (pSapCtx->acceptMacList != NULL) { for (i = 0; i < (pSapCtx->nAcceptMac - 1); i++) { - cdf_mem_zero((pSapCtx->acceptMacList + i)->bytes, + qdf_mem_zero((pSapCtx->acceptMacList + i)->bytes, QDF_MAC_ADDR_SIZE); } @@ -1713,7 +1713,7 @@ wlan_sap_getstation_ie_information QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, FL("WPAIE len : %x"), *len); if ((buf) && (ie_len >= sap_ctx->nStaWPARSnReqIeLength)) { - cdf_mem_copy(buf, + qdf_mem_copy(buf, sap_ctx->pStaWpaRsnReqIE, sap_ctx->nStaWPARSnReqIeLength); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, @@ -1764,13 +1764,13 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe) if (sap_acquire_global_lock(pSapCtx) == QDF_STATUS_SUCCESS) { if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_BEACON_IE) { - cdf_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, + qdf_mem_copy(&pSapCtx->APWPSIEs.SirWPSBeaconIE, &pSap_WPSIe->sapwpsie. sapWPSBeaconIE, sizeof(tSap_WPSBeaconIE)); } else if (pSap_WPSIe->sapWPSIECode == eSAP_WPS_PROBE_RSP_IE) { - cdf_mem_copy(&pSapCtx->APWPSIEs. + qdf_mem_copy(&pSapCtx->APWPSIEs. SirWPSProbeRspIE, &pSap_WPSIe->sapwpsie. sapWPSProbeRspIE, @@ -1946,7 +1946,7 @@ QDF_STATUS wlansap_set_wparsn_ies } pSapCtx->APWPARSNIEs.length = (uint16_t) WPARSNIEsLen; - cdf_mem_copy(pSapCtx->APWPARSNIEs.rsnIEdata, pWPARSNIEs, + qdf_mem_copy(pSapCtx->APWPARSNIEs.rsnIEdata, pWPARSNIEs, WPARSNIEsLen); cdf_ret_status = @@ -2686,14 +2686,14 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, /* initialize the buffer pointer so that pe can copy */ if (additionIELength > 0) { bufferLength = additionIELength; - pBuffer = cdf_mem_malloc(bufferLength); + pBuffer = qdf_mem_malloc(bufferLength); if (NULL == pBuffer) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Could not allocate the buffer ")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pBuffer, pAdditionIEBuffer, bufferLength); + qdf_mem_copy(pBuffer, pAdditionIEBuffer, bufferLength); bufferValid = true; } } @@ -2704,7 +2704,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, pConfig->probeRespBcnIEsLen = bufferLength; pConfig->pProbeRespBcnIEsBuffer = pBuffer; } else { - cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); + qdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); pConfig->probeRespBcnIEsLen = 0; pConfig->pProbeRespBcnIEsBuffer = NULL; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, @@ -2717,7 +2717,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, pConfig->probeRespIEsBufferLen = bufferLength; pConfig->pProbeRespIEsBuffer = pBuffer; } else { - cdf_mem_free(pConfig->pProbeRespIEsBuffer); + qdf_mem_free(pConfig->pProbeRespIEsBuffer); pConfig->probeRespIEsBufferLen = 0; pConfig->pProbeRespIEsBuffer = NULL; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, @@ -2730,7 +2730,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, pConfig->assocRespIEsLen = bufferLength; pConfig->pAssocRespIEsBuffer = pBuffer; } else { - cdf_mem_free(pConfig->pAssocRespIEsBuffer); + qdf_mem_free(pConfig->pAssocRespIEsBuffer); pConfig->assocRespIEsLen = 0; pConfig->pAssocRespIEsBuffer = NULL; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, @@ -2742,7 +2742,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("No matching buffer type %d"), updateType); if (pBuffer != NULL) - cdf_mem_free(pBuffer); + qdf_mem_free(pBuffer); break; } @@ -2761,21 +2761,21 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp switch (updateType) { case eUPDATE_IE_ALL: /*only used to reset */ case eUPDATE_IE_PROBE_RESP: - cdf_mem_free(pConfig->pProbeRespIEsBuffer); + qdf_mem_free(pConfig->pProbeRespIEsBuffer); pConfig->probeRespIEsBufferLen = 0; pConfig->pProbeRespIEsBuffer = NULL; if (eUPDATE_IE_ALL != updateType) break; case eUPDATE_IE_ASSOC_RESP: - cdf_mem_free(pConfig->pAssocRespIEsBuffer); + qdf_mem_free(pConfig->pAssocRespIEsBuffer); pConfig->assocRespIEsLen = 0; pConfig->pAssocRespIEsBuffer = NULL; if (eUPDATE_IE_ALL != updateType) break; case eUPDATE_IE_PROBE_BCN: - cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); + qdf_mem_free(pConfig->pProbeRespBcnIEsBuffer); pConfig->probeRespBcnIEsLen = 0; pConfig->pProbeRespBcnIEsBuffer = NULL; if (eUPDATE_IE_ALL != updateType) @@ -3105,7 +3105,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac, if (NULL == mac) qdf_set_macaddr_broadcast(&pDelStaParams->peerMacAddr); else - cdf_mem_copy(pDelStaParams->peerMacAddr.bytes, mac, + qdf_mem_copy(pDelStaParams->peerMacAddr.bytes, mac, QDF_MAC_ADDR_SIZE); if (reason_code == 0) diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 04b9be37358e..0f75c43eb56c 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -40,7 +40,7 @@ #include "qdf_status.h" #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "sir_api.h" #include "csr_internal.h" diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 61f7d82b1061..21a7b78476f8 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -40,7 +40,7 @@ #include "qdf_status.h" #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "host_diag_core_event.h" #include "csr_link_list.h" diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h index 6c3c1450a903..d0649a23d4ed 100644 --- a/core/sme/inc/sme_power_save.h +++ b/core/sme/inc/sme_power_save.h @@ -29,7 +29,7 @@ #define __SME_POWER_SAVE_H #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "ani_system_defs.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h index 59515080bb95..7b98504b5e81 100644 --- a/core/sme/inc/sme_qos_api.h +++ b/core/sme/inc/sme_qos_api.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h index 61570d4c8abd..8682eaa4719d 100644 --- a/core/sme/inc/sme_qos_internal.h +++ b/core/sme/inc/sme_qos_internal.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h index 9e8d56f16382..c65fb086ace2 100644 --- a/core/sme/inc/sme_rrm_api.h +++ b/core/sme/inc/sme_rrm_api.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "ani_global.h" #include "sir_api.h" diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index 9814e48a5794..a4eb3b5a3355 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -39,7 +39,7 @@ ------------------------------------------------------------------------*/ #include "qdf_lock.h" #include "qdf_trace.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "rrm_global.h" diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 6b35228b4efa..fe3bef0060ff 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -214,16 +214,16 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) saved_cmd); } if (saved_cmd->u.roamCmd.pRoamBssEntry) - cdf_mem_free( + qdf_mem_free( saved_cmd->u.roamCmd.pRoamBssEntry); if (saved_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList) - cdf_mem_free(saved_cmd->u.scanCmd.u. + qdf_mem_free(saved_cmd->u.scanCmd.u. scanRequest.SSIDs.SSIDList); if (saved_cmd->u.scanCmd.pToRoamProfile) - cdf_mem_free(saved_cmd->u.scanCmd. + qdf_mem_free(saved_cmd->u.scanCmd. pToRoamProfile); if (saved_cmd) { - cdf_mem_free(saved_cmd); + qdf_mem_free(saved_cmd); saved_cmd = NULL; mac->sme.saved_scan_cmd = NULL; } @@ -297,9 +297,9 @@ static void free_sme_cmds(tpAniSirGlobal mac_ctx) return; for (idx = 0; idx < mac_ctx->sme.totalSmeCmd; idx++) - cdf_mem_free(mac_ctx->sme.pSmeCmdBufAddr[idx]); + qdf_mem_free(mac_ctx->sme.pSmeCmdBufAddr[idx]); - cdf_mem_free(mac_ctx->sme.pSmeCmdBufAddr); + qdf_mem_free(mac_ctx->sme.pSmeCmdBufAddr); mac_ctx->sme.pSmeCmdBufAddr = NULL; } @@ -336,14 +336,14 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) /* following pointer contains array of pointers for tSmeCmd* */ sme_cmd_ptr_ary_sz = sizeof(void *) * pMac->sme.totalSmeCmd; - pMac->sme.pSmeCmdBufAddr = cdf_mem_malloc(sme_cmd_ptr_ary_sz); + pMac->sme.pSmeCmdBufAddr = qdf_mem_malloc(sme_cmd_ptr_ary_sz); if (NULL == pMac->sme.pSmeCmdBufAddr) { status = QDF_STATUS_E_NOMEM; goto end; } status = QDF_STATUS_SUCCESS; - cdf_mem_set(pMac->sme.pSmeCmdBufAddr, sme_cmd_ptr_ary_sz, 0); + qdf_mem_set(pMac->sme.pSmeCmdBufAddr, sme_cmd_ptr_ary_sz, 0); for (cmd_idx = 0; cmd_idx < pMac->sme.totalSmeCmd; cmd_idx++) { /* * Since total size of all commands together can be huge chunk @@ -355,7 +355,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) * freeing up of all SME CMDs with just a for loop. */ pMac->sme.pSmeCmdBufAddr[cmd_idx] = - cdf_mem_malloc(sizeof(tSmeCmd)); + qdf_mem_malloc(sizeof(tSmeCmd)); if (NULL == pMac->sme.pSmeCmdBufAddr[cmd_idx]) { status = QDF_STATUS_E_NOMEM; free_sme_cmds(pMac); @@ -369,7 +369,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) /* This timer is only to debug the active list command timeout */ cmdTimeoutTimer = - (qdf_mc_timer_t *) cdf_mem_malloc(sizeof(qdf_mc_timer_t)); + (qdf_mc_timer_t *) qdf_mem_malloc(sizeof(qdf_mc_timer_t)); if (cmdTimeoutTimer) { pMac->sme.smeCmdActiveList.cmdTimeoutTimer = cmdTimeoutTimer; qdf_status = @@ -380,7 +380,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Init Timer fail for active list command process time out"); - cdf_mem_free(pMac->sme.smeCmdActiveList. + qdf_mem_free(pMac->sme.smeCmdActiveList. cmdTimeoutTimer); pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; } else { @@ -433,7 +433,7 @@ void purge_sme_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId, tSmeCmd *pCommand; tDblLinkList localList; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; @@ -474,7 +474,7 @@ static QDF_STATUS free_sme_cmd_list(tpAniSirGlobal pMac) /*destroy active list command time out timer */ qdf_mc_timer_destroy(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); - cdf_mem_free(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); + qdf_mem_free(pMac->sme.smeCmdActiveList.cmdTimeoutTimer); pMac->sme.smeCmdActiveList.cmdTimeoutTimer = NULL; status = qdf_mutex_acquire(&pMac->sme.lkSmeGlobalLock); @@ -615,11 +615,11 @@ tSmeCmd *sme_get_command_buffer(tpAniSirGlobal pMac) /* memset to zero */ if (pRetCmd) { - cdf_mem_set((uint8_t *)&pRetCmd->command, + qdf_mem_set((uint8_t *)&pRetCmd->command, sizeof(pRetCmd->command), 0); - cdf_mem_set((uint8_t *)&pRetCmd->sessionId, + qdf_mem_set((uint8_t *)&pRetCmd->sessionId, sizeof(pRetCmd->sessionId), 0); - cdf_mem_set((uint8_t *)&pRetCmd->u, sizeof(pRetCmd->u), 0); + qdf_mem_set((uint8_t *)&pRetCmd->u, sizeof(pRetCmd->u), 0); } return pRetCmd; @@ -1285,10 +1285,10 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) } /* End of for () */ /* Copying back the valid channel list to plm struct */ - cdf_mem_set((void *)pPlmReq->plmChList, + qdf_mem_set((void *)pPlmReq->plmChList, pPlmReq->plmNumCh, 0); if (valid_count) - cdf_mem_copy(pPlmReq->plmChList, ch_list, + qdf_mem_copy(pPlmReq->plmChList, ch_list, valid_count); /* All are invalid channels, FW need to send the PLM * report with "incapable" bit set. @@ -1424,25 +1424,25 @@ QDF_STATUS sme_update_roam_params(tHalHandle hal, roam_params_dst->is_5g_pref_enabled = true; break; case REASON_ROAM_SET_SSID_ALLOWED: - cdf_mem_set(&roam_params_dst->ssid_allowed_list, 0, + qdf_mem_set(&roam_params_dst->ssid_allowed_list, 0, sizeof(tSirMacSSid) * MAX_SSID_ALLOWED_LIST); roam_params_dst->num_ssid_allowed_list = roam_params_src.num_ssid_allowed_list; for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) { roam_params_dst->ssid_allowed_list[i].length = roam_params_src.ssid_allowed_list[i].length; - cdf_mem_copy(roam_params_dst->ssid_allowed_list[i].ssId, + qdf_mem_copy(roam_params_dst->ssid_allowed_list[i].ssId, roam_params_src.ssid_allowed_list[i].ssId, roam_params_dst->ssid_allowed_list[i].length); } break; case REASON_ROAM_SET_FAVORED_BSSID: - cdf_mem_set(&roam_params_dst->bssid_favored, 0, + qdf_mem_set(&roam_params_dst->bssid_favored, 0, sizeof(tSirMacAddr) * MAX_BSSID_FAVORED); roam_params_dst->num_bssid_favored = roam_params_src.num_bssid_favored; for (i = 0; i < roam_params_dst->num_bssid_favored; i++) { - cdf_mem_copy(&roam_params_dst->bssid_favored[i], + qdf_mem_copy(&roam_params_dst->bssid_favored[i], &roam_params_src.bssid_favored[i], sizeof(tSirMacAddr)); roam_params_dst->bssid_favored_factor[i] = @@ -1450,7 +1450,7 @@ QDF_STATUS sme_update_roam_params(tHalHandle hal, } break; case REASON_ROAM_SET_BLACKLIST_BSSID: - cdf_mem_set(&roam_params_dst->bssid_avoid_list, 0, + qdf_mem_set(&roam_params_dst->bssid_avoid_list, 0, QDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST); roam_params_dst->num_bssid_avoid_list = roam_params_src.num_bssid_avoid_list; @@ -1733,7 +1733,7 @@ static QDF_STATUS sme_handle_scan_req(tpAniSirGlobal mac_ctx, FL("scan request failed. session_id %d"), session_id); } csr_scan_free_request(mac_ctx, scan_msg->scan_param); - cdf_mem_free(scan_msg->scan_param); + qdf_mem_free(scan_msg->scan_param); return status; } @@ -1993,11 +1993,11 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, } /* Store the info in RRM context */ - cdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq, + qdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq, sizeof(tCsrEseBeaconReq)); /* Prepare the request to send to SME. */ - pSmeBcnReportReq = cdf_mem_malloc(sizeof(tSirBeaconReportReqInd)); + pSmeBcnReportReq = qdf_mem_malloc(sizeof(tSirBeaconReportReqInd)); if (NULL == pSmeBcnReportReq) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! ESE BcnReq Ind to SME"); @@ -2007,11 +2007,11 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, pSmeRrmContext->eseBcnReqInProgress = true; sms_log(pMac, LOGE, "Sending Beacon Report Req to SME"); - cdf_mem_zero(pSmeBcnReportReq, sizeof(tSirBeaconReportReqInd)); + qdf_mem_zero(pSmeBcnReportReq, sizeof(tSirBeaconReportReqInd)); pSmeBcnReportReq->messageType = eWNI_SME_BEACON_REPORT_REQ_IND; pSmeBcnReportReq->length = sizeof(tSirBeaconReportReqInd); - cdf_mem_copy(pSmeBcnReportReq->bssId, + qdf_mem_copy(pSmeBcnReportReq->bssId, pSession->connectedProfile.bssid.bytes, sizeof(tSirMacAddr)); pSmeBcnReportReq->channelInfo.channelNum = 255; @@ -2057,7 +2057,7 @@ static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) if (mac_ctx->sme.fw_dump_callback) mac_ctx->sme.fw_dump_callback(mac_ctx->hHdd, (struct fw_dump_rsp *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); } } #else @@ -2165,14 +2165,14 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGW, FL("Locking failed, bailing out")); if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); return status; } if (!SME_IS_START(pMac)) { sms_log(pMac, LOGW, FL("message type %d in stop state ignored"), pMsg->type); if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); goto release_lock; } switch (pMsg->type) { @@ -2181,7 +2181,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("LFR3: Rcvd eWNI_SME_HO_FAIL_IND")); csr_process_ho_fail_ind(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #endif case eWNI_PMC_SMPS_STATE_IND: @@ -2201,7 +2201,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) #ifndef WLAN_MDM_CODE_REDUCTION_OPT status = sme_qos_msg_processor(pMac, pMsg->type, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); #endif } else { sms_log(pMac, LOGE, FL("Empty message for %d"), @@ -2218,7 +2218,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_rrm_msg_processor(pMac, pMsg->type, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2230,7 +2230,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_OEM_DATA_RSP: if (pMsg->bodyptr) { status = sme_handle_oem_data_rsp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2242,7 +2242,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = csr_process_add_sta_session_rsp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2252,7 +2252,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = csr_process_del_sta_session_rsp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2261,7 +2261,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_REMAIN_ON_CHN_RSP: if (pMsg->bodyptr) { status = sme_remain_on_chn_rsp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2270,7 +2270,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_REMAIN_ON_CHN_RDY_IND: if (pMsg->bodyptr) { status = sme_remain_on_chn_ready(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2279,7 +2279,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_ACTION_FRAME_SEND_CNF: if (pMsg->bodyptr) { status = sme_send_action_cnf(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2290,7 +2290,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_preferred_network_found_ind((void *)pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2301,7 +2301,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_handle_change_country_code((void *)pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2311,7 +2311,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_handle_generic_change_country_code( (void *)pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2320,7 +2320,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_SCAN_CMD: if (pMsg->bodyptr) { status = sme_handle_scan_req(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2329,7 +2329,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_ROC_CMD: if (pMsg->bodyptr) { status = sme_handle_roc_req(hHal, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2353,7 +2353,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = tdls_msg_processor(pMac, pMsg->type, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2364,7 +2364,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_UNPROT_MGMT_FRM_IND: if (pMsg->bodyptr) { sme_unprotected_mgmt_frm_ind(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2375,7 +2375,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_TSM_IE_IND: if (pMsg->bodyptr) { sme_tsm_ie_ind(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2385,13 +2385,13 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_ROAM_SCAN_OFFLOAD_RSP: status = csr_roam_offload_scan_rsp_hdlr((void *)pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #ifdef WLAN_FEATURE_GTK_OFFLOAD case eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP: if (pMsg->bodyptr) { sme_process_get_gtk_info_rsp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2403,14 +2403,14 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_LPHB_IND: if (pMac->sme.pLphbIndCb) pMac->sme.pLphbIndCb(pMac->hHdd, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #endif /* FEATURE_WLAN_LPHB */ case eWNI_SME_READY_TO_SUSPEND_IND: if (pMsg->bodyptr) { sme_process_ready_to_suspend(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2420,7 +2420,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_READY_TO_EXTWOW_IND: if (pMsg->bodyptr) { sme_process_ready_to_ext_wow(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2436,7 +2436,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) pMac->sme.pChAvoidNotificationCb(pMac->hHdd, pMsg->bodyptr); } - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #endif /* FEATURE_WLAN_CH_AVOID */ #ifdef FEATURE_WLAN_AUTO_SHUTDOWN @@ -2446,20 +2446,20 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) FL("Auto shutdown notification")); pMac->sme.pAutoShutdownNotificationCb(); } - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #endif case eWNI_SME_DFS_RADAR_FOUND: case eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND: status = dfs_msg_processor(pMac, pMsg->type, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_CHANNEL_CHANGE_RSP: if (pMsg->bodyptr) { status = sme_process_channel_change_resp(pMac, pMsg->type, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2469,7 +2469,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) case eWNI_SME_STATS_EXT_EVENT: if (pMsg->bodyptr) { status = sme_stats_ext_event(hHal, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2481,19 +2481,19 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) pMac->sme.pLinkSpeedIndCb(pMsg->bodyptr, pMac->sme.pLinkSpeedCbContext); if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_CSA_OFFLOAD_EVENT: if (pMsg->bodyptr) { csr_scan_flush_bss_entry(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } break; #ifdef WLAN_FEATURE_NAN case eWNI_SME_NAN_EVENT: if (pMsg->bodyptr) { sme_nan_event(hHal, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } break; #endif /* WLAN_FEATURE_NAN */ @@ -2509,7 +2509,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } pMac->sme.linkStatusCallback = NULL; pMac->sme.linkStatusContext = NULL; - cdf_mem_free(pLinkStatus); + qdf_mem_free(pLinkStatus); } break; } @@ -2529,7 +2529,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) (pSnrReq->snr, pSnrReq->staId, pSnrReq->pDevContext); } - cdf_mem_free(pSnrReq); + qdf_mem_free(pSnrReq); } break; } @@ -2544,7 +2544,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) FL("callback not registered to process %d"), pMsg->type); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_EPNO_NETWORK_FOUND_IND: if (pMac->sme.pExtScanIndCb) @@ -2556,7 +2556,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) FL("callback not registered to process %d"), pMsg->type); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; #endif case eWNI_SME_FW_DUMP_IND: @@ -2566,7 +2566,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_process_set_hw_mode_resp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2576,7 +2576,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_process_hw_mode_trans_ind(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2586,7 +2586,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) if (pMsg->bodyptr) { status = sme_process_nss_update_resp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2603,7 +2603,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } pMac->sme.ocb_set_config_callback = NULL; pMac->sme.ocb_set_config_context = NULL; - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_OCB_GET_TSF_TIMER_RSP: if (pMac->sme.ocb_get_tsf_timer_callback) { @@ -2616,7 +2616,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } pMac->sme.ocb_get_tsf_timer_callback = NULL; pMac->sme.ocb_get_tsf_timer_context = NULL; - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_DCC_GET_STATS_RSP: if (pMac->sme.dcc_get_stats_callback) { @@ -2629,7 +2629,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } pMac->sme.dcc_get_stats_callback = NULL; pMac->sme.dcc_get_stats_context = NULL; - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_DCC_UPDATE_NDL_RSP: if (pMac->sme.dcc_update_ndl_callback) { @@ -2642,7 +2642,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } pMac->sme.dcc_update_ndl_callback = NULL; pMac->sme.dcc_update_ndl_context = NULL; - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_DCC_STATS_EVENT: if (pMac->sme.dcc_stats_event_callback) { @@ -2653,13 +2653,13 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) sms_log(pMac, LOGE, FL( "Message error. The callback is NULL.")); } - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; case eWNI_SME_SET_DUAL_MAC_CFG_RESP: if (pMsg->bodyptr) { status = sme_process_dual_mac_config_resp(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2671,7 +2671,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) break; case eWNI_SME_EXT_CHANGE_CHANNEL_IND: status = sme_extended_change_channel_ind(pMac, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); break; default: @@ -2680,7 +2680,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) /* CSR */ if (pMsg->bodyptr) { status = csr_msg_processor(hHal, pMsg->bodyptr); - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } else { sms_log(pMac, LOGE, FL("Empty message for %d"), pMsg->type); @@ -2689,7 +2689,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) sms_log(pMac, LOGW, FL("Unknown message type %d"), pMsg->type); if (pMsg->bodyptr) - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } } /* switch */ release_lock: @@ -2772,7 +2772,7 @@ void sme_free_msg(tHalHandle hHal, cds_msg_t *pMsg) { if (pMsg) { if (pMsg->bodyptr) { - cdf_mem_free(pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); } } @@ -2958,7 +2958,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, return status; } sms_log(mac_ctx, LOG1, FL(" called")); - scan_msg = cdf_mem_malloc(sizeof(struct ani_scan_req)); + scan_msg = qdf_mem_malloc(sizeof(struct ani_scan_req)); if (NULL == scan_msg) { sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); @@ -2970,12 +2970,12 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, scan_msg->session_id = session_id; scan_msg->callback = callback; scan_msg->ctx = ctx; - scan_msg->scan_param = cdf_mem_malloc(sizeof(tCsrScanRequest)); + scan_msg->scan_param = qdf_mem_malloc(sizeof(tCsrScanRequest)); if (NULL == scan_msg->scan_param) { sms_log(mac_ctx, LOGE, "scan_req:failed to allocate mem for scanreq"); sme_release_global_lock(&mac_ctx->sme); - cdf_mem_free(scan_msg); + qdf_mem_free(scan_msg); return QDF_STATUS_E_NOMEM; } csr_scan_copy_request(mac_ctx, scan_msg->scan_param, scan_req); @@ -2988,8 +2988,8 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); csr_scan_free_request(mac_ctx, scan_msg->scan_param); - cdf_mem_free(scan_msg->scan_param); - cdf_mem_free(scan_msg); + qdf_mem_free(scan_msg->scan_param); + qdf_mem_free(scan_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); @@ -3054,14 +3054,14 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, FL("mac_ctx is NULL")); return QDF_STATUS_E_FAILURE; } - scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + scan_filter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("scan_filter mem alloc failed")); return QDF_STATUS_E_FAILURE; } else { - cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); - cdf_mem_set(&first_ap_profile, sizeof(tSirBssDescription), 0); + qdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(&first_ap_profile, sizeof(tSirBssDescription), 0); if (NULL == profile) { scan_filter->EncryptionType.numEntries = 1; @@ -3088,7 +3088,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Preparing the profile filter failed")); - cdf_mem_free(scan_filter); + qdf_mem_free(scan_filter); return QDF_STATUS_E_FAILURE; } } @@ -3131,7 +3131,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, status = QDF_STATUS_E_FAILURE; } - cdf_mem_free(scan_filter); + qdf_mem_free(scan_filter); return status; } @@ -4200,7 +4200,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam) sme_release_global_lock(&pMac->sme); return status; } - cdf_mem_copy(&pParam->rrmConfig, + qdf_mem_copy(&pParam->rrmConfig, &pMac->rrm.rrmSmeContext.rrmConfig, sizeof(pMac->rrm.rrmSmeContext.rrmConfig)); sme_release_global_lock(&pMac->sme); @@ -4497,13 +4497,13 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal, MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_ADDBCAST_PATTERN, session_id, 0)); - ptrn = cdf_mem_malloc(sizeof(*ptrn)); + ptrn = qdf_mem_malloc(sizeof(*ptrn)); if (NULL == ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); return QDF_STATUS_E_NOMEM; } - (void)cdf_mem_copy(ptrn, pattern, sizeof(*ptrn)); + (void)qdf_mem_copy(ptrn, pattern, sizeof(*ptrn)); msg_q.type = WMA_WOW_ADD_PTRN; msg_q.reserved = 0; @@ -4538,13 +4538,13 @@ QDF_STATUS sme_wow_delete_pattern(tHalHandle hal, MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_WOWL_DELBCAST_PATTERN, sessionId, 0)); - delete_ptrn = cdf_mem_malloc(sizeof(*delete_ptrn)); + delete_ptrn = qdf_mem_malloc(sizeof(*delete_ptrn)); if (NULL == delete_ptrn) { sms_log(pMac, LOGP, FL("Fail to allocate memory for WoWLAN Delete Bcast Pattern ")); return QDF_STATUS_E_NOMEM; } - (void)cdf_mem_copy(delete_ptrn, pattern, sizeof(*delete_ptrn)); + (void)qdf_mem_copy(delete_ptrn, pattern, sizeof(*delete_ptrn)); msg_q.type = WMA_WOW_DEL_PTRN; msg_q.reserved = 0; msg_q.bodyptr = delete_ptrn; @@ -4876,7 +4876,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus)); + pMsg = qdf_mem_malloc(sizeof(tAniGetLinkStatus)); if (NULL == pMsg) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for link status", @@ -4899,7 +4899,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal, (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post LINK STATUS MSG fail", __func__); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); pMac->sme.linkStatusContext = NULL; pMac->sme.linkStatusCallback = NULL; status = QDF_STATUS_E_FAILURE; @@ -5031,7 +5031,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, return status; } - pMsg = cdf_mem_malloc(sizeof(tAniChangeCountryCodeReq)); + pMsg = qdf_mem_malloc(sizeof(tAniChangeCountryCodeReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, " csrChangeCountryCode: failed to allocate mem for req"); @@ -5041,7 +5041,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, pMsg->msgType = eWNI_SME_CHANGE_COUNTRY_CODE; pMsg->msgLen = (uint16_t) sizeof(tAniChangeCountryCodeReq); - cdf_mem_copy(pMsg->countryCode, pCountry, 3); + qdf_mem_copy(pMsg->countryCode, pCountry, 3); pMsg->countryFromUserSpace = countryFromUserSpace; pMsg->sendRegHint = sendRegHint; pMsg->changeCCCallback = callback; @@ -5056,7 +5056,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " sme_change_country_code failed to post msg to self "); - cdf_mem_free((void *)pMsg); + qdf_mem_free((void *)pMsg); status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); @@ -5101,7 +5101,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOG1, FL(" called")); - pMsg = cdf_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq)); + pMsg = qdf_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, @@ -5113,7 +5113,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, pMsg->msgType = eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE; pMsg->msgLen = (uint16_t) sizeof(tAniGenericChangeCountryCodeReq); - cdf_mem_copy(pMsg->countryCode, pCountry, 2); + qdf_mem_copy(pMsg->countryCode, pCountry, 2); pMsg->countryCode[2] = ' '; msg.type = eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE; @@ -5124,7 +5124,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "sme_generic_change_country_code failed to post msg to self"); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG1, FL(" returned")); @@ -5174,7 +5174,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); + pMsg = (tAniDHCPInd *) qdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp start", @@ -5185,7 +5185,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, pMsg->msgType = WMA_DHCP_START_IND; pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; - cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, + qdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, QDF_MAC_ADDR_SIZE); qdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5198,7 +5198,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Start MSG fail", __func__); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -5244,7 +5244,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd)); + pMsg = (tAniDHCPInd *) qdf_mem_malloc(sizeof(tAniDHCPInd)); if (NULL == pMsg) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for dhcp stop", @@ -5256,7 +5256,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, pMsg->msgType = WMA_DHCP_STOP_IND; pMsg->msgLen = (uint16_t) sizeof(tAniDHCPInd); pMsg->device_mode = device_mode; - cdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, + qdf_mem_copy(pMsg->adapterMacAddr.bytes, macAddr, QDF_MAC_ADDR_SIZE); qdf_copy_macaddr(&pMsg->peerMacAddr, &pSession->connectedProfile.bssid); @@ -5269,7 +5269,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post DHCP Stop MSG fail", __func__); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); status = QDF_STATUS_E_FAILURE; } @@ -5801,7 +5801,7 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(*request_buf)); + request_buf = qdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for GTK offload request")); @@ -5820,7 +5820,7 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal, (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -5854,7 +5854,7 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(*request_buf)); + request_buf = qdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for Get GTK offload request")); @@ -5887,7 +5887,7 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal, (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -5918,7 +5918,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, FL("Session not Found")); return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq)); + request_buf = qdf_mem_malloc(sizeof(tSirKeepAliveReq)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for keep alive request")); @@ -5926,7 +5926,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, } qdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid); - cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); + qdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq)); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_LOW, "buff TP %d input TP %d ", request_buf->timePeriod, @@ -5940,7 +5940,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id, cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -6064,14 +6064,14 @@ QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal, if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&mac_ctx->sme)) { - msg = cdf_mem_malloc(sizeof(*msg)); + msg = qdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(mac_ctx, LOGE, FL("Not able to allocate memory for eWNI_SME_REGISTER_MGMT_FRAME_CB")); sme_release_global_lock(&mac_ctx->sme); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(msg, sizeof(*msg), 0); + qdf_mem_set(msg, sizeof(*msg), 0); msg->message_type = eWNI_SME_REGISTER_MGMT_FRAME_CB; msg->length = sizeof(*msg); @@ -6125,18 +6125,18 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId, len = sizeof(tSirRegisterMgmtFrame) + matchLen; - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set(pMsg, len, 0); + qdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; pMsg->length = len; pMsg->sessionId = sessionId; pMsg->registerFrame = true; pMsg->frameType = frameType; pMsg->matchLen = matchLen; - cdf_mem_copy(pMsg->matchData, matchData, matchLen); + qdf_mem_copy(pMsg->matchData, matchData, matchLen); status = cds_send_mb_message_to_mac(pMsg); } sme_release_global_lock(&pMac->sme); @@ -6187,17 +6187,17 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId, len = sizeof(tSirRegisterMgmtFrame) + matchLen; - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set(pMsg, len, 0); + qdf_mem_set(pMsg, len, 0); pMsg->messageType = eWNI_SME_REGISTER_MGMT_FRAME_REQ; pMsg->length = len; pMsg->registerFrame = false; pMsg->frameType = frameType; pMsg->matchLen = matchLen; - cdf_mem_copy(pMsg->matchData, matchData, matchLen); + qdf_mem_copy(pMsg->matchData, matchData, matchLen); status = cds_send_mb_message_to_mac(pMsg); } sme_release_global_lock(&pMac->sme); @@ -6247,7 +6247,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, status = sme_acquire_global_lock(&mac_ctx->sme); sms_log(mac_ctx, LOG1, FL(" called")); - roc_msg = cdf_mem_malloc(sizeof(struct ani_roc_req)); + roc_msg = qdf_mem_malloc(sizeof(struct ani_roc_req)); if (NULL == roc_msg) { sms_log(mac_ctx, LOGE, " scan_req: failed to allocate mem for msg"); @@ -6271,7 +6271,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id, cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(mac_ctx, LOGE, " sme_scan_req failed to post msg"); - cdf_mem_free(roc_msg); + qdf_mem_free(roc_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac_ctx->sme); @@ -6328,11 +6328,11 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { if (NULL != pMac->p2pContext.probeRspIe) { - cdf_mem_free(pMac->p2pContext.probeRspIe); + qdf_mem_free(pMac->p2pContext.probeRspIe); pMac->p2pContext.probeRspIeLength = 0; } - pMac->p2pContext.probeRspIe = cdf_mem_malloc(p2pIeLength); + pMac->p2pContext.probeRspIe = qdf_mem_malloc(p2pIeLength); if (NULL == pMac->p2pContext.probeRspIe) { sms_log(pMac, LOGE, "%s: Unable to allocate P2P IE", __func__); @@ -6344,7 +6344,7 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength) sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG2, pMac->p2pContext.probeRspIe, pMac->p2pContext.probeRspIeLength); - cdf_mem_copy((uint8_t *) pMac->p2pContext.probeRspIe, + qdf_mem_copy((uint8_t *) pMac->p2pContext.probeRspIe, p2pIe, p2pIeLength); } @@ -6584,7 +6584,7 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - tpSirExtWoWParams MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); + tpSirExtWoWParams MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) return QDF_STATUS_E_NOMEM; @@ -6599,21 +6599,21 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal, if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ - cdf_mem_copy(MsgPtr, wlanExtParams, sizeof(*MsgPtr)); + qdf_mem_copy(MsgPtr, wlanExtParams, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_EXT_WOW; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { pMac->readyToExtWoWCallback = NULL; pMac->readyToExtWoWContext = NULL; - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { pMac->readyToExtWoWCallback = NULL; pMac->readyToExtWoWContext = NULL; - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); } return status; @@ -6642,7 +6642,7 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - tpSirAppType1Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); + tpSirAppType1Params MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) return QDF_STATUS_E_NOMEM; @@ -6654,17 +6654,17 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ - cdf_mem_copy(MsgPtr, wlanAppType1Params, sizeof(*MsgPtr)); + qdf_mem_copy(MsgPtr, wlanAppType1Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE1_PARAMS; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); } return status; @@ -6693,7 +6693,7 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); cds_msg_t cds_message; - tpSirAppType2Params MsgPtr = cdf_mem_malloc(sizeof(*MsgPtr)); + tpSirAppType2Params MsgPtr = qdf_mem_malloc(sizeof(*MsgPtr)); if (!MsgPtr) return QDF_STATUS_E_NOMEM; @@ -6705,17 +6705,17 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { /* serialize the req through MC thread */ - cdf_mem_copy(MsgPtr, wlanAppType2Params, sizeof(*MsgPtr)); + qdf_mem_copy(MsgPtr, wlanAppType2Params, sizeof(*MsgPtr)); cds_message.bodyptr = MsgPtr; cds_message.type = WMA_WLAN_SET_APP_TYPE2_PARAMS; qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { - cdf_mem_free(MsgPtr); + qdf_mem_free(MsgPtr); } return status; @@ -6899,7 +6899,7 @@ QDF_STATUS sme_preferred_network_found_ind(tHalHandle hHal, void *pMsg) if (pPrefNetworkFoundInd->ssId.length > 0) { ssIdLength = CSR_MIN(SIR_MAC_MAX_SSID_LENGTH, pPrefNetworkFoundInd->ssId.length); - cdf_mem_copy(dumpSsId, pPrefNetworkFoundInd->ssId.ssId, + qdf_mem_copy(dumpSsId, pPrefNetworkFoundInd->ssId.ssId, ssIdLength); dumpSsId[ssIdLength] = 0; sms_log(pMac, LOG2, "%s:SSID=%s frame length %d", @@ -6995,8 +6995,8 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) * if the reset Supplicant country code command is triggered, * enable 11D, reset the country code and return */ - if (true == - cdf_mem_compare(pMsg->countryCode, SME_INVALID_COUNTRY_CODE, 2)) { + if (true != + qdf_mem_cmp(pMsg->countryCode, SME_INVALID_COUNTRY_CODE, 2)) { pMac->roam.configParam.Is11dSupportEnabled = pMac->roam.configParam.Is11dSupportEnabledOriginal; @@ -7004,7 +7004,7 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) /* read the country code and use it */ if (QDF_IS_STATUS_SUCCESS(qdf_status)) { - cdf_mem_copy(pMsg->countryCode, + qdf_mem_copy(pMsg->countryCode, default_country, WNI_CFG_COUNTRY_CODE_LEN); } else { @@ -7019,7 +7019,7 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) sms_log(pMac, LOG1, FL("Set default country code (%c%c) as invalid country received"), pMsg->countryCode[0], pMsg->countryCode[1]); - cdf_mem_copy(pMac->scan.countryCode11d, + qdf_mem_copy(pMac->scan.countryCode11d, pMsg->countryCode, WNI_CFG_COUNTRY_CODE_LEN); } else { @@ -7044,7 +7044,7 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) } /* overwrite the defualt country code */ - cdf_mem_copy(pMac->scan.countryCodeDefault, + qdf_mem_copy(pMac->scan.countryCodeDefault, pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN); /* Get Domain ID from country code */ @@ -7076,9 +7076,9 @@ QDF_STATUS sme_handle_change_country_code(tpAniSirGlobal pMac, void *pMsgBuf) sms_log(pMac, LOGW, FL ("Clearing currentCountryBssid, countryCode11d")); - cdf_mem_zero(&pMac->scan.currentCountryBssid, + qdf_mem_zero(&pMac->scan.currentCountryBssid, sizeof(struct qdf_mac_addr)); - cdf_mem_zero(pMac->scan.countryCode11d, + qdf_mem_zero(pMac->scan.countryCode11d, sizeof(pMac->scan.countryCode11d)); } } @@ -7153,12 +7153,12 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, /* if Supplicant country code has priority, disable 11d */ if (!is_11d_country && supplicant_priority) mac_ctx->roam.configParam.Is11dSupportEnabled = false; - cdf_mem_copy(mac_ctx->scan.countryCodeCurrent, msg->countryCode, + qdf_mem_copy(mac_ctx->scan.countryCodeCurrent, msg->countryCode, WNI_CFG_COUNTRY_CODE_LEN); status = wma_set_reg_domain(mac_ctx, reg_domain_id); if (false == is_11d_country) { /* overwrite the defualt country code */ - cdf_mem_copy(mac_ctx->scan.countryCodeDefault, + qdf_mem_copy(mac_ctx->scan.countryCodeDefault, mac_ctx->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN); /* set to default domain ID */ @@ -7176,9 +7176,9 @@ sme_handle_generic_change_country_code(tpAniSirGlobal mac_ctx, if (!supplicant_priority && (false == is_11d_country)) { sms_log(mac_ctx, LOGW, FL("Clearing currentCountryBssid, countryCode11d")); - cdf_mem_zero(&mac_ctx->scan.currentCountryBssid, + qdf_mem_zero(&mac_ctx->scan.currentCountryBssid, sizeof(struct qdf_mac_addr)); - cdf_mem_zero(mac_ctx->scan.countryCode11d, + qdf_mem_zero(mac_ctx->scan.countryCode11d, sizeof(mac_ctx->scan.countryCode11d)); } } @@ -7288,7 +7288,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); + request_buf = qdf_mem_malloc(sizeof(tSirRcvFltMcAddrList)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to " @@ -7301,11 +7301,11 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Ignoring the " "indication as we are not connected", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(request_buf, pMulticastAddrs, + qdf_mem_copy(request_buf, pMulticastAddrs, sizeof(tSirRcvFltMcAddrList)); qdf_copy_macaddr(&request_buf->self_macaddr, &pSession->selfMacAddr); @@ -7320,7 +7320,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId, "%s: Not able to " "post WMA_8023_MULTICAST_LIST message to WMA", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -7344,7 +7344,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, allocSize = sizeof(tSirRcvPktFilterCfgType); - request_buf = cdf_mem_malloc(allocSize); + request_buf = qdf_mem_malloc(allocSize); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -7357,7 +7357,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, if (NULL == pSession) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Session Not found ", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -7365,7 +7365,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, &pSession->selfMacAddr); qdf_copy_macaddr(&pRcvPktFilterCfg->bssid, &pSession->connectedProfile.bssid); - cdf_mem_copy(request_buf, pRcvPktFilterCfg, allocSize); + qdf_mem_copy(request_buf, pRcvPktFilterCfg, allocSize); msg.type = WMA_RECEIVE_FILTER_SET_FILTER_REQ; msg.reserved = 0; @@ -7416,7 +7416,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal, "%s: Not able to post " "WMA_RECEIVE_FILTER_SET_FILTER message to WMA", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -7441,7 +7441,7 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); + request_buf = qdf_mem_malloc(sizeof(tSirRcvFltPktClearParam)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for Receive Filter " @@ -7454,7 +7454,7 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, qdf_copy_macaddr(&pRcvFltPktClearParam->bssid, &pSession->connectedProfile.bssid); - cdf_mem_copy(request_buf, pRcvFltPktClearParam, + qdf_mem_copy(request_buf, pRcvFltPktClearParam, sizeof(tSirRcvFltPktClearParam)); msg.type = WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ; @@ -7465,7 +7465,7 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal, "%s: Not able to post " "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -7561,7 +7561,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) tpMaxTxPowerPerBandParams pMaxTxPowerPerBandParams = NULL; pMaxTxPowerPerBandParams = - cdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams)); + qdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams)); if (NULL == pMaxTxPowerPerBandParams) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Not able to allocate memory for pMaxTxPowerPerBandParams", @@ -7580,7 +7580,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ", __func__); - cdf_mem_free(pMaxTxPowerPerBandParams); + qdf_mem_free(pMaxTxPowerPerBandParams); return QDF_STATUS_E_FAILURE; } @@ -7609,7 +7609,7 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_MAXTXPOW, NO_SESSION, 0)); - pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); + pMaxTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pMaxTxParams) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pMaxTxParams", @@ -7629,7 +7629,7 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA", __func__); - cdf_mem_free(pMaxTxParams); + qdf_mem_free(pMaxTxParams); return QDF_STATUS_E_FAILURE; } @@ -7651,14 +7651,14 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) cds_msg_t msg; tSirMacAddr *pBaseMacAddr; - pBaseMacAddr = cdf_mem_malloc(sizeof(tSirMacAddr)); + pBaseMacAddr = qdf_mem_malloc(sizeof(tSirMacAddr)); if (NULL == pBaseMacAddr) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for pBaseMacAddr")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(*pBaseMacAddr, customMacAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(*pBaseMacAddr, customMacAddr, sizeof(tSirMacAddr)); msg.type = SIR_HAL_SET_BASE_MACADDR_IND; msg.reserved = 0; @@ -7668,7 +7668,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA")); - cdf_mem_free(pBaseMacAddr); + qdf_mem_free(pBaseMacAddr); return QDF_STATUS_E_FAILURE; } @@ -7703,7 +7703,7 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, return QDF_STATUS_E_FAILURE; } - pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams)); + pTxParams = qdf_mem_malloc(sizeof(tMaxTxPowerParams)); if (NULL == pTxParams) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for pTxParams", @@ -7722,7 +7722,7 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: failed to post WMA_SET_TX_POWER_REQ to WMA", __func__); - cdf_mem_free(pTxParams); + qdf_mem_free(pTxParams); return QDF_STATUS_E_FAILURE; } @@ -7765,11 +7765,11 @@ QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden) /* Create the message and send to lim */ len = sizeof(tSirUpdateParams); - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set(pMsg, sizeof(tSirUpdateParams), 0); + qdf_mem_set(pMsg, sizeof(tSirUpdateParams), 0); pMsg->messageType = eWNI_SME_HIDE_SSID_REQ; pMsg->length = len; /* Data starts from here */ @@ -7805,7 +7805,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod if (QDF_IS_STATUS_SUCCESS(status)) { setTmLevelReq = (tAniSetTmLevelReq *) - cdf_mem_malloc(sizeof(tAniSetTmLevelReq)); + qdf_mem_malloc(sizeof(tAniSetTmLevelReq)); if (NULL == setTmLevelReq) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for sme_set_tm_level", @@ -7824,7 +7824,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Set TM Level MSG fail", __func__); - cdf_mem_free(setTmLevelReq); + qdf_mem_free(setTmLevelReq); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -9636,7 +9636,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, sessionId, statusCode)); status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_copy(sendTdlsReq.peerMac, peerMac, sizeof(tSirMacAddr)); + qdf_mem_copy(sendTdlsReq.peerMac, peerMac, sizeof(tSirMacAddr)); sendTdlsReq.frameType = frame_type; sendTdlsReq.buf = buf; sendTdlsReq.len = len; @@ -9833,7 +9833,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, status = sme_acquire_global_lock(&pMac->sme); if (!QDF_IS_STATUS_SUCCESS(status)) return status; - pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); + pTdlsPeerStateParams = qdf_mem_malloc(sizeof(*pTdlsPeerStateParams)); if (NULL == pTdlsPeerStateParams) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("failed to allocate mem for tdls peer state param")); @@ -9841,8 +9841,8 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pTdlsPeerStateParams, sizeof(*pTdlsPeerStateParams)); - cdf_mem_copy(&pTdlsPeerStateParams->peerMacAddr, + qdf_mem_zero(pTdlsPeerStateParams, sizeof(*pTdlsPeerStateParams)); + qdf_mem_copy(&pTdlsPeerStateParams->peerMacAddr, &peerStateParams->peerMacAddr, sizeof(tSirMacAddr)); pTdlsPeerStateParams->vdevId = peerStateParams->vdevId; pTdlsPeerStateParams->peerState = peerStateParams->peerState; @@ -9875,7 +9875,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("invalid peer state param (%d)"), peerStateParams->peerState); - cdf_mem_free(pTdlsPeerStateParams); + qdf_mem_free(pTdlsPeerStateParams); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } @@ -9933,7 +9933,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cdf_mem_free(pTdlsPeerStateParams); + qdf_mem_free(pTdlsPeerStateParams); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); @@ -9964,14 +9964,14 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, status = sme_acquire_global_lock(&mac->sme); if (QDF_STATUS_SUCCESS != status) return status; - chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params)); + chan_switch_params = qdf_mem_malloc(sizeof(*chan_switch_params)); if (NULL == chan_switch_params) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("fail to alloc mem for tdls chan switch param")); sme_release_global_lock(&mac->sme); return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(chan_switch_params, sizeof(*chan_switch_params)); + qdf_mem_zero(chan_switch_params, sizeof(*chan_switch_params)); switch (ch_switch_params->tdls_off_ch_mode) { case ENABLE_CHANSWITCH: @@ -9986,12 +9986,12 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("invalid off channel command (%d)"), ch_switch_params->tdls_off_ch_mode); - cdf_mem_free(chan_switch_params); + qdf_mem_free(chan_switch_params); sme_release_global_lock(&mac->sme); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&chan_switch_params->peer_mac_addr, + qdf_mem_copy(&chan_switch_params->peer_mac_addr, &ch_switch_params->peer_mac_addr, sizeof(tSirMacAddr)); chan_switch_params->vdev_id = ch_switch_params->vdev_id; chan_switch_params->tdls_off_ch = ch_switch_params->tdls_off_channel; @@ -10015,7 +10015,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Message Post failed status=%d"), qdf_status); - cdf_mem_free(chan_switch_params); + qdf_mem_free(chan_switch_params); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -10346,7 +10346,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { - request_buf = cdf_mem_malloc(sizeof(*request_buf)); + request_buf = qdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for \ @@ -10367,7 +10367,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_IPA_OFFLOAD_\ ENABLE_DISABLE message to WMA")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } @@ -10485,7 +10485,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOG1, FL("enter")); - req_msg = cdf_mem_malloc(sizeof(*req_msg)); + req_msg = qdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); return QDF_STATUS_E_NOMEM; @@ -10498,7 +10498,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -10510,7 +10510,7 @@ sme_add_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } sme_release_global_lock(&mac->sme); return status; @@ -10534,7 +10534,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOG1, FL("enter")); - req_msg = cdf_mem_malloc(sizeof(*req_msg)); + req_msg = qdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); return QDF_STATUS_E_NOMEM; @@ -10547,7 +10547,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -10559,7 +10559,7 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } sme_release_global_lock(&mac->sme); return status; @@ -10629,7 +10629,7 @@ static struct sir_ocb_config *sme_copy_sir_ocb_config( src->dcc_ndl_chan_list_len + src->dcc_ndl_active_state_list_len; - dst = cdf_mem_malloc(length); + dst = qdf_mem_malloc(length); if (!dst) return NULL; @@ -10639,19 +10639,19 @@ static struct sir_ocb_config *sme_copy_sir_ocb_config( cursor += sizeof(*dst); dst->channels = cursor; cursor += src->channel_count * sizeof(*src->channels); - cdf_mem_copy(dst->channels, src->channels, + qdf_mem_copy(dst->channels, src->channels, src->channel_count * sizeof(*src->channels)); dst->schedule = cursor; cursor += src->schedule_size * sizeof(*src->schedule); - cdf_mem_copy(dst->schedule, src->schedule, + qdf_mem_copy(dst->schedule, src->schedule, src->schedule_size * sizeof(*src->schedule)); dst->dcc_ndl_chan_list = cursor; cursor += src->dcc_ndl_chan_list_len; - cdf_mem_copy(dst->dcc_ndl_chan_list, src->dcc_ndl_chan_list, + qdf_mem_copy(dst->dcc_ndl_chan_list, src->dcc_ndl_chan_list, src->dcc_ndl_chan_list_len); dst->dcc_ndl_active_state_list = cursor; cursor += src->dcc_ndl_active_state_list_len; - cdf_mem_copy(dst->dcc_ndl_active_state_list, + qdf_mem_copy(dst->dcc_ndl_active_state_list, src->dcc_ndl_active_state_list, src->dcc_ndl_active_state_list_len); return dst; @@ -10709,7 +10709,7 @@ QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_set_config_callback = callback; pMac->sme.ocb_set_config_context = context; - cdf_mem_free(msg_body); + qdf_mem_free(msg_body); goto end; } @@ -10738,7 +10738,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) if (!QDF_IS_STATUS_SUCCESS(status)) return status; - sme_utc = cdf_mem_malloc(sizeof(*sme_utc)); + sme_utc = qdf_mem_malloc(sizeof(*sme_utc)); if (!sme_utc) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Malloc failed")); @@ -10754,7 +10754,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc) if (!QDF_IS_STATUS_SUCCESS(status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post message to WDA")); - cdf_mem_free(utc); + qdf_mem_free(utc); goto end; } @@ -10785,7 +10785,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(status)) return status; - buf = cdf_mem_malloc(sizeof(*sme_timing_advert) + + buf = qdf_mem_malloc(sizeof(*sme_timing_advert) + timing_advert->template_length); if (!buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -10797,7 +10797,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal, sme_timing_advert = (struct sir_ocb_timing_advert *)buf; *sme_timing_advert = *timing_advert; sme_timing_advert->template_value = buf + sizeof(*sme_timing_advert); - cdf_mem_copy(sme_timing_advert->template_value, + qdf_mem_copy(sme_timing_advert->template_value, timing_advert->template_value, timing_advert->template_length); msg.type = WMA_OCB_START_TIMING_ADVERT_CMD; @@ -10836,7 +10836,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal, if (!QDF_IS_STATUS_SUCCESS(status)) return status; - sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert)); + sme_timing_advert = qdf_mem_malloc(sizeof(*timing_advert)); if (!sme_timing_advert) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for stop TA")); @@ -10908,7 +10908,7 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, return status; /* Allocate memory for the WMI request, and copy the parameter */ - msg_body = cdf_mem_malloc(sizeof(*msg_body)); + msg_body = qdf_mem_malloc(sizeof(*msg_body)); if (!msg_body) { status = QDF_STATUS_E_NOMEM; goto end; @@ -10929,7 +10929,7 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context, FL("Error posting message to WDA: %d"), status); pMac->sme.ocb_get_tsf_timer_callback = NULL; pMac->sme.ocb_get_tsf_timer_context = NULL; - cdf_mem_free(msg_body); + qdf_mem_free(msg_body); goto end; } @@ -10963,7 +10963,7 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, return status; /* Allocate memory for the WMI request, and copy the parameter */ - msg_body = cdf_mem_malloc(sizeof(*msg_body) + + msg_body = qdf_mem_malloc(sizeof(*msg_body) + request->request_array_len); if (!msg_body) { status = QDF_STATUS_E_NOMEM; @@ -10971,7 +10971,7 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, } *msg_body = *request; msg_body->request_array = (void *)msg_body + sizeof(*msg_body); - cdf_mem_copy(msg_body->request_array, request->request_array, + qdf_mem_copy(msg_body->request_array, request->request_array, request->request_array_len); msg.type = WMA_DCC_GET_STATS_CMD; @@ -10987,7 +10987,7 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_get_stats_callback = callback; pMac->sme.dcc_get_stats_context = context; - cdf_mem_free(msg_body); + qdf_mem_free(msg_body); goto end; } @@ -11018,7 +11018,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, if (!QDF_IS_STATUS_SUCCESS(status)) return status; - request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); + request = qdf_mem_malloc(sizeof(struct sir_dcc_clear_stats)); if (!request) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory")); @@ -11026,7 +11026,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, goto end; } - cdf_mem_zero(request, sizeof(*request)); + qdf_mem_zero(request, sizeof(*request)); request->vdev_id = vdev_id; request->dcc_stats_bitmap = dcc_stats_bitmap; @@ -11037,7 +11037,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id, if (!QDF_IS_STATUS_SUCCESS(status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post msg to WDA")); - cdf_mem_free(request); + qdf_mem_free(request); goto end; } @@ -11071,7 +11071,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, return status; /* Allocate memory for the WMI request, and copy the parameter */ - msg_body = cdf_mem_malloc(sizeof(*msg_body) + + msg_body = qdf_mem_malloc(sizeof(*msg_body) + request->dcc_ndl_chan_list_len + request->dcc_ndl_active_state_list_len); if (!msg_body) { @@ -11086,9 +11086,9 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, msg_body->dcc_ndl_chan_list = (void *)msg_body + sizeof(*msg_body); msg_body->dcc_ndl_active_state_list = msg_body->dcc_ndl_chan_list + request->dcc_ndl_chan_list_len; - cdf_mem_copy(msg_body->dcc_ndl_chan_list, request->dcc_ndl_chan_list, + qdf_mem_copy(msg_body->dcc_ndl_chan_list, request->dcc_ndl_chan_list, request->dcc_ndl_active_state_list_len); - cdf_mem_copy(msg_body->dcc_ndl_active_state_list, + qdf_mem_copy(msg_body->dcc_ndl_active_state_list, request->dcc_ndl_active_state_list, request->dcc_ndl_active_state_list_len); @@ -11105,7 +11105,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context, FL("Error posting message to WDA: %d"), status); pMac->sme.dcc_update_ndl_callback = NULL; pMac->sme.dcc_update_ndl_context = NULL; - cdf_mem_free(msg_body); + qdf_mem_free(msg_body); goto end; } @@ -11236,7 +11236,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd)); + request_buf = qdf_mem_malloc(sizeof(tSirModemPowerStateInd)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for MODEM POWER STATE IND", @@ -11254,7 +11254,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_MODEM_POWER_STATE_IND message" " to WMA", __func__); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -11275,7 +11275,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, return QDF_STATUS_E_FAILURE; } - pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode)); + pHtOpMode = qdf_mem_malloc(sizeof(tUpdateVHTOpMode)); if (NULL == pHtOpMode) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to allocate memory for setting OP mode", @@ -11300,7 +11300,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, } pHtOpMode->staId = staId, - cdf_mem_copy(pHtOpMode->peer_mac, macAddrSTA.bytes, + qdf_mem_copy(pHtOpMode->peer_mac, macAddrSTA.bytes, sizeof(tSirMacAddr)); pHtOpMode->smesessionId = sessionId; @@ -11312,7 +11312,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_UPDATE_OP_MODE message" " to WMA", __func__); - cdf_mem_free(pHtOpMode); + qdf_mem_free(pHtOpMode); return QDF_STATUS_E_FAILURE; } @@ -11508,7 +11508,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status; cds_msg_t msg; - tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd)); + tSirRateUpdateInd *rate_upd = qdf_mem_malloc(sizeof(tSirRateUpdateInd)); if (rate_upd == NULL) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -11538,7 +11538,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal, __func__); sme_release_global_lock(&pMac->sme); - cdf_mem_free(rate_upd); + qdf_mem_free(rate_upd); return QDF_STATUS_E_FAILURE; } @@ -11637,7 +11637,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { auto_sh_cmd = (tSirAutoShutdownCmdParams *) - cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); + qdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams)); if (auto_sh_cmd == NULL) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); @@ -11654,7 +11654,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Auto shutdown MSG fail", __func__); - cdf_mem_free(auto_sh_cmd); + qdf_mem_free(auto_sh_cmd); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } @@ -11715,7 +11715,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) status = sme_acquire_global_lock(&pMac->sme); if (QDF_STATUS_SUCCESS == status) { cauReq = (tSirChAvoidUpdateReq *) - cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); + qdf_mem_malloc(sizeof(tSirChAvoidUpdateReq)); if (NULL == cauReq) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s Request Buffer Alloc Fail", __func__); @@ -11733,7 +11733,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Post Ch Avoid Update MSG fail", __func__); - cdf_mem_free(cauReq); + qdf_mem_free(cauReq); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } @@ -11763,7 +11763,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) uint32_t *val; tpAniSirGlobal mac_ptr = PMAC_STRUCT(hal); - val = cdf_mem_malloc(sizeof(*val)); + val = qdf_mem_malloc(sizeof(*val)); if (NULL == val || NULL == mac_ptr) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Invalid pointer", __func__); @@ -11781,7 +11781,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); - cdf_mem_free(val); + qdf_mem_free(val); return QDF_STATUS_E_FAILURE; } @@ -11804,7 +11804,7 @@ QDF_STATUS sme_set_mas(uint32_t val) cds_msg_t msg; uint32_t *ptr_val; - ptr_val = cdf_mem_malloc(sizeof(*ptr_val)); + ptr_val = qdf_mem_malloc(sizeof(*ptr_val)); if (NULL == ptr_val) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: could not allocate ptr_val", __func__); @@ -11822,7 +11822,7 @@ QDF_STATUS sme_set_mas(uint32_t val) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!", __func__); - cdf_mem_free(ptr_val); + qdf_mem_free(ptr_val); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -11872,7 +11872,7 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, proam_info.channelChangeRespEvent = (tSirChanChangeResponse *) - cdf_mem_malloc(sizeof(tSirChanChangeResponse)); + qdf_mem_malloc(sizeof(tSirChanChangeResponse)); if (NULL == proam_info.channelChangeRespEvent) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -11910,7 +11910,7 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac, sms_log(pMac, LOGE, "Invalid Channel Change Resp Message: %d\n", status); } - cdf_mem_free(proam_info.channelChangeRespEvent); + qdf_mem_free(proam_info.channelChangeRespEvent); return status; } @@ -11976,14 +11976,14 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam cds_msg_t msg; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - pWmaParam = (t_thermal_mgmt *) cdf_mem_malloc(sizeof(t_thermal_mgmt)); + pWmaParam = (t_thermal_mgmt *) qdf_mem_malloc(sizeof(t_thermal_mgmt)); if (NULL == pWmaParam) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: could not allocate tThermalMgmt", __func__); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero((void *)pWmaParam, sizeof(t_thermal_mgmt)); + qdf_mem_zero((void *)pWmaParam, sizeof(t_thermal_mgmt)); pWmaParam->thermalMgmtEnabled = thermalParam.smeThermalMgmtEnabled; pWmaParam->throttlePeriod = thermalParam.smeThrottlePeriod; @@ -12013,14 +12013,14 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!", __func__); - cdf_mem_free(pWmaParam); + qdf_mem_free(pWmaParam); sme_release_global_lock(&pMac->sme); return QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); return QDF_STATUS_SUCCESS; } - cdf_mem_free(pWmaParam); + qdf_mem_free(pWmaParam); return QDF_STATUS_E_FAILURE; } @@ -12055,7 +12055,7 @@ QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) { - cdf_mem_set(&msg, sizeof(msg), 0); + qdf_mem_set(&msg, sizeof(msg), 0); msg.type = WMA_SET_THERMAL_LEVEL; msg.bodyval = level; @@ -12088,7 +12088,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); tSirTxPowerLimit *tx_power_limit; - tx_power_limit = cdf_mem_malloc(sizeof(*tx_power_limit)); + tx_power_limit = qdf_mem_malloc(sizeof(*tx_power_limit)); if (!tx_power_limit) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Memory allocation for TxPowerLimit failed!", @@ -12110,7 +12110,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx) "%s: not able to post WMA_TX_POWER_LIMIT", __func__); status = QDF_STATUS_E_FAILURE; - cdf_mem_free(tx_power_limit); + qdf_mem_free(tx_power_limit); } sme_release_global_lock(&pMac->sme); } @@ -12151,13 +12151,13 @@ QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, tpDisableIntraBssFwd pSapDisableIntraFwd = NULL; /* Prepare the request to send to SME. */ - pSapDisableIntraFwd = cdf_mem_malloc(sizeof(tDisableIntraBssFwd)); + pSapDisableIntraFwd = qdf_mem_malloc(sizeof(tDisableIntraBssFwd)); if (NULL == pSapDisableIntraFwd) { sms_log(pMac, LOGP, "Memory Allocation Failure!!! %s", __func__); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pSapDisableIntraFwd, sizeof(tDisableIntraBssFwd)); + qdf_mem_zero(pSapDisableIntraFwd, sizeof(tDisableIntraBssFwd)); pSapDisableIntraFwd->sessionId = sessionId; pSapDisableIntraFwd->disableintrabssfwd = disablefwd; @@ -12170,7 +12170,7 @@ QDF_STATUS sme_ap_disable_intra_bss_fwd(tHalHandle hHal, uint8_t sessionId, qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { status = QDF_STATUS_E_FAILURE; - cdf_mem_free(pSapDisableIntraFwd); + qdf_mem_free(pSapDisableIntraFwd); } sme_release_global_lock(&pMac->sme); } @@ -12214,17 +12214,17 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) size_t data_len; data_len = sizeof(tStatsExtRequest) + input->request_data_len; - data = cdf_mem_malloc(data_len); + data = qdf_mem_malloc(data_len); if (data == NULL) { return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(data, data_len); + qdf_mem_zero(data, data_len); data->vdev_id = session_id; data->request_data_len = input->request_data_len; if (input->request_data_len) { - cdf_mem_copy(data->request_data, + qdf_mem_copy(data->request_data, input->request_data, input->request_data_len); } @@ -12236,7 +12236,7 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA", __func__); - cdf_mem_free(data); + qdf_mem_free(data); return QDF_STATUS_E_FAILURE; } @@ -12903,13 +12903,13 @@ QDF_STATUS sme_set_epno_list(tHalHandle hal, sms_log(mac, LOG1, FL("enter")); len = sizeof(*req_msg) + (input->num_networks * sizeof(struct wifi_epno_network)); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->num_networks = input->num_networks; req_msg->request_id = input->request_id; req_msg->session_id = input->session_id; @@ -12921,7 +12921,7 @@ QDF_STATUS sme_set_epno_list(tHalHandle hal, input->networks[i].auth_bit_field; req_msg->networks[i].ssid.length = input->networks[i].ssid.length; - cdf_mem_copy(req_msg->networks[i].ssid.ssId, + qdf_mem_copy(req_msg->networks[i].ssid.ssId, input->networks[i].ssid.ssId, req_msg->networks[i].ssid.length); } @@ -12931,7 +12931,7 @@ QDF_STATUS sme_set_epno_list(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -12943,7 +12943,7 @@ QDF_STATUS sme_set_epno_list(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -12972,26 +12972,26 @@ QDF_STATUS sme_set_passpoint_list(tHalHandle hal, sms_log(mac, LOG1, FL("enter")); len = sizeof(*req_msg) + (input->num_networks * sizeof(struct wifi_passpoint_network)); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->num_networks = input->num_networks; req_msg->request_id = input->request_id; req_msg->session_id = input->session_id; for (i = 0; i < req_msg->num_networks; i++) { req_msg->networks[i].id = input->networks[i].id; - cdf_mem_copy(req_msg->networks[i].realm, + qdf_mem_copy(req_msg->networks[i].realm, input->networks[i].realm, strlen(input->networks[i].realm) + 1); - cdf_mem_copy(req_msg->networks[i].plmn, + qdf_mem_copy(req_msg->networks[i].plmn, input->networks[i].plmn, SIR_PASSPOINT_PLMN_LEN); - cdf_mem_copy(req_msg->networks[i].roaming_consortium_ids, + qdf_mem_copy(req_msg->networks[i].roaming_consortium_ids, input->networks[i].roaming_consortium_ids, sizeof(req_msg->networks[i].roaming_consortium_ids)); } @@ -13001,7 +13001,7 @@ QDF_STATUS sme_set_passpoint_list(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -13013,7 +13013,7 @@ QDF_STATUS sme_set_passpoint_list(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13036,13 +13036,13 @@ QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, struct wifi_passpoint_req *req_msg; sms_log(mac, LOG1, FL("enter")); - req_msg = cdf_mem_malloc(sizeof(*req_msg)); + req_msg = qdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, sizeof(*req_msg)); + qdf_mem_zero(req_msg, sizeof(*req_msg)); req_msg->request_id = input->request_id; req_msg->session_id = input->session_id; @@ -13051,7 +13051,7 @@ QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -13063,7 +13063,7 @@ QDF_STATUS sme_reset_passpoint_list(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13086,9 +13086,9 @@ sme_set_ssid_hotlist(tHalHandle hal, cds_msg_t cds_message; struct sir_set_ssid_hotlist_request *set_req; - set_req = cdf_mem_malloc(sizeof(*set_req)); + set_req = qdf_mem_malloc(sizeof(*set_req)); if (!set_req) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_FAILURE; } @@ -13101,14 +13101,14 @@ sme_set_ssid_hotlist(tHalHandle hal, status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); sme_release_global_lock(&mac->sme); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(set_req); + qdf_mem_free(set_req); status = QDF_STATUS_E_FAILURE; } } else { sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(set_req); + qdf_mem_free(set_req); status = QDF_STATUS_E_FAILURE; } return status; @@ -13157,7 +13157,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "stopReq = %u", pclearStatsReq->stopReq); - clear_stats_req = cdf_mem_malloc(sizeof(*clear_stats_req)); + clear_stats_req = qdf_mem_malloc(sizeof(*clear_stats_req)); if (!clear_stats_req) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13177,14 +13177,14 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_CLEAR_REQ", __func__); - cdf_mem_free(clear_stats_req); + qdf_mem_free(clear_stats_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); - cdf_mem_free(clear_stats_req); + qdf_mem_free(clear_stats_req); status = QDF_STATUS_E_FAILURE; } @@ -13213,7 +13213,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq " Aggressive Stats Collections = %u", psetStatsReq->aggressiveStatisticsGathering); - set_stats_req = cdf_mem_malloc(sizeof(*set_stats_req)); + set_stats_req = qdf_mem_malloc(sizeof(*set_stats_req)); if (!set_stats_req) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13233,14 +13233,14 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: not able to post WMA_LL_STATS_SET_REQ", __func__); - cdf_mem_free(set_stats_req); + qdf_mem_free(set_stats_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); - cdf_mem_free(set_stats_req); + qdf_mem_free(set_stats_req); status = QDF_STATUS_E_FAILURE; } @@ -13269,7 +13269,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Stats Type = %u", pgetStatsReq->paramIdMask); - get_stats_req = cdf_mem_malloc(sizeof(*get_stats_req)); + get_stats_req = qdf_mem_malloc(sizeof(*get_stats_req)); if (!get_stats_req) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13290,7 +13290,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq "%s: not able to post WMA_LL_STATS_GET_REQ", __func__); - cdf_mem_free(get_stats_req); + qdf_mem_free(get_stats_req); status = QDF_STATUS_E_FAILURE; } @@ -13298,7 +13298,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: " "sme_acquire_global_lock error", __func__); - cdf_mem_free(get_stats_req); + qdf_mem_free(get_stats_req); status = QDF_STATUS_E_FAILURE; } @@ -13565,7 +13565,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); + pSmeDhcpSrvInfo = qdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo)); if (!pSmeDhcpSrvInfo) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13587,14 +13587,14 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!", __func__); - cdf_mem_free(pSmeDhcpSrvInfo); + qdf_mem_free(pSmeDhcpSrvInfo); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); - cdf_mem_free(pSmeDhcpSrvInfo); + qdf_mem_free(pSmeDhcpSrvInfo); } return status; @@ -13618,7 +13618,7 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type, cds_msg_t cds_message; tSirLedFlashingReq *ledflashing; - ledflashing = cdf_mem_malloc(sizeof(*ledflashing)); + ledflashing = qdf_mem_malloc(sizeof(*ledflashing)); if (!ledflashing) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL @@ -13731,7 +13731,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_stats_avg_factor *stats_factor; - stats_factor = cdf_mem_malloc(sizeof(*stats_factor)); + stats_factor = qdf_mem_malloc(sizeof(*stats_factor)); if (!stats_factor) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13756,7 +13756,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!", __func__); - cdf_mem_free(stats_factor); + qdf_mem_free(stats_factor); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13764,7 +13764,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); - cdf_mem_free(stats_factor); + qdf_mem_free(stats_factor); } return status; @@ -13788,7 +13788,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, tpAniSirGlobal mac = PMAC_STRUCT(hal); struct sir_guard_time_request *g_time; - g_time = cdf_mem_malloc(sizeof(*g_time)); + g_time = qdf_mem_malloc(sizeof(*g_time)); if (!g_time) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -13813,7 +13813,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!", __func__); - cdf_mem_free(g_time); + qdf_mem_free(g_time); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13821,7 +13821,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); - cdf_mem_free(g_time); + qdf_mem_free(g_time); } return status; @@ -13845,7 +13845,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, tpAniSirGlobal mac = PMAC_STRUCT(h_hal); wma_cli_set_cmd_t *iwcmd; - iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); + iwcmd = qdf_mem_malloc(sizeof(*iwcmd)); if (NULL == iwcmd) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, @@ -13857,7 +13857,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, if (QDF_STATUS_SUCCESS == status) { - cdf_mem_zero((void *)iwcmd, sizeof(*iwcmd)); + qdf_mem_zero((void *)iwcmd, sizeof(*iwcmd)); iwcmd->param_value = modulated_dtim; iwcmd->param_vdev_id = session_id; iwcmd->param_id = GEN_PARAM_MODULATED_DTIM; @@ -13871,7 +13871,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!", __func__); - cdf_mem_free(iwcmd); + qdf_mem_free(iwcmd); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -13879,7 +13879,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: sme_acquire_global_lock error!", __func__); - cdf_mem_free(iwcmd); + qdf_mem_free(iwcmd); } return status; @@ -13905,13 +13905,13 @@ QDF_STATUS sme_wifi_start_logger(tHalHandle hal, uint32_t len; len = sizeof(*req_msg); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); req_msg->verbose_level = start_log.verbose_level; req_msg->flag = start_log.flag; @@ -13922,7 +13922,7 @@ QDF_STATUS sme_wifi_start_logger(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -13934,7 +13934,7 @@ QDF_STATUS sme_wifi_start_logger(tHalHandle hal, sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -14236,7 +14236,7 @@ QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, struct rssi_monitor_req *req_msg; sms_log(mac, LOG1, FL("enter")); - req_msg = cdf_mem_malloc(sizeof(*req_msg)); + req_msg = qdf_mem_malloc(sizeof(*req_msg)); if (!req_msg) { sms_log(mac, LOGE, FL("memory allocation failed")); return QDF_STATUS_E_NOMEM; @@ -14249,7 +14249,7 @@ QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, sms_log(mac, LOGE, FL("sme_acquire_global_lock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -14261,7 +14261,7 @@ QDF_STATUS sme_set_rssi_monitoring(tHalHandle hal, sms_log(mac, LOGE, FL("cds_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } sme_release_global_lock(&mac->sme); @@ -14289,13 +14289,13 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) struct fw_dump_seg_req seg_req; int loop; - send_req = cdf_mem_malloc(sizeof(*send_req)); + send_req = qdf_mem_malloc(sizeof(*send_req)); if (!send_req) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Memory allocation failed for WDA_FW_MEM_DUMP")); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); + qdf_mem_copy(send_req, recvd_req, sizeof(*send_req)); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("request_id:%d num_seg:%d"), @@ -14325,14 +14325,14 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req) if (QDF_STATUS_SUCCESS != qdf_status) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_FW_MEM_DUMP")); - cdf_mem_free(send_req); + qdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&pMac->sme); } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Failed to acquire SME Global Lock")); - cdf_mem_free(send_req); + qdf_mem_free(send_req); status = QDF_STATUS_E_FAILURE; } @@ -14364,13 +14364,13 @@ QDF_STATUS sme_soc_set_pcl(tHalHandle hal, len = sizeof(*req_msg); - req_msg = cdf_mem_malloc(len); + req_msg = qdf_mem_malloc(len); if (!req_msg) { - sms_log(mac, LOGE, FL("cdf_mem_malloc failed")); + sms_log(mac, LOGE, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(req_msg, len); + qdf_mem_zero(req_msg, len); for (i = 0; i < msg.pcl_len; i++) req_msg->pcl_list[i] = msg.pcl_list[i]; @@ -14382,7 +14382,7 @@ QDF_STATUS sme_soc_set_pcl(tHalHandle hal, sms_log(mac, LOGE, FL("sme_AcquireGlobalLock failed!(status=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -14394,7 +14394,7 @@ QDF_STATUS sme_soc_set_pcl(tHalHandle hal, sms_log(mac, LOGE, FL("vos_mq_post_message failed!(err=%d)"), status); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); status = QDF_STATUS_E_FAILURE; } sme_release_global_lock(&mac->sme); @@ -14568,7 +14568,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, cds_msg_t cds_message; struct gateway_param_update_req *request_buf; - request_buf = cdf_mem_malloc(sizeof(*request_buf)); + request_buf = qdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for gw param update request")); @@ -14584,7 +14584,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -14831,7 +14831,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, QDF_STATUS status; struct egap_conf_params *egap_params; - egap_params = cdf_mem_malloc(sizeof(*egap_params)); + egap_params = qdf_mem_malloc(sizeof(*egap_params)); if (NULL == egap_params) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: fail to alloc egap_params", __func__); @@ -14850,7 +14850,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post msg to WMA!", __func__); - cdf_mem_free(egap_params); + qdf_mem_free(egap_params); } return status; } diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index 3b9aba549253..adbb1aa273c6 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -40,10 +40,10 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) if (NULL != pSession) { /* Clean up the context */ - cdf_mem_set(&pSession->ftSmeContext, sizeof(tftSMEContext), 0); + qdf_mem_set(&pSession->ftSmeContext, sizeof(tftSMEContext), 0); pSession->ftSmeContext.pUsrCtx = - cdf_mem_malloc(sizeof(tFTRoamCallbackUsrCtx)); + qdf_mem_malloc(sizeof(tFTRoamCallbackUsrCtx)); if (NULL == pSession->ftSmeContext.pUsrCtx) { sms_log(pMac, LOGE, FL("Memory allocation failure")); @@ -63,7 +63,7 @@ void sme_ft_open(tHalHandle hHal, uint32_t sessionId) sms_log(pMac, LOGE, FL ("Preauth Reassoc interval Timer allocation failed")); - cdf_mem_free(pSession->ftSmeContext.pUsrCtx); + qdf_mem_free(pSession->ftSmeContext.pUsrCtx); pSession->ftSmeContext.pUsrCtx = NULL; return; } @@ -102,7 +102,7 @@ void sme_ft_close(tHalHandle hHal, uint32_t sessionId) sms_log(pMac, LOG1, FL ("Freeing ftSmeContext.pUsrCtx and setting to NULL")); - cdf_mem_free(pSession->ftSmeContext.pUsrCtx); + qdf_mem_free(pSession->ftSmeContext.pUsrCtx); pSession->ftSmeContext.pUsrCtx = NULL; } } @@ -165,13 +165,13 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, if ((session->ftSmeContext.auth_ft_ies) && (session->ftSmeContext.auth_ft_ies_length)) { /* Free the one we recvd last from supplicant */ - cdf_mem_free(session->ftSmeContext.auth_ft_ies); + qdf_mem_free(session->ftSmeContext.auth_ft_ies); session->ftSmeContext.auth_ft_ies_length = 0; session->ftSmeContext.auth_ft_ies = NULL; } /* Save the FT IEs */ session->ftSmeContext.auth_ft_ies = - cdf_mem_malloc(ft_ies_length); + qdf_mem_malloc(ft_ies_length); if (NULL == session->ftSmeContext.auth_ft_ies) { sms_log(mac_ctx, LOGE, FL("Mem alloc failed for auth_ft_ies")); @@ -179,7 +179,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, return; } session->ftSmeContext.auth_ft_ies_length = ft_ies_length; - cdf_mem_copy((uint8_t *)session->ftSmeContext.auth_ft_ies, + qdf_mem_copy((uint8_t *)session->ftSmeContext.auth_ft_ies, ft_ies, ft_ies_length); session->ftSmeContext.FTState = eFT_AUTH_REQ_READY; @@ -215,12 +215,12 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, if ((session->ftSmeContext.reassoc_ft_ies) && (session->ftSmeContext.reassoc_ft_ies_length)) { /* Free the one we recvd last from supplicant */ - cdf_mem_free(session->ftSmeContext.reassoc_ft_ies); + qdf_mem_free(session->ftSmeContext.reassoc_ft_ies); session->ftSmeContext.reassoc_ft_ies_length = 0; } /* Save the FT IEs */ session->ftSmeContext.reassoc_ft_ies = - cdf_mem_malloc(ft_ies_length); + qdf_mem_malloc(ft_ies_length); if (NULL == session->ftSmeContext.reassoc_ft_ies) { sms_log(mac_ctx, LOGE, FL("Mem alloc fail for reassoc_ft_ie")); @@ -229,7 +229,7 @@ void sme_set_ft_ies(tHalHandle hal_ptr, uint32_t session_id, } session->ftSmeContext.reassoc_ft_ies_length = ft_ies_length; - cdf_mem_copy((uint8_t *)session->ftSmeContext.reassoc_ft_ies, + qdf_mem_copy((uint8_t *)session->ftSmeContext.reassoc_ft_ies, ft_ies, ft_ies_length); session->ftSmeContext.FTState = eFT_SET_KEY_WAIT; @@ -280,11 +280,11 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, } msglen = sizeof(tSirFTUpdateKeyInfo); - msg = cdf_mem_malloc(msglen); + msg = qdf_mem_malloc(msglen); if (NULL == msg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(msg, msglen, 0); + qdf_mem_set(msg, msglen, 0); msg->messageType = eWNI_SME_FT_UPDATE_KEY; msg->length = msglen; @@ -297,13 +297,13 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, keymaterial->key[0].unicast = (uint8_t) true; keymaterial->key[0].keyDirection = ftkey_info->keyDirection; - cdf_mem_copy(&keymaterial->key[0].keyRsc, + qdf_mem_copy(&keymaterial->key[0].keyRsc, ftkey_info->keyRsc, CSR_MAX_RSC_LEN); keymaterial->key[0].paeRole = ftkey_info->paeRole; keymaterial->key[0].keyLength = ftkey_info->keyLength; if (ftkey_info->keyLength && ftkey_info->Key) { - cdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key, + qdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key, ftkey_info->keyLength); if (ftkey_info->keyLength == 16) { sms_log(mac_ctx, LOG1, @@ -457,11 +457,11 @@ void sme_get_ft_pre_auth_response(tHalHandle hHal, uint32_t sessionId, } /* hdd needs to pack the bssid also along with the */ /* auth response to supplicant */ - cdf_mem_copy(ft_ies, pSession->ftSmeContext.preAuthbssId, + qdf_mem_copy(ft_ies, pSession->ftSmeContext.preAuthbssId, QDF_MAC_ADDR_SIZE); /* Copy the auth resp FTIEs */ - cdf_mem_copy(&(ft_ies[QDF_MAC_ADDR_SIZE]), + qdf_mem_copy(&(ft_ies[QDF_MAC_ADDR_SIZE]), pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies, pSession->ftSmeContext.psavedFTPreAuthRsp->ft_ies_length); @@ -507,7 +507,7 @@ void sme_get_rici_es(tHalHandle hHal, uint32_t sessionId, uint8_t *ric_ies, return; } - cdf_mem_copy(ric_ies, + qdf_mem_copy(ric_ies, pSession->ftSmeContext.psavedFTPreAuthRsp->ric_ies, pSession->ftSmeContext.psavedFTPreAuthRsp->ric_ies_length); @@ -559,7 +559,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) sms_log(pMac, LOG1, FL("Free FT Auth IE %p and set to NULL"), pSession->ftSmeContext.auth_ft_ies); - cdf_mem_free(pSession->ftSmeContext.auth_ft_ies); + qdf_mem_free(pSession->ftSmeContext.auth_ft_ies); pSession->ftSmeContext.auth_ft_ies = NULL; } pSession->ftSmeContext.auth_ft_ies_length = 0; @@ -568,7 +568,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) sms_log(pMac, LOG1, FL("Free FT Reassoc IE %p and set to NULL"), pSession->ftSmeContext.reassoc_ft_ies); - cdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies); + qdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies); pSession->ftSmeContext.reassoc_ft_ies = NULL; } pSession->ftSmeContext.reassoc_ft_ies_length = 0; @@ -577,13 +577,13 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId) sms_log(pMac, LOG1, FL("Free FtPreAuthRsp %p and set to NULL"), pSession->ftSmeContext.psavedFTPreAuthRsp); - cdf_mem_free(pSession->ftSmeContext.psavedFTPreAuthRsp); + qdf_mem_free(pSession->ftSmeContext.psavedFTPreAuthRsp); pSession->ftSmeContext.psavedFTPreAuthRsp = NULL; } pSession->ftSmeContext.setFTPreAuthState = false; pSession->ftSmeContext.setFTPTKState = false; - cdf_mem_zero(pSession->ftSmeContext.preAuthbssId, + qdf_mem_zero(pSession->ftSmeContext.preAuthbssId, QDF_MAC_ADDR_SIZE); pSession->ftSmeContext.FTState = eFT_START_READY; } diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 78ccd346e5a4..784270996a6f 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -28,7 +28,7 @@ #include "sme_power_save.h" #include "sme_power_save_api.h" #include "sms_debug.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_types.h" #include "wma_types.h" #include "wmm_apsd.h" @@ -56,7 +56,7 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Posting message %d failed", __func__, type); - cdf_mem_free(body); + qdf_mem_free(body); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -75,7 +75,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, struct sEnablePsParams *enable_ps_req_params; QDF_STATUS status = QDF_STATUS_SUCCESS; - enable_ps_req_params = cdf_mem_malloc(sizeof(*enable_ps_req_params)); + enable_ps_req_params = qdf_mem_malloc(sizeof(*enable_ps_req_params)); if (NULL == enable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_ps_req_params")); @@ -105,7 +105,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, struct sDisablePsParams *disable_ps_req_params; QDF_STATUS status = QDF_STATUS_SUCCESS; - disable_ps_req_params = cdf_mem_malloc(sizeof(*disable_ps_req_params)); + disable_ps_req_params = qdf_mem_malloc(sizeof(*disable_ps_req_params)); if (NULL == disable_ps_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for sDisablePsParams")); @@ -142,7 +142,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; enable_uapsd_req_params = - cdf_mem_malloc(sizeof(*enable_uapsd_req_params)); + qdf_mem_malloc(sizeof(*enable_uapsd_req_params)); if (NULL == enable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for enable_uapsd_req_params")); @@ -209,7 +209,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; disable_uapsd_req_params = - cdf_mem_malloc(sizeof(*disable_uapsd_req_params)); + qdf_mem_malloc(sizeof(*disable_uapsd_req_params)); if (NULL == disable_uapsd_req_params) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed for disable_uapsd_req_params")); @@ -245,13 +245,13 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, sme_wowl_params = &ps_global_info->ps_params[session_id].wowl_enter_params; - hal_wowl_params = cdf_mem_malloc(sizeof(*hal_wowl_params)); + hal_wowl_params = qdf_mem_malloc(sizeof(*hal_wowl_params)); if (NULL == hal_wowl_params) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for Enter Wowl Request")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0); + qdf_mem_set((uint8_t *) hal_wowl_params, sizeof(*hal_wowl_params), 0); /* fill in the message field */ hal_wowl_params->ucMagicPktEnable = sme_wowl_params->ucMagicPktEnable; @@ -337,7 +337,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx, end: if (hal_wowl_params != NULL) - cdf_mem_free(hal_wowl_params); + qdf_mem_free(hal_wowl_params); return QDF_STATUS_E_FAILURE; } @@ -352,13 +352,13 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, uint32_t session_id) { struct sSirHalWowlExitParams *hal_wowl_msg; - hal_wowl_msg = cdf_mem_malloc(sizeof(*hal_wowl_msg)); + hal_wowl_msg = qdf_mem_malloc(sizeof(*hal_wowl_msg)); if (NULL == hal_wowl_msg) { sms_log(mac_ctx, LOGP, FL("Fail to allocate memory for WoWLAN Add Bcast Pattern ")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set((uint8_t *) hal_wowl_msg, + qdf_mem_set((uint8_t *) hal_wowl_msg, sizeof(*hal_wowl_msg), 0); hal_wowl_msg->sessionId = session_id; @@ -369,7 +369,7 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx, return QDF_STATUS_SUCCESS; } if (hal_wowl_msg != NULL) - cdf_mem_free(hal_wowl_msg); + qdf_mem_free(hal_wowl_msg); return QDF_STATUS_E_FAILURE; } @@ -647,13 +647,13 @@ sme_populate_mac_header(tpAniSirGlobal mac_ctx, mac_hdr->fc.subType = sub_type; /* Prepare Address 1 */ - cdf_mem_copy((uint8_t *) mac_hdr->da, (uint8_t *) peer_addr, + qdf_mem_copy((uint8_t *) mac_hdr->da, (uint8_t *) peer_addr, sizeof(tSirMacAddr)); sir_copy_mac_addr(mac_hdr->sa, self_mac_addr); /* Prepare Address 3 */ - cdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) peer_addr, + qdf_mem_copy((uint8_t *) mac_hdr->bssId, (uint8_t *) peer_addr, sizeof(tSirMacAddr)); return status_code; } /*** sme_populate_mac_header() ***/ @@ -676,7 +676,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, * and then hand it off to 'dot11f_pack_probe_request' (for * serialization). We start by zero-initializing the structure: */ - cdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); + qdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); populate_dot11f_supp_rates(mac_ctx, channel_num, &pr.SuppRates, NULL); @@ -714,7 +714,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx, bytes = payload + sizeof(tSirMacMgmtHdr); /* Prepare outgoing frame */ - cdf_mem_set(frame, bytes, 0); + qdf_mem_set(frame, bytes, 0); /* Next, we fill out the buffer descriptor: */ sir_status = sme_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, @@ -815,14 +815,14 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq)); + request_buf = qdf_mem_malloc(sizeof(tSirPNOScanReq)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for PNO request")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(request_buf, request, sizeof(tSirPNOScanReq)); + qdf_mem_copy(request_buf, request, sizeof(tSirPNOScanReq)); /*Must translate the mode first */ uc_dot11_mode = (uint8_t) csr_translate_to_wni_cfg_dot11_mode(mac_ctx, @@ -847,7 +847,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, ((request_buf->us24GProbeTemplateLen + request->us24GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE)) { - cdf_mem_copy((uint8_t *) &request_buf-> + qdf_mem_copy((uint8_t *) &request_buf-> p24GProbeTemplate + request_buf->us24GProbeTemplateLen, (uint8_t *) &request->p24GProbeTemplate, @@ -880,7 +880,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, ((request_buf->us5GProbeTemplateLen + request->us5GProbeTemplateLen) < SIR_PNO_MAX_PB_REQ_SIZE)) { - cdf_mem_copy((uint8_t *) &request_buf-> + qdf_mem_copy((uint8_t *) &request_buf-> p5GProbeTemplate + request_buf->us5GProbeTemplateLen, (uint8_t *) &request->p5GProbeTemplate, @@ -935,7 +935,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx, (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_PNO_REQ message to WMA")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -982,7 +982,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, return QDF_STATUS_E_FAILURE; } - request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq)); + request_buf = qdf_mem_malloc(sizeof(tSirHostOffloadReq)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for host offload request")); @@ -991,7 +991,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, qdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); - cdf_mem_copy(request_buf, request, sizeof(tSirHostOffloadReq)); + qdf_mem_copy(request_buf, request, sizeof(tSirHostOffloadReq)); msg.type = WMA_SET_HOST_OFFLOAD; msg.reserved = 0; @@ -1000,7 +1000,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx, cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } @@ -1033,7 +1033,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, qdf_copy_macaddr(&request->bssid, &session->connectedProfile.bssid); - request_buf = cdf_mem_malloc(sizeof(*request_buf)); + request_buf = qdf_mem_malloc(sizeof(*request_buf)); if (NULL == request_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to allocate memory for NS offload request")); @@ -1048,7 +1048,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx, cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL")); - cdf_mem_free(request_buf); + qdf_mem_free(request_buf); return QDF_STATUS_E_FAILURE; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8c2c4bbdf82f..1cf113a3af69 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -287,7 +287,7 @@ void csr_init_operating_classes(tHalHandle hHal); static void csr_roam_init_globals(tpAniSirGlobal pMac) { if (pMac) { - cdf_mem_zero(&csr_roam_roam_session, sizeof(csr_roam_roam_session)); + qdf_mem_zero(&csr_roam_roam_session, sizeof(csr_roam_roam_session)); pMac->roam.roamSession = csr_roam_roam_session; } return; @@ -365,9 +365,9 @@ QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) } mac->scan.domainIdDefault = reg_id; mac->scan.domainIdCurrent = mac->scan.domainIdDefault; - cdf_mem_copy(mac->scan.countryCodeCurrent, + qdf_mem_copy(mac->scan.countryCodeCurrent, mac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN); - cdf_mem_copy(mac->scan.countryCodeElected, + qdf_mem_copy(mac->scan.countryCodeElected, mac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN); status = csr_get_channel_and_power_list(mac); csr_clear_votes_for_country_info(mac); @@ -405,17 +405,17 @@ QDF_STATUS csr_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) pMac->scan.domainIdDefault = regId; pMac->scan.domainIdCurrent = pMac->scan.domainIdDefault; /* Clear CC field */ - cdf_mem_set(pMac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN, 0); + qdf_mem_set(pMac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN, 0); /* Copy 2 or 3 bytes country code */ - cdf_mem_copy(pMac->scan.countryCodeDefault, apCntryCode, + qdf_mem_copy(pMac->scan.countryCodeDefault, apCntryCode, cntryCodeLength); /* If 2 bytes country code, 3rd byte must be filled with space */ if ((WNI_CFG_COUNTRY_CODE_LEN - 1) == cntryCodeLength) { - cdf_mem_set(pMac->scan.countryCodeDefault + 2, 1, 0x20); + qdf_mem_set(pMac->scan.countryCodeDefault + 2, 1, 0x20); } - cdf_mem_copy(pMac->scan.countryCodeCurrent, + qdf_mem_copy(pMac->scan.countryCodeCurrent, pMac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN); status = csr_get_channel_and_power_list(pMac); return status; @@ -426,7 +426,7 @@ QDF_STATUS csr_set_channels(tHalHandle hHal, tCsrConfigParam *pParam) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); uint8_t index = 0; - cdf_mem_copy(pParam->Csr11dinfo.countryCode, + qdf_mem_copy(pParam->Csr11dinfo.countryCode, pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN); for (index = 0; index < pMac->scan.base_channels.numChannels; index++) { @@ -454,7 +454,7 @@ QDF_STATUS csr_close(tpAniSirGlobal pMac) csr_ll_close(&pMac->roam.peStatsReqList); csr_ll_close(&pMac->roam.roamCmdPendingList); if (pMac->sme.saved_scan_cmd) { - cdf_mem_free(pMac->sme.saved_scan_cmd); + qdf_mem_free(pMac->sme.saved_scan_cmd); pMac->sme.saved_scan_cmd = NULL; } /* DeInit Globals */ @@ -505,7 +505,7 @@ void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, return; tmp_list = (tSirUpdateChanParam *) - cdf_mem_malloc(sizeof(tSirUpdateChanParam) * num_channel); + qdf_mem_malloc(sizeof(tSirUpdateChanParam) * num_channel); if (tmp_list == NULL) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed")); return; @@ -515,7 +515,7 @@ void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, for (i = 0; i < num_channel; i++) { if (CDS_IS_CHANNEL_5GHZ(chan_list[i].chanId) && !CDS_IS_DFS_CH(chan_list[i].chanId)) { - cdf_mem_copy(&tmp_list[j++], + qdf_mem_copy(&tmp_list[j++], &chan_list[i], sizeof(tSirUpdateChanParam)); chan_list[i].chanId = INVALID_CHANNEL_ID; } @@ -524,7 +524,7 @@ void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, /* next copy DFS channels (remaining channels in 5G) */ for (i = 0; i < num_channel; i++) { if (CDS_IS_CHANNEL_5GHZ(chan_list[i].chanId)) { - cdf_mem_copy(&tmp_list[j++], &chan_list[i], + qdf_mem_copy(&tmp_list[j++], &chan_list[i], sizeof(tSirUpdateChanParam)); chan_list[i].chanId = INVALID_CHANNEL_ID; } @@ -533,7 +533,7 @@ void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, /* next copy 2G channels */ for (i = 0; i < num_channel; i++) { if (CDS_IS_CHANNEL_24GHZ(chan_list[i].chanId)) { - cdf_mem_copy(&tmp_list[j++], &chan_list[i], + qdf_mem_copy(&tmp_list[j++], &chan_list[i], sizeof(tSirUpdateChanParam)); chan_list[i].chanId = INVALID_CHANNEL_ID; } @@ -542,15 +542,15 @@ void csr_roam_arrange_ch_list(tpAniSirGlobal mac_ctx, /* copy rest of the channels in same order to tmp list */ for (i = 0; i < num_channel; i++) { if (chan_list[i].chanId != INVALID_CHANNEL_ID) { - cdf_mem_copy(&tmp_list[j++], &chan_list[i], + qdf_mem_copy(&tmp_list[j++], &chan_list[i], sizeof(tSirUpdateChanParam)); chan_list[i].chanId = INVALID_CHANNEL_ID; } } /* copy tmp list to original channel list buffer */ - cdf_mem_copy(chan_list, tmp_list, + qdf_mem_copy(chan_list, tmp_list, sizeof(tSirUpdateChanParam) * num_channel); - cdf_mem_free(tmp_list); + qdf_mem_free(tmp_list); } /** @@ -589,15 +589,15 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, buf_size = sizeof(tSirUpdateChanList) + (sizeof(tSirUpdateChanParam) * num_channel); - chan_list_greedy = cdf_mem_malloc(buf_size); - chan_list_non_greedy = cdf_mem_malloc(buf_size); + chan_list_greedy = qdf_mem_malloc(buf_size); + chan_list_non_greedy = qdf_mem_malloc(buf_size); if (!chan_list_greedy || !chan_list_non_greedy) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return; } - cdf_mem_zero(chan_list_greedy, buf_size); - cdf_mem_zero(chan_list_non_greedy, buf_size); + qdf_mem_zero(chan_list_greedy, buf_size); + qdf_mem_zero(chan_list_non_greedy, buf_size); /* * fixed_greedy_chan_list is an evaluated channel list based on most of * the enterprise wifi deployments and the order of the channels @@ -619,7 +619,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, } } if (!match_found) { - cdf_mem_copy( + qdf_mem_copy( &chan_list_non_greedy->chanParam[num_non_greedy_chan], &chan_list->chanParam[i], sizeof(tSirUpdateChanParam)); @@ -637,7 +637,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, for (j = 0; j < num_channel; j++) { if (fixed_greedy_chan_list[i] == chan_list->chanParam[j].chanId) { - cdf_mem_copy( + qdf_mem_copy( &chan_list_greedy->chanParam[num_greedy_chan], &chan_list->chanParam[j], sizeof(tSirUpdateChanParam)); @@ -656,21 +656,21 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx, } /* Copy the Greedy channels first */ i = 0; - cdf_mem_copy(&chan_list->chanParam[i], + qdf_mem_copy(&chan_list->chanParam[i], &chan_list_greedy->chanParam[i], num_greedy_chan * sizeof(tSirUpdateChanParam)); /* Copy the remaining Non Greedy channels */ i = num_greedy_chan; j = 0; - cdf_mem_copy(&chan_list->chanParam[i], + qdf_mem_copy(&chan_list->chanParam[i], &chan_list_non_greedy->chanParam[j], num_non_greedy_chan * sizeof(tSirUpdateChanParam)); /* Update channel list for 5g preference and allow DFS roam */ csr_roam_arrange_ch_list(mac_ctx, chan_list->chanParam, num_channel); scan_list_sort_error: - cdf_mem_free(chan_list_greedy); - cdf_mem_free(chan_list_non_greedy); + qdf_mem_free(chan_list_greedy); + qdf_mem_free(chan_list_non_greedy); } QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) @@ -696,13 +696,13 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) (sizeof(tSirUpdateChanParam) * (numChan)); csr_init_operating_classes((tHalHandle) pMac); - pChanList = (tSirUpdateChanList *) cdf_mem_malloc(bufLen); + pChanList = (tSirUpdateChanList *) qdf_mem_malloc(bufLen); if (!pChanList) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Failed to allocate memory for tSirUpdateChanList"); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pChanList, bufLen); + qdf_mem_zero(pChanList, bufLen); for (i = 0; i < pScan->base_channels.numChannels; i++) { /* Scan is not performed on DSRC channels*/ @@ -768,7 +768,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac) if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "%s: Failed to post msg to WMA", __func__); - cdf_mem_free(pChanList); + qdf_mem_free(pChanList); return QDF_STATUS_E_FAILURE; } @@ -1000,9 +1000,9 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, size = pSession->pConnectBssDesc->length + sizeof(pSession->pConnectBssDesc->length); if (size) { - pProfile->pBssDesc = cdf_mem_malloc(size); + pProfile->pBssDesc = qdf_mem_malloc(size); if (NULL != pProfile->pBssDesc) { - cdf_mem_copy(pProfile->pBssDesc, + qdf_mem_copy(pProfile->pBssDesc, pSession->pConnectBssDesc, size); status = QDF_STATUS_SUCCESS; @@ -1019,9 +1019,9 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, pProfile->BSSType = connected_prof->BSSType; pProfile->operationChannel = connected_prof->operationChannel; pProfile->CBMode = connected_prof->CBMode; - cdf_mem_copy(&pProfile->bssid, &connected_prof->bssid, + qdf_mem_copy(&pProfile->bssid, &connected_prof->bssid, sizeof(struct qdf_mac_addr)); - cdf_mem_copy(&pProfile->SSID, &connected_prof->SSID, + qdf_mem_copy(&pProfile->SSID, &connected_prof->SSID, sizeof(tSirMacSSid)); if (connected_prof->MDID.mdiePresent) { pProfile->MDID.mdiePresent = 1; @@ -1034,11 +1034,11 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac, #ifdef FEATURE_WLAN_ESE pProfile->isESEAssoc = connected_prof->isESEAssoc; if (csr_is_auth_type_ese(connected_prof->AuthType)) { - cdf_mem_copy(pProfile->eseCckmInfo.krk, + qdf_mem_copy(pProfile->eseCckmInfo.krk, connected_prof->eseCckmInfo.krk, SIR_KRK_KEY_LEN); #ifdef WLAN_FEATURE_ROAM_OFFLOAD - cdf_mem_copy(pProfile->eseCckmInfo.btk, + qdf_mem_copy(pProfile->eseCckmInfo.btk, connected_prof->eseCckmInfo.btk, SIR_BTK_KEY_LEN); #endif @@ -1076,10 +1076,10 @@ QDF_STATUS csr_roam_get_connect_profile(tpAniSirGlobal pMac, uint32_t sessionId, void csr_roam_free_connect_profile(tCsrRoamConnectedProfile *profile) { if (profile->pBssDesc) - cdf_mem_free(profile->pBssDesc); + qdf_mem_free(profile->pBssDesc); if (profile->pAddIEAssoc) - cdf_mem_free(profile->pAddIEAssoc); - cdf_mem_set(profile, sizeof(tCsrRoamConnectedProfile), 0); + qdf_mem_free(profile->pAddIEAssoc); + qdf_mem_set(profile, sizeof(tCsrRoamConnectedProfile), 0); profile->AuthType = eCSR_AUTH_TYPE_UNKNOWN; } @@ -1089,7 +1089,7 @@ static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, { QDF_STATUS status = QDF_STATUS_SUCCESS; if (pConnectedInfo->pbFrames) { - cdf_mem_free(pConnectedInfo->pbFrames); + qdf_mem_free(pConnectedInfo->pbFrames); pConnectedInfo->pbFrames = NULL; } pConnectedInfo->nBeaconLength = 0; @@ -1131,7 +1131,7 @@ void csr_release_command_wm_status_change(tpAniSirGlobal pMac, tSmeCmd *pCommand void csr_reinit_set_key_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - cdf_mem_set(&pCommand->u.setKeyCmd, sizeof(tSetKeyCmd), 0); + qdf_mem_set(&pCommand->u.setKeyCmd, sizeof(tSetKeyCmd), 0); } void csr_release_command_set_key(tpAniSirGlobal pMac, tSmeCmd *pCommand) @@ -1393,7 +1393,7 @@ QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, if (NULL != pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList) { - cdf_mem_free(pNeighborRoamInfo->roamChannelInfo. + qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. currentChannelListInfo.ChannelList); pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList = NULL; @@ -1416,7 +1416,7 @@ QDF_STATUS csr_flush_cfg_bg_scan_roam_channel_list(tpAniSirGlobal pMac, /* Free up the memory first (if required) */ if (NULL != pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { - cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. + qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = 0; @@ -1440,7 +1440,7 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels = numChannels; pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = - cdf_mem_malloc(pNeighborRoamInfo->cfgParams.channelInfo. + qdf_mem_malloc(pNeighborRoamInfo->cfgParams.channelInfo. numOfChannels); if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { @@ -1451,7 +1451,7 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, } /* Update the roam global structure */ - cdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList, + qdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList, pChannelList, pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels); return status; @@ -1547,25 +1547,25 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, outNumChannels, tmpChannelList, &outNumChannels); - cdf_mem_copy(ChannelList, tmpChannelList, outNumChannels); + qdf_mem_copy(ChannelList, tmpChannelList, outNumChannels); } /* Prepare final roam scan channel list */ if (outNumChannels) { /* Clear the channel list first */ if (NULL != currChannelListInfo->ChannelList) { - cdf_mem_free(currChannelListInfo->ChannelList); + qdf_mem_free(currChannelListInfo->ChannelList); currChannelListInfo->ChannelList = NULL; currChannelListInfo->numOfChannels = 0; } currChannelListInfo->ChannelList - = cdf_mem_malloc(outNumChannels * sizeof(uint8_t)); + = qdf_mem_malloc(outNumChannels * sizeof(uint8_t)); if (NULL == currChannelListInfo->ChannelList) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, "Failed to allocate memory for roam scan channel list"); currChannelListInfo->numOfChannels = 0; return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(currChannelListInfo->ChannelList, + qdf_mem_copy(currChannelListInfo->ChannelList, ChannelList, outNumChannels); } return status; @@ -1911,7 +1911,7 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, csr_init_channel_power_list(pMac, &pParam->Csr11dinfo); } - cdf_mem_copy(&pMac->roam.configParam.csr11rConfig, + qdf_mem_copy(&pMac->roam.configParam.csr11rConfig, &pParam->csr11rConfig, sizeof(tCsr11rConfigParams)); sms_log(pMac, LOG1, "IsFTResourceReqSupp = %d", @@ -1940,7 +1940,7 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->roam.configParam.isEseIniFeatureEnabled = pParam->isEseIniFeatureEnabled; #endif - cdf_mem_copy(&pMac->roam.configParam.neighborRoamConfig, + qdf_mem_copy(&pMac->roam.configParam.neighborRoamConfig, &pParam->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); sms_log(pMac, LOG1, "nNeighborScanTimerPerioid = %d", @@ -2177,7 +2177,7 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->fEnableMCCMode = cfg_params->fenableMCCMode; pParam->fAllowMCCGODiffBI = cfg_params->fAllowMCCGODiffBI; pParam->scanCfgAgingTime = pMac->scan.scanResultCfgAgingTime; - cdf_mem_copy(&pParam->neighborRoamConfig, + qdf_mem_copy(&pParam->neighborRoamConfig, &cfg_params->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); #ifdef WLAN_FEATURE_11AC @@ -2191,7 +2191,7 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->ignore_peer_erp_info = cfg_params->ignore_peer_erp_info; pParam->enable2x2 = cfg_params->enable2x2; #endif - cdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig, + qdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig, sizeof(tCsr11rConfigParams)); pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled; pParam->RoamRssiDiff = cfg_params->RoamRssiDiff; @@ -2208,7 +2208,7 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) #ifdef FEATURE_WLAN_ESE pParam->isEseIniFeatureEnabled = cfg_params->isEseIniFeatureEnabled; #endif - cdf_mem_copy(&pParam->neighborRoamConfig, + qdf_mem_copy(&pParam->neighborRoamConfig, &cfg_params->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); sms_log(pMac, LOG1, @@ -2396,7 +2396,7 @@ void csr_prune_ch_list(tCsrChannel *ch_lst, bool is_24_GHz) } /* * Cleanup the rest of channels. Note we only need to clean up the - * channels if we had to trim the list. Calling cdf_mem_set() with a 0 + * channels if we had to trim the list. Calling qdf_mem_set() with a 0 * size is going to throw asserts on the debug builds so let's be a bit * smarter about that. Zero out the reset of the channels only if we * need to. The amount of memory to clear is the number of channesl that @@ -2404,7 +2404,7 @@ void csr_prune_ch_list(tCsrChannel *ch_lst, bool is_24_GHz) * channel in the structure. */ if (ch_lst->numChannels > num_channels) { - cdf_mem_set(&ch_lst->channelList[num_channels], + qdf_mem_set(&ch_lst->channelList[num_channels], sizeof(ch_lst->channelList[0]) * (ch_lst->numChannels - num_channels), 0); } @@ -2570,7 +2570,7 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) ps11dinfo->Channels.numChannels)) { pMac->scan.base_channels.numChannels = ps11dinfo->Channels.numChannels; - cdf_mem_copy(pMac->scan.base_channels.channelList, + qdf_mem_copy(pMac->scan.base_channels.channelList, ps11dinfo->Channels.channelList, ps11dinfo->Channels.numChannels); } else { @@ -2579,21 +2579,21 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) } /* legacy maintenance */ - cdf_mem_copy(pMac->scan.countryCodeDefault, ps11dinfo->countryCode, + qdf_mem_copy(pMac->scan.countryCodeDefault, ps11dinfo->countryCode, WNI_CFG_COUNTRY_CODE_LEN); /* Tush: at csropen get this initialized with default, during csr reset if this */ /* already set with some value no need initilaize with default again */ if (0 == pMac->scan.countryCodeCurrent[0]) { - cdf_mem_copy(pMac->scan.countryCodeCurrent, + qdf_mem_copy(pMac->scan.countryCodeCurrent, ps11dinfo->countryCode, WNI_CFG_COUNTRY_CODE_LEN); } /* need to add the max power channel list */ pChanInfo = - cdf_mem_malloc(sizeof(tSirMacChanInfo) * + qdf_mem_malloc(sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN); if (pChanInfo != NULL) { - cdf_mem_set(pChanInfo, + qdf_mem_set(pChanInfo, sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN, 0); @@ -2616,7 +2616,7 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo) sizeof(tSirMacChanInfo), pChanInfoStart); } - cdf_mem_free(pChanInfoStart); + qdf_mem_free(pChanInfoStart); } /* Only apply them to CFG when not in STOP state. Otherwise they will be applied later */ if (QDF_IS_STATUS_SUCCESS(status)) { @@ -2652,10 +2652,10 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din } pChanInfo = - cdf_mem_malloc(sizeof(tSirMacChanInfo) * + qdf_mem_malloc(sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN); if (pChanInfo != NULL) { - cdf_mem_set(pChanInfo, + qdf_mem_set(pChanInfo, sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN, 0); pChanInfoStart = pChanInfo; @@ -2678,7 +2678,7 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din sizeof(tSirMacChanInfo), pChanInfoStart); } - cdf_mem_free(pChanInfoStart); + qdf_mem_free(pChanInfoStart); } return QDF_STATUS_SUCCESS; @@ -2694,7 +2694,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, tSmeCmd *pDupCommand; tDblLinkList localList; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; @@ -2719,7 +2719,7 @@ void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, * suffice as pCommand will always be NULL for STA * scenarios */ - (cdf_mem_compare + (!qdf_mem_cmp (pDupCommand->u.roamCmd.peerMac, pCommand->u.roamCmd.peerMac, QDF_MAC_ADDR_SIZE)) @@ -2842,7 +2842,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGW, FL("Assoc complete result=%d status=%d reason=%d"), u2, pRoamInfo->statusCode, pRoamInfo->reasonCode); - beacon_ies = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + beacon_ies = qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if ((NULL != beacon_ies) && (NULL != pRoamInfo->pBssDesc)) { status = csr_parse_bss_description_ies( (tHalHandle) pMac, pRoamInfo->pBssDesc, @@ -2874,7 +2874,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, pRoamInfo->chan_info.reg_info_2 = (csr_get_cfg_max_tx_power(pMac, pRoamInfo->chan_info.chan_id) << 8); - cdf_mem_free(beacon_ies); + qdf_mem_free(beacon_ies); } else if ((u1 == eCSR_ROAM_FT_REASSOC_FAILED) && (pSession->bRefAssocStartCnt)) { /* @@ -2916,7 +2916,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, * eCSR_ROAM_DISASSOCIATED, */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR - cdf_mem_set(&connectionStatus, + qdf_mem_set(&connectionStatus, sizeof(host_event_wlan_status_payload_type), 0); if ((eCSR_ROAM_ASSOCIATION_COMPLETION == u1) @@ -2944,18 +2944,18 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, connectionStatus.encryptionType = (uint8_t) diag_enc_type_from_csr_type( pRoamInfo->u.pConnectedProfile->EncryptionType); - cdf_mem_copy(connectionStatus.ssid, + qdf_mem_copy(connectionStatus.ssid, pRoamInfo->u.pConnectedProfile->SSID.ssId, 6); connectionStatus.reason = eCSR_REASON_UNSPECIFIED; - cdf_mem_copy(&pMac->sme.eventPayload, &connectionStatus, + qdf_mem_copy(&pMac->sme.eventPayload, &connectionStatus, sizeof(host_event_wlan_status_payload_type)); WLAN_HOST_DIAG_EVENT_REPORT(&connectionStatus, EVENT_WLAN_STATUS); } if ((eCSR_ROAM_MIC_ERROR_IND == u1) || (eCSR_ROAM_RESULT_MIC_FAILURE == u2)) { - cdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, + qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) @@ -2967,7 +2967,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, EVENT_WLAN_STATUS); } if (eCSR_ROAM_RESULT_FORCED == u2) { - cdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, + qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) @@ -2979,7 +2979,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, EVENT_WLAN_STATUS); } if (eCSR_ROAM_RESULT_DISASSOC_IND == u2) { - cdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, + qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) @@ -2995,7 +2995,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId, EVENT_WLAN_STATUS); } if (eCSR_ROAM_RESULT_DEAUTH_IND == u2) { - cdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, + qdf_mem_copy(&connectionStatus, &pMac->sme.eventPayload, sizeof(host_event_wlan_status_payload_type)); if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_int(pMac, WNI_CFG_CURRENT_RSSI, &rssi))) @@ -3055,7 +3055,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId, pNeighborRoamInfo->csrNeighborRoamProfile.BSSIDs. bssid); } else if (pSession->pConnectBssDesc) { - cdf_mem_copy(&bssId.bytes, pSession->pConnectBssDesc->bssId, + qdf_mem_copy(&bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } @@ -3114,7 +3114,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, pCommand->command = eSmeCommandRoam; pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrForcedDisassocSta; - cdf_mem_copy(pCommand->u.roamCmd.peerMac, pPeerMacAddr, 6); + qdf_mem_copy(pCommand->u.roamCmd.peerMac, pPeerMacAddr, 6); pCommand->u.roamCmd.reason = (tSirMacReasonCodes) reason; status = csr_queue_sme_command(pMac, pCommand, false); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -3153,7 +3153,7 @@ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, pCommand->command = eSmeCommandRoam; pCommand->sessionId = (uint8_t) sessionId; pCommand->u.roamCmd.roamReason = eCsrForcedDeauthSta; - cdf_mem_copy(pCommand->u.roamCmd.peerMac, + qdf_mem_copy(pCommand->u.roamCmd.peerMac, pDelStaParams->peerMacAddr.bytes, sizeof(tSirMacAddr)); pCommand->u.roamCmd.reason = @@ -3177,14 +3177,14 @@ csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeTkipCntrMeasReq *pMsg; do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeTkipCntrMeasReq)); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) break; - cdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeTkipCntrMeasReq), 0); pMsg->messageType = eWNI_SME_TKIP_CNTR_MEAS_REQ; pMsg->length = sizeof(tSirSmeTkipCntrMeasReq); pMsg->sessionId = sessionId; @@ -3209,7 +3209,7 @@ csr_roam_issue_tkip_counter_measures(tpAniSirGlobal pMac, uint32_t sessionId, return status; } if (pSession->pConnectBssDesc) { - cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, + qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, @@ -3239,7 +3239,7 @@ csr_roam_get_associated_stas(tpAniSirGlobal pMac, uint32_t sessionId, return status; } if (pSession->pConnectBssDesc) { - cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, + qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, @@ -3273,7 +3273,7 @@ csr_roam_get_wps_session_overlap(tpAniSirGlobal pMac, uint32_t sessionId, return status; } if (pSession->pConnectBssDesc) { - cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, + qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } else { sms_log(pMac, LOGE, @@ -3303,7 +3303,7 @@ QDF_STATUS csr_roam_issue_deauth(tpAniSirGlobal pMac, uint32_t sessionId, } if (pSession->pConnectBssDesc) { - cdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, + qdf_mem_copy(bssId.bytes, pSession->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); } sms_log(pMac, LOG2, "CSR Attempting to Deauth Bssid= " MAC_ADDRESS_STR, @@ -3352,12 +3352,12 @@ QDF_STATUS csr_roam_save_connected_bss_desc(tpAniSirGlobal pMac, uint32_t sessio } } if (NULL == pSession->pConnectBssDesc) { - pSession->pConnectBssDesc = cdf_mem_malloc(size); + pSession->pConnectBssDesc = qdf_mem_malloc(size); } if (NULL == pSession->pConnectBssDesc) status = QDF_STATUS_E_NOMEM; else - cdf_mem_copy(pSession->pConnectBssDesc, pBssDesc, size); + qdf_mem_copy(pSession->pConnectBssDesc, pBssDesc, size); } return status; } @@ -3373,13 +3373,13 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, if (pIes == NULL) return QDF_STATUS_E_FAILURE; - cdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, + qdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, sizeof(tSirMacCapabilityInfo)); /* get qos */ pBssConfig->qosType = csr_get_qo_s_from_bss_desc(pMac, pBssDesc, pIes); /* get SSID */ if (pIes->SSID.present) { - cdf_mem_copy(&pBssConfig->SSID.ssId, pIes->SSID.ssid, + qdf_mem_copy(&pBssConfig->SSID.ssId, pIes->SSID.ssid, pIes->SSID.num_ssid); pBssConfig->SSID.length = pIes->SSID.num_ssid; } else @@ -3501,7 +3501,7 @@ static QDF_STATUS csr_roam_prepare_bss_config_from_profile(tpAniSirGlobal pMac, pBssConfig->SSID.length = 0; if (pProfile->SSIDs.numOfSSIDs) { /* only use the first one */ - cdf_mem_copy(&pBssConfig->SSID, + qdf_mem_copy(&pBssConfig->SSID, &pProfile->SSIDs.SSIDList[0].SSID, sizeof(tSirMacSSid)); } else { @@ -3616,7 +3616,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, } while (0); if (NULL != pIes) { - cdf_mem_free(pIes); + qdf_mem_free(pIes); } return status; @@ -3668,7 +3668,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, * clear those that are not present in this profile. */ if (pProfile->Keys.KeyLength[0]) { - cdf_mem_copy(Key0, + qdf_mem_copy(Key0, pProfile->Keys.KeyMaterial[0], WNI_CFG_WEP_KEY_LENGTH_5); Key0Length = WNI_CFG_WEP_KEY_LENGTH_5; @@ -3677,7 +3677,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[1]) { - cdf_mem_copy(Key1, + qdf_mem_copy(Key1, pProfile->Keys.KeyMaterial[1], WNI_CFG_WEP_KEY_LENGTH_5); Key1Length = WNI_CFG_WEP_KEY_LENGTH_5; @@ -3686,7 +3686,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[2]) { - cdf_mem_copy(Key2, + qdf_mem_copy(Key2, pProfile->Keys.KeyMaterial[2], WNI_CFG_WEP_KEY_LENGTH_5); Key2Length = WNI_CFG_WEP_KEY_LENGTH_5; @@ -3695,7 +3695,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[3]) { - cdf_mem_copy(Key3, + qdf_mem_copy(Key3, pProfile->Keys.KeyMaterial[3], WNI_CFG_WEP_KEY_LENGTH_5); Key3Length = WNI_CFG_WEP_KEY_LENGTH_5; @@ -3719,7 +3719,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, * those that are not present in this profile. */ if (pProfile->Keys.KeyLength[0]) { - cdf_mem_copy(Key0, + qdf_mem_copy(Key0, pProfile->Keys.KeyMaterial[0], WNI_CFG_WEP_KEY_LENGTH_13); Key0Length = WNI_CFG_WEP_KEY_LENGTH_13; @@ -3728,7 +3728,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[1]) { - cdf_mem_copy(Key1, + qdf_mem_copy(Key1, pProfile->Keys.KeyMaterial[1], WNI_CFG_WEP_KEY_LENGTH_13); Key1Length = WNI_CFG_WEP_KEY_LENGTH_13; @@ -3737,7 +3737,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[2]) { - cdf_mem_copy(Key2, + qdf_mem_copy(Key2, pProfile->Keys.KeyMaterial[2], WNI_CFG_WEP_KEY_LENGTH_13); Key2Length = WNI_CFG_WEP_KEY_LENGTH_13; @@ -3746,7 +3746,7 @@ void csr_set_cfg_privacy(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile, } if (pProfile->Keys.KeyLength[3]) { - cdf_mem_copy(Key3, + qdf_mem_copy(Key3, pProfile->Keys.KeyMaterial[3], WNI_CFG_WEP_KEY_LENGTH_13); Key3Length = WNI_CFG_WEP_KEY_LENGTH_13; @@ -3852,8 +3852,8 @@ static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac, eCsrCfgDot11Mode cfgDot11Mode; uint8_t *pDstRate; uint16_t rateBitmap = 0; - cdf_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0); - cdf_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0); + qdf_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0); + qdf_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0); QDF_ASSERT(pIes != NULL); if (NULL == pIes) { @@ -4057,7 +4057,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, OperationalRatesLength = DefaultSupportedRates11a.supportedRateSet.numRates * sizeof(*DefaultSupportedRates11a.supportedRateSet.rate); - cdf_mem_copy(OperationalRates, + qdf_mem_copy(OperationalRates, DefaultSupportedRates11a.supportedRateSet.rate, OperationalRatesLength); @@ -4068,7 +4068,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, ProprietaryOperationalRatesLength = DefaultSupportedPropRates.numPropRates * sizeof(*DefaultSupportedPropRates.propRate); - cdf_mem_copy(ProprietaryOperationalRates, + qdf_mem_copy(ProprietaryOperationalRates, DefaultSupportedPropRates.propRate, ProprietaryOperationalRatesLength); } else { @@ -4080,7 +4080,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, OperationalRatesLength = DefaultSupportedRates11b.supportedRateSet.numRates * sizeof(*DefaultSupportedRates11b.supportedRateSet.rate); - cdf_mem_copy(OperationalRates, + qdf_mem_copy(OperationalRates, DefaultSupportedRates11b.supportedRateSet.rate, OperationalRatesLength); /* Nothing in the Extended rate set. */ @@ -4094,7 +4094,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, OperationalRatesLength = DefaultSupportedRates11b.supportedRateSet.numRates * sizeof(*DefaultSupportedRates11b.supportedRateSet.rate); - cdf_mem_copy(OperationalRates, + qdf_mem_copy(OperationalRates, DefaultSupportedRates11b.supportedRateSet.rate, OperationalRatesLength); @@ -4102,7 +4102,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, ExtendedOperationalRatesLength = DefaultSupportedRates11a.supportedRateSet.numRates * sizeof(*DefaultSupportedRates11a.supportedRateSet.rate); - cdf_mem_copy(ExtendedOperationalRates, + qdf_mem_copy(ExtendedOperationalRates, DefaultSupportedRates11a.supportedRateSet.rate, ExtendedOperationalRatesLength); @@ -4111,7 +4111,7 @@ static void csr_set_cfg_rate_set_from_profile(tpAniSirGlobal pMac, ProprietaryOperationalRatesLength = DefaultSupportedPropRates.numPropRates * sizeof(*DefaultSupportedPropRates.propRate); - cdf_mem_copy(ProprietaryOperationalRates, + qdf_mem_copy(ProprietaryOperationalRates, DefaultSupportedPropRates.propRate, ProprietaryOperationalRatesLength); } else { @@ -4225,7 +4225,7 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, } else { /* Let's also update the below to make sure we don't update CC while */ /* connected to an AP which is advertising some CC */ - cdf_mem_copy(pMac->scan.currentCountryBssid.bytes, + qdf_mem_copy(pMac->scan.currentCountryBssid.bytes, pBssDesc->bssId, sizeof(tSirMacAddr)); } @@ -4300,11 +4300,11 @@ QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, return QDF_STATUS_E_FAILURE; } - pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); + pBssConfig = qdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); + qdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); status = csr_roam_prepare_bss_config(pMac, pProfile, pBssDesc, pBssConfig, pIes); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4364,7 +4364,7 @@ QDF_STATUS csr_roam_stop_network(tpAniSirGlobal pMac, uint32_t sessionId, is11rRoamingFlag); } } /* Success getting BSS config info */ - cdf_mem_free(pBssConfig); + qdf_mem_free(pBssConfig); return status; } @@ -4392,7 +4392,7 @@ static eCsrJoinState csr_roam_state_for_same_profile(tpAniSirGlobal mac_ctx, profile)) return eCsrReassocToSelfNoCapChange; /* The key changes */ - cdf_mem_set(&bssConfig, sizeof(bssConfig), 0); + qdf_mem_set(&bssConfig, sizeof(bssConfig), 0); status = csr_roam_prepare_bss_config(mac_ctx, profile, bss_descr, &bssConfig, ies_local); if (QDF_IS_STATUS_SUCCESS(status)) { @@ -4487,7 +4487,7 @@ eCsrJoinState csr_roam_join(tpAniSirGlobal pMac, uint32_t sessionId, } if (pIesLocal && !pScanResult->pvIes) - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); return eRoamState; } @@ -4496,7 +4496,7 @@ QDF_STATUS csr_roam_should_roam(tpAniSirGlobal pMac, uint32_t sessionId, { QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.pBssDesc = pBssDesc; status = csr_roam_call_callback(pMac, sessionId, &roamInfo, roamId, @@ -4681,7 +4681,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, csr_set_abort_roaming_command(mac_ctx, cmd); return; } - cdf_mem_set(roam_info_ptr, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(roam_info_ptr, sizeof(tCsrRoamInfo), 0); if (!scan_result) cmd->u.roamCmd.roamProfile.uapsd_mask = 0; else @@ -4711,7 +4711,7 @@ static void csr_roam_join_handle_profile(tpAniSirGlobal mac_ctx, cmd->u.roamCmd.roamProfile.uapsd_mask = 0; } if (ies_local && !result->pvIes) - cdf_mem_free(ies_local); + qdf_mem_free(ies_local); roam_info_ptr->pProfile = profile; session->bRefAssocStartCnt++; csr_roam_call_callback(mac_ctx, session_id, roam_info_ptr, @@ -4825,8 +4825,8 @@ static eCsrJoinState csr_roam_join_next_bss(tpAniSirGlobal mac_ctx, return eCsrStopRoaming; } - cdf_mem_set(&roam_info, sizeof(roam_info), 0); - cdf_mem_copy(&roam_info.bssid, &session->joinFailStatusCode.bssId, + qdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_copy(&roam_info.bssid, &session->joinFailStatusCode.bssId, sizeof(tSirMacAddr)); /* * When handling AP's capability change, continue to associate @@ -5069,7 +5069,7 @@ static QDF_STATUS csr_roam_trigger_reassociate(tpAniSirGlobal mac_ctx, csr_release_command_roam(mac_ctx, cmd); } - cdf_mem_free(pIes); + qdf_mem_free(pIes); pIes = NULL; } } else { @@ -5182,9 +5182,9 @@ QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) /* Remember the roaming profile */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = - cdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL != pSession->pCurRoamProfile) { - cdf_mem_set(pSession->pCurRoamProfile, + qdf_mem_set(pSession->pCurRoamProfile, sizeof(tCsrRoamProfile), 0); csr_roam_copy_profile(pMac, pSession->pCurRoamProfile, @@ -5212,7 +5212,7 @@ void csr_reinit_preauth_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) pCommand->u.roamCmd.pLastRoamBss = NULL; pCommand->u.roamCmd.pRoamBssEntry = NULL; /* Because u.roamCmd is union and share with scanCmd and StatusChange */ - cdf_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0); + qdf_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0); } void csr_reinit_roam_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) @@ -5228,12 +5228,12 @@ void csr_reinit_roam_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) } pCommand->u.roamCmd.pRoamBssEntry = NULL; /* Because u.roamCmd is union and share with scanCmd and StatusChange */ - cdf_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0); + qdf_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0); } void csr_reinit_wm_status_change_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - cdf_mem_set(&pCommand->u.wmStatusChangeCmd, sizeof(tWmStatusChangeCmd), + qdf_mem_set(&pCommand->u.wmStatusChangeCmd, sizeof(tWmStatusChangeCmd), 0); } @@ -5291,7 +5291,7 @@ void csr_reset_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId) sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); return; } - cdf_mem_set(&(pSession->PmkidCandidateInfo[0]), + qdf_mem_set(&(pSession->PmkidCandidateInfo[0]), sizeof(tPmkidCandidateInfo) * CSR_MAX_PMKID_ALLOWED, 0); pSession->NumPmkidCandidate = 0; } @@ -5304,7 +5304,7 @@ void csr_reset_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId) sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); return; } - cdf_mem_set(&(pSession->BkidCandidateInfo[0]), + qdf_mem_set(&(pSession->BkidCandidateInfo[0]), sizeof(tBkidCandidateInfo) * CSR_MAX_BKID_ALLOWED, 0); pSession->NumBkidCandidate = 0; } @@ -5355,41 +5355,41 @@ static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, nIeLen += 2 + rsnie->pmkid_count * 4; /* nIeLen doesn't count EID and length fields */ - session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); + session_ptr->pWpaRsnRspIE = qdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) return QDF_STATUS_E_NOMEM; - cdf_mem_set(session_ptr->pWpaRsnRspIE, + qdf_mem_set(session_ptr->pWpaRsnRspIE, nIeLen + 2, 0); session_ptr->pWpaRsnRspIE[0] = DOT11F_EID_RSN; session_ptr->pWpaRsnRspIE[1] = (uint8_t) nIeLen; /* copy upto akm_suites */ pIeBuf = session_ptr->pWpaRsnRspIE + 2; - cdf_mem_copy(pIeBuf, &rsnie->version, + qdf_mem_copy(pIeBuf, &rsnie->version, sizeof(rsnie->version)); pIeBuf += sizeof(rsnie->version); - cdf_mem_copy(pIeBuf, &rsnie->gp_cipher_suite, + qdf_mem_copy(pIeBuf, &rsnie->gp_cipher_suite, sizeof(rsnie->gp_cipher_suite)); pIeBuf += sizeof(rsnie->gp_cipher_suite); - cdf_mem_copy(pIeBuf, &rsnie->pwise_cipher_suite_count, + qdf_mem_copy(pIeBuf, &rsnie->pwise_cipher_suite_count, sizeof(rsnie->pwise_cipher_suite_count)); pIeBuf += sizeof(rsnie->pwise_cipher_suite_count); if (rsnie->pwise_cipher_suite_count) { /* copy pwise_cipher_suites */ - cdf_mem_copy(pIeBuf, rsnie->pwise_cipher_suites, + qdf_mem_copy(pIeBuf, rsnie->pwise_cipher_suites, rsnie->pwise_cipher_suite_count * 4); pIeBuf += rsnie->pwise_cipher_suite_count * 4; } - cdf_mem_copy(pIeBuf, &rsnie->akm_suite_count, 2); + qdf_mem_copy(pIeBuf, &rsnie->akm_suite_count, 2); pIeBuf += 2; if (rsnie->akm_suite_count) { /* copy akm_suites */ - cdf_mem_copy(pIeBuf, rsnie->akm_suites, + qdf_mem_copy(pIeBuf, rsnie->akm_suites, rsnie->akm_suite_count * 4); pIeBuf += rsnie->akm_suite_count * 4; } /* copy the rest */ - cdf_mem_copy(pIeBuf, rsnie->akm_suites + + qdf_mem_copy(pIeBuf, rsnie->akm_suites + rsnie->akm_suite_count * 4, 2 + rsnie->pmkid_count * 4); session_ptr->nWpaRsnRspIeLength = nIeLen + 2; @@ -5408,19 +5408,19 @@ static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, * we always "send" zero, so just remove it. This is * consistent with our assumptions in the frames * compiler; nIeLen doesn't count EID & length fields */ - session_ptr->pWpaRsnRspIE = cdf_mem_malloc(nIeLen + 2); + session_ptr->pWpaRsnRspIE = qdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWpaRsnRspIE) return QDF_STATUS_E_NOMEM; session_ptr->pWpaRsnRspIE[0] = DOT11F_EID_WPA; session_ptr->pWpaRsnRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWpaRsnRspIE + 2; /* Copy WPA OUI */ - cdf_mem_copy(pIeBuf, &csr_wpa_oui[1], 4); + qdf_mem_copy(pIeBuf, &csr_wpa_oui[1], 4); pIeBuf += 4; - cdf_mem_copy(pIeBuf, &wpaie->version, + qdf_mem_copy(pIeBuf, &wpaie->version, 8 + wpaie->unicast_cipher_count * 4); pIeBuf += 8 + wpaie->unicast_cipher_count * 4; - cdf_mem_copy(pIeBuf, &wpaie->auth_suite_count, + qdf_mem_copy(pIeBuf, &wpaie->auth_suite_count, 2 + wpaie->auth_suite_count * 4); pIeBuf += wpaie->auth_suite_count * 4; session_ptr->nWpaRsnRspIeLength = nIeLen + 2; @@ -5443,48 +5443,48 @@ static QDF_STATUS csr_roam_save_params(tpAniSirGlobal mac_ctx, /* nIeLen doesn't count EID and length fields */ session_ptr->pWapiRspIE = - cdf_mem_malloc(nIeLen + 2); + qdf_mem_malloc(nIeLen + 2); if (NULL == session_ptr->pWapiRspIE) return QDF_STATUS_E_NOMEM; session_ptr->pWapiRspIE[0] = DOT11F_EID_WAPI; session_ptr->pWapiRspIE[1] = (uint8_t) nIeLen; pIeBuf = session_ptr->pWapiRspIE + 2; /* copy upto akm_suite_count */ - cdf_mem_copy(pIeBuf, &wapi_ie->version, 2); + qdf_mem_copy(pIeBuf, &wapi_ie->version, 2); pIeBuf += 4; if (wapi_ie->akm_suite_count) { /* copy akm_suites */ - cdf_mem_copy(pIeBuf, + qdf_mem_copy(pIeBuf, wapi_ie->akm_suites, wapi_ie->akm_suite_count * 4); pIeBuf += wapi_ie->akm_suite_count * 4; } - cdf_mem_copy(pIeBuf, + qdf_mem_copy(pIeBuf, &wapi_ie->unicast_cipher_suite_count, 2); pIeBuf += 2; if (wapi_ie->unicast_cipher_suite_count) { uint16_t suite_size = wapi_ie->unicast_cipher_suite_count * 4; /* copy pwise_cipher_suites */ - cdf_mem_copy(pIeBuf, + qdf_mem_copy(pIeBuf, wapi_ie->unicast_cipher_suites, suite_size); pIeBuf += suite_size; } /* gp_cipher_suite */ - cdf_mem_copy(pIeBuf, + qdf_mem_copy(pIeBuf, wapi_ie->multicast_cipher_suite, 4); pIeBuf += 4; /* preauth + reserved */ - cdf_mem_copy(pIeBuf, + qdf_mem_copy(pIeBuf, wapi_ie->multicast_cipher_suite + 4, 2); pIeBuf += 2; if (wapi_ie->bkid_count) { /* bkid_count */ - cdf_mem_copy(pIeBuf, &wapi_ie->bkid_count, 2); + qdf_mem_copy(pIeBuf, &wapi_ie->bkid_count, 2); pIeBuf += 2; /* copy akm_suites */ - cdf_mem_copy(pIeBuf, wapi_ie->bkid, + qdf_mem_copy(pIeBuf, wapi_ie->bkid, wapi_ie->bkid_count * 4); pIeBuf += wapi_ie->bkid_count * 4; } @@ -5534,7 +5534,7 @@ static QDF_STATUS csr_roam_save_security_rsp_ie(tpAniSirGlobal pMac, pIes, pIesLocal); if (!pIes) /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } } return status; @@ -5658,7 +5658,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) "%s: Roam Synch Failed, Clean Up", __func__); session->roam_synch_in_progress = false; - roam_offload_failed = cdf_mem_malloc( + roam_offload_failed = qdf_mem_malloc( sizeof(struct roam_offload_synch_fail)); if (NULL == roam_offload_failed) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -5676,7 +5676,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA", __func__); - cdf_mem_free(roam_offload_failed); + qdf_mem_free(roam_offload_failed); } } #endif @@ -5755,12 +5755,12 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, case eCsrSmeIssuedDisassocForHandoff: csr_roam_state_change(mac_ctx, eCSR_ROAMING_STATE_IDLE, session_id); - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.pBssDesc = cmd->u.roamCmd.pLastRoamBss; roam_info.pProfile = &cmd->u.roamCmd.roamProfile; roam_info.statusCode = session->joinFailStatusCode.statusCode; roam_info.reasonCode = session->joinFailStatusCode.reasonCode; - cdf_mem_copy(&roam_info.bssid, + qdf_mem_copy(&roam_info.bssid, &session->joinFailStatusCode.bssId, sizeof(struct qdf_mac_addr)); @@ -5881,7 +5881,7 @@ static void csr_roam_process_results_default(tpAniSirGlobal mac_ctx, CSR_IS_INFRA_AP(&session->connectedProfile)) { roam_info.u.pConnectedProfile = &session->connectedProfile; - cdf_mem_copy(roam_info.peerMac.bytes, + qdf_mem_copy(roam_info.peerMac.bytes, cmd->u.roamCmd.peerMac, sizeof(tSirMacAddr)); roam_info.reasonCode = eCSR_ROAM_RESULT_FORCED; @@ -5953,7 +5953,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOG2, FL("receives start BSS ok indication")); status = QDF_STATUS_E_FAILURE; start_bss_rsp = (tSirSmeStartBssRsp *) context; - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); if (CSR_IS_IBSS(profile)) session->connectState = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED; else if (CSR_IS_INFRA_AP(profile)) @@ -5986,11 +5986,11 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, if (bss_desc) { csr_roam_save_connected_infomation(mac_ctx, session_id, profile, bss_desc, ies_ptr); - cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, + qdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, sizeof(struct qdf_mac_addr)); } /* We are done with the IEs so free it */ - cdf_mem_free(ies_ptr); + qdf_mem_free(ies_ptr); #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR WLAN_HOST_DIAG_LOG_ALLOC(ibss_log, host_log_ibss_pkt_type, LOG_WLAN_IBSS_C); @@ -6008,7 +6008,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, WLAN_IBSS_EVENT_JOIN_IBSS_RSP; } if (bss_desc) { - cdf_mem_copy(ibss_log->bssid.bytes, + qdf_mem_copy(ibss_log->bssid.bytes, bss_desc->bssId, QDF_MAC_ADDR_SIZE); ibss_log->operatingChannel = bss_desc->channelId; @@ -6064,13 +6064,13 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, * start the BSS ourself, handler of eSIR_SME_JOINED_NEW_BSS * will trigger the connection start indication in Vista */ - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.statusCode = session->joinFailStatusCode.statusCode; roam_info.reasonCode = session->joinFailStatusCode.reasonCode; /* We start the IBSS (didn't find any matched IBSS out there) */ roam_info.pBssDesc = bss_desc; roam_info.staId = (uint8_t) start_bss_rsp->staId; - cdf_mem_copy(roam_info.bssid.bytes, bss_desc->bssId, + qdf_mem_copy(roam_info.bssid.bytes, bss_desc->bssId, sizeof(struct qdf_mac_addr)); if (!IS_FEATURE_SUPPORTED_BY_FW(SLM_SESSIONIZATION) && (csr_is_concurrent_session_running(mac_ctx))) { @@ -6133,17 +6133,17 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, else ind_qos = SME_QOS_CSR_ASSOC_COMPLETE; sms_log(mac_ctx, LOGW, FL("receives association indication")); - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); /* always free the memory here */ if (session->pWpaRsnRspIE) { session->nWpaRsnRspIeLength = 0; - cdf_mem_free(session->pWpaRsnRspIE); + qdf_mem_free(session->pWpaRsnRspIE); session->pWpaRsnRspIE = NULL; } #ifdef FEATURE_WLAN_WAPI if (session->pWapiRspIE) { session->nWapiRspIeLength = 0; - cdf_mem_free(session->pWapiRspIE); + qdf_mem_free(session->pWapiRspIE); session->pWapiRspIE = NULL; } #endif /* FEATURE_WLAN_WAPI */ @@ -6170,7 +6170,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, cmd->u.roamCmd.roamReason)) { bss_desc = session->pConnectBssDesc; if (bss_desc) - cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, + qdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, sizeof(struct qdf_mac_addr)); } else { if (cmd->u.roamCmd.pRoamBssEntry) { @@ -6180,7 +6180,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, bss_desc = &scan_res->Result.BssDescriptor; ies_ptr = (tDot11fBeaconIEs *) (scan_res->Result.pvIes); - cdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, + qdf_mem_copy(&roam_info.bssid, &bss_desc->bssId, sizeof(struct qdf_mac_addr)); } } @@ -6334,10 +6334,10 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, #endif if (len) { session->connectedInfo.pbFrames = - cdf_mem_malloc(len); + qdf_mem_malloc(len); if (session->connectedInfo.pbFrames != NULL) { - cdf_mem_copy( + qdf_mem_copy( session->connectedInfo.pbFrames, join_rsp->frames, len); session->connectedInfo.nAssocReqLength = @@ -6463,13 +6463,13 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, roam_info.roamSynchInProgress = 1; roam_info.synchAuthStatus = roam_offload_params->authStatus; - cdf_mem_copy(roam_info.kck, + qdf_mem_copy(roam_info.kck, roam_offload_params->kck, SIR_KCK_KEY_LEN); - cdf_mem_copy(roam_info.kek, + qdf_mem_copy(roam_info.kek, roam_offload_params->kek, SIR_KEK_KEY_LEN); - cdf_mem_copy(roam_info.replay_ctr, + qdf_mem_copy(roam_info.replay_ctr, roam_offload_params->replay_ctr, SIR_REPLAY_CTR_LEN); QDF_TRACE(QDF_MODULE_ID_SME, @@ -6571,7 +6571,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, } else { bss_desc = NULL; } - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.pBssDesc = bss_desc; csr_roam_call_callback(mac_ctx, session_id, &roam_info, cmd->u.roamCmd.roamId, roam_status, @@ -6588,10 +6588,10 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, session_id); csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE, session_id); - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.pBssDesc = session->pConnectBssDesc; if (roam_info.pBssDesc) - cdf_mem_copy(&roam_info.bssid, + qdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, sizeof(struct qdf_mac_addr)); /* @@ -6608,7 +6608,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, /* No message to PE */ sms_log(mac_ctx, LOGW, FL("receives silently stop roaming indication")); - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); /* to aviod resetting the substate to NONE */ mac_ctx->roam.curState[session_id] = eCSR_ROAMING_STATE_JOINED; @@ -6618,7 +6618,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, */ roam_info.pBssDesc = session->pConnectBssDesc; if (roam_info.pBssDesc) - cdf_mem_copy(&roam_info.bssid, + qdf_mem_copy(&roam_info.bssid, &roam_info.pBssDesc->bssId, sizeof(struct qdf_mac_addr)); roam_info.statusCode = session->joinFailStatusCode.statusCode; @@ -6669,96 +6669,96 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t size = 0; - cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); if (pSrcProfile->BSSIDs.numOfBSSIDs) { size = sizeof(struct qdf_mac_addr) * pSrcProfile->BSSIDs.numOfBSSIDs; - pDstProfile->BSSIDs.bssid = cdf_mem_malloc(size); + pDstProfile->BSSIDs.bssid = qdf_mem_malloc(size); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->BSSIDs.numOfBSSIDs = pSrcProfile->BSSIDs.numOfBSSIDs; - cdf_mem_copy(pDstProfile->BSSIDs.bssid, + qdf_mem_copy(pDstProfile->BSSIDs.bssid, pSrcProfile->BSSIDs.bssid, size); } if (pSrcProfile->SSIDs.numOfSSIDs) { size = sizeof(tCsrSSIDInfo) * pSrcProfile->SSIDs.numOfSSIDs; - pDstProfile->SSIDs.SSIDList = cdf_mem_malloc(size); + pDstProfile->SSIDs.SSIDList = qdf_mem_malloc(size); if (NULL == pDstProfile->SSIDs.SSIDList) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->SSIDs.numOfSSIDs = pSrcProfile->SSIDs.numOfSSIDs; - cdf_mem_copy(pDstProfile->SSIDs.SSIDList, + qdf_mem_copy(pDstProfile->SSIDs.SSIDList, pSrcProfile->SSIDs.SSIDList, size); } if (pSrcProfile->nWPAReqIELength) { pDstProfile->pWPAReqIE = - cdf_mem_malloc(pSrcProfile->nWPAReqIELength); + qdf_mem_malloc(pSrcProfile->nWPAReqIELength); if (NULL == pDstProfile->pWPAReqIE) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWPAReqIELength = pSrcProfile->nWPAReqIELength; - cdf_mem_copy(pDstProfile->pWPAReqIE, pSrcProfile->pWPAReqIE, + qdf_mem_copy(pDstProfile->pWPAReqIE, pSrcProfile->pWPAReqIE, pSrcProfile->nWPAReqIELength); } if (pSrcProfile->nRSNReqIELength) { pDstProfile->pRSNReqIE = - cdf_mem_malloc(pSrcProfile->nRSNReqIELength); + qdf_mem_malloc(pSrcProfile->nRSNReqIELength); if (NULL == pDstProfile->pRSNReqIE) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nRSNReqIELength = pSrcProfile->nRSNReqIELength; - cdf_mem_copy(pDstProfile->pRSNReqIE, pSrcProfile->pRSNReqIE, + qdf_mem_copy(pDstProfile->pRSNReqIE, pSrcProfile->pRSNReqIE, pSrcProfile->nRSNReqIELength); } #ifdef FEATURE_WLAN_WAPI if (pSrcProfile->nWAPIReqIELength) { pDstProfile->pWAPIReqIE = - cdf_mem_malloc(pSrcProfile->nWAPIReqIELength); + qdf_mem_malloc(pSrcProfile->nWAPIReqIELength); if (NULL == pDstProfile->pWAPIReqIE) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nWAPIReqIELength = pSrcProfile->nWAPIReqIELength; - cdf_mem_copy(pDstProfile->pWAPIReqIE, pSrcProfile->pWAPIReqIE, + qdf_mem_copy(pDstProfile->pWAPIReqIE, pSrcProfile->pWAPIReqIE, pSrcProfile->nWAPIReqIELength); } #endif /* FEATURE_WLAN_WAPI */ if (pSrcProfile->nAddIEScanLength) { pDstProfile->pAddIEScan = - cdf_mem_malloc(pSrcProfile->nAddIEScanLength); + qdf_mem_malloc(pSrcProfile->nAddIEScanLength); if (NULL == pDstProfile->pAddIEScan) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEScanLength = pSrcProfile->nAddIEScanLength; - cdf_mem_copy(pDstProfile->pAddIEScan, pSrcProfile->pAddIEScan, + qdf_mem_copy(pDstProfile->pAddIEScan, pSrcProfile->pAddIEScan, pSrcProfile->nAddIEScanLength); } if (pSrcProfile->nAddIEAssocLength) { pDstProfile->pAddIEAssoc = - cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); + qdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { status = QDF_STATUS_E_NOMEM; goto end; } pDstProfile->nAddIEAssocLength = pSrcProfile->nAddIEAssocLength; - cdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc, + qdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc, pSrcProfile->nAddIEAssocLength); } if (pSrcProfile->ChannelInfo.ChannelList) { pDstProfile->ChannelInfo.ChannelList = - cdf_mem_malloc(pSrcProfile->ChannelInfo. + qdf_mem_malloc(pSrcProfile->ChannelInfo. numOfChannels); if (NULL == pDstProfile->ChannelInfo.ChannelList) { status = QDF_STATUS_E_NOMEM; @@ -6766,7 +6766,7 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, } pDstProfile->ChannelInfo.numOfChannels = pSrcProfile->ChannelInfo.numOfChannels; - cdf_mem_copy(pDstProfile->ChannelInfo.ChannelList, + qdf_mem_copy(pDstProfile->ChannelInfo.ChannelList, pSrcProfile->ChannelInfo.ChannelList, pSrcProfile->ChannelInfo.numOfChannels); } @@ -6818,7 +6818,7 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->wps_state = pSrcProfile->wps_state; pDstProfile->ieee80211d = pSrcProfile->ieee80211d; pDstProfile->sap_dot11mc = pSrcProfile->sap_dot11mc; - cdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys, + qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys, sizeof(pDstProfile->Keys)); #ifdef WLAN_FEATURE_11W pDstProfile->MFPEnabled = pSrcProfile->MFPEnabled; @@ -6830,7 +6830,7 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac, pDstProfile->MDID.mobilityDomain = pSrcProfile->MDID.mobilityDomain; } - cdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams, + qdf_mem_copy(&pDstProfile->addIeParams, &pSrcProfile->addIeParams, sizeof(tSirAddIeParams)); end: if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -6848,9 +6848,9 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, tCsrRoamConnectedProfile *pSrcProfile = &pMac->roam.roamSession[sessionId].connectedProfile; - cdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pDstProfile, sizeof(tCsrRoamProfile), 0); - pDstProfile->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); + pDstProfile->BSSIDs.bssid = qdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pDstProfile->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -6864,7 +6864,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, if (pSrcProfile->SSID.ssId) { pDstProfile->SSIDs.SSIDList = - cdf_mem_malloc(sizeof(tCsrSSIDInfo)); + qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == pDstProfile->SSIDs.SSIDList) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -6878,12 +6878,12 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pSrcProfile->handoffPermitted; pDstProfile->SSIDs.SSIDList[0].ssidHidden = pSrcProfile->ssidHidden; - cdf_mem_copy(&pDstProfile->SSIDs.SSIDList[0].SSID, + qdf_mem_copy(&pDstProfile->SSIDs.SSIDList[0].SSID, &pSrcProfile->SSID, sizeof(tSirMacSSid)); } if (pSrcProfile->nAddIEAssocLength) { pDstProfile->pAddIEAssoc = - cdf_mem_malloc(pSrcProfile->nAddIEAssocLength); + qdf_mem_malloc(pSrcProfile->nAddIEAssocLength); if (NULL == pDstProfile->pAddIEAssoc) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, @@ -6891,10 +6891,10 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, goto end; } pDstProfile->nAddIEAssocLength = pSrcProfile->nAddIEAssocLength; - cdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc, + qdf_mem_copy(pDstProfile->pAddIEAssoc, pSrcProfile->pAddIEAssoc, pSrcProfile->nAddIEAssocLength); } - pDstProfile->ChannelInfo.ChannelList = cdf_mem_malloc(1); + pDstProfile->ChannelInfo.ChannelList = qdf_mem_malloc(1); if (NULL == pDstProfile->ChannelInfo.ChannelList) { status = QDF_STATUS_E_NOMEM; goto end; @@ -6916,7 +6916,7 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, pSrcProfile->mcEncryptionType; pDstProfile->BSSType = pSrcProfile->BSSType; pDstProfile->CBMode = pSrcProfile->CBMode; - cdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys, + qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys, sizeof(pDstProfile->Keys)); if (pSrcProfile->MDID.mdiePresent) { pDstProfile->MDID.mdiePresent = 1; @@ -7194,13 +7194,13 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, #ifdef FEATURE_WLAN_BTAMP_UT_RF pSession->maxRetryCount = CSR_JOIN_MAX_RETRY_COUNT; #endif - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { status = QDF_STATUS_E_NOMEM; goto end; } - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Try to connect to any BSS */ if (NULL == pProfile) { @@ -7217,7 +7217,7 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, if (pRoamId) *pRoamId = roamId; if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); goto end; } @@ -7246,7 +7246,7 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, } csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); goto end; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); @@ -7323,7 +7323,7 @@ error: */ csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); end: /* tell the caller if we fail to trigger a join request */ if (fCallCallback) { @@ -7382,7 +7382,7 @@ csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, */ sms_log(mac_ctx, LOG1, FL("SSID mismatch")); } - } else if (!cdf_mem_compare(&mod_fields, + } else if (qdf_mem_cmp(&mod_fields, &session->connectedProfile.modifyProfileFields, sizeof(tCsrRoamModifyProfileFields))) { fCallCallback = false; @@ -7431,22 +7431,22 @@ QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) csr_scan_abort_mac_scan_not_for_connect(pMac, sessionId); /* We have to make a copy of pCurRoamProfile because it * will be free inside csr_roam_issue_connect */ - pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); + pProfile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { status = QDF_STATUS_E_NOMEM; goto end; } - cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); if (!QDF_IS_STATUS_SUCCESS(status)) goto end; - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { status = QDF_STATUS_E_NOMEM; goto end; } - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -7480,11 +7480,11 @@ QDF_STATUS csr_roam_join_last_profile(tpAniSirGlobal pMac, uint32_t sessionId) end: if (pScanFilter) { csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); } if (NULL != pProfile) { csr_release_profile(pMac, pProfile); - cdf_mem_free(pProfile); + qdf_mem_free(pProfile); } return status; } @@ -7817,11 +7817,11 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, } pConnectProfile = &pSession->connectedProfile; if (pConnectProfile->pAddIEAssoc) { - cdf_mem_free(pConnectProfile->pAddIEAssoc); + qdf_mem_free(pConnectProfile->pAddIEAssoc); pConnectProfile->pAddIEAssoc = NULL; } if (!pSession->roam_synch_in_progress) { - cdf_mem_set(&pSession->connectedProfile, + qdf_mem_set(&pSession->connectedProfile, sizeof(tCsrRoamConnectedProfile), 0); pConnectProfile->AuthType = pProfile->negotiatedAuthType; pConnectProfile->AuthInfo = pProfile->AuthType; @@ -7835,11 +7835,11 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->BSSType = pProfile->BSSType; pConnectProfile->modifyProfileFields.uapsd_mask = pProfile->uapsd_mask; - cdf_mem_copy(&pConnectProfile->Keys, &pProfile->Keys, + qdf_mem_copy(&pConnectProfile->Keys, &pProfile->Keys, sizeof(tCsrKeys)); if (pProfile->nAddIEAssocLength) { pConnectProfile->pAddIEAssoc = - cdf_mem_malloc(pProfile->nAddIEAssocLength); + qdf_mem_malloc(pProfile->nAddIEAssocLength); if (NULL == pConnectProfile->pAddIEAssoc) status = QDF_STATUS_E_NOMEM; else @@ -7851,7 +7851,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, } pConnectProfile->nAddIEAssocLength = pProfile->nAddIEAssocLength; - cdf_mem_copy(pConnectProfile->pAddIEAssoc, + qdf_mem_copy(pConnectProfile->pAddIEAssoc, pProfile->pAddIEAssoc, pProfile->nAddIEAssocLength); } @@ -7890,7 +7890,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, if (QDF_IS_STATUS_SUCCESS(status)) { if (pIesTemp->SSID.present) { pConnectProfile->SSID.length = pIesTemp->SSID.num_ssid; - cdf_mem_copy(pConnectProfile->SSID.ssId, + qdf_mem_copy(pConnectProfile->SSID.ssId, pIesTemp->SSID.ssid, pIesTemp->SSID.num_ssid); } @@ -7914,7 +7914,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, if (NULL == pIes) { /* Free memory if it allocated locally */ - cdf_mem_free(pIesTemp); + qdf_mem_free(pIesTemp); } } /* Save Qos connection */ @@ -7927,9 +7927,9 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, for (index = 0; index < pProfile->SSIDs.numOfSSIDs; index++) { if ((pProfile->SSIDs.SSIDList[index].SSID.length == pConnectProfile->SSID.length) - && cdf_mem_compare(pProfile->SSIDs.SSIDList[index].SSID. + && (!qdf_mem_cmp(pProfile->SSIDs.SSIDList[index].SSID. ssId, pConnectProfile->SSID.ssId, - pConnectProfile->SSID.length)) { + pConnectProfile->SSID.length))) { pConnectProfile->handoffPermitted = pProfile->SSIDs.SSIDList[index].handoffPermitted; break; @@ -8151,7 +8151,7 @@ void csr_roam_reissue_roam_command(tpAniSirGlobal pMac) } return; } - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.pBssDesc = pCommand->u.roamCmd.pLastRoamBss; roamInfo.statusCode = pSession->joinFailStatusCode.statusCode; roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode; @@ -8525,7 +8525,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, } if (!scan_result->Result.pvIes) { /* Locally allocated */ - cdf_mem_free(local_ies); + qdf_mem_free(local_ies); } } @@ -8571,7 +8571,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac, pSmeJoinRsp->statusCode)) { /* Inform HDD to turn off FT flag in HDD */ if (pNeighborRoamInfo) { - cdf_mem_zero(&roamInfo, sizeof(tCsrRoamInfo)); + qdf_mem_zero(&roamInfo, sizeof(tCsrRoamInfo)); csr_roam_call_callback(pMac, pSmeJoinRsp->sessionId, &roamInfo, roamId, @@ -8698,16 +8698,16 @@ csr_post_roam_failure(tpAniSirGlobal mac_ctx, if (scan_filter) { csr_free_scan_filter(mac_ctx, scan_filter); - cdf_mem_free(scan_filter); + qdf_mem_free(scan_filter); } if (cur_roam_profile) - cdf_mem_free(cur_roam_profile); + qdf_mem_free(cur_roam_profile); #ifdef WLAN_FEATURE_ROAM_OFFLOAD csr_roam_synch_clean_up(mac_ctx, session_id); #endif /* Inform the upper layers that the reassoc failed */ - cdf_mem_zero(roam_info, sizeof(tCsrRoamInfo)); + qdf_mem_zero(roam_info, sizeof(tCsrRoamInfo)); csr_roam_call_callback(mac_ctx, session_id, roam_info, 0, eCSR_ROAM_FT_REASSOC_FAILED, eSIR_SME_SUCCESS); /* @@ -8744,12 +8744,12 @@ csr_check_profile_in_scan_cache(tpAniSirGlobal mac_ctx, tScanResultHandle *hBSSList) { QDF_STATUS status; - *scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + *scan_filter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == *scan_filter) { sms_log(mac_ctx, LOGE, FL("alloc for ScanFilter failed.")); return false; } - cdf_mem_set(*scan_filter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(*scan_filter, sizeof(tCsrScanResultFilter), 0); (*scan_filter)->scan_filter_for_roam = 1; status = csr_roam_prepare_filter_from_profile(mac_ctx, &neighbor_roam_info->csrNeighborRoamProfile, @@ -8847,7 +8847,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, * Copy the connected profile to apply the same for this * connection as well */ - pCurRoamProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); + pCurRoamProfile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (pCurRoamProfile != NULL) { /* * notify sub-modules like QoS etc. that handoff @@ -8856,7 +8856,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, sme_qos_csr_event_ind(pMac, sessionId, SME_QOS_CSR_HANDOFF_ASSOC_REQ, NULL); - cdf_mem_set(pCurRoamProfile, sizeof(tCsrRoamProfile), + qdf_mem_set(pCurRoamProfile, sizeof(tCsrRoamProfile), 0); csr_roam_copy_profile(pMac, pCurRoamProfile, pSession->pCurRoamProfile); @@ -8871,9 +8871,9 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac, status); csr_release_profile(pMac, pCurRoamProfile); - cdf_mem_free(pCurRoamProfile); + qdf_mem_free(pCurRoamProfile); csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return; } @@ -9042,7 +9042,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) pIbssPeerInd = (tSmeIbssPeerInd *) pSmeRsp; sms_log(pMac, LOGE, FL("Peer departed ntf from LIM in joining state")); - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.staId = (uint8_t) pIbssPeerInd->staId; roamInfo.ucastSig = (uint8_t) pIbssPeerInd->ucastSig; roamInfo.bcastSig = (uint8_t) pIbssPeerInd->bcastSig; @@ -9095,7 +9095,7 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) sms_log(pMac, LOG1, FL ("ASSOCIATION confirmation can be given to upper layer ")); - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); pRoamInfo = &roamInfo; pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; @@ -9131,17 +9131,17 @@ void csr_roam_joined_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf) (uint8_t) pUpperLayerAssocCnf->addIE.length; pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata; - cdf_mem_copy(pRoamInfo->peerMac.bytes, + qdf_mem_copy(pRoamInfo->peerMac.bytes, pUpperLayerAssocCnf->peerMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(&pRoamInfo->bssid, + qdf_mem_copy(&pRoamInfo->bssid, pUpperLayerAssocCnf->bssId, sizeof(struct qdf_mac_addr)); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; pRoamInfo->timingMeasCap = pUpperLayerAssocCnf->timingMeasCap; - cdf_mem_copy(&pRoamInfo->chan_info, + qdf_mem_copy(&pRoamInfo->chan_info, &pUpperLayerAssocCnf->chan_info, sizeof(tSirSmeChanInfo)); if (CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile)) { @@ -9192,14 +9192,14 @@ QDF_STATUS csr_roam_issue_set_context_req(tpAniSirGlobal pMac, tCsrRoamSetKey setKey; setKey.encType = EncryptType; setKey.keyDirection = aniKeyDirection; - cdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct qdf_mac_addr)); + qdf_mem_copy(&setKey.peerMac, bssId, sizeof(struct qdf_mac_addr)); /* 0 for supplicant */ setKey.paeRole = paeRole; /* Key index */ setKey.keyId = keyId; setKey.keyLength = keyLength; if (keyLength) { - cdf_mem_copy(setKey.Key, pKey, keyLength); + qdf_mem_copy(setKey.Key, pKey, keyLength); } status = csr_roam_issue_set_key_command(pMac, sessionId, &setKey, 0); @@ -9239,7 +9239,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP40_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_WEP40_KEY_LEN); } *enqueue_cmd = true; @@ -9257,7 +9257,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, } set_key_cmd->u.setKeyCmd.keyLength = CSR_WEP104_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_WEP104_KEY_LEN); } *enqueue_cmd = true; @@ -9271,7 +9271,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_TKIP_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_TKIP_KEY_LEN); *enqueue_cmd = true; break; @@ -9284,7 +9284,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_AES_KEY_LEN); *enqueue_cmd = true; break; @@ -9298,7 +9298,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_WAPI_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_WAPI_KEY_LEN); if (session->pCurRoamProfile) { session->pCurRoamProfile->negotiatedUCEncryptionType = @@ -9322,7 +9322,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, set_key->keyLength); return QDF_STATUS_E_INVAL; } - cdf_mem_copy(session->eseCckmInfo.krk, set_key->Key, + qdf_mem_copy(session->eseCckmInfo.krk, set_key->Key, CSR_KRK_KEY_LEN); session->eseCckmInfo.reassoc_req_num = 1; session->eseCckmInfo.krk_plumbed = true; @@ -9337,7 +9337,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, set_key->keyLength); return QDF_STATUS_E_INVAL; } - cdf_mem_copy(session->eseCckmInfo.btk, set_key->Key, + qdf_mem_copy(session->eseCckmInfo.btk, set_key->Key, SIR_BTK_KEY_LEN); break; #endif @@ -9353,7 +9353,7 @@ csr_update_key_cmd(tpAniSirGlobal mac_ctx, tCsrRoamSession *session, return QDF_STATUS_E_INVAL; } set_key_cmd->u.setKeyCmd.keyLength = CSR_AES_KEY_LEN; - cdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, + qdf_mem_copy(set_key_cmd->u.setKeyCmd.Key, set_key->Key, CSR_AES_KEY_LEN); *enqueue_cmd = true; break; @@ -9389,7 +9389,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL(" fail to get command buffer")); return QDF_STATUS_E_RESOURCES; } - cdf_mem_zero(pCommand, sizeof(tSmeCmd)); + qdf_mem_zero(pCommand, sizeof(tSmeCmd)); pCommand->command = eSmeCommandSetKey; pCommand->sessionId = (uint8_t) sessionId; /* @@ -9413,7 +9413,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac, /* 0 for supplicant */ pCommand->u.setKeyCmd.paeRole = pSetKey->paeRole; pCommand->u.setKeyCmd.keyId = pSetKey->keyId; - cdf_mem_copy(pCommand->u.setKeyCmd.keyRsc, pSetKey->keyRsc, + qdf_mem_copy(pCommand->u.setKeyCmd.keyRsc, pSetKey->keyRsc, CSR_MAX_RSC_LEN); /* * Always put set key to the head of the Q because it is the @@ -9461,7 +9461,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma } if (eSIR_ED_NONE != edType) { - cdf_mem_set(&setKeyEvent, + qdf_mem_set(&setKeyEvent, sizeof(host_event_wlan_security_payload_type), 0); if (qdf_is_macaddr_group(&pCommand->u.setKeyCmd.peermac)) { setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_GTK_REQ; @@ -9482,7 +9482,7 @@ QDF_STATUS csr_roam_process_set_key_command(tpAniSirGlobal pMac, tSmeCmd *pComma connectedProfile. mcEncryptionType); } - cdf_mem_copy(setKeyEvent.bssid, + qdf_mem_copy(setKeyEvent.bssid, pSession->connectedProfile.bssid.bytes, QDF_MAC_ADDR_SIZE); if (CSR_IS_ENC_TYPE_STATIC(pCommand->u.setKeyCmd.encType)) { @@ -9585,13 +9585,13 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, if (profile->BSSIDs.numOfBSSIDs) { size = sizeof(struct qdf_mac_addr) * profile->BSSIDs.numOfBSSIDs; - scan_fltr->BSSIDs.bssid = cdf_mem_malloc(size); + scan_fltr->BSSIDs.bssid = qdf_mem_malloc(size); if (NULL == scan_fltr->BSSIDs.bssid) { status = QDF_STATUS_E_NOMEM; goto free_filter; } scan_fltr->BSSIDs.numOfBSSIDs = profile->BSSIDs.numOfBSSIDs; - cdf_mem_copy(scan_fltr->BSSIDs.bssid, + qdf_mem_copy(scan_fltr->BSSIDs.bssid, profile->BSSIDs.bssid, size); } @@ -9606,7 +9606,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, roam_params->num_ssid_allowed_list; size = sizeof(tCsrSSIDInfo) * scan_fltr->SSIDs.numOfSSIDs; - scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); + scan_fltr->SSIDs.SSIDList = qdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) status = QDF_STATUS_E_FAILURE; else @@ -9616,7 +9616,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, for (i = 0; i < roam_params->num_ssid_allowed_list; i++) { - cdf_mem_copy((void *) + qdf_mem_copy((void *) scan_fltr->SSIDs.SSIDList[i].SSID.ssId, roam_params->ssid_allowed_list[i].ssId, roam_params->ssid_allowed_list[i].length); @@ -9629,12 +9629,12 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, } else { size = sizeof(tCsrSSIDInfo) * profile->SSIDs.numOfSSIDs; - scan_fltr->SSIDs.SSIDList = cdf_mem_malloc(size); + scan_fltr->SSIDs.SSIDList = qdf_mem_malloc(size); if (NULL == scan_fltr->SSIDs.SSIDList) { status = QDF_STATUS_E_NOMEM; goto free_filter; } - cdf_mem_copy(scan_fltr->SSIDs.SSIDList, + qdf_mem_copy(scan_fltr->SSIDs.SSIDList, profile->SSIDs.SSIDList, size); } } @@ -9646,7 +9646,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, } else if (profile_ch_info->numOfChannels) { fltr_ch_info->numOfChannels = 0; fltr_ch_info->ChannelList = - cdf_mem_malloc(sizeof(*(fltr_ch_info->ChannelList)) * + qdf_mem_malloc(sizeof(*(fltr_ch_info->ChannelList)) * profile_ch_info->numOfChannels); if (NULL == fltr_ch_info->ChannelList) { status = QDF_STATUS_E_NOMEM; @@ -9699,7 +9699,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx, * This causes the matching function to use countryCode as one * of the criteria. */ - cdf_mem_copy(scan_fltr->countryCode, profile->countryCode, + qdf_mem_copy(scan_fltr->countryCode, profile->countryCode, WNI_CFG_COUNTRY_CODE_LEN); } if (profile->MDID.mdiePresent) { @@ -9748,12 +9748,12 @@ bool csr_roam_issue_wm_status_change(tpAniSirGlobal pMac, uint32_t sessionId, pCommand->sessionId = (uint8_t) sessionId; pCommand->u.wmStatusChangeCmd.Type = Type; if (eCsrDisassociated == Type) { - cdf_mem_copy(&pCommand->u.wmStatusChangeCmd.u. + qdf_mem_copy(&pCommand->u.wmStatusChangeCmd.u. DisassocIndMsg, pSmeRsp, sizeof(pCommand->u.wmStatusChangeCmd.u. DisassocIndMsg)); } else { - cdf_mem_copy(&pCommand->u.wmStatusChangeCmd.u. + qdf_mem_copy(&pCommand->u.wmStatusChangeCmd.u. DeauthIndMsg, pSmeRsp, sizeof(pCommand->u.wmStatusChangeCmd.u. DeauthIndMsg)); @@ -9868,12 +9868,12 @@ void csr_tsm_stats_rsp_processor(tpAniSirGlobal pMac, void *pMsg) pDevContext); reqBkp->tsmStatsCallback = NULL; } - cdf_mem_free(reqBkp); + qdf_mem_free(reqBkp); pTsmStatsRsp->tsmStatsReq = NULL; } else { sms_log(pMac, LOGE, FL("reqBkp is NULL")); if (NULL != reqBkp) { - cdf_mem_free(reqBkp); + qdf_mem_free(reqBkp); pTsmStatsRsp->tsmStatsReq = NULL; } } @@ -9926,14 +9926,14 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, /* Create the message and send to lim */ len = sizeof(tSirResetAPCapsChange); - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); + qdf_mem_set(pMsg, sizeof(tSirResetAPCapsChange), 0); pMsg->messageType = eWNI_SME_RESET_AP_CAPS_CHANGED; pMsg->length = len; qdf_copy_macaddr(&pMsg->bssId, bssId); @@ -9956,7 +9956,7 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tCsrRoamInfo *roam_info_ptr = NULL; tSirSmeAssocInd *pAssocInd; tCsrRoamInfo roam_info; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sms_log(mac_ctx, LOG1, FL("Receive WNI_SME_ASSOC_IND from SME")); pAssocInd = (tSirSmeAssocInd *) msg_ptr; @@ -9989,15 +9989,15 @@ csr_roam_chk_lnk_assoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) #endif roam_info_ptr->addIELen = (uint8_t) pAssocInd->addIE.length; roam_info_ptr->paddIE = pAssocInd->addIE.addIEdata; - cdf_mem_copy(roam_info_ptr->peerMac.bytes, + qdf_mem_copy(roam_info_ptr->peerMac.bytes, pAssocInd->peerMacAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(roam_info_ptr->bssid.bytes, + qdf_mem_copy(roam_info_ptr->bssid.bytes, pAssocInd->bssId, sizeof(struct qdf_mac_addr)); roam_info_ptr->wmmEnabledSta = pAssocInd->wmmEnabledSta; roam_info_ptr->timingMeasCap = pAssocInd->timingMeasCap; - cdf_mem_copy(&roam_info_ptr->chan_info, + qdf_mem_copy(&roam_info_ptr->chan_info, &pAssocInd->chan_info, sizeof(tSirSmeChanInfo)); if (CSR_IS_INFRA_AP(roam_info_ptr->u.pConnectedProfile)) { @@ -10053,7 +10053,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) * the WmStatusChange requests is pushed and processed */ pDisassocInd = (tSirSmeDisassocInd *) msg_ptr; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pDisassocInd->bssid, &sessionId); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -10127,7 +10127,7 @@ csr_roam_chk_lnk_disassoc_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) cmd.command = eSmeCommandRoam; cmd.sessionId = (uint8_t) sessionId; cmd.u.roamCmd.roamReason = eCsrForcedDeauthSta; - cdf_mem_copy(cmd.u.roamCmd.peerMac, + qdf_mem_copy(cmd.u.roamCmd.peerMac, pDisassocInd->peer_macaddr.bytes, QDF_MAC_ADDR_SIZE); csr_roam_remove_duplicate_command(mac_ctx, sessionId, &cmd, @@ -10145,7 +10145,7 @@ csr_roam_chk_lnk_deauth_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tSirSmeDeauthInd *pDeauthInd; tCsrRoamInfo roam_info; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sms_log(mac_ctx, LOG1, FL("DEAUTHENTICATION Indication from MAC")); pDeauthInd = (tpSirSmeDeauthInd) msg_ptr; status = csr_roam_get_session_id_from_bssid(mac_ctx, @@ -10247,7 +10247,7 @@ csr_roam_chk_lnk_deauth_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tSirSmeDeauthRsp *pDeauthRsp = (tSirSmeDeauthRsp *) msg_ptr; tCsrRoamInfo roam_info; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sms_log(mac_ctx, LOGW, FL("eWNI_SME_DEAUTH_RSP from SME")); sessionId = pDeauthRsp->sessionId; if (!CSR_IS_SESSION_VALID(mac_ctx, sessionId)) @@ -10281,7 +10281,7 @@ csr_roam_chk_lnk_disassoc_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) */ tSirSmeDisassocRsp *pDisassocRsp = (tSirSmeDisassocRsp *) msg_ptr; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sms_log(mac_ctx, LOGW, FL("eWNI_SME_DISASSOC_RSP from SME ")); sessionId = pDisassocRsp->sessionId; if (!CSR_IS_SESSION_VALID(mac_ctx, sessionId)) @@ -10312,7 +10312,7 @@ csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) sms_log(mac_ctx, LOGE, FL("session %d not found"), sessionId); return; } - cdf_mem_set(&secEvent, sizeof(host_event_wlan_security_payload_type), + qdf_mem_set(&secEvent, sizeof(host_event_wlan_security_payload_type), 0); secEvent.eventId = WLAN_SECURITY_EVENT_MIC_ERROR; secEvent.encryptionModeMulticast = @@ -10324,7 +10324,7 @@ csr_roam_diag_mic_fail(tpAniSirGlobal mac_ctx, uint32_t sessionId) secEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( session->connectedProfile.AuthType); - cdf_mem_copy(secEvent.bssid, session->connectedProfile.bssid.bytes, + qdf_mem_copy(secEvent.bssid, session->connectedProfile.bssid.bytes, QDF_MAC_ADDR_SIZE); WLAN_HOST_DIAG_EVENT_REPORT(&secEvent, EVENT_WLAN_SECURITY); } @@ -10340,11 +10340,11 @@ csr_roam_chk_lnk_mic_fail_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tpSirSmeMicFailureInd pMicInd = (tpSirSmeMicFailureInd) msg_ptr; eCsrRoamResult result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pMicInd->bssId, &sessionId); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pMICFailureInfo = &pMicInd->info; roam_info_ptr = &roam_info; if (pMicInd->info.multicast) @@ -10367,13 +10367,13 @@ csr_roam_chk_lnk_pbs_probe_req_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tCsrRoamInfo roam_info; tpSirSmeProbeReqInd pProbeReqInd = (tpSirSmeProbeReqInd) msg_ptr; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sms_log(mac_ctx, LOG1, FL("WPS PBC Probe request Indication from SME")); status = csr_roam_get_session_id_from_bssid(mac_ctx, &pProbeReqInd->bssid, &sessionId); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roam_info, sizeof(tCsrRoamInfo), 0); roam_info.u.pWPSPBCProbeReq = &pProbeReqInd->WPSPBCProbeReq; csr_roam_call_callback(mac_ctx, sessionId, &roam_info, 0, eCSR_ROAM_WPS_PBC_PROBE_REQ_IND, @@ -10396,7 +10396,7 @@ csr_roam_diag_joined_new_bss(tpAniSirGlobal mac_ctx, if (pNewBss) { qdf_copy_macaddr(&pIbssLog->bssid, &pNewBss->bssId); if (pNewBss->ssId.length) - cdf_mem_copy(pIbssLog->ssid, pNewBss->ssId.ssId, + qdf_mem_copy(pIbssLog->ssid, pNewBss->ssId.ssId, pNewBss->ssId.length); pIbssLog->operatingChannel = pNewBss->channelNumber; } @@ -10425,7 +10425,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, tSirSmeNewBssInfo *pNewBss; eRoamCmdStatus roamStatus = eCSR_ROAM_FAILED; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); pStatusChangeMsg = (tSirSmeWmStatusChangeNtf *) msg_ptr; switch (pStatusChangeMsg->statusChangeCode) { case eSIR_SME_IBSS_ACTIVE: @@ -10440,7 +10440,7 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, } session->connectState = eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED; if (session->pConnectBssDesc) { - cdf_mem_copy(&roam_info.bssid, + qdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); roam_info.u.pConnectedProfile = @@ -10503,12 +10503,12 @@ csr_roam_chk_lnk_wm_status_change_ntf(tpAniSirGlobal mac_ctx, } result = eCSR_ROAM_RESULT_IBSS_COALESCED; roamStatus = eCSR_ROAM_IBSS_IND; - cdf_mem_copy(&roam_info.bssid, &pNewBss->bssId, + qdf_mem_copy(&roam_info.bssid, &pNewBss->bssId, sizeof(struct qdf_mac_addr)); roam_info_ptr = &roam_info; /* This BSSID is the real BSSID, save it */ if (session->pConnectBssDesc) - cdf_mem_copy(session->pConnectBssDesc->bssId, + qdf_mem_copy(session->pConnectBssDesc->bssId, &pNewBss->bssId, sizeof(struct qdf_mac_addr)); break; @@ -10589,7 +10589,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } #endif /* FEATURE_WLAN_DIAG_SUPPORT_CSR */ - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); sessionId = csr_find_ibss_session(mac_ctx); if (CSR_SESSION_ID_INVALID == sessionId) return; @@ -10607,10 +10607,10 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) goto callback_and_free; } qdf_copy_macaddr(&roam_info.peerMac, &pIbssPeerInd->peer_addr); - cdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, + qdf_mem_copy(&roam_info.bssid, session->pConnectBssDesc->bssId, sizeof(struct qdf_mac_addr)); if (pIbssPeerInd->mesgLen > sizeof(tSmeIbssPeerInd)) { - roam_info.pbFrames = cdf_mem_malloc((pIbssPeerInd->mesgLen - + roam_info.pbFrames = qdf_mem_malloc((pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd))); if (NULL == roam_info.pbFrames) { status = QDF_STATUS_E_NOMEM; @@ -10618,7 +10618,7 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) status = QDF_STATUS_SUCCESS; roam_info.nBeaconLength = pIbssPeerInd->mesgLen - sizeof(tSmeIbssPeerInd); - cdf_mem_copy(roam_info.pbFrames, + qdf_mem_copy(roam_info.pbFrames, ((uint8_t *) pIbssPeerInd) + sizeof(tSmeIbssPeerInd), roam_info.nBeaconLength); @@ -10626,17 +10626,17 @@ csr_roam_chk_lnk_ibss_new_peer_ind(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) roam_info.staId = (uint8_t) pIbssPeerInd->staId; roam_info.ucastSig = (uint8_t) pIbssPeerInd->ucastSig; roam_info.bcastSig = (uint8_t) pIbssPeerInd->bcastSig; - roam_info.pBssDesc = cdf_mem_malloc( + roam_info.pBssDesc = qdf_mem_malloc( session->pConnectBssDesc->length); if (NULL == roam_info.pBssDesc) { status = QDF_STATUS_E_NOMEM; if (roam_info.pbFrames) - cdf_mem_free(roam_info.pbFrames); + qdf_mem_free(roam_info.pbFrames); if (roam_info.pBssDesc) - cdf_mem_free(roam_info.pBssDesc); + qdf_mem_free(roam_info.pBssDesc); } else { status = QDF_STATUS_SUCCESS; - cdf_mem_copy(roam_info.pBssDesc, + qdf_mem_copy(roam_info.pBssDesc, session->pConnectBssDesc, session->pConnectBssDesc->length); roam_info_ptr = &roam_info; @@ -10663,9 +10663,9 @@ callback_and_free: eCSR_ROAM_RESULT_IBSS_NEW_PEER); if (roam_info_ptr) { if (roam_info.pbFrames) - cdf_mem_free(roam_info.pbFrames); + qdf_mem_free(roam_info.pbFrames); if (roam_info.pBssDesc) - cdf_mem_free(roam_info.pBssDesc); + qdf_mem_free(roam_info.pBssDesc); } } @@ -10681,7 +10681,7 @@ csr_roam_chk_lnk_ibss_peer_departed_ind(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGE, FL("IBSS peer ind. message is NULL")); return; } - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); pIbssPeerInd = (tSmeIbssPeerInd *) msg_ptr; sessionId = csr_find_ibss_session(mac_ctx); if (CSR_SESSION_ID_INVALID != sessionId) { @@ -10721,7 +10721,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, if (eCSR_ENCRYPT_TYPE_NONE == session->connectedProfile.EncryptionType) return; - cdf_mem_set(&setKeyEvent, + qdf_mem_set(&setKeyEvent, sizeof(host_event_wlan_security_payload_type), 0); if (qdf_is_macaddr_group(&pRsp->peer_macaddr)) setKeyEvent.eventId = WLAN_SECURITY_EVENT_SET_GTK_RSP; @@ -10733,7 +10733,7 @@ csr_roam_diag_set_ctx_rsp(tpAniSirGlobal mac_ctx, setKeyEvent.encryptionModeUnicast = (uint8_t) diag_enc_type_from_csr_type( session->connectedProfile.EncryptionType); - cdf_mem_copy(setKeyEvent.bssid, session->connectedProfile.bssid.bytes, + qdf_mem_copy(setKeyEvent.bssid, session->connectedProfile.bssid.bytes, QDF_MAC_ADDR_SIZE); setKeyEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( @@ -10757,7 +10757,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tSirSmeSetContextRsp *pRsp = (tSirSmeSetContextRsp *) msg_ptr; tListElem *entry; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); entry = csr_ll_peek_head(&mac_ctx->sme.smeCmdActiveList, LL_ACCESS_LOCK); if (!entry) { @@ -10799,7 +10799,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) */ if (qdf_is_macaddr_broadcast(&pRsp->peer_macaddr)) { tpSirSetActiveModeSetBncFilterReq pMsg; - pMsg = cdf_mem_malloc( + pMsg = qdf_mem_malloc( sizeof(tSirSetActiveModeSetBncFilterReq)); pMsg->messageType = eWNI_SME_SET_BCN_FILTER_REQ; pMsg->length = sizeof(uint8_t); @@ -10853,7 +10853,7 @@ csr_roam_chk_lnk_max_assoc_exceeded(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) tSmeMaxAssocInd *pSmeMaxAssocInd; tCsrRoamInfo roam_info; - cdf_mem_set(&roam_info, sizeof(roam_info), 0); + qdf_mem_set(&roam_info, sizeof(roam_info), 0); pSmeMaxAssocInd = (tSmeMaxAssocInd *) msg_ptr; sms_log(mac_ctx, LOG1, FL("max assoc have been reached, new peer cannot be accepted")); @@ -11337,7 +11337,7 @@ QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, fToRoam = false; } /* prepare to tell HDD to disconnect */ - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); roamInfo.statusCode = (tSirResultCodes) pSession->roamingStatusCode; roamInfo.reasonCode = pSession->joinFailStatusCode.reasonCode; if (eWNI_SME_DISASSOC_IND == type) { @@ -11375,7 +11375,7 @@ QDF_STATUS csr_roam_lost_link(tpAniSirGlobal pMac, uint32_t sessionId, eCsrLostlinkRoamingDeauth : eCsrLostlinkRoamingDisassoc); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); /* For IBSS, we need to give some more info to HDD */ if (csr_is_bss_type_ibss (pSession->connectedProfile.BSSType)) { @@ -11853,7 +11853,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) } else return maxTxPwr; - pCountryInfo = cdf_mem_malloc(cfgLength); + pCountryInfo = qdf_mem_malloc(cfgLength); if (NULL == pCountryInfo) status = QDF_STATUS_E_NOMEM; else @@ -11882,7 +11882,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel) error: if (NULL != pCountryInfo) - cdf_mem_free(pCountryInfo); + qdf_mem_free(pCountryInfo); return maxTxPwr; } @@ -12053,11 +12053,11 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, if (!(pProfile1 && pProfile2)) return fCheck; - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) return fCheck; - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile2, pScanFilter); if (!(QDF_IS_STATUS_SUCCESS(status))) @@ -12095,7 +12095,7 @@ bool csr_is_same_profile(tpAniSirGlobal pMac, fCheck = true; free_scan_filter: csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return fCheck; } @@ -12127,7 +12127,7 @@ bool csr_roam_is_same_profile_keys(tpAniSirGlobal pMac, if (pConnProfile->Keys.KeyLength[i] != pProfile2->Keys.KeyLength[i]) break; - if (!cdf_mem_compare(&pConnProfile->Keys.KeyMaterial[i], + if (qdf_mem_cmp(&pConnProfile->Keys.KeyMaterial[i], &pProfile2->Keys.KeyMaterial[i], pProfile2->Keys.KeyLength[i])) { break; @@ -12273,7 +12273,7 @@ csr_populate_basic_rates(tSirMacRateSet *rate_set, bool type, bool masked) if (type == true) { rate_set->numRates = 8; - cdf_mem_copy(rate_set->rate, ofdm_rates, sizeof(ofdm_rates)); + qdf_mem_copy(rate_set->rate, ofdm_rates, sizeof(ofdm_rates)); if (masked) { rate_set->rate[0] |= CSR_DOT11_BASIC_RATE_MASK; rate_set->rate[2] |= CSR_DOT11_BASIC_RATE_MASK; @@ -12281,7 +12281,7 @@ csr_populate_basic_rates(tSirMacRateSet *rate_set, bool type, bool masked) } } else { rate_set->numRates = 4; - cdf_mem_copy(rate_set->rate, cck_rates, sizeof(cck_rates)); + qdf_mem_copy(rate_set->rate, cck_rates, sizeof(cck_rates)); if (masked) { rate_set->rate[0] |= CSR_DOT11_BASIC_RATE_MASK; rate_set->rate[1] |= CSR_DOT11_BASIC_RATE_MASK; @@ -12440,7 +12440,7 @@ csr_roam_get_bss_start_parms_from_bss_desc(tpAniSirGlobal pMac, pParam->sirNwType = pBssDesc->nwType; pParam->cbMode = PHY_SINGLE_CHANNEL_CENTERED; pParam->operationChn = pBssDesc->channelId; - cdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct qdf_mac_addr)); + qdf_mem_copy(&pParam->bssid, pBssDesc->bssId, sizeof(struct qdf_mac_addr)); if (!pIes) { pParam->ssId.length = 0; @@ -12457,7 +12457,7 @@ csr_roam_get_bss_start_parms_from_bss_desc(tpAniSirGlobal pMac, pIes->SuppRates.num_rates); pIes->SuppRates.num_rates = SIR_MAC_RATESET_EID_MAX; } - cdf_mem_copy(pParam->operationalRateSet.rate, + qdf_mem_copy(pParam->operationalRateSet.rate, pIes->SuppRates.rates, sizeof(*pIes->SuppRates.rates) * pIes->SuppRates.num_rates); @@ -12470,14 +12470,14 @@ csr_roam_get_bss_start_parms_from_bss_desc(tpAniSirGlobal pMac, pIes->ExtSuppRates.num_rates); pIes->ExtSuppRates.num_rates = SIR_MAC_RATESET_EID_MAX; } - cdf_mem_copy(pParam->extendedRateSet.rate, + qdf_mem_copy(pParam->extendedRateSet.rate, pIes->ExtSuppRates.rates, sizeof(*pIes->ExtSuppRates.rates) * pIes->ExtSuppRates.num_rates); } if (pIes->SSID.present) { pParam->ssId.length = pIes->SSID.num_ssid; - cdf_mem_copy(pParam->ssId.ssId, pIes->SSID.ssid, + qdf_mem_copy(pParam->ssId.ssId, pIes->SSID.ssid, pParam->ssId.length); } pParam->cbMode = csr_get_cb_mode_from_ies(pMac, pParam->operationChn, @@ -12524,13 +12524,13 @@ QDF_STATUS csr_roam_issue_start_bss(tpAniSirGlobal pMac, uint32_t sessionId, if (pBssDesc) { pIbssLog->eventId = WLAN_IBSS_EVENT_JOIN_IBSS_REQ; - cdf_mem_copy(pIbssLog->bssid.bytes, + qdf_mem_copy(pIbssLog->bssid.bytes, pBssDesc->bssId, QDF_MAC_ADDR_SIZE); } else { pIbssLog->eventId = WLAN_IBSS_EVENT_START_IBSS_REQ; } - cdf_mem_copy(pIbssLog->ssid, pParam->ssId.ssId, + qdf_mem_copy(pIbssLog->ssid, pParam->ssId.ssId, pParam->ssId.length); if (pProfile->ChannelInfo.numOfChannels == 0) { pIbssLog->channelSetting = AUTO_PICK; @@ -12627,16 +12627,16 @@ static void csr_roam_prepare_bss_params(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_get_bss_start_parms(pMac, pProfile, &pSession->bssParams); /* Use the first SSID */ if (pProfile->SSIDs.numOfSSIDs) - cdf_mem_copy(&pSession->bssParams.ssId, + qdf_mem_copy(&pSession->bssParams.ssId, pProfile->SSIDs.SSIDList, sizeof(tSirMacSSid)); if (pProfile->BSSIDs.numOfBSSIDs) /* Use the first BSSID */ - cdf_mem_copy(&pSession->bssParams.bssid, + qdf_mem_copy(&pSession->bssParams.bssid, pProfile->BSSIDs.bssid, sizeof(struct qdf_mac_addr)); else - cdf_mem_set(&pSession->bssParams.bssid, + qdf_mem_set(&pSession->bssParams.bssid, sizeof(struct qdf_mac_addr), 0); } Channel = pSession->bssParams.operationChn; @@ -12698,13 +12698,13 @@ static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, } else { tBssConfigParam *pBssConfig; - pBssConfig = cdf_mem_malloc(sizeof(tBssConfigParam)); + pBssConfig = qdf_mem_malloc(sizeof(tBssConfigParam)); if (NULL == pBssConfig) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); + qdf_mem_set(pBssConfig, sizeof(tBssConfigParam), 0); /* there is no Bss description before we start an IBSS so we need to adopt */ /* all Bss configuration parameters from the Profile. */ status = @@ -12726,7 +12726,7 @@ static QDF_STATUS csr_roam_start_ibss(tpAniSirGlobal pMac, uint32_t sessionId, false); } - cdf_mem_free(pBssConfig); + qdf_mem_free(pBssConfig); } /* Allocate memory */ } @@ -12752,7 +12752,7 @@ static void csr_roam_update_connected_profile_from_new_bss(tpAniSirGlobal pMac, pSession->connectedProfile.operationChannel = pNewBss->channelNumber; /* move the BSSId from the BSS description into the connected state information. */ - cdf_mem_copy(&pSession->connectedProfile.bssid.bytes, + qdf_mem_copy(&pSession->connectedProfile.bssid.bytes, &(pNewBss->bssId), sizeof(struct qdf_mac_addr)); } return; @@ -12767,7 +12767,7 @@ QDF_STATUS csr_roam_set_psk_pmk(tpAniSirGlobal pMac, uint32_t sessionId, sms_log(pMac, LOGE, FL("session %d not found"), sessionId); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(pSession->psk_pmk, pPSK_PMK, sizeof(pSession->psk_pmk)); + qdf_mem_copy(pSession->psk_pmk, pPSK_PMK, sizeof(pSession->psk_pmk)); pSession->pmk_len = pmk_len; return QDF_STATUS_SUCCESS; } @@ -12779,7 +12779,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) { WLAN_HOST_DIAG_EVENT_DEF(secEvent, host_event_wlan_security_payload_type); - cdf_mem_set(&secEvent, + qdf_mem_set(&secEvent, sizeof(host_event_wlan_security_payload_type), 0); secEvent.eventId = WLAN_SECURITY_EVENT_PMKID_UPDATE; secEvent.encryptionModeMulticast = @@ -12788,7 +12788,7 @@ csr_roam_diag_set_pmkid(tCsrRoamSession *pSession) secEvent.encryptionModeUnicast = (uint8_t) diag_enc_type_from_csr_type( pSession->connectedProfile.EncryptionType); - cdf_mem_copy(secEvent.bssid, + qdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t) diag_auth_type_from_csr_type( @@ -12823,7 +12823,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, if (update_entire_cache) { if (numItems && pPMKIDCache) { pSession->NumPmkidCache = (uint16_t) numItems; - cdf_mem_copy(pSession->PmkidCacheInfo, pPMKIDCache, + qdf_mem_copy(pSession->PmkidCacheInfo, pPMKIDCache, sizeof(tPmkidCacheInfo) * numItems); pSession->curr_cache_idx = (uint16_t)numItems; } @@ -12841,7 +12841,7 @@ csr_roam_set_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, qdf_copy_macaddr( &pSession->PmkidCacheInfo[pSession->curr_cache_idx].BSSID, &pmksa->BSSID); - cdf_mem_copy( + qdf_mem_copy( pSession->PmkidCacheInfo[pSession->curr_cache_idx].PMKID, pmksa->PMKID, CSR_RSN_PMKID_SIZE); @@ -12882,7 +12882,7 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, if (flush_cache) { /* Flush the entire cache */ - cdf_mem_zero(pSession->PmkidCacheInfo, + qdf_mem_zero(pSession->PmkidCacheInfo, sizeof(tPmkidCacheInfo) * CSR_MAX_PMKID_ALLOWED); pSession->NumPmkidCache = 0; pSession->curr_cache_idx = 0; @@ -12891,12 +12891,12 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, /* !flush_cache - so look up in the cache */ for (Index = 0; Index < CSR_MAX_PMKID_ALLOWED; Index++) { - if (cdf_mem_compare(pSession->PmkidCacheInfo[Index].BSSID.bytes, + if (!qdf_mem_cmp(pSession->PmkidCacheInfo[Index].BSSID.bytes, pBSSId, QDF_MAC_ADDR_SIZE)) { fMatchFound = 1; /* Clear this - the matched entry */ - cdf_mem_zero(&pSession->PmkidCacheInfo[Index], + qdf_mem_zero(&pSession->PmkidCacheInfo[Index], sizeof(tPmkidCacheInfo)); break; } @@ -12912,23 +12912,23 @@ QDF_STATUS csr_roam_del_pmkid_from_cache(tpAniSirGlobal pMac, curr_idx = pSession->curr_cache_idx; if (Index < curr_idx) { for (i = Index; i < (curr_idx - 1); i++) { - cdf_mem_copy(&pSession->PmkidCacheInfo[i], + qdf_mem_copy(&pSession->PmkidCacheInfo[i], &pSession->PmkidCacheInfo[i + 1], sizeof(tPmkidCacheInfo)); } pSession->curr_cache_idx--; - cdf_mem_zero(&pSession->PmkidCacheInfo + qdf_mem_zero(&pSession->PmkidCacheInfo [pSession->curr_cache_idx], sizeof(tPmkidCacheInfo)); } else if (Index > curr_idx) { for (i = Index; i > (curr_idx); i--) { - cdf_mem_copy(&pSession->PmkidCacheInfo[i], + qdf_mem_copy(&pSession->PmkidCacheInfo[i], &pSession->PmkidCacheInfo[i - 1], sizeof(tPmkidCacheInfo)); } - cdf_mem_zero(&pSession->PmkidCacheInfo + qdf_mem_zero(&pSession->PmkidCacheInfo [pSession->curr_cache_idx], sizeof(tPmkidCacheInfo)); } @@ -12982,7 +12982,7 @@ QDF_STATUS csr_roam_get_pmkid_cache(tpAniSirGlobal pMac, uint32_t sessionId, /* Fill the valid entries */ pmksa = &pSession->PmkidCacheInfo[i]; if (!qdf_is_macaddr_zero(&pmksa->BSSID)) { - cdf_mem_copy(pPmkidCache, pmksa, + qdf_mem_copy(pPmkidCache, pmksa, sizeof(tPmkidCacheInfo)); pPmkidCache++; j++; @@ -13010,7 +13010,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, *pLen = pSession->nWpaRsnReqIeLength; if (pBuf) { if (len >= pSession->nWpaRsnReqIeLength) { - cdf_mem_copy(pBuf, pSession->pWpaRsnReqIE, + qdf_mem_copy(pBuf, pSession->pWpaRsnReqIE, pSession->nWpaRsnReqIeLength); status = QDF_STATUS_SUCCESS; } @@ -13036,7 +13036,7 @@ QDF_STATUS csr_roam_get_wpa_rsn_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, *pLen = pSession->nWpaRsnRspIeLength; if (pBuf) { if (len >= pSession->nWpaRsnRspIeLength) { - cdf_mem_copy(pBuf, pSession->pWpaRsnRspIE, + qdf_mem_copy(pBuf, pSession->pWpaRsnRspIE, pSession->nWpaRsnRspIeLength); status = QDF_STATUS_SUCCESS; } @@ -13063,7 +13063,7 @@ QDF_STATUS csr_roam_get_wapi_req_ie(tpAniSirGlobal pMac, uint32_t sessionId, *pLen = pSession->nWapiReqIeLength; if (pBuf) { if (len >= pSession->nWapiReqIeLength) { - cdf_mem_copy(pBuf, pSession->pWapiReqIE, + qdf_mem_copy(pBuf, pSession->pWapiReqIE, pSession->nWapiReqIeLength); status = QDF_STATUS_SUCCESS; } @@ -13089,7 +13089,7 @@ QDF_STATUS csr_roam_get_wapi_rsp_ie(tpAniSirGlobal pMac, uint32_t sessionId, *pLen = pSession->nWapiRspIeLength; if (pBuf) { if (len >= pSession->nWapiRspIeLength) { - cdf_mem_copy(pBuf, pSession->pWapiRspIE, + qdf_mem_copy(pBuf, pSession->pWapiRspIE, pSession->nWapiRspIeLength); status = QDF_STATUS_SUCCESS; } @@ -13134,29 +13134,29 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, * Prepare the filter. Only fill in the necessary fields. Not all fields * are needed */ - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); - pScanFilter->BSSIDs.bssid = cdf_mem_malloc(sizeof(struct qdf_mac_addr)); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + pScanFilter->BSSIDs.bssid = qdf_mem_malloc(sizeof(struct qdf_mac_addr)); if (NULL == pScanFilter->BSSIDs.bssid) { - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pScanFilter->BSSIDs.bssid, + qdf_mem_copy(pScanFilter->BSSIDs.bssid, &pConnProfile->bssid, sizeof(struct qdf_mac_addr)); pScanFilter->BSSIDs.numOfBSSIDs = 1; if (!csr_is_nullssid(pConnProfile->SSID.ssId, pConnProfile->SSID.length)) { - pScanFilter->SSIDs.SSIDList = cdf_mem_malloc( + pScanFilter->SSIDs.SSIDList = qdf_mem_malloc( sizeof(tCsrSSIDInfo)); if (NULL == pScanFilter->SSIDs.SSIDList) { csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(&pScanFilter->SSIDs.SSIDList[0].SSID, + qdf_mem_copy(&pScanFilter->SSIDs.SSIDList[0].SSID, &pConnProfile->SSID, sizeof(tSirMacSSid)); } pScanFilter->authType.numEntries = 1; @@ -13194,7 +13194,7 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, * need to free the IEs since it is allocated * by csr_match_bss */ - cdf_mem_free(pIes); + qdf_mem_free(pIes); } if (fMatch) { /* We found the one */ @@ -13209,7 +13209,7 @@ csr_roam_remove_connected_bss_from_scan_cache(tpAniSirGlobal pMac, } /* while */ csr_ll_unlock(&pMac->scan.scanResultList); csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } @@ -13246,7 +13246,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); + qdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0); /* Assume HDD provide bssid in profile */ qdf_copy_macaddr(&pSession->bssParams.bssid, pProfile->BSSIDs.bssid); @@ -13259,9 +13259,9 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId, /* Save profile for late use */ csr_free_roam_profile(pMac, sessionId); pSession->pCurRoamProfile = - cdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (pSession->pCurRoamProfile != NULL) { - cdf_mem_set(pSession->pCurRoamProfile, + qdf_mem_set(pSession->pCurRoamProfile, sizeof(tCsrRoamProfile), 0); csr_roam_copy_profile(pMac, pSession->pCurRoamProfile, @@ -13372,7 +13372,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, do { pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS; pSession->joinFailStatusCode.reasonCode = 0; - cdf_mem_copy(&pSession->joinFailStatusCode.bssId, + qdf_mem_copy(&pSession->joinFailStatusCode.bssId, &pBssDescription->bssId, sizeof(tSirMacAddr)); /* * the tSirSmeJoinReq which includes a single @@ -13393,25 +13393,25 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, */ sizeof(tCsrWpaIe) + sizeof(tCsrWpaAuthIe) + sizeof(uint16_t); - csr_join_req = cdf_mem_malloc(msgLen); + csr_join_req = qdf_mem_malloc(msgLen); if (NULL == csr_join_req) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) break; - cdf_mem_set(csr_join_req, msgLen, 0); + qdf_mem_set(csr_join_req, msgLen, 0); csr_join_req->messageType = messageType; csr_join_req->length = msgLen; csr_join_req->sessionId = (uint8_t) sessionId; csr_join_req->transactionId = 0; if (pIes->SSID.present && pIes->SSID.num_ssid) { csr_join_req->ssId.length = pIes->SSID.num_ssid; - cdf_mem_copy(&csr_join_req->ssId.ssId, pIes->SSID.ssid, + qdf_mem_copy(&csr_join_req->ssId.ssId, pIes->SSID.ssid, pIes->SSID.num_ssid); } else csr_join_req->ssId.length = 0; - cdf_mem_copy(&csr_join_req->selfMacAddr, &pSession->selfMacAddr, + qdf_mem_copy(&csr_join_req->selfMacAddr, &pSession->selfMacAddr, sizeof(tSirMacAddr)); sms_log(pMac, LOGE, "Connecting to ssid:%.*s bssid: " @@ -13462,7 +13462,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (OpRateSet.numRates) { csr_join_req->operationalRateSet.numRates = OpRateSet.numRates; - cdf_mem_copy(&csr_join_req->operationalRateSet. + qdf_mem_copy(&csr_join_req->operationalRateSet. rate, OpRateSet.rate, OpRateSet.numRates); } else @@ -13472,7 +13472,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (ExRateSet.numRates) { csr_join_req->extendedRateSet.numRates = ExRateSet.numRates; - cdf_mem_copy(&csr_join_req->extendedRateSet. + qdf_mem_copy(&csr_join_req->extendedRateSet. rate, ExRateSet.rate, ExRateSet.numRates); } else @@ -13522,11 +13522,11 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (ieLen > pSession->nWapiReqIeLength) { if (pSession->pWapiReqIE && pSession->nWapiReqIeLength) { - cdf_mem_free(pSession-> + qdf_mem_free(pSession-> pWapiReqIE); } pSession->pWapiReqIE = - cdf_mem_malloc(ieLen); + qdf_mem_malloc(ieLen); if (NULL == pSession->pWapiReqIE) status = QDF_STATUS_E_NOMEM; else @@ -13535,10 +13535,10 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, break; } pSession->nWapiReqIeLength = ieLen; - cdf_mem_copy(pSession->pWapiReqIE, wpaRsnIE, + qdf_mem_copy(pSession->pWapiReqIE, wpaRsnIE, ieLen); csr_join_req->rsnIE.length = ieLen; - cdf_mem_copy(&csr_join_req->rsnIE.rsnIEdata, + qdf_mem_copy(&csr_join_req->rsnIE.rsnIEdata, wpaRsnIE, ieLen); } else /* should be WPA/WPA2 otherwise */ #endif /* FEATURE_WLAN_WAPI */ @@ -13547,11 +13547,11 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (ieLen > pSession->nWpaRsnReqIeLength) { if (pSession->pWpaRsnReqIE && pSession->nWpaRsnReqIeLength) { - cdf_mem_free(pSession-> + qdf_mem_free(pSession-> pWpaRsnReqIE); } pSession->pWpaRsnReqIE = - cdf_mem_malloc(ieLen); + qdf_mem_malloc(ieLen); if (NULL == pSession->pWpaRsnReqIE) status = QDF_STATUS_E_NOMEM; else @@ -13560,23 +13560,23 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, break; } pSession->nWpaRsnReqIeLength = ieLen; - cdf_mem_copy(pSession->pWpaRsnReqIE, wpaRsnIE, + qdf_mem_copy(pSession->pWpaRsnReqIE, wpaRsnIE, ieLen); csr_join_req->rsnIE.length = ieLen; - cdf_mem_copy(&csr_join_req->rsnIE.rsnIEdata, + qdf_mem_copy(&csr_join_req->rsnIE.rsnIEdata, wpaRsnIE, ieLen); } } else { /* free whatever old info */ pSession->nWpaRsnReqIeLength = 0; if (pSession->pWpaRsnReqIE) { - cdf_mem_free(pSession->pWpaRsnReqIE); + qdf_mem_free(pSession->pWpaRsnReqIE); pSession->pWpaRsnReqIE = NULL; } #ifdef FEATURE_WLAN_WAPI pSession->nWapiReqIeLength = 0; if (pSession->pWapiReqIE) { - cdf_mem_free(pSession->pWapiReqIE); + qdf_mem_free(pSession->pWapiReqIE); pSession->pWapiReqIE = NULL; } #endif /* FEATURE_WLAN_WAPI */ @@ -13591,7 +13591,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, /* Insert the CCKM IE into the join request */ #ifdef FEATURE_WLAN_ESE_UPLOAD ieLen = pSession->suppCckmIeInfo.cckmIeLen; - cdf_mem_copy((void *)(wpaRsnIE), + qdf_mem_copy((void *)(wpaRsnIE), pSession->suppCckmIeInfo.cckmIe, ieLen); #endif /* FEATURE_WLAN_ESE_UPLOAD */ @@ -13607,7 +13607,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, * buffer (wpaRsnIE) */ csr_join_req->cckmIE.length = ieLen; - cdf_mem_copy(&csr_join_req->cckmIE.cckmIEdata, + qdf_mem_copy(&csr_join_req->cckmIE.cckmIEdata, wpaRsnIE, ieLen); } else csr_join_req->cckmIE.length = 0; @@ -13619,9 +13619,9 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (ieLen > pSession->nAddIEScanLength) { if (pSession->pAddIEScan && pSession->nAddIEScanLength) { - cdf_mem_free(pSession->pAddIEScan); + qdf_mem_free(pSession->pAddIEScan); } - pSession->pAddIEScan = cdf_mem_malloc(ieLen); + pSession->pAddIEScan = qdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEScan) status = QDF_STATUS_E_NOMEM; else @@ -13630,15 +13630,15 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, break; } pSession->nAddIEScanLength = ieLen; - cdf_mem_copy(pSession->pAddIEScan, pProfile->pAddIEScan, + qdf_mem_copy(pSession->pAddIEScan, pProfile->pAddIEScan, ieLen); csr_join_req->addIEScan.length = ieLen; - cdf_mem_copy(&csr_join_req->addIEScan.addIEdata, + qdf_mem_copy(&csr_join_req->addIEScan.addIEdata, pProfile->pAddIEScan, ieLen); } else { pSession->nAddIEScanLength = 0; if (pSession->pAddIEScan) { - cdf_mem_free(pSession->pAddIEScan); + qdf_mem_free(pSession->pAddIEScan); pSession->pAddIEScan = NULL; } csr_join_req->addIEScan.length = 0; @@ -13649,9 +13649,9 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (ieLen > pSession->nAddIEAssocLength) { if (pSession->pAddIEAssoc && pSession->nAddIEAssocLength) { - cdf_mem_free(pSession->pAddIEAssoc); + qdf_mem_free(pSession->pAddIEAssoc); } - pSession->pAddIEAssoc = cdf_mem_malloc(ieLen); + pSession->pAddIEAssoc = qdf_mem_malloc(ieLen); if (NULL == pSession->pAddIEAssoc) status = QDF_STATUS_E_NOMEM; else @@ -13660,15 +13660,15 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, break; } pSession->nAddIEAssocLength = ieLen; - cdf_mem_copy(pSession->pAddIEAssoc, + qdf_mem_copy(pSession->pAddIEAssoc, pProfile->pAddIEAssoc, ieLen); csr_join_req->addIEAssoc.length = ieLen; - cdf_mem_copy(&csr_join_req->addIEAssoc.addIEdata, + qdf_mem_copy(&csr_join_req->addIEAssoc.addIEdata, pProfile->pAddIEAssoc, ieLen); } else { pSession->nAddIEAssocLength = 0; if (pSession->pAddIEAssoc) { - cdf_mem_free(pSession->pAddIEAssoc); + qdf_mem_free(pSession->pAddIEAssoc); pSession->pAddIEAssoc = NULL; } csr_join_req->addIEAssoc.length = 0; @@ -13746,8 +13746,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, * ESE-Tspec IEs in the ASSOC request is presently not * supported. so nullify the TSPEC parameters */ - cdf_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); - cdf_mem_copy(&csr_join_req->eseTspecInfo, + qdf_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); + qdf_mem_copy(&csr_join_req->eseTspecInfo, &eseTspec, sizeof(tESETspecInfo)); } else if (eWNI_SME_REASSOC_REQ == messageType) { if ((csr_is_profile_ese(pProfile) || @@ -13756,7 +13756,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, eCSR_AUTH_TYPE_OPEN_SYSTEM))) && (ese_config)) { tESETspecInfo eseTspec; - cdf_mem_set(&eseTspec, sizeof(tESETspecInfo), + qdf_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); eseTspec.numTspecs = sme_qos_ese_retrieve_tspec_info(pMac, @@ -13766,7 +13766,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, csr_join_req->eseTspecInfo.numTspecs = eseTspec.numTspecs; if (eseTspec.numTspecs) { - cdf_mem_copy(&csr_join_req->eseTspecInfo + qdf_mem_copy(&csr_join_req->eseTspecInfo .tspec[0], &eseTspec.tspec[0], (eseTspec.numTspecs * @@ -13779,9 +13779,9 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, * presently not supported. so nullify the TSPEC * parameters */ - cdf_mem_set(&eseTspec, sizeof(tESETspecInfo), + qdf_mem_set(&eseTspec, sizeof(tESETspecInfo), 0); - cdf_mem_copy(&csr_join_req->eseTspecInfo, + qdf_mem_copy(&csr_join_req->eseTspecInfo, &eseTspec, sizeof(tESETspecInfo)); } @@ -13813,7 +13813,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, (&pIes->Country.triplets[0])); csr_apply_power2_current(pMac); } - cdf_mem_copy(&csr_join_req->htConfig, + qdf_mem_copy(&csr_join_req->htConfig, &pSession->htConfig, sizeof(tSirHTConfig)); #ifdef WLAN_FEATURE_11AC csr_join_req->txBFIniFeatureEnabled = @@ -13870,7 +13870,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, csr_join_req->isOSENConnection = false; /* Fill rrm config parameters */ - cdf_mem_copy(&csr_join_req->rrm_config, + qdf_mem_copy(&csr_join_req->rrm_config, &pMac->rrm.rrmSmeContext.rrmConfig, sizeof(struct rrm_config_param)); @@ -13907,7 +13907,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, csr_join_req->uapsdPerAcBitmask = (uint8_t)pProfile->uapsd_mask; /* Move the entire BssDescription into the join request. */ - cdf_mem_copy(&csr_join_req->bssDescription, pBssDescription, + qdf_mem_copy(&csr_join_req->bssDescription, pBssDescription, pBssDescription->length + sizeof(pBssDescription->length)); @@ -13987,7 +13987,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, /* Clean up the memory in case of any failure */ if (!QDF_IS_STATUS_SUCCESS(status) && (NULL != csr_join_req)) - cdf_mem_free(csr_join_req); + qdf_mem_free(csr_join_req); return status; } @@ -14002,27 +14002,27 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) return QDF_STATUS_E_FAILURE; - pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeDisassocReq)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeDisassocReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeDisassocReq), 0); pMsg->messageType = eWNI_SME_DISASSOC_REQ; pMsg->length = sizeof(tSirSmeDisassocReq); pMsg->sessionId = sessionId; pMsg->transactionId = 0; if ((pSession->pCurRoamProfile != NULL) && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { - cdf_mem_copy(&pMsg->bssid.bytes, + qdf_mem_copy(&pMsg->bssid.bytes, &pSession->selfMacAddr, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&pMsg->peer_macaddr.bytes, + qdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); } else { - cdf_mem_copy(&pMsg->bssid.bytes, + qdf_mem_copy(&pMsg->bssid.bytes, bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&pMsg->peer_macaddr.bytes, + qdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); } pMsg->reasonCode = reasonCode; @@ -14050,17 +14050,17 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeGetAssocSTAsReq *pMsg; - pMsg = cdf_mem_malloc(sizeof(*pMsg)); + pMsg = qdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; pMsg->messageType = eWNI_SME_GET_ASSOC_STAS_REQ; qdf_copy_macaddr(&pMsg->bssid, &bssid); pMsg->modId = modId; - cdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); - cdf_mem_copy(pMsg->pSapEventCallback, + qdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); + qdf_mem_copy(pMsg->pSapEventCallback, pfnSapEventCallback, sizeof(void *)); - cdf_mem_copy(pMsg->pAssocStasArray, pAssocStasBuf, sizeof(void *)); + qdf_mem_copy(pMsg->pAssocStasArray, pAssocStasBuf, sizeof(void *)); pMsg->length = sizeof(*pMsg); status = cds_send_mb_message_to_mac(pMsg); @@ -14077,17 +14077,17 @@ csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId, tSirSmeGetWPSPBCSessionsReq *pMsg; do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeGetWPSPBCSessionsReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeGetWPSPBCSessionsReq)); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) break; - cdf_mem_set(pMsg, sizeof(tSirSmeGetWPSPBCSessionsReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeGetWPSPBCSessionsReq), 0); pMsg->messageType = eWNI_SME_GET_WPSPBC_SESSION_REQ; - cdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); - cdf_mem_copy(pMsg->pSapEventCallback, pfnSapEventCallback, + qdf_mem_copy(pMsg->pUsrContext, pUsrContext, sizeof(void *)); + qdf_mem_copy(pMsg->pSapEventCallback, pfnSapEventCallback, sizeof(void *)); qdf_copy_macaddr(&pMsg->bssid, &bssid); qdf_copy_macaddr(&pMsg->remove_mac, &remove_mac); @@ -14117,13 +14117,13 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi /* Create the message and send to lim */ len = sizeof(tSirChangeBIParams); - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(pMsg, sizeof(tSirChangeBIParams), 0); + qdf_mem_set(pMsg, sizeof(tSirChangeBIParams), 0); pMsg->messageType = eWNI_SME_CHNG_MCC_BEACON_INTERVAL; pMsg->length = len; @@ -14159,13 +14159,13 @@ QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId, /* Create the message and send to lim */ len = sizeof(tSirSetHT2040Mode); - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_set(pMsg, sizeof(tSirSetHT2040Mode), 0); + qdf_mem_set(pMsg, sizeof(tSirSetHT2040Mode), 0); pMsg->messageType = eWNI_SME_SET_HT_2040_MODE; pMsg->length = len; @@ -14193,11 +14193,11 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) return QDF_STATUS_E_FAILURE; - pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeDeauthReq)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeDeauthReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeDeauthReq), 0); pMsg->messageType = eWNI_SME_DEAUTH_REQ; pMsg->length = sizeof(tSirSmeDeauthReq); pMsg->sessionId = sessionId; @@ -14205,16 +14205,16 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, if ((pSession->pCurRoamProfile != NULL) && (CSR_IS_INFRA_AP(pSession->pCurRoamProfile))) { - cdf_mem_copy(&pMsg->bssid, + qdf_mem_copy(&pMsg->bssid, &pSession->selfMacAddr, QDF_MAC_ADDR_SIZE); } else { - cdf_mem_copy(&pMsg->bssid, + qdf_mem_copy(&pMsg->bssid, bssId, QDF_MAC_ADDR_SIZE); } /* Set the peer MAC address before sending the message to LIM */ - cdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE); pMsg->reasonCode = reasonCode; return cds_send_mb_message_to_mac(pMsg); @@ -14226,14 +14226,14 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDisassocCnf *pMsg; do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeDisassocCnf)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeDisassocCnf)); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) break; - cdf_mem_set(pMsg, sizeof(tSirSmeDisassocCnf), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeDisassocCnf), 0); pMsg->messageType = eWNI_SME_DISASSOC_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDisassocCnf); @@ -14241,14 +14241,14 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac, &pDisassocInd->peer_macaddr); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); break; } qdf_copy_macaddr(&pMsg->bssid, &pDisassocInd->bssid); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); break; } @@ -14263,28 +14263,28 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirSmeDeauthCnf *pMsg; do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeDeauthCnf)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeDeauthCnf)); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) break; - cdf_mem_set(pMsg, sizeof(tSirSmeDeauthCnf), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeDeauthCnf), 0); pMsg->messageType = eWNI_SME_DEAUTH_CNF; pMsg->statusCode = eSIR_SME_SUCCESS; pMsg->length = sizeof(tSirSmeDeauthCnf); qdf_copy_macaddr(&pMsg->bssid, &pDeauthInd->bssid); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); break; } qdf_copy_macaddr(&pMsg->peer_macaddr, &pDeauthInd->peer_macaddr); status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); break; } status = cds_send_mb_message_to_mac(pMsg); @@ -14302,10 +14302,10 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn FL("Posting eWNI_SME_ASSOC_CNF to LIM.HalStatus :%d"), Halstatus); do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocCnf)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeAssocCnf)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeAssocCnf), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeAssocCnf), 0); pMsg->messageType = eWNI_SME_ASSOC_CNF; pMsg->length = sizeof(tSirSmeAssocCnf); if (QDF_IS_STATUS_SUCCESS(Halstatus)) @@ -14313,15 +14313,15 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn else pMsg->statusCode = eSIR_SME_ASSOC_REFUSED; /* bssId */ - cdf_mem_copy(pMsg->bssid.bytes, pAssocInd->bssId, + qdf_mem_copy(pMsg->bssid.bytes, pAssocInd->bssId, QDF_MAC_ADDR_SIZE); /* peerMacAddr */ - cdf_mem_copy(pMsg->peer_macaddr.bytes, pAssocInd->peerMacAddr, + qdf_mem_copy(pMsg->peer_macaddr.bytes, pAssocInd->peerMacAddr, QDF_MAC_ADDR_SIZE); /* aid */ pMsg->aid = pAssocInd->aid; /* alternateBssId */ - cdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId, + qdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId, QDF_MAC_ADDR_SIZE); /* alternateChannelId */ pMsg->alternateChannelId = 11; @@ -14342,10 +14342,10 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, tSirResultCodes statusCode; uint16_t wTmp; do { - pMsg = cdf_mem_malloc(sizeof(tSirSmeAssocIndToUpperLayerCnf)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeAssocIndToUpperLayerCnf)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeAssocIndToUpperLayerCnf), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeAssocIndToUpperLayerCnf), 0); pMsg->messageType = eWNI_SME_UPPER_LAYER_ASSOC_CNF; pMsg->length = sizeof(tSirSmeAssocIndToUpperLayerCnf); @@ -14357,22 +14357,22 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, statusCode = eSIR_SME_SUCCESS; else statusCode = eSIR_SME_ASSOC_REFUSED; - cdf_mem_copy(pBuf, &statusCode, sizeof(tSirResultCodes)); + qdf_mem_copy(pBuf, &statusCode, sizeof(tSirResultCodes)); pBuf += sizeof(tSirResultCodes); /* bssId */ - cdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->bssId, + qdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->bssId, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); /* peerMacAddr */ - cdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->peerMacAddr, + qdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->peerMacAddr, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); /* StaId */ wTmp = pAssocInd->staId; - cdf_mem_copy(pBuf, &wTmp, sizeof(uint16_t)); + qdf_mem_copy(pBuf, &wTmp, sizeof(uint16_t)); pBuf += sizeof(uint16_t); /* alternateBssId */ - cdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->bssId, + qdf_mem_copy((tSirMacAddr *) pBuf, pAssocInd->bssId, sizeof(tSirMacAddr)); pBuf += sizeof(tSirMacAddr); /* alternateChannelId */ @@ -14383,17 +14383,17 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, *pBuf = pAssocInd->wmmEnabledSta; pBuf += sizeof(uint8_t); /* RSN IE */ - cdf_mem_copy((tSirRSNie *) pBuf, &pAssocInd->rsnIE, + qdf_mem_copy((tSirRSNie *) pBuf, &pAssocInd->rsnIE, sizeof(tSirRSNie)); pBuf += sizeof(tSirRSNie); #ifdef FEATURE_WLAN_WAPI /* WAPI IE */ - cdf_mem_copy((tSirWAPIie *) pBuf, &pAssocInd->wapiIE, + qdf_mem_copy((tSirWAPIie *) pBuf, &pAssocInd->wapiIE, sizeof(tSirWAPIie)); pBuf += sizeof(tSirWAPIie); #endif /* Additional IE */ - cdf_mem_copy((void *)pBuf, &pAssocInd->addIE, + qdf_mem_copy((void *)pBuf, &pAssocInd->addIE, sizeof(tSirAddie)); pBuf += sizeof(tSirAddie); /* reassocReq */ @@ -14402,7 +14402,7 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(tpAniSirGlobal pMac, /* timingMeasCap */ *pBuf = pAssocInd->timingMeasCap; pBuf += sizeof(uint8_t); - cdf_mem_copy((void *)pBuf, &pAssocInd->chan_info, + qdf_mem_copy((void *)pBuf, &pAssocInd->chan_info, sizeof(tSirSmeChanInfo)); msgQ.type = eWNI_SME_UPPER_LAYER_ASSOC_CNF; msgQ.bodyptr = pMsg; @@ -14438,10 +14438,10 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, */ msgLen = sizeof(struct sSirSmeSetContextReq); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, msgLen, 0); + qdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SETCONTEXT_REQ; pMsg->length = msgLen; pMsg->sessionId = (uint8_t) sessionId; @@ -14467,13 +14467,13 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, pMsg->keyMaterial.key[0].keyId = keyId; pMsg->keyMaterial.key[0].unicast = fUnicast; pMsg->keyMaterial.key[0].keyDirection = aniKeyDirection; - cdf_mem_copy(pMsg->keyMaterial.key[0].keyRsc, + qdf_mem_copy(pMsg->keyMaterial.key[0].keyRsc, pKeyRsc, CSR_MAX_RSC_LEN); /* 0 is Supplicant */ pMsg->keyMaterial.key[0].paeRole = paeRole; pMsg->keyMaterial.key[0].keyLength = keyLength; if (keyLength && pKey) { - cdf_mem_copy(pMsg->keyMaterial.key[0].key, + qdf_mem_copy(pMsg->keyMaterial.key[0].key, pKey, keyLength); sms_log(pMac, LOG1, FL("SME set keyIndx (%d) encType (%d) key"), @@ -14502,11 +14502,11 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS; pSession->joinFailStatusCode.reasonCode = 0; - pMsg = cdf_mem_malloc(sizeof(tSirSmeStartBssReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeStartBssReq)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeStartBssReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeStartBssReq), 0); pMsg->messageType = eWNI_SME_START_BSS_REQ; pMsg->sessionId = sessionId; pMsg->length = sizeof(tSirSmeStartBssReq); @@ -14534,7 +14534,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId } else { sms_log(pMac, LOGE, FL("****Start BSS failed persona already exists***")); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return QDF_STATUS_E_FAILURE; } pMsg->beaconInterval = wTmp; @@ -14545,7 +14545,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId pMsg->cc_switch_mode = pMac->roam.configParam.cc_switch_mode; #endif pMsg->bssType = csr_translate_bsstype_to_mac_type(bssType); - cdf_mem_copy(&pMsg->ssId, &pParam->ssId, sizeof(pParam->ssId)); + qdf_mem_copy(&pMsg->ssId, &pParam->ssId, sizeof(pParam->ssId)); pMsg->channelId = pParam->operationChn; /* What should we really do for the cbmode. */ pMsg->cbMode = (ePhyChanBondState) pParam->cbMode; @@ -14577,24 +14577,24 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId #endif if (pParam->nRSNIELength > sizeof(pMsg->rsnIE.rsnIEdata)) { - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return QDF_STATUS_E_INVAL; } pMsg->rsnIE.length = pParam->nRSNIELength; - cdf_mem_copy(pMsg->rsnIE.rsnIEdata, + qdf_mem_copy(pMsg->rsnIE.rsnIEdata, pParam->pRSNIE, pParam->nRSNIELength); pMsg->nwType = (tSirNwType)pParam->sirNwType; - cdf_mem_copy(&pMsg->operationalRateSet, + qdf_mem_copy(&pMsg->operationalRateSet, &pParam->operationalRateSet, sizeof(tSirMacRateSet)); - cdf_mem_copy(&pMsg->extendedRateSet, + qdf_mem_copy(&pMsg->extendedRateSet, &pParam->extendedRateSet, sizeof(tSirMacRateSet)); - cdf_mem_copy(&pMsg->htConfig, + qdf_mem_copy(&pMsg->htConfig, &pSession->htConfig, sizeof(tSirHTConfig)); - cdf_mem_copy(&pMsg->addIeParams, + qdf_mem_copy(&pMsg->addIeParams, &pParam->addIeParams, sizeof(pParam->addIeParams)); pMsg->obssEnabled = pMac->roam.configParam.obssEnabled; @@ -14613,10 +14613,10 @@ QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId) return QDF_STATUS_E_FAILURE; } - pMsg = cdf_mem_malloc(sizeof(tSirSmeStopBssReq)); + pMsg = qdf_mem_malloc(sizeof(tSirSmeStopBssReq)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirSmeStopBssReq), 0); + qdf_mem_set(pMsg, sizeof(tSirSmeStopBssReq), 0); pMsg->messageType = eWNI_SME_STOP_BSS_REQ; pMsg->sessionId = sessionId; pMsg->length = sizeof(tSirSmeStopBssReq); @@ -14634,7 +14634,7 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, uint32_t roamId = 0; tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); if ((csr_is_conn_state_connected(pMac, sessionId)) && - (fForce || (!cdf_mem_compare(&pModProfileFields, + (fForce || (qdf_mem_cmp(&pModProfileFields, &pSession->connectedProfile. modifyProfileFields, sizeof(tCsrRoamModifyProfileFields))))) { @@ -14657,7 +14657,7 @@ static QDF_STATUS csr_roam_session_opened(tpAniSirGlobal pMac, { QDF_STATUS status = QDF_STATUS_SUCCESS; tCsrRoamInfo roamInfo; - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); status = csr_roam_call_callback(pMac, sessionId, &roamInfo, 0, eCSR_ROAM_SESSION_OPENED, eCSR_ROAM_RESULT_NONE); @@ -14696,13 +14696,13 @@ QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg) (WMI_VDEV_TYPE_AP == rsp->type && WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE == rsp->sub_type))) { sms_log(pMac, LOG1, FL("send SET IE msg to PE")); - msg = cdf_mem_malloc(sizeof(*msg)); + msg = qdf_mem_malloc(sizeof(*msg)); if (NULL == msg) { sms_log(pMac, LOGE, FL("Memory allocation failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(msg, sizeof(*msg), 0); + qdf_mem_set(msg, sizeof(*msg), 0); msg->msg_type = eWNI_SME_SET_IE_REQ; msg->session_id = rsp->session_id; msg->length = sizeof(*msg); @@ -14735,7 +14735,7 @@ QDF_STATUS csr_issue_add_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi } else { pCommand->command = eSmeCommandAddStaSession; pCommand->sessionId = (uint8_t) sessionId; - cdf_mem_copy(pCommand->u.addStaSessionCmd.selfMacAddr, + qdf_mem_copy(pCommand->u.addStaSessionCmd.selfMacAddr, sessionMacAddr, sizeof(tSirMacAddr)); pCommand->u.addStaSessionCmd.currDeviceMode = pMac->sme.currDeviceMode; @@ -14761,7 +14761,7 @@ QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_E_NOMEM; tSirMsgQ msg; - add_sta_self_req = cdf_mem_malloc(sizeof(struct add_sta_self_params)); + add_sta_self_req = qdf_mem_malloc(sizeof(struct add_sta_self_params)); if (NULL == add_sta_self_req) { lim_log(pMac, LOGP, FL @@ -14769,7 +14769,7 @@ QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, return status; } - cdf_mem_copy(add_sta_self_req->self_mac_addr, pAddStaReq->selfMacAddr, + qdf_mem_copy(add_sta_self_req->self_mac_addr, pAddStaReq->selfMacAddr, sizeof(tSirMacAddr)); add_sta_self_req->curr_device_mode = pAddStaReq->currDeviceMode; add_sta_self_req->session_id = sessionId; @@ -14790,7 +14790,7 @@ QDF_STATUS csr_process_add_sta_session_command(tpAniSirGlobal pMac, if (status != QDF_STATUS_SUCCESS) { lim_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); - cdf_mem_free(add_sta_self_req); + qdf_mem_free(add_sta_self_req); add_sta_self_req = NULL; } return status; @@ -14830,7 +14830,7 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, pSession->callback = callback; pSession->pContext = pContext; - cdf_mem_copy(&pSession->selfMacAddr, pSelfMacAddr, + qdf_mem_copy(&pSession->selfMacAddr, pSelfMacAddr, sizeof(struct qdf_mac_addr)); *pbSessionId = (uint8_t) i; status = @@ -14958,7 +14958,7 @@ QDF_STATUS csr_issue_del_sta_for_session_req(tpAniSirGlobal pMac, uint32_t sessi pCommand->sessionId = (uint8_t) sessionId; pCommand->u.delStaSessionCmd.callback = callback; pCommand->u.delStaSessionCmd.pContext = pContext; - cdf_mem_copy(pCommand->u.delStaSessionCmd.selfMacAddr, + qdf_mem_copy(pCommand->u.delStaSessionCmd.selfMacAddr, sessionMacAddr, sizeof(tSirMacAddr)); status = csr_queue_sme_command(pMac, pCommand, true); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -14976,14 +14976,14 @@ QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, struct del_sta_self_params *del_sta_self_req; tSirMsgQ msg; QDF_STATUS status = QDF_STATUS_E_FAILURE; - del_sta_self_req = cdf_mem_malloc(sizeof(struct del_sta_self_params)); + del_sta_self_req = qdf_mem_malloc(sizeof(struct del_sta_self_params)); if (NULL == del_sta_self_req) { lim_log(pMac, LOGP, FL(" mem alloc failed for tDelStaSelfParams")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(del_sta_self_req->self_mac_addr, + qdf_mem_copy(del_sta_self_req->self_mac_addr, pCommand->u.delStaSessionCmd.selfMacAddr, sizeof(tSirMacAddr)); @@ -14999,7 +14999,7 @@ QDF_STATUS csr_process_del_sta_session_command(tpAniSirGlobal pMac, status = wma_post_ctrl_msg(pMac, &msg); if (status != QDF_STATUS_SUCCESS) { sms_log(pMac, LOGP, FL("wma_post_ctrl_msg failed")); - cdf_mem_free(del_sta_self_req); + qdf_mem_free(del_sta_self_req); } return status; } @@ -15011,7 +15011,7 @@ static void purge_csr_session_cmd_list(tpAniSirGlobal pMac, uint32_t sessionId) tSmeCmd *pCommand; tDblLinkList localList; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; @@ -15112,36 +15112,36 @@ static void csr_init_session(tpAniSirGlobal pMac, uint32_t sessionId) csr_roam_free_connected_info(pMac, &pSession->connectedInfo); csr_free_connect_bss_desc(pMac, sessionId); csr_scan_enable(pMac); - cdf_mem_set(&pSession->selfMacAddr, sizeof(struct qdf_mac_addr), 0); + qdf_mem_set(&pSession->selfMacAddr, sizeof(struct qdf_mac_addr), 0); if (pSession->pWpaRsnReqIE) { - cdf_mem_free(pSession->pWpaRsnReqIE); + qdf_mem_free(pSession->pWpaRsnReqIE); pSession->pWpaRsnReqIE = NULL; } pSession->nWpaRsnReqIeLength = 0; if (pSession->pWpaRsnRspIE) { - cdf_mem_free(pSession->pWpaRsnRspIE); + qdf_mem_free(pSession->pWpaRsnRspIE); pSession->pWpaRsnRspIE = NULL; } pSession->nWpaRsnRspIeLength = 0; #ifdef FEATURE_WLAN_WAPI if (pSession->pWapiReqIE) { - cdf_mem_free(pSession->pWapiReqIE); + qdf_mem_free(pSession->pWapiReqIE); pSession->pWapiReqIE = NULL; } pSession->nWapiReqIeLength = 0; if (pSession->pWapiRspIE) { - cdf_mem_free(pSession->pWapiRspIE); + qdf_mem_free(pSession->pWapiRspIE); pSession->pWapiRspIE = NULL; } pSession->nWapiRspIeLength = 0; #endif /* FEATURE_WLAN_WAPI */ if (pSession->pAddIEScan) { - cdf_mem_free(pSession->pAddIEScan); + qdf_mem_free(pSession->pAddIEScan); pSession->pAddIEScan = NULL; } pSession->nAddIEScanLength = 0; if (pSession->pAddIEAssoc) { - cdf_mem_free(pSession->pAddIEAssoc); + qdf_mem_free(pSession->pAddIEAssoc); pSession->pAddIEAssoc = NULL; } pSession->nAddIEAssocLength = 0; @@ -15310,7 +15310,7 @@ void csr_roam_pe_stats_timer_handler(void *pv) ("csr_roam_pe_stats_timer_handler:failed to destroy hPeStatsTimer timer")); } /* Free the entry */ - cdf_mem_free(pPeStatsReqListEntry); + qdf_mem_free(pPeStatsReqListEntry); pPeStatsReqListEntry = NULL; } else { if (!pPeStatsReqListEntry->rspPending) { @@ -15376,7 +15376,7 @@ QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask, { tAniGetPEStatsReq *pMsg; QDF_STATUS status = QDF_STATUS_SUCCESS; - pMsg = cdf_mem_malloc(sizeof(tAniGetPEStatsReq)); + pMsg = qdf_mem_malloc(sizeof(tAniGetPEStatsReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, FL("Failed to allocate mem for stats req ")); return QDF_STATUS_E_NOMEM; @@ -15415,28 +15415,28 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, switch (stats_type) { case eCsrSummaryStats: sms_log(mac, LOG2, FL("summary stats")); - cdf_mem_copy((uint8_t *) &mac->roam.summaryStatsInfo, *stats, + qdf_mem_copy((uint8_t *) &mac->roam.summaryStatsInfo, *stats, sizeof(tCsrSummaryStatsInfo)); *stats += sizeof(tCsrSummaryStatsInfo); *length -= sizeof(tCsrSummaryStatsInfo); break; case eCsrGlobalClassAStats: sms_log(mac, LOG2, FL("ClassA stats")); - cdf_mem_copy((uint8_t *) &mac->roam.classAStatsInfo, *stats, + qdf_mem_copy((uint8_t *) &mac->roam.classAStatsInfo, *stats, sizeof(tCsrGlobalClassAStatsInfo)); *stats += sizeof(tCsrGlobalClassAStatsInfo); *length -= sizeof(tCsrGlobalClassAStatsInfo); break; case eCsrGlobalClassBStats: sms_log(mac, LOG2, FL("ClassB stats")); - cdf_mem_copy((uint8_t *) &mac->roam.classBStatsInfo, *stats, + qdf_mem_copy((uint8_t *) &mac->roam.classBStatsInfo, *stats, sizeof(tCsrGlobalClassBStatsInfo)); *stats += sizeof(tCsrGlobalClassBStatsInfo); *length -= sizeof(tCsrGlobalClassBStatsInfo); break; case eCsrGlobalClassCStats: sms_log(mac, LOG2, FL("ClassC stats")); - cdf_mem_copy((uint8_t *) &mac->roam.classCStatsInfo, *stats, + qdf_mem_copy((uint8_t *) &mac->roam.classCStatsInfo, *stats, sizeof(tCsrGlobalClassCStatsInfo)); *stats += sizeof(tCsrGlobalClassCStatsInfo); *length -= sizeof(tCsrGlobalClassCStatsInfo); @@ -15444,7 +15444,7 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type, case eCsrPerStaStats: sms_log(mac, LOG2, FL("PerSta stats")); if (CSR_MAX_STA > sme_stats_rsp->staId) { - cdf_mem_copy( + qdf_mem_copy( &mac->roam.perStaStatsInfo[sme_stats_rsp->staId], *stats, sizeof(tCsrPerStaStatsInfo)); } else { @@ -15704,7 +15704,7 @@ tCsrStatsClientReqInfo *csr_roam_insert_entry_into_list(tpAniSirGlobal pMac, /* callback update it */ if (NULL == csr_roam_checkn_update_client_req_list(pMac, pStaEntry, true)) { - pNewStaEntry = cdf_mem_malloc(sizeof(tCsrStatsClientReqInfo)); + pNewStaEntry = qdf_mem_malloc(sizeof(tCsrStatsClientReqInfo)); if (NULL == pNewStaEntry) { sms_log(pMac, LOGW, "csr_roam_insert_entry_into_list: couldn't allocate memory for the " @@ -15734,7 +15734,7 @@ tCsrPeStatsReqInfo *csr_roam_insert_entry_into_pe_stats_req_list(tpAniSirGlobal pStaEntry) { tCsrPeStatsReqInfo *pNewStaEntry = NULL; - pNewStaEntry = cdf_mem_malloc(sizeof(tCsrPeStatsReqInfo)); + pNewStaEntry = qdf_mem_malloc(sizeof(tCsrPeStatsReqInfo)); if (NULL == pNewStaEntry) { sms_log(pMac, LOGW, "csr_roam_insert_entry_into_pe_stats_req_list: couldn't allocate memory for the " @@ -15775,7 +15775,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, return QDF_STATUS_E_FAILURE; } - pMsg = cdf_mem_malloc(sizeof(tAniGetRssiReq)); + pMsg = qdf_mem_malloc(sizeof(tAniGetRssiReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_get_rssi: failed to allocate mem for req "); @@ -15799,7 +15799,7 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, msg.reserved = 0; if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_get_rssi failed to post msg to self "); - cdf_mem_free((void *)pMsg); + qdf_mem_free((void *)pMsg); status = QDF_STATUS_E_FAILURE; } sms_log(pMac, LOG2, FL("returned")); @@ -15818,7 +15818,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, sms_log(pMac, LOG2, FL("called")); - pMsg = (tAniGetSnrReq *) cdf_mem_malloc(sizeof(tAniGetSnrReq)); + pMsg = (tAniGetSnrReq *) qdf_mem_malloc(sizeof(tAniGetSnrReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, "%s: failed to allocate mem for req", __func__); @@ -15839,7 +15839,7 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, "%s failed to post msg to self", __func__); - cdf_mem_free((void *)pMsg); + qdf_mem_free((void *)pMsg); status = QDF_STATUS_E_FAILURE; } @@ -15856,7 +15856,7 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, { QDF_STATUS status = QDF_STATUS_SUCCESS; tAniGetTsmStatsReq *pMsg = NULL; - pMsg = cdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); + pMsg = qdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); if (!pMsg) { sms_log(pMac, LOGE, "csr_get_tsm_stats: failed to allocate mem for req"); @@ -16173,13 +16173,13 @@ csr_roam_scan_offload_populate_mac_header(tpAniSirGlobal pMac, pMacHdr->fc.subType = subType; /* Prepare Address 1 */ - cdf_mem_copy((uint8_t *) pMacHdr->da, (uint8_t *) peerAddr, + qdf_mem_copy((uint8_t *) pMacHdr->da, (uint8_t *) peerAddr, sizeof(tSirMacAddr)); sir_copy_mac_addr(pMacHdr->sa, selfMacAddr); /* Prepare Address 3 */ - cdf_mem_copy((uint8_t *) pMacHdr->bssId, (uint8_t *) peerAddr, + qdf_mem_copy((uint8_t *) pMacHdr->bssId, (uint8_t *) peerAddr, sizeof(tSirMacAddr)); return statusCode; } /*** csr_roam_scan_offload_populate_mac_header() ***/ @@ -16200,7 +16200,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, tSirMacAddr bssId = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - cdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); + qdf_mem_set((uint8_t *) &pr, sizeof(pr), 0); populate_dot11f_supp_rates(pMac, nChannelNum, &pr.SuppRates, NULL); @@ -16236,7 +16236,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, nBytes = nPayload + sizeof(tSirMacMgmtHdr); /* Prepare outgoing frame */ - cdf_mem_set(pFrame, nBytes, 0); + qdf_mem_set(pFrame, nBytes, 0); nSirStatus = csr_roam_scan_offload_populate_mac_header(pMac, pFrame, @@ -16297,13 +16297,13 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, tSirRoamOffloadScanReq *req_buf, tCsrRoamSession *session) { - cdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, + qdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, sizeof(req_buf->PSK_PMK)); req_buf->pmk_len = session->pmk_len; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3: PMK Length = %d", req_buf->pmk_len); req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; - cdf_mem_copy(req_buf->R0KH_ID, + qdf_mem_copy(req_buf->R0KH_ID, session->ftSmeContext.r0kh_id, req_buf->R0KH_ID_Length); req_buf->Prefer5GHz = mac_ctx->roam.configParam.nRoamPrefer5GHz; @@ -16319,9 +16319,9 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, } #ifdef FEATURE_WLAN_ESE if (csr_is_auth_type_ese(req_buf->ConnectedNetwork.authentication)) { - cdf_mem_copy(req_buf->KRK, session->eseCckmInfo.krk, + qdf_mem_copy(req_buf->KRK, session->eseCckmInfo.krk, SIR_KRK_KEY_LEN); - cdf_mem_copy(req_buf->BTK, session->eseCckmInfo.btk, + qdf_mem_copy(req_buf->BTK, session->eseCckmInfo.btk, SIR_BTK_KEY_LEN); } #endif @@ -16590,13 +16590,13 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, || (roam_info->isESEAssoc == false); #endif /* FEATURE_WLAN_ESE */ - req_buf = cdf_mem_malloc(sizeof(tSirRoamOffloadScanReq)); + req_buf = qdf_mem_malloc(sizeof(tSirRoamOffloadScanReq)); if (NULL == req_buf) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Mem alloc for roam scan offload req failed.")); return NULL; } - cdf_mem_zero(req_buf, sizeof(tSirRoamOffloadScanReq)); + qdf_mem_zero(req_buf, sizeof(tSirRoamOffloadScanReq)); req_buf->Command = command; /* * If command is STOP, then pass down ScanOffloadEnabled as Zero. This @@ -16618,12 +16618,12 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, req_buf->RoamScanOffloadEnabled = mac_ctx->roam.configParam.isRoamOffloadScanEnabled; } - cdf_mem_copy(req_buf->ConnectedNetwork.currAPbssid, + qdf_mem_copy(req_buf->ConnectedNetwork.currAPbssid, roam_info->currAPbssid.bytes, sizeof(struct qdf_mac_addr)); req_buf->ConnectedNetwork.ssId.length = mac_ctx->roam.roamSession[session_id]. connectedProfile.SSID.length; - cdf_mem_copy(req_buf->ConnectedNetwork.ssId.ssId, + qdf_mem_copy(req_buf->ConnectedNetwork.ssId.ssId, mac_ctx->roam.roamSession[session_id]. connectedProfile.SSID.ssId, req_buf->ConnectedNetwork.ssId.length); @@ -16684,7 +16684,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, status = csr_fetch_ch_lst_from_ini(mac_ctx, roam_info, req_buf); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(req_buf); + qdf_mem_free(req_buf); return NULL; } } else { @@ -16720,7 +16720,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, /* Maintain the Valid Channels List */ status = csr_fetch_valid_ch_lst(mac_ctx, req_buf); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(req_buf); + qdf_mem_free(req_buf); return NULL; } @@ -16784,7 +16784,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, /* Roam Offload piggybacks upon the Roam Scan offload command. */ if (req_buf->RoamOffloadEnabled) csr_update_roam_scan_offload_request(mac_ctx, req_buf, session); - cdf_mem_copy(&req_buf->roam_params, + qdf_mem_copy(&req_buf->roam_params, &mac_ctx->roam.configParam.roam_params, sizeof(req_buf->roam_params)); #endif @@ -16809,9 +16809,9 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, for (i = 0; i < roam_params->num_ssid_allowed_list; i++) { if ((roam_params->ssid_allowed_list[i].length == req_buffer->ConnectedNetwork.ssId.length) && - cdf_mem_compare(roam_params->ssid_allowed_list[i].ssId, + (!qdf_mem_cmp(roam_params->ssid_allowed_list[i].ssId, req_buffer->ConnectedNetwork.ssId.ssId, - roam_params->ssid_allowed_list[i].length)) { + roam_params->ssid_allowed_list[i].length))) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Whitelist contains connected profile SSID"); match = true; @@ -16829,7 +16829,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer, "Adding Connected profile SSID to whitelist"); /* i is the next available index to add the entry.*/ i = roam_params->num_ssid_allowed_list; - cdf_mem_copy(roam_params->ssid_allowed_list[i].ssId, + qdf_mem_copy(roam_params->ssid_allowed_list[i].ssId, req_buffer->ConnectedNetwork.ssId.ssId, req_buffer->ConnectedNetwork.ssId.length); roam_params->ssid_allowed_list[i].length = @@ -17008,7 +17008,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, req_buf->LookupThreshold = (int8_t)roam_info->cfgParams.neighborLookupThreshold * (-1); - cdf_mem_copy(roam_params_dst, roam_params_src, + qdf_mem_copy(roam_params_dst, roam_params_src, sizeof(struct roam_ext_params)); /* * rssi_diff which is updated via framework is equivalent to the @@ -17090,7 +17090,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: Not able to post message to WMA", __func__); - cdf_mem_free(req_buf); + qdf_mem_free(req_buf); return QDF_STATUS_E_FAILURE; } else { if (ROAM_SCAN_OFFLOAD_START == command) @@ -17155,7 +17155,7 @@ tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, pTempStaEntry->numClient++; found = true; } else { - cdf_mem_set(&staEntry, sizeof(tCsrPeStatsReqInfo), 0); + qdf_mem_set(&staEntry, sizeof(tCsrPeStatsReqInfo), 0); staEntry.numClient = 1; staEntry.periodicity = periodicity; staEntry.pMac = pMac; @@ -17238,7 +17238,7 @@ static void csr_roam_remove_stat_list_entry(tpAniSirGlobal pMac, tListElem *pEnt if (pEntry) { if (csr_ll_remove_entry (&pMac->roam.statsClientReqList, pEntry, LL_ACCESS_LOCK)) { - cdf_mem_free(GET_BASE_ADDR + qdf_mem_free(GET_BASE_ADDR (pEntry, tCsrStatsClientReqInfo, link)); } } @@ -17300,7 +17300,7 @@ void csr_roam_remove_entry_from_pe_stats_req_list(tpAniSirGlobal pMac, * successfully */ if (!pTempStaEntry->timerStopFailed) { - cdf_mem_free(pTempStaEntry); + qdf_mem_free(pTempStaEntry); pTempStaEntry = NULL; } break; @@ -17335,7 +17335,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, switch (counter) { case eCsrSummaryStats: sms_log(pMac, LOG2, FL("Summary stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. summaryStatsInfo, sizeof(tCsrSummaryStatsInfo)); @@ -17343,7 +17343,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, break; case eCsrGlobalClassAStats: sms_log(pMac, LOG2, FL("ClassA stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. classAStatsInfo, sizeof(tCsrGlobalClassAStatsInfo)); @@ -17351,7 +17351,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, break; case eCsrGlobalClassBStats: sms_log(pMac, LOG2, FL("ClassB stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. classBStatsInfo, sizeof(tCsrGlobalClassBStatsInfo)); @@ -17359,7 +17359,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, break; case eCsrGlobalClassCStats: sms_log(pMac, LOG2, FL("ClassC stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. classCStatsInfo, sizeof(tCsrGlobalClassCStatsInfo)); @@ -17367,7 +17367,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, break; case eCsrGlobalClassDStats: sms_log(pMac, LOG2, FL("ClassD stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. classDStatsInfo, sizeof(tCsrGlobalClassDStatsInfo)); @@ -17375,7 +17375,7 @@ void csr_roam_report_statistics(tpAniSirGlobal pMac, uint32_t statsMask, break; case eCsrPerStaStats: sms_log(pMac, LOG2, FL("PerSta stats")); - cdf_mem_copy(pStats, + qdf_mem_copy(pStats, (uint8_t *) &pMac->roam. perStaStatsInfo[staId], sizeof(tCsrPerStaStatsInfo)); @@ -17571,7 +17571,7 @@ QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, return QDF_STATUS_E_FAILURE; } - pMsg = cdf_mem_malloc(sizeof(*pMsg)); + pMsg = qdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; @@ -17579,7 +17579,7 @@ QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId, pMsg->transactionId = 0; qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); pMsg->sessionId = sessionId; - cdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs)); + qdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs)); pMsg->length = sizeof(*pMsg); status = cds_send_mb_message_to_mac(pMsg); @@ -17599,15 +17599,15 @@ QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, return QDF_STATUS_E_FAILURE; } do { - pMsg = cdf_mem_malloc(sizeof(tSirUpdateAPWPARSNIEsReq)); + pMsg = qdf_mem_malloc(sizeof(tSirUpdateAPWPARSNIEsReq)); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, sizeof(tSirUpdateAPWPARSNIEsReq), 0); + qdf_mem_set(pMsg, sizeof(tSirUpdateAPWPARSNIEsReq), 0); pMsg->messageType = eWNI_SME_SET_APWPARSNIEs_REQ; pMsg->transactionId = 0; qdf_copy_macaddr(&pMsg->bssid, &pSession->selfMacAddr); pMsg->sessionId = sessionId; - cdf_mem_copy(&pMsg->APWPARSNIEs, pAPSirRSNie, + qdf_mem_copy(&pMsg->APWPARSNIEs, pAPSirRSNie, sizeof(tSirRSNie)); pMsg->length = sizeof(struct sSirUpdateAPWPARSNIEsReq); status = cds_send_mb_message_to_mac(pMsg); @@ -17632,7 +17632,7 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, } auth_req_len = sizeof(tSirFTPreAuthReq); - pftPreAuthReq = (tpSirFTPreAuthReq) cdf_mem_malloc(auth_req_len); + pftPreAuthReq = (tpSirFTPreAuthReq) qdf_mem_malloc(auth_req_len); if (NULL == pftPreAuthReq) { sms_log(pMac, LOGE, FL("Memory allocation for FT Preauth request failed")); @@ -17640,10 +17640,10 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, } /* Save the SME Session ID here. We need it while processing the preauth response */ pSession->ftSmeContext.smeSessionId = sessionId; - cdf_mem_zero(pftPreAuthReq, auth_req_len); + qdf_mem_zero(pftPreAuthReq, auth_req_len); pftPreAuthReq->pbssDescription = - (tpSirBssDescription) cdf_mem_malloc(sizeof(pBssDescription->length) + (tpSirBssDescription) qdf_mem_malloc(sizeof(pBssDescription->length) + pBssDescription->length); if (NULL == pftPreAuthReq->pbssDescription) { sms_log(pMac, LOGE, @@ -17655,12 +17655,12 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, pftPreAuthReq->preAuthchannelNum = pBssDescription->channelId; - cdf_mem_copy((void *)&pftPreAuthReq->currbssId, + qdf_mem_copy((void *)&pftPreAuthReq->currbssId, (void *)pSession->connectedProfile.bssid.bytes, sizeof(tSirMacAddr)); - cdf_mem_copy((void *)&pftPreAuthReq->preAuthbssId, + qdf_mem_copy((void *)&pftPreAuthReq->preAuthbssId, (void *)pBssDescription->bssId, sizeof(tSirMacAddr)); - cdf_mem_copy((void *)&pftPreAuthReq->self_mac_addr, + qdf_mem_copy((void *)&pftPreAuthReq->self_mac_addr, (void *)&pSession->selfMacAddr.bytes, sizeof(tSirMacAddr)); if (csr_roam_is11r_assoc(pMac, sessionId) && @@ -17668,13 +17668,13 @@ csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, eCSR_AUTH_TYPE_OPEN_SYSTEM)) { pftPreAuthReq->ft_ies_length = (uint16_t) pSession->ftSmeContext.auth_ft_ies_length; - cdf_mem_copy(pftPreAuthReq->ft_ies, + qdf_mem_copy(pftPreAuthReq->ft_ies, pSession->ftSmeContext.auth_ft_ies, pSession->ftSmeContext.auth_ft_ies_length); } else { pftPreAuthReq->ft_ies_length = 0; } - cdf_mem_copy(pftPreAuthReq->pbssDescription, pBssDescription, + qdf_mem_copy(pftPreAuthReq->pbssDescription, pBssDescription, sizeof(pBssDescription->length) + pBssDescription->length); pftPreAuthReq->length = auth_req_len; return cds_send_mb_message_to_mac(pftPreAuthReq); @@ -17744,7 +17744,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, return; } /* Save the received response */ - cdf_mem_copy((void *)&pSession->ftSmeContext.preAuthbssId, + qdf_mem_copy((void *)&pSession->ftSmeContext.preAuthbssId, (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId)) csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, @@ -17757,7 +17757,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, csr_roam_read_tsf(pMac, (uint8_t *) roamInfo.timestamp, pFTPreAuthRsp->smeSessionId); /* Save the bssid from the received response */ - cdf_mem_copy((void *)&roamInfo.bssid, + qdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, @@ -17770,7 +17770,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, /* So he can send us a PMK-ID for this candidate AP. */ if (csr_roam_is_fast_roam_enabled(pMac, pFTPreAuthRsp->smeSessionId)) { /* Save the bssid from the received response */ - cdf_mem_copy((void *)&roamInfo.bssid, + qdf_mem_copy((void *)&roamInfo.bssid, (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, @@ -17794,7 +17794,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, if ((pSession->ftSmeContext.reassoc_ft_ies) && (pSession->ftSmeContext.reassoc_ft_ies_length)) { - cdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies); + qdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies); pSession->ftSmeContext.reassoc_ft_ies_length = 0; pSession->ftSmeContext.reassoc_ft_ies = NULL; } @@ -17803,14 +17803,14 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, return; pSession->ftSmeContext.reassoc_ft_ies = - cdf_mem_malloc(ft_ies_length); + qdf_mem_malloc(ft_ies_length); if (NULL == pSession->ftSmeContext.reassoc_ft_ies) { sms_log(pMac, LOGE, FL("Memory allocation failed for ft_ies")); return; } else { /* Copy the RIC IEs to reassoc IEs */ - cdf_mem_copy(((uint8_t *) pSession->ftSmeContext. + qdf_mem_copy(((uint8_t *) pSession->ftSmeContext. reassoc_ft_ies), (uint8_t *) pFTPreAuthRsp->ric_ies, pFTPreAuthRsp->ric_ies_length); @@ -17842,7 +17842,7 @@ static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pR pBuf += 2; qdf_get_u32(pBuf, (uint32_t *) &pRsp->statusCode); pBuf += 4; - cdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(pRsp->peer_macaddr.bytes, pBuf, QDF_MAC_ADDR_SIZE); } } @@ -17889,7 +17889,7 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, cds_msg_t msg; tAniHandoffReq *pMsg; - pMsg = cdf_mem_malloc(sizeof(tAniHandoffReq)); + pMsg = qdf_mem_malloc(sizeof(tAniHandoffReq)); if (NULL == pMsg) { sms_log(pMac, LOGE, " csr_handoff_request: failed to allocate mem for req "); @@ -17900,14 +17900,14 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, pMsg->sessionId = sessionId; pMsg->channel = pHandoffInfo->channel; pMsg->handoff_src = pHandoffInfo->src; - cdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(pMsg->bssid, pHandoffInfo->bssid.bytes, QDF_MAC_ADDR_SIZE); msg.type = eWNI_SME_HANDOFF_REQ; msg.bodyptr = pMsg; msg.reserved = 0; if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, &msg)) { sms_log(pMac, LOGE, " csr_handoff_request failed to post msg to self "); - cdf_mem_free((void *)pMsg); + qdf_mem_free((void *)pMsg); status = QDF_STATUS_E_FAILURE; } return status; @@ -17934,7 +17934,7 @@ QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); + qdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen; return status; } @@ -17966,7 +17966,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, timeStamp[0] = pBssDescription->timeStamp[0]; timeStamp[1] = pBssDescription->timeStamp[1]; update_cckmtsf(&(timeStamp[0]), &(timeStamp[1]), &timer_diff); - cdf_mem_copy(pTimestamp, (void *)&timeStamp[0], sizeof(uint32_t) * 2); + qdf_mem_copy(pTimestamp, (void *)&timeStamp[0], sizeof(uint32_t) * 2); return status; } #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ @@ -17992,12 +17992,12 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, tCsrRoamStartBssParams param; csr_roam_get_bss_start_parms(pMac, profile, ¶m); - pMsg = cdf_mem_malloc(sizeof(tSirChanChangeRequest)); + pMsg = qdf_mem_malloc(sizeof(tSirChanChangeRequest)); if (!pMsg) { return QDF_STATUS_E_NOMEM; } - cdf_mem_set((void *)pMsg, sizeof(tSirChanChangeRequest), 0); + qdf_mem_set((void *)pMsg, sizeof(tSirChanChangeRequest), 0); pMsg->messageType = eWNI_SME_CHANNEL_CHANGE_REQ; pMsg->messageLen = sizeof(tSirChanChangeRequest); @@ -18008,10 +18008,10 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, pMac->roam.configParam.uCfgDot11Mode); pMsg->center_freq_seg_0 = ch_params->center_freq_seg0; pMsg->center_freq_seg_1 = ch_params->center_freq_seg1; - cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&pMsg->operational_rateset, + qdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(&pMsg->operational_rateset, ¶m.operationalRateSet, sizeof(pMsg->operational_rateset)); - cdf_mem_copy(&pMsg->extended_rateset, + qdf_mem_copy(&pMsg->extended_rateset, ¶m.extendedRateSet, sizeof(pMsg->extended_rateset)); status = cds_send_mb_message_to_mac(pMsg); @@ -18030,17 +18030,17 @@ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirStartBeaconIndication *pMsg; - pMsg = cdf_mem_malloc(sizeof(tSirStartBeaconIndication)); + pMsg = qdf_mem_malloc(sizeof(tSirStartBeaconIndication)); if (!pMsg) { return QDF_STATUS_E_NOMEM; } - cdf_mem_set((void *)pMsg, sizeof(tSirStartBeaconIndication), 0); + qdf_mem_set((void *)pMsg, sizeof(tSirStartBeaconIndication), 0); pMsg->messageType = eWNI_SME_START_BEACON_REQ; pMsg->messageLen = sizeof(tSirStartBeaconIndication); pMsg->beaconStartStatus = dfsCacWaitStatus; - cdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); status = cds_send_mb_message_to_mac(pMsg); @@ -18064,24 +18064,24 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, QDF_STATUS status; /* following buffer will be freed by consumer (PE) */ - pLocalBuffer = cdf_mem_malloc(pModifyIE->ieBufferlength); + pLocalBuffer = qdf_mem_malloc(pModifyIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); return QDF_STATUS_E_NOMEM; } - pModifyAddIEInd = cdf_mem_malloc(sizeof(tSirModifyIEsInd)); + pModifyAddIEInd = qdf_mem_malloc(sizeof(tSirModifyIEsInd)); if (NULL == pModifyAddIEInd) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); - cdf_mem_free(pLocalBuffer); + qdf_mem_free(pLocalBuffer); return QDF_STATUS_E_NOMEM; } /*copy the IE buffer */ - cdf_mem_copy(pLocalBuffer, pModifyIE->pIEBuffer, + qdf_mem_copy(pLocalBuffer, pModifyIE->pIEBuffer, pModifyIE->ieBufferlength); - cdf_mem_zero(pModifyAddIEInd, sizeof(tSirModifyIEsInd)); + qdf_mem_zero(pModifyAddIEInd, sizeof(tSirModifyIEsInd)); pModifyAddIEInd->msgType = eWNI_SME_MODIFY_ADDITIONAL_IES; pModifyAddIEInd->msgLen = sizeof(tSirModifyIEsInd); @@ -18102,7 +18102,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); - cdf_mem_free(pLocalBuffer); + qdf_mem_free(pLocalBuffer); } return status; } @@ -18129,25 +18129,25 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, if (pUpdateIE->ieBufferlength != 0) { /* Following buffer will be freed by consumer (PE) */ - pLocalBuffer = cdf_mem_malloc(pUpdateIE->ieBufferlength); + pLocalBuffer = qdf_mem_malloc(pUpdateIE->ieBufferlength); if (NULL == pLocalBuffer) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pLocalBuffer, pUpdateIE->pAdditionIEBuffer, + qdf_mem_copy(pLocalBuffer, pUpdateIE->pAdditionIEBuffer, pUpdateIE->ieBufferlength); } - pUpdateAddIEs = cdf_mem_malloc(sizeof(tSirUpdateIEsInd)); + pUpdateAddIEs = qdf_mem_malloc(sizeof(tSirUpdateIEsInd)); if (NULL == pUpdateAddIEs) { sms_log(pMac, LOGE, FL("Memory Allocation Failure!!!")); if (pLocalBuffer != NULL) { - cdf_mem_free(pLocalBuffer); + qdf_mem_free(pLocalBuffer); } return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pUpdateAddIEs, sizeof(tSirUpdateIEsInd)); + qdf_mem_zero(pUpdateAddIEs, sizeof(tSirUpdateIEsInd)); pUpdateAddIEs->msgType = eWNI_SME_UPDATE_ADDITIONAL_IES; pUpdateAddIEs->msgLen = sizeof(tSirUpdateIEsInd); @@ -18167,7 +18167,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg" "!!! status %d"), status); - cdf_mem_free(pLocalBuffer); + qdf_mem_free(pLocalBuffer); } return status; } @@ -18189,11 +18189,11 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, QDF_STATUS status = QDF_STATUS_SUCCESS; struct sir_sme_ext_cng_chan_req *msg; - msg = cdf_mem_malloc(sizeof(*msg)); + msg = qdf_mem_malloc(sizeof(*msg)); if (NULL == msg) return QDF_STATUS_E_NOMEM; - cdf_mem_zero(msg, sizeof(*msg)); + qdf_mem_zero(msg, sizeof(*msg)); msg->message_type = eWNI_SME_EXT_CHANGE_CHANNEL; msg->length = sizeof(*msg); msg->new_channel = channel; @@ -18223,19 +18223,19 @@ csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; tSirDfsCsaIeRequest *msg; - msg = cdf_mem_malloc(sizeof(tSirDfsCsaIeRequest)); + msg = qdf_mem_malloc(sizeof(tSirDfsCsaIeRequest)); if (!msg) { return QDF_STATUS_E_NOMEM; } - cdf_mem_set((void *)msg, sizeof(tSirDfsCsaIeRequest), 0); + qdf_mem_set((void *)msg, sizeof(tSirDfsCsaIeRequest), 0); msg->msgType = eWNI_SME_DFS_BEACON_CHAN_SW_IE_REQ; msg->msgLen = sizeof(tSirDfsCsaIeRequest); msg->targetChannel = target_channel; msg->csaIeRequired = csa_ie_reqd; - cdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&msg->ch_params, ch_params, sizeof(chan_params_t)); + qdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(&msg->ch_params, ch_params, sizeof(chan_params_t)); status = cds_send_mb_message_to_mac(msg); @@ -18261,7 +18261,7 @@ void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, { WLAN_HOST_DIAG_EVENT_DEF(roam_connection, host_event_wlan_status_payload_type); - cdf_mem_set(&roam_connection, + qdf_mem_set(&roam_connection, sizeof(host_event_wlan_status_payload_type), 0); switch (reason) { case eCSR_REASON_ROAM_SYNCH_IND: @@ -18696,7 +18696,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) } len = sizeof(*cmd); - cmd = cdf_mem_malloc(len); + cmd = qdf_mem_malloc(len); if (!cmd) { sms_log(mac, LOGE, FL("Memory allocation failed")); /* Probably the fail response will also fail during malloc. @@ -18718,7 +18718,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) } } - cdf_mem_set(cmd, len, 0); + qdf_mem_set(cmd, len, 0); cmd->messageType = eWNI_SME_SET_HW_MODE_REQ; cmd->length = len; @@ -18740,7 +18740,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) } return; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { sms_log(mac, LOGE, FL("Malloc fail: Fail to send response to SME")); @@ -18783,7 +18783,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) } len = sizeof(*cmd); - cmd = cdf_mem_malloc(len); + cmd = qdf_mem_malloc(len); if (!cmd) { sms_log(mac, LOGE, FL("Memory allocation failed")); /* Probably the fail response will also fail during malloc. @@ -18816,7 +18816,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command) } return; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { sms_log(mac, LOGE, FL("Malloc fail: Fail to send response to SME")); @@ -18862,7 +18862,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) } len = sizeof(*msg); - msg = cdf_mem_malloc(len); + msg = qdf_mem_malloc(len); if (!msg) { sms_log(mac, LOGE, FL("Memory allocation failed")); /* Probably the fail response is also fail during malloc. @@ -18871,7 +18871,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) goto fail; } - cdf_mem_set((void *)msg, sizeof(*msg), 0); + qdf_mem_set((void *)msg, sizeof(*msg), 0); msg->msgType = eWNI_SME_NSS_UPDATE_REQ; msg->msgLen = sizeof(*msg); @@ -18888,7 +18888,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command) } return; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { sms_log(mac, LOGE, FL("Malloc fail: Fail to send response to SME")); @@ -18980,7 +18980,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, ies_local); ps_global_info->remain_in_power_active_till_dhcp = false; session->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED; - roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo)); + roam_info = qdf_mem_malloc(sizeof(tCsrRoamInfo)); if (NULL == roam_info) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR3: Mem Alloc failed for roam info")); @@ -18990,12 +18990,12 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } csr_scan_save_roam_offload_ap_to_scan_cache(mac_ctx, roam_synch_data, bss_desc); - cdf_mem_zero(roam_info, sizeof(tCsrRoamInfo)); + qdf_mem_zero(roam_info, sizeof(tCsrRoamInfo)); roam_info->sessionId = session_id; csr_roam_call_callback(mac_ctx, roam_synch_data->roamedVdevId, roam_info, 0, eCSR_ROAM_TDLS_STATUS_UPDATE, eCSR_ROAM_RESULT_DELETE_ALL_TDLS_PEER_IND); - cdf_mem_copy(&roam_info->bssid.bytes, &bss_desc->bssId, + qdf_mem_copy(&roam_info->bssid.bytes, &bss_desc->bssId, sizeof(struct qdf_mac_addr)); csr_roam_save_connected_infomation(mac_ctx, session_id, session->pCurRoamProfile, @@ -19058,24 +19058,24 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, SIR_MAC_HDR_LEN_3A - SIR_MAC_REASSOC_SSID_OFFSET; roam_info->nAssocRspLength = roam_synch_data->reassocRespLength - SIR_MAC_HDR_LEN_3A; - roam_info->pbFrames = cdf_mem_malloc(roam_info->nBeaconLength + + roam_info->pbFrames = qdf_mem_malloc(roam_info->nBeaconLength + roam_info->nAssocReqLength + roam_info->nAssocRspLength); if (NULL == roam_info->pbFrames) { sms_log(mac_ctx, LOGE, FL("no memory available")); session->roam_synch_in_progress = false; if (roam_info) - cdf_mem_free(roam_info); + qdf_mem_free(roam_info); sme_release_global_lock(&mac_ctx->sme); return; } - cdf_mem_zero(roam_info->pbFrames, roam_info->nBeaconLength + + qdf_mem_zero(roam_info->pbFrames, roam_info->nBeaconLength + roam_info->nAssocReqLength + roam_info->nAssocRspLength); - cdf_mem_copy(roam_info->pbFrames, + qdf_mem_copy(roam_info->pbFrames, (uint8_t *)roam_synch_data + roam_synch_data->reassoc_req_offset + SIR_MAC_HDR_LEN_3A + SIR_MAC_REASSOC_SSID_OFFSET, roam_info->nAssocReqLength); - cdf_mem_copy(roam_info->pbFrames + roam_info->nAssocReqLength, + qdf_mem_copy(roam_info->pbFrames + roam_info->nAssocReqLength, (uint8_t *)roam_synch_data + roam_synch_data->reassocRespOffset + SIR_MAC_HDR_LEN_3A, @@ -19149,9 +19149,9 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } roam_info->roamSynchInProgress = true; roam_info->synchAuthStatus = roam_synch_data->authStatus; - cdf_mem_copy(roam_info->kck, roam_synch_data->kck, SIR_KCK_KEY_LEN); - cdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN); - cdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr, + qdf_mem_copy(roam_info->kck, roam_synch_data->kck, SIR_KCK_KEY_LEN); + qdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN); + qdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr, SIR_REPLAY_CTR_LEN); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("LFR3: Copy KCK, KEK and Replay Ctr")); @@ -19172,7 +19172,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, } session->fRoaming = false; session->roam_synch_in_progress = false; - cdf_mem_free(roam_info->pbFrames); - cdf_mem_free(roam_info); + qdf_mem_free(roam_info->pbFrames); + qdf_mem_free(roam_info); sme_release_global_lock(&mac_ctx->sme); } diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index c587ca589e13..4054ffea9b5d 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -133,9 +133,9 @@ static void csr_release_scan_cmd_pending_list(tpAniSirGlobal pMac) void csr_free_scan_result_entry(tpAniSirGlobal pMac, tCsrScanResult *pResult) { if (NULL != pResult->Result.pvIes) { - cdf_mem_free(pResult->Result.pvIes); + qdf_mem_free(pResult->Result.pvIes); } - cdf_mem_free(pResult); + qdf_mem_free(pResult); } static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, @@ -320,7 +320,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx, /* Contsruct valid Supported 2.4 GHz Channel List */ if (NULL == scan_req->ChannelInfo.ChannelList) { scan_req->ChannelInfo.ChannelList = - cdf_mem_malloc(NUM_24GHZ_CHANNELS); + qdf_mem_malloc(NUM_24GHZ_CHANNELS); if (NULL == scan_req->ChannelInfo.ChannelList) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed.")); return QDF_STATUS_E_NOMEM; @@ -400,20 +400,20 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, && (false == mac_ctx->scan.fEnableBypass11d))) return QDF_STATUS_SUCCESS; - cdf_mem_set(&tmp_rq, sizeof(tCsrScanRequest), 0); + qdf_mem_set(&tmp_rq, sizeof(tCsrScanRequest), 0); scan_11d_cmd = csr_get_command_buffer(mac_ctx); if (!scan_11d_cmd) { sms_log(mac_ctx, LOGE, FL("scan_11d_cmd failed")); return QDF_STATUS_E_FAILURE; } - cdf_mem_set(&scan_11d_cmd->u.scanCmd, sizeof(tScanCmd), 0); - pChnInfo->ChannelList = cdf_mem_malloc(numChn); + qdf_mem_set(&scan_11d_cmd->u.scanCmd, sizeof(tScanCmd), 0); + pChnInfo->ChannelList = qdf_mem_malloc(numChn); if (NULL == pChnInfo->ChannelList) { sms_log(mac_ctx, LOGE, FL("Failed to allocate memory")); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pChnInfo->ChannelList, + qdf_mem_copy(pChnInfo->ChannelList, mac_ctx->scan.base_channels.channelList, numChn); pChnInfo->numOfChannels = (uint8_t) numChn; @@ -461,7 +461,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd, status = csr_scan_copy_request(mac_ctx, &scan_11d_cmd->u.scanCmd.u.scanRequest, &tmp_rq); /* Free the channel list */ - cdf_mem_free(pChnInfo->ChannelList); + qdf_mem_free(pChnInfo->ChannelList); pChnInfo->ChannelList = NULL; if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL("csr_scan_copy_request failed")); @@ -531,7 +531,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId, goto release_cmd; } - cdf_mem_set(&scan_cmd->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&scan_cmd->u.scanCmd, sizeof(tScanCmd), 0); scan_cmd->command = eSmeCommandScan; scan_cmd->sessionId = sessionId; if (scan_cmd->sessionId >= CSR_ROAM_SESSION_MAX) @@ -664,12 +664,12 @@ QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, goto free_filter; } /* Here is the profile we need to connect to */ - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { status = QDF_STATUS_E_NOMEM; goto free_filter; } - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); if (NULL == pSession->pCurRoamProfile) { pScanFilter->EncryptionType.numEntries = 1; pScanFilter->EncryptionType.encryptionType[0] = @@ -679,12 +679,12 @@ QDF_STATUS csr_issue_roam_after_lostlink_scan(tpAniSirGlobal pMac, * We have to make a copy of pCurRoamProfile because it will * be free inside csr_roam_issue_connect */ - pProfile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); + pProfile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == pProfile) { status = QDF_STATUS_E_NOMEM; goto free_filter; } - cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(pMac, pProfile, pSession->pCurRoamProfile); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -715,11 +715,11 @@ free_filter: if (pScanFilter) { /* we need to free memory for filter if profile exists */ csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); } if (NULL != pProfile) { csr_release_profile(pMac, pProfile); - cdf_mem_free(pProfile); + qdf_mem_free(pProfile); } return status; } @@ -818,11 +818,11 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, * on error: following memory will be released by call to * csr_release_command_scan in the end */ - ssid_list->SSIDList = cdf_mem_malloc(sizeof(tCsrSSIDInfo)); + ssid_list->SSIDList = qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == ssid_list->SSIDList) return QDF_STATUS_E_NOMEM; ssid_list->numOfSSIDs = 1; - cdf_mem_copy(&ssid_list->SSIDList[0].SSID, + qdf_mem_copy(&ssid_list->SSIDList[0].SSID, &pSession->connectedProfile.SSID, sizeof(tSirMacSSid)); } else { @@ -832,11 +832,11 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (!pSession->pCurRoamProfile) return QDF_STATUS_SUCCESS; - scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + scan_filter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_filter) return QDF_STATUS_E_NOMEM; - cdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(scan_filter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, pSession->pCurRoamProfile, scan_filter); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -846,7 +846,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, &bss_lst)) && bss_lst)) { if (csr_roam_is_channel_valid(mac_ctx, pSession->connectedProfile.operationChannel)) { - ch_info->ChannelList = cdf_mem_malloc(1); + ch_info->ChannelList = qdf_mem_malloc(1); if (NULL == ch_info->ChannelList) { status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; @@ -859,7 +859,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, } /* on error: this mem will be released by csr_release_command_scan */ - ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); + ch_info->ChannelList = qdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { status = QDF_STATUS_E_NOMEM; goto free_lost_link1_local_mem; @@ -893,7 +893,7 @@ csr_update_lost_link1_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, free_lost_link1_local_mem: if (scan_filter) { csr_free_scan_filter(mac_ctx, scan_filter); - cdf_mem_free(scan_filter); + qdf_mem_free(scan_filter); } if (bss_lst) csr_scan_result_purge(mac_ctx, bss_lst); @@ -929,12 +929,12 @@ csr_scan_request_lost_link1(tpAniSirGlobal mac_ctx, uint32_t session_id) status = QDF_STATUS_E_RESOURCES; goto release_lost_link1_cmd; } - cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link1_cmd(mac_ctx, cmd, session, session_id); if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link1_cmd; - cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, + qdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct qdf_mac_addr), 0xFF); status = csr_queue_sme_command(mac_ctx, cmd, false); if (!QDF_IS_STATUS_SUCCESS(status)) { @@ -981,11 +981,11 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, status = qdf_mc_timer_init(&cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, csr_scan_active_list_timeout_handle, &cmd); - scan_fltr = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + scan_fltr = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == scan_fltr) return QDF_STATUS_E_NOMEM; - cdf_mem_set(scan_fltr, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(scan_fltr, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(mac_ctx, session->pCurRoamProfile, scan_fltr); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -998,7 +998,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, if (!bss_lst) goto free_lost_link2_local_mem; - ch_info->ChannelList = cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); + ch_info->ChannelList = qdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == ch_info->ChannelList) { status = QDF_STATUS_E_NOMEM; goto free_lost_link2_local_mem; @@ -1020,7 +1020,7 @@ csr_update_lost_link2_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *cmd, free_lost_link2_local_mem: if (scan_fltr) { csr_free_scan_filter(mac_ctx, scan_fltr); - cdf_mem_free(scan_fltr); + qdf_mem_free(scan_fltr); } if (bss_lst) csr_scan_result_purge(mac_ctx, bss_lst); @@ -1056,12 +1056,12 @@ csr_scan_request_lost_link2(tpAniSirGlobal mac_ctx, uint32_t session_id) status = QDF_STATUS_E_RESOURCES; goto release_lost_link2_cmd; } - cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); status = csr_update_lost_link2_cmd(mac_ctx, cmd, session_id, session); if (!QDF_IS_STATUS_SUCCESS(status)) goto release_lost_link2_cmd; - cdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, + qdf_mem_set(&cmd->u.scanCmd.u.scanRequest.bssid, sizeof(struct qdf_mac_addr), 0xFF); /* Put to the head in pending queue */ status = csr_queue_sme_command(mac_ctx, cmd, true); @@ -1101,7 +1101,7 @@ csr_scan_request_lost_link3(tpAniSirGlobal mac_ctx, uint32_t session_id) status = QDF_STATUS_E_RESOURCES; break; } - cdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&cmd->u.scanCmd, sizeof(tScanCmd), 0); cmd->command = eSmeCommandScan; cmd->sessionId = (uint8_t) session_id; cmd->u.scanCmd.reason = eCsrScanLostLink3; @@ -1168,12 +1168,12 @@ QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, } if (pProfile == NULL) break; - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) { status = QDF_STATUS_E_NOMEM; break; } - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); status = csr_roam_prepare_filter_from_profile(pMac, pProfile, pScanFilter); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -1206,7 +1206,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid(tpAniSirGlobal pMac, } if (pScanFilter) { csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); } return status; } @@ -1238,7 +1238,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, char str[36]; tSirMacSSid *ptr_ssid = &pCommand->u.scanCmd.u.scanRequest.SSIDs.SSIDList[0].SSID; - cdf_mem_copy(str, ptr_ssid->ssId, ptr_ssid->length); + qdf_mem_copy(str, ptr_ssid->ssId, ptr_ssid->length); str[ptr_ssid->length] = 0; sms_log(pMac, LOGW, FL("SSID = %s"), str); } @@ -1270,7 +1270,7 @@ QDF_STATUS csr_scan_handle_search_for_ssid_failure(tpAniSirGlobal pMac, if (pSession->bRefAssocStartCnt > 0) { tCsrRoamInfo *pRoamInfo = NULL, roamInfo; - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); pRoamInfo = &roamInfo; if (pCommand->u.roamCmd.pRoamBssEntry) { tCsrScanResult *pScanResult = GET_BASE_ADDR( @@ -1306,7 +1306,7 @@ QDF_STATUS csr_scan_result_purge(tpAniSirGlobal pMac, if (pScanList) { status = csr_ll_scan_purge_result(pMac, &pScanList->List); csr_ll_close(&pScanList->List); - cdf_mem_free(pScanList); + qdf_mem_free(pScanList); } return status; } @@ -1386,9 +1386,9 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, struct qdf_mac_addr local_bssid; modified_rssi = rssi; - cdf_mem_zero(&local_bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_zero(&local_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid) - cdf_mem_copy(local_bssid.bytes, bssid->bytes, + qdf_mem_copy(local_bssid.bytes, bssid->bytes, QDF_MAC_ADDR_SIZE); roam_params = &mac_ctx->roam.configParam.roam_params; /* @@ -1421,10 +1421,10 @@ static int csr_get_altered_rssi(tpAniSirGlobal mac_ctx, int rssi, * Check if there are preferred bssid and then apply the * preferred score */ - cdf_mem_zero(&fav_bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_zero(&fav_bssid.bytes, QDF_MAC_ADDR_SIZE); if (bssid && roam_params->num_bssid_favored) { for (i = 0; i < roam_params->num_bssid_favored; i++) { - cdf_mem_copy(fav_bssid.bytes, + qdf_mem_copy(fav_bssid.bytes, &roam_params->bssid_favored[i], QDF_MAC_ADDR_SIZE); if (!qdf_is_macaddr_equal(&fav_bssid, bssid)) @@ -1526,13 +1526,13 @@ static bool csr_is_better_rssi(tpAniSirGlobal mac_ctx, * Apply the boost and penlty logic and check * which is the best RSSI */ - cdf_mem_zero(&local_mac.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&local_mac.bytes, + qdf_mem_zero(&local_mac.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(&local_mac.bytes, &bss1->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi1 = csr_get_altered_rssi(mac_ctx, rssi1, bss1->Result.BssDescriptor.channelId, &local_mac); - cdf_mem_copy(&local_mac.bytes, + qdf_mem_copy(&local_mac.bytes, &bss2->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); rssi2 = csr_get_altered_rssi(mac_ctx, rssi2, bss2->Result.BssDescriptor.channelId, @@ -1626,8 +1626,8 @@ static void csr_scan_add_result(tpAniSirGlobal pMac, tCsrScanResult *pResult, struct qdf_mac_addr bssid; uint8_t channel_id = pResult->Result.BssDescriptor.channelId; - cdf_mem_zero(&bssid.bytes, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(bssid.bytes, &pResult->Result.BssDescriptor.bssId, + qdf_mem_zero(&bssid.bytes, QDF_MAC_ADDR_SIZE); + qdf_mem_copy(bssid.bytes, &pResult->Result.BssDescriptor.bssId, QDF_MAC_ADDR_SIZE); pResult->preferValue = csr_get_bss_prefer_value(pMac, (int)pResult->Result.BssDescriptor.rssi, @@ -1684,7 +1684,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, fMatch = true; sms_log(pMac, LOG1, FL("Security Matched")); if ((pBssDesc->Result.pvIes == NULL) && pIes) - cdf_mem_free(pIes); + qdf_mem_free(pIes); continue; } #ifdef WLAN_FEATURE_11W @@ -1705,7 +1705,7 @@ csr_parser_scan_result_for_5ghz_preference(tpAniSirGlobal pMac, pIes, NULL, NULL, NULL); #endif if ((pBssDesc->Result.pvIes == NULL) && pIes) - cdf_mem_free(pIes); + qdf_mem_free(pIes); if (fMatch) sms_log(pMac, LOG1, FL("Security Matched")); } /* for loop ends */ @@ -1816,7 +1816,7 @@ csr_save_ies(tpAniSirGlobal pMac, return status; /* Only save it when matching */ if (!(*fMatch) && !pBssDesc->Result.pvIes) { - cdf_mem_free(pIes); + qdf_mem_free(pIes); return status; } if (!pBssDesc->Result.pvIes) { @@ -1832,16 +1832,16 @@ csr_save_ies(tpAniSirGlobal pMac, * Only to save parsed IEs if caller provides a filter. Most likely the * caller is using to for association, hence save the parsed IEs */ - *pNewIes = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + *pNewIes = qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == *pNewIes) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for IEs")); /* Need to free memory allocated by csr_match_bss */ if (!pBssDesc->Result.pvIes) - cdf_mem_free(pIes); + qdf_mem_free(pIes); return status; } - cdf_mem_copy(*pNewIes, pIes, sizeof(tDot11fBeaconIEs)); + qdf_mem_copy(*pNewIes, pIes, sizeof(tDot11fBeaconIEs)); return status; } @@ -1870,17 +1870,17 @@ csr_save_scan_entry(tpAniSirGlobal pMac, bssLen = pBssDesc->Result.BssDescriptor.length + sizeof(pBssDesc->Result.BssDescriptor.length); allocLen = sizeof(tCsrScanResult) + bssLen; - pResult = cdf_mem_malloc(allocLen); + pResult = qdf_mem_malloc(allocLen); if (NULL == pResult) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("fail to allocate memory for scan result, len=%d"), allocLen); if (pNewIes) - cdf_mem_free(pNewIes); + qdf_mem_free(pNewIes); return status; } - cdf_mem_set(pResult, allocLen, 0); + qdf_mem_set(pResult, allocLen, 0); pResult->capValue = pBssDesc->capValue; pResult->preferValue = pBssDesc->preferValue; pResult->ucEncryptionType = uc; @@ -1891,7 +1891,7 @@ csr_save_scan_entry(tpAniSirGlobal pMac, /* save the pIes for later use */ pResult->Result.pvIes = pNewIes; /* save bss description */ - cdf_mem_copy(&pResult->Result.BssDescriptor, + qdf_mem_copy(&pResult->Result.BssDescriptor, &pBssDesc->Result.BssDescriptor, bssLen); /* @@ -2059,13 +2059,13 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, csr_prefer_5ghz(pMac, pFilter); - pRetList = cdf_mem_malloc(sizeof(tScanResultList)); + pRetList = qdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) { sms_log(pMac, LOGE, FL("pRetList is NULL")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(pRetList, sizeof(tScanResultList), 0); + qdf_mem_set(pRetList, sizeof(tScanResultList), 0); csr_ll_open(pMac->hHdd, &pRetList->List); pRetList->pCurEntry = NULL; status = csr_parse_scan_results(pMac, pFilter, pRetList, &count); @@ -2078,7 +2078,7 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal pMac, if (0 == count) { /* We are here meaning the there is no match */ csr_ll_close(&pRetList->List); - cdf_mem_free(pRetList); + qdf_mem_free(pRetList); status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; @@ -2140,7 +2140,7 @@ QDF_STATUS csr_scan_flush_selective_result(tpAniSirGlobal pMac, bool flushP2P) pEntry = csr_ll_peek_head(pList, LL_ACCESS_NOLOCK); while (pEntry != NULL) { pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); - if (flushP2P == cdf_mem_compare(pBssDesc->Result.ssId.ssId, + if (flushP2P != qdf_mem_cmp(pBssDesc->Result.ssId.ssId, "DIRECT-", 7)) { pFreeElem = pEntry; pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK); @@ -2168,7 +2168,7 @@ void csr_scan_flush_bss_entry(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(pList, LL_ACCESS_NOLOCK); while (pEntry != NULL) { pBssDesc = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); - if (cdf_mem_compare(pBssDesc->Result.BssDescriptor.bssId, + if (!qdf_mem_cmp(pBssDesc->Result.BssDescriptor.bssId, pCsaOffloadInd->bssid.bytes, QDF_MAC_ADDR_SIZE)) { pFreeElem = pEntry; pEntry = csr_ll_next(pList, pEntry, LL_ACCESS_NOLOCK); @@ -2320,11 +2320,11 @@ QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, if (phResult) { *phResult = CSR_INVALID_SCANRESULT_HANDLE; } - pRetList = cdf_mem_malloc(sizeof(tScanResultList)); + pRetList = qdf_mem_malloc(sizeof(tScanResultList)); if (NULL == pRetList) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set(pRetList, sizeof(tScanResultList), 0); + qdf_mem_set(pRetList, sizeof(tScanResultList), 0); csr_ll_open(pMac->hHdd, &pRetList->List); pRetList->pCurEntry = NULL; csr_ll_lock(&pMac->scan.scanResultList); @@ -2338,7 +2338,7 @@ QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, pScanResult->Result.BssDescriptor.length + sizeof(pScanResult->Result.BssDescriptor.length); allocLen = sizeof(tCsrScanResult) + bssLen; - pResult = cdf_mem_malloc(allocLen); + pResult = qdf_mem_malloc(allocLen); if (NULL == pResult) status = QDF_STATUS_E_NOMEM; else @@ -2350,27 +2350,27 @@ QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, count = 0; break; } - cdf_mem_set(pResult, allocLen, 0); - cdf_mem_copy(&pResult->Result.BssDescriptor, + qdf_mem_set(pResult, allocLen, 0); + qdf_mem_copy(&pResult->Result.BssDescriptor, &pScanResult->Result.BssDescriptor, bssLen); if (pScanResult->Result.pvIes) { pResult->Result.pvIes = - cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if (NULL == pResult->Result.pvIes) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; if (!QDF_IS_STATUS_SUCCESS(status)) { /* Free the memory we allocate above first */ - cdf_mem_free(pResult); + qdf_mem_free(pResult); csr_scan_result_purge(pMac, (tScanResultHandle *) pRetList); count = 0; break; } - cdf_mem_copy(pResult->Result.pvIes, + qdf_mem_copy(pResult->Result.pvIes, pScanResult->Result.pvIes, sizeof(tDot11fBeaconIEs)); } @@ -2386,7 +2386,7 @@ QDF_STATUS csr_scan_copy_result_list(tpAniSirGlobal pMac, tScanResultHandle hIn, if (QDF_IS_STATUS_SUCCESS(status)) { if (0 == count) { csr_ll_close(&pRetList->List); - cdf_mem_free(pRetList); + qdf_mem_free(pRetList); status = QDF_STATUS_E_NULL_VALUE; } else if (phResult) { *phResult = pRetList; @@ -2430,7 +2430,7 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, sms_log(pMac, LOG1, FL("Scanning: ASSOC cnf can be given to upper layer")); - cdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); + qdf_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0); pRoamInfo = &roamInfo; pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *) pMsgBuf; status = csr_roam_get_session_id_from_bssid(pMac, @@ -2450,10 +2450,10 @@ QDF_STATUS csr_scanning_state_msg_processor(tpAniSirGlobal pMac, pRoamInfo->prsnIE = pUpperLayerAssocCnf->rsnIE.rsnIEdata; pRoamInfo->addIELen = (uint8_t) pUpperLayerAssocCnf->addIE.length; pRoamInfo->paddIE = pUpperLayerAssocCnf->addIE.addIEdata; - cdf_mem_copy(pRoamInfo->peerMac.bytes, + qdf_mem_copy(pRoamInfo->peerMac.bytes, pUpperLayerAssocCnf->peerMacAddr, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(&pRoamInfo->bssid.bytes, pUpperLayerAssocCnf->bssId, + qdf_mem_copy(&pRoamInfo->bssid.bytes, pUpperLayerAssocCnf->bssId, QDF_MAC_ADDR_SIZE); pRoamInfo->wmmEnabledSta = pUpperLayerAssocCnf->wmmEnabledSta; if (CSR_IS_INFRA_AP(pRoamInfo->u.pConnectedProfile)) { @@ -2491,7 +2491,7 @@ void csr_check_n_save_wsc_ie(tpAniSirGlobal pMac, tSirBssDescription *pNewBssDes /* Founrd it */ if ((DOT11F_IE_WSCPROBERES_MAX_LEN - 2) >= pbIe[1]) { - cdf_mem_copy(pNewBssDescr-> + qdf_mem_copy(pNewBssDescr-> WscIeProbeRsp, pbIe, pbIe[1] + 2); pNewBssDescr->WscIeLen = pbIe[1] + 2; @@ -2619,14 +2619,14 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, /* BSS is capable of doing pre-authentication */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR - cdf_mem_set(&secEvent, sizeof(host_event_wlan_security_payload_type), + qdf_mem_set(&secEvent, sizeof(host_event_wlan_security_payload_type), 0); secEvent.eventId = WLAN_SECURITY_EVENT_PMKID_CANDIDATE_FOUND; secEvent.encryptionModeMulticast = (uint8_t)diag_enc_type_from_csr_type( pSession->connectedProfile.mcEncryptionType); secEvent.encryptionModeUnicast = (uint8_t)diag_enc_type_from_csr_type( pSession->connectedProfile.EncryptionType); - cdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, + qdf_mem_copy(secEvent.bssid, pSession->connectedProfile.bssid.bytes, QDF_MAC_ADDR_SIZE); secEvent.authMode = (uint8_t)diag_auth_type_from_csr_type( pSession->connectedProfile.AuthType); @@ -2635,7 +2635,7 @@ QDF_STATUS csr_add_pmkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, pmkid_info = &pSession->PmkidCandidateInfo[pSession->NumPmkidCandidate]; /* if yes, then add to PMKIDCandidateList */ - cdf_mem_copy(pmkid_info->BSSID.bytes, pBssDesc->bssId, + qdf_mem_copy(pmkid_info->BSSID.bytes, pBssDesc->bssId, QDF_MAC_ADDR_SIZE); /* Bit 0 offirst byte - PreAuthentication Capability */ if ((pIes->RSN.RSN_Cap[0] >> 0) & 0x1) @@ -2668,7 +2668,7 @@ QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { if (!pIes) - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); return status; } @@ -2689,7 +2689,7 @@ QDF_STATUS csr_process_bss_desc_for_pmkid_list(tpAniSirGlobal pMac, } if (!pIes) - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); return status; } @@ -2717,7 +2717,7 @@ QDF_STATUS csr_add_bkid_candidate_list(tpAniSirGlobal pMac, uint32_t sessionId, if (pSession->NumBkidCandidate < CSR_MAX_BKID_ALLOWED) { /* if yes, then add to BKIDCandidateList */ - cdf_mem_copy(pSession-> + qdf_mem_copy(pSession-> BkidCandidateInfo[pSession-> NumBkidCandidate]. BSSID.bytes, pBssDesc->bssId, @@ -2779,7 +2779,7 @@ bool csr_process_bss_desc_for_bkid_list(tpAniSirGlobal pMac, } } if (!pIes) - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); return fRC; } @@ -2828,7 +2828,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, if (CSR_SCAN_IS_OVER_BSS_LIMIT(mac_ctx)) { sms_log(mac_ctx, LOGW, FL("BSS limit reached")); if ((bss_dscp->Result.pvIes == NULL) && local_ie) - cdf_mem_free(local_ie); + qdf_mem_free(local_ie); csr_free_scan_result_entry(mac_ctx, bss_dscp); /* Continue because there may be duplicated BSS */ continue; @@ -2885,7 +2885,7 @@ csr_remove_from_tmp_list(tpAniSirGlobal mac_ctx, /* append to main list */ csr_scan_add_result(mac_ctx, bss_dscp, local_ie, session_id); if ((bss_dscp->Result.pvIes == NULL) && local_ie) - cdf_mem_free(local_ie); + qdf_mem_free(local_ie); } /* end of loop */ } @@ -2935,9 +2935,9 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac, cbAllocated = sizeof(tCsrScanResult) + cbBSSDesc; - pCsrBssDescription = cdf_mem_malloc(cbAllocated); + pCsrBssDescription = qdf_mem_malloc(cbAllocated); if (NULL != pCsrBssDescription) { - cdf_mem_set(pCsrBssDescription, cbAllocated, 0); + qdf_mem_set(pCsrBssDescription, cbAllocated, 0); pCsrBssDescription->AgingCount = (int32_t) pMac->roam.configParam.agingCount; sms_log(pMac, LOGW, @@ -2945,7 +2945,7 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac, pCsrBssDescription->AgingCount, MAC_ADDR_ARRAY(pCsrBssDescription->Result.BssDescriptor. bssId)); - cdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, + qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, pBSSDescription, cbBSSDesc); #if defined(CDF_ENSBALED) if (NULL != pCsrBssDescription->Result.pvIes) { @@ -3019,7 +3019,7 @@ void csr_purge_channel_power(tpAniSirGlobal pMac, tDblLinkList *pChannelList) LL_ACCESS_NOLOCK)) != NULL) { pChannelSet = GET_BASE_ADDR(pEntry, tCsrChannelPowerInfo, link); if (pChannelSet) - cdf_mem_free(pChannelSet); + qdf_mem_free(pChannelSet); } csr_ll_unlock(pChannelList); return; @@ -3043,12 +3043,12 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, pChannelInfo = channelTable; /* atleast 3 bytes have to be remaining -- from "countryString" */ while (i--) { - pChannelSet = cdf_mem_malloc(sizeof(tCsrChannelPowerInfo)); + pChannelSet = qdf_mem_malloc(sizeof(tCsrChannelPowerInfo)); if (NULL == pChannelSet) { pChannelInfo++; continue; } - cdf_mem_set(pChannelSet, sizeof(tCsrChannelPowerInfo), 0); + qdf_mem_set(pChannelSet, sizeof(tCsrChannelPowerInfo), 0); pChannelSet->firstChannel = pChannelInfo->firstChanNum; pChannelSet->numChannels = pChannelInfo->numChannels; /* @@ -3071,7 +3071,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, sms_log(pMac, LOGW, FL("Invalid Channel %d Present in Country IE"), pChannelSet->firstChannel); - cdf_mem_free(pChannelSet); + qdf_mem_free(pChannelSet); return QDF_STATUS_E_FAILURE; } pChannelSet->txPower = QDF_MIN(pChannelInfo->maxTxPower, @@ -3094,7 +3094,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, sms_log(pMac, LOGW, FL("Adding 11B/G ch in 11A. 1st ch %d"), pChannelSet->firstChannel); - cdf_mem_free(pChannelSet); + qdf_mem_free(pChannelSet); } } else { /* 5GHz info found */ @@ -3115,7 +3115,7 @@ QDF_STATUS csr_save_to_channel_power2_g_5_g(tpAniSirGlobal pMac, sms_log(pMac, LOGW, FL("Adding 11A ch in B/G. 1st ch %d"), pChannelSet->firstChannel); - cdf_mem_free(pChannelSet); + qdf_mem_free(pChannelSet); } } pChannelInfo++; /* move to next entry */ @@ -3129,9 +3129,9 @@ static void csr_clear_dfs_channel_list(tpAniSirGlobal pMac) uint16_t msgLen; msgLen = (uint16_t) (sizeof(tSirMbMsg)); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL != pMsg) { - cdf_mem_set((void *)pMsg, msgLen, 0); + qdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_CLEAR_DFS_CHANNEL_LIST; pMsg->msgLen = msgLen; cds_send_mb_message_to_mac(pMsg); @@ -3194,10 +3194,10 @@ static void csr_diag_reset_country_information(tpAniSirGlobal pMac) return; p11dLog->eventId = WLAN_80211D_EVENT_RESET; - cdf_mem_copy(p11dLog->countryCode, pMac->scan.countryCodeCurrent, 3); + qdf_mem_copy(p11dLog->countryCode, pMac->scan.countryCodeCurrent, 3); p11dLog->numChannel = pMac->scan.base_channels.numChannels; if (p11dLog->numChannel <= HOST_LOG_MAX_NUM_CHANNEL) { - cdf_mem_copy(p11dLog->Channels, + qdf_mem_copy(p11dLog->Channels, pMac->scan.base_channels.channelList, p11dLog->numChannel); for (Index = 0; @@ -3238,13 +3238,13 @@ void csr_apply_channel_power_info_wrapper(tpAniSirGlobal pMac) csr_apply_channel_power_info_to_fw(pMac, &pMac->scan.base_channels, pMac->scan.countryCodeCurrent); /* clear the 11d channel list */ - cdf_mem_set(&pMac->scan.channels11d, sizeof(pMac->scan.channels11d), 0); + qdf_mem_set(&pMac->scan.channels11d, sizeof(pMac->scan.channels11d), 0); } void csr_clear_votes_for_country_info(tpAniSirGlobal pMac) { pMac->scan.countryCodeCount = 0; - cdf_mem_set(pMac->scan.votes11d, + qdf_mem_set(pMac->scan.votes11d, sizeof(tCsrVotes11d) * CSR_MAX_NUM_COUNTRY_CODE, 0); } @@ -3286,7 +3286,7 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode) } for (i = 0; i < pMac->scan.countryCodeCount; i++) { - match = (cdf_mem_compare(pMac->scan.votes11d[i].countryCode, + match = (!qdf_mem_cmp(pMac->scan.votes11d[i].countryCode, pCountryCode, 2)); if (match) { break; @@ -3296,7 +3296,7 @@ void csr_add_vote_for_country_info(tpAniSirGlobal pMac, uint8_t *pCountryCode) if (match) { pMac->scan.votes11d[i].votes++; } else { - cdf_mem_copy(pMac->scan.votes11d[pMac->scan.countryCodeCount]. + qdf_mem_copy(pMac->scan.votes11d[pMac->scan.countryCodeCount]. countryCode, pCountryCode, 3); pMac->scan.votes11d[pMac->scan.countryCodeCount].votes = 1; pMac->scan.countryCodeCount++; @@ -3335,10 +3335,10 @@ bool csr_elected_country_info(tpAniSirGlobal pMac) } if (fRet) { - cdf_mem_copy(pMac->scan.countryCodeElected, + qdf_mem_copy(pMac->scan.countryCodeElected, pMac->scan.votes11d[j].countryCode, WNI_CFG_COUNTRY_CODE_LEN); - cdf_mem_copy(pMac->scan.countryCode11d, + qdf_mem_copy(pMac->scan.countryCode11d, pMac->scan.votes11d[j].countryCode, WNI_CFG_COUNTRY_CODE_LEN); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, @@ -3370,7 +3370,7 @@ QDF_STATUS csr_set_country_code(tpAniSirGlobal pMac, uint8_t *pCountry) &domainId, SOURCE_USERSPACE); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_copy(pMac->scan.countryCodeCurrent, + qdf_mem_copy(pMac->scan.countryCodeCurrent, pCountry, WNI_CFG_COUNTRY_CODE_LEN); csr_set_cfg_country_code(pMac, pCountry); @@ -3421,12 +3421,12 @@ void csr_diag_apply_country_info(tpAniSirGlobal mac_ctx) return; p11dLog->eventId = WLAN_80211D_EVENT_COUNTRY_SET; - cdf_mem_copy(p11dLog->countryCode, mac_ctx->scan.countryCode11d, 3); + qdf_mem_copy(p11dLog->countryCode, mac_ctx->scan.countryCode11d, 3); p11dLog->numChannel = mac_ctx->scan.channels11d.numChannels; if (p11dLog->numChannel > HOST_LOG_MAX_NUM_CHANNEL) goto diag_end; - cdf_mem_copy(p11dLog->Channels, + qdf_mem_copy(p11dLog->Channels, mac_ctx->scan.channels11d.channelList, p11dLog->numChannel); csr_get_channel_power_info(mac_ctx, @@ -3513,12 +3513,12 @@ void csr_save_channel_power_for_band(tpAniSirGlobal pMac, bool fill_5f) pMac->scan.base_channels.numChannels : WNI_CFG_VALID_CHANNEL_LIST_LEN; - chan_info = cdf_mem_malloc(sizeof(tSirMacChanInfo) * + chan_info = qdf_mem_malloc(sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN); if (NULL == chan_info) return; - cdf_mem_set(chan_info, sizeof(tSirMacChanInfo) * + qdf_mem_set(chan_info, sizeof(tSirMacChanInfo) * WNI_CFG_VALID_CHANNEL_LIST_LEN, 0); ch_info_start = chan_info; for (idx = 0; idx < max_ch_idx; idx++) { @@ -3546,7 +3546,7 @@ void csr_save_channel_power_for_band(tpAniSirGlobal pMac, bool fill_5f) csr_save_to_channel_power2_g_5_g(pMac, count * sizeof(tSirMacChanInfo), ch_info_start); } - cdf_mem_free(ch_info_start); + qdf_mem_free(ch_info_start); } bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId) @@ -3618,13 +3618,13 @@ bool csr_learn_11dcountry_information(tpAniSirGlobal pMac, } /* updating 11d Country Code with Country code selected. */ - cdf_mem_copy(pMac->scan.countryCode11d, pCountryCodeSelected, + qdf_mem_copy(pMac->scan.countryCode11d, pCountryCodeSelected, WNI_CFG_COUNTRY_CODE_LEN); fRet = true; free_ie: if (!pIes && pIesLocal) { /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return fRet; } @@ -3657,9 +3657,9 @@ void csr_reinit_scan_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) } if (pCommand->u.scanCmd.pToRoamProfile) { csr_release_profile(pMac, pCommand->u.scanCmd.pToRoamProfile); - cdf_mem_free(pCommand->u.scanCmd.pToRoamProfile); + qdf_mem_free(pCommand->u.scanCmd.pToRoamProfile); } - cdf_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&pCommand->u.scanCmd, sizeof(tScanCmd), 0); } eCsrScanCompleteNextCommand csr_scan_get_next_command_state(tpAniSirGlobal pMac, @@ -3800,15 +3800,15 @@ csr_diag_scan_complete(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("fail to parse IEs")); break; } - cdf_mem_copy(pScanLog->bssid[n], + qdf_mem_copy(pScanLog->bssid[n], pScanResult->BssDescriptor.bssId, 6); if (pIes && pIes->SSID.present && HOST_LOG_MAX_SSID_SIZE >= pIes->SSID.num_ssid) { - cdf_mem_copy(pScanLog->ssid[n], + qdf_mem_copy(pScanLog->ssid[n], pIes->SSID.ssid, pIes->SSID.num_ssid); } - cdf_mem_free(pIes); + qdf_mem_free(pIes); n++; } c++; @@ -3846,7 +3846,7 @@ QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, QDF_STATUS status; save_cmd->u.scanCmd.pToRoamProfile = - cdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (!save_cmd->u.scanCmd.pToRoamProfile) { sms_log(mac_ctx, LOGE, FL("pToRoamProfile mem fail")); goto error; @@ -3865,7 +3865,7 @@ QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, save_cmd->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs = command->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs; save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList = - cdf_mem_malloc( + qdf_mem_malloc( save_cmd->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs * sizeof(tCsrSSIDInfo)); if (!save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList) { @@ -3873,7 +3873,7 @@ QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, goto error; } - cdf_mem_copy(save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList, + qdf_mem_copy(save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList, command->u.scanCmd.u.scanRequest.SSIDs.SSIDList, save_cmd->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs * sizeof(tCsrSSIDInfo)); @@ -3887,7 +3887,7 @@ QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, bss_len = scan_result->Result.BssDescriptor.length + sizeof(scan_result->Result.BssDescriptor.length); - temp = cdf_mem_malloc(sizeof(tCsrScanResult) + bss_len); + temp = qdf_mem_malloc(sizeof(tCsrScanResult) + bss_len); if (!temp) { sms_log(mac_ctx, LOGE, FL("bss mem fail")); goto error; @@ -3902,15 +3902,15 @@ QDF_STATUS csr_save_profile(tpAniSirGlobal mac_ctx, /* pvIes is unsued in success/failure */ temp->Result.pvIes = NULL; - cdf_mem_copy(temp->Result.pvIes, + qdf_mem_copy(temp->Result.pvIes, scan_result->Result.pvIes, sizeof(*scan_result->Result.pvIes)); temp->Result.ssId.length = scan_result->Result.ssId.length; - cdf_mem_copy(temp->Result.ssId.ssId, + qdf_mem_copy(temp->Result.ssId.ssId, scan_result->Result.ssId.ssId, sizeof(scan_result->Result.ssId.ssId)); temp->Result.timer = scan_result->Result.timer; - cdf_mem_copy(&temp->Result.BssDescriptor, + qdf_mem_copy(&temp->Result.BssDescriptor, &scan_result->Result.BssDescriptor, sizeof(temp->Result.BssDescriptor)); temp->Link.last = temp->Link.next = NULL; @@ -3921,11 +3921,11 @@ error: csr_scan_handle_search_for_ssid_failure(mac_ctx, command); if (save_cmd->u.roamCmd.pRoamBssEntry) - cdf_mem_free(save_cmd->u.roamCmd.pRoamBssEntry); + qdf_mem_free(save_cmd->u.roamCmd.pRoamBssEntry); if (save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList) - cdf_mem_free(save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList); + qdf_mem_free(save_cmd->u.scanCmd.u.scanRequest.SSIDs.SSIDList); if (save_cmd->u.scanCmd.pToRoamProfile) - cdf_mem_free(save_cmd->u.scanCmd.pToRoamProfile); + qdf_mem_free(save_cmd->u.scanCmd.pToRoamProfile); return QDF_STATUS_E_FAILURE; } @@ -4003,13 +4003,13 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, sms_log(mac_ctx, LOG1, FL("chan: %d session: %d status: %d"), chan, pCommand->sessionId, ret); if (mac_ctx->sme.saved_scan_cmd) { - cdf_mem_free(mac_ctx->sme.saved_scan_cmd); + qdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; sms_log(mac_ctx, LOGE, FL("memory should have been free. Check!")); } - save_cmd = (tSmeCmd *) cdf_mem_malloc(sizeof(*pCommand)); + save_cmd = (tSmeCmd *) qdf_mem_malloc(sizeof(*pCommand)); if (!save_cmd) { sms_log(mac_ctx, LOGE, FL("save_cmd mem fail")); goto error; @@ -4020,7 +4020,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, /* csr_save_profile should report error */ sms_log(mac_ctx, LOGE, FL("profile save failed %d"), status); - cdf_mem_free(save_cmd); + qdf_mem_free(save_cmd); return; } @@ -4032,7 +4032,7 @@ error: csr_scan_handle_search_for_ssid_failure(mac_ctx, pCommand); if (mac_ctx->sme.saved_scan_cmd) { - cdf_mem_free(mac_ctx->sme.saved_scan_cmd); + qdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } } else if ((QDF_STATUS_E_NOSUPPORT == ret) || @@ -4040,7 +4040,7 @@ error: sms_log(mac_ctx, LOGE, FL("conn update ret %d"), ret); csr_scan_handle_search_for_ssid(mac_ctx, pCommand); if (mac_ctx->sme.saved_scan_cmd) { - cdf_mem_free(mac_ctx->sme.saved_scan_cmd); + qdf_mem_free(mac_ctx->sme.saved_scan_cmd); mac_ctx->sme.saved_scan_cmd = NULL; } } @@ -4256,10 +4256,10 @@ tCsrScanResult *csr_scan_save_bss_description_to_interim_list(tpAniSirGlobal pMa sms_log(pMac, LOG4, FL("new BSS description, length %d, cbBSSDesc %d"), cbAllocated, cbBSSDesc); - pCsrBssDescription = cdf_mem_malloc(cbAllocated); + pCsrBssDescription = qdf_mem_malloc(cbAllocated); if (NULL != pCsrBssDescription) { - cdf_mem_set(pCsrBssDescription, cbAllocated, 0); - cdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, + qdf_mem_set(pCsrBssDescription, cbAllocated, 0); + qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, pBSSDescription, cbBSSDesc); pCsrBssDescription->AgingCount = (int32_t) pMac->roam.configParam.agingCount; @@ -4280,7 +4280,7 @@ tCsrScanResult *csr_scan_save_bss_description_to_interim_list(tpAniSirGlobal pMa pCsrBssDescription->Result.ssId.length = len; pCsrBssDescription->Result.timer = qdf_mc_timer_get_system_time(); - cdf_mem_copy(pCsrBssDescription->Result.ssId.ssId, + qdf_mem_copy(pCsrBssDescription->Result.ssId.ssId, pIes->SSID.ssid, len); } csr_ll_insert_tail(&pMac->scan.tempScanResults, @@ -4366,10 +4366,10 @@ bool csr_is_duplicate_bss_description(tpAniSirGlobal pMac, free_ies: if (pIes1) - cdf_mem_free(pIes1); + qdf_mem_free(pIes1); if ((NULL == pIes2) && pIesTemp) /* locally allocated */ - cdf_mem_free(pIesTemp); + qdf_mem_free(pIesTemp); return fMatch; } @@ -4466,7 +4466,7 @@ static bool csr_scan_validate_scan_result(tpAniSirGlobal pMac, if (valid) *ppIes = pIes; else - cdf_mem_free(pIes); + qdf_mem_free(pIes); } return valid; } @@ -4560,7 +4560,7 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, csr_update_scantype(mac_ctx, ies, bssdescr->channelId); /* Free the resource */ if (ies != NULL) - cdf_mem_free(ies); + qdf_mem_free(ies); } return QDF_STATUS_SUCCESS; } @@ -4569,13 +4569,13 @@ QDF_STATUS csr_scan_process_single_bssdescr(tpAniSirGlobal mac_ctx, bool csr_scan_is_wild_card_scan(tpAniSirGlobal pMac, tSmeCmd *pCommand) { uint8_t bssid[QDF_MAC_ADDR_SIZE] = {0}; - bool f = cdf_mem_compare(pCommand->u.scanCmd.u.scanRequest.bssid.bytes, + bool f = qdf_mem_cmp(pCommand->u.scanCmd.u.scanRequest.bssid.bytes, bssid, sizeof(struct qdf_mac_addr)); /* * It is not a wild card scan if the bssid is not broadcast and * the number of SSID is 1. */ - return (f || (0xff == pCommand->u.scanCmd.u.scanRequest.bssid.bytes[0])) + return ((!f) || (0xff == pCommand->u.scanCmd.u.scanRequest.bssid.bytes[0])) && (pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs != 1); } @@ -4717,7 +4717,7 @@ QDF_STATUS csr_move_bss_to_head_from_bssid(tpAniSirGlobal pMac, pEntry = csr_ll_peek_head(&pResultList->List, LL_ACCESS_NOLOCK); while (pEntry) { pResult = GET_BASE_ADDR(pEntry, tCsrScanResult, Link); - if (cdf_mem_compare(bssid, pResult->Result.BssDescriptor.bssId, + if (!qdf_mem_cmp(bssid, pResult->Result.BssDescriptor.bssId, sizeof(struct qdf_mac_addr))) { status = QDF_STATUS_SUCCESS; csr_ll_remove_entry(&pResultList->List, pEntry, @@ -4861,7 +4861,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, pScanReq->ChannelInfo.numOfChannels)) + (pScanReq->uIEFieldLen); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) { sms_log(pMac, LOGE, FL("memory allocation failed")); sms_log(pMac, LOG1, FL("Failed: SId: %d FirstMatch = %d" @@ -4883,7 +4883,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, return QDF_STATUS_E_NOMEM; } - cdf_mem_set(pMsg, msgLen, 0); + qdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SCAN_REQ; pMsg->length = msgLen; /* ToDO: Fill in session info when we need to do scan base on session */ @@ -4973,7 +4973,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, if ((pScanReq->SSIDs.numOfSSIDs != 0) && (eSIR_PASSIVE_SCAN != scanType)) { for (i = 0; i < pMsg->numSsid; i++) { - cdf_mem_copy(&pMsg->ssId[i], + qdf_mem_copy(&pMsg->ssId[i], &pScanReq->SSIDs.SSIDList[i].SSID, sizeof(tSirMacSSid)); } @@ -5000,7 +5000,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, (uint8_t) pScanReq->ChannelInfo.numOfChannels; if (pScanReq->ChannelInfo.numOfChannels) { /* Assuming the channelNumber is uint8_t (1 byte) */ - cdf_mem_copy(pMsg->channelList.channelNumber, + qdf_mem_copy(pMsg->channelList.channelNumber, pScanReq->ChannelInfo.ChannelList, pScanReq->ChannelInfo.numOfChannels); } @@ -5011,7 +5011,7 @@ QDF_STATUS csr_send_mb_scan_req(tpAniSirGlobal pMac, uint16_t sessionId, (sizeof(pMsg->channelList.channelNumber) * pScanReq->ChannelInfo.numOfChannels)); if (pScanReq->uIEFieldLen != 0) { - cdf_mem_copy((uint8_t *) pMsg + pMsg->uIEFieldOffset, + qdf_mem_copy((uint8_t *) pMsg + pMsg->uIEFieldOffset, pScanReq->pIEField, pScanReq->uIEFieldLen); } pMsg->p2pSearch = pScanReq->p2pSearch; @@ -5037,7 +5037,7 @@ send_scan_req: sms_log(pMac, LOGE, FL("failed to send down scan req with status = %d"), status); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); } return status; } @@ -5051,11 +5051,11 @@ QDF_STATUS csr_send_mb_scan_result_req(tpAniSirGlobal pMac, uint16_t msgLen; msgLen = (uint16_t) (sizeof(tSirSmeScanReq)); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pMsg, msgLen, 0); + qdf_mem_set(pMsg, msgLen, 0); pMsg->messageType = eWNI_SME_SCAN_REQ; pMsg->length = msgLen; pMsg->sessionId = sessionId; @@ -5104,7 +5104,7 @@ static void csr_diag_scan_channels(tpAniSirGlobal pMac, tSmeCmd *pCommand) (uint8_t) pCommand->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels; if (pScanLog->numChannel && (pScanLog->numChannel < HOST_LOG_MAX_NUM_CHANNEL)) { - cdf_mem_copy(pScanLog->channels, + qdf_mem_copy(pScanLog->channels, pCommand->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList, pScanLog->numChannel); } @@ -5164,7 +5164,7 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) && (NULL != cmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList)) { len = cmd->u.scanCmd.u.scanRequest.ChannelInfo.numOfChannels; /* allocate twice the channel */ - new_ch_info.ChannelList = (uint8_t *) cdf_mem_malloc(len * 2); + new_ch_info.ChannelList = (uint8_t *) qdf_mem_malloc(len * 2); ch_lst = cmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList; } else { /* get the valid channel list to scan all. */ @@ -5174,7 +5174,7 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) if (QDF_IS_STATUS_SUCCESS(status)) { /* allocate twice the channel */ new_ch_info.ChannelList = - (uint8_t *) cdf_mem_malloc(len * 2); + (uint8_t *) qdf_mem_malloc(len * 2); ch_lst = mac_ctx->roam.validChannelList; } } @@ -5193,7 +5193,7 @@ csr_issue_user_scan(tpAniSirGlobal mac_ctx, tSmeCmd *cmd) * ch_lst points to the channellist from the command, * free it. */ - cdf_mem_free( + qdf_mem_free( cmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList); cmd->u.scanCmd.u.scanRequest.ChannelInfo.ChannelList = NULL; @@ -5333,7 +5333,7 @@ static bool csr_scan_filter_ibss_chnl_band(tpAniSirGlobal mac_ctx, dst_req->ChannelInfo.numOfChannels) ? dst_req->ChannelInfo.numOfChannels : WNI_CFG_VALID_CHANNEL_LIST_LEN; - cdf_mem_copy(valid_chnl_list, dst_req->ChannelInfo.ChannelList, + qdf_mem_copy(valid_chnl_list, dst_req->ChannelInfo.ChannelList, valid_chnl_len); } for (i = 0; i < valid_chnl_len; i++) { @@ -5362,13 +5362,13 @@ static bool csr_scan_filter_ibss_chnl_band(tpAniSirGlobal mac_ctx, } if (dst_req->ChannelInfo.ChannelList) { - cdf_mem_free(dst_req->ChannelInfo.ChannelList); + qdf_mem_free(dst_req->ChannelInfo.ChannelList); dst_req->ChannelInfo.ChannelList = NULL; dst_req->ChannelInfo.numOfChannels = 0; } dst_req->ChannelInfo.ChannelList = - cdf_mem_malloc(filter_chnl_len * + qdf_mem_malloc(filter_chnl_len * sizeof(*dst_req->ChannelInfo.ChannelList)); dst_req->ChannelInfo.numOfChannels = filter_chnl_len; if (NULL == dst_req->ChannelInfo.ChannelList) { @@ -5376,7 +5376,7 @@ static bool csr_scan_filter_ibss_chnl_band(tpAniSirGlobal mac_ctx, FL("Memory allocation failed")); return false; } - cdf_mem_copy(dst_req->ChannelInfo.ChannelList, valid_chnl_list, + qdf_mem_copy(dst_req->ChannelInfo.ChannelList, valid_chnl_list, filter_chnl_len); return true; } @@ -5409,7 +5409,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, status = csr_scan_free_request(mac_ctx, dst_req); if (!QDF_IS_STATUS_SUCCESS(status)) goto complete; - cdf_mem_copy(dst_req, src_req, sizeof(tCsrScanRequest)); + qdf_mem_copy(dst_req, src_req, sizeof(tCsrScanRequest)); /* Re-initialize the pointers to NULL since we did a copy */ dst_req->pIEField = NULL; dst_req->ChannelInfo.ChannelList = NULL; @@ -5417,7 +5417,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, if (src_req->uIEFieldLen) { dst_req->pIEField = - cdf_mem_malloc(src_req->uIEFieldLen); + qdf_mem_malloc(src_req->uIEFieldLen); if (NULL == dst_req->pIEField) { status = QDF_STATUS_E_NOMEM; sms_log(mac_ctx, LOGE, @@ -5425,7 +5425,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, goto complete; } else { status = QDF_STATUS_SUCCESS; - cdf_mem_copy(dst_req->pIEField, src_req->pIEField, + qdf_mem_copy(dst_req->pIEField, src_req->pIEField, src_req->uIEFieldLen); dst_req->uIEFieldLen = src_req->uIEFieldLen; } @@ -5437,7 +5437,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->ChannelInfo.numOfChannels = 0; } else { dst_req->ChannelInfo.ChannelList = - cdf_mem_malloc(src_req->ChannelInfo.numOfChannels * + qdf_mem_malloc(src_req->ChannelInfo.numOfChannels * sizeof(*dst_req->ChannelInfo.ChannelList)); if (NULL == dst_req->ChannelInfo.ChannelList) { status = QDF_STATUS_E_NOMEM; @@ -5524,7 +5524,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, dst_req->SSIDs.SSIDList = NULL; } else { dst_req->SSIDs.SSIDList = - cdf_mem_malloc(src_req->SSIDs.numOfSSIDs * + qdf_mem_malloc(src_req->SSIDs.numOfSSIDs * sizeof(*dst_req->SSIDs.SSIDList)); if (NULL == dst_req->SSIDs.SSIDList) status = QDF_STATUS_E_NOMEM; @@ -5533,7 +5533,7 @@ QDF_STATUS csr_scan_copy_request(tpAniSirGlobal mac_ctx, if (QDF_IS_STATUS_SUCCESS(status)) { dst_req->SSIDs.numOfSSIDs = src_req->SSIDs.numOfSSIDs; - cdf_mem_copy(dst_req->SSIDs.SSIDList, + qdf_mem_copy(dst_req->SSIDs.SSIDList, src_req->SSIDs.SSIDList, src_req->SSIDs.numOfSSIDs * sizeof(*dst_req->SSIDs.SSIDList)); @@ -5562,17 +5562,17 @@ QDF_STATUS csr_scan_free_request(tpAniSirGlobal pMac, tCsrScanRequest *pReq) { if (pReq->ChannelInfo.ChannelList) { - cdf_mem_free(pReq->ChannelInfo.ChannelList); + qdf_mem_free(pReq->ChannelInfo.ChannelList); pReq->ChannelInfo.ChannelList = NULL; } pReq->ChannelInfo.numOfChannels = 0; if (pReq->pIEField) { - cdf_mem_free(pReq->pIEField); + qdf_mem_free(pReq->pIEField); pReq->pIEField = NULL; } pReq->uIEFieldLen = 0; if (pReq->SSIDs.SSIDList) { - cdf_mem_free(pReq->SSIDs.SSIDList); + qdf_mem_free(pReq->SSIDs.SSIDList); pReq->SSIDs.SSIDList = NULL; } pReq->SSIDs.numOfSSIDs = 0; @@ -5674,7 +5674,7 @@ static void csr_sta_ap_conc_timer_handler(void *pv) (csr_is_concurrent_infra_connected(mac_ctx)) && (scan_cmd->u.scanCmd.u.scanRequest.p2pSearch != 1)) || (csr_is_p2p_session_connected(mac_ctx)))) { - cdf_mem_set(&scan_req, sizeof(tCsrScanRequest), 0); + qdf_mem_set(&scan_req, sizeof(tCsrScanRequest), 0); /* optimize this to use 2 command buffer only */ send_scancmd = csr_get_command_buffer(mac_ctx); @@ -5706,12 +5706,12 @@ static void csr_sta_ap_conc_timer_handler(void *pv) * to be modified for split scan */ if (scan_req.ChannelInfo.ChannelList != NULL) { - cdf_mem_free(scan_req.ChannelInfo.ChannelList); + qdf_mem_free(scan_req.ChannelInfo.ChannelList); scan_req.ChannelInfo.ChannelList = NULL; } chn_info->numOfChannels = numchan_combinedconc; - cdf_mem_copy(&channel_to_scan[0], + qdf_mem_copy(&channel_to_scan[0], &scan_cmd->u.scanCmd.u.scanRequest.ChannelInfo. ChannelList[0], chn_info->numOfChannels * sizeof(uint8_t)); @@ -5848,7 +5848,7 @@ bool csr_scan_remove_fresh_scan_command(tpAniSirGlobal pMac, uint8_t sessionId) tDblLinkList localList; tDblLinkList *pCmdList; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return fRet; @@ -5946,23 +5946,23 @@ QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, return status; *pNumItems = 0; - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } @@ -5980,14 +5980,14 @@ QDF_STATUS csr_scan_get_pmkid_candidate_list(tpAniSirGlobal pMac, if (pSession->NumPmkidCandidate) { *pNumItems = pSession->NumPmkidCandidate; - cdf_mem_copy(pPmkidList, pSession->PmkidCandidateInfo, + qdf_mem_copy(pPmkidList, pSession->PmkidCandidateInfo, pSession->NumPmkidCandidate * sizeof(tPmkidCandidateInfo)); } csr_scan_result_purge(pMac, hBSSList); csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } @@ -6017,23 +6017,23 @@ QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, return status; *pNumItems = 0; - pScanFilter = cdf_mem_malloc(sizeof(tCsrScanResultFilter)); + pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter)); if (NULL == pScanFilter) return QDF_STATUS_E_NOMEM; - cdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); + qdf_mem_set(pScanFilter, sizeof(tCsrScanResultFilter), 0); /* Here is the profile we need to connect to */ status = csr_roam_prepare_filter_from_profile(pMac, pSession->pCurRoamProfile, pScanFilter); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } status = csr_scan_get_result(pMac, pScanFilter, &hBSSList); if (!QDF_IS_STATUS_SUCCESS(status)) { csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } @@ -6050,14 +6050,14 @@ QDF_STATUS csr_scan_get_bkid_candidate_list(tpAniSirGlobal pMac, if (pSession->NumBkidCandidate) { *pNumItems = pSession->NumBkidCandidate; - cdf_mem_copy(pBkidList, pSession->BkidCandidateInfo, + qdf_mem_copy(pBkidList, pSession->BkidCandidateInfo, pSession->NumBkidCandidate * sizeof(tBkidCandidateInfo)); } csr_scan_result_purge(pMac, hBSSList); csr_free_scan_filter(pMac, pScanFilter); - cdf_mem_free(pScanFilter); + qdf_mem_free(pScanFilter); return status; } #endif /* FEATURE_WLAN_WAPI */ @@ -6137,9 +6137,9 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, goto error; } - cdf_mem_set(&scan_cmd->u.scanCmd, sizeof(tScanCmd), 0); + qdf_mem_set(&scan_cmd->u.scanCmd, sizeof(tScanCmd), 0); scan_cmd->u.scanCmd.pToRoamProfile = - cdf_mem_malloc(sizeof(tCsrRoamProfile)); + qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == scan_cmd->u.scanCmd.pToRoamProfile) status = QDF_STATUS_E_NOMEM; @@ -6160,7 +6160,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, /* let it wrap around */ wma_get_scan_id(&scan_cmd->u.scanCmd.scanID); - cdf_mem_set(&scan_cmd->u.scanCmd.u.scanRequest, + qdf_mem_set(&scan_cmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest), 0); status = qdf_mc_timer_init(&scan_cmd->u.scanCmd.csr_scan_timer, QDF_TIMER_TYPE_SW, @@ -6179,18 +6179,18 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, /* Allocate memory for IE field */ if (profile->pAddIEScan) { scan_req->pIEField = - cdf_mem_malloc(profile->nAddIEScanLength); + qdf_mem_malloc(profile->nAddIEScanLength); if (NULL == scan_req->pIEField) status = QDF_STATUS_E_NOMEM; else status = QDF_STATUS_SUCCESS; - cdf_mem_set(scan_req->pIEField, + qdf_mem_set(scan_req->pIEField, profile->nAddIEScanLength, 0); if (QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_copy(scan_req->pIEField, + qdf_mem_copy(scan_req->pIEField, profile->pAddIEScan, profile->nAddIEScanLength); scan_req->uIEFieldLen = profile->nAddIEScanLength; @@ -6235,7 +6235,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, if (profile->ChannelInfo.numOfChannels) { scan_req->ChannelInfo.ChannelList = - cdf_mem_malloc(sizeof(*scan_req->ChannelInfo.ChannelList) * + qdf_mem_malloc(sizeof(*scan_req->ChannelInfo.ChannelList) * profile->ChannelInfo.numOfChannels); if (NULL == scan_req->ChannelInfo.ChannelList) @@ -6259,7 +6259,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, if (profile->SSIDs.numOfSSIDs) { scan_req->SSIDs.SSIDList = - cdf_mem_malloc(profile->SSIDs.numOfSSIDs * + qdf_mem_malloc(profile->SSIDs.numOfSSIDs * sizeof(tCsrSSIDInfo)); if (NULL == scan_req->SSIDs.SSIDList) @@ -6273,7 +6273,7 @@ QDF_STATUS csr_scan_for_ssid(tpAniSirGlobal mac_ctx, uint32_t session_id, ssids = &scan_req->SSIDs; ssids->numOfSSIDs = 1; - cdf_mem_copy(scan_req->SSIDs.SSIDList, + qdf_mem_copy(scan_req->SSIDs.SSIDList, profile->SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); } @@ -6338,11 +6338,11 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, /* allocate maximum space for all channels */ dataLen = WNI_CFG_VALID_CHANNEL_LIST_LEN * sizeof(tSirMacChanInfo); - pBuf = cdf_mem_malloc(dataLen); + pBuf = qdf_mem_malloc(dataLen); if (pBuf == NULL) return; - cdf_mem_set(pBuf, dataLen, 0); + qdf_mem_set(pBuf, dataLen, 0); ch_pwr_set = (tSirMacChanInfo *) (pBuf); pEntry = csr_ll_peek_head(pList, LL_ACCESS_LOCK); /* @@ -6418,7 +6418,7 @@ void csr_save_tx_power_to_cfg(tpAniSirGlobal pMac, tDblLinkList *pList, if (cbLen) cfg_set_str(pMac, cfgId, (uint8_t *) pBuf, cbLen); - cdf_mem_free(pBuf); + qdf_mem_free(pBuf); } void csr_set_cfg_country_code(tpAniSirGlobal pMac, uint8_t *countryCode) @@ -6427,7 +6427,7 @@ void csr_set_cfg_country_code(tpAniSirGlobal pMac, uint8_t *countryCode) /* v_REGDOMAIN_t DomainId */ sms_log(pMac, LOG3, FL("Setting Country Code in Cfg %s"), countryCode); - cdf_mem_copy(cc, countryCode, WNI_CFG_COUNTRY_CODE_LEN); + qdf_mem_copy(cc, countryCode, WNI_CFG_COUNTRY_CODE_LEN); /* * don't program the bogus country codes that we created for Korea in the @@ -6482,9 +6482,9 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, uint8_t *pControlList = NULL; uint32_t len = WNI_CFG_SCAN_CONTROL_LIST_LEN; - pControlList = cdf_mem_malloc(WNI_CFG_SCAN_CONTROL_LIST_LEN); + pControlList = qdf_mem_malloc(WNI_CFG_SCAN_CONTROL_LIST_LEN); if (pControlList != NULL) { - cdf_mem_set((void *)pControlList, WNI_CFG_SCAN_CONTROL_LIST_LEN, + qdf_mem_set((void *)pControlList, WNI_CFG_SCAN_CONTROL_LIST_LEN, 0); if (IS_SIR_STATUS_SUCCESS(wlan_cfg_get_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, @@ -6516,7 +6516,7 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode, cfg_set_str(pMac, WNI_CFG_SCAN_CONTROL_LIST, pControlList, len); } /* Successfully getting scan control list */ - cdf_mem_free(pControlList); + qdf_mem_free(pControlList); } /* AllocateMemory */ } @@ -6547,7 +6547,7 @@ void csr_remove_cmd_with_session_id_from_pending_list(tpAniSirGlobal pMac, tSmeCmd *pCommand; tListElem *pEntryToRemove; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL("failed to open list")); return; @@ -6597,7 +6597,7 @@ void csr_remove_cmd_from_pending_list(tpAniSirGlobal pMac, tSmeCmd *pCommand; tListElem *pEntryToRemove; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; @@ -6655,7 +6655,7 @@ void csr_remove_scan_for_ssid_from_pending_list(tpAniSirGlobal pMac, tSmeCmd *pCommand; tListElem *pEntryToRemove; - cdf_mem_zero(&localList, sizeof(tDblLinkList)); + qdf_mem_zero(&localList, sizeof(tDblLinkList)); if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { sms_log(pMac, LOGE, FL(" failed to open list")); return; @@ -6712,13 +6712,13 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_SUCCESS; msg_len = (uint16_t)(sizeof(tSirSmeScanAbortReq)); - msg = cdf_mem_malloc(msg_len); + msg = qdf_mem_malloc(msg_len); if (NULL == msg) { sms_log(mac_ctx, LOGE, FL("Failed to alloc memory for SmeScanAbortReq")); return; } - cdf_mem_zero((void *)msg, msg_len); + qdf_mem_zero((void *)msg, msg_len); msg->type = eWNI_SME_SCAN_ABORT_IND; msg->msgLen = msg_len; msg->sessionId = session_id; @@ -6728,7 +6728,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx, scan_id, session_id); status = cds_send_mb_message_to_mac(msg); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(msg); + qdf_mem_free(msg); sms_log(mac_ctx, LOGE, FL("Failed to send abort scan.scan_id %d session %d"), scan_id, session_id); @@ -6833,7 +6833,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, tpSirMacMgmtHdr macHeader = (tpSirMacMgmtHdr) pPrefNetworkFoundInd->data; parsed_frm = - (tpSirProbeRespBeacon) cdf_mem_malloc(sizeof(tSirProbeRespBeacon)); + (tpSirProbeRespBeacon) qdf_mem_malloc(sizeof(tSirProbeRespBeacon)); if (NULL == parsed_frm) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); @@ -6843,7 +6843,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("Incorrect len(%d)"), pPrefNetworkFoundInd->frameLength); - cdf_mem_free(parsed_frm); + qdf_mem_free(parsed_frm); return QDF_STATUS_E_FAILURE; } if (sir_convert_probe_frame2_struct(pMac, @@ -6853,7 +6853,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, || !parsed_frm->ssidPresent) { sms_log(pMac, LOGE, FL("Parse error ProbeResponse, length=%d"), pPrefNetworkFoundInd->frameLength); - cdf_mem_free(parsed_frm); + qdf_mem_free(parsed_frm); return QDF_STATUS_E_FAILURE; } /* 24 byte MAC header and 12 byte to ssid IE */ @@ -6862,13 +6862,13 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, uLen = pPrefNetworkFoundInd->frameLength - (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET); } - pScanResult = cdf_mem_malloc(sizeof(tCsrScanResult) + uLen); + pScanResult = qdf_mem_malloc(sizeof(tCsrScanResult) + uLen); if (NULL == pScanResult) { sms_log(pMac, LOGE, FL("fail to allocate memory for frame")); - cdf_mem_free(parsed_frm); + qdf_mem_free(parsed_frm); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(pScanResult, sizeof(tCsrScanResult) + uLen, 0); + qdf_mem_set(pScanResult, sizeof(tCsrScanResult) + uLen, 0); pBssDescr = &pScanResult->Result.BssDescriptor; /* * Length of BSS desription is without length of length itself and @@ -6912,7 +6912,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, pBssDescr->timeStamp[0] = parsed_frm->timeStamp[0]; pBssDescr->timeStamp[1] = parsed_frm->timeStamp[1]; pBssDescr->capabilityInfo = *((uint16_t *)&parsed_frm->capabilityInfo); - cdf_mem_copy((uint8_t *) &pBssDescr->bssId, + qdf_mem_copy((uint8_t *) &pBssDescr->bssId, (uint8_t *) macHeader->bssId, sizeof(tSirMacAddr)); pBssDescr->nReceivedTime = (uint32_t) qdf_mc_timer_get_system_ticks(); sms_log(pMac, LOG2, FL("Bssid= "MAC_ADDRESS_STR" chan= %d, rssi = %d"), @@ -6920,7 +6920,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, pBssDescr->rssi); /* IEs */ if (uLen) { - cdf_mem_copy(&pBssDescr->ieFields, + qdf_mem_copy(&pBssDescr->ieFields, pPrefNetworkFoundInd->data + (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET), uLen); } @@ -6930,7 +6930,7 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, if (!(local_ie || QDF_IS_STATUS_SUCCESS(status))) { sms_log(pMac, LOGE, FL("Cannot parse IEs")); csr_free_scan_result_entry(pMac, pScanResult); - cdf_mem_free(parsed_frm); + qdf_mem_free(parsed_frm); return QDF_STATUS_E_RESOURCES; } @@ -6943,9 +6943,9 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, sms_log(pMac, LOGE, FL("BSS limit reached")); /* Free the resources */ if ((pScanResult->Result.pvIes == NULL) && local_ie) - cdf_mem_free(local_ie); + qdf_mem_free(local_ie); csr_free_scan_result_entry(pMac, pScanResult); - cdf_mem_free(parsed_frm); + qdf_mem_free(parsed_frm); return QDF_STATUS_E_RESOURCES; } /* Add to scan cache */ @@ -6953,8 +6953,8 @@ QDF_STATUS csr_scan_save_preferred_network_found(tpAniSirGlobal pMac, pPrefNetworkFoundInd->sessionId); if ((pScanResult->Result.pvIes == NULL) && local_ie) - cdf_mem_free(local_ie); - cdf_mem_free(parsed_frm); + qdf_mem_free(local_ie); + qdf_mem_free(parsed_frm); return QDF_STATUS_SUCCESS; } #endif /* FEATURE_WLAN_SCAN_PNO */ @@ -7005,7 +7005,7 @@ void csr_init_occupied_channels_list(tpAniSirGlobal pMac, uint8_t sessionId) * csr_get_parsed_bss_description_ies */ if ((pBssDesc->Result.pvIes == NULL) && pIes) - cdf_mem_free(pIes); + qdf_mem_free(pIes); pEntry = csr_ll_next(&pMac->scan.scanResultList, pEntry, LL_ACCESS_NOLOCK); } /* while */ @@ -7046,15 +7046,15 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, status = QDF_STATUS_E_FAILURE; goto free_mem; } - pNewBssDescriptor = cdf_mem_malloc(size); + pNewBssDescriptor = qdf_mem_malloc(size); if (NULL == pNewBssDescriptor) { sms_log(pMac, LOGE, FL("memory allocation failed")); status = QDF_STATUS_E_FAILURE; goto free_mem; } - cdf_mem_copy(pNewBssDescriptor, pSession->pConnectBssDesc, size); + qdf_mem_copy(pNewBssDescriptor, pSession->pConnectBssDesc, size); /* change the BSSID & channel as passed */ - cdf_mem_copy(pNewBssDescriptor->bssId, bssid.bytes, + qdf_mem_copy(pNewBssDescriptor->bssId, bssid.bytes, sizeof(tSirMacAddr)); pNewBssDescriptor->channelId = channel; if (NULL == csr_scan_append_bss_description(pMac, pNewBssDescriptor, @@ -7068,10 +7068,10 @@ QDF_STATUS csr_scan_create_entry_in_scan_cache(tpAniSirGlobal pMac, free_mem: if (pNewIes) { - cdf_mem_free(pNewIes); + qdf_mem_free(pNewIes); } if (pNewBssDescriptor) { - cdf_mem_free(pNewBssDescriptor); + qdf_mem_free(pNewBssDescriptor); } return status; } @@ -7116,15 +7116,15 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, length = roam_sync_ind_ptr->beaconProbeRespLength - (SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET); - scan_res_ptr = cdf_mem_malloc(sizeof(tCsrScanResult) + length); + scan_res_ptr = qdf_mem_malloc(sizeof(tCsrScanResult) + length); if (scan_res_ptr == NULL) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, " fail to allocate memory for frame"); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(scan_res_ptr, sizeof(tCsrScanResult) + length); - cdf_mem_copy(&scan_res_ptr->Result.BssDescriptor, + qdf_mem_zero(scan_res_ptr, sizeof(tCsrScanResult) + length); + qdf_mem_copy(&scan_res_ptr->Result.BssDescriptor, bss_desc_ptr, (sizeof(tSirBssDescription) + length)); ies_local_ptr = (tDot11fBeaconIEs *)(scan_res_ptr->Result.pvIes); @@ -7146,7 +7146,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s:BSS Limit Exceed", __func__); if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr) - cdf_mem_free(ies_local_ptr); + qdf_mem_free(ies_local_ptr); csr_free_scan_result_entry(pMac, scan_res_ptr); return QDF_STATUS_E_RESOURCES; @@ -7181,7 +7181,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, if (csr_ll_is_list_empty(&bss_list->List, LL_ACCESS_NOLOCK)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("bss_list->List is empty")); - cdf_mem_free(bss_list); + qdf_mem_free(bss_list); return NULL; } first_element = csr_ll_peek_head(&bss_list->List, LL_ACCESS_NOLOCK); @@ -7189,7 +7189,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle, scan_result = GET_BASE_ADDR(first_element, tCsrScanResult, Link); - cdf_mem_copy(bss_descr, + qdf_mem_copy(bss_descr, &scan_result->Result.BssDescriptor, sizeof(tSirBssDescription)); } @@ -7230,13 +7230,13 @@ void csr_scan_active_list_timeout_handle(void *userData) FL("Scan Timeout:Sending abort to Firmware ID %d session %d "), scan_id, scan_cmd->sessionId); msg_len = (uint16_t)(sizeof(tSirSmeScanAbortReq)); - msg = cdf_mem_malloc(msg_len); + msg = qdf_mem_malloc(msg_len); if (NULL == msg) { sms_log(mac_ctx, LOGE, FL("Failed to alloc memory for SmeScanAbortReq")); return; } - cdf_mem_zero((void *)msg, msg_len); + qdf_mem_zero((void *)msg, msg_len); msg->type = eWNI_SME_SCAN_ABORT_IND; msg->msgLen = msg_len; msg->sessionId = scan_cmd->sessionId; @@ -7245,7 +7245,7 @@ void csr_scan_active_list_timeout_handle(void *userData) if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(mac_ctx, LOGE, FL(" Failed to post message to LIM")); - cdf_mem_free(msg); + qdf_mem_free(msg); } csr_release_scan_command(mac_ctx, scan_cmd, eCSR_SCAN_FAILURE); return; diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 4241ee51ef44..2e52aa4312e3 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -34,7 +34,7 @@ #include "csr_link_list.h" #include "qdf_lock.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "qdf_trace.h" #include "qdf_mc_timer.h" diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 60599908bd22..36e01046377a 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -110,15 +110,15 @@ static void csr_neighbor_roam_send_lfr_metric_event( { tCsrRoamInfo *roam_info; - roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo)); + roam_info = qdf_mem_malloc(sizeof(tCsrRoamInfo)); if (NULL == roam_info) { sms_log(mac_ctx, LOG1, FL("Memory allocation failed!")); } else { - cdf_mem_copy((void *)roam_info->bssid, + qdf_mem_copy((void *)roam_info->bssid, (void *)bssid, sizeof(*roam_info)); csr_roam_call_callback(mac_ctx, session_id, roam_info, 0, status, 0); - cdf_mem_free(roam_info); + qdf_mem_free(roam_info); } } #else @@ -150,10 +150,10 @@ void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, { if (neighborRoamBSSNode) { if (neighborRoamBSSNode->pBssDescription) { - cdf_mem_free(neighborRoamBSSNode->pBssDescription); + qdf_mem_free(neighborRoamBSSNode->pBssDescription); neighborRoamBSSNode->pBssDescription = NULL; } - cdf_mem_free(neighborRoamBSSNode); + qdf_mem_free(neighborRoamBSSNode); neighborRoamBSSNode = NULL; } @@ -623,7 +623,7 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo rChInfo->currentChannelListInfo.numOfChannels = 0; if (rChInfo->currentChannelListInfo.ChannelList) - cdf_mem_free(rChInfo->currentChannelListInfo. + qdf_mem_free(rChInfo->currentChannelListInfo. ChannelList); rChInfo->currentChannelListInfo.ChannelList = NULL; @@ -648,11 +648,11 @@ static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac, pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0; pNeighborRoamInfo->FTRoamInfo.neighborRptPending = false; pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0; - cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, + qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT); pNeighborRoamInfo->uOsRequestedHandoff = 0; - cdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo, + qdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo, sizeof(tCsrHandoffRequest)); } @@ -684,11 +684,11 @@ void csr_neighbor_roam_reset_connected_state_control_info(tpAniSirGlobal pMac, pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0; pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0; pNeighborRoamInfo->FTRoamInfo.preauthRspPending = 0; - cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, + qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT); pNeighborRoamInfo->uOsRequestedHandoff = 0; - cdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo, + qdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo, sizeof(tCsrHandoffRequest)); } @@ -754,7 +754,7 @@ void csr_neighbor_roam_purge_preauth_fail_list(tpAniSirGlobal pMac) pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[i]; while (pNeighborRoamInfo->FTRoamInfo.preAuthFailList. numMACAddress) { - cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. + qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. preAuthFailList. macAddress[pNeighborRoamInfo->FTRoamInfo. preAuthFailList.numMACAddress - @@ -792,7 +792,7 @@ QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, for (i = 0; i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress; i++) { - if (true == cdf_mem_compare( + if (true != qdf_mem_cmp( neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i], bssid, sizeof(tSirMacAddr))) { sms_log(mac_ctx, LOGW, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"), @@ -806,7 +806,7 @@ QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, FL("Cannot add, preauth fail list is full.")); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. + qdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. macAddress[num_mac_addr], bssid, sizeof(tSirMacAddr)); neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress++; @@ -840,8 +840,8 @@ bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, for (i = 0; i < pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress; i++) { - if (true == - cdf_mem_compare(pNeighborRoamInfo->FTRoamInfo. + if (true != + qdf_mem_cmp(pNeighborRoamInfo->FTRoamInfo. preAuthFailList.macAddress[i], bssId, sizeof(tSirMacAddr))) { NEIGHBOR_ROAM_DEBUG(pMac, LOGE, @@ -1144,7 +1144,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, return QDF_STATUS_E_FAILURE; } - bss_info_ptr = cdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); + bss_info_ptr = qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); if (NULL == bss_info_ptr) { sms_log(pMac, LOGE, FL("LFR3:Memory allocation for Neighbor Roam BSS Info failed")); @@ -1152,15 +1152,15 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, } bss_desc_len = roam_sync_ind_ptr->bss_desc_ptr->length + sizeof(roam_sync_ind_ptr->bss_desc_ptr->length); - bss_info_ptr->pBssDescription = cdf_mem_malloc(bss_desc_len); + bss_info_ptr->pBssDescription = qdf_mem_malloc(bss_desc_len); if (bss_info_ptr->pBssDescription != NULL) { - cdf_mem_copy(bss_info_ptr->pBssDescription, + qdf_mem_copy(bss_info_ptr->pBssDescription, roam_sync_ind_ptr->bss_desc_ptr, bss_desc_len); } else { sms_log(pMac, LOGE, FL("LFR3:Mem alloc for Neighbor Roam BSS Descriptor failed")); - cdf_mem_free(bss_info_ptr); + qdf_mem_free(bss_info_ptr); return QDF_STATUS_E_NOMEM; } @@ -1205,7 +1205,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (pScanFilter == NULL) return QDF_STATUS_E_FAILURE; - cdf_mem_zero(pScanFilter, sizeof(tCsrScanResultFilter)); + qdf_mem_zero(pScanFilter, sizeof(tCsrScanResultFilter)); roam_params = &pMac->roam.configParam.roam_params; /* We dont want to set BSSID based Filter */ pScanFilter->BSSIDs.numOfBSSIDs = 0; @@ -1214,7 +1214,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, if (nbr_roam_info->uOsRequestedHandoff) { pScanFilter->BSSIDs.numOfBSSIDs = 1; pScanFilter->BSSIDs.bssid = - cdf_mem_malloc(sizeof(tSirMacAddr) * + qdf_mem_malloc(sizeof(tSirMacAddr) * pScanFilter->BSSIDs.numOfBSSIDs); if (NULL == pScanFilter->BSSIDs.bssid) { sms_log(pMac, LOGE, @@ -1222,7 +1222,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pScanFilter->BSSIDs.bssid, + qdf_mem_zero(pScanFilter->BSSIDs.bssid, sizeof(tSirMacAddr) * pScanFilter->BSSIDs.numOfBSSIDs); @@ -1239,7 +1239,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, pScanFilter->SSIDs.numOfSSIDs = roam_params->num_ssid_allowed_list; pScanFilter->SSIDs.SSIDList = - cdf_mem_malloc(sizeof(tCsrSSIDInfo) * + qdf_mem_malloc(sizeof(tCsrSSIDInfo) * pScanFilter->SSIDs.numOfSSIDs); if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, @@ -1249,7 +1249,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, for (i = 0; i < roam_params->num_ssid_allowed_list; i++) { pScanFilter->SSIDs.SSIDList[i].handoffPermitted = 1; pScanFilter->SSIDs.SSIDList[i].ssidHidden = 0; - cdf_mem_copy((void *) + qdf_mem_copy((void *) pScanFilter->SSIDs.SSIDList[i].SSID.ssId, roam_params->ssid_allowed_list[i].ssId, roam_params->ssid_allowed_list[i].length); @@ -1260,7 +1260,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, /* Populate all the information from the connected profile */ pScanFilter->SSIDs.numOfSSIDs = 1; pScanFilter->SSIDs.SSIDList = - cdf_mem_malloc(sizeof(tCsrSSIDInfo)); + qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (NULL == pScanFilter->SSIDs.SSIDList) { sms_log(pMac, LOGE, FL("Scan Filter SSID mem alloc failed")); @@ -1270,7 +1270,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, pScanFilter->SSIDs.SSIDList->ssidHidden = 0; pScanFilter->SSIDs.SSIDList->SSID.length = pCurProfile->SSID.length; - cdf_mem_copy((void *)pScanFilter->SSIDs.SSIDList->SSID.ssId, + qdf_mem_copy((void *)pScanFilter->SSIDs.SSIDList->SSID.ssId, (void *)pCurProfile->SSID.ssId, pCurProfile->SSID.length); @@ -1302,11 +1302,11 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, */ pScanFilter->ChannelInfo.numOfChannels = num_ch; pScanFilter->ChannelInfo.ChannelList = - cdf_mem_malloc(num_ch * sizeof(uint8_t)); + qdf_mem_malloc(num_ch * sizeof(uint8_t)); if (NULL == pScanFilter->ChannelInfo.ChannelList) { sms_log(pMac, LOGE, FL("Scan Filter Ch list mem alloc failed")); - cdf_mem_free(pScanFilter->SSIDs.SSIDList); + qdf_mem_free(pScanFilter->SSIDs.SSIDList); pScanFilter->SSIDs.SSIDList = NULL; return QDF_STATUS_E_NOMEM; } @@ -1352,8 +1352,8 @@ uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, while (NULL != (pScanResult = csr_scan_result_get_next(pMac, *pScanResultList))) { - if (true == - cdf_mem_compare(pScanResult->BssDescriptor.bssId, + if (true != + qdf_mem_cmp(pScanResult->BssDescriptor.bssId, nbr_roam_info->currAPbssid.bytes, sizeof(tSirMacAddr))) { /* We got a match with the currently associated AP. @@ -1451,7 +1451,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, MAC_ADDR_ARRAY(descr->bssId), abs(descr->rssi), descr->channelId); - if (true == cdf_mem_compare(descr->bssId, + if (true != qdf_mem_cmp(descr->bssId, n_roam_info->currAPbssid.bytes, sizeof(tSirMacAddr))) { /* @@ -1469,7 +1469,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, * have duplicates */ if ((n_roam_info->uOsRequestedHandoff) && - ((false == cdf_mem_compare(descr->bssId, + ((false != qdf_mem_cmp(descr->bssId, n_roam_info->handoffReqInfo.bssid.bytes, sizeof(tSirMacAddr))) || (descr->channelId != @@ -1550,22 +1550,22 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, /* Finished all checks, now add it to candidate list */ bss_info = - cdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); + qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); if (NULL == bss_info) { sms_log(mac_ctx, LOGE, FL("Memory allocation failed. Ignored candidate.")); continue; } bss_info->pBssDescription = - cdf_mem_malloc(descr->length + + qdf_mem_malloc(descr->length + sizeof(descr->length)); if (bss_info->pBssDescription != NULL) { - cdf_mem_copy(bss_info->pBssDescription, descr, + qdf_mem_copy(bss_info->pBssDescription, descr, descr->length + sizeof(descr->length)); } else { sms_log(mac_ctx, LOGE, FL("Memory allocation failed. Ignored candidate.")); - cdf_mem_free(bss_info); + qdf_mem_free(bss_info); continue; } /* @@ -1859,7 +1859,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo. numBssFromNeighborReport]. neighborScore = (uint8_t) pNeighborBssDesc->roamScore; - cdf_mem_copy(pNeighborRoamInfo->FTRoamInfo. + qdf_mem_copy(pNeighborRoamInfo->FTRoamInfo. neighboReportBssInfo[pNeighborRoamInfo->FTRoamInfo. numBssFromNeighborReport]. neighborBssId, @@ -1921,7 +1921,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba if (pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList) { - cdf_mem_free(pNeighborRoamInfo->roamChannelInfo. + qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. currentChannelListInfo.ChannelList); } @@ -1933,7 +1933,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba if (numChannels) pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList = - cdf_mem_malloc((numChannels) * sizeof(uint8_t)); + qdf_mem_malloc((numChannels) * sizeof(uint8_t)); if (NULL == pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList) { @@ -1943,7 +1943,7 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. + qdf_mem_copy(pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList, channelList, (numChannels) * sizeof(uint8_t)); pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. numOfChannels = numChannels; @@ -2101,7 +2101,7 @@ bool csr_neighbor_roam_is_new_connected_profile(tpAniSirGlobal pMac, fNew = false; } if (pIes) { - cdf_mem_free(pIes); + qdf_mem_free(pIes); } } @@ -2216,7 +2216,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx) FL("Roaming parameters are reset")); roam_params = &mac_ctx->roam.configParam.roam_params; roam_params->num_ssid_allowed_list = 0; - cdf_mem_set(&roam_params->ssid_allowed_list, 0, + qdf_mem_set(&roam_params->ssid_allowed_list, 0, sizeof(tSirMacSSid) * MAX_SSID_ALLOWED_LIST); } @@ -2276,7 +2276,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, } #ifdef FEATURE_WLAN_ESE if (pSession->connectedProfile.isESEAssoc) { - cdf_mem_copy(&pSession->prevApSSID, + qdf_mem_copy(&pSession->prevApSSID, &pSession->connectedProfile.SSID, sizeof(tSirMacSSid)); qdf_copy_macaddr(&pSession->prevApBssid, @@ -2466,7 +2466,7 @@ static void csr_neighbor_roam_info_ctx_init( QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Free Reassoc Rsp"); - cdf_mem_free(pMac->roam.pReassocResp); + qdf_mem_free(pMac->roam.pReassocResp); pMac->roam.pReassocResp = NULL; } } else @@ -2537,7 +2537,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( session->roam_synch_data->authStatus)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3:csr_neighbor_roam_indicate_connect"); - msg = cdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq)); + msg = qdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq)); if (msg == NULL) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "LFR3:Mem Alloc failed for beacon Filter Req"); @@ -2615,7 +2615,7 @@ void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac) i < pNeighborRoamInfo->FTRoamInfo.preAuthFailList. numMACAddress; i++) { - cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. + qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. preAuthFailList.macAddress[i], sizeof(tSirMacAddr)); } @@ -2661,7 +2661,7 @@ QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) pFTRoamInfo->currentNeighborRptRetryNum = 0; pFTRoamInfo->numBssFromNeighborReport = 0; - cdf_mem_zero(pFTRoamInfo->neighboReportBssInfo, + qdf_mem_zero(pFTRoamInfo->neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT); @@ -2730,7 +2730,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) numChannels; if (pNeighborRoamInfo->cfgParams.channelInfo.numOfChannels != 0) { pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = - cdf_mem_malloc(pMac->roam.configParam.neighborRoamConfig. + qdf_mem_malloc(pMac->roam.configParam.neighborRoamConfig. neighborScanChanList.numChannels); if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) { @@ -2746,7 +2746,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) } /* Update the roam global structure from CFG */ - cdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList, + qdf_mem_copy(pNeighborRoamInfo->cfgParams.channelInfo.ChannelList, pMac->roam.configParam.neighborRoamConfig. neighborScanChanList.channelList, pMac->roam.configParam.neighborRoamConfig. @@ -2777,13 +2777,13 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) pNeighborRoamInfo->cfgParams.nRoamBmissFinalBcnt; pNeighborRoamInfo->currentRoamBeaconRssiWeight = pNeighborRoamInfo->cfgParams.nRoamBeaconRssiWeight; - cdf_mem_set(&pNeighborRoamInfo->prevConnProfile, + qdf_mem_set(&pNeighborRoamInfo->prevConnProfile, sizeof(tCsrRoamConnectedProfile), 0); status = csr_ll_open(pMac->hHdd, &pNeighborRoamInfo->roamableAPList); if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); - cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. + qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; return QDF_STATUS_E_RESOURCES; @@ -2800,7 +2800,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) status = csr_neighbor_roam_init11r_assoc_info(pMac); if (QDF_STATUS_SUCCESS != status) { sms_log(pMac, LOGE, FL("LL Open of roam able AP List failed")); - cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. + qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; csr_ll_close(&pNeighborRoamInfo->roamableAPList); @@ -2839,7 +2839,7 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) } if (pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) - cdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. + qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. ChannelList); pNeighborRoamInfo->cfgParams.channelInfo.ChannelList = NULL; @@ -2851,7 +2851,7 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) if (pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. ChannelList) { - cdf_mem_free(pNeighborRoamInfo->roamChannelInfo. + qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. currentChannelListInfo.ChannelList); } @@ -2870,7 +2870,7 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) csr_roam_free_connect_profile(&pNeighborRoamInfo->prevConnProfile); pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0; pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0; - cdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, + qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT); csr_neighbor_roam_free_roamable_bss_list(pMac, @@ -2927,11 +2927,11 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); - cdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); + qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); csr_roam_call_callback(mac_ctx, session_id, &roam_info, roamid, eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); - cdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); + qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); CSR_NEIGHBOR_ROAM_STATE_TRANSITION (mac_ctx, eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING, session_id) @@ -2954,7 +2954,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, status); return; } - cdf_mem_copy(neighbor_roam_info->csrNeighborRoamProfile.BSSIDs.bssid, + qdf_mem_copy(neighbor_roam_info->csrNeighborRoamProfile.BSSIDs.bssid, handoff_node.pBssDescription->bssId, sizeof(tSirMacAddr)); neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] = handoff_node.pBssDescription->channelId; @@ -2973,7 +2973,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, /* notify HDD for handoff, providing the BSSID too */ roam_info.reasonCode = eCsrRoamReasonBetterAP; - cdf_mem_copy(roam_info.bssid.bytes, + qdf_mem_copy(roam_info.bssid.bytes, handoff_node.pBssDescription->bssId, sizeof(struct qdf_mac_addr)); @@ -3085,7 +3085,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, } if (NULL == bss_node) return false; - cdf_mem_copy(hand_off_node, bss_node, sizeof(tCsrNeighborRoamBSSInfo)); + qdf_mem_copy(hand_off_node, bss_node, sizeof(tCsrNeighborRoamBSSInfo)); return true; } @@ -3249,12 +3249,12 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( } roam_id = GET_NEXT_ROAM_ID(&mac_ctx->roam); - profile = cdf_mem_malloc(sizeof(tCsrRoamProfile)); + profile = qdf_mem_malloc(sizeof(tCsrRoamProfile)); if (NULL == profile) { sms_log(mac_ctx, LOGE, FL("Memory alloc failed")); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(profile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(profile, sizeof(tCsrRoamProfile), 0); status = csr_roam_copy_profile(mac_ctx, profile, session->pCurRoamProfile); @@ -3266,7 +3266,7 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( profile->BSSIDs.numOfBSSIDs = 1; if (NULL == profile->BSSIDs.bssid) { profile->BSSIDs.bssid = - cdf_mem_malloc(sizeof(tSirMacAddr) * + qdf_mem_malloc(sizeof(tSirMacAddr) * profile->BSSIDs.numOfBSSIDs); if (NULL == profile->BSSIDs.bssid) { sms_log(mac_ctx, LOGE, FL("mem alloc failed for BSSID")); @@ -3275,7 +3275,7 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( } } - cdf_mem_zero(profile->BSSIDs.bssid, + qdf_mem_zero(profile->BSSIDs.bssid, sizeof(tSirMacAddr) * profile->BSSIDs.numOfBSSIDs); @@ -3288,7 +3288,7 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( profile->ChannelInfo.numOfChannels = 1; if (NULL == profile->ChannelInfo.ChannelList) { profile->ChannelInfo.ChannelList = - cdf_mem_malloc(sizeof(*profile-> + qdf_mem_malloc(sizeof(*profile-> ChannelInfo.ChannelList) * profile->ChannelInfo.numOfChannels); if (NULL == profile->ChannelInfo.ChannelList) { @@ -3311,7 +3311,7 @@ QDF_STATUS csr_neighbor_roam_process_handoff_req( end: if (NULL != profile) { csr_release_profile(mac_ctx, profile); - cdf_mem_free(profile); + qdf_mem_free(profile); } return status; @@ -3412,7 +3412,7 @@ QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( } /* sanity check */ - if (true == cdf_mem_compare(handoff_req->bssid, + if (true != qdf_mem_cmp(handoff_req->bssid, roam_ctrl_info->currAPbssid.bytes, sizeof(tSirMacAddr))) { sms_log(mac_ctx, LOGE, @@ -3424,7 +3424,7 @@ QDF_STATUS csr_neighbor_roam_handoff_req_hdlr( handoff_req->channel; roam_ctrl_info->handoffReqInfo.src = handoff_req->handoff_src; - cdf_mem_copy(&roam_ctrl_info->handoffReqInfo.bssid.bytes, + qdf_mem_copy(&roam_ctrl_info->handoffReqInfo.bssid.bytes, &handoff_req->bssid, QDF_MAC_ADDR_SIZE); roam_ctrl_info->uOsRequestedHandoff = 1; status = csr_roam_offload_scan(mac_ctx, session_id, diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c index fa9657931d6a..d6baf4ea1525 100644 --- a/core/sme/src/csr/csr_tdls_process.c +++ b/core/sme/src/csr/csr_tdls_process.c @@ -63,7 +63,7 @@ QDF_STATUS csr_tdls_remove_sme_cmd(tpAniSirGlobal pMac, eSmeCommandType cmdType) if (cmdType == pCommand->command) { if (csr_ll_remove_entry(&pMac->sme.smeCmdActiveList, pEntry, LL_ACCESS_LOCK)) { - cdf_mem_zero(&pCommand->u.tdlsCmd, + qdf_mem_zero(&pCommand->u.tdlsCmd, sizeof(tTdlsCmd)); csr_release_command(pMac, pCommand); sme_process_pending_queue(pMac); @@ -106,18 +106,18 @@ QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId, tdlsSendMgmtCmdInfo->statusCode = tdlsSendMgmt->statusCode; tdlsSendMgmtCmdInfo->responder = tdlsSendMgmt->responder; tdlsSendMgmtCmdInfo->peerCapability = tdlsSendMgmt->peerCapability; - cdf_mem_copy(tdlsSendMgmtCmdInfo->peerMac, tdlsSendMgmt->peerMac, + qdf_mem_copy(tdlsSendMgmtCmdInfo->peerMac, tdlsSendMgmt->peerMac, sizeof(tSirMacAddr)); if ((0 != tdlsSendMgmt->len) && (NULL != tdlsSendMgmt->buf)) { - tdlsSendMgmtCmdInfo->buf = cdf_mem_malloc(tdlsSendMgmt->len); + tdlsSendMgmtCmdInfo->buf = qdf_mem_malloc(tdlsSendMgmt->len); if (NULL == tdlsSendMgmtCmdInfo->buf) { status = QDF_STATUS_E_NOMEM; sms_log(pMac, LOGE, FL("Alloc Failed")); QDF_ASSERT(0); return status; } - cdf_mem_copy(tdlsSendMgmtCmdInfo->buf, tdlsSendMgmt->buf, + qdf_mem_copy(tdlsSendMgmtCmdInfo->buf, tdlsSendMgmt->buf, tdlsSendMgmt->len); tdlsSendMgmtCmdInfo->len = tdlsSendMgmt->len; } else { @@ -158,41 +158,41 @@ QDF_STATUS csr_tdls_change_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->sessionId = sessionId; - cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, + qdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmdInfo->capability = pstaParams->capability; tdlsAddStaCmdInfo->uapsdQueues = pstaParams->uapsd_queues; tdlsAddStaCmdInfo->maxSp = pstaParams->max_sp; - cdf_mem_copy(tdlsAddStaCmdInfo->extnCapability, + qdf_mem_copy(tdlsAddStaCmdInfo->extnCapability, pstaParams->extn_capability, sizeof(pstaParams->extn_capability)); tdlsAddStaCmdInfo->htcap_present = pstaParams->htcap_present; if (pstaParams->htcap_present) - cdf_mem_copy(&tdlsAddStaCmdInfo->HTCap, + qdf_mem_copy(&tdlsAddStaCmdInfo->HTCap, &pstaParams->HTCap, sizeof(pstaParams->HTCap)); else - cdf_mem_set(&tdlsAddStaCmdInfo->HTCap, + qdf_mem_set(&tdlsAddStaCmdInfo->HTCap, sizeof(pstaParams->HTCap), 0); tdlsAddStaCmdInfo->vhtcap_present = pstaParams->vhtcap_present; if (pstaParams->vhtcap_present) - cdf_mem_copy(&tdlsAddStaCmdInfo->VHTCap, + qdf_mem_copy(&tdlsAddStaCmdInfo->VHTCap, &pstaParams->VHTCap, sizeof(pstaParams->VHTCap)); else - cdf_mem_set(&tdlsAddStaCmdInfo->VHTCap, + qdf_mem_set(&tdlsAddStaCmdInfo->VHTCap, sizeof(pstaParams->VHTCap), 0); tdlsAddStaCmdInfo->supportedRatesLen = pstaParams->supported_rates_len; if (0 != pstaParams->supported_rates_len) - cdf_mem_copy(&tdlsAddStaCmdInfo->supportedRates, + qdf_mem_copy(&tdlsAddStaCmdInfo->supportedRates, pstaParams->supported_rates, pstaParams->supported_rates_len); @@ -232,7 +232,7 @@ QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishCmd->sessionId = sessionId; - cdf_mem_copy(tdlsLinkEstablishCmdInfo->peermac.bytes, + qdf_mem_copy(tdlsLinkEstablishCmdInfo->peermac.bytes, peerMac, QDF_MAC_ADDR_SIZE); tdlsLinkEstablishCmdInfo->isBufSta = tdlsLinkEstablishParams->isBufSta; @@ -244,14 +244,14 @@ QDF_STATUS csr_tdls_send_link_establish_params(tHalHandle hHal, tdlsLinkEstablishParams->uapsdQueues; tdlsLinkEstablishCmdInfo->isOffChannelSupported = tdlsLinkEstablishParams->isOffChannelSupported; - cdf_mem_copy(tdlsLinkEstablishCmdInfo-> + qdf_mem_copy(tdlsLinkEstablishCmdInfo-> supportedChannels, tdlsLinkEstablishParams->supportedChannels, tdlsLinkEstablishParams-> supportedChannelsLen); tdlsLinkEstablishCmdInfo->supportedChannelsLen = tdlsLinkEstablishParams->supportedChannelsLen; - cdf_mem_copy(tdlsLinkEstablishCmdInfo-> + qdf_mem_copy(tdlsLinkEstablishCmdInfo-> supportedOperClasses, tdlsLinkEstablishParams-> supportedOperClasses, @@ -300,7 +300,7 @@ QDF_STATUS csr_tdls_add_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsAddStaCmd->sessionId = sessionId; tdlsAddStaCmdInfo->tdlsAddOper = TDLS_OPER_ADD; - cdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, + qdf_mem_copy(tdlsAddStaCmdInfo->peermac.bytes, peerMac, QDF_MAC_ADDR_SIZE); tdlsAddStaCmd->command = eSmeCommandTdlsAddPeer; @@ -336,7 +336,7 @@ QDF_STATUS csr_tdls_del_peer_sta(tHalHandle hHal, uint8_t sessionId, tdlsDelStaCmd->sessionId = sessionId; - cdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes, + qdf_mem_copy(tdlsDelStaCmdInfo->peermac.bytes, peerMac, QDF_MAC_ADDR_SIZE); tdlsDelStaCmd->command = eSmeCommandTdlsDelPeer; @@ -390,7 +390,7 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) } tdlsSendMgmtReq = - cdf_mem_malloc(sizeof(tSirTdlsSendMgmtReq) + + qdf_mem_malloc(sizeof(tSirTdlsSendMgmtReq) + tdlsSendMgmtCmdInfo->len); if (NULL == tdlsSendMgmtReq) status = QDF_STATUS_E_NOMEM; @@ -411,14 +411,14 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsSendMgmtReq->responder = tdlsSendMgmtCmdInfo->responder; tdlsSendMgmtReq->peerCapability = tdlsSendMgmtCmdInfo->peerCapability; - cdf_mem_copy(tdlsSendMgmtReq->bssid.bytes, + qdf_mem_copy(tdlsSendMgmtReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(tdlsSendMgmtReq->peer_mac.bytes, + qdf_mem_copy(tdlsSendMgmtReq->peer_mac.bytes, tdlsSendMgmtCmdInfo->peerMac, QDF_MAC_ADDR_SIZE); if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { - cdf_mem_copy(tdlsSendMgmtReq->addIe, tdlsSendMgmtCmdInfo->buf, + qdf_mem_copy(tdlsSendMgmtReq->addIe, tdlsSendMgmtCmdInfo->buf, tdlsSendMgmtCmdInfo->len); } @@ -433,7 +433,7 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd) } if (tdlsSendMgmtCmdInfo->len && tdlsSendMgmtCmdInfo->buf) { /* Done with the buf. Free it. */ - cdf_mem_free(tdlsSendMgmtCmdInfo->buf); + qdf_mem_free(tdlsSendMgmtCmdInfo->buf); tdlsSendMgmtCmdInfo->buf = NULL; tdlsSendMgmtCmdInfo->len = 0; } @@ -459,7 +459,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) return QDF_STATUS_E_FAILURE; } - tdlsAddStaReq = cdf_mem_malloc(sizeof(tSirTdlsAddStaReq)); + tdlsAddStaReq = qdf_mem_malloc(sizeof(tSirTdlsAddStaReq)); if (NULL == tdlsAddStaReq) status = QDF_STATUS_E_NOMEM; else @@ -475,7 +475,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) /* Using dialog as transactionId. This can be used to match response with request */ tdlsAddStaReq->transactionId = 0; - cdf_mem_copy(tdlsAddStaReq->bssid.bytes, + qdf_mem_copy(tdlsAddStaReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); qdf_copy_macaddr(&tdlsAddStaReq->peermac, @@ -485,19 +485,19 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsAddStaReq->uapsd_queues = tdlsAddStaCmdInfo->uapsdQueues; tdlsAddStaReq->max_sp = tdlsAddStaCmdInfo->maxSp; - cdf_mem_copy(tdlsAddStaReq->extn_capability, + qdf_mem_copy(tdlsAddStaReq->extn_capability, tdlsAddStaCmdInfo->extnCapability, SIR_MAC_MAX_EXTN_CAP); tdlsAddStaReq->htcap_present = tdlsAddStaCmdInfo->htcap_present; - cdf_mem_copy(&tdlsAddStaReq->htCap, + qdf_mem_copy(&tdlsAddStaReq->htCap, &tdlsAddStaCmdInfo->HTCap, sizeof(tdlsAddStaCmdInfo->HTCap)); tdlsAddStaReq->vhtcap_present = tdlsAddStaCmdInfo->vhtcap_present; - cdf_mem_copy(&tdlsAddStaReq->vhtCap, + qdf_mem_copy(&tdlsAddStaReq->vhtCap, &tdlsAddStaCmdInfo->VHTCap, sizeof(tdlsAddStaCmdInfo->VHTCap)); tdlsAddStaReq->supported_rates_length = tdlsAddStaCmdInfo->supportedRatesLen; - cdf_mem_copy(&tdlsAddStaReq->supported_rates, + qdf_mem_copy(&tdlsAddStaReq->supported_rates, tdlsAddStaCmdInfo->supportedRates, tdlsAddStaCmdInfo->supportedRatesLen); @@ -530,7 +530,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) return QDF_STATUS_E_FAILURE; } - tdlsDelStaReq = cdf_mem_malloc(sizeof(tSirTdlsDelStaReq)); + tdlsDelStaReq = qdf_mem_malloc(sizeof(tSirTdlsDelStaReq)); if (NULL == tdlsDelStaReq) status = QDF_STATUS_E_NOMEM; else @@ -545,7 +545,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd) /* Using dialog as transactionId. This can be used to match response with request */ tdlsDelStaReq->transactionId = 0; - cdf_mem_copy(tdlsDelStaReq->bssid.bytes, + qdf_mem_copy(tdlsDelStaReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); qdf_copy_macaddr(&tdlsDelStaReq->peermac, @@ -627,7 +627,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) return QDF_STATUS_E_FAILURE; } - tdlsLinkEstablishReq = cdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReq)); + tdlsLinkEstablishReq = qdf_mem_malloc(sizeof(tSirTdlsLinkEstablishReq)); if (tdlsLinkEstablishReq == NULL) { sms_log(pMac, LOGE, FL("alloc failed")); @@ -639,14 +639,14 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd) tdlsLinkEstablishReq->transactionId = 0; qdf_copy_macaddr(&tdlsLinkEstablishReq->peermac, &tdlsLinkEstablishCmdInfo->peermac); - cdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes, + qdf_mem_copy(tdlsLinkEstablishReq->bssid.bytes, pSession->pConnectBssDesc->bssId, QDF_MAC_ADDR_SIZE); - cdf_mem_copy(tdlsLinkEstablishReq->supportedChannels, + qdf_mem_copy(tdlsLinkEstablishReq->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannels, tdlsLinkEstablishCmdInfo->supportedChannelsLen); tdlsLinkEstablishReq->supportedChannelsLen = tdlsLinkEstablishCmdInfo->supportedChannelsLen; - cdf_mem_copy(tdlsLinkEstablishReq->supportedOperClasses, + qdf_mem_copy(tdlsLinkEstablishReq->supportedOperClasses, tdlsLinkEstablishCmdInfo->supportedOperClasses, tdlsLinkEstablishCmdInfo->supportedOperClassesLen); tdlsLinkEstablishReq->supportedOperClassesLen = diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 3107e086de4e..e181cf892872 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -258,7 +258,7 @@ const char *get_e_csr_roam_result_str(eCsrRoamResult val) bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, struct qdf_mac_addr *pBssId) { - cdf_mem_copy(pBssId, &pSirBssDesc->bssId[0], + qdf_mem_copy(pBssId, &pSirBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); return true; } @@ -1123,20 +1123,19 @@ bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, break; if (pIes1->SSID.num_ssid != pIesLocal->SSID.num_ssid) break; - cdf_mem_copy(Ssid1.ssId, pIes1->SSID.ssid, + qdf_mem_copy(Ssid1.ssId, pIes1->SSID.ssid, pIes1->SSID.num_ssid); - cdf_mem_copy(Ssid2.ssId, pIesLocal->SSID.ssid, + qdf_mem_copy(Ssid2.ssId, pIesLocal->SSID.ssid, pIesLocal->SSID.num_ssid); - fEqual = - cdf_mem_compare(Ssid1.ssId, Ssid2.ssId, - pIesLocal->SSID.num_ssid); + fEqual = (!qdf_mem_cmp(Ssid1.ssId, Ssid2.ssId, + pIesLocal->SSID.num_ssid)); } while (0); if (pIes1) - cdf_mem_free(pIes1); + qdf_mem_free(pIes1); if (pIesLocal && !pIes2) - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); return fEqual; } @@ -1172,7 +1171,7 @@ bool csr_is_bss_description_wme(tHalHandle hHal, tSirBssDescription *pSirBssDesc } if ((pIes == NULL) && (NULL != pIesTemp)) { /* we allocate memory here so free it before returning */ - cdf_mem_free(pIesTemp); + qdf_mem_free(pIesTemp); } return fWme; @@ -1246,15 +1245,15 @@ QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pBssDesc && ppIEStruct) { - *ppIEStruct = cdf_mem_malloc(sizeof(tDot11fBeaconIEs)); + *ppIEStruct = qdf_mem_malloc(sizeof(tDot11fBeaconIEs)); if ((*ppIEStruct) != NULL) { - cdf_mem_set((void *)*ppIEStruct, + qdf_mem_set((void *)*ppIEStruct, sizeof(tDot11fBeaconIEs), 0); status = csr_parse_bss_description_ies(hHal, pBssDesc, *ppIEStruct); if (!QDF_IS_STATUS_SUCCESS(status)) { - cdf_mem_free(*ppIEStruct); + qdf_mem_free(*ppIEStruct); *ppIEStruct = NULL; } } else { @@ -2428,7 +2427,7 @@ bool csr_is_profile_wapi(tCsrRoamProfile *pProfile) static bool csr_is_wapi_oui_equal(tpAniSirGlobal pMac, uint8_t *Oui1, uint8_t *Oui2) { - return cdf_mem_compare(Oui1, Oui2, CSR_WAPI_OUI_SIZE); + return !qdf_mem_cmp(Oui1, Oui2, CSR_WAPI_OUI_SIZE); } static bool csr_is_wapi_oui_match(tpAniSirGlobal pMac, @@ -2447,7 +2446,7 @@ static bool csr_is_wapi_oui_match(tpAniSirGlobal pMac, } if (fYes && Oui) { - cdf_mem_copy(Oui, AllCyphers[idx], CSR_WAPI_OUI_SIZE); + qdf_mem_copy(Oui, AllCyphers[idx], CSR_WAPI_OUI_SIZE); } return fYes; @@ -2457,7 +2456,7 @@ static bool csr_is_wapi_oui_match(tpAniSirGlobal pMac, static bool csr_is_wpa_oui_equal(tpAniSirGlobal pMac, uint8_t *Oui1, uint8_t *Oui2) { - return cdf_mem_compare(Oui1, Oui2, CSR_WPA_OUI_SIZE); + return !qdf_mem_cmp(Oui1, Oui2, CSR_WPA_OUI_SIZE); } static bool csr_is_oui_match(tpAniSirGlobal pMac, @@ -2475,7 +2474,7 @@ static bool csr_is_oui_match(tpAniSirGlobal pMac, } if (fYes && Oui) { - cdf_mem_copy(Oui, AllCyphers[idx], CSR_WPA_OUI_SIZE); + qdf_mem_copy(Oui, AllCyphers[idx], CSR_WPA_OUI_SIZE); } return fYes; @@ -2707,13 +2706,13 @@ bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type, if (!rsn_ie->present) goto end; c_mcast_cipher++; - cdf_mem_copy(mccipher_arr, rsn_ie->gp_cipher_suite, + qdf_mem_copy(mccipher_arr, rsn_ie->gp_cipher_suite, CSR_RSN_OUI_SIZE); c_ucast_cipher = (uint8_t) (rsn_ie->pwise_cipher_suite_count); c_auth_suites = (uint8_t) (rsn_ie->akm_suite_count); for (i = 0; i < c_auth_suites && i < CSR_RSN_MAX_AUTH_SUITES; i++) { - cdf_mem_copy((void *)&authsuites[i], + qdf_mem_copy((void *)&authsuites[i], (void *)&rsn_ie->akm_suites[i], CSR_RSN_OUI_SIZE); } @@ -2814,14 +2813,14 @@ bool csr_get_rsn_information(tHalHandle hal, tCsrAuthList *auth_type, end: if (acceptable_cipher) { if (mcast_cipher) - cdf_mem_copy(mcast_cipher, multicast, + qdf_mem_copy(mcast_cipher, multicast, CSR_RSN_OUI_SIZE); if (ucast_cipher) - cdf_mem_copy(ucast_cipher, unicast, CSR_RSN_OUI_SIZE); + qdf_mem_copy(ucast_cipher, unicast, CSR_RSN_OUI_SIZE); if (auth_suite) - cdf_mem_copy(auth_suite, authentication, + qdf_mem_copy(auth_suite, authentication, CSR_RSN_OUI_SIZE); if (negotiated_authtype) @@ -2985,7 +2984,7 @@ bool csr_lookup_pmkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, sms_log(pMac, LOG1, "match PMKID " MAC_ADDRESS_STR " to ", MAC_ADDR_ARRAY(pBSSId)); - if (cdf_mem_compare + if (!qdf_mem_cmp (pBSSId, pSession->PmkidCacheInfo[Index].BSSID.bytes, sizeof(struct qdf_mac_addr))) { /* match found */ @@ -2997,7 +2996,7 @@ bool csr_lookup_pmkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, if (!fMatchFound) break; - cdf_mem_copy(pPMKId, pSession->PmkidCacheInfo[Index].PMKID, + qdf_mem_copy(pPMKId, pSession->PmkidCacheInfo[Index].PMKID, CSR_RSN_PMKID_SIZE); fRC = true; @@ -3058,12 +3057,12 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, pRSNIe->Version = CSR_RSN_VERSION_SUPPORTED; - cdf_mem_copy(pRSNIe->MulticastOui, MulticastCypher, + qdf_mem_copy(pRSNIe->MulticastOui, MulticastCypher, sizeof(MulticastCypher)); pRSNIe->cUnicastCyphers = 1; - cdf_mem_copy(&pRSNIe->UnicastOui[0], UnicastCypher, + qdf_mem_copy(&pRSNIe->UnicastOui[0], UnicastCypher, sizeof(UnicastCypher)); pAuthSuite = @@ -3071,7 +3070,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, UnicastOui[pRSNIe->cUnicastCyphers]); pAuthSuite->cAuthenticationSuites = 1; - cdf_mem_copy(&pAuthSuite->AuthOui[0], AuthSuite, + qdf_mem_copy(&pAuthSuite->AuthOui[0], AuthSuite, sizeof(AuthSuite)); /* RSN capabilities follows the Auth Suite (two octects) */ @@ -3105,7 +3104,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, &(PMKId[0]))) { pPMK->cPMKIDs = 1; - cdf_mem_copy(pPMK->PMKIDList[0].PMKID, PMKId, + qdf_mem_copy(pPMK->PMKIDList[0].PMKID, PMKId, CSR_RSN_PMKID_SIZE); } else { pPMK->cPMKIDs = 0; @@ -3116,7 +3115,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, pGroupMgmtCipherSuite = (uint8_t *) pPMK + sizeof(uint16_t) + (pPMK->cPMKIDs * CSR_RSN_PMKID_SIZE); - cdf_mem_copy(pGroupMgmtCipherSuite, csr_rsn_oui[07], + qdf_mem_copy(pGroupMgmtCipherSuite, csr_rsn_oui[07], CSR_WPA_OUI_SIZE); } #endif @@ -3150,7 +3149,7 @@ uint8_t csr_construct_rsn_ie(tHalHandle hHal, uint32_t sessionId, if (!pIes && pIesLocal) { /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return cbRSNIe; @@ -3199,12 +3198,12 @@ bool csr_get_wapi_information(tHalHandle hal, tCsrAuthList *auth_type, goto end; c_mcast_cipher++; - cdf_mem_copy(mccipher_arr, wapi_ie->multicast_cipher_suite, + qdf_mem_copy(mccipher_arr, wapi_ie->multicast_cipher_suite, CSR_WAPI_OUI_SIZE); c_ucast_cipher = (uint8_t) (wapi_ie->unicast_cipher_suite_count); c_auth_suites = (uint8_t) (wapi_ie->akm_suite_count); for (i = 0; i < c_auth_suites && i < CSR_WAPI_MAX_AUTH_SUITES; i++) - cdf_mem_copy((void *)&authsuites[i], + qdf_mem_copy((void *)&authsuites[i], (void *)&wapi_ie->akm_suites[i], CSR_WAPI_OUI_SIZE); wapioui_idx = csr_get_oui_index_from_cipher(encr_type); @@ -3277,12 +3276,12 @@ bool csr_get_wapi_information(tHalHandle hal, tCsrAuthList *auth_type, end: if (acceptable_cipher) { if (mcast_cipher) - cdf_mem_copy(mcast_cipher, multicast, + qdf_mem_copy(mcast_cipher, multicast, CSR_WAPI_OUI_SIZE); if (ucast_cipher) - cdf_mem_copy(ucast_cipher, unicast, CSR_WAPI_OUI_SIZE); + qdf_mem_copy(ucast_cipher, unicast, CSR_WAPI_OUI_SIZE); if (auth_suite) - cdf_mem_copy(auth_suite, authentication, + qdf_mem_copy(auth_suite, authentication, CSR_WAPI_OUI_SIZE); if (negotiated_authtype) *negotiated_authtype = neg_authtype; @@ -3322,7 +3321,7 @@ bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, for (Index = 0; Index < pSession->NumBkidCache; Index++) { sms_log(pMac, LOGW, "match BKID " MAC_ADDRESS_STR " to ", MAC_ADDR_ARRAY(pBSSId)); - if (cdf_mem_compare + if (!qdf_mem_cmp (pBSSId, pSession->BkidCacheInfo[Index].BSSID.bytes, sizeof(struct qdf_mac_addr))) { /* match found */ @@ -3334,7 +3333,7 @@ bool csr_lookup_bkid(tpAniSirGlobal pMac, uint32_t sessionId, uint8_t *pBSSId, if (!fMatchFound) break; - cdf_mem_copy(pBKId, pSession->BkidCacheInfo[Index].BKID, + qdf_mem_copy(pBKId, pSession->BkidCacheInfo[Index].BKID, CSR_WAPI_BKID_SIZE); fRC = true; @@ -3383,24 +3382,24 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (!fWapiMatch) break; - cdf_mem_set(pWapiIe, sizeof(tCsrWapiIe), 0); + qdf_mem_set(pWapiIe, sizeof(tCsrWapiIe), 0); pWapiIe->IeHeader.ElementID = DOT11F_EID_WAPI; pWapiIe->Version = CSR_WAPI_VERSION_SUPPORTED; pWapiIe->cAuthenticationSuites = 1; - cdf_mem_copy(&pWapiIe->AuthOui[0], AuthSuite, + qdf_mem_copy(&pWapiIe->AuthOui[0], AuthSuite, sizeof(AuthSuite)); pWapi = (uint8_t *) (&pWapiIe->AuthOui[1]); *pWapi = (uint16_t) 1; /* cUnicastCyphers */ pWapi += 2; - cdf_mem_copy(pWapi, UnicastCypher, sizeof(UnicastCypher)); + qdf_mem_copy(pWapi, UnicastCypher, sizeof(UnicastCypher)); pWapi += sizeof(UnicastCypher); - cdf_mem_copy(pWapi, MulticastCypher, sizeof(MulticastCypher)); + qdf_mem_copy(pWapi, MulticastCypher, sizeof(MulticastCypher)); pWapi += sizeof(MulticastCypher); /* WAPI capabilities follows the Auth Suite (two octects) */ @@ -3416,7 +3415,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, /* Do we need to change the endianness here */ *pWapi = (uint16_t) 1; /* cBKIDs */ pWapi += 2; - cdf_mem_copy(pWapi, BKId, CSR_WAPI_BKID_SIZE); + qdf_mem_copy(pWapi, BKId, CSR_WAPI_BKID_SIZE); } else { *pWapi = 0; pWapi += 1; @@ -3442,7 +3441,7 @@ uint8_t csr_construct_wapi_ie(tpAniSirGlobal pMac, uint32_t sessionId, if (!pIes && pIesLocal) { /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return cbWapiIe; @@ -3487,7 +3486,7 @@ bool csr_get_wpa_cyphers(tpAniSirGlobal mac_ctx, tCsrAuthList *auth_type, if (!wpa_ie->present) goto end; c_mcast_cipher = 1; - cdf_mem_copy(mccipher_arr, wpa_ie->multicast_cipher, CSR_WPA_OUI_SIZE); + qdf_mem_copy(mccipher_arr, wpa_ie->multicast_cipher, CSR_WPA_OUI_SIZE); c_ucast_cipher = (uint8_t) (wpa_ie->unicast_cipher_count); c_auth_suites = (uint8_t) (wpa_ie->auth_suite_count); @@ -3558,15 +3557,15 @@ bool csr_get_wpa_cyphers(tpAniSirGlobal mac_ctx, tCsrAuthList *auth_type, end: if (acceptable_cipher) { if (mcast_cipher) - cdf_mem_copy((uint8_t **) mcast_cipher, multicast, + qdf_mem_copy((uint8_t **) mcast_cipher, multicast, CSR_WPA_OUI_SIZE); if (ucast_cipher) - cdf_mem_copy((uint8_t **) ucast_cipher, unicast, + qdf_mem_copy((uint8_t **) ucast_cipher, unicast, CSR_WPA_OUI_SIZE); if (auth_suite) - cdf_mem_copy((uint8_t **) auth_suite, authentication, + qdf_mem_copy((uint8_t **) auth_suite, authentication, CSR_WPA_OUI_SIZE); if (negotiated_authtype) @@ -3630,16 +3629,16 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, pWpaIe->IeHeader.ElementID = SIR_MAC_WPA_EID; - cdf_mem_copy(pWpaIe->Oui, csr_wpa_oui[01], sizeof(pWpaIe->Oui)); + qdf_mem_copy(pWpaIe->Oui, csr_wpa_oui[01], sizeof(pWpaIe->Oui)); pWpaIe->Version = CSR_WPA_VERSION_SUPPORTED; - cdf_mem_copy(pWpaIe->MulticastOui, MulticastCypher, + qdf_mem_copy(pWpaIe->MulticastOui, MulticastCypher, sizeof(MulticastCypher)); pWpaIe->cUnicastCyphers = 1; - cdf_mem_copy(&pWpaIe->UnicastOui[0], UnicastCypher, + qdf_mem_copy(&pWpaIe->UnicastOui[0], UnicastCypher, sizeof(UnicastCypher)); pAuthSuite = @@ -3647,7 +3646,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, UnicastOui[pWpaIe->cUnicastCyphers]); pAuthSuite->cAuthenticationSuites = 1; - cdf_mem_copy(&pAuthSuite->AuthOui[0], AuthSuite, + qdf_mem_copy(&pAuthSuite->AuthOui[0], AuthSuite, sizeof(AuthSuite)); /* The WPA capabilities follows the Auth Suite (two octects)-- */ @@ -3669,7 +3668,7 @@ uint8_t csr_construct_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, if (!pIes && pIesLocal) { /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return cbWpaIe; @@ -3691,7 +3690,7 @@ uint8_t csr_retrieve_wpa_ie(tHalHandle hHal, tCsrRoamProfile *pProfile, if (SIR_MAC_WPA_IE_MAX_LENGTH >= pProfile->nWPAReqIELength) { cbWpaIe = (uint8_t) pProfile->nWPAReqIELength; - cdf_mem_copy(pWpaIe, pProfile->pWPAReqIE, + qdf_mem_copy(pWpaIe, pProfile->pWPAReqIE, cbWpaIe); } else { sms_log(pMac, LOGW, @@ -3732,7 +3731,7 @@ uint8_t csr_retrieve_rsn_ie(tHalHandle hHal, uint32_t sessionId, if (SIR_MAC_WPA_IE_MAX_LENGTH >= pProfile->nRSNReqIELength) { cbRsnIe = (uint8_t) pProfile->nRSNReqIELength; - cdf_mem_copy(pRsnIe, pProfile->pRSNReqIE, + qdf_mem_copy(pRsnIe, pProfile->pRSNReqIE, cbRsnIe); } else { sms_log(pMac, LOGW, @@ -3767,7 +3766,7 @@ uint8_t csr_retrieve_wapi_ie(tHalHandle hHal, uint32_t sessionId, if (DOT11F_IE_WAPI_MAX_LEN >= pProfile->nWAPIReqIELength) { cbWapiIe = (uint8_t) pProfile->nWAPIReqIELength; - cdf_mem_copy(pWapiIe, pProfile->pWAPIReqIE, + qdf_mem_copy(pWapiIe, pProfile->pWAPIReqIE, cbWapiIe); } else { sms_log(pMac, LOGW, @@ -3965,18 +3964,18 @@ bool csr_validate_wep(tpAniSirGlobal mac_ctx, eCsrEncryptionType uc_encry_type, /* else we can use the encryption type directly */ if (ie_ptr->WPA.present) { - match = cdf_mem_compare(ie_ptr->WPA.multicast_cipher, + match = (!qdf_mem_cmp(ie_ptr->WPA.multicast_cipher, csr_wpa_oui[csr_get_oui_index_from_cipher( uc_encry_type)], - CSR_WPA_OUI_SIZE); + CSR_WPA_OUI_SIZE)); if (match) goto end; } if (ie_ptr->RSN.present) { - match = cdf_mem_compare(ie_ptr->RSN.gp_cipher_suite, + match = (!qdf_mem_cmp(ie_ptr->RSN.gp_cipher_suite, csr_rsn_oui[csr_get_oui_index_from_cipher( uc_encry_type)], - CSR_RSN_OUI_SIZE); + CSR_RSN_OUI_SIZE)); } @@ -4292,7 +4291,7 @@ bool csr_is_ssid_match(tpAniSirGlobal pMac, uint8_t *ssid1, uint8_t ssid1Len, if (ssid1Len != bssSsidLen) break; - if (cdf_mem_compare(bssSsid, ssid1, bssSsidLen)) { + if (!qdf_mem_cmp(bssSsid, ssid1, bssSsidLen)) { fMatch = true; break; } @@ -4317,9 +4316,9 @@ bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, || ((pSsidList->SSIDList[i].SSID.length == pSsid->length) - && cdf_mem_compare(pSsid->ssId, + && (!qdf_mem_cmp(pSsid->ssId, pSsidList->SSIDList[i].SSID. - ssId, pSsid->length))) { + ssId, pSsid->length)))) { fMatch = true; break; } @@ -4337,7 +4336,7 @@ bool csr_is_bssid_match(tHalHandle hHal, struct qdf_mac_addr *pProfBssid, /* for efficiency of the MAC_ADDRESS functions, move the */ /* Bssid's into MAC_ADDRESS structs. */ - cdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct qdf_mac_addr)); + qdf_mem_copy(&ProfileBssid, pProfBssid, sizeof(struct qdf_mac_addr)); do { @@ -4845,7 +4844,7 @@ end: if (ie_dblptr) *ie_dblptr = ie_ptr; else if (ie_ptr) - cdf_mem_free(ie_ptr); + qdf_mem_free(ie_ptr); return rc; } @@ -4933,7 +4932,7 @@ bool csr_match_bss_to_connect_profile(tHalHandle hHal, if (!pIes && pIesLocal) { /* locally allocated */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return fRC; @@ -5169,57 +5168,57 @@ void csr_release_profile(tpAniSirGlobal pMac, tCsrRoamProfile *pProfile) { if (pProfile) { if (pProfile->BSSIDs.bssid) { - cdf_mem_free(pProfile->BSSIDs.bssid); + qdf_mem_free(pProfile->BSSIDs.bssid); pProfile->BSSIDs.bssid = NULL; } if (pProfile->SSIDs.SSIDList) { - cdf_mem_free(pProfile->SSIDs.SSIDList); + qdf_mem_free(pProfile->SSIDs.SSIDList); pProfile->SSIDs.SSIDList = NULL; } if (pProfile->pWPAReqIE) { - cdf_mem_free(pProfile->pWPAReqIE); + qdf_mem_free(pProfile->pWPAReqIE); pProfile->pWPAReqIE = NULL; } if (pProfile->pRSNReqIE) { - cdf_mem_free(pProfile->pRSNReqIE); + qdf_mem_free(pProfile->pRSNReqIE); pProfile->pRSNReqIE = NULL; } #ifdef FEATURE_WLAN_WAPI if (pProfile->pWAPIReqIE) { - cdf_mem_free(pProfile->pWAPIReqIE); + qdf_mem_free(pProfile->pWAPIReqIE); pProfile->pWAPIReqIE = NULL; } #endif /* FEATURE_WLAN_WAPI */ if (pProfile->pAddIEScan) { - cdf_mem_free(pProfile->pAddIEScan); + qdf_mem_free(pProfile->pAddIEScan); pProfile->pAddIEScan = NULL; } if (pProfile->pAddIEAssoc) { - cdf_mem_free(pProfile->pAddIEAssoc); + qdf_mem_free(pProfile->pAddIEAssoc); pProfile->pAddIEAssoc = NULL; } if (pProfile->ChannelInfo.ChannelList) { - cdf_mem_free(pProfile->ChannelInfo.ChannelList); + qdf_mem_free(pProfile->ChannelInfo.ChannelList); pProfile->ChannelInfo.ChannelList = NULL; } - cdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); + qdf_mem_set(pProfile, sizeof(tCsrRoamProfile), 0); } } void csr_free_scan_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter) { if (pScanFilter->BSSIDs.bssid) { - cdf_mem_free(pScanFilter->BSSIDs.bssid); + qdf_mem_free(pScanFilter->BSSIDs.bssid); pScanFilter->BSSIDs.bssid = NULL; } if (pScanFilter->ChannelInfo.ChannelList) { - cdf_mem_free(pScanFilter->ChannelInfo.ChannelList); + qdf_mem_free(pScanFilter->ChannelInfo.ChannelList); pScanFilter->ChannelInfo.ChannelList = NULL; } if (pScanFilter->SSIDs.SSIDList) { - cdf_mem_free(pScanFilter->SSIDs.SSIDList); + qdf_mem_free(pScanFilter->SSIDs.SSIDList); pScanFilter->SSIDs.SSIDList = NULL; } } @@ -5230,7 +5229,7 @@ void csr_free_roam_profile(tpAniSirGlobal pMac, uint32_t sessionId) if (pSession->pCurRoamProfile) { csr_release_profile(pMac, pSession->pCurRoamProfile); - cdf_mem_free(pSession->pCurRoamProfile); + qdf_mem_free(pSession->pCurRoamProfile); pSession->pCurRoamProfile = NULL; } } @@ -5240,7 +5239,7 @@ void csr_free_connect_bss_desc(tpAniSirGlobal pMac, uint32_t sessionId) tCsrRoamSession *pSession = &pMac->roam.roamSession[sessionId]; if (pSession->pConnectBssDesc) { - cdf_mem_free(pSession->pConnectBssDesc); + qdf_mem_free(pSession->pConnectBssDesc); pSession->pConnectBssDesc = NULL; } } @@ -5452,7 +5451,7 @@ bool csr_match_country_code(tpAniSirGlobal pMac, uint8_t *pCountry, for (i = 0; i < WNI_CFG_COUNTRY_CODE_LEN - 1; i++) { pCountry[i] = csr_to_upper(pCountry[i]); } - if (!cdf_mem_compare(pIes->Country.country, pCountry, + if (qdf_mem_cmp(pIes->Country.country, pCountry, WNI_CFG_COUNTRY_CODE_LEN - 1)) { fRet = false; break; @@ -5472,7 +5471,7 @@ QDF_STATUS csr_get_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(pModifyProfileFields, + qdf_mem_copy(pModifyProfileFields, &pMac->roam.roamSession[sessionId].connectedProfile. modifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); @@ -5485,7 +5484,7 @@ QDF_STATUS csr_set_modify_profile_fields(tpAniSirGlobal pMac, uint32_t sessionId { tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - cdf_mem_copy(&pSession->connectedProfile.modifyProfileFields, + qdf_mem_copy(&pSession->connectedProfile.modifyProfileFields, pModifyProfileFields, sizeof(tCsrRoamModifyProfileFields)); return QDF_STATUS_SUCCESS; @@ -5633,7 +5632,7 @@ void csr_diag_event_report(tpAniSirGlobal pmac, uint16_t event_type, { WLAN_HOST_DIAG_EVENT_DEF(diag_event, host_event_wlan_pe_payload_type); - cdf_mem_zero(&diag_event, sizeof(host_event_wlan_pe_payload_type)); + qdf_mem_zero(&diag_event, sizeof(host_event_wlan_pe_payload_type)); /* diag_event.bssid is already all zeroes */ diag_event.sme_state = sme_get_lim_sme_state(pmac); diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c index 849d5fb88ace..7fc71e0f944e 100644 --- a/core/sme/src/nan/nan_api.c +++ b/core/sme/src/nan/nan_api.c @@ -79,7 +79,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) size_t data_len; data_len = sizeof(tNanRequest) + input->request_data_len; - data = cdf_mem_malloc(data_len); + data = qdf_mem_malloc(data_len); if (data == NULL) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -87,10 +87,10 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(data, data_len); + qdf_mem_zero(data, data_len); data->request_data_len = input->request_data_len; if (input->request_data_len) { - cdf_mem_copy(data->request_data, + qdf_mem_copy(data->request_data, input->request_data, input->request_data_len); } @@ -102,7 +102,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL ("Not able to post WMA_NAN_REQUEST message to WMA")); - cdf_mem_free(data); + qdf_mem_free(data); return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index 5474e8cc8d92..6478e19ae479 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -58,7 +58,7 @@ QDF_STATUS oem_data_oem_data_req_open(tHalHandle hHal) do { /* initialize all the variables to null */ - cdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); + qdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, "oem_data_oem_data_req_open: Cannot allocate memory for the timer function"); @@ -88,7 +88,7 @@ QDF_STATUS oem_data_oem_data_req_close(tHalHandle hHal) } /* initialize all the variables to null */ - cdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); + qdf_mem_set(&(pMac->oemData), sizeof(tOemDataStruct), 0); } while (0); @@ -110,12 +110,12 @@ void oem_data_release_oem_data_req_command(tpAniSirGlobal pMac, if (csr_ll_remove_entry (&pMac->sme.smeCmdActiveList, &pOemDataCmd->Link, LL_ACCESS_LOCK)) { if (pOemDataCmd->u.oemDataCmd.oemDataReq.data) { - cdf_mem_free( + qdf_mem_free( pOemDataCmd->u.oemDataCmd.oemDataReq.data); pOemDataCmd->u.oemDataCmd.oemDataReq.data = NULL; } - cdf_mem_zero(&(pOemDataCmd->u.oemDataCmd), sizeof(tOemDataCmd)); + qdf_mem_zero(&(pOemDataCmd->u.oemDataCmd), sizeof(tOemDataCmd)); /* Now put this command back on the avilable command list */ sme_release_command(pMac, pOemDataCmd); @@ -165,7 +165,7 @@ QDF_STATUS oem_data_oem_data_req(tHalHandle hHal, /* set the oem data request */ cmd_req->sessionId = sessionId; cmd_req->data_len = oemDataReqConfig->data_len; - cmd_req->data = cdf_mem_malloc(cmd_req->data_len); + cmd_req->data = qdf_mem_malloc(cmd_req->data_len); if (!cmd_req->data) { sms_log(pMac, LOGE, FL("memory alloc failed")); @@ -173,7 +173,7 @@ QDF_STATUS oem_data_oem_data_req(tHalHandle hHal, break; } - cdf_mem_copy((void *)(cmd_req->data), + qdf_mem_copy((void *)(cmd_req->data), (void *)(oemDataReqConfig->data), cmd_req->data_len); } else { @@ -220,9 +220,9 @@ QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, return QDF_STATUS_E_INVAL; } - pMsg = cdf_mem_malloc(sizeof(*pMsg)); + pMsg = qdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) { - sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); + sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } @@ -333,11 +333,11 @@ QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) if (csr_ll_remove_entry (&pMac->sme.smeCmdActiveList, &pCommand->Link, LL_ACCESS_LOCK)) { - cdf_mem_set(&(pCommand->u.oemDataCmd), + qdf_mem_set(&(pCommand->u.oemDataCmd), sizeof(tOemDataCmd), 0); req = &(pCommand->u.oemDataCmd.oemDataReq); - cdf_mem_free(req->data); + qdf_mem_free(req->data); sme_release_command(pMac, pCommand); } } diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c index 3f84dfbc1b6e..9deb1678b48d 100644 --- a/core/sme/src/p2p/p2p_api.c +++ b/core/sme/src/p2p/p2p_api.c @@ -70,13 +70,13 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, goto error; } - pMsg = cdf_mem_malloc(len); + pMsg = qdf_mem_malloc(len); if (NULL == pMsg) goto error; else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s call", __func__); - cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); + qdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0); pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ; pMsg->length = (uint16_t) len; qdf_copy_macaddr(&pMsg->selfMacAddr, &pSession->selfMacAddr); @@ -88,7 +88,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac, p2pRemainonChn->u.remainChlCmd.isP2PProbeReqAllowed; pMsg->scan_id = p2pRemainonChn->u.remainChlCmd.scan_id; if (pMac->p2pContext.probeRspIeLength) - cdf_mem_copy((void *)pMsg->probeRspIe, + qdf_mem_copy((void *)pMsg->probeRspIe, (void *)pMac->p2pContext.probeRspIe, pMac->p2pContext.probeRspIeLength); status = cds_send_mb_message_to_mac(pMsg); @@ -196,7 +196,7 @@ QDF_STATUS sme_p2p_open(tHalHandle hHal) QDF_STATUS status = QDF_STATUS_SUCCESS; /* If static structure is too big, Need to change this function to allocate memory dynamically */ - cdf_mem_zero(&pMac->p2pContext, sizeof(tp2pContext)); + qdf_mem_zero(&pMac->p2pContext, sizeof(tp2pContext)); if (!QDF_IS_STATUS_SUCCESS(status)) { sme_p2p_close(hHal); @@ -210,7 +210,7 @@ QDF_STATUS p2p_stop(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pMac->p2pContext.probeRspIe) { - cdf_mem_free(pMac->p2pContext.probeRspIe); + qdf_mem_free(pMac->p2pContext.probeRspIe); pMac->p2pContext.probeRspIe = NULL; } @@ -224,7 +224,7 @@ QDF_STATUS sme_p2p_close(tHalHandle hHal) tpAniSirGlobal pMac = PMAC_STRUCT(hHal); if (pMac->p2pContext.probeRspIe) { - cdf_mem_free(pMac->p2pContext.probeRspIe); + qdf_mem_free(pMac->p2pContext.probeRspIe); pMac->p2pContext.probeRspIe = NULL; } @@ -314,18 +314,18 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED, " %s sends action frame", __func__); msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set((void *)pMsg, msgLen, 0); + qdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_SEND_ACTION_FRAME_IND; pMsg->msgLen = msgLen; pMsg->sessionId = sessionId; pMsg->noack = noack; pMsg->channel_freq = channel_freq; pMsg->wait = (uint16_t) wait; - cdf_mem_copy(pMsg->data, pBuf, len); + qdf_mem_copy(pMsg->data, pBuf, len); status = cds_send_mb_message_to_mac(pMsg); } return status; @@ -341,11 +341,11 @@ QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal, /* Need to check session ID to support concurrency */ msgLen = (uint16_t) (sizeof(tSirMbMsgP2p)); - pMsg = cdf_mem_malloc(msgLen); + pMsg = qdf_mem_malloc(msgLen); if (NULL == pMsg) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set((void *)pMsg, msgLen, 0); + qdf_mem_set((void *)pMsg, msgLen, 0); pMsg->type = eWNI_SME_ABORT_REMAIN_ON_CHAN_IND; pMsg->msgLen = msgLen; pMsg->sessionId = sessionId; @@ -363,12 +363,12 @@ QDF_STATUS p2p_set_ps(tHalHandle hHal, tP2pPsConfig *pNoA) QDF_STATUS status = QDF_STATUS_SUCCESS; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - pNoAParam = cdf_mem_malloc(sizeof(tP2pPsConfig)); + pNoAParam = qdf_mem_malloc(sizeof(tP2pPsConfig)); if (NULL == pNoAParam) status = QDF_STATUS_E_NOMEM; else { - cdf_mem_set(pNoAParam, sizeof(tP2pPsConfig), 0); - cdf_mem_copy(pNoAParam, pNoA, sizeof(tP2pPsConfig)); + qdf_mem_set(pNoAParam, sizeof(tP2pPsConfig), 0); + qdf_mem_copy(pNoAParam, pNoA, sizeof(tP2pPsConfig)); msg.type = eWNI_SME_UPDATE_NOA; msg.bodyval = 0; msg.bodyptr = pNoAParam; diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 64eb0feacaca..0e3d4ff01358 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -520,7 +520,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) "%s: %d: initializing SME-QoS module", __func__, __LINE__); /* init the control block */ /* (note that this will make all sessions invalid) */ - cdf_mem_zero(&sme_qos_cb, sizeof(sme_qos_cb)); + qdf_mem_zero(&sme_qos_cb, sizeof(sme_qos_cb)); sme_qos_cb.pMac = pMac; sme_qos_cb.nextFlowId = SME_QOS_MIN_FLOW_ID; sme_qos_cb.nextDialogToken = SME_QOS_MIN_DIALOG_TOKEN; @@ -595,7 +595,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac) /* Clean up the assoc info if already allocated */ if (pSession->assocInfo.pBssDesc) { - cdf_mem_free(pSession->assocInfo.pBssDesc); + qdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } /* close the session's buffered command list */ @@ -779,7 +779,7 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID) void qos_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) { - cdf_mem_zero(&pCommand->u.qosCmd, sizeof(tGenericQosCmd)); + qdf_mem_zero(&pCommand->u.qosCmd, sizeof(tGenericQosCmd)); sme_release_command(pMac, pCommand); } @@ -904,7 +904,7 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac, "%s: %d: validated with status = %d", __func__, __LINE__, status); if (pIes) { - cdf_mem_free(pIes); + qdf_mem_free(pIes); } return status; } @@ -1183,7 +1183,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, status)) { /* we received an expected "good" status */ /* create an entry in the flow list */ - pentry = cdf_mem_malloc(sizeof(*pentry)); + pentry = qdf_mem_malloc(sizeof(*pentry)); if (!pentry) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -1214,7 +1214,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, ac, pACInfo->tspec_mask_status); QDF_ASSERT(0); - cdf_mem_free(pentry); + qdf_mem_free(pentry); return SME_QOS_STATUS_SETUP_FAILURE_RSP; } pACInfo->tspec_mask_status = @@ -1518,7 +1518,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* create an entry in the flow list */ pentry = (sme_QosFlowInfoEntry *) - cdf_mem_malloc(sizeof(*pentry)); + qdf_mem_malloc(sizeof(*pentry)); if (!pentry) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -1556,7 +1556,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac, /* if we are not in handoff, then notify all flows on */ /* this AC that the aggregate TSPEC may have changed */ if (!pentry->hoRenewal) { - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof (sme_QosSearchInfo)); search_key.key.ac_type = ac; @@ -1681,7 +1681,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.QosFlowID = QosFlowID; search_key.index = SME_QOS_SEARCH_KEY_INDEX_1; @@ -1790,7 +1790,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, /* Once we have decided on OTA exchange needed or not we can delete the */ /* original one from the List */ pNewEntry = - (sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pNewEntry)); + (sme_QosFlowInfoEntry *) qdf_mem_malloc(sizeof(*pNewEntry)); if (!pNewEntry) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the new " @@ -1855,7 +1855,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, == status)) { new_state = SME_QOS_QOS_ON; - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* delete the original entry in FLOW list which got modified */ search_key.key.ac_type = ac; @@ -1878,7 +1878,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac, if (SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status) { status = SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_APSD_SET_ALREADY; - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof (sme_QosSearchInfo)); search_key.key.ac_type = ac; @@ -2031,7 +2031,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID); - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.QosFlowID = QosFlowID; search_key.index = SME_QOS_SEARCH_KEY_INDEX_1; @@ -2115,7 +2115,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, * to AP. */ if (flow_info->QoSInfo.ts_info.direction == SME_QOS_WMM_TS_DIR_BOTH) { - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.ac_type = ac; @@ -2149,7 +2149,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, && downlinkFlowsPresent) { /* Need to split the uni-directional flows into SME_QOS_TSPEC_INDEX_0 and SME_QOS_TSPEC_INDEX_1 */ - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof (sme_QosSearchInfo)); /* Mark all downstream flows as using tspec index 1 */ @@ -2281,7 +2281,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, pEntry, true); pDeletedFlow = flow_info; if (SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY == status) { - cdf_mem_zero(&search_key, + qdf_mem_zero(&search_key, sizeof (sme_QosSearchInfo)); search_key.key.ac_type = ac; @@ -2551,12 +2551,12 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } if (false == deltsIssued) { - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> curr_QoSInfo[flow_info-> tspec_mask - 1], sizeof(sme_QosWmmTspecInfo)); } - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> requested_QoSInfo[flow_info->tspec_mask - 1], sizeof(sme_QosWmmTspecInfo)); @@ -2617,7 +2617,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac, } /* if we deleted a flow, reclaim the memory */ if (pDeletedFlow) { - cdf_mem_free(pDeletedFlow); + qdf_mem_free(pDeletedFlow); } if ((SME_QOS_STATUS_RELEASE_SUCCESS_RSP == status)) { (void)sme_qos_process_buffered_cmd(sessionId); @@ -2705,7 +2705,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: On session %d AP doesn't support QoS", __func__, __LINE__, sessionId); - cdf_mem_free(pIes); + qdf_mem_free(pIes); /* notify HDD through the synchronous status msg */ return SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP; } @@ -2870,7 +2870,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac, } } while (0); - cdf_mem_free(pIes); + qdf_mem_free(pIes); return status; } @@ -2912,7 +2912,7 @@ QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI ac = sme_qos_u_pto_ac_map[pTspec->user_priority]; - cdf_mem_zero(pAddtsRsp, sizeof(tSirAddtsRsp)); + qdf_mem_zero(pAddtsRsp, sizeof(tSirAddtsRsp)); pAddtsRsp->messageType = eWNI_SME_ADDTS_RSP; pAddtsRsp->length = sizeof(tSirAddtsRsp); @@ -3176,7 +3176,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac, return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&ricIE, sizeof(tDot11fIERICDataDesc)); + qdf_mem_zero(&ricIE, sizeof(tDot11fIERICDataDesc)); ricIE.present = 1; ricIE.RICData.present = 1; @@ -3314,7 +3314,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev( ac_info->requested_QoSInfo[tspec_index] = ac_info->curr_QoSInfo[tspec_index]; - cdf_mem_zero( + qdf_mem_zero( &ac_info->curr_QoSInfo[tspec_index], sizeof(sme_QosWmmTspecInfo)); qos_requested = true; @@ -3407,7 +3407,7 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id, session->ac_info[ac_id].addTsRsp[ts_id].rsp.lleTspecPresent; msg->aggrInfo.aggrAddTsInfo[ac_id].numTclas = session->ac_info[ac_id].addTsRsp[ts_id].rsp.numTclas; - cdf_mem_copy(msg->aggrInfo.aggrAddTsInfo[ac_id].tclasInfo, + qdf_mem_copy(msg->aggrInfo.aggrAddTsInfo[ac_id].tclasInfo, session->ac_info[ac_id].addTsRsp[ts_id].rsp.tclasInfo, SIR_MAC_TCLASIE_MAXNUM); msg->aggrInfo.aggrAddTsInfo[ac_id].tclasProc = @@ -3452,7 +3452,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) session = &sme_qos_cb.sessionInfo[session_id]; - aggr_req = (tSirAggrQosReq *) cdf_mem_malloc(sizeof(tSirAggrQosReq)); + aggr_req = (tSirAggrQosReq *) qdf_mem_malloc(sizeof(tSirAggrQosReq)); if (!aggr_req) { /* err msg */ @@ -3461,14 +3461,14 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id) return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(aggr_req, sizeof(tSirAggrQosReq)); + qdf_mem_zero(aggr_req, sizeof(tSirAggrQosReq)); aggr_req->messageType = eWNI_SME_FT_AGGR_QOS_REQ; aggr_req->length = sizeof(tSirAggrQosReq); aggr_req->sessionId = session_id; aggr_req->timeout = 0; aggr_req->rspReqd = true; - cdf_mem_copy(&aggr_req->bssid.bytes[0], + qdf_mem_copy(&aggr_req->bssid.bytes[0], &session->assocInfo.pBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); @@ -3519,7 +3519,7 @@ QDF_STATUS sme_qos_process_ftric_response(tpAniSirGlobal pMac, uint8_t sessionId = &sme_qos_cb.sessionInfo[sessionId].ac_info[ac].addTsRsp[tspecIndex]; - cdf_mem_zero(pAddtsRsp, sizeof(tSirAddtsRsp)); + qdf_mem_zero(pAddtsRsp, sizeof(tSirAddtsRsp)); pAddtsRsp->messageType = eWNI_SME_ADDTS_RSP; pAddtsRsp->length = sizeof(tSirAddtsRsp); @@ -3899,7 +3899,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, } pSession = &sme_qos_cb.sessionInfo[sessionId]; - pMsg = (tSirAddtsReq *) cdf_mem_malloc(sizeof(tSirAddtsReq)); + pMsg = (tSirAddtsReq *) qdf_mem_malloc(sizeof(tSirAddtsReq)); if (!pMsg) { /* err msg */ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -3907,7 +3907,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, __func__, __LINE__); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pMsg, sizeof(tSirAddtsReq)); + qdf_mem_zero(pMsg, sizeof(tSirAddtsReq)); pMsg->messageType = eWNI_SME_ADDTS_REQ; pMsg->length = sizeof(tSirAddtsReq); pMsg->sessionId = sessionId; @@ -3956,10 +3956,10 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&pMsg->bssid.bytes[0], + qdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, @@ -4016,7 +4016,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: invoked on session %d for AC %d", __func__, __LINE__, sessionId, ac); - pMsg = (tSirDeltsReq *) cdf_mem_malloc(sizeof(tSirDeltsReq)); + pMsg = (tSirDeltsReq *) qdf_mem_malloc(sizeof(tSirDeltsReq)); if (!pMsg) { /* err msg */ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -4024,7 +4024,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, __func__, __LINE__); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pMsg, sizeof(tSirDeltsReq)); + qdf_mem_zero(pMsg, sizeof(tSirDeltsReq)); /* get pointer to the TSPEC being deleted */ pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; @@ -4066,10 +4066,10 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: BSS descriptor is NULL so we don't send request to PE", __func__, __LINE__); - cdf_mem_free(pMsg); + qdf_mem_free(pMsg); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&pMsg->bssid.bytes[0], + qdf_mem_copy(&pMsg->bssid.bytes[0], &pSession->assocInfo.pBssDesc->bssId[0], sizeof(struct qdf_mac_addr)); @@ -4077,7 +4077,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac, "%s: %d: up = %d, tid = %d", __func__, __LINE__, pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid); - cdf_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1], + qdf_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1], sizeof(sme_QosWmmTspecInfo)); if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) { status = QDF_STATUS_SUCCESS; @@ -4243,7 +4243,7 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf) pSession = &sme_qos_cb.sessionInfo[sessionId]; pACInfo = &pSession->ac_info[ac]; - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; @@ -4516,14 +4516,14 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, /* notify HDD with new Service Interval */ ac_info->curr_QoSInfo[SME_QOS_TSPEC_INDEX_0] = ac_info->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0]; - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; search_key.sessionId = sessionid; /* notify PMC that reassoc is done for APSD on certain AC?? */ - cdf_mem_zero(&search_key1, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key1, sizeof(sme_QosSearchInfo)); /* set the hoRenewal field in control block if needed */ search_key1.index = SME_QOS_SEARCH_KEY_INDEX_3; search_key1.key.reason = SME_QOS_REASON_SETUP; @@ -4554,7 +4554,7 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_FAILURE; } ac_info->hoRenewal = false; - cdf_mem_zero(&ac_info->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], + qdf_mem_zero(&ac_info->requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], sizeof(sme_QosWmmTspecInfo)); return status; @@ -4712,16 +4712,16 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac, if (pACInfo->reassoc_pending) { pACInfo->reassoc_pending = false; } - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> curr_QoSInfo[SME_QOS_TSPEC_INDEX_0], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> curr_QoSInfo[SME_QOS_TSPEC_INDEX_1], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> requested_QoSInfo[SME_QOS_TSPEC_INDEX_1], sizeof(sme_QosWmmTspecInfo)); pACInfo->tspec_mask_status = SME_QOS_TSPEC_MASK_CLEAR; @@ -4902,16 +4902,16 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, case SME_QOS_HANDOFF: sme_qos_state_transition(sessionId, ac, SME_QOS_INIT); /* need to clean up flows: TODO */ - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> curr_QoSInfo[SME_QOS_TSPEC_INDEX_0], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> requested_QoSInfo[SME_QOS_TSPEC_INDEX_0], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> curr_QoSInfo[SME_QOS_TSPEC_INDEX_1], sizeof(sme_QosWmmTspecInfo)); - cdf_mem_zero(&pACInfo-> + qdf_mem_zero(&pACInfo-> requested_QoSInfo[SME_QOS_TSPEC_INDEX_1], sizeof(sme_QosWmmTspecInfo)); pACInfo->tspec_mask_status = SME_QOS_TSPEC_MASK_CLEAR; @@ -4937,7 +4937,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac, pSession->handoffRequested = false; /* clean up the assoc info */ if (pSession->assocInfo.pBssDesc) { - cdf_mem_free(pSession->assocInfo.pBssDesc); + qdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } return QDF_STATUS_SUCCESS; @@ -4997,7 +4997,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId, sme_qos_delete_existing_flows(pMac, sessionId); /* clean up the assoc info */ if (pSession->assocInfo.pBssDesc) { - cdf_mem_free(pSession->assocInfo.pBssDesc); + qdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } sme_qos_cb.sessionInfo[sessionId].sessionActive = false; @@ -5046,7 +5046,7 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId, } /* clean up the assoc info if already set */ if (pSession->assocInfo.pBssDesc) { - cdf_mem_free(pSession->assocInfo.pBssDesc); + qdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } return QDF_STATUS_SUCCESS; @@ -5143,7 +5143,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx, ac_info = &qos_session->ac_info[ac]; tspec_pending_status = ac_info->tspec_pending; tspec_mask_status = ac_info->tspec_mask_status; - cdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX); + qdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX); QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("AC %d ==> TSPEC status = %d, tspec pending = %d"), ac, tspec_mask_status, tspec_pending_status); @@ -5229,7 +5229,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; @@ -5244,7 +5244,7 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac, QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], + qdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], sizeof(sme_QosWmmTspecInfo)); if ((!pACInfo->num_flows[0]) && (!pACInfo->num_flows[1])) { @@ -5473,7 +5473,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, if ((pACInfo->curr_QoSInfo[pACInfo->tspec_pending - 1].ts_info. direction == SME_QOS_WMM_TS_DIR_BOTH) && (pACInfo->num_flows[SME_QOS_TSPEC_INDEX_1] > 0)) { - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* update tspec_mask for all the flows having SME_QOS_TSPEC_MASK_BIT_2_SET to SME_QOS_TSPEC_MASK_BIT_1_SET */ search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_5; @@ -5483,7 +5483,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, SME_QOS_TSPEC_MASK_BIT_1_SET); } - cdf_mem_zero(&search_key1, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key1, sizeof(sme_QosSearchInfo)); /* set the horenewal field in control block if needed */ search_key1.index = SME_QOS_SEARCH_KEY_INDEX_3; search_key1.key.reason = SME_QOS_REASON_SETUP; @@ -5500,7 +5500,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, } } } - cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); + qdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo)); /* set the key type & the key to be searched in the Flow List */ search_key.key.ac_type = ac; search_key.index = SME_QOS_SEARCH_KEY_INDEX_2; @@ -5518,7 +5518,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac, return QDF_STATUS_E_FAILURE; } pACInfo->hoRenewal = false; - cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], + qdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1], sizeof(sme_QosWmmTspecInfo)); /* event: EVENT_WLAN_QOS */ #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -5623,7 +5623,7 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, __func__, __LINE__); return QDF_STATUS_E_FAILURE; } - cdf_mem_copy(&TspecInfo, pCurrent_Tspec_Info, + qdf_mem_copy(&TspecInfo, pCurrent_Tspec_Info, sizeof(sme_QosWmmTspecInfo)); TspecInfo.ts_info.psb = pInput_Tspec_Info->ts_info.psb; /*------------------------------------------------------------------------- @@ -5755,10 +5755,10 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info, TspecInfo.ts_info.burst_size_defn = 1; } if (pUpdated_Tspec_Info) { - cdf_mem_copy(pUpdated_Tspec_Info, &TspecInfo, + qdf_mem_copy(pUpdated_Tspec_Info, &TspecInfo, sizeof(sme_QosWmmTspecInfo)); } else { - cdf_mem_copy(pCurrent_Tspec_Info, &TspecInfo, + qdf_mem_copy(pCurrent_Tspec_Info, &TspecInfo, sizeof(sme_QosWmmTspecInfo)); } return QDF_STATUS_SUCCESS; @@ -5797,7 +5797,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId, __func__, __LINE__); return QDF_STATUS_E_FAILURE; } - cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); + qdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo)); pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false); if (!pEntry) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -6137,7 +6137,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc, __func__, __LINE__, ret_val, ac); if (NULL == pIes) { /* IEs were allocated locally so free them */ - cdf_mem_free(pIesLocal); + qdf_mem_free(pIesLocal); } return ret_val; } @@ -6253,7 +6253,7 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx, FL("Deleting original entry at %p with flowID %d"), flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, list_entry, true); - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); list_entry = list_nextentry; } @@ -6304,7 +6304,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac, /* delete the entry from Flow List */ csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); } pEntry = pNextEntry; } @@ -6329,7 +6329,7 @@ QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head) QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: %d: Invoked", __func__, __LINE__); pentry = - (sme_QosCmdInfoEntry *) cdf_mem_malloc(sizeof(sme_QosCmdInfoEntry)); + (sme_QosCmdInfoEntry *) qdf_mem_malloc(sizeof(sme_QosCmdInfoEntry)); if (!pentry) { /* err msg */ QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, @@ -6451,7 +6451,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) break; } /* buffered command has been processed, reclaim the memory */ - cdf_mem_free(pcmd); + qdf_mem_free(pcmd); } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, FL("cmd buffer empty")); @@ -6497,7 +6497,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac, true); /* reclaim the memory */ pcmd = GET_BASE_ADDR(pEntry, sme_QosCmdInfoEntry, link); - cdf_mem_free(pcmd); + qdf_mem_free(pcmd); pEntry = pNextEntry; } return QDF_STATUS_SUCCESS; @@ -6528,20 +6528,20 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession, } /* clean up the assoc info if already set */ if (pSession->assocInfo.pBssDesc) { - cdf_mem_free(pSession->assocInfo.pBssDesc); + qdf_mem_free(pSession->assocInfo.pBssDesc); pSession->assocInfo.pBssDesc = NULL; } bssLen = pAssoc_info->pBssDesc->length + sizeof(pAssoc_info->pBssDesc->length); /* save the bss Descriptor */ - pBssDesc = (tSirBssDescription *) cdf_mem_malloc(bssLen); + pBssDesc = (tSirBssDescription *) qdf_mem_malloc(bssLen); if (!pBssDesc) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: couldn't allocate memory for the bss Descriptor", __func__, __LINE__); return QDF_STATUS_E_NOMEM; } - cdf_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen); + qdf_mem_copy(pBssDesc, pAssoc_info->pBssDesc, bssLen); pSession->assocInfo.pBssDesc = pBssDesc; /* save the apsd info from assoc */ if (pAssoc_info->pProfile) { @@ -6666,7 +6666,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry) __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); /* reclaim the memory */ - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); break; default: break; @@ -6848,7 +6848,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true); /* reclaim the memory */ - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); } return QDF_STATUS_SUCCESS; } @@ -6935,7 +6935,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry) __func__, __LINE__, flow_info, flow_info->QosFlowID); csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true); /* reclaim the memory */ - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); } return QDF_STATUS_SUCCESS; } @@ -7116,7 +7116,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx, /* delete the entry from Flow List */ csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true); /* reclaim the memory */ - cdf_mem_free(flow_info); + qdf_mem_free(flow_info); } return QDF_STATUS_SUCCESS; } @@ -7311,10 +7311,10 @@ void sme_qos_cleanup_ctrl_blk_for_handoff(tpAniSirGlobal pMac, uint8_t sessionId pSession = &sme_qos_cb.sessionInfo[sessionId]; for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { pACInfo = &pSession->ac_info[ac]; - cdf_mem_zero(pACInfo->curr_QoSInfo, + qdf_mem_zero(pACInfo->curr_QoSInfo, sizeof(sme_QosWmmTspecInfo) * SME_QOS_TSPEC_INDEX_MAX); - cdf_mem_zero(pACInfo->requested_QoSInfo, + qdf_mem_zero(pACInfo->requested_QoSInfo, sizeof(sme_QosWmmTspecInfo) * SME_QOS_TSPEC_INDEX_MAX); pACInfo->num_flows[0] = 0; @@ -7389,11 +7389,11 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac, "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ", __func__, __LINE__, sessionId); - cdf_mem_free(pIes); + qdf_mem_free(pIes); return false; } - cdf_mem_free(pIes); + qdf_mem_free(pIes); return true; } @@ -7654,7 +7654,7 @@ static void sme_qos_init_a_cs(tpAniSirGlobal pMac, uint8_t sessionId) sme_QosEdcaAcType ac; pSession = &sme_qos_cb.sessionInfo[sessionId]; for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) { - cdf_mem_zero(&pSession->ac_info[ac], sizeof(sme_QosACInfo)); + qdf_mem_zero(&pSession->ac_info[ac], sizeof(sme_QosACInfo)); sme_qos_state_transition(sessionId, ac, SME_QOS_INIT); } } diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 31728178ef34..c95c6ee0bf87 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -94,8 +94,8 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, while ((pEntry = csr_ll_remove_head(pList, LL_ACCESS_NOLOCK)) != NULL) { pNeighborReportDesc = GET_BASE_ADDR(pEntry, tRrmNeighborReportDesc, List); - cdf_mem_free(pNeighborReportDesc->pNeighborBssDescription); - cdf_mem_free(pNeighborReportDesc); + qdf_mem_free(pNeighborReportDesc->pNeighborBssDescription); + qdf_mem_free(pNeighborReportDesc); } csr_ll_unlock(pList); return; @@ -193,13 +193,13 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, do { length = sizeof(tSirBeaconReportXmitInd); - beacon_rep = cdf_mem_malloc(length); + beacon_rep = qdf_mem_malloc(length); if (NULL == beacon_rep) { sms_log(mac_ctx, LOGP, "Unable to allocate memory for beacon report"); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(beacon_rep, length); + qdf_mem_zero(beacon_rep, length); #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Allocated memory for beacon_rep")); #endif @@ -208,7 +208,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, beacon_rep->uDialogToken = rrm_ctx->token; beacon_rep->duration = rrm_ctx->duration[0]; beacon_rep->regClass = rrm_ctx->regClass; - cdf_mem_copy(beacon_rep->bssId, rrm_ctx->sessionBssId.bytes, + qdf_mem_copy(beacon_rep->bssId, rrm_ctx->sessionBssId.bytes, QDF_MAC_ADDR_SIZE); i = 0; @@ -218,14 +218,14 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, break; ie_len = GET_IE_LEN_IN_BSS(bss_desc->length); beacon_rep->pBssDescription[i] = - cdf_mem_malloc(ie_len + + qdf_mem_malloc(ie_len + sizeof(tSirBssDescription)); if (NULL == beacon_rep->pBssDescription[i]) break; - cdf_mem_copy(beacon_rep->pBssDescription[i], + qdf_mem_copy(beacon_rep->pBssDescription[i], bss_desc, sizeof(tSirBssDescription)); - cdf_mem_copy( + qdf_mem_copy( &beacon_rep->pBssDescription[i]->ieFields[0], bss_desc->ieFields, ie_len); sms_log(mac_ctx, LOG1, @@ -314,7 +314,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( if (result_arr) cur_result = result_arr[bss_counter]; - cdf_mem_zero(&bcn_rpt_rsp, sizeof(tSirEseBcnReportRsp)); + qdf_mem_zero(&bcn_rpt_rsp, sizeof(tSirEseBcnReportRsp)); do { cur_meas_req = NULL; for (i = 0; i < rrm_ctx->eseBcnReqInfo.numBcnReqIe; i++) { @@ -356,7 +356,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( bcn_rpt_fields->CapabilityInfo = bss_desc->capabilityInfo; - cdf_mem_copy(bcn_rpt_fields->Bssid, + qdf_mem_copy(bcn_rpt_fields->Bssid, bss_desc->bssId, sizeof(tSirMacAddr)); fill_ie_status = sir_beacon_ie_ese_bcn_report(mac_ctx, @@ -405,7 +405,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( /* Free the memory allocated to IE */ for (i = 0; i < j; i++) if (bcn_report->bcnRepBssInfo[i].pBuf) - cdf_mem_free(bcn_report->bcnRepBssInfo[i].pBuf); + qdf_mem_free(bcn_report->bcnRepBssInfo[i].pBuf); } while (cur_result); return status; } @@ -442,27 +442,27 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGE, FL("Send scan result to PE ")); #endif - cdf_mem_zero(&filter, sizeof(filter)); - cdf_mem_zero(scanresults_arr, + qdf_mem_zero(&filter, sizeof(filter)); + qdf_mem_zero(scanresults_arr, sizeof(next_result) * SIR_BCN_REPORT_MAX_BSS_DESC); filter.BSSIDs.numOfBSSIDs = 1; filter.BSSIDs.bssid = (struct qdf_mac_addr *)&rrm_ctx->bssId; if (rrm_ctx->ssId.length) { filter.SSIDs.SSIDList = - (tCsrSSIDInfo *) cdf_mem_malloc(sizeof(tCsrSSIDInfo)); + (tCsrSSIDInfo *) qdf_mem_malloc(sizeof(tCsrSSIDInfo)); if (filter.SSIDs.SSIDList == NULL) { - sms_log(mac_ctx, LOGP, FL("cdf_mem_malloc failed")); + sms_log(mac_ctx, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Allocated memory for SSIDList")); #endif - cdf_mem_zero(filter.SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); + qdf_mem_zero(filter.SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); filter.SSIDs.SSIDList->SSID.length = rrm_ctx->ssId.length; - cdf_mem_copy(filter.SSIDs.SSIDList->SSID.ssId, + qdf_mem_copy(filter.SSIDs.SSIDList->SSID.ssId, rrm_ctx->ssId.ssId, rrm_ctx->ssId.length); filter.SSIDs.numOfSSIDs = 1; } else { @@ -489,7 +489,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, if (filter.SSIDs.SSIDList) { /* Free the memory allocated for SSIDList */ - cdf_mem_free(filter.SSIDs.SSIDList); + qdf_mem_free(filter.SSIDs.SSIDList); #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Free memory for SSIDList")); #endif @@ -623,7 +623,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, &pSmeRrmContext->channelList. ChannelList[pSmeRrmContext->currentIndex], true); - cdf_mem_free(pSmeRrmContext->channelList.ChannelList); + qdf_mem_free(pSmeRrmContext->channelList.ChannelList); #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) pSmeRrmContext->eseBcnReqInProgress = false; #endif @@ -674,31 +674,31 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Issue scan request")); #endif - cdf_mem_zero(&scan_req, sizeof(scan_req)); + qdf_mem_zero(&scan_req, sizeof(scan_req)); /* set scan_type, active or passive */ scan_req.bcnRptReqScan = true; scan_req.scanType = scan_type; - cdf_mem_copy(&scan_req.bssid.bytes, sme_rrm_ctx->bssId, + qdf_mem_copy(&scan_req.bssid.bytes, sme_rrm_ctx->bssId, QDF_MAC_ADDR_SIZE); if (sme_rrm_ctx->ssId.length) { scan_req.SSIDs.numOfSSIDs = 1; scan_req.SSIDs.SSIDList = - (tCsrSSIDInfo *)cdf_mem_malloc( + (tCsrSSIDInfo *)qdf_mem_malloc( sizeof(tCsrSSIDInfo)); if (NULL == scan_req.SSIDs.SSIDList) { sms_log(mac_ctx, LOGP, - FL("cdf_mem_malloc failed")); + FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Allocated memory for pSSIDList")); #endif - cdf_mem_zero(scan_req.SSIDs.SSIDList, + qdf_mem_zero(scan_req.SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); scan_req.SSIDs.SSIDList->SSID.length = sme_rrm_ctx->ssId.length; - cdf_mem_copy(scan_req.SSIDs.SSIDList->SSID.ssId, + qdf_mem_copy(scan_req.SSIDs.SSIDList->SSID.ssId, sme_rrm_ctx->ssId.ssId, sme_rrm_ctx->ssId.length); } @@ -743,7 +743,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) &sme_rrm_scan_request_callback, NULL); if (sme_rrm_ctx->ssId.length) { - cdf_mem_free(scan_req.SSIDs.SSIDList); + qdf_mem_free(scan_req.SSIDs.SSIDList); #if defined WLAN_VOWIFI_DEBUG sms_log(mac_ctx, LOGE, FL("Free memory for SSIDList")); #endif @@ -776,7 +776,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) sme_rrm_send_scan_result(mac_ctx, 1, &sme_rrm_ctx->channelList.ChannelList[ sme_rrm_ctx->currentIndex], true); - cdf_mem_free(sme_rrm_ctx->channelList.ChannelList); + qdf_mem_free(sme_rrm_ctx->channelList.ChannelList); } } else { sms_log(mac_ctx, LOGE, FL("Unknown beacon report req mode(%d)"), @@ -821,9 +821,9 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg && (pBeaconReq->channelList.numChannels == 0))) { /* Add all the channel in the regulatory domain. */ wlan_cfg_get_str_len(pMac, WNI_CFG_VALID_CHANNEL_LIST, &len); - pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); + pSmeRrmContext->channelList.ChannelList = qdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { - sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); + sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG @@ -851,9 +851,9 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg len += pBeaconReq->channelList.numChannels; - pSmeRrmContext->channelList.ChannelList = cdf_mem_malloc(len); + pSmeRrmContext->channelList.ChannelList = qdf_mem_malloc(len); if (pSmeRrmContext->channelList.ChannelList == NULL) { - sms_log(pMac, LOGP, FL("cdf_mem_malloc failed")); + sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } #if defined WLAN_VOWIFI_DEBUG @@ -891,15 +891,15 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg } /* Copy session bssid */ - cdf_mem_copy(pSmeRrmContext->sessionBssId.bytes, pBeaconReq->bssId, + qdf_mem_copy(pSmeRrmContext->sessionBssId.bytes, pBeaconReq->bssId, sizeof(tSirMacAddr)); /* copy measurement bssid */ - cdf_mem_copy(pSmeRrmContext->bssId, pBeaconReq->macaddrBssid, + qdf_mem_copy(pSmeRrmContext->bssId, pBeaconReq->macaddrBssid, sizeof(tSirMacAddr)); /* Copy ssid */ - cdf_mem_copy(&pSmeRrmContext->ssId, &pBeaconReq->ssId, + qdf_mem_copy(&pSmeRrmContext->ssId, &pBeaconReq->ssId, sizeof(tAniSSID)); pSmeRrmContext->token = pBeaconReq->uDialogToken; @@ -909,10 +909,10 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg pSmeRrmContext->rrmConfig.max_randn_interval); pSmeRrmContext->currentIndex = 0; pSmeRrmContext->msgSource = pBeaconReq->msgSource; - cdf_mem_copy((uint8_t *) &pSmeRrmContext->measMode, + qdf_mem_copy((uint8_t *) &pSmeRrmContext->measMode, (uint8_t *) &pBeaconReq->fMeasurementtype, SIR_ESE_MAX_MEAS_IE_REQS); - cdf_mem_copy((uint8_t *) &pSmeRrmContext->duration, + qdf_mem_copy((uint8_t *) &pSmeRrmContext->duration, (uint8_t *) &pBeaconReq->measurementDuration, SIR_ESE_MAX_MEAS_IE_REQS); @@ -959,14 +959,14 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI return QDF_STATUS_E_AGAIN; } - pMsg = cdf_mem_malloc(sizeof(tSirNeighborReportReqInd)); + pMsg = qdf_mem_malloc(sizeof(tSirNeighborReportReqInd)); if (NULL == pMsg) { sms_log(pMac, LOGE, "Unable to allocate memory for Neighbor request"); return QDF_STATUS_E_NOMEM; } - cdf_mem_zero(pMsg, sizeof(tSirNeighborReportReqInd)); + qdf_mem_zero(pMsg, sizeof(tSirNeighborReportReqInd)); #if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, FL(" Allocated memory for Neighbor request")); #endif @@ -983,10 +983,10 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI pMsg->messageType = eWNI_SME_NEIGHBOR_REPORT_REQ_IND; pMsg->length = sizeof(tSirNeighborReportReqInd); - cdf_mem_copy(&pMsg->bssId, &pSession->connectedProfile.bssid, + qdf_mem_copy(&pMsg->bssId, &pSession->connectedProfile.bssid, sizeof(tSirMacAddr)); pMsg->noSSID = pNeighborReq->no_ssid; - cdf_mem_copy(&pMsg->ucSSID, &pNeighborReq->ssid, sizeof(tSirMacSSid)); + qdf_mem_copy(&pMsg->ucSSID, &pNeighborReq->ssid, sizeof(tSirMacSSid)); status = cds_send_mb_message_to_mac(pMsg); if (status != QDF_STATUS_SUCCESS) @@ -1198,7 +1198,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) for (i = 0; i < pNeighborRpt->numNeighborReports; i++) { pNeighborReportDesc = - cdf_mem_malloc(sizeof(tRrmNeighborReportDesc)); + qdf_mem_malloc(sizeof(tRrmNeighborReportDesc)); if (NULL == pNeighborReportDesc) { sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report desc"); @@ -1207,20 +1207,20 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) } - cdf_mem_zero(pNeighborReportDesc, + qdf_mem_zero(pNeighborReportDesc, sizeof(tRrmNeighborReportDesc)); pNeighborReportDesc->pNeighborBssDescription = - cdf_mem_malloc(sizeof(tSirNeighborBssDescription)); + qdf_mem_malloc(sizeof(tSirNeighborBssDescription)); if (NULL == pNeighborReportDesc->pNeighborBssDescription) { sms_log(pMac, LOGE, "Failed to allocate memory for RRM Neighbor report BSS Description"); - cdf_mem_free(pNeighborReportDesc); + qdf_mem_free(pNeighborReportDesc); status = QDF_STATUS_E_NOMEM; goto end; } - cdf_mem_zero(pNeighborReportDesc->pNeighborBssDescription, + qdf_mem_zero(pNeighborReportDesc->pNeighborBssDescription, sizeof(tSirNeighborBssDescription)); - cdf_mem_copy(pNeighborReportDesc->pNeighborBssDescription, + qdf_mem_copy(pNeighborReportDesc->pNeighborBssDescription, &pNeighborRpt->sNeighborBssDescription[i], sizeof(tSirNeighborBssDescription)); @@ -1247,9 +1247,9 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) sNeighborBssDescription[i]. bssId)); - cdf_mem_free(pNeighborReportDesc-> + qdf_mem_free(pNeighborReportDesc-> pNeighborBssDescription); - cdf_mem_free(pNeighborReportDesc); + qdf_mem_free(pNeighborReportDesc); } } end: @@ -1493,7 +1493,7 @@ QDF_STATUS rrm_ready(tpAniSirGlobal pMac) QDF_STATUS rrm_change_default_config_param(tpAniSirGlobal pMac, struct rrm_config_param *rrm_config) { - cdf_mem_copy(&pMac->rrm.rrmSmeContext.rrmConfig, rrm_config, + qdf_mem_copy(&pMac->rrm.rrmSmeContext.rrmConfig, rrm_config, sizeof(struct rrm_config_param)); return QDF_STATUS_SUCCESS; diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 278693326847..8940579d3a7a 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -60,7 +60,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) pEpping_ctx->cookie_count = 0; for (i = 0; i < MAX_COOKIE_SLOTS_NUM; i++) { pEpping_ctx->s_cookie_mem[i] = - cdf_mem_malloc(sizeof(struct epping_cookie) * + qdf_mem_malloc(sizeof(struct epping_cookie) * MAX_COOKIE_SLOT_SIZE); if (pEpping_ctx->s_cookie_mem == NULL) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, @@ -68,7 +68,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) i); goto error; } - cdf_mem_zero(pEpping_ctx->s_cookie_mem[i], + qdf_mem_zero(pEpping_ctx->s_cookie_mem[i], sizeof(struct epping_cookie) * MAX_COOKIE_SLOT_SIZE); } @@ -84,7 +84,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx) error: for (i = 0; i < MAX_COOKIE_SLOTS_NUM; i++) { if (pEpping_ctx->s_cookie_mem[i]) { - cdf_mem_free(pEpping_ctx->s_cookie_mem[i]); + qdf_mem_free(pEpping_ctx->s_cookie_mem[i]); pEpping_ctx->s_cookie_mem[i] = NULL; } } @@ -101,7 +101,7 @@ void epping_cookie_cleanup(epping_context_t *pEpping_ctx) qdf_spin_unlock_bh(&pEpping_ctx->cookie_lock); for (i = 0; i < MAX_COOKIE_SLOTS_NUM; i++) { if (pEpping_ctx->s_cookie_mem[i]) { - cdf_mem_free(pEpping_ctx->s_cookie_mem[i]); + qdf_mem_free(pEpping_ctx->s_cookie_mem[i]); pEpping_ctx->s_cookie_mem[i] = NULL; } } diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index ee8fef1fff02..e9b141ec4262 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -87,7 +87,7 @@ int epping_open(void) { EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__); - g_epping_ctx = cdf_mem_malloc(sizeof(*g_epping_ctx)); + g_epping_ctx = qdf_mem_malloc(sizeof(*g_epping_ctx)); if (g_epping_ctx == NULL) { EPPING_LOG(QDF_TRACE_LEVEL_ERROR, @@ -148,7 +148,7 @@ void epping_close(void) to_free = g_epping_ctx; g_epping_ctx = NULL; - cdf_mem_free(to_free); + qdf_mem_free(to_free); } static void epping_target_suspend_acknowledge(void *context) diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index 4012af562a1f..3d41d0f707f7 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -221,9 +221,9 @@ static int epping_set_mac_address(struct net_device *dev, void *addr) { epping_adapter_t *pAdapter = netdev_priv(dev); struct sockaddr *psta_mac_addr = addr; - cdf_mem_copy(&pAdapter->macAddressCurrent, + qdf_mem_copy(&pAdapter->macAddressCurrent, psta_mac_addr->sa_data, ETH_ALEN); - cdf_mem_copy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN); + qdf_mem_copy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN); return 0; } @@ -360,12 +360,12 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, } pAdapter = netdev_priv(dev); - cdf_mem_zero(pAdapter, sizeof(*pAdapter)); + qdf_mem_zero(pAdapter, sizeof(*pAdapter)); pAdapter->dev = dev; pAdapter->pEpping_ctx = pEpping_ctx; pAdapter->device_mode = device_mode; /* station, SAP, etc */ - cdf_mem_copy(dev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr)); - cdf_mem_copy(pAdapter->macAddressCurrent.bytes, + qdf_mem_copy(dev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr)); + qdf_mem_copy(pAdapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr)); qdf_spinlock_create(&pAdapter->data_lock); cdf_nbuf_queue_init(&pAdapter->nodrop_queue); @@ -394,8 +394,8 @@ int epping_connect_service(epping_context_t *pEpping_ctx) HTC_SERVICE_CONNECT_REQ connect; HTC_SERVICE_CONNECT_RESP response; - cdf_mem_zero(&connect, sizeof(connect)); - cdf_mem_zero(&response, sizeof(response)); + qdf_mem_zero(&connect, sizeof(connect)); + qdf_mem_zero(&response, sizeof(response)); /* these fields are the same for all service endpoints */ connect.EpCallbacks.pContext = pEpping_ctx; diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index 6de19c5ec3c7..b37e83974340 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -4118,10 +4118,10 @@ cnss_diag_event_report(A_UINT16 event_Id, A_UINT16 length, void *pPayload) event_report_t *pEvent_report; A_UINT16 total_len; total_len = sizeof(event_report_t) + length; - pBuf = cdf_mem_malloc(total_len); + pBuf = qdf_mem_malloc(total_len); if (!pBuf) { AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("%s: cdf_mem_malloc failed \n", __func__)); + ("%s: qdf_mem_malloc failed \n", __func__)); return; } pBuf1 = pBuf; @@ -4133,7 +4133,7 @@ cnss_diag_event_report(A_UINT16 event_Id, A_UINT16 length, void *pPayload) memcpy(pBuf, pPayload, length); send_diag_netlink_data((A_UINT8 *) pBuf1, total_len, DIAG_TYPE_HOST_MSG); - cdf_mem_free((void *)pBuf1); + qdf_mem_free((void *)pBuf1); return; } diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c index 0ad80713f3f7..4f9d26164c2e 100644 --- a/core/utils/host_diag_log/src/host_diag_log.c +++ b/core/utils/host_diag_log/src/host_diag_log.c @@ -131,15 +131,15 @@ void host_diag_log_submit(void *plog_hdr_ptr) total_len = sizeof(tAniHdr) + sizeof(uint32_t) + data_len; - pBuf = (uint8_t *) cdf_mem_malloc(total_len); + pBuf = (uint8_t *) qdf_mem_malloc(total_len); if (!pBuf) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "cdf_mem_malloc failed"); + "qdf_mem_malloc failed"); return; } - cdf_mem_zero((void *)pBuf, total_len); + qdf_mem_zero((void *)pBuf, total_len); wmsg = (tAniHdr *) pBuf; wmsg->type = PTT_MSG_DIAG_CMDS_TYPE; @@ -154,7 +154,7 @@ void host_diag_log_submit(void *plog_hdr_ptr) memcpy(pBuf, pHdr, data_len); ptt_sock_send_msg_to_app (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID); - cdf_mem_free((void *)wmsg); + qdf_mem_free((void *)wmsg); } return; } @@ -226,11 +226,11 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, if (cds_is_multicast_logging()) { total_len = sizeof(tAniHdr) + sizeof(event_report_t) + length; - pBuf = (uint8_t *) cdf_mem_malloc(total_len); + pBuf = (uint8_t *) qdf_mem_malloc(total_len); if (!pBuf) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "cdf_mem_malloc failed"); + "qdf_mem_malloc failed"); return; } wmsg = (tAniHdr *) pBuf; @@ -252,11 +252,11 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length, (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID) < 0) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Ptt Socket error sending message to the app!!"); - cdf_mem_free((void *)wmsg); + qdf_mem_free((void *)wmsg); return; } - cdf_mem_free((void *)wmsg); + qdf_mem_free((void *)wmsg); } return; diff --git a/core/utils/host_diag_log/src/i_host_diag_core_log.h b/core/utils/host_diag_log/src/i_host_diag_core_log.h index 8695171022ef..829ae193034e 100644 --- a/core/utils/host_diag_log/src/i_host_diag_core_log.h +++ b/core/utils/host_diag_log/src/i_host_diag_core_log.h @@ -46,7 +46,7 @@ Include Files ------------------------------------------------------------------------*/ #include -#include +#include /*-------------------------------------------------------------------------- Preprocessor definitions and constants @@ -83,9 +83,9 @@ void host_diag_log_submit(void *plog_hdr_ptr); #define WLAN_HOST_DIAG_LOG_ALLOC(payload_ptr, payload_type, log_code) \ do { \ - payload_ptr = (payload_type *)cdf_mem_malloc(sizeof(payload_type)); \ + payload_ptr = (payload_type *)qdf_mem_malloc(sizeof(payload_type)); \ if (payload_ptr) { \ - cdf_mem_zero(payload_ptr, sizeof(payload_type)); \ + qdf_mem_zero(payload_ptr, sizeof(payload_type)); \ host_diag_log_set_code(payload_ptr, log_code); \ host_diag_log_set_length(payload_ptr, sizeof(payload_type)); \ } \ @@ -98,7 +98,7 @@ void host_diag_log_submit(void *plog_hdr_ptr); do { \ if (payload_ptr) { \ host_diag_log_submit(payload_ptr); \ - cdf_mem_free(payload_ptr); \ + qdf_mem_free(payload_ptr); \ } \ } while (0) @@ -108,7 +108,7 @@ void host_diag_log_submit(void *plog_hdr_ptr); #define WLAN_HOST_DIAG_LOG_FREE(payload_ptr) \ do { \ if (payload_ptr) { \ - cdf_mem_free(payload_ptr); \ + qdf_mem_free(payload_ptr); \ } \ } while (0) diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 55eefa96d4a7..631cff50eff3 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -667,7 +667,7 @@ int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf) return -ENOMEM; } - cdf_mem_zero(gplog_msg, (num_buf * sizeof(struct log_msg))); + qdf_mem_zero(gplog_msg, (num_buf * sizeof(struct log_msg))); gwlan_logging.log_fe_to_console = !!log_fe_to_console; gwlan_logging.num_buf = num_buf; diff --git a/core/utils/pktlog/linux_ac.c b/core/utils/pktlog/linux_ac.c index 3297c000e41e..4289ab331a0e 100644 --- a/core/utils/pktlog/linux_ac.c +++ b/core/utils/pktlog/linux_ac.c @@ -583,7 +583,7 @@ int pktlog_send_per_pkt_stats_to_user(void) do { pktlog = (struct host_log_pktlog_info *) - cdf_mem_malloc(sizeof(struct host_log_pktlog_info) + + qdf_mem_malloc(sizeof(struct host_log_pktlog_info) + VOS_LOG_PKT_LOG_SIZE); if (!pktlog) { printk(PKTLOG_TAG " %s: Memory allocation failed\n", @@ -591,7 +591,7 @@ int pktlog_send_per_pkt_stats_to_user(void) return -ENOMEM; } - cdf_mem_zero(pktlog, VOS_LOG_PKT_LOG_SIZE); + qdf_mem_zero(pktlog, VOS_LOG_PKT_LOG_SIZE); host_diag_log_set_code(pktlog, LOG_WLAN_PKT_LOG_INFO_C); pktlog->buf_len = 0; @@ -643,7 +643,7 @@ int pktlog_send_per_pkt_stats_to_user(void) pktlog->seq_no = pl_info->buf->msg_index++; WLAN_HOST_DIAG_LOG_REPORT(pktlog); } else { - cdf_mem_free(pktlog); + qdf_mem_free(pktlog); } num_bytes_read += ret_val; @@ -710,7 +710,7 @@ pktlog_read_proc_entry(char *buf, size_t nbytes, loff_t *ppos, if (*ppos < bufhdr_size) { count = MIN((bufhdr_size - *ppos), rem_len); - cdf_mem_copy(buf, ((char *)&log_buf->bufhdr) + *ppos, + qdf_mem_copy(buf, ((char *)&log_buf->bufhdr) + *ppos, count); rem_len -= count; ret_val += count; @@ -756,7 +756,7 @@ pktlog_read_proc_entry(char *buf, size_t nbytes, loff_t *ppos, goto rd_done; count = MIN(rem_len, (end_offset - ppos_data + 1)); - cdf_mem_copy(buf + ret_val, + qdf_mem_copy(buf + ret_val, log_buf->log_data + ppos_data, count); ret_val += count; @@ -764,7 +764,7 @@ pktlog_read_proc_entry(char *buf, size_t nbytes, loff_t *ppos, } else { if (ppos_data <= fold_offset) { count = MIN(rem_len, (fold_offset - ppos_data + 1)); - cdf_mem_copy(buf + ret_val, + qdf_mem_copy(buf + ret_val, log_buf->log_data + ppos_data, count); ret_val += count; @@ -780,7 +780,7 @@ pktlog_read_proc_entry(char *buf, size_t nbytes, loff_t *ppos, if (ppos_data <= end_offset) { count = MIN(rem_len, (end_offset - ppos_data + 1)); - cdf_mem_copy(buf + ret_val, + qdf_mem_copy(buf + ret_val, log_buf->log_data + ppos_data, count); ret_val += count; diff --git a/core/utils/pktlog/pktlog_ac.c b/core/utils/pktlog/pktlog_ac.c index 842ecb5c20b6..3b3f071e2d10 100644 --- a/core/utils/pktlog/pktlog_ac.c +++ b/core/utils/pktlog/pktlog_ac.c @@ -41,7 +41,7 @@ */ #ifndef REMOVE_PKT_LOG -#include "cdf_memory.h" +#include "qdf_mem.h" #include "athdefs.h" #include "pktlog_ac_i.h" #include "cds_api.h" @@ -78,7 +78,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, QDF_STATUS status; struct ath_pktlog_wmi_params *param; - param = cdf_mem_malloc(sizeof(struct ath_pktlog_wmi_params)); + param = qdf_mem_malloc(sizeof(struct ath_pktlog_wmi_params)); if (!param) return A_NO_MEMORY; @@ -93,7 +93,7 @@ static A_STATUS pktlog_wma_post_msg(WMI_PKTLOG_EVENT event_types, status = cds_mq_post_message(CDS_MQ_ID_WMA, &msg); if (status != QDF_STATUS_SUCCESS) { - cdf_mem_free(param); + qdf_mem_free(param); return A_ERROR; } diff --git a/core/utils/pktlog/pktlog_internal.c b/core/utils/pktlog/pktlog_internal.c index cdc416fbbba5..010585ce362f 100644 --- a/core/utils/pktlog/pktlog_internal.c +++ b/core/utils/pktlog/pktlog_internal.c @@ -44,7 +44,7 @@ #include "ol_txrx_types.h" #include "ol_htt_tx_api.h" #include "ol_tx_desc.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "htt.h" #include "htt_internal.h" #include "pktlog_ac_i.h" @@ -327,7 +327,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) &buf_size); if (data) { process_ieee_hdr(data); - cdf_mem_free(data); + qdf_mem_free(data); } } else { /* @@ -359,11 +359,11 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) */ txctl_log.priv.frm_hdr = frm_hdr; qdf_assert(txctl_log.priv.txdesc_ctl); - cdf_mem_copy((void *)&txctl_log.priv.txdesc_ctl, + qdf_mem_copy((void *)&txctl_log.priv.txdesc_ctl, ((void *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); qdf_assert(txctl_log.txdesc_hdr_ctl); - cdf_mem_copy(txctl_log.txdesc_hdr_ctl, &txctl_log.priv, + qdf_mem_copy(txctl_log.txdesc_hdr_ctl, &txctl_log.priv, sizeof(txctl_log.priv)); /* Add Protocol information and HT specific information */ #else @@ -373,8 +373,8 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) qdf_assert(txdesc_hdr_ctl); qdf_assert(pl_hdr.size < (370 * sizeof(u_int32_t))); - cdf_mem_copy(txdesc_hdr_ctl, &frm_hdr, sizeof(frm_hdr)); - cdf_mem_copy((char *)txdesc_hdr_ctl + sizeof(frm_hdr), + qdf_mem_copy(txdesc_hdr_ctl, &frm_hdr, sizeof(frm_hdr)); + qdf_mem_copy((char *)txdesc_hdr_ctl + sizeof(frm_hdr), ((void *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); #endif /* !defined(HELIUMPLUS) */ @@ -387,7 +387,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) txstat_log.ds_status = (void *) pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); qdf_assert(txstat_log.ds_status); - cdf_mem_copy(txstat_log.ds_status, + qdf_mem_copy(txstat_log.ds_status, ((void *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); } @@ -409,7 +409,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) cdf_nbuf_t netbuf; uint32_t len; - cdf_mem_set(&pl_msdu_info, sizeof(pl_msdu_info), 0); + qdf_mem_set(&pl_msdu_info, sizeof(pl_msdu_info), 0); pl_msdu_info.num_msdu = *msdu_id_info; pl_msdu_info.priv_size = sizeof(uint32_t) * @@ -473,10 +473,10 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) } pl_msdu_info.ath_msdu_info = pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_mem_copy((void *)&pl_msdu_info.priv.msdu_id_info, + qdf_mem_copy((void *)&pl_msdu_info.priv.msdu_id_info, ((void *)data + sizeof(struct ath_pktlog_hdr)), sizeof(pl_msdu_info.priv.msdu_id_info)); - cdf_mem_copy(pl_msdu_info.ath_msdu_info, &pl_msdu_info.priv, + qdf_mem_copy(pl_msdu_info.ath_msdu_info, &pl_msdu_info.priv, sizeof(pl_msdu_info.priv)); } return A_OK; @@ -528,7 +528,7 @@ A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu) #endif /* !defined(HELIUMPLUS) */ rxstat_log.rx_desc = (void *)pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_mem_copy(rxstat_log.rx_desc, (void *)rx_desc + + qdf_mem_copy(rxstat_log.rx_desc, (void *)rx_desc + sizeof(struct htt_host_fw_desc_base), pl_hdr.size); msdu = cdf_nbuf_next(msdu); } @@ -567,7 +567,7 @@ A_STATUS process_rx_info(void *pdev, void *data) rxstat_log.rx_desc = (void *)pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_mem_copy(rxstat_log.rx_desc, + qdf_mem_copy(rxstat_log.rx_desc, (void *)data + sizeof(struct ath_pktlog_hdr), pl_hdr.size); return A_OK; @@ -620,7 +620,7 @@ A_STATUS process_rate_find(void *pdev, void *data) rcf_log.rcFind = (void *)pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_mem_copy(rcf_log.rcFind, + qdf_mem_copy(rcf_log.rcFind, ((char *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); @@ -672,7 +672,7 @@ A_STATUS process_rate_update(void *pdev, void *data) */ rcu_log.txRateCtrl = (void *)pktlog_getbuf(pl_dev, pl_info, log_size, &pl_hdr); - cdf_mem_copy(rcu_log.txRateCtrl, + qdf_mem_copy(rcu_log.txRateCtrl, ((char *)data + sizeof(struct ath_pktlog_hdr)), pl_hdr.size); return A_OK; diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c index 71768f74d793..c2c81bd25977 100644 --- a/core/wma/src/wlan_qct_wma_legacy.c +++ b/core/wma/src/wlan_qct_wma_legacy.c @@ -114,14 +114,14 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb) msg.type = pMb->type; msg.bodyval = 0; - pMbLocal = cdf_mem_malloc(pMb->msgLen); + pMbLocal = qdf_mem_malloc(pMb->msgLen); if (!pMbLocal) { WMA_LOGE("Memory allocation failed! Can't send 0x%x\n", msg.type); return eSIR_MEM_ALLOC_FAILED; } - cdf_mem_copy((void *)pMbLocal, (void *)pMb, pMb->msgLen); + qdf_mem_copy((void *)pMbLocal, (void *)pMb, pMb->msgLen); msg.bodyptr = pMbLocal; switch (msg.type & HAL_MMH_MB_MSG_TYPE_MASK) { @@ -142,12 +142,12 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb) break; case SIR_PTT_MSG_TYPES_BEGIN: - cdf_mem_free(msg.bodyptr); + qdf_mem_free(msg.bodyptr); break; default: WMA_LOGD("Unknown message type = 0x%X\n", msg.type); - cdf_mem_free(msg.bodyptr); + qdf_mem_free(msg.bodyptr); return eSIR_FAILURE; } diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index aa56cb9c4cef..941ce36dc8f6 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -48,7 +48,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -830,7 +830,7 @@ static void wma_data_tx_ack_work_handler(void *ack_work) wma_handle->umac_data_ota_ack_cb = NULL; wma_handle->last_umac_data_nbuf = NULL; - cdf_mem_free(work); + qdf_mem_free(work); wma_handle->ack_work_ctx = NULL; } @@ -881,7 +881,7 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) if (wma_handle && wma_handle->umac_data_ota_ack_cb) { struct wma_tx_ack_work_ctx *ack_work; - ack_work = cdf_mem_malloc(sizeof(struct wma_tx_ack_work_ctx)); + ack_work = qdf_mem_malloc(sizeof(struct wma_tx_ack_work_ctx)); wma_handle->ack_work_ctx = ack_work; if (ack_work) { ack_work->wma_handle = wma_handle; @@ -1128,7 +1128,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency buf_ptr += WMI_TLV_HDR_SIZE; chan_latency.chan_mhz = chan1_freq; chan_latency.latency = latency_chan1; - cdf_mem_copy(buf_ptr, &chan_latency, sizeof(chan_latency)); + qdf_mem_copy(buf_ptr, &chan_latency, sizeof(chan_latency)); ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_RESMGR_SET_CHAN_LATENCY_CMDID); if (ret) { @@ -1255,12 +1255,12 @@ QDF_STATUS wma_set_mcc_channel_time_quota buf_ptr += WMI_TLV_HDR_SIZE; chan_quota.chan_mhz = chan1_freq; chan_quota.channel_time_quota = quota_chan1; - cdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); + qdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); /* Construct channel and quota record for the 2nd MCC mode. */ buf_ptr += sizeof(chan_quota); chan_quota.chan_mhz = chan2_freq; chan_quota.channel_time_quota = quota_chan2; - cdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); + qdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID); @@ -1410,7 +1410,7 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, if (!pdev) { WMA_LOGE("vdev handle is invalid for %pM", pRateUpdateParams->bssid.bytes); - cdf_mem_free(pRateUpdateParams); + qdf_mem_free(pRateUpdateParams); return QDF_STATUS_E_INVAL; } short_gi = intr[vdev_id].config.shortgi; @@ -1446,7 +1446,7 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, mbpsx10_rate, pRateUpdateParams->nss, &rate); if (ret != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Error, Invalid input rate value", __func__); - cdf_mem_free(pRateUpdateParams); + qdf_mem_free(pRateUpdateParams); return ret; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, @@ -1454,12 +1454,12 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, if (ret) { WMA_LOGE("%s: Failed to Set WMI_VDEV_PARAM_SGI (%d), ret = %d", __func__, short_gi, ret); - cdf_mem_free(pRateUpdateParams); + qdf_mem_free(pRateUpdateParams); return QDF_STATUS_E_FAILURE; } ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, paramId, rate); - cdf_mem_free(pRateUpdateParams); + qdf_mem_free(pRateUpdateParams); if (ret) { WMA_LOGE("%s: Failed to Set rate, ret = %d", __func__, ret); return QDF_STATUS_E_FAILURE; @@ -1497,7 +1497,7 @@ static void wma_mgmt_tx_ack_work_handler(void *ack_work) ack_cb((tpAniSirGlobal) (wma_handle->mac_context), work->status ? 0 : 1); - cdf_mem_free(work); + qdf_mem_free(work); wma_handle->ack_work_ctx = NULL; } @@ -1555,7 +1555,7 @@ wma_mgmt_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) struct wma_tx_ack_work_ctx *ack_work; ack_work = - cdf_mem_malloc(sizeof(struct wma_tx_ack_work_ctx)); + qdf_mem_malloc(sizeof(struct wma_tx_ack_work_ctx)); if (ack_work) { ack_work->wma_handle = wma_handle; @@ -2181,27 +2181,27 @@ static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) ethr_hdr = (struct ethernet_hdr_t *)local_buf; switch (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_TODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr2, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_FROMDS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr1, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr3, ETHERNET_ADDR_LEN); break; case IEEE80211_FC1_DIR_DSTODS: - cdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, + qdf_mem_copy(ethr_hdr->dest_addr, wh->i_addr3, ETHERNET_ADDR_LEN); - cdf_mem_copy(ethr_hdr->src_addr, wh->i_addr4, + qdf_mem_copy(ethr_hdr->src_addr, wh->i_addr4, ETHERNET_ADDR_LEN); break; } @@ -2217,7 +2217,7 @@ static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) ethr_hdr->ethertype[0] = (ether_type >> 8) & 0xff; ethr_hdr->ethertype[1] = (ether_type) & 0xff; } - cdf_mem_copy(buf, ethr_hdr, ETHERNET_HDR_LEN); + qdf_mem_copy(buf, ethr_hdr, ETHERNET_HDR_LEN); } /** @@ -2257,7 +2257,7 @@ int wmi_desc_pool_init(tp_wma_handle wma_handle, uint32_t pool_size) WMA_LOGE("%s: initialize desc pool of size %d", __func__, pool_size); wma_handle->wmi_desc_pool.pool_size = pool_size; wma_handle->wmi_desc_pool.num_free = pool_size; - wma_handle->wmi_desc_pool.array = cdf_mem_malloc(pool_size * + wma_handle->wmi_desc_pool.array = qdf_mem_malloc(pool_size * sizeof(union wmi_desc_elem_t)); if (!wma_handle->wmi_desc_pool.array) { WMA_LOGE("%s: failed to allocate desc pool", __func__); @@ -2289,7 +2289,7 @@ void wmi_desc_pool_deinit(tp_wma_handle wma_handle) { qdf_spin_lock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); if (wma_handle->wmi_desc_pool.array) { - cdf_mem_free(wma_handle->wmi_desc_pool.array); + qdf_mem_free(wma_handle->wmi_desc_pool.array); wma_handle->wmi_desc_pool.array = NULL; } else { WMA_LOGE("%s: Empty WMI descriptor pool", __func__); @@ -2392,7 +2392,7 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, WMITLV_SET_HDR(bufp, WMITLV_TAG_ARRAY_BYTE, roundup(bufp_len, sizeof(uint32_t))); bufp += WMI_TLV_HDR_SIZE; - cdf_mem_copy(bufp, pData, bufp_len); + qdf_mem_copy(bufp, pData, bufp_len); cdf_nbuf_map_single(qdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); @@ -2529,9 +2529,9 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, * MAC header and data, Keep the CCMP header and * trailer as 0's, firmware shall fill this */ - cdf_mem_set(pFrame, newFrmLen, 0); - cdf_mem_copy(pFrame, wh, sizeof(*wh)); - cdf_mem_copy(pFrame + sizeof(*wh) + + qdf_mem_set(pFrame, newFrmLen, 0); + qdf_mem_copy(pFrame, wh, sizeof(*wh)); + qdf_mem_copy(pFrame + sizeof(*wh) + IEEE80211_CCMP_HEADERLEN, pData + sizeof(*wh), frmLen - sizeof(*wh)); @@ -2560,9 +2560,9 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, * MAC header and data. MMIE field will be * filled by cds_attach_mmie API */ - cdf_mem_set(pFrame, newFrmLen, 0); - cdf_mem_copy(pFrame, wh, sizeof(*wh)); - cdf_mem_copy(pFrame + sizeof(*wh), + qdf_mem_set(pFrame, newFrmLen, 0); + qdf_mem_copy(pFrame, wh, sizeof(*wh)); + qdf_mem_copy(pFrame + sizeof(*wh), pData + sizeof(*wh), frmLen - sizeof(*wh)); if (!cds_attach_mmie(iface->key.key, iface->key.key_id[0].ipn, @@ -2644,14 +2644,14 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, /* Take out 802.11 header from skb */ decap_info.hdr_len = wma_ieee80211_hdrsize(wh); - cdf_mem_copy(decap_info.hdr, wh, decap_info.hdr_len); + qdf_mem_copy(decap_info.hdr, wh, decap_info.hdr_len); cdf_nbuf_pull_head(skb, decap_info.hdr_len); /* Decapsulate to 802.3 format */ wma_decap_to_8023(skb, &decap_info); /* Zero out skb's context buffer for the driver to use */ - cdf_mem_set(skb->cb, sizeof(skb->cb), 0); + qdf_mem_set(skb->cb, sizeof(skb->cb), 0); /* Do the DMA Mapping */ cdf_nbuf_map_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); @@ -2912,34 +2912,34 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, if (cdf_nbuf_len(rx_frame) < sizeof(*eth_hdr)) return; eth_hdr = (struct ether_header *)cdf_nbuf_data(rx_frame); - mic_err_ind = cdf_mem_malloc(sizeof(*mic_err_ind)); + mic_err_ind = qdf_mem_malloc(sizeof(*mic_err_ind)); if (!mic_err_ind) { WMA_LOGE("%s: Failed to allocate memory for MIC indication message", __func__); return; } - cdf_mem_set((void *)mic_err_ind, sizeof(*mic_err_ind), 0); + qdf_mem_set((void *)mic_err_ind, sizeof(*mic_err_ind), 0); mic_err_ind->messageType = eWNI_SME_MIC_FAILURE_IND; mic_err_ind->length = sizeof(*mic_err_ind); mic_err_ind->sessionId = vdev_id; qdf_copy_macaddr(&mic_err_ind->bssId, (struct qdf_mac_addr *) &wma->interfaces[vdev_id].bssid); - cdf_mem_copy(mic_err_ind->info.taMacAddr, + qdf_mem_copy(mic_err_ind->info.taMacAddr, (struct qdf_mac_addr *) peer_mac_addr, sizeof(tSirMacAddr)); - cdf_mem_copy(mic_err_ind->info.srcMacAddr, + qdf_mem_copy(mic_err_ind->info.srcMacAddr, (struct qdf_mac_addr *) eth_hdr->ether_shost, sizeof(tSirMacAddr)); - cdf_mem_copy(mic_err_ind->info.dstMacAddr, + qdf_mem_copy(mic_err_ind->info.dstMacAddr, (struct qdf_mac_addr *) eth_hdr->ether_dhost, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = key_id; mic_err_ind->info.multicast = IEEE80211_IS_MULTICAST(eth_hdr->ether_dhost); - cdf_mem_copy(mic_err_ind->info.TSC, pn, SIR_CIPHER_SEQ_CTR_SIZE); + qdf_mem_copy(mic_err_ind->info.TSC, pn, SIR_CIPHER_SEQ_CTR_SIZE); - cdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); + qdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; @@ -2947,7 +2947,7 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: could not post mic failure indication to SME", __func__); - cdf_mem_free((void *)mic_err_ind); + qdf_mem_free((void *)mic_err_ind); } } @@ -3107,14 +3107,14 @@ wma_indicate_err( return; } - mic_err_ind = cdf_mem_malloc(sizeof(*mic_err_ind)); + mic_err_ind = qdf_mem_malloc(sizeof(*mic_err_ind)); if (!mic_err_ind) { WMA_LOGE("%s: MIC indication mem alloc failed", __func__); return; } - cdf_mem_set((void *) mic_err_ind, 0, + qdf_mem_set((void *) mic_err_ind, 0, sizeof(*mic_err_ind)); mic_err_ind->messageType = eWNI_SME_MIC_FAILURE_IND; mic_err_ind->length = sizeof(*mic_err_ind); @@ -3125,23 +3125,23 @@ wma_indicate_err( mic_err_ind->bssId.bytes[0], mic_err_ind->bssId.bytes[1], mic_err_ind->bssId.bytes[2], mic_err_ind->bssId.bytes[3], mic_err_ind->bssId.bytes[4], mic_err_ind->bssId.bytes[5]); - cdf_mem_copy(mic_err_ind->info.taMacAddr, + qdf_mem_copy(mic_err_ind->info.taMacAddr, (struct qdf_mac_addr *) err_info->u.mic_err.ta, sizeof(tSirMacAddr)); - cdf_mem_copy(mic_err_ind->info.srcMacAddr, + qdf_mem_copy(mic_err_ind->info.srcMacAddr, (struct qdf_mac_addr *) err_info->u.mic_err.sa, sizeof(tSirMacAddr)); - cdf_mem_copy(mic_err_ind->info.dstMacAddr, + qdf_mem_copy(mic_err_ind->info.dstMacAddr, (struct qdf_mac_addr *) err_info->u.mic_err.da, sizeof(tSirMacAddr)); mic_err_ind->info.keyId = err_info->u.mic_err.key_id; mic_err_ind->info.multicast = IEEE80211_IS_MULTICAST(err_info->u.mic_err.da); - cdf_mem_copy(mic_err_ind->info.TSC, + qdf_mem_copy(mic_err_ind->info.TSC, (void *)&err_info-> u.mic_err.pn, SIR_CIPHER_SEQ_CTR_SIZE); - cdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); + qdf_mem_set(&cds_msg, sizeof(cds_msg_t), 0); cds_msg.type = eWNI_SME_MIC_FAILURE_IND; cds_msg.bodyptr = (void *) mic_err_ind; if (QDF_STATUS_SUCCESS != @@ -3149,7 +3149,7 @@ wma_indicate_err( (cds_msg_t *) &cds_msg)) { WMA_LOGE("%s: mic failure ind post to SME failed", __func__); - cdf_mem_free((void *)mic_err_ind); + qdf_mem_free((void *)mic_err_ind); } break; } diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index a4ce0beab19f..3dafbddae5f5 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -48,7 +48,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -504,18 +504,18 @@ void wma_vdev_detach_callback(void *ctx) __func__, param->session_id); qdf_mc_timer_stop(&req_msg->event_timeout); qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } } if (iface->addBssStaContext) - cdf_mem_free(iface->addBssStaContext); + qdf_mem_free(iface->addBssStaContext); #if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) - cdf_mem_free(iface->staKeyParams); + qdf_mem_free(iface->staKeyParams); #endif /* WLAN_FEATURE_VOWIFI_11R */ - cdf_mem_zero(iface, sizeof(*iface)); + qdf_mem_zero(iface, sizeof(*iface)); param->status = QDF_STATUS_SUCCESS; sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; sme_msg.bodyptr = param; @@ -524,7 +524,7 @@ void wma_vdev_detach_callback(void *ctx) status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); - cdf_mem_free(param); + qdf_mem_free(param); } } @@ -573,7 +573,7 @@ static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle, if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_SYNC_DELETE_CMDS)) { sta_self_wmi_rsp = - cdf_mem_malloc(sizeof(struct del_sta_self_rsp_params)); + qdf_mem_malloc(sizeof(struct del_sta_self_rsp_params)); if (sta_self_wmi_rsp == NULL) { WMA_LOGP(FL("Failed to allocate memory")); return QDF_STATUS_E_NOMEM; @@ -652,12 +652,12 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, return status; out: if (iface->addBssStaContext) - cdf_mem_free(iface->addBssStaContext); + qdf_mem_free(iface->addBssStaContext); #if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) - cdf_mem_free(iface->staKeyParams); + qdf_mem_free(iface->staKeyParams); #endif /* WLAN_FEATURE_VOWIFI_11R */ - cdf_mem_zero(iface, sizeof(*iface)); + qdf_mem_zero(iface, sizeof(*iface)); del_sta_self_req_param->status = status; if (generate_rsp) { sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; @@ -667,7 +667,7 @@ out: status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_DEL_STA_SELF_RSP"); - cdf_mem_free(del_sta_self_req_param); + qdf_mem_free(del_sta_self_req_param); } } return status; @@ -698,7 +698,7 @@ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, if (!iface->handle) { WMA_LOGE("handle of vdev_id %d is NULL vdev is already freed", vdev_id); - cdf_mem_free(pdel_sta_self_req_param); + qdf_mem_free(pdel_sta_self_req_param); pdel_sta_self_req_param = NULL; return status; } @@ -791,7 +791,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, #endif /* QCA_IBSS_SUPPORT */ ) { wma->interfaces[resp_event->vdev_id].beacon = - cdf_mem_malloc(sizeof(struct beacon_info)); + qdf_mem_malloc(sizeof(struct beacon_info)); bcn = wma->interfaces[resp_event->vdev_id].beacon; if (!bcn) { @@ -800,13 +800,13 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, add_bss->status = QDF_STATUS_E_NOMEM; goto send_fail_resp; } - cdf_mem_zero(bcn, sizeof(*bcn)); + qdf_mem_zero(bcn, sizeof(*bcn)); bcn->buf = cdf_nbuf_alloc(NULL, WMA_BCN_BUF_MAX_SIZE, 0, sizeof(uint32_t), 0); if (!bcn->buf) { WMA_LOGE("%s: No memory allocated for beacon buffer", __func__); - cdf_mem_free(bcn); + qdf_mem_free(bcn); add_bss->status = QDF_STATUS_E_FAILURE; goto send_fail_resp; } @@ -858,7 +858,7 @@ void wma_find_mcc_ap(tp_wma_handle wma, uint8_t vdev_id, bool add) uint8_t *ap_vdev_ids = NULL; uint8_t num_ch = 0; - ap_vdev_ids = cdf_mem_malloc(wma->max_bssid); + ap_vdev_ids = qdf_mem_malloc(wma->max_bssid); if (!ap_vdev_ids) return; @@ -1024,7 +1024,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, wma_send_msg(wma, WMA_SWITCH_CHANNEL_RSP, (void *)params, 0); } else if (req_msg->msg_type == WMA_ADD_BSS_REQ) { tpAddBssParams bssParams = (tpAddBssParams) req_msg->user_data; - cdf_mem_copy(iface->bssid, bssParams->bssId, + qdf_mem_copy(iface->bssid, bssParams->bssId, IEEE80211_ADDR_LEN); wma_vdev_start_rsp(wma, bssParams, resp_event); } else if (req_msg->msg_type == WMA_OCB_SET_CONFIG_CMD) { @@ -1044,7 +1044,7 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, wma_set_sap_keepalive(wma, resp_event->vdev_id); qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return 0; } @@ -1182,7 +1182,7 @@ int wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, WMI_PEER_SET_PARAM_CMDID); if (err) { WMA_LOGE("Failed to send set_param cmd"); - cdf_mem_free(buf); + qdf_mem_free(buf); return -EIO; } return 0; @@ -1323,15 +1323,15 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, /* for each remote ibss peer, clear its keys */ if (wma_is_vdev_in_ibss_mode(wma, vdev_id) && - !cdf_mem_compare(peer_addr, vdev->mac_addr.raw, + qdf_mem_cmp(peer_addr, vdev->mac_addr.raw, IEEE80211_ADDR_LEN)) { tSetStaKeyParams key_info; WMA_LOGD("%s: remote ibss peer %pM key clearing\n", __func__, peer_addr); - cdf_mem_set(&key_info, sizeof(key_info), 0); + qdf_mem_set(&key_info, sizeof(key_info), 0); key_info.smesessionId = vdev_id; - cdf_mem_copy(key_info.peer_macaddr.bytes, peer_addr, + qdf_mem_copy(key_info.peer_macaddr.bytes, peer_addr, IEEE80211_ADDR_LEN); key_info.sendRsp = false; @@ -1535,7 +1535,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* delete old ibss vdev */ del_sta_param.session_id = vdev_id; - cdf_mem_copy((void *)del_sta_param.self_mac_addr, + qdf_mem_copy((void *)del_sta_param.self_mac_addr, (void *)&(vdev->mac_addr), QDF_MAC_ADDR_SIZE); wma_vdev_detach(wma, &del_sta_param, 0); @@ -1617,7 +1617,7 @@ void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle, cmd->vdev_id = sessionId; cmd->ssid.ssid_len = intr[sessionId].vdev_restart_params.ssid.ssid_len; - cdf_mem_copy(cmd->ssid.ssid, + qdf_mem_copy(cmd->ssid.ssid, intr[sessionId].vdev_restart_params.ssid.ssid, cmd->ssid.ssid_len); cmd->flags = intr[sessionId].vdev_restart_params.flags; @@ -1782,7 +1782,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); - cdf_mem_free(bcn); + qdf_mem_free(bcn); wma->interfaces[resp_event->vdev_id].beacon = NULL; } @@ -1796,7 +1796,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, * to send response to UMAC */ if (params->status == QDF_STATUS_FW_MSG_TIMEDOUT) { - cdf_mem_free(params); + qdf_mem_free(params); WMA_LOGE("%s: DEL BSS from ADD BSS timeout do not send " "resp to UMAC (vdev id %x)", __func__, resp_event->vdev_id); @@ -1814,7 +1814,7 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, } free_req_msg: qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -1911,7 +1911,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, else wma_handle->wow.bmiss_enable = cfg_val ? true : false; - cdf_mem_copy(wma_handle->interfaces[self_sta_req->session_id].addr, + qdf_mem_copy(wma_handle->interfaces[self_sta_req->session_id].addr, self_sta_req->self_mac_addr, sizeof(wma_handle->interfaces[self_sta_req->session_id]. addr)); @@ -2063,7 +2063,7 @@ end: status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); - cdf_mem_free(self_sta_req); + qdf_mem_free(self_sta_req); } } return txrx_vdev_handle; @@ -2248,7 +2248,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, cmd->ssid.ssid_len = req->ssid.length; else cmd->ssid.ssid_len = sizeof(cmd->ssid.ssid); - cdf_mem_copy(cmd->ssid.ssid, req->ssid.ssId, + qdf_mem_copy(cmd->ssid.ssid, req->ssid.ssId, cmd->ssid.ssid_len); } @@ -2284,7 +2284,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, intr[req->vdev_id].vdev_restart_params.vdev_id = req->vdev_id; intr[req->vdev_id].vdev_restart_params.ssid.ssid_len = cmd->ssid.ssid_len; - cdf_mem_copy(intr[req->vdev_id].vdev_restart_params.ssid.ssid, + qdf_mem_copy(intr[req->vdev_id].vdev_restart_params.ssid.ssid, cmd->ssid.ssid, cmd->ssid.ssid_len); intr[req->vdev_id].vdev_restart_params.flags = cmd->flags; intr[req->vdev_id].vdev_restart_params.requestor_id = @@ -2418,7 +2418,7 @@ int wma_peer_assoc_conf_handler(void *handle, uint8_t *cmd_param_info, free_req_msg: qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -2467,7 +2467,7 @@ int wma_vdev_delete_handler(void *handle, uint8_t *cmd_param_info, wma_vdev_detach_callback(req_msg->user_data); qdf_mc_timer_stop(&req_msg->event_timeout); qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -2533,9 +2533,9 @@ int wma_peer_delete_handler(void *handle, uint8_t *cmd_param_info, WMA_LOGD(FL("Calling vdev detach handler")); wma_handle_vdev_detach(wma, data->self_sta_param, data->generate_rsp); - cdf_mem_free(data); + qdf_mem_free(data); } - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); return status; } @@ -2596,7 +2596,7 @@ void wma_hold_req_timer(void *data) } free_tgt_req: qdf_mc_timer_destroy(&tgt_req->event_timeout); - cdf_mem_free(tgt_req); + qdf_mem_free(tgt_req); } /** @@ -2617,7 +2617,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, struct wma_target_req *req; QDF_STATUS status; - req = cdf_mem_malloc(sizeof(*req)); + req = qdf_mem_malloc(sizeof(*req)); if (!req) { WMA_LOGP(FL("Failed to allocate memory for msg %d vdev %d"), msg_type, vdev_id); @@ -2638,7 +2638,7 @@ struct wma_target_req *wma_fill_hold_req(tp_wma_handle wma, if (QDF_STATUS_SUCCESS != status) { qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); WMA_LOGE(FL("Failed add request in queue")); - cdf_mem_free(req); + qdf_mem_free(req); return NULL; } qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); @@ -2668,7 +2668,7 @@ void wma_remove_req(tp_wma_handle wma, uint8_t vdev_id, qdf_mc_timer_stop(&req_msg->event_timeout); qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } /** @@ -2790,7 +2790,7 @@ void wma_vdev_resp_timer(void *data) cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); - cdf_mem_free(bcn); + qdf_mem_free(bcn); wma->interfaces[tgt_req->vdev_id].beacon = NULL; } @@ -2830,19 +2830,19 @@ void wma_vdev_resp_timer(void *data) status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(status)) { WMA_LOGE("Failed to post eWNI_SME_ADD_STA_SELF_RSP"); - cdf_mem_free(iface->del_staself_req); + qdf_mem_free(iface->del_staself_req); } if (iface->addBssStaContext) - cdf_mem_free(iface->addBssStaContext); + qdf_mem_free(iface->addBssStaContext); #if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) - cdf_mem_free(iface->staKeyParams); + qdf_mem_free(iface->staKeyParams); #endif /* WLAN_FEATURE_VOWIFI_11R */ - cdf_mem_zero(iface, sizeof(*iface)); + qdf_mem_zero(iface, sizeof(*iface)); } else if (tgt_req->msg_type == WMA_ADD_BSS_REQ) { tpAddBssParams params = (tpAddBssParams) tgt_req->user_data; tDeleteBssParams *del_bss_params = - cdf_mem_malloc(sizeof(tDeleteBssParams)); + qdf_mem_malloc(sizeof(tDeleteBssParams)); if (NULL == del_bss_params) { WMA_LOGE("Failed to allocate memory for del_bss_params"); peer = ol_txrx_find_peer_by_addr(pdev, params->bssId, @@ -2854,7 +2854,7 @@ void wma_vdev_resp_timer(void *data) QDF_STATUS_FW_MSG_TIMEDOUT; del_bss_params->sessionId = params->sessionId; del_bss_params->bssIdx = params->bssIdx; - cdf_mem_copy(del_bss_params->bssid, params->bssId, + qdf_mem_copy(del_bss_params->bssid, params->bssId, sizeof(tSirMacAddr)); WMA_LOGA("%s: WMA_ADD_BSS_REQ timedout", __func__); @@ -2905,7 +2905,7 @@ error0: } free_tgt_req: qdf_mc_timer_destroy(&tgt_req->event_timeout); - cdf_mem_free(tgt_req); + qdf_mem_free(tgt_req); } /** @@ -2926,7 +2926,7 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, struct wma_target_req *req; QDF_STATUS status; - req = cdf_mem_malloc(sizeof(*req)); + req = qdf_mem_malloc(sizeof(*req)); if (!req) { WMA_LOGP("%s: Failed to allocate memory for msg %d vdev %d", __func__, msg_type, vdev_id); @@ -2947,7 +2947,7 @@ struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, qdf_spin_unlock_bh(&wma->vdev_respq_lock); WMA_LOGE(FL("Failed add request in queue for vdev_id %d type %d"), vdev_id, type); - cdf_mem_free(req); + qdf_mem_free(req); return NULL; } @@ -2974,7 +2974,7 @@ void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id, qdf_mc_timer_stop(&req_msg->event_timeout); qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } /** @@ -3108,7 +3108,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) add_bss->staContext.staIdx = ol_txrx_local_peer_id(peer); - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.vdev_id = vdev_id; req.chan = add_bss->currentOperChannel; req.chan_width = add_bss->ch_width; @@ -3146,7 +3146,7 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.oper_mode = BSS_OPERATIONAL_MODE_AP; req.ssid.length = add_bss->ssId.length; if (req.ssid.length > 0) - cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, + qdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -3284,10 +3284,10 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) /* clear leftover ibss keys on bss peer */ WMA_LOGD("%s: ibss bss key clearing", __func__); - cdf_mem_set(&key_info, sizeof(key_info), 0); + qdf_mem_set(&key_info, sizeof(key_info), 0); key_info.smesessionId = vdev_id; key_info.numKeys = SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS; - cdf_mem_copy(&wma->ibsskey_info, &key_info, sizeof(tSetBssKeyParams)); + qdf_mem_copy(&wma->ibsskey_info, &key_info, sizeof(tSetBssKeyParams)); /* start ibss vdev */ @@ -3319,7 +3319,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) } } - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.vdev_id = vdev_id; req.chan = add_bss->currentOperChannel; req.chan_width = add_bss->ch_width; @@ -3338,7 +3338,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.oper_mode = BSS_OPERATIONAL_MODE_IBSS; req.ssid.length = add_bss->ssId.length; if (req.ssid.length > 0) - cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, + qdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -3425,30 +3425,30 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) if (add_bss->operMode) { /* Save parameters later needed by WMA_ADD_STA_REQ */ if (iface->addBssStaContext) { - cdf_mem_free(iface->addBssStaContext); + qdf_mem_free(iface->addBssStaContext); } - iface->addBssStaContext = cdf_mem_malloc(sizeof(tAddStaParams)); + iface->addBssStaContext = qdf_mem_malloc(sizeof(tAddStaParams)); if (!iface->addBssStaContext) { WMA_LOGE("%s Failed to allocat memory", __func__); goto send_fail_resp; } - cdf_mem_copy(iface->addBssStaContext, &add_bss->staContext, + qdf_mem_copy(iface->addBssStaContext, &add_bss->staContext, sizeof(tAddStaParams)); #if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) { - cdf_mem_free(iface->staKeyParams); + qdf_mem_free(iface->staKeyParams); iface->staKeyParams = NULL; } if (add_bss->extSetStaKeyParamValid) { iface->staKeyParams = - cdf_mem_malloc(sizeof(tSetStaKeyParams)); + qdf_mem_malloc(sizeof(tSetStaKeyParams)); if (!iface->staKeyParams) { WMA_LOGE("%s Failed to allocat memory", __func__); goto send_fail_resp; } - cdf_mem_copy(iface->staKeyParams, + qdf_mem_copy(iface->staKeyParams, &add_bss->extSetStaKeyParam, sizeof(tSetStaKeyParams)); } @@ -3502,7 +3502,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) add_bss->staContext.staIdx = ol_txrx_local_peer_id(peer); - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.vdev_id = vdev_id; req.chan = add_bss->currentOperChannel; req.chan_width = add_bss->ch_width; @@ -3520,7 +3520,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.ssid.length = add_bss->ssId.length; req.oper_mode = BSS_OPERATIONAL_MODE_STA; if (req.ssid.length > 0) - cdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, + qdf_mem_copy(req.ssid.ssId, add_bss->ssId.ssId, add_bss->ssId.length); status = wma_get_current_hw_mode(&hw_mode); if (!QDF_IS_STATUS_SUCCESS(status)) @@ -3636,7 +3636,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) * Store the bssid in interface table, bssid will * be used during group key setting sta mode. */ - cdf_mem_copy(iface->bssid, add_bss->bssId, IEEE80211_ADDR_LEN); + qdf_mem_copy(iface->bssid, add_bss->bssId, IEEE80211_ADDR_LEN); } send_bss_resp: @@ -3645,7 +3645,7 @@ send_bss_resp: add_bss->status = (add_bss->staContext.staIdx < 0) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; add_bss->bssIdx = add_bss->staContext.smesessionId; - cdf_mem_copy(add_bss->staContext.staMac, add_bss->bssId, + qdf_mem_copy(add_bss->staContext.staMac, add_bss->bssId, sizeof(add_bss->staContext.staMac)); if (!WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, @@ -4031,7 +4031,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) "staIdx: %d, staMac: %pM", __func__, add_sta->staIdx, add_sta->staMac); - peerStateParams = cdf_mem_malloc(sizeof(tTdlsPeerStateParams)); + peerStateParams = qdf_mem_malloc(sizeof(tTdlsPeerStateParams)); if (!peerStateParams) { WMA_LOGE ("%s: Failed to allocate memory for peerStateParams for %pM", @@ -4040,10 +4040,10 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) goto send_rsp; } - cdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); + qdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); peerStateParams->peerState = WMI_TDLS_PEER_STATE_PEERING; peerStateParams->vdevId = vdev->vdev_id; - cdf_mem_copy(&peerStateParams->peerMacAddr, + qdf_mem_copy(&peerStateParams->peerMacAddr, &add_sta->staMac, sizeof(tSirMacAddr)); wma_update_tdls_peer_state(wma, peerStateParams); } else { @@ -4438,7 +4438,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) goto send_del_rsp; } - peerStateParams = cdf_mem_malloc(sizeof(tTdlsPeerStateParams)); + peerStateParams = qdf_mem_malloc(sizeof(tTdlsPeerStateParams)); if (!peerStateParams) { WMA_LOGE("%s: Failed to allocate memory for peerStateParams for: %pM", __func__, del_sta->staMac); @@ -4446,10 +4446,10 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) goto send_del_rsp; } - cdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); + qdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); peerStateParams->peerState = WMA_TDLS_PEER_STATE_TEARDOWN; peerStateParams->vdevId = vdev->vdev_id; - cdf_mem_copy(&peerStateParams->peerMacAddr, + qdf_mem_copy(&peerStateParams->peerMacAddr, &del_sta->staMac, sizeof(tSirMacAddr)); WMA_LOGD("%s: sending tdls_peer_state for peer mac: %pM, " @@ -4588,7 +4588,7 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (!rsp_requested) { WMA_LOGD("%s: vdev_id %d status %d", __func__, del_sta->smesessionId, del_sta->status); - cdf_mem_free(del_sta); + qdf_mem_free(del_sta); } } @@ -4662,7 +4662,7 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) goto out; } - cdf_mem_zero(wma->interfaces[params->smesessionId].bssid, + qdf_mem_zero(wma->interfaces[params->smesessionId].bssid, IEEE80211_ADDR_LEN); txrx_vdev = wma_find_vdev_by_id(wma, params->smesessionId); @@ -4674,12 +4674,12 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) /*Free the allocated stats response buffer for the the session */ if (wma->interfaces[params->smesessionId].stats_rsp) { - cdf_mem_free(wma->interfaces[params->smesessionId].stats_rsp); + qdf_mem_free(wma->interfaces[params->smesessionId].stats_rsp); wma->interfaces[params->smesessionId].stats_rsp = NULL; } if (wma->interfaces[params->smesessionId].psnr_req) { - cdf_mem_free(wma->interfaces[params->smesessionId].psnr_req); + qdf_mem_free(wma->interfaces[params->smesessionId].psnr_req); wma->interfaces[params->smesessionId].psnr_req = NULL; } diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index c3ae9572d088..ea82fa96aa3a 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -49,7 +49,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -116,7 +116,7 @@ static int wma_post_auto_shutdown_msg(void) cds_msg_t sme_msg = { 0 }; auto_sh_evt = (tSirAutoShutdownEvtParams *) - cdf_mem_malloc(sizeof(tSirAutoShutdownEvtParams)); + qdf_mem_malloc(sizeof(tSirAutoShutdownEvtParams)); if (!auto_sh_evt) { WMA_LOGE(FL("No Mem")); return -ENOMEM; @@ -131,7 +131,7 @@ static int wma_post_auto_shutdown_msg(void) qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_AUTO_SHUTDOWN_IND msg to SME"); - cdf_mem_free(auto_sh_evt); + qdf_mem_free(auto_sh_evt); return -EINVAL; } @@ -161,13 +161,13 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, * after wmi event */ if (pGetRssiReq) { - pRssiBkUp = cdf_mem_malloc(sizeof(tAniGetRssiReq)); + pRssiBkUp = qdf_mem_malloc(sizeof(tAniGetRssiReq)); if (!pRssiBkUp) { WMA_LOGE("Failed to allocate memory for tAniGetRssiReq"); wma_handle->pGetRssiReq = NULL; return QDF_STATUS_E_NOMEM; } - cdf_mem_set(pRssiBkUp, sizeof(tAniGetRssiReq), 0); + qdf_mem_set(pRssiBkUp, sizeof(tAniGetRssiReq), 0); pRssiBkUp->sessionId = ((tAniGetRssiReq *) pGetRssiReq)->sessionId; pRssiBkUp->rssiCallback = @@ -180,7 +180,7 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - cdf_mem_free(pRssiBkUp); + qdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; return QDF_STATUS_E_FAILURE; } @@ -195,7 +195,7 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, (wma_handle->wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { WMA_LOGE("Failed to send host stats request to fw"); wmi_buf_free(buf); - cdf_mem_free(pRssiBkUp); + qdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; return QDF_STATUS_E_FAILURE; } @@ -231,20 +231,20 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) return QDF_STATUS_SUCCESS; } - psnr_req_bkp = cdf_mem_malloc(sizeof(tAniGetSnrReq)); + psnr_req_bkp = qdf_mem_malloc(sizeof(tAniGetSnrReq)); if (!psnr_req_bkp) { WMA_LOGE("Failed to allocate memory for tAniGetSnrReq"); return QDF_STATUS_E_NOMEM; } - cdf_mem_set(psnr_req_bkp, sizeof(tAniGetSnrReq), 0); + qdf_mem_set(psnr_req_bkp, sizeof(tAniGetSnrReq), 0); psnr_req_bkp->staId = psnr_req->staId; psnr_req_bkp->pDevContext = psnr_req->pDevContext; psnr_req_bkp->snrCallback = psnr_req->snrCallback; buf = wmi_buf_alloc(wma_handle->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - cdf_mem_free(psnr_req_bkp); + qdf_mem_free(psnr_req_bkp); return QDF_STATUS_E_FAILURE; } @@ -261,7 +261,7 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) WMI_REQUEST_STATS_CMDID)) { WMA_LOGE("Failed to send host stats request to fw"); wmi_buf_free(buf); - cdf_mem_free(psnr_req_bkp); + qdf_mem_free(psnr_req_bkp); intr->psnr_req = NULL; return QDF_STATUS_E_FAILURE; } @@ -288,7 +288,7 @@ void wma_process_link_status_req(tp_wma_handle wma, if (iface->plink_status_req) { WMA_LOGE("%s:previous link status request is pending,deleting the new request", __func__); - cdf_mem_free(pGetLinkStatus); + qdf_mem_free(pGetLinkStatus); return; } @@ -402,7 +402,7 @@ QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, WMA_LOGI("%s: cached LPHB status in WMA context for item %d", __func__, i); } else { - cdf_mem_zero((void *)&wma_handle->wow.lphb_cache, + qdf_mem_zero((void *)&wma_handle->wow.lphb_cache, sizeof(wma_handle->wow.lphb_cache)); WMA_LOGI("%s: cleared all cached LPHB status in WMA context", __func__); @@ -748,7 +748,7 @@ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, break; } - cdf_mem_free(lphb_conf_req); + qdf_mem_free(lphb_conf_req); return qdf_status; } #endif /* FEATURE_WLAN_LPHB */ @@ -1293,7 +1293,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) WMA_LOGD("lphb indication received with vdev_id=%d, session=%d, reason=%d", hb_fp->vdev_id, hb_fp->session, hb_fp->reason); - slphb_indication = (tSirLPHBInd *) cdf_mem_malloc(sizeof(tSirLPHBInd)); + slphb_indication = (tSirLPHBInd *) qdf_mem_malloc(sizeof(tSirLPHBInd)); if (!slphb_indication) { WMA_LOGE("Invalid LPHB indication buffer"); @@ -1311,7 +1311,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_LPHB_IND msg to SME"); - cdf_mem_free(slphb_indication); + qdf_mem_free(slphb_indication); return -EINVAL; } @@ -1527,14 +1527,14 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, buf_ptr = (uint8_t *) nan_rsp_event_hdr; alloc_len = sizeof(tSirNanEvent); alloc_len += nan_rsp_event_hdr->data_len; - nan_rsp_event = (tSirNanEvent *) cdf_mem_malloc(alloc_len); + nan_rsp_event = (tSirNanEvent *) qdf_mem_malloc(alloc_len); if (NULL == nan_rsp_event) { WMA_LOGE("%s: Memory allocation failure", __func__); return -ENOMEM; } nan_rsp_event->event_data_len = nan_rsp_event_hdr->data_len; - cdf_mem_copy(nan_rsp_event->event_data, buf_ptr + + qdf_mem_copy(nan_rsp_event->event_data, buf_ptr + sizeof(wmi_nan_event_hdr) + WMI_TLV_HDR_SIZE, nan_rsp_event->event_data_len); cds_msg.type = eWNI_SME_NAN_EVENT; @@ -1545,7 +1545,7 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post NaN response event to SME", __func__); - cdf_mem_free(nan_rsp_event); + qdf_mem_free(nan_rsp_event); return -EFAULT; } WMA_LOGD("%s: NaN response event Posted to SME", __func__); @@ -1592,14 +1592,14 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) return -EINVAL; } - csa_offload_event = cdf_mem_malloc(sizeof(*csa_offload_event)); + csa_offload_event = qdf_mem_malloc(sizeof(*csa_offload_event)); if (!csa_offload_event) { WMA_LOGE("CDF MEM Alloc Failed for csa_offload_event"); return -EINVAL; } - cdf_mem_zero(csa_offload_event, sizeof(*csa_offload_event)); - cdf_mem_copy(csa_offload_event->bssId, &bssid, IEEE80211_ADDR_LEN); + qdf_mem_zero(csa_offload_event, sizeof(*csa_offload_event)); + qdf_mem_copy(csa_offload_event->bssId, &bssid, IEEE80211_ADDR_LEN); if (csa_event->ies_present_flag & WMI_CSA_IE_PRESENT) { csa_ie = (struct ieee80211_channelswitch_ie *) @@ -1614,7 +1614,7 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) csa_offload_event->new_op_class = xcsa_ie->newClass; } else { WMA_LOGE("CSA Event error: No CSA IE present"); - cdf_mem_free(csa_offload_event); + qdf_mem_free(csa_offload_event); return -EINVAL; } @@ -1640,7 +1640,7 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) (cur_chan == csa_offload_event->channel)) { WMA_LOGE("CSA Event with channel %d. Ignore !!", csa_offload_event->channel); - cdf_mem_free(csa_offload_event); + qdf_mem_free(csa_offload_event); return -EINVAL; } wma->interfaces[vdev_id].is_channel_switch = true; @@ -1692,17 +1692,17 @@ int wma_oem_capability_event_callback(void *handle, return -EINVAL; } - pStartOemDataRsp = cdf_mem_malloc(sizeof(*pStartOemDataRsp)); + pStartOemDataRsp = qdf_mem_malloc(sizeof(*pStartOemDataRsp)); if (!pStartOemDataRsp) { WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } - cdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); + qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); *msg_subtype = WMI_OEM_CAPABILITY_RSP; - cdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", __func__, datalen); @@ -1754,17 +1754,17 @@ int wma_oem_measurement_report_event_callback(void *handle, return -EINVAL; } - pStartOemDataRsp = cdf_mem_malloc(sizeof(*pStartOemDataRsp)); + pStartOemDataRsp = qdf_mem_malloc(sizeof(*pStartOemDataRsp)); if (!pStartOemDataRsp) { WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } - cdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); + qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); *msg_subtype = WMI_OEM_MEASUREMENT_RSP; - cdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", __func__, datalen); @@ -1815,17 +1815,17 @@ int wma_oem_error_report_event_callback(void *handle, return -EINVAL; } - pStartOemDataRsp = cdf_mem_malloc(sizeof(*pStartOemDataRsp)); + pStartOemDataRsp = qdf_mem_malloc(sizeof(*pStartOemDataRsp)); if (!pStartOemDataRsp) { WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } - cdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); + qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); *msg_subtype = WMI_OEM_ERROR_REPORT_RSP; - cdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", __func__, datalen); @@ -1871,15 +1871,15 @@ int wma_oem_data_response_handler(void *handle, return -EINVAL; } - oem_data_rsp = cdf_mem_malloc(sizeof(*oem_data_rsp)); + oem_data_rsp = qdf_mem_malloc(sizeof(*oem_data_rsp)); if (!oem_data_rsp) { WMA_LOGE(FL("Failed to alloc oem_data_rsp")); return -ENOMEM; } - cdf_mem_zero(oem_data_rsp, sizeof(tStartOemDataRsp)); + qdf_mem_zero(oem_data_rsp, sizeof(tStartOemDataRsp)); oem_data_rsp->target_rsp = true; - cdf_mem_copy(&oem_data_rsp->oemDataRsp[0], data, datalen); + qdf_mem_copy(&oem_data_rsp->oemDataRsp[0], data, datalen); WMA_LOGI(FL("Sending WMA_START_OEM_DATA_RSP, data len %d"), datalen); @@ -1925,7 +1925,7 @@ void wma_start_oem_data_req(tp_wma_handle wma_handle, WMITLV_SET_HDR(cmd, WMITLV_TAG_ARRAY_BYTE, startOemDataReq->data_len); cmd += WMI_TLV_HDR_SIZE; - cdf_mem_copy(cmd, startOemDataReq->data, + qdf_mem_copy(cmd, startOemDataReq->data, startOemDataReq->data_len); WMA_LOGI(FL("Sending OEM Data Request to target, data len %d"), @@ -1944,8 +1944,8 @@ out: /* free oem data req buffer received from UMAC */ if (startOemDataReq) { if (startOemDataReq->data) - cdf_mem_free(startOemDataReq->data); - cdf_mem_free(startOemDataReq); + qdf_mem_free(startOemDataReq->data); + qdf_mem_free(startOemDataReq); } /* Now send data resp back to PE/SME with message sub-type of @@ -1954,13 +1954,13 @@ out: * comes as wmi event from target then those shall be passed * to oem application */ - pStartOemDataRsp = cdf_mem_malloc(sizeof(*pStartOemDataRsp)); + pStartOemDataRsp = qdf_mem_malloc(sizeof(*pStartOemDataRsp)); if (!pStartOemDataRsp) { WMA_LOGE("%s:failed to allocate memory for OEM Data Resp to PE", __func__); return; } - cdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); + qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = false; WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP to clear up PE/SME pending cmd", @@ -2584,7 +2584,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) WMA_LOGD("Posting ready to suspend indication to umac"); len = sizeof(tSirReadyToSuspendInd); - ready_to_suspend = (tSirReadyToSuspendInd *) cdf_mem_malloc(len); + ready_to_suspend = (tSirReadyToSuspendInd *) qdf_mem_malloc(len); if (NULL == ready_to_suspend) { WMA_LOGE("%s: Memory allocation failure", __func__); @@ -2602,7 +2602,7 @@ static void wma_send_status_to_suspend_ind(tp_wma_handle wma, bool suspended) status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); - cdf_mem_free(ready_to_suspend); + qdf_mem_free(ready_to_suspend); } } @@ -2940,7 +2940,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, WMA_LOGD("Wake up for Rx packet, dump starting from ethernet hdr"); if (param_buf->wow_packet_buffer) { /* First 4-bytes of wow_packet_buffer is the length */ - cdf_mem_copy((uint8_t *) &wow_buf_pkt_len, + qdf_mem_copy((uint8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); wma_wow_wake_up_stats(wma, param_buf->wow_packet_buffer + 4, @@ -2967,7 +2967,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, if (param_buf->wow_packet_buffer) { /* Roam event is embedded in wow_packet_buffer */ WMA_LOGD("Host woken up because of roam event"); - cdf_mem_copy((uint8_t *) &wow_buf_pkt_len, + qdf_mem_copy((uint8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); qdf_trace_hex_dump(QDF_MODULE_ID_WMA, @@ -3000,7 +3000,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, if (param_buf->wow_packet_buffer) { /* station kickout event embedded in wow_packet_buffer */ WMA_LOGD("Host woken up because of sta_kickout event"); - cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, + qdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); WMA_LOGD("wow_packet_buffer dump"); qdf_trace_hex_dump(QDF_MODULE_ID_WMA, @@ -3043,7 +3043,7 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event, WMA_LOGD("Host woken up because of rssi breach reason"); /* rssi breach event is embedded in wow_packet_buffer */ if (param_buf->wow_packet_buffer) { - cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, + qdf_mem_copy((u_int8_t *) &wow_buf_pkt_len, param_buf->wow_packet_buffer, 4); if (wow_buf_pkt_len >= sizeof(param)) { param.fixed_param = @@ -3232,8 +3232,8 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, WMITLV_TAG_STRUC_WOW_BITMAP_PATTERN_T, WMITLV_GET_STRUCT_TLVLEN(WOW_BITMAP_PATTERN_T)); - cdf_mem_copy(&bitmap_pattern->patternbuf[0], ptrn, ptrn_len); - cdf_mem_copy(&bitmap_pattern->bitmaskbuf[0], mask, mask_len); + qdf_mem_copy(&bitmap_pattern->patternbuf[0], ptrn, ptrn_len); + qdf_mem_copy(&bitmap_pattern->bitmaskbuf[0], mask, mask_len); bitmap_pattern->pattern_offset = ptrn_offset; bitmap_pattern->pattern_len = ptrn_len; @@ -3314,7 +3314,7 @@ static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) uint8_t mac_mask[IEEE80211_ADDR_LEN]; /* Setup unicast pkt pattern */ - cdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); + qdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, @@ -3355,7 +3355,7 @@ static QDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) QDF_STATUS ret = QDF_STATUS_SUCCESS; /* Setup unicast pkt pattern */ - cdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); + qdf_mem_set(&mac_mask, IEEE80211_ADDR_LEN, 0xFF); ret = wma_send_wow_patterns_to_fw(wma, vdev_id, 0, wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN, 0, mac_mask, @@ -3809,7 +3809,7 @@ QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) * Mask value : FF:00:FF:00:0:00:00:FF * Pattern value : 12:00:13:00:00:00:00:44 */ - cdf_mem_zero(new_mask, sizeof(new_mask)); + qdf_mem_zero(new_mask, sizeof(new_mask)); for (pos = 0; pos < ptrn->pattern_size; pos++) { bit_to_check = (WMA_NUM_BITS_IN_BYTE - 1) - (pos % WMA_NUM_BITS_IN_BYTE); @@ -3890,7 +3890,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); - cdf_mem_free(info); + qdf_mem_free(info); return QDF_STATUS_E_INVAL; } @@ -3902,7 +3902,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) wma->wow.disassoc_enable = info->ucWowDeauthRcv ? true : false; wma->wow.bmiss_enable = info->ucWowMaxMissedBeacons ? true : false; - cdf_mem_free(info); + qdf_mem_free(info); return QDF_STATUS_SUCCESS; } @@ -3922,14 +3922,14 @@ QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) if (info->sessionId > wma->max_bssid) { WMA_LOGE("Invalid vdev id (%d)", info->sessionId); - cdf_mem_free(info); + qdf_mem_free(info); return QDF_STATUS_E_INVAL; } iface = &wma->interfaces[info->sessionId]; iface->ptrn_match_enable = false; wma->wow.magic_ptrn_enable = false; - cdf_mem_free(info); + qdf_mem_free(info); return QDF_STATUS_SUCCESS; } @@ -4468,7 +4468,7 @@ void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg) #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ err: - cdf_mem_free(msg); + qdf_mem_free(msg); } /** @@ -4827,7 +4827,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - cdf_mem_free(pTsmStatsMsg); + qdf_mem_free(pTsmStatsMsg); return QDF_STATUS_E_INVAL; } @@ -4838,12 +4838,12 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, #ifdef FEATURE_WLAN_ESE_UPLOAD pTsmRspParams = - (tpAniGetTsmStatsRsp) cdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); + (tpAniGetTsmStatsRsp) qdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if (NULL == pTsmRspParams) { QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "%s: CDF MEM Alloc Failure", __func__); QDF_ASSERT(0); - cdf_mem_free(pTsmStatsMsg); + qdf_mem_free(pTsmStatsMsg); return QDF_STATUS_E_NOMEM; } pTsmRspParams->staId = pStats->staId; @@ -4899,7 +4899,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, } cmd = (WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param *) wmi_buf_data(buf); - cdf_mem_zero(cmd, sizeof(*cmd)); + qdf_mem_zero(cmd, sizeof(*cmd)); WMITLV_SET_HDR(&cmd->tlv_header, WMITLV_TAG_STRUC_WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param, @@ -4914,7 +4914,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, WMI_SET_MCASTBCAST_FILTER_CMDID); if (err) { WMA_LOGE("Failed to send set_param cmd"); - cdf_mem_free(buf); + qdf_mem_free(buf); return -EIO; } WMA_LOGD("Action:%d; vdev_id:%d; clearList:%d", @@ -5002,12 +5002,12 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, return -ENOENT; } - resp = cdf_mem_malloc(sizeof(*resp)); + resp = qdf_mem_malloc(sizeof(*resp)); if (!resp) { WMA_LOGE("%s: Failed to alloc response", __func__); return -ENOMEM; } - cdf_mem_zero(resp, sizeof(*resp)); + qdf_mem_zero(resp, sizeof(*resp)); resp->mesgType = eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP; resp->mesgLen = sizeof(*resp); resp->ulStatus = QDF_STATUS_SUCCESS; @@ -5015,10 +5015,10 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, /* TODO: Is the total rekey count and GTK rekey count same? */ resp->ulGTKRekeyCount = status->refresh_cnt; - cdf_mem_copy(&resp->ullKeyReplayCounter, &status->replay_counter, + qdf_mem_copy(&resp->ullKeyReplayCounter, &status->replay_counter, GTK_REPLAY_COUNTER_BYTES); - cdf_mem_copy(resp->bssid.bytes, bssid, IEEE80211_ADDR_LEN); + qdf_mem_copy(resp->bssid.bytes, bssid, IEEE80211_ADDR_LEN); #ifdef IGTK_OFFLOAD /* TODO: Is the refresh count same for GTK and IGTK? */ @@ -5032,7 +5032,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, if (cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg) != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post GTK response to SME"); - cdf_mem_free(resp); + qdf_mem_free(resp); return -EINVAL; } @@ -5096,9 +5096,9 @@ static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, wma->wow.gtk_err_enable[vdev_id] = true; /* Copy the keys and replay counter */ - cdf_mem_copy(cmd->KCK, params->aKCK, GTK_OFFLOAD_KCK_BYTES); - cdf_mem_copy(cmd->KEK, params->aKEK, GTK_OFFLOAD_KEK_BYTES); - cdf_mem_copy(cmd->replay_counter, ¶ms->ullKeyReplayCounter, + qdf_mem_copy(cmd->KCK, params->aKCK, GTK_OFFLOAD_KCK_BYTES); + qdf_mem_copy(cmd->KEK, params->aKEK, GTK_OFFLOAD_KEK_BYTES); + qdf_mem_copy(cmd->replay_counter, ¶ms->ullKeyReplayCounter, GTK_REPLAY_COUNTER_BYTES); } else { wma->wow.gtk_err_enable[vdev_id] = false; @@ -5165,7 +5165,7 @@ QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, } status = wma_send_gtk_offload_req(wma, vdev_id, params); out: - cdf_mem_free(params); + qdf_mem_free(params); WMA_LOGD("%s Exit", __func__); return status; } @@ -5223,7 +5223,7 @@ QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, status = QDF_STATUS_E_FAILURE; } out: - cdf_mem_free(params); + qdf_mem_free(params); WMA_LOGD("%s Exit", __func__); return status; } @@ -5260,13 +5260,13 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, &vdev_id)) { WMA_LOGE("vdev handle is invalid for %pM", pHostOffloadParams->bssid.bytes); - cdf_mem_free(pHostOffloadParams); + qdf_mem_free(pHostOffloadParams); return QDF_STATUS_E_INVAL; } if (!wma->interfaces[vdev_id].vdev_up) { WMA_LOGE("vdev %d is not up skipping arp/ns offload", vdev_id); - cdf_mem_free(pHostOffloadParams); + qdf_mem_free(pHostOffloadParams); return QDF_STATUS_E_FAILURE; } @@ -5295,7 +5295,7 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, buf = wmi_buf_alloc(wma->wmi_handle, len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - cdf_mem_free(pHostOffloadParams); + qdf_mem_free(pHostOffloadParams); return QDF_STATUS_E_NOMEM; } @@ -5315,7 +5315,7 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, /* Have copy of arp info to send along with NS, Since FW expects * both ARP and NS info in single cmd */ if (bArpOnly) - cdf_mem_copy(&wma->mArpInfo, pHostOffloadParams, + qdf_mem_copy(&wma->mArpInfo, pHostOffloadParams, sizeof(tSirHostOffloadReq)); buf_ptr += sizeof(WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param); @@ -5438,11 +5438,11 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, if (res) { WMA_LOGE("Failed to enable ARP NDP/NSffload"); wmi_buf_free(buf); - cdf_mem_free(pHostOffloadParams); + qdf_mem_free(pHostOffloadParams); return QDF_STATUS_E_FAILURE; } - cdf_mem_free(pHostOffloadParams); + qdf_mem_free(pHostOffloadParams); return QDF_STATUS_SUCCESS; } @@ -5507,7 +5507,7 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, buf_ptr += sizeof(WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ptrn_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, pAddPeriodicTxPtrnParams->ucPattern, ptrn_len); + qdf_mem_copy(buf_ptr, pAddPeriodicTxPtrnParams->ucPattern, ptrn_len); for (j = 0; j < pAddPeriodicTxPtrnParams->ucPtrnSize; j++) { WMA_LOGD("%s: Add Ptrn: %02x", __func__, buf_ptr[j] & 0xff); } @@ -5624,7 +5624,7 @@ QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, cmd->data_len); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, preq->request_data, cmd->data_len); + qdf_mem_copy(buf_ptr, preq->request_data, cmd->data_len); ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_REQUEST_STATS_EXT_CMDID); @@ -5657,7 +5657,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) WMA_LOGD("Posting ready to suspend indication to umac"); len = sizeof(tSirReadyToExtWoWInd); - ready_to_extwow = (tSirReadyToExtWoWInd *) cdf_mem_malloc(len); + ready_to_extwow = (tSirReadyToExtWoWInd *) qdf_mem_malloc(len); if (NULL == ready_to_extwow) { WMA_LOGE("%s: Memory allocation failure", __func__); @@ -5675,7 +5675,7 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) vstatus = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); if (vstatus != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to post ready to suspend"); - cdf_mem_free(ready_to_extwow); + qdf_mem_free(ready_to_extwow); } } @@ -5761,9 +5761,9 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, cmd->vdev_id = appType1Params->vdev_id; WMI_CHAR_ARRAY_TO_MAC_ADDR(appType1Params->wakee_mac_addr.bytes, &cmd->wakee_mac); - cdf_mem_copy(cmd->ident, appType1Params->identification_id, 8); + qdf_mem_copy(cmd->ident, appType1Params->identification_id, 8); cmd->ident_len = appType1Params->id_length; - cdf_mem_copy(cmd->passwd, appType1Params->password, 16); + qdf_mem_copy(cmd->passwd, appType1Params->password, 16); cmd->passwd_len = appType1Params->pass_length; WMA_LOGD("%s: vdev_id %d wakee_mac_addr %pM " @@ -5815,7 +5815,7 @@ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, cmd->vdev_id = appType2Params->vdev_id; - cdf_mem_copy(cmd->rc4_key, appType2Params->rc4_key, 16); + qdf_mem_copy(cmd->rc4_key, appType2Params->rc4_key, 16); cmd->rc4_key_len = appType2Params->rc4_key_len; cmd->ip_id = appType2Params->ip_id; @@ -6004,7 +6004,7 @@ QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) buf_ptr += sizeof(wmi_nan_cmd_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, nan_data_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, nan_req->request_data, cmd->data_len); + qdf_mem_copy(buf_ptr, nan_req->request_data, cmd->data_len); ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_NAN_CMDID); @@ -6041,7 +6041,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, } cmd = (wmi_set_dhcp_server_offload_cmd_fixed_param *) wmi_buf_data(buf); - cdf_mem_zero(cmd, sizeof(*cmd)); + qdf_mem_zero(cmd, sizeof(*cmd)); WMITLV_SET_HDR(&cmd->tlv_header, WMITLV_TAG_STRUC_wmi_set_dhcp_server_offload_cmd_fixed_param, @@ -6169,7 +6169,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, } sca_indication = (tSirChAvoidIndType *) - cdf_mem_malloc(sizeof(tSirChAvoidIndType)); + qdf_mem_malloc(sizeof(tSirChAvoidIndType)); if (!sca_indication) { WMA_LOGE("Invalid channel avoid indication buffer"); return -EINVAL; @@ -6194,7 +6194,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_CH_AVOID_IND msg to SME"); - cdf_mem_free(sca_indication); + qdf_mem_free(sca_indication); return -EINVAL; } @@ -6783,7 +6783,7 @@ int wma_tdls_event_handler(void *handle, uint8_t *event, uint32_t len) } tdls_event = (tSirTdlsEventnotify *) - cdf_mem_malloc(sizeof(*tdls_event)); + qdf_mem_malloc(sizeof(*tdls_event)); if (!tdls_event) { WMA_LOGE("%s: failed to allocate memory for tdls_event", __func__); @@ -6919,7 +6919,7 @@ int wma_set_tdls_offchan_mode(WMA_HANDLE handle, end: if (chan_switch_params) - cdf_mem_free(chan_switch_params); + qdf_mem_free(chan_switch_params); return ret; } @@ -7029,7 +7029,7 @@ int wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams) end_fw_tdls_state: if (pwmaTdlsparams) - cdf_mem_free(pwmaTdlsparams); + qdf_mem_free(pwmaTdlsparams); return ret; } @@ -7065,7 +7065,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, /* peer capability info is valid only when peer state is connected */ if (WMA_TDLS_PEER_STATE_CONNECTED != peerStateParams->peerState) { - cdf_mem_zero(&peerStateParams->peerCap, + qdf_mem_zero(&peerStateParams->peerCap, sizeof(tTdlsPeerCapParams)); } @@ -7257,7 +7257,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, end_tdls_peer_state: if (peerStateParams) - cdf_mem_free(peerStateParams); + qdf_mem_free(peerStateParams); return ret; } #endif /* FEATURE_WLAN_TDLS */ @@ -7625,7 +7625,7 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, return -ENOENT; } radar_event = (struct wma_dfs_radar_indication *) - cdf_mem_malloc(sizeof(struct wma_dfs_radar_indication)); + qdf_mem_malloc(sizeof(struct wma_dfs_radar_indication)); if (radar_event == NULL) { WMA_LOGE("%s:DFS- Invalid radar_event", __func__); return -ENOMEM; @@ -7651,7 +7651,7 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, if (indication_status == false) { WMA_LOGE("%s:Application triggered channel switch in progress!.. drop radar event indiaction to SAP", __func__); - cdf_mem_free(radar_event); + qdf_mem_free(radar_event); qdf_spin_unlock_bh(&ic->chan_lock); return 0; } @@ -7718,7 +7718,7 @@ QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, } buf_ptr = (u_int8_t *) wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); cmd = (wmi_get_fw_mem_dump_fixed_param *) buf_ptr; WMITLV_SET_HDR(&cmd->tlv_header, @@ -7791,7 +7791,7 @@ static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) cds_msg_t sme_msg = {0}; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - dump_rsp = cdf_mem_malloc(sizeof(*dump_rsp)); + dump_rsp = qdf_mem_malloc(sizeof(*dump_rsp)); if (!dump_rsp) { WMA_LOGE(FL("Memory allocation failed.")); @@ -7812,7 +7812,7 @@ static QDF_STATUS wma_fw_mem_dump_rsp(uint32_t req_id, uint32_t status) qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post fw mem dump ind msg")); - cdf_mem_free(dump_rsp); + qdf_mem_free(dump_rsp); } return qdf_status; @@ -7898,7 +7898,7 @@ QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, } buf_ptr = wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); /* Populate the WMI command */ cmd = (wmi_vdev_set_ie_cmd_fixed_param *)buf_ptr; @@ -7918,7 +7918,7 @@ QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, ie_info->data, cmd->ie_len); + qdf_mem_copy(buf_ptr, ie_info->data, cmd->ie_len); ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_VDEV_SET_IE_CMDID); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index b54a3625f1e4..777b0275a90b 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -50,7 +50,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -505,13 +505,13 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, cds_msg_t msg = { 0 }; wma_cli_set_cmd_t *iwcmd; - iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); + iwcmd = qdf_mem_malloc(sizeof(*iwcmd)); if (!iwcmd) { WMA_LOGE("%s: Failed alloc memory for iwcmd", __func__); return -ENOMEM; } - cdf_mem_zero(iwcmd, sizeof(*iwcmd)); + qdf_mem_zero(iwcmd, sizeof(*iwcmd)); iwcmd->param_value = sval1; iwcmd->param_sec_value = sval2; iwcmd->param_vdev_id = vdev_id; @@ -525,7 +525,7 @@ int wma_cli_set2_command(int vdev_id, int param_id, int sval1, cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGP("%s: Failed to post WMA_CLI_SET_CMD msg", __func__); - cdf_mem_free(iwcmd); + qdf_mem_free(iwcmd); return -EIO; } return 0; @@ -1489,7 +1489,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, wma_process_fw_event_params *params_buf; cds_msg_t cds_msg = { 0 }; - params_buf = cdf_mem_malloc(sizeof(wma_process_fw_event_params)); + params_buf = qdf_mem_malloc(sizeof(wma_process_fw_event_params)); if (!params_buf) { WMA_LOGE("%s: Failed alloc memory for params_buf", __func__); cdf_nbuf_free(evt_buf); @@ -1508,7 +1508,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg", __func__); cdf_nbuf_free(evt_buf); - cdf_mem_free(params_buf); + qdf_mem_free(params_buf); return -EFAULT; } WMA_LOGD("WMA_PROCESS_FW_EVENT posted"); @@ -1619,7 +1619,7 @@ QDF_STATUS wma_open(void *cds_context, return qdf_status; } - cdf_mem_zero(wma_handle, sizeof(t_wma_handle)); + qdf_mem_zero(wma_handle, sizeof(t_wma_handle)); if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO @@ -1752,14 +1752,14 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->dfs_phyerr_filter_offload = mac_params->dfsPhyerrFilterOffload; wma_handle->dfs_pri_multiplier = mac_params->dfsRadarPriMultiplier; - wma_handle->interfaces = cdf_mem_malloc(sizeof(struct wma_txrx_node) * + wma_handle->interfaces = qdf_mem_malloc(sizeof(struct wma_txrx_node) * wma_handle->max_bssid); if (!wma_handle->interfaces) { WMA_LOGP("%s: failed to allocate interface table", __func__); qdf_status = QDF_STATUS_E_NOMEM; goto err_scn_context; } - cdf_mem_zero(wma_handle->interfaces, sizeof(struct wma_txrx_node) * + qdf_mem_zero(wma_handle->interfaces, sizeof(struct wma_txrx_node) * wma_handle->max_bssid); /* Register the debug print event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, @@ -2016,14 +2016,14 @@ err_dbglog_init: err_event_init: wmi_unified_unregister_event_handler(wma_handle->wmi_handle, WMI_DEBUG_PRINT_EVENTID); - cdf_mem_free(wma_handle->interfaces); + qdf_mem_free(wma_handle->interfaces); err_scn_context: wma_dfs_detach(wma_handle->dfs_ic); #if defined(QCA_WIFI_FTM) wma_utf_detach(wma_handle); #endif /* QCA_WIFI_FTM */ err_wmi_handle: - cdf_mem_free(((p_cds_contextType) cds_context)->cfg_ctx); + qdf_mem_free(((p_cds_contextType) cds_context)->cfg_ctx); OS_FREE(wmi_handle); err_wma_handle: @@ -2115,7 +2115,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, status = lim_post_msg_api(pMac, &msg); if (QDF_STATUS_SUCCESS != status) { if (NULL != body_ptr) - cdf_mem_free(body_ptr); + qdf_mem_free(body_ptr); QDF_ASSERT(0); } return; @@ -2142,7 +2142,7 @@ static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle, } cmd = (wmi_pdev_set_base_macaddr_cmd_fixed_param *) wmi_buf_data(buf); - cdf_mem_zero(cmd, sizeof(*cmd)); + qdf_mem_zero(cmd, sizeof(*cmd)); WMITLV_SET_HDR(&cmd->tlv_header, WMITLV_TAG_STRUC_wmi_pdev_set_base_macaddr_cmd_fixed_param, @@ -2154,7 +2154,7 @@ static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle, WMI_PDEV_SET_BASE_MACADDR_CMDID); if (err) { WMA_LOGE("Failed to send set_base_macaddr cmd"); - cdf_mem_free(buf); + qdf_mem_free(buf); return -EIO; } WMA_LOGD("Base MAC Addr: " MAC_ADDRESS_STR, @@ -2211,10 +2211,10 @@ static int wma_log_supported_evt_handler(void *handle, /* Free any previous allocation */ if (wma->events_logs_list) - cdf_mem_free(wma->events_logs_list); + qdf_mem_free(wma->events_logs_list); /* Store the event list for run time enable/disable */ - wma->events_logs_list = cdf_mem_malloc(num_of_diag_events_logs * + wma->events_logs_list = qdf_mem_malloc(num_of_diag_events_logs * sizeof(uint32_t)); if (!wma->events_logs_list) { WMA_LOGE("%s: event log list memory allocation failed", @@ -2230,7 +2230,7 @@ static int wma_log_supported_evt_handler(void *handle, buf = wmi_buf_alloc(wma->wmi_handle, buf_len); if (!buf) { WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - cdf_mem_free(wma->events_logs_list); + qdf_mem_free(wma->events_logs_list); wma->events_logs_list = NULL; return -ENOMEM; } @@ -2380,7 +2380,7 @@ static int wma_soc_set_hw_mode_resp_evt_handler(void *handle, return QDF_STATUS_E_NULL_VALUE; } - hw_mode_resp = cdf_mem_malloc(sizeof(*hw_mode_resp)); + hw_mode_resp = qdf_mem_malloc(sizeof(*hw_mode_resp)); if (!hw_mode_resp) { WMA_LOGI("%s: Memory allocation failed", __func__); /* Since this memory allocation itself failed, we cannot @@ -2490,7 +2490,7 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle, return QDF_STATUS_E_FAILURE; } - hw_mode_trans_ind = cdf_mem_malloc(sizeof(*hw_mode_trans_ind)); + hw_mode_trans_ind = qdf_mem_malloc(sizeof(*hw_mode_trans_ind)); if (!hw_mode_trans_ind) { WMA_LOGI("%s: Memory allocation failed", __func__); return QDF_STATUS_E_NULL_VALUE; @@ -2566,7 +2566,7 @@ static int wma_soc_set_dual_mode_config_resp_evt_handler(void *handle, return QDF_STATUS_E_NULL_VALUE; } - dual_mac_cfg_resp = cdf_mem_malloc(sizeof(*dual_mac_cfg_resp)); + dual_mac_cfg_resp = qdf_mem_malloc(sizeof(*dual_mac_cfg_resp)); if (!dual_mac_cfg_resp) { WMA_LOGE("%s: Memory allocation failed", __func__); /* Since the mem alloc failed, we cannot send resp to LIM. @@ -2864,7 +2864,7 @@ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) if (wma_handle->ack_work_ctx) { cds_flush_work(&wma_handle->ack_work_ctx->ack_cmp_work); - cdf_mem_free(wma_handle->ack_work_ctx); + qdf_mem_free(wma_handle->ack_work_ctx); wma_handle->ack_work_ctx = NULL; } @@ -2935,7 +2935,7 @@ static void wma_cleanup_hold_req(tp_wma_handle wma) return; } qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } qdf_spin_unlock_bh(&wma->wma_hold_req_q_lock); } @@ -2970,7 +2970,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) return; } qdf_mc_timer_destroy(&req_msg->event_timeout); - cdf_mem_free(req_msg); + qdf_mem_free(req_msg); } qdf_spin_unlock_bh(&wma->vdev_respq_lock); } @@ -3016,33 +3016,33 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) cdf_nbuf_unmap_single(wma_handle->qdf_dev, bcn->buf, QDF_DMA_TO_DEVICE); cdf_nbuf_free(bcn->buf); - cdf_mem_free(bcn); + qdf_mem_free(bcn); wma_handle->interfaces[i].beacon = NULL; } if (wma_handle->interfaces[i].handle) { - cdf_mem_free(wma_handle->interfaces[i].handle); + qdf_mem_free(wma_handle->interfaces[i].handle); wma_handle->interfaces[i].handle = NULL; } if (wma_handle->interfaces[i].addBssStaContext) { - cdf_mem_free(wma_handle-> + qdf_mem_free(wma_handle-> interfaces[i].addBssStaContext); wma_handle->interfaces[i].addBssStaContext = NULL; } if (wma_handle->interfaces[i].del_staself_req) { - cdf_mem_free(wma_handle->interfaces[i].del_staself_req); + qdf_mem_free(wma_handle->interfaces[i].del_staself_req); wma_handle->interfaces[i].del_staself_req = NULL; } } - cdf_mem_free(wma_handle->interfaces); + qdf_mem_free(wma_handle->interfaces); /* free the wma_handle */ cds_free_context(wma_handle->cds_context, QDF_MODULE_ID_WMA, wma_handle); - cdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); + qdf_mem_free(((p_cds_contextType) cds_ctx)->cfg_ctx); WMA_LOGD("%s: Exit", __func__); return QDF_STATUS_SUCCESS; } @@ -3116,13 +3116,13 @@ QDF_STATUS wma_close(void *cds_ctx) /* Free DBS list */ if (wma_handle->hw_mode.hw_mode_list) { - cdf_mem_free(wma_handle->hw_mode.hw_mode_list); + qdf_mem_free(wma_handle->hw_mode.hw_mode_list); wma_handle->hw_mode.hw_mode_list = NULL; WMA_LOGI("%s: DBS list is freed", __func__); } if (wma_handle->events_logs_list) { - cdf_mem_free(wma_handle->events_logs_list); + qdf_mem_free(wma_handle->events_logs_list); wma_handle->events_logs_list = NULL; WMA_LOGD("%s: Event log list freed", __func__); } @@ -3163,7 +3163,7 @@ QDF_STATUS wma_close(void *cds_ctx) qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock); qdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { - cdf_os_mem_free_consistent(wma_handle->qdf_dev, + qdf_mem_free_consistent(wma_handle->qdf_dev, wma_handle->mem_chunks[idx].len, wma_handle->mem_chunks[idx].vaddr, wma_handle->mem_chunks[idx].paddr, @@ -3184,7 +3184,7 @@ QDF_STATUS wma_close(void *cds_ctx) } if (NULL != wma_handle->pGetRssiReq) { - cdf_mem_free(wma_handle->pGetRssiReq); + qdf_mem_free(wma_handle->pGetRssiReq); wma_handle->pGetRssiReq = NULL; } if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, @@ -3244,11 +3244,10 @@ static uint32_t wma_alloc_host_mem_chunk(tp_wma_handle wma_handle, /** reduce the requested allocation by half until allocation succeeds */ while (wma_handle->mem_chunks[idx].vaddr == NULL && num_units) { wma_handle->mem_chunks[idx].vaddr = - cdf_os_mem_alloc_consistent(wma_handle->qdf_dev, - num_units * unit_len, &paddr, - qdf_get_dma_mem_context( - (&(wma_handle->mem_chunks[idx])), - memctx)); + qdf_mem_alloc_consistent(wma_handle->qdf_dev, + wma_handle->qdf_dev->dev, + num_units * unit_len, + &paddr); if (wma_handle->mem_chunks[idx].vaddr == NULL) { num_units = (num_units >> 1);/* reduce length by half */ } else { @@ -3514,7 +3513,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle) struct wma_tgt_cfg tgt_cfg; void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - cdf_mem_zero(&tgt_cfg, sizeof(struct wma_tgt_cfg)); + qdf_mem_zero(&tgt_cfg, sizeof(struct wma_tgt_cfg)); tgt_cfg.reg_domain = wma_handle->reg_cap.eeprom_rd; tgt_cfg.eeprom_rd_ext = wma_handle->reg_cap.eeprom_rd_ext; @@ -3536,7 +3535,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle) tgt_cfg.max_intf_count = wma_handle->wlan_resource_config.num_vdevs; - cdf_mem_copy(tgt_cfg.hw_macaddr.bytes, wma_handle->hwaddr, + qdf_mem_copy(tgt_cfg.hw_macaddr.bytes, wma_handle->hwaddr, ATH_MAC_LEN); wma_update_target_services(wma_handle, &tgt_cfg.services); @@ -3654,7 +3653,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, WMITLV_TAG_ARRAY_STRUC, (sizeof(wlan_host_memory_chunk) * wma_handle->num_mem_chunks)); - cdf_mem_copy(&wma_handle->target_abi_vers, + qdf_mem_copy(&wma_handle->target_abi_vers, ¶m_buf->fixed_param->fw_abi_vers, sizeof(wmi_abi_version)); num_whitelist = sizeof(version_whitelist) / @@ -3679,7 +3678,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, cmd->host_abi_vers.abi_version_ns_2, cmd->host_abi_vers.abi_version_ns_3); - cdf_mem_copy(&wma_handle->final_abi_vers, &cmd->host_abi_vers, + qdf_mem_copy(&wma_handle->final_abi_vers, &cmd->host_abi_vers, sizeof(wmi_abi_version)); return buf; } @@ -3831,13 +3830,13 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) wma_handle->num_dbs_hw_modes = ev->num_dbs_hw_modes; ev_wlan_dbs_hw_mode_list = param_buf->wlan_dbs_hw_mode_list; wma_handle->hw_mode.hw_mode_list = - cdf_mem_malloc(sizeof(*wma_handle->hw_mode.hw_mode_list) * + qdf_mem_malloc(sizeof(*wma_handle->hw_mode.hw_mode_list) * wma_handle->num_dbs_hw_modes); if (!wma_handle->hw_mode.hw_mode_list) { WMA_LOGE("%s: Memory allocation failed for DBS", __func__); /* Continuing with the rest of the processing */ } - cdf_mem_copy(wma_handle->hw_mode.hw_mode_list, + qdf_mem_copy(wma_handle->hw_mode.hw_mode_list, ev_wlan_dbs_hw_mode_list, (sizeof(*wma_handle->hw_mode.hw_mode_list) * wma_handle->num_dbs_hw_modes)); @@ -3855,7 +3854,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) wma_handle->phy_capability = ev->phy_capability; wma_handle->max_frag_entry = ev->max_frag_entry; wma_handle->num_rf_chains = ev->num_rf_chains; - cdf_mem_copy(&wma_handle->reg_cap, param_buf->hal_reg_capabilities, + qdf_mem_copy(&wma_handle->reg_cap, param_buf->hal_reg_capabilities, sizeof(HAL_REG_CAPABILITIES)); wma_handle->ht_cap_info = ev->ht_cap_info; #ifdef WLAN_FEATURE_11AC @@ -3876,7 +3875,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) if (ev->hw_bd_id) { wma_handle->hw_bd_id = ev->hw_bd_id; - cdf_mem_copy(wma_handle->hw_bd_info, + qdf_mem_copy(wma_handle->hw_bd_info, ev->hw_bd_info, sizeof(ev->hw_bd_info)); WMA_LOGE("%s: Board version: %x.%x", @@ -3884,7 +3883,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) wma_handle->hw_bd_info[0], wma_handle->hw_bd_info[1]); } else { wma_handle->hw_bd_id = 0; - cdf_mem_zero(wma_handle->hw_bd_info, + qdf_mem_zero(wma_handle->hw_bd_info, sizeof(wma_handle->hw_bd_info)); WMA_LOGE("%s: Board version is unknown!", __func__); } @@ -3894,7 +3893,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) /* dbg_print_wmi_service_11ac(ev); */ /* wmi service is ready */ - cdf_mem_copy(wma_handle->wmi_service_bitmap, + qdf_mem_copy(wma_handle->wmi_service_bitmap, param_buf->wmi_service_bitmap, sizeof(wma_handle->wmi_service_bitmap)); @@ -4004,12 +4003,12 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) return; } - cdf_mem_copy(target_cap.wmi_service_bitmap, + qdf_mem_copy(target_cap.wmi_service_bitmap, param_buf->wmi_service_bitmap, sizeof(wma_handle->wmi_service_bitmap)); target_cap.wlan_resource_config = wma_handle->wlan_resource_config; wma_update_fw_config(wma_handle, &target_cap); - cdf_mem_copy(wma_handle->wmi_service_bitmap, + qdf_mem_copy(wma_handle->wmi_service_bitmap, target_cap.wmi_service_bitmap, sizeof(wma_handle->wmi_service_bitmap)); wma_handle->wlan_resource_config = target_cap.wlan_resource_config; @@ -4192,9 +4191,9 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) WLAN_INIT_STATUS_GEN_FAILED; } } - cdf_mem_copy(&wma_handle->final_abi_vers, &ev->fw_abi_vers, + qdf_mem_copy(&wma_handle->final_abi_vers, &ev->fw_abi_vers, sizeof(wmi_abi_version)); - cdf_mem_copy(&wma_handle->target_abi_vers, &ev->fw_abi_vers, + qdf_mem_copy(&wma_handle->target_abi_vers, &ev->fw_abi_vers, sizeof(wmi_abi_version)); /* copy the mac addr */ @@ -4716,7 +4715,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) if (NULL == wma_handle) { WMA_LOGP("%s: wma_handle is NULL", __func__); QDF_ASSERT(0); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); qdf_status = QDF_STATUS_E_INVAL; goto end; } @@ -4729,7 +4728,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_PROCESS_FW_EVENT: wma_process_fw_event(wma_handle, (wma_process_fw_event_params *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef FEATURE_WLAN_ESE @@ -4767,16 +4766,16 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) break; case WMA_START_SCAN_OFFLOAD_REQ: wma_start_scan(wma_handle, msg->bodyptr, msg->type); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_STOP_SCAN_OFFLOAD_REQ: wma_stop_scan(wma_handle, msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_UPDATE_CHAN_LIST_REQ: wma_update_channel_list(wma_handle, (tSirUpdateChanList *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_LINK_STATE: wma_set_linkstate(wma_handle, (tpLinkStateParams) msg->bodyptr); @@ -4806,27 +4805,27 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_UPDATE_EDCA_PROFILE_IND: wma_process_update_edca_param_req(wma_handle, (tEdcaParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SEND_BEACON_REQ: wma_send_beacon(wma_handle, (tpSendbeaconParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SEND_PROBE_RSP_TMPL: wma_send_probe_rsp_tmpl(wma_handle, (tpSendProbeRespParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_CLI_SET_CMD: wma_process_cli_set_cmd(wma_handle, (wma_cli_set_cmd_t *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #if !defined(REMOVE_PKT_LOG) case WMA_PKTLOG_ENABLE_REQ: wma_pktlog_wmi_send_cmd(wma_handle, (struct ath_pktlog_wmi_params *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* REMOVE_PKT_LOG */ #if defined(QCA_WIFI_FTM) @@ -4838,22 +4837,22 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_ENTER_PS_REQ: wma_enable_sta_ps_mode(wma_handle, (tpEnablePsParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXIT_PS_REQ: wma_disable_sta_ps_mode(wma_handle, (tpDisablePsParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_ENABLE_UAPSD_REQ: wma_enable_uapsd_mode(wma_handle, (tpEnableUapsdParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_DISABLE_UAPSD_REQ: wma_disable_uapsd_mode(wma_handle, (tpDisableUapsdParams) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_TX_POWER_REQ: wma_set_tx_power(wma_handle, (tpMaxTxPowerParams) msg->bodyptr); @@ -4892,12 +4891,12 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_UPDATE_OP_MODE: wma_process_update_opmode(wma_handle, (tUpdateVHTOpMode *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_UPDATE_RX_NSS: wma_process_update_rx_nss(wma_handle, (tUpdateRxNss *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef WLAN_FEATURE_11AC case WMA_UPDATE_MEMBERSHIP: @@ -4912,7 +4911,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_UPDATE_BEACON_IND: wma_process_update_beacon_params(wma_handle, (tUpdateBeaconParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_ADD_TS_REQ: @@ -4930,24 +4929,24 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_RECEIVE_FILTER_SET_FILTER_REQ: wma_process_receive_filter_set_filter_req(wma_handle, (tSirRcvPktFilterCfgType *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_RECEIVE_FILTER_CLEAR_FILTER_REQ: wma_process_receive_filter_clear_filter_req(wma_handle, (tSirRcvFltPktClearParam *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WOW_ADD_PTRN: wma_wow_add_pattern(wma_handle, (struct wow_add_pattern *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WOW_DEL_PTRN: wma_wow_delete_user_pattern(wma_handle, (struct wow_delete_pattern *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WOWL_ENTER_REQ: wma_wow_enter(wma_handle, @@ -4973,7 +4972,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_8023_MULTICAST_LIST_REQ: wma_process_mcbc_set_filter_req(wma_handle, (tpSirRcvFltMcAddrList) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef WLAN_FEATURE_GTK_OFFLOAD case WMA_GTK_OFFLOAD_REQ: @@ -5034,17 +5033,17 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_ADD_PERIODIC_TX_PTRN_IND: wma_process_add_periodic_tx_ptrn_ind(wma_handle, (tSirAddPeriodicTxPtrn *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_DEL_PERIODIC_TX_PTRN_IND: wma_process_del_periodic_tx_ptrn_ind(wma_handle, (tSirDelPeriodicTxPtrn *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_TX_POWER_LIMIT: wma_process_tx_power_limits(wma_handle, (tSirTxPowerLimit *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef FEATURE_WLAN_LPHB case WMA_LPHB_CONF_REQ: @@ -5057,25 +5056,25 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_CH_AVOID_UPDATE_REQ: wma_process_ch_avoid_update_req(wma_handle, (tSirChAvoidUpdateReq *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* FEATURE_WLAN_CH_AVOID */ #ifdef FEATURE_WLAN_AUTO_SHUTDOWN case WMA_SET_AUTO_SHUTDOWN_TIMER_REQ: wma_set_auto_shutdown_timer_req(wma_handle, msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ case WMA_DHCP_START_IND: case WMA_DHCP_STOP_IND: wma_process_dhcp_ind(wma_handle, (tAniDHCPInd *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_INIT_THERMAL_INFO_CMD: wma_process_init_thermal_info(wma_handle, (t_thermal_mgmt *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_THERMAL_LEVEL: @@ -5085,26 +5084,26 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_SET_P2P_GO_NOA_REQ: wma_process_set_p2pgo_noa_req(wma_handle, (tP2pPsParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_MIMOPS_REQ: wma_process_set_mimops_req(wma_handle, (tSetMIMOPS *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_SAP_INTRABSS_DIS: wma_set_vdev_intrabss_fwd(wma_handle, (tDisableIntraBssFwd *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_GET_LINK_SPEED: wma_get_link_speed(wma_handle, msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_MODEM_POWER_STATE_IND: wma_notify_modem_power_state(wma_handle, (tSirModemPowerStateInd *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WLAN_RESUME_REQ: wma_resume_req(wma_handle, QDF_SYSTEM_SUSPEND); @@ -5114,76 +5113,76 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_STATS_EXT_REQUEST: wma_stats_ext_req(wma_handle, (tpStatsExtRequest) (msg->bodyptr)); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_STATS_EXT */ case WMA_HIDDEN_SSID_VDEV_RESTART: wma_hidden_ssid_vdev_restart(wma_handle, (tHalHiddenSsidVdevRestart *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef WLAN_FEATURE_EXTWOW_SUPPORT case WMA_WLAN_EXT_WOW: wma_enable_ext_wow(wma_handle, (tSirExtWoWParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WLAN_SET_APP_TYPE1_PARAMS: wma_set_app_type1_params_in_fw(wma_handle, (tSirAppType1Params *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_WLAN_SET_APP_TYPE2_PARAMS: wma_set_app_type2_params_in_fw(wma_handle, (tSirAppType2Params *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_EXTWOW_SUPPORT */ #ifdef FEATURE_WLAN_EXTSCAN case WMA_EXTSCAN_START_REQ: wma_start_extscan(wma_handle, (tSirWifiScanCmdReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_STOP_REQ: wma_stop_extscan(wma_handle, (tSirExtScanStopReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_SET_BSSID_HOTLIST_REQ: wma_extscan_start_hotlist_monitor(wma_handle, (tSirExtScanSetBssidHotListReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_RESET_BSSID_HOTLIST_REQ: wma_extscan_stop_hotlist_monitor(wma_handle, (tSirExtScanResetBssidHotlistReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_SET_SIGNF_CHANGE_REQ: wma_extscan_start_change_monitor(wma_handle, (tSirExtScanSetSigChangeReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_RESET_SIGNF_CHANGE_REQ: wma_extscan_stop_change_monitor(wma_handle, (tSirExtScanResetSignificantChangeReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_GET_CACHED_RESULTS_REQ: wma_extscan_get_cached_results(wma_handle, (tSirExtScanGetCachedResultsReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_EXTSCAN_GET_CAPABILITIES_REQ: wma_extscan_get_capabilities(wma_handle, (tSirGetExtScanCapabilitiesReqParams *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_EPNO_LIST_REQ: wma_set_epno_network_list(wma_handle, (struct wifi_epno_params *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_PASSPOINT_LIST_REQ: /* Issue reset passpoint network list first and clear @@ -5193,7 +5192,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) wma_set_passpoint_network_list(wma_handle, (struct wifi_passpoint_req *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_RESET_PASSPOINT_LIST_REQ: wma_reset_passpoint_network_list(wma_handle, @@ -5202,57 +5201,57 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_EXTSCAN_SET_SSID_HOTLIST_REQ: wma_set_ssid_hotlist(wma_handle, (struct sir_set_ssid_hotlist_request *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* FEATURE_WLAN_EXTSCAN */ case WMA_SET_SCAN_MAC_OUI_REQ: wma_scan_probe_setoui(wma_handle, msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef WLAN_FEATURE_LINK_LAYER_STATS case WMA_LINK_LAYER_STATS_CLEAR_REQ: wma_process_ll_stats_clear_req(wma_handle, (tpSirLLStatsClearReq) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_LINK_LAYER_STATS_SET_REQ: wma_process_ll_stats_set_req(wma_handle, (tpSirLLStatsSetReq) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_LINK_LAYER_STATS_GET_REQ: wma_process_ll_stats_get_req(wma_handle, (tpSirLLStatsGetReq) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_LINK_LAYER_STATS */ case SIR_HAL_UNIT_TEST_CMD: wma_process_unit_test_cmd(wma_handle, (t_wma_unit_test_cmd *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef WLAN_FEATURE_ROAM_OFFLOAD case WMA_ROAM_OFFLOAD_SYNCH_FAIL: wma_process_roam_synch_fail(wma_handle, (struct roam_offload_synch_fail *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_ROAM_INVOKE: wma_process_roam_invoke(wma_handle, (struct wma_roam_invoke_cmd *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ #ifdef WLAN_FEATURE_NAN case WMA_NAN_REQUEST: wma_nan_req(wma_handle, (tNanRequest *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_NAN */ case SIR_HAL_SET_BASE_MACADDR_IND: wma_set_base_macaddr_indicate(wma_handle, (tSirMacAddr *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_LINK_STATUS_GET_REQ: wma_process_link_status_req(wma_handle, @@ -5260,37 +5259,37 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) break; case WMA_GET_TEMPERATURE_REQ: wma_get_temperature(wma_handle); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #ifdef DHCP_SERVER_OFFLOAD case WMA_SET_DHCP_SERVER_OFFLOAD_CMD: wma_process_dhcpserver_offload(wma_handle, (tSirDhcpSrvOffloadInfo *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* DHCP_SERVER_OFFLOAD */ #ifdef WLAN_FEATURE_GPIO_LED_FLASHING case WMA_LED_FLASHING_REQ: wma_set_led_flashing(wma_handle, (tSirLedFlashingReq *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; #endif /* WLAN_FEATURE_GPIO_LED_FLASHING */ case SIR_HAL_SET_MAS: wma_process_set_mas(wma_handle, (uint32_t *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_SET_MIRACAST: wma_process_set_miracast(wma_handle, (uint32_t *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_CONFIG_STATS_FACTOR: wma_config_stats_factor(wma_handle, (struct sir_stats_avg_factor *) msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_CONFIG_GUARD_TIME: wma_config_guard_time(wma_handle, @@ -5299,14 +5298,14 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_IPA_OFFLOAD_ENABLE_DISABLE: wma_ipa_offload_enable_disable(wma_handle, (struct sir_ipa_offload_enable_disable *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_START_STOP_LOGGING: wma_set_wifi_start_packet_stats(wma_handle, (struct sir_wifi_start_log *)msg->bodyptr); wma_enable_specific_fw_logs(wma_handle, (struct sir_wifi_start_log *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_FLUSH_LOG_TO_FW: wma_send_flush_logs_to_fw(wma_handle); @@ -5319,72 +5318,72 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_FW_MEM_DUMP_REQ: wma_process_fw_mem_dump_req(wma_handle, (struct fw_dump_req *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_SOC_SET_PCL_TO_FW: wma_send_soc_set_pcl_cmd(wma_handle, (struct sir_pcl_list *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_SOC_SET_HW_MODE: wma_send_soc_set_hw_mode_cmd(wma_handle, (struct sir_hw_mode *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_OCB_SET_CONFIG_CMD: wma_ocb_set_config_req(wma_handle, (struct sir_ocb_config *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_OCB_SET_UTC_TIME_CMD: wma_ocb_set_utc_time(wma_handle, (struct sir_ocb_utc *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_OCB_START_TIMING_ADVERT_CMD: wma_ocb_start_timing_advert(wma_handle, (struct sir_ocb_timing_advert *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_OCB_STOP_TIMING_ADVERT_CMD: wma_ocb_stop_timing_advert(wma_handle, (struct sir_ocb_timing_advert *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_DCC_CLEAR_STATS_CMD: wma_dcc_clear_stats(wma_handle, (struct sir_dcc_clear_stats *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_OCB_GET_TSF_TIMER_CMD: wma_ocb_get_tsf_timer(wma_handle, (struct sir_ocb_get_tsf_timer *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_DCC_GET_STATS_CMD: wma_dcc_get_stats(wma_handle, (struct sir_dcc_get_stats *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_DCC_UPDATE_NDL_CMD: wma_dcc_update_ndl(wma_handle, (struct sir_dcc_update_ndl *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case SIR_HAL_SOC_DUAL_MAC_CFG_REQ: wma_send_soc_set_dual_mac_config(wma_handle, (struct sir_dual_mac_config *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_IE_INFO: wma_process_set_ie_info(wma_handle, (struct vdev_ie_info *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_LRO_CONFIG_CMD: wma_lro_config_cmd(wma_handle, (struct wma_lro_config_cmd_t *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_GW_PARAM_UPDATE_REQ: wma_set_gateway_params(wma_handle, @@ -5393,13 +5392,13 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_SET_EGAP_CONF_PARAMS: wma_send_egap_conf_params(wma_handle, (struct egap_conf_params *)msg->bodyptr); - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; default: WMA_LOGD("unknow msg type %x", msg->type); /* Do Nothing? MSG Body should be freed at here */ if (NULL != msg->bodyptr) { - cdf_mem_free(msg->bodyptr); + qdf_mem_free(msg->bodyptr); } } end: @@ -5555,7 +5554,7 @@ QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, } return QDF_STATUS_SUCCESS; fail: - param = cdf_mem_malloc(sizeof(*param)); + param = qdf_mem_malloc(sizeof(*param)); if (!param) { WMA_LOGE("%s: Memory allocation failed", __func__); return QDF_STATUS_E_NULL_VALUE; @@ -5656,7 +5655,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) cds_msg_t msg = {0}; struct wma_lro_config_cmd_t *iwcmd; - iwcmd = cdf_mem_malloc(sizeof(*iwcmd)); + iwcmd = qdf_mem_malloc(sizeof(*iwcmd)); if (!iwcmd) { WMA_LOGE("memory allocation for WMA_LRO_CONFIG_CMD failed!"); return -ENOMEM; @@ -5671,7 +5670,7 @@ int wma_lro_init(struct wma_lro_config_cmd_t *lro_config) if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) { WMA_LOGE("Failed to post WMA_LRO_CONFIG_CMD msg!"); - cdf_mem_free(iwcmd); + qdf_mem_free(iwcmd); return -EAGAIN; } diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index fce66cc66d06..2573e6715c63 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -49,7 +49,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -117,10 +117,10 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, if (tim_info->tim_changed) { if (tim_info->tim_num_ps_pending) - cdf_mem_copy(&tim_ie->tim_bitmap, tim_info->tim_bitmap, + qdf_mem_copy(&tim_ie->tim_bitmap, tim_info->tim_bitmap, WMA_TIM_SUPPORTED_PVB_LENGTH); else - cdf_mem_zero(&tim_ie->tim_bitmap, + qdf_mem_zero(&tim_ie->tim_bitmap, WMA_TIM_SUPPORTED_PVB_LENGTH); /* * Currently we support fixed number of @@ -161,7 +161,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, bcn->seq_no++; if (WMI_UNIFIED_NOA_ATTR_IS_MODIFIED(p2p_noa_info)) { - cdf_mem_zero(&noa_ie, sizeof(noa_ie)); + qdf_mem_zero(&noa_ie, sizeof(noa_ie)); noa_ie.index = (uint8_t) WMI_UNIFIED_NOA_ATTR_INDEX_GET(p2p_noa_info); @@ -334,14 +334,14 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) switch (kickout_event->reason) { case WMI_PEER_STA_KICKOUT_REASON_IBSS_DISCONNECT: p_inactivity = (tpSirIbssPeerInactivityInd) - cdf_mem_malloc(sizeof(tSirIbssPeerInactivityInd)); + qdf_mem_malloc(sizeof(tSirIbssPeerInactivityInd)); if (!p_inactivity) { WMA_LOGE("CDF MEM Alloc Failed for tSirIbssPeerInactivity"); return -ENOMEM; } p_inactivity->staIdx = peer_id; - cdf_mem_copy(p_inactivity->peer_addr.bytes, macaddr, + qdf_mem_copy(p_inactivity->peer_addr.bytes, macaddr, IEEE80211_ADDR_LEN); wma_send_msg(wma, WMA_IBSS_PEER_INACTIVITY_IND, (void *)p_inactivity, 0); @@ -351,7 +351,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) #ifdef FEATURE_WLAN_TDLS case WMI_PEER_STA_KICKOUT_REASON_TDLS_DISCONNECT: del_sta_ctx = (tpDeleteStaContext) - cdf_mem_malloc(sizeof(tDeleteStaContext)); + qdf_mem_malloc(sizeof(tDeleteStaContext)); if (!del_sta_ctx) { WMA_LOGE("%s: mem alloc failed for tDeleteStaContext for TDLS peer: %pM", __func__, macaddr); @@ -359,8 +359,8 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) } del_sta_ctx->staId = peer_id; - cdf_mem_copy(del_sta_ctx->addr2, macaddr, IEEE80211_ADDR_LEN); - cdf_mem_copy(del_sta_ctx->bssId, wma->interfaces[vdev_id].bssid, + qdf_mem_copy(del_sta_ctx->addr2, macaddr, IEEE80211_ADDR_LEN); + qdf_mem_copy(del_sta_ctx->bssId, wma->interfaces[vdev_id].bssid, IEEE80211_ADDR_LEN); del_sta_ctx->reasonCode = HAL_DEL_STA_REASON_CODE_KEEP_ALIVE; wma_send_msg(wma, SIR_LIM_DELETE_STA_CONTEXT_IND, @@ -374,7 +374,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) (wma->interfaces[vdev_id].sub_type == 0 || wma->interfaces[vdev_id].sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT) && - cdf_mem_compare(wma->interfaces[vdev_id].bssid, + !qdf_mem_cmp(wma->interfaces[vdev_id].bssid, macaddr, IEEE80211_ADDR_LEN)) { /* * KICKOUT event is for current station-AP connection. @@ -400,7 +400,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) (wma->interfaces[vdev_id].sub_type == 0 || wma->interfaces[vdev_id].sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT) && - cdf_mem_compare(wma->interfaces[vdev_id].bssid, + !qdf_mem_cmp(wma->interfaces[vdev_id].bssid, macaddr, IEEE80211_ADDR_LEN)) { /* * KICKOUT event is for current station-AP connection. @@ -429,15 +429,15 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) * default action is to send delete station context indication to LIM */ del_sta_ctx = - (tpDeleteStaContext) cdf_mem_malloc(sizeof(tDeleteStaContext)); + (tpDeleteStaContext) qdf_mem_malloc(sizeof(tDeleteStaContext)); if (!del_sta_ctx) { WMA_LOGE("CDF MEM Alloc Failed for tDeleteStaContext"); return -ENOMEM; } del_sta_ctx->staId = peer_id; - cdf_mem_copy(del_sta_ctx->addr2, macaddr, IEEE80211_ADDR_LEN); - cdf_mem_copy(del_sta_ctx->bssId, wma->interfaces[vdev_id].addr, + qdf_mem_copy(del_sta_ctx->addr2, macaddr, IEEE80211_ADDR_LEN); + qdf_mem_copy(del_sta_ctx->bssId, wma->interfaces[vdev_id].addr, IEEE80211_ADDR_LEN); del_sta_ctx->reasonCode = HAL_DEL_STA_REASON_CODE_KEEP_ALIVE; del_sta_ctx->rssi = kickout_event->rssi + WMA_TGT_NOISE_FLOOR_DBM; @@ -498,7 +498,7 @@ int wma_unified_bcntx_status_event_handler(void *handle, } beacon_tx_complete_ind = (tSirFirstBeaconTxCompleteInd *) - cdf_mem_malloc(sizeof(tSirFirstBeaconTxCompleteInd)); + qdf_mem_malloc(sizeof(tSirFirstBeaconTxCompleteInd)); if (!beacon_tx_complete_ind) { WMA_LOGE("%s: Failed to alloc beacon_tx_complete_ind", __func__); @@ -727,9 +727,9 @@ void wma_set_sta_keep_alive(tp_wma_handle wma, uint8_t vdev_id, return; } cmd->method = WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE; - cdf_mem_copy(&arp_rsp->sender_prot_addr, hostv4addr, + qdf_mem_copy(&arp_rsp->sender_prot_addr, hostv4addr, SIR_IPV4_ADDR_LEN); - cdf_mem_copy(&arp_rsp->target_prot_addr, destv4addr, + qdf_mem_copy(&arp_rsp->target_prot_addr, destv4addr, SIR_IPV4_ADDR_LEN); WMI_CHAR_ARRAY_TO_MAC_ADDR(destmac, &arp_rsp->dest_mac_addr); } else { @@ -857,8 +857,8 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, return -EINVAL; } - cdf_mem_zero(&peer_legacy_rates, sizeof(wmi_rate_set)); - cdf_mem_zero(&peer_ht_rates, sizeof(wmi_rate_set)); + qdf_mem_zero(&peer_legacy_rates, sizeof(wmi_rate_set)); + qdf_mem_zero(&peer_ht_rates, sizeof(wmi_rate_set)); phymode = wma_peer_phymode(nw_type, params->staType, params->htCapable, @@ -923,7 +923,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, /* TODO: Do we really need this? */ WMA_LOGW("Peer is marked as HT capable but supported mcs rate is 0"); peer_ht_rates.num_rates = sizeof(temp_ni_rates); - cdf_mem_copy((uint8_t *) peer_ht_rates.rates, temp_ni_rates, + qdf_mem_copy((uint8_t *) peer_ht_rates.rates, temp_ni_rates, peer_ht_rates.num_rates); } @@ -1093,7 +1093,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, num_peer_legacy_rates); buf_ptr += WMI_TLV_HDR_SIZE; cmd->num_peer_legacy_rates = peer_legacy_rates.num_rates; - cdf_mem_copy(buf_ptr, peer_legacy_rates.rates, + qdf_mem_copy(buf_ptr, peer_legacy_rates.rates, peer_legacy_rates.num_rates); /* Update peer HT rate information */ @@ -1101,7 +1101,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, num_peer_ht_rates); buf_ptr += WMI_TLV_HDR_SIZE; cmd->num_peer_ht_rates = peer_ht_rates.num_rates; - cdf_mem_copy(buf_ptr, peer_ht_rates.rates, peer_ht_rates.num_rates); + qdf_mem_copy(buf_ptr, peer_ht_rates.rates, peer_ht_rates.num_rates); /* VHT Rates */ buf_ptr += num_peer_ht_rates; @@ -1499,9 +1499,9 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, cmd->key_txmic_len = WMA_TXMIC_LEN; cmd->key_rxmic_len = WMA_RXMIC_LEN; - cdf_mem_copy(&cmd->wpi_key_rsc_counter, &rx_iv, + qdf_mem_copy(&cmd->wpi_key_rsc_counter, &rx_iv, WPI_IV_LEN); - cdf_mem_copy(&cmd->wpi_key_tsc_counter, &tx_iv, + qdf_mem_copy(&cmd->wpi_key_tsc_counter, &tx_iv, WPI_IV_LEN); cmd->key_cipher = WMI_CIPHER_WAPI; break; @@ -1549,7 +1549,7 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, } } #else - cdf_mem_copy((void *)key_data, + qdf_mem_copy((void *)key_data, (const void *)key_params->key_data, key_params->key_len); #endif /* BIG_ENDIAN_HOST */ cmd->key_len = key_params->key_len; @@ -1559,12 +1559,12 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, iface = &wma_handle->interfaces[key_params->vdev_id]; if (iface) { iface->key.key_length = key_params->key_len; - cdf_mem_copy(iface->key.key, + qdf_mem_copy(iface->key.key, (const void *)key_params->key_data, iface->key.key_length); if ((cmd->key_ix == WMA_IGTK_KEY_INDEX_4) || (cmd->key_ix == WMA_IGTK_KEY_INDEX_5)) - cdf_mem_zero(iface->key.key_id[cmd->key_ix - + qdf_mem_zero(iface->key.key_id[cmd->key_ix - WMA_IGTK_KEY_INDEX_4].ipn, CMAC_IPN_LEN); } @@ -1614,22 +1614,22 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) if (wma_handle->ibss_started > 0) goto out; WMA_LOGD("Caching IBSS Key"); - cdf_mem_copy(&wma_handle->ibsskey_info, key_info, + qdf_mem_copy(&wma_handle->ibsskey_info, key_info, sizeof(tSetBssKeyParams)); } - cdf_mem_set(&key_params, sizeof(key_params), 0); + qdf_mem_set(&key_params, sizeof(key_params), 0); key_params.vdev_id = key_info->smesessionId; key_params.key_type = key_info->encType; key_params.singl_tid_rc = key_info->singleTidRc; key_params.unicast = false; if (txrx_vdev->opmode == wlan_op_mode_sta) { - cdf_mem_copy(key_params.peer_mac, + qdf_mem_copy(key_params.peer_mac, wma_handle->interfaces[key_info->smesessionId].bssid, IEEE80211_ADDR_LEN); } else { /* vdev mac address will be passed for all other modes */ - cdf_mem_copy(key_params.peer_mac, txrx_vdev->mac_addr.raw, + qdf_mem_copy(key_params.peer_mac, txrx_vdev->mac_addr.raw, IEEE80211_ADDR_LEN); WMA_LOGA("BSS Key setup with vdev_mac %pM\n", txrx_vdev->mac_addr.raw); @@ -1654,14 +1654,14 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) key_params.key_len = key_info->key[i].keyLength; if (key_info->encType == eSIR_ED_TKIP) { - cdf_mem_copy(key_params.key_data, + qdf_mem_copy(key_params.key_data, key_info->key[i].key, 16); - cdf_mem_copy(&key_params.key_data[16], + qdf_mem_copy(&key_params.key_data[16], &key_info->key[i].key[24], 8); - cdf_mem_copy(&key_params.key_data[24], + qdf_mem_copy(&key_params.key_data[24], &key_info->key[i].key[16], 8); } else - cdf_mem_copy((void *)key_params.key_data, + qdf_mem_copy((void *)key_params.key_data, (const void *)key_info->key[i].key, key_info->key[i].keyLength); @@ -1823,14 +1823,14 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, return; } - cdf_mem_set(&key_params, sizeof(key_params), 0); + qdf_mem_set(&key_params, sizeof(key_params), 0); key_params.vdev_id = key_info->smesessionId; key_params.key_type = key_info->encType; key_params.singl_tid_rc = key_info->singleTidRc; key_params.unicast = false; ASSERT(wlan_op_mode_ibss == txrx_vdev->opmode); - cdf_mem_copy(key_params.peer_mac, peer_macaddr.bytes, + qdf_mem_copy(key_params.peer_mac, peer_macaddr.bytes, IEEE80211_ADDR_LEN); if (key_info->numKeys == 0 && @@ -1847,14 +1847,14 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, key_params.key_idx = key_info->key[i].keyId; key_params.key_len = key_info->key[i].keyLength; if (key_info->encType == eSIR_ED_TKIP) { - cdf_mem_copy(key_params.key_data, + qdf_mem_copy(key_params.key_data, key_info->key[i].key, 16); - cdf_mem_copy(&key_params.key_data[16], + qdf_mem_copy(&key_params.key_data[16], &key_info->key[i].key[24], 8); - cdf_mem_copy(&key_params.key_data[24], + qdf_mem_copy(&key_params.key_data[24], &key_info->key[i].key[16], 8); } else - cdf_mem_copy((void *)key_params.key_data, + qdf_mem_copy((void *)key_params.key_data, (const void *)key_info->key[i].key, key_info->key[i].keyLength); @@ -1946,13 +1946,13 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) } } } - cdf_mem_set(&key_params, sizeof(key_params), 0); + qdf_mem_set(&key_params, sizeof(key_params), 0); key_params.vdev_id = key_info->smesessionId; key_params.key_type = key_info->encType; key_params.singl_tid_rc = key_info->singleTidRc; key_params.unicast = true; key_params.def_key_idx = key_info->defWEPIdx; - cdf_mem_copy((void *)key_params.peer_mac, + qdf_mem_copy((void *)key_params.peer_mac, (const void *)key_info->peer_macaddr.bytes, IEEE80211_ADDR_LEN); for (i = 0; i < num_keys; i++) { @@ -1960,14 +1960,14 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) !key_info->key[i].keyLength) continue; if (key_info->encType == eSIR_ED_TKIP) { - cdf_mem_copy(key_params.key_data, + qdf_mem_copy(key_params.key_data, key_info->key[i].key, 16); - cdf_mem_copy(&key_params.key_data[16], + qdf_mem_copy(&key_params.key_data[16], &key_info->key[i].key[24], 8); - cdf_mem_copy(&key_params.key_data[24], + qdf_mem_copy(&key_params.key_data[24], &key_info->key[i].key[16], 8); } else - cdf_mem_copy(key_params.key_data, key_info->key[i].key, + qdf_mem_copy(key_params.key_data, key_info->key[i].key, key_info->key[i].keyLength); if (key_info->encType == eSIR_ED_WPI) { key_params.key_idx = key_info->key[i].keyId; @@ -2172,7 +2172,7 @@ static int wmi_unified_probe_rsp_tmpl_send(tp_wma_handle wma, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, tmpl_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, frm, tmpl_len); + qdf_mem_copy(buf_ptr, frm, tmpl_len); ret = wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, wmi_buf_len, WMI_PRB_TMPL_CMDID); @@ -2273,7 +2273,7 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, tmpl_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, frm, tmpl_len); + qdf_mem_copy(buf_ptr, frm, tmpl_len); ret = wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, wmi_buf_len, WMI_BCN_TMPL_CMDID); @@ -2420,7 +2420,7 @@ int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, intf[if_id].tsfadjust = adjusted_tsf[if_id]; qdf_spin_lock_bh(&bcn->lock); - cdf_mem_zero(&bcn_info, sizeof(bcn_info)); + qdf_mem_zero(&bcn_info, sizeof(bcn_info)); bcn_info.beacon = cdf_nbuf_data(bcn->buf); bcn_info.p2pIeOffset = bcn->p2p_ie_offset; bcn_info.beaconLength = bcn->len; @@ -2490,7 +2490,7 @@ static int wma_p2p_go_set_beacon_ie(t_wma_handle *wma_handle, buf_ptr += sizeof(wmi_p2p_go_set_beacon_ie_fixed_param); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_aligned); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, p2pIe, ie_len); + qdf_mem_copy(buf_ptr, p2pIe, ie_len); WMA_LOGI("%s: Sending WMI_P2P_GO_SET_BEACON_IE", __func__); @@ -2632,7 +2632,7 @@ void wma_set_keepalive_req(tp_wma_handle wma, keepalive->destIpv4Addr, keepalive->dest_macaddr.bytes); - cdf_mem_free(keepalive); + qdf_mem_free(keepalive); } /** @@ -2648,7 +2648,7 @@ void wma_beacon_miss_handler(tp_wma_handle wma, uint32_t vdev_id) { tSirSmeMissedBeaconInd *beacon_miss_ind; - beacon_miss_ind = (tSirSmeMissedBeaconInd *) cdf_mem_malloc + beacon_miss_ind = (tSirSmeMissedBeaconInd *) qdf_mem_malloc (sizeof(tSirSmeMissedBeaconInd)); if (NULL == beacon_miss_ind) { @@ -3089,7 +3089,7 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle, /* Strip privacy headers (and trailer) * for a received frame */ - cdf_mem_move(orig_hdr + + qdf_mem_move(orig_hdr + IEEE80211_CCMP_HEADERLEN, wh, sizeof(*wh)); cdf_nbuf_pull_head(wbuf, @@ -3170,7 +3170,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, return -EINVAL; } - rx_pkt = cdf_mem_malloc(sizeof(*rx_pkt)); + rx_pkt = qdf_mem_malloc(sizeof(*rx_pkt)); if (!rx_pkt) { WMA_LOGE("Failed to allocate rx packet"); return -ENOMEM; @@ -3181,7 +3181,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, return -EINVAL; } - cdf_mem_zero(rx_pkt, sizeof(*rx_pkt)); + qdf_mem_zero(rx_pkt, sizeof(*rx_pkt)); /* * Fill in meta information needed by pe/lim @@ -3221,7 +3221,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, if (!wbuf) { WMA_LOGE("%s: Failed to allocate wbuf for mgmt rx len(%u)", __func__, hdr->buf_len); - cdf_mem_free(rx_pkt); + qdf_mem_free(rx_pkt); return -ENOMEM; } @@ -3259,7 +3259,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, } } #else - cdf_mem_copy(wh, param_tlvs->bufp, hdr->buf_len); + qdf_mem_copy(wh, param_tlvs->bufp, hdr->buf_len); #endif WMA_LOGD( diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index def726d12568..3a63ca5ef977 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -55,7 +55,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) */ if (status == QDF_STATUS_SUCCESS && vdev && req) { if (vdev->ocb_channel_info) - cdf_mem_free(vdev->ocb_channel_info); + qdf_mem_free(vdev->ocb_channel_info); vdev->ocb_channel_count = req->channel_count; if (req->channel_count) { @@ -63,10 +63,10 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) int buf_size = sizeof(*vdev->ocb_channel_info) * req->channel_count; vdev->ocb_channel_info = - cdf_mem_malloc(buf_size); + qdf_mem_malloc(buf_size); if (!vdev->ocb_channel_info) return -ENOMEM; - cdf_mem_zero(vdev->ocb_channel_info, buf_size); + qdf_mem_zero(vdev->ocb_channel_info, buf_size); for (i = 0; i < req->channel_count; i++) { vdev->ocb_channel_info[i].chan_freq = req->channels[i].chan_freq; @@ -81,10 +81,10 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) } /* Free the configuration that was saved in wma_ocb_set_config. */ - cdf_mem_free(wma_handle->ocb_config_req); + qdf_mem_free(wma_handle->ocb_config_req); wma_handle->ocb_config_req = NULL; - resp = cdf_mem_malloc(sizeof(*resp)); + resp = qdf_mem_malloc(sizeof(*resp)); if (!resp) return -ENOMEM; @@ -96,7 +96,7 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Fail to post msg to SME")); - cdf_mem_free(resp); + qdf_mem_free(resp); return -EINVAL; } @@ -121,7 +121,7 @@ static struct sir_ocb_config *copy_sir_ocb_config(struct sir_ocb_config *src) src->dcc_ndl_chan_list_len + src->dcc_ndl_active_state_list_len; - dst = cdf_mem_malloc(length); + dst = qdf_mem_malloc(length); if (!dst) return NULL; @@ -131,19 +131,19 @@ static struct sir_ocb_config *copy_sir_ocb_config(struct sir_ocb_config *src) cursor += sizeof(*dst); dst->channels = cursor; cursor += src->channel_count * sizeof(*dst->channels); - cdf_mem_copy(dst->channels, src->channels, + qdf_mem_copy(dst->channels, src->channels, src->channel_count * sizeof(*dst->channels)); dst->schedule = cursor; cursor += src->schedule_size * sizeof(*dst->schedule); - cdf_mem_copy(dst->schedule, src->schedule, + qdf_mem_copy(dst->schedule, src->schedule, src->schedule_size * sizeof(*dst->schedule)); dst->dcc_ndl_chan_list = cursor; cursor += src->dcc_ndl_chan_list_len; - cdf_mem_copy(dst->dcc_ndl_chan_list, src->dcc_ndl_chan_list, + qdf_mem_copy(dst->dcc_ndl_chan_list, src->dcc_ndl_chan_list, src->dcc_ndl_chan_list_len); dst->dcc_ndl_active_state_list = cursor; cursor += src->dcc_ndl_active_state_list_len; - cdf_mem_copy(dst->dcc_ndl_active_state_list, + qdf_mem_copy(dst->dcc_ndl_active_state_list, src->dcc_ndl_active_state_list, src->dcc_ndl_active_state_list_len); return dst; @@ -166,7 +166,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, * vdev start response message */ if (!wma_handle->interfaces[config_req->session_id].vdev_up) { - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); /* Enqueue OCB Set Schedule request message */ msg = wma_fill_vdev_req(wma_handle, config_req->session_id, WMA_OCB_SET_CONFIG_CMD, @@ -185,7 +185,7 @@ int wma_ocb_set_config_req(tp_wma_handle wma_handle, req.dot11_mode = WNI_CFG_DOT11_MODE_11A; if (wma_handle->ocb_config_req) - cdf_mem_free(wma_handle->ocb_config_req); + qdf_mem_free(wma_handle->ocb_config_req); wma_handle->ocb_config_req = copy_sir_ocb_config(config_req); req.preferred_rx_streams = 2; req.preferred_tx_streams = 2; @@ -376,7 +376,7 @@ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) buf_ptr += WMI_TLV_HDR_SIZE; if (config->dcc_ndl_chan_list_len) { ndl_chan = (wmi_dcc_ndl_chan *)buf_ptr; - cdf_mem_copy(ndl_chan, config->dcc_ndl_chan_list, + qdf_mem_copy(ndl_chan, config->dcc_ndl_chan_list, config->dcc_ndl_chan_list_len); for (i = 0; i < config->channel_count; i++) WMITLV_SET_HDR(&(ndl_chan[i].tlv_header), @@ -391,7 +391,7 @@ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) buf_ptr += WMI_TLV_HDR_SIZE; if (active_state_count) { ndl_active_config = (wmi_dcc_ndl_active_state_config *)buf_ptr; - cdf_mem_copy(ndl_active_config, + qdf_mem_copy(ndl_active_config, config->dcc_ndl_active_state_list, active_state_count * sizeof(*ndl_active_config)); for (i = 0; i < active_state_count; ++i) @@ -424,7 +424,7 @@ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) */ if (wma_handle->ocb_config_req != config) { if (wma_handle->ocb_config_req) - cdf_mem_free(wma_handle->ocb_config_req); + qdf_mem_free(wma_handle->ocb_config_req); wma_handle->ocb_config_req = copy_sir_ocb_config(config); } @@ -432,7 +432,7 @@ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) WMI_OCB_SET_CONFIG_CMDID); if (ret != EOK) { if (wma_handle->ocb_config_req) { - cdf_mem_free(wma_handle->ocb_config_req); + qdf_mem_free(wma_handle->ocb_config_req); wma_handle->ocb_config_req = NULL; } @@ -556,7 +556,7 @@ int wma_ocb_start_timing_advert(tp_wma_handle wma_handle, /* Add the timing advert template */ WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, len_template); - cdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, + qdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, (uint8_t *)timing_advert->template_value, timing_advert->template_length); @@ -641,7 +641,7 @@ int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, buf_ptr = (uint8_t *)wmi_buf_data(buf); cmd = (wmi_ocb_get_tsf_timer_cmd_fixed_param *)buf_ptr; - cdf_mem_zero(cmd, len); + qdf_mem_zero(cmd, len); WMITLV_SET_HDR(&cmd->tlv_header, WMITLV_TAG_STRUC_wmi_ocb_get_tsf_timer_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN( @@ -681,7 +681,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, fix_param = param_tlvs->fixed_param; /* Allocate and populate the response */ - response = cdf_mem_malloc(sizeof(*response)); + response = qdf_mem_malloc(sizeof(*response)); if (response == NULL) return -ENOMEM; response->vdev_id = fix_param->vdev_id; @@ -694,7 +694,7 @@ int wma_ocb_get_tsf_timer_resp_event_handler(void *handle, uint8_t *event_buf, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); - cdf_mem_free(response); + qdf_mem_free(response); return -EINVAL; } @@ -737,7 +737,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, } buf_ptr = wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); /* Populate the WMI command */ cmd = (wmi_dcc_get_stats_cmd_fixed_param *)buf_ptr; @@ -755,7 +755,7 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE; channel_stats_array = (wmi_dcc_channel_stats_request *)buf_ptr; - cdf_mem_copy(channel_stats_array, get_stats_param->request_array, + qdf_mem_copy(channel_stats_array, get_stats_param->request_array, get_stats_param->request_array_len); for (i = 0; i < cmd->num_channels; i++) WMITLV_SET_HDR(&channel_stats_array[i].tlv_header, @@ -797,7 +797,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, fix_param = param_tlvs->fixed_param; /* Allocate and populate the response */ - response = cdf_mem_malloc(sizeof(*response) + fix_param->num_channels * + response = qdf_mem_malloc(sizeof(*response) + fix_param->num_channels * sizeof(wmi_dcc_ndl_stats_per_channel)); if (response == NULL) return -ENOMEM; @@ -807,7 +807,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, response->channel_stats_array_len = fix_param->num_channels * sizeof(wmi_dcc_ndl_stats_per_channel); response->channel_stats_array = ((void *)response) + sizeof(*response); - cdf_mem_copy(response->channel_stats_array, + qdf_mem_copy(response->channel_stats_array, param_tlvs->stats_per_channel_list, response->channel_stats_array_len); @@ -817,7 +817,7 @@ int wma_dcc_get_stats_resp_event_handler(void *handle, uint8_t *event_buf, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); - cdf_mem_free(response); + qdf_mem_free(response); return -EINVAL; } @@ -850,7 +850,7 @@ int wma_dcc_clear_stats(tp_wma_handle wma_handle, } buf_ptr = wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); /* Populate the WMI command */ cmd = (wmi_dcc_clear_stats_cmd_fixed_param *)buf_ptr; @@ -924,7 +924,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, } buf_ptr = wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); /* Populate the WMI command */ cmd = (wmi_dcc_update_ndl_cmd_fixed_param *)buf_ptr; @@ -942,7 +942,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE; ndl_chan_array = (wmi_dcc_ndl_chan *)buf_ptr; - cdf_mem_copy(ndl_chan_array, update_ndl_param->dcc_ndl_chan_list, + qdf_mem_copy(ndl_chan_array, update_ndl_param->dcc_ndl_chan_list, update_ndl_param->dcc_ndl_chan_list_len); for (i = 0; i < cmd->num_channel; i++) WMITLV_SET_HDR(&ndl_chan_array[i].tlv_header, @@ -956,7 +956,7 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE; ndl_active_state_array = (wmi_dcc_ndl_active_state_config *) buf_ptr; - cdf_mem_copy(ndl_active_state_array, + qdf_mem_copy(ndl_active_state_array, update_ndl_param->dcc_ndl_active_state_list, update_ndl_param->dcc_ndl_active_state_list_len); for (i = 0; i < active_state_count; i++) { @@ -1001,7 +1001,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, param_tlvs = (WMI_DCC_UPDATE_NDL_RESP_EVENTID_param_tlvs *)event_buf; fix_param = param_tlvs->fixed_param; /* Allocate and populate the response */ - resp = cdf_mem_malloc(sizeof(*resp)); + resp = qdf_mem_malloc(sizeof(*resp)); if (!resp) { WMA_LOGE(FL("Error allocating memory for the response.")); return -ENOMEM; @@ -1015,7 +1015,7 @@ int wma_dcc_update_ndl_resp_event_handler(void *handle, uint8_t *event_buf, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); - cdf_mem_free(resp); + qdf_mem_free(resp); return -EINVAL; } @@ -1042,7 +1042,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, param_tlvs = (WMI_DCC_STATS_EVENTID_param_tlvs *)event_buf; fix_param = param_tlvs->fixed_param; /* Allocate and populate the response */ - response = cdf_mem_malloc(sizeof(*response) + + response = qdf_mem_malloc(sizeof(*response) + fix_param->num_channels * sizeof(wmi_dcc_ndl_stats_per_channel)); if (response == NULL) return -ENOMEM; @@ -1051,7 +1051,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, response->channel_stats_array_len = fix_param->num_channels * sizeof(wmi_dcc_ndl_stats_per_channel); response->channel_stats_array = ((void *)response) + sizeof(*response); - cdf_mem_copy(response->channel_stats_array, + qdf_mem_copy(response->channel_stats_array, param_tlvs->stats_per_channel_list, response->channel_stats_array_len); @@ -1061,7 +1061,7 @@ int wma_dcc_stats_event_handler(void *handle, uint8_t *event_buf, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE(FL("Failed to post msg to SME")); - cdf_mem_free(response); + qdf_mem_free(response); return -EINVAL; } diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 9d9a987cc22b..52276cb0f47e 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -48,7 +48,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -288,7 +288,7 @@ static int32_t wmi_unified_set_ap_ps_param(void *wma_ctx, uint32_t vdev_id, sizeof(*cmd), WMI_AP_PS_PEER_PARAM_CMDID); if (err) { WMA_LOGE("Failed to send set_ap_ps_param cmd"); - cdf_mem_free(buf); + qdf_mem_free(buf); return -EIO; } return 0; @@ -428,14 +428,14 @@ void wma_set_tx_power(WMA_HANDLE handle, if (!pdev) { WMA_LOGE("vdev handle is invalid for %pM", tx_pwr_params->bssId.bytes); - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); return; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up for %pM", __func__, vdev_id, tx_pwr_params->bssId.bytes); - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); return; } @@ -471,7 +471,7 @@ void wma_set_tx_power(WMA_HANDLE handle, ret = 0; } end: - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); if (ret) WMA_LOGE("Failed to set vdev param WMI_VDEV_PARAM_TX_PWRLIMIT"); } @@ -503,13 +503,13 @@ void wma_set_max_tx_power(WMA_HANDLE handle, if (!pdev) { WMA_LOGE("vdev handle is invalid for %pM", tx_pwr_params->bssId.bytes); - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); return; } if (!(wma_handle->interfaces[vdev_id].vdev_up)) { WMA_LOGE("%s: vdev id %d is not up", __func__, vdev_id); - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); return; } @@ -535,7 +535,7 @@ void wma_set_max_tx_power(WMA_HANDLE handle, else wma_handle->interfaces[vdev_id].max_tx_power = prev_max_power; end: - cdf_mem_free(tx_pwr_params); + qdf_mem_free(tx_pwr_params); if (ret) WMA_LOGE("%s: Failed to set vdev param WMI_VDEV_PARAM_TX_PWRLIMIT", __func__); @@ -1173,7 +1173,7 @@ wmi_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, param_len); buf_ptr += WMI_TLV_HDR_SIZE; - cdf_mem_copy(buf_ptr, autoTriggerparam, param_len); + qdf_mem_copy(buf_ptr, autoTriggerparam, param_len); /* * Update tag and length for uapsd auto trigger params (this will take @@ -1503,7 +1503,7 @@ static void wma_update_beacon_noa_ie(struct beacon_info *bcn, "but not present in swba event, " "So Reset the NoA", __func__); /* TODO: Assuming p2p noa ie is last ie in the beacon */ - cdf_mem_zero(bcn->noa_ie, (bcn->noa_sub_ie_len + + qdf_mem_zero(bcn->noa_ie, (bcn->noa_sub_ie_len + sizeof(struct p2p_ie))); bcn->len -= (bcn->noa_sub_ie_len + sizeof(struct p2p_ie)); @@ -1521,7 +1521,7 @@ static void wma_update_beacon_noa_ie(struct beacon_info *bcn, "bcn->noa_sub_ie_len %u", __func__, bcn->len, bcn->noa_sub_ie_len); bcn->len -= (bcn->noa_sub_ie_len + sizeof(struct p2p_ie)); - cdf_mem_zero(bcn->noa_ie, + qdf_mem_zero(bcn->noa_ie, (bcn->noa_sub_ie_len + sizeof(struct p2p_ie))); } else { /* NoA is not present in previous beacon */ WMA_LOGD("%s: NoA not present in previous beacon, add it" @@ -1534,7 +1534,7 @@ static void wma_update_beacon_noa_ie(struct beacon_info *bcn, wma_add_p2p_ie(bcn->noa_ie); p2p_ie = (struct p2p_ie *)bcn->noa_ie; p2p_ie->p2p_len += new_noa_sub_ie_len; - cdf_mem_copy((bcn->noa_ie + sizeof(struct p2p_ie)), bcn->noa_sub_ie, + qdf_mem_copy((bcn->noa_ie + sizeof(struct p2p_ie)), bcn->noa_sub_ie, new_noa_sub_ie_len); bcn->len += (new_noa_sub_ie_len + sizeof(struct p2p_ie)); @@ -1636,14 +1636,14 @@ void wma_update_probe_resp_noa(tp_wma_handle wma_handle, struct p2p_sub_element_noa *noa_ie) { tSirP2PNoaAttr *noa_attr = - (tSirP2PNoaAttr *) cdf_mem_malloc(sizeof(tSirP2PNoaAttr)); + (tSirP2PNoaAttr *) qdf_mem_malloc(sizeof(tSirP2PNoaAttr)); WMA_LOGD("Received update NoA event"); if (!noa_attr) { WMA_LOGE("Failed to allocate memory for tSirP2PNoaAttr"); return; } - cdf_mem_zero(noa_attr, sizeof(tSirP2PNoaAttr)); + qdf_mem_zero(noa_attr, sizeof(tSirP2PNoaAttr)); noa_attr->index = noa_ie->index; noa_attr->oppPsFlag = noa_ie->oppPS; @@ -1707,7 +1707,7 @@ int wma_p2p_noa_event_handler(void *handle, uint8_t *event, if (WMI_UNIFIED_NOA_ATTR_IS_MODIFIED(p2p_noa_info)) { - cdf_mem_zero(&noa_ie, sizeof(noa_ie)); + qdf_mem_zero(&noa_ie, sizeof(noa_ie)); noa_ie.index = (uint8_t) WMI_UNIFIED_NOA_ATTR_INDEX_GET(p2p_noa_info); noa_ie.oppPS = diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 55586707e1ad..138d4ea08961 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -49,7 +49,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -126,7 +126,7 @@ static inline void wma_set_p2p_scan_info(tp_wma_handle wma_handle, static inline void wma_reset_p2p_scan_info(tp_wma_handle wma_handle, uint8_t vdev_id) { - cdf_mem_zero((void *)&(wma_handle->interfaces[vdev_id].p2p_scan_info), + qdf_mem_zero((void *)&(wma_handle->interfaces[vdev_id].p2p_scan_info), sizeof(struct p2p_scan_param)); } @@ -484,7 +484,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, ssid = (wmi_ssid *) (buf_ptr + WMI_TLV_HDR_SIZE); for (i = 0; i < scan_req->numSsid; ++i) { ssid->ssid_len = scan_req->ssId[i].length; - cdf_mem_copy(ssid->ssid, scan_req->ssId[i].ssId, + qdf_mem_copy(ssid->ssid, scan_req->ssId[i].ssId, scan_req->ssId[i].length); ssid++; } @@ -513,7 +513,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, ie_len_with_pad = roundup(scan_req->uIEFieldLen, sizeof(uint32_t)); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_with_pad); if (scan_req->uIEFieldLen) { - cdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, + qdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, (uint8_t *) scan_req + (scan_req->uIEFieldOffset), scan_req->uIEFieldLen); } @@ -522,7 +522,7 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, *buf_len = len; return QDF_STATUS_SUCCESS; error: - cdf_mem_free(*buf); + qdf_mem_free(*buf); *buf = NULL; return qdf_status; } @@ -657,7 +657,7 @@ error: if (msg_type == WMA_START_SCAN_OFFLOAD_REQ) { scan_event = (tSirScanOffloadEvent *) - cdf_mem_malloc(sizeof(tSirScanOffloadEvent)); + qdf_mem_malloc(sizeof(tSirScanOffloadEvent)); if (!scan_event) { WMA_LOGP("%s: Failed to allocate memory for scan rsp", __func__); @@ -922,7 +922,7 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, roam_scan_mode_fp->vdev_id = vdev_id; /* Fill in scan parameters suitable for roaming scan */ buf_ptr += sizeof(wmi_roam_scan_mode_fixed_param); - cdf_mem_copy(buf_ptr, scan_cmd_fp, + qdf_mem_copy(buf_ptr, scan_cmd_fp, sizeof(wmi_start_scan_cmd_fixed_param)); /* Ensure there is no additional IEs */ scan_cmd_fp->ie_len = 0; @@ -971,10 +971,10 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, buf_ptr += WMI_TLV_HDR_SIZE; roam_offload_ese = (wmi_roam_ese_offload_tlv_param *) buf_ptr; - cdf_mem_copy(roam_offload_ese->krk, + qdf_mem_copy(roam_offload_ese->krk, roam_req->KRK, sizeof(roam_req->KRK)); - cdf_mem_copy(roam_offload_ese->btk, + qdf_mem_copy(roam_offload_ese->btk, roam_req->BTK, sizeof(roam_req->BTK)); WMITLV_SET_HDR(&roam_offload_ese->tlv_header, @@ -997,10 +997,10 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, (wmi_roam_11r_offload_tlv_param *) buf_ptr; roam_offload_11r->r0kh_id_len = roam_req->R0KH_ID_Length; - cdf_mem_copy(roam_offload_11r->r0kh_id, + qdf_mem_copy(roam_offload_11r->r0kh_id, roam_req->R0KH_ID, roam_offload_11r->r0kh_id_len); - cdf_mem_copy(roam_offload_11r->psk_msk, + qdf_mem_copy(roam_offload_11r->psk_msk, roam_req->PSK_PMK, sizeof(roam_req->PSK_PMK)); roam_offload_11r->psk_msk_len = @@ -1040,7 +1040,7 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, WMA_LOGE("LFR3:OKC Disabled"); } - cdf_mem_copy(roam_offload_11i->pmk, + qdf_mem_copy(roam_offload_11i->pmk, roam_req->PSK_PMK, sizeof(roam_req->PSK_PMK)); roam_offload_11i->pmk_len = roam_req->pmk_len; @@ -1571,7 +1571,7 @@ void wma_roam_scan_fill_ap_profile(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req, wmi_ap_profile *ap_profile_p) { - cdf_mem_zero(ap_profile_p, sizeof(wmi_ap_profile)); + qdf_mem_zero(ap_profile_p, sizeof(wmi_ap_profile)); if (roam_req == NULL) { ap_profile_p->ssid.ssid_len = 0; ap_profile_p->ssid.ssid[0] = 0; @@ -1583,7 +1583,7 @@ void wma_roam_scan_fill_ap_profile(tp_wma_handle wma_handle, } else { ap_profile_p->ssid.ssid_len = roam_req->ConnectedNetwork.ssId.length; - cdf_mem_copy(ap_profile_p->ssid.ssid, + qdf_mem_copy(ap_profile_p->ssid.ssid, roam_req->ConnectedNetwork.ssId.ssId, ap_profile_p->ssid.ssid_len); ap_profile_p->rsn_authmode = @@ -1629,7 +1629,7 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, return; } - cdf_mem_zero(scan_params, sizeof(wmi_start_scan_cmd_fixed_param)); + qdf_mem_zero(scan_params, sizeof(wmi_start_scan_cmd_fixed_param)); scan_params->scan_ctrl_flags = WMI_SCAN_ADD_CCK_RATES | WMI_SCAN_ADD_OFDM_RATES | WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ; @@ -1830,7 +1830,7 @@ QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, roam_ap_profile_fp->id = 0; buf_ptr += sizeof(wmi_roam_ap_profile_fixed_param); - cdf_mem_copy(buf_ptr, ap_profile_p, sizeof(wmi_ap_profile)); + qdf_mem_copy(buf_ptr, ap_profile_p, sizeof(wmi_ap_profile)); WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_STRUC_wmi_ap_profile, WMITLV_GET_STRUCT_TLVLEN(wmi_ap_profile)); @@ -2134,7 +2134,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, /* roam scan offload is not enabled in firmware. * Cannot initialize it in the middle of connection. */ - cdf_mem_free(roam_req); + qdf_mem_free(roam_req); return QDF_STATUS_E_PERM; } switch (roam_req->Command) { @@ -2265,11 +2265,11 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, cds_msg_t cds_msg; tSirRoamOffloadScanRsp *scan_offload_rsp; scan_offload_rsp = - cdf_mem_malloc(sizeof(*scan_offload_rsp)); + qdf_mem_malloc(sizeof(*scan_offload_rsp)); if (!scan_offload_rsp) { WMA_LOGE("%s: Alloc failed for scan_offload_rsp", __func__); - cdf_mem_free(roam_req); + qdf_mem_free(roam_req); return QDF_STATUS_E_NOMEM; } cds_msg.type = eWNI_SME_ROAM_SCAN_OFFLOAD_RSP; @@ -2284,7 +2284,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { - cdf_mem_free(scan_offload_rsp); + qdf_mem_free(scan_offload_rsp); QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, "%s: Failed to post Scan Offload Rsp to UMAC", @@ -2417,7 +2417,7 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, default: break; } - cdf_mem_free(roam_req); + qdf_mem_free(roam_req); return qdf_status; } @@ -2554,7 +2554,7 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, roam_synch_ind_ptr->beaconProbeRespOffset; roam_synch_ind_ptr->beaconProbeRespLength = synch_event->bcn_probe_rsp_len; - cdf_mem_copy(bcn_probersp_ptr, param_buf->bcn_probe_rsp_frame, + qdf_mem_copy(bcn_probersp_ptr, param_buf->bcn_probe_rsp_frame, roam_synch_ind_ptr->beaconProbeRespLength); /* ReAssoc Rsp data */ roam_synch_ind_ptr->reassocRespOffset = @@ -2563,7 +2563,7 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, roam_synch_ind_ptr->reassocRespLength = synch_event->reassoc_rsp_len; reassoc_rsp_ptr = (uint8_t *) roam_synch_ind_ptr + roam_synch_ind_ptr->reassocRespOffset; - cdf_mem_copy(reassoc_rsp_ptr, + qdf_mem_copy(reassoc_rsp_ptr, param_buf->reassoc_rsp_frame, roam_synch_ind_ptr->reassocRespLength); @@ -2575,18 +2575,18 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma, roam_synch_ind_ptr->reassoc_req_length = synch_event->reassoc_req_len; reassoc_req_ptr = (uint8_t *) roam_synch_ind_ptr + roam_synch_ind_ptr->reassoc_req_offset; - cdf_mem_copy(reassoc_req_ptr, param_buf->reassoc_req_frame, + qdf_mem_copy(reassoc_req_ptr, param_buf->reassoc_req_frame, roam_synch_ind_ptr->reassoc_req_length); chan = (wmi_channel *) param_buf->chan; roam_synch_ind_ptr->chan_freq = chan->mhz; key = (wmi_key_material *) param_buf->key; if (key != NULL) { - cdf_mem_copy(roam_synch_ind_ptr->kck, key->kck, + qdf_mem_copy(roam_synch_ind_ptr->kck, key->kck, SIR_KCK_KEY_LEN); - cdf_mem_copy(roam_synch_ind_ptr->kek, key->kek, + qdf_mem_copy(roam_synch_ind_ptr->kek, key->kek, SIR_KEK_KEY_LEN); - cdf_mem_copy(roam_synch_ind_ptr->replay_ctr, + qdf_mem_copy(roam_synch_ind_ptr->replay_ctr, key->replay_counter, SIR_REPLAY_CTR_LEN); WMA_LOGD("%s: KCK dump", __func__); QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, @@ -2620,33 +2620,33 @@ void wma_roam_update_vdev(tp_wma_handle wma, tAddStaParams *add_sta_params; uint8_t vdev_id; - del_bss_params = cdf_mem_malloc(sizeof(*del_bss_params)); - del_sta_params = cdf_mem_malloc(sizeof(*del_sta_params)); - set_link_params = cdf_mem_malloc(sizeof(*set_link_params)); - add_sta_params = cdf_mem_malloc(sizeof(*add_sta_params)); + del_bss_params = qdf_mem_malloc(sizeof(*del_bss_params)); + del_sta_params = qdf_mem_malloc(sizeof(*del_sta_params)); + set_link_params = qdf_mem_malloc(sizeof(*set_link_params)); + add_sta_params = qdf_mem_malloc(sizeof(*add_sta_params)); if (!del_bss_params || !del_sta_params || !set_link_params || !add_sta_params) { WMA_LOGE("%s: failed to allocate memory", __func__); return; } vdev_id = roam_synch_ind_ptr->roamedVdevId; - cdf_mem_zero(del_bss_params, sizeof(*del_bss_params)); - cdf_mem_zero(del_sta_params, sizeof(*del_sta_params)); - cdf_mem_zero(set_link_params, sizeof(*set_link_params)); - cdf_mem_zero(add_sta_params, sizeof(*add_sta_params)); + qdf_mem_zero(del_bss_params, sizeof(*del_bss_params)); + qdf_mem_zero(del_sta_params, sizeof(*del_sta_params)); + qdf_mem_zero(set_link_params, sizeof(*set_link_params)); + qdf_mem_zero(add_sta_params, sizeof(*add_sta_params)); del_bss_params->smesessionId = vdev_id; del_sta_params->smesessionId = vdev_id; - cdf_mem_copy(del_bss_params->bssid, wma->interfaces[vdev_id].bssid, + qdf_mem_copy(del_bss_params->bssid, wma->interfaces[vdev_id].bssid, IEEE80211_ADDR_LEN); set_link_params->state = eSIR_LINK_PREASSOC_STATE; - cdf_mem_copy(set_link_params->selfMacAddr, wma->myaddr, + qdf_mem_copy(set_link_params->selfMacAddr, wma->myaddr, IEEE80211_ADDR_LEN); - cdf_mem_copy(set_link_params->bssid, roam_synch_ind_ptr->bssid.bytes, + qdf_mem_copy(set_link_params->bssid, roam_synch_ind_ptr->bssid.bytes, IEEE80211_ADDR_LEN); add_sta_params->staType = STA_ENTRY_SELF; add_sta_params->smesessionId = vdev_id; - cdf_mem_copy(&add_sta_params->bssId, &roam_synch_ind_ptr->bssid.bytes, + qdf_mem_copy(&add_sta_params->bssId, &roam_synch_ind_ptr->bssid.bytes, IEEE80211_ADDR_LEN); add_sta_params->staIdx = STA_INVALID_IDX; add_sta_params->assocId = roam_synch_ind_ptr->aid; @@ -2657,12 +2657,12 @@ void wma_roam_update_vdev(tp_wma_handle wma, wma_add_bss(wma, (tpAddBssParams)roam_synch_ind_ptr->add_bss_params); wma_add_sta(wma, add_sta_params); wma->interfaces[vdev_id].vdev_up = true; - cdf_mem_copy(wma->interfaces[vdev_id].bssid, + qdf_mem_copy(wma->interfaces[vdev_id].bssid, roam_synch_ind_ptr->bssid.bytes, IEEE80211_ADDR_LEN); - cdf_mem_free(del_bss_params); - cdf_mem_free(del_sta_params); - cdf_mem_free(set_link_params); - cdf_mem_free(add_sta_params); + qdf_mem_free(del_bss_params); + qdf_mem_free(del_sta_params); + qdf_mem_free(set_link_params); + qdf_mem_free(add_sta_params); } /** @@ -2716,14 +2716,14 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, synch_event->bcn_probe_rsp_len + synch_event->reassoc_rsp_len + synch_event->reassoc_req_len; roam_synch_ind_ptr = - (roam_offload_synch_ind *) cdf_mem_malloc(len); + (roam_offload_synch_ind *) qdf_mem_malloc(len); if (!roam_synch_ind_ptr) { WMA_LOGE("%s: failed to allocate memory for roam_synch_event", __func__); QDF_ASSERT(roam_synch_ind_ptr != NULL); return -ENOMEM; } - cdf_mem_zero(roam_synch_ind_ptr, len); + qdf_mem_zero(roam_synch_ind_ptr, len); wma_fill_roam_synch_buffer(wma, roam_synch_ind_ptr, param_buf); /* 24 byte MAC header and 12 byte to ssid IE */ @@ -2735,8 +2735,8 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, WMA_LOGE("LFR3: Invalid Beacon Length"); goto cleanup_label; } - bss_desc_ptr = cdf_mem_malloc(sizeof(tSirBssDescription) + ie_len); - roam_synch_ind_ptr->join_rsp = cdf_mem_malloc(sizeof(tSirSmeJoinRsp)); + bss_desc_ptr = qdf_mem_malloc(sizeof(tSirBssDescription) + ie_len); + roam_synch_ind_ptr->join_rsp = qdf_mem_malloc(sizeof(tSirSmeJoinRsp)); if ((NULL == roam_synch_ind_ptr->join_rsp) || (NULL == bss_desc_ptr)) { WMA_LOGE("LFR3: mem alloc failed!"); QDF_ASSERT(bss_desc_ptr != NULL); @@ -2744,8 +2744,8 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, status = -ENOMEM; goto cleanup_label; } - cdf_mem_zero(roam_synch_ind_ptr->join_rsp, sizeof(tSirSmeJoinRsp)); - cdf_mem_zero(bss_desc_ptr, sizeof(tSirBssDescription) + ie_len); + qdf_mem_zero(roam_synch_ind_ptr->join_rsp, sizeof(tSirSmeJoinRsp)); + qdf_mem_zero(bss_desc_ptr, sizeof(tSirBssDescription) + ie_len); wma->pe_roam_synch_cb((tpAniSirGlobal)wma->mac_context, roam_synch_ind_ptr, bss_desc_ptr); wma_roam_update_vdev(wma, roam_synch_ind_ptr); @@ -2754,11 +2754,11 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, wma_process_roam_synch_complete(wma, synch_event->vdev_id); cleanup_label: if (roam_synch_ind_ptr->join_rsp) - cdf_mem_free(roam_synch_ind_ptr->join_rsp); + qdf_mem_free(roam_synch_ind_ptr->join_rsp); if (roam_synch_ind_ptr) - cdf_mem_free(roam_synch_ind_ptr); + qdf_mem_free(roam_synch_ind_ptr); if (bss_desc_ptr) - cdf_mem_free(bss_desc_ptr); + qdf_mem_free(bss_desc_ptr); wma->interfaces[synch_event->vdev_id].roam_synch_in_progress = false; return 0; @@ -2837,7 +2837,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, tSirMacExtendedHTCapabilityInfo extHtCapInfo; } uHTCapabilityInfo; - cdf_mem_set(&macQosInfoSta, sizeof(tSirMacQosInfoStation), 0); + qdf_mem_set(&macQosInfoSta, sizeof(tSirMacQosInfoStation), 0); /* Roaming is done only for INFRA STA type. * So, ess will be one and ibss will be Zero */ pMac = cds_get_context(QDF_MODULE_ID_PE); @@ -3045,10 +3045,10 @@ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) /* Fill the tsinfo in the format expected by firmware */ #ifndef ANI_LITTLE_BIT_ENDIAN - cdf_mem_copy(((uint8_t *) &tspec_param->ts_info) + 1, + qdf_mem_copy(((uint8_t *) &tspec_param->ts_info) + 1, ((uint8_t *) &ptspecIE->tsinfo) + 1, 2); #else - cdf_mem_copy(((uint8_t *) &tspec_param->ts_info), + qdf_mem_copy(((uint8_t *) &tspec_param->ts_info), ((uint8_t *) &ptspecIE->tsinfo) + 1, 2); #endif /* ANI_LITTLE_BIT_ENDIAN */ @@ -3156,7 +3156,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) cds_msg_t sme_msg = { 0 }; QDF_STATUS qdf_status; - ho_failure_ind = cdf_mem_malloc(sizeof(tSirSmeHOFailureInd)); + ho_failure_ind = qdf_mem_malloc(sizeof(tSirSmeHOFailureInd)); if (NULL == ho_failure_ind) { WMA_LOGE("%s: Memory allocation failure", __func__); @@ -3170,7 +3170,7 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("Fail to post eWNI_SME_HO_FAIL_IND msg to SME"); - cdf_mem_free(ho_failure_ind); + qdf_mem_free(ho_failure_ind); return; } return; @@ -3256,7 +3256,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) peer = ol_txrx_find_peer_by_addr(pdev, intr[vdev_id].bssid, &peer_id); - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.vdev_id = vdev_id; msg = wma_fill_vdev_req(wma, req.vdev_id, WMA_CHNL_SWITCH_REQ, WMA_TARGET_REQ_TYPE_VDEV_START, params, @@ -3441,7 +3441,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) /* Copy ssid and it's length */ nlo_list[i].ssid.valid = true; nlo_list[i].ssid.ssid.ssid_len = pno->aNetworks[i].ssId.length; - cdf_mem_copy(nlo_list[i].ssid.ssid.ssid, + qdf_mem_copy(nlo_list[i].ssid.ssid.ssid, pno->aNetworks[i].ssId.ssId, nlo_list[i].ssid.ssid.ssid_len); WMA_LOGD("index: %d ssid: %.*s len: %d", i, @@ -3604,7 +3604,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) /* SME expects WMA to free tpSirPNOScanReq memory after * processing PNO request. */ - cdf_mem_free(pno); + qdf_mem_free(pno); } #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) @@ -3795,7 +3795,7 @@ void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm) /* SME expects WMA to free tpSirPlmReq memory after * processing PLM request. */ - cdf_mem_free(plm); + qdf_mem_free(plm); plm = NULL; } #endif @@ -3834,7 +3834,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) WMA_LOGD("Posting PNO completion to umac"); len = sizeof(tSirPrefNetworkFoundInd); - nw_found_ind = (tSirPrefNetworkFoundInd *) cdf_mem_malloc(len); + nw_found_ind = (tSirPrefNetworkFoundInd *) qdf_mem_malloc(len); if (NULL == nw_found_ind) { WMA_LOGE("%s: Memory allocation failure", __func__); @@ -3853,7 +3853,7 @@ void wma_scan_cache_updated_ind(tp_wma_handle wma, uint8_t sessionId) if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post PNO completion match event to SME", __func__); - cdf_mem_free(nw_found_ind); + qdf_mem_free(nw_found_ind); } } @@ -4082,7 +4082,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, WIFI_POWER_EVENT_WAKELOCK_PNO); scan_event = (tSirScanOffloadEvent *) - cdf_mem_malloc(sizeof(tSirScanOffloadEvent)); + qdf_mem_malloc(sizeof(tSirScanOffloadEvent)); if (scan_event) { /* Posting scan completion msg would take scan cache result * from LIM module and update in scan cache maintained in SME.*/ @@ -4090,7 +4090,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, qdf_wake_lock_timeout_acquire(&wma->pno_wake_lock, WMA_PNO_SCAN_COMPLETE_WAKE_LOCK_TIMEOUT, WIFI_POWER_EVENT_WAKELOCK_PNO); - cdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); + qdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); scan_event->reasonCode = eSIR_PNO_SCAN_SUCCESS; scan_event->event = SCAN_EVENT_COMPLETED; scan_event->sessionId = nlo_event->vdev_id; @@ -4195,7 +4195,7 @@ int wma_extscan_start_stop_event_handler(void *handle, return -EINVAL; } event = param_buf->fixed_param; - extscan_ind = cdf_mem_malloc(sizeof(*extscan_ind)); + extscan_ind = qdf_mem_malloc(sizeof(*extscan_ind)); if (!extscan_ind) { WMA_LOGE("%s: extscan memory allocation failed", __func__); return -ENOMEM; @@ -4250,14 +4250,14 @@ int wma_extscan_start_stop_event_handler(void *handle, default: WMA_LOGE("%s: Unknown event(%d) from target", __func__, event->status); - cdf_mem_free(extscan_ind); + qdf_mem_free(extscan_ind); return -EINVAL; } pMac->sme.pExtScanIndCb(pMac->hHdd, event_type, extscan_ind); WMA_LOGD("%s: sending event to umac for requestid %u" "with status %d", __func__, extscan_ind->request_id, extscan_ind->status); - cdf_mem_free(extscan_ind); + qdf_mem_free(extscan_ind); return 0; } @@ -4296,10 +4296,10 @@ int wma_extscan_operations_event_handler(void *handle, return -EINVAL; } oprn_event = param_buf->fixed_param; - oprn_ind = cdf_mem_malloc(sizeof(*oprn_ind)); + oprn_ind = qdf_mem_malloc(sizeof(*oprn_ind)); if (!oprn_ind) { WMA_LOGE("%s: extscan memory allocation failed", __func__); - cdf_mem_free(oprn_ind); + qdf_mem_free(oprn_ind); return -ENOMEM; } @@ -4326,14 +4326,14 @@ int wma_extscan_operations_event_handler(void *handle, default: WMA_LOGE("%s: Unknown event(%d) from target", __func__, oprn_event->event); - cdf_mem_free(oprn_ind); + qdf_mem_free(oprn_ind); return -EINVAL; } pMac->sme.pExtScanIndCb(pMac->hHdd, eSIR_EXTSCAN_SCAN_PROGRESS_EVENT_IND, oprn_ind); WMA_LOGI("%s: sending scan progress event to hdd", __func__); exit_handler: - cdf_mem_free(oprn_ind); + qdf_mem_free(oprn_ind); return 0; } @@ -4371,7 +4371,7 @@ int wma_extscan_table_usage_event_handler(void *handle, return -EINVAL; } event = param_buf->fixed_param; - tbl_usg_ind = cdf_mem_malloc(sizeof(*tbl_usg_ind)); + tbl_usg_ind = qdf_mem_malloc(sizeof(*tbl_usg_ind)); if (!tbl_usg_ind) { WMA_LOGE("%s: table usage allocation failed", __func__); return -ENOMEM; @@ -4383,7 +4383,7 @@ int wma_extscan_table_usage_event_handler(void *handle, eSIR_EXTSCAN_SCAN_RES_AVAILABLE_IND, tbl_usg_ind); WMA_LOGI("%s: sending scan_res available event to hdd", __func__); - cdf_mem_free(tbl_usg_ind); + qdf_mem_free(tbl_usg_ind); return 0; } @@ -4433,7 +4433,7 @@ int wma_extscan_capabilities_event_handler(void *handle, WMA_LOGE("%s: Invalid capabilities list", __func__); return -EINVAL; } - dest_capab = cdf_mem_malloc(sizeof(*dest_capab)); + dest_capab = qdf_mem_malloc(sizeof(*dest_capab)); if (!dest_capab) { WMA_LOGE("%s: Allocation failed for capabilities buffer", __func__); @@ -4490,7 +4490,7 @@ int wma_extscan_capabilities_event_handler(void *handle, pMac->sme.pExtScanIndCb(pMac->hHdd, eSIR_EXTSCAN_GET_CAPABILITIES_IND, dest_capab); WMA_LOGI("%s: sending capabilities event to hdd", __func__); - cdf_mem_free(dest_capab); + qdf_mem_free(dest_capab); return 0; } @@ -4539,7 +4539,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, WMA_LOGE("%s: Hotlist AP's list invalid", __func__); return -EINVAL; } - dest_hotlist = cdf_mem_malloc(sizeof(*dest_hotlist) + + dest_hotlist = qdf_mem_malloc(sizeof(*dest_hotlist) + sizeof(*dest_ap) * numap); if (!dest_hotlist) { WMA_LOGE("%s: Allocation failed for hotlist buffer", __func__); @@ -4575,7 +4575,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, dest_ap->ieLength = src_hotlist->ie_length; WMI_MAC_ADDR_TO_CHAR_ARRAY(&src_hotlist->bssid, dest_ap->bssid.bytes); - cdf_mem_copy(dest_ap->ssid, src_hotlist->ssid.ssid, + qdf_mem_copy(dest_ap->ssid, src_hotlist->ssid.ssid, src_hotlist->ssid.ssid_len); dest_ap->ssid[src_hotlist->ssid.ssid_len] = '\0'; dest_ap++; @@ -4585,7 +4585,7 @@ int wma_extscan_hotlist_match_event_handler(void *handle, pMac->sme.pExtScanIndCb(pMac->hHdd, eSIR_EXTSCAN_HOTLIST_MATCH_IND, dest_hotlist); WMA_LOGI("%s: sending hotlist match event to hdd", __func__); - cdf_mem_free(dest_hotlist); + qdf_mem_free(dest_hotlist); return 0; } @@ -4720,10 +4720,10 @@ static int wma_group_num_bss_to_scan_id(const u_int8_t *cmd_param_info, for (i = 0; i < t_cached_result->num_scan_ids; i++) { WMA_LOGD("%s: num_results:%d", __func__, t_scan_id_grp->num_results); - t_scan_id_grp->ap = cdf_mem_malloc(t_scan_id_grp->num_results * + t_scan_id_grp->ap = qdf_mem_malloc(t_scan_id_grp->num_results * sizeof(*ap)); if (!t_scan_id_grp->ap) { - WMA_LOGD("%s: cdf_mem_malloc failed", __func__); + WMA_LOGD("%s: qdf_mem_malloc failed", __func__); return -ENOMEM; } @@ -4746,7 +4746,7 @@ static int wma_group_num_bss_to_scan_id(const u_int8_t *cmd_param_info, WMI_MAC_ADDR_TO_CHAR_ARRAY(&src_hotlist->bssid, ap->bssid.bytes); - cdf_mem_copy(ap->ssid, src_hotlist->ssid.ssid, + qdf_mem_copy(ap->ssid, src_hotlist->ssid.ssid, src_hotlist->ssid.ssid_len); ap->ssid[src_hotlist->ssid.ssid_len] = '\0'; ap++; @@ -4814,12 +4814,12 @@ int wma_extscan_cached_results_event_handler(void *handle, else moredata = 0; - dest_cachelist = cdf_mem_malloc(sizeof(*dest_cachelist)); + dest_cachelist = qdf_mem_malloc(sizeof(*dest_cachelist)); if (!dest_cachelist) { - WMA_LOGE("%s: cdf_mem_malloc failed", __func__); + WMA_LOGE("%s: qdf_mem_malloc failed", __func__); return -ENOMEM; } - cdf_mem_zero(dest_cachelist, sizeof(*dest_cachelist)); + qdf_mem_zero(dest_cachelist, sizeof(*dest_cachelist)); dest_cachelist->request_id = event->request_id; dest_cachelist->more_data = moredata; @@ -4828,10 +4828,10 @@ int wma_extscan_cached_results_event_handler(void *handle, dest_cachelist->num_scan_ids = scan_ids_cnt; buf_len = sizeof(*dest_result) * scan_ids_cnt; - dest_cachelist->result = cdf_mem_malloc(buf_len); + dest_cachelist->result = qdf_mem_malloc(buf_len); if (!dest_cachelist->result) { WMA_LOGE("%s: Allocation failed for scanid grouping", __func__); - cdf_mem_free(dest_cachelist); + qdf_mem_free(dest_cachelist); return -ENOMEM; } @@ -4845,11 +4845,11 @@ int wma_extscan_cached_results_event_handler(void *handle, WMA_LOGI("%s: sending cached results event", __func__); dest_result = dest_cachelist->result; for (i = 0; i < dest_cachelist->num_scan_ids; i++) { - cdf_mem_free(dest_result->ap); + qdf_mem_free(dest_result->ap); dest_result++; } - cdf_mem_free(dest_cachelist->result); - cdf_mem_free(dest_cachelist); + qdf_mem_free(dest_cachelist->result); + qdf_mem_free(dest_cachelist); return 0; noresults: @@ -4924,7 +4924,7 @@ int wma_extscan_change_results_event_handler(void *handle, } else { moredata = 0; } - dest_chglist = cdf_mem_malloc(sizeof(*dest_chglist) + + dest_chglist = qdf_mem_malloc(sizeof(*dest_chglist) + sizeof(*dest_ap) * numap + sizeof(int32_t) * rssi_num); if (!dest_chglist) { @@ -4954,7 +4954,7 @@ int wma_extscan_change_results_event_handler(void *handle, eSIR_EXTSCAN_SIGNIFICANT_WIFI_CHANGE_RESULTS_IND, dest_chglist); WMA_LOGI("%s: sending change monitor results", __func__); - cdf_mem_free(dest_chglist); + qdf_mem_free(dest_chglist); return 0; } @@ -4998,10 +4998,10 @@ int wma_passpoint_match_event_handler(void *handle, event = param_buf->fixed_param; buf_ptr = (uint8_t *)param_buf->fixed_param; - dest_match = cdf_mem_malloc(sizeof(*dest_match) + + dest_match = qdf_mem_malloc(sizeof(*dest_match) + event->ie_length + event->anqp_length); if (!dest_match) { - WMA_LOGE("%s: cdf_mem_malloc failed", __func__); + WMA_LOGE("%s: qdf_mem_malloc failed", __func__); return -EINVAL; } dest_ap = &dest_match->ap; @@ -5020,12 +5020,12 @@ int wma_passpoint_match_event_handler(void *handle, dest_ap->capability = event->capability; dest_ap->ieLength = event->ie_length; WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->bssid, dest_ap->bssid.bytes); - cdf_mem_copy(dest_ap->ssid, event->ssid.ssid, + qdf_mem_copy(dest_ap->ssid, event->ssid.ssid, event->ssid.ssid_len); dest_ap->ssid[event->ssid.ssid_len] = '\0'; - cdf_mem_copy(dest_ap->ieData, buf_ptr + sizeof(*event) + + qdf_mem_copy(dest_ap->ieData, buf_ptr + sizeof(*event) + WMI_TLV_HDR_SIZE, dest_ap->ieLength); - cdf_mem_copy(dest_match->anqp, buf_ptr + sizeof(*event) + + qdf_mem_copy(dest_match->anqp, buf_ptr + sizeof(*event) + WMI_TLV_HDR_SIZE + dest_ap->ieLength, dest_match->anqp_len); @@ -5033,7 +5033,7 @@ int wma_passpoint_match_event_handler(void *handle, eSIR_PASSPOINT_NETWORK_FOUND_IND, dest_match); WMA_LOGI("%s: sending passpoint match event to hdd", __func__); - cdf_mem_free(dest_match); + qdf_mem_free(dest_match); return 0; } @@ -5085,7 +5085,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, return -EINVAL; } - dest_hotlist = cdf_mem_malloc(sizeof(*dest_hotlist) + + dest_hotlist = qdf_mem_malloc(sizeof(*dest_hotlist) + sizeof(*dest_ap) * numap); if (!dest_hotlist) { WMA_LOGE("%s: Allocation failed for hotlist buffer", @@ -5117,7 +5117,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, dest_ap->ieLength = src_hotlist->ie_length; WMI_MAC_ADDR_TO_CHAR_ARRAY(&src_hotlist->bssid, dest_ap->bssid.bytes); - cdf_mem_copy(dest_ap->ssid, src_hotlist->ssid.ssid, + qdf_mem_copy(dest_ap->ssid, src_hotlist->ssid.ssid, src_hotlist->ssid.ssid_len); dest_ap->ssid[src_hotlist->ssid.ssid_len] = '\0'; dest_ap++; @@ -5129,7 +5129,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, eSIR_EXTSCAN_HOTLIST_SSID_MATCH_IND, dest_hotlist); WMA_LOGI("%s: sending hotlist ssid match event", __func__); - cdf_mem_free(dest_hotlist); + qdf_mem_free(dest_hotlist); return 0; } @@ -6190,7 +6190,7 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, /* Copy ssid and it's length */ nlo_list[i].ssid.valid = true; nlo_list[i].ssid.ssid.ssid_len = req->networks[i].ssid.length; - cdf_mem_copy(nlo_list[i].ssid.ssid.ssid, + qdf_mem_copy(nlo_list[i].ssid.ssid.ssid, req->networks[i].ssid.ssId, nlo_list[i].ssid.ssid.ssid_len); WMA_LOGD("index: %d ssid: %.*s len: %d", i, @@ -6288,7 +6288,7 @@ QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, wmi_passpoint_config_cmd_fixed_param)); cmd->id = req->networks[i].id; WMA_LOGD("%s: network id: %u", __func__, cmd->id); - cdf_mem_copy(cmd->realm, req->networks[i].realm, + qdf_mem_copy(cmd->realm, req->networks[i].realm, strlen(req->networks[i].realm) + 1); WMA_LOGD("%s: realm: %s", __func__, cmd->realm); for (j = 0; j < PASSPOINT_ROAMING_CONSORTIUM_ID_NUM; j++) { @@ -6297,11 +6297,11 @@ QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, j, bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7]); - cdf_mem_copy(&cmd->roaming_consortium_ids[j], + qdf_mem_copy(&cmd->roaming_consortium_ids[j], &req->networks[i].roaming_consortium_ids[j], PASSPOINT_ROAMING_CONSORTIUM_ID_LEN); } - cdf_mem_copy(cmd->plmn, req->networks[i].plmn, + qdf_mem_copy(cmd->plmn, req->networks[i].plmn, PASSPOINT_PLMN_ID_LEN); WMA_LOGD("%s: plmn: %02x:%02x:%02x", __func__, cmd->plmn[0], cmd->plmn[1], cmd->plmn[2]); @@ -6463,7 +6463,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, WMITLV_GET_STRUCT_TLVLEN (wmi_extscan_hotlist_ssid_entry)); entry->ssid.ssid_len = request->ssids[i].ssid.length; - cdf_mem_copy(entry->ssid.ssid, + qdf_mem_copy(entry->ssid.ssid, request->ssids[i].ssid.ssId, request->ssids[i].ssid.length); entry->band = request->ssids[i].band; @@ -6522,7 +6522,7 @@ QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) (wmi_scan_prob_req_oui_cmd_fixed_param)); oui_buf = &cmd->prob_req_oui; - cdf_mem_zero(oui_buf, sizeof(cmd->prob_req_oui)); + qdf_mem_zero(oui_buf, sizeof(cmd->prob_req_oui)); *oui_buf = psetoui->oui[0] << 16 | psetoui->oui[1] << 8 | psetoui->oui[2]; WMA_LOGD("%s: wma:oui received from hdd %08x", __func__, @@ -6563,7 +6563,7 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, vdev_id = wmi_event->vdev_id; scan_id = wma_handle->interfaces[vdev_id].scan_info.scan_id; - scan_event = (tSirScanOffloadEvent *) cdf_mem_malloc + scan_event = (tSirScanOffloadEvent *) qdf_mem_malloc (sizeof(tSirScanOffloadEvent)); if (!scan_event) { WMA_LOGE("Memory allocation failed for tSirScanOffloadEvent"); @@ -6658,7 +6658,7 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) wma_stop_scan(wma, &abortScan); } - candidate_ind = cdf_mem_malloc(sizeof(tSirSmeCandidateFoundInd)); + candidate_ind = qdf_mem_malloc(sizeof(tSirSmeCandidateFoundInd)); if (!candidate_ind) { WMA_LOGE("%s: Alloc failed for tSirSmeCandidateFoundInd", __func__); @@ -6676,7 +6676,7 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { - cdf_mem_free(candidate_ind); + qdf_mem_free(candidate_ind); QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, FL("Failed to post candidate ind to SME")); } @@ -6862,9 +6862,9 @@ QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, wmi_roam_subnet_change_config_fixed_param)); cmd->vdev_id = req->session_id; - cdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, + qdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, QDF_IPV4_ADDR_SIZE); - cdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr, + qdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr, QDF_IPV6_ADDR_SIZE); WMI_CHAR_ARRAY_TO_MAC_ADDR(req->gw_mac_addr.bytes, &cmd->inet_gw_mac_addr); diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 907b50bde005..6f6af9b1ba98 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -48,7 +48,7 @@ #include "cdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" -#include "cdf_memory.h" +#include "qdf_mem.h" #include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" @@ -356,7 +356,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, alloc_len = sizeof(tSirStatsExtEvent); alloc_len += stats_ext_info->data_len; - stats_ext_event = (tSirStatsExtEvent *) cdf_mem_malloc(alloc_len); + stats_ext_event = (tSirStatsExtEvent *) qdf_mem_malloc(alloc_len); if (NULL == stats_ext_event) { WMA_LOGE("%s: Memory allocation failure", __func__); return -ENOMEM; @@ -366,7 +366,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, stats_ext_event->vdev_id = stats_ext_info->vdev_id; stats_ext_event->event_data_len = stats_ext_info->data_len; - cdf_mem_copy(stats_ext_event->event_data, + qdf_mem_copy(stats_ext_event->event_data, buf_ptr, stats_ext_event->event_data_len); cds_msg.type = eWNI_SME_STATS_EXT_EVENT; @@ -376,7 +376,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, status = cds_mq_post_message(CDS_MQ_ID_SME, &cds_msg); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to post stats ext event to SME", __func__); - cdf_mem_free(stats_ext_event); + qdf_mem_free(stats_ext_event); return -EFAULT; } @@ -535,7 +535,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, (fixed_param->num_peers * peer_info_size) + (num_rates * rate_stats_size); - link_stats_results = cdf_mem_malloc(link_stats_results_size); + link_stats_results = qdf_mem_malloc(link_stats_results_size); if (NULL == link_stats_results) { WMA_LOGD("%s: could not allocate mem for stats results-len %zu", __func__, link_stats_results_size); @@ -548,7 +548,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, fixed_param->request_id, fixed_param->num_peers, fixed_param->peer_event_number, fixed_param->more_data); - cdf_mem_zero(link_stats_results, link_stats_results_size); + qdf_mem_zero(link_stats_results, link_stats_results_size); link_stats_results->paramId = WMI_LINK_STATS_ALL_PEER; link_stats_results->rspId = fixed_param->request_id; @@ -557,7 +557,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, link_stats_results->peer_event_number = fixed_param->peer_event_number; link_stats_results->moreResultToFollow = fixed_param->more_data; - cdf_mem_copy(link_stats_results->results, + qdf_mem_copy(link_stats_results->results, &fixed_param->num_peers, peer_stats_size); results = (uint8_t *) link_stats_results->results; @@ -572,7 +572,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, peer_stats->peer_type, peer_stats->capabilities, peer_stats->num_rates); - cdf_mem_copy(results + next_res_offset, + qdf_mem_copy(results + next_res_offset, t_peer_stats + next_peer_offset, peer_info_size); next_res_offset += peer_info_size; @@ -588,7 +588,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, rate_stats->retries_long); rate_stats++; - cdf_mem_copy(results + next_res_offset, + qdf_mem_copy(results + next_res_offset, t_rate_stats + next_rate_offset, rate_stats_size); next_res_offset += rate_stats_size; @@ -606,7 +606,7 @@ static int wma_unified_link_peer_stats_event_handler(void *handle, WMA_LINK_LAYER_STATS_RESULTS_RSP, link_stats_results); WMA_LOGD("%s: Peer Stats event posted to HDD", __func__); - cdf_mem_free(link_stats_results); + qdf_mem_free(link_stats_results); return 0; } @@ -674,7 +674,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, link_stats_results_size = sizeof(*link_stats_results) + radio_stats_size + (radio_stats->num_channels * chan_stats_size); - link_stats_results = cdf_mem_malloc(link_stats_results_size); + link_stats_results = qdf_mem_malloc(link_stats_results_size); if (NULL == link_stats_results) { WMA_LOGD("%s: could not allocate mem for stats results-len %zu", __func__, link_stats_results_size); @@ -699,7 +699,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, radio_stats->on_time_pno_scan, radio_stats->on_time_hs20, radio_stats->num_channels); - cdf_mem_zero(link_stats_results, link_stats_results_size); + qdf_mem_zero(link_stats_results, link_stats_results_size); link_stats_results->paramId = WMI_LINK_STATS_RADIO; link_stats_results->rspId = fixed_param->request_id; @@ -712,7 +712,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, t_radio_stats = (uint8_t *) radio_stats; t_channel_stats = (uint8_t *) channel_stats; - cdf_mem_copy(results, t_radio_stats + WMI_TLV_HDR_SIZE, + qdf_mem_copy(results, t_radio_stats + WMI_TLV_HDR_SIZE, radio_stats_size); next_res_offset = radio_stats_size; @@ -729,7 +729,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, channel_stats->cca_busy_time); channel_stats++; - cdf_mem_copy(results + next_res_offset, + qdf_mem_copy(results + next_res_offset, t_channel_stats + next_chan_offset, chan_stats_size); next_res_offset += chan_stats_size; @@ -744,7 +744,7 @@ static int wma_unified_link_radio_stats_event_handler(void *handle, WMA_LINK_LAYER_STATS_RESULTS_RSP, link_stats_results); WMA_LOGD("%s: Radio Stats event posted to HDD", __func__); - cdf_mem_free(link_stats_results); + qdf_mem_free(link_stats_results); return 0; } @@ -807,7 +807,7 @@ QDF_STATUS wma_process_ll_stats_clear_req } buf_ptr = (uint8_t *) wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); cmd = (wmi_clear_link_stats_cmd_fixed_param *) buf_ptr; WMITLV_SET_HDR(&cmd->tlv_header, @@ -871,7 +871,7 @@ QDF_STATUS wma_process_ll_stats_set_req } buf_ptr = (uint8_t *) wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); cmd = (wmi_start_link_stats_cmd_fixed_param *) buf_ptr; WMITLV_SET_HDR(&cmd->tlv_header, @@ -929,7 +929,7 @@ QDF_STATUS wma_process_ll_stats_get_req } buf_ptr = (uint8_t *) wmi_buf_data(buf); - cdf_mem_zero(buf_ptr, len); + qdf_mem_zero(buf_ptr, len); cmd = (wmi_request_link_stats_cmd_fixed_param *) buf_ptr; WMITLV_SET_HDR(&cmd->tlv_header, @@ -1024,7 +1024,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, ac_stats_size = sizeof(tSirWifiWmmAcStat); link_stats_results_size = sizeof(*link_stats_results) + link_stats_size; - link_stats_results = cdf_mem_malloc(link_stats_results_size); + link_stats_results = qdf_mem_malloc(link_stats_results_size); if (!link_stats_results) { WMA_LOGD("%s: could not allocate mem for stats results-len %zu", __func__, link_stats_results_size); @@ -1057,7 +1057,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, link_stats->avg_rx_frms_leaked, link_stats->rx_leak_window); - cdf_mem_zero(link_stats_results, link_stats_results_size); + qdf_mem_zero(link_stats_results, link_stats_results_size); link_stats_results->paramId = WMI_LINK_STATS_IFACE; link_stats_results->rspId = fixed_param->request_id; @@ -1074,10 +1074,10 @@ int wma_unified_link_iface_stats_event_handler(void *handle, roaming_offset = offsetof(tSirWifiInterfaceInfo, roaming); roaming_size = member_size(tSirWifiInterfaceInfo, roaming); - cdf_mem_copy(results + roaming_offset, &link_stats->roam_state, + qdf_mem_copy(results + roaming_offset, &link_stats->roam_state, roaming_size); - cdf_mem_copy(results + iface_info_size, + qdf_mem_copy(results + iface_info_size, t_link_stats + WMI_TLV_HDR_SIZE, link_stats_size - iface_info_size - WIFI_AC_MAX * ac_stats_size); @@ -1103,7 +1103,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, ac_stats->contention_num_samples); ac_stats++; - cdf_mem_copy(results + next_res_offset, + qdf_mem_copy(results + next_res_offset, t_ac_stats + next_ac_offset, ac_stats_size); next_res_offset += ac_stats_size; next_ac_offset += sizeof(*ac_stats); @@ -1117,7 +1117,7 @@ int wma_unified_link_iface_stats_event_handler(void *handle, WMA_LINK_LAYER_STATS_RESULTS_RSP, link_stats_results); WMA_LOGD("%s: Iface Stats event posted to HDD", __func__); - cdf_mem_free(link_stats_results); + qdf_mem_free(link_stats_results); return 0; } @@ -1250,7 +1250,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, pGetRssiReq->pDevContext); } - cdf_mem_free(pGetRssiReq); + qdf_mem_free(pGetRssiReq); wma->pGetRssiReq = NULL; } @@ -1271,7 +1271,7 @@ static void wma_update_vdev_stats(tp_wma_handle wma, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post snr ind msg", __func__); - cdf_mem_free(p_snr_req); + qdf_mem_free(p_snr_req); } node->psnr_req = NULL; @@ -1389,7 +1389,7 @@ void wma_post_link_status(tAniGetLinkStatus *pGetLinkStatus, qdf_status = cds_mq_post_message(QDF_MODULE_ID_SME, &sme_msg); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post link status ind msg", __func__); - cdf_mem_free(pGetLinkStatus); + qdf_mem_free(pGetLinkStatus); } } @@ -1527,7 +1527,7 @@ QDF_STATUS wma_send_link_speed(uint32_t link_speed) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; cds_msg_t sme_msg = { 0 }; tSirLinkSpeedInfo *ls_ind = - (tSirLinkSpeedInfo *) cdf_mem_malloc(sizeof(tSirLinkSpeedInfo)); + (tSirLinkSpeedInfo *) qdf_mem_malloc(sizeof(tSirLinkSpeedInfo)); if (!ls_ind) { WMA_LOGE("%s: Memory allocation failed.", __func__); qdf_status = QDF_STATUS_E_NOMEM; @@ -1541,7 +1541,7 @@ QDF_STATUS wma_send_link_speed(uint32_t link_speed) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { WMA_LOGE("%s: Fail to post linkspeed ind msg", __func__); - cdf_mem_free(ls_ind); + qdf_mem_free(ls_ind); } } return qdf_status; @@ -1832,7 +1832,7 @@ int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle, WMA_LOGE("%s:Invalid vdev handle", __func__); return -EINVAL; } - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.stats_type_reset_mask = value; ol_txrx_fw_stats_get(vdev, &req, false); @@ -1867,7 +1867,7 @@ int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, WMA_LOGE("%s:Invalid vdev handle", __func__); return -EINVAL; } - cdf_mem_zero(&req, sizeof(req)); + qdf_mem_zero(&req, sizeof(req)); req.print.verbose = 1; switch (value) { @@ -2035,14 +2035,14 @@ static tAniGetPEStatsRsp *wma_get_stats_rsp_buf temp_mask >>= 1; } - stats_rsp_params = (tAniGetPEStatsRsp *) cdf_mem_malloc(len); + stats_rsp_params = (tAniGetPEStatsRsp *) qdf_mem_malloc(len); if (!stats_rsp_params) { WMA_LOGE("memory allocation failed for tAniGetPEStatsRsp"); QDF_ASSERT(0); return NULL; } - cdf_mem_zero(stats_rsp_params, len); + qdf_mem_zero(stats_rsp_params, len); stats_rsp_params->staId = get_stats_param->staId; stats_rsp_params->statsMask = get_stats_param->statsMask; stats_rsp_params->msgType = WMA_GET_STATISTICS_RSP; @@ -2081,7 +2081,7 @@ void wma_get_stats_req(WMA_HANDLE handle, get_stats_param->statsMask); goto end; } else { - cdf_mem_free(node->stats_rsp); + qdf_mem_free(node->stats_rsp); node->stats_rsp = NULL; node->fw_stats_set = 0; } @@ -2128,7 +2128,7 @@ failed: wma_send_msg(wma_handle, WMA_GET_STATISTICS_RSP, pGetPEStatsRspParams, 0); end: - cdf_mem_free(get_stats_param); + qdf_mem_free(get_stats_param); WMA_LOGD("%s: Exit", __func__); return; } @@ -2173,7 +2173,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) qdf_spin_lock_bh(&beacon->lock); buf_size = cdf_nbuf_len(beacon->buf); - buf = cdf_mem_malloc(buf_size); + buf = qdf_mem_malloc(buf_size); if (!buf) { qdf_spin_unlock_bh(&beacon->lock); @@ -2181,7 +2181,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) return NULL; } - cdf_mem_copy(buf, cdf_nbuf_data(beacon->buf), buf_size); + qdf_mem_copy(buf, cdf_nbuf_data(beacon->buf), buf_size); qdf_spin_unlock_bh(&beacon->lock); @@ -2276,7 +2276,7 @@ int wma_utf_rsp(tp_wma_handle wma_handle, uint8_t **payload, uint32_t *len) * The first 4 bytes holds the payload size * and the actual payload sits next to it */ - *payload = (uint8_t *) cdf_mem_malloc((uint32_t) payload_len + *payload = (uint8_t *) qdf_mem_malloc((uint32_t) payload_len + sizeof(A_UINT32)); *(A_UINT32 *) &(*payload[0]) = wma_handle->utf_event_info.length; @@ -2317,7 +2317,7 @@ static void wma_post_ftm_response(tp_wma_handle wma_handle) if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("failed to post ftm response to SYS"); - cdf_mem_free(payload); + qdf_mem_free(payload); } } @@ -2399,7 +2399,7 @@ wma_process_utf_event(WMA_HANDLE handle, uint8_t *datap, uint32_t dataplen) void wma_utf_detach(tp_wma_handle wma_handle) { if (wma_handle->utf_event_info.data) { - cdf_mem_free(wma_handle->utf_event_info.data); + qdf_mem_free(wma_handle->utf_event_info.data); wma_handle->utf_event_info.data = NULL; wma_handle->utf_event_info.length = 0; wmi_unified_unregister_event_handler(wma_handle->wmi_handle, @@ -2418,7 +2418,7 @@ void wma_utf_attach(tp_wma_handle wma_handle) int ret; wma_handle->utf_event_info.data = (unsigned char *) - cdf_mem_malloc(MAX_UTF_EVENT_LENGTH); + qdf_mem_malloc(MAX_UTF_EVENT_LENGTH); wma_handle->utf_event_info.length = 0; ret = wmi_unified_register_event_handler(wma_handle->wmi_handle, @@ -2552,8 +2552,8 @@ wma_process_ftm_command(tp_wma_handle wma_handle, if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { WMA_LOGE("FTM command issued in non-FTM mode"); - cdf_mem_free(msg_buffer->data); - cdf_mem_free(msg_buffer); + qdf_mem_free(msg_buffer->data); + qdf_mem_free(msg_buffer); return QDF_STATUS_E_NOSUPPORT; } @@ -2562,8 +2562,8 @@ wma_process_ftm_command(tp_wma_handle wma_handle, ret = wma_utf_cmd(wma_handle, data, len); - cdf_mem_free(msg_buffer->data); - cdf_mem_free(msg_buffer); + qdf_mem_free(msg_buffer->data); + qdf_mem_free(msg_buffer); if (ret) return QDF_STATUS_E_FAILURE; diff --git a/core/wma/src/wma_utils_ut.c b/core/wma/src/wma_utils_ut.c index 845a39b36469..45db586d9f9f 100644 --- a/core/wma/src/wma_utils_ut.c +++ b/core/wma/src/wma_utils_ut.c @@ -62,7 +62,7 @@ void wma_set_dbs_capability_ut(uint32_t dbs) if (wma->hw_mode.hw_mode_list == NULL) { wma->num_dbs_hw_modes = 1; wma->hw_mode.hw_mode_list = - cdf_mem_malloc(sizeof(*wma->hw_mode.hw_mode_list) * + qdf_mem_malloc(sizeof(*wma->hw_mode.hw_mode_list) * wma->num_dbs_hw_modes); if (!wma->hw_mode.hw_mode_list) { WMA_LOGE("%s: Memory allocation failed for UT-DBS", diff --git a/core/wmi/wmi_tlv_platform.c b/core/wmi/wmi_tlv_platform.c index 3351b01510e3..5e0795ce7ec0 100644 --- a/core/wmi/wmi_tlv_platform.c +++ b/core/wmi/wmi_tlv_platform.c @@ -30,7 +30,7 @@ */ #include "ol_if_athvar.h" -#include /* cdf_mem_malloc,free, etc. */ +#include /* qdf_mem_malloc,free, etc. */ #include #include "htc_api.h" #include "wmi.h" @@ -54,5 +54,5 @@ { \ (ptr) = os_malloc(NULL, (numBytes), GFP_ATOMIC); \ } -#define wmi_tlv_os_mem_free cdf_mem_free +#define wmi_tlv_os_mem_free qdf_mem_free #endif diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index e80a0299a144..b081a5d5afd6 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -68,7 +68,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_buf_idx) \ g_wmi_command_buf_idx = 0; \ wmi_command_log_buffer[g_wmi_command_buf_idx].command = a; \ - cdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \ + qdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \ wmi_command_log_buffer[g_wmi_command_buf_idx].time = \ qdf_get_log_timestamp(); \ g_wmi_command_buf_idx++; \ @@ -78,7 +78,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_tx_cmp_buf_idx) \ g_wmi_command_tx_cmp_buf_idx = 0; \ wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].command = a; \ - cdf_mem_copy(wmi_command_tx_cmp_log_buffer \ + qdf_mem_copy(wmi_command_tx_cmp_log_buffer \ [g_wmi_command_tx_cmp_buf_idx].data, b, 16); \ wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].time = \ qdf_get_log_timestamp(); \ @@ -89,7 +89,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_event_buf_idx) \ g_wmi_event_buf_idx = 0; \ wmi_event_log_buffer[g_wmi_event_buf_idx].event = a; \ - cdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \ + qdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \ wmi_event_log_buffer[g_wmi_event_buf_idx].time = \ qdf_get_log_timestamp(); \ g_wmi_event_buf_idx++; \ @@ -99,7 +99,7 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_rx_event_buf_idx) \ g_wmi_rx_event_buf_idx = 0; \ wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].event = a; \ - cdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \ + qdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \ wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].time = \ qdf_get_log_timestamp(); \ g_wmi_rx_event_buf_idx++; \ @@ -126,7 +126,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; g_wmi_mgmt_command_buf_idx) \ g_wmi_mgmt_command_buf_idx = 0; \ wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].command = a; \ - cdf_mem_copy( \ + qdf_mem_copy( \ wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].data,\ b, 16); \ wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].time = \ @@ -140,7 +140,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; g_wmi_mgmt_command_tx_cmp_buf_idx = 0; \ wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\ command = a; \ - cdf_mem_copy(wmi_mgmt_command_tx_cmp_log_buffer \ + qdf_mem_copy(wmi_mgmt_command_tx_cmp_log_buffer \ [g_wmi_mgmt_command_tx_cmp_buf_idx].data, b, 16); \ wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\ time =\ @@ -152,7 +152,7 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; if (WMI_MGMT_EVENT_DEBUG_MAX_ENTRY <= g_wmi_mgmt_event_buf_idx) \ g_wmi_mgmt_event_buf_idx = 0; \ wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].event = a; \ - cdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\ + qdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\ b, 16); \ wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].time = \ qdf_get_log_timestamp(); \ @@ -844,7 +844,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, return -EBUSY; } - pkt = cdf_mem_malloc(sizeof(*pkt)); + pkt = qdf_mem_malloc(sizeof(*pkt)); if (!pkt) { qdf_atomic_dec(&wmi_handle->pending_cmds); pr_err("%s, Failed to alloc htc packet %x, no memory\n", @@ -1312,7 +1312,7 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); #endif cdf_nbuf_free(wmi_cmd_buf); - cdf_mem_free(htc_pkt); + qdf_mem_free(htc_pkt); qdf_atomic_dec(&wmi_handle->pending_cmds); } -- cgit v1.2.3 From cbc6d72570e59523c2d2d48a87478ea506dd730e Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Tue, 1 Mar 2016 16:24:53 +0530 Subject: qcacld-3.0: Update driver to use QDF NBUF APIs(1/2) Update driver to use QDF NBUF APIs Change-Id: I4409b6c046de1221b57baed45088d5f3b898b565 CRs-Fixed: 981188 --- core/cdf/inc/cdf_nbuf.h | 1125 ---------------------------- core/cdf/src/cdf_nbuf.c | 1040 ------------------------- core/cdf/src/i_cdf_nbuf.h | 1056 -------------------------- core/cds/inc/cds_packet.h | 8 +- core/cds/src/cds_packet.c | 36 +- core/cds/src/cds_sched.c | 6 +- core/dp/htt/htt.c | 8 +- core/dp/htt/htt_fw_stats.c | 2 +- core/dp/htt/htt_h2t.c | 154 ++-- core/dp/htt/htt_internal.h | 28 +- core/dp/htt/htt_rx.c | 254 +++---- core/dp/htt/htt_t2h.c | 80 +- core/dp/htt/htt_tx.c | 101 +-- core/dp/htt/htt_types.h | 16 +- core/dp/ol/inc/ol_htt_api.h | 2 +- core/dp/ol/inc/ol_htt_rx_api.h | 54 +- core/dp/ol/inc/ol_htt_tx_api.h | 40 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 12 +- core/dp/ol/inc/ol_txrx_htt_api.h | 22 +- core/dp/ol/inc/ol_txrx_osif_api.h | 28 +- core/dp/ol/inc/ol_vowext_dbg_defs.h | 4 +- core/dp/txrx/ol_ctrl_txrx_api.h | 6 +- core/dp/txrx/ol_osif_txrx_api.h | 2 +- core/dp/txrx/ol_rx.c | 142 ++-- core/dp/txrx/ol_rx.h | 14 +- core/dp/txrx/ol_rx_defrag.c | 152 ++-- core/dp/txrx/ol_rx_defrag.h | 42 +- core/dp/txrx/ol_rx_fwd.c | 38 +- core/dp/txrx/ol_rx_fwd.h | 14 +- core/dp/txrx/ol_rx_pn.c | 28 +- core/dp/txrx/ol_rx_pn.h | 12 +- core/dp/txrx/ol_rx_reorder.c | 38 +- core/dp/txrx/ol_rx_reorder.h | 6 +- core/dp/txrx/ol_rx_reorder_timeout.c | 2 +- core/dp/txrx/ol_tx.c | 221 +++--- core/dp/txrx/ol_tx.h | 18 +- core/dp/txrx/ol_tx_desc.c | 48 +- core/dp/txrx/ol_tx_desc.h | 4 +- core/dp/txrx/ol_tx_queue.c | 14 +- core/dp/txrx/ol_tx_queue.h | 2 +- core/dp/txrx/ol_tx_send.c | 78 +- core/dp/txrx/ol_tx_send.h | 10 +- core/dp/txrx/ol_txrx.c | 52 +- core/dp/txrx/ol_txrx.h | 2 +- core/dp/txrx/ol_txrx_encap.c | 64 +- core/dp/txrx/ol_txrx_encap.h | 18 +- core/dp/txrx/ol_txrx_flow_control.c | 2 +- core/dp/txrx/ol_txrx_internal.h | 42 +- core/dp/txrx/ol_txrx_types.h | 16 +- core/dp/txrx/txrx.h | 11 +- core/dp/txrx/wdi_event.h | 6 +- core/hdd/inc/wlan_hdd_ipa.h | 8 +- core/hdd/inc/wlan_hdd_softap_tx_rx.h | 4 +- core/hdd/inc/wlan_hdd_tx_rx.h | 4 +- core/hdd/src/wlan_hdd_ipa.c | 60 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 24 +- core/hdd/src/wlan_hdd_tx_rx.c | 28 +- core/mac/src/sys/common/src/wlan_qct_sys.c | 8 + core/sap/dfs/inc/dfs.h | 2 +- core/utils/epping/inc/epping_internal.h | 8 +- core/utils/epping/src/epping_rx.c | 12 +- core/utils/epping/src/epping_tx.c | 68 +- core/utils/epping/src/epping_txrx.c | 10 +- core/utils/fwlog/dbglog_host.c | 2 +- core/utils/pktlog/include/pktlog_ac_i.h | 4 +- core/utils/pktlog/pktlog_internal.c | 12 +- core/wma/inc/wma.h | 6 +- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_data.c | 68 +- core/wma/src/wma_dev_if.c | 30 +- core/wma/src/wma_features.c | 40 +- core/wma/src/wma_main.c | 18 +- core/wma/src/wma_mgmt.c | 74 +- core/wma/src/wma_power.c | 8 +- core/wma/src/wma_scan_roam.c | 28 +- core/wma/src/wma_utils.c | 6 +- core/wmi/wmi_unified.c | 82 +- core/wmi/wmi_unified_api.h | 4 +- core/wmi/wmi_unified_priv.h | 4 +- 79 files changed, 1299 insertions(+), 4505 deletions(-) delete mode 100644 core/cdf/inc/cdf_nbuf.h delete mode 100644 core/cdf/src/cdf_nbuf.c delete mode 100644 core/cdf/src/i_cdf_nbuf.h diff --git a/core/cdf/inc/cdf_nbuf.h b/core/cdf/inc/cdf_nbuf.h deleted file mode 100644 index 01771c6cea9f..000000000000 --- a/core/cdf/inc/cdf_nbuf.h +++ /dev/null @@ -1,1125 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_nbuf_public network buffer API - * This file defines the network buffer abstraction. - */ - -#ifndef _CDF_NBUF_H -#define _CDF_NBUF_H -#include -#include -#include -#include -#include -#include - -#define IPA_NBUF_OWNER_ID 0xaa55aa55 -#define NBUF_PKT_TRAC_TYPE_EAPOL 0x02 -#define NBUF_PKT_TRAC_TYPE_DHCP 0x04 -#define NBUF_PKT_TRAC_TYPE_MGMT_ACTION 0x08 -#define NBUF_PKT_TRAC_MAX_STRING 12 -#define NBUF_PKT_TRAC_PROTO_STRING 4 -#define NBUF_PKT_ERROR 1 - -/* Tracked Packet types */ -#define NBUF_TX_PKT_INVALID 0 -#define NBUF_TX_PKT_DATA_TRACK 1 -#define NBUF_TX_PKT_MGMT_TRACK 2 - -/* Different Packet states */ -#define NBUF_TX_PKT_HDD 1 -#define NBUF_TX_PKT_TXRX_ENQUEUE 2 -#define NBUF_TX_PKT_TXRX_DEQUEUE 3 -#define NBUF_TX_PKT_TXRX 4 -#define NBUF_TX_PKT_HTT 5 -#define NBUF_TX_PKT_HTC 6 -#define NBUF_TX_PKT_HIF 7 -#define NBUF_TX_PKT_CE 8 -#define NBUF_TX_PKT_FREE 9 -#define NBUF_TX_PKT_STATE_MAX 10 - - -/** - * @cdf_nbuf_t - Platform indepedent packet abstraction - */ -typedef __cdf_nbuf_t cdf_nbuf_t; - -/** - * @cdf_dma_map_cb_t - Dma map callback prototype - */ -typedef void (*cdf_dma_map_cb_t)(void *arg, cdf_nbuf_t buf, - qdf_dma_map_t dmap); - -/** - * @__CDF_NBUF_NULL - invalid handle - */ -#define CDF_NBUF_NULL __CDF_NBUF_NULL -/** - * @cdf_nbuf_queue_t - Platform independent packet queue abstraction - */ -typedef __cdf_nbuf_queue_t cdf_nbuf_queue_t; - -/* BUS/DMA mapping routines */ - -/** - * cdf_nbuf_map() - map a buffer to local bus address space - * @osdev: OS device - * @buf: Buf to be mapped (mapping info is stored in the buf's meta-data area) - * @dir: DMA direction - * - * Return: Status of the operation - */ -static inline QDF_STATUS -cdf_nbuf_map(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ - return __cdf_nbuf_map(osdev, buf, dir); -} - -/** - * cdf_nbuf_unmap() - unmap a previously mapped buf - * @osdev: OS device - * @buf: Buf to be unmapped (mapping info is stored in the buf's meta-data area) - * @dir: DMA direction - * - * Return: none - */ -static inline void -cdf_nbuf_unmap(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ - __cdf_nbuf_unmap(osdev, buf, dir); -} - -/** - * cdf_nbuf_map_single() - map a single buffer to local bus address space - * @osdev: OS device - * @buf: Buf to be mapped (mapping info is stored in the buf's meta-data area) - * @dir: DMA direction - * - * Return: Status of the operation - */ -static inline QDF_STATUS -cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ - return __cdf_nbuf_map_single(osdev, buf, dir); -} - -/** - * cdf_nbuf_unmap_single() - unmap a previously mapped buf - * @osdev: OS device - * @buf: Buf to be unmapped (mapping info is stored in the buf's meta-data area) - * @dir: DMA direction - * - * Return: none - */ -static inline void -cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ - __cdf_nbuf_unmap_single(osdev, buf, dir); -} - -/** - * cdf_nbuf_get_num_frags() - get number of fragments - * @buf: Network buffer - * - * Return: Number of fragments - */ -static inline int cdf_nbuf_get_num_frags(cdf_nbuf_t buf) -{ - return __cdf_nbuf_get_num_frags(buf); -} - -/** - * cdf_nbuf_get_frag_len() - get fragment length - * @buf: Network buffer - * @frag_num: Fragment number - * - * Return: Fragment length - */ -static inline int cdf_nbuf_get_frag_len(cdf_nbuf_t buf, int frag_num) -{ - BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); - return __cdf_nbuf_get_frag_len(buf, frag_num); -} - -/** - * cdf_nbuf_get_frag_vaddr() - get fragment virtual address - * @buf: Network buffer - * @frag_num: Fragment number - * - * Return: Fragment virtual address - */ -static inline unsigned char *cdf_nbuf_get_frag_vaddr(cdf_nbuf_t buf, - int frag_num) -{ - BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); - return __cdf_nbuf_get_frag_vaddr(buf, frag_num); -} - -/** - * cdf_nbuf_get_frag_paddr() - get fragment physical address - * @buf: Network buffer - * @frag_num: Fragment number - * - * Return: Fragment physical address - */ -static inline qdf_dma_addr_t cdf_nbuf_get_frag_paddr(cdf_nbuf_t buf, int frag_num) -{ - BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); - return __cdf_nbuf_get_frag_paddr(buf, frag_num); -} - -/** - * cdf_nbuf_get_frag_is_wordstream() - is fragment wordstream - * @buf: Network buffer - * @frag_num: Fragment number - * - * Return: Fragment wordstream or not - */ -static inline int cdf_nbuf_get_frag_is_wordstream(cdf_nbuf_t buf, int frag_num) -{ - BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); - return __cdf_nbuf_get_frag_is_wordstream(buf, frag_num); -} - -/** - * cdf_nbuf_set_frag_is_wordstream() - set fragment wordstream - * @buf: Network buffer - * @frag_num: Fragment number - * @is_wordstream: Wordstream - * - * Return: none - */ -static inline void -cdf_nbuf_set_frag_is_wordstream(cdf_nbuf_t buf, int frag_num, int is_wordstream) -{ - BUG_ON(frag_num >= NBUF_CB_TX_MAX_EXTRA_FRAGS); - __cdf_nbuf_set_frag_is_wordstream(buf, frag_num, is_wordstream); -} - -/** - * cdf_nbuf_ipa_owned_get - gets the ipa_owned flag - * @buf: Network buffer - * - * Return: none - */ -static inline int cdf_nbuf_ipa_owned_get(cdf_nbuf_t buf) -{ - return __cdf_nbuf_ipa_owned_get(buf); -} - -/** - * cdf_nbuf_ipa_owned_set - sets the ipa_owned flag - * @buf: Network buffer - * - * Return: none - */ -static inline void cdf_nbuf_ipa_owned_set(cdf_nbuf_t buf) -{ - __cdf_nbuf_ipa_owned_set(buf); -} - -/** - * cdf_nbuf_ipa_priv_get - gets the ipa_priv field - * @buf: Network buffer - * - * Return: none - */ -static inline int cdf_nbuf_ipa_priv_get(cdf_nbuf_t buf) -{ - return __cdf_nbuf_ipa_priv_get(buf); -} - -/** - * cdf_nbuf_ipa_priv_set - sets the ipa_priv field - * @buf: Network buffer - * - * Return: none - */ -static inline void cdf_nbuf_ipa_priv_set(cdf_nbuf_t buf, uint32_t priv) -{ - BUG_ON(priv & 0x80000000); /* priv is 31 bits only */ - __cdf_nbuf_ipa_priv_set(buf, priv); -} - -/** - * cdf_nbuf_mapped_paddr_get - gets the paddr of nbuf->data - * @buf: Network buffer - * - * Return: none - */ -static inline qdf_dma_addr_t -cdf_nbuf_mapped_paddr_get(cdf_nbuf_t buf) -{ - return __cdf_nbuf_mapped_paddr_get(buf); -} - -/** - * cdf_nbuf_mapped_paddr_set - sets the paddr of nbuf->data - * @buf: Network buffer - * - * Return: none - */ -static inline void -cdf_nbuf_mapped_paddr_set(cdf_nbuf_t buf, qdf_dma_addr_t paddr) -{ - __cdf_nbuf_mapped_paddr_set(buf, paddr); -} - -/** - * cdf_nbuf_frag_push_head() - push fragment head - * @buf: Network buffer - * @frag_len: Fragment length - * @frag_vaddr: Fragment virtual address - * @frag_paddr_lo: Fragment physical address lo - * @frag_paddr_hi: Fragment physical address hi - * - * Return: none - */ -static inline void -cdf_nbuf_frag_push_head(cdf_nbuf_t buf, - int frag_len, - char *frag_vaddr, - qdf_dma_addr_t frag_paddr) -{ - __cdf_nbuf_frag_push_head(buf, frag_len, frag_vaddr, frag_paddr); -} - -#ifdef MEMORY_DEBUG -void cdf_net_buf_debug_init(void); -void cdf_net_buf_debug_exit(void); -void cdf_net_buf_debug_clean(void); -void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, - uint8_t *file_name, uint32_t line_num); -void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf); -void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf); - -/* nbuf allocation rouines */ - -/** - * cdf_nbuf_alloc() - Allocate cdf_nbuf - * @hdl: Platform device object - * @size: Data buffer size for this cdf_nbuf including max header - * size - * @reserve: Headroom to start with. - * @align: Alignment for the start buffer. - * @prio: Indicate if the nbuf is high priority (some OSes e.g darwin - * polls few times if allocation fails and priority is true) - * - * The nbuf created is guarenteed to have only 1 physical segment - * - * Return: The new cdf_nbuf instance or NULL if there's not enough memory. - */ - -#define cdf_nbuf_alloc(d, s, r, a, p) \ - cdf_nbuf_alloc_debug(d, s, r, a, p, __FILE__, __LINE__) -static inline cdf_nbuf_t -cdf_nbuf_alloc_debug(qdf_device_t osdev, qdf_size_t size, int reserve, - int align, int prio, uint8_t *file_name, - uint32_t line_num) -{ - cdf_nbuf_t net_buf; - net_buf = __cdf_nbuf_alloc(osdev, size, reserve, align, prio); - - /* Store SKB in internal CDF tracking table */ - if (qdf_likely(net_buf)) - cdf_net_buf_debug_add_node(net_buf, size, file_name, line_num); - - return net_buf; -} - -/** - * cdf_nbuf_free() - free cdf_nbuf - * @net_buf: Network buffer to free - * - * Return: none - */ -static inline void cdf_nbuf_free(cdf_nbuf_t net_buf) -{ - /* Remove SKB from internal CDF tracking table */ - if (qdf_likely(net_buf)) - cdf_net_buf_debug_delete_node(net_buf); - - __cdf_nbuf_free(net_buf); -} - -#else - -static inline void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf) -{ - return; -} - -/* Nbuf allocation rouines */ - -/** - * cdf_nbuf_alloc() - allocate cdf_nbuf - * @hdl: Platform device object - * @size: Data buffer size for this cdf_nbuf including max header - * size - * @reserve: Headroom to start with. - * @align: Alignment for the start buffer. - * @prio: Indicate if the nbuf is high priority (some OSes e.g darwin - * polls few times if allocation fails and priority is true) - * - * The nbuf created is guarenteed to have only 1 physical segment - * - * Return: new cdf_nbuf instance or NULL if there's not enough memory. - */ -static inline cdf_nbuf_t -cdf_nbuf_alloc(qdf_device_t osdev, - qdf_size_t size, int reserve, int align, int prio) -{ - return __cdf_nbuf_alloc(osdev, size, reserve, align, prio); -} - -/** - * cdf_nbuf_free() - free cdf_nbuf - * @buf: Network buffer to free - * - * Return: none - */ -static inline void cdf_nbuf_free(cdf_nbuf_t buf) -{ - __cdf_nbuf_free(buf); -} - -#endif - -/** - * cdf_nbuf_tx_free() - free a list of cdf_nbufs and tell the OS their tx - * status (if req'd) - * @bufs: List of netbufs to free - * @tx_err: Whether the tx frames were transmitted successfully - * - * Return: none - */ -static inline void cdf_nbuf_tx_free(cdf_nbuf_t buf_list, int tx_err) -{ - __cdf_nbuf_tx_free(buf_list, tx_err); -} - -/** - * cdf_nbuf_copy() - copy src buffer into dst. - * @buf: source nbuf to copy from - * - * This API is useful, for example, because most native buffer provide a way to - * copy a chain into a single buffer. Therefore as a side effect, it also - * "linearizes" a buffer (which is perhaps why you'll use it mostly). It - * creates a writeable copy. - * - * - * Return: new nbuf - */ -static inline cdf_nbuf_t cdf_nbuf_copy(cdf_nbuf_t buf) -{ - return __cdf_nbuf_copy(buf); -} - -/** - * cdf_nbuf_cat() - link two nbufs, the new buf is piggybacked into older one - * @dst: Buffer to piggyback into - * @src: Buffer to put - * - * Return: Status of the call - 0 successful - */ -static inline QDF_STATUS cdf_nbuf_cat(cdf_nbuf_t dst, cdf_nbuf_t src) -{ - return __cdf_nbuf_cat(dst, src); -} - -/** - * @cdf_nbuf_copy_bits() - return the length of the copy bits for skb - * @skb: SKB pointer - * @offset: offset - * @len: Length - * @to: To - * - * Return: int32_t - */ -static inline int32_t -cdf_nbuf_copy_bits(cdf_nbuf_t nbuf, uint32_t offset, uint32_t len, void *to) -{ - return __cdf_nbuf_copy_bits(nbuf, offset, len, to); -} - -/** - * cdf_nbuf_clone() - clone the nbuf (copy is readonly) - * @buf: nbuf to clone from - * - * Return: cloned buffer - */ -static inline cdf_nbuf_t cdf_nbuf_clone(cdf_nbuf_t buf) -{ - return __cdf_nbuf_clone(buf); -} - -/* nbuf manipulation routines */ - -/** - * @cdf_nbuf_head() - return the address of an nbuf's buffer - * @buf: netbuf - * - * Return: head address - */ -static inline uint8_t *cdf_nbuf_head(cdf_nbuf_t buf) -{ - return __cdf_nbuf_head(buf); -} - -/** - * cdf_nbuf_data() - Return the address of the start of data within an nbuf - * @buf: Network buffer - * - * Return: Data address - */ -static inline uint8_t *cdf_nbuf_data(cdf_nbuf_t buf) -{ - return __cdf_nbuf_data(buf); -} - -/** - * cdf_nbuf_headroom() - amount of headroom int the current nbuf - * @buf: Network buffer - * - * Return: Amount of head room - */ -static inline uint32_t cdf_nbuf_headroom(cdf_nbuf_t buf) -{ - return __cdf_nbuf_headroom(buf); -} - -/** - * cdf_nbuf_tailroom() - amount of tail space available - * @buf: Network buffer - * - * Return: amount of tail room - */ -static inline uint32_t cdf_nbuf_tailroom(cdf_nbuf_t buf) -{ - return __cdf_nbuf_tailroom(buf); -} - -/** - * cdf_nbuf_push_head() - push data in the front - * @buf: Network buf instance - * @size: Size to be pushed - * - * Return: New data pointer of this buf after data has been pushed, - * or NULL if there is not enough room in this buf. - */ -static inline uint8_t *cdf_nbuf_push_head(cdf_nbuf_t buf, qdf_size_t size) -{ - return __cdf_nbuf_push_head(buf, size); -} - -/** - * cdf_nbuf_put_tail() - puts data in the end - * @buf: Network buf instance - * @size: Size to be pushed - * - * Return: Data pointer of this buf where new data has to be - * put, or NULL if there is not enough room in this buf. - */ -static inline uint8_t *cdf_nbuf_put_tail(cdf_nbuf_t buf, qdf_size_t size) -{ - return __cdf_nbuf_put_tail(buf, size); -} - -/** - * cdf_nbuf_pull_head() - pull data out from the front - * @buf: Network buf instance - * @size: Size to be popped - * - * Return: New data pointer of this buf after data has been popped, - * or NULL if there is not sufficient data to pull. - */ -static inline uint8_t *cdf_nbuf_pull_head(cdf_nbuf_t buf, qdf_size_t size) -{ - return __cdf_nbuf_pull_head(buf, size); -} - -/** - * cdf_nbuf_trim_tail() - trim data out from the end - * @buf: Network buf instance - * @size: Size to be popped - * - * Return: none - */ -static inline void cdf_nbuf_trim_tail(cdf_nbuf_t buf, qdf_size_t size) -{ - __cdf_nbuf_trim_tail(buf, size); -} - -/** - * cdf_nbuf_len() - get the length of the buf - * @buf: Network buf instance - * - * Return: total length of this buf. - */ -static inline qdf_size_t cdf_nbuf_len(cdf_nbuf_t buf) -{ - return __cdf_nbuf_len(buf); -} - -/** - * cdf_nbuf_set_pktlen() - set the length of the buf - * @buf: Network buf instance - * @size: Size to be set - * - * Return: none - */ -static inline void cdf_nbuf_set_pktlen(cdf_nbuf_t buf, uint32_t len) -{ - __cdf_nbuf_set_pktlen(buf, len); -} - -/** - * cdf_nbuf_reserve() - trim data out from the end - * @buf: Network buf instance - * @size: Size to be popped - * - * Return: none - */ -static inline void cdf_nbuf_reserve(cdf_nbuf_t buf, qdf_size_t size) -{ - __cdf_nbuf_reserve(buf, size); -} - -/** - * cdf_nbuf_peek_header() - return the data pointer & length of the header - * @buf: Network nbuf - * @addr: Data pointer - * @len: Length of the data - * - * Return: none - */ -static inline void -cdf_nbuf_peek_header(cdf_nbuf_t buf, uint8_t **addr, uint32_t *len) -{ - __cdf_nbuf_peek_header(buf, addr, len); -} - -/* nbuf private context routines */ - -/* nbuf queue routines */ - -/** - * cdf_nbuf_queue_init() - initialize buf queue - * @head: Network buf queue head - * - * Return: none - */ -static inline void cdf_nbuf_queue_init(cdf_nbuf_queue_t *head) -{ - __cdf_nbuf_queue_init(head); -} - -/** - * cdf_nbuf_queue_add() - append a nbuf to the tail of the buf queue - * @head: Network buf queue head - * @buf: Network buf - * - * Return: none - */ -static inline void cdf_nbuf_queue_add(cdf_nbuf_queue_t *head, cdf_nbuf_t buf) -{ - __cdf_nbuf_queue_add(head, buf); -} - -/** - * cdf_nbuf_queue_insert_head() - insert nbuf at the head of queue - * @head: Network buf queue head - * @buf: Network buf - * - * Return: none - */ -static inline void -cdf_nbuf_queue_insert_head(cdf_nbuf_queue_t *head, cdf_nbuf_t buf) -{ - __cdf_nbuf_queue_insert_head(head, buf); -} - -/** - * cdf_nbuf_queue_remove() - retrieve a buf from the head of the buf queue - * @head: Network buf queue head - * - * Return: The head buf in the buf queue. - */ -static inline cdf_nbuf_t cdf_nbuf_queue_remove(cdf_nbuf_queue_t *head) -{ - return __cdf_nbuf_queue_remove(head); -} - -/** - * cdf_nbuf_queue_len() - get the length of the queue - * @head: Network buf queue head - * - * Return: length of the queue - */ -static inline uint32_t cdf_nbuf_queue_len(cdf_nbuf_queue_t *head) -{ - return __cdf_nbuf_queue_len(head); -} - -/** - * cdf_nbuf_queue_next() - get the next guy/packet of the given buffer - * @buf: Network buffer - * - * Return: next buffer/packet - */ -static inline cdf_nbuf_t cdf_nbuf_queue_next(cdf_nbuf_t buf) -{ - return __cdf_nbuf_queue_next(buf); -} - -/** - * @cdf_nbuf_is_queue_empty() - check if the buf queue is empty - * @nbq: Network buf queue handle - * - * Return: true if queue is empty - * false if queue is not emty - */ -static inline bool cdf_nbuf_is_queue_empty(cdf_nbuf_queue_t *nbq) -{ - return __cdf_nbuf_is_queue_empty(nbq); -} - -/** - * cdf_nbuf_next() - get the next packet in the linked list - * @buf: Network buffer - * - * This function can be used when nbufs are directly linked into a list, - * rather than using a separate network buffer queue object. - * - * Return: next network buffer in the linked list - */ -static inline cdf_nbuf_t cdf_nbuf_next(cdf_nbuf_t buf) -{ - return __cdf_nbuf_next(buf); -} - -/** - * cdf_nbuf_get_protocol() - return the protocol value of the skb - * @skb: Pointer to network buffer - * - * Return: skb protocol - */ -static inline uint16_t cdf_nbuf_get_protocol(struct sk_buff *skb) -{ - return __cdf_nbuf_get_protocol(skb); -} - -/** - * cdf_nbuf_get_ip_summed() - return the ip checksum value of the skb - * @skb: Pointer to network buffer - * - * Return: skb ip_summed - */ -static inline uint8_t cdf_nbuf_get_ip_summed(struct sk_buff *skb) -{ - return __cdf_nbuf_get_ip_summed(skb); -} - -/** - * cdf_nbuf_set_ip_summed() - sets the ip_summed value of the skb - * @skb: Pointer to network buffer - * @ip_summed: ip checksum - * - * Return: none - */ -static inline void cdf_nbuf_set_ip_summed(struct sk_buff *skb, uint8_t ip_summed) -{ - __cdf_nbuf_set_ip_summed(skb, ip_summed); -} - -/** - * cdf_nbuf_set_next() - add a packet to a linked list - * @this_buf: Predecessor buffer - * @next_buf: Successor buffer - * - * This function can be used to directly link nbufs, rather than using - * a separate network buffer queue object. - * - * Return: none - */ -static inline void cdf_nbuf_set_next(cdf_nbuf_t this_buf, cdf_nbuf_t next_buf) -{ - __cdf_nbuf_set_next(this_buf, next_buf); -} - -/* nbuf extension routines */ - -/** - * cdf_nbuf_set_next_ext() - link extension of this packet contained in a new - * nbuf - * @this_buf: predecessor buffer - * @next_buf: successor buffer - * - * This function is used to link up many nbufs containing a single logical - * packet - not a collection of packets. Do not use for linking the first - * extension to the head - * - * Return: none - */ -static inline void -cdf_nbuf_set_next_ext(cdf_nbuf_t this_buf, cdf_nbuf_t next_buf) -{ - __cdf_nbuf_set_next_ext(this_buf, next_buf); -} - -/** - * cdf_nbuf_next_ext() - get the next packet extension in the linked list - * @buf: Network buffer - * - * Return: Next network buffer in the linked list - */ -static inline cdf_nbuf_t cdf_nbuf_next_ext(cdf_nbuf_t buf) -{ - return __cdf_nbuf_next_ext(buf); -} - -/** - * cdf_nbuf_append_ext_list() - link list of packet extensions to the head - * segment - * @head_buf: Network buf holding head segment (single) - * @ext_list: Network buf list holding linked extensions to the head - * @ext_len: Total length of all buffers in the extension list - * - * This function is used to link up a list of packet extensions (seg1, 2, - * ...) to the nbuf holding the head segment (seg0) - * - * Return: none - */ -static inline void -cdf_nbuf_append_ext_list(cdf_nbuf_t head_buf, cdf_nbuf_t ext_list, - qdf_size_t ext_len) -{ - __cdf_nbuf_append_ext_list(head_buf, ext_list, ext_len); -} - -/** - * cdf_nbuf_get_tx_cksum() - gets the tx checksum offload demand - * @buf: Network buffer - * - * Return: qdf_nbuf_tx_cksum_t checksum offload demand for the frame - */ -static inline qdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf) -{ - return __cdf_nbuf_get_tx_cksum(buf); -} - -/** - * cdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to - * indicate checksum info to the stack. - * @buf: Network buffer - * @cksum: Checksum - * - * Return: none - */ -static inline void -cdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, qdf_nbuf_rx_cksum_t *cksum) -{ - __cdf_nbuf_set_rx_cksum(buf, cksum); -} - -/** - * cdf_nbuf_get_tid() - this function extracts the TID value from nbuf - * @buf: Network buffer - * - * Return: TID value - */ -static inline uint8_t cdf_nbuf_get_tid(cdf_nbuf_t buf) -{ - return __cdf_nbuf_get_tid(buf); -} - -/** - * cdf_nbuf_set_tid() - this function sets the TID value in nbuf - * @buf: Network buffer - * @tid: TID value - * - * Return: none - */ -static inline void cdf_nbuf_set_tid(cdf_nbuf_t buf, uint8_t tid) -{ - __cdf_nbuf_set_tid(buf, tid); -} - -/** - * cdf_nbuf_get_exemption_type() - this function extracts the exemption type - * from nbuf - * @buf: Network buffer - * - * Return: Exemption type - */ -static inline uint8_t cdf_nbuf_get_exemption_type(cdf_nbuf_t buf) -{ - return __cdf_nbuf_get_exemption_type(buf); -} - -/** - * cdf_nbuf_set_protocol() - this function peeks data into the buffer at given - * offset - * @buf: Network buffer - * @proto: Protocol - * - * Return: none - */ -static inline void cdf_nbuf_set_protocol(cdf_nbuf_t buf, uint16_t proto) -{ - __cdf_nbuf_set_protocol(buf, proto); -} - -/** - * cdf_nbuf_trace_get_proto_type() - this function return packet proto type - * @buf: Network buffer - * - * Return: Packet protocol type - */ -static inline uint8_t cdf_nbuf_trace_get_proto_type(cdf_nbuf_t buf) -{ - return __cdf_nbuf_trace_get_proto_type(buf); -} - -#ifdef QCA_PKT_PROTO_TRACE -/** - * cdf_nbuf_trace_set_proto_type() - this function updates packet proto type - * @buf: Network buffer - * @proto_type: Protocol type - * - * Return: none - */ -static inline void -cdf_nbuf_trace_set_proto_type(cdf_nbuf_t buf, uint8_t proto_type) -{ - __cdf_nbuf_trace_set_proto_type(buf, proto_type); -} -#else -#define cdf_nbuf_trace_set_proto_type(buf, proto_type) /*NO OP*/ -#endif - -/** - * cdf_nbuf_reg_trace_cb() - this function registers protocol trace callback - * @cb_func_ptr: Callback pointer - * - * Return: none - */ -static inline void cdf_nbuf_reg_trace_cb(cdf_nbuf_trace_update_t cb_func_ptr) -{ - __cdf_nbuf_reg_trace_cb(cb_func_ptr); -} - -/** - * cdf_nbuf_trace_update() - this function updates protocol event - * @buf: Network buffer - * @event_string: Event string pointer - * - * Return: none - */ -static inline void cdf_nbuf_trace_update(cdf_nbuf_t buf, char *event_string) -{ - __cdf_nbuf_trace_update(buf, event_string); -} - -/** - * cdf_nbuf_set_tx_parallel_dnload_frm() - set tx parallel download - * @buf: Network buffer - * @candi: Candidate of parallel download frame - * - * This function stores a flag specifying this TX frame is suitable for - * downloading though a 2nd TX data pipe that is used for short frames for - * protocols that can accept out-of-order delivery. - * - * Return: none - */ -static inline void -cdf_nbuf_set_tx_parallel_dnload_frm(cdf_nbuf_t buf, uint8_t candi) -{ - __cdf_nbuf_set_tx_htt2_frm(buf, candi); -} - -/** - * cdf_nbuf_get_tx_parallel_dnload_frm() - get tx parallel download - * @buf: Network buffer - * - * This function return whether this TX frame is allow to download though a 2nd - * TX data pipe or not. - * - * Return: none - */ -static inline uint8_t cdf_nbuf_get_tx_parallel_dnload_frm(cdf_nbuf_t buf) -{ - return __cdf_nbuf_get_tx_htt2_frm(buf); -} - -/** - * cdf_invalidate_range() - invalidate the virtual address range specified by - * start and end addresses. - * Note: This does not write back the cache entries. - * - * Return: none - */ - -#ifdef MSM_PLATFORM -static inline void cdf_invalidate_range(void *start, void *end) -{ - dmac_inv_range(start, end); -} -#else -static inline void cdf_invalidate_range(void *start, void *end) -{ -} -#endif - -#if defined(FEATURE_TSO) -/** - * cdf_nbuf_reset_num_frags() - resets the number of frags to 0 (valid range: 0..1) - * @buf: Network buffer - * - * Return: Number of fragments - */ -static inline int cdf_nbuf_reset_num_frags(cdf_nbuf_t buf) -{ - return __cdf_nbuf_reset_num_frags(buf); -} - -/** - * cdf_nbuf_is_tso() - is the network buffer a jumbo packet? - * @buf: Network buffer - * - * Return: true - jumbo packet false - not a jumbo packet - */ -static inline bool cdf_nbuf_is_tso(cdf_nbuf_t nbuf) -{ - return __cdf_nbuf_is_tso(nbuf); -} - -/** - * cdf_nbuf_get_tso_info() - function to divide a jumbo TSO - * network buffer into segments - * @nbuf: network buffer to be segmented - * @tso_info: This is the output. The information about the - * TSO segments will be populated within this. - * - * This function fragments a TCP jumbo packet into smaller - * segments to be transmitted by the driver. It chains the TSO - * segments created into a list. - * - * Return: number of TSO segments - */ -static inline uint32_t cdf_nbuf_get_tso_info(qdf_device_t osdev, - cdf_nbuf_t nbuf, struct qdf_tso_info_t *tso_info) -{ - return __cdf_nbuf_get_tso_info(osdev, nbuf, tso_info); -} - -/** - * cdf_nbuf_get_tso_num_seg() - function to calculate the number - * of TCP segments within the TSO jumbo packet - * @nbuf: TSO jumbo network buffer to be segmented - * - * This function calculates the number of TCP segments that the - network buffer can be divided into. - * - * Return: number of TCP segments - */ -static inline uint32_t cdf_nbuf_get_tso_num_seg(cdf_nbuf_t nbuf) -{ - return __cdf_nbuf_get_tso_num_seg(nbuf); -} - -/** - * cdf_nbuf_inc_users() - function to increment the number of - * users referencing this network buffer - * - * @nbuf: network buffer - * - * This function increments the number of users referencing this - * network buffer - * - * Return: the network buffer - */ -static inline void cdf_nbuf_inc_users(cdf_nbuf_t nbuf) -{ - __cdf_nbuf_inc_users(nbuf); -} -#endif /*TSO*/ - -/** - * cdf_nbuf_data_attr_get() - Get data_attr field from cvg_nbuf_cb - * - * @nbuf: Network buffer (skb on linux) - * - * This function returns the values of data_attr field - * in struct cvg_nbuf_cb{}, to which skb->cb is typecast. - * This value is actually the value programmed in CE descriptor. - * - * Return: Value of data_attr - */ -static inline -uint32_t cdf_nbuf_data_attr_get(cdf_nbuf_t buf) -{ - return __cdf_nbuf_data_attr_get(buf); -} - -/** - * cdf_nbuf_data_attr_set() - Sets data_attr field in cvg_nbuf_cb - * - * @nbuf: Network buffer (skb on linux) - * @data_attr: Value to be stored cvg_nbuf_cb->data_attr - * - * This function stores the value to be programmed in CE - * descriptor as part skb->cb which is typecast to struct cvg_nbuf_cb{} - * - * Return: void - */ -static inline -void cdf_nbuf_data_attr_set(cdf_nbuf_t buf, uint32_t data_attr) -{ - __cdf_nbuf_data_attr_set(buf, data_attr); -} - -/** - * cdf_nbuf_tx_info_get() - Parse skb and get Tx metadata - * - * @nbuf: Network buffer (skb on linux) - * - * This function parses the payload to figure out relevant - * Tx meta-data e.g. whether to enable tx_classify bit - * in CE. - * - * Return: void - */ -#define cdf_nbuf_tx_info_get __cdf_nbuf_tx_info_get - -void cdf_nbuf_set_state(cdf_nbuf_t nbuf, uint8_t current_state); -void cdf_nbuf_tx_desc_count_display(void); -void cdf_nbuf_tx_desc_count_clear(void); - -#endif diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c deleted file mode 100644 index 2968d9dadee8..000000000000 --- a/core/cdf/src/cdf_nbuf.c +++ /dev/null @@ -1,1040 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: cdf_nbuf.c - * - * Connectivity driver framework(CDF) network buffer management APIs - */ - -#include -#include -#include -#include -#if defined(FEATURE_TSO) -#include -#include -#include -#endif /* FEATURE_TSO */ -#include -#include -#include -#include -#include -#include - -/* Packet Counter */ -static uint32_t nbuf_tx_mgmt[NBUF_TX_PKT_STATE_MAX]; -static uint32_t nbuf_tx_data[NBUF_TX_PKT_STATE_MAX]; - -/** - * cdf_nbuf_tx_desc_count_display() - Displays the packet counter - * - * Return: none - */ -void cdf_nbuf_tx_desc_count_display(void) -{ - qdf_print("Current Snapshot of the Driver:\n"); - qdf_print("Data Packets:\n"); - qdf_print("HDD %d TXRX_Q %d TXRX %d HTT %d", - nbuf_tx_data[NBUF_TX_PKT_HDD] - - (nbuf_tx_data[NBUF_TX_PKT_TXRX] + - nbuf_tx_data[NBUF_TX_PKT_TXRX_ENQUEUE] - - nbuf_tx_data[NBUF_TX_PKT_TXRX_DEQUEUE]), - nbuf_tx_data[NBUF_TX_PKT_TXRX_ENQUEUE] - - nbuf_tx_data[NBUF_TX_PKT_TXRX_DEQUEUE], - nbuf_tx_data[NBUF_TX_PKT_TXRX] - nbuf_tx_data[NBUF_TX_PKT_HTT], - nbuf_tx_data[NBUF_TX_PKT_HTT] - nbuf_tx_data[NBUF_TX_PKT_HTC]); - qdf_print(" HTC %d HIF %d CE %d TX_COMP %d\n", - nbuf_tx_data[NBUF_TX_PKT_HTC] - nbuf_tx_data[NBUF_TX_PKT_HIF], - nbuf_tx_data[NBUF_TX_PKT_HIF] - nbuf_tx_data[NBUF_TX_PKT_CE], - nbuf_tx_data[NBUF_TX_PKT_CE] - nbuf_tx_data[NBUF_TX_PKT_FREE], - nbuf_tx_data[NBUF_TX_PKT_FREE]); - qdf_print("Mgmt Packets:\n"); - qdf_print("TXRX_Q %d TXRX %d HTT %d HTC %d HIF %d CE %d TX_COMP %d\n", - nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_ENQUEUE] - - nbuf_tx_mgmt[NBUF_TX_PKT_TXRX_DEQUEUE], - nbuf_tx_mgmt[NBUF_TX_PKT_TXRX] - nbuf_tx_mgmt[NBUF_TX_PKT_HTT], - nbuf_tx_mgmt[NBUF_TX_PKT_HTT] - nbuf_tx_mgmt[NBUF_TX_PKT_HTC], - nbuf_tx_mgmt[NBUF_TX_PKT_HTC] - nbuf_tx_mgmt[NBUF_TX_PKT_HIF], - nbuf_tx_mgmt[NBUF_TX_PKT_HIF] - nbuf_tx_mgmt[NBUF_TX_PKT_CE], - nbuf_tx_mgmt[NBUF_TX_PKT_CE] - nbuf_tx_mgmt[NBUF_TX_PKT_FREE], - nbuf_tx_mgmt[NBUF_TX_PKT_FREE]); -} - -/** - * cdf_nbuf_tx_desc_count_update() - Updates the layer packet counter - * @packet_type : packet type either mgmt/data - * @current_state : layer at which the packet currently present - * - * Return: none - */ -static inline void cdf_nbuf_tx_desc_count_update(uint8_t packet_type, - uint8_t current_state) -{ - switch (packet_type) { - case NBUF_TX_PKT_MGMT_TRACK: - nbuf_tx_mgmt[current_state]++; - break; - case NBUF_TX_PKT_DATA_TRACK: - nbuf_tx_data[current_state]++; - break; - default: - break; - } -} - -/** - * cdf_nbuf_tx_desc_count_clear() - Clears packet counter for both data, mgmt - * - * Return: none - */ -void cdf_nbuf_tx_desc_count_clear(void) -{ - memset(nbuf_tx_mgmt, 0, sizeof(nbuf_tx_mgmt)); - memset(nbuf_tx_data, 0, sizeof(nbuf_tx_data)); -} - -/** - * cdf_nbuf_set_state() - Updates the packet state - * @nbuf: network buffer - * @current_state : layer at which the packet currently is - * - * This function updates the packet state to the layer at which the packet - * currently is - * - * Return: none - */ -void cdf_nbuf_set_state(cdf_nbuf_t nbuf, uint8_t current_state) -{ - /* - * Only Mgmt, Data Packets are tracked. WMI messages - * such as scan commands are not tracked - */ - uint8_t packet_type; - packet_type = NBUF_CB_TX_PACKET_TRACK(nbuf); - - if ((packet_type != NBUF_TX_PKT_DATA_TRACK) && - (packet_type != NBUF_TX_PKT_MGMT_TRACK)) { - return; - } - NBUF_CB_TX_PACKET_STATE(nbuf) = current_state; - cdf_nbuf_tx_desc_count_update(packet_type, - current_state); -} - -/* globals do not need to be initialized to NULL/0 */ -cdf_nbuf_trace_update_t trace_update_cb; - -/** - * __cdf_nbuf_alloc() - Allocate nbuf - * @hdl: Device handle - * @size: Netbuf requested size - * @reserve: Reserve - * @align: Align - * @prio: Priority - * - * This allocates an nbuf aligns if needed and reserves some space in the front, - * since the reserve is done after alignment the reserve value if being - * unaligned will result in an unaligned address. - * - * Return: nbuf or %NULL if no memory - */ -struct sk_buff *__cdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve, - int align, int prio) -{ - struct sk_buff *skb; - unsigned long offset; - - if (align) - size += (align - 1); - - skb = dev_alloc_skb(size); - - if (!skb) { - pr_err("ERROR:NBUF alloc failed\n"); - return NULL; - } - memset(skb->cb, 0x0, sizeof(skb->cb)); - - /* - * The default is for netbuf fragments to be interpreted - * as wordstreams rather than bytestreams. - */ - NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) = 1; - NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) = 1; - - /* - * XXX:how about we reserve first then align - * Align & make sure that the tail & data are adjusted properly - */ - - if (align) { - offset = ((unsigned long)skb->data) % align; - if (offset) - skb_reserve(skb, align - offset); - } - - /* - * NOTE:alloc doesn't take responsibility if reserve unaligns the data - * pointer - */ - skb_reserve(skb, reserve); - - return skb; -} - -/** - * __cdf_nbuf_free() - free the nbuf its interrupt safe - * @skb: Pointer to network buffer - * - * Return: none - */ -void __cdf_nbuf_free(struct sk_buff *skb) -{ - if (cdf_nbuf_ipa_owned_get(skb)) - /* IPA cleanup function will need to be called here */ - QDF_BUG(1); - else - dev_kfree_skb_any(skb); -} - -/** - * __cdf_nbuf_map() - get the dma map of the nbuf - * @osdev: OS device - * @bmap: Bitmap - * @skb: Pointer to network buffer - * @dir: Direction - * - * Return: QDF_STATUS - */ -QDF_STATUS -__cdf_nbuf_map(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) -{ -#ifdef CDF_OS_DEBUG - struct skb_shared_info *sh = skb_shinfo(skb); -#endif - qdf_assert((dir == QDF_DMA_TO_DEVICE) - || (dir == QDF_DMA_FROM_DEVICE)); - - /* - * Assume there's only a single fragment. - * To support multiple fragments, it would be necessary to change - * cdf_nbuf_t to be a separate object that stores meta-info - * (including the bus address for each fragment) and a pointer - * to the underlying sk_buff. - */ - qdf_assert(sh->nr_frags == 0); - - return __cdf_nbuf_map_single(osdev, skb, dir); - - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_nbuf_unmap() - to unmap a previously mapped buf - * @osdev: OS device - * @skb: Pointer to network buffer - * @dir: Direction - * - * Return: none - */ -void -__cdf_nbuf_unmap(qdf_device_t osdev, struct sk_buff *skb, qdf_dma_dir_t dir) -{ - qdf_assert((dir == QDF_DMA_TO_DEVICE) - || (dir == QDF_DMA_FROM_DEVICE)); - - qdf_assert(((dir == QDF_DMA_TO_DEVICE) - || (dir == QDF_DMA_FROM_DEVICE))); - /* - * Assume there's a single fragment. - * If this is not true, the assertion in __cdf_nbuf_map will catch it. - */ - __cdf_nbuf_unmap_single(osdev, skb, dir); -} - -/** - * __cdf_nbuf_map_single() - dma map of the nbuf - * @osdev: OS device - * @skb: Pointer to network buffer - * @dir: Direction - * - * Return: QDF_STATUS - */ -QDF_STATUS -__cdf_nbuf_map_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ - qdf_dma_addr_t paddr; - -/* tempory hack for simulation */ -#ifdef A_SIMOS_DEVHOST - NBUF_CB_PADDR(buf) = paddr = buf->data; - return QDF_STATUS_SUCCESS; -#else - /* assume that the OS only provides a single fragment */ - NBUF_CB_PADDR(buf) = paddr = - dma_map_single(osdev->dev, buf->data, - skb_end_pointer(buf) - buf->data, dir); - return dma_mapping_error(osdev->dev, paddr) - ? QDF_STATUS_E_FAILURE - : QDF_STATUS_SUCCESS; -#endif /* #ifdef A_SIMOS_DEVHOST */ -} - -/** - * __cdf_nbuf_unmap_single() - dma unmap nbuf - * @osdev: OS device - * @skb: Pointer to network buffer - * @dir: Direction - * - * Return: none - */ -void -__cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir) -{ -#if !defined(A_SIMOS_DEVHOST) - dma_unmap_single(osdev->dev, NBUF_CB_PADDR(buf), - skb_end_pointer(buf) - buf->data, dir); -#endif /* #if !defined(A_SIMOS_DEVHOST) */ -} - -/** - * __cdf_nbuf_set_rx_cksum() - set rx checksum - * @skb: Pointer to network buffer - * @cksum: Pointer to checksum value - * - * Return: QDF_STATUS - */ -QDF_STATUS -__cdf_nbuf_set_rx_cksum(struct sk_buff *skb, qdf_nbuf_rx_cksum_t *cksum) -{ - switch (cksum->l4_result) { - case QDF_NBUF_RX_CKSUM_NONE: - skb->ip_summed = CHECKSUM_NONE; - break; - case QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY: - skb->ip_summed = CHECKSUM_UNNECESSARY; - break; - case QDF_NBUF_RX_CKSUM_TCP_UDP_HW: - skb->ip_summed = CHECKSUM_PARTIAL; - skb->csum = cksum->val; - break; - default: - pr_err("ADF_NET:Unknown checksum type\n"); - qdf_assert(0); - return QDF_STATUS_E_NOSUPPORT; - } - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_nbuf_get_tx_cksum() - get tx checksum - * @skb: Pointer to network buffer - * - * Return: TX checksum value - */ -qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb) -{ - switch (skb->ip_summed) { - case CHECKSUM_NONE: - return QDF_NBUF_TX_CKSUM_NONE; - case CHECKSUM_PARTIAL: - /* XXX ADF and Linux checksum don't map with 1-to-1. This is - * not 100% correct */ - return QDF_NBUF_TX_CKSUM_TCP_UDP; - case CHECKSUM_COMPLETE: - return QDF_NBUF_TX_CKSUM_TCP_UDP_IP; - default: - return QDF_NBUF_TX_CKSUM_NONE; - } -} - -/** - * __cdf_nbuf_get_tid() - get tid - * @skb: Pointer to network buffer - * - * Return: tid - */ -uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb) -{ - return skb->priority; -} - -/** - * __cdf_nbuf_set_tid() - set tid - * @skb: Pointer to network buffer - * - * Return: none - */ -void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid) -{ - skb->priority = tid; -} - -/** - * __cdf_nbuf_set_tid() - set tid - * @skb: Pointer to network buffer - * - * Return: none - */ -uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb) -{ - return QDF_NBUF_EXEMPT_NO_EXEMPTION; -} - -/** - * __cdf_nbuf_reg_trace_cb() - register trace callback - * @cb_func_ptr: Pointer to trace callback function - * - * Return: none - */ -void __cdf_nbuf_reg_trace_cb(cdf_nbuf_trace_update_t cb_func_ptr) -{ - trace_update_cb = cb_func_ptr; - return; -} - -#ifdef QCA_PKT_PROTO_TRACE -/** - * __cdf_nbuf_trace_update() - update trace event - * @skb: Pointer to network buffer - * @event_string: Pointer to trace callback function - * - * Return: none - */ -void __cdf_nbuf_trace_update(struct sk_buff *buf, char *event_string) -{ - char string_buf[NBUF_PKT_TRAC_MAX_STRING]; - - if ((!trace_update_cb) || (!event_string)) - return; - - if (!cdf_nbuf_trace_get_proto_type(buf)) - return; - - /* Buffer over flow */ - if (NBUF_PKT_TRAC_MAX_STRING <= - (cdf_str_len(event_string) + NBUF_PKT_TRAC_PROTO_STRING)) { - return; - } - - qdf_mem_zero(string_buf, NBUF_PKT_TRAC_MAX_STRING); - qdf_mem_copy(string_buf, event_string, cdf_str_len(event_string)); - if (NBUF_PKT_TRAC_TYPE_EAPOL & cdf_nbuf_trace_get_proto_type(buf)) { - qdf_mem_copy(string_buf + cdf_str_len(event_string), - "EPL", NBUF_PKT_TRAC_PROTO_STRING); - } else if (NBUF_PKT_TRAC_TYPE_DHCP & cdf_nbuf_trace_get_proto_type(buf)) { - qdf_mem_copy(string_buf + cdf_str_len(event_string), - "DHC", NBUF_PKT_TRAC_PROTO_STRING); - } else if (NBUF_PKT_TRAC_TYPE_MGMT_ACTION & - cdf_nbuf_trace_get_proto_type(buf)) { - qdf_mem_copy(string_buf + cdf_str_len(event_string), - "MACT", NBUF_PKT_TRAC_PROTO_STRING); - } - - trace_update_cb(string_buf); - return; -} -#endif /* QCA_PKT_PROTO_TRACE */ - -#ifdef MEMORY_DEBUG -#define CDF_NET_BUF_TRACK_MAX_SIZE (1024) - -/** - * struct cdf_nbuf_track_t - Network buffer track structure - * - * @p_next: Pointer to next - * @net_buf: Pointer to network buffer - * @file_name: File name - * @line_num: Line number - * @size: Size - */ -struct cdf_nbuf_track_t { - struct cdf_nbuf_track_t *p_next; - cdf_nbuf_t net_buf; - uint8_t *file_name; - uint32_t line_num; - size_t size; -}; - -spinlock_t g_cdf_net_buf_track_lock; -typedef struct cdf_nbuf_track_t CDF_NBUF_TRACK; - -CDF_NBUF_TRACK *gp_cdf_net_buf_track_tbl[CDF_NET_BUF_TRACK_MAX_SIZE]; - -/** - * cdf_net_buf_debug_init() - initialize network buffer debug functionality - * - * CDF network buffer debug feature tracks all SKBs allocated by WLAN driver - * in a hash table and when driver is unloaded it reports about leaked SKBs. - * WLAN driver module whose allocated SKB is freed by network stack are - * suppose to call cdf_net_buf_debug_release_skb() such that the SKB is not - * reported as memory leak. - * - * Return: none - */ -void cdf_net_buf_debug_init(void) -{ - uint32_t i; - unsigned long irq_flag; - - spin_lock_init(&g_cdf_net_buf_track_lock); - - spin_lock_irqsave(&g_cdf_net_buf_track_lock, irq_flag); - - for (i = 0; i < CDF_NET_BUF_TRACK_MAX_SIZE; i++) - gp_cdf_net_buf_track_tbl[i] = NULL; - - spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); - - return; -} - -/** - * cdf_net_buf_debug_init() - exit network buffer debug functionality - * - * Exit network buffer tracking debug functionality and log SKB memory leaks - * - * Return: none - */ -void cdf_net_buf_debug_exit(void) -{ - uint32_t i; - unsigned long irq_flag; - CDF_NBUF_TRACK *p_node; - CDF_NBUF_TRACK *p_prev; - - spin_lock_irqsave(&g_cdf_net_buf_track_lock, irq_flag); - - for (i = 0; i < CDF_NET_BUF_TRACK_MAX_SIZE; i++) { - p_node = gp_cdf_net_buf_track_tbl[i]; - while (p_node) { - p_prev = p_node; - p_node = p_node->p_next; - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, - "SKB buf memory Leak@ File %s, @Line %d, size %zu\n", - p_prev->file_name, p_prev->line_num, - p_prev->size); - } - } - - spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); - - return; -} - -/** - * cdf_net_buf_debug_clean() - clean up network buffer debug functionality - * - * Return: none - */ -void cdf_net_buf_debug_clean(void) -{ - uint32_t i; - unsigned long irq_flag; - CDF_NBUF_TRACK *p_node; - CDF_NBUF_TRACK *p_prev; - - spin_lock_irqsave(&g_cdf_net_buf_track_lock, irq_flag); - - for (i = 0; i < CDF_NET_BUF_TRACK_MAX_SIZE; i++) { - p_node = gp_cdf_net_buf_track_tbl[i]; - while (p_node) { - p_prev = p_node; - p_node = p_node->p_next; - qdf_mem_free(p_prev); - } - } - - spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); - - return; -} - -/** - * cdf_net_buf_debug_hash() - hash network buffer pointer - * - * Return: hash value - */ -uint32_t cdf_net_buf_debug_hash(cdf_nbuf_t net_buf) -{ - uint32_t i; - - i = (uint32_t) ((uintptr_t) net_buf & (CDF_NET_BUF_TRACK_MAX_SIZE - 1)); - - return i; -} - -/** - * cdf_net_buf_debug_look_up() - look up network buffer in debug hash table - * - * Return: If skb is found in hash table then return pointer to network buffer - * else return %NULL - */ -CDF_NBUF_TRACK *cdf_net_buf_debug_look_up(cdf_nbuf_t net_buf) -{ - uint32_t i; - CDF_NBUF_TRACK *p_node; - - i = cdf_net_buf_debug_hash(net_buf); - p_node = gp_cdf_net_buf_track_tbl[i]; - - while (p_node) { - if (p_node->net_buf == net_buf) - return p_node; - p_node = p_node->p_next; - } - - return NULL; - -} - -/** - * cdf_net_buf_debug_add_node() - store skb in debug hash table - * - * Return: none - */ -void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size, - uint8_t *file_name, uint32_t line_num) -{ - uint32_t i; - unsigned long irq_flag; - CDF_NBUF_TRACK *p_node; - - spin_lock_irqsave(&g_cdf_net_buf_track_lock, irq_flag); - - i = cdf_net_buf_debug_hash(net_buf); - p_node = cdf_net_buf_debug_look_up(net_buf); - - if (p_node) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "Double allocation of skb ! Already allocated from %s %d", - p_node->file_name, p_node->line_num); - QDF_ASSERT(0); - goto done; - } else { - p_node = (CDF_NBUF_TRACK *) qdf_mem_malloc(sizeof(*p_node)); - if (p_node) { - p_node->net_buf = net_buf; - p_node->file_name = file_name; - p_node->line_num = line_num; - p_node->size = size; - p_node->p_next = gp_cdf_net_buf_track_tbl[i]; - gp_cdf_net_buf_track_tbl[i] = p_node; - } else { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "Mem alloc failed ! Could not track skb from %s %d of size %zu", - file_name, line_num, size); - QDF_ASSERT(0); - } - } - -done: - spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); - - return; -} - -/** - * cdf_net_buf_debug_delete_node() - remove skb from debug hash table - * - * Return: none - */ -void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf) -{ - uint32_t i; - bool found = false; - CDF_NBUF_TRACK *p_head; - CDF_NBUF_TRACK *p_node; - unsigned long irq_flag; - CDF_NBUF_TRACK *p_prev; - - spin_lock_irqsave(&g_cdf_net_buf_track_lock, irq_flag); - - i = cdf_net_buf_debug_hash(net_buf); - p_head = gp_cdf_net_buf_track_tbl[i]; - - /* Unallocated SKB */ - if (!p_head) - goto done; - - p_node = p_head; - /* Found at head of the table */ - if (p_head->net_buf == net_buf) { - gp_cdf_net_buf_track_tbl[i] = p_node->p_next; - qdf_mem_free((void *)p_node); - found = true; - goto done; - } - - /* Search in collision list */ - while (p_node) { - p_prev = p_node; - p_node = p_node->p_next; - if ((NULL != p_node) && (p_node->net_buf == net_buf)) { - p_prev->p_next = p_node->p_next; - qdf_mem_free((void *)p_node); - found = true; - break; - } - } - -done: - if (!found) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "Unallocated buffer ! Double free of net_buf %p ?", - net_buf); - QDF_ASSERT(0); - } - - spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag); - - return; -} - -/** - * cdf_net_buf_debug_release_skb() - release skb to avoid memory leak - * - * WLAN driver module whose allocated SKB is freed by network stack are - * suppose to call this API before returning SKB to network stack such - * that the SKB is not reported as memory leak. - * - * Return: none - */ -void cdf_net_buf_debug_release_skb(cdf_nbuf_t net_buf) -{ - cdf_net_buf_debug_delete_node(net_buf); -} - -#endif /*MEMORY_DEBUG */ -#if defined(FEATURE_TSO) - -struct cdf_tso_cmn_seg_info_t { - uint16_t ethproto; - uint16_t ip_tcp_hdr_len; - uint16_t l2_len; - unsigned char *eit_hdr; - unsigned int eit_hdr_len; - struct tcphdr *tcphdr; - uint16_t ipv4_csum_en; - uint16_t tcp_ipv4_csum_en; - uint16_t tcp_ipv6_csum_en; - uint16_t ip_id; - uint32_t tcp_seq_num; -}; - -/** - * __cdf_nbuf_get_tso_cmn_seg_info() - get TSO common - * information - * - * Get the TSO information that is common across all the TCP - * segments of the jumbo packet - * - * Return: 0 - success 1 - failure - */ -uint8_t __cdf_nbuf_get_tso_cmn_seg_info(struct sk_buff *skb, - struct cdf_tso_cmn_seg_info_t *tso_info) -{ - /* Get ethernet type and ethernet header length */ - tso_info->ethproto = vlan_get_protocol(skb); - - /* Determine whether this is an IPv4 or IPv6 packet */ - if (tso_info->ethproto == htons(ETH_P_IP)) { /* IPv4 */ - /* for IPv4, get the IP ID and enable TCP and IP csum */ - struct iphdr *ipv4_hdr = ip_hdr(skb); - tso_info->ip_id = ntohs(ipv4_hdr->id); - tso_info->ipv4_csum_en = 1; - tso_info->tcp_ipv4_csum_en = 1; - if (qdf_unlikely(ipv4_hdr->protocol != IPPROTO_TCP)) { - qdf_print("TSO IPV4 proto 0x%x not TCP\n", - ipv4_hdr->protocol); - return 1; - } - } else if (tso_info->ethproto == htons(ETH_P_IPV6)) { /* IPv6 */ - /* for IPv6, enable TCP csum. No IP ID or IP csum */ - tso_info->tcp_ipv6_csum_en = 1; - } else { - qdf_print("TSO: ethertype 0x%x is not supported!\n", - tso_info->ethproto); - return 1; - } - - tso_info->l2_len = (skb_network_header(skb) - skb_mac_header(skb)); - tso_info->tcphdr = tcp_hdr(skb); - tso_info->tcp_seq_num = ntohl(tcp_hdr(skb)->seq); - /* get pointer to the ethernet + IP + TCP header and their length */ - tso_info->eit_hdr = skb->data; - tso_info->eit_hdr_len = (skb_transport_header(skb) - - skb_mac_header(skb)) + tcp_hdrlen(skb); - tso_info->ip_tcp_hdr_len = tso_info->eit_hdr_len - tso_info->l2_len; - return 0; -} - -/** - * cdf_dmaaddr_to_32s - return high and low parts of dma_addr - * - * Returns the high and low 32-bits of the DMA addr in the provided ptrs - * - * Return: N/A -*/ -static inline void cdf_dmaaddr_to_32s(qdf_dma_addr_t dmaaddr, - uint32_t *lo, uint32_t *hi) -{ - if (sizeof(dmaaddr) > sizeof(uint32_t)) { - *lo = (uint32_t) (dmaaddr & 0x0ffffffff); - *hi = (uint32_t) (dmaaddr >> 32); - } else { - *lo = dmaaddr; - *hi = 0; - } -} -/** - * __cdf_nbuf_get_tso_info() - function to divide a TSO nbuf - * into segments - * @nbuf: network buffer to be segmented - * @tso_info: This is the output. The information about the - * TSO segments will be populated within this. - * - * This function fragments a TCP jumbo packet into smaller - * segments to be transmitted by the driver. It chains the TSO - * segments created into a list. - * - * Return: number of TSO segments - */ -uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, - struct qdf_tso_info_t *tso_info) -{ - /* common accross all segments */ - struct cdf_tso_cmn_seg_info_t tso_cmn_info; - - /* segment specific */ - char *tso_frag_vaddr; - qdf_dma_addr_t tso_frag_paddr = 0; - uint32_t tso_frag_paddr_lo, tso_frag_paddr_hi; - uint32_t num_seg = 0; - struct cdf_tso_seg_elem_t *curr_seg; - const struct skb_frag_struct *frag = NULL; - uint32_t tso_frag_len = 0; /* tso segment's fragment length*/ - uint32_t skb_frag_len = 0; /* skb's fragment length (continous memory)*/ - uint32_t foffset = 0; /* offset into the skb's fragment */ - uint32_t skb_proc = 0; /* bytes of the skb that have been processed*/ - uint32_t tso_seg_size = skb_shinfo(skb)->gso_size; - - memset(&tso_cmn_info, 0x0, sizeof(tso_cmn_info)); - - if (qdf_unlikely(__cdf_nbuf_get_tso_cmn_seg_info(skb, &tso_cmn_info))) { - qdf_print("TSO: error getting common segment info\n"); - return 0; - } - curr_seg = tso_info->tso_seg_list; - - /* length of the first chunk of data in the skb */ - skb_proc = skb_frag_len = skb_headlen(skb); - - /* the 0th tso segment's 0th fragment always contains the EIT header */ - /* update the remaining skb fragment length and TSO segment length */ - skb_frag_len -= tso_cmn_info.eit_hdr_len; - skb_proc -= tso_cmn_info.eit_hdr_len; - - /* get the address to the next tso fragment */ - tso_frag_vaddr = skb->data + tso_cmn_info.eit_hdr_len; - /* get the length of the next tso fragment */ - tso_frag_len = min(skb_frag_len, tso_seg_size); - tso_frag_paddr = dma_map_single(osdev->dev, - tso_frag_vaddr, tso_frag_len, DMA_TO_DEVICE); - cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); - - num_seg = tso_info->num_segs; - tso_info->num_segs = 0; - tso_info->is_tso = 1; - - while (num_seg && curr_seg) { - int i = 1; /* tso fragment index */ - int j = 0; /* skb fragment index */ - uint8_t more_tso_frags = 1; - uint8_t from_frag_table = 0; - - /* Initialize the flags to 0 */ - memset(&curr_seg->seg, 0x0, sizeof(curr_seg->seg)); - tso_info->num_segs++; - - /* The following fields remain the same across all segments of - a jumbo packet */ - curr_seg->seg.tso_flags.tso_enable = 1; - curr_seg->seg.tso_flags.partial_checksum_en = 0; - curr_seg->seg.tso_flags.ipv4_checksum_en = - tso_cmn_info.ipv4_csum_en; - curr_seg->seg.tso_flags.tcp_ipv6_checksum_en = - tso_cmn_info.tcp_ipv6_csum_en; - curr_seg->seg.tso_flags.tcp_ipv4_checksum_en = - tso_cmn_info.tcp_ipv4_csum_en; - curr_seg->seg.tso_flags.l2_len = 0; - curr_seg->seg.tso_flags.tcp_flags_mask = 0x1FF; - curr_seg->seg.num_frags = 0; - - /* The following fields change for the segments */ - curr_seg->seg.tso_flags.ip_id = tso_cmn_info.ip_id; - tso_cmn_info.ip_id++; - - curr_seg->seg.tso_flags.syn = tso_cmn_info.tcphdr->syn; - curr_seg->seg.tso_flags.rst = tso_cmn_info.tcphdr->rst; - curr_seg->seg.tso_flags.psh = tso_cmn_info.tcphdr->psh; - curr_seg->seg.tso_flags.ack = tso_cmn_info.tcphdr->ack; - curr_seg->seg.tso_flags.urg = tso_cmn_info.tcphdr->urg; - curr_seg->seg.tso_flags.ece = tso_cmn_info.tcphdr->ece; - curr_seg->seg.tso_flags.cwr = tso_cmn_info.tcphdr->cwr; - - curr_seg->seg.tso_flags.tcp_seq_num = tso_cmn_info.tcp_seq_num; - - /* First fragment for each segment always contains the ethernet, - IP and TCP header */ - curr_seg->seg.tso_frags[0].vaddr = tso_cmn_info.eit_hdr; - curr_seg->seg.tso_frags[0].length = tso_cmn_info.eit_hdr_len; - tso_info->total_len = curr_seg->seg.tso_frags[0].length; - { - qdf_dma_addr_t mapped; - uint32_t lo, hi; - - mapped = dma_map_single(osdev->dev, tso_cmn_info.eit_hdr, - tso_cmn_info.eit_hdr_len, DMA_TO_DEVICE); - cdf_dmaaddr_to_32s(mapped, &lo, &hi); - curr_seg->seg.tso_frags[0].paddr_low_32 = lo; - curr_seg->seg.tso_frags[0].paddr_upper_16 = (hi & 0xffff); - } - curr_seg->seg.tso_flags.ip_len = tso_cmn_info.ip_tcp_hdr_len; - curr_seg->seg.num_frags++; - - while (more_tso_frags) { - curr_seg->seg.tso_frags[i].vaddr = tso_frag_vaddr; - curr_seg->seg.tso_frags[i].length = tso_frag_len; - tso_info->total_len += - curr_seg->seg.tso_frags[i].length; - curr_seg->seg.tso_flags.ip_len += - curr_seg->seg.tso_frags[i].length; - curr_seg->seg.num_frags++; - skb_proc = skb_proc - curr_seg->seg.tso_frags[i].length; - - /* increment the TCP sequence number */ - tso_cmn_info.tcp_seq_num += tso_frag_len; - curr_seg->seg.tso_frags[i].paddr_upper_16 = - (tso_frag_paddr_hi & 0xffff); - curr_seg->seg.tso_frags[i].paddr_low_32 = - tso_frag_paddr_lo; - - /* if there is no more data left in the skb */ - if (!skb_proc) - return tso_info->num_segs; - - /* get the next payload fragment information */ - /* check if there are more fragments in this segment */ - if ((tso_seg_size - tso_frag_len)) { - more_tso_frags = 1; - i++; - } else { - more_tso_frags = 0; - /* reset i and the tso payload size */ - i = 1; - tso_seg_size = skb_shinfo(skb)->gso_size; - } - - /* if the next fragment is contiguous */ - if (tso_frag_len < skb_frag_len) { - skb_frag_len = skb_frag_len - tso_frag_len; - tso_frag_len = min(skb_frag_len, tso_seg_size); - tso_frag_vaddr = tso_frag_vaddr + tso_frag_len; - if (from_frag_table) { - tso_frag_paddr = - skb_frag_dma_map(osdev->dev, - frag, foffset, - tso_frag_len, - DMA_TO_DEVICE); - cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); - } else { - tso_frag_paddr = - dma_map_single(osdev->dev, - tso_frag_vaddr, - tso_frag_len, - DMA_TO_DEVICE); - cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); - } - } else { /* the next fragment is not contiguous */ - tso_frag_len = min(skb_frag_len, tso_seg_size); - frag = &skb_shinfo(skb)->frags[j]; - skb_frag_len = skb_frag_size(frag); - - tso_frag_vaddr = skb_frag_address(frag); - tso_frag_paddr = skb_frag_dma_map(osdev->dev, - frag, 0, tso_frag_len, - DMA_TO_DEVICE); - cdf_dmaaddr_to_32s(tso_frag_paddr, &tso_frag_paddr_lo, &tso_frag_paddr_hi); - foffset += tso_frag_len; - from_frag_table = 1; - j++; - } - } - num_seg--; - /* if TCP FIN flag was set, set it in the last segment */ - if (!num_seg) - curr_seg->seg.tso_flags.fin = tso_cmn_info.tcphdr->fin; - - curr_seg = curr_seg->next; - } - return tso_info->num_segs; -} - -/** - * __cdf_nbuf_get_tso_num_seg() - function to divide a TSO nbuf - * into segments - * @nbuf: network buffer to be segmented - * @tso_info: This is the output. The information about the - * TSO segments will be populated within this. - * - * This function fragments a TCP jumbo packet into smaller - * segments to be transmitted by the driver. It chains the TSO - * segments created into a list. - * - * Return: 0 - success, 1 - failure - */ -uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb) -{ - uint32_t gso_size, tmp_len, num_segs = 0; - - gso_size = skb_shinfo(skb)->gso_size; - tmp_len = skb->len - ((skb_transport_header(skb) - skb_mac_header(skb)) - + tcp_hdrlen(skb)); - while (tmp_len) { - num_segs++; - if (tmp_len > gso_size) - tmp_len -= gso_size; - else - break; - } - return num_segs; -} - -#endif /* FEATURE_TSO */ diff --git a/core/cdf/src/i_cdf_nbuf.h b/core/cdf/src/i_cdf_nbuf.h deleted file mode 100644 index 160a5ff47f7c..000000000000 --- a/core/cdf/src/i_cdf_nbuf.h +++ /dev/null @@ -1,1056 +0,0 @@ -/* - * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * DOC: i_cdf_nbuf.h - * - * Linux implementation of skbuf - */ -#ifndef _I_CDF_NET_BUF_H -#define _I_CDF_NET_BUF_H - -#include -#include -#include -#include -#include -#include - -/* - * Use socket buffer as the underlying implentation as skbuf . - * Linux use sk_buff to represent both packet and data, - * so we use sk_buffer to represent both skbuf . - */ -typedef struct sk_buff *__cdf_nbuf_t; - -/* NBUFCB_TX_MAX_OS_FRAGS - * max tx fragments provided by the OS - */ -#define NBUF_CB_TX_MAX_OS_FRAGS 1 - -/* NBUF_CB_TX_MAX_EXTRA_FRAGS - - * max tx fragments added by the driver - * The driver will always add one tx fragment (the tx descriptor) - */ -#define NBUF_CB_TX_MAX_EXTRA_FRAGS 2 - -/* - * Make sure that qdf_dma_addr_t in the cb block is always 64 bit aligned - */ -typedef union { - uint64_t u64; - qdf_dma_addr_t dma_addr; -} cdf_paddr_t; - -/** - * struct cdf_nbuf_cb - network buffer control block contents (skb->cb) - * - data passed between layers of the driver. - * - * Notes: - * 1. Hard limited to 48 bytes. Please count your bytes - * 2. The size of this structure has to be easily calculatable and - * consistently so: do not use any conditional compile flags - * 3. Split into a common part followed by a tx/rx overlay - * 4. There is only one extra frag, which represents the HTC/HTT header - * - * @common.paddr : physical addressed retrived by dma_map of nbuf->data - * @rx.lro_flags : hardware assisted flags: - * @rx.lro_eligible : flag to indicate whether the MSDU is LRO eligible - * @rx.tcp_proto : L4 protocol is TCP - * @rx.tcp_pure_ack : A TCP ACK packet with no payload - * @rx.ipv6_proto : L3 protocol is IPV6 - * @rx.ip_offset : offset to IP header - * @rx.tcp_offset : offset to TCP header - * @rx.tcp_udp_chksum : L4 payload checksum - * @rx.tcp_seq_num : TCP sequence number - * @rx.tcp_ack_num : TCP ACK number - * @rx.flow_id_toeplitz: 32-bit 5-tuple Toeplitz hash - * @tx.extra_frag : represent HTC/HTT header - * @tx.efrag.vaddr : virtual address of ~ - * @tx.efrag.paddr : physical/DMA address of ~ - * @tx.efrag.len : length of efrag pointed by the above pointers - * @tx.efrag.num : number of extra frags ( 0 or 1) - * @tx.efrag.flags.nbuf : flag, nbuf payload to be swapped (wordstream) - * @tx.efrag.flags.efrag : flag, efrag payload to be swapped (wordstream) - * @tx.efrag.flags.chfrag_start: used by WIN - * @tx.efrags.flags.chfrag_end: used by WIN - * @tx.data_attr : value that is programmed into CE descr, includes: - * + (1) CE classification enablement bit - * + (2) packet type (802.3 or Ethernet type II) - * + (3) packet offset (usually length of HTC/HTT descr) - * @tx.trace : combined structure for DP and protocol trace - * @tx.trace.packet_state: {NBUF_TX_PKT_[(HDD)|(TXRX_ENQUEUE)|(TXRX_DEQUEUE)| - * + (TXRX)|(HTT)|(HTC)|(HIF)|(CE)|(FREE)] - * @tx.trace.packet_track: {NBUF_TX_PKT_[(DATA)|(MGMT)]_TRACK} - * @tx.trace.proto_type : bitmap of NBUF_PKT_TRAC_TYPE[(EAPOL)|(DHCP)| - * + (MGMT_ACTION)] - 4 bits - * @tx.trace.dp_trace : flag (Datapath trace) - * @tx.trace.htt2_frm : flag (high-latency path only) - * @tx.trace.vdev_id : vdev (for protocol trace) - * @tx.ipa.owned : packet owned by IPA - * @tx.ipa.priv : private data, used by IPA - */ -struct cdf_nbuf_cb { - /* common */ - cdf_paddr_t paddr; /* of skb->data */ - /* valid only in one direction */ - union { - /* Note: MAX: 40 bytes */ - struct { - uint32_t lro_eligible:1, - tcp_proto:1, - tcp_pure_ack:1, - ipv6_proto:1, - ip_offset:7, - tcp_offset:7; - uint32_t tcp_udp_chksum:16, - tcp_win:16; - uint32_t tcp_seq_num; - uint32_t tcp_ack_num; - uint32_t flow_id_toeplitz; - } rx; /* 20 bytes */ - - /* Note: MAX: 40 bytes */ - struct { - struct { - unsigned char *vaddr; - cdf_paddr_t paddr; - uint16_t len; - uint8_t num; /* 0: cmn.addr; 1: tx.efrag */ - union { - struct { - uint8_t flag_efrag:1, - flag_nbuf:1, - /* following for WIN */ - flag_chfrag_start:1, - flag_chfrag_end:1, - reserved:4; - } bits; - uint8_t u8; - } flags; - } extra_frag; /* 20 bytes */ - uint32_t data_attr; /* 4 bytes */ - union { - struct { - uint8_t packet_state; - uint8_t packet_track:4, - proto_type:4; - uint8_t dp_trace:1, - htt2_frm:1, - rsrvd:6; - uint8_t vdev_id; - } hl; - struct { - uint8_t packet_state; - uint8_t packet_track:4, - proto_type:4; - uint8_t dp_trace:1, - rsrvd:7; - uint8_t vdev_id; - } ll; /* low latency */ - } trace; /* 4 bytes */ - struct { - uint32_t owned:1, - priv:31; - } ipa; /* 4 */ - } tx; /* 32 bytes */ - } u; -}; /* struct cdf_nbuf_cb: MAX 48 bytes */ - -/** - * access macros to cdf_nbuf_cb - * Note: These macros can be used as L-values as well as R-values. - * When used as R-values, they effectively function as "get" macros - * When used as L_values, they effectively function as "set" macros - */ -#define NBUF_CB_PADDR(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->paddr.dma_addr) -#define NBUF_CB_RX_LRO_ELIGIBLE(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.lro_eligible) -#define NBUF_CB_RX_TCP_PROTO(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_proto) -#define NBUF_CB_RX_TCP_PURE_ACK(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_pure_ack) -#define NBUF_CB_RX_IPV6_PROTO(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.ipv6_proto) -#define NBUF_CB_RX_IP_OFFSET(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.ip_offset) -#define NBUF_CB_RX_TCP_OFFSET(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_offset) -#define NBUF_CB_RX_TCP_CHKSUM(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_udp_chksum) -#define NBUF_CB_RX_TCP_OFFSET(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_offset) -#define NBUF_CB_RX_TCP_WIN(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_win) -#define NBUF_CB_RX_TCP_SEQ_NUM(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_seq_num) -#define NBUF_CB_RX_TCP_ACK_NUM(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.tcp_ack_num) -#define NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.rx.flow_id_toeplitz) - -#define NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.vaddr) -#define NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.paddr.dma_addr) -#define NBUF_CB_TX_EXTRA_FRAG_LEN(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.len) -#define NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.num) -#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_FLAGS(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.u8) -#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.bits.flag_efrag) -#define NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.extra_frag.flags.bits.flag_nbuf) -#define NBUF_CB_TX_DATA_ATTR(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.data_attr) -#define NBUF_CB_TX_PACKET_STATE(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.packet_state) -#define NBUF_CB_TX_PACKET_TRACK(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.packet_track) -#define NBUF_CB_TX_PROTO_TYPE(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.proto_type) -#define NBUF_UPDATE_TX_PKT_COUNT(skb, PACKET_STATE) \ - cdf_nbuf_set_state(skb, PACKET_STATE) -#define NBUF_CB_TX_DP_TRACE(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.dp_trace) -#define NBUF_CB_TX_HL_HTT2_FRM(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.hl.htt2_frm) -#define NBUF_CB_TX_VDEV_ID(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.trace.ll.vdev_id) -#define NBUF_CB_TX_IPA_OWNED(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.ipa.owned) -#define NBUF_CB_TX_IPA_PRIV(skb) \ - (((struct cdf_nbuf_cb *)((skb)->cb))->u.tx.ipa.priv) - -#define __cdf_nbuf_get_num_frags(skb) \ - (NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) + 1) - -#if defined(FEATURE_TSO) -#define __cdf_nbuf_reset_num_frags(skb) \ - (NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) = 0) -#endif -/** - * end of nbuf->cb access macros - */ - -typedef void (*cdf_nbuf_trace_update_t)(char *); - -#define __cdf_nbuf_mapped_paddr_get(skb) \ - NBUF_CB_PADDR(skb) - -#define __cdf_nbuf_mapped_paddr_set(skb, paddr) \ - (NBUF_CB_PADDR(skb) = (paddr)) - -#define __cdf_nbuf_frag_push_head( \ - skb, frag_len, frag_vaddr, frag_paddr) \ - do { \ - NBUF_CB_TX_NUM_EXTRA_FRAGS(skb) = 1; \ - NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) = frag_vaddr; \ - NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) = frag_paddr; \ - NBUF_CB_TX_EXTRA_FRAG_LEN(skb) = frag_len; \ - } while (0) - -#define __cdf_nbuf_get_frag_vaddr(skb, frag_num) \ - ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_CB_TX_EXTRA_FRAG_VADDR(skb) : ((skb)->data)) - -#define __cdf_nbuf_get_frag_paddr(skb, frag_num) \ - ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_CB_TX_EXTRA_FRAG_PADDR(skb) : \ - /* assume that the OS only provides a single fragment */ \ - NBUF_CB_PADDR(skb)) - -#define __cdf_nbuf_get_frag_len(skb, frag_num) \ - ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) ? \ - NBUF_CB_TX_EXTRA_FRAG_LEN(skb) : (skb)->len) - -#define __cdf_nbuf_get_frag_is_wordstream(skb, frag) \ - ((frag_num < NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) \ - ? (NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb)) \ - : (NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb))) - -#define __cdf_nbuf_set_frag_is_wordstream(skb, frag_num, is_wstrm) \ - do { \ - if (frag_num >= NBUF_CB_TX_NUM_EXTRA_FRAGS(skb)) \ - frag_num = NBUF_CB_TX_MAX_EXTRA_FRAGS; \ - if (frag_num) \ - NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) = is_wstrm; \ - else \ - NBUF_CB_TX_EXTRA_FRAG_WORDSTR_NBUF(skb) = is_wstrm; \ - } while (0) - -#define __cdf_nbuf_trace_set_proto_type(skb, proto_type) \ - (NBUF_CB_TX_PROTO_TYPE(skb) = (proto_type)) -#define __cdf_nbuf_trace_get_proto_type(skb) \ - NBUF_CB_TX_PROTO_TYPE(skb) - -#define __cdf_nbuf_data_attr_get(skb) \ - NBUF_CB_TX_DATA_ATTR(skb) -#define __cdf_nbuf_data_attr_set(skb, data_attr) \ - (NBUF_CB_TX_DATA_ATTR(skb) = (data_attr)) - -#define __cdf_nbuf_ipa_owned_get(skb) \ - NBUF_CB_TX_IPA_OWNED(skb) - -#define __cdf_nbuf_ipa_owned_set(skb) \ - (NBUF_CB_TX_IPA_OWNED(skb) = 1) - -#define __cdf_nbuf_ipa_priv_get(skb) \ - NBUF_CB_TX_IPA_PRIV(skb) - -#define __cdf_nbuf_ipa_priv_set(skb, priv) \ - (NBUF_CB_TX_IPA_PRIV(skb) = (priv)) - -/* - * prototypes. Implemented in cdf_nbuf.c - */ -__cdf_nbuf_t __cdf_nbuf_alloc(__qdf_device_t osdev, size_t size, int reserve, - int align, int prio); -void __cdf_nbuf_free(struct sk_buff *skb); -QDF_STATUS __cdf_nbuf_map(__qdf_device_t osdev, - struct sk_buff *skb, qdf_dma_dir_t dir); -void __cdf_nbuf_unmap(__qdf_device_t osdev, - struct sk_buff *skb, qdf_dma_dir_t dir); -QDF_STATUS __cdf_nbuf_map_single(__qdf_device_t osdev, - struct sk_buff *skb, qdf_dma_dir_t dir); -void __cdf_nbuf_unmap_single(__qdf_device_t osdev, - struct sk_buff *skb, qdf_dma_dir_t dir); -void __cdf_nbuf_reg_trace_cb(cdf_nbuf_trace_update_t cb_func_ptr); - -#ifdef QCA_PKT_PROTO_TRACE -void __cdf_nbuf_trace_update(struct sk_buff *buf, char *event_string); -#else -#define __cdf_nbuf_trace_update(skb, event_string) -#endif /* QCA_PKT_PROTO_TRACE */ - -/** - * __cdf_os_to_status() - OS to CDF status conversion - * @error : OS error - * - * Return: CDF status - */ -static inline QDF_STATUS __cdf_os_to_status(signed int error) -{ - switch (error) { - case 0: - return QDF_STATUS_SUCCESS; - case ENOMEM: - case -ENOMEM: - return QDF_STATUS_E_NOMEM; - default: - return QDF_STATUS_E_NOSUPPORT; - } -} - -/** - * __cdf_nbuf_len() - return the amount of valid data in the skb - * @skb: Pointer to network buffer - * - * This API returns the amount of valid data in the skb, If there are frags - * then it returns total length. - * - * Return: network buffer length - */ -static inline size_t __cdf_nbuf_len(struct sk_buff *skb) -{ - int i, extra_frag_len = 0; - - i = NBUF_CB_TX_NUM_EXTRA_FRAGS(skb); - if (i > 0) - extra_frag_len = NBUF_CB_TX_EXTRA_FRAG_LEN(skb); - - return extra_frag_len + skb->len; -} - -/** - * __cdf_nbuf_cat() - link two nbufs - * @dst: Buffer to piggyback into - * @src: Buffer to put - * - * Link tow nbufs the new buf is piggybacked into the older one. The older - * (src) skb is released. - * - * Return: QDF_STATUS (status of the call) if failed the src skb - * is released - */ -static inline QDF_STATUS -__cdf_nbuf_cat(struct sk_buff *dst, struct sk_buff *src) -{ - QDF_STATUS error = 0; - - qdf_assert(dst && src); - - /* - * Since pskb_expand_head unconditionally reallocates the skb->head - * buffer, first check whether the current buffer is already large - * enough. - */ - if (skb_tailroom(dst) < src->len) { - error = pskb_expand_head(dst, 0, src->len, GFP_ATOMIC); - if (error) - return __cdf_os_to_status(error); - } - memcpy(skb_tail_pointer(dst), src->data, src->len); - - skb_put(dst, src->len); - dev_kfree_skb_any(src); - - return __cdf_os_to_status(error); -} - -/* - * nbuf manipulation routines - */ - -/** - * __cdf_nbuf_headroom() - return the amount of tail space available - * @buf: Pointer to network buffer - * - * Return: amount of tail room - */ -static inline int __cdf_nbuf_headroom(struct sk_buff *skb) -{ - return skb_headroom(skb); -} - -/** - * __cdf_nbuf_tailroom() - return the amount of tail space available - * @buf: Pointer to network buffer - * - * Return: amount of tail room - */ -static inline uint32_t __cdf_nbuf_tailroom(struct sk_buff *skb) -{ - return skb_tailroom(skb); -} - -/** - * __cdf_nbuf_push_head() - Push data in the front - * @skb: Pointer to network buffer - * @size: size to be pushed - * - * Return: New data pointer of this buf after data has been pushed, - * or NULL if there is not enough room in this buf. - */ -static inline uint8_t *__cdf_nbuf_push_head(struct sk_buff *skb, size_t size) -{ - if (NBUF_CB_PADDR(skb)) - NBUF_CB_PADDR(skb) -= size; - - return skb_push(skb, size); -} - -/** - * __cdf_nbuf_put_tail() - Puts data in the end - * @skb: Pointer to network buffer - * @size: size to be pushed - * - * Return: data pointer of this buf where new data has to be - * put, or NULL if there is not enough room in this buf. - */ -static inline uint8_t *__cdf_nbuf_put_tail(struct sk_buff *skb, size_t size) -{ - if (skb_tailroom(skb) < size) { - if (unlikely(pskb_expand_head(skb, 0, - size - skb_tailroom(skb), GFP_ATOMIC))) { - dev_kfree_skb_any(skb); - return NULL; - } - } - return skb_put(skb, size); -} - -/** - * __cdf_nbuf_pull_head() - pull data out from the front - * @skb: Pointer to network buffer - * @size: size to be popped - * - * Return: New data pointer of this buf after data has been popped, - * or NULL if there is not sufficient data to pull. - */ -static inline uint8_t *__cdf_nbuf_pull_head(struct sk_buff *skb, size_t size) -{ - if (NBUF_CB_PADDR(skb)) - NBUF_CB_PADDR(skb) += size; - - return skb_pull(skb, size); -} - -/** - * __cdf_nbuf_trim_tail() - trim data out from the end - * @skb: Pointer to network buffer - * @size: size to be popped - * - * Return: none - */ -static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size) -{ - return skb_trim(skb, skb->len - size); -} - - -/* - * prototypes. Implemented in cdf_nbuf.c - */ -qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb); -QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, - qdf_nbuf_rx_cksum_t *cksum); -uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb); -void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid); -uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb); - -/* - * cdf_nbuf_pool_delete() implementation - do nothing in linux - */ -#define __cdf_nbuf_pool_delete(osdev) - -/** - * __cdf_nbuf_clone() - clone the nbuf (copy is readonly) - * @skb: Pointer to network buffer - * - * if GFP_ATOMIC is overkill then we can check whether its - * called from interrupt context and then do it or else in - * normal case use GFP_KERNEL - * - * example use "in_irq() || irqs_disabled()" - * - * Return: cloned skb - */ -static inline struct sk_buff *__cdf_nbuf_clone(struct sk_buff *skb) -{ - return skb_clone(skb, GFP_ATOMIC); -} - -/** - * __cdf_nbuf_copy() - returns a private copy of the skb - * @skb: Pointer to network buffer - * - * This API returns a private copy of the skb, the skb returned is completely - * modifiable by callers - * - * Return: skb or NULL - */ -static inline struct sk_buff *__cdf_nbuf_copy(struct sk_buff *skb) -{ - return skb_copy(skb, GFP_ATOMIC); -} - -#define __cdf_nbuf_reserve skb_reserve - -/***********************XXX: misc api's************************/ - -/** - * __cdf_nbuf_head() - return the pointer the skb's head pointer - * @skb: Pointer to network buffer - * - * Return: Pointer to head buffer - */ -static inline uint8_t *__cdf_nbuf_head(struct sk_buff *skb) -{ - return skb->head; -} - -/** - * __cdf_nbuf_data() - return the pointer to data header in the skb - * @skb: Pointer to network buffer - * - * Return: Pointer to skb data - */ -static inline uint8_t *__cdf_nbuf_data(struct sk_buff *skb) -{ - return skb->data; -} - -/** - * __cdf_nbuf_get_protocol() - return the protocol value of the skb - * @skb: Pointer to network buffer - * - * Return: skb protocol - */ -static inline uint16_t __cdf_nbuf_get_protocol(struct sk_buff *skb) -{ - return skb->protocol; -} - -/** - * __cdf_nbuf_get_ip_summed() - return the ip checksum value of the skb - * @skb: Pointer to network buffer - * - * Return: skb ip_summed - */ -static inline uint8_t __cdf_nbuf_get_ip_summed(struct sk_buff *skb) -{ - return skb->ip_summed; -} - -/** - * __cdf_nbuf_set_ip_summed() - sets the ip_summed value of the skb - * @skb: Pointer to network buffer - * @ip_summed: ip checksum - * - * Return: none - */ -static inline void __cdf_nbuf_set_ip_summed(struct sk_buff *skb, uint8_t ip_summed) -{ - skb->ip_summed = ip_summed; -} - -/** - * __cdf_nbuf_get_priority() - return the priority value of the skb - * @skb: Pointer to network buffer - * - * Return: skb priority - */ -static inline uint32_t __cdf_nbuf_get_priority(struct sk_buff *skb) -{ - return skb->priority; -} - -/** - * __cdf_nbuf_set_priority() - sets the priority value of the skb - * @skb: Pointer to network buffer - * @p: priority - * - * Return: none - */ -static inline void __cdf_nbuf_set_priority(struct sk_buff *skb, uint32_t p) -{ - skb->priority = p; -} - -/** - * __cdf_nbuf_set_next() - sets the next skb pointer of the current skb - * @skb: Current skb - * @next_skb: Next skb - * - * Return: void - */ -static inline void -__cdf_nbuf_set_next(struct sk_buff *skb, struct sk_buff *skb_next) -{ - skb->next = skb_next; -} - -/** - * __cdf_nbuf_next() - return the next skb pointer of the current skb - * @skb: Current skb - * - * Return: the next skb pointed to by the current skb - */ -static inline struct sk_buff *__cdf_nbuf_next(struct sk_buff *skb) -{ - return skb->next; -} - -/** - * __cdf_nbuf_set_next_ext() - sets the next skb pointer of the current skb - * @skb: Current skb - * @next_skb: Next skb - * - * This fn is used to link up extensions to the head skb. Does not handle - * linking to the head - * - * Return: none - */ -static inline void -__cdf_nbuf_set_next_ext(struct sk_buff *skb, struct sk_buff *skb_next) -{ - skb->next = skb_next; -} - -/** - * __cdf_nbuf_next_ext() - return the next skb pointer of the current skb - * @skb: Current skb - * - * Return: the next skb pointed to by the current skb - */ -static inline struct sk_buff *__cdf_nbuf_next_ext(struct sk_buff *skb) -{ - return skb->next; -} - -/** - * __cdf_nbuf_append_ext_list() - link list of packet extensions to the head - * @skb_head: head_buf nbuf holding head segment (single) - * @ext_list: nbuf list holding linked extensions to the head - * @ext_len: Total length of all buffers in the extension list - * - * This function is used to link up a list of packet extensions (seg1, 2,* ...) - * to the nbuf holding the head segment (seg0) - * - * Return: none - */ -static inline void -__cdf_nbuf_append_ext_list(struct sk_buff *skb_head, - struct sk_buff *ext_list, size_t ext_len) -{ - skb_shinfo(skb_head)->frag_list = ext_list; - skb_head->data_len = ext_len; - skb_head->len += skb_head->data_len; -} - -/** - * __cdf_nbuf_tx_free() - free skb list - * @skb: Pointer to network buffer - * @tx_err: TX error - * - * Return: none - */ -static inline void __cdf_nbuf_tx_free(struct sk_buff *bufs, int tx_err) -{ - while (bufs) { - struct sk_buff *next = __cdf_nbuf_next(bufs); - __cdf_nbuf_free(bufs); - bufs = next; - } -} - -/** - * __cdf_nbuf_get_age() - return the checksum value of the skb - * @skb: Pointer to network buffer - * - * Return: checksum value - */ -static inline uint32_t __cdf_nbuf_get_age(struct sk_buff *skb) -{ - return skb->csum; -} - -/** - * __cdf_nbuf_set_age() - sets the checksum value of the skb - * @skb: Pointer to network buffer - * @v: Value - * - * Return: none - */ -static inline void __cdf_nbuf_set_age(struct sk_buff *skb, uint32_t v) -{ - skb->csum = v; -} - -/** - * __cdf_nbuf_adj_age() - adjusts the checksum/age value of the skb - * @skb: Pointer to network buffer - * @adj: Adjustment value - * - * Return: none - */ -static inline void __cdf_nbuf_adj_age(struct sk_buff *skb, uint32_t adj) -{ - skb->csum -= adj; -} - -/** - * __cdf_nbuf_copy_bits() - return the length of the copy bits for skb - * @skb: Pointer to network buffer - * @offset: Offset value - * @len: Length - * @to: Destination pointer - * - * Return: length of the copy bits for skb - */ -static inline int32_t -__cdf_nbuf_copy_bits(struct sk_buff *skb, int32_t offset, int32_t len, void *to) -{ - return skb_copy_bits(skb, offset, to, len); -} - -/** - * __cdf_nbuf_set_pktlen() - sets the length of the skb and adjust the tail - * @skb: Pointer to network buffer - * @len: Packet length - * - * Return: none - */ -static inline void __cdf_nbuf_set_pktlen(struct sk_buff *skb, uint32_t len) -{ - if (skb->len > len) { - skb_trim(skb, len); - } else { - if (skb_tailroom(skb) < len - skb->len) { - if (unlikely(pskb_expand_head(skb, 0, - len - skb->len - skb_tailroom(skb), - GFP_ATOMIC))) { - dev_kfree_skb_any(skb); - qdf_assert(0); - } - } - skb_put(skb, (len - skb->len)); - } -} - -/** - * __cdf_nbuf_set_protocol() - sets the protocol value of the skb - * @skb: Pointer to network buffer - * @protocol: Protocol type - * - * Return: none - */ -static inline void -__cdf_nbuf_set_protocol(struct sk_buff *skb, uint16_t protocol) -{ - skb->protocol = protocol; -} - -#define __cdf_nbuf_set_tx_htt2_frm(skb, candi) \ - (NBUF_CB_TX_HL_HTT2_FRM(skb) = (candi)) -#define __cdf_nbuf_get_tx_htt2_frm(skb) \ - NBUF_CB_TX_HL_HTT2_FRM(skb) - -#if defined(FEATURE_TSO) -uint32_t __cdf_nbuf_get_tso_info(qdf_device_t osdev, struct sk_buff *skb, - struct qdf_tso_info_t *tso_info); - -uint32_t __cdf_nbuf_get_tso_num_seg(struct sk_buff *skb); - -static inline bool __cdf_nbuf_is_tso(struct sk_buff *skb) -{ - return skb_is_gso(skb); -} - -static inline void __cdf_nbuf_inc_users(struct sk_buff *skb) -{ - atomic_inc(&skb->users); - return; -} -#endif /* TSO */ - -/** - * __cdf_nbuf_tx_info_get() - Modify pkt_type, set pkt_subtype, - * and get hw_classify by peeking - * into packet - * @nbuf: Network buffer (skb on Linux) - * @pkt_type: Pkt type (from enum htt_pkt_type) - * @pkt_subtype: Bit 4 of this field in HTT descriptor - * needs to be set in case of CE classification support - * Is set by this macro. - * @hw_classify: This is a flag which is set to indicate - * CE classification is enabled. - * Do not set this bit for VLAN packets - * OR for mcast / bcast frames. - * - * This macro parses the payload to figure out relevant Tx meta-data e.g. - * whether to enable tx_classify bit in CE. - * - * Overrides pkt_type only if required for 802.3 frames (original ethernet) - * If protocol is less than ETH_P_802_3_MIN (0x600), then - * it is the length and a 802.3 frame else it is Ethernet Type II - * (RFC 894). - * Bit 4 in pkt_subtype is the tx_classify bit - * - * Return: void - */ -#define __cdf_nbuf_tx_info_get(skb, pkt_type, \ - pkt_subtype, hw_classify) \ -do { \ - struct ethhdr *eh = (struct ethhdr *)skb->data; \ - uint16_t ether_type = ntohs(eh->h_proto); \ - bool is_mc_bc; \ - \ - is_mc_bc = is_broadcast_ether_addr((uint8_t *)eh) || \ - is_multicast_ether_addr((uint8_t *)eh); \ - \ - if (likely((ether_type != ETH_P_8021Q) && !is_mc_bc)) { \ - hw_classify = 1; \ - pkt_subtype = 0x01 << \ - HTT_TX_CLASSIFY_BIT_S; \ - } \ - \ - if (unlikely(ether_type < ETH_P_802_3_MIN)) \ - pkt_type = htt_pkt_type_ethernet; \ - \ -} while (0) - -/** - * nbuf private buffer routines - */ - -/** - * __cdf_nbuf_peek_header() - return the header's addr & m_len - * @skb: Pointer to network buffer - * @addr: Pointer to store header's addr - * @m_len: network buffer length - * - * Return: none - */ -static inline void -__cdf_nbuf_peek_header(struct sk_buff *skb, uint8_t **addr, uint32_t *len) -{ - *addr = skb->data; - *len = skb->len; -} - -/** - * typedef struct __cdf_nbuf_queue_t - network buffer queue - * @head: Head pointer - * @tail: Tail pointer - * @qlen: Queue length - */ -typedef struct __cdf_nbuf_qhead { - struct sk_buff *head; - struct sk_buff *tail; - unsigned int qlen; -} __cdf_nbuf_queue_t; - -/******************Functions *************/ - -/** - * __cdf_nbuf_queue_init() - initiallize the queue head - * @qhead: Queue head - * - * Return: CDF status - */ -static inline QDF_STATUS __cdf_nbuf_queue_init(__cdf_nbuf_queue_t *qhead) -{ - memset(qhead, 0, sizeof(struct __cdf_nbuf_qhead)); - return QDF_STATUS_SUCCESS; -} - -/** - * __cdf_nbuf_queue_add() - add an skb in the tail of the queue - * @qhead: Queue head - * @skb: Pointer to network buffer - * - * This is a lockless version, driver must acquire locks if it - * needs to synchronize - * - * Return: none - */ -static inline void -__cdf_nbuf_queue_add(__cdf_nbuf_queue_t *qhead, struct sk_buff *skb) -{ - skb->next = NULL; /*Nullify the next ptr */ - - if (!qhead->head) - qhead->head = skb; - else - qhead->tail->next = skb; - - qhead->tail = skb; - qhead->qlen++; -} - -/** - * __cdf_nbuf_queue_insert_head() - add an skb at the head of the queue - * @qhead: Queue head - * @skb: Pointer to network buffer - * - * This is a lockless version, driver must acquire locks if it needs to - * synchronize - * - * Return: none - */ -static inline void -__cdf_nbuf_queue_insert_head(__cdf_nbuf_queue_t *qhead, __cdf_nbuf_t skb) -{ - if (!qhead->head) { - /*Empty queue Tail pointer Must be updated */ - qhead->tail = skb; - } - skb->next = qhead->head; - qhead->head = skb; - qhead->qlen++; -} - -/** - * __cdf_nbuf_queue_remove() - remove a skb from the head of the queue - * @qhead: Queue head - * - * This is a lockless version. Driver should take care of the locks - * - * Return: skb or NULL - */ -static inline -struct sk_buff *__cdf_nbuf_queue_remove(__cdf_nbuf_queue_t *qhead) -{ - __cdf_nbuf_t tmp = NULL; - - if (qhead->head) { - qhead->qlen--; - tmp = qhead->head; - if (qhead->head == qhead->tail) { - qhead->head = NULL; - qhead->tail = NULL; - } else { - qhead->head = tmp->next; - } - tmp->next = NULL; - } - return tmp; -} - -/** - * __cdf_nbuf_queue_len() - return the queue length - * @qhead: Queue head - * - * Return: Queue length - */ -static inline uint32_t __cdf_nbuf_queue_len(__cdf_nbuf_queue_t *qhead) -{ - return qhead->qlen; -} - -/** - * __cdf_nbuf_queue_next() - return the next skb from packet chain - * @skb: Pointer to network buffer - * - * This API returns the next skb from packet chain, remember the skb is - * still in the queue - * - * Return: NULL if no packets are there - */ -static inline struct sk_buff *__cdf_nbuf_queue_next(struct sk_buff *skb) -{ - return skb->next; -} - -/** - * __cdf_nbuf_is_queue_empty() - check if the queue is empty or not - * @qhead: Queue head - * - * Return: true if length is 0 else false - */ -static inline bool __cdf_nbuf_is_queue_empty(__cdf_nbuf_queue_t *qhead) -{ - return qhead->qlen == 0; -} - -/* - * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. - * Because the queue head will most likely put in some structure, - * we don't use pointer type as the definition. - */ - -/* - * Use sk_buff_head as the implementation of cdf_nbuf_queue_t. - * Because the queue head will most likely put in some structure, - * we don't use pointer type as the definition. - */ -#endif /*_I_CDF_NET_BUF_H */ diff --git a/core/cds/inc/cds_packet.h b/core/cds/inc/cds_packet.h index 44ce1efde30d..f63e9033345c 100644 --- a/core/cds/inc/cds_packet.h +++ b/core/cds/inc/cds_packet.h @@ -54,11 +54,11 @@ struct cds_pkt_t; typedef struct cds_pkt_t cds_pkt_t; -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" -#define CDS_PKT_TRAC_TYPE_EAPOL NBUF_PKT_TRAC_TYPE_EAPOL -#define CDS_PKT_TRAC_TYPE_DHCP NBUF_PKT_TRAC_TYPE_DHCP -#define CDS_PKT_TRAC_TYPE_MGMT_ACTION NBUF_PKT_TRAC_TYPE_MGMT_ACTION /* Managment action frame */ +#define CDS_PKT_TRAC_TYPE_EAPOL QDF_NBUF_PKT_TRAC_TYPE_EAPOL +#define CDS_PKT_TRAC_TYPE_DHCP QDF_NBUF_PKT_TRAC_TYPE_DHCP +#define CDS_PKT_TRAC_TYPE_MGMT_ACTION QDF_NBUF_PKT_TRAC_TYPE_MGMT_ACTION #define CDS_PKT_TRAC_DUMP_CMD 9999 diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index b0f6fdc12a08..f60bd2dd3ff8 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -43,7 +43,7 @@ #include #include #include -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_mem.h" #define TX_PKT_MIN_HEADROOM (64) @@ -83,8 +83,8 @@ QDF_STATUS cds_pkt_return_packet(cds_pkt_t *packet) return QDF_STATUS_E_INVAL; } - /* Free up the Adf nbuf */ - cdf_nbuf_free(packet->pkt_buf); + /* Free up the qdf nbuf */ + qdf_nbuf_free(packet->pkt_buf); packet->pkt_buf = NULL; @@ -120,7 +120,7 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize) return QDF_STATUS_E_INVAL; } /* return the requested information */ - *pPacketSize = cdf_nbuf_len(pPacket->pkt_buf); + *pPacketSize = qdf_nbuf_len(pPacket->pkt_buf); return QDF_STATUS_SUCCESS; } @@ -265,7 +265,7 @@ void cds_pkt_proto_trace_init(void) /* Register callback function to NBUF * Lower layer event also will be reported to here */ - cdf_nbuf_reg_trace_cb(cds_pkt_trace_buf_update); + qdf_nbuf_reg_trace_cb(cds_pkt_trace_buf_update); return; } @@ -293,18 +293,18 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num) { QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; - cdf_nbuf_t nbuf; + qdf_nbuf_t nbuf; - nbuf = - cdf_nbuf_alloc_debug(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), - TX_PKT_MIN_HEADROOM, sizeof(uint32_t), false, + nbuf = qdf_nbuf_alloc_debug(NULL, + roundup(size + TX_PKT_MIN_HEADROOM, 4), + TX_PKT_MIN_HEADROOM, sizeof(uint32_t), false, file_name, line_num); if (nbuf != NULL) { - cdf_nbuf_put_tail(nbuf, size); - cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); + qdf_nbuf_put_tail(nbuf, size); + qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; - *data = cdf_nbuf_data(nbuf); + *data = qdf_nbuf_data(nbuf); cdf_ret_status = QDF_STATUS_SUCCESS; } @@ -318,16 +318,16 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) { QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; - cdf_nbuf_t nbuf; + qdf_nbuf_t nbuf; - nbuf = cdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), + nbuf = qdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), TX_PKT_MIN_HEADROOM, sizeof(uint32_t), false); if (nbuf != NULL) { - cdf_nbuf_put_tail(nbuf, size); - cdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); + qdf_nbuf_put_tail(nbuf, size); + qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; - *data = cdf_nbuf_data(nbuf); + *data = qdf_nbuf_data(nbuf); cdf_ret_status = QDF_STATUS_SUCCESS; } @@ -341,5 +341,5 @@ QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) ---------------------------------------------------------------------------*/ void cds_packet_free(void *pPacket) { - cdf_nbuf_free((cdf_nbuf_t) pPacket); + qdf_nbuf_free((qdf_nbuf_t) pPacket); } diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index 0d236484c35c..292c4a664f1b 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -731,7 +731,7 @@ void cds_drop_rxpkt_by_staid(p_cds_sched_context pSchedContext, uint16_t staId) { struct list_head local_list; struct cds_ol_rx_pkt *pkt, *tmp; - cdf_nbuf_t buf, next_buf; + qdf_nbuf_t buf, next_buf; INIT_LIST_HEAD(&local_list); spin_lock_bh(&pSchedContext->ol_rx_queue_lock); @@ -750,8 +750,8 @@ void cds_drop_rxpkt_by_staid(p_cds_sched_context pSchedContext, uint16_t staId) list_del(&pkt->list); buf = pkt->Rxpkt; while (buf) { - next_buf = cdf_nbuf_queue_next(buf); - cdf_nbuf_free(buf); + next_buf = qdf_nbuf_queue_next(buf); + qdf_nbuf_free(buf); buf = next_buf; } cds_free_ol_rx_pkt(pSchedContext, pkt); diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index ea8a933ba89f..58a7dccd2ab3 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -121,14 +121,14 @@ void htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt) void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev) { struct htt_htc_pkt_union *pkt, *next; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; pkt = pdev->htt_htc_pkt_misclist; while (pkt) { next = pkt->u.next; - netbuf = (cdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext); - cdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); - cdf_nbuf_free(netbuf); + netbuf = (qdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext); + qdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); + qdf_nbuf_free(netbuf); qdf_mem_free(pkt); pkt = next; } diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c index eb863208795c..0bf4c13d4f31 100644 --- a/core/dp/htt/htt_fw_stats.c +++ b/core/dp/htt/htt_fw_stats.c @@ -32,7 +32,7 @@ #include /* HTC_PACKET */ #include /* HTT_T2H_MSG_TYPE, etc. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* qdf_mem_set */ #include /* ol_fw_tx_dbg_ppdu_base */ diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index bb8e7141ebaf..39762b5ae614 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -43,7 +43,7 @@ */ #include /* qdf_mem_copy */ -#include /* cdf_nbuf_map_single */ +#include /* qdf_nbuf_map_single */ #include /* HTC_PACKET */ #include /* HTC_HDR_ALIGNMENT_PADDING */ #include /* HTT host->target msg defs */ @@ -62,25 +62,25 @@ static void htt_h2t_send_complete_free_netbuf(void *pdev, A_STATUS status, - cdf_nbuf_t netbuf, uint16_t msdu_id) + qdf_nbuf_t netbuf, uint16_t msdu_id) { - cdf_nbuf_free(netbuf); + qdf_nbuf_free(netbuf); } void htt_h2t_send_complete(void *context, HTC_PACKET *htc_pkt) { void (*send_complete_part2)(void *pdev, A_STATUS status, - cdf_nbuf_t msdu, uint16_t msdu_id); + qdf_nbuf_t msdu, uint16_t msdu_id); struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; struct htt_htc_pkt *htt_pkt; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; send_complete_part2 = htc_pkt->pPktContext; htt_pkt = container_of(htc_pkt, struct htt_htc_pkt, htc_pkt); /* process (free or keep) the netbuf that held the message */ - netbuf = (cdf_nbuf_t) htc_pkt->pNetBufContext; + netbuf = (qdf_nbuf_t) htc_pkt->pNetBufContext; if (send_complete_part2 != NULL) { send_complete_part2(htt_pkt->pdev_ctxt, htc_pkt->Status, netbuf, htt_pkt->msdu_id); @@ -101,7 +101,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) A_STATUS rc = A_OK; struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; u_int32_t *msg_word; struct htt_tx_frag_desc_bank_cfg_t *bank_cfg; @@ -115,7 +115,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) pkt->msdu_id = HTT_TX_COMPL_INV_MSDU_ID; pkt->pdev_ctxt = NULL; /* not used during send-done callback */ - msg = cdf_nbuf_alloc( + msg = qdf_nbuf_alloc( pdev->osdev, HTT_MSG_BUF_SIZE(sizeof(struct htt_tx_frag_desc_bank_cfg_t)), /* reserve room for the HTC header */ @@ -131,14 +131,14 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) * separately during the below call to adf_nbuf_push_head. * The contribution from the HTC header is added separately inside HTC. */ - cdf_nbuf_put_tail(msg, sizeof(struct htt_tx_frag_desc_bank_cfg_t)); + qdf_nbuf_put_tail(msg, sizeof(struct htt_tx_frag_desc_bank_cfg_t)); /* fill in the message contents */ - msg_word = (u_int32_t *) cdf_nbuf_data(msg); + msg_word = (u_int32_t *) qdf_nbuf_data(msg); memset(msg_word, 0 , sizeof(struct htt_tx_frag_desc_bank_cfg_t)); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_FRAG_DESC_BANK_CFG); @@ -170,8 +170,8 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) SET_HTC_PACKET_INFO_TX( &pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, 1); /* tag - not relevant here */ @@ -187,7 +187,7 @@ A_STATUS htt_h2t_frag_desc_bank_cfg_msg(struct htt_pdev_t *pdev) A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -201,7 +201,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for the HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_VER_REQ_BYTES), + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_VER_REQ_BYTES), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, true); if (!msg) { @@ -212,23 +212,23 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) /* * Set the length of the message. * The contribution from the HTC_HDR_ALIGNMENT_PADDING is added - * separately during the below call to cdf_nbuf_push_head. + * separately during the below call to qdf_nbuf_push_head. * The contribution from the HTC header is added separately inside HTC. */ - cdf_nbuf_put_tail(msg, HTT_VER_REQ_BYTES); + qdf_nbuf_put_tail(msg, HTT_VER_REQ_BYTES); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_VERSION_REQ); SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), cdf_nbuf_len(msg), + qdf_nbuf_data(msg), qdf_nbuf_len(msg), pdev->htc_endpoint, 1); /* tag - not relevant here */ @@ -247,7 +247,7 @@ A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev) A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; int enable_ctrl_data, enable_mgmt_data, enable_null_data, enable_phy_data, enable_hdr, @@ -264,7 +264,7 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for the HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_RX_RING_CFG_BYTES(1)), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, true); @@ -275,16 +275,16 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) /* * Set the length of the message. * The contribution from the HTC_HDR_ALIGNMENT_PADDING is added - * separately during the below call to cdf_nbuf_push_head. + * separately during the below call to qdf_nbuf_push_head. * The contribution from the HTC header is added separately inside HTC. */ - cdf_nbuf_put_tail(msg, HTT_RX_RING_CFG_BYTES(1)); + qdf_nbuf_put_tail(msg, HTT_RX_RING_CFG_BYTES(1)); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_RX_RING_CFG); @@ -414,8 +414,8 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, HTC_TX_PACKET_TAG_RUNTIME_PUT); @@ -437,7 +437,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, uint8_t cfg_stat_type, uint32_t cfg_val, uint64_t cookie) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; uint16_t htc_tag = 1; @@ -463,7 +463,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, pkt->pdev_ctxt = NULL; /* not used during send-done callback */ - msg = cdf_nbuf_alloc(pdev->osdev, + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_H2T_STATS_REQ_MSG_SZ), /* reserve room for HTC header */ HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, @@ -473,13 +473,13 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, return -EINVAL; /* failure */ } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_H2T_STATS_REQ_MSG_SZ); + qdf_nbuf_put_tail(msg, HTT_H2T_STATS_REQ_MSG_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_STATS_REQ); @@ -504,8 +504,8 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, htc_tag); /* tag - not relevant here */ @@ -524,7 +524,7 @@ htt_h2t_dbg_stats_get(struct htt_pdev_t *pdev, A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -538,7 +538,7 @@ A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_H2T_SYNC_MSG_SZ), + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_H2T_SYNC_MSG_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); if (!msg) { @@ -546,13 +546,13 @@ A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt) return A_NO_MEMORY; } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_H2T_SYNC_MSG_SZ); + qdf_nbuf_put_tail(msg, HTT_H2T_SYNC_MSG_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_SYNC); @@ -560,8 +560,8 @@ A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt) SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, HTC_TX_PACKET_TAG_RUNTIME_PUT); @@ -582,7 +582,7 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, int max_subfrms_ampdu, int max_subfrms_amsdu) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -596,7 +596,7 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_AGGR_CFG_MSG_SZ), + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_AGGR_CFG_MSG_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); if (!msg) { @@ -604,13 +604,13 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, return -EINVAL; /* failure */ } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_AGGR_CFG_MSG_SZ); + qdf_nbuf_put_tail(msg, HTT_AGGR_CFG_MSG_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_AGGR_CFG); @@ -627,8 +627,8 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, HTC_TX_PACKET_TAG_RUNTIME_PUT); @@ -657,7 +657,7 @@ htt_h2t_aggr_cfg_msg(struct htt_pdev_t *pdev, int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -671,7 +671,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ), + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); if (!msg) { @@ -679,13 +679,13 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) return A_NO_MEMORY; } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ); + qdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_WDI_IPA_CFG_TX_PKT_POOL_SIZE_SET(*msg_word, @@ -734,8 +734,8 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, HTC_TX_PACKET_TAG_RUNTIME_PUT); @@ -749,7 +749,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -763,7 +763,7 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ), + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); if (!msg) { @@ -771,13 +771,13 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) return -A_NO_MEMORY; } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ); + qdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_WDI_IPA_CFG_TX_PKT_POOL_SIZE_SET(*msg_word, @@ -878,8 +878,8 @@ int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev) SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, 1); /* tag - not relevant here */ @@ -904,7 +904,7 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, bool uc_active, bool is_tx) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; uint8_t active_target = 0; @@ -919,7 +919,7 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); @@ -928,13 +928,13 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, return -A_NO_MEMORY; } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ); + qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; if (uc_active && is_tx) @@ -951,8 +951,8 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, 1); /* tag - not relevant here */ @@ -973,7 +973,7 @@ int htt_h2t_ipa_uc_set_active(struct htt_pdev_t *pdev, int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev) { struct htt_htc_pkt *pkt; - cdf_nbuf_t msg; + qdf_nbuf_t msg; uint32_t *msg_word; pkt = htt_htc_pkt_alloc(pdev); @@ -987,7 +987,7 @@ int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev) pkt->pdev_ctxt = NULL; /* not used during send-done callback */ /* reserve room for HTC header */ - msg = cdf_nbuf_alloc(pdev->osdev, + msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ), HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4, false); @@ -996,13 +996,13 @@ int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev) return -A_NO_MEMORY; } /* set the length of the message */ - cdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ); + qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ); /* fill in the message contents */ - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); /* rewind beyond alignment pad to get to the HTC header reserved area */ - cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); + qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING); *msg_word = 0; HTT_WDI_IPA_OP_REQUEST_OP_CODE_SET(*msg_word, @@ -1011,8 +1011,8 @@ int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev) SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt, htt_h2t_send_complete_free_netbuf, - cdf_nbuf_data(msg), - cdf_nbuf_len(msg), + qdf_nbuf_data(msg), + qdf_nbuf_len(msg), pdev->htc_endpoint, 1); /* tag - not relevant here */ diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 8b1cb4c91687..e462b13138a4 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -29,7 +29,7 @@ #define _HTT_INTERNAL__H_ #include /* A_STATUS */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* qdf_assert */ #include /* HTC_PACKET */ @@ -133,10 +133,10 @@ struct rx_buf_debug { bool in_use; }; #endif -static inline struct htt_host_rx_desc_base *htt_rx_desc(cdf_nbuf_t msdu) +static inline struct htt_host_rx_desc_base *htt_rx_desc(qdf_nbuf_t msdu) { return (struct htt_host_rx_desc_base *) - (((size_t) (cdf_nbuf_head(msdu) + HTT_RX_DESC_ALIGN_MASK)) & + (((size_t) (qdf_nbuf_head(msdu) + HTT_RX_DESC_ALIGN_MASK)) & ~HTT_RX_DESC_ALIGN_MASK); } @@ -191,7 +191,7 @@ static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc) * * Return: none */ -static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu, +static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu, struct htt_host_rx_desc_base *rx_desc) { NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible; @@ -212,7 +212,7 @@ static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu, #else static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc) {} -static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu, +static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu, struct htt_host_rx_desc_base *rx_desc) {} #endif /* FEATURE_LRO */ @@ -388,19 +388,19 @@ static inline void htt_print_rx_desc(struct htt_host_rx_desc_base *rx_desc) #define HTT_TX_NBUF_QUEUE_REMOVE(_pdev, _msdu) do { \ HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \ - _msdu = cdf_nbuf_queue_remove(&_pdev->txnbufq);\ + _msdu = qdf_nbuf_queue_remove(&_pdev->txnbufq);\ HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \ } while (0) #define HTT_TX_NBUF_QUEUE_ADD(_pdev, _msdu) do { \ HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \ - cdf_nbuf_queue_add(&_pdev->txnbufq, _msdu); \ + qdf_nbuf_queue_add(&_pdev->txnbufq, _msdu); \ HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \ } while (0) #define HTT_TX_NBUF_QUEUE_INSERT_HEAD(_pdev, _msdu) do { \ HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \ - cdf_nbuf_queue_insert_head(&_pdev->txnbufq, _msdu);\ + qdf_nbuf_queue_insert_head(&_pdev->txnbufq, _msdu);\ HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \ } while (0) #else @@ -463,9 +463,9 @@ void htt_htc_disable_aspm(struct htt_pdev_t *pdev); int htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, - cdf_nbuf_t netbuf); + qdf_nbuf_t netbuf); -cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr); +qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr); #ifdef IPA_OFFLOAD int @@ -551,7 +551,7 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev) static inline void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev, uint32_t paddr, - cdf_nbuf_t rx_netbuf) + qdf_nbuf_t rx_netbuf) { if (pdev->rx_buff_list) { pdev->rx_buff_list[pdev->rx_buff_index].paddr = @@ -574,7 +574,7 @@ void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev, */ static inline void htt_rx_dbg_rxbuf_reset(struct htt_pdev_t *pdev, - cdf_nbuf_t netbuf) + qdf_nbuf_t netbuf) { uint32_t index; @@ -609,13 +609,13 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev) static inline void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev, uint32_t paddr, - cdf_nbuf_t rx_netbuf) + qdf_nbuf_t rx_netbuf) { return; } static inline void htt_rx_dbg_rxbuf_reset(struct htt_pdev_t *pdev, - cdf_nbuf_t netbuf) + qdf_nbuf_t netbuf) { return; } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index eb532ce6fa55..72b704749481 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -41,7 +41,7 @@ #include /* qdf_mem_malloc,free, etc. */ #include /* qdf_print, bool */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_timer_free */ #include /* HTT_HL_RX_DESC_SIZE */ @@ -128,13 +128,13 @@ void htt_rx_hash_deinit(struct htt_pdev_t *pdev) listnode_offset); if (hash_entry->netbuf) { #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, + qdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, + qdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf, QDF_DMA_FROM_DEVICE); #endif - cdf_nbuf_free(hash_entry->netbuf); + qdf_nbuf_free(hash_entry->netbuf); hash_entry->paddr = 0; } list_iter = list_iter->next; @@ -230,11 +230,11 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) idx = *(pdev->rx_ring.alloc_idx.vaddr); while (num > 0) { qdf_dma_addr_t paddr; - cdf_nbuf_t rx_netbuf; + qdf_nbuf_t rx_netbuf; int headroom; rx_netbuf = - cdf_nbuf_alloc(pdev->osdev, HTT_RX_BUF_SIZE, + qdf_nbuf_alloc(pdev->osdev, HTT_RX_BUF_SIZE, 0, 4, false); if (!rx_netbuf) { qdf_timer_stop(&pdev->rx_ring. @@ -269,26 +269,26 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) smp_mb(); #endif /* - * Adjust cdf_nbuf_data to point to the location in the buffer + * Adjust qdf_nbuf_data to point to the location in the buffer * where the rx descriptor will be filled in. */ - headroom = cdf_nbuf_data(rx_netbuf) - (uint8_t *) rx_desc; - cdf_nbuf_push_head(rx_netbuf, headroom); + headroom = qdf_nbuf_data(rx_netbuf) - (uint8_t *) rx_desc; + qdf_nbuf_push_head(rx_netbuf, headroom); #ifdef DEBUG_DMA_DONE status = - cdf_nbuf_map(pdev->osdev, rx_netbuf, + qdf_nbuf_map(pdev->osdev, rx_netbuf, QDF_DMA_BIDIRECTIONAL); #else status = - cdf_nbuf_map(pdev->osdev, rx_netbuf, + qdf_nbuf_map(pdev->osdev, rx_netbuf, QDF_DMA_FROM_DEVICE); #endif if (status != QDF_STATUS_SUCCESS) { - cdf_nbuf_free(rx_netbuf); + qdf_nbuf_free(rx_netbuf); goto fail; } - paddr = cdf_nbuf_get_frag_paddr(rx_netbuf, 0); + paddr = qdf_nbuf_get_frag_paddr(rx_netbuf, 0); if (pdev->cfg.is_full_reorder_offload) { if (qdf_unlikely (htt_rx_hash_list_insert(pdev, paddr, @@ -296,13 +296,13 @@ void htt_rx_ring_fill_n(struct htt_pdev_t *pdev, int num) qdf_print("%s: hash insert failed!\n", __func__); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, rx_netbuf, + qdf_nbuf_unmap(pdev->osdev, rx_netbuf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, rx_netbuf, + qdf_nbuf_unmap(pdev->osdev, rx_netbuf, QDF_DMA_FROM_DEVICE); #endif - cdf_nbuf_free(rx_netbuf); + qdf_nbuf_free(rx_netbuf); goto fail; } htt_rx_dbg_rxbuf_set(pdev, paddr, rx_netbuf); @@ -360,17 +360,17 @@ void htt_rx_detach(struct htt_pdev_t *pdev) while (sw_rd_idx != *(pdev->rx_ring.alloc_idx.vaddr)) { #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, + qdf_nbuf_unmap(pdev->osdev, pdev->rx_ring.buf. netbufs_ring[sw_rd_idx], QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, + qdf_nbuf_unmap(pdev->osdev, pdev->rx_ring.buf. netbufs_ring[sw_rd_idx], QDF_DMA_FROM_DEVICE); #endif - cdf_nbuf_free(pdev->rx_ring.buf. + qdf_nbuf_free(pdev->rx_ring.buf. netbufs_ring[sw_rd_idx]); sw_rd_idx++; sw_rd_idx &= pdev->rx_ring.size_mask; @@ -623,10 +623,10 @@ htt_rx_msdu_actions(htt_pdev_handle pdev, *inspect = rx_msdu_fw_desc & FW_RX_DESC_INSPECT_M; } -static inline cdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev) +static inline qdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev) { int idx; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; HTT_ASSERT1(htt_rx_ring_elems(pdev) != 0); @@ -644,7 +644,7 @@ static inline cdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev) return msdu; } -static inline cdf_nbuf_t +static inline qdf_nbuf_t htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, uint32_t paddr) { HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0); @@ -657,7 +657,7 @@ htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, uint32_t paddr) #ifdef CHECKSUM_OFFLOAD static inline void -htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu, +htt_set_checksum_result_ll(htt_pdev_handle pdev, qdf_nbuf_t msdu, struct htt_host_rx_desc_base *rx_desc) { #define MAX_IP_VER 2 @@ -704,7 +704,7 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu, QDF_NBUF_RX_CKSUM_NONE : QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY; } - cdf_nbuf_set_rx_cksum(msdu, &cksum); + qdf_nbuf_set_rx_cksum(msdu, &cksum); #undef MAX_IP_VER #undef MAX_PROTO_VAL } @@ -713,13 +713,13 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu, #endif #ifdef DEBUG_DMA_DONE -void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) +void htt_rx_print_rx_indication(qdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) { uint32_t *msg_word; int byte_offset; int mpdu_range, num_mpdu_range; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); qdf_print ("------------------HTT RX IND-----------------------------\n"); @@ -795,11 +795,11 @@ void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev) int htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu) + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu) { int msdu_len, msdu_chaining = 0; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; struct htt_host_rx_desc_base *rx_desc; uint8_t *rx_ind_data; uint32_t *msg_word, num_msdu_bytes; @@ -807,7 +807,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, uint8_t pad_bytes = 0; HTT_ASSERT1(htt_rx_ring_elems(pdev) != 0); - rx_ind_data = cdf_nbuf_data(rx_ind_msg); + rx_ind_data = qdf_nbuf_data(rx_ind_msg); msg_word = (uint32_t *) rx_ind_data; msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); @@ -830,14 +830,14 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, * Set the netbuf length to be the entire buffer length * initially, so the unmap will unmap the entire buffer. */ - cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); + qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); #endif - /* cache consistency has been taken care of by cdf_nbuf_unmap */ + /* cache consistency has been taken care of by qdf_nbuf_unmap */ /* * Now read the rx descriptor. @@ -854,7 +854,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, * than the descriptor. */ - cdf_nbuf_pull_head(msdu, + qdf_nbuf_pull_head(msdu, HTT_RX_STD_DESC_RESERVATION + pad_bytes); /* @@ -879,7 +879,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, RX_ATTENTION_0_MSDU_DONE_MASK))) { qdf_mdelay(1); - cdf_invalidate_range((void *)rx_desc, + qdf_invalidate_range((void *)rx_desc, (void *)((char *)rx_desc + HTT_RX_STD_DESC_RESERVATION)); @@ -895,7 +895,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, #ifdef HTT_RX_RESTORE qdf_print("RX done bit error detected!\n"); - cdf_nbuf_set_next(msdu, NULL); + qdf_nbuf_set_next(msdu, NULL); *tail_msdu = msdu; pdev->rx_ring.rx_reset = 1; return msdu_chaining; @@ -997,7 +997,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, if (msdu_len > 0x3000) break; #endif - cdf_nbuf_trim_tail(msdu, + qdf_nbuf_trim_tail(msdu, HTT_RX_BUF_SIZE - (RX_STD_DESC_SIZE + msdu_len)); @@ -1005,10 +1005,10 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, } while (0); while (msdu_chained--) { - cdf_nbuf_t next = htt_rx_netbuf_pop(pdev); - cdf_nbuf_set_pktlen(next, HTT_RX_BUF_SIZE); + qdf_nbuf_t next = htt_rx_netbuf_pop(pdev); + qdf_nbuf_set_pktlen(next, HTT_RX_BUF_SIZE); msdu_len -= HTT_RX_BUF_SIZE; - cdf_nbuf_set_next(msdu, next); + qdf_nbuf_set_next(msdu, next); msdu = next; msdu_chaining = 1; @@ -1025,7 +1025,7 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, RX_STD_DESC_SIZE); } - cdf_nbuf_trim_tail(next, + qdf_nbuf_trim_tail(next, HTT_RX_BUF_SIZE - (RX_STD_DESC_SIZE + msdu_len)); @@ -1038,11 +1038,11 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, RX_MSDU_END_4_LAST_MSDU_LSB; if (last_msdu) { - cdf_nbuf_set_next(msdu, NULL); + qdf_nbuf_set_next(msdu, NULL); break; } else { - cdf_nbuf_t next = htt_rx_netbuf_pop(pdev); - cdf_nbuf_set_next(msdu, next); + qdf_nbuf_t next = htt_rx_netbuf_pop(pdev); + qdf_nbuf_set_next(msdu, next); msdu = next; } } @@ -1065,26 +1065,26 @@ htt_rx_amsdu_pop_ll(htt_pdev_handle pdev, int htt_rx_offload_msdu_pop_ll(htt_pdev_handle pdev, - cdf_nbuf_t offload_deliver_msg, + qdf_nbuf_t offload_deliver_msg, int *vdev_id, int *peer_id, int *tid, uint8_t *fw_desc, - cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf) + qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf) { - cdf_nbuf_t buf; + qdf_nbuf_t buf; uint32_t *msdu_hdr, msdu_len; *head_buf = *tail_buf = buf = htt_rx_netbuf_pop(pdev); /* Fake read mpdu_desc to keep desc ptr in sync */ htt_rx_mpdu_desc_list_next(pdev, NULL); - cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); + qdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); + qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); #endif - msdu_hdr = (uint32_t *) cdf_nbuf_data(buf); + msdu_hdr = (uint32_t *) qdf_nbuf_data(buf); /* First dword */ msdu_len = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_LEN_GET(*msdu_hdr); @@ -1096,8 +1096,8 @@ htt_rx_offload_msdu_pop_ll(htt_pdev_handle pdev, *tid = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_TID_GET(*msdu_hdr); *fw_desc = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_DESC_GET(*msdu_hdr); - cdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES); - cdf_nbuf_set_pktlen(buf, msdu_len); + qdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES); + qdf_nbuf_set_pktlen(buf, msdu_len); return 0; } @@ -1109,9 +1109,9 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, int *peer_id, int *tid, uint8_t *fw_desc, - cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf) + qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf) { - cdf_nbuf_t buf; + qdf_nbuf_t buf; uint32_t *msdu_hdr, msdu_len; uint32_t *curr_msdu; uint32_t paddr; @@ -1125,13 +1125,13 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, qdf_print("%s: netbuf pop failed!\n", __func__); return 0; } - cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); + qdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); + qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE); #endif - msdu_hdr = (uint32_t *) cdf_nbuf_data(buf); + msdu_hdr = (uint32_t *) qdf_nbuf_data(buf); /* First dword */ msdu_len = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_LEN_GET(*msdu_hdr); @@ -1143,13 +1143,13 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, *tid = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_TID_GET(*msdu_hdr); *fw_desc = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_DESC_GET(*msdu_hdr); - cdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES); - cdf_nbuf_set_pktlen(buf, msdu_len); + qdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES); + qdf_nbuf_set_pktlen(buf, msdu_len); return 0; } extern void -dump_pkt(cdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len); +dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len); #ifdef RX_HASH_DEBUG #define HTT_RX_CHECK_MSDU_COUNT(msdu_count) HTT_ASSERT_ALWAYS(msdu_count) @@ -1160,10 +1160,10 @@ dump_pkt(cdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len); /* Return values: 1 - success, 0 - failure */ int htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu) + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu) { - cdf_nbuf_t msdu, next, prev = NULL; + qdf_nbuf_t msdu, next, prev = NULL; uint8_t *rx_ind_data; uint32_t *msg_word; unsigned int msdu_count = 0; @@ -1172,7 +1172,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0); - rx_ind_data = cdf_nbuf_data(rx_ind_msg); + rx_ind_data = qdf_nbuf_data(rx_ind_msg); msg_word = (uint32_t *) rx_ind_data; offload_ind = HTT_RX_IN_ORD_PADDR_IND_OFFLOAD_GET(*msg_word); @@ -1206,14 +1206,14 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, * Set the netbuf length to be the entire buffer length * initially, so the unmap will unmap the entire buffer. */ - cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); + qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); #ifdef DEBUG_DMA_DONE - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL); #else - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); #endif - /* cache consistency has been taken care of by cdf_nbuf_unmap */ + /* cache consistency has been taken care of by qdf_nbuf_unmap */ rx_desc = htt_rx_desc(msdu); htt_rx_extract_lro_info(msdu, rx_desc); @@ -1222,14 +1222,14 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, * Make the netbuf's data pointer point to the payload rather * than the descriptor. */ - cdf_nbuf_pull_head(msdu, HTT_RX_STD_DESC_RESERVATION); + qdf_nbuf_pull_head(msdu, HTT_RX_STD_DESC_RESERVATION); #if HTT_PADDR64 #define NEXT_FIELD_OFFSET_IN32 2 #else /* ! HTT_PADDR64 */ #define NEXT_FIELD_OFFSET_IN32 1 #endif /* HTT_PADDR64 */ # - cdf_nbuf_trim_tail(msdu, + qdf_nbuf_trim_tail(msdu, HTT_RX_BUF_SIZE - (RX_STD_DESC_SIZE + HTT_RX_IN_ORD_PADDR_IND_MSDU_LEN_GET( @@ -1263,7 +1263,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, return 0; } else { *tail_msdu = prev; - cdf_nbuf_set_next(prev, NULL); + qdf_nbuf_set_next(prev, NULL); return 1; } } else { /* if this is not the last msdu */ @@ -1284,7 +1284,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, * next pointer of the preceding msdu */ if (prev) { - cdf_nbuf_set_next(prev, next); + qdf_nbuf_set_next(prev, next); } else { /* if this is the first msdu, update the * head pointer @@ -1311,22 +1311,22 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, *tail_msdu = NULL; return 0; } - cdf_nbuf_set_next(msdu, next); + qdf_nbuf_set_next(msdu, next); prev = msdu; msdu = next; } else { *tail_msdu = msdu; - cdf_nbuf_set_next(msdu, NULL); + qdf_nbuf_set_next(msdu, NULL); } } return 1; } -/* Util fake function that has same prototype as cdf_nbuf_clone that just +/* Util fake function that has same prototype as qdf_nbuf_clone that just * retures the same nbuf */ -cdf_nbuf_t htt_rx_cdf_noclone_buf(cdf_nbuf_t buf) +qdf_nbuf_t htt_rx_cdf_noclone_buf(qdf_nbuf_t buf) { return buf; } @@ -1393,15 +1393,15 @@ htt_rx_parse_ppdu_start_status(struct htt_host_rx_desc_base *rx_desc, /* This function is used by montior mode code to restitch an MSDU list * corresponding to an MPDU back into an MPDU by linking up the skbs. */ -cdf_nbuf_t +qdf_nbuf_t htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, - cdf_nbuf_t head_msdu, + qdf_nbuf_t head_msdu, struct ieee80211_rx_status *rx_status, unsigned clone_not_reqd) { - cdf_nbuf_t msdu, mpdu_buf, prev_buf, msdu_orig, head_frag_list_cloned; - cdf_nbuf_t (*clone_nbuf_fn)(cdf_nbuf_t buf); + qdf_nbuf_t msdu, mpdu_buf, prev_buf, msdu_orig, head_frag_list_cloned; + qdf_nbuf_t (*clone_nbuf_fn)(qdf_nbuf_t buf); unsigned decap_format, wifi_hdr_len, sec_hdr_len, msdu_llc_len, mpdu_buf_len, decap_hdr_pull_bytes, frag_list_sum_len, dir, is_amsdu, is_first_frag, amsdu_pad, msdu_len; @@ -1415,7 +1415,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, * waste cycles cloning the packets */ clone_nbuf_fn = - clone_not_reqd ? htt_rx_cdf_noclone_buf : cdf_nbuf_clone; + clone_not_reqd ? htt_rx_cdf_noclone_buf : qdf_nbuf_clone; /* The nbuf has been pulled just beyond the status and points to the * payload @@ -1452,13 +1452,13 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, frag_list_sum_len = 0; is_first_frag = 1; - msdu_len = cdf_nbuf_len(mpdu_buf); + msdu_len = qdf_nbuf_len(mpdu_buf); /* Drop the zero-length msdu */ if (!msdu_len) goto mpdu_stitch_fail; - msdu_orig = cdf_nbuf_next(head_msdu); + msdu_orig = qdf_nbuf_next(head_msdu); while (msdu_orig) { @@ -1472,7 +1472,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, head_frag_list_cloned = msdu; } - msdu_len = cdf_nbuf_len(msdu); + msdu_len = qdf_nbuf_len(msdu); /* Drop the zero-length msdu */ if (!msdu_len) goto mpdu_stitch_fail; @@ -1480,22 +1480,22 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, frag_list_sum_len += msdu_len; /* Maintain the linking of the cloned MSDUS */ - cdf_nbuf_set_next_ext(prev_buf, msdu); + qdf_nbuf_set_next_ext(prev_buf, msdu); /* Move to the next */ prev_buf = msdu; - msdu_orig = cdf_nbuf_next(msdu_orig); + msdu_orig = qdf_nbuf_next(msdu_orig); } /* The last msdu length need be larger than HTT_FCS_LEN */ if (msdu_len < HTT_FCS_LEN) goto mpdu_stitch_fail; - cdf_nbuf_trim_tail(prev_buf, HTT_FCS_LEN); + qdf_nbuf_trim_tail(prev_buf, HTT_FCS_LEN); /* If there were more fragments to this RAW frame */ if (head_frag_list_cloned) { - cdf_nbuf_append_ext_list(mpdu_buf, + qdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned, frag_list_sum_len); } @@ -1544,7 +1544,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, * accomodating any radio-tap /prism like PHY header */ #define HTT_MAX_MONITOR_HEADER (512) - mpdu_buf = cdf_nbuf_alloc(pdev->osdev, + mpdu_buf = qdf_nbuf_alloc(pdev->osdev, HTT_MAX_MONITOR_HEADER + mpdu_buf_len, HTT_MAX_MONITOR_HEADER, 4, false); @@ -1556,7 +1556,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, */ prev_buf = mpdu_buf; - dest = cdf_nbuf_put_tail(prev_buf, wifi_hdr_len); + dest = qdf_nbuf_put_tail(prev_buf, wifi_hdr_len); if (!dest) goto mpdu_stitch_fail; qdf_mem_copy(dest, hdr_desc, wifi_hdr_len); @@ -1591,7 +1591,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, } else { /* Maintain the linking of the cloned MSDUS */ - cdf_nbuf_set_next_ext(prev_buf, msdu); + qdf_nbuf_set_next_ext(prev_buf, msdu); /* Reload the hdr ptr only on non-first MSDUs */ rx_desc = htt_rx_desc(msdu_orig); @@ -1600,18 +1600,18 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, } /* Copy this buffers MSDU related status into the prev buffer */ - dest = cdf_nbuf_put_tail(prev_buf, msdu_llc_len + amsdu_pad); + dest = qdf_nbuf_put_tail(prev_buf, msdu_llc_len + amsdu_pad); dest += amsdu_pad; qdf_mem_copy(dest, hdr_desc, msdu_llc_len); /* Push the MSDU buffer beyond the decap header */ - cdf_nbuf_pull_head(msdu, decap_hdr_pull_bytes); + qdf_nbuf_pull_head(msdu, decap_hdr_pull_bytes); frag_list_sum_len += - msdu_llc_len + cdf_nbuf_len(msdu) + amsdu_pad; + msdu_llc_len + qdf_nbuf_len(msdu) + amsdu_pad; /* Set up intra-AMSDU pad to be added to start of next buffer - * AMSDU pad is 4 byte pad on AMSDU subframe */ - amsdu_pad = (msdu_llc_len + cdf_nbuf_len(msdu)) & 0x3; + amsdu_pad = (msdu_llc_len + qdf_nbuf_len(msdu)) & 0x3; amsdu_pad = amsdu_pad ? (4 - amsdu_pad) : 0; /* TODO FIXME How do we handle MSDUs that have fraglist - Should @@ -1621,12 +1621,12 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, /* Move to the next */ prev_buf = msdu; - msdu_orig = cdf_nbuf_next(msdu_orig); + msdu_orig = qdf_nbuf_next(msdu_orig); } /* TODO: Convert this to suitable cdf routines */ - cdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned, + qdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned, frag_list_sum_len); mpdu_stitch_done: @@ -1644,8 +1644,8 @@ mpdu_stitch_done: msdu = head_msdu; while (msdu) { msdu_orig = msdu; - msdu = cdf_nbuf_next(msdu); - cdf_nbuf_set_next(msdu_orig, NULL); + msdu = qdf_nbuf_next(msdu); + qdf_nbuf_set_next(msdu_orig, NULL); } } @@ -1656,27 +1656,27 @@ mpdu_stitch_fail: if (!clone_not_reqd) { /* Free the head buffer */ if (mpdu_buf) - cdf_nbuf_free(mpdu_buf); + qdf_nbuf_free(mpdu_buf); /* Free the partial list */ while (head_frag_list_cloned) { msdu = head_frag_list_cloned; head_frag_list_cloned = - cdf_nbuf_next_ext(head_frag_list_cloned); - cdf_nbuf_free(msdu); + qdf_nbuf_next_ext(head_frag_list_cloned); + qdf_nbuf_free(msdu); } } else { /* Free the alloced head buffer */ if (decap_format != HW_RX_DECAP_FORMAT_RAW) if (mpdu_buf) - cdf_nbuf_free(mpdu_buf); + qdf_nbuf_free(mpdu_buf); /* Free the orig buffers */ msdu = head_msdu; while (msdu) { msdu_orig = msdu; - msdu = cdf_nbuf_next(msdu); - cdf_nbuf_free(msdu_orig); + msdu = qdf_nbuf_next(msdu); + qdf_nbuf_free(msdu_orig); } } @@ -1698,8 +1698,8 @@ int16_t htt_rx_mpdu_desc_rssi_dbm(htt_pdev_handle pdev, void *mpdu_desc) * to either htt_rx_amsdu_pop_ll or htt_rx_amsdu_rx_in_order_pop_ll. */ int (*htt_rx_amsdu_pop)(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu); + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu); /* * htt_rx_frag_pop - @@ -1707,20 +1707,20 @@ int (*htt_rx_amsdu_pop)(htt_pdev_handle pdev, * to either htt_rx_amsdu_pop_ll */ int (*htt_rx_frag_pop)(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu); + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu); int (*htt_rx_offload_msdu_pop)(htt_pdev_handle pdev, - cdf_nbuf_t offload_deliver_msg, + qdf_nbuf_t offload_deliver_msg, int *vdev_id, int *peer_id, int *tid, uint8_t *fw_desc, - cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf); + qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf); void * (*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg); + qdf_nbuf_t rx_ind_msg); bool (*htt_rx_mpdu_desc_retry)( htt_pdev_handle pdev, void *mpdu_desc); @@ -1744,17 +1744,17 @@ bool (*htt_rx_msdu_is_wlan_mcast)(htt_pdev_handle pdev, void *msdu_desc); int (*htt_rx_msdu_is_frag)(htt_pdev_handle pdev, void *msdu_desc); -void * (*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, cdf_nbuf_t msdu); +void * (*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, qdf_nbuf_t msdu); bool (*htt_rx_mpdu_is_encrypted)(htt_pdev_handle pdev, void *mpdu_desc); bool (*htt_rx_msdu_desc_key_id)(htt_pdev_handle pdev, void *mpdu_desc, uint8_t *key_id); -void *htt_rx_mpdu_desc_list_next_ll(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +void *htt_rx_mpdu_desc_list_next_ll(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { int idx = pdev->rx_ring.sw_rd_idx.msdu_desc; - cdf_nbuf_t netbuf = pdev->rx_ring.buf.netbufs_ring[idx]; + qdf_nbuf_t netbuf = pdev->rx_ring.buf.netbufs_ring[idx]; pdev->rx_ring.sw_rd_idx.msdu_desc = pdev->rx_ring.sw_rd_idx.msdu_payld; return (void *)htt_rx_desc(netbuf); } @@ -1773,12 +1773,12 @@ bool (*htt_rx_msdu_center_freq)( uint8_t *phy_mode); void *htt_rx_in_ord_mpdu_desc_list_next_ll(htt_pdev_handle pdev, - cdf_nbuf_t netbuf) + qdf_nbuf_t netbuf) { return (void *)htt_rx_desc(netbuf); } -void *htt_rx_msdu_desc_retrieve_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu) +void *htt_rx_msdu_desc_retrieve_ll(htt_pdev_handle pdev, qdf_nbuf_t msdu) { return htt_rx_desc(msdu); } @@ -1834,12 +1834,12 @@ htt_rx_msdu_desc_key_id_ll(htt_pdev_handle pdev, void *mpdu_desc, return true; } -void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu) +void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu) { - cdf_nbuf_free(msdu); + qdf_nbuf_free(msdu); } -void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu) +void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu) { /* * The rx descriptor is in the same buffer as the rx MSDU payload, @@ -1944,7 +1944,7 @@ static inline void htt_list_remove(struct htt_list_node *node) Returns 0 - success, 1 - failure */ int htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, - cdf_nbuf_t netbuf) + qdf_nbuf_t netbuf) { int i; struct htt_rx_hash_entry *hash_element = NULL; @@ -1994,11 +1994,11 @@ htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, /* Given a physical address this function will find the corresponding network buffer from the hash table. Note: this function is not thread-safe */ -cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr) +qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr) { uint32_t i; struct htt_list_node *list_iter = NULL; - cdf_nbuf_t netbuf = NULL; + qdf_nbuf_t netbuf = NULL; struct htt_rx_hash_entry *hash_entry; i = RX_HASH_FUNCTION(paddr); @@ -2162,7 +2162,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) *pdev->rx_ring.target_idx.vaddr = 0; } else { pdev->rx_ring.buf.netbufs_ring = - qdf_mem_malloc(pdev->rx_ring.size * sizeof(cdf_nbuf_t)); + qdf_mem_malloc(pdev->rx_ring.size * sizeof(qdf_nbuf_t)); if (!pdev->rx_ring.buf.netbufs_ring) goto fail1; diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 6cf12e972b31..efefeb4b9bf5 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -38,7 +38,7 @@ #include #include /* HTC_PACKET */ #include /* HTT_T2H_MSG_TYPE, etc. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include #include @@ -86,16 +86,16 @@ static uint8_t *htt_t2h_mac_addr_deswizzle(uint8_t *tgt_mac_addr, #endif } -static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, cdf_nbuf_t msg) +static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, qdf_nbuf_t msg) { uint32_t *msg_word; unsigned num_msdu_bytes; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; struct htt_host_rx_desc_base *rx_desc; int start_idx; uint8_t *p_fw_msdu_rx_desc = 0; - msg_word = (uint32_t *) cdf_nbuf_data(msg); + msg_word = (uint32_t *) qdf_nbuf_data(msg); num_msdu_bytes = HTT_RX_FRAG_IND_FW_RX_DESC_BYTES_GET( *(msg_word + HTT_RX_FRAG_IND_HDR_PREFIX_SIZE32)); /* @@ -123,22 +123,22 @@ static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, cdf_nbuf_t msg) */ start_idx = pdev->rx_ring.sw_rd_idx.msdu_payld; msdu = pdev->rx_ring.buf.netbufs_ring[start_idx]; - cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); + qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); rx_desc = htt_rx_desc(msdu); *((uint8_t *) &rx_desc->fw_desc.u.val) = *p_fw_msdu_rx_desc; rx_desc->msdu_end.last_msdu = 1; - cdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); + qdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE); } /* Target to host Msg/event handler for low priority messages*/ -void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) +void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg) { struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; uint32_t *msg_word; enum htt_t2h_msg_type msg_type; - msg_word = (uint32_t *) cdf_nbuf_data(htt_t2h_msg); + msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg); msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); switch (msg_type) { case HTT_T2H_MSG_TYPE_VERSION_CONF: @@ -473,7 +473,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) break; }; /* Free the indication buffer */ - cdf_nbuf_free(htt_t2h_msg); + qdf_nbuf_free(htt_t2h_msg); } /* Generic Target to host Msg/event handler for low priority messages @@ -484,7 +484,7 @@ void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg) void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) { struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; - cdf_nbuf_t htt_t2h_msg = (cdf_nbuf_t) pkt->pPktContext; + qdf_nbuf_t htt_t2h_msg = (qdf_nbuf_t) pkt->pPktContext; uint32_t *msg_word; enum htt_t2h_msg_type msg_type; @@ -492,21 +492,21 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) if (pkt->Status != A_OK) { if (pkt->Status != A_ECANCELED) pdev->stats.htc_err_cnt++; - cdf_nbuf_free(htt_t2h_msg); + qdf_nbuf_free(htt_t2h_msg); return; } #ifdef HTT_RX_RESTORE if (qdf_unlikely(pdev->rx_ring.rx_reset)) { qdf_print("rx restore ..\n"); - cdf_nbuf_free(htt_t2h_msg); + qdf_nbuf_free(htt_t2h_msg); return; } #endif /* confirm alignment */ - HTT_ASSERT3((((unsigned long)cdf_nbuf_data(htt_t2h_msg)) & 0x3) == 0); + HTT_ASSERT3((((unsigned long)qdf_nbuf_data(htt_t2h_msg)) & 0x3) == 0); - msg_word = (uint32_t *) cdf_nbuf_data(htt_t2h_msg); + msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg); msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); #if defined(HELIUMPLUS_DEBUG) @@ -686,7 +686,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) }; /* Free the indication buffer */ - cdf_nbuf_free(htt_t2h_msg); + qdf_nbuf_free(htt_t2h_msg); } /*--- target->host HTT message Info Element access methods ------------------*/ @@ -717,43 +717,43 @@ uint16_t htt_tx_compl_desc_id(void *iterator, int num) /*--- rx indication message ---*/ -int htt_rx_ind_flush(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +int htt_rx_ind_flush(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); return HTT_RX_IND_FLUSH_VALID_GET(*msg_word); } void htt_rx_ind_flush_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, unsigned *seq_num_start, unsigned *seq_num_end) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); msg_word++; *seq_num_start = HTT_RX_IND_FLUSH_SEQ_NUM_START_GET(*msg_word); *seq_num_end = HTT_RX_IND_FLUSH_SEQ_NUM_END_GET(*msg_word); } -int htt_rx_ind_release(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +int htt_rx_ind_release(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); return HTT_RX_IND_REL_VALID_GET(*msg_word); } void htt_rx_ind_release_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, unsigned *seq_num_start, unsigned *seq_num_end) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); msg_word++; *seq_num_start = HTT_RX_IND_REL_SEQ_NUM_START_GET(*msg_word); *seq_num_end = HTT_RX_IND_REL_SEQ_NUM_END_GET(*msg_word); @@ -761,13 +761,13 @@ htt_rx_ind_release_seq_num_range(htt_pdev_handle pdev, void htt_rx_ind_mpdu_range_info(struct htt_pdev_t *pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, int mpdu_range_num, enum htt_rx_status *status, int *mpdu_count) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg); msg_word += pdev->rx_mpdu_range_offset_words + mpdu_range_num; *status = HTT_RX_IND_MPDU_STATUS_GET(*msg_word); *mpdu_count = HTT_RX_IND_MPDU_COUNT_GET(*msg_word); @@ -783,13 +783,13 @@ htt_rx_ind_mpdu_range_info(struct htt_pdev_t *pdev, * * Return: RSSI in dBm, or HTT_INVALID_RSSI */ -int16_t htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +int16_t htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { int8_t rssi; uint32_t *msg_word; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg) + + (qdf_nbuf_data(rx_ind_msg) + HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET); /* check if the RX_IND message contains valid rx PPDU start info */ @@ -813,7 +813,7 @@ int16_t htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) * Return: RSSI, or HTT_INVALID_RSSI */ int16_t -htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, int8_t chain) { int8_t rssi; @@ -823,7 +823,7 @@ htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, return HTT_RSSI_INVALID; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg) + + (qdf_nbuf_data(rx_ind_msg) + HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET); /* check if the RX_IND message contains valid rx PPDU start info */ @@ -869,13 +869,13 @@ htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, * Return the data rate provided in a rx indication message. */ void -htt_rx_ind_legacy_rate(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_legacy_rate(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, uint8_t *legacy_rate, uint8_t *legacy_rate_sel) { uint32_t *msg_word; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg) + + (qdf_nbuf_data(rx_ind_msg) + HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET); /* check if the RX_IND message contains valid rx PPDU start info */ @@ -901,14 +901,14 @@ htt_rx_ind_legacy_rate(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, * Return the timestamp provided in a rx indication message. */ void -htt_rx_ind_timestamp(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_timestamp(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, uint32_t *timestamp_microsec, uint8_t *timestamp_submicrosec) { uint32_t *msg_word; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg) + + (qdf_nbuf_data(rx_ind_msg) + HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET); /* check if the RX_IND message contains valid rx PPDU start info */ @@ -934,12 +934,12 @@ htt_rx_ind_timestamp(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, * Return: TSF timestamp */ uint32_t -htt_rx_ind_tsf32(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +htt_rx_ind_tsf32(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { uint32_t *msg_word; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg) + + (qdf_nbuf_data(rx_ind_msg) + HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET); /* check if the RX_IND message contains valid rx PPDU start info */ @@ -959,12 +959,12 @@ htt_rx_ind_tsf32(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) * Return: Extended TID */ uint8_t -htt_rx_ind_ext_tid(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg) +htt_rx_ind_ext_tid(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg) { uint32_t *msg_word; msg_word = (uint32_t *) - (cdf_nbuf_data(rx_ind_msg)); + (qdf_nbuf_data(rx_ind_msg)); return HTT_RX_IND_EXT_TID_GET(*msg_word); } @@ -987,12 +987,12 @@ htt_t2h_dbg_stats_hdr_parse(uint8_t *stats_info_list, void htt_rx_frag_ind_flush_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_frag_ind_msg, + qdf_nbuf_t rx_frag_ind_msg, int *seq_num_start, int *seq_num_end) { uint32_t *msg_word; - msg_word = (uint32_t *) cdf_nbuf_data(rx_frag_ind_msg); + msg_word = (uint32_t *) qdf_nbuf_data(rx_frag_ind_msg); msg_word++; *seq_num_start = HTT_RX_FRAG_IND_FLUSH_SEQ_NUM_START_GET(*msg_word); *seq_num_end = HTT_RX_FRAG_IND_FLUSH_SEQ_NUM_END_GET(*msg_word); diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index d53caf95ba26..757ba4405d8e 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -39,7 +39,7 @@ #include /* uint32_t, offsetof, etc. */ #include /* qdf_dma_addr_t */ #include /* qdf_mem_alloc_consistent et al */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_mdelay */ #include /* htt_tx_msdu_desc_t */ @@ -548,7 +548,7 @@ void htt_tx_desc_flag_batch_more(htt_pdev_handle pdev, void *desc) because of No CE desc*/ void htt_tx_sched(htt_pdev_handle pdev) { - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; int download_len = pdev->download_len; int packet_len; @@ -556,7 +556,7 @@ void htt_tx_sched(htt_pdev_handle pdev) while (msdu != NULL) { int not_accepted; /* packet length includes HTT tx desc frag added above */ - packet_len = cdf_nbuf_len(msdu); + packet_len = qdf_nbuf_len(msdu); if (packet_len < download_len) { /* * This case of packet length being less than the @@ -583,7 +583,7 @@ void htt_tx_sched(htt_pdev_handle pdev) } } -int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) +int htt_tx_send_std(htt_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t msdu_id) { int download_len = pdev->download_len; @@ -591,7 +591,7 @@ int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) int packet_len; /* packet length includes HTT tx desc frag added above */ - packet_len = cdf_nbuf_len(msdu); + packet_len = qdf_nbuf_len(msdu); if (packet_len < download_len) { /* * This case of packet length being less than the nominal @@ -605,17 +605,17 @@ int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) download_len = packet_len; } - NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT); + QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_HTT); DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(msdu)), - sizeof(cdf_nbuf_data(msdu)))); - if (cdf_nbuf_queue_len(&pdev->txnbufq) > 0) { + (uint8_t *)(qdf_nbuf_data(msdu)), + sizeof(qdf_nbuf_data(msdu)))); + if (qdf_nbuf_queue_len(&pdev->txnbufq) > 0) { HTT_TX_NBUF_QUEUE_ADD(pdev, msdu); htt_tx_sched(pdev); return 0; } - cdf_nbuf_trace_update(msdu, "HT:T:"); + qdf_nbuf_trace_update(msdu, "HT:T:"); if (htc_send_data_pkt (pdev->htc_pdev, msdu, pdev->htc_endpoint, download_len)) { HTT_TX_NBUF_QUEUE_ADD(pdev, msdu); @@ -643,8 +643,8 @@ void htt_tx_resume_handler(void *context) { } #endif -cdf_nbuf_t -htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) +qdf_nbuf_t +htt_tx_send_batch(htt_pdev_handle pdev, qdf_nbuf_t head_msdu, int num_msdus) { qdf_print("*** %s curently only applies for HL systems\n", __func__); qdf_assert(0); @@ -654,7 +654,7 @@ htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) int htt_tx_send_nonstd(htt_pdev_handle pdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, uint16_t msdu_id, enum htt_pkt_type pkt_type) { int download_len; @@ -678,15 +678,15 @@ htt_tx_send_nonstd(htt_pdev_handle pdev, #ifdef QCA_TX_HTT2_SUPPORT static inline HTC_ENDPOINT_ID -htt_tx_htt2_get_ep_id(htt_pdev_handle pdev, cdf_nbuf_t msdu) +htt_tx_htt2_get_ep_id(htt_pdev_handle pdev, qdf_nbuf_t msdu) { /* * TX HTT2 service mainly for small sized frame and check if * this candidate frame allow or not. */ if ((pdev->htc_tx_htt2_endpoint != ENDPOINT_UNUSED) && - cdf_nbuf_get_tx_parallel_dnload_frm(msdu) && - (cdf_nbuf_len(msdu) < pdev->htc_tx_htt2_max_size)) + qdf_nbuf_get_tx_parallel_dnload_frm(msdu) && + (qdf_nbuf_len(msdu) < pdev->htc_tx_htt2_max_size)) return pdev->htc_tx_htt2_endpoint; else return pdev->htc_endpoint; @@ -697,7 +697,7 @@ htt_tx_htt2_get_ep_id(htt_pdev_handle pdev, cdf_nbuf_t msdu) static inline int htt_tx_send_base(htt_pdev_handle pdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, uint16_t msdu_id, int download_len, uint8_t more_data) { struct htt_host_tx_desc_t *htt_host_tx_desc; @@ -711,7 +711,7 @@ htt_tx_send_base(htt_pdev_handle pdev, * Retrieve it so we can provide its HTC header space to HTC. */ htt_host_tx_desc = (struct htt_host_tx_desc_t *) - cdf_nbuf_get_frag_vaddr(msdu, 0); + qdf_nbuf_get_frag_vaddr(msdu, 0); pkt = htt_htc_pkt_alloc(pdev); if (!pkt) @@ -721,7 +721,7 @@ htt_tx_send_base(htt_pdev_handle pdev, pkt->pdev_ctxt = pdev->txrx_pdev; /* packet length includes HTT tx desc frag added above */ - packet_len = cdf_nbuf_len(msdu); + packet_len = qdf_nbuf_len(msdu); if (packet_len < download_len) { /* * This case of packet length being less than the nominal @@ -746,23 +746,23 @@ htt_tx_send_base(htt_pdev_handle pdev, SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msdu); - cdf_nbuf_trace_update(msdu, "HT:T:"); - NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT); + qdf_nbuf_trace_update(msdu, "HT:T:"); + QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_HTT); DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(msdu)), - sizeof(cdf_nbuf_data(msdu)))); + (uint8_t *)(qdf_nbuf_data(msdu)), + sizeof(qdf_nbuf_data(msdu)))); htc_send_data_pkt(pdev->htc_pdev, &pkt->htc_pkt, more_data); return 0; /* success */ } -cdf_nbuf_t -htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) +qdf_nbuf_t +htt_tx_send_batch(htt_pdev_handle pdev, qdf_nbuf_t head_msdu, int num_msdus) { - cdf_nbuf_t rejected = NULL; + qdf_nbuf_t rejected = NULL; uint16_t *msdu_id_storage; uint16_t msdu_id; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; /* * FOR NOW, iterate through the batch, sending the frames singly. * Eventually HTC and HIF should be able to accept a batch of @@ -770,14 +770,14 @@ htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) */ msdu = head_msdu; while (num_msdus--) { - cdf_nbuf_t next_msdu = cdf_nbuf_next(msdu); + qdf_nbuf_t next_msdu = qdf_nbuf_next(msdu); msdu_id_storage = ol_tx_msdu_id_storage(msdu); msdu_id = *msdu_id_storage; /* htt_tx_send_base returns 0 as success and 1 as failure */ if (htt_tx_send_base(pdev, msdu, msdu_id, pdev->download_len, num_msdus)) { - cdf_nbuf_set_next(msdu, rejected); + qdf_nbuf_set_next(msdu, rejected); rejected = msdu; } msdu = next_msdu; @@ -787,7 +787,7 @@ htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus) int htt_tx_send_nonstd(htt_pdev_handle pdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, uint16_t msdu_id, enum htt_pkt_type pkt_type) { int download_len; @@ -806,7 +806,7 @@ htt_tx_send_nonstd(htt_pdev_handle pdev, return htt_tx_send_base(pdev, msdu, msdu_id, download_len, 0); } -int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id) +int htt_tx_send_std(htt_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t msdu_id) { return htt_tx_send_base(pdev, msdu, msdu_id, pdev->download_len, 0); } @@ -865,7 +865,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, unsigned int uc_tx_partition_base) { unsigned int tx_buffer_count; - cdf_nbuf_t buffer_vaddr; + qdf_nbuf_t buffer_vaddr; qdf_dma_addr_t buffer_paddr; uint32_t *header_ptr; uint32_t *ring_vaddr; @@ -876,7 +876,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, /* Allocate TX buffers as many as possible */ for (tx_buffer_count = 0; tx_buffer_count < (uc_tx_buf_cnt - 1); tx_buffer_count++) { - buffer_vaddr = cdf_nbuf_alloc(pdev->osdev, + buffer_vaddr = qdf_nbuf_alloc(pdev->osdev, uc_tx_buf_sz, 0, 4, false); if (!buffer_vaddr) { qdf_print("%s: TX BUF alloc fail, loop index: %d", @@ -885,8 +885,8 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, } /* Init buffer */ - qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); - header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr); + qdf_mem_zero(qdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); + header_ptr = (uint32_t *) qdf_nbuf_data(buffer_vaddr); /* HTT control header */ *header_ptr = HTT_IPA_UC_OFFLOAD_TX_HEADER_DEFAULT; @@ -896,8 +896,8 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, *header_ptr |= ((uint16_t) uc_tx_partition_base + tx_buffer_count) << 16; - cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); - buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); + qdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); + buffer_paddr = qdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; *header_ptr = (uint32_t) (buffer_paddr + IPA_UC_TX_BUF_FRAG_DESC_OFFSET); @@ -924,7 +924,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, unsigned int uc_tx_partition_base) { unsigned int tx_buffer_count; - cdf_nbuf_t buffer_vaddr; + qdf_nbuf_t buffer_vaddr; qdf_dma_addr_t buffer_paddr; uint32_t *header_ptr; uint32_t *ring_vaddr; @@ -936,7 +936,7 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, /* Allocate TX buffers as many as possible */ for (tx_buffer_count = 0; tx_buffer_count < (uc_tx_buf_cnt - 1); tx_buffer_count++) { - buffer_vaddr = cdf_nbuf_alloc(pdev->osdev, + buffer_vaddr = qdf_nbuf_alloc(pdev->osdev, uc_tx_buf_sz, 0, 4, false); if (!buffer_vaddr) { qdf_print("%s: TX BUF alloc fail, loop index: %d", @@ -945,8 +945,8 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, } /* Init buffer */ - qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); - header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr); + qdf_mem_zero(qdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz); + header_ptr = (uint32_t *) qdf_nbuf_data(buffer_vaddr); /* HTT control header */ *header_ptr = HTT_IPA_UC_OFFLOAD_TX_HEADER_DEFAULT; @@ -956,8 +956,8 @@ int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev, *header_ptr |= ((uint16_t) uc_tx_partition_base + tx_buffer_count) << 16; - cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); - buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0); + qdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL); + buffer_paddr = qdf_nbuf_get_frag_paddr(buffer_vaddr, 0); header_ptr++; /* Frag Desc Pointer */ @@ -1019,7 +1019,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, } /* Allocate TX COMP Ring */ - tx_comp_ring_size = uc_tx_buf_cnt * sizeof(cdf_nbuf_t); + tx_comp_ring_size = uc_tx_buf_cnt * sizeof(qdf_nbuf_t); pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr = qdf_mem_alloc_consistent( pdev->osdev, pdev->osdev->dev, @@ -1035,15 +1035,15 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, /* Allocate TX BUF vAddress Storage */ pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg = - (cdf_nbuf_t *) qdf_mem_malloc(uc_tx_buf_cnt * - sizeof(cdf_nbuf_t)); + (qdf_nbuf_t *) qdf_mem_malloc(uc_tx_buf_cnt * + sizeof(qdf_nbuf_t)); if (!pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg) { qdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__); return_code = -ENOBUFS; goto free_tx_comp_base; } qdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg, - uc_tx_buf_cnt * sizeof(cdf_nbuf_t)); + uc_tx_buf_cnt * sizeof(qdf_nbuf_t)); pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt = htt_tx_ipa_uc_wdi_tx_buf_alloc( pdev, uc_tx_buf_sz, uc_tx_buf_cnt, uc_tx_partition_base); @@ -1090,7 +1090,8 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { qdf_mem_free_consistent( pdev->osdev, - ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t), + ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * + sizeof(qdf_nbuf_t), pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc. @@ -1101,11 +1102,11 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) /* Free each single buffer */ for (idx = 0; idx < pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt; idx++) { if (pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx]) { - cdf_nbuf_unmap(pdev->osdev, + qdf_nbuf_unmap(pdev->osdev, pdev->ipa_uc_tx_rsc. tx_buf_pool_vaddr_strg[idx], QDF_DMA_FROM_DEVICE); - cdf_nbuf_free(pdev->ipa_uc_tx_rsc. + qdf_nbuf_free(pdev->ipa_uc_tx_rsc. tx_buf_pool_vaddr_strg[idx]); } } diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 671200c36291..0be83c8e8e7f 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -33,7 +33,7 @@ #include /* qdf_spinlock_t */ #include /* qdf_timer_t */ #include /* qdf_atomic_inc */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* HTC_PACKET */ #include /* ol_pdev_handle */ @@ -83,9 +83,9 @@ struct htt_host_tx_desc_t { }; struct htt_tx_mgmt_desc_buf { - cdf_nbuf_t msg_buf; + qdf_nbuf_t msg_buf; A_BOOL is_inuse; - cdf_nbuf_t mgmt_frm; + qdf_nbuf_t mgmt_frm; }; struct htt_tx_mgmt_desc_ctxt { @@ -100,7 +100,7 @@ struct htt_list_node { struct htt_rx_hash_entry { A_UINT32 paddr; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; A_UINT8 fromlist; struct htt_list_node listnode; #ifdef RX_HASH_DEBUG @@ -133,7 +133,7 @@ struct htt_ipa_uc_tx_resource_t { struct uc_shared_mem_t tx_comp_base; uint32_t tx_comp_idx_paddr; - cdf_nbuf_t *tx_buf_pool_vaddr_strg; + qdf_nbuf_t *tx_buf_pool_vaddr_strg; uint32_t alloc_tx_buf_cnt; }; @@ -229,7 +229,7 @@ struct htt_pdev_t { #ifdef ATH_11AC_TXCOMPACT HTT_TX_MUTEX_TYPE txnbufq_mutex; - cdf_nbuf_queue_t txnbufq; + qdf_nbuf_queue_t txnbufq; struct htt_htc_pkt_union *htt_htc_pkt_misclist; #endif @@ -259,7 +259,7 @@ struct htt_pdev_t { * The host SW uses this netbufs ring to locate the nw * buffer objects whose data buffers the HW has filled. */ - cdf_nbuf_t *netbufs_ring; + qdf_nbuf_t *netbufs_ring; /* * Ring of buffer addresses - * This ring holds the "physical" device address of the @@ -370,7 +370,7 @@ struct htt_pdev_t { int download_len; void (*tx_send_complete_part2)(void *pdev, A_STATUS status, - cdf_nbuf_t msdu, uint16_t msdu_id); + qdf_nbuf_t msdu, uint16_t msdu_id); HTT_TX_MUTEX_TYPE htt_tx_mutex; diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h index 0cf49b5ac212..e0a7cd8c847d 100644 --- a/core/dp/ol/inc/ol_htt_api.h +++ b/core/dp/ol/inc/ol_htt_api.h @@ -36,7 +36,7 @@ #define _OL_HTT_API__H_ #include /* qdf_device_t */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* A_STATUS */ #include /* HTC_HANDLE */ #include /* ol_pdev_handle */ diff --git a/core/dp/ol/inc/ol_htt_rx_api.h b/core/dp/ol/inc/ol_htt_rx_api.h index 230d87b4a1e8..942b4cb95f01 100644 --- a/core/dp/ol/inc/ol_htt_rx_api.h +++ b/core/dp/ol/inc/ol_htt_rx_api.h @@ -40,7 +40,7 @@ /* #include / * uint16_t, etc. * / */ #include /* uint16_t, etc. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* bool */ #include /* HTT_RX_IND_MPDU_STATUS */ @@ -109,7 +109,7 @@ PREPACK struct ocb_rx_stats_hdr_t { * -OR- * 0 - the message's rx flush command is invalid and should be ignored */ -int htt_rx_ind_flush(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +int htt_rx_ind_flush(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); /** * @brief Return the sequence number starting the range of MPDUs to flush. @@ -138,7 +138,7 @@ int htt_rx_ind_flush(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); */ void htt_rx_ind_flush_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, unsigned *seq_num_start, unsigned *seq_num_end); /** @@ -160,7 +160,7 @@ htt_rx_ind_flush_seq_num_range(htt_pdev_handle pdev, * -OR- * 0 - the message's rx release command is invalid and should be ignored */ -int htt_rx_ind_release(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +int htt_rx_ind_release(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); /** * @brief Return the sequence number starting the range of MPDUs to release. @@ -189,7 +189,7 @@ int htt_rx_ind_release(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); */ void htt_rx_ind_release_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, unsigned *seq_num_start, unsigned *seq_num_end); @@ -234,7 +234,7 @@ enum htt_rx_status { */ void htt_rx_ind_mpdu_range_info(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, int mpdu_range_num, enum htt_rx_status *status, int *mpdu_count); @@ -248,27 +248,27 @@ htt_rx_ind_mpdu_range_info(htt_pdev_handle pdev, * @return RSSI in dBm, or HTT_INVALID_RSSI */ int16_t -htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); int16_t -htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, int8_t chain); void -htt_rx_ind_legacy_rate(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_legacy_rate(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, uint8_t *legacy_rate, uint8_t *legacy_rate_sel); void -htt_rx_ind_timestamp(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg, +htt_rx_ind_timestamp(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg, uint32_t *timestamp_microsec, uint8_t *timestamp_submicrosec); uint32_t -htt_rx_ind_tsf32(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +htt_rx_ind_tsf32(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); uint8_t -htt_rx_ind_ext_tid(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +htt_rx_ind_ext_tid(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); /*==================== rx MPDU descriptor access methods ====================*/ @@ -654,13 +654,13 @@ extern bool */ extern int (*htt_rx_amsdu_pop)(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu); + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu); extern int (*htt_rx_frag_pop)(htt_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, - cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu); + qdf_nbuf_t rx_ind_msg, + qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu); /** * @brief Return a linked list of buffers holding one MSDU @@ -685,12 +685,12 @@ extern int */ extern int (*htt_rx_offload_msdu_pop)(htt_pdev_handle pdev, - cdf_nbuf_t offload_deliver_msg, + qdf_nbuf_t offload_deliver_msg, int *vdev_id, int *peer_id, int *tid, uint8_t *fw_desc, - cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf); + qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf); /** * @brief Return the rx descriptor for the next rx MPDU. @@ -713,7 +713,7 @@ extern int * by an rx ind msg */ extern void * -(*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg); +(*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg); /** * @brief Retrieve a previously-stored rx descriptor from a MSDU buffer. @@ -727,7 +727,7 @@ extern void * * @return the corresponding abstract rx MSDU descriptor */ extern void * -(*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, cdf_nbuf_t msdu); +(*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, qdf_nbuf_t msdu); /** * @brief Free both an rx MSDU descriptor and the associated MSDU buffer. @@ -749,7 +749,7 @@ extern void * * @param rx_msdu_desc - rx descriptor for the MSDU being freed * @param msdu - rx frame buffer for the MSDU being freed */ -void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu); +void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu); /** * @brief Look up and free the rx descriptor for a MSDU. @@ -766,7 +766,7 @@ void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu); * @param htt_pdev - the HTT instance the rx data was received on * @param msdu - rx frame buffer for the rx MSDU descriptor being freed */ -void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu); +void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu); /** * @brief Add new MSDU buffers for the target to fill. @@ -805,9 +805,9 @@ void htt_rx_msdu_buff_replenish(htt_pdev_handle pdev); * list, else operates on a cloned nbuf * @return network buffer handle to the MPDU */ -cdf_nbuf_t +qdf_nbuf_t htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, - cdf_nbuf_t head_msdu, + qdf_nbuf_t head_msdu, struct ieee80211_rx_status *rx_status, unsigned clone_not_reqd); @@ -822,7 +822,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, */ void htt_rx_frag_ind_flush_seq_num_range(htt_pdev_handle pdev, - cdf_nbuf_t rx_frag_ind_msg, + qdf_nbuf_t rx_frag_ind_msg, int *seq_num_start, int *seq_num_end); /** * @brief Return the HL rx desc size @@ -837,7 +837,7 @@ uint16_t htt_rx_msdu_rx_desc_size_hl(htt_pdev_handle pdev, void *msdu_desc); * @param msdu - network buffer handle * @param vowstats - handle to vow ext stats. */ -void htt_rx_get_vowext_stats(cdf_nbuf_t msdu, struct vow_extstats *vowstats); +void htt_rx_get_vowext_stats(qdf_nbuf_t msdu, struct vow_extstats *vowstats); /** * @brief parses the offload message passed by the target. @@ -859,5 +859,5 @@ htt_rx_offload_paddr_msdu_pop_ll(htt_pdev_handle pdev, int *peer_id, int *tid, uint8_t *fw_desc, - cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf); + qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf); #endif /* _OL_HTT_RX_API__H_ */ diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h index e2497f3b3a45..a6b785c805f2 100644 --- a/core/dp/ol/inc/ol_htt_tx_api.h +++ b/core/dp/ol/inc/ol_htt_tx_api.h @@ -39,7 +39,7 @@ /* #include / * uint16_t, etc. * / */ #include /* uint16_t, etc. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* wlan_frm_fmt */ #include /* needed by inline functions */ @@ -256,13 +256,13 @@ struct htt_msdu_info_t { uint8_t *dest_addr; */ - uint8_t l3_hdr_offset; /* wrt cdf_nbuf_data(msdu), in bytes */ + uint8_t l3_hdr_offset; /* wrt qdf_nbuf_data(msdu), in bytes */ /* l4_hdr_offset is not currently used. * It could be used to specify to a TCP/UDP checksum computation * engine where the TCP/UDP header starts. */ - /* uint8_t l4_hdr_offset; - wrt cdf_nbuf_data(msdu), in bytes */ + /* uint8_t l4_hdr_offset; - wrt qdf_nbuf_data(msdu), in bytes */ } info; /* the action sub-struct specifies how to process the MSDU */ struct { @@ -419,7 +419,7 @@ void htt_tx_pending_discard(htt_pdev_handle pdev); * function assumes the tx frame is the default frame type, as specified * by ol_cfg_frame_type. "Raw" frames need to be transmitted through the * alternate htt_tx_send_nonstd function. - * The tx descriptor has already been attached to the cdf_nbuf object during + * The tx descriptor has already been attached to the qdf_nbuf object during * a preceding call to htt_tx_desc_init. * * @param htt_pdev - the handle of the physical device sending the tx data @@ -428,7 +428,7 @@ void htt_tx_pending_discard(htt_pdev_handle pdev); * @return 0 -> success, -OR- 1 -> failure */ int -htt_tx_send_std(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu, uint16_t msdu_id); +htt_tx_send_std(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu, uint16_t msdu_id); /** * @brief Download a Batch Of Tx MSDUs @@ -442,9 +442,9 @@ htt_tx_send_std(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu, uint16_t msdu_id); * @param num_msdus - The total Number of MSDU's provided for batch tx * @return null-terminated linked-list of unaccepted frames */ -cdf_nbuf_t +qdf_nbuf_t htt_tx_send_batch(htt_pdev_handle htt_pdev, - cdf_nbuf_t head_msdu, int num_msdus); + qdf_nbuf_t head_msdu, int num_msdus); /* The htt scheduler for queued packets in htt * htt when unable to send to HTC because of lack of resource @@ -459,7 +459,7 @@ void htt_tx_sched(htt_pdev_handle pdev); */ int htt_tx_send_nonstd(htt_pdev_handle htt_pdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, uint16_t msdu_id, enum htt_pkt_type pkt_type); /** @@ -532,7 +532,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, void *htt_tx_desc, qdf_dma_addr_t htt_tx_desc_paddr, uint16_t msdu_id, - cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info, + qdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info, struct qdf_tso_info_t *tso_info, struct ocb_tx_ctrl_hdr_t *tx_ctrl, uint8_t is_dsrc) @@ -568,7 +568,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, if (qdf_likely(pdev->cfg.ce_classify_enabled)) { if (qdf_likely(pkt_type == htt_pkt_type_eth2 || pkt_type == htt_pkt_type_ethernet)) - cdf_nbuf_tx_info_get(msdu, pkt_type, pkt_subtype, + qdf_nbuf_tx_info_get(msdu, pkt_type, pkt_subtype, hw_classify); ce_pkt_type = htt_to_ce_pkt_type[pkt_type]; @@ -611,7 +611,7 @@ htt_tx_desc_init(htt_pdev_handle pdev, if (tso_info->is_tso) HTT_TX_DESC_FRM_LEN_SET(local_word1, tso_info->total_len); else - HTT_TX_DESC_FRM_LEN_SET(local_word1, cdf_nbuf_len(msdu)); + HTT_TX_DESC_FRM_LEN_SET(local_word1, qdf_nbuf_len(msdu)); HTT_TX_DESC_FRM_ID_SET(local_word1, msdu_id); *word1 = local_word1; @@ -659,8 +659,8 @@ htt_tx_desc_init(htt_pdev_handle pdev, local_desc_ext.is_dsrc = (is_dsrc != 0); - cdf_nbuf_push_head(msdu, sizeof(local_desc_ext)); - qdf_mem_copy(cdf_nbuf_data(msdu), &local_desc_ext, + qdf_nbuf_push_head(msdu, sizeof(local_desc_ext)); + qdf_mem_copy(qdf_nbuf_data(msdu), &local_desc_ext, sizeof(local_desc_ext)); } @@ -675,11 +675,11 @@ htt_tx_desc_init(htt_pdev_handle pdev, * Setting the flag for this final fragment suffices for specifying * all fragments provided by the OS rather than added by the driver. */ - cdf_nbuf_set_frag_is_wordstream(msdu, cdf_nbuf_get_num_frags(msdu) - 1, + qdf_nbuf_set_frag_is_wordstream(msdu, qdf_nbuf_get_num_frags(msdu) - 1, 0); /* store a link to the HTT tx descriptor within the netbuf */ - cdf_nbuf_frag_push_head(msdu, sizeof(struct htt_host_tx_desc_t), + qdf_nbuf_frag_push_head(msdu, sizeof(struct htt_host_tx_desc_t), (char *)htt_host_tx_desc, /* virtual addr */ htt_tx_desc_paddr); @@ -691,17 +691,17 @@ htt_tx_desc_init(htt_pdev_handle pdev, * the host is big-endian, to convert to the target's little-endian * format. */ - cdf_nbuf_set_frag_is_wordstream(msdu, 0, 1); + qdf_nbuf_set_frag_is_wordstream(msdu, 0, 1); if (qdf_likely(pdev->cfg.ce_classify_enabled && (msdu_info->info.l2_hdr_type != htt_pkt_type_mgmt))) { - uint32_t pkt_offset = cdf_nbuf_get_frag_len(msdu, 0); + uint32_t pkt_offset = qdf_nbuf_get_frag_len(msdu, 0); data_attr = hw_classify << QDF_CE_TX_CLASSIFY_BIT_S; data_attr |= ce_pkt_type << QDF_CE_TX_PKT_TYPE_BIT_S; data_attr |= pkt_offset << QDF_CE_TX_PKT_OFFSET_BIT_S; } - cdf_nbuf_data_attr_set(msdu, data_attr); + qdf_nbuf_data_attr_set(msdu, data_attr); } /** @@ -909,9 +909,9 @@ void htt_tx_mgmt_desc_pool_alloc(struct htt_pdev_t *pdev, A_UINT32 num_elems); * @param - pointer to the mamangement from UMAC * @return - pointer the allocated mgmt descriptor */ -cdf_nbuf_t +qdf_nbuf_t htt_tx_mgmt_desc_alloc(struct htt_pdev_t *pdev, A_UINT32 *desc_id, - cdf_nbuf_t mgmt_frm); + qdf_nbuf_t mgmt_frm); /** htt_tx_mgmt_desc_free * @description - releases the management descriptor back to the pool diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index b08c5dd7411e..79b830e3a6c1 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -33,7 +33,7 @@ #define _OL_TXRX_CTRL_API__H_ #include /* A_STATUS */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* qdf_device_t */ #include /* HTC_HANDLE */ @@ -543,7 +543,7 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle data_vdev, void ol_txrx_pdev_detach(ol_txrx_pdev_handle data_pdev, int force); typedef void -(*ol_txrx_data_tx_cb)(void *ctxt, cdf_nbuf_t tx_frm, int had_error); +(*ol_txrx_data_tx_cb)(void *ctxt, qdf_nbuf_t tx_frm, int had_error); /** * @brief Store a delivery notification callback for specific data frames. @@ -583,12 +583,12 @@ ol_txrx_data_tx_cb_set(ol_txrx_vdev_handle data_vdev, * @param tx_spec - what non-standard handling to apply to the tx data frames * @param msdu_list - NULL-terminated list of tx MSDUs */ -cdf_nbuf_t +qdf_nbuf_t ol_tx_non_std(ol_txrx_vdev_handle data_vdev, - enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list); + enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list); typedef void -(*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error); +(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error); /** * @brief Store a callback for delivery notifications for management frames. @@ -634,7 +634,7 @@ ol_txrx_mgmt_tx_cb_set(ol_txrx_pdev_handle pdev, */ int ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, - cdf_nbuf_t tx_mgmt_frm, + qdf_nbuf_t tx_mgmt_frm, uint8_t type, uint8_t use_6mbps, uint16_t chanfreq); /** diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h index d84b3ee1f202..00d612c17ef1 100644 --- a/core/dp/ol/inc/ol_txrx_htt_api.h +++ b/core/dp/ol/inc/ol_txrx_htt_api.h @@ -34,14 +34,14 @@ #include /* HTT_TX_COMPL_IND_STAT */ #include /* A_STATUS */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_txrx_pdev_handle */ -static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu) +static inline uint16_t *ol_tx_msdu_id_storage(qdf_nbuf_t msdu) { - qdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1)); - return (uint16_t *) (((qdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1); + qdf_assert(qdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1)); + return (uint16_t *) (((qdf_size_t) (qdf_nbuf_head(msdu) + 1)) & ~0x1); } /** @@ -59,7 +59,7 @@ static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu) */ void ol_tx_download_done_ll(void *pdev, - A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id); + A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id); /** * @brief Tx MSDU download completion for HL system without tx completion msgs @@ -75,7 +75,7 @@ ol_tx_download_done_ll(void *pdev, */ void ol_tx_download_done_hl_free(void *pdev, - A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id); + A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id); /** * @brief Tx MSDU download completion for HL system with tx completion msgs @@ -96,7 +96,7 @@ ol_tx_download_done_hl_free(void *pdev, void ol_tx_download_done_hl_retain(void *pdev, A_STATUS status, - cdf_nbuf_t msdu, uint16_t msdu_id); + qdf_nbuf_t msdu, uint16_t msdu_id); /* * For now, make the host HTT -> host txrx tx completion status @@ -233,7 +233,7 @@ void ol_tx_target_credit_update(struct ol_txrx_pdev_t *pdev, int credit_delta); */ void ol_rx_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, uint16_t peer_id, uint8_t tid, int num_mpdu_ranges); /** @@ -253,7 +253,7 @@ ol_rx_indication_handler(ol_txrx_pdev_handle pdev, * @param tid - what (extended) traffic type the rx data is */ void ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_frag_ind_msg, + qdf_nbuf_t rx_frag_ind_msg, uint16_t peer_id, uint8_t tid); /** @@ -277,7 +277,7 @@ void ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev, */ void ol_rx_offload_deliver_ind_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t msg, int msdu_cnt); + qdf_nbuf_t msg, int msdu_cnt); /** * @brief Process a peer map message sent by the target. @@ -572,7 +572,7 @@ ol_txrx_peer_qoscapable_get(struct ol_txrx_pdev_t *txrx_pdev, uint16_t peer_id); */ void ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, uint16_t peer_id, uint8_t tid, uint8_t is_offload); diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 81fddfee1f09..dd7acafa32f4 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -32,7 +32,7 @@ #ifndef _OL_TXRX_OSIF_API__H_ #define _OL_TXRX_OSIF_API__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_osif_vdev_handle */ #include /* ol_txrx_pdev_handle, etc. */ @@ -46,21 +46,21 @@ */ struct ol_rx_cached_buf { struct list_head list; - cdf_nbuf_t buf; + qdf_nbuf_t buf; }; /** * @typedef ol_txrx_rx_fp * @brief receive function to hand batches of data frames from txrx to OS shim */ -typedef void (*ol_txrx_rx_fp)(void *osif_dev, cdf_nbuf_t msdus); +typedef void (*ol_txrx_rx_fp)(void *osif_dev, qdf_nbuf_t msdus); /** * @typedef ol_txrx_tx_fp * @brief top-level transmit function */ -typedef cdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev, - cdf_nbuf_t msdu_list); +typedef qdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev, + qdf_nbuf_t msdu_list); /** * @typedef ol_txrx_tx_non_std_fp @@ -82,9 +82,9 @@ typedef cdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev, * @param tx_spec - what non-standard operations to apply to the tx frame * @param msdu_list - tx frame(s), in a null-terminated list */ -typedef cdf_nbuf_t (*ol_txrx_tx_non_std_fp)(ol_txrx_vdev_handle data_vdev, +typedef qdf_nbuf_t (*ol_txrx_tx_non_std_fp)(ol_txrx_vdev_handle data_vdev, enum ol_tx_spec tx_spec, - cdf_nbuf_t msdu_list); + qdf_nbuf_t msdu_list); struct txrx_rx_metainfo; @@ -111,7 +111,7 @@ struct ol_txrx_desc_type { typedef QDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, - cdf_nbuf_t pDataBuff, + qdf_nbuf_t pDataBuff, uint8_t ucSTAId); typedef void (*ol_tx_pause_callback_fp)(uint8_t vdev_id, @@ -250,16 +250,16 @@ ol_txrx_osif_vdev_register(ol_txrx_vdev_handle txrx_vdev, * NULL if the segmentation fails, - OR - * a NULL-terminated list of segment network buffers */ -cdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev, +qdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev, int max_seg_payload_bytes, - cdf_nbuf_t jumbo_tcp_frame); + qdf_nbuf_t jumbo_tcp_frame); -cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, +qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, uint8_t proto_type); #ifdef IPA_OFFLOAD -cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, - cdf_nbuf_t skb); +qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, + qdf_nbuf_t skb); #endif QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, @@ -272,7 +272,7 @@ QDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, bool roam_synch_in_progress); void ol_rx_data_process(struct ol_txrx_peer_t *peer, - cdf_nbuf_t rx_buf_list); + qdf_nbuf_t rx_buf_list); void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, bool drop); diff --git a/core/dp/ol/inc/ol_vowext_dbg_defs.h b/core/dp/ol/inc/ol_vowext_dbg_defs.h index 3be07aca6368..4a9d3db50014 100644 --- a/core/dp/ol/inc/ol_vowext_dbg_defs.h +++ b/core/dp/ol/inc/ol_vowext_dbg_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -61,6 +61,6 @@ struct vow_extstats { * @param msdu - network buffer handle * @param pdev - handle to htt dev. */ -void ol_ath_add_vow_extstats(htt_pdev_handle pdev, cdf_nbuf_t msdu); +void ol_ath_add_vow_extstats(htt_pdev_handle pdev, qdf_nbuf_t msdu); #endif /* _VOW_DEFINES__H_ */ diff --git a/core/dp/txrx/ol_ctrl_txrx_api.h b/core/dp/txrx/ol_ctrl_txrx_api.h index 5a0d50f425b5..d77a5764a072 100644 --- a/core/dp/txrx/ol_ctrl_txrx_api.h +++ b/core/dp/txrx/ol_ctrl_txrx_api.h @@ -34,7 +34,7 @@ /* #include / * uint8_t * / */ #include /* uint8_t */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_vdev_handle */ #include /* ol_txrx_peer_handle, etc. */ @@ -106,7 +106,7 @@ ol_rx_err(ol_pdev_handle pdev, int tid, uint32_t tsf32, enum ol_rx_err_type err_type, - cdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id); + qdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id); enum ol_rx_notify_type { OL_RX_NOTIFY_IPV4_IGMP, @@ -138,7 +138,7 @@ ol_rx_notify(ol_pdev_handle pdev, uint8_t *peer_mac_addr, int tid, uint32_t tsf32, - enum ol_rx_notify_type notify_type, cdf_nbuf_t rx_frame); + enum ol_rx_notify_type notify_type, qdf_nbuf_t rx_frame); /** * @brief Indicate when a paused STA has tx data available. diff --git a/core/dp/txrx/ol_osif_txrx_api.h b/core/dp/txrx/ol_osif_txrx_api.h index 2014d4f407c5..979b258c0a43 100644 --- a/core/dp/txrx/ol_osif_txrx_api.h +++ b/core/dp/txrx/ol_osif_txrx_api.h @@ -32,7 +32,7 @@ #ifndef _OL_OSIF_TXRX_API_H_ #define _OL_OSIF_TXRX_API_H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ /** * @brief Call tx completion handler to release the buffers diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index 263341c7b8db..c3f475e9fd36 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_cpu_to_le64 */ #include /* bool */ #include /* ieee80211_frame */ @@ -68,7 +68,7 @@ #endif void ol_rx_data_process(struct ol_txrx_peer_t *peer, - cdf_nbuf_t rx_buf_list); + qdf_nbuf_t rx_buf_list); #ifdef HTT_RX_RESTORE @@ -84,16 +84,16 @@ static void ol_rx_restore_handler(struct work_struct *htt_rx) static DECLARE_WORK(ol_rx_restore_work, ol_rx_restore_handler); -void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu, - cdf_nbuf_t tail_msdu) +void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, qdf_nbuf_t head_msdu, + qdf_nbuf_t tail_msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; while (head_msdu) { - next = cdf_nbuf_next(head_msdu); + next = qdf_nbuf_next(head_msdu); QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "freeing %p\n", head_msdu); - cdf_nbuf_free(head_msdu); + qdf_nbuf_free(head_msdu); head_msdu = next; } @@ -106,7 +106,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu, #endif static void ol_rx_process_inv_peer(ol_txrx_pdev_handle pdev, - void *rx_mpdu_desc, cdf_nbuf_t msdu) + void *rx_mpdu_desc, qdf_nbuf_t msdu) { uint8_t a1[IEEE80211_ADDR_LEN]; htt_pdev_handle htt_pdev = pdev->htt_pdev; @@ -166,7 +166,7 @@ ol_rx_rssi_avg(struct ol_txrx_pdev_t *pdev, int16_t rssi_old, int16_t rssi_new) } static void -ol_rx_ind_rssi_update(struct ol_txrx_peer_t *peer, cdf_nbuf_t rx_ind_msg) +ol_rx_ind_rssi_update(struct ol_txrx_peer_t *peer, qdf_nbuf_t rx_ind_msg) { struct ol_txrx_pdev_t *pdev = peer->vdev->pdev; peer->rssi_dbm = ol_rx_rssi_avg(pdev, peer->rssi_dbm, @@ -192,12 +192,12 @@ ol_rx_mpdu_rssi_update(struct ol_txrx_peer_t *peer, void *rx_mpdu_desc) #endif /* QCA_SUPPORT_PEER_DATA_RX_RSSI */ void discard_msdus(htt_pdev_handle htt_pdev, - cdf_nbuf_t head_msdu, - cdf_nbuf_t tail_msdu) + qdf_nbuf_t head_msdu, + qdf_nbuf_t tail_msdu) { while (1) { - cdf_nbuf_t next; - next = cdf_nbuf_next( + qdf_nbuf_t next; + next = qdf_nbuf_next( head_msdu); htt_rx_desc_frame_free (htt_pdev, @@ -212,12 +212,12 @@ void discard_msdus(htt_pdev_handle htt_pdev, } void chain_msdus(htt_pdev_handle htt_pdev, - cdf_nbuf_t head_msdu, - cdf_nbuf_t tail_msdu) + qdf_nbuf_t head_msdu, + qdf_nbuf_t tail_msdu) { while (1) { - cdf_nbuf_t next; - next = cdf_nbuf_next(head_msdu); + qdf_nbuf_t next; + next = qdf_nbuf_next(head_msdu); htt_rx_desc_frame_free( htt_pdev, head_msdu); @@ -232,8 +232,8 @@ void process_reorder(ol_txrx_pdev_handle pdev, void *rx_mpdu_desc, uint8_t tid, struct ol_txrx_peer_t *peer, - cdf_nbuf_t head_msdu, - cdf_nbuf_t tail_msdu, + qdf_nbuf_t head_msdu, + qdf_nbuf_t tail_msdu, int num_mpdu_ranges, int num_pdus, bool rx_ind_release @@ -310,7 +310,7 @@ void process_reorder(ol_txrx_pdev_handle pdev, void ol_rx_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, uint16_t peer_id, uint8_t tid, int num_mpdu_ranges) { int mpdu_range, i; @@ -383,7 +383,7 @@ ol_rx_indication_handler(ol_txrx_pdev_handle pdev, if (htt_rx_ind_release(pdev->htt_pdev, rx_ind_msg)) { /* the ind info of release is saved here and do release at the - * end. This is for the reason of in HL case, the cdf_nbuf_t + * end. This is for the reason of in HL case, the qdf_nbuf_t * for msg and payload are the same buf. And the buf will be * changed during processing */ rx_ind_release = true; @@ -398,7 +398,7 @@ ol_rx_indication_handler(ol_txrx_pdev_handle pdev, for (mpdu_range = 0; mpdu_range < num_mpdu_ranges; mpdu_range++) { enum htt_rx_status status; int i, num_mpdus; - cdf_nbuf_t head_msdu, tail_msdu, msdu; + qdf_nbuf_t head_msdu, tail_msdu, msdu; void *rx_mpdu_desc; #ifdef DEBUG_DMA_DONE @@ -558,8 +558,8 @@ ol_rx_indication_handler(ol_txrx_pdev_handle pdev, } while (1) { /* Free the nbuf */ - cdf_nbuf_t next; - next = cdf_nbuf_next(msdu); + qdf_nbuf_t next; + next = qdf_nbuf_next(msdu); htt_rx_desc_frame_free(htt_pdev, msdu); if (msdu == tail_msdu) break; @@ -649,7 +649,7 @@ ol_rx_sec_ind_handler(ol_txrx_pdev_handle pdev, #include -static void transcap_nwifi_to_8023(cdf_nbuf_t msdu) +static void transcap_nwifi_to_8023(qdf_nbuf_t msdu) { struct ieee80211_frame *wh; uint32_t hdrsize; @@ -661,7 +661,7 @@ static void transcap_nwifi_to_8023(cdf_nbuf_t msdu) uint8_t a3[IEEE80211_ADDR_LEN]; uint8_t fc1; - wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu); + wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu); qdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN); qdf_mem_copy(a2, wh->i_addr2, IEEE80211_ADDR_LEN); qdf_mem_copy(a3, wh->i_addr3, IEEE80211_ADDR_LEN); @@ -669,17 +669,17 @@ static void transcap_nwifi_to_8023(cdf_nbuf_t msdu) /* Native Wifi header is 80211 non-QoS header */ hdrsize = sizeof(struct ieee80211_frame); - llchdr = (struct llc *)(((uint8_t *) cdf_nbuf_data(msdu)) + hdrsize); + llchdr = (struct llc *)(((uint8_t *) qdf_nbuf_data(msdu)) + hdrsize); ether_type = llchdr->llc_un.type_snap.ether_type; /* * Now move the data pointer to the beginning of the mac header : * new-header = old-hdr + (wifhdrsize + llchdrsize - ethhdrsize) */ - cdf_nbuf_pull_head(msdu, + qdf_nbuf_pull_head(msdu, (hdrsize + sizeof(struct llc) - sizeof(struct ether_header))); - eth_hdr = (struct ether_header *)(cdf_nbuf_data(msdu)); + eth_hdr = (struct ether_header *)(qdf_nbuf_data(msdu)); switch (fc1) { case IEEE80211_FC1_DIR_NODS: qdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN); @@ -705,7 +705,7 @@ void ol_rx_notify(ol_pdev_handle pdev, uint8_t *peer_mac_addr, int tid, uint32_t tsf32, - enum ol_rx_notify_type notify_type, cdf_nbuf_t rx_frame) + enum ol_rx_notify_type notify_type, qdf_nbuf_t rx_frame) { /* * NOTE: This is used in qca_main for AP mode to handle IGMP @@ -732,14 +732,14 @@ void ol_rx_notify(ol_pdev_handle pdev, void ol_rx_inspect(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu, void *rx_desc) + unsigned tid, qdf_nbuf_t msdu, void *rx_desc) { ol_txrx_pdev_handle pdev = vdev->pdev; uint8_t *data, *l3_hdr; uint16_t ethertype; int offset; - data = cdf_nbuf_data(msdu); + data = qdf_nbuf_data(msdu); if (pdev->frame_format == wlan_frm_fmt_native_wifi) { offset = SIZEOF_80211_HDR + LLC_SNAP_HDR_OFFSET_ETHERTYPE; l3_hdr = data + SIZEOF_80211_HDR + LLC_SNAP_HDR_LEN; @@ -764,10 +764,10 @@ ol_rx_inspect(struct ol_txrx_vdev_t *vdev, void ol_rx_offload_deliver_ind_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t msg, int msdu_cnt) + qdf_nbuf_t msg, int msdu_cnt) { int vdev_id, peer_id, tid; - cdf_nbuf_t head_buf, tail_buf, buf; + qdf_nbuf_t head_buf, tail_buf, buf; struct ol_txrx_peer_t *peer; uint8_t fw_desc; htt_pdev_handle htt_pdev = pdev->htt_pdev; @@ -782,8 +782,8 @@ ol_rx_offload_deliver_ind_handler(ol_txrx_pdev_handle pdev, } else { buf = head_buf; while (1) { - cdf_nbuf_t next; - next = cdf_nbuf_next(buf); + qdf_nbuf_t next; + next = qdf_nbuf_next(buf); htt_rx_desc_frame_free(htt_pdev, buf); if (buf == tail_buf) break; @@ -801,7 +801,7 @@ ol_rx_mic_error_handler( u_int8_t tid, u_int16_t peer_id, void *msdu_desc, - cdf_nbuf_t msdu) + qdf_nbuf_t msdu) { union htt_rx_pn_t pn = {0}; u_int8_t key_id = 0; @@ -836,7 +836,7 @@ ol_rx_mic_error_handler( */ bool ol_rx_filter(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, cdf_nbuf_t msdu, void *rx_desc) + struct ol_txrx_peer_t *peer, qdf_nbuf_t msdu, void *rx_desc) { #define FILTER_STATUS_REJECT 1 #define FILTER_STATUS_ACCEPT 0 @@ -867,7 +867,7 @@ ol_rx_filter(struct ol_txrx_vdev_t *vdev, offset = ETHERNET_ADDR_LEN * 2; } /* get header info from msdu */ - wh = cdf_nbuf_data(msdu); + wh = qdf_nbuf_data(msdu); /* get ether type */ ether_type = (wh[offset] << 8) | wh[offset + 1]; @@ -963,13 +963,13 @@ ol_rx_filter(struct ol_txrx_vdev_t *vdev, void ol_rx_deliver(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list) + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list) { ol_txrx_pdev_handle pdev = vdev->pdev; htt_pdev_handle htt_pdev = pdev->htt_pdev; - cdf_nbuf_t deliver_list_head = NULL; - cdf_nbuf_t deliver_list_tail = NULL; - cdf_nbuf_t msdu; + qdf_nbuf_t deliver_list_head = NULL; + qdf_nbuf_t deliver_list_tail = NULL; + qdf_nbuf_t msdu; bool filter = false; #ifdef QCA_SUPPORT_SW_TXRX_ENCAP struct ol_rx_decap_info_t info; @@ -984,7 +984,7 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev, while (msdu) { void *rx_desc; int discard, inspect, dummy_fwd; - cdf_nbuf_t next = cdf_nbuf_next(msdu); + qdf_nbuf_t next = qdf_nbuf_next(msdu); rx_desc = htt_rx_msdu_desc_retrieve(pdev->htt_pdev, msdu); @@ -1002,7 +1002,7 @@ ol_rx_deliver(struct ol_txrx_vdev_t *vdev, peer->mac_addr.raw[0], peer->mac_addr.raw[1], peer->mac_addr.raw[2], peer->mac_addr.raw[3], peer->mac_addr.raw[4], peer->mac_addr.raw[5], - cdf_nbuf_len(msdu)); + qdf_nbuf_len(msdu)); goto DONE; } #endif @@ -1028,13 +1028,13 @@ DONE: ol_txrx_frm_dump_tcp_seq | ol_txrx_frm_dump_contents, 0 /* don't print contents */); - cdf_nbuf_free(msdu); + qdf_nbuf_free(msdu); /* If discarding packet is last packet of the delivery list, NULL terminator should be added for delivery list. */ if (next == NULL && deliver_list_head) { /* add NULL terminator */ - cdf_nbuf_set_next(deliver_list_tail, NULL); + qdf_nbuf_set_next(deliver_list_tail, NULL); } } else { /* @@ -1117,9 +1117,9 @@ DONE: rx_header.tsf32 = peer->last_pkt_tsf; rx_header.ext_tid = peer->last_pkt_tid; - cdf_nbuf_push_head(msdu, + qdf_nbuf_push_head(msdu, sizeof(rx_header)); - qdf_mem_copy(cdf_nbuf_data(msdu), + qdf_mem_copy(qdf_nbuf_data(msdu), &rx_header, sizeof(rx_header)); /* Construct the ethernet header with @@ -1128,9 +1128,9 @@ DONE: RX stats header. */ eth_header.ether_type = QDF_SWAP_U16( ETHERTYPE_OCB_RX); - cdf_nbuf_push_head(msdu, + qdf_nbuf_push_head(msdu, sizeof(eth_header)); - qdf_mem_copy(cdf_nbuf_data(msdu), + qdf_mem_copy(qdf_nbuf_data(msdu), ð_header, sizeof(eth_header)); } @@ -1150,7 +1150,7 @@ DONE: #if defined(PERE_IP_HDR_ALIGNMENT_WAR) if (pdev->host_80211_enable) - for (msdu = deliver_list_head; msdu; msdu = cdf_nbuf_next(msdu)) + for (msdu = deliver_list_head; msdu; msdu = qdf_nbuf_next(msdu)) transcap_nwifi_to_8023(msdu); #endif @@ -1164,15 +1164,15 @@ DONE: void ol_rx_discard(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list) + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list) { ol_txrx_pdev_handle pdev = vdev->pdev; htt_pdev_handle htt_pdev = pdev->htt_pdev; while (msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; - msdu_list = cdf_nbuf_next(msdu_list); + msdu_list = qdf_nbuf_next(msdu_list); TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1, "discard rx %p from partly-deleted peer %p " "(%02x:%02x:%02x:%02x:%02x:%02x)\n", @@ -1214,12 +1214,12 @@ ol_rx_peer_cleanup(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer) /* * Free frames including both rx descriptors and buffers */ -void ol_rx_frames_free(htt_pdev_handle htt_pdev, cdf_nbuf_t frames) +void ol_rx_frames_free(htt_pdev_handle htt_pdev, qdf_nbuf_t frames) { - cdf_nbuf_t next, frag = frames; + qdf_nbuf_t next, frag = frames; while (frag) { - next = cdf_nbuf_next(frag); + next = qdf_nbuf_next(frag); htt_rx_desc_frame_free(htt_pdev, frag); frag = next; } @@ -1227,7 +1227,7 @@ void ol_rx_frames_free(htt_pdev_handle htt_pdev, cdf_nbuf_t frames) void ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_ind_msg, + qdf_nbuf_t rx_ind_msg, uint16_t peer_id, uint8_t tid, uint8_t is_offload) { @@ -1235,7 +1235,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, struct ol_txrx_peer_t *peer = NULL; htt_pdev_handle htt_pdev = NULL; int status; - cdf_nbuf_t head_msdu, tail_msdu = NULL; + qdf_nbuf_t head_msdu, tail_msdu = NULL; if (pdev) { peer = ol_txrx_peer_find_by_id(pdev, peer_id); @@ -1271,7 +1271,7 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, /* Send the chain of MSDUs to the OS */ /* rx_opt_proc takes a NULL-terminated list of msdu netbufs */ - cdf_nbuf_set_next(tail_msdu, NULL); + qdf_nbuf_set_next(tail_msdu, NULL); /* Pktlog */ #ifdef WDI_EVENT_ENABLE @@ -1287,8 +1287,8 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, "%s: Couldn't find peer from ID 0x%x\n", __func__, peer_id); while (head_msdu) { - cdf_nbuf_t msdu = head_msdu; - head_msdu = cdf_nbuf_next(head_msdu); + qdf_nbuf_t msdu = head_msdu; + head_msdu = qdf_nbuf_next(head_msdu); htt_rx_desc_frame_free(htt_pdev, msdu); } return; @@ -1301,9 +1301,9 @@ ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev, void ol_rx_in_order_deliver(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list) + unsigned tid, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; msdu = msdu_list; /* @@ -1314,7 +1314,7 @@ ol_rx_in_order_deliver(struct ol_txrx_vdev_t *vdev, */ while (msdu) { - cdf_nbuf_t next = cdf_nbuf_next(msdu); + qdf_nbuf_t next = qdf_nbuf_next(msdu); OL_RX_PEER_STATS_UPDATE(peer, msdu); OL_RX_ERR_STATISTICS_1(vdev->pdev, vdev, peer, rx_desc, @@ -1338,7 +1338,7 @@ ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev, uint32_t *msg_word) { int vdev_id, peer_id, tid; - cdf_nbuf_t head_buf, tail_buf, buf; + qdf_nbuf_t head_buf, tail_buf, buf; struct ol_txrx_peer_t *peer; uint8_t fw_desc; int msdu_iter = 0; @@ -1355,8 +1355,8 @@ ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev, } else { buf = head_buf; while (1) { - cdf_nbuf_t next; - next = cdf_nbuf_next(buf); + qdf_nbuf_t next; + next = qdf_nbuf_next(buf); htt_rx_desc_frame_free(htt_pdev, buf); if (buf == tail_buf) break; @@ -1376,7 +1376,7 @@ ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev, * @param msdu - network buffer handle * @param pdev - handle to htt dev. */ -void ol_ath_add_vow_extstats(htt_pdev_handle pdev, cdf_nbuf_t msdu) +void ol_ath_add_vow_extstats(htt_pdev_handle pdev, qdf_nbuf_t msdu) { /* FIX THIS: * txrx should not be directly using data types (scn) @@ -1393,7 +1393,7 @@ void ol_ath_add_vow_extstats(htt_pdev_handle pdev, cdf_nbuf_t msdu) int offset; struct vow_extstats vowstats; - data = cdf_nbuf_data(msdu); + data = qdf_nbuf_data(msdu); offset = ETHERNET_ADDR_LEN * 2; l3_hdr = data + ETHERNET_HDR_LEN; diff --git a/core/dp/txrx/ol_rx.h b/core/dp/txrx/ol_rx.h index 33d749fccf00..ce1bbb0b0855 100644 --- a/core/dp/txrx/ol_rx.h +++ b/core/dp/txrx/ol_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,18 +28,18 @@ #ifndef _OL_RX__H_ #define _OL_RX__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_txrx_vdev_t, etc. */ void ol_rx_deliver(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t head_msdu); + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t head_msdu); void ol_rx_discard(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t head_msdu); + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t head_msdu); -void ol_rx_frames_free(htt_pdev_handle htt_pdev, cdf_nbuf_t frames); +void ol_rx_frames_free(htt_pdev_handle htt_pdev, qdf_nbuf_t frames); void ol_rx_peer_init(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer); @@ -49,7 +49,7 @@ ol_rx_peer_cleanup(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer); void ol_rx_in_order_deliver(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t head_msdu); + unsigned tid, qdf_nbuf_t head_msdu); void ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev, @@ -62,6 +62,6 @@ ol_rx_mic_error_handler( u_int8_t tid, u_int16_t peer_id, void *msdu_desc, - cdf_nbuf_t msdu); + qdf_nbuf_t msdu); #endif /* _OL_RX__H_ */ diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index 58f5b90bf6e3..f4c0768b1a61 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include @@ -107,18 +107,18 @@ const struct ol_rx_defrag_cipher f_wep = { inline struct ieee80211_frame *ol_rx_frag_get_mac_hdr( htt_pdev_handle htt_pdev, - cdf_nbuf_t frag) + qdf_nbuf_t frag) { return - (struct ieee80211_frame *) cdf_nbuf_data(frag); + (struct ieee80211_frame *) qdf_nbuf_data(frag); } #define ol_rx_frag_pull_hdr(pdev, frag, hdrsize) \ - cdf_nbuf_pull_head(frag, hdrsize); + qdf_nbuf_pull_head(frag, hdrsize); #define OL_RX_FRAG_CLONE(frag) NULL /* no-op */ static inline void ol_rx_frag_desc_adjust(ol_txrx_pdev_handle pdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, void **rx_desc_old_position, void **ind_old_position, int *rx_desc_len) { @@ -132,14 +132,14 @@ ol_rx_frag_desc_adjust(ol_txrx_pdev_handle pdev, */ void ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev, - cdf_nbuf_t rx_frag_ind_msg, + qdf_nbuf_t rx_frag_ind_msg, uint16_t peer_id, uint8_t tid) { uint16_t seq_num; int seq_num_start, seq_num_end; struct ol_txrx_peer_t *peer; htt_pdev_handle htt_pdev; - cdf_nbuf_t head_msdu, tail_msdu; + qdf_nbuf_t head_msdu, tail_msdu; void *rx_mpdu_desc; htt_pdev = pdev->htt_pdev; @@ -213,7 +213,7 @@ ol_rx_reorder_flush_frag(htt_pdev_handle htt_pdev, void ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, struct ol_txrx_peer_t *peer, - unsigned tid, uint16_t seq_num, cdf_nbuf_t frag) + unsigned tid, uint16_t seq_num, qdf_nbuf_t frag) { struct ieee80211_frame *fmac_hdr, *mac_hdr; uint8_t fragno, more_frag, all_frag_present = 0; @@ -236,7 +236,7 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, if ((!more_frag) && (!fragno) && (!rx_reorder_array_elem->head)) { rx_reorder_array_elem->head = frag; rx_reorder_array_elem->tail = frag; - cdf_nbuf_set_next(frag, NULL); + qdf_nbuf_set_next(frag, NULL); ol_rx_defrag(pdev, peer, tid, rx_reorder_array_elem->head); rx_reorder_array_elem->head = NULL; rx_reorder_array_elem->tail = NULL; @@ -292,15 +292,15 @@ ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, */ void ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, - cdf_nbuf_t *head_addr, - cdf_nbuf_t *tail_addr, - cdf_nbuf_t frag, uint8_t *all_frag_present) + qdf_nbuf_t *head_addr, + qdf_nbuf_t *tail_addr, + qdf_nbuf_t frag, uint8_t *all_frag_present) { - cdf_nbuf_t next, prev = NULL, cur = *head_addr; + qdf_nbuf_t next, prev = NULL, cur = *head_addr; struct ieee80211_frame *mac_hdr, *cmac_hdr, *next_hdr, *lmac_hdr; uint8_t fragno, cur_fragno, lfragno, next_fragno; uint8_t last_morefrag = 1, count = 0; - cdf_nbuf_t frag_clone; + qdf_nbuf_t frag_clone; qdf_assert(frag); frag_clone = OL_RX_FRAG_CLONE(frag); @@ -314,7 +314,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, if (!(*head_addr)) { *head_addr = frag; *tail_addr = frag; - cdf_nbuf_set_next(*tail_addr, NULL); + qdf_nbuf_set_next(*tail_addr, NULL); return; } /* For efficiency, compare with tail first */ @@ -323,9 +323,9 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, lfragno = qdf_le16_to_cpu(*(uint16_t *) lmac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; if (fragno > lfragno) { - cdf_nbuf_set_next(*tail_addr, frag); + qdf_nbuf_set_next(*tail_addr, frag); *tail_addr = frag; - cdf_nbuf_set_next(*tail_addr, NULL); + qdf_nbuf_set_next(*tail_addr, NULL); } else { do { cmac_hdr = (struct ieee80211_frame *) @@ -334,7 +334,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, qdf_le16_to_cpu(*(uint16_t *) cmac_hdr->i_seq) & IEEE80211_SEQ_FRAG_MASK; prev = cur; - cur = cdf_nbuf_next(cur); + cur = qdf_nbuf_next(cur); } while (fragno > cur_fragno); if (fragno == cur_fragno) { @@ -342,11 +342,11 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, *all_frag_present = 0; return; } else { - cdf_nbuf_set_next(prev, frag); - cdf_nbuf_set_next(frag, cur); + qdf_nbuf_set_next(prev, frag); + qdf_nbuf_set_next(frag, cur); } } - next = cdf_nbuf_next(*head_addr); + next = qdf_nbuf_next(*head_addr); lmac_hdr = (struct ieee80211_frame *)ol_rx_frag_get_mac_hdr(htt_pdev, *tail_addr); last_morefrag = lmac_hdr->i_fc[1] & IEEE80211_FC1_MORE_FRAG; @@ -362,7 +362,7 @@ ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, if (next_fragno != count) break; - next = cdf_nbuf_next(next); + next = qdf_nbuf_next(next); } while (next); if (!next) { @@ -448,10 +448,10 @@ void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev) */ void ol_rx_defrag(ol_txrx_pdev_handle pdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t frag_list) + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t frag_list) { struct ol_txrx_vdev_t *vdev = NULL; - cdf_nbuf_t tmp_next, msdu, prev = NULL, cur = frag_list; + qdf_nbuf_t tmp_next, msdu, prev = NULL, cur = frag_list; uint8_t index, tkip_demic = 0; uint16_t hdr_space; void *rx_desc; @@ -471,12 +471,12 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, } while (cur) { - tmp_next = cdf_nbuf_next(cur); - cdf_nbuf_set_next(cur, NULL); + tmp_next = qdf_nbuf_next(cur); + qdf_nbuf_set_next(cur, NULL); if (!ol_rx_pn_check_base(vdev, peer, tid, cur)) { /* PN check failed,discard frags */ if (prev) { - cdf_nbuf_set_next(prev, NULL); + qdf_nbuf_set_next(prev, NULL); ol_rx_frames_free(htt_pdev, frag_list); } ol_rx_frames_free(htt_pdev, tmp_next); @@ -485,9 +485,9 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, return; } /* remove FCS from each fragment */ - cdf_nbuf_trim_tail(cur, DEFRAG_IEEE80211_FCS_LEN); + qdf_nbuf_trim_tail(cur, DEFRAG_IEEE80211_FCS_LEN); prev = cur; - cdf_nbuf_set_next(cur, tmp_next); + qdf_nbuf_set_next(cur, tmp_next); cur = tmp_next; } cur = frag_list; @@ -504,7 +504,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, /* fall-through to rest of tkip ops */ case htt_sec_type_tkip_nomic: while (cur) { - tmp_next = cdf_nbuf_next(cur); + tmp_next = qdf_nbuf_next(cur); if (!ol_rx_frag_tkip_decap(pdev, cur, hdr_space)) { /* TKIP decap failed, discard frags */ ol_rx_frames_free(htt_pdev, frag_list); @@ -518,7 +518,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, case htt_sec_type_aes_ccmp: while (cur) { - tmp_next = cdf_nbuf_next(cur); + tmp_next = qdf_nbuf_next(cur); if (!ol_rx_frag_ccmp_demic(pdev, cur, hdr_space)) { /* CCMP demic failed, discard frags */ ol_rx_frames_free(htt_pdev, frag_list); @@ -541,7 +541,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, case htt_sec_type_wep104: case htt_sec_type_wep128: while (cur) { - tmp_next = cdf_nbuf_next(cur); + tmp_next = qdf_nbuf_next(cur); if (!ol_rx_frag_wep_decap(pdev, cur, hdr_space)) { /* wep decap failed, discard frags */ ol_rx_frames_free(htt_pdev, frag_list); @@ -589,7 +589,7 @@ ol_rx_defrag(ol_txrx_pdev_handle pdev, */ int ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t msdu, uint16_t hdrlen) + qdf_nbuf_t msdu, uint16_t hdrlen) { uint8_t *ivp, *origHdr; @@ -602,15 +602,15 @@ ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev, &rx_desc_old_position, &ind_old_position, &rx_desc_len); /* Header should have extended IV */ - origHdr = (uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len); + origHdr = (uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len); ivp = origHdr + hdrlen; if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) return OL_RX_DEFRAG_ERR; qdf_mem_move(origHdr + f_tkip.ic_header, origHdr, hdrlen); - cdf_nbuf_pull_head(msdu, f_tkip.ic_header); - cdf_nbuf_trim_tail(msdu, f_tkip.ic_trailer); + qdf_nbuf_pull_head(msdu, f_tkip.ic_header); + qdf_nbuf_trim_tail(msdu, f_tkip.ic_trailer); return OL_RX_DEFRAG_OK; } @@ -618,7 +618,7 @@ ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev, * Handling WEP processing for defragmentation */ int -ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t hdrlen) +ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t hdrlen) { uint8_t *origHdr; void *rx_desc_old_position = NULL; @@ -629,10 +629,10 @@ ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t hdrlen) msdu, &rx_desc_old_position, &ind_old_position, &rx_desc_len); - origHdr = (uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len); + origHdr = (uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len); qdf_mem_move(origHdr + f_wep.ic_header, origHdr, hdrlen); - cdf_nbuf_pull_head(msdu, f_wep.ic_header); - cdf_nbuf_trim_tail(msdu, f_wep.ic_trailer); + qdf_nbuf_pull_head(msdu, f_wep.ic_header); + qdf_nbuf_trim_tail(msdu, f_wep.ic_trailer); return OL_RX_DEFRAG_OK; } @@ -641,7 +641,7 @@ ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t hdrlen) */ int ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, const uint8_t *key, - cdf_nbuf_t msdu, uint16_t hdrlen) + qdf_nbuf_t msdu, uint16_t hdrlen) { int status; uint32_t pktlen; @@ -668,7 +668,7 @@ ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, const uint8_t *key, if (!qdf_mem_cmp(mic, mic0, f_tkip.ic_miclen)) return OL_RX_DEFRAG_ERR; - cdf_nbuf_trim_tail(msdu, f_tkip.ic_miclen); + qdf_nbuf_trim_tail(msdu, f_tkip.ic_miclen); return OL_RX_DEFRAG_OK; } @@ -677,7 +677,7 @@ ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, const uint8_t *key, */ int ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t nbuf, uint16_t hdrlen) + qdf_nbuf_t nbuf, uint16_t hdrlen) { uint8_t *ivp, *origHdr; void *rx_desc_old_position = NULL; @@ -689,13 +689,13 @@ ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev, &rx_desc_old_position, &ind_old_position, &rx_desc_len); - origHdr = (uint8_t *) (cdf_nbuf_data(nbuf) + rx_desc_len); + origHdr = (uint8_t *) (qdf_nbuf_data(nbuf) + rx_desc_len); ivp = origHdr + hdrlen; if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) return OL_RX_DEFRAG_ERR; qdf_mem_move(origHdr + f_ccmp.ic_header, origHdr, hdrlen); - cdf_nbuf_pull_head(nbuf, f_ccmp.ic_header); + qdf_nbuf_pull_head(nbuf, f_ccmp.ic_header); return OL_RX_DEFRAG_OK; } @@ -705,7 +705,7 @@ ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev, */ int ol_rx_frag_ccmp_demic(ol_txrx_pdev_handle pdev, - cdf_nbuf_t wbuf, uint16_t hdrlen) + qdf_nbuf_t wbuf, uint16_t hdrlen) { uint8_t *ivp, *origHdr; void *rx_desc_old_position = NULL; @@ -717,13 +717,13 @@ ol_rx_frag_ccmp_demic(ol_txrx_pdev_handle pdev, &rx_desc_old_position, &ind_old_position, &rx_desc_len); - origHdr = (uint8_t *) (cdf_nbuf_data(wbuf) + rx_desc_len); + origHdr = (uint8_t *) (qdf_nbuf_data(wbuf) + rx_desc_len); ivp = origHdr + hdrlen; if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV)) return OL_RX_DEFRAG_ERR; - cdf_nbuf_trim_tail(wbuf, f_ccmp.ic_trailer); + qdf_nbuf_trim_tail(wbuf, f_ccmp.ic_trailer); return OL_RX_DEFRAG_OK; } @@ -779,7 +779,7 @@ void ol_rx_defrag_michdr(const struct ieee80211_frame *wh0, uint8_t hdr[]) int ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, const uint8_t *key, - cdf_nbuf_t wbuf, + qdf_nbuf_t wbuf, uint16_t off, uint16_t data_len, uint8_t mic[]) { uint8_t hdr[16] = { 0, }; @@ -795,7 +795,7 @@ ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, &rx_desc_old_position, &ind_old_position, &rx_desc_len); - ol_rx_defrag_michdr((struct ieee80211_frame *)(cdf_nbuf_data(wbuf) + + ol_rx_defrag_michdr((struct ieee80211_frame *)(qdf_nbuf_data(wbuf) + rx_desc_len), hdr); l = get_le32(key); r = get_le32(key + 4); @@ -811,7 +811,7 @@ ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, michael_block(l, r); /* first buffer has special handling */ - data = (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len + off; + data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len + off; space = ol_rx_defrag_len(wbuf) - rx_desc_len - off; for (;; ) { if (space > data_len) @@ -828,7 +828,7 @@ ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, if (data_len < sizeof(uint32_t)) break; - wbuf = cdf_nbuf_next(wbuf); + wbuf = qdf_nbuf_next(wbuf); if (wbuf == NULL) return OL_RX_DEFRAG_ERR; @@ -840,7 +840,7 @@ ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, * Block straddles buffers, split references. */ data_next = - (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len; + (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len; if ((ol_rx_defrag_len(wbuf) - rx_desc_len) < sizeof(uint32_t) - space) { return OL_RX_DEFRAG_ERR; @@ -874,7 +874,7 @@ ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, /* * Setup for next buffer. */ - data = (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len; + data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len; space = ol_rx_defrag_len(wbuf) - rx_desc_len; } } @@ -923,26 +923,26 @@ uint16_t ol_rx_frag_hdrsize(const void *data) /* * Recombine and decap fragments */ -cdf_nbuf_t +qdf_nbuf_t ol_rx_defrag_decap_recombine(htt_pdev_handle htt_pdev, - cdf_nbuf_t frag_list, uint16_t hdrsize) + qdf_nbuf_t frag_list, uint16_t hdrsize) { - cdf_nbuf_t tmp; - cdf_nbuf_t msdu = frag_list; - cdf_nbuf_t rx_nbuf = frag_list; + qdf_nbuf_t tmp; + qdf_nbuf_t msdu = frag_list; + qdf_nbuf_t rx_nbuf = frag_list; struct ieee80211_frame *wh; - msdu = cdf_nbuf_next(msdu); - cdf_nbuf_set_next(rx_nbuf, NULL); + msdu = qdf_nbuf_next(msdu); + qdf_nbuf_set_next(rx_nbuf, NULL); while (msdu) { htt_rx_msdu_desc_free(htt_pdev, msdu); - tmp = cdf_nbuf_next(msdu); - cdf_nbuf_set_next(msdu, NULL); + tmp = qdf_nbuf_next(msdu); + qdf_nbuf_set_next(msdu, NULL); ol_rx_frag_pull_hdr(htt_pdev, msdu, hdrsize); if (!ol_rx_defrag_concat(rx_nbuf, msdu)) { ol_rx_frames_free(htt_pdev, tmp); htt_rx_desc_frame_free(htt_pdev, rx_nbuf); - cdf_nbuf_free(msdu); + qdf_nbuf_free(msdu); /* msdu rx desc already freed above */ return NULL; } @@ -956,7 +956,7 @@ ol_rx_defrag_decap_recombine(htt_pdev_handle htt_pdev, return rx_nbuf; } -void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) +void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu) { struct ieee80211_frame wh; uint32_t hdrsize; @@ -972,10 +972,10 @@ void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) &rx_desc_old_position, &ind_old_position, &rx_desc_len); - wh_ptr = (struct ieee80211_frame *)(cdf_nbuf_data(msdu) + rx_desc_len); + wh_ptr = (struct ieee80211_frame *)(qdf_nbuf_data(msdu) + rx_desc_len); qdf_mem_copy(&wh, wh_ptr, sizeof(wh)); hdrsize = sizeof(struct ieee80211_frame); - qdf_mem_copy(&llchdr, ((uint8_t *) (cdf_nbuf_data(msdu) + + qdf_mem_copy(&llchdr, ((uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len)) + hdrsize, sizeof(struct llc_snap_hdr_t)); @@ -983,10 +983,10 @@ void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) * Now move the data pointer to the beginning of the mac header : * new-header = old-hdr + (wifhdrsize + llchdrsize - ethhdrsize) */ - cdf_nbuf_pull_head(msdu, (rx_desc_len + hdrsize + + qdf_nbuf_pull_head(msdu, (rx_desc_len + hdrsize + sizeof(struct llc_snap_hdr_t) - sizeof(struct ethernet_hdr_t))); - eth_hdr = (struct ethernet_hdr_t *)(cdf_nbuf_data(msdu)); + eth_hdr = (struct ethernet_hdr_t *)(qdf_nbuf_data(msdu)); switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) { case IEEE80211_FC1_DIR_NODS: qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1, @@ -1016,7 +1016,7 @@ void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu) */ void ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t nbuf, uint16_t hdrlen) + qdf_nbuf_t nbuf, uint16_t hdrlen) { struct ieee80211_frame *wh; uint16_t qoslen; @@ -1029,7 +1029,7 @@ ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev, &rx_desc_old_position, &ind_old_position, &rx_desc_len); - wh = (struct ieee80211_frame *)(cdf_nbuf_data(nbuf) + rx_desc_len); + wh = (struct ieee80211_frame *)(qdf_nbuf_data(nbuf) + rx_desc_len); if (DEFRAG_IEEE80211_QOS_HAS_SEQ(wh)) { qoslen = sizeof(struct ieee80211_qoscntl); /* Qos frame with Order bit set indicates a HTC frame */ @@ -1039,19 +1039,19 @@ ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev, /* remove QoS filed from header */ hdrlen -= qoslen; qdf_mem_move((uint8_t *) wh + qoslen, wh, hdrlen); - wh = (struct ieee80211_frame *)cdf_nbuf_pull_head(nbuf, + wh = (struct ieee80211_frame *)qdf_nbuf_pull_head(nbuf, rx_desc_len + qoslen); /* clear QoS bit */ /* - * KW# 6154 'cdf_nbuf_pull_head' in turn calls - * __cdf_nbuf_pull_head, + * KW# 6154 'qdf_nbuf_pull_head' in turn calls + * __qdf_nbuf_pull_head, * which returns NULL if there is not sufficient data to pull. - * It's guaranteed that cdf_nbuf_pull_head will succeed rather + * It's guaranteed that qdf_nbuf_pull_head will succeed rather * than returning NULL, since the entire rx frame is already * present in the rx buffer. * However, to make it obvious to static analyzers that this - * code is safe, add an explicit check that cdf_nbuf_pull_head + * code is safe, add an explicit check that qdf_nbuf_pull_head * returns a non-NULL value. * Since this part of the code is not performance-critical, * adding this explicit check is okay. diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h index 6ed90da22243..595d83a1d7b4 100644 --- a/core/dp/txrx/ol_rx_defrag.h +++ b/core/dp/txrx/ol_rx_defrag.h @@ -28,7 +28,7 @@ #ifndef _OL_RX_DEFRAG_H_ #define _OL_RX_DEFRAG_H_ -#include +#include #include #include #include @@ -54,16 +54,16 @@ enum { }; #define ol_rx_defrag_copydata(buf, offset, len, _to) \ - cdf_nbuf_copy_bits(buf, offset, len, _to) + qdf_nbuf_copy_bits(buf, offset, len, _to) #define ol_rx_defrag_len(buf) \ - cdf_nbuf_len(buf) + qdf_nbuf_len(buf) void ol_rx_fraglist_insert(htt_pdev_handle htt_pdev, - cdf_nbuf_t *head_addr, - cdf_nbuf_t *tail_addr, - cdf_nbuf_t frag, uint8_t *all_frag_present); + qdf_nbuf_t *head_addr, + qdf_nbuf_t *tail_addr, + qdf_nbuf_t frag, uint8_t *all_frag_present); void ol_rx_defrag_waitlist_add(struct ol_txrx_peer_t *peer, unsigned tid); @@ -73,33 +73,33 @@ void ol_rx_defrag_waitlist_flush(struct ol_txrx_pdev_t *pdev); void ol_rx_defrag(ol_txrx_pdev_handle pdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t frag_list); + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t frag_list); int ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t msdu, uint16_t hdrlen); + qdf_nbuf_t msdu, uint16_t hdrlen); int ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t nbuf, uint16_t hdrlen); + qdf_nbuf_t nbuf, uint16_t hdrlen); -void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu); +void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu); void ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t nbuf, uint16_t hdrlen); + qdf_nbuf_t nbuf, uint16_t hdrlen); int ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, - const uint8_t *key, cdf_nbuf_t msdu, uint16_t hdrlen); + const uint8_t *key, qdf_nbuf_t msdu, uint16_t hdrlen); int ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev, - cdf_nbuf_t nbuf, uint16_t hdrlen); + qdf_nbuf_t nbuf, uint16_t hdrlen); int ol_rx_frag_ccmp_demic(ol_txrx_pdev_handle pdev, - cdf_nbuf_t wbuf, uint16_t hdrlen); + qdf_nbuf_t wbuf, uint16_t hdrlen); uint16_t ol_rx_frag_hdrsize(const void *data); @@ -108,16 +108,16 @@ void ol_rx_defrag_michdr(const struct ieee80211_frame *wh0, uint8_t hdr[]); void ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev, struct ol_txrx_peer_t *peer, - unsigned tid, uint16_t seq_num, cdf_nbuf_t frag); + unsigned tid, uint16_t seq_num, qdf_nbuf_t frag); -cdf_nbuf_t +qdf_nbuf_t ol_rx_defrag_decap_recombine(htt_pdev_handle htt_pdev, - cdf_nbuf_t frag_list, uint16_t hdrsize); + qdf_nbuf_t frag_list, uint16_t hdrsize); int ol_rx_defrag_mic(ol_txrx_pdev_handle pdev, const uint8_t *key, - cdf_nbuf_t wbuf, + qdf_nbuf_t wbuf, uint16_t off, uint16_t data_len, uint8_t mic[]); void @@ -167,16 +167,16 @@ static inline void put_le32(uint8_t *p, uint32_t v) p[3] = (v >> 24) & 0xff; } -static inline uint8_t ol_rx_defrag_concat(cdf_nbuf_t dst, cdf_nbuf_t src) +static inline uint8_t ol_rx_defrag_concat(qdf_nbuf_t dst, qdf_nbuf_t src) { /* - * Inside cdf_nbuf_cat, if it is necessary to reallocate dst + * Inside qdf_nbuf_cat, if it is necessary to reallocate dst * to provide space for src, the headroom portion is copied from * the original dst buffer to the larger new dst buffer. * (This is needed, because the headroom of the dst buffer * contains the rx desc.) */ - if (cdf_nbuf_cat(dst, src)) + if (qdf_nbuf_cat(dst, src)) return OL_RX_DEFRAG_ERR; return OL_RX_DEFRAG_OK; diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index f85df9d2964a..7653928fb231 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/core/dp/txrx/ol_rx_fwd.c @@ -26,7 +26,7 @@ */ /* standard header files */ -#include /* cdf_nbuf_map */ +#include /* qdf_nbuf_map */ #include /* qdf_mem_cmp */ /* external header files */ @@ -48,7 +48,7 @@ * Check that this Packet is suitable for forwarding. If yes, then * prepare the new 802.11 header. */ -static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) +static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu) { struct ieee80211_frame *mac_header; unsigned char tmp_addr[IEEE80211_ADDR_LEN]; @@ -57,7 +57,7 @@ static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) unsigned char fromds; unsigned char tods; - mac_header = (struct ieee80211_frame *)(cdf_nbuf_data(msdu)); + mac_header = (struct ieee80211_frame *)(qdf_nbuf_data(msdu)); TXRX_ASSERT1(mac_header); type = mac_header->i_fc[0] & IEEE80211_FC0_TYPE_MASK; @@ -107,7 +107,7 @@ static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) } } -static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) +static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu) { struct ol_txrx_pdev_t *pdev = vdev->pdev; @@ -118,8 +118,8 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) * Map the netbuf, so it's accessible to the DMA that * sends it to the target. */ - cdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); - cdf_nbuf_set_next(msdu, NULL); /* add NULL terminator */ + qdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); + qdf_nbuf_set_next(msdu, NULL); /* add NULL terminator */ msdu = OL_TX_LL(vdev, msdu); @@ -129,19 +129,19 @@ static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu) * We could store the frame and try again later, * but the simplest solution is to discard the frames. */ - cdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); - cdf_nbuf_tx_free(msdu, NBUF_PKT_ERROR); + qdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); + qdf_nbuf_tx_free(msdu, QDF_NBUF_PKT_ERROR); } } void ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list) + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list) { struct ol_txrx_pdev_t *pdev = vdev->pdev; - cdf_nbuf_t deliver_list_head = NULL; - cdf_nbuf_t deliver_list_tail = NULL; - cdf_nbuf_t msdu; + qdf_nbuf_t deliver_list_head = NULL; + qdf_nbuf_t deliver_list_tail = NULL; + qdf_nbuf_t msdu; msdu = msdu_list; while (msdu) { @@ -151,7 +151,7 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, * Remember the next list elem, because our processing * may cause the MSDU to get linked into a different list. */ - msdu_list = cdf_nbuf_next(msdu); + msdu_list = qdf_nbuf_next(msdu); rx_desc = htt_rx_msdu_desc_retrieve(pdev->htt_pdev, msdu); @@ -182,9 +182,9 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, * Fw will take care of filling proper tid. */ if (tid != HTT_NON_QOS_TID) { - cdf_nbuf_set_tid(msdu, tid); + qdf_nbuf_set_tid(msdu, tid); } else { - cdf_nbuf_set_tid(msdu, + qdf_nbuf_set_tid(msdu, QDF_NBUF_TX_EXT_TID_INVALID); } /* @@ -195,14 +195,14 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, */ if (htt_rx_msdu_discard(pdev->htt_pdev, rx_desc)) { htt_rx_msdu_desc_free(pdev->htt_pdev, msdu); - cdf_net_buf_debug_release_skb(msdu); + qdf_net_buf_debug_release_skb(msdu); ol_rx_fwd_to_tx(tx_vdev, msdu); msdu = NULL; /* already handled this MSDU */ TXRX_STATS_ADD(pdev, pub.rx.intra_bss_fwd.packets_fwd, 1); } else { - cdf_nbuf_t copy; - copy = cdf_nbuf_copy(msdu); + qdf_nbuf_t copy; + copy = qdf_nbuf_copy(msdu); if (copy) ol_rx_fwd_to_tx(tx_vdev, copy); TXRX_STATS_ADD(pdev, @@ -221,7 +221,7 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, } if (deliver_list_head) { /* add NULL terminator */ - cdf_nbuf_set_next(deliver_list_tail, NULL); + qdf_nbuf_set_next(deliver_list_tail, NULL); if (ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev)) { ol_rx_in_order_deliver(vdev, peer, tid, deliver_list_head); diff --git a/core/dp/txrx/ol_rx_fwd.h b/core/dp/txrx/ol_rx_fwd.h index fe570c5acb4c..79d1e2de22aa 100644 --- a/core/dp/txrx/ol_rx_fwd.h +++ b/core/dp/txrx/ol_rx_fwd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,19 +28,19 @@ #ifndef _OL_RX_FWD_H_ #define _OL_RX_FWD_H_ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* ol_txrx_peer_t, etc. */ -cdf_nbuf_t +qdf_nbuf_t ol_rx_fwd_mcast_check_sta(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - cdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast); + qdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast); -cdf_nbuf_t +qdf_nbuf_t ol_rx_fwd_mcast_check_ap(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - cdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast); + qdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast); /** * @brief Check if rx frames should be transmitted over WLAN. @@ -70,6 +70,6 @@ ol_rx_fwd_mcast_check_ap(struct ol_txrx_vdev_t *vdev, void ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list); + unsigned tid, qdf_nbuf_t msdu_list); #endif /* _OL_RX_FWD_H_ */ diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index 4da66ef68b64..fa4903db5d34 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* htt_rx_pn_t, etc. */ #include /* ol_rx_err */ @@ -41,7 +41,7 @@ if (!head) { \ head = mpdu; \ } else { \ - cdf_nbuf_set_next(tail, mpdu); \ + qdf_nbuf_set_next(tail, mpdu); \ } \ tail = mpdu_tail; \ } while (0) @@ -80,16 +80,16 @@ int ol_rx_pn_wapi_cmp(union htt_rx_pn_t *new_pn, return pn_is_replay; } -cdf_nbuf_t +qdf_nbuf_t ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list) + unsigned tid, qdf_nbuf_t msdu_list) { struct ol_txrx_pdev_t *pdev = vdev->pdev; union htt_rx_pn_t *last_pn; - cdf_nbuf_t out_list_head = NULL; - cdf_nbuf_t out_list_tail = NULL; - cdf_nbuf_t mpdu; + qdf_nbuf_t out_list_head = NULL; + qdf_nbuf_t out_list_tail = NULL; + qdf_nbuf_t mpdu; int index; /* unicast vs. multicast */ int pn_len; void *rx_desc; @@ -114,7 +114,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, last_pn = &peer->tids_last_pn[tid]; mpdu = msdu_list; while (mpdu) { - cdf_nbuf_t mpdu_tail, next_mpdu; + qdf_nbuf_t mpdu_tail, next_mpdu; union htt_rx_pn_t new_pn; int pn_is_replay = 0; @@ -148,7 +148,7 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, } if (pn_is_replay) { - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; static uint32_t last_pncheck_print_time /* = 0 */; int log_level; uint32_t current_time_ms; @@ -198,10 +198,10 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, mpdu, NULL, 0); /* free all MSDUs within this MPDU */ do { - cdf_nbuf_t next_msdu; + qdf_nbuf_t next_msdu; OL_RX_ERR_STATISTICS_1(pdev, vdev, peer, rx_desc, OL_RX_ERR_PN); - next_msdu = cdf_nbuf_next(msdu); + next_msdu = qdf_nbuf_next(msdu); htt_rx_desc_frame_free(pdev->htt_pdev, msdu); if (msdu == mpdu_tail) break; @@ -228,14 +228,14 @@ ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, } /* make sure the list is null-terminated */ if (out_list_tail) - cdf_nbuf_set_next(out_list_tail, NULL); + qdf_nbuf_set_next(out_list_tail, NULL); return out_list_head; } void ol_rx_pn_check(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list) + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list) { msdu_list = ol_rx_pn_check_base(vdev, peer, tid, msdu_list); ol_rx_fwd_check(vdev, peer, tid, msdu_list); @@ -244,7 +244,7 @@ ol_rx_pn_check(struct ol_txrx_vdev_t *vdev, void ol_rx_pn_check_only(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list) + unsigned tid, qdf_nbuf_t msdu_list) { msdu_list = ol_rx_pn_check_base(vdev, peer, tid, msdu_list); ol_rx_deliver(vdev, peer, tid, msdu_list); diff --git a/core/dp/txrx/ol_rx_pn.h b/core/dp/txrx/ol_rx_pn.h index 845dc9177394..0b132f8fbb5c 100644 --- a/core/dp/txrx/ol_rx_pn.h +++ b/core/dp/txrx/ol_rx_pn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,7 +28,7 @@ #ifndef _OL_RX_PN_H_ #define _OL_RX_PN_H_ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* ol_txrx_peer_t, etc. */ @@ -60,7 +60,7 @@ int ol_rx_pn_wapi_cmp(union htt_rx_pn_t *new_pn, */ void ol_rx_pn_check(struct ol_txrx_vdev_t *vdev, - struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list); + struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list); /** * @brief If applicable, check the Packet Number to detect replays. @@ -82,7 +82,7 @@ ol_rx_pn_check(struct ol_txrx_vdev_t *vdev, void ol_rx_pn_check_only(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list); + unsigned tid, qdf_nbuf_t msdu_list); /** * @brief If applicable, check the Packet Number to detect replays. @@ -97,9 +97,9 @@ ol_rx_pn_check_only(struct ol_txrx_vdev_t *vdev, * (if PN check is applicable, i.e. PN length > 0) * @return list of netbufs that didn't fail the PN check */ -cdf_nbuf_t +qdf_nbuf_t ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list); + unsigned tid, qdf_nbuf_t msdu_list); #endif /* _OL_RX_PN_H_ */ diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index 42fd4fb6af7d..f832aa68616c 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -27,7 +27,7 @@ /*=== header file includes ===*/ /* generic utilities */ -#include /* cdf_nbuf_t, etc. */ +#include /* cdf_nbuf_t, etc. */ #include /* qdf_mem_malloc */ #include /* IEEE80211_SEQ_MAX */ @@ -86,7 +86,7 @@ static char g_log2ceil[] = { #define OL_RX_REORDER_LIST_APPEND(head_msdu, tail_msdu, rx_reorder_array_elem) \ do { \ if (tail_msdu) { \ - cdf_nbuf_set_next(tail_msdu, \ + qdf_nbuf_set_next(tail_msdu, \ rx_reorder_array_elem->head); \ } \ } while (0) @@ -223,14 +223,14 @@ void ol_rx_reorder_store(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer, unsigned tid, - unsigned idx, cdf_nbuf_t head_msdu, cdf_nbuf_t tail_msdu) + unsigned idx, qdf_nbuf_t head_msdu, qdf_nbuf_t tail_msdu) { struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem; idx &= peer->tids_rx_reorder[tid].win_sz_mask; rx_reorder_array_elem = &peer->tids_rx_reorder[tid].array[idx]; if (rx_reorder_array_elem->head) { - cdf_nbuf_set_next(rx_reorder_array_elem->tail, head_msdu); + qdf_nbuf_set_next(rx_reorder_array_elem->tail, head_msdu); } else { rx_reorder_array_elem->head = head_msdu; OL_RX_REORDER_MPDU_CNT_INCR(&peer->tids_rx_reorder[tid], 1); @@ -246,8 +246,8 @@ ol_rx_reorder_release(struct ol_txrx_vdev_t *vdev, unsigned idx; unsigned win_sz, win_sz_mask; struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem; - cdf_nbuf_t head_msdu; - cdf_nbuf_t tail_msdu; + qdf_nbuf_t head_msdu; + qdf_nbuf_t tail_msdu; OL_RX_REORDER_IDX_START_SELF_SELECT(peer, tid, &idx_start); /* may get reset below */ @@ -305,7 +305,7 @@ ol_rx_reorder_release(struct ol_txrx_vdev_t *vdev, head_msdu)); peer->tids_last_seq[tid] = seq_num; /* rx_opt_proc takes a NULL-terminated list of msdu netbufs */ - cdf_nbuf_set_next(tail_msdu, NULL); + qdf_nbuf_set_next(tail_msdu, NULL); peer->rx_opt_proc(vdev, peer, tid, head_msdu); } /* @@ -327,8 +327,8 @@ ol_rx_reorder_flush(struct ol_txrx_vdev_t *vdev, unsigned win_sz; uint8_t win_sz_mask; struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem; - cdf_nbuf_t head_msdu = NULL; - cdf_nbuf_t tail_msdu = NULL; + qdf_nbuf_t head_msdu = NULL; + qdf_nbuf_t tail_msdu = NULL; pdev = vdev->pdev; win_sz = peer->tids_rx_reorder[tid].win_sz; @@ -371,7 +371,7 @@ ol_rx_reorder_flush(struct ol_txrx_vdev_t *vdev, rx_reorder_array_elem->tail = NULL; continue; } - cdf_nbuf_set_next(tail_msdu, + qdf_nbuf_set_next(tail_msdu, rx_reorder_array_elem->head); tail_msdu = rx_reorder_array_elem->tail; rx_reorder_array_elem->head = @@ -390,13 +390,13 @@ ol_rx_reorder_flush(struct ol_txrx_vdev_t *vdev, htt_rx_msdu_desc_retrieve(htt_pdev, head_msdu)); peer->tids_last_seq[tid] = seq_num; /* rx_opt_proc takes a NULL-terminated list of msdu netbufs */ - cdf_nbuf_set_next(tail_msdu, NULL); + qdf_nbuf_set_next(tail_msdu, NULL); if (action == htt_rx_flush_release) { peer->rx_opt_proc(vdev, peer, tid, head_msdu); } else { do { - cdf_nbuf_t next; - next = cdf_nbuf_next(head_msdu); + qdf_nbuf_t next; + next = qdf_nbuf_next(head_msdu); htt_rx_desc_frame_free(pdev->htt_pdev, head_msdu); head_msdu = next; @@ -596,8 +596,8 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, struct ol_txrx_peer_t *peer; struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem; unsigned win_sz_mask; - cdf_nbuf_t head_msdu = NULL; - cdf_nbuf_t tail_msdu = NULL; + qdf_nbuf_t head_msdu = NULL; + qdf_nbuf_t tail_msdu = NULL; htt_pdev_handle htt_pdev = pdev->htt_pdev; int seq_num, i = 0; @@ -630,7 +630,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, if (rx_reorder_array_elem->head) { if (pn_ie_cnt && seq_num == (int)(pn_ie[i])) { - cdf_nbuf_t msdu, next_msdu, mpdu_head, + qdf_nbuf_t msdu, next_msdu, mpdu_head, mpdu_tail; static uint32_t last_pncheck_print_time; /* Do not need to initialize as C does it */ @@ -691,7 +691,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, /* free all MSDUs within this MPDU */ do { - next_msdu = cdf_nbuf_next(msdu); + next_msdu = qdf_nbuf_next(msdu); htt_rx_desc_frame_free(htt_pdev, msdu); if (msdu == mpdu_tail) break; @@ -704,7 +704,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, head_msdu = rx_reorder_array_elem->head; tail_msdu = rx_reorder_array_elem->tail; } else { - cdf_nbuf_set_next( + qdf_nbuf_set_next( tail_msdu, rx_reorder_array_elem->head); tail_msdu = rx_reorder_array_elem->tail; @@ -718,7 +718,7 @@ ol_rx_pn_ind_handler(ol_txrx_pdev_handle pdev, if (head_msdu) { /* rx_opt_proc takes a NULL-terminated list of msdu netbufs */ - cdf_nbuf_set_next(tail_msdu, NULL); + qdf_nbuf_set_next(tail_msdu, NULL); peer->rx_opt_proc(vdev, peer, tid, head_msdu); } } diff --git a/core/dp/txrx/ol_rx_reorder.h b/core/dp/txrx/ol_rx_reorder.h index 7629c6a9b2f7..701715423152 100644 --- a/core/dp/txrx/ol_rx_reorder.h +++ b/core/dp/txrx/ol_rx_reorder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,7 +28,7 @@ #ifndef _OL_RX_REORDER__H_ #define _OL_RX_REORDER__H_ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* ol_txrx_peer_t, etc. */ @@ -39,7 +39,7 @@ ol_rx_reorder_store(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer, unsigned tid, unsigned reorder_array_index, - cdf_nbuf_t head_msdu, cdf_nbuf_t tail_msdu); + qdf_nbuf_t head_msdu, qdf_nbuf_t tail_msdu); void ol_rx_reorder_release(struct ol_txrx_vdev_t *vdev, diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index 3175dc5dc9a0..24b0ae559765 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -27,7 +27,7 @@ /*=== header file includes ===*/ /* generic utilities */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include #include diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 6ac608a969da..b5dedef42275 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -26,7 +26,7 @@ */ /* OS abstraction libraries */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_atomic_read, etc. */ #include /* qdf_unlikely */ @@ -56,7 +56,7 @@ #include #include /* htc_endpoint */ -int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, +int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus, unsigned int num_msdus, unsigned int transfer_id); #endif /* WLAN_FEATURE_FASTPATH */ @@ -91,11 +91,11 @@ int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus, * Return: 0 - success, >0 - error */ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, - cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) { msdu_info->tso_info.curr_seg = NULL; - if (cdf_nbuf_is_tso(msdu)) { - int num_seg = cdf_nbuf_get_tso_num_seg(msdu); + if (qdf_nbuf_is_tso(msdu)) { + int num_seg = qdf_nbuf_get_tso_num_seg(msdu); msdu_info->tso_info.tso_seg_list = NULL; msdu_info->tso_info.num_segs = num_seg; while (num_seg) { @@ -121,7 +121,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, return 1; } } - cdf_nbuf_get_tso_info(vdev->pdev->osdev, + qdf_nbuf_get_tso_info(vdev->pdev->osdev, msdu, &(msdu_info->tso_info)); msdu_info->tso_info.curr_seg = msdu_info->tso_info.tso_seg_list; @@ -142,13 +142,13 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, * * Return: skb/NULL for success */ -cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, +qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, uint8_t proto_type) { void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct ol_txrx_peer_t *peer; - cdf_nbuf_t ret; + qdf_nbuf_t ret; QDF_STATUS status; if (qdf_unlikely(!pdev)) { @@ -181,27 +181,27 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, return skb; } - status = cdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE); + status = qdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE); if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: nbuf map failed", __func__); return skb; } - cdf_nbuf_trace_set_proto_type(skb, proto_type); + qdf_nbuf_trace_set_proto_type(skb, proto_type); if ((ol_cfg_is_ip_tcp_udp_checksum_offload_enabled(pdev->ctrl_pdev)) - && (cdf_nbuf_get_protocol(skb) == htons(ETH_P_IP)) - && (cdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL)) - cdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE); + && (qdf_nbuf_get_protocol(skb) == htons(ETH_P_IP)) + && (qdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL)) + qdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE); /* Terminate the (single-element) list of tx frames */ - cdf_nbuf_set_next(skb, NULL); + qdf_nbuf_set_next(skb, NULL); ret = OL_TX_LL(peer->vdev, skb); if (ret) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: Failed to tx", __func__); - cdf_nbuf_unmap_single(qdf_ctx, ret, QDF_DMA_TO_DEVICE); + qdf_nbuf_unmap_single(qdf_ctx, ret, QDF_DMA_TO_DEVICE); return ret; } @@ -216,11 +216,11 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb, * * Return: skb/ NULL is for success */ -cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, - cdf_nbuf_t skb) +qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, + qdf_nbuf_t skb) { ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); - cdf_nbuf_t ret; + qdf_nbuf_t ret; if (qdf_unlikely(!pdev)) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -229,12 +229,12 @@ cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, } if ((ol_cfg_is_ip_tcp_udp_checksum_offload_enabled(pdev->ctrl_pdev)) - && (cdf_nbuf_get_protocol(skb) == htons(ETH_P_IP)) - && (cdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL)) - cdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE); + && (qdf_nbuf_get_protocol(skb) == htons(ETH_P_IP)) + && (qdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL)) + qdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE); /* Terminate the (single-element) list of tx frames */ - cdf_nbuf_set_next(skb, NULL); + qdf_nbuf_set_next(skb, NULL); ret = OL_TX_LL((struct ol_txrx_vdev_t *)vdev, skb); if (ret) { TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, @@ -248,9 +248,9 @@ cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, #if defined(FEATURE_TSO) -cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; struct ol_txrx_msdu_info_t msdu_info; msdu_info.htt.info.l2_hdr_type = vdev->pdev->htt_pkt_type; @@ -262,11 +262,11 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * within the list. */ while (msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; struct ol_tx_desc_t *tx_desc; int segments = 1; - msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); + msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { @@ -283,7 +283,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * ol_tx_send function, so store the next pointer before the * tx_send call. */ - next = cdf_nbuf_next(msdu); + next = qdf_nbuf_next(msdu); /* init the current segment to the 1st segment in the list */ while (segments) { @@ -301,7 +301,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * receiving tx completion for all segments of an nbuf */ if (segments) - cdf_nbuf_inc_users(msdu); + qdf_nbuf_inc_users(msdu); ol_tx_prepare_ll(tx_desc, vdev, msdu, &msdu_info); @@ -318,7 +318,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) msdu_info.tso_info.curr_seg->next; } - cdf_nbuf_reset_num_frags(msdu); + qdf_nbuf_reset_num_frags(msdu); if (msdu_info.tso_info.is_tso) { TXRX_STATS_TSO_INC_SEG(vdev->pdev); @@ -336,9 +336,9 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) } #else /* TSO */ -cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; struct ol_txrx_msdu_info_t msdu_info; msdu_info.htt.info.l2_hdr_type = vdev->pdev->htt_pkt_type; @@ -351,10 +351,10 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * within the list. */ while (msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; struct ol_tx_desc_t *tx_desc; - msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); + msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; ol_tx_prepare_ll(tx_desc, vdev, msdu, &msdu_info); @@ -368,7 +368,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * ol_tx_send function, so store the next pointer before the * tx_send call. */ - next = cdf_nbuf_next(msdu); + next = qdf_nbuf_next(msdu); ol_tx_send(vdev->pdev, tx_desc, msdu); msdu = next; } @@ -394,7 +394,7 @@ cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) */ static inline struct ol_tx_desc_t * ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, - ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu, + ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu, uint32_t pkt_download_len, uint32_t ep_id, struct ol_txrx_msdu_info_t *msdu_info) { @@ -436,10 +436,10 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, &msdu_info->htt, &msdu_info->tso_info, NULL, vdev->opmode == wlan_op_mode_ocb); - num_frags = cdf_nbuf_get_num_frags(msdu); + num_frags = qdf_nbuf_get_num_frags(msdu); /* num_frags are expected to be 2 max */ - num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS) - ? NBUF_CB_TX_MAX_EXTRA_FRAGS + num_frags = (num_frags > QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS) + ? QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS : num_frags; #if defined(HELIUMPLUS_PADDR64) /* @@ -463,8 +463,8 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, qdf_size_t frag_len; qdf_dma_addr_t frag_paddr; - frag_len = cdf_nbuf_get_frag_len(msdu, i); - frag_paddr = cdf_nbuf_get_frag_paddr(msdu, i); + frag_len = qdf_nbuf_get_frag_len(msdu, i); + frag_paddr = qdf_nbuf_get_frag_paddr(msdu, i); #if defined(HELIUMPLUS_PADDR64) htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); @@ -491,8 +491,8 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, /* * TODO : Can we remove this check and always download a fixed length ? * */ - if (qdf_unlikely(cdf_nbuf_len(msdu) < pkt_download_len)) - pkt_download_len = cdf_nbuf_len(msdu); + if (qdf_unlikely(qdf_nbuf_len(msdu) < pkt_download_len)) + pkt_download_len = qdf_nbuf_len(msdu); /* Fill the HTC header information */ /* @@ -513,10 +513,10 @@ ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev, * * Return: on success return NULL, pointer to nbuf when it fails to send. */ -cdf_nbuf_t -ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +qdf_nbuf_t +ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; struct ol_txrx_pdev_t *pdev = vdev->pdev; uint32_t pkt_download_len = ((struct htt_pdev_t *)(pdev->htt_pdev))->download_len; @@ -532,11 +532,11 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * within the list. */ while (msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; struct ol_tx_desc_t *tx_desc; int segments = 1; - msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); + msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) { @@ -553,7 +553,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * inside the ce_send_fast function, so store the next * pointer before the ce_send call. */ - next = cdf_nbuf_next(msdu); + next = qdf_nbuf_next(msdu); /* init the current segment to the 1st segment in the list */ while (segments) { @@ -570,13 +570,13 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * receiving tx completion for all segments of an nbuf */ if (segments) - cdf_nbuf_inc_users(msdu); + qdf_nbuf_inc_users(msdu); msdu_info.htt.info.frame_type = pdev->htt_pkt_type; msdu_info.htt.info.vdev_id = vdev->vdev_id; msdu_info.htt.action.cksum_offload = - cdf_nbuf_get_tx_cksum(msdu); - switch (cdf_nbuf_get_exemption_type(msdu)) { + qdf_nbuf_get_tx_cksum(msdu); + switch (qdf_nbuf_get_exemption_type(msdu)) { case QDF_NBUF_EXEMPT_NO_EXEMPTION: case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ @@ -619,7 +619,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) } if (msdu_info.tso_info.is_tso) { - cdf_nbuf_reset_num_frags(msdu); + qdf_nbuf_reset_num_frags(msdu); TXRX_STATS_TSO_INC_SEG(vdev->pdev); TXRX_STATS_TSO_INC_SEG_IDX(vdev->pdev); } @@ -640,10 +640,10 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) return NULL; /* all MSDUs were accepted */ } #else -cdf_nbuf_t -ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +qdf_nbuf_t +ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; struct ol_txrx_pdev_t *pdev = vdev->pdev; uint32_t pkt_download_len = ((struct htt_pdev_t *)(pdev->htt_pdev))->download_len; @@ -660,17 +660,17 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * within the list. */ while (msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; struct ol_tx_desc_t *tx_desc; - msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); + msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; msdu_info.htt.info.frame_type = pdev->htt_pkt_type; msdu_info.htt.info.vdev_id = vdev->vdev_id; msdu_info.htt.action.cksum_offload = - cdf_nbuf_get_tx_cksum(msdu); - switch (cdf_nbuf_get_exemption_type(msdu)) { + qdf_nbuf_get_tx_cksum(msdu); + switch (qdf_nbuf_get_exemption_type(msdu)) { case QDF_NBUF_EXEMPT_NO_EXEMPTION: case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ @@ -701,7 +701,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * inside the ce_send_fast function, so store the next * pointer before the ce_send call. */ - next = cdf_nbuf_next(msdu); + next = qdf_nbuf_next(msdu); if ((0 == ce_send_fast(pdev->ce_tx_hdl, &msdu, 1, ep_id))) { /* The packet could not be sent */ @@ -728,8 +728,8 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) * ol_tx_ll_wrapper() wrapper to ol_tx_ll * */ -static inline cdf_nbuf_t -ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +static inline qdf_nbuf_t +ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { struct hif_opaque_softc *hif_device = (struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF); @@ -742,8 +742,8 @@ ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) return msdu_list; } #else -static inline cdf_nbuf_t -ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +static inline qdf_nbuf_t +ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { return ol_tx_ll(vdev, msdu_list); } @@ -778,17 +778,17 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) max_to_accept = vdev->pdev->tx_desc.num_free - OL_TX_VDEV_PAUSE_QUEUE_SEND_MARGIN; while (max_to_accept > 0 && vdev->ll_pause.txq.depth) { - cdf_nbuf_t tx_msdu; + qdf_nbuf_t tx_msdu; max_to_accept--; vdev->ll_pause.txq.depth--; tx_msdu = vdev->ll_pause.txq.head; if (tx_msdu) { - vdev->ll_pause.txq.head = cdf_nbuf_next(tx_msdu); + vdev->ll_pause.txq.head = qdf_nbuf_next(tx_msdu); if (NULL == vdev->ll_pause.txq.head) vdev->ll_pause.txq.tail = NULL; - cdf_nbuf_set_next(tx_msdu, NULL); - NBUF_UPDATE_TX_PKT_COUNT(tx_msdu, - NBUF_TX_PKT_TXRX_DEQUEUE); + qdf_nbuf_set_next(tx_msdu, NULL); + QDF_NBUF_UPDATE_TX_PKT_COUNT(tx_msdu, + QDF_NBUF_TX_PKT_TXRX_DEQUEUE); tx_msdu = ol_tx_ll_wrapper(vdev, tx_msdu); /* * It is unexpected that ol_tx_ll would reject the frame @@ -799,9 +799,9 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) * For simplicity, just drop the frame. */ if (tx_msdu) { - cdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu, + qdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu, QDF_DMA_TO_DEVICE); - cdf_nbuf_tx_free(tx_msdu, NBUF_PKT_ERROR); + qdf_nbuf_tx_free(tx_msdu, QDF_NBUF_PKT_ERROR); } } } @@ -817,33 +817,34 @@ static void ol_tx_vdev_ll_pause_queue_send_base(struct ol_txrx_vdev_t *vdev) qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } -static cdf_nbuf_t +static qdf_nbuf_t ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu_list, uint8_t start_timer) + qdf_nbuf_t msdu_list, uint8_t start_timer) { qdf_spin_lock_bh(&vdev->ll_pause.mutex); while (msdu_list && vdev->ll_pause.txq.depth < vdev->ll_pause.max_q_depth) { - cdf_nbuf_t next = cdf_nbuf_next(msdu_list); - NBUF_UPDATE_TX_PKT_COUNT(msdu_list, NBUF_TX_PKT_TXRX_ENQUEUE); + qdf_nbuf_t next = qdf_nbuf_next(msdu_list); + QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu_list, + QDF_NBUF_TX_PKT_TXRX_ENQUEUE); DPTRACE(qdf_dp_trace(msdu_list, QDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(msdu_list)), - sizeof(cdf_nbuf_data(msdu_list)))); + (uint8_t *)(qdf_nbuf_data(msdu_list)), + sizeof(qdf_nbuf_data(msdu_list)))); vdev->ll_pause.txq.depth++; if (!vdev->ll_pause.txq.head) { vdev->ll_pause.txq.head = msdu_list; vdev->ll_pause.txq.tail = msdu_list; } else { - cdf_nbuf_set_next(vdev->ll_pause.txq.tail, msdu_list); + qdf_nbuf_set_next(vdev->ll_pause.txq.tail, msdu_list); } vdev->ll_pause.txq.tail = msdu_list; msdu_list = next; } if (vdev->ll_pause.txq.tail) - cdf_nbuf_set_next(vdev->ll_pause.txq.tail, NULL); + qdf_nbuf_set_next(vdev->ll_pause.txq.tail, NULL); if (start_timer) { qdf_timer_stop(&vdev->ll_pause.timer); @@ -860,7 +861,7 @@ ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev, * Store up the tx frame in the vdev's tx queue if the vdev is paused. * If there are too many frames in the tx queue, reject it. */ -cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) +qdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { uint16_t eth_type; uint32_t paused_reason; @@ -874,10 +875,10 @@ cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED) == paused_reason)) { eth_type = (((struct ethernet_hdr_t *) - cdf_nbuf_data(msdu_list))-> + qdf_nbuf_data(msdu_list))-> ethertype[0] << 8) | (((struct ethernet_hdr_t *) - cdf_nbuf_data(msdu_list))->ethertype[1]); + qdf_nbuf_data(msdu_list))->ethertype[1]); if (ETHERTYPE_IS_EAPOL_WAPI(eth_type)) { msdu_list = ol_tx_ll_wrapper(vdev, msdu_list); return msdu_list; @@ -918,7 +919,7 @@ cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list) void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) { int max_to_send; /* tracks how many frames have been sent */ - cdf_nbuf_t tx_msdu; + qdf_nbuf_t tx_msdu; struct ol_txrx_vdev_t *vdev = NULL; uint8_t more; @@ -961,12 +962,12 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) vdev->ll_pause.txq.depth--; vdev->ll_pause.txq.head = - cdf_nbuf_next(tx_msdu); + qdf_nbuf_next(tx_msdu); if (NULL == vdev->ll_pause.txq.head) vdev->ll_pause.txq.tail = NULL; - cdf_nbuf_set_next(tx_msdu, NULL); + qdf_nbuf_set_next(tx_msdu, NULL); tx_msdu = ol_tx_ll_wrapper(vdev, tx_msdu); /* * It is unexpected that ol_tx_ll would reject @@ -978,10 +979,10 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) * For simplicity, just drop the frame. */ if (tx_msdu) { - cdf_nbuf_unmap(pdev->osdev, tx_msdu, + qdf_nbuf_unmap(pdev->osdev, tx_msdu, QDF_DMA_TO_DEVICE); - cdf_nbuf_tx_free(tx_msdu, - NBUF_PKT_ERROR); + qdf_nbuf_tx_free(tx_msdu, + QDF_NBUF_PKT_ERROR); } } /*check if there are more msdus to transmit */ @@ -1038,11 +1039,11 @@ static inline uint8_t ol_txrx_tx_raw_subtype(enum ol_tx_spec tx_spec) return sub_type; } -cdf_nbuf_t +qdf_nbuf_t ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, - enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list) + enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list) { - cdf_nbuf_t msdu = msdu_list; + qdf_nbuf_t msdu = msdu_list; htt_pdev_handle htt_pdev = vdev->pdev->htt_pdev; struct ol_txrx_msdu_info_t msdu_info; @@ -1056,10 +1057,10 @@ ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, * within the list. */ while (msdu) { - cdf_nbuf_t next; + qdf_nbuf_t next; struct ol_tx_desc_t *tx_desc; - msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu); + msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu); msdu_info.peer = NULL; msdu_info.tso_info.is_tso = 0; @@ -1070,7 +1071,7 @@ ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, * ol_tx_send function, so store the next pointer before the * tx_send call. */ - next = cdf_nbuf_next(msdu); + next = qdf_nbuf_next(msdu); if (tx_spec != ol_tx_spec_std) { if (tx_spec & ol_tx_spec_no_free) { @@ -1126,26 +1127,26 @@ ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, * parse_ocb_tx_header() - Function to check for OCB * TX control header on a packet and extract it if present * - * @msdu: Pointer to OS packet (cdf_nbuf_t) + * @msdu: Pointer to OS packet (qdf_nbuf_t) */ #define OCB_HEADER_VERSION 1 -bool parse_ocb_tx_header(cdf_nbuf_t msdu, +bool parse_ocb_tx_header(qdf_nbuf_t msdu, struct ocb_tx_ctrl_hdr_t *tx_ctrl) { struct ether_header *eth_hdr_p; struct ocb_tx_ctrl_hdr_t *tx_ctrl_hdr; /* Check if TX control header is present */ - eth_hdr_p = (struct ether_header *) cdf_nbuf_data(msdu); + eth_hdr_p = (struct ether_header *) qdf_nbuf_data(msdu); if (eth_hdr_p->ether_type != QDF_SWAP_U16(ETHERTYPE_OCB_TX)) /* TX control header is not present. Nothing to do.. */ return true; /* Remove the ethernet header */ - cdf_nbuf_pull_head(msdu, sizeof(struct ether_header)); + qdf_nbuf_pull_head(msdu, sizeof(struct ether_header)); /* Parse the TX control header */ - tx_ctrl_hdr = (struct ocb_tx_ctrl_hdr_t *) cdf_nbuf_data(msdu); + tx_ctrl_hdr = (struct ocb_tx_ctrl_hdr_t *) qdf_nbuf_data(msdu); if (tx_ctrl_hdr->version == OCB_HEADER_VERSION) { if (tx_ctrl) @@ -1157,13 +1158,13 @@ bool parse_ocb_tx_header(cdf_nbuf_t msdu, } /* Remove the TX control header */ - cdf_nbuf_pull_head(msdu, tx_ctrl_hdr->length); + qdf_nbuf_pull_head(msdu, tx_ctrl_hdr->length); return true; } -cdf_nbuf_t +qdf_nbuf_t ol_tx_non_std(ol_txrx_vdev_handle vdev, - enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list) + enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list) { return ol_tx_non_std_ll(vdev, tx_spec, msdu_list); } @@ -1230,7 +1231,7 @@ void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) int ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, - cdf_nbuf_t tx_mgmt_frm, + qdf_nbuf_t tx_mgmt_frm, uint8_t type, uint8_t use_6mbps, uint16_t chanfreq) { struct ol_txrx_pdev_t *pdev = vdev->pdev; @@ -1287,7 +1288,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, tx_msdu_info.peer = NULL; - cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE); + qdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE); /* For LL tx_comp_req is not used so initialized to 0 */ tx_msdu_info.htt.action.tx_comp_req = 0; tx_desc = ol_tx_desc_ll(pdev, vdev, tx_mgmt_frm, &tx_msdu_info); @@ -1310,7 +1311,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, htt_tx_desc_frags_table_set( pdev->htt_pdev, tx_desc->htt_tx_desc, - cdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1), + qdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1), 0, 0); #if defined(HELIUMPLUS_PADDR64) && defined(HELIUMPLUS_DEBUG) dump_frag_desc( @@ -1319,7 +1320,7 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, #endif /* defined(HELIUMPLUS_PADDR64) */ } if (!tx_desc) { - cdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm, + qdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE); return -EINVAL; /* can't accept the tx mgmt frame */ } @@ -1328,7 +1329,9 @@ ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, tx_desc->pkt_type = type + OL_TXRX_MGMT_TYPE_BASE; htt_tx_desc_set_chanfreq(tx_desc->htt_tx_desc, chanfreq); - NBUF_CB_TX_PACKET_TRACK(tx_desc->netbuf) = NBUF_TX_PKT_MGMT_TRACK; ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm, + QDF_NBUF_CB_TX_PACKET_TRACK(tx_desc->netbuf) = + QDF_NBUF_TX_PKT_MGMT_TRACK; + ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm, htt_pkt_type_mgmt); return 0; /* accepted the tx mgmt frame */ @@ -1339,8 +1342,8 @@ void ol_txrx_sync(ol_txrx_pdev_handle pdev, uint8_t sync_cnt) htt_h2t_sync_msg(pdev->htt_pdev, sync_cnt); } -cdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu, uint16_t peer_id) +qdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev, + qdf_nbuf_t msdu, uint16_t peer_id) { struct ol_tx_desc_t *tx_desc; struct ol_txrx_msdu_info_t msdu_info; diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index f0c0a7fe1a3a..a76b82992cb0 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -32,18 +32,18 @@ #ifndef _OL_TX__H_ #define _OL_TX__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include #include /* ol_txrx_vdev_handle */ #include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ -cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list); +qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef WLAN_FEATURE_FASTPATH -cdf_nbuf_t ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list); +qdf_nbuf_t ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #endif -cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list); +qdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL #define OL_TX_LL ol_tx_ll_queue @@ -65,14 +65,14 @@ void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev) return; } #endif -cdf_nbuf_t +qdf_nbuf_t ol_tx_non_std_ll(ol_txrx_vdev_handle data_vdev, - enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list); + enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list); -cdf_nbuf_t -ol_tx_reinject(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu, uint16_t peer_id); +qdf_nbuf_t +ol_tx_reinject(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu, uint16_t peer_id); -void ol_txrx_mgmt_tx_complete(void *ctxt, cdf_nbuf_t netbuf, int err); +void ol_txrx_mgmt_tx_complete(void *ctxt, qdf_nbuf_t netbuf, int err); #if defined(FEATURE_TSO) diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index a0a1b18057cb..852829e76d0f 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -26,7 +26,7 @@ */ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_assert */ #include /* cdf_spinlock */ #ifdef QCA_COMPUTE_TX_DELAY @@ -307,12 +307,12 @@ extern void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc); void -dump_pkt(cdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len) +dump_pkt(qdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len) { qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__, - cdf_nbuf_data(nbuf), nbuf_paddr, len); + qdf_nbuf_data(nbuf), nbuf_paddr, len); print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4, - cdf_nbuf_data(nbuf), len, true); + qdf_nbuf_data(nbuf), len, true); } const uint32_t htt_to_ce_pkt_type[] = { @@ -326,7 +326,7 @@ const uint32_t htt_to_ce_pkt_type[] = { struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t netbuf, + qdf_nbuf_t netbuf, struct ol_txrx_msdu_info_t *msdu_info) { struct ol_tx_desc_t *tx_desc; @@ -334,8 +334,8 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, uint32_t num_frags; msdu_info->htt.info.vdev_id = vdev->vdev_id; - msdu_info->htt.action.cksum_offload = cdf_nbuf_get_tx_cksum(netbuf); - switch (cdf_nbuf_get_exemption_type(netbuf)) { + msdu_info->htt.action.cksum_offload = qdf_nbuf_get_tx_cksum(netbuf); + switch (qdf_nbuf_get_exemption_type(netbuf)) { case QDF_NBUF_EXEMPT_NO_EXEMPTION: case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: /* We want to encrypt this frame */ @@ -379,10 +379,10 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, * Skip the prefix fragment (HTT tx descriptor) that was added * during the call to htt_tx_desc_init above. */ - num_frags = cdf_nbuf_get_num_frags(netbuf); + num_frags = qdf_nbuf_get_num_frags(netbuf); /* num_frags are expected to be 2 max */ - num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS) - ? NBUF_CB_TX_MAX_EXTRA_FRAGS + num_frags = (num_frags > QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS) + ? QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS : num_frags; #if defined(HELIUMPLUS_PADDR64) /* @@ -408,10 +408,10 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, qdf_dma_addr_t frag_paddr; #ifdef HELIUMPLUS_DEBUG void *frag_vaddr; - frag_vaddr = cdf_nbuf_get_frag_vaddr(netbuf, i); + frag_vaddr = qdf_nbuf_get_frag_vaddr(netbuf, i); #endif - frag_len = cdf_nbuf_get_frag_len(netbuf, i); - frag_paddr = cdf_nbuf_get_frag_paddr(netbuf, i); + frag_len = qdf_nbuf_get_frag_len(netbuf, i); + frag_paddr = qdf_nbuf_get_frag_paddr(netbuf, i); #if defined(HELIUMPLUS_PADDR64) htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1, frag_paddr, frag_len); @@ -438,25 +438,25 @@ void ol_tx_desc_frame_list_free(struct ol_txrx_pdev_t *pdev, ol_tx_desc_list *tx_descs, int had_error) { struct ol_tx_desc_t *tx_desc, *tmp; - cdf_nbuf_t msdus = NULL; + qdf_nbuf_t msdus = NULL; TAILQ_FOREACH_SAFE(tx_desc, tx_descs, tx_desc_list_elem, tmp) { - cdf_nbuf_t msdu = tx_desc->netbuf; + qdf_nbuf_t msdu = tx_desc->netbuf; qdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */ #ifdef QCA_SUPPORT_SW_TXRX_ENCAP /* restore original hdr offset */ OL_TX_RESTORE_HDR(tx_desc, msdu); #endif - cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); + qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE); /* free the tx desc */ ol_tx_desc_free(pdev, tx_desc); /* link the netbuf into a list to free as a batch */ - cdf_nbuf_set_next(msdu, msdus); + qdf_nbuf_set_next(msdu, msdus); msdus = msdu; } /* free the netbufs as a batch */ - cdf_nbuf_tx_free(msdus, had_error); + qdf_nbuf_tx_free(msdus, had_error); } void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, @@ -472,11 +472,11 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, OL_TX_RESTORE_HDR(tx_desc, (tx_desc->netbuf)); #endif trace_str = (had_error) ? "OT:C:F:" : "OT:C:S:"; - cdf_nbuf_trace_update(tx_desc->netbuf, trace_str); + qdf_nbuf_trace_update(tx_desc->netbuf, trace_str); if (tx_desc->pkt_type == ol_tx_frm_no_free) { /* free the tx desc but don't unmap or free the frame */ if (pdev->tx_data_callback.func) { - cdf_nbuf_set_next(tx_desc->netbuf, NULL); + qdf_nbuf_set_next(tx_desc->netbuf, NULL); pdev->tx_data_callback.func(pdev->tx_data_callback.ctxt, tx_desc->netbuf, had_error); ol_tx_desc_free(pdev, tx_desc); @@ -484,7 +484,7 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, } /* let the code below unmap and free the frame */ } - cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE); + qdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE); /* check the frame type to see what kind of special steps are needed */ if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) && (tx_desc->pkt_type != 0xff)) { @@ -524,11 +524,11 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, ota_ack_cb(ctxt, tx_desc->netbuf, had_error); } /* free the netbuf */ - cdf_nbuf_free(tx_desc->netbuf); + qdf_nbuf_free(tx_desc->netbuf); } else { /* single regular frame */ - cdf_nbuf_set_next(tx_desc->netbuf, NULL); - cdf_nbuf_tx_free(tx_desc->netbuf, had_error); + qdf_nbuf_set_next(tx_desc->netbuf, NULL); + qdf_nbuf_tx_free(tx_desc->netbuf, had_error); } /* free the tx desc */ ol_tx_desc_free(pdev, tx_desc); diff --git a/core/dp/txrx/ol_tx_desc.h b/core/dp/txrx/ol_tx_desc.h index fa154f8f3bd9..456325175e74 100644 --- a/core/dp/txrx/ol_tx_desc.h +++ b/core/dp/txrx/ol_tx_desc.h @@ -33,7 +33,7 @@ #define _OL_TX_DESC__H_ #include /* TAILQ_HEAD */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_tx_desc_t */ #include /*TXRX_ASSERT2 */ @@ -63,7 +63,7 @@ ol_tx_desc_alloc_wrapper(struct ol_txrx_pdev_t *pdev, */ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev, struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t netbuf, + qdf_nbuf_t netbuf, struct ol_txrx_msdu_info_t *msdu_info); /** diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index 99f3584964f2..5c25a40909d5 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -25,7 +25,7 @@ * to the Linux Foundation. */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_atomic_read, etc. */ #include /* ol_cfg_addba_retry */ #include /* HTT_TX_EXT_TID_MGMT */ @@ -91,14 +91,14 @@ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) qdf_timer_stop(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; while (vdev->ll_pause.txq.head) { - cdf_nbuf_t next = - cdf_nbuf_next(vdev->ll_pause.txq.head); - cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); - cdf_nbuf_unmap(vdev->pdev->osdev, + qdf_nbuf_t next = + qdf_nbuf_next(vdev->ll_pause.txq.head); + qdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); + qdf_nbuf_unmap(vdev->pdev->osdev, vdev->ll_pause.txq.head, QDF_DMA_TO_DEVICE); - cdf_nbuf_tx_free(vdev->ll_pause.txq.head, - NBUF_PKT_ERROR); + qdf_nbuf_tx_free(vdev->ll_pause.txq.head, + QDF_NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } vdev->ll_pause.txq.tail = NULL; diff --git a/core/dp/txrx/ol_tx_queue.h b/core/dp/txrx/ol_tx_queue.h index 5da4b9f3fcea..ce847b78b7d4 100644 --- a/core/dp/txrx/ol_tx_queue.h +++ b/core/dp/txrx/ol_tx_queue.h @@ -32,7 +32,7 @@ #ifndef _OL_TX_QUEUE__H_ #define _OL_TX_QUEUE__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_txrx_vdev_t, etc. */ #include /* bool */ diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index ae2d77aad510..785938b39b04 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -28,7 +28,7 @@ #include /* qdf_atomic_inc, etc. */ #include /* cdf_os_spinlock */ #include /* qdf_system_ticks, etc. */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* QDF_NBUF_TX_EXT_TID_INVALID */ #include /* TAILQ */ @@ -133,15 +133,15 @@ static inline uint16_t ol_tx_send_base(struct ol_txrx_pdev_t *pdev, - struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu) + struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu) { int msdu_credit_consumed; - TX_CREDIT_DEBUG_PRINT("TX %d bytes\n", cdf_nbuf_len(msdu)); + TX_CREDIT_DEBUG_PRINT("TX %d bytes\n", qdf_nbuf_len(msdu)); TX_CREDIT_DEBUG_PRINT(" Decrease credit %d - 1 = %d, len:%d.\n", qdf_atomic_read(&pdev->target_tx_credit), qdf_atomic_read(&pdev->target_tx_credit) - 1, - cdf_nbuf_len(msdu)); + qdf_nbuf_len(msdu)); msdu_credit_consumed = htt_tx_msdu_credit(msdu); OL_TX_TARGET_CREDIT_DECR_INT(pdev, msdu_credit_consumed); @@ -174,7 +174,7 @@ ol_tx_send_base(struct ol_txrx_pdev_t *pdev, void ol_tx_send(struct ol_txrx_pdev_t *pdev, - struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu) + struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu) { int msdu_credit_consumed; uint16_t id; @@ -182,10 +182,10 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev, msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu); id = ol_tx_desc_id(pdev, tx_desc); - NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX); + QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_TXRX); DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_TXRX_PACKET_PTR_RECORD, - (uint8_t *)(cdf_nbuf_data(msdu)), - sizeof(cdf_nbuf_data(msdu)))); + (uint8_t *)(qdf_nbuf_data(msdu)), + sizeof(qdf_nbuf_data(msdu)))); failed = htt_tx_send_std(pdev->htt_pdev, msdu, id); if (qdf_unlikely(failed)) { OL_TX_TARGET_CREDIT_INCR_INT(pdev, msdu_credit_consumed); @@ -195,18 +195,18 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev, void ol_tx_send_batch(struct ol_txrx_pdev_t *pdev, - cdf_nbuf_t head_msdu, int num_msdus) + qdf_nbuf_t head_msdu, int num_msdus) { - cdf_nbuf_t rejected; + qdf_nbuf_t rejected; OL_TX_CREDIT_RECLAIM(pdev); rejected = htt_tx_send_batch(pdev->htt_pdev, head_msdu, num_msdus); while (qdf_unlikely(rejected)) { struct ol_tx_desc_t *tx_desc; uint16_t *msdu_id_storage; - cdf_nbuf_t next; + qdf_nbuf_t next; - next = cdf_nbuf_next(rejected); + next = qdf_nbuf_next(rejected); msdu_id_storage = ol_tx_msdu_id_storage(rejected); tx_desc = ol_tx_desc_find(pdev, *msdu_id_storage); @@ -220,7 +220,7 @@ ol_tx_send_batch(struct ol_txrx_pdev_t *pdev, void ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, enum htt_pkt_type pkt_type) + qdf_nbuf_t msdu, enum htt_pkt_type pkt_type) { int msdu_credit_consumed; uint16_t id; @@ -228,7 +228,7 @@ ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev, msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu); id = ol_tx_desc_id(pdev, tx_desc); - NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX); + QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_TXRX); failed = htt_tx_send_nonstd(pdev->htt_pdev, msdu, id, pkt_type); if (failed) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, @@ -240,7 +240,7 @@ ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev, static inline void ol_tx_download_done_base(struct ol_txrx_pdev_t *pdev, - A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id) + A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id) { struct ol_tx_desc_t *tx_desc; @@ -283,7 +283,7 @@ ol_tx_download_done_base(struct ol_txrx_pdev_t *pdev, void ol_tx_download_done_ll(void *pdev, - A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id) + A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id) { ol_tx_download_done_base((struct ol_txrx_pdev_t *)pdev, status, msdu, msdu_id); @@ -292,7 +292,7 @@ ol_tx_download_done_ll(void *pdev, void ol_tx_download_done_hl_retain(void *txrx_pdev, A_STATUS status, - cdf_nbuf_t msdu, uint16_t msdu_id) + qdf_nbuf_t msdu, uint16_t msdu_id) { struct ol_txrx_pdev_t *pdev = txrx_pdev; ol_tx_download_done_base(pdev, status, msdu, msdu_id); @@ -300,7 +300,7 @@ ol_tx_download_done_hl_retain(void *txrx_pdev, void ol_tx_download_done_hl_free(void *txrx_pdev, - A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id) + A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id) { struct ol_txrx_pdev_t *pdev = txrx_pdev; struct ol_tx_desc_t *tx_desc; @@ -363,8 +363,8 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, qdf_atomic_init(&(_tx_desc)->ref_cnt); \ /* restore orginal hdr offset */ \ OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \ - cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ - cdf_nbuf_free((_netbuf)); \ + qdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ + qdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ if (qdf_unlikely(!lcl_freelist)) { \ @@ -379,8 +379,8 @@ ol_tx_delay_compute(struct ol_txrx_pdev_t *pdev, do { \ /* restore orginal hdr offset */ \ OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \ - cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ - cdf_nbuf_free((_netbuf)); \ + qdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \ + qdf_nbuf_free((_netbuf)); \ ((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \ (_lcl_freelist); \ if (qdf_unlikely(!lcl_freelist)) { \ @@ -488,7 +488,7 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev, char *trace_str; uint32_t byte_cnt = 0; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; union ol_tx_desc_list_elem_t *lcl_freelist = NULL; union ol_tx_desc_list_elem_t *tx_desc_last = NULL; @@ -505,9 +505,9 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev, netbuf = tx_desc->netbuf; qdf_runtime_pm_put(); - cdf_nbuf_trace_update(netbuf, trace_str); + qdf_nbuf_trace_update(netbuf, trace_str); /* Per SDU update of byte count */ - byte_cnt += cdf_nbuf_len(netbuf); + byte_cnt += qdf_nbuf_len(netbuf); if (OL_TX_DESC_NO_REFS(tx_desc)) { ol_tx_statistics( pdev->ctrl_pdev, @@ -518,7 +518,7 @@ ol_tx_completion_handler(ol_txrx_pdev_handle pdev, ol_tx_msdu_complete(pdev, tx_desc, tx_descs, netbuf, lcl_freelist, tx_desc_last, status); } - NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_FREE); + QDF_NBUF_UPDATE_TX_PKT_COUNT(netbuf, QDF_NBUF_TX_PKT_FREE); #ifdef QCA_SUPPORT_TXDESC_SANITY_CHECKS tx_desc->pkt_type = 0xff; #ifdef QCA_COMPUTE_TX_DELAY @@ -561,15 +561,15 @@ ol_tx_single_completion_handler(ol_txrx_pdev_handle pdev, enum htt_tx_status status, uint16_t tx_desc_id) { struct ol_tx_desc_t *tx_desc; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; tx_desc = ol_tx_desc_find(pdev, tx_desc_id); tx_desc->status = status; netbuf = tx_desc->netbuf; - NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_FREE); + QDF_NBUF_UPDATE_TX_PKT_COUNT(netbuf, QDF_NBUF_TX_PKT_FREE); /* Do one shot statistics */ - TXRX_STATS_UPDATE_TX_STATS(pdev, status, 1, cdf_nbuf_len(netbuf)); + TXRX_STATS_UPDATE_TX_STATS(pdev, status, 1, qdf_nbuf_len(netbuf)); if (OL_TX_DESC_NO_REFS(tx_desc)) { ol_tx_desc_frame_free_nonstd(pdev, tx_desc, @@ -599,7 +599,7 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, struct ol_tx_desc_t *tx_desc; union ol_tx_desc_list_elem_t *lcl_freelist = NULL; union ol_tx_desc_list_elem_t *tx_desc_last = NULL; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; ol_tx_desc_list tx_descs; TAILQ_INIT(&tx_descs); @@ -760,10 +760,10 @@ ol_tx_delay_hist(ol_txrx_pdev_handle pdev, #ifdef QCA_COMPUTE_TX_DELAY_PER_TID static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev, - cdf_nbuf_t tx_nbuf) + qdf_nbuf_t tx_nbuf) { uint8_t *hdr_ptr; - void *datap = cdf_nbuf_data(tx_nbuf); + void *datap = qdf_nbuf_data(tx_nbuf); if (pdev->frame_format == wlan_frm_fmt_raw) { /* adjust hdr_ptr to RA */ @@ -787,7 +787,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev, static uint8_t ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev, - cdf_nbuf_t msdu, struct ol_tx_desc_t *tx_desc) + qdf_nbuf_t msdu, struct ol_tx_desc_t *tx_desc) { uint16_t ethertype; uint8_t *dest_addr, *l3_hdr; @@ -810,14 +810,14 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev, if (pdev->frame_format == wlan_frm_fmt_802_3) { struct ethernet_hdr_t *enet_hdr; - enet_hdr = (struct ethernet_hdr_t *)cdf_nbuf_data(msdu); + enet_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu); l2_hdr_size = sizeof(struct ethernet_hdr_t); ethertype = (enet_hdr->ethertype[0] << 8) | enet_hdr->ethertype[1]; if (!IS_ETHERTYPE(ethertype)) { struct llc_snap_hdr_t *llc_hdr; llc_hdr = (struct llc_snap_hdr_t *) - (cdf_nbuf_data(msdu) + l2_hdr_size); + (qdf_nbuf_data(msdu) + l2_hdr_size); l2_hdr_size += sizeof(struct llc_snap_hdr_t); ethertype = (llc_hdr->ethertype[0] << 8) | llc_hdr-> @@ -826,13 +826,13 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev, } else { struct llc_snap_hdr_t *llc_hdr; l2_hdr_size = sizeof(struct ieee80211_frame); - llc_hdr = (struct llc_snap_hdr_t *)(cdf_nbuf_data(msdu) + llc_hdr = (struct llc_snap_hdr_t *)(qdf_nbuf_data(msdu) + l2_hdr_size); l2_hdr_size += sizeof(struct llc_snap_hdr_t); ethertype = (llc_hdr->ethertype[0] << 8) | llc_hdr->ethertype[1]; } - l3_hdr = cdf_nbuf_data(msdu) + l2_hdr_size; + l3_hdr = qdf_nbuf_data(msdu) + l2_hdr_size; if (ETHERTYPE_IPV4 == ethertype) { return (((struct ipv4_hdr_t *)l3_hdr)->tos >> 5) & 0x7; } else if (ETHERTYPE_IPV6 == ethertype) { @@ -850,8 +850,8 @@ static int ol_tx_delay_category(struct ol_txrx_pdev_t *pdev, uint16_t msdu_id) struct ol_tx_desc_t *tx_desc = ol_tx_desc_find(pdev, msdu_id); uint8_t tid; - cdf_nbuf_t msdu = tx_desc->netbuf; - tid = cdf_nbuf_get_tid(msdu); + qdf_nbuf_t msdu = tx_desc->netbuf; + tid = qdf_nbuf_get_tid(msdu); if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc); if (tid == QDF_NBUF_TX_EXT_TID_INVALID) { diff --git a/core/dp/txrx/ol_tx_send.h b/core/dp/txrx/ol_tx_send.h index db4881202350..2260da996f98 100644 --- a/core/dp/txrx/ol_tx_send.h +++ b/core/dp/txrx/ol_tx_send.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -32,7 +32,7 @@ #ifndef _OL_TX_SEND__H_ #define _OL_TX_SEND__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_tx_send_t */ /** @@ -52,7 +52,7 @@ void ol_tx_discard_target_frms(ol_txrx_pdev_handle pdev); */ void ol_tx_send(struct ol_txrx_pdev_t *pdev, - struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu); + struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu); /** * @brief Send a tx batch download to the target. @@ -67,7 +67,7 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev, int ol_tx_send_batch(struct ol_txrx_pdev_t *pdev, - cdf_nbuf_t msdu_list, int num_msdus); + qdf_nbuf_t msdu_list, int num_msdus); /** * @brief Send a tx frame with a non-std header or payload type to the target. @@ -82,5 +82,5 @@ ol_tx_send_batch(struct ol_txrx_pdev_t *pdev, void ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, enum htt_pkt_type pkt_type); + qdf_nbuf_t msdu, enum htt_pkt_type pkt_type); #endif /* _OL_TX_SEND__H_ */ diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 208548f95355..7a0629b60c33 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -30,7 +30,7 @@ #include /* uint32_t, etc. */ #include /* qdf_mem_malloc,free */ #include /* qdf_device_t, qdf_print */ -#include /* cdf_spinlock */ +#include /* qdf_spinlock */ #include /* qdf_atomic_read */ /* Required for WLAN_FEATURE_FASTPATH */ @@ -1190,11 +1190,11 @@ ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, qdf_timer_free(&vdev->ll_pause.timer); vdev->ll_pause.is_q_timer_on = false; while (vdev->ll_pause.txq.head) { - cdf_nbuf_t next = cdf_nbuf_next(vdev->ll_pause.txq.head); - cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); - cdf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head, + qdf_nbuf_t next = qdf_nbuf_next(vdev->ll_pause.txq.head); + qdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL); + qdf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head, QDF_DMA_TO_DEVICE); - cdf_nbuf_tx_free(vdev->ll_pause.txq.head, NBUF_PKT_ERROR); + qdf_nbuf_tx_free(vdev->ll_pause.txq.head, QDF_NBUF_PKT_ERROR); vdev->ll_pause.txq.head = next; } qdf_spin_unlock_bh(&vdev->ll_pause.mutex); @@ -1287,12 +1287,12 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, list_del(&cache_buf->list); qdf_spin_unlock_bh(&peer->bufq_lock); if (drop) { - cdf_nbuf_free(cache_buf->buf); + qdf_nbuf_free(cache_buf->buf); } else { /* Flush the cached frames to HDD */ ret = data_rx(cds_ctx, cache_buf->buf, peer->local_id); if (ret != QDF_STATUS_SUCCESS) - cdf_nbuf_free(cache_buf->buf); + qdf_nbuf_free(cache_buf->buf); } qdf_mem_free(cache_buf); qdf_spin_lock_bh(&peer->bufq_lock); @@ -2939,7 +2939,7 @@ void ol_txrx_display_stats(uint16_t value) ol_tx_dump_flow_pool_info(); break; case WLAN_TXRX_DESC_STATS: - cdf_nbuf_tx_desc_count_display(); + qdf_nbuf_tx_desc_count_display(); break; default: QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -2967,7 +2967,7 @@ void ol_txrx_clear_stats(uint16_t value) ol_tx_clear_flow_pool_stats(); break; case WLAN_TXRX_DESC_STATS: - cdf_nbuf_tx_desc_count_clear(); + qdf_nbuf_tx_desc_count_clear(); break; default: QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, @@ -2984,10 +2984,10 @@ void ol_txrx_clear_stats(uint16_t value) * Return: None */ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, - cdf_nbuf_t buf_list) + qdf_nbuf_t buf_list) { void *cds_ctx = cds_get_global_context(); - cdf_nbuf_t buf, next_buf; + qdf_nbuf_t buf, next_buf; QDF_STATUS ret; ol_rx_callback_fp data_rx = NULL; @@ -3012,12 +3012,12 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, buf = buf_list; while (buf) { - next_buf = cdf_nbuf_queue_next(buf); - cdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */ + next_buf = qdf_nbuf_queue_next(buf); + qdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */ ret = data_rx(cds_ctx, buf, peer->local_id); if (ret != QDF_STATUS_SUCCESS) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed"); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } buf = next_buf; } @@ -3027,8 +3027,8 @@ free_buf: TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "%s:Dropping frames", __func__); buf = buf_list; while (buf) { - next_buf = cdf_nbuf_queue_next(buf); - cdf_nbuf_free(buf); + next_buf = qdf_nbuf_queue_next(buf); + qdf_nbuf_free(buf); buf = next_buf; } } @@ -3041,12 +3041,12 @@ free_buf: * Return: None */ void ol_rx_data_process(struct ol_txrx_peer_t *peer, - cdf_nbuf_t rx_buf_list) + qdf_nbuf_t rx_buf_list) { /* Firmware data path active response will use shim RX thread * T2H MSG running on SIRQ context, * IPA kernel module API should not be called on SIRQ CTXT */ - cdf_nbuf_t buf, next_buf; + qdf_nbuf_t buf, next_buf; ol_rx_callback_fp data_rx = NULL; ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -3069,15 +3069,15 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, struct ol_rx_cached_buf *cache_buf; buf = rx_buf_list; while (buf) { - next_buf = cdf_nbuf_queue_next(buf); + next_buf = qdf_nbuf_queue_next(buf); cache_buf = qdf_mem_malloc(sizeof(*cache_buf)); if (!cache_buf) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Failed to allocate buf to cache the rx frames"); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } else { /* Add NULL terminator */ - cdf_nbuf_set_next(buf, NULL); + qdf_nbuf_set_next(buf, NULL); cache_buf->buf = buf; qdf_spin_lock_bh(&peer->bufq_lock); list_add_tail(&cache_buf->list, @@ -3126,8 +3126,8 @@ drop_rx_buf: TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Dropping rx packets"); buf = rx_buf_list; while (buf) { - next_buf = cdf_nbuf_queue_next(buf); - cdf_nbuf_free(buf); + next_buf = qdf_nbuf_queue_next(buf); + qdf_nbuf_free(buf); buf = next_buf; } } @@ -3137,7 +3137,7 @@ drop_rx_buf: * @rxcb: rx callback * @sta_desc: sta descriptor * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, struct ol_txrx_desc_type *sta_desc) @@ -3187,7 +3187,7 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, * ol_txrx_clear_peer() - clear peer * @sta_id: sta id * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) { @@ -3320,7 +3320,7 @@ exit: * ol_txrx_register_pause_cb() - register pause callback * @pause_cb: pause callback * - * Return: CDF status + * Return: QDF status */ QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) { diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index 760850f8f30c..22472386519a 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/core/dp/txrx/ol_txrx.h @@ -28,7 +28,7 @@ #ifndef _OL_TXRX__H_ #define _OL_TXRX__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ol_txrx_vdev_t, etc. */ #include /* ol_pdev_handle */ #include "cds_sched.h" diff --git a/core/dp/txrx/ol_txrx_encap.c b/core/dp/txrx/ol_txrx_encap.c index 8deddebada03..03b1ddd95d20 100644 --- a/core/dp/txrx/ol_txrx_encap.c +++ b/core/dp/txrx/ol_txrx_encap.c @@ -35,7 +35,7 @@ */ #ifdef QCA_SUPPORT_SW_TXRX_ENCAP -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* ieee80211_frame */ #include /* struct llc, struct ether_header, etc. */ #include /* TXRX_ASSERT1 */ @@ -44,14 +44,14 @@ #define OL_TX_COPY_NATIVE_WIFI_HEADER(wh, msdu, hdsize, localbuf) \ do { \ - wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu); \ + wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu); \ if ((wh->i_fc[1] & \ IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) { \ hdsize = sizeof(struct ieee80211_frame_addr4); \ } else { \ hdsize = sizeof(struct ieee80211_frame); \ } \ - if (cdf_nbuf_len(msdu) < hdsize) { \ + if (qdf_nbuf_len(msdu) < hdsize) { \ return A_ERROR; \ } \ qdf_mem_copy(localbuf, wh, hdsize); \ @@ -59,18 +59,18 @@ } while (0) static inline A_STATUS -ol_tx_copy_native_wifi_header(cdf_nbuf_t msdu, +ol_tx_copy_native_wifi_header(qdf_nbuf_t msdu, uint8_t *hdsize, uint8_t *localbuf) { struct ieee80211_frame *wh = - (struct ieee80211_frame *)cdf_nbuf_data(msdu); + (struct ieee80211_frame *)qdf_nbuf_data(msdu); if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) { *hdsize = sizeof(struct ieee80211_frame_addr4); } else { *hdsize = sizeof(struct ieee80211_frame); } - if (cdf_nbuf_len(msdu) < *hdsize) + if (qdf_nbuf_len(msdu) < *hdsize) return A_ERROR; qdf_mem_copy(localbuf, wh, *hdsize); @@ -80,7 +80,7 @@ ol_tx_copy_native_wifi_header(cdf_nbuf_t msdu, static inline A_STATUS ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *tx_msdu_info) { uint8_t localbuf[sizeof(struct ieee80211_qosframe_htc_addr4)]; @@ -127,7 +127,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, new_hdsize), localbuf, new_hdsize); - cdf_nbuf_pull_head(msdu, hdsize); + qdf_nbuf_pull_head(msdu, hdsize); tx_msdu_info->htt.info.l3_hdr_offset = new_hdsize; tx_desc->orig_l2_hdr_bytes = hdsize; } @@ -148,7 +148,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, hdsize); qdf_mem_copy((void *)wh, localbuf, hdsize); - cdf_nbuf_pull_head(msdu, hdsize); + qdf_nbuf_pull_head(msdu, hdsize); tx_msdu_info->htt.info.l3_hdr_offset = hdsize; tx_desc->orig_l2_hdr_bytes = hdsize; } @@ -160,7 +160,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev, static inline A_STATUS ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *tx_msdu_info) + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *tx_msdu_info) { uint8_t localbuf[sizeof(struct ieee80211_qosframe_htc_addr4) + sizeof(struct llc_snap_hdr_t)]; @@ -183,7 +183,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, */ peer = tx_msdu_info->peer; - eth_hdr = (struct ethernet_hdr_t *)cdf_nbuf_data(msdu); + eth_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu); hdsize = sizeof(struct ethernet_hdr_t); wh = (struct ieee80211_frame *)localbuf; wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA; @@ -277,7 +277,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc, new_l2_hdsize), localbuf, new_hdsize); - cdf_nbuf_pull_head(msdu, hdsize); + qdf_nbuf_pull_head(msdu, hdsize); tx_msdu_info->htt.info.l3_hdr_offset = new_l2_hdsize; tx_desc->orig_l2_hdr_bytes = hdsize; return A_OK; @@ -286,7 +286,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev, A_STATUS ol_tx_encap(struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) { struct ol_txrx_pdev_t *pdev = vdev->pdev; @@ -303,7 +303,7 @@ ol_tx_encap(struct ol_txrx_vdev_t *vdev, static inline void ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info, struct ethernet_hdr_t *ethr_hdr) { @@ -322,7 +322,7 @@ ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev, else hdsize = sizeof(struct ieee80211_frame); - wh = (struct ieee80211_frame_addr4 *)cdf_nbuf_push_head(msdu, hdsize); + wh = (struct ieee80211_frame_addr4 *)qdf_nbuf_push_head(msdu, hdsize); TXRX_ASSERT2(wh != NULL); TXRX_ASSERT2(hdsize <= info->hdr_len); qdf_mem_copy((uint8_t *) wh, info->hdr, hdsize); @@ -365,7 +365,7 @@ ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev, static inline void ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu, + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info, struct ethernet_hdr_t *ethr_hdr) { @@ -381,7 +381,7 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, * if ethr_hdr is null, rx frame is 802.11 format(HW ft disabled) * if ethr_hdr is not null, rx frame is "subfrm of amsdu". */ - buf = (uint8_t *) cdf_nbuf_data(msdu); + buf = (uint8_t *) qdf_nbuf_data(msdu); llc_hdr = (struct llc_snap_hdr_t *)buf; ether_type = (llc_hdr->ethertype[0] << 8) | llc_hdr->ethertype[1]; /* do llc remove if needed */ @@ -401,9 +401,9 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, } } if (l2_hdr_space > ETHERNET_HDR_LEN) - buf = cdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN); + buf = qdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN); else if (l2_hdr_space < ETHERNET_HDR_LEN) - buf = cdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space); + buf = qdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space); /* normal msdu(non-subfrm of A-MSDU) if ethr_hdr is null */ if (ethr_hdr == NULL) { @@ -444,10 +444,10 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, ethr_hdr->ethertype[1] = (ether_type) & 0xff; } else { uint32_t pktlen = - cdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype); + qdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype); TXRX_ASSERT2(pktlen <= ETHERNET_MTU); ether_type = (uint16_t) pktlen; - ether_type = cdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t); + ether_type = qdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t); ethr_hdr->ethertype[0] = (ether_type >> 8) & 0xff; ethr_hdr->ethertype[1] = (ether_type) & 0xff; } @@ -456,18 +456,18 @@ ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev, static inline A_STATUS ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) { struct ol_txrx_pdev_t *pdev = vdev->pdev; uint8_t *subfrm_hdr; uint8_t localbuf[ETHERNET_HDR_LEN]; struct ethernet_hdr_t *ether_hdr = (struct ethernet_hdr_t *)localbuf; - subfrm_hdr = (uint8_t *) cdf_nbuf_data(msdu); + subfrm_hdr = (uint8_t *) qdf_nbuf_data(msdu); if (pdev->frame_format == wlan_frm_fmt_native_wifi) { /* decap to native wifi */ qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); - cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); + qdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); ol_rx_decap_to_native_wifi(vdev, msdu, info, ether_hdr); } else if (pdev->frame_format == wlan_frm_fmt_802_3) { if (pdev->sw_rx_llc_proc_enable) { @@ -475,7 +475,7 @@ ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev, * 802.11 table P-3 */ qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN); - cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); + qdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN); ol_rx_decap_to_8023(vdev, msdu, info, ether_hdr); } else { /* subfrm of A-MSDU is already in 802.3 format. @@ -492,11 +492,11 @@ ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev, static inline A_STATUS ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, - cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) { struct ol_txrx_pdev_t *pdev = vdev->pdev; struct ieee80211_frame *wh; - wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu); + wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu); if (pdev->frame_format == wlan_frm_fmt_native_wifi) { /* Decap to native wifi because according to MSFT( @@ -509,7 +509,7 @@ ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ wh, info->hdr_len); - cdf_nbuf_pull_head(msdu, info->hdr_len); + qdf_nbuf_pull_head(msdu, info->hdr_len); ol_rx_decap_to_native_wifi(vdev, msdu, info, NULL); /* 802.11 hdr^ eth_hdr^ */ } @@ -519,7 +519,7 @@ ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */ wh, info->hdr_len); - cdf_nbuf_pull_head(msdu, info->hdr_len); + qdf_nbuf_pull_head(msdu, info->hdr_len); /* remove llc snap hdr if it's necessary according to * 802.11 table P-3 */ @@ -541,7 +541,7 @@ ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev, A_STATUS ol_rx_decap(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) { A_STATUS status; uint8_t *mpdu_hdr; @@ -559,14 +559,14 @@ ol_rx_decap(struct ol_txrx_vdev_t *vdev, * subsequent subfrm 802.11 header recovery * in certain chip(such as Riva). */ - mpdu_hdr = cdf_nbuf_data(msdu); + mpdu_hdr = qdf_nbuf_data(msdu); info->hdr_len = ol_txrx_ieee80211_hdrsize(mpdu_hdr); TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr)); qdf_mem_copy(info->hdr, mpdu_hdr, info->hdr_len); - cdf_nbuf_pull_head(msdu, info->hdr_len); + qdf_nbuf_pull_head(msdu, info->hdr_len); } } } diff --git a/core/dp/txrx/ol_txrx_encap.h b/core/dp/txrx/ol_txrx_encap.h index 5795b3bbd4f3..2da28be57998 100644 --- a/core/dp/txrx/ol_txrx_encap.h +++ b/core/dp/txrx/ol_txrx_encap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -34,7 +34,7 @@ #ifdef QCA_SUPPORT_SW_TXRX_ENCAP -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* ieee80211_qosframe_htc_addr4 */ #include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ @@ -48,7 +48,7 @@ * with or without QOS control field based on peer's QOS capabilites. * @param vdev - handle to vdev object * @param tx_desc - tx desc struct,some fields will be updated. - * @param msdu - cdf_nbuf_t + * @param msdu - qdf_nbuf_t * @param msdu_info - informations from tx classification. * @return * A_OK: encap operation sucessful @@ -57,7 +57,7 @@ A_STATUS ol_tx_encap(struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info); + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info); struct ol_rx_decap_info_t { uint8_t hdr[sizeof(struct ieee80211_qosframe_htc_addr4)]; @@ -75,7 +75,7 @@ struct ol_rx_decap_info_t { * if Target haven't done that. * @param vdev - handle to vdev object * @param peer - the peer object. - * @param msdu - cdf_nbuf_t + * @param msdu - qdf_nbuf_t * @param info - ol_rx_decap_info_t: context info for decap * @return * A_OK: decap operation sucessful @@ -84,12 +84,12 @@ struct ol_rx_decap_info_t { A_STATUS ol_rx_decap(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info); + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info); static inline A_STATUS OL_TX_ENCAP(struct ol_txrx_vdev_t *vdev, struct ol_tx_desc_t *tx_desc, - cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) + qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info) { if (vdev->pdev->sw_tx_encap) return ol_tx_encap(vdev, tx_desc, msdu, msdu_info); @@ -99,7 +99,7 @@ OL_TX_ENCAP(struct ol_txrx_vdev_t *vdev, static inline A_STATUS OL_RX_DECAP(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) + qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info) { if (vdev->pdev->sw_rx_decap) return ol_rx_decap(vdev, peer, msdu, info); @@ -109,7 +109,7 @@ OL_RX_DECAP(struct ol_txrx_vdev_t *vdev, #define OL_TX_RESTORE_HDR(__tx_desc, __msdu) \ do { \ if (__tx_desc->orig_l2_hdr_bytes != 0) \ - cdf_nbuf_push_head(__msdu, \ + qdf_nbuf_push_head(__msdu, \ __tx_desc->orig_l2_hdr_bytes); \ } while (0) #else diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 157c0d4630c4..442115b4f746 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -26,7 +26,7 @@ */ /* OS abstraction libraries */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_atomic_read, etc. */ #include /* qdf_unlikely */ diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 51d6a9490d43..52c2546ef48e 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -29,7 +29,7 @@ #define _OL_TXRX_INTERNAL__H_ #include /* qdf_assert */ -#include /* cdf_nbuf_t */ +#include /* cdf_nbuf_t */ #include /* qdf_mem_set */ #include /* ieee80211_frame */ #include /* htt_rx_msdu_desc_completes_mpdu, etc. */ @@ -160,7 +160,7 @@ extern unsigned g_txrx_print_level; if (!(head)) { \ (head) = (elem); \ } else { \ - cdf_nbuf_set_next((tail), (elem)); \ + qdf_nbuf_set_next((tail), (elem)); \ } \ (tail) = (elem); \ } while (0) @@ -168,10 +168,10 @@ extern unsigned g_txrx_print_level; static inline void ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, void *mpdu_list, - cdf_nbuf_t *mpdu_tail, cdf_nbuf_t *next_mpdu) + qdf_nbuf_t *mpdu_tail, qdf_nbuf_t *next_mpdu) { htt_pdev_handle htt_pdev = pdev->htt_pdev; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; /* * For now, we use a simply flat list of MSDUs. @@ -181,12 +181,12 @@ ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, msdu = mpdu_list; while (!htt_rx_msdu_desc_completes_mpdu (htt_pdev, htt_rx_msdu_desc_retrieve(htt_pdev, msdu))) { - msdu = cdf_nbuf_next(msdu); + msdu = qdf_nbuf_next(msdu); TXRX_ASSERT2(msdu); } /* msdu now points to the last MSDU within the first MPDU */ *mpdu_tail = msdu; - *next_mpdu = cdf_nbuf_next(msdu); + *next_mpdu = qdf_nbuf_next(msdu); } /*--- txrx stats macros ---*/ @@ -203,7 +203,7 @@ ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, #define TXRX_STATS_MSDU_INCR(pdev, field, netbuf) \ do { \ TXRX_STATS_INCR((pdev), pub.field.pkts); \ - TXRX_STATS_ADD((pdev), pub.field.bytes, cdf_nbuf_len(netbuf)); \ + TXRX_STATS_ADD((pdev), pub.field.bytes, qdf_nbuf_len(netbuf)); \ } while (0) /* conditional defs based on verbosity level */ @@ -211,10 +211,10 @@ ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev, #define TXRX_STATS_MSDU_LIST_INCR(pdev, field, netbuf_list) \ do { \ - cdf_nbuf_t tmp_list = netbuf_list; \ + qdf_nbuf_t tmp_list = netbuf_list; \ while (tmp_list) { \ TXRX_STATS_MSDU_INCR(pdev, field, tmp_list); \ - tmp_list = cdf_nbuf_next(tmp_list); \ + tmp_list = qdf_nbuf_next(tmp_list); \ } \ } while (0) @@ -373,7 +373,7 @@ enum ol_txrx_frm_dump_options { static inline void ol_txrx_frms_dump(const char *name, struct ol_txrx_pdev_t *pdev, - cdf_nbuf_t frm, + qdf_nbuf_t frm, enum ol_txrx_frm_dump_options display_options, int max_len) { #define TXRX_FRM_DUMP_MAX_LEN 128 @@ -385,7 +385,7 @@ ol_txrx_frms_dump(const char *name, name); } while (frm) { - p = cdf_nbuf_data(frm); + p = qdf_nbuf_data(frm); if (display_options & ol_txrx_frm_dump_tcp_seq) { int tcp_offset; int l2_hdr_size; @@ -475,8 +475,8 @@ NOT_IP_TCP: if (display_options & ol_txrx_frm_dump_contents) { int i, frag_num, len_lim; len_lim = max_len; - if (len_lim > cdf_nbuf_len(frm)) - len_lim = cdf_nbuf_len(frm); + if (len_lim > qdf_nbuf_len(frm)) + len_lim = qdf_nbuf_len(frm); if (len_lim > TXRX_FRM_DUMP_MAX_LEN) len_lim = TXRX_FRM_DUMP_MAX_LEN; @@ -489,11 +489,11 @@ NOT_IP_TCP: while (i < len_lim) { int frag_bytes; frag_bytes = - cdf_nbuf_get_frag_len(frm, frag_num); + qdf_nbuf_get_frag_len(frm, frag_num); if (frag_bytes > len_lim - i) frag_bytes = len_lim - i; if (frag_bytes > 0) { - p = cdf_nbuf_get_frag_vaddr(frm, + p = qdf_nbuf_get_frag_vaddr(frm, frag_num); qdf_mem_copy(&local_buf[i], p, frag_bytes); @@ -504,7 +504,7 @@ NOT_IP_TCP: QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "frame %p data (%p), hex dump of bytes 0-%d of %d:\n", - frm, p, len_lim - 1, (int)cdf_nbuf_len(frm)); + frm, p, len_lim - 1, (int)qdf_nbuf_len(frm)); p = local_buf; while (len_lim > 16) { QDF_TRACE(QDF_MODULE_ID_TXRX, @@ -532,7 +532,7 @@ NOT_IP_TCP: QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "\n"); } - frm = cdf_nbuf_next(frm); + frm = qdf_nbuf_next(frm); } } #else @@ -571,7 +571,7 @@ NOT_IP_TCP: if (ol_cfg_frame_type(pdev->ctrl_pdev) == \ wlan_frm_fmt_native_wifi) { \ /* For windows, it is always native wifi header .*/ \ - wh = (struct ieee80211_frame *)cdf_nbuf_data(rx_msdu); \ + wh = (struct ieee80211_frame *)qdf_nbuf_data(rx_msdu); \ } \ ol_rx_err_inv_peer_statistics(pdev->ctrl_pdev, \ wh, OL_RX_ERR_UNKNOWN_PEER); \ @@ -613,7 +613,7 @@ NOT_IP_TCP: do { \ qdf_spin_lock_bh(&peer->vdev->pdev->peer_stat_mutex); \ peer->stats.tx_or_rx.frms.type += 1; \ - peer->stats.tx_or_rx.bytes.type += cdf_nbuf_len(msdu); \ + peer->stats.tx_or_rx.bytes.type += qdf_nbuf_len(msdu); \ qdf_spin_unlock_bh(&peer->vdev->pdev->peer_stat_mutex); \ } while (0) #define OL_TXRX_PEER_STATS_UPDATE(peer, tx_or_rx, msdu) \ @@ -622,10 +622,10 @@ NOT_IP_TCP: struct ol_txrx_pdev_t *pdev = vdev->pdev; \ uint8_t *dest_addr; \ if (pdev->frame_format == wlan_frm_fmt_802_3) { \ - dest_addr = cdf_nbuf_data(msdu); \ + dest_addr = qdf_nbuf_data(msdu); \ } else { /* 802.11 format */ \ struct ieee80211_frame *frm; \ - frm = (struct ieee80211_frame *) cdf_nbuf_data(msdu); \ + frm = (struct ieee80211_frame *) qdf_nbuf_data(msdu); \ if (vdev->opmode == wlan_op_mode_ap) { \ dest_addr = (uint8_t *) &(frm->i_addr1[0]); \ } else { \ diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 90ad86b84a3f..7d6ffc471d03 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -32,7 +32,7 @@ #ifndef _OL_TXRX_TYPES__H_ #define _OL_TXRX_TYPES__H_ -#include /* cdf_nbuf_t */ +#include /* cdf_nbuf_t */ #include #include /* TAILQ */ #include /* A_UINT8 */ @@ -127,7 +127,7 @@ enum ol_tx_frm_type { }; struct ol_tx_desc_t { - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; void *htt_tx_desc; uint16_t id; qdf_dma_addr_t htt_tx_desc_paddr; @@ -536,7 +536,7 @@ struct ol_txrx_pdev_t { /* rx proc function */ void (*rx_opt_proc)(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list); + unsigned tid, qdf_nbuf_t msdu_list); /* tx data delivery notification callback function */ struct { @@ -827,8 +827,8 @@ struct ol_txrx_vdev_t { struct { struct { - cdf_nbuf_t head; - cdf_nbuf_t tail; + qdf_nbuf_t head; + qdf_nbuf_t tail; int depth; } txq; uint32_t paused_reason; @@ -877,8 +877,8 @@ struct ol_txrx_vdev_t { }; struct ol_rx_reorder_array_elem_t { - cdf_nbuf_t head; - cdf_nbuf_t tail; + qdf_nbuf_t head; + qdf_nbuf_t tail; }; struct ol_rx_reorder_t { @@ -967,7 +967,7 @@ struct ol_txrx_peer_t { */ void (*rx_opt_proc)(struct ol_txrx_vdev_t *vdev, struct ol_txrx_peer_t *peer, - unsigned tid, cdf_nbuf_t msdu_list); + unsigned tid, qdf_nbuf_t msdu_list); #ifdef QCA_ENABLE_OL_TXRX_PEER_STATS ol_txrx_peer_stats_t stats; diff --git a/core/dp/txrx/txrx.h b/core/dp/txrx/txrx.h index 7d2c03cc0ec2..fa24eaf8cc4a 100644 --- a/core/dp/txrx/txrx.h +++ b/core/dp/txrx/txrx.h @@ -29,10 +29,9 @@ #define TXRX_H #include "cds_api.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "csr_api.h" #include "sap_api.h" -#include "cdf_nbuf.h" #include "ol_txrx_osif_api.h" /* wait on peer deletion timeout value in milliseconds */ @@ -117,11 +116,11 @@ typedef void (*ol_txrx_vdev_delete_cb)(void *context); * @typedef ol_txrx_tx_fp * @brief top-level transmit function */ -typedef cdf_nbuf_t -(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu_list); +typedef qdf_nbuf_t +(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu_list); typedef void -(*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error); +(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error); /* If RSSI realm is changed, send notification to Clients, SME, HDD */ typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, @@ -141,7 +140,7 @@ struct wlan_txrx_ind_req { /* Rx callback registered with txrx */ -typedef int (*wlan_txrx_cb_type)(void *g_cdsctx, cdf_nbuf_t buf, u8 sta_id, +typedef int (*wlan_txrx_cb_type)(void *g_cdsctx, qdf_nbuf_t buf, u8 sta_id, struct txrx_rx_metainfo *rx_meta_info); static inline int wlan_txrx_get_rssi(void *g_cdsctx, u8 sta_id, int8_t *rssi) diff --git a/core/dp/txrx/wdi_event.h b/core/dp/txrx/wdi_event.h index d1019eefb093..70eb7954b87b 100644 --- a/core/dp/txrx/wdi_event.h +++ b/core/dp/txrx/wdi_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -29,7 +29,7 @@ #define _WDI_EVENT_H_ #include "athdefs.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #define WDI_EVENT_BASE 0x100 /* Event starting number */ enum WDI_EVENT { @@ -45,7 +45,7 @@ enum WDI_EVENT { }; struct wdi_event_rx_peer_invalid_msg { - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; struct ieee80211_frame *wh; uint8_t vdev_id; }; diff --git a/core/hdd/inc/wlan_hdd_ipa.h b/core/hdd/inc/wlan_hdd_ipa.h index a7cabccedfb6..a7e8d5f7908d 100644 --- a/core/hdd/inc/wlan_hdd_ipa.h +++ b/core/hdd/inc/wlan_hdd_ipa.h @@ -45,8 +45,8 @@ * FIXME: Temporary hack - until IPA functionality gets restored * */ -typedef void (*hdd_ipa_nbuf_cb_fn)(cdf_nbuf_t); -void hdd_ipa_nbuf_cb(cdf_nbuf_t skb); /* Fwd declare */ +typedef void (*hdd_ipa_nbuf_cb_fn)(qdf_nbuf_t); +void hdd_ipa_nbuf_cb(qdf_nbuf_t skb); /* Fwd declare */ static inline hdd_ipa_nbuf_cb_fn wlan_hdd_stub_ipa_fn(void) { return hdd_ipa_nbuf_cb; @@ -54,7 +54,7 @@ static inline hdd_ipa_nbuf_cb_fn wlan_hdd_stub_ipa_fn(void) QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx); QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx); -QDF_STATUS hdd_ipa_process_rxt(void *cds_context, cdf_nbuf_t rxBuf, +QDF_STATUS hdd_ipa_process_rxt(void *cds_context, qdf_nbuf_t rxBuf, uint8_t sta_id); int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, enum ipa_wlan_event type, uint8_t *mac_addr); @@ -86,7 +86,7 @@ static inline QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) } static inline QDF_STATUS hdd_ipa_process_rxt(void *cds_context, - cdf_nbuf_t rxBuf, uint8_t sta_id) + qdf_nbuf_t rxBuf, uint8_t sta_id) { return QDF_STATUS_SUCCESS; } diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index eff0fb1a705d..b5d879a04de4 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -47,11 +47,11 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId); QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, - cdf_nbuf_t rxBufChain, + qdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD QDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, - cdf_nbuf_t rx_buf_list, uint8_t staId); + qdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 881a78849f4c..3bf0c928d4cc 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -57,12 +57,12 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); -QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBufChain, +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, qdf_nbuf_t rxBufChain, uint8_t staId); #ifdef IPA_OFFLOAD QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, - cdf_nbuf_t rx_buf_list, uint8_t staId); + qdf_nbuf_t rx_buf_list, uint8_t staId); #endif /* IPA_OFFLOAD */ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 4458819f3554..8c6dc29ed9f7 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -376,7 +376,7 @@ struct hdd_ipa_priv { uint8_t num_iface; enum hdd_ipa_rm_state rm_state; /* - * IPA driver can send RM notifications with IRQ disabled so using cdf + * IPA driver can send RM notifications with IRQ disabled so using qdf * APIs as it is taken care gracefully. Without this, kernel would throw * an warning if spin_lock_bh is used while IRQ is disabled */ @@ -390,7 +390,7 @@ struct hdd_ipa_priv { enum ipa_client_type prod_client; atomic_t tx_ref_cnt; - cdf_nbuf_queue_t pm_queue_head; + qdf_nbuf_queue_t pm_queue_head; struct work_struct pm_work; qdf_spinlock_t pm_lock; bool suspended; @@ -2130,7 +2130,7 @@ static int hdd_ipa_rm_try_release(struct hdd_ipa_priv *hdd_ipa) qdf_spin_lock_bh(&hdd_ipa->pm_lock); - if (!cdf_nbuf_is_queue_empty(&hdd_ipa->pm_queue_head)) { + if (!qdf_nbuf_is_queue_empty(&hdd_ipa->pm_queue_head)) { qdf_spin_unlock_bh(&hdd_ipa->pm_lock); return -EAGAIN; } @@ -2508,7 +2508,7 @@ static void hdd_ipa_destroy_rm_resource(struct hdd_ipa_priv *hdd_ipa) * * Return: None */ -static void hdd_ipa_send_skb_to_network(cdf_nbuf_t skb, +static void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, hdd_adapter_t *adapter) { struct hdd_ipa_priv *hdd_ipa = ghdd_ipa; @@ -2518,13 +2518,13 @@ static void hdd_ipa_send_skb_to_network(cdf_nbuf_t skb, HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_LOW, "Invalid adapter: 0x%p", adapter); HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return; } if (cds_is_driver_unloading()) { HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return; } @@ -2559,11 +2559,11 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, { struct hdd_ipa_priv *hdd_ipa = NULL; hdd_adapter_t *adapter = NULL; - cdf_nbuf_t skb; + qdf_nbuf_t skb; uint8_t iface_id; uint8_t session_id; struct hdd_ipa_iface_context *iface_context; - cdf_nbuf_t copy; + qdf_nbuf_t copy; uint8_t fw_desc; int ret; @@ -2571,7 +2571,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, switch (evt) { case IPA_RECEIVE: - skb = (cdf_nbuf_t) data; + skb = (qdf_nbuf_t) data; if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) { session_id = (uint8_t)skb->cb[0]; iface_id = vdev_to_iface[session_id]; @@ -2589,7 +2589,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_INFO_HIGH, "w2i -- skb", skb->data, 8); HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return; } @@ -2628,7 +2628,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, QDF_TRACE_LEVEL_DEBUG, "Forward packet to Tx (fw_desc=%d)", fw_desc); - copy = cdf_nbuf_copy(skb); + copy = qdf_nbuf_copy(skb); if (copy) { hdd_ipa->ipa_tx_forward++; ret = hdd_softap_hard_start_xmit( @@ -2649,7 +2649,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, if (fw_desc & HDD_IPA_FW_RX_DESC_DISCARD_M) { HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa); hdd_ipa->ipa_rx_discard++; - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); break; } @@ -2674,13 +2674,15 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt, * * Return: None */ -void hdd_ipa_nbuf_cb(cdf_nbuf_t skb) +void hdd_ipa_nbuf_cb(qdf_nbuf_t skb) { struct hdd_ipa_priv *hdd_ipa = ghdd_ipa; - HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); + HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "%p", + wlan_hdd_stub_priv_to_addr(QDF_NBUF_CB_TX_IPA_PRIV(skb))); /* FIXME: This is broken; PRIV_DATA is now 31 bits */ - ipa_free_skb((struct ipa_rx_data *)wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb))); + ipa_free_skb((struct ipa_rx_data *) + wlan_hdd_stub_priv_to_addr(QDF_NBUF_CB_TX_IPA_PRIV(skb))); hdd_ipa->stats.num_tx_comp_cnt++; @@ -2703,7 +2705,7 @@ static void hdd_ipa_send_pkt_to_tl( struct hdd_ipa_priv *hdd_ipa = iface_context->hdd_ipa; uint8_t interface_id; hdd_adapter_t *adapter = NULL; - cdf_nbuf_t skb; + qdf_nbuf_t skb; qdf_spin_lock_bh(&iface_context->interface_lock); adapter = iface_context->adapter; @@ -2736,21 +2738,21 @@ static void hdd_ipa_send_pkt_to_tl( skb = ipa_tx_desc->skb; qdf_mem_set(skb->cb, sizeof(skb->cb), 0); - cdf_nbuf_ipa_owned_set(skb); + qdf_nbuf_ipa_owned_set(skb); /* FIXME: This is broken. No such field in cb any more: NBUF_CALLBACK_FN(skb) = hdd_ipa_nbuf_cb; */ if (hdd_ipa_uc_sta_is_enabled(hdd_ipa->hdd_ctx)) { - cdf_nbuf_mapped_paddr_set(skb, + qdf_nbuf_mapped_paddr_set(skb, ipa_tx_desc->dma_addr + HDD_IPA_WLAN_FRAG_HEADER + HDD_IPA_WLAN_IPA_HEADER); ipa_tx_desc->skb->len -= HDD_IPA_WLAN_FRAG_HEADER + HDD_IPA_WLAN_IPA_HEADER; } else - cdf_nbuf_mapped_paddr_set(skb, ipa_tx_desc->dma_addr); + qdf_nbuf_mapped_paddr_set(skb, ipa_tx_desc->dma_addr); /* FIXME: This is broken: priv_data is 31 bits */ - cdf_nbuf_ipa_priv_set(skb, wlan_hdd_stub_addr_to_priv(ipa_tx_desc)); + qdf_nbuf_ipa_priv_set(skb, wlan_hdd_stub_addr_to_priv(ipa_tx_desc)); adapter->stats.tx_bytes += ipa_tx_desc->skb->len; @@ -2785,12 +2787,13 @@ static void hdd_ipa_pm_send_pkt_to_tl(struct work_struct *work) struct hdd_ipa_priv, pm_work); struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; - cdf_nbuf_t skb; + qdf_nbuf_t skb; uint32_t dequeued = 0; qdf_spin_lock_bh(&hdd_ipa->pm_lock); - while (((skb = cdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) != NULL)) { + while (((skb = qdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) + != NULL)) { qdf_spin_unlock_bh(&hdd_ipa->pm_lock); pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; @@ -2825,13 +2828,13 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, struct hdd_ipa_priv *hdd_ipa = NULL; struct ipa_rx_data *ipa_tx_desc; struct hdd_ipa_iface_context *iface_context; - cdf_nbuf_t skb; + qdf_nbuf_t skb; struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; QDF_STATUS status = QDF_STATUS_SUCCESS; iface_context = (struct hdd_ipa_iface_context *)priv; if (evt != IPA_RECEIVE) { - skb = (cdf_nbuf_t) data; + skb = (qdf_nbuf_t) data; dev_kfree_skb_any(skb); iface_context->stats.num_tx_drop++; return; @@ -2879,7 +2882,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt, pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; pm_tx_cb->iface_context = iface_context; pm_tx_cb->ipa_tx_desc = ipa_tx_desc; - cdf_nbuf_queue_add(&hdd_ipa->pm_queue_head, skb); + qdf_nbuf_queue_add(&hdd_ipa->pm_queue_head, skb); hdd_ipa->stats.num_tx_queued++; qdf_spin_unlock_bh(&hdd_ipa->pm_lock); @@ -4066,7 +4069,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) INIT_WORK(&hdd_ipa->pm_work, hdd_ipa_pm_send_pkt_to_tl); #endif qdf_spinlock_create(&hdd_ipa->pm_lock); - cdf_nbuf_queue_init(&hdd_ipa->pm_queue_head); + qdf_nbuf_queue_init(&hdd_ipa->pm_queue_head); ret = hdd_ipa_setup_rm(hdd_ipa); if (ret) @@ -4140,7 +4143,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) struct hdd_ipa_priv *hdd_ipa = hdd_ctx->hdd_ipa; int i; struct hdd_ipa_iface_context *iface_context = NULL; - cdf_nbuf_t skb; + qdf_nbuf_t skb; struct hdd_ipa_pm_tx_cb *pm_tx_cb = NULL; if (!hdd_ipa_is_enabled(hdd_ctx)) @@ -4163,7 +4166,8 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx) qdf_spin_lock_bh(&hdd_ipa->pm_lock); - while (((skb = cdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) != NULL)) { + while (((skb = qdf_nbuf_queue_remove(&hdd_ipa->pm_queue_head)) + != NULL)) { qdf_spin_unlock_bh(&hdd_ipa->pm_lock); pm_tx_cb = (struct hdd_ipa_pm_tx_cb *)skb->cb; diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index a39a5dc33cd0..b20c086f0ebd 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -258,7 +258,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac]; #if defined (IPA_OFFLOAD) - if (!cdf_nbuf_ipa_owned_get(skb)) { + if (!qdf_nbuf_ipa_owned_get(skb)) { #endif /* Check if the buffer has enough header room */ skb = skb_unshare(skb, GFP_ATOMIC); @@ -299,18 +299,18 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Zero out skb's context buffer for the driver to use */ qdf_mem_set(skb->cb, sizeof(skb->cb), 0); - NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; - NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); + QDF_NBUF_CB_TX_PACKET_TRACK(skb) = QDF_NBUF_TX_PKT_DATA_TRACK; + QDF_NBUF_UPDATE_TX_PKT_COUNT(skb, QDF_NBUF_TX_PKT_HDD); qdf_dp_trace_set_track(skb); DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD, (uint8_t *)skb->data, sizeof(skb->data))); DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, - (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + (uint8_t *)skb->data, qdf_nbuf_len(skb))); + if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); + (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); if (ol_tx_send_data_frame(STAId, skb, proto_type) != NULL) { @@ -327,11 +327,11 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) drop_pkt: DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, - (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + (uint8_t *)skb->data, qdf_nbuf_len(skb))); + if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); + (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); kfree_skb(skb); drop_pkt_accounting: @@ -490,7 +490,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) /** * hdd_softap_rx_packet_cbk() - Receive packet handler * @cds_context: pointer to CDS context - * @rxBuf: pointer to rx cdf_nbuf + * @rxBuf: pointer to rx qdf_nbuf * @staId: Station Id * * Receive callback registered with TL. TL will call this to notify @@ -501,7 +501,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) * QDF_STATUS_SUCCESS otherwise */ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, - cdf_nbuf_t rxBuf, uint8_t staId) + qdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; int rxstat; @@ -578,7 +578,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, /* Remove SKB from internal tracking table before submitting * it to stack */ - cdf_net_buf_debug_release_skb(rxBuf); + qdf_net_buf_debug_release_skb(rxBuf); if (hdd_napi_enabled(HDD_NAPI_ANY) && !pHddCtx->config->enableRxThread) rxstat = netif_receive_skb(skb); diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index d176b819d0b7..a288c4e234a3 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -368,7 +368,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Get TL AC corresponding to Qdisc queue index/AC. */ ac = hdd_qdisc_ac_to_tl_ac[skb->queue_mapping]; - if (!cdf_nbuf_ipa_owned_get(skb)) { + if (!qdf_nbuf_ipa_owned_get(skb)) { /* Check if the buffer has enough header room */ skb = skb_unshare(skb, GFP_ATOMIC); if (!skb) @@ -476,20 +476,20 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Zero out skb's context buffer for the driver to use */ qdf_mem_set(skb->cb, sizeof(skb->cb), 0); - NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK; - NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD); + QDF_NBUF_CB_TX_PACKET_TRACK(skb) = QDF_NBUF_TX_PKT_DATA_TRACK; + QDF_NBUF_UPDATE_TX_PKT_COUNT(skb, QDF_NBUF_TX_PKT_HDD); qdf_dp_trace_set_track(skb); DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD, (uint8_t *)skb->data, sizeof(skb->data))); DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, - (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + (uint8_t *)skb->data, qdf_nbuf_len(skb))); + if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD, (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); + (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); - if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb, + if (ol_tx_send_data_frame(STAId, (qdf_nbuf_t) skb, proto_type) != NULL) { QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", @@ -503,11 +503,11 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) drop_pkt: DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, - (uint8_t *)skb->data, cdf_nbuf_len(skb))); - if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) + (uint8_t *)skb->data, qdf_nbuf_len(skb))); + if (qdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE) DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD, (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], - (cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); + (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); ++pAdapter->stats.tx_dropped; ++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped; @@ -642,7 +642,7 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) /** * hdd_rx_packet_cbk() - Receive packet handler * @cds_context: pointer to CDS context - * @rxBuf: pointer to rx cdf_nbuf + * @rxBuf: pointer to rx qdf_nbuf * @staId: Station Id * * Receive callback registered with TL. TL will call this to notify @@ -652,7 +652,7 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) * Return: QDF_STATUS_E_FAILURE if any errors encountered, * QDF_STATUS_SUCCESS otherwise */ -QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) +QDF_STATUS hdd_rx_packet_cbk(void *cds_context, qdf_nbuf_t rxBuf, uint8_t staId) { hdd_adapter_t *pAdapter = NULL; hdd_context_t *pHddCtx = NULL; @@ -706,7 +706,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) /* Remove SKB from internal tracking table before submitting * it to stack */ - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return QDF_STATUS_SUCCESS; } @@ -740,7 +740,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId) /* Remove SKB from internal tracking table before submitting * it to stack */ - cdf_net_buf_debug_release_skb(rxBuf); + qdf_net_buf_debug_release_skb(rxBuf); if (HDD_LRO_NO_RX == hdd_lro_rx(pHddCtx, pAdapter, skb)) { diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c index aab767f6a159..6d83790c66cf 100644 --- a/core/mac/src/sys/common/src/wlan_qct_sys.c +++ b/core/mac/src/sys/common/src/wlan_qct_sys.c @@ -35,6 +35,7 @@ #include "wma_types.h" #include "sme_api.h" #include "mac_init_api.h" +#include "qdf_trace.h" /* * Cookie for SYS messages. Note that anyone posting a SYS Message @@ -72,6 +73,7 @@ QDF_STATUS sys_build_message_header(SYS_MSG_ID sysMsgId, cds_msg_t *pMsg) * * Return: none */ +#ifdef QDF_ENABLE_TRACING void sys_stop_complete_cb(void *pUserData) { qdf_event_t *pStopEvt = (qdf_event_t *) pUserData; @@ -80,6 +82,12 @@ void sys_stop_complete_cb(void *pUserData) QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status)); } +#else +void sys_stop_complete_cb(void *pUserData) +{ + return; +} +#endif /** * sys_stop() - To post stop message to system module diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index a2f9ae28ffc9..ffcafff8ebfb 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -49,7 +49,7 @@ /*DFS New Include Start*/ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_assert */ #include /* cdf_spinlock */ #include /* TAILQ */ diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 0c980de6b759..2439c575113a 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -96,7 +96,7 @@ typedef struct { struct task_struct *pid; void *arg; bool done; - cdf_nbuf_t skb; + qdf_nbuf_t skb; HTC_ENDPOINT_ID eid; struct semaphore sem; bool inited; @@ -142,7 +142,7 @@ typedef struct epping_adapter_s { uint8_t sessionId; /* for mboxping */ qdf_spinlock_t data_lock; - cdf_nbuf_queue_t nodrop_queue; + qdf_nbuf_queue_t nodrop_queue; qdf_timer_t epping_timer; epping_tx_timer_state_t epping_timer_state; bool registered; @@ -168,7 +168,7 @@ void epping_set_kperf_flag(epping_adapter_t *pAdapter, /* epping_tx signatures */ void epping_tx_timer_expire(epping_adapter_t *pAdapter); void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue); -int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter); +int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *pAdapter); #ifdef HIF_SDIO HTC_SEND_FULL_ACTION epping_tx_queue_full(void *Context, HTC_PACKET *pPacket); @@ -192,6 +192,6 @@ void epping_register_tx_copier(HTC_ENDPOINT_ID eid, void epping_unregister_tx_copier(HTC_ENDPOINT_ID eid, epping_context_t *pEpping_ctx); void epping_tx_copier_schedule(epping_context_t *pEpping_ctx, - HTC_ENDPOINT_ID eid, cdf_nbuf_t skb); + HTC_ENDPOINT_ID eid, qdf_nbuf_t skb); #endif /* HIF_PCI */ #endif /* end #ifndef EPPING_INTERNAL_H */ diff --git a/core/utils/epping/src/epping_rx.c b/core/utils/epping/src/epping_rx.c index ea2d32311c37..2718e64e5a32 100644 --- a/core/utils/epping/src/epping_rx.c +++ b/core/utils/epping/src/epping_rx.c @@ -83,7 +83,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint) __func__, buffersToRefill, Endpoint); for (RxBuffers = 0; RxBuffers < buffersToRefill; RxBuffers++) { - osBuf = cdf_nbuf_alloc(NULL, AR6000_BUFFER_SIZE, + osBuf = qdf_nbuf_alloc(NULL, AR6000_BUFFER_SIZE, AR6000_MIN_HEAD_ROOM, 4, false); if (NULL == osBuf) { break; @@ -93,7 +93,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint) pPacket = (HTC_PACKET *) (A_NETBUF_HEAD(osBuf)); /* set re-fill info */ SET_HTC_PACKET_INFO_RX_REFILL(pPacket, osBuf, - cdf_nbuf_data(osBuf), + qdf_nbuf_data(osBuf), AR6000_BUFFER_SIZE, Endpoint); SET_HTC_PACKET_NET_BUF_CONTEXT(pPacket, osBuf); /* add to queue */ @@ -123,9 +123,9 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) if (status != A_OK) { if (status != A_ECANCELED) { - printk("%s: RX ERR (%d) \n", __func__, status); + printk("%s: RX ERR (%d)\n", __func__, status); } - cdf_nbuf_free(pktSkb); + qdf_nbuf_free(pktSkb); return; } @@ -135,7 +135,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) A_NETBUF_PULL(pktSkb, EPPING_ALIGNMENT_PAD); } if (enb_rx_dump) - epping_hex_dump((void *)cdf_nbuf_data(pktSkb), + epping_hex_dump((void *)qdf_nbuf_data(pktSkb), pktSkb->len, __func__); pktSkb->dev = dev; if ((pktSkb->dev->flags & IFF_UP) == IFF_UP) { @@ -155,7 +155,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket) } } else { ++pAdapter->stats.rx_dropped; - cdf_nbuf_free(pktSkb); + qdf_nbuf_free(pktSkb); } } } diff --git a/core/utils/epping/src/epping_tx.c b/core/utils/epping/src/epping_tx.c index 814f4438dfa3..ffcf8df36b2e 100644 --- a/core/utils/epping/src/epping_tx.c +++ b/core/utils/epping/src/epping_tx.c @@ -56,11 +56,11 @@ static bool enb_tx_dump; void epping_tx_dup_pkt(epping_adapter_t *pAdapter, - HTC_ENDPOINT_ID eid, cdf_nbuf_t skb) + HTC_ENDPOINT_ID eid, qdf_nbuf_t skb) { struct epping_cookie *cookie = NULL; int skb_len, ret; - cdf_nbuf_t new_skb; + qdf_nbuf_t new_skb; cookie = epping_alloc_cookie(pAdapter->pEpping_ctx); if (cookie == NULL) { @@ -69,25 +69,25 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter, __func__); return; } - new_skb = cdf_nbuf_copy(skb); + new_skb = qdf_nbuf_copy(skb); if (!new_skb) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, - "%s: cdf_nbuf_copy returns no resource\n", __func__); + "%s: qdf_nbuf_copy returns no resource\n", __func__); epping_free_cookie(pAdapter->pEpping_ctx, cookie); return; } SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt, - cookie, cdf_nbuf_data(skb), - cdf_nbuf_len(new_skb), eid, 0); + cookie, qdf_nbuf_data(skb), + qdf_nbuf_len(new_skb), eid, 0); SET_HTC_PACKET_NET_BUF_CONTEXT(&cookie->HtcPkt, new_skb); - skb_len = (int)cdf_nbuf_len(new_skb); + skb_len = (int)qdf_nbuf_len(new_skb); /* send the packet */ ret = htc_send_pkt(pAdapter->pEpping_ctx->HTCHandle, &cookie->HtcPkt); if (ret != A_OK) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: htc_send_pkt failed, ret = %d\n", __func__, ret); epping_free_cookie(pAdapter->pEpping_ctx, cookie); - cdf_nbuf_free(new_skb); + qdf_nbuf_free(new_skb); return; } pAdapter->stats.tx_bytes += skb_len; @@ -99,9 +99,9 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter, } } -static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) +static int epping_tx_send_int(qdf_nbuf_t skb, epping_adapter_t *pAdapter) { - EPPING_HEADER *eppingHdr = (EPPING_HEADER *) cdf_nbuf_data(skb); + EPPING_HEADER *eppingHdr = (EPPING_HEADER *) qdf_nbuf_data(skb); HTC_ENDPOINT_ID eid = ENDPOINT_UNUSED; struct epping_cookie *cookie = NULL; A_UINT8 ac = 0; @@ -143,7 +143,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) epping_set_kperf_flag(pAdapter, eid, tmpHdr.CmdBuffer_t[0]); } SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt, - cookie, cdf_nbuf_data(skb), cdf_nbuf_len(skb), + cookie, qdf_nbuf_data(skb), qdf_nbuf_len(skb), eid, 0); SET_HTC_PACKET_NET_BUF_CONTEXT(&cookie->HtcPkt, skb); skb_len = skb->len; @@ -170,25 +170,25 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter) void epping_tx_timer_expire(epping_adapter_t *pAdapter) { - cdf_nbuf_t nodrop_skb; + qdf_nbuf_t nodrop_skb; EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: queue len: %d\n", __func__, - cdf_nbuf_queue_len(&pAdapter->nodrop_queue)); + qdf_nbuf_queue_len(&pAdapter->nodrop_queue)); - if (!cdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { + if (!qdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { /* nodrop queue is empty so no need to arm timer */ pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; return; } /* try to flush nodrop queue */ - while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { + while ((nodrop_skb = qdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { if (epping_tx_send_int(nodrop_skb, pAdapter)) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p xmit fail in timer\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ - cdf_nbuf_queue_insert_head(&pAdapter->nodrop_queue, + qdf_nbuf_queue_insert_head(&pAdapter->nodrop_queue, nodrop_skb); break; } else { @@ -213,19 +213,19 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter) } } -int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) +int epping_tx_send(qdf_nbuf_t skb, epping_adapter_t *pAdapter) { - cdf_nbuf_t nodrop_skb; + qdf_nbuf_t nodrop_skb; EPPING_HEADER *eppingHdr; A_UINT8 ac = 0; - eppingHdr = (EPPING_HEADER *) cdf_nbuf_data(skb); + eppingHdr = (EPPING_HEADER *) qdf_nbuf_data(skb); if (!IS_EPPING_PACKET(eppingHdr)) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Recived non endpoint ping packets\n", __func__); /* no packet to send, cleanup */ - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return -ENOMEM; } @@ -236,7 +236,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: ac %d is not mapped to mboxping service\n", __func__, ac); - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); return -ENOMEM; } @@ -252,13 +252,13 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) */ /* check the nodrop queue first */ - while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { + while ((nodrop_skb = qdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) { if (epping_tx_send_int(nodrop_skb, pAdapter)) { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p xmit fail\n", __func__, nodrop_skb); /* fail to xmit so put the nodrop packet to the nodrop queue */ - cdf_nbuf_queue_insert_head(&pAdapter->nodrop_queue, + qdf_nbuf_queue_insert_head(&pAdapter->nodrop_queue, nodrop_skb); /* no cookie so free the current skb */ goto tx_fail; @@ -278,7 +278,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter) tx_fail: if (!IS_EPING_PACKET_NO_DROP(eppingHdr)) { /* allow to drop the skb so drop it */ - cdf_nbuf_free(skb); + qdf_nbuf_free(skb); ++pAdapter->stats.tx_dropped; EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: Tx skb %p dropped, stats.tx_dropped = %ld\n", @@ -287,7 +287,7 @@ tx_fail: } else { EPPING_LOG(QDF_TRACE_LEVEL_FATAL, "%s: nodrop: %p queued\n", __func__, skb); - cdf_nbuf_queue_add(&pAdapter->nodrop_queue, skb); + qdf_nbuf_queue_add(&pAdapter->nodrop_queue, skb); qdf_spin_lock_bh(&pAdapter->data_lock); if (pAdapter->epping_timer_state != EPPING_TX_TIMER_RUNNING) { pAdapter->epping_timer_state = EPPING_TX_TIMER_RUNNING; @@ -317,13 +317,13 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) struct net_device *dev = pAdapter->dev; A_STATUS status; HTC_ENDPOINT_ID eid; - cdf_nbuf_t pktSkb; + qdf_nbuf_t pktSkb; struct epping_cookie *cookie; A_BOOL flushing = false; - cdf_nbuf_queue_t skb_queue; + qdf_nbuf_queue_t skb_queue; HTC_PACKET *htc_pkt; - cdf_nbuf_queue_init(&skb_queue); + qdf_nbuf_queue_init(&skb_queue); qdf_spin_lock_bh(&pAdapter->data_lock); @@ -337,13 +337,13 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) cookie = htc_pkt->pPktContext; ASSERT(pktSkb); - ASSERT(htc_pkt->pBuffer == cdf_nbuf_data(pktSkb)); + ASSERT(htc_pkt->pBuffer == qdf_nbuf_data(pktSkb)); /* add this to the list, use faster non-lock API */ - cdf_nbuf_queue_add(&skb_queue, pktSkb); + qdf_nbuf_queue_add(&skb_queue, pktSkb); if (A_SUCCESS(status)) { - ASSERT(htc_pkt->ActualLength == cdf_nbuf_len(pktSkb)); + ASSERT(htc_pkt->ActualLength == qdf_nbuf_len(pktSkb)); } EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s skb=%p data=%p len=0x%x eid=%d ", @@ -370,12 +370,12 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue) qdf_spin_unlock_bh(&pAdapter->data_lock); /* free all skbs in our local list */ - while (cdf_nbuf_queue_len(&skb_queue)) { + while (qdf_nbuf_queue_len(&skb_queue)) { /* use non-lock version */ - pktSkb = cdf_nbuf_queue_remove(&skb_queue); + pktSkb = qdf_nbuf_queue_remove(&skb_queue); if (pktSkb == NULL) break; - cdf_nbuf_free(pktSkb); + qdf_nbuf_free(pktSkb); pEpping_ctx->total_tx_acks++; } diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index 3d41d0f707f7..dc7e2fe8ee30 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -312,11 +312,11 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter) qdf_timer_free(&pAdapter->epping_timer); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; - while (cdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { - cdf_nbuf_t tmp_nbuf = NULL; - tmp_nbuf = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue); + while (qdf_nbuf_queue_len(&pAdapter->nodrop_queue)) { + qdf_nbuf_t tmp_nbuf = NULL; + tmp_nbuf = qdf_nbuf_queue_remove(&pAdapter->nodrop_queue); if (tmp_nbuf) - cdf_nbuf_free(tmp_nbuf); + qdf_nbuf_free(tmp_nbuf); } free_netdev(dev); @@ -368,7 +368,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, qdf_mem_copy(pAdapter->macAddressCurrent.bytes, macAddr, sizeof(tSirMacAddr)); qdf_spinlock_create(&pAdapter->data_lock); - cdf_nbuf_queue_init(&pAdapter->nodrop_queue); + qdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, epping_timer_expire, dev, QDF_TIMER_TYPE_SW); diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index b37e83974340..977d0517e3a2 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -1392,7 +1392,7 @@ wmi_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param, len, WMI_DBGLOG_CFG_CMDID); if (status != A_OK) - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return status; } diff --git a/core/utils/pktlog/include/pktlog_ac_i.h b/core/utils/pktlog/include/pktlog_ac_i.h index 07bbac07a168..7dbf443a6990 100644 --- a/core/utils/pktlog/include/pktlog_ac_i.h +++ b/core/utils/pktlog/include/pktlog_ac_i.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -59,7 +59,7 @@ char *pktlog_getbuf(struct ol_pktlog_dev_t *pl_dev, A_STATUS process_tx_info(struct ol_txrx_pdev_t *pdev, void *data); A_STATUS process_rx_info(void *pdev, void *data); -A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu); +A_STATUS process_rx_info_remote(void *pdev, qdf_nbuf_t amsdu); A_STATUS process_rate_find(void *pdev, void *data); A_STATUS process_rate_update(void *pdev, void *data); diff --git a/core/utils/pktlog/pktlog_internal.c b/core/utils/pktlog/pktlog_internal.c index 010585ce362f..0d219b628475 100644 --- a/core/utils/pktlog/pktlog_internal.c +++ b/core/utils/pktlog/pktlog_internal.c @@ -406,7 +406,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) msdu_id_offset); uint8_t *addr, *vap_addr; uint8_t vdev_id; - cdf_nbuf_t netbuf; + qdf_nbuf_t netbuf; uint32_t len; qdf_mem_set(&pl_msdu_info, sizeof(pl_msdu_info), 0); @@ -436,7 +436,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) htt_tx_desc = (uint32_t *) tx_desc->htt_tx_desc; qdf_assert(htt_tx_desc); - cdf_nbuf_peek_header(netbuf, &addr, &len); + qdf_nbuf_peek_header(netbuf, &addr, &len); if (len < (2 * IEEE80211_ADDR_LEN)) { qdf_print("TX frame does not have a valid" @@ -482,7 +482,7 @@ A_STATUS process_tx_info(struct ol_txrx_pdev_t *txrx_pdev, void *data) return A_OK; } -A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu) +A_STATUS process_rx_info_remote(void *pdev, qdf_nbuf_t amsdu) { struct ol_pktlog_dev_t *pl_dev; struct ath_pktlog_info *pl_info; @@ -490,7 +490,7 @@ A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu) struct ath_pktlog_hdr pl_hdr; struct ath_pktlog_rx_info rxstat_log; size_t log_size; - cdf_nbuf_t msdu; + qdf_nbuf_t msdu; if (!pdev) { printk("Invalid pdev in %s\n", __func__); @@ -506,7 +506,7 @@ A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu) while (msdu) { rx_desc = - (struct htt_host_rx_desc_base *)(cdf_nbuf_data(msdu)) - 1; + (struct htt_host_rx_desc_base *)(qdf_nbuf_data(msdu)) - 1; log_size = sizeof(*rx_desc) - sizeof(struct htt_host_fw_desc_base); @@ -530,7 +530,7 @@ A_STATUS process_rx_info_remote(void *pdev, cdf_nbuf_t amsdu) log_size, &pl_hdr); qdf_mem_copy(rxstat_log.rx_desc, (void *)rx_desc + sizeof(struct htt_host_fw_desc_base), pl_hdr.size); - msdu = cdf_nbuf_next(msdu); + msdu = qdf_nbuf_next(msdu); } return A_OK; } diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 21d915353753..9c4e1a179d73 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -509,7 +509,7 @@ struct scan_param { * @lock: lock */ struct beacon_info { - cdf_nbuf_t buf; + qdf_nbuf_t buf; uint32_t len; uint8_t dma_mapped; uint32_t tim_ie_offset; @@ -991,7 +991,7 @@ struct dbs_hw_mode_info { struct wmi_desc_t { pWMATxRxCompFunc tx_cmpl_cb; pWMAAckFnTxComp ota_post_proc_cb; - cdf_nbuf_t nbuf; + qdf_nbuf_t nbuf; uint32_t desc_id; }; @@ -1216,7 +1216,7 @@ typedef struct { pWMAAckFnTxComp umac_ota_ack_cb[SIR_MAC_MGMT_RESERVED15]; pWMAAckFnTxComp umac_data_ota_ack_cb; unsigned long last_umac_data_ota_timestamp; - cdf_nbuf_t last_umac_data_nbuf; + qdf_nbuf_t last_umac_data_nbuf; bool needShutdown; uint32_t num_mem_chunks; struct wma_mem_chunk mem_chunks[MAX_MEM_CHUNKS]; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index c822ffcbbb3b..1e563b0e4935 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -156,7 +156,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, void *body_ptr, uint32_t body_val); void wma_data_tx_ack_comp_hdlr(void *wma_context, - cdf_nbuf_t netbuf, int32_t status); + qdf_nbuf_t netbuf, int32_t status); QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int value); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 941ce36dc8f6..dbfce926619b 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -45,7 +45,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -846,7 +846,7 @@ static void wma_data_tx_ack_work_handler(void *ack_work) * Return: none */ void -wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) +wma_data_tx_ack_comp_hdlr(void *wma_context, qdf_nbuf_t netbuf, int32_t status) { ol_txrx_pdev_handle pdev; tp_wma_handle wma_handle = (tp_wma_handle) wma_context; @@ -897,8 +897,8 @@ wma_data_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) free_nbuf: /* unmap and freeing the tx buf as txrx is not taking care */ - cdf_nbuf_unmap_single(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); - cdf_nbuf_free(netbuf); + qdf_nbuf_unmap_single(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE); + qdf_nbuf_free(netbuf); } /** @@ -1026,7 +1026,7 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t if (ret) { WMA_LOGP("%s: Failed to send enable/disable MCC" " adaptive scheduler command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } return QDF_STATUS_SUCCESS; } @@ -1134,7 +1134,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency if (ret) { WMA_LOGE("%s: Failed to send MCC Channel Time Latency command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -1266,7 +1266,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID); if (ret) { WMA_LOGE("Failed to send MCC Channel Time Quota command"); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } @@ -1540,9 +1540,9 @@ wma_mgmt_tx_comp_conf_ind(tp_wma_handle wma_handle, uint8_t sub_type, * Return: none */ static void -wma_mgmt_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) +wma_mgmt_tx_ack_comp_hdlr(void *wma_context, qdf_nbuf_t netbuf, int32_t status) { - tpSirMacFrameCtl pFc = (tpSirMacFrameCtl) (cdf_nbuf_data(netbuf)); + tpSirMacFrameCtl pFc = (tpSirMacFrameCtl) (qdf_nbuf_data(netbuf)); tp_wma_handle wma_handle = (tp_wma_handle) wma_context; if (wma_handle && wma_handle->umac_ota_ack_cb[pFc->subType]) { @@ -1583,7 +1583,7 @@ wma_mgmt_tx_ack_comp_hdlr(void *wma_context, cdf_nbuf_t netbuf, int32_t status) * Return: none */ static void -wma_mgmt_tx_dload_comp_hldr(void *wma_context, cdf_nbuf_t netbuf, +wma_mgmt_tx_dload_comp_hldr(void *wma_context, qdf_nbuf_t netbuf, int32_t status) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -2004,7 +2004,7 @@ QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_THERMAL_MGMT_CMDID); if (status) { - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send thermal mgmt command", __func__); return QDF_STATUS_E_FAILURE; } @@ -2141,7 +2141,7 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, * * Return: none */ -static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) +static void wma_decap_to_8023(qdf_nbuf_t msdu, struct wma_decap_info_t *info) { struct llc_snap_hdr_t *llc_hdr; uint16_t ether_type; @@ -2151,7 +2151,7 @@ static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) uint8_t *buf; struct ethernet_hdr_t *ethr_hdr; - buf = (uint8_t *) cdf_nbuf_data(msdu); + buf = (uint8_t *) qdf_nbuf_data(msdu); llc_hdr = (struct llc_snap_hdr_t *)buf; ether_type = (llc_hdr->ethertype[0] << 8) | llc_hdr->ethertype[1]; /* do llc remove if needed */ @@ -2171,9 +2171,9 @@ static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) } } if (l2_hdr_space > ETHERNET_HDR_LEN) { - buf = cdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN); + buf = qdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN); } else if (l2_hdr_space < ETHERNET_HDR_LEN) { - buf = cdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space); + buf = qdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space); } /* mpdu hdr should be present in info,re-create ethr_hdr based on mpdu hdr */ @@ -2211,9 +2211,9 @@ static void wma_decap_to_8023(cdf_nbuf_t msdu, struct wma_decap_info_t *info) ethr_hdr->ethertype[1] = (ether_type) & 0xff; } else { uint32_t pktlen = - cdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype); + qdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype); ether_type = (uint16_t) pktlen; - ether_type = cdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t); + ether_type = qdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t); ethr_hdr->ethertype[0] = (ether_type >> 8) & 0xff; ethr_hdr->ethertype[1] = (ether_type) & 0xff; } @@ -2393,8 +2393,8 @@ mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, sizeof(uint32_t))); bufp += WMI_TLV_HDR_SIZE; qdf_mem_copy(bufp, pData, bufp_len); - cdf_nbuf_map_single(qdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); - dma_addr = cdf_nbuf_get_frag_paddr(tx_frame, 0); + qdf_nbuf_map_single(qdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); + dma_addr = qdf_nbuf_get_frag_paddr(tx_frame, 0); cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); #if defined(HELIUMPLUS_PADDR64) cmd->paddr_hi = (uint32_t)((dma_addr >> 32) & 0x1F); @@ -2447,7 +2447,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, int32_t is_high_latency; ol_txrx_vdev_handle txrx_vdev; enum frame_index tx_frm_index = GENERIC_NODOWNLD_NOACK_COMP_INDEX; - tpSirMacFrameCtl pFc = (tpSirMacFrameCtl) (cdf_nbuf_data(tx_frame)); + tpSirMacFrameCtl pFc = (tpSirMacFrameCtl) (qdf_nbuf_data(tx_frame)); uint8_t use_6mbps = 0; uint8_t downld_comp_required = 0; uint16_t chanfreq; @@ -2495,7 +2495,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, WMA_LOGE("No Support to send other frames except 802.11 Mgmt/Data"); return QDF_STATUS_E_FAILURE; } - mHdr = (tpSirMacMgmtHdr)cdf_nbuf_data(tx_frame); + mHdr = (tpSirMacMgmtHdr)qdf_nbuf_data(tx_frame); #ifdef WLAN_FEATURE_11W if ((iface && iface->rmfEnabled) && (frmType == TXRX_FRM_802_11_MGMT) && @@ -2503,7 +2503,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, pFc->subType == SIR_MAC_MGMT_DEAUTH || pFc->subType == SIR_MAC_MGMT_ACTION)) { struct ieee80211_frame *wh = - (struct ieee80211_frame *)cdf_nbuf_data(tx_frame); + (struct ieee80211_frame *)qdf_nbuf_data(tx_frame); if (!IEEE80211_IS_BROADCAST(wh->i_addr1) && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { if (pFc->wep) { @@ -2586,7 +2586,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, (pFc->subType == SIR_MAC_MGMT_PROBE_RSP)) { uint64_t adjusted_tsf_le; struct ieee80211_frame *wh = - (struct ieee80211_frame *)cdf_nbuf_data(tx_frame); + (struct ieee80211_frame *)qdf_nbuf_data(tx_frame); /* Make the TSF offset negative to match TSF in beacons */ adjusted_tsf_le = cpu_to_le64(0ULL - @@ -2595,14 +2595,14 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, A_MEMCPY(&wh[1], &adjusted_tsf_le, sizeof(adjusted_tsf_le)); } if (frmType == TXRX_FRM_802_11_DATA) { - cdf_nbuf_t ret; - cdf_nbuf_t skb = (cdf_nbuf_t) tx_frame; + qdf_nbuf_t ret; + qdf_nbuf_t skb = (qdf_nbuf_t) tx_frame; ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); struct wma_decap_info_t decap_info; struct ieee80211_frame *wh = - (struct ieee80211_frame *)cdf_nbuf_data(skb); + (struct ieee80211_frame *)qdf_nbuf_data(skb); unsigned long curr_timestamp = qdf_mc_timer_get_system_ticks(); if (pdev == NULL) { @@ -2645,7 +2645,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, /* Take out 802.11 header from skb */ decap_info.hdr_len = wma_ieee80211_hdrsize(wh); qdf_mem_copy(decap_info.hdr, wh, decap_info.hdr_len); - cdf_nbuf_pull_head(skb, decap_info.hdr_len); + qdf_nbuf_pull_head(skb, decap_info.hdr_len); /* Decapsulate to 802.3 format */ wma_decap_to_8023(skb, &decap_info); @@ -2654,7 +2654,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, qdf_mem_set(skb->cb, sizeof(skb->cb), 0); /* Do the DMA Mapping */ - cdf_nbuf_map_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); + qdf_nbuf_map_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); /* Terminate the (single-element) list of tx frames */ skb->next = NULL; @@ -2671,7 +2671,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (ret) { WMA_LOGE("TxRx Rejected. Fail to do Tx"); - cdf_nbuf_unmap_single(pdev->osdev, skb, + qdf_nbuf_unmap_single(pdev->osdev, skb, QDF_DMA_TO_DEVICE); /* Call Download Cb so that umac can free the buffer */ if (tx_frm_download_comp_cb) @@ -2718,7 +2718,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, NBUF_PKT_TRAC_TYPE_MGMT_ACTION); if (proto_type & NBUF_PKT_TRAC_TYPE_MGMT_ACTION) cds_pkt_trace_buf_update("WM:T:MACT"); - cdf_nbuf_trace_set_proto_type(tx_frame, proto_type); + qdf_nbuf_trace_set_proto_type(tx_frame, proto_type); #endif /* QCA_PKT_PROTO_TRACE */ } else { if (downld_comp_required) @@ -2893,7 +2893,7 @@ QDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, */ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, uint8_t *peer_mac_addr, int tid, uint32_t tsf32, - enum ol_rx_err_type err_type, cdf_nbuf_t rx_frame, + enum ol_rx_err_type err_type, qdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id) { tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); @@ -2909,9 +2909,9 @@ void ol_rx_err(ol_pdev_handle pdev, uint8_t vdev_id, if (err_type != OL_RX_ERR_TKIP_MIC) return; - if (cdf_nbuf_len(rx_frame) < sizeof(*eth_hdr)) + if (qdf_nbuf_len(rx_frame) < sizeof(*eth_hdr)) return; - eth_hdr = (struct ether_header *)cdf_nbuf_data(rx_frame); + eth_hdr = (struct ether_header *)qdf_nbuf_data(rx_frame); mic_err_ind = qdf_mem_malloc(sizeof(*mic_err_ind)); if (!mic_err_ind) { WMA_LOGE("%s: Failed to allocate memory for MIC indication message", @@ -3069,7 +3069,7 @@ QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, sizeof(*cmd), WMI_LRO_CONFIG_CMDID); if (status) { - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send WMI_LRO_CONFIG_CMDID", __func__); return QDF_STATUS_E_FAILURE; } diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 3dafbddae5f5..e75d08543a15 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -45,7 +45,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -752,7 +752,7 @@ static int32_t wmi_unified_peer_delete_send(wmi_unified_t wmi, if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_DELETE_CMDID)) { WMA_LOGP("%s: Failed to send peer delete command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); @@ -801,7 +801,7 @@ static void wma_vdev_start_rsp(tp_wma_handle wma, goto send_fail_resp; } qdf_mem_zero(bcn, sizeof(*bcn)); - bcn->buf = cdf_nbuf_alloc(NULL, WMA_BCN_BUF_MAX_SIZE, 0, + bcn->buf = qdf_nbuf_alloc(NULL, WMA_BCN_BUF_MAX_SIZE, 0, sizeof(uint32_t), 0); if (!bcn->buf) { WMA_LOGE("%s: No memory allocated for beacon buffer", @@ -1125,7 +1125,7 @@ int32_t wmi_unified_peer_flush_tids_send(wmi_unified_t wmi, if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_FLUSH_TIDS_CMDID)) { WMA_LOGP("%s: Failed to send flush tid command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); @@ -1267,7 +1267,7 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi, if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_CREATE_CMDID)) { WMA_LOGP("%s: failed to send WMI_PEER_CREATE_CMDID", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); @@ -1369,7 +1369,7 @@ static int wmi_unified_vdev_down_send(wmi_unified_t wmi, uint8_t vdev_id) cmd->vdev_id = vdev_id; if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_DOWN_CMDID)) { WMA_LOGP("%s: Failed to send vdev down", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } WMA_LOGE("%s: vdev_id %d", __func__, vdev_id); @@ -1651,7 +1651,7 @@ void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle, WMA_LOGE("%s: Failed to send vdev restart command", __func__); qdf_atomic_set(&intr[sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 0); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } } @@ -1779,9 +1779,9 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, WMA_LOGD("%s: Freeing beacon struct %p, " "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) - cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, + qdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); - cdf_nbuf_free(bcn->buf); + qdf_nbuf_free(bcn->buf); qdf_mem_free(bcn); wma->interfaces[resp_event->vdev_id].beacon = NULL; } @@ -2211,7 +2211,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, " Failed to send VDEV START command", __func__, __LINE__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2326,7 +2326,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, if (ret < 0) { WMA_LOGP("%s: Failed to send vdev start command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -2787,9 +2787,9 @@ void wma_vdev_resp_timer(void *data) WMA_LOGD("%s: Freeing beacon struct %p, " "template memory %p", __func__, bcn, bcn->buf); if (bcn->dma_mapped) - cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, + qdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); - cdf_nbuf_free(bcn->buf); + qdf_nbuf_free(bcn->buf); qdf_mem_free(bcn); wma->interfaces[tgt_req->vdev_id].beacon = NULL; } @@ -3758,7 +3758,7 @@ int wmi_unified_vdev_up_send(wmi_unified_t wmi, WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid, &cmd->vdev_bssid); if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_UP_CMDID)) { WMA_LOGP("%s: Failed to send vdev up command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } return 0; @@ -4617,7 +4617,7 @@ int32_t wmi_unified_vdev_stop_send(wmi_unified_t wmi, uint8_t vdev_id) cmd->vdev_id = vdev_id; if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_STOP_CMDID)) { WMA_LOGP("%s: Failed to send vdev stop command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } return 0; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index ea82fa96aa3a..9fa87a066c31 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -46,7 +46,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -971,7 +971,7 @@ QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID)) { WMA_LOGE("%s: failed to send link speed command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -1131,7 +1131,7 @@ int32_t wmi_unified_pdev_green_ap_ps_enable_cmd(wmi_unified_t wmi_handle, if (wmi_unified_cmd_send(wmi_handle, buf, len, WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID)) { WMA_LOGE("Set Green AP PS param Failed val %d", value); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } return 0; @@ -1179,7 +1179,7 @@ int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, if (ret) { WMA_LOGE("PROFILE_TRIGGER cmd Failed with value %d", value1); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return ret; } break; @@ -1203,7 +1203,7 @@ int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, if (ret) { WMA_LOGE("PROFILE_DATA cmd Failed for id %d value %d", value1, value2); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return ret; } break; @@ -1229,7 +1229,7 @@ int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, if (ret) { WMA_LOGE("HIST_INTVL cmd Failed for id %d value %d", value1, value2); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return ret; } break; @@ -1256,7 +1256,7 @@ int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, if (ret) { WMA_LOGE("enable cmd Failed for id %d value %d", value1, value2); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return ret; } break; @@ -1937,7 +1937,7 @@ void wma_start_oem_data_req(tp_wma_handle wma_handle, if (ret != EOK) { WMA_LOGE(FL(":wmi cmd send failed")); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } out: @@ -4460,7 +4460,7 @@ void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg) if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_VDEV_WMM_DELTS_CMDID)) { WMA_LOGP("%s: Failed to send vdev DELTS command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (msg->setRICparams == true) @@ -4529,7 +4529,7 @@ void wma_aggr_qos_req(tp_wma_handle wma, __func__); pAggrQosRspMsg->status[i] = QDF_STATUS_E_FAILURE; - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } } } @@ -4592,7 +4592,7 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) WMI_VDEV_WMM_ADDTS_CMDID)) { WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); msg->status = QDF_STATUS_E_FAILURE; - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (msg->setRICparams == true) @@ -5486,7 +5486,7 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pAddPeriodicTxPtrnParams->mac_address.bytes); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_INVAL; } buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); @@ -5518,7 +5518,7 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { WMA_LOGE("%s: failed to add pattern set state command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -5557,7 +5557,7 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pDelPeriodicTxPtrnParams->mac_address.bytes); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_INVAL; } cmd = (WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *) @@ -5576,7 +5576,7 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { WMA_LOGE("%s: failed to send del pattern command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -6316,7 +6316,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, WMI_PDEV_SET_REGDOMAIN_CMDID)) { WMA_LOGP("%s: Failed to send pdev set regdomain command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } if ((((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_JAPAN) || @@ -6577,7 +6577,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) ret = wmi_unified_cmd_send(wma_handle->wmi_handle, wmibuf, len, WMI_PDEV_SUSPEND_CMDID); if (ret < 0) { - cdf_nbuf_free(wmibuf); + qdf_nbuf_free(wmibuf); return ret; } @@ -6913,7 +6913,7 @@ int wma_set_tdls_offchan_mode(WMA_HANDLE handle, if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, WMI_TDLS_SET_OFFCHAN_MODE_CMDID)) { WMA_LOGP(FL("failed to send tdls off chan command")); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); ret = -EIO; } @@ -7021,7 +7021,7 @@ int wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams) if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, WMI_TDLS_SET_STATE_CMDID)) { WMA_LOGP("%s: failed to send tdls set state command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); ret = -EIO; goto end_fw_tdls_state; } @@ -7223,7 +7223,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, WMI_TDLS_PEER_UPDATE_CMDID)) { WMA_LOGE("%s: failed to send tdls peer update state command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); ret = -EIO; goto end_tdls_peer_state; } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 777b0275a90b..5c76e7d06abb 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -47,7 +47,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -1492,7 +1492,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, params_buf = qdf_mem_malloc(sizeof(wma_process_fw_event_params)); if (!params_buf) { WMA_LOGE("%s: Failed alloc memory for params_buf", __func__); - cdf_nbuf_free(evt_buf); + qdf_nbuf_free(evt_buf); return -ENOMEM; } @@ -1507,7 +1507,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, cds_mq_post_message(CDS_MQ_ID_WMA, &cds_msg)) { WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg", __func__); - cdf_nbuf_free(evt_buf); + qdf_nbuf_free(evt_buf); qdf_mem_free(params_buf); return -EFAULT; } @@ -3013,9 +3013,9 @@ QDF_STATUS wma_wmi_service_close(void *cds_ctx) if (bcn) { if (bcn->dma_mapped) - cdf_nbuf_unmap_single(wma_handle->qdf_dev, + qdf_nbuf_unmap_single(wma_handle->qdf_dev, bcn->buf, QDF_DMA_TO_DEVICE); - cdf_nbuf_free(bcn->buf); + qdf_nbuf_free(bcn->buf); qdf_mem_free(bcn); wma_handle->interfaces[i].beacon = NULL; } @@ -3609,7 +3609,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, /* allocate memory requested by FW */ if (ev->num_mem_reqs > WMI_MAX_MEM_REQS) { QDF_ASSERT(0); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return NULL; } @@ -5487,7 +5487,7 @@ QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_SOC_SET_PCL_CMDID)) { WMA_LOGE("%s: Failed to send WMI_SOC_SET_PCL_CMDID", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -5549,7 +5549,7 @@ QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, WMI_SOC_SET_HW_MODE_CMDID)) { WMA_LOGE("%s: Failed to send WMI_SOC_SET_HW_MODE_CMDID", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); goto fail; } return QDF_STATUS_SUCCESS; @@ -5620,7 +5620,7 @@ QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID)) { WMA_LOGE("%s: Failed to send WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 2573e6715c63..a710e053cd3d 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -46,7 +46,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -111,7 +111,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, qdf_spin_lock_bh(&bcn->lock); - bcn_payload = cdf_nbuf_data(bcn->buf); + bcn_payload = qdf_nbuf_data(bcn->buf); tim_ie = (struct beacon_tim_ie *)(&bcn_payload[bcn->tim_ie_offset]); @@ -200,12 +200,12 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, } if (bcn->dma_mapped) { - cdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); + qdf_nbuf_unmap_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); bcn->dma_mapped = 0; } - ret = cdf_nbuf_map_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); + ret = qdf_nbuf_map_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); if (ret != QDF_STATUS_SUCCESS) { - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); qdf_spin_unlock_bh(&bcn->lock); return; @@ -220,7 +220,7 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, cmd->vdev_id = vdev_id; cmd->data_len = bcn->len; cmd->frame_ctrl = *((A_UINT16 *) wh->i_fc); - cmd->frag_ptr = cdf_nbuf_get_frag_paddr(bcn->buf, 0); + cmd->frag_ptr = qdf_nbuf_get_frag_paddr(bcn->buf, 0); /* notify Firmware of DTM and mcast/bcast traffic */ if (tim_ie->dtim_count == 0) { @@ -653,7 +653,7 @@ void wma_set_sta_sa_query_param(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID)) { WMA_LOGE(FL("Failed to offload STA SA Query")); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } WMA_LOGD(FL("Exit :")); @@ -723,7 +723,7 @@ void wma_set_sta_keep_alive(tp_wma_handle wma, uint8_t vdev_id, WMA_LOGE("%s: received null pointer, hostv4addr:%p " "destv4addr:%p destmac:%p ", __func__, hostv4addr, destv4addr, destmac); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return; } cmd->method = WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE; @@ -739,7 +739,7 @@ void wma_set_sta_keep_alive(tp_wma_handle wma, uint8_t vdev_id, if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_STA_KEEPALIVE_CMDID)) { WMA_LOGE("Failed to set KeepAlive"); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } WMA_LOGD("%s: Exit", __func__); @@ -1069,7 +1069,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, WMA_LOGE ("Set WMI_VDEV_PARAM_DROP_UNENCRY Param status:%d\n", ret); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return ret; } } @@ -1164,7 +1164,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, if (ret != EOK) { WMA_LOGP("%s: Failed to send peer assoc command ret = %d", __func__, ret); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } return ret; } @@ -1519,7 +1519,7 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, /* TODO: MFP ? */ WMA_LOGE("%s:Invalid encryption type:%d", __func__, key_params->key_type); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return NULL; } @@ -1680,7 +1680,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_VDEV_INSTALL_KEY_CMDID); if (status) { - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -1872,7 +1872,7 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_VDEV_INSTALL_KEY_CMDID); if (status) { - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); } @@ -1991,7 +1991,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_VDEV_INSTALL_KEY_CMDID); if (status) { - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); WMA_LOGE("%s:Failed to send install key command", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -2327,8 +2327,8 @@ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, * this will be send to target on the reception of SWBA * event from target. */ - cdf_nbuf_trim_tail(bcn->buf, cdf_nbuf_len(bcn->buf)); - memcpy(cdf_nbuf_data(bcn->buf), + qdf_nbuf_trim_tail(bcn->buf, qdf_nbuf_len(bcn->buf)); + memcpy(qdf_nbuf_data(bcn->buf), bcn_info->beacon + 4 /* Exclude beacon length field */, len); if (bcn_info->timIeOffset > 3) { @@ -2342,7 +2342,7 @@ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, } else { bcn->p2p_ie_offset = bcn_info->p2pIeOffset; } - bcn_payload = cdf_nbuf_data(bcn->buf); + bcn_payload = qdf_nbuf_data(bcn->buf); if (bcn->tim_ie_offset) { tim_ie = (struct beacon_tim_ie *)(&bcn_payload[bcn->tim_ie_offset]); @@ -2355,7 +2355,7 @@ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, tim_ie->tim_bitctl = 0; } - cdf_nbuf_put_tail(bcn->buf, len); + qdf_nbuf_put_tail(bcn->buf, len); bcn->len = len; qdf_spin_unlock_bh(&bcn->lock); @@ -2421,7 +2421,7 @@ int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, qdf_spin_lock_bh(&bcn->lock); qdf_mem_zero(&bcn_info, sizeof(bcn_info)); - bcn_info.beacon = cdf_nbuf_data(bcn->buf); + bcn_info.beacon = qdf_nbuf_data(bcn->buf); bcn_info.p2pIeOffset = bcn->p2p_ie_offset; bcn_info.beaconLength = bcn->len; bcn_info.timIeOffset = bcn->tim_ie_offset; @@ -2701,7 +2701,7 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, } if (wmi_desc->nbuf) - cdf_nbuf_unmap_single(pdev->osdev, wmi_desc->nbuf, + qdf_nbuf_unmap_single(pdev->osdev, wmi_desc->nbuf, QDF_DMA_TO_DEVICE); if (wmi_desc->tx_cmpl_cb) wmi_desc->tx_cmpl_cb(wma_handle->mac_context, @@ -3012,13 +3012,13 @@ static int wma_process_bip(tp_wma_handle wma_handle, struct wma_txrx_node *iface, struct ieee80211_frame *wh, - cdf_nbuf_t wbuf + qdf_nbuf_t wbuf ) { uint16_t key_id; uint8_t *efrm; - efrm = cdf_nbuf_data(wbuf) + cdf_nbuf_len(wbuf); + efrm = qdf_nbuf_data(wbuf) + qdf_nbuf_len(wbuf); key_id = (uint16_t)*(efrm - cds_get_mmie_size() + 2); if (!((key_id == WMA_IGTK_KEY_INDEX_4) @@ -3032,14 +3032,14 @@ int wma_process_bip(tp_wma_handle wma_handle, * if 11w offload is enabled then mmie validation is performed * in firmware, host just need to trim the mmie. */ - cdf_nbuf_trim_tail(wbuf, cds_get_mmie_size()); + qdf_nbuf_trim_tail(wbuf, cds_get_mmie_size()); } else { if (cds_is_mmie_valid(iface->key.key, iface->key.key_id[key_id - WMA_IGTK_KEY_INDEX_4].ipn, (uint8_t *) wh, efrm)) { WMA_LOGE(FL("Protected BC/MC frame MMIE validation successful")); /* Remove MMIE */ - cdf_nbuf_trim_tail(wbuf, cds_get_mmie_size()); + qdf_nbuf_trim_tail(wbuf, cds_get_mmie_size()); } else { WMA_LOGE(FL("BC/MC MIC error or MMIE not present, dropping the frame")); return -EINVAL; @@ -3063,7 +3063,7 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle, struct wma_txrx_node *iface, struct ieee80211_frame *wh, cds_pkt_t *rx_pkt, - cdf_nbuf_t wbuf) + qdf_nbuf_t wbuf) { uint8_t *orig_hdr; uint8_t *ccmp; @@ -3076,7 +3076,7 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle, return -EINVAL; } - orig_hdr = (uint8_t *) cdf_nbuf_data(wbuf); + orig_hdr = (uint8_t *) qdf_nbuf_data(wbuf); /* Pointer to head of CCMP header */ ccmp = orig_hdr + sizeof(*wh); if (wma_is_ccmp_pn_replay_attack( @@ -3092,13 +3092,13 @@ int wma_process_rmf_frame(tp_wma_handle wma_handle, qdf_mem_move(orig_hdr + IEEE80211_CCMP_HEADERLEN, wh, sizeof(*wh)); - cdf_nbuf_pull_head(wbuf, + qdf_nbuf_pull_head(wbuf, IEEE80211_CCMP_HEADERLEN); - cdf_nbuf_trim_tail(wbuf, IEEE80211_CCMP_MICLEN); + qdf_nbuf_trim_tail(wbuf, IEEE80211_CCMP_MICLEN); rx_pkt->pkt_meta.mpdu_hdr_ptr = - cdf_nbuf_data(wbuf); - rx_pkt->pkt_meta.mpdu_len = cdf_nbuf_len(wbuf); + qdf_nbuf_data(wbuf); + rx_pkt->pkt_meta.mpdu_len = qdf_nbuf_len(wbuf); rx_pkt->pkt_meta.mpdu_data_len = rx_pkt->pkt_meta.mpdu_len - rx_pkt->pkt_meta.mpdu_hdr_len; @@ -3143,7 +3143,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, struct wma_txrx_node *iface = NULL; uint8_t vdev_id = WMA_INVALID_VDEV_ID; cds_pkt_t *rx_pkt; - cdf_nbuf_t wbuf; + qdf_nbuf_t wbuf; struct ieee80211_frame *wh; uint8_t mgt_type, mgt_subtype; int status; @@ -3217,7 +3217,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, rx_pkt->pkt_meta.roamCandidateInd = 0; /* Why not just use rx_event->hdr.buf_len? */ - wbuf = cdf_nbuf_alloc(NULL, roundup(hdr->buf_len, 4), 0, 4, false); + wbuf = qdf_nbuf_alloc(NULL, roundup(hdr->buf_len, 4), 0, 4, false); if (!wbuf) { WMA_LOGE("%s: Failed to allocate wbuf for mgmt rx len(%u)", __func__, hdr->buf_len); @@ -3225,11 +3225,11 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, return -ENOMEM; } - cdf_nbuf_put_tail(wbuf, hdr->buf_len); - cdf_nbuf_set_protocol(wbuf, ETH_P_CONTROL); - wh = (struct ieee80211_frame *)cdf_nbuf_data(wbuf); + qdf_nbuf_put_tail(wbuf, hdr->buf_len); + qdf_nbuf_set_protocol(wbuf, ETH_P_CONTROL); + wh = (struct ieee80211_frame *)qdf_nbuf_data(wbuf); - rx_pkt->pkt_meta.mpdu_hdr_ptr = cdf_nbuf_data(wbuf); + rx_pkt->pkt_meta.mpdu_hdr_ptr = qdf_nbuf_data(wbuf); rx_pkt->pkt_meta.mpdu_data_ptr = rx_pkt->pkt_meta.mpdu_hdr_ptr + rx_pkt->pkt_meta.mpdu_hdr_len; rx_pkt->pkt_meta.tsf_delta = hdr->tsf_delta; diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 52276cb0f47e..4330b4dede17 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -45,7 +45,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -154,7 +154,7 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, WMI_STA_POWERSAVE_PARAM_CMDID)) { WMA_LOGE("Set Sta Ps param Failed vdevId %d Param %d val %d", vdev_id, param, value); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } /* Store the PS Status */ @@ -578,7 +578,7 @@ int32_t wmi_unified_set_sta_ps(wmi_unified_t wmi_handle, WMI_STA_POWERSAVE_MODE_CMDID)) { WMA_LOGE("Set Sta Mode Ps Failed vdevId %d val %d", vdev_id, val); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return -EIO; } return 0; @@ -1526,7 +1526,7 @@ static void wma_update_beacon_noa_ie(struct beacon_info *bcn, } else { /* NoA is not present in previous beacon */ WMA_LOGD("%s: NoA not present in previous beacon, add it" "bcn->len %u", __func__, bcn->len); - buf = cdf_nbuf_data(bcn->buf); + buf = qdf_nbuf_data(bcn->buf); bcn->noa_ie = buf + bcn->len; } diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 138d4ea08961..8b270fd8beb5 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -46,7 +46,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -724,7 +724,7 @@ QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, return QDF_STATUS_SUCCESS; error: if (buf) - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); error1: return qdf_status; } @@ -3076,7 +3076,7 @@ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) __func__); if (is_add_ts) ((tAddTsParams *) msg)->status = QDF_STATUS_E_FAILURE; - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); } } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ @@ -3135,7 +3135,7 @@ void wma_process_unit_test_cmd(WMA_HANDLE handle, if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, WMI_UNIT_TEST_CMDID)) { WMA_LOGP("%s: failed to send unit test command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return; } return; @@ -3215,7 +3215,7 @@ void wma_process_roam_synch_complete(WMA_HANDLE handle, uint8_t vdev_id) WMI_ROAM_SYNCH_COMPLETE)) { WMA_LOGP("%s: failed to send roam synch confirmation", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return; } return; @@ -5405,7 +5405,7 @@ QDF_STATUS wma_start_extscan(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_START_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } wma->interfaces[pstart->sessionId].extscan_in_progress = true; @@ -5460,7 +5460,7 @@ QDF_STATUS wma_stop_extscan(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_EXTSCAN_STOP_CMDID)) { WMA_LOGE("%s: failed to command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } wma->interfaces[pstopcmd->sessionId].extscan_in_progress = false; @@ -5609,7 +5609,7 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } index = index + min_entries; @@ -5718,7 +5718,7 @@ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -5849,7 +5849,7 @@ QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); - cdf_nbuf_free(buf); + qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -5918,7 +5918,7 @@ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { WMA_LOGE("%s: failed to command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -5972,7 +5972,7 @@ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID)) { WMA_LOGE("%s: failed to command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -6024,7 +6024,7 @@ QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_EXTSCAN_GET_CAPABILITIES_CMDID)) { WMA_LOGE("%s: failed to command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -6531,7 +6531,7 @@ QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, WMI_SCAN_PROB_REQ_OUI_CMDID)) { WMA_LOGE("%s: failed to send command", __func__); - cdf_nbuf_free(wmi_buf); + qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 6f6af9b1ba98..fd54008db815 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -45,7 +45,7 @@ #include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" -#include "cdf_nbuf.h" +#include "qdf_nbuf.h" #include "qdf_types.h" #include "ol_txrx_api.h" #include "qdf_mem.h" @@ -2172,7 +2172,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) qdf_spin_lock_bh(&beacon->lock); - buf_size = cdf_nbuf_len(beacon->buf); + buf_size = qdf_nbuf_len(beacon->buf); buf = qdf_mem_malloc(buf_size); if (!buf) { @@ -2181,7 +2181,7 @@ void *wma_get_beacon_buffer_by_vdev_id(uint8_t vdev_id, uint32_t *buffer_size) return NULL; } - qdf_mem_copy(buf, cdf_nbuf_data(beacon->buf), buf_size); + qdf_mem_copy(buf, qdf_nbuf_data(beacon->buf), buf_size); qdf_spin_unlock_bh(&beacon->lock); diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index b081a5d5afd6..3d1d7ae351ba 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -177,7 +177,7 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name, return NULL; } - wmi_buf = cdf_nbuf_alloc_debug(NULL, + wmi_buf = qdf_nbuf_alloc_debug(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4), WMI_MIN_HEAD_ROOM, 4, false, file_name, line_num); @@ -186,19 +186,19 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name, return NULL; /* Clear the wmi buffer */ - OS_MEMZERO(cdf_nbuf_data(wmi_buf), len); + OS_MEMZERO(qdf_nbuf_data(wmi_buf), len); /* * Set the length of the buffer to match the allocation size. */ - cdf_nbuf_set_pktlen(wmi_buf, len); + qdf_nbuf_set_pktlen(wmi_buf, len); return wmi_buf; } void wmi_buf_free(wmi_buf_t net_buf) { - cdf_nbuf_free(net_buf); + qdf_nbuf_free(net_buf); } #else wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len) @@ -210,24 +210,24 @@ wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len) return NULL; } - wmi_buf = cdf_nbuf_alloc(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4), + wmi_buf = qdf_nbuf_alloc(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4), WMI_MIN_HEAD_ROOM, 4, false); if (!wmi_buf) return NULL; /* Clear the wmi buffer */ - OS_MEMZERO(cdf_nbuf_data(wmi_buf), len); + OS_MEMZERO(qdf_nbuf_data(wmi_buf), len); /* * Set the length of the buffer to match the allocation size. */ - cdf_nbuf_set_pktlen(wmi_buf, len); + qdf_nbuf_set_pktlen(wmi_buf, len); return wmi_buf; } void wmi_buf_free(wmi_buf_t net_buf) { - cdf_nbuf_free(net_buf); + qdf_nbuf_free(net_buf); } #endif @@ -813,7 +813,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, /* Do sanity check on the TLV parameter structure */ { - void *buf_ptr = (void *)cdf_nbuf_data(buf); + void *buf_ptr = (void *)qdf_nbuf_data(buf); if (wmitlv_check_command_tlv_params(NULL, buf_ptr, len, cmd_id) != 0) { @@ -824,13 +824,13 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, } } - if (cdf_nbuf_push_head(buf, sizeof(WMI_CMD_HDR)) == NULL) { + if (qdf_nbuf_push_head(buf, sizeof(WMI_CMD_HDR)) == NULL) { pr_err("%s, Failed to send cmd %x, no memory\n", __func__, cmd_id); return -ENOMEM; } - WMI_SET_FIELD(cdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id); + WMI_SET_FIELD(qdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id); qdf_atomic_inc(&wmi_handle->pending_cmds); if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { @@ -854,7 +854,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, SET_HTC_PACKET_INFO_TX(pkt, NULL, - cdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR), + qdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR), /* htt_host_data_dl_len(buf)+20 */ wmi_handle->wmi_endpoint_id, htc_tag); @@ -867,9 +867,9 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, /*Record 16 bytes of WMI cmd data - exclude TLV and WMI headers */ if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { WMI_MGMT_COMMAND_RECORD(cmd_id, - ((uint32_t *)cdf_nbuf_data(buf) + 2)); + ((uint32_t *)qdf_nbuf_data(buf) + 2)); } else { - WMI_COMMAND_RECORD(cmd_id, ((uint32_t *) cdf_nbuf_data(buf) + + WMI_COMMAND_RECORD(cmd_id, ((uint32_t *) qdf_nbuf_data(buf) + 2)); } @@ -956,9 +956,9 @@ static int wmi_unified_event_rx(struct wmi_unified *wmi_handle, ASSERT(evt_buf != NULL); - id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); + id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - if (cdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) + if (qdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) goto end; idx = wmi_unified_get_event_handler_ix(wmi_handle, id); @@ -968,15 +968,15 @@ static int wmi_unified_event_rx(struct wmi_unified *wmi_handle, goto end; } - event = cdf_nbuf_data(evt_buf); - len = cdf_nbuf_len(evt_buf); + event = qdf_nbuf_data(evt_buf); + len = qdf_nbuf_len(evt_buf); /* Call the WMI registered event handler */ status = wmi_handle->event_handler[idx] (wmi_handle->scn_handle, event, len); end: - cdf_nbuf_free(evt_buf); + qdf_nbuf_free(evt_buf); return status; } #endif /* 0 */ @@ -1024,15 +1024,15 @@ static void wmi_process_fw_event_worker_thread_ctx uint8_t *data; evt_buf = (wmi_buf_t) htc_packet->pPktContext; - id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - data = cdf_nbuf_data(evt_buf); + id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); + data = qdf_nbuf_data(evt_buf); qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); /* Exclude 4 bytes of TLV header */ WMI_RX_EVENT_RECORD(id, ((uint8_t *) data + 4)); qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); qdf_spin_lock_bh(&wmi_handle->eventq_lock); - cdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf); + qdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf); qdf_spin_unlock_bh(&wmi_handle->eventq_lock); schedule_work(&wmi_handle->rx_event_work); return; @@ -1049,7 +1049,7 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet) uint32_t id; evt_buf = (wmi_buf_t) htc_packet->pPktContext; - id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); + id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); switch (id) { /*Event will be handled in tasklet ctx*/ case WMI_TX_PAUSE_EVENTID: @@ -1090,13 +1090,13 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) void *wmi_cmd_struct_ptr = NULL; int tlv_ok_status = 0; - id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); + id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - if (cdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) + if (qdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) goto end; - data = cdf_nbuf_data(evt_buf); - len = cdf_nbuf_len(evt_buf); + data = qdf_nbuf_data(evt_buf); + len = qdf_nbuf_len(evt_buf); /* Validate and pad(if necessary) the TLVs */ tlv_ok_status = wmitlv_check_and_pad_event_tlvs(wmi_handle->scn_handle, @@ -1164,7 +1164,7 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) } end: wmitlv_free_allocated_event_tlvs(id, &wmi_cmd_struct_ptr); - cdf_nbuf_free(evt_buf); + qdf_nbuf_free(evt_buf); } void wmi_rx_event_work(struct work_struct *work) @@ -1174,12 +1174,12 @@ void wmi_rx_event_work(struct work_struct *work) wmi_buf_t buf; qdf_spin_lock_bh(&wmi->eventq_lock); - buf = cdf_nbuf_queue_remove(&wmi->event_queue); + buf = qdf_nbuf_queue_remove(&wmi->event_queue); qdf_spin_unlock_bh(&wmi->eventq_lock); while (buf) { __wmi_control_rx(wmi, buf); qdf_spin_lock_bh(&wmi->eventq_lock); - buf = cdf_nbuf_queue_remove(&wmi->event_queue); + buf = qdf_nbuf_queue_remove(&wmi->event_queue); qdf_spin_unlock_bh(&wmi->eventq_lock); } } @@ -1219,7 +1219,7 @@ void *wmi_unified_attach(ol_scn_t scn_handle, qdf_atomic_init(&wmi_handle->is_target_suspended); wmi_runtime_pm_init(wmi_handle); qdf_spinlock_create(&wmi_handle->eventq_lock); - cdf_nbuf_queue_init(&wmi_handle->event_queue); + qdf_nbuf_queue_init(&wmi_handle->event_queue); #ifdef CONFIG_CNSS cnss_init_work(&wmi_handle->rx_event_work, wmi_rx_event_work); #else @@ -1238,10 +1238,10 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle) cds_flush_work(&wmi_handle->rx_event_work); qdf_spin_lock_bh(&wmi_handle->eventq_lock); - buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); + buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); while (buf) { - cdf_nbuf_free(buf); - buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); + qdf_nbuf_free(buf); + buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); } qdf_spin_unlock_bh(&wmi_handle->eventq_lock); if (wmi_handle != NULL) { @@ -1270,10 +1270,10 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle) "Enter: %s", __func__); cds_flush_work(&wmi_handle->rx_event_work); qdf_spin_lock_bh(&wmi_handle->eventq_lock); - buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); + buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); while (buf) { - cdf_nbuf_free(buf); - buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue); + qdf_nbuf_free(buf); + buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); } qdf_spin_unlock_bh(&wmi_handle->eventq_lock); QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, @@ -1290,7 +1290,7 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) ASSERT(wmi_cmd_buf); #ifdef WMI_INTERFACE_EVENT_LOGGING - cmd_id = WMI_GET_FIELD(cdf_nbuf_data(wmi_cmd_buf), + cmd_id = WMI_GET_FIELD(qdf_nbuf_data(wmi_cmd_buf), WMI_CMD_HDR, COMMANDID); #ifdef QCA_WIFI_3_0_EMU @@ -1303,15 +1303,15 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) - exclude TLV and WMI headers */ if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { WMI_MGMT_COMMAND_TX_CMP_RECORD(cmd_id, - ((uint32_t *) cdf_nbuf_data(wmi_cmd_buf) + 2)); + ((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2)); } else { WMI_COMMAND_TX_CMP_RECORD(cmd_id, - ((uint32_t *) cdf_nbuf_data(wmi_cmd_buf) + 2)); + ((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2)); } qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); #endif - cdf_nbuf_free(wmi_cmd_buf); + qdf_nbuf_free(wmi_cmd_buf); qdf_mem_free(htc_pkt); qdf_atomic_dec(&wmi_handle->pending_cmds); } diff --git a/core/wmi/wmi_unified_api.h b/core/wmi/wmi_unified_api.h index f96c128aa19d..a995e04ab88b 100644 --- a/core/wmi/wmi_unified_api.h +++ b/core/wmi/wmi_unified_api.h @@ -38,8 +38,8 @@ #include "wmi.h" #include "htc_api.h" -typedef cdf_nbuf_t wmi_buf_t; -#define wmi_buf_data(_buf) cdf_nbuf_data(_buf) +typedef qdf_nbuf_t wmi_buf_t; +#define wmi_buf_data(_buf) qdf_nbuf_data(_buf) /** * attach for unified WMI diff --git a/core/wmi/wmi_unified_priv.h b/core/wmi/wmi_unified_priv.h index 9c46dce1437e..a508c828cdf4 100644 --- a/core/wmi/wmi_unified_priv.h +++ b/core/wmi/wmi_unified_priv.h @@ -39,7 +39,7 @@ #define WMI_UNIFIED_MAX_EVENT 0x100 #define WMI_MAX_CMDS 1024 -typedef cdf_nbuf_t wmi_buf_t; +typedef qdf_nbuf_t wmi_buf_t; #ifdef WMI_INTERFACE_EVENT_LOGGING @@ -77,7 +77,7 @@ struct wmi_unified { uint32_t max_event_idx; void *htc_handle; qdf_spinlock_t eventq_lock; - cdf_nbuf_queue_t event_queue; + qdf_nbuf_queue_t event_queue; struct work_struct rx_event_work; #ifdef WLAN_OPEN_SOURCE struct fwdebug dbglog; -- cgit v1.2.3 From f04e84f24a4c532e5a4fe553c058153a2aabec8b Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Thu, 3 Mar 2016 10:12:12 +0530 Subject: qcacld-3.0: Add qdf references in place of cdf Replace CDF references with QDF references. Change-Id: Ifb4571174719b5fce61dd305545d05628265f317 CRs-Fixed: 981188 --- core/bmi/inc/bmi.h | 2 +- core/bmi/src/bmi.c | 28 ++-- core/bmi/src/bmi_1.c | 10 +- core/bmi/src/bmi_2.c | 10 +- core/bmi/src/i_bmi.h | 4 +- core/bmi/src/ol_fw.c | 6 +- core/cds/inc/cds_concurrency.h | 8 +- core/cds/inc/cds_mq.h | 4 +- core/cds/inc/cds_sched.h | 12 +- core/cds/src/cds_api.c | 34 ++-- core/cds/src/cds_concurrency.c | 104 ++++++------ core/cds/src/cds_mq.c | 10 +- core/cds/src/cds_packet.c | 12 +- core/cds/src/cds_sched.c | 6 +- core/cds/src/cds_utils.c | 6 +- core/dp/htt/htt_internal.h | 22 +-- core/dp/htt/htt_rx.c | 32 ++-- core/dp/htt/htt_tx.c | 10 +- core/dp/htt/htt_types.h | 2 +- core/dp/ol/inc/ol_txrx_ctrl_api.h | 2 +- core/dp/txrx/ol_rx_reorder.c | 2 +- core/dp/txrx/ol_tx.c | 20 +-- core/dp/txrx/ol_tx_desc.c | 8 +- core/dp/txrx/ol_tx_desc.h | 4 +- core/dp/txrx/ol_tx_send.c | 2 +- core/dp/txrx/ol_txrx_flow_control.c | 2 +- core/dp/txrx/ol_txrx_internal.h | 2 +- core/dp/txrx/ol_txrx_types.h | 8 +- core/hdd/inc/wlan_hdd_cfg.h | 94 +++++------ core/hdd/inc/wlan_hdd_main.h | 6 +- core/hdd/inc/wlan_hdd_wext.h | 4 +- core/hdd/src/wlan_hdd_assoc.c | 42 ++--- core/hdd/src/wlan_hdd_cfg.c | 178 ++++++++++----------- core/hdd/src/wlan_hdd_cfg80211.c | 50 +++--- core/hdd/src/wlan_hdd_driver_ops.c | 18 +-- core/hdd/src/wlan_hdd_ftm.c | 18 +-- core/hdd/src/wlan_hdd_green_ap.c | 4 +- core/hdd/src/wlan_hdd_hostapd.c | 64 ++++---- core/hdd/src/wlan_hdd_ioctl.c | 36 ++--- core/hdd/src/wlan_hdd_lro.c | 21 +-- core/hdd/src/wlan_hdd_main.c | 128 +++++++-------- core/hdd/src/wlan_hdd_memdump.c | 16 +- core/hdd/src/wlan_hdd_ocb.c | 4 +- core/hdd/src/wlan_hdd_power.c | 40 ++--- core/hdd/src/wlan_hdd_scan.c | 2 +- core/hdd/src/wlan_hdd_softap_tx_rx.c | 12 +- core/hdd/src/wlan_hdd_tdls.c | 36 ++--- core/hdd/src/wlan_hdd_wext.c | 34 ++-- core/hdd/src/wlan_hdd_wowl.c | 52 +++--- core/mac/src/pe/lim/lim_api.c | 2 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 4 +- core/mac/src/pe/sch/sch_debug.c | 6 +- .../src/sys/legacy/src/platform/inc/sys_wrapper.h | 2 +- .../src/sys/legacy/src/platform/src/sys_wrapper.c | 20 +-- core/mac/src/sys/legacy/src/utils/src/log_api.c | 10 +- core/sap/dfs/inc/dfs.h | 2 +- core/sap/inc/sap_api.h | 2 +- core/sap/src/sap_api_link_cntl.c | 42 ++--- core/sap/src/sap_ch_select.c | 2 +- core/sap/src/sap_fsm.c | 38 ++--- core/sap/src/sap_module.c | 74 ++++----- core/sme/src/common/sme_api.c | 26 +-- core/sme/src/csr/csr_api_roam.c | 12 +- core/sme/src/csr/csr_api_scan.c | 2 +- core/sme/src/csr/csr_inside_api.h | 2 +- core/sme/src/csr/csr_neighbor_roam.c | 6 +- core/sme/src/csr/csr_util.c | 8 +- core/sme/src/qos/sme_qos.c | 12 +- core/sme/src/rrm/sme_rrm.c | 8 +- core/utils/epping/inc/epping_internal.h | 2 +- core/utils/epping/src/epping_helper.c | 8 +- core/utils/epping/src/epping_txrx.c | 2 +- core/utils/logging/src/wlan_logging_sock_svc.c | 2 +- core/wma/inc/wma.h | 2 +- core/wma/inc/wma_if.h | 10 +- core/wma/src/wma_data.c | 32 ++-- core/wma/src/wma_dev_if.c | 6 +- core/wma/src/wma_features.c | 88 +++++----- core/wma/src/wma_main.c | 21 +-- core/wma/src/wma_mgmt.c | 14 +- core/wma/src/wma_scan_roam.c | 62 +++---- 82 files changed, 885 insertions(+), 877 deletions(-) diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index 538ed0be99b7..1c7931738555 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -38,7 +38,7 @@ #include "hif.h" struct ol_context; -QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx); +QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx); void ol_cds_free(void); /** diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index 36b44c976f3a..d9de534cd0d4 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -60,7 +60,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); struct hif_opaque_softc *scn = ol_ctx->scn; - qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t qdf_dev = ol_ctx->qdf_dev; if (!scn) { BMI_ERR("Invalid scn Context"); @@ -68,7 +68,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) return QDF_STATUS_NOT_INITIALIZED; } - if (!cdf_dev->dev) { + if (!qdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); return QDF_STATUS_NOT_INITIALIZED; } @@ -77,7 +77,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!info->bmi_cmd_buff) { info->bmi_cmd_buff = - qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ, &info->bmi_cmd_da); if (!info->bmi_cmd_buff) { BMI_ERR("No Memory for BMI Command"); @@ -87,7 +87,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) if (!info->bmi_rsp_buff) { info->bmi_rsp_buff = - qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ, &info->bmi_rsp_da); if (!info->bmi_rsp_buff) { BMI_ERR("No Memory for BMI Response"); @@ -96,7 +96,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx) } return QDF_STATUS_SUCCESS; end: - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; return QDF_STATUS_E_NOMEM; @@ -105,22 +105,24 @@ end: void bmi_cleanup(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); - qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t qdf_dev = ol_ctx->qdf_dev; - if (!cdf_dev->dev) { + if (!qdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); return; } if (info->bmi_cmd_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; @@ -517,12 +519,12 @@ end: /** * ol_cds_init() - API to initialize global CDS OL Context - * @cdf_dev: QDF Device + * @qdf_dev: QDF Device * @hif_ctx: HIF Context * * Return: Success/Failure */ -QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx) +QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx) { struct ol_context *ol_info; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -539,11 +541,11 @@ QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx) return status; } - ol_info->cdf_dev = cdf_dev; + ol_info->qdf_dev = qdf_dev; ol_info->scn = hif_ctx; ol_info->tgt_def.targetdef = hif_get_targetdef(hif_ctx); - qdf_create_work(cdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info); + qdf_create_work(qdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info); return status; } diff --git a/core/bmi/src/bmi_1.c b/core/bmi/src/bmi_1.c index df51f625f6eb..2b475f5e4c03 100644 --- a/core/bmi/src/bmi_1.c +++ b/core/bmi/src/bmi_1.c @@ -289,7 +289,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) int status; uint32_t cid; struct bmi_info *info; - qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t qdf_dev = ol_ctx->qdf_dev; qdf_dma_addr_t cmd, rsp; if (!scn) { @@ -298,7 +298,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) return QDF_STATUS_NOT_INITIALIZED; } - if (!cdf_dev->dev) { + if (!qdf_dev->dev) { BMI_ERR("%s: Invalid device pointer", __func__); return QDF_STATUS_NOT_INITIALIZED; } @@ -333,14 +333,16 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx) } if (info->bmi_cmd_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c index 9c1929b476fb..59c6dd605461 100644 --- a/core/bmi/src/bmi_2.c +++ b/core/bmi/src/bmi_2.c @@ -88,7 +88,7 @@ bmi_done_local(struct ol_context *ol_ctx) struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); uint8_t *bmi_cmd_buff = info->bmi_cmd_buff; uint8_t *bmi_rsp_buff = info->bmi_rsp_buff; - qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t qdf_dev = ol_ctx->qdf_dev; qdf_dma_addr_t cmd = info->bmi_cmd_da; qdf_dma_addr_t rsp = info->bmi_rsp_da; @@ -102,7 +102,7 @@ bmi_done_local(struct ol_context *ol_ctx) return QDF_STATUS_NOT_INITIALIZED; } - if (!cdf_dev->dev) { + if (!qdf_dev->dev) { BMI_ERR("%s Invalid Device pointer", __func__); return QDF_STATUS_NOT_INITIALIZED; } @@ -127,14 +127,16 @@ bmi_done_local(struct ol_context *ol_ctx) } if (info->bmi_cmd_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_cmd_buff, info->bmi_cmd_da, 0); info->bmi_cmd_buff = NULL; info->bmi_cmd_da = 0; } if (info->bmi_rsp_buff) { - qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ, + qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, + MAX_BMI_CMDBUF_SZ, info->bmi_rsp_buff, info->bmi_rsp_da, 0); info->bmi_rsp_buff = NULL; info->bmi_rsp_da = 0; diff --git a/core/bmi/src/i_bmi.h b/core/bmi/src/i_bmi.h index 23f5936e2ac0..ae92ca97f93b 100644 --- a/core/bmi/src/i_bmi.h +++ b/core/bmi/src/i_bmi.h @@ -146,7 +146,7 @@ struct bmi_info { * struct ol_context - Structure to hold OL context * @bmi: BMI info * @cal_in_flash: For Firmware Flash Download - * @cdf_dev: QDF Device + * @qdf_dev: QDF Device * @scn: HIF Context * @ramdump_work: WorkQueue for Ramdump collection * @tgt_def: Target Defnition pointer @@ -157,7 +157,7 @@ struct ol_context { struct bmi_info bmi; struct ol_config_info cfg_info; uint8_t *cal_in_flash; - qdf_device_t cdf_dev; + qdf_device_t qdf_dev; qdf_work_t ramdump_work; struct hif_opaque_softc *scn; struct targetdef_t { diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index 42438da81f51..d1980f47baf6 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -151,7 +151,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, struct hif_target_info *tgt_info = hif_get_target_info_handle(scn); uint32_t target_type = tgt_info->target_type; struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx); - qdf_device_t cdf_dev = ol_ctx->cdf_dev; + qdf_device_t qdf_dev = ol_ctx->qdf_dev; switch (file) { default: @@ -251,7 +251,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, break; } - if (request_firmware(&fw_entry, filename, cdf_dev->dev) != 0) { + if (request_firmware(&fw_entry, filename, qdf_dev->dev) != 0) { BMI_ERR("%s: Failed to get %s", __func__, filename); if (file == ATH_OTP_FILE) @@ -265,7 +265,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file, BMI_INFO("%s: Trying to load default %s", __func__, filename); if (request_firmware(&fw_entry, filename, - cdf_dev->dev) != 0) { + qdf_dev->dev) != 0) { BMI_ERR("%s: Failed to get %s", __func__, filename); return -1; diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index aca9537316c6..f01ee4c6f986 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -650,8 +650,8 @@ void cds_clear_concurrent_session_count(void); bool cds_is_multiple_active_sta_sessions(void); bool cds_is_sta_active_connection_exists(void); bool cds_concurrent_beaconing_sessions_running(void); -QDF_STATUS cdf_wait_for_connection_update(void); -QDF_STATUS cdf_reset_connection_update(void); -QDF_STATUS cdf_set_connection_update(void); -QDF_STATUS cdf_init_connection_update(void); +QDF_STATUS qdf_wait_for_connection_update(void); +QDF_STATUS qdf_reset_connection_update(void); +QDF_STATUS qdf_set_connection_update(void); +QDF_STATUS qdf_init_connection_update(void); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h index ab8c4d36dd48..09cda349e18e 100644 --- a/core/cds/inc/cds_mq.h +++ b/core/cds/inc/cds_mq.h @@ -32,7 +32,7 @@ \file cds_mq.h - \brief virtual Operating System Services (CDF) message queue APIs + \brief virtual Operating System Services (QDF) message queue APIs Message Queue Definitions and API @@ -123,7 +123,7 @@ typedef enum { will be posted. \param message - a pointer to a message buffer. Memory for this message - buffer is allocated by the caller and free'd by the CDF after the + buffer is allocated by the caller and free'd by the QDF after the message is posted to the message queue. If the consumer of the message needs anything in this message, it needs to copy the contents before returning from the message queue handler. diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 652e63e79165..6a1bb7eb009f 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -87,7 +87,7 @@ typedef void (*cds_ol_rx_thread_cb)(void *context, void *rxpkt, uint16_t staid); #endif /* -** CDF Message queue definition. +** QDF Message queue definition. */ typedef struct _cds_mq_type { /* Lock use to synchronize access to this message queue */ @@ -242,7 +242,7 @@ typedef struct _cds_context_type { cds_mq_type freeVosMq; /* Scheduler Context */ - cds_sched_context cdf_sched; + cds_sched_context qdf_sched; /* HDD Module Context */ void *pHDDContext; @@ -265,7 +265,7 @@ typedef struct _cds_context_type { void *g_ol_context; /* - * qdf_ctx will be used by cdf + * qdf_ctx will be used by qdf * while allocating dma memory * to access dev information. */ @@ -285,7 +285,7 @@ typedef struct _cds_context_type { struct cds_log_complete log_complete; qdf_spinlock_t bug_report_lock; qdf_event_t connection_update_done_evt; - qdf_mutex_t cdf_conc_list_lock; + qdf_mutex_t qdf_conc_list_lock; } cds_context_type, *p_cds_contextType; @@ -369,7 +369,7 @@ void cds_free_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext); - The Tx thread is created and ready to receive and dispatch messages - \param p_cds_context - pointer to the global CDF Context + \param p_cds_context - pointer to the global QDF Context \param p_cds_sched_context - pointer to a previously allocated buffer big enough to hold a scheduler context. @@ -407,7 +407,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context, - The Tx thread is closed - \param p_cds_context - pointer to the global CDF Context + \param p_cds_context - pointer to the global QDF Context \return QDF_STATUS_SUCCESS - Scheduler was successfully initialized and is ready to be used. diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index b63acbec1460..206f396498e4 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -162,7 +162,7 @@ static void cds_set_nan_enable(tMacOpenParameters *param, * - All the WLAN SW components should have been opened. This includes * SYS, MAC, SME, WMA and TL. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_open(void) { @@ -228,7 +228,7 @@ QDF_STATUS cds_open(void) } /* Now Open the CDS Scheduler */ - qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, + qdf_status = cds_sched_open(gp_cds_context, &gp_cds_context->qdf_sched, sizeof(cds_sched_context)); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -482,7 +482,7 @@ err_probe_event: * cds_pre_enable() - pre enable cds * @cds_context: CDS context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) { @@ -588,7 +588,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) * cds_enable() - start/enable cds module * @cds_context: CDS context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) { @@ -714,7 +714,7 @@ err_wma_stop: * cds_disable() - stop/disable cds module * @cds_context: CDS context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) { @@ -753,7 +753,7 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) * cds_close() - close cds module * @cds_context: CDS context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_close(v_CONTEXT_t cds_context) { @@ -1036,7 +1036,7 @@ void cds_clear_driver_state(enum cds_driver_state state) * This API allows any user to allocate a user context area within the * CDS Global Context. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, void **ppModuleContext, uint32_t size) @@ -1165,7 +1165,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) * This API allows a user to free the user context area within the * CDS Global Context. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, void *pModuleContext) @@ -1248,12 +1248,12 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, * @msgQueueId: identifies the message queue upon which the message * will be posted. * @message: a pointer to a message buffer. Memory for this message - * buffer is allocated by the caller and free'd by the CDF after the + * buffer is allocated by the caller and free'd by the QDF after the * message is posted to the message queue. If the consumer of the * message needs anything in this message, it needs to copy the contents * before returning from the message queue handler. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) { @@ -1273,28 +1273,28 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) /* Message Queue ID for messages bound for SME */ case CDS_MQ_ID_SME: { - pTargetMq = &(gp_cds_context->cdf_sched.smeMcMq); + pTargetMq = &(gp_cds_context->qdf_sched.smeMcMq); break; } /* Message Queue ID for messages bound for PE */ case CDS_MQ_ID_PE: { - pTargetMq = &(gp_cds_context->cdf_sched.peMcMq); + pTargetMq = &(gp_cds_context->qdf_sched.peMcMq); break; } /* Message Queue ID for messages bound for wma */ case CDS_MQ_ID_WMA: { - pTargetMq = &(gp_cds_context->cdf_sched.wmaMcMq); + pTargetMq = &(gp_cds_context->qdf_sched.wmaMcMq); break; } /* Message Queue ID for messages bound for the SYS module */ case CDS_MQ_ID_SYS: { - pTargetMq = &(gp_cds_context->cdf_sched.sysMcMq); + pTargetMq = &(gp_cds_context->qdf_sched.sysMcMq); break; } @@ -1337,8 +1337,8 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg) cds_mq_put(pTargetMq, pMsgWrapper); - set_bit(MC_POST_EVENT_MASK, &gp_cds_context->cdf_sched.mcEventFlag); - wake_up_interruptible(&gp_cds_context->cdf_sched.mcWaitQueue); + set_bit(MC_POST_EVENT_MASK, &gp_cds_context->qdf_sched.mcEventFlag); + wake_up_interruptible(&gp_cds_context->qdf_sched.mcWaitQueue); return QDF_STATUS_SUCCESS; } /* cds_mq_post_message() */ @@ -1425,7 +1425,7 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper) * cds_shutdown() - shutdown CDS * @cds_context: global cds context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context) { diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 5423e0efb947..248b4929372d 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2203,7 +2203,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries, return; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); for (i = 0; i < num_vdev_mac_entries; i++) { conn_index = 0; found = 0; @@ -2236,7 +2236,7 @@ static void cds_update_hw_mode_conn_info(uint32_t num_vdev_mac_entries, conc_connection_list[conn_index].rx_spatial_stream); } } - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); } /** @@ -2432,7 +2432,7 @@ static void cds_soc_set_hw_mode_cb(uint32_t status, vdev_mac_map, hw_mode); - ret = cdf_set_connection_update(); + ret = qdf_set_connection_update(); if (!QDF_IS_STATUS_SUCCESS(ret)) cds_err("ERROR: set connection_update_done event failed"); @@ -3533,7 +3533,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, * Need to aquire mutex as entire functionality in this function * is in critical section */ - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); switch (mode) { case QDF_STA_MODE: case QDF_P2P_CLIENT_MODE: @@ -3558,7 +3558,7 @@ void cds_incr_active_session(enum tQDF_ADAPTER_MODE mode, cds_info("Set PCL of STA to FW"); } cds_incr_connection_count(session_id); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); } /** @@ -3716,7 +3716,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, * given to the FW. After setting the PCL, we need to restore * the entry that we have saved before. */ - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); cds_set_pcl_for_existing_combo(CDS_STA_MODE); /* do we need to change the HW mode */ if (cds_need_opportunistic_upgrade()) { @@ -3729,7 +3729,7 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, if (!QDF_IS_STATUS_SUCCESS(qdf_status)) cds_err("Failed to start dbs opportunistic timer"); } - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return; } @@ -3768,7 +3768,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, * Need to aquire mutex as entire functionality in this function * is in critical section */ - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); switch (mode) { case QDF_STA_MODE: case QDF_P2P_CLIENT_MODE: @@ -3784,7 +3784,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, cds_info("No.# of active sessions for mode %d = %d", mode, hdd_ctx->no_of_active_sessions[mode]); cds_decr_connection_count(session_id); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); } /** @@ -3807,7 +3807,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) return; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); /* if we still need it */ action = cds_need_opportunistic_upgrade(); if (action) { @@ -3819,7 +3819,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) cds_next_actions(0, action, CDS_UPDATE_REASON_OPPORTUNISTIC); } - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); } @@ -3841,8 +3841,8 @@ QDF_STATUS cds_deinit_policy_mgr(void) return QDF_STATUS_E_FAILURE; } if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy( - &cds_ctx->cdf_conc_list_lock))) { - cds_err("Failed to destroy cdf_conc_list_lock"); + &cds_ctx->qdf_conc_list_lock))) { + cds_err("Failed to destroy qdf_conc_list_lock"); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -3880,8 +3880,8 @@ QDF_STATUS cds_init_policy_mgr(void) qdf_mem_zero(conc_connection_list, sizeof(conc_connection_list)); if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create( - &cds_ctx->cdf_conc_list_lock))) { - cds_err("Failed to init cdf_conc_list_lock"); + &cds_ctx->qdf_conc_list_lock))) { + cds_err("Failed to init qdf_conc_list_lock"); /* Lets us not proceed further */ return QDF_STATUS_E_FAILURE; } @@ -3897,7 +3897,7 @@ QDF_STATUS cds_init_policy_mgr(void) return status; } - status = cdf_init_connection_update(); + status = qdf_init_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("connection_update_done_evt init failed"); return status; @@ -4093,7 +4093,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) return status; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) { if (vdev_id == conc_connection_list[conn_index].vdev_id) { /* debug msg */ @@ -4104,7 +4104,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) } if (!found) { /* err msg */ - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); cds_err("can't find vdev_id %d in conc_connection_list", vdev_id); return status; @@ -4114,7 +4114,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) if (NULL == wma_conn_table_entry) { /* err msg*/ - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); cds_err("can't find vdev_id %d in WMA table", vdev_id); return status; } @@ -4129,7 +4129,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) wma_conn_table_entry->tx_streams, wma_conn_table_entry->rx_streams, wma_conn_table_entry->nss, vdev_id, true); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -4878,7 +4878,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, return status; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); /* find the current connection state from conc_connection_list*/ num_connections = cds_get_connection_count(); @@ -5065,7 +5065,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, status = true; done: - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return status; } @@ -5572,7 +5572,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id, else band = CDS_BAND_5; - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); num_connections = cds_get_connection_count(); cds_debug("num_connections=%d channel=%d", @@ -5629,7 +5629,7 @@ QDF_STATUS cds_current_connections_update(uint32_t session_id, reason, session_id); done: - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return status; } @@ -5721,10 +5721,10 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, /* * Check if we are ok to request for HW mode change now */ - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); conn_index = cds_get_connection_for_vdev_id(vdev_id); if (MAX_NUMBER_OF_CONC_CONNECTIONS == conn_index) { - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); cds_err("connection not found for vdev %d", vdev_id); return; } @@ -5747,7 +5747,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, cds_next_actions(vdev_id, next_action, CDS_UPDATE_REASON_NSS_UPDATE); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return; } @@ -6584,7 +6584,7 @@ QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) return QDF_STATUS_E_FAILURE; } - status = cdf_reset_connection_update(); + status = qdf_reset_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) cds_err("clearing event failed"); @@ -6692,7 +6692,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) uint16_t intf_ch = 0; if ((hdd_ctx->config->WlanMccToSccSwitchMode == - CDF_MCC_TO_SCC_SWITCH_DISABLE) + QDF_MCC_TO_SCC_SWITCH_DISABLE) || !(cds_concurrent_open_sessions_running() || !(cds_get_concurrency_mode() == (QDF_STA_MASK | QDF_SAP_MASK)))) @@ -6745,7 +6745,7 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, } if ((hdd_ctx->config->WlanMccToSccSwitchMode - != CDF_MCC_TO_SCC_SWITCH_DISABLE) && + != QDF_MCC_TO_SCC_SWITCH_DISABLE) && ((0 == hdd_ctx->config->conc_custom_rule1) && (0 == hdd_ctx->config->conc_custom_rule2)) #ifdef FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE @@ -7053,7 +7053,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, */ QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal; cds_info("UPDATE Beacon Params"); @@ -7064,11 +7064,11 @@ QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) cds_err("Hal ctx is null"); return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_change_mcc_beacon_interval(hHal, pHostapdAdapter-> sessionId); - if (cdf_ret_status == QDF_STATUS_E_FAILURE) { + if (qdf_ret_status == QDF_STATUS_E_FAILURE) { cds_err("Failed to update Beacon Params"); return QDF_STATUS_E_FAILURE; } @@ -7289,11 +7289,11 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) #endif hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); - qdf_event_reset(&hostapd_state->cdf_stop_bss_event); + qdf_event_reset(&hostapd_state->qdf_stop_bss_event); if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) { qdf_status = qdf_wait_single_event(&hostapd_state-> - cdf_stop_bss_event, + qdf_stop_bss_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -7322,7 +7322,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) cds_info("Waiting for SAP to start"); qdf_status = - qdf_wait_single_event(&hostapd_state->cdf_event, + qdf_wait_single_event(&hostapd_state->qdf_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { cds_err("SAP Start failed"); @@ -7404,7 +7404,7 @@ QDF_STATUS cds_update_connection_info_utfw( return status; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) { if (vdev_id == conc_connection_list[conn_index].vdev_id) { /* debug msg */ @@ -7415,7 +7415,7 @@ QDF_STATUS cds_update_connection_info_utfw( } if (!found) { /* err msg */ - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); cds_err("can't find vdev_id %d in conc_connection_list", vdev_id); return status; @@ -7426,7 +7426,7 @@ QDF_STATUS cds_update_connection_info_utfw( cds_get_mode(type, sub_type), channelid, mac_id, chain_mask, tx_streams, rx_streams, 0, vdev_id, true); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -7453,11 +7453,11 @@ QDF_STATUS cds_incr_connection_count_utfw( return status; } - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); conn_index = cds_get_connection_count(); if (MAX_NUMBER_OF_CONC_CONNECTIONS <= conn_index) { /* err msg */ - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); cds_err("exceeded max connection limit %d", MAX_NUMBER_OF_CONC_CONNECTIONS); return status; @@ -7468,7 +7468,7 @@ QDF_STATUS cds_incr_connection_count_utfw( cds_get_mode(type, sub_type), channelid, mac_id, chain_mask, tx_streams, rx_streams, 0, vdev_id, true); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return QDF_STATUS_SUCCESS; } @@ -7492,9 +7492,9 @@ QDF_STATUS cds_decr_connection_count_utfw(uint32_t del_all, return QDF_STATUS_E_FAILURE; } } else { - qdf_mutex_acquire(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); cds_decr_connection_count(vdev_id); - qdf_mutex_release(&cds_ctx->cdf_conc_list_lock); + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); } return QDF_STATUS_SUCCESS; @@ -7735,14 +7735,14 @@ bool cds_is_sta_active_connection_exists(void) } /** - * cdf_wait_for_connection_update() - Wait for hw mode command to get processed + * qdf_wait_for_connection_update() - Wait for hw mode command to get processed * * Waits for CONNECTION_UPDATE_TIMEOUT duration until the set hw mode * response sets the event connection_update_done_evt * * Return: QDF_STATUS */ -QDF_STATUS cdf_wait_for_connection_update(void) +QDF_STATUS qdf_wait_for_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7766,13 +7766,13 @@ QDF_STATUS cdf_wait_for_connection_update(void) } /** - * cdf_reset_connection_update() - Reset connection update event + * qdf_reset_connection_update() - Reset connection update event * * Resets the concurrent connection update event * * Return: QDF_STATUS */ -QDF_STATUS cdf_reset_connection_update(void) +QDF_STATUS qdf_reset_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7794,13 +7794,13 @@ QDF_STATUS cdf_reset_connection_update(void) } /** - * cdf_set_connection_update() - Set connection update event + * qdf_set_connection_update() - Set connection update event * * Sets the concurrent connection update event * * Return: QDF_STATUS */ -QDF_STATUS cdf_set_connection_update(void) +QDF_STATUS qdf_set_connection_update(void) { QDF_STATUS status; p_cds_contextType cds_context; @@ -7822,13 +7822,13 @@ QDF_STATUS cdf_set_connection_update(void) } /** - * cdf_init_connection_update() - Initialize connection update event + * qdf_init_connection_update() - Initialize connection update event * * Initializes the concurrent connection update event * * Return: QDF_STATUS */ -QDF_STATUS cdf_init_connection_update(void) +QDF_STATUS qdf_init_connection_update(void) { QDF_STATUS qdf_status; p_cds_contextType cds_context; diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c index 95b30cf6911b..cce2de9dc8e8 100644 --- a/core/cds/src/cds_mq.c +++ b/core/cds/src/cds_mq.c @@ -53,7 +53,7 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, void *pMb); * * This function initializes the Message queue. * - * Return: cdf status + * Return: qdf status */ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq) { @@ -184,11 +184,11 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq) * cds_send_mb_message_to_mac() - post a message to a message queue * @pBuf: Pointer to buffer allocated by caller * - * Return: cdf status + * Return: qdf status */ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; tSirRetStatus sirStatus; v_CONTEXT_t cds_context; void *hHal; @@ -205,11 +205,11 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf) } else { sirStatus = u_mac_post_ctrl_msg(hHal, pBuf); if (eSIR_SUCCESS == sirStatus) - cdf_ret_status = QDF_STATUS_SUCCESS; + qdf_ret_status = QDF_STATUS_SUCCESS; } } qdf_mem_free(pBuf); - return cdf_ret_status; + return qdf_ret_status; } diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c index f60bd2dd3ff8..38447aeef712 100644 --- a/core/cds/src/cds_packet.c +++ b/core/cds/src/cds_packet.c @@ -292,7 +292,7 @@ void cds_pkt_proto_trace_close(void) QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, uint8_t *file_name, uint32_t line_num) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; qdf_nbuf_t nbuf; nbuf = qdf_nbuf_alloc_debug(NULL, @@ -305,10 +305,10 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = qdf_nbuf_data(nbuf); - cdf_ret_status = QDF_STATUS_SUCCESS; + qdf_ret_status = QDF_STATUS_SUCCESS; } - return cdf_ret_status; + return qdf_ret_status; } #else /*--------------------------------------------------------------------------- @@ -317,7 +317,7 @@ QDF_STATUS cds_packet_alloc_debug(uint16_t size, void **data, void **ppPacket, ---------------------------------------------------------------------------*/ QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; qdf_nbuf_t nbuf; nbuf = qdf_nbuf_alloc(NULL, roundup(size + TX_PKT_MIN_HEADROOM, 4), @@ -328,10 +328,10 @@ QDF_STATUS cds_packet_alloc(uint16_t size, void **data, void **ppPacket) qdf_nbuf_set_protocol(nbuf, ETH_P_CONTROL); *ppPacket = nbuf; *data = qdf_nbuf_data(nbuf); - cdf_ret_status = QDF_STATUS_SUCCESS; + qdf_ret_status = QDF_STATUS_SUCCESS; } - return cdf_ret_status; + return qdf_ret_status; } #endif diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c index 292c4a664f1b..cf0983c0f94f 100644 --- a/core/cds/src/cds_sched.c +++ b/core/cds/src/cds_sched.c @@ -184,7 +184,7 @@ static struct notifier_block cds_cpu_hotplug_notifier = { * dispatch messages. * * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_sched_open(void *p_cds_context, p_cds_sched_context pSchedContext, @@ -893,7 +893,7 @@ static int cds_ol_rx_thread(void *arg) * - The Tx thread is closed * * - * Return: cdf status + * Return: qdf status */ QDF_STATUS cds_sched_close(void *p_cds_context) { @@ -938,7 +938,7 @@ QDF_STATUS cds_sched_close(void *p_cds_context) * * This api initializes the cds scheduler message queues. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext) { diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c index 49b7962b0f15..180993759ece 100644 --- a/core/cds/src/cds_utils.c +++ b/core/cds/src/cds_utils.c @@ -485,7 +485,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm) /* Validate IPN */ rx_ipn = mmie->sequence_number; - if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) != 0) { + if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) > 0) { /* Replay error */ QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Replay error mmie ipn %02X %02X %02X %02X %02X %02X" @@ -591,7 +591,7 @@ err_tfm: * @param keyLen length of key * @param digest holds resultant SHA1 HMAC (20B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ @@ -753,7 +753,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle, /* Handle */ * @param keyLen length of key * @param digest holds resultant MD5 HMAC (20B) * - * @return CDF_STATUS_SUCCSS if the operation succeeds + * @return QDF_STATUS_SUCCSS if the operation succeeds * */ struct hmac_md5_result { diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index e462b13138a4..454327543b95 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -194,18 +194,18 @@ static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc) static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu, struct htt_host_rx_desc_base *rx_desc) { - NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible; + QDF_NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible; if (rx_desc->msdu_end.lro_eligible) { - NBUF_CB_RX_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack; - NBUF_CB_RX_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum; - NBUF_CB_RX_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number; - NBUF_CB_RX_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number; - NBUF_CB_RX_TCP_WIN(msdu) = rx_desc->msdu_end.window_size; - NBUF_CB_RX_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto; - NBUF_CB_RX_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto; - NBUF_CB_RX_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset; - NBUF_CB_RX_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset; - NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) = + QDF_NBUF_CB_RX_TCP_PURE_ACK(msdu) = rx_desc->msdu_start.tcp_only_ack; + QDF_NBUF_CB_RX_TCP_CHKSUM(msdu) = rx_desc->msdu_end.tcp_udp_chksum; + QDF_NBUF_CB_RX_TCP_SEQ_NUM(msdu) = rx_desc->msdu_end.tcp_seq_number; + QDF_NBUF_CB_RX_TCP_ACK_NUM(msdu) = rx_desc->msdu_end.tcp_ack_number; + QDF_NBUF_CB_RX_TCP_WIN(msdu) = rx_desc->msdu_end.window_size; + QDF_NBUF_CB_RX_TCP_PROTO(msdu) = rx_desc->msdu_start.tcp_proto; + QDF_NBUF_CB_RX_IPV6_PROTO(msdu) = rx_desc->msdu_start.ipv6_proto; + QDF_NBUF_CB_RX_IP_OFFSET(msdu) = rx_desc->msdu_start.l3_offset; + QDF_NBUF_CB_RX_TCP_OFFSET(msdu) = rx_desc->msdu_start.l4_offset; + QDF_NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) = rx_desc->msdu_start.flow_id_toeplitz; } } diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 72b704749481..5e7231584ad4 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -346,7 +346,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) qdf_timer_free(&pdev->rx_ring.refill_retry_timer); if (pdev->cfg.is_full_reorder_offload) { - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, @@ -378,7 +378,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) qdf_mem_free(pdev->rx_ring.buf.netbufs_ring); } - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, sizeof(uint32_t), pdev->rx_ring.alloc_idx.vaddr, pdev->rx_ring.alloc_idx.paddr, @@ -386,7 +386,7 @@ void htt_rx_detach(struct htt_pdev_t *pdev) alloc_idx), memctx)); - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, @@ -1326,7 +1326,7 @@ htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, /* Util fake function that has same prototype as qdf_nbuf_clone that just * retures the same nbuf */ -qdf_nbuf_t htt_rx_cdf_noclone_buf(qdf_nbuf_t buf) +qdf_nbuf_t htt_rx_qdf_noclone_buf(qdf_nbuf_t buf) { return buf; } @@ -1415,7 +1415,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, * waste cycles cloning the packets */ clone_nbuf_fn = - clone_not_reqd ? htt_rx_cdf_noclone_buf : qdf_nbuf_clone; + clone_not_reqd ? htt_rx_qdf_noclone_buf : qdf_nbuf_clone; /* The nbuf has been pulled just beyond the status and points to the * payload @@ -1625,7 +1625,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev, } - /* TODO: Convert this to suitable cdf routines */ + /* TODO: Convert this to suitable qdf routines */ qdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned, frag_list_sum_len); @@ -2049,7 +2049,7 @@ int htt_rx_hash_init(struct htt_pdev_t *pdev) { int i, j; - HTT_ASSERT2(CDF_IS_PWR2(RX_NUM_HASH_BUCKETS)); + HTT_ASSERT2(QDF_IS_PWR2(RX_NUM_HASH_BUCKETS)); pdev->rx_ring.hash_table = qdf_mem_malloc(RX_NUM_HASH_BUCKETS * @@ -2132,7 +2132,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) uint32_t ring_elem_size = sizeof(qdf_dma_addr_t); pdev->rx_ring.size = htt_rx_ring_size(pdev); - HTT_ASSERT2(CDF_IS_PWR2(pdev->rx_ring.size)); + HTT_ASSERT2(QDF_IS_PWR2(pdev->rx_ring.size)); pdev->rx_ring.size_mask = pdev->rx_ring.size - 1; /* @@ -2247,7 +2247,7 @@ int htt_rx_attach(struct htt_pdev_t *pdev) return 0; /* success */ fail3: - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, pdev->rx_ring.size * sizeof(qdf_dma_addr_t), pdev->rx_ring.buf.paddrs_ring, pdev->rx_ring.base_paddr, @@ -2256,7 +2256,7 @@ fail3: fail2: if (pdev->cfg.is_full_reorder_offload) { - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, sizeof(uint32_t), pdev->rx_ring.target_idx.vaddr, pdev->rx_ring.target_idx.paddr, @@ -2315,7 +2315,7 @@ int htt_rx_ipa_uc_alloc_wdi2_rsc(struct htt_pdev_t *pdev, if (!pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) { qdf_print("%s: RX PROC DONE IND alloc fail", __func__); qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, @@ -2377,7 +2377,7 @@ int htt_rx_ipa_uc_attach(struct htt_pdev_t *pdev, if (!pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) { qdf_print("%s: RX PROC DONE IND alloc fail", __func__); qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, @@ -2403,7 +2403,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) { if (pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, pdev->ipa_uc_rx_rsc.rx2_ind_ring_size, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx2_ind_ring_base.paddr, @@ -2414,7 +2414,7 @@ void htt_rx_ipa_uc_free_wdi2_rsc(struct htt_pdev_t *pdev) if (pdev->ipa_uc_rx_rsc.rx2_ipa_prc_done_idx.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, 4, pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx.vaddr, @@ -2435,7 +2435,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) { if (pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, pdev->ipa_uc_rx_rsc.rx_ind_ring_size, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.vaddr, pdev->ipa_uc_rx_rsc.rx_ind_ring_base.paddr, @@ -2446,7 +2446,7 @@ int htt_rx_ipa_uc_detach(struct htt_pdev_t *pdev) if (pdev->ipa_uc_rx_rsc.rx_ipa_prc_done_idx.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, 4, pdev->ipa_uc_rx_rsc. rx_ipa_prc_done_idx.vaddr, diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c index 757ba4405d8e..ac81810b6117 100644 --- a/core/dp/htt/htt_tx.c +++ b/core/dp/htt/htt_tx.c @@ -1052,7 +1052,7 @@ int htt_tx_ipa_uc_attach(struct htt_pdev_t *pdev, return 0; free_tx_comp_base: - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, tx_comp_ring_size, pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, pdev->ipa_uc_tx_rsc.tx_comp_base.paddr, @@ -1061,7 +1061,7 @@ free_tx_comp_base: tx_comp_base), memctx)); free_tx_ce_idx: - qdf_mem_free_consistent(pdev->osdev, + qdf_mem_free_consistent(pdev->osdev, pdev->osdev->dev, 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, @@ -1078,7 +1078,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) if (pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, 4, pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr, pdev->ipa_uc_tx_rsc.tx_ce_idx.paddr, @@ -1089,7 +1089,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev) if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) { qdf_mem_free_consistent( - pdev->osdev, + pdev->osdev, pdev->osdev->dev, ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(qdf_nbuf_t), pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr, @@ -1125,7 +1125,7 @@ htt_tx_desc_fill_tso_info(htt_pdev_handle pdev, void *desc, { u_int32_t *word; int i; - struct cdf_tso_seg_elem_t *tso_seg = tso_info->curr_seg; + struct qdf_tso_seg_elem_t *tso_seg = tso_info->curr_seg; struct msdu_ext_desc_t *msdu_ext_desc = (struct msdu_ext_desc_t *)desc; word = (u_int32_t *)(desc); diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index 0be83c8e8e7f..c9437f96401e 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -195,7 +195,7 @@ struct msdu_ext_frag_desc { }; struct msdu_ext_desc_t { - struct cdf_tso_flags_t tso_flags; + struct qdf_tso_flags_t tso_flags; struct msdu_ext_frag_desc frags[6]; /* u_int32_t frag_ptr0; diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 79b830e3a6c1..aa482bf60582 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -762,7 +762,7 @@ enum ol_txrx_peer_state { * @param data_peer - which peer has changed its state * @param state - the new state of the peer * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr, diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c index f832aa68616c..971126004faf 100644 --- a/core/dp/txrx/ol_rx_reorder.c +++ b/core/dp/txrx/ol_rx_reorder.c @@ -27,7 +27,7 @@ /*=== header file includes ===*/ /* generic utilities */ -#include /* cdf_nbuf_t, etc. */ +#include /* qdf_nbuf_t, etc. */ #include /* qdf_mem_malloc */ #include /* IEEE80211_SEQ_MAX */ diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index b5dedef42275..5422bef9e499 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -99,7 +99,7 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, msdu_info->tso_info.tso_seg_list = NULL; msdu_info->tso_info.num_segs = num_seg; while (num_seg) { - struct cdf_tso_seg_elem_t *tso_seg = + struct qdf_tso_seg_elem_t *tso_seg = ol_tso_alloc_segment(vdev->pdev); if (tso_seg) { tso_seg->next = @@ -108,8 +108,8 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, = tso_seg; num_seg--; } else { - struct cdf_tso_seg_elem_t *next_seg; - struct cdf_tso_seg_elem_t *free_seg = + struct qdf_tso_seg_elem_t *next_seg; + struct qdf_tso_seg_elem_t *free_seg = msdu_info->tso_info.tso_seg_list; qdf_print("TSO seg alloc failed!\n"); while (free_seg) { @@ -288,7 +288,7 @@ qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) while (segments) { if (msdu_info.tso_info.curr_seg) - NBUF_CB_PADDR(msdu) = + QDF_NBUF_CB_PADDR(msdu) = msdu_info.tso_info.curr_seg-> seg.tso_frags[0].paddr_low_32; @@ -558,7 +558,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) while (segments) { if (msdu_info.tso_info.curr_seg) - NBUF_CB_PADDR(msdu) = msdu_info.tso_info. + QDF_NBUF_CB_PADDR(msdu) = msdu_info.tso_info. curr_seg->seg.tso_frags[0].paddr_low_32; segments--; @@ -1368,13 +1368,13 @@ qdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev, void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg) { int i; - struct cdf_tso_seg_elem_t *c_element; + struct qdf_tso_seg_elem_t *c_element; - c_element = qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); + c_element = qdf_mem_malloc(sizeof(struct qdf_tso_seg_elem_t)); pdev->tso_seg_pool.freelist = c_element; for (i = 0; i < (num_seg - 1); i++) { c_element->next = - qdf_mem_malloc(sizeof(struct cdf_tso_seg_elem_t)); + qdf_mem_malloc(sizeof(struct qdf_tso_seg_elem_t)); c_element = c_element->next; c_element->next = NULL; } @@ -1385,8 +1385,8 @@ void ol_tso_seg_list_init(struct ol_txrx_pdev_t *pdev, uint32_t num_seg) void ol_tso_seg_list_deinit(struct ol_txrx_pdev_t *pdev) { int i; - struct cdf_tso_seg_elem_t *c_element; - struct cdf_tso_seg_elem_t *temp; + struct qdf_tso_seg_elem_t *c_element; + struct qdf_tso_seg_elem_t *temp; qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); c_element = pdev->tso_seg_pool.freelist; diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 852829e76d0f..0522d1de0002 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -28,7 +28,7 @@ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* qdf_nbuf_t, etc. */ #include /* qdf_assert */ -#include /* cdf_spinlock */ +#include /* qdf_spinlock */ #ifdef QCA_COMPUTE_TX_DELAY #include /* qdf_system_ticks */ #endif @@ -546,9 +546,9 @@ void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev, * * Return: none */ -struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev) +struct qdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev) { - struct cdf_tso_seg_elem_t *tso_seg = NULL; + struct qdf_tso_seg_elem_t *tso_seg = NULL; qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); if (pdev->tso_seg_pool.freelist) { @@ -574,7 +574,7 @@ struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev) */ void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev, - struct cdf_tso_seg_elem_t *tso_seg) + struct qdf_tso_seg_elem_t *tso_seg) { qdf_spin_lock_bh(&pdev->tso_seg_pool.tso_mutex); tso_seg->next = pdev->tso_seg_pool.freelist; diff --git a/core/dp/txrx/ol_tx_desc.h b/core/dp/txrx/ol_tx_desc.h index 456325175e74..92dd0b88e7aa 100644 --- a/core/dp/txrx/ol_tx_desc.h +++ b/core/dp/txrx/ol_tx_desc.h @@ -159,10 +159,10 @@ void *ol_ath_get_bcn_header(ol_pdev_handle pdev, A_UINT32 vdev_id); void ol_tx_desc_free(struct ol_txrx_pdev_t *pdev, struct ol_tx_desc_t *tx_desc); #if defined(FEATURE_TSO) -struct cdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev); +struct qdf_tso_seg_elem_t *ol_tso_alloc_segment(struct ol_txrx_pdev_t *pdev); void ol_tso_free_segment(struct ol_txrx_pdev_t *pdev, - struct cdf_tso_seg_elem_t *tso_seg); + struct qdf_tso_seg_elem_t *tso_seg); #else #define ol_tso_alloc_segment(pdev) /*no-op*/ #define ol_tso_free_segment(pdev, tso_seg) /*no-op*/ diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index 785938b39b04..cea7b2196b42 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -26,7 +26,7 @@ */ #include /* qdf_atomic_inc, etc. */ -#include /* cdf_os_spinlock */ +#include /* qdf_os_spinlock */ #include /* qdf_system_ticks, etc. */ #include /* qdf_nbuf_t */ #include /* QDF_NBUF_TX_EXT_TID_INVALID */ diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index 442115b4f746..f30008336ca2 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -27,7 +27,7 @@ /* OS abstraction libraries */ #include /* qdf_nbuf_t, etc. */ -#include /* qdf_atomic_read, etc. */ +#include /* qdf_atomic_read, etc. */ #include /* qdf_unlikely */ /* APIs for other modules */ diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h index 52c2546ef48e..25cf2a066391 100644 --- a/core/dp/txrx/ol_txrx_internal.h +++ b/core/dp/txrx/ol_txrx_internal.h @@ -29,7 +29,7 @@ #define _OL_TXRX_INTERNAL__H_ #include /* qdf_assert */ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include /* qdf_mem_set */ #include /* ieee80211_frame */ #include /* htt_rx_msdu_desc_completes_mpdu, etc. */ diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 7d6ffc471d03..0731c0836a37 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -32,7 +32,7 @@ #ifndef _OL_TXRX_TYPES__H_ #define _OL_TXRX_TYPES__H_ -#include /* cdf_nbuf_t */ +#include /* qdf_nbuf_t */ #include #include /* TAILQ */ #include /* A_UINT8 */ @@ -40,7 +40,7 @@ #include /* qdf_atomic_t */ #include /* wdi_event_subscribe */ #include /* qdf_timer_t */ -#include /* cdf_spinlock */ +#include /* qdf_spinlock */ #include /* ol_pktlog_dev_handle */ #include #include @@ -757,7 +757,7 @@ struct ol_txrx_pdev_t { struct { uint16_t pool_size; uint16_t num_free; - struct cdf_tso_seg_elem_t *freelist; + struct qdf_tso_seg_elem_t *freelist; /* tso mutex */ OL_TX_MUTEX_TYPE tso_mutex; } tso_seg_pool; @@ -854,7 +854,7 @@ struct ol_txrx_vdev_t { struct { int pool_elems; /* total number of elements in the pool */ int alloc_cnt; /* number of allocated elements */ - uint32_t *freelist; /* free list of cdf_tso_seg_elem_t */ + uint32_t *freelist; /* free list of qdf_tso_seg_elem_t */ } tso_pool_t; #endif diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 3a7c2710981a..b93fa5375b4e 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -346,9 +346,9 @@ typedef enum { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH #define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE "gWlanMccToSccSwitchMode" -#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MIN (CDF_MCC_TO_SCC_SWITCH_DISABLE) -#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX (CDF_MCC_TO_SCC_SWITCH_FORCE) -#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_DEFAULT (CDF_MCC_TO_SCC_SWITCH_DISABLE) +#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MIN (QDF_MCC_TO_SCC_SWITCH_DISABLE) +#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX (QDF_MCC_TO_SCC_SWITCH_FORCE) +#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_DEFAULT (QDF_MCC_TO_SCC_SWITCH_DISABLE) #endif #define CFG_DISABLE_PACKET_FILTER "gDisablePacketFilter" @@ -1278,14 +1278,14 @@ typedef enum { #endif /* FEATURE_WLAN_FORCE_SAP_SCC */ /* - * CDF Trace Enable Control + * QDF Trace Enable Control * Notes: * the MIN/MAX/DEFAULT values apply for all modules * the DEFAULT value is outside the valid range. if the DEFAULT * value is not overridden, then no change will be made to the * "built in" default values compiled into the code * values are a bitmap indicating which log levels are to enabled - * (must match order of cdf_trace_level enumerations) + * (must match order of qdf_trace_level enumerations) * 00000001 FATAL * 00000010 ERROR * 00000100 WARN @@ -1298,29 +1298,29 @@ typedef enum { * hence a value of 0xFF would set all bits (enable all logs) */ -#define CFG_CDF_TRACE_ENABLE_WDI_NAME "cdf_trace_enable_wdi" -#define CFG_CDF_TRACE_ENABLE_HDD_NAME "cdf_trace_enable_hdd" -#define CFG_CDF_TRACE_ENABLE_SME_NAME "cdf_trace_enable_sme" -#define CFG_CDF_TRACE_ENABLE_PE_NAME "cdf_trace_enable_pe" -#define CFG_CDF_TRACE_ENABLE_PMC_NAME "cdf_trace_enable_pmc" -#define CFG_CDF_TRACE_ENABLE_WMA_NAME "cdf_trace_enable_wma" -#define CFG_CDF_TRACE_ENABLE_SYS_NAME "cdf_trace_enable_sys" -#define CFG_CDF_TRACE_ENABLE_CDF_NAME "cdf_trace_enable_cdf" -#define CFG_CDF_TRACE_ENABLE_SAP_NAME "cdf_trace_enable_sap" -#define CFG_CDF_TRACE_ENABLE_HDD_SAP_NAME "cdf_trace_enable_hdd_sap" -#define CFG_CDF_TRACE_ENABLE_BMI_NAME "cdf_trace_enable_bmi" -#define CFG_CDF_TRACE_ENABLE_CFG_NAME "cdf_trace_enable_cfg" -#define CFG_CDF_TRACE_ENABLE_EPPING "cdf_trace_enable_epping" -#define CFG_CDF_TRACE_ENABLE_CDF_DEVICES "cdf_trace_enable_cdf_devices" -#define CFG_CDF_TRACE_ENABLE_TXRX_NAME "cfd_trace_enable_txrx" -#define CFG_CDF_TRACE_ENABLE_HTC_NAME "cdf_trace_enable_htc" -#define CFG_CDF_TRACE_ENABLE_HIF_NAME "cdf_trace_enable_hif" -#define CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME "cdf_trace_enable_hdd_sap_data" -#define CFG_CDF_TRACE_ENABLE_HDD_DATA_NAME "cdf_trace_enable_hdd_data" - -#define CFG_CDF_TRACE_ENABLE_MIN (0) -#define CFG_CDF_TRACE_ENABLE_MAX (0xff) -#define CFG_CDF_TRACE_ENABLE_DEFAULT (0xffff) +#define CFG_QDF_TRACE_ENABLE_WDI_NAME "qdf_trace_enable_wdi" +#define CFG_QDF_TRACE_ENABLE_HDD_NAME "qdf_trace_enable_hdd" +#define CFG_QDF_TRACE_ENABLE_SME_NAME "qdf_trace_enable_sme" +#define CFG_QDF_TRACE_ENABLE_PE_NAME "qdf_trace_enable_pe" +#define CFG_QDF_TRACE_ENABLE_PMC_NAME "qdf_trace_enable_pmc" +#define CFG_QDF_TRACE_ENABLE_WMA_NAME "qdf_trace_enable_wma" +#define CFG_QDF_TRACE_ENABLE_SYS_NAME "qdf_trace_enable_sys" +#define CFG_QDF_TRACE_ENABLE_QDF_NAME "qdf_trace_enable_qdf" +#define CFG_QDF_TRACE_ENABLE_SAP_NAME "qdf_trace_enable_sap" +#define CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME "qdf_trace_enable_hdd_sap" +#define CFG_QDF_TRACE_ENABLE_BMI_NAME "qdf_trace_enable_bmi" +#define CFG_QDF_TRACE_ENABLE_CFG_NAME "qdf_trace_enable_cfg" +#define CFG_QDF_TRACE_ENABLE_EPPING "qdf_trace_enable_epping" +#define CFG_QDF_TRACE_ENABLE_QDF_DEVICES "qdf_trace_enable_qdf_devices" +#define CFG_QDF_TRACE_ENABLE_TXRX_NAME "cfd_trace_enable_txrx" +#define CFG_QDF_TRACE_ENABLE_HTC_NAME "qdf_trace_enable_htc" +#define CFG_QDF_TRACE_ENABLE_HIF_NAME "qdf_trace_enable_hif" +#define CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME "qdf_trace_enable_hdd_sap_data" +#define CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME "qdf_trace_enable_hdd_data" + +#define CFG_QDF_TRACE_ENABLE_MIN (0) +#define CFG_QDF_TRACE_ENABLE_MAX (0xff) +#define CFG_QDF_TRACE_ENABLE_DEFAULT (0xffff) #define HDD_MCASTBCASTFILTER_FILTER_NONE 0x00 #define HDD_MCASTBCASTFILTER_FILTER_ALL_MULTICAST 0x01 @@ -3096,26 +3096,26 @@ struct hdd_config { bool fEnableBeaconEarlyTermination; bool teleBcnWakeupEn; -/* CDF Trace Control*/ - uint16_t cdf_trace_enable_wdi; - uint16_t cdf_trace_enable_hdd; - uint16_t cdf_trace_enable_sme; - uint16_t cdf_trace_enable_pe; - uint16_t cdf_trace_enable_pmc; - uint16_t cdf_trace_enable_wma; - uint16_t cdf_trace_enable_sys; - uint16_t cdf_trace_enable_cdf; - uint16_t cdf_trace_enable_sap; - uint16_t cdf_trace_enable_hdd_sap; - uint16_t cdf_trace_enable_bmi; - uint16_t cdf_trace_enable_cfg; +/* QDF Trace Control*/ + uint16_t qdf_trace_enable_wdi; + uint16_t qdf_trace_enable_hdd; + uint16_t qdf_trace_enable_sme; + uint16_t qdf_trace_enable_pe; + uint16_t qdf_trace_enable_pmc; + uint16_t qdf_trace_enable_wma; + uint16_t qdf_trace_enable_sys; + uint16_t qdf_trace_enable_qdf; + uint16_t qdf_trace_enable_sap; + uint16_t qdf_trace_enable_hdd_sap; + uint16_t qdf_trace_enable_bmi; + uint16_t qdf_trace_enable_cfg; uint16_t cfd_trace_enable_txrx; - uint16_t cdf_trace_enable_htc; - uint16_t cdf_trace_enable_hif; - uint16_t cdf_trace_enable_hdd_sap_data; - uint16_t cdf_trace_enable_hdd_data; - uint16_t cdf_trace_enable_epping; - uint16_t cdf_trace_enable_cdf_devices; + uint16_t qdf_trace_enable_htc; + uint16_t qdf_trace_enable_hif; + uint16_t qdf_trace_enable_hdd_sap_data; + uint16_t qdf_trace_enable_hdd_data; + uint16_t qdf_trace_enable_epping; + uint16_t qdf_trace_enable_qdf_devices; uint16_t nTeleBcnTransListenInterval; uint16_t nTeleBcnMaxListenInterval; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index e9e44cae717e..d8d0e4c84cc0 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -672,8 +672,8 @@ struct hdd_station_ctx { #define BSS_START 1 typedef struct hdd_hostapd_state_s { int bssState; - qdf_event_t cdf_event; - qdf_event_t cdf_stop_bss_event; + qdf_event_t qdf_event; + qdf_event_t qdf_stop_bss_event; QDF_STATUS qdf_status; bool bCommit; @@ -1109,7 +1109,7 @@ struct hdd_context_s { qdf_list_t hddAdapters; /* List of adapters */ /* One per STA: 1 for BCMC_STA_ID, 1 for each SAP_SELF_STA_ID, 1 for WDS_STAID */ - hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + CDF_MAX_NO_OF_SAP_MODE + 2]; /* One per sta. For quick reference. */ + hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + QDF_MAX_NO_OF_SAP_MODE + 2]; /* One per sta. For quick reference. */ /** Pointer for firmware image data */ const struct firmware *fw; diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index c91add39a758..4ccdc82991c9 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -249,8 +249,8 @@ typedef struct hdd_wext_state_s { /**auth key mgmt */ int32_t authKeyMgmt; - /* cdf event */ - qdf_event_t hdd_cdf_event; + /* qdf event */ + qdf_event_t hdd_qdf_event; qdf_event_t scanevent; diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 72106ede5752..abe2eb282e4c 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1179,7 +1179,7 @@ void hdd_set_peer_authorized_event(uint32_t vdev_id) * @sta_state: peer state * @roam_synch_in_progress: roam synch in progress * - * Return: CDF status + * Return: QDF status */ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, @@ -1661,7 +1661,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, */ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) { - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamInfo roamInfo; roamInfo.fAuthRequired = false; @@ -1670,13 +1670,13 @@ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter) qdf_mem_copy(roamInfo.peerMac.bytes, pHddStaCtx->roam_info.peerMac, QDF_MAC_ADDR_SIZE); - cdf_ret_status = + qdf_ret_status = hdd_roam_set_key_complete_handler(pAdapter, &roamInfo, pHddStaCtx->roam_info.roamId, pHddStaCtx->roam_info.roamStatus, eCSR_ROAM_RESULT_AUTHENTICATED); - if (cdf_ret_status != QDF_STATUS_SUCCESS) + if (qdf_ret_status != QDF_STATUS_SUCCESS) hddLog(LOGE, FL("Set Key complete failure")); pHddStaCtx->roam_info.deferKeyComplete = false; @@ -3841,7 +3841,7 @@ QDF_STATUS hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, eRoamCmdStatus roamStatus, eCsrRoamResult roamResult) { - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; hdd_adapter_t *pAdapter = (hdd_adapter_t *) pContext; hdd_wext_state_t *pWextState = NULL; hdd_station_ctx_t *pHddStaCtx = NULL; @@ -3881,7 +3881,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, FL ("Reassoc Failed with roamStatus: %d roamResult: %d SessionID: %d"), roamStatus, roamResult, pAdapter->sessionId); - cdf_ret_status = + qdf_ret_status = hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId, roamStatus, roamResult); /* @@ -3917,7 +3917,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, status = hdd_roam_deregister_sta(pAdapter, pHddStaCtx->conn_info.staId[0]); if (!QDF_IS_STATUS_SUCCESS(status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; pHddStaCtx->ft_carrier_on = true; pHddStaCtx->hdd_ReassocScenario = true; hddLog(LOG1, @@ -3949,7 +3949,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, case eCSR_ROAM_DISASSOCIATED: { hddLog(LOG1, "****eCSR_ROAM_DISASSOCIATED****"); - cdf_ret_status = + qdf_ret_status = hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId, roamStatus, roamResult); /* Check if Mcast/Bcast Filters are set, if yes clear the filters here */ @@ -3984,7 +3984,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, break; case eCSR_ROAM_IBSS_LEAVE: hddLog(LOG1, "****eCSR_ROAM_IBSS_LEAVE****"); - cdf_ret_status = + qdf_ret_status = hdd_dis_connect_handler(pAdapter, pRoamInfo, roamId, roamStatus, roamResult); break; @@ -3999,7 +3999,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, hdd_conn_remove_connect_info( WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)); } - cdf_ret_status = + qdf_ret_status = hdd_association_completion_handler(pAdapter, pRoamInfo, roamId, roamStatus, roamResult); @@ -4009,7 +4009,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, #endif break; case eCSR_ROAM_ASSOCIATION_FAILURE: - cdf_ret_status = hdd_association_completion_handler(pAdapter, + qdf_ret_status = hdd_association_completion_handler(pAdapter, pRoamInfo, roamId, roamStatus, @@ -4021,7 +4021,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, break; case eCSR_ROAM_CONNECT_STATUS_UPDATE: - cdf_ret_status = + qdf_ret_status = roam_roam_connect_status_update_handler(pAdapter, pRoamInfo, roamId, @@ -4030,7 +4030,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, break; case eCSR_ROAM_MIC_ERROR_IND: - cdf_ret_status = + qdf_ret_status = hdd_roam_mic_error_indication_handler(pAdapter, pRoamInfo, roamId, @@ -4040,7 +4040,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, case eCSR_ROAM_SET_KEY_COMPLETE: { - cdf_ret_status = + qdf_ret_status = hdd_roam_set_key_complete_handler(pAdapter, pRoamInfo, roamId, roamStatus, roamResult); @@ -4066,7 +4066,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, if (eCSR_AUTH_TYPE_RSN == pHddStaCtx->conn_info.authType || hdd_is_8021x_sha256_auth_type(pHddStaCtx)) { /* notify the supplicant of a new candidate */ - cdf_ret_status = + qdf_ret_status = wlan_hdd_cfg80211_pmksa_candidate_notify( pAdapter, pRoamInfo, 1, false); } @@ -4078,7 +4078,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth(pAdapter, pRoamInfo)) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_SUCCESS: @@ -4088,7 +4088,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 1)) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_PREAUTH_STATUS_FAILURE: @@ -4098,7 +4098,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_preauth_status(pAdapter, pRoamInfo, 0)) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_HANDOVER_SUCCESS: @@ -4107,7 +4107,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, if (QDF_STATUS_SUCCESS != wlan_hdd_cfg80211_roam_metrics_handover(pAdapter, pRoamInfo)) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; #endif @@ -4121,7 +4121,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, break; #ifdef FEATURE_WLAN_TDLS case eCSR_ROAM_TDLS_STATUS_UPDATE: - cdf_ret_status = + qdf_ret_status = hdd_roam_tdls_status_update_handler(pAdapter, pRoamInfo, roamId, roamStatus, @@ -4173,7 +4173,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, default: break; } - return cdf_ret_status; + return qdf_ret_status; } /** diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index daa65a04475e..8214e69107eb 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1653,132 +1653,132 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_ENABLE_BEACON_EARLY_TERMINATION_MIN, CFG_ENABLE_BEACON_EARLY_TERMINATION_MAX), -/* CFG_CDF_TRACE_ENABLE Parameters */ - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_WDI_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_wdi, +/* CFG_QDF_TRACE_ENABLE Parameters */ + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WDI_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_wdi, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_hdd, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_hdd, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_BMI_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_bmi, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_BMI_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_bmi, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SME_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_sme, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SME_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_sme, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_PE_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_pe, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_PE_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_pe, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_WMA_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_wma, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_WMA_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_wma, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SYS_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_sys, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SYS_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_sys, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CDF_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_cdf, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_qdf, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_SAP_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_sap, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_SAP_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_sap, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_SAP_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_hdd_sap, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_SAP_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_hdd_sap, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CFG_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_cfg, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_CFG_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_cfg, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_TXRX_NAME, WLAN_PARAM_Integer, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_TXRX_NAME, WLAN_PARAM_Integer, struct hdd_config, cfd_trace_enable_txrx, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HTC_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_htc, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HTC_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_htc, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HIF_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_hif, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HIF_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_hif, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), REG_VARIABLE(CFG_CDR_TRACE_ENABLE_HDD_SAP_DATA_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_hdd_sap_data, + struct hdd_config, qdf_trace_enable_hdd_sap_data, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_HDD_DATA_NAME, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_hdd_data, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_HDD_DATA_NAME, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_hdd_data, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_EPPING, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_epping, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_EPPING, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_epping, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), - REG_VARIABLE(CFG_CDF_TRACE_ENABLE_CDF_DEVICES, WLAN_PARAM_Integer, - struct hdd_config, cdf_trace_enable_cdf_devices, + REG_VARIABLE(CFG_QDF_TRACE_ENABLE_QDF_DEVICES, WLAN_PARAM_Integer, + struct hdd_config, qdf_trace_enable_qdf_devices, VAR_FLAGS_OPTIONAL, - CFG_CDF_TRACE_ENABLE_DEFAULT, - CFG_CDF_TRACE_ENABLE_MIN, - CFG_CDF_TRACE_ENABLE_MAX), + CFG_QDF_TRACE_ENABLE_DEFAULT, + CFG_QDF_TRACE_ENABLE_MIN, + CFG_QDF_TRACE_ENABLE_MAX), REG_VARIABLE(CFG_TELE_BCN_TRANS_LI_NAME, WLAN_PARAM_Integer, struct hdd_config, nTeleBcnTransListenInterval, diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 67e1a376e35d..587cae24df44 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -397,7 +397,7 @@ static const struct ieee80211_iface_limit static const struct ieee80211_iface_limit wlan_hdd_ap_iface_limit[] = { { - .max = (CDF_MAX_NO_OF_SAP_MODE + SAP_MAX_OBSS_STA_CNT), + .max = (QDF_MAX_NO_OF_SAP_MODE + SAP_MAX_OBSS_STA_CNT), .types = BIT(NL80211_IFTYPE_AP), }, }; @@ -425,7 +425,7 @@ static const struct ieee80211_iface_limit .types = BIT(NL80211_IFTYPE_STATION), }, { - .max = CDF_MAX_NO_OF_SAP_MODE, + .max = QDF_MAX_NO_OF_SAP_MODE, .types = BIT(NL80211_IFTYPE_AP), }, }; @@ -524,7 +524,7 @@ static struct ieee80211_iface_combination { .limits = wlan_hdd_ap_iface_limit, .num_different_channels = 2, - .max_interfaces = (SAP_MAX_OBSS_STA_CNT + CDF_MAX_NO_OF_SAP_MODE), + .max_interfaces = (SAP_MAX_OBSS_STA_CNT + QDF_MAX_NO_OF_SAP_MODE), .n_limits = ARRAY_SIZE(wlan_hdd_ap_iface_limit), }, /* P2P */ @@ -538,7 +538,7 @@ static struct ieee80211_iface_combination { .limits = wlan_hdd_sta_ap_iface_limit, .num_different_channels = 2, - .max_interfaces = (1 + SAP_MAX_OBSS_STA_CNT + CDF_MAX_NO_OF_SAP_MODE), + .max_interfaces = (1 + SAP_MAX_OBSS_STA_CNT + QDF_MAX_NO_OF_SAP_MODE), .n_limits = ARRAY_SIZE(wlan_hdd_sta_ap_iface_limit), .beacon_int_infra_match = true, }, @@ -4233,7 +4233,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, } if (hdd_ctx->config->policy_manager_enabled) { - ret = cdf_reset_connection_update(); + ret = qdf_reset_connection_update(); if (!QDF_IS_STATUS_SUCCESS(ret)) hdd_err("clearing event failed"); @@ -4253,9 +4253,9 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, * For any other return value it should be a pass * through */ - ret = cdf_wait_for_connection_update(); + ret = qdf_wait_for_connection_update(); if (!QDF_IS_STATUS_SUCCESS(ret)) { - hdd_err("ERROR: cdf wait for event failed!!"); + hdd_err("ERROR: qdf wait for event failed!!"); return -EINVAL; } @@ -5500,7 +5500,7 @@ int wlan_hdd_cfg80211_init(struct device *dev, } /* - * In this function, wiphy structure is updated after CDF + * In this function, wiphy structure is updated after QDF * initialization. In wlan_hdd_cfg80211_init, only the * default values will be initialized. The final initialization * of all required members can be done here. @@ -5857,7 +5857,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); int ret = 0; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; ENTER(); @@ -5889,12 +5889,12 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, pAdapter->sessionCtx.ap.apDisableIntraBssFwd = !!params->ap_isolate; - cdf_ret_status = sme_ap_disable_intra_bss_fwd(pHddCtx->hHal, + qdf_ret_status = sme_ap_disable_intra_bss_fwd(pHddCtx->hHal, pAdapter->sessionId, pAdapter->sessionCtx. ap. apDisableIntraBssFwd); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { ret = -EINVAL; } } @@ -6588,7 +6588,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(pAdapter))->pcds_context; #endif hdd_hostapd_state_t *pHostapdState; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; hdd_context_t *pHddCtx; hdd_ap_ctx_t *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); @@ -6826,13 +6826,13 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, /* The supplicant may attempt to set the PTK once pre-authentication is done. Save the key in the UMAC and include it in the ADD BSS request */ - cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), + qdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -7612,7 +7612,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter, * * 802.11r/LFR metrics reporting function to report preauth initiation * - * Return: CDF status + * Return: QDF status */ #define MAX_LFR_METRICS_EVENT_LENGTH 100 QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, @@ -7654,7 +7654,7 @@ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter, * * 802.11r/LFR metrics reporting function to report handover initiation * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, @@ -7704,7 +7704,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(hdd_adapter_t *pAdapter, * * 802.11r/LFR metrics reporting function to report handover initiation * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wlan_hdd_cfg80211_roam_metrics_handover(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo) @@ -9369,7 +9369,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, return -ECONNREFUSED; } if (pHddCtx->config->policy_manager_enabled) { - status = cdf_reset_connection_update(); + status = qdf_reset_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); @@ -9382,9 +9382,9 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, } if (QDF_STATUS_SUCCESS == status) { - status = cdf_wait_for_connection_update(); + status = qdf_wait_for_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) { - hdd_err("ERROR: cdf wait for event failed!!"); + hdd_err("ERROR: qdf wait for event failed!!"); return -EINVAL; } } @@ -9891,7 +9891,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, DFS_CAC_IN_PROGRESS) goto fn_end; - qdf_event_reset(&hapd_state->cdf_event); + qdf_event_reset(&hapd_state->qdf_event); hdd_softap_sta_disassoc(pAdapter, mac); qdf_status = @@ -9902,7 +9902,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, isDeauthInProgress = true; qdf_status = qdf_wait_single_event( - &hapd_state->cdf_event, + &hapd_state->qdf_event, 1000); if (!QDF_IS_STATUS_SUCCESS( qdf_status)) @@ -9955,7 +9955,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, if (pHddCtx->dev_dfs_cac_status == DFS_CAC_IN_PROGRESS) goto fn_end; - qdf_event_reset(&hapd_state->cdf_event); + qdf_event_reset(&hapd_state->qdf_event); hdd_softap_sta_disassoc(pAdapter, mac); qdf_status = hdd_softap_sta_deauth(pAdapter, pDelStaParams); @@ -9969,7 +9969,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, return -ENOENT; } else { qdf_status = qdf_wait_single_event( - &hapd_state->cdf_event, + &hapd_state->qdf_event, 1000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 51c00d795680..9c08deb675bd 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -296,18 +296,18 @@ static void hdd_hif_close(void *hif_ctx) } /** - * hdd_init_cdf_ctx() - API to initialize global CDF Device structure + * hdd_init_qdf_ctx() - API to initialize global QDF Device structure * @dev: Device Pointer * @bdev: Bus Device pointer * * Return: void */ -void hdd_init_cdf_ctx(struct device *dev, void *bdev) +void hdd_init_qdf_ctx(struct device *dev, void *bdev) { - qdf_device_t cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + qdf_device_t qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - cdf_dev->dev = dev; - cdf_dev->drv_hdl = bdev; + qdf_dev->dev = dev; + qdf_dev->drv_hdl = bdev; } /** @@ -329,7 +329,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, void *hif_ctx; QDF_STATUS status; int ret = 0; - qdf_device_t cdf_dev; + qdf_device_t qdf_dev; uint32_t mode = cds_get_conparam(); pr_info("%s: %sprobing driver v%s\n", WLAN_MODULE_NAME, @@ -361,7 +361,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_hdd_deinit; } - hdd_init_cdf_ctx(dev, bdev); + hdd_init_qdf_ctx(dev, bdev); ret = hdd_hif_open(dev, bdev, bid, bus_type, reinit); @@ -369,9 +369,9 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_epping_close; hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); - cdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - status = ol_cds_init(cdf_dev, hif_ctx); + status = ol_cds_init(qdf_dev, hif_ctx); if (status != QDF_STATUS_SUCCESS) { pr_err("%s No Memory to Create BMI Context\n", __func__); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 5a3029318fda..02aa06ee8a6e 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -154,7 +154,7 @@ static inline void hdd_is_lpass_supported(tMacOpenParameters *mac_openParms, * @p_cds_context: pointer to the global CDS context * @hddContextSize: Size of the HDD context to allocate. * - * The wlan_ftm_cds_open() function opens the CDF Scheduler + * The wlan_ftm_cds_open() function opens the QDF Scheduler * Upon successful initialization: * - All CDS submodules should have been initialized * - The CDS scheduler should have opened @@ -232,7 +232,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, } /* Now Open the CDS Scheduler */ - vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->cdf_sched, + vStatus = cds_sched_open(gp_cds_context, &gp_cds_context->qdf_sched, sizeof(cds_sched_context)); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { @@ -402,10 +402,10 @@ err_probe_event: } /* wlan_ftm_cds_open() */ /** - * wlan_ftm_cds_close() - Close the CDF Module in FTM mode + * wlan_ftm_cds_close() - Close the QDF Module in FTM mode * @cds_context: context of cds * - * The wlan_ftm_cds_close() function closes the CDF Module + * The wlan_ftm_cds_close() function closes the QDF Module * * Return: QDF_STATUS_SUCCESS - successfully closed */ @@ -484,7 +484,7 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context) * in FTM mode. * * Return: QDF_STATUS_SUCCESS if pre-start was successful, an - * appropriate CDF_STATUS_E_* error code otherwise + * appropriate QDF_STATUS_E_** error code otherwise */ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context) { @@ -569,14 +569,14 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Trying to open CDS without a PreOpen", __func__); QDF_ASSERT(0); - goto err_cdf_status_failure; + goto err_qdf_status_failure; } vStatus = wlan_ftm_cds_open(p_cds_context, 0); if (!QDF_IS_STATUS_SUCCESS(vStatus)) { hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__); - goto err_cdf_status_failure; + goto err_qdf_status_failure; } /* @@ -598,7 +598,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx) err_ftm_close: wlan_ftm_cds_close(p_cds_context); -err_cdf_status_failure: +err_qdf_status_failure: return -EPERM; } @@ -1012,7 +1012,7 @@ static void wlanqcmbr_mc_process_msg(void *message) * @data: FTM testmode command * @len: length of @data * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len) { diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index 5fbb8e4082b4..ae802895d1d7 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -302,7 +302,7 @@ static void hdd_wlan_green_ap_timer_fn(void *ctx) * hdd_wlan_green_ap_attach() - Attach Green AP context to HDD context * @hdd_ctx: Global HDD contect * - * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error */ static QDF_STATUS hdd_wlan_green_ap_attach(struct hdd_context_s *hdd_ctx) { @@ -340,7 +340,7 @@ error: * hdd_wlan_green_ap_deattach() - Detach Green AP context from HDD context * @hdd_ctx: Global HDD contect * - * Return: QDF_STATUS_SUCCESS on success, otherwise CDF_STATUS_E_* error + * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error */ static QDF_STATUS hdd_wlan_green_ap_deattach(struct hdd_context_s *hdd_ctx) { diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index b181351c7078..6a076eeae76d 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -379,7 +379,7 @@ static int hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu) QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, uint8_t channel_type) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; hddLog(LOGE, FL("change HT20/40 mode")); @@ -390,10 +390,10 @@ QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, hddLog(LOGE, FL("Hal ctx is null")); return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_set_ht2040_mode(hHal, pHostapdAdapter->sessionId, channel_type, true); - if (cdf_ret_status == QDF_STATUS_E_FAILURE) { + if (qdf_ret_status == QDF_STATUS_E_FAILURE) { hddLog(LOGE, FL("Failed to change HT20/40 mode")); return QDF_STATUS_E_FAILURE; } @@ -933,7 +933,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHostapdState->qdf_status = pSapEvent->sapevt.sapStartBssCompleteEvent.status; - qdf_status = qdf_event_set(&pHostapdState->cdf_event); + qdf_status = qdf_event_set(&pHostapdState->qdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status) || pHostapdState->qdf_status) { @@ -1443,7 +1443,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOG1, " disassociated " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(wrqu.addr.sa_data)); - qdf_status = qdf_event_set(&pHostapdState->cdf_event); + qdf_status = qdf_event_set(&pHostapdState->qdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) hddLog(LOGE, "ERR: Station Deauth event Set failed"); @@ -1863,7 +1863,7 @@ stopbss: * not be touched since they are now subject to being deleted * by another thread */ if (eSAP_STOP_BSS_EVENT == sapEvent) - qdf_event_set(&pHostapdState->cdf_stop_bss_event); + qdf_event_set(&pHostapdState->qdf_stop_bss_event); /* notify userspace that the BSS has stopped */ memset(&we_custom_event, '\0', sizeof(we_custom_event)); @@ -4441,7 +4441,7 @@ __iw_softap_setwpsie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_hostapd_state_t *pHostapdState; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *wps_genie; uint8_t *fwps_genie; uint8_t *pos; @@ -4496,7 +4496,7 @@ __iw_softap_setwpsie(struct net_device *dev, pSap_WPSIe = qdf_mem_malloc(sizeof(tSap_WPSIE)); if (NULL == pSap_WPSIe) { - hddLog(LOGE, "CDF unable to allocate memory"); + hddLog(LOGE, "QDF unable to allocate memory"); kfree(fwps_genie); return -ENOMEM; } @@ -4993,11 +4993,11 @@ __iw_softap_setwpsie(struct net_device *dev, } /* switch */ } #ifdef WLAN_FEATURE_MBSSID - cdf_ret_status = + qdf_ret_status = wlansap_set_wps_ie(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter), pSap_WPSIe); #else - cdf_ret_status = wlansap_set_wps_ie(p_cds_context, pSap_WPSIe); + qdf_ret_status = wlansap_set_wps_ie(p_cds_context, pSap_WPSIe); #endif pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); if (pHostapdState->bCommit && WPSIeType == eQC_WPS_PROBE_RSP_IE) { @@ -5011,7 +5011,7 @@ __iw_softap_setwpsie(struct net_device *dev, qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); EXIT(); - return cdf_ret_status; + return qdf_ret_status; } static int iw_softap_setwpsie(struct net_device *dev, @@ -5049,7 +5049,7 @@ __iw_softap_stopbss(struct net_device *dev, hdd_hostapd_state_t *pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); - qdf_event_reset(&pHostapdState->cdf_stop_bss_event); + qdf_event_reset(&pHostapdState->qdf_stop_bss_event); #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pHostapdAdapter)); @@ -5061,7 +5061,7 @@ __iw_softap_stopbss(struct net_device *dev, if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> - cdf_stop_bss_event, + qdf_stop_bss_event, 10000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -5240,7 +5240,7 @@ static int __iw_set_ap_genie(struct net_device *dev, v_CONTEXT_t cds_ctx; #endif hdd_context_t *hdd_ctx; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; uint8_t *genie = (uint8_t *)extra; int ret; @@ -5255,7 +5255,7 @@ static int __iw_set_ap_genie(struct net_device *dev, cds_ctx = hdd_ctx->pcds_context; if (NULL == cds_ctx) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: CDF Context is NULL", __func__); + "%s: QDF Context is NULL", __func__); return -EINVAL; } #endif @@ -5274,12 +5274,12 @@ static int __iw_set_ap_genie(struct net_device *dev, } (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->uPrivacy = 1; #ifdef WLAN_FEATURE_MBSSID - cdf_ret_status = + qdf_ret_status = wlansap_set_wparsn_ies(WLAN_HDD_GET_SAP_CTX_PTR (pHostapdAdapter), genie, wrqu->data.length); #else - cdf_ret_status = + qdf_ret_status = wlansap_set_wparsn_ies(cds_ctx, genie, wrqu->data.length); #endif @@ -5287,11 +5287,11 @@ static int __iw_set_ap_genie(struct net_device *dev, default: hddLog(LOGE, FL("Set UNKNOWN IE %X"), genie[0]); - cdf_ret_status = 0; + qdf_ret_status = 0; } EXIT(); - return cdf_ret_status; + return qdf_ret_status; } /** @@ -6035,16 +6035,16 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) return status; } - qdf_status = qdf_event_create(&phostapdBuf->cdf_event); + qdf_status = qdf_event_create(&phostapdBuf->qdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(LOGE, ("ERROR: Hostapd HDD cdf event init failed!!")); + hddLog(LOGE, ("ERROR: Hostapd HDD qdf event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); #endif return qdf_status; } - qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event); + qdf_status = qdf_event_create(&phostapdBuf->qdf_stop_bss_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, ("ERROR: Hostapd HDD stop bss event init failed!!")); @@ -6189,7 +6189,7 @@ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, * @pAdapter: Pointer to hostapd adapter * @rtnl_lock_held: RTNL lock held * - * Return: CDF status + * Return: QDF status */ QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_lock_held) { @@ -7778,7 +7778,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, (WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter))->dfs_cac_block_tx = true; - qdf_event_reset(&pHostapdState->cdf_event); + qdf_event_reset(&pHostapdState->qdf_event); status = wlansap_start_bss( #ifdef WLAN_FEATURE_MBSSID WLAN_HDD_GET_SAP_CTX_PTR @@ -7798,13 +7798,13 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, hddLog(LOG1, FL("Waiting for Scan to complete(auto mode) and BSS to start")); - qdf_status = qdf_wait_single_event(&pHostapdState->cdf_event, 10000); + qdf_status = qdf_wait_single_event(&pHostapdState->qdf_event, 10000); wlansap_reset_sap_config_add_ie(pConfig, eUPDATE_IE_ALL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, - FL("ERROR: HDD cdf wait for single_event failed!!")); + FL("ERROR: HDD qdf wait for single_event failed!!")); cds_set_connection_in_progress(false); sme_get_command_q_status(hHal); #ifdef WLAN_FEATURE_MBSSID @@ -7961,7 +7961,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_hostapd_state_t *pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); - qdf_event_reset(&pHostapdState->cdf_stop_bss_event); + qdf_event_reset(&pHostapdState->qdf_stop_bss_event); #ifdef WLAN_FEATURE_MBSSID status = wlansap_stop_bss(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter)); #else @@ -7970,12 +7970,12 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (QDF_IS_STATUS_SUCCESS(status)) { qdf_status = qdf_wait_single_event(&pHostapdState-> - cdf_stop_bss_event, + qdf_stop_bss_event, 10000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, - FL("HDD cdf wait for single_event failed!!")); + FL("HDD qdf wait for single_event failed!!")); QDF_ASSERT(0); } } @@ -8137,7 +8137,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, return -EINVAL; } if (pHddCtx->config->policy_manager_enabled) { - status = cdf_reset_connection_update(); + status = qdf_reset_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("ERR: clear event failed"); @@ -8150,9 +8150,9 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, } if (QDF_STATUS_SUCCESS == status) { - status = cdf_wait_for_connection_update(); + status = qdf_wait_for_connection_update(); if (!QDF_IS_STATUS_SUCCESS(status)) { - hdd_err("ERROR: cdf wait for event failed!!"); + hdd_err("ERROR: qdf wait for event failed!!"); return -EINVAL; } } diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 215f8048afa2..d2c14590e8fd 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -474,7 +474,7 @@ hdd_parse_send_action_frame_v1_data(const uint8_t *pValue, */ *pBuf = qdf_mem_malloc((*pBufLen + 1) / 2); if (NULL == *pBuf) { - hddLog(LOGE, FL("cdf_mem_alloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } @@ -1577,7 +1577,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, tpSirExtWoWParams arg_params) { tSirExtWoWParams params; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); int rc; @@ -1586,13 +1586,13 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, INIT_COMPLETION(hdd_ctx->ready_to_extwow); - cdf_ret_status = sme_configure_ext_wow(hHal, ¶ms, + qdf_ret_status = sme_configure_ext_wow(hHal, ¶ms, &wlan_hdd_ready_to_extwow, hdd_ctx); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_ext_wow returned failure %d"), - cdf_ret_status); + qdf_ret_status); return -EPERM; } @@ -1620,11 +1620,11 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter, __func__, rc); return rc; } - cdf_ret_status = wlan_hdd_bus_suspend(state); - if (cdf_ret_status != QDF_STATUS_SUCCESS) { + qdf_ret_status = wlan_hdd_bus_suspend(state); + if (qdf_ret_status != QDF_STATUS_SUCCESS) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: wlan_hdd_suspend failed, status = %d", - __func__, cdf_ret_status); + __func__, qdf_ret_status); wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy); return -EPERM; } @@ -1685,15 +1685,15 @@ static int hdd_set_app_type1_params(tHalHandle hHal, tpSirAppType1Params arg_params) { tSirAppType1Params params; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; qdf_mem_copy(¶ms, arg_params, sizeof(params)); - cdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = sme_configure_app_type1_params(hHal, ¶ms); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type1_params returned failure %d"), - cdf_ret_status); + qdf_ret_status); return -EPERM; } @@ -1743,15 +1743,15 @@ static int hdd_set_app_type2_params(tHalHandle hHal, tpSirAppType2Params arg_params) { tSirAppType2Params params; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; qdf_mem_copy(¶ms, arg_params, sizeof(params)); - cdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = sme_configure_app_type2_params(hHal, ¶ms); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_app_type2_params returned failure %d"), - cdf_ret_status); + qdf_ret_status); return -EPERM; } @@ -2376,7 +2376,7 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe, */ *pCckmIe = qdf_mem_malloc((*pCckmIeLen + 1) / 2); if (NULL == *pCckmIe) { - hddLog(LOGE, FL("cdf_mem_alloc failed")); + hddLog(LOGE, FL("qdf_mem_malloc failed")); return -ENOMEM; } qdf_mem_zero(*pCckmIe, (*pCckmIeLen + 1) / 2); @@ -4145,7 +4145,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, fastreassoc = qdf_mem_malloc(sizeof(*fastreassoc)); if (NULL == fastreassoc) { - hddLog(LOGE, FL("cdf_mem_alloc failed for fastreassoc")); + hddLog(LOGE, FL("qdf_mem_malloc failed for fastreassoc")); return; } fastreassoc->vdev_id = sessionId; diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 77522bd106a1..1f08b62d2ca3 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -67,14 +67,14 @@ static int hdd_lro_get_skb_header(struct sk_buff *skb, void **ip_hdr, void **tcpudp_hdr, u64 *hdr_flags, void *priv) { - if (NBUF_CB_RX_IPV6_PROTO(skb)) { + if (QDF_NBUF_CB_RX_IPV6_PROTO(skb)) { hdr_flags = 0; return -EINVAL; } *hdr_flags |= (LRO_IPV4 | LRO_TCP); (*ip_hdr) = skb->data; - (*tcpudp_hdr) = skb->data + NBUF_CB_RX_TCP_OFFSET(skb); + (*tcpudp_hdr) = skb->data + QDF_NBUF_CB_RX_TCP_OFFSET(skb); return 0; } @@ -215,7 +215,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter, struct hdd_lro_desc_info *desc_info = &adapter->lro_info.lro_desc_info; *lro_desc = NULL; - i = NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK; + i = QDF_NBUF_CB_RX_FLOW_ID_TOEPLITZ(skb) & LRO_DESC_TABLE_SZ_MASK; lro_hash_table = &desc_info->lro_hash_table[i]; @@ -321,7 +321,8 @@ static bool hdd_lro_eligible(hdd_adapter_t *adapter, struct sk_buff *skb, { struct net_lro_desc *lro_desc = NULL; int hw_lro_eligible = - NBUF_CB_RX_LRO_ELIGIBLE(skb) && (!NBUF_CB_RX_TCP_PURE_ACK(skb)); + QDF_NBUF_CB_RX_LRO_ELIGIBLE(skb) && + (!QDF_NBUF_CB_RX_TCP_PURE_ACK(skb)); if (!hw_lro_eligible) return false; @@ -624,12 +625,12 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx, enum hdd_lro_rx_status status = HDD_LRO_NO_RX; if ((adapter->dev->features & NETIF_F_LRO) && - NBUF_CB_RX_TCP_PROTO(skb)) { + QDF_NBUF_CB_RX_TCP_PROTO(skb)) { struct iphdr *iph; struct tcphdr *tcph; struct net_lro_desc *lro_desc = NULL; iph = (struct iphdr *)skb->data; - tcph = (struct tcphdr *)(skb->data + NBUF_CB_RX_TCP_OFFSET(skb)); + tcph = (struct tcphdr *)(skb->data + QDF_NBUF_CB_RX_TCP_OFFSET(skb)); if (hdd_lro_eligible(adapter, skb, iph, tcph, &lro_desc)) { struct net_lro_info hdd_lro_info; @@ -637,11 +638,11 @@ enum hdd_lro_rx_status hdd_lro_rx(hdd_context_t *hdd_ctx, hdd_lro_info.lro_desc = lro_desc; hdd_lro_info.lro_eligible = 1; - hdd_lro_info.tcp_ack_num = NBUF_CB_RX_TCP_ACK_NUM(skb); + hdd_lro_info.tcp_ack_num = QDF_NBUF_CB_RX_TCP_ACK_NUM(skb); hdd_lro_info.tcp_data_csum = - csum_unfold(htons(NBUF_CB_RX_TCP_CHKSUM(skb))); - hdd_lro_info.tcp_seq_num = NBUF_CB_RX_TCP_SEQ_NUM(skb); - hdd_lro_info.tcp_win = NBUF_CB_RX_TCP_WIN(skb); + csum_unfold(htons(QDF_NBUF_CB_RX_TCP_CHKSUM(skb))); + hdd_lro_info.tcp_seq_num = QDF_NBUF_CB_RX_TCP_SEQ_NUM(skb); + hdd_lro_info.tcp_win = QDF_NBUF_CB_RX_TCP_WIN(skb); lro_receive_skb_ext(adapter->lro_info.lro_mgr, skb, (void *)adapter, &hdd_lro_info); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index d6557cc36b80..f9ae7bd2ff26 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -473,7 +473,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, } /** - * hdd_cdf_trace_enable() - configure initial CDF Trace enable + * hdd_qdf_trace_enable() - configure initial QDF Trace enable * @moduleId: Module whose trace level is being configured * @bitmask: Bitmask of log levels to be enabled * @@ -482,7 +482,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, * * Return: None */ -static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) +static void hdd_qdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) { QDF_TRACE_LEVEL level; @@ -491,7 +491,7 @@ static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask) * specified in cfg.ini, so leave the logging level alone (it * will remain at the "compiled in" default value) */ - if (CFG_CDF_TRACE_ENABLE_DEFAULT == bitmask) { + if (CFG_QDF_TRACE_ENABLE_DEFAULT == bitmask) { return; } @@ -1636,7 +1636,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; struct sockaddr *psta_mac_addr = addr; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; int ret; ENTER(); @@ -1650,7 +1650,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN); EXIT(); - return cdf_ret_status; + return qdf_ret_status; } /** @@ -1937,7 +1937,7 @@ QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, struct net_device *pWlanDev = adapter->dev; /* hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; */ /* hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX( adapter ); */ - /* QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; */ + /* QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; */ if (rtnl_held) { if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) { @@ -2015,7 +2015,7 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) struct net_device *pWlanDev = adapter->dev; hdd_station_ctx_t *pHddStaCtx = &adapter->sessionCtx.station; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_E_FAILURE; uint32_t type, subType; unsigned long rc; @@ -2029,14 +2029,14 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) goto error_sme_open; } /* Open a SME session for future operation */ - cdf_ret_status = + qdf_ret_status = sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter, (uint8_t *) &adapter->macAddressCurrent, &adapter->sessionId, type, subType); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { hddLog(LOGP, FL("sme_open_session() failed, status code %08d [x%08x]"), - cdf_ret_status, cdf_ret_status); + qdf_ret_status, qdf_ret_status); status = QDF_STATUS_E_FAILURE; goto error_sme_open; } @@ -2053,11 +2053,11 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) } /* Register wireless extensions */ - cdf_ret_status = hdd_register_wext(pWlanDev); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = hdd_register_wext(pWlanDev); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { hddLog(LOGP, FL("hdd_register_wext() failed, status code %08d [x%08x]"), - cdf_ret_status, cdf_ret_status); + qdf_ret_status, qdf_ret_status); status = QDF_STATUS_E_FAILURE; goto error_register_wext; } @@ -2711,7 +2711,7 @@ QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, * * Close all open adapters. * - * Return: CDF status code + * Return: QDF status code */ QDF_STATUS hdd_close_all_adapters(hdd_context_t *hdd_ctx, bool rtnl_held) { @@ -2783,7 +2783,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, const bool bCloseSession) { - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); union iwreq_data wrqu; tSirUpdateIE updateIE; @@ -2805,17 +2805,17 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { if (pWextState->roamProfile.BSSType == eCSR_BSS_TYPE_START_IBSS) - cdf_ret_status = + qdf_ret_status = sme_roam_disconnect(hdd_ctx->hHal, adapter->sessionId, eCSR_DISCONNECT_REASON_IBSS_LEAVE); else - cdf_ret_status = + qdf_ret_status = sme_roam_disconnect(hdd_ctx->hHal, adapter->sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); /* success implies disconnect command got queued up successfully */ - if (cdf_ret_status == QDF_STATUS_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_SUCCESS) { rc = wait_for_completion_timeout( &adapter->disconnect_comp_var, msecs_to_jiffies @@ -2921,10 +2921,10 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, hdd_hostapd_state_t *hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); qdf_event_reset(&hostapd_state-> - cdf_stop_bss_event); + qdf_stop_bss_event); qdf_status = qdf_wait_single_event(&hostapd_state-> - cdf_stop_bss_event, + qdf_stop_bss_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -3943,19 +3943,19 @@ int hdd_wlan_notify_modem_power_state(int state) */ QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx) { - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; /* * Send ready indication to the HDD. This will kick off the MAC * into a 'running' state and should kick off an initial scan. */ - cdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + qdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal); + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { hddLog(QDF_TRACE_LEVEL_ERROR, FL( "sme_hdd_ready_ind() failed with status code %08d [x%08x]" ), - cdf_ret_status, cdf_ret_status); + qdf_ret_status, qdf_ret_status); return QDF_STATUS_E_FAILURE; } @@ -5016,42 +5016,42 @@ static void hdd_override_ini_config(hdd_context_t *hdd_ctx) */ static void hdd_set_trace_level_for_each(hdd_context_t *hdd_ctx) { - hdd_cdf_trace_enable(QDF_MODULE_ID_WMI, - hdd_ctx->config->cdf_trace_enable_wdi); - hdd_cdf_trace_enable(QDF_MODULE_ID_HDD, - hdd_ctx->config->cdf_trace_enable_hdd); - hdd_cdf_trace_enable(QDF_MODULE_ID_SME, - hdd_ctx->config->cdf_trace_enable_sme); - hdd_cdf_trace_enable(QDF_MODULE_ID_PE, - hdd_ctx->config->cdf_trace_enable_pe); - hdd_cdf_trace_enable(QDF_MODULE_ID_WMA, - hdd_ctx->config->cdf_trace_enable_wma); - hdd_cdf_trace_enable(QDF_MODULE_ID_SYS, - hdd_ctx->config->cdf_trace_enable_sys); - hdd_cdf_trace_enable(QDF_MODULE_ID_QDF, - hdd_ctx->config->cdf_trace_enable_cdf); - hdd_cdf_trace_enable(QDF_MODULE_ID_SAP, - hdd_ctx->config->cdf_trace_enable_sap); - hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP, - hdd_ctx->config->cdf_trace_enable_hdd_sap); - hdd_cdf_trace_enable(QDF_MODULE_ID_BMI, - hdd_ctx->config->cdf_trace_enable_bmi); - hdd_cdf_trace_enable(QDF_MODULE_ID_CFG, - hdd_ctx->config->cdf_trace_enable_cfg); - hdd_cdf_trace_enable(QDF_MODULE_ID_EPPING, - hdd_ctx->config->cdf_trace_enable_epping); - hdd_cdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE, - hdd_ctx->config->cdf_trace_enable_cdf_devices); - hdd_cdf_trace_enable(QDF_MODULE_ID_TXRX, + hdd_qdf_trace_enable(QDF_MODULE_ID_WMI, + hdd_ctx->config->qdf_trace_enable_wdi); + hdd_qdf_trace_enable(QDF_MODULE_ID_HDD, + hdd_ctx->config->qdf_trace_enable_hdd); + hdd_qdf_trace_enable(QDF_MODULE_ID_SME, + hdd_ctx->config->qdf_trace_enable_sme); + hdd_qdf_trace_enable(QDF_MODULE_ID_PE, + hdd_ctx->config->qdf_trace_enable_pe); + hdd_qdf_trace_enable(QDF_MODULE_ID_WMA, + hdd_ctx->config->qdf_trace_enable_wma); + hdd_qdf_trace_enable(QDF_MODULE_ID_SYS, + hdd_ctx->config->qdf_trace_enable_sys); + hdd_qdf_trace_enable(QDF_MODULE_ID_QDF, + hdd_ctx->config->qdf_trace_enable_qdf); + hdd_qdf_trace_enable(QDF_MODULE_ID_SAP, + hdd_ctx->config->qdf_trace_enable_sap); + hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SOFTAP, + hdd_ctx->config->qdf_trace_enable_hdd_sap); + hdd_qdf_trace_enable(QDF_MODULE_ID_BMI, + hdd_ctx->config->qdf_trace_enable_bmi); + hdd_qdf_trace_enable(QDF_MODULE_ID_CFG, + hdd_ctx->config->qdf_trace_enable_cfg); + hdd_qdf_trace_enable(QDF_MODULE_ID_EPPING, + hdd_ctx->config->qdf_trace_enable_epping); + hdd_qdf_trace_enable(QDF_MODULE_ID_QDF_DEVICE, + hdd_ctx->config->qdf_trace_enable_qdf_devices); + hdd_qdf_trace_enable(QDF_MODULE_ID_TXRX, hdd_ctx->config->cfd_trace_enable_txrx); - hdd_cdf_trace_enable(QDF_MODULE_ID_HTC, - hdd_ctx->config->cdf_trace_enable_htc); - hdd_cdf_trace_enable(QDF_MODULE_ID_HIF, - hdd_ctx->config->cdf_trace_enable_hif); - hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA, - hdd_ctx->config->cdf_trace_enable_hdd_sap_data); - hdd_cdf_trace_enable(QDF_MODULE_ID_HDD_DATA, - hdd_ctx->config->cdf_trace_enable_hdd_data); + hdd_qdf_trace_enable(QDF_MODULE_ID_HTC, + hdd_ctx->config->qdf_trace_enable_htc); + hdd_qdf_trace_enable(QDF_MODULE_ID_HIF, + hdd_ctx->config->qdf_trace_enable_hif); + hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_SAP_DATA, + hdd_ctx->config->qdf_trace_enable_hdd_sap_data); + hdd_qdf_trace_enable(QDF_MODULE_ID_HDD_DATA, + hdd_ctx->config->qdf_trace_enable_hdd_data); hdd_cfg_print(hdd_ctx); } @@ -5168,7 +5168,7 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) goto err_free_config; /* - * Update CDF trace levels based upon the code. The multicast + * Update QDF trace levels based upon the code. The multicast * levels of the code need not be set when the logger thread * is not enabled. */ @@ -6593,11 +6593,11 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Now doing SAP STOPBSS")); - qdf_event_reset(&hostapd_state->cdf_stop_bss_event); + qdf_event_reset(&hostapd_state->qdf_stop_bss_event); if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx-> sapContext)) { qdf_status = qdf_wait_single_event(&hostapd_state-> - cdf_stop_bss_event, + qdf_stop_bss_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { mutex_unlock(&hdd_ctx->sap_lock); @@ -6674,7 +6674,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("Waiting for SAP to start")); - qdf_status = qdf_wait_single_event(&hostapd_state->cdf_event, + qdf_status = qdf_wait_single_event(&hostapd_state->qdf_event, BSS_WAIT_TIMEOUT); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP Start failed")); @@ -6819,7 +6819,7 @@ static int __hdd_module_init(void) goto out; } - pr_info("%s: qdf converged driver loaded\n", WLAN_MODULE_NAME); + pr_info("%s: driver loaded\n", WLAN_MODULE_NAME); return 0; out: diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index 49a9a4a5a2f8..ec3cb91631ac 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -84,13 +84,13 @@ static void memdump_cleanup_timer_cb(void *data) qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!qdf_ctx) { - hddLog(LOGE, FL("CDF context is NULL")); + hddLog(LOGE, FL("QDF context is NULL")); return; } paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - qdf_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -216,7 +216,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!qdf_ctx) { - hddLog(LOGE, FL("CDF context is NULL")); + hddLog(LOGE, FL("QDF context is NULL")); return -EINVAL; } @@ -299,7 +299,7 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, if (QDF_STATUS_SUCCESS != sme_status) { hddLog(LOGE, FL("sme_fw_mem_dump Failed")); mutex_lock(&hdd_ctx->memdump_lock); - qdf_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; mutex_unlock(&hdd_ctx->memdump_lock); @@ -407,7 +407,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, } qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!qdf_ctx) { - hddLog(LOGE, FL("CDF context is NULL")); + hddLog(LOGE, FL("QDF context is NULL")); return -EINVAL; } @@ -443,7 +443,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf, if (*pos >= FW_MEM_DUMP_SIZE) { paddr = hdd_ctx->dump_loc_paddr; mutex_lock(&hdd_ctx->memdump_lock); - qdf_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; @@ -609,7 +609,7 @@ void memdump_deinit(void) qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); if (!qdf_ctx) { - hddLog(LOGE, FL("CDF context is NULL")); + hddLog(LOGE, FL("QDF context is NULL")); return; } @@ -619,7 +619,7 @@ void memdump_deinit(void) mutex_lock(&hdd_ctx->memdump_lock); if (hdd_ctx->fw_dump_loc) { paddr = hdd_ctx->dump_loc_paddr; - qdf_mem_free_consistent(qdf_ctx, + qdf_mem_free_consistent(qdf_ctx, qdf_ctx->dev, FW_MEM_DUMP_SIZE, hdd_ctx->fw_dump_loc, paddr, dma_ctx); hdd_ctx->fw_dump_loc = NULL; hdd_ctx->memdump_in_progress = false; diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 62ff20ae9e02..f011b660e4d7 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -422,7 +422,7 @@ static int hdd_ocb_set_config_req(hdd_adapter_t *adapter, hdd_ocb_set_config_callback, config); if (qdf_status != QDF_STATUS_SUCCESS) { hddLog(LOGE, FL("Error calling SME function.")); - /* Convert from ecdf_status to errno */ + /* Convert from qdf_status to errno */ return -EINVAL; } @@ -1369,7 +1369,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy, &request); if (rc) { hddLog(LOGE, FL("Error calling SME function")); - /* Need to convert from ecdf_status to errno. */ + /* Need to convert from qdf_status to errno. */ return -EINVAL; } diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 61802fa7216a..cff0d5c0c48f 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -832,12 +832,12 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx, */ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; tpSirWlanSetRxpFilters wlanRxpFilterParam = qdf_mem_malloc(sizeof(tSirWlanSetRxpFilters)); if (NULL == wlanRxpFilterParam) { hddLog(QDF_TRACE_LEVEL_FATAL, - "%s: cdf_mem_alloc failed ", __func__); + "%s: qdf_mem_malloc failed ", __func__); return; } hddLog(QDF_TRACE_LEVEL_INFO, @@ -854,20 +854,20 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter) } wlanRxpFilterParam->setMcstBcstFilter = setfilter; - cdf_ret_status = + qdf_ret_status = sme_configure_rxp_filter(pHddCtx->hHal, wlanRxpFilterParam); - if (setfilter && (QDF_STATUS_SUCCESS == cdf_ret_status)) + if (setfilter && (QDF_STATUS_SUCCESS == qdf_ret_status)) pHddCtx->hdd_mcastbcast_filter_set = true; hddLog(LOG1, FL("%s to post set/reset filter to lower mac with status %d configuredMcstBcstFilterSetting = %d setMcstBcstFilter = %d"), - (QDF_STATUS_SUCCESS != cdf_ret_status) ? "Failed" : "Success", - cdf_ret_status, + (QDF_STATUS_SUCCESS != qdf_ret_status) ? "Failed" : "Success", + qdf_ret_status, wlanRxpFilterParam->configuredMcstBcstFilterSetting, wlanRxpFilterParam->setMcstBcstFilter); - if (QDF_STATUS_SUCCESS != cdf_ret_status) + if (QDF_STATUS_SUCCESS != qdf_ret_status) qdf_mem_free(wlanRxpFilterParam); } @@ -1001,20 +1001,20 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, bool suspended), void *callbackContext) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; hdd_info("%s: send wlan suspend indication", __func__); - cdf_ret_status = + qdf_ret_status = sme_configure_suspend_ind(pHddCtx->hHal, conn_state_mask, callback, callbackContext); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { pHddCtx->hdd_mcastbcast_filter_set = true; } else { hddLog(QDF_TRACE_LEVEL_ERROR, FL("sme_configure_suspend_ind returned failure %d"), - cdf_ret_status); + qdf_ret_status); } } @@ -1027,14 +1027,14 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx, static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter) { hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; - cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL); + qdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: sme_configure_resume_req return failure %d", - __func__, cdf_ret_status); + __func__, qdf_ret_status); } @@ -1405,7 +1405,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) QDF_STATUS qdf_status; v_CONTEXT_t p_cds_context = NULL; hdd_context_t *pHddCtx = NULL; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; hdd_adapter_t *pAdapter; int i; @@ -1488,14 +1488,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) /* Set the MAC Address, currently this is used by HAL to add self sta. * Remove this once self sta is added as part of session open. */ - cdf_ret_status = cfg_set_str(pHddCtx->hHal, WNI_CFG_STA_ID, + qdf_ret_status = cfg_set_str(pHddCtx->hHal, WNI_CFG_STA_ID, (uint8_t *) &pHddCtx->config-> intfMacAddr[0], sizeof(pHddCtx->config->intfMacAddr[0])); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. " - "HALStatus is %08d [x%08x]", __func__, cdf_ret_status, - cdf_ret_status); + "HALStatus is %08d [x%08x]", __func__, qdf_ret_status, + qdf_ret_status); goto err_cds_close; } diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index be7d6df53f9a..c77a296ac279 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1087,7 +1087,7 @@ nla_put_failure: * @scanId: Scan Id * @status: Scan status * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle, void *pContext, diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index b20c086f0ebd..39ffe38958ad 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -600,7 +600,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, * @pAdapter: pointer to adapter context * @staId: Station ID to deregister * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) { @@ -653,7 +653,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId) * @pPeerMacAddress: station MAC address * @fWmmEnabled: is WMM enabled for this STA? * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, bool fAuthRequired, @@ -753,7 +753,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * @pAdapter: pointer to adapter context * @fPrivacyBit: should 802.11 privacy bit be set? * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, bool fPrivacyBit) @@ -784,7 +784,7 @@ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter, * hdd_softap_deregister_bc_sta() - Deregister the SoftAP broadcast STA * @pAdapter: pointer to adapter context * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) { @@ -797,7 +797,7 @@ QDF_STATUS hdd_softap_deregister_bc_sta(hdd_adapter_t *pAdapter) * hdd_softap_stop_bss() - Stop the BSS * @pAdapter: pointer to adapter context * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) { @@ -845,7 +845,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter) * @pDestMacAddress: MAC address of the station * @state: new state of the station * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, struct qdf_mac_addr *pDestMacAddress, diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 326194305046..8f764fa688b4 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -535,7 +535,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) int i; uint8_t staIdx; tdlsInfo_t *tInfo; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddCtx) return -EINVAL; @@ -680,7 +680,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) tInfo = qdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tInfo) { hddLog(QDF_TRACE_LEVEL_ERROR, - FL("cdf_mem_alloc failed for tInfo")); + FL("qdf_mem_malloc failed for tInfo")); qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); qdf_mem_free(pHddTdlsCtx); return -ENOMEM; @@ -722,8 +722,8 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter) pHddCtx->config->tdls_peer_kickout_threshold; dump_tdls_state_param_setting(tInfo); - cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, true); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { qdf_mem_free(tInfo); qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer); qdf_mem_free(pHddTdlsCtx); @@ -744,7 +744,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) tdlsCtx_t *pHddTdlsCtx; hdd_context_t *pHddCtx; tdlsInfo_t *tInfo; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pHddCtx = WLAN_HDD_GET_CTX(pAdapter); if (!pHddCtx) { @@ -824,14 +824,14 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter) pHddCtx->config->tdls_peer_kickout_threshold; dump_tdls_state_param_setting(tInfo); - cdf_ret_status = + qdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tInfo, false); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { qdf_mem_free(tInfo); } } else { hddLog(QDF_TRACE_LEVEL_ERROR, - "%s: cdf_mem_alloc failed for tInfo", __func__); + "%s: qdf_mem_malloc failed for tInfo", __func__); } } @@ -1591,7 +1591,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter); eTDLSSupportMode req_tdls_mode; tdlsInfo_t *tdlsParams; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; if (NULL == pHddTdlsCtx) { hddLog(LOGE, FL("TDLS not enabled!")); @@ -1631,7 +1631,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, tdlsParams = qdf_mem_malloc(sizeof(tdlsInfo_t)); if (NULL == tdlsParams) { hddLog(QDF_TRACE_LEVEL_ERROR, - "%s: cdf_mem_alloc failed for tdlsParams", __func__); + "%s: qdf_mem_malloc failed for tdlsParams", __func__); return -ENOMEM; } @@ -1665,8 +1665,8 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, dump_tdls_state_param_setting(tdlsParams); - cdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = sme_update_fw_tdls_state(pHddCtx->hHal, tdlsParams, true); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { qdf_mem_free(tdlsParams); return -EINVAL; } @@ -1697,7 +1697,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); tdlsCtx_t *hdd_tdls_ctx = WLAN_HDD_GET_TDLS_CTX_PTR(adapter); tdlsInfo_t *tdls_param; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; if (!hdd_tdls_ctx) { /* may be TDLS is not applicable for this adapter */ @@ -1774,10 +1774,10 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited, dump_tdls_state_param_setting(tdls_param); - cdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal, + qdf_ret_status = sme_update_fw_tdls_state(hdd_ctx->hHal, tdls_param, true); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { qdf_mem_free(tdls_param); return; } @@ -4157,7 +4157,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); int status; tSmeTdlsPeerStateParams smeTdlsPeerStateParams; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; hddTdlsPeer_t *pTdlsPeer; ENTER(); @@ -4384,12 +4384,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, supported_oper_classes[i]; } - cdf_ret_status = + qdf_ret_status = sme_update_tdls_peer_state(pHddCtx-> hHal, &smeTdlsPeerStateParams); if (QDF_STATUS_SUCCESS != - cdf_ret_status) { + qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_update_tdls_peer_state failed for " diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index daa2cb4ecd50..5dda7dcf2fb8 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1088,7 +1088,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext) * @pAdapter: adapter upon which the measurement is requested * @rssi_value: pointer to where the RSSI should be returned * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) { @@ -1177,7 +1177,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value) * @pAdapter: adapter upon which the measurement is requested * @snr: pointer to where the SNR should be returned * - * Return: QDF_STATUS_SUCCESS on success, CDF_STATUS_E_* on error + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error */ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr) { @@ -1327,7 +1327,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext) * given peer, and then wait for the callback to be invoked. * * Return: QDF_STATUS_SUCCESS if linkspeed data is available, - * otherwise a CDF_STATUS_E_* error. + * otherwise a QDF_STATUS_E_** error. */ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter, struct qdf_mac_addr macAddress) { @@ -1487,7 +1487,7 @@ void hdd_statistics_cb(void *pStats, void *pContext) if (pAdapter) { pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - qdf_status = qdf_event_set(&pWextState->hdd_cdf_event); + qdf_status = qdf_event_set(&pWextState->hdd_qdf_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("qdf_event_set failed")); return; @@ -2274,7 +2274,7 @@ static int __iw_get_bitrate(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); qdf_status = - qdf_wait_single_event(&pWextState->hdd_cdf_event, + qdf_wait_single_event(&pWextState->hdd_qdf_event, WLAN_WAIT_TIME_STATS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -4036,7 +4036,7 @@ static int __iw_set_encodeext(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_context_t *hdd_ctx; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; int ret; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; @@ -4187,13 +4187,13 @@ static int __iw_set_encodeext(struct net_device *dev, * pre-authentication is done. Save the key in the UMAC and * include it in the ADD BSS request */ - cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), + qdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey); - if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: Update PreAuth Key success", __func__); return 0; - } else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { + } else if (qdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Update PreAuth Key failed", __func__); return -EINVAL; @@ -4201,19 +4201,19 @@ static int __iw_set_encodeext(struct net_device *dev, pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_SETTING_KEY; - cdf_ret_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX(pAdapter), + qdf_ret_status = sme_roam_set_key(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, &setKey, &roamId); - if (cdf_ret_status != QDF_STATUS_SUCCESS) { + if (qdf_ret_status != QDF_STATUS_SUCCESS) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "[%4d] sme_roam_set_key returned ERROR status= %d", - __LINE__, cdf_ret_status); + __LINE__, qdf_ret_status); pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE; } - return cdf_ret_status; + return qdf_ret_status; } /** @@ -7906,7 +7906,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, unitTestArgs = qdf_mem_malloc(sizeof(*unitTestArgs)); if (NULL == unitTestArgs) { hddLog(LOGE, - FL("cdf_mem_alloc failed for unitTestArgs")); + FL("qdf_mem_malloc failed for unitTestArgs")); return -ENOMEM; } unitTestArgs->vdev_id = (int)pAdapter->sessionId; @@ -8857,7 +8857,7 @@ static int __iw_get_statistics(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); qdf_status = - qdf_wait_single_event(&pWextState->hdd_cdf_event, + qdf_wait_single_event(&pWextState->hdd_qdf_event, WLAN_WAIT_TIME_STATS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(QDF_TRACE_LEVEL_ERROR, @@ -10770,9 +10770,9 @@ int hdd_register_wext(struct net_device *dev) return QDF_STATUS_E_FAILURE; } - if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) { + if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_qdf_event))) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - ("ERROR: HDD cdf event init failed!!")); + ("ERROR: HDD qdf event init failed!!")); return QDF_STATUS_E_FAILURE; } diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c index 209e7fcfa345..47f92eed57f3 100644 --- a/core/hdd/src/wlan_hdd_wowl.c +++ b/core/hdd/src/wlan_hdd_wowl.c @@ -57,10 +57,10 @@ static inline int find_ptrn_len(const char *ptrn) return len; } -static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status) +static void hdd_wowl_callback(void *pContext, QDF_STATUS qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, - "%s: Return code = (%d)", __func__, cdf_ret_status); + "%s: Return code = (%d)", __func__, qdf_ret_status); } #ifdef WLAN_WAKEUP_EVENTS @@ -117,7 +117,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) { struct wow_add_pattern localPattern; int i, first_empty_slot, len, offset; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; const char *temp; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t sessionId = pAdapter->sessionId; @@ -253,14 +253,14 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) localPattern.session_id = sessionId; /* Register the pattern downstream */ - cdf_ret_status = + qdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, sessionId); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { /* Add failed, so invalidate the local storage */ QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_wowl_add_bcast_pattern failed with error code (%d)", - cdf_ret_status); + qdf_ret_status); kfree(g_hdd_wowl_ptrns[first_empty_slot]); g_hdd_wowl_ptrns[first_empty_slot] = NULL; } @@ -293,7 +293,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) unsigned char id; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); bool patternFound = false; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; uint8_t sessionId = pAdapter->sessionId; hdd_context_t *pHddCtx = pAdapter->pHddCtx; @@ -311,10 +311,10 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn) if (patternFound) { delPattern.pattern_id = id; delPattern.session_id = sessionId; - cdf_ret_status = + qdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { /* Remove from local storage as well */ QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "Deleted pattern with id %d [%s]", id, @@ -344,7 +344,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, char *pattern_mask) { struct wow_add_pattern localPattern; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); uint8_t session_id = pAdapter->sessionId; uint16_t pattern_len, mask_len, i; @@ -429,13 +429,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx, } /* Register the pattern downstream */ - cdf_ret_status = + qdf_ret_status = sme_wow_add_pattern(hHal, &localPattern, session_id); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_add_bcast_pattern failed with error code (%d).", - __func__, cdf_ret_status); + __func__, qdf_ret_status); return false; } @@ -463,7 +463,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) { struct wow_delete_pattern delPattern; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; uint8_t sessionId = pAdapter->sessionId; if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) { @@ -484,13 +484,13 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) delPattern.pattern_id = pattern_idx; delPattern.session_id = sessionId; - cdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, + qdf_ret_status = sme_wow_delete_pattern(hHal, &delPattern, sessionId); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: sme_wowl_del_bcast_pattern failed with error code (%d).", - __func__, cdf_ret_status); + __func__, qdf_ret_status); return false; } @@ -513,7 +513,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx) bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) { tSirSmeWowlEnterParams wowParams; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); qdf_mem_zero(&wowParams, sizeof(tSirSmeWowlEnterParams)); @@ -534,19 +534,19 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm) #endif /* WLAN_WAKEUP_EVENTS */ /* Request to put FW into WoWL */ - cdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter, + qdf_ret_status = sme_enter_wowl(hHal, hdd_wowl_callback, pAdapter, #ifdef WLAN_WAKEUP_EVENTS hdd_wowl_wake_indication_callback, pAdapter, #endif /* WLAN_WAKEUP_EVENTS */ &wowParams, pAdapter->sessionId); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { - if (QDF_STATUS_PMC_PENDING != cdf_ret_status) { + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { + if (QDF_STATUS_PMC_PENDING != qdf_ret_status) { /* We failed to enter WoWL */ QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_enter_wowl failed with error code (%d)", - cdf_ret_status); + qdf_ret_status); return false; } } @@ -563,15 +563,15 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter) { tSirSmeWowlExitParams wowParams; tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; wowParams.sessionId = pAdapter->sessionId; - cdf_ret_status = sme_exit_wowl(hHal, &wowParams); - if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) { + qdf_ret_status = sme_exit_wowl(hHal, &wowParams); + if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "sme_exit_wowl failed with error code (%d)", - cdf_ret_status); + qdf_ret_status); return false; } diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 4281255e75f1..b8db70abbdec 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1816,7 +1816,7 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp) return; } if (session->cc_switch_mode != - CDF_MCC_TO_SCC_SWITCH_DISABLE) { + QDF_MCC_TO_SCC_SWITCH_DISABLE) { ht_profile = &join_rsp->HTProfile; ht_profile->htSupportedChannelWidthSet = session->htSupportedChannelWidthSet; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 32b862b68ced..c26903d8ec68 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -2423,7 +2423,7 @@ static void lim_process_periodic_probe_req_timer(tpAniSirGlobal mac_ctx) TX_TIMER *probe_req_timer = &mac_ctx->lim.limTimers.gLimPeriodicProbeReqTimer; - if (qdf_mc_timer_get_current_state(&probe_req_timer->cdf_timer) + if (qdf_mc_timer_get_current_state(&probe_req_timer->qdf_timer) != QDF_TIMER_STATE_STOPPED) { lim_log(mac_ctx, LOG1, FL("Invalid state of timer")); return; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 358016afc01c..02b4329ead73 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -343,7 +343,7 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->ch_width; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (session_entry->cc_switch_mode != - CDF_MCC_TO_SCC_SWITCH_DISABLE) { + QDF_MCC_TO_SCC_SWITCH_DISABLE) { ht_profile = &sme_join_rsp->HTProfile; ht_profile->htSupportedChannelWidthSet = session_entry->htSupportedChannelWidthSet; @@ -637,7 +637,7 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, size += ieLen - sizeof(uint32_t); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (psessionEntry->cc_switch_mode - != CDF_MCC_TO_SCC_SWITCH_DISABLE) { + != QDF_MCC_TO_SCC_SWITCH_DISABLE) { pSirSmeRsp->HTProfile. htSupportedChannelWidthSet = psessionEntry->htSupportedChannelWidthSet; diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c index d637ce3f0230..28b65f45085d 100644 --- a/core/mac/src/pe/sch/sch_debug.c +++ b/core/mac/src/pe/sch/sch_debug.c @@ -44,17 +44,17 @@ void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { - QDF_TRACE_LEVEL cdf_debug_level; + QDF_TRACE_LEVEL qdf_debug_level; char logBuffer[LOG_SIZE]; va_list marker; /* getting proper Debug level */ - cdf_debug_level = get_vos_debug_level(loglevel); + qdf_debug_level = get_vos_debug_level(loglevel); /* extracting arguments from pstring */ va_start(marker, pString); vsnprintf(logBuffer, LOG_SIZE, pString, marker); - QDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer); + QDF_TRACE(QDF_MODULE_ID_PE, qdf_debug_level, "%s", logBuffer); va_end(marker); } diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h index b6109f0d97ac..68c4a0017940 100644 --- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h +++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h @@ -110,7 +110,7 @@ typedef struct TX_TIMER_STRUCT { uint32_t expireInput; uint64_t initScheduleTimeInMsecs; uint64_t rescheduleTimeInMsecs; - qdf_mc_timer_t cdf_timer; + qdf_mc_timer_t qdf_timer; /* Pointer to the MAC global structure, which stores the context for the NIC, */ /* for which this timer is supposed to operate. */ diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c index 82603e9b29c8..b925da552957 100644 --- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c +++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c @@ -43,7 +43,7 @@ when who what, where, why -------- --- -------------------------------------------------------- - 03/31/09 sho Remove the use of cdf_timerIsActive flag as it is not + 03/31/09 sho Remove the use of qdf_timerIsActive flag as it is not thread-safe 02/17/08 sho Fix the timer callback function to work when it is called after the timer has stopped due to a race condition. @@ -138,7 +138,7 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr) QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "Timer %s being activated\n", TIMER_NAME); - status = qdf_mc_timer_start(&timer_ptr->cdf_timer, + status = qdf_mc_timer_start(&timer_ptr->qdf_timer, timer_ptr->initScheduleTimeInMsecs); if (QDF_STATUS_SUCCESS == status) { @@ -184,7 +184,7 @@ uint32_t tx_timer_change(TX_TIMER *timer_ptr, } /* changes cannot be applied until timer stops running */ if (QDF_TIMER_STATE_STOPPED == - qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) { timer_ptr->initScheduleTimeInMsecs = TX_MSECS_IN_1_TICK * initScheduleTimeInTicks; timer_ptr->rescheduleTimeInMsecs = @@ -223,7 +223,7 @@ uint32_t tx_timer_change_context(TX_TIMER *timer_ptr, } /* changes cannot be applied until timer stops running */ if (QDF_TIMER_STATE_STOPPED == - qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) { timer_ptr->expireInput = expiration_input; return TX_SUCCESS; } else { @@ -271,7 +271,7 @@ static void tx_main_timer_func(void *functionContext) /* check if this needs to be rescheduled */ if (0 != timer_ptr->rescheduleTimeInMsecs) { QDF_STATUS status; - status = qdf_mc_timer_start(&timer_ptr->cdf_timer, + status = qdf_mc_timer_start(&timer_ptr->qdf_timer, timer_ptr->rescheduleTimeInMsecs); timer_ptr->rescheduleTimeInMsecs = 0; @@ -334,7 +334,7 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal, #endif /* Store the timer name, for Debug build only */ status = - qdf_mc_timer_init_debug(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, + qdf_mc_timer_init_debug(&timer_ptr->qdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr, fileName, lineNum); if (QDF_STATUS_SUCCESS != status) { @@ -393,7 +393,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr, strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName)); #endif /* Store the timer name, for Debug build only */ - status = qdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW, + status = qdf_mc_timer_init(&timer_ptr->qdf_timer, QDF_TIMER_TYPE_SW, tx_main_timer_func, (void *) timer_ptr); if (QDF_STATUS_SUCCESS != status) { QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR, @@ -442,7 +442,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr) return TX_TIMER_ERROR; } /* if the timer is not running then we do not need to do anything here */ - vStatus = qdf_mc_timer_stop(&timer_ptr->cdf_timer); + vStatus = qdf_mc_timer_stop(&timer_ptr->qdf_timer); if (QDF_STATUS_SUCCESS != vStatus) { QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH, "Unable to stop timer %s; status =%d\n", @@ -463,7 +463,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr) return TX_TIMER_ERROR; } - qdf_mc_timer_destroy(&timer_ptr->cdf_timer); + qdf_mc_timer_destroy(&timer_ptr->qdf_timer); return TX_SUCCESS; } /*** tx_timer_delete() ***/ @@ -493,7 +493,7 @@ bool tx_timer_running(TX_TIMER *timer_ptr) return false; if (QDF_TIMER_STATE_RUNNING == - qdf_mc_timer_get_current_state(&timer_ptr->cdf_timer)) { + qdf_mc_timer_get_current_state(&timer_ptr->qdf_timer)) { return true; } return false; diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c index 8efbd6b4eb8c..6e571622c046 100644 --- a/core/mac/src/sys/legacy/src/utils/src/log_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c @@ -183,15 +183,15 @@ static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId) void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel, const char *pStr, va_list marker) { - QDF_TRACE_LEVEL cdf_debug_level; - QDF_MODULE_ID cdf_module_id; + QDF_TRACE_LEVEL qdf_debug_level; + QDF_MODULE_ID qdf_module_id; char logBuffer[LOG_SIZE]; - cdf_debug_level = get_vos_debug_level(debugLevel); - cdf_module_id = get_vos_module_id(modId); + qdf_debug_level = get_vos_debug_level(debugLevel); + qdf_module_id = get_vos_module_id(modId); vsnprintf(logBuffer, LOG_SIZE - 1, pStr, marker); - QDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer); + QDF_TRACE(qdf_module_id, qdf_debug_level, "%s", logBuffer); /* The caller must check loglevel */ QDF_ASSERT((debugLevel <= diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index ffcafff8ebfb..c367eec4dbcf 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -51,7 +51,7 @@ #include /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */ #include /* qdf_nbuf_t, etc. */ #include /* qdf_assert */ -#include /* cdf_spinlock */ +#include /* qdf_spinlock */ #include /* TAILQ */ #include #include diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index c206ed5ebc06..f0564b504fec 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -69,7 +69,7 @@ extern "C" { #define MAX_TEXT_SIZE 32 #define MAX_CHANNEL_LIST_LEN 256 -#define CDF_MAX_NO_OF_SAP_MODE 2 /* max # of SAP */ +#define QDF_MAX_NO_OF_SAP_MODE 2 /* max # of SAP */ #define SAP_MAX_NUM_SESSION 5 #define SAP_MAX_OBSS_STA_CNT 1 /* max # of OBSS STA */ #define SAP_ACS_WEIGHT_MAX (4444) diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 55f754f5de18..99b11857ba94 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -806,7 +806,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* State machine event */ tWLAN_SAPEvent sap_event; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; tHalHandle hal = CDS_GET_HAL_CB(sap_ctx->p_cds_gctx); tpAniSirGlobal mac_ctx = NULL; uint8_t intf; @@ -814,8 +814,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, if (NULL == hal) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("Invalid hal")); - cdf_ret_status = QDF_STATUS_E_NOMEM; - return cdf_ret_status; + qdf_ret_status = QDF_STATUS_E_NOMEM; + return qdf_ret_status; } mac_ctx = PMAC_STRUCT(hal); @@ -826,7 +826,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP")); sap_ctx->isSapSessionOpen = eSAP_TRUE; - cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, + qdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, &sap_ctx->csr_roamProfile, &sap_ctx->csr_roamId); break; @@ -843,7 +843,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Handle event */ qdf_status = sap_fsm(sap_ctx, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_LOSTLINK: @@ -987,7 +987,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, switch (roam_result) { case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND: wlansap_roam_process_infra_assoc_ind(sap_ctx, roam_result, - csr_roam_info, &cdf_ret_status); + csr_roam_info, &qdf_ret_status); break; case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1012,7 +1012,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_ASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DISASSOC_IND: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1023,7 +1023,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DEAUTH_IND: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1038,7 +1038,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_DISASSOC_EVENT, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_GROUP: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1052,7 +1052,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1067,7 +1067,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_MIC_FAILURE_EVENT, (void *) NULL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case eCSR_ROAM_RESULT_AUTHENTICATED: @@ -1079,7 +1079,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_STA_SET_KEY_EVENT, (void *) eSAP_STATUS_SUCCESS); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_ASSOCIATED: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1106,7 +1106,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, sap_event.u2 = roam_result; qdf_status = sap_fsm(sap_ctx, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_INFRA_STOPPED: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1120,7 +1120,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, /* Handle event */ qdf_status = sap_fsm(sap_ctx, &sap_event); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1134,7 +1134,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_WPS_PBC_PROBE_REQ_EVENT, (void *) NULL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_FORCED: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, @@ -1172,21 +1172,21 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, eSAP_MAX_ASSOC_EXCEEDED, NULL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; case eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND: wlansap_roam_process_dfs_radar_found(mac_ctx, sap_ctx, - &cdf_ret_status); + &qdf_ret_status); break; case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS: case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE: wlansap_roam_process_dfs_chansw_update_fail(hal, sap_ctx, - &cdf_ret_status); + &qdf_ret_status); break; case eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS: wlansap_roam_process_ch_change_success(mac_ctx, sap_ctx, - csr_roam_info, &cdf_ret_status); + csr_roam_info, &qdf_ret_status); break; case eCSR_ROAM_RESULT_CHANNEL_CHANGE_FAILURE: /* @@ -1201,7 +1201,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, qdf_status = sap_signal_hdd_event(sap_ctx, csr_roam_info, eSAP_ECSA_CHANGE_CHAN_IND, NULL); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; break; default: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -1210,5 +1210,5 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, roam_result); break; } - return cdf_ret_status; + return qdf_ret_status; } diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index c06f974d4fda..8dab98eb2bee 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -612,7 +612,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, if (pSpectCh == NULL) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "In %s, CDF_MALLOC_ERR", __func__); + "In %s, QDF_MALLOC_ERR", __func__); return eSAP_FALSE; } diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index e7bcc38cb091..11bedb3613bb 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1962,7 +1962,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, { /* Initiate a SCAN request */ - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; /* To be initialised if scan is required */ tCsrScanRequest scan_request; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -1997,7 +1997,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (sap_context->cc_switch_mode != - CDF_MCC_TO_SCC_SWITCH_DISABLE) { + QDF_MCC_TO_SCC_SWITCH_DISABLE) { con_ch = sme_check_concurrent_channel_overlap(h_hal, sap_context->channel, sap_context->csr_roamProfile.phyMode, @@ -2025,7 +2025,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #endif #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (sap_context->cc_switch_mode != - CDF_MCC_TO_SCC_SWITCH_DISABLE) { + QDF_MCC_TO_SCC_SWITCH_DISABLE) { con_ch = sme_check_concurrent_channel_overlap(h_hal, sap_context->channel, sap_context->csr_roamProfile.phyMode, @@ -2109,7 +2109,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * csrScanCompleteCallback callback * pContext scan_request_id filled up */ - cdf_ret_status = sme_scan_request(h_hal, + qdf_ret_status = sme_scan_request(h_hal, sap_context->sessionId, &scan_request, &wlansap_pre_start_bss_acs_scan_callback, @@ -2121,16 +2121,16 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, * csrScanCompleteCallback callback, * pContext scan_request_id filled up */ - cdf_ret_status = sme_scan_request(h_hal, + qdf_ret_status = sme_scan_request(h_hal, sap_context->sessionId, &scan_request, &wlansap_scan_callback, sap_context); } - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("sme_scan_request fail %d!!!"), - cdf_ret_status); + qdf_ret_status); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Configuring default channel, Ch=%d"), sap_context->channel); @@ -2241,7 +2241,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) { uint32_t type, subType; - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -2256,16 +2256,16 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) return QDF_STATUS_E_FAILURE; } /* Open SME Session for Softap */ - cdf_ret_status = sme_open_session(hHal, + qdf_ret_status = sme_open_session(hHal, &wlansap_roam_callback, sapContext, sapContext->self_mac_addr, &sapContext->sessionId, type, subType); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_connect status = %d", - __func__, cdf_ret_status); + __func__, qdf_ret_status); return QDF_STATUS_E_FAILURE; } @@ -2308,7 +2308,7 @@ sap_goto_starting ptWLAN_SAPEvent sapEvent, eCsrRoamBssType bssType) { /* tHalHandle */ tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; /*- - - - - - - - TODO:once configs from hdd available - - - - - - - - -*/ char key_material[32] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, @@ -2327,12 +2327,12 @@ sap_goto_starting return QDF_STATUS_E_FAULT; } - cdf_ret_status = sap_open_session(hHal, sapContext); + qdf_ret_status = sap_open_session(hHal, sapContext); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sap_open_session status = %d", - __func__, cdf_ret_status); + __func__, qdf_ret_status); return QDF_STATUS_E_FAILURE; } @@ -2363,7 +2363,7 @@ sap_goto_starting ============================================================================*/ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) { - QDF_STATUS cdf_ret_status; + QDF_STATUS qdf_ret_status; tHalHandle hHal; hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); @@ -2375,11 +2375,11 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext) } sap_free_roam_profile(&sapContext->csr_roamProfile); - cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + qdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId); + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Error: In %s calling sme_roam_stop_bss status = %d", - __func__, cdf_ret_status); + __func__, qdf_ret_status); return QDF_STATUS_E_FAILURE; } diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 4cc8d44c556b..47d38b6e6083 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -339,7 +339,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / IN callbackContext: The user passed in a context to identify - status: The cdf_ret_status + status : The qdf_ret_status RETURN VALUE None @@ -1299,7 +1299,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac) QDF_STATUS wlansap_deauth_sta(void *pCtx, struct tagCsrDelStaParams *pDelStaParams) { - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1313,11 +1313,11 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx, return qdf_status; } - cdf_ret_status = + qdf_ret_status = sme_roam_deauth_sta(CDS_GET_HAL_CB(pSapCtx->p_cds_gctx), pSapCtx->sessionId, pDelStaParams); - if (cdf_ret_status == QDF_STATUS_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_SUCCESS) { qdf_status = QDF_STATUS_SUCCESS; } return qdf_status; @@ -1652,7 +1652,7 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; uint32_t roamId = 0xFF; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1669,11 +1669,11 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo) __func__); return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_roam_set_key(hHal, pSapCtx->sessionId, pSetKeyInfo, &roamId); - if (cdf_ret_status == QDF_STATUS_SUCCESS) + if (qdf_ret_status == QDF_STATUS_SUCCESS) qdf_status = QDF_STATUS_SUCCESS; else qdf_status = QDF_STATUS_E_FAULT; @@ -1800,7 +1800,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) { QDF_STATUS qdf_status = QDF_STATUS_E_FAULT; ptSapContext pSapCtx = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, @@ -1822,11 +1822,11 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx) return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_roam_update_apwpsie(hHal, pSapCtx->sessionId, &pSapCtx->APWPSIEs); - if (cdf_ret_status == QDF_STATUS_SUCCESS) + if (qdf_ret_status == QDF_STATUS_SUCCESS) qdf_status = QDF_STATUS_SUCCESS; else qdf_status = QDF_STATUS_E_FAULT; @@ -1926,7 +1926,7 @@ QDF_STATUS sap_release_global_lock(ptSapContext pSapCtx) QDF_STATUS wlansap_set_wparsn_ies (void *pCtx, uint8_t *pWPARSNIEs, uint32_t WPARSNIEsLen) { ptSapContext pSapCtx = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; pSapCtx = CDS_GET_SAP_CB(pCtx); @@ -1949,11 +1949,11 @@ QDF_STATUS wlansap_set_wparsn_ies qdf_mem_copy(pSapCtx->APWPARSNIEs.rsnIEdata, pWPARSNIEs, WPARSNIEsLen); - cdf_ret_status = + qdf_ret_status = sme_roam_update_apwparsni_es(hHal, pSapCtx->sessionId, &pSapCtx->APWPARSNIEs); - if (cdf_ret_status == QDF_STATUS_SUCCESS) + if (qdf_ret_status == QDF_STATUS_SUCCESS) return QDF_STATUS_SUCCESS; else return QDF_STATUS_E_FAULT; @@ -1979,7 +1979,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, { ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { @@ -1996,11 +1996,11 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf, return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_send_action(hHal, pSapCtx->sessionId, pBuf, len, 0, 0, channel_freq); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { return QDF_STATUS_SUCCESS; } @@ -2033,7 +2033,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, { ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { @@ -2050,11 +2050,11 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx, return QDF_STATUS_E_FAULT; } - cdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId, + qdf_ret_status = sme_remain_on_channel(hHal, pSapCtx->sessionId, channel, duration, callback, pContext, true, scan_id); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { return QDF_STATUS_SUCCESS; } @@ -2080,7 +2080,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, { ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { @@ -2098,11 +2098,11 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx, return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_cancel_remain_on_channel(hHal, pSapCtx->sessionId, scan_id); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { return QDF_STATUS_SUCCESS; } @@ -2131,7 +2131,7 @@ QDF_STATUS wlansap_register_mgmt_frame uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { @@ -2148,11 +2148,11 @@ QDF_STATUS wlansap_register_mgmt_frame return QDF_STATUS_E_FAULT; } - cdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId, + qdf_ret_status = sme_register_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { return QDF_STATUS_SUCCESS; } @@ -2181,7 +2181,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame uint16_t frameType, uint8_t *matchData, uint16_t matchLen) { ptSapContext pSapCtx = NULL; void *hHal = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; pSapCtx = CDS_GET_SAP_CB(pCtx); if (NULL == pSapCtx) { @@ -2198,11 +2198,11 @@ QDF_STATUS wlansap_de_register_mgmt_frame return QDF_STATUS_E_FAULT; } - cdf_ret_status = + qdf_ret_status = sme_deregister_mgmt_frame(hHal, pSapCtx->sessionId, frameType, matchData, matchLen); - if (QDF_STATUS_SUCCESS == cdf_ret_status) { + if (QDF_STATUS_SUCCESS == qdf_ret_status) { return QDF_STATUS_SUCCESS; } @@ -2243,7 +2243,7 @@ QDF_STATUS wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) { ptSapContext sapContext = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal mac_ctx = NULL; eCsrPhyMode phy_mode; @@ -2278,10 +2278,10 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) */ sapContext->channel = target_channel; sapContext->csr_roamProfile.ch_params.ch_width = ch_params.ch_width; - cdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid, + qdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid, &ch_params, &sapContext->csr_roamProfile); - if (cdf_ret_status == QDF_STATUS_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_SUCCESS) { sap_signal_hdd_event(sapContext, NULL, eSAP_CHANNEL_CHANGE_EVENT, (void *) eSAP_STATUS_SUCCESS); @@ -2321,7 +2321,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) { ptSapContext sapContext = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; uint8_t dfsCacWaitStatus = 0; tpAniSirGlobal pMac = NULL; @@ -2345,10 +2345,10 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) if (pMac->sap.SapDfsInfo.sap_radar_found_status == false) { /* CAC Wait done without any Radar Detection */ dfsCacWaitStatus = true; - cdf_ret_status = sme_roam_start_beacon_req(hHal, + qdf_ret_status = sme_roam_start_beacon_req(hHal, sapContext->bssid, dfsCacWaitStatus); - if (cdf_ret_status == QDF_STATUS_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_SUCCESS) { return QDF_STATUS_SUCCESS; } return QDF_STATUS_E_FAULT; @@ -2379,7 +2379,7 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx) QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) { ptSapContext sapContext = NULL; - QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; void *hHal = NULL; tpAniSirGlobal pMac = NULL; sapContext = (ptSapContext) pSapCtx; @@ -2398,13 +2398,13 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) } pMac = PMAC_STRUCT(hHal); - cdf_ret_status = sme_roam_csa_ie_request(hHal, + qdf_ret_status = sme_roam_csa_ie_request(hHal, sapContext->bssid, pMac->sap.SapDfsInfo.target_channel, pMac->sap.SapDfsInfo.csaIERequired, &pMac->sap.SapDfsInfo.new_ch_params); - if (cdf_ret_status == QDF_STATUS_SUCCESS) { + if (qdf_ret_status == QDF_STATUS_SUCCESS) { return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index fe3bef0060ff..1fbe9cf90788 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -8461,16 +8461,16 @@ QDF_STATUS sme_update_is_ese_feature_enabled QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal, bool fEnableFwRssiMonitoring) { - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR, fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) { - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG"); } - return cdf_ret_status; + return qdf_ret_status; } /* --------------------------------------------------------------------------- @@ -9581,7 +9581,7 @@ uint8_t sme_is_feature_supported_by_fw(uint8_t featEnumValue) \param peerMac - peer's Mac Adress. \param tdlsLinkEstablishParams - TDLS Peer Link Establishment Parameters - \- return CDF_STATUS_SUCCES + \- return QDF_STATUS_SUCCES -------------------------------------------------------------------------*/ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, uint8_t sessionId, @@ -9618,7 +9618,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal, \param buf - additional IEs to be included \param len - lenght of additional Ies \param responder - Tdls request type - \- return CDF_STATUS_SUCCES + \- return QDF_STATUS_SUCCES -------------------------------------------------------------------------*/ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, @@ -9660,7 +9660,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId, \param peerMac - peer's Mac Adress. \param staParams - Peer Station Parameters - \- return CDF_STATUS_SUCCES + \- return QDF_STATUS_SUCCES -------------------------------------------------------------------------*/ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac, @@ -9694,7 +9694,7 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \brief API to Add TDLS peer sta entry. \param peerMac - peer's Mac Adress. - \- return CDF_STATUS_SUCCES + \- return QDF_STATUS_SUCCES -------------------------------------------------------------------------*/ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) @@ -9721,7 +9721,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, \brief API to Delete TDLS peer sta entry. \param peerMac - peer's Mac Adress. - \- return CDF_STATUS_SUCCES + \- return QDF_STATUS_SUCCES -------------------------------------------------------------------------*/ QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId, const tSirMacAddr peerMac) @@ -9947,7 +9947,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal, * * API to set tdls channel switch parameters. * - * Return: QDF_STATUS_SUCCESS on success; another CDF_STATUS_* code otherwise + * Return: QDF_STATUS_SUCCESS on success; another QDF_STATUS_** code otherwise */ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal, sme_tdls_chan_switch_params *ch_switch_params) @@ -13849,7 +13849,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id, if (NULL == iwcmd) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, - "%s: cdf_mem_alloc failed", __func__); + "%s: qdf_mem_malloc failed", __func__); return QDF_STATUS_E_NOMEM; } @@ -14010,7 +14010,7 @@ QDF_STATUS sme_send_flush_logs_cmd_to_fw(tpAniSirGlobal mac) * @sessionId: session id * @delay_interval: delay interval * - * Return: CDF status + * Return: QDF status */ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, uint8_t tid, @@ -14077,7 +14077,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, * @ac: access catagory * @sessionId: session id * - * Return: CDF status + * Return: QDF status */ QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id, sme_ac_enum_type ac, @@ -14598,7 +14598,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, * @auth_cb: auth callback * @vdev_id: vdev id * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, sme_peer_authorized_fp auth_cb, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 1cf113a3af69..43d82897bddd 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -3134,7 +3134,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to delete a associated station * - * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_** on error */ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, @@ -6080,7 +6080,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx, dst_profile = &session->connectedProfile.HTProfile; src_profile = &start_bss_rsp->HTProfile; if (mac_ctx->roam.configParam.cc_switch_mode - != CDF_MCC_TO_SCC_SWITCH_DISABLE) + != QDF_MCC_TO_SCC_SWITCH_DISABLE) csr_roam_copy_ht_profile(dst_profile, src_profile); #endif csr_roam_call_callback(mac_ctx, session_id, &roam_info, @@ -6389,7 +6389,7 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, src_profile = &join_rsp->HTProfile; dst_profile = &conn_profile->HTProfile; if (mac_ctx->roam.configParam.cc_switch_mode - != CDF_MCC_TO_SCC_SWITCH_DISABLE) + != QDF_MCC_TO_SCC_SWITCH_DISABLE) csr_roam_copy_ht_profile(dst_profile, src_profile); #endif @@ -15929,7 +15929,7 @@ csr_deregister_client_request(tpAniSirGlobal mac_ctx, mac_ctx->roam.tlStatsReqInfo.timerRunning = false; } qdf_mc_timer_stop(&ptr_sta_entry->timer); - /* Destroy the cdf timer... */ + /* Destroy the qdf timer... */ status = qdf_mc_timer_destroy(&ptr_sta_entry->timer); if (!QDF_IS_STATUS_SUCCESS(status)) sms_log(mac_ctx, LOGE, @@ -17457,7 +17457,7 @@ QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac) /* So Stop and Destroy timer only when periodicity is set. */ qdf_mc_timer_stop(&pTempStaEntry->timer); - /* Destroy the cdf timer... */ + /* Destroy the qdf timer... */ qdf_status = qdf_mc_timer_destroy(&pTempStaEntry->timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -19109,7 +19109,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, src_profile = &roam_synch_data->join_rsp->HTProfile; dst_profile = &conn_profile->HTProfile; if (mac_ctx->roam.configParam.cc_switch_mode - != CDF_MCC_TO_SCC_SWITCH_DISABLE) + != QDF_MCC_TO_SCC_SWITCH_DISABLE) csr_roam_copy_ht_profile(dst_profile, src_profile); #endif diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 4054ffea9b5d..f808ffc1194f 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -2947,7 +2947,7 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac, bssId)); qdf_mem_copy(&pCsrBssDescription->Result.BssDescriptor, pBSSDescription, cbBSSDesc); -#if defined(CDF_ENSBALED) +#if defined(QDF_ENSBALED) if (NULL != pCsrBssDescription->Result.pvIes) { QDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL); return NULL; diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 44bf688cbbf1..37b7c05a696a 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -928,7 +928,7 @@ QDF_STATUS csr_roam_issue_disassociate_sta_cmd(tpAniSirGlobal pMac, * * CSR function that HDD calls to issue a deauthenticate station command * - * Return: QDF_STATUS_SUCCESS on success or another CDF_STATUS_* on error + * Return: QDF_STATUS_SUCCESS on success or another QDF_STATUS_** on error */ QDF_STATUS csr_roam_issue_deauth_sta_cmd(tpAniSirGlobal pMac, uint32_t sessionId, diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 36e01046377a..74c867ea2cf3 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -2370,7 +2370,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, * This initializes all the necessary data structures related to the * associated AP. * - * Return: CDF status + * Return: QDF status */ static void csr_neighbor_roam_info_ctx_init( tpAniSirGlobal pMac, @@ -2481,13 +2481,13 @@ static void csr_neighbor_roam_info_ctx_init( * csr_neighbor_roam_indicate_connect() * @pMac: mac context * @session_id: Session Id - * @qdf_status: CDF status + * @qdf_status: QDF status * * This function is called by CSR as soon as the station connects to an AP. * This initializes all the necessary data structures related to the * associated AP and transitions the state to CONNECTED state * - * Return: CDF status + * Return: QDF status */ QDF_STATUS csr_neighbor_roam_indicate_connect( tpAniSirGlobal pMac, uint8_t session_id, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index e181cf892872..463a9d205a1e 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -706,7 +706,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, uint16_t sap_lfreq, sap_hfreq, intf_lfreq, intf_hfreq, sap_cch; if (mac_ctx->roam.configParam.cc_switch_mode == - CDF_MCC_TO_SCC_SWITCH_DISABLE) + QDF_MCC_TO_SCC_SWITCH_DISABLE) return 0; if (sap_ch != 0) { @@ -756,7 +756,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, } if (intf_ch && sap_ch != intf_ch && - cc_switch_mode != CDF_MCC_TO_SCC_SWITCH_FORCE) { + cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE) { sap_lfreq = sap_cfreq - sap_hbw; sap_hfreq = sap_cfreq + sap_hbw; intf_lfreq = intf_cfreq - intf_hbw; @@ -777,7 +777,7 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, (intf_hfreq > sap_lfreq && intf_hfreq < sap_hfreq)))) intf_ch = 0; } else if (intf_ch && sap_ch != intf_ch && - cc_switch_mode == CDF_MCC_TO_SCC_SWITCH_FORCE) { + cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_FORCE) { if (!((intf_ch < 14 && sap_ch < 14) || (intf_ch > 14 && sap_ch > 14))) intf_ch = 0; @@ -5670,7 +5670,7 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, } } - status = cdf_wait_for_connection_update(); + status = qdf_wait_for_connection_update(); if (do_release_reacquire_lock == true) { ret = sme_acquire_global_lock(&mac->sme); diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 0e3d4ff01358..1aaf22a735b5 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -6366,7 +6366,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) sme_QosCmdInfoEntry *pcmd = NULL; tListElem *list_elt = NULL; sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; sme_QosCmdInfo *qos_cmd = NULL; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, @@ -6399,7 +6399,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_setup_req failed on session %d"), session_id); - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RELEASE_REQ: @@ -6411,7 +6411,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_release_req failed on session %d"), session_id); - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_MODIFY_REQ: @@ -6425,7 +6425,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_TRACE_LEVEL_ERROR, FL("sme_qos_internal_modify_req failed on session %d"), session_id); - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; case SME_QOS_RESEND_REQ: @@ -6440,7 +6440,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) QDF_TRACE_LEVEL_ERROR, FL("sme_qos_re_request_add_ts failed on session %d"), session_id); - cdf_ret_status = QDF_STATUS_E_FAILURE; + qdf_ret_status = QDF_STATUS_E_FAILURE; } break; default: @@ -6457,7 +6457,7 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id) FL("cmd buffer empty")); qos_session->readyForPowerSave = true; } - return cdf_ret_status; + return qdf_ret_status; } /*-------------------------------------------------------------------------- diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index c95c6ee0bf87..341234f967ac 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -105,7 +105,7 @@ static void rrm_ll_purge_neighbor_cache(tpAniSirGlobal pMac, * rrm_indicate_neighbor_report_result() -calls the callback registered for * neighbor report * @pMac: Pointer to the Hal Handle. - * @qdf_status - QDF_STATUS_SUCCESS/CDF_STATUS_FAILURE based on whether a valid + * @qdf_status - QDF_STATUS_SUCCESS/QDF_STATUS_FAILURE based on whether a valid * report is received or neighbor timer expired * * This function calls the callback register by the caller while requesting for @@ -1355,7 +1355,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) QDF_STATUS qdf_status; tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; - QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; pSmeRrmContext->rrmConfig.max_randn_interval = 50; /* ms */ @@ -1386,9 +1386,9 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) pSmeRrmContext->neighborReqControlInfo.isNeighborRspPending = false; - cdf_ret_status = + qdf_ret_status = csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); - if (QDF_STATUS_SUCCESS != cdf_ret_status) { + if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result"); return QDF_STATUS_E_FAILURE; diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h index 2439c575113a..664076d7a523 100644 --- a/core/utils/epping/inc/epping_internal.h +++ b/core/utils/epping/inc/epping_internal.h @@ -158,7 +158,7 @@ void epping_free_cookie(epping_context_t *pEpping_ctx, struct epping_cookie *epping_alloc_cookie(epping_context_t *pEpping_ctx); void epping_get_dummy_mac_addr(tSirMacAddr macAddr); void epping_hex_dump(void *data, int buf_len, const char *str); -void *epping_get_cdf_ctx(void); +void *epping_get_qdf_ctx(void); void epping_log_packet(epping_adapter_t *pAdapter, EPPING_HEADER *eppingHdr, int ret, const char *str); void epping_log_stats(epping_adapter_t *pAdapter, const char *str); diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c index 8940579d3a7a..ff82790012d5 100644 --- a/core/utils/epping/src/epping_helper.c +++ b/core/utils/epping/src/epping_helper.c @@ -163,12 +163,12 @@ void epping_hex_dump(void *data, int buf_len, const char *str) printk("\n%s: X %s\n", __func__, str); } -void *epping_get_cdf_ctx(void) +void *epping_get_qdf_ctx(void) { - qdf_device_t *p_cdf_ctx; + qdf_device_t *qdf_ctx; - p_cdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - return p_cdf_ctx; + qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + return qdf_ctx; } void epping_log_packet(epping_adapter_t *pAdapter, diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c index dc7e2fe8ee30..4586b1033fe8 100644 --- a/core/utils/epping/src/epping_txrx.c +++ b/core/utils/epping/src/epping_txrx.c @@ -370,7 +370,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, qdf_spinlock_create(&pAdapter->data_lock); qdf_nbuf_queue_init(&pAdapter->nodrop_queue); pAdapter->epping_timer_state = EPPING_TX_TIMER_STOPPED; - qdf_timer_init(epping_get_cdf_ctx(), &pAdapter->epping_timer, + qdf_timer_init(epping_get_qdf_ctx(), &pAdapter->epping_timer, epping_timer_expire, dev, QDF_TIMER_TYPE_SW); dev->type = ARPHRD_IEEE80211; dev->netdev_ops = &epping_drv_ops; diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c index 631cff50eff3..15687a2f7e15 100644 --- a/core/utils/logging/src/wlan_logging_sock_svc.c +++ b/core/utils/logging/src/wlan_logging_sock_svc.c @@ -635,7 +635,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb) wake_up_interruptible(&gwlan_logging.wait_queue); } else { /* This is to set the default levels (WLAN logging - * default values not the CDF trace default) when + * default values not the QDF trace default) when * logger app is registered for the first time. */ gapp_pid = wnl->nlh.nlmsg_pid; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 9c4e1a179d73..7f25d757fa0d 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1067,7 +1067,7 @@ struct wma_ini_config { * @egap_support: Enhanced Green AP support flag * @wmi_ready: wmi status flag * @wlan_init_status: wlan init status - * @cdf_dev: cdf device + * @qdf_dev: qdf device * @phy_capability: PHY Capability from Target * @max_frag_entry: Max number of Fragment entry * @wmi_service_bitmap: wmi services bitmap received from Target diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 104739325a53..1b3b30bb789f 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -191,7 +191,7 @@ typedef struct sAniProbeRspStruct { * @fShortGI40Mhz: short GI support for 40Mhz packets * @fShortGI20Mhz: short GI support for 20Mhz packets * @supportedRates: legacy supported rates - * @status: CDF status + * @status: QDF status * @staIdx: station index * @bssIdx: BSSID of BSS to which the station is associated * @updateSta: pdate the existing STA entry, if this flag is set @@ -517,7 +517,7 @@ typedef struct { /** * struct tDeleteBssParams - params required for del bss request * @bssIdx: BSSID - * @status: CDF status + * @status: QDF status * @respReqd: response message to LIM only when this flag is set * @sessionId: PE session id * @bssid: BSSID mac address @@ -886,7 +886,7 @@ typedef struct { * @maxTxPower: max tx power * @selfStaMacAddr: self mac address * @bssId: bssid - * @status: CDF status + * @status: QDF status * @chainMask: chanin mask * @smpsMode: SMPS mode * @isDfsChannel: is DFS channel @@ -982,7 +982,7 @@ typedef struct sLinkStateParams { * @staIdx: station index * @tspecIdx: TSPEC handler uniquely identifying a TSPEC for a STA in a BSS * @tspec: tspec value - * @status: CDF status + * @status: QDF status * @sessionId: session id * @tsm_interval: TSM interval period passed from lim to WMA * @setRICparams: RIC parameters @@ -1035,7 +1035,7 @@ typedef struct { * @staIdx: station index * @tspecIdx: TSPEC handler uniquely identifying a TSPEC for a STA in a BSS * @tspec: tspec value - * @status: CDF status + * @status: QDF status * @sessionId: session id */ typedef struct { diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index dbfce926619b..889c3724e712 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -283,7 +283,7 @@ static void wma_bin_search_rate(wma_search_rate_t *tbl, int32_t tbl_size, * @nss: nss * @rate: rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_ofdm_cck_mcast_rate(int32_t mbpsx10_rate, uint8_t nss, uint8_t *rate) @@ -337,7 +337,7 @@ static void wma_set_ht_vht_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, @@ -375,7 +375,7 @@ static QDF_STATUS wma_fill_ht20_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, @@ -414,7 +414,7 @@ static QDF_STATUS wma_fill_ht40_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, @@ -454,7 +454,7 @@ static QDF_STATUS wma_fill_vht20_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, @@ -495,7 +495,7 @@ static QDF_STATUS wma_fill_vht40_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, int32_t mbpsx10_rate, uint8_t nss, @@ -538,7 +538,7 @@ static QDF_STATUS wma_fill_vht80_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, uint32_t chwidth, int32_t mbpsx10_rate, @@ -572,7 +572,7 @@ static QDF_STATUS wma_fill_ht_mcast_rate(uint32_t shortgi, * @rate: rate * @streaming_rate: streaming rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, uint32_t chwidth, @@ -610,7 +610,7 @@ static QDF_STATUS wma_fill_vht_mcast_rate(uint32_t shortgi, * @nss: nss * @rate: rate * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_encode_mc_rate(uint32_t shortgi, uint32_t chwidth, WLAN_PHY_MODE chanmode, A_UINT32 mhz, @@ -1041,7 +1041,7 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t * channel of it and channel number. The info is provided run time using * iwpriv command: iwpriv setMccLatency . * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, @@ -1155,7 +1155,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency * checks if MCC mode is active, gets the second mode and its operating chan. * Quota for the 2nd role is calculated as 100 - quota of first mode. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_mcc_channel_time_quota (tp_wma_handle wma, @@ -1389,7 +1389,7 @@ void wma_unpause_vdev(tp_wma_handle wma) * This function update rate & short GI interval to fw based on params * send by SME. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, tSirRateUpdateInd * @@ -1616,7 +1616,7 @@ wma_mgmt_tx_dload_comp_hldr(void *wma_context, qdf_nbuf_t netbuf, * * attaches tx fn with underlying layer. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) { @@ -1651,7 +1651,7 @@ QDF_STATUS wma_tx_attach(tp_wma_handle wma_handle) * * Deregister with TxRx for Tx Mgmt Download and Ack completion. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle) { @@ -2433,7 +2433,7 @@ err2: * given vdev id. * This is blocking call till the downloading of frame is complete. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, eFrameType frmType, eFrameTxDir txDir, uint8_t tid, @@ -2859,7 +2859,7 @@ error: * * Function fills the rx packet meta info from the the cds packet * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_ds_peek_rx_packet_info(cds_pkt_t *pkt, void **pkt_meta, bool bSwap) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index e75d08543a15..a6745f84a240 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -678,7 +678,7 @@ out: * @pdel_sta_self_req_param: del sta params * @generateRsp: generate Response flag * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, @@ -1284,7 +1284,7 @@ static int wmi_unified_peer_create_send(wmi_unified_t wmi, * @vdev_id: vdev id * @roam_synch_in_progress: roam in progress * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, ol_txrx_vdev_handle vdev, @@ -2075,7 +2075,7 @@ end: * @req: vdev start params * @isRestart: isRestart flag * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 9fa87a066c31..6e80bf0f0e97 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -143,7 +143,7 @@ static int wma_post_auto_shutdown_msg(void) * @wma_handle: wma handle * @pGetRssiReq: get RSSI request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq) @@ -206,7 +206,7 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, * wma_get_snr() - get RSSI from fw * @psnr_req: request params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) { @@ -327,7 +327,7 @@ end: * @lphb_conf_req: configuration info * @by_user: whether this call is from user or cached resent * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req, bool by_user) @@ -419,7 +419,7 @@ error: * @wma_handle: wma handle * @lphb_conf_req: lphb config request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) @@ -493,7 +493,7 @@ error: * @wma_handle: wma handle * @lphb_conf_req: lphb config request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) @@ -562,7 +562,7 @@ error: * @wma_handle: wma handle * @lphb_conf_req: lphb config request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) @@ -634,7 +634,7 @@ error: * @wma_handle: wma handle * @lphb_conf_req: lphb config request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) @@ -703,7 +703,7 @@ error: * @wma_handle: wma handle * @lphb_conf_req: lphb config request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, tSirLPHBReq *lphb_conf_req) @@ -758,7 +758,7 @@ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, * @wma_handle: wma handle * @ta_dhcp_ind: DHCP indication * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind) @@ -922,7 +922,7 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, * @handle: wma handle * @pLinkSpeed: link speed info * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) { @@ -1325,7 +1325,7 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) * @wma: wma handle * @vdev_id: vdev id * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) { @@ -1594,7 +1594,7 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) csa_offload_event = qdf_mem_malloc(sizeof(*csa_offload_event)); if (!csa_offload_event) { - WMA_LOGE("CDF MEM Alloc Failed for csa_offload_event"); + WMA_LOGE("QDF MEM Alloc Failed for csa_offload_event"); return -EINVAL; } @@ -2498,7 +2498,7 @@ wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle) * @handle: wma handle * @params: pktlog params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params) @@ -3114,7 +3114,7 @@ static inline void wma_set_wow_bus_suspend(tp_wma_handle wma, int val) * @bitmap: Event bitmap * @enable: enable/disable * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, uint32_t vdev_id, @@ -3167,7 +3167,7 @@ static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, * @mask_len: mask length * @user: true for user configured pattern and false for default pattern * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, uint8_t vdev_id, uint8_t ptrn_id, @@ -3305,7 +3305,7 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, * * Configures default WOW pattern for the given vdev_id which is in AP mode. * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) { @@ -3345,7 +3345,7 @@ static QDF_STATUS wma_wow_ap(tp_wma_handle wma, uint8_t vdev_id) * * Configures default WOW pattern for the given vdev_id which is in sta mode. * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_wow_sta(tp_wma_handle wma, uint8_t vdev_id) { @@ -3532,7 +3532,7 @@ void wma_enable_disable_wakeup_event(WMA_HANDLE handle, * wma_enable_wow_in_fw() - wnable wow in fw * @wma: wma handle * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) { @@ -3676,7 +3676,7 @@ error: * @wma: wma handle * @type: type of suspend * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) { @@ -3708,7 +3708,7 @@ QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) * @vdev_id: vdev id * @user: true for user pattern and false for default pattern * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, uint8_t vdev_id, bool user) @@ -3768,7 +3768,7 @@ static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, * Target is responsible for caching wow patterns accross multiple * suspend/resumes until the pattern is deleted by user * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) { @@ -3840,7 +3840,7 @@ QDF_STATUS wma_wow_add_pattern(tp_wma_handle wma, struct wow_add_pattern *ptrn) * 2) After deleting all user wow patterns add default wow patterns * specific to that vdev. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, struct wow_delete_pattern *pattern) @@ -3880,7 +3880,7 @@ QDF_STATUS wma_wow_delete_user_pattern(tp_wma_handle wma, * Records pattern enable/disable status locally. This choice will * take effect when the driver enter into suspend state. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) { @@ -3912,7 +3912,7 @@ QDF_STATUS wma_wow_enter(tp_wma_handle wma, tpSirHalWowlEnterParams info) * @wma: wma handle * @info: wow params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_wow_exit(tp_wma_handle wma, tpSirHalWowlExitParams info) { @@ -4212,7 +4212,7 @@ static void wma_notify_suspend_req_procesed(tp_wma_handle wma, * The type controlls how we notify the indicator that the indication has * been processed * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type) { @@ -4249,7 +4249,7 @@ QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type) * Sends host wakeup indication to FW. On receiving this indication, * FW will come out of WOW. * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) { @@ -4801,7 +4801,7 @@ int wma_process_receive_filter_clear_filter_req(tp_wma_handle wma, * function fetches stats from data path APIs and post * WMA_TSM_STATS_RSP msg back to LIM. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg) @@ -4841,7 +4841,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, (tpAniGetTsmStatsRsp) qdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); if (NULL == pTsmRspParams) { QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, - "%s: CDF MEM Alloc Failure", __func__); + "%s: QDF MEM Alloc Failure", __func__); QDF_ASSERT(0); qdf_mem_free(pTsmStatsMsg); return QDF_STATUS_E_NOMEM; @@ -4929,7 +4929,7 @@ static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, * @wma_handle: wma handle * @mcbc_param: mcbc params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, tSirRcvFltMcAddrList *mcbc_param) @@ -5060,7 +5060,7 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, * @vdev_id: vdev id * @params: GTK offload parameters * - * Return: CDF status + * Return: QDF status */ static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, tpSirGtkOffloadParams params) @@ -5124,7 +5124,7 @@ out: * @handle: wma handle * @params: GTK offload params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_gtk_offload_req(tp_wma_handle wma, tpSirGtkOffloadParams params) @@ -5175,7 +5175,7 @@ out: * @wma: wma handle * @params: GTK offload params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params) @@ -5238,7 +5238,7 @@ out: * To configure ARP NS off load data to firmware * when target goes to wow mode. * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq @@ -5451,7 +5451,7 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, * @handle: wma handle * @pAddPeriodicTxPtrnParams: tx ptrn params * - * Retrun: CDF status + * Retrun: QDF status */ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * @@ -5529,7 +5529,7 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, * @handle: wma handle * @pDelPeriodicTxPtrnParams: tx ptrn params * - * Retrun: CDF status + * Retrun: QDF status */ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirDelPeriodicTxPtrn * @@ -5588,7 +5588,7 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, * @wma_ptr: wma handle * @preq: stats ext params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) { @@ -5733,7 +5733,7 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) * @wma: wma handle * @appType1Params: app type1 params * - * Return: CDF status + * Return: QDF status */ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, tpSirAppType1Params appType1Params) @@ -5788,7 +5788,7 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, * @wma: wma handle * @appType2Params: app type2 params * - * Return: CDF status + * Return: QDF status */ int wma_set_app_type2_params_in_fw(tp_wma_handle wma, tpSirAppType2Params appType2Params) @@ -5907,7 +5907,7 @@ int wma_auto_shutdown_event_handler(void *handle, uint8_t *event, * @wma: wma handle * @auto_sh_cmd: auto shutdown timer value * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * @@ -5962,7 +5962,7 @@ QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, * @wma: wma_handle * @nan_req: request data which will be non-null * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) { @@ -6072,7 +6072,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, * @wma_handle: wma handle * @flashing: flashing request * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing) @@ -6206,7 +6206,7 @@ int wma_channel_avoid_evt_handler(void *handle, uint8_t *event, * @wma_handle: wma handle * @ch_avoid_update_req: channel avoid update params * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * @@ -6259,7 +6259,7 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, * @clientCtxt: client context * @regId: reg id * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_reg_domain(void *clientCtxt, v_REGDOMAIN_t regId) { @@ -6341,7 +6341,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, * * request the MC thread unpaus the vdev and set resume dtim * - * Return: cdf status of the mq post + * Return: qdf status of the mq post */ static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) { diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 5c76e7d06abb..b13523458f65 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -2618,7 +2618,7 @@ fail: * Intialize event handlers and timers. * @cds_ctx: cds context * - * Return: 0 on success, CDF Error on failure + * Return: 0 on success, QDF Error on failure */ QDF_STATUS wma_start(void *cds_ctx) { @@ -2834,7 +2834,7 @@ end: * @cds_ctx: cds context * @reason: reason for wma_stop. * - * Return: 0 on success, CDF Error on failure + * Return: 0 on success, QDF Error on failure */ QDF_STATUS wma_stop(void *cds_ctx, uint8_t reason) { @@ -2979,7 +2979,7 @@ static void wma_cleanup_vdev_resp(tp_wma_handle wma) * wma_wmi_service_close() - close wma wmi service interface. * @cds_ctx: cds context * - * Return: 0 on success, CDF Error on failure + * Return: 0 on success, QDF Error on failure */ QDF_STATUS wma_wmi_service_close(void *cds_ctx) { @@ -3090,7 +3090,7 @@ QDF_STATUS wma_wmi_work_close(void *cds_ctx) * cleanup resources attached with wma. * @cds_ctx: cds context * - * Return: 0 on success, CDF Error on failure + * Return: 0 on success, QDF Error on failure */ QDF_STATUS wma_close(void *cds_ctx) { @@ -3147,7 +3147,7 @@ QDF_STATUS wma_close(void *cds_ctx) if (qdf_status != QDF_STATUS_SUCCESS) WMA_LOGP("%s: dbglog_deinit failed", __func__); - /* close the cdf events */ + /* close the qdf events */ qdf_event_destroy(&wma_handle->wma_ready_event); qdf_status = qdf_mc_timer_destroy(&wma_handle->service_ready_ext_timer); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -3164,6 +3164,7 @@ QDF_STATUS wma_close(void *cds_ctx) qdf_runtime_lock_deinit(wma_handle->wmi_cmd_rsp_runtime_lock); for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { qdf_mem_free_consistent(wma_handle->qdf_dev, + wma_handle->qdf_dev->dev, wma_handle->mem_chunks[idx].len, wma_handle->mem_chunks[idx].vaddr, wma_handle->mem_chunks[idx].paddr, @@ -4259,7 +4260,7 @@ bool wma_needshutdown(void *cds_ctx) * wma_wait_for_ready_event() - wait for wma ready event * @handle: wma handle * - * Return: 0 for success or CDF error + * Return: 0 for success or QDF error */ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) { @@ -4284,7 +4285,7 @@ QDF_STATUS wma_wait_for_ready_event(WMA_HANDLE handle) * @pps_param: pps params * @val : param value * - * Return: 0 for success or CDF error + * Return: 0 for success or QDF error */ QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, int val) @@ -4362,7 +4363,7 @@ pkt_pwr_save_config: * * This function enables/disables the MAS value * - * Return: CDF_SUCCESS for success otherwise failure + * Return: QDF_SUCCESS for success otherwise failure */ QDF_STATUS wma_process_set_mas(tp_wma_handle wma, uint32_t *mas_val) @@ -4394,7 +4395,7 @@ QDF_STATUS wma_process_set_mas(tp_wma_handle wma, * * This function stores the miracast value in WMA * - * Return: CDF_SUCCESS for success otherwise failure + * Return: QDF_SUCCESS for success otherwise failure * */ QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) @@ -4690,7 +4691,7 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) * @cds_context: cds context * @msg: message * - * Return: CDF_SUCCESS for success otherwise failure + * Return: QDF_SUCCESS for success otherwise failure */ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) { diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index a710e053cd3d..9945f9c8e670 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -336,7 +336,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) p_inactivity = (tpSirIbssPeerInactivityInd) qdf_mem_malloc(sizeof(tSirIbssPeerInactivityInd)); if (!p_inactivity) { - WMA_LOGE("CDF MEM Alloc Failed for tSirIbssPeerInactivity"); + WMA_LOGE("QDF MEM Alloc Failed for tSirIbssPeerInactivity"); return -ENOMEM; } @@ -431,7 +431,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) del_sta_ctx = (tpDeleteStaContext) qdf_mem_malloc(sizeof(tDeleteStaContext)); if (!del_sta_ctx) { - WMA_LOGE("CDF MEM Alloc Failed for tDeleteStaContext"); + WMA_LOGE("QDF MEM Alloc Failed for tDeleteStaContext"); return -ENOMEM; } @@ -2022,7 +2022,7 @@ out: * * This function updates EDCA parameters to the target * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params) @@ -2295,7 +2295,7 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, * This will send to target on the reception of * SWBA event. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_store_bcn_tmpl(tp_wma_handle wma, uint8_t vdev_id, tpSendbeaconParams bcn_info) @@ -2808,7 +2808,7 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, * @ht_capab: ht capablity * @value: value of ht param * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { @@ -3304,7 +3304,7 @@ static int wma_mgmt_rx_process(void *handle, uint8_t *data, * wma_de_register_mgmt_frm_client() - deregister management frame * @cds_ctx: cds context * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) { @@ -3366,7 +3366,7 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, * @cds_ctx: cds context * @mgmt_frm_rx: management frame * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_register_mgmt_frm_client( void *cds_ctx, wma_mgmt_frame_rx_callback mgmt_frm_rx) diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 8b270fd8beb5..9217ad1942c9 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -171,7 +171,7 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle) * Fill individual elements of wmi_start_scan_req and TLV for * channel list, bssid, ssid etc. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, @@ -536,7 +536,7 @@ error: * * Fill wmi_stop_scan_cmd buffer. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, @@ -582,7 +582,7 @@ error: * * Send start scan command to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, uint16_t msg_type) @@ -683,7 +683,7 @@ error: * * Send stop scan command to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req) @@ -736,7 +736,7 @@ error1: * * Function is used to update the support channel list in fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list) @@ -839,7 +839,7 @@ end: * send WMI_ROAM_SCAN_MODE TLV to firmware. It has a piggyback * of WMI_ROAM_SCAN_MODE. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, wmi_start_scan_cmd_fixed_param * @@ -1105,7 +1105,7 @@ error: * * Send WMI_ROAM_SCAN_RSSI_THRESHOLD TLV to firmware * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) @@ -1258,7 +1258,7 @@ error: * * Send WMI_ROAM_SCAN_PERIOD parameters to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_period, @@ -1318,7 +1318,7 @@ error: * * Send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD parameters to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t vdev_id, @@ -1383,7 +1383,7 @@ error: * * Set roam offload channel list. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t chan_count, @@ -1798,7 +1798,7 @@ void wma_roam_scan_fill_scan_params(tp_wma_handle wma_handle, * * Send WMI_ROAM_AP_PROFILE to firmware * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, @@ -2015,7 +2015,7 @@ error: * * set first & final biss count to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, @@ -2057,7 +2057,7 @@ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, * * This function set roam offload command to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id) @@ -2110,7 +2110,7 @@ error: * * Main routine to handle ROAM commands coming from CSR module. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) @@ -2817,7 +2817,7 @@ int wma_rssi_breached_event_handler(void *handle, * * This function fills roam self capablities. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, wmi_roam_offload_tlv_param * @@ -3367,7 +3367,7 @@ void wma_set_pno_channel_prediction(uint8_t *buf_ptr, * @pno: PNO request * * This function request FW to start PNO request. - * Request: CDF status + * Request: QDF status */ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) { @@ -3515,7 +3515,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) * * This function request FW to stop ongoing PNO operation. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) { @@ -3616,7 +3616,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) * * This function request FW to start PLM. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) { @@ -3712,7 +3712,7 @@ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) * * This function request FW to stop PLM. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) { @@ -5143,7 +5143,7 @@ wma_extscan_hotlist_ssid_match_event_handler(void *handle, * This function fills individual elements of extscan request and * TLV for buckets, channel list. * - * Return: CDF Status. + * Return: QDF Status. */ QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, tSirWifiScanCmdReqParams *pstart, @@ -5371,7 +5371,7 @@ QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, * * This function sends start extscan request to fw. * - * Return: CDF Status. + * Return: QDF Status. */ QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart) @@ -5422,7 +5422,7 @@ QDF_STATUS wma_start_extscan(tp_wma_handle wma, * * This function sends stop extscan request to fw. * - * Return: CDF Status. + * Return: QDF Status. */ QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd) @@ -5505,7 +5505,7 @@ static inline int wma_get_hotlist_entries_per_page(wmi_unified_t wmi_handle, * This function fills individual elements for hotlist request and * TLV for bssid entries * - * Return: CDF Status. + * Return: QDF Status. */ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * @@ -5626,7 +5626,7 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, * * This function configures hotlist monitor in fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, tSirExtScanSetBssidHotListReqParams @@ -5659,7 +5659,7 @@ QDF_STATUS wma_extscan_start_hotlist_monitor(tp_wma_handle wma, * * This function configures hotlist monitor to stop in fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams @@ -5733,7 +5733,7 @@ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, * * This function fills elements of change monitor request buffer. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, tSirExtScanSetSigChangeReqParams @@ -5816,7 +5816,7 @@ QDF_STATUS wma_get_buf_extscan_change_monitor_cmd(tp_wma_handle wma_handle, * * This function sends start change monitor request to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * @@ -5862,7 +5862,7 @@ QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, * * This function sends stop change monitor request to fw. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams @@ -5931,7 +5931,7 @@ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, * * This function send request to fw to get cached results. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * @@ -5985,7 +5985,7 @@ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, * * This function send request to fw to get extscan capabilities. * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * @@ -6494,7 +6494,7 @@ wma_set_ssid_hotlist(tp_wma_handle wma, * * set scan probe OUI parameters in firmware * - * Return: CDF status + * Return: QDF status */ QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) { -- cgit v1.2.3 From 7e58dd3820a848453c3cd2e5ecb3bac1d48b43dd Mon Sep 17 00:00:00 2001 From: Prashanth Bhatta Date: Tue, 16 Feb 2016 15:46:46 -0800 Subject: qcacld-3.0: Kbuild: Build with qca-wifi-host-cmn With common code is separated into qca-wifi-host-cmn project, add Kbuild instructions to build along with qca-wifi-host-cmn project. Change-Id: Ie28d348ed6874e5b2ee0d1fb8d9451513db9771a CRs-fixed: 978124 --- Android.mk | 10 +++--- Kbuild | 104 +++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 62 insertions(+), 52 deletions(-) mode change 100644 => 100755 Kbuild diff --git a/Android.mk b/Android.mk index 791ae84cfd46..c9657ec67b7c 100644 --- a/Android.mk +++ b/Android.mk @@ -34,11 +34,9 @@ else DLKM_DIR := build/dlkm endif # platform-sdk-version -# Copy WCNSS_cfg.dat and WCNSS_qcom_cfg.ini file from firmware_bin/ folder to target out directory. +# Copy WCNSS_qcom_cfg.ini file from firmware_bin/ folder to target out directory. ifeq ($(call is-board-platform-in-list, msm8960),true) -$(shell rm -f $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_cfg.dat) $(shell rm -f $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_cfg.dat $(TARGET_OUT_ETC)/firmware/wlan/qca_cld) $(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_qcom_cfg.ini $(TARGET_OUT_ETC)/firmware/wlan/qca_cld) endif @@ -47,9 +45,13 @@ endif # This is set once per LOCAL_PATH, not per (kernel) module ifeq ($(WLAN_PROPRIETARY),1) KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-new + KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn else KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 + KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../opensource/wlan/qca-wifi-host-cmn endif # WLAN_PROPRIETARY +KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn + # We are actually building wlan.ko here, as per the # requirement we are specifying _wlan.ko as LOCAL_MODULE. # This means we need to rename the module to _wlan.ko @@ -102,9 +104,7 @@ ifeq ($(WLAN_PROPRIETARY),1) $(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) $(shell mkdir -p $(TARGET_OUT)/etc/wifi) $(shell rm -f $(TARGET_OUT)/etc/wifi/WCNSS_qcom_cfg.ini) -$(shell rm -f $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_SHIPSET)/WCNSS_cfg.dat) $(shell cp $(LOCAL_PATH)/config/WCNSS_qcom_cfg.ini $(TARGET_OUT)/etc/wifi) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_cfg.dat $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) endif #endif diff --git a/Kbuild b/Kbuild old mode 100644 new mode 100755 index 809011a0e326..04763f130341 --- a/Kbuild +++ b/Kbuild @@ -18,6 +18,8 @@ ifeq ($(KERNEL_BUILD),1) # Need to explicitly define for Kernel-based builds MODNAME := wlan WLAN_ROOT := drivers/staging/qcacld-3.0 + WLAN_COMMON_ROOT := drivers/staging/qca-wifi-host-cmn + WLAN_COMMON_INC := $(WLAN_COMMON_ROOT) endif # Make WLAN as open-source driver by default @@ -135,6 +137,10 @@ ifeq ($(KERNEL_BUILD), 0) CONFIG_LFR_SUBNET_DETECTION := y endif +# If not set, assume, Common driver is with in the build tree +WLAN_COMMON_ROOT ?= qca-wifi-host-cmn +WLAN_COMMON_INC ?= $(WLAN_ROOT)/$(WLAN_COMMON_ROOT) + ifneq ($(CONFIG_MOBILE_ROUTER), y) # To enable ESE upload, dependent config # CONFIG_QCOM_ESE must be enabled. @@ -575,23 +581,24 @@ SYS_OBJS := $(SYS_COMMON_SRC_DIR)/wlan_qct_sys.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/utils_api.o \ $(SYS_LEGACY_SRC_DIR)/utils/src/utils_parser.o -############ CDF (Connectivity driver framework) ############ -CDF_DIR := core/cdf -CDF_INC_DIR := $(CDF_DIR)/inc -CDF_SRC_DIR := $(CDF_DIR)/src - -CDF_INC := -I$(WLAN_ROOT)/$(CDF_INC_DIR) \ - -I$(WLAN_ROOT)/$(CDF_SRC_DIR) - -CDF_OBJS := $(CDF_SRC_DIR)/cdf_event.o \ - $(CDF_SRC_DIR)/cdf_list.o \ - $(CDF_SRC_DIR)/cdf_lock.o \ - $(CDF_SRC_DIR)/cdf_memory.o \ - $(CDF_SRC_DIR)/cdf_threads.o \ - $(CDF_SRC_DIR)/cdf_mc_timer.o \ - $(CDF_SRC_DIR)/cdf_trace.o \ - $(CDF_SRC_DIR)/cdf_nbuf.o \ - $(CDF_SRC_DIR)/cdf_defer.o +############ Qca-wifi-host-cmn ############ +QDF_OS_DIR := qdf +QDF_OS_INC_DIR := $(QDF_OS_DIR)/inc +QDF_OS_SRC_DIR := $(QDF_OS_DIR)/linux/src +QDF_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(QDF_OS_SRC_DIR) + +QDF_INC := -I$(WLAN_COMMON_INC)/$(QDF_OS_INC_DIR) \ + -I$(WLAN_COMMON_INC)/$(QDF_OS_SRC_DIR) + +QDF_OBJS := $(QDF_OBJ_DIR)/qdf_defer.o \ + $(QDF_OBJ_DIR)/qdf_event.o \ + $(QDF_OBJ_DIR)/qdf_list.o \ + $(QDF_OBJ_DIR)/qdf_lock.o \ + $(QDF_OBJ_DIR)/qdf_mc_timer.o \ + $(QDF_OBJ_DIR)/qdf_mem.o \ + $(QDF_OBJ_DIR)/qdf_nbuf.o \ + $(QDF_OBJ_DIR)/qdf_threads.o \ + $(QDF_OBJ_DIR)/qdf_trace.o ############ CDS (Connectivity driver services) ############ CDS_DIR := core/cds @@ -608,7 +615,8 @@ CDS_OBJS := $(CDS_SRC_DIR)/cds_api.o \ $(CDS_SRC_DIR)/cds_regdomain.o \ $(CDS_SRC_DIR)/cds_sched.o \ $(CDS_SRC_DIR)/cds_concurrency.o \ - $(CDS_SRC_DIR)/cds_utils.o + $(CDS_SRC_DIR)/cds_utils.o \ + $(CDS_SRC_DIR)/cds_mc_timer.o ########### BMI ########### @@ -689,16 +697,16 @@ HTT_OBJS := $(HTT_DIR)/htt_tx.o \ $(HTT_DIR)/htt_rx.o ############## HTC ########## -HTC_DIR := core/htc -HTC_INC := -I$(WLAN_ROOT)/$(HTC_DIR) +HTC_DIR := htc +HTC_INC := -I$(WLAN_COMMON_INC)/$(HTC_DIR) -HTC_OBJS := $(HTC_DIR)/htc.o \ - $(HTC_DIR)/htc_send.o \ - $(HTC_DIR)/htc_recv.o \ - $(HTC_DIR)/htc_services.o +HTC_OBJS := $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc.o \ + $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_send.o \ + $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_recv.o \ + $(WLAN_COMMON_ROOT)/$(HTC_DIR)/htc_services.o ########### HIF ########### -HIF_DIR := core/hif +HIF_DIR := hif HIF_CE_DIR := $(HIF_DIR)/src/ce HIF_CNSS_STUB_DIR := $(HIF_DIR)/src/icnss_stub @@ -708,41 +716,41 @@ else HIF_SNOC_DIR := $(HIF_DIR)/src/snoc endif -HIF_INC := -I$(WLAN_ROOT)/$(HIF_DIR)/inc \ - -I$(WLAN_ROOT)/$(HIF_DIR)/src \ - -I$(WLAN_ROOT)/$(HIF_CE_DIR) \ - -I$(WLAN_ROOT)/$(HIF_CNSS_STUB_DIR) +HIF_INC := -I$(WLAN_COMMON_INC)/$(HIF_DIR)/inc \ + -I$(WLAN_COMMON_INC)/$(HIF_DIR)/src \ + -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR) \ + -I$(WLAN_COMMON_INC)/$(HIF_CNSS_STUB_DIR) ifeq ($(CONFIG_HIF_PCI), 1) -HIF_INC += -I$(WLAN_ROOT)/$(HIF_PCIE_DIR) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_PCIE_DIR) else -HIF_INC += -I$(WLAN_ROOT)/$(HIF_SNOC_DIR) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SNOC_DIR) endif -HIF_OBJS := $(HIF_DIR)/src/ath_procfs.o \ - $(HIF_CE_DIR)/ce_diag.o \ - $(HIF_CE_DIR)/ce_main.o \ - $(HIF_CE_DIR)/ce_service.o \ - $(HIF_CE_DIR)/ce_tasklet.o \ - $(HIF_DIR)/src/hif_main.o \ - $(HIF_DIR)/src/mp_dev.o \ - $(HIF_DIR)/src/regtable.o +HIF_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/ath_procfs.o \ + $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_diag.o \ + $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_main.o \ + $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_service.o \ + $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_tasklet.o \ + $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_main.o \ + $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/mp_dev.o \ + $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/regtable.o ifeq ($(CONFIG_CNSS), y) -HIF_OBJS += $(HIF_CNSS_STUB_DIR)/icnss_stub.o \ - $(HIF_CE_DIR)/ce_bmi.o +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CNSS_STUB_DIR)/icnss_stub.o \ + $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o endif ifeq ($(CONFIG_WLAN_NAPI), y) -HIF_OBJS += $(HIF_DIR)/src/hif_napi.o +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_napi.o endif ifeq ($(CONFIG_HIF_PCI), 1) -HIF_PCIE_OBJS := $(HIF_PCIE_DIR)/if_pci.o +HIF_PCIE_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_PCIE_DIR)/if_pci.o HIF_OBJS += $(HIF_PCIE_OBJS) else -HIF_SNOC_OBJS := $(HIF_SNOC_DIR)/if_snoc.o +HIF_SNOC_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_SNOC_DIR)/if_snoc.o HIF_OBJS += $(HIF_SNOC_OBJS) endif @@ -783,7 +791,7 @@ INCS := $(HDD_INC) \ $(SAP_INC) \ $(SME_INC) \ $(SYS_INC) \ - $(CDF_INC) \ + $(QDF_INC) \ $(CDS_INC) \ $(DFS_INC) @@ -822,7 +830,7 @@ OBJS := $(HDD_OBJS) \ $(SAP_OBJS) \ $(SME_OBJS) \ $(SYS_OBJS) \ - $(CDF_OBJS) \ + $(QDF_OBJS) \ $(CDS_OBJS) \ $(DFS_OBJS) @@ -893,7 +901,8 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DWLAN_LOGGING_SOCK_SVC_ENABLE \ -DFEATURE_WLAN_EXTSCAN \ -DWLAN_FEATURE_MBSSID \ - -DCONFIG_160MHZ_SUPPORT + -DCONFIG_160MHZ_SUPPORT \ + -DCONFIG_MCL ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS))) CDEFINES += -DQCA_WIFI_3_0 @@ -1339,3 +1348,4 @@ endif # Module information used by KBuild framework obj-$(CONFIG_QCA_CLD_WLAN) += $(MODNAME).o $(MODNAME)-y := $(OBJS) + -- cgit v1.2.3 From 1edffd327b9b48ca065e193afc45068ec90e4c08 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Wed, 27 Jan 2016 16:30:34 -0800 Subject: qcacld-3.0: Support simultaneous mutlibus in kbuild Make the kbuild support multiple bus types at the same time. Change-Id: I3ac6ea75b9495681ce0b3fc65ed4999f19cf5a6d CRs-Fixed: 986480 --- Kbuild | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/Kbuild b/Kbuild index 04763f130341..b9e44f270a50 100755 --- a/Kbuild +++ b/Kbuild @@ -710,20 +710,25 @@ HIF_DIR := hif HIF_CE_DIR := $(HIF_DIR)/src/ce HIF_CNSS_STUB_DIR := $(HIF_DIR)/src/icnss_stub -ifeq ($(CONFIG_HIF_PCI), 1) + +HIF_DISPATCHER_DIR := $(HIF_DIR)/src/dispatcher + HIF_PCIE_DIR := $(HIF_DIR)/src/pcie -else HIF_SNOC_DIR := $(HIF_DIR)/src/snoc -endif HIF_INC := -I$(WLAN_COMMON_INC)/$(HIF_DIR)/inc \ -I$(WLAN_COMMON_INC)/$(HIF_DIR)/src \ -I$(WLAN_COMMON_INC)/$(HIF_CE_DIR) \ -I$(WLAN_COMMON_INC)/$(HIF_CNSS_STUB_DIR) + ifeq ($(CONFIG_HIF_PCI), 1) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_PCIE_DIR) -else +endif + +ifeq ($(CONFIG_HIF_SNOC), 1) +HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_DISPATCHER_DIR) HIF_INC += -I$(WLAN_COMMON_INC)/$(HIF_SNOC_DIR) endif @@ -736,23 +741,28 @@ HIF_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/ath_procfs.o \ $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/mp_dev.o \ $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/regtable.o -ifeq ($(CONFIG_CNSS), y) -HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CNSS_STUB_DIR)/icnss_stub.o \ - $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o +ifneq ($(CONFIG_ICNSS), y) +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CNSS_STUB_DIR)/icnss_stub.o endif ifeq ($(CONFIG_WLAN_NAPI), y) HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DIR)/src/hif_napi.o endif -ifeq ($(CONFIG_HIF_PCI), 1) HIF_PCIE_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_PCIE_DIR)/if_pci.o +HIF_PCIE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o +HIF_SNOC_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_SNOC_DIR)/if_snoc.o +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus.o + +ifeq ($(CONFIG_HIF_PCI), 1) HIF_OBJS += $(HIF_PCIE_OBJS) -else -HIF_SNOC_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_SNOC_DIR)/if_snoc.o +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_pci.o +endif +ifeq ($(CONFIG_HIF_SNOC), 1) HIF_OBJS += $(HIF_SNOC_OBJS) +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus_snoc.o endif ############ WMA ############ @@ -1090,6 +1100,10 @@ ifeq ($(CONFIG_HIF_PCI), 1) CDEFINES += -DHIF_PCI endif +ifeq ($(CONFIG_HIF_SNOC), 1) +CDEFINES += -DHIF_SNOC +endif + #Enable USB specific APIS ifeq ($(CONFIG_HIF_USB), 1) CDEFINES += -DHIF_USB -- cgit v1.2.3 From ab091116bfb1e01d5ef53f11b3832dfea2e20164 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Fri, 12 Feb 2016 18:21:36 -0800 Subject: qcacld-3.0: Let compiler resolve hif_device_id type hif_device_id type is a opaque pointer that abstracts out some of the pci data structures. Change-Id: Ib472490b9de26cae291f86fd0e3c05af40e6951e CRs-Fixed: 986480 --- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 9c08deb675bd..0077b66ddbf5 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -815,7 +815,7 @@ void wlan_hdd_pci_remove(struct pci_dev *pdev) int wlan_hdd_pci_reinit(struct pci_dev *pdev, const struct pci_device_id *id) { - return wlan_hdd_probe(&pdev->dev, pdev, id, + return wlan_hdd_probe(&pdev->dev, pdev, (void *)id, QDF_BUS_TYPE_PCI, true); } -- cgit v1.2.3 From 9a547dc0bc457530cd9efd38cb479a23a31a9783 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Fri, 12 Feb 2016 17:10:24 -0800 Subject: qcacld-3.0: Skip bmi and ramdump at runtime Need to support SNOC and PCI dynamically. Core BSP code is responsible for SNOC firmware loading and crash dumps. Change-Id: Ia16076809f2b74be6f32ad5015b79b1fe2c13ca3 CRs-Fixed: 986480 --- Kbuild | 2 -- core/bmi/inc/bmi.h | 17 ----------------- core/bmi/inc/ol_fw.h | 7 ------- core/bmi/src/bmi.c | 38 +++++++++++++++++++++++++++++++------- core/bmi/src/ol_fw.c | 13 +++++++++++++ 5 files changed, 44 insertions(+), 33 deletions(-) diff --git a/Kbuild b/Kbuild index b9e44f270a50..ee0fb4e53eaf 100755 --- a/Kbuild +++ b/Kbuild @@ -624,7 +624,6 @@ BMI_DIR := core/bmi BMI_INC := -I$(WLAN_ROOT)/$(BMI_DIR)/inc -ifneq ($(CONFIG_ICNSS), y) BMI_OBJS := $(BMI_DIR)/src/bmi.o \ $(BMI_DIR)/src/ol_fw.o ifeq ($(CONFIG_FEATURE_BMI_2), y) @@ -632,7 +631,6 @@ BMI_OBJS += $(BMI_DIR)/src/bmi_2.o else BMI_OBJS += $(BMI_DIR)/src/bmi_1.o endif -endif ########### WMI ########### WMI_DIR := core/wmi diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h index 1c7931738555..bf26ffba4058 100644 --- a/core/bmi/inc/bmi.h +++ b/core/bmi/inc/bmi.h @@ -62,24 +62,7 @@ struct ol_config_info { void ol_init_ini_config(struct ol_context *ol_ctx, struct ol_config_info *cfg); -#ifdef HIF_PCI void bmi_cleanup(struct ol_context *scn); QDF_STATUS bmi_done(struct ol_context *ol_ctx); QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx); -#else -static inline void bmi_cleanup(struct ol_context *scn) -{ - return; -} - -static inline QDF_STATUS bmi_done(struct ol_context *ol_ctx) -{ - return QDF_STATUS_SUCCESS; -} - -static inline QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) -{ - return QDF_STATUS_SUCCESS; -} -#endif #endif /* _BMI_H_ */ diff --git a/core/bmi/inc/ol_fw.h b/core/bmi/inc/ol_fw.h index d417bb3fe090..963cacc6b727 100644 --- a/core/bmi/inc/ol_fw.h +++ b/core/bmi/inc/ol_fw.h @@ -47,12 +47,5 @@ #define AR6320_REV4_VERSION AR6320_REV2_1_VERSION #define AR6320_DEV_VERSION 0x1000000 -#ifdef HIF_PCI void ol_target_failure(void *instance, QDF_STATUS status); -#else -static inline void ol_target_failure(void *instance, QDF_STATUS status) -{ - return; -} -#endif #endif /* _OL_FW_H_ */ diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index d9de534cd0d4..0a15dd41267e 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -105,9 +105,15 @@ end: void bmi_cleanup(struct ol_context *ol_ctx) { struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx); - qdf_device_t qdf_dev = ol_ctx->qdf_dev; + qdf_device_t qdf_dev; - if (!qdf_dev->dev) { + if (!info || !ol_ctx) { + BMI_WARN("%s: no bmi to cleanup", __func__); + return; + } + + qdf_dev = ol_ctx->qdf_dev; + if (!qdf_dev || !qdf_dev->dev) { BMI_ERR("%s: Invalid Device Pointer", __func__); return; } @@ -129,16 +135,34 @@ void bmi_cleanup(struct ol_context *ol_ctx) } } - +/** + * bmi_done() - finish the bmi opperation + * @ol_ctx: the bmi context + * + * does some sanity checking. + * exchanges one last message with firmware. + * frees some buffers. + * + * Return: QDF_STATUS_SUCCESS if bmi isn't needed. + * QDF_STATUS_SUCCESS if bmi finishes. + * otherwise returns failure. + */ QDF_STATUS bmi_done(struct ol_context *ol_ctx) { QDF_STATUS status = QDF_STATUS_SUCCESS; if (NO_BMI) - return status; + return QDF_STATUS_SUCCESS; - status = bmi_done_local(ol_ctx); + if (!ol_ctx) { + BMI_ERR("%s: null context", __func__); + return QDF_STATUS_E_NOMEM; + } + if (!hif_needs_bmi(ol_ctx->scn)) + return QDF_STATUS_SUCCESS; + + status = bmi_done_local(ol_ctx); if (status != QDF_STATUS_SUCCESS) BMI_ERR("BMI_DONE Failed status:%d", status); @@ -203,8 +227,8 @@ QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx) int32_t ret; struct hif_opaque_softc *scn = ol_ctx->scn; - if (NO_BMI) - return QDF_STATUS_SUCCESS; /* no BMI for Q6 bring up */ + if (NO_BMI || !hif_needs_bmi(scn)) + return QDF_STATUS_SUCCESS; if (!scn) { BMI_ERR("Invalid scn context"); diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index d1980f47baf6..effd599f6350 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -617,6 +617,11 @@ void ol_target_failure(void *instance, QDF_STATUS status) ol_target_status target_status = hif_get_target_status(scn); + if (hif_get_bus_type(scn) == QDF_BUS_TYPE_SNOC) { + BMI_ERR("SNOC doesn't suppor this code path!"); + return; + } + qdf_event_set(&wma->recovery_event); if (OL_TRGET_STATUS_RESET == target_status) { @@ -1422,6 +1427,7 @@ int ol_diag_read(struct hif_opaque_softc *scn, uint8_t *buffer, return -EIO; } +#ifdef HIF_PCI static int ol_ath_get_reg_table(uint32_t target_version, tgt_reg_table *reg_table) { @@ -1522,6 +1528,13 @@ static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer, out: return result; } +#else +static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer, + uint32_t buffer_len) +{ + return -EINVAL; +} +#endif void ol_dump_target_memory(struct hif_opaque_softc *scn, void *memory_block) { -- cgit v1.2.3 From c2cd5d472ea62af791d62d7e6e168b6c06c18f44 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Tue, 16 Feb 2016 14:57:56 -0800 Subject: qcacld-3.0: Remove power_gating from upper layers These are pci specific power management features. These should be consolidated instead of littering bus agnostic code. Change-Id: I366f1d14ab04368d77a144bebaeb038c1469abed CRs-Fixed: 986480 --- core/dp/htt/htt.c | 6 ------ core/dp/htt/htt_h2t.c | 2 -- core/dp/htt/htt_internal.h | 2 -- core/hdd/src/wlan_hdd_driver_ops.c | 2 +- core/hdd/src/wlan_hdd_main.c | 2 -- core/hdd/src/wlan_hdd_power.c | 1 - 6 files changed, 1 insertion(+), 14 deletions(-) diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 58a7dccd2ab3..840692b82dce 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -463,12 +463,6 @@ void htt_display(htt_pdev_handle pdev, int indent) } #endif -/* Disable ASPM : Disable PCIe low power */ -void htt_htc_disable_aspm(struct htt_pdev_t *pdev) -{ - htc_disable_aspm(pdev->htc_pdev); -} - #ifdef IPA_OFFLOAD /** * htt_ipa_uc_attach() - Allocate UC data path resources diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c index 39762b5ae614..2246e7fda1b8 100644 --- a/core/dp/htt/htt_h2t.c +++ b/core/dp/htt/htt_h2t.c @@ -332,9 +332,7 @@ A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev) enable_hdr = 1; enable_ppdu_start = 1; enable_ppdu_end = 1; - /* Disable ASPM when pkt log is enabled */ qdf_print("Pkt log is enabled\n"); - htt_htc_disable_aspm(pdev); } else { qdf_print("Pkt log is disabled\n"); enable_ctrl_data = 0; diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 454327543b95..8b371ae5f58e 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -459,8 +459,6 @@ htt_htc_misc_pkt_list_add(struct htt_pdev_t *pdev, struct htt_htc_pkt *pkt); void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev); #endif -void htt_htc_disable_aspm(struct htt_pdev_t *pdev); - int htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr, qdf_nbuf_t netbuf); diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 0077b66ddbf5..f9345755bcf1 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -386,7 +386,7 @@ static int wlan_hdd_probe(struct device *dev, void *bdev, const hif_bus_id *bid, if (ret) goto err_bmi_close; - hif_enable_power_management(hif_ctx); + hif_enable_power_management(hif_ctx, cds_is_packet_log_enabled()); if (reinit) { cds_set_recovery_in_progress(false); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f9ae7bd2ff26..d399859d7385 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5784,8 +5784,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) } } - hif_enable_power_gating(hif_sc); - memdump_init(); goto success; diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index cff0d5c0c48f..238158b8036d 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1601,7 +1601,6 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) pHddCtx->target_hw_name); #endif - hif_enable_power_gating(hif_sc); hddLog(LOGE, "%s: WLAN host driver reinitiation completed!", __func__); goto success; -- cgit v1.2.3 From ee9990f139cb33ec1a9a832348219b307136f447 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Tue, 16 Feb 2016 15:22:33 -0800 Subject: qcacld-3.0: Remove htc_set_target_to_sleep Hif will take care of allowing target sleep after driver load. Change-Id: I3def052f4c14d843e1f8eb8f261f11306958c0a7 CRs-Fixed: 986480 --- core/cds/src/cds_api.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 206f396498e4..8edddecae199 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -564,7 +564,6 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Failed to get ready event from target firmware"); - htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; @@ -573,14 +572,11 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Failed to attach pdev"); - htc_set_target_to_sleep(scn); htc_stop(gp_cds_context->htc_ctx); QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - htc_set_target_to_sleep(scn); - return QDF_STATUS_SUCCESS; } -- cgit v1.2.3 From f3c2e1d2dfa3bb64043ccd95a999a59ffd5f04ad Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Thu, 18 Feb 2016 17:12:08 -0800 Subject: qcacld-3.0: Controll target sleep in hif Reduce the api footprint of hif and make hif responsible for controlling its own timer as part of suspend resume. Change-Id: Ifdcc95f65cd56e5987d961c01c4e35a9a93787f7 CRs-Fixed: 986480 --- core/wma/src/wma_features.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 6e80bf0f0e97..8c92bb7eb2f1 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3660,8 +3660,6 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) return QDF_STATUS_E_FAULT; } - htc_cancel_deferred_target_sleep(scn); - wma->wow.wow_enable_cmd_sent = true; return QDF_STATUS_SUCCESS; @@ -6610,8 +6608,6 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) return -EFAULT; } - htc_cancel_deferred_target_sleep(scn); - return 0; } -- cgit v1.2.3 From b61b9b1dcbca84674c42eeb5b899ea5465467d3b Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Thu, 3 Mar 2016 20:04:16 -0800 Subject: qcacld-3.0: Add dummy.o to kbuild Add a file to contain dummy functions for hif. Change-Id: Ief06d0913eac0a38d6c188460925c6a7ca989f85 CRs-Fixed: 986480 --- Kbuild | 1 + 1 file changed, 1 insertion(+) diff --git a/Kbuild b/Kbuild index ee0fb4e53eaf..21ea0a97bd53 100755 --- a/Kbuild +++ b/Kbuild @@ -752,6 +752,7 @@ HIF_PCIE_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_CE_DIR)/ce_bmi.o HIF_SNOC_OBJS := $(WLAN_COMMON_ROOT)/$(HIF_SNOC_DIR)/if_snoc.o HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/multibus.o +HIF_OBJS += $(WLAN_COMMON_ROOT)/$(HIF_DISPATCHER_DIR)/dummy.o ifeq ($(CONFIG_HIF_PCI), 1) HIF_OBJS += $(HIF_PCIE_OBJS) -- cgit v1.2.3 From e3846e4b48deab1c8a288174e616b41dc8f05e9f Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Thu, 10 Mar 2016 11:56:31 -0800 Subject: qcacld-3.0: Remove ifdef HIF_PCI from ol_fw The target defs need to be protected by a chip specific flag if at all. A bus flag is too generic. Change-Id: I631b9686b69dcba0a47bf10bccf7f94ac3a4bd9c CRs-Fixed: 986480 --- core/bmi/src/i_ar6320v2_regtable.h | 2 -- core/bmi/src/ol_fw.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/core/bmi/src/i_ar6320v2_regtable.h b/core/bmi/src/i_ar6320v2_regtable.h index 9022e1291d29..b3fcf2f5e5a4 100644 --- a/core/bmi/src/i_ar6320v2_regtable.h +++ b/core/bmi/src/i_ar6320v2_regtable.h @@ -33,7 +33,6 @@ #define AR6320_REV2_1_REG_SIZE 0x0007F820 #define AR6320_REV3_REG_SIZE 0x0007F820 -#ifdef HIF_PCI /* * Redefine the register list. To minimize the size of the array, the list must * obey the below format. {start0, end0}, {start1, end1}, {start2, end2}....... @@ -603,5 +602,4 @@ static const tgt_reg_section ar6320v3_reg_table[] = { {0x80000, 0x8000C}, {0x80010, 0x80020}, }; -#endif #endif /* #ifndef _AR6320V2_DBG_REGTABLE_H_ */ diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c index effd599f6350..79bc5625f106 100644 --- a/core/bmi/src/ol_fw.c +++ b/core/bmi/src/ol_fw.c @@ -1427,7 +1427,6 @@ int ol_diag_read(struct hif_opaque_softc *scn, uint8_t *buffer, return -EIO; } -#ifdef HIF_PCI static int ol_ath_get_reg_table(uint32_t target_version, tgt_reg_table *reg_table) { @@ -1528,13 +1527,6 @@ static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer, out: return result; } -#else -static int ol_diag_read_reg_loc(struct hif_opaque_softc *scn, uint8_t *buffer, - uint32_t buffer_len) -{ - return -EINVAL; -} -#endif void ol_dump_target_memory(struct hif_opaque_softc *scn, void *memory_block) { -- cgit v1.2.3 From 5e99fff7402f2ede8aee7e769c4e9d3db07d2005 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Tue, 15 Mar 2016 19:25:38 -0700 Subject: qcacld-3.0: First CLD3.1 Release 5.1.0.1 qcacld-3.0: First CLD3.1 Release 5.1.0.1 CRs-Fixed: 688141 Change-Id: Ib194b131c1caf4c7937fdcb0dcaed53bebea34ee --- core/mac/inc/qwlan_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4c6d3dc123a5..12f8762112d9 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -39,11 +39,11 @@ ===========================================================================*/ #define QWLAN_VERSION_MAJOR 5 -#define QWLAN_VERSION_MINOR 0 +#define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 161 +#define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.0.0.161" +#define QWLAN_VERSIONSTR "5.1.0.1" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From d2970e3861991ba20bb7dbb4d44aae88cc681500 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 21 Jan 2016 10:30:02 +0530 Subject: qcacld-3.0: CL- 1439678 - update fw common interface files Add qtimer to TSF capture request and response WMI messages/event. CRs-Fixed: 962166 Change-Id: Ia10eca66cfbff821ef1f4c03a0fb964d504d53a2 --- target/inc/wmi_unified.h | 5 +++++ target/inc/wmi_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 183a074303ad..563ea90e65ff 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -11966,6 +11966,7 @@ typedef enum { TSF_TSTAMP_CAPTURE_REQ = 1, TSF_TSTAMP_CAPTURE_RESET = 2, TSF_TSTAMP_READ_VALUE = 3, + TSF_TSTAMP_QTIMER_CAPTURE_REQ = 4, } wmi_tsf_tstamp_action; typedef struct { @@ -11976,6 +11977,10 @@ typedef struct { A_UINT32 vdev_id; /* action type, refer to wmi_tsf_tstamp_action */ A_UINT32 tsf_action; + /* low 32 bits of qtimer */ + A_UINT32 qtimer_low; + /* high 32 bits of qtimer */ + A_UINT32 qtimer_high; } wmi_vdev_tsf_tstamp_action_cmd_fixed_param; typedef struct { diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 875992f38794..fcebd80e3308 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 192 +#define __WMI_REVISION_ 194 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From ce8fd91b4fd910b186a0d12517d1c1ee9847fbb6 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 21 Jan 2016 10:24:19 +0530 Subject: qcacld-3.0: CL- 1439486 - update fw common interface files add wmi_roam_dense_thres_param params defs CRs-Fixed: 960961 Change-Id: I20b18babdde45b05f1675cf708ef9663141d8541 --- target/inc/wmi_tlv_defs.h | 4 +++- target/inc/wmi_unified.h | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index d7645fa8cacf..6633321b27cb 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -613,6 +613,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_bpf_del_vdev_instructions_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_vdev_delete_resp_event_fixed_param, WMITLV_TAG_STRUC_wmi_peer_delete_resp_event_fixed_param, + WMITLV_TAG_STRUC_wmi_roam_dense_thres_param, } WMITLV_TAG_ID; @@ -1107,7 +1108,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_MODE); #define WMITLV_TABLE_WMI_ROAM_SCAN_RSSI_THRESHOLD(id,op,buf,len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_roam_scan_rssi_threshold_fixed_param, wmi_roam_scan_rssi_threshold_fixed_param, fixed_param, WMITLV_SIZE_FIX)\ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_scan_extended_threshold_param, extended_param, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_earlystop_rssi_thres_param, earlystop_param, WMITLV_SIZE_VAR) + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_earlystop_rssi_thres_param, earlystop_param, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_dense_thres_param, dense_param, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_RSSI_THRESHOLD); diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 563ea90e65ff..1a8ca58ec6c1 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -6056,6 +6056,7 @@ typedef struct { /* The TLVs will follow. * wmi_roam_scan_extended_threshold_param extended_param; * wmi_roam_earlystop_rssi_thres_param earlystop_param; + * wmi_roam_dense_thres_param dense_param; */ } wmi_roam_scan_rssi_threshold_fixed_param; @@ -6228,6 +6229,24 @@ typedef struct { A_UINT32 roam_earlystop_thres_max; } wmi_roam_earlystop_rssi_thres_param; +typedef struct { + /* TLV tag and len; + * tag equals WMITLV_TAG_STRUC_wmi_roam_dense_thres_param + */ + A_UINT32 tlv_header; + /* rssi threshold offset under trffic and dense env */ + A_UINT32 roam_dense_rssi_thres_offset; + /* minimum number of APs to determine dense env */ + A_UINT32 roam_dense_min_aps; + /* initial dense status detected by host + * at the time of initial connection */ + A_UINT32 roam_dense_status; + /* traffic threshold to enable aggressive roaming in dense env; + * units are percent of medium occupancy, 0 - 100 + */ + A_UINT32 roam_dense_traffic_thres; +} wmi_roam_dense_thres_param; + /** Beacon filter wmi command info */ #define BCN_FLT_MAX_SUPPORTED_IES 256 -- cgit v1.2.3 From 42f7154c947555f39c344b50617a405f16373eeb Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 14 Mar 2016 16:32:33 +0530 Subject: qcacld-3.0: CL- 1443304 - update fw common interface files WMI changes for EPNO enhancement. CRs-Fixed: 962167 Change-Id: I8439c4f574738d89d54300e08fbd7e2d536863a9 --- target/inc/wmi_tlv_defs.h | 6 ++++-- target/inc/wmi_unified.h | 27 +++++++++++++++++++++++++++ target/inc/wmi_version.h | 4 ++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 6633321b27cb..01216eb3b3d3 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -614,6 +614,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_vdev_delete_resp_event_fixed_param, WMITLV_TAG_STRUC_wmi_peer_delete_resp_event_fixed_param, WMITLV_TAG_STRUC_wmi_roam_dense_thres_param, + WMITLV_TAG_STRUC_enlo_candidate_score_param, } WMITLV_TAG_ID; @@ -1513,7 +1514,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_REQUEST_LINK_STATS_CMDID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_nlo_config_cmd_fixed_param, wmi_nlo_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, nlo_configured_parameters, nlo_list, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_list, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, nlo_channel_prediction_cfg, channel_prediction_param, WMITLV_SIZE_VAR) + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, nlo_channel_prediction_cfg, channel_prediction_param, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_enlo_candidate_score_param, enlo_candidate_score_params, candidate_score_params, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 1a8ca58ec6c1..d39cb186941d 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -7767,6 +7767,7 @@ typedef enum _WMI_NLO_SSID_BcastNwType { * one of them can be enabled at a given time */ #define WMI_NLO_CONFIG_ENLO (0x1 << 7) #define WMI_NLO_CONFIG_SCAN_PASSIVE (0x1 << 8) +#define WMI_NLO_CONFIG_ENLO_RESET (0x1 << 9) /* Whether directed scan needs to be performed (for hidden SSIDs) */ #define WMI_ENLO_FLAG_DIRECTED_SCAN 1 @@ -7850,6 +7851,31 @@ typedef struct nlo_channel_prediction_cfg { A_UINT32 full_scan_period_ms; } nlo_channel_prediction_cfg; +typedef struct enlo_candidate_score_params_t { + /* + * TLV tag and len; + * tag equals WMITLV_TAG_STRUC_wmi_enlo_candidate_score_param + */ + A_UINT32 tlv_header; + /* minimum 5GHz RSSI for a BSSID to be considered (units = dBm) */ + A_INT32 min5GHz_rssi; + /* minimum 2.4GHz RSSI for a BSSID to be considered (units = dBm) */ + A_INT32 min24GHz_rssi; + /* the maximum score that a network can have before bonuses */ + A_UINT32 initial_score_max; + /* current_connection_bonus: + * only report when there is a network's score this much higher + * than the current connection + */ + A_UINT32 current_connection_bonus; + /* score bonus for all networks with the same network flag */ + A_UINT32 same_network_bonus; + /* score bonus for networks that are not open */ + A_UINT32 secure_bonus; + /* 5GHz RSSI score bonus (applied to all 5GHz networks) */ + A_UINT32 band5GHz_bonus; +} enlo_candidate_score_params; + typedef struct wmi_nlo_config { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_nlo_config_cmd_fixed_param */ A_UINT32 flags; @@ -7870,6 +7896,7 @@ typedef struct wmi_nlo_config { * nlo_configured_parameters nlo_list[]; * A_UINT32 channel_list[]; * nlo_channel_prediction_cfg ch_prediction_cfg; + * enlo_candidate_score_params candidate_score_params; */ } wmi_nlo_config_cmd_fixed_param; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index fcebd80e3308..bfef0954f6d0 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 194 +#define __WMI_REVISION_ 195 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From fad2f214b85fdd0e5e18003ad03d4559c2dbde6a Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 21 Jan 2016 10:55:51 +0530 Subject: qcacld-3.0: CL- 1443550 - update fw common interface files WMI changes for gscan enhancements CRs-Fixed: 962169 Change-Id: If319738b42d4e71aec8d21624546ca039232c413 --- target/inc/wmi_unified.h | 11 +++++++++++ target/inc/wmi_version.h | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index d39cb186941d..ffeb7278b5f6 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -9107,6 +9107,11 @@ typedef struct { #define LPI_IE_BITMAP_SCAN_ID 0x00100000 /*extscan inserts the scan cycle count for this value; other scan clients can insert the scan id of the scan, if needed.*/ #define LPI_IE_BITMAP_FLAGS 0x00200000 /* reserved as a bitmap to indicate more scan information; one such use being to indicate if the on-going scan is interrupted or not*/ #define LPI_IE_BITMAP_CACHING_REQD 0x00400000 /*extscan will use this field to indicate if this frame info needs to be cached in LOWI LP or not*/ +/* + * extscan will use this field to indicate to + * LOWI LP whether to report result to context hub or not + */ +#define LPI_IE_BITMAP_REPORT_CONTEXT_HUB 0x00800000 #define LPI_IE_BITMAP_ALL 0xFFFFFFFF typedef struct { @@ -10123,6 +10128,8 @@ typedef enum { WMI_EXTSCAN_BUCKET_COMPLETED_EVENT = 0x0008, WMI_EXTSCAN_BUCKET_FAILED_EVENT = 0x0010, WMI_EXTSCAN_BUCKET_OVERRUN_EVENT = 0x0020, + WMI_EXTSCAN_THRESHOLD_NUM_SCANS = 0x0040, + WMI_EXTSCAN_THRESHOLD_PERCENT = 0x0080, WMI_EXTSCAN_EVENT_MAX = 0x8000 } wmi_extscan_event_type; @@ -10152,6 +10159,8 @@ typedef enum { * configuration flags has this bit set */ WMI_EXTSCAN_BUCKET_CACHE_RESULTS = 0x0001, + /* Report ext scan results to context hub or not.*/ + WMI_EXTSCAN_REPORT_EVENT_CONTEXT_HUB = 0x0002, } wmi_extscan_bucket_configuration_flags; typedef enum { @@ -10725,6 +10734,8 @@ typedef struct { A_UINT32 first_entry_index; /**number of bssids in this page */ A_UINT32 num_entries_in_page; + /* number of buckets scanned */ + A_UINT32 buckets_scanned; /* Followed by the variable length TLVs * wmi_extscan_wlan_descriptor bssid_list[] * wmi_extscan_rssi_info rssi_list[] diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index bfef0954f6d0..e08a9a69c8d3 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 195 +#define __WMI_REVISION_ 196 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From c7d519439bd0aaf8ccd6f50c43bfb08f9bd7c12b Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 12:09:31 +0530 Subject: qcacld-3.0: CL 1444210 update fw common interface files Merge WIN's wlanfw_cmn.2.0 WMI message defs Change-Id: I6489713538ac945386bc9b089a4a014d41281382 CRs-fixed: 865207 --- core/wmi/wmi_unified.c | 23 +- target/inc/wmi_tlv_defs.h | 238 +++++++++++++++- target/inc/wmi_unified.h | 714 ++++++++++++++++++++++++++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 4 files changed, 973 insertions(+), 4 deletions(-) diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 3d1d7ae351ba..cb632fe7fc4a 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -747,7 +747,28 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_BPF_GET_VDEV_STATS_CMDID); CASE_RETURN_STRING(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); CASE_RETURN_STRING(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID); - + CASE_RETURN_STRING(WMI_PEER_UPDATE_WDS_ENTRY_CMDID); + CASE_RETURN_STRING(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID); + CASE_RETURN_STRING(WMI_PDEV_FIPS_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_ENABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_CTL_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_VDEV_RATEMASK_CMDID); + CASE_RETURN_STRING(WMI_VDEV_ATF_REQUEST_CMDID); + CASE_RETURN_STRING(WMI_VDEV_SET_DSCP_TID_MAP_CMDID); + CASE_RETURN_STRING(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); + CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); + CASE_RETURN_STRING(WMI_PEER_ATF_REQUEST_CMDID); + CASE_RETURN_STRING(WMI_FWTEST_CMDID); + CASE_RETURN_STRING(WMI_QBOOST_CFG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_GET_NFCAL_POWER_CMDID); } return "Invalid WMI cmd"; } diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 01216eb3b3d3..24f1cd56671c 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -615,6 +615,48 @@ typedef enum { WMITLV_TAG_STRUC_wmi_peer_delete_resp_event_fixed_param, WMITLV_TAG_STRUC_wmi_roam_dense_thres_param, WMITLV_TAG_STRUC_enlo_candidate_score_param, + WMITLV_TAG_STRUC_wmi_peer_update_wds_entry_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_config_ratemask_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_fips_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_smart_ant_enable_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_tx_antenna_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_train_antenna_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_ant_switch_tbl_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_ctl_table_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_mimogain_table_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_fwtest_set_param_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_atf_request_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_atf_request_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_get_ani_cck_config_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_get_ani_ofdm_config_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_inst_rssi_stats_resp_fixed_param, + WMITLV_TAG_STRUC_wmi_med_util_report_event_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_sta_ps_statechange_event_fixed_param, + WMITLV_TAG_STRUC_wmi_wds_addr_event_fixed_param, + WMITLV_TAG_STRUC_wmi_peer_ratecode_list_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_tpc_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ani_ofdm_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ani_cck_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_channel_hopping_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param, + WMITLV_TAG_STRUC_wmi_atf_peer_info, + WMITLV_TAG_STRUC_wmi_pdev_get_tpc_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_filter_nrp_config_cmd_fixed_param, + WMITLV_TAG_STRUC_WMI_QBOOST_CFG_CMD_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_smart_ant_gpio_handle, + WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_tx_antenna_series, + WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_train_antenna_param, + WMITLV_TAG_STRUC_wmi_pdev_set_ant_ctrl_chain, + WMITLV_TAG_STRUC_wmi_peer_cck_ofdm_rate_info, + WMITLV_TAG_STRUC_wmi_peer_mcs_rate_info, + WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBr, + WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBm, + WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_freqNum, + WMITLV_TAG_STRUC_wmi_mu_report_total_mu, + WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param, } WMITLV_TAG_ID; @@ -859,7 +901,28 @@ typedef enum { OP(WMI_BPF_GET_CAPABILITY_CMDID) \ OP(WMI_BPF_GET_VDEV_STATS_CMDID) \ OP(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID) \ - OP(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID) + OP(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID) \ + OP(WMI_PEER_UPDATE_WDS_ENTRY_CMDID) \ + OP(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID) \ + OP(WMI_PDEV_FIPS_CMDID) \ + OP(WMI_PDEV_SMART_ANT_ENABLE_CMDID) \ + OP(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID) \ + OP(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID) \ + OP(WMI_PDEV_SET_CTL_TABLE_CMDID) \ + OP(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID) \ + OP(WMI_PDEV_GET_TPC_CMDID) \ + OP(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID) \ + OP(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID) \ + OP(WMI_VDEV_RATEMASK_CMDID) \ + OP(WMI_VDEV_ATF_REQUEST_CMDID) \ + OP(WMI_VDEV_SET_DSCP_TID_MAP_CMDID) \ + OP(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID) \ + OP(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID) \ + OP(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID) \ + OP(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID) \ + OP(WMI_PEER_ATF_REQUEST_CMDID) \ + OP(WMI_FWTEST_CMDID) \ + OP(WMI_QBOOST_CFG_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -983,7 +1046,17 @@ typedef enum { OP(WMI_BPF_CAPABILIY_INFO_EVENTID) \ OP(WMI_BPF_VDEV_STATS_INFO_EVENTID) \ OP(WMI_VDEV_DELETE_RESP_EVENTID) \ - OP(WMI_PEER_DELETE_RESP_EVENTID) + OP(WMI_PEER_DELETE_RESP_EVENTID) \ + OP(WMI_PDEV_FIPS_EVENTID) \ + OP(WMI_PDEV_CHANNEL_HOPPING_EVENTID) \ + OP(WMI_PDEV_ANI_CCK_LEVEL_EVENTID) \ + OP(WMI_PDEV_ANI_OFDM_LEVEL_EVENTID) \ + OP(WMI_PDEV_TPC_EVENTID) \ + OP(WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID) \ + OP(WMI_PEER_RATECODE_LIST_EVENTID) \ + OP(WMI_WDS_PEER_EVENTID) \ + OP(WMI_PEER_STA_PS_STATECHG_EVENTID) \ + OP(WMI_INST_RSSI_STATS_EVENTID) /* TLV definitions of WMI commands */ @@ -2271,6 +2344,119 @@ WMITLV_CREATE_PARAM_STRUC(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_bpf_del_vdev_instructions_cmd_fixed_param, wmi_bpf_del_vdev_instructions_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID); +/* Enable/Disable Smart Antenna */ +#define WMITLV_TABLE_WMI_PDEV_SMART_ANT_ENABLE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_smart_ant_enable_cmd_fixed_param, wmi_pdev_smart_ant_enable_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_smart_ant_gpio_handle, gpio_handle, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SMART_ANT_ENABLE_CMDID); + +/* Set Smart Antenna RX antenna */ +#define WMITLV_TABLE_WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param, wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID); + +/* Override the antenna switch table */ +#define WMITLV_TABLE_WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_ant_switch_tbl_cmd_fixed_param, wmi_pdev_set_ant_switch_tbl_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_set_ant_ctrl_chain, ant_ctrl_chain, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID); + +/* Override the CTL table */ +#define WMITLV_TABLE_WMI_PDEV_SET_CTL_TABLE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_ctl_table_cmd_fixed_param, wmi_pdev_set_ctl_table_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, ctl_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_CTL_TABLE_CMDID); + +/* Override the array gain table */ +#define WMITLV_TABLE_WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_mimogain_table_cmd_fixed_param, wmi_pdev_set_mimogain_table_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, arraygain_tbl, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID); + +/* FIPS cmd */ +#define WMITLV_TABLE_WMI_PDEV_FIPS_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_fips_cmd_fixed_param, wmi_pdev_fips_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_FIPS_CMDID); + +/* get CCK ANI level */ +#define WMITLV_TABLE_WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_get_ani_cck_config_cmd_fixed_param, wmi_pdev_get_ani_cck_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID); + +/* get OFDM ANI level */ +#define WMITLV_TABLE_WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_get_ani_ofdm_config_cmd_fixed_param, wmi_pdev_get_ani_ofdm_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID); + +/* TxPPDU TPC cmd */ +#define WMITLV_TABLE_WMI_PDEV_GET_TPC_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_get_tpc_cmd_fixed_param, wmi_pdev_get_tpc_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_CMDID); + +#define WMITLV_TABLE_WMI_VDEV_RATEMASK_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_config_ratemask_fixed_param, wmi_vdev_config_ratemask_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_RATEMASK_CMDID); + +/* ATF VDEV REQUEST commands */ +#define WMITLV_TABLE_WMI_VDEV_ATF_REQUEST_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_atf_request_fixed_param, wmi_vdev_atf_request_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ATF_REQUEST_CMDID); + +/* Command to send the DSCP-to-TID map to the target for VAP */ +#define WMITLV_TABLE_WMI_VDEV_SET_DSCP_TID_MAP_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param, wmi_vdev_set_dscp_tid_map_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_DSCP_TID_MAP_CMDID); + +/* Configure filter for Neighbor Rx Pkt (smart mesh selective listening) */ +#define WMITLV_TABLE_WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_filter_nrp_config_cmd_fixed_param, wmi_vdev_filter_nrp_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID); + +/* update a wds (4 address) entry */ +#define WMITLV_TABLE_WMI_PEER_UPDATE_WDS_ENTRY_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_update_wds_entry_cmd_fixed_param, wmi_peer_update_wds_entry_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_UPDATE_WDS_ENTRY_CMDID); + +/* add a proxy sta entry */ +#define WMITLV_TABLE_WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_create_cmd_fixed_param, wmi_peer_create_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID); + +/* Set Smart Antenna TX antenna */ +#define WMITLV_TABLE_WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len,WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_tx_antenna_cmd_fixed_param, wmi_peer_smart_ant_set_tx_antenna_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_smart_ant_set_tx_antenna_series, antenna_series, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); + +/* Set Smart Antenna TX train info */ +#define WMITLV_TABLE_WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_train_antenna_cmd_fixed_param, wmi_peer_smart_ant_set_train_antenna_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_smart_ant_set_train_antenna_param, antenna_param, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); + +/* Set SA node config options */ +#define WMITLV_TABLE_WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param, wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, args, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); + +/* Q-Boost configuration test commands */ +#define WMITLV_TABLE_WMI_QBOOST_CFG_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_WMI_QBOOST_CFG_CMD_fixed_param, WMI_QBOOST_CFG_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_QBOOST_CFG_CMDID); + +/* set debug and tuning parameters */ +#define WMITLV_TABLE_WMI_FWTEST_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_fwtest_set_param_cmd_fixed_param, wmi_fwtest_set_param_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_FWTEST_CMDID); + +/* ATF PEER REQUEST commands. */ +#define WMITLV_TABLE_WMI_PEER_ATF_REQUEST_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_atf_request_fixed_param, wmi_peer_atf_request_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_atf_peer_info, peer_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_ATF_REQUEST_CMDID) + /* Set rssi monitoring config Cmd */ #define WMITLV_TABLE_WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_rssi_breach_monitor_config_fixed_param, wmi_rssi_breach_monitor_config_fixed_param, fixed_param, WMITLV_SIZE_FIX) @@ -3094,6 +3280,54 @@ WMITLV_CREATE_PARAM_STRUC(WMI_BPF_CAPABILIY_INFO_EVENTID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_bpf_vdev_stats_info_evt_fixed_param, wmi_bpf_vdev_stats_info_evt_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_BPF_VDEV_STATS_INFO_EVENTID); +/* FIPS event */ +#define WMITLV_TABLE_WMI_PDEV_FIPS_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param, wmi_pdev_fips_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, data, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_FIPS_EVENTID); + +#define WMITLV_TABLE_WMI_PDEV_CHANNEL_HOPPING_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_channel_hopping_event_fixed_param, wmi_pdev_channel_hopping_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CHANNEL_HOPPING_EVENTID); + +#define WMITLV_TABLE_WMI_PDEV_ANI_CCK_LEVEL_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ani_cck_event_fixed_param, wmi_ani_cck_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ANI_CCK_LEVEL_EVENTID); + +#define WMITLV_TABLE_WMI_PDEV_ANI_OFDM_LEVEL_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ani_ofdm_event_fixed_param, wmi_ani_ofdm_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_ANI_OFDM_LEVEL_EVENTID); + +#define WMITLV_TABLE_WMI_PDEV_TPC_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_tpc_event_fixed_param, wmi_pdev_tpc_event_fixed_param, fixed_param, WMITLV_SIZE_FIX)\ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, tpc, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_TPC_EVENTID); + +#define WMITLV_TABLE_WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_event_fixed_param, wmi_pdev_nfcal_power_all_channels_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_nfcal_power_all_channels_nfdBr, nfdbr, WMITLV_SIZE_VAR) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_nfcal_power_all_channels_nfdBm, nfdbm, WMITLV_SIZE_VAR) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_nfcal_power_all_channels_freqNum, freqnum, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID); + +#define WMITLV_TABLE_WMI_PEER_RATECODE_LIST_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_ratecode_list_event_fixed_param, wmi_peer_ratecode_list_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_cck_ofdm_rate_info, ratecode_legacy, WMITLV_SIZE_VAR) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_peer_mcs_rate_info, ratecode_mcs, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_RATECODE_LIST_EVENTID); + +#define WMITLV_TABLE_WMI_WDS_PEER_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_wds_addr_event_fixed_param, wmi_wds_addr_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_WDS_PEER_EVENTID); + +#define WMITLV_TABLE_WMI_PEER_STA_PS_STATECHG_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_peer_sta_ps_statechange_event_fixed_param, wmi_peer_sta_ps_statechange_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PEER_STA_PS_STATECHG_EVENTID); + +#define WMITLV_TABLE_WMI_INST_RSSI_STATS_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_inst_rssi_stats_resp_fixed_param, wmi_inst_rssi_stats_resp_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_INST_RSSI_STATS_EVENTID); + #ifdef __cplusplus } #endif diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index ffeb7278b5f6..4a17e0f5d406 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -303,6 +303,26 @@ typedef enum { WMI_PDEV_GET_TEMPERATURE_CMDID, /* Set LED flashing behavior */ WMI_PDEV_SET_LED_FLASHING_CMDID, + /** Enable/Disable Smart Antenna */ + WMI_PDEV_SMART_ANT_ENABLE_CMDID, + /** Set Smart Antenna RX antenna*/ + WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID, + /** Override the antenna switch table */ + WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID, + /** Override the CTL table */ + WMI_PDEV_SET_CTL_TABLE_CMDID, + /** Override the array gain table */ + WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID, + /** FIPS test mode command */ + WMI_PDEV_FIPS_CMDID, + /** get CCK ANI level */ + WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID, + /** get OFDM ANI level */ + WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID, + /** NF Cal Power dBr/dBm */ + WMI_PDEV_GET_NFCAL_POWER_CMDID, + /** TxPPDU TPC */ + WMI_PDEV_GET_TPC_CMDID, /* VDEV(virtual device) specific commands */ /** vdev create */ @@ -342,6 +362,16 @@ typedef enum { */ WMI_VDEV_SET_IE_CMDID, + WMI_VDEV_RATEMASK_CMDID, + /** ATF VDEV REQUEST commands. */ + WMI_VDEV_ATF_REQUEST_CMDID, + /** Command to send the DSCP-to-TID map to the target for VAP */ + WMI_VDEV_SET_DSCP_TID_MAP_CMDID, + /* + * Configure filter for Neighbor Rx Pkt + * (smart mesh selective listening) + */ + WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID, /* peer specific commands */ /** create a peer */ @@ -372,6 +402,19 @@ typedef enum { * The justified rate means the the user-rate is justified by PER. */ WMI_PEER_SET_RATE_REPORT_CONDITION_CMDID, + /** update a wds (4 address) entry */ + WMI_PEER_UPDATE_WDS_ENTRY_CMDID, + /** add a proxy sta entry */ + WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID, + /** Set Smart Antenna TX antenna */ + WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID, + /** Set Smart Antenna TX train info */ + WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID, + /** Set SA node config options */ + WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID, + /** ATF PEER REQUEST commands */ + WMI_PEER_ATF_REQUEST_CMDID, + /* beacon/management specific commands */ /** transmit beacon by reference . used for transmitting beacon on low latency interface like pcie */ @@ -718,6 +761,10 @@ typedef enum { WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID, /* UNIT Tests */ WMI_UNIT_TEST_CMDID, + /* set debug and tuning parameters */ + WMI_FWTEST_CMDID, + /* Q-Boost configuration test commands */ + WMI_QBOOST_CFG_CMDID, /** TDLS Configuration */ /** enable/disable TDLS */ @@ -916,6 +963,23 @@ typedef enum { */ WMI_SERVICE_READY_EXT_EVENTID, + /** FIPS test mode event */ + WMI_PDEV_FIPS_EVENTID, + + /** Channel hopping avoidance */ + WMI_PDEV_CHANNEL_HOPPING_EVENTID, + + /** CCK ANI level event */ + WMI_PDEV_ANI_CCK_LEVEL_EVENTID, + + /** OFDM ANI level event */ + WMI_PDEV_ANI_OFDM_LEVEL_EVENTID, + + /** Tx PPDU params */ + WMI_PDEV_TPC_EVENTID, + + /** NF Cal Power in DBR/DBM for all channels */ + WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID, /* VDEV specific events */ /** VDEV started event in response to VDEV_START request */ WMI_VDEV_START_RESP_EVENTID = @@ -966,6 +1030,11 @@ typedef enum { /* FW response to Host for peer delete cmdid */ WMI_PEER_DELETE_RESP_EVENTID, + /** Valid rate code list for peer */ + WMI_PEER_RATECODE_LIST_EVENTID, + WMI_WDS_PEER_EVENTID, + WMI_PEER_STA_PS_STATECHG_EVENTID, + /* beacon/mgmt specific events */ /** RX management frame. the entire frame is carried along with the event. */ WMI_MGMT_RX_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_MGMT), @@ -1050,6 +1119,9 @@ typedef enum { /** Event indicating the DIAG logs/events supported by FW */ WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID, + /* Instantaneous RSSI event */ + WMI_INST_RSSI_STATS_EVENTID, + /** NLO specific events */ /** NLO match event after the first match */ WMI_NLO_MATCH_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_NLO_OFL), @@ -2820,6 +2892,67 @@ typedef struct { A_UINT32 scan_start; } wmi_pdev_scan_cmd; +/* WMI support for setting ratemask in target */ + +typedef struct { + A_UINT32 tlv_header; + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_vdev_config_ratemask_fixed_param + */ + A_UINT32 vdev_id; + /* + * 0 - cck/ofdm + * 1 - HT + * 2 - VHT */ + A_UINT32 type; + + A_UINT32 mask_lower32; + A_UINT32 mask_higher32; +} wmi_vdev_config_ratemask_cmd_fixed_param; + +/* nrp action - Filter Neighbor Rx Packets - add/remove filter */ +enum { + WMI_FILTER_NRP_ACTION_ADD = 0x1, + WMI_FILTER_NRP_ACTION_REMOVE = 0x2, + WMI_FILTER_NRP_ACTION_GET_LIST = 0x3, +}; /* nrp - Neighbor Rx Packets */ + +/* nrp type - Filter Neighbor Rx Packets - ap/client addr */ +enum { + WMI_FILTER_NRP_TYPE_AP_BSSID = 0x1, + WMI_FILTER_NRP_TYPE_STA_MACADDR = 0x2, +}; + +/* nrp flag - Filter Neighbor Rx Packets + * (capture flag, 2 & 3 not initially supported) + */ +enum { + WMI_FILTER_NRP_CAPTURE_ONLY_RX_PACKETS = 0x1, + WMI_FILTER_NRP_CAPTURE_ONLY_TX_PACKETS = 0x2, + WMI_FILTER_NRP_CAPTURE_BOTH_TXRX_PACKETS = 0x3, +}; + +/* Filter for Neighbor Rx Packets */ +typedef struct { + A_UINT32 tlv_header; + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_vdev_filter_nrp_config_cmd_fixed_param + */ + A_UINT32 vdev_id; + /* AP Bssid or Client Mac-addr */ + wmi_mac_addr addr; + /* Add/Remove NRF Filter */ + A_UINT32 action; /* WMI_FILTER_NRP_ACTION enum */ + /* client/ap filter */ + A_UINT32 type; /* WMI_FILTER_NRP_TYPE enum */ + /* optional - tx/rx capture */ + A_UINT32 flag; /* WMI_FILTER_NRP_CAPTURE enum */ + /* BSSID index - index of the BSSID register */ + A_UINT32 bssid_idx; +} wmi_vdev_filter_nrp_config_cmd_fixed_param; + /*Command to set/unset chip in quiet mode*/ typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_quiet_cmd_fixed_param */ @@ -3463,6 +3596,17 @@ typedef struct { A_UINT32 dscp_to_tid_map[WMI_DSCP_MAP_MAX]; } wmi_pdev_set_dscp_tid_map_cmd_fixed_param; +typedef struct { + A_UINT32 tlv_header; + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param + */ + A_UINT32 vdev_id; + /** map indicating DSCP to TID conversion */ + A_UINT32 dscp_to_tid_map[WMI_DSCP_MAP_MAX]; +} wmi_vdev_set_dscp_tid_map_cmd_fixed_param; + /** Fixed rate (rate-code) for broadcast/ multicast data frames */ /* @brief bcast_mcast_data_rate - set the rates for the bcast/ mcast frames * @details @@ -5857,6 +6001,30 @@ typedef struct { wmi_mac_addr peer_macaddr; } wmi_peer_q_empty_callback_event; +/* + * Command to update an already existing WDS entry. Different address setting + * combinations are possible. + * + * Valid wds and peer -> Associated WDS entry peer ptr & flags will be updated. + * Valid wds and null peer -> Associated WDS entry flags will be updated. + * Null wds and Valid peer-> Flags will be updated for all WDS entries + * behind the peer. + * Null wds and peer -> Flags will be updated for all WDS entries. + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_update_wds_entry_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** peer MAC address */ + wmi_mac_addr peer_macaddr; + /** wds MAC addr */ + wmi_mac_addr wds_macaddr; + /* Flags associated with WDS entry */ + A_UINT32 flags; +} wmi_peer_update_wds_entry_cmd_fixed_param; + /** * Channel info WMI event */ @@ -12668,6 +12836,552 @@ typedef struct wmi_bpf_del_vdev_instructions_cmd_s { A_UINT32 filter_id; /* BPF_FILTER_ID_ALL means delete all */ } wmi_bpf_del_vdev_instructions_cmd_fixed_param; +#define AES_BLOCK_LEN 16 /* in bytes */ +#define FIPS_KEY_LENGTH_128 16 /* in bytes */ +#define FIPS_KEY_LENGTH_256 32 /* in bytes */ +#define FIPS_ENCRYPT_CMD 0 +#define FIPS_DECRYPT_CMD 1 +#define FIPS_ENGINE_AES_CTR 0 +#define FIPS_ENGINE_AES_MIC 1 +#define FIPS_ERROR_OPER_TIMEOUT 1 + +/* WMI_PDEV_FIPS_CMDID */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_fips_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 fips_cmd; /* FIPS_ENCRYPT or FIPS_DECRYPT */ + /* FIPS_ENGINE_AES_CTR or FIPS_ENGINE_AES_MIC */ + A_UINT32 mode; + /* FIPS_KEY_LENGTH_128 or FIPS_KEY_LENGTH_256 (units = bytes) */ + A_UINT32 key_len; + A_UINT8 key[WMI_MAX_KEY_LEN]; /* Key */ + A_UINT32 data_len; /* data length */ + /* + * Following this structure is the TLV: + * A_UINT32 data[1]; - In Data (keep this in the end) + */ +} wmi_pdev_fips_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_smart_ant_enable_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 enable; /* 1:enable, 0:disable */ + /* 1:GPIO parallel mode, 0:GPIO serial mode */ + A_UINT32 mode; + A_UINT32 rx_antenna; /* rx antenna */ + A_UINT32 tx_default_antenna; /* tx default antenna */ + /* + * Following this structure is the TLV: + * wmi_pdev_smart_ant_gpio_handle + */ +} wmi_pdev_smart_ant_enable_cmd_fixed_param; + +/** GPIO pins/function values to control antennas */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_smart_ant_gpio_handle + */ + A_UINT32 tlv_header; + /* For serial: index 0-strobe index 1-data, For Parallel: per stream */ + A_UINT32 gpio_pin; + A_UINT32 gpio_func; /* GPIO function values for Smart Antenna */ +} wmi_pdev_smart_ant_gpio_handle; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; + A_UINT32 rx_antenna; +} wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_tx_antenna_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** unique id identifying the vdev, generated by the caller */ + A_UINT32 vdev_id; + /** peer MAC address */ + wmi_mac_addr peer_macaddr; + /* + * Following this structure is the TLV: + * wmi_peer_smart_ant_set_tx_antenna_series + */ +} wmi_peer_smart_ant_set_tx_antenna_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_tx_antenna_series + */ + A_UINT32 tlv_header; + /* antenna array */ + A_UINT32 antenna_series; +} wmi_peer_smart_ant_set_tx_antenna_series; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_train_antenna_param + */ + A_UINT32 tlv_header; + /* rate array */ + A_UINT32 train_rate_series; + /* antenna array */ + A_UINT32 train_antenna_series; + /* Rate flags */ + /* TODO: For future use? */ + A_UINT32 rc_flags; +} wmi_peer_smart_ant_set_train_antenna_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_train_antenna_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** unique id identifying the VDEV, generated by the caller */ + A_UINT32 vdev_id; + /** peer MAC address */ + wmi_mac_addr peer_macaddr; + /* num packets; 0-stop training */ + A_UINT32 num_pkts; + /* + * Following this structure is the TLV: + * wmi_peer_smart_ant_set_train_antenna_param + */ +} wmi_peer_smart_ant_set_train_antenna_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** unique id identifying the vdev, generated by the caller */ + A_UINT32 vdev_id; + /** peer MAC address */ + wmi_mac_addr peer_macaddr; + /* command id*/ + A_UINT32 cmd_id; + /* number of arguments passed */ + A_UINT32 args_count; + /* + * Following this structure is the TLV: + * A_UINT32 args[]; // argument list + */ +} wmi_peer_smart_ant_set_node_config_ops_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_ant_ctrl_chain + */ + A_UINT32 tlv_header; + A_UINT32 antCtrlChain; +} wmi_pdev_set_ant_ctrl_chain; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_ant_switch_tbl_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 antCtrlCommon1; + A_UINT32 antCtrlCommon2; + /* + * Following this structure is the TLV: + * wmi_pdev_set_ant_ctrl_chain + */ +} wmi_pdev_set_ant_switch_tbl_cmd_fixed_param; + +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_ctl_table_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + /** len of CTL info */ + A_UINT32 ctl_len; + /* ctl array (len adjusted to number of words) + * Following this structure is the TLV: + * A_UINT32 ctl_info[1]; + */ +} wmi_pdev_set_ctl_table_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_mimogain_table_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 mimogain_info; /* see WMI_MIMOGAIN macros */ + /* + * Bit 7:0 len of array gain table + * Bit 8 bypass multi chain gain or not + */ + /* + * array gain table(s) (len adjusted to number of words). + * Following this structure is the TLV: + * A_UINT32 arraygain_tbl[1]; + */ +} wmi_pdev_set_mimogain_table_cmd_fixed_param; + +#define WMI_MIMOGAIN_ARRAY_GAIN_LEN_S 0 +#define WMI_MIMOGAIN_ARRAY_GAIN_LEN (0xff << WMI_MIMOGAIN_ARRAY_GAIN_LEN_S) +#define WMI_MIMOGAIN_ARRAY_GAIN_LEN_GET(x) WMI_F_MS(x, WMI_MIMOGAIN_ARRAY_GAIN_LEN) +#define WMI_MIMOGAIN_ARRAY_GAIN_LEN_SET(x, z) WMI_F_RMW(x, z, WMI_MIMOGAIN_ARRAY_GAIN_LEN) + +#define WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_S 8 +#define WMI_MIMOGAIN_MULTI_CHAIN_BYPASS (0x1 << WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_S) +#define WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_GET(x) WMI_F_MS(x, WMI_MIMOGAIN_MULTI_CHAIN_BYPASS) +#define WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_SET(x, z) WMI_F_RMW(x, z, WMI_MIMOGAIN_MULTI_CHAIN_BYPASS) + + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_fwtest_set_param_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** parameter id */ + A_UINT32 param_id; + /** parameter value */ + A_UINT32 param_value; +} wmi_fwtest_set_param_cmd_fixed_param; + +/* Expressed in 1 part in 1000 (permille) */ +#define WMI_ATF_DENOMINATION 1000 + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_atf_peer_info + */ + A_UINT32 tlv_header; + wmi_mac_addr peer_macaddr; + A_UINT32 atf_units; /* Based on 1 part in 1000 (per mille) */ + A_UINT32 atf_groupid; /* Group Id of the peers for ATF SSID grouping */ + /* Peer congestion threshold for future use */ + A_UINT32 atf_units_reserved; +} wmi_atf_peer_info; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_atf_request_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 num_peers; + /* + * Following this structure is the TLV: + * struct wmi_atf_peer_info peer_info[1]; + */ +} wmi_peer_atf_request_fixed_param; + +/* Equal distribution of ATF air time within an VDEV. */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_vdev_atf_request_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 vdev_id; + A_UINT32 peer_atf_units; /* Per peer ATF units (per mille). */ +} wmi_vdev_atf_request_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_get_ani_cck_config_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + /** parameter */ + A_UINT32 param; +} wmi_pdev_get_ani_cck_config_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_get_ani_ofdm_config_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + /** parameter */ + A_UINT32 param; +} wmi_pdev_get_ani_ofdm_config_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_WMI_QBOOST_CFG_CMD_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 vdev_id; + A_UINT32 qb_enable; + wmi_mac_addr peer_macaddr; +} WMI_QBOOST_CFG_CMD_fixed_param; + +#define WMI_INST_STATS_INVALID_RSSI 0 + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_inst_rssi_stats_resp_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 iRSSI; /* dBm above the noise floor */ + /* peer MAC address */ + wmi_mac_addr peer_macaddr; +} wmi_inst_rssi_stats_resp_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_cck_ofdm_rate_info + */ + A_UINT32 tlv_header; + A_UINT32 ratecode_legacy; /* Rate code for CCK OFDM */ +} wmi_peer_cck_ofdm_rate_info; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_mcs_rate_info + */ + A_UINT32 tlv_header; + A_UINT32 ratecode_20; /* Rate code for 20MHz BW */ + A_UINT32 ratecode_40; /* Rate code for 40MHz BW */ + A_UINT32 ratecode_80; /* Rate code for 80MHz BW */ +} wmi_peer_mcs_rate_info; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_ratecode_list_event_fixed_param + */ + A_UINT32 tlv_header; + wmi_mac_addr peer_macaddr; + A_UINT32 ratecount; /* Max Rate count for each mode */ + /* + * Following this structure are the TLV + * struct wmi_peer_cck_ofdm_rate_info; + * struct wmi_peer_mcs_rate_info; + */ +} wmi_peer_ratecode_list_event_fixed_param; + +typedef struct wmi_wds_addr_event { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_wds_addr_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 event_type[4]; + wmi_mac_addr peer_mac; + wmi_mac_addr dest_mac; +} wmi_wds_addr_event_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_peer_sta_ps_statechange_event_fixed_param + */ + A_UINT32 tlv_header; + wmi_mac_addr peer_macaddr; + A_UINT32 peer_ps_state; +} wmi_peer_sta_ps_statechange_event_fixed_param; + +/* WMI_PDEV_FIPS_EVENTID */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + /* Error status: 0 (no err), 1, or OPER_TIMEOUT */ + A_UINT32 error_status; + A_UINT32 data_len; /* Data length */ + /* + * Following this structure is the TLV: + * A_UINT32 data[1]; // Out Data (keep this in the end) + */ +} wmi_pdev_fips_event_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_channel_hopping_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + /* Noise threshold iterations with high values */ + A_UINT32 noise_floor_report_iter; + /* Total noise threshold iterations */ + A_UINT32 noise_floor_total_iter; +} wmi_pdev_channel_hopping_event_fixed_param; + +enum { + WMI_PDEV_RESERVE_AST_ENTRY_OK, + WMI_PDEV_RESERVE_AST_ENTRY_HASH_COLLISION, + WMI_PDEV_RESERVE_AST_ENTRY_CROSSING_AXI_BOUNDARY, +}; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_get_tpc_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 rate_flags; + /** + * FLAG_ONE_CHAIN 0x001 - one chain mask + * FLAG_TWO_CHAIN 0x005 - two chain mask + * FLAG_THREE_CHAIN 0x007 - three chain mask + * FLAG_FOUR_CHAIN 0x00F - four chain mask + * FLAG_STBC 0x010 - STBC is set + * FLAG_40MHZ 0x020 + * FLAG_80MHZ 0x040 + * FLAG_160MHZ 0x080 + * FLAG_TXBF 0x0100 - Tx Bf enabled + * FLAG_RTSENA 0x0200 - RTS enabled + * FLAG_CTSENA 0x0400 - CTS enabled + * FLAG_LDPC 0x0800 - LDPC set + * FLAG_SERIES1 0x1000 - + * FLAG_SGI 0x2000 - Short gaurd interval + * FLAG_MU2 0x4000 - MU2 data + * FLAG_MU3 0x8000 - MU3 data + * */ + A_UINT32 nss; + /** + * NSS 0x0 - 0x3 + * */ + A_UINT32 preamble; + /** + * PREAM_OFDM - 0x0 + * PREAM_CCK - 0x1 + * PREAM_HT - 0x2 + * PREAM_VHT - 0x3 + * */ + A_UINT32 hw_rate; + /** + * *** HW_OFDM_RATE *** + * OFDM_48_MBPS - 0x0 + * OFDM_24_MBPS - 0x1 + * OFDM_12_MBPS - 0x2 + * OFDM_6_MBPS - 0x3 + * OFDM_54_MBPS - 0x4 + * OFDM_36_MBPS - 0x5 + * OFDM_18_MBPS - 0x6 + * OFDM_9_MBPS - 0x7 + * + * *** HW_CCK_RATE *** + * CCK_11_LONG_MBPS - 0x0 + * CCK_5_5_LONG_MBPS - 0x1 + * CCK_2_LONG_MBPS - 0x2 + * CCK_1_LONG_MBPS - 0x3 + * CCK_11_SHORT_MBPS - 0x4 + * CCK_5_5_SHORT_MBPS - 0x5 + * CCK_2_SHORT_MBPS - 0x6 + * + * *** HW_HT / VHT_RATE *** + * MCS 0x0 - 0x9 + * */ +} wmi_pdev_get_tpc_cmd_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_tpc_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 reserved0; /* for future need */ + /* + * Following this structure is the TLV: + * A_UINT32 tpc[1]; + */ +} wmi_pdev_tpc_event_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 mac_id; /* MAC ID */ + A_UINT32 nfdBr_len; + A_UINT32 nfdBm_len; + A_UINT32 freqNum_len; + /* + * Following this structure is the TLV: + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBr; + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBm; + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_freqNum; + */ +} wmi_pdev_nfcal_power_all_channels_event_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBr + */ + A_UINT32 tlv_header; + A_UINT32 nfdBr; +} wmi_pdev_nfcal_power_all_channels_nfdBr; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_nfdBm + */ + A_UINT32 tlv_header; + A_UINT32 nfdBm; +} wmi_pdev_nfcal_power_all_channels_nfdBm; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_freqNum + */ + A_UINT32 tlv_header; + A_UINT32 freqNum; +} wmi_pdev_nfcal_power_all_channels_freqNum; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ani_cck_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 cck_level; +} wmi_ani_cck_event_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ani_ofdm_event_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 ofdm_level; +} wmi_ani_ofdm_event_fixed_param; + /* ADD NEW DEFS HERE */ /***************************************************************************** diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index e08a9a69c8d3..d2a2f39765e3 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 196 +#define __WMI_REVISION_ 197 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 32cced3b752945f96d3245da005258a829da4483 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 13:33:09 +0530 Subject: qcacld-3.0: CL 1445182 update fw common interface files Fix QTF build errors Merge remaining common commands and events of WIN and MCL Change-Id: If534f7960d39d40fc6cb2ed18c37ecd7e4c6db97 CRs-fixed: 865207 --- target/inc/wmi_services.h | 2 + target/inc/wmi_unified.h | 244 +++++++++++++++++++++++++++++++++++++++++++++- target/inc/wmi_version.h | 2 +- 3 files changed, 246 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index 8b1268c6ac2f..c363de40d3de 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -141,6 +141,8 @@ typedef enum { WMI_SERVICE_RESTRT_CHNL_SUPPORT, /* Restricted Channel Support */ WMI_SERVICE_BPF_OFFLOAD, /* FW supports bpf offload */ WMI_SERVICE_SYNC_DELETE_CMDS, /* FW sends response event for Peer, Vdev delete commands */ + WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT, + WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT, WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 4a17e0f5d406..6f89a043f27b 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -1354,6 +1354,8 @@ typedef enum { #define WMI_CHANNEL_CHANGE_CAUSE_CSA 13 /*Indicate reason for channel switch */ #define WMI_CHAN_FLAG_HALF_RATE 14 /* Indicates half rate channel */ #define WMI_CHAN_FLAG_QUARTER_RATE 15 /* Indicates quarter rate channel */ +/* Enable radar event reporting for sec80 in VHT80p80 */ +#define WMI_CHAN_FLAG_DFS_CFREQ2 16 #define WMI_SET_CHANNEL_FLAG(pwmi_channel, flag) do { \ (pwmi_channel)->info |= (1 << flag); \ @@ -2365,6 +2367,12 @@ typedef struct { * oui specified by WMI_SCAN_PROB_REQ_OUI_CMDID to the probe req frame. * if oui is not set by WMI_SCAN_PROB_REQ_OUI_CMDID then the flag is ignored*/ #define WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ 0x1000 +/** allow mgmt transmission during off channel scan */ +#define WMI_SCAN_OFFCHAN_MGMT_TX 0x2000 +/** allow data transmission during off channel scan */ +#define WMI_SCAN_OFFCHAN_DATA_TX 0x4000 +/** allow capture ppdu with phy errrors */ +#define WMI_SCAN_CAPTURE_PHY_ERROR 0x8000 /** WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */ #define WMI_SCAN_CLASS_MASK 0xFF000000 @@ -2885,6 +2893,7 @@ typedef struct { A_UINT32 reg_domain_5G; A_UINT32 conformance_test_limit_2G; A_UINT32 conformance_test_limit_5G; + A_UINT32 dfs_domain; } wmi_pdev_set_regdomain_cmd_fixed_param; typedef struct { @@ -3082,6 +3091,14 @@ typedef struct { A_UINT32 ies_present_flag; /* WMI_CSA_EVENT_IES_PRESENT_FLAG */ } wmi_csa_event_fixed_param; +typedef enum { + WAL_PEER_MCAST2UCAST_DISABLED = 0, + /* Drop the frames if match is not found */ + WAL_PEER_MCAST2UCAST_DROP_EMPTY = 1, + /* Send as mcast if match is not found */ + WAL_PEER_MCAST2UCAST_MCAST_EMPTY = 2, +} WMI_PEER_MCAST2UCAST_MODE; + typedef enum { /** TX chain mask */ WMI_PDEV_PARAM_TX_CHAIN_MASK = 0x1, @@ -3257,6 +3274,111 @@ typedef enum { * the values. Safety check will happen in Halphy */ WMI_PDEV_PARAM_TXPOWER_DECR_DB, + /** enable and disable aggregate burst along with duration */ + WMI_PDEV_PARAM_AGGR_BURST, + /** Set the global RX decap mode */ + WMI_PDEV_PARAM_RX_DECAP_MODE, + /** Enable/Disable Fast channel reset */ + WMI_PDEV_PARAM_FAST_CHANNEL_RESET, + /** Default antenna for Smart antenna */ + WMI_PDEV_PARAM_SMART_ANTENNA_DEFAULT_ANTENNA, + /** Set the user-specified antenna gain */ + WMI_PDEV_PARAM_ANTENNA_GAIN, + /** Set the user-specified RX filter */ + WMI_PDEV_PARAM_RX_FILTER, + /* + * configure the user-specified MCAST tid for managed mcast feature + * 0-15 is the valid range. 0xff will clear the tid setting + */ + WMI_PDEV_SET_MCAST_TO_UCAST_TID, + /** Enable/Disable Proxy sta mode */ + WMI_PDEV_PARAM_PROXY_STA_MODE, + /* + * configure the mcast2ucast mode for the pdev->peer_mcast. + * See WMI_PEER_MCAST2UCAST_MODE for possible values + */ + WMI_PDEV_PARAM_SET_MCAST2UCAST_MODE, + /** Sets the Mcast buffers for cloning, to support Mcast enhancement */ + WMI_PDEV_PARAM_SET_MCAST2UCAST_BUFFER, + /** Remove the Mcast buffers added by host */ + WMI_PDEV_PARAM_REMOVE_MCAST2UCAST_BUFFER, + /** En/disable station power save state indication */ + WMI_PDEV_PEER_STA_PS_STATECHG_ENABLE, + /** Access category on which ARP frames are sent */ + WMI_PDEV_PARAM_IGMPMLD_AC_OVERRIDE, + /** allow or disallow interbss frame forwarding */ + WMI_PDEV_PARAM_BLOCK_INTERBSS, + /** Enable/Disable reset */ + WMI_PDEV_PARAM_SET_DISABLE_RESET_CMDID, + /** Enable/Disable/Set MSDU_TTL in milliseconds. */ + WMI_PDEV_PARAM_SET_MSDU_TTL_CMDID, + /** Set global PPDU duration limit (usec). */ + WMI_PDEV_PARAM_SET_PPDU_DURATION_CMDID, + /** set txbf sounding period of vap in milliseconds */ + WMI_PDEV_PARAM_TXBF_SOUND_PERIOD_CMDID, + /** Set promiscuous mode */ + WMI_PDEV_PARAM_SET_PROMISC_MODE_CMDID, + /** Set burst mode */ + WMI_PDEV_PARAM_SET_BURST_MODE_CMDID, + /** enable enhanced stats */ + WMI_PDEV_PARAM_EN_STATS, + /** Set mu-grouping policy */ + WMI_PDEV_PARAM_MU_GROUP_POLICY, + /** Channel Hopping Enable */ + WMI_PDEV_PARAM_NOISE_DETECTION, + /** Set Channel Hopping NF threshold in dBm */ + WMI_PDEV_PARAM_NOISE_THRESHOLD, + /** Set PAPRD policy */ + WMI_PDEV_PARAM_DPD_ENABLE, + /** Enable/disable mcast/bcast echo, used by ProxySTA */ + WMI_PDEV_PARAM_SET_MCAST_BCAST_ECHO, + /** ATF enable/disable strict schedule */ + WMI_PDEV_PARAM_ATF_STRICT_SCH, + /** ATF set access category duration, B0-B29 duration, B30-B31: AC */ + WMI_PDEV_PARAM_ATF_SCHED_DURATION, + /** Default antenna polarization */ + WMI_PDEV_PARAM_ANT_PLZN, + /** Set mgmt retry limit */ + WMI_PDEV_PARAM_MGMT_RETRY_LIMIT, + /** Set CCA sensitivity level in dBm */ + WMI_PDEV_PARAM_SENSITIVITY_LEVEL, + /** Set 2G positive and negative Tx power in 0.5dBm units */ + WMI_PDEV_PARAM_SIGNED_TXPOWER_2G, + /** Set 5G positive and negative Tx power in 0.5dBm units */ + WMI_PDEV_PARAM_SIGNED_TXPOWER_5G, + /** Enable/disble AMSDU for tids */ + WMI_PDEV_PARAM_ENABLE_PER_TID_AMSDU, + /** Enable/disable AMPDU for tids */ + WMI_PDEV_PARAM_ENABLE_PER_TID_AMPDU, + /** Set CCA threshold in dBm */ + WMI_PDEV_PARAM_CCA_THRESHOLD, + /** RTS Fixed rate setting */ + WMI_PDEV_PARAM_RTS_FIXED_RATE, + /** Pdev reset */ + WMI_PDEV_PARAM_PDEV_RESET, + /** wapi mbssid offset **/ + WMI_PDEV_PARAM_WAPI_MBSSID_OFFSET, + /** ARP DEBUG source address*/ + WMI_PDEV_PARAM_ARP_DBG_SRCADDR, + /** ARP DEBUG destination address*/ + WMI_PDEV_PARAM_ARP_DBG_DSTADDR, + /** ATF enable/disable obss noise scheduling */ + WMI_PDEV_PARAM_ATF_OBSS_NOISE_SCH, + /** ATF obss noise scaling factor */ + WMI_PDEV_PARAM_ATF_OBSS_NOISE_SCALING_FACTOR, + /** + * TX power reduction scaling exponent - final tx power is the + * nominal tx power (A_MIN(reg_pow,ctl,etc..)) divided by + * 2^(scale exponent). For example: + * If this scale exponent is 0, the power is unchanged (divided by 2^0) + * If this factor is 1, the power is scaled down by 2^1, i.e. 3 dB + * If this factor is 2, the power is scaled down by 2^2, i.e. 6 dB + * If this factor is 3, the power is scaled down by 2^3, i.e. 9 dB + */ + WMI_PDEV_PARAM_CUST_TXPOWER_SCALE, + /** ATF enabe/disabe dynamically */ + WMI_PDEV_PARAM_ATF_DYNAMIC_ENABLE, + } WMI_PDEV_PARAM; typedef enum { @@ -3698,6 +3820,7 @@ typedef enum { WMI_REQUEST_VDEV_STAT = 0x08, WMI_REQUEST_BCNFLT_STAT = 0x10, WMI_REQUEST_VDEV_RATE_STAT = 0x20, + WMI_REQUEST_INST_STAT = 0x40, } wmi_stats_id; typedef struct { @@ -4366,6 +4489,8 @@ typedef struct { #define WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE 0x1 #define WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT 0x2 #define WMI_UNIFIED_VDEV_SUBTYPE_P2P_GO 0x3 +#define WMI_UNIFIED_VDEV_SUBTYPE_PROXY_STA 0x4 +#define WMI_UNIFIED_VDEV_SUBTYPE_MESH 0x5 /** values for vdev_start_request flags */ /** Indicates that AP VDEV uses hidden ssid. only valid for @@ -4817,6 +4942,50 @@ typedef enum { * by the values. Safety check will happen in Halphy. */ WMI_VDEV_PARAM_TXPOWER_SCALE_DECR_DB, + /** Multicast to Unicast conversion setting */ + WMI_VDEV_PARAM_MCAST2UCAST_SET, + + /** Total number of HW retries */ + WMI_VDEV_PARAM_RC_NUM_RETRIES, + + /** Max tx percentage for cabq */ + WMI_VDEV_PARAM_CABQ_MAXDUR, + + /** MFPTEST settings */ + WMI_VDEV_PARAM_MFPTEST_SET, + + /** RTS Fixed rate setting */ + WMI_VDEV_PARAM_RTS_FIXED_RATE, + + /** VHT SGI MASK */ + WMI_VDEV_PARAM_VHT_SGIMASK, + + /** VHT80 Auto Rate MASK */ + WMI_VDEV_PARAM_VHT80_RATEMASK, + + /** set Proxy STA features for this vap */ + WMI_VDEV_PARAM_PROXY_STA, + + /** set virtual cell mode - enable/disable */ + WMI_VDEV_PARAM_VIRTUAL_CELL_MODE, + + /** Set receive packet type */ + WMI_VDEV_PARAM_RX_DECAP_TYPE, + + /** Set ratemask with specific Bandwidth and NSS */ + WMI_VDEV_PARAM_BW_NSS_RATEMASK, + + /** Set SENSOR Support */ + WMI_VDEV_PARAM_SENSOR_AP, + + /** Set beacon rate */ + WMI_VDEV_PARAM_BEACON_RATE, + + /** Enable CTS to self for DTIM beacon */ + WMI_VDEV_PARAM_DTIM_ENABLE_CTS, + + /** Disable station kickout at Vap level */ + WMI_VDEV_PARAM_STA_KICKOUT, } WMI_VDEV_PARAM; @@ -5257,6 +5426,17 @@ enum wmi_ap_ps_peer_param { /** Time in seconds for aging out buffered frames for STA in power save */ WMI_AP_PS_PEER_PARAM_AGEOUT_TIME = 2, + /** Specify frame types that are considered SIFS RESP trigger frame */ + WMI_AP_PS_PEER_PARAM_SIFS_RESP_FRMTYPE = 3, + + /* + * Specifies the trigger state of TID. + * Valid only for UAPSD frame type + */ + WMI_AP_PS_PEER_PARAM_SIFS_RESP_UAPSD = 4, + + /** Specifies the WNM sleep state of a STA */ + WMI_AP_PS_PEER_PARAM_WNM_SLEEP = 5, }; typedef struct { @@ -5840,6 +6020,12 @@ typedef struct { /** peer phy mode */ #define WMI_PEER_PHYMODE 0xD +/** Use FIXED Pwr */ +#define WMI_PEER_USE_FIXED_PWR 0xE +/** Set peer fixed rate */ +#define WMI_PEER_PARAM_FIXED_RATE 0xF +/** Whitelist peer TIDs */ +#define WMI_PEER_SET_MU_WHITELIST 0x10 /** mimo ps values for the parameter WMI_PEER_MIMO_PS_STATE */ #define WMI_PEER_MIMO_PS_NONE 0x0 @@ -5883,6 +6069,7 @@ typedef struct { A_UINT32 rx_mcs_set; /* Negotiated RX VHT rates */ A_UINT32 tx_max_rate; /* Max Tx data rate */ A_UINT32 tx_mcs_set; /* Negotiated TX VHT rates */ + A_UINT32 tx_max_mcs_nss; /* b0-b3: max mcs idx; b4-b7: max nss */ } wmi_vht_rate_set; /* @@ -5975,6 +6162,21 @@ typedef struct { /** total number of negotiated ht rate set. Also the sizeof * peer_ht_rates[] */ A_UINT32 num_peer_ht_rates; + /** + * Bitmap providing QCA proprietary mapping of bandwidths to max Rx NSS + * for this peer. + * This is required since 802.11 standard currently facilitates peer to + * be able to advertise only a single max Rx NSS value across all + * bandwidths. + * Some QCA chipsets might need to be able to advertise a different max + * Rx NSS value for 160 MHz, than that for 80 MHz and lower. + * + * bit[2:0] : Represents value of Rx NSS for VHT 160 MHz + * bit[30:3]: Reserved + * bit[31] : MSB(0/1): 1 in case of valid data else all bits will be + * set to 0 by host + */ + A_UINT32 peer_bw_rxnss_override; /* Following this struc are the TLV's: * A_UINT8 peer_legacy_rates[]; * A_UINT8 peer_ht_rates[]; @@ -5982,12 +6184,17 @@ typedef struct { */ } wmi_peer_assoc_complete_cmd_fixed_param; +/* WDS Entry Flags */ +#define WMI_WDS_FLAG_STATIC 0x1 /* Disable aging & learning */ + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_peer_add_wds_entry_cmd_fixed_param */ /** peer MAC address */ wmi_mac_addr peer_macaddr; /** wds MAC addr */ wmi_mac_addr wds_macaddr; + /* Flags associated with WDS entry - see WMI_WDS_FLAG defs */ + A_UINT32 flags; } wmi_peer_add_wds_entry_cmd_fixed_param; typedef struct { @@ -6042,6 +6249,12 @@ typedef struct { A_UINT32 rx_clear_count; /** cycle count */ A_UINT32 cycle_count; + /** channel tx power per range in 0.5dBm steps */ + A_UINT32 chan_tx_pwr_range; + /** channel tx power per throughput */ + A_UINT32 chan_tx_pwr_tp; + /** rx frame count (cumulative) */ + A_UINT32 rx_frame_count; } wmi_chan_info_event_fixed_param; /** @@ -6148,6 +6361,16 @@ enum wmi_peer_mcast_group_action { #define WMI_PEER_MCAST_GROUP_FLAG_ACTION_S 0 #define WMI_PEER_MCAST_GROUP_FLAG_WILDCARD_M 0x2 #define WMI_PEER_MCAST_GROUP_FLAG_WILDCARD_S 1 +/* flag to exclude an ip while filtering.set to exclude */ +#define WMI_PEER_MCAST_GROUP_FLAG_SRC_FILTER_EXCLUDE_M 0x4 +#define WMI_PEER_MCAST_GROUP_FLAG_SRC_FILTER_EXCLUDE_S 2 +/* flag to say ipv4/ipv6. Will be set for ipv6 */ +#define WMI_PEER_MCAST_GROUP_FLAG_IPV6_M 0x8 +#define WMI_PEER_MCAST_GROUP_FLAG_IPV6_S 3 +/* delete all mcast table entries. */ +#define WMI_PEER_MCAST_GROUP_FLAG_DELETEALL_M 0x10 +#define WMI_PEER_MCAST_GROUP_FLAG_DELETEALL_S 4 + /* multicast group membership commands */ /* TODO: Converting this will be tricky since it uses an union. Also, the mac_addr is not aligned. We will convert to the wmi_mac_addr */ @@ -6156,7 +6379,25 @@ typedef struct { /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_peer_mcast_group_cmd_fixed_param */ A_UINT32 flags; wmi_mac_addr ucast_mac_addr; - A_UINT8 mcast_ip_addr[16]; /* in network byte order */ + /* + * for ipv4, bytes (12-15) should contain ip address and + * other lower bytes 0. ipv6 should have all bytes valid + */ + A_UINT8 mcast_ip_addr[16]; /* in network byte order */ + /* + * for ipv6, all 16 bytes has to be valid; + * for ipv4 last 4 bytes(12-15) has to be valid, rest all 0s + */ + A_UINT8 mcast_ip_mask[16]; /* zero out lower bytes if ipv4 */ + /* number of address filters - irrespective of ipv4/ipv6 addresses */ + A_UINT32 num_filter_addr; + /* + * this array should contain the src IPs that are to be filtered + * during find. The array should be packed. If there are 2 ipv4 + * addresses, there should be 8 bytes and rest all 0s + */ + A_UINT8 filter_addr[64]; /* 16 ipv4 addresses or 4 ipv6 addresses */ + A_UINT8 vdev_id; /* vdev of this mcast group */ } wmi_peer_mcast_group_cmd_fixed_param; /** Offload Scan and Roaming related commands */ @@ -6458,6 +6699,7 @@ typedef struct wmi_bcn_send_from_host { A_UINT32 frag_ptr; /* Physical address of the frame */ A_UINT32 frame_ctrl; /* farme ctrl to setup PPDU desc */ A_UINT32 dtim_flag; /* to control CABQ traffic */ + A_UINT32 bcn_antenna; /* Antenna for beacon transmission */ } wmi_bcn_send_from_host_cmd_fixed_param; /* cmd to support bcn snd for all vaps at once */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index d2a2f39765e3..75791f378b70 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 197 +#define __WMI_REVISION_ 198 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 8618029254d0ef15e48ebbcb40479cfc8aee26a6 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 14:03:37 +0530 Subject: qcacld-3.0: CL 1446198 update fw common interface files Added One tuple control flag bit WMI_FLAGS_IS_IPV6_ANYCAST and added one parameter 'num_ns_ext_tuples_cfg' in wmi_resource_config RTT definitions updated Add wmi interface for MBO(MultiBand Operation) feature. Change-Id: If698fc104e9ac39d6b58c88a542a30c2ba59d52b CRs-fixed: 865207 --- core/wmi/wmi_unified.c | 1 + target/inc/wmi_tlv_defs.h | 15 ++++++++- target/inc/wmi_unified.h | 77 +++++++++++++++++++++++++++++++++++++++++++++-- target/inc/wmi_version.h | 2 +- 4 files changed, 91 insertions(+), 4 deletions(-) diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index cb632fe7fc4a..0081f71cd2f1 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -769,6 +769,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_FWTEST_CMDID); CASE_RETURN_STRING(WMI_QBOOST_CFG_CMDID); CASE_RETURN_STRING(WMI_PDEV_GET_NFCAL_POWER_CMDID); + CASE_RETURN_STRING(WMI_ROAM_SET_MBO_PARAM_CMDID); } return "Invalid WMI cmd"; } diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 24f1cd56671c..34f2219c0866 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -657,6 +657,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_pdev_nfcal_power_all_channels_freqNum, WMITLV_TAG_STRUC_wmi_mu_report_total_mu, WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param, } WMITLV_TAG_ID; @@ -922,7 +923,8 @@ typedef enum { OP(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID) \ OP(WMI_PEER_ATF_REQUEST_CMDID) \ OP(WMI_FWTEST_CMDID) \ - OP(WMI_QBOOST_CFG_CMDID) + OP(WMI_QBOOST_CFG_CMDID) \ + OP(WMI_ROAM_SET_MBO_PARAM_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -1211,6 +1213,17 @@ WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_CHAN_LIST); WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SCAN_CMD); +/* Roam mbo configuration */ +#define WMITLV_TABLE_WMI_ROAM_SET_MBO_PARAM_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param, wmi_roam_set_mbo_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, cellular_cap, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_supported_operating_class_param, supp_op_class_param, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, supp_op_class_list, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_mbo_non_preferred_channel_report_param, non_prefer_ch_param, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, non_prefer_ch_attr, WMITLV_SIZE_VAR) + +WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SET_MBO_PARAM_CMDID); + #define WMITLV_TABLE_WMI_VDEV_PLMREQ_START_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_plmreq_start_cmd_fixed_param, wmi_vdev_plmreq_start_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_list, WMITLV_SIZE_VAR) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 6f89a043f27b..390b6265f37d 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -357,8 +357,8 @@ typedef enum { /* TSF timestamp action for specified vdev */ WMI_VDEV_TSF_TSTAMP_ACTION_CMDID, /* - * set the capabilties IE, e.g. for extended caps in probe - * requests, assoc req etc for frames FW locally generates + * set the additional IEs in probe requests for scan or + * assoc req etc for frames FW locally generates */ WMI_VDEV_SET_IE_CMDID, @@ -498,6 +498,8 @@ typedef enum { WMI_ROAM_SUBNET_CHANGE_CONFIG_CMDID, /** configure thresholds for MAWC */ WMI_ROAM_CONFIGURE_MAWC_CMDID, + /** configure MultiBand Operation(refer WFA MBO spec) parameter */ + WMI_ROAM_SET_MBO_PARAM_CMDID, /** offload scan specific commands */ /** set offload scan AP profile */ @@ -2134,6 +2136,12 @@ typedef struct { * 0 - Don't allocate fragment descriptor for data packet. */ A_UINT32 alloc_frag_desc_for_data_pkt; + + /* + * how much space to allocate for NDP NS (neighbor solicitation) + * specs + */ + A_UINT32 num_ns_ext_tuples_cfg; } wmi_resource_config; #define WMI_RSRC_CFG_FLAG_SET(word32, flag, value) \ @@ -7931,6 +7939,8 @@ typedef struct { #define WMI_NSOFF_FLAGS_VALID (1 << 0) /* the tuple entry is valid */ #define WMI_NSOFF_FLAGS_MAC_VALID (1 << 1) /* the target mac address is valid */ #define WMI_NSOFF_FLAGS_REMOTE_IP_VALID (1 << 2) /* remote IP field is valid */ +/* whether the configured IPv6 address is anycast */ +#define WMI_NSOFF_FLAGS_IS_IPV6_ANYCAST (1 << 3) #define WMI_NSOFF_MAX_TARGET_IPS 2 @@ -12664,6 +12674,69 @@ typedef struct { A_UINT32 sensor_status; } wmi_mawc_sensor_report_ind_cmd_fixed_param; +/* MBO flag field definition */ +/* + * Bit 0: 0 - Allow to connect to both MBO and non-MBO AP + * 1 - Allow to connect to MBO AP only + * Bit 1-31 : reserved. + */ +#define WMI_ROAM_MBO_FLAG_MBO_ONLY_MODE (1<<0) + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param + */ + A_UINT32 tlv_header; + /** vdev id */ + A_UINT32 vdev_id; + /** enable or disable MBO */ + A_UINT32 enable; + /** MBO flags, refer to definition of MBO flags*/ + A_UINT32 flags; +} wmi_roam_set_mbo_fixed_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_ARRAY_STRUC + */ + A_UINT32 tlv_header; + /** Current operating class number */ + A_UINT32 cur_op_class; + /* + * Country string of current reg domain, + * the expected value should be same as country str defined + * in country IE. + * 3 octets (COUNTRY_STR) + 1 octet (always 0) + * The ordering of this array must be maintained, + * even when a big-endian host's WMI messages undergo + * automatic byte reordering for conversion to the + * little-endian ordering required by the target. + * On big-endian hosts, this array may need to be byte-swapped + * by the host, so the subsequent automatic byte-swap + * will result in the correct final byte order. + * global operating class: set country_str[0]=0 + */ + A_UINT8 country_str[4]; + /** Supported operating class number in current regdomain */ + A_UINT32 supp_op_class_num; + /* The TLVs will follow. */ + /* A_UINT32 supp_op_class_list[] */ +} wmi_supported_operating_class_param; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_ARRAY_STRUC + */ + A_UINT32 tlv_header; + /** non preferred channel attribute length */ + A_UINT32 non_prefer_ch_attr_len; + /* The TLVs will follow. */ + /** A_UINT8 non_prefer_ch_attr[];*/ +} wmi_mbo_non_preferred_channel_report_param; + typedef struct { /* TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_mawc_enable_sensor_event_fixed_param */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 75791f378b70..92962ba318d0 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 198 +#define __WMI_REVISION_ 200 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 45ef44a92610d851f3dab692a210b219c0f054f4 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 17:45:22 +0530 Subject: qcacld-3.0: CL 1448844 update fw common interface files WMI handle changes to incorporate ini changes to enable/disable collection of MIB stats WMI interface change for scan suspend Change-Id: Icdcca16827af85e6b694dcd7ad0be2b4d0d8ac45 CRs-fixed: 865207 --- core/wmi/wmi_unified.c | 1 + target/inc/wmi_tlv_defs.h | 11 +++++-- target/inc/wmi_unified.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 4 files changed, 94 insertions(+), 3 deletions(-) diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 0081f71cd2f1..4f102c4de48b 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -756,6 +756,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_PDEV_SET_CTL_TABLE_CMDID); CASE_RETURN_STRING(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID); CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CMDID); + CASE_RETURN_STRING(WMI_MIB_STATS_ENABLE_CMDID); CASE_RETURN_STRING(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID); CASE_RETURN_STRING(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID); CASE_RETURN_STRING(WMI_VDEV_RATEMASK_CMDID); diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 34f2219c0866..c4ecf9213d47 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -658,6 +658,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_mu_report_total_mu, WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param, + WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param, } WMITLV_TAG_ID; @@ -924,8 +925,8 @@ typedef enum { OP(WMI_PEER_ATF_REQUEST_CMDID) \ OP(WMI_FWTEST_CMDID) \ OP(WMI_QBOOST_CFG_CMDID) \ - OP(WMI_ROAM_SET_MBO_PARAM_CMDID) - + OP(WMI_ROAM_SET_MBO_PARAM_CMDID) \ + OP(WMI_MIB_STATS_ENABLE_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. * Otherwise, these WMI TLV Functions will be process them. @@ -1798,6 +1799,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_GET_TPC_CONFIG_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_BASE_MACADDR_CMDID); +/* MIB Stats*/ +#define WMITLV_TABLE_WMI_MIB_STATS_ENABLE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param, wmi_mib_stats_enable_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) + +WMITLV_CREATE_PARAM_STRUC(WMI_MIB_STATS_ENABLE_CMDID); + /* Peer multicast group Cmd */ #define WMITLV_TABLE_WMI_PEER_MCAST_GROUP_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_peer_mcast_group_cmd_fixed_param, wmi_peer_mcast_group_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 390b6265f37d..abf417ebaa1c 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -323,6 +323,8 @@ typedef enum { WMI_PDEV_GET_NFCAL_POWER_CMDID, /** TxPPDU TPC */ WMI_PDEV_GET_TPC_CMDID, + /* Set to enable MIB stats collection */ + WMI_MIB_STATS_ENABLE_CMDID, /* VDEV(virtual device) specific commands */ /** vdev create */ @@ -2508,6 +2510,8 @@ enum wmi_scan_event_type { WMI_SCAN_EVENT_START_FAILED = 0x40, /* scan start failed */ WMI_SCAN_EVENT_RESTARTED = 0x80, /* scan restarted */ WMI_SCAN_EVENT_FOREIGN_CHANNEL_EXIT = 0x100, + WMI_SCAN_EVENT_SUSPENDED = 0x200, /* scan request is suspended */ + WMI_SCAN_EVENT_RESUMED = 0x400, /* scan request is resumed */ WMI_SCAN_EVENT_MAX = 0x8000 }; @@ -2519,6 +2523,7 @@ enum wmi_scan_completion_reason { WMI_SCAN_REASON_PREEMPTED = 2, WMI_SCAN_REASON_TIMEDOUT = 3, WMI_SCAN_REASON_INTERNAL_FAILURE = 4, /* This reason indication failures when performaing scan */ + WMI_SCAN_REASON_SUSPENDED = 5, WMI_SCAN_REASON_MAX, }; @@ -3674,6 +3679,23 @@ typedef struct { A_UINT32 reserved0; } wmi_pdev_pktlog_disable_cmd_fixed_param; +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** placeholder for pdev_id of multiple MAC products. Init. to 0. */ + A_UINT32 reserved0; + /* + * enable for mib stats collection. + * Stats are delivered to host in wmi_mib_stats structure. + * If enable_Mib=1, stats collection is enabled. + * If enable_Mib=0, stats collection does not happen + */ + A_UINT32 enable_Mib; +} wmi_mib_stats_enable_cmd_fixed_param; + /** Customize the DSCP (bit) to TID (0-7) mapping for QOS. * NOTE: This constant cannot be changed without breaking * WMI Compatibility. */ @@ -3829,6 +3851,7 @@ typedef enum { WMI_REQUEST_BCNFLT_STAT = 0x10, WMI_REQUEST_VDEV_RATE_STAT = 0x20, WMI_REQUEST_INST_STAT = 0x40, + WMI_REQUEST_MIB_STAT = 0x80, } wmi_stats_id; typedef struct { @@ -4332,6 +4355,8 @@ typedef struct { A_UINT32 num_bcnflt_stats; /** number of chan stats event structures (wmi_chan_stats) 0 to MAX MCC CHANS */ A_UINT32 num_chan_stats; + /** number of MIB stats event structures (wmi_mib_stats) */ + A_UINT32 num_mib_stats; /* This TLV is followed by another TLV of array of bytes * A_UINT8 data[]; * This data array contains @@ -4340,6 +4365,7 @@ typedef struct { * num_peer_stats * size of(struct wmi_peer_stats) * num_bcnflt_stats * size_of() * num_chan_stats * size of(struct wmi_chan_stats) + * num_mib_stats * size of(struct wmi_mib_stats) * */ } wmi_stats_event_fixed_param; @@ -4429,6 +4455,63 @@ typedef struct { A_UINT32 rx_duration_us; } wmi_chan_stats; +typedef struct { + A_UINT32 tx_mpdu_grp_frag_cnt; /*dot11TransmittedFragmentCount */ + A_UINT32 tx_msdu_grp_frm_cnt; /*dot11GroupTransmittedFrameCount */ + A_UINT32 tx_msdu_fail_cnt; /*dot11FailedCount*/ + A_UINT32 rx_mpdu_frag_cnt; /*dot11ReceivedFragmentCount*/ + A_UINT32 rx_msdu_grp_frm_cnt; /*dot11GroupReceivedFrameCount*/ + A_UINT32 rx_mpdu_fcs_err; /*dot11FCSErrorCount*/ + A_UINT32 tx_msdu_frm_cnt; /*dot11TransmittedFrameCount*/ + A_UINT32 tx_msdu_retry_cnt; /*dot11RetryCount*/ + A_UINT32 rx_frm_dup_cnt; /*dot11FrameDuplicateCount */ + A_UINT32 tx_rts_success_cnt; /*dot11RTSSuccessCount*/ + A_UINT32 tx_rts_fail_cnt; /*dot11RTSFailureCount*/ + /*dot11QosTransmittedFragmentCount */ + A_UINT32 tx_Qos_mpdu_grp_frag_cnt; + A_UINT32 tx_Qos_msdu_fail_UP; /*dot11QosFailedCount */ + A_UINT32 tx_Qos_msdu_retry_UP; /*dot11QosRetryCount */ + A_UINT32 rx_Qos_frm_dup_cnt_UP; /*dot11QosFrameDuplicateCount*/ + A_UINT32 tx_Qos_rts_success_cnt_UP; /*dot11QosRTSSuccessCount*/ + A_UINT32 tx_Qos_rts_fail_cnt_UP; /*dot11QosRTSFailureCount*/ + A_UINT32 rx_Qos_mpdu_frag_cnt_UP; /*dot11QosReceivedFragmentCount*/ + A_UINT32 tx_Qos_msdu_frm_cnt_UP; /*dot11QosTransmittedFrameCount*/ + A_UINT32 rx_Qos_msdu_discard_cnt_UP; /*dot11QosDiscardedFrameCount*/ + A_UINT32 rx_Qos_mpdu_cnt; /*dot11QosMPDUsReceivedCount*/ + A_UINT32 rx_Qos_mpdu_retryBit_cnt; /*dot11QosRetriesReceivedCount*/ + /*dot11RSNAStatsRobustMgmtCCMPReplays */ + A_UINT32 rsna_Mgmt_discard_CCMP_replay_err_cnt; + A_UINT32 rsna_TKIP_icv_err_cnt; /*dot11RSNAStatsTKIPICVErrors*/ + A_UINT32 rsna_TKIP_replay_err_cnt; /*dot11RSNAStatsTKIPReplays*/ + /*dot11RSNAStatsCCMPDecryptErrors */ + A_UINT32 rsna_CCMP_decrypt_err_cnt; + A_UINT32 rsna_CCMP_replay_err_cnt; /*dot11RSNAStatsCCMPReplays*/ + A_UINT32 tx_ampdu_cnt; /*dot11TransmittedAMPDUCount*/ + /*dot11TransmittedMPDUsInAMPDUCount*/ + A_UINT32 tx_mpdu_cnt_in_ampdu; + /*dot11TransmittedOctetsInAMPDUCount*/ + union { + A_UINT64 counter; /* for use by target only */ + struct { + A_UINT32 low; + A_UINT32 high; + } upload; /* for use by host */ + } tx_octets_in_ampdu; + A_UINT32 rx_ampdu_cnt; /*dot11AMPDUReceivedCount*/ + A_UINT32 rx_mpdu_cnt_in_ampdu; /*dot11MPDUInReceivedAMPDUCount*/ + union { + A_UINT64 counter; /* for use by target only */ + struct { + A_UINT32 rx_octets_in_ampdu_low; + A_UINT32 rx_octets_in_ampdu_high; + } upload; /* for use by host */ + } rx_octets_in_ampdu; /*dot11ReceivedOctetsInAMPDUCount*/ + A_UINT32 reserved_1; + A_UINT32 reserved_2; + A_UINT32 reserved_3; + A_UINT32 reserved_4; +} wmi_mib_stats; + typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 92962ba318d0..17e0d10c0a27 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 200 +#define __WMI_REVISION_ 202 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From d0c80a3e18e7eda44ba2c759398d1e7d2b54c2de Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 17:57:48 +0530 Subject: qcacld-3.0: CL 1449912 update fw common interface files Add wmi interface for MBO(MultiBand Operation) feature Change-Id: I81370b40c0d8232b57699cc6cfb0ef5113e33058 CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 14 +++++++++++++- target/inc/wmi_version.h | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index abf417ebaa1c..5b7ac98b1353 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -6956,6 +6956,16 @@ typedef struct { WMI_ROAM_AP_PROFILE, found during scan triggered upon FINAL_BMISS **/ #define WMI_ROAM_REASON_HO_FAILED 0x5 /** LFR3.0 roaming failed, indicate the disconnection to host */ + +/* + * WMI_ROAM_REASON_INVOKE_ROAM_FAIL: + * Result code of WMI_ROAM_INVOKE_CMDID. + * Any roaming failure before reassociation will be indicated to host + * with this reason. + * Any roaming failure after reassociation will be indicated to host with + * WMI_ROAM_REASON_HO_FAILED no matter WMI_ROAM_INVOKE_CMDID is called or not. + */ +#define WMI_ROAM_REASON_INVOKE_ROAM_FAIL 0x6 /* reserved up through 0xF */ /* subnet status: bits 4-5 */ @@ -7019,7 +7029,9 @@ typedef struct { /* flags for roam_invoke_cmd */ /* add this channel into roam cache channel list after this command is finished */ #define WMI_ROAM_INVOKE_FLAG_ADD_CH_TO_CACHE 0 -/* from bit 1 to bit 31 are reserved */ +/* indicate to host of failure if WMI_ROAM_INVOKE_CMDID. */ +#define WMI_ROAM_INVOKE_FLAG_REPORT_FAILURE 1 +/* from bit 2 to bit 31 are reserved */ #define WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE(flag) do { \ (flag) |= (1 << WMI_SET_ROAM_INVOKE_ADD_CH_TO_CACHE); \ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 17e0d10c0a27..5c6a7c5b03f4 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 202 +#define __WMI_REVISION_ 203 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 67b83b8266be5a5a982813b181e8ec9d2da4714a Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 1 Feb 2016 19:26:59 +0530 Subject: qcacld-3.0: CL 1450690 update fw common interface files WMI per-peer max/min tx rate spec Change-Id: I7af4dc75058062f9b4b088133a0696b8fc6da04d CRs-Fixed: 865207 --- target/inc/wmi_services.h | 4 ++- target/inc/wmi_unified.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index c363de40d3de..6874f8945019 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -143,6 +143,8 @@ typedef enum { WMI_SERVICE_SYNC_DELETE_CMDS, /* FW sends response event for Peer, Vdev delete commands */ WMI_SERVICE_SMART_ANTENNA_SW_SUPPORT, WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT, + /* allow per-peer tx MCS min/max limits by host */ + WMI_SERVICE_RATECTRL_LIMIT_MAX_MIN_RATES, WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 5b7ac98b1353..943e15fd5b2b 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -6117,6 +6117,10 @@ typedef struct { #define WMI_PEER_PARAM_FIXED_RATE 0xF /** Whitelist peer TIDs */ #define WMI_PEER_SET_MU_WHITELIST 0x10 +/** Set peer max tx rate (MCS) in adaptive rate ctrl */ +#define WMI_PEER_SET_MAX_TX_RATE 0x11 +/** Set peer minimal tx rate (MCS) in adaptive rate ctrl */ +#define WMI_PEER_SET_MIN_TX_RATE 0x12 /** mimo ps values for the parameter WMI_PEER_MIMO_PS_STATE */ #define WMI_PEER_MIMO_PS_NONE 0x0 @@ -6136,6 +6140,69 @@ typedef struct { A_UINT32 param_value; } wmi_peer_set_param_cmd_fixed_param; +typedef union { + /* + * The A_UINT16 "mode" and "tx_rate" fields can only be directly used + * by the target or a little-endian host. + * A big-endian host needs to use the WMI_PEER_MAX_MIN_TX_xxx_GET/SET + * macros on the A_UINT32 "value" field. + */ + struct { + /* 0:CCK, 1:OFDM, 2:HT, 3:VHT (see WMI_RATE_PREAMBLE) */ + A_UINT16 mode; + A_UINT16 tx_rate; /* see per-mode specs below */ + }; + A_UINT32 value; /* for use by big-endian host */ +} wmi_peer_max_min_tx_rate; + +/* + * Any access to the mode/tx_rate in an big endian system should use + * the below Macros on the wmi_peer_max_min_tx_rate.value field. + */ +#define WMI_PEER_MAX_MIN_TX_MODE_GET(value32) WMI_GET_BITS(value32, 0, 16) +#define WMI_PEER_MAX_MIN_TX_MODE_SET(value32, tx_mode) WMI_SET_BITS(value32, 0, 16, tx_mode) + +#define WMI_PEER_MAX_MIN_TX_RATE_GET(value32) WMI_GET_BITS(value32, 16, 16) +#define WMI_PEER_MAX_MIN_TX_RATE_SET(value32, tx_mode) WMI_SET_BITS(value32, 16, 16, tx_mode) + +/* + * CCK max/min tx Rate description + * tx_rate = 0: 1Mbps, + * tx_rate = 1: 2Mbps + * tx_rate = 2: 5.5Mbps + * tx_rate = 3: 11Mbps + * tx_rate = else : invalid. + */ +#define WMI_MAX_CCK_TX_RATE 0x03 + +/* + * OFDM max/min tx Rate description + * tx_rate = 0: 6Mbps, + * tx_rate = 1: 9Mbps + * tx_rate = 2: 12Mbps + * tx_rate = 3: 18Mbps + * tx_rate = 4: 24Mbps + * tx_rate = 5: 32Mbps + * tx_rate = 6: 48Mbps + * tx_rate = 7: 54Mbps + * tx_rate = else : invalid. + */ +#define WMI_MAX_OFDM_TX_RATE 0x07 + +/* + * HT max/min tx rate description + * tx_rate = 0~7 : MCS Rate 0~7 + * tx_rate=else : invalid. + */ +#define WMI_MAX_HT_TX_MCS 0x07 + +/* + * VHT max/min tx rate description + * tx_rate = 0~9 : MCS Rate 0~9 + * tx_rate=else : invalid. + */ +#define WMI_MAX_VHT_TX_MCS 0x09 + #define MAX_SUPPORTED_RATES 128 typedef struct { diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 5c6a7c5b03f4..c766a6600206 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 203 +#define __WMI_REVISION_ 204 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From b5158e269287bc3c6b50cca337f1f45c4baad941 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 4 Feb 2016 15:38:30 +0530 Subject: qcacld-3.0: CL 1452008 update fw common interface files add a flag bit in WMI_WOW_ENABLE_CMD param to control sending PM_PME after WOW Change-Id: Ifd61ecdc51a51683369e8672a7cd61a6ebb5ec42 CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 7 +++++++ target/inc/wmi_version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 943e15fd5b2b..23166041056e 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -7606,6 +7606,13 @@ typedef enum { enum { /* some win10 platfrom will not assert pcie_reset for wow.*/ WMI_WOW_FLAG_IGNORE_PCIE_RESET = 0x00000001, + /* + * WMI_WOW_FLAG_SEND_PM_PME + * Some platforms have issues if the PM_PME message is sent after WoW, + * so don't send PM_PME after WoW unless the host uses this flag + * to request it. + */ + WMI_WOW_FLAG_SEND_PM_PME = 0x00000002, }; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index c766a6600206..d8768f399ba2 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 204 +#define __WMI_REVISION_ 205 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 941bd5e5be328689a519320d7e7ae15fdb63c66c Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 4 Feb 2016 17:15:25 +0530 Subject: qcacld-3.0: CL 1453185 update fw common interface files NAN data WMI changes. Change-Id: I9292af24d92c9e522b7889a02194e54b2f113917 CRs-Fixed: 865207 --- core/wmi/wmi_unified.c | 4 + target/inc/wmi_services.h | 2 + target/inc/wmi_tlv_defs.h | 167 +++++++++++++- target/inc/wmi_unified.h | 549 +++++++++++++++++++++++++++++++++++++++++++++- target/inc/wmi_version.h | 2 +- 5 files changed, 715 insertions(+), 9 deletions(-) diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index 4f102c4de48b..da4b6d1d1e3c 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -747,6 +747,10 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_BPF_GET_VDEV_STATS_CMDID); CASE_RETURN_STRING(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); CASE_RETURN_STRING(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID); + CASE_RETURN_STRING(WMI_NDI_GET_CAP_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_INITIATOR_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_RESPONDER_REQ_CMDID); + CASE_RETURN_STRING(WMI_NDP_END_REQ_CMDID); CASE_RETURN_STRING(WMI_PEER_UPDATE_WDS_ENTRY_CMDID); CASE_RETURN_STRING(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID); CASE_RETURN_STRING(WMI_PDEV_FIPS_CMDID); diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index 6874f8945019..9e76ddb2099c 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -145,6 +145,8 @@ typedef enum { WMI_SERVICE_SMART_ANTENNA_HW_SUPPORT, /* allow per-peer tx MCS min/max limits by host */ WMI_SERVICE_RATECTRL_LIMIT_MAX_MIN_RATES, + WMI_SERVICE_NAN_DATA, /* FW supports NAN data */ + WMI_SERVICE_NAN_RTT, /* FW supports NAN RTT */ WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index c4ecf9213d47..b8a3f3d67d60 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -659,7 +659,21 @@ typedef enum { WMITLV_TAG_STRUC_wmi_vdev_set_dscp_tid_map_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_roam_set_mbo_fixed_param, WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param, - + WMITLV_TAG_STRUC_wmi_nan_disc_iface_created_event_fixed_param, + WMITLV_TAG_STRUC_wmi_nan_disc_iface_deleted_event_fixed_param, + WMITLV_TAG_STRUC_wmi_nan_started_cluster_event_fixed_param, + WMITLV_TAG_STRUC_wmi_nan_joined_cluster_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndi_get_cap_req_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_initiator_req_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_responder_req_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_end_req_fixed_param, + WMITLV_TAG_STRUC_wmi_ndi_cap_rsp_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_initiator_rsp_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_responder_rsp_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_end_rsp_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_indication_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_confirm_event_fixed_param, + WMITLV_TAG_STRUC_wmi_ndp_end_indication_event_fixed_param, } WMITLV_TAG_ID; /* @@ -926,7 +940,12 @@ typedef enum { OP(WMI_FWTEST_CMDID) \ OP(WMI_QBOOST_CFG_CMDID) \ OP(WMI_ROAM_SET_MBO_PARAM_CMDID) \ - OP(WMI_MIB_STATS_ENABLE_CMDID) + OP(WMI_MIB_STATS_ENABLE_CMDID) \ + OP(WMI_NDI_GET_CAP_REQ_CMDID) \ + OP(WMI_NDP_INITIATOR_REQ_CMDID) \ + OP(WMI_NDP_RESPONDER_REQ_CMDID) \ + OP(WMI_NDP_END_REQ_CMDID) + /* * IMPORTANT: Please add _ALL_ WMI Events Here. * Otherwise, these WMI TLV Functions will be process them. @@ -1059,8 +1078,18 @@ typedef enum { OP(WMI_PEER_RATECODE_LIST_EVENTID) \ OP(WMI_WDS_PEER_EVENTID) \ OP(WMI_PEER_STA_PS_STATECHG_EVENTID) \ - OP(WMI_INST_RSSI_STATS_EVENTID) - + OP(WMI_INST_RSSI_STATS_EVENTID) \ + OP(WMI_NAN_DISC_IFACE_CREATED_EVENTID) \ + OP(WMI_NAN_DISC_IFACE_DELETED_EVENTID) \ + OP(WMI_NAN_STARTED_CLUSTER_EVENTID) \ + OP(WMI_NAN_JOINED_CLUSTER_EVENTID) \ + OP(WMI_NDI_CAP_RSP_EVENTID) \ + OP(WMI_NDP_INITIATOR_RSP_EVENTID) \ + OP(WMI_NDP_RESPONDER_RSP_EVENTID) \ + OP(WMI_NDP_END_RSP_EVENTID) \ + OP(WMI_NDP_INDICATION_EVENTID) \ + OP(WMI_NDP_CONFIRM_EVENTID) \ + OP(WMI_NDP_END_INDICATION_EVENTID) /* TLV definitions of WMI commands */ @@ -2250,6 +2279,50 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NAN_CMDID); +/* NAN Data Get Capabilities Cmd */ +#define WMITLV_TABLE_WMI_NDI_GET_CAP_REQ_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndi_get_cap_req_fixed_param, wmi_ndi_get_cap_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NDI_GET_CAP_REQ_CMDID); + +/* + * NAN Data Initiator Request Cmd + * + * TLV (tag length value ) parameters follow the ndp_initiator_req + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +#define WMITLV_TABLE_WMI_NDP_INITIATOR_REQ_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_initiator_req_fixed_param, wmi_ndp_initiator_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_REQ_CMDID); + +/* + * NAN Data Responder Request Cmd + * TLV (tag length value ) parameters follow the ndp_responder_req + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +#define WMITLV_TABLE_WMI_NDP_RESPONDER_REQ_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_responder_rsp_event_fixed_param, wmi_ndp_responder_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_RESPONDER_REQ_CMDID); + +/* + * NAN Data End Request Cmd + * + * TLV (tag length value ) parameters follow the ndp_end_req + * structure. The TLV's are: + * wmi_ndp_end_req wmi_ndp_end_req_list[]; + */ +#define WMITLV_TABLE_WMI_NDP_END_REQ_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_end_req_fixed_param, wmi_ndp_end_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_FIXED_STRUC, wmi_ndp_end_req, ndp_end_req_list, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_END_REQ_CMDID); + /* Modem power state cmd */ #define WMITLV_TABLE_WMI_MODEM_POWER_STATE_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_modem_power_state_cmd_param, wmi_modem_power_state_cmd_param, fixed_param, WMITLV_SIZE_FIX) @@ -3136,6 +3209,92 @@ WMITLV_CREATE_PARAM_STRUC(WMI_THERMAL_MGMT_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_NAN_EVENTID); +/* NAN discovery interface created event */ +#define WMITLV_TABLE_WMI_NAN_DISC_IFACE_CREATED_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_nan_disc_iface_created_event_fixed_param, wmi_nan_disc_iface_created_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NAN_DISC_IFACE_CREATED_EVENTID); + +/* NAN discovery interface deleted event */ +#define WMITLV_TABLE_WMI_NAN_DISC_IFACE_DELETED_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_nan_disc_iface_deleted_event_fixed_param, wmi_nan_disc_iface_deleted_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NAN_DISC_IFACE_DELETED_EVENTID); + +/* NAN device started new cluster event */ +#define WMITLV_TABLE_WMI_NAN_STARTED_CLUSTER_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_nan_started_cluster_event_fixed_param, wmi_nan_started_cluster_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NAN_STARTED_CLUSTER_EVENTID); + +/* NAN device joined to cluster event */ +#define WMITLV_TABLE_WMI_NAN_JOINED_CLUSTER_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_nan_joined_cluster_event_fixed_param, wmi_nan_joined_cluster_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NAN_JOINED_CLUSTER_EVENTID); + +/* NDP capabilities response event */ +#define WMITLV_TABLE_WMI_NDI_CAP_RSP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndi_cap_rsp_event_fixed_param, wmi_ndi_cap_rsp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NDI_CAP_RSP_EVENTID); + +/* NDP initiator response event */ +#define WMITLV_TABLE_WMI_NDP_INITIATOR_RSP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_initiator_rsp_event_fixed_param, wmi_ndp_initiator_rsp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INITIATOR_RSP_EVENTID); + +/* NDP responder response event */ +#define WMITLV_TABLE_WMI_NDP_RESPONDER_RSP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_responder_rsp_event_fixed_param, wmi_ndp_responder_rsp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_RESPONDER_RSP_EVENTID); + +/** + * NDP end response event + * + * TLV (tag length value ) parameters follow the ndp_end_rsp + * structure. The TLV's are: + * wmi_ndp_end_rsp_per_ndi ndp_end_rsp_per_ndi_list[]; + */ +#define WMITLV_TABLE_WMI_NDP_END_RSP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_end_rsp_event_fixed_param, wmi_ndp_end_rsp_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_ndp_end_rsp_per_ndi, ndp_end_rsp_per_ndi_list, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_END_RSP_EVENTID); + +/** + * NDP indication event + * + * TLV (tag length value ) parameters follow the ndp_indication + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +#define WMITLV_TABLE_WMI_NDP_INDICATION_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_indication_event_fixed_param, wmi_ndp_indication_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_INDICATION_EVENTID); + +/** + * NDP confirm event + * TLV (tag length value ) parameters follow the ndp_confirm + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +#define WMITLV_TABLE_WMI_NDP_CONFIRM_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_confirm_event_fixed_param, wmi_ndp_confirm_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_cfg, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, ndp_app_info, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_CONFIRM_EVENTID); + +/** + * NDP end indication event + * + * TLV (tag length value ) parameters follow the ndp_end_indication + * structure. The TLV's are: + * wmi_ndp_end_indication ndp_end_indication_list[]; + */ +#define WMITLV_TABLE_WMI_NDP_END_INDICATION_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_ndp_end_indication_event_fixed_param, wmi_ndp_end_indication_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_ndp_end_indication, ndp_end_indication_list, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_NDP_END_INDICATION_EVENTID); + /* L1SS track Event */ #define WMITLV_TABLE_WMI_PDEV_L1SS_TRACK_EVENTID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_l1ss_track_event_fixed_param, wmi_pdev_l1ss_track_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 23166041056e..d72831c89862 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -232,6 +232,7 @@ typedef enum { WMI_GRP_MAWC, WMI_GRP_PMF_OFFLOAD, WMI_GRP_BPF_OFFLOAD, /* Berkeley Packet Filter */ + WMI_GRP_NAN_DATA, } WMI_GRP_ID; #define WMI_CMD_GRP_START_ID(grp_id) (((grp_id) << 12) | 0x1) @@ -926,6 +927,15 @@ typedef enum { WMI_BPF_GET_VDEV_STATS_CMDID, WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID, WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID, + /** + * Nan Data commands + * NDI - NAN Data Interface + * NDP - NAN Data Path + */ + WMI_NDI_GET_CAP_REQ_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_NAN_DATA), + WMI_NDP_INITIATOR_REQ_CMDID, + WMI_NDP_RESPONDER_REQ_CMDID, + WMI_NDP_END_REQ_CMDID, } WMI_CMD_ID; typedef enum { @@ -1253,6 +1263,10 @@ typedef enum { /* NAN Event */ WMI_NAN_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_NAN), + WMI_NAN_DISC_IFACE_CREATED_EVENTID, + WMI_NAN_DISC_IFACE_DELETED_EVENTID, + WMI_NAN_STARTED_CLUSTER_EVENTID, + WMI_NAN_JOINED_CLUSTER_EVENTID, /* LPI Event */ WMI_LPI_RESULT_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_LPI), @@ -1294,6 +1308,15 @@ typedef enum { WMI_BPF_CAPABILIY_INFO_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_BPF_OFFLOAD), WMI_BPF_VDEV_STATS_INFO_EVENTID, + + /** NAN Data Events */ + WMI_NDI_CAP_RSP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_NAN_DATA), + WMI_NDP_INITIATOR_RSP_EVENTID, + WMI_NDP_RESPONDER_RSP_EVENTID, + WMI_NDP_END_RSP_EVENTID, + WMI_NDP_INDICATION_EVENTID, + WMI_NDP_CONFIRM_EVENTID, + WMI_NDP_END_INDICATION_EVENTID, } WMI_EVT_ID; /* defines for OEM message sub-types */ @@ -1313,10 +1336,16 @@ typedef enum { */ #define WMI_OEM_INTERNAL_RSP 0xdeadbeef -#define WMI_CHAN_LIST_TAG 0x1 -#define WMI_SSID_LIST_TAG 0x2 -#define WMI_BSSID_LIST_TAG 0x3 -#define WMI_IE_TAG 0x4 +#define WMI_CHAN_LIST_TAG 0x1 +#define WMI_SSID_LIST_TAG 0x2 +#define WMI_BSSID_LIST_TAG 0x3 +#define WMI_IE_TAG 0x4 +#define WMI_NDP_CFG_TAG 0x5 +#define WMI_NDP_QOS_CFG_TAG 0x6 +#define WMI_NDP_APP_INFO_TAG 0x7 +#define WMI_NDP_END_REQ_LIST_TAG 0x8 +#define WMI_NDP_END_RSP_PER_NDI_LIST_TAG 0x9 +#define WMI_NDP_END_INDICATION_LIST_TAG 0xA typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_channel */ @@ -3636,8 +3665,12 @@ enum { VDEV_TYPE_AP = 2, /** Monitor */ VDEV_TYPE_MONITOR = 3, + /** Reserved for NAN - See WMI_VDEV_TYPE_NAN */ + VDEV_TYPE_RSVD_1 = 5, /** OCB */ VDEV_TYPE_OCB = 6, + /** Reserved for NAN Data Interface - See WMI_VDEV_TYPE_NDI */ + VDEV_TYPE_RSVD_2 = 7, }; enum { @@ -4576,6 +4609,9 @@ typedef struct { #define WMI_VDEV_TYPE_OCB 0x6 +/* NAN Data Interface */ +#define WMI_VDEV_TYPE_NDI 0x7 + /** values for vdev_subtype */ #define WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE 0x1 #define WMI_UNIFIED_VDEV_SUBTYPE_P2P_CLIENT 0x2 @@ -5854,6 +5890,7 @@ enum wmi_peer_type { WMI_PEER_TYPE_BSS = 1, /* Peer is BSS Peer entry */ WMI_PEER_TYPE_TDLS = 2, /* Peer is a TDLS Peer */ WMI_PEER_TYPE_OCB = 3, /* Peer is a OCB Peer */ + WMI_PEER_TYPE_NAN_DATA = 4, /* Peer is NAN DATA */ WMI_PEER_TYPE_HOST_MAX = 127, /* Host <-> Target Peer type * is assigned up to 127 */ /* Reserved from 128 - 255 for @@ -7551,6 +7588,8 @@ typedef enum event_type_e { WOW_IOAC_REV_KA_FAIL_EVENT, WOW_IOAC_SOCK_EVENT, WOW_NLO_SCAN_COMPLETE_EVENT, + WOW_NAN_DATA_EVENT, + WOW_NAN_RTT_EVENT, } WOW_WAKE_EVENT_TYPE; typedef enum wake_reason_e { @@ -7595,6 +7634,8 @@ typedef enum wake_reason_e { WOW_REASON_REASSOC_RES_RECV, WOW_REASON_ACTION_FRAME_RECV, WOW_REASON_BPF_ALLOW, + WOW_REASON_NAN_DATA, + WOW_REASON_NAN_RTT, WOW_REASON_DEBUG_TEST = 0xFF, } WOW_WAKE_REASON_TYPE; @@ -10400,6 +10441,506 @@ typedef struct { */ } wmi_nan_event_hdr; +/** + * Event to indicate NAN discovery interface created + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_nan_disc_iface_created_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** NAN interface MAC address */ + wmi_mac_addr nan_interface_macaddr; +} wmi_nan_disc_iface_created_event_fixed_param; + +/** + * Event to indicate NAN discovery interface deleted + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_nan_disc_iface_deleted_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; +} wmi_nan_disc_iface_deleted_event_fixed_param; + +/** + * Event to indicate NAN device started new cluster + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_nan_started_cluster_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** NAN Cluster ID */ + A_UINT32 nan_cluster_id; +} wmi_nan_started_cluster_event_fixed_param; + +/** + * Event to indicate NAN device joined to cluster + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_nan_joined_cluster_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** NAN Cluster ID */ + A_UINT32 nan_cluster_id; +} wmi_nan_joined_cluster_event_fixed_param; + +/** NAN DATA CMD's */ + +/** + * NAN Data get capabilities req + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndi_get_cap_req_fixed_param + */ + A_UINT32 tlv_header; + /** unique id generated in upper layer for the transaction */ + A_UINT32 transaction_id; +} wmi_ndi_get_cap_req_fixed_param; + +/** + * NDP configuration (Security and/or QOS) + */ +typedef struct { + A_UINT32 tag; /** WMI_NDP_CFG_TAG */ + A_UINT32 ndp_cfg_len; /** ndp_cfg length in byte */ + A_UINT32 ndp_cfg[1]; /** Security/QoS configuration */ +} wmi_ndp_cfg; + +/** + * NDP QOS configuration + */ +typedef struct { + A_UINT32 tag; /** WMI_NDP_QOS_CFG_TAG */ + A_UINT32 ndp_qos_cfg_len; /** ndp_qos_cfg length in byte */ + A_UINT32 ndp_qos_cfg[1]; /** QoS configuration */ +} wmi_ndp_qos_cfg; + +/** + * NDP application information + */ +typedef struct { + A_UINT32 tag; /** WMI_NDP_APP_INFO_TAG */ + A_UINT32 ndp_app_info_len; /** ndp_app_info length in byte */ + A_UINT32 ndp_app_info[1]; /** App/Service information */ +} wmi_ndp_app_info; + +/** + * NDP Response code + */ +typedef enum { + NDP_RSP_CODE_REQUEST_ACCEPT = 0x00, + NDP_RSP_CODE_REQUEST_REJECT = 0x01, + NDP_RSP_CODE_REQUEST_DEFER = 0x02, +} wmi_ndp_rsp_code; + +/** + * NDP Initiator requesting a data session + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_initiator_req_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** unique id generated in upper layer for the transaction */ + A_UINT32 transaction_id; + /** Unique Instance Id identifying the Responder's service */ + A_UINT32 service_instance_id; + /** Discovery MAC addr of the publisher/peer */ + wmi_mac_addr peer_discovery_mac_addr; + /** Number of bytes in TLV wmi_ndp_cfg */ + A_UINT32 ndp_cfg_len; + /** Number of bytes in TLV wmi_ndp_app_info */ + A_UINT32 ndp_app_info_len; + /** + * TLV (tag length value ) parameters follow the ndp_initiator_req + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +} wmi_ndp_initiator_req_fixed_param; + +/** + * Initiate a data response on the responder side + * for data request indication from the peer + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_responder_req_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** unique id generated in upper layer for the transaction */ + A_UINT32 transaction_id; + /** + * Unique token Id generated on the initiator/responder + * side used for a NDP session between two NAN devices + */ + A_UINT32 ndp_instance_id; + /** Response Code defined in wmi_ndp_rsp_code */ + A_UINT32 rsp_code; + /** Number of bytes in TLV wmi_ndp_cfg */ + A_UINT32 ndp_cfg_len; + /** Number of bytes in TLV wmi_ndp_app_info */ + A_UINT32 ndp_app_info_len; + /** + * TLV (tag length value ) parameters follow the ndp_responder_req + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +} wmi_ndp_responder_req_fixed_param; + +/** + * NDP end type + */ +typedef enum { + NDP_END_TYPE_UNSPECIFIED = 0x00, + NDP_END_TYPE_PEER_UNAVAILABLE = 0x01, + NDP_END_TYPE_OTA_FRAME = 0x02, +} wmi_ndp_end_type; + +/** + * NDP end reason code + */ +typedef enum { + NDP_END_REASON_UNSPECIFIED = 0x00, + NDP_END_REASON_INACTIVITY = 0x01, + NDP_END_REASON_PEER_DATA_END = 0x02, +} wmi_ndp_end_reason_code; + +/** + * NDP end request + */ +typedef struct { + /** reason_code defined in wmi_ndp_end_reason_code */ + A_UINT32 reason_code; + /** NDP instance id */ + A_UINT32 ndp_instance_id; +} wmi_ndp_end_req; + +/** + * NDP end request list + */ +typedef struct { + A_UINT32 tag;/** WMI_NDP_END_REQ_LIST_TAG */ + A_UINT32 num_ndp_end_reqs; /** number of wmi_ndp_end_req */ + wmi_ndp_end_req ndp_end_reqs[1]; +} wmi_ndp_end_req_list; + +/** + * NDP End request + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_end_req_fixed_param + */ + A_UINT32 tlv_header; + /** unique id generated in upper layer for the transaction */ + A_UINT32 transaction_id; + /** Number of ndp instances in wmi_ndp_end_req_list */ + A_UINT32 num_ndp_instances; + /** Number of bytes in TLV wmi_ndp_end_req_list */ + A_UINT32 ndp_end_req_len; + /** + * TLV (tag length value ) parameters follow the ndp_end_req + * structure. The TLV's are: + * wmi_ndp_end_req wmi_ndp_end_req_list[]; + */ +} wmi_ndp_end_req_fixed_param; + +/* NAN DATA RSP EVENTS */ + +/** + * Event to indicate NAN Data Interface capabilities cmd + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndi_cap_rsp_event_fixed_param + */ + A_UINT32 tlv_header; + /** Copy of transaction_id received in wmi_ndi_get_cap_req */ + A_UINT32 transaction_id; + /** Max ndi interface support */ + A_UINT32 max_ndi_interfaces; + /** Max ndp per ndi support */ + A_UINT32 max_ndp_per_ndi; + /** Max number of peer's per ndi */ + A_UINT32 max_peers_per_ndi; +} wmi_ndi_cap_rsp_event_fixed_param; + +/** + * NDP command response code + */ +typedef enum { + NDP_CMD_RSP_STATUS_SUCCESS = 0x00, + NDP_CMD_RSP_STATUS_ERROR = 0x01, +} wmi_ndp_cmd_rsp_status; + +/** + * NDP command reason code + */ +typedef enum { + NDP_INVALID_VDEV_ID_PARAM = 0x00, + NDP_INVALID_SERVICE_INSTANCE_ID_PARAM = 0x01, + NDP_INVALID_PEER_DISC_MAC_ADDR_PARAM = 0x02, + NDP_INVALID_NDP_CFG_SECURITY_PARAM = 0x03, + NDP_INVALID_NDP_CFG_QOS_PARAM = 0x04, + NDP_INVALID_APP_INFO_LEN_PARAM = 0x05, + NDP_INVALID_NDP_INSTANCE_ID_PARAM = 0x06, + NDP_INVALID_RSP_CODE_PARAM = 0x07, +} wmi_ndp_cmd_reason_code; + +/** + * Event response for wmi_ndp_initiator_req + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_initiator_rsp_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** Copy of transaction_id received in wmi_ndp_initiator_req */ + A_UINT32 transaction_id; + /** Response status defined in wmi_ndp_cmd_rsp_status*/ + A_UINT32 rsp_status; + /** Reason code defined in wmi_ndp_cmd_reason_code */ + A_UINT32 reason_code; +} wmi_ndp_initiator_rsp_event_fixed_param; + +/** + * Event response for wmi_ndp_responder_req cmd + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_responder_rsp_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** Copy of transaction_id received in wmi_ndp_responder_req */ + A_UINT32 transaction_id; + /** Response status defined in wmi_ndp_cmd_rsp_status*/ + A_UINT32 rsp_status; + /** Reason code defined in wmi_ndp_cmd_reason_code */ + A_UINT32 reason_code; +} wmi_ndp_responder_rsp_event_fixed_param; + +/** + * NDP end response per ndi + */ +typedef struct { + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** Peer MAC addr */ + wmi_mac_addr peer_mac_addr; + /** Number of active ndps on this ndi */ + A_UINT32 num_active_ndps_on_ndi; +} wmi_ndp_end_rsp_per_ndi; + +/** + * NDP end response per ndi list + */ +typedef struct { + /** WMI_NDP_END_RSP_PER_NDI_LIST_TAG */ + A_UINT32 tag; + /** Number of ndp_end_rsp_per_ndi */ + A_UINT32 num_ndp_end_rsp_per_ndis; + wmi_ndp_end_rsp_per_ndi ndp_end_rsp_per_ndis[1]; +} wmi_ndp_end_rsp_per_ndi_list; + +/** + * Event response for wmi_ndp_end_req cmd + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_end_rsp_event_fixed_param + */ + A_UINT32 tlv_header; + /** Copy of transaction_id received in wmi_ndp_end_req */ + A_UINT32 transaction_id; + /** Response status defined in wmi_ndp_cmd_rsp_status*/ + A_UINT32 rsp_status; + /** Reason code defined in wmi_ndp_cmd_reason_code */ + A_UINT32 reason_code; + /** Number of bytes in TLV wmi_ndp_end_rsp_per_ndi */ + A_UINT32 data_end_req_rsp_len; + /** + * TLV (tag length value ) parameters follow the ndp_end_rsp + * structure. The TLV's are: + * wmi_ndp_end_rsp_per_ndi ndp_end_rsp_per_ndis[]; + */ +} wmi_ndp_end_rsp_event_fixed_param; + +/** NAN DATA EVENTS */ + +/** + * NDP self role + */ +typedef enum { + WMI_NDP_INITIATOR_ROLE, + WMI_NDP_RESPONDER_ROLE, +} wmi_ndp_self_role; + +/** + * NDP accept policy + */ +typedef enum { + WMI_NDP_ACCEPT_POLICY_NONE, + WMI_NDP_ACCEPT_POLICY_ALL, +} wmi_ndp_accept_policy; + +/** + * Event indication received on the responder side when a NDP Initiator request/ + * NDP session is initiated on the Initiator side + * (self role will be NDP_RESPONDER_ROLE) + * + * Event indication received on the initiator side when a + * NDP responder request on the Initiator side + * (self role will be NDP_INITIATOR_ROLE) + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_indication_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** Self NDP Role defined in wmi_ndp_self_role */ + A_UINT32 self_ndp_role; + /** Accept policy defined in wmi_ndp_accept_policy */ + A_UINT32 accept_policy; + /** Unique Instance Id corresponding to a service/session. */ + A_UINT32 service_instance_id; + /** Discovery MAC addr of the peer/initiator */ + wmi_mac_addr peer_disc_mac_addr; + /** + * Unique token Id generated on the initiator/responder + * side used for a NDP session between two NAN devices + */ + A_UINT32 ndp_instance_id; + /** Number of bytes in TLV wmi_ndp_cfg */ + A_UINT32 ndp_cfg_len; + /** Number of bytes in TLV wmi_ndp_app_info */ + A_UINT32 ndp_app_info_len; + /** + * TLV (tag length value ) parameters follow the ndp_indication + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +} wmi_ndp_indication_event_fixed_param; + +/** + * Event indication of data confirm is received on both + * initiator and responder side confirming a NDP session + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_confirm_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** + * Unique token Id generated on the initiator/responder + * side used for a NDP session between two NAN devices + */ + A_UINT32 ndp_instance_id; + /* + * NDI mac address of the peer + * (required to derive target ipv6 address) + */ + wmi_mac_addr peer_ndi_mac_addr; + /** Response Code defined in wmi_ndp_rsp_code */ + A_UINT32 rsp_code; + /** Number of bytes in TLV wmi_ndp_cfg */ + A_UINT32 ndp_cfg_len; + /** Number of bytes in TLV wmi_ndp_app_info */ + A_UINT32 ndp_app_info_len; + /** + * TLV (tag length value ) parameters follow the ndp_confirm + * structure. The TLV's are: + * wmi_ndp_cfg ndp_cfg[]; + * wmi_ndp_app_info ndp_app_info[]; + */ +} wmi_ndp_confirm_event_fixed_param; + +/** + * NDP end indication + */ +typedef struct { + /** type defined in wmi_ndp_end_type */ + A_UINT32 type; + /** reason_code defined in wmi_ndp_end_reason_code */ + A_UINT32 reason_code; + /** NDP instance id */ + A_UINT32 ndp_instance_id; +} wmi_ndp_end_indication; + +/** + * NDP end indication list + */ +typedef struct { + /** WMI_NDP_END_INDICATION_LIST_TAG */ + A_UINT32 tag; + /** Number of ndp_end_rsp_per_ndi */ + A_UINT32 num_ndp_end_indications; + wmi_ndp_end_indication ndp_end_indications[1]; +} wmi_ndp_end_indication_list; + +/** + * Event indication received on the initiator/responder side + * terminating a NDP session + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_ndp_end_indication_event_fixed_param + */ + A_UINT32 tlv_header; + /** Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /** Number of ndp instances in wmi_ndp_end_indication */ + A_UINT32 num_ndp_instances; + /** Number of bytes in TLV wmi_ndp_end_indication */ + A_UINT32 data_end_event_len; + /** + * TLV (tag length value ) parameters follow the ndp_end_indication + * structure. The TLV's are: + * wmi_ndp_end_indication ndp_end_indications[]; + */ +} wmi_ndp_end_indication_event_fixed_param; + typedef struct { A_UINT32 tlv_header; A_UINT32 num_data; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index d8768f399ba2..c103cf6de9a9 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 205 +#define __WMI_REVISION_ 206 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 69616c1c891a6a85b599eeab84c0c50ef67fbc6d Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 4 Feb 2016 17:31:47 +0530 Subject: qcacld-3.0: CL 1454086 update fw common interface files Remove VDEV_TYPE_xxx enum defs. Change-Id: Id836ddacb245db303d8f8f8754b24f53937bf8b8 CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 17 ----------------- target/inc/wmi_version.h | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index d72831c89862..fbf9404d9bef 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -3656,23 +3656,6 @@ typedef struct { char bufp[WMI_MAX_DEBUG_MESG]; } wmi_debug_mesg_event; -enum { - /** IBSS station */ - VDEV_TYPE_IBSS = 0, - /** infra STA */ - VDEV_TYPE_STA = 1, - /** infra AP */ - VDEV_TYPE_AP = 2, - /** Monitor */ - VDEV_TYPE_MONITOR = 3, - /** Reserved for NAN - See WMI_VDEV_TYPE_NAN */ - VDEV_TYPE_RSVD_1 = 5, - /** OCB */ - VDEV_TYPE_OCB = 6, - /** Reserved for NAN Data Interface - See WMI_VDEV_TYPE_NDI */ - VDEV_TYPE_RSVD_2 = 7, -}; - enum { /** P2P device */ VDEV_SUBTYPE_P2PDEV = 0, diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index c103cf6de9a9..01ec993d665c 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 206 +#define __WMI_REVISION_ 207 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From d24f5e428973b971cb48a85e52e32f6a4045097a Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 22 Feb 2016 15:16:46 +0530 Subject: qcacld-3.0: CL 1457903 update fw common interface files WMI changes for introducing 11ax capabilities add new dbglog IDs for scan events Change-Id: Ie9d30e397ae7bfe84619acab4c42bc8739b19a99 CRs-Fixed: 865207 --- target/inc/dbglog_id.h | 40 ++++++++++++++++++++++++++-- target/inc/wlan_defs.h | 28 ++++++++++++++++++-- target/inc/wmi.h | 3 ++- target/inc/wmi_services.h | 1 + target/inc/wmi_unified.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 6 files changed, 134 insertions(+), 6 deletions(-) diff --git a/target/inc/dbglog_id.h b/target/inc/dbglog_id.h index 171701a02348..e6855e74e30b 100644 --- a/target/inc/dbglog_id.h +++ b/target/inc/dbglog_id.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -580,7 +580,42 @@ extern "C" { #define SCAN_FWLOG_EVENT_RESTARTED 10 #define SCAN_FWLOG_EVENT_COMPLETED 11 #define SCAN_SM_REQ_NEXT_CH 12 -#define SCAN_DBGID_DEFINITION_END 13 +#define SCAN_ENG_START 13 +#define SCAN_ENG_CANCEL 14 +#define SCAN_ENG_SPOOFED_MAC_ADDR 15 +#define SCAN_ENG_PARAM_1 16 +#define SCAN_ENG_PARAM_2 17 +#define SCAN_ENG_MAX_SCAN_TIMEOUT 18 +#define SCAN_ENG_START_IN_PROGRESS 19 +#define SCAN_SM_START_COMMAND_FAILED 20 +#define SCAN_SCH_START 21 +#define SCAN_SCH_START_INFO 22 +#define SCAN_SCH_START_NEW_REQ_FAILED 23 +#define SCAN_SCH_START_ALLOC_FAIL 24 +#define SCAN_SCH_ENGINE_STOP_DUE_TO_TIMEOUT 25 +#define SCAN_SCH_POLICY_EVENT 26 +#define SCAN_SCH_CANCEL 27 +#define SCAN_SCH_STOP_COMMAND_FAILED 28 +#define SCAN_SCH_NEXT_SCAN_FAILED 29 +#define SCAN_WMI_SET_CHAN_LIST 30 +#define SCAN_EVENT_STARTED 31 +#define SCAN_EVENT_BSS_CHANNEL 32 +#define SCAN_EVENT_FOREIGN_CHANNEL 33 +#define SCAN_EVENT_DEQUEUED 34 +#define SCAN_EVENT_START_FAILED 35 +#define SCAN_EVENT_FOREIGN_CHANNEL_EXIT 36 +#define SCAN_SM_DISPATCH 37 +#define SCAN_SM_TRANSITIONS 38 +#define SCAN_SM_REQ_NEXT_CHAN 39 +#define SCAN_SEND_PROBE_REQ_RET_VDEV 40 +#define SCAN_SEND_PROBE_REQ_RET_PLM 41 +#define SCAN_SEND_PROBE_REQ_RET_PASSIVE 42 +#define SCAN_SEND_PROBE_REQ_RET_RADAR 43 +#define SCAN_SEND_PROBE_REQ_RET_DFS 44 +#define SCAN_SEND_PROBE_REQ_INFO 45 +#define SCAN_SM_CANCEL 46 +#define SCAN_SM_PROBE_REQ_FRAME_SEND_FAILED 47 +#define SCAN_DBGID_DEFINITION_END 48 #define BEACON_EVENT_SWBA_SEND_FAILED 0 #define BEACON_EVENT_EARLY_RX_BMISS_STATUS 1 @@ -1531,6 +1566,7 @@ extern "C" { #define EXTSCAN_NOTIFY_HOTLIST_MATCH 38 #define EXTSCAN_CONFIG_HOTLIST_TABLE 39 #define EXTSCAN_CONFIG_WLAN_CHANGE_TABLE 40 +#define EXTSCAN_EVENT_SEND_FAILED 41 /* NLO DBGIDs */ #define NLO_DBGID_SSID_TO_BE_SCANNED_LIST 0 diff --git a/target/inc/wlan_defs.h b/target/inc/wlan_defs.h index 8369bfb93930..2a6003675337 100644 --- a/target/inc/wlan_defs.h +++ b/target/inc/wlan_defs.h @@ -55,6 +55,10 @@ #define CONFIG_160MHZ_SUPPORT 0 #endif +#ifndef SUPPORT_11AX +#define SUPPORT_11AX 0 /* 11ax not supported by default */ +#endif + typedef enum { MODE_11A = 0, /* 11a Mode */ MODE_11G = 1, /* 11b/g Mode */ @@ -75,9 +79,29 @@ typedef enum { MODE_11AC_VHT160 = 15, #endif +#if SUPPORT_11AX + MODE_11AX_HE20 = 16, + MODE_11AX_HE40 = 17, + MODE_11AX_HE80 = 18, + MODE_11AX_HE80_80 = 19, + MODE_11AX_HE160 = 20, + MODE_11AX_HE20_2G = 21, + MODE_11AX_HE40_2G = 22, + MODE_11AX_HE80_2G = 23, +#endif + + /* + * MODE_UNKNOWN should not be used within the host / target interface. + * Thus, it is permissible for ODE_UNKNOWN to be conditionally-defined, + * taking different values when compiling for different targets. + */ + MODE_UNKNOWN, - MODE_UNKNOWN_NO_160MHZ_SUPPORT = 14, - MODE_UNKNOWN_160MHZ_SUPPORT = 16, + MODE_UNKNOWN_NO_160MHZ_SUPPORT = 14, /* not needed? */ + /* MODE_UNKNOWN_NO_11AX_SUPPORT = 16,*/ /* not needed? */ + /* MODE_UNKNOWN_11AX_SUPPORT = 24,*/ /* not needed? */ + MODE_UNKNOWN_160MHZ_SUPPORT = MODE_UNKNOWN, /* not needed? */ + MODE_MAX = MODE_UNKNOWN, MODE_MAX_NO_160_MHZ_SUPPORT = MODE_UNKNOWN_NO_160MHZ_SUPPORT, MODE_MAX_160_MHZ_SUPPORT = MODE_UNKNOWN_160MHZ_SUPPORT, diff --git a/target/inc/wmi.h b/target/inc/wmi.h index 6645ebac1975..e7fec58b29c4 100644 --- a/target/inc/wmi.h +++ b/target/inc/wmi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, 2013-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2004-2010, 2013-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -151,6 +151,7 @@ typedef enum { WMI_11NG_CAPABILITY = 5, WMI_11NAG_CAPABILITY = 6, WMI_11AC_CAPABILITY = 7, + WMI_11AX_CAPABILITY = 8, /* END CAPABILITY */ WMI_11N_CAPABILITY_OFFSET = (WMI_11NA_CAPABILITY - WMI_11A_CAPABILITY), diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index 9e76ddb2099c..c6b3acc1f25f 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -147,6 +147,7 @@ typedef enum { WMI_SERVICE_RATECTRL_LIMIT_MAX_MIN_RATES, WMI_SERVICE_NAN_DATA, /* FW supports NAN data */ WMI_SERVICE_NAN_RTT, /* FW supports NAN RTT */ + WMI_SERVICE_11AX, /* FW supports 802.11ax */ WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index fbf9404d9bef..a031d93a3ea2 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -1528,6 +1528,64 @@ typedef enum { #define WMI_VHT_MAX_SUPP_RATE_MASK 0x1fff0000 #define WMI_VHT_MAX_SUPP_RATE_MASK_SHIFT 16 +/** 11ax capabilities */ +#define WMI_HE_CAP_PPE_PRESENT 0x00000001 +#define WMI_HE_CAP_TWT_RESPONDER_SUPPORT 0x00000002 +#define WMI_HE_CAP_TWT_REQUESTER_SUPPORT 0x00000004 +#define WMI_HE_FRAG_SUPPORT_MASK 0x00000018 +#define WMI_HE_FRAG_SUPPORT_SHIFT 3 +/** NOTE: This defs cannot be changed in the future without + * breaking WMI compatibility + */ +#define WMI_MAX_NUM_SS 8 +#define WMI_MAX_NUM_RU 4 + +/* + * Figure 8 554ae: -PPE Threshold Info field format + * we pack PPET16 and PPT8 for four RU's in one element of array. + * + * ppet16_ppet8_ru3_ru0 array element 0 holds: + * | PPET16 | PPET8 | PPET16 | PPET8 | PPET16 | PPET8 | PPET16 | PPET8 | + *rsvd |NSS1,RU4|NSS1,RU4|NSS1,RU3|NSS1,RU3|NSS1,RU2|NSS1,RU2|NSS1,RU1|NSS1,RU1| + *31:23| 22:20 | 19:17 | 17:15 | 14:12 | 11:9 | 8:6 | 5:3 | 2:0 | + * + * ppet16_ppet8_ru3_ru0 array element 1 holds: + * | PPET16 | PPET8 | PPET16 | PPET8 | PPET16 | PPET8 | PPET16 | PPET8 | + *rsvd |NSS2,RU4|NSS2,RU4|NSS2,RU3|NSS2,RU3|NSS2,RU2|NSS2,RU2|NSS2,RU1|NSS2,RU1| + *31:23| 22:20 | 19:17 | 17:15 | 14:12 | 11:9 | 8:6 | 5:3 | 2:0 | + * + * etc. + */ + +/* + * Note that in these macros, "ru" is one-based, not zero-based, while + * nssm1 is zero-based. + */ +#define WMI_SET_PPET8(ppet16_ppet8_ru3_ru0, ppet, ru, nssm1) \ + do { \ + ppet16_ppet8_ru3_ru0[nssm1] &= ~(7 << (((ru-1)%4)*6)); \ + ppet16_ppet8_ru3_ru0[nssm1] |= ((ppet&7) << (((ru-1)%4)*6)); \ + } while (0) + +#define WMI_GET_PPET8(ppet16_ppet8_ru3_ru0, ru, nssm1) \ + ((ppet16_ppet8_ru3_ru0[nssm1] >> (((ru-1)%4)*6))&7) + +#define WMI_SET_PPET16(ppet16_ppet8_ru3_ru0, ppet, ru, nssm1) \ + do { \ + ppet16_ppet8_ru3_ru0[nssm1] &= ~(7 << (((ru-1)%4)*6+3)); \ + ppet16_ppet8_ru3_ru0[nssm1] |= ((ppet&7) << (((ru-1)%4)*6+3)); \ + } while (0) + +#define WMI_GET_PPET16(ppet16_ppet8_ru3_ru0, ru, nssm1) \ + ((ppet16_ppet8_ru3_ru0[nssm1] >> (((ru-1)%4)*6+3))&7) + +typedef struct _wmi_ppe_threshold { + A_UINT32 numss_m1; /** NSS - 1*/ + A_UINT32 ru_count; /** Max RU count */ + /** ppet8 and ppet16 for max num ss */ + A_UINT32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; +} wmi_ppe_threshold; + /* WMI_SYS_CAPS_* refer to the capabilities that system support */ #define WMI_SYS_CAP_ENABLE 0x00000001 @@ -1749,6 +1807,9 @@ typedef struct { A_UINT32 default_conc_scan_config_bits; /* which WMI_DBS_FW_MODE_CFG setting the FW is initialized with */ A_UINT32 default_fw_config_bits; + wmi_ppe_threshold ppet; + /* see section 8.4.2.213 from draft r8 of 802.11ax */ + A_UINT32 he_cap_info; } wmi_service_ready_ext_event_fixed_param; typedef enum { @@ -6355,6 +6416,11 @@ typedef struct { * set to 0 by host */ A_UINT32 peer_bw_rxnss_override; + /* 802.11ax capabilities */ + wmi_ppe_threshold peer_ppet; + /* protocol-defined HE / 11ax capability flags */ + A_UINT32 peer_he_cap_info; + A_UINT32 peer_he_ops; /* HE operation contains BSS color */ /* Following this struc are the TLV's: * A_UINT8 peer_legacy_rates[]; * A_UINT8 peer_ht_rates[]; diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 01ec993d665c..29cafa11fbc7 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 207 +#define __WMI_REVISION_ 208 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 76d82bcb3659aa36ae21e18cdb48cb66a2ae0e1d Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 22 Feb 2016 15:39:48 +0530 Subject: qcacld-3.0: CL 1461271 update fw common interface files MPDU density advertisement Change-Id: If6e03586008cf498dfe1c38dcd31dc04043f1f2c CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 5 +++++ target/inc/wmi_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index a031d93a3ea2..f863444f8534 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -1810,6 +1810,11 @@ typedef struct { wmi_ppe_threshold ppet; /* see section 8.4.2.213 from draft r8 of 802.11ax */ A_UINT32 he_cap_info; + /* + * An HT STA shall not allow transmission of more than one MPDU start + * within the time limit described in the MPDU maximum density field. + */ + A_UINT32 mpdu_density; /* units are microseconds */ } wmi_service_ready_ext_event_fixed_param; typedef enum { diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 29cafa11fbc7..083a9e52b243 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 208 +#define __WMI_REVISION_ 209 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 869c9871d03c7a205c3e9f401428144a743be157 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 22 Feb 2016 18:36:34 +0530 Subject: qcacld-3.0: CL 1462943 update fw common interface files Replace mac_id with pdev_id, add vdev_id to peer commands/events and change reserved0 to pdev_id in PDEV commands Change-Id: Id112e0eb6262739a1fd1767150d29cc5bd59955b CRs-Fixed: 865207 --- core/wmi/wmi_unified.c | 5 + target/inc/wmi_services.h | 12 + target/inc/wmi_tlv_defs.h | 95 +++++-- target/inc/wmi_unified.h | 634 +++++++++++++++++++++++++++++++++++++++++----- target/inc/wmi_version.h | 2 +- 5 files changed, 669 insertions(+), 79 deletions(-) diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c index da4b6d1d1e3c..7ede80e64d42 100644 --- a/core/wmi/wmi_unified.c +++ b/core/wmi/wmi_unified.c @@ -730,8 +730,11 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_DEBUG_MESG_FLUSH_CMDID); CASE_RETURN_STRING(WMI_PEER_SET_RATE_REPORT_CONDITION_CMDID); CASE_RETURN_STRING(WMI_SOC_SET_PCL_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_PCL_CMDID); CASE_RETURN_STRING(WMI_SOC_SET_HW_MODE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_HW_MODE_CMDID); CASE_RETURN_STRING(WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_MAC_CONFIG_CMDID); CASE_RETURN_STRING(WMI_WOW_ENABLE_ICMPV6_NA_FLT_CMDID); CASE_RETURN_STRING(WMI_DIAG_EVENT_LOG_CONFIG_CMDID); CASE_RETURN_STRING(WMI_PACKET_FILTER_CONFIG_CMDID); @@ -740,6 +743,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_WOW_UDP_SVC_OFLD_CMDID); CASE_RETURN_STRING(WMI_MGMT_TX_SEND_CMDID); CASE_RETURN_STRING(WMI_SOC_SET_ANTENNA_MODE_CMDID); + CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_MODE_CMDID); CASE_RETURN_STRING(WMI_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMDID); CASE_RETURN_STRING(WMI_AP_PS_EGAP_PARAM_CMDID); CASE_RETURN_STRING(WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID); @@ -767,6 +771,7 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) CASE_RETURN_STRING(WMI_VDEV_ATF_REQUEST_CMDID); CASE_RETURN_STRING(WMI_VDEV_SET_DSCP_TID_MAP_CMDID); CASE_RETURN_STRING(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID); + CASE_RETURN_STRING(WMI_VDEV_SET_QUIET_MODE_CMDID); CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index c6b3acc1f25f..4ab82d040e98 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -148,6 +148,18 @@ typedef enum { WMI_SERVICE_NAN_DATA, /* FW supports NAN data */ WMI_SERVICE_NAN_RTT, /* FW supports NAN RTT */ WMI_SERVICE_11AX, /* FW supports 802.11ax */ + /* WMI_SERVICE_DEPRECATED_REPLACE + * FW supports these new WMI commands, to be used rather than + * deprecated matching commands: + * - WMI_PDEV_SET_PCL_CMDID (vs. WMI_SOC_SET_PCL_CMDID) + * - WMI_PDEV_SET_HW_MODE_CMDID (vs. WMI_SOC_SET_HW_MODE_CMDID) + * - WMI_PDEV_SET_MAC_CONFIG_CMDID + * (vs. WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID) + * - WMI_PDEV_SET_ANTENNA_MODE_CMDID + * (vs. WMI_SOC_SET_ANTENNA_MODE_CMDID) + * - WMI_VDEV_SET_DSCP_TID_MAP_CMDID (vs. WMI_VDEV_SET_WMM_PARAMS_CMDID) + */ + WMI_SERVICE_DEPRECATED_REPLACE, WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index b8a3f3d67d60..0c24a659840c 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -223,8 +223,12 @@ typedef enum { WMITLV_TAG_STRUC_WMI_GTK_OFFLOAD_STATUS_EVENT_fixed_param, WMITLV_TAG_STRUC_wmi_igtk_info, WMITLV_TAG_STRUC_wmi_dcs_interference_event_fixed_param, - WMITLV_TAG_STRUC_ath_dcs_cw_int, - WMITLV_TAG_STRUC_ath_dcs_wlan_int_stat, + WMITLV_TAG_STRUC_ath_dcs_cw_int, /* DEPRECATED */ + WMITLV_TAG_STRUC_wlan_dcs_cw_int = /* alias */ + WMITLV_TAG_STRUC_ath_dcs_cw_int, + WMITLV_TAG_STRUC_ath_dcs_wlan_int_stat, /* DEPRECATED */ + WMITLV_TAG_STRUC_wlan_dcs_im_tgt_stats_t = /* alias */ + WMITLV_TAG_STRUC_ath_dcs_wlan_int_stat, WMITLV_TAG_STRUC_wmi_wlan_profile_ctx_t, WMITLV_TAG_STRUC_wmi_wlan_profile_t, WMITLV_TAG_STRUC_wmi_pdev_qvit_event_fixed_param, @@ -674,6 +678,15 @@ typedef enum { WMITLV_TAG_STRUC_wmi_ndp_indication_event_fixed_param, WMITLV_TAG_STRUC_wmi_ndp_confirm_event_fixed_param, WMITLV_TAG_STRUC_wmi_ndp_end_indication_event_fixed_param, + WMITLV_TAG_STRUC_wmi_vdev_set_quiet_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_pcl_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_antenna_mode_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_hw_mode_transition_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_vdev_mac_entry, + WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param, } WMITLV_TAG_ID; /* @@ -944,7 +957,12 @@ typedef enum { OP(WMI_NDI_GET_CAP_REQ_CMDID) \ OP(WMI_NDP_INITIATOR_REQ_CMDID) \ OP(WMI_NDP_RESPONDER_REQ_CMDID) \ - OP(WMI_NDP_END_REQ_CMDID) + OP(WMI_NDP_END_REQ_CMDID) \ + OP(WMI_PDEV_SET_PCL_CMDID) \ + OP(WMI_PDEV_SET_HW_MODE_CMDID) \ + OP(WMI_PDEV_SET_MAC_CONFIG_CMDID) \ + OP(WMI_PDEV_SET_ANTENNA_MODE_CMDID) \ + OP(WMI_VDEV_SET_QUIET_MODE_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -1089,7 +1107,10 @@ typedef enum { OP(WMI_NDP_END_RSP_EVENTID) \ OP(WMI_NDP_INDICATION_EVENTID) \ OP(WMI_NDP_CONFIRM_EVENTID) \ - OP(WMI_NDP_END_INDICATION_EVENTID) + OP(WMI_NDP_END_INDICATION_EVENTID) \ + OP(WMI_PDEV_SET_HW_MODE_RESP_EVENTID) \ + OP(WMI_PDEV_HW_MODE_TRANSITION_EVENTID) \ + OP(WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID) /* TLV definitions of WMI commands */ @@ -1964,6 +1985,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_PARAM_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_QUIET_MODE_CMDID); +/* VDev set quiet Cmd */ +#define WMITLV_TABLE_WMI_VDEV_SET_QUIET_MODE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_set_quiet_cmd_fixed_param, wmi_vdev_set_quiet_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) + +WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_QUIET_MODE_CMDID); + /* Vdev create Cmd */ #define WMITLV_TABLE_WMI_VDEV_CREATE_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param, wmi_vdev_create_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ @@ -2687,27 +2714,48 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_TSF_TSTAMP_ACTION_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_SUBNET_CHANGE_CONFIG_CMDID); -/* Set the SOC Preferred Channel List (PCL) Cmd */ +/* Set the SOC Preferred Channel List (PCL) Cmd - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_PCL_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_pcl_cmd_fixed_param, wmi_soc_set_pcl_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_list, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_PCL_CMDID); -/* Set the SOC Hardware Mode Cmd */ +/* Set the PDEV Preferred Channel List (PCL) Cmd */ +#define WMITLV_TABLE_WMI_PDEV_SET_PCL_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_pcl_cmd_fixed_param, wmi_pdev_set_pcl_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, channel_weight, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_PCL_CMDID); + +/* Set the SOC Hardware Mode Cmd - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_HW_MODE_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_hw_mode_cmd_fixed_param, wmi_soc_set_hw_mode_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_HW_MODE_CMDID); -/* Set the SOC Dual MAC Config Cmd */ +/* Set the PDEV Hardware Mode Cmd */ +#define WMITLV_TABLE_WMI_PDEV_SET_HW_MODE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_cmd_fixed_param, wmi_pdev_set_hw_mode_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_HW_MODE_CMDID); + +/* Set the SOC Dual MAC Config Cmd - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_dual_mac_config_cmd_fixed_param, wmi_soc_set_dual_mac_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID); -/* Set the SOC Antenna Mode Cmd */ +/* Set the PDEV MAC Config Cmd */ +#define WMITLV_TABLE_WMI_PDEV_SET_MAC_CONFIG_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_cmd_fixed_param, wmi_pdev_set_mac_config_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_MAC_CONFIG_CMDID); + +/* Set the SOC Antenna Mode Cmd - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_ANTENNA_MODE_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_antenna_mode_cmd_fixed_param, wmi_soc_set_antenna_mode_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_ANTENNA_MODE_CMDID); +/* Set the PDEV Antenna Mode Cmd */ +#define WMITLV_TABLE_WMI_PDEV_SET_ANTENNA_MODE_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_antenna_mode_cmd_fixed_param, wmi_pdev_set_antenna_mode_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_ANTENNA_MODE_CMDID); + /************************** TLV definitions of WMI events *******************************/ /* Service Ready event */ @@ -2980,10 +3028,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_DIAG_EVENTID); WMITLV_CREATE_PARAM_STRUC(WMI_GTK_OFFLOAD_STATUS_EVENTID); /* DCA interferance Event */ -#define WMITLV_TABLE_WMI_DCS_INTERFERENCE_EVENTID(id,op,buf,len) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_dcs_interference_event_fixed_param, wmi_dcs_interference_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, ath_dcs_cw_int, cw_int, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wlan_dcs_im_tgt_stats_t, wlan_stat, WMITLV_SIZE_VAR) +#define WMITLV_TABLE_WMI_DCS_INTERFERENCE_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_dcs_interference_event_fixed_param, wmi_dcs_interference_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wlan_dcs_cw_int, cw_int, WMITLV_SIZE_VAR) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wlan_dcs_im_tgt_stats_t, wlan_stat, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_DCS_INTERFERENCE_EVENTID); /* Profile data Event */ @@ -3412,23 +3460,40 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_TSF_REPORT_EVENTID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, bufp, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_SET_IE_CMDID); -/* SOC Set Hardware Mode Response event */ +/* SOC Set Hardware Mode Response event - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_HW_MODE_RESP_EVENTID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_hw_mode_response_event_fixed_param, wmi_soc_set_hw_mode_response_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_soc_set_hw_mode_response_vdev_mac_entry, wmi_soc_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_HW_MODE_RESP_EVENTID); -/* SOC Hardware Mode Transition event */ +/* PDEV Set Hardware Mode Response event */ +#define WMITLV_TABLE_WMI_PDEV_SET_HW_MODE_RESP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_event_fixed_param, wmi_pdev_set_hw_mode_response_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ +WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_set_hw_mode_response_vdev_mac_entry, wmi_pdev_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_HW_MODE_RESP_EVENTID); + +/* SOC Hardware Mode Transition event - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_HW_MODE_TRANSITION_EVENTID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_hw_mode_transition_event_fixed_param, wmi_soc_hw_mode_transition_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_soc_set_hw_mode_response_vdev_mac_entry, wmi_soc_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_HW_MODE_TRANSITION_EVENTID); -/* SOC Set Dual MAC Config Response event */ +/* PDEV Hardware Mode Transition event */ +#define WMITLV_TABLE_WMI_PDEV_HW_MODE_TRANSITION_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_hw_mode_transition_event_fixed_param, wmi_pdev_hw_mode_transition_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_set_hw_mode_response_vdev_mac_entry, wmi_pdev_set_hw_mode_response_vdev_mac_mapping, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_HW_MODE_TRANSITION_EVENTID); + +/* SOC Set Dual MAC Config Response event - DEPRECATED */ #define WMITLV_TABLE_WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_soc_set_dual_mac_config_response_event_fixed_param, wmi_soc_set_dual_mac_config_response_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID); +/* PDEV Set Dual MAC Config Response event */ +#define WMITLV_TABLE_WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param, wmi_pdev_set_mac_config_response_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID); + /* Packet Filter configure command*/ #define WMITLV_TABLE_WMI_PACKET_FILTER_CONFIG_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_packet_filter_config_fixed_param, WMI_PACKET_FILTER_CONFIG_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index f863444f8534..9c31e1c9e903 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -327,6 +327,17 @@ typedef enum { /* Set to enable MIB stats collection */ WMI_MIB_STATS_ENABLE_CMDID, + /** Set preferred channel list for DBS Mgr */ + WMI_PDEV_SET_PCL_CMDID, + /** Set HW mode. Eg: single MAC, DBS & SBS, + * see soc_hw_mode_t for values + */ + WMI_PDEV_SET_HW_MODE_CMDID, + /** Set DFS, SCAN modes and other FW configurations */ + WMI_PDEV_SET_MAC_CONFIG_CMDID, + /** Set per band and per pdev antenna chains */ + WMI_PDEV_SET_ANTENNA_MODE_CMDID, + /* VDEV(virtual device) specific commands */ /** vdev create */ WMI_VDEV_CREATE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_VDEV), @@ -375,6 +386,9 @@ typedef enum { * (smart mesh selective listening) */ WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID, + /** set quiet ie parameters. primarily used in AP mode */ + WMI_VDEV_SET_QUIET_MODE_CMDID, + /* peer specific commands */ /** create a peer */ @@ -994,6 +1008,12 @@ typedef enum { /** NF Cal Power in DBR/DBM for all channels */ WMI_PDEV_NFCAL_POWER_ALL_CHANNELS_EVENTID, + + /** SOC/PDEV events */ + WMI_PDEV_SET_HW_MODE_RESP_EVENTID, + WMI_PDEV_HW_MODE_TRANSITION_EVENTID, + WMI_PDEV_SET_MAC_CONFIG_RESP_EVENTID, + /* VDEV specific events */ /** VDEV started event in response to VDEV_START request */ WMI_VDEV_START_RESP_EVENTID = @@ -1712,6 +1732,15 @@ typedef struct _wmi_abi_version { */ #define HW_BD_INFO_SIZE 5 +/** + * PDEV ID to identify the physical device, + * value 0 reserved for SOC level commands/event + */ +#define WMI_PDEV_ID_SOC 0 /* SOC level, applicable to all PDEVs */ +#define WMI_PDEV_ID_1ST 1 /* first pdev (pdev 0) */ +#define WMI_PDEV_ID_2ND 2 /* second pdev (pdev 1) */ +#define WMI_PDEV_ID_3RD 3 /* third pdev (pdev 2) */ + /** * The following struct holds optional payload for * wmi_service_ready_event_fixed_param,e.g., 11ac pass some of the @@ -2919,13 +2948,23 @@ typedef struct { */ typedef struct { - A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_comb_phyerr_rx_hdr */ + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_comb_phyerr_rx_hdr + */ + A_UINT32 tlv_header; /** Phy error phy error count */ A_UINT32 num_phyerr_events; A_UINT32 tsf_l32; A_UINT32 tsf_u32; A_UINT32 buf_len; - A_UINT32 pmac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 pmac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; A_UINT32 rsPhyErrMask0; /* see WMI_PHY_ERROR_MASK0 */ A_UINT32 rsPhyErrMask1; /* see WMI_PHY_ERROR_MASK1 */ A_UINT32 rsPhyErrMask2; /* see WMI_PHY_ERROR_MASK2 */ @@ -2991,10 +3030,14 @@ typedef struct { } wmi_echo_cmd_fixed_param; typedef struct { - A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_regdomain_cmd_fixed_param */ - - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_regdomain_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /** reg domain code */ A_UINT32 reg_domain; A_UINT32 reg_domain_2G; @@ -3081,6 +3124,18 @@ typedef struct { A_UINT32 enabled; /*enable/disable */ } wmi_pdev_set_quiet_cmd_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_vdev_set_quiet_cmd_fixed_param + */ + A_UINT32 tlv_header; + A_UINT32 vdev_id; /* Virtual interface ID */ + A_UINT32 period; /* period in TUs */ + A_UINT32 duration; /* duration in TUs */ + A_UINT32 next_start; /* offset in TUs */ + A_UINT32 enabled; /* enable/disable */ +} wmi_vdev_set_quiet_cmd_fixed_param; + /* * Command to enable/disable Green AP Power Save. * This helps conserve power during AP operation. When the AP has no @@ -3089,14 +3144,19 @@ typedef struct { * chains. */ typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_green_ap_ps_enable_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_green_ap_ps_enable_cmd_fixed_param */ - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; A_UINT32 enable; /*1:enable, 0:disable */ } wmi_pdev_green_ap_ps_enable_cmd_fixed_param; #define MAX_HT_IE_LEN 32 +/* DEPRECATED */ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_ht_ie_cmd_fixed_param */ @@ -3111,6 +3171,7 @@ typedef struct { } wmi_pdev_set_ht_ie_cmd_fixed_param; #define MAX_VHT_IE_LEN 32 +/* DEPRECATED */ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_vht_ie_cmd_fixed_param */ @@ -3125,10 +3186,14 @@ typedef struct { } wmi_pdev_set_vht_ie_cmd_fixed_param; typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_base_macaddr_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_base_macaddr_cmd_fixed_param */ - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; wmi_mac_addr base_macaddr; } wmi_pdev_set_base_macaddr_cmd_fixed_param; @@ -3321,9 +3386,9 @@ typedef enum { /** Enable/Disable LED */ WMI_PDEV_PARAM_LED_ENABLE, /** set DIRECT AUDIO time latency */ - WMI_PDEV_PARAM_AUDIO_OVER_WLAN_LATENCY, + WMI_PDEV_PARAM_AUDIO_OVER_WLAN_LATENCY, /* DEPRECATED */ /** set DIRECT AUDIO Feature ENABLE */ - WMI_PDEV_PARAM_AUDIO_OVER_WLAN_ENABLE, + WMI_PDEV_PARAM_AUDIO_OVER_WLAN_ENABLE, /* DEPRECATED */ /** pdev level whal mib stats update enable */ WMI_PDEV_PARAM_WHAL_MIB_STATS_UPDATE_ENABLE, /** ht/vht info based on vdev */ @@ -3519,10 +3584,14 @@ typedef enum { } WMI_CTS_CBW; typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_param_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_param_cmd_fixed_param */ - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /** parameter id */ A_UINT32 param_id; /** parametr value */ @@ -3530,10 +3599,14 @@ typedef struct { } wmi_pdev_set_param_cmd_fixed_param; typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_get_tpc_config_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_get_tpc_config_cmd_fixed_param */ - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /** parameter */ A_UINT32 param; } wmi_pdev_get_tpc_config_cmd_fixed_param; @@ -3542,10 +3615,24 @@ typedef struct { #define WMI_SLOW_DIVERSITY_BIT_OFFSET 1 typedef struct { - A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_antenna_diversity_cmd_fixed_param */ - A_UINT32 mac_id; /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_antenna_diversity_cmd_fixed_param + */ + A_UINT32 tlv_header; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; /** parameter */ - A_UINT32 value; /** bit0 is for enable/disable FAST diversity, and bit1 is for enable/disable SLOW diversity, 0->disable, 1->enable */ + /** bit0 is for enable/disable FAST diversity, + * and bit1 is for enable/disable SLOW diversity, + * 0->disable, 1->enable + */ + A_UINT32 value; } wmi_pdev_set_antenna_diversity_cmd_fixed_param; #define WMI_MAX_RSSI_THRESHOLD_SUPPORTED 3 @@ -3657,7 +3744,10 @@ typedef enum { } WMI_TPC_CONFIG_EVENT_FLAG; typedef struct { - A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_tpc_config_event_fixed_param */ + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_tpc_config_event_fixed_param + */ + A_UINT32 tlv_header; A_UINT32 regDomain; A_UINT32 chanFreq; A_UINT32 phyMode; @@ -3669,7 +3759,9 @@ typedef struct { A_UINT32 numTxChain; A_UINT32 ctl; A_UINT32 flags; - /* WMI_TPC_TX_NUM_CHAIN macro can't be changed without breaking the WMI compatibility */ + /* WMI_TPC_TX_NUM_CHAIN macro can't be changed without + * breaking the WMI compatibility + */ A_INT8 maxRegAllowedPower[WMI_TPC_TX_NUM_CHAIN]; A_INT8 maxRegAllowedPowerAGCDD[WMI_TPC_TX_NUM_CHAIN] @@ -3680,6 +3772,10 @@ typedef struct { A_INT8 maxRegAllowedPowerAGTXBF[WMI_TPC_TX_NUM_CHAIN] [WMI_TPC_TX_NUM_CHAIN]; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /* This TLV is followed by a byte array: * A_UINT8 ratesArray[]; */ @@ -3694,6 +3790,10 @@ typedef struct { A_UINT32 L1Entry; A_UINT32 L11Entry; A_UINT32 L12Entry; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_l1ss_track_event_fixed_param; typedef struct { @@ -3748,17 +3848,26 @@ typedef enum { } WMI_PKTLOG_EVENT; typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_pktlog_enable_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_pktlog_enable_cmd_fixed_param */ - A_UINT32 reserved0; - /** placeholder for pdev_id of future multiple MAC products. Init. to 0. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; WMI_PKTLOG_EVENT evlist; } wmi_pdev_pktlog_enable_cmd_fixed_param; typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_pktlog_disable_cmd_fixed_param + */ A_UINT32 tlv_header; - /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_pktlog_disable_cmd_fixed_param */ - A_UINT32 reserved0; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_pktlog_disable_cmd_fixed_param; typedef struct { @@ -3767,8 +3876,10 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_mib_stats_enable_cmd_fixed_param */ A_UINT32 tlv_header; - /** placeholder for pdev_id of multiple MAC products. Init. to 0. */ - A_UINT32 reserved0; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /* * enable for mib stats collection. * Stats are delivered to host in wmi_mib_stats structure. @@ -3821,6 +3932,10 @@ typedef struct { * the WMI_PDEV_SET_DSCP_TID_MAP_CMDID id. * */ + +/* DEPRECATED - use VDEV level command instead + * (wmi_vdev_set_dscp_tid_map_cmd_fixed_param) + */ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_dscp_tid_map_cmd_fixed_param */ @@ -3910,6 +4025,9 @@ typedef struct { A_UINT32 no_ack; } wmi_wmm_params; +/* DEPRECATED - use VDEV level command instead + * (wmi_vdev_set_wmm_params_cmd_fixed_param) + */ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_wmm_params_cmd_fixed_param */ @@ -4790,6 +4908,8 @@ typedef struct { #define WMI_CIPHER_CKIP 0x6 #define WMI_CIPHER_AES_CMAC 0x7 #define WMI_CIPHER_ANY 0x8 +#define WMI_CIPHER_AES_GCM 0x9 +#define WMI_CIPHER_AES_GMAC 0xa typedef struct { A_UINT32 tlv_header; @@ -5163,8 +5283,78 @@ typedef enum { /** Disable station kickout at Vap level */ WMI_VDEV_PARAM_STA_KICKOUT, + /* VDEV capabilities */ + WMI_VDEV_PARAM_CAPABILITIES, /* see capabilities defs below */ } WMI_VDEV_PARAM; +/* vdev capabilities bit mask */ +#define WMI_VDEV_BEACON_SUPPORT 0x1 +#define WMI_VDEV_WDS_LRN_ENABLED 0x2 +#define WMI_VDEV_IS_BEACON_SUPPORTED(param) ((param) & WMI_VDEV_BEACON_SUPPORT) +#define WMI_VDEV_IS_WDS_LRN_ENABLED(param) ((param) & WMI_VDEV_WDS_LRN_ENABLED) + +/* TXBF capabilities masks */ +#define WMI_TXBF_CONF_SU_TX_BFEE_S 0 +#define WMI_TXBF_CONF_SU_TX_BFEE_M 0x1 +#define WMI_TXBF_CONF_SU_TX_BFEE (WMI_TXBF_CONF_SU_TX_BFEE_M << \ + WMI_TXBF_CONF_SU_TX_BFEE_S) +#define WMI_TXBF_CONF_SU_TX_BFEE_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_SU_TX_BFEE) +#define WMI_TXBF_CONF_SU_TX_BFEE_SET(x, z) WMI_F_RMW(x, z,\ + WMI_TXBF_CONF_SU_TX_BFEE) + +#define WMI_TXBF_CONF_MU_TX_BFEE_S 1 +#define WMI_TXBF_CONF_MU_TX_BFEE_M 0x1 +#define WMI_TXBF_CONF_MU_TX_BFEE (WMI_TXBF_CONF_MU_TX_BFEE_M << \ + WMI_TXBF_CONF_MU_TX_BFEE_S) +#define WMI_TXBF_CONF_MU_TX_BFEE_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_MU_TX_BFEE) +#define WMI_TXBF_CONF_MU_TX_BFEE_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_MU_TX_BFEE) + +#define WMI_TXBF_CONF_SU_TX_BFER_S 2 +#define WMI_TXBF_CONF_SU_TX_BFER_M 0x1 +#define WMI_TXBF_CONF_SU_TX_BFER (WMI_TXBF_CONF_SU_TX_BFER_M << \ + WMI_TXBF_CONF_SU_TX_BFER_S) +#define WMI_TXBF_CONF_SU_TX_BFER_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_SU_TX_BFER) +#define WMI_TXBF_CONF_SU_TX_BFER_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_SU_TX_BFER) + +#define WMI_TXBF_CONF_MU_TX_BFER_S 3 +#define WMI_TXBF_CONF_MU_TX_BFER_M 0x1 +#define WMI_TXBF_CONF_MU_TX_BFER (WMI_TXBF_CONF_MU_TX_BFER_M << \ + WMI_TXBF_CONF_MU_TX_BFER_S) +#define WMI_TXBF_CONF_MU_TX_BFER_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_MU_TX_BFER) +#define WMI_TXBF_CONF_MU_TX_BFER_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_MU_TX_BFER) + +#define WMI_TXBF_CONF_STS_CAP_S 4 +#define WMI_TXBF_CONF_STS_CAP_M 0x7 +#define WMI_TXBF_CONF_STS_CAP (WMI_TXBF_CONF_STS_CAP_M << \ + WMI_TXBF_CONF_STS_CAP_S) +#define WMI_TXBF_CONF_STS_CAP_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_STS_CAP); +#define WMI_TXBF_CONF_STS_CAP_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_STS_CAP) + +#define WMI_TXBF_CONF_IMPLICIT_BF_S 7 +#define WMI_TXBF_CONF_IMPLICIT_BF_M 0x1 +#define WMI_TXBF_CONF_IMPLICIT_BF (WMI_TXBF_CONF_IMPLICIT_BF_M << \ + WMI_TXBF_CONF_IMPLICIT_BF_S) +#define WMI_TXBF_CONF_IMPLICIT_BF_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_IMPLICIT_BF) +#define WMI_TXBF_CONF_IMPLICIT_BF_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_IMPLICIT_BF) + +#define WMI_TXBF_CONF_BF_SND_DIM_S 8 +#define WMI_TXBF_CONF_BF_SND_DIM_M 0x7 +#define WMI_TXBF_CONF_BF_SND_DIM (WMI_TXBF_CONF_BF_SND_DIM_M << \ + WMI_TXBF_CONF_BF_SND_DIM_S) +#define WMI_TXBF_CONF_BF_SND_DIM_GET(x) WMI_F_MS(x, WMI_TXBF_CONF_BF_SND_DIM) +#define WMI_TXBF_CONF_BF_SND_DIM_SET(x, z) WMI_F_RMW(x, z, \ + WMI_TXBF_CONF_BF_SND_DIM) + +/* TXBF capabilities */ +typedef struct { + A_UINT32 txbf_cap; +} wmi_vdev_txbf_cap; + /* Length of ATIM Window in TU */ #define WMI_VDEV_PARAM_ATIM_WINDOW_LENGTH WMI_VDEV_PARAM_ATIM_WINDOW @@ -5174,6 +5364,11 @@ enum wmi_pkt_type { WMI_PKT_TYPE_ETHERNET = 2, }; +/******************************************************************* + * wmi_vdev_txbf_en is DEPRECATED in favor of wmi_vdev_txbf_cap + * Do not use it! + *******************************************************************/ + typedef struct { A_UINT8 sutxbfee:1, mutxbfee:1, sutxbfer:1, mutxbfer:1, #if defined(AR900B) @@ -5221,8 +5416,14 @@ typedef struct { A_UINT32 chain_mask; /** Vdev mimo power save mode */ A_UINT32 smps_mode; - /** mac_id field contains the MAC identifier that the VDEV is bound to. The valid range is 0 to (num_macs-1). */ - A_UINT32 mac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; /** Configured Transmit Streams **/ A_UINT32 cfgd_tx_streams; /** Configured Receive Streams **/ @@ -5727,8 +5928,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_ap_ps_egap_info_chainmask_list */ A_UINT32 tlv_header; - /** The param indicates a mac under dual-mac */ - A_UINT32 mac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; /** The param indicates the current tx chainmask with the mac id. */ A_UINT32 tx_chainmask; /** The param indicates the current rx chainmask with the mac id. */ @@ -6444,12 +6651,14 @@ typedef struct { wmi_mac_addr wds_macaddr; /* Flags associated with WDS entry - see WMI_WDS_FLAG defs */ A_UINT32 flags; + A_UINT32 vdev_id; } wmi_peer_add_wds_entry_cmd_fixed_param; typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_peer_remove_wds_entry_cmd_fixed_param */ /** wds MAC addr */ wmi_mac_addr wds_macaddr; + A_UINT32 vdev_id; } wmi_peer_remove_wds_entry_cmd_fixed_param; typedef struct { @@ -6479,6 +6688,7 @@ typedef struct { wmi_mac_addr wds_macaddr; /* Flags associated with WDS entry */ A_UINT32 flags; + A_UINT32 vdev_id; } wmi_peer_update_wds_entry_cmd_fixed_param; /** @@ -6513,13 +6723,18 @@ typedef struct { A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_ath_dcs_cw_int */ A_UINT32 channel; /* either number or freq in mhz */ -} ath_dcs_cw_int; +} wlan_dcs_cw_int; +#define ath_dcs_cw_int /* DEPRECATED */ wlan_dcs_cw_int /* alias */ /** * wlan_dcs_im_tgt_stats * */ typedef struct _wlan_dcs_im_tgt_stats { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wlan_dcs_im_tgt_stats_t + */ + A_UINT32 tlv_header; /** current running TSF from the TSF-1 */ A_UINT32 reg_tsf32; @@ -6593,10 +6808,12 @@ typedef struct { * Following this struct are these TLVs. Note that they are both array of structures * but can have at most one element. Which TLV is empty or has one element depends * on the field interference_type. This is to emulate an union with cw_int and wlan_stat - * elements (not arrays). union { ath_dcs_cw_int cw_int; wlan_dcs_im_tgt_stats_t wlan_stat; } int_event; + * elements (not arrays). union { wlan_dcs_cw_int cw_int; + * wlan_dcs_im_tgt_stats_t wlan_stat; } + * int_event; * * //cw_interference event - * ath_dcs_cw_int cw_int[]; this element + * wlan_dcs_cw_int cw_int[]; this element * // wlan im interfernce stats * wlan_dcs_im_tgt_stats_t wlan_stat[]; */ @@ -8166,6 +8383,10 @@ typedef struct { /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_ftm_intg_cmd_fixed_param */ A_UINT32 num_data; /** length in byte of data[]. */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /* This structure is used to send Factory Test Mode [FTM] command * from host to firmware for integrated chips which are binary blobs. * Following this structure is the TLV: @@ -9163,16 +9384,20 @@ typedef struct { A_UINT32 ac; } wmi_vdev_wmm_delts_cmd_fixed_param; +/* DEPRECATED */ typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_dfs_enable_cmd_fixed_param */ /** Reserved for future use */ A_UINT32 reserved0; } wmi_pdev_dfs_enable_cmd_fixed_param; +/* DEPRECATED */ typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_dfs_disable_cmd_fixed_param */ - /** Reserved for future use */ - A_UINT32 reserved0; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_dfs_disable_cmd_fixed_param; typedef struct { @@ -9180,9 +9405,10 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_dfs_phyerr_filter_ena_cmd_fixed_param */ A_UINT32 tlv_header; - - /** Reserved for future use */ - A_UINT32 reserved0; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_dfs_phyerr_filter_ena_cmd_fixed_param; typedef struct { @@ -9507,8 +9733,14 @@ typedef struct { */ A_UINT32 enable; /** This field contains the MAC identifier in order to lookup the appropriate OCS instance. */ - /** The valid range is 0 to (num_macs-1). */ - A_UINT32 mac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; } wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param; /* WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID */ @@ -10005,7 +10237,7 @@ typedef enum { typedef struct { /** TLV tag and len; tag equals - * WMITLV_TAG_STRUC_wmi_peer_info_req_cmd_fixed_param */ + * WMITLV_TAG_STRUC_wmi_pdev_set_led_config_cmd_fixed_param */ A_UINT32 tlv_header; /* Set GPIO pin */ A_UINT32 led_gpio_pin; @@ -10015,6 +10247,10 @@ typedef struct { A_UINT32 with_bt; /* Set LED enablement defined in wmi_config_led_enable_flag */ A_UINT32 led_enable; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_set_led_config_cmd_fixed_param; #define WMI_WNTS_CFG_GPIO_PIN_NUM_OFFSET 0 @@ -10057,6 +10293,10 @@ typedef struct { A_UINT32 tlv_header; /** number of peers in peer_info */ A_UINT32 num_peers; + /* Set to 1 only if vdev_id field is valid */ + A_UINT32 valid_vdev_id; + /* VDEV to which the peer belongs to */ + A_UINT32 vdev_id; /* This TLV is followed by another TLV of array of structs * wmi_peer_info peer_info[]; */ @@ -10243,8 +10483,14 @@ typedef struct { /** For 4-byte aligment padding */ A_UINT8 reserved; - /** pmac_id for the radar event */ - A_UINT8 pmac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT8 pmac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT8 pdev_id; + }; /** index of peak magnitude bin (signed) */ A_INT32 peak_sidx; @@ -11118,6 +11364,10 @@ typedef struct { A_UINT32 tlv_header; /** MAC address of the peer for which the estimated link speed is required. */ wmi_mac_addr peer_macaddr; + /* Set to 1 only if vdev_id field is valid */ + A_UINT32 valid_vdev_id; + /* VDEV to which the peer belongs to */ + A_UINT32 vdev_id; } wmi_peer_get_estimated_linkspeed_cmd_fixed_param; typedef struct { @@ -11130,6 +11380,10 @@ typedef struct { * When est_linkspeed_kbps is not valid, the value is set to WMI_PEER_ESTIMATED_LINKSPEED_INVALID. */ A_UINT32 est_linkspeed_kbps; + /* Set to 1 only if vdev_id field is valid */ + A_UINT32 valid_vdev_id; + /* VDEV to which the peer belongs to */ + A_UINT32 vdev_id; } wmi_peer_estimated_linkspeed_event_fixed_param; typedef struct { @@ -12066,8 +12320,14 @@ typedef struct { /** WMI_PDEV_RESUME_EVENTID : generated in response to WMI_PDEV_RESUME_CMDID */ typedef struct { - A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_resume_event_fixed_param */ - A_UINT32 rsvd; /* for future need */ + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_resume_event_fixed_param + */ + A_UINT32 tlv_header; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_resume_event_fixed_param; /** value representing all modules */ @@ -12152,11 +12412,19 @@ typedef struct { typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_get_temperature_cmd_fixed_param */ A_UINT32 param; /* Reserved for future use */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_get_temperature_cmd_fixed_param; typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_temperature_event_fixed_param */ A_INT32 value; /* temprature value in Celcius degree */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_temperature_event_fixed_param; typedef struct { @@ -13253,6 +13521,7 @@ typedef struct { */ } wmi_vdev_set_ie_cmd_fixed_param; +/* DEPRECATED - use wmi_pdev_set_pcl_cmd_fixed_param instead */ typedef struct { /* * TLV tag and len; tag equals @@ -13270,6 +13539,30 @@ typedef struct { */ } wmi_soc_set_pcl_cmd_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_pcl_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** Set Preferred Channel List **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /** # of channels to scan */ + A_UINT32 num_chan; + /** + * TLV (tag length value ) parameters follow the wmi_soc_set_pcl_cmd + * structure. The TLV's are: + * A_UINT32 channel_weight[]; + * channel order & size will be as per the list provided + * in WMI_SCAN_CHAN_LIST_CMDID + **/ +} wmi_pdev_set_pcl_cmd_fixed_param; + +/* DEPRECATED - use wmi_pdev_set_hw_mode_cmd_fixed_param instead */ typedef struct { /* TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_soc_set_hw_mode_cmd_fixed_param @@ -13280,6 +13573,23 @@ typedef struct { A_UINT32 hw_mode_index; } wmi_soc_set_hw_mode_cmd_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** Set Hardware Mode **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Hardware Mode Index */ + A_UINT32 hw_mode_index; +} wmi_pdev_set_hw_mode_cmd_fixed_param; + +/* DEPRECATED - use wmi_pdev_set_mac_config_cmd_fixed_param instead */ typedef struct { /* * TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_soc_set_dual_mac_config_cmd_fixed_param @@ -13294,6 +13604,24 @@ typedef struct { } wmi_soc_set_dual_mac_config_cmd_fixed_param; typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_cmd_fixed_param + */ + A_UINT32 tlv_header; + /** Set Dual MAC Firmware Configuration **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Concurrent scan configuration bits */ + A_UINT32 concurrent_scan_config_bits; + /* Firmware mode configuration bits */ + A_UINT32 fw_mode_config_bits; +} wmi_pdev_set_mac_config_cmd_fixed_param; + +typedef struct { /* DEPRECATED */ A_UINT32 num_tx_chains; A_UINT32 num_rx_chains; A_UINT32 reserved[2]; @@ -13317,6 +13645,7 @@ typedef enum { /* reserved */ } antenna_mode_reason; +/* DEPRECATED - use wmi_pdev_set_antenna_mode_cmd_fixed_param instead */ typedef struct { /* * TLV tag and len; @@ -13334,8 +13663,25 @@ typedef struct { antenna_num_tx_rx_chains num_txrx_chains_setting; } wmi_soc_set_antenna_mode_cmd_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_antenna_mode_cmd_fixed_param + */ + A_UINT32 tlv_header; + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Bits 0-15 is the number of RX chains and + * 16-31 is the number of TX chains + */ + A_UINT32 num_txrx_chains; +} wmi_pdev_set_antenna_mode_cmd_fixed_param; /** Data structure for information specific to a VDEV to MAC mapping. */ +/* DEPRECATED - use wmi_pdev_set_hw_mode_response_vdev_mac_entry instead */ typedef struct { /* * TLV tag and len; tag equals @@ -13345,6 +13691,21 @@ typedef struct { A_UINT32 mac_id; /* MAC ID */ } wmi_soc_set_hw_mode_response_vdev_mac_entry; +/** Data structure for information specific to a VDEV to MAC mapping. */ +typedef struct { + /** TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_vdev_mac_entry */ + A_UINT32 tlv_header; + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + A_UINT32 vdev_id; +} wmi_pdev_set_hw_mode_response_vdev_mac_entry; + +/* DEPRECATED - use wmi_pdev_set_hw_mode_response_event_fixed_param instead */ typedef struct { /* TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_soc_set_hw_mode_response_event_fixed_param @@ -13373,6 +13734,42 @@ typedef struct { */ } wmi_soc_set_hw_mode_response_event_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_event_fixed_param + */ + A_UINT32 tlv_header; + /** Set Hardware Mode Response Event **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Status of set_hw_mode command */ + /* + * Values for Status: + * 0 - OK; command successful + * 1 - EINVAL; Requested invalid hw_mode + * 2 - ECANCELED; HW mode change canceled + * 3 - ENOTSUP; HW mode not supported + * 4 - EHARDWARE; HW mode change prevented by hardware + * 5 - EPENDING; HW mode change is pending + * 6 - ECOEX; HW mode change conflict with Coex + */ + A_UINT32 status; + /* Configured Hardware Mode */ + A_UINT32 cfgd_hw_mode_index; + /* Number of Vdev to Mac entries */ + A_UINT32 num_vdev_mac_entries; + /** + * TLV (tag length value ) parameters follow the + * soc_set_hw_mode_response_event structure. The TLV's are: + * A_UINT32 wmi_soc_set_hw_mode_response_vdev_mac_entry[]; + */ +} wmi_pdev_set_hw_mode_response_event_fixed_param; + +/* DEPRECATED - use wmi_pdev_hw_mode_transition_event_fixed_param instead */ typedef struct { /* * TLV tag and len; tag equals @@ -13394,7 +13791,35 @@ typedef struct { */ } wmi_soc_hw_mode_transition_event_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_hw_mode_transition_event_fixed_param + */ + A_UINT32 tlv_header; + /** Hardware Mode Transition Event **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Original or old Hardware mode */ + A_UINT32 old_hw_mode_index; + /* New Hardware Mode */ + A_UINT32 new_hw_mode_index; + /* Number of Vdev to Mac entries */ + A_UINT32 num_vdev_mac_entries; + + /** + * TLV (tag length value ) parameters follow the + * soc_set_hw_mode_response_event structure. The TLV's are: + * A_UINT32 wmi_soc_set_hw_mode_response_vdev_mac_entry[]; + */ +} wmi_pdev_hw_mode_transition_event_fixed_param; +/* DEPRECATED - use wmi_pdev_set_mac_config_response_event_fixed_param + * instead + */ typedef struct { /* * TLV tag and len; tag equals @@ -13415,6 +13840,30 @@ typedef struct { A_UINT32 status; } wmi_soc_set_dual_mac_config_response_event_fixed_param; +typedef struct { + /* TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param + */ + A_UINT32 tlv_header; + /** Set Dual MAC Config Response Event **/ + + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + + /* Status for set_dual_mac_config command */ + /* + * Values for Status: + * 0 - OK; command successful + * 1 - EINVAL; Requested invalid hw_mode + * 3 - ENOTSUP; HW mode not supported + * 4 - EHARDWARE; HW mode change prevented by hardware + * 6 - ECOEX; HW mode change conflict with Coex + */ + A_UINT32 status; +} wmi_pdev_set_mac_config_response_event_fixed_param; + typedef enum { MAWC_MOTION_STATE_UNKNOWN, MAWC_MOTION_STATE_STATIONARY, @@ -13931,7 +14380,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_fips_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; A_UINT32 fips_cmd; /* FIPS_ENCRYPT or FIPS_DECRYPT */ /* FIPS_ENGINE_AES_CTR or FIPS_ENGINE_AES_MIC */ A_UINT32 mode; @@ -13951,7 +14407,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_smart_ant_enable_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; A_UINT32 enable; /* 1:enable, 0:disable */ /* 1:GPIO parallel mode, 0:GPIO serial mode */ A_UINT32 mode; @@ -13973,6 +14436,10 @@ typedef struct { /* For serial: index 0-strobe index 1-data, For Parallel: per stream */ A_UINT32 gpio_pin; A_UINT32 gpio_func; /* GPIO function values for Smart Antenna */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_smart_ant_gpio_handle; typedef struct { @@ -13981,7 +14448,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; A_UINT32 rx_antenna; } wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param; @@ -13992,7 +14466,7 @@ typedef struct { */ A_UINT32 tlv_header; /** unique id identifying the vdev, generated by the caller */ - A_UINT32 vdev_id; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ /** peer MAC address */ wmi_mac_addr peer_macaddr; /* @@ -14033,7 +14507,7 @@ typedef struct { */ A_UINT32 tlv_header; /** unique id identifying the VDEV, generated by the caller */ - A_UINT32 vdev_id; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ /** peer MAC address */ wmi_mac_addr peer_macaddr; /* num packets; 0-stop training */ @@ -14051,7 +14525,7 @@ typedef struct { */ A_UINT32 tlv_header; /** unique id identifying the vdev, generated by the caller */ - A_UINT32 vdev_id; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ /** peer MAC address */ wmi_mac_addr peer_macaddr; /* command id*/ @@ -14071,6 +14545,10 @@ typedef struct { */ A_UINT32 tlv_header; A_UINT32 antCtrlChain; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; } wmi_pdev_set_ant_ctrl_chain; typedef struct { @@ -14093,7 +14571,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_set_ctl_table_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; /** len of CTL info */ A_UINT32 ctl_len; /* ctl array (len adjusted to number of words) @@ -14108,7 +14593,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_set_mimogain_table_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; A_UINT32 mimogain_info; /* see WMI_MIMOGAIN macros */ /* * Bit 7:0 len of array gain table @@ -14190,7 +14682,10 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_get_ani_cck_config_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /** parameter */ A_UINT32 param; } wmi_pdev_get_ani_cck_config_cmd_fixed_param; @@ -14201,7 +14696,10 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_get_ani_ofdm_config_cmd_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; /** parameter */ A_UINT32 param; } wmi_pdev_get_ani_ofdm_config_cmd_fixed_param; @@ -14212,7 +14710,7 @@ typedef struct { * WMITLV_TAG_STRUC_WMI_QBOOST_CFG_CMD_fixed_param */ A_UINT32 tlv_header; - A_UINT32 vdev_id; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ A_UINT32 qb_enable; wmi_mac_addr peer_macaddr; } WMI_QBOOST_CFG_CMD_fixed_param; @@ -14228,6 +14726,7 @@ typedef struct { A_UINT32 iRSSI; /* dBm above the noise floor */ /* peer MAC address */ wmi_mac_addr peer_macaddr; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ } wmi_inst_rssi_stats_resp_fixed_param; typedef struct { @@ -14258,6 +14757,7 @@ typedef struct { A_UINT32 tlv_header; wmi_mac_addr peer_macaddr; A_UINT32 ratecount; /* Max Rate count for each mode */ + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ /* * Following this structure are the TLV * struct wmi_peer_cck_ofdm_rate_info; @@ -14274,6 +14774,7 @@ typedef struct wmi_wds_addr_event { A_UINT32 event_type[4]; wmi_mac_addr peer_mac; wmi_mac_addr dest_mac; + A_UINT32 vdev_id; /* ID of the vdev this peer belongs to */ } wmi_wds_addr_event_fixed_param; typedef struct { @@ -14293,7 +14794,14 @@ typedef struct { * WMITLV_TAG_STRUC_wmi_pdev_fips_event_fixed_param */ A_UINT32 tlv_header; - A_UINT32 mac_id; /* MAC ID */ + union { + /* OBSOLETE - will be removed once all refs are gone */ + A_UINT32 mac_id; + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; + }; /* Error status: 0 (no err), 1, or OPER_TIMEOUT */ A_UINT32 error_status; A_UINT32 data_len; /* Data length */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 083a9e52b243..3e79cf5d8762 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 209 +#define __WMI_REVISION_ 210 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 3c443556a9bc2709512fb72bac7314324d5ec2a5 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Fri, 19 Feb 2016 18:34:40 -0800 Subject: qcacld-3.0: Rename enumeration associated with scan types qcacld-2.0 to qcacld-3.0 propagation. Rename enumeration associated with scan types. WMI interface files shared between host and Firmware have the same macro defined resulting in compilaiton issue. Hence renaming these enumeration with LIM prefix. Change-Id: Ia196b8e4bb582490a9f957b8cdf1e3a12c4fbde0 CRs-Fixed: 981355 --- core/mac/inc/sir_api.h | 36 ++++++++++++++-------- core/mac/src/pe/include/lim_ft.h | 2 +- core/mac/src/pe/lim/lim_ft.c | 8 ++--- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 14 ++++----- core/wma/src/wma_scan_roam.c | 7 +++-- 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 91deff13aea8..c9a60954aba6 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3584,20 +3584,32 @@ typedef struct sSirScanOffloadReq { -----------------------------*/ } tSirScanOffloadReq, *tpSirScanOffloadReq; -typedef enum sSirScanEventType { - SCAN_EVENT_STARTED = 0x1, /* Scan command accepted by FW */ - SCAN_EVENT_COMPLETED = 0x2, /* Scan has been completed by FW */ - SCAN_EVENT_BSS_CHANNEL = 0x4, /* FW is going to move to HOME ch */ - SCAN_EVENT_FOREIGN_CHANNEL = 0x8, /* FW going to move to FORIEGN ch */ - SCAN_EVENT_DEQUEUED = 0x10, /* scan request got dequeued */ - SCAN_EVENT_PREEMPTED = 0x20, /* preempted by high priority scan */ - SCAN_EVENT_START_FAILED = 0x40, /* scan start failed */ - SCAN_EVENT_RESTARTED = 0x80, /*scan restarted */ - SCAN_EVENT_MAX = 0x8000 -} tSirScanEventType; +/** + * lim_scan_event_type - scan event types used in LIM + * @LIM_SCAN_EVENT_STARTED - scan command accepted by FW + * @LIM_SCAN_EVENT_COMPLETED - scan has been completed by FW + * @LIM_SCAN_EVENT_BSS_CHANNEL - FW is going to move to HOME channel + * @LIM_SCAN_EVENT_FOREIGN_CHANNEL - FW is going to move to FORIEGN channel + * @LIM_SCAN_EVENT_DEQUEUED - scan request got dequeued + * @LIM_SCAN_EVENT_PREEMPTED - preempted by other high priority scan + * @LIM_SCAN_EVENT_START_FAILED - scan start failed + * @LIM_SCAN_EVENT_RESTARTED - scan restarted + * @LIM_SCAN_EVENT_MAX - max value for event type +*/ +enum lim_scan_event_type { + LIM_SCAN_EVENT_STARTED = 0x1, + LIM_SCAN_EVENT_COMPLETED = 0x2, + LIM_SCAN_EVENT_BSS_CHANNEL = 0x4, + LIM_SCAN_EVENT_FOREIGN_CHANNEL = 0x8, + LIM_SCAN_EVENT_DEQUEUED = 0x10, + LIM_SCAN_EVENT_PREEMPTED = 0x20, + LIM_SCAN_EVENT_START_FAILED = 0x40, + LIM_SCAN_EVENT_RESTARTED = 0x80, + LIM_SCAN_EVENT_MAX = 0x8000 +}; typedef struct sSirScanOffloadEvent { - tSirScanEventType event; + enum lim_scan_event_type event; tSirResultCodes reasonCode; uint32_t chanFreq; uint32_t requestor; diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index eccc869d95dc..9c8dd36a2baf 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -63,7 +63,7 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, tpPESession psessionEntry); void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal pMac); void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - tSirScanEventType event, + enum lim_scan_event_type event, uint8_t session_id, uint32_t scan_id); tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index ee0116256fb1..98318ba6124a 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -1956,7 +1956,7 @@ QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, */ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - tSirScanEventType event, + enum lim_scan_event_type event, uint8_t session_id, uint32_t scan_id) { @@ -1970,14 +1970,14 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, } switch (event) { - case SCAN_EVENT_START_FAILED: + case LIM_SCAN_EVENT_START_FAILED: /* Scan command is rejected by firmware */ lim_log(mac_ctx, LOGE, FL("Failed to start preauth scan")); lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, session_entry); return; - case SCAN_EVENT_COMPLETED: + case LIM_SCAN_EVENT_COMPLETED: /* * Scan either completed succesfully or or got terminated * after successful auth, or timed out. Either way, STA @@ -1987,7 +1987,7 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, session_entry); break; - case SCAN_EVENT_FOREIGN_CHANNEL: + case LIM_SCAN_EVENT_FOREIGN_CHANNEL: /* Sta is on candidate channel. Send auth */ lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, session_entry); diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index ed6875cb1b06..546e76da279b 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -4158,10 +4158,10 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId, pScanEvent->requestor); switch (pScanEvent->event) { - case SCAN_EVENT_STARTED: + case LIM_SCAN_EVENT_STARTED: break; - case SCAN_EVENT_START_FAILED: - case SCAN_EVENT_COMPLETED: + case LIM_SCAN_EVENT_START_FAILED: + case LIM_SCAN_EVENT_COMPLETED: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { lim_send_sme_roc_rsp(pMac, eWNI_SME_REMAIN_ON_CHN_RSP, QDF_STATUS_SUCCESS, @@ -4189,7 +4189,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) lim_send_scan_offload_complete(pMac, pScanEvent); } break; - case SCAN_EVENT_FOREIGN_CHANNEL: + case LIM_SCAN_EVENT_FOREIGN_CHANNEL: if (ROC_SCAN_REQUESTOR_ID == pScanEvent->requestor) { /*Send Ready on channel indication to SME */ if (pMac->lim.gpLimRemainOnChanReq) { @@ -4208,9 +4208,9 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf) pScanEvent->scanId); } break; - case SCAN_EVENT_BSS_CHANNEL: - case SCAN_EVENT_DEQUEUED: - case SCAN_EVENT_PREEMPTED: + case LIM_SCAN_EVENT_BSS_CHANNEL: + case LIM_SCAN_EVENT_DEQUEUED: + case LIM_SCAN_EVENT_PREEMPTED: default: QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, "Received unhandled scan event %u", diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 9217ad1942c9..7889c078f23b 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -4092,7 +4092,7 @@ int wma_nlo_scan_cmp_evt_handler(void *handle, uint8_t *event, WIFI_POWER_EVENT_WAKELOCK_PNO); qdf_mem_zero(scan_event, sizeof(tSirScanOffloadEvent)); scan_event->reasonCode = eSIR_PNO_SCAN_SUCCESS; - scan_event->event = SCAN_EVENT_COMPLETED; + scan_event->event = LIM_SCAN_EVENT_COMPLETED; scan_event->sessionId = nlo_event->vdev_id; wma_send_msg(wma, WMA_RX_SCAN_EVENT, (void *)scan_event, 0); } else { @@ -6583,7 +6583,7 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, if (scan_event->scanId == wma_handle->interfaces[vdev_id].p2p_scan_info.scan_id) { scan_event->p2pScanType = P2P_SCAN_TYPE_LISTEN; - if (scan_event->event == SCAN_EVENT_COMPLETED) + if (scan_event->event == LIM_SCAN_EVENT_COMPLETED) wma_reset_p2p_scan_info(wma_handle, vdev_id); } scan_event->sessionId = vdev_id; @@ -6620,7 +6620,8 @@ int wma_scan_event_callback(WMA_HANDLE handle, uint8_t *data, } /* Stop scan completion timeout if event is WMI_SCAN_EVENT_COMPLETED */ - if (scan_event->event == (tSirScanEventType) WMI_SCAN_EVENT_COMPLETED) { + if (scan_event->event == + (enum lim_scan_event_type) WMI_SCAN_EVENT_COMPLETED) { WMA_LOGE("scan complete:scan_id 0x%x, requestor 0x%x, vdev %d", wmi_event->scan_id, wmi_event->requestor, vdev_id); } -- cgit v1.2.3 From d76a5b05cb291953f6aa5bfdb65d97db42e60cd6 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 15:12:14 +0530 Subject: qcacld-3.0: Adapt wma layer with common wmi layer Modify wmi layer API calls with respect to new common wmi layer. Register all wmi service events using standard wmi event register API. Remove TLV formation of common API from wma layer. Pass rx scheduling context of wmi events during event registration. CRs-Fixed: 976998 Change-Id: Id490db96c28778ec371dd633d43dfa002c08c16a --- core/utils/fwlog/dbglog_host.c | 84 +----- core/wma/inc/wma.h | 23 +- core/wma/inc/wma_api.h | 15 +- core/wma/inc/wma_internal.h | 37 +-- core/wma/src/wma_data.c | 26 +- core/wma/src/wma_dev_if.c | 579 ++++++++++------------------------------- core/wma/src/wma_features.c | 186 ++++--------- core/wma/src/wma_main.c | 424 ++++++++++++++++++------------ core/wma/src/wma_mgmt.c | 79 +++--- core/wma/src/wma_ocb.c | 15 +- core/wma/src/wma_power.c | 376 ++++++++++++-------------- core/wma/src/wma_scan_roam.c | 69 ++--- core/wma/src/wma_utils.c | 189 ++++---------- 13 files changed, 809 insertions(+), 1293 deletions(-) diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c index 977d0517e3a2..b233dc8f5d4a 100644 --- a/core/utils/fwlog/dbglog_host.c +++ b/core/utils/fwlog/dbglog_host.c @@ -79,11 +79,6 @@ module_dbg_print mod_print[WLAN_MODULE_ID_MAX]; A_UINT32 dbglog_process_type = DBGLOG_PROCESS_NET_RAW; -A_STATUS -wmi_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param, - A_UINT32 val, A_UINT32 *module_id_bitmap, - A_UINT32 bitmap_len); - const char *dbglog_get_module_str(A_UINT32 module_id) { switch (module_id) { @@ -1284,7 +1279,7 @@ int dbglog_module_log_enable(wmi_unified_t wmi_handle, A_UINT32 mod_id, /* set it to ERROR level */ WMI_DBGLOG_SET_LOG_LEVEL(val, DBGLOG_ERR); } - wmi_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, + wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, val, NULL, 0); return 0; @@ -1300,7 +1295,7 @@ int dbglog_vap_log_enable(wmi_unified_t wmi_handle, A_UINT16 vap_id, return -EINVAL; } - wmi_config_debug_module_cmd(wmi_handle, + wma_config_debug_module_cmd(wmi_handle, isenable ? WMI_DEBUG_LOG_PARAM_VDEV_ENABLE : WMI_DEBUG_LOG_PARAM_VDEV_DISABLE, vap_id, NULL, 0); @@ -1321,7 +1316,7 @@ int dbglog_set_log_lvl(wmi_unified_t wmi_handle, DBGLOG_LOG_LVL log_lvl) WMI_DBGLOG_SET_MODULE_ID(val, WMI_DEBUG_LOG_MODULE_ALL); WMI_DBGLOG_SET_LOG_LEVEL(val, log_lvl); - wmi_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, + wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, val, NULL, 0); return 0; @@ -1333,75 +1328,17 @@ int dbglog_set_mod_log_lvl(wmi_unified_t wmi_handle, A_UINT32 mod_log_lvl) /* set the global module level to log_lvl */ WMI_DBGLOG_SET_MODULE_ID(val, (mod_log_lvl / 10)); WMI_DBGLOG_SET_LOG_LEVEL(val, (mod_log_lvl % 10)); - wmi_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, + wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_LOG_LEVEL, val, NULL, 0); return 0; } -A_STATUS -wmi_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param, - A_UINT32 val, A_UINT32 *module_id_bitmap, - A_UINT32 bitmap_len) -{ - wmi_buf_t buf; - wmi_debug_log_config_cmd_fixed_param *configmsg; - A_STATUS status = A_OK; - int i; - int len; - int8_t *buf_ptr; - int32_t *module_id_bitmap_array; /* Used to fomr the second tlv */ - - ASSERT(bitmap_len < MAX_MODULE_ID_BITMAP_WORDS); - - /* Allocate size for 2 tlvs - including tlv hdr space for second tlv */ - len = sizeof(wmi_debug_log_config_cmd_fixed_param) + WMI_TLV_HDR_SIZE + - (sizeof(int32_t) * MAX_MODULE_ID_BITMAP_WORDS); - buf = wmi_buf_alloc(wmi_handle, len); - if (buf == NULL) - return A_NO_MEMORY; - - configmsg = - (wmi_debug_log_config_cmd_fixed_param *) (wmi_buf_data(buf)); - buf_ptr = (int8_t *) configmsg; - WMITLV_SET_HDR(&configmsg->tlv_header, - WMITLV_TAG_STRUC_wmi_debug_log_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_debug_log_config_cmd_fixed_param)); - configmsg->dbg_log_param = param; - configmsg->value = val; - /* Filling in the data part of second tlv -- should follow first tlv _ WMI_TLV_HDR_SIZE */ - module_id_bitmap_array = (A_UINT32 *) (buf_ptr + - sizeof - (wmi_debug_log_config_cmd_fixed_param) - + WMI_TLV_HDR_SIZE); - WMITLV_SET_HDR(buf_ptr + sizeof(wmi_debug_log_config_cmd_fixed_param), - WMITLV_TAG_ARRAY_UINT32, - sizeof(A_UINT32) * MAX_MODULE_ID_BITMAP_WORDS); - if (module_id_bitmap) { - for (i = 0; i < bitmap_len; ++i) { - module_id_bitmap_array[i] = module_id_bitmap[i]; - } - } - - AR_DEBUG_PRINTF(ATH_DEBUG_ERR, - ("wmi_dbg_cfg_send: param 0x%x val 0x%x \n ", param, - val)); - - status = wmi_unified_cmd_send(wmi_handle, buf, - len, WMI_DBGLOG_CFG_CMDID); - - if (status != A_OK) - qdf_nbuf_free(buf); - - return status; -} - void dbglog_set_vap_enable_bitmap(wmi_unified_t wmi_handle, A_UINT32 vap_enable_bitmap) { - wmi_config_debug_module_cmd(wmi_handle, + wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP, vap_enable_bitmap, NULL, 0); } @@ -1410,7 +1347,7 @@ void dbglog_set_mod_enable_bitmap(wmi_unified_t wmi_handle, A_UINT32 log_level, A_UINT32 *mod_enable_bitmap, A_UINT32 bitmap_len) { - wmi_config_debug_module_cmd(wmi_handle, + wma_config_debug_module_cmd(wmi_handle, WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP, log_level, mod_enable_bitmap, bitmap_len); } @@ -4408,20 +4345,23 @@ int dbglog_init(wmi_unified_t wmi_handle) res = wmi_unified_register_event_handler(wmi_handle, WMI_DEBUG_MESG_EVENTID, - dbglog_parse_debug_logs); + dbglog_parse_debug_logs, + WMA_RX_WORK_CTX); if (res != 0) return res; /* Register handler for FW diag events */ res = wmi_unified_register_event_handler(wmi_handle, WMI_DIAG_DATA_CONTAINER_EVENTID, - fw_diag_data_event_handler); + fw_diag_data_event_handler, + WMA_RX_SERIALIZER_CTX); if (res != 0) return res; /* Register handler for new FW diag Event, LOG, MSG combined */ res = wmi_unified_register_event_handler(wmi_handle, WMI_DIAG_EVENTID, - diag_fw_handler); + diag_fw_handler, + WMA_RX_SERIALIZER_CTX); if (res != 0) return res; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 7f25d757fa0d..a83c1947be6f 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -114,6 +114,7 @@ #define ALIGNED_WORD_SIZE 4 #define WLAN_HAL_MSG_TYPE_MAX_ENUM_SIZE 0x7FFF +#define WMA_WILDCARD_PDEV_ID 0x0 /* Prefix used by scan req ids generated on the host */ #define WMA_HOST_SCAN_REQID_PREFIX 0xA000 @@ -452,6 +453,18 @@ enum wma_tdls_peer_reason { }; #endif /* FEATURE_WLAN_TDLS */ +/** + * enum wma_rx_exec_ctx - wma rx execution context + * @WMA_RX_WORK_CTX: work queue context execution + * @WMA_RX_TASKLET_CTX: tasklet context execution + * @WMA_RX_SERIALIZER_CTX: MC thread context execution + * + */ +enum wma_rx_exec_ctx { + WMA_RX_WORK_CTX, + WMA_RX_TASKLET_CTX, + WMA_RX_SERIALIZER_CTX +}; /** * struct wma_mem_chunk - memory chunks * @vaddr: virtual address @@ -1916,8 +1929,7 @@ typedef struct { void *evt_buf; } wma_process_fw_event_params; -int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, - wmi_buf_t evt_buf); +int wma_process_fw_event_handler(void *ctx, void *ev, uint8_t rx_ctx); A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype, eCsrEncryptionType encr); @@ -1971,7 +1983,7 @@ QDF_STATUS wma_get_scan_id(uint32_t *scan_id); QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg); -int wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, +QDF_STATUS wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, uint32_t delay_time_ms); struct wma_target_req *wma_fill_vdev_req(tp_wma_handle wma, @@ -1997,7 +2009,10 @@ int wma_mgmt_tx_completion_handler(void *handle, uint8_t *cmpl_event_params, uint32_t len); void wma_set_dfs_region(tp_wma_handle wma, uint8_t dfs_region); uint32_t wma_get_vht_ch_width(void); - +QDF_STATUS +wma_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param, + A_UINT32 val, A_UINT32 *module_id_bitmap, + A_UINT32 bitmap_len); #ifdef FEATURE_LFR_SUBNET_DETECTION QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req); diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h index 164ec4d5f52e..f97eb1b6b6b1 100644 --- a/core/wma/inc/wma_api.h +++ b/core/wma/inc/wma_api.h @@ -92,11 +92,11 @@ QDF_STATUS wma_wmi_service_close(void *cds_context); QDF_STATUS wma_wmi_work_close(void *cds_context); -void wma_rx_ready_event(WMA_HANDLE handle, void *ev); +int wma_rx_ready_event(void *handle, uint8_t *ev, uint32_t len); -void wma_rx_service_ready_event(WMA_HANDLE handle, void *ev); +int wma_rx_service_ready_event(void *handle, uint8_t *ev, uint32_t len); -void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *ev); +int wma_rx_service_ready_ext_event(void *handle, uint8_t *ev, uint32_t len); void wma_setneedshutdown(void *cds_context); @@ -120,10 +120,10 @@ QDF_STATUS wma_get_wcnss_software_version(void *p_cds_gctx, int wma_runtime_suspend(void); int wma_runtime_resume(void); int wma_bus_suspend(void); -int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); +QDF_STATUS wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); void wma_target_suspend_acknowledge(void *context); int wma_bus_resume(void); -int wma_resume_target(WMA_HANDLE handle); +QDF_STATUS wma_resume_target(WMA_HANDLE handle); QDF_STATUS wma_disable_wow_in_fw(WMA_HANDLE handle); QDF_STATUS wma_disable_d0wow_in_fw(WMA_HANDLE handle); bool wma_is_wow_mode_selected(WMA_HANDLE handle); @@ -131,8 +131,9 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle); QDF_STATUS wma_enable_d0wow_in_fw(WMA_HANDLE handle); bool wma_check_scan_in_progress(WMA_HANDLE handle); void wma_set_peer_authorized_cb(void *wma_ctx, wma_peer_authorized_fp auth_cb); -int wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, - uint32_t param_value, uint32_t vdev_id); +QDF_STATUS wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, + uint32_t param_id, + uint32_t param_value, uint32_t vdev_id); #ifdef NOT_YET QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, void *scan_chan_info); #endif diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 1e563b0e4935..82a777e90f1b 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -532,10 +532,6 @@ static inline uint8_t *wma_find_bssid_by_vdev_id(tp_wma_handle wma, void *wma_find_vdev_by_bssid(tp_wma_handle wma, uint8_t *bssid, uint8_t *vdev_id); -int wma_unified_vdev_create_send(wmi_unified_t wmi_handle, uint8_t if_id, - uint32_t type, uint32_t subtype, - uint8_t macaddr[IEEE80211_ADDR_LEN]); - QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, struct del_sta_self_params *pdel_sta_self_req_param, uint8_t generateRsp); @@ -543,15 +539,9 @@ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, uint32_t len); -int wmi_unified_vdev_set_param_send(wmi_unified_t wmi_handle, uint32_t if_id, +QDF_STATUS wma_vdev_set_param(wmi_unified_t wmi_handle, uint32_t if_id, uint32_t param_id, uint32_t param_value); -int32_t wmi_unified_peer_flush_tids_send(wmi_unified_t wmi, - uint8_t peer_addr - [IEEE80211_ADDR_LEN], - uint32_t peer_tid_bitmap, - uint8_t vdev_id); - void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, uint8_t vdev_id, ol_txrx_peer_handle peer, bool roam_synch_in_progress); @@ -590,16 +580,10 @@ void wma_remove_vdev_req(tp_wma_handle wma, uint8_t vdev_id, void wma_add_bss(tp_wma_handle wma, tpAddBssParams params); -int wmi_unified_vdev_up_send(wmi_unified_t wmi, - uint8_t vdev_id, uint16_t aid, - uint8_t bssid[IEEE80211_ADDR_LEN]); - void wma_add_sta(tp_wma_handle wma, tpAddStaParams add_sta); void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta); -int32_t wmi_unified_vdev_stop_send(wmi_unified_t wmi, uint8_t vdev_id); - void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params); int32_t wma_find_vdev_by_type(tp_wma_handle wma, int32_t type); @@ -693,14 +677,14 @@ void wma_hidden_ssid_vdev_restart(tp_wma_handle wma_handle, void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req); -int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, +QDF_STATUS wma_unified_set_sta_ps_param(wmi_unified_t wmi_handle, uint32_t vdev_id, uint32_t param, uint32_t value); QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id); -int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, +QDF_STATUS wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, uint8_t *peer_addr, uint8_t uapsd_value, uint8_t max_sp); @@ -713,9 +697,6 @@ void wma_set_tx_power(WMA_HANDLE handle, void wma_set_max_tx_power(WMA_HANDLE handle, tMaxTxPowerParams *tx_pwr_params); -int32_t wmi_unified_set_sta_ps(wmi_unified_t wmi_handle, - uint32_t vdev_id, uint8_t val); - void wma_disable_sta_ps_mode(tp_wma_handle wma, tpDisablePsParams ps_req); void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req); @@ -880,9 +861,6 @@ int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle, int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, uint8_t vdev_id, uint32_t value); -int wmi_crash_inject(wmi_unified_t wmi_handle, uint32_t type, - uint32_t delay_time_ms); - void wma_get_stats_req(WMA_HANDLE handle, tAniGetPEStatsReq *get_stats_param); @@ -917,11 +895,6 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); -#ifdef FEATURE_GREEN_AP -int32_t wmi_unified_pdev_green_ap_ps_enable_cmd(wmi_unified_t wmi_handle, - uint32_t value); -#endif - int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, uint32_t len); @@ -932,7 +905,7 @@ void wma_wow_tx_complete(void *wma); int wmi_unified_nat_keepalive_enable(tp_wma_handle wma, uint8_t vdev_id); -int wmi_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id); +int wma_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id); #ifdef WLAN_FEATURE_NAN int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf, uint32_t len); @@ -1104,7 +1077,7 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, ch_avoid_update_req); #endif -int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); +QDF_STATUS wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); #ifdef FEATURE_WLAN_TDLS diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 889c3724e712..12f52ccc0d29 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -788,7 +788,7 @@ int32_t wmi_unified_send_txbf(tp_wma_handle wma, tpAddStaParams params) WMA_LOGD("txbf_en.sutxbfee %d txbf_en.mutxbfee %d, sutxbfer %d", txbf_en.sutxbfee, txbf_en.mutxbfee, txbf_en.sutxbfer); - return wmi_unified_vdev_set_param_send(wma->wmi_handle, + return wma_vdev_set_param(wma->wmi_handle, params->smesessionId, WMI_VDEV_PARAM_TXBF, *((A_UINT8 *) &txbf_en)); @@ -1403,6 +1403,7 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, uint8_t rate = 0; uint32_t short_gi; struct wma_txrx_node *intr = wma->interfaces; + QDF_STATUS status; /* Get the vdev id */ pdev = wma_find_vdev_by_addr(wma, pRateUpdateParams->bssid.bytes, @@ -1449,20 +1450,20 @@ QDF_STATUS wma_process_rate_update_indicate(tp_wma_handle wma, qdf_mem_free(pRateUpdateParams); return ret; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + status = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_SGI, short_gi); - if (ret) { - WMA_LOGE("%s: Failed to Set WMI_VDEV_PARAM_SGI (%d), ret = %d", - __func__, short_gi, ret); + if (QDF_IS_STATUS_ERROR(status)) { + WMA_LOGE("%s: Failed to Set WMI_VDEV_PARAM_SGI (%d), status = %d", + __func__, short_gi, status); qdf_mem_free(pRateUpdateParams); - return QDF_STATUS_E_FAILURE; + return status; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + status = wma_vdev_set_param(wma->wmi_handle, vdev_id, paramId, rate); qdf_mem_free(pRateUpdateParams); - if (ret) { - WMA_LOGE("%s: Failed to Set rate, ret = %d", __func__, ret); - return QDF_STATUS_E_FAILURE; + if (QDF_IS_STATUS_ERROR(status)) { + WMA_LOGE("%s: Failed to Set rate, status = %d", __func__, status); + return status; } return QDF_STATUS_SUCCESS; @@ -2965,6 +2966,7 @@ void wma_tx_abort(uint8_t vdev_id) tp_wma_handle wma; uint32_t peer_tid_bitmap = PEER_ALL_TID_BITMASK; struct wma_txrx_node *iface; + struct peer_flush_params param = {0}; wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { @@ -2984,8 +2986,10 @@ void wma_tx_abort(uint8_t vdev_id) /* Flush all TIDs except MGMT TID for this peer in Target */ peer_tid_bitmap &= ~(0x1 << WMI_MGMT_TID); + param.peer_tid_bitmap = peer_tid_bitmap; + param.vdev_id = vdev_id; wmi_unified_peer_flush_tids_send(wma->wmi_handle, iface->bssid, - peer_tid_bitmap, vdev_id); + ¶m); } #if defined(FEATURE_LRO) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index a6745f84a240..655507323b12 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -211,86 +211,6 @@ enum wlan_op_mode wma_get_txrx_vdev_type(uint32_t type) return vdev_type; } -/** - * wma_unified_vdev_create_send() - send VDEV create command to fw - * @wmi_handle: wmi handle - * @if_id: vdev id - * @type: vdev type - * @subtype: vdev subtype - * @macaddr: vdev mac address - * - * Return: 0 for success or error code - */ -int wma_unified_vdev_create_send(wmi_unified_t wmi_handle, uint8_t if_id, - uint32_t type, uint32_t subtype, - uint8_t macaddr[IEEE80211_ADDR_LEN]) -{ - wmi_vdev_create_cmd_fixed_param *cmd; - wmi_buf_t buf; - int len = sizeof(*cmd); - int ret; - - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s:wmi_buf_alloc failed", __FUNCTION__); - return -ENOMEM; - } - cmd = (wmi_vdev_create_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_create_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_create_cmd_fixed_param)); - cmd->vdev_id = if_id; - cmd->vdev_type = type; - cmd->vdev_subtype = subtype; - WMI_CHAR_ARRAY_TO_MAC_ADDR(macaddr, &cmd->vdev_macaddr); - WMA_LOGE("%s: ID = %d VAP Addr = %02x:%02x:%02x:%02x:%02x:%02x", - __func__, if_id, - macaddr[0], macaddr[1], macaddr[2], - macaddr[3], macaddr[4], macaddr[5]); - ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_CREATE_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send WMI_VDEV_CREATE_CMDID"); - wmi_buf_free(buf); - } - return ret; -} - -/** - * wma_unified_vdev_delete_send() - send VDEV delete command to fw - * @wmi_handle: wmi handle - * @if_id: vdev id - * - * Return: 0 for success or error code - */ -static int wma_unified_vdev_delete_send(wmi_unified_t wmi_handle, uint8_t if_id) -{ - wmi_vdev_delete_cmd_fixed_param *cmd; - wmi_buf_t buf; - int ret; - - buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGP("%s:wmi_buf_alloc failed", __FUNCTION__); - return -ENOMEM; - } - - cmd = (wmi_vdev_delete_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_delete_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_delete_cmd_fixed_param)); - cmd->vdev_id = if_id; - ret = wmi_unified_cmd_send(wmi_handle, buf, - sizeof(wmi_vdev_delete_cmd_fixed_param), - WMI_VDEV_DELETE_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send WMI_VDEV_DELETE_CMDID"); - wmi_buf_free(buf); - } - return ret; -} - /** * wma_find_req() - find target request for vdev id * @wma: wma handle @@ -606,9 +526,9 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, struct wma_target_req *msg = NULL; cds_msg_t sme_msg = { 0 }; - if (wma_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id)) { + status = wmi_unified_vdev_delete_send(wma_handle->wmi_handle, vdev_id); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("Unable to remove an interface"); - status = QDF_STATUS_E_FAILURE; goto out; } @@ -720,45 +640,6 @@ QDF_STATUS wma_vdev_detach(tp_wma_handle wma_handle, return status; } -/** - * wmi_unified_peer_delete_send() - send PEER delete command to fw - * @wmi: wmi handle - * @peer_addr: peer mac addr - * @vdev_id: vdev id - * - * Return: 0 for success or error code - */ -static int32_t wmi_unified_peer_delete_send(wmi_unified_t wmi, - uint8_t - peer_addr[IEEE80211_ADDR_LEN], - uint8_t vdev_id) -{ - wmi_peer_delete_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_peer_delete_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_delete_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_delete_cmd_fixed_param)); - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - cmd->vdev_id = vdev_id; - - if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_DELETE_CMDID)) { - WMA_LOGP("%s: Failed to send peer delete command", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); - return 0; -} - /** * wma_vdev_start_rsp() - send vdev start response to upper layer * @wma: wma handle @@ -905,6 +786,9 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, wmi_vdev_start_response_event_fixed_param *resp_event; struct wma_target_req *req_msg; struct wma_txrx_node *iface; + struct vdev_up_params param = {0}; + QDF_STATUS status; + #ifdef FEATURE_AP_MCC_CH_AVOIDANCE tpAniSirGlobal mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (NULL == mac_ctx) { @@ -957,9 +841,12 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, WMA_LOGE("%s: vdev restart event recevied for hidden ssid set using IOCTL", __func__); + param.vdev_id = resp_event->vdev_id; + param.assoc_id = 0; if (wmi_unified_vdev_up_send - (wma->wmi_handle, resp_event->vdev_id, 0, - wma->interfaces[resp_event->vdev_id].bssid) < 0) { + (wma->wmi_handle, + wma->interfaces[resp_event->vdev_id].bssid, + ¶m) != QDF_STATUS_SUCCESS) { WMA_LOGE("%s : failed to send vdev up", __func__); return -EEXIST; } @@ -1007,10 +894,12 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, params->status = resp_event->status; if (resp_event->resp_type == WMI_VDEV_RESTART_RESP_EVENT && (iface->type == WMI_VDEV_TYPE_STA)) { - if (wmi_unified_vdev_up_send(wma->wmi_handle, - resp_event->vdev_id, - iface->aid, - iface->bssid)) { + param.vdev_id = resp_event->vdev_id; + param.assoc_id = iface->aid; + status = wmi_unified_vdev_up_send(wma->wmi_handle, + iface->bssid, + ¶m); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s:vdev_up failed vdev_id %d", __func__, resp_event->vdev_id); wma->interfaces[resp_event->vdev_id].vdev_up = @@ -1028,9 +917,11 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, IEEE80211_ADDR_LEN); wma_vdev_start_rsp(wma, bssParams, resp_event); } else if (req_msg->msg_type == WMA_OCB_SET_CONFIG_CMD) { + param.vdev_id = resp_event->vdev_id; + param.assoc_id = iface->aid; if (wmi_unified_vdev_up_send(wma->wmi_handle, - resp_event->vdev_id, iface->aid, - iface->bssid) < 0) { + iface->bssid, + ¶m) != QDF_STATUS_SUCCESS) { WMA_LOGE(FL("failed to send vdev up")); return -EEXIST; } @@ -1050,86 +941,24 @@ int wma_vdev_start_resp_handler(void *handle, uint8_t *cmd_param_info, } /** - * wmi_unified_vdev_set_param_send() - set per vdev params in fw + * wma_vdev_set_param() - set per vdev params in fw * @wmi_handle: wmi handle * @if_if: vdev id * @param_id: parameter id * @param_value: parameter value * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -int -wmi_unified_vdev_set_param_send(wmi_unified_t wmi_handle, uint32_t if_id, +QDF_STATUS +wma_vdev_set_param(wmi_unified_t wmi_handle, uint32_t if_id, uint32_t param_id, uint32_t param_value) { - int ret; - wmi_vdev_set_param_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint16_t len = sizeof(*cmd); + struct vdev_set_params param = {0}; + param.if_id = if_id; + param.param_id = param_id; + param.param_value = param_value; - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_vdev_set_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_set_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_set_param_cmd_fixed_param)); - cmd->vdev_id = if_id; - cmd->param_id = param_id; - cmd->param_value = param_value; - WMA_LOGD("Setting vdev %d param = %x, value = %u", - if_id, param_id, param_value); - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_VDEV_SET_PARAM_CMDID); - if (ret < 0) { - WMA_LOGE("Failed to send set param command ret = %d", ret); - wmi_buf_free(buf); - } - return ret; -} - -/** - * wmi_unified_peer_flush_tids_send() - flush peer tids packets in fw - * @wmi: wmi handle - * @peer_addr: peer mac address - * @peer_tid_bitmap: peer tid bitmap - * @vdev_id: vdev id - * - * Return: 0 for sucess or error code - */ -int32_t wmi_unified_peer_flush_tids_send(wmi_unified_t wmi, - uint8_t peer_addr[IEEE80211_ADDR_LEN], - uint32_t peer_tid_bitmap, - uint8_t vdev_id) -{ - wmi_peer_flush_tids_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_peer_flush_tids_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_flush_tids_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_flush_tids_cmd_fixed_param)); - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - cmd->peer_tid_bitmap = peer_tid_bitmap; - cmd->vdev_id = vdev_id; - - if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_FLUSH_TIDS_CMDID)) { - WMA_LOGP("%s: Failed to send flush tid command", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); - return 0; + return wmi_unified_vdev_set_param_send(wmi_handle, ¶m); } /** @@ -1153,39 +982,24 @@ void wma_set_peer_authorized_cb(void *wma_ctx, wma_peer_authorized_fp auth_cb) * @param_value: parameter value * @vdev_id: vdev id * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -int wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, uint32_t param_id, - uint32_t param_value, uint32_t vdev_id) +QDF_STATUS wma_set_peer_param(void *wma_ctx, uint8_t *peer_addr, + uint32_t param_id, uint32_t param_value, + uint32_t vdev_id) { tp_wma_handle wma_handle = (tp_wma_handle) wma_ctx; - wmi_peer_set_param_cmd_fixed_param *cmd; - wmi_buf_t buf; + struct peer_set_params param = {0}; int err; - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set_param cmd"); - return -ENOMEM; - } - cmd = (wmi_peer_set_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_set_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_set_param_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - cmd->param_id = param_id; - cmd->param_value = param_value; - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(wmi_peer_set_param_cmd_fixed_param), - WMI_PEER_SET_PARAM_CMDID); - if (err) { - WMA_LOGE("Failed to send set_param cmd"); - qdf_mem_free(buf); - return -EIO; - } - return 0; + param.vdev_id = vdev_id; + param.param_value = param_value; + param.param_id = param_id; + + err = wmi_set_peer_param_send(wma_handle->wmi_handle, peer_addr, + ¶m); + + return err; } /** @@ -1205,6 +1019,8 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, #define PEER_ALL_TID_BITMASK 0xffffffff uint32_t peer_tid_bitmap = PEER_ALL_TID_BITMASK; uint8_t *peer_addr = bssid; + struct peer_flush_params param = {0}; + if (!wma->interfaces[vdev_id].peer_count) { WMA_LOGE("%s: Can't remove peer with peer_addr %pM vdevid %d peer_count %d", __func__, bssid, vdev_id, @@ -1221,8 +1037,10 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, return; /* Flush all TIDs except MGMT TID for this peer in Target */ peer_tid_bitmap &= ~(0x1 << WMI_MGMT_TID); + param.peer_tid_bitmap = peer_tid_bitmap; + param.vdev_id = vdev_id; wmi_unified_peer_flush_tids_send(wma->wmi_handle, bssid, - peer_tid_bitmap, vdev_id); + ¶m); if ((peer) && (wma_is_vdev_in_ibss_mode(wma, vdev_id))) { WMA_LOGD("%s: bssid %pM peer->mac_addr %pM", __func__, @@ -1234,46 +1052,6 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, #undef PEER_ALL_TID_BITMASK } -/** - * wmi_unified_peer_create_send() - send peer create command to fw - * @wmi: wmi handle - * @peer_addr: peer mac address - * @peer_type: peer type - * @vdev_id: vdev id - * - * Return: 0 for success or error code - */ -static int wmi_unified_peer_create_send(wmi_unified_t wmi, - const uint8_t *peer_addr, - uint32_t peer_type, uint32_t vdev_id) -{ - wmi_peer_create_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_peer_create_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_create_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_create_cmd_fixed_param)); - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - cmd->peer_type = peer_type; - cmd->vdev_id = vdev_id; - - if (wmi_unified_cmd_send(wmi, buf, len, WMI_PEER_CREATE_CMDID)) { - WMA_LOGP("%s: failed to send WMI_PEER_CREATE_CMDID", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - WMA_LOGD("%s: peer_addr %pM vdev_id %d", __func__, peer_addr, vdev_id); - return 0; -} - /** * wma_create_peer() - send peer create command to fw * @wma: wma handle @@ -1293,6 +1071,7 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, bool roam_synch_in_progress) { ol_txrx_peer_handle peer; + struct peer_create_params param = {0}; if (++wma->interfaces[vdev_id].peer_count > wma->wlan_resource_config.num_peers) { @@ -1312,8 +1091,11 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, wma->interfaces[vdev_id].peer_count); return QDF_STATUS_SUCCESS; } - if (wmi_unified_peer_create_send(wma->wmi_handle, peer_addr, - peer_type, vdev_id) < 0) { + param.peer_addr = peer_addr; + param.peer_type = peer_type; + param.vdev_id = vdev_id; + if (wmi_unified_peer_create_send(wma->wmi_handle, + ¶m) != QDF_STATUS_SUCCESS) { WMA_LOGP("%s : Unable to create peer in Target", __func__); ol_txrx_peer_detach(peer); goto err; @@ -1344,38 +1126,6 @@ err: return QDF_STATUS_E_FAILURE; } -/** - * wmi_unified_vdev_down_send() - send vdev down command to fw - * @wmi: wmi handle - * @vdev_id: vdev id - * - * Return: 0 for success or error code - */ -static int wmi_unified_vdev_down_send(wmi_unified_t wmi, uint8_t vdev_id) -{ - wmi_vdev_down_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s : wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_vdev_down_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_down_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_vdev_down_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_DOWN_CMDID)) { - WMA_LOGP("%s: Failed to send vdev down", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - WMA_LOGE("%s: vdev_id %d", __func__, vdev_id); - return 0; -} - #ifdef QCA_IBSS_SUPPORT /** @@ -1753,8 +1503,9 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, peer, false); } - if (wmi_unified_vdev_down_send - (wma->wmi_handle, resp_event->vdev_id) < 0) { + if (wmi_unified_vdev_down_send(wma->wmi_handle, + resp_event->vdev_id) != + QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to send vdev down cmd: vdev %d", resp_event->vdev_id); } else { @@ -1841,24 +1592,27 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t cfg_val; uint16_t val16; - int ret; + QDF_STATUS ret; tSirMacHTCapabilityInfo *phtCapInfo; cds_msg_t sme_msg = { 0 }; + struct vdev_create_params params = { 0 }; if (NULL == mac) { WMA_LOGE("%s: Failed to get mac", __func__); goto end; } + params.if_id = self_sta_req->session_id; + params.type = self_sta_req->type; + params.subtype = self_sta_req->sub_type; + /* Create a vdev in target */ - if (wma_unified_vdev_create_send(wma_handle->wmi_handle, - self_sta_req->session_id, - self_sta_req->type, - self_sta_req->sub_type, - self_sta_req->self_mac_addr)) { + status = wmi_unified_vdev_create_send(wma_handle->wmi_handle, + self_sta_req->self_mac_addr, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGP("%s: Unable to add an interface for ath_dev", __func__); - status = QDF_STATUS_E_RESOURCES; goto end; } @@ -1866,7 +1620,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (wlan_op_mode_unknown == txrx_vdev_type) { WMA_LOGE("Failed to get txrx vdev type"); - wma_unified_vdev_delete_send(wma_handle->wmi_handle, + wmi_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); goto end; } @@ -1883,7 +1637,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (NULL == txrx_vdev_handle) { WMA_LOGP("%s: ol_txrx_vdev_attach failed", __func__); status = QDF_STATUS_E_FAILURE; - wma_unified_vdev_delete_send(wma_handle->wmi_handle, + wmi_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); goto end; } @@ -1958,32 +1712,32 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("%s: Failed to create peer", __func__); status = QDF_STATUS_E_FAILURE; - wma_unified_vdev_delete_send(wma_handle->wmi_handle, + wmi_unified_vdev_delete_send(wma_handle->wmi_handle, self_sta_req->session_id); } } - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_MCC_RTSCTS_PROTECTION_ENABLE, mac->roam.configParam.mcc_rts_cts_prot_enable); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set WMI VDEV MCC_RTSCTS_PROTECTION_ENABLE"); - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_MCC_BROADCAST_PROBE_ENABLE, mac->roam.configParam.mcc_bcast_prob_resp_enable); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set WMI VDEV MCC_BROADCAST_PROBE_ENABLE"); if (wlan_cfg_get_int(mac, WNI_CFG_RTS_THRESHOLD, &cfg_val) == eSIR_SUCCESS) { - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_RTS_THRESHOLD, cfg_val); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set WMI_VDEV_PARAM_RTS_THRESHOLD"); } else { WMA_LOGE("Failed to get value for WNI_CFG_RTS_THRESHOLD, leaving unchanged"); @@ -1991,11 +1745,11 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (wlan_cfg_get_int(mac, WNI_CFG_FRAGMENTATION_THRESHOLD, &cfg_val) == eSIR_SUCCESS) { - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_FRAGMENTATION_THRESHOLD, cfg_val); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set WMI_VDEV_PARAM_FRAGMENTATION_THRESHOLD"); } else { WMA_LOGE("Failed to get value for WNI_CFG_FRAGMENTATION_THRESHOLD, leaving unchanged"); @@ -2004,11 +1758,11 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (wlan_cfg_get_int(mac, WNI_CFG_HT_CAP_INFO, &cfg_val) == eSIR_SUCCESS) { val16 = (uint16_t) cfg_val; phtCapInfo = (tSirMacHTCapabilityInfo *) &cfg_val; - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_TX_STBC, phtCapInfo->txSTBC); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set WMI_VDEV_PARAM_TX_STBC"); } else { WMA_LOGE("Failed to get value of HT_CAP, TX STBC unchanged"); @@ -2017,11 +1771,13 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if ((self_sta_req->type == WMI_VDEV_TYPE_STA) && (self_sta_req->sub_type == 0)) { wma_handle->roam_offload_enabled = true; - wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, self_sta_req->session_id, WMI_VDEV_PARAM_ROAM_FW_OFFLOAD, (WMI_ROAM_FW_OFFLOAD_ENABLE_FLAG | WMI_ROAM_BMISS_FINAL_SCAN_ENABLE_FLAG)); + if (QDF_IS_STATUS_ERROR(ret)) + WMA_LOGE("Failed to set WMI_VDEV_PARAM_ROAM_FW_OFFLOAD"); } /* Initialize BMISS parameters */ @@ -2761,7 +2517,7 @@ void wma_vdev_resp_timer(void *data) } if (wmi_unified_vdev_down_send(wma->wmi_handle, - tgt_req->vdev_id) < 0) { + tgt_req->vdev_id) != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to send vdev down cmd: vdev %d", tgt_req->vdev_id); } else { @@ -2995,37 +2751,37 @@ wma_vdev_set_bss_params(tp_wma_handle wma, int vdev_id, uint8_t dtimPeriod, uint8_t shortSlotTimeSupported, uint8_t llbCoexist, int8_t maxTxPower) { - int ret; + QDF_STATUS ret; uint32_t slot_time; struct wma_txrx_node *intr = wma->interfaces; /* Beacon Interval setting */ - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_BEACON_INTERVAL, beaconInterval); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set WMI_VDEV_PARAM_BEACON_INTERVAL"); ret = wmi_unified_vdev_set_gtx_cfg_send(wma->wmi_handle, vdev_id, &intr[vdev_id].config.gtx_info); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set WMI_VDEV_PARAM_DTIM_PERIOD"); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_DTIM_PERIOD, dtimPeriod); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set WMI_VDEV_PARAM_DTIM_PERIOD"); if (!maxTxPower) { WMA_LOGW("Setting Tx power limit to 0"); } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_TX_PWRLIMIT, maxTxPower); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set WMI_VDEV_PARAM_TX_PWRLIMIT"); else intr[vdev_id].max_tx_power = maxTxPower; @@ -3036,10 +2792,10 @@ wma_vdev_set_bss_params(tp_wma_handle wma, int vdev_id, else slot_time = WMI_VDEV_SLOT_TIME_LONG; - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_SLOT_TIME, slot_time); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set WMI_VDEV_PARAM_SLOT_TIME"); /* Initialize protection mode in case of coexistence */ @@ -3063,8 +2819,9 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) uint8_t vdev_id, peer_id; QDF_STATUS status; int8_t maxTxPower; + struct pdev_params param = {0}; #ifdef WLAN_FEATURE_11W - int ret = 0; + QDF_STATUS ret; #endif /* WLAN_FEATURE_11W */ struct sir_hw_mode_params hw_mode = {0}; @@ -3128,9 +2885,11 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) * when 802.11w PMF is enabled for hw encr/decr * use hw MFP Qos bits 0x10 */ - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_PMF_QOS, true); - if (ret) { + param.param_id = WMI_PDEV_PARAM_PMF_QOS; + param.param_value = true; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + ¶m, WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("%s: Failed to set QOS MFP/PMF (%d)", __func__, ret); } else { @@ -3365,11 +3124,11 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("%s: vdev start request for IBSS sent to target", __func__); /* Initialize protection mode to no protection */ - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, - WMI_VDEV_PARAM_PROTECTION_MODE, - IEEE80211_PROT_NONE)) { + status = wma_vdev_set_param(wma->wmi_handle, vdev_id, + WMI_VDEV_PARAM_PROTECTION_MODE, + IEEE80211_PROT_NONE); + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGE("Failed to initialize protection mode"); - } return; @@ -3399,12 +3158,12 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) ol_txrx_peer_handle peer; QDF_STATUS status; struct wma_txrx_node *iface; - int ret = 0; int pps_val = 0; bool roam_synch_in_progress = false; tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct sir_hw_mode_params hw_mode = {0}; bool peer_assoc_sent = false; + struct pdev_params param = {0}; if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); @@ -3596,14 +3355,14 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) ((pMac-> enable5gEBT << 31) & 0xffff0000) | (PKT_PWR_SAVE_5G_EBT & 0xffff); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + status = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_PACKET_POWERSAVE, pps_val); - if (ret) + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGE("Failed to send wmi packet power save cmd"); else - WMA_LOGD("Sent PKT_PWR_SAVE_5G_EBT cmd to target, val = %x, ret = %d", - pps_val, ret); + WMA_LOGD("Sent PKT_PWR_SAVE_5G_EBT cmd to target, val = %x, status = %d", + pps_val, status); wmi_unified_send_peer_assoc(wma, add_bss->nwType, &add_bss->staContext); @@ -3612,12 +3371,14 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) if (add_bss->rmfEnabled) { /* when 802.11w PMF is enabled for hw encr/decr use hw MFP Qos bits 0x10 */ - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_PMF_QOS, - true); - if (ret) { + param.param_id = WMI_PDEV_PARAM_PMF_QOS; + param.param_value = true; + status = wmi_unified_pdev_param_send(wma->wmi_handle, + ¶m, + WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s: Failed to set QOS MFP/PMF (%d)", - __func__, ret); + __func__, status); } else { WMA_LOGI("%s: QOS MFP/PMF set to %d", __func__, true); @@ -3724,46 +3485,6 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) } } -/** - * wmi_unified_vdev_up_send() - send vdev up command in fw - * @wmi: wmi handle - * @vdev_id: vdev id - * @aid: association ID - * @bssid: bssid - * - * Return: 0 for success or error code - */ -int wmi_unified_vdev_up_send(wmi_unified_t wmi, - uint8_t vdev_id, uint16_t aid, - uint8_t bssid[IEEE80211_ADDR_LEN]) -{ - wmi_vdev_up_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - WMA_LOGD("%s: VDEV_UP", __func__); - WMA_LOGD("%s: vdev_id %d aid %d bssid %pM", __func__, - vdev_id, aid, bssid); - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_vdev_up_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_up_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_vdev_up_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->vdev_assoc_id = aid; - WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid, &cmd->vdev_bssid); - if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_UP_CMDID)) { - WMA_LOGP("%s: Failed to send vdev up command", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - return 0; -} - /** * wma_add_sta_req_ap_mode() - process add sta request in ap mode * @wma: wma handle @@ -3783,6 +3504,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) struct wma_txrx_node *iface = NULL; struct wma_target_req *msg; bool peer_assoc_cnf = false; + struct pdev_params param; pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -3915,11 +3637,13 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) * when 802.11w PMF is enabled for hw encr/decr * use hw MFP Qos bits 0x10 */ - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_PMF_QOS, true); - if (ret) { + param.param_id = WMI_PDEV_PARAM_PMF_QOS; + param.param_value = true; + status = wmi_unified_pdev_param_send(wma->wmi_handle, + ¶m, WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s: Failed to set QOS MFP/PMF (%d)", - __func__, ret); + __func__, status); } else { WMA_LOGI("%s: QOS MFP/PMF set to %d", __func__, true); } @@ -3927,10 +3651,10 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) #endif /* WLAN_FEATURE_11W */ if (add_sta->uAPSD) { - ret = wma_set_ap_peer_uapsd(wma, add_sta->smesessionId, + status = wma_set_ap_peer_uapsd(wma, add_sta->smesessionId, add_sta->staMac, add_sta->uAPSD, add_sta->maxSPLen); - if (ret) { + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("Failed to set peer uapsd param for %pM", add_sta->staMac); add_sta->status = QDF_STATUS_E_FAILURE; @@ -4124,6 +3848,8 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) int ret = 0; struct wma_target_req *msg; bool peer_assoc_cnf = false; + struct vdev_up_params param = {0}; + struct pdev_params pdev_param = {0}; #ifdef FEATURE_WLAN_TDLS if (STA_ENTRY_TDLS_PEER == params->staType) { @@ -4233,12 +3959,14 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (params->rmfEnabled) { /* when 802.11w PMF is enabled for hw encr/decr use hw MFP Qos bits 0x10 */ - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_PMF_QOS, - true); - if (ret) { + pdev_param.param_id = WMI_PDEV_PARAM_PMF_QOS; + pdev_param.param_value = true; + status = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdev_param, + WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s: Failed to set QOS MFP/PMF (%d)", - __func__, ret); + __func__, status); } else { WMA_LOGI("%s: QOS MFP/PMF set to %d", __func__, true); @@ -4269,7 +3997,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_CSA_OFFLOAD)) { params->csaOffloadEnable = 1; - if (wmi_unified_csa_offload_enable(wma, params->smesessionId) < + if (wma_unified_csa_offload_enable(wma, params->smesessionId) < 0) { WMA_LOGE("Unable to enable CSA offload for vdev_id:%d", params->smesessionId); @@ -4285,8 +4013,10 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) } } - if (wmi_unified_vdev_up_send(wma->wmi_handle, params->smesessionId, - params->assocId, params->bssId) < 0) { + param.vdev_id = params->smesessionId; + param.assoc_id = params->assocId; + if (wmi_unified_vdev_up_send(wma->wmi_handle, params->bssId, + ¶m) != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to send vdev up cmd: vdev %d bssid %pM", __func__, params->smesessionId, params->bssId); status = QDF_STATUS_E_FAILURE; @@ -4592,37 +4322,6 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) } } -/** - * wmi_unified_vdev_stop_send() - send vdev stop command to fw - * @wmi: wmi handle - * @vdev_id: vdev id - * - * Return: 0 for success or erro code - */ -int32_t wmi_unified_vdev_stop_send(wmi_unified_t wmi, uint8_t vdev_id) -{ - wmi_vdev_stop_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi, len); - if (!buf) { - WMA_LOGP("%s : wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_vdev_stop_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_stop_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_vdev_stop_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - if (wmi_unified_cmd_send(wmi, buf, len, WMI_VDEV_STOP_CMDID)) { - WMA_LOGP("%s: Failed to send vdev stop command", __func__); - qdf_nbuf_free(buf); - return -EIO; - } - return 0; -} - /** * wma_delete_bss() - process delete bss request from upper layer * @wma: wma handle diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 8c92bb7eb2f1..8ec2c2c26ca1 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1079,15 +1079,16 @@ void wma_setup_egap_support(struct wma_tgt_cfg *tgt_cfg, WMA_HANDLE handle) void wma_register_egap_event_handle(WMA_HANDLE handle) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - int status; + QDF_STATUS status; if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_EGAP)) { status = wmi_unified_register_event_handler( wma_handle->wmi_handle, WMI_AP_PS_EGAP_INFO_EVENTID, - wma_egap_info_status_event); - if (status) { + wma_egap_info_status_event, + WMA_RX_SERIALIZER_CTX); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("Failed to register Enhance Green AP event"); wma_handle->egap_support = false; } else { @@ -1097,45 +1098,6 @@ void wma_register_egap_event_handle(WMA_HANDLE handle) } else wma_handle->egap_support = false; } - -/** - * wmi_unified_pdev_green_ap_ps_enable_cmd() - enable green ap powersave command - * @wmi_handle: wmi handle - * @value: value - * - * Return: 0 for success or error code - */ -int32_t wmi_unified_pdev_green_ap_ps_enable_cmd(wmi_unified_t wmi_handle, - uint32_t value) -{ - wmi_pdev_green_ap_ps_enable_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - WMA_LOGD("Set Green AP PS val %d", value); - - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: Green AP PS Mem Alloc Failed", __func__); - return -ENOMEM; - } - - cmd = (wmi_pdev_green_ap_ps_enable_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_green_ap_ps_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_green_ap_ps_enable_cmd_fixed_param)); - cmd->reserved0 = 0; - cmd->enable = value; - - if (wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID)) { - WMA_LOGE("Set Green AP PS param Failed val %d", value); - qdf_nbuf_free(buf); - return -EIO; - } - return 0; -} #endif /* FEATURE_GREEN_AP */ /** @@ -1450,13 +1412,13 @@ int wmi_unified_nat_keepalive_enable(tp_wma_handle wma, uint8_t vdev_id) } /** - * wmi_unified_csa_offload_enable() - sen CSA offload enable command + * wma_unified_csa_offload_enable() - sen CSA offload enable command * @wma: wma handle * @vdev_id: vdev id * * Return: 0 for success or error code */ -int wmi_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id) +int wma_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id) { wmi_csa_offload_enable_cmd_fixed_param *cmd; wmi_buf_t buf; @@ -2375,16 +2337,18 @@ void wma_register_dfs_event_handler(tp_wma_handle wma_handle) WMA_LOGD("%s:Phyerror Filtering offload is Disabled in ini", __func__); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_PHYERR_EVENTID, - wma_unified_phyerr_rx_event_handler); + WMI_PHYERR_EVENTID, + wma_unified_phyerr_rx_event_handler, + WMA_RX_WORK_CTX); WMA_LOGD("%s: WMI_PHYERR_EVENTID event handler registered", __func__); } else { WMA_LOGD("%s:Phyerror Filtering offload is Enabled in ini", __func__); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_DFS_RADAR_EVENTID, - wma_unified_dfs_radar_rx_event_handler); + WMI_DFS_RADAR_EVENTID, + wma_unified_dfs_radar_rx_event_handler, + WMA_RX_WORK_CTX); WMA_LOGD("%s:WMI_DFS_RADAR_EVENTID event handler registered", __func__); } @@ -2554,7 +2518,7 @@ QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, WMITLV_TAG_STRUC_wmi_pdev_pktlog_disable_cmd_fixed_param, WMITLV_GET_STRUCT_TLVLEN (wmi_pdev_pktlog_disable_cmd_fixed_param)); - disable_cmd->reserved0 = 0; + disable_cmd->pdev_id = 0; if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, WMI_PDEV_PKTLOG_DISABLE_CMDID)) { WMA_LOGE("failed to send pktlog disable cmdid"); @@ -3537,13 +3501,12 @@ void wma_enable_disable_wakeup_event(WMA_HANDLE handle, QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) { tp_wma_handle wma = handle; - wmi_wow_enable_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len; int ret; struct hif_opaque_softc *scn; int host_credits; int wmi_pending_cmds; + struct wow_cmd_params param = {0}; + #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); @@ -3553,29 +3516,6 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) } #endif /* CONFIG_CNSS */ - len = sizeof(wmi_wow_enable_cmd_fixed_param); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_wow_enable_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wow_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wow_enable_cmd_fixed_param)); - cmd->enable = true; - if (htc_can_suspend_link(wma->htc_handle)) - cmd->pause_iface_config = WOW_IFACE_PAUSE_ENABLED; - else - cmd->pause_iface_config = WOW_IFACE_PAUSE_DISABLED; - - WMA_LOGI("suspend type: %s", - cmd->pause_iface_config == WOW_IFACE_PAUSE_ENABLED ? - "WOW_IFACE_PAUSE_ENABLED" : "WOW_IFACE_PAUSE_DISABLED"); - qdf_event_reset(&wma->target_suspend); wma->wow_nack = 0; @@ -3594,8 +3534,10 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) #endif } - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_ENABLE_CMDID); + param.enable = true; + param.can_suspend_link = hif_can_suspend_link(wma->htc_handle); + ret = wmi_unified_wow_enable_send(wma->wmi_handle, ¶m, + WMA_WILDCARD_PDEV_ID); if (ret) { WMA_LOGE("Failed to enable wow in fw"); goto error; @@ -3665,7 +3607,6 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle) return QDF_STATUS_SUCCESS; error: - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6288,6 +6229,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int32_t cck_mask_val = 0; int ret = 0; + struct pdev_params pdev_param = {0}; if (NULL == wma) { WMA_LOGE("%s: wma context is NULL", __func__); @@ -6323,9 +6265,12 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, cck_mask_val = 1; cck_mask_val |= (wma->self_gen_frm_pwr << 16); - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_TX_CHAIN_MASK_CCK, - cck_mask_val); + pdev_param.param_id = WMI_PDEV_PARAM_TX_CHAIN_MASK_CCK; + pdev_param.param_value = cck_mask_val; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdev_param, + WMA_WILDCARD_PDEV_ID); + if (ret) WMA_LOGE("failed to set PDEV tx_chain_mask_cck %d", ret); @@ -6526,58 +6471,37 @@ int wma_bus_resume(void) * @handle: wma handle * @disable_target_intr: disable target interrupt * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) +QDF_STATUS wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_pdev_suspend_cmd_fixed_param *cmd; - wmi_buf_t wmibuf; - uint32_t len = sizeof(*cmd); struct hif_opaque_softc *scn; - int ret; + QDF_STATUS status; + struct suspend_params param = {0}; + #ifdef CONFIG_CNSS tpAniSirGlobal pmac = cds_get_context(QDF_MODULE_ID_PE); #endif if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("WMA is closed. can not issue suspend cmd"); - return -EINVAL; + return QDF_STATUS_E_INVAL; } #ifdef CONFIG_CNSS if (NULL == pmac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return -EINVAL; + return QDF_STATUS_E_INVAL; } #endif - - /* - * send the comand to Target to ignore the - * PCIE reset so as to ensure that Host and target - * states are in sync - */ - wmibuf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (wmibuf == NULL) - return -ENOMEM; - - cmd = (wmi_pdev_suspend_cmd_fixed_param *) wmi_buf_data(wmibuf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_suspend_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_suspend_cmd_fixed_param)); - if (disable_target_intr) { - cmd->suspend_opt = WMI_PDEV_SUSPEND_AND_DISABLE_INTR; - } else { - cmd->suspend_opt = WMI_PDEV_SUSPEND; - } qdf_event_reset(&wma_handle->target_suspend); - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, wmibuf, len, - WMI_PDEV_SUSPEND_CMDID); - if (ret < 0) { - qdf_nbuf_free(wmibuf); - return ret; - } + param.disable_target_intr = disable_target_intr; + status = wmi_unified_suspend_send(wma_handle->wmi_handle, + ¶m, + WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(status)) + return status; wmi_set_target_suspend(wma_handle->wmi_handle, true); @@ -6597,7 +6521,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) WMA_LOGE("%s: LOGP is in progress, ignore!", __func__); } #endif - return -EFAULT; + return QDF_STATUS_E_FAULT; } scn = cds_get_context(QDF_MODULE_ID_HIF); @@ -6605,10 +6529,10 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) if (scn == NULL) { WMA_LOGE("%s: Failed to get HIF context", __func__); QDF_ASSERT(0); - return -EFAULT; + return QDF_STATUS_E_FAULT; } - return 0; + return QDF_STATUS_SUCCESS; } /** @@ -6639,40 +6563,26 @@ void wma_target_suspend_acknowledge(void *context) * wma_resume_target() - resume target * @handle: wma handle * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -int wma_resume_target(WMA_HANDLE handle) +QDF_STATUS wma_resume_target(WMA_HANDLE handle) { int ret; tp_wma_handle wma = (tp_wma_handle) handle; - wmi_buf_t wmibuf; - wmi_pdev_resume_cmd_fixed_param *cmd; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (NULL == pMac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return -EINVAL; + return QDF_STATUS_E_INVAL; } #endif /* CONFIG_CNSS */ - wmibuf = wmi_buf_alloc(wma->wmi_handle, sizeof(*cmd)); - if (wmibuf == NULL) { - return -ENOMEM; - } - cmd = (wmi_pdev_resume_cmd_fixed_param *) wmi_buf_data(wmibuf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_resume_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_resume_cmd_fixed_param)); - cmd->reserved0 = 0; qdf_event_reset(&wma->wma_resume_event); - ret = wmi_unified_cmd_send(wma->wmi_handle, wmibuf, sizeof(*cmd), - WMI_PDEV_RESUME_CMDID); - if (ret != EOK) { + qdf_status = wmi_unified_resume_send(wma->wmi_handle, + WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(qdf_status)) WMA_LOGE("Failed to send WMI_PDEV_RESUME_CMDID command"); - wmi_buf_free(wmibuf); - } qdf_status = qdf_wait_single_event(&(wma->wma_resume_event), WMA_RESUME_TIMEOUT); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index b13523458f65..a4fe3fef8ec8 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -65,10 +65,7 @@ #endif /* REMOVE_PKT_LOG */ #include "dbglog_host.h" -/* FIXME: Inclusion of .c looks odd - * but this is how it is in internal codebase - */ -#include "wmi_version_whitelist.c" +#include "wmi_version_whitelist.h" #include "csr_api.h" #include "ol_fw.h" @@ -748,46 +745,6 @@ static int32_t wma_set_priv_cfg(tp_wma_handle wma_handle, return ret; } -/** - * wmi_unified_pdev_set_param() - set pdev parameters - * @wmi_handle: wmi handle - * @param_id: parameter id - * @param_value: parameter value - * - * Return: 0 on success, errno on failure - */ -int -wmi_unified_pdev_set_param(wmi_unified_t wmi_handle, WMI_PDEV_PARAM param_id, - uint32_t param_value) -{ - int ret; - wmi_pdev_set_param_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint16_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_pdev_set_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_set_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_set_param_cmd_fixed_param)); - cmd->reserved0 = 0; - cmd->param_id = param_id; - cmd->param_value = param_value; - WMA_LOGD("Setting pdev param = %x, value = %u", param_id, param_value); - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_PDEV_SET_PARAM_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send set param command ret = %d", ret); - wmi_buf_free(buf); - } - return ret; -} - /** * wma_set_modulated_dtim() - function to configure modulated dtim * @wma: wma handle @@ -805,7 +762,7 @@ static void wma_set_modulated_dtim(tp_wma_handle wma, &wma->interfaces[vdev_id]; bool prev_dtim_enabled; uint32_t listen_interval; - int ret; + QDF_STATUS ret; iface->alt_modulated_dtim = privcmd->param_value; @@ -822,20 +779,20 @@ static void wma_set_modulated_dtim(tp_wma_handle wma, listen_interval = iface->alt_modulated_dtim * iface->dtimPeriod; - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, privcmd->param_vdev_id, WMI_VDEV_PARAM_LISTEN_INTERVAL, listen_interval); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) /* Even if it fails, continue */ WMA_LOGW("Failed to set listen interval %d", listen_interval); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, privcmd->param_vdev_id, WMI_VDEV_PARAM_DTIM_POLICY , NORMAL_DTIM); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to Set to Normal DTIM policy"); } } @@ -851,10 +808,12 @@ static void wma_set_modulated_dtim(tp_wma_handle wma, static void wma_process_cli_set_cmd(tp_wma_handle wma, wma_cli_set_cmd_t *privcmd) { - int ret = 0, vid = privcmd->param_vdev_id, pps_val = 0; + int vid = privcmd->param_vdev_id, pps_val = 0; + QDF_STATUS ret; struct wma_txrx_node *intr = wma->interfaces; tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); struct qpower_params *qparams = &intr[vid].config.qpower_params; + struct pdev_params pdev_param; WMA_LOGD("wmihandle %p", wma->wmi_handle); @@ -877,12 +836,12 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, case VDEV_CMD: WMA_LOGD("vdev id %d pid %d pval %d", privcmd->param_vdev_id, privcmd->param_id, privcmd->param_value); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, privcmd->param_vdev_id, privcmd->param_id, privcmd->param_value); - if (ret) { - WMA_LOGE("wmi_unified_vdev_set_param_send failed ret %d", + if (QDF_IS_STATUS_ERROR(ret)) { + WMA_LOGE("wma_vdev_set_param failed ret %d", ret); return; } @@ -895,11 +854,13 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, wma_update_txrx_chainmask(wma->num_rf_chains, &privcmd->param_value); } - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - privcmd->param_id, - privcmd->param_value); - if (ret) { - WMA_LOGE("wmi_unified_vdev_set_param_send failed ret %d", + pdev_param.param_id = privcmd->param_id; + pdev_param.param_value = privcmd->param_value; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdev_param, + WMA_WILDCARD_PDEV_ID); + if (QDF_IS_STATUS_ERROR(ret)) { + WMA_LOGE("wma_vdev_set_param failed ret %d", ret); return; } @@ -953,7 +914,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, htc_dump(wma->htc_handle, WD_DUMP, false); break; case GEN_PARAM_CRASH_INJECT: - ret = wmi_crash_inject(wma->wmi_handle, + ret = wma_crash_inject(wma, privcmd->param_value, privcmd->param_sec_value); break; @@ -1078,17 +1039,16 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID, ret); break; -#ifdef FEATURE_GREEN_AP case WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID: /* Set the Green AP */ - ret = wmi_unified_pdev_green_ap_ps_enable_cmd - (wma->wmi_handle, privcmd->param_value); + ret = wmi_unified_green_ap_ps_send + (wma->wmi_handle, privcmd->param_value, + WMA_WILDCARD_PDEV_ID); if (ret) { WMA_LOGE("Set GreenAP Failed val %d", privcmd->param_value); } break; -#endif /* FEATURE_GREEN_AP */ default: WMA_LOGE("Invalid param id 0x%x", privcmd->param_id); @@ -1174,7 +1134,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMA_LOGD("QPOWER CLI CMD:Ps Poll Cnt val %d", privcmd->param_value); /* Set the QPower Ps Poll Count */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vid, WMI_STA_PS_PARAM_QPOWER_PSPOLL_COUNT, privcmd->param_value); if (ret) { @@ -1188,7 +1148,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMA_LOGD("QPOWER CLI CMD:Max Tx Before wake val %d", privcmd->param_value); /* Set the QPower Max Tx Before Wake */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vid, WMI_STA_PS_PARAM_QPOWER_MAX_TX_BEFORE_WAKE, privcmd->param_value); if (ret) { @@ -1203,7 +1163,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMA_LOGD("QPOWER CLI CMD:Ps Poll Wake Inv val %d", privcmd->param_value); /* Set the QPower Spec Ps Poll Wake Inv */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vid, WMI_STA_PS_PARAM_QPOWER_SPEC_PSPOLL_WAKE_INTERVAL, privcmd->param_value); if (ret) { @@ -1218,7 +1178,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMA_LOGD("QPOWER CLI CMD:Spec NoData Ps Poll val %d", privcmd->param_value); /* Set the QPower Spec NoData PsPoll */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vid, WMI_STA_PS_PARAM_QPOWER_SPEC_MAX_SPEC_NODATA_PSPOLL, privcmd->param_value); if (ret) { @@ -1301,7 +1261,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, privcmd->param_vdev_id, &intr[vid].config.gtx_info); if (ret) { - WMA_LOGE("wmi_unified_vdev_set_param_send" + WMA_LOGE("wma_vdev_set_param" " failed ret %d", ret); return; } @@ -1445,7 +1405,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, break; } } else if (5 == privcmd->param_vp_dev) { - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, privcmd->param_vdev_id, WMI_VDEV_PARAM_PACKET_POWERSAVE, pps_val); @@ -1475,16 +1435,33 @@ static int wma_process_fw_event(tp_wma_handle wma, return 0; } +/** + * wmi_process_fw_event_tasklet_ctx() - process in tasklet context + * @ctx: handle to wmi + * @ev: wmi event buffer + * + * Event process by below function will be in tasket context, + * need to use this method only for time sensitive functions. + * + * Return: none + */ +static int wma_process_fw_event_tasklet_ctx(void *ctx, void *ev) +{ + wmi_process_fw_event(ctx, ev); + + return 0; +} + /** * wma_process_fw_event_handler() - common event handler to serialize * event processing through mc_thread - * @wmi_handle: wmi handle - * @evt_buf: event buffer + * @ctx: wmi context + * @ev: event buffer + * @rx_ctx: rx execution context * * Return: 0 on success, errno on failure */ -int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, - wmi_buf_t evt_buf) +static int wma_process_fw_event_mc_thread_ctx(void *ctx, void *ev) { wma_process_fw_event_params *params_buf; cds_msg_t cds_msg = { 0 }; @@ -1492,12 +1469,12 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, params_buf = qdf_mem_malloc(sizeof(wma_process_fw_event_params)); if (!params_buf) { WMA_LOGE("%s: Failed alloc memory for params_buf", __func__); - qdf_nbuf_free(evt_buf); + qdf_nbuf_free(ev); return -ENOMEM; } - params_buf->wmi_handle = wmi_handle; - params_buf->evt_buf = evt_buf; + params_buf->wmi_handle = (struct wmi_unified *)ctx; + params_buf->evt_buf = (wmi_buf_t *)ev; cds_msg.type = WMA_PROCESS_FW_EVENT; cds_msg.bodyptr = params_buf; @@ -1507,7 +1484,7 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, cds_mq_post_message(CDS_MQ_ID_WMA, &cds_msg)) { WMA_LOGP("%s: Failed to post WMA_PROCESS_FW_EVENT msg", __func__); - qdf_nbuf_free(evt_buf); + qdf_nbuf_free(ev); qdf_mem_free(params_buf); return -EFAULT; } @@ -1516,6 +1493,31 @@ int wma_process_fw_event_handler(struct wmi_unified *wmi_handle, } +/** + * wma_process_fw_event_handler() - common event handler to serialize + * event processing through mc_thread + * @ctx: wmi context + * @ev: event buffer + * @rx_ctx: rx execution context + * + * Return: 0 on success, errno on failure + */ +int wma_process_fw_event_handler(void *ctx, void *ev, uint8_t rx_ctx) +{ + int err = 0; + + if (rx_ctx == WMA_RX_SERIALIZER_CTX) { + err = wma_process_fw_event_mc_thread_ctx(ctx, ev); + } else if (rx_ctx == WMA_RX_TASKLET_CTX) { + wma_process_fw_event_tasklet_ctx(ctx, ev); + } else { + WMA_LOGE("%s: invalid wmi event execution context", __func__); + qdf_nbuf_free(ev); + } + + return err; +} + #ifdef QCA_LL_TX_FLOW_CONTROL_V2 /** * ol_cfg_set_flow_control_parameters() - set flow control parameters @@ -1597,6 +1599,9 @@ QDF_STATUS wma_open(void *cds_context, void *wmi_handle; QDF_STATUS qdf_status; struct txrx_pdev_cfg_param_t olCfg = { 0 }; + struct wmi_rx_ops ops; + + bool use_cookie = false; WMA_LOGD("%s: Enter", __func__); @@ -1632,9 +1637,11 @@ QDF_STATUS wma_open(void *cds_context, qdf_wake_lock_create(&wma_handle->wow_wake_lock, "wlan_wow_wl"); } + /* Attach mc_thread context processing function */ + ops.wma_process_fw_event_handler_cbk = wma_process_fw_event_handler; /* attach the wmi */ - wmi_handle = wmi_unified_attach(wma_handle, - wma_process_fw_event_handler); + wmi_handle = wmi_unified_attach(wma_handle, NULL, + WMI_TLV_TARGET, use_cookie, &ops); if (!wmi_handle) { WMA_LOGP("%s: failed to attach WMI", __func__); qdf_status = QDF_STATUS_E_NOMEM; @@ -1642,7 +1649,18 @@ QDF_STATUS wma_open(void *cds_context, } WMA_LOGA("WMA --> wmi_unified_attach - success"); - + wmi_unified_register_event_handler(wmi_handle, + WMI_SERVICE_READY_EVENTID, + wma_rx_service_ready_event, + WMA_RX_SERIALIZER_CTX); + wmi_unified_register_event_handler(wmi_handle, + WMI_SERVICE_READY_EXT_EVENTID, + wma_rx_service_ready_ext_event, + WMA_RX_SERIALIZER_CTX); + wmi_unified_register_event_handler(wmi_handle, + WMI_READY_EVENTID, + wma_rx_ready_event, + WMA_RX_SERIALIZER_CTX); /* Save the WMI & HTC handle */ wma_handle->wmi_handle = wmi_handle; wma_handle->htc_handle = htc_handle; @@ -1763,12 +1781,14 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->max_bssid); /* Register the debug print event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_DEBUG_PRINT_EVENTID, - wma_unified_debug_print_event_handler); + WMI_DEBUG_PRINT_EVENTID, + wma_unified_debug_print_event_handler, + WMA_RX_SERIALIZER_CTX); /* Register profiling event Handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_WLAN_PROFILE_DATA_EVENTID, - wma_profile_data_report_event_handler); + wma_profile_data_report_event_handler, + WMA_RX_SERIALIZER_CTX); wma_handle->tgt_cfg_update_cb = tgt_cfg_cb; wma_handle->dfs_radar_indication_cb = radar_ind_cb; @@ -1845,43 +1865,52 @@ QDF_STATUS wma_open(void *cds_context, /* Register vdev start response event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_VDEV_START_RESP_EVENTID, - wma_vdev_start_resp_handler); + wma_vdev_start_resp_handler, + WMA_RX_SERIALIZER_CTX); /* Register vdev stop response event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_VDEV_STOPPED_EVENTID, - wma_vdev_stop_resp_handler); + wma_vdev_stop_resp_handler, + WMA_RX_SERIALIZER_CTX); /* register for STA kickout function */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_STA_KICKOUT_EVENTID, - wma_peer_sta_kickout_event_handler); + wma_peer_sta_kickout_event_handler, + WMA_RX_SERIALIZER_CTX); /* register for stats response event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_UPDATE_STATS_EVENTID, - wma_stats_event_handler); + wma_stats_event_handler, + WMA_RX_SERIALIZER_CTX); /* register for linkspeed response event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_ESTIMATED_LINKSPEED_EVENTID, - wma_link_speed_event_handler); + wma_link_speed_event_handler, + WMA_RX_SERIALIZER_CTX); #ifdef FEATURE_OEM_DATA_SUPPORT wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_OEM_CAPABILITY_EVENTID, - wma_oem_capability_event_callback); + wma_oem_capability_event_callback, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_OEM_MEASUREMENT_REPORT_EVENTID, - wma_oem_measurement_report_event_callback); + WMI_OEM_MEASUREMENT_REPORT_EVENTID, + wma_oem_measurement_report_event_callback, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_OEM_ERROR_REPORT_EVENTID, - wma_oem_error_report_event_callback); + wma_oem_error_report_event_callback, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_OEM_RESPONSE_EVENTID, - wma_oem_data_response_handler); + wma_oem_data_response_handler, + WMA_RX_SERIALIZER_CTX); #endif /* FEATURE_OEM_DATA_SUPPORT */ /* * Register appropriate DFS phyerr event handler for @@ -1893,18 +1922,21 @@ QDF_STATUS wma_open(void *cds_context, /* Register peer change event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_STATE_EVENTID, - wma_peer_state_change_event_handler); + wma_peer_state_change_event_handler, + WMA_RX_WORK_CTX); /* Register beacon tx complete event id. The event is required * for sending channel switch announcement frames */ wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_OFFLOAD_BCN_TX_STATUS_EVENTID, - wma_unified_bcntx_status_event_handler); + WMI_OFFLOAD_BCN_TX_STATUS_EVENTID, + wma_unified_bcntx_status_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_UPDATE_VDEV_RATE_STATS_EVENTID, - wma_link_status_event_handler); + wma_link_status_event_handler, + WMA_RX_SERIALIZER_CTX); #ifdef WLAN_FEATURE_LINK_LAYER_STATS /* Register event handler for processing Link Layer Stats * response from the FW @@ -1919,7 +1951,8 @@ QDF_STATUS wma_open(void *cds_context, */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_UPDATE_FW_MEM_DUMP_EVENTID, - wma_fw_mem_dump_event_handler); + wma_fw_mem_dump_event_handler, + WMA_RX_SERIALIZER_CTX); /* Firmware debug log */ qdf_status = dbglog_init(wma_handle->wmi_handle); @@ -1956,25 +1989,29 @@ QDF_STATUS wma_open(void *cds_context, #ifdef FEATURE_WLAN_TDLS wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_TDLS_PEER_EVENTID, - wma_tdls_event_handler); + wma_tdls_event_handler, + WMA_RX_SERIALIZER_CTX); #endif /* FEATURE_WLAN_TDLS */ /* register for install key completion event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID, - wma_vdev_install_key_complete_event_handler); + WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID, + wma_vdev_install_key_complete_event_handler, + WMA_RX_SERIALIZER_CTX); #ifdef WLAN_FEATURE_NAN /* register for nan response event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_NAN_EVENTID, - wma_nan_rsp_event_handler); + wma_nan_rsp_event_handler, + WMA_RX_SERIALIZER_CTX); #endif /* WLAN_FEATURE_NAN */ #ifdef WLAN_FEATURE_STATS_EXT /* register for extended stats event */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_STATS_EXT_EVENTID, - wma_stats_ext_event_handler); + wma_stats_ext_event_handler, + WMA_RX_SERIALIZER_CTX); #endif /* WLAN_FEATURE_STATS_EXT */ #ifdef FEATURE_WLAN_EXTSCAN wma_register_extscan_event_handler(wma_handle); @@ -1985,27 +2022,32 @@ QDF_STATUS wma_open(void *cds_context, #ifdef WLAN_FEATURE_ROAM_OFFLOAD wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_ROAM_SYNCH_EVENTID, - wma_roam_synch_event_handler); + wma_roam_synch_event_handler, + WMA_RX_SERIALIZER_CTX); #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_RSSI_BREACH_EVENTID, - wma_rssi_breached_event_handler); + wma_rssi_breached_event_handler, + WMA_RX_SERIALIZER_CTX); qdf_wake_lock_create(&wma_handle->wmi_cmd_rsp_wake_lock, - "wlan_fw_rsp_wakelock"); + "wlan_fw_rsp_wakelock"); wma_handle->wmi_cmd_rsp_runtime_lock = qdf_runtime_lock_init("wlan_fw_rsp_runtime_lock"); /* Register peer assoc conf event handler */ wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_ASSOC_CONF_EVENTID, - wma_peer_assoc_conf_handler); + wma_peer_assoc_conf_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_VDEV_DELETE_RESP_EVENTID, - wma_vdev_delete_handler); + wma_vdev_delete_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PEER_DELETE_RESP_EVENTID, - wma_peer_delete_handler); + wma_peer_delete_handler, + WMA_RX_SERIALIZER_CTX); return QDF_STATUS_SUCCESS; err_dbglog_init: @@ -2638,7 +2680,8 @@ QDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SCAN_EVENTID, - wma_scan_event_callback); + wma_scan_event_callback, + WMA_RX_SERIALIZER_CTX); if (0 != status) { WMA_LOGP("%s: Failed to register scan callback", __func__); qdf_status = QDF_STATUS_E_FAILURE; @@ -2647,7 +2690,8 @@ QDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_ROAM_EVENTID, - wma_roam_event_callback); + wma_roam_event_callback, + WMA_RX_WORK_CTX); if (0 != status) { WMA_LOGP("%s: Failed to register Roam callback", __func__); qdf_status = QDF_STATUS_E_FAILURE; @@ -2656,7 +2700,8 @@ QDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_WOW_WAKEUP_HOST_EVENTID, - wma_wow_wakeup_host_event); + wma_wow_wakeup_host_event, + WMA_RX_TASKLET_CTX); if (status) { WMA_LOGP("%s: Failed to register wow wakeup host event handler", __func__); @@ -2666,7 +2711,8 @@ QDF_STATUS wma_start(void *cds_ctx) status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PDEV_RESUME_EVENTID, - wma_pdev_resume_event_handler); + wma_pdev_resume_event_handler, + WMA_RX_TASKLET_CTX); if (status) { WMA_LOGP("%s: Failed to register PDEV resume event handler", __func__); @@ -2681,8 +2727,9 @@ QDF_STATUS wma_start(void *cds_ctx) WMA_LOGD("FW supports pno offload, registering nlo match handler"); status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_NLO_MATCH_EVENTID, - wma_nlo_match_evt_handler); + WMI_NLO_MATCH_EVENTID, + wma_nlo_match_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register nlo match event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2690,8 +2737,9 @@ QDF_STATUS wma_start(void *cds_ctx) } status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_NLO_SCAN_COMPLETE_EVENTID, - wma_nlo_scan_cmp_evt_handler); + WMI_NLO_SCAN_COMPLETE_EVENTID, + wma_nlo_scan_cmp_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register nlo scan comp event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2703,16 +2751,18 @@ QDF_STATUS wma_start(void *cds_ctx) #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) WMA_LOGE("MCC TX Pause Event Handler register"); status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_TX_PAUSE_EVENTID, - wma_mcc_vdev_tx_pause_evt_handler); + WMI_TX_PAUSE_EVENTID, + wma_mcc_vdev_tx_pause_evt_handler, + WMA_RX_TASKLET_CTX); #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ #ifdef FEATURE_WLAN_CH_AVOID WMA_LOGD("Registering channel to avoid handler"); status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_WLAN_FREQ_AVOID_EVENTID, - wma_channel_avoid_evt_handler); + WMI_WLAN_FREQ_AVOID_EVENTID, + wma_channel_avoid_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register channel to avoid event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2722,8 +2772,9 @@ QDF_STATUS wma_start(void *cds_ctx) #ifdef FEATURE_WLAN_AUTO_SHUTDOWN WMA_LOGD("Registering auto shutdown handler"); status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_HOST_AUTO_SHUTDOWN_EVENTID, - wma_auto_shutdown_event_handler); + WMI_HOST_AUTO_SHUTDOWN_EVENTID, + wma_auto_shutdown_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register WMI Auto shutdown event handler"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2731,8 +2782,9 @@ QDF_STATUS wma_start(void *cds_ctx) } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_THERMAL_MGMT_EVENTID, - wma_thermal_mgmt_evt_handler); + WMI_THERMAL_MGMT_EVENTID, + wma_thermal_mgmt_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register thermal mitigation event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2775,8 +2827,9 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize the get temperature event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_PDEV_TEMPERATURE_EVENTID, - wma_pdev_temperature_evt_handler); + WMI_PDEV_TEMPERATURE_EVENTID, + wma_pdev_temperature_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register get_temperature event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2786,7 +2839,8 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize the log flush complete event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DEBUG_MESG_FLUSH_COMPLETE_EVENTID, - wma_flush_complete_evt_handler); + wma_flush_complete_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log flush complete event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2796,7 +2850,8 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize the WMI_SOC_SET_HW_MODE_RESP_EVENTID event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_HW_MODE_RESP_EVENTID, - wma_soc_set_hw_mode_resp_evt_handler); + wma_soc_set_hw_mode_resp_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register set hw mode resp event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2806,7 +2861,8 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize the WMI_SOC_HW_MODE_TRANSITION_EVENTID event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_HW_MODE_TRANSITION_EVENTID, - wma_soc_hw_mode_transition_evt_handler); + wma_soc_hw_mode_transition_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -2816,7 +2872,8 @@ QDF_STATUS wma_start(void *cds_ctx) /* Initialize the set dual mac configuration event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_SOC_SET_DUAL_MAC_CONFIG_RESP_EVENTID, - wma_soc_set_dual_mode_config_resp_evt_handler); + wma_soc_set_dual_mode_config_resp_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register hw mode transition event cb"); qdf_status = QDF_STATUS_E_FAILURE; @@ -3800,7 +3857,8 @@ done: * * Return: none */ -void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) +int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, + uint32_t length) { wmi_buf_t buf; uint32_t len; @@ -3817,13 +3875,13 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) param_buf = (WMI_SERVICE_READY_EVENTID_param_tlvs *) cmd_param_info; if (!(handle && param_buf)) { WMA_LOGP("%s: Invalid arguments", __func__); - return; + return -EINVAL; } ev = param_buf->fixed_param; if (!ev) { WMA_LOGP("%s: Invalid buffer", __func__); - return; + return -EINVAL; } WMA_LOGA("WMA <-- WMI_SERVICE_READY_EVENTID"); @@ -3906,10 +3964,11 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) /* SWBA event handler for beacon transmission */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_HOST_SWBA_EVENTID, - wma_beacon_swba_handler); + wma_beacon_swba_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register swba beacon event cb"); - return; + return -EINVAL; } #ifdef WLAN_FEATURE_LPSS wma_handle->lpss_support = @@ -3930,11 +3989,12 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) WMA_LOGD("%s: FW support CSA offload capability", __func__); status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_CSA_HANDLING_EVENTID, - wma_csa_offload_handler); + WMI_CSA_HANDLING_EVENTID, + wma_csa_offload_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register CSA offload event cb"); - return; + return -EINVAL; } } @@ -3944,7 +4004,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) status = wmi_desc_pool_init(wma_handle, WMI_DESC_POOL_MAX); if (status) { WMA_LOGE("Failed to initialize wmi descriptor pool"); - return; + return -EINVAL; } /* * Register Tx completion event handler for MGMT Tx over WMI @@ -3953,10 +4013,11 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) status = wmi_unified_register_event_handler( wma_handle->wmi_handle, WMI_MGMT_TX_COMPLETION_EVENTID, - wma_mgmt_tx_completion_handler); + wma_mgmt_tx_completion_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register MGMT over WMI completion handler"); - return; + return -EINVAL; } } else { @@ -3967,29 +4028,32 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) WMI_SERVICE_GTK_OFFLOAD)) { status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_GTK_OFFLOAD_STATUS_EVENTID, - wma_gtk_offload_status_event); + WMI_GTK_OFFLOAD_STATUS_EVENTID, + wma_gtk_offload_status_event, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register GTK offload event cb"); - return; + return -EINVAL; } } #endif /* WLAN_FEATURE_GTK_OFFLOAD */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_P2P_NOA_EVENTID, - wma_p2p_noa_event_handler); + wma_p2p_noa_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE("Failed to register WMI_P2P_NOA_EVENTID callback"); - return; + return -EINVAL; } status = wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_TBTTOFFSET_UPDATE_EVENTID, - wma_tbttoffset_update_event_handler); + WMI_TBTTOFFSET_UPDATE_EVENTID, + wma_tbttoffset_update_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) { WMA_LOGE ("Failed to register WMI_TBTTOFFSET_UPDATE_EVENTID callback"); - return; + return -EINVAL; } /* register the Enhanced Green AP event handler */ @@ -3998,10 +4062,11 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) /* Initialize the log supported event handler */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID, - wma_log_supported_evt_handler); + wma_log_supported_evt_handler, + WMA_RX_SERIALIZER_CTX); if (status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to register log supported event cb"); - return; + return -EINVAL; } qdf_mem_copy(target_cap.wmi_service_bitmap, @@ -4017,7 +4082,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) buf = wma_setup_wmi_init_msg(wma_handle, ev, param_buf, &len); if (!buf) { WMA_LOGE("Failed to setup buffer for wma init command"); - return; + return -EINVAL; } /* A host, which supports WMI_SERVICE_READY_EXT_EVENTID, would need to @@ -4036,7 +4101,7 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) if (status != EOK) { WMA_LOGE("Failed to send WMI_INIT_CMDID command"); wmi_buf_free(buf); - return; + return -EINVAL; } } else { /* Need to save and send the WMI INIT command only after @@ -4055,16 +4120,20 @@ void wma_rx_service_ready_event(WMA_HANDLE handle, void *cmd_param_info) WMA_LOGA("%s: WMA waiting for WMI_SERVICE_READY_EXT_EVENTID", __func__); } + + return 0; } /** * wma_rx_service_ready_ext_event() - evt handler for sevice ready ext event. * @handle: wma handle * @event: params of the service ready extended event + * @length: param length * * Return: none */ -void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) +int wma_rx_service_ready_ext_event(void *handle, uint8_t *event, + uint32_t length) { tp_wma_handle wma_handle = (tp_wma_handle) handle; WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; @@ -4076,26 +4145,26 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) if (!wma_handle) { WMA_LOGP("%s: Invalid WMA handle", __func__); - return; + return -EINVAL; } param_buf = (WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *) event; if (!param_buf) { WMA_LOGP("%s: Invalid event", __func__); - return; + return -EINVAL; } ev = param_buf->fixed_param; if (!ev) { WMA_LOGP("%s: Invalid buffer", __func__); - return; + return -EINVAL; } WMA_LOGA("WMA <-- WMI_SERVICE_READY_EXT_EVENTID"); if (!wma_handle->saved_wmi_init_cmd.buf) { WMA_LOGP("Service ready ext event w/o WMI_SERVICE_EXT_MSG!"); - return; + return -EINVAL; } WMA_LOGA("%s: Defaults: scan config:%x FW mode config:%x", @@ -4105,7 +4174,7 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) ret = qdf_mc_timer_stop(&wma_handle->service_ready_ext_timer); if (!QDF_IS_STATUS_SUCCESS(ret)) { WMA_LOGP("Failed to stop the service ready ext timer"); - return; + return -EINVAL; } WMA_LOGA("WMA --> WMI_INIT_CMDID"); @@ -4126,6 +4195,8 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) wma_init_scan_fw_mode_config(wma_handle, ev->default_conc_scan_config_bits, ev->default_fw_config_bits); + + return 0; } /** @@ -4133,10 +4204,12 @@ void wma_rx_service_ready_ext_event(WMA_HANDLE handle, void *event) * wmi rx ready event. * @handle: wma handle * @cmd_param_info: command params info + * @length: param length * * Return: none */ -void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) +int wma_rx_ready_event(void *handle, uint8_t *cmd_param_info, + uint32_t length) { tp_wma_handle wma_handle = (tp_wma_handle) handle; WMI_READY_EVENTID_param_tlvs *param_buf = NULL; @@ -4148,7 +4221,7 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) if (!(wma_handle && param_buf)) { WMA_LOGP("%s: Invalid arguments", __func__); QDF_ASSERT(0); - return; + return -EINVAL; } WMA_LOGA("WMA <-- WMI_READY_EVENTID"); @@ -4206,6 +4279,8 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info) qdf_event_set(&wma_handle->wma_ready_event); WMA_LOGD("Exit"); + + return 0; } /** @@ -4345,7 +4420,7 @@ QDF_STATUS wma_set_ppsconfig(uint8_t vdev_id, uint16_t pps_param, pkt_pwr_save_config: WMA_LOGD("vdev_id:%d val:0x%x pps_val:0x%x", vdev_id, val, pps_val); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_PACKET_POWERSAVE, pps_val); break; @@ -4424,18 +4499,18 @@ QDF_STATUS wma_process_set_miracast(tp_wma_handle wma, uint32_t *miracast_val) static QDF_STATUS wma_config_stats_factor(tp_wma_handle wma, struct sir_stats_avg_factor *avg_factor) { - int ret; + QDF_STATUS ret; if (NULL == wma || NULL == avg_factor) { WMA_LOGE("%s: Invalid input of stats avg factor", __func__); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, avg_factor->vdev_id, WMI_VDEV_PARAM_STATS_AVG_FACTOR, avg_factor->stats_avg_factor); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE(" failed to set avg_factor for vdev_id %d", avg_factor->vdev_id); } @@ -4459,18 +4534,18 @@ static QDF_STATUS wma_config_stats_factor(tp_wma_handle wma, static QDF_STATUS wma_config_guard_time(tp_wma_handle wma, struct sir_guard_time_request *guard_time) { - int ret; + QDF_STATUS ret; if (NULL == wma || NULL == guard_time) { WMA_LOGE("%s: Invalid input of guard time", __func__); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, guard_time->vdev_id, WMI_VDEV_PARAM_RX_LEAK_WINDOW, guard_time->guard_time); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE(" failed to set guard time for vdev_id %d", guard_time->vdev_id); } @@ -5635,13 +5710,18 @@ QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, * This function will send a command to FW in order to simulate different * kinds of FW crashes. * - * Return: 0 for success or reasons for failure + * Return: QDF_STATUS_SUCCESS for success or error code */ -int wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, +QDF_STATUS wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, uint32_t delay_time_ms) { - return wmi_crash_inject(wma_handle->wmi_handle, type, delay_time_ms); + struct crash_inject param; + param.type = type; + param.delay_time_ms = delay_time_ms; + + return wmi_crash_inject(wma_handle->wmi_handle, ¶m); } + #if defined(FEATURE_LRO) /** * wma_lro_init() - sends LRO configuration to FW diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 9945f9c8e670..1d4804e8ae5d 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -566,6 +566,7 @@ void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) { uint32_t min_inactive_time, max_inactive_time, max_unresponsive_time; struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); + QDF_STATUS status; if (NULL == mac) { WMA_LOGE("%s: Failed to get mac", __func__); @@ -577,19 +578,25 @@ void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id) min_inactive_time = max_inactive_time / 2; - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, - vdev_id, WMI_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS, - min_inactive_time)) + status = wma_vdev_set_param(wma->wmi_handle, + vdev_id, + WMI_VDEV_PARAM_AP_KEEPALIVE_MIN_IDLE_INACTIVE_TIME_SECS, + min_inactive_time); + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGE("Failed to Set AP MIN IDLE INACTIVE TIME"); - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, - vdev_id, WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS, - max_inactive_time)) + status = wma_vdev_set_param(wma->wmi_handle, + vdev_id, + WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_IDLE_INACTIVE_TIME_SECS, + max_inactive_time); + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGE("Failed to Set AP MAX IDLE INACTIVE TIME"); - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, - vdev_id, WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS, - max_unresponsive_time)) + status = wma_vdev_set_param(wma->wmi_handle, + vdev_id, + WMI_VDEV_PARAM_AP_KEEPALIVE_MAX_UNRESPONSIVE_TIME_SECS, + max_unresponsive_time); + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGE("Failed to Set MAX UNRESPONSIVE TIME"); WMA_LOGD("%s:vdev_id:%d min_inactive_time: %u max_inactive_time: %u" @@ -1061,7 +1068,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, #ifdef FEATURE_WLAN_WAPI if (params->encryptType == eSIR_ED_WPI) { - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, params->smesessionId, WMI_VDEV_PARAM_DROP_UNENCRY, false); @@ -1228,16 +1235,16 @@ int wmi_unified_vdev_set_gtx_cfg_send(wmi_unified_t wmi_handle, uint32_t if_id, void wma_update_protection_mode(tp_wma_handle wma, uint8_t vdev_id, uint8_t llbcoexist) { - int ret; + QDF_STATUS ret; enum ieee80211_protmode prot_mode; prot_mode = llbcoexist ? IEEE80211_PROT_CTSONLY : IEEE80211_PROT_NONE; - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_PROTECTION_MODE, prot_mode); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to send wmi protection mode cmd"); else WMA_LOGD("Updated protection mode %d to target", prot_mode); @@ -1255,13 +1262,13 @@ static void wma_update_beacon_interval(tp_wma_handle wma, uint8_t vdev_id, uint16_t beaconInterval) { - int ret; + QDF_STATUS ret; - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_BEACON_INTERVAL, beaconInterval); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to update beacon interval"); else WMA_LOGI("Updated beacon interval %d for vdev %d", @@ -1311,7 +1318,7 @@ void wma_update_cfg_params(tp_wma_handle wma, tSirMsgQ *cfgParam) uint8_t vdev_id; uint32_t param_id; uint32_t cfg_val; - int ret; + QDF_STATUS ret; /* get mac to acess CFG data base */ struct sAniSirGlobal *pmac; @@ -1343,10 +1350,10 @@ void wma_update_cfg_params(tp_wma_handle wma, tSirMsgQ *cfgParam) for (vdev_id = 0; vdev_id < wma->max_bssid; vdev_id++) { if (wma->interfaces[vdev_id].handle != 0) { - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, param_id, cfg_val); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Update cfg params failed for vdevId %d", vdev_id); } @@ -1739,6 +1746,7 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, int16_t new_peer_num; uint16_t new_timer_value_sec; uint32_t new_timer_value_ms; + QDF_STATUS status; if (peer_num_delta != 1 && peer_num_delta != -1) { WMA_LOGE("Invalid peer_num_delta value %d", peer_num_delta); @@ -1784,9 +1792,10 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, new_timer_value_ms = ((uint32_t) new_timer_value_sec) * 1000; - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, - WMI_VDEV_PARAM_IBSS_MAX_BCN_LOST_MS, - new_timer_value_ms)) { + status = wma_vdev_set_param(wma->wmi_handle, vdev_id, + WMI_VDEV_PARAM_IBSS_MAX_BCN_LOST_MS, + new_timer_value_ms); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("Failed to set IBSS link monitoring timer value"); return; } @@ -2568,6 +2577,7 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) QDF_STATUS status; uint8_t *p2p_ie; tpAniBeaconStruct beacon; + struct vdev_up_params param = {0}; beacon = (tpAniBeaconStruct) (bcn_info->beacon); vdev = wma_find_vdev_by_addr(wma, beacon->macHdr.sa, &vdev_id); @@ -2604,8 +2614,12 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) return; } if (!wma->interfaces[vdev_id].vdev_up) { - if (wmi_unified_vdev_up_send(wma->wmi_handle, vdev_id, 0, - bcn_info->bssId) < 0) { + param.vdev_id = vdev_id; + param.assoc_id = 0; + status = wmi_unified_vdev_up_send(wma->wmi_handle, + bcn_info->bssId, + ¶m); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s : failed to send vdev up", __func__); return; } @@ -2813,7 +2827,7 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) { tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); - int ret = -EIO; + QDF_STATUS ret = QDF_STATUS_E_FAILURE; if (NULL == wma) { WMA_LOGE("%s: Failed to get wma", __func__); @@ -2822,17 +2836,17 @@ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) switch (ht_capab) { case WNI_CFG_HT_CAP_INFO_ADVANCE_CODING: - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_LDPC, value); break; case WNI_CFG_HT_CAP_INFO_TX_STBC: - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_TX_STBC, value); break; case WNI_CFG_HT_CAP_INFO_RX_STBC: - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_RX_STBC, value); break; @@ -2840,16 +2854,16 @@ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value) case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ: WMA_LOGE("%s: ht_capab = %d, value = %d", __func__, ht_capab, value); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_SGI, value); - if (ret == 0) + if (ret == QDF_STATUS_SUCCESS) wma->interfaces[vdev_id].config.shortgi = value; break; default: WMA_LOGE("%s:INVALID HT CONFIG", __func__); } - return (ret) ? QDF_STATUS_E_FAILURE : QDF_STATUS_SUCCESS; + return ret; } /** @@ -3380,7 +3394,8 @@ QDF_STATUS wma_register_mgmt_frm_client( if (wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_MGMT_RX_EVENTID, - wma_mgmt_rx_process) != 0) { + wma_mgmt_rx_process, + WMA_RX_WORK_CTX) != 0) { WMA_LOGE("Failed to register rx mgmt handler with wmi"); return QDF_STATUS_E_FAILURE; } diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 3a63ca5ef977..818dadc61f21 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -1087,34 +1087,39 @@ int wma_ocb_register_event_handlers(tp_wma_handle wma_handle) /* Initialize the members in WMA used by wma_ocb */ status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_OCB_SET_CONFIG_RESP_EVENTID, - wma_ocb_set_config_event_handler); + wma_ocb_set_config_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) return status; status = wmi_unified_register_event_handler( wma_handle->wmi_handle, WMI_OCB_GET_TSF_TIMER_RESP_EVENTID, - wma_ocb_get_tsf_timer_resp_event_handler); + wma_ocb_get_tsf_timer_resp_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) return status; status = wmi_unified_register_event_handler( wma_handle->wmi_handle, WMI_DCC_GET_STATS_RESP_EVENTID, - wma_dcc_get_stats_resp_event_handler); + wma_dcc_get_stats_resp_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) return status; status = wmi_unified_register_event_handler( wma_handle->wmi_handle, WMI_DCC_UPDATE_NDL_RESP_EVENTID, - wma_dcc_update_ndl_resp_event_handler); + wma_dcc_update_ndl_resp_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) return status; status = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_DCC_STATS_EVENTID, - wma_dcc_stats_event_handler); + wma_dcc_stats_event_handler, + WMA_RX_SERIALIZER_CTX); if (status) return status; diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index 4330b4dede17..a618b3fbd603 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -70,14 +70,14 @@ #include "wma_internal.h" /** - * wmi_unified_modem_power_state() - set modem power state to fw + * wma_unified_modem_power_state() - set modem power state to fw * @wmi_handle: wmi handle * @param_value: parameter value * * Return: 0 for success or error code */ static int -wmi_unified_modem_power_state(wmi_unified_t wmi_handle, uint32_t param_value) +wma_unified_modem_power_state(wmi_unified_t wmi_handle, uint32_t param_value) { int ret; wmi_modem_power_state_cmd_param *cmd; @@ -107,59 +107,42 @@ wmi_unified_modem_power_state(wmi_unified_t wmi_handle, uint32_t param_value) } /** - * wmi_unified_set_sta_ps_param() - set sta power save parameter to fw + * wma_unified_set_sta_ps_param() - set sta power save parameter to fw * @wmi_handle: wmi handle * @vdev_id: vdev id * @param: param * @value: parameter value * - * Return: 0 for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code */ -int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, +QDF_STATUS wma_unified_set_sta_ps_param(wmi_unified_t wmi_handle, uint32_t vdev_id, uint32_t param, uint32_t value) { - wmi_sta_powersave_param_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); tp_wma_handle wma; struct wma_txrx_node *iface; + struct sta_ps_params sta_ps_param = {0}; + QDF_STATUS status; wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { WMA_LOGE("%s: wma is NULL", __func__); - return -EIO; + return QDF_STATUS_E_FAILURE; } - iface = &wma->interfaces[vdev_id]; - WMA_LOGD("Set Sta Ps param vdevId %d Param %d val %d", vdev_id, param, value); + iface = &wma->interfaces[vdev_id]; - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: Set Sta Ps param Mem Alloc Failed", __func__); - return -ENOMEM; - } - - cmd = (wmi_sta_powersave_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_sta_powersave_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_powersave_param_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->param = param; - cmd->value = value; - - if (wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_STA_POWERSAVE_PARAM_CMDID)) { - WMA_LOGE("Set Sta Ps param Failed vdevId %d Param %d val %d", - vdev_id, param, value); - qdf_nbuf_free(buf); - return -EIO; - } + sta_ps_param.vdev_id = vdev_id; + sta_ps_param.param = param; + sta_ps_param.value = value; + status = wmi_unified_sta_ps_cmd_send(wmi_handle, &sta_ps_param); + if (QDF_IS_STATUS_ERROR(status)) + return status; /* Store the PS Status */ iface->ps_enabled = value ? true : false; - return 0; + + return status; } #ifdef QCA_IBSS_SUPPORT @@ -173,75 +156,75 @@ int32_t wmi_unified_set_sta_ps_param(wmi_unified_t wmi_handle, QDF_STATUS wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) { - int ret; + QDF_STATUS ret; - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_ATIM_WINDOW_LENGTH, wma->wma_ibss_power_save_params.atimWindowLength); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed to set WMI_VDEV_PARAM_ATIM_WINDOW_LENGTH ret = %d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED, wma->wma_ibss_power_save_params.isPowerSaveAllowed); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_IBSS_POWER_SAVE_ALLOWED ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED, wma->wma_ibss_power_save_params.isPowerCollapseAllowed); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_POWER_COLLAPSE_ALLOWED ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED, wma->wma_ibss_power_save_params.isAwakeonTxRxEnabled); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IS_AWAKE_ON_TXRX_ENABLED ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_INACTIVITY_CNT, wma->wma_ibss_power_save_params.inactivityCount); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_INACTIVITY_CNT ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS, wma->wma_ibss_power_save_params.txSPEndInactivityTime); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_TXSP_END_INACTIVITY_TIME_MS ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS, wma->wma_ibss_power_save_params.ibssPsWarmupTime); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed, set WMI_VDEV_PARAM_IBSS_PS_WARMUP_TIME_SECS ret=%d", ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE, wma->wma_ibss_power_save_params.ibssPs1RxChainInAtimEnable); - if (ret < 0) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed to set IBSS_PS_1RX_CHAIN_IN_ATIM_WINDOW_ENABLE ret=%d", ret); return QDF_STATUS_E_FAILURE; @@ -251,49 +234,6 @@ wma_set_ibss_pwrsave_params(tp_wma_handle wma, uint8_t vdev_id) } #endif /* QCA_IBSS_SUPPORT */ -/** - * wmi_unified_set_ap_ps_param() - set ap powersave parameters - * @wma_ctx: wma context - * @vdev_id: vdev id - * @peer_addr: peer mac address - * @param: parameter - * @value: prameter value - * - * Return: 0 for success or error code - */ -static int32_t wmi_unified_set_ap_ps_param(void *wma_ctx, uint32_t vdev_id, - uint8_t *peer_addr, uint32_t param, - uint32_t value) -{ - tp_wma_handle wma_handle = (tp_wma_handle) wma_ctx; - wmi_ap_ps_peer_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t err; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set_ap_ps_param cmd"); - return -ENOMEM; - } - cmd = (wmi_ap_ps_peer_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ap_ps_peer_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_ap_ps_peer_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - cmd->param = param; - cmd->value = value; - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), WMI_AP_PS_PEER_PARAM_CMDID); - if (err) { - WMA_LOGE("Failed to send set_ap_ps_param cmd"); - qdf_mem_free(buf); - return -EIO; - } - return 0; -} - /** * wma_set_ap_peer_uapsd() - set powersave parameters in ap mode to fw * @wma: wma handle @@ -302,15 +242,16 @@ static int32_t wmi_unified_set_ap_ps_param(void *wma_ctx, uint32_t vdev_id, * @uapsd_value: uapsd value * @max_sp: maximum service period * - * Return: 0 for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code */ -int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, +QDF_STATUS wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, uint8_t *peer_addr, uint8_t uapsd_value, uint8_t max_sp) { uint32_t uapsd = 0; uint32_t max_sp_len = 0; - int32_t ret = 0; + QDF_STATUS ret; + struct ap_ps_params param = {0}; if (uapsd_value & UAPSD_VO_ENABLED) { uapsd |= WMI_AP_PS_UAPSD_AC3_DELIVERY_EN | @@ -349,11 +290,12 @@ int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, WMA_LOGD("Set WMI_AP_PS_PEER_PARAM_UAPSD 0x%x for %pM", uapsd, peer_addr); - - ret = wmi_unified_set_ap_ps_param(wma, vdev_id, - peer_addr, - WMI_AP_PS_PEER_PARAM_UAPSD, uapsd); - if (ret) { + param.vdev_id = vdev_id; + param.param = WMI_AP_PS_PEER_PARAM_UAPSD; + param.value = uapsd; + ret = wmi_unified_ap_ps_cmd_send(wma->wmi_handle, peer_addr, + ¶m); + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed to set WMI_AP_PS_PEER_PARAM_UAPSD for %pM", peer_addr); return ret; @@ -362,16 +304,18 @@ int32_t wma_set_ap_peer_uapsd(tp_wma_handle wma, uint32_t vdev_id, WMA_LOGD("Set WMI_AP_PS_PEER_PARAM_MAX_SP 0x%x for %pM", max_sp_len, peer_addr); - ret = wmi_unified_set_ap_ps_param(wma, vdev_id, - peer_addr, - WMI_AP_PS_PEER_PARAM_MAX_SP, - max_sp_len); - if (ret) { + param.vdev_id = vdev_id; + param.param = WMI_AP_PS_PEER_PARAM_MAX_SP; + param.value = max_sp_len; + ret = wmi_unified_ap_ps_cmd_send(wma->wmi_handle, peer_addr, + ¶m); + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Failed to set WMI_AP_PS_PEER_PARAM_MAX_SP for %pM", peer_addr); return ret; } - return 0; + + return QDF_STATUS_SUCCESS; } /** @@ -412,7 +356,7 @@ void wma_set_tx_power(WMA_HANDLE handle, { tp_wma_handle wma_handle = (tp_wma_handle) handle; uint8_t vdev_id; - int ret = -1; + QDF_STATUS ret = QDF_STATUS_E_FAILURE; void *pdev; if (tx_pwr_params->dev_mode == QDF_SAP_MODE || @@ -459,20 +403,20 @@ void wma_set_tx_power(WMA_HANDLE handle, /* tx_power changed, Push the tx_power to FW */ WMA_LOGW("%s: Set TX power limit [WMI_VDEV_PARAM_TX_PWRLIMIT] to %d", __func__, tx_pwr_params->power); - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + ret = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_TX_PWRLIMIT, tx_pwr_params->power); - if (ret == 0) + if (ret == QDF_STATUS_SUCCESS) wma_handle->interfaces[vdev_id].tx_power = tx_pwr_params->power; } else { /* no tx_power change */ - ret = 0; + ret = QDF_STATUS_SUCCESS; } end: qdf_mem_free(tx_pwr_params); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to set vdev param WMI_VDEV_PARAM_TX_PWRLIMIT"); } @@ -488,7 +432,7 @@ void wma_set_max_tx_power(WMA_HANDLE handle, { tp_wma_handle wma_handle = (tp_wma_handle) handle; uint8_t vdev_id; - int ret = -1; + QDF_STATUS ret = QDF_STATUS_E_FAILURE; void *pdev; int8_t prev_max_power; @@ -515,28 +459,28 @@ void wma_set_max_tx_power(WMA_HANDLE handle, if (wma_handle->interfaces[vdev_id].max_tx_power == tx_pwr_params->power) { - ret = 0; + ret = QDF_STATUS_SUCCESS; goto end; } prev_max_power = wma_handle->interfaces[vdev_id].max_tx_power; wma_handle->interfaces[vdev_id].max_tx_power = tx_pwr_params->power; if (wma_handle->interfaces[vdev_id].max_tx_power == 0) { - ret = 0; + ret = QDF_STATUS_SUCCESS; goto end; } WMA_LOGW("Set MAX TX power limit [WMI_VDEV_PARAM_TX_PWRLIMIT] to %d", wma_handle->interfaces[vdev_id].max_tx_power); - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_TX_PWRLIMIT, wma_handle->interfaces[vdev_id].max_tx_power); - if (ret == 0) + if (ret == QDF_STATUS_SUCCESS) wma_handle->interfaces[vdev_id].tx_power = wma_handle->interfaces[vdev_id].max_tx_power; else wma_handle->interfaces[vdev_id].max_tx_power = prev_max_power; end: qdf_mem_free(tx_pwr_params); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("%s: Failed to set vdev param WMI_VDEV_PARAM_TX_PWRLIMIT", __func__); } @@ -628,14 +572,14 @@ static inline uint32_t wma_get_uapsd_mask(tpUapsd_Params uapsd_params) * @enable: enable/disable * @qpower_config: qpower configuration * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -static int32_t wma_set_force_sleep(tp_wma_handle wma, +static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma, uint32_t vdev_id, uint8_t enable, enum powersave_qpower_mode qpower_config) { - int32_t ret; + QDF_STATUS ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); @@ -649,7 +593,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, if (NULL == mac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return -ENOMEM; + return QDF_STATUS_E_NOMEM; } /* Set Tx/Rx Data InActivity Timeout */ @@ -701,21 +645,21 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, * QPower is enabled by default in Firmware * So Disable QPower explicitly */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_ENABLE_QPOWER, qpower_config); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable QPower Failed vdevId %d", vdev_id); return ret; } WMA_LOGD("QPower Disabled vdevId %d", vdev_id); /* Set the Wake Policy to WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_RX_WAKE_POLICY, rx_wake_policy); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Setting wake policy Failed vdevId %d", vdev_id); return ret; } @@ -723,11 +667,11 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, rx_wake_policy, vdev_id); /* Set the Tx Wake Threshold */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD, tx_wake_threshold); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Setting TxWake Threshold vdevId %d", vdev_id); return ret; } @@ -735,11 +679,11 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, tx_wake_threshold, vdev_id); /* Set the Ps Poll Count */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_PSPOLL_COUNT, pspoll_count); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Set Ps Poll Count Failed vdevId %d ps poll cnt %d", vdev_id, pspoll_count); return ret; @@ -748,11 +692,11 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, vdev_id, pspoll_count); /* Set the Tx/Rx InActivity */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_INACTIVITY_TIME, inactivity_time); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Setting Tx/Rx InActivity Failed vdevId %d InAct %d", vdev_id, inactivity_time); return ret; @@ -763,7 +707,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, /* Enable Sta Mode Power save */ ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, true); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Sta Mode Ps Failed vdevId %d", vdev_id); return ret; } @@ -776,16 +720,17 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_LISTEN_INTERVAL, cfg_data_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { /* Even it fails continue Fw will take default LI */ WMA_LOGE("Failed to Set Listen Interval vdevId %d", vdev_id); } WMA_LOGD("Set Listen Interval vdevId %d Listen Intv %d", vdev_id, cfg_data_val); - return 0; + + return QDF_STATUS_SUCCESS; } /** @@ -794,12 +739,12 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma, * @vdev_id: vdev id * @enable: value * - * Return: 0 for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code */ -int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, +QDF_STATUS wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, uint8_t enable) { - int32_t ret; + QDF_STATUS ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); @@ -810,7 +755,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, if (NULL == mac) { WMA_LOGE("%s: Unable to get PE context", __func__); - return -ENOMEM; + return QDF_STATUS_E_NOMEM; } /* Get Configured Ps Poll Count */ @@ -824,21 +769,21 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, } /* Enable QPower */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_ENABLE_QPOWER, 1); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable QPower Failed vdevId %d", vdev_id); return ret; } WMA_LOGD("QPower Enabled vdevId %d", vdev_id); /* Set the Wake Policy to WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_RX_WAKE_POLICY, WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Setting wake policy to pspoll/uapsd Failed vdevId %d", vdev_id); return ret; @@ -847,11 +792,11 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, if (enable) { /* Set the Tx Wake Threshold */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD, WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Setting TxWake Threshold vdevId %d", vdev_id); return ret; } @@ -860,11 +805,11 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, } /* Set the QPower Ps Poll Count */ - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_QPOWER_PSPOLL_COUNT, pspoll_count); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Set QPower Ps Poll Count Failed vdevId %d ps poll cnt %d", vdev_id, pspoll_count); return ret; @@ -875,7 +820,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, /* Enable Sta Mode Power save */ ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, true); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Sta Mode Ps Failed vdevId %d", vdev_id); return ret; } @@ -888,16 +833,17 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id, cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_LISTEN_INTERVAL, cfg_data_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { /* Even it fails continue Fw will take default LI */ WMA_LOGE("Failed to Set Listen Interval vdevId %d", vdev_id); } WMA_LOGD("Set Listen Interval vdevId %d Listen Intv %d", vdev_id, cfg_data_val); - return 0; + + return QDF_STATUS_SUCCESS; } /** @@ -947,25 +893,26 @@ static enum powersave_qpower_mode wma_get_qpower_config(tp_wma_handle wma) void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) { uint32_t vdev_id = ps_req->sessionid; - int32_t ret; + QDF_STATUS ret; enum powersave_qpower_mode qpower_config = wma_get_qpower_config(wma); struct wma_txrx_node *iface = &wma->interfaces[vdev_id]; + if (!iface->handle) { WMA_LOGE("vdev id %d is not active", vdev_id); return; } if (eSIR_ADDON_NOTHING == ps_req->psSetting) { WMA_LOGD("Enable Sta Mode Ps vdevId %d", vdev_id); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, 0); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Set Uapsd param 0 Failed vdevId %d", vdev_id); return; } ret = wma_set_force_sleep(wma, vdev_id, false, qpower_config); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Sta Ps Failed vdevId %d", vdev_id); return; } @@ -976,11 +923,11 @@ void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) if (uapsd_val != iface->uapsd_cached_val) { WMA_LOGD("Enable Uapsd vdevId %d Mask %d", vdev_id, uapsd_val); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, uapsd_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Uapsd Failed vdevId %d", vdev_id); return; @@ -996,7 +943,7 @@ void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) ret = wma_set_force_sleep(wma, vdev_id, true, qpower_config); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", vdev_id); return; @@ -1014,14 +961,14 @@ void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) */ void wma_disable_sta_ps_mode(tp_wma_handle wma, tpDisablePsParams ps_req) { - int32_t ret; + QDF_STATUS ret; uint32_t vdev_id = ps_req->sessionid; WMA_LOGD("Disable Sta Mode Ps vdevId %d", vdev_id); /* Disable Sta Mode Power save */ ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, false); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Sta Mode Ps Failed vdevId %d", vdev_id); return; } @@ -1029,9 +976,9 @@ void wma_disable_sta_ps_mode(tp_wma_handle wma, tpDisablePsParams ps_req) /* Disable UAPSD incase if additional Req came */ if (eSIR_ADDON_DISABLE_UAPSD == ps_req->psSetting) { WMA_LOGD("Disable Uapsd vdevId %d", vdev_id); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, 0); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Uapsd Failed vdevId %d", vdev_id); /* * Even this fails we can proceed as success @@ -1050,14 +997,14 @@ void wma_disable_sta_ps_mode(tp_wma_handle wma, tpDisablePsParams ps_req) */ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req) { - int32_t ret; + QDF_STATUS ret; uint32_t vdev_id = ps_req->sessionid; uint32_t uapsd_val = 0; enum powersave_qpower_mode qpower_config = wma_get_qpower_config(wma); /* Disable Sta Mode Power save */ ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, false); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Sta Mode Ps Failed vdevId %d", vdev_id); return; } @@ -1065,9 +1012,9 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req) uapsd_val = wma_get_uapsd_mask(&ps_req->uapsdParams); WMA_LOGD("Enable Uapsd vdevId %d Mask %d", vdev_id, uapsd_val); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, uapsd_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Uapsd Failed vdevId %d", vdev_id); return; } @@ -1075,7 +1022,7 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req) WMA_LOGD("Enable Forced Sleep vdevId %d", vdev_id); ret = wma_set_force_sleep(wma, vdev_id, true, qpower_config); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", vdev_id); return; } @@ -1092,7 +1039,7 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req) void wma_disable_uapsd_mode(tp_wma_handle wma, tpDisableUapsdParams ps_req) { - int32_t ret; + QDF_STATUS ret; uint32_t vdev_id = ps_req->sessionid; enum powersave_qpower_mode qpower_config = wma_get_qpower_config(wma); @@ -1100,14 +1047,14 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, /* Disable Sta Mode Power save */ ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, false); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Sta Mode Ps Failed vdevId %d", vdev_id); return; } - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, 0); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Uapsd Failed vdevId %d", vdev_id); return; } @@ -1115,14 +1062,14 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, /* Re enable Sta Mode Powersave with proper configuration */ ret = wma_set_force_sleep(wma, vdev_id, false, qpower_config); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Forced Sleep Failed vdevId %d", vdev_id); return; } } /** - * wmi_unified_set_sta_uapsd_auto_trig_cmd() - set uapsd auto trigger command + * wma_unified_set_sta_uapsd_auto_trig_cmd() - set uapsd auto trigger command * @wmi_handle: wma handle * @vdevid: vdev id * @peer_addr: peer mac address @@ -1138,7 +1085,7 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, * Return: 0 for success or error code. */ int32_t -wmi_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, +wma_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, uint32_t vdevid, uint8_t peer_addr[IEEE80211_ADDR_LEN], uint8_t *autoTriggerparam, @@ -1244,7 +1191,7 @@ QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, uapsd_trigger_param.delay_interval = trigger_uapsd_params->delay_interval; - ret = wmi_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, + ret = wma_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, vdev_id, wma_handle->interfaces[vdev_id].bssid, (uint8_t *) (&uapsd_trigger_param), 1); if (ret) { @@ -1313,7 +1260,7 @@ QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uapsd_trigger_param.suspend_interval = 0; uapsd_trigger_param.delay_interval = 0; - ret = wmi_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, + ret = wma_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, vdev_id, wma_handle->interfaces[vdev_id].bssid, (uint8_t *)(&uapsd_trigger_param), 1); if (ret) { @@ -1322,7 +1269,7 @@ QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_set_sta_ps_param(wma_handle->wmi_handle, vdev_id, + ret = wma_unified_set_sta_ps_param(wma_handle->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, iface->uapsd_cached_val); if (ret) { @@ -1427,6 +1374,7 @@ QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, int32_t ret = 0; uint32_t txpower_params2g = 0; uint32_t txpower_params5g = 0; + struct pdev_params pdevparam; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue tx power limit", @@ -1446,16 +1394,20 @@ QDF_STATUS wma_process_tx_power_limits(WMA_HANDLE handle, WMA_LOGD("%s: txpower2g: %x txpower5g: %x", __func__, txpower_params2g, txpower_params5g); - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_TXPOWER_LIMIT2G, - txpower_params2g); + pdevparam.param_id = WMI_PDEV_PARAM_TXPOWER_LIMIT2G; + pdevparam.param_value = txpower_params2g; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdevparam, + WMA_WILDCARD_PDEV_ID); if (ret) { WMA_LOGE("%s: Failed to set txpower 2g (%d)", __func__, ret); return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_TXPOWER_LIMIT5G, - txpower_params5g); + pdevparam.param_id = WMI_PDEV_PARAM_TXPOWER_LIMIT5G; + pdevparam.param_value = txpower_params5g; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdevparam, + WMA_WILDCARD_PDEV_ID); if (ret) { WMA_LOGE("%s: Failed to set txpower 5g (%d)", __func__, ret); return QDF_STATUS_E_FAILURE; @@ -1976,7 +1928,7 @@ QDF_STATUS wma_notify_modem_power_state(void *wma_ptr, WMA_LOGD("%s: WMA notify Modem Power State %d", __func__, pReq->param); - ret = wmi_unified_modem_power_state(wma->wmi_handle, pReq->param); + ret = wma_unified_modem_power_state(wma->wmi_handle, pReq->param); if (ret) { WMA_LOGE("%s: Fail to notify Modem Power State %d", __func__, pReq->param); @@ -1998,13 +1950,17 @@ QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) { int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; + struct pdev_params pdevparam; WMA_LOGD("WMA Set Idle Ps Config [1:set 0:clear] val %d", idle_ps); /* Set Idle Mode Power Save Config */ - ret = wmi_unified_pdev_set_param(wma->wmi_handle, - WMI_PDEV_PARAM_IDLE_PS_CONFIG, - idle_ps); + pdevparam.param_id = WMI_PDEV_PARAM_IDLE_PS_CONFIG; + pdevparam.param_value = idle_ps; + ret = wmi_unified_pdev_param_send(wma->wmi_handle, + &pdevparam, + WMA_WILDCARD_PDEV_ID); + if (ret) { WMA_LOGE("Fail to Set Idle Ps Config %d", idle_ps); return QDF_STATUS_E_FAILURE; @@ -2074,7 +2030,7 @@ static void wma_set_vdev_suspend_dtim(tp_wma_handle wma, uint8_t vdev_id) if ((iface->type == WMI_VDEV_TYPE_STA) && (iface->ps_enabled == true) && (iface->dtimPeriod != 0)) { - int32_t ret; + QDF_STATUS ret; uint32_t listen_interval; uint32_t max_mod_dtim; @@ -2105,10 +2061,10 @@ static void wma_set_vdev_suspend_dtim(tp_wma_handle wma, uint8_t vdev_id) return; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_LISTEN_INTERVAL, listen_interval); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { /* Even it fails continue Fw will take default LI */ WMA_LOGE("Failed to Set Listen Interval vdevId %d", vdev_id); @@ -2119,20 +2075,20 @@ static void wma_set_vdev_suspend_dtim(tp_wma_handle wma, uint8_t vdev_id) if (qpower_config) { WMA_LOGD("disable Qpower in suspend mode!"); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_ENABLE_QPOWER, 0); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to disable Qpower in suspend mode!"); iface->ps_enabled = true; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_DTIM_POLICY, NORMAL_DTIM); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to Set to Normal DTIM vdevId %d", vdev_id); @@ -2180,7 +2136,7 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) if ((iface->type == WMI_VDEV_TYPE_STA) && (iface->ps_enabled == true) && (iface->dtim_policy == NORMAL_DTIM)) { - int32_t ret; + QDF_STATUS ret; uint32_t cfg_data_val = 0; /* get mac to acess CFG data base */ struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); @@ -2194,10 +2150,10 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL; } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_LISTEN_INTERVAL, cfg_data_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { /* Even it fails continue Fw will take default LI */ WMA_LOGE("Failed to Set Listen Interval vdevId %d", vdev_id); @@ -2206,10 +2162,10 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) WMA_LOGD("Set Listen Interval vdevId %d Listen Intv %d", vdev_id, cfg_data_val); - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_DTIM_POLICY, STICK_DTIM); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { /* Set it back to Stick DTIM */ WMA_LOGE("Failed to Set to Stick DTIM vdevId %d", vdev_id); @@ -2219,11 +2175,11 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id) if (qpower_config) { WMA_LOGD("enable Qpower in resume mode!"); - ret = wmi_unified_set_sta_ps_param(wma->wmi_handle, + ret = wma_unified_set_sta_ps_param(wma->wmi_handle, vdev_id, WMI_STA_PS_ENABLE_QPOWER, 1); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to enable Qpower in resume mode!"); } } @@ -2261,9 +2217,10 @@ void wma_set_resume_dtim(tp_wma_handle wma) */ QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) { - int ret = QDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); + if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2274,9 +2231,9 @@ QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_TXPOWER_SCALE, value); - if (ret != 0) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Set tx power scale failed"); return ret; @@ -2291,9 +2248,10 @@ QDF_STATUS wma_set_tx_power_scale(uint8_t vdev_id, int value) */ QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) { - int ret = QDF_STATUS_SUCCESS; + QDF_STATUS ret = QDF_STATUS_SUCCESS; tp_wma_handle wma_handle = (tp_wma_handle)cds_get_context(QDF_MODULE_ID_WMA); + if (NULL == wma_handle) { WMA_LOGE("%s: wma_handle is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -2304,9 +2262,9 @@ QDF_STATUS wma_set_tx_power_scale_decr_db(uint8_t vdev_id, int value) return QDF_STATUS_E_FAILURE; } - ret = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, vdev_id, + ret = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_TXPOWER_SCALE_DECR_DB, value); - if (ret != 0) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Decrease tx power value failed"); return ret; diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 7889c078f23b..26fc2bca2c15 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2021,32 +2021,32 @@ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, A_INT32 first_bcnt, A_UINT32 final_bcnt, uint32_t vdev_id) { - int status = 0; + QDF_STATUS status; WMA_LOGI("%s: first_bcnt=%d, final_bcnt=%d", __func__, first_bcnt, final_bcnt); - status = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + status = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_BMISS_FIRST_BCNT, first_bcnt); - if (status != EOK) { - WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FIRST_BCNT returned Error %d", + if (QDF_IS_STATUS_ERROR(status)) { + WMA_LOGE("wma_vdev_set_param WMI_VDEV_PARAM_BMISS_FIRST_BCNT returned Error %d", status); - return QDF_STATUS_E_FAILURE; + return status; } - status = wmi_unified_vdev_set_param_send(wma_handle->wmi_handle, + status = wma_vdev_set_param(wma_handle->wmi_handle, vdev_id, WMI_VDEV_PARAM_BMISS_FINAL_BCNT, final_bcnt); - if (status != EOK) { - WMA_LOGE("wmi_unified_vdev_set_param_send WMI_VDEV_PARAM_BMISS_FINAL_BCNT returned Error %d", + if (QDF_IS_STATUS_ERROR(status)) { + WMA_LOGE("wma_vdev_set_param WMI_VDEV_PARAM_BMISS_FINAL_BCNT returned Error %d", status); - return QDF_STATUS_E_FAILURE; + return status; } - return QDF_STATUS_SUCCESS; + return status; } /** @@ -4121,39 +4121,48 @@ void wma_register_extscan_event_handler(tp_wma_handle wma_handle) } wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_EXTSCAN_START_STOP_EVENTID, - wma_extscan_start_stop_event_handler); + wma_extscan_start_stop_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_CAPABILITIES_EVENTID, - wma_extscan_capabilities_event_handler); + WMI_EXTSCAN_CAPABILITIES_EVENTID, + wma_extscan_capabilities_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_HOTLIST_MATCH_EVENTID, - wma_extscan_hotlist_match_event_handler); + WMI_EXTSCAN_HOTLIST_MATCH_EVENTID, + wma_extscan_hotlist_match_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_WLAN_CHANGE_RESULTS_EVENTID, - wma_extscan_change_results_event_handler); + WMI_EXTSCAN_WLAN_CHANGE_RESULTS_EVENTID, + wma_extscan_change_results_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_OPERATION_EVENTID, - wma_extscan_operations_event_handler); + WMI_EXTSCAN_OPERATION_EVENTID, + wma_extscan_operations_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_TABLE_USAGE_EVENTID, - wma_extscan_table_usage_event_handler); + WMI_EXTSCAN_TABLE_USAGE_EVENTID, + wma_extscan_table_usage_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_EXTSCAN_CACHED_RESULTS_EVENTID, - wma_extscan_cached_results_event_handler); + WMI_EXTSCAN_CACHED_RESULTS_EVENTID, + wma_extscan_cached_results_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PASSPOINT_MATCH_EVENTID, - wma_passpoint_match_event_handler); + wma_passpoint_match_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_EXTSCAN_HOTLIST_SSID_MATCH_EVENTID, - wma_extscan_hotlist_ssid_match_event_handler); + wma_extscan_hotlist_ssid_match_event_handler, + WMA_RX_SERIALIZER_CTX); return; } @@ -6040,6 +6049,7 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, ol_txrx_vdev_handle vdev; struct txrx_pdev_cfg_t *cfg; int32_t intra_bss_fwd = 0; + QDF_STATUS status; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", @@ -6109,14 +6119,15 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, } /* Disable/enable WMI_VDEV_PARAM_INTRA_BSS_FWD */ - if (wmi_unified_vdev_set_param_send(wma->wmi_handle, + status = wma_vdev_set_param(wma->wmi_handle, ipa_offload->vdev_id, WMI_VDEV_PARAM_INTRA_BSS_FWD, - intra_bss_fwd)) { + intra_bss_fwd); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("Failed to disable WMI_VDEV_PARAM_INTRA_BSS_FWD"); - return QDF_STATUS_E_FAILURE; + return status; } - return QDF_STATUS_SUCCESS; + return status; } /** wma_set_epno_network_list() - set epno network list diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index fd54008db815..0d0e7327d76a 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -69,7 +69,7 @@ #include "dfs.h" #include "wma_internal.h" #include "cds_concurrency.h" - +#include "wmi_unified_param.h" #include "linux/ieee80211.h" /* MCS Based rate table */ @@ -764,14 +764,17 @@ void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle) } wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_IFACE_LINK_STATS_EVENTID, - wma_unified_link_iface_stats_event_handler); + WMI_IFACE_LINK_STATS_EVENTID, + wma_unified_link_iface_stats_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_PEER_LINK_STATS_EVENTID, - wma_unified_link_peer_stats_event_handler); + WMI_PEER_LINK_STATS_EVENTID, + wma_unified_link_peer_stats_event_handler, + WMA_RX_SERIALIZER_CTX); wmi_unified_register_event_handler(wma_handle->wmi_handle, - WMI_RADIO_LINK_STATS_EVENTID, - wma_unified_link_radio_stats_event_handler); + WMI_RADIO_LINK_STATS_EVENTID, + wma_unified_link_radio_stats_event_handler, + WMA_RX_SERIALIZER_CTX); return; } @@ -1952,46 +1955,6 @@ int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, return 0; } -/** - * wmi_crash_inject() - inject fw crash - * @wma_handle: wma handle - * @type: type - * @delay_time_ms: delay time in ms - * - * Return: 0 for success or return error - */ -int wmi_crash_inject(wmi_unified_t wmi_handle, uint32_t type, - uint32_t delay_time_ms) -{ - int ret = 0; - WMI_FORCE_FW_HANG_CMD_fixed_param *cmd; - uint16_t len = sizeof(*cmd); - wmi_buf_t buf; - - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed!", __func__); - return -ENOMEM; - } - - cmd = (WMI_FORCE_FW_HANG_CMD_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_FORCE_FW_HANG_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_FORCE_FW_HANG_CMD_fixed_param)); - cmd->type = type; - cmd->delay_time_ms = delay_time_ms; - - ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_FORCE_FW_HANG_CMDID); - if (ret < 0) { - WMA_LOGE("%s: Failed to send set param command, ret = %d", - __func__, ret); - wmi_buf_free(buf); - } - - return ret; -} - /** * wma_get_stats_rsp_buf() - fill get stats response buffer * @get_stats_param: get stats parameters @@ -2333,7 +2296,7 @@ static int wma_process_utf_event(WMA_HANDLE handle, uint8_t *datap, uint32_t dataplen) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - SEG_HDR_INFO_STRUCT segHdrInfo; + struct seg_hdr_info segHdrInfo; uint8_t totalNumOfSegments, currentSeq; WMI_PDEV_UTF_EVENTID_param_tlvs *param_buf; uint8_t *data; @@ -2347,7 +2310,7 @@ wma_process_utf_event(WMA_HANDLE handle, uint8_t *datap, uint32_t dataplen) data = param_buf->data; datalen = param_buf->num_data; - segHdrInfo = *(SEG_HDR_INFO_STRUCT *) &(data[0]); + segHdrInfo = *(struct seg_hdr_info *) &(data[0]); wma_handle->utf_event_info.currentSeq = (segHdrInfo.segmentInfo & 0xF); @@ -2423,113 +2386,31 @@ void wma_utf_attach(tp_wma_handle wma_handle) ret = wmi_unified_register_event_handler(wma_handle->wmi_handle, WMI_PDEV_UTF_EVENTID, - wma_process_utf_event); + wma_process_utf_event, + WMA_RX_SERIALIZER_CTX); if (ret) WMA_LOGP("%s: Failed to register UTF event callback", __func__); } -/** - * wmi_unified_pdev_utf_cmd() - send utf command to fw - * @wmi_handle: wmi handle - * @utf_payload: utf payload - * @len: length - * - * Return: 0 for success or error code - */ -static int -wmi_unified_pdev_utf_cmd(wmi_unified_t wmi_handle, uint8_t *utf_payload, - uint16_t len) -{ - wmi_buf_t buf; - uint8_t *cmd; - int ret = 0; - static uint8_t msgref = 1; - uint8_t segNumber = 0, segInfo, numSegments; - uint16_t chunk_len, total_bytes; - uint8_t *bufpos; - SEG_HDR_INFO_STRUCT segHdrInfo; - - bufpos = utf_payload; - total_bytes = len; - ASSERT(total_bytes / MAX_WMI_UTF_LEN == - (uint8_t) (total_bytes / MAX_WMI_UTF_LEN)); - numSegments = (uint8_t) (total_bytes / MAX_WMI_UTF_LEN); - - if (len - (numSegments * MAX_WMI_UTF_LEN)) - numSegments++; - - while (len) { - if (len > MAX_WMI_UTF_LEN) - chunk_len = MAX_WMI_UTF_LEN; /* MAX messsage */ - else - chunk_len = len; - - buf = wmi_buf_alloc(wmi_handle, - (chunk_len + sizeof(segHdrInfo) + - WMI_TLV_HDR_SIZE)); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - - cmd = (uint8_t *) wmi_buf_data(buf); - - segHdrInfo.len = total_bytes; - segHdrInfo.msgref = msgref; - segInfo = ((numSegments << 4) & 0xF0) | (segNumber & 0xF); - segHdrInfo.segmentInfo = segInfo; - segHdrInfo.pad = 0; - - WMA_LOGD("%s:segHdrInfo.len = %d, segHdrInfo.msgref = %d," - " segHdrInfo.segmentInfo = %d", - __func__, segHdrInfo.len, segHdrInfo.msgref, - segHdrInfo.segmentInfo); - - WMA_LOGD("%s:total_bytes %d segNumber %d totalSegments %d" - "chunk len %d", __func__, total_bytes, segNumber, - numSegments, chunk_len); - - segNumber++; - - WMITLV_SET_HDR(cmd, WMITLV_TAG_ARRAY_BYTE, - (chunk_len + sizeof(segHdrInfo))); - cmd += WMI_TLV_HDR_SIZE; - memcpy(cmd, &segHdrInfo, sizeof(segHdrInfo)); /* 4 bytes */ - memcpy(&cmd[sizeof(segHdrInfo)], bufpos, chunk_len); - - ret = wmi_unified_cmd_send(wmi_handle, buf, - (chunk_len + sizeof(segHdrInfo) + - WMI_TLV_HDR_SIZE), - WMI_PDEV_UTF_CMDID); - - if (ret != EOK) { - WMA_LOGE("Failed to send WMI_PDEV_UTF_CMDID command"); - wmi_buf_free(buf); - break; - } - - len -= chunk_len; - bufpos += chunk_len; - } - - msgref++; - - return ret; -} - /** * wma_utf_cmd() - utf command * @wma_handle: wma handle * @data: data * @len: length * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -int wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data, uint16_t len) +QDF_STATUS wma_utf_cmd(tp_wma_handle wma_handle, uint8_t *data, uint16_t len) { + struct pdev_utf_params param = {0}; + wma_handle->utf_event_info.length = 0; - return wmi_unified_pdev_utf_cmd(wma_handle->wmi_handle, data, len); + param.utf_payload = data; + param.len = len; + + return wmi_unified_pdev_utf_cmd_send(wma_handle->wmi_handle, ¶m, + WMA_WILDCARD_PDEV_ID); } /** @@ -3636,3 +3517,27 @@ uint32_t wma_get_vht_ch_width(void) return fw_ch_wd; } + +/** + * wma_config_debug_module_cmd - set debug log config + * @wmi_handle: wmi layer handle + * @param: debug log parameter + * @val: debug log value + * @module_id_bitmap: debug module id bitmap + * @bitmap_len: debug module bitmap length + * + * Return: QDF_STATUS_SUCCESS for success or error code + */ +QDF_STATUS +wma_config_debug_module_cmd(wmi_unified_t wmi_handle, A_UINT32 param, + A_UINT32 val, A_UINT32 *module_id_bitmap, + A_UINT32 bitmap_len) +{ + struct dbglog_params dbg_param; + dbg_param.param = param; + dbg_param.val = val; + dbg_param.module_id_bitmap = module_id_bitmap; + dbg_param.bitmap_len = bitmap_len; + + return wmi_unified_dbglog_cmd_send(wmi_handle, &dbg_param); +} -- cgit v1.2.3 From 9fcc1610b4e036bfd2904735acd366f85aa5be8d Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 14 Mar 2016 22:32:29 +0530 Subject: qcacld-3.0: Add Kbuild changes for common wmi layer Add kbuild changes to compile converged wmi layer. CRs-Fixed: 976998 Change-Id: If3372e89b5cc1922c499cf553759281dfeaacaf2 --- Kbuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Kbuild b/Kbuild index 21ea0a97bd53..7104ec71ab26 100755 --- a/Kbuild +++ b/Kbuild @@ -632,12 +632,16 @@ else BMI_OBJS += $(BMI_DIR)/src/bmi_1.o endif ########### WMI ########### -WMI_DIR := core/wmi +WMI_SRC_DIR := qca-wifi-host-cmn//wmi/src +WMI_INC_DIR := qca-wifi-host-cmn//wmi/inc \ -WMI_INC := -I$(WLAN_ROOT)/$(WMI_DIR) +WMI_INC := -I$(WLAN_ROOT)/$(WMI_INC_DIR) -WMI_OBJS := $(WMI_DIR)/wmi_unified.o \ - $(WMI_DIR)/wmi_tlv_helper.o +WMI_OBJS := $(WMI_SRC_DIR)/wmi_unified.o \ + $(WMI_SRC_DIR)/wmi_tlv_helper.o \ + $(WMI_SRC_DIR)/wmi_unified_tlv.o \ + $(WMI_SRC_DIR)/wmi_unified_api.o \ + $(WMI_SRC_DIR)/wmi_unified_non_tlv.o ########### FWLOG ########### FWLOG_DIR := core/utils/fwlog -- cgit v1.2.3 From 897312e214eb14b4fda71414f5dec5a978815b73 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Wed, 16 Mar 2016 21:48:17 -0700 Subject: qcacld-3.0: Incremental CLD3.1 Release 5.1.0.1A qcacld-3.0: Incremental CLD3.1 Release 5.1.0.1A Change-Id: Icf1d1e397a587a0d56c74e9aee97bea5f77f148a --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 12f8762112d9..4e30ecc9ddd2 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "" +#define QWLAN_VERSION_EXTRA "A" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1" +#define QWLAN_VERSIONSTR "5.1.0.1A" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From ffaf220142cf553b7d519c6323936fea4ae0099f Mon Sep 17 00:00:00 2001 From: Anurag Chouhan Date: Sat, 6 Feb 2016 17:16:44 +0530 Subject: qcacld-3.0: Add CDS specific MC timer Add MC timer API's in CDS. Change-Id: Idbb10f7d2a00ad8e4620b07275c610d21f699999 CRs-Fixed: 981188 --- core/cds/inc/cds_mc_timer.h | 40 +++++++++++++ core/cds/src/cds_mc_timer.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 core/cds/inc/cds_mc_timer.h create mode 100644 core/cds/src/cds_mc_timer.c diff --git a/core/cds/inc/cds_mc_timer.h b/core/cds/inc/cds_mc_timer.h new file mode 100644 index 000000000000..e01937ab1652 --- /dev/null +++ b/core/cds/inc/cds_mc_timer.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ + +/** + * DOC: cds_mc_timer.h + * + * Connectivity driver services public API + * + */ + +#if !defined(__CDS_MC_TIMER_H) +#define __CDS_MC_TIMER_H + +void cds_linux_timer_callback(unsigned long data); + +#endif /* __CDS_MC_TIMER_H */ diff --git a/core/cds/src/cds_mc_timer.c b/core/cds/src/cds_mc_timer.c new file mode 100644 index 000000000000..cb6d64eb88e5 --- /dev/null +++ b/core/cds/src/cds_mc_timer.c @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ + +/** + * DOC: cds_mc_timer.c + * Connectivity driver services timer APIs + */ + +#include +#include "cds_mc_timer.h" +#include +#include +#include "cds_mq.h" + +/** + * cds_linux_timer_callback() - timer callback, gets called at time out. + * @data: unsigned long, holds the timer object. + * + * Return: None + */ +void cds_linux_timer_callback(unsigned long data) +{ + qdf_mc_timer_t *timer = (qdf_mc_timer_t *)data; + cds_msg_t msg; + QDF_STATUS status; + + qdf_mc_timer_callback_t callback = NULL; + void *user_data = NULL; + QDF_TIMER_TYPE type = QDF_TIMER_TYPE_SW; + + QDF_ASSERT(timer); + + if (timer == NULL) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "%s Null pointer passed in!", __func__); + return; + } + + qdf_spin_lock_irqsave(&timer->platform_info.spinlock); + + switch (timer->state) { + case QDF_TIMER_STATE_STARTING: + /* we are in this state because someone just started the timer, + * MC timer got started and expired, but the time content have + * not been updated this is a rare race condition! + */ + timer->state = QDF_TIMER_STATE_STOPPED; + status = QDF_STATUS_E_ALREADY; + break; + + case QDF_TIMER_STATE_STOPPED: + status = QDF_STATUS_E_ALREADY; + break; + + case QDF_TIMER_STATE_UNUSED: + status = QDF_STATUS_E_EXISTS; + break; + + case QDF_TIMER_STATE_RUNNING: + /* need to go to stop state here because the call-back function + * may restart timer (to emulate periodic timer) + */ + timer->state = QDF_TIMER_STATE_STOPPED; + /* copy the relevant timer information to local variables; + * once we exits from this critical section, the timer content + * may be modified by other tasks + */ + callback = timer->callback; + user_data = timer->user_data; + type = timer->type; + status = QDF_STATUS_SUCCESS; + break; + + default: + QDF_ASSERT(0); + status = QDF_STATUS_E_FAULT; + break; + } + + qdf_spin_unlock_irqrestore(&timer->platform_info.spinlock); + + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "TIMER callback called in a wrong state=%d", + timer->state); + return; + } + + qdf_try_allowing_sleep(type); + + if (callback == NULL) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "%s: No TIMER callback, Could not enqueue timer to any queue", + __func__); + QDF_ASSERT(0); + return; + } + + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, + "TIMER callback: running on MC thread"); + /* serialize to the MC thread */ + sys_build_message_header(SYS_MSG_ID_MC_TIMER, &msg); + msg.callback = callback; + msg.bodyptr = user_data; + msg.bodyval = 0; + + if (cds_mq_post_message(CDS_MQ_ID_SYS, &msg) == QDF_STATUS_SUCCESS) + return; + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "%s: Could not enqueue timer to any queue", __func__); + QDF_ASSERT(0); +} -- cgit v1.2.3 From 0fea23a7a999f019ffe66de060e7052e730fdc21 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Fri, 18 Mar 2016 12:59:27 +0530 Subject: qcacld-3.0: Fix Kbuild changes for common wmi layer Fix Kbuild changes to compile converged wmi layer. Change-Id: I2ada3e63d798402b326a291ffbe8b6da2afa3f14 CRs-Fixed: 976998 --- Kbuild | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Kbuild b/Kbuild index 7104ec71ab26..4e639d7938b1 100755 --- a/Kbuild +++ b/Kbuild @@ -631,17 +631,21 @@ BMI_OBJS += $(BMI_DIR)/src/bmi_2.o else BMI_OBJS += $(BMI_DIR)/src/bmi_1.o endif + ########### WMI ########### -WMI_SRC_DIR := qca-wifi-host-cmn//wmi/src -WMI_INC_DIR := qca-wifi-host-cmn//wmi/inc \ +WMI_ROOT_DIR := wmi + +WMI_SRC_DIR := $(WMI_ROOT_DIR)/src +WMI_INC_DIR := $(WMI_ROOT_DIR)/inc +WMI_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(WMI_SRC_DIR) -WMI_INC := -I$(WLAN_ROOT)/$(WMI_INC_DIR) +WMI_INC := -I$(WLAN_COMMON_INC)/$(WMI_INC_DIR) -WMI_OBJS := $(WMI_SRC_DIR)/wmi_unified.o \ - $(WMI_SRC_DIR)/wmi_tlv_helper.o \ - $(WMI_SRC_DIR)/wmi_unified_tlv.o \ - $(WMI_SRC_DIR)/wmi_unified_api.o \ - $(WMI_SRC_DIR)/wmi_unified_non_tlv.o +WMI_OBJS := $(WMI_OBJ_DIR)/wmi_unified.o \ + $(WMI_OBJ_DIR)/wmi_tlv_helper.o \ + $(WMI_OBJ_DIR)/wmi_unified_tlv.o \ + $(WMI_OBJ_DIR)/wmi_unified_api.o \ + $(WMI_OBJ_DIR)/wmi_unified_non_tlv.o ########### FWLOG ########### FWLOG_DIR := core/utils/fwlog -- cgit v1.2.3 From 9a6db86fea115686d3ab1c5b68c6f7bcfe064d05 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Tue, 29 Mar 2016 10:49:43 -0700 Subject: qcacld-3.0: Adjust relative path to common Need to adjust relative path to common repository after relocating the base of the mcl git project. Change-Id: Ib2cdab8756ec294e00e391d21a400ec82de76c70 CRs-Fixed: 688141 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index c9657ec67b7c..ff889ef1c690 100644 --- a/Android.mk +++ b/Android.mk @@ -48,7 +48,7 @@ ifeq ($(WLAN_PROPRIETARY),1) KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn else KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 - KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../opensource/wlan/qca-wifi-host-cmn + KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn endif # WLAN_PROPRIETARY KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn -- cgit v1.2.3 From 1c6599c91095fb980746beb788362c94512812ed Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Tue, 29 Mar 2016 13:59:05 -0700 Subject: qcacld-3.0: Incremental CLD3.1 Release 5.1.0.1B Incremental CLD3.1 Release 5.1.0.1B after relocating the driver development to new branch and path. Change-Id: Ibd2f045e31475458225ec43c38186074c640c8b1 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4e30ecc9ddd2..bf1cab5170a3 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "A" +#define QWLAN_VERSION_EXTRA "B" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1A" +#define QWLAN_VERSIONSTR "5.1.0.1B" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 61ad26253ca41f960dd9f6e0a9fe3b8d9594b8b0 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Mon, 22 Feb 2016 17:25:02 +0530 Subject: qcacld-3.0: Refactor beacon template wmi command Move tlv formation of beacon template command to common wmi layer from wma layer. Change-Id: Ibca8441b4a8c5bed7aeedd1c6421415711b662a0 CRs-Fixed: 976998 --- core/wma/src/wma_mgmt.c | 65 +++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 1d4804e8ae5d..5abbf53910d2 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -2194,25 +2194,23 @@ static int wmi_unified_probe_rsp_tmpl_send(tp_wma_handle wma, } /** - * wmi_unified_bcn_tmpl_send() - send beacon template to fw + * wma_unified_bcn_tmpl_send() - send beacon template to fw * @wma:wma handle * @vdev_id: vdev id * @bcn_info: beacon info * @bytes_to_strip: bytes to strip * - * Return: 0 for success or error code + * Return: QDF_STATUS_SUCCESS for success or error code */ -static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, +static QDF_STATUS wma_unified_bcn_tmpl_send(tp_wma_handle wma, uint8_t vdev_id, - tpSendbeaconParams bcn_info, + const tpSendbeaconParams bcn_info, uint8_t bytes_to_strip) { - wmi_bcn_tmpl_cmd_fixed_param *cmd; - wmi_bcn_prb_info *bcn_prb_info; - wmi_buf_t wmi_buf; - uint32_t tmpl_len, tmpl_len_aligned, wmi_buf_len; - uint8_t *frm, *buf_ptr; - int ret; + struct beacon_params params = {0}; + uint32_t tmpl_len, tmpl_len_aligned; + uint8_t *frm; + QDF_STATUS ret; uint8_t *p2p_ie; uint16_t p2p_ie_len = 0; uint64_t adjusted_tsf_le; @@ -2251,44 +2249,18 @@ static int wmi_unified_bcn_tmpl_send(tp_wma_handle wma, wh = (struct ieee80211_frame *)frm; A_MEMCPY(&wh[1], &adjusted_tsf_le, sizeof(adjusted_tsf_le)); - wmi_buf_len = sizeof(wmi_bcn_tmpl_cmd_fixed_param) + - sizeof(wmi_bcn_prb_info) + WMI_TLV_HDR_SIZE + - tmpl_len_aligned; - wmi_buf = wmi_buf_alloc(wma->wmi_handle, wmi_buf_len); - if (!wmi_buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_bcn_tmpl_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_bcn_tmpl_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_bcn_tmpl_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->tim_ie_offset = bcn_info->timIeOffset - bytes_to_strip; - cmd->buf_len = tmpl_len; - buf_ptr += sizeof(wmi_bcn_tmpl_cmd_fixed_param); + params.vdev_id = vdev_id; + params.tim_ie_offset = bcn_info->timIeOffset - bytes_to_strip; + params.tmpl_len = tmpl_len; + params.frm = frm; + params.tmpl_len_aligned = tmpl_len_aligned; - bcn_prb_info = (wmi_bcn_prb_info *) buf_ptr; - WMITLV_SET_HDR(&bcn_prb_info->tlv_header, - WMITLV_TAG_STRUC_wmi_bcn_prb_info, - WMITLV_GET_STRUCT_TLVLEN(wmi_bcn_prb_info)); - bcn_prb_info->caps = 0; - bcn_prb_info->erp = 0; - buf_ptr += sizeof(wmi_bcn_prb_info); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, tmpl_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, frm, tmpl_len); - - ret = wmi_unified_cmd_send(wma->wmi_handle, - wmi_buf, wmi_buf_len, WMI_BCN_TMPL_CMDID); - if (ret) { + ret = wmi_unified_beacon_send_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("%s: Failed to send bcn tmpl: %d", __func__, ret); - wmi_buf_free(wmi_buf); } return ret; @@ -2437,7 +2409,7 @@ int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, qdf_spin_unlock_bh(&bcn->lock); /* Update beacon template in firmware */ - wmi_unified_bcn_tmpl_send(wma, if_id, &bcn_info, 0); + wma_unified_bcn_tmpl_send(wma, if_id, &bcn_info, 0); } return 0; } @@ -2589,7 +2561,8 @@ void wma_send_beacon(tp_wma_handle wma, tpSendbeaconParams bcn_info) if (WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, WMI_SERVICE_BEACON_OFFLOAD)) { WMA_LOGI("Beacon Offload Enabled Sending Unified command"); - if (wmi_unified_bcn_tmpl_send(wma, vdev_id, bcn_info, 4) < 0) { + status = wma_unified_bcn_tmpl_send(wma, vdev_id, bcn_info, 4); + if (QDF_IS_STATUS_ERROR(status)) { WMA_LOGE("%s : wmi_unified_bcn_tmpl_send Failed ", __func__); return; -- cgit v1.2.3 From 498bf2a1ba183a4fdc084126b29541fa1ec583c8 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 15:44:17 +0530 Subject: qcacld-3.0: Refactor scan related wmi command Move tlv formation of start scan, stop scan wmi command to common wmi layer from wma layer. Change-Id: Ieff5c114e8ca6468a6ba74f57c08eaf4ebabd975 CRs-Fixed: 976998 --- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_scan_roam.c | 231 +++++++++++-------------------------------- 2 files changed, 59 insertions(+), 174 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 82a777e90f1b..2da1ef337057 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -178,7 +178,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, - wmi_buf_t *buf, int *buf_len); + struct scan_start_params *cmd); QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, wmi_buf_t *buf, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 26fc2bca2c15..02d3e13e94d9 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -165,8 +165,7 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle) * wma_get_buf_start_scan_cmd() - Fill start scan command * @wma_handle: wma handle * @scan_req: scan request - * @buf: wmi buffer to be filled in - * @buf_len: buf length + * @cmd: wmi buffer to be filled in * * Fill individual elements of wmi_start_scan_req and TLV for * channel list, bssid, ssid etc. @@ -175,19 +174,12 @@ static bool wma_is_mcc_24G(WMA_HANDLE handle) */ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, tSirScanOffloadReq *scan_req, - wmi_buf_t *buf, int *buf_len) + struct scan_start_params *cmd) { - wmi_start_scan_cmd_fixed_param *cmd; - wmi_chan_list *chan_list = NULL; - wmi_mac_addr *bssid; - wmi_ssid *ssid = NULL; - uint32_t *tmp_ptr, ie_len_with_pad; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; - uint8_t *buf_ptr; uint32_t dwell_time; uint8_t SSID_num; int i; - int len = sizeof(*cmd); tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); if (!pMac) { @@ -195,37 +187,6 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, return QDF_STATUS_E_FAILURE; } - len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of uint32_t */ - /* calculate the length of buffer required */ - if (scan_req->channelList.numChannels) - len += scan_req->channelList.numChannels * sizeof(uint32_t); - - len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of wmi_ssid structures */ - if (scan_req->numSsid) - len += scan_req->numSsid * sizeof(wmi_ssid); - - len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of wmi_mac_addr structures */ - len += sizeof(wmi_mac_addr); - - len += WMI_TLV_HDR_SIZE; /* Length TLV placeholder for array of bytes */ - if (scan_req->uIEFieldLen) - len += roundup(scan_req->uIEFieldLen, sizeof(uint32_t)); - - /* Allocate the memory */ - *buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!*buf) { - WMA_LOGP("%s: failed to allocate memory for start scan cmd", - __func__); - return QDF_STATUS_E_FAILURE; - } - - buf_ptr = (uint8_t *) wmi_buf_data(*buf); - cmd = (wmi_start_scan_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_start_scan_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_start_scan_cmd_fixed_param)); - cmd->vdev_id = scan_req->sessionId; /* * host cycles through the lower 12 bits for scan id generation @@ -456,40 +417,30 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, cmd->n_probes = (cmd->repeat_probe_time > 0) ? cmd->dwell_time_active / cmd->repeat_probe_time : 0; - - buf_ptr += sizeof(*cmd); - tmp_ptr = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); - if (scan_req->channelList.numChannels) { - chan_list = (wmi_chan_list *) tmp_ptr; cmd->num_chan = scan_req->channelList.numChannels; for (i = 0; i < scan_req->channelList.numChannels; ++i) { - tmp_ptr[i] = + cmd->chan_list[i] = cds_chan_to_freq(scan_req->channelList. channelNumber[i]); } } - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_UINT32, - (cmd->num_chan * sizeof(uint32_t))); - buf_ptr += WMI_TLV_HDR_SIZE + (cmd->num_chan * sizeof(uint32_t)); + if (scan_req->numSsid > SIR_SCAN_MAX_NUM_SSID) { WMA_LOGE("Invalid value for numSsid"); goto error; } + cmd->num_ssids = scan_req->numSsid; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC, - (cmd->num_ssids * sizeof(wmi_ssid))); + if (scan_req->numSsid) { - ssid = (wmi_ssid *) (buf_ptr + WMI_TLV_HDR_SIZE); for (i = 0; i < scan_req->numSsid; ++i) { - ssid->ssid_len = scan_req->ssId[i].length; - qdf_mem_copy(ssid->ssid, scan_req->ssId[i].ssId, + cmd->ssid[i].length = scan_req->ssId[i].length; + qdf_mem_copy(cmd->ssid[i].mac_ssid, + scan_req->ssId[i].ssId, scan_req->ssId[i].length); - ssid++; } } - buf_ptr += WMI_TLV_HDR_SIZE + (cmd->num_ssids * sizeof(wmi_ssid)); cmd->num_bssid = 1; @@ -503,77 +454,18 @@ QDF_STATUS wma_get_buf_start_scan_cmd(tp_wma_handle wma_handle, } } - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC, - (cmd->num_bssid * sizeof(wmi_mac_addr))); - bssid = (wmi_mac_addr *) (buf_ptr + WMI_TLV_HDR_SIZE); - WMI_CHAR_ARRAY_TO_MAC_ADDR(scan_req->bssId.bytes, bssid); - buf_ptr += WMI_TLV_HDR_SIZE + (cmd->num_bssid * sizeof(wmi_mac_addr)); - + qdf_mem_copy(cmd->mac_add_bytes, scan_req->bssId.bytes, QDF_MAC_ADDR_SIZE); cmd->ie_len = scan_req->uIEFieldLen; - ie_len_with_pad = roundup(scan_req->uIEFieldLen, sizeof(uint32_t)); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_with_pad); - if (scan_req->uIEFieldLen) { - qdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, - (uint8_t *) scan_req + - (scan_req->uIEFieldOffset), scan_req->uIEFieldLen); - } - buf_ptr += WMI_TLV_HDR_SIZE + ie_len_with_pad; + cmd->ie_len_with_pad = roundup(scan_req->uIEFieldLen, sizeof(uint32_t)); + cmd->uie_fieldOffset = scan_req->uIEFieldOffset; + cmd->ie_base = (uint8_t *) scan_req; - *buf_len = len; return QDF_STATUS_SUCCESS; -error: - qdf_mem_free(*buf); - *buf = NULL; - return qdf_status; -} - -/** - * wma_get_buf_stop_scan_cmd() - Fill stop scan command - * @wma_handle: wma handle - * @buf: wmi buffer to be filled in - * @buf_len: buf length - * @abort_scan_req: abort scan request - * - * Fill wmi_stop_scan_cmd buffer. - * - * Return: QDF status - */ -QDF_STATUS wma_get_buf_stop_scan_cmd(tp_wma_handle wma_handle, - wmi_buf_t *buf, - int *buf_len, - tAbortScanParams *abort_scan_req) -{ - wmi_stop_scan_cmd_fixed_param *cmd; - QDF_STATUS qdf_status; - int len = sizeof(*cmd); - /* Allocate the memory */ - *buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!*buf) { - WMA_LOGP("%s: failed to allocate memory for stop scan cmd", - __func__); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } - - cmd = (wmi_stop_scan_cmd_fixed_param *) wmi_buf_data(*buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_stop_scan_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_stop_scan_cmd_fixed_param)); - cmd->vdev_id = abort_scan_req->SessionId; - cmd->requestor = abort_scan_req->scan_requestor_id; - cmd->scan_id = abort_scan_req->scan_id; - /* stop the scan with the corresponding scan_id */ - cmd->req_type = WMI_SCAN_STOP_ONE; - - *buf_len = len; - qdf_status = QDF_STATUS_SUCCESS; error: return qdf_status; - } - /** * wma_start_scan() - start scan command * @wma_handle: wma handle @@ -589,69 +481,74 @@ QDF_STATUS wma_start_scan(tp_wma_handle wma_handle, { uint32_t vdev_id, scan_id; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - wmi_start_scan_cmd_fixed_param *cmd; - int status = 0; - int len; + struct scan_start_params cmd = {0}; tSirScanOffloadEvent *scan_event; + cmd.chan_list = qdf_mem_malloc(sizeof(uint32_t) * + scan_req->channelList.numChannels); + if (NULL == cmd.chan_list) { + qdf_status = QDF_STATUS_E_NOMEM; + goto error; + } + qdf_mem_zero((void *)cmd.chan_list, sizeof(uint32_t) * + scan_req->channelList.numChannels); if (scan_req->sessionId > wma_handle->max_bssid) { WMA_LOGE("%s: Invalid vdev_id %d, msg_type : 0x%x", __func__, scan_req->sessionId, msg_type); - goto error; + goto error1; } /* Sanity check to find whether vdev id active or not */ if (msg_type != WMA_START_SCAN_OFFLOAD_REQ && !wma_handle->interfaces[scan_req->sessionId].handle) { WMA_LOGA("vdev id [%d] is not active", scan_req->sessionId); - goto error; + goto error1; } /* Fill individual elements of wmi_start_scan_req and * TLV for channel list, bssid, ssid etc ... */ qdf_status = wma_get_buf_start_scan_cmd(wma_handle, scan_req, - &buf, &len); + &cmd); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get buffer for start scan cmd"); - goto error; - } - - if (NULL == buf) { - WMA_LOGE("Failed to get buffer for saving current scan info"); - goto error; + goto error1; } - /* Save current scan info */ - cmd = (wmi_start_scan_cmd_fixed_param *) wmi_buf_data(buf); if (scan_req->p2pScanType == P2P_SCAN_TYPE_LISTEN) - wma_set_p2p_scan_info(wma_handle, cmd->scan_id, - cmd->vdev_id, P2P_SCAN_TYPE_LISTEN); + wma_set_p2p_scan_info(wma_handle, cmd.scan_id, + cmd.vdev_id, P2P_SCAN_TYPE_LISTEN); WMA_LOGE("scan_id 0x%x, vdev_id %d, p2pScanType %d, msg_type 0x%x", - cmd->scan_id, cmd->vdev_id, scan_req->p2pScanType, msg_type); + cmd.scan_id, cmd.vdev_id, scan_req->p2pScanType, msg_type); /* * Cache vdev_id and scan_id because cmd is freed after calling * wmi_unified_cmd_send cmd. WMI internally frees cmd buffer after * getting TX complete from CE */ - vdev_id = cmd->vdev_id; - scan_id = cmd->scan_id; + vdev_id = cmd.vdev_id; + scan_id = cmd.scan_id; WMA_LOGI("ActiveDwell %d, PassiveDwell %d, ScanFlags 0x%x NumChan %d", - cmd->dwell_time_active, cmd->dwell_time_passive, - cmd->scan_ctrl_flags, cmd->num_chan); + cmd.dwell_time_active, cmd.dwell_time_passive, + cmd.scan_ctrl_flags, cmd.num_chan); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_START_SCAN_CMDID); /* Call the wmi api to request the scan */ - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send returned Error %d", status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; + qdf_status = wmi_unified_scan_start_cmd_send(wma_handle->wmi_handle, + &cmd); + if (QDF_IS_STATUS_ERROR(qdf_status)) { + WMA_LOGE("wmi_unified_cmd_send returned Error %d", qdf_status); + goto error1; } + if (NULL != cmd.chan_list) + qdf_mem_free(cmd.chan_list); + WMA_LOGI("WMA --> WMI_START_SCAN_CMDID"); return QDF_STATUS_SUCCESS; + +error1: + if (NULL != cmd.chan_list) + qdf_mem_free(cmd.chan_list); + error: /* Send completion event for only for start scan request */ if (msg_type == WMA_START_SCAN_OFFLOAD_REQ) { @@ -673,6 +570,7 @@ error: wma_send_msg(wma_handle, WMA_RX_SCAN_EVENT, (void *)scan_event, 0); } + return qdf_status; } @@ -689,30 +587,19 @@ QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, tAbortScanParams *abort_scan_req) { QDF_STATUS qdf_status; - wmi_buf_t buf; - int status = 0; - int len; + struct scan_stop_params scan_param = {0}; - qdf_status = wma_get_buf_stop_scan_cmd(wma_handle, &buf, &len, - abort_scan_req); - if (qdf_status != QDF_STATUS_SUCCESS) { - WMA_LOGE("Failed to get buffer for stop scan cmd"); - goto error1; - } - - if (NULL == buf) { - WMA_LOGE("Failed to get buffer for stop scan cmd"); - qdf_status = QDF_STATUS_E_FAULT; - goto error1; - } - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_STOP_SCAN_CMDID); + scan_param.vdev_id = abort_scan_req->SessionId; + scan_param.requestor = abort_scan_req->scan_requestor_id; + scan_param.scan_id = abort_scan_req->scan_id; + /* stop the scan with the corresponding scan_id */ + scan_param.req_type = WMI_SCAN_STOP_ONE; + qdf_status = wmi_unified_scan_stop_cmd_send(wma_handle->wmi_handle, + &scan_param); /* Call the wmi api to request the scan */ - if (status != EOK) { + if (QDF_IS_STATUS_ERROR(qdf_status)) { WMA_LOGE("wmi_unified_cmd_send WMI_STOP_SCAN_CMDID returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; + qdf_status); goto error; } WMA_LOGE("scan_id 0x%x, scan_requestor_id 0x%x, vdev_id %d", @@ -722,10 +609,8 @@ QDF_STATUS wma_stop_scan(tp_wma_handle wma_handle, WMA_LOGI("WMA --> WMI_STOP_SCAN_CMDID"); return QDF_STATUS_SUCCESS; + error: - if (buf) - qdf_nbuf_free(buf); -error1: return qdf_status; } -- cgit v1.2.3 From bc64c9e9eb19f6655e62d52ffeeac3da2032ac8f Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 25 Feb 2016 17:42:38 +0530 Subject: qcacld-3.0: Refactor update channel list command Move tlv formation of update channel list wmi command to common wmi layer from wma layer. Change-Id: I6f368d749a947e284d59fc394a8ecf657d916739 CRs-Fixed: 976998 --- core/wma/src/wma_scan_roam.c | 85 ++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 02d3e13e94d9..24fe0df6c2b9 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -627,92 +627,75 @@ QDF_STATUS wma_update_channel_list(WMA_HANDLE handle, tSirUpdateChanList *chan_list) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_buf_t buf; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_scan_chan_list_cmd_fixed_param *cmd; - int status, i; - uint8_t *buf_ptr; - wmi_channel *chan_info; - uint16_t len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; + int i; + struct scan_chan_list_params scan_ch_param = {0}; + wmi_channel *tchan_info; - len += sizeof(wmi_channel) * chan_list->numChan; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("Failed to allocate memory"); - qdf_status = QDF_STATUS_E_NOMEM; - goto end; + scan_ch_param.chan_info = qdf_mem_malloc(sizeof(wmi_channel) * + chan_list->numChan); + if (NULL == scan_ch_param.chan_info) { + WMA_LOGE("%s: Failed to allocate channel info", __func__); + return QDF_STATUS_E_NOMEM; } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_scan_chan_list_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_scan_chan_list_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_scan_chan_list_cmd_fixed_param)); - - WMA_LOGD("no of channels = %d, len = %d", chan_list->numChan, len); - - cmd->num_scan_chans = chan_list->numChan; - WMITLV_SET_HDR((buf_ptr + sizeof(wmi_scan_chan_list_cmd_fixed_param)), - WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_channel) * chan_list->numChan); - chan_info = (wmi_channel *) (buf_ptr + sizeof(*cmd) + WMI_TLV_HDR_SIZE); + qdf_mem_zero(scan_ch_param.chan_info, sizeof(wmi_channel) * + chan_list->numChan); + WMA_LOGD("no of channels = %d", chan_list->numChan); + tchan_info = scan_ch_param.chan_info; + scan_ch_param.num_scan_chans = chan_list->numChan; for (i = 0; i < chan_list->numChan; ++i) { - WMITLV_SET_HDR(&chan_info->tlv_header, - WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - chan_info->mhz = + tchan_info->mhz = cds_chan_to_freq(chan_list->chanParam[i].chanId); - chan_info->band_center_freq1 = chan_info->mhz; - chan_info->band_center_freq2 = 0; + tchan_info->band_center_freq1 = + tchan_info->mhz; + tchan_info->band_center_freq2 = 0; - WMA_LOGD("chan[%d] = %u", i, chan_info->mhz); + WMA_LOGD("chan[%d] = %u", i, tchan_info->mhz); if (chan_list->chanParam[i].dfsSet) { - WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PASSIVE); + WMI_SET_CHANNEL_FLAG(tchan_info, WMI_CHAN_FLAG_PASSIVE); WMA_LOGI("chan[%d] DFS[%d]\n", chan_list->chanParam[i].chanId, chan_list->chanParam[i].dfsSet); } - if (chan_info->mhz < WMA_2_4_GHZ_MAX_FREQ) - WMI_SET_CHANNEL_MODE(chan_info, MODE_11G); + if (tchan_info->mhz < WMA_2_4_GHZ_MAX_FREQ) + WMI_SET_CHANNEL_MODE(tchan_info, MODE_11G); else - WMI_SET_CHANNEL_MODE(chan_info, MODE_11A); + WMI_SET_CHANNEL_MODE(tchan_info, MODE_11A); if (chan_list->chanParam[i].half_rate) - WMI_SET_CHANNEL_FLAG(chan_info, + WMI_SET_CHANNEL_FLAG(tchan_info, WMI_CHAN_FLAG_HALF_RATE); else if (chan_list->chanParam[i].quarter_rate) - WMI_SET_CHANNEL_FLAG(chan_info, + WMI_SET_CHANNEL_FLAG(tchan_info, WMI_CHAN_FLAG_QUARTER_RATE); - WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, + WMI_SET_CHANNEL_MAX_TX_POWER(tchan_info, chan_list->chanParam[i].pwr); - WMI_SET_CHANNEL_REG_POWER(chan_info, + WMI_SET_CHANNEL_REG_POWER(tchan_info, chan_list->chanParam[i].pwr); - WMA_LOGD("Channel TX power[%d] = %u: %d", i, chan_info->mhz, + WMA_LOGD("Channel TX power[%d] = %u: %d", i, tchan_info->mhz, chan_list->chanParam[i].pwr); /*TODO: Set WMI_SET_CHANNEL_MIN_POWER */ /*TODO: Set WMI_SET_CHANNEL_ANTENNA_MAX */ /*TODO: WMI_SET_CHANNEL_REG_CLASSID */ - chan_info++; + tchan_info++; } - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_SCAN_CHAN_LIST_CMDID); + qdf_status = wmi_unified_scan_chan_list_cmd_send(wma_handle->wmi_handle, + &scan_ch_param); - if (status != EOK) { - qdf_status = QDF_STATUS_E_FAILURE; + if (QDF_IS_STATUS_ERROR(qdf_status)) { WMA_LOGE("Failed to send WMI_SCAN_CHAN_LIST_CMDID"); - wmi_buf_free(buf); } -end: + + qdf_mem_free(scan_ch_param.chan_info); + return qdf_status; } - /** * wma_roam_scan_offload_mode() - send roam scan mode request to fw * @wma_handle: wma handle -- cgit v1.2.3 From 09c3b495b48bee922179a1d66b0383c4ccd5a548 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 16:05:14 +0530 Subject: qcacld-3.0: Refactor wmi power and management commands Move tlv formation of wmi power commands, management over wmi commands to common wmi layer from wma layer. Change-Id: If6be3f786edbad931e2f3af05b45103456b8229b CRs-Fixed: 976998 --- core/wma/src/wma_data.c | 94 ++----------- core/wma/src/wma_power.c | 353 +++++++++++------------------------------------ 2 files changed, 96 insertions(+), 351 deletions(-) diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 12f52ccc0d29..4fc9f6361d8d 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2342,80 +2342,6 @@ void wmi_desc_put(tp_wma_handle wma_handle, struct wmi_desc_t *wmi_desc) qdf_spin_unlock_bh(&wma_handle->wmi_desc_pool.wmi_desc_pool_lock); } -#define mgmt_tx_dl_frm_len 64 -static inline QDF_STATUS -mgmt_wmi_unified_cmd_send(tp_wma_handle wma_handle, void *tx_frame, - uint16_t frmLen, uint8_t vdev_id, - pWMATxRxCompFunc tx_complete_cb, - pWMAAckFnTxComp tx_ota_post_proc_cb, - uint16_t chanfreq, void *pData) -{ - wmi_buf_t buf; - wmi_mgmt_tx_send_cmd_fixed_param *cmd; - int32_t cmd_len; - uint64_t dma_addr; - struct wmi_desc_t *wmi_desc = NULL; - void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - uint8_t *bufp; - int32_t bufp_len = (frmLen < mgmt_tx_dl_frm_len) ? frmLen : - mgmt_tx_dl_frm_len; - - cmd_len = sizeof(wmi_mgmt_tx_send_cmd_fixed_param) + - WMI_TLV_HDR_SIZE + roundup(bufp_len, sizeof(uint32_t)); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, cmd_len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_mgmt_tx_send_cmd_fixed_param *)wmi_buf_data(buf); - bufp = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_mgmt_tx_send_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_mgmt_tx_send_cmd_fixed_param)); - - cmd->vdev_id = vdev_id; - - wmi_desc = wmi_desc_get(wma_handle); - if (!wmi_desc) { - WMA_LOGE("%s: Failed to get wmi_desc", __func__); - goto err2; - } - wmi_desc->nbuf = tx_frame; - wmi_desc->tx_cmpl_cb = tx_complete_cb; - wmi_desc->ota_post_proc_cb = tx_ota_post_proc_cb; - - cmd->desc_id = wmi_desc->desc_id; - cmd->chanfreq = chanfreq; - bufp += sizeof(wmi_mgmt_tx_send_cmd_fixed_param); - WMITLV_SET_HDR(bufp, WMITLV_TAG_ARRAY_BYTE, roundup(bufp_len, - sizeof(uint32_t))); - bufp += WMI_TLV_HDR_SIZE; - qdf_mem_copy(bufp, pData, bufp_len); - qdf_nbuf_map_single(qdf_ctx, tx_frame, QDF_DMA_TO_DEVICE); - dma_addr = qdf_nbuf_get_frag_paddr(tx_frame, 0); - cmd->paddr_lo = (uint32_t)(dma_addr & 0xffffffff); -#if defined(HELIUMPLUS_PADDR64) - cmd->paddr_hi = (uint32_t)((dma_addr >> 32) & 0x1F); -#endif - cmd->frame_len = frmLen; - cmd->buf_len = bufp_len; - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, cmd_len, - WMI_MGMT_TX_SEND_CMDID)) { - WMA_LOGE("%s: Failed to send mgmt Tx", __func__); - goto err1; - } - return QDF_STATUS_SUCCESS; -err1: - wmi_desc_put(wma_handle, wmi_desc); -err2: - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; -} - /** * wma_tx_packet() - Sends Tx Frame to TxRx * @wma_context: wma context @@ -2463,6 +2389,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, #ifdef QCA_PKT_PROTO_TRACE uint8_t proto_type = 0; #endif /* QCA_PKT_PROTO_TRACE */ + struct wmi_mgmt_params mgmt_param = {0}; if (NULL == wma_handle) { WMA_LOGE("wma_handle is NULL"); @@ -2781,11 +2708,20 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, WMI_SERVICE_MGMT_TX_WMI)) { - status = mgmt_wmi_unified_cmd_send(wma_handle, tx_frame, frmLen, - vdev_id, - tx_frm_download_comp_cb, - tx_frm_ota_comp_cb, - chanfreq, pData); + mgmt_param.tx_frame = tx_frame; + mgmt_param.frm_len = frmLen; + mgmt_param.vdev_id = vdev_id; + mgmt_param.tx_complete_cb = tx_frm_download_comp_cb; + mgmt_param.tx_ota_post_proc_cb = tx_frm_ota_comp_cb; + mgmt_param.chanfreq = chanfreq; + mgmt_param.wmi_desc = wmi_desc_get(wma_handle); + mgmt_param.pdata = pData; + mgmt_param.qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); + + status = wmi_mgmt_unified_cmd_send(wma_handle->wmi_handle, + &mgmt_param); + if (status) + wmi_desc_put(wma_handle, mgmt_param.wmi_desc); } else { /* Hand over the Tx Mgmt frame to TxRx */ status = ol_txrx_mgmt_send(txrx_vdev, tx_frame, tx_frm_index, diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index a618b3fbd603..e687fc542d65 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -491,41 +491,19 @@ end: * @vdev_id: vdev id * @val: value * - * Return: 0 for success or error code. + * Return: QDF_STATUS_SUCCESS for success or error code */ -int32_t wmi_unified_set_sta_ps(wmi_unified_t wmi_handle, +QDF_STATUS wmi_unified_set_sta_ps(wmi_unified_t wmi_handle, uint32_t vdev_id, uint8_t val) { - wmi_sta_powersave_mode_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - WMA_LOGD("Set Sta Mode Ps vdevId %d val %d", vdev_id, val); + QDF_STATUS ret; - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: Set Sta Mode Ps Mem Alloc Failed", __func__); - return -ENOMEM; - } - cmd = (wmi_sta_powersave_mode_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_sta_powersave_mode_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_powersave_mode_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - if (val) - cmd->sta_ps_mode = WMI_STA_PS_MODE_ENABLED; - else - cmd->sta_ps_mode = WMI_STA_PS_MODE_DISABLED; + ret = wmi_unified_set_sta_ps_mode(wmi_handle, vdev_id, + val); + if (QDF_IS_STATUS_ERROR(ret)) + WMA_LOGE("Failed to send set Mimo PS ret = %d", ret); - if (wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_STA_POWERSAVE_MODE_CMDID)) { - WMA_LOGE("Set Sta Mode Ps Failed vdevId %d val %d", - vdev_id, val); - qdf_nbuf_free(buf); - return -EIO; - } - return 0; + return QDF_STATUS_SUCCESS; } /** @@ -1069,7 +1047,7 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, } /** - * wma_unified_set_sta_uapsd_auto_trig_cmd() - set uapsd auto trigger command + * wma_set_sta_uapsd_auto_trig_cmd() - set uapsd auto trigger command * @wmi_handle: wma handle * @vdevid: vdev id * @peer_addr: peer mac address @@ -1084,62 +1062,26 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, * * Return: 0 for success or error code. */ -int32_t -wma_unified_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, +static QDF_STATUS wma_set_sta_uapsd_auto_trig_cmd(wmi_unified_t wmi_handle, uint32_t vdevid, uint8_t peer_addr[IEEE80211_ADDR_LEN], uint8_t *autoTriggerparam, uint32_t num_ac) { - wmi_sta_uapsd_auto_trig_cmd_fixed_param *cmd; - int32_t ret; - uint32_t param_len = num_ac * sizeof(wmi_sta_uapsd_auto_trig_param); - uint32_t cmd_len = sizeof(*cmd) + param_len + WMI_TLV_HDR_SIZE; - uint32_t i; - wmi_buf_t buf; - uint8_t *buf_ptr; - - buf = wmi_buf_alloc(wmi_handle, cmd_len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_sta_uapsd_auto_trig_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_sta_uapsd_auto_trig_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_uapsd_auto_trig_cmd_fixed_param)); - cmd->vdev_id = vdevid; - cmd->num_ac = num_ac; - WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_addr, &cmd->peer_macaddr); - - /* TLV indicating array of structures to follow */ - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, param_len); + QDF_STATUS ret; + struct sta_uapsd_trig_params cmd = {0}; - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, autoTriggerparam, param_len); + cmd.vdevid = vdevid; + cmd.auto_triggerparam = autoTriggerparam; + cmd.num_ac = num_ac; - /* - * Update tag and length for uapsd auto trigger params (this will take - * care of updating tag and length if it is not pre-filled by caller). - */ - for (i = 0; i < num_ac; i++) { - WMITLV_SET_HDR((buf_ptr + - (i * sizeof(wmi_sta_uapsd_auto_trig_param))), - WMITLV_TAG_STRUC_wmi_sta_uapsd_auto_trig_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_uapsd_auto_trig_param)); - } - - ret = wmi_unified_cmd_send(wmi_handle, buf, cmd_len, - WMI_STA_UAPSD_AUTO_TRIG_CMDID); - if (ret != EOK) { + qdf_mem_copy((uint8_t *) cmd.peer_addr, (uint8_t *) peer_addr, + sizeof(peer_addr)); + ret = wmi_unified_set_sta_uapsd_auto_trig_cmd(wmi_handle, + &cmd); + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to send set uapsd param ret = %d", ret); - wmi_buf_free(buf); - } + return ret; } @@ -1162,7 +1104,7 @@ QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, tp_wma_trigger_uapsd_params trigger_uapsd_params) { - int32_t ret; + QDF_STATUS ret; wmi_sta_uapsd_auto_trig_param uapsd_trigger_param; WMA_LOGD("Trigger uapsd params vdev id %d", vdev_id); @@ -1191,15 +1133,16 @@ QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, uapsd_trigger_param.delay_interval = trigger_uapsd_params->delay_interval; - ret = wma_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, + ret = wma_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, vdev_id, wma_handle->interfaces[vdev_id].bssid, (uint8_t *) (&uapsd_trigger_param), 1); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Fail to send uapsd param cmd for vdevid %d ret = %d", ret, vdev_id); - return QDF_STATUS_E_FAILURE; + return ret; } - return QDF_STATUS_SUCCESS; + + return ret; } /** @@ -1213,7 +1156,7 @@ QDF_STATUS wma_trigger_uapsd_params(tp_wma_handle wma_handle, uint32_t vdev_id, QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uint32_t vdev_id, enum uapsd_ac ac) { - int32_t ret; + QDF_STATUS ret; struct wma_txrx_node *iface = &wma_handle->interfaces[vdev_id]; wmi_sta_uapsd_auto_trig_param uapsd_trigger_param; enum uapsd_up user_priority; @@ -1260,25 +1203,26 @@ QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, uapsd_trigger_param.suspend_interval = 0; uapsd_trigger_param.delay_interval = 0; - ret = wma_unified_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, + ret = wma_set_sta_uapsd_auto_trig_cmd(wma_handle->wmi_handle, vdev_id, wma_handle->interfaces[vdev_id].bssid, (uint8_t *)(&uapsd_trigger_param), 1); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Fail to send auto trig cmd for vdevid %d ret = %d", ret, vdev_id); - return QDF_STATUS_E_FAILURE; + return ret; } ret = wma_unified_set_sta_ps_param(wma_handle->wmi_handle, vdev_id, WMI_STA_PS_PARAM_UAPSD, iface->uapsd_cached_val); - if (ret) { + if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Uapsd per ac Failed vdevId %d ac %d", vdev_id, ac); - return QDF_STATUS_E_FAILURE; + return ret; } WMA_LOGD("Disable Uapsd per ac vdevId %d val %d", vdev_id, iface->uapsd_cached_val); + return QDF_STATUS_SUCCESS; } @@ -1290,37 +1234,13 @@ QDF_STATUS wma_disable_uapsd_per_ac(tp_wma_handle wma_handle, */ QDF_STATUS wma_get_temperature(tp_wma_handle wma_handle) { - wmi_pdev_get_temperature_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len = sizeof(wmi_pdev_get_temperature_cmd_fixed_param); - uint8_t *buf_ptr; - - if (!wma_handle) { - WMA_LOGE(FL("WMA is closed, can not issue cmd")); - return QDF_STATUS_E_INVAL; - } - - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); + QDF_STATUS ret = QDF_STATUS_SUCCESS; - cmd = (wmi_pdev_get_temperature_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_get_temperature_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_get_temperature_cmd_fixed_param)); + ret = wmi_unified_get_temperature(wma_handle->wmi_handle); + if (ret) + WMA_LOGE("Failed to send set Mimo PS ret = %d", ret); - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_PDEV_GET_TEMPERATURE_CMDID)) { - WMA_LOGE(FL("failed to send get temperature command")); - wmi_buf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return ret; } /** @@ -1708,59 +1628,24 @@ int wma_p2p_noa_event_handler(void *handle, uint8_t *event, */ static void wma_set_p2pgo_noa_req(tp_wma_handle wma, tP2pPsParams *noa) { - wmi_p2p_set_noa_cmd_fixed_param *cmd; - wmi_p2p_noa_descriptor *noa_discriptor; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint16_t len; - int32_t status; - uint32_t duration; - - WMA_LOGD("%s: Enter", __func__); - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + sizeof(*noa_discriptor); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("Failed to allocate memory"); - goto end; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_p2p_set_noa_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_p2p_set_noa_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_p2p_set_noa_cmd_fixed_param)); - duration = (noa->count == 1) ? noa->single_noa_duration : noa->duration; - cmd->vdev_id = noa->sessionId; - cmd->enable = (duration) ? true : false; - cmd->num_noa = 1; - - WMITLV_SET_HDR((buf_ptr + sizeof(wmi_p2p_set_noa_cmd_fixed_param)), - WMITLV_TAG_ARRAY_STRUC, sizeof(wmi_p2p_noa_descriptor)); - noa_discriptor = (wmi_p2p_noa_descriptor *) (buf_ptr + - sizeof - (wmi_p2p_set_noa_cmd_fixed_param) - + WMI_TLV_HDR_SIZE); - WMITLV_SET_HDR(&noa_discriptor->tlv_header, - WMITLV_TAG_STRUC_wmi_p2p_noa_descriptor, - WMITLV_GET_STRUCT_TLVLEN(wmi_p2p_noa_descriptor)); - noa_discriptor->type_count = noa->count; - noa_discriptor->duration = duration; - noa_discriptor->interval = noa->interval; - noa_discriptor->start_time = 0; - - WMA_LOGI("SET P2P GO NOA:vdev_id:%d count:%d duration:%d interval:%d", - cmd->vdev_id, noa->count, noa_discriptor->duration, - noa->interval); - status = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID); - if (status != EOK) { - WMA_LOGE("Failed to send WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID"); - wmi_buf_free(buf); - } + QDF_STATUS ret; + struct p2p_ps_params cmd = {0}; + + cmd.opp_ps = noa->opp_ps; + cmd.ctwindow = noa->ctWindow; + cmd.count = noa->count; + cmd.duration = noa->duration; + cmd.interval = noa->interval; + cmd.single_noa_duration = noa->single_noa_duration; + cmd.ps_selection = noa->psSelection; + cmd.session_id = noa->sessionId; + + ret = wmi_unified_set_p2pgo_noa_req_cmd(wma->wmi_handle, + &cmd); + if (QDF_IS_STATUS_ERROR(ret)) + WMA_LOGE("Failed to send set uapsd param ret = %d", ret); -end: - WMA_LOGD("%s: Exit", __func__); + return; } /** @@ -1772,38 +1657,24 @@ end: */ static void wma_set_p2pgo_oppps_req(tp_wma_handle wma, tP2pPsParams *oppps) { - wmi_p2p_set_oppps_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t status; - - WMA_LOGD("%s: Enter", __func__); - buf = wmi_buf_alloc(wma->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate memory"); - goto end; - } - - cmd = (wmi_p2p_set_oppps_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_p2p_set_oppps_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_p2p_set_oppps_cmd_fixed_param)); - cmd->vdev_id = oppps->sessionId; - if (oppps->ctWindow) - WMI_UNIFIED_OPPPS_ATTR_ENABLED_SET(cmd); - - WMI_UNIFIED_OPPPS_ATTR_CTWIN_SET(cmd, oppps->ctWindow); - WMA_LOGI("SET P2P GO OPPPS:vdev_id:%d ctwindow:%d", - cmd->vdev_id, oppps->ctWindow); - status = wmi_unified_cmd_send(wma->wmi_handle, buf, sizeof(*cmd), - WMI_P2P_SET_OPPPS_PARAM_CMDID); - if (status != EOK) { - WMA_LOGE("Failed to send WMI_P2P_SET_OPPPS_PARAM_CMDID"); - wmi_buf_free(buf); - } + QDF_STATUS ret; + struct p2p_ps_params cmd = {0}; + + cmd.opp_ps = oppps->opp_ps; + cmd.ctwindow = oppps->ctWindow; + cmd.count = oppps->count; + cmd.duration = oppps->duration; + cmd.interval = oppps->interval; + cmd.single_noa_duration = oppps->single_noa_duration; + cmd.ps_selection = oppps->psSelection; + cmd.session_id = oppps->sessionId; + + ret = wmi_unified_set_p2pgo_oppps_req(wma->wmi_handle, + &cmd); + if (QDF_IS_STATUS_ERROR(ret)) + WMA_LOGE("Failed to send set uapsd param ret = %d", ret); -end: - WMA_LOGD("%s: Exit", __func__); + return; } /** @@ -1865,50 +1736,12 @@ void wma_process_set_mimops_req(tp_wma_handle wma_handle, */ QDF_STATUS wma_set_mimops(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = QDF_STATUS_SUCCESS; - wmi_sta_smps_force_mode_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint16_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_sta_smps_force_mode_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_sta_smps_force_mode_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_smps_force_mode_cmd_fixed_param)); - - cmd->vdev_id = vdev_id; - - switch (value) { - case 0: - cmd->forced_mode = WMI_SMPS_FORCED_MODE_NONE; - break; - case 1: - cmd->forced_mode = WMI_SMPS_FORCED_MODE_DISABLED; - break; - case 2: - cmd->forced_mode = WMI_SMPS_FORCED_MODE_STATIC; - break; - case 3: - cmd->forced_mode = WMI_SMPS_FORCED_MODE_DYNAMIC; - break; - default: - WMA_LOGE("%s:INVALID Mimo PS CONFIG", __func__); - return QDF_STATUS_E_FAILURE; - } - - WMA_LOGD("Setting vdev %d value = %u", vdev_id, value); + QDF_STATUS ret; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_STA_SMPS_FORCE_MODE_CMDID); - if (ret < 0) { + ret = wmi_unified_set_mimops(wma->wmi_handle, vdev_id, + value); + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to send set Mimo PS ret = %d", ret); - wmi_buf_free(buf); - } return ret; } @@ -1981,36 +1814,12 @@ QDF_STATUS wma_set_idle_ps_config(void *wma_ptr, uint32_t idle_ps) QDF_STATUS wma_set_smps_params(tp_wma_handle wma, uint8_t vdev_id, int value) { - int ret = QDF_STATUS_SUCCESS; - wmi_sta_smps_param_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint16_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_sta_smps_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_sta_smps_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_sta_smps_param_cmd_fixed_param)); - - cmd->vdev_id = vdev_id; - cmd->value = value & WMA_SMPS_MASK_LOWER_16BITS; - cmd->param = - (value >> WMA_SMPS_PARAM_VALUE_S) & WMA_SMPS_MASK_UPPER_3BITS; - - WMA_LOGD("Setting vdev %d value = %x param %x", vdev_id, cmd->value, - cmd->param); + QDF_STATUS ret; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_STA_SMPS_PARAM_CMDID); - if (ret < 0) { + ret = wmi_unified_set_smps_params(wma->wmi_handle, vdev_id, + value); + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("Failed to send set Mimo PS ret = %d", ret); - wmi_buf_free(buf); - } return ret; } -- cgit v1.2.3 From f076e7292eb7cdbb43e96455573ebb28ee203e6d Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 11:15:03 +0530 Subject: qcacld-3.0: Refactor wmi ocb command formation Move tlv formation of wmi ocb/dsrc commands to common wmi layer from wma layer. Change-Id: I16b6028b2c4448c8d3161676c642c0fd29e9a356 CRs-Fixed: 976998 --- core/wma/src/wma_ocb.c | 530 ++++++------------------------------------------- 1 file changed, 59 insertions(+), 471 deletions(-) diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 818dadc61f21..624912eafc0e 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -232,191 +232,24 @@ static WLAN_PHY_MODE wma_ocb_freq_to_mode(uint32_t freq) */ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) { - int32_t ret; - wmi_ocb_set_config_cmd_fixed_param *cmd; - wmi_channel *chan; - wmi_ocb_channel *ocb_chan; - wmi_qos_parameter *qos_param; - wmi_dcc_ndl_chan *ndl_chan; - wmi_dcc_ndl_active_state_config *ndl_active_config; - wmi_ocb_schedule_element *sched_elem; - uint8_t *buf_ptr; - wmi_buf_t buf; - int32_t len; - int32_t i, j, active_state_count; - - /* - * Validate the dcc_ndl_chan_list_len and count the number of active - * states. Validate dcc_ndl_active_state_list_len. - */ - active_state_count = 0; - if (config->dcc_ndl_chan_list_len) { - if (!config->dcc_ndl_chan_list || - config->dcc_ndl_chan_list_len != - config->channel_count * sizeof(wmi_dcc_ndl_chan)) { - WMA_LOGE(FL("NDL channel is invalid. List len: %d"), - config->dcc_ndl_chan_list_len); - return -EINVAL; - } - - for (i = 0, ndl_chan = config->dcc_ndl_chan_list; - i < config->channel_count; ++i, ++ndl_chan) - active_state_count += - WMI_NDL_NUM_ACTIVE_STATE_GET(ndl_chan); - - if (active_state_count) { - if (!config->dcc_ndl_active_state_list || - config->dcc_ndl_active_state_list_len != - active_state_count * - sizeof(wmi_dcc_ndl_active_state_config)) { - WMA_LOGE(FL("NDL active state is invalid.")); - return -EINVAL; - } - } - } - - len = sizeof(*cmd) + - WMI_TLV_HDR_SIZE + config->channel_count * - sizeof(wmi_channel) + - WMI_TLV_HDR_SIZE + config->channel_count * - sizeof(wmi_ocb_channel) + - WMI_TLV_HDR_SIZE + config->channel_count * - sizeof(wmi_qos_parameter) * WLAN_MAX_AC + - WMI_TLV_HDR_SIZE + config->dcc_ndl_chan_list_len + - WMI_TLV_HDR_SIZE + active_state_count * - sizeof(wmi_dcc_ndl_active_state_config) + - WMI_TLV_HDR_SIZE + config->schedule_size * - sizeof(wmi_ocb_schedule_element); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = (uint8_t *)wmi_buf_data(buf); - cmd = (wmi_ocb_set_config_cmd_fixed_param *)buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_set_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_ocb_set_config_cmd_fixed_param)); - cmd->vdev_id = config->session_id; - cmd->channel_count = config->channel_count; - cmd->schedule_size = config->schedule_size; - cmd->flags = config->flags; - buf_ptr += sizeof(*cmd); - - /* Add the wmi_channel info */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - config->channel_count*sizeof(wmi_channel)); - buf_ptr += WMI_TLV_HDR_SIZE; - for (i = 0; i < config->channel_count; i++) { - chan = (wmi_channel *)buf_ptr; - WMITLV_SET_HDR(&chan->tlv_header, - WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - chan->mhz = config->channels[i].chan_freq; - chan->band_center_freq1 = config->channels[i].chan_freq; - chan->band_center_freq2 = 0; - chan->info = 0; - - WMI_SET_CHANNEL_MODE(chan, wma_ocb_freq_to_mode(chan->mhz)); - WMI_SET_CHANNEL_MAX_POWER(chan, config->channels[i].max_pwr); - WMI_SET_CHANNEL_MIN_POWER(chan, config->channels[i].min_pwr); - WMI_SET_CHANNEL_MAX_TX_POWER(chan, config->channels[i].max_pwr); - WMI_SET_CHANNEL_REG_POWER(chan, config->channels[i].reg_pwr); - WMI_SET_CHANNEL_ANTENNA_MAX(chan, - config->channels[i].antenna_max); - - if (config->channels[i].bandwidth < 10) - WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE); - else if (config->channels[i].bandwidth < 20) - WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE); - buf_ptr += sizeof(*chan); - } - - /* Add the wmi_ocb_channel info */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - config->channel_count*sizeof(wmi_ocb_channel)); - buf_ptr += WMI_TLV_HDR_SIZE; - for (i = 0; i < config->channel_count; i++) { - ocb_chan = (wmi_ocb_channel *)buf_ptr; - WMITLV_SET_HDR(&ocb_chan->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_ocb_channel)); - ocb_chan->bandwidth = config->channels[i].bandwidth; - WMI_CHAR_ARRAY_TO_MAC_ADDR( - config->channels[i].mac_address.bytes, - &ocb_chan->mac_address); - buf_ptr += sizeof(*ocb_chan); - } - - /* Add the wmi_qos_parameter info */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - config->channel_count * sizeof(wmi_qos_parameter)*WLAN_MAX_AC); - buf_ptr += WMI_TLV_HDR_SIZE; - /* WLAN_MAX_AC parameters for each channel */ - for (i = 0; i < config->channel_count; i++) { - for (j = 0; j < WLAN_MAX_AC; j++) { - qos_param = (wmi_qos_parameter *)buf_ptr; - WMITLV_SET_HDR(&qos_param->tlv_header, - WMITLV_TAG_STRUC_wmi_qos_parameter, - WMITLV_GET_STRUCT_TLVLEN(wmi_qos_parameter)); - qos_param->aifsn = - config->channels[i].qos_params[j].aifsn; - qos_param->cwmin = - config->channels[i].qos_params[j].cwmin; - qos_param->cwmax = - config->channels[i].qos_params[j].cwmax; - buf_ptr += sizeof(*qos_param); - } - } - - /* Add the wmi_dcc_ndl_chan (per channel) */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - config->dcc_ndl_chan_list_len); - buf_ptr += WMI_TLV_HDR_SIZE; - if (config->dcc_ndl_chan_list_len) { - ndl_chan = (wmi_dcc_ndl_chan *)buf_ptr; - qdf_mem_copy(ndl_chan, config->dcc_ndl_chan_list, - config->dcc_ndl_chan_list_len); - for (i = 0; i < config->channel_count; i++) - WMITLV_SET_HDR(&(ndl_chan[i].tlv_header), - WMITLV_TAG_STRUC_wmi_dcc_ndl_chan, - WMITLV_GET_STRUCT_TLVLEN(wmi_dcc_ndl_chan)); - buf_ptr += config->dcc_ndl_chan_list_len; - } - - /* Add the wmi_dcc_ndl_active_state_config */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, active_state_count * - sizeof(wmi_dcc_ndl_active_state_config)); - buf_ptr += WMI_TLV_HDR_SIZE; - if (active_state_count) { - ndl_active_config = (wmi_dcc_ndl_active_state_config *)buf_ptr; - qdf_mem_copy(ndl_active_config, - config->dcc_ndl_active_state_list, - active_state_count * sizeof(*ndl_active_config)); - for (i = 0; i < active_state_count; ++i) - WMITLV_SET_HDR(&(ndl_active_config[i].tlv_header), - WMITLV_TAG_STRUC_wmi_dcc_ndl_active_state_config, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_ndl_active_state_config)); - buf_ptr += active_state_count * - sizeof(*ndl_active_config); - } - - /* Add the wmi_ocb_schedule_element info */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - config->schedule_size * sizeof(wmi_ocb_schedule_element)); - buf_ptr += WMI_TLV_HDR_SIZE; - for (i = 0; i < config->schedule_size; i++) { - sched_elem = (wmi_ocb_schedule_element *)buf_ptr; - WMITLV_SET_HDR(&sched_elem->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_schedule_element, - WMITLV_GET_STRUCT_TLVLEN(wmi_ocb_schedule_element)); - sched_elem->channel_freq = config->schedule[i].chan_freq; - sched_elem->total_duration = config->schedule[i].total_duration; - sched_elem->guard_interval = config->schedule[i].guard_interval; - buf_ptr += sizeof(*sched_elem); - } + int32_t ret, i; + uint32_t *ch_mhz; + struct ocb_config_param tconfig = {0}; + + tconfig.session_id = config->session_id; + tconfig.channel_count = config->channel_count; + tconfig.schedule_size = config->schedule_size; + tconfig.flags = config->flags; + tconfig.channels = (struct ocb_config_channel *)config->channels; + tconfig.schedule = (struct ocb_config_sched *)config->schedule; + tconfig.dcc_ndl_chan_list_len = config->dcc_ndl_chan_list_len; + tconfig.dcc_ndl_chan_list = config->dcc_ndl_chan_list; + tconfig.dcc_ndl_active_state_list_len = config->dcc_ndl_active_state_list_len; + tconfig.dcc_ndl_active_state_list = config->dcc_ndl_active_state_list; + ch_mhz = qdf_mem_malloc(sizeof(uint32_t)*config->channel_count); + + for (i = 0; i < config->channel_count; i++) + ch_mhz[i] = wma_ocb_freq_to_mode(config->channels[i].chan_freq); /* * Save the configuration so that it can be used in @@ -428,18 +261,19 @@ int wma_ocb_set_config(tp_wma_handle wma_handle, struct sir_ocb_config *config) wma_handle->ocb_config_req = copy_sir_ocb_config(config); } - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_OCB_SET_CONFIG_CMDID); + ret = wmi_unified_ocb_set_config(wma_handle->wmi_handle, &tconfig, + ch_mhz); if (ret != EOK) { if (wma_handle->ocb_config_req) { qdf_mem_free(wma_handle->ocb_config_req); wma_handle->ocb_config_req = NULL; } - + qdf_mem_free(ch_mhz); WMA_LOGE("Failed to set OCB config"); - wmi_buf_free(buf); return -EIO; } + qdf_mem_free(ch_mhz); + return 0; } @@ -471,36 +305,14 @@ int wma_ocb_set_config_event_handler(void *handle, uint8_t *event_buf, int wma_ocb_set_utc_time(tp_wma_handle wma_handle, struct sir_ocb_utc *utc) { int32_t ret; - wmi_ocb_set_utc_time_cmd_fixed_param *cmd; - uint8_t *buf_ptr; - uint32_t len, i; - wmi_buf_t buf; - - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = (uint8_t *)wmi_buf_data(buf); - cmd = (wmi_ocb_set_utc_time_cmd_fixed_param *)buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_set_utc_time_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_ocb_set_utc_time_cmd_fixed_param)); - cmd->vdev_id = utc->vdev_id; + struct ocb_utc_param cmd = {0}; - for (i = 0; i < SIZE_UTC_TIME; i++) - WMI_UTC_TIME_SET(cmd, i, utc->utc_time[i]); - - for (i = 0; i < SIZE_UTC_TIME_ERROR; i++) - WMI_TIME_ERROR_SET(cmd, i, utc->time_error[i]); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_OCB_SET_UTC_TIME_CMDID); + cmd.vdev_id = utc->vdev_id; + qdf_mem_copy(&cmd.utc_time, &utc->utc_time, WMI_SIZE_UTC_TIME); + qdf_mem_copy(&cmd.time_error, &utc->time_error, WMI_SIZE_UTC_TIME_ERROR); + ret = wmi_unified_ocb_set_utc_time_cmd(wma_handle->wmi_handle, &cmd); if (ret != EOK) { WMA_LOGE(FL("Failed to set OCB UTC time")); - wmi_buf_free(buf); return -EIO; } @@ -519,52 +331,20 @@ int wma_ocb_start_timing_advert(tp_wma_handle wma_handle, struct sir_ocb_timing_advert *timing_advert) { int32_t ret; - wmi_ocb_start_timing_advert_cmd_fixed_param *cmd; - uint8_t *buf_ptr; - uint32_t len, len_template; - wmi_buf_t buf; - - len = sizeof(*cmd) + - WMI_TLV_HDR_SIZE; - - len_template = timing_advert->template_length; - /* Add padding to the template if needed */ - if (len_template % 4 != 0) - len_template += 4 - (len_template % 4); - len += len_template; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = (uint8_t *)wmi_buf_data(buf); - cmd = (wmi_ocb_start_timing_advert_cmd_fixed_param *)buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_start_timing_advert_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_ocb_start_timing_advert_cmd_fixed_param)); - cmd->vdev_id = timing_advert->vdev_id; - cmd->repeat_rate = timing_advert->repeat_rate; - cmd->channel_freq = timing_advert->chan_freq; - cmd->timestamp_offset = timing_advert->timestamp_offset; - cmd->time_value_offset = timing_advert->time_value_offset; - cmd->timing_advert_template_length = timing_advert->template_length; - buf_ptr += sizeof(*cmd); - - /* Add the timing advert template */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, - len_template); - qdf_mem_copy(buf_ptr + WMI_TLV_HDR_SIZE, - (uint8_t *)timing_advert->template_value, - timing_advert->template_length); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_OCB_START_TIMING_ADVERT_CMDID); + struct ocb_timing_advert_param cmd = {0}; + + cmd.vdev_id = timing_advert->vdev_id; + cmd.repeat_rate = timing_advert->repeat_rate; + cmd.chan_freq = timing_advert->chan_freq; + cmd.timestamp_offset = timing_advert->timestamp_offset; + cmd.time_value_offset = timing_advert->time_value_offset; + cmd.template_length = timing_advert->template_length; + cmd.template_value = (uint8_t *)timing_advert->template_value; + + ret = wmi_unified_ocb_start_timing_advert(wma_handle->wmi_handle, + &cmd); if (ret != EOK) { WMA_LOGE(FL("Failed to start OCB timing advert")); - wmi_buf_free(buf); return -EIO; } @@ -583,32 +363,14 @@ int wma_ocb_stop_timing_advert(tp_wma_handle wma_handle, struct sir_ocb_timing_advert *timing_advert) { int32_t ret; - wmi_ocb_stop_timing_advert_cmd_fixed_param *cmd; - uint8_t *buf_ptr; - uint32_t len; - wmi_buf_t buf; - - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } + struct ocb_timing_advert_param cmd = {0}; - buf_ptr = (uint8_t *)wmi_buf_data(buf); - cmd = (wmi_ocb_stop_timing_advert_cmd_fixed_param *)buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_stop_timing_advert_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_ocb_stop_timing_advert_cmd_fixed_param)); - cmd->vdev_id = timing_advert->vdev_id; - cmd->channel_freq = timing_advert->chan_freq; - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_OCB_STOP_TIMING_ADVERT_CMDID); + cmd.vdev_id = timing_advert->vdev_id; + cmd.chan_freq = timing_advert->chan_freq; + ret = wmi_unified_ocb_stop_timing_advert(wma_handle->wmi_handle, + &cmd); if (ret != EOK) { WMA_LOGE(FL("Failed to stop OCB timing advert")); - wmi_buf_free(buf); return -EIO; } @@ -627,34 +389,12 @@ int wma_ocb_get_tsf_timer(tp_wma_handle wma_handle, struct sir_ocb_get_tsf_timer *request) { QDF_STATUS ret; - wmi_ocb_get_tsf_timer_cmd_fixed_param *cmd; - uint8_t *buf_ptr; - wmi_buf_t buf; - int32_t len; - - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - buf_ptr = (uint8_t *)wmi_buf_data(buf); - - cmd = (wmi_ocb_get_tsf_timer_cmd_fixed_param *)buf_ptr; - qdf_mem_zero(cmd, len); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ocb_get_tsf_timer_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_ocb_get_tsf_timer_cmd_fixed_param)); - cmd->vdev_id = request->vdev_id; /* Send the WMI command */ - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_OCB_GET_TSF_TIMER_CMDID); + ret = wmi_unified_ocb_get_tsf_timer(wma_handle->wmi_handle, request->vdev_id); /* If there is an error, set the completion event */ if (ret != EOK) { WMA_LOGE(FL("Failed to send WMI message: %d"), ret); - wmi_buf_free(buf); return -EIO; } return 0; @@ -712,64 +452,18 @@ int wma_dcc_get_stats(tp_wma_handle wma_handle, struct sir_dcc_get_stats *get_stats_param) { int32_t ret; - wmi_dcc_get_stats_cmd_fixed_param *cmd; - wmi_dcc_channel_stats_request *channel_stats_array; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t len; - uint32_t i; - - /* Validate the input */ - if (get_stats_param->request_array_len != - get_stats_param->channel_count * sizeof(*channel_stats_array)) { - WMA_LOGE(FL("Invalid parameter")); - return -EINVAL; - } - - /* Allocate memory for the WMI command */ - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + - get_stats_param->request_array_len; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return QDF_STATUS_E_NOMEM; - } + struct dcc_get_stats_param cmd = {0}; - buf_ptr = wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - - /* Populate the WMI command */ - cmd = (wmi_dcc_get_stats_cmd_fixed_param *)buf_ptr; - buf_ptr += sizeof(*cmd); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_get_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_get_stats_cmd_fixed_param)); - cmd->vdev_id = get_stats_param->vdev_id; - cmd->num_channels = get_stats_param->channel_count; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - get_stats_param->request_array_len); - buf_ptr += WMI_TLV_HDR_SIZE; - - channel_stats_array = (wmi_dcc_channel_stats_request *)buf_ptr; - qdf_mem_copy(channel_stats_array, get_stats_param->request_array, - get_stats_param->request_array_len); - for (i = 0; i < cmd->num_channels; i++) - WMITLV_SET_HDR(&channel_stats_array[i].tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_channel_stats_request, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_channel_stats_request)); + cmd.vdev_id = get_stats_param->vdev_id; + cmd.channel_count = get_stats_param->channel_count; + cmd.request_array_len = get_stats_param->request_array_len; + cmd.request_array = get_stats_param->request_array; /* Send the WMI command */ - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DCC_GET_STATS_CMDID); + ret = wmi_unified_dcc_get_stats_cmd(wma_handle->wmi_handle, &cmd); if (ret != EOK) { WMA_LOGE(FL("Failed to send WMI message: %d"), ret); - wmi_buf_free(buf); return -EIO; } @@ -835,39 +529,13 @@ int wma_dcc_clear_stats(tp_wma_handle wma_handle, struct sir_dcc_clear_stats *clear_stats_param) { int32_t ret; - wmi_dcc_clear_stats_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t len; - - /* Allocate memory for the WMI command */ - len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - - /* Populate the WMI command */ - cmd = (wmi_dcc_clear_stats_cmd_fixed_param *)buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_clear_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_clear_stats_cmd_fixed_param)); - cmd->vdev_id = clear_stats_param->vdev_id; - cmd->dcc_stats_bitmap = clear_stats_param->dcc_stats_bitmap; /* Send the WMI command */ - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DCC_CLEAR_STATS_CMDID); + ret = wmi_unified_dcc_clear_stats(wma_handle->wmi_handle, + clear_stats_param->vdev_id, + clear_stats_param->dcc_stats_bitmap); if (ret != EOK) { WMA_LOGE(FL("Failed to send the WMI command")); - wmi_buf_free(buf); return -EIO; } @@ -885,95 +553,15 @@ int wma_dcc_update_ndl(tp_wma_handle wma_handle, struct sir_dcc_update_ndl *update_ndl_param) { QDF_STATUS qdf_status; - wmi_dcc_update_ndl_cmd_fixed_param *cmd; - wmi_dcc_ndl_chan *ndl_chan_array; - wmi_dcc_ndl_active_state_config *ndl_active_state_array; - uint32_t active_state_count; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t len; - uint32_t i; - - /* validate the input */ - if (update_ndl_param->dcc_ndl_chan_list_len != - update_ndl_param->channel_count * sizeof(*ndl_chan_array)) { - WMA_LOGE(FL("Invalid parameter")); - return QDF_STATUS_E_INVAL; - } - active_state_count = 0; - ndl_chan_array = update_ndl_param->dcc_ndl_chan_list; - for (i = 0; i < update_ndl_param->channel_count; i++) - active_state_count += - WMI_NDL_NUM_ACTIVE_STATE_GET(&ndl_chan_array[i]); - if (update_ndl_param->dcc_ndl_active_state_list_len != - active_state_count * sizeof(*ndl_active_state_array)) { - WMA_LOGE(FL("Invalid parameter")); - return QDF_STATUS_E_INVAL; - } - - /* Allocate memory for the WMI command */ - len = sizeof(*cmd) + - WMI_TLV_HDR_SIZE + update_ndl_param->dcc_ndl_chan_list_len + - WMI_TLV_HDR_SIZE + - update_ndl_param->dcc_ndl_active_state_list_len; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - - /* Populate the WMI command */ - cmd = (wmi_dcc_update_ndl_cmd_fixed_param *)buf_ptr; - buf_ptr += sizeof(*cmd); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_update_ndl_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_update_ndl_cmd_fixed_param)); - cmd->vdev_id = update_ndl_param->vdev_id; - cmd->num_channel = update_ndl_param->channel_count; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - update_ndl_param->dcc_ndl_chan_list_len); - buf_ptr += WMI_TLV_HDR_SIZE; - - ndl_chan_array = (wmi_dcc_ndl_chan *)buf_ptr; - qdf_mem_copy(ndl_chan_array, update_ndl_param->dcc_ndl_chan_list, - update_ndl_param->dcc_ndl_chan_list_len); - for (i = 0; i < cmd->num_channel; i++) - WMITLV_SET_HDR(&ndl_chan_array[i].tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_ndl_chan, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_ndl_chan)); - buf_ptr += update_ndl_param->dcc_ndl_chan_list_len; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - update_ndl_param->dcc_ndl_active_state_list_len); - buf_ptr += WMI_TLV_HDR_SIZE; - - ndl_active_state_array = (wmi_dcc_ndl_active_state_config *) buf_ptr; - qdf_mem_copy(ndl_active_state_array, - update_ndl_param->dcc_ndl_active_state_list, - update_ndl_param->dcc_ndl_active_state_list_len); - for (i = 0; i < active_state_count; i++) { - WMITLV_SET_HDR(&ndl_active_state_array[i].tlv_header, - WMITLV_TAG_STRUC_wmi_dcc_ndl_active_state_config, - WMITLV_GET_STRUCT_TLVLEN( - wmi_dcc_ndl_active_state_config)); - } - buf_ptr += update_ndl_param->dcc_ndl_active_state_list_len; + struct dcc_update_ndl_param *cmd; + cmd = (struct dcc_update_ndl_param *) update_ndl_param; /* Send the WMI command */ - qdf_status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DCC_UPDATE_NDL_CMDID); + qdf_status = wmi_unified_dcc_update_ndl(wma_handle->wmi_handle, + cmd); /* If there is an error, set the completion event */ if (qdf_status) { WMA_LOGE(FL("Failed to send WMI message: %d"), qdf_status); - wmi_buf_free(buf); return -EIO; } -- cgit v1.2.3 From aa64c24a2ab37e65d028ba91db058a754627d5ad Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 11:31:49 +0530 Subject: qcacld-3.0: Refactor formation of wmi feature commands Move tlv formation of wmi feature based commands to common wmi layer from wma layer. Change-Id: I2cda92c377faf16b09412f0dc746e537343242ff CRs-Fixed: 976998 --- core/wma/src/wma_features.c | 1695 +++++-------------------------------------- 1 file changed, 181 insertions(+), 1514 deletions(-) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 8ec2c2c26ca1..8fe0266f5460 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -148,9 +148,6 @@ static int wma_post_auto_shutdown_msg(void) QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, void *pGetRssiReq) { - wmi_buf_t buf; - wmi_request_stats_cmd_fixed_param *cmd; - uint8_t len = sizeof(wmi_request_stats_cmd_fixed_param); tAniGetRssiReq *pRssiBkUp = NULL; /* command is in progess */ @@ -177,24 +174,8 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, wma_handle->pGetRssiReq = (void *)pRssiBkUp; } - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - qdf_mem_free(pRssiBkUp); - wma_handle->pGetRssiReq = NULL; - return QDF_STATUS_E_FAILURE; - } - - cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_request_stats_cmd_fixed_param)); - cmd->stats_id = WMI_REQUEST_VDEV_STAT; - if (wmi_unified_cmd_send - (wma_handle->wmi_handle, buf, len, WMI_REQUEST_STATS_CMDID)) { + if (wmi_unified_snr_request_cmd(wma_handle->wmi_handle)) { WMA_LOGE("Failed to send host stats request to fw"); - wmi_buf_free(buf); qdf_mem_free(pRssiBkUp); wma_handle->pGetRssiReq = NULL; return QDF_STATUS_E_FAILURE; @@ -210,10 +191,7 @@ QDF_STATUS wma_send_snr_request(tp_wma_handle wma_handle, */ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) { - wmi_buf_t buf; - wmi_request_stats_cmd_fixed_param *cmd; tAniGetSnrReq *psnr_req_bkp; - uint8_t len = sizeof(wmi_request_stats_cmd_fixed_param); tp_wma_handle wma_handle = NULL; struct wma_txrx_node *intr; @@ -241,26 +219,11 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) psnr_req_bkp->staId = psnr_req->staId; psnr_req_bkp->pDevContext = psnr_req->pDevContext; psnr_req_bkp->snrCallback = psnr_req->snrCallback; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - qdf_mem_free(psnr_req_bkp); - return QDF_STATUS_E_FAILURE; - } - - cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); - cmd->vdev_id = psnr_req->sessionId; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_request_stats_cmd_fixed_param)); - cmd->stats_id = WMI_REQUEST_VDEV_STAT; intr->psnr_req = (void *)psnr_req_bkp; - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_REQUEST_STATS_CMDID)) { + + if (wmi_unified_snr_cmd(wma_handle->wmi_handle, + psnr_req->sessionId)) { WMA_LOGE("Failed to send host stats request to fw"); - wmi_buf_free(buf); qdf_mem_free(psnr_req_bkp); intr->psnr_req = NULL; return QDF_STATUS_E_FAILURE; @@ -279,9 +242,7 @@ QDF_STATUS wma_get_snr(tAniGetSnrReq *psnr_req) void wma_process_link_status_req(tp_wma_handle wma, tAniGetLinkStatus *pGetLinkStatus) { - wmi_buf_t buf; - wmi_request_stats_cmd_fixed_param *cmd; - uint8_t len = sizeof(wmi_request_stats_cmd_fixed_param); + struct link_status_params cmd = {0}; struct wma_txrx_node *iface = &wma->interfaces[pGetLinkStatus->sessionId]; @@ -292,24 +253,10 @@ void wma_process_link_status_req(tp_wma_handle wma, return; } - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - goto end; - } - iface->plink_status_req = pGetLinkStatus; - cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_request_stats_cmd_fixed_param)); - cmd->stats_id = WMI_REQUEST_VDEV_RATE_STAT; - cmd->vdev_id = pGetLinkStatus->sessionId; - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_REQUEST_STATS_CMDID)) { + cmd.session_id = pGetLinkStatus->sessionId; + if (wmi_unified_link_status_req_cmd(wma->wmi_handle, &cmd)) { WMA_LOGE("Failed to send WMI link status request to fw"); - wmi_buf_free(buf); iface->plink_status_req = NULL; goto end; } @@ -335,10 +282,7 @@ QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBEnableStruct *ts_lphb_enable; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_hb_set_enable_cmd_fixed_param *hb_enable_fp; - int len = sizeof(wmi_hb_set_enable_cmd_fixed_param); + wmi_hb_set_enable_cmd_fixed_param hb_enable_fp; int i; if (lphb_conf_req == NULL) { @@ -358,30 +302,16 @@ QDF_STATUS wma_lphb_conf_hbenable(tp_wma_handle wma_handle, return QDF_STATUS_E_FAILURE; } - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - hb_enable_fp = (wmi_hb_set_enable_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&hb_enable_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_hb_set_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_hb_set_enable_cmd_fixed_param)); /* fill in values */ - hb_enable_fp->vdev_id = ts_lphb_enable->session; - hb_enable_fp->enable = ts_lphb_enable->enable; - hb_enable_fp->item = ts_lphb_enable->item; - hb_enable_fp->session = ts_lphb_enable->session; + hb_enable_fp.vdev_id = ts_lphb_enable->session; + hb_enable_fp.enable = ts_lphb_enable->enable; + hb_enable_fp.item = ts_lphb_enable->item; + hb_enable_fp.session = ts_lphb_enable->session; - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HB_SET_ENABLE_CMDID); + status = wmi_unified_lphb_config_hbenable_cmd(wma_handle->wmi_handle, + &hb_enable_fp); if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_ENABLE returned Error %d", - status); qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -427,10 +357,8 @@ QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpParamStruct *ts_lphb_tcp_param; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_hb_set_tcp_params_cmd_fixed_param *hb_tcp_params_fp; - int len = sizeof(wmi_hb_set_tcp_params_cmd_fixed_param); + wmi_hb_set_tcp_params_cmd_fixed_param hb_tcp_params_fp = {0}; + if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); @@ -448,37 +376,22 @@ QDF_STATUS wma_lphb_conf_tcp_params(tp_wma_handle wma_handle, MAC_ADDR_ARRAY(ts_lphb_tcp_param->gateway_mac.bytes), ts_lphb_tcp_param->timePeriodSec, ts_lphb_tcp_param->tcpSn); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - hb_tcp_params_fp = (wmi_hb_set_tcp_params_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&hb_tcp_params_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_hb_set_tcp_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_hb_set_tcp_params_cmd_fixed_param)); - /* fill in values */ - hb_tcp_params_fp->vdev_id = ts_lphb_tcp_param->session; - hb_tcp_params_fp->srv_ip = ts_lphb_tcp_param->srv_ip; - hb_tcp_params_fp->dev_ip = ts_lphb_tcp_param->dev_ip; - hb_tcp_params_fp->seq = ts_lphb_tcp_param->tcpSn; - hb_tcp_params_fp->src_port = ts_lphb_tcp_param->src_port; - hb_tcp_params_fp->dst_port = ts_lphb_tcp_param->dst_port; - hb_tcp_params_fp->interval = ts_lphb_tcp_param->timePeriodSec; - hb_tcp_params_fp->timeout = ts_lphb_tcp_param->timeout; - hb_tcp_params_fp->session = ts_lphb_tcp_param->session; + hb_tcp_params_fp.vdev_id = ts_lphb_tcp_param->session; + hb_tcp_params_fp.srv_ip = ts_lphb_tcp_param->srv_ip; + hb_tcp_params_fp.dev_ip = ts_lphb_tcp_param->dev_ip; + hb_tcp_params_fp.seq = ts_lphb_tcp_param->tcpSn; + hb_tcp_params_fp.src_port = ts_lphb_tcp_param->src_port; + hb_tcp_params_fp.dst_port = ts_lphb_tcp_param->dst_port; + hb_tcp_params_fp.interval = ts_lphb_tcp_param->timePeriodSec; + hb_tcp_params_fp.timeout = ts_lphb_tcp_param->timeout; + hb_tcp_params_fp.session = ts_lphb_tcp_param->session; WMI_CHAR_ARRAY_TO_MAC_ADDR(ts_lphb_tcp_param->gateway_mac.bytes, - &hb_tcp_params_fp->gateway_mac); + &hb_tcp_params_fp.gateway_mac); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HB_SET_TCP_PARAMS_CMDID); + status = wmi_unified_lphb_config_tcp_params_cmd(wma_handle->wmi_handle, + &hb_tcp_params_fp); if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PARAMS returned Error %d", - status); qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -501,10 +414,7 @@ QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBTcpFilterStruct *ts_lphb_tcp_filter; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_hb_set_tcp_pkt_filter_cmd_fixed_param *hb_tcp_filter_fp; - int len = sizeof(wmi_hb_set_tcp_pkt_filter_cmd_fixed_param); + wmi_hb_set_tcp_pkt_filter_cmd_fixed_param hb_tcp_filter_fp = {0}; if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); @@ -520,34 +430,18 @@ QDF_STATUS wma_lphb_conf_tcp_pkt_filter(tp_wma_handle wma_handle, ts_lphb_tcp_filter->filter[3], ts_lphb_tcp_filter->filter[4], ts_lphb_tcp_filter->filter[5]); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - hb_tcp_filter_fp = - (wmi_hb_set_tcp_pkt_filter_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&hb_tcp_filter_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_hb_set_tcp_pkt_filter_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_hb_set_tcp_pkt_filter_cmd_fixed_param)); - /* fill in values */ - hb_tcp_filter_fp->vdev_id = ts_lphb_tcp_filter->session; - hb_tcp_filter_fp->length = ts_lphb_tcp_filter->length; - hb_tcp_filter_fp->offset = ts_lphb_tcp_filter->offset; - hb_tcp_filter_fp->session = ts_lphb_tcp_filter->session; - memcpy((void *)&hb_tcp_filter_fp->filter, + hb_tcp_filter_fp.vdev_id = ts_lphb_tcp_filter->session; + hb_tcp_filter_fp.length = ts_lphb_tcp_filter->length; + hb_tcp_filter_fp.offset = ts_lphb_tcp_filter->offset; + hb_tcp_filter_fp.session = ts_lphb_tcp_filter->session; + memcpy((void *)&hb_tcp_filter_fp.filter, (void *)&ts_lphb_tcp_filter->filter, WMI_WLAN_HB_MAX_FILTER_SIZE); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HB_SET_TCP_PKT_FILTER_CMDID); + status = wmi_unified_lphb_config_tcp_pkt_filter_cmd(wma_handle->wmi_handle, + &hb_tcp_filter_fp); if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_TCP_PKT_FILTER returned Error %d", - status); qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -570,10 +464,8 @@ QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpParamStruct *ts_lphb_udp_param; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_hb_set_udp_params_cmd_fixed_param *hb_udp_params_fp; - int len = sizeof(wmi_hb_set_udp_params_cmd_fixed_param); + wmi_hb_set_udp_params_cmd_fixed_param hb_udp_params_fp = {0}; + if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); @@ -590,36 +482,22 @@ QDF_STATUS wma_lphb_conf_udp_params(tp_wma_handle wma_handle, ts_lphb_udp_param->session, MAC_ADDR_ARRAY(ts_lphb_udp_param->gateway_mac.bytes)); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - hb_udp_params_fp = (wmi_hb_set_udp_params_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&hb_udp_params_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_hb_set_udp_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_hb_set_udp_params_cmd_fixed_param)); /* fill in values */ - hb_udp_params_fp->vdev_id = ts_lphb_udp_param->session; - hb_udp_params_fp->srv_ip = ts_lphb_udp_param->srv_ip; - hb_udp_params_fp->dev_ip = ts_lphb_udp_param->dev_ip; - hb_udp_params_fp->src_port = ts_lphb_udp_param->src_port; - hb_udp_params_fp->dst_port = ts_lphb_udp_param->dst_port; - hb_udp_params_fp->interval = ts_lphb_udp_param->interval; - hb_udp_params_fp->timeout = ts_lphb_udp_param->timeout; - hb_udp_params_fp->session = ts_lphb_udp_param->session; + hb_udp_params_fp.vdev_id = ts_lphb_udp_param->session; + hb_udp_params_fp.srv_ip = ts_lphb_udp_param->srv_ip; + hb_udp_params_fp.dev_ip = ts_lphb_udp_param->dev_ip; + hb_udp_params_fp.src_port = ts_lphb_udp_param->src_port; + hb_udp_params_fp.dst_port = ts_lphb_udp_param->dst_port; + hb_udp_params_fp.interval = ts_lphb_udp_param->interval; + hb_udp_params_fp.timeout = ts_lphb_udp_param->timeout; + hb_udp_params_fp.session = ts_lphb_udp_param->session; WMI_CHAR_ARRAY_TO_MAC_ADDR(ts_lphb_udp_param->gateway_mac.bytes, - &hb_udp_params_fp->gateway_mac); + &hb_udp_params_fp.gateway_mac); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HB_SET_UDP_PARAMS_CMDID); + status = wmi_unified_lphb_config_udp_params_cmd(wma_handle->wmi_handle, + &hb_udp_params_fp); if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PARAMS returned Error %d", - status); qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -642,10 +520,7 @@ QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; int status = 0; tSirLPHBUdpFilterStruct *ts_lphb_udp_filter; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_hb_set_udp_pkt_filter_cmd_fixed_param *hb_udp_filter_fp; - int len = sizeof(wmi_hb_set_udp_pkt_filter_cmd_fixed_param); + wmi_hb_set_udp_pkt_filter_cmd_fixed_param hb_udp_filter_fp = {0}; if (lphb_conf_req == NULL) { WMA_LOGE("%s : LPHB configuration is NULL", __func__); @@ -661,34 +536,19 @@ QDF_STATUS wma_lphb_conf_udp_pkt_filter(tp_wma_handle wma_handle, ts_lphb_udp_filter->filter[3], ts_lphb_udp_filter->filter[4], ts_lphb_udp_filter->filter[5]); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - hb_udp_filter_fp = - (wmi_hb_set_udp_pkt_filter_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&hb_udp_filter_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_hb_set_udp_pkt_filter_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_hb_set_udp_pkt_filter_cmd_fixed_param)); /* fill in values */ - hb_udp_filter_fp->vdev_id = ts_lphb_udp_filter->session; - hb_udp_filter_fp->length = ts_lphb_udp_filter->length; - hb_udp_filter_fp->offset = ts_lphb_udp_filter->offset; - hb_udp_filter_fp->session = ts_lphb_udp_filter->session; - memcpy((void *)&hb_udp_filter_fp->filter, + hb_udp_filter_fp.vdev_id = ts_lphb_udp_filter->session; + hb_udp_filter_fp.length = ts_lphb_udp_filter->length; + hb_udp_filter_fp.offset = ts_lphb_udp_filter->offset; + hb_udp_filter_fp.session = ts_lphb_udp_filter->session; + memcpy((void *)&hb_udp_filter_fp.filter, (void *)&ts_lphb_udp_filter->filter, WMI_WLAN_HB_MAX_FILTER_SIZE); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HB_SET_UDP_PKT_FILTER_CMDID); + status = wmi_unified_lphb_config_udp_pkt_filter_cmd(wma_handle->wmi_handle, + &hb_udp_filter_fp); if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_HB_SET_UDP_PKT_FILTER returned Error %d", - status); qdf_status = QDF_STATUS_E_FAILURE; goto error; } @@ -765,10 +625,7 @@ QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, { uint8_t vdev_id; int status = 0; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_peer_set_param_cmd_fixed_param *peer_set_param_fp; - int len = sizeof(wmi_peer_set_param_cmd_fixed_param); + wmi_peer_set_param_cmd_fixed_param peer_set_param_fp = {0}; if (!ta_dhcp_ind) { WMA_LOGE("%s : DHCP indication is NULL", __func__); @@ -792,34 +649,19 @@ QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, ta_dhcp_ind->device_mode, MAC_ADDR_ARRAY(ta_dhcp_ind->peerMacAddr.bytes)); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - peer_set_param_fp = (wmi_peer_set_param_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&peer_set_param_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_set_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_set_param_cmd_fixed_param)); - /* fill in values */ - peer_set_param_fp->vdev_id = vdev_id; - peer_set_param_fp->param_id = WMI_PEER_CRIT_PROTO_HINT_ENABLED; + peer_set_param_fp.vdev_id = vdev_id; + peer_set_param_fp.param_id = WMI_PEER_CRIT_PROTO_HINT_ENABLED; if (WMA_DHCP_START_IND == ta_dhcp_ind->msgType) - peer_set_param_fp->param_value = 1; + peer_set_param_fp.param_value = 1; else - peer_set_param_fp->param_value = 0; + peer_set_param_fp.param_value = 0; WMI_CHAR_ARRAY_TO_MAC_ADDR(ta_dhcp_ind->peerMacAddr.bytes, - &peer_set_param_fp->peer_macaddr); + &peer_set_param_fp.peer_macaddr); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_PEER_SET_PARAM_CMDID); + status = wmi_unified_process_dhcp_ind(wma_handle->wmi_handle, + &peer_set_param_fp); if (status != EOK) { - WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" - " returned Error %d", __func__, status); return QDF_STATUS_E_FAILURE; } @@ -927,10 +769,7 @@ WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_peer_get_estimated_linkspeed_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; + wmi_mac_addr peer_macaddr; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue get link speed cmd", @@ -944,36 +783,22 @@ QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed) wma_send_link_speed(0); return QDF_STATUS_E_FAILURE; } - len = sizeof(wmi_peer_get_estimated_linkspeed_cmd_fixed_param); - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - - cmd = (wmi_peer_get_estimated_linkspeed_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_get_estimated_linkspeed_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_get_estimated_linkspeed_cmd_fixed_param)); /* Copy the peer macaddress to the wma buffer */ WMI_CHAR_ARRAY_TO_MAC_ADDR(pLinkSpeed->peer_macaddr.bytes, - &cmd->peer_macaddr); + &peer_macaddr); WMA_LOGD("%s: pLinkSpeed->peerMacAddr: %pM, " "peer_macaddr.mac_addr31to0: 0x%x, peer_macaddr.mac_addr47to32: 0x%x", __func__, pLinkSpeed->peer_macaddr.bytes, - cmd->peer_macaddr.mac_addr31to0, - cmd->peer_macaddr.mac_addr47to32); + peer_macaddr.mac_addr31to0, + peer_macaddr.mac_addr47to32); - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID)) { - WMA_LOGE("%s: failed to send link speed command", __func__); - qdf_nbuf_free(wmi_buf); + if (wmi_unified_get_link_speed_cmd(wma_handle->wmi_handle, + peer_macaddr)) { return QDF_STATUS_E_FAILURE; } + return QDF_STATUS_SUCCESS; } @@ -1026,32 +851,18 @@ QDF_STATUS wma_send_egap_conf_params(WMA_HANDLE handle, struct egap_conf_params *egap_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_ap_ps_egap_param_cmd_fixed_param *cmd; - wmi_buf_t buf; + wmi_ap_ps_egap_param_cmd_fixed_param cmd = {0}; int32_t err; - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send ap_ps_egap cmd"); - return QDF_STATUS_E_NOMEM; - } - cmd = (wmi_ap_ps_egap_param_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ap_ps_egap_param_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_ap_ps_egap_param_cmd_fixed_param)); - - cmd->enable = egap_params->enable; - cmd->inactivity_time = egap_params->inactivity_time; - cmd->wait_time = egap_params->wait_time; - cmd->flags = egap_params->flags; - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), WMI_AP_PS_EGAP_PARAM_CMDID); + cmd.enable = egap_params->enable; + cmd.inactivity_time = egap_params->inactivity_time; + cmd.wait_time = egap_params->wait_time; + cmd.flags = egap_params->flags; + err = wmi_unified_egap_conf_params_cmd(wma_handle->wmi_handle, &cmd); if (err) { - WMA_LOGE("Failed to send ap_ps_egap cmd"); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } + return QDF_STATUS_SUCCESS; } @@ -1101,7 +912,7 @@ void wma_register_egap_event_handle(WMA_HANDLE handle) #endif /* FEATURE_GREEN_AP */ /** - * wmi_unified_fw_profiling_cmd() - send FW profiling cmd to WLAN FW + * wma_unified_fw_profiling_cmd() - send FW profiling cmd to WLAN FW * @wma: wma handle * @cmd: Profiling command index * @value1: parameter1 value @@ -1109,126 +920,20 @@ void wma_register_egap_event_handle(WMA_HANDLE handle) * * Return: 0 for success else error code */ -int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, +QDF_STATUS wma_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, uint32_t cmd, uint32_t value1, uint32_t value2) { - wmi_buf_t buf; - int32_t len = 0; int ret; - wmi_wlan_profile_trigger_cmd_fixed_param *prof_trig_cmd; - wmi_wlan_profile_set_hist_intvl_cmd_fixed_param *hist_intvl_cmd; - wmi_wlan_profile_enable_profile_id_cmd_fixed_param *profile_enable_cmd; - wmi_wlan_profile_get_prof_data_cmd_fixed_param *profile_getdata_cmd; - - switch (cmd) { - case WMI_WLAN_PROFILE_TRIGGER_CMDID: - len = sizeof(wmi_wlan_profile_trigger_cmd_fixed_param); - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc Failed", __func__); - return -ENOMEM; - } - prof_trig_cmd = - (wmi_wlan_profile_trigger_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&prof_trig_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wlan_profile_trigger_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wlan_profile_trigger_cmd_fixed_param)); - prof_trig_cmd->enable = value1; - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_WLAN_PROFILE_TRIGGER_CMDID); - if (ret) { - WMA_LOGE("PROFILE_TRIGGER cmd Failed with value %d", - value1); - qdf_nbuf_free(buf); - return ret; - } - break; - - case WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID: - len = sizeof(wmi_wlan_profile_get_prof_data_cmd_fixed_param); - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc Failed", __func__); - return -ENOMEM; - } - profile_getdata_cmd = - (wmi_wlan_profile_get_prof_data_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&profile_getdata_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wlan_profile_get_prof_data_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wlan_profile_get_prof_data_cmd_fixed_param)); - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID); - if (ret) { - WMA_LOGE("PROFILE_DATA cmd Failed for id %d value %d", - value1, value2); - qdf_nbuf_free(buf); - return ret; - } - break; - - case WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID: - len = sizeof(wmi_wlan_profile_set_hist_intvl_cmd_fixed_param); - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc Failed", __func__); - return -ENOMEM; - } - hist_intvl_cmd = - (wmi_wlan_profile_set_hist_intvl_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&hist_intvl_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wlan_profile_set_hist_intvl_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wlan_profile_set_hist_intvl_cmd_fixed_param)); - hist_intvl_cmd->profile_id = value1; - hist_intvl_cmd->value = value2; - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID); - if (ret) { - WMA_LOGE("HIST_INTVL cmd Failed for id %d value %d", - value1, value2); - qdf_nbuf_free(buf); - return ret; - } - break; - - case WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID: - len = - sizeof(wmi_wlan_profile_enable_profile_id_cmd_fixed_param); - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc Failed", __func__); - return -ENOMEM; - } - profile_enable_cmd = - (wmi_wlan_profile_enable_profile_id_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&profile_enable_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wlan_profile_enable_profile_id_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wlan_profile_enable_profile_id_cmd_fixed_param)); - profile_enable_cmd->profile_id = value1; - profile_enable_cmd->enable = value2; - ret = wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID); - if (ret) { - WMA_LOGE("enable cmd Failed for id %d value %d", - value1, value2); - qdf_nbuf_free(buf); - return ret; - } - break; - default: - WMA_LOGD("%s: invalid profiling command", __func__); - break; + ret = wmi_unified_fw_profiling_data_cmd(wmi_handle, cmd, + value1, value2); + if (ret) { + WMA_LOGE("enable cmd Failed for id %d value %d", + value1, value2); + return ret; } - return 0; + return QDF_STATUS_SUCCESS; } #ifdef FEATURE_WLAN_LPHB @@ -1292,79 +997,21 @@ static int wma_lphb_handler(tp_wma_handle wma, uint8_t *event) static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) { - WMI_WOW_ADD_PATTERN_CMD_fixed_param *cmd; struct wma_txrx_node *iface; - wmi_buf_t buf; - uint8_t *buf_ptr; - int32_t len; int ret; + uint8_t default_pattern; iface = &wma->interfaces[vdev_id]; - len = sizeof(WMI_WOW_ADD_PATTERN_CMD_fixed_param) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_BITMAP_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_IPV4_SYNC_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_IPV6_SYNC_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_MAGIC_PATTERN_CMD) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(A_UINT32) + WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_WOW_ADD_PATTERN_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_WOW_ADD_PATTERN_CMD_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->pattern_id = iface->num_wow_default_patterns++, - cmd->pattern_type = WOW_IPV6_RA_PATTERN; - buf_ptr += sizeof(WMI_WOW_ADD_PATTERN_CMD_fixed_param); - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_BITMAP_PATTERN_T but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_IPV4_SYNC_PATTERN_T but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_IPV6_SYNC_PATTERN_T but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_MAGIC_PATTERN_CMD but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for pattern_info_timeout but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for ra_ratelimit_interval. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, sizeof(A_UINT32)); - buf_ptr += WMI_TLV_HDR_SIZE; - - *((A_UINT32 *) buf_ptr) = wma->RArateLimitInterval; + default_pattern = iface->num_wow_default_patterns++; WMA_LOGD("%s: send RA rate limit [%d] to fw vdev = %d", __func__, wma->RArateLimitInterval, vdev_id); - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_ADD_WAKE_PATTERN_CMDID); + ret = wmi_unified_wow_sta_ra_filter_cmd(wma->wmi_handle, vdev_id, + default_pattern, wma->RArateLimitInterval); if (ret) { WMA_LOGE("%s: Failed to send RA rate limit to fw", __func__); - wmi_buf_free(buf); iface->num_wow_default_patterns--; return QDF_STATUS_E_FAILURE; } @@ -1383,32 +1030,11 @@ static QDF_STATUS wma_wow_sta_ra_filter(tp_wma_handle wma, uint8_t vdev_id) */ int wmi_unified_nat_keepalive_enable(tp_wma_handle wma, uint8_t vdev_id) { - WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - WMA_LOGD("%s: vdev_id %d", __func__, vdev_id); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMD_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->action = IPSEC_NATKEEPALIVE_FILTER_ENABLE; - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID)) { - WMA_LOGP("%s: Failed to send NAT keepalive enable command", - __func__); - wmi_buf_free(buf); - return -EIO; - } - return 0; + if (wmi_unified_nat_keepalive_en_cmd(wma->wmi_handle, vdev_id)) + return QDF_STATUS_E_FAILURE; + + return QDF_STATUS_SUCCESS; } /** @@ -1420,30 +1046,13 @@ int wmi_unified_nat_keepalive_enable(tp_wma_handle wma, uint8_t vdev_id) */ int wma_unified_csa_offload_enable(tp_wma_handle wma, uint8_t vdev_id) { - wmi_csa_offload_enable_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - WMA_LOGD("%s: vdev_id %d", __func__, vdev_id); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - cmd = (wmi_csa_offload_enable_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_csa_offload_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_csa_offload_enable_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->csa_offload_enable = WMI_CSA_OFFLOAD_ENABLE; - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_CSA_OFFLOAD_ENABLE_CMDID)) { + if (wmi_unified_csa_offload_enable(wma->wmi_handle, + vdev_id)) { WMA_LOGP("%s: Failed to send CSA offload enable command", __func__); - wmi_buf_free(buf); return -EIO; } + return 0; } @@ -1859,8 +1468,6 @@ int wma_oem_data_response_handler(void *handle, void wma_start_oem_data_req(tp_wma_handle wma_handle, tStartOemDataReq *startOemDataReq) { - wmi_buf_t buf; - uint8_t *cmd; int ret = 0; tStartOemDataRsp *pStartOemDataRsp; @@ -1876,30 +1483,12 @@ void wma_start_oem_data_req(tp_wma_handle wma_handle, return; } - buf = wmi_buf_alloc(wma_handle->wmi_handle, - (startOemDataReq->data_len + WMI_TLV_HDR_SIZE)); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - goto out; - } - - cmd = (uint8_t *) wmi_buf_data(buf); - - WMITLV_SET_HDR(cmd, WMITLV_TAG_ARRAY_BYTE, startOemDataReq->data_len); - cmd += WMI_TLV_HDR_SIZE; - qdf_mem_copy(cmd, startOemDataReq->data, - startOemDataReq->data_len); - - WMA_LOGI(FL("Sending OEM Data Request to target, data len %d"), - startOemDataReq->data_len); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - (startOemDataReq->data_len + - WMI_TLV_HDR_SIZE), WMI_OEM_REQ_CMDID); + ret = wmi_unified_start_oem_data_cmd(wma_handle->wmi_handle, + startOemDataReq->data_len, + startOemDataReq->data); if (ret != EOK) { WMA_LOGE(FL(":wmi cmd send failed")); - qdf_nbuf_free(buf); } out: @@ -2371,10 +1960,6 @@ void wma_register_dfs_event_handler(tp_wma_handle wma_handle) int wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle) { - wmi_dfs_phyerr_filter_ena_cmd_fixed_param *enable_phyerr_offload_cmd; - wmi_dfs_phyerr_filter_dis_cmd_fixed_param *disable_phyerr_offload_cmd; - wmi_buf_t buf; - uint16_t len; int ret; if (NULL == wma_handle) { @@ -2382,78 +1967,13 @@ wma_unified_dfs_phyerr_filter_offload_enable(tp_wma_handle wma_handle) return 0; } - if (false == wma_handle->dfs_phyerr_filter_offload) { - WMA_LOGD("%s:Phyerror Filtering offload is Disabled in ini", - __func__); - len = sizeof(*disable_phyerr_offload_cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return 0; - } - disable_phyerr_offload_cmd = - (wmi_dfs_phyerr_filter_dis_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&disable_phyerr_offload_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_dfs_phyerr_filter_dis_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_dfs_phyerr_filter_dis_cmd_fixed_param)); - - /* - * Send WMI_DFS_PHYERR_FILTER_DIS_CMDID - * to the firmware to disable the phyerror - * filtering offload. - */ - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DFS_PHYERR_FILTER_DIS_CMDID); - if (ret < 0) { - WMA_LOGE("%s: Failed to send WMI_DFS_PHYERR_FILTER_DIS_CMDID ret=%d", - __func__, ret); - wmi_buf_free(buf); - return 0; - } - WMA_LOGD("%s: WMI_DFS_PHYERR_FILTER_DIS_CMDID Send Success", - __func__); - } else { - WMA_LOGD("%s:Phyerror Filtering offload is Enabled in ini", - __func__); - - len = sizeof(*enable_phyerr_offload_cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return 0; - } - - enable_phyerr_offload_cmd = - (wmi_dfs_phyerr_filter_ena_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&enable_phyerr_offload_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_dfs_phyerr_filter_ena_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_dfs_phyerr_filter_ena_cmd_fixed_param)); - - /* - * Send a WMI_DFS_PHYERR_FILTER_ENA_CMDID - * to the firmware to enable the phyerror - * filtering offload. - */ - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DFS_PHYERR_FILTER_ENA_CMDID); + ret = wmi_unified_dfs_phyerr_filter_offload_en_cmd(wma_handle->wmi_handle, + wma_handle->dfs_phyerr_filter_offload); + if (ret) + return QDF_STATUS_E_FAILURE; - if (ret < 0) { - WMA_LOGE("%s: Failed to send WMI_DFS_PHYERR_FILTER_ENA_CMDID ret=%d", - __func__, ret); - wmi_buf_free(buf); - return 0; - } - WMA_LOGD("%s: WMI_DFS_PHYERR_FILTER_ENA_CMDID Send Success", - __func__); - } - return 1; + return QDF_STATUS_SUCCESS; } #if !defined(REMOVE_PKT_LOG) @@ -2468,12 +1988,7 @@ QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, struct ath_pktlog_wmi_params *params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - WMI_PKTLOG_EVENT PKTLOG_EVENT; - WMI_CMD_ID CMD_ID; - wmi_pdev_pktlog_enable_cmd_fixed_param *cmd; - wmi_pdev_pktlog_disable_cmd_fixed_param *disable_cmd; - int len = 0; - wmi_buf_t buf; + int ret; /*Check if packet log is enabled in cfg.ini */ if (!cds_is_packet_log_enabled()) { @@ -2481,60 +1996,14 @@ QDF_STATUS wma_pktlog_wmi_send_cmd(WMA_HANDLE handle, return QDF_STATUS_E_FAILURE; } - PKTLOG_EVENT = params->pktlog_event; - CMD_ID = params->cmd_id; + ret = wmi_unified_pktlog_wmi_send_cmd(wma_handle->wmi_handle, + params->pktlog_event, + params->cmd_id); + if (ret) + return QDF_STATUS_E_FAILURE; - switch (CMD_ID) { - case WMI_PDEV_PKTLOG_ENABLE_CMDID: - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - cmd = (wmi_pdev_pktlog_enable_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_pktlog_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_pktlog_enable_cmd_fixed_param)); - cmd->evlist = PKTLOG_EVENT; - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_PDEV_PKTLOG_ENABLE_CMDID)) { - WMA_LOGE("failed to send pktlog enable cmdid"); - goto wmi_send_failed; - } - break; - case WMI_PDEV_PKTLOG_DISABLE_CMDID: - len = sizeof(*disable_cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - disable_cmd = (wmi_pdev_pktlog_disable_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&disable_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_pktlog_disable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_pktlog_disable_cmd_fixed_param)); - disable_cmd->pdev_id = 0; - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_PDEV_PKTLOG_DISABLE_CMDID)) { - WMA_LOGE("failed to send pktlog disable cmdid"); - goto wmi_send_failed; - } - break; - default: - WMA_LOGD("%s: invalid PKTLOG command", __func__); - break; - } return QDF_STATUS_SUCCESS; - -wmi_send_failed: - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; } #endif /* REMOVE_PKT_LOG */ @@ -3085,37 +2554,15 @@ static QDF_STATUS wma_add_wow_wakeup_event(tp_wma_handle wma, uint32_t bitmap, bool enable) { - WMI_WOW_ADD_DEL_EVT_CMD_fixed_param *cmd; - uint16_t len; - wmi_buf_t buf; int ret; - len = sizeof(WMI_WOW_ADD_DEL_EVT_CMD_fixed_param); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - cmd = (WMI_WOW_ADD_DEL_EVT_CMD_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_WOW_ADD_DEL_EVT_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_WOW_ADD_DEL_EVT_CMD_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->is_add = enable; - cmd->event_bitmap = bitmap; - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID); + ret = wmi_unified_add_wow_wakeup_event_cmd(wma->wmi_handle, vdev_id, + enable, bitmap); if (ret) { WMA_LOGE("Failed to config wow wakeup event"); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } - WMA_LOGD("Wakeup pattern 0x%x %s in fw", bitmap, - enable ? "enabled" : "disabled"); - return QDF_STATUS_SUCCESS; } @@ -3139,118 +2586,17 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma, uint8_t ptrn_offset, const uint8_t *mask, uint8_t mask_len, bool user) { - WMI_WOW_ADD_PATTERN_CMD_fixed_param *cmd; - WOW_BITMAP_PATTERN_T *bitmap_pattern; struct wma_txrx_node *iface; - wmi_buf_t buf; - uint8_t *buf_ptr; - int32_t len; int ret; + uint8_t default_patterns; iface = &wma->interfaces[vdev_id]; - - len = sizeof(WMI_WOW_ADD_PATTERN_CMD_fixed_param) + - WMI_TLV_HDR_SIZE + - 1 * sizeof(WOW_BITMAP_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_IPV4_SYNC_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_IPV6_SYNC_PATTERN_T) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(WOW_MAGIC_PATTERN_CMD) + - WMI_TLV_HDR_SIZE + - 0 * sizeof(A_UINT32) + WMI_TLV_HDR_SIZE + 1 * sizeof(A_UINT32); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (WMI_WOW_ADD_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_WOW_ADD_PATTERN_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_WOW_ADD_PATTERN_CMD_fixed_param)); - cmd->vdev_id = vdev_id; - /* - * For user configured wow pattern use pattern id sent by HDD - * and for default wow patterns generate pattern id internally - */ - if (user) - cmd->pattern_id = ptrn_id; - else - cmd->pattern_id = iface->num_wow_default_patterns++; - - cmd->pattern_type = WOW_BITMAP_PATTERN; - buf_ptr += sizeof(WMI_WOW_ADD_PATTERN_CMD_fixed_param); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(WOW_BITMAP_PATTERN_T)); - buf_ptr += WMI_TLV_HDR_SIZE; - bitmap_pattern = (WOW_BITMAP_PATTERN_T *) buf_ptr; - - WMITLV_SET_HDR(&bitmap_pattern->tlv_header, - WMITLV_TAG_STRUC_WOW_BITMAP_PATTERN_T, - WMITLV_GET_STRUCT_TLVLEN(WOW_BITMAP_PATTERN_T)); - - qdf_mem_copy(&bitmap_pattern->patternbuf[0], ptrn, ptrn_len); - qdf_mem_copy(&bitmap_pattern->bitmaskbuf[0], mask, mask_len); - - bitmap_pattern->pattern_offset = ptrn_offset; - bitmap_pattern->pattern_len = ptrn_len; - - if (bitmap_pattern->pattern_len > WOW_DEFAULT_BITMAP_PATTERN_SIZE) - bitmap_pattern->pattern_len = WOW_DEFAULT_BITMAP_PATTERN_SIZE; - - if (bitmap_pattern->pattern_len > WOW_DEFAULT_BITMASK_SIZE) - bitmap_pattern->pattern_len = WOW_DEFAULT_BITMASK_SIZE; - - bitmap_pattern->bitmask_len = bitmap_pattern->pattern_len; - bitmap_pattern->pattern_id = ptrn_id; - - WMA_LOGI("vdev id : %d, ptrn id: %d, ptrn len: %d, ptrn offset: %d user %d", - cmd->vdev_id, cmd->pattern_id, bitmap_pattern->pattern_len, - bitmap_pattern->pattern_offset, user); - - WMA_LOGI("Pattern : "); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, - &bitmap_pattern->patternbuf[0], bitmap_pattern->pattern_len); - - WMA_LOGI("Mask : "); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, - &bitmap_pattern->bitmaskbuf[0], bitmap_pattern->pattern_len); - - buf_ptr += sizeof(WOW_BITMAP_PATTERN_T); - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_IPV4_SYNC_PATTERN_T but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_IPV6_SYNC_PATTERN_T but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for WMITLV_TAG_STRUC_WOW_MAGIC_PATTERN_CMD but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for pattern_info_timeout but no data. */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - /* Fill TLV for ra_ratelimit_interval with dummy data as this fix elem */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 1 * sizeof(A_UINT32)); - buf_ptr += WMI_TLV_HDR_SIZE; - *(A_UINT32 *) buf_ptr = 0; - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_ADD_WAKE_PATTERN_CMDID); + default_patterns = iface->num_wow_default_patterns++; + ret = wmi_unified_wow_patterns_to_fw_cmd(wma->wmi_handle, + vdev_id, ptrn_id, ptrn, + ptrn_len, ptrn_offset, mask, + mask_len, user, default_patterns); if (ret) { - WMA_LOGE("%s: Failed to send wow ptrn to fw", __func__); - wmi_buf_free(buf); if (!user) iface->num_wow_default_patterns--; return QDF_STATUS_E_FAILURE; @@ -3652,40 +2998,14 @@ QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) static QDF_STATUS wma_wow_delete_pattern(tp_wma_handle wma, uint8_t ptrn_id, uint8_t vdev_id, bool user) { - WMI_WOW_DEL_PATTERN_CMD_fixed_param *cmd; + struct wma_txrx_node *iface; - wmi_buf_t buf; - int32_t len; int ret; - len = sizeof(WMI_WOW_DEL_PATTERN_CMD_fixed_param); - iface = &wma->interfaces[vdev_id]; - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (WMI_WOW_DEL_PATTERN_CMD_fixed_param *) wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_WOW_DEL_PATTERN_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - WMI_WOW_DEL_PATTERN_CMD_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->pattern_id = ptrn_id; - cmd->pattern_type = WOW_BITMAP_PATTERN; - - WMA_LOGI("Deleting pattern id: %d vdev id %d in fw", - cmd->pattern_id, vdev_id); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_DEL_WAKE_PATTERN_CMDID); + ret = wmi_unified_wow_delete_pattern_cmd(wma->wmi_handle, ptrn_id, + vdev_id); if (ret) { - WMA_LOGE("%s: Failed to delete wow ptrn from fw", __func__); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -4192,10 +3512,7 @@ QDF_STATUS wma_suspend_req(tp_wma_handle wma, enum qdf_suspend_type type) */ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) { - wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *cmd; - wmi_buf_t buf; QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - int32_t len; int ret; #ifdef CONFIG_CNSS tpAniSirGlobal pMac = cds_get_context(QDF_MODULE_ID_PE); @@ -4205,28 +3522,10 @@ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma) } #endif /* CONFIG_CNSS */ - len = sizeof(wmi_wow_hostwakeup_from_sleep_cmd_fixed_param); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_wow_hostwakeup_from_sleep_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_wow_hostwakeup_from_sleep_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_wow_hostwakeup_from_sleep_cmd_fixed_param)); - qdf_event_reset(&wma->wma_resume_event); - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID); + ret = wmi_unified_host_wakeup_ind_to_fw_cmd(wma->wmi_handle); if (ret) { - WMA_LOGE("Failed to send host wakeup indication to fw"); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -4377,36 +3676,17 @@ bool wma_is_wow_mode_selected(WMA_HANDLE handle) */ void wma_del_ts_req(tp_wma_handle wma, tDelTsParams *msg) { - wmi_vdev_wmm_delts_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - goto err; - } - cmd = (wmi_vdev_wmm_delts_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_wmm_delts_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_wmm_delts_cmd_fixed_param)); - cmd->vdev_id = msg->sessionId; - cmd->ac = TID_TO_WME_AC(msg->userPrio); - - WMA_LOGD("Delts vdev:%d, ac:%d, %s:%d", - cmd->vdev_id, cmd->ac, __FUNCTION__, __LINE__); - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_WMM_DELTS_CMDID)) { + if (wmi_unified_del_ts_cmd(wma->wmi_handle, + msg->sessionId, + TID_TO_WME_AC(msg->userPrio))) { WMA_LOGP("%s: Failed to send vdev DELTS command", __func__); - qdf_nbuf_free(buf); } + #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (msg->setRICparams == true) wma_set_ric_req(wma, msg, false); #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ -err: qdf_mem_free(msg); } @@ -4424,56 +3704,8 @@ err: void wma_aggr_qos_req(tp_wma_handle wma, tAggrAddTsParams *pAggrQosRspMsg) { - int i = 0; - wmi_vdev_wmm_addts_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); - - for (i = 0; i < HAL_QOS_NUM_AC_MAX; i++) { - /* if flow in this AC is active */ - if (((1 << i) & pAggrQosRspMsg->tspecIdx)) { - /* - * as per implementation of wma_add_ts_req() we - * are not waiting any response from firmware so - * apart from sending ADDTS to firmware just send - * success to upper layers - */ - pAggrQosRspMsg->status[i] = QDF_STATUS_SUCCESS; - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - goto aggr_qos_exit; - } - cmd = (wmi_vdev_wmm_addts_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_wmm_addts_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_wmm_addts_cmd_fixed_param)); - cmd->vdev_id = pAggrQosRspMsg->sessionId; - cmd->ac = - TID_TO_WME_AC(pAggrQosRspMsg->tspec[i].tsinfo. - traffic.userPrio); - cmd->medium_time_us = - pAggrQosRspMsg->tspec[i].mediumTime * 32; - cmd->downgrade_type = WMM_AC_DOWNGRADE_DEPRIO; - WMA_LOGD("%s:%d: Addts vdev:%d, ac:%d, mediumTime:%d downgrade_type:%d", - __func__, __LINE__, cmd->vdev_id, cmd->ac, - cmd->medium_time_us, cmd->downgrade_type); - if (wmi_unified_cmd_send - (wma->wmi_handle, buf, len, - WMI_VDEV_WMM_ADDTS_CMDID)) { - WMA_LOGP("%s: Failed to send vdev ADDTS command", - __func__); - pAggrQosRspMsg->status[i] = - QDF_STATUS_E_FAILURE; - qdf_nbuf_free(buf); - } - } - } - -aggr_qos_exit: + wmi_unified_aggr_qos_cmd(wma->wmi_handle, + (struct aggr_add_ts_param *)pAggrQosRspMsg); /* send reponse to upper layers from here only. */ wma_send_msg(wma, WMA_AGGR_QOS_RSP, pAggrQosRspMsg, 0); } @@ -4487,9 +3719,7 @@ aggr_qos_exit: */ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) { - wmi_vdev_wmm_addts_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len = sizeof(*cmd); + struct add_ts_param cmd = {0}; #ifdef FEATURE_WLAN_ESE /* @@ -4510,29 +3740,14 @@ void wma_add_ts_req(tp_wma_handle wma, tAddTsParams *msg) #endif /* FEATURE_WLAN_ESE */ msg->status = QDF_STATUS_SUCCESS; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - goto err; - } - cmd = (wmi_vdev_wmm_addts_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_wmm_addts_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_wmm_addts_cmd_fixed_param)); - cmd->vdev_id = msg->sme_session_id; - cmd->ac = TID_TO_WME_AC(msg->tspec.tsinfo.traffic.userPrio); - cmd->medium_time_us = msg->tspec.mediumTime * 32; - cmd->downgrade_type = WMM_AC_DOWNGRADE_DROP; - WMA_LOGD("Addts vdev:%d, ac:%d, mediumTime:%d, downgrade_type:%d %s:%d", - cmd->vdev_id, cmd->ac, cmd->medium_time_us, - cmd->downgrade_type, __func__, __LINE__); - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_WMM_ADDTS_CMDID)) { - WMA_LOGP("%s: Failed to send vdev ADDTS command", __func__); + + cmd.sme_session_id = msg->sme_session_id; + cmd.tspec.tsinfo.traffic.userPrio = + TID_TO_WME_AC(msg->tspec.tsinfo.traffic.userPrio); + cmd.tspec.mediumTime = msg->tspec.mediumTime; + if (wmi_unified_add_ts_cmd(wma->wmi_handle, &cmd)) msg->status = QDF_STATUS_E_FAILURE; - qdf_nbuf_free(buf); - } + #ifdef WLAN_FEATURE_ROAM_OFFLOAD if (msg->setRICparams == true) wma_set_ric_req(wma, msg, true); @@ -4553,36 +3768,10 @@ err: static int wma_enable_disable_packet_filter(tp_wma_handle wma, uint8_t vdev_id, bool enable) { - int32_t len; - int ret = 0; - wmi_buf_t buf; - WMI_PACKET_FILTER_ENABLE_CMD_fixed_param *cmd; - - len = sizeof(WMI_PACKET_FILTER_ENABLE_CMD_fixed_param); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return -ENOMEM; - } - - cmd = (WMI_PACKET_FILTER_ENABLE_CMD_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_packet_filter_enable_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - WMI_PACKET_FILTER_ENABLE_CMD_fixed_param)); - - cmd->vdev_id = vdev_id; - if (enable) - cmd->enable = PACKET_FILTER_SET_ENABLE; - else - cmd->enable = PACKET_FILTER_SET_DISABLE; - - WMA_LOGE("%s: Packet filter enable %d for vdev_id %d", - __func__, cmd->enable, vdev_id); + int ret; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PACKET_FILTER_ENABLE_CMDID); + ret = wmi_unified_enable_disable_packet_filter_cmd(wma->wmi_handle, + vdev_id, enable); if (ret) WMA_LOGE("Failed to send packet filter wmi cmd to fw"); @@ -4603,66 +3792,14 @@ static int wma_config_packet_filter(tp_wma_handle wma, uint8_t vdev_id, tSirRcvPktFilterCfgType *rcv_filter_param, uint8_t filter_id, bool enable) { - int len, i; - int err = 0; - wmi_buf_t buf; - WMI_PACKET_FILTER_CONFIG_CMD_fixed_param *cmd; - - - /* allocate the memory */ - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set_param cmd"); - return -ENOMEM; - } - - cmd = (WMI_PACKET_FILTER_CONFIG_CMD_fixed_param *)wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_packet_filter_config_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_PACKET_FILTER_CONFIG_CMD_fixed_param)); - - cmd->vdev_id = vdev_id; - cmd->filter_id = filter_id; - if (enable) - cmd->filter_action = PACKET_FILTER_SET_ACTIVE; - else - cmd->filter_action = PACKET_FILTER_SET_INACTIVE; - - if (enable) { - cmd->num_params = QDF_MIN( - WMI_PACKET_FILTER_MAX_CMP_PER_PACKET_FILTER, - rcv_filter_param->numFieldParams); - cmd->filter_type = rcv_filter_param->filterType; - cmd->coalesce_time = rcv_filter_param->coalesceTime; - - for (i = 0; i < cmd->num_params; i++) { - cmd->paramsData[i].proto_type = - rcv_filter_param->paramsData[i].protocolLayer; - cmd->paramsData[i].cmp_type = - rcv_filter_param->paramsData[i].cmpFlag; - cmd->paramsData[i].data_length = - rcv_filter_param->paramsData[i].dataLength; - cmd->paramsData[i].data_offset = - rcv_filter_param->paramsData[i].dataOffset; - memcpy(&cmd->paramsData[i].compareData, - rcv_filter_param->paramsData[i].compareData, - sizeof(cmd->paramsData[i].compareData)); - memcpy(&cmd->paramsData[i].dataMask, - rcv_filter_param->paramsData[i].dataMask, - sizeof(cmd->paramsData[i].dataMask)); - } - } + int err; - WMA_LOGE("Packet filter action %d filter with id: %d, num_params=%d", - cmd->filter_action, cmd->filter_id, cmd->num_params); /* send the command along with data */ - err = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PACKET_FILTER_CONFIG_CMDID); + err = wmi_unified_config_packet_filter_cmd(wma->wmi_handle, + vdev_id, (struct rcv_pkt_filter_config *)rcv_filter_param, + filter_id, enable); if (err) { WMA_LOGE("Failed to send pkt_filter cmd"); - wmi_buf_free(buf); return -EIO; } @@ -5172,7 +4309,7 @@ out: * wma_enable_arp_ns_offload() - enable ARP NS offload * @wma: wma handle * @tpSirHostOffloadReq: offload request - * @bArpOnly: flag + * @arp_only: flag * * To configure ARP NS off load data to firmware * when target goes to wow mode. @@ -5181,18 +4318,10 @@ out: */ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq - pHostOffloadParams, bool bArpOnly) + pHostOffloadParams, bool arp_only) { - int32_t i; int32_t res; - WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param *cmd; - WMI_NS_OFFLOAD_TUPLE *ns_tuple; - WMI_ARP_OFFLOAD_TUPLE *arp_tuple; - A_UINT8 *buf_ptr; - wmi_buf_t buf; - int32_t len; uint8_t vdev_id; - uint32_t count = 0, num_ns_ext_tuples = 0; /* Get the vdev id */ if (!wma_find_vdev_by_bssid(wma, pHostOffloadParams->bssid.bytes, @@ -5209,174 +4338,13 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, return QDF_STATUS_E_FAILURE; } - if (!bArpOnly) - count = pHostOffloadParams->num_ns_offload_count; - - len = sizeof(WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param) + WMI_TLV_HDR_SIZE + /* TLV place holder size for array of NS tuples */ - WMI_MAX_NS_OFFLOADS * sizeof(WMI_NS_OFFLOAD_TUPLE) + WMI_TLV_HDR_SIZE + /* TLV place holder size for array of ARP tuples */ - WMI_MAX_ARP_OFFLOADS * sizeof(WMI_ARP_OFFLOAD_TUPLE); - - /* - * If there are more than WMI_MAX_NS_OFFLOADS addresses then allocate - * extra length for extended NS offload tuples which follows ARP offload - * tuples. Host needs to fill this structure in following format: - * 2 NS ofload tuples - * 2 ARP offload tuples - * N numbers of extended NS offload tuples if HDD has given more than - * 2 NS offload addresses - */ - if (!bArpOnly && count > WMI_MAX_NS_OFFLOADS) { - num_ns_ext_tuples = count - WMI_MAX_NS_OFFLOADS; - len += WMI_TLV_HDR_SIZE + num_ns_ext_tuples * - sizeof(WMI_NS_OFFLOAD_TUPLE); - } - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - qdf_mem_free(pHostOffloadParams); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (A_UINT8 *) wmi_buf_data(buf); - cmd = (WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param)); - cmd->flags = 0; - cmd->vdev_id = vdev_id; - if (!bArpOnly) - cmd->num_ns_ext_tuples = num_ns_ext_tuples; - - WMA_LOGD("ARP NS Offload vdev_id: %d", cmd->vdev_id); - - /* Have copy of arp info to send along with NS, Since FW expects - * both ARP and NS info in single cmd */ - if (bArpOnly) - qdf_mem_copy(&wma->mArpInfo, pHostOffloadParams, - sizeof(tSirHostOffloadReq)); - - buf_ptr += sizeof(WMI_SET_ARP_NS_OFFLOAD_CMD_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - (WMI_MAX_NS_OFFLOADS * sizeof(WMI_NS_OFFLOAD_TUPLE))); - buf_ptr += WMI_TLV_HDR_SIZE; - for (i = 0; i < WMI_MAX_NS_OFFLOADS; i++) { - ns_tuple = (WMI_NS_OFFLOAD_TUPLE *) buf_ptr; - WMITLV_SET_HDR(&ns_tuple->tlv_header, - WMITLV_TAG_STRUC_WMI_NS_OFFLOAD_TUPLE, - (sizeof(WMI_NS_OFFLOAD_TUPLE) - - WMI_TLV_HDR_SIZE)); - - /* Fill data only for NS offload in the first ARP tuple for LA */ - if (!bArpOnly && - ((pHostOffloadParams->enableOrDisable & SIR_OFFLOAD_ENABLE))) { - ns_tuple->flags |= WMI_NSOFF_FLAGS_VALID; - -#ifdef WLAN_NS_OFFLOAD - /*Copy the target/solicitation/remote ip addr */ - if (pHostOffloadParams->nsOffloadInfo. - targetIPv6AddrValid[i]) - A_MEMCPY(&ns_tuple->target_ipaddr[0], - &pHostOffloadParams->nsOffloadInfo. - targetIPv6Addr[i], - sizeof(WMI_IPV6_ADDR)); - A_MEMCPY(&ns_tuple->solicitation_ipaddr, - &pHostOffloadParams->nsOffloadInfo. - selfIPv6Addr[i], sizeof(WMI_IPV6_ADDR)); - WMA_LOGD("NS solicitedIp: %pI6, targetIp: %pI6", - &pHostOffloadParams->nsOffloadInfo.selfIPv6Addr[i], - &pHostOffloadParams->nsOffloadInfo. - targetIPv6Addr[i]); - - /* target MAC is optional, check if it is valid, - * if this is not valid, the target will use the known - * local MAC address rather than the tuple - */ - WMI_CHAR_ARRAY_TO_MAC_ADDR(pHostOffloadParams-> - nsOffloadInfo.self_macaddr.bytes, - &ns_tuple->target_mac); -#endif /* WLAN_NS_OFFLOAD */ - if ((ns_tuple->target_mac.mac_addr31to0 != 0) || - (ns_tuple->target_mac.mac_addr47to32 != 0)) { - ns_tuple->flags |= WMI_NSOFF_FLAGS_MAC_VALID; - } - } - buf_ptr += sizeof(WMI_NS_OFFLOAD_TUPLE); - } - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - (WMI_MAX_ARP_OFFLOADS * sizeof(WMI_ARP_OFFLOAD_TUPLE))); - buf_ptr += WMI_TLV_HDR_SIZE; - for (i = 0; i < WMI_MAX_ARP_OFFLOADS; i++) { - arp_tuple = (WMI_ARP_OFFLOAD_TUPLE *) buf_ptr; - WMITLV_SET_HDR(&arp_tuple->tlv_header, - WMITLV_TAG_STRUC_WMI_ARP_OFFLOAD_TUPLE, - WMITLV_GET_STRUCT_TLVLEN(WMI_ARP_OFFLOAD_TUPLE)); - - /* Fill data for ARP and NS in the first tupple for LA */ - if ((wma->mArpInfo.enableOrDisable & SIR_OFFLOAD_ENABLE) - && (i == 0)) { - /*Copy the target ip addr and flags */ - arp_tuple->flags = WMI_ARPOFF_FLAGS_VALID; - A_MEMCPY(&arp_tuple->target_ipaddr, - wma->mArpInfo.params.hostIpv4Addr, - SIR_IPV4_ADDR_LEN); - WMA_LOGD("ARPOffload IP4 address: %pI4", - wma->mArpInfo.params.hostIpv4Addr); - } - buf_ptr += sizeof(WMI_ARP_OFFLOAD_TUPLE); - } - - /* Populate extended NS offload tuples */ - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - (num_ns_ext_tuples*sizeof(WMI_NS_OFFLOAD_TUPLE))); - buf_ptr += WMI_TLV_HDR_SIZE; - - if (num_ns_ext_tuples) { - for (i = WMI_MAX_NS_OFFLOADS; i < count; i++) { - ns_tuple = (WMI_NS_OFFLOAD_TUPLE *)buf_ptr; - WMITLV_SET_HDR(&ns_tuple->tlv_header, - WMITLV_TAG_STRUC_WMI_NS_OFFLOAD_TUPLE, - (sizeof(WMI_NS_OFFLOAD_TUPLE)-WMI_TLV_HDR_SIZE)); - - /* Fill data only for NS offload in the first ARP tuple for LA */ - if (!bArpOnly && - ((pHostOffloadParams->enableOrDisable & SIR_OFFLOAD_ENABLE))) { - ns_tuple->flags |= WMI_NSOFF_FLAGS_VALID; -#ifdef WLAN_NS_OFFLOAD - /*Copy the target/solicitation/remote ip addr */ - if (pHostOffloadParams->nsOffloadInfo.targetIPv6AddrValid[i]) - A_MEMCPY(&ns_tuple->target_ipaddr[0], - &pHostOffloadParams->nsOffloadInfo.targetIPv6Addr[i], - sizeof(WMI_IPV6_ADDR)); - A_MEMCPY(&ns_tuple->solicitation_ipaddr, - &pHostOffloadParams->nsOffloadInfo.selfIPv6Addr[i], - sizeof(WMI_IPV6_ADDR)); - WMA_LOGD("Index %d NS solicitedIp: %pI6, targetIp: %pI6", i, - &pHostOffloadParams->nsOffloadInfo.selfIPv6Addr[i], - &pHostOffloadParams->nsOffloadInfo.targetIPv6Addr[i]); - - /* target MAC is optional, check if it is valid, if this is not valid, - * the target will use the known local MAC address rather than the tuple */ - WMI_CHAR_ARRAY_TO_MAC_ADDR( - pHostOffloadParams->nsOffloadInfo.self_macaddr.bytes, - &ns_tuple->target_mac); -#endif - if ((ns_tuple->target_mac.mac_addr31to0 != 0) || - (ns_tuple->target_mac.mac_addr47to32 != 0)) { - ns_tuple->flags |= WMI_NSOFF_FLAGS_MAC_VALID; - } - } - buf_ptr += sizeof(WMI_NS_OFFLOAD_TUPLE); - } - } - res = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_SET_ARP_NS_OFFLOAD_CMDID); + res = wmi_unified_enable_arp_ns_offload_cmd(wma->wmi_handle, + (struct host_offload_req_param *)pHostOffloadParams, + arp_only, + vdev_id); if (res) { WMA_LOGE("Failed to enable ARP NDP/NSffload"); - wmi_buf_free(buf); qdf_mem_free(pHostOffloadParams); return QDF_STATUS_E_FAILURE; } @@ -5677,45 +4645,12 @@ int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) int wma_set_app_type1_params_in_fw(tp_wma_handle wma, tpSirAppType1Params appType1Params) { - wmi_extwow_set_app_type1_params_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len; int ret; - len = sizeof(wmi_extwow_set_app_type1_params_cmd_fixed_param); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_extwow_set_app_type1_params_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extwow_set_app_type1_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extwow_set_app_type1_params_cmd_fixed_param)); - - cmd->vdev_id = appType1Params->vdev_id; - WMI_CHAR_ARRAY_TO_MAC_ADDR(appType1Params->wakee_mac_addr.bytes, - &cmd->wakee_mac); - qdf_mem_copy(cmd->ident, appType1Params->identification_id, 8); - cmd->ident_len = appType1Params->id_length; - qdf_mem_copy(cmd->passwd, appType1Params->password, 16); - cmd->passwd_len = appType1Params->pass_length; - - WMA_LOGD("%s: vdev_id %d wakee_mac_addr %pM " - "identification_id %.8s id_length %u " - "password %.16s pass_length %u", - __func__, cmd->vdev_id, appType1Params->wakee_mac_addr.bytes, - cmd->ident, cmd->ident_len, cmd->passwd, cmd->passwd_len); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID); + ret = wmi_unified_app_type1_params_in_fw_cmd(wma->wmi_handle, + (struct app_type1_params *)appType1Params); if (ret) { WMA_LOGE("%s: Failed to set APP TYPE1 PARAMS", __func__); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -6016,11 +4951,7 @@ int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, tSirLedFlashingReq *flashing) { - wmi_set_led_flashing_cmd_fixed_param *cmd; - int status = 0; - wmi_buf_t buf; - uint8_t *buf_ptr; - int32_t len = sizeof(wmi_set_led_flashing_cmd_fixed_param); + struct flashing_req_params cmd = {0}; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE(FL("WMA is closed, can not issue cmd")); @@ -6030,27 +4961,13 @@ QDF_STATUS wma_set_led_flashing(tp_wma_handle wma_handle, WMA_LOGE(FL("invalid parameter: flashing")); return QDF_STATUS_E_INVAL; } - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGP(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_set_led_flashing_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_set_led_flashing_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_set_led_flashing_cmd_fixed_param)); - cmd->pattern_id = flashing->pattern_id; - cmd->led_x0 = flashing->led_x0; - cmd->led_x1 = flashing->led_x1; - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_PDEV_SET_LED_FLASHING_CMDID); + cmd.req_id = flashing->reqId; + cmd.pattern_id = flashing->pattern_id; + cmd.led_x0 = flashing->led_x0; + cmd.led_x1 = flashing->led_x1; + status = wmi_unified_set_led_flashing_cmd(wma_handle->wmi_handle, + &cmd); if (status != EOK) { - WMA_LOGE("%s: wmi_unified_cmd_send WMI_PEER_SET_PARAM_CMD" - " returned Error %d", __func__, status); return QDF_STATUS_E_FAILURE; } return QDF_STATUS_SUCCESS; @@ -6950,18 +5867,12 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, tTdlsPeerStateParams *peerStateParams) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_tdls_peer_update_cmd_fixed_param *cmd; - wmi_tdls_peer_capabilities *peer_cap; - wmi_channel *chan_info; - wmi_buf_t wmi_buf; - uint8_t *buf_ptr; uint32_t i; ol_txrx_pdev_handle pdev; uint8_t peer_id; struct ol_txrx_peer_t *peer; - int32_t len = sizeof(wmi_tdls_peer_update_cmd_fixed_param) + - sizeof(wmi_tdls_peer_capabilities); int ret = 0; + uint32_t *ch_mhz; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); @@ -6975,165 +5886,25 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, sizeof(tTdlsPeerCapParams)); } - len += WMI_TLV_HDR_SIZE + - sizeof(wmi_channel) * peerStateParams->peerCap.peerChanLen; - - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - ret = ENOMEM; - goto end_tdls_peer_state; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_tdls_peer_update_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_tdls_peer_update_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_tdls_peer_update_cmd_fixed_param)); - - cmd->vdev_id = peerStateParams->vdevId; - WMI_CHAR_ARRAY_TO_MAC_ADDR(peerStateParams->peerMacAddr, - &cmd->peer_macaddr); - - switch (peerStateParams->peerState) { - case WMA_TDLS_PEER_STATE_PEERING: - cmd->peer_state = WMI_TDLS_PEER_STATE_PEERING; - break; - case WMA_TDLS_PEER_STATE_CONNECTED: - cmd->peer_state = WMI_TDLS_PEER_STATE_CONNECTED; - break; - case WMA_TDLS_PEER_STATE_TEARDOWN: - cmd->peer_state = WMI_TDLS_PEER_STATE_TEARDOWN; - break; - case WMA_TDLS_PEER_ADD_MAC_ADDR: - cmd->peer_state = WMI_TDLS_PEER_ADD_MAC_ADDR; - break; - case WMA_TDLS_PEER_REMOVE_MAC_ADDR: - cmd->peer_state = WMI_TDLS_PEER_REMOVE_MAC_ADDR; - break; - } - - WMA_LOGD("%s: vdev_id: %d, peerStateParams->peerMacAddr: %pM, " - "peer_macaddr.mac_addr31to0: 0x%x, " - "peer_macaddr.mac_addr47to32: 0x%x, peer_state: %d", - __func__, cmd->vdev_id, peerStateParams->peerMacAddr, - cmd->peer_macaddr.mac_addr31to0, - cmd->peer_macaddr.mac_addr47to32, cmd->peer_state); - - buf_ptr += sizeof(wmi_tdls_peer_update_cmd_fixed_param); - peer_cap = (wmi_tdls_peer_capabilities *) buf_ptr; - WMITLV_SET_HDR(&peer_cap->tlv_header, - WMITLV_TAG_STRUC_wmi_tdls_peer_capabilities, - WMITLV_GET_STRUCT_TLVLEN(wmi_tdls_peer_capabilities)); - - if ((peerStateParams->peerCap.peerUapsdQueue & 0x08) >> 3) - WMI_SET_TDLS_PEER_VO_UAPSD(peer_cap); - if ((peerStateParams->peerCap.peerUapsdQueue & 0x04) >> 2) - WMI_SET_TDLS_PEER_VI_UAPSD(peer_cap); - if ((peerStateParams->peerCap.peerUapsdQueue & 0x02) >> 1) - WMI_SET_TDLS_PEER_BK_UAPSD(peer_cap); - if (peerStateParams->peerCap.peerUapsdQueue & 0x01) - WMI_SET_TDLS_PEER_BE_UAPSD(peer_cap); - - /* Ack and More Data Ack are sent as 0, so no need to set - * but fill SP - */ - WMI_SET_TDLS_PEER_SP_UAPSD(peer_cap, - peerStateParams->peerCap.peerMaxSp); - - peer_cap->buff_sta_support = - peerStateParams->peerCap.peerBuffStaSupport; - peer_cap->off_chan_support = - peerStateParams->peerCap.peerOffChanSupport; - peer_cap->peer_curr_operclass = - peerStateParams->peerCap.peerCurrOperClass; - /* self curr operclass is not being used and so pass op class for - * preferred off chan in it. - */ - peer_cap->self_curr_operclass = - peerStateParams->peerCap.opClassForPrefOffChan; - peer_cap->peer_chan_len = peerStateParams->peerCap.peerChanLen; - peer_cap->peer_operclass_len = - peerStateParams->peerCap.peerOperClassLen; - - WMA_LOGD("%s: peer_operclass_len: %d", - __func__, peer_cap->peer_operclass_len); - for (i = 0; i < WMI_TDLS_MAX_SUPP_OPER_CLASSES; i++) { - peer_cap->peer_operclass[i] = - peerStateParams->peerCap.peerOperClass[i]; - WMA_LOGD("%s: peer_operclass[%d]: %d", - __func__, i, peer_cap->peer_operclass[i]); - } - - peer_cap->is_peer_responder = peerStateParams->peerCap.isPeerResponder; - peer_cap->pref_offchan_num = peerStateParams->peerCap.prefOffChanNum; - peer_cap->pref_offchan_bw = - peerStateParams->peerCap.prefOffChanBandwidth; - - WMA_LOGD - ("%s: peer_qos: 0x%x, buff_sta_support: %d, off_chan_support: %d, peer_curr_operclass: %d, self_curr_operclass: %d, peer_chan_len: %d, peer_operclass_len: %d, is_peer_responder: %d, pref_offchan_num: %d, pref_offchan_bw: %d", - __func__, peer_cap->peer_qos, peer_cap->buff_sta_support, - peer_cap->off_chan_support, peer_cap->peer_curr_operclass, - peer_cap->self_curr_operclass, peer_cap->peer_chan_len, - peer_cap->peer_operclass_len, peer_cap->is_peer_responder, - peer_cap->pref_offchan_num, peer_cap->pref_offchan_bw); - - /* next fill variable size array of peer chan info */ - buf_ptr += sizeof(wmi_tdls_peer_capabilities); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_channel) * - peerStateParams->peerCap.peerChanLen); - chan_info = (wmi_channel *) (buf_ptr + WMI_TLV_HDR_SIZE); - + ch_mhz = qdf_mem_malloc(sizeof(uint32_t) * + peerStateParams->peerCap.peerChanLen); for (i = 0; i < peerStateParams->peerCap.peerChanLen; ++i) { - WMITLV_SET_HDR(&chan_info->tlv_header, - WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - chan_info->mhz = + ch_mhz[i] = cds_chan_to_freq(peerStateParams->peerCap.peerChan[i]. chanId); - chan_info->band_center_freq1 = chan_info->mhz; - chan_info->band_center_freq2 = 0; - - WMA_LOGD("%s: chan[%d] = %u", __func__, i, chan_info->mhz); - - if (peerStateParams->peerCap.peerChan[i].dfsSet) { - WMI_SET_CHANNEL_FLAG(chan_info, WMI_CHAN_FLAG_PASSIVE); - WMA_LOGI("chan[%d] DFS[%d]\n", - peerStateParams->peerCap.peerChan[i].chanId, - peerStateParams->peerCap.peerChan[i].dfsSet); - } - - if (chan_info->mhz < WMA_2_4_GHZ_MAX_FREQ) { - WMI_SET_CHANNEL_MODE(chan_info, MODE_11G); - } else { - WMI_SET_CHANNEL_MODE(chan_info, MODE_11A); - } - - WMI_SET_CHANNEL_MAX_TX_POWER(chan_info, - peerStateParams->peerCap. - peerChan[i].pwr); - - WMI_SET_CHANNEL_REG_POWER(chan_info, - peerStateParams->peerCap.peerChan[i]. - pwr); - WMA_LOGD("Channel TX power[%d] = %u: %d", i, chan_info->mhz, - peerStateParams->peerCap.peerChan[i].pwr); - - chan_info++; } - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_TDLS_PEER_UPDATE_CMDID)) { + if (wmi_unified_update_tdls_peer_state_cmd(wma_handle->wmi_handle, + (struct tdls_peer_state_params *)peerStateParams, + ch_mhz)) { WMA_LOGE("%s: failed to send tdls peer update state command", __func__); - qdf_nbuf_free(wmi_buf); + qdf_mem_free(ch_mhz); ret = -EIO; goto end_tdls_peer_state; } + qdf_mem_free(ch_mhz); /* in case of teardown, remove peer from fw */ if (WMA_TDLS_PEER_STATE_TEARDOWN == peerStateParams->peerState) { pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -7596,87 +6367,18 @@ int wma_dfs_indicate_radar(struct ieee80211com *ic, QDF_STATUS wma_process_fw_mem_dump_req(tp_wma_handle wma, struct fw_dump_req *mem_dump_req) { - wmi_get_fw_mem_dump_fixed_param *cmd; - wmi_fw_mem_dump *dump_params; - struct fw_dump_seg_req *seg_req; - int32_t len; - wmi_buf_t buf; - u_int8_t *buf_ptr; - int ret, loop; + int ret; if (!mem_dump_req || !wma) { WMA_LOGE(FL("input pointer is NULL")); return QDF_STATUS_E_FAILURE; } - /* - * len = sizeof(fixed param) that includes tlv header + - * tlv header for array of struc + - * sizeof (each struct) - */ - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; - len += mem_dump_req->num_seg * sizeof(wmi_fw_mem_dump); - buf = wmi_buf_alloc(wma->wmi_handle, len); - - if (!buf) { - WMA_LOGE(FL("Failed allocate wmi buffer")); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (u_int8_t *) wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - cmd = (wmi_get_fw_mem_dump_fixed_param *) buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_get_fw_mem_dump_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_get_fw_mem_dump_fixed_param)); - - cmd->request_id = mem_dump_req->request_id; - cmd->num_fw_mem_dump_segs = mem_dump_req->num_seg; - - /* TLV indicating array of structures to follow */ - buf_ptr += sizeof(wmi_get_fw_mem_dump_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_fw_mem_dump) * - cmd->num_fw_mem_dump_segs); - - buf_ptr += WMI_TLV_HDR_SIZE; - dump_params = (wmi_fw_mem_dump *) buf_ptr; - - WMA_LOGI(FL("request_id:%d num_seg:%d"), - mem_dump_req->request_id, mem_dump_req->num_seg); - for (loop = 0; loop < cmd->num_fw_mem_dump_segs; loop++) { - seg_req = (struct fw_dump_seg_req *) - ((uint8_t *)(mem_dump_req->segment) + - loop * sizeof(*seg_req)); - WMITLV_SET_HDR(&dump_params->tlv_header, - WMITLV_TAG_STRUC_wmi_fw_mem_dump_params, - WMITLV_GET_STRUCT_TLVLEN(wmi_fw_mem_dump)); - dump_params->seg_id = seg_req->seg_id; - dump_params->seg_start_addr_lo = seg_req->seg_start_addr_lo; - dump_params->seg_start_addr_hi = seg_req->seg_start_addr_hi; - dump_params->seg_length = seg_req->seg_length; - dump_params->dest_addr_lo = seg_req->dst_addr_lo; - dump_params->dest_addr_hi = seg_req->dst_addr_hi; - WMA_LOGI(FL("seg_number:%d"), loop); - WMA_LOGI(FL("seg_id:%d start_addr_lo:0x%x start_addr_hi:0x%x"), - dump_params->seg_id, dump_params->seg_start_addr_lo, - dump_params->seg_start_addr_hi); - WMA_LOGI(FL("seg_length:%d dst_addr_lo:0x%x dst_addr_hi:0x%x"), - dump_params->seg_length, dump_params->dest_addr_lo, - dump_params->dest_addr_hi); - dump_params++; - } - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_GET_FW_MEM_DUMP_CMDID); - if (ret) { - WMA_LOGE(FL("Failed to send get firmware mem dump request")); - wmi_buf_free(buf); + ret = wmi_unified_process_fw_mem_dump_cmd(wma->wmi_handle, + (struct fw_dump_req_param *) mem_dump_req); + if (ret) return QDF_STATUS_E_FAILURE; - } - WMA_LOGI(FL("Get firmware mem dump request sent successfully")); return QDF_STATUS_SUCCESS; } @@ -7776,10 +6478,7 @@ int wma_fw_mem_dump_event_handler(void *handle, u_int8_t *cmd_param_info, QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, struct vdev_ie_info *ie_info) { - wmi_vdev_set_ie_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t len, ie_len_aligned; + struct vdev_ie_info_param cmd = {0}; int ret; if (!ie_info || !wma) { @@ -7793,45 +6492,13 @@ QDF_STATUS wma_process_set_ie_info(tp_wma_handle wma, return QDF_STATUS_E_INVAL; } - ie_len_aligned = roundup(ie_info->length, sizeof(uint32_t)); - /* Allocate memory for the WMI command */ - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + ie_len_aligned; + cmd.vdev_id = ie_info->vdev_id; + cmd.ie_id = ie_info->ie_id; + cmd.length = ie_info->length; + cmd.data = ie_info->data; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - - /* Populate the WMI command */ - cmd = (wmi_vdev_set_ie_cmd_fixed_param *)buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_set_ie_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_vdev_set_ie_cmd_fixed_param)); - cmd->vdev_id = ie_info->vdev_id; - cmd->ie_id = ie_info->ie_id; - cmd->ie_len = ie_info->length; - - WMA_LOGD(FL("IE:%d of size:%d sent for vdev:%d"), ie_info->ie_id, - ie_info->length, ie_info->vdev_id); - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - - qdf_mem_copy(buf_ptr, ie_info->data, cmd->ie_len); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_SET_IE_CMDID); - if (ret != EOK) { - WMA_LOGE(FL("Failed to send set IE command ret = %d"), ret); - wmi_buf_free(buf); - } + ret = wmi_unified_process_set_ie_info_cmd(wma->wmi_handle, + &cmd); return ret; } -- cgit v1.2.3 From 4863da4d7e31bb8eacc5db80dd952ed0fedc3ffc Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 11:45:00 +0530 Subject: qcacld-3.0: Refactor formation of ll stats wmi commands Move tlv formation of wmi link layer stats commands to common wmi layer from wma layer. Change-Id: I58831f16802dc3ca307145654196b7c9238a5e8c CRs-Fixed: 976998 --- core/wma/src/wma_utils.c | 152 +++++++---------------------------------------- 1 file changed, 23 insertions(+), 129 deletions(-) diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 0d0e7327d76a..81af1d58061a 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -790,10 +790,7 @@ void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle) QDF_STATUS wma_process_ll_stats_clear_req (tp_wma_handle wma, const tpSirLLStatsClearReq clearReq) { - wmi_clear_link_stats_cmd_fixed_param *cmd; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; + struct ll_stats_clear_params cmd = {0}; int ret; if (!clearReq || !wma) { @@ -801,46 +798,17 @@ QDF_STATUS wma_process_ll_stats_clear_req return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - cmd = (wmi_clear_link_stats_cmd_fixed_param *) buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_clear_link_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_clear_link_stats_cmd_fixed_param)); - - cmd->stop_stats_collection_req = clearReq->stopReq; - cmd->vdev_id = clearReq->staId; - cmd->stats_clear_req_mask = clearReq->statsClearReqMask; - - WMI_CHAR_ARRAY_TO_MAC_ADDR(wma->interfaces[clearReq->staId].addr, - &cmd->peer_macaddr); + cmd.stop_req = clearReq->stopReq; + cmd.sta_id = clearReq->staId; + cmd.stats_clear_mask = clearReq->statsClearReqMask; - WMA_LOGD("LINK_LAYER_STATS - Clear Request Params"); - WMA_LOGD("StopReq : %d", cmd->stop_stats_collection_req); - WMA_LOGD("Vdev Id : %d", cmd->vdev_id); - WMA_LOGD("Clear Stat Mask : %d", cmd->stats_clear_req_mask); - WMA_LOGD("Peer MAC Addr : %pM", - wma->interfaces[clearReq->staId].addr); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_CLEAR_LINK_STATS_CMDID); + ret = wmi_unified_process_ll_stats_clear_cmd(wma->wmi_handle, &cmd, + wma->interfaces[clearReq->staId].addr); if (ret) { WMA_LOGE("%s: Failed to send clear link stats req", __func__); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } - WMA_LOGD("Clear Link Layer Stats request sent successfully"); return QDF_STATUS_SUCCESS; } @@ -854,10 +822,7 @@ QDF_STATUS wma_process_ll_stats_clear_req QDF_STATUS wma_process_ll_stats_set_req (tp_wma_handle wma, const tpSirLLStatsSetReq setReq) { - wmi_start_link_stats_cmd_fixed_param *cmd; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; + struct ll_stats_set_params cmd = {0}; int ret; if (!setReq || !wma) { @@ -865,40 +830,17 @@ QDF_STATUS wma_process_ll_stats_set_req return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - cmd = (wmi_start_link_stats_cmd_fixed_param *) buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_start_link_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_start_link_stats_cmd_fixed_param)); - - cmd->mpdu_size_threshold = setReq->mpduSizeThreshold; - cmd->aggressive_statistics_gathering = + cmd.mpdu_size_threshold = setReq->mpduSizeThreshold; + cmd.aggressive_statistics_gathering = setReq->aggressiveStatisticsGathering; - WMA_LOGD("LINK_LAYER_STATS - Start/Set Request Params"); - WMA_LOGD("MPDU Size Thresh : %d", cmd->mpdu_size_threshold); - WMA_LOGD("Aggressive Gather: %d", cmd->aggressive_statistics_gathering); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_START_LINK_STATS_CMDID); + ret = wmi_unified_process_ll_stats_set_cmd(wma->wmi_handle, + &cmd); if (ret) { WMA_LOGE("%s: Failed to send set link stats request", __func__); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } - WMA_LOGD("Set Link Layer Stats request sent successfully"); return QDF_STATUS_SUCCESS; } @@ -912,10 +854,7 @@ QDF_STATUS wma_process_ll_stats_set_req QDF_STATUS wma_process_ll_stats_get_req (tp_wma_handle wma, const tpSirLLStatsGetReq getReq) { - wmi_request_link_stats_cmd_fixed_param *cmd; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; + struct ll_stats_get_params cmd = {0}; int ret; if (!getReq || !wma) { @@ -923,45 +862,17 @@ QDF_STATUS wma_process_ll_stats_get_req return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - qdf_mem_zero(buf_ptr, len); - cmd = (wmi_request_link_stats_cmd_fixed_param *) buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_request_link_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_request_link_stats_cmd_fixed_param)); - - cmd->request_id = getReq->reqId; - cmd->stats_type = getReq->paramIdMask; - cmd->vdev_id = getReq->staId; + cmd.req_id = getReq->reqId; + cmd.param_id_mask = getReq->paramIdMask; + cmd.sta_id = getReq->staId; - WMI_CHAR_ARRAY_TO_MAC_ADDR(wma->interfaces[getReq->staId].addr, - &cmd->peer_macaddr); - - WMA_LOGD("LINK_LAYER_STATS - Get Request Params"); - WMA_LOGD("Request ID : %d", cmd->request_id); - WMA_LOGD("Stats Type : %d", cmd->stats_type); - WMA_LOGD("Vdev ID : %d", cmd->vdev_id); - WMA_LOGD("Peer MAC Addr : %pM", wma->interfaces[getReq->staId].addr); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_REQUEST_LINK_STATS_CMDID); + ret = wmi_unified_process_ll_stats_get_cmd(wma->wmi_handle, &cmd, + wma->interfaces[getReq->staId].addr); if (ret) { WMA_LOGE("%s: Failed to send get link stats request", __func__); - wmi_buf_free(buf); return QDF_STATUS_E_FAILURE; } - WMA_LOGD("Get Link Layer Stats request sent successfully"); return QDF_STATUS_SUCCESS; } @@ -2026,10 +1937,9 @@ void wma_get_stats_req(WMA_HANDLE handle, { tp_wma_handle wma_handle = (tp_wma_handle) handle; struct wma_txrx_node *node; - wmi_buf_t buf; - wmi_request_stats_cmd_fixed_param *cmd; + struct pe_stats_req cmd = {0}; tAniGetPEStatsRsp *pGetPEStatsRspParams; - uint8_t len = sizeof(wmi_request_stats_cmd_fixed_param); + WMA_LOGD("%s: Enter", __func__); node = &wma_handle->interfaces[get_stats_param->sessionId]; @@ -2054,31 +1964,15 @@ void wma_get_stats_req(WMA_HANDLE handle, if (!pGetPEStatsRspParams) goto end; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed to allocate wmi buffer", __func__); - goto failed; - } - node->fw_stats_set = 0; node->stats_rsp = pGetPEStatsRspParams; - cmd = (wmi_request_stats_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_request_stats_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_request_stats_cmd_fixed_param)); - cmd->stats_id = - WMI_REQUEST_PEER_STAT | WMI_REQUEST_PDEV_STAT | - WMI_REQUEST_VDEV_STAT; - cmd->vdev_id = get_stats_param->sessionId; - WMI_CHAR_ARRAY_TO_MAC_ADDR(node->bssid, &cmd->peer_macaddr); - WMA_LOGD("STATS REQ VDEV_ID:%d-->", cmd->vdev_id); - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_REQUEST_STATS_CMDID)) { + + cmd.session_id = get_stats_param->sessionId; + if (wmi_unified_get_stats_cmd(wma_handle->wmi_handle, &cmd, + node->bssid)) { WMA_LOGE("%s: Failed to send WMI_REQUEST_STATS_CMDID", __func__); - wmi_buf_free(buf); goto failed; } -- cgit v1.2.3 From 64b5e11e804d19d33b0dd17b2f6fc89b183665d3 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 11:53:50 +0530 Subject: qcacld-3.0: Refactor formation of wmi scan roaming commands Move tlv formation of wmi scan roaming commands to common wmi layer from wma layer. Change-Id: I6786ce42d99d6a3f29561c24dea7e3018fb0f3e9 CRs-Fixed: 976998 --- core/wma/src/wma_scan_roam.c | 541 ++++--------------------------------------- 1 file changed, 41 insertions(+), 500 deletions(-) diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 24fe0df6c2b9..728ea9ee74b3 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1133,48 +1133,8 @@ QDF_STATUS wma_roam_scan_offload_scan_period(tp_wma_handle wma_handle, uint32_t scan_age, uint32_t vdev_id) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len; - uint8_t *buf_ptr; - wmi_roam_scan_period_fixed_param *scan_period_fp; - - /* Send scan period values */ - len = sizeof(wmi_roam_scan_period_fixed_param); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - scan_period_fp = (wmi_roam_scan_period_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&scan_period_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_period_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_scan_period_fixed_param)); - /* fill in scan period values */ - scan_period_fp->vdev_id = vdev_id; - scan_period_fp->roam_scan_period = scan_period; /* 20 seconds */ - scan_period_fp->roam_scan_age = scan_age; - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_SCAN_PERIOD); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_PERIOD returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } - - WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_PERIOD roam_scan_period=%d, roam_scan_age=%d", - __func__, scan_period, scan_age); - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - - return qdf_status; + return wmi_unified_roam_scan_offload_scan_period(wma_handle->wmi_handle, + scan_period, scan_age, vdev_id); } /** @@ -1194,51 +1154,16 @@ QDF_STATUS wma_roam_scan_offload_rssi_change(tp_wma_handle wma_handle, uint32_t bcn_rssi_weight, uint32_t hirssi_delay_btw_scans) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len; - uint8_t *buf_ptr; - wmi_roam_scan_rssi_change_threshold_fixed_param *rssi_change_fp; + int status; - /* Send rssi change parameters */ - len = sizeof(wmi_roam_scan_rssi_change_threshold_fixed_param); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } + status = wmi_unified_roam_scan_offload_rssi_change_cmd(wma_handle->wmi_handle, + vdev_id, rssi_change_thresh, + bcn_rssi_weight, hirssi_delay_btw_scans); + if (status != EOK) + return QDF_STATUS_E_FAILURE; - buf_ptr = (uint8_t *) wmi_buf_data(buf); - rssi_change_fp = - (wmi_roam_scan_rssi_change_threshold_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&rssi_change_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_rssi_change_threshold_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_scan_rssi_change_threshold_fixed_param)); - /* fill in rssi change threshold (hysteresis) values */ - rssi_change_fp->vdev_id = vdev_id; - rssi_change_fp->roam_scan_rssi_change_thresh = rssi_change_thresh; - rssi_change_fp->bcn_rssi_weight = bcn_rssi_weight; - rssi_change_fp->hirssi_delay_btw_scans = hirssi_delay_btw_scans; - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } - - WMA_LOGI(FL("roam_scan_rssi_change_thresh=%d, bcn_rssi_weight=%d"), - rssi_change_thresh, bcn_rssi_weight); - WMA_LOGI(FL("hirssi_delay_btw_scans=%d"), hirssi_delay_btw_scans); return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - - return qdf_status; } /** @@ -1258,73 +1183,28 @@ QDF_STATUS wma_roam_scan_offload_chan_list(tp_wma_handle wma_handle, uint8_t *chan_list, uint8_t list_type, uint32_t vdev_id) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len, list_tlv_len; + QDF_STATUS status; int i; - uint8_t *buf_ptr; - wmi_roam_chan_list_fixed_param *chan_list_fp; - A_UINT32 *roam_chan_list_array; + uint8_t *chan_list_hz; if (chan_count == 0) { WMA_LOGD("%s : invalid number of channels %d", __func__, chan_count); return QDF_STATUS_E_EMPTY; } - /* Channel list is a table of 2 TLV's */ - list_tlv_len = WMI_TLV_HDR_SIZE + chan_count * sizeof(A_UINT32); - len = sizeof(wmi_roam_chan_list_fixed_param) + list_tlv_len; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - chan_list_fp = (wmi_roam_chan_list_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&chan_list_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_chan_list_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_chan_list_fixed_param)); - chan_list_fp->vdev_id = vdev_id; - chan_list_fp->num_chan = chan_count; - if (chan_count > 0 && list_type == CHANNEL_LIST_STATIC) { - /* external app is controlling channel list */ - chan_list_fp->chan_list_type = - WMI_ROAM_SCAN_CHAN_LIST_TYPE_STATIC; - } else { - /* umac supplied occupied channel list in LFR */ - chan_list_fp->chan_list_type = - WMI_ROAM_SCAN_CHAN_LIST_TYPE_DYNAMIC; - } - - buf_ptr += sizeof(wmi_roam_chan_list_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (chan_list_fp->num_chan * sizeof(uint32_t))); - roam_chan_list_array = (A_UINT32 *) (buf_ptr + WMI_TLV_HDR_SIZE); - WMA_LOGI("%s: %d channels = ", __func__, chan_list_fp->num_chan); - for (i = 0; ((i < chan_list_fp->num_chan) && + chan_list_hz = qdf_mem_malloc(chan_count * sizeof(uint8_t)); + for (i = 0; ((i < chan_count) && (i < SIR_ROAM_MAX_CHANNELS)); i++) { - roam_chan_list_array[i] = cds_chan_to_freq(chan_list[i]); - WMA_LOGI("%d,", roam_chan_list_array[i]); + chan_list_hz[i] = cds_chan_to_freq(chan_list[i]); + WMA_LOGI("%d,", chan_list_hz[i]); } - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_CHAN_LIST); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_CHAN_LIST returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } + status = wmi_unified_roam_scan_offload_chan_list_cmd(wma_handle->wmi_handle, + chan_count, chan_list_hz, + list_type, vdev_id); + qdf_mem_free(chan_list_hz); - WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CHAN_LIST", __func__); - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - - return qdf_status; + return status; } /** @@ -1672,51 +1552,8 @@ QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, wmi_ap_profile *ap_profile_p, uint32_t vdev_id) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len; - uint8_t *buf_ptr; - wmi_roam_ap_profile_fixed_param *roam_ap_profile_fp; - - len = sizeof(wmi_roam_ap_profile_fixed_param) + sizeof(wmi_ap_profile); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - roam_ap_profile_fp = (wmi_roam_ap_profile_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&roam_ap_profile_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_ap_profile_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_ap_profile_fixed_param)); - /* fill in threshold values */ - roam_ap_profile_fp->vdev_id = vdev_id; - roam_ap_profile_fp->id = 0; - buf_ptr += sizeof(wmi_roam_ap_profile_fixed_param); - - qdf_mem_copy(buf_ptr, ap_profile_p, sizeof(wmi_ap_profile)); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_STRUC_wmi_ap_profile, - WMITLV_GET_STRUCT_TLVLEN(wmi_ap_profile)); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_AP_PROFILE); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_AP_PROFILE returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } - - WMA_LOGI("WMA --> WMI_ROAM_AP_PROFILE and other parameters"); - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - - return qdf_status; + return wmi_unified_send_roam_scan_offload_ap_cmd(wma_handle->wmi_handle, + ap_profile_p, vdev_id); } /** @@ -1930,45 +1767,8 @@ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id) { - QDF_STATUS qdf_status; - wmi_roam_scan_cmd_fixed_param *cmd_fp; - wmi_buf_t buf = NULL; - int status = 0; - int len; - uint8_t *buf_ptr; - - len = sizeof(wmi_roam_scan_cmd_fixed_param); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - - cmd_fp = (wmi_roam_scan_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_roam_scan_cmd_fixed_param)); - cmd_fp->vdev_id = vdev_id; - cmd_fp->command_arg = command; - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_SCAN_CMD); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_CMD returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; - } - - WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_CMD", __func__); - return QDF_STATUS_SUCCESS; - -error: - wmi_buf_free(buf); - - return qdf_status; + return wmi_unified_roam_scan_offload_cmd(wma_handle->wmi_handle, + command, vdev_id); } /** @@ -2304,56 +2104,18 @@ void wma_process_roam_invoke(WMA_HANDLE handle, struct wma_roam_invoke_cmd *roaminvoke) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_roam_invoke_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - u_int8_t *buf_ptr; - u_int16_t len, args_tlv_len; - A_UINT32 *channel_list; - wmi_mac_addr *bssid_list; + uint32_t ch_hz; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not send roam invoke", __func__); return; } - /* Host sends only one channel and one bssid */ - args_tlv_len = 2 * WMI_TLV_HDR_SIZE + sizeof(A_UINT32) + - sizeof(wmi_mac_addr); - len = sizeof(wmi_roam_invoke_cmd_fixed_param) + args_tlv_len; - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmai_buf_alloc failed", __func__); - return; - } + ch_hz = (A_UINT32)cds_chan_to_freq(roaminvoke->channel); + wmi_unified_roam_invoke_cmd(wma_handle->wmi_handle, + (struct wmi_roam_invoke_cmd *)roaminvoke, + ch_hz); - cmd = (wmi_roam_invoke_cmd_fixed_param *)wmi_buf_data(wmi_buf); - buf_ptr = (u_int8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_invoke_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_roam_invoke_cmd_fixed_param)); - cmd->vdev_id = roaminvoke->vdev_id; - cmd->flags = 0; - cmd->roam_scan_mode = 0; - cmd->roam_ap_sel_mode = 0; - cmd->roam_delay = 0; - cmd->num_chan = 1; - cmd->num_bssid = 1; - buf_ptr += sizeof(wmi_roam_invoke_cmd_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (sizeof(u_int32_t))); - channel_list = (A_UINT32 *)(buf_ptr + WMI_TLV_HDR_SIZE); - *channel_list = (A_UINT32)cds_chan_to_freq(roaminvoke->channel); - buf_ptr += sizeof(A_UINT32) + WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC, - (sizeof(wmi_mac_addr))); - bssid_list = (wmi_mac_addr *)(buf_ptr + WMI_TLV_HDR_SIZE); - WMI_CHAR_ARRAY_TO_MAC_ADDR(roaminvoke->bssid, bssid_list); - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_ROAM_INVOKE_CMDID)) { - WMA_LOGP("%s: failed to send roam invoke command", __func__); - wmi_buf_free(wmi_buf); - return; - } return; } @@ -2962,50 +2724,18 @@ void wma_process_unit_test_cmd(WMA_HANDLE handle, t_wma_unit_test_cmd *wma_utest) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_unit_test_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint8_t *buf_ptr; - int i; - uint16_t len, args_tlv_len; - A_UINT32 *unit_test_cmd_args; - args_tlv_len = - WMI_TLV_HDR_SIZE + wma_utest->num_args * sizeof(A_UINT32); - len = sizeof(wmi_unit_test_cmd_fixed_param) + args_tlv_len; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue fw unit test cmd", __func__); return; } - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmai_buf_alloc failed", __func__); - return; - } - cmd = (wmi_unit_test_cmd_fixed_param *) wmi_buf_data(wmi_buf); - buf_ptr = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_unit_test_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_unit_test_cmd_fixed_param)); - cmd->vdev_id = wma_utest->vdev_id; - cmd->module_id = wma_utest->module_id; - cmd->num_args = wma_utest->num_args; - buf_ptr += sizeof(wmi_unit_test_cmd_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (wma_utest->num_args * sizeof(uint32_t))); - unit_test_cmd_args = (A_UINT32 *) (buf_ptr + WMI_TLV_HDR_SIZE); - WMA_LOGI("%s: %d num of args = ", __func__, wma_utest->num_args); - for (i = 0; (i < wma_utest->num_args && i < WMA_MAX_NUM_ARGS); i++) { - unit_test_cmd_args[i] = wma_utest->args[i]; - WMA_LOGI("%d,", wma_utest->args[i]); - } - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_UNIT_TEST_CMDID)) { - WMA_LOGP("%s: failed to send unit test command", __func__); - qdf_nbuf_free(wmi_buf); + if (wmi_unified_unit_test_cmd(wma_handle->wmi_handle, + (struct wmi_unit_test_cmd *)wma_utest)) { return; } + return; } @@ -3056,36 +2786,18 @@ static void wma_roam_ho_fail_handler(tp_wma_handle wma, uint32_t vdev_id) void wma_process_roam_synch_complete(WMA_HANDLE handle, uint8_t vdev_id) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_roam_synch_complete_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint8_t *buf_ptr; - uint16_t len; - len = sizeof(wmi_roam_synch_complete_fixed_param); if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue roam synch cnf", __func__); return; } - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return; - } - cmd = (wmi_roam_synch_complete_fixed_param *) wmi_buf_data(wmi_buf); - buf_ptr = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_synch_complete_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_synch_complete_fixed_param)); - cmd->vdev_id = vdev_id; - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_ROAM_SYNCH_COMPLETE)) { - WMA_LOGP("%s: failed to send roam synch confirmation", - __func__); - qdf_nbuf_free(wmi_buf); + + if (wmi_unified_roam_synch_complete_cmd(wma_handle->wmi_handle, + vdev_id)) { return; } + return; } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ @@ -5388,112 +5100,9 @@ QDF_STATUS wma_get_buf_extscan_hotlist_cmd(tp_wma_handle wma_handle, tSirExtScanSetBssidHotListReqParams * photlist, int *buf_len) { - wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *cmd = NULL; - wmi_extscan_hotlist_entry *dest_hotlist; - tSirAPThresholdParam *src_ap = photlist->ap; - wmi_buf_t buf; - uint8_t *buf_ptr; - - int j, index = 0; - int cmd_len = 0; - int num_entries = 0; - int min_entries = 0; - int numap = photlist->numAp; - int len = sizeof(*cmd); - - len += WMI_TLV_HDR_SIZE; - cmd_len = len; - - /* setbssid hotlist expects the bssid list - * to be non zero value - */ - if (!numap) { - WMA_LOGE("%s: Invalid number of bssid's", __func__); - return QDF_STATUS_E_INVAL; - } - num_entries = wma_get_hotlist_entries_per_page(wma_handle->wmi_handle, - cmd_len, - sizeof(*dest_hotlist)); - - /* Split the hot list entry pages and send multiple command - * requests if the buffer reaches the maximum request size - */ - while (index < numap) { - min_entries = QDF_MIN(num_entries, numap); - len += min_entries * sizeof(wmi_extscan_hotlist_entry); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_FAILURE; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *) - buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_configure_hotlist_monitor_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param)); - - /* Multiple requests are sent until the num_entries_in_page - * matches the total_entries - */ - cmd->request_id = photlist->requestId; - cmd->vdev_id = photlist->sessionId; - cmd->total_entries = numap; - cmd->mode = 1; - cmd->num_entries_in_page = min_entries; - cmd->lost_ap_scan_count = photlist->lost_ap_sample_size; - cmd->first_entry_index = index; - - WMA_LOGD("%s: vdev id:%d total_entries: %d num_entries: %d lost_ap_sample_size: %d", - __func__, cmd->vdev_id, cmd->total_entries, - cmd->num_entries_in_page, - cmd->lost_ap_scan_count); - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - min_entries * sizeof(wmi_extscan_hotlist_entry)); - dest_hotlist = (wmi_extscan_hotlist_entry *) - (buf_ptr + WMI_TLV_HDR_SIZE); - - /* Populate bssid, channel info and rssi - * for the bssid's that are sent as hotlists. - */ - for (j = 0; j < min_entries; j++) { - WMITLV_SET_HDR(dest_hotlist, - WMITLV_TAG_STRUC_wmi_extscan_bucket_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_hotlist_entry)); - - dest_hotlist->min_rssi = src_ap->low; - WMI_CHAR_ARRAY_TO_MAC_ADDR(src_ap->bssid.bytes, - &dest_hotlist->bssid); - - WMA_LOGD("%s:channel:%d min_rssi %d", - __func__, dest_hotlist->channel, - dest_hotlist->min_rssi); - WMA_LOGD - ("%s: bssid mac_addr31to0: 0x%x, mac_addr47to32: 0x%x", - __func__, dest_hotlist->bssid.mac_addr31to0, - dest_hotlist->bssid.mac_addr47to32); - dest_hotlist++; - src_ap++; - } - buf_ptr += WMI_TLV_HDR_SIZE + - (min_entries * sizeof(wmi_extscan_hotlist_entry)); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { - WMA_LOGE("%s: failed to send command", __func__); - qdf_nbuf_free(buf); - return QDF_STATUS_E_FAILURE; - } - index = index + min_entries; - num_entries = numap - min_entries; - len = cmd_len; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_get_buf_extscan_hotlist_cmd(wma_handle->wmi_handle, + (struct ext_scan_setbssi_hotlist_params *)photlist, + buf_len); } /** @@ -6272,11 +5881,6 @@ QDF_STATUS wma_set_ssid_hotlist(tp_wma_handle wma, struct sir_set_ssid_hotlist_request *request) { - wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint32_t array_size; - uint8_t *buf_ptr; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue hotlist cmd", @@ -6294,74 +5898,11 @@ wma_set_ssid_hotlist(tp_wma_handle wma, return QDF_STATUS_E_NOSUPPORT; } - /* length of fixed portion */ - len = sizeof(*cmd); - - /* length of variable portion */ - array_size = - request->ssid_count * sizeof(wmi_extscan_hotlist_ssid_entry); - len += WMI_TLV_HDR_SIZE + array_size; - - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param *) - buf_ptr; - WMITLV_SET_HDR - (&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_configure_hotlist_ssid_monitor_cmd_fixed_param)); - - cmd->request_id = request->request_id; - cmd->requestor_id = 0; - cmd->vdev_id = request->session_id; - cmd->table_id = 0; - cmd->lost_ap_scan_count = request->lost_ssid_sample_size; - cmd->total_entries = request->ssid_count; - cmd->num_entries_in_page = request->ssid_count; - cmd->first_entry_index = 0; - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, array_size); - - if (request->ssid_count) { - wmi_extscan_hotlist_ssid_entry *entry; - int i; - - buf_ptr += WMI_TLV_HDR_SIZE; - entry = (wmi_extscan_hotlist_ssid_entry *)buf_ptr; - for (i = 0; i < request->ssid_count; i++) { - WMITLV_SET_HDR - (entry, - WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_hotlist_ssid_entry)); - entry->ssid.ssid_len = request->ssids[i].ssid.length; - qdf_mem_copy(entry->ssid.ssid, - request->ssids[i].ssid.ssId, - request->ssids[i].ssid.length); - entry->band = request->ssids[i].band; - entry->min_rssi = request->ssids[i].rssi_low; - entry->max_rssi = request->ssids[i].rssi_high; - entry++; - } - cmd->mode = WMI_EXTSCAN_MODE_START; - } else { - cmd->mode = WMI_EXTSCAN_MODE_STOP; - } - - if (wmi_unified_cmd_send - (wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID)) { - WMA_LOGE("%s: failed to send command", __func__); - wmi_buf_free(wmi_buf); + if (wmi_unified_set_ssid_hotlist_cmd(wma->wmi_handle, + (struct ssid_hotlist_request_params *)request)) { return QDF_STATUS_E_FAILURE; } + return QDF_STATUS_SUCCESS; } #endif -- cgit v1.2.3 From f25a0f1553c574f9e068a156ebe646af7ca8edde Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 8 Mar 2016 16:09:48 +0530 Subject: qcacld-3.0: Refactor formation of wmi init command Move tlv formation of wmi init and wmi main commands to common wmi layer from wma layer. Move diag events logs list and saved wmi init command to wmi handle from of wma handle. Change-Id: Ie58e10408ea52952021c22f63dd9f3c499e63e74 CRs-Fixed: 976998 --- core/wma/inc/wma.h | 15 +- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_main.c | 477 ++++++-------------------------------------- 3 files changed, 59 insertions(+), 435 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index a83c1947be6f..93355a544ea5 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1037,15 +1037,6 @@ struct dual_mac_config { }; -/** - * struct wmi_init_cmd - Saved wmi INIT command - * @buf: Buffer containing the wmi INIT command - * @buf_len: Length of the buffer - */ -struct wmi_init_cmd { - wmi_buf_t buf; - uint32_t buf_len; -}; /** * struct wma_ini_config - Structure to hold wma ini configuration @@ -1232,7 +1223,7 @@ typedef struct { qdf_nbuf_t last_umac_data_nbuf; bool needShutdown; uint32_t num_mem_chunks; - struct wma_mem_chunk mem_chunks[MAX_MEM_CHUNKS]; + struct wmi_host_mem_chunk mem_chunks[MAX_MEM_CHUNKS]; wma_tgt_cfg_cb tgt_cfg_update_cb; wma_dfs_radar_indication_cb dfs_radar_indication_cb; HAL_REG_CAPABILITIES reg_cap; @@ -1316,9 +1307,6 @@ typedef struct { uint32_t new_hw_mode_index; qdf_atomic_t scan_id_counter; wma_peer_authorized_fp peer_authorized_cb; - uint32_t num_of_diag_events_logs; - uint32_t *events_logs_list; - uint32_t wow_pno_match_wake_up_count; uint32_t wow_pno_complete_wake_up_count; uint32_t wow_gscan_wake_up_count; @@ -1343,7 +1331,6 @@ typedef struct { qdf_spinlock_t wmi_desc_pool_lock; } wmi_desc_pool; uint8_t max_scan; - struct wmi_init_cmd saved_wmi_init_cmd; uint16_t self_gen_frm_pwr; bool tx_chain_mask_cck; /* Going with a timer instead of wait event because on receiving the diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 2da1ef337057..8914e0e5f771 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -898,7 +898,7 @@ QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, uint32_t len); -int32_t wmi_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, +QDF_STATUS wma_unified_fw_profiling_cmd(wmi_unified_t wmi_handle, uint32_t cmd, uint32_t value1, uint32_t value2); void wma_wow_tx_complete(void *wma); diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index a4fe3fef8ec8..fef95c01f34c 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -113,10 +113,6 @@ static void wma_service_ready_ext_evt_timeout(void *data) goto end; } - if (wma_handle->saved_wmi_init_cmd.buf) { - wmi_buf_free(wma_handle->saved_wmi_init_cmd.buf); - wma_handle->saved_wmi_init_cmd.buf = NULL; - } end: /* Panic so that we can debug why FW is not responding */ QDF_BUG(0); @@ -994,7 +990,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, ret); break; case WMI_WLAN_PROFILE_TRIGGER_CMDID: - ret = wmi_unified_fw_profiling_cmd(wma->wmi_handle, + ret = wma_unified_fw_profiling_cmd(wma->wmi_handle, WMI_WLAN_PROFILE_TRIGGER_CMDID, privcmd->param_value, 0); if (ret) @@ -1002,7 +998,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, WMI_WLAN_PROFILE_TRIGGER_CMDID, ret); break; case WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID: - ret = wmi_unified_fw_profiling_cmd(wma->wmi_handle, + ret = wma_unified_fw_profiling_cmd(wma->wmi_handle, WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID, privcmd->param_value, privcmd->param_sec_value); @@ -1012,7 +1008,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, ret); break; case WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID: - ret = wmi_unified_fw_profiling_cmd(wma->wmi_handle, + ret = wma_unified_fw_profiling_cmd(wma->wmi_handle, WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID, privcmd->param_value, privcmd->param_sec_value); @@ -1022,7 +1018,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, ret); break; case WMI_WLAN_PROFILE_LIST_PROFILE_ID_CMDID: - ret = wmi_unified_fw_profiling_cmd(wma->wmi_handle, + ret = wma_unified_fw_profiling_cmd(wma->wmi_handle, WMI_WLAN_PROFILE_LIST_PROFILE_ID_CMDID, 0, 0); if (ret) @@ -1031,7 +1027,7 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, ret); break; case WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID: - ret = wmi_unified_fw_profiling_cmd(wma->wmi_handle, + ret = wma_unified_fw_profiling_cmd(wma->wmi_handle, WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID, 0, 0); if (ret) @@ -1794,7 +1790,6 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->dfs_radar_indication_cb = radar_ind_cb; wma_handle->old_hw_mode_index = WMA_DEFAULT_HW_MODE_INDEX; wma_handle->new_hw_mode_index = WMA_DEFAULT_HW_MODE_INDEX; - wma_handle->saved_wmi_init_cmd.buf = NULL; qdf_status = qdf_event_create(&wma_handle->wma_ready_event); if (qdf_status != QDF_STATUS_SUCCESS) { @@ -2173,32 +2168,12 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type, static int wma_set_base_macaddr_indicate(tp_wma_handle wma_handle, tSirMacAddr *customAddr) { - wmi_pdev_set_base_macaddr_cmd_fixed_param *cmd; - wmi_buf_t buf; int err; - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set_base_macaddr cmd"); - return -ENOMEM; - } - - cmd = (wmi_pdev_set_base_macaddr_cmd_fixed_param *) wmi_buf_data(buf); - qdf_mem_zero(cmd, sizeof(*cmd)); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_set_base_macaddr_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_set_base_macaddr_cmd_fixed_param)); - WMI_CHAR_ARRAY_TO_MAC_ADDR(*customAddr, &cmd->base_macaddr); - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), - WMI_PDEV_SET_BASE_MACADDR_CMDID); - if (err) { - WMA_LOGE("Failed to send set_base_macaddr cmd"); - qdf_mem_free(buf); + err = wmi_unified_set_base_macaddr_indicate_cmd(wma_handle->wmi_handle, + (uint8_t *)customAddr); + if (err) return -EIO; - } WMA_LOGD("Base MAC Addr: " MAC_ADDRESS_STR, MAC_ADDR_ARRAY((*customAddr))); @@ -2222,105 +2197,10 @@ static int wma_log_supported_evt_handler(void *handle, uint32_t len) { tp_wma_handle wma = (tp_wma_handle) handle; - uint32_t num_of_diag_events_logs; - wmi_diag_event_log_config_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t *cmd_args, *evt_args; - uint32_t buf_len, i; - - WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID_param_tlvs *param_buf; - wmi_diag_event_log_supported_event_fixed_params *wmi_event; - - WMA_LOGI("Received WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID"); - - param_buf = (WMI_DIAG_EVENT_LOG_SUPPORTED_EVENTID_param_tlvs *) event; - if (!param_buf) { - WMA_LOGE("Invalid log supported event buffer"); - return -EINVAL; - } - wmi_event = param_buf->fixed_param; - num_of_diag_events_logs = wmi_event->num_of_diag_events_logs; - evt_args = param_buf->diag_events_logs_list; - if (!evt_args) { - WMA_LOGE("%s: Event list is empty, num_of_diag_events_logs=%d", - __func__, num_of_diag_events_logs); - return -EINVAL; - } - - WMA_LOGD("%s: num_of_diag_events_logs=%d", - __func__, num_of_diag_events_logs); - - /* Free any previous allocation */ - if (wma->events_logs_list) - qdf_mem_free(wma->events_logs_list); - - /* Store the event list for run time enable/disable */ - wma->events_logs_list = qdf_mem_malloc(num_of_diag_events_logs * - sizeof(uint32_t)); - if (!wma->events_logs_list) { - WMA_LOGE("%s: event log list memory allocation failed", - __func__); - return -ENOMEM; - } - wma->num_of_diag_events_logs = num_of_diag_events_logs; - - /* Prepare the send buffer */ - buf_len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + - (num_of_diag_events_logs * sizeof(uint32_t)); - - buf = wmi_buf_alloc(wma->wmi_handle, buf_len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - qdf_mem_free(wma->events_logs_list); - wma->events_logs_list = NULL; - return -ENOMEM; - } - - cmd = (wmi_diag_event_log_config_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_diag_event_log_config_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_diag_event_log_config_fixed_param)); - - cmd->num_of_diag_events_logs = num_of_diag_events_logs; - - buf_ptr += sizeof(wmi_diag_event_log_config_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (num_of_diag_events_logs * sizeof(uint32_t))); - - cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); - - /* Populate the events */ - for (i = 0; i < num_of_diag_events_logs; i++) { - /* Low freq (0) - Enable (1) the event - * High freq (1) - Disable (0) the event - */ - WMI_DIAG_ID_ENABLED_DISABLED_SET(cmd_args[i], - !(WMI_DIAG_FREQUENCY_GET(evt_args[i]))); - /* Set the event ID */ - WMI_DIAG_ID_SET(cmd_args[i], - WMI_DIAG_ID_GET(evt_args[i])); - /* Set the type */ - WMI_DIAG_TYPE_SET(cmd_args[i], - WMI_DIAG_TYPE_GET(evt_args[i])); - /* Storing the event/log list in WMA */ - wma->events_logs_list[i] = evt_args[i]; - } - - if (wmi_unified_cmd_send(wma->wmi_handle, buf, buf_len, - WMI_DIAG_EVENT_LOG_CONFIG_CMDID)) { - WMA_LOGE("%s: WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed", - __func__); - wmi_buf_free(buf); - /* Not clearing events_logs_list, though wmi cmd failed. - * Host can still have this list - */ + if (wmi_unified_log_supported_evt_cmd(wma->wmi_handle, + event, len)) return -EINVAL; - } return 0; } @@ -3178,17 +3058,6 @@ QDF_STATUS wma_close(void *cds_ctx) WMA_LOGI("%s: DBS list is freed", __func__); } - if (wma_handle->events_logs_list) { - qdf_mem_free(wma_handle->events_logs_list); - wma_handle->events_logs_list = NULL; - WMA_LOGD("%s: Event log list freed", __func__); - } - - if (wma_handle->saved_wmi_init_cmd.buf) { - wmi_buf_free(wma_handle->saved_wmi_init_cmd.buf); - wma_handle->saved_wmi_init_cmd.buf = NULL; - } - if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) { #ifdef FEATURE_WLAN_SCAN_PNO qdf_wake_lock_destroy(&wma_handle->pno_wake_lock); @@ -3623,55 +3492,25 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle) * * Return: wmi buffer or NULL for error */ -static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, - wmi_service_ready_event_fixed_param *ev, - WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf, - uint32_t *len) +static int wma_setup_wmi_init_msg(tp_wma_handle wma_handle, + wmi_service_ready_event_fixed_param *ev, + WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf) { - wmi_buf_t buf; - wmi_init_cmd_fixed_param *cmd; wlan_host_mem_req *ev_mem_reqs; wmi_abi_version my_vers; + wmi_abi_version host_abi_vers; int num_whitelist; - uint8_t *buf_ptr; - wmi_resource_config *resource_cfg; - wlan_host_memory_chunk *host_mem_chunks; - uint32_t mem_chunk_len = 0; uint16_t idx; uint32_t num_units; - *len = sizeof(*cmd) + sizeof(wmi_resource_config) + WMI_TLV_HDR_SIZE; - mem_chunk_len = (sizeof(wlan_host_memory_chunk) * MAX_MEM_CHUNKS); - buf = wmi_buf_alloc(wma_handle->wmi_handle, *len + mem_chunk_len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return NULL; - } - ev_mem_reqs = param_buf->mem_reqs; - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_init_cmd_fixed_param *) buf_ptr; - resource_cfg = (wmi_resource_config *) (buf_ptr + sizeof(*cmd)); - host_mem_chunks = (wlan_host_memory_chunk *) - (buf_ptr + sizeof(*cmd) + sizeof(wmi_resource_config) - + WMI_TLV_HDR_SIZE); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_init_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_init_cmd_fixed_param)); - - *resource_cfg = wma_handle->wlan_resource_config; - WMITLV_SET_HDR(&resource_cfg->tlv_header, - WMITLV_TAG_STRUC_wmi_resource_config, - WMITLV_GET_STRUCT_TLVLEN(wmi_resource_config)); /* allocate memory requested by FW */ if (ev->num_mem_reqs > WMI_MAX_MEM_REQS) { QDF_ASSERT(0); - qdf_nbuf_free(buf); - return NULL; + return QDF_STATUS_E_NOMEM; } - cmd->num_host_mem_chunks = 0; for (idx = 0; idx < ev->num_mem_reqs; ++idx) { num_units = ev_mem_reqs[idx].num_units; if (ev_mem_reqs[idx].num_unit_info & NUM_UNITS_IS_NUM_PEERS) { @@ -3681,7 +3520,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, * target. this needs to be fied, host * and target can get out of sync */ - num_units = resource_cfg->num_peers + 1; + num_units = wma_handle->wlan_resource_config.num_peers + 1; } WMA_LOGD ("idx %d req %d num_units %d num_unit_info %d unit size %d actual units %d ", @@ -3692,25 +3531,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, wma_alloc_host_mem(wma_handle, ev_mem_reqs[idx].req_id, num_units, ev_mem_reqs[idx].unit_size); } - for (idx = 0; idx < wma_handle->num_mem_chunks; ++idx) { - WMITLV_SET_HDR(&(host_mem_chunks[idx].tlv_header), - WMITLV_TAG_STRUC_wlan_host_memory_chunk, - WMITLV_GET_STRUCT_TLVLEN - (wlan_host_memory_chunk)); - host_mem_chunks[idx].ptr = wma_handle->mem_chunks[idx].paddr; - host_mem_chunks[idx].size = wma_handle->mem_chunks[idx].len; - host_mem_chunks[idx].req_id = - wma_handle->mem_chunks[idx].req_id; - WMA_LOGD("chunk %d len %d requested ,ptr 0x%x ", - idx, host_mem_chunks[idx].size, - host_mem_chunks[idx].ptr); - } - cmd->num_host_mem_chunks = wma_handle->num_mem_chunks; - len += (wma_handle->num_mem_chunks * sizeof(wlan_host_memory_chunk)); - WMITLV_SET_HDR((buf_ptr + sizeof(*cmd) + sizeof(wmi_resource_config)), - WMITLV_TAG_ARRAY_STRUC, - (sizeof(wlan_host_memory_chunk) * - wma_handle->num_mem_chunks)); + qdf_mem_copy(&wma_handle->target_abi_vers, ¶m_buf->fixed_param->fw_abi_vers, sizeof(wmi_abi_version)); @@ -3726,19 +3547,12 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle, wmi_cmp_and_set_abi_version(num_whitelist, version_whitelist, &my_vers, ¶m_buf->fixed_param->fw_abi_vers, - &cmd->host_abi_vers); - - WMA_LOGD("%s: INIT_CMD version: %d, %d, 0x%x, 0x%x, 0x%x, 0x%x", - __func__, WMI_VER_GET_MAJOR(cmd->host_abi_vers.abi_version_0), - WMI_VER_GET_MINOR(cmd->host_abi_vers.abi_version_0), - cmd->host_abi_vers.abi_version_ns_0, - cmd->host_abi_vers.abi_version_ns_1, - cmd->host_abi_vers.abi_version_ns_2, - cmd->host_abi_vers.abi_version_ns_3); + &host_abi_vers); - qdf_mem_copy(&wma_handle->final_abi_vers, &cmd->host_abi_vers, + qdf_mem_copy(&wma_handle->final_abi_vers, &host_abi_vers, sizeof(wmi_abi_version)); - return buf; + + return QDF_STATUS_SUCCESS; } /** @@ -3860,8 +3674,6 @@ done: int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, uint32_t length) { - wmi_buf_t buf; - uint32_t len; tp_wma_handle wma_handle = (tp_wma_handle) handle; struct wma_target_cap target_cap; WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf; @@ -4079,9 +3891,16 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, sizeof(wma_handle->wmi_service_bitmap)); wma_handle->wlan_resource_config = target_cap.wlan_resource_config; - buf = wma_setup_wmi_init_msg(wma_handle, ev, param_buf, &len); - if (!buf) { - WMA_LOGE("Failed to setup buffer for wma init command"); + status = wmi_unified_save_fw_version_cmd(wma_handle->wmi_handle, + param_buf); + if (status != EOK) { + WMA_LOGE("Failed to send WMI_INIT_CMDID command"); + return -EINVAL; + } + + status = wma_setup_wmi_init_msg(wma_handle, ev, param_buf); + if (status != EOK) { + WMA_LOGE("Failed to setup for wma init command"); return -EINVAL; } @@ -4096,19 +3915,23 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, * Send INIT command immediately */ WMA_LOGA("WMA --> WMI_INIT_CMDID"); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_INIT_CMDID); + status = wmi_unified_send_init_cmd(wma_handle->wmi_handle, + &wma_handle->wlan_resource_config, + wma_handle->num_mem_chunks, + wma_handle->mem_chunks, 1); if (status != EOK) { WMA_LOGE("Failed to send WMI_INIT_CMDID command"); - wmi_buf_free(buf); return -EINVAL; } } else { - /* Need to save and send the WMI INIT command only after - * processing service ready extended event - */ - wma_handle->saved_wmi_init_cmd.buf = buf; - wma_handle->saved_wmi_init_cmd.buf_len = len; + status = wmi_unified_send_init_cmd(wma_handle->wmi_handle, + &wma_handle->wlan_resource_config, + wma_handle->num_mem_chunks, + wma_handle->mem_chunks, 0); + if (status != EOK) { + WMA_LOGE("Failed to save WMI_INIT_CMDID command parameter"); + return -EINVAL; + } /* The saved 'buf' will be freed after sending INIT command or * in other cases as required */ @@ -4162,11 +3985,6 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event, WMA_LOGA("WMA <-- WMI_SERVICE_READY_EXT_EVENTID"); - if (!wma_handle->saved_wmi_init_cmd.buf) { - WMA_LOGP("Service ready ext event w/o WMI_SERVICE_EXT_MSG!"); - return -EINVAL; - } - WMA_LOGA("%s: Defaults: scan config:%x FW mode config:%x", __func__, ev->default_conc_scan_config_bits, ev->default_fw_config_bits); @@ -4178,19 +3996,12 @@ int wma_rx_service_ready_ext_event(void *handle, uint8_t *event, } WMA_LOGA("WMA --> WMI_INIT_CMDID"); - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, - wma_handle->saved_wmi_init_cmd.buf, - wma_handle->saved_wmi_init_cmd.buf_len, - WMI_INIT_CMDID); - if (status != EOK) { + status = wmi_unified_send_saved_init_cmd(wma_handle->wmi_handle); + if (status != EOK) /* In success case, WMI layer will free after getting copy * engine TX complete interrupt */ WMA_LOGE("Failed to send WMI_INIT_CMDID command"); - wmi_buf_free(wma_handle->saved_wmi_init_cmd.buf); - } - wma_handle->saved_wmi_init_cmd.buf = NULL; wma_init_scan_fw_mode_config(wma_handle, ev->default_conc_scan_config_bits, @@ -4569,13 +4380,6 @@ static QDF_STATUS wma_config_guard_time(tp_wma_handle wma, void wma_enable_specific_fw_logs(tp_wma_handle wma_handle, struct sir_wifi_start_log *start_log) { - wmi_diag_event_log_config_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t len, count, log_level, i; - uint32_t *cmd_args; - uint32_t total_len; - count = 0; if (!start_log) { WMA_LOGE("%s: start_log pointer is NULL", __func__); @@ -4593,75 +4397,9 @@ void wma_enable_specific_fw_logs(tp_wma_handle wma_handle, return; } - if (!wma_handle->events_logs_list) { - WMA_LOGE("%s: Not received event/log list from FW, yet", - __func__); - return; - } - - /* total_len stores the number of events where BITS 17 and 18 are set. - * i.e., events of high frequency (17) and for extended debugging (18) - */ - total_len = 0; - for (i = 0; i < wma_handle->num_of_diag_events_logs; i++) { - if ((WMI_DIAG_FREQUENCY_GET(wma_handle->events_logs_list[i])) && - (WMI_DIAG_EXT_FEATURE_GET(wma_handle->events_logs_list[i]))) - total_len++; - } - - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + - (total_len * sizeof(uint32_t)); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return; - } - cmd = (wmi_diag_event_log_config_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_diag_event_log_config_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_diag_event_log_config_fixed_param)); - - cmd->num_of_diag_events_logs = total_len; - - buf_ptr += sizeof(wmi_diag_event_log_config_fixed_param); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (total_len * sizeof(uint32_t))); - - cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); - - if (start_log->verbose_level >= LOG_LEVEL_ACTIVE) - log_level = 1; - else - log_level = 0; - - WMA_LOGD("%s: Length:%d, Log_level:%d", __func__, total_len, log_level); - for (i = 0; i < wma_handle->num_of_diag_events_logs; i++) { - uint32_t val = wma_handle->events_logs_list[i]; - if ((WMI_DIAG_FREQUENCY_GET(val)) && - (WMI_DIAG_EXT_FEATURE_GET(val))) { - - WMI_DIAG_ID_SET(cmd_args[count], - WMI_DIAG_ID_GET(val)); - WMI_DIAG_TYPE_SET(cmd_args[count], - WMI_DIAG_TYPE_GET(val)); - WMI_DIAG_ID_ENABLED_DISABLED_SET(cmd_args[count], - log_level); - WMA_LOGD("%s: Idx:%d, val:%x", __func__, i, val); - count++; - } - } + wmi_unified_enable_specific_fw_logs_cmd(wma_handle->wmi_handle, + (struct wmi_wifi_start_log *)start_log); - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_DIAG_EVENT_LOG_CONFIG_CMDID)) { - WMA_LOGE("%s: WMI_DIAG_EVENT_LOG_CONFIG_CMDID failed", - __func__); - wmi_buf_free(buf); - } return; } @@ -4726,34 +4464,11 @@ void wma_set_wifi_start_packet_stats(void *wma_handle, void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle) { QDF_STATUS status; - wmi_debug_mesg_flush_fixed_param *cmd; - wmi_buf_t buf; - int len = sizeof(*cmd); int ret; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); + ret = wmi_unified_flush_logs_to_fw_cmd(wma_handle->wmi_handle); + if (ret != EOK) return; - } - - cmd = (wmi_debug_mesg_flush_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_debug_mesg_flush_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_debug_mesg_flush_fixed_param)); - cmd->reserved0 = 0; - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, - buf, - len, - WMI_DEBUG_MESG_FLUSH_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send WMI_DEBUG_MESG_FLUSH_CMDID"); - wmi_buf_free(buf); - return; - } - WMA_LOGI("Sent WMI_DEBUG_MESG_FLUSH_CMDID to FW"); status = qdf_mc_timer_start(&wma_handle->log_completion_timer, WMA_LOG_COMPLETION_TIMER); @@ -5524,48 +5239,16 @@ void wma_log_completion_timeout(void *data) QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, struct sir_pcl_list *msg) { - wmi_soc_set_pcl_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint32_t *cmd_args, i, len; - if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); return QDF_STATUS_E_NULL_VALUE; } - len = sizeof(*cmd) + - WMI_TLV_HDR_SIZE + (msg->pcl_len * sizeof(uint32_t)); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_soc_set_pcl_cmd_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_soc_set_pcl_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_soc_set_pcl_cmd_fixed_param)); - cmd->num_chan = msg->pcl_len; - WMA_LOGI("%s: PCL len:%d", __func__, cmd->num_chan); - - buf_ptr += sizeof(wmi_soc_set_pcl_cmd_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (msg->pcl_len * sizeof(uint32_t))); - cmd_args = (uint32_t *) (buf_ptr + WMI_TLV_HDR_SIZE); - for (i = 0; i < msg->pcl_len ; i++) { - cmd_args[i] = msg->pcl_list[i]; - WMA_LOGI("%s: PCL chan:%d", __func__, cmd_args[i]); - } - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_SOC_SET_PCL_CMDID)) { - WMA_LOGE("%s: Failed to send WMI_SOC_SET_PCL_CMDID", __func__); - qdf_nbuf_free(buf); + if (wmi_unified_soc_set_pcl_cmd(wma_handle->wmi_handle, + (struct wmi_pcl_list *) msg)) return QDF_STATUS_E_FAILURE; - } + return QDF_STATUS_SUCCESS; } @@ -5586,9 +5269,6 @@ QDF_STATUS wma_send_soc_set_pcl_cmd(tp_wma_handle wma_handle, QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, struct sir_hw_mode *msg) { - wmi_soc_set_hw_mode_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint32_t len; struct sir_set_hw_mode_resp *param; if (!wma_handle) { @@ -5606,28 +5286,10 @@ QDF_STATUS wma_send_soc_set_hw_mode_cmd(tp_wma_handle wma_handle, goto fail; } - len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); + if (wmi_unified_soc_set_hw_mode_cmd(wma_handle->wmi_handle, + msg->hw_mode_index)) goto fail; - } - cmd = (wmi_soc_set_hw_mode_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_soc_set_hw_mode_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_soc_set_hw_mode_cmd_fixed_param)); - cmd->hw_mode_index = msg->hw_mode_index; - WMA_LOGI("%s: HW mode index:%d", __func__, cmd->hw_mode_index); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_SOC_SET_HW_MODE_CMDID)) { - WMA_LOGE("%s: Failed to send WMI_SOC_SET_HW_MODE_CMDID", - __func__); - qdf_nbuf_free(buf); - goto fail; - } return QDF_STATUS_SUCCESS; fail: param = qdf_mem_malloc(sizeof(*param)); @@ -5656,10 +5318,6 @@ fail: QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg) { - wmi_soc_set_dual_mac_config_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint32_t len; - if (!wma_handle) { WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", __func__); @@ -5671,33 +5329,12 @@ QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, return QDF_STATUS_E_NULL_VALUE; } - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_FAILURE; - } - - cmd = (wmi_soc_set_dual_mac_config_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_soc_set_dual_mac_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_soc_set_dual_mac_config_cmd_fixed_param)); - cmd->concurrent_scan_config_bits = msg->scan_config; - cmd->fw_mode_config_bits = msg->fw_mode_config; - WMA_LOGI("%s: scan_config:%x fw_mode_config:%x", - __func__, msg->scan_config, msg->fw_mode_config); - - wma_handle->dual_mac_cfg.req_scan_config = msg->scan_config; - wma_handle->dual_mac_cfg.req_fw_mode_config = msg->fw_mode_config; - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID)) { + if (wmi_unified_soc_set_dual_mac_config_cmd(wma_handle->wmi_handle, + (struct wmi_dual_mac_config *)msg)) WMA_LOGE("%s: Failed to send WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID", __func__); - qdf_nbuf_free(buf); - } + return QDF_STATUS_SUCCESS; } -- cgit v1.2.3 From b30d4c0c716048fe9b4f82515e5a8398d69bed69 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Thu, 24 Mar 2016 11:01:23 +0530 Subject: qcacld-3.0: Refactor formation of wmi peer assoc command Move tlv formation of wmi peer assoc command to common wmi layer from wma layer. CRs-Fixed: 976998 Change-Id: I0562862a7acc16b88bbd295b998397f1acf7973a --- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_dev_if.c | 12 +++--- core/wma/src/wma_mgmt.c | 98 +++++++++++++++------------------------------ 3 files changed, 40 insertions(+), 72 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 8914e0e5f771..8c9a583552ed 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -617,7 +617,7 @@ int wma_vdev_install_key_complete_event_handler(void *handle, uint8_t *event, uint32_t len); -int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, +QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, tSirNwType nw_type, tpAddStaParams params); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 655507323b12..9c765d419d58 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -3364,7 +3364,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("Sent PKT_PWR_SAVE_5G_EBT cmd to target, val = %x, status = %d", pps_val, status); - wmi_unified_send_peer_assoc(wma, add_bss->nwType, + wma_send_peer_assoc(wma, add_bss->nwType, &add_bss->staContext); peer_assoc_sent = true; #ifdef WLAN_FEATURE_11W @@ -3589,7 +3589,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) WMA_LOGE(FL("WMI_SERVICE_PEER_ASSOC_CONF not enabled")); } - ret = wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); + ret = wma_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId, @@ -3805,11 +3805,11 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) WMA_LOGE(FL("WMI_SERVICE_PEER_ASSOC_CONF not enabled")); } - WMA_LOGD("%s: changeSta, calling wmi_unified_send_peer_assoc", + WMA_LOGD("%s: changeSta, calling wma_send_peer_assoc", __func__); ret = - wmi_unified_send_peer_assoc(wma, add_sta->nwType, add_sta); + wma_send_peer_assoc(wma, add_sta->nwType, add_sta); if (ret) { add_sta->status = QDF_STATUS_E_FAILURE; wma_remove_peer(wma, add_sta->staMac, @@ -3909,7 +3909,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (wma_is_roam_synch_in_progress(wma, params->smesessionId)) { /* iface->nss = params->nss; */ /*In LFR2.0, the following operations are performed as - * part of wmi_unified_send_peer_assoc. As we are + * part of wma_send_peer_assoc. As we are * skipping this operation, we are just executing the * following which are useful for LFR3.0.*/ ol_txrx_peer_state_update(pdev, params->bssId, @@ -3946,7 +3946,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) WMA_LOGE(FL("WMI_SERVICE_PEER_ASSOC_CONF not enabled")); } - ret = wmi_unified_send_peer_assoc(wma, + ret = wma_send_peer_assoc(wma, iface->nwType, (tAddStaParams *) iface->addBssStaContext); if (ret) { diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 5abbf53910d2..89676b4c3cae 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -828,44 +828,44 @@ static inline uint8_t wma_parse_mpdudensity(uint8_t mpdudensity) * This function send peer assoc command to firmware with * different parameters. * - * Return: 0 for success or error code + * Return: QDF_STATUS */ -int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, +QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, tSirNwType nw_type, tpAddStaParams params) { ol_txrx_pdev_handle pdev; - wmi_peer_assoc_complete_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len; + struct peer_assoc_params *cmd; int32_t ret, max_rates, i; uint8_t rx_stbc, tx_stbc; - uint8_t *rate_pos, *buf_ptr; + uint8_t *rate_pos; wmi_rate_set peer_legacy_rates, peer_ht_rates; - wmi_vht_rate_set *mcs; - uint32_t num_peer_legacy_rates; - uint32_t num_peer_ht_rates; uint32_t num_peer_11b_rates = 0; uint32_t num_peer_11a_rates = 0; uint32_t phymode; uint32_t peer_nss = 1; struct wma_txrx_node *intr = NULL; + QDF_STATUS status; - if (NULL == params) { - WMA_LOGE("%s: params is NULL", __func__); - return -EINVAL; + cmd = qdf_mem_malloc(sizeof(struct peer_assoc_params)); + if (!cmd) { + WMA_LOGE("Failed to allocate peer_assoc_params param"); + return QDF_STATUS_E_NOMEM; } + intr = &wma->interfaces[params->smesessionId]; pdev = cds_get_context(QDF_MODULE_ID_TXRX); if (NULL == pdev) { WMA_LOGE("%s: Failed to get pdev", __func__); - return -EINVAL; + qdf_mem_free(cmd); + return QDF_STATUS_E_INVAL; } qdf_mem_zero(&peer_legacy_rates, sizeof(wmi_rate_set)); qdf_mem_zero(&peer_ht_rates, sizeof(wmi_rate_set)); + qdf_mem_zero(cmd, sizeof(struct peer_assoc_params)); phymode = wma_peer_phymode(nw_type, params->staType, params->htCapable, @@ -893,11 +893,9 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, (phymode == MODE_11B && num_peer_11b_rates == 0)) { WMA_LOGW("%s: Invalid phy rates. phymode 0x%x, 11b_rates %d, 11a_rates %d", __func__, phymode, num_peer_11b_rates, num_peer_11a_rates); - return -EINVAL; + qdf_mem_free(cmd); + return QDF_STATUS_E_INVAL; } - /* Set the Legacy Rates to Word Aligned */ - num_peer_legacy_rates = roundup(peer_legacy_rates.num_rates, - sizeof(uint32_t)); /* HT Rateset */ max_rates = sizeof(peer_ht_rates.rates) / @@ -934,28 +932,6 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, peer_ht_rates.num_rates); } - /* Set the Peer HT Rates to Word Aligned */ - num_peer_ht_rates = roundup(peer_ht_rates.num_rates, sizeof(uint32_t)); - - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + /* Place holder for peer legacy rate array */ - (num_peer_legacy_rates * sizeof(uint8_t)) + /* peer legacy rate array size */ - WMI_TLV_HDR_SIZE + /* Place holder for peer Ht rate array */ - (num_peer_ht_rates * sizeof(uint8_t)) + /* peer HT rate array size */ - sizeof(wmi_vht_rate_set); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_peer_assoc_complete_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_peer_assoc_complete_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_peer_assoc_complete_cmd_fixed_param)); - /* in ap/ibss mode and for tdls peer, use mac address of the peer in * the other end as the new peer address; in sta mode, use bss id to * be the new peer address @@ -1076,7 +1052,7 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, WMA_LOGE ("Set WMI_VDEV_PARAM_DROP_UNENCRY Param status:%d\n", ret); - qdf_nbuf_free(buf); + qdf_mem_free(cmd); return ret; } } @@ -1096,24 +1072,16 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, cmd->peer_rate_caps |= WMI_RC_DS_FLAG; /* Update peer legacy rate information */ - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, num_peer_legacy_rates); - buf_ptr += WMI_TLV_HDR_SIZE; - cmd->num_peer_legacy_rates = peer_legacy_rates.num_rates; - qdf_mem_copy(buf_ptr, peer_legacy_rates.rates, + cmd->peer_legacy_rates.num_rates = peer_legacy_rates.num_rates; + qdf_mem_copy(cmd->peer_legacy_rates.rates, peer_legacy_rates.rates, peer_legacy_rates.num_rates); /* Update peer HT rate information */ - buf_ptr += num_peer_legacy_rates; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, num_peer_ht_rates); - buf_ptr += WMI_TLV_HDR_SIZE; - cmd->num_peer_ht_rates = peer_ht_rates.num_rates; - qdf_mem_copy(buf_ptr, peer_ht_rates.rates, peer_ht_rates.num_rates); + cmd->peer_ht_rates.num_rates = peer_ht_rates.num_rates; + qdf_mem_copy(cmd->peer_ht_rates.rates, peer_ht_rates.rates, + peer_ht_rates.num_rates); /* VHT Rates */ - buf_ptr += num_peer_ht_rates; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_STRUC_wmi_vht_rate_set, - WMITLV_GET_STRUCT_TLVLEN(wmi_vht_rate_set)); cmd->peer_nss = peer_nss; /* @@ -1131,18 +1099,18 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, WMA_LOGD("peer_nss %d peer_ht_rates.num_rates %d ", cmd->peer_nss, peer_ht_rates.num_rates); - mcs = (wmi_vht_rate_set *) buf_ptr; + cmd->vht_capable = params->vhtCapable; if (params->vhtCapable) { #define VHT2x2MCSMASK 0xc - mcs->rx_max_rate = params->supportedRates.vhtRxHighestDataRate; - mcs->rx_mcs_set = params->supportedRates.vhtRxMCSMap; - mcs->tx_max_rate = params->supportedRates.vhtTxHighestDataRate; - mcs->tx_mcs_set = params->supportedRates.vhtTxMCSMap; + cmd->rx_max_rate = params->supportedRates.vhtRxHighestDataRate; + cmd->rx_mcs_set = params->supportedRates.vhtRxMCSMap; + cmd->tx_max_rate = params->supportedRates.vhtTxHighestDataRate; + cmd->tx_mcs_set = params->supportedRates.vhtTxMCSMap; if (params->vhtSupportedRxNss) { cmd->peer_nss = params->vhtSupportedRxNss; } else { - cmd->peer_nss = ((mcs->rx_mcs_set & VHT2x2MCSMASK) + cmd->peer_nss = ((cmd->rx_mcs_set & VHT2x2MCSMASK) == VHT2x2MCSMASK) ? 1 : 2; } } @@ -1166,14 +1134,14 @@ int32_t wmi_unified_send_peer_assoc(tp_wma_handle wma, cmd->peer_mpdu_density, params->encryptType, cmd->peer_vht_caps); - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PEER_ASSOC_CMDID); - if (ret != EOK) { + status = wmi_unified_peer_assoc_send(wma->wmi_handle, + cmd); + if (QDF_IS_STATUS_ERROR(status)) WMA_LOGP("%s: Failed to send peer assoc command ret = %d", __func__, ret); - qdf_nbuf_free(buf); - } - return ret; + qdf_mem_free(cmd); + + return status; } /** -- cgit v1.2.3 From 17dea6eb82bbcce778964de2550a9e9f81a50de7 Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Wed, 9 Mar 2016 12:11:22 +0530 Subject: qcacld-3.0: Refactor formation of wmi data commands Move tlv formation of wmi datapath related commands to common wmi layer from wma layer. Change-Id: I5f7bf9eb578d0777e131b2b659e64d9365f4faec CRs-Fixed: 987362 --- core/wma/src/wma_data.c | 280 ++++++------------------------------------------ 1 file changed, 32 insertions(+), 248 deletions(-) diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 4fc9f6361d8d..5c8550587ef6 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -994,12 +994,7 @@ int wma_peer_state_change_event_handler(void *handle, QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t mcc_adaptive_scheduler) { - int ret = -1; - wmi_buf_t buf = 0; - wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param *cmd = NULL; tp_wma_handle wma = NULL; - uint16_t len = - sizeof(wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param); wma = cds_get_context(QDF_MODULE_ID_WMA); if (NULL == wma) { @@ -1007,28 +1002,8 @@ QDF_STATUS wma_set_enable_disable_mcc_adaptive_scheduler(uint32_t return QDF_STATUS_E_FAULT; } - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - cmd = (wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_resmgr_adaptive_ocs_enable_disable_cmd_fixed_param)); - cmd->enable = mcc_adaptive_scheduler; - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_RESMGR_ADAPTIVE_OCS_ENABLE_DISABLE_CMDID); - if (ret) { - WMA_LOGP("%s: Failed to send enable/disable MCC" - " adaptive scheduler command", __func__); - qdf_nbuf_free(buf); - } - return QDF_STATUS_SUCCESS; + return wmi_unified_set_enable_disable_mcc_adaptive_scheduler_cmd( + wma->wmi_handle, mcc_adaptive_scheduler); } /** @@ -1047,19 +1022,10 @@ QDF_STATUS wma_set_mcc_channel_time_latency (tp_wma_handle wma, uint32_t mcc_channel, uint32_t mcc_channel_time_latency) { - int ret = -1; - wmi_buf_t buf = 0; - wmi_resmgr_set_chan_latency_cmd_fixed_param *cmdTL = NULL; - uint16_t len = 0; - uint8_t *buf_ptr = NULL; uint32_t cfg_val = 0; - wmi_resmgr_chan_latency chan_latency; struct sAniSirGlobal *pMac = NULL; - /* Note: we only support MCC time latency for a single channel */ - uint32_t num_channels = 1; uint32_t channel1 = mcc_channel; uint32_t chan1_freq = cds_chan_to_freq(channel1); - uint32_t latency_chan1 = mcc_channel_time_latency; if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); @@ -1081,7 +1047,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency } /* Confirm MCC adaptive scheduler feature is disabled */ if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, - &cfg_val) == eSIR_SUCCESS) { + &cfg_val) == eSIR_SUCCESS) { if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) { WMA_LOGD("%s: Can't set channel latency while MCC " "ADAPTIVE SCHED is enabled. Exit", __func__); @@ -1093,52 +1059,10 @@ QDF_STATUS wma_set_mcc_channel_time_latency QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - /* If 0ms latency is provided, then FW will set to a default. - * Otherwise, latency must be at least 30ms. - */ - if ((latency_chan1 > 0) && - (latency_chan1 < WMI_MCC_MIN_NON_ZERO_CHANNEL_LATENCY)) { - WMA_LOGE("%s: Invalid time latency for Channel #1 = %dms " - "Minimum is 30ms (or 0 to use default value by " - "firmware)", __func__, latency_chan1); - return QDF_STATUS_E_INVAL; - } - /* Set WMI CMD for channel time latency here */ - len = sizeof(wmi_resmgr_set_chan_latency_cmd_fixed_param) + - WMI_TLV_HDR_SIZE + /*Place holder for chan_time_latency array */ - num_channels * sizeof(wmi_resmgr_chan_latency); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmdTL = (wmi_resmgr_set_chan_latency_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmdTL->tlv_header, - WMITLV_TAG_STRUC_wmi_resmgr_set_chan_latency_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_resmgr_set_chan_latency_cmd_fixed_param)); - cmdTL->num_chans = num_channels; - /* Update channel time latency information for home channel(s) */ - buf_ptr += sizeof(*cmdTL); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, - num_channels * sizeof(wmi_resmgr_chan_latency)); - buf_ptr += WMI_TLV_HDR_SIZE; - chan_latency.chan_mhz = chan1_freq; - chan_latency.latency = latency_chan1; - qdf_mem_copy(buf_ptr, &chan_latency, sizeof(chan_latency)); - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_RESMGR_SET_CHAN_LATENCY_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send MCC Channel Time Latency command", - __func__); - qdf_nbuf_free(buf); - QDF_ASSERT(0); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_set_mcc_channel_time_latency_cmd(wma->wmi_handle, + chan1_freq, + mcc_channel_time_latency); } /** @@ -1162,29 +1086,11 @@ QDF_STATUS wma_set_mcc_channel_time_quota uint32_t adapter_1_chan_number, uint32_t adapter_1_quota, uint32_t adapter_2_chan_number) { - int ret = -1; - wmi_buf_t buf = 0; - uint16_t len = 0; - uint8_t *buf_ptr = NULL; uint32_t cfg_val = 0; struct sAniSirGlobal *pMac = NULL; - wmi_resmgr_set_chan_time_quota_cmd_fixed_param *cmdTQ = NULL; - wmi_resmgr_chan_time_quota chan_quota; - uint32_t channel1 = adapter_1_chan_number; - uint32_t channel2 = adapter_2_chan_number; - uint32_t quota_chan1 = adapter_1_quota; - /* Knowing quota of 1st chan., derive quota for 2nd chan. */ - uint32_t quota_chan2 = 100 - quota_chan1; - /* Note: setting time quota for MCC requires info for 2 channels */ - uint32_t num_channels = 2; uint32_t chan1_freq = cds_chan_to_freq(adapter_1_chan_number); uint32_t chan2_freq = cds_chan_to_freq(adapter_2_chan_number); - WMA_LOGD("%s: Channel1:%d, freq1:%dMHz, Quota1:%dms, " - "Channel2:%d, freq2:%dMHz, Quota2:%dms", __func__, - channel1, chan1_freq, quota_chan1, channel2, chan2_freq, - quota_chan2); - if (!wma) { WMA_LOGE("%s:NULL wma ptr. Exiting", __func__); QDF_ASSERT(0); @@ -1206,7 +1112,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota /* Confirm MCC adaptive scheduler feature is disabled */ if (wlan_cfg_get_int(pMac, WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED, - &cfg_val) == eSIR_SUCCESS) { + &cfg_val) == eSIR_SUCCESS) { if (cfg_val == WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED_STAMAX) { WMA_LOGD("%s: Can't set channel quota while " "MCC_ADAPTIVE_SCHED is enabled. Exit", @@ -1220,57 +1126,10 @@ QDF_STATUS wma_set_mcc_channel_time_quota return QDF_STATUS_E_FAILURE; } - /* - * Perform sanity check on time quota values provided. - */ - if (quota_chan1 < WMI_MCC_MIN_CHANNEL_QUOTA || - quota_chan1 > WMI_MCC_MAX_CHANNEL_QUOTA) { - WMA_LOGE("%s: Invalid time quota for Channel #1=%dms. Minimum " - "is 20ms & maximum is 80ms", __func__, quota_chan1); - return QDF_STATUS_E_INVAL; - } - /* Set WMI CMD for channel time quota here */ - len = sizeof(wmi_resmgr_set_chan_time_quota_cmd_fixed_param) + - WMI_TLV_HDR_SIZE + /* Place holder for chan_time_quota array */ - num_channels * sizeof(wmi_resmgr_chan_time_quota); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - QDF_ASSERT(0); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmdTQ = (wmi_resmgr_set_chan_time_quota_cmd_fixed_param *) - wmi_buf_data(buf); - WMITLV_SET_HDR(&cmdTQ->tlv_header, - WMITLV_TAG_STRUC_wmi_resmgr_set_chan_time_quota_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_resmgr_set_chan_time_quota_cmd_fixed_param)); - cmdTQ->num_chans = num_channels; - - /* Update channel time quota information for home channel(s) */ - buf_ptr += sizeof(*cmdTQ); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, - num_channels * sizeof(wmi_resmgr_chan_time_quota)); - buf_ptr += WMI_TLV_HDR_SIZE; - chan_quota.chan_mhz = chan1_freq; - chan_quota.channel_time_quota = quota_chan1; - qdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); - /* Construct channel and quota record for the 2nd MCC mode. */ - buf_ptr += sizeof(chan_quota); - chan_quota.chan_mhz = chan2_freq; - chan_quota.channel_time_quota = quota_chan2; - qdf_mem_copy(buf_ptr, &chan_quota, sizeof(chan_quota)); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID); - if (ret) { - WMA_LOGE("Failed to send MCC Channel Time Quota command"); - qdf_nbuf_free(buf); - QDF_ASSERT(0); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_set_mcc_channel_time_quota_cmd(wma->wmi_handle, + chan1_freq, + adapter_1_quota, + chan2_freq); } /** @@ -1975,42 +1834,20 @@ QDF_STATUS wma_process_set_thermal_level(tp_wma_handle wma, QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, t_thermal_cmd_params thermal_info) { - wmi_thermal_mgmt_cmd_fixed_param *cmd = NULL; - wmi_buf_t buf = NULL; - int status = 0; - uint32_t len = 0; + struct thermal_cmd_params mgmt_thermal_info = {0}; - len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set key cmd"); + if (!wma_handle) { + WMA_LOGE("%s:'wma_set_thermal_mgmt':invalid input", __func__); + QDF_ASSERT(0); return QDF_STATUS_E_FAILURE; } - cmd = (wmi_thermal_mgmt_cmd_fixed_param *) wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_thermal_mgmt_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_thermal_mgmt_cmd_fixed_param)); - - cmd->lower_thresh_degreeC = thermal_info.minTemp; - cmd->upper_thresh_degreeC = thermal_info.maxTemp; - cmd->enable = thermal_info.thermalEnable; - - WMA_LOGE("TM Sending thermal mgmt cmd: low temp %d, upper temp %d, enabled %d", - cmd->lower_thresh_degreeC, cmd->upper_thresh_degreeC, cmd->enable); - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_THERMAL_MGMT_CMDID); - if (status) { - qdf_nbuf_free(buf); - WMA_LOGE("%s:Failed to send thermal mgmt command", __func__); - return QDF_STATUS_E_FAILURE; - } + mgmt_thermal_info.min_temp = thermal_info.minTemp; + mgmt_thermal_info.max_temp = thermal_info.maxTemp; + mgmt_thermal_info.thermal_enable = thermal_info.thermalEnable; - return QDF_STATUS_SUCCESS; + return wmi_unified_set_thermal_mgmt_cmd(wma_handle->wmi_handle, + &mgmt_thermal_info); } /** @@ -2943,78 +2780,25 @@ void wma_tx_abort(uint8_t vdev_id) QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, struct wma_lro_config_cmd_t *wma_lro_cmd) { - wmi_lro_info_cmd_fixed_param *cmd; - wmi_buf_t buf; - int status; + struct wmi_lro_config_cmd_t wmi_lro_cmd = {0}; if (NULL == wma_handle || NULL == wma_lro_cmd) { WMA_LOGE("wma_lro_config_cmd': invalid input!"); return QDF_STATUS_E_FAILURE; } - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return QDF_STATUS_E_FAILURE; - } - - cmd = (wmi_lro_info_cmd_fixed_param *) wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_lro_info_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_lro_info_cmd_fixed_param)); - - cmd->lro_enable = wma_lro_cmd->lro_enable; - WMI_LRO_INFO_TCP_FLAG_VALS_SET(cmd->tcp_flag_u32, - wma_lro_cmd->tcp_flag); - WMI_LRO_INFO_TCP_FLAGS_MASK_SET(cmd->tcp_flag_u32, - wma_lro_cmd->tcp_flag_mask); - cmd->toeplitz_hash_ipv4_0_3 = - wma_lro_cmd->toeplitz_hash_ipv4[0]; - cmd->toeplitz_hash_ipv4_4_7 = - wma_lro_cmd->toeplitz_hash_ipv4[1]; - cmd->toeplitz_hash_ipv4_8_11 = - wma_lro_cmd->toeplitz_hash_ipv4[2]; - cmd->toeplitz_hash_ipv4_12_15 = - wma_lro_cmd->toeplitz_hash_ipv4[3]; - cmd->toeplitz_hash_ipv4_16 = - wma_lro_cmd->toeplitz_hash_ipv4[4]; - - cmd->toeplitz_hash_ipv6_0_3 = - wma_lro_cmd->toeplitz_hash_ipv6[0]; - cmd->toeplitz_hash_ipv6_4_7 = - wma_lro_cmd->toeplitz_hash_ipv6[1]; - cmd->toeplitz_hash_ipv6_8_11 = - wma_lro_cmd->toeplitz_hash_ipv6[2]; - cmd->toeplitz_hash_ipv6_12_15 = - wma_lro_cmd->toeplitz_hash_ipv6[3]; - cmd->toeplitz_hash_ipv6_16_19 = - wma_lro_cmd->toeplitz_hash_ipv6[4]; - cmd->toeplitz_hash_ipv6_20_23 = - wma_lro_cmd->toeplitz_hash_ipv6[5]; - cmd->toeplitz_hash_ipv6_24_27 = - wma_lro_cmd->toeplitz_hash_ipv6[6]; - cmd->toeplitz_hash_ipv6_28_31 = - wma_lro_cmd->toeplitz_hash_ipv6[7]; - cmd->toeplitz_hash_ipv6_32_35 = - wma_lro_cmd->toeplitz_hash_ipv6[8]; - cmd->toeplitz_hash_ipv6_36_39 = - wma_lro_cmd->toeplitz_hash_ipv6[9]; - cmd->toeplitz_hash_ipv6_40 = - wma_lro_cmd->toeplitz_hash_ipv6[10]; - - WMA_LOGD("WMI_LRO_CONFIG: lro_enable %d, tcp_flag 0x%x", - cmd->lro_enable, cmd->tcp_flag_u32); - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), WMI_LRO_CONFIG_CMDID); - if (status) { - qdf_nbuf_free(buf); - WMA_LOGE("%s:Failed to send WMI_LRO_CONFIG_CMDID", __func__); - return QDF_STATUS_E_FAILURE; - } + wmi_lro_cmd.lro_enable = wma_lro_cmd->lro_enable; + wmi_lro_cmd.tcp_flag = wma_lro_cmd->tcp_flag; + wmi_lro_cmd.tcp_flag_mask = wma_lro_cmd->tcp_flag_mask; + qdf_mem_copy(wmi_lro_cmd.toeplitz_hash_ipv4, + wma_lro_cmd->toeplitz_hash_ipv4, + LRO_IPV4_SEED_ARR_SZ * sizeof(uint32_t)); + qdf_mem_copy(wmi_lro_cmd.toeplitz_hash_ipv6, + wma_lro_cmd->toeplitz_hash_ipv6, + LRO_IPV6_SEED_ARR_SZ * sizeof(uint32_t)); - return QDF_STATUS_SUCCESS; + return wmi_unified_lro_config_cmd(wma_handle->wmi_handle, + &wmi_lro_cmd); } #endif -- cgit v1.2.3 From 4419541ce7c354fc866a581301fcb1b830d87f95 Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Wed, 9 Mar 2016 13:03:54 +0530 Subject: qcacld-3.0: Refactor formation of wmi feature commands Move tlv formation of wmi feature related commands to common wmi layer from wma layer. Change-Id: Ice267f5fc2b057c0c5e288888c57886a1c61006e CRs-Fixed: 987362 --- core/wma/inc/wma_internal.h | 8 +- core/wma/src/wma_features.c | 781 +++++++++++--------------------------------- 2 files changed, 195 insertions(+), 594 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 8c9a583552ed..be1bfc46a7ec 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -1034,12 +1034,12 @@ QDF_STATUS wma_process_ibss_route_table_update_ind(void *wma_handle, tAniIbssRouteTable * pData); #ifdef WLAN_FEATURE_EXTWOW_SUPPORT -int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params); +QDF_STATUS wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params); int wma_set_app_type1_params_in_fw(tp_wma_handle wma, tpSirAppType1Params appType1Params); -int wma_set_app_type2_params_in_fw(tp_wma_handle wma, +QDF_STATUS wma_set_app_type2_params_in_fw(tp_wma_handle wma, tpSirAppType2Params appType2Params); #endif @@ -1081,7 +1081,7 @@ QDF_STATUS wma_suspend_target(WMA_HANDLE handle, int disable_target_intr); #ifdef FEATURE_WLAN_TDLS -int wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams); +QDF_STATUS wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams); int wma_update_tdls_peer_state(WMA_HANDLE handle, tTdlsPeerStateParams *peerStateParams); /** @@ -1093,7 +1093,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, * * Return: 0 on success; negative errno otherwise */ -int wma_set_tdls_offchan_mode(WMA_HANDLE wma_handle, +QDF_STATUS wma_set_tdls_offchan_mode(WMA_HANDLE wma_handle, tdls_chan_switch_params *chan_switch_params); #endif diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 8fe0266f5460..e77211e0d0d7 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3960,44 +3960,13 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, * * Return: 0 for success or error code */ -static int wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, uint8_t vdev_id, +static QDF_STATUS wma_add_clear_mcbc_filter(tp_wma_handle wma_handle, + uint8_t vdev_id, struct qdf_mac_addr multicast_addr, bool clearList) { - WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param *cmd; - wmi_buf_t buf; - int err; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set_param cmd"); - return -ENOMEM; - } - - cmd = (WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param *) wmi_buf_data(buf); - qdf_mem_zero(cmd, sizeof(*cmd)); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_SET_MCASTBCAST_FILTER_CMD_fixed_param)); - cmd->action = - (clearList ? WMI_MCAST_FILTER_DELETE : WMI_MCAST_FILTER_SET); - cmd->vdev_id = vdev_id; - WMI_CHAR_ARRAY_TO_MAC_ADDR(multicast_addr.bytes, &cmd->mcastbdcastaddr); - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), - WMI_SET_MCASTBCAST_FILTER_CMDID); - if (err) { - WMA_LOGE("Failed to send set_param cmd"); - qdf_mem_free(buf); - return -EIO; - } - WMA_LOGD("Action:%d; vdev_id:%d; clearList:%d", - cmd->action, vdev_id, clearList); - WMA_LOGD("MCBC MAC Addr: "MAC_ADDRESS_STR, - MAC_ADDR_ARRAY(multicast_addr.bytes)); - return 0; + return wmi_unified_add_clear_mcbc_filter_cmd(wma_handle->wmi_handle, + vdev_id, multicast_addr, clearList); } /** @@ -4141,55 +4110,41 @@ int wma_gtk_offload_status_event(void *handle, uint8_t *event, static QDF_STATUS wma_send_gtk_offload_req(tp_wma_handle wma, uint8_t vdev_id, tpSirGtkOffloadParams params) { - int len; - wmi_buf_t buf; - WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; + struct gtk_offload_params offload_params = {0}; QDF_STATUS status = QDF_STATUS_SUCCESS; + bool enable_offload; + uint32_t gtk_offload_opcode; WMA_LOGD("%s Enter", __func__); - len = sizeof(*cmd); - - /* alloc wmi buffer */ - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = QDF_STATUS_E_NOMEM; - goto out; - } - - cmd = (WMI_GTK_OFFLOAD_CMD_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_GTK_OFFLOAD_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_GTK_OFFLOAD_CMD_fixed_param)); - - cmd->vdev_id = vdev_id; - /* Request target to enable GTK offload */ if (params->ulFlags == GTK_OFFLOAD_ENABLE) { - cmd->flags = GTK_OFFLOAD_ENABLE_OPCODE; + gtk_offload_opcode = GTK_OFFLOAD_ENABLE_OPCODE; wma->wow.gtk_err_enable[vdev_id] = true; /* Copy the keys and replay counter */ - qdf_mem_copy(cmd->KCK, params->aKCK, GTK_OFFLOAD_KCK_BYTES); - qdf_mem_copy(cmd->KEK, params->aKEK, GTK_OFFLOAD_KEK_BYTES); - qdf_mem_copy(cmd->replay_counter, ¶ms->ullKeyReplayCounter, - GTK_REPLAY_COUNTER_BYTES); + qdf_mem_copy(offload_params.aKCK, params->aKCK, + GTK_OFFLOAD_KCK_BYTES); + qdf_mem_copy(offload_params.aKEK, params->aKEK, + GTK_OFFLOAD_KEK_BYTES); + qdf_mem_copy(&offload_params.ullKeyReplayCounter, + ¶ms->ullKeyReplayCounter, GTK_REPLAY_COUNTER_BYTES); } else { wma->wow.gtk_err_enable[vdev_id] = false; - cmd->flags = GTK_OFFLOAD_DISABLE_OPCODE; + gtk_offload_opcode = GTK_OFFLOAD_DISABLE_OPCODE; } + enable_offload = params->ulFlags; + /* send the wmi command */ - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_GTK_OFFLOAD_CMDID)) { - WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID"); - wmi_buf_free(buf); - status = QDF_STATUS_E_FAILURE; - } + status = wmi_unified_send_gtk_offload_cmd(wma->wmi_handle, + vdev_id, &offload_params, + enable_offload, + gtk_offload_opcode); + if (QDF_IS_STATUS_ERROR(status)) + goto out; - WMA_LOGD("VDEVID: %d, GTK_FLAGS: x%x", vdev_id, cmd->flags); + WMA_LOGD("VDEVID: %d, GTK_FLAGS: x%x", vdev_id, gtk_offload_opcode); out: WMA_LOGD("%s Exit", __func__); return status; @@ -4257,9 +4212,7 @@ QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, tpSirGtkOffloadGetInfoRspParams params) { uint8_t vdev_id; - int len; - wmi_buf_t buf; - WMI_GTK_OFFLOAD_CMD_fixed_param *cmd; + uint64_t offload_req_opcode; QDF_STATUS status = QDF_STATUS_SUCCESS; WMA_LOGD("%s Enter", __func__); @@ -4271,33 +4224,13 @@ QDF_STATUS wma_process_gtk_offload_getinfo_req(tp_wma_handle wma, goto out; } - len = sizeof(*cmd); - - /* alloc wmi buffer */ - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("wmi_buf_alloc failed for WMI_GTK_OFFLOAD_CMD"); - status = QDF_STATUS_E_NOMEM; - goto out; - } - - cmd = (WMI_GTK_OFFLOAD_CMD_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_GTK_OFFLOAD_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_GTK_OFFLOAD_CMD_fixed_param)); - /* Request for GTK offload status */ - cmd->flags = GTK_OFFLOAD_REQUEST_STATUS_OPCODE; - cmd->vdev_id = vdev_id; + offload_req_opcode = GTK_OFFLOAD_REQUEST_STATUS_OPCODE; /* send the wmi command */ - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_GTK_OFFLOAD_CMDID)) { - WMA_LOGE("Failed to send WMI_GTK_OFFLOAD_CMDID for req info"); - wmi_buf_free(buf); - status = QDF_STATUS_E_FAILURE; - } + status = wmi_unified_process_gtk_offload_getinfo_cmd(wma->wmi_handle, + vdev_id, offload_req_opcode); + out: qdf_mem_free(params); WMA_LOGD("%s Exit", __func__); @@ -4365,70 +4298,36 @@ QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, pAddPeriodicTxPtrnParams) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; + struct periodic_tx_pattern params; uint8_t vdev_id; - uint8_t *buf_ptr; - uint32_t ptrn_len, ptrn_len_aligned; - int j; + + qdf_mem_set(¶ms, sizeof(struct periodic_tx_pattern), 0); if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue fw add pattern cmd", __func__); return QDF_STATUS_E_INVAL; } - ptrn_len = pAddPeriodicTxPtrnParams->ucPtrnSize; - ptrn_len_aligned = roundup(ptrn_len, sizeof(uint32_t)); - len = sizeof(WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param) + - WMI_TLV_HDR_SIZE + ptrn_len_aligned; - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } if (!wma_find_vdev_by_addr(wma_handle, pAddPeriodicTxPtrnParams->mac_address.bytes, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pAddPeriodicTxPtrnParams->mac_address.bytes); - qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_INVAL; } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - - cmd = (WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param)); - - /* Pass the pattern id to delete for the corresponding vdev id */ - cmd->vdev_id = vdev_id; - cmd->pattern_id = pAddPeriodicTxPtrnParams->ucPtrnId; - cmd->timeout = pAddPeriodicTxPtrnParams->usPtrnIntervalMs; - cmd->length = pAddPeriodicTxPtrnParams->ucPtrnSize; - - /* Pattern info */ - buf_ptr += sizeof(WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ptrn_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, pAddPeriodicTxPtrnParams->ucPattern, ptrn_len); - for (j = 0; j < pAddPeriodicTxPtrnParams->ucPtrnSize; j++) { - WMA_LOGD("%s: Add Ptrn: %02x", __func__, buf_ptr[j] & 0xff); - } - WMA_LOGD("%s: Add ptrn id: %d vdev_id: %d", - __func__, cmd->pattern_id, cmd->vdev_id); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { - WMA_LOGE("%s: failed to add pattern set state command", - __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + + params.ucPtrnId = pAddPeriodicTxPtrnParams->ucPtrnId; + params.ucPtrnSize = pAddPeriodicTxPtrnParams->ucPtrnSize; + params.usPtrnIntervalMs = pAddPeriodicTxPtrnParams->usPtrnIntervalMs; + qdf_mem_copy(¶ms.mac_address, + &pAddPeriodicTxPtrnParams->mac_address, + sizeof(struct qdf_mac_addr)); + qdf_mem_copy(params.ucPattern, pAddPeriodicTxPtrnParams->ucPattern, + params.ucPtrnSize); + + return wmi_unified_process_add_periodic_tx_ptrn_cmd( + wma_handle->wmi_handle, ¶ms, vdev_id); } /** @@ -4443,50 +4342,25 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, pDelPeriodicTxPtrnParams) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *cmd; - wmi_buf_t wmi_buf; uint8_t vdev_id; - uint32_t len = - sizeof(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param); if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue Del Pattern cmd", __func__); return QDF_STATUS_E_INVAL; } - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } + if (!wma_find_vdev_by_addr(wma_handle, pDelPeriodicTxPtrnParams->mac_address.bytes, &vdev_id)) { WMA_LOGE("%s: Failed to find vdev id for %pM", __func__, pDelPeriodicTxPtrnParams->mac_address.bytes); - qdf_nbuf_free(wmi_buf); return QDF_STATUS_E_INVAL; } - cmd = (WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param *) - wmi_buf_data(wmi_buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMD_fixed_param)); - - /* Pass the pattern id to delete for the corresponding vdev id */ - cmd->vdev_id = vdev_id; - cmd->pattern_id = pDelPeriodicTxPtrnParams->ucPtrnId; - WMA_LOGD("%s: Del ptrn id: %d vdev_id: %d", - __func__, cmd->pattern_id, cmd->vdev_id); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID)) { - WMA_LOGE("%s: failed to send del pattern command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + + return wmi_unified_process_del_periodic_tx_ptrn_cmd( + wma_handle->wmi_handle, vdev_id, + pDelPeriodicTxPtrnParams->ucPtrnId); } #ifdef WLAN_FEATURE_STATS_EXT @@ -4499,49 +4373,21 @@ QDF_STATUS wma_process_del_periodic_tx_ptrn_ind(WMA_HANDLE handle, */ QDF_STATUS wma_stats_ext_req(void *wma_ptr, tpStatsExtRequest preq) { - int32_t ret; tp_wma_handle wma = (tp_wma_handle) wma_ptr; - wmi_req_stats_ext_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint16_t len; - uint8_t *buf_ptr; - - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE + preq->request_data_len; + struct stats_ext_params params = {0}; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return -ENOMEM; + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_FAILURE; } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_req_stats_ext_cmd_fixed_param *) buf_ptr; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_req_stats_ext_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_req_stats_ext_cmd_fixed_param)); - cmd->vdev_id = preq->vdev_id; - cmd->data_len = preq->request_data_len; - - WMA_LOGD("%s: The data len value is %u and vdev id set is %u ", - __func__, preq->request_data_len, preq->vdev_id); - - buf_ptr += sizeof(wmi_req_stats_ext_cmd_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, cmd->data_len); + params.vdev_id = preq->vdev_id; + params.request_data_len = preq->request_data_len; + qdf_mem_copy(params.request_data, preq->request_data, + params.request_data_len); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, preq->request_data, cmd->data_len); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_REQUEST_STATS_EXT_CMDID); - if (ret != EOK) { - WMA_LOGE("%s: Failed to send notify cmd ret = %d", __func__, - ret); - wmi_buf_free(buf); - } - - return ret; + return wmi_unified_stats_ext_req_cmd(wma->wmi_handle, + ¶ms); } #endif /* WLAN_FEATURE_STATS_EXT */ @@ -4593,45 +4439,27 @@ static void wma_send_status_of_ext_wow(tp_wma_handle wma, bool status) * * Return:0 for success or error code */ -int wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) +QDF_STATUS wma_enable_ext_wow(tp_wma_handle wma, tpSirExtWoWParams params) { - wmi_extwow_enable_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len; - int ret; + struct ext_wow_params wow_params = {0}; + QDF_STATUS status; - len = sizeof(wmi_extwow_enable_cmd_fixed_param); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_FAILURE; } - cmd = (wmi_extwow_enable_cmd_fixed_param *) wmi_buf_data(buf); + wow_params.vdev_id = params->vdev_id; + wow_params.type = (enum wmi_ext_wow_type) params->type; + wow_params.wakeup_pin_num = params->wakeup_pin_num; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extwow_enable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extwow_enable_cmd_fixed_param)); - - cmd->vdev_id = params->vdev_id; - cmd->type = params->type; - cmd->wakeup_pin_num = params->wakeup_pin_num; - - WMA_LOGD("%s: vdev_id %d type %d Wakeup_pin_num %x", - __func__, cmd->vdev_id, cmd->type, cmd->wakeup_pin_num); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_EXTWOW_ENABLE_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to set EXTWOW Enable", __func__); - wmi_buf_free(buf); - wma_send_status_of_ext_wow(wma, false); - return QDF_STATUS_E_FAILURE; - } + status = wmi_unified_enable_ext_wow_cmd(wma->wmi_handle, + &wow_params); + if (QDF_IS_STATUS_ERROR(status)) + return status; wma_send_status_of_ext_wow(wma, true); - return QDF_STATUS_SUCCESS; + return status; } @@ -4664,77 +4492,37 @@ int wma_set_app_type1_params_in_fw(tp_wma_handle wma, * * Return: QDF status */ -int wma_set_app_type2_params_in_fw(tp_wma_handle wma, +QDF_STATUS wma_set_app_type2_params_in_fw(tp_wma_handle wma, tpSirAppType2Params appType2Params) { - wmi_extwow_set_app_type2_params_cmd_fixed_param *cmd; - wmi_buf_t buf; - int32_t len; - int ret; + struct app_type2_params params = {0}; - len = sizeof(wmi_extwow_set_app_type2_params_cmd_fixed_param); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_extwow_set_app_type2_params_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extwow_set_app_type2_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extwow_set_app_type2_params_cmd_fixed_param)); - - cmd->vdev_id = appType2Params->vdev_id; - - qdf_mem_copy(cmd->rc4_key, appType2Params->rc4_key, 16); - cmd->rc4_key_len = appType2Params->rc4_key_len; - - cmd->ip_id = appType2Params->ip_id; - cmd->ip_device_ip = appType2Params->ip_device_ip; - cmd->ip_server_ip = appType2Params->ip_server_ip; - - cmd->tcp_src_port = appType2Params->tcp_src_port; - cmd->tcp_dst_port = appType2Params->tcp_dst_port; - cmd->tcp_seq = appType2Params->tcp_seq; - cmd->tcp_ack_seq = appType2Params->tcp_ack_seq; - - cmd->keepalive_init = appType2Params->keepalive_init; - cmd->keepalive_min = appType2Params->keepalive_min; - cmd->keepalive_max = appType2Params->keepalive_max; - cmd->keepalive_inc = appType2Params->keepalive_inc; - - WMI_CHAR_ARRAY_TO_MAC_ADDR(appType2Params->gateway_mac.bytes, - &cmd->gateway_mac); - cmd->tcp_tx_timeout_val = appType2Params->tcp_tx_timeout_val; - cmd->tcp_rx_timeout_val = appType2Params->tcp_rx_timeout_val; - - WMA_LOGD("%s: vdev_id %d gateway_mac %pM " - "rc4_key %.16s rc4_key_len %u " - "ip_id %x ip_device_ip %x ip_server_ip %x " - "tcp_src_port %u tcp_dst_port %u tcp_seq %u " - "tcp_ack_seq %u keepalive_init %u keepalive_min %u " - "keepalive_max %u keepalive_inc %u " - "tcp_tx_timeout_val %u tcp_rx_timeout_val %u", - __func__, cmd->vdev_id, appType2Params->gateway_mac.bytes, - cmd->rc4_key, cmd->rc4_key_len, - cmd->ip_id, cmd->ip_device_ip, cmd->ip_server_ip, - cmd->tcp_src_port, cmd->tcp_dst_port, cmd->tcp_seq, - cmd->tcp_ack_seq, cmd->keepalive_init, cmd->keepalive_min, - cmd->keepalive_max, cmd->keepalive_inc, - cmd->tcp_tx_timeout_val, cmd->tcp_rx_timeout_val); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to set APP TYPE2 PARAMS", __func__); - wmi_buf_free(buf); + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); return QDF_STATUS_E_FAILURE; } - return QDF_STATUS_SUCCESS; + params.vdev_id = appType2Params->vdev_id; + params.rc4_key_len = appType2Params->rc4_key_len; + qdf_mem_copy(params.rc4_key, appType2Params->rc4_key, 16); + params.ip_id = appType2Params->ip_id; + params.ip_device_ip = appType2Params->ip_device_ip; + params.ip_server_ip = appType2Params->ip_server_ip; + params.tcp_src_port = appType2Params->tcp_src_port; + params.tcp_dst_port = appType2Params->tcp_dst_port; + params.tcp_seq = appType2Params->tcp_seq; + params.tcp_ack_seq = appType2Params->tcp_ack_seq; + params.keepalive_init = appType2Params->keepalive_init; + params.keepalive_min = appType2Params->keepalive_min; + params.keepalive_max = appType2Params->keepalive_max; + params.keepalive_inc = appType2Params->keepalive_inc; + params.tcp_tx_timeout_val = appType2Params->tcp_tx_timeout_val; + params.tcp_rx_timeout_val = appType2Params->tcp_rx_timeout_val; + qdf_mem_copy(¶ms.gateway_mac, &appType2Params->gateway_mac, + sizeof(struct qdf_mac_addr)); + + return wmi_unified_set_app_type2_params_in_fw_cmd(wma->wmi_handle, + ¶ms); } #endif /* WLAN_FEATURE_EXTWOW_SUPPORT */ @@ -4787,46 +4575,13 @@ QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, tSirAutoShutdownCmdParams * auto_sh_cmd) { - int status = 0; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_host_auto_shutdown_cfg_cmd_fixed_param *wmi_auto_sh_cmd; - int len = sizeof(wmi_host_auto_shutdown_cfg_cmd_fixed_param); - if (auto_sh_cmd == NULL) { WMA_LOGE("%s : Invalid Autoshutdown cfg cmd", __func__); return QDF_STATUS_E_FAILURE; } - WMA_LOGD("%s: Set WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID:TIMER_VAL=%d", - __func__, auto_sh_cmd->timer_val); - - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - wmi_auto_sh_cmd = - (wmi_host_auto_shutdown_cfg_cmd_fixed_param *) buf_ptr; - wmi_auto_sh_cmd->timer_value = auto_sh_cmd->timer_val; - - WMITLV_SET_HDR(&wmi_auto_sh_cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_host_auto_shutdown_cfg_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_host_auto_shutdown_cfg_cmd_fixed_param)); - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID); - if (status != EOK) { - WMA_LOGE("%s: WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID Err %d", - __func__, status); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } - - return QDF_STATUS_SUCCESS; + return wmi_unified_set_auto_shutdown_timer_cmd(wma_handle->wmi_handle, + auto_sh_cmd->timer_val); } #endif /* FEATURE_WLAN_AUTO_SHUTDOWN */ @@ -4840,54 +4595,24 @@ QDF_STATUS wma_set_auto_shutdown_timer_req(tp_wma_handle wma_handle, */ QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) { - int ret; tp_wma_handle wma_handle = (tp_wma_handle) wma_ptr; - wmi_nan_cmd_param *cmd; - wmi_buf_t buf; - uint16_t len = sizeof(*cmd); - uint16_t nan_data_len, nan_data_len_aligned; - uint8_t *buf_ptr; + struct nan_req_params params = {0}; - /* - * <----- cmd ------------><-- WMI_TLV_HDR_SIZE --><--- data ----> - * +------------+----------+-----------------------+--------------+ - * | tlv_header | data_len | WMITLV_TAG_ARRAY_BYTE | nan_req_data | - * +------------+----------+-----------------------+--------------+ - */ + if (!wma_handle) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_FAILURE; + } if (!nan_req) { WMA_LOGE("%s:nan req is not valid", __func__); return QDF_STATUS_E_FAILURE; } - nan_data_len = nan_req->request_data_len; - nan_data_len_aligned = roundup(nan_req->request_data_len, - sizeof(uint32_t)); - len += WMI_TLV_HDR_SIZE + nan_data_len_aligned; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_nan_cmd_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_nan_cmd_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_nan_cmd_param)); - cmd->data_len = nan_req->request_data_len; - WMA_LOGD("%s: The data len value is %u", - __func__, nan_req->request_data_len); - buf_ptr += sizeof(wmi_nan_cmd_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, nan_data_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, nan_req->request_data, cmd->data_len); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_NAN_CMDID); - if (ret != EOK) { - WMA_LOGE("%s Failed to send set param command ret = %d", - __func__, ret); - wmi_buf_free(buf); - } - return ret; + + params.request_data_len = nan_req->request_data_len; + qdf_mem_copy(params.request_data, nan_req->request_data, + params.request_data_len); + + return wmi_unified_nan_req_cmd(wma_handle->wmi_handle, + ¶ms); } #endif /* WLAN_FEATURE_NAN */ @@ -4899,44 +4624,32 @@ QDF_STATUS wma_nan_req(void *wma_ptr, tpNanRequest nan_req) * * Return: 0 for success or error code */ -int wma_process_dhcpserver_offload(tp_wma_handle wma_handle, +QDF_STATUS wma_process_dhcpserver_offload(tp_wma_handle wma_handle, tSirDhcpSrvOffloadInfo * pDhcpSrvOffloadInfo) { - wmi_set_dhcp_server_offload_cmd_fixed_param *cmd; - wmi_buf_t buf; - int err; - - buf = wmi_buf_alloc(wma_handle->wmi_handle, sizeof(*cmd)); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send " - "set_dhcp_server_offload cmd"); - return -ENOMEM; - } + struct dhcp_offload_info_params params = {0}; + QDF_STATUS status; - cmd = (wmi_set_dhcp_server_offload_cmd_fixed_param *) wmi_buf_data(buf); - qdf_mem_zero(cmd, sizeof(*cmd)); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_set_dhcp_server_offload_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_set_dhcp_server_offload_cmd_fixed_param)); - cmd->vdev_id = pDhcpSrvOffloadInfo->vdev_id; - cmd->enable = pDhcpSrvOffloadInfo->dhcpSrvOffloadEnabled; - cmd->num_client = pDhcpSrvOffloadInfo->dhcpClientNum; - cmd->srv_ipv4 = pDhcpSrvOffloadInfo->dhcpSrvIP; - cmd->start_lsb = 0; - err = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - sizeof(*cmd), - WMI_SET_DHCP_SERVER_OFFLOAD_CMDID); - if (err) { - WMA_LOGE("Failed to send set_dhcp_server_offload cmd"); - wmi_buf_free(buf); + if (!wma_handle) { + WMA_LOGE("%s: wma handle is NULL", __func__); return -EIO; } + + params.vdev_id = pDhcpSrvOffloadInfo->vdev_id; + params.dhcpSrvOffloadEnabled = + pDhcpSrvOffloadInfo->dhcpSrvOffloadEnabled; + params.dhcpClientNum = pDhcpSrvOffloadInfo->dhcpClientNum; + params.dhcpSrvIP = pDhcpSrvOffloadInfo->; + + status = wmi_unified_process_dhcpserver_offload_cmd( + wma_handle->wmi_handle, ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; + WMA_LOGD("Set dhcp server offload to vdevId %d", pDhcpSrvOffloadInfo->vdev_id); - return 0; + return status; } #endif /* DHCP_SERVER_OFFLOAD */ @@ -5068,12 +4781,11 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, tSirChAvoidUpdateReq * ch_avoid_update_req) { - int status = 0; - wmi_buf_t buf = NULL; - uint8_t *buf_ptr; - wmi_chan_avoid_update_cmd_param *ch_avoid_update_fp; - int len = sizeof(wmi_chan_avoid_update_cmd_param); - + QDF_STATUS status; + if (!wma_handle) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_FAILURE; + } if (ch_avoid_update_req == NULL) { WMA_LOGE("%s : ch_avoid_update_req is NULL", __func__); return QDF_STATUS_E_FAILURE; @@ -5081,32 +4793,14 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle, WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE", __func__); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - ch_avoid_update_fp = (wmi_chan_avoid_update_cmd_param *) buf_ptr; - WMITLV_SET_HDR(&ch_avoid_update_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_chan_avoid_update_cmd_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_chan_avoid_update_cmd_param)); - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_CHAN_AVOID_UPDATE_CMDID); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send" - " WMITLV_TABLE_WMI_CHAN_AVOID_UPDATE" - " returned Error %d", status); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } + status = wmi_unified_process_ch_avoid_update_cmd( + wma_handle->wmi_handle); + if (QDF_IS_STATUS_ERROR(status)) + return status; WMA_LOGI("%s: WMA --> WMI_CHAN_AVOID_UPDATE sent through WMI", __func__); - return QDF_STATUS_SUCCESS; + return status; } #endif /* FEATURE_WLAN_CH_AVOID */ @@ -5140,41 +4834,21 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, uint16_t regdmn5G, int8_t ctl2G, int8_t ctl5G) { - wmi_buf_t buf; - wmi_pdev_set_regdomain_cmd_fixed_param *cmd; - int32_t len = sizeof(*cmd); tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); int32_t cck_mask_val = 0; - int ret = 0; struct pdev_params pdev_param = {0}; + QDF_STATUS ret = QDF_STATUS_SUCCESS; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (NULL == wma) { WMA_LOGE("%s: wma context is NULL", __func__); return; } - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); + status = wmi_unified_send_regdomain_info_to_fw_cmd(wma->wmi_handle, + reg_dmn, regdmn2G, regdmn5G, ctl2G, ctl5G); + if (status == QDF_STATUS_E_NOMEM) return; - } - cmd = (wmi_pdev_set_regdomain_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_pdev_set_regdomain_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_pdev_set_regdomain_cmd_fixed_param)); - cmd->reg_domain = reg_dmn; - cmd->reg_domain_2G = regdmn2G; - cmd->reg_domain_5G = regdmn5G; - cmd->conformance_test_limit_2G = ctl2G; - cmd->conformance_test_limit_5G = ctl5G; - - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PDEV_SET_REGDOMAIN_CMDID)) { - WMA_LOGP("%s: Failed to send pdev set regdomain command", - __func__); - qdf_nbuf_free(buf); - } if ((((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_JAPAN) || ((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_KOREA_ROC)) && @@ -5188,7 +4862,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, &pdev_param, WMA_WILDCARD_PDEV_ID); - if (ret) + if (QDF_IS_STATUS_ERROR(ret)) WMA_LOGE("failed to set PDEV tx_chain_mask_cck %d", ret); @@ -5681,14 +5355,12 @@ int wma_tdls_event_handler(void *handle, uint8_t *event, uint32_t len) * * Return: 0 on success; Negative errno otherwise */ -int wma_set_tdls_offchan_mode(WMA_HANDLE handle, +QDF_STATUS wma_set_tdls_offchan_mode(WMA_HANDLE handle, tdls_chan_switch_params *chan_switch_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_tdls_set_offchan_mode_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - u_int16_t len = sizeof(wmi_tdls_set_offchan_mode_cmd_fixed_param); - int ret = 0; + struct tdls_channel_switch_params params = {0}; + QDF_STATUS ret = QDF_STATUS_SUCCESS; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE(FL( @@ -5697,48 +5369,19 @@ int wma_set_tdls_offchan_mode(WMA_HANDLE handle, ret = -EINVAL; goto end; } - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - ret = -ENOMEM; - goto end; - } - cmd = (wmi_tdls_set_offchan_mode_cmd_fixed_param *) - wmi_buf_data(wmi_buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_tdls_set_offchan_mode_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_tdls_set_offchan_mode_cmd_fixed_param)); - - WMI_CHAR_ARRAY_TO_MAC_ADDR(chan_switch_params->peer_mac_addr, - &cmd->peer_macaddr); - cmd->vdev_id = chan_switch_params->vdev_id; - cmd->offchan_mode = chan_switch_params->tdls_sw_mode; - cmd->is_peer_responder = chan_switch_params->is_responder; - cmd->offchan_num = chan_switch_params->tdls_off_ch; - cmd->offchan_bw_bitmap = chan_switch_params->tdls_off_ch_bw_offset; - cmd->offchan_oper_class = chan_switch_params->oper_class; - - WMA_LOGD(FL("Peer MAC Addr mac_addr31to0: 0x%x, mac_addr47to32: 0x%x"), - cmd->peer_macaddr.mac_addr31to0, - cmd->peer_macaddr.mac_addr47to32); - - WMA_LOGD(FL( - "vdev_id: %d, off channel mode: %d, off channel Num: %d, off channel offset: 0x%x, is_peer_responder: %d, operating class: %d" - ), - cmd->vdev_id, - cmd->offchan_mode, - cmd->offchan_num, - cmd->offchan_bw_bitmap, - cmd->is_peer_responder, - cmd->offchan_oper_class); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_TDLS_SET_OFFCHAN_MODE_CMDID)) { - WMA_LOGP(FL("failed to send tdls off chan command")); - qdf_nbuf_free(wmi_buf); - ret = -EIO; - } + + params.vdev_id = chan_switch_params->vdev_id; + params.tdls_off_ch_bw_offset = + chan_switch_params->tdls_off_ch_bw_offset; + params.tdls_off_ch = chan_switch_params->tdls_off_ch; + params.tdls_sw_mode = chan_switch_params->tdls_sw_mode; + params.oper_class = chan_switch_params->oper_class; + params.is_responder = chan_switch_params->is_responder; + qdf_mem_copy(params.peer_mac_addr, chan_switch_params->peer_mac_addr, + WMI_ETH_LEN); + + ret = wmi_unified_set_tdls_offchan_mode_cmd(wma_handle->wmi_handle, + ¶ms); end: if (chan_switch_params) @@ -5753,15 +5396,14 @@ end: * * Return: 0 for sucess or error code */ -int wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams) +QDF_STATUS wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - wmi_tdls_set_state_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; t_wma_tdls_mode tdls_mode; t_wma_tdls_params *wma_tdls = (t_wma_tdls_params *) pwmaTdlsparams; - uint16_t len = sizeof(wmi_tdls_set_state_cmd_fixed_param); - int ret = 0; + struct wmi_tdls_params params = {0}; + QDF_STATUS ret = QDF_STATUS_SUCCESS; + uint8_t tdls_state; if (!wma_handle || !wma_handle->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue fw tdls state cmd", @@ -5770,84 +5412,43 @@ int wma_update_fw_tdls_state(WMA_HANDLE handle, void *pwmaTdlsparams) goto end_fw_tdls_state; } - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmai_buf_alloc failed", __func__); - ret = ENOMEM; - goto end_fw_tdls_state; - } + params.tdls_state = wma_tdls->tdls_state; tdls_mode = wma_tdls->tdls_state; - cmd = (wmi_tdls_set_state_cmd_fixed_param *) wmi_buf_data(wmi_buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_tdls_set_state_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_tdls_set_state_cmd_fixed_param)); - cmd->vdev_id = wma_tdls->vdev_id; if (WMA_TDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY == tdls_mode) { - cmd->state = WMI_TDLS_ENABLE_PASSIVE; + tdls_state = WMI_TDLS_ENABLE_PASSIVE; } else if (WMA_TDLS_SUPPORT_ENABLED == tdls_mode) { - cmd->state = WMI_TDLS_ENABLE_ACTIVE; + tdls_state = WMI_TDLS_ENABLE_ACTIVE; } else if (WMA_TDLS_SUPPORT_ACTIVE_EXTERNAL_CONTROL == tdls_mode) { - cmd->state = WMI_TDLS_ENABLE_ACTIVE_EXTERNAL_CONTROL; + tdls_state = WMI_TDLS_ENABLE_ACTIVE_EXTERNAL_CONTROL; } else { - cmd->state = WMI_TDLS_DISABLE; - } - - cmd->notification_interval_ms = wma_tdls->notification_interval_ms; - cmd->tx_discovery_threshold = wma_tdls->tx_discovery_threshold; - cmd->tx_teardown_threshold = wma_tdls->tx_teardown_threshold; - cmd->rssi_teardown_threshold = wma_tdls->rssi_teardown_threshold; - cmd->rssi_delta = wma_tdls->rssi_delta; - cmd->tdls_options = wma_tdls->tdls_options; - cmd->tdls_peer_traffic_ind_window = wma_tdls->peer_traffic_ind_window; - cmd->tdls_peer_traffic_response_timeout_ms = + tdls_state = WMI_TDLS_DISABLE; + } + + params.vdev_id = wma_tdls->vdev_id; + params.notification_interval_ms = wma_tdls->notification_interval_ms; + params.tx_discovery_threshold = wma_tdls->tx_discovery_threshold; + params.tx_teardown_threshold = wma_tdls->tx_teardown_threshold; + params.rssi_teardown_threshold = wma_tdls->rssi_teardown_threshold; + params.rssi_delta = wma_tdls->rssi_delta; + params.tdls_options = wma_tdls->tdls_options; + params.peer_traffic_ind_window = wma_tdls->peer_traffic_ind_window; + params.peer_traffic_response_timeout = wma_tdls->peer_traffic_response_timeout; - cmd->tdls_puapsd_mask = wma_tdls->puapsd_mask; - cmd->tdls_puapsd_inactivity_time_ms = wma_tdls->puapsd_inactivity_time; - cmd->tdls_puapsd_rx_frame_threshold = + params.puapsd_mask = wma_tdls->puapsd_mask; + params.puapsd_inactivity_time = wma_tdls->puapsd_inactivity_time; + params.puapsd_rx_frame_threshold = wma_tdls->puapsd_rx_frame_threshold; - cmd->teardown_notification_ms = + params.teardown_notification_ms = wma_tdls->teardown_notification_ms; - cmd->tdls_peer_kickout_threshold = + params.tdls_peer_kickout_threshold = wma_tdls->tdls_peer_kickout_threshold; - WMA_LOGD("%s: tdls_mode: %d, state: %d, " - "notification_interval_ms: %d, " - "tx_discovery_threshold: %d, " - "tx_teardown_threshold: %d, " - "rssi_teardown_threshold: %d, " - "rssi_delta: %d, " - "tdls_options: 0x%x, " - "tdls_peer_traffic_ind_window: %d, " - "tdls_peer_traffic_response_timeout: %d, " - "tdls_puapsd_mask: 0x%x, " - "tdls_puapsd_inactivity_time: %d, " - "tdls_puapsd_rx_frame_threshold: %d, " - "teardown_notification_ms: %d, " - "tdls_peer_kickout_threshold: %d", - __func__, tdls_mode, cmd->state, - cmd->notification_interval_ms, - cmd->tx_discovery_threshold, - cmd->tx_teardown_threshold, - cmd->rssi_teardown_threshold, - cmd->rssi_delta, - cmd->tdls_options, - cmd->tdls_peer_traffic_ind_window, - cmd->tdls_peer_traffic_response_timeout_ms, - cmd->tdls_puapsd_mask, - cmd->tdls_puapsd_inactivity_time_ms, - cmd->tdls_puapsd_rx_frame_threshold, - cmd->teardown_notification_ms, - cmd->tdls_peer_kickout_threshold); - - if (wmi_unified_cmd_send(wma_handle->wmi_handle, wmi_buf, len, - WMI_TDLS_SET_STATE_CMDID)) { - WMA_LOGP("%s: failed to send tdls set state command", __func__); - qdf_nbuf_free(wmi_buf); - ret = -EIO; + ret = wmi_unified_update_fw_tdls_state_cmd(wma_handle->wmi_handle, + ¶ms, tdls_state); + if (QDF_IS_STATUS_ERROR(ret)) goto end_fw_tdls_state; - } + WMA_LOGD("%s: vdev_id %d", __func__, wma_tdls->vdev_id); end_fw_tdls_state: -- cgit v1.2.3 From bf6a12be5e414eccfd652ec6b6375f4e009fd81e Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Wed, 9 Mar 2016 14:48:05 +0530 Subject: qcacld-3.0: Refactor formation of roam scan commands Move tlv formation of wmi roam scan commands to common wmi layer from wma layer. Change-Id: Iee92f71c6ae7470449f514f60a804a9cf021ccf0 CRs-Fixed: 987362 --- core/wma/src/wma_scan_roam.c | 1719 +++++++++++------------------------------- 1 file changed, 455 insertions(+), 1264 deletions(-) diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 728ea9ee74b3..dfb69d5f7927 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -715,255 +715,56 @@ QDF_STATUS wma_roam_scan_offload_mode(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req, uint32_t mode, uint32_t vdev_id) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len; - uint8_t *buf_ptr; - wmi_roam_scan_mode_fixed_param *roam_scan_mode_fp; + QDF_STATUS status = QDF_STATUS_SUCCESS; + struct roam_offload_scan_params params = {0}; + #ifdef WLAN_FEATURE_ROAM_OFFLOAD int auth_mode = WMI_AUTH_NONE; - wmi_roam_offload_tlv_param *roam_offload_params; - wmi_roam_11i_offload_tlv_param *roam_offload_11i; - wmi_roam_11r_offload_tlv_param *roam_offload_11r; - wmi_roam_ese_offload_tlv_param *roam_offload_ese; if (roam_req) auth_mode = e_csr_auth_type_to_rsn_authmode (roam_req->ConnectedNetwork.authentication, roam_req->ConnectedNetwork.encryption); WMA_LOGD("%s : auth mode = %d", __func__, auth_mode); + params.auth_mode = auth_mode; #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ - /* Need to create a buf with roam_scan command at - * front and piggyback with scan command */ - len = sizeof(wmi_roam_scan_mode_fixed_param) + -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - (2 * WMI_TLV_HDR_SIZE) + -#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ - sizeof(wmi_start_scan_cmd_fixed_param); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (roam_req && roam_req->RoamOffloadEnabled) { - len += sizeof(wmi_roam_offload_tlv_param); - len += WMI_TLV_HDR_SIZE; - if ((auth_mode != WMI_AUTH_NONE) && - ((auth_mode != WMI_AUTH_OPEN) || - (auth_mode == WMI_AUTH_OPEN && - roam_req->MDID.mdiePresent) || roam_req->IsESEAssoc)) { - len += WMI_TLV_HDR_SIZE; - if (roam_req->IsESEAssoc) - len += sizeof(wmi_roam_ese_offload_tlv_param); - else if (auth_mode == WMI_AUTH_FT_RSNA || - auth_mode == WMI_AUTH_FT_RSNA_PSK || - (auth_mode == WMI_AUTH_OPEN && - roam_req->MDID.mdiePresent)) - len += sizeof(wmi_roam_11r_offload_tlv_param); - else - len += sizeof(wmi_roam_11i_offload_tlv_param); - } else { - len += WMI_TLV_HDR_SIZE; - } - } else { - if (roam_req) - WMA_LOGD("%s : roam offload = %d", - __func__, roam_req->RoamOffloadEnabled); - else - WMA_LOGD("%s : roam_req is NULL", __func__); - len += (2 * WMI_TLV_HDR_SIZE); - } - if (roam_req && roam_req->RoamOffloadEnabled) { - mode = mode | WMI_ROAM_SCAN_MODE_ROAMOFFLOAD; - } -#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - roam_scan_mode_fp = (wmi_roam_scan_mode_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&roam_scan_mode_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_mode_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_scan_mode_fixed_param)); - - roam_scan_mode_fp->roam_scan_mode = mode; - roam_scan_mode_fp->vdev_id = vdev_id; - /* Fill in scan parameters suitable for roaming scan */ - buf_ptr += sizeof(wmi_roam_scan_mode_fixed_param); - qdf_mem_copy(buf_ptr, scan_cmd_fp, - sizeof(wmi_start_scan_cmd_fixed_param)); - /* Ensure there is no additional IEs */ - scan_cmd_fp->ie_len = 0; - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_STRUC_wmi_start_scan_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_start_scan_cmd_fixed_param)); + params.is_roam_req_valid = 0; + params.mode = mode; + params.vdev_id = vdev_id; + if (roam_req) { + params.is_roam_req_valid = 1; #ifdef WLAN_FEATURE_ROAM_OFFLOAD - buf_ptr += sizeof(wmi_start_scan_cmd_fixed_param); - if (roam_req && roam_req->RoamOffloadEnabled) { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_offload_tlv_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - roam_offload_params = (wmi_roam_offload_tlv_param *) buf_ptr; - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_STRUC_wmi_roam_offload_tlv_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_offload_tlv_param)); - roam_offload_params->prefer_5g = roam_req->Prefer5GHz; - roam_offload_params->rssi_cat_gap = roam_req->RoamRssiCatGap; - roam_offload_params->select_5g_margin = - roam_req->Select5GHzMargin; - roam_offload_params->reassoc_failure_timeout = - roam_req->ReassocFailureTimeout; - /* Fill the capabilities */ - wma_roam_scan_fill_self_caps(wma_handle, roam_offload_params, - roam_req); - buf_ptr += sizeof(wmi_roam_offload_tlv_param); - /* The TLV's are in the order of 11i, 11R, ESE. Hence, - * they are filled in the same order.Depending on the - * authentication type, the other mode TLV's are nullified - * and only headers are filled.*/ - if ((auth_mode != WMI_AUTH_NONE) && - ((auth_mode != WMI_AUTH_OPEN) || - (auth_mode == WMI_AUTH_OPEN - && roam_req->MDID.mdiePresent) || roam_req->IsESEAssoc)) { - if (roam_req->IsESEAssoc) { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_ese_offload_tlv_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - roam_offload_ese = - (wmi_roam_ese_offload_tlv_param *) buf_ptr; - qdf_mem_copy(roam_offload_ese->krk, - roam_req->KRK, - sizeof(roam_req->KRK)); - qdf_mem_copy(roam_offload_ese->btk, - roam_req->BTK, - sizeof(roam_req->BTK)); - WMITLV_SET_HDR(&roam_offload_ese->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_ese_offload_tlv_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_ese_offload_tlv_param)); - buf_ptr += - sizeof(wmi_roam_ese_offload_tlv_param); - } else if (auth_mode == WMI_AUTH_FT_RSNA - || auth_mode == WMI_AUTH_FT_RSNA_PSK - || (auth_mode == WMI_AUTH_OPEN - && roam_req->MDID.mdiePresent)) { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - 0); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_11r_offload_tlv_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - roam_offload_11r = - (wmi_roam_11r_offload_tlv_param *) buf_ptr; - roam_offload_11r->r0kh_id_len = - roam_req->R0KH_ID_Length; - qdf_mem_copy(roam_offload_11r->r0kh_id, - roam_req->R0KH_ID, - roam_offload_11r->r0kh_id_len); - qdf_mem_copy(roam_offload_11r->psk_msk, - roam_req->PSK_PMK, - sizeof(roam_req->PSK_PMK)); - roam_offload_11r->psk_msk_len = - roam_req->pmk_len; - roam_offload_11r->mdie_present = - roam_req->MDID.mdiePresent; - roam_offload_11r->mdid = - roam_req->MDID.mobilityDomain; - if (auth_mode == WMI_AUTH_OPEN) { - /* If FT-Open ensure pmk length - and r0khid len are zero */ - roam_offload_11r->r0kh_id_len = 0; - roam_offload_11r->psk_msk_len = 0; - } - WMITLV_SET_HDR(&roam_offload_11r->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_11r_offload_tlv_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_11r_offload_tlv_param)); - buf_ptr += - sizeof(wmi_roam_11r_offload_tlv_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - } else { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_11i_offload_tlv_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - roam_offload_11i = - (wmi_roam_11i_offload_tlv_param *) buf_ptr; - if (roam_req->RoamKeyMgmtOffloadEnabled) { - WMI_SET_ROAM_OFFLOAD_OKC_ENABLED - (roam_offload_11i->flags); - WMA_LOGE("LFR3:OKC Enabled"); - } else { - WMI_SET_ROAM_OFFLOAD_OKC_DISABLED - (roam_offload_11i->flags); - WMA_LOGE("LFR3:OKC Disabled"); - } - - qdf_mem_copy(roam_offload_11i->pmk, - roam_req->PSK_PMK, - sizeof(roam_req->PSK_PMK)); - roam_offload_11i->pmk_len = roam_req->pmk_len; - WMITLV_SET_HDR(&roam_offload_11i->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_11i_offload_tlv_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_11i_offload_tlv_param)); - buf_ptr += - sizeof(wmi_roam_11i_offload_tlv_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - 0); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - 0); - buf_ptr += WMI_TLV_HDR_SIZE; - } - } else { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - } - } else { - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - buf_ptr += WMI_TLV_HDR_SIZE; - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - WMITLV_GET_STRUCT_TLVLEN(0)); - } -#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_SCAN_MODE); - if (status != EOK) { - WMA_LOGE("wmi_unified_cmd_send WMI_ROAM_SCAN_MODE returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; + params.roam_offload_enabled = roam_req->RoamOffloadEnabled; + params.prefer_5ghz = roam_req->Prefer5GHz; + params.roam_rssi_cat_gap = roam_req->RoamRssiCatGap; + params.select_5ghz_margin = roam_req->Select5GHzMargin; + params.reassoc_failure_timeout = + roam_req->ReassocFailureTimeout; + params.rokh_id_length = roam_req->R0KH_ID_Length; + qdf_mem_copy(params.rokh_id, roam_req->R0KH_ID, + WMI_ROAM_R0KH_ID_MAX_LEN); + qdf_mem_copy(params.krk, roam_req->KRK, WMI_KRK_KEY_LEN); + qdf_mem_copy(params.btk, roam_req->BTK, WMI_BTK_KEY_LEN); + qdf_mem_copy(params.psk_pmk, roam_req->PSK_PMK, + WMI_ROAM_SCAN_PSK_SIZE); + params.pmk_len = roam_req->pmk_len; + params.roam_key_mgmt_offload_enabled = + roam_req->RoamKeyMgmtOffloadEnabled; + wma_roam_scan_fill_self_caps(wma_handle, + ¶ms.roam_offload_params, roam_req); +#endif + params.is_ese_assoc = roam_req->IsESEAssoc; + params.mdid.mdie_present = roam_req->MDID.mdiePresent; + params.mdid.mobility_domain = roam_req->MDID.mobilityDomain; } - WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_MODE", __func__); - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); + status = wmi_unified_roam_scan_offload_mode_cmd(wma_handle->wmi_handle, + scan_cmd_fp, ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; - return qdf_status; + WMA_LOGI("%s: WMA --> WMI_ROAM_SCAN_MODE", __func__); + return status; } /** @@ -978,14 +779,9 @@ error: QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf = NULL; - int status = 0; - int len, rssi_thresh, rssi_thresh_diff; - uint8_t *buf_ptr; - wmi_roam_scan_rssi_threshold_fixed_param *rssi_threshold_fp; - wmi_roam_scan_extended_threshold_param *ext_thresholds = NULL; - wmi_roam_earlystop_rssi_thres_param *early_stop_thresholds = NULL; + struct roam_offload_scan_rssi_params params = {0}; + QDF_STATUS status = QDF_STATUS_SUCCESS; + int rssi_thresh, rssi_thresh_diff; struct roam_ext_params *roam_params; int32_t good_rssi_threshold; uint32_t hirssi_scan_max_count; @@ -1000,39 +796,16 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, hirssi_scan_delta = roam_req->hi_rssi_scan_rssi_delta; hirssi_upper_bound = roam_req->hi_rssi_scan_rssi_ub - WMA_NOISE_FLOOR_DBM_DEFAULT; - len = sizeof(wmi_roam_scan_rssi_threshold_fixed_param); - len += WMI_TLV_HDR_SIZE; /* TLV for ext_thresholds*/ - len += sizeof(wmi_roam_scan_extended_threshold_param); - len += WMI_TLV_HDR_SIZE; - len += sizeof(wmi_roam_earlystop_rssi_thres_param); - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - rssi_threshold_fp = - (wmi_roam_scan_rssi_threshold_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&rssi_threshold_fp->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_rssi_threshold_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_scan_rssi_threshold_fixed_param)); /* fill in threshold values */ - rssi_threshold_fp->vdev_id = roam_req->sessionId; - rssi_threshold_fp->roam_scan_rssi_thresh = rssi_thresh & 0x000000ff; - rssi_threshold_fp->roam_rssi_thresh_diff = - rssi_thresh_diff & 0x000000ff; - rssi_threshold_fp->hirssi_scan_max_count = hirssi_scan_max_count; - rssi_threshold_fp->hirssi_scan_delta = hirssi_scan_delta; - rssi_threshold_fp->hirssi_upper_bound = hirssi_upper_bound & 0x00000ff; - - buf_ptr += sizeof(wmi_roam_scan_rssi_threshold_fixed_param); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_scan_extended_threshold_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - ext_thresholds = (wmi_roam_scan_extended_threshold_param *) buf_ptr; + params.session_id = roam_req->sessionId; + params.rssi_thresh = rssi_thresh & 0x000000ff; + params.rssi_thresh_diff = rssi_thresh_diff & 0x000000ff; + params.hi_rssi_scan_max_count = hirssi_scan_max_count; + params.hi_rssi_scan_rssi_delta = hirssi_scan_delta; + params.hi_rssi_scan_rssi_ub = hirssi_upper_bound & 0x00000ff; + params.raise_rssi_thresh_5g = roam_params->raise_rssi_thresh_5g; + /* * The current Noise floor in firmware is -96dBm. Penalty/Boost * threshold is applied on a weaker signal to make it even more weaker. @@ -1041,68 +814,48 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, * then suppress the penalty/boost threshold to the noise floor. */ if (roam_params->raise_rssi_thresh_5g < WMA_NOISE_FLOOR_DBM_DEFAULT) - ext_thresholds->penalty_threshold_5g = 0; + params.penalty_threshold_5g = 0; else - ext_thresholds->boost_threshold_5g = + params.boost_threshold_5g = (roam_params->raise_rssi_thresh_5g - WMA_NOISE_FLOOR_DBM_DEFAULT) & 0x000000ff; if (roam_params->drop_rssi_thresh_5g < WMA_NOISE_FLOOR_DBM_DEFAULT) - ext_thresholds->penalty_threshold_5g = 0; + params.penalty_threshold_5g = 0; else - ext_thresholds->penalty_threshold_5g = + params.penalty_threshold_5g = (roam_params->drop_rssi_thresh_5g - WMA_NOISE_FLOOR_DBM_DEFAULT) & 0x000000ff; - ext_thresholds->boost_algorithm_5g = - WMI_ROAM_5G_BOOST_PENALIZE_ALGO_LINEAR; - ext_thresholds->boost_factor_5g = roam_params->raise_factor_5g; - ext_thresholds->penalty_algorithm_5g = - WMI_ROAM_5G_BOOST_PENALIZE_ALGO_LINEAR; - ext_thresholds->penalty_factor_5g = roam_params->drop_factor_5g; - ext_thresholds->max_boost_5g = roam_params->max_raise_rssi_5g; - ext_thresholds->max_penalty_5g = roam_params->max_drop_rssi_5g; + params.raise_factor_5g = roam_params->raise_factor_5g; + params.drop_factor_5g = roam_params->drop_factor_5g; + params.max_raise_rssi_5g = roam_params->max_raise_rssi_5g; + params.max_drop_rssi_5g = roam_params->max_drop_rssi_5g; if (roam_params->good_rssi_roam) good_rssi_threshold = WMA_NOISE_FLOOR_DBM_DEFAULT; else good_rssi_threshold = 0; - ext_thresholds->good_rssi_threshold = + params.good_rssi_threshold = (good_rssi_threshold - WMA_NOISE_FLOOR_DBM_DEFAULT) & 0x000000ff; WMA_LOGD("WMA --> good_rssi_threshold=%d", - ext_thresholds->good_rssi_threshold); + params.good_rssi_threshold); - WMITLV_SET_HDR(&ext_thresholds->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_scan_extended_threshold_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_scan_extended_threshold_param)); - buf_ptr += sizeof(wmi_roam_scan_extended_threshold_param); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - sizeof(wmi_roam_earlystop_rssi_thres_param)); - buf_ptr += WMI_TLV_HDR_SIZE; - early_stop_thresholds = (wmi_roam_earlystop_rssi_thres_param *) buf_ptr; - early_stop_thresholds->roam_earlystop_thres_min = + params.roam_earlystop_thres_min = roam_req->early_stop_scan_min_threshold - WMA_NOISE_FLOOR_DBM_DEFAULT; - early_stop_thresholds->roam_earlystop_thres_max = + params.roam_earlystop_thres_max = roam_req->early_stop_scan_max_threshold - WMA_NOISE_FLOOR_DBM_DEFAULT; - WMITLV_SET_HDR(&early_stop_thresholds->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_earlystop_rssi_thres_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_roam_earlystop_rssi_thres_param)); + WMA_LOGD("early_stop_thresholds en=%d, min=%d, max=%d", roam_req->early_stop_scan_enable, - early_stop_thresholds->roam_earlystop_thres_min, - early_stop_thresholds->roam_earlystop_thres_max); + params.roam_earlystop_thres_min, + params.roam_earlystop_thres_max); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_SCAN_RSSI_THRESHOLD); - if (status != EOK) { - WMA_LOGE("cmd WMI_ROAM_SCAN_RSSI_THRESHOLD returned Error %d", - status); - qdf_status = QDF_STATUS_E_FAILURE; - goto error; + status = wmi_unified_roam_scan_offload_rssi_thresh_cmd( + wma_handle->wmi_handle, ¶ms); + if (QDF_IS_STATUS_ERROR(status)) { + return status; } WMA_LOGI(FL("roam_scan_rssi_thresh=%d, roam_rssi_thresh_diff=%d"), @@ -1110,11 +863,7 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, WMA_LOGI( FL("hirssi_scan max_count=%d, delta=%d, hirssi_upper_bound=%d"), hirssi_scan_max_count, hirssi_scan_delta, hirssi_upper_bound); - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - - return qdf_status; + return status; } /** @@ -1571,43 +1320,37 @@ QDF_STATUS wma_roam_scan_offload_ap_profile(tp_wma_handle wma_handle, QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { - wmi_buf_t buf = NULL; - int status = 0, i; - uint32_t len, num_bssid_black_list = 0, num_ssid_white_list = 0, + int i; + QDF_STATUS status = QDF_STATUS_SUCCESS; + uint32_t len = 0, num_bssid_black_list = 0, num_ssid_white_list = 0, num_bssid_preferred_list = 0; uint32_t op_bitmap = 0; - uint8_t *buf_ptr; - wmi_roam_filter_fixed_param *roam_filter; - uint8_t *bssid_src_ptr = NULL; - wmi_mac_addr *bssid_dst_ptr = NULL; - wmi_ssid *ssid_ptr = NULL; - uint32_t *bssid_preferred_factor_ptr = NULL; struct roam_ext_params *roam_params; + struct roam_scan_filter_params *params; + params = qdf_mem_malloc(sizeof(struct roam_scan_filter_params)); roam_params = &roam_req->roam_params; - len = sizeof(wmi_roam_filter_fixed_param); - len += WMI_TLV_HDR_SIZE; if (roam_req->Command != ROAM_SCAN_OFFLOAD_STOP) { switch (roam_req->reason) { case REASON_ROAM_SET_BLACKLIST_BSSID: op_bitmap |= 0x1; num_bssid_black_list = roam_params->num_bssid_avoid_list; - len += num_bssid_black_list * sizeof(wmi_mac_addr); + len = num_bssid_black_list * sizeof(wmi_mac_addr); len += WMI_TLV_HDR_SIZE; break; case REASON_ROAM_SET_SSID_ALLOWED: op_bitmap |= 0x2; num_ssid_white_list = roam_params->num_ssid_allowed_list; - len += num_ssid_white_list * sizeof(wmi_ssid); + len = num_ssid_white_list * sizeof(wmi_ssid); len += WMI_TLV_HDR_SIZE; break; case REASON_ROAM_SET_FAVORED_BSSID: op_bitmap |= 0x4; num_bssid_preferred_list = roam_params->num_bssid_favored; - len += num_bssid_preferred_list * sizeof(wmi_mac_addr); + len = num_bssid_preferred_list * sizeof(wmi_mac_addr); len += WMI_TLV_HDR_SIZE; len += num_bssid_preferred_list * sizeof(A_UINT32); break; @@ -1622,93 +1365,45 @@ QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle, * across connections.*/ op_bitmap = 0x2 | 0x4; num_ssid_white_list = roam_params->num_ssid_allowed_list; - len += num_ssid_white_list * sizeof(wmi_ssid); + len = num_ssid_white_list * sizeof(wmi_ssid); num_bssid_preferred_list = roam_params->num_bssid_favored; len += num_bssid_preferred_list * sizeof(wmi_mac_addr); len += num_bssid_preferred_list * sizeof(A_UINT32); len += (2 * WMI_TLV_HDR_SIZE); } - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (u_int8_t *) wmi_buf_data(buf); - roam_filter = (wmi_roam_filter_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&roam_filter->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_filter_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_roam_filter_fixed_param)); /* fill in fixed values */ - roam_filter->vdev_id = roam_req->sessionId; - roam_filter->flags = 0; - roam_filter->op_bitmap = op_bitmap; - roam_filter->num_bssid_black_list = num_bssid_black_list; - roam_filter->num_ssid_white_list = num_ssid_white_list; - roam_filter->num_bssid_preferred_list = num_bssid_preferred_list; - buf_ptr += sizeof(wmi_roam_filter_fixed_param); - - WMITLV_SET_HDR((buf_ptr), - WMITLV_TAG_ARRAY_FIXED_STRUC, - (num_bssid_black_list * sizeof(wmi_mac_addr))); - bssid_src_ptr = (uint8_t *)&roam_params->bssid_avoid_list; - bssid_dst_ptr = (wmi_mac_addr *)(buf_ptr + WMI_TLV_HDR_SIZE); - for (i = 0; i < num_bssid_black_list; i++) { - WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid_src_ptr, bssid_dst_ptr); - bssid_src_ptr += ATH_MAC_LEN; - bssid_dst_ptr++; - } - buf_ptr += WMI_TLV_HDR_SIZE + - (num_bssid_black_list * sizeof(wmi_mac_addr)); - WMITLV_SET_HDR((buf_ptr), - WMITLV_TAG_ARRAY_FIXED_STRUC, - (num_ssid_white_list * sizeof(wmi_ssid))); - ssid_ptr = (wmi_ssid *)(buf_ptr + WMI_TLV_HDR_SIZE); + params->session_id = roam_req->sessionId; + params->op_bitmap = op_bitmap; + params->num_bssid_black_list = num_bssid_black_list; + params->num_ssid_white_list = num_ssid_white_list; + params->num_bssid_preferred_list = num_bssid_preferred_list; + params->len = len; + qdf_mem_copy(params->bssid_avoid_list, roam_params->bssid_avoid_list, + MAX_BSSID_AVOID_LIST * sizeof(struct qdf_mac_addr)); + for (i = 0; i < num_ssid_white_list; i++) { - memcpy(&ssid_ptr->ssid, &roam_params->ssid_allowed_list[i].ssId, + qdf_mem_copy(params->ssid_allowed_list[i].mac_ssid, + roam_params->ssid_allowed_list[i].ssId, roam_params->ssid_allowed_list[i].length); - ssid_ptr->ssid_len = roam_params->ssid_allowed_list[i].length; - WMA_LOGD("%s: SSID length=%d", __func__, ssid_ptr->ssid_len); - QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, - (uint8_t *)ssid_ptr->ssid, - ssid_ptr->ssid_len); - ssid_ptr++; - } - buf_ptr += WMI_TLV_HDR_SIZE + (num_ssid_white_list * sizeof(wmi_ssid)); - WMITLV_SET_HDR((buf_ptr), - WMITLV_TAG_ARRAY_FIXED_STRUC, - (num_bssid_preferred_list * sizeof(wmi_mac_addr))); - bssid_src_ptr = (uint8_t *)&roam_params->bssid_favored; - bssid_dst_ptr = (wmi_mac_addr *)(buf_ptr + WMI_TLV_HDR_SIZE); - for (i = 0; i < num_bssid_preferred_list; i++) { - WMI_CHAR_ARRAY_TO_MAC_ADDR(bssid_src_ptr, - (wmi_mac_addr *)bssid_dst_ptr); - bssid_src_ptr += ATH_MAC_LEN; - bssid_dst_ptr++; - } - buf_ptr += WMI_TLV_HDR_SIZE + - (num_bssid_preferred_list * sizeof(wmi_mac_addr)); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (num_bssid_preferred_list * sizeof(uint32_t))); - bssid_preferred_factor_ptr = (uint32_t *)(buf_ptr + WMI_TLV_HDR_SIZE); - for (i = 0; i < num_bssid_preferred_list; i++) { - *bssid_preferred_factor_ptr = - roam_params->bssid_favored_factor[i]; - bssid_preferred_factor_ptr++; - } - buf_ptr += WMI_TLV_HDR_SIZE + - (num_bssid_preferred_list * sizeof(uint32_t)); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, - len, WMI_ROAM_FILTER_CMDID); - if (status != EOK) { - WMA_LOGE("cmd WMI_ROAM_FILTER_CMDID returned Error %d", - status); - goto error; - } - return QDF_STATUS_SUCCESS; -error: - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; + params->ssid_allowed_list[i].length = + roam_params->ssid_allowed_list[i].length; + WMA_LOGD("%s: SSID length=%d", __func__, + params->ssid_allowed_list[i].length); + qdf_trace_hex_dump(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, + (uint8_t *)params->ssid_allowed_list[i].mac_ssid, + params->ssid_allowed_list[i].length); + } + qdf_mem_copy(params->bssid_favored, roam_params->bssid_favored, + MAX_BSSID_FAVORED * sizeof(struct qdf_mac_addr)); + qdf_mem_copy(params->bssid_favored_factor, + roam_params->bssid_favored_factor, MAX_BSSID_FAVORED); + + status = wmi_unified_roam_scan_filter_cmd(wma_handle->wmi_handle, + params); + + qdf_mem_free(params); + return status; } /** @@ -2632,82 +2327,14 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle, */ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) { - wmi_ric_request_fixed_param *cmd; - wmi_ric_tspec *tspec_param; - wmi_buf_t buf; - uint8_t *buf_ptr; - tSirMacTspecIE *ptspecIE; - int32_t len = sizeof(wmi_ric_request_fixed_param) + - WMI_TLV_HDR_SIZE + sizeof(wmi_ric_tspec); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); return; } - buf_ptr = (uint8_t *) wmi_buf_data(buf); + wmi_unified_set_ric_req_cmd(wma->wmi_handle, msg, is_add_ts); - cmd = (wmi_ric_request_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_ric_request_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_ric_request_fixed_param)); - if (is_add_ts) - cmd->vdev_id = ((tAddTsParams *) msg)->sessionId; - else - cmd->vdev_id = ((tDelTsParams *) msg)->sessionId; - cmd->num_ric_request = 1; /* Today we are sending only 1 ric at once */ - cmd->is_add_ric = is_add_ts; - - buf_ptr += sizeof(wmi_ric_request_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, sizeof(wmi_ric_tspec)); - - buf_ptr += WMI_TLV_HDR_SIZE; - tspec_param = (wmi_ric_tspec *) buf_ptr; - WMITLV_SET_HDR(&tspec_param->tlv_header, - WMITLV_TAG_STRUC_wmi_ric_tspec, - WMITLV_GET_STRUCT_TLVLEN(wmi_ric_tspec)); - - if (is_add_ts) - ptspecIE = &(((tAddTsParams *) msg)->tspec); - else - ptspecIE = &(((tDelTsParams *) msg)->delTsInfo.tspec); - - /* Fill the tsinfo in the format expected by firmware */ -#ifndef ANI_LITTLE_BIT_ENDIAN - qdf_mem_copy(((uint8_t *) &tspec_param->ts_info) + 1, - ((uint8_t *) &ptspecIE->tsinfo) + 1, 2); -#else - qdf_mem_copy(((uint8_t *) &tspec_param->ts_info), - ((uint8_t *) &ptspecIE->tsinfo) + 1, 2); -#endif /* ANI_LITTLE_BIT_ENDIAN */ - - tspec_param->nominal_msdu_size = ptspecIE->nomMsduSz; - tspec_param->maximum_msdu_size = ptspecIE->maxMsduSz; - tspec_param->min_service_interval = ptspecIE->minSvcInterval; - tspec_param->max_service_interval = ptspecIE->maxSvcInterval; - tspec_param->inactivity_interval = ptspecIE->inactInterval; - tspec_param->suspension_interval = ptspecIE->suspendInterval; - tspec_param->svc_start_time = ptspecIE->svcStartTime; - tspec_param->min_data_rate = ptspecIE->minDataRate; - tspec_param->mean_data_rate = ptspecIE->meanDataRate; - tspec_param->peak_data_rate = ptspecIE->peakDataRate; - tspec_param->max_burst_size = ptspecIE->maxBurstSz; - tspec_param->delay_bound = ptspecIE->delayBound; - tspec_param->min_phy_rate = ptspecIE->minPhyRate; - tspec_param->surplus_bw_allowance = ptspecIE->surplusBw; - tspec_param->medium_time = 0; - - WMA_LOGI("%s: Set RIC Req is_add_ts:%d", __func__, is_add_ts); - - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_ROAM_SET_RIC_REQUEST_CMDID)) { - WMA_LOGP("%s: Failed to send vdev Set RIC Req command", - __func__); - if (is_add_ts) - ((tAddTsParams *) msg)->status = QDF_STATUS_E_FAILURE; - qdf_nbuf_free(buf); - } + return; } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ @@ -2951,141 +2578,91 @@ void wma_set_pno_channel_prediction(uint8_t *buf_ptr, */ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) { - wmi_nlo_config_cmd_fixed_param *cmd; - nlo_configured_parameters *nlo_list; - uint32_t *channel_list; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint8_t i; - int ret; + struct pno_scan_req_params *params; + uint32_t i; + uint32_t num_channels; + uint32_t *channel_list = NULL; + QDF_STATUS status; WMA_LOGD("PNO Start"); - /* - * TLV place holder for array nlo_configured_parameters(nlo_list) - * TLV place holder for array of uint32_t channel_list - * TLV place holder for chnnl prediction cfg - */ - len = sizeof(*cmd) + - WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE; - - len += sizeof(uint32_t) * QDF_MIN(pno->aNetworks[0].ucChannelCount, - WMI_NLO_MAX_CHAN); - len += sizeof(nlo_configured_parameters) * - QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); - len += sizeof(nlo_channel_prediction_cfg); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } + num_channels = (uint32_t) QDF_MIN(pno->aNetworks[0].ucChannelCount, + WMI_NLO_MAX_CHAN); - cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); + if (num_channels) { + channel_list = qdf_mem_malloc(sizeof(uint32_t) * num_channels); + if (!channel_list) + return QDF_STATUS_E_FAILURE; - buf_ptr = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_nlo_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_nlo_config_cmd_fixed_param)); - cmd->vdev_id = pno->sessionId; - cmd->flags = WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN; - - /* Current FW does not support min-max range for dwell time */ - cmd->active_dwell_time = pno->active_max_time; - cmd->passive_dwell_time = pno->passive_max_time; - - /* Copy scan interval */ - cmd->fast_scan_period = pno->fast_scan_period; - cmd->slow_scan_period = pno->slow_scan_period; - cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles; - WMA_LOGD("fast_scan_period: %d msec slow_scan_period: %d msec", - cmd->fast_scan_period, cmd->slow_scan_period); - WMA_LOGD("fast_scan_max_cycles: %d", cmd->fast_scan_max_cycles); - - buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - - cmd->no_of_ssids = QDF_MIN(pno->ucNetworksCount, WMI_NLO_MAX_SSIDS); - WMA_LOGD("SSID count : %d", cmd->no_of_ssids); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - cmd->no_of_ssids * sizeof(nlo_configured_parameters)); - buf_ptr += WMI_TLV_HDR_SIZE; - - nlo_list = (nlo_configured_parameters *) buf_ptr; - for (i = 0; i < cmd->no_of_ssids; i++) { - WMITLV_SET_HDR(&nlo_list[i].tlv_header, - WMITLV_TAG_ARRAY_BYTE, - WMITLV_GET_STRUCT_TLVLEN - (nlo_configured_parameters)); - /* Copy ssid and it's length */ - nlo_list[i].ssid.valid = true; - nlo_list[i].ssid.ssid.ssid_len = pno->aNetworks[i].ssId.length; - qdf_mem_copy(nlo_list[i].ssid.ssid.ssid, - pno->aNetworks[i].ssId.ssId, - nlo_list[i].ssid.ssid.ssid_len); - WMA_LOGD("index: %d ssid: %.*s len: %d", i, - nlo_list[i].ssid.ssid.ssid_len, - (char *)nlo_list[i].ssid.ssid.ssid, - nlo_list[i].ssid.ssid.ssid_len); - - /* Copy rssi threshold */ - if (pno->aNetworks[i].rssiThreshold && - pno->aNetworks[i].rssiThreshold > WMA_RSSI_THOLD_DEFAULT) { - nlo_list[i].rssi_cond.valid = true; - nlo_list[i].rssi_cond.rssi = - pno->aNetworks[i].rssiThreshold; - WMA_LOGD("RSSI threshold : %d dBm", - nlo_list[i].rssi_cond.rssi); + for (i = 0; i < num_channels; i++) { + channel_list[i] = pno->aNetworks[0].aChannels[i]; + + if (channel_list[i] < WMA_NLO_FREQ_THRESH) + channel_list[i] = + cds_chan_to_freq(channel_list[i]); } - nlo_list[i].bcast_nw_type.valid = true; - nlo_list[i].bcast_nw_type.bcast_nw_type = - pno->aNetworks[i].bcastNetwType; - WMA_LOGI("Broadcast NW type (%u)", - nlo_list[i].bcast_nw_type.bcast_nw_type); } - buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters); - /* Copy channel info */ - cmd->num_of_channels = QDF_MIN(pno->aNetworks[0].ucChannelCount, - WMI_NLO_MAX_CHAN); - WMA_LOGD("Channel count: %d", cmd->num_of_channels); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (cmd->num_of_channels * sizeof(uint32_t))); - buf_ptr += WMI_TLV_HDR_SIZE; - - channel_list = (uint32_t *) buf_ptr; - for (i = 0; i < cmd->num_of_channels; i++) { - channel_list[i] = pno->aNetworks[0].aChannels[i]; - - if (channel_list[i] < WMA_NLO_FREQ_THRESH) - channel_list[i] = cds_chan_to_freq(channel_list[i]); - - WMA_LOGD("Ch[%d]: %d MHz", i, channel_list[i]); - } - buf_ptr += cmd->num_of_channels * sizeof(uint32_t); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - sizeof(nlo_channel_prediction_cfg)); - buf_ptr += WMI_TLV_HDR_SIZE; - wma_set_pno_channel_prediction(buf_ptr, pno); - buf_ptr += WMI_TLV_HDR_SIZE; - /* TODO: Discrete firmware doesn't have command/option to configure - * App IE which comes from wpa_supplicant as of part PNO start request. - */ - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; + params = qdf_mem_malloc(sizeof(struct pno_scan_req_params)); + + params->enable = pno->enable; + params->modePNO = (enum pno_mode) pno->modePNO; + params->ucNetworksCount = pno->ucNetworksCount; + params->sessionId = pno->sessionId; + params->fast_scan_period = pno->fast_scan_period; + params->slow_scan_period = pno->slow_scan_period; + params->fast_scan_max_cycles = pno->fast_scan_max_cycles; + params->active_min_time = pno->active_min_time; + params->active_max_time = pno->active_max_time; + params->passive_min_time = pno->passive_min_time; + params->passive_max_time = pno->passive_max_time; + params->us24GProbeTemplateLen = pno->us24GProbeTemplateLen; + qdf_mem_copy(params->p24GProbeTemplate, pno->p24GProbeTemplate, + WMI_PNO_MAX_PB_REQ_SIZE); + params->us5GProbeTemplateLen = pno->us5GProbeTemplateLen; + qdf_mem_copy(params->p5GProbeTemplate, pno->p5GProbeTemplate, + WMI_PNO_MAX_PB_REQ_SIZE); +#ifdef FEATURE_WLAN_SCAN_PNO + params->pno_channel_prediction = pno->pno_channel_prediction; + params->top_k_num_of_channels = pno->top_k_num_of_channels; + params->stationary_thresh = pno->stationary_thresh; + params->channel_prediction_full_scan = + pno->channel_prediction_full_scan; +#endif + for (i = 0; i < WMI_PNO_MAX_SUPP_NETWORKS; i++) { + params->aNetworks[i].authentication = + pno->aNetworks[i].authentication; + params->aNetworks[i].encryption = pno->aNetworks[i].encryption; + params->aNetworks[i].bcastNetwType = + pno->aNetworks[i].bcastNetwType; + params->aNetworks[i].ucChannelCount = + pno->aNetworks[i].ucChannelCount; + params->aNetworks[i].rssiThreshold = + pno->aNetworks[i].rssiThreshold; + qdf_mem_copy(params->aNetworks[i].aChannels, + pno->aNetworks[i].aChannels, + WMI_PNO_MAX_NETW_CHANNELS_EX); + params->aNetworks[i].ssid.length = + pno->aNetworks[i].ssId.length; + qdf_mem_copy(params->aNetworks[i].ssid.mac_ssid, + pno->aNetworks[i].ssId.ssId, + WMI_MAC_MAX_SSID_LENGTH); + } + + status = wmi_unified_pno_start_cmd(wma->wmi_handle, + params, channel_list); + if (QDF_IS_STATUS_ERROR(status)) { + qdf_mem_free(channel_list); + return status; } + qdf_mem_free(channel_list); wma->interfaces[pno->sessionId].pno_in_progress = true; WMA_LOGD("PNO start request sent successfully for vdev %d", pno->sessionId); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -3099,12 +2676,7 @@ QDF_STATUS wma_pno_start(tp_wma_handle wma, tpSirPNOScanReq pno) */ QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) { - wmi_nlo_config_cmd_fixed_param *cmd; - int32_t len = sizeof(*cmd); - wmi_buf_t buf; - uint8_t *buf_ptr; - int ret; - + QDF_STATUS status; if (!wma->interfaces[vdev_id].pno_in_progress) { WMA_LOGD("No active pno session found for vdev %d, skip pno stop request", vdev_id); @@ -3113,53 +2685,15 @@ QDF_STATUS wma_pno_stop(tp_wma_handle wma, uint8_t vdev_id) WMA_LOGD("PNO Stop"); - /* - * TLV place holder for array of structures nlo_configured_parameters - * TLV place holder for array of uint32_t channel_list - * TLV place holder for chnl prediction cfg - */ - len += WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE + WMI_TLV_HDR_SIZE; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_nlo_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_nlo_config_cmd_fixed_param)); - - cmd->vdev_id = vdev_id; - cmd->flags = WMI_NLO_CONFIG_STOP; - buf_ptr += sizeof(*cmd); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } + status = wmi_unified_pno_stop_cmd(wma->wmi_handle, vdev_id); + if (QDF_IS_STATUS_ERROR(status)) + return status; wma->interfaces[vdev_id].pno_in_progress = false; WMA_LOGD("PNO stop request sent successfully for vdev %d", vdev_id); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -3200,13 +2734,11 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) */ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) { - wmi_vdev_plmreq_start_cmd_fixed_param *cmd; - uint32_t *channel_list; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint8_t count; - int ret; + struct plm_req_params params = {0}; + uint32_t num_channels; + uint32_t *channel_list = NULL; + uint32_t i; + QDF_STATUS status; if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); @@ -3214,75 +2746,51 @@ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) } WMA_LOGD("PLM Start"); - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; /* TLV place holder for channel_list */ - len += sizeof(uint32_t) * plm->plmNumCh; + num_channels = plm->plmNumCh; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - cmd = (wmi_vdev_plmreq_start_cmd_fixed_param *) wmi_buf_data(buf); + if (num_channels) { + channel_list = qdf_mem_malloc(sizeof(uint32_t) * num_channels); + if (!channel_list) + return QDF_STATUS_E_FAILURE; - buf_ptr = (uint8_t *) cmd; + for (i = 0; i < num_channels; i++) { + channel_list[i] = plm->plmChList[i]; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_plmreq_start_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_plmreq_start_cmd_fixed_param)); - - cmd->vdev_id = plm->sessionId; - - cmd->meas_token = plm->meas_token; - cmd->dialog_token = plm->diag_token; - cmd->number_bursts = plm->numBursts; - cmd->burst_interval = WMA_SEC_TO_MSEC(plm->burstInt); - cmd->off_duration = plm->measDuration; - cmd->burst_cycle = plm->burstLen; - cmd->tx_power = plm->desiredTxPwr; - WMI_CHAR_ARRAY_TO_MAC_ADDR(plm->mac_addr.bytes, &cmd->dest_mac); - cmd->num_chans = plm->plmNumCh; - - buf_ptr += sizeof(wmi_vdev_plmreq_start_cmd_fixed_param); - - WMA_LOGD("vdev : %d measu token : %d", cmd->vdev_id, cmd->meas_token); - WMA_LOGD("dialog_token: %d", cmd->dialog_token); - WMA_LOGD("number_bursts: %d", cmd->number_bursts); - WMA_LOGD("burst_interval: %d", cmd->burst_interval); - WMA_LOGD("off_duration: %d", cmd->off_duration); - WMA_LOGD("burst_cycle: %d", cmd->burst_cycle); - WMA_LOGD("tx_power: %d", cmd->tx_power); - WMA_LOGD("Number of channels : %d", cmd->num_chans); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, - (cmd->num_chans * sizeof(uint32_t))); - - buf_ptr += WMI_TLV_HDR_SIZE; - if (cmd->num_chans) { - channel_list = (uint32_t *) buf_ptr; - for (count = 0; count < cmd->num_chans; count++) { - channel_list[count] = plm->plmChList[count]; - if (channel_list[count] < WMA_NLO_FREQ_THRESH) - channel_list[count] = - cds_chan_to_freq(channel_list[count]); - WMA_LOGD("Ch[%d]: %d MHz", count, channel_list[count]); + if (channel_list[i] < WMA_NLO_FREQ_THRESH) + channel_list[i] = + cds_chan_to_freq(channel_list[i]); } - buf_ptr += cmd->num_chans * sizeof(uint32_t); } - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_PLMREQ_START_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send plm start wmi cmd", __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; + params.diag_token = plm->diag_token; + params.meas_token = plm->meas_token; + params.num_bursts = plm->numBursts; + params.burst_int = plm->burstInt; + params.meas_duration = plm->measDuration; + params.burst_len = plm->burstLen; + params.desired_tx_pwr = plm->desiredTxPwr; + params.plm_num_ch = plm->plmNumCh; + params.session_id = plm->sessionId; + params.enable = plm->enable; + qdf_mem_copy(¶ms.mac_addr, &plm->mac_addr, + sizeof(struct qdf_mac_addr)); + qdf_mem_copy(params.plm_ch_list, plm->plmChList, + WMI_CFG_VALID_CHANNEL_LIST_LEN); + + status = wmi_unified_plm_start_cmd(wma->wmi_handle, + ¶ms, channel_list); + if (QDF_IS_STATUS_ERROR(status)) { + qdf_mem_free(channel_list); + return status; } + + qdf_mem_free(channel_list); wma->interfaces[plm->sessionId].plm_in_progress = true; WMA_LOGD("Plm start request sent successfully for vdev %d", plm->sessionId); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -3296,11 +2804,8 @@ QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm) */ QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) { - wmi_vdev_plmreq_stop_cmd_fixed_param *cmd; - int32_t len; - wmi_buf_t buf; - uint8_t *buf_ptr; - int ret; + struct plm_req_params params = {0}; + QDF_STATUS status; if (NULL == plm || NULL == wma) { WMA_LOGE("%s: input pointer is NULL ", __func__); @@ -3314,40 +2819,32 @@ QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm) WMA_LOGD("PLM Stop"); - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_vdev_plmreq_stop_cmd_fixed_param *) wmi_buf_data(buf); - - buf_ptr = (uint8_t *) cmd; - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_plmreq_stop_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_plmreq_stop_cmd_fixed_param)); - - cmd->vdev_id = plm->sessionId; - - cmd->meas_token = plm->meas_token; - WMA_LOGD("vdev %d meas token %d", cmd->vdev_id, cmd->meas_token); + params.diag_token = plm->diag_token; + params.meas_token = plm->meas_token; + params.num_bursts = plm->numBursts; + params.burst_int = plm->burstInt; + params.meas_duration = plm->measDuration; + params.burst_len = plm->burstLen; + params.desired_tx_pwr = plm->desiredTxPwr; + params.plm_num_ch = plm->plmNumCh; + params.session_id = plm->sessionId; + params.enable = plm->enable; + qdf_mem_copy(¶ms.mac_addr, &plm->mac_addr, + sizeof(struct qdf_mac_addr)); + qdf_mem_copy(params.plm_ch_list, plm->plmChList, + WMI_CFG_VALID_CHANNEL_LIST_LEN); + + status = wmi_unified_plm_stop_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_PLMREQ_STOP_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send plm stop wmi cmd", __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } wma->interfaces[plm->sessionId].plm_in_progress = false; WMA_LOGD("Plm stop request sent successfully for vdev %d", plm->sessionId); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -4965,9 +4462,10 @@ QDF_STATUS wma_get_buf_extscan_start_cmd(tp_wma_handle wma_handle, QDF_STATUS wma_start_extscan(tp_wma_handle wma, tSirWifiScanCmdReqParams *pstart) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf; - int len; + struct wifi_scan_cmd_req_params *params = {0}; + int i, j; + QDF_STATUS status; + if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); @@ -4978,30 +4476,62 @@ QDF_STATUS wma_start_extscan(tp_wma_handle wma, WMA_LOGE("%s: extscan feature bit not enabled", __func__); return QDF_STATUS_E_FAILURE; } - /* Fill individual elements of extscan request and - * TLV for buckets, channel list. - */ - qdf_status = wma_get_buf_extscan_start_cmd(wma, pstart, &buf, &len); - if (qdf_status != QDF_STATUS_SUCCESS) { - WMA_LOGE("%s: Failed to get buffer for ext scan cmd", __func__); - return QDF_STATUS_E_FAILURE; - } - if (!buf) { - WMA_LOGE("%s:Failed to get buffer" - "for current extscan info", __func__); - return QDF_STATUS_E_FAILURE; - } - if (wmi_unified_cmd_send(wma->wmi_handle, buf, - len, WMI_EXTSCAN_START_CMDID)) { - WMA_LOGE("%s: failed to send command", __func__); - qdf_nbuf_free(buf); - return QDF_STATUS_E_FAILURE; + + params = qdf_mem_malloc(sizeof(struct wifi_scan_cmd_req_params)); + + params->basePeriod = pstart->basePeriod; + params->maxAPperScan = pstart->maxAPperScan; + params->report_threshold_percent = pstart->report_threshold_percent; + params->report_threshold_num_scans = pstart->report_threshold_num_scans; + params->requestId = pstart->requestId; + params->sessionId = pstart->sessionId; + params->numBuckets = pstart->numBuckets; + params->min_dwell_time_active = pstart->min_dwell_time_active; + params->min_dwell_time_passive = pstart->min_dwell_time_passive; + params->max_dwell_time_active = pstart->max_dwell_time_active; + params->max_dwell_time_passive = pstart->max_dwell_time_passive; + params->configuration_flags = pstart->configuration_flags; + for (i = 0; i < WMI_WLAN_EXTSCAN_MAX_BUCKETS; i++) { + params->buckets[i].bucket = pstart->buckets[i].bucket; + params->buckets[i].band = + (enum wmi_wifi_band) pstart->buckets[i].band; + params->buckets[i].period = pstart->buckets[i].period; + params->buckets[i].reportEvents = + pstart->buckets[i].reportEvents; + params->buckets[i].max_period = pstart->buckets[i].max_period; + params->buckets[i].exponent = pstart->buckets[i].exponent; + params->buckets[i].step_count = pstart->buckets[i].step_count; + params->buckets[i].numChannels = pstart->buckets[i].numChannels; + params->buckets[i].min_dwell_time_active = + pstart->buckets[i].min_dwell_time_active; + params->buckets[i].min_dwell_time_passive = + pstart->buckets[i].min_dwell_time_passive; + params->buckets[i].max_dwell_time_active = + pstart->buckets[i].max_dwell_time_active; + params->buckets[i].max_dwell_time_passive = + pstart->buckets[i].max_dwell_time_passive; + for (j = 0; j < WLAN_EXTSCAN_MAX_CHANNELS; j++) { + params->buckets[i].channels[j].channel = + pstart->buckets[i].channels[j].channel; + params->buckets[i].channels[j].dwellTimeMs = + pstart->buckets[i].channels[j].dwellTimeMs; + params->buckets[i].channels[j].passive = + pstart->buckets[i].channels[j].passive; + params->buckets[i].channels[j].chnlClass = + pstart->buckets[i].channels[j].chnlClass; + } } + + status = wmi_unified_start_extscan_cmd(wma->wmi_handle, + params); + if (QDF_IS_STATUS_ERROR(status)) + return status; + wma->interfaces[pstart->sessionId].extscan_in_progress = true; WMA_LOGD("Extscan start request sent successfully for vdev %d", pstart->sessionId); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -5016,10 +4546,8 @@ QDF_STATUS wma_start_extscan(tp_wma_handle wma, QDF_STATUS wma_stop_extscan(tp_wma_handle wma, tSirExtScanStopReqParams *pstopcmd) { - wmi_extscan_stop_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; + struct extscan_stop_req_params params = {0}; + QDF_STATUS status; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); @@ -5030,33 +4558,20 @@ QDF_STATUS wma_stop_extscan(tp_wma_handle wma, WMA_LOGE("%s: extscan not enabled", __func__); return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_stop_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_stop_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_stop_cmd_fixed_param)); - cmd->request_id = pstopcmd->requestId; - cmd->vdev_id = pstopcmd->sessionId; + params.request_id = pstopcmd->requestId; + params.session_id = pstopcmd->sessionId; + + status = wmi_unified_stop_extscan_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_STOP_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } wma->interfaces[pstopcmd->sessionId].extscan_in_progress = false; WMA_LOGD("Extscan stop request sent successfully for vdev %d", pstopcmd->sessionId); - return QDF_STATUS_SUCCESS; + return status; } /** wma_get_hotlist_entries_per_page() - hotlist entries per page @@ -5151,11 +4666,7 @@ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, tSirExtScanResetBssidHotlistReqParams *photlist_reset) { - wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; - int hotlist_entries = 0; + struct extscan_bssid_hotlist_reset_params params = {0}; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); @@ -5170,44 +4681,12 @@ QDF_STATUS wma_extscan_stop_hotlist_monitor(tp_wma_handle wma, WMA_LOGE("%s: extscan not enabled", __func__); return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - - /* reset bssid hotlist with tlv set to 0 */ - len += WMI_TLV_HDR_SIZE; - len += hotlist_entries * sizeof(wmi_extscan_hotlist_entry); - - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param *) - buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_configure_hotlist_monitor_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_configure_hotlist_monitor_cmd_fixed_param)); + params.request_id = photlist_reset->requestId; + params.session_id = photlist_reset->requestId; - cmd->request_id = photlist_reset->requestId; - cmd->vdev_id = photlist_reset->sessionId; - cmd->mode = 0; - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - hotlist_entries * sizeof(wmi_extscan_hotlist_entry)); - buf_ptr += WMI_TLV_HDR_SIZE + - (hotlist_entries * sizeof(wmi_extscan_hotlist_entry)); - - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_extscan_stop_hotlist_monitor_cmd(wma->wmi_handle, + ¶ms); } /** @@ -5308,37 +4787,30 @@ QDF_STATUS wma_extscan_start_change_monitor(tp_wma_handle wma, tSirExtScanSetSigChangeReqParams * psigchange) { - QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; - wmi_buf_t buf; - int len; + struct extscan_set_sig_changereq_params params = {0}; + int i = 0; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed,can not issue extscan cmd", __func__); return QDF_STATUS_E_INVAL; } - /* Fill individual elements of change monitor and - * TLV info ... */ - qdf_status = wma_get_buf_extscan_change_monitor_cmd(wma, - psigchange, &buf, - &len); - if (qdf_status != QDF_STATUS_SUCCESS) { - WMA_LOGE("%s: Failed to get buffer for change monitor cmd", - __func__); - return QDF_STATUS_E_FAILURE; - } - if (!buf) { - WMA_LOGE("%s: Failed to get buffer", __func__); - return QDF_STATUS_E_FAILURE; + params.request_id = psigchange->requestId; + params.session_id = psigchange->sessionId; + params.rssi_sample_size = psigchange->rssiSampleSize; + params.lostap_sample_size = psigchange->lostApSampleSize; + params.min_breaching = psigchange->minBreaching; + params.num_ap = psigchange->numAp; + for (i = 0; i < WLAN_EXTSCAN_MAX_SIGNIFICANT_CHANGE_APS; i++) { + qdf_mem_copy(¶ms.ap[i].bssid, &psigchange->ap[i].bssid, + sizeof(struct qdf_mac_addr)); + params.ap[i].high = psigchange->ap[i].high; + params.ap[i].low = psigchange->ap[i].low; } - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { - WMA_LOGE("%s: failed to send command", __func__); - qdf_nbuf_free(buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + + return wmi_unified_extscan_start_change_monitor_cmd(wma->wmi_handle, + ¶ms); } /** @@ -5354,11 +4826,7 @@ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, tSirExtScanResetSignificantChangeReqParams *pResetReq) { - wmi_extscan_configure_wlan_change_monitor_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; - int change_list = 0; + struct extscan_capabilities_reset_params params = {0}; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); @@ -5369,45 +4837,12 @@ QDF_STATUS wma_extscan_stop_change_monitor(tp_wma_handle wma, WMA_LOGE("%s: ext scan not enabled", __func__); return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - /* reset significant change tlv is set to 0 */ - len += WMI_TLV_HDR_SIZE; - len += change_list * sizeof(wmi_extscan_wlan_change_bssid_param); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); + params.request_id = pResetReq->requestId; + params.session_id = pResetReq->sessionId; - cmd = (wmi_extscan_configure_wlan_change_monitor_cmd_fixed_param *) - buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_configure_wlan_change_monitor_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_configure_wlan_change_monitor_cmd_fixed_param)); - - cmd->request_id = pResetReq->requestId; - cmd->vdev_id = pResetReq->sessionId; - cmd->mode = 0; - - buf_ptr += sizeof(*cmd); - WMITLV_SET_HDR(buf_ptr, - WMITLV_TAG_ARRAY_STRUC, - change_list * - sizeof(wmi_extscan_wlan_change_bssid_param)); - buf_ptr += WMI_TLV_HDR_SIZE + (change_list * - sizeof - (wmi_extscan_wlan_change_bssid_param)); - - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_extscan_stop_change_monitor_cmd(wma->wmi_handle, + ¶ms); } /** @@ -5423,10 +4858,7 @@ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, tSirExtScanGetCachedResultsReqParams * pcached_results) { - wmi_extscan_get_cached_results_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; + struct extscan_cached_result_params params = {0}; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, cannot issue cmd", __func__); @@ -5437,31 +4869,13 @@ QDF_STATUS wma_extscan_get_cached_results(tp_wma_handle wma, WMA_LOGE("%s: extscan not enabled", __func__); return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_get_cached_results_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_get_cached_results_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_get_cached_results_cmd_fixed_param)); - - cmd->request_id = pcached_results->requestId; - cmd->vdev_id = pcached_results->sessionId; - cmd->control_flags = pcached_results->flush; + params.request_id = pcached_results->requestId; + params.session_id = pcached_results->sessionId; + params.flush = pcached_results->flush; - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_extscan_get_cached_results_cmd(wma->wmi_handle, + ¶ms); } /** @@ -5477,10 +4891,7 @@ QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, tSirGetExtScanCapabilitiesReqParams * pgetcapab) { - wmi_extscan_get_capabilities_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; + struct extscan_capabilities_params params = {0}; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); @@ -5491,41 +4902,21 @@ QDF_STATUS wma_extscan_get_capabilities(tp_wma_handle wma, WMA_LOGE("%s: extscan not enabled", __func__); return QDF_STATUS_E_FAILURE; } - len = sizeof(*cmd); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_extscan_get_capabilities_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_extscan_get_capabilities_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_extscan_get_capabilities_cmd_fixed_param)); + params.request_id = pgetcapab->requestId; + params.session_id = pgetcapab->sessionId; - cmd->request_id = pgetcapab->requestId; - - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_EXTSCAN_GET_CAPABILITIES_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + return wmi_unified_extscan_get_capabilities_cmd(wma->wmi_handle, + ¶ms); } QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload) { - wmi_ipa_offload_enable_disable_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - u_int8_t *buf_ptr; ol_txrx_vdev_handle vdev; struct txrx_pdev_cfg_t *cfg; int32_t intra_bss_fwd = 0; + struct ipa_offload_control_params params = {0}; QDF_STATUS status; if (!wma || !wma->wmi_handle) { @@ -5549,34 +4940,14 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, return QDF_STATUS_E_INVAL; } - len = sizeof(*cmd); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed (len=%d)", __func__, len); - return QDF_STATUS_E_NOMEM; - } - - WMA_LOGE("%s: offload_type=%d, enable=%d", __func__, - ipa_offload->offload_type, ipa_offload->enable); - - buf_ptr = (u_int8_t *)wmi_buf_data(wmi_buf); + params.offload_type = ipa_offload->offload_type; + params.vdev_id = ipa_offload->vdev_id; + params.enable = ipa_offload->enable; - cmd = (wmi_ipa_offload_enable_disable_cmd_fixed_param *)buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUCT_wmi_ipa_offload_enable_disable_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_ipa_offload_enable_disable_cmd_fixed_param)); - - cmd->offload_type = ipa_offload->offload_type; - cmd->vdev_id = ipa_offload->vdev_id; - cmd->enable = ipa_offload->enable; - - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID)) { - WMA_LOGE("%s: failed to command", __func__); - wmi_buf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } + status = wmi_unified_ipa_offload_control_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; /* * Check if VDEV is already deleted. If deleted, don't @@ -5619,12 +4990,9 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, struct wifi_epno_params *req) { - wmi_nlo_config_cmd_fixed_param *cmd; - nlo_configured_parameters *nlo_list; - u_int8_t i, *buf_ptr; - wmi_buf_t buf; - uint32_t len; - int ret; + struct wifi_enhanched_pno_params params = {0}; + uint8_t i = 0; + QDF_STATUS status; WMA_LOGD("wma_set_epno_network_list"); @@ -5638,94 +5006,30 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, return QDF_STATUS_E_NOSUPPORT; } - /* TLV place holder for array of structures - * nlo_configured_parameters(nlo_list) */ - len = sizeof(*cmd) + WMI_TLV_HDR_SIZE; - len += sizeof(nlo_configured_parameters) * - QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); - len += WMI_TLV_HDR_SIZE; /* TLV for channel_list */ - len += WMI_TLV_HDR_SIZE; /* TLV for channel prediction cfg*/ - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_nlo_config_cmd_fixed_param *) wmi_buf_data(buf); - - buf_ptr = (u_int8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_nlo_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_nlo_config_cmd_fixed_param)); - cmd->vdev_id = req->session_id; - cmd->flags = WMI_NLO_CONFIG_ENLO; - - buf_ptr += sizeof(wmi_nlo_config_cmd_fixed_param); - - cmd->no_of_ssids = QDF_MIN(req->num_networks, WMI_NLO_MAX_SSIDS); - WMA_LOGD("SSID count: %d", cmd->no_of_ssids); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - cmd->no_of_ssids * sizeof(nlo_configured_parameters)); - buf_ptr += WMI_TLV_HDR_SIZE; - - nlo_list = (nlo_configured_parameters *) buf_ptr; - for (i = 0; i < cmd->no_of_ssids; i++) { - WMITLV_SET_HDR(&nlo_list[i].tlv_header, - WMITLV_TAG_ARRAY_BYTE, - WMITLV_GET_STRUCT_TLVLEN(nlo_configured_parameters)); - /* Copy ssid and it's length */ - nlo_list[i].ssid.valid = true; - nlo_list[i].ssid.ssid.ssid_len = req->networks[i].ssid.length; - qdf_mem_copy(nlo_list[i].ssid.ssid.ssid, - req->networks[i].ssid.ssId, - nlo_list[i].ssid.ssid.ssid_len); - WMA_LOGD("index: %d ssid: %.*s len: %d", i, - nlo_list[i].ssid.ssid.ssid_len, - (char *) nlo_list[i].ssid.ssid.ssid, - nlo_list[i].ssid.ssid.ssid_len); - - /* Copy rssi threshold */ - nlo_list[i].rssi_cond.valid = true; - nlo_list[i].rssi_cond.rssi = - req->networks[i].rssi_threshold; - WMA_LOGD("RSSI threshold : %d dBm", - nlo_list[i].rssi_cond.rssi); - - /* Copy pno flags */ - nlo_list[i].bcast_nw_type.valid = true; - nlo_list[i].bcast_nw_type.bcast_nw_type = - req->networks[i].flags; - WMA_LOGD("PNO flags (%u)", - nlo_list[i].bcast_nw_type.bcast_nw_type); - - /* Copy auth bit field */ - nlo_list[i].auth_type.valid = true; - nlo_list[i].auth_type.auth_type = + params.request_id = req->request_id; + params.session_id = req->session_id; + params.num_networks = req->num_networks; + for (i = 0; i < req->num_networks; i++) { + params.networks[i].rssi_threshold = + req->networks[i].rssi_threshold; + params.networks[i].auth_bit_field = req->networks[i].auth_bit_field; - WMA_LOGD("Auth bit field (%u)", - nlo_list[i].auth_type.auth_type); + params.networks[i].flags = req->networks[i].flags; + params.networks[i].ssid.length = req->networks[i].ssid.length; + qdf_mem_copy(params.networks[i].ssid.mac_ssid, + req->networks[i].ssid.ssId, + WMI_MAC_MAX_SSID_LENGTH); } - buf_ptr += cmd->no_of_ssids * sizeof(nlo_configured_parameters); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_UINT32, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); - buf_ptr += WMI_TLV_HDR_SIZE; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send nlo wmi cmd", __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } + status = wmi_unified_set_epno_network_list_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; WMA_LOGD("set ePNO list request sent successfully for vdev %d", req->session_id); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -5741,11 +5045,9 @@ QDF_STATUS wma_set_epno_network_list(tp_wma_handle wma, QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { - wmi_passpoint_config_cmd_fixed_param *cmd; - u_int8_t i, j, *bytes; - wmi_buf_t buf; - uint32_t len; - int ret; + struct wifi_passpoint_req_param params = {0}; + int i = 0; + QDF_STATUS status; WMA_LOGD("wma_set_passpoint_network_list"); @@ -5759,55 +5061,30 @@ QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, return QDF_STATUS_E_NOSUPPORT; } - len = sizeof(*cmd); + params.request_id = req->request_id; + params.session_id = req->session_id; + params.num_networks = req->num_networks; for (i = 0; i < req->num_networks; i++) { - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_passpoint_config_cmd_fixed_param *) - wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_passpoint_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_passpoint_config_cmd_fixed_param)); - cmd->id = req->networks[i].id; - WMA_LOGD("%s: network id: %u", __func__, cmd->id); - qdf_mem_copy(cmd->realm, req->networks[i].realm, - strlen(req->networks[i].realm) + 1); - WMA_LOGD("%s: realm: %s", __func__, cmd->realm); - for (j = 0; j < PASSPOINT_ROAMING_CONSORTIUM_ID_NUM; j++) { - bytes = (uint8_t *) &req->networks[i].roaming_consortium_ids[j]; - WMA_LOGD("index: %d rcids: %02x %02x %02x %02x %02x %02x %02x %02x", - j, bytes[0], bytes[1], bytes[2], bytes[3], - bytes[4], bytes[5], bytes[6], bytes[7]); - - qdf_mem_copy(&cmd->roaming_consortium_ids[j], - &req->networks[i].roaming_consortium_ids[j], - PASSPOINT_ROAMING_CONSORTIUM_ID_LEN); - } - qdf_mem_copy(cmd->plmn, req->networks[i].plmn, - PASSPOINT_PLMN_ID_LEN); - WMA_LOGD("%s: plmn: %02x:%02x:%02x", __func__, - cmd->plmn[0], cmd->plmn[1], cmd->plmn[2]); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PASSPOINT_LIST_CONFIG_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send set passpoint network list wmi cmd", - __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } - } + params.networks[i].id = req->networks[i].id; + qdf_mem_copy(params.networks[i].realm, req->networks[i].realm, + WMI_PASSPOINT_REALM_LEN); + qdf_mem_copy(params.networks[i].roaming_consortium_ids, + req->networks[i].roaming_consortium_ids, + WMI_PASSPOINT_ROAMING_CONSORTIUM_ID_NUM * + sizeof(int64_t)); + qdf_mem_copy(params.networks[i].plmn, req->networks[i].plmn, + WMI_PASSPOINT_PLMN_LEN); + } + + status = wmi_unified_set_passpoint_network_list_cmd(wma->wmi_handle, + ¶ms); + if (QDF_IS_STATUS_ERROR(status)) + return status; WMA_LOGD("Set passpoint network list request is sent successfully for vdev %d", req->session_id); - return QDF_STATUS_SUCCESS; + return status; } /** @@ -5823,10 +5100,8 @@ QDF_STATUS wma_set_passpoint_network_list(tp_wma_handle wma, QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, struct wifi_passpoint_req *req) { - wmi_passpoint_config_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint32_t len; - int ret; + struct wifi_passpoint_req_param params = {0}; + int i = 0; WMA_LOGD("wma_reset_passpoint_network_list"); @@ -5840,34 +5115,23 @@ QDF_STATUS wma_reset_passpoint_network_list(tp_wma_handle wma, return QDF_STATUS_E_NOSUPPORT; } - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s: Failed allocate wmi buffer", __func__); - return QDF_STATUS_E_NOMEM; - } - - cmd = (wmi_passpoint_config_cmd_fixed_param *) wmi_buf_data(buf); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_passpoint_config_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_passpoint_config_cmd_fixed_param)); - cmd->id = WMI_PASSPOINT_NETWORK_ID_WILDCARD; - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PASSPOINT_LIST_CONFIG_CMDID); - if (ret) { - WMA_LOGE("%s: Failed to send reset passpoint network list wmi cmd", - __func__); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } - - WMA_LOGD("Reset passpoint network list request is sent successfully for vdev %d", - req->session_id); - - return QDF_STATUS_SUCCESS; + params.request_id = req->request_id; + params.session_id = req->session_id; + params.num_networks = req->num_networks; + for (i = 0; i < req->num_networks; i++) { + params.networks[i].id = req->networks[i].id; + qdf_mem_copy(params.networks[i].realm, req->networks[i].realm, + WMI_PASSPOINT_REALM_LEN); + qdf_mem_copy(params.networks[i].roaming_consortium_ids, + req->networks[i].roaming_consortium_ids, + WMI_PASSPOINT_ROAMING_CONSORTIUM_ID_NUM * + sizeof(int64_t)); + qdf_mem_copy(params.networks[i].plmn, req->networks[i].plmn, + WMI_PASSPOINT_PLMN_LEN); + } + + return wmi_unified_reset_passpoint_network_list_cmd(wma->wmi_handle, + ¶ms); } /** @@ -5918,43 +5182,20 @@ wma_set_ssid_hotlist(tp_wma_handle wma, */ QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui) { - wmi_scan_prob_req_oui_cmd_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t len; - uint8_t *buf_ptr; - uint32_t *oui_buf; + struct scan_mac_oui set_oui; + + qdf_mem_set(&set_oui, sizeof(struct scan_mac_oui), 0); if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", __func__); return QDF_STATUS_E_INVAL; } - len = sizeof(*cmd); - wmi_buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - cmd = (wmi_scan_prob_req_oui_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_scan_prob_req_oui_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_scan_prob_req_oui_cmd_fixed_param)); - - oui_buf = &cmd->prob_req_oui; - qdf_mem_zero(oui_buf, sizeof(cmd->prob_req_oui)); - *oui_buf = psetoui->oui[0] << 16 | psetoui->oui[1] << 8 - | psetoui->oui[2]; - WMA_LOGD("%s: wma:oui received from hdd %08x", __func__, - cmd->prob_req_oui); - - if (wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, len, - WMI_SCAN_PROB_REQ_OUI_CMDID)) { - WMA_LOGE("%s: failed to send command", __func__); - qdf_nbuf_free(wmi_buf); - return QDF_STATUS_E_FAILURE; - } - return QDF_STATUS_SUCCESS; + + qdf_mem_copy(set_oui.oui, psetoui->oui, + WMI_WIFI_SCANNING_MAC_OUI_LENGTH); + + return wmi_unified_scan_probe_setoui_cmd(wma->wmi_handle, + &set_oui); } /** @@ -6177,49 +5418,21 @@ int wma_roam_event_callback(WMA_HANDLE handle, uint8_t *event_buf, QDF_STATUS wma_set_rssi_monitoring(tp_wma_handle wma, struct rssi_monitor_req *req) { - wmi_rssi_breach_monitor_config_fixed_param *cmd; - wmi_buf_t buf; - int ret, len = sizeof(*cmd); + struct rssi_monitor_param params = {0}; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_INVAL; } - cmd = (wmi_rssi_breach_monitor_config_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_rssi_breach_monitor_config_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_rssi_breach_monitor_config_fixed_param)); - - cmd->vdev_id = req->session_id; - cmd->request_id = req->request_id; - cmd->lo_rssi_reenable_hysteresis = 0; - cmd->hi_rssi_reenable_histeresis = 0; - cmd->min_report_interval = 0; - cmd->max_num_report = 1; - if (req->control) { - /* enable one threshold for each min/max */ - cmd->enabled_bitmap = 0x09; - cmd->low_rssi_breach_threshold[0] = req->min_rssi; - cmd->hi_rssi_breach_threshold[0] = req->max_rssi; - } else { - cmd->enabled_bitmap = 0; - cmd->low_rssi_breach_threshold[0] = 0; - cmd->hi_rssi_breach_threshold[0] = 0; - } + params.request_id = req->request_id; + params.session_id = req->session_id; + params.min_rssi = req->min_rssi; + params.max_rssi = req->max_rssi; + params.control = req->control; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID"); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; - } - - WMA_LOGI("Sent WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID to FW"); - return QDF_STATUS_SUCCESS; + return wmi_unified_set_rssi_monitoring_cmd(wma->wmi_handle, + ¶ms); } /** @@ -6265,50 +5478,28 @@ QDF_STATUS wma_get_scan_id(uint32_t *scan_id) QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, struct gateway_param_update_req *req) { - wmi_roam_subnet_change_config_fixed_param *cmd; - wmi_buf_t buf; - int ret; - int len = sizeof(*cmd); - - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGP("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } + struct gateway_update_req_param params = {0}; - cmd = (wmi_roam_subnet_change_config_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_roam_subnet_change_config_fixed_param, - WMITLV_GET_STRUCT_TLVLEN( - wmi_roam_subnet_change_config_fixed_param)); - - cmd->vdev_id = req->session_id; - qdf_mem_copy(&cmd->inet_gw_ip_v4_addr, req->ipv4_addr, - QDF_IPV4_ADDR_SIZE); - qdf_mem_copy(&cmd->inet_gw_ip_v6_addr, req->ipv6_addr, - QDF_IPV6_ADDR_SIZE); - WMI_CHAR_ARRAY_TO_MAC_ADDR(req->gw_mac_addr.bytes, - &cmd->inet_gw_mac_addr); - cmd->max_retries = req->max_retries; - cmd->timeout = req->timeout; - cmd->num_skip_subnet_change_detection_bssid_list = 0; - cmd->flag = 0; - if (req->ipv4_addr_type) - WMI_SET_ROAM_SUBNET_CHANGE_FLAG_IP4_ENABLED(cmd->flag); - - if (req->ipv6_addr_type) - WMI_SET_ROAM_SUBNET_CHANGE_FLAG_IP6_ENABLED(cmd->flag); - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_ROAM_SUBNET_CHANGE_CONFIG_CMDID); - if (ret != EOK) { - WMA_LOGE("Failed to send gw config parameter to fw, ret: %d", - ret); - wmi_buf_free(buf); - return QDF_STATUS_E_FAILURE; + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_INVAL; } - return QDF_STATUS_SUCCESS; + params.request_id = req->request_id; + params.session_id = req->session_id; + params.max_retries = req->max_retries; + params.timeout = req->timeout; + params.ipv4_addr_type = req->ipv4_addr_type; + params.ipv6_addr_type = req->ipv6_addr_type; + qdf_mem_copy(¶ms.gw_mac_addr, &req->gw_mac_addr, + sizeof(struct qdf_mac_addr)); + qdf_mem_copy(params.ipv4_addr, req->ipv4_addr, + QDF_IPV4_ADDR_SIZE); + qdf_mem_copy(params.ipv6_addr, req->ipv6_addr, + QDF_IPV6_ADDR_SIZE); + + return wmi_unified_set_gateway_params_cmd(wma->wmi_handle, + ¶ms); } #endif /* FEATURE_LFR_SUBNET_DETECTION */ -- cgit v1.2.3 From 009f1573e6c109acdec2b0f3bc3ceef58331a9f0 Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Wed, 9 Mar 2016 17:26:02 +0530 Subject: qcacld-3.0: Refactor formation of wmi mgmt. commands Move tlv formation of wmi mgmt. commands to common wmi layer from wma layer. Change-Id: Idfc5c3e2aacb297fb3fb86f4d1895db1fc3905b1 CRs-Fixed: 987362 --- core/wma/inc/wma_internal.h | 3 +- core/wma/src/wma_mgmt.c | 508 ++++++++++++-------------------------------- 2 files changed, 137 insertions(+), 374 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index be1bfc46a7ec..f72280ad8f4d 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -621,7 +621,8 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, tSirNwType nw_type, tpAddStaParams params); -int wmi_unified_vdev_set_gtx_cfg_send(wmi_unified_t wmi_handle, uint32_t if_id, +QDF_STATUS wmi_unified_vdev_set_gtx_cfg_send(wmi_unified_t wmi_handle, + uint32_t if_id, gtx_config_t *gtx_info); void wma_update_protection_mode(tp_wma_handle wma, uint8_t vdev_id, diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 89676b4c3cae..4ab70a3e2d4d 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -84,18 +84,16 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, uint8_t vdev_id, WMI_HOST_SWBA_EVENTID_param_tlvs *param_buf) { - wmi_bcn_send_from_host_cmd_fixed_param *cmd; struct ieee80211_frame *wh; struct beacon_info *bcn; wmi_tim_info *tim_info = param_buf->tim_info; uint8_t *bcn_payload; - wmi_buf_t wmi_buf; QDF_STATUS ret; struct beacon_tim_ie *tim_ie; wmi_p2p_noa_info *p2p_noa_info = param_buf->p2p_noa_info; struct p2p_sub_element_noa noa_ie; + struct wmi_bcn_send_from_host params; uint8_t i; - int status; bcn = wma->interfaces[vdev_id].beacon; if (!bcn->buf) { @@ -103,12 +101,6 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, return; } - wmi_buf = wmi_buf_alloc(wma->wmi_handle, sizeof(*cmd)); - if (!wmi_buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return; - } - qdf_spin_lock_bh(&bcn->lock); bcn_payload = qdf_nbuf_data(bcn->buf); @@ -205,38 +197,28 @@ static void wma_send_bcn_buf_ll(tp_wma_handle wma, } ret = qdf_nbuf_map_single(pdev->osdev, bcn->buf, QDF_DMA_TO_DEVICE); if (ret != QDF_STATUS_SUCCESS) { - qdf_nbuf_free(wmi_buf); WMA_LOGE("%s: failed map beacon buf to DMA region", __func__); qdf_spin_unlock_bh(&bcn->lock); return; } bcn->dma_mapped = 1; - cmd = (wmi_bcn_send_from_host_cmd_fixed_param *) wmi_buf_data(wmi_buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_bcn_send_from_host_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_bcn_send_from_host_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->data_len = bcn->len; - cmd->frame_ctrl = *((A_UINT16 *) wh->i_fc); - cmd->frag_ptr = qdf_nbuf_get_frag_paddr(bcn->buf, 0); - + params.vdev_id = vdev_id; + params.data_len = bcn->len; + params.frame_ctrl = *((A_UINT16 *) wh->i_fc); + params.frag_ptr = qdf_nbuf_get_frag_paddr(bcn->buf, 0); + params.dtim_flag = 0; /* notify Firmware of DTM and mcast/bcast traffic */ if (tim_ie->dtim_count == 0) { - cmd->dtim_flag |= WMI_BCN_SEND_DTIM_ZERO; + params.dtim_flag |= WMI_BCN_SEND_DTIM_ZERO; /* deliver mcast/bcast traffic in next DTIM beacon */ if (tim_ie->tim_bitctl & 0x01) - cmd->dtim_flag |= WMI_BCN_SEND_DTIM_BITCTL_SET; + params.dtim_flag |= WMI_BCN_SEND_DTIM_BITCTL_SET; } - status = wmi_unified_cmd_send(wma->wmi_handle, wmi_buf, sizeof(*cmd), - WMI_PDEV_SEND_BCN_CMDID); + wmi_unified_bcn_buf_ll_cmd(wma->wmi_handle, + ¶ms); - if (status != EOK) { - WMA_LOGE("Failed to send WMI_PDEV_SEND_BCN_CMDID command"); - wmi_buf_free(wmi_buf); - } qdf_spin_unlock_bh(&bcn->lock); } @@ -619,23 +601,8 @@ void wma_set_sta_sa_query_param(tp_wma_handle wma, { struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); uint32_t max_retries, retry_interval; - wmi_buf_t buf; - WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param *cmd; - int len; WMA_LOGD(FL("Enter:")); - len = sizeof(*cmd); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return; - } - - cmd = (WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param *)wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_PMF_OFFLOAD_SET_SA_QUERY_CMD_fixed_param)); if (wlan_cfg_get_int (mac, WNI_CFG_PMF_SA_QUERY_MAX_RETRIES, @@ -650,18 +617,10 @@ void wma_set_sta_sa_query_param(tp_wma_handle wma, WMA_LOGE(FL("Failed to get value for WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL")); } - cmd->vdev_id = vdev_id; - cmd->sa_query_max_retry_count = max_retries; - cmd->sa_query_retry_interval = retry_interval; - - WMA_LOGD(FL("STA sa query: vdev_id:%d interval:%u retry count:%d"), - vdev_id, retry_interval, max_retries); - - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID)) { - WMA_LOGE(FL("Failed to offload STA SA Query")); - qdf_nbuf_free(buf); - } + wmi_unified_set_sta_sa_query_param_cmd(wma->wmi_handle, + vdev_id, + max_retries, + retry_interval); WMA_LOGD(FL("Exit :")); return; @@ -686,68 +645,24 @@ void wma_set_sta_keep_alive(tp_wma_handle wma, uint8_t vdev_id, uint8_t *hostv4addr, uint8_t *destv4addr, uint8_t *destmac) { - wmi_buf_t buf; - WMI_STA_KEEPALIVE_CMD_fixed_param *cmd; - WMI_STA_KEEPALVE_ARP_RESPONSE *arp_rsp; - uint8_t *buf_ptr; - int len; + struct sta_params params; WMA_LOGD("%s: Enter", __func__); - if (timeperiod > WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX) { - WMA_LOGE("Invalid period %d Max limit %d", timeperiod, - WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX); - return; - } - - len = sizeof(*cmd) + sizeof(*arp_rsp); - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("wmi_buf_alloc failed"); + if (!wma) { + WMA_LOGE("%s: wma handle is NULL", __func__); return; } - cmd = (WMI_STA_KEEPALIVE_CMD_fixed_param *) wmi_buf_data(buf); - buf_ptr = (uint8_t *) cmd; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_WMI_STA_KEEPALIVE_CMD_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (WMI_STA_KEEPALIVE_CMD_fixed_param)); - cmd->interval = timeperiod; - cmd->enable = (timeperiod) ? 1 : 0; - cmd->vdev_id = vdev_id; - WMA_LOGD("Keep Alive: vdev_id:%d interval:%u method:%d", vdev_id, - timeperiod, method); - arp_rsp = (WMI_STA_KEEPALVE_ARP_RESPONSE *) (buf_ptr + sizeof(*cmd)); - WMITLV_SET_HDR(&arp_rsp->tlv_header, - WMITLV_TAG_STRUC_WMI_STA_KEEPALVE_ARP_RESPONSE, - WMITLV_GET_STRUCT_TLVLEN(WMI_STA_KEEPALVE_ARP_RESPONSE)); - - if (method == SIR_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { - if ((NULL == hostv4addr) || - (NULL == destv4addr) || - (NULL == destmac)) { - WMA_LOGE("%s: received null pointer, hostv4addr:%p " - "destv4addr:%p destmac:%p ", __func__, - hostv4addr, destv4addr, destmac); - qdf_nbuf_free(buf); - return; - } - cmd->method = WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE; - qdf_mem_copy(&arp_rsp->sender_prot_addr, hostv4addr, - SIR_IPV4_ADDR_LEN); - qdf_mem_copy(&arp_rsp->target_prot_addr, destv4addr, - SIR_IPV4_ADDR_LEN); - WMI_CHAR_ARRAY_TO_MAC_ADDR(destmac, &arp_rsp->dest_mac_addr); - } else { - cmd->method = WMI_STA_KEEPALIVE_METHOD_NULL_FRAME; - } + params.vdev_id = vdev_id; + params.method = method; + params.timeperiod = timeperiod; + params.hostv4addr = hostv4addr; + params.destv4addr = destv4addr; + params.destmac = destmac; - if (wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_STA_KEEPALIVE_CMDID)) { - WMA_LOGE("Failed to set KeepAlive"); - qdf_nbuf_free(buf); - } + wmi_unified_set_sta_keep_alive_cmd(wma->wmi_handle, + ¶ms); WMA_LOGD("%s: Exit", __func__); return; @@ -1154,40 +1069,24 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, * * Return: 0 for success or error code */ -int wmi_unified_vdev_set_gtx_cfg_send(wmi_unified_t wmi_handle, uint32_t if_id, +QDF_STATUS wmi_unified_vdev_set_gtx_cfg_send(wmi_unified_t wmi_handle, + uint32_t if_id, gtx_config_t *gtx_info) { - wmi_vdev_set_gtx_params_cmd_fixed_param *cmd; - wmi_buf_t buf; - int len = sizeof(wmi_vdev_set_gtx_params_cmd_fixed_param); - buf = wmi_buf_alloc(wmi_handle, len); - if (!buf) { - WMA_LOGE("%s:wmi_buf_alloc failed", __FUNCTION__); - return -ENOMEM; - } - cmd = (wmi_vdev_set_gtx_params_cmd_fixed_param *) wmi_buf_data(buf); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_set_gtx_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_set_gtx_params_cmd_fixed_param)); - cmd->vdev_id = if_id; - - cmd->gtxRTMask[0] = gtx_info->gtxRTMask[0]; - cmd->gtxRTMask[1] = gtx_info->gtxRTMask[1]; - cmd->userGtxMask = gtx_info->gtxUsrcfg; - cmd->gtxPERThreshold = gtx_info->gtxPERThreshold; - cmd->gtxPERMargin = gtx_info->gtxPERMargin; - cmd->gtxTPCstep = gtx_info->gtxTPCstep; - cmd->gtxTPCMin = gtx_info->gtxTPCMin; - cmd->gtxBWMask = gtx_info->gtxBWMask; - - WMA_LOGD("Setting vdev%d GTX values:htmcs 0x%x, vhtmcs 0x%x, usermask 0x%x, \ - gtxPERThreshold %d, gtxPERMargin %d, gtxTPCstep %d, gtxTPCMin %d, \ - gtxBWMask 0x%x.", if_id, cmd->gtxRTMask[0], cmd->gtxRTMask[1], - cmd->userGtxMask, cmd->gtxPERThreshold, cmd->gtxPERMargin, - cmd->gtxTPCstep, cmd->gtxTPCMin, cmd->gtxBWMask); - return wmi_unified_cmd_send(wmi_handle, buf, len, - WMI_VDEV_SET_GTX_PARAMS_CMDID); + struct wmi_gtx_config params; + + params.gtx_rt_mask[0] = gtx_info->gtxRTMask[0]; + params.gtx_rt_mask[1] = gtx_info->gtxRTMask[1]; + params.gtx_usrcfg = gtx_info->gtxUsrcfg; + params.gtx_threshold = gtx_info->gtxPERThreshold; + params.gtx_margin = gtx_info->gtxPERMargin; + params.gtx_tpcstep = gtx_info->gtxTPCstep; + params.gtx_tpcmin = gtx_info->gtxTPCMin; + params.gtx_bwmask = gtx_info->gtxBWMask; + + return wmi_unified_vdev_set_gtx_cfg_cmd(wmi_handle, + if_id, ¶ms); + } /** @@ -1371,26 +1270,24 @@ static void wma_read_cfg_wepkey(tp_wma_handle wma_handle, } /** - * wma_setup_install_key_cmd() - fill wmi buffer as per key parameters + * wma_setup_install_key_cmd() - set key parameters * @wma_handle: wma handle * @key_params: key parameters - * @len: length * @mode: op mode * - * This function setsup wmi buffer from information + * This function fills structure from information * passed in key_params. * - * Return: filled wmi buffer ptr or NULL for error + * Return: QDF_STATUS_SUCCESS - success + QDF_STATUS_E_FAILURE - failure + QDF_STATUS_E_NOMEM - invalid request */ -static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, +static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle, struct wma_set_key_params - *key_params, uint32_t *len, - uint8_t mode) + *key_params, uint8_t mode) { - wmi_vdev_install_key_cmd_fixed_param *cmd; - wmi_buf_t buf; - uint8_t *buf_ptr; - uint8_t *key_data; + struct set_key_params params; + QDF_STATUS status = QDF_STATUS_SUCCESS; #ifdef WLAN_FEATURE_11W struct wma_txrx_node *iface = NULL; #endif /* WLAN_FEATURE_11W */ @@ -1398,53 +1295,47 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, key_params->key_len) || (key_params->key_type != eSIR_ED_NONE && !key_params->key_len)) { WMA_LOGE("%s:Invalid set key request", __func__); - return NULL; + return QDF_STATUS_E_NOMEM; } - *len = sizeof(*cmd) + roundup(key_params->key_len, sizeof(uint32_t)) + - WMI_TLV_HDR_SIZE; + params.vdev_id = key_params->vdev_id; + params.key_idx = key_params->key_idx; + qdf_mem_copy(params.peer_mac, key_params->peer_mac, IEEE80211_ADDR_LEN); - buf = wmi_buf_alloc(wma_handle->wmi_handle, *len); - if (!buf) { - WMA_LOGE("Failed to allocate buffer to send set key cmd"); - return NULL; - } +#ifdef FEATURE_WLAN_WAPI + qdf_mem_set(params.tx_iv, 16, 0); + qdf_mem_set(params.rx_iv, 16, 0); +#endif + params.key_txmic_len = 0; + params.key_rxmic_len = 0; - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_vdev_install_key_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_install_key_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_install_key_cmd_fixed_param)); - cmd->vdev_id = key_params->vdev_id; - cmd->key_ix = key_params->key_idx; - WMI_CHAR_ARRAY_TO_MAC_ADDR(key_params->peer_mac, &cmd->peer_macaddr); + params.key_flags = 0; if (key_params->unicast) - cmd->key_flags |= PAIRWISE_USAGE; + params.key_flags |= PAIRWISE_USAGE; else - cmd->key_flags |= GROUP_USAGE; + params.key_flags |= GROUP_USAGE; switch (key_params->key_type) { case eSIR_ED_NONE: - cmd->key_cipher = WMI_CIPHER_NONE; + params.key_cipher = WMI_CIPHER_NONE; break; case eSIR_ED_WEP40: case eSIR_ED_WEP104: - cmd->key_cipher = WMI_CIPHER_WEP; + params.key_cipher = WMI_CIPHER_WEP; if (key_params->unicast && - cmd->key_ix == key_params->def_key_idx) { + params.key_idx == key_params->def_key_idx) { WMA_LOGD("STA Mode: cmd->key_flags |= TX_USAGE"); - cmd->key_flags |= TX_USAGE; + params.key_flags |= TX_USAGE; } else if ((mode == wlan_op_mode_ap) && - (cmd->key_ix == key_params->def_key_idx)) { + (params.key_idx == key_params->def_key_idx)) { WMA_LOGD("AP Mode: cmd->key_flags |= TX_USAGE"); - cmd->key_flags |= TX_USAGE; + params.key_flags |= TX_USAGE; } break; case eSIR_ED_TKIP: - cmd->key_txmic_len = WMA_TXMIC_LEN; - cmd->key_rxmic_len = WMA_RXMIC_LEN; - cmd->key_cipher = WMI_CIPHER_TKIP; + params.key_txmic_len = WMA_TXMIC_LEN; + params.key_rxmic_len = WMA_RXMIC_LEN; + params.key_cipher = WMI_CIPHER_TKIP; break; #ifdef FEATURE_WLAN_WAPI #define WPI_IV_LEN 16 @@ -1471,37 +1362,32 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, rx_iv[WPI_IV_LEN - 1] = 0x36; } - cmd->key_txmic_len = WMA_TXMIC_LEN; - cmd->key_rxmic_len = WMA_RXMIC_LEN; + params.key_txmic_len = WMA_TXMIC_LEN; + params.key_rxmic_len = WMA_RXMIC_LEN; - qdf_mem_copy(&cmd->wpi_key_rsc_counter, &rx_iv, + qdf_mem_copy(¶ms.rx_iv, &rx_iv, WPI_IV_LEN); - qdf_mem_copy(&cmd->wpi_key_tsc_counter, &tx_iv, + qdf_mem_copy(¶ms.tx_iv, &tx_iv, WPI_IV_LEN); - cmd->key_cipher = WMI_CIPHER_WAPI; + params.key_cipher = WMI_CIPHER_WAPI; break; } #endif /* FEATURE_WLAN_WAPI */ case eSIR_ED_CCMP: - cmd->key_cipher = WMI_CIPHER_AES_CCM; + params.key_cipher = WMI_CIPHER_AES_CCM; break; #ifdef WLAN_FEATURE_11W case eSIR_ED_AES_128_CMAC: - cmd->key_cipher = WMI_CIPHER_AES_CMAC; + params.key_cipher = WMI_CIPHER_AES_CMAC; break; #endif /* WLAN_FEATURE_11W */ default: /* TODO: MFP ? */ WMA_LOGE("%s:Invalid encryption type:%d", __func__, key_params->key_type); - qdf_nbuf_free(buf); - return NULL; + return QDF_STATUS_E_NOMEM; } - buf_ptr += sizeof(wmi_vdev_install_key_cmd_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, - roundup(key_params->key_len, sizeof(uint32_t))); - key_data = (A_UINT8 *) (buf_ptr + WMI_TLV_HDR_SIZE); #ifdef BIG_ENDIAN_HOST { /* for big endian host, copy engine byte_swap is enabled @@ -1513,7 +1399,7 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, int8_t i; uint32_t *destp, *srcp; - destp = (uint32_t *) key_data; + destp = (uint32_t *) params.key_data; srcp = (uint32_t *) key_params->key_data; for (i = 0; i < roundup(key_params->key_len, sizeof(uint32_t)) / 4; @@ -1524,10 +1410,10 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, } } #else - qdf_mem_copy((void *)key_data, + qdf_mem_copy((void *)params.key_data, (const void *)key_params->key_data, key_params->key_len); #endif /* BIG_ENDIAN_HOST */ - cmd->key_len = key_params->key_len; + params.key_len = key_params->key_len; #ifdef WLAN_FEATURE_11W if (key_params->key_type == eSIR_ED_AES_128_CMAC) { @@ -1537,9 +1423,9 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, qdf_mem_copy(iface->key.key, (const void *)key_params->key_data, iface->key.key_length); - if ((cmd->key_ix == WMA_IGTK_KEY_INDEX_4) || - (cmd->key_ix == WMA_IGTK_KEY_INDEX_5)) - qdf_mem_zero(iface->key.key_id[cmd->key_ix - + if ((params.key_idx == WMA_IGTK_KEY_INDEX_4) || + (params.key_idx == WMA_IGTK_KEY_INDEX_5)) + qdf_mem_zero(iface->key.key_id[params.key_idx - WMA_IGTK_KEY_INDEX_4].ipn, CMAC_IPN_LEN); } @@ -1552,7 +1438,10 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, key_params->unicast, key_params->peer_mac, key_params->def_key_idx); - return buf; + status = wmi_unified_setup_install_key_cmd(wma_handle->wmi_handle, + ¶ms); + + return status; } /** @@ -1565,9 +1454,8 @@ static wmi_buf_t wma_setup_install_key_cmd(tp_wma_handle wma_handle, void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) { struct wma_set_key_params key_params; - wmi_buf_t buf; - int32_t status; - uint32_t len = 0, i; + QDF_STATUS status = QDF_STATUS_SUCCESS; + uint32_t i; uint32_t def_key_idx = 0; ol_txrx_vdev_handle txrx_vdev; @@ -1643,19 +1531,14 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) WMA_LOGD("%s: bss key[%d] length %d", __func__, i, key_info->key[i].keyLength); - buf = wma_setup_install_key_cmd(wma_handle, &key_params, &len, + status = wma_setup_install_key_cmd(wma_handle, &key_params, txrx_vdev->opmode); - if (!buf) { + if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); key_info->status = QDF_STATUS_E_NOMEM; goto out; - } - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_VDEV_INSTALL_KEY_CMDID); - if (status) { - qdf_nbuf_free(buf); + } else if (status == QDF_STATUS_E_FAILURE) { WMA_LOGE("%s:Failed to send install key command", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -1786,9 +1669,8 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, struct qdf_mac_addr peer_macaddr) { struct wma_set_key_params key_params; - wmi_buf_t buf; - int32_t status; - uint32_t len = 0, i; + QDF_STATUS status = QDF_STATUS_SUCCESS; + uint32_t i; uint32_t def_key_idx = 0; ol_txrx_vdev_handle txrx_vdev; @@ -1838,18 +1720,13 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, WMA_LOGD("%s: peer bcast key[%d] length %d", __func__, i, key_info->key[i].keyLength); - buf = wma_setup_install_key_cmd(wma_handle, &key_params, &len, + status = wma_setup_install_key_cmd(wma_handle, &key_params, txrx_vdev->opmode); - if (!buf) { + if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); return; - } - - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_VDEV_INSTALL_KEY_CMDID); - if (status) { - qdf_nbuf_free(buf); + } else if (status == QDF_STATUS_E_FAILURE) { WMA_LOGE("%s:Failed to send install key command", __func__); } @@ -1868,9 +1745,8 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, */ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) { - wmi_buf_t buf; - int32_t status, i; - uint32_t len = 0; + int32_t i; + QDF_STATUS status = QDF_STATUS_SUCCESS; ol_txrx_pdev_handle txrx_pdev; ol_txrx_vdev_handle txrx_vdev; struct ol_txrx_peer_t *peer; @@ -1953,9 +1829,9 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) key_params.key_idx = i; key_params.key_len = key_info->key[i].keyLength; - buf = wma_setup_install_key_cmd(wma_handle, &key_params, &len, + status = wma_setup_install_key_cmd(wma_handle, &key_params, txrx_vdev->opmode); - if (!buf) { + if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); key_info->status = QDF_STATUS_E_NOMEM; @@ -1965,10 +1841,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) WMA_LOGD("%s: peer unicast key[%d] %d ", __func__, i, key_info->key[i].keyLength); - status = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_VDEV_INSTALL_KEY_CMDID); - if (status) { - qdf_nbuf_free(buf); + if (status == QDF_STATUS_E_FAILURE) { WMA_LOGE("%s:Failed to send install key command", __func__); key_info->status = QDF_STATUS_E_FAILURE; @@ -2005,36 +1878,17 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, tEdcaParams *edca_params) { tp_wma_handle wma_handle = (tp_wma_handle) handle; - uint8_t *buf_ptr; - wmi_buf_t buf; - wmi_vdev_set_wmm_params_cmd_fixed_param *cmd; - wmi_wmm_vparams *wmm_param; + wmi_wmm_vparams wmm_param[WME_NUM_AC]; tSirMacEdcaParamRecord *edca_record; int ac; - int len = sizeof(*cmd); ol_txrx_pdev_handle pdev; struct ol_tx_wmm_param_t ol_tx_wmm_param; + uint8_t vdev_id; + QDF_STATUS status; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - - if (!buf) { - WMA_LOGE("%s: wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_vdev_set_wmm_params_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_set_wmm_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_set_wmm_params_cmd_fixed_param)); - cmd->vdev_id = edca_params->bssIdx; + vdev_id = edca_params->bssIdx; for (ac = 0; ac < WME_NUM_AC; ac++) { - wmm_param = (wmi_wmm_vparams *) (&cmd->wmm_params[ac]); - WMITLV_SET_HDR(&wmm_param->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_set_wmm_params_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_wmm_vparams)); switch (ac) { case WME_AC_BE: edca_record = &edca_params->acbe; @@ -2052,15 +1906,18 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, goto fail; } - wma_update_edca_params_for_ac(edca_record, wmm_param, ac); + wma_update_edca_params_for_ac(edca_record, &wmm_param[ac], ac); - ol_tx_wmm_param.ac[ac].aifs = wmm_param->aifs; - ol_tx_wmm_param.ac[ac].cwmin = wmm_param->cwmin; - ol_tx_wmm_param.ac[ac].cwmax = wmm_param->cwmax; + ol_tx_wmm_param.ac[ac].aifs = wmm_param[ac].aifs; + ol_tx_wmm_param.ac[ac].cwmin = wmm_param[ac].cwmin; + ol_tx_wmm_param.ac[ac].cwmax = wmm_param[ac].cwmax; } - if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_VDEV_SET_WMM_PARAMS_CMDID)) + status = wmi_unified_process_update_edca_param(wma_handle->wmi_handle, + vdev_id, wmm_param); + if (status == QDF_STATUS_E_NOMEM) + return status; + else if (status == QDF_STATUS_E_FAILURE) goto fail; pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -2072,7 +1929,6 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle, return QDF_STATUS_SUCCESS; fail: - wmi_buf_free(buf); WMA_LOGE("%s: Failed to set WMM Paremeters", __func__); return QDF_STATUS_E_FAILURE; } @@ -2089,20 +1945,15 @@ static int wmi_unified_probe_rsp_tmpl_send(tp_wma_handle wma, uint8_t vdev_id, tpSendProbeRespParams probe_rsp_info) { - wmi_prb_tmpl_cmd_fixed_param *cmd; - wmi_bcn_prb_info *bcn_prb_info; - wmi_buf_t wmi_buf; - uint32_t tmpl_len, tmpl_len_aligned, wmi_buf_len; - uint8_t *frm, *buf_ptr; - int ret; + uint8_t *frm; uint64_t adjusted_tsf_le; struct ieee80211_frame *wh; + struct wmi_probe_resp_params params; WMA_LOGD(FL("Send probe response template for vdev %d"), vdev_id); frm = probe_rsp_info->pProbeRespTemplate; - tmpl_len = probe_rsp_info->probeRespTemplateLen; - tmpl_len_aligned = roundup(tmpl_len, sizeof(A_UINT32)); + /* * Make the TSF offset negative so probe response in the same * staggered batch have the same TSF. @@ -2113,52 +1964,16 @@ static int wmi_unified_probe_rsp_tmpl_send(tp_wma_handle wma, wh = (struct ieee80211_frame *)frm; A_MEMCPY(&wh[1], &adjusted_tsf_le, sizeof(adjusted_tsf_le)); - wmi_buf_len = sizeof(wmi_prb_tmpl_cmd_fixed_param) + - sizeof(wmi_bcn_prb_info) + WMI_TLV_HDR_SIZE + - tmpl_len_aligned; - - if (wmi_buf_len > BEACON_TX_BUFFER_SIZE) { - WMA_LOGE(FL("wmi_buf_len: %d > %d. Can't send wmi cmd"), - wmi_buf_len, BEACON_TX_BUFFER_SIZE); - return -EINVAL; - } - - wmi_buf = wmi_buf_alloc(wma->wmi_handle, wmi_buf_len); - if (!wmi_buf) { - WMA_LOGE(FL("wmi_buf_alloc failed")); - return -ENOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - - cmd = (wmi_prb_tmpl_cmd_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_prb_tmpl_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN(wmi_prb_tmpl_cmd_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->buf_len = tmpl_len; - buf_ptr += sizeof(wmi_prb_tmpl_cmd_fixed_param); - - bcn_prb_info = (wmi_bcn_prb_info *) buf_ptr; - WMITLV_SET_HDR(&bcn_prb_info->tlv_header, - WMITLV_TAG_STRUC_wmi_bcn_prb_info, - WMITLV_GET_STRUCT_TLVLEN(wmi_bcn_prb_info)); - bcn_prb_info->caps = 0; - bcn_prb_info->erp = 0; - buf_ptr += sizeof(wmi_bcn_prb_info); - - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, tmpl_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, frm, tmpl_len); + params.pProbeRespTemplate = probe_rsp_info->pProbeRespTemplate; + params.probeRespTemplateLen = probe_rsp_info->probeRespTemplateLen; + qdf_mem_copy(params.bssId, probe_rsp_info->bssId, + WMI_ETH_LEN); + qdf_mem_copy(params.ucProxyProbeReqValidIEBmap, + probe_rsp_info->ucProxyProbeReqValidIEBmap, + 8 * sizeof(uint32_t)); - ret = wmi_unified_cmd_send(wma->wmi_handle, - wmi_buf, wmi_buf_len, WMI_PRB_TMPL_CMDID); - if (ret) { - WMA_LOGE(FL("Failed to send PRB RSP tmpl: %d"), ret); - wmi_buf_free(wmi_buf); - } - - return ret; + return wmi_unified_probe_rsp_tmpl_send_cmd(wma->wmi_handle, vdev_id, + ¶ms, frm); } /** @@ -2393,66 +2208,13 @@ int wma_tbttoffset_update_event_handler(void *handle, uint8_t *event, static int wma_p2p_go_set_beacon_ie(t_wma_handle *wma_handle, A_UINT32 vdev_id, uint8_t *p2pIe) { - int ret; - wmi_p2p_go_set_beacon_ie_fixed_param *cmd; - wmi_buf_t wmi_buf; - uint32_t ie_len, ie_len_aligned, wmi_buf_len; - uint8_t *buf_ptr; - - ie_len = (uint32_t) (p2pIe[1] + 2); - - /* More than one P2P IE may be included in a single frame. - If multiple P2P IEs are present, the complete P2P attribute - data consists of the concatenation of the P2P Attribute - fields of the P2P IEs. The P2P Attributes field of each - P2P IE may be any length up to the maximum (251 octets). - In this case host sends one P2P IE to firmware so the length - should not exceed more than 251 bytes - */ - if (ie_len > 251) { - WMA_LOGE("%s : invalid p2p ie length %u", __func__, ie_len); - return -EINVAL; - } - - ie_len_aligned = roundup(ie_len, sizeof(A_UINT32)); - - wmi_buf_len = - sizeof(wmi_p2p_go_set_beacon_ie_fixed_param) + ie_len_aligned + - WMI_TLV_HDR_SIZE; - - wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, wmi_buf_len); - if (!wmi_buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return -ENOMEM; - } - - buf_ptr = (uint8_t *) wmi_buf_data(wmi_buf); - - cmd = (wmi_p2p_go_set_beacon_ie_fixed_param *) buf_ptr; - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_p2p_go_set_beacon_ie_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_p2p_go_set_beacon_ie_fixed_param)); - cmd->vdev_id = vdev_id; - cmd->ie_buf_len = ie_len; - - buf_ptr += sizeof(wmi_p2p_go_set_beacon_ie_fixed_param); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, ie_len_aligned); - buf_ptr += WMI_TLV_HDR_SIZE; - qdf_mem_copy(buf_ptr, p2pIe, ie_len); - - WMA_LOGI("%s: Sending WMI_P2P_GO_SET_BEACON_IE", __func__); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, - wmi_buf, wmi_buf_len, - WMI_P2P_GO_SET_BEACON_IE); - if (ret) { - WMA_LOGE("Failed to send bcn tmpl: %d", ret); - wmi_buf_free(wmi_buf); + if (!wma_handle) { + WMA_LOGE("%s: wma handle is NULL", __func__); + return QDF_STATUS_E_FAILURE; } - WMA_LOGI("%s: Successfully sent WMI_P2P_GO_SET_BEACON_IE", __func__); - return ret; + return wmi_unified_p2p_go_set_beacon_ie_cmd(wma_handle->wmi_handle, + vdev_id, p2pIe); } /** -- cgit v1.2.3 From 17dc4713ff2f2a84a4464252253cf61a4c68de98 Mon Sep 17 00:00:00 2001 From: Siddarth Poddar Date: Wed, 9 Mar 2016 16:30:27 +0530 Subject: qcacld-3.0: Refactor formation of vdev commands Move tlv formation of wmi vdev start, vdev restart related commands to common wmi layer from wma layer. Change-Id: Ic01c9720fd73cb47ea24313c947d6c2a03dbaea4 CRs-Fixed: 987362 --- core/wma/inc/wma_internal.h | 4 +- core/wma/src/wma_dev_if.c | 272 +++++++++++++++++--------------------------- core/wma/src/wma_features.c | 19 ++-- 3 files changed, 119 insertions(+), 176 deletions(-) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index f72280ad8f4d..820e05111d28 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -1106,8 +1106,8 @@ void wma_dfs_configure(struct ieee80211com *ic); struct dfs_ieee80211_channel *wma_dfs_configure_channel( struct ieee80211com *dfs_ic, - wmi_channel *chan, - WLAN_PHY_MODE chanmode, + uint32_t band_center_freq1, + uint32_t band_center_freq2, struct wma_vdev_start_req *req); void wma_set_sap_keepalive(tp_wma_handle wma, uint8_t vdev_id); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 9c765d419d58..3ffda0247fe3 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1336,72 +1336,39 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, void wma_hidden_ssid_vdev_restart_on_vdev_stop(tp_wma_handle wma_handle, uint8_t sessionId) { - wmi_vdev_start_request_cmd_fixed_param *cmd; - wmi_buf_t buf; - wmi_channel *chan; - int32_t len; - uint8_t *buf_ptr; struct wma_txrx_node *intr = wma_handle->interfaces; - int32_t ret = 0; - - len = sizeof(*cmd) + sizeof(wmi_channel) + WMI_TLV_HDR_SIZE; - buf = wmi_buf_alloc(wma_handle->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - qdf_atomic_set(&intr[sessionId].vdev_restart_params. - hidden_ssid_restart_in_progress, 0); - return; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_vdev_start_request_cmd_fixed_param *) buf_ptr; - chan = (wmi_channel *) (buf_ptr + sizeof(*cmd)); - - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_start_request_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_start_request_cmd_fixed_param)); - - WMITLV_SET_HDR(&chan->tlv_header, - WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); + struct hidden_ssid_vdev_restart_params params; + QDF_STATUS status; - cmd->vdev_id = sessionId; - cmd->ssid.ssid_len = intr[sessionId].vdev_restart_params.ssid.ssid_len; - qdf_mem_copy(cmd->ssid.ssid, + params.session_id = sessionId; + params.ssid_len = intr[sessionId].vdev_restart_params.ssid.ssid_len; + qdf_mem_copy(params.ssid, intr[sessionId].vdev_restart_params.ssid.ssid, - cmd->ssid.ssid_len); - cmd->flags = intr[sessionId].vdev_restart_params.flags; + params.ssid_len); + params.flags = intr[sessionId].vdev_restart_params.flags; if (intr[sessionId].vdev_restart_params.ssidHidden) - cmd->flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; + params.flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; else - cmd->flags &= (0xFFFFFFFE); - cmd->requestor_id = intr[sessionId].vdev_restart_params.requestor_id; - cmd->disable_hw_ack = + params.flags &= (0xFFFFFFFE); + params.requestor_id = intr[sessionId].vdev_restart_params.requestor_id; + params.disable_hw_ack = intr[sessionId].vdev_restart_params.disable_hw_ack; - chan->mhz = intr[sessionId].vdev_restart_params.chan.mhz; - chan->band_center_freq1 = + params.mhz = intr[sessionId].vdev_restart_params.chan.mhz; + params.band_center_freq1 = intr[sessionId].vdev_restart_params.chan.band_center_freq1; - chan->band_center_freq2 = + params.band_center_freq2 = intr[sessionId].vdev_restart_params.chan.band_center_freq2; - chan->info = intr[sessionId].vdev_restart_params.chan.info; - chan->reg_info_1 = intr[sessionId].vdev_restart_params.chan.reg_info_1; - chan->reg_info_2 = intr[sessionId].vdev_restart_params.chan.reg_info_2; - - cmd->num_noa_descriptors = 0; - buf_ptr = (uint8_t *) (((uint8_t *) cmd) + sizeof(*cmd) + - sizeof(wmi_channel)); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - cmd->num_noa_descriptors * - sizeof(wmi_p2p_noa_descriptor)); - - ret = wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, - WMI_VDEV_RESTART_REQUEST_CMDID); - if (ret < 0) { + params.info = intr[sessionId].vdev_restart_params.chan.info; + params.reg_info_1 = intr[sessionId].vdev_restart_params.chan.reg_info_1; + params.reg_info_2 = intr[sessionId].vdev_restart_params.chan.reg_info_2; + + status = wmi_unified_hidden_ssid_vdev_restart_send( + wma_handle->wmi_handle, ¶ms); + if (status == QDF_STATUS_E_FAILURE) { WMA_LOGE("%s: Failed to send vdev restart command", __func__); qdf_atomic_set(&intr[sessionId].vdev_restart_params. hidden_ssid_restart_in_progress, 0); - qdf_nbuf_free(buf); } } @@ -1836,15 +1803,16 @@ end: QDF_STATUS wma_vdev_start(tp_wma_handle wma, struct wma_vdev_start_req *req, bool isRestart) { + struct vdev_start_params params = { 0 }; wmi_vdev_start_request_cmd_fixed_param *cmd; - wmi_buf_t buf; - wmi_channel *chan; - int32_t len, ret; - WLAN_PHY_MODE chanmode; - uint8_t *buf_ptr; struct wma_txrx_node *intr = wma->interfaces; tpAniSirGlobal mac_ctx = NULL; struct ath_dfs *dfs; + uint32_t temp_ssid_len = 0; + uint32_t temp_flags = 0; + uint32_t temp_chan_info = 0; + uint32_t temp_reg_info_1 = 0; + uint32_t temp_reg_info_2 = 0; mac_ctx = cds_get_context(QDF_MODULE_ID_PE); if (mac_ctx == NULL) { @@ -1856,66 +1824,56 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, WMA_LOGD("%s: Enter isRestart=%d vdev=%d", __func__, isRestart, req->vdev_id); - len = sizeof(*cmd) + sizeof(wmi_channel) + WMI_TLV_HDR_SIZE; - buf = wmi_buf_alloc(wma->wmi_handle, len); - if (!buf) { - WMA_LOGE("%s : wmi_buf_alloc failed", __func__); - return QDF_STATUS_E_NOMEM; - } - buf_ptr = (uint8_t *) wmi_buf_data(buf); - cmd = (wmi_vdev_start_request_cmd_fixed_param *) buf_ptr; - chan = (wmi_channel *) (buf_ptr + sizeof(*cmd)); - WMITLV_SET_HDR(&cmd->tlv_header, - WMITLV_TAG_STRUC_wmi_vdev_start_request_cmd_fixed_param, - WMITLV_GET_STRUCT_TLVLEN - (wmi_vdev_start_request_cmd_fixed_param)); - WMITLV_SET_HDR(&chan->tlv_header, WMITLV_TAG_STRUC_wmi_channel, - WMITLV_GET_STRUCT_TLVLEN(wmi_channel)); - cmd->vdev_id = req->vdev_id; + params.vdev_id = req->vdev_id; /* Fill channel info */ - chan->mhz = cds_chan_to_freq(req->chan); - chanmode = wma_chan_to_mode(req->chan, req->chan_width, - req->vht_capable, req->dot11_mode); - - intr[cmd->vdev_id].chanmode = chanmode; /* save channel mode */ - intr[cmd->vdev_id].ht_capable = req->ht_capable; - intr[cmd->vdev_id].vht_capable = req->vht_capable; - intr[cmd->vdev_id].config.gtx_info.gtxRTMask[0] = + params.chan_freq = cds_chan_to_freq(req->chan); + params.chan_mode = wma_chan_to_mode(req->chan, req->chan_width, + req->vht_capable, req->dot11_mode); + /* save channel mode */ + intr[params.vdev_id].chanmode = params.chan_mode; + intr[params.vdev_id].ht_capable = req->ht_capable; + intr[params.vdev_id].vht_capable = req->vht_capable; + intr[params.vdev_id].config.gtx_info.gtxRTMask[0] = CFG_TGT_DEFAULT_GTX_HT_MASK; - intr[cmd->vdev_id].config.gtx_info.gtxRTMask[1] = + intr[params.vdev_id].config.gtx_info.gtxRTMask[1] = CFG_TGT_DEFAULT_GTX_VHT_MASK; - intr[cmd->vdev_id].config.gtx_info.gtxUsrcfg = + intr[params.vdev_id].config.gtx_info.gtxUsrcfg = CFG_TGT_DEFAULT_GTX_USR_CFG; - intr[cmd->vdev_id].config.gtx_info.gtxPERThreshold = + intr[params.vdev_id].config.gtx_info.gtxPERThreshold = CFG_TGT_DEFAULT_GTX_PER_THRESHOLD; - intr[cmd->vdev_id].config.gtx_info.gtxPERMargin = + intr[params.vdev_id].config.gtx_info.gtxPERMargin = CFG_TGT_DEFAULT_GTX_PER_MARGIN; - intr[cmd->vdev_id].config.gtx_info.gtxTPCstep = + intr[params.vdev_id].config.gtx_info.gtxTPCstep = CFG_TGT_DEFAULT_GTX_TPC_STEP; - intr[cmd->vdev_id].config.gtx_info.gtxTPCMin = + intr[params.vdev_id].config.gtx_info.gtxTPCMin = CFG_TGT_DEFAULT_GTX_TPC_MIN; - intr[cmd->vdev_id].config.gtx_info.gtxBWMask = + intr[params.vdev_id].config.gtx_info.gtxBWMask = CFG_TGT_DEFAULT_GTX_BW_MASK; - intr[cmd->vdev_id].mhz = chan->mhz; + intr[params.vdev_id].mhz = params.chan_freq; + + temp_chan_info &= 0xffffffc0; + temp_chan_info |= params.chan_mode; - WMI_SET_CHANNEL_MODE(chan, chanmode); - chan->band_center_freq1 = chan->mhz; + params.band_center_freq1 = params.chan_freq; if (CH_WIDTH_20MHZ != req->chan_width) - chan->band_center_freq1 = + params.band_center_freq1 = cds_chan_to_freq(req->ch_center_freq_seg0); if (CH_WIDTH_80P80MHZ == req->chan_width) - chan->band_center_freq2 = + params.band_center_freq2 = cds_chan_to_freq(req->ch_center_freq_seg1); else - chan->band_center_freq2 = 0; + params.band_center_freq2 = 0; /* Set half or quarter rate WMI flags */ + params.is_half_rate = req->is_half_rate; + params.is_quarter_rate = req->is_quarter_rate; + if (req->is_half_rate) - WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_HALF_RATE); + temp_chan_info |= (1 << WMI_CHAN_FLAG_HALF_RATE); else if (req->is_quarter_rate) - WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_QUARTER_RATE); + temp_chan_info |= (1 << WMI_CHAN_FLAG_QUARTER_RATE); /* * If the channel has DFS set, flip on radar reporting. @@ -1932,10 +1890,12 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, * If the Channel is DFS, * set the WMI_CHAN_FLAG_DFS flag */ + params.is_dfs = req->is_dfs; + params.is_restart = isRestart; if (req->is_dfs) { - WMI_SET_CHANNEL_FLAG(chan, WMI_CHAN_FLAG_DFS); - cmd->disable_hw_ack = true; - + params.flag_dfs = WMI_CHAN_FLAG_DFS; + temp_chan_info |= (1 << WMI_CHAN_FLAG_DFS); + params.dis_hw_ack = true; req->dfs_pri_multiplier = wma->dfs_pri_multiplier; /* @@ -1949,7 +1909,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, * mode operation on DFS channels, P2P-GO * does not support operation on DFS Channels. */ - if (wma_is_vdev_in_ap_mode(wma, cmd->vdev_id) == true) { + if (wma_is_vdev_in_ap_mode(wma, params.vdev_id) == true) { /* * If DFS regulatory domain is invalid, * then, DFS radar filters intialization @@ -1967,7 +1927,6 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, " Failed to send VDEV START command", __func__, __LINE__); - qdf_nbuf_free(buf); return QDF_STATUS_E_FAILURE; } @@ -1977,8 +1936,9 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, /* provide the current channel to DFS */ wma->dfs_ic->ic_curchan = - wma_dfs_configure_channel(wma->dfs_ic, chan, - chanmode, req); + wma_dfs_configure_channel(wma->dfs_ic, + params.band_center_freq1, + params.band_center_freq2, req); qdf_spin_unlock_bh(&wma->dfs_ic->chan_lock); wma_unified_dfs_phyerr_filter_offload_enable(wma); @@ -1987,76 +1947,69 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, } } - cmd->beacon_interval = req->beacon_intval; - cmd->dtim_period = req->dtim_period; + params.beacon_intval = req->beacon_intval; + params.dtim_period = req->dtim_period; /* FIXME: Find out min, max and regulatory power levels */ - WMI_SET_CHANNEL_REG_POWER(chan, req->max_txpow); - WMI_SET_CHANNEL_MAX_TX_POWER(chan, req->max_txpow); + params.max_txpow = req->max_txpow; + temp_reg_info_1 &= 0xff00ffff; + temp_reg_info_1 |= ((req->max_txpow&0xff) << 16); + + temp_reg_info_2 &= 0xffff00ff; + temp_reg_info_2 |= ((req->max_txpow&0xff)<<8); /* TODO: Handle regulatory class, max antenna */ if (!isRestart) { - cmd->beacon_interval = req->beacon_intval; - cmd->dtim_period = req->dtim_period; + params.beacon_intval = req->beacon_intval; + params.dtim_period = req->dtim_period; /* Copy the SSID */ if (req->ssid.length) { + params.ssid.length = req->ssid.length; if (req->ssid.length < sizeof(cmd->ssid.ssid)) - cmd->ssid.ssid_len = req->ssid.length; + temp_ssid_len = req->ssid.length; else - cmd->ssid.ssid_len = sizeof(cmd->ssid.ssid); - qdf_mem_copy(cmd->ssid.ssid, req->ssid.ssId, - cmd->ssid.ssid_len); + temp_ssid_len = sizeof(cmd->ssid.ssid); + qdf_mem_copy(params.ssid.mac_ssid, req->ssid.ssId, + temp_ssid_len); } + params.hidden_ssid = req->hidden_ssid; + params.pmf_enabled = req->pmf_enabled; if (req->hidden_ssid) - cmd->flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; + temp_flags |= WMI_UNIFIED_VDEV_START_HIDDEN_SSID; if (req->pmf_enabled) - cmd->flags |= WMI_UNIFIED_VDEV_START_PMF_ENABLED; - } - - cmd->num_noa_descriptors = 0; - cmd->preferred_rx_streams = req->preferred_rx_streams; - cmd->preferred_tx_streams = req->preferred_tx_streams; - - buf_ptr = (uint8_t *) (((uintptr_t) cmd) + sizeof(*cmd) + - sizeof(wmi_channel)); - WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, - cmd->num_noa_descriptors * - sizeof(wmi_p2p_noa_descriptor)); - WMA_LOGA("\n%s: vdev_id %d freq %d channel %d chanmode %d is_dfs %d " - "beacon interval %d dtim %d center_chan %d center_freq2 %d " - "reg_info_1: 0x%x reg_info_2: 0x%x, req->max_txpow: 0x%x " - "Tx SS %d, Rx SS %d", - __func__, req->vdev_id, chan->mhz, req->chan, chanmode, - req->is_dfs, req->beacon_intval, cmd->dtim_period, - chan->band_center_freq1, chan->band_center_freq2, - chan->reg_info_1, chan->reg_info_2, req->max_txpow, - req->preferred_tx_streams, req->preferred_rx_streams); + temp_flags |= WMI_UNIFIED_VDEV_START_PMF_ENABLED; + } + + params.num_noa_descriptors = 0; + params.preferred_rx_streams = req->preferred_rx_streams; + params.preferred_tx_streams = req->preferred_tx_streams; /* Store vdev params in SAP mode which can be used in vdev restart */ if (intr[req->vdev_id].type == WMI_VDEV_TYPE_AP && intr[req->vdev_id].sub_type == 0) { intr[req->vdev_id].vdev_restart_params.vdev_id = req->vdev_id; intr[req->vdev_id].vdev_restart_params.ssid.ssid_len = - cmd->ssid.ssid_len; + temp_ssid_len; qdf_mem_copy(intr[req->vdev_id].vdev_restart_params.ssid.ssid, - cmd->ssid.ssid, cmd->ssid.ssid_len); - intr[req->vdev_id].vdev_restart_params.flags = cmd->flags; - intr[req->vdev_id].vdev_restart_params.requestor_id = - cmd->requestor_id; + params.ssid.mac_ssid, temp_ssid_len); + intr[req->vdev_id].vdev_restart_params.flags = temp_flags; + intr[req->vdev_id].vdev_restart_params.requestor_id = 0; intr[req->vdev_id].vdev_restart_params.disable_hw_ack = - cmd->disable_hw_ack; - intr[req->vdev_id].vdev_restart_params.chan.mhz = chan->mhz; + params.dis_hw_ack; + intr[req->vdev_id].vdev_restart_params.chan.mhz = + params.chan_freq; intr[req->vdev_id].vdev_restart_params.chan.band_center_freq1 = - chan->band_center_freq1; + params.band_center_freq1; intr[req->vdev_id].vdev_restart_params.chan.band_center_freq2 = - chan->band_center_freq2; - intr[req->vdev_id].vdev_restart_params.chan.info = chan->info; + params.band_center_freq2; + intr[req->vdev_id].vdev_restart_params.chan.info = + temp_chan_info; intr[req->vdev_id].vdev_restart_params.chan.reg_info_1 = - chan->reg_info_1; + temp_reg_info_1; intr[req->vdev_id].vdev_restart_params.chan.reg_info_2 = - chan->reg_info_2; + temp_reg_info_2; } if (isRestart) { @@ -2065,28 +2018,17 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, * since, VDEV RESTART will do a VDEV DOWN * in the firmware. */ - intr[cmd->vdev_id].vdev_up = false; - - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_RESTART_REQUEST_CMDID); - + intr[params.vdev_id].vdev_up = false; } else { WMA_LOGD("%s, vdev_id: %d, unpausing tx_ll_queue at VDEV_START", - __func__, cmd->vdev_id); - ol_txrx_vdev_unpause(wma->interfaces[cmd->vdev_id].handle, + __func__, params.vdev_id); + ol_txrx_vdev_unpause(wma->interfaces[params.vdev_id].handle, 0xffffffff); - wma->interfaces[cmd->vdev_id].pause_bitmap = 0; - ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, - WMI_VDEV_START_REQUEST_CMDID); + wma->interfaces[params.vdev_id].pause_bitmap = 0; } - if (ret < 0) { - WMA_LOGP("%s: Failed to send vdev start command", __func__); - qdf_nbuf_free(buf); - return QDF_STATUS_E_FAILURE; - } + return wmi_unified_vdev_start_send(wma->wmi_handle, ¶ms); - return QDF_STATUS_SUCCESS; } /** diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index e77211e0d0d7..71514c7aa004 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -5691,8 +5691,9 @@ void wma_dfs_configure(struct ieee80211com *ic) /** * wma_dfs_configure_channel() - configure DFS channel * @dfs_ic: ieee80211com ptr - * @chan: wmi channel - * @chanmode: channel mode + * @band_center_freq1: center frequency 1 + * @band_center_freq2: center frequency 2 + * (valid only for 11ac vht 80plus80 mode) * @ req: vdev start request * * Set the Channel parameters in to DFS module @@ -5703,8 +5704,8 @@ void wma_dfs_configure(struct ieee80211com *ic) */ struct dfs_ieee80211_channel *wma_dfs_configure_channel( struct ieee80211com *dfs_ic, - wmi_channel *chan, - WLAN_PHY_MODE chanmode, + uint32_t band_center_freq1, + uint32_t band_center_freq2, struct wma_vdev_start_req *req) { @@ -5731,9 +5732,9 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel( OS_MEMZERO(dfs_ic->ic_curchan, sizeof(struct dfs_ieee80211_channel)); dfs_ic->ic_curchan->ic_ieee = req->chan; - dfs_ic->ic_curchan->ic_freq = chan->mhz; - dfs_ic->ic_curchan->ic_vhtop_ch_freq_seg1 = chan->band_center_freq1; - dfs_ic->ic_curchan->ic_vhtop_ch_freq_seg2 = chan->band_center_freq2; + dfs_ic->ic_curchan->ic_freq = cds_chan_to_freq(req->chan); + dfs_ic->ic_curchan->ic_vhtop_ch_freq_seg1 = band_center_freq1; + dfs_ic->ic_curchan->ic_vhtop_ch_freq_seg2 = band_center_freq2; dfs_ic->ic_curchan->ic_pri_freq_center_freq_mhz_separation = dfs_ic->ic_curchan->ic_freq - dfs_ic->ic_curchan->ic_vhtop_ch_freq_seg1; @@ -5765,11 +5766,11 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel( dfs_ic->ic_curchan->ic_flags |= IEEE80211_CHAN_VHT80; break; case CH_WIDTH_80P80MHZ: - ext_channel = cds_freq_to_chan(chan->band_center_freq2); + ext_channel = cds_freq_to_chan(band_center_freq2); dfs_ic->ic_curchan->ic_flags |= IEEE80211_CHAN_VHT80P80; dfs_ic->ic_curchan->ic_freq_ext = - chan->band_center_freq2; + band_center_freq2; dfs_ic->ic_curchan->ic_ieee_ext = ext_channel; /* verify both the 80MHz are DFS bands or not */ -- cgit v1.2.3 From f2cffceb692042133960772f3033d236cf0b6a49 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Wed, 30 Mar 2016 11:55:47 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1C Incremental CLD3.1 Release 5.1.0.1C after relocating the driver development to new branch and path. Change-Id: Icef0cc257781d8baf5f9684ffc08d6808a9bf4d4 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index bf1cab5170a3..27a1c876cec6 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "B" +#define QWLAN_VERSION_EXTRA "C" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1B" +#define QWLAN_VERSIONSTR "5.1.0.1C" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 1aac198ff8c33a61d99fcfedd754e6e732ec07ba Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Wed, 2 Mar 2016 15:57:26 +0530 Subject: qcacld-3.0: Rename hif_callbacks and fix typos Rename hif_callbacks to hif_driver_state_callbacks and remove function pointer for monotonic API and fix some minor typos. Change-Id: Iae2326e26b58a00e4cc197104b31aca36d569a8e CRs-Fixed: 967765 --- core/cds/inc/cds_api.h | 2 +- core/cds/src/cds_api.c | 12 ++++++------ core/hdd/src/wlan_hdd_driver_ops.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h index ee114622978a..103514657291 100644 --- a/core/cds/inc/cds_api.h +++ b/core/cds/inc/cds_api.h @@ -209,7 +209,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID, void *pModuleContext); -QDF_STATUS cds_set_context(QDF_MODULE_ID moduleID, void *context); +QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context); QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, uint32_t *subType); diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 8edddecae199..e5cff3dcaf58 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1119,10 +1119,10 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID, /** * cds_set_context() - API to set context in global CDS Context - * @moduleID: Module ID + * @module_id: Module ID * @context: Pointer to the Module Context * - * API to set a MODULE Context in gloabl CDS Context + * API to set a MODULE Context in global CDS Context * * Return: QDF_STATUS */ @@ -1132,7 +1132,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) if (!p_cds_context) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "cds context is Invald"); + "cds context is Invalid"); return QDF_STATUS_NOT_INITIALIZED; } @@ -1142,8 +1142,8 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context) break; default: QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Module ID %i does not have its context " - "allocated by CDS", __func__, module_id); + "%s: Module ID %i does not have its context managed by CDS", + __func__, module_id); QDF_ASSERT(0); return QDF_STATUS_E_INVAL; } @@ -1615,7 +1615,7 @@ void cds_trigger_recovery(void) if (!wma_handle) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "WMA context is invald!"); + "WMA context is invalid!"); return; } diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index f9345755bcf1..4eb564b06809 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -143,32 +143,32 @@ static bool hdd_is_load_or_unload_in_progress(void *data) } /** - * hdd_is_recovery_in_prgress() - API to query if recovery in progress + * hdd_is_recovery_in_progress() - API to query if recovery in progress * @data: Private Data * * Return: bool */ -static bool hdd_is_recovery_in_prgress(void *data) +static bool hdd_is_recovery_in_progress(void *data) { return cds_is_driver_recovering(); } /** - * hdd_hif_init_cds_callbacks() - API to initialize HIF callbacks + * hdd_hif_init_driver_state_callbacks() - API to initialize HIF callbacks * @data: Private Data - * @cbk: callbacks + * @cbk: HIF Driver State callbacks * * HIF should be independent of CDS calls. Pass CDS Callbacks to HIF, HIF will * call the callbacks. * * Return: void */ -static void hdd_hif_init_cds_callbacks(void *data, struct hif_callbacks *cbk) +static void hdd_hif_init_driver_state_callbacks(void *data, + struct hif_driver_state_callbacks *cbk) { cbk->context = data; cbk->set_recovery_in_progress = hdd_set_recovery_in_progress; - cbk->get_monotonic_boottime = cds_get_monotonic_boottime; - cbk->is_recovery_in_progress = hdd_is_recovery_in_prgress; + cbk->is_recovery_in_progress = hdd_is_recovery_in_progress; cbk->is_load_unload_in_progress = hdd_is_load_or_unload_in_progress; cbk->is_driver_unloading = hdd_is_driver_unloading; } @@ -227,10 +227,10 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, int ret = 0; struct hif_opaque_softc *hif_ctx; qdf_device_t qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - struct hif_callbacks cbk; + struct hif_driver_state_callbacks cbk; uint32_t mode = cds_get_conparam(); - hdd_hif_init_cds_callbacks(dev, &cbk); + hdd_hif_init_driver_state_callbacks(dev, &cbk); hif_ctx = hif_open(qdf_ctx, mode, bus_type, &cbk); if (!hif_ctx) { -- cgit v1.2.3 From 9e6f1dd44751b96caece4ca5cb9d49fc026e7963 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Thu, 31 Mar 2016 13:31:49 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1D Incremental CLD3.1 Release 5.1.0.1D after relocating the driver development to new branch and path. Change-Id: Ifc161a74d121e11e9e21c3f2006889de8a5c71b8 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 27a1c876cec6..88e90556c6de 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "C" +#define QWLAN_VERSION_EXTRA "D" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1C" +#define QWLAN_VERSIONSTR "5.1.0.1D" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 3d4b1ef5eb78735413c10a3b7a7bdeab8b0b6160 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 29 Jan 2016 15:57:26 -0800 Subject: qcacld-3.0: Clean-up log messages from data path In data path per packet logging is overwriting previous useful logs. Use HDD data module ID for WMM per packet logging with debug log level such that by defualt per packet WMM debug log messages are not logged. Change-Id: I64053a6d5048a14277e01f35fcb6e0bbf6ac42b9 CRs-Fixed: 969712 --- core/hdd/src/wlan_hdd_wmm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 0e0a49dd77ec..7c3e33f187cc 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -1799,7 +1799,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, { hdd_wmm_qos_context_t *pQosContext; - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: Entered for AC %d", __func__, acType); if (!hdd_wmm_is_active(pAdapter) || @@ -1808,7 +1808,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* either we don't want QoS or the AP doesn't support * QoS or we don't want to do implicit QoS */ - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: QoS not configured on both ends ", __func__); *pGranted = @@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request already pending so we need to wait for that * response */ - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: Implicit QoS for TL AC %d already scheduled", __func__, acType); @@ -1838,7 +1838,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* request previously failed * allow access, but we'll be downgraded */ - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: Implicit QoS for TL AC %d previously failed", __func__, acType); @@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, return QDF_STATUS_SUCCESS; } /* we need to establish implicit QoS */ - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p", __func__, acType, pAdapter); @@ -1867,7 +1867,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, /* no memory for QoS context. Nothing we can do but * let data flow */ - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, WMM_TRACE_LEVEL_ERROR, "%s: Unable to allocate context", __func__); pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = true; @@ -1889,7 +1889,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter, INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos); #endif - QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_DEBUG, "%s: Scheduling work for AC %d, context %p", __func__, acType, pQosContext); -- cgit v1.2.3 From c7c69f014d368668209d10cb239a04114876ccbc Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Thu, 24 Mar 2016 22:45:52 -0700 Subject: qcacld-3.0: Add runtime pm ini items Add runtime pm enable and delay ini items in hdd. If runtime pm isn't enabled, the wlan driver will not perform runtime suspends. If runtime pm is enabled, the wlan driver will perform a runtime suspend after delay time in miliseconds. Change-Id: I7fa05b9fc1e81bd189e8336efcb3d2977732ed81 CRs-Fixed: 935300 --- core/hdd/inc/wlan_hdd_cfg.h | 28 ++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_cfg.c | 33 +++++++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_main.c | 22 ++++++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index b93fa5375b4e..867ee9570001 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -1009,6 +1009,28 @@ typedef enum { #define CFG_ENABLE_HOST_SSDP_MAX (1) #define CFG_ENABLE_HOST_SSDP_DEFAULT (1) +#ifdef FEATURE_RUNTIME_PM +/* + * config item to enable runtime suspend + * 1 means runtime suspend is enabled + * by default runtime suspend is disabled + */ +#define CFG_ENABLE_RUNTIME_PM "gRuntimePM" +#define CFG_ENABLE_RUNTIME_PM_MIN (0) +#define CFG_ENABLE_RUNTIME_PM_MAX (1) +#define CFG_ENABLE_RUNTIME_PM_DEFAULT (0) + +/* + * config item for runtime pm's inactivity timer. + * the wlan driver will wait for this number of miliseconds + * of inactivity before performing a runtime suspend. + */ +#define CFG_RUNTIME_PM_DELAY_NAME "gRuntimePMDelay" +#define CFG_RUNTIME_PM_DELAY_MIN (100) +#define CFG_RUNTIME_PM_DELAY_MAX (10000) +#define CFG_RUNTIME_PM_DELAY_DEFAULT (500) +#endif + #define CFG_ENABLE_HOST_NSOFFLOAD_NAME "hostNSOffload" #define CFG_ENABLE_HOST_NSOFFLOAD_MIN (0) #define CFG_ENABLE_HOST_NSOFFLOAD_MAX (1) @@ -3070,6 +3092,12 @@ struct hdd_config { uint8_t mcastBcastFilterSetting; bool fhostArpOffload; bool ssdp; + +#ifdef FEATURE_RUNTIME_PM + bool runtime_pm; + uint32_t runtime_pm_delay; +#endif + #ifdef FEATURE_WLAN_RA_FILTERING bool IsRArateLimitEnabled; uint16_t RArateLimitInterval; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 8214e69107eb..3c2eda6604a2 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1568,6 +1568,23 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_ENABLE_HOST_SSDP_MIN, CFG_ENABLE_HOST_SSDP_MAX), +#ifdef FEATURE_RUNTIME_PM + REG_VARIABLE(CFG_ENABLE_RUNTIME_PM, WLAN_PARAM_Integer, + struct hdd_config, runtime_pm, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_ENABLE_RUNTIME_PM_DEFAULT, + CFG_ENABLE_RUNTIME_PM_MIN, + CFG_ENABLE_RUNTIME_PM_MAX), + + REG_VARIABLE(CFG_RUNTIME_PM_DELAY_NAME, WLAN_PARAM_Integer, + struct hdd_config, runtime_pm_delay, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_RUNTIME_PM_DELAY_DEFAULT, + CFG_RUNTIME_PM_DELAY_MIN, + CFG_RUNTIME_PM_DELAY_MAX), +#endif + + REG_VARIABLE(CFG_ENABLE_HOST_NSOFFLOAD_NAME, WLAN_PARAM_Integer, struct hdd_config, fhostNSOffload, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -4489,6 +4506,21 @@ static void hdd_set_power_save_offload_config(hdd_context_t *pHddCtx) } +#ifdef FEATURE_RUNTIME_PM +static void hdd_cfg_print_runtime_pm(hdd_context_t *hdd_ctx) +{ + hdd_info("Name = [gRuntimePM] Value = [%u] ", + hdd_ctx->config->runtime_pm); + + hdd_info("Name = [gRuntimePMDelay] Value = [%u] ", + hdd_ctx->config->runtime_pm_delay); +} +#else +static void hdd_cfg_print_runtime_pm(hdd_context_t *hdd_ctx) +{ +} +#endif + /** * hdd_cfg_print() - print the hdd configuration * @iniTable: pointer to hdd context @@ -4758,6 +4790,7 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) pHddCtx->config->fhostArpOffload); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp); + hdd_cfg_print_runtime_pm(pHddCtx); #ifdef FEATURE_WLAN_RA_FILTERING QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [RArateLimitInterval] Value = [%u] ", diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index d399859d7385..543041d695fe 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -7005,6 +7005,27 @@ static void hdd_update_ol_config(hdd_context_t *hdd_ctx) ol_init_ini_config(ol_ctx, &cfg); } +#ifdef FEATURE_RUNTIME_PM +/** + * hdd_populate_runtime_cfg() - populate runtime configuration + * @hdd_ctx: hdd context + * @cfg: pointer to the configuration memory being populated + * + * Return: void + */ +static void hdd_populate_runtime_cfg(hdd_context_t *hdd_ctx, + struct hif_config_info *cfg) +{ + cfg->enable_runtime_pm = hdd_ctx->config->runtime_pm; + cfg->runtime_pm_delay = hdd_ctx->config->runtime_pm_delay; +} +#else +static void hdd_populate_runtime_cfg(hdd_context_t *hdd_ctx, + struct hif_config_info *cfg) +{ +} +#endif + /** * hdd_update_hif_config - API to update HIF configuration parameters * @hdd_ctx: HDD Context @@ -7020,6 +7041,7 @@ static void hdd_update_hif_config(hdd_context_t *hdd_ctx) return; cfg.enable_self_recovery = hdd_ctx->config->enableSelfRecovery; + hdd_populate_runtime_cfg(hdd_ctx, &cfg); hif_init_ini_config(scn, &cfg); } -- cgit v1.2.3 From 6785797b91afc0eea579570c52fec85c2e225ac5 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Thu, 31 Mar 2016 23:21:40 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1E Incremental CLD3.1 Release 5.1.0.1E after relocating the driver development to new branch and path. Change-Id: I49934210bb4c92f7cf9d700845812e49615af6da CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 88e90556c6de..656fe22fd2f0 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "D" +#define QWLAN_VERSION_EXTRA "E" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1D" +#define QWLAN_VERSIONSTR "5.1.0.1E" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 1e11d79646cf368e8e1851a27a58c6246721af50 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Fri, 26 Feb 2016 18:58:44 -0800 Subject: qcacld-3.0: Remove CDS related functions in HTC Update runtime PM APIs and HTC connection mode parameter accordingly. Change-Id: I2f54933b90aaed233042c113d246fae4726f5707 CRs-fixed: 982024 --- core/cds/src/cds_api.c | 4 ++-- core/dp/ol/inc/ol_txrx_ctrl_api.h | 4 ++++ core/dp/txrx/ol_txrx.c | 32 ++++++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_driver_ops.c | 17 ++++++++++++++--- core/hdd/src/wlan_hdd_ftm.c | 2 +- core/utils/epping/src/epping_main.c | 3 ++- 6 files changed, 55 insertions(+), 7 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index e5cff3dcaf58..8313b4adcc09 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -55,7 +55,7 @@ #include "ol_fw.h" #include "ol_if_athvar.h" #include "hif.h" - +#include "cds_concurrency.h" #include "cds_utils.h" #include "wlan_logging_sock_svc.h" #include "wma.h" @@ -273,7 +273,7 @@ QDF_STATUS cds_open(void) /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(scn, &htcInfo, qdf_ctx); + htc_create(scn, &htcInfo, qdf_ctx, cds_get_conparam()); if (!gp_cds_context->htc_ctx) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index aa482bf60582..fd151f16a1f9 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -674,6 +674,10 @@ ol_txrx_set_monitor_mode_vap(ol_txrx_pdev_handle pdev, */ void ol_txrx_set_curchan(ol_txrx_pdev_handle pdev, uint32_t chan_mhz); +#ifdef FEATURE_RUNTIME_PM +QDF_STATUS ol_txrx_runtime_suspend(ol_txrx_pdev_handle txrx_pdev); +QDF_STATUS ol_txrx_runtime_resume(ol_txrx_pdev_handle txrx_pdev); +#endif QDF_STATUS ol_txrx_bus_suspend(void); QDF_STATUS ol_txrx_bus_resume(void); QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 7a0629b60c33..4393d470dfe7 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1918,6 +1918,38 @@ QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout) #define SUSPEND_DRAIN_WAIT 3000 #endif +#ifdef FEATURE_RUNTIME_PM +/** + * ol_txrx_runtime_suspend() - ensure TXRX is ready to runtime suspend + * @txrx_pdev: TXRX pdev context + * + * TXRX is ready to runtime suspend if there are no pending packets + * in the tx queue. + * + * Return: QDF_STATUS + */ +QDF_STATUS ol_txrx_runtime_suspend(ol_txrx_pdev_handle txrx_pdev) +{ + if (ol_txrx_get_tx_pending(txrx_pdev)) + return QDF_STATUS_E_BUSY; + else + return QDF_STATUS_SUCCESS; +} + +/** + * ol_txrx_runtime_resume() - ensure TXRX is ready to runtime resume + * @txrx_pdev: TXRX pdev context + * + * This is a dummy function for symmetry. + * + * Return: QDF_STATUS_SUCCESS + */ +QDF_STATUS ol_txrx_runtime_resume(ol_txrx_pdev_handle txrx_pdev) +{ + return QDF_STATUS_SUCCESS; +} +#endif + /** * ol_txrx_bus_suspend() - bus suspend * diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 4eb564b06809..2050ad542cb8 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -681,6 +681,8 @@ static int __wlan_hdd_runtime_suspend(void) { void *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); + void *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); + void *htc_ctx = cds_get_context(QDF_MODULE_ID_HTC); int status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) @@ -690,10 +692,14 @@ static int __wlan_hdd_runtime_suspend(void) if (status) goto process_failure; - status = htc_runtime_suspend(); + status = qdf_status_to_os_return(ol_txrx_runtime_suspend(txrx_pdev)); if (status) goto process_failure; + status = htc_runtime_suspend(htc_ctx); + if (status) + goto resume_txrx; + status = wma_runtime_suspend(); if (status) goto resume_htc; @@ -714,7 +720,9 @@ resume_hif: resume_wma: QDF_BUG(!wma_runtime_resume()); resume_htc: - QDF_BUG(!htc_runtime_resume()); + QDF_BUG(!htc_runtime_resume(htc_ctx)); +resume_txrx: + QDF_BUG(!qdf_status_to_os_return(ol_txrx_runtime_resume(txrx_pdev))); process_failure: hif_process_runtime_suspend_failure(hif_ctx); return status; @@ -751,12 +759,15 @@ static int wlan_hdd_runtime_suspend(void) static int __wlan_hdd_runtime_resume(void) { void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF); + void *htc_ctx = cds_get_context(QDF_MODULE_ID_HTC); + void *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX); hif_pre_runtime_resume(hif_ctx); QDF_BUG(!cnss_auto_resume()); QDF_BUG(!hif_runtime_resume(hif_ctx)); QDF_BUG(!wma_runtime_resume()); - QDF_BUG(!htc_runtime_resume()); + QDF_BUG(!htc_runtime_resume(htc_ctx)); + QDF_BUG(!qdf_status_to_os_return(ol_txrx_runtime_resume(txrx_pdev))); hif_process_runtime_resume_success(hif_ctx); return 0; } diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 02aa06ee8a6e..59e11a2a8ef6 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -266,7 +266,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context, /* Create HTC */ gp_cds_context->htc_ctx = - htc_create(pHifContext, &htcInfo, qdf_ctx); + htc_create(pHifContext, &htcInfo, qdf_ctx, hdd_get_conparam()); if (!gp_cds_context->htc_ctx) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index e9b141ec4262..a0ebc9cc9b7d 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -239,7 +239,8 @@ int epping_enable(struct device *parent_dev) qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); /* Create HTC */ - p_cds_context->htc_ctx = htc_create(scn, &htcInfo, qdf_ctx); + p_cds_context->htc_ctx = htc_create(scn, &htcInfo, qdf_ctx, + cds_get_conparam()); if (!p_cds_context->htc_ctx) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed to Create HTC", __func__); -- cgit v1.2.3 From 12a0839cd6d0c349cd45074cd268d8625c948370 Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Wed, 17 Feb 2016 13:10:34 -0800 Subject: qcacld-3.0: Data path changes to use converged APIs (Part 1) Change the data path and external modules to use the new converged common data path APIs. Change-Id: Ifb48178efd012b6ad9ea6f6d5230d0a809922b1c CRs-Fixed: 994638 --- Kbuild | 6 + core/bmi/inc/ol_if_athvar.h | 3 - core/cds/src/cds_api.c | 6 +- core/dp/htt/htt_t2h.c | 1 - core/dp/htt/htt_types.h | 3 - core/dp/ol/inc/ol_cfg.h | 3 +- core/dp/ol/inc/ol_ctrl_api.h | 44 ------- core/dp/ol/inc/ol_htt_api.h | 3 +- core/dp/ol/inc/ol_osif_api.h | 42 ------ core/dp/ol/inc/ol_txrx_api.h | 21 --- core/dp/ol/inc/ol_txrx_ctrl_api.h | 239 +---------------------------------- core/dp/ol/inc/ol_txrx_dbg.h | 63 --------- core/dp/ol/inc/ol_txrx_htt_api.h | 2 +- core/dp/ol/inc/ol_txrx_osif_api.h | 128 +------------------ core/dp/txrx/ol_ctrl_txrx_api.h | 30 +---- core/dp/txrx/ol_rx.c | 3 - core/dp/txrx/ol_rx.h | 3 +- core/dp/txrx/ol_rx_defrag.c | 1 - core/dp/txrx/ol_rx_fwd.c | 1 - core/dp/txrx/ol_rx_pn.c | 1 - core/dp/txrx/ol_rx_reorder_timeout.c | 1 - core/dp/txrx/ol_rx_reorder_timeout.h | 5 +- core/dp/txrx/ol_tx.c | 43 ++++++- core/dp/txrx/ol_tx.h | 4 +- core/dp/txrx/ol_tx_desc.c | 1 - core/dp/txrx/ol_tx_desc.h | 2 +- core/dp/txrx/ol_tx_queue.c | 3 - core/dp/txrx/ol_tx_queue.h | 2 +- core/dp/txrx/ol_tx_send.c | 1 - core/dp/txrx/ol_tx_send.h | 2 +- core/dp/txrx/ol_txrx.c | 190 +++++++++++++++++++++++++--- core/dp/txrx/ol_txrx.h | 27 +--- core/dp/txrx/ol_txrx_encap.c | 1 - core/dp/txrx/ol_txrx_encap.h | 2 +- core/dp/txrx/ol_txrx_flow_control.c | 5 +- core/dp/txrx/ol_txrx_peer_find.h | 2 +- core/dp/txrx/ol_txrx_types.h | 11 +- core/dp/txrx/txrx.h | 12 -- core/wma/inc/wma.h | 2 +- core/wma/src/wma_data.c | 7 +- core/wma/src/wma_dev_if.c | 5 +- core/wma/src/wma_features.c | 3 - core/wma/src/wma_main.c | 3 - core/wma/src/wma_mgmt.c | 3 - core/wma/src/wma_power.c | 3 - core/wma/src/wma_scan_roam.c | 3 - core/wma/src/wma_utils.c | 3 - 47 files changed, 245 insertions(+), 704 deletions(-) delete mode 100644 core/dp/ol/inc/ol_ctrl_api.h delete mode 100644 core/dp/ol/inc/ol_osif_api.h diff --git a/Kbuild b/Kbuild index 4e639d7938b1..504f5f0e16cc 100755 --- a/Kbuild +++ b/Kbuild @@ -683,6 +683,11 @@ endif OL_DIR := core/dp/ol OL_INC := -I$(WLAN_ROOT)/$(OL_DIR)/inc +############ CDP ############ +CDP_ROOT_DIR := dp +CDP_INC_DIR := $(CDP_ROOT_DIR)/inc +CDP_INC := -I$(WLAN_COMMON_INC)/$(CDP_INC_DIR) + ############ PKTLOG ############ PKTLOG_DIR := core/utils/pktlog PKTLOG_INC := -I$(WLAN_ROOT)/$(PKTLOG_DIR)/include @@ -819,6 +824,7 @@ INCS += $(WMA_INC) \ $(FWLOG_INC) \ $(TXRX_INC) \ $(OL_INC) \ + $(CDP_INC) \ $(PKTLOG_INC) \ $(HTT_INC) \ $(HTC_INC) \ diff --git a/core/bmi/inc/ol_if_athvar.h b/core/bmi/inc/ol_if_athvar.h index c9d45d81abdb..cf0e1c81634c 100644 --- a/core/bmi/inc/ol_if_athvar.h +++ b/core/bmi/inc/ol_if_athvar.h @@ -37,9 +37,6 @@ #include "wmi_unified_api.h" #include "htc_api.h" #include "bmi_msg.h" -#include "ol_txrx_api.h" -#include "ol_txrx_ctrl_api.h" -#include "ol_txrx_osif_api.h" #include "ol_params.h" #include diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 8313b4adcc09..ad9ace313f70 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -427,7 +427,7 @@ QDF_STATUS cds_open(void) } gp_cds_context->pdev_txrx_ctx = - ol_txrx_pdev_alloc(gp_cds_context->cfg_ctx, + ol_txrx_pdev_attach(gp_cds_context->cfg_ctx, gp_cds_context->htc_ctx, gp_cds_context->qdf_ctx); if (!gp_cds_context->pdev_txrx_ctx) { @@ -569,7 +569,7 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context) return QDF_STATUS_E_FAILURE; } - if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) { + if (ol_txrx_pdev_post_attach(gp_cds_context->pdev_txrx_ctx)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "Failed to attach pdev"); htc_stop(gp_cds_context->htc_ctx); @@ -655,7 +655,7 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context) "%s: SME correctly started", __func__); if (ol_txrx_pdev_attach_target - (p_cds_context->pdev_txrx_ctx) != A_OK) { + (p_cds_context->pdev_txrx_ctx)) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL, "%s: Failed attach target", __func__); goto err_sme_stop; diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index efefeb4b9bf5..7fb80647e8f3 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -48,7 +48,6 @@ #include #include #include -#include #include /*--- target->host HTT message dispatch function ----------------------------*/ diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h index c9437f96401e..c49a02273338 100644 --- a/core/dp/htt/htt_types.h +++ b/core/dp/htt/htt_types.h @@ -36,9 +36,6 @@ #include /* qdf_nbuf_t */ #include /* HTC_PACKET */ -#include /* ol_pdev_handle */ -#include /* ol_txrx_pdev_handle */ - #define DEBUG_DMA_DONE #define HTT_TX_MUTEX_TYPE qdf_spinlock_t diff --git a/core/dp/ol/inc/ol_cfg.h b/core/dp/ol/inc/ol_cfg.h index 88224ccd812f..49c9ae454451 100644 --- a/core/dp/ol/inc/ol_cfg.h +++ b/core/dp/ol/inc/ol_cfg.h @@ -29,10 +29,11 @@ #define _OL_CFG__H_ #include /* uint32_t */ -#include /* ol_pdev_handle */ +#include /* ol_pdev_handle */ #include /* ieee80211_qosframe_htc_addr4 */ #include /* LLC_SNAP_HDR_LEN */ #include "wlan_tgt_def_config.h" +#include "ol_txrx_ctrl_api.h" /* txrx_pdev_cfg_param_t */ /** * @brief format of data frames delivered to/from the WLAN driver by/to the OS diff --git a/core/dp/ol/inc/ol_ctrl_api.h b/core/dp/ol/inc/ol_ctrl_api.h deleted file mode 100644 index c3e6eb347480..000000000000 --- a/core/dp/ol/inc/ol_ctrl_api.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * @file ol_ctrl_api.h - * @brief Definitions used in multiple external interfaces to the control SW. - */ -#ifndef _OL_CTRL_API__H_ -#define _OL_CTRL_API__H_ - -struct ol_pdev_t; -typedef struct ol_pdev_t *ol_pdev_handle; - -struct ol_vdev_t; -typedef struct ol_vdev_t *ol_vdev_handle; - -struct ol_peer_t; -typedef struct ol_peer_t *ol_peer_handle; - -#endif /* _OL_CTRL_API__H_ */ diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h index e0a7cd8c847d..f55ddfb730ec 100644 --- a/core/dp/ol/inc/ol_htt_api.h +++ b/core/dp/ol/inc/ol_htt_api.h @@ -39,9 +39,8 @@ #include /* qdf_nbuf_t */ #include /* A_STATUS */ #include /* HTC_HANDLE */ -#include /* ol_pdev_handle */ -#include /* ol_txrx_pdev_handle */ #include "htt.h" /* htt_dbg_stats_type, etc. */ +#include /* ol_pdev_handle */ /* TID */ #define OL_HTT_TID_NON_QOS_UNICAST 16 diff --git a/core/dp/ol/inc/ol_osif_api.h b/core/dp/ol/inc/ol_osif_api.h deleted file mode 100644 index 9344a5fa5fea..000000000000 --- a/core/dp/ol/inc/ol_osif_api.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/** - * @file ol_osif_api.h - * @brief Definitions used in multiple external interfaces to the txrx SW. - */ -#ifndef _OL_OSIF_API__H_ -#define _OL_OSIF_API__H_ - -/** - * @typedef ol_osif_vdev_handle - * @brief opaque handle for OS shim virtual device object - */ -struct ol_osif_vdev_t; -typedef struct ol_osif_vdev_t *ol_osif_vdev_handle; - -#endif /* _OL_OSIF_API__H_ */ diff --git a/core/dp/ol/inc/ol_txrx_api.h b/core/dp/ol/inc/ol_txrx_api.h index 289d49e32341..81f61f5147c2 100644 --- a/core/dp/ol/inc/ol_txrx_api.h +++ b/core/dp/ol/inc/ol_txrx_api.h @@ -32,27 +32,6 @@ #ifndef _OL_TXRX_API__H_ #define _OL_TXRX_API__H_ -/** - * @typedef ol_txrx_pdev_handle - * @brief opaque handle for txrx physical device object - */ -struct ol_txrx_pdev_t; -typedef struct ol_txrx_pdev_t *ol_txrx_pdev_handle; - -/** - * @typedef ol_txrx_vdev_handle - * @brief opaque handle for txrx virtual device object - */ -struct ol_txrx_vdev_t; -typedef struct ol_txrx_vdev_t *ol_txrx_vdev_handle; - -/** - * @typedef ol_txrx_peer_handle - * @brief opaque handle for txrx peer object - */ -struct ol_txrx_peer_t; -typedef struct ol_txrx_peer_t *ol_txrx_peer_handle; - /** * @brief ADDBA negotiation status, used both during requests and confirmations */ diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index fd151f16a1f9..70ea34e491e0 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -37,11 +37,9 @@ #include /* qdf_device_t */ #include /* HTC_HANDLE */ -#include /* ol_osif_vdev_handle */ -#include /* ol_txrx_pdev_handle, etc. */ -#include /* ol_pdev_handle, ol_vdev_handle */ - +#include /* ol_sec_type */ #include /* MAX_SPATIAL_STREAM */ +#include /* ol_pdev_handle, ol_vdev_handle, etc */ #define OL_ATH_TX_DRAIN_WAIT_DELAY 50 @@ -55,25 +53,6 @@ to soft-AP itself */ #define WLAN_RX_SAP_SELF_STA_ID (WLAN_MAX_STA_COUNT + 2) -/** - * enum wlan_op_mode - Virtual device operation mode - * - * @wlan_op_mode_unknown: Unknown mode - * @wlan_op_mode_ap: AP mode - * @wlan_op_mode_ibss: IBSS mode - * @wlan_op_mode_sta: STA (client) mode - * @wlan_op_mode_monitor: Monitor mode - * @wlan_op_mode_ocb: OCB mode - */ -enum wlan_op_mode { - wlan_op_mode_unknown, - wlan_op_mode_ap, - wlan_op_mode_ibss, - wlan_op_mode_sta, - wlan_op_mode_monitor, - wlan_op_mode_ocb, -}; - #define OL_TXQ_PAUSE_REASON_FW (1 << 0) #define OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED (1 << 1) #define OL_TXQ_PAUSE_REASON_TX_ABORT (1 << 2) @@ -137,10 +116,6 @@ enum netif_reason_type { #define WLAN_DUMP_TX_FLOW_POOL_INFO 5 #define WLAN_TXRX_DESC_STATS 6 -ol_txrx_pdev_handle -ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, - HTC_HANDLE htc_pdev, qdf_device_t osdev); - /** * @brief Set up the data SW subsystem. * @details @@ -163,59 +138,7 @@ ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, * @return 0 for success or error code */ int -ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev); - -/** - * @brief Do final steps of data SW setup that send messages to the target. - * @details - * The majority of the data SW setup are done by the pdev_attach function, - * but this function completes the data SW setup by sending datapath - * configuration messages to the target. - * - * @param data_pdev - the physical device being initialized - */ -A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle data_pdev); - -/** - * @brief Allocate and initialize the data object for a new virtual device. - * @param data_pdev - the physical device the virtual device belongs to - * @param vdev_mac_addr - the MAC address of the virtual device - * @param vdev_id - the ID used to identify the virtual device to the target - * @param op_mode - whether this virtual device is operating as an AP, - * an IBSS, or a STA - * @return - * success: handle to new data vdev object, -OR- - * failure: NULL - */ -ol_txrx_vdev_handle -ol_txrx_vdev_attach(ol_txrx_pdev_handle data_pdev, - uint8_t *vdev_mac_addr, - uint8_t vdev_id, enum wlan_op_mode op_mode); - -/** - * @brief Allocate and set up references for a data peer object. - * @details - * When an association with a peer starts, the host's control SW - * uses this function to inform the host data SW. - * The host data SW allocates its own peer object, and stores a - * reference to the control peer object within the data peer object. - * The host data SW also stores a reference to the virtual device - * that the peer is associated with. This virtual device handle is - * used when the data SW delivers rx data frames to the OS shim layer. - * The host data SW returns a handle to the new peer data object, - * so a reference within the control peer object can be set to the - * data peer object. - * - * @param data_pdev - data physical device object that will indirectly - * own the data_peer object - * @param data_vdev - data virtual device object that will directly - * own the data_peer object - * @param peer_mac_addr - MAC address of the new peer - * @return handle to new data peer object, or NULL if the attach fails - */ -ol_txrx_peer_handle -ol_txrx_peer_attach(ol_txrx_pdev_handle data_pdev, - ol_txrx_vdev_handle data_vdev, uint8_t *peer_mac_addr); +ol_txrx_pdev_post_attach(ol_txrx_pdev_handle pdev); /** * @brief Parameter type to be input to ol_txrx_peer_update @@ -486,61 +409,8 @@ void ol_txrx_pdev_unpause(struct ol_txrx_pdev_t *pdev, uint32_t reason) */ void ol_txrx_tx_sync(ol_txrx_pdev_handle data_pdev, uint8_t sync_cnt); -/** - * @brief Delete a peer's data object. - * @details - * When the host's control SW disassociates a peer, it calls this - * function to delete the peer's data object. - * The reference stored in the control peer object to the data peer - * object (set up by a call to ol_peer_store()) is provided. - * - * @param data_peer - the object to delete - */ -void ol_txrx_peer_detach(ol_txrx_peer_handle data_peer); - typedef void (*ol_txrx_vdev_delete_cb)(void *context); -/** - * @brief Deallocate the specified data virtual device object. - * @details - * All peers associated with the virtual device need to be deleted - * (ol_txrx_peer_detach) before the virtual device itself is deleted. - * However, for the peers to be fully deleted, the peer deletion has to - * percolate through the target data FW and back up to the host data SW. - * Thus, even though the host control SW may have issued a peer_detach - * call for each of the vdev's peers, the peer objects may still be - * allocated, pending removal of all references to them by the target FW. - * In this case, though the vdev_detach function call will still return - * immediately, the vdev itself won't actually be deleted, until the - * deletions of all its peers complete. - * The caller can provide a callback function pointer to be notified when - * the vdev deletion actually happens - whether it's directly within the - * vdev_detach call, or if it's deferred until all in-progress peer - * deletions have completed. - * - * @param data_vdev - data object for the virtual device in question - * @param callback - function to call (if non-NULL) once the vdev has - * been wholly deleted - * @param callback_context - context to provide in the callback - */ -void -ol_txrx_vdev_detach(ol_txrx_vdev_handle data_vdev, - ol_txrx_vdev_delete_cb callback, void *callback_context); - -/** - * @brief Delete the data SW state. - * @details - * This function is used when the WLAN driver is being removed to - * remove the host data component within the driver. - * All virtual devices within the physical device need to be deleted - * (ol_txrx_vdev_detach) before the physical device itself is deleted. - * - * @param data_pdev - the data physical device object being removed - * @param force - delete the pdev (and its vdevs and peers) even if there - * are outstanding references by the target to the vdevs and peers - * within the pdev - */ -void ol_txrx_pdev_detach(ol_txrx_pdev_handle data_pdev, int force); typedef void (*ol_txrx_data_tx_cb)(void *ctxt, qdf_nbuf_t tx_frm, int had_error); @@ -587,93 +457,6 @@ qdf_nbuf_t ol_tx_non_std(ol_txrx_vdev_handle data_vdev, enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list); -typedef void -(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error); - -/** - * @brief Store a callback for delivery notifications for management frames. - * @details - * When the txrx SW receives notifications from the target that a tx frame - * has been delivered to its recipient, it will check if the tx frame - * is a management frame. If so, the txrx SW will check the management - * frame type specified when the frame was submitted for transmission. - * If there is a callback function registered for the type of managment - * frame in question, the txrx code will invoke the callback to inform - * the management + control SW that the mgmt frame was delivered. - * This function is used by the control SW to store a callback pointer - * for a given type of management frame. - * - * @param pdev - the data physical device object - * @param type - the type of mgmt frame the callback is used for - * @param download_cb - the callback for notification of delivery to the target - * @param ota_ack_cb - the callback for notification of delivery to the peer - * @param ctxt - context to use with the callback - */ -void -ol_txrx_mgmt_tx_cb_set(ol_txrx_pdev_handle pdev, - uint8_t type, - ol_txrx_mgmt_tx_cb download_cb, - ol_txrx_mgmt_tx_cb ota_ack_cb, void *ctxt); - -/** - * @brief Transmit a management frame. - * @details - * Send the specified management frame from the specified virtual device. - * The type is used for determining whether to invoke a callback to inform - * the sender that the tx mgmt frame was delivered, and if so, which - * callback to use. - * - * @param vdev - virtual device transmitting the frame - * @param tx_mgmt_frm - management frame to transmit - * @param type - the type of managment frame (determines what callback to use) - * @param use_6mbps - specify whether management frame to transmit should use 6 Mbps - * rather than 1 Mbps min rate(for 5GHz band or P2P) - * @return - * 0 -> the frame is accepted for transmission, -OR- - * 1 -> the frame was not accepted - */ -int -ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, - qdf_nbuf_t tx_mgmt_frm, - uint8_t type, uint8_t use_6mbps, uint16_t chanfreq); - -/** - * @brief Setup the monitor mode vap (vdev) for this pdev - * @details - * When a non-NULL vdev handle is registered as the monitor mode vdev, all - * packets received by the system are delivered to the OS stack on this - * interface in 802.11 MPDU format. Only a single monitor mode interface - * can be up at any timer. When the vdev handle is set to NULL the monitor - * mode delivery is stopped. This handle may either be a unique vdev - * object that only receives monitor mode packets OR a point to a a vdev - * object that also receives non-monitor traffic. In the second case the - * OS stack is responsible for delivering the two streams using approprate - * OS APIs - * - * @param pdev - the data physical device object - * @param vdev - the data virtual device object to deliver monitor mode - * packets on - * @return - * 0 -> the monitor mode vap was sucessfully setup - * -1 -> Unable to setup monitor mode - */ -int -ol_txrx_set_monitor_mode_vap(ol_txrx_pdev_handle pdev, - ol_txrx_vdev_handle vdev); - -/** - * @brief Setup the current operating channel of the device - * @details - * Mainly used when populating monitor mode status that requires the - * current operating channel - * - * @param pdev - the data physical device object - * @param chan_mhz - the channel frequency (mhz) - * packets on - * @return - void - */ -void ol_txrx_set_curchan(ol_txrx_pdev_handle pdev, uint32_t chan_mhz); - #ifdef FEATURE_RUNTIME_PM QDF_STATUS ol_txrx_runtime_suspend(ol_txrx_pdev_handle txrx_pdev); QDF_STATUS ol_txrx_runtime_resume(ol_txrx_pdev_handle txrx_pdev); @@ -717,22 +500,6 @@ void ol_txrx_discard_tx_pending(ol_txrx_pdev_handle pdev); */ void ol_txrx_set_safemode(ol_txrx_vdev_handle vdev, uint32_t val); -/** - * @brief set the privacy filter - * @details - * Rx related. Set the privacy filters. When rx packets, check - * the ether type, filter type and packet type - * to decide whether discard these packets. - * - * @param vdev - the data virtual device object - * @param filter - filters to be set - * @param num - the number of filters - * @return - void - */ -void -ol_txrx_set_privacy_filters(ol_txrx_vdev_handle vdev, - void *filter, uint32_t num); - /** * @brief configure the drop unencrypted frame flag * @details diff --git a/core/dp/ol/inc/ol_txrx_dbg.h b/core/dp/ol/inc/ol_txrx_dbg.h index 976415f00ae0..745e24f7baea 100644 --- a/core/dp/ol/inc/ol_txrx_dbg.h +++ b/core/dp/ol/inc/ol_txrx_dbg.h @@ -37,70 +37,10 @@ #include /* htt_dbg_stats_type */ #include /* ol_txrx_stats */ -typedef void (*ol_txrx_stats_callback)(void *ctxt, - enum htt_dbg_stats_type type, - uint8_t *buf, int bytes); - -struct ol_txrx_stats_req { - uint32_t stats_type_upload_mask; /* which stats to upload */ - uint32_t stats_type_reset_mask; /* which stats to reset */ - - /* stats will be printed if either print element is set */ - struct { - int verbose; /* verbose stats printout */ - int concise; /* concise stats printout (takes precedence) */ - } print; /* print uploaded stats */ - - /* stats notify callback will be invoked if fp is non-NULL */ - struct { - ol_txrx_stats_callback fp; - void *ctxt; - } callback; - - /* stats will be copied into the specified buffer if buf is non-NULL */ - struct { - uint8_t *buf; - int byte_limit; /* don't copy more than this */ - } copy; - - /* - * If blocking is true, the caller will take the specified semaphore - * to wait for the stats to be uploaded, and the driver will release - * the semaphore when the stats are done being uploaded. - */ - struct { - int blocking; - qdf_semaphore_t *sem_ptr; - } wait; -}; - #ifndef TXRX_DEBUG_LEVEL #define TXRX_DEBUG_LEVEL 0 /* no debug info */ #endif -#ifndef ATH_PERF_PWR_OFFLOAD /*---------------------------------------------*/ - -#define ol_txrx_debug(vdev, debug_specs) 0 -#define ol_txrx_fw_stats_cfg(vdev, type, val) 0 -#define ol_txrx_fw_stats_get(vdev, req, response_expected) 0 -#define ol_txrx_aggr_cfg(vdev, max_subfrms_ampdu, max_subfrms_amsdu) 0 - -#else /*---------------------------------------------------------------------*/ - -#include /* ol_txrx_pdev_handle, etc. */ - -int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs); - -void ol_txrx_fw_stats_cfg(ol_txrx_vdev_handle vdev, - uint8_t cfg_stats_type, uint32_t cfg_val); - -int ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, - struct ol_txrx_stats_req *req, - bool response_expected); - -int ol_txrx_aggr_cfg(ol_txrx_vdev_handle vdev, - int max_subfrms_ampdu, int max_subfrms_amsdu); - enum { TXRX_DBG_MASK_OBJS = 0x01, TXRX_DBG_MASK_STATS = 0x02, @@ -119,8 +59,6 @@ enum { /* uncomment this for verbose txrx printouts (may impact performance) */ /* #define TXRX_PRINT_VERBOSE_ENABLE 1 */ -void ol_txrx_print_level_set(unsigned level); - /*--- txrx object (pdev, vdev, peer) display debug functions ---*/ #if TXRX_DEBUG_LEVEL > 5 @@ -198,7 +136,6 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once); #define ol_tx_queue_log_display(pdev) -#endif /* ATH_PERF_PWR_OFFLOAD */ /*----------------------------------------*/ #endif /* _OL_TXRX_DBG__H_ */ diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h index 00d612c17ef1..024fe0ce07dd 100644 --- a/core/dp/ol/inc/ol_txrx_htt_api.h +++ b/core/dp/ol/inc/ol_txrx_htt_api.h @@ -36,7 +36,7 @@ #include /* A_STATUS */ #include /* qdf_nbuf_t */ -#include /* ol_txrx_pdev_handle */ +#include /* ol_txrx_pdev_handle */ static inline uint16_t *ol_tx_msdu_id_storage(qdf_nbuf_t msdu) { diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index dd7acafa32f4..5e153765d495 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -33,11 +33,8 @@ #define _OL_TXRX_OSIF_API__H_ #include /* qdf_nbuf_t */ - -#include /* ol_osif_vdev_handle */ -#include /* ol_txrx_pdev_handle, etc. */ -#include #include "cds_sched.h" +#include "ol_txrx_ctrl_api.h" /** * struct ol_rx_cached_buf - rx cached buffer @@ -49,54 +46,8 @@ struct ol_rx_cached_buf { qdf_nbuf_t buf; }; -/** - * @typedef ol_txrx_rx_fp - * @brief receive function to hand batches of data frames from txrx to OS shim - */ -typedef void (*ol_txrx_rx_fp)(void *osif_dev, qdf_nbuf_t msdus); - -/** - * @typedef ol_txrx_tx_fp - * @brief top-level transmit function - */ -typedef qdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev, - qdf_nbuf_t msdu_list); - -/** - * @typedef ol_txrx_tx_non_std_fp - * @brief top-level transmit function for non-standard tx frames - * @details - * This function pointer provides an alternative to the ol_txrx_tx_fp - * to support non-standard transmits. In particular, this function - * supports transmission of: - * 1. "Raw" frames - * These raw frames already have an 802.11 header; the usual - * 802.11 header encapsulation by the driver does not apply. - * 2. TSO segments - * During tx completion, the txrx layer needs to reclaim the buffer - * that holds the ethernet/IP/TCP header created for the TSO segment. - * Thus, these tx frames need to be marked as TSO, to show that they - * need this special handling during tx completion. - * - * @param data_vdev - which virtual device should transmit the frame - * @param tx_spec - what non-standard operations to apply to the tx frame - * @param msdu_list - tx frame(s), in a null-terminated list - */ -typedef qdf_nbuf_t (*ol_txrx_tx_non_std_fp)(ol_txrx_vdev_handle data_vdev, - enum ol_tx_spec tx_spec, - qdf_nbuf_t msdu_list); - struct txrx_rx_metainfo; -/** - * @typedef ol_txrx_tx_fc_fp - * @brief tx flow control notification function from txrx to OS shim - * @param osif_dev - the virtual device's OS shim object - * @param tx_resume - tx os q should be resumed or not - */ -typedef void (*ol_txrx_tx_flow_control_fp)(void *osif_dev, - bool tx_resume); - /** * struct ol_txrx_desc_type - txrx descriptor type * @sta_id: sta id @@ -148,83 +99,6 @@ int ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth); #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ -/** - * @typedef ol_txrx_rx_fp - * @brief receive function to hand batches of data frames from txrx to OS shim - */ - -struct ol_txrx_osif_ops { - /* tx function pointers - specified by txrx, stored by OS shim */ - struct { - ol_txrx_tx_fp std; - ol_txrx_tx_non_std_fp non_std; - ol_txrx_tx_flow_control_fp flow_control_cb; - } tx; - - /* rx function pointers - specified by OS shim, stored by txrx */ - struct { - ol_txrx_rx_fp std; - } rx; -}; - -/** - * @brief Link a vdev's data object with the matching OS shim vdev object. - * @details - * The data object for a virtual device is created by the function - * ol_txrx_vdev_attach. However, rather than fully linking the - * data vdev object with the vdev objects from the other subsystems - * that the data vdev object interacts with, the txrx_vdev_attach - * function focuses primarily on creating the data vdev object. - * After the creation of both the data vdev object and the OS shim - * vdev object, this txrx_osif_vdev_attach function is used to connect - * the two vdev objects, so the data SW can use the OS shim vdev handle - * when passing rx data received by a vdev up to the OS shim. - * - * @param txrx_vdev - the virtual device's data object - * @param osif_vdev - the virtual device's OS shim object - * @param txrx_ops - (pointers to) the functions used for tx and rx data xfer - * There are two portions of these txrx operations. - * The rx portion is filled in by OSIF SW before calling - * ol_txrx_osif_vdev_register; inside the ol_txrx_osif_vdev_register - * the txrx SW stores a copy of these rx function pointers, to use - * as it delivers rx data frames to the OSIF SW. - * The tx portion is filled in by the txrx SW inside - * ol_txrx_osif_vdev_register; when the function call returns, - * the OSIF SW stores a copy of these tx functions to use as it - * delivers tx data frames to the txrx SW. - * The rx function pointer inputs consist of the following: - * rx: the OS shim rx function to deliver rx data frames to. - * This can have different values for different virtual devices, - * e.g. so one virtual device's OS shim directly hands rx frames to - * the OS, but another virtual device's OS shim filters out P2P - * messages before sending the rx frames to the OS. - * The netbufs delivered to the osif_rx function are in the format - * specified by the OS to use for tx and rx frames (either 802.3 or - * native WiFi). - * rx_mon: the OS shim rx monitor function to deliver monitor data to - * Though in practice, it is probable that the same function will - * be used for delivering rx monitor data for all virtual devices, - * in theory each different virtual device can have a different - * OS shim function for accepting rx monitor data. - * The netbufs delivered to the osif_rx_mon function are in 802.11 - * format. Each netbuf holds a 802.11 MPDU, not an 802.11 MSDU. - * Depending on compile-time configuration, each netbuf may also - * have a monitor-mode encapsulation header such as a radiotap - * header added before the MPDU contents. - * The tx function pointer outputs consist of the following: - * tx: the tx function pointer for standard data frames - * This function pointer is set by the txrx SW to perform - * host-side transmit operations based on whether a HL or LL - * host/target interface is in use. - * tx_non_std: the tx function pointer for non-standard data frames, - * such as TSO frames, explicitly-prioritized frames, or "raw" - * frames which skip some of the tx operations, such as 802.11 - * MAC header encapsulation. - */ -void -ol_txrx_osif_vdev_register(ol_txrx_vdev_handle txrx_vdev, - void *osif_vdev, struct ol_txrx_osif_ops *txrx_ops); - /** * @brief Divide a jumbo TCP frame into smaller segments. * @details diff --git a/core/dp/txrx/ol_ctrl_txrx_api.h b/core/dp/txrx/ol_ctrl_txrx_api.h index d77a5764a072..544ea9561476 100644 --- a/core/dp/txrx/ol_ctrl_txrx_api.h +++ b/core/dp/txrx/ol_ctrl_txrx_api.h @@ -36,8 +36,7 @@ #include /* uint8_t */ #include /* qdf_nbuf_t */ -#include /* ol_vdev_handle */ -#include /* ol_txrx_peer_handle, etc. */ +#include /* ol_txrx_pdev_handle */ #include /* OL_TXRX_MAC_ADDR_LEN */ #include /* ieee80211_frame */ @@ -140,34 +139,7 @@ ol_rx_notify(ol_pdev_handle pdev, uint32_t tsf32, enum ol_rx_notify_type notify_type, qdf_nbuf_t rx_frame); -/** - * @brief Indicate when a paused STA has tx data available. - * @details - * Indicate to the control SW when a paused peer that previously - * has all its peer-TID queues empty gets a MSDU to transmit. - * Conversely, indicate when a paused peer that had data in one or more of - * its peer-TID queues has all queued data removed (e.g. due to a U-APSD - * triggered transmission), but is still paused. - * It is up to the control SW to determine whether the peer is paused due to - * being in power-save sleep, or some other reason, and thus whether it is - * necessary to set the TIM in beacons to notify a sleeping STA that it has - * data. - * The data SW will also issue this ol_tx_paused_peer_data call when an - * unpaused peer that currently has tx data in one or more of its - * peer-TID queues becomes paused. - * The data SW will not issue this ol_tx_paused_peer_data call when a - * peer with data in one or more of its peer-TID queues becomes unpaused. - * - * @param peer - the paused peer - * @param has_tx_data - - * 1 -> a paused peer that previously had no tx data now does, -OR- - * 0 -> a paused peer that previously had tx data now doesnt - */ -void ol_tx_paused_peer_data(ol_peer_handle peer, int has_tx_data); - #define ol_ctrl_addba_req(pdev, peer_mac_addr, tid) ol_addba_req_reject #define ol_ctrl_rx_addba_complete(pdev, peer_mac_addr, tid, failed) /* no-op */ -void ol_txrx_set_peer_authorized_event(struct ol_txrx_vdev_t *vdev); - #endif /* _OL_CTRL_TXRX_API__H_ */ diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c index c3f475e9fd36..093383b0b4ac 100644 --- a/core/dp/txrx/ol_rx.c +++ b/core/dp/txrx/ol_rx.c @@ -32,13 +32,11 @@ /* external API header files */ #include /* ol_rx_notify */ -#include /* htt_pdev_handle */ #include /* ol_txrx_pdev_handle */ #include /* ol_rx_indication_handler */ #include /* htt_rx_peer_id, etc. */ /* internal API header files */ -#include /* ol_txrx_vdev_t, etc. */ #include /* ol_txrx_peer_find_by_id */ #include /* ol_rx_reorder_store, etc. */ #include /* OL_RX_REORDER_TIMEOUT_UPDATE */ @@ -58,7 +56,6 @@ #include /* IPv4 header defs */ #include /* IPv6 header defs */ #include -#include #include #ifdef HTT_RX_RESTORE diff --git a/core/dp/txrx/ol_rx.h b/core/dp/txrx/ol_rx.h index ce1bbb0b0855..536a6d888f82 100644 --- a/core/dp/txrx/ol_rx.h +++ b/core/dp/txrx/ol_rx.h @@ -29,7 +29,8 @@ #define _OL_RX__H_ #include /* qdf_nbuf_t */ -#include /* ol_txrx_vdev_t, etc. */ +#include /* htt_pdev_handle */ +#include /* ol_txrx_vdev_t */ void ol_rx_deliver(struct ol_txrx_vdev_t *vdev, diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c index f4c0768b1a61..11b9f5a1467b 100644 --- a/core/dp/txrx/ol_rx_defrag.c +++ b/core/dp/txrx/ol_rx_defrag.c @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c index 7653928fb231..939c739c534f 100644 --- a/core/dp/txrx/ol_rx_fwd.c +++ b/core/dp/txrx/ol_rx_fwd.c @@ -35,7 +35,6 @@ #include /* ieee80211_frame, etc. */ /* internal header files */ -#include /* ol_txrx_dev_t, etc. */ #include /* our own defs */ #include /* ol_rx_deliver */ #include /* TXRX_ASSERT1 */ diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c index fa4903db5d34..9ecb4eab6d1b 100644 --- a/core/dp/txrx/ol_rx_pn.c +++ b/core/dp/txrx/ol_rx_pn.c @@ -31,7 +31,6 @@ #include /* ol_rx_err */ #include /* ol_rx_mpdu_list_next */ -#include /* ol_txrx_vdev_t, etc. */ #include /* our own defs */ #include /* ol_rx_fwd_check */ #include /* ol_rx_deliver */ diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c index 24b0ae559765..02ab4255b051 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.c +++ b/core/dp/txrx/ol_rx_reorder_timeout.c @@ -32,7 +32,6 @@ #include /* datapath internal interfaces */ -#include /* ol_txrx_pdev_t, etc. */ #include /* TXRX_ASSERT, etc. */ #include /* ol_rx_reorder_flush, etc. */ diff --git a/core/dp/txrx/ol_rx_reorder_timeout.h b/core/dp/txrx/ol_rx_reorder_timeout.h index 768ee6fe4561..950e3843ab57 100644 --- a/core/dp/txrx/ol_rx_reorder_timeout.h +++ b/core/dp/txrx/ol_rx_reorder_timeout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012, 2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -28,8 +28,7 @@ #ifndef _OL_RX_REORDER_TIMEOUT__H_ #define _OL_RX_REORDER_TIMEOUT__H_ -#include /* ol_txrx_pdev_t, etc. */ - +#include /* ol_txrx_vdev_t, etc. */ #ifdef QCA_SUPPORT_OL_RX_REORDER_TIMEOUT void ol_rx_reorder_timeout_init(struct ol_txrx_pdev_t *pdev); diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 5422bef9e499..0956af1c7b35 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -33,12 +33,9 @@ /* APIs for other modules */ #include /* HTT_TX_EXT_TID_MGMT */ #include /* htt_tx_desc_tid */ -#include /* ol_txrx_vdev_handle */ -#include /* ol_txrx_sync */ /* internal header files relevant for all systems */ #include /* TXRX_ASSERT1 */ -#include /* pdev stats */ #include /* ol_tx_desc */ #include /* ol_tx_send */ #include @@ -1178,6 +1175,26 @@ ol_txrx_data_tx_cb_set(ol_txrx_vdev_handle vdev, pdev->tx_data_callback.ctxt = ctxt; } +/** + * ol_txrx_mgmt_tx_cb_set() - Store a callback for delivery + * notifications for management frames. + * + * @pdev - the data physical device object + * @type - the type of mgmt frame the callback is used for + * @download_cb - the callback for notification of delivery to the target + * @ota_ack_cb - the callback for notification of delivery to the peer + * @ctxt - context to use with the callback + * + * When the txrx SW receives notifications from the target that a tx frame + * has been delivered to its recipient, it will check if the tx frame + * is a management frame. If so, the txrx SW will check the management + * frame type specified when the frame was submitted for transmission. + * If there is a callback function registered for the type of managment + * frame in question, the txrx code will invoke the callback to inform + * the management + control SW that the mgmt frame was delivered. + * This function is used by the control SW to store a callback pointer + * for a given type of management frame. + */ void ol_txrx_mgmt_tx_cb_set(ol_txrx_pdev_handle pdev, uint8_t type, @@ -1229,8 +1246,26 @@ void dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc) } #endif /* HELIUMPLUS_PADDR64 */ +/** + * ol_txrx_mgmt_send_ext() - Transmit a management frame + * + * @vdev - virtual device transmitting the frame + * @tx_mgmt_frm - management frame to transmit + * @type - the type of managment frame (determines what callback to use) + * @use_6mbps - specify whether management frame to transmit should + * use 6 Mbps rather than 1 Mbps min rate(for 5GHz band or P2P) + * @chanfreq - channel to transmit the frame on + * + * Send the specified management frame from the specified virtual device. + * The type is used for determining whether to invoke a callback to inform + * the sender that the tx mgmt frame was delivered, and if so, which + * callback to use. + * + * Return: 0 - the frame is accepted for transmission + * 1 - the frame was not accepted + */ int -ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev, +ol_txrx_mgmt_send_ext(ol_txrx_vdev_handle vdev, qdf_nbuf_t tx_mgmt_frm, uint8_t type, uint8_t use_6mbps, uint16_t chanfreq) { diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index a76b82992cb0..a91bff1a7b28 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -34,9 +34,7 @@ #include /* qdf_nbuf_t */ #include -#include /* ol_txrx_vdev_handle */ - -#include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ +#include /* ol_txrx_vdev_t, etc. */ qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef WLAN_FEATURE_FASTPATH diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c index 0522d1de0002..cfba71b28dc5 100644 --- a/core/dp/txrx/ol_tx_desc.c +++ b/core/dp/txrx/ol_tx_desc.c @@ -35,7 +35,6 @@ #include /* htt_tx_desc_id */ -#include /* ol_txrx_pdev_t */ #include #include #ifdef QCA_SUPPORT_SW_TXRX_ENCAP diff --git a/core/dp/txrx/ol_tx_desc.h b/core/dp/txrx/ol_tx_desc.h index 92dd0b88e7aa..9b0cf42ee135 100644 --- a/core/dp/txrx/ol_tx_desc.h +++ b/core/dp/txrx/ol_tx_desc.h @@ -34,7 +34,7 @@ #include /* TAILQ_HEAD */ #include /* qdf_nbuf_t */ -#include /* ol_tx_desc_t */ +#include /* ol_txrx_vdev_t, etc. */ #include /*TXRX_ASSERT2 */ struct ol_tx_desc_t * diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index 5c25a40909d5..de35be4e970a 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -30,11 +30,8 @@ #include /* ol_cfg_addba_retry */ #include /* HTT_TX_EXT_TID_MGMT */ #include /* htt_tx_desc_tid */ -#include /* ol_txrx_vdev_handle */ -#include /* ol_txrx_sync, ol_tx_addba_conf */ #include /* ol_ctrl_addba_req */ #include /* TXRX_ASSERT1, etc. */ -#include /* pdev stats */ #include /* ol_tx_desc, ol_tx_desc_frame_list_free */ #include /* ol_tx_vdev_ll_pause_queue_send */ #include diff --git a/core/dp/txrx/ol_tx_queue.h b/core/dp/txrx/ol_tx_queue.h index ce847b78b7d4..c78bbc20fd3d 100644 --- a/core/dp/txrx/ol_tx_queue.h +++ b/core/dp/txrx/ol_tx_queue.h @@ -33,7 +33,7 @@ #define _OL_TX_QUEUE__H_ #include /* qdf_nbuf_t */ -#include /* ol_txrx_vdev_t, etc. */ +#include /* ol_txrx_vdev_t, etc. */ #include /* bool */ /*--- function prototypes for optional queue log feature --------------------*/ diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index cea7b2196b42..cd3cd8868c7f 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -43,7 +43,6 @@ #include /* htt_tx_status */ #include -#include /* ol_txrx_vdev_t, etc */ #include /* ol_tx_desc_find, ol_tx_desc_frame_free */ #ifdef QCA_COMPUTE_TX_DELAY #endif diff --git a/core/dp/txrx/ol_tx_send.h b/core/dp/txrx/ol_tx_send.h index 2260da996f98..d7935cab9746 100644 --- a/core/dp/txrx/ol_tx_send.h +++ b/core/dp/txrx/ol_tx_send.h @@ -33,7 +33,7 @@ #define _OL_TX_SEND__H_ #include /* qdf_nbuf_t */ -#include /* ol_tx_send_t */ +#include /* ol_txrx_vdev_t, etc. */ /** * @flush the ol tx when surprise remove. diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 4393d470dfe7..b6166fd43e1c 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -46,19 +46,12 @@ #include #include -/* header files for OS shim API */ -#include - /* header files for our own APIs */ #include #include -#include -#include /* header files for our internal definitions */ #include /* TXRX_ASSERT, etc. */ #include /* WDI events */ -#include /* ol_txrx_pdev_t, etc. */ -#include #include /* ol_tx_ll */ #include /* ol_rx_deliver */ #include /* ol_txrx_peer_find_attach, etc. */ @@ -389,7 +382,7 @@ uint32_t ol_tx_get_total_free_desc(struct ol_txrx_pdev_t *pdev) #endif /** - * ol_txrx_pdev_alloc() - allocate txrx pdev + * ol_txrx_pdev_attach() - allocate txrx pdev * @ctrl_pdev: cfg pdev * @htc_pdev: HTC pdev * @osdev: os dev @@ -398,7 +391,7 @@ uint32_t ol_tx_get_total_free_desc(struct ol_txrx_pdev_t *pdev) * NULL for failure */ ol_txrx_pdev_handle -ol_txrx_pdev_alloc(ol_pdev_handle ctrl_pdev, +ol_txrx_pdev_attach(ol_pdev_handle ctrl_pdev, HTC_HANDLE htc_pdev, qdf_device_t osdev) { struct ol_txrx_pdev_t *pdev; @@ -488,13 +481,13 @@ void htt_pktlogmod_exit(ol_txrx_pdev_handle handle, void *sc) { } #endif /** - * ol_txrx_pdev_attach() - attach txrx pdev + * ol_txrx_pdev_post_attach() - attach txrx pdev * @pdev: txrx pdev * * Return: 0 for success */ int -ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev) +ol_txrx_pdev_post_attach(ol_txrx_pdev_handle pdev) { uint16_t i; uint16_t fail_idx = 0; @@ -953,11 +946,36 @@ ol_attach_fail: return ret; /* fail */ } +/** + * ol_txrx_pdev_attach_target() - send target configuration + * + * @pdev - the physical device being initialized + * + * The majority of the data SW setup are done by the pdev_attach + * functions, but this function completes the data SW setup by + * sending datapath configuration messages to the target. + * + * Return: 0 - success 1 - failure + */ A_STATUS ol_txrx_pdev_attach_target(ol_txrx_pdev_handle pdev) { - return htt_attach_target(pdev->htt_pdev); + return htt_attach_target(pdev->htt_pdev) == A_OK ? 0:1; } +/** + * ol_txrx_pdev_detach() - delete the data SW state + * + * @pdev - the data physical device object being removed + * @force - delete the pdev (and its vdevs and peers) even if + * there are outstanding references by the target to the vdevs + * and peers within the pdev + * + * This function is used when the WLAN driver is being removed to + * remove the host data component within the driver. + * All virtual devices within the physical device need to be deleted + * (ol_txrx_vdev_detach) before the physical device itself is deleted. + * + */ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) { int i; @@ -1068,6 +1086,18 @@ void ol_txrx_pdev_detach(ol_txrx_pdev_handle pdev, int force) #endif } +/** + * ol_txrx_vdev_attach - Allocate and initialize the data object + * for a new virtual device. + * + * @data_pdev - the physical device the virtual device belongs to + * @vdev_mac_addr - the MAC address of the virtual device + * @vdev_id - the ID used to identify the virtual device to the target + * @op_mode - whether this virtual device is operating as an AP, + * an IBSS, or a STA + * + * Return: success: handle to new data vdev object, failure: NULL + */ ol_txrx_vdev_handle ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, uint8_t *vdev_mac_addr, @@ -1143,15 +1173,43 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, return vdev; } -void ol_txrx_osif_vdev_register(ol_txrx_vdev_handle vdev, +/** + *ol_txrx_vdev_register - Link a vdev's data object with the + * matching OS shim vdev object. + * + * @txrx_vdev: the virtual device's data object + * @osif_vdev: the virtual device's OS shim object + * @txrx_ops: (pointers to)functions used for tx and rx data xfer + * + * The data object for a virtual device is created by the + * function ol_txrx_vdev_attach. However, rather than fully + * linking the data vdev object with the vdev objects from the + * other subsystems that the data vdev object interacts with, + * the txrx_vdev_attach function focuses primarily on creating + * the data vdev object. After the creation of both the data + * vdev object and the OS shim vdev object, this + * txrx_osif_vdev_attach function is used to connect the two + * vdev objects, so the data SW can use the OS shim vdev handle + * when passing rx data received by a vdev up to the OS shim. + */ +void ol_txrx_vdev_register(ol_txrx_vdev_handle vdev, void *osif_vdev, - struct ol_txrx_osif_ops *txrx_ops) + struct ol_txrx_ops *txrx_ops) { vdev->osif_dev = osif_vdev; - txrx_ops->tx.std = vdev->tx = OL_TX_LL; - txrx_ops->tx.non_std = ol_tx_non_std_ll; + txrx_ops->tx.tx = vdev->tx = OL_TX_LL; } +/** + * ol_txrx_set_curchan - Setup the current operating channel of + * the device + * @pdev - the data physical device object + * @chan_mhz - the channel frequency (mhz) packets on + * + * Mainly used when populating monitor mode status that requires + * the current operating channel + * + */ void ol_txrx_set_curchan(ol_txrx_pdev_handle pdev, uint32_t chan_mhz) { return; @@ -1162,6 +1220,16 @@ void ol_txrx_set_safemode(ol_txrx_vdev_handle vdev, uint32_t val) vdev->safemode = val; } +/** + * ol_txrx_set_privacy_filters - set the privacy filter + * @vdev - the data virtual device object + * @filter - filters to be set + * @num - the number of filters + * + * Rx related. Set the privacy filters. When rx packets, check + * the ether type, filter type and packet type to decide whether + * discard these packets. + */ void ol_txrx_set_privacy_filters(ol_txrx_vdev_handle vdev, void *filters, uint32_t num) @@ -1176,6 +1244,29 @@ void ol_txrx_set_drop_unenc(ol_txrx_vdev_handle vdev, uint32_t val) vdev->drop_unenc = val; } +/** + * ol_txrx_vdev_detach - Deallocate the specified data virtual + * device object. + * @data_vdev: data object for the virtual device in question + * @callback: function to call (if non-NULL) once the vdev has + * been wholly deleted + * @callback_context: context to provide in the callback + * + * All peers associated with the virtual device need to be deleted + * (ol_txrx_peer_detach) before the virtual device itself is deleted. + * However, for the peers to be fully deleted, the peer deletion has to + * percolate through the target data FW and back up to the host data SW. + * Thus, even though the host control SW may have issued a peer_detach + * call for each of the vdev's peers, the peer objects may still be + * allocated, pending removal of all references to them by the target FW. + * In this case, though the vdev_detach function call will still return + * immediately, the vdev itself won't actually be deleted, until the + * deletions of all its peers complete. + * The caller can provide a callback function pointer to be notified when + * the vdev deletion actually happens - whether it's directly within the + * vdev_detach call, or if it's deferred until all in-progress peer + * deletions have completed. + */ void ol_txrx_vdev_detach(ol_txrx_vdev_handle vdev, ol_txrx_vdev_delete_cb callback, void *context) @@ -1303,9 +1394,31 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, qdf_atomic_dec(&peer->flush_in_progress); } +/** + * ol_txrx_peer_attach - Allocate and set up references for a + * data peer object. + * @data_pdev: data physical device object that will indirectly + * own the data_peer object + * @data_vdev - data virtual device object that will directly + * own the data_peer object + * @peer_mac_addr - MAC address of the new peer + * + * When an association with a peer starts, the host's control SW + * uses this function to inform the host data SW. + * The host data SW allocates its own peer object, and stores a + * reference to the control peer object within the data peer object. + * The host data SW also stores a reference to the virtual device + * that the peer is associated with. This virtual device handle is + * used when the data SW delivers rx data frames to the OS shim layer. + * The host data SW returns a handle to the new peer data object, + * so a reference within the control peer object can be set to the + * data peer object. + * + * Return: handle to new data peer object, or NULL if the attach + * fails + */ ol_txrx_peer_handle -ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, - ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr) +ol_txrx_peer_attach(ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr) { struct ol_txrx_peer_t *peer; struct ol_txrx_peer_t *temp_peer; @@ -1313,12 +1426,15 @@ ol_txrx_peer_attach(ol_txrx_pdev_handle pdev, int differs; bool wait_on_deletion = false; unsigned long rc; + struct ol_txrx_pdev_t *pdev; /* preconditions */ - TXRX_ASSERT2(pdev); TXRX_ASSERT2(vdev); TXRX_ASSERT2(peer_mac_addr); + pdev = vdev->pdev; + TXRX_ASSERT2(pdev); + qdf_spin_lock_bh(&pdev->peer_ref_mutex); /* check for duplicate exsisting peer */ TAILQ_FOREACH(temp_peer, &vdev->peer_list, peer_list_elem) { @@ -1798,6 +1914,16 @@ void ol_txrx_peer_unref_delete(ol_txrx_peer_handle peer) } } +/** + * ol_txrx_peer_detach - Delete a peer's data object. + * @data_peer - the object to delete + * + * When the host's control SW disassociates a peer, it calls + * this function to delete the peer's data object. The reference + * stored in the control peer object to the data peer + * object (set up by a call to ol_peer_store()) is provided. + * + */ void ol_txrx_peer_detach(ol_txrx_peer_handle peer) { struct ol_txrx_vdev_t *vdev = peer->vdev; @@ -2036,7 +2162,6 @@ struct ol_txrx_stats_req_internal *ol_txrx_u64_to_stats_ptr(uint64_t cookie) return (struct ol_txrx_stats_req_internal *)((size_t) cookie); } -#ifdef ATH_PERF_PWR_OFFLOAD void ol_txrx_fw_stats_cfg(ol_txrx_vdev_handle vdev, uint8_t cfg_stats_type, uint32_t cfg_val) @@ -2095,7 +2220,7 @@ ol_txrx_fw_stats_get(ol_txrx_vdev_handle vdev, struct ol_txrx_stats_req *req, return A_OK; } -#endif + void ol_txrx_fw_stats_handler(ol_txrx_pdev_handle pdev, uint64_t cookie, uint8_t *stats_info_list) @@ -3479,3 +3604,26 @@ void ol_deregister_lro_flush_cb(void) pdev->lro_info.lro_data = NULL; } #endif /* FEATURE_LRO */ + +/** + * ol_txrx_get_vdev_from_vdev_id() - get vdev from vdev_id + * @vdev_id: vdev_id + * + * Return: vdev handle + * NULL if not found. + */ +ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id) +{ + ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); + ol_txrx_vdev_handle vdev = NULL; + + if (qdf_unlikely(!pdev)) + return NULL; + + TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { + if (vdev->vdev_id == vdev_id) + break; + } + + return vdev; +} diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h index 22472386519a..c65151c672d9 100644 --- a/core/dp/txrx/ol_txrx.h +++ b/core/dp/txrx/ol_txrx.h @@ -29,8 +29,7 @@ #define _OL_TXRX__H_ #include /* qdf_nbuf_t */ -#include /* ol_txrx_vdev_t, etc. */ -#include /* ol_pdev_handle */ +#include /* ol_txrx_vdev_t, etc. */ #include "cds_sched.h" void ol_txrx_peer_unref_delete(struct ol_txrx_peer_t *peer); @@ -39,28 +38,6 @@ void ol_txrx_peer_unref_delete(struct ol_txrx_peer_t *peer); #define OL_TX_AVG_FRM_BYTES 1000 #endif -/** - * ol_txrx_get_vdev_from_vdev_id() - get vdev from vdev_id - * @vdev_id: vdev_id - * - * Return: vdev handle - * NULL if not found. - */ -static inline ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id) -{ - ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); - ol_txrx_vdev_handle vdev = NULL; - - if (qdf_unlikely(!pdev)) { - return NULL; - } - - TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) { - if (vdev->vdev_id == vdev_id) - break; - } - - return vdev; -} +ol_txrx_vdev_handle ol_txrx_get_vdev_from_vdev_id(uint8_t vdev_id); #endif /* _OL_TXRX__H_ */ diff --git a/core/dp/txrx/ol_txrx_encap.c b/core/dp/txrx/ol_txrx_encap.c index 03b1ddd95d20..95c9d65d63e7 100644 --- a/core/dp/txrx/ol_txrx_encap.c +++ b/core/dp/txrx/ol_txrx_encap.c @@ -39,7 +39,6 @@ #include /* ieee80211_frame */ #include /* struct llc, struct ether_header, etc. */ #include /* TXRX_ASSERT1 */ -#include /* struct ol_txrx_vdev_t, ol_txrx_pdev_t,etc. */ #include /* struct ol_rx_decap_info_t */ #define OL_TX_COPY_NATIVE_WIFI_HEADER(wh, msdu, hdsize, localbuf) \ diff --git a/core/dp/txrx/ol_txrx_encap.h b/core/dp/txrx/ol_txrx_encap.h index 2da28be57998..932bdd342a45 100644 --- a/core/dp/txrx/ol_txrx_encap.h +++ b/core/dp/txrx/ol_txrx_encap.h @@ -36,7 +36,7 @@ #include /* qdf_nbuf_t */ #include /* ieee80211_qosframe_htc_addr4 */ -#include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ +#include /* ol_txrx_vdev_t, etc. */ /** * @brief Encap outgoing frm from OS dependent format to Target diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c index f30008336ca2..a0d4404cb0d4 100644 --- a/core/dp/txrx/ol_txrx_flow_control.c +++ b/core/dp/txrx/ol_txrx_flow_control.c @@ -33,15 +33,12 @@ /* APIs for other modules */ #include /* HTT_TX_EXT_TID_MGMT */ #include /* htt_tx_desc_tid */ -#include /* ol_txrx_vdev_handle */ -#include /* ol_txrx_sync */ /* internal header files relevant for all systems */ #include /* TXRX_ASSERT1 */ -#include /* pdev stats */ #include /* ol_tx_desc */ #include /* ol_tx_send */ -#include +#include /* ol_txrx_get_vdev_from_vdev_id */ /* internal header files relevant only for HL systems */ #include /* ol_tx_enqueue */ diff --git a/core/dp/txrx/ol_txrx_peer_find.h b/core/dp/txrx/ol_txrx_peer_find.h index 25886cae1cf0..e5ec69df7efd 100644 --- a/core/dp/txrx/ol_txrx_peer_find.h +++ b/core/dp/txrx/ol_txrx_peer_find.h @@ -33,7 +33,7 @@ #define _OL_TXRX_PEER_FIND__H_ #include /* HTT_INVALID_PEER */ -#include /* ol_txrx_pdev_t, etc. */ +#include /* ol_txrx_pdev_t, etc. */ #include /* TXRX_ASSERT */ int ol_txrx_peer_find_attach(struct ol_txrx_pdev_t *pdev); diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index 0731c0836a37..e7f5f6bcd6c2 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -47,6 +47,8 @@ #include "ol_txrx_htt_api.h" #include "ol_htt_tx_api.h" #include "ol_htt_rx_api.h" +#include "ol_txrx_ctrl_api.h" /* WLAN_MAX_STA_COUNT */ +#include "ol_txrx_osif_api.h" /* ol_rx_callback_fp */ /* * The target may allocate multiple IDs for a peer. @@ -87,15 +89,6 @@ struct ol_txrx_pdev_t; struct ol_txrx_vdev_t; struct ol_txrx_peer_t; -struct ol_pdev_t; -typedef struct ol_pdev_t *ol_pdev_handle; - -struct ol_vdev_t; -typedef struct ol_vdev_t *ol_vdev_handle; - -struct ol_peer_t; -typedef struct ol_peer_t *ol_peer_handle; - /* rx filter related */ #define MAX_PRIVACY_FILTERS 4 /* max privacy filters */ diff --git a/core/dp/txrx/txrx.h b/core/dp/txrx/txrx.h index fa24eaf8cc4a..333899bcd1db 100644 --- a/core/dp/txrx/txrx.h +++ b/core/dp/txrx/txrx.h @@ -110,18 +110,6 @@ QDF_STATUS wlan_register_mgmt_client(void *pdev_txrx, QDF_STATUS (*rx_mgmt)(void *g_cdsctx, void *buf)); -typedef void (*ol_txrx_vdev_delete_cb)(void *context); - -/** - * @typedef ol_txrx_tx_fp - * @brief top-level transmit function - */ -typedef qdf_nbuf_t -(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu_list); - -typedef void -(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error); - /* If RSSI realm is changed, send notification to Clients, SME, HDD */ typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi, void *usr_ctx, diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 93355a544ea5..364aeb47f084 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -40,7 +40,6 @@ #include "cfg_api.h" #include "qdf_status.h" #include "cds_sched.h" -#include "ol_txrx_api.h" #include "sir_mac_prot_def.h" #include "wma_types.h" #include "ol_txrx_types.h" @@ -48,6 +47,7 @@ #include "utils_api.h" #include "lim_types.h" #include "wmi_unified_api.h" +#include "cdp_txrx_cmn.h" /* Platform specific configuration for max. no. of fragments */ #define QCA_OL_11AC_TX_MAX_FRAGS 2 diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 5c8550587ef6..0e6f46fa6318 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -42,14 +42,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" @@ -2561,8 +2558,8 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, wmi_desc_put(wma_handle, mgmt_param.wmi_desc); } else { /* Hand over the Tx Mgmt frame to TxRx */ - status = ol_txrx_mgmt_send(txrx_vdev, tx_frame, tx_frm_index, - use_6mbps, chanfreq); + status = ol_txrx_mgmt_send_ext(txrx_vdev, tx_frame, + tx_frm_index, use_6mbps, chanfreq); } /* diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 3ffda0247fe3..328430578eca 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -42,14 +42,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" @@ -1079,7 +1076,7 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, wma->interfaces[vdev_id].peer_count - 1); goto err; } - peer = ol_txrx_peer_attach(pdev, vdev, peer_addr); + peer = ol_txrx_peer_attach(vdev, peer_addr); if (!peer) { WMA_LOGE("%s : Unable to attach peer %pM", __func__, peer_addr); goto err; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 71514c7aa004..ef525be6de37 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -43,14 +43,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index fef95c01f34c..465a008ff5ee 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -44,14 +44,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 4ab70a3e2d4d..134039cf721c 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -43,14 +43,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index e687fc542d65..e383e3906d8f 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -42,14 +42,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index dfb69d5f7927..d6c6f7954ac2 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -43,14 +43,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 81af1d58061a..8457bd4d5ca7 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -42,14 +42,11 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" -#include "ol_txrx_ctrl_api.h" #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" #include "qdf_types.h" -#include "ol_txrx_api.h" #include "qdf_mem.h" -#include "ol_txrx_types.h" #include "ol_txrx_peer_find.h" #include "wma_types.h" -- cgit v1.2.3 From 182b027a73beed8a274221fa88be14a9add6a14d Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Wed, 17 Feb 2016 15:35:07 -0800 Subject: qcacld-3.0: Data path changes to use converged APIs (Part 2) Changes to register a per vdev rx callback function. Register a per-vdev receive callback function using the vdev registration API provided by the converged data path API. The changes include - removing the older method of registering the receive callback - modify the HDD callback to adhere to the rx callback function defined by the converged data path API - modify the invocation of the callback function in the data path Change-Id: I2aef905132af4b3d7db22c7ec315d114607c9383 CRs-Fixed: 994638 --- core/dp/ol/inc/ol_txrx_osif_api.h | 4 ++-- core/dp/txrx/ol_txrx.c | 40 +++++++++++++++++----------------- core/dp/txrx/ol_txrx_types.h | 3 +-- core/hdd/inc/wlan_hdd_softap_tx_rx.h | 5 ++--- core/hdd/inc/wlan_hdd_tx_rx.h | 4 ++-- core/hdd/src/wlan_hdd_assoc.c | 24 +++++++++++++++++---- core/hdd/src/wlan_hdd_ocb.c | 12 +++++++++-- core/hdd/src/wlan_hdd_softap_tx_rx.c | 42 ++++++++++++++++++++---------------- core/hdd/src/wlan_hdd_tx_rx.c | 33 +++++++++++----------------- 9 files changed, 93 insertions(+), 74 deletions(-) diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 5e153765d495..b2f707a15642 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -136,8 +136,8 @@ qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, qdf_nbuf_t skb); #endif -QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, - struct ol_txrx_desc_type *sta_desc); +QDF_STATUS ol_txrx_register_peer + (struct ol_txrx_desc_type *sta_desc); QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index b6166fd43e1c..63e4aa84e242 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1146,6 +1146,7 @@ ol_txrx_vdev_attach(ol_txrx_pdev_handle pdev, qdf_atomic_set(&vdev->os_q_paused, 0); vdev->tx_fl_lwm = 0; vdev->tx_fl_hwm = 0; + vdev->rx = NULL; vdev->wait_on_peer_id = OL_TXRX_INVALID_LOCAL_PEER_ID; qdf_spinlock_create(&vdev->flow_control_lock); vdev->osif_flow_control_cb = NULL; @@ -1197,7 +1198,7 @@ void ol_txrx_vdev_register(ol_txrx_vdev_handle vdev, struct ol_txrx_ops *txrx_ops) { vdev->osif_dev = osif_vdev; - txrx_ops->tx.tx = vdev->tx = OL_TX_LL; + vdev->rx = txrx_ops->rx.rx; } /** @@ -1355,18 +1356,19 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, { struct ol_rx_cached_buf *cache_buf; QDF_STATUS ret; - ol_rx_callback_fp data_rx = NULL; - void *cds_ctx = cds_get_global_context(); + ol_txrx_rx_fp data_rx = NULL; if (qdf_atomic_inc_return(&peer->flush_in_progress) > 1) { qdf_atomic_dec(&peer->flush_in_progress); return; } - qdf_assert(cds_ctx); + qdf_assert(peer->vdev); + qdf_spin_lock_bh(&peer->peer_info_lock); + if (peer->state >= ol_txrx_peer_state_conn) - data_rx = peer->osif_rx; + data_rx = peer->vdev->rx; else drop = true; qdf_spin_unlock_bh(&peer->peer_info_lock); @@ -1381,7 +1383,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, qdf_nbuf_free(cache_buf->buf); } else { /* Flush the cached frames to HDD */ - ret = data_rx(cds_ctx, cache_buf->buf, peer->local_id); + ret = data_rx(peer->vdev->osif_dev, cache_buf->buf); if (ret != QDF_STATUS_SUCCESS) qdf_nbuf_free(cache_buf->buf); } @@ -1498,8 +1500,7 @@ ol_txrx_peer_attach(ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr) for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) peer->peer_ids[i] = HTT_INVALID_PEER; - - peer->osif_rx = NULL; + peer->vdev->rx = NULL; qdf_spinlock_create(&peer->peer_info_lock); qdf_spinlock_create(&peer->bufq_lock); @@ -3143,12 +3144,11 @@ void ol_txrx_clear_stats(uint16_t value) static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, qdf_nbuf_t buf_list) { - void *cds_ctx = cds_get_global_context(); qdf_nbuf_t buf, next_buf; QDF_STATUS ret; - ol_rx_callback_fp data_rx = NULL; + ol_txrx_rx_fp data_rx = NULL; - if (qdf_unlikely(!cds_ctx)) + if (qdf_unlikely(!peer->vdev)) goto free_buf; qdf_spin_lock_bh(&peer->peer_info_lock); @@ -3156,7 +3156,8 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, qdf_spin_unlock_bh(&peer->peer_info_lock); goto free_buf; } - data_rx = peer->osif_rx; + + data_rx = peer->vdev->rx; qdf_spin_unlock_bh(&peer->peer_info_lock); qdf_spin_lock_bh(&peer->bufq_lock); @@ -3171,7 +3172,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, while (buf) { next_buf = qdf_nbuf_queue_next(buf); qdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */ - ret = data_rx(cds_ctx, buf, peer->local_id); + ret = data_rx(peer->vdev->osif_dev, buf); if (ret != QDF_STATUS_SUCCESS) { TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed"); qdf_nbuf_free(buf); @@ -3204,7 +3205,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, * T2H MSG running on SIRQ context, * IPA kernel module API should not be called on SIRQ CTXT */ qdf_nbuf_t buf, next_buf; - ol_rx_callback_fp data_rx = NULL; + ol_txrx_rx_fp data_rx = NULL; ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX); if ((!peer) || (!pdev)) { @@ -3212,9 +3213,11 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, goto drop_rx_buf; } + qdf_assert(peer->vdev); + qdf_spin_lock_bh(&peer->peer_info_lock); if (peer->state >= ol_txrx_peer_state_conn) - data_rx = peer->osif_rx; + data_rx = peer->vdev->rx; qdf_spin_unlock_bh(&peer->peer_info_lock); /* @@ -3291,13 +3294,11 @@ drop_rx_buf: /** * ol_txrx_register_peer() - register peer - * @rxcb: rx callback * @sta_desc: sta descriptor * * Return: QDF Status */ -QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, - struct ol_txrx_desc_type *sta_desc) +QDF_STATUS ol_txrx_register_peer(struct ol_txrx_desc_type *sta_desc) { struct ol_txrx_peer_t *peer; struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -3320,7 +3321,6 @@ QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb, return QDF_STATUS_E_FAULT; qdf_spin_lock_bh(&peer->peer_info_lock); - peer->osif_rx = rxcb; peer->state = ol_txrx_peer_state_conn; qdf_spin_unlock_bh(&peer->peer_info_lock); @@ -3379,7 +3379,7 @@ QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) ol_txrx_flush_rx_frames(peer, 1); qdf_spin_lock_bh(&peer->peer_info_lock); - peer->osif_rx = NULL; + peer->vdev->rx = NULL; peer->state = ol_txrx_peer_state_disc; qdf_spin_unlock_bh(&peer->peer_info_lock); diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index e7f5f6bcd6c2..f707a8ef825f 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -784,7 +784,7 @@ struct ol_txrx_vdev_t { struct ol_txrx_peer_t *last_real_peer; /* last real peer created for this vdev (not "self" pseudo-peer) */ - ol_txrx_tx_fp tx; /* transmit function used by this vdev */ + ol_txrx_rx_fp rx; /* receive function used by this vdev */ struct { /* @@ -918,7 +918,6 @@ struct ol_txrx_peer_t { */ enum ol_txrx_peer_state state; qdf_spinlock_t peer_info_lock; - ol_rx_callback_fp osif_rx; qdf_spinlock_t bufq_lock; struct list_head cached_bufq; diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index b5d879a04de4..45312fb316a5 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -46,9 +46,8 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, struct qdf_mac_addr *pmacAddrSTA); QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId); -QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, - qdf_nbuf_t rxBufChain, - uint8_t staId); + +QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBufChain); #ifdef IPA_OFFLOAD QDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, qdf_nbuf_t rx_buf_list, uint8_t staId); diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 3bf0c928d4cc..46793c2f1da2 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -55,10 +55,10 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); + QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter); -QDF_STATUS hdd_rx_packet_cbk(void *cds_context, qdf_nbuf_t rxBufChain, - uint8_t staId); +QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf); #ifdef IPA_OFFLOAD QDF_STATUS hdd_rx_mul_packet_cbk(void *cds_context, diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index abe2eb282e4c..d3606b538a59 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -55,6 +55,7 @@ #include "sme_power_save_api.h" #include "ol_txrx_ctrl_api.h" #include "ol_txrx_types.h" +#include "ol_txrx.h" /* These are needed to recognize WPA and RSN suite types */ #define HDD_WPA_OUI_SIZE 4 @@ -1269,6 +1270,7 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + struct ol_txrx_ops txrx_ops; if (NULL == pBssDesc) return QDF_STATUS_E_FAILURE; @@ -1291,8 +1293,8 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, staDesc.is_wapi_supported = 0; #endif /* FEATURE_WLAN_WAPI */ - qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, - &staDesc); + qdf_status = ol_txrx_register_peer(&staDesc); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGW, "ol_txrx_register_peer() failed to register. Status=%d [0x%08X]", @@ -1300,6 +1302,13 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, return qdf_status; } + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), + pAdapter, &txrx_ops); + if (!pRoamInfo->fAuthRequired) { /* * Connections that do not need Upper layer auth, transition @@ -2836,6 +2845,7 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, { QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; + struct ol_txrx_ops txrx_ops; /* * TDLS sta in BSS should be set as STA type TDLS and STA MAC should @@ -2849,14 +2859,20 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, /* Register the Station with TL... */ - qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, - &staDesc); + qdf_status = ol_txrx_register_peer(&staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("ol_txrx_register_peer() failed to register. Status=%d [0x%08X]"), qdf_status, qdf_status); return qdf_status; } + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), + pAdapter, &txrx_ops); + return qdf_status; } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index f011b660e4d7..fcca73109c1a 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -39,6 +39,7 @@ #include "wlan_tgt_def_config.h" #include "sch_api.h" #include "wma_api.h" +#include "ol_txrx.h" /* Structure definitions for WLAN_SET_DOT11P_CHANNEL_SCHED */ #define AIFSN_MIN (2) @@ -246,6 +247,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); uint8_t peer_id; + struct ol_txrx_ops txrx_ops; qdf_status = ol_txrx_register_ocb_peer(hdd_ctx->pcds_context, adapter->macAddressCurrent.bytes, @@ -260,14 +262,20 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) sta_desc.sta_id = peer_id; sta_desc.is_qos_enabled = 1; - qdf_status = ol_txrx_register_peer(hdd_rx_packet_cbk, - &sta_desc); + qdf_status = ol_txrx_register_peer(&sta_desc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { hddLog(LOGE, FL("Failed to register. Status= %d [0x%08X]"), qdf_status, qdf_status); return -EINVAL; } + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(adapter->sessionId), + adapter, &txrx_ops); + if (pHddStaCtx->conn_info.staId[0] != 0 && pHddStaCtx->conn_info.staId[0] != peer_id) { hddLog(LOGE, FL("The ID for the OCB station has changed.")); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 39ffe38958ad..09b862d6849a 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef IPA_OFFLOAD #include @@ -489,9 +490,8 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) /** * hdd_softap_rx_packet_cbk() - Receive packet handler - * @cds_context: pointer to CDS context + * @context: pointer to HDD context * @rxBuf: pointer to rx qdf_nbuf - * @staId: Station Id * * Receive callback registered with TL. TL will call this to notify * the HDD when one or more packets were received for a registered @@ -500,8 +500,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId) * Return: QDF_STATUS_E_FAILURE if any errors encountered, * QDF_STATUS_SUCCESS otherwise */ -QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, - qdf_nbuf_t rxBuf, uint8_t staId) +QDF_STATUS hdd_softap_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf) { hdd_adapter_t *pAdapter = NULL; int rxstat; @@ -513,24 +512,24 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, #endif /* QCA_PKT_PROTO_TRACE */ /* Sanity check on inputs */ - if ((NULL == cds_context) || (NULL == rxBuf)) { + if (unlikely((NULL == context) || (NULL == rxBuf))) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); - if (NULL == pHddCtx) { - QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, - "%s: HDD context is Null", __func__); + pAdapter = (hdd_adapter_t *)context; + if (unlikely(WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL, + "Magic cookie(%x) for adapter sanity verification is invalid", + pAdapter->magic); return QDF_STATUS_E_FAILURE; } - pAdapter = pHddCtx->sta_to_adapter[staId]; - if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - hddLog(LOGE, - FL("invalid adapter %p or adapter has invalid magic"), - pAdapter); + pHddCtx = pAdapter->pHddCtx; + if (unlikely(NULL == pHddCtx)) { + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, + "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } @@ -541,7 +540,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context, skb->dev = pAdapter->dev; - if (skb->dev == NULL) { + if (unlikely(skb->dev == NULL)) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "%s: ERROR!!Invalid netdevice", __func__); @@ -667,6 +666,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; struct ol_txrx_desc_type staDesc = { 0 }; hdd_context_t *pHddCtx = pAdapter->pHddCtx; + struct ol_txrx_ops txrx_ops; /* * Clean up old entry if it is not cleaned up properly @@ -692,10 +692,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, "HDD SOFTAP register TL QoS_enabled=%d", staDesc.is_qos_enabled); - - qdf_status = - ol_txrx_register_peer(hdd_softap_rx_packet_cbk, - &staDesc); + qdf_status = ol_txrx_register_peer(&staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", @@ -703,6 +700,13 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, return qdf_status; } + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_softap_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), + pAdapter, &txrx_ops); + /* if ( WPA ), tell TL to go to 'connected' and after keys come to the * driver then go to 'authenticated'. For all other authentication * types (those that do not require upper layer authentication) we can diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index a288c4e234a3..492a72bd0d32 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -641,9 +641,8 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) /** * hdd_rx_packet_cbk() - Receive packet handler - * @cds_context: pointer to CDS context + * @context: pointer to HDD context * @rxBuf: pointer to rx qdf_nbuf - * @staId: Station Id * * Receive callback registered with TL. TL will call this to notify * the HDD when one or more packets were received for a registered @@ -652,7 +651,7 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter) * Return: QDF_STATUS_E_FAILURE if any errors encountered, * QDF_STATUS_SUCCESS otherwise */ -QDF_STATUS hdd_rx_packet_cbk(void *cds_context, qdf_nbuf_t rxBuf, uint8_t staId) +QDF_STATUS hdd_rx_packet_cbk(void *context, qdf_nbuf_t rxBuf) { hdd_adapter_t *pAdapter = NULL; hdd_context_t *pHddCtx = NULL; @@ -665,37 +664,31 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, qdf_nbuf_t rxBuf, uint8_t staId) unsigned int cpu_index; /* Sanity check on inputs */ - if ((NULL == cds_context) || (NULL == rxBuf)) { + if (unlikely((NULL == context) || (NULL == rxBuf))) { QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, "%s: Null params being passed", __func__); return QDF_STATUS_E_FAILURE; } - pHddCtx = cds_get_context(QDF_MODULE_ID_HDD); - if (NULL == pHddCtx) { - QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, - "%s: HDD context is Null", __func__); + pAdapter = (hdd_adapter_t *)context; + if (unlikely(WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL, + "Magic cookie(%x) for adapter sanity verification is invalid", + pAdapter->magic); return QDF_STATUS_E_FAILURE; } - pAdapter = pHddCtx->sta_to_adapter[staId]; - if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - hddLog(LOGE, - FL("invalid adapter %p or adapter has invalid magic"), - pAdapter); + pHddCtx = pAdapter->pHddCtx; + if (unlikely(NULL == pHddCtx)) { + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, + "%s: HDD context is Null", __func__); return QDF_STATUS_E_FAILURE; } + cpu_index = wlan_hdd_get_cpu(); skb = (struct sk_buff *)rxBuf; - if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) { - QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL, - "Magic cookie(%x) for adapter sanity verification is invalid", - pAdapter->magic); - return QDF_STATUS_E_FAILURE; - } - pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if ((pHddStaCtx->conn_info.proxyARPService) && cfg80211_is_gratuitous_arp_unsolicited_na(skb)) { -- cgit v1.2.3 From 168d2b492e27345f0e40f0aaf6f453a5e0057c8b Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Mon, 22 Feb 2016 14:43:06 -0800 Subject: qcacld-3.0: Data path changes to use converged APIs (Part 3) Changes to register a per vdev tx callback function. Register a per-vdev transmit function during vdev registration. The OS interface (HDD) adapter stores this transmit function and invokes it to transmit data frames. Change-Id: I1dfe6f58d1d26069dadc2d719fff242c29071bad CRs-Fixed: 994638 --- core/dp/ol/inc/ol_txrx_osif_api.h | 3 +-- core/dp/txrx/ol_tx.c | 34 +++++----------------------------- core/dp/txrx/ol_txrx.c | 2 ++ core/hdd/inc/wlan_hdd_main.h | 1 + core/hdd/src/wlan_hdd_assoc.c | 2 ++ core/hdd/src/wlan_hdd_ocb.c | 1 + core/hdd/src/wlan_hdd_softap_tx_rx.c | 20 +++++++++++++++++--- core/hdd/src/wlan_hdd_tx_rx.c | 30 +++++++++++++++++++++++++++--- 8 files changed, 56 insertions(+), 37 deletions(-) diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index b2f707a15642..0d2136c6161d 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -128,8 +128,7 @@ qdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev, int max_seg_payload_bytes, qdf_nbuf_t jumbo_tcp_frame); -qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, - uint8_t proto_type); +qdf_nbuf_t ol_tx_data(ol_txrx_vdev_handle data_vdev, qdf_nbuf_t skb); #ifdef IPA_OFFLOAD qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 0956af1c7b35..eb9cf21165d2 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -132,19 +132,16 @@ static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev, #endif /** - * ol_tx_send_data_frame() - send data frame - * @sta_id: sta id + * ol_tx_data() - send data frame + * @vdev: virtual device handle * @skb: skb - * @proto_type: proto type * * Return: skb/NULL for success */ -qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, - uint8_t proto_type) +qdf_nbuf_t ol_tx_data(ol_txrx_vdev_handle vdev, qdf_nbuf_t skb) { void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); - struct ol_txrx_peer_t *peer; + struct ol_txrx_pdev_t *pdev = vdev->pdev; qdf_nbuf_t ret; QDF_STATUS status; @@ -159,25 +156,6 @@ qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, return skb; } - if (sta_id >= WLAN_MAX_STA_COUNT) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, - "%s:Invalid sta id", __func__); - return skb; - } - - peer = ol_txrx_peer_find_by_local_id(pdev, sta_id); - if (!peer) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, - "%s:Invalid peer", __func__); - return skb; - } - - if (peer->state < ol_txrx_peer_state_conn) { - QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, - "%s: station to be yet registered..dropping pkt", __func__); - return skb; - } - status = qdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE); if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, @@ -185,8 +163,6 @@ qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, return skb; } - qdf_nbuf_trace_set_proto_type(skb, proto_type); - if ((ol_cfg_is_ip_tcp_udp_checksum_offload_enabled(pdev->ctrl_pdev)) && (qdf_nbuf_get_protocol(skb) == htons(ETH_P_IP)) && (qdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL)) @@ -194,7 +170,7 @@ qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb, /* Terminate the (single-element) list of tx frames */ qdf_nbuf_set_next(skb, NULL); - ret = OL_TX_LL(peer->vdev, skb); + ret = OL_TX_LL(vdev, skb); if (ret) { QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN, "%s: Failed to tx", __func__); diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 63e4aa84e242..7719a0f46d52 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1198,7 +1198,9 @@ void ol_txrx_vdev_register(ol_txrx_vdev_handle vdev, struct ol_txrx_ops *txrx_ops) { vdev->osif_dev = osif_vdev; + vdev->rx = txrx_ops->rx.rx; + txrx_ops->tx.tx = ol_tx_data; } /** diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index d8d0e4c84cc0..8cee4140f864 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1021,6 +1021,7 @@ struct hdd_adapter_s { queue_oper_history[WLAN_HDD_MAX_HISTORY_ENTRY]; struct hdd_netif_queue_stats queue_oper_stats[WLAN_REASON_TYPE_MAX]; struct hdd_lro_s lro_info; + ol_txrx_tx_fp tx_fn; }; #define WLAN_HDD_GET_STATION_CTX_PTR(pAdapter) (&(pAdapter)->sessionCtx.station) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index d3606b538a59..6093ed541787 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1308,6 +1308,7 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, ol_txrx_vdev_register( ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), pAdapter, &txrx_ops); + pAdapter->tx_fn = txrx_ops.tx.tx; if (!pRoamInfo->fAuthRequired) { /* @@ -2872,6 +2873,7 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, ol_txrx_vdev_register( ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), pAdapter, &txrx_ops); + pAdapter->tx_fn = txrx_ops.tx.tx; return qdf_status; } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index fcca73109c1a..f7c240e5fd14 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -275,6 +275,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) ol_txrx_vdev_register( ol_txrx_get_vdev_from_vdev_id(adapter->sessionId), adapter, &txrx_ops); + adapter->tx_fn = txrx_ops.tx.tx; if (pHddStaCtx->conn_info.staId[0] != 0 && pHddStaCtx->conn_info.staId[0] != peer_id) { diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index 09b862d6849a..fb4739fe9e6b 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -171,8 +171,8 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter); struct qdf_mac_addr *pDestMacAddress; uint8_t STAId; - uint8_t proto_type = 0; #ifdef QCA_PKT_PROTO_TRACE + uint8_t proto_type = 0; hdd_context_t *hddCtxt = (hdd_context_t *) pAdapter->pHddCtx; #endif /* QCA_PKT_PROTO_TRACE */ @@ -199,6 +199,16 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto drop_pkt; } + /* + * If a transmit function is not registered, drop packet + */ + if (!pAdapter->tx_fn) { + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH, + "%s: TX function not registered by the data path", + __func__); + goto drop_pkt; + } + pDestMacAddress = (struct qdf_mac_addr *) skb->data; if (qdf_is_macaddr_broadcast(pDestMacAddress) || @@ -313,8 +323,11 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); - if (ol_tx_send_data_frame(STAId, skb, - proto_type) != NULL) { +#ifdef QCA_PKT_PROTO_TRACE + qdf_nbuf_trace_set_proto_type(skb, proto_type); +#endif + if (pAdapter->tx_fn(ol_txrx_get_vdev_by_sta_id(STAId), + (qdf_nbuf_t) skb) != NULL) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); @@ -706,6 +719,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, ol_txrx_vdev_register( ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), pAdapter, &txrx_ops); + pAdapter->tx_fn = txrx_ops.tx.tx; /* if ( WPA ), tell TL to go to 'connected' and after keys come to the * driver then go to 'authenticated'. For all other authentication diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 492a72bd0d32..9a2944834475 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -299,8 +299,8 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) bool granted; uint8_t STAId = WLAN_MAX_STA_COUNT; hdd_station_ctx_t *pHddStaCtx = &pAdapter->sessionCtx.station; - uint8_t proto_type = 0; #ifdef QCA_PKT_PROTO_TRACE + uint8_t proto_type = 0; hdd_context_t *hddCtxt = WLAN_HDD_GET_CTX(pAdapter); #endif /* QCA_PKT_PROTO_TRACE */ @@ -489,8 +489,32 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE], (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); - if (ol_tx_send_data_frame(STAId, (qdf_nbuf_t) skb, - proto_type) != NULL) { + /* Check if station is connected */ + if (ol_txrx_peer_state_conn == + pAdapter->aStaInfo[STAId].tlSTAState) { + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, + QDF_TRACE_LEVEL_WARN, + "%s: station is not connected..dropping pkt", + __func__); + goto drop_pkt; + } + +#ifdef QCA_PKT_PROTO_TRACE + qdf_nbuf_trace_set_proto_type(skb, proto_type); +#endif + + /* + * If a transmit function is not registered, drop packet + */ + if (!pAdapter->tx_fn) { + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH, + "%s: TX function not registered by the data path", + __func__); + goto drop_pkt; + } + + if (pAdapter->tx_fn(ol_txrx_get_vdev_by_sta_id(STAId), + (qdf_nbuf_t) skb) != NULL) { QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, "%s: Failed to send packet to txrx for staid:%d", __func__, STAId); -- cgit v1.2.3 From b08959a747330dc0cd4206e6dc43b7003c28ffe6 Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Tue, 1 Mar 2016 17:28:03 -0800 Subject: qcacld-4.0: Data path changes to use converged APIs (Part 4) Changes in the data path to use the converged MCL specific APIs. Change-Id: Ib6ae1917a9678dcd735b81e3aa83d086406ac404 CRs-Fixed: 994638 --- core/cds/src/cds_concurrency.c | 3 +- core/dp/htt/htt_t2h.c | 1 + core/dp/ol/inc/ol_cfg.h | 17 -- core/dp/ol/inc/ol_txrx_api.h | 29 --- core/dp/ol/inc/ol_txrx_ctrl_api.h | 395 +---------------------------------- core/dp/ol/inc/ol_txrx_osif_api.h | 65 ------ core/dp/txrx/ol_cfg.c | 29 +++ core/dp/txrx/ol_tx.c | 42 +++- core/dp/txrx/ol_tx.h | 1 + core/dp/txrx/ol_tx_queue.c | 46 +++- core/dp/txrx/ol_txrx.c | 74 +++---- core/dp/txrx/ol_txrx_types.h | 2 + core/hdd/inc/wlan_hdd_assoc.h | 1 + core/hdd/inc/wlan_hdd_main.h | 1 + core/hdd/inc/wlan_hdd_tx_rx.h | 1 + core/hdd/src/wlan_hdd_assoc.c | 14 +- core/hdd/src/wlan_hdd_cfg80211.c | 2 +- core/hdd/src/wlan_hdd_driver_ops.c | 1 + core/hdd/src/wlan_hdd_ipa.c | 115 +++++----- core/hdd/src/wlan_hdd_lro.c | 4 +- core/hdd/src/wlan_hdd_main.c | 1 + core/hdd/src/wlan_hdd_power.c | 1 + core/hdd/src/wlan_hdd_softap_tx_rx.c | 17 +- core/hdd/src/wlan_hdd_tx_rx.c | 5 +- core/hdd/src/wlan_hdd_wext.c | 1 + core/wma/src/wma_data.c | 5 +- core/wma/src/wma_dev_if.c | 19 +- core/wma/src/wma_main.c | 4 + core/wma/src/wma_mgmt.c | 3 +- 29 files changed, 249 insertions(+), 650 deletions(-) diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 248b4929372d..68b239d3bde1 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -64,6 +64,7 @@ #include "cds_utils.h" #include "cds_reg_service.h" #include "wlan_hdd_ipa.h" +#include "cdp_txrx_flow_ctrl_legacy.h" #define CDS_MAX_FEATURE_SET 8 static struct cds_conc_connection_info @@ -2645,7 +2646,7 @@ bool cds_is_connection_in_progress(void) for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) { if (!((adapter->aStaInfo[sta_id].isUsed) - && (ol_txrx_peer_state_conn == + && (OL_TXRX_PEER_STATE_CONN == adapter->aStaInfo[sta_id].tlSTAState))) continue; diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 7fb80647e8f3..3da86ec398d8 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -49,6 +49,7 @@ #include #include #include +#include /*--- target->host HTT message dispatch function ----------------------------*/ diff --git a/core/dp/ol/inc/ol_cfg.h b/core/dp/ol/inc/ol_cfg.h index 49c9ae454451..4884794a24c6 100644 --- a/core/dp/ol/inc/ol_cfg.h +++ b/core/dp/ol/inc/ol_cfg.h @@ -152,18 +152,6 @@ int ol_cfg_rx_pn_check(ol_pdev_handle pdev); */ int ol_cfg_rx_fwd_check(ol_pdev_handle pdev); -/** - * @brief set rx fwd disable/enable. - * @details - * Choose whether to forward rx frames to tx (where applicable) within the - * WLAN driver, or to leave all forwarding up to the operating system. - * currently only intra-bss fwd is supported. - * - * @param pdev - handle to the physical device - * @param disable_rx_fwd 1 -> no rx->tx forward -> rx->tx forward - */ -void ol_set_cfg_rx_fwd_disabled(ol_pdev_handle pdev, uint8_t disalbe_rx_fwd); - /** * @brief Check whether rx forwarding is enabled or disabled. * @details @@ -456,11 +444,6 @@ static inline int ol_tx_cfg_max_tx_queue_depth_ll(ol_pdev_handle pdev) return 1500; } -/** - * @brief Set packet log config in HTT config based on CFG ini configuration - */ -void ol_set_cfg_packet_log_enabled(ol_pdev_handle pdev, uint8_t val); - /** * @brief Get packet log config from HTT config */ diff --git a/core/dp/ol/inc/ol_txrx_api.h b/core/dp/ol/inc/ol_txrx_api.h index 81f61f5147c2..f350ecfa7d73 100644 --- a/core/dp/ol/inc/ol_txrx_api.h +++ b/core/dp/ol/inc/ol_txrx_api.h @@ -60,33 +60,4 @@ enum ol_sec_type { ol_sec_type_types }; -/** - * @enum ol_tx_spec - * @brief indicate what non-standard transmission actions to apply - * @details - * Indicate one or more of the following: - * - The tx frame already has a complete 802.11 header. - * Thus, skip 802.3/native-WiFi to 802.11 header encapsulation and - * A-MSDU aggregation. - * - The tx frame should not be aggregated (A-MPDU or A-MSDU) - * - The tx frame is already encrypted - don't attempt encryption. - * - The tx frame is a segment of a TCP jumbo frame. - * - This tx frame should not be unmapped and freed by the txrx layer - * after transmission, but instead given to a registered tx completion - * callback. - * More than one of these specification can apply, though typically - * only a single specification is applied to a tx frame. - * A compound specification can be created, as a bit-OR of these - * specifications. - */ -enum ol_tx_spec { - ol_tx_spec_std = 0x0, /* do regular processing */ - ol_tx_spec_raw = 0x1, /* skip encap + A-MSDU aggr */ - ol_tx_spec_no_aggr = 0x2, /* skip encap + all aggr */ - ol_tx_spec_no_encrypt = 0x4, /* skip encap + encrypt */ - ol_tx_spec_tso = 0x8, /* TCP segmented */ - ol_tx_spec_nwifi_no_encrypt = 0x10, /* skip encrypt for nwifi */ - ol_tx_spec_no_free = 0x20, /* give to cb rather than free */ -}; - #endif /* _OL_TXRX_API__H_ */ diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 70ea34e491e0..e833e8dfb32c 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -59,54 +59,6 @@ #define OL_TXQ_PAUSE_REASON_VDEV_STOP (1 << 3) #define OL_TXQ_PAUSE_REASON_THERMAL_MITIGATION (1 << 4) - -/** - * enum netif_action_type - Type of actions on netif queues - * @WLAN_STOP_ALL_NETIF_QUEUE: stop all netif queues - * @WLAN_START_ALL_NETIF_QUEUE: start all netif queues - * @WLAN_WAKE_ALL_NETIF_QUEUE: wake all netif queues - * @WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER: stop all queues and off carrier - * @WLAN_START_ALL_NETIF_QUEUE_N_CARRIER: start all queues and on carrier - * @WLAN_NETIF_TX_DISABLE: disable tx - * @WLAN_NETIF_TX_DISABLE_N_CARRIER: disable tx and off carrier - * @WLAN_NETIF_CARRIER_ON: on carrier - * @WLAN_NETIF_CARRIER_OFF: off carrier - */ -enum netif_action_type { - WLAN_STOP_ALL_NETIF_QUEUE, - WLAN_START_ALL_NETIF_QUEUE, - WLAN_WAKE_ALL_NETIF_QUEUE, - WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER, - WLAN_START_ALL_NETIF_QUEUE_N_CARRIER, - WLAN_NETIF_TX_DISABLE, - WLAN_NETIF_TX_DISABLE_N_CARRIER, - WLAN_NETIF_CARRIER_ON, - WLAN_NETIF_CARRIER_OFF, - WLAN_NETIF_ACTION_TYPE_MAX, -}; - -/** - * enum netif_reason_type - reason for netif queue action - * @WLAN_CONTROL_PATH: action from control path - * @WLAN_DATA_FLOW_CONTROL: because of flow control - * @WLAN_FW_PAUSE: because of firmware pause - * @WLAN_TX_ABORT: because of tx abort - * @WLAN_VDEV_STOP: because of vdev stop - * @WLAN_PEER_UNAUTHORISED: because of peer is unauthorised - * @WLAN_THERMAL_MITIGATION: because of thermal mitigation - */ -enum netif_reason_type { - WLAN_CONTROL_PATH, - WLAN_DATA_FLOW_CONTROL, - WLAN_FW_PAUSE, - WLAN_TX_ABORT, - WLAN_VDEV_STOP, - WLAN_PEER_UNAUTHORISED, - WLAN_THERMAL_MITIGATION, - WLAN_REASON_TYPE_MAX, -}; - - /* command options for dumpStats*/ #define WLAN_HDD_STATS 0 #define WLAN_TXRX_STATS 1 @@ -279,66 +231,6 @@ struct ol_tx_wmm_param_t { */ #define ol_txrx_tx_release(peer, tid_mask, max_frms) /* no-op */ -/** - * @brief Suspend all tx data for the specified virtual device. - * @details - * This function applies primarily to HL systems, but also applies to - * LL systems that use per-vdev tx queues for MCC or thermal throttling. - * As an example, this function could be used when a single-channel physical - * device supports multiple channels by jumping back and forth between the - * channels in a time-shared manner. As the device is switched from channel - * A to channel B, the virtual devices that operate on channel A will be - * paused. - * - * @param data_vdev - the virtual device being paused - * @param reason - the reason for which vdev queue is getting paused - */ -#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) -void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason); -#else -static inline -void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) -{ - return; -} -#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ - -/** - * @brief Drop all tx data for the specified virtual device. - * @details - * This function applies primarily to HL systems, but also applies to - * LL systems that use per-vdev tx queues for MCC or thermal throttling. - * This function would typically be used by the ctrl SW after it parks - * a STA vdev and then resumes it, but to a new AP. In this case, though - * the same vdev can be used, any old tx frames queued inside it would be - * stale, and would need to be discarded. - * - * @param data_vdev - the virtual device being flushed - */ -#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) -void ol_txrx_vdev_flush(ol_txrx_vdev_handle data_vdev); -#else -#define ol_txrx_vdev_flush(data_vdev) /* no-op */ -#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ - -/** - * @brief Resume tx for the specified virtual device. - * @details - * This function applies primarily to HL systems, but also applies to - * LL systems that use per-vdev tx queues for MCC or thermal throttling. - * - * @param data_vdev - the virtual device being unpaused - * @param reason - the reason for which vdev queue is getting unpaused - */ -#if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) -void ol_txrx_vdev_unpause(ol_txrx_vdev_handle data_vdev, uint32_t reason); -#else -static inline -void ol_txrx_vdev_unpause(ol_txrx_vdev_handle data_vdev, uint32_t reason) -{ - return; -} -#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ /** * @brief Suspend all tx data per thermal event/timer for the @@ -433,47 +325,12 @@ void ol_txrx_data_tx_cb_set(ol_txrx_vdev_handle data_vdev, ol_txrx_data_tx_cb callback, void *ctxt); -/** - * @brief Allow the control-path SW to send data frames. - * @details - * Generally, all tx data frames come from the OS shim into the txrx layer. - * However, there are rare cases such as TDLS messaging where the UMAC - * control-path SW creates tx data frames. - * This UMAC SW can call this function to provide the tx data frames to - * the txrx layer. - * The UMAC SW can request a callback for these data frames after their - * transmission completes, by using the ol_txrx_data_tx_cb_set function - * to register a tx completion callback, and by specifying - * ol_tx_spec_no_free as the tx_spec arg when giving the frames to - * ol_tx_non_std. - * The MSDUs need to have the appropriate L2 header type (802.3 vs. 802.11), - * as specified by ol_cfg_frame_type(). - * - * @param data_vdev - which vdev should transmit the tx data frames - * @param tx_spec - what non-standard handling to apply to the tx data frames - * @param msdu_list - NULL-terminated list of tx MSDUs - */ -qdf_nbuf_t -ol_tx_non_std(ol_txrx_vdev_handle data_vdev, - enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list); - #ifdef FEATURE_RUNTIME_PM QDF_STATUS ol_txrx_runtime_suspend(ol_txrx_pdev_handle txrx_pdev); QDF_STATUS ol_txrx_runtime_resume(ol_txrx_pdev_handle txrx_pdev); #endif -QDF_STATUS ol_txrx_bus_suspend(void); -QDF_STATUS ol_txrx_bus_resume(void); -QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); -/** - * @brief Get the number of pending transmit frames that are awaiting completion. - * @details - * Mainly used in clean up path to make sure all buffers have been free'ed - * - * @param pdev - the data physical device object - * @return - count of pending frames - */ -int ol_txrx_get_tx_pending(ol_txrx_pdev_handle pdev); +QDF_STATUS ol_txrx_wait_for_pending_tx(int timeout); /** * @brief Discard all tx frames that are pending in txrx. @@ -512,33 +369,6 @@ void ol_txrx_set_safemode(ol_txrx_vdev_handle vdev, uint32_t val); */ void ol_txrx_set_drop_unenc(ol_txrx_vdev_handle vdev, uint32_t val); -enum ol_txrx_peer_state { - ol_txrx_peer_state_invalid, - ol_txrx_peer_state_disc, /* initial state */ - ol_txrx_peer_state_conn, /* authentication in progress */ - ol_txrx_peer_state_auth, /* authentication successful */ -}; - -/** - * @brief specify the peer's authentication state - * @details - * Specify the peer's authentication state (none, connected, authenticated) - * to allow the data SW to determine whether to filter out invalid data frames. - * (In the "connected" state, where security is enabled, but authentication - * has not completed, tx and rx data frames other than EAPOL or WAPI should - * be discarded.) - * This function is only relevant for systems in which the tx and rx filtering - * are done in the host rather than in the target. - * - * @param data_peer - which peer has changed its state - * @param state - the new state of the peer - * - * Return: QDF Status - */ -QDF_STATUS -ol_txrx_peer_state_update(ol_txrx_pdev_handle pdev, uint8_t *peer_addr, - enum ol_txrx_peer_state state); - void ol_txrx_peer_keyinstalled_state_update(ol_txrx_peer_handle data_peer, uint8_t val); @@ -633,63 +463,12 @@ ol_txrx_peer_stats_copy(ol_txrx_pdev_handle pdev, #define ol_txrx_peer_stats_copy(pdev, peer, stats) A_ERROR /* failure */ #endif /* QCA_ENABLE_OL_TXRX_PEER_STATS */ -/* Config parameters for txrx_pdev */ -struct txrx_pdev_cfg_param_t { - uint8_t is_full_reorder_offload; - /* IPA Micro controller data path offload enable flag */ - uint8_t is_uc_offload_enabled; - /* IPA Micro controller data path offload TX buffer count */ - uint32_t uc_tx_buffer_count; - /* IPA Micro controller data path offload TX buffer size */ - uint32_t uc_tx_buffer_size; - /* IPA Micro controller data path offload RX indication ring count */ - uint32_t uc_rx_indication_ring_count; - /* IPA Micro controller data path offload TX partition base */ - uint32_t uc_tx_partition_base; - /* IP, TCP and UDP checksum offload */ - bool ip_tcp_udp_checksum_offload; - /* Rx processing in thread from TXRX */ - bool enable_rxthread; - /* CE classification enabled through INI */ - bool ce_classify_enabled; -#ifdef QCA_LL_TX_FLOW_CONTROL_V2 - /* Threshold to stop queue in percentage */ - uint32_t tx_flow_stop_queue_th; - /* Start queue offset in percentage */ - uint32_t tx_flow_start_queue_offset; -#endif -}; - -/** - * @brief Setup configuration parameters - * @details - * Allocation configuration context that will be used across data path - * - * @param osdev - OS handle needed as an argument for some OS primitives - * @return the control device object - */ -ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev, - struct txrx_pdev_cfg_param_t cfg_param); - QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); + void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id); #define OL_TXRX_INVALID_LOCAL_PEER_ID 0xffff -#ifdef QCA_SUPPORT_TXRX_LOCAL_PEER_ID -uint16_t ol_txrx_local_peer_id(ol_txrx_peer_handle peer); -ol_txrx_peer_handle ol_txrx_find_peer_by_addr(ol_txrx_pdev_handle pdev, - uint8_t *peer_addr, - uint8_t *peer_id); -ol_txrx_peer_handle -ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev, - ol_txrx_vdev_handle vdev, - uint8_t *peer_addr, uint8_t *peer_id); -#else -#define ol_txrx_local_peer_id(peer) OL_TXRX_INVALID_LOCAL_PEER_ID -#define ol_txrx_find_peer_by_addr(pdev, peer_addr, peer_id) NULL -#define ol_txrx_find_peer_by_addr_and_vdev(pdev, vdev, peer_addr, peer_id) NULL -#endif #define OL_TXRX_RSSI_INVALID 0xffff /** @@ -718,11 +497,8 @@ int16_t ol_txrx_peer_rssi(ol_txrx_peer_handle peer); #define ol_txrx_peer_rssi(peer) OL_TXRX_RSSI_INVALID #endif /* QCA_SUPPORT_PEER_DATA_RX_RSSI */ -#define OL_TXRX_INVALID_LOCAL_PEER_ID 0xffff #if QCA_SUPPORT_TXRX_LOCAL_PEER_ID -uint16_t ol_txrx_local_peer_id(ol_txrx_peer_handle peer); #else -#define ol_txrx_local_peer_id(peer) OL_TXRX_INVALID_LOCAL_PEER_ID #endif #ifdef QCA_COMPUTE_TX_DELAY @@ -857,168 +633,6 @@ static inline void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, } #endif /* QCA_SUPPORT_TX_THROTTLE */ -void ol_vdev_rx_set_intrabss_fwd(ol_txrx_vdev_handle vdev, bool val); - - -#ifdef IPA_OFFLOAD -void -ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - qdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - qdf_dma_addr_t *ce_reg_paddr, - qdf_dma_addr_t *tx_comp_ring_base_paddr, - uint32_t *tx_comp_ring_size, - uint32_t *tx_num_alloc_buffer, - qdf_dma_addr_t *rx_rdy_ring_base_paddr, - uint32_t *rx_rdy_ring_size, - qdf_dma_addr_t *rx_proc_done_idx_paddr, - void **rx_proc_done_idx_vaddr, - qdf_dma_addr_t *rx2_rdy_ring_base_paddr, - uint32_t *rx2_rdy_ring_size, - qdf_dma_addr_t *rx2_proc_done_idx_paddr, - void **rx2_proc_done_idx_vaddr); - - -void -ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev, - qdf_dma_addr_t ipa_tx_uc_doorbell_paddr, - qdf_dma_addr_t ipa_rx_uc_doorbell_paddr); - -void -ol_txrx_ipa_uc_set_active(ol_txrx_pdev_handle pdev, bool uc_active, bool is_tx); - -void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg); - -void ol_txrx_ipa_uc_register_op_cb(ol_txrx_pdev_handle pdev, - void (*ipa_uc_op_cb_type)(uint8_t *op_msg, - void *osif_ctxt), - void *osif_dev); - -void ol_txrx_ipa_uc_get_stat(ol_txrx_pdev_handle pdev); -#else -/** - * ol_txrx_ipa_uc_get_resource() - Client request resource information - * @pdev: handle to the HTT instance - * @ce_sr_base_paddr: copy engine source ring base physical address - * @ce_sr_ring_size: copy engine source ring size - * @ce_reg_paddr: copy engine register physical address - * @tx_comp_ring_base_paddr: tx comp ring base physical address - * @tx_comp_ring_size: tx comp ring size - * @tx_num_alloc_buffer: number of allocated tx buffer - * @rx_rdy_ring_base_paddr: rx ready ring base physical address - * @rx_rdy_ring_size: rx ready ring size - * @rx_proc_done_idx_paddr: rx process done index physical address - * @rx_proc_done_idx_vaddr: rx process done index virtual address - * @rx2_rdy_ring_base_paddr: rx done ring base physical address - * @rx2_rdy_ring_size: rx done ring size - * @rx2_proc_done_idx_paddr: rx done index physical address - * @rx2_proc_done_idx_vaddr: rx done index virtual address - * - * OL client will reuqest IPA UC related resource information - * Resource information will be distributted to IPA module - * All of the required resources should be pre-allocated - * - * Return: none - */ -static inline void -ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - qdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - qdf_dma_addr_t *ce_reg_paddr, - qdf_dma_addr_t *tx_comp_ring_base_paddr, - uint32_t *tx_comp_ring_size, - uint32_t *tx_num_alloc_buffer, - qdf_dma_addr_t *rx_rdy_ring_base_paddr, - uint32_t *rx_rdy_ring_size, - qdf_dma_addr_t *rx_proc_done_idx_paddr, - void **rx_proc_done_idx_vaddr, - qdf_dma_addr_t *rx2_rdy_ring_base_paddr, - uint32_t *rx2_rdy_ring_size, - qdf_dma_addr_t *rx2_proc_done_idx_paddr, - void **rx2_proc_done_idx_vaddr) -{ - return; -} - -/** - * ol_txrx_ipa_uc_set_doorbell_paddr() - Client set IPA UC doorbell register - * @pdev: handle to the HTT instance - * @ipa_uc_tx_doorbell_paddr: tx comp doorbell physical address - * @ipa_uc_rx_doorbell_paddr: rx ready doorbell physical address - * - * IPA UC let know doorbell register physical address - * WLAN firmware will use this physical address to notify IPA UC - * - * Return: none - */ -static inline void -ol_txrx_ipa_uc_set_doorbell_paddr(ol_txrx_pdev_handle pdev, - qdf_dma_addr_t ipa_tx_uc_doorbell_paddr, - qdf_dma_addr_t ipa_rx_uc_doorbell_paddr) -{ - return; -} - -/** - * ol_txrx_ipa_uc_set_active() - Client notify IPA UC data path active or not - * @pdev: handle to the HTT instance - * @ipa_uc_tx_doorbell_paddr: tx comp doorbell physical address - * @ipa_uc_rx_doorbell_paddr: rx ready doorbell physical address - * - * IPA UC let know doorbell register physical address - * WLAN firmware will use this physical address to notify IPA UC - * - * Return: none - */ -static inline void -ol_txrx_ipa_uc_set_active(ol_txrx_pdev_handle pdev, - bool uc_active, bool is_tx) -{ - return; -} - -/** - * ol_txrx_ipa_uc_op_response() - Handle OP command response from firmware - * @pdev: handle to the HTT instance - * @op_msg: op response message from firmware - * - * Return: none - */ -static inline void -ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg) -{ - return; -} - -/** - * ol_txrx_ipa_uc_register_op_cb() - Register OP handler function - * @pdev: handle to the HTT instance - * @op_cb: handler function pointer - * @osif_dev: register client context - * - * Return: none - */ -static inline void -ol_txrx_ipa_uc_register_op_cb(ol_txrx_pdev_handle pdev, - void (*ipa_uc_op_cb_type)(uint8_t *op_msg, - void *osif_ctxt), - void *osif_dev) -{ - return; -} - -/** - * ol_txrx_ipa_uc_get_stat() - Get firmware wdi status - * @pdev: handle to the HTT instance - * - * Return: none - */ -static inline void ol_txrx_ipa_uc_get_stat(ol_txrx_pdev_handle pdev) -{ - return; -} -#endif /* IPA_OFFLOAD */ - void ol_txrx_display_stats(uint16_t bitmap); void ol_txrx_clear_stats(uint16_t bitmap); int ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len); @@ -1056,7 +670,6 @@ void ol_tx_flow_pool_unmap_handler(uint8_t flow_id, uint8_t flow_type, struct ol_tx_flow_pool_t *ol_tx_create_flow_pool(uint8_t flow_pool_id, uint16_t flow_pool_size); int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool); -void ol_tx_set_desc_global_pool_size(uint32_t num_msdu_desc); #else static inline void ol_tx_register_flow_control(struct ol_txrx_pdev_t *pdev) @@ -1094,10 +707,6 @@ static inline int ol_tx_delete_flow_pool(struct ol_tx_flow_pool_t *pool) { return 0; } -static inline void ol_tx_set_desc_global_pool_size(uint32_t num_msdu_desc) -{ - return; -} #endif #endif /* _OL_TXRX_CTRL_API__H_ */ diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 0d2136c6161d..54da414e82b9 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -48,57 +48,10 @@ struct ol_rx_cached_buf { struct txrx_rx_metainfo; -/** - * struct ol_txrx_desc_type - txrx descriptor type - * @sta_id: sta id - * @is_qos_enabled: is station qos enabled - * @is_wapi_supported: is station wapi supported - */ -struct ol_txrx_desc_type { - uint8_t sta_id; - uint8_t is_qos_enabled; - uint8_t is_wapi_supported; -}; - - typedef QDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx, qdf_nbuf_t pDataBuff, uint8_t ucSTAId); -typedef void (*ol_tx_pause_callback_fp)(uint8_t vdev_id, - enum netif_action_type action, - enum netif_reason_type reason); - -#ifdef QCA_LL_TX_FLOW_CONTROL_V2 -QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb); -#else -static inline -QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb) -{ - return QDF_STATUS_SUCCESS; - -} -#endif - -#ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL - -int ol_txrx_register_tx_flow_control (uint8_t vdev_id, - ol_txrx_tx_flow_control_fp flowControl, - void *osif_fc_ctx); - -int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id); - -void ol_txrx_flow_control_cb(ol_txrx_vdev_handle vdev, - bool tx_resume); -bool -ol_txrx_get_tx_resource(uint8_t sta_id, - unsigned int low_watermark, - unsigned int high_watermark_offset); - -int -ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth); -#endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ - /** * @brief Divide a jumbo TCP frame into smaller segments. * @details @@ -130,28 +83,10 @@ qdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev, qdf_nbuf_t ol_tx_data(ol_txrx_vdev_handle data_vdev, qdf_nbuf_t skb); -#ifdef IPA_OFFLOAD -qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev, - qdf_nbuf_t skb); -#endif - -QDF_STATUS ol_txrx_register_peer - (struct ol_txrx_desc_type *sta_desc); - -QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id); - -QDF_STATUS ol_txrx_change_peer_state(uint8_t sta_id, - enum ol_txrx_peer_state sta_state, - bool roam_synch_in_progress); - void ol_rx_data_process(struct ol_txrx_peer_t *peer, qdf_nbuf_t rx_buf_list); void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, bool drop); -#if defined(FEATURE_LRO) -void ol_register_lro_flush_cb(void (handler)(void *), void *data); -void ol_deregister_lro_flush_cb(void); -#endif #endif /* _OL_TXRX_OSIF_API__H_ */ diff --git a/core/dp/txrx/ol_cfg.c b/core/dp/txrx/ol_cfg.c index 44e5f240cb83..aaf7b1ce63a5 100644 --- a/core/dp/txrx/ol_cfg.c +++ b/core/dp/txrx/ol_cfg.c @@ -27,6 +27,7 @@ #include #include +#include unsigned int vow_config = 0; @@ -75,6 +76,16 @@ uint8_t ol_defrag_timeout_check(void) * Many of these should actually be determined dynamically instead. */ +/** + * ol_pdev_cfg_attach - setup configuration parameters + * + *@osdev - OS handle needed as an argument for some OS primitives + *@cfg_param - configuration parameters + * + * Allocation configuration context that will be used across data path + * + * Return: the control device object + */ ol_pdev_handle ol_pdev_cfg_attach(qdf_device_t osdev, struct txrx_pdev_cfg_param_t cfg_param) { @@ -156,12 +167,30 @@ int ol_cfg_rx_fwd_check(ol_pdev_handle pdev) return cfg->pn_rx_fwd_check; } +/** + * ol_set_cfg_rx_fwd_disabled - set rx fwd disable/enable + * + * @pdev - handle to the physical device + * @disable_rx_fwd 1 -> no rx->tx forward -> rx->tx forward + * + * Choose whether to forward rx frames to tx (where applicable) within the + * WLAN driver, or to leave all forwarding up to the operating system. + * Currently only intra-bss fwd is supported. + * + */ void ol_set_cfg_rx_fwd_disabled(ol_pdev_handle pdev, uint8_t disable_rx_fwd) { struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev; cfg->rx_fwd_disabled = disable_rx_fwd; } +/** + * ol_set_cfg_packet_log_enabled - Set packet log config in HTT + * config based on CFG ini configuration + * + * @pdev - handle to the physical device + * @val - 0 - disable, 1 - enable + */ void ol_set_cfg_packet_log_enabled(ol_pdev_handle pdev, uint8_t val) { struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *)pdev; diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index eb9cf21165d2..1c9219cd3039 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -996,18 +996,18 @@ static inline int ol_txrx_tx_is_raw(enum ol_tx_spec tx_spec) { return tx_spec & - (ol_tx_spec_raw | ol_tx_spec_no_aggr | ol_tx_spec_no_encrypt); + (OL_TX_SPEC_RAW | OL_TX_SPEC_NO_AGGR | OL_TX_SPEC_NO_ENCRYPT); } static inline uint8_t ol_txrx_tx_raw_subtype(enum ol_tx_spec tx_spec) { uint8_t sub_type = 0x1; /* 802.11 MAC header present */ - if (tx_spec & ol_tx_spec_no_aggr) + if (tx_spec & OL_TX_SPEC_NO_AGGR) sub_type |= 0x1 << HTT_TX_MSDU_DESC_RAW_SUBTYPE_NO_AGGR_S; - if (tx_spec & ol_tx_spec_no_encrypt) + if (tx_spec & OL_TX_SPEC_NO_ENCRYPT) sub_type |= 0x1 << HTT_TX_MSDU_DESC_RAW_SUBTYPE_NO_ENCRYPT_S; - if (tx_spec & ol_tx_spec_nwifi_no_encrypt) + if (tx_spec & OL_TX_SPEC_NWIFI_NO_ENCRYPT) sub_type |= 0x1 << HTT_TX_MSDU_DESC_RAW_SUBTYPE_NO_ENCRYPT_S; return sub_type; } @@ -1046,12 +1046,12 @@ ol_tx_non_std_ll(ol_txrx_vdev_handle vdev, */ next = qdf_nbuf_next(msdu); - if (tx_spec != ol_tx_spec_std) { - if (tx_spec & ol_tx_spec_no_free) { - tx_desc->pkt_type = ol_tx_frm_no_free; - } else if (tx_spec & ol_tx_spec_tso) { - tx_desc->pkt_type = ol_tx_frm_tso; - } else if (tx_spec & ol_tx_spec_nwifi_no_encrypt) { + if (tx_spec != OL_TX_SPEC_STD) { + if (tx_spec & OL_TX_SPEC_NO_FREE) { + tx_desc->pkt_type = OL_TX_SPEC_NO_FREE; + } else if (tx_spec & OL_TX_SPEC_TSO) { + tx_desc->pkt_type = OL_TX_SPEC_TSO; + } else if (tx_spec & OL_TX_SPEC_NWIFI_NO_ENCRYPT) { uint8_t sub_type = ol_txrx_tx_raw_subtype(tx_spec); htt_tx_desc_type(htt_pdev, tx_desc->htt_tx_desc, @@ -1135,6 +1135,28 @@ bool parse_ocb_tx_header(qdf_nbuf_t msdu, return true; } +/** + * ol_tx_non_std - Allow the control-path SW to send data frames + * + * @data_vdev - which vdev should transmit the tx data frames + * @tx_spec - what non-standard handling to apply to the tx data frames + * @msdu_list - NULL-terminated list of tx MSDUs + * + * Generally, all tx data frames come from the OS shim into the txrx layer. + * However, there are rare cases such as TDLS messaging where the UMAC + * control-path SW creates tx data frames. + * This UMAC SW can call this function to provide the tx data frames to + * the txrx layer. + * The UMAC SW can request a callback for these data frames after their + * transmission completes, by using the ol_txrx_data_tx_cb_set function + * to register a tx completion callback, and by specifying + * ol_tx_spec_no_free as the tx_spec arg when giving the frames to + * ol_tx_non_std. + * The MSDUs need to have the appropriate L2 header type (802.3 vs. 802.11), + * as specified by ol_cfg_frame_type(). + * + * Return: null - success, skb - failure + */ qdf_nbuf_t ol_tx_non_std(ol_txrx_vdev_handle vdev, enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list) diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index a91bff1a7b28..3b2acf499e2a 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -35,6 +35,7 @@ #include /* qdf_nbuf_t */ #include #include /* ol_txrx_vdev_t, etc. */ +#include /* ol_tx_spec */ qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef WLAN_FEATURE_FASTPATH diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index de35be4e970a..6aa2cd7a306b 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -37,9 +37,26 @@ #include #include /* ENABLE_TX_QUEUE_LOG */ #include /* bool */ +#include "cdp_txrx_flow_ctrl_legacy.h" #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) +/** + * ol_txrx_vdev_pause- Suspend all tx data for the specified virtual device + * + * @data_vdev - the virtual device being paused + * @reason - the reason for which vdev queue is getting paused + * + * This function applies primarily to HL systems, but also + * applies to LL systems that use per-vdev tx queues for MCC or + * thermal throttling. As an example, this function could be + * used when a single-channel physical device supports multiple + * channels by jumping back and forth between the channels in a + * time-shared manner. As the device is switched from channel A + * to channel B, the virtual devices that operate on channel A + * will be paused. + * + */ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) { /* TO DO: log the queue pause */ @@ -57,6 +74,16 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason) TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__); } +/** + * ol_txrx_vdev_unpause - Resume tx for the specified virtual device + * + * @data_vdev - the virtual device being unpaused + * @reason - the reason for which vdev queue is getting unpaused + * + * This function applies primarily to HL systems, but also applies to + * LL systems that use per-vdev tx queues for MCC or thermal throttling. + * + */ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) { /* TO DO: log the queue unpause */ @@ -82,6 +109,19 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason) TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__); } +/** + * ol_txrx_vdev_flush - Drop all tx data for the specified virtual device + * + * @data_vdev - the virtual device being flushed + * + * This function applies primarily to HL systems, but also applies to + * LL systems that use per-vdev tx queues for MCC or thermal throttling. + * This function would typically be used by the ctrl SW after it parks + * a STA vdev and then resumes it, but to a new AP. In this case, though + * the same vdev can be used, any old tx frames queued inside it would be + * stale, and would need to be discarded. + * + */ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) { qdf_spin_lock_bh(&vdev->ll_pause.mutex); @@ -102,7 +142,11 @@ void ol_txrx_vdev_flush(ol_txrx_vdev_handle vdev) vdev->ll_pause.txq.depth = 0; qdf_spin_unlock_bh(&vdev->ll_pause.mutex); } - +#else /* defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) */ +void ol_txrx_vdev_flush(ol_txrx_vdev_handle data_vdev) +{ + return; +} #endif /* defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) */ #ifdef QCA_LL_TX_FLOW_CONTROL_V2 diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 7719a0f46d52..adcaea7e2c6f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -63,6 +63,8 @@ #include /* ol_tx_desc_frame_free */ #include #include +#include +#include #include "wma.h" #ifndef REMOVE_PKT_LOG #include "pktlog_ac.h" @@ -1369,7 +1371,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, qdf_spin_lock_bh(&peer->peer_info_lock); - if (peer->state >= ol_txrx_peer_state_conn) + if (peer->state >= OL_TXRX_PEER_STATE_CONN) data_rx = peer->vdev->rx; else drop = true; @@ -1542,9 +1544,9 @@ ol_txrx_peer_attach(ol_txrx_vdev_handle vdev, uint8_t *peer_mac_addr) * or else to the "conn" state. For non-open mode, the peer will * progress to "auth" state once the authentication completes. */ - peer->state = ol_txrx_peer_state_invalid; + peer->state = OL_TXRX_PEER_STATE_INVALID; ol_txrx_peer_state_update(pdev, peer->mac_addr.raw, - ol_txrx_peer_state_disc); + OL_TXRX_PEER_STATE_DISC); #ifdef QCA_SUPPORT_PEER_DATA_RX_RSSI peer->rssi_dbm = HTT_RSSI_INVALID; @@ -1620,14 +1622,14 @@ ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, TXRX_PRINT(TXRX_PRINT_LEVEL_INFO2, "%s: change from %d to %d\n", __func__, peer->state, state); - peer->tx_filter = (state == ol_txrx_peer_state_auth) + peer->tx_filter = (state == OL_TXRX_PEER_STATE_AUTH) ? ol_tx_filter_pass_thru - : ((state == ol_txrx_peer_state_conn) + : ((state == OL_TXRX_PEER_STATE_CONN) ? ol_tx_filter_non_auth : ol_tx_filter_discard); if (peer->vdev->pdev->cfg.host_addba) { - if (state == ol_txrx_peer_state_auth) { + if (state == OL_TXRX_PEER_STATE_AUTH) { int tid; /* * Pause all regular (non-extended) TID tx queues until @@ -2103,6 +2105,15 @@ QDF_STATUS ol_txrx_bus_resume(void) return QDF_STATUS_SUCCESS; } +/** + * ol_txrx_get_tx_pending - Get the number of pending transmit + * frames that are awaiting completion. + * + * @pdev - the data physical device object + * Mainly used in clean up path to make sure all buffers have been freed + * + * Return: count of pending frames + */ int ol_txrx_get_tx_pending(ol_txrx_pdev_handle pdev_handle) { struct ol_txrx_pdev_t *pdev = (ol_txrx_pdev_handle) pdev_handle; @@ -2908,34 +2919,23 @@ inline void ol_txrx_flow_control_cb(ol_txrx_vdev_handle vdev, */ void ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev, - qdf_dma_addr_t *ce_sr_base_paddr, - uint32_t *ce_sr_ring_size, - qdf_dma_addr_t *ce_reg_paddr, - qdf_dma_addr_t *tx_comp_ring_base_paddr, - uint32_t *tx_comp_ring_size, - uint32_t *tx_num_alloc_buffer, - qdf_dma_addr_t *rx_rdy_ring_base_paddr, - uint32_t *rx_rdy_ring_size, - qdf_dma_addr_t *rx_proc_done_idx_paddr, - void **rx_proc_done_idx_vaddr, - qdf_dma_addr_t *rx2_rdy_ring_base_paddr, - uint32_t *rx2_rdy_ring_size, - qdf_dma_addr_t *rx2_proc_done_idx2_paddr, - void **rx2_proc_done_idx2_vaddr) + struct ol_txrx_ipa_resources *ipa_res) { htt_ipa_uc_get_resource(pdev->htt_pdev, - ce_sr_base_paddr, - ce_sr_ring_size, - ce_reg_paddr, - tx_comp_ring_base_paddr, - tx_comp_ring_size, - tx_num_alloc_buffer, - rx_rdy_ring_base_paddr, - rx_rdy_ring_size, rx_proc_done_idx_paddr, - rx_proc_done_idx_vaddr, - rx2_rdy_ring_base_paddr, - rx2_rdy_ring_size, rx2_proc_done_idx2_paddr, - rx2_proc_done_idx2_vaddr); + &ipa_res->ce_sr_base_paddr, + &ipa_res->ce_sr_ring_size, + &ipa_res->ce_reg_paddr, + &ipa_res->tx_comp_ring_base_paddr, + &ipa_res->tx_comp_ring_size, + &ipa_res->tx_num_alloc_buffer, + &ipa_res->rx_rdy_ring_base_paddr, + &ipa_res->rx_rdy_ring_size, + &ipa_res->rx_proc_done_idx_paddr, + &ipa_res->rx_proc_done_idx_vaddr, + &ipa_res->rx2_rdy_ring_base_paddr, + &ipa_res->rx2_rdy_ring_size, + &ipa_res->rx2_proc_done_idx_paddr, + &ipa_res->rx2_proc_done_idx_vaddr); } /** @@ -3154,7 +3154,7 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, goto free_buf; qdf_spin_lock_bh(&peer->peer_info_lock); - if (qdf_unlikely(!(peer->state >= ol_txrx_peer_state_conn))) { + if (qdf_unlikely(!(peer->state >= OL_TXRX_PEER_STATE_CONN))) { qdf_spin_unlock_bh(&peer->peer_info_lock); goto free_buf; } @@ -3218,7 +3218,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, qdf_assert(peer->vdev); qdf_spin_lock_bh(&peer->peer_info_lock); - if (peer->state >= ol_txrx_peer_state_conn) + if (peer->state >= OL_TXRX_PEER_STATE_CONN) data_rx = peer->vdev->rx; qdf_spin_unlock_bh(&peer->peer_info_lock); @@ -3323,7 +3323,7 @@ QDF_STATUS ol_txrx_register_peer(struct ol_txrx_desc_type *sta_desc) return QDF_STATUS_E_FAULT; qdf_spin_lock_bh(&peer->peer_info_lock); - peer->state = ol_txrx_peer_state_conn; + peer->state = OL_TXRX_PEER_STATE_CONN; qdf_spin_unlock_bh(&peer->peer_info_lock); param.qos_capable = sta_desc->is_qos_enabled; @@ -3382,7 +3382,7 @@ QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id) qdf_spin_lock_bh(&peer->peer_info_lock); peer->vdev->rx = NULL; - peer->state = ol_txrx_peer_state_disc; + peer->state = OL_TXRX_PEER_STATE_DISC; qdf_spin_unlock_bh(&peer->peer_info_lock); return QDF_STATUS_SUCCESS; @@ -3426,7 +3426,7 @@ QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, /* Set peer state to connected */ ol_txrx_peer_state_update(pdev, peer->mac_addr.raw, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); return QDF_STATUS_SUCCESS; } diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index f707a8ef825f..f52ea035da1a 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -49,6 +49,8 @@ #include "ol_htt_rx_api.h" #include "ol_txrx_ctrl_api.h" /* WLAN_MAX_STA_COUNT */ #include "ol_txrx_osif_api.h" /* ol_rx_callback_fp */ +#include "cdp_txrx_flow_ctrl_v2.h" +#include "cdp_txrx_peer_ops.h" /* * The target may allocate multiple IDs for a peer. diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 768ee713abda..e4b48f8f14b2 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -38,6 +38,7 @@ #include #include #include "ol_txrx_ctrl_api.h" +#include "cdp_txrx_peer_ops.h" /* Preprocessor Definitions and Constants */ #ifdef FEATURE_WLAN_TDLS diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 8cee4140f864..bb4e0103552c 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -65,6 +65,7 @@ #include "ol_txrx_osif_api.h" #include "ol_txrx_ctrl_api.h" #include +#include "cdp_txrx_flow_ctrl_legacy.h" /*--------------------------------------------------------------------------- Preprocessor definitions and constants diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index 46793c2f1da2..df570cd83e48 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -39,6 +39,7 @@ #include #include #include "ol_txrx_osif_api.h" +#include "cdp_txrx_flow_ctrl_legacy.h" #define HDD_ETHERTYPE_802_1_X 0x888E #define HDD_ETHERTYPE_802_1_X_FRAME_OFFSET 12 diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 6093ed541787..060fc6bf7871 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -56,6 +56,8 @@ #include "ol_txrx_ctrl_api.h" #include "ol_txrx_types.h" #include "ol_txrx.h" +#include "cdp_txrx_flow_ctrl_legacy.h" +#include "cdp_txrx_peer_ops.h" /* These are needed to recognize WPA and RSN suite types */ #define HDD_WPA_OUI_SIZE 4 @@ -1216,7 +1218,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, return QDF_STATUS_SUCCESS; #endif - if (sta_state == ol_txrx_peer_state_auth) { + if (sta_state == OL_TXRX_PEER_STATE_AUTH) { #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL /* make sure event is reset */ INIT_COMPLETION(pAdapter->sta_authorized_event); @@ -1317,7 +1319,7 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, */ qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, - ol_txrx_peer_state_auth, + OL_TXRX_PEER_STATE_AUTH, #ifdef WLAN_FEATURE_ROAM_OFFLOAD pRoamInfo->roamSynchInProgress #else @@ -1332,7 +1334,7 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, pHddStaCtx->conn_info.staId[0]); qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, - ol_txrx_peer_state_conn, + OL_TXRX_PEER_STATE_CONN, #ifdef WLAN_FEATURE_ROAM_OFFLOAD pRoamInfo->roamSynchInProgress #else @@ -1529,7 +1531,7 @@ static int hdd_change_sta_state_authenticated(hdd_adapter_t *adapter, */ ret = hdd_change_peer_state(adapter, hddstactx->conn_info.staId[0], - ol_txrx_peer_state_auth, + OL_TXRX_PEER_STATE_AUTH, hdd_is_roam_sync_in_progress(roaminfo)); hdd_conn_set_authenticated(adapter, true); if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) || @@ -2120,7 +2122,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], - ol_txrx_peer_state_conn, + OL_TXRX_PEER_STATE_CONN, #ifdef WLAN_FEATURE_ROAM_OFFLOAD pRoamInfo->roamSynchInProgress #else @@ -2135,7 +2137,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, qdf_status = hdd_change_peer_state(pAdapter, pHddStaCtx->conn_info.staId[0], - ol_txrx_peer_state_auth, + OL_TXRX_PEER_STATE_AUTH, #ifdef WLAN_FEATURE_ROAM_OFFLOAD pRoamInfo->roamSynchInProgress #else diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 587cae24df44..817887f1e9f6 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -6335,7 +6335,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, status = hdd_softap_change_sta_state(pAdapter, &STAMacAddress, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); if (status != QDF_STATUS_SUCCESS) { hddLog(QDF_TRACE_LEVEL_INFO, diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 2050ad542cb8..86d93f084d27 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -53,6 +53,7 @@ #include "cds_concurrency.h" #include "qwlan_version.h" #include "bmi.h" +#include "cdp_txrx_bus.h" #ifdef MODULE #define WLAN_MODULE_NAME module_name(THIS_MODULE) diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 8c6dc29ed9f7..046921d71abc 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -54,6 +54,8 @@ #include "wma.h" #include "wma_api.h" +#include "cdp_txrx_ipa.h" + #define HDD_IPA_DESC_BUFFER_RATIO 4 #define HDD_IPA_IPV4_NAME_EXT "_ipv4" #define HDD_IPA_IPV6_NAME_EXT "_ipv6" @@ -441,29 +443,7 @@ struct hdd_ipa_priv { qdf_mc_timer_t rt_debug_fill_timer; qdf_mutex_t rt_debug_lock; qdf_mutex_t ipa_lock; - - /* CE resources */ - qdf_dma_addr_t ce_sr_base_paddr; - uint32_t ce_sr_ring_size; - qdf_dma_addr_t ce_reg_paddr; - - /* WLAN TX:IPA->WLAN */ - qdf_dma_addr_t tx_comp_ring_base_paddr; - uint32_t tx_comp_ring_size; - uint32_t tx_num_alloc_buffer; - - /* WLAN RX:WLAN->IPA */ - qdf_dma_addr_t rx_rdy_ring_base_paddr; - uint32_t rx_rdy_ring_size; - qdf_dma_addr_t rx_proc_done_idx_paddr; - void *rx_proc_done_idx_vaddr; - - /* WLAN RX2:WLAN->IPA */ - qdf_dma_addr_t rx2_rdy_ring_base_paddr; - uint32_t rx2_rdy_ring_size; - qdf_dma_addr_t rx2_proc_done_idx_paddr; - void *rx2_proc_done_idx_vaddr; - + struct ol_txrx_ipa_resources ipa_resource; /* IPA UC doorbell registers paddr */ qdf_dma_addr_t tx_comp_doorbell_paddr; qdf_dma_addr_t rx_ready_doorbell_paddr; @@ -531,13 +511,18 @@ uint32_t wlan_hdd_stub_addr_to_priv(void *ptr) /* Temporary macro to make a build without IPA V2 */ #ifdef IPA_V2 -#define HDD_IPA_WDI2_SET(pipe_in, ipa_ctxt) \ -do { \ - pipe_in.u.ul.rdy_ring_rp_va = ipa_ctxt->rx_proc_done_idx_vaddr; \ - pipe_in.u.ul.rdy_comp_ring_base_pa = ipa_ctxt->rx2_rdy_ring_base_paddr;\ - pipe_in.u.ul.rdy_comp_ring_size = ipa_ctxt->rx2_rdy_ring_size; \ - pipe_in.u.ul.rdy_comp_ring_wp_pa = ipa_ctxt->rx2_proc_done_idx_paddr; \ - pipe_in.u.ul.rdy_comp_ring_wp_va = ipa_ctxt->rx2_proc_done_idx_vaddr; \ +#define HDD_IPA_WDI2_SET(pipe_in, ipa_ctxt) \ +do { \ + pipe_in.u.ul.rdy_ring_rp_va = \ + ipa_ctxt->ipa_resource.rx_proc_done_idx_vaddr; \ + pipe_in.u.ul.rdy_comp_ring_base_pa = \ + ipa_ctxt->ipa_resource.rx2_rdy_ring_base_paddr;\ + pipe_in.u.ul.rdy_comp_ring_size = \ + ipa_ctxt->ipa_resource.rx2_rdy_ring_size; \ + pipe_in.u.ul.rdy_comp_ring_wp_pa = \ + ipa_ctxt->ipa_resource.rx2_proc_done_idx_paddr; \ + pipe_in.u.ul.rdy_comp_ring_wp_va = \ + ipa_ctxt->ipa_resource.rx2_proc_done_idx_vaddr; \ } while (0) #else /* Do nothing */ @@ -1420,25 +1405,25 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) if ((HDD_IPA_UC_OPCODE_STATS == msg->op_code) && (HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) { - + struct ol_txrx_ipa_resources *res = &hdd_ipa->ipa_resource; /* STATs from host */ QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST CE ====\n" "CE RING BASE: 0x%llx\n" "CE RING SIZE: %d\n" "CE REG ADDR : 0x%llx", - (unsigned long long)hdd_ipa->ce_sr_base_paddr, - hdd_ipa->ce_sr_ring_size, - (unsigned long long)hdd_ipa->ce_reg_paddr); + (unsigned long long)res->ce_sr_base_paddr, + res->ce_sr_ring_size, + (unsigned long long)res->ce_reg_paddr); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST TX ====\n" "COMP RING BASE: 0x%llx\n" "COMP RING SIZE: %d\n" "NUM ALLOC BUF: %d\n" "COMP RING DBELL : 0x%llx", - (unsigned long long)hdd_ipa->tx_comp_ring_base_paddr, - hdd_ipa->tx_comp_ring_size, - hdd_ipa->tx_num_alloc_buffer, + (unsigned long long)res->tx_comp_ring_base_paddr, + res->tx_comp_ring_size, + res->tx_num_alloc_buffer, (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr); QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "==== IPA_UC WLAN_HOST RX ====\n" @@ -1449,10 +1434,11 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt) "NUM EXCP PKT : %llu\n" "NUM TX BCMC : %llu\n" "NUM TX BCMC ERR : %llu", - (unsigned long long)hdd_ipa->rx_rdy_ring_base_paddr, - hdd_ipa->rx_rdy_ring_size, + (unsigned long long)res->rx_rdy_ring_base_paddr, + res->rx_rdy_ring_size, (unsigned long long)hdd_ipa->rx_ready_doorbell_paddr, - (unsigned long long)hdd_ipa->rx_proc_done_idx_paddr, + (unsigned long long)hdd_ipa->ipa_resource. + rx_proc_done_idx_paddr, hdd_ipa->stats.num_rx_excep, hdd_ipa->stats.num_tx_bcmc, (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err); @@ -1811,13 +1797,18 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) pipe_in.sys.keep_ipa_awake = true; } - pipe_in.u.dl.comp_ring_base_pa = ipa_ctxt->tx_comp_ring_base_paddr; + pipe_in.u.dl.comp_ring_base_pa = + ipa_ctxt->ipa_resource.tx_comp_ring_base_paddr; pipe_in.u.dl.comp_ring_size = - ipa_ctxt->tx_comp_ring_size * sizeof(qdf_dma_addr_t); - pipe_in.u.dl.ce_ring_base_pa = ipa_ctxt->ce_sr_base_paddr; - pipe_in.u.dl.ce_door_bell_pa = ipa_ctxt->ce_reg_paddr; - pipe_in.u.dl.ce_ring_size = ipa_ctxt->ce_sr_ring_size; - pipe_in.u.dl.num_tx_buffers = ipa_ctxt->tx_num_alloc_buffer; + ipa_ctxt->ipa_resource.tx_comp_ring_size * + sizeof(qdf_dma_addr_t); + pipe_in.u.dl.ce_ring_base_pa = + ipa_ctxt->ipa_resource.ce_sr_base_paddr; + pipe_in.u.dl.ce_door_bell_pa = ipa_ctxt->ipa_resource.ce_reg_paddr; + pipe_in.u.dl.ce_ring_size = + ipa_ctxt->ipa_resource.ce_sr_ring_size; + pipe_in.u.dl.num_tx_buffers = + ipa_ctxt->ipa_resource.tx_num_alloc_buffer; /* Connect WDI IPA PIPE */ ipa_connect_wdi_pipe(&pipe_in, &pipe_out); @@ -1852,9 +1843,12 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx) pipe_in.sys.keep_ipa_awake = true; } - pipe_in.u.ul.rdy_ring_base_pa = ipa_ctxt->rx_rdy_ring_base_paddr; - pipe_in.u.ul.rdy_ring_size = ipa_ctxt->rx_rdy_ring_size; - pipe_in.u.ul.rdy_ring_rp_pa = ipa_ctxt->rx_proc_done_idx_paddr; + pipe_in.u.ul.rdy_ring_base_pa = + ipa_ctxt->ipa_resource.rx_rdy_ring_base_paddr; + pipe_in.u.ul.rdy_ring_size = + ipa_ctxt->ipa_resource.rx_rdy_ring_size; + pipe_in.u.ul.rdy_ring_rp_pa = + ipa_ctxt->ipa_resource.rx_proc_done_idx_paddr; HDD_IPA_WDI2_SET(pipe_in, ipa_ctxt); ipa_connect_wdi_pipe(&pipe_in, &pipe_out); ipa_ctxt->rx_ready_doorbell_paddr = pipe_out.uc_door_bell_pa; @@ -4027,24 +4021,11 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) hdd_ipa->hdd_ctx = hdd_ctx; hdd_ipa->num_iface = 0; ol_txrx_ipa_uc_get_resource(cds_get_context(QDF_MODULE_ID_TXRX), - &hdd_ipa->ce_sr_base_paddr, - &hdd_ipa->ce_sr_ring_size, - &hdd_ipa->ce_reg_paddr, - &hdd_ipa->tx_comp_ring_base_paddr, - &hdd_ipa->tx_comp_ring_size, - &hdd_ipa->tx_num_alloc_buffer, - &hdd_ipa->rx_rdy_ring_base_paddr, - &hdd_ipa->rx_rdy_ring_size, - &hdd_ipa->rx_proc_done_idx_paddr, - &hdd_ipa->rx_proc_done_idx_vaddr, - &hdd_ipa->rx2_rdy_ring_base_paddr, - &hdd_ipa->rx2_rdy_ring_size, - &hdd_ipa->rx2_proc_done_idx_paddr, - &hdd_ipa->rx2_proc_done_idx_vaddr); - if ((0 == hdd_ipa->ce_sr_base_paddr) || - (0 == hdd_ipa->tx_comp_ring_base_paddr) || - (0 == hdd_ipa->rx_rdy_ring_base_paddr) || - (0 == hdd_ipa->rx2_rdy_ring_base_paddr)) { + &hdd_ipa->ipa_resource); + if ((0 == hdd_ipa->ipa_resource.ce_sr_base_paddr) || + (0 == hdd_ipa->ipa_resource.tx_comp_ring_base_paddr) || + (0 == hdd_ipa->ipa_resource.rx_rdy_ring_base_paddr) || + (0 == hdd_ipa->ipa_resource.rx2_rdy_ring_base_paddr)) { HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "IPA UC resource alloc fail"); goto fail_get_resource; diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index 1f08b62d2ca3..c1a0e312554b 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -504,7 +505,6 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { struct hdd_lro_s *hdd_lro; - struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); size_t lro_mgr_sz, desc_arr_sz, desc_pool_sz, hash_table_sz; uint8_t *lro_mem_ptr; @@ -557,7 +557,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_lro_desc_info_init(hdd_lro); hdd_lro->lro_mgr->dev = adapter->dev; - if (ol_cfg_is_rx_thread_enabled(pdev->ctrl_pdev)) + if (hdd_ctx->config->enableRxThread) hdd_lro->lro_mgr->features = LRO_F_NI; if (hdd_napi_enabled(HDD_NAPI_ANY)) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 543041d695fe..7e0835caf793 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -89,6 +89,7 @@ #include "cds_regdomain.h" #include "wlan_hdd_ocb.h" +#include "cdp_txrx_flow_ctrl_v2.h" extern int hdd_hostapd_stop(struct net_device *dev); #endif /* FEATURE_WLAN_CH_AVOID */ diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 238158b8036d..ed1e47a6ce3b 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -69,6 +69,7 @@ #include "hif.h" #include "sme_power_save_api.h" #include "cds_concurrency.h" +#include "cdp_txrx_flow_ctrl_v2.h" /* Preprocessor definitions and constants */ #define HDD_SSR_BRING_UP_TIME 30000 diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index fb4739fe9e6b..d73f07e8a6f1 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -39,6 +39,7 @@ #include #include #include +#include #ifdef IPA_OFFLOAD #include @@ -241,15 +242,15 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto drop_pkt; } - if ((ol_txrx_peer_state_conn != + if ((OL_TXRX_PEER_STATE_CONN != pAdapter->aStaInfo[STAId].tlSTAState) - && (ol_txrx_peer_state_auth != + && (OL_TXRX_PEER_STATE_AUTH != pAdapter->aStaInfo[STAId].tlSTAState)) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_WARN, "%s: Station not connected yet", __func__); goto drop_pkt; - } else if (ol_txrx_peer_state_conn == + } else if (OL_TXRX_PEER_STATE_CONN == pAdapter->aStaInfo[STAId].tlSTAState) { if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) { QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, @@ -739,9 +740,9 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, * transition TL directly to 'Authenticated' state. */ qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, - ol_txrx_peer_state_auth, false); + OL_TXRX_PEER_STATE_AUTH, false); - pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_auth; + pAdapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_AUTH; pAdapter->sessionCtx.ap.uIsAuthenticated = true; } else { @@ -750,8 +751,8 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter->aStaInfo[staId].ucSTAId); qdf_status = hdd_change_peer_state(pAdapter, staDesc.sta_id, - ol_txrx_peer_state_conn, false); - pAdapter->aStaInfo[staId].tlSTAState = ol_txrx_peer_state_conn; + OL_TXRX_PEER_STATE_CONN, false); + pAdapter->aStaInfo[staId].tlSTAState = OL_TXRX_PEER_STATE_CONN; pAdapter->sessionCtx.ap.uIsAuthenticated = false; @@ -899,7 +900,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter, if (QDF_STATUS_SUCCESS == qdf_status) { pAdapter->aStaInfo[ucSTAId].tlSTAState = - ol_txrx_peer_state_auth; + OL_TXRX_PEER_STATE_AUTH; } QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO, diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 9a2944834475..c4db719dd8f3 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -52,9 +52,10 @@ #include #include "wlan_hdd_ocb.h" - #include "wlan_hdd_lro.h" +#include "cdp_txrx_peer_ops.h" + #ifdef FEATURE_WLAN_DIAG_SUPPORT #define HDD_EAPOL_ETHER_TYPE (0x888E) #define HDD_EAPOL_ETHER_TYPE_OFFSET (12) @@ -490,7 +491,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) (qdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE))); /* Check if station is connected */ - if (ol_txrx_peer_state_conn == + if (OL_TXRX_PEER_STATE_CONN == pAdapter->aStaInfo[STAId].tlSTAState) { QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN, diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 5dda7dcf2fb8..f11628c6d006 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -83,6 +83,7 @@ #include "wlan_hdd_conc_ut.h" #include "wlan_hdd_ocb.h" #include "wlan_hdd_napi.h" +#include "cdp_txrx_flow_ctrl_legacy.h" #ifdef QCA_PKT_PROTO_TRACE #include "cds_packet.h" diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 0e6f46fa6318..e0ea7a3a92b3 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -65,6 +65,9 @@ #include "dfs.h" #include "wma_internal.h" +#include "cdp_txrx_flow_ctrl_legacy.h" +#include "cdp_txrx_cmn.h" +#include "cdp_txrx_misc.h" typedef struct { int32_t rate; @@ -2429,7 +2432,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, wma_handle->last_umac_data_nbuf = skb; /* Send the Data frame to TxRx in Non Standard Path */ - ret = ol_tx_non_std(txrx_vdev, ol_tx_spec_no_free, skb); + ret = ol_tx_non_std(txrx_vdev, OL_TX_SPEC_NO_FREE, skb); if (ret) { WMA_LOGE("TxRx Rejected. Fail to do Tx"); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 328430578eca..7c4a84bf99a9 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -62,12 +62,13 @@ #include "dbglog_host.h" /* FIXME: Inclusion of .c looks odd but this is how it is in internal codebase */ #include "csr_api.h" -#include "ol_fw.h" #include "dfs.h" #include "wma_internal.h" #include "wma_ocb.h" +#include "cdp_txrx_cfg.h" +#include "cdp_txrx_flow_ctrl_legacy.h" /** * wma_find_vdev_by_addr() - find vdev_id from mac address @@ -3260,7 +3261,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("%s: Update peer(%pM) state into auth", __func__, add_bss->bssId); ol_txrx_peer_state_update(pdev, add_bss->bssId, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); } else { #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) ol_txrx_vdev_handle vdev; @@ -3268,7 +3269,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) WMA_LOGD("%s: Update peer(%pM) state into conn", __func__, add_bss->bssId); ol_txrx_peer_state_update(pdev, add_bss->bssId, - ol_txrx_peer_state_conn); + OL_TXRX_PEER_STATE_CONN); #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) peer = ol_txrx_find_peer_by_addr(pdev, add_bss->bssId, &peer_id); @@ -3433,7 +3434,7 @@ void wma_add_bss(tp_wma_handle wma, tpAddBssParams params) */ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) { - enum ol_txrx_peer_state state = ol_txrx_peer_state_conn; + enum ol_txrx_peer_state state = OL_TXRX_PEER_STATE_CONN; ol_txrx_pdev_handle pdev; ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; @@ -3813,7 +3814,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) peer = ol_txrx_find_peer_by_addr(pdev, params->bssId, ¶ms->staIdx); if (params->nonRoamReassoc) { ol_txrx_peer_state_update(pdev, params->bssId, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); iface->aid = params->assocId; goto out; @@ -3825,7 +3826,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) status = QDF_STATUS_E_FAILURE; goto out; } - if (peer != NULL && peer->state == ol_txrx_peer_state_disc) { + if (peer != NULL && peer->state == OL_TXRX_PEER_STATE_DISC) { /* * This is the case for reassociation. * peer state update and peer_assoc is required since it @@ -3837,12 +3838,12 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) WMA_LOGD("%s: Update peer(%pM) state into auth", __func__, params->bssId); ol_txrx_peer_state_update(pdev, params->bssId, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); } else { WMA_LOGD("%s: Update peer(%pM) state into conn", __func__, params->bssId); ol_txrx_peer_state_update(pdev, params->bssId, - ol_txrx_peer_state_conn); + OL_TXRX_PEER_STATE_CONN); } if (wma_is_roam_synch_in_progress(wma, params->smesessionId)) { @@ -3852,7 +3853,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) * skipping this operation, we are just executing the * following which are useful for LFR3.0.*/ ol_txrx_peer_state_update(pdev, params->bssId, - ol_txrx_peer_state_auth); + OL_TXRX_PEER_STATE_AUTH); qdf_atomic_set(&iface->bss_status, WMA_BSS_STATUS_STARTED); iface->aid = params->assocId; diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 465a008ff5ee..d52b44637165 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -71,6 +71,10 @@ #include "wma_ocb.h" #include "cds_concurrency.h" +#include "cdp_txrx_cfg.h" +#include "cdp_txrx_flow_ctrl_legacy.h" +#include "cdp_txrx_flow_ctrl_v2.h" +#include "cdp_txrx_ipa.h" #define WMA_LOG_COMPLETION_TIMER 10000 /* 10 seconds */ diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 134039cf721c..e7eed705db8b 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -66,6 +66,7 @@ #include "dfs.h" #include "wma_internal.h" #include "cds_concurrency.h" +#include "cdp_txrx_flow_ctrl_legacy.h" /** * wma_send_bcn_buf_ll() - prepare and send beacon buffer to fw for LL @@ -952,7 +953,7 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, if (params->wpa_rsn >> 1) cmd->peer_flags |= WMI_PEER_NEED_GTK_2_WAY; - ol_txrx_peer_state_update(pdev, params->bssId, ol_txrx_peer_state_auth); + ol_txrx_peer_state_update(pdev, params->bssId, OL_TXRX_PEER_STATE_AUTH); #ifdef FEATURE_WLAN_WAPI if (params->encryptType == eSIR_ED_WPI) { -- cgit v1.2.3 From 10d357a17ca7f2a110ff4ed3fc00390375a0dd80 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Thu, 31 Mar 2016 19:20:49 -0700 Subject: qcacld-3.0: remove references to datapath structures from other modules Core datapath structures should be opaque to non-datapath modules, remove the references to them. Change-Id: I3618253566a971c27f16b14923d1ff8028718918 CRs-Fixed: 994638 --- core/dp/ol/inc/ol_txrx_ctrl_api.h | 1 + core/dp/txrx/ol_txrx.c | 274 ++++++++++++++++++++++++++++++++++++++ core/dp/txrx/ol_txrx_types.h | 2 + core/hdd/src/wlan_hdd_assoc.c | 22 ++- core/wma/src/wma_data.c | 15 ++- core/wma/src/wma_dev_if.c | 168 ++++++++++------------- core/wma/src/wma_features.c | 8 +- core/wma/src/wma_mgmt.c | 62 +++++---- core/wma/src/wma_ocb.c | 25 ++-- core/wma/src/wma_scan_roam.c | 10 +- 10 files changed, 435 insertions(+), 152 deletions(-) diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index e833e8dfb32c..5e426e9265ae 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -40,6 +40,7 @@ #include /* ol_sec_type */ #include /* MAX_SPATIAL_STREAM */ #include /* ol_pdev_handle, ol_vdev_handle, etc */ +#include #define OL_ATH_TX_DRAIN_WAIT_DELAY 50 diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index adcaea7e2c6f..a4a7b66db025 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -49,6 +49,7 @@ /* header files for our own APIs */ #include #include +#include /* header files for our internal definitions */ #include /* TXRX_ASSERT, etc. */ #include /* WDI events */ @@ -1586,6 +1587,279 @@ static A_STATUS ol_tx_filter_pass_thru(struct ol_txrx_msdu_info_t *tx_msdu_info) return A_OK; } +/** + * ol_txrx_peer_get_peer_mac_addr() - return mac_addr from peer handle. + * @peer: handle to peer + * + * returns mac addrs for module which do not know peer type + * + * Return: the mac_addr from peer + */ +uint8_t * +ol_txrx_peer_get_peer_mac_addr(ol_txrx_peer_handle peer) +{ + if (!peer) + return NULL; + + return peer->mac_addr.raw; +} + +/** + * ol_txrx_get_pn_info() - Returns pn info from peer + * @peer: handle to peer + * @last_pn_valid: return last_rmf_pn_valid value from peer. + * @last_pn: return last_rmf_pn value from peer. + * @rmf_pn_replays: return rmf_pn_replays value from peer. + * + * Return: NONE + */ +void +ol_txrx_get_pn_info(ol_txrx_peer_handle peer, uint8_t **last_pn_valid, + uint64_t **last_pn, uint32_t **rmf_pn_replays) +{ + *last_pn_valid = &peer->last_rmf_pn_valid; + *last_pn = &peer->last_rmf_pn; + *rmf_pn_replays = &peer->rmf_pn_replays; +} + +/** + * ol_txrx_get_opmode() - Return operation mode of vdev + * @vdev: vdev handle + * + * Return: operation mode. + */ +int ol_txrx_get_opmode(ol_txrx_vdev_handle vdev) +{ + return vdev->opmode; +} + +/** + * ol_txrx_get_peer_state() - Return peer state of peer + * @peer: peer handle + * + * Return: return peer state + */ +int ol_txrx_get_peer_state(ol_txrx_peer_handle peer) +{ + return peer->state; +} + +/** + * ol_txrx_get_vdev_for_peer() - Return vdev from peer handle + * @peer: peer handle + * + * Return: vdev handle from peer + */ +ol_txrx_vdev_handle +ol_txrx_get_vdev_for_peer(ol_txrx_peer_handle peer) +{ + return peer->vdev; +} + +/** + * ol_txrx_get_vdev_mac_addr() - Return mac addr of vdev + * @vdev: vdev handle + * + * Return: vdev mac address + */ +uint8_t * +ol_txrx_get_vdev_mac_addr(ol_txrx_vdev_handle vdev) +{ + if (!vdev) + return NULL; + + return vdev->mac_addr.raw; +} + +/** + * ol_txrx_get_vdev_struct_mac_addr() - Return handle to struct cdf_mac_addr of + * vdev + * @vdev: vdev handle + * + * Return: Handle to struct cdf_mac_addr + */ +struct cdf_mac_addr * +ol_txrx_get_vdev_struct_mac_addr(ol_txrx_vdev_handle vdev) +{ + return (struct cdf_mac_addr *)&(vdev->mac_addr); +} + +/** + * ol_txrx_get_pdev_from_vdev() - Return handle to pdev of vdev + * @vdev: vdev handle + * + * Return: Handle to pdev + */ +ol_txrx_pdev_handle ol_txrx_get_pdev_from_vdev(ol_txrx_vdev_handle vdev) +{ + return vdev->pdev; +} + +/** + * ol_txrx_get_ctrl_pdev_from_vdev() - Return control pdev of vdev + * @vdev: vdev handle + * + * Return: Handle to control pdev + */ +ol_pdev_handle +ol_txrx_get_ctrl_pdev_from_vdev(ol_txrx_vdev_handle vdev) +{ + return vdev->pdev->ctrl_pdev; +} + +/** + * ol_txrx_is_rx_fwd_disabled() - returns the rx_fwd_disabled status on vdev + * @vdev: vdev handle + * + * Return: Rx Fwd disabled status + */ +uint8_t +ol_txrx_is_rx_fwd_disabled(ol_txrx_vdev_handle vdev) +{ + struct txrx_pdev_cfg_t *cfg = (struct txrx_pdev_cfg_t *) + vdev->pdev->ctrl_pdev; + return cfg->rx_fwd_disabled; +} + +/** + * ol_txrx_update_ibss_add_peer_num_of_vdev() - update and return peer num + * @vdev: vdev handle + * @peer_num_delta: peer nums to be adjusted + * + * Return: -1 for failure or total peer nums after adjustment. + */ +int16_t +ol_txrx_update_ibss_add_peer_num_of_vdev(ol_txrx_vdev_handle vdev, + int16_t peer_num_delta) +{ + int16_t new_peer_num; + + new_peer_num = vdev->ibss_peer_num + peer_num_delta; + if (new_peer_num > MAX_IBSS_PEERS || new_peer_num < 0) + return OL_TXRX_INVALID_NUM_PEERS; + + vdev->ibss_peer_num = new_peer_num; + + return new_peer_num; +} + +/** + * ol_txrx_set_ibss_vdev_heart_beat_timer() - Update ibss vdev heart + * beat timer + * @vdev: vdev handle + * @timer_value_sec: new heart beat timer value + * + * Return: Old timer value set in vdev. + */ +uint16_t ol_txrx_set_ibss_vdev_heart_beat_timer(ol_txrx_vdev_handle vdev, + uint16_t timer_value_sec) +{ + uint16_t old_timer_value = vdev->ibss_peer_heart_beat_timer; + + vdev->ibss_peer_heart_beat_timer = timer_value_sec; + + return old_timer_value; +} + +/** + * ol_txrx_remove_peers_for_vdev() - remove all vdev peers with lock held + * @vdev: vdev handle + * @callback: callback function to remove the peer. + * @callback_context: handle for callback function + * @remove_last_peer: Does it required to last peer. + * + * Return: NONE + */ +void +ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev, + ol_txrx_vdev_peer_remove_cb callback, + void *callback_context, bool remove_last_peer) +{ + ol_txrx_peer_handle peer, temp; + /* remove all remote peers for vdev */ + cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + + temp = NULL; + TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, + peer_list_elem) { + if (temp) { + cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + if (cdf_atomic_read(&temp->delete_in_progress) == 0) { + callback(callback_context, temp->mac_addr.raw, + vdev->vdev_id, temp, false); + } + cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + } + /* self peer is deleted last */ + if (peer == TAILQ_FIRST(&vdev->peer_list)) { + TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, + "%s: self peer removed by caller ", + __func__); + break; + } else + temp = peer; + } + + if (remove_last_peer) { + /* remove IBSS bss peer last */ + peer = TAILQ_FIRST(&vdev->peer_list); + callback(callback_context, (uint8_t *) &vdev->mac_addr, + vdev->vdev_id, peer, false); + } + + cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); +} + +/** + * ol_txrx_remove_peers_for_vdev_no_lock() - remove vdev peers with no lock. + * @vdev: vdev handle + * @callback: callback function to remove the peer. + * @callback_context: handle for callback function + * + * Return: NONE + */ +void +ol_txrx_remove_peers_for_vdev_no_lock(ol_txrx_vdev_handle vdev, + ol_txrx_vdev_peer_remove_cb callback, + void *callback_context) +{ + ol_txrx_peer_handle peer = NULL; + + TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) { + TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, + "%s: peer found for vdev id %d. deleting the peer", + __func__, vdev->vdev_id); + callback(callback_context, (uint8_t *)&vdev->mac_addr, + vdev->vdev_id, peer, false); + } +} + +/** + * ol_txrx_set_ocb_chan_info() - set OCB channel info to vdev. + * @vdev: vdev handle + * @ocb_set_chan: OCB channel information to be set in vdev. + * + * Return: NONE + */ +void ol_txrx_set_ocb_chan_info(ol_txrx_vdev_handle vdev, + struct ol_txrx_ocb_set_chan ocb_set_chan) +{ + vdev->ocb_channel_info = ocb_set_chan.ocb_channel_info; + vdev->ocb_channel_count = ocb_set_chan.ocb_channel_count; +} + +/** + * ol_txrx_get_ocb_chan_info() - return handle to vdev ocb_channel_info + * @vdev: vdev handle + * + * Return: handle to struct ol_txrx_ocb_chan_info + */ +struct ol_txrx_ocb_chan_info * +ol_txrx_get_ocb_chan_info(ol_txrx_vdev_handle vdev) +{ + return vdev->ocb_channel_info; +} + QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, enum ol_txrx_peer_state state) diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h index f52ea035da1a..43e2461a9115 100644 --- a/core/dp/txrx/ol_txrx_types.h +++ b/core/dp/txrx/ol_txrx_types.h @@ -60,6 +60,8 @@ */ #define MAX_NUM_PEER_ID_PER_PEER 8 +#define OL_TXRX_INVALID_NUM_PEERS (-1) + #define OL_TXRX_MAC_ADDR_LEN 6 /* OL_TXRX_NUM_EXT_TIDS - diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 060fc6bf7871..8f5e5678c63f 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1189,9 +1189,11 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, enum ol_txrx_peer_state sta_state, bool roam_synch_in_progress) { - struct ol_txrx_peer_t *peer; QDF_STATUS err; - struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); + uint8_t *peer_mac_addr; + struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + ol_txrx_vdev_handle vdev; + ol_txrx_peer_handle peer; if (!pdev) { hdd_err("Failed to get txrx context"); @@ -1207,8 +1209,13 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, if (!peer) return QDF_STATUS_E_FAULT; - err = ol_txrx_peer_state_update(pdev, - (u_int8_t *) peer->mac_addr.raw, sta_state); + peer_mac_addr = ol_txrx_peer_get_peer_mac_addr(peer); + if (peer_mac_addr == NULL) { + hddLog(LOGE, "peer mac addr is NULL"); + return QDF_STATUS_E_FAULT; + } + + err = ol_txrx_peer_state_update(pdev, peer_mac_addr, sta_state); if (err != QDF_STATUS_SUCCESS) { hddLog(LOGE, "peer state update failed"); return QDF_STATUS_E_FAULT; @@ -1224,7 +1231,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, INIT_COMPLETION(pAdapter->sta_authorized_event); #endif - err = sme_set_peer_authorized(peer->mac_addr.raw, + err = sme_set_peer_authorized(peer_mac_addr, hdd_set_peer_authorized_event, pAdapter->sessionId); if (err != QDF_STATUS_SUCCESS) { @@ -1245,8 +1252,9 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, hddLog(LOG1, "%s: timeout waiting for sta_authorized_event", __func__); } - ol_txrx_vdev_unpause(peer->vdev, - OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED); + vdev = ol_txrx_get_vdev_for_peer(peer); + ol_txrx_vdev_unpause(vdev, + OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED); #endif } } diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index e0ea7a3a92b3..eaa85c57cd46 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -68,6 +68,8 @@ #include "cdp_txrx_flow_ctrl_legacy.h" #include "cdp_txrx_cmn.h" #include "cdp_txrx_misc.h" +#include +#include typedef struct { int32_t rate; @@ -964,7 +966,7 @@ int wma_peer_state_change_event_handler(void *handle, return -EINVAL; } - if (vdev->opmode == wlan_op_mode_sta + if (ol_txrx_get_opmode(vdev) == wlan_op_mode_sta && event->state == WMI_PEER_STATE_AUTHORIZED) { /* * set event so that hdd @@ -976,7 +978,7 @@ int wma_peer_state_change_event_handler(void *handle, __func__); return -EINVAL; } - wma_handle->peer_authorized_cb(vdev->vdev_id); + wma_handle->peer_authorized_cb(event->vdev_id); #endif } @@ -2227,6 +2229,7 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, uint8_t proto_type = 0; #endif /* QCA_PKT_PROTO_TRACE */ struct wmi_mgmt_params mgmt_param = {0}; + ol_pdev_handle ctrl_pdev; if (NULL == wma_handle) { WMA_LOGE("wma_handle is NULL"); @@ -2457,8 +2460,12 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, return QDF_STATUS_SUCCESS; } - is_high_latency = - ol_cfg_is_high_latency(txrx_vdev->pdev->ctrl_pdev); + ctrl_pdev = ol_txrx_get_ctrl_pdev_from_vdev(txrx_vdev); + if (ctrl_pdev == NULL) { + WMA_LOGE("ol_pdev_handle is NULL\n"); + return QDF_STATUS_E_FAILURE; + } + is_high_latency = ol_cfg_is_high_latency(ctrl_pdev); downld_comp_required = tx_frm_download_comp_cb && is_high_latency; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 7c4a84bf99a9..2f8165e57963 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -69,6 +69,9 @@ #include "wma_ocb.h" #include "cdp_txrx_cfg.h" #include "cdp_txrx_flow_ctrl_legacy.h" +#include +#include +#include /** * wma_find_vdev_by_addr() - find vdev_id from mac address @@ -1018,6 +1021,7 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, uint32_t peer_tid_bitmap = PEER_ALL_TID_BITMASK; uint8_t *peer_addr = bssid; struct peer_flush_params param = {0}; + uint8_t *peer_mac_addr; if (!wma->interfaces[vdev_id].peer_count) { WMA_LOGE("%s: Can't remove peer with peer_addr %pM vdevid %d peer_count %d", @@ -1028,6 +1032,14 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, if (peer) ol_txrx_peer_detach(peer); + peer_mac_addr = ol_txrx_peer_get_peer_mac_addr(peer); + if (peer_mac_addr == NULL) { + WMA_LOGE("%s: peer mac addr is NULL, Can't remove peer with peer_addr %pM vdevid %d peer_count %d", + __func__, bssid, vdev_id, + wma->interfaces[vdev_id].peer_count); + return; + } + wma->interfaces[vdev_id].peer_count--; WMA_LOGE("%s: Removed peer with peer_addr %pM vdevid %d peer_count %d", __func__, bssid, vdev_id, wma->interfaces[vdev_id].peer_count); @@ -1040,10 +1052,10 @@ void wma_remove_peer(tp_wma_handle wma, uint8_t *bssid, wmi_unified_peer_flush_tids_send(wma->wmi_handle, bssid, ¶m); - if ((peer) && (wma_is_vdev_in_ibss_mode(wma, vdev_id))) { + if (wma_is_vdev_in_ibss_mode(wma, vdev_id)) { WMA_LOGD("%s: bssid %pM peer->mac_addr %pM", __func__, - bssid, peer->mac_addr.raw); - peer_addr = peer->mac_addr.raw; + bssid, peer_mac_addr); + peer_addr = peer_mac_addr; } wmi_unified_peer_delete_send(wma->wmi_handle, peer_addr, vdev_id); @@ -1070,6 +1082,7 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, { ol_txrx_peer_handle peer; struct peer_create_params param = {0}; + uint8_t *mac_addr_raw; if (++wma->interfaces[vdev_id].peer_count > wma->wlan_resource_config.num_peers) { @@ -1101,10 +1114,15 @@ QDF_STATUS wma_create_peer(tp_wma_handle wma, ol_txrx_pdev_handle pdev, WMA_LOGE("%s: Created peer with peer_addr %pM vdev_id %d, peer_count - %d", __func__, peer_addr, vdev_id, wma->interfaces[vdev_id].peer_count); + mac_addr_raw = ol_txrx_get_vdev_mac_addr(vdev); + if (mac_addr_raw == NULL) { + WMA_LOGE("%s: peer mac addr is NULL", __func__); + return QDF_STATUS_E_FAULT; + } + /* for each remote ibss peer, clear its keys */ if (wma_is_vdev_in_ibss_mode(wma, vdev_id) && - qdf_mem_cmp(peer_addr, vdev->mac_addr.raw, - IEEE80211_ADDR_LEN)) { + qdf_mem_cmp(peer_addr, mac_addr_raw, IEEE80211_ADDR_LEN)) { tSetStaKeyParams key_info; WMA_LOGD("%s: remote ibss peer %pM key clearing\n", __func__, @@ -1141,7 +1159,6 @@ err: static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) { ol_txrx_vdev_handle vdev; - ol_txrx_peer_handle peer, temp; if (!wma || vdev_id > wma->max_bssid) return; @@ -1151,31 +1168,9 @@ static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) return; /* remove all remote peers of IBSS */ - qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); - - temp = NULL; - TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, peer_list_elem) { - if (temp) { - qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - if (qdf_atomic_read(&temp->delete_in_progress) == 0) { - wma_remove_peer(wma, temp->mac_addr.raw, - vdev_id, temp, false); - } - qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); - } - /* self peer is deleted last */ - if (peer == TAILQ_FIRST(&vdev->peer_list)) { - WMA_LOGE("%s: self peer removed by caller ", __func__); - break; - } else - temp = peer; - } - qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - - /* remove IBSS bss peer last */ - peer = TAILQ_FIRST(&vdev->peer_list); - wma_remove_peer(wma, wma->interfaces[vdev_id].bssid, vdev_id, peer, - false); + ol_txrx_remove_peers_for_vdev(vdev, + (ol_txrx_vdev_peer_remove_cb)wma_remove_peer, wma, + true); } #else /** @@ -1210,7 +1205,6 @@ static void wma_delete_all_ibss_peers(tp_wma_handle wma, A_UINT32 vdev_id) static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) { ol_txrx_vdev_handle vdev; - ol_txrx_peer_handle peer, temp; if (!wma || vdev_id > wma->max_bssid) return; @@ -1221,28 +1215,8 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) WMA_LOGE("%s: vdev_id - %d", __func__, vdev_id); /* remove all remote peers of SAP */ - qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); - - temp = NULL; - TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, - peer_list_elem) { - if (temp) { - qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - if (qdf_atomic_read(&temp->delete_in_progress) == 0) { - wma_remove_peer(wma, temp->mac_addr.raw, - vdev_id, temp, false); - } - qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); - } - /* self peer is deleted by caller */ - if (peer == TAILQ_FIRST(&vdev->peer_list)) { - WMA_LOGE("%s: self peer removed by caller ", __func__); - break; - } else - temp = peer; - } - - qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + ol_txrx_remove_peers_for_vdev(vdev, + (ol_txrx_vdev_peer_remove_cb)wma_remove_peer, wma, false); } #ifdef QCA_IBSS_SUPPORT @@ -1258,9 +1232,12 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, uint8_t vdev_id) { ol_txrx_vdev_handle vdev; + ol_txrx_pdev_handle pdev; struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; QDF_STATUS status; + struct cdf_mac_addr *mac_addr; + uint8_t *mac_addr_raw; if (!wma) { WMA_LOGE("%s: Null wma handle", __func__); @@ -1273,9 +1250,16 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, return; } + mac_addr = ol_txrx_get_vdev_struct_mac_addr(vdev); + if (mac_addr == NULL) { + WMA_LOGE("%s: mac_addr is NULL for vdev with id %d", __func__, + vdev_id); + return; + } + qdf_copy_macaddr( - (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), - (struct qdf_mac_addr *) &(vdev->mac_addr)); + (struct cdf_mac_addr *) &(add_sta_self_param.self_mac_addr), + mac_addr); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; add_sta_self_param.sub_type = 0; @@ -1284,7 +1268,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* delete old ibss vdev */ del_sta_param.session_id = vdev_id; qdf_mem_copy((void *)del_sta_param.self_mac_addr, - (void *)&(vdev->mac_addr), QDF_MAC_ADDR_SIZE); + (void *)mac_addr, CDF_MAC_ADDR_SIZE); wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ @@ -1294,19 +1278,22 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, return; } + mac_addr_raw = ol_txrx_get_vdev_mac_addr(vdev); /* Register with TxRx Module for Data Ack Complete Cb */ ol_txrx_data_tx_cb_set(vdev, wma_data_tx_ack_comp_hdlr, wma); WMA_LOGA("new IBSS vdev created with mac %pM", add_sta_self_param.self_mac_addr); + pdev = ol_txrx_get_pdev_from_vdev(vdev); + /* create ibss bss peer */ - status = wma_create_peer(wma, vdev->pdev, vdev, vdev->mac_addr.raw, + status = wma_create_peer(wma, pdev, vdev, mac_addr_raw, WMI_PEER_TYPE_DEFAULT, vdev_id, false); if (status != QDF_STATUS_SUCCESS) WMA_LOGE("%s: Failed to create IBSS bss peer", __func__); else WMA_LOGA("IBSS BSS peer created with mac %pM", - vdev->mac_addr.raw); + mac_addr_raw); } #else /** @@ -2901,6 +2888,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct del_sta_self_params del_sta_param; tSetBssKeyParams key_info; struct sir_hw_mode_params hw_mode = {0}; + struct cdf_mac_addr *mac_addr; vdev = wma_find_vdev_by_addr(wma, add_bss->selfMacAddr, &vdev_id); if (!vdev) { @@ -2925,17 +2913,19 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) __func__, vdev_id); /* remove peers on the existing non-ibss vdev */ - TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) { - WMA_LOGE("%s: peer found for vdev id %d. deleting the peer", - __func__, vdev_id); - wma_remove_peer(wma, (uint8_t *) &vdev->mac_addr, - vdev_id, peer, false); + ol_txrx_remove_peers_for_vdev_no_lock(vdev, + (ol_txrx_vdev_peer_remove_cb)wma_remove_peer, wma); + mac_addr = ol_txrx_get_vdev_struct_mac_addr(vdev); + if (mac_addr == NULL) { + WMA_LOGE("%s: mac_addr is NULL for vdev with id %d", + __func__, vdev_id); + goto send_fail_resp; } /* remove the non-ibss vdev */ qdf_copy_macaddr( - (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), - (struct qdf_mac_addr *) &(vdev->mac_addr)); + (struct cdf_mac_addr *) &(del_sta_param.self_mac_addr), + mac_addr); del_sta_param.session_id = vdev_id; del_sta_param.status = 0; @@ -3473,7 +3463,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta) goto send_rsp; } - iface = &wma->interfaces[vdev->vdev_id]; + iface = &wma->interfaces[add_sta->smesessionId]; peer = ol_txrx_find_peer_by_addr_and_vdev(pdev, vdev, add_sta->staMac, &peer_id); @@ -3706,7 +3696,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta) qdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); peerStateParams->peerState = WMI_TDLS_PEER_STATE_PEERING; - peerStateParams->vdevId = vdev->vdev_id; + peerStateParams->vdevId = add_sta->smesessionId; qdf_mem_copy(&peerStateParams->peerMacAddr, &add_sta->staMac, sizeof(tSirMacAddr)); wma_update_tdls_peer_state(wma, peerStateParams); @@ -3826,7 +3816,9 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) status = QDF_STATUS_E_FAILURE; goto out; } - if (peer != NULL && peer->state == OL_TXRX_PEER_STATE_DISC) { + + if (peer != NULL && + (ol_txrx_get_peer_state(peer) == OL_TXRX_PEER_STATE_DISC)) { /* * This is the case for reassociation. * peer state update and peer_assoc is required since it @@ -4014,8 +4006,9 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, tpDeleteStaParams del_sta) { ol_txrx_pdev_handle pdev; - struct ol_txrx_peer_t *peer; + ol_txrx_peer_handle peer; struct wma_target_req *msg; + uint8_t *peer_mac_addr; pdev = cds_get_context(QDF_MODULE_ID_TXRX); @@ -4032,8 +4025,9 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma, del_sta->status = QDF_STATUS_E_FAILURE; goto send_del_rsp; } + peer_mac_addr = ol_txrx_peer_get_peer_mac_addr(peer); - wma_remove_peer(wma, peer->mac_addr.raw, del_sta->smesessionId, peer, + wma_remove_peer(wma, peer_mac_addr, del_sta->smesessionId, peer, false); del_sta->status = QDF_STATUS_SUCCESS; @@ -4080,34 +4074,8 @@ send_del_rsp: */ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) { - ol_txrx_pdev_handle pdev; - ol_txrx_vdev_handle vdev; - struct ol_txrx_peer_t *peer; tTdlsPeerStateParams *peerStateParams; - pdev = cds_get_context(QDF_MODULE_ID_TXRX); - - if (NULL == pdev) { - WMA_LOGE("%s: Failed to find pdev", __func__); - del_sta->status = QDF_STATUS_E_FAILURE; - goto send_del_rsp; - } - - vdev = wma_find_vdev_by_id(wma, del_sta->smesessionId); - if (!vdev) { - WMA_LOGE("%s: Failed to find vdev", __func__); - del_sta->status = QDF_STATUS_E_FAILURE; - goto send_del_rsp; - } - - peer = ol_txrx_peer_find_by_local_id(pdev, del_sta->staIdx); - if (!peer) { - WMA_LOGE("%s: Failed to get peer handle using peer id %d", - __func__, del_sta->staIdx); - del_sta->status = QDF_STATUS_E_FAILURE; - goto send_del_rsp; - } - peerStateParams = qdf_mem_malloc(sizeof(tTdlsPeerStateParams)); if (!peerStateParams) { WMA_LOGE("%s: Failed to allocate memory for peerStateParams for: %pM", @@ -4118,7 +4086,7 @@ static void wma_del_tdls_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) qdf_mem_zero(peerStateParams, sizeof(*peerStateParams)); peerStateParams->peerState = WMA_TDLS_PEER_STATE_TEARDOWN; - peerStateParams->vdevId = vdev->vdev_id; + peerStateParams->vdevId = del_sta->smesessionId; qdf_mem_copy(&peerStateParams->peerMacAddr, &del_sta->staMac, sizeof(tSirMacAddr)); @@ -4322,9 +4290,9 @@ void wma_delete_bss(tp_wma_handle wma, tpDeleteBssParams params) wma->interfaces[params->smesessionId].psnr_req = NULL; } - if (wlan_op_mode_ibss == txrx_vdev->opmode) { + if (wlan_op_mode_ibss == ol_txrx_get_opmode(txrx_vdev)) wma->ibss_started = 0; - } + if (wma_is_roam_synch_in_progress(wma, params->smesessionId)) { roam_synch_in_progress = true; WMA_LOGD("LFR3:%s: Setting vdev_up to FALSE for session %d", diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index ef525be6de37..c4477b1a498b 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -5468,7 +5468,8 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, uint32_t i; ol_txrx_pdev_handle pdev; uint8_t peer_id; - struct ol_txrx_peer_t *peer; + ol_txrx_peer_handle peer; + uint8_t *peer_mac_addr; int ret = 0; uint32_t *ch_mhz; @@ -5521,12 +5522,13 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle, ret = -EIO; goto end_tdls_peer_state; } + peer_mac_addr = ol_txrx_peer_get_peer_mac_addr(peer); WMA_LOGD("%s: calling wma_remove_peer for peer " MAC_ADDRESS_STR " vdevId: %d", __func__, - MAC_ADDR_ARRAY(peer->mac_addr.raw), + MAC_ADDR_ARRAY(peer_mac_addr), peerStateParams->vdevId); - wma_remove_peer(wma_handle, peer->mac_addr.raw, + wma_remove_peer(wma_handle, peer_mac_addr, peerStateParams->vdevId, peer, false); } diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index e7eed705db8b..f055d6f39ba3 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -67,6 +67,11 @@ #include "wma_internal.h" #include "cds_concurrency.h" #include "cdp_txrx_flow_ctrl_legacy.h" +#include +#include +#include +#include +#include /** * wma_send_bcn_buf_ll() - prepare and send beacon buffer to fw for LL @@ -1455,7 +1460,9 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) QDF_STATUS status = QDF_STATUS_SUCCESS; uint32_t i; uint32_t def_key_idx = 0; + uint32_t wlan_opmode; ol_txrx_vdev_handle txrx_vdev; + uint8_t *mac_addr; WMA_LOGD("BSS key setup"); txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); @@ -1464,13 +1471,14 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) key_info->status = QDF_STATUS_E_FAILURE; goto out; } + wlan_opmode = ol_txrx_get_opmode(txrx_vdev); /* * For IBSS, WMI expects the BSS key to be set per peer key * So cache the BSS key in the wma_handle and re-use it when the * STA key is been setup for a peer */ - if (wlan_op_mode_ibss == txrx_vdev->opmode) { + if (wlan_op_mode_ibss == wlan_opmode) { key_info->status = QDF_STATUS_SUCCESS; if (wma_handle->ibss_started > 0) goto out; @@ -1484,16 +1492,22 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) key_params.key_type = key_info->encType; key_params.singl_tid_rc = key_info->singleTidRc; key_params.unicast = false; - if (txrx_vdev->opmode == wlan_op_mode_sta) { + if (wlan_opmode == wlan_op_mode_sta) { qdf_mem_copy(key_params.peer_mac, wma_handle->interfaces[key_info->smesessionId].bssid, IEEE80211_ADDR_LEN); } else { + mac_addr = ol_txrx_get_vdev_mac_addr(txrx_vdev); + if (mac_addr == NULL) { + WMA_LOGE("%s: mac_addr is NULL for vdev with id %d", + __func__, key_info->smesessionId); + goto out; + } /* vdev mac address will be passed for all other modes */ - qdf_mem_copy(key_params.peer_mac, txrx_vdev->mac_addr.raw, + qdf_mem_copy(key_params.peer_mac, mac_addr, IEEE80211_ADDR_LEN); WMA_LOGA("BSS Key setup with vdev_mac %pM\n", - txrx_vdev->mac_addr.raw); + mac_addr); } if (key_info->numKeys == 0 && @@ -1530,7 +1544,7 @@ void wma_set_bsskey(tp_wma_handle wma_handle, tpSetBssKeyParams key_info) key_info->key[i].keyLength); status = wma_setup_install_key_cmd(wma_handle, &key_params, - txrx_vdev->opmode); + wlan_opmode); if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); @@ -1608,18 +1622,17 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, return; } - new_peer_num = vdev->ibss_peer_num + peer_num_delta; - if (new_peer_num > MAX_IBSS_PEERS || new_peer_num < 0) { + /* adjust peer numbers */ + new_peer_num = ol_txrx_update_ibss_add_peer_num_of_vdev(vdev, + peer_num_delta); + if (OL_TXRX_INVALID_NUM_PEERS == new_peer_num) { WMA_LOGE("new peer num %d out of valid boundary", new_peer_num); return; } - /* adjust peer numbers */ - vdev->ibss_peer_num = new_peer_num; - /* reset timer value if all peers departed */ if (new_peer_num == 0) { - vdev->ibss_peer_heart_beat_timer = 0; + ol_txrx_set_ibss_vdev_heart_beat_timer(vdev, 0); return; } @@ -1630,15 +1643,13 @@ void wma_adjust_ibss_heart_beat_timer(tp_wma_handle wma, new_timer_value_sec, new_peer_num); return; } - if (new_timer_value_sec == vdev->ibss_peer_heart_beat_timer) { + if (new_timer_value_sec == + ol_txrx_set_ibss_vdev_heart_beat_timer(vdev, new_timer_value_sec)) { WMA_LOGD("timer value %d stays same, no need to notify target", new_timer_value_sec); return; } - /* send new timer value to target */ - vdev->ibss_peer_heart_beat_timer = new_timer_value_sec; - new_timer_value_ms = ((uint32_t) new_timer_value_sec) * 1000; status = wma_vdev_set_param(wma->wmi_handle, vdev_id, @@ -1671,6 +1682,7 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, uint32_t i; uint32_t def_key_idx = 0; ol_txrx_vdev_handle txrx_vdev; + int opmode; WMA_LOGD("BSS key setup for peer"); txrx_vdev = wma_find_vdev_by_id(wma_handle, key_info->smesessionId); @@ -1680,12 +1692,14 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, return; } + qdf_mem_set(&key_params, sizeof(key_params), 0); + opmode = ol_txrx_get_opmode(txrx_vdev); qdf_mem_set(&key_params, sizeof(key_params), 0); key_params.vdev_id = key_info->smesessionId; key_params.key_type = key_info->encType; key_params.singl_tid_rc = key_info->singleTidRc; key_params.unicast = false; - ASSERT(wlan_op_mode_ibss == txrx_vdev->opmode); + ASSERT(wlan_op_mode_ibss == opmode); qdf_mem_copy(key_params.peer_mac, peer_macaddr.bytes, IEEE80211_ADDR_LEN); @@ -1719,7 +1733,7 @@ static void wma_set_ibsskey_helper(tp_wma_handle wma_handle, key_info->key[i].keyLength); status = wma_setup_install_key_cmd(wma_handle, &key_params, - txrx_vdev->opmode); + opmode); if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); @@ -1747,10 +1761,11 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) QDF_STATUS status = QDF_STATUS_SUCCESS; ol_txrx_pdev_handle txrx_pdev; ol_txrx_vdev_handle txrx_vdev; - struct ol_txrx_peer_t *peer; + ol_txrx_peer_handle peer; uint8_t num_keys = 0, peer_id; struct wma_set_key_params key_params; uint32_t def_key_idx = 0; + int opmode; WMA_LOGD("STA key setup"); @@ -1777,11 +1792,12 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) key_info->status = QDF_STATUS_E_FAILURE; goto out; } + opmode = ol_txrx_get_opmode(txrx_vdev); if (key_info->defWEPIdx == WMA_INVALID_KEY_IDX && (key_info->encType == eSIR_ED_WEP40 || key_info->encType == eSIR_ED_WEP104) && - txrx_vdev->opmode != wlan_op_mode_ap) { + opmode != wlan_op_mode_ap) { wma_read_cfg_wepkey(wma_handle, key_info->key, &def_key_idx, &num_keys); key_info->defWEPIdx = def_key_idx; @@ -1828,7 +1844,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) key_params.key_len = key_info->key[i].keyLength; status = wma_setup_install_key_cmd(wma_handle, &key_params, - txrx_vdev->opmode); + opmode); if (status == QDF_STATUS_E_NOMEM) { WMA_LOGE("%s:Failed to setup install key buf", __func__); @@ -1850,7 +1866,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info) /* In IBSS mode, set the BSS KEY for this peer * BSS key is supposed to be cache into wma_handle */ - if (wlan_op_mode_ibss == txrx_vdev->opmode) { + if (wlan_op_mode_ibss == opmode) { wma_set_ibsskey_helper(wma_handle, &wma_handle->ibsskey_info, key_info->peer_macaddr); } @@ -2691,9 +2707,7 @@ wma_is_ccmp_pn_replay_attack(void *cds_ctx, struct ieee80211_frame *wh, } new_pn = wma_extract_ccmp_pn(ccmp_ptr); - last_pn_valid = &peer->last_rmf_pn_valid; - last_pn = &peer->last_rmf_pn; - rmf_pn_replays = &peer->rmf_pn_replays; + ol_txrx_get_pn_info(peer, &last_pn_valid, &last_pn, &rmf_pn_replays); if (*last_pn_valid) { if (new_pn > *last_pn) { diff --git a/core/wma/src/wma_ocb.c b/core/wma/src/wma_ocb.c index 624912eafc0e..8cfde6e8614f 100644 --- a/core/wma/src/wma_ocb.c +++ b/core/wma/src/wma_ocb.c @@ -34,6 +34,7 @@ #include "wma_ocb.h" #include "wmi_unified_api.h" #include "cds_utils.h" +#include /** * wma_ocb_resp() - send the OCB set config response via callback @@ -48,36 +49,40 @@ int wma_ocb_set_config_resp(tp_wma_handle wma_handle, uint8_t status) struct sir_ocb_config *req = wma_handle->ocb_config_req; ol_txrx_vdev_handle vdev = (req ? wma_handle->interfaces[req->session_id].handle : NULL); + struct ol_txrx_ocb_set_chan ocb_set_chan; /* * If the command was successful, save the channel information in the * vdev. */ if (status == QDF_STATUS_SUCCESS && vdev && req) { - if (vdev->ocb_channel_info) - qdf_mem_free(vdev->ocb_channel_info); - vdev->ocb_channel_count = + ocb_set_chan.ocb_channel_info = ol_txrx_get_ocb_chan_info(vdev); + if (ocb_set_chan.ocb_channel_info) + qdf_mem_free(ocb_set_chan.ocb_channel_info); + ocb_set_chan.ocb_channel_count = req->channel_count; if (req->channel_count) { int i; - int buf_size = sizeof(*vdev->ocb_channel_info) * + int buf_size = sizeof(*ocb_set_chan.ocb_channel_info) * req->channel_count; - vdev->ocb_channel_info = + ocb_set_chan.ocb_channel_info = qdf_mem_malloc(buf_size); - if (!vdev->ocb_channel_info) + if (!ocb_set_chan.ocb_channel_info) return -ENOMEM; - qdf_mem_zero(vdev->ocb_channel_info, buf_size); + qdf_mem_zero(ocb_set_chan.ocb_channel_info, buf_size); for (i = 0; i < req->channel_count; i++) { - vdev->ocb_channel_info[i].chan_freq = + ocb_set_chan.ocb_channel_info[i].chan_freq = req->channels[i].chan_freq; if (req->channels[i].flags & OCB_CHANNEL_FLAG_DISABLE_RX_STATS_HDR) - vdev->ocb_channel_info[i]. + ocb_set_chan.ocb_channel_info[i]. disable_rx_stats_hdr = 1; } } else { - vdev->ocb_channel_info = 0; + ocb_set_chan.ocb_channel_info = 0; + ocb_set_chan.ocb_channel_count = 0; } + ol_txrx_set_ocb_chan_info(vdev, ocb_set_chan); } /* Free the configuration that was saved in wma_ocb_set_config. */ diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index d6c6f7954ac2..2cc648d1f120 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -44,6 +44,8 @@ #include "wni_cfg.h" #include "cfg_api.h" #include "wlan_tgt_def_config.h" +#include +#include #include "qdf_nbuf.h" #include "qdf_types.h" @@ -4911,10 +4913,10 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload) { ol_txrx_vdev_handle vdev; - struct txrx_pdev_cfg_t *cfg; int32_t intra_bss_fwd = 0; struct ipa_offload_control_params params = {0}; QDF_STATUS status; + uint8_t rx_fwd_disabled; if (!wma || !wma->wmi_handle) { WMA_LOGE("%s: WMA is closed, can not issue cmd", @@ -4955,11 +4957,11 @@ QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, return QDF_STATUS_SUCCESS; /* Disable Intra-BSS FWD offload when gDisableIntraBssFwd=1 in INI */ - cfg = (struct txrx_pdev_cfg_t *)vdev->pdev->ctrl_pdev; - if (!ipa_offload->enable || cfg->rx_fwd_disabled) { + rx_fwd_disabled = ol_txrx_is_rx_fwd_disabled(vdev); + if (!ipa_offload->enable || rx_fwd_disabled) { WMA_LOGE("%s: ipa_offload->enable=%d, rx_fwd_disabled=%d", __func__, - ipa_offload->enable, cfg->rx_fwd_disabled); + ipa_offload->enable, rx_fwd_disabled); intra_bss_fwd = 1; } -- cgit v1.2.3 From 3454fd61da8d7d9ffa748c0359912ab60a61cf7e Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Fri, 1 Apr 2016 08:52:06 -0700 Subject: qcacld-3.0: Data path changes to use converged APIs (Part 5) Changes in the data path to use the converged MCL specific APIs. Change-Id: Iaedc5e7e175d6b8eb905a04178fe9772dc7bb797 CRs-Fixed: 994638 --- core/dp/ol/inc/ol_txrx_ctrl_api.h | 153 ----------------------------------- core/dp/ol/inc/ol_txrx_osif_api.h | 1 + core/dp/txrx/ol_tx.c | 1 + core/dp/txrx/ol_tx_queue.c | 3 + core/dp/txrx/ol_tx_send.c | 21 ++++- core/dp/txrx/ol_txrx.c | 39 ++++++++- core/hdd/inc/wlan_hdd_main.h | 1 + core/hdd/inc/wlan_hdd_softap_tx_rx.h | 1 + core/hdd/src/wlan_hdd_hostapd.c | 1 + core/hdd/src/wlan_hdd_ipa.c | 1 + core/hdd/src/wlan_hdd_main.c | 1 + core/hdd/src/wlan_hdd_ocb.c | 1 + core/hdd/src/wlan_hdd_wext.c | 1 + core/wma/src/wma_data.c | 2 + core/wma/src/wma_features.c | 3 + 15 files changed, 73 insertions(+), 157 deletions(-) diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h index 5e426e9265ae..203eb6983526 100644 --- a/core/dp/ol/inc/ol_txrx_ctrl_api.h +++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h @@ -397,26 +397,6 @@ ol_txrx_peer_keyinstalled_state_update(ol_txrx_peer_handle data_peer, ol_txrx_peer_handle ol_txrx_peer_find_by_addr(ol_txrx_pdev_handle pdev, uint8_t *peer_mac_addr); -/** - * @brief Find a txrx peer handle from a peer's local ID - * @details - * The control SW typically uses the txrx peer handle to refer to the peer. - * In unusual circumstances, if it is infeasible for the control SW maintain - * the txrx peer handle but it can maintain a small integer local peer ID, - * this function allows the peer handled to be retrieved, based on the local - * peer ID. - * - * @param pdev - the data physical device object - * @param local_peer_id - the ID txrx assigned locally to the peer in question - * @return handle to the txrx peer object - */ -#if QCA_SUPPORT_TXRX_LOCAL_PEER_ID -ol_txrx_peer_handle -ol_txrx_peer_find_by_local_id(ol_txrx_pdev_handle pdev, uint8_t local_peer_id); -#else -#define ol_txrx_peer_find_by_local_id(pdev, local_peer_id) NULL -#endif - struct ol_txrx_peer_stats_t { struct { struct { @@ -468,7 +448,6 @@ QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id); void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id); - #define OL_TXRX_INVALID_LOCAL_PEER_ID 0xffff #define OL_TXRX_RSSI_INVALID 0xffff @@ -498,67 +477,6 @@ int16_t ol_txrx_peer_rssi(ol_txrx_peer_handle peer); #define ol_txrx_peer_rssi(peer) OL_TXRX_RSSI_INVALID #endif /* QCA_SUPPORT_PEER_DATA_RX_RSSI */ -#if QCA_SUPPORT_TXRX_LOCAL_PEER_ID -#else -#endif - -#ifdef QCA_COMPUTE_TX_DELAY -/** - * @brief updates the compute interval period for TSM stats. - * @details - * @param interval - interval for stats computation - */ -void ol_tx_set_compute_interval(ol_txrx_pdev_handle pdev, uint32_t interval); - -/** - * @brief Return the uplink (transmitted) packet count and loss count. - * @details - * This function will be called for getting uplink packet count and - * loss count for given stream (access category) a regular interval. - * This also resets the counters hence, the value returned is packets - * counted in last 5(default) second interval. These counter are - * incremented per access category in ol_tx_completion_handler() - * - * @param category - access category of interest - * @param out_packet_count - number of packets transmitted - * @param out_packet_loss_count - number of packets lost - */ -void -ol_tx_packet_count(ol_txrx_pdev_handle pdev, - uint16_t *out_packet_count, - uint16_t *out_packet_loss_count, int category); -#endif - -/** - * @brief Return the average delays for tx frames. - * @details - * Return the average of the total time tx frames spend within the driver - * and the average time tx frames take to be transmitted. - * These averages are computed over a 5 second time interval. - * These averages are computed separately for separate access categories, - * if the QCA_COMPUTE_TX_DELAY_PER_AC flag is set. - * - * @param pdev - the data physical device instance - * @param queue_delay_microsec - average time tx frms spend in the WLAN driver - * @param tx_delay_microsec - average time for frames to be transmitted - * @param category - category (TID) of interest - */ -#ifdef QCA_COMPUTE_TX_DELAY -void -ol_tx_delay(ol_txrx_pdev_handle pdev, - uint32_t *queue_delay_microsec, - uint32_t *tx_delay_microsec, int category); -#else -static inline void -ol_tx_delay(ol_txrx_pdev_handle pdev, - uint32_t *queue_delay_microsec, - uint32_t *tx_delay_microsec, int category) -{ - /* no-op version if QCA_COMPUTE_TX_DELAY is not set */ - *queue_delay_microsec = *tx_delay_microsec = 0; -} -#endif - /* * Bins used for reporting delay histogram: * bin 0: 0 - 10 ms delay @@ -569,77 +487,6 @@ ol_tx_delay(ol_txrx_pdev_handle pdev, * bin 5: > 160 ms delay */ #define QCA_TX_DELAY_HIST_REPORT_BINS 6 -/** - * @brief Provide a histogram of tx queuing delays. - * @details - * Return a histogram showing the number of tx frames of the specified - * category for each of the delay levels in the histogram bin spacings - * listed above. - * These histograms are computed over a 5 second time interval. - * These histograms are computed separately for separate access categories, - * if the QCA_COMPUTE_TX_DELAY_PER_AC flag is set. - * - * @param pdev - the data physical device instance - * @param bin_values - an array of QCA_TX_DELAY_HIST_REPORT_BINS elements - * This array gets filled in with the histogram bin counts. - * @param category - category (TID) of interest - */ -#ifdef QCA_COMPUTE_TX_DELAY -void -ol_tx_delay_hist(ol_txrx_pdev_handle pdev, uint16_t *bin_values, int category); -#else -static inline void -ol_tx_delay_hist(ol_txrx_pdev_handle pdev, uint16_t *bin_values, int category) -{ - /* no-op version if QCA_COMPUTE_TX_DELAY is not set */ - qdf_assert(bin_values); - qdf_mem_zero(bin_values, - QCA_TX_DELAY_HIST_REPORT_BINS * sizeof(*bin_values)); -} -#endif - -#if defined(QCA_SUPPORT_TX_THROTTLE) -/** - * @brief Set the thermal mitgation throttling level. - * @details - * This function applies only to LL systems. This function is used set the - * tx throttle level used for thermal mitigation - * - * @param pdev - the physics device being throttled - */ -void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev, int level); -#else -static inline void ol_tx_throttle_set_level(struct ol_txrx_pdev_t *pdev, - int level) -{ - /* no-op */ -} -#endif /* QCA_SUPPORT_TX_THROTTLE */ - -#if defined(QCA_SUPPORT_TX_THROTTLE) -/** - * @brief Configure the thermal mitgation throttling period. - * @details - * This function applies only to LL systems. This function is used set the - * period over which data will be throttled - * - * @param pdev - the physics device being throttled - */ -void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, int period); -#else -static inline void ol_tx_throttle_init_period(struct ol_txrx_pdev_t *pdev, - int period) -{ - /* no-op */ -} -#endif /* QCA_SUPPORT_TX_THROTTLE */ - -void ol_txrx_display_stats(uint16_t bitmap); -void ol_txrx_clear_stats(uint16_t bitmap); -int ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len); - -QDF_STATUS ol_txrx_register_ocb_peer(void *cds_ctx, uint8_t *mac_addr, - uint8_t *peer_id); void ol_txrx_set_ocb_peer(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer); diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h index 54da414e82b9..007e1c43e290 100644 --- a/core/dp/ol/inc/ol_txrx_osif_api.h +++ b/core/dp/ol/inc/ol_txrx_osif_api.h @@ -35,6 +35,7 @@ #include /* qdf_nbuf_t */ #include "cds_sched.h" #include "ol_txrx_ctrl_api.h" +#include /** * struct ol_rx_cached_buf - rx cached buffer diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 1c9219cd3039..3b324abfd5d8 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -52,6 +52,7 @@ #include /* Layering violation, but required for fast path */ #include #include /* htc_endpoint */ +#include int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus, unsigned int num_msdus, unsigned int transfer_id); diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c index 6aa2cd7a306b..b0cfe07763ac 100644 --- a/core/dp/txrx/ol_tx_queue.c +++ b/core/dp/txrx/ol_tx_queue.c @@ -30,6 +30,9 @@ #include /* ol_cfg_addba_retry */ #include /* HTT_TX_EXT_TID_MGMT */ #include /* htt_tx_desc_tid */ +#include /* ol_txrx_vdev_handle */ +#include /* ol_txrx_sync, ol_tx_addba_conf */ +#include #include /* ol_ctrl_addba_req */ #include /* TXRX_ASSERT1, etc. */ #include /* ol_tx_desc, ol_tx_desc_frame_list_free */ diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c index cd3cd8868c7f..c09d1091022a 100644 --- a/core/dp/txrx/ol_tx_send.c +++ b/core/dp/txrx/ol_tx_send.c @@ -43,6 +43,8 @@ #include /* htt_tx_status */ #include +#include +#include /* ol_txrx_vdev_t, etc */ #include /* ol_tx_desc_find, ol_tx_desc_frame_free */ #ifdef QCA_COMPUTE_TX_DELAY #endif @@ -651,12 +653,29 @@ ol_tx_inspect_handler(ol_txrx_pdev_handle pdev, } #ifdef QCA_COMPUTE_TX_DELAY - +/** + * @brief updates the compute interval period for TSM stats. + * @details + * @param interval - interval for stats computation + */ void ol_tx_set_compute_interval(ol_txrx_pdev_handle pdev, uint32_t interval) { pdev->tx_delay.avg_period_ticks = qdf_system_msecs_to_ticks(interval); } +/** + * @brief Return the uplink (transmitted) packet count and loss count. + * @details + * This function will be called for getting uplink packet count and + * loss count for given stream (access category) a regular interval. + * This also resets the counters hence, the value returned is packets + * counted in last 5(default) second interval. These counter are + * incremented per access category in ol_tx_completion_handler() + * + * @param category - access category of interest + * @param out_packet_count - number of packets transmitted + * @param out_packet_loss_count - number of packets lost + */ void ol_tx_packet_count(ol_txrx_pdev_handle pdev, uint16_t *out_packet_count, diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index a4a7b66db025..77c48f304270 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -50,6 +50,9 @@ #include #include #include +#include +#include +#include /* header files for our internal definitions */ #include /* TXRX_ASSERT, etc. */ #include /* WDI events */ @@ -67,6 +70,7 @@ #include #include #include "wma.h" +#include #ifndef REMOVE_PKT_LOG #include "pktlog_ac.h" #endif @@ -185,6 +189,19 @@ uint16_t ol_txrx_local_peer_id(ol_txrx_peer_handle peer) return peer->local_id; } +/** + * @brief Find a txrx peer handle from a peer's local ID + * @details + * The control SW typically uses the txrx peer handle to refer to the peer. + * In unusual circumstances, if it is infeasible for the control SW maintain + * the txrx peer handle but it can maintain a small integer local peer ID, + * this function allows the peer handled to be retrieved, based on the local + * peer ID. + * + * @param pdev - the data physical device object + * @param local_peer_id - the ID txrx assigned locally to the peer in question + * @return handle to the txrx peer object + */ ol_txrx_peer_handle ol_txrx_peer_find_by_local_id(struct ol_txrx_pdev_t *pdev, uint8_t local_peer_id) @@ -1860,9 +1877,25 @@ ol_txrx_get_ocb_chan_info(ol_txrx_vdev_handle vdev) return vdev->ocb_channel_info; } -QDF_STATUS -ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, - enum ol_txrx_peer_state state) +/** + * @brief specify the peer's authentication state + * @details + * Specify the peer's authentication state (none, connected, authenticated) + * to allow the data SW to determine whether to filter out invalid data frames. + * (In the "connected" state, where security is enabled, but authentication + * has not completed, tx and rx data frames other than EAPOL or WAPI should + * be discarded.) + * This function is only relevant for systems in which the tx and rx filtering + * are done in the host rather than in the target. + * + * @param data_peer - which peer has changed its state + * @param state - the new state of the peer + * + * Return: CDF Status + */ +QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, + uint8_t *peer_mac, + enum ol_txrx_peer_state state) { struct ol_txrx_peer_t *peer; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index bb4e0103552c..0833b9ef8831 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -66,6 +66,7 @@ #include "ol_txrx_ctrl_api.h" #include #include "cdp_txrx_flow_ctrl_legacy.h" +#include /*--------------------------------------------------------------------------- Preprocessor definitions and constants diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 45312fb316a5..6fdf85a983b9 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -35,6 +35,7 @@ */ #include +#include int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 6a076eeae76d..0bd09531c3f5 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 046921d71abc..215797222035 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "cds_sched.h" diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 7e0835caf793..13b4693e18e9 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -57,6 +57,7 @@ #include "wlan_hdd_stats.h" #include "qdf_types.h" #include "qdf_trace.h" +#include #include #include diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index f7c240e5fd14..ecfa1d6cf39d 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -40,6 +40,7 @@ #include "sch_api.h" #include "wma_api.h" #include "ol_txrx.h" +#include /* Structure definitions for WLAN_SET_DOT11P_CHANNEL_SCHED */ #define AIFSN_MIN (2) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index f11628c6d006..6ed2c32f2151 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "sir_params.h" #include "csr_api.h" #include "csr_inside_api.h" diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index eaa85c57cd46..22f727255185 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -42,6 +42,8 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" +#include "ol_txrx_ctrl_api.h" +#include #include "wlan_tgt_def_config.h" #include "qdf_nbuf.h" diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index c4477b1a498b..ad74ab301fff 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -43,7 +43,10 @@ #include "wmi_unified.h" #include "wni_cfg.h" #include "cfg_api.h" +#include "ol_txrx_ctrl_api.h" +#include #include "wlan_tgt_def_config.h" +#include #include "qdf_nbuf.h" #include "qdf_types.h" -- cgit v1.2.3 From 2593a640d4c7cdddca3d0c4133e04c3a32115597 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Fri, 1 Apr 2016 08:53:35 -0700 Subject: qcacld-3.0: Replace cdf references with qdf Replace cdf references with qdf. Change-Id: Ifba0c1045af57e285c87017e62ae240c2faa28ff CRs-Fixed: 994638 --- core/dp/txrx/ol_txrx.c | 20 ++++++++++---------- core/hdd/src/wlan_hdd_assoc.c | 2 +- core/wma/src/wma_dev_if.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 77c48f304270..c79498657c96 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1689,16 +1689,16 @@ ol_txrx_get_vdev_mac_addr(ol_txrx_vdev_handle vdev) } /** - * ol_txrx_get_vdev_struct_mac_addr() - Return handle to struct cdf_mac_addr of + * ol_txrx_get_vdev_struct_mac_addr() - Return handle to struct qdf_mac_addr of * vdev * @vdev: vdev handle * - * Return: Handle to struct cdf_mac_addr + * Return: Handle to struct qdf_mac_addr */ -struct cdf_mac_addr * +struct qdf_mac_addr * ol_txrx_get_vdev_struct_mac_addr(ol_txrx_vdev_handle vdev) { - return (struct cdf_mac_addr *)&(vdev->mac_addr); + return (struct qdf_mac_addr *)&(vdev->mac_addr); } /** @@ -1794,18 +1794,18 @@ ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev, { ol_txrx_peer_handle peer, temp; /* remove all remote peers for vdev */ - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); temp = NULL; TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t, peer_list_elem) { if (temp) { - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); - if (cdf_atomic_read(&temp->delete_in_progress) == 0) { + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + if (qdf_atomic_read(&temp->delete_in_progress) == 0) { callback(callback_context, temp->mac_addr.raw, vdev->vdev_id, temp, false); } - cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex); } /* self peer is deleted last */ if (peer == TAILQ_FIRST(&vdev->peer_list)) { @@ -1824,7 +1824,7 @@ ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev, vdev->vdev_id, peer, false); } - cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); + qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex); } /** @@ -1891,7 +1891,7 @@ ol_txrx_get_ocb_chan_info(ol_txrx_vdev_handle vdev) * @param data_peer - which peer has changed its state * @param state - the new state of the peer * - * Return: CDF Status + * Return: QDF Status */ QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev, uint8_t *peer_mac, diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 8f5e5678c63f..1a7a15758891 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1191,7 +1191,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, { QDF_STATUS err; uint8_t *peer_mac_addr; - struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX); + struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX); ol_txrx_vdev_handle vdev; ol_txrx_peer_handle peer; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2f8165e57963..d7a51952fc4b 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1236,7 +1236,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, struct add_sta_self_params add_sta_self_param; struct del_sta_self_params del_sta_param; QDF_STATUS status; - struct cdf_mac_addr *mac_addr; + struct qdf_mac_addr *mac_addr; uint8_t *mac_addr_raw; if (!wma) { @@ -1258,7 +1258,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, } qdf_copy_macaddr( - (struct cdf_mac_addr *) &(add_sta_self_param.self_mac_addr), + (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), mac_addr); add_sta_self_param.session_id = vdev_id; add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; @@ -1268,7 +1268,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, /* delete old ibss vdev */ del_sta_param.session_id = vdev_id; qdf_mem_copy((void *)del_sta_param.self_mac_addr, - (void *)mac_addr, CDF_MAC_ADDR_SIZE); + (void *)mac_addr, QDF_MAC_ADDR_SIZE); wma_vdev_detach(wma, &del_sta_param, 0); /* create new vdev for ibss */ @@ -2888,7 +2888,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct del_sta_self_params del_sta_param; tSetBssKeyParams key_info; struct sir_hw_mode_params hw_mode = {0}; - struct cdf_mac_addr *mac_addr; + struct qdf_mac_addr *mac_addr; vdev = wma_find_vdev_by_addr(wma, add_bss->selfMacAddr, &vdev_id); if (!vdev) { @@ -2924,7 +2924,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) /* remove the non-ibss vdev */ qdf_copy_macaddr( - (struct cdf_mac_addr *) &(del_sta_param.self_mac_addr), + (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), mac_addr); del_sta_param.session_id = vdev_id; del_sta_param.status = 0; -- cgit v1.2.3 From 59e44b029c7a43372030f15a7a0d685179d64483 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Fri, 1 Apr 2016 16:50:30 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1F Incremental CLD3.1 Release 5.1.0.1F after relocating the driver development to new branch and path. Change-Id: Ic34b6e6f810f1ab32eaefe0b624b4183b86a43cf CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 656fe22fd2f0..45d99ae7b42f 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "E" +#define QWLAN_VERSION_EXTRA "F" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1E" +#define QWLAN_VERSIONSTR "5.1.0.1F" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From e068982a92a3610344bce1b0f7d1cd173bae24e8 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Mon, 4 Apr 2016 09:53:13 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1G Incremental CLD3.1 Release 5.1.0.1G after relocating the driver development to new branch and path. Change-Id: Ib75f16fb56ab6a9306f09377bb3df2094d0fc516 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 45d99ae7b42f..dbcca69a3e49 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "F" +#define QWLAN_VERSION_EXTRA "G" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1F" +#define QWLAN_VERSIONSTR "5.1.0.1G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 50141c53a3a95dffda046201526093487a3ef437 Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Thu, 7 Apr 2016 13:15:29 -0700 Subject: qcacld-3.0: Register vdev before registering peer Ensure that the per vdev rx callback is registered before registering the peer. The peer registration function may try to flush the rx frames so we need to ensure that the rx callback is registered before it is called. Change-Id: Ibd1d73d89105bbc3f9d29fa2c64e9f515d4b0da5 CRs-Fixed: 1000834 --- core/dp/txrx/ol_txrx.c | 5 +++-- core/hdd/src/wlan_hdd_assoc.c | 31 +++++++++++++++---------------- core/hdd/src/wlan_hdd_ocb.c | 14 +++++++------- core/hdd/src/wlan_hdd_softap_tx_rx.c | 16 ++++++++-------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index c79498657c96..11e862e7a821 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -1389,7 +1389,7 @@ void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer, qdf_spin_lock_bh(&peer->peer_info_lock); - if (peer->state >= OL_TXRX_PEER_STATE_CONN) + if (peer->state >= OL_TXRX_PEER_STATE_CONN && peer->vdev->rx) data_rx = peer->vdev->rx; else drop = true; @@ -3461,7 +3461,8 @@ static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, goto free_buf; qdf_spin_lock_bh(&peer->peer_info_lock); - if (qdf_unlikely(!(peer->state >= OL_TXRX_PEER_STATE_CONN))) { + if (qdf_unlikely(!(peer->state >= OL_TXRX_PEER_STATE_CONN) || + !peer->vdev->rx)) { qdf_spin_unlock_bh(&peer->peer_info_lock); goto free_buf; } diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 1a7a15758891..07e3f2450cb3 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1303,6 +1303,14 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, staDesc.is_wapi_supported = 0; #endif /* FEATURE_WLAN_WAPI */ + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), + pAdapter, &txrx_ops); + pAdapter->tx_fn = txrx_ops.tx.tx; + qdf_status = ol_txrx_register_peer(&staDesc); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { @@ -1312,14 +1320,6 @@ static QDF_STATUS hdd_roam_register_sta(hdd_adapter_t *pAdapter, return qdf_status; } - /* Register the vdev transmit and receive functions */ - qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); - txrx_ops.rx.rx = hdd_rx_packet_cbk; - ol_txrx_vdev_register( - ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), - pAdapter, &txrx_ops); - pAdapter->tx_fn = txrx_ops.tx.tx; - if (!pRoamInfo->fAuthRequired) { /* * Connections that do not need Upper layer auth, transition @@ -2868,6 +2868,13 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, (hdd_wmm_is_active(pAdapter)) ? (staDesc.is_qos_enabled = 1) : (staDesc.is_qos_enabled = 0); + /* Register the vdev transmit and receive functions */ + qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); + txrx_ops.rx.rx = hdd_rx_packet_cbk; + ol_txrx_vdev_register( + ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), + pAdapter, &txrx_ops); + pAdapter->tx_fn = txrx_ops.tx.tx; /* Register the Station with TL... */ qdf_status = ol_txrx_register_peer(&staDesc); @@ -2877,14 +2884,6 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, return qdf_status; } - /* Register the vdev transmit and receive functions */ - qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); - txrx_ops.rx.rx = hdd_rx_packet_cbk; - ol_txrx_vdev_register( - ol_txrx_get_vdev_from_vdev_id(pAdapter->sessionId), - pAdapter, &txrx_ops); - pAdapter->tx_fn = txrx_ops.tx.tx; - return qdf_status; } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index ecfa1d6cf39d..0a5c267ea6d9 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -263,13 +263,6 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) sta_desc.sta_id = peer_id; sta_desc.is_qos_enabled = 1; - qdf_status = ol_txrx_register_peer(&sta_desc); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - hddLog(LOGE, FL("Failed to register. Status= %d [0x%08X]"), - qdf_status, qdf_status); - return -EINVAL; - } - /* Register the vdev transmit and receive functions */ qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); txrx_ops.rx.rx = hdd_rx_packet_cbk; @@ -278,6 +271,13 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter) adapter, &txrx_ops); adapter->tx_fn = txrx_ops.tx.tx; + qdf_status = ol_txrx_register_peer(&sta_desc); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + hddLog(LOGE, FL("Failed to register. Status= %d [0x%08X]"), + qdf_status, qdf_status); + return -EINVAL; + } + if (pHddStaCtx->conn_info.staId[0] != 0 && pHddStaCtx->conn_info.staId[0] != peer_id) { hddLog(LOGE, FL("The ID for the OCB station has changed.")); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index d73f07e8a6f1..faf3fbe53a87 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -706,14 +706,6 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, "HDD SOFTAP register TL QoS_enabled=%d", staDesc.is_qos_enabled); - qdf_status = ol_txrx_register_peer(&staDesc); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, - "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", - qdf_status, qdf_status); - return qdf_status; - } - /* Register the vdev transmit and receive functions */ qdf_mem_zero(&txrx_ops, sizeof(txrx_ops)); txrx_ops.rx.rx = hdd_softap_rx_packet_cbk; @@ -722,6 +714,14 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter, pAdapter, &txrx_ops); pAdapter->tx_fn = txrx_ops.tx.tx; + qdf_status = ol_txrx_register_peer(&staDesc); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, + "SOFTAP ol_txrx_register_peer() failed to register. Status= %d [0x%08X]", + qdf_status, qdf_status); + return qdf_status; + } + /* if ( WPA ), tell TL to go to 'connected' and after keys come to the * driver then go to 'authenticated'. For all other authentication * types (those that do not require upper layer authentication) we can -- cgit v1.2.3 From 88fdf825d4848f54258f25cb8b7a75db500a2094 Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Tue, 12 Apr 2016 14:03:33 -0700 Subject: cld-3.0: Incremental CLD3.1 Release 5.1.0.1H Incremental CLD3.1 Release on top of 5.1.0.1G with data path fix. Change-Id: I3838483c0e1c7e3b698433fa74563e535e7cd309 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index dbcca69a3e49..f2dd78f3ca47 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "G" +#define QWLAN_VERSION_EXTRA "H" #define QWLAN_VERSION_BUILD 1 -#define QWLAN_VERSIONSTR "5.1.0.1G" +#define QWLAN_VERSIONSTR "5.1.0.1H" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From aea89633d6ebdb4e53b90c412f2dfa03223c1a96 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Tue, 2 Feb 2016 18:02:32 -0800 Subject: qcacld-3.0: Set wow enable parameter in WMA properly WoW is getting enabled even in disconnected state when PNO, EXT_SCAN or LPASS is not enabled. Enable wow only when one of interface is in beaconing mode, connected state or PNO/EXT_SCAN/LPASS is enabled. Change-Id: I30226700844c9b4adbe3a0659a270b99dc6e66f8 CRs-Fixed: 971738 --- core/wma/src/wma_features.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index ad74ab301fff..a68cade641d8 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3364,8 +3364,9 @@ bool wma_is_extscan_in_progress(tp_wma_handle wma, int vdev_id) * 2) Is any one of vdev in connected state (in STA mode) ? * 3) Is PNO in progress in any one of vdev ? * 4) Is Extscan in progress in any one of vdev ? + * If none of above conditions is true then return false * - * Return: true if wma needs to configure wow. + * Return: true if wma needs to configure wow false otherwise. */ bool wma_is_wow_applicable(tp_wma_handle wma) { @@ -3389,7 +3390,7 @@ bool wma_is_wow_applicable(tp_wma_handle wma) } WMA_LOGD("All vdev are in disconnected state and pno/extscan is not in progress, skipping wow"); - return true; + return false; } /** -- cgit v1.2.3 From c45db899eb6ef40e9ccc9642872513dd6a48fd5a Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Fri, 13 Nov 2015 19:59:25 -0800 Subject: qcacld-3.0: Prevent runtime suspend untill clean-up completes qcacld-2.0 to qcacld-3.0 propagation When runtime suspend fails because of wma_suspend_req() not completing in time, PM runtime workqueue posts resume request to MC thread to clean-up. If MC thread is busy or slow in processing resume request and after the timeout Runtime PM framework posts another suspend request then there may be race condition between MC thread processing resume request (Or even suspend request) and Runtime PM workqueue posting subsequent suspend request. Synchronize subsequent suspend request by not allowing the runtime suspend till resume requests completes in MC thread context. Change-Id: Ie9aaf72fbced41f8d23640b9032a3c2236dc6826 CRs-fixed: 921373 --- core/wma/inc/wma.h | 1 + core/wma/src/wma_features.c | 21 +++++++++++++++++++-- core/wma/src/wma_main.c | 5 +++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 364aeb47f084..bb3f24ea13c1 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1351,6 +1351,7 @@ typedef struct { tpSirBssDescription bss_desc_ptr); qdf_wake_lock_t wmi_cmd_rsp_wake_lock; qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock; + qdf_runtime_lock_t wma_runtime_resume_lock; uint32_t fine_time_measurement_cap; struct wma_ini_config ini_config; } t_wma_handle, *tp_wma_handle; diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index a68cade641d8..07c85455c37b 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -2983,6 +2983,9 @@ QDF_STATUS wma_resume_req(tp_wma_handle wma, enum qdf_suspend_type type) wmi_set_runtime_pm_inprogress(wma->wmi_handle, false); + if (type == QDF_RUNTIME_SUSPEND) + qdf_runtime_pm_allow_suspend(wma->wma_runtime_resume_lock); + return QDF_STATUS_SUCCESS; } @@ -4881,10 +4884,22 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, static QDF_STATUS wma_post_runtime_resume_msg(WMA_HANDLE handle) { cds_msg_t resume_msg; + QDF_STATUS status; + tp_wma_handle wma = (tp_wma_handle) handle; + + qdf_runtime_pm_prevent_suspend(wma->wma_runtime_resume_lock); resume_msg.bodyptr = NULL; resume_msg.type = WMA_RUNTIME_PM_RESUME_IND; - return cds_mq_post_message(QDF_MODULE_ID_WMA, &resume_msg); + + status = cds_mq_post_message(QDF_MODULE_ID_WMA, &resume_msg); + + if (!QDF_IS_STATUS_SUCCESS(status)) { + WMA_LOGE("Failed to post Runtime PM Resume IND to VOS"); + qdf_runtime_pm_allow_suspend(wma->wma_runtime_resume_lock); + } + + return status; } /** @@ -4915,11 +4930,13 @@ static QDF_STATUS wma_post_runtime_suspend_msg(WMA_HANDLE handle) WMA_TGT_SUSPEND_COMPLETE_TIMEOUT) != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get runtime suspend event"); - goto failure; + goto msg_timed_out; } return QDF_STATUS_SUCCESS; +msg_timed_out: + wma_post_runtime_resume_msg(wma); failure: return QDF_STATUS_E_AGAIN; } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index d52b44637165..625ae4e83b41 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -1665,6 +1665,9 @@ QDF_STATUS wma_open(void *cds_context, wma_handle->qdf_dev = qdf_dev; wma_handle->max_scan = mac_params->max_scan; + wma_handle->wma_runtime_resume_lock = + qdf_runtime_lock_init("wma_runtime_resume"); + /* initialize default target config */ wma_set_default_tgt_config(wma_handle); @@ -2075,6 +2078,8 @@ err_wma_handle: #endif /* FEATURE_WLAN_EXTSCAN */ qdf_wake_lock_destroy(&wma_handle->wow_wake_lock); } + + qdf_runtime_lock_deinit(wma_handle->wma_runtime_resume_lock); cds_free_context(cds_context, QDF_MODULE_ID_WMA, wma_handle); WMA_LOGD("%s: Exit", __func__); -- cgit v1.2.3 From 6639d325cb9ffd7ed5fa9a808ed0c7d3fa4ad40b Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Mon, 1 Feb 2016 14:24:17 +0530 Subject: qcacld-3.0: Move DBS opportunistic timer out of HDD context Move the DBS opportunistic timer out, from the HDD context to the CDS context. Change-Id: I57cb3010bc1ba4ce3736edc6c4c1f4c32f226144 CRs-Fixed: 970163 --- core/cds/inc/cds_sched.h | 2 ++ core/cds/src/cds_concurrency.c | 33 +++++++++++++++++++-------------- core/hdd/inc/wlan_hdd_main.h | 1 - core/hdd/src/wlan_hdd_main.c | 11 ----------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index 6a1bb7eb009f..e07f15143455 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -48,6 +48,7 @@ #include #include #include "qdf_lock.h" +#include "qdf_mc_timer.h" #define TX_POST_EVENT_MASK 0x001 #define TX_SUSPEND_EVENT_MASK 0x002 @@ -286,6 +287,7 @@ typedef struct _cds_context_type { qdf_spinlock_t bug_report_lock; qdf_event_t connection_update_done_evt; qdf_mutex_t qdf_conc_list_lock; + qdf_mc_timer_t dbs_opportunistic_timer; } cds_context_type, *p_cds_contextType; diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 68b239d3bde1..3d07ac71c81e 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3687,15 +3687,8 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, uint8_t session_id) { QDF_STATUS qdf_status; - hdd_context_t *hdd_ctx; cds_context_type *cds_ctx; - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - if (!hdd_ctx) { - cds_err("HDD context is NULL"); - return; - } - cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); @@ -3722,9 +3715,9 @@ void cds_decr_session_set_pcl(enum tQDF_ADAPTER_MODE mode, /* do we need to change the HW mode */ if (cds_need_opportunistic_upgrade()) { /* let's start the timer */ - qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); + qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer); qdf_status = qdf_mc_timer_start( - &hdd_ctx->dbs_opportunistic_timer, + &cds_ctx->dbs_opportunistic_timer, DBS_OPPORTUNISTIC_TIME * 1000); if (!QDF_IS_STATUS_SUCCESS(qdf_status)) @@ -3791,7 +3784,7 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, /** * cds_dbs_opportunistic_timer_handler() - handler of * dbs_opportunistic_timer - * @data: HDD context + * @data: CDS context * * handler for dbs_opportunistic_timer * @@ -3800,9 +3793,8 @@ void cds_decr_active_session(enum tQDF_ADAPTER_MODE mode, void cds_dbs_opportunistic_timer_handler(void *data) { enum cds_conc_next_action action = CDS_NOP; - cds_context_type *cds_ctx; + cds_context_type *cds_ctx = (cds_context_type *)data; - cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); if (!cds_ctx) { cds_err("Invalid CDS Context"); return; @@ -3846,6 +3838,19 @@ QDF_STATUS cds_deinit_policy_mgr(void) cds_err("Failed to destroy qdf_conc_list_lock"); return QDF_STATUS_E_FAILURE; } + + if (QDF_TIMER_STATE_RUNNING == + qdf_mc_timer_get_current_state( + &cds_ctx->dbs_opportunistic_timer)) { + qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer); + } + + if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_destroy( + &cds_ctx->dbs_opportunistic_timer))) { + cds_err("Cannot deallocate dbs opportunistic timer"); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; } @@ -3889,10 +3894,10 @@ QDF_STATUS cds_init_policy_mgr(void) sme_register_hw_mode_trans_cb(hdd_ctx->hHal, cds_hw_mode_transition_cb); - status = qdf_mc_timer_init(&hdd_ctx->dbs_opportunistic_timer, + status = qdf_mc_timer_init(&cds_ctx->dbs_opportunistic_timer, QDF_TIMER_TYPE_SW, cds_dbs_opportunistic_timer_handler, - (void *)hdd_ctx); + (void *)cds_ctx); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("Failed to init DBS opportunistic timer"); return status; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 0833b9ef8831..010211d3eca4 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1320,7 +1320,6 @@ struct hdd_context_s { bool memdump_in_progress; #endif /* WLAN_FEATURE_MEMDUMP */ - qdf_mc_timer_t dbs_opportunistic_timer; bool connection_in_progress; qdf_spinlock_t connection_status_lock; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 13b4693e18e9..b6d9e5721d8a 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3725,17 +3725,6 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) FL("Cannot deallocate ACS Skip timer")); } #endif - if (QDF_TIMER_STATE_RUNNING == - qdf_mc_timer_get_current_state( - &hdd_ctx->dbs_opportunistic_timer)) { - qdf_mc_timer_stop(&hdd_ctx->dbs_opportunistic_timer); - } - - if (!QDF_IS_STATUS_SUCCESS - (qdf_mc_timer_destroy( - &hdd_ctx->dbs_opportunistic_timer))) { - hdd_err("Cannot deallocate dbs opportunistic timer"); - } /* * Powersave Offload Case -- cgit v1.2.3 From e716c40025b110dbb7dd63cac476056588f8cbd5 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Fri, 29 Jan 2016 11:30:15 +0530 Subject: qcacld-3.0: Set hw mode during channel switch in SAP/P2P-GO case Set the hw mode, if needed, during channel switch in SAP and P2P-GO scenario. Change-Id: Icef31277465b3a298695ccefb856d9cad8a16108 CRs-Fixed: 969307 --- core/cds/inc/cds_concurrency.h | 2 + core/cds/src/cds_concurrency.c | 129 ++++++++++++++++++++++++++++++- core/mac/inc/sir_api.h | 2 + core/sap/src/sap_api_link_cntl.c | 160 +++++++++++++++++++++++++++++++++++++-- core/sme/inc/csr_api.h | 3 +- core/sme/src/common/sme_api.c | 7 ++ 6 files changed, 294 insertions(+), 9 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index f01ee4c6f986..09b88bac167b 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -463,6 +463,8 @@ struct cds_conc_connection_info { bool in_use; }; +enum cds_conc_next_action cds_get_pref_hw_mode_for_chan(uint32_t vdev_id, + uint32_t target_channel); bool cds_is_connection_in_progress(void); void cds_dump_concurrency_info(void); void cds_set_concurrency_mode(enum tQDF_ADAPTER_MODE mode); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 3d07ac71c81e..1b645c9d0501 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3593,6 +3593,12 @@ enum cds_conc_next_action cds_need_opportunistic_upgrade(void) /* Are both mac's still in use*/ for (conn_index = 0; conn_index < MAX_NUMBER_OF_CONC_CONNECTIONS; conn_index++) { + cds_debug("index:%d mac:%d in_use:%d chan:%d org_nss:%d", + conn_index, + conc_connection_list[conn_index].mac, + conc_connection_list[conn_index].in_use, + conc_connection_list[conn_index].chan, + conc_connection_list[conn_index].original_nss); if ((conc_connection_list[conn_index].mac == 0) && conc_connection_list[conn_index].in_use) { mac |= 1; @@ -3608,8 +3614,10 @@ enum cds_conc_next_action cds_need_opportunistic_upgrade(void) #ifdef QCA_WIFI_3_0_EMU /* For M2M emulation only: if we have a connection on 2.4, stay in DBS */ if (hdd_ctx->config->enable_m2m_limitation && - CDS_IS_CHANNEL_24GHZ(conc_connection_list[0].chan)) + CDS_IS_CHANNEL_24GHZ(conc_connection_list[0].chan)) { + cds_debug("For emulation only: connection on 2.4, stay in DBS"); goto done; + } #endif /* Let's request for single MAC mode */ upgrade = CDS_MCC; @@ -3803,6 +3811,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); /* if we still need it */ action = cds_need_opportunistic_upgrade(); + cds_info("action:%d", action); if (action) { /* lets call for action */ /* session id is being used only @@ -7854,3 +7863,121 @@ QDF_STATUS qdf_init_connection_update(void) return QDF_STATUS_SUCCESS; } + +/** + * cds_get_pref_hw_mode_for_chan() - Get preferred hw mode for new channel + * @vdev_id: vdev id whose target channel needs to change + * @target_channel: Target channel + * + * Get the preferred hw mode based on the vdev whose channel is going to change + * + * Return: No change (CDS_NOP), MCC (CDS_MCC_UPGRADE), DBS (CDS_DBS_DOWNGRADE) + */ +enum cds_conc_next_action cds_get_pref_hw_mode_for_chan(uint32_t vdev_id, + uint32_t target_channel) +{ + uint32_t num_connections; + uint32_t conn_index = 0; + bool found = false; + uint8_t old_band, new_band; + + while (CONC_CONNECTION_LIST_VALID_INDEX(conn_index)) { + if ((vdev_id == conc_connection_list[conn_index].vdev_id) && + (conc_connection_list[conn_index].in_use == true)) { + found = true; + break; + } + conn_index++; + } + + if (!found) { + cds_err("vdev_id:%d not available in the conn info", vdev_id); + return CDS_NOP; + } + + old_band = cds_chan_to_band(conc_connection_list[conn_index].chan); + new_band = cds_chan_to_band(target_channel); + + num_connections = cds_get_connection_count(); + + cds_debug("vdev_id:%d conn_index:%d target_channel:%d chan[0]:%d chan[1]:%d chan[2]:%d num_connections:%d", + vdev_id, conn_index, target_channel, + conc_connection_list[0].chan, conc_connection_list[1].chan, + conc_connection_list[2].chan, + num_connections); + + /* If the band of the new channel to which the switching is done is same + * as the band of the old channel, then there is no need for a hw mode + * change. The driver would already be in the required hw mode. + */ + if (old_band == new_band) + return CDS_NOP; + + switch (num_connections) { + case 1: + /* The driver would already be in the required hw mode */ + return CDS_NOP; + case 2: + /* If the band of the new channel, is same as that of the band + * of the channel on the other interface, the driver needs to + * move to single MAC. + * + * If the band of the new channel, is different than that of the + * band of the channel on the other interface, the driver needs + * to move to DBS. + */ + if (conn_index == 0) { + if (new_band == cds_chan_to_band( + conc_connection_list[1].chan)) + return CDS_MCC_UPGRADE; + else if (new_band != cds_chan_to_band( + conc_connection_list[1].chan)) + return CDS_DBS_DOWNGRADE; + } else { + if (new_band == cds_chan_to_band( + conc_connection_list[0].chan)) + return CDS_MCC_UPGRADE; + else if (new_band != cds_chan_to_band( + conc_connection_list[0].chan)) + return CDS_DBS_DOWNGRADE; + } + case 3: + /* If the band of the new channel, is same as that of the band + * of the channel on the other two interfaces, the driver needs + * to move to single MAC. + * + * If the band of the new channel, is different than that of the + * band of the channel on the other two interfaces, the driver + * needs to move to DBS. + */ + if (conn_index == 0) { + if ((new_band == cds_chan_to_band( + conc_connection_list[1].chan)) && + (new_band == cds_chan_to_band( + conc_connection_list[2].chan))) + return CDS_MCC_UPGRADE; + else + return CDS_DBS_DOWNGRADE; + } else if (conn_index == 1) { + if ((new_band == cds_chan_to_band( + conc_connection_list[0].chan)) && + (new_band == cds_chan_to_band( + conc_connection_list[2].chan))) + return CDS_MCC_UPGRADE; + else + return CDS_DBS_DOWNGRADE; + } else { + if ((new_band == cds_chan_to_band( + conc_connection_list[0].chan)) && + (new_band == cds_chan_to_band( + conc_connection_list[1].chan))) + return CDS_MCC_UPGRADE; + else + return CDS_DBS_DOWNGRADE; + } + default: + cds_err("unexpected num_connections value %d", + num_connections); + return CDS_NOP; + } +} diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index c9a60954aba6..e0aa3801b0b8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -104,6 +104,7 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN]; * @CDS_UPDATE_REASON_HIDDEN_STA: Connection to Hidden STA * @CDS_UPDATE_REASON_OPPORTUNISTIC: Opportunistic HW mode update * @CDS_UPDATE_REASON_NSS_UPDATE: NSS update + * @CDS_UPDATE_REASON_CHANNEL_SWITCH: Channel switch */ enum cds_conn_update_reason { CDS_UPDATE_REASON_SET_OPER_CHAN, @@ -114,6 +115,7 @@ enum cds_conn_update_reason { CDS_UPDATE_REASON_HIDDEN_STA, CDS_UPDATE_REASON_OPPORTUNISTIC, CDS_UPDATE_REASON_NSS_UPDATE, + CDS_UPDATE_REASON_CHANNEL_SWITCH, }; typedef enum { diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 99b11857ba94..09fed3226582 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -48,9 +48,13 @@ #include "qdf_trace.h" /* Pick up the CSR callback definition */ #include "csr_api.h" +#include "ani_global.h" +#include "csr_inside_api.h" #include "sme_api.h" /* SAP Internal API header file */ #include "sap_internal.h" +#include "cds_concurrency.h" +#include "wma.h" /*---------------------------------------------------------------------------- * Preprocessor Definitions and Constants @@ -495,8 +499,130 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, } /** - * wlansap_roam_process_dfs_chansw_update_fail() - handles the case for - * eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE in wlansap_roam_callback() + * wlansap_set_hw_mode_on_channel_switch() - Set hw mode before channel switch + * @sap_ctx: Global SAP context + * @target_channel: Target channel + * + * Sets hw mode, if needed, before doing a channel switch + * + * Return: None + */ +static QDF_STATUS wlansap_set_hw_mode_on_channel_switch(tpAniSirGlobal mac_ctx, + ptSapContext sap_ctx, + uint32_t target_channel) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE, qdf_status; + cds_context_type *cds_ctx; + enum cds_conc_next_action action; + + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); + if (!cds_ctx) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Invalid CDS Context")); + return status; + } + + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); + + action = cds_get_pref_hw_mode_for_chan(sap_ctx->sessionId, + target_channel); + + if ((action != CDS_DBS_DOWNGRADE) && (action != CDS_MCC_UPGRADE)) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Invalid action: %d"), action); + goto done; + } + + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + FL("action:%d session id:%d"), + action, sap_ctx->sessionId); + + /* For MCC, opportunistic timer will be trigerred. We do not + * want to do hw mode change here to avoid the ping pong effect. + * e.g., If a new connection is immediately coming up, we could be + * moving in and out of MCC. The timer after DBS_OPPORTUNISTIC_TIME + * seconds will check if the driver can move to MCC or not. + * + * 1. Start opportunistic timer + * 2. Do vdev restart on the new channel + * 3. PM will check if MCC upgrade can be done after timer expiry + */ + if (action == CDS_MCC_UPGRADE) { + qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer); + qdf_status = qdf_mc_timer_start( + &cds_ctx->dbs_opportunistic_timer, + DBS_OPPORTUNISTIC_TIME * + 1000); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Failed to start dbs opportunistic timer")); + else + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, + FL("opportunistic timer for MCC upgrade")); + goto done; + } + + /* For DBS, we want to move right away to DBS mode. Else, we could + * be doing MCC momentarily. + * + * 1. PM will initiate HW mode change to DBS rightaway + * 2. Do vdev restart on the new channel + */ + status = cds_next_actions(sap_ctx->sessionId, action, + CDS_UPDATE_REASON_CHANNEL_SWITCH); + if (!QDF_IS_STATUS_SUCCESS(status)) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("no set hw mode command was issued")); + goto done; + } +done: + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); + /* success must be returned only when a set hw mode was done */ + return status; +} + +/** + * wlansap_update_hw_mode() - Set the hw mode for the new channel switch + * @hal: HAL pointer + * @sap_ctx: SAP context + * + * Sets the hw mode, if needed, for the driver based on the new channel + * to which the vdev is going to switch to + * + * Return: None + */ +void wlansap_update_hw_mode(tHalHandle hal, ptSapContext sap_ctx) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + tCsrRoamInfo roam_info = {0}; + + if (mac_ctx->policy_manager_enabled && + wma_is_hw_dbs_capable() == true) { + status = wlansap_set_hw_mode_on_channel_switch(mac_ctx, sap_ctx, + mac_ctx->sap.SapDfsInfo.target_channel); + } + + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + FL("status:%d"), status); + + /* + * If no set hw mode was done, proceed as before by doing set channel. + * If set hw mode was done, perform the following in the callback so + * that the set channel operations are done after the driver moves to + * the required hw mode. + */ + if (!QDF_IS_STATUS_SUCCESS(status)) { + csr_roam_call_callback(mac_ctx, sap_ctx->sessionId, + &roam_info, 0, + eCSR_ROAM_STATUS_UPDATE_HW_MODE, + eCSR_ROAM_RESULT_UPDATE_HW_MODE); + } +} + +/** + * wlansap_roam_process_dfs_chansw_update() - handles the case for + * eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS in wlansap_roam_callback() * * @hal: hal global context * @sap_ctx: sap context @@ -505,7 +631,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, * Return: void */ static void -wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, +wlansap_roam_process_dfs_chansw_update(tHalHandle hHal, ptSapContext sap_ctx, QDF_STATUS *ret_status) { @@ -531,8 +657,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal, return; } /* - * Both success and failure cases are handled intentionally handled - * together. Irrespective of whether the channel switch IE was sent out + * Irrespective of whether the channel switch IE was sent out * successfully or not, SAP should still vacate the channel immediately */ if (eSAP_STARTED != sap_ctx->sapsMachine) { @@ -965,6 +1090,10 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received Chan Sw Update Notification")); break; + case eCSR_ROAM_STATUS_UPDATE_HW_MODE: + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + FL("Received HW mode update notification")); + break; case eCSR_ROAM_SET_CHANNEL_RSP: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Received set channel response")); @@ -1180,8 +1309,25 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, &qdf_ret_status); break; case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS: - case eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE: - wlansap_roam_process_dfs_chansw_update_fail(hal, sap_ctx, + /* eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS indicates the + * completion of sending (E)CSA IEs. After these IEs are sent, + * in eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS state, check + * for DBS downgrade/MCC upgrade is done. + * (1) From this state + * eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS, on MCC upgrade, + * transition immediately happens to the state + * eCSR_ROAM_RESULT_UPDATE_HW_MODE, where the vdev restart + * happens internally. + * (2) From this state, + * eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS, on DBS downgrade, + * transition happens to the state + * eCSR_ROAM_RESULT_UPDATE_HW_MODE to do vdev restart only after + * SME received the set HW mode response. + */ + wlansap_update_hw_mode(hal, sap_ctx); + break; + case eCSR_ROAM_RESULT_UPDATE_HW_MODE: + wlansap_roam_process_dfs_chansw_update(hal, sap_ctx, &qdf_ret_status); break; case eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS: diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index a359244f55cb..fbcccfe2dfd6 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -497,6 +497,7 @@ typedef enum { /* Channel sw update notification */ eCSR_ROAM_DFS_CHAN_SW_NOTIFY, eCSR_ROAM_EXT_CHG_CHNL_IND, + eCSR_ROAM_STATUS_UPDATE_HW_MODE, } eRoamCmdStatus; /* comment inside indicates what roaming callback gets */ @@ -590,8 +591,8 @@ typedef enum { eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS, eCSR_ROAM_RESULT_CHANNEL_CHANGE_FAILURE, eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS, - eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_FAILURE, eCSR_ROAM_EXT_CHG_CHNL_UPDATE_IND, + eCSR_ROAM_RESULT_UPDATE_HW_MODE, } eCsrRoamResult; /*---------------------------------------------------------------------------- diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1fbe9cf90788..9af459f7bd78 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -155,6 +155,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) struct sir_set_hw_mode_resp *param; enum cds_conn_update_reason reason; tSmeCmd *saved_cmd; + tCsrRoamInfo roam_info = {0}; sms_log(mac, LOG1, FL("%s"), __func__); param = (struct sir_set_hw_mode_resp *)msg; @@ -227,6 +228,12 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) saved_cmd = NULL; mac->sme.saved_scan_cmd = NULL; } + } else if (reason == CDS_UPDATE_REASON_CHANNEL_SWITCH) { + csr_roam_call_callback(mac, + command->u.set_hw_mode_cmd.session_id, + &roam_info, 0, + eCSR_ROAM_STATUS_UPDATE_HW_MODE, + eCSR_ROAM_RESULT_UPDATE_HW_MODE); } else { sms_log(mac, LOGE, FL("Calling HDD callback for HW mode response")); -- cgit v1.2.3 From 8104abd5a902dceb4e998dc46b514b8cce986ded Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Fri, 29 Jan 2016 18:10:27 +0530 Subject: qcacld-3.0: Restrict channel switch only to the intended interface Ensure that application triggered channel switch impacts only the interface of interest. eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START gets used for both radar detected channel switch and application triggered channel switch using ioctl or nl commands. On radar detected channel switch, if radar was detected by one of the SAP interface, all SAP interfaces in the driver would vacate the channel. In application triggered channel switch, only the interface of interest should vacate the channel. Change-Id: I8eee8bde89ae44eec31c1bd35a99a78e517b4a5e CRs-Fixed: 969323 --- core/sap/src/sap_fsm.c | 19 +++++++++++++++++++ core/sap/src/sap_fsm_ext.h | 1 + core/sap/src/sap_module.c | 7 +++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 11bedb3613bb..f1122249349e 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -3594,6 +3594,25 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx, (void *) temp_sap_ctx); } } + } else if (eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START == msg) { + enum tQDF_ADAPTER_MODE persona; + + if (!sap_ctx) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Invalid sap_ctx")); + return qdf_status; + } + + persona = mac_ctx->sap.sapCtxList[sap_ctx->sessionId]. + sapPersona; + + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED, + FL("app trigger chan switch: mode:%d vdev:%d"), + persona, sap_ctx->sessionId); + + if ((QDF_SAP_MODE == persona) || (QDF_P2P_GO_MODE == persona)) + qdf_status = wlansap_dfs_send_csa_ie_request( + (void *) sap_ctx); } else { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("in state %s, invalid event msg %d"), diff --git a/core/sap/src/sap_fsm_ext.h b/core/sap/src/sap_fsm_ext.h index ad98431f2924..170f1f5bd0a9 100644 --- a/core/sap/src/sap_fsm_ext.h +++ b/core/sap/src/sap_fsm_ext.h @@ -54,6 +54,7 @@ typedef enum { eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START, eSAP_OPERATING_CHANNEL_CHANGED, eSAP_CHANNEL_SELECTION_RETRY, + eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START, eSAP_NO_MSG } eSapMsg_t; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 47d38b6e6083..31450eccc537 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1558,12 +1558,12 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, sap_cac_reset_notify(hHal); /* - * Post the eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START + * Post the eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START * to SAP state machine to process the channel * request with CSA IE set in the beacons. */ sapEvent.event = - eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START; + eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START; sapEvent.params = 0; sapEvent.u1 = 0; sapEvent.u2 = 0; @@ -1586,8 +1586,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, } QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: Posted eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START" - "successfully to sap_fsm for Channel = %d", + "%s: Posted eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START successfully to sap_fsm for Channel = %d", __func__, targetChannel); return QDF_STATUS_SUCCESS; -- cgit v1.2.3 From ce7ab08669c68a842d78b2858b566fceaa7a1055 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Tue, 2 Feb 2016 10:24:15 +0530 Subject: qcacld-3.0: Update the policy manager table during channel switch Update the policy manager table during channel switch in case of STA/CLI/SAP/P2P-GO mode. The vdev (re)start response carries the updated vdev parameters such as the new MAC to which the vdev connection moved to etc. Change-Id: I55a56acdba8234e09d1439698b2b13751d4e9b2d CRs-Fixed: 970794 --- core/cds/src/cds_concurrency.c | 2 ++ core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 1b645c9d0501..dea6bf2ce9a6 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -4134,6 +4134,8 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id) return status; } + cds_debug("update PM connection table for vdev:%d", vdev_id); + /* add the entry */ cds_update_conc_list(conn_index, cds_get_mode(wma_conn_table_entry->type, diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 546e76da279b..8cc9c9371d2e 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -52,6 +52,7 @@ #include "wma_types.h" #include "cds_utils.h" #include "lim_types.h" +#include "cds_concurrency.h" #define MAX_SUPPORTED_PEERS_WEP 16 @@ -3680,6 +3681,10 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) gpchangeChannelData, psessionEntry); } + /* If MCC upgrade/DBS downgrade happended during channel switch, + * the policy manager connection table needs to be updated. + */ + cds_update_connection_info(psessionEntry->smeSessionId); break; case LIM_SWITCH_CHANNEL_SAP_DFS: { @@ -3693,6 +3698,10 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) */ lim_send_sme_ap_channel_switch_resp(pMac, psessionEntry, pChnlParams); + /* If MCC upgrade/DBS downgrade happended during channel switch, + * the policy manager connection table needs to be updated. + */ + cds_update_connection_info(psessionEntry->smeSessionId); } break; default: -- cgit v1.2.3 From 5738eb0fe82421a66fefa0dfe8f48324aa19fa2e Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Tue, 2 Feb 2016 12:22:00 +0530 Subject: qcacld-3.0: Fix extraction of invalid PE session entry during Nss update Ensure that the PE session is extracted using the SME session id during Nss update request. The Nss update request carries the SME session id and not the PE session id. Fixing the implementation by invoking pe_find_session_by_sme_session_id() to extract the PE session entry using the SME session id, instead of pe_find_session_by_session_id() which uses the PE session id. Change-Id: If388fa917635c7a536d21fcfb664b081babd5c2a CRs-Fixed: 970802 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index d71fa9701f6b..e588228df023 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -5676,7 +5676,7 @@ static void lim_process_nss_update_request(tpAniSirGlobal mac_ctx, } nss_update_req_ptr = (struct sir_nss_update_request *)msg_buf; - session_entry = pe_find_session_by_session_id(mac_ctx, + session_entry = pe_find_session_by_sme_session_id(mac_ctx, nss_update_req_ptr->vdev_id); if (session_entry == NULL) { lim_log(mac_ctx, LOGE, FL( -- cgit v1.2.3 From abc98d148330267f4f7efffcd01ed7659aac4c42 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 4 Feb 2016 10:25:27 +0530 Subject: qcacld-3.0: Log the channel switch IEs to debug any related issue Log the channel switch and extended channel switch information element along with the wide channel bandwidth sub element to debug any channel switch related issues. Since the IEs are populated only during channel switch, this logging of the IEs from the beacon should not have any impact in performance. Change-Id: I7a7e0dcf45f39fb6e4d049dde0b02289bde1d4f7 CRs-Fixed: 972007 --- core/mac/src/pe/sch/sch_beacon_gen.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index efb73f488d8c..bd57105238dc 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -288,10 +288,17 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) /* Initialize the 'new' fields at the end of the beacon */ if ((session->limSystemRole == eLIM_AP_ROLE) && - session->dfsIncludeChanSwIe == true) + session->dfsIncludeChanSwIe == true) { populate_dot_11_f_ext_chann_switch_ann(mac_ctx, &bcn_2->ext_chan_switch_ann, session); + sch_log(mac_ctx, LOG1, + FL("ecsa: mode:%d reg:%d chan:%d count:%d"), + bcn_2->ext_chan_switch_ann.switch_mode, + bcn_2->ext_chan_switch_ann.new_reg_class, + bcn_2->ext_chan_switch_ann.new_channel, + bcn_2->ext_chan_switch_ann.switch_count); + } populate_dot11_supp_operating_classes(mac_ctx, &bcn_2->SuppOperatingClasses, session); @@ -315,6 +322,11 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) */ populate_dot11f_chan_switch_ann(mac_ctx, &bcn_2->ChanSwitchAnn, session); + sch_log(mac_ctx, LOG1, + FL("csa: mode:%d chan:%d count:%d"), + bcn_2->ChanSwitchAnn.switchMode, + bcn_2->ChanSwitchAnn.newChannel, + bcn_2->ChanSwitchAnn.switchCount); /* * TODO: depending the CB mode, extended channel switch @@ -338,9 +350,19 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) * Populate the Channel Switch Wrapper Element if * SAP operates in 40/80 Mhz Channel Width. */ - if (true == session->dfsIncludeChanWrapperIe) + if (true == session->dfsIncludeChanWrapperIe) { populate_dot11f_chan_switch_wrapper(mac_ctx, &bcn_2->ChannelSwitchWrapper, session); + sch_log(mac_ctx, LOG1, + FL("wrapper: width:%d f0:%d f1:%d"), + bcn_2->ChannelSwitchWrapper. + WiderBWChanSwitchAnn.newChanWidth, + bcn_2->ChannelSwitchWrapper. + WiderBWChanSwitchAnn.newCenterChanFreq0, + bcn_2->ChannelSwitchWrapper. + WiderBWChanSwitchAnn.newCenterChanFreq1 + ); + } } } -- cgit v1.2.3 From ada5faca16ef33859db170e0d1790ac9d2fab6e7 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 28 Jan 2016 16:24:32 -0800 Subject: qcacld-3.0: Fix names for lim_process_assoc_req_frame.c This patch fixes: 1) Fixes variable names as per linux kernel coding guidelines. 2) Removes PELOG definitions. 3) Fixes few of long debug prints. 4) Fixes function headers for file lim_process_assoc_req_frame.c. This patch is then used as base for reindentation of function lim_process_assoc_req_frame() Change-Id: I5d4a39356b4555789ca9119f54a54766594b26c3 CRs-Fixed: 824222 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 1482 ++++++++++----------- 1 file changed, 732 insertions(+), 750 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 2754cbb7309c..6611b7f98b58 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -26,15 +26,8 @@ */ /* - * This file lim_process_assoc_req_frame.cc contains the code + * This file lim_process_assoc_req_frame.c contains the code * for processing Re/Association Request Frame. - * Author: Chandra Modumudi - * Date: 03/18/02 - * History:- - * Date Modified by Modification Information - * -------------------------------------------------------------------- - * 05/26/10 js WPA handling in (Re)Assoc frames - * */ #include "cds_api.h" #include "ani_global.h" @@ -75,9 +68,9 @@ lim_convert_supported_channels(tpAniSirGlobal mac_ctx, tpLimMlmAssocInd assoc_ind, tSirAssocReq *assoc_req) { uint16_t i, j, index = 0; - uint8_t first_chn_no; + uint8_t first_ch_no; uint8_t chn_count; - uint8_t next_chn_no; + uint8_t next_ch_no; uint8_t channel_offset = 0; if (assoc_req->supportedChannels.length >= @@ -91,45 +84,42 @@ lim_convert_supported_channels(tpAniSirGlobal mac_ctx, for (i = 0; i < (assoc_req->supportedChannels.length); i++) { /* Get First Channel Number */ - first_chn_no = - assoc_req->supportedChannels.supportedChannels[i]; - assoc_ind->supportedChannels.channelList[index] = - first_chn_no; + first_ch_no = assoc_req->supportedChannels.supportedChannels[i]; + assoc_ind->supportedChannels.channelList[index] = first_ch_no; i++; index++; /* Get Number of Channels in a Subband */ - chn_count = - assoc_req->supportedChannels.supportedChannels[i]; - PELOG2(lim_log(mac_ctx, LOG2, + chn_count = assoc_req->supportedChannels.supportedChannels[i]; + lim_log(mac_ctx, LOG2, FL("Rcv assoc_req: chnl=%d, numOfChnl=%d "), - first_chn_no, chn_count);) + first_ch_no, chn_count); if (index >= SIR_MAX_SUPPORTED_CHANNEL_LIST) { - PELOG2(lim_log(mac_ctx, LOGW, - FL("Channel count is more than max supported =%d "), - chn_count);) + lim_log(mac_ctx, LOGW, + FL("Ch count > max supported =%d "), + chn_count); assoc_ind->supportedChannels.numChnl = 0; return; } if (chn_count <= 1) continue; - next_chn_no = first_chn_no; - if (SIR_BAND_5_GHZ == lim_get_rf_band(first_chn_no)) + next_ch_no = first_ch_no; + if (SIR_BAND_5_GHZ == lim_get_rf_band(first_ch_no)) channel_offset = SIR_11A_FREQUENCY_OFFSET; - else if (SIR_BAND_2_4_GHZ == lim_get_rf_band(first_chn_no)) + else if (SIR_BAND_2_4_GHZ == lim_get_rf_band(first_ch_no)) channel_offset = SIR_11B_FREQUENCY_OFFSET; else continue; for (j = 1; j < chn_count; j++) { - next_chn_no += channel_offset; + next_ch_no += channel_offset; assoc_ind->supportedChannels.channelList[index] - = next_chn_no; + = next_ch_no; index++; if (index >= SIR_MAX_SUPPORTED_CHANNEL_LIST) { - PELOG2(lim_log(mac_ctx, LOGW, - FL("Channel count is more than supported =%d "), - chn_count);) + lim_log(mac_ctx, LOGW, + FL("Ch count > supported =%d "), + chn_count); assoc_ind->supportedChannels.numChnl = 0; return; } @@ -137,135 +127,129 @@ lim_convert_supported_channels(tpAniSirGlobal mac_ctx, } assoc_ind->supportedChannels.numChnl = (uint8_t) index; - PELOG2(lim_log(mac_ctx, LOG2, + lim_log(mac_ctx, LOG2, FL("Send AssocInd to WSM: minPwr %d, maxPwr %d, numChnl %d"), assoc_ind->powerCap.minTxPower, assoc_ind->powerCap.maxTxPower, - assoc_ind->supportedChannels.numChnl);) + assoc_ind->supportedChannels.numChnl); } -/**--------------------------------------------------------------- - \fn lim_check_sta_in_pe_entries - \brief This function is called by lim_process_assoc_req_frame() - \ to check if STA entry already exists in any of the - \ PE entries of the AP. If it exists, deauth will be - \ sent on that session and the STA deletion will - \ happen. After this, the ASSOC request will be - \ processed - \ - \param pMac - A pointer to Global MAC structure - \param pHdr - A pointer to the MAC header - \return None - ------------------------------------------------------------------*/ -void lim_check_sta_in_pe_entries(tpAniSirGlobal pMac, tpSirMacMgmtHdr pHdr) +/** + * lim_check_sta_in_pe_entries() - checks if sta exists in any dph tables. + * @mac_ctx: Pointer to Global MAC structure + * @hdr: A pointer to the MAC header + * + * This function is called by lim_process_assoc_req_frame() to check if STA + * entry already exists in any of the PE entries of the AP. If it exists, deauth + * will be sent on that session and the STA deletion will happen. After this, + * the ASSOC request will be processed + * + * Return: void + */ +void lim_check_sta_in_pe_entries(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr) { uint8_t i; - uint16_t assocId = 0; - tpDphHashNode pStaDs = NULL; - tpPESession psessionEntry = NULL; - - for (i = 0; i < pMac->lim.maxBssId; i++) { - if ((&pMac->lim.gpSession[i] != NULL) && - (pMac->lim.gpSession[i].valid) && - (pMac->lim.gpSession[i].pePersona == QDF_SAP_MODE)) { - - psessionEntry = &pMac->lim.gpSession[i]; - pStaDs = dph_lookup_hash_entry(pMac, pHdr->sa, &assocId, - &psessionEntry->dph. - dphHashTable); - if (pStaDs + uint16_t assoc_id = 0; + tpDphHashNode sta_ds = NULL; + tpPESession session = NULL; + + for (i = 0; i < mac_ctx->lim.maxBssId; i++) { + if ((&mac_ctx->lim.gpSession[i] != NULL) && + (mac_ctx->lim.gpSession[i].valid) && + (mac_ctx->lim.gpSession[i].pePersona == QDF_SAP_MODE)) { + session = &mac_ctx->lim.gpSession[i]; + sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa, + &assoc_id, &session->dph.dphHashTable); + if (sta_ds #ifdef WLAN_FEATURE_11W - && !pStaDs->rmfEnabled + && !sta_ds->rmfEnabled #endif ) { - lim_log(pMac, LOGE, - FL - ("Sending Deauth and Deleting existing STA entry: " - MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(psessionEntry-> - selfMacAddr)); - lim_send_deauth_mgmt_frame(pMac, - eSIR_MAC_UNSPEC_FAILURE_REASON, - (uint8_t *) pHdr->sa, - psessionEntry, false); - lim_trigger_sta_deletion(pMac, pStaDs, - psessionEntry); + lim_log(mac_ctx, LOGE, + FL("Sending Deauth and Deleting existing STA entry: " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(session->selfMacAddr)); + lim_send_deauth_mgmt_frame(mac_ctx, + eSIR_MAC_UNSPEC_FAILURE_REASON, + (uint8_t *) hdr->sa, session, false); + lim_trigger_sta_deletion(mac_ctx, sta_ds, + session); break; } } } } -/**--------------------------------------------------------------- - \fn lim_process_assoc_req_frame - \brief This function is called by limProcessMessageQueue() - \ upon Re/Association Request frame reception in - \ BTAMP AP or Soft AP role. - \ - \param pMac - \param *pRxPacketInfo - A pointer to Buffer descriptor + associated PDUs - \param subType - Indicates whether it is Association Request(=0) - \ or Reassociation Request(=1) frame - \return None - ------------------------------------------------------------------*/ +/** + * lim_process_assoc_req_frame() - Process RE/ASSOC Request frame. + * @mac_ctx: Pointer to Global MAC structure + * @rx_pkt_info: A pointer to Buffer descriptor + associated PDUs + * @sub_type: Indicates whether it is Association Request(=0) + * or Reassociation Request(=1) frame + * @session: pe session entry + * + * This function is called to process RE/ASSOC Request frame. + * + * Return: void + */ void -lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, - uint8_t subType, tpPESession psessionEntry) +lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, + uint8_t sub_type, tpPESession session) { - uint8_t updateContext; - uint8_t *pBody; - uint16_t peerIdx, temp; + uint8_t update_ctx; + uint8_t *frm_body; + uint16_t peer_idx, temp; uint32_t val; - int32_t framelen; + int32_t frame_len; tSirRetStatus status; - tpSirMacMgmtHdr pHdr; - struct tLimPreAuthNode *pStaPreAuthContext; - tAniAuthType authType; - tSirMacCapabilityInfo localCapabilities; - tpDphHashNode pStaDs = NULL; - tpSirAssocReq pAssocReq, pTempAssocReq; - tLimMlmStates mlmPrevState; - tDot11fIERSN Dot11fIERSN; - tDot11fIEWPA Dot11fIEWPA; - uint32_t phyMode; - tHalBitVal qosMode; - tHalBitVal wsmMode, wmeMode; - uint8_t *wpsIe = NULL; + tpSirMacMgmtHdr hdr; + struct tLimPreAuthNode *sta_pre_auth_ctx; + tAniAuthType auth_type; + tSirMacCapabilityInfo local_cap; + tpDphHashNode sta_ds = NULL; + tpSirAssocReq assoc_req, tmp_assoc_req; + tLimMlmStates mlm_prev_state; + tDot11fIERSN dot11f_ie_rsn; + tDot11fIEWPA dot11f_ie_wpa; + uint32_t phy_mode; + tHalBitVal qos_mode; + tHalBitVal wsm_mode, wme_mode; + uint8_t *wps_ie = NULL; uint8_t *ht_cap_ie = NULL; - tSirMacRateSet basicRates; + tSirMacRateSet basic_rates; uint8_t i = 0, j = 0; - bool pmfConnection = false; + bool pmf_connection = false; #ifdef WLAN_FEATURE_11W - tPmfSaQueryTimerId timerId; - uint32_t retryInterval; + tPmfSaQueryTimerId timer_id; + uint32_t retry_interval; #endif uint16_t assoc_id = 0; bool assoc_req_copied = false; - lim_get_phy_mode(pMac, &phyMode, psessionEntry); + lim_get_phy_mode(mac_ctx, &phy_mode, session); - limGetQosMode(psessionEntry, &qosMode); + limGetQosMode(session, &qos_mode); - pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo); - framelen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo); + hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); + frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); - lim_log(pMac, LOG1, + lim_log(mac_ctx, LOG1, FL("Received %s Req Frame on sessionid: %d systemrole %d" " limMlmState %d from: " MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - psessionEntry->peSessionId, GET_LIM_SYSTEM_ROLE(psessionEntry), - psessionEntry->limMlmState, MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, GET_LIM_SYSTEM_ROLE(session), + session->limMlmState, MAC_ADDR_ARRAY(hdr->sa)); - if (LIM_IS_STA_ROLE(psessionEntry) || - LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, + if (LIM_IS_STA_ROLE(session) || + LIM_IS_BT_AMP_STA_ROLE(session)) { + lim_log(mac_ctx, LOGE, FL("received unexpected ASSOC REQ on sessionid: %d " - "sys subType=%d for role=%d from: " MAC_ADDRESS_STR), - psessionEntry->peSessionId, subType, - GET_LIM_SYSTEM_ROLE(psessionEntry), - MAC_ADDR_ARRAY(pHdr->sa)); - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG3, - WMA_GET_RX_MPDU_DATA(pRxPacketInfo), framelen); + "sys sub_type=%d for role=%d from: " MAC_ADDRESS_STR), + session->peSessionId, sub_type, + GET_LIM_SYSTEM_ROLE(session), + MAC_ADDR_ARRAY(hdr->sa)); + sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG3, + WMA_GET_RX_MPDU_DATA(rx_pkt_info), frame_len); return; } @@ -278,154 +262,153 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * does not process it once the entry for the STA is already * present in DPH. */ - pStaDs = dph_lookup_hash_entry(pMac, pHdr->sa, &assoc_id, - &psessionEntry->dph.dphHashTable); - if ((NULL != pStaDs)) { - if (pHdr->fc.retry > 0) { - lim_log(pMac, LOGE, + sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa, &assoc_id, + &session->dph.dphHashTable); + if ((NULL != sta_ds)) { + if (hdr->fc.retry > 0) { + lim_log(mac_ctx, LOGE, FL("STA is initiating Assoc Req after ACK lost. Do not process" - " sessionid: %d sys subType=%d for role=%d from: " - MAC_ADDRESS_STR), psessionEntry->peSessionId, - subType, GET_LIM_SYSTEM_ROLE(psessionEntry), - MAC_ADDR_ARRAY(pHdr->sa)); - } else if (!pStaDs->rmfEnabled) { + " sessionid: %d sys sub_type=%d for role=%d from: " + MAC_ADDRESS_STR), session->peSessionId, + sub_type, GET_LIM_SYSTEM_ROLE(session), + MAC_ADDR_ARRAY(hdr->sa)); + } else if (!sta_ds->rmfEnabled) { /* Do this only for non PMF case. * * STA might have missed the assoc response, * so it is sending assoc request frame again. */ - lim_send_assoc_rsp_mgmt_frame(pMac, eSIR_SUCCESS, - pStaDs->assocId, pStaDs->staAddr, - pStaDs->mlmStaContext.subType, pStaDs, - psessionEntry); - lim_log(pMac, LOGE, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_SUCCESS, + sta_ds->assocId, sta_ds->staAddr, + sta_ds->mlmStaContext.subType, sta_ds, + session); + lim_log(mac_ctx, LOGE, FL("DUT already received an assoc request frame " "and STA is sending another assoc req.So, do not " - "Process sessionid: %d sys subType=%d for role=%d " + "Process sessionid: %d sys sub_type=%d for role=%d " "from: "MAC_ADDRESS_STR), - psessionEntry->peSessionId, subType, - psessionEntry->limSystemRole, - MAC_ADDR_ARRAY(pHdr->sa)); + session->peSessionId, sub_type, + session->limSystemRole, + MAC_ADDR_ARRAY(hdr->sa)); } return; } - lim_check_sta_in_pe_entries(pMac, pHdr); + lim_check_sta_in_pe_entries(mac_ctx, hdr); /* Get pointer to Re/Association Request frame body */ - pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo); + frm_body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); - if (lim_is_group_addr(pHdr->sa)) { + if (lim_is_group_addr(hdr->sa)) { /* Received Re/Assoc Req frame from a BC/MC address */ /* Log error and ignore it */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Received %s Req on sessionid: %d frame from a " "BC/MC address" MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - psessionEntry->peSessionId, MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); return; } - sir_dump_buf(pMac, SIR_LIM_MODULE_ID, LOG2, (uint8_t *) pBody, framelen); + sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2, (uint8_t *) frm_body, frame_len); - if (!qdf_mem_cmp((uint8_t *) pHdr->sa, (uint8_t *) pHdr->da, + if (!qdf_mem_cmp((uint8_t *) hdr->sa, (uint8_t *) hdr->da, (uint8_t) (sizeof(tSirMacAddr)))) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Rejected Assoc Req frame Since same mac as" " SAP/GO")); - lim_send_assoc_rsp_mgmt_frame(pMac, eSIR_MAC_UNSPEC_FAILURE_STATUS, - 1, pHdr->sa, subType, 0, - psessionEntry); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, + 1, hdr->sa, sub_type, 0, + session); return; } /* If TKIP counter measures active send Assoc Rsp frame to station with eSIR_MAC_MIC_FAILURE_REASON */ - if (psessionEntry->bTkipCntrMeasActive && - LIM_IS_AP_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("TKIP counter measure is active")); - lim_send_assoc_rsp_mgmt_frame(pMac, + if (session->bTkipCntrMeasActive && + LIM_IS_AP_ROLE(session)) { + lim_log(mac_ctx, LOGE, FL("TKIP counter measure is active")); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_MIC_FAILURE_REASON, - 1, pHdr->sa, subType, - 0, psessionEntry); + 1, hdr->sa, sub_type, + 0, session); return; } /* Allocate memory for the Assoc Request frame */ - pAssocReq = qdf_mem_malloc(sizeof(*pAssocReq)); - if (NULL == pAssocReq) { - lim_log(pMac, LOGP, FL("Allocate Memory failed in assoc_req")); + assoc_req = qdf_mem_malloc(sizeof(*assoc_req)); + if (NULL == assoc_req) { + lim_log(mac_ctx, LOGP, FL("Allocate Memory failed in assoc_req")); return; } - qdf_mem_set((void *)pAssocReq, sizeof(*pAssocReq), 0); + qdf_mem_set((void *)assoc_req, sizeof(*assoc_req), 0); /* Parse Assoc Request frame */ - if (subType == LIM_ASSOC) + if (sub_type == LIM_ASSOC) status = - sir_convert_assoc_req_frame2_struct(pMac, pBody, framelen, - pAssocReq); + sir_convert_assoc_req_frame2_struct(mac_ctx, frm_body, frame_len, + assoc_req); else status = - sir_convert_reassoc_req_frame2_struct(pMac, pBody, framelen, - pAssocReq); + sir_convert_reassoc_req_frame2_struct(mac_ctx, frm_body, frame_len, + assoc_req); if (status != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Parse error AssocRequest, length=%d from " - MAC_ADDRESS_STR), framelen, MAC_ADDR_ARRAY(pHdr->sa)); - lim_send_assoc_rsp_mgmt_frame(pMac, eSIR_MAC_UNSPEC_FAILURE_STATUS, - 1, pHdr->sa, subType, 0, - psessionEntry); + MAC_ADDRESS_STR), frame_len, MAC_ADDR_ARRAY(hdr->sa)); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, + 1, hdr->sa, sub_type, 0, + session); goto error; } - pAssocReq->assocReqFrame = qdf_mem_malloc(framelen); - if (NULL == pAssocReq->assocReqFrame) { - lim_log(pMac, LOGE, + assoc_req->assocReqFrame = qdf_mem_malloc(frame_len); + if (NULL == assoc_req->assocReqFrame) { + lim_log(mac_ctx, LOGE, FL("Unable to allocate memory for the assoc req, " - "length=%d from "), framelen); + "length=%d from "), frame_len); goto error; } - qdf_mem_copy((uint8_t *) pAssocReq->assocReqFrame, - (uint8_t *) pBody, framelen); - pAssocReq->assocReqFrameLength = framelen; + qdf_mem_copy((uint8_t *) assoc_req->assocReqFrame, + (uint8_t *) frm_body, frame_len); + assoc_req->assocReqFrameLength = frame_len; - if (cfg_get_capability_info(pMac, &temp, psessionEntry) != eSIR_SUCCESS) { - lim_log(pMac, LOGP, FL("could not retrieve Capabilities")); + if (cfg_get_capability_info(mac_ctx, &temp, session) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGP, FL("could not retrieve Capabilities")); goto error; } - lim_copy_u16((uint8_t *) &localCapabilities, temp); + lim_copy_u16((uint8_t *) &local_cap, temp); - if (lim_compare_capabilities(pMac, pAssocReq, - &localCapabilities, psessionEntry) == - false) { - lim_log(pMac, LOGE, FL("local caps mismatch received caps")); - lim_log(pMac, LOGE, FL("Received %s Req with unsupported " + if (lim_compare_capabilities(mac_ctx, assoc_req, + &local_cap, session) == false) { + lim_log(mac_ctx, LOGE, FL("local caps mismatch received caps")); + lim_log(mac_ctx, LOGE, FL("Received %s Req with unsupported " "capabilities from" MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); /** * Capabilities of requesting STA does not match with * local capabilities. Respond with 'unsupported capabilities' * status code. */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, 1, - pHdr->sa, subType, 0, psessionEntry); + hdr->sa, sub_type, 0, session); goto error; } - updateContext = false; + update_ctx = false; - if (lim_cmp_ssid(&pAssocReq->ssId, psessionEntry) != false) { - lim_log(pMac, LOGE, + if (lim_cmp_ssid(&assoc_req->ssId, session) != false) { + lim_log(mac_ctx, LOGE, FL("Received %s Req with unmatched ssid ( Received" " SSID: %.*s current SSID: %.*s ) from " MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - pAssocReq->ssId.length, pAssocReq->ssId.ssId, - psessionEntry->ssId.length, psessionEntry->ssId.ssId, - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + assoc_req->ssId.length, assoc_req->ssId.ssId, + session->ssId.length, session->ssId.ssId, + MAC_ADDR_ARRAY(hdr->sa)); /** * Received Re/Association Request with either @@ -433,10 +416,10 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * match with local one. * Respond with unspecified status code. */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, 1, - pHdr->sa, subType, 0, psessionEntry); + hdr->sa, sub_type, 0, session); goto error; } @@ -446,137 +429,137 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, ** set or Extended rate set. Some APs are adding basic rates in ** Extended rateset IE ***************************************************************/ - basicRates.numRates = 0; + basic_rates.numRates = 0; for (i = 0; - i < pAssocReq->supportedRates.numRates + i < assoc_req->supportedRates.numRates && (i < SIR_MAC_RATESET_EID_MAX); i++) { - basicRates.rate[i] = pAssocReq->supportedRates.rate[i]; - basicRates.numRates++; + basic_rates.rate[i] = assoc_req->supportedRates.rate[i]; + basic_rates.numRates++; } for (j = 0; - (j < pAssocReq->extendedRates.numRates) + (j < assoc_req->extendedRates.numRates) && (i < SIR_MAC_RATESET_EID_MAX); i++, j++) { - basicRates.rate[i] = pAssocReq->extendedRates.rate[j]; - basicRates.numRates++; + basic_rates.rate[i] = assoc_req->extendedRates.rate[j]; + basic_rates.numRates++; } - if (lim_check_rx_basic_rates(pMac, basicRates, psessionEntry) == false) { - lim_log(pMac, LOGE, FL("Received %s Req with unsupported " + if (lim_check_rx_basic_rates(mac_ctx, basic_rates, session) == false) { + lim_log(mac_ctx, LOGE, FL("Received %s Req with unsupported " "rates from" MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); /** * Requesting STA does not support ALL BSS basic * rates. Respond with 'basic rates not supported' * status code. */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, 1, - pHdr->sa, subType, 0, psessionEntry); + hdr->sa, sub_type, 0, session); goto error; } - if (LIM_IS_AP_ROLE(psessionEntry) && - (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) && - (pAssocReq->HTCaps.present)) { - lim_log(pMac, LOGE, + if (LIM_IS_AP_ROLE(session) && + (session->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) && + (assoc_req->HTCaps.present)) { + lim_log(mac_ctx, LOGE, FL("SOFTAP was in 11G only mode, rejecting legacy " - "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHdr->sa)); - lim_send_assoc_rsp_mgmt_frame(pMac, + "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, pHdr->sa, subType, 0, - psessionEntry); + 1, hdr->sa, sub_type, 0, + session); goto error; - } /* end if phyMode == 11G_only */ + } /* end if phy_mode == 11G_only */ - if (LIM_IS_AP_ROLE(psessionEntry) && - (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11N_ONLY) && - (!pAssocReq->HTCaps.present)) { - lim_log(pMac, LOGE, + if (LIM_IS_AP_ROLE(session) && + (session->dot11mode == WNI_CFG_DOT11_MODE_11N_ONLY) && + (!assoc_req->HTCaps.present)) { + lim_log(mac_ctx, LOGE, FL("SOFTAP was in 11N only mode, rejecting legacy " - "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHdr->sa)); - lim_send_assoc_rsp_mgmt_frame(pMac, + "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, pHdr->sa, subType, 0, - psessionEntry); + 1, hdr->sa, sub_type, 0, + session); goto error; } /* end if PhyMode == 11N_only */ - if (LIM_IS_AP_ROLE(psessionEntry) && - (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY) && - (!pAssocReq->VHTCaps.present)) { - lim_send_assoc_rsp_mgmt_frame(pMac, + if (LIM_IS_AP_ROLE(session) && + (session->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY) && + (!assoc_req->VHTCaps.present)) { + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, pHdr->sa, subType, 0, - psessionEntry); - lim_log(pMac, LOGE, FL("SOFTAP was in 11AC only mode, reject")); + 1, hdr->sa, sub_type, 0, + session); + lim_log(mac_ctx, LOGE, FL("SOFTAP was in 11AC only mode, reject")); goto error; } /* end if PhyMode == 11AC_only */ /* Spectrum Management (11h) specific checks */ - if (localCapabilities.spectrumMgt) { + if (local_cap.spectrumMgt) { tSirRetStatus status = eSIR_SUCCESS; /* If station is 11h capable, then it SHOULD send all mandatory * IEs in assoc request frame. Let us verify that */ - if (pAssocReq->capabilityInfo.spectrumMgt) { + if (assoc_req->capabilityInfo.spectrumMgt) { if (! - ((pAssocReq->powerCapabilityPresent) - && (pAssocReq->supportedChannelsPresent))) { + ((assoc_req->powerCapabilityPresent) + && (assoc_req->supportedChannelsPresent))) { /* One or more required information elements are missing, log the peers error */ - if (!pAssocReq->powerCapabilityPresent) { - lim_log(pMac, LOG1, + if (!assoc_req->powerCapabilityPresent) { + lim_log(mac_ctx, LOG1, FL ("LIM Info: Missing Power capability " "IE in %s Req from " MAC_ADDRESS_STR), (LIM_ASSOC == - subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); } - if (!pAssocReq->supportedChannelsPresent) { - lim_log(pMac, LOGW, + if (!assoc_req->supportedChannelsPresent) { + lim_log(mac_ctx, LOGW, FL ("LIM Info: Missing Supported channel " "IE in %s Req from " MAC_ADDRESS_STR), (LIM_ASSOC == - subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); } } else { /* Assoc request has mandatory fields */ status = - lim_is_dot11h_power_capabilities_in_range(pMac, - pAssocReq, - psessionEntry); + lim_is_dot11h_power_capabilities_in_range(mac_ctx, + assoc_req, + session); if (eSIR_SUCCESS != status) { - lim_log(pMac, LOGW, + lim_log(mac_ctx, LOGW, FL("LIM Info: MinTxPower(STA) > " "MaxTxPower(AP) in %s Req from " MAC_ADDRESS_STR), (LIM_ASSOC == - subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); } status = - lim_is_dot11h_supported_channels_valid(pMac, - pAssocReq); + lim_is_dot11h_supported_channels_valid(mac_ctx, + assoc_req); if (eSIR_SUCCESS != status) { - lim_log(pMac, LOGW, + lim_log(mac_ctx, LOGW, FL("LIM Info: wrong supported " "channels (STA) in %s Req from " MAC_ADDRESS_STR), (LIM_ASSOC == - subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); } /* IEs are valid, use them if needed */ @@ -594,55 +577,55 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } } /* end of spectrum management related processing */ - if ((pAssocReq->HTCaps.present) - && (lim_check_mcs_set(pMac, pAssocReq->HTCaps.supportedMCSSet) == + if ((assoc_req->HTCaps.present) + && (lim_check_mcs_set(mac_ctx, assoc_req->HTCaps.supportedMCSSet) == false)) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("received %s req with unsupported" "MCS Rate Set from " MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); /** * Requesting STA does not support ALL BSS MCS basic Rate set rates. * Spec does not define any status code for this scenario. */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS, 1, - pHdr->sa, subType, 0, psessionEntry); + hdr->sa, sub_type, 0, session); goto error; } - if (phyMode == WNI_CFG_PHY_MODE_11G) { + if (phy_mode == WNI_CFG_PHY_MODE_11G) { - if (wlan_cfg_get_int(pMac, WNI_CFG_11G_ONLY_POLICY, &val) != + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11G_ONLY_POLICY, &val) != eSIR_SUCCESS) { - lim_log(pMac, LOGP, + lim_log(mac_ctx, LOGP, FL("could not retrieve 11g-only flag")); goto error; } - if (!pAssocReq->extendedRatesPresent && val) { + if (!assoc_req->extendedRatesPresent && val) { /** * Received Re/Association Request from * 11b STA when 11g only policy option * is set. * Reject with unspecified status code. */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, 1, - pHdr->sa, - subType, 0, psessionEntry); + hdr->sa, + sub_type, 0, session); - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Rejecting Re/Assoc req from 11b STA: ")); - lim_print_mac_addr(pMac, pHdr->sa, LOGW); + lim_print_mac_addr(mac_ctx, hdr->sa, LOGW); #ifdef WLAN_DEBUG - pMac->lim.gLim11bStaAssocRejectCount++; + mac_ctx->lim.gLim11bStaAssocRejectCount++; #endif goto error; } @@ -650,31 +633,31 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, /* Check for 802.11n HT caps compatibility; are HT Capabilities */ /* turned on in lim? */ - if (psessionEntry->htCapability) { + if (session->htCapability) { /* There are; are they turned on in the STA? */ - if (pAssocReq->HTCaps.present) { + if (assoc_req->HTCaps.present) { /* The station *does* support 802.11n HT capability... */ - lim_log(pMac, LOG1, FL("AdvCodingCap:%d ChaWidthSet:%d " + lim_log(mac_ctx, LOG1, FL("AdvCodingCap:%d ChaWidthSet:%d " "PowerSave:%d greenField:%d " "shortGI20:%d shortGI40:%d" "txSTBC:%d rxSTBC:%d delayBA:%d" "maxAMSDUsize:%d DSSS/CCK:%d " "PSMP:%d stbcCntl:%d lsigTXProt:%d"), - pAssocReq->HTCaps.advCodingCap, - pAssocReq->HTCaps.supportedChannelWidthSet, - pAssocReq->HTCaps.mimoPowerSave, - pAssocReq->HTCaps.greenField, - pAssocReq->HTCaps.shortGI20MHz, - pAssocReq->HTCaps.shortGI40MHz, - pAssocReq->HTCaps.txSTBC, - pAssocReq->HTCaps.rxSTBC, - pAssocReq->HTCaps.delayedBA, - pAssocReq->HTCaps.maximalAMSDUsize, - pAssocReq->HTCaps.dsssCckMode40MHz, - pAssocReq->HTCaps.psmp, - pAssocReq->HTCaps.stbcControlFrame, - pAssocReq->HTCaps.lsigTXOPProtection); + assoc_req->HTCaps.advCodingCap, + assoc_req->HTCaps.supportedChannelWidthSet, + assoc_req->HTCaps.mimoPowerSave, + assoc_req->HTCaps.greenField, + assoc_req->HTCaps.shortGI20MHz, + assoc_req->HTCaps.shortGI40MHz, + assoc_req->HTCaps.txSTBC, + assoc_req->HTCaps.rxSTBC, + assoc_req->HTCaps.delayedBA, + assoc_req->HTCaps.maximalAMSDUsize, + assoc_req->HTCaps.dsssCckMode40MHz, + assoc_req->HTCaps.psmp, + assoc_req->HTCaps.stbcControlFrame, + assoc_req->HTCaps.lsigTXOPProtection); /* Make sure the STA's caps are compatible with our own: */ /* 11.15.2 Support of DSSS/CCK in 40 MHz */ @@ -684,198 +667,200 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } /* End if on HT caps turned on in lim. */ /* Clear the buffers so that frame parser knows that there isn't a previously decoded IE in these buffers */ - qdf_mem_set((uint8_t *) &Dot11fIERSN, sizeof(Dot11fIERSN), 0); - qdf_mem_set((uint8_t *) &Dot11fIEWPA, sizeof(Dot11fIEWPA), 0); + qdf_mem_set((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn), 0); + qdf_mem_set((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa), 0); /* if additional IE is present, check if it has WscIE */ - if (pAssocReq->addIEPresent && pAssocReq->addIE.length) - wpsIe = - limGetWscIEPtr(pMac, pAssocReq->addIE.addIEdata, - pAssocReq->addIE.length); + if (assoc_req->addIEPresent && assoc_req->addIE.length) + wps_ie = + limGetWscIEPtr(mac_ctx, assoc_req->addIE.addIEdata, + assoc_req->addIE.length); else { - lim_log(pMac, LOG1, FL("Assoc req addIEPresent = %d " + lim_log(mac_ctx, LOG1, FL("Assoc req addIEPresent = %d " "addIE length = %d"), - pAssocReq->addIEPresent, pAssocReq->addIE.length); + assoc_req->addIEPresent, assoc_req->addIE.length); } - /* when wpsIe is present, RSN/WPA IE is ignored */ - if (wpsIe == NULL) { + /* when wps_ie is present, RSN/WPA IE is ignored */ + if (wps_ie == NULL) { /** check whether as RSN IE is present */ - if (LIM_IS_AP_ROLE(psessionEntry) && - psessionEntry->pLimStartBssReq->privacy && - psessionEntry->pLimStartBssReq->rsnIE.length) { - lim_log(pMac, LOG1, + if (LIM_IS_AP_ROLE(session) && + session->pLimStartBssReq->privacy && + session->pLimStartBssReq->rsnIE.length) { + lim_log(mac_ctx, LOG1, FL("RSN enabled auth, Re/Assoc req from STA: " - MAC_ADDRESS_STR), MAC_ADDR_ARRAY(pHdr->sa)); - if (pAssocReq->rsnPresent) { - if (pAssocReq->rsn.length) { + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + if (assoc_req->rsnPresent) { + if (assoc_req->rsn.length) { /* Unpack the RSN IE */ - dot11f_unpack_ie_rsn(pMac, - &pAssocReq->rsn. + dot11f_unpack_ie_rsn(mac_ctx, + &assoc_req->rsn. info[0], - pAssocReq->rsn.length, - &Dot11fIERSN); + assoc_req->rsn.length, + &dot11f_ie_rsn); /* Check RSN version is supported or not */ if (SIR_MAC_OUI_VERSION_1 == - Dot11fIERSN.version) { + dot11f_ie_rsn.version) { /* check the groupwise and pairwise cipher suites */ - status = lim_check_rx_rsn_ie_match(pMac, - Dot11fIERSN, - psessionEntry, - pAssocReq-> - HTCaps.present, - &pmfConnection); + status = lim_check_rx_rsn_ie_match(mac_ctx, + dot11f_ie_rsn, + session, + assoc_req-> + HTCaps. + present, + &pmf_connection); + if (eSIR_SUCCESS != status) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("RSN Mismatch." "Rejecting Re/Assoc req from " "STA: " MAC_ADDRESS_STR), MAC_ADDR_ARRAY - (pHdr->sa)); + (hdr->sa)); /* some IE is not properly sent */ /* received Association req frame with RSN IE but length is 0 */ lim_send_assoc_rsp_mgmt_frame - (pMac, status, 1, - pHdr->sa, subType, - 0, psessionEntry); + (mac_ctx, status, 1, + hdr->sa, sub_type, + 0, session); goto error; } } else { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("RSN length not correct." "Rejecting Re/Assoc req from " "STA: " MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(pHdr-> + MAC_ADDR_ARRAY(hdr-> sa)); /* received Association req frame with RSN IE version wrong */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSUPPORTED_RSN_IE_VERSION_STATUS, 1, - pHdr-> + hdr-> sa, - subType, + sub_type, 0, - psessionEntry); + session); goto error; } } else { - lim_log(pMac, LOGW, + lim_log(mac_ctx, LOGW, FL ("Rejecting Re/Assoc req from STA:" MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(pHdr->sa)); + MAC_ADDR_ARRAY(hdr->sa)); /* received Association req frame with RSN IE but length is 0 */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, 1, - pHdr->sa, - subType, 0, - psessionEntry); + hdr->sa, + sub_type, 0, + session); goto error; } - } /* end - if(pAssocReq->rsnPresent) */ - if ((!pAssocReq->rsnPresent) && pAssocReq->wpaPresent) { + } /* end - if(assoc_req->rsnPresent) */ + if ((!assoc_req->rsnPresent) && assoc_req->wpaPresent) { /* Unpack the WPA IE */ - if (pAssocReq->wpa.length) { - dot11f_unpack_ie_wpa(pMac, &pAssocReq->wpa.info[4], /* OUI is not taken care */ - pAssocReq->wpa.length, - &Dot11fIEWPA); + if (assoc_req->wpa.length) { + dot11f_unpack_ie_wpa(mac_ctx, &assoc_req->wpa.info[4], /* OUI is not taken care */ + assoc_req->wpa.length, + &dot11f_ie_wpa); /* check the groupwise and pairwise cipher suites */ - status = lim_check_rx_wpa_ie_match(pMac, - Dot11fIEWPA, - psessionEntry, - pAssocReq-> + status = lim_check_rx_wpa_ie_match(mac_ctx, + dot11f_ie_wpa, + session, + assoc_req-> HTCaps. present); if (eSIR_SUCCESS != status) { - lim_log(pMac, LOGW, + lim_log(mac_ctx, LOGW, FL("WPA IE mismatch" "Rejecting Re/Assoc req from " "STA: " MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(pHdr-> + MAC_ADDR_ARRAY(hdr-> sa)); /* received Association req frame with WPA IE but mismatch */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, status, 1, - pHdr-> + hdr-> sa, - subType, + sub_type, 0, - psessionEntry); + session); goto error; } } else { - lim_log(pMac, LOGW, + lim_log(mac_ctx, LOGW, FL("WPA len incorrect." "Rejecting Re/Assoc req from" "STA: "MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(pHdr->sa)); + MAC_ADDR_ARRAY(hdr->sa)); /* received Association req frame with invalid WPA IE */ - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, 1, - pHdr->sa, - subType, 0, - psessionEntry); + hdr->sa, + sub_type, 0, + session); goto error; - } /* end - if(pAssocReq->wpa.length) */ - } /* end - if(pAssocReq->wpaPresent) */ + } /* end - if(assoc_req->wpa.length) */ + } /* end - if(assoc_req->wpaPresent) */ } - /* end of if(psessionEntry->pLimStartBssReq->privacy - && psessionEntry->pLimStartBssReq->rsnIE->length) */ - } /* end of if( ! pAssocReq->wscInfo.present ) */ + /* end of if(session->pLimStartBssReq->privacy + && session->pLimStartBssReq->rsnIE->length) */ + } /* end of if( ! assoc_req->wscInfo.present ) */ else { - lim_log(pMac, LOG1, FL("Assoc req WSE IE is present")); + lim_log(mac_ctx, LOG1, FL("Assoc req WSE IE is present")); } /** * Extract 'associated' context for STA, if any. * This is maintained by DPH and created by LIM. */ - pStaDs = - dph_lookup_hash_entry(pMac, pHdr->sa, &peerIdx, - &psessionEntry->dph.dphHashTable); + sta_ds = + dph_lookup_hash_entry(mac_ctx, hdr->sa, &peer_idx, + &session->dph.dphHashTable); /* / Extract pre-auth context for the STA, if any. */ - pStaPreAuthContext = lim_search_pre_auth_list(pMac, pHdr->sa); + sta_pre_auth_ctx = lim_search_pre_auth_list(mac_ctx, hdr->sa); - if (pStaDs == NULL) { + if (sta_ds == NULL) { /* / Requesting STA is not currently associated */ - if (pe_get_current_stas_count(pMac) == - pMac->lim.gLimAssocStaLimit) { + if (pe_get_current_stas_count(mac_ctx) == + mac_ctx->lim.gLimAssocStaLimit) { /** * Maximum number of STAs that AP can handle reached. * Send Association response to peer MAC entity */ - lim_log(pMac, LOGE, FL("Max Sta count reached : %d"), - pMac->lim.maxStation); - lim_reject_association(pMac, pHdr->sa, - subType, false, + lim_log(mac_ctx, LOGE, FL("Max Sta count reached : %d"), + mac_ctx->lim.maxStation); + lim_reject_association(mac_ctx, hdr->sa, + sub_type, false, (tAniAuthType) 0, 0, false, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); goto error; } /* / Check if STA is pre-authenticated. */ - if ((pStaPreAuthContext == NULL) || - (pStaPreAuthContext && - (pStaPreAuthContext->mlmState != + if ((sta_pre_auth_ctx == NULL) || + (sta_pre_auth_ctx && + (sta_pre_auth_ctx->mlmState != eLIM_MLM_AUTHENTICATED_STATE))) { /** * STA is not pre-authenticated yet requesting @@ -885,72 +870,72 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * Send Deauthentication frame with 'prior * authentication required' reason code. */ - lim_send_deauth_mgmt_frame(pMac, eSIR_MAC_STA_NOT_PRE_AUTHENTICATED_REASON, /* =9 */ - pHdr->sa, psessionEntry, false); + lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_STA_NOT_PRE_AUTHENTICATED_REASON, /* =9 */ + hdr->sa, session, false); - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("received %s req on sessionid: %d from STA " "that does not have pre-auth context" MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - psessionEntry->peSessionId, - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, + MAC_ADDR_ARRAY(hdr->sa)); goto error; } /* / Delete 'pre-auth' context of STA */ - authType = pStaPreAuthContext->authType; - lim_delete_pre_auth_node(pMac, pHdr->sa); + auth_type = sta_pre_auth_ctx->authType; + lim_delete_pre_auth_node(mac_ctx, hdr->sa); /* All is well. Assign AID (after else part) */ - } /* if (pStaDs == NULL) */ + } /* if (sta_ds == NULL) */ else { /* STA context does exist for this STA */ - if (pStaDs->mlmStaContext.mlmState != + if (sta_ds->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) { /** * Requesting STA is in some 'transient' state? * Ignore the Re/Assoc Req frame by incrementing * debug counter & logging error. */ - if (subType == LIM_ASSOC) { + if (sub_type == LIM_ASSOC) { #ifdef WLAN_DEBUG - pMac->lim.gLimNumAssocReqDropInvldState++; + mac_ctx->lim.gLimNumAssocReqDropInvldState++; #endif - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("received Assoc req in state " "%X from "), - pStaDs->mlmStaContext.mlmState); + sta_ds->mlmStaContext.mlmState); } else { #ifdef WLAN_DEBUG - pMac->lim.gLimNumReassocReqDropInvldState++; + mac_ctx->lim.gLimNumReassocReqDropInvldState++; #endif - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("received ReAssoc req in state %X" " from "), - pStaDs->mlmStaContext.mlmState); + sta_ds->mlmStaContext.mlmState); } - lim_print_mac_addr(pMac, pHdr->sa, LOG1); - lim_print_mlm_state(pMac, LOG1, - (tLimMlmStates) pStaDs->mlmStaContext. + lim_print_mac_addr(mac_ctx, hdr->sa, LOG1); + lim_print_mlm_state(mac_ctx, LOG1, + (tLimMlmStates) sta_ds->mlmStaContext. mlmState); goto error; - } /* if (pStaDs->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */ + } /* if (sta_ds->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */ /* STA sent association Request frame while already in * 'associated' state */ #ifdef WLAN_FEATURE_11W - lim_log(pMac, LOG1, + lim_log(mac_ctx, LOG1, FL ("Re/Assoc request from station that is already associated")); - lim_log(pMac, LOG1, FL("PMF enabled %d, SA Query state %d"), - pStaDs->rmfEnabled, pStaDs->pmfSaQueryState); - if (pStaDs->rmfEnabled) { - switch (pStaDs->pmfSaQueryState) { + lim_log(mac_ctx, LOG1, FL("PMF enabled %d, SA Query state %d"), + sta_ds->rmfEnabled, sta_ds->pmfSaQueryState); + if (sta_ds->rmfEnabled) { + switch (sta_ds->pmfSaQueryState) { /* start SA Query procedure, respond to Association Request */ /* with try again later */ @@ -960,47 +945,47 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * the SA query procedure, otherwise in next set of SA query * procedure we will end up using the stale value. */ - pStaDs->pmfSaQueryRetryCount = 0; - lim_send_assoc_rsp_mgmt_frame(pMac, + sta_ds->pmfSaQueryRetryCount = 0; + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_TRY_AGAIN_LATER, - 1, pHdr->sa, subType, - pStaDs, psessionEntry); - lim_send_sa_query_request_frame(pMac, + 1, hdr->sa, sub_type, + sta_ds, session); + lim_send_sa_query_request_frame(mac_ctx, (uint8_t *) & - (pStaDs-> + (sta_ds-> pmfSaQueryCurrentTransId), - pHdr->sa, - psessionEntry); - pStaDs->pmfSaQueryStartTransId = - pStaDs->pmfSaQueryCurrentTransId; - pStaDs->pmfSaQueryCurrentTransId++; + hdr->sa, + session); + sta_ds->pmfSaQueryStartTransId = + sta_ds->pmfSaQueryCurrentTransId; + sta_ds->pmfSaQueryCurrentTransId++; /* start timer for SA Query retry */ - if (tx_timer_activate(&pStaDs->pmfSaQueryTimer) + if (tx_timer_activate(&sta_ds->pmfSaQueryTimer) != TX_SUCCESS) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL ("PMF SA Query timer activation failed!")); goto error; } - pStaDs->pmfSaQueryState = + sta_ds->pmfSaQueryState = DPH_SA_QUERY_IN_PROGRESS; goto error; /* SA Query procedure still going, respond to Association */ /* Request with try again later */ case DPH_SA_QUERY_IN_PROGRESS: - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_TRY_AGAIN_LATER, - 1, pHdr->sa, subType, - 0, psessionEntry); + 1, hdr->sa, sub_type, + 0, session); goto error; /* SA Query procedure timed out, accept Association Request */ /* normally */ case DPH_SA_QUERY_TIMED_OUT: - pStaDs->pmfSaQueryState = + sta_ds->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; break; } @@ -1008,14 +993,13 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, #endif /* no change in the capability so drop the frame */ - if ((true != - qdf_mem_cmp(&pStaDs->mlmStaContext.capabilityInfo, - &pAssocReq->capabilityInfo, - sizeof(tSirMacCapabilityInfo))) - && (subType == LIM_ASSOC)) { - lim_log(pMac, LOGE, + if ((true != qdf_mem_cmp(&sta_ds->mlmStaContext.capabilityInfo, + &assoc_req->capabilityInfo, + sizeof(tSirMacCapabilityInfo))) + && (sub_type == LIM_ASSOC)) { + lim_log(mac_ctx, LOGE, FL(" Received Assoc req in state %X STAid=%d"), - pStaDs->mlmStaContext.mlmState, peerIdx); + sta_ds->mlmStaContext.mlmState, peer_idx); goto error; } else { /** @@ -1023,27 +1007,27 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * 'associated' state. Update STA capabilities and * send Association response frame with same AID */ - lim_log(pMac, LOG1, + lim_log(mac_ctx, LOG1, FL("Recved Assoc req from STA already connected" " UpdateConext")); - pStaDs->mlmStaContext.capabilityInfo = - pAssocReq->capabilityInfo; - if (pStaPreAuthContext - && (pStaPreAuthContext->mlmState == + sta_ds->mlmStaContext.capabilityInfo = + assoc_req->capabilityInfo; + if (sta_pre_auth_ctx + && (sta_pre_auth_ctx->mlmState == eLIM_MLM_AUTHENTICATED_STATE)) { /* / STA has triggered pre-auth again */ - authType = pStaPreAuthContext->authType; - lim_delete_pre_auth_node(pMac, pHdr->sa); + auth_type = sta_pre_auth_ctx->authType; + lim_delete_pre_auth_node(mac_ctx, hdr->sa); } else - authType = pStaDs->mlmStaContext.authType; + auth_type = sta_ds->mlmStaContext.authType; - updateContext = true; + update_ctx = true; if (dph_init_sta_state - (pMac, pHdr->sa, peerIdx, true, - &psessionEntry->dph.dphHashTable) + (mac_ctx, hdr->sa, peer_idx, true, + &session->dph.dphHashTable) == NULL) { - lim_log(pMac, LOGE, - FL("could not Init STAid=%d"), peerIdx); + lim_log(mac_ctx, LOGE, + FL("could not Init STAid=%d"), peer_idx); goto error; } } @@ -1051,52 +1035,52 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, } /* end if (lookup for STA in perStaDs fails) */ /* check if sta is allowed per QoS AC rules */ - limGetWmeMode(psessionEntry, &wmeMode); - if ((qosMode == eHAL_SET) || (wmeMode == eHAL_SET)) { + limGetWmeMode(session, &wme_mode); + if ((qos_mode == eHAL_SET) || (wme_mode == eHAL_SET)) { /* for a qsta, check if the requested Traffic spec */ /* is admissible */ /* for a non-qsta check if the sta can be admitted */ - if (pAssocReq->addtsPresent) { - uint8_t tspecIdx = 0; /* index in the sch tspec table. */ - if (lim_admit_control_add_ts - (pMac, pHdr->sa, &(pAssocReq->addtsReq), - &(pAssocReq->qosCapability), 0, false, NULL, - &tspecIdx, psessionEntry) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + if (assoc_req->addtsPresent) { + uint8_t tspec_idx = 0; /* index in the sch tspec table. */ + if (lim_admit_control_add_ts(mac_ctx, hdr->sa, + &(assoc_req->addtsReq), + &(assoc_req->qosCapability), 0, false, NULL, + &tspec_idx, session) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, FL("AdmitControl: TSPEC rejected")); - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_QAP_NO_BANDWIDTH_REASON, - 1, pHdr->sa, subType, - 0, psessionEntry); + 1, hdr->sa, sub_type, + 0, session); #ifdef WLAN_DEBUG - pMac->lim.gLimNumAssocReqDropACRejectTS++; + mac_ctx->lim.gLimNumAssocReqDropACRejectTS++; #endif goto error; } - } else if (lim_admit_control_add_sta(pMac, pHdr->sa, false) + } else if (lim_admit_control_add_sta(mac_ctx, hdr->sa, false) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, FL("AdmitControl: Sta rejected")); - lim_send_assoc_rsp_mgmt_frame(pMac, + lim_log(mac_ctx, LOGE, FL("AdmitControl: Sta rejected")); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_QAP_NO_BANDWIDTH_REASON, 1, - pHdr->sa, - subType, 0, psessionEntry); + hdr->sa, + sub_type, 0, session); #ifdef WLAN_DEBUG - pMac->lim.gLimNumAssocReqDropACRejectSta++; + mac_ctx->lim.gLimNumAssocReqDropACRejectSta++; #endif goto error; } /* else all ok */ - lim_log(pMac, LOG1, FL("AdmitControl: Sta OK!")); + lim_log(mac_ctx, LOG1, FL("AdmitControl: Sta OK!")); } /** * STA is Associated ! */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Received %s Req successful from " MAC_ADDRESS_STR), - (LIM_ASSOC == subType) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(pHdr->sa)); + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); /** * AID for this association will be same as the peer Index used in DPH table. @@ -1105,19 +1089,19 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * between 1 - cfg_item(WNI_CFG_ASSOC_STA_LIMIT) */ - peerIdx = lim_assign_peer_idx(pMac, psessionEntry); + peer_idx = lim_assign_peer_idx(mac_ctx, session); - if (!peerIdx) { + if (!peer_idx) { /* Could not assign AID */ /* Reject association */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("PeerIdx not avaialble. Reject associaton")); - lim_reject_association(pMac, pHdr->sa, - subType, true, authType, - peerIdx, false, + lim_reject_association(mac_ctx, hdr->sa, + sub_type, true, auth_type, + peer_idx, false, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); goto error; } @@ -1126,24 +1110,24 @@ lim_process_assoc_req_frame(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, * Add an entry to hash table maintained by DPH module */ - pStaDs = - dph_add_hash_entry(pMac, pHdr->sa, peerIdx, - &psessionEntry->dph.dphHashTable); + sta_ds = + dph_add_hash_entry(mac_ctx, hdr->sa, peer_idx, + &session->dph.dphHashTable); - if (pStaDs == NULL) { + if (sta_ds == NULL) { /* Could not add hash table entry at DPH */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("could not add hash entry at DPH for aid=%d, MacAddr:" - MAC_ADDRESS_STR), peerIdx, MAC_ADDR_ARRAY(pHdr->sa)); + MAC_ADDRESS_STR), peer_idx, MAC_ADDR_ARRAY(hdr->sa)); /* Release AID */ - lim_release_peer_idx(pMac, peerIdx, psessionEntry); + lim_release_peer_idx(mac_ctx, peer_idx, session); - lim_reject_association(pMac, pHdr->sa, - subType, true, authType, peerIdx, false, + lim_reject_association(mac_ctx, hdr->sa, + sub_type, true, auth_type, peer_idx, false, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); goto error; } @@ -1152,47 +1136,47 @@ sendIndToSme: /* * check here if the parsedAssocReq already * pointing to the assoc_req and free it before - * assigning this new pAssocReq + * assigning this new assoc_req */ - if (psessionEntry->parsedAssocReq != NULL) { - pTempAssocReq = psessionEntry->parsedAssocReq[pStaDs->assocId]; - if (pTempAssocReq != NULL) { - if (pTempAssocReq->assocReqFrame) { - qdf_mem_free(pTempAssocReq->assocReqFrame); - pTempAssocReq->assocReqFrame = NULL; - pTempAssocReq->assocReqFrameLength = 0; + if (session->parsedAssocReq != NULL) { + tmp_assoc_req = session->parsedAssocReq[sta_ds->assocId]; + if (tmp_assoc_req != NULL) { + if (tmp_assoc_req->assocReqFrame) { + qdf_mem_free(tmp_assoc_req->assocReqFrame); + tmp_assoc_req->assocReqFrame = NULL; + tmp_assoc_req->assocReqFrameLength = 0; } - qdf_mem_free(pTempAssocReq); - pTempAssocReq = NULL; + qdf_mem_free(tmp_assoc_req); + tmp_assoc_req = NULL; } - psessionEntry->parsedAssocReq[pStaDs->assocId] = pAssocReq; + session->parsedAssocReq[sta_ds->assocId] = assoc_req; assoc_req_copied = true; } - pStaDs->mlmStaContext.htCapability = pAssocReq->HTCaps.present; + sta_ds->mlmStaContext.htCapability = assoc_req->HTCaps.present; #ifdef WLAN_FEATURE_11AC - pStaDs->mlmStaContext.vhtCapability = pAssocReq->VHTCaps.present; + sta_ds->mlmStaContext.vhtCapability = assoc_req->VHTCaps.present; #endif - pStaDs->qos.addtsPresent = - (pAssocReq->addtsPresent == 0) ? false : true; - pStaDs->qos.addts = pAssocReq->addtsReq; - pStaDs->qos.capability = pAssocReq->qosCapability; - pStaDs->versionPresent = 0; + sta_ds->qos.addtsPresent = + (assoc_req->addtsPresent == 0) ? false : true; + sta_ds->qos.addts = assoc_req->addtsReq; + sta_ds->qos.capability = assoc_req->qosCapability; + sta_ds->versionPresent = 0; /* short slot and short preamble should be updated before doing limaddsta */ - pStaDs->shortPreambleEnabled = - (uint8_t) pAssocReq->capabilityInfo.shortPreamble; - pStaDs->shortSlotTimeEnabled = - (uint8_t) pAssocReq->capabilityInfo.shortSlotTime; + sta_ds->shortPreambleEnabled = + (uint8_t) assoc_req->capabilityInfo.shortPreamble; + sta_ds->shortSlotTimeEnabled = + (uint8_t) assoc_req->capabilityInfo.shortSlotTime; - pStaDs->valid = 0; - pStaDs->mlmStaContext.authType = authType; - pStaDs->staType = STA_ENTRY_PEER; + sta_ds->valid = 0; + sta_ds->mlmStaContext.authType = auth_type; + sta_ds->staType = STA_ENTRY_PEER; /* TODO: If listen interval is more than certain limit, reject the association. */ /* Need to check customer requirements and then implement. */ - pStaDs->mlmStaContext.listenInterval = pAssocReq->listenInterval; - pStaDs->mlmStaContext.capabilityInfo = pAssocReq->capabilityInfo; + sta_ds->mlmStaContext.listenInterval = assoc_req->listenInterval; + sta_ds->mlmStaContext.capabilityInfo = assoc_req->capabilityInfo; /* The following count will be used to knock-off the station if it doesn't * come back to receive the buffered data. The AP will wait for numTimSent number @@ -1201,289 +1185,289 @@ sendIndToSme: */ /** timWaitCount is used by PMM for monitoring the STA's in PS for LINK*/ - pStaDs->timWaitCount = - (uint8_t) GET_TIM_WAIT_COUNT(pAssocReq->listenInterval); + sta_ds->timWaitCount = + (uint8_t) GET_TIM_WAIT_COUNT(assoc_req->listenInterval); /** Initialise the Current successful MPDU's tranfered to this STA count as 0 */ - pStaDs->curTxMpduCnt = 0; - - if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && - pAssocReq->HTCaps.present && pAssocReq->wmeInfoPresent) { - pStaDs->htGreenfield = (uint8_t) pAssocReq->HTCaps.greenField; - pStaDs->htAMpduDensity = pAssocReq->HTCaps.mpduDensity; - pStaDs->htDsssCckRate40MHzSupport = - (uint8_t) pAssocReq->HTCaps.dsssCckMode40MHz; - pStaDs->htLsigTXOPProtection = - (uint8_t) pAssocReq->HTCaps.lsigTXOPProtection; - pStaDs->htMaxAmsduLength = - (uint8_t) pAssocReq->HTCaps.maximalAMSDUsize; - pStaDs->htMaxRxAMpduFactor = pAssocReq->HTCaps.maxRxAMPDUFactor; - pStaDs->htMIMOPSState = pAssocReq->HTCaps.mimoPowerSave; - - /* pAssocReq will be copied to psessionEntry->parsedAssocReq + sta_ds->curTxMpduCnt = 0; + + if (IS_DOT11_MODE_HT(session->dot11mode) && + assoc_req->HTCaps.present && assoc_req->wmeInfoPresent) { + sta_ds->htGreenfield = (uint8_t) assoc_req->HTCaps.greenField; + sta_ds->htAMpduDensity = assoc_req->HTCaps.mpduDensity; + sta_ds->htDsssCckRate40MHzSupport = + (uint8_t) assoc_req->HTCaps.dsssCckMode40MHz; + sta_ds->htLsigTXOPProtection = + (uint8_t) assoc_req->HTCaps.lsigTXOPProtection; + sta_ds->htMaxAmsduLength = + (uint8_t) assoc_req->HTCaps.maximalAMSDUsize; + sta_ds->htMaxRxAMpduFactor = assoc_req->HTCaps.maxRxAMPDUFactor; + sta_ds->htMIMOPSState = assoc_req->HTCaps.mimoPowerSave; + + /* assoc_req will be copied to session->parsedAssocReq * later */ - ht_cap_ie = ((uint8_t *) &pAssocReq->HTCaps) + 1; + ht_cap_ie = ((uint8_t *) &assoc_req->HTCaps) + 1; /* check whether AP is enabled with shortGI */ - if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_GI_20MHZ, &val) != + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_20MHZ, &val) != eSIR_SUCCESS) { - PELOGE(lim_log(pMac, LOGE, + PELOGE(lim_log(mac_ctx, LOGE, FL("could not retrieve shortGI 20Mhz CFG"));) goto error; } if (val) { - pStaDs->htShortGI20Mhz = - (uint8_t)pAssocReq->HTCaps.shortGI20MHz; + sta_ds->htShortGI20Mhz = + (uint8_t)assoc_req->HTCaps.shortGI20MHz; } else { /* Unset htShortGI20Mhz in ht_caps*/ *ht_cap_ie &= ~(1 << SIR_MAC_HT_CAP_SHORTGI20MHZ_S); - pStaDs->htShortGI20Mhz = 0; + sta_ds->htShortGI20Mhz = 0; } - if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_GI_40MHZ, &val) != + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_40MHZ, &val) != eSIR_SUCCESS) { - PELOGE(lim_log(pMac, LOGE, + PELOGE(lim_log(mac_ctx, LOGE, FL("could not retrieve shortGI 40Mhz CFG"));) goto error; } if (val) { - pStaDs->htShortGI40Mhz = - (uint8_t)pAssocReq->HTCaps.shortGI40MHz; + sta_ds->htShortGI40Mhz = + (uint8_t)assoc_req->HTCaps.shortGI40MHz; } else { /* Unset htShortGI40Mhz in ht_caps */ *ht_cap_ie &= ~(1 << SIR_MAC_HT_CAP_SHORTGI40MHZ_S); - pStaDs->htShortGI40Mhz = 0; + sta_ds->htShortGI40Mhz = 0; } - pStaDs->htSupportedChannelWidthSet = - (uint8_t) pAssocReq->HTCaps.supportedChannelWidthSet; + sta_ds->htSupportedChannelWidthSet = + (uint8_t) assoc_req->HTCaps.supportedChannelWidthSet; /* * peer just follows AP; so when we are softAP/GO, * we just store our session entry's secondary channel offset * here in peer INFRA STA. However, if peer's 40MHz channel * width support is disabled then secondary channel will be zero */ - pStaDs->htSecondaryChannelOffset = - (pStaDs->htSupportedChannelWidthSet) ? psessionEntry-> + sta_ds->htSecondaryChannelOffset = + (sta_ds->htSupportedChannelWidthSet) ? session-> htSecondaryChannelOffset : 0; #ifdef WLAN_FEATURE_11AC - if (pAssocReq->operMode.present) { - pStaDs->vhtSupportedChannelWidthSet = - (uint8_t) ((pAssocReq->operMode.chanWidth == + if (assoc_req->operMode.present) { + sta_ds->vhtSupportedChannelWidthSet = + (uint8_t) ((assoc_req->operMode.chanWidth == eHT_CHANNEL_WIDTH_80MHZ) ? WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ : WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ); - pStaDs->htSupportedChannelWidthSet = - (uint8_t) (pAssocReq->operMode. + sta_ds->htSupportedChannelWidthSet = + (uint8_t) (assoc_req->operMode. chanWidth ? eHT_CHANNEL_WIDTH_40MHZ : eHT_CHANNEL_WIDTH_20MHZ); - } else if (pAssocReq->VHTCaps.present) { + } else if (assoc_req->VHTCaps.present) { /* Check if STA has enabled it's channel bonding mode. */ /* If channel bonding mode is enabled, we decide based on SAP's current configuration. */ /* else, we set it to VHT20. */ - pStaDs->vhtSupportedChannelWidthSet = - (uint8_t) ((pStaDs->htSupportedChannelWidthSet == + sta_ds->vhtSupportedChannelWidthSet = + (uint8_t) ((sta_ds->htSupportedChannelWidthSet == eHT_CHANNEL_WIDTH_20MHZ) ? WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ : - psessionEntry->ch_width - 1); - pStaDs->htMaxRxAMpduFactor = - pAssocReq->VHTCaps.maxAMPDULenExp; + session->ch_width - 1); + sta_ds->htMaxRxAMpduFactor = + assoc_req->VHTCaps.maxAMPDULenExp; } /* Lesser among the AP and STA bandwidth of operation. */ - pStaDs->htSupportedChannelWidthSet = - (pStaDs->htSupportedChannelWidthSet < - psessionEntry->htSupportedChannelWidthSet) ? - pStaDs->htSupportedChannelWidthSet : - psessionEntry->htSupportedChannelWidthSet; + sta_ds->htSupportedChannelWidthSet = + (sta_ds->htSupportedChannelWidthSet < + session->htSupportedChannelWidthSet) ? + sta_ds->htSupportedChannelWidthSet : + session->htSupportedChannelWidthSet; #endif - pStaDs->baPolicyFlag = 0xFF; - pStaDs->htLdpcCapable = - (uint8_t) pAssocReq->HTCaps.advCodingCap; + sta_ds->baPolicyFlag = 0xFF; + sta_ds->htLdpcCapable = + (uint8_t) assoc_req->HTCaps.advCodingCap; } - if (pAssocReq->VHTCaps.present && pAssocReq->wmeInfoPresent) { - pStaDs->vhtLdpcCapable = - (uint8_t) pAssocReq->VHTCaps.ldpcCodingCap; + if (assoc_req->VHTCaps.present && assoc_req->wmeInfoPresent) { + sta_ds->vhtLdpcCapable = + (uint8_t) assoc_req->VHTCaps.ldpcCodingCap; } - if (!pAssocReq->wmeInfoPresent) { - pStaDs->mlmStaContext.htCapability = 0; - pStaDs->mlmStaContext.vhtCapability = 0; + if (!assoc_req->wmeInfoPresent) { + sta_ds->mlmStaContext.htCapability = 0; + sta_ds->mlmStaContext.vhtCapability = 0; } - if (pStaDs->mlmStaContext.vhtCapability) { - if (psessionEntry->txBFIniFeatureEnabled && - pAssocReq->VHTCaps.suBeamFormerCap) - pStaDs->vhtBeamFormerCapable = 1; + if (sta_ds->mlmStaContext.vhtCapability) { + if (session->txBFIniFeatureEnabled && + assoc_req->VHTCaps.suBeamFormerCap) + sta_ds->vhtBeamFormerCapable = 1; else - pStaDs->vhtBeamFormerCapable = 0; - if (psessionEntry->enable_su_tx_bformer && - pAssocReq->VHTCaps.suBeamformeeCap) - pStaDs->vht_su_bfee_capable = 1; + sta_ds->vhtBeamFormerCapable = 0; + if (session->enable_su_tx_bformer && + assoc_req->VHTCaps.suBeamformeeCap) + sta_ds->vht_su_bfee_capable = 1; else - pStaDs->vht_su_bfee_capable = 0; + sta_ds->vht_su_bfee_capable = 0; } #ifdef WLAN_FEATURE_11AC - if (lim_populate_matching_rate_set(pMac, - pStaDs, - &(pAssocReq->supportedRates), - &(pAssocReq->extendedRates), - pAssocReq->HTCaps.supportedMCSSet, - psessionEntry, &pAssocReq->VHTCaps) + if (lim_populate_matching_rate_set(mac_ctx, + sta_ds, + &(assoc_req->supportedRates), + &(assoc_req->extendedRates), + assoc_req->HTCaps.supportedMCSSet, + session, &assoc_req->VHTCaps) != eSIR_SUCCESS) #else - if (lim_populate_matching_rate_set(pMac, - pStaDs, - &(pAssocReq->supportedRates), - &(pAssocReq->extendedRates), - pAssocReq->HTCaps.supportedMCSSet, - psessionEntry) != eSIR_SUCCESS) + if (lim_populate_matching_rate_set(mac_ctx, + sta_ds, + &(assoc_req->supportedRates), + &(assoc_req->extendedRates), + assoc_req->HTCaps.supportedMCSSet, + session) != eSIR_SUCCESS) #endif { /* Could not update hash table entry at DPH with rateset */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL ("could not update hash entry at DPH for aid=%d, MacAddr: " - MAC_ADDRESS_STR), peerIdx, MAC_ADDR_ARRAY(pHdr->sa)); + MAC_ADDRESS_STR), peer_idx, MAC_ADDR_ARRAY(hdr->sa)); /* Release AID */ - lim_release_peer_idx(pMac, peerIdx, psessionEntry); + lim_release_peer_idx(mac_ctx, peer_idx, session); - lim_reject_association(pMac, pHdr->sa, - subType, true, authType, peerIdx, true, + lim_reject_association(mac_ctx, hdr->sa, + sub_type, true, auth_type, peer_idx, true, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); - if (psessionEntry->parsedAssocReq) - pAssocReq = - psessionEntry->parsedAssocReq[pStaDs->assocId]; + if (session->parsedAssocReq) + assoc_req = + session->parsedAssocReq[sta_ds->assocId]; goto error; } #ifdef WLAN_FEATURE_11AC - if (pAssocReq->operMode.present) { - pStaDs->vhtSupportedRxNss = pAssocReq->operMode.rxNSS + 1; + if (assoc_req->operMode.present) { + sta_ds->vhtSupportedRxNss = assoc_req->operMode.rxNSS + 1; } else { - pStaDs->vhtSupportedRxNss = - ((pStaDs->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2) + sta_ds->vhtSupportedRxNss = + ((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2) ? 1 : 2; } #endif /* / Add STA context at MAC HW (BMU, RHP & TFP) */ - pStaDs->qosMode = false; - pStaDs->lleEnabled = false; - if (pAssocReq->capabilityInfo.qos && (qosMode == eHAL_SET)) { - pStaDs->lleEnabled = true; - pStaDs->qosMode = true; + sta_ds->qosMode = false; + sta_ds->lleEnabled = false; + if (assoc_req->capabilityInfo.qos && (qos_mode == eHAL_SET)) { + sta_ds->lleEnabled = true; + sta_ds->qosMode = true; } - pStaDs->wmeEnabled = false; - pStaDs->wsmEnabled = false; - limGetWmeMode(psessionEntry, &wmeMode); - if ((!pStaDs->lleEnabled) && pAssocReq->wmeInfoPresent - && (wmeMode == eHAL_SET)) { - pStaDs->wmeEnabled = true; - pStaDs->qosMode = true; - limGetWsmMode(psessionEntry, &wsmMode); + sta_ds->wmeEnabled = false; + sta_ds->wsmEnabled = false; + limGetWmeMode(session, &wme_mode); + if ((!sta_ds->lleEnabled) && assoc_req->wmeInfoPresent + && (wme_mode == eHAL_SET)) { + sta_ds->wmeEnabled = true; + sta_ds->qosMode = true; + limGetWsmMode(session, &wsm_mode); /* WMM_APSD - WMM_SA related processing should be separate; WMM_SA and WMM_APSD can coexist */ - if (pAssocReq->WMMInfoStation.present) { + if (assoc_req->WMMInfoStation.present) { /* check whether AP supports or not */ - if (LIM_IS_AP_ROLE(psessionEntry) && - (psessionEntry->apUapsdEnable == 0) && - (pAssocReq->WMMInfoStation.acbe_uapsd || - pAssocReq->WMMInfoStation.acbk_uapsd || - pAssocReq->WMMInfoStation.acvo_uapsd || - pAssocReq->WMMInfoStation.acvi_uapsd)) { + if (LIM_IS_AP_ROLE(session) && + (session->apUapsdEnable == 0) && + (assoc_req->WMMInfoStation.acbe_uapsd || + assoc_req->WMMInfoStation.acbk_uapsd || + assoc_req->WMMInfoStation.acvo_uapsd || + assoc_req->WMMInfoStation.acvi_uapsd)) { /** * Received Re/Association Request from * STA when UPASD is not supported. */ - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("AP do not support UAPSD so reply " "to STA accordingly")); /* update UAPSD and send it to LIM to add STA */ - pStaDs->qos.capability.qosInfo.acbe_uapsd = 0; - pStaDs->qos.capability.qosInfo.acbk_uapsd = 0; - pStaDs->qos.capability.qosInfo.acvo_uapsd = 0; - pStaDs->qos.capability.qosInfo.acvi_uapsd = 0; - pStaDs->qos.capability.qosInfo.maxSpLen = 0; + sta_ds->qos.capability.qosInfo.acbe_uapsd = 0; + sta_ds->qos.capability.qosInfo.acbk_uapsd = 0; + sta_ds->qos.capability.qosInfo.acvo_uapsd = 0; + sta_ds->qos.capability.qosInfo.acvi_uapsd = 0; + sta_ds->qos.capability.qosInfo.maxSpLen = 0; } else { /* update UAPSD and send it to LIM to add STA */ - pStaDs->qos.capability.qosInfo.acbe_uapsd = - pAssocReq->WMMInfoStation.acbe_uapsd; - pStaDs->qos.capability.qosInfo.acbk_uapsd = - pAssocReq->WMMInfoStation.acbk_uapsd; - pStaDs->qos.capability.qosInfo.acvo_uapsd = - pAssocReq->WMMInfoStation.acvo_uapsd; - pStaDs->qos.capability.qosInfo.acvi_uapsd = - pAssocReq->WMMInfoStation.acvi_uapsd; - pStaDs->qos.capability.qosInfo.maxSpLen = - pAssocReq->WMMInfoStation.max_sp_length; + sta_ds->qos.capability.qosInfo.acbe_uapsd = + assoc_req->WMMInfoStation.acbe_uapsd; + sta_ds->qos.capability.qosInfo.acbk_uapsd = + assoc_req->WMMInfoStation.acbk_uapsd; + sta_ds->qos.capability.qosInfo.acvo_uapsd = + assoc_req->WMMInfoStation.acvo_uapsd; + sta_ds->qos.capability.qosInfo.acvi_uapsd = + assoc_req->WMMInfoStation.acvi_uapsd; + sta_ds->qos.capability.qosInfo.maxSpLen = + assoc_req->WMMInfoStation.max_sp_length; } } - if (pAssocReq->wsmCapablePresent && (wsmMode == eHAL_SET)) - pStaDs->wsmEnabled = true; + if (assoc_req->wsmCapablePresent && (wsm_mode == eHAL_SET)) + sta_ds->wsmEnabled = true; } /* Re/Assoc Response frame to requesting STA */ - pStaDs->mlmStaContext.subType = subType; + sta_ds->mlmStaContext.subType = sub_type; #ifdef WLAN_FEATURE_11W - pStaDs->rmfEnabled = (pmfConnection) ? 1 : 0; - pStaDs->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; - timerId.fields.sessionId = psessionEntry->peSessionId; - timerId.fields.peerIdx = peerIdx; - if (wlan_cfg_get_int(pMac, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL, - &retryInterval) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + sta_ds->rmfEnabled = (pmf_connection) ? 1 : 0; + sta_ds->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; + timer_id.fields.sessionId = session->peSessionId; + timer_id.fields.peerIdx = peer_idx; + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL, + &retry_interval) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, FL ("Could not retrieve PMF SA Query retry interval value")); - lim_reject_association(pMac, pHdr->sa, subType, true, authType, - peerIdx, false, + lim_reject_association(mac_ctx, hdr->sa, sub_type, true, auth_type, + peer_idx, false, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); goto error; } - if (WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMIN > retryInterval) { - retryInterval = WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF; + if (WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMIN > retry_interval) { + retry_interval = WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF; } - if (tx_timer_create(pMac, &pStaDs->pmfSaQueryTimer, "PMF SA Query timer", - lim_pmf_sa_query_timer_handler, timerId.value, - SYS_MS_TO_TICKS((retryInterval * 1024) / 1000), + if (tx_timer_create(mac_ctx, &sta_ds->pmfSaQueryTimer, "PMF SA Query timer", + lim_pmf_sa_query_timer_handler, timer_id.value, + SYS_MS_TO_TICKS((retry_interval * 1024) / 1000), 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGE, FL("could not create PMF SA Query timer")); - lim_reject_association(pMac, pHdr->sa, - subType, true, authType, - peerIdx, false, + lim_log(mac_ctx, LOGE, FL("could not create PMF SA Query timer")); + lim_reject_association(mac_ctx, hdr->sa, + sub_type, true, auth_type, + peer_idx, false, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); goto error; } #endif - if (pAssocReq->ExtCap.present) { - lim_set_stads_rtt_cap(pStaDs, - (struct s_ext_cap *) pAssocReq->ExtCap.bytes, pMac); + if (assoc_req->ExtCap.present) { + lim_set_stads_rtt_cap(sta_ds, + (struct s_ext_cap *) assoc_req->ExtCap.bytes, mac_ctx); } else { - pStaDs->timingMeasCap = 0; - PELOG1(lim_log(pMac, LOG1, FL("ExtCap not present"));) + sta_ds->timingMeasCap = 0; + PELOG1(lim_log(mac_ctx, LOG1, FL("ExtCap not present"));) } - /* BTAMP: Storing the parsed assoc request in the psessionEntry array */ - if (psessionEntry->parsedAssocReq) - psessionEntry->parsedAssocReq[pStaDs->assocId] = pAssocReq; + /* BTAMP: Storing the parsed assoc request in the session array */ + if (session->parsedAssocReq) + session->parsedAssocReq[sta_ds->assocId] = assoc_req; assoc_req_copied = true; - /* BTAMP: If STA context already exist (ie. updateContext = 1) + /* BTAMP: If STA context already exist (ie. update_ctx = 1) * for this STA, then we should delete the old one, and add * the new STA. This is taken care of in the lim_del_sta() routine. * @@ -1493,88 +1477,88 @@ sendIndToSme: * BTAMP, we're directly adding station before waiting for * SME_ASSOC_CNF, so we can do this now. */ - if (!updateContext) { - pStaDs->mlmStaContext.updateContext = 0; + if (!update_ctx) { + sta_ds->mlmStaContext.updateContext = 0; /* BTAMP: Add STA context at HW - issue WMA_ADD_STA_REQ to HAL */ - if (lim_add_sta(pMac, pStaDs, false, psessionEntry) != + if (lim_add_sta(mac_ctx, sta_ds, false, session) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("could not Add STA with assocId=%d"), - pStaDs->assocId); - lim_reject_association(pMac, pStaDs->staAddr, - pStaDs->mlmStaContext.subType, + sta_ds->assocId); + lim_reject_association(mac_ctx, sta_ds->staAddr, + sta_ds->mlmStaContext.subType, true, - pStaDs->mlmStaContext.authType, - pStaDs->assocId, true, + sta_ds->mlmStaContext.authType, + sta_ds->assocId, true, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); - if (psessionEntry->parsedAssocReq) - pAssocReq = psessionEntry->parsedAssocReq[ - pStaDs->assocId]; + if (session->parsedAssocReq) + assoc_req = session->parsedAssocReq[ + sta_ds->assocId]; goto error; } } else { - pStaDs->mlmStaContext.updateContext = 1; + sta_ds->mlmStaContext.updateContext = 1; - mlmPrevState = pStaDs->mlmStaContext.mlmState; + mlm_prev_state = sta_ds->mlmStaContext.mlmState; /* As per the HAL/FW needs the reassoc req need not be calling lim_del_sta */ - if (subType != LIM_REASSOC) { + if (sub_type != LIM_REASSOC) { /* we need to set the mlmState here in order differentiate in lim_del_sta. */ - pStaDs->mlmStaContext.mlmState = + sta_ds->mlmStaContext.mlmState = eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE; - if (lim_del_sta(pMac, pStaDs, true, psessionEntry) != + if (lim_del_sta(mac_ctx, sta_ds, true, session) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL ("could not DEL STA with assocId=%d staId %d"), - pStaDs->assocId, pStaDs->staIndex); - lim_reject_association(pMac, pStaDs->staAddr, - pStaDs->mlmStaContext. + sta_ds->assocId, sta_ds->staIndex); + lim_reject_association(mac_ctx, sta_ds->staAddr, + sta_ds->mlmStaContext. subType, true, - pStaDs->mlmStaContext. - authType, pStaDs->assocId, + sta_ds->mlmStaContext. + authType, sta_ds->assocId, true, (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); + session); /* Restoring the state back. */ - pStaDs->mlmStaContext.mlmState = mlmPrevState; - if (psessionEntry->parsedAssocReq) - pAssocReq = - psessionEntry->parsedAssocReq[ - pStaDs->assocId]; + sta_ds->mlmStaContext.mlmState = mlm_prev_state; + if (session->parsedAssocReq) + assoc_req = + session->parsedAssocReq[ + sta_ds->assocId]; goto error; } } else { /* mlmState is changed in lim_add_sta context */ /* use the same AID, already allocated */ - if (lim_add_sta(pMac, pStaDs, false, psessionEntry) != + if (lim_add_sta(mac_ctx, sta_ds, false, session) != eSIR_SUCCESS) { - lim_log(pMac, LOGE, + lim_log(mac_ctx, LOGE, FL("Could not AddSta with assocId= %d" "staId %d"), - pStaDs->assocId, pStaDs->staIndex); - lim_reject_association(pMac, pStaDs->staAddr, - pStaDs->mlmStaContext. + sta_ds->assocId, sta_ds->staIndex); + lim_reject_association(mac_ctx, sta_ds->staAddr, + sta_ds->mlmStaContext. subType, true, - pStaDs->mlmStaContext. - authType, pStaDs->assocId, + sta_ds->mlmStaContext. + authType, sta_ds->assocId, true, (tSirResultCodes) eSIR_MAC_WME_REFUSED_STATUS, - psessionEntry); + session); /* Restoring the state back. */ - pStaDs->mlmStaContext.mlmState = mlmPrevState; - if (psessionEntry->parsedAssocReq) - pAssocReq = - psessionEntry->parsedAssocReq[ - pStaDs->assocId]; + sta_ds->mlmStaContext.mlmState = mlm_prev_state; + if (session->parsedAssocReq) + assoc_req = + session->parsedAssocReq[ + sta_ds->assocId]; goto error; } @@ -1583,55 +1567,53 @@ sendIndToSme: } /* AddSta is sucess here */ - if (LIM_IS_AP_ROLE(psessionEntry) && - IS_DOT11_MODE_HT(psessionEntry->dot11mode) && - pAssocReq->HTCaps.present && pAssocReq->wmeInfoPresent) { + if (LIM_IS_AP_ROLE(session) && + IS_DOT11_MODE_HT(session->dot11mode) && + assoc_req->HTCaps.present && assoc_req->wmeInfoPresent) { /** Update in the HAL Station Table for the Update of the Protection Mode */ - lim_post_sm_state_update(pMac, pStaDs->staIndex, - pStaDs->htMIMOPSState, - pStaDs->staAddr, - psessionEntry->smeSessionId); + lim_post_sm_state_update(mac_ctx, sta_ds->staIndex, + sta_ds->htMIMOPSState, + sta_ds->staAddr, + session->smeSessionId); } return; error: - if (pAssocReq != NULL) { - if (pAssocReq->assocReqFrame) { - qdf_mem_free(pAssocReq->assocReqFrame); - pAssocReq->assocReqFrame = NULL; - pAssocReq->assocReqFrameLength = 0; + if (assoc_req != NULL) { + if (assoc_req->assocReqFrame) { + qdf_mem_free(assoc_req->assocReqFrame); + assoc_req->assocReqFrame = NULL; + assoc_req->assocReqFrameLength = 0; } - qdf_mem_free(pAssocReq); + qdf_mem_free(assoc_req); /* to avoid double free */ - if (assoc_req_copied && psessionEntry->parsedAssocReq) - psessionEntry->parsedAssocReq[pStaDs->assocId] = NULL; + if (assoc_req_copied && session->parsedAssocReq) + session->parsedAssocReq[sta_ds->assocId] = NULL; } /* If it is not duplicate Assoc request then only make to Null */ - if ((pStaDs != NULL) && - (pStaDs->mlmStaContext.mlmState != eLIM_MLM_WT_ADD_STA_RSP_STATE)) { - if (psessionEntry->parsedAssocReq != NULL) { - pTempAssocReq = - psessionEntry->parsedAssocReq[pStaDs->assocId]; - if (pTempAssocReq != NULL) { - if (pTempAssocReq->assocReqFrame) { - qdf_mem_free(pTempAssocReq-> + if ((sta_ds != NULL) && + (sta_ds->mlmStaContext.mlmState != eLIM_MLM_WT_ADD_STA_RSP_STATE)) { + if (session->parsedAssocReq != NULL) { + tmp_assoc_req = + session->parsedAssocReq[sta_ds->assocId]; + if (tmp_assoc_req != NULL) { + if (tmp_assoc_req->assocReqFrame) { + qdf_mem_free(tmp_assoc_req-> assocReqFrame); - pTempAssocReq->assocReqFrame = NULL; - pTempAssocReq->assocReqFrameLength = 0; + tmp_assoc_req->assocReqFrame = NULL; + tmp_assoc_req->assocReqFrameLength = 0; } - qdf_mem_free(pTempAssocReq); - psessionEntry-> - parsedAssocReq[pStaDs->assocId] = NULL; + qdf_mem_free(tmp_assoc_req); + session-> + parsedAssocReq[sta_ds->assocId] = NULL; } } } - return; - -} /*** end lim_process_assoc_req_frame() ***/ +} #ifdef FEATURE_WLAN_WAPI /** -- cgit v1.2.3 From 3e2e935a03fc0d33d3372aa219d4719cc8101b15 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Tue, 2 Feb 2016 13:31:31 -0800 Subject: qcacld-3.0: Fix typo on gEnableM2MLimitation config Fix a typo on default values of gEnableM2MLimitation config parameter Change-Id: I730dd10118777359fe644d5c5c9f1671b5d185bb CRs-fixed: 922181 --- core/hdd/src/wlan_hdd_cfg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 3c2eda6604a2..397e05b9f253 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3681,9 +3681,9 @@ REG_TABLE_ENTRY g_registry_table[] = { REG_VARIABLE(CFG_ENABLE_M2M_LIMITATION, WLAN_PARAM_Integer, struct hdd_config, enable_m2m_limitation, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_LFR_SUBNET_DEFAULT, - CFG_ENABLE_LFR_SUBNET_MIN, - CFG_ENABLE_LFR_SUBNET_MAX), + CFG_ENABLE_M2M_LIMITATION_DEFAULT, + CFG_ENABLE_M2M_LIMITATION_MIN, + CFG_ENABLE_M2M_LIMITATION_MAX), #endif }; -- cgit v1.2.3 From e27e2aa2c0969d7a652243449eb67d9d82c7bec9 Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Thu, 4 Feb 2016 14:43:18 -0800 Subject: Release 5.1.0.2G Rebase of 5.0.0.162 onto 5.1.0.1G Change-Id: Ice0a1557e23a66b94d278879337ea10769b894d1 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index f2dd78f3ca47..4cfd5d624402 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "H" -#define QWLAN_VERSION_BUILD 1 +#define QWLAN_VERSION_EXTRA "G" +#define QWLAN_VERSION_BUILD 2 -#define QWLAN_VERSIONSTR "5.1.0.1H" +#define QWLAN_VERSIONSTR "5.1.0.2G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 262d95a523d05bb94c362f6824d1deed61cb1692 Mon Sep 17 00:00:00 2001 From: Deepak Dhamdhere Date: Sun, 10 Jan 2016 16:36:53 -0800 Subject: qcacld-3.0: Remove WLAN_FEATURE_VOWIFI_11R option from MAC Conditional compilation option WLAN_FEATURE_VOWIFI_11R is always defined in cld3.0 and underlying code is permanent in the driver. Hence, remove #ifdef WLAN_FEATURE_VOWIFI_11R check from MAC source code. CRs-Fixed: 960105 Change-Id: Iae95c169c7e78310d18cbf9ae097501d4c66230c --- core/mac/inc/ani_global.h | 6 -- core/mac/inc/ani_system_defs.h | 2 - core/mac/inc/sir_api.h | 6 -- core/mac/inc/wni_api.h | 2 - core/mac/src/include/parser_api.h | 14 +---- core/mac/src/include/sir_params.h | 4 -- core/mac/src/pe/include/lim_ft.h | 3 - core/mac/src/pe/include/lim_ft_defs.h | 3 - core/mac/src/pe/include/lim_global.h | 2 - core/mac/src/pe/include/lim_session.h | 6 -- core/mac/src/pe/lim/lim_aid_mgmt.c | 4 +- core/mac/src/pe/lim/lim_api.c | 4 -- core/mac/src/pe/lim/lim_assoc_utils.c | 8 --- core/mac/src/pe/lim/lim_assoc_utils.h | 2 - core/mac/src/pe/lim/lim_ft.c | 4 -- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 2 - core/mac/src/pe/lim/lim_link_monitoring_algo.c | 2 - core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 14 +---- core/mac/src/pe/lim/lim_process_auth_frame.c | 11 +--- core/mac/src/pe/lim/lim_process_message_queue.c | 14 ----- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 6 -- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 7 +-- core/mac/src/pe/lim/lim_process_probe_req_frame.c | 2 - core/mac/src/pe/lim/lim_process_sme_req_messages.c | 8 --- core/mac/src/pe/lim/lim_prop_exts_utils.c | 2 - core/mac/src/pe/lim/lim_scan_result_utils.c | 4 -- core/mac/src/pe/lim/lim_security_utils.c | 2 - core/mac/src/pe/lim/lim_send_management_frames.c | 69 ++++++++-------------- core/mac/src/pe/lim/lim_send_messages.c | 2 - core/mac/src/pe/lim/lim_send_messages.h | 2 - core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 10 ---- core/mac/src/pe/lim/lim_send_sme_rsp_messages.h | 2 - core/mac/src/pe/lim/lim_session.c | 8 --- core/mac/src/pe/lim/lim_session_utils.c | 4 +- core/mac/src/pe/lim/lim_timer_utils.c | 5 +- core/mac/src/pe/lim/lim_timer_utils.h | 4 +- core/mac/src/pe/lim/lim_trace.c | 2 - core/mac/src/pe/lim/lim_types.h | 6 -- core/mac/src/pe/lim/lim_utils.c | 7 --- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 8 --- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 10 ---- 41 files changed, 35 insertions(+), 248 deletions(-) diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index f1c580312a1f..0838c75c6ae0 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -47,9 +47,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #include "sir_api.h" #include "csr_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "sme_ft_api.h" -#endif #include "csr_support.h" #include "sme_internal.h" #include "sap_api.h" @@ -65,9 +63,7 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #endif #include "p2p_api.h" -#if defined WLAN_FEATURE_VOWIFI_11R #include -#endif /* Check if this definition can actually move here from halInternal.h even for Volans. In that case */ /* this featurization can be removed. */ @@ -313,9 +309,7 @@ typedef struct sLimTimers { /* quiet duration */ TX_TIMER gLimQuietBssTimer; -#ifdef WLAN_FEATURE_VOWIFI_11R TX_TIMER gLimFTPreAuthRspTimer; -#endif #ifdef FEATURE_WLAN_ESE TX_TIMER gLimEseTsmTimer; diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h index ebaa1311bc85..4d5796ec82d4 100644 --- a/core/mac/inc/ani_system_defs.h +++ b/core/mac/inc/ani_system_defs.h @@ -73,9 +73,7 @@ typedef enum eAniBool { typedef enum eAniAuthType { eSIR_OPEN_SYSTEM, eSIR_SHARED_KEY, -#if defined WLAN_FEATURE_VOWIFI_11R eSIR_FT_AUTH, -#endif #if defined FEATURE_WLAN_ESE eSIR_LEAP_AUTH = 0x80, #endif diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index e0aa3801b0b8..7e4c033d2da4 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -677,11 +677,9 @@ typedef struct sSirBssDescription { uint32_t parentTSF; uint32_t startTSF[2]; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdiePresent; /* MDIE for 11r, picked from the beacons */ uint8_t mdie[SIR_MDIE_SIZE]; -#endif #ifdef FEATURE_WLAN_ESE uint16_t QBSSLoad_present; uint16_t QBSSLoad_avail; @@ -990,9 +988,7 @@ typedef struct sSirSmeJoinReq { tAniEdType MgmtEncryptionType; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R tAniBool is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE tAniBool isESEFeatureIniEnabled; tAniBool isESEconnection; @@ -1045,9 +1041,7 @@ typedef struct sSirSmeJoinRsp { uint32_t beaconLength; uint32_t assocReqLength; uint32_t assocRspLength; -#ifdef WLAN_FEATURE_VOWIFI_11R uint32_t parsedRicRspLen; -#endif #ifdef FEATURE_WLAN_ESE uint32_t tspecIeLen; #endif diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 64235814b2e9..c71c8069a694 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -129,13 +129,11 @@ enum eWniMsgTypes { eWNI_SME_ADD_STA_SELF_RSP, eWNI_SME_DEL_STA_SELF_RSP, -#if defined WLAN_FEATURE_VOWIFI_11R eWNI_SME_FT_PRE_AUTH_REQ, eWNI_SME_FT_PRE_AUTH_RSP, eWNI_SME_FT_UPDATE_KEY, eWNI_SME_FT_AGGR_QOS_REQ, eWNI_SME_FT_AGGR_QOS_RSP, -#endif #if defined FEATURE_WLAN_ESE eWNI_SME_ESE_ADJACENT_AP_REPORT, diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 42f016a09163..687fc3c93fcf 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -41,9 +41,7 @@ #include #include "sir_mac_prop_exts.h" #include "dot11f.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #define COUNTRY_STRING_LENGTH (3) @@ -115,9 +113,7 @@ typedef struct sSirProbeRespBeacon { tDot11fIEHTCaps HTCaps; tDot11fIEHTInfo HTInfo; tDot11fIEP2PProbeRes P2PProbeRes; -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdie[SIR_MDIE_SIZE]; -#endif #ifdef FEATURE_WLAN_ESE tDot11fIEESETxmitPower eseTxPwr; tDot11fIEQBSSLoad QBSSLoad; @@ -147,9 +143,7 @@ typedef struct sSirProbeRespBeacon { uint8_t tpcReportPresent; uint8_t powerConstraintPresent; -#ifdef WLAN_FEATURE_VOWIFI_11R uint8_t mdiePresent; -#endif #ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; @@ -256,12 +250,10 @@ typedef struct sSirAssocRsp { tSirAddtsRspInfo addtsRsp; tDot11fIEHTCaps HTCaps; tDot11fIEHTInfo HTInfo; -#if defined WLAN_FEATURE_VOWIFI_11R tDot11fIEFTInfo FTInfo; uint8_t mdie[SIR_MDIE_SIZE]; uint8_t num_RICData; tDot11fIERICDataDesc RICData[2]; -#endif #ifdef FEATURE_WLAN_ESE uint8_t num_tspecs; @@ -276,11 +268,9 @@ typedef struct sSirAssocRsp { uint8_t wmeEdcaPresent; uint8_t addtsPresent; uint8_t wsmCapablePresent; -#if defined WLAN_FEATURE_VOWIFI_11R uint8_t ftinfoPresent; uint8_t mdiePresent; uint8_t ricPresent; -#endif #ifdef FEATURE_WLAN_ESE uint8_t tspecPresent; uint8_t tsmPresent; @@ -907,11 +897,9 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, tpPESession psessionEntry); #endif -#if defined WLAN_FEATURE_VOWIFI_11R void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain * pDot11f, uint8_t mdie[]); void populate_ft_info(tpAniSirGlobal pMac, tDot11fIEFTInfo *pDot11f); -#endif void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp, diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index ff6f339154e8..affd556d5cf3 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -336,12 +336,10 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_CFG_RXP_FILTER_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 106) -#ifdef WLAN_FEATURE_VOWIFI_11R #define SIR_HAL_AGGR_ADD_TS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 107) #define SIR_HAL_AGGR_ADD_TS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 108) #define SIR_HAL_AGGR_QOS_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 109) #define SIR_HAL_AGGR_QOS_RSP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 110) -#endif /* WLAN_FEATURE_VOWIFI_11R */ /* P2P <-> HAL P2P msg */ #define SIR_HAL_SET_P2P_GO_NOA_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 111) @@ -678,9 +676,7 @@ typedef struct sSirMbMsgP2p { #define SIR_LIM_QUIET_BSS_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1C) #define SIR_LIM_WPS_OVERLAP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1D) -#ifdef WLAN_FEATURE_VOWIFI_11R #define SIR_LIM_FT_PREAUTH_RSP_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1E) -#endif #define SIR_LIM_REMAIN_CHN_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x1F) #define SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x20) diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index 9c8dd36a2baf..3f514877282c 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#if defined WLAN_FEATURE_VOWIFI_11R /**========================================================================= Macros and Function prototypes FT and 802.11R purposes @@ -84,5 +83,3 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req); #endif /* __LIMFT_H__ */ - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/include/lim_ft_defs.h b/core/mac/src/pe/include/lim_ft_defs.h index 95dfa3730dfb..476d1d35616c 100644 --- a/core/mac/src/pe/include/lim_ft_defs.h +++ b/core/mac/src/pe/include/lim_ft_defs.h @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#if defined WLAN_FEATURE_VOWIFI_11R /**========================================================================= Macros and Function prototypes FT and 802.11R purposes @@ -131,5 +130,3 @@ typedef struct sFTPEContext { } tftPEContext, *tpftPEContext; #endif /* __LIMFTDEFS_H__ */ - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 657518f808b7..b61b4d8a7e4f 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -165,10 +165,8 @@ typedef enum eLimMlmStates { eLIM_MLM_WT_SET_STA_KEY_STATE, eLIM_MLM_WT_SET_STA_BCASTKEY_STATE, eLIM_MLM_WT_SET_MIMOPS_STATE, -#if defined WLAN_FEATURE_VOWIFI_11R eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE, eLIM_MLM_WT_FT_REASSOC_RSP_STATE, -#endif eLIM_MLM_P2P_LISTEN_STATE, } tLimMlmStates; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index c7013e18425e..5ff9dd66862e 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -192,10 +192,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint8_t *assocRsp; /* Used to store association response received while associating */ tAniSirDph dph; void **parsedAssocReq; /* Used to store parsed assoc req from various requesting station */ -#ifdef WLAN_FEATURE_VOWIFI_11R uint32_t RICDataLen; /* Used to store the Ric data received in the assoc response */ uint8_t *ricData; -#endif #ifdef FEATURE_WLAN_ESE uint32_t tspecLen; /* Used to store the TSPEC IEs received in the assoc response */ uint8_t *tspecIes; @@ -281,9 +279,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ int8_t txMgmtPower; #endif -#ifdef WLAN_FEATURE_VOWIFI_11R tAniBool is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE tAniBool isESEconnection; @@ -447,10 +443,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ bool bRoamSynchInProgress; #endif -#if defined WLAN_FEATURE_VOWIFI_11R /* Fast Transition (FT) */ tftPEContext ftPEContext; -#endif bool isNonRoamReassoc; #ifdef WLAN_FEATURE_11W qdf_mc_timer_t pmfComebackTimer; diff --git a/core/mac/src/pe/lim/lim_aid_mgmt.c b/core/mac/src/pe/lim/lim_aid_mgmt.c index 253543d86b02..f99a8ae25197 100644 --- a/core/mac/src/pe/lim/lim_aid_mgmt.c +++ b/core/mac/src/pe/lim/lim_aid_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -43,9 +43,7 @@ #include "sir_params.h" #include "lim_utils.h" #include "lim_timer_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index b8db70abbdec..d875899ac3cb 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -57,9 +57,7 @@ #include "lim_send_sme_rsp_messages.h" #include "wmm_apsd.h" #include "lim_trace.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "wma_types.h" @@ -713,9 +711,7 @@ void lim_cleanup(tpAniSirGlobal pMac) rrm_cleanup(pMac); #endif -#if defined WLAN_FEATURE_VOWIFI_11R lim_ft_cleanup_all_ft_sessions(pMac); -#endif } /*** end lim_cleanup() ***/ diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 8d720cb21894..9aa6e118c1fb 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -55,9 +55,7 @@ #include "lim_admit_control.h" #include "lim_send_messages.h" #include "lim_ibss_peer_mgmt.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "qdf_types.h" @@ -2783,7 +2781,6 @@ lim_del_sta(tpAniSirGlobal pMac, return retCode; } -#if defined WLAN_FEATURE_VOWIFI_11R /** * lim_add_ft_sta_self()- function to add STA once we have connected with a * new AP @@ -2837,7 +2834,6 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, session_entry->ftPEContext.pAddStaReq = NULL; return ret_code; } -#endif /* WLAN_FEATURE_VOWIFI_11R */ /** * lim_add_sta_self() @@ -4223,11 +4219,9 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; -#if defined WLAN_FEATURE_VOWIFI_11R pAddBssParams->extSetStaKeyParamValid = 0; lim_log(pMac, LOG2, FL("extSetStaKeyParamValid: %d"), pAddBssParams->extSetStaKeyParamValid); -#endif #ifdef WLAN_FEATURE_11W if (psessionEntry->limRmfEnabled) { @@ -4755,11 +4749,9 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->bSpectrumMgtEnabled = psessionEntry->spectrumMgtEnabled; -#if defined WLAN_FEATURE_VOWIFI_11R pAddBssParams->extSetStaKeyParamValid = 0; lim_log(pMac, LOG2, FL("extSetStaKeyParamValid: %d"), pAddBssParams->extSetStaKeyParamValid); -#endif #ifdef WLAN_FEATURE_11W if (psessionEntry->limRmfEnabled) { diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 941513b241fd..7686940149c0 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -120,10 +120,8 @@ tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal, tSirRetStatus lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, tpPESession); tSirRetStatus lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, tpPESession); tSirRetStatus lim_del_sta(tpAniSirGlobal, tpDphHashNode, bool, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, uint16_t assocId, tpPESession psessionEntry); -#endif /* WLAN_FEATURE_VOWIFI_11R */ tSirRetStatus lim_add_sta_self(tpAniSirGlobal, uint16_t, uint8_t, tpPESession); tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 98318ba6124a..82fbd8e5ced0 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -25,7 +25,6 @@ * to the Linux Foundation. */ -#ifdef WLAN_FEATURE_VOWIFI_11R /**========================================================================= \brief implementation for PE 11r VoWiFi FT Protocol @@ -922,9 +921,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->limReassocBssPropCap = pftSessionEntry->limCurrentBssPropCap; -#ifdef WLAN_FEATURE_VOWIFI_11R pftSessionEntry->is11Rconnection = psessionEntry->is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE pftSessionEntry->isESEconnection = psessionEntry->isESEconnection; pftSessionEntry->is_ese_version_ie_present = @@ -1998,4 +1995,3 @@ void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, } } -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index a8c26803d40c..cfd4752271cd 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -35,9 +35,7 @@ #include "sch_api.h" /* sch_set_fixed_beacon_fields for IBSS coalesce */ #include "lim_security_utils.h" #include "lim_send_messages.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_ibss_peer_mgmt.h" #include "lim_types.h" diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index 416edf1dd824..07ca20322c8b 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -51,9 +51,7 @@ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h" #endif /* FEATURE_WLAN_DIAG_SUPPORT */ -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_ser_des_utils.h" diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 510e3f2da3f2..8faefd1cf15f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -363,7 +363,6 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, psessionEntry->limMlmState)); } -#ifdef WLAN_FEATURE_VOWIFI_11R /** * lim_update_ric_data() - update session with ric data * @mac_ctx: Pointer to Global MAC structure @@ -409,7 +408,6 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx, } return; } -#endif #ifdef FEATURE_WLAN_ESE @@ -761,9 +759,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, session_entry->assocRspLen = frame_len; } -#ifdef WLAN_FEATURE_VOWIFI_11R lim_update_ric_data(mac_ctx, session_entry, assoc_rsp); -#endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD roam_session = @@ -1106,12 +1102,9 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, assocReject: if ((subtype == LIM_ASSOC) -#ifdef WLAN_FEATURE_VOWIFI_11R || ((subtype == LIM_REASSOC) && (session_entry->limMlmState == - eLIM_MLM_WT_FT_REASSOC_RSP_STATE)) -#endif - ) { + eLIM_MLM_WT_FT_REASSOC_RSP_STATE))) { lim_log(mac_ctx, LOGE, FL("Assoc Rejected by the peer. " "mlmestate: %d sessionid %d Reason: %d MACADDR:" MAC_ADDRESS_STR), @@ -1129,14 +1122,11 @@ assocReject: if (subtype == LIM_ASSOC) { lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF, (uint32_t *) &assoc_cnf); - } -#ifdef WLAN_FEATURE_VOWIFI_11R - else { + } else { assoc_cnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; lim_post_sme_message(mac_ctx, LIM_MLM_REASSOC_CNF, (uint32_t *)&assoc_cnf); } -#endif } else { lim_restore_pre_reassoc_state(mac_ctx, eSIR_SME_REASSOC_REFUSED, diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index 41b4c9cf44a7..ce612bf9d716 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -48,9 +48,7 @@ #include "lim_assoc_utils.h" #include "lim_security_utils.h" #include "lim_ser_des_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" -#endif #include "cds_utils.h" /** @@ -512,7 +510,6 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, /* AuthFrame 2 */ if (pe_session->limMlmState != eLIM_MLM_WT_AUTH_FRAME2_STATE) { -#ifdef WLAN_FEATURE_VOWIFI_11R /** * Check if a Reassociation is in progress and this is a * Pre-Auth frame @@ -540,9 +537,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, pe_session->ftPEContext.saved_auth_rsp_length = frame_len; } - } else -#endif - { + } else { /* * Received Auth frame2 in an unexpected state. * Log error and ignore the frame. @@ -1362,8 +1357,6 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, } } -#ifdef WLAN_FEATURE_VOWIFI_11R - /*---------------------------------------------------------------------- * * Pass the received Auth frame. This is possibly the pre-auth from the @@ -1529,5 +1522,3 @@ tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *pB return ret_status; } - -#endif /* WLAN_FEATURE_VOWIFI_11R */ diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 0e715472ff84..fcbcdccffe86 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -51,9 +51,7 @@ #include "lim_admit_control.h" #include "lim_ibss_peer_mgmt.h" #include "sch_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_send_messages.h" @@ -61,9 +59,7 @@ #include "rrm_api.h" #endif -#if defined WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" -#endif #include "qdf_types.h" #include "cds_packet.h" @@ -813,7 +809,6 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg psessionEntry = pe_find_session_by_bssid(pMac, pHdr->bssId, &sessionId); if (psessionEntry == NULL) { -#ifdef WLAN_FEATURE_VOWIFI_11R if (fc.subType == SIR_MAC_MGMT_AUTH) { lim_log(pMac, LOG1, FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"), @@ -826,7 +821,6 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg goto end; } } -#endif /* Public action frame can be received from non-assoc stations*/ if ((fc.subType != SIR_MAC_MGMT_PROBE_RSP) && (fc.subType != SIR_MAC_MGMT_BEACON) && @@ -1353,11 +1347,9 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) #if defined FEATURE_WLAN_ESE case eWNI_SME_ESE_ADJACENT_AP_REPORT: #endif -#ifdef WLAN_FEATURE_VOWIFI_11R case eWNI_SME_FT_UPDATE_KEY: case eWNI_SME_FT_PRE_AUTH_REQ: case eWNI_SME_FT_AGGR_QOS_REQ: -#endif case eWNI_SME_REGISTER_MGMT_FRAME_REQ: case eWNI_SME_UPDATE_NOA: case eWNI_SME_CLEAR_DFS_CHANNEL_LIST: @@ -1532,9 +1524,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_AUTH_RSP_TIMEOUT: case SIR_LIM_ASSOC_FAIL_TIMEOUT: case SIR_LIM_REASSOC_FAIL_TIMEOUT: -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: -#endif case SIR_LIM_REMAIN_CHN_TIMEOUT: case SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT: case SIR_LIM_DISASSOC_ACK_TIMEOUT: @@ -1655,14 +1645,11 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_mem_free((void *)(msg->bodyptr)); msg->bodyptr = NULL; break; -#ifdef WLAN_FEATURE_VOWIFI_11R case WMA_AGGR_QOS_RSP: lim_process_ft_aggr_qo_s_rsp(mac_ctx, msg); break; -#endif case WMA_SET_LINK_STATE_RSP: link_state_param = (tLinkStateParams *) msg->bodyptr; -#if defined WLAN_FEATURE_VOWIFI_11R session_entry = link_state_param->session; if (link_state_param->ft #if defined WLAN_FEATURE_ROAM_OFFLOAD @@ -1672,7 +1659,6 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_send_reassoc_req_with_ft_ies_mgmt_frame(mac_ctx, session_entry->pLimMlmReassocReq, session_entry); -#endif if (link_state_param->callback) link_state_param->callback(mac_ctx, link_state_param->callbackArg, diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index c26903d8ec68..ebb7f272940d 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -41,9 +41,7 @@ #include "lim_send_messages.h" #include "lim_send_messages.h" #include "lim_session_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include -#endif #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM #include "host_diag_core_log.h" #endif @@ -138,11 +136,9 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_ASSOC_FAIL_TIMEOUT: lim_process_assoc_failure_timeout(mac_ctx, msg->bodyval); break; -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: lim_process_ft_preauth_rsp_timeout(mac_ctx); break; -#endif case SIR_LIM_REMAIN_CHN_TIMEOUT: lim_process_remain_on_chn_timeout(mac_ctx); break; @@ -687,9 +683,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->bSpectrumMgtEnabled = session->spectrumMgtEnabled || lim_isconnected_on_dfs_channel(mlm_start_req->channelNumber); -#if defined WLAN_FEATURE_VOWIFI_11R addbss_param->extSetStaKeyParamValid = 0; -#endif addbss_param->dot11_mode = session->dot11mode; addbss_param->nss = session->nss; diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 8cc9c9371d2e..21afe39e39be 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -40,10 +40,8 @@ #include "lim_admit_control.h" #include "lim_send_messages.h" #include "lim_ibss_peer_mgmt.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft.h" #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" #if defined WLAN_FEATURE_VOWIFI @@ -1756,7 +1754,6 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, goto end; } if (session_entry->limSmeState == eLIM_SME_WT_REASSOC_STATE) { -#ifdef WLAN_FEATURE_VOWIFI_11R /* check if we have keys(PTK)to install in case of 11r */ tpftPEContext ft_ctx = &session_entry->ftPEContext; ft_session = pe_find_session_by_bssid(mac_ctx, @@ -1771,7 +1768,6 @@ void lim_process_sta_mlm_add_sta_rsp(tpAniSirGlobal mac_ctx, ft_ctx->PreAuthKeyInfo.extSetStaKeyParamValid = false; } -#endif } /* * Update the DPH Hash Entry for this STA @@ -2660,7 +2656,6 @@ joinFailure: } -#ifdef WLAN_FEATURE_VOWIFI_11R /*------------------------------------------------------------------------------------------ * * Function to handle WMA_ADD_BSS_RSP, in FT reassoc state. @@ -2910,7 +2905,7 @@ end: lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); } -#endif /* WLAN_FEATURE_VOWIFI_11R */ + /** * lim_process_sta_mlm_add_bss_rsp() - Process ADD BSS response * @mac_ctx: Pointer to Global MAC structure diff --git a/core/mac/src/pe/lim/lim_process_probe_req_frame.c b/core/mac/src/pe/lim/lim_process_probe_req_frame.c index 91b887da46f4..da973a0cf4fd 100644 --- a/core/mac/src/pe/lim/lim_process_probe_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_probe_req_frame.c @@ -46,9 +46,7 @@ #include "lim_assoc_utils.h" #include "lim_ser_des_utils.h" #include "parser_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" void diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index e588228df023..f84cbfdf5ffa 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -61,9 +61,7 @@ #include "sap_api.h" -#if defined WLAN_FEATURE_VOWIFI_11R #include -#endif #include "cds_regdomain_common.h" /* @@ -1799,9 +1797,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * which inturn is dependent on the profile the user wants * to connect to, So input is coming from supplicant */ -#ifdef WLAN_FEATURE_VOWIFI_11R session->is11Rconnection = sme_join_req->is11Rconnection; -#endif #ifdef FEATURE_WLAN_ESE session->isESEconnection = sme_join_req->isESEconnection; #endif @@ -2671,10 +2667,8 @@ static void __lim_process_sme_disassoc_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBu return; } -#if defined WLAN_FEATURE_VOWIFI_11R /* Delete FT session if there exists one */ lim_ft_cleanup_pre_auth_info(pMac, psessionEntry); -#endif lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); lim_clean_up_disassoc_deauth_req(pMac, @@ -4866,7 +4860,6 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) break; #endif -#if defined WLAN_FEATURE_VOWIFI_11R case eWNI_SME_FT_PRE_AUTH_REQ: bufConsumed = (bool) lim_process_ft_pre_auth_req(pMac, pMsg); break; @@ -4877,7 +4870,6 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) case eWNI_SME_FT_AGGR_QOS_REQ: lim_process_ft_aggr_qos_req(pMac, pMsgBuf); break; -#endif case eWNI_SME_REGISTER_MGMT_FRAME_REQ: __lim_process_sme_register_mgmt_frame_req(pMac, pMsgBuf); diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 7f966339d55e..3c8ddf4bf321 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -51,9 +51,7 @@ #include "lim_prop_exts_utils.h" #include "lim_ser_des_utils.h" #include "lim_trace.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "wma.h" diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index e8a68131d938..0794cc40aa1d 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -39,9 +39,7 @@ #include "lim_utils.h" #include "lim_ser_des_utils.h" #include "lim_api.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" @@ -202,7 +200,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac, } #endif -#ifdef WLAN_FEATURE_VOWIFI_11R /* MobilityDomain */ pBssDescr->mdie[0] = 0; pBssDescr->mdie[1] = 0; @@ -216,7 +213,6 @@ lim_collect_bss_description(tpAniSirGlobal pMac, pBssDescr->mdie[1] = pBPR->mdie[1]; pBssDescr->mdie[2] = pBPR->mdie[2]; } -#endif #ifdef FEATURE_WLAN_ESE pBssDescr->QBSSLoad_present = false; diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 2283bf755b3a..77edf9ff2842 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -46,9 +46,7 @@ #include "utils_api.h" #include "lim_utils.h" #include "lim_security_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #define LIM_SEED_LENGTH 16 diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 52220506ebcd..7be4311fc1ce 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -52,9 +52,7 @@ #include "wni_cfg.h" #endif -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "qdf_types.h" #include "qdf_trace.h" @@ -1809,7 +1807,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm->ExtCap, pe_session); -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->pLimJoinReq->is11Rconnection) { tSirBssDescription *bssdescr; @@ -1824,7 +1821,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, /* No 11r IEs dont send any MDIE */ lim_log(mac_ctx, LOG1, FL("MDIE not present")); } -#endif #ifdef FEATURE_WLAN_ESE /* @@ -2215,7 +2211,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, mac_ctx->lim.htCapabilityPresentInBeacon) { populate_dot11f_ht_caps(mac_ctx, pe_session, &frm.HTCaps); } -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->pLimReAssocReq->bssDescription.mdiePresent && (ft_sme_context->addMDIE == true) #if defined FEATURE_WLAN_ESE @@ -2225,7 +2220,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, populate_mdie(mac_ctx, &frm.MobilityDomain, pe_session->pLimReAssocReq->bssDescription.mdie); } -#endif #ifdef WLAN_FEATURE_11AC if (pe_session->vhtCapability && @@ -2270,10 +2264,8 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("FT IE Reassoc Req (%d)."), ft_sme_context->reassoc_ft_ies_length); -#if defined WLAN_FEATURE_VOWIFI_11R if (pe_session->is11Rconnection) ft_ies_length = ft_sme_context->reassoc_ft_ies_length; -#endif qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, (void **)&frame, (void **)&packet); @@ -2801,7 +2793,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, SIR_MAC_AUTH_CHALLENGE_OFFSET; body_len = SIR_MAC_AUTH_CHALLENGE_OFFSET; -#if defined WLAN_FEATURE_VOWIFI_11R if (auth_frame->authAlgoNumber == eSIR_FT_AUTH) { if (NULL != session->ftPEContext.pFTPreAuthReq && 0 != session->ftPEContext.pFTPreAuthReq-> @@ -2818,7 +2809,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, frame_len += (2 + SIR_MDIE_SIZE); } } -#endif break; case SIR_MAC_AUTH_FRAME_2: @@ -2960,7 +2950,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, qdf_mem_copy(body, (uint8_t *) &auth_frame->type, body_len); -#if defined WLAN_FEATURE_VOWIFI_11R if ((auth_frame->authAlgoNumber == eSIR_FT_AUTH) && (auth_frame->authTransactionSeqNumber == SIR_MAC_AUTH_FRAME_1) && @@ -2989,7 +2978,6 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, SIR_MDIE_SIZE); } } -#endif lim_log(mac_ctx, LOG1, FL("*** Sending Auth seq# %d status %d (%d) to " @@ -3073,39 +3061,38 @@ QDF_STATUS lim_send_deauth_cnf(tpAniSirGlobal pMac) /* / Receive path cleanup with dummy packet */ lim_ft_cleanup_pre_auth_info(pMac, psessionEntry); lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); -#ifdef WLAN_FEATURE_VOWIFI_11R - if ((psessionEntry->limSystemRole == eLIM_STA_ROLE) && - ( + if ((psessionEntry->limSystemRole == eLIM_STA_ROLE) && + ( #ifdef FEATURE_WLAN_ESE - (psessionEntry->isESEconnection) || + (psessionEntry->isESEconnection) || #endif - (psessionEntry->isFastRoamIniFeatureEnabled) || - (psessionEntry->is11Rconnection))) { - PELOGE(lim_log(pMac, LOGE, - FL("FT Preauth Session (%p,%d) Cleanup Deauth reason %d Trigger = %d"), - psessionEntry, psessionEntry->peSessionId, - pMlmDeauthReq->reasonCode, - pMlmDeauthReq->deauthTrigger);); - lim_ft_cleanup(pMac, psessionEntry); - } else { - PELOGE(lim_log(pMac, LOGE, - FL("No FT Preauth Session Cleanup in role %d" + (psessionEntry->isFastRoamIniFeatureEnabled) || + (psessionEntry->is11Rconnection))) { + lim_log(pMac, LOGE, + FL("FT Preauth (%p,%d) Deauth rc %d src = %d"), + psessionEntry, + psessionEntry->peSessionId, + pMlmDeauthReq->reasonCode, + pMlmDeauthReq->deauthTrigger); + lim_ft_cleanup(pMac, psessionEntry); + } else { + lim_log(pMac, LOGE, + FL("No FT Preauth Session Cleanup in role %d" #ifdef FEATURE_WLAN_ESE - " isESE %d" + " isESE %d" #endif - " isLFR %d" - " is11r %d, Deauth reason %d Trigger = %d"), - psessionEntry->limSystemRole, + " isLFR %d" + " is11r %d, Deauth reason %d Trigger = %d"), + psessionEntry->limSystemRole, #ifdef FEATURE_WLAN_ESE - psessionEntry->isESEconnection, -#endif - psessionEntry->isFastRoamIniFeatureEnabled, - psessionEntry->is11Rconnection, - pMlmDeauthReq->reasonCode, - pMlmDeauthReq->deauthTrigger);); - } + psessionEntry->isESEconnection, #endif - /* / Free up buffer allocated for mlmDeauthReq */ + psessionEntry->isFastRoamIniFeatureEnabled, + psessionEntry->is11Rconnection, + pMlmDeauthReq->reasonCode, + pMlmDeauthReq->deauthTrigger); + } + /* Free up buffer allocated for mlmDeauthReq */ qdf_mem_free(pMlmDeauthReq); pMac->lim.limDisassocDeauthCnfReq.pMlmDeauthReq = NULL; } @@ -3178,7 +3165,6 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) lim_log(mac_ctx, LOGE, FL("cleanup_rx_path error")); goto end; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (LIM_IS_STA_ROLE(pe_session) && ( #ifdef FEATURE_WLAN_ESE (pe_session->isESEconnection) || @@ -3191,10 +3177,8 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) FL("FT Preauth Session (%p,%d) Clean up"), pe_session, pe_session->peSessionId); -#if defined WLAN_FEATURE_VOWIFI_11R /* Delete FT session if there exists one */ lim_ft_cleanup_pre_auth_info(mac_ctx, pe_session); -#endif } else { lim_log(mac_ctx, LOGE, FL("No FT Preauth Session Clean up in role %d" @@ -3211,7 +3195,6 @@ QDF_STATUS lim_send_disassoc_cnf(tpAniSirGlobal mac_ctx) pe_session->is11Rconnection, disassoc_req->reasonCode); } -#endif /* Free up buffer allocated for mlmDisassocReq */ qdf_mem_free(disassoc_req); mac_ctx->lim.limDisassocDeauthCnfReq.pMlmDisassocReq = NULL; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index ad53515619b5..c4fcff20d216 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -527,7 +527,6 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, return retCode; } -#ifdef WLAN_FEATURE_VOWIFI_11R extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMacAddr, int ft, @@ -573,7 +572,6 @@ extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState } return retCode; } -#endif /** --------------------------------------------------------- \fn lim_send_beacon_filter_info diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index e8b4665a2962..9cf863df5361 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -89,12 +89,10 @@ tSirRetStatus lim_set_link_state(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMac, tpSetLinkStateCallback callback, void *callbackArg); -#ifdef WLAN_FEATURE_VOWIFI_11R extern tSirRetStatus lim_set_link_state_ft(tpAniSirGlobal pMac, tSirLinkState state, tSirMacAddr bssId, tSirMacAddr selfMacAddr, int ft, tpPESession psessionEntry); -#endif void lim_set_active_edca_params(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *plocalEdcaParams, tpPESession psessionEntry); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 02b4329ead73..580d40bc5768 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -301,7 +301,6 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (session_entry->ricData != NULL) { sme_join_rsp->parsedRicRspLen = session_entry->RICDataLen; @@ -317,7 +316,6 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("RicLength=%d"), sme_join_rsp->parsedRicRspLen); } -#endif #ifdef FEATURE_WLAN_ESE if (session_entry->tspecIes != NULL) { sme_join_rsp->tspecIeLen = @@ -379,13 +377,11 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->assocRsp = NULL; session_entry->assocRspLen = 0; } -#ifdef WLAN_FEATURE_VOWIFI_11R if (session_entry->ricData != NULL) { qdf_mem_free(session_entry->ricData); session_entry->ricData = NULL; session_entry->RICDataLen = 0; } -#endif #ifdef FEATURE_WLAN_ESE if (session_entry->tspecIes != NULL) { qdf_mem_free(session_entry->tspecIes); @@ -450,9 +446,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, } else { rsp_len = session_entry->assocReqLen + session_entry->assocRspLen + session_entry->bcnLen + -#ifdef WLAN_FEATURE_VOWIFI_11R session_entry->RICDataLen + -#endif #ifdef FEATURE_WLAN_ESE session_entry->tspecLen + #endif @@ -494,9 +488,7 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, sme_join_rsp->beaconLength = 0; sme_join_rsp->assocReqLength = 0; sme_join_rsp->assocRspLength = 0; -#ifdef WLAN_FEATURE_VOWIFI_11R sme_join_rsp->parsedRicRspLen = 0; -#endif #ifdef FEATURE_WLAN_ESE sme_join_rsp->tspecIeLen = 0; #endif @@ -2245,7 +2237,6 @@ void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ) } -#ifdef WLAN_FEATURE_VOWIFI_11R /** ----------------------------------------------------------------- \brief lim_send_sme_aggr_qos_rsp() - sends SME FT AGGR QOS RSP \ This function sends a eWNI_SME_FT_AGGR_QOS_RSP to SME. @@ -2270,7 +2261,6 @@ lim_send_sme_aggr_qos_rsp(tpAniSirGlobal pMac, tpSirAggrQosRsp aggrQosRsp, return; } -#endif void lim_send_sme_max_assoc_exceeded_ntf(tpAniSirGlobal pMac, tSirMacAddr peerMacAddr, uint8_t smesessionId) diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index 81049bcbfb83..4e94f4246678 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h @@ -73,11 +73,9 @@ void lim_send_sme_neighbor_bss_ind(tpAniSirGlobal, tLimScanResultNode *); void lim_handle_delete_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ MsgQ); void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg); -#ifdef WLAN_FEATURE_VOWIFI_11R void lim_send_sme_aggr_qos_rsp(tpAniSirGlobal pMac, tpSirAggrQosRsp aggrQosRsp, uint8_t smesessionId); -#endif /*WLAN_FEATURE_VOWIFI_11R */ void lim_send_sme_addts_rsp(tpAniSirGlobal pMac, uint8_t rspReqd, uint32_t status, tpPESession psessionEntry, tSirMacTspecIE tspec, diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c index 7d85ec189f26..b24be5489d6c 100644 --- a/core/mac/src/pe/lim/lim_session.c +++ b/core/mac/src/pe/lim/lim_session.c @@ -40,10 +40,8 @@ ------------------------------------------------------------------------*/ #include "ani_global.h" #include "lim_debug.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" #include "lim_ft.h" -#endif #include "lim_session.h" #include "lim_utils.h" @@ -303,9 +301,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, session_ptr->limSmeState = eLIM_SME_IDLE_STATE; session_ptr->limCurrentAuthType = eSIR_OPEN_SYSTEM; pe_init_beacon_params(pMac, &pMac->lim.gpSession[i]); -#ifdef WLAN_FEATURE_VOWIFI_11R session_ptr->is11Rconnection = false; -#endif #ifdef FEATURE_WLAN_ESE session_ptr->isESEconnection = false; #endif @@ -359,10 +355,8 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId, return NULL; } } -#if defined WLAN_FEATURE_VOWIFI_11R if (eSIR_INFRASTRUCTURE_MODE == bssType) lim_ft_open(pMac, &pMac->lim.gpSession[i]); -#endif if (eSIR_INFRA_AP_MODE == bssType) { session_ptr->old_protection_state = 0; session_ptr->mac_ctx = (void *)pMac; @@ -554,10 +548,8 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session) qdf_mc_timer_destroy(&session->protection_fields_reset_timer); } -#if defined (WLAN_FEATURE_VOWIFI_11R) /* Delete FT related information */ lim_ft_cleanup(mac_ctx, session); -#endif if (session->pLimStartBssReq != NULL) { qdf_mem_free(session->pLimStartBssReq); session->pLimStartBssReq = NULL; diff --git a/core/mac/src/pe/lim/lim_session_utils.c b/core/mac/src/pe/lim/lim_session_utils.c index 49b37a12b8d4..fb9aab1443e2 100644 --- a/core/mac/src/pe/lim/lim_session_utils.c +++ b/core/mac/src/pe/lim/lim_session_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -37,9 +37,7 @@ ------------------------------------------------------------------------*/ #include "ani_global.h" #include "lim_debug.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "lim_session_utils.h" #include "lim_utils.h" diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 92fa50434fca..8f3b6605115f 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -325,7 +325,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("Cannot create update OLBC cache tmr")); goto err_timer; } -#ifdef WLAN_FEATURE_VOWIFI_11R /* In future we need to use the auth timer, cause the pre auth session * will be introduced before sending Auth frame. We need to go off * channel and come back to home channel @@ -339,7 +338,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("could not create Join failure timer")); goto err_timer; } -#endif cfgValue = 1000; cfgValue = SYS_MS_TO_TICKS(cfgValue); if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimRemainOnChannelTimer, @@ -898,7 +896,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) case eLIM_LEARN_DURATION_TIMER: break; -#ifdef WLAN_FEATURE_VOWIFI_11R case eLIM_FT_PREAUTH_RSP_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimFTPreAuthRspTimer) != @@ -925,7 +922,7 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) return; } break; -#endif + case eLIM_REMAIN_CHN_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimRemainOnChannelTimer) != diff --git a/core/mac/src/pe/lim/lim_timer_utils.h b/core/mac/src/pe/lim/lim_timer_utils.h index 33b94d5505ee..1f1af1daafb5 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.h +++ b/core/mac/src/pe/lim/lim_timer_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2014, 2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -60,9 +60,7 @@ enum { eLIM_QUIET_TIMER, eLIM_QUIET_BSS_TIMER, eLIM_WPS_OVERLAP_TIMER, -#ifdef WLAN_FEATURE_VOWIFI_11R eLIM_FT_PREAUTH_RSP_TIMER, -#endif eLIM_REMAIN_CHN_TIMER, eLIM_PERIODIC_PROBE_REQ_TIMER, eLIM_DISASSOC_ACK_TIMER, diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index 10b8232e37a7..d287ca38ea60 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -71,9 +71,7 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId) CASE_RETURN_STRING(eLIM_QUIET_TIMER); CASE_RETURN_STRING(eLIM_QUIET_BSS_TIMER); CASE_RETURN_STRING(eLIM_WPS_OVERLAP_TIMER); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eLIM_FT_PREAUTH_RSP_TIMER); -#endif CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER); CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER); CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER); diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index ed6e61c64ef6..ff0f68a06fd2 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -434,10 +434,8 @@ void lim_process_probe_req_frame_multiple_bss(tpAniSirGlobal, uint8_t *, /* Process Auth frame when we have a session in progress. */ void lim_process_auth_frame(tpAniSirGlobal, uint8_t *, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R tSirRetStatus lim_process_auth_frame_no_session(tpAniSirGlobal pMac, uint8_t *, void *body); -#endif void lim_process_assoc_req_frame(tpAniSirGlobal, uint8_t *, uint8_t, tpPESession); void lim_send_mlm_assoc_ind(tpAniSirGlobal pMac, tpDphHashNode pStaDs, @@ -462,11 +460,9 @@ void lim_send_auth_mgmt_frame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAdd void lim_send_assoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmAssocReq *, tpPESession); void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmReassocReq *, tpPESession); -#ifdef WLAN_FEATURE_VOWIFI_11R void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry); -#endif void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer, uint8_t wmmTspecPresent, tSirMacTSInfo * pTsinfo, @@ -836,11 +832,9 @@ QDF_STATUS lim_disassoc_tx_complete_cnf(tpAniSirGlobal pMac, QDF_STATUS lim_deauth_tx_complete_cnf(tpAniSirGlobal pMac, uint32_t txCompleteSuccess); -#ifdef WLAN_FEATURE_VOWIFI_11R typedef struct sSetLinkCbackParams { void *cbackDataPtr; } tSetLinkCbackParams; -#endif void lim_process_rx_scan_event(tpAniSirGlobal mac, void *buf); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index d25964681a97..b36f9e03f6a6 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -53,9 +53,7 @@ #endif /* FEATURE_WLAN_DIAG_SUPPORT */ #include "lim_ibss_peer_mgmt.h" #include "lim_session_utils.h" -#ifdef WLAN_FEATURE_VOWIFI_11R #include "lim_ft_defs.h" -#endif #include "lim_session.h" #include "cds_reg_service.h" @@ -378,11 +376,8 @@ char *lim_msg_str(uint32_t msgType) return "SIR_LIM_CNF_WAIT_TIMEOUT"; case SIR_LIM_RADAR_DETECT_IND: return "SIR_LIM_RADAR_DETECT_IND"; -#ifdef WLAN_FEATURE_VOWIFI_11R case SIR_LIM_FT_PREAUTH_RSP_TIMEOUT: return "SIR_LIM_FT_PREAUTH_RSP_TIMEOUT"; -#endif - case WNI_CFG_PARAM_UPDATE_IND: return "WNI_CFG_PARAM_UPDATE_IND"; case WNI_CFG_DNLD_REQ: @@ -699,11 +694,9 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) tx_timer_deactivate(&lim_timer->gLimPreAuthClnupTimer); tx_timer_delete(&lim_timer->gLimPreAuthClnupTimer); -#ifdef WLAN_FEATURE_VOWIFI_11R /* Deactivate and delete FT Preauth response timer */ tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); -#endif /* Deactivate and delete remain on channel timer */ tx_timer_deactivate(&lim_timer->gLimRemainOnChannelTimer); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 92c4280d8988..63a4c648f6ee 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -64,10 +64,8 @@ uint8_t *mac_trace_get_neighbour_roam_state(uint16_t neighbourroamstate) CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_INIT); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_CONNECTED); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING); CASE_RETURN_STRING(eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE); -#endif /* WLAN_FEATURE_VOWIFI_11R */ CASE_RETURN_STRING(eNEIGHBOR_STATE_MAX); default: @@ -304,13 +302,11 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg) #endif CASE_RETURN_STRING(eWNI_SME_ADD_STA_SELF_RSP); CASE_RETURN_STRING(eWNI_SME_DEL_STA_SELF_RSP); -#if defined WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_REQ); CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_RSP); CASE_RETURN_STRING(eWNI_SME_FT_UPDATE_KEY); CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_REQ); CASE_RETURN_STRING(eWNI_SME_FT_AGGR_QOS_RSP); -#endif #if defined FEATURE_WLAN_ESE CASE_RETURN_STRING(eWNI_SME_ESE_ADJACENT_AP_REPORT); #endif @@ -439,10 +435,8 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_WLAN_SET_APP_TYPE2_PARAMS); #endif CASE_RETURN_STRING(WMA_MSG_TYPES_END); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(WMA_AGGR_QOS_REQ); CASE_RETURN_STRING(WMA_AGGR_QOS_RSP); -#endif /* WLAN_FEATURE_VOWIFI_11R */ CASE_RETURN_STRING(WMA_FTM_CMD_REQ); CASE_RETURN_STRING(WMA_FTM_CMD_RSP); #ifdef FEATURE_WLAN_SCAN_PNO @@ -651,9 +645,7 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg) CASE_RETURN_STRING(SIR_LIM_QUIET_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_QUIET_BSS_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_WPS_OVERLAP_TIMEOUT); -#ifdef WLAN_FEATURE_VOWIFI_11R CASE_RETURN_STRING(SIR_LIM_FT_PREAUTH_RSP_TIMEOUT); -#endif CASE_RETURN_STRING(SIR_LIM_REMAIN_CHN_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_INSERT_SINGLESHOT_NOA_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 7a5e691a6859..0420429e6f6e 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -2430,7 +2430,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, pProbeResp->erpPresent = 1; convert_erp_info(pMac, &pProbeResp->erpIEInfo, &pr->ERPInfo); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (pr->MobilityDomain.present) { /* MobilityDomain */ pProbeResp->mdiePresent = 1; @@ -2446,7 +2445,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, (unsigned int)pProbeResp->mdie[1], (unsigned int)pProbeResp->mdie[2]); } -#endif #if defined FEATURE_WLAN_ESE if (pr->ESEVersion.present) @@ -2801,7 +2799,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pAssocRsp->HTInfo, &ar.HTInfo, sizeof(tDot11fIEHTInfo)); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (ar.MobilityDomain.present) { /* MobilityDomain */ pAssocRsp->mdiePresent = 1; @@ -2826,9 +2823,7 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pAssocRsp->FTInfo, &ar.FTInfo, sizeof(tDot11fIEFTInfo)); } -#endif -#ifdef WLAN_FEATURE_VOWIFI_11R if (ar.num_RICDataDesc) { for (cnt = 0; cnt < ar.num_RICDataDesc; cnt++) { if (ar.RICDataDesc[cnt].present) { @@ -2840,7 +2835,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, pAssocRsp->num_RICData = ar.num_RICDataDesc; pAssocRsp->ricPresent = true; } -#endif #ifdef FEATURE_WLAN_ESE if (ar.num_WMMTSPEC) { @@ -3904,7 +3898,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, convert_erp_info(pMac, &pBeaconStruct->erpIEInfo, &pBeacon->ERPInfo); } -#ifdef WLAN_FEATURE_VOWIFI_11R if (pBeacon->MobilityDomain.present) { /* MobilityDomain */ pBeaconStruct->mdiePresent = 1; @@ -3918,7 +3911,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, << 1)); } -#endif #ifdef FEATURE_WLAN_ESE if (pBeacon->ESEVersion.present) @@ -5596,7 +5588,6 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, } #endif -#if defined WLAN_FEATURE_VOWIFI_11R void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain *pDot11f, uint8_t mdie[SIR_MDIE_SIZE]) @@ -5617,7 +5608,6 @@ void populate_ft_info(tpAniSirGlobal pMac, tDot11fIEFTInfo *pDot11f) /* All other info is zero. */ } -#endif void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac, tDot11fIESuppRates *pSupp, -- cgit v1.2.3 From 641bf32b43bb37ca7b40b1c8c3d29daed79d44a9 Mon Sep 17 00:00:00 2001 From: Deepak Dhamdhere Date: Wed, 6 Jan 2016 15:19:03 -0800 Subject: qcacld-3.0: Remove WLAN_FEATURE_VOWIFI conditional compilation Remove #ifdef WLAN_FEATURE_VOWIFI from host driver source code. It has alwasys been defined in Kbuild and underlying features will be permanent in cld3.0. Those features are 11r radio resource measurement, beacon report, link report, neighbor report and power constraint. Please note that WLAN_FEATURE_VOWIFI_11R is used for different purpose and it is not removed in this change. CRs-Fixed: 958729 Change-Id: Icd80e9cce08c4662e86ccda94491c1fc22c5756d --- Kbuild | 1 - core/hdd/inc/wlan_hdd_cfg.h | 4 -- core/hdd/src/wlan_hdd_cfg.c | 6 --- core/hdd/src/wlan_hdd_wext.c | 11 +--- core/mac/inc/ani_global.h | 6 --- core/mac/inc/sir_api.h | 2 - core/mac/inc/sir_mac_prot_def.h | 11 ---- core/mac/inc/wni_api.h | 2 - core/mac/src/cfg/cfg_api.c | 2 - core/mac/src/include/parser_api.h | 4 -- core/mac/src/pe/include/lim_session.h | 4 -- core/mac/src/pe/include/rrm_api.h | 7 --- core/mac/src/pe/lim/lim_api.c | 6 --- core/mac/src/pe/lim/lim_assoc_utils.c | 4 -- core/mac/src/pe/lim/lim_ft.c | 2 - core/mac/src/pe/lim/lim_process_action_frame.c | 7 +-- core/mac/src/pe/lim/lim_process_cfg_updates.c | 2 - core/mac/src/pe/lim/lim_process_message_queue.c | 6 --- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 19 ------- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 8 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 8 --- core/mac/src/pe/lim/lim_prop_exts_utils.c | 18 ------- core/mac/src/pe/lim/lim_scan_result_utils.c | 19 ------- core/mac/src/pe/lim/lim_scan_result_utils.h | 14 ++---- core/mac/src/pe/lim/lim_send_management_frames.c | 34 +------------ core/mac/src/pe/lim/lim_send_messages.c | 29 +---------- core/mac/src/pe/lim/lim_send_messages.h | 11 ---- core/mac/src/pe/lim/lim_types.h | 2 - core/mac/src/pe/lim/lim_utils.c | 58 +--------------------- core/mac/src/pe/lim/lim_utils.h | 2 - core/mac/src/pe/rrm/rrm_api.c | 3 -- core/mac/src/pe/sch/sch_beacon_process.c | 12 ----- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 2 - core/mac/src/sys/legacy/src/utils/src/parser_api.c | 4 -- core/sme/inc/csr_api.h | 2 - core/sme/inc/sme_api.h | 6 --- core/sme/inc/sme_inside.h | 2 - core/sme/src/common/sme_api.c | 12 ----- core/sme/src/csr/csr_neighbor_roam.c | 2 - core/sme/src/csr/csr_util.c | 2 - core/sme/src/rrm/sme_rrm.c | 2 - core/wma/inc/wma_if.h | 9 ---- core/wma/src/wma_dev_if.c | 13 ----- core/wma/src/wma_scan_roam.c | 8 --- 44 files changed, 10 insertions(+), 378 deletions(-) diff --git a/Kbuild b/Kbuild index 504f5f0e16cc..37c4af240f2c 100755 --- a/Kbuild +++ b/Kbuild @@ -902,7 +902,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DWLAN_AP_STA_CONCURRENCY \ -DFEATURE_WLAN_SCAN_PNO \ -DWLAN_FEATURE_PACKET_FILTERING \ - -DWLAN_FEATURE_VOWIFI \ -DWLAN_FEATURE_11AC \ -DWLAN_FEATURE_P2P_DEBUG \ -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \ diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 867ee9570001..14698665ae19 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -801,7 +801,6 @@ typedef enum { #define CFG_TL_DELAYED_TRGR_FRM_INT_MAX (4294967295UL) #define CFG_TL_DELAYED_TRGR_FRM_INT_DEFAULT 3000 -#if defined WLAN_FEATURE_VOWIFI #define CFG_RRM_ENABLE_NAME "gRrmEnable" #define CFG_RRM_ENABLE_MIN (0) #define CFG_RRM_ENABLE_MAX (1) @@ -833,7 +832,6 @@ typedef enum { */ #define CFG_RM_CAPABILITY_NAME "rm_capability" #define CFG_RM_CAPABILITY_DEFAULT "73,00,6D,00,04" -#endif #define CFG_QOS_IMPLICIT_SETUP_ENABLED_NAME "ImplicitQosIsEnabled" #define CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN (0) @@ -2956,14 +2954,12 @@ struct hdd_config { uint8_t nTxPowerCap; /* In dBm */ bool fIsLowGainOverride; uint8_t disablePacketFilter; -#if defined WLAN_FEATURE_VOWIFI bool fRrmEnable; uint8_t nInChanMeasMaxDuration; uint8_t nOutChanMeasMaxDuration; uint16_t nRrmRandnIntvl; /* length includes separator */ char rm_capability[3 * DOT11F_IE_RRMENABLEDCAP_MAX_LEN]; -#endif /* Vowifi 11r params */ bool fFTResourceReqSupported; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 397e05b9f253..a9ac00a9aab3 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1285,7 +1285,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_WLAN_AUTO_SHUTDOWN_MIN, CFG_WLAN_AUTO_SHUTDOWN_MAX), #endif -#if defined WLAN_FEATURE_VOWIFI REG_VARIABLE(CFG_RRM_ENABLE_NAME, WLAN_PARAM_Integer, struct hdd_config, fRrmEnable, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, @@ -1320,7 +1319,6 @@ REG_TABLE_ENTRY g_registry_table[] = { struct hdd_config, rm_capability, VAR_FLAGS_OPTIONAL, (void *) CFG_RM_CAPABILITY_DEFAULT), -#endif REG_VARIABLE(CFG_FT_RESOURCE_REQ_NAME, WLAN_PARAM_Integer, struct hdd_config, fFTResourceReqSupported, @@ -5852,14 +5850,12 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx) "Could not pass on WNI_CFG_GO_LINK_MONITOR_TIMEOUT to CFG"); } -#if defined WLAN_FEATURE_VOWIFI if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_MCAST_BCAST_FILTER_SETTING, pConfig->mcastBcastFilterSetting) == QDF_STATUS_E_FAILURE) fStatus = false; hddLog(LOGE, "Could not pass on WNI_CFG_MCAST_BCAST_FILTER_SETTING to CFG"); -#endif if (sme_cfg_set_int (pHddCtx->hHal, WNI_CFG_SINGLE_TID_RC, @@ -6492,13 +6488,11 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig->csrConfig.Is11eSupportEnabled = pConfig->b80211eIsEnabled; smeConfig->csrConfig.WMMSupportMode = pConfig->WmmMode; -#if defined WLAN_FEATURE_VOWIFI smeConfig->rrmConfig.rrm_enabled = pConfig->fRrmEnable; smeConfig->rrmConfig.max_randn_interval = pConfig->nRrmRandnIntvl; hdd_hex_string_to_u8_array(pConfig->rm_capability, smeConfig->rrmConfig.rm_capability, &rrm_capab_len, DOT11F_IE_RRMENABLEDCAP_MAX_LEN); -#endif /* Remaining config params not obtained from registry * On RF EVB beacon using channel 1. */ diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 6ed2c32f2151..3f1ef0c9653f 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -44,9 +44,7 @@ #include "sir_params.h" #include "csr_api.h" #include "csr_inside_api.h" -#if defined WLAN_FEATURE_VOWIFI #include "sme_rrm_internal.h" -#endif #include #include "dot11f.h" #include @@ -284,9 +282,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #define WLAN_PRIV_SET_CHAR_GET_NONE (SIOCIWFIRSTPRIV + 3) #define WE_WOWL_ADD_PTRN 1 #define WE_WOWL_DEL_PTRN 2 -#if defined WLAN_FEATURE_VOWIFI #define WE_NEIGHBOR_REPORT_REQUEST 3 -#endif #define WE_SET_AP_WPS_IE 4 /* This is called in station mode to set probe rsp ie. */ #define WE_SET_CONFIG 5 @@ -6181,9 +6177,7 @@ static int __iw_setchar_getnone(struct net_device *dev, char *pBuffer = NULL; hdd_adapter_t *pAdapter = (netdev_priv(dev)); hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); -#ifdef WLAN_FEATURE_VOWIFI struct hdd_config *pConfig = hdd_ctx->config; -#endif /* WLAN_FEATURE_VOWIFI */ struct iw_point s_priv_data; if (!capable(CAP_NET_ADMIN)) { @@ -6233,7 +6227,6 @@ static int __iw_setchar_getnone(struct net_device *dev, QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "DEL_PTRN"); hdd_del_wowl_ptrn(pAdapter, pBuffer); break; -#if defined WLAN_FEATURE_VOWIFI case WE_NEIGHBOR_REPORT_REQUEST: { tRrmNeighborReq neighborReq; @@ -6270,7 +6263,6 @@ static int __iw_setchar_getnone(struct net_device *dev, } } break; -#endif case WE_SET_AP_WPS_IE: hddLog(LOGE, "Received WE_SET_AP_WPS_IE"); sme_update_p2p_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), pBuffer, @@ -10320,13 +10312,12 @@ static const struct iw_priv_args we_private_args[] = { 0, "wowlDelPtrn"}, -#if defined WLAN_FEATURE_VOWIFI /* handlers for sub-ioctl */ {WE_NEIGHBOR_REPORT_REQUEST, IW_PRIV_TYPE_CHAR | 512, 0, "neighbor"}, -#endif + {WE_SET_AP_WPS_IE, IW_PRIV_TYPE_CHAR | 512, 0, diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 0838c75c6ae0..db0618a5ea28 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -57,10 +57,8 @@ typedef struct sAniSirGlobal *tpAniSirGlobal; #include "oem_data_internal.h" #endif -#if defined WLAN_FEATURE_VOWIFI #include "sme_rrm_internal.h" #include "rrm_global.h" -#endif #include "p2p_api.h" #include @@ -851,12 +849,10 @@ struct mgmt_frm_reg_info { uint8_t matchData[1]; }; -#if defined WLAN_FEATURE_VOWIFI typedef struct sRrmContext { tRrmSMEContext rrmSmeContext; tRrmPEContext rrmPEContext; } tRrmContext, *tpRrmContext; -#endif /** * enum tDriverType - Indicate the driver type to the mac, and based on this @@ -989,9 +985,7 @@ typedef struct sAniSirGlobal { #ifdef FEATURE_OEM_DATA_SUPPORT tOemDataStruct oemData; #endif -#if defined WLAN_FEATURE_VOWIFI tRrmContext rrm; -#endif #ifdef WLAN_FEATURE_CONCURRENT_P2P tp2pContext p2pContext[MAX_NO_OF_P2P_SESSIONS]; #else diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 7e4c033d2da4..d69b4f821452 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -673,10 +673,8 @@ typedef struct sSirBssDescription { uint8_t sSirBssDescriptionRsvd[3]; /* base on a tick count. It is a time stamp, not a relative time. */ uint32_t nReceivedTime; -#if defined WLAN_FEATURE_VOWIFI uint32_t parentTSF; uint32_t startTSF[2]; -#endif uint8_t mdiePresent; /* MDIE for 11r, picked from the beacons */ uint8_t mdie[SIR_MDIE_SIZE]; diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index ed4fa0b7b362..a417daefd490 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -171,7 +171,6 @@ /* RRM related. */ /* Refer IEEE Std 802.11k-2008, Section 7.3.2.21, table 7.29 */ -#if defined WLAN_FEATURE_VOWIFI #define SIR_MAC_RRM_CHANNEL_LOAD_TYPE 3 #define SIR_MAC_RRM_NOISE_HISTOGRAM_BEACON 4 @@ -191,8 +190,6 @@ #define SIR_MAC_RRM_NEIGHBOR_REQ 4 #define SIR_MAC_RRM_NEIGHBOR_RPT 5 -#endif - /* VHT Action Field */ #ifdef WLAN_FEATURE_11AC #define SIR_MAC_VHT_GID_NOTIFICATION 1 @@ -565,9 +562,7 @@ #define SIR_MAC_GET_QOS(x) ((((uint16_t) x) & 0x0200) >> 9) #define SIR_MAC_GET_SHORT_SLOT_TIME(x) ((((uint16_t) x) & 0x0400) >> 10) #define SIR_MAC_GET_APSD(x) ((((uint16_t) x) & 0x0800) >> 11) -#if defined WLAN_FEATURE_VOWIFI #define SIR_MAC_GET_RRM(x) ((((uint16_t) x) & 0x1000) >> 12) -#endif #define SIR_MAC_GET_BLOCK_ACK(x) ((((uint16_t) x) & 0xc000) >> CAPABILITY_INFO_DELAYED_BA_BIT) #define SIR_MAC_SET_ESS(x) (((uint16_t) x) | 0x0001) #define SIR_MAC_SET_IBSS(x) (((uint16_t) x) | 0x0002) @@ -579,9 +574,7 @@ #define SIR_MAC_SET_QOS(x) (((uint16_t) x) | 0x0200) #define SIR_MAC_SET_SHORT_SLOT_TIME(x) (((uint16_t) x) | 0x0400) #define SIR_MAC_SET_APSD(x) (((uint16_t) x) | 0x0800) -#if defined WLAN_FEATURE_VOWIFI #define SIR_MAC_SET_RRM(x) (((uint16_t) x) | 0x1000) -#endif #define SIR_MAC_SET_GROUP_ACK(x) (((uint16_t) x) | 0x4000) #ifdef WLAN_FEATURE_11AC @@ -1992,8 +1985,6 @@ typedef struct sSirMacMeasReqActionFrame { } tSirMacMeasReqActionFrame, *tpSirMacMeasReqActionFrame; #endif -#if defined WLAN_FEATURE_VOWIFI - typedef struct sSirMacNeighborReportReq { uint8_t dialogToken; uint8_t ssid_present; @@ -2039,8 +2030,6 @@ typedef struct sSirMacRadioMeasureReport { } tSirMacRadioMeasureReport, *tpSirMacRadioMeasureReport; -#endif - /* QOS action frame definitions */ /* max number of possible tclas elements in any frame */ diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index c71c8069a694..2caf25d702fb 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -117,7 +117,6 @@ enum eWniMsgTypes { /* WOWL Messages */ eWNI_PMC_SMPS_STATE_IND, -#if defined WLAN_FEATURE_VOWIFI eWNI_SME_RRM_MSG_TYPE_BEGIN, eWNI_SME_NEIGHBOR_REPORT_REQ_IND, @@ -125,7 +124,6 @@ enum eWniMsgTypes { eWNI_SME_BEACON_REPORT_REQ_IND, eWNI_SME_BEACON_REPORT_RESP_XMIT_IND, -#endif eWNI_SME_ADD_STA_SELF_RSP, eWNI_SME_DEL_STA_SELF_RSP, diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c index 1a62f21962ca..596794cd4be9 100644 --- a/core/mac/src/cfg/cfg_api.c +++ b/core/mac/src/cfg/cfg_api.c @@ -818,11 +818,9 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap, if (val) pCapInfo->apsd = 1; -#if defined WLAN_FEATURE_VOWIFI pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled; #if defined WLAN_VOWIFI_DEBUG cfg_log(pMac, LOGE, FL("RRM = %d"), pCapInfo->rrm); -#endif #endif /* DSSS-OFDM */ /* FIXME : no config defined yet. */ diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 687fc3c93fcf..087833dd8b1c 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -601,12 +601,10 @@ populate_dot11f_ext_supp_rates(tpAniSirGlobal pMac, uint8_t nChannelNum, tDot11fIEExtSuppRates *pDot11f, tpPESession psessionEntry); -#if defined WLAN_FEATURE_VOWIFI tSirRetStatus populate_dot11f_beacon_report(tpAniSirGlobal pMac, tDot11fIEMeasurementReport *pDot11f, tSirMacBeaconReport *pBeaconReport); -#endif /** * \brief Populate a tDot11fIEExtSuppRates @@ -887,7 +885,6 @@ tSirRetStatus populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac, tSirRetStatus populate_dot11f_wscInAssocRes(tpAniSirGlobal pMac, tDot11fIEWscAssocRes *pDot11f); -#if defined WLAN_FEATURE_VOWIFI tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac, tDot11fIEWFATPC *pDot11f, uint8_t txPower, uint8_t linkMargin); @@ -895,7 +892,6 @@ tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac, tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, tDot11fIERRMEnabledCap *pDot11f, tpPESession psessionEntry); -#endif void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain * pDot11f, uint8_t mdie[]); diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 5ff9dd66862e..24069b324629 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -274,11 +274,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ int8_t maxTxPower; /* MIN (Regulatory and local power constraint) */ enum tQDF_ADAPTER_MODE pePersona; - -#if defined WLAN_FEATURE_VOWIFI int8_t txMgmtPower; -#endif - tAniBool is11Rconnection; #ifdef FEATURE_WLAN_ESE diff --git a/core/mac/src/pe/include/rrm_api.h b/core/mac/src/pe/include/rrm_api.h index 998364e121de..65bdbb1741b9 100644 --- a/core/mac/src/pe/include/rrm_api.h +++ b/core/mac/src/pe/include/rrm_api.h @@ -38,7 +38,6 @@ #ifndef __RRM_API_H__ #define __RRM_API_H__ -#ifdef WLAN_FEATURE_VOWIFI #define RRM_MIN_TX_PWR_CAP 13 #define RRM_MAX_TX_PWR_CAP 19 @@ -102,10 +101,4 @@ rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, tpSirBeaconReportXmitInd pBcnReport); extern void lim_update_rrm_capability(tpAniSirGlobal mac_ctx, tpSirSmeJoinReq join_req); -#else -void lim_update_rrm_capability(tpAniSirGlobal mac_ctx, - tpSirSmeJoinReq join_req) -{ -} -#endif #endif diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index d875899ac3cb..14b1559567b7 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -61,9 +61,7 @@ #include "lim_session.h" #include "wma_types.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include #include "qdf_types.h" @@ -600,9 +598,7 @@ tSirRetStatus lim_initialize(tpAniSirGlobal pMac) /* Initializations for maintaining peers in IBSS */ lim_ibss_init(pMac); -#if defined WLAN_FEATURE_VOWIFI rrm_initialize(pMac); -#endif qdf_mutex_create(&pMac->lim.lim_frame_register_lock); qdf_list_create(&pMac->lim.gLimMgmtFrameRegistratinQueue, 0); @@ -707,9 +703,7 @@ void lim_cleanup(tpAniSirGlobal pMac) /* Now, finally reset the deferred message queue pointers */ lim_reset_deferred_msg_q(pMac); -#if defined WLAN_FEATURE_VOWIFI rrm_cleanup(pMac); -#endif lim_ft_cleanup_all_ft_sessions(pMac); diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 9aa6e118c1fb..e32676258a3c 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -4204,10 +4204,8 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, "could not Update the supported rates")); pAddBssParams->staContext.encryptType = psessionEntry->encryptType; -#if defined WLAN_FEATURE_VOWIFI pAddBssParams->maxTxPower = psessionEntry->maxTxPower; lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower); -#endif /* FIXME_GEN4 - Any other value that can be used for initialization? */ pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; @@ -4733,10 +4731,8 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->staContext.encryptType = psessionEntry->encryptType; -#if defined WLAN_FEATURE_VOWIFI pAddBssParams->maxTxPower = psessionEntry->maxTxPower; lim_log(pMac, LOG2, FL("maxTxPower: %d"), pAddBssParams->maxTxPower); -#endif pAddBssParams->status = QDF_STATUS_SUCCESS; pAddBssParams->respReqd = true; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 82fbd8e5ced0..99c3ed0f33be 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -714,9 +714,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, } } -#if defined WLAN_FEATURE_VOWIFI pAddBssParams->maxTxPower = pftSessionEntry->maxTxPower; -#endif #ifdef WLAN_FEATURE_11W if (pftSessionEntry->limRmfEnabled) { diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index af506051e44d..9069d5c1fd83 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -52,9 +52,7 @@ #include "lim_admit_control.h" #include "wmm_apsd.h" #include "lim_send_messages.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "lim_session_utils.h" #include "cds_concurrency.h" #include "wma_types.h" @@ -1350,7 +1348,6 @@ __lim_process_sm_power_save_update(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, pSta->staAddr, psessionEntry->smeSessionId); } -#if defined WLAN_FEATURE_VOWIFI static void __lim_process_radio_measure_request(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, @@ -1501,7 +1498,6 @@ __lim_process_neighbor_report(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, qdf_mem_free(pFrm); } -#endif #ifdef WLAN_FEATURE_11W /** @@ -1911,7 +1907,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, } break; -#if defined WLAN_FEATURE_VOWIFI case SIR_MAC_ACTION_RRM: #ifdef WLAN_FEATURE_11W if (lim_drop_unprotected_action_frame(mac_ctx, session, @@ -1948,7 +1943,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, FL("RRM frm ignored, it is disabled in cfg")); } break; -#endif + case SIR_MAC_ACTION_VENDOR_SPECIFIC_CATEGORY: vendor_specific = (tpSirMacVendorSpecificFrameHdr) action_hdr; mac_hdr = NULL; diff --git a/core/mac/src/pe/lim/lim_process_cfg_updates.c b/core/mac/src/pe/lim/lim_process_cfg_updates.c index ece95d4c100b..65bcd4bcadd0 100644 --- a/core/mac/src/pe/lim/lim_process_cfg_updates.c +++ b/core/mac/src/pe/lim/lim_process_cfg_updates.c @@ -44,9 +44,7 @@ #include "lim_utils.h" #include "lim_prop_exts_utils.h" #include "sch_api.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif static void lim_update_config(tpAniSirGlobal pMac, tpPESession psessionEntry); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index fcbcdccffe86..2591138c903e 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -55,9 +55,7 @@ #include "lim_session.h" #include "lim_send_messages.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "lim_ft.h" @@ -1340,10 +1338,8 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case eWNI_SME_GET_WPSPBC_SESSION_REQ: case eWNI_SME_SET_APWPARSNIEs_REQ: case eWNI_SME_CHNG_MCC_BEACON_INTERVAL: -#if defined WLAN_FEATURE_VOWIFI case eWNI_SME_NEIGHBOR_REPORT_REQ_IND: case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND: -#endif #if defined FEATURE_WLAN_ESE case eWNI_SME_ESE_ADJACENT_AP_REPORT: #endif @@ -1628,9 +1624,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) msg->bodyptr = NULL; break; case WMA_SET_MAX_TX_POWER_RSP: -#if defined WLAN_FEATURE_VOWIFI rrm_set_max_tx_power_rsp(mac_ctx, msg); -#endif if (msg->bodyptr != NULL) { qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index ebb7f272940d..d4b6d522cffd 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -663,9 +663,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, addbss_param->bProxyProbeRespEn = 0; addbss_param->obssProtEnabled = mlm_start_req->obssProtEnabled; -#if defined WLAN_FEATURE_VOWIFI addbss_param->maxTxPower = session->maxTxPower; -#endif mlm_add_sta(mac_ctx, &addbss_param->staContext, addbss_param->bssId, addbss_param->htCapable, session); @@ -2893,9 +2891,6 @@ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel, phy_ch_width ch_width, int8_t max_tx_power, uint8_t pe_session_id) { -#if !defined WLAN_FEATURE_VOWIFI - uint32_t localPwrConstraint; -#endif tpPESession pe_session; pe_session = pe_find_session_by_session_id(mac_ctx, pe_session_id); @@ -2904,21 +2899,7 @@ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel, pe_session_id); return; } -#if defined WLAN_FEATURE_VOWIFI lim_send_switch_chnl_params(mac_ctx, channel, ch_center_freq_seg0, ch_center_freq_seg1, ch_width, max_tx_power, pe_session_id, false); -#else - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_LOCAL_POWER_CONSTRAINT, - &localPwrConstraint) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("couldn't read CFG_LOCAL_POWER_CONSTRAINT")); - return; - } - /* Send WMA_CHNL_SWITCH_IND to HAL */ - lim_send_switch_chnl_params(mac_ctx, channel, ch_center_freq_seg0, - ch_center_freq_seg1, ch_width, - (int8_t)localPwrConstraint, - pe_session_id, false); -#endif } diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 21afe39e39be..e70c24f7e814 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -44,9 +44,7 @@ #include "lim_ft_defs.h" #include "lim_session.h" #include "lim_session_utils.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "wma_types.h" #include "cds_utils.h" #include "lim_types.h" @@ -2771,9 +2769,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, pStaDs->ucUcastSig = pAddBssParams->staContext.ucUcastSig; pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig; -#if defined WLAN_FEATURE_VOWIFI rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower, psessionEntry); -#endif pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); if (NULL == pAddStaParams) { @@ -3027,10 +3023,8 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx, lim_send_edca_params(mac_ctx, session_entry->gLimEdcaParamsActive, sta_ds->bssId); -#if defined WLAN_FEATURE_VOWIFI rrm_cache_mgmt_tx_power(mac_ctx, add_bss_params->txMgmtPower, session_entry); -#endif if (lim_add_sta_self(mac_ctx, sta_idx, update_sta, session_entry) != eSIR_SUCCESS) { /* Add STA context at HW */ @@ -3638,11 +3632,9 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) FL("session does not exist for given sessionId")); return; } -#if defined WLAN_FEATURE_VOWIFI /* HAL fills in the tx power used for mgmt frames in this field. */ /* Store this value to use in TPC report IE. */ rrm_cache_mgmt_tx_power(pMac, pChnlParams->txMgmtPower, psessionEntry); -#endif channelChangeReasonCode = psessionEntry->channelChangeReasonCode; /* initialize it back to invalid id */ psessionEntry->chainMask = pChnlParams->chainMask; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index f84cbfdf5ffa..7b8149fd17d9 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -2017,7 +2017,6 @@ end: sme_transaction_id); } -#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower, uint8_t iniTxPower) { @@ -2033,7 +2032,6 @@ uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower, return maxTxPower; } -#endif /** * __lim_process_sme_reassoc_req() - process reassoc req @@ -4386,7 +4384,6 @@ static void __lim_process_sme_set_ht2040_mode(tpAniSirGlobal pMac, void __lim_process_report_message(tpAniSirGlobal pMac, tpSirMsgQ pMsg) { -#ifdef WLAN_FEATURE_VOWIFI switch (pMsg->type) { case eWNI_SME_NEIGHBOR_REPORT_REQ_IND: rrm_process_neighbor_report_req(pMac, pMsg->bodyptr); @@ -4397,10 +4394,8 @@ void __lim_process_report_message(tpAniSirGlobal pMac, tpSirMsgQ pMsg) default: lim_log(pMac, LOGE, FL("Invalid msg type:%d"), pMsg->type); } -#endif } -#if defined(FEATURE_WLAN_ESE) || defined(WLAN_FEATURE_VOWIFI) /* -------------------------------------------------------------------- */ /** * lim_send_set_max_tx_power_req @@ -4469,7 +4464,6 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, } return retCode; } -#endif /** * __lim_process_sme_register_mgmt_frame_req() - process sme reg mgmt frame req @@ -4853,12 +4847,10 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) break; #endif -#if defined WLAN_FEATURE_VOWIFI case eWNI_SME_NEIGHBOR_REPORT_REQ_IND: case eWNI_SME_BEACON_REPORT_RESP_XMIT_IND: __lim_process_report_message(pMac, pMsg); break; -#endif case eWNI_SME_FT_PRE_AUTH_REQ: bufConsumed = (bool) lim_process_ft_pre_auth_req(pMac, pMsg); diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 3c8ddf4bf321..93911d2c10b4 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -78,9 +78,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, int8_t *local_constraint, tpPESession session) { tSirProbeRespBeacon *beacon_struct; -#if !defined WLAN_FEATURE_VOWIFI - uint32_t local_power_constraints = 0; -#endif uint32_t enable_txbf_20mhz; tSirRetStatus cfg_set_status = eSIR_FAILURE; tSirRetStatus cfg_get_status = eSIR_FAILURE; @@ -213,25 +210,10 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, beacon_struct->is_ese_ver_ie_present; #endif if (beacon_struct->powerConstraintPresent) { -#if defined WLAN_FEATURE_VOWIFI *local_constraint -= beacon_struct->localPowerConstraint. localPowerConstraints; -#else - local_power_constraints = - (uint32_t) beacon_struct->localPowerConstraint. - localPowerConstraints; -#endif } -#if !defined WLAN_FEATURE_VOWIFI - if (cfg_set_int - (mac_ctx, WNI_CFG_LOCAL_POWER_CONSTRAINT, - local_power_constraints) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL - ("Could not update local power constraint to cfg.")); - } -#endif session->country_info_present = false; /* Initializing before first use */ if (beacon_struct->countryInfoPresent) diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c index 0794cc40aa1d..8bc20d247801 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.c +++ b/core/mac/src/pe/lim/lim_scan_result_utils.c @@ -41,9 +41,7 @@ #include "lim_api.h" #include "lim_ft_defs.h" #include "lim_session.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "cds_utils.h" @@ -67,24 +65,16 @@ * @param pMac - Pointer to Global MAC structure * @param pBPR - Pointer to parsed Beacon/Probe Response structure * @param pRxPacketInfo - Pointer to Received frame's BD - * ---------if defined WLAN_FEATURE_VOWIFI------ * @param fScanning - flag to indicate if it is during scan. * --------------------------------------------- * * @return None */ -#if defined WLAN_FEATURE_VOWIFI QDF_STATUS lim_collect_bss_description(tpAniSirGlobal pMac, tSirBssDescription *pBssDescr, tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo, uint8_t fScanning) -#else -QDF_STATUS -lim_collect_bss_description(tpAniSirGlobal pMac, - tSirBssDescription *pBssDescr, - tpSirProbeRespBeacon pBPR, uint8_t *pRxPacketInfo) -#endif { uint8_t *pBody; uint32_t ieLen = 0; @@ -193,12 +183,10 @@ lim_collect_bss_description(tpAniSirGlobal pMac, lim_log(pMac, LOG1, FL("BSSID: "MAC_ADDRESS_STR " tsf_delta = %u"), MAC_ADDR_ARRAY(pHdr->bssId), pBssDescr->tsf_delta); -#if defined WLAN_FEATURE_VOWIFI if (fScanning) { rrm_get_start_tsf(pMac, pBssDescr->startTSF); pBssDescr->parentTSF = WMA_GET_RX_TIMESTAMP(pRxPacketInfo); } -#endif /* MobilityDomain */ pBssDescr->mdie[0] = 0; @@ -393,17 +381,10 @@ lim_check_and_add_bss_description(tpAniSirGlobal mac_ctx, return; } /* In scan state, store scan result. */ -#if defined WLAN_FEATURE_VOWIFI status = lim_collect_bss_description(mac_ctx, bssdescr, bpr, rx_packet_info, scanning); if (QDF_STATUS_SUCCESS != status) goto last; -#else - status = lim_collect_bss_description(mac_ctx, bssdescr, - bpr, rx_packet_info); - if (QDF_STATUS_SUCCESS != status) - goto last; -#endif bssdescr->fProbeRsp = fProbeRsp; /* diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.h b/core/mac/src/pe/lim/lim_scan_result_utils.h index 74fb3b0af965..4548d28e7815 100644 --- a/core/mac/src/pe/lim/lim_scan_result_utils.h +++ b/core/mac/src/pe/lim/lim_scan_result_utils.h @@ -46,14 +46,8 @@ void lim_restore_pre_scan_state(tpAniSirGlobal); void lim_copy_scan_result(tpAniSirGlobal, uint8_t *); void lim_check_and_add_bss_description(tpAniSirGlobal, tpSirProbeRespBeacon, uint8_t *, bool, uint8_t); -#if defined WLAN_FEATURE_VOWIFI -QDF_STATUS lim_collect_bss_description(tpAniSirGlobal, - tSirBssDescription *, - tpSirProbeRespBeacon, uint8_t *, uint8_t); -#else -QDF_STATUS lim_collect_bss_description(tpAniSirGlobal, - tSirBssDescription *, - tpSirProbeRespBeacon, uint8_t *); -#endif - +QDF_STATUS lim_collect_bss_description(tpAniSirGlobal pMac, + tSirBssDescription *pBssDescr, + tpSirProbeRespBeacon pBPR, + uint8_t *pRxPacketInfo, uint8_t fScanning); #endif /* __LIM_SCAN_UTILS_H */ diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 7be4311fc1ce..56f8c82e91d7 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -58,9 +58,7 @@ #include "qdf_trace.h" #include "cds_utils.h" #include "sme_trace.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "wma_types.h" @@ -288,7 +286,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, } } -#if defined WLAN_FEATURE_VOWIFI /* * Table 7-14 in IEEE Std. 802.11k-2008 says * DS params "can" be present in RRM is disabled and "is" present if @@ -300,7 +297,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, txPower = (uint8_t) rrm_get_mgmt_tx_power(mac_ctx, pesession); populate_dot11f_wfatpc(mac_ctx, &pr.WFATPC, txPower, 0); -#endif if (pesession != NULL) { pesession->htCapability = IS_DOT11_MODE_HT(dot11mode); @@ -1594,9 +1590,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, uint16_t add_ie_len; uint8_t *add_ie; uint8_t *wps_ie = NULL; -#if defined WLAN_FEATURE_VOWIFI uint8_t power_caps = false; -#endif uint8_t tx_flag = 0; uint8_t sme_sessionid = 0; bool vht_enabled = false; @@ -1694,17 +1688,14 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, if (pe_session->lim11hEnable && pe_session->pLimJoinReq->spectrumMgtIndicator == eSIR_TRUE) { -#if defined WLAN_FEATURE_VOWIFI power_caps = true; populate_dot11f_power_caps(mac_ctx, &frm->PowerCaps, LIM_ASSOC, pe_session); -#endif populate_dot11f_supp_channels(mac_ctx, &frm->SuppChannels, LIM_ASSOC, pe_session); } -#if defined WLAN_FEATURE_VOWIFI if (mac_ctx->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) { if (power_caps == false) { @@ -1713,8 +1704,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, LIM_ASSOC, pe_session); } } -#endif - if (qos_enabled) populate_dot11f_qos_caps_station(mac_ctx, &frm->QOSCapsStation); @@ -1722,12 +1711,11 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, POPULATE_DOT11F_RATES_OPERATIONAL, &frm->ExtSuppRates, pe_session); -#if defined WLAN_FEATURE_VOWIFI if (mac_ctx->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) populate_dot11f_rrm_ie(mac_ctx, &frm->RRMEnabledCap, pe_session); -#endif + /* * The join request *should* contain zero or one of the WPA and RSN * IEs. The payload send along with the request is a @@ -1997,9 +1985,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, uint8_t qos_enabled, wme_enabled, wsm_enabled; void *packet; QDF_STATUS qdf_status; -#if defined WLAN_FEATURE_VOWIFI uint8_t power_caps_populated = false; -#endif uint16_t ft_ies_length = 0; uint8_t *body; uint16_t add_ie_len; @@ -2067,16 +2053,13 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, if (pe_session->lim11hEnable && pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { -#if defined WLAN_FEATURE_VOWIFI power_caps_populated = true; populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps, LIM_REASSOC, pe_session); populate_dot11f_supp_channels(mac_ctx, &frm.SuppChannels, LIM_REASSOC, pe_session); -#endif } -#if defined WLAN_FEATURE_VOWIFI if (mac_ctx->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) { if (power_caps_populated == false) { @@ -2085,7 +2068,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, LIM_REASSOC, pe_session); } } -#endif if (qos_enabled) populate_dot11f_qos_caps_station(mac_ctx, &frm.QOSCapsStation); @@ -2094,11 +2076,9 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, pe_session); -#if defined WLAN_FEATURE_VOWIFI if (mac_ctx->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session); -#endif /* * Ideally this should be enabled for 11r also. But 11r does @@ -2472,9 +2452,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, uint8_t *pAddIE; uint8_t *wpsIe = NULL; uint8_t txFlag = 0; -#if defined WLAN_FEATURE_VOWIFI uint8_t PowerCapsPopulated = false; -#endif uint8_t smeSessionId = 0; bool isVHTEnabled = false; tpSirMacMgmtHdr pMacHdr; @@ -2527,15 +2505,12 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, if (psessionEntry->lim11hEnable && psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { -#if defined WLAN_FEATURE_VOWIFI PowerCapsPopulated = true; populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC, psessionEntry); populate_dot11f_supp_channels(pMac, &frm.SuppChannels, LIM_REASSOC, psessionEntry); -#endif } -#if defined WLAN_FEATURE_VOWIFI if (pMac->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) { if (PowerCapsPopulated == false) { @@ -2544,7 +2519,6 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, LIM_REASSOC, psessionEntry); } } -#endif if (fQosEnabled) populate_dot11f_qos_caps_station(pMac, &frm.QOSCapsStation); @@ -2552,11 +2526,9 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, populate_dot11f_ext_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, psessionEntry); -#if defined WLAN_FEATURE_VOWIFI if (pMac->rrm.rrmPEContext.rrmEnable && SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry); -#endif /* The join request *should* contain zero or one of the WPA and RSN */ /* IEs. The payload send along with the request is a */ /* 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': */ @@ -4335,8 +4307,6 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, return eSIR_SUCCESS; } -#if defined WLAN_FEATURE_VOWIFI - /** * \brief Send a Neighbor Report Request Action frame * @@ -4842,8 +4812,6 @@ returnAfterError: return statusCode; } -#endif - #ifdef WLAN_FEATURE_11W /** * \brief Send SA query request action frame to peer diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index c4fcff20d216..b3ed1956dfb9 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -61,10 +61,8 @@ static tBeaconFilterIe beacon_filter_table[] = { {SIR_MAC_CHNL_SWITCH_ANN_EID, 1, {0, 0, 0, 0} }, {SIR_MAC_HT_INFO_EID, 0, {0, 0, HT_BYTE0_FILTER_MASK, 0} }, {SIR_MAC_HT_INFO_EID, 0, {2, 0, HT_BYTE2_FILTER_MASK, 0} }, - {SIR_MAC_HT_INFO_EID, 0, {5, 0, HT_BYTE5_FILTER_MASK, 0} } -#if defined WLAN_FEATURE_VOWIFI - , {SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} } -#endif + {SIR_MAC_HT_INFO_EID, 0, {5, 0, HT_BYTE5_FILTER_MASK, 0} }, + {SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} } #ifdef WLAN_FEATURE_11AC , {SIR_MAC_VHT_OPMODE_EID, 0, {0, 0, 0, 0} } , {SIR_MAC_VHT_OPERATION_EID, 0, {0, 0, VHTOP_CHWIDTH_MASK, 0} } @@ -205,16 +203,6 @@ tSirRetStatus lim_send_beacon_params(tpAniSirGlobal pMac, * * @return success if message send is ok, else false. */ -#if !defined WLAN_FEATURE_VOWIFI -tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, - uint8_t chnlNumber, - uint8_t ch_center_freq_seg0, - uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, - uint8_t localPwrConstraint, - uint8_t peSessionId, - uint8_t is_restart) -#else tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, @@ -223,7 +211,6 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart) -#endif { tpSwitchChannelParams pChnlParams = NULL; tSirMsgQ msgQ; @@ -248,11 +235,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, pChnlParams->ch_width = ch_width; qdf_mem_copy(pChnlParams->selfStaMacAddr, pSessionEntry->selfMacAddr, sizeof(tSirMacAddr)); -#if defined WLAN_FEATURE_VOWIFI pChnlParams->maxTxPower = maxTxPower; -#else - pChnlParams->localPowerConstraint = localPwrConstraint; -#endif qdf_mem_copy(pChnlParams->bssId, pSessionEntry->bssId, sizeof(tSirMacAddr)); pChnlParams->peSessionId = peSessionId; @@ -277,18 +260,10 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, msgQ.reserved = 0; msgQ.bodyptr = pChnlParams; msgQ.bodyval = 0; -#if defined WLAN_FEATURE_VOWIFI PELOG3(lim_log(pMac, LOG3, FL( "Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, maxTxPower %d"), pChnlParams->ch_width, pChnlParams->channelNumber, pChnlParams->maxTxPower);) -#else - PELOG3(lim_log(pMac, LOG3, FL( - "Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, local_pwr_constraint %d"), - pChnlParams->ch_width, - pChnlParams->channelNumber, - pChnlParams->localPowerConstraint);) -#endif MTRACE(mac_trace_msg_tx(pMac, peSessionId, msgQ.type)); if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msgQ)) { qdf_mem_free(pChnlParams); diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index 9cf863df5361..7db70c48c89a 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -63,7 +63,6 @@ tSirRetStatus lim_set_membership(tpAniSirGlobal pMac, tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac, tUpdateUserPos *pTempParam, tpPESession psessionEntry); -#if defined WLAN_FEATURE_VOWIFI tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, @@ -72,16 +71,6 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart); -#else -tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, - uint8_t chnlNumber, - uint8_t ch_center_freq_seg0, - uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, - uint8_t localPwrConstraint, - uint8_t peSessionId, - uint8_t is_restart); -#endif tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *pUpdatedEdcaParams, uint16_t bssIdx); diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index ff0f68a06fd2..ebe4374a0750 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -497,7 +497,6 @@ tSirRetStatus lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac, tSirMacAddr peer, uint8_t nMode, tpPESession psessionEntry); -#if defined WLAN_FEATURE_VOWIFI tSirRetStatus lim_send_neighbor_report_request_frame(tpAniSirGlobal, tpSirMacNeighborReportReq, tSirMacAddr, tpPESession); @@ -507,7 +506,6 @@ tSirRetStatus lim_send_radio_measure_report_action_frame(tpAniSirGlobal, uint8_t uint8_t, tpSirMacRadioMeasureReport, tSirMacAddr, tpPESession); -#endif #ifdef FEATURE_WLAN_TDLS diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index b36f9e03f6a6..80bf76e2f644 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -2701,9 +2701,6 @@ void lim_switch_channel_cback(tpAniSirGlobal pMac, QDF_STATUS status, void lim_switch_primary_channel(tpAniSirGlobal pMac, uint8_t newChannel, tpPESession psessionEntry) { -#if !defined WLAN_FEATURE_VOWIFI - uint32_t localPwrConstraint; -#endif PELOG3(lim_log (pMac, LOG3, @@ -2718,22 +2715,9 @@ void lim_switch_primary_channel(tpAniSirGlobal pMac, uint8_t newChannel, pMac->lim.gpchangeChannelCallback = lim_switch_channel_cback; pMac->lim.gpchangeChannelData = NULL; -#if defined WLAN_FEATURE_VOWIFI lim_send_switch_chnl_params(pMac, newChannel, 0, 0, CH_WIDTH_20MHZ, psessionEntry->maxTxPower, psessionEntry->peSessionId, false); -#else - if (wlan_cfg_get_int - (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT, - &localPwrConstraint) != eSIR_SUCCESS) { - lim_log(pMac, LOGP, - FL("Unable to read Local Power Constraint from cfg")); - return; - } - lim_send_switch_chnl_params(pMac, newChannel, 0, 0, CH_WIDTH_20MHZ, - localPwrConstraint, - psessionEntry->peSessionId, false); -#endif return; } @@ -2763,19 +2747,8 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, uint8_t ch_center_freq_seg1, phy_ch_width ch_width) { -#if !defined WLAN_FEATURE_VOWIFI - uint32_t localPwrConstraint; -#endif uint8_t subband = 0; -#if !defined WLAN_FEATURE_VOWIFI - if (wlan_cfg_get_int - (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT, - &localPwrConstraint) != eSIR_SUCCESS) { - lim_log(pMac, LOGP, - FL("Unable to get Local Power Constraint from cfg")); - return; - } -#endif + /* Assign the callback to resume TX once channel is changed. */ psessionEntry->currentReqChannel = newChannel; psessionEntry->limRFBand = lim_get_rf_band(newChannel); @@ -2783,18 +2756,11 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, pMac->lim.gpchangeChannelCallback = lim_switch_channel_cback; pMac->lim.gpchangeChannelData = NULL; -#if defined WLAN_FEATURE_VOWIFI lim_send_switch_chnl_params(pMac, newChannel, ch_center_freq_seg0, ch_center_freq_seg1, ch_width, psessionEntry->maxTxPower, psessionEntry->peSessionId, false); -#else - lim_send_switch_chnl_params(pMac, newChannel, ch_center_freq_seg0, - ch_center_freq_seg1, ch_width, - psessionEntry->peSessionId, - false); -#endif /* Store the new primary and secondary channel in session entries if different */ if (psessionEntry->currentOperChannel != newChannel) { @@ -4888,25 +4854,12 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac, tpPESession psessionEntry) { uint8_t center_freq = 0; -#if !defined WLAN_FEATURE_VOWIFI - uint32_t localPwrConstraint; -#endif /* If self capability is set to '20Mhz only', then do not change the CB mode. */ if (!lim_get_ht_capability (pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry)) return; -#if !defined WLAN_FEATURE_VOWIFI - if (wlan_cfg_get_int - (pMac, WNI_CFG_LOCAL_POWER_CONSTRAINT, - &localPwrConstraint) != eSIR_SUCCESS) { - lim_log(pMac, LOGP, - FL("Unable to get Local Power Constraint from cfg")); - return; - } -#endif - if (psessionEntry->ftPEContext.ftPreAuthSession) { lim_log(pMac, LOGE, FL("FT PREAUTH channel change is in progress")); @@ -4957,21 +4910,12 @@ void lim_update_sta_run_time_ht_switch_chnl_params(tpAniSirGlobal pMac, pMac->lim.gpchangeChannelCallback = NULL; pMac->lim.gpchangeChannelData = NULL; -#if defined WLAN_FEATURE_VOWIFI lim_send_switch_chnl_params(pMac, (uint8_t) pHTInfo->primaryChannel, center_freq, 0, psessionEntry->htRecommendedTxWidthSet, psessionEntry->maxTxPower, psessionEntry->peSessionId, true); -#else - lim_send_switch_chnl_params(pMac, (uint8_t) pHTInfo->primaryChannel, - center_freq, 0, - psessionEntry->htRecommendedTxWidthSet, - (int8_t)localPwrConstraint, - psessionEntry->peSessionId, - true); -#endif /* In case of IBSS, if STA should update HT Info IE in its beacons. */ if (LIM_IS_IBSS_ROLE(psessionEntry)) { diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 9200313042dd..98b1e17cfa20 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -91,13 +91,11 @@ void lim_print_sme_state(tpAniSirGlobal pMac, uint16_t logLevel, tLimSmeStates state); void lim_print_msg_name(tpAniSirGlobal pMac, uint16_t logLevel, uint32_t msgType); -#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI extern tSirRetStatus lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, tpPESession pSessionEntry); extern uint8_t lim_get_max_tx_power(int8_t regMax, int8_t apTxPower, uint8_t iniTxPower); -#endif uint8_t lim_is_addr_bc(tSirMacAddr); uint8_t lim_is_group_addr(tSirMacAddr); diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index ecad9b163cfd..dab718ea963e 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -35,7 +35,6 @@ /* $Header$ */ -#if defined WLAN_FEATURE_VOWIFI /*-------------------------------------------------------------------------- Include Files @@ -1460,5 +1459,3 @@ void lim_update_rrm_capability(tpAniSirGlobal mac_ctx, return; } - -#endif diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index a8b8ed89ad0f..a9595b4025e7 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -50,9 +50,7 @@ #include "lim_send_messages.h" #include "lim_sta_hash_api.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #ifdef FEATURE_WLAN_DIAG_SUPPORT #include "host_diag_core_log.h" @@ -724,9 +722,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, #ifdef WLAN_FEATURE_11AC tpSirMacMgmtHdr pMh = WMA_GET_RX_MAC_HEADER(rx_pkt_info); #endif -#if defined FEATURE_WLAN_ESE || defined WLAN_FEATURE_VOWIFI int8_t regMax = 0, maxTxPower = 0; -#endif qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); beaconParams.paramChangeBitmap = 0; @@ -772,13 +768,10 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, &beaconParams, &sendProbeReq, pMh); #endif -#if defined (FEATURE_WLAN_ESE) || defined (WLAN_FEATURE_VOWIFI) /* Obtain the Max Tx power for the current regulatory */ regMax = cfg_get_regulatory_max_transmit_power(mac_ctx, session->currentOperChannel); -#endif -#if defined WLAN_FEATURE_VOWIFI if (mac_ctx->rrm.rrmPEContext.rrmEnable && bcn->powerConstraintPresent) localRRMConstraint = @@ -787,9 +780,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, localRRMConstraint = 0; maxTxPower = lim_get_max_tx_power(regMax, regMax - localRRMConstraint, mac_ctx->roam.configParam.nTxPowerCap); -#elif defined FEATURE_WLAN_ESE - maxTxPower = regMax; -#endif #if defined FEATURE_WLAN_ESE if (session->isESEconnection) { @@ -806,7 +796,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, } #endif -#if defined (FEATURE_WLAN_ESE) || defined (WLAN_FEATURE_VOWIFI) /* If maxTxPower is increased or decreased */ if (maxTxPower != session->maxTxPower) { sch_log(mac_ctx, LOG1, @@ -816,7 +805,6 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, == eSIR_SUCCESS) session->maxTxPower = maxTxPower; } -#endif /* Indicate to LIM that Beacon is received */ if (bcn->HTInfo.present) diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 63a4c648f6ee..44d2bf0f88bf 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -293,13 +293,11 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg) CASE_RETURN_STRING(eWNI_PMC_MSG_TYPES_BEGIN); CASE_RETURN_STRING(eWNI_PMC_SMPS_STATE_IND); -#if defined WLAN_FEATURE_VOWIFI CASE_RETURN_STRING(eWNI_SME_RRM_MSG_TYPE_BEGIN); CASE_RETURN_STRING(eWNI_SME_NEIGHBOR_REPORT_REQ_IND); CASE_RETURN_STRING(eWNI_SME_NEIGHBOR_REPORT_IND); CASE_RETURN_STRING(eWNI_SME_BEACON_REPORT_REQ_IND); CASE_RETURN_STRING(eWNI_SME_BEACON_REPORT_RESP_XMIT_IND); -#endif CASE_RETURN_STRING(eWNI_SME_ADD_STA_SELF_RSP); CASE_RETURN_STRING(eWNI_SME_DEL_STA_SELF_RSP); CASE_RETURN_STRING(eWNI_SME_FT_PRE_AUTH_REQ); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 0420429e6f6e..431bba7871f3 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -45,9 +45,7 @@ #include "lim_ser_des_utils.h" #include "sch_api.h" #include "wmm_apsd.h" -#if defined WLAN_FEATURE_VOWIFI #include "rrm_api.h" -#endif #include "cds_regdomain_common.h" @@ -5491,7 +5489,6 @@ tSirRetStatus populate_dot11_assoc_res_p2p_ie(tpAniSirGlobal pMac, return eSIR_SUCCESS; } -#if defined WLAN_FEATURE_VOWIFI tSirRetStatus populate_dot11f_wfatpc(tpAniSirGlobal pMac, tDot11fIEWFATPC *pDot11f, uint8_t txPower, @@ -5586,7 +5583,6 @@ tSirRetStatus populate_dot11f_rrm_ie(tpAniSirGlobal pMac, pDot11f->present = 1; return eSIR_SUCCESS; } -#endif void populate_mdie(tpAniSirGlobal pMac, tDot11fIEMobilityDomain *pDot11f, diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index fbcccfe2dfd6..bd2231db1104 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -363,13 +363,11 @@ typedef struct tagCsrScanResultFilter { /* For WPS filtering if true => auth and ecryption should be ignored */ bool bWPSAssociation; bool bOSENAssociation; -#if defined WLAN_FEATURE_VOWIFI /* * For measurement reports --> if set, only SSID, * BSSID and channel is considered for filtering. */ bool fMeasurement; -#endif tCsrMobilityDomainInfo MDID; bool p2pResult; #ifdef WLAN_FEATURE_11W diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index f706d45aa737..e99d39d58d68 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -52,9 +52,7 @@ #include "oem_data_api.h" #endif -#if defined WLAN_FEATURE_VOWIFI #include "sme_rrm_internal.h" -#endif #include "sir_types.h" /*-------------------------------------------------------------------------- Preprocessor definitions and constants @@ -90,9 +88,7 @@ typedef void (*hdd_ftm_msg_processor)(void *); typedef struct _smeConfigParams { tCsrConfigParam csrConfig; -#if defined WLAN_FEATURE_VOWIFI struct rrm_config_param rrmConfig; -#endif } tSmeConfigParams, *tpSmeConfigParams; #ifdef FEATURE_WLAN_TDLS @@ -434,11 +430,9 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, void sme_set_cfg_privacy(tHalHandle hHal, tCsrRoamProfile *pProfile, bool fPrivacy); void sme_get_recovery_stats(tHalHandle hHal); -#if defined WLAN_FEATURE_VOWIFI QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, tpRrmNeighborReq pRrmNeighborReq, tpRrmNeighborRspCallbackInfo callbackInfo); -#endif QDF_STATUS sme_get_wcnss_wlan_compiled_version(tHalHandle hHal, tSirVersionType * pVersion); QDF_STATUS sme_get_wcnss_wlan_reported_version(tHalHandle hHal, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 0f75c43eb56c..c8ba415f2f68 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -51,9 +51,7 @@ #include "oem_data_internal.h" #endif -#if defined WLAN_FEATURE_VOWIFI #include "sme_rrm_api.h" -#endif ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue); /*-------------------------------------------------------------------------- diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 9af459f7bd78..37a9ed73539b 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1097,13 +1097,11 @@ QDF_STATUS sme_open(tHalHandle hHal) if (!QDF_IS_STATUS_SUCCESS(status)) return status; -#if defined WLAN_FEATURE_VOWIFI status = rrm_open(pMac); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, FL("rrm_open failed, status=%d"), status); return status; } -#endif sme_p2p_open(pMac); sme_trace_init(pMac); return status; @@ -1364,7 +1362,6 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams "csr_change_default_config_param failed with status=%d", status); } -#if defined WLAN_FEATURE_VOWIFI status = rrm_change_default_config_param(hHal, &pSmeConfigParams->rrmConfig); @@ -1373,7 +1370,6 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams "rrm_change_default_config_param failed with status=%d", status); } -#endif /* For SOC, CFG is set before start */ /* We don't want to apply global CFG in connect state because that may cause some side affect */ if (csr_is_all_session_disconnected(pMac)) { @@ -1664,13 +1660,11 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal) break; } -#if defined WLAN_FEATURE_VOWIFI if (QDF_STATUS_SUCCESS != rrm_ready(hHal)) { status = QDF_STATUS_E_FAILURE; sms_log(pMac, LOGE, "rrm_ready failed"); break; } -#endif pMac->sme.state = SME_STATE_READY; } while (0); @@ -2215,7 +2209,6 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) pMsg->type); } break; -#if defined WLAN_FEATURE_VOWIFI case eWNI_SME_NEIGHBOR_REPORT_IND: case eWNI_SME_BEACON_REPORT_REQ_IND: #if defined WLAN_VOWIFI_DEBUG @@ -2231,7 +2224,6 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) pMsg->type); } break; -#endif #ifdef FEATURE_OEM_DATA_SUPPORT /* Handle the eWNI_SME_OEM_DATA_RSP: */ case eWNI_SME_OEM_DATA_RSP: @@ -2891,7 +2883,6 @@ QDF_STATUS sme_close(tHalHandle hHal) fail_status = status; } -#if defined WLAN_FEATURE_VOWIFI status = rrm_close(hHal); if (!QDF_IS_STATUS_SUCCESS(status)) { sms_log(pMac, LOGE, @@ -2899,7 +2890,6 @@ QDF_STATUS sme_close(tHalHandle hHal) status); fail_status = status; } -#endif sme_p2p_close(hHal); @@ -5306,7 +5296,6 @@ void sme_set_cfg_privacy(tHalHandle hHal, } } -#if defined WLAN_FEATURE_VOWIFI /* --------------------------------------------------------------------------- \fn sme_neighbor_report_request \brief API to request neighbor report. @@ -5337,7 +5326,6 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId, return status; } -#endif void sms_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...) { diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 74c867ea2cf3..a26ae1fd1e7e 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1671,7 +1671,6 @@ static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, } -#if defined WLAN_FEATURE_VOWIFI /** * csr_neighbor_roam_channels_filter_by_current_band() * @@ -1994,7 +1993,6 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba return QDF_STATUS_SUCCESS; } -#endif /* WLAN_FEATURE_VOWIFI */ /** * csr_neighbor_roam_is_ssid_and_security_match() - to match ssid/security diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 463a9d205a1e..0b0c5d1b75c2 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -4779,13 +4779,11 @@ bool csr_match_bss(tHalHandle hal, tSirBssDescription *bss_descr, } if (!check) goto end; -#if defined WLAN_FEATURE_VOWIFI /* If this is for measurement filtering */ if (filter->fMeasurement) { rc = true; goto end; } -#endif if (!csr_is_phy_mode_match(mac_ctx, filter->phyMode, bss_descr, NULL, NULL, ie_ptr)) goto end; diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 341234f967ac..ad1716998d3a 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -35,7 +35,6 @@ /* $Header$ */ -#if defined WLAN_FEATURE_VOWIFI /*-------------------------------------------------------------------------- Include Files ------------------------------------------------------------------------*/ @@ -1563,4 +1562,3 @@ tRrmNeighborReportDesc *sme_rrm_get_next_bss_entry_from_neighbor_cache( return pTempBssEntry; } -#endif diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 1b3b30bb789f..ba21b8b28cd4 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -486,10 +486,8 @@ typedef struct { tSirMacSSid ssId; uint8_t respReqd; uint8_t sessionId; -#if defined WLAN_FEATURE_VOWIFI int8_t txMgmtPower; int8_t maxTxPower; -#endif /* WLAN_FEATURE_VOWIFI */ #if defined WLAN_FEATURE_VOWIFI_11R uint8_t extSetStaKeyParamValid; @@ -613,10 +611,8 @@ typedef struct { typedef struct { uint8_t scanChannel; QDF_STATUS status; -#if defined WLAN_FEATURE_VOWIFI uint32_t startTSF[2]; int8_t txMgmtPower; -#endif /* WLAN_FEATURE_VOWIFI */ } tStartScanParams, *tpStartScanParams; /** @@ -895,14 +891,9 @@ typedef struct { */ typedef struct { uint8_t channelNumber; -#ifndef WLAN_FEATURE_VOWIFI - uint8_t localPowerConstraint; -#endif /* WLAN_FEATURE_VOWIFI */ uint8_t peSessionId; -#if defined WLAN_FEATURE_VOWIFI int8_t txMgmtPower; int8_t maxTxPower; -#endif /* WLAN_FEATURE_VOWIFI */ tSirMacAddr selfStaMacAddr; /* the request has power constraints, this should be applied only to * that session diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index d7a51952fc4b..3f1fc9c0d690 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -2799,13 +2799,8 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.ch_center_freq_seg0 = add_bss->ch_center_freq_seg0; req.ch_center_freq_seg1 = add_bss->ch_center_freq_seg1; req.vht_capable = add_bss->vhtCapable; -#if defined WLAN_FEATURE_VOWIFI req.max_txpow = add_bss->maxTxPower; maxTxPower = add_bss->maxTxPower; -#else - req.max_txpow = 0; - maxTxPower = 0; -#endif /* WLAN_FEATURE_VOWIFI */ #ifdef WLAN_FEATURE_11W if (add_bss->rmfEnabled) { /* @@ -3197,11 +3192,7 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) req.chan_width = add_bss->ch_width; req.ch_center_freq_seg0 = add_bss->ch_center_freq_seg0; req.ch_center_freq_seg1 = add_bss->ch_center_freq_seg1; -#if defined WLAN_FEATURE_VOWIFI req.max_txpow = add_bss->maxTxPower; -#else - req.max_txpow = 0; -#endif req.beacon_intval = add_bss->beaconInterval; req.dtim_period = add_bss->dtimPeriod; req.hidden_ssid = add_bss->bHiddenSSIDEn; @@ -3915,11 +3906,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) } #endif } -#if defined WLAN_FEATURE_VOWIFI maxTxPower = params->maxTxPower; -#else - maxTxPower = 0; -#endif wma_vdev_set_bss_params(wma, params->smesessionId, iface->beaconInterval, iface->dtimPeriod, iface->shortSlotTimeSupported, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 2cc648d1f120..a2549fa688ab 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2491,11 +2491,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) req.preferred_tx_streams = 1; } -#ifdef WLAN_FEATURE_VOWIFI req.max_txpow = params->maxTxPower; -#else - req.max_txpow = params->localPowerConstraint; -#endif /* WLAN_FEATURE_VOWIFI */ req.beacon_intval = 100; req.dtim_period = 1; req.is_dfs = params->isDfsChannel; @@ -2523,11 +2519,7 @@ void wma_set_channel(tp_wma_handle wma, tpSwitchChannelParams params) send_resp: WMA_LOGD("%s: channel %d ch_width %d txpower %d status %d", __func__, params->channelNumber, params->ch_width, -#ifdef WLAN_FEATURE_VOWIFI params->maxTxPower, -#else - params->localPowerConstraint, -#endif /* WLAN_FEATURE_VOWIFI */ status); params->status = status; WMA_LOGI("%s: sending WMA_SWITCH_CHANNEL_RSP, status = 0x%x", -- cgit v1.2.3 From f988222e04522dcfa78141563484de5467118909 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Fri, 22 Jan 2016 17:16:50 -0800 Subject: qcacld-3.0: Fix memory leak while cleaning up scan filter Memory leak observed while cleaning up scan filter in SME module. Change-Id: Ic4bbf622f1950d1ed6323a45504e4ad57fbf3b09 CRs-Fixed: 973626 --- core/sme/src/common/sme_api.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 37a9ed73539b..0a44d44f309b 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -3125,11 +3125,10 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle, } else { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, FL("Aquiring lock failed")); + csr_free_scan_filter(mac_ctx, scan_filter); status = QDF_STATUS_E_FAILURE; } - qdf_mem_free(scan_filter); - return status; } -- cgit v1.2.3 From 9be5eaa4389673e26009fc115e113fb255d3def7 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Mon, 1 Feb 2016 17:12:28 -0800 Subject: qcacld-3.0: Remove wma_recreate_ibss_vdev_and_bss_peer logic wma_recreate_ibss_vdev_and_bss_peer is obsoleted API and no longer needed. Remove this API as part of clean-up efforts. Change-Id: I277e775b7f44ca5aa05129d45e80c98fe1a53753 CRs-Fixed: 973626 --- core/wma/src/wma_dev_if.c | 103 ---------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 3f1fc9c0d690..2049c828646c 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1219,98 +1219,6 @@ static void wma_delete_all_ap_remote_peers(tp_wma_handle wma, A_UINT32 vdev_id) (ol_txrx_vdev_peer_remove_cb)wma_remove_peer, wma, false); } -#ifdef QCA_IBSS_SUPPORT - -/** - * wma_recreate_ibss_vdev_and_bss_peer() - recreate IBSS vdev and create peer - * @wma: wma handle - * @vdev_id: vdev id - * - * Return: none - */ -static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, - uint8_t vdev_id) -{ - ol_txrx_vdev_handle vdev; - ol_txrx_pdev_handle pdev; - struct add_sta_self_params add_sta_self_param; - struct del_sta_self_params del_sta_param; - QDF_STATUS status; - struct qdf_mac_addr *mac_addr; - uint8_t *mac_addr_raw; - - if (!wma) { - WMA_LOGE("%s: Null wma handle", __func__); - return; - } - - vdev = wma_find_vdev_by_id(wma, vdev_id); - if (!vdev) { - WMA_LOGE("%s: Can't find vdev with id %d", __func__, vdev_id); - return; - } - - mac_addr = ol_txrx_get_vdev_struct_mac_addr(vdev); - if (mac_addr == NULL) { - WMA_LOGE("%s: mac_addr is NULL for vdev with id %d", __func__, - vdev_id); - return; - } - - qdf_copy_macaddr( - (struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr), - mac_addr); - add_sta_self_param.session_id = vdev_id; - add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; - add_sta_self_param.sub_type = 0; - add_sta_self_param.status = 0; - - /* delete old ibss vdev */ - del_sta_param.session_id = vdev_id; - qdf_mem_copy((void *)del_sta_param.self_mac_addr, - (void *)mac_addr, QDF_MAC_ADDR_SIZE); - wma_vdev_detach(wma, &del_sta_param, 0); - - /* create new vdev for ibss */ - vdev = wma_vdev_attach(wma, &add_sta_self_param, 0); - if (!vdev) { - WMA_LOGE("%s: Failed to create vdev", __func__); - return; - } - - mac_addr_raw = ol_txrx_get_vdev_mac_addr(vdev); - /* Register with TxRx Module for Data Ack Complete Cb */ - ol_txrx_data_tx_cb_set(vdev, wma_data_tx_ack_comp_hdlr, wma); - WMA_LOGA("new IBSS vdev created with mac %pM", - add_sta_self_param.self_mac_addr); - - pdev = ol_txrx_get_pdev_from_vdev(vdev); - - /* create ibss bss peer */ - status = wma_create_peer(wma, pdev, vdev, mac_addr_raw, - WMI_PEER_TYPE_DEFAULT, vdev_id, false); - if (status != QDF_STATUS_SUCCESS) - WMA_LOGE("%s: Failed to create IBSS bss peer", __func__); - else - WMA_LOGA("IBSS BSS peer created with mac %pM", - mac_addr_raw); -} -#else -/** - * wma_recreate_ibss_vdev_and_bss_peer() - dummy function - * @wma: wma handle - * @vdev_id: vdev id - * - * Dummy for when IBSS not supported - * - * Return: none - */ -static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma, - uint8_t vdev_id) -{ -} -#endif /* QCA_IBSS_SUPPORT */ - /** * wma_hidden_ssid_vdev_restart_on_vdev_stop() - restart vdev to set hidden ssid * @wma_handle: wma handle @@ -1489,11 +1397,6 @@ int wma_vdev_stop_resp_handler(void *handle, uint8_t *cmd_param_info, wma->interfaces[resp_event->vdev_id].beacon = NULL; } - /* recreate ibss vdev and bss peer for scan purpose */ - if (wma_is_vdev_in_ibss_mode(wma, resp_event->vdev_id)) - wma_recreate_ibss_vdev_and_bss_peer(wma, - resp_event->vdev_id); - /* Timeout status means its WMA generated DEL BSS REQ when ADD * BSS REQ was timed out to stop the VDEV in this case no need * to send response to UMAC @@ -2476,12 +2379,6 @@ void wma_vdev_resp_timer(void *data) qdf_mem_free(bcn); wma->interfaces[tgt_req->vdev_id].beacon = NULL; } - - /* recreate ibss vdev and bss peer for scan purpose */ - if (wma_is_vdev_in_ibss_mode(wma, tgt_req->vdev_id)) - wma_recreate_ibss_vdev_and_bss_peer(wma, - tgt_req->vdev_id); - params->status = QDF_STATUS_E_TIMEOUT; WMA_LOGA("%s: WMA_DELETE_BSS_REQ timedout", __func__); wma_send_msg(wma, WMA_DELETE_BSS_RSP, (void *)params, 0); -- cgit v1.2.3 From 8c37e32104bf18cffbfee503da62324156c7989a Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Wed, 3 Feb 2016 16:08:37 -0800 Subject: qcacld-3.0: Fix to make common change intf api for ibss/sta/p2pcli Current code is using seperate change interface for IBSS and STA/P2PCLI. Fix the API such that IBSS/STA/P2PCLI all can use same API. Change-Id: I7a1d9fa3ef42091fcb7f71d95b604e3dceb8da50 CRs-Fixed: 973626 --- core/cds/src/cds_api.c | 3 + core/hdd/src/wlan_hdd_cfg80211.c | 126 +++++++++++++++------------------------ core/hdd/src/wlan_hdd_main.c | 38 +++++++++--- core/wma/src/wma_dev_if.c | 70 ++++------------------ 4 files changed, 93 insertions(+), 144 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index ad9ace313f70..6c0204407a52 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1545,6 +1545,9 @@ QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type, case QDF_OCB_MODE: *type = WMI_VDEV_TYPE_OCB; break; + case QDF_IBSS_MODE: + *type = WMI_VDEV_TYPE_IBSS; + break; default: QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Invalid device mode %d", mode); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 817887f1e9f6..4e513d6e569f 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -5903,63 +5903,61 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, return ret; } -static int -wlan_hdd_change_iface_to_adhoc(struct net_device *ndev, - tCsrRoamProfile *pRoamProfile, - enum nl80211_iftype type) -{ - hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev); - hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - struct hdd_config *pConfig = pHddCtx->config; - struct wireless_dev *wdev = ndev->ieee80211_ptr; - - pRoamProfile->BSSType = eCSR_BSS_TYPE_START_IBSS; - pRoamProfile->phyMode = - hdd_cfg_xlate_to_csr_phy_mode(pConfig->dot11Mode); - pAdapter->device_mode = WLAN_HDD_IBSS; - wdev->iftype = type; - - return 0; -} - -static int wlan_hdd_change_iface_to_sta_mode(struct net_device *ndev, +/** + * wlan_hdd_change_client_iface_to_new_mode() - to change iface to provided mode + * @ndev: pointer to net device provided by supplicant + * @type: type of the interface, upper layer wanted to change + * + * Upper layer provides the new interface mode that needs to be changed + * for given net device + * + * Return: success or failure in terms of integer value + */ +static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev, enum nl80211_iftype type) { - hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(ndev); - hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); + hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); + hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); + struct hdd_config *config = hdd_ctx->config; hdd_wext_state_t *wext; struct wireless_dev *wdev; QDF_STATUS status; ENTER(); - if (test_bit(ACS_IN_PROGRESS, &pHddCtx->g_event_flags)) { + if (test_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags)) { hddLog(LOG1, FL("ACS is in progress, don't change iface!")); return 0; } wdev = ndev->ieee80211_ptr; - hdd_stop_adapter(pHddCtx, pAdapter, true); - hdd_deinit_adapter(pHddCtx, pAdapter, true); + hdd_stop_adapter(hdd_ctx, adapter, true); + hdd_deinit_adapter(hdd_ctx, adapter, true); wdev->iftype = type; /*Check for sub-string p2p to confirm its a p2p interface */ if (NULL != strnstr(ndev->name, "p2p", 3)) { - pAdapter->device_mode = + adapter->device_mode = (type == NL80211_IFTYPE_STATION) ? WLAN_HDD_P2P_DEVICE : WLAN_HDD_P2P_CLIENT; + } else if (type == NL80211_IFTYPE_ADHOC) { + adapter->device_mode = WLAN_HDD_IBSS; } else { - pAdapter->device_mode = + adapter->device_mode = (type == NL80211_IFTYPE_STATION) ? WLAN_HDD_INFRA_STATION : WLAN_HDD_P2P_CLIENT; } - - memset(&pAdapter->sessionCtx, 0, sizeof(pAdapter->sessionCtx)); - hdd_set_station_ops(pAdapter->dev); - status = hdd_init_station_mode(pAdapter); - wext = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); - wext->roamProfile.pAddIEScan = pAdapter->scan_info.scanAddIE.addIEdata; + memset(&adapter->sessionCtx, 0, sizeof(adapter->sessionCtx)); + hdd_set_station_ops(adapter->dev); + status = hdd_init_station_mode(adapter); + wext = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); + wext->roamProfile.pAddIEScan = adapter->scan_info.scanAddIE.addIEdata; wext->roamProfile.nAddIEScanLength = - pAdapter->scan_info.scanAddIE.length; + adapter->scan_info.scanAddIE.length; + if (type == NL80211_IFTYPE_ADHOC) { + wext->roamProfile.BSSType = eCSR_BSS_TYPE_START_IBSS; + wext->roamProfile.phyMode = + hdd_cfg_xlate_to_csr_phy_mode(config->dot11Mode); + } EXIT(); return status; } @@ -6009,8 +6007,6 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, tCsrRoamProfile *pRoamProfile = NULL; eCsrRoamBssType LastBSSType; struct hdd_config *pConfig = NULL; - eMib_dot11DesiredBssType connectedBssType; - unsigned long rc; QDF_STATUS vstatus; int status; @@ -6062,24 +6058,28 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, switch (type) { case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: - vstatus = wlan_hdd_change_iface_to_sta_mode(ndev, type); + case NL80211_IFTYPE_ADHOC: + if (type == NL80211_IFTYPE_ADHOC) { + wlan_hdd_tdls_exit(pAdapter); + hdd_deregister_tx_flow_control(pAdapter); + hddLog(LOG1, + FL("Setting interface Type to ADHOC")); + } + vstatus = wlan_hdd_change_client_iface_to_new_mode(ndev, + type); if (vstatus != QDF_STATUS_SUCCESS) return -EINVAL; - hdd_register_tx_flow_control(pAdapter, + /* + * for ibss interface type flow control is not required + * so don't register tx flow control + */ + if (type != NL80211_IFTYPE_ADHOC) + hdd_register_tx_flow_control(pAdapter, hdd_tx_resume_timer_expired_handler, hdd_tx_resume_cb); goto done; - - case NL80211_IFTYPE_ADHOC: - wlan_hdd_tdls_exit(pAdapter); - hdd_deregister_tx_flow_control(pAdapter); - hddLog(LOG1, FL("Setting interface Type to ADHOC")); - wlan_hdd_change_iface_to_adhoc(ndev, pRoamProfile, - type); - break; - case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: { @@ -6162,7 +6162,8 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_ADHOC: - status = wlan_hdd_change_iface_to_sta_mode(ndev, type); + status = wlan_hdd_change_client_iface_to_new_mode(ndev, + type); if (status != QDF_STATUS_SUCCESS) return status; @@ -6196,35 +6197,6 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, pAdapter->device_mode); return -EOPNOTSUPP; } - - if (LastBSSType != pRoamProfile->BSSType) { - /* Interface type changed update in wiphy structure */ - wdev->iftype = type; - - /* The BSS mode changed, We need to issue disconnect - if connected or in IBSS disconnect state */ - if (hdd_conn_get_connected_bss_type - (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter), &connectedBssType) - || (eCSR_BSS_TYPE_START_IBSS == LastBSSType)) { - /* Need to issue a disconnect to CSR. */ - INIT_COMPLETION(pAdapter->disconnect_comp_var); - if (QDF_STATUS_SUCCESS == - sme_roam_disconnect(WLAN_HDD_GET_HAL_CTX(pAdapter), - pAdapter->sessionId, - eCSR_DISCONNECT_REASON_UNSPECIFIED)) { - rc = wait_for_completion_timeout(&pAdapter-> - disconnect_comp_var, - msecs_to_jiffies - (WLAN_WAIT_TIME_DISCONNECT)); - if (!rc) { - hddLog(LOGE, - FL - ("Wait on disconnect_comp_var failed")); - } - } - } - } - done: /* Set bitmask based on updated value */ cds_set_concurrency_mode(pAdapter->device_mode); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b6d9e5721d8a..af0d983eb9bf 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2012,6 +2012,35 @@ static QDF_STATUS hdd_sme_close_session_callback(void *pContext) return QDF_STATUS_SUCCESS; } +/** + * hdd_check_and_init_tdls() - check and init TDLS operation for desired mode + * @adapter: pointer to device adapter + * @type: type of interface + * + * This routine will check the mode of adapter and if it is required then it + * will initialize the TDLS operations + * + * Return: QDF_STATUS + */ +#ifdef FEATURE_WLAN_TDLS +static QDF_STATUS hdd_check_and_init_tdls(hdd_adapter_t *adapter, uint32_t type) +{ + if (QDF_IBSS_MODE != type) { + if (0 != wlan_hdd_tdls_init(adapter)) { + hddLog(LOGE, FL("wlan_hdd_tdls_init failed")); + return QDF_STATUS_E_FAILURE; + } + set_bit(TDLS_INIT_DONE, &adapter->event_flags); + } + return QDF_STATUS_SUCCESS; +} +#else +static QDF_STATUS hdd_check_and_init_tdls(hdd_adapter_t *adapter, uint32_t type) +{ + return QDF_STATUS_SUCCESS; +} +#endif + QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) { struct net_device *pWlanDev = adapter->dev; @@ -2105,14 +2134,9 @@ QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter) FL("WMI_PDEV_PARAM_BURST_ENABLE set failed %d"), ret_val); } -#ifdef FEATURE_WLAN_TDLS - if (0 != wlan_hdd_tdls_init(adapter)) { - status = QDF_STATUS_E_FAILURE; - hddLog(LOGE, FL("wlan_hdd_tdls_init failed")); + status = hdd_check_and_init_tdls(adapter, type); + if (status != QDF_STATUS_SUCCESS) goto error_tdls_init; - } - set_bit(TDLS_INIT_DONE, &adapter->event_flags); -#endif return QDF_STATUS_SUCCESS; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2049c828646c..ab2965b91f94 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1557,7 +1557,7 @@ ol_txrx_vdev_handle wma_vdev_attach(tp_wma_handle wma_handle, if (((self_sta_req->type == WMI_VDEV_TYPE_AP) && (self_sta_req->sub_type == WMI_UNIFIED_VDEV_SUBTYPE_P2P_DEVICE)) || (self_sta_req->type == WMI_VDEV_TYPE_OCB)) { - WMA_LOGA("P2P Device: creating self peer %pM, vdev_id %hu", + WMA_LOGA("Creating self peer %pM, vdev_id %hu", self_sta_req->self_mac_addr, self_sta_req->session_id); status = wma_create_peer(wma_handle, txrx_pdev, txrx_vdev_handle, @@ -2776,11 +2776,8 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) struct wma_target_req *msg; uint8_t vdev_id, peer_id; QDF_STATUS status; - struct add_sta_self_params add_sta_self_param; - struct del_sta_self_params del_sta_param; tSetBssKeyParams key_info; struct sir_hw_mode_params hw_mode = {0}; - struct qdf_mac_addr *mac_addr; vdev = wma_find_vdev_by_addr(wma, add_bss->selfMacAddr, &vdev_id); if (!vdev) { @@ -2797,63 +2794,16 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss) } wma_set_bss_rate_flags(&wma->interfaces[vdev_id], add_bss); - /* only change vdev type to ibss during 1st time join_ibss handling */ - - if (false == wma_is_vdev_in_ibss_mode(wma, vdev_id)) { - - WMA_LOGD("%s: vdev found for vdev id %d. deleting the vdev", - __func__, vdev_id); - - /* remove peers on the existing non-ibss vdev */ - ol_txrx_remove_peers_for_vdev_no_lock(vdev, - (ol_txrx_vdev_peer_remove_cb)wma_remove_peer, wma); - mac_addr = ol_txrx_get_vdev_struct_mac_addr(vdev); - if (mac_addr == NULL) { - WMA_LOGE("%s: mac_addr is NULL for vdev with id %d", - __func__, vdev_id); - goto send_fail_resp; - } - - /* remove the non-ibss vdev */ - qdf_copy_macaddr( - (struct qdf_mac_addr *) &(del_sta_param.self_mac_addr), - mac_addr); - del_sta_param.session_id = vdev_id; - del_sta_param.status = 0; - - wma_vdev_detach(wma, &del_sta_param, 0); - - /* create new vdev for ibss */ - qdf_copy_macaddr((struct qdf_mac_addr *) & - (add_sta_self_param.self_mac_addr), - (struct qdf_mac_addr *) &(add_bss->selfMacAddr)); - add_sta_self_param.session_id = vdev_id; - add_sta_self_param.type = WMI_VDEV_TYPE_IBSS; - add_sta_self_param.sub_type = 0; - add_sta_self_param.status = 0; - - vdev = wma_vdev_attach(wma, &add_sta_self_param, 0); - if (!vdev) { - WMA_LOGE("%s: Failed to create vdev", __func__); - goto send_fail_resp; - } - - /* Register with TxRx Module for Data Ack Complete Cb */ - ol_txrx_data_tx_cb_set(vdev, wma_data_tx_ack_comp_hdlr, wma); - WMA_LOGA("new IBSS vdev created with mac %pM", - add_bss->selfMacAddr); - - /* create ibss bss peer */ - status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, - WMI_PEER_TYPE_DEFAULT, vdev_id, - false); - if (status != QDF_STATUS_SUCCESS) { - WMA_LOGE("%s: Failed to create peer", __func__); - goto send_fail_resp; - } - WMA_LOGA("IBSS BSS peer created with mac %pM", - add_bss->selfMacAddr); + /* create ibss bss peer */ + status = wma_create_peer(wma, pdev, vdev, add_bss->selfMacAddr, + WMI_PEER_TYPE_DEFAULT, vdev_id, + false); + if (status != QDF_STATUS_SUCCESS) { + WMA_LOGE("%s: Failed to create peer", __func__); + goto send_fail_resp; } + WMA_LOGA("IBSS BSS peer created with mac %pM", + add_bss->selfMacAddr); peer = ol_txrx_find_peer_by_addr(pdev, add_bss->selfMacAddr, &peer_id); if (!peer) { -- cgit v1.2.3 From d521600a10fe7a495ca1a0ffa982ae1278bd2da1 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 3 Feb 2016 17:09:09 -0800 Subject: qcacld-3.0: Change channel bonding mode after roaming The CB mode could get changed after roaming since the non-AP STA can roam to an AP which has a different channel bonding mode. So, derive the CB mode from the IE's and accordingly set in the connected profile. CRs-Fixed: 972479 Change-Id: I01daa88d69397fb0e88615656903c43ed623ed38 --- core/sme/src/csr/csr_api_roam.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 43d82897bddd..4a4f47734ccc 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -7820,12 +7820,16 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, qdf_mem_free(pConnectProfile->pAddIEAssoc); pConnectProfile->pAddIEAssoc = NULL; } + /* + * In case of LFR2.0, the connected profile is copied into a temporary + * profile and cleared and then is copied back. This is not needed for + * LFR3.0, since the profile is not cleared. + */ if (!pSession->roam_synch_in_progress) { qdf_mem_set(&pSession->connectedProfile, sizeof(tCsrRoamConnectedProfile), 0); pConnectProfile->AuthType = pProfile->negotiatedAuthType; pConnectProfile->AuthInfo = pProfile->AuthType; - pConnectProfile->CBMode = pProfile->CBMode; pConnectProfile->EncryptionType = pProfile->negotiatedUCEncryptionType; pConnectProfile->EncryptionInfo = pProfile->EncryptionType; @@ -7861,6 +7865,12 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac, pConnectProfile->MFPCapable = pProfile->MFPCapable; #endif } + if (pIes) + pConnectProfile->CBMode = csr_get_cb_mode_from_ies(pMac, + pSirBssDesc->channelId, pIes); + else + sms_log(pMac, LOGE, FL("IE unavailable to derive CB mode")); + /* Save bssid */ pConnectProfile->operationChannel = pSirBssDesc->channelId; pConnectProfile->beaconInterval = pSirBssDesc->beaconInterval; -- cgit v1.2.3 From 16e8f0114ec12a3264114d2740529506775bcb10 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 3 Feb 2016 17:21:09 -0800 Subject: qcacld-3.0: Do not send replay counter for CCKM Do not include replay counter attribute when roaming is done for CCKM authentication type. For 11R and CCKM roaming, the re-association frame carries additional IE's which help cut down the Key exchange post association. Hence there would be no EAPOL exchange and hence it is not needed to include the replay counter attribute to the supplicant after roaming. CRs-Fixed: 972486 Change-Id: Ib861bdc91e949605788a19df4a706e6544dd4c73 --- core/hdd/src/wlan_hdd_cfg80211.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 4e513d6e569f..e9a74a044d2b 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2998,6 +2998,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, uint32_t rsp_rsn_len, tCsrRoamInfo *roam_info_ptr) { struct sk_buff *skb = NULL; + eCsrAuthType auth_type; ENTER(); if (wlan_hdd_validate_context(hdd_ctx_ptr)) { @@ -3043,14 +3044,17 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, hdd_err("nla put fail"); goto nla_put_failure; } - /* if FT connection: dont send ROAM_AUTH_KEY_REPLAY_CTR */ - if (roam_info_ptr->u.pConnectedProfile->AuthType != - eCSR_AUTH_TYPE_FT_RSN && - roam_info_ptr->u.pConnectedProfile->AuthType != - eCSR_AUTH_TYPE_FT_RSN_PSK && - nla_put(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_KEY_REPLAY_CTR, - SIR_REPLAY_CTR_LEN, roam_info_ptr->replay_ctr)) { - hdd_err("non FT connection."); + auth_type = roam_info_ptr->u.pConnectedProfile->AuthType; + /* if FT or CCKM connection: dont send replay counter */ + if (auth_type != eCSR_AUTH_TYPE_FT_RSN && + auth_type != eCSR_AUTH_TYPE_FT_RSN_PSK && + auth_type != eCSR_AUTH_TYPE_CCKM_WPA && + auth_type != eCSR_AUTH_TYPE_CCKM_RSN && + nla_put(skb, + QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_KEY_REPLAY_CTR, + SIR_REPLAY_CTR_LEN, + roam_info_ptr->replay_ctr)) { + hdd_err("non FT/non CCKM connection."); hdd_err("failed to send replay counter."); goto nla_put_failure; } -- cgit v1.2.3 From 30bc42cbe8742090fb7905ed2855b0d886cd5493 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 4 Feb 2016 10:07:30 -0800 Subject: qcacld-3.0: LFR2.0 Ignore STA kickout when roaming is in progress If roaming is in progress, then there is a good chance to connect to a better AP very soon, so ignore the sta kickout event that is received from the firmware. CRs-Fixed: 947880 Change-Id: I9197ed09a40d9acb706d1bfa535a4eb292a1af74 --- core/wma/inc/wma.h | 1 + core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_main.c | 2 +- core/wma/src/wma_mgmt.c | 4 ++++ core/wma/src/wma_scan_roam.c | 10 ++++++++-- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index bb3f24ea13c1..797b1ae41173 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -910,6 +910,7 @@ struct wma_txrx_node { uint32_t rx_streams; uint32_t chain_mask; uint32_t mac_id; + bool roaming_in_progress; }; #if defined(QCA_WIFI_FTM) diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 820e05111d28..0dd428cfdacd 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -253,7 +253,7 @@ QDF_STATUS wma_roam_scan_bmiss_cnt(tp_wma_handle wma_handle, QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, uint32_t command, uint32_t vdev_id); -QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req); QDF_STATUS wma_roam_preauth_chan_set(tp_wma_handle wma_handle, diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 625ae4e83b41..2fd6f9314eb6 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -4804,7 +4804,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) /* * Main entry point or roaming directives from CSR. */ - wma_process_roam_scan_req(wma_handle, + wma_process_roaming_config(wma_handle, (tSirRoamOffloadScanReq *) msg->bodyptr); break; diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index f055d6f39ba3..4a44de63b952 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -315,6 +315,10 @@ int wma_peer_sta_kickout_event_handler(void *handle, u8 *event, u32 len) WMA_LOGA("%s: PEER:[%pM], ADDR:[%pN], INTERFACE:%d, peer_id:%d, reason:%d", __func__, macaddr, wma->interfaces[vdev_id].addr, vdev_id, peer_id, kickout_event->reason); + if (wma->interfaces[vdev_id].roaming_in_progress) { + WMA_LOGE("Ignore STA kick out since roaming is in progress"); + return -EINVAL; + } switch (kickout_event->reason) { case WMI_PEER_STA_KICKOUT_REASON_IBSS_DISCONNECT: diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index a2549fa688ab..6f465dcb9400 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1466,7 +1466,7 @@ QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, } /** - * wma_process_roam_scan_req() - process roam request + * wma_process_roaming_config() - process roam request * @wma_handle: wma handle * @roam_req: roam request parameters * @@ -1474,7 +1474,7 @@ QDF_STATUS wma_roam_scan_offload_command(tp_wma_handle wma_handle, * * Return: QDF status */ -QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, +QDF_STATUS wma_process_roaming_config(tp_wma_handle wma_handle, tSirRoamOffloadScanReq *roam_req) { QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; @@ -1499,6 +1499,9 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle, qdf_mem_free(roam_req); return QDF_STATUS_E_PERM; } + WMA_LOGD("%s: roaming in progress set to false for vdev %d", + __func__, roam_req->sessionId); + wma_handle->interfaces[roam_req->sessionId].roaming_in_progress = false; switch (roam_req->Command) { case ROAM_SCAN_OFFLOAD_START: intr = &wma_handle->interfaces[roam_req->sessionId]; @@ -5317,6 +5320,9 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id) __func__); return; } + WMA_LOGD("%s: roaming in progress for vdev %d", + __func__, vdev_id); + wma->interfaces[vdev_id].roaming_in_progress = true; candidate_ind->messageType = eWNI_SME_CANDIDATE_FOUND_IND; candidate_ind->sessionId = vdev_id; -- cgit v1.2.3 From 9044489d18fdfcc05964cd2a367c104df867aac8 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 4 Feb 2016 10:43:20 -0800 Subject: qcacld-3.0: Improve default logging for LFR3 Log the improtant messages with respect to roam synch propagation by default so that they appear in the kernel logs and give an hint of roaming. Also ensure not to log too much. CRs-Fixed: 972498 Change-Id: Ia0bd7c9960a29275f872a9ec18173b8c5a08539a --- core/mac/src/pe/lim/lim_api.c | 2 +- core/sme/src/csr/csr_api_roam.c | 2 +- core/wma/src/wma_scan_roam.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 14b1559567b7..ae2392c1226a 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2004,7 +2004,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOGE, FL("LFR3:roam_sync_ind_ptr is NULL")); return status; } - lim_log(mac_ctx, LOGE, FL("LFR3:Received WMA_ROAM_OFFLOAD_SYNCH_IND")); + lim_log(mac_ctx, LOG1, FL("LFR3:Received WMA_ROAM_OFFLOAD_SYNCH_IND")); lim_log(mac_ctx, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"), roam_sync_ind_ptr->authStatus, roam_sync_ind_ptr->roamedVdevId); lim_print_mac_addr(mac_ctx, roam_sync_ind_ptr->bssid.bytes, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 4a4f47734ccc..01e43eb37dcb 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -19143,7 +19143,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, conn_profile->acm_mask = sme_qos_get_acm_mask(mac_ctx, bss_desc, NULL); if (conn_profile->modifyProfileFields.uapsd_mask) { - sms_log(mac_ctx, LOGE, + sms_log(mac_ctx, LOG1, " uapsd_mask (0x%X) set, request UAPSD now", conn_profile->modifyProfileFields.uapsd_mask); sme_ps_start_uapsd(mac_ctx, session_id, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 6f465dcb9400..13ca63f10731 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2037,6 +2037,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event, __func__); return status; } + WMA_LOGE("LFR3: Received WMA_ROAM_OFFLOAD_SYNCH_IND"); wma->interfaces[synch_event->vdev_id].roam_synch_in_progress = true; len = sizeof(roam_offload_synch_ind) + @@ -2426,7 +2427,7 @@ void wma_process_roam_synch_complete(WMA_HANDLE handle, uint8_t vdev_id) vdev_id)) { return; } - + WMA_LOGE("LFR3: Posting WMA_ROAM_OFFLOAD_SYNCH_CNF"); return; } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ -- cgit v1.2.3 From 28925b4c24e90f7075147128744e9c6c51e26021 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Mon, 8 Feb 2016 07:18:50 -0800 Subject: qcacld-3.0: LFR3.0: Fill Self MAC Address properly The self MAC address should be filled from the previous session in PE and has to be passed to WMA which is used while creating the new PEER. CRs-Fixed: 973463 Change-Id: If7f0d4d8400fd8dfcafb08e3795e434621b67a6d --- core/mac/inc/sir_api.h | 1 + core/mac/src/pe/lim/lim_api.c | 2 ++ core/wma/src/wma_scan_roam.c | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index d69b4f821452..991113380b08 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3990,6 +3990,7 @@ typedef struct sSirSmeRoamOffloadSynchInd { uint8_t isBeacon; uint8_t roamedVdevId; struct qdf_mac_addr bssid; + struct qdf_mac_addr self_mac; int8_t txMgmtPower; uint32_t authStatus; uint8_t rssi; diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index ae2392c1226a..51bc6f0bde44 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -2035,6 +2035,8 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, } ft_session_ptr->peSessionId = session_id; sir_copy_mac_addr(ft_session_ptr->selfMacAddr, session_ptr->selfMacAddr); + sir_copy_mac_addr(roam_sync_ind_ptr->self_mac.bytes, + session_ptr->selfMacAddr); sir_copy_mac_addr(ft_session_ptr->limReAssocbssId, bss_desc->bssId); ft_session_ptr->bssType = eSIR_INFRASTRUCTURE_MODE; session_ptr->bRoamSynchInProgress = true; diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 13ca63f10731..85aac40fd780 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -1967,8 +1967,8 @@ void wma_roam_update_vdev(tp_wma_handle wma, qdf_mem_copy(del_bss_params->bssid, wma->interfaces[vdev_id].bssid, IEEE80211_ADDR_LEN); set_link_params->state = eSIR_LINK_PREASSOC_STATE; - qdf_mem_copy(set_link_params->selfMacAddr, wma->myaddr, - IEEE80211_ADDR_LEN); + qdf_mem_copy(set_link_params->selfMacAddr, + roam_synch_ind_ptr->self_mac.bytes, IEEE80211_ADDR_LEN); qdf_mem_copy(set_link_params->bssid, roam_synch_ind_ptr->bssid.bytes, IEEE80211_ADDR_LEN); add_sta_params->staType = STA_ENTRY_SELF; -- cgit v1.2.3 From dca5f81346d46253a54f10d06f5c204c0ae3594b Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 4 Feb 2016 17:28:06 -0800 Subject: qcacld-3.0: Extend wow debug fs support to all interfaces Currently WoW debug fs support is limited to 1st interface. FW supports wow and periodic pattern generation on all interface types. Extend wow debug fs support to all interfaces. Change-Id: I83deb1845f921ecf8c5422786e025a051ee3c561 CRs-Fixed: 973003 --- core/hdd/inc/wlan_hdd_debugfs.h | 6 +++--- core/hdd/inc/wlan_hdd_main.h | 5 ++--- core/hdd/src/wlan_hdd_debugfs.c | 27 ++++++++++++++++----------- core/hdd/src/wlan_hdd_main.c | 12 +++--------- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_debugfs.h b/core/hdd/inc/wlan_hdd_debugfs.h index 59f2f36238df..f5bfb1b49452 100644 --- a/core/hdd/inc/wlan_hdd_debugfs.h +++ b/core/hdd/inc/wlan_hdd_debugfs.h @@ -29,15 +29,15 @@ #define _WLAN_HDD_DEBUGFS_H #ifdef WLAN_OPEN_SOURCE -QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter); -void hdd_debugfs_exit(hdd_context_t *pHddCtx); +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *adapter); +void hdd_debugfs_exit(hdd_adapter_t *adapter); #else inline QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) { return QDF_STATUS_SUCCESS; } -inline void hdd_debugfs_exit(hdd_context_t *pHddCtx) +inline void hdd_debugfs_exit(hdd_adapter_t *adapter) { } #endif /* #ifdef WLAN_OPEN_SOURCE */ diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 010211d3eca4..d9c5ca0d7302 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1024,6 +1024,8 @@ struct hdd_adapter_s { struct hdd_netif_queue_stats queue_oper_stats[WLAN_REASON_TYPE_MAX]; struct hdd_lro_s lro_info; ol_txrx_tx_fp tx_fn; + /* debugfs entry */ + struct dentry *debugfs_phy; }; #define WLAN_HDD_GET_STATION_CTX_PTR(pAdapter) (&(pAdapter)->sessionCtx.station) @@ -1199,9 +1201,6 @@ struct hdd_context_s { bool sus_res_mcastbcast_filter_valid; - /* debugfs entry */ - struct dentry *debugfs_phy; - /* Use below lock to protect access to isSchedScanUpdatePending * since it will be accessed in two different contexts. */ diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index bf2239d8234d..9c862b59e8c3 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -603,7 +603,7 @@ static const struct file_operations fops_patterngen = { /** * hdd_debugfs_init() - Initialize debugfs interface - * @pAdapter: primary wlan adapter + * @adapter: interface adapter pointer * * Register support for the debugfs files supported by the driver. * @@ -613,26 +613,26 @@ static const struct file_operations fops_patterngen = { * Return: QDF_STATUS_SUCCESS if all files registered, * QDF_STATUS_E_FAILURE on failure */ -QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) +QDF_STATUS hdd_debugfs_init(hdd_adapter_t *adapter) { - hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - pHddCtx->debugfs_phy = debugfs_create_dir("wlan_wcnss", 0); + struct net_device *dev = adapter->dev; + adapter->debugfs_phy = debugfs_create_dir(dev->name, 0); - if (NULL == pHddCtx->debugfs_phy) + if (NULL == adapter->debugfs_phy) return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_enable", S_IRUSR | S_IWUSR, - pHddCtx->debugfs_phy, pAdapter, + adapter->debugfs_phy, adapter, &fops_wowenable)) return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("wow_pattern", S_IRUSR | S_IWUSR, - pHddCtx->debugfs_phy, pAdapter, + adapter->debugfs_phy, adapter, &fops_wowpattern)) return QDF_STATUS_E_FAILURE; if (NULL == debugfs_create_file("pattern_gen", S_IRUSR | S_IWUSR, - pHddCtx->debugfs_phy, pAdapter, + adapter->debugfs_phy, adapter, &fops_patterngen)) return QDF_STATUS_E_FAILURE; @@ -641,14 +641,19 @@ QDF_STATUS hdd_debugfs_init(hdd_adapter_t *pAdapter) /** * hdd_debugfs_exit() - Shutdown debugfs interface - * @pHddCtx: the global HDD context + * @adapter: interface adapter pointer * * Unregister support for the debugfs files supported by the driver. * * Return: None */ -void hdd_debugfs_exit(hdd_context_t *pHddCtx) +void hdd_debugfs_exit(hdd_adapter_t *adapter) { - debugfs_remove_recursive(pHddCtx->debugfs_phy); + struct net_device *dev = adapter->dev; + + if (adapter->debugfs_phy) + debugfs_remove_recursive(adapter->debugfs_phy); + else + hdd_info("Interface %s has no debugfs entry", dev->name); } #endif /* #ifdef WLAN_OPEN_SOURCE */ diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index af0d983eb9bf..e2c3b0ad3320 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2265,6 +2265,7 @@ void hdd_cleanup_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, } hdd_lro_disable(hdd_ctx, adapter); + hdd_debugfs_exit(adapter); /* * The adapter is marked as closed. When hdd_wlan_exit() call returns, * the driver is almost closed and cannot handle either control @@ -2679,6 +2680,8 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, } } #endif + if (QDF_STATUS_SUCCESS != hdd_debugfs_init(adapter)) + hdd_err("Interface %s wow debug_fs init failed", iface_name); return adapter; @@ -3756,8 +3759,6 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) */ hdd_set_idle_ps_config(hdd_ctx, false); - hdd_debugfs_exit(hdd_ctx); - /* Unregister the Net Device Notifier */ unregister_netdevice_notifier(&hdd_netdev_notifier); @@ -5634,11 +5635,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) sme_register_oem_data_rsp_callback(hdd_ctx->hHal, hdd_send_oem_data_rsp_msg); - status = hdd_debugfs_init(adapter); - - if (QDF_IS_STATUS_SUCCESS(status)) - hdd_err("hdd_debugfs_init failed: %d!", status); - /* FW capabilities received, Set the Dot11 mode */ sme_setdef_dot11mode(hdd_ctx->hHal); @@ -5818,8 +5814,6 @@ err_nl_srv: /* Proceed and complete the clean up */ } - hdd_debugfs_exit(hdd_ctx); - err_close_adapter: hdd_release_rtnl_lock(); -- cgit v1.2.3 From b08f39cc4c8c697dcd66b97106b15b5ecd6536d7 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 4 Feb 2016 17:50:54 -0800 Subject: qcacld-3.0: Add error log in wow periodic pattern handler WoW periodic transmit pattern handler has no error log if given input format is wrong. Add error log message to indicate input is wrong and suggest the correct input format. Change-Id: Ie3a37c7e1a9b9fd8a974c68a5cc7456b1b622168 CRs-Fixed: 973006 --- core/hdd/src/wlan_hdd_debugfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 9c862b59e8c3..89aac4e51cc9 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -502,6 +502,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, return count; failure: + hdd_err("Invalid input. Input format is: ptrn_idx duration pattern"); qdf_mem_free(cmd); return -EINVAL; } -- cgit v1.2.3 From 4fc968d17f96fd00557ff66237a2856bf26aa434 Mon Sep 17 00:00:00 2001 From: Deepak Dhamdhere Date: Sun, 10 Jan 2016 19:34:57 -0800 Subject: qcacld-3.0: Remove WLAN_FEATURE_VOWIFI_11R option from WMA Conditional compilation option WLAN_FEATURE_VOWIFI_11R is always defined in cld3.0 and underlying code is permanent in the driver. Hence, remove #ifdef WLAN_FEATURE_VOWIFI_11R check from WMA source code. Remove -DWLAN_FEATURE_VOWIFI_11R compilation flag from Kbuild. CRs-Fixed: 960105 Change-Id: Idbcea2faf9aa31ef62920ef322d6de61378198a6 --- Kbuild | 1 - core/wma/inc/wma.h | 2 -- core/wma/inc/wma_if.h | 6 ------ core/wma/inc/wma_types.h | 2 -- core/wma/src/wma_dev_if.c | 10 ---------- core/wma/src/wma_scan_roam.c | 2 -- 6 files changed, 23 deletions(-) diff --git a/Kbuild b/Kbuild index 37c4af240f2c..39a3b153b70b 100755 --- a/Kbuild +++ b/Kbuild @@ -895,7 +895,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -Werror\ -D__linux__ \ -DHAL_SELF_STA_PER_BSS=1 \ - -DWLAN_FEATURE_VOWIFI_11R \ -DFEATURE_WLAN_WAPI \ -DFEATURE_OEM_DATA_SUPPORT\ -DSOFTAP_CHANNEL_RANGE \ diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 797b1ae41173..4ad606e6b564 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -891,9 +891,7 @@ struct wma_txrx_node { int8_t tx_power; int8_t max_tx_power; uint32_t nwType; -#if defined WLAN_FEATURE_VOWIFI_11R void *staKeyParams; -#endif bool ps_enabled; uint32_t dtim_policy; uint32_t peer_count; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index ba21b8b28cd4..9748d67a3644 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -489,10 +489,8 @@ typedef struct { int8_t txMgmtPower; int8_t maxTxPower; -#if defined WLAN_FEATURE_VOWIFI_11R uint8_t extSetStaKeyParamValid; tSetStaKeyParams extSetStaKeyParam; -#endif /* WLAN_FEATURE_VOWIFI_11R */ uint8_t ucMaxProbeRespRetryLimit; uint8_t bHiddenSSIDEn; @@ -961,10 +959,8 @@ typedef struct sLinkStateParams { tSirLinkState state; tpSetLinkStateCallback callback; void *callbackArg; -#ifdef WLAN_FEATURE_VOWIFI_11R int ft; void *session; -#endif /* WLAN_FEATURE_VOWIFI_11R */ bool status; } tLinkStateParams, *tpLinkStateParams; @@ -1016,7 +1012,6 @@ typedef struct { #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ } tDelTsParams, *tpDelTsParams; -#ifdef WLAN_FEATURE_VOWIFI_11R #define HAL_QOS_NUM_TSPEC_MAX 2 #define HAL_QOS_NUM_AC_MAX 4 @@ -1037,7 +1032,6 @@ typedef struct { uint8_t sessionId; } tAggrAddTsParams, *tpAggrAddTsParams; -#endif /* WLAN_FEATURE_VOWIFI_11R */ typedef tSirRetStatus (*tHalMsgCallback)(tpAniSirGlobal pMac, uint32_t mesgId, void *mesgParam); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 2b4e72ff2bba..8b0ce3ccb0ad 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -265,10 +265,8 @@ #define WMA_RUNTIME_PM_SUSPEND_IND SIR_HAL_RUNTIME_PM_SUSPEND_IND #define WMA_RUNTIME_PM_RESUME_IND SIR_HAL_RUNTIME_PM_RESUME_IND -#ifdef WLAN_FEATURE_VOWIFI_11R #define WMA_AGGR_QOS_REQ SIR_HAL_AGGR_QOS_REQ #define WMA_AGGR_QOS_RSP SIR_HAL_AGGR_QOS_RSP -#endif /* WLAN_FEATURE_VOWIFI_11R */ /* FTM CMD MSG */ #define WMA_FTM_CMD_REQ SIR_PTT_MSG_TYPES_BEGIN diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index ab2965b91f94..48b94e732b75 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -432,10 +432,8 @@ void wma_vdev_detach_callback(void *ctx) qdf_mem_free(iface->addBssStaContext); -#if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) qdf_mem_free(iface->staKeyParams); -#endif /* WLAN_FEATURE_VOWIFI_11R */ qdf_mem_zero(iface, sizeof(*iface)); param->status = QDF_STATUS_SUCCESS; sme_msg.type = eWNI_SME_DEL_STA_SELF_RSP; @@ -574,10 +572,8 @@ static QDF_STATUS wma_handle_vdev_detach(tp_wma_handle wma_handle, out: if (iface->addBssStaContext) qdf_mem_free(iface->addBssStaContext); -#if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) qdf_mem_free(iface->staKeyParams); -#endif /* WLAN_FEATURE_VOWIFI_11R */ qdf_mem_zero(iface, sizeof(*iface)); del_sta_self_req_param->status = status; if (generate_rsp) { @@ -2414,10 +2410,8 @@ void wma_vdev_resp_timer(void *data) } if (iface->addBssStaContext) qdf_mem_free(iface->addBssStaContext); -#if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) qdf_mem_free(iface->staKeyParams); -#endif /* WLAN_FEATURE_VOWIFI_11R */ qdf_mem_zero(iface, sizeof(*iface)); } else if (tgt_req->msg_type == WMA_ADD_BSS_REQ) { tpAddBssParams params = (tpAddBssParams) tgt_req->user_data; @@ -2966,7 +2960,6 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) qdf_mem_copy(iface->addBssStaContext, &add_bss->staContext, sizeof(tAddStaParams)); -#if defined WLAN_FEATURE_VOWIFI_11R if (iface->staKeyParams) { qdf_mem_free(iface->staKeyParams); iface->staKeyParams = NULL; @@ -2983,7 +2976,6 @@ static void wma_add_bss_sta_mode(tp_wma_handle wma, tpAddBssParams add_bss) &add_bss->extSetStaKeyParam, sizeof(tSetStaKeyParams)); } -#endif /* WLAN_FEATURE_VOWIFI_11R */ /* Save parameters later needed by WMA_ADD_STA_REQ */ iface->rmfEnabled = add_bss->rmfEnabled; iface->beaconInterval = add_bss->beaconInterval; @@ -3743,7 +3735,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) } } #endif /* WLAN_FEATURE_11W */ -#if defined WLAN_FEATURE_VOWIFI_11R /* * Set the PTK in 11r mode because we already have it. */ @@ -3751,7 +3742,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) wma_set_stakey(wma, (tpSetStaKeyParams) iface->staKeyParams); } -#endif } maxTxPower = params->maxTxPower; wma_vdev_set_bss_params(wma, params->smesessionId, diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 85aac40fd780..472ae9b4025e 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -978,12 +978,10 @@ A_UINT32 e_csr_auth_type_to_rsn_authmode(eCsrAuthType authtype, return WMI_AUTH_RSNA; case eCSR_AUTH_TYPE_RSN_PSK: return WMI_AUTH_RSNA_PSK; -#if defined WLAN_FEATURE_VOWIFI_11R case eCSR_AUTH_TYPE_FT_RSN: return WMI_AUTH_FT_RSNA; case eCSR_AUTH_TYPE_FT_RSN_PSK: return WMI_AUTH_FT_RSNA_PSK; -#endif /* WLAN_FEATURE_VOWIFI_11R */ #ifdef FEATURE_WLAN_WAPI case eCSR_AUTH_TYPE_WAPI_WAI_CERTIFICATE: return WMI_AUTH_WAPI; -- cgit v1.2.3 From 6eae0cd53970332ff3f6c7852d9010b37ca38bee Mon Sep 17 00:00:00 2001 From: Prakash Manjunathappa Date: Mon, 8 Feb 2016 10:27:21 -0800 Subject: qcacld-3.0: Enable CE classification by default Enables the CE classification by default. Change-Id: Iabe2b58e41e30a449bebaa16daf8f869b2634b82 CRs-Fixed: 973502 --- core/hdd/inc/wlan_hdd_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 14698665ae19..f777dac935f0 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2736,7 +2736,7 @@ enum dot11p_mode { #define CFG_CE_CLASSIFY_ENABLE_NAME "gCEClassifyEnable" #define CFG_CE_CLASSIFY_ENABLE_MIN (0) #define CFG_CE_CLASSIFY_ENABLE_MAX (1) -#define CFG_CE_CLASSIFY_ENABLE_DEFAULT (0) +#define CFG_CE_CLASSIFY_ENABLE_DEFAULT (1) #define CFG_DUAL_MAC_FEATURE_DISABLE "gDualMacFeatureDisable" #define CFG_DUAL_MAC_FEATURE_DISABLE_MIN (0) -- cgit v1.2.3 From 608291e13bfcaf96d7a36b797112793a3014fd28 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Mon, 14 Dec 2015 18:17:27 -0800 Subject: qcacld-3.0: Pass correct data length in oem data response msg Add data length information in oem data response messages. Currently maximum response size is passed to upper layers. Change-Id: Id74d44e03755af9a5402e5409ee5f6b5e7abbb7c CRs-Fixed: 942260 --- core/mac/inc/sir_api.h | 3 +- core/mac/src/pe/include/lim_global.h | 3 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 32 +++++++--- core/sme/inc/oem_data_api.h | 4 +- core/sme/src/oem_data/oem_data_api.c | 5 +- core/wma/inc/wma_if.h | 7 ++- core/wma/src/wma_features.c | 79 ++++++++++++++++++------- 7 files changed, 96 insertions(+), 37 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 991113380b08..c44d0497b464 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -916,7 +916,8 @@ typedef struct sSirOemDataRsp { uint16_t messageType; uint16_t length; bool target_rsp; - uint8_t oemDataRsp[OEM_DATA_RSP_SIZE]; + uint32_t rsp_len; + uint8_t *oem_data_rsp; } tSirOemDataRsp, *tpSirOemDataRsp; #endif /* FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index b61b4d8a7e4f..4a98ad38fe19 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -305,7 +305,8 @@ typedef struct sLimMlmOemDataReq { typedef struct sLimMlmOemDataRsp { bool target_rsp; - uint8_t oemDataRsp[OEM_DATA_RSP_SIZE]; + uint32_t rsp_len; + uint8_t *oem_data_rsp; } tLimMlmOemDataRsp, *tpLimMlmOemDataRsp; #endif diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 580d40bc5768..dd1e592a9e13 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -809,16 +809,30 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, /* get the pointer to the mlm message */ pMlmOemDataRsp = (tLimMlmOemDataRsp *) (pMsgBuf); - msgLength = sizeof(tSirOemDataRsp); - + msgLength = sizeof(*pSirSmeOemDataRsp); /* now allocate memory for the char buffer */ - pSirSmeOemDataRsp = qdf_mem_malloc(msgLength); + pSirSmeOemDataRsp = qdf_mem_malloc(sizeof(*pSirSmeOemDataRsp)); if (NULL == pSirSmeOemDataRsp) { lim_log(pMac, LOGP, - FL - ("call to AllocateMemory failed for pSirSmeOemDataRsp")); + FL("malloc failed for pSirSmeOemDataRsp")); + qdf_mem_free(pMlmOemDataRsp->oem_data_rsp); + qdf_mem_free(pMlmOemDataRsp); return; } + + if (pMlmOemDataRsp->rsp_len) { + pSirSmeOemDataRsp->oem_data_rsp = + qdf_mem_malloc(pMlmOemDataRsp->rsp_len); + if (!pSirSmeOemDataRsp->oem_data_rsp) { + lim_log(pMac, LOGE, + FL("malloc failed for oem_data_rsp")); + qdf_mem_free(pSirSmeOemDataRsp); + qdf_mem_free(pMlmOemDataRsp->oem_data_rsp); + qdf_mem_free(pMlmOemDataRsp); + return; + } + } + #if defined (ANI_LITTLE_BYTE_ENDIAN) sir_store_u16_n((uint8_t *) &pSirSmeOemDataRsp->length, msgLength); sir_store_u16_n((uint8_t *) &pSirSmeOemDataRsp->messageType, @@ -828,10 +842,14 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf, pSirSmeOemDataRsp->messageType = eWNI_SME_OEM_DATA_RSP; #endif pSirSmeOemDataRsp->target_rsp = pMlmOemDataRsp->target_rsp; - qdf_mem_copy(pSirSmeOemDataRsp->oemDataRsp, pMlmOemDataRsp->oemDataRsp, - OEM_DATA_RSP_SIZE); + pSirSmeOemDataRsp->rsp_len = pMlmOemDataRsp->rsp_len; + if (pSirSmeOemDataRsp->rsp_len) + qdf_mem_copy(pSirSmeOemDataRsp->oem_data_rsp, + pMlmOemDataRsp->oem_data_rsp, + pSirSmeOemDataRsp->rsp_len); /* Now free the memory from MLM Rsp Message */ + qdf_mem_free(pMlmOemDataRsp->oem_data_rsp); qdf_mem_free(pMlmOemDataRsp); mmhMsg.type = eWNI_SME_OEM_DATA_RSP; diff --git a/core/sme/inc/oem_data_api.h b/core/sme/inc/oem_data_api.h index 110f0177a63b..fa1d1f3fe2d7 100644 --- a/core/sme/inc/oem_data_api.h +++ b/core/sme/inc/oem_data_api.h @@ -49,6 +49,7 @@ /* message subtype for internal purpose */ #define OEM_MESSAGE_SUBTYPE_INTERNAL 0xdeadbeef +#define OEM_MESSAGE_SUBTYPE_LEN 4 /* Structure for defining req sent to the PE */ typedef struct tagOemDataReq { @@ -58,7 +59,8 @@ typedef struct tagOemDataReq { } tOemDataReq, tOemDataReqConfig; typedef struct tagOemDataRsp { - uint8_t oemDataRsp[OEM_DATA_RSP_SIZE]; + uint8_t rsp_len; + uint8_t *oem_data_rsp; } tOemDataRsp; typedef enum { diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index 6478e19ae479..a607caab6d9f 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -351,12 +351,13 @@ QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg) FL("received target oem data resp")); if (pMac->oemData.oem_data_rsp_callback != NULL) pMac->oemData.oem_data_rsp_callback( - sizeof(tOemDataRsp), - &pOemDataRsp->oemDataRsp[0]); + pOemDataRsp->rsp_len, + pOemDataRsp->oem_data_rsp); } else { sms_log(pMac, LOG1, FL("received internal oem data resp")); } + qdf_mem_free(pOemDataRsp->oem_data_rsp); } while (0); return status; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 9748d67a3644..8b01d00e4830 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -680,11 +680,14 @@ typedef struct { /** * struct tStartOemDataRsp - start OEM Data response - * @oemDataRsp: OEM Data response + * @target_rsp: Indicates if the rsp is from Target or WMA generated. + * @rsp_len: oem data response length + * @oem_data_rsp: pointer to OEM Data response */ typedef struct { bool target_rsp; - uint8_t oemDataRsp[OEM_DATA_RSP_SIZE]; + uint32_t rsp_len; + uint8_t *oem_data_rsp; } tStartOemDataRsp, *tpStartOemDataRsp; #endif /* FEATURE_OEM_DATA_SUPPORT */ diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 07c85455c37b..53f06fe7474e 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1253,11 +1253,12 @@ int wma_oem_capability_event_callback(void *handle, return -EINVAL; } - /* wma puts 4 bytes prefix for msg subtype, so length + /* + * wma puts 4 bytes prefix for msg subtype, so length * of data received from target should be 4 bytes less * then max allowed */ - if (datalen > (OEM_DATA_RSP_SIZE - 4)) { + if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) { WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)", __func__, datalen, (OEM_DATA_RSP_SIZE - 4)); return -EINVAL; @@ -1268,15 +1269,23 @@ int wma_oem_capability_event_callback(void *handle, WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } + pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN; + pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen); + if (!pStartOemDataRsp->oem_data_rsp) { + WMA_LOGE(FL("malloc failed for oem_data_rsp")); + qdf_mem_free(pStartOemDataRsp); + return -ENOMEM; + } - qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; - msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); + msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp; *msg_subtype = WMI_OEM_CAPABILITY_RSP; - qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + /* copy data after msg sub type */ + qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN, + data, datalen); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", - __func__, datalen); + __func__, pStartOemDataRsp->rsp_len); wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)pStartOemDataRsp, 0); return 0; @@ -1315,11 +1324,12 @@ int wma_oem_measurement_report_event_callback(void *handle, return -EINVAL; } - /* wma puts 4 bytes prefix for msg subtype, so length + /* + * wma puts 4 bytes prefix for msg subtype, so length * of data received from target should be 4 bytes less * then max allowed */ - if (datalen > (OEM_DATA_RSP_SIZE - 4)) { + if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) { WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)", __func__, datalen, (OEM_DATA_RSP_SIZE - 4)); return -EINVAL; @@ -1330,12 +1340,20 @@ int wma_oem_measurement_report_event_callback(void *handle, WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } + pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN; + pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen); + if (!pStartOemDataRsp->oem_data_rsp) { + WMA_LOGE(FL("malloc failed for oem_data_rsp")); + qdf_mem_free(pStartOemDataRsp); + return -ENOMEM; + } - qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; - msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); + msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp; *msg_subtype = WMI_OEM_MEASUREMENT_RSP; - qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + /* copy data after msg sub type */ + qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN, + data, pStartOemDataRsp->rsp_len); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", __func__, datalen); @@ -1376,11 +1394,12 @@ int wma_oem_error_report_event_callback(void *handle, return -EINVAL; } - /* wma puts 4 bytes prefix for msg subtype, so length + /* + * wma puts 4 bytes prefix for msg subtype, so length * of data received from target should be 4 bytes less * then max allowed */ - if (datalen > (OEM_DATA_RSP_SIZE - 4)) { + if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) { WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)", __func__, datalen, (OEM_DATA_RSP_SIZE - 4)); return -EINVAL; @@ -1391,12 +1410,20 @@ int wma_oem_error_report_event_callback(void *handle, WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__); return -ENOMEM; } + pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN; + pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen); + if (!pStartOemDataRsp->oem_data_rsp) { + WMA_LOGE(FL("malloc failed for oem_data_rsp")); + qdf_mem_free(pStartOemDataRsp); + return -ENOMEM; + } - qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp)); pStartOemDataRsp->target_rsp = true; - msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]); + msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp; *msg_subtype = WMI_OEM_ERROR_REPORT_RSP; - qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen); + /* copy data after msg sub type */ + qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN, + data, pStartOemDataRsp->rsp_len); WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)", __func__, datalen); @@ -1420,7 +1447,7 @@ int wma_oem_data_response_handler(void *handle, WMI_OEM_RESPONSE_EVENTID_param_tlvs *param_buf; uint8_t *data; uint32_t datalen; - tStartOemDataRsp *oem_data_rsp; + tStartOemDataRsp *oem_rsp; param_buf = (WMI_OEM_RESPONSE_EVENTID_param_tlvs *) datap; if (!param_buf) { @@ -1442,19 +1469,25 @@ int wma_oem_data_response_handler(void *handle, return -EINVAL; } - oem_data_rsp = qdf_mem_malloc(sizeof(*oem_data_rsp)); - if (!oem_data_rsp) { + oem_rsp = qdf_mem_malloc(sizeof(*oem_rsp)); + if (!oem_rsp) { WMA_LOGE(FL("Failed to alloc oem_data_rsp")); return -ENOMEM; } + oem_rsp->rsp_len = datalen; + oem_rsp->oem_data_rsp = qdf_mem_malloc(datalen); + if (!oem_rsp->rsp_len) { + WMA_LOGE(FL("malloc failed for oem_data_rsp")); + qdf_mem_free(oem_rsp); + return -ENOMEM; + } - qdf_mem_zero(oem_data_rsp, sizeof(tStartOemDataRsp)); - oem_data_rsp->target_rsp = true; - qdf_mem_copy(&oem_data_rsp->oemDataRsp[0], data, datalen); + oem_rsp->target_rsp = true; + qdf_mem_copy(oem_rsp->oem_data_rsp, data, datalen); WMA_LOGI(FL("Sending WMA_START_OEM_DATA_RSP, data len %d"), datalen); - wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_data_rsp, 0); + wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_rsp, 0); return 0; } -- cgit v1.2.3 From 70133f0f37cd32660aa4c9ca4db902dbee0e076e Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Wed, 3 Feb 2016 14:35:48 -0800 Subject: qcacld-3.0: Fix double free of delete sta params Fix double free of delete sta params by adding appropriate check in wma_delete_sta. If the synchronization feature is enabled, memory will be freed in the wma_peer_delete_handler else memory will be free in wma_delete_sta. Change-Id: I40e664f10766faa8a20e9089f1c6b95d490b8658 CRs-Fixed: 971280 --- core/wma/src/wma_dev_if.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 48b94e732b75..1aa278e946c5 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -4031,12 +4031,25 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) wma_delete_sta_req_sta_mode(wma, del_sta); if (wma_is_roam_synch_in_progress(wma, smesession_id)) return; + if (!rsp_requested) { + WMA_LOGD(FL("vdev_id %d status %d"), + del_sta->smesessionId, del_sta->status); + qdf_mem_free(del_sta); + } break; case BSS_OPERATIONAL_MODE_IBSS: /* IBSS shares AP code */ case BSS_OPERATIONAL_MODE_AP: htc_vote_link_up(wma->htc_handle); wma_delete_sta_req_ap_mode(wma, del_sta); + /* free the memory here only if sync feature is not enabled */ + if (!rsp_requested && + !WMI_SERVICE_IS_ENABLED(wma->wmi_service_bitmap, + WMI_SERVICE_SYNC_DELETE_CMDS)) { + WMA_LOGD(FL("vdev_id %d status %d"), + del_sta->smesessionId, del_sta->status); + qdf_mem_free(del_sta); + } break; } @@ -4047,11 +4060,6 @@ void wma_delete_sta(tp_wma_handle wma, tpDeleteStaParams del_sta) if (oper_mode == BSS_OPERATIONAL_MODE_IBSS) wma_adjust_ibss_heart_beat_timer(wma, smesession_id, -1); #endif - if (!rsp_requested) { - WMA_LOGD("%s: vdev_id %d status %d", __func__, - del_sta->smesessionId, del_sta->status); - qdf_mem_free(del_sta); - } } /** -- cgit v1.2.3 From 164e6b0c7b0e11f5afc8186086c1d3d49e8bda08 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Thu, 17 Dec 2015 15:19:09 -0800 Subject: qcacld-3.0: Merge extended capability IE in beacon/probe resp template qcacld-2.0 to qcacld-3.0 propagation. Merge extended capability coming from hostapd and remove it from extra IE before sending beacon/probe response template to firmware. Change-Id: Iae50bbf1f70fd280f3366a89e58ad8f2c729720c CRs-Fixed: 943078 --- core/mac/src/pe/sch/sch_api.c | 55 ++++++++++++++---------- core/mac/src/pe/sch/sch_beacon_gen.c | 81 ++++++++++++++++++++++++++---------- 2 files changed, 94 insertions(+), 42 deletions(-) diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c index 48d6560be37b..a61d0fa7e888 100644 --- a/core/mac/src/pe/sch/sch_api.c +++ b/core/mac/src/pe/sch/sch_api.c @@ -55,6 +55,7 @@ #include "sch_sys_params.h" #include "lim_trace.h" #include "lim_types.h" +#include "lim_utils.h" #include "wma_types.h" @@ -381,16 +382,18 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, uint32_t nPayload, nBytes, nStatus; tpSirMacMgmtHdr pMacHdr; uint32_t addnIEPresent = false; - uint32_t addnIELen = 0; uint8_t *addIE = NULL; uint8_t *addIeWoP2pIe = NULL; uint32_t addnIELenWoP2pIe = 0; uint32_t retStatus; - - nStatus = - dot11f_get_packed_probe_response_size(pMac, - &psessionEntry->probeRespFrame, - &nPayload); + tDot11fIEExtCap extracted_extcap; + bool extcap_present = true; + tDot11fProbeResponse *prb_rsp_frm; + tSirRetStatus status; + uint16_t addn_ielen = 0; + + nStatus = dot11f_get_packed_probe_response_size(pMac, + &psessionEntry->probeRespFrame, &nPayload); if (DOT11F_FAILED(nStatus)) { sch_log(pMac, LOGE, FL("Failed to calculate the packed size f" "or a Probe Response (0x%08x)."), @@ -435,30 +438,34 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, /* Probe rsp IE available */ /*need to check the data length */ - addIE = - qdf_mem_malloc(addnIELenWoP2pIe); + addIE = qdf_mem_malloc(addnIELenWoP2pIe); if (NULL == addIE) { sch_log(pMac, LOGE, - FL - ("Unable to get WNI_CFG_PROBE_RSP_ADDNIE_DATA1 length")); + FL("Unable to get WNI_CFG_PROBE_RSP_ADDNIE_DATA1 length")); qdf_mem_free(addIeWoP2pIe); return eSIR_MEM_ALLOC_FAILED; } - addnIELen = addnIELenWoP2pIe; + addn_ielen = addnIELenWoP2pIe; - if (addnIELen <= WNI_CFG_PROBE_RSP_ADDNIE_DATA1_LEN && addnIELen - && (nBytes + addnIELen) <= SIR_MAX_PACKET_SIZE) { + if (addn_ielen <= WNI_CFG_PROBE_RSP_ADDNIE_DATA1_LEN && + addn_ielen && (nBytes + addn_ielen) <= SIR_MAX_PACKET_SIZE) + qdf_mem_copy(addIE, addIeWoP2pIe, addnIELenWoP2pIe); - qdf_mem_copy(addIE, - addIeWoP2pIe, - addnIELenWoP2pIe); - } qdf_mem_free(addIeWoP2pIe); + + qdf_mem_zero((uint8_t *)&extracted_extcap, + sizeof(tDot11fIEExtCap)); + status = lim_strip_extcap_update_struct(pMac, addIE, + &addn_ielen, &extracted_extcap); + if (eSIR_SUCCESS != status) { + extcap_present = false; + sch_log(pMac, LOG1, FL("extcap not extracted")); + } } if (addnIEPresent) { - if ((nBytes + addnIELen) <= SIR_MAX_PACKET_SIZE) - nBytes += addnIELen; + if ((nBytes + addn_ielen) <= SIR_MAX_PACKET_SIZE) + nBytes += addn_ielen; else addnIEPresent = false; /* Dont include the IE. */ } @@ -475,6 +482,12 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, sir_copy_mac_addr(pMacHdr->bssId, psessionEntry->bssId); + /* merge extcap IE */ + prb_rsp_frm = &psessionEntry->probeRespFrame; + if (extcap_present) + lim_merge_extcap_struct(&prb_rsp_frm->ExtCap, + &extracted_extcap); + /* That done, pack the Probe Response: */ nStatus = dot11f_pack_probe_response(pMac, &psessionEntry->probeRespFrame, @@ -494,8 +507,8 @@ uint32_t lim_send_probe_rsp_template_to_hal(tpAniSirGlobal pMac, } if (addnIEPresent) { - qdf_mem_copy(&pFrame2Hal[nBytes - addnIELen], - &addIE[0], addnIELen); + qdf_mem_copy(&pFrame2Hal[nBytes - addn_ielen], + &addIE[0], addn_ielen); } /* free the allocated Memory */ diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index bd57105238dc..7f3a7b394c63 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -94,41 +94,41 @@ tSirRetStatus sch_get_p2p_ie_offset(uint8_t *pExtraIe, uint32_t extraIeLen, * @frm: frame where additional IE is to be added * @max_bcn_size: max beacon size * @num_bytes: final size + * @addn_ie: pointer to additional IE + * @addn_ielen: lenght of additional IE * * Return: status of operation */ tSirRetStatus sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session, - uint8_t *frm, uint32_t max_bcn_size, uint32_t *num_bytes) + uint8_t *frm, uint32_t max_bcn_size, uint32_t *num_bytes, + uint8_t *addn_ie, uint16_t addn_ielen) { tSirRetStatus status = eSIR_FAILURE; - uint32_t present, len; uint8_t add_ie[WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN]; uint8_t *p2p_ie = NULL; uint8_t noa_len = 0; uint8_t noa_strm[SIR_MAX_NOA_ATTR_LEN + SIR_P2P_IE_HEADER_LEN]; + bool valid_ie; - present = (session->addIeParams.probeRespBCNDataLen != 0); - if (!present) - return status; + valid_ie = (addn_ielen <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN && + addn_ielen && ((addn_ielen + *num_bytes) <= max_bcn_size)); - len = session->addIeParams.probeRespBCNDataLen; - if (!(len <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN && len && - ((len + *num_bytes) <= max_bcn_size))) + if (!valid_ie) return status; - qdf_mem_copy(&add_ie[0], session->addIeParams.probeRespBCNData_buff, - len); + qdf_mem_copy(&add_ie[0], addn_ie, addn_ielen); - p2p_ie = limGetP2pIEPtr(mac_ctx, &add_ie[0], len); + p2p_ie = limGetP2pIEPtr(mac_ctx, &add_ie[0], addn_ielen); if ((p2p_ie != NULL) && !mac_ctx->beacon_offload) { /* get NoA attribute stream P2P IE */ noa_len = lim_get_noa_attr_stream(mac_ctx, noa_strm, session); if (noa_len) { - if ((noa_len + len) <= + if ((noa_len + addn_ielen) <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN) { - qdf_mem_copy(&add_ie[len], noa_strm, noa_len); - len += noa_len; + qdf_mem_copy(&add_ie[addn_ielen], noa_strm, + noa_len); + addn_ielen += noa_len; p2p_ie[1] += noa_len; } else { sch_log(mac_ctx, LOGE, @@ -136,13 +136,13 @@ sch_append_addn_ie(tpAniSirGlobal mac_ctx, tpPESession session, } } } - if (len <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN) { - qdf_mem_copy(frm, &add_ie[0], len); - *num_bytes = *num_bytes + len; + if (addn_ielen <= WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA_LEN) { + qdf_mem_copy(frm, &add_ie[0], addn_ielen); + *num_bytes = *num_bytes + addn_ielen; } else { sch_log(mac_ctx, LOGW, FL("Not able to insert because of len constraint %d"), - len); + addn_ielen); } return status; } @@ -176,6 +176,10 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) uint16_t p2p_ie_offset = 0; tSirRetStatus status = eSIR_SUCCESS; bool is_vht_enabled = false; + uint16_t addn_ielen = 0; + uint8_t *addn_ie = NULL; + tDot11fIEExtCap extracted_extcap; + bool extcap_present = true, addnie_present = false; bcn_1 = qdf_mem_malloc(sizeof(tDot11fBeacon1)); if (NULL == bcn_1) { @@ -474,6 +478,36 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) } + addnie_present = (session->addIeParams.probeRespBCNDataLen != 0); + if (addnie_present) { + addn_ielen = session->addIeParams.probeRespBCNDataLen; + addn_ie = qdf_mem_malloc(addn_ielen); + if (!addn_ie) { + sch_log(mac_ctx, LOGE, FL("addn_ie malloc failed")); + qdf_mem_free(bcn_1); + qdf_mem_free(bcn_2); + qdf_mem_free(wsc_prb_res); + return eSIR_MEM_ALLOC_FAILED; + } + qdf_mem_copy(addn_ie, + session->addIeParams.probeRespBCNData_buff, + addn_ielen); + + qdf_mem_zero((uint8_t *)&extracted_extcap, + sizeof(tDot11fIEExtCap)); + status = lim_strip_extcap_update_struct(mac_ctx, addn_ie, + &addn_ielen, &extracted_extcap); + if (eSIR_SUCCESS != status) { + extcap_present = false; + sch_log(mac_ctx, LOG1, FL("extcap not extracted")); + } + /* merge extcap IE */ + if (extcap_present) + lim_merge_extcap_struct(&bcn_2->ExtCap, + &extracted_extcap); + + } + n_status = dot11f_pack_beacon2(mac_ctx, bcn_2, session->pSchBeaconFrameEnd, SCH_MAX_BEACON_SIZE, &n_bytes); @@ -484,6 +518,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) qdf_mem_free(bcn_1); qdf_mem_free(bcn_2); qdf_mem_free(wsc_prb_res); + qdf_mem_free(addn_ie); return eSIR_FAILURE; } else if (DOT11F_WARNED(n_status)) { sch_log(mac_ctx, LOGE, @@ -493,10 +528,13 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) extra_ie = session->pSchBeaconFrameEnd + n_bytes; extra_ie_offset = n_bytes; + /* TODO: Append additional IE here. */ - sch_append_addn_ie(mac_ctx, session, - session->pSchBeaconFrameEnd + n_bytes, - SCH_MAX_BEACON_SIZE, &n_bytes); + if (addn_ielen > 0) + sch_append_addn_ie(mac_ctx, session, + session->pSchBeaconFrameEnd + n_bytes, + SCH_MAX_BEACON_SIZE, &n_bytes, addn_ie, addn_ielen); + session->schBeaconOffsetEnd = (uint16_t) n_bytes; extra_ie_len = n_bytes - extra_ie_offset; /* Get the p2p Ie Offset */ @@ -515,6 +553,7 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) qdf_mem_free(bcn_1); qdf_mem_free(bcn_2); qdf_mem_free(wsc_prb_res); + qdf_mem_free(addn_ie); return eSIR_SUCCESS; } -- cgit v1.2.3 From c7c72a8cc94c0c0e6c866030546c4c24ed5ea66f Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Mon, 7 Dec 2015 15:30:48 -0800 Subject: qcacld-3.0: Prevent runtime suspend when recovery initiated qcacld-2.0 to qcacld-3.0 propagation When self recovery initiated, CRASH_INJECT command is sent to firmware. If firmware crash doesn't reach the host in time then RuntimePM may kick in and try to suspend the PCIe link. At this time, firmware might already been crashed just that host missed the interrupt. Add the logic to prevent the Runtime suspend when initiating the recovery so that host driver doesn't attempt the suspend which may not go through and cause stability issues. Change-Id: Ie8d5fc6aa08e4864fa5f03119c25037f5aeb5cec CRs-fixed: 924538 --- core/cds/src/cds_api.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 6c0204407a52..cc950b32ae7b 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -1615,6 +1615,7 @@ void cds_trigger_recovery(void) { tp_wma_handle wma_handle = cds_get_context(QDF_MODULE_ID_WMA); QDF_STATUS status = QDF_STATUS_SUCCESS; + qdf_runtime_lock_t recovery_lock; if (!wma_handle) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, @@ -1622,6 +1623,15 @@ void cds_trigger_recovery(void) return; } + recovery_lock = qdf_runtime_lock_init("cds_recovery"); + if (!recovery_lock) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "Could not acquire runtime pm lock!"); + return; + } + + qdf_runtime_pm_prevent_suspend(recovery_lock); + wma_crash_inject(wma_handle, RECOVERY_SIM_SELF_RECOVERY, 0); status = qdf_wait_single_event(&wma_handle->recovery_event, @@ -1634,14 +1644,15 @@ void cds_trigger_recovery(void) if (cds_is_driver_recovering()) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "Recovery is in progress, ignore!"); - return; + } else { + cds_set_recovery_in_progress(true); + cnss_schedule_recovery_work(); } - cds_set_recovery_in_progress(true); - cnss_schedule_recovery_work(); #endif - - return; } + + qdf_runtime_pm_allow_suspend(recovery_lock); + qdf_runtime_lock_deinit(recovery_lock); } /** -- cgit v1.2.3 From 107e6a36c1d1f9ca32ec5cf3b90582173786ff4f Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Wed, 10 Feb 2016 15:58:59 -0800 Subject: Release 5.1.0.3G Rebase of 5.0.0.163 onto 5.1.0.2G Change-Id: If244ee2a2bc26a8b4387c89d7bce965c00497630 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4cfd5d624402..c0b80b8a25be 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 2 +#define QWLAN_VERSION_BUILD 3 -#define QWLAN_VERSIONSTR "5.1.0.2G" +#define QWLAN_VERSIONSTR "5.1.0.3G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 5c19dc5f8e94af067506631cdbe7a6115a3b8213 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 4 Feb 2016 14:58:26 +0530 Subject: qcacld-3.0: Set hw mode during channel switch in STA/P2P-CLI case Set the hw mode, if needed, during channel switch in STA and P2P-CLI scenario. The STA/P2P-CLI on receiving the channel change event may need to do a hw mode change to get the best out of the hw capabilities. e.g.1, In a STA+SAP concurrency, the STA and SAP are doing SCC on channel 6. When the STA interface receives a channel event for channel 36, it is better the driver moves to a DBS scenario. e.g.2, In a STA+SAP concurrency, the STA is on channel 6 and the SAP is on channel 36. When the STA interface receives a channel event for channel 36, it is better the driver moves from a DBS scenario to a SCC scenario. For MCC upgrade, the following steps are taken 1. Opportunistic timer is started 2. vdev restart is initiated on the new channel 3. PM will check if MCC upgrade can be done on timer expiry For DBS downgrade, the following steps are taken 1. PM will initiate HW mode change to DBS right away 2. vdev restart is initiated on the new channel Change-Id: I202842bf28c3117e8cc91954cdfd3b39a0062f4e CRs-Fixed: 972184 --- core/cds/inc/cds_concurrency.h | 1 + core/cds/src/cds_concurrency.c | 36 +++- core/mac/inc/sir_api.h | 37 +++++ core/mac/src/include/sir_params.h | 5 +- core/mac/src/pe/include/lim_session.h | 1 + core/mac/src/pe/lim/lim_process_message_queue.c | 210 +++++++++++++++++++++++- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 10 +- core/sme/inc/sme_internal.h | 1 + core/sme/src/common/sme_api.c | 23 +++ core/wma/inc/wma_if.h | 22 --- core/wma/src/wma_features.c | 6 +- 11 files changed, 317 insertions(+), 35 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 09b88bac167b..8bfa5663bb53 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -656,4 +656,5 @@ QDF_STATUS qdf_wait_for_connection_update(void); QDF_STATUS qdf_reset_connection_update(void); QDF_STATUS qdf_set_connection_update(void); QDF_STATUS qdf_init_connection_update(void); +QDF_STATUS cds_stop_start_opportunistic_timer(void); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index dea6bf2ce9a6..adf5108a2aae 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3614,8 +3614,8 @@ enum cds_conc_next_action cds_need_opportunistic_upgrade(void) #ifdef QCA_WIFI_3_0_EMU /* For M2M emulation only: if we have a connection on 2.4, stay in DBS */ if (hdd_ctx->config->enable_m2m_limitation && - CDS_IS_CHANNEL_24GHZ(conc_connection_list[0].chan)) { - cds_debug("For emulation only: connection on 2.4, stay in DBS"); + CDS_IS_CHANNEL_24GHZ(conc_connection_list[0].chan)) { + cds_debug("emulation only: conn on 2.4, stay in DBS"); goto done; } #endif @@ -7983,3 +7983,35 @@ enum cds_conc_next_action cds_get_pref_hw_mode_for_chan(uint32_t vdev_id, return CDS_NOP; } } + +/** + * cds_stop_start_opportunistic_timer() - Start and stop the opportunistic timer + * + * Stops and starts the opportunistic timer for DBS_OPPORTUNISTIC_TIME seconds + * + * Return: QDF_STATUS + */ +QDF_STATUS cds_stop_start_opportunistic_timer(void) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + p_cds_contextType cds_ctx; + + cds_ctx = cds_get_global_context(); + if (!cds_ctx) { + cds_err("Invalid CDS context"); + return status; + } + + qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer); + + status = qdf_mc_timer_start( + &cds_ctx->dbs_opportunistic_timer, + DBS_OPPORTUNISTIC_TIME * 1000); + + if (!QDF_IS_STATUS_SUCCESS(status)) { + cds_err("failed to start opportunistic timer"); + return status; + } + + return status; +} diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index c44d0497b464..5e8e93efcd59 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -105,6 +105,7 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN]; * @CDS_UPDATE_REASON_OPPORTUNISTIC: Opportunistic HW mode update * @CDS_UPDATE_REASON_NSS_UPDATE: NSS update * @CDS_UPDATE_REASON_CHANNEL_SWITCH: Channel switch + * @CDS_UPDATE_REASON_CHANNEL_SWITCH_STA: Channel switch for STA */ enum cds_conn_update_reason { CDS_UPDATE_REASON_SET_OPER_CHAN, @@ -116,6 +117,7 @@ enum cds_conn_update_reason { CDS_UPDATE_REASON_OPPORTUNISTIC, CDS_UPDATE_REASON_NSS_UPDATE, CDS_UPDATE_REASON_CHANNEL_SWITCH, + CDS_UPDATE_REASON_CHANNEL_SWITCH_STA, }; typedef enum { @@ -5518,4 +5520,39 @@ struct egap_conf_params { uint32_t wait_time; uint32_t flags; }; + +/** + * struct csa_offload_params - CSA offload request parameters + * @channel: channel + * @switch_mode: switch mode + * @sec_chan_offset: second channel offset + * @new_ch_width: new channel width + * @new_ch_freq_seg1: channel center freq 1 + * @new_ch_freq_seg2: channel center freq 2 + * @ies_present_flag: IE present flag + */ +struct csa_offload_params { + uint8_t channel; + uint8_t switch_mode; + uint8_t sec_chan_offset; + uint8_t new_ch_width; + uint8_t new_op_class; + uint8_t new_ch_freq_seg1; + uint8_t new_ch_freq_seg2; + uint32_t ies_present_flag; + tSirMacAddr bssId; +}; + +/** + * struct sir_saved_csa_params - saved csa offload params + * @message_type: Message type + * @length: Message length + * @session_id: Session id + */ +struct sir_saved_csa_params { + uint16_t message_type; + uint16_t length; + uint32_t session_id; +}; + #endif /* __SIR_API_H */ diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index affd556d5cf3..30a0ad1cb1e0 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -642,10 +642,7 @@ typedef struct sSirMbMsgP2p { #define SIR_LIM_SCH_CLEAN_MSG (SIR_LIM_ITC_MSG_TYPES_BEGIN + 0xB) /* Message from ISR upon Radar Detection */ #define SIR_LIM_RADAR_DETECT_IND (SIR_LIM_ITC_MSG_TYPES_BEGIN + 0xC) - -/* /////////////////////////////////// */ -/* message id Available */ -/* ////////////////////////////////// */ +#define SIR_LIM_CSA_POST_HW_MODE_CHANGE (SIR_LIM_ITC_MSG_TYPES_BEGIN + 0xD) /* Message from Hal to send out a DEL-TS indication */ #define SIR_LIM_DEL_TS_IND (SIR_LIM_ITC_MSG_TYPES_BEGIN + 0xE) diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 24069b324629..a95238389f7c 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -471,6 +471,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint8_t country_info_present; uint8_t nss; bool add_bss_failed; + struct csa_offload_params saved_csa_params; } tPESession, *tpPESession; /*------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 2591138c903e..664c5233cde2 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -62,6 +62,7 @@ #include "qdf_types.h" #include "cds_packet.h" #include "qdf_mem.h" +#include "cds_concurrency.h" void lim_log_session_states(tpAniSirGlobal pMac); static void lim_process_normal_hdd_msg(tpAniSirGlobal mac_ctx, @@ -1146,6 +1147,210 @@ void lim_process_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *body) #endif +/** + * lim_handle_hw_mode_change_on_csa() - Do HW mode change on CSA for STA mode + * @mac_ctx: Global MAC context + * @msg: Received message + * + * Checks if hw mode change is required for the new channel. + * If MCC upgrade is required, this function will start the opportunistic + * timer and the caller will invoke the other APIs to perform vdev restart on + * the new channel. + * + * If DBS downgrade is required, this function will initiate the hw mode + * change and vdev restart will happen on the new channel after getting hw + * mode response + * + * Return: QDF_STATUS_SUCCESS if processing of csa params (and hence vdev + * restart) needs to happen or if no hw mode change is required, + * QDF_STATUS_E_FAILURE otherwise. + */ +static QDF_STATUS lim_handle_hw_mode_change_on_csa(tpAniSirGlobal mac_ctx, + tpSirMsgQ msg) +{ + tpPESession session_entry; + struct csa_offload_params *csa_params = + (struct csa_offload_params *) (msg->bodyptr); + tpDphHashNode sta_ds = NULL; + uint8_t session_id; + uint16_t aid = 0; + enum cds_conc_next_action action; + QDF_STATUS status = QDF_STATUS_E_FAILURE; + + lim_log(mac_ctx, LOG1, FL("handle hw mode change for csa")); + + if (!csa_params) { + lim_log(mac_ctx, LOGE, FL("limMsgQ body ptr is NULL")); + /* qdf_mem_free() can handle NULL values */ + goto err; + } + + session_entry = pe_find_session_by_bssid(mac_ctx, + csa_params->bssId, &session_id); + if (!session_entry) { + lim_log(mac_ctx, LOGE, FL("Session does not exist")); + goto err; + } + + sta_ds = dph_lookup_hash_entry(mac_ctx, session_entry->bssId, &aid, + &session_entry->dph.dphHashTable); + + if (!sta_ds) { + lim_log(mac_ctx, LOGE, FL("sta_ds does not exist")); + goto err; + } + + /* Since all the write to the policy manager table happens in the + * MC thread context and this channel change event is also processed + * in the MC thread context, explicit lock/unlock of qdf_conc_list_lock + * is not done here + */ + action = cds_get_pref_hw_mode_for_chan(session_entry->smeSessionId, + csa_params->channel); + + if (action == CDS_NOP) { + lim_log(mac_ctx, LOG1, FL("no need for hw mode change")); + /* Proceed with processing csa params. So, not freeing it */ + return QDF_STATUS_SUCCESS; + } + + lim_log(mac_ctx, LOG1, FL("session:%d action:%d"), + session_entry->smeSessionId, action); + + /* 1. Start opportunistic timer + * 2. Do vdev restart on the new channel (by the caller) + * 3. PM will check if MCC upgrade can be done after timer expiry + */ + if (action == CDS_MCC_UPGRADE) { + status = cds_stop_start_opportunistic_timer(); + if (QDF_IS_STATUS_SUCCESS(status)) + lim_log(mac_ctx, LOG1, + FL("opportunistic timer for MCC upgrade")); + + /* After opportunistic timer is triggered, we can go ahead + * with processing the csa params. So, not freeing the memory + * through 'err' label. + */ + return QDF_STATUS_SUCCESS; + } + + /* CDS_DBS_DOWNGRADE: + * 1. PM will initiate HW mode change to DBS rightaway + * 2. Do vdev restart on the new channel (on getting hw mode resp) + */ + status = cds_next_actions(session_entry->smeSessionId, action, + CDS_UPDATE_REASON_CHANNEL_SWITCH_STA); + if (!QDF_IS_STATUS_SUCCESS(status)) { + lim_log(mac_ctx, LOGE, FL("no set hw mode command was issued")); + /* Proceed with processing csa params. So, not freeing it */ + return QDF_STATUS_SUCCESS; + } else { + /* Save the csa params to be used after DBS downgrade */ + qdf_mem_copy(&session_entry->saved_csa_params, csa_params, + sizeof(session_entry->saved_csa_params)); + + lim_log(mac_ctx, LOG1, + FL("saved csa params for dbs downgrade for %pM"), + session_entry->saved_csa_params.bssId); + + /* Returning error so that csa params are not processed here */ + status = QDF_STATUS_E_FAILURE; + } + +err: + qdf_mem_free(csa_params); + return status; +} + +/** + * lim_handle_hw_mode_change_on_csa_event() - Handle hw mode change on csa + * @mac_ctx: Pointer to the Global Mac Context + * @msg: Received message + * + * Checks if a hw mode change is required for the received csa event. Processes + * csa params and do vdev restart immediately if the there is no need for a hw + * mode change or if MCC upgrade is required + * + * Return: None + */ +static void lim_handle_hw_mode_change_on_csa_event(tpAniSirGlobal mac_ctx, + tpSirMsgQ msg) +{ + QDF_STATUS qdf_status; + + lim_log(mac_ctx, LOG1, FL("lim received csa offload event")); + if (mac_ctx->policy_manager_enabled && + wma_is_hw_dbs_capable() == true) { + /* Check if a hw mode change is required */ + qdf_status = lim_handle_hw_mode_change_on_csa(mac_ctx, + msg); + /* Process csa params and do vdev restart immediately if + * there is no need for a hw mode change or if MCC upgrade is + * required. + */ + if (QDF_IS_STATUS_SUCCESS(qdf_status)) + lim_handle_csa_offload_msg(mac_ctx, msg); + } else { + lim_handle_csa_offload_msg(mac_ctx, msg); + } +} + +/** + * lim_handle_csa_event_post_dbs_downgrade() - Process csa event post dbs + * downgrade + * @mac_ctx: Pointer to the Global Mac Context + * @msg: Received message + * + * Process the csa event to do vdev restart on the new channel after the dbs + * downgrade. If there was a DBS downgrade as part of the event + * WMA_CSA_OFFLOAD_EVENT, SIR_LIM_CSA_POST_HW_MODE_CHANGE will be received after + * receiving the set hw mode response, where this processing will happen. + * + * Return: None + */ +static void lim_handle_csa_event_post_dbs_downgrade(tpAniSirGlobal mac_ctx, + tpSirMsgQ msg) +{ + tSirMsgQ csa_msg; + tpPESession session_entry; + + struct sir_saved_csa_params *buf = + (struct sir_saved_csa_params *)msg->bodyptr; + + /* Null check for 'msg' already done before coming here in the caller */ + + session_entry = pe_find_session_by_sme_session_id(mac_ctx, + buf->session_id); + if (!session_entry) { + lim_log(mac_ctx, LOGE, FL("Invalid session id:%d"), + buf->session_id); + return; + } + + lim_log(mac_ctx, LOG1, + FL("received csa offload event post hw change for %pM"), + session_entry->saved_csa_params.bssId); + + csa_msg.bodyptr = qdf_mem_malloc( + sizeof(struct csa_offload_params)); + if (!csa_msg.bodyptr) { + lim_log(mac_ctx, LOGE, FL("malloc failed for csa msg")); + goto clean_msg_body; + } + + qdf_mem_copy((void *)csa_msg.bodyptr, + (void *)&session_entry->saved_csa_params, + sizeof(struct csa_offload_params)); + /* If there was a DBS downgrade as part of the event + * WMA_CSA_OFFLOAD_EVENT, SIR_LIM_CSA_POST_HW_MODE_CHANGE will + * be received after receiving the set hw mode response. + */ + lim_handle_csa_offload_msg(mac_ctx, &csa_msg); +clean_msg_body: + if (msg->bodyptr) + qdf_mem_free(msg->bodyptr); +} + /** * lim_process_messages() - Process messages from upper layers. * @@ -1605,7 +1810,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_handle_delete_bss_rsp(mac_ctx, msg); break; case WMA_CSA_OFFLOAD_EVENT: - lim_handle_csa_offload_msg(mac_ctx, msg); + lim_handle_hw_mode_change_on_csa_event(mac_ctx, msg); + break; + case SIR_LIM_CSA_POST_HW_MODE_CHANGE: + lim_handle_csa_event_post_dbs_downgrade(mac_ctx, msg); break; case WMA_SET_BSSKEY_RSP: case WMA_SET_STA_BCASTKEY_RSP: diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index dd1e592a9e13..2256f851761b 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2016,7 +2016,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) { tpPESession session_entry; tSirMsgQ mmh_msg; - tpCSAOffloadParams csa_params = (tpCSAOffloadParams) (msg->bodyptr); + struct csa_offload_params *csa_params = + (struct csa_offload_params *) (msg->bodyptr); tpSmeCsaOffloadInd csa_offload_ind; tpDphHashNode sta_ds = NULL; uint8_t session_id; @@ -2027,6 +2028,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) tLimWiderBWChannelSwitchInfo *chnl_switch_info = NULL; tLimChannelSwitchInfo *lim_ch_switch = NULL; + lim_log(mac_ctx, LOG1, FL("handle csa offload msg")); + if (!csa_params) { lim_log(mac_ctx, LOGE, FL("limMsgQ body ptr is NULL")); return; @@ -2037,7 +2040,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) csa_params->bssId, &session_id); if (!session_entry) { lim_log(mac_ctx, LOGE, - FL("Session does not exist")); + FL("Session does not exists for %pM"), + csa_params->bssId); goto err; } @@ -2059,7 +2063,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) lim_ch_switch = &session_entry->gLimChannelSwitch; session_entry->gLimChannelSwitch.switchMode = - csa_params->switchmode; + csa_params->switch_mode; /* timer already started by firmware, switch immediately */ session_entry->gLimChannelSwitch.switchCount = 0; session_entry->gLimChannelSwitch.primaryChannel = diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 21a7b78476f8..9c9a9976147f 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -220,6 +220,7 @@ typedef struct tagSmeStruct { ocb_callback dcc_stats_event_callback; sme_set_thermal_level_callback set_thermal_level_cb; void *saved_scan_cmd; + struct csa_offload_params saved_csa_params; } tSmeStruct, *tpSmeStruct; #endif /* #if !defined( __SMEINTERNAL_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 0a44d44f309b..423f56d2a178 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -156,6 +156,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) enum cds_conn_update_reason reason; tSmeCmd *saved_cmd; tCsrRoamInfo roam_info = {0}; + QDF_STATUS status; sms_log(mac, LOG1, FL("%s"), __func__); param = (struct sir_set_hw_mode_resp *)msg; @@ -234,6 +235,28 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) &roam_info, 0, eCSR_ROAM_STATUS_UPDATE_HW_MODE, eCSR_ROAM_RESULT_UPDATE_HW_MODE); + } else if (reason == CDS_UPDATE_REASON_CHANNEL_SWITCH_STA) { + struct sir_saved_csa_params *msg; + + sms_log(mac, LOG1, FL("process channel switch sta")); + msg = qdf_mem_malloc(sizeof(*msg)); + if (!msg) { + sms_log(mac, LOGE, + FL("memory alloc fail for csa ")); + goto end; + } + + msg->message_type = SIR_LIM_CSA_POST_HW_MODE_CHANGE; + msg->length = sizeof(*msg); + msg->session_id = command->u.set_hw_mode_cmd.session_id; + + status = cds_send_mb_message_to_mac(msg); + if (!QDF_IS_STATUS_SUCCESS(status)) + sms_log(mac, LOGE, + FL("failed to process csa params")); + else + sms_log(mac, LOG1, + FL("csa after hw mode change")); } else { sms_log(mac, LOGE, FL("Calling HDD callback for HW mode response")); diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 8b01d00e4830..dcce413c6700 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -921,28 +921,6 @@ typedef struct { uint8_t nss; } tSwitchChannelParams, *tpSwitchChannelParams; -/** - * struct tpCSAOffloadParams - CSA offload request parameters - * @channel: channel - * @switchmode: switch mode - * @sec_chan_offset: second channel offset - * @new_ch_width: new channel width - * @new_ch_freq_seg1: channel center freq 1 - * @new_ch_freq_seg2: channel center freq 2 - * @ies_present_flag: IE present flag - */ -typedef struct CSAOffloadParams { - uint8_t channel; - uint8_t switchmode; - uint8_t sec_chan_offset; - uint8_t new_ch_width; - uint8_t new_op_class; - uint8_t new_ch_freq_seg1; - uint8_t new_ch_freq_seg2; - uint32_t ies_present_flag; - tSirMacAddr bssId; -} *tpCSAOffloadParams, tCSAOffloadParams; - typedef void (*tpSetLinkStateCallback)(tpAniSirGlobal pMac, void *msgParam, bool status); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 53f06fe7474e..2e5671de7746 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1143,7 +1143,7 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) uint8_t vdev_id = 0; uint8_t cur_chan = 0; struct ieee80211_channelswitch_ie *csa_ie; - tpCSAOffloadParams csa_offload_event; + struct csa_offload_params *csa_offload_event; struct ieee80211_extendedchannelswitch_ie *xcsa_ie; struct ieee80211_ie_wide_bw_switch *wb_ie; struct wma_txrx_node *intr = wma->interfaces; @@ -1176,12 +1176,12 @@ int wma_csa_offload_handler(void *handle, uint8_t *event, uint32_t len) csa_ie = (struct ieee80211_channelswitch_ie *) (&csa_event->csa_ie[0]); csa_offload_event->channel = csa_ie->newchannel; - csa_offload_event->switchmode = csa_ie->switchmode; + csa_offload_event->switch_mode = csa_ie->switchmode; } else if (csa_event->ies_present_flag & WMI_XCSA_IE_PRESENT) { xcsa_ie = (struct ieee80211_extendedchannelswitch_ie *) (&csa_event->xcsa_ie[0]); csa_offload_event->channel = xcsa_ie->newchannel; - csa_offload_event->switchmode = xcsa_ie->switchmode; + csa_offload_event->switch_mode = xcsa_ie->switchmode; csa_offload_event->new_op_class = xcsa_ie->newClass; } else { WMA_LOGE("CSA Event error: No CSA IE present"); -- cgit v1.2.3 From ee57247afe09dbdf6003c52b172dbe5b974568d5 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 11 Feb 2016 11:48:53 -0800 Subject: qcacld-3.0: Fix follow-up comments for csa changes in STA/CLI case Move cdf/cds module related operation from lim_handle_hw_mode_change_on_csa to cdf_handle_hw_mode_change_on_csa to keep majority of cdf/cds operation in one place. Change-Id: I5af9ee941f8430be49cf2e467f9eac77dc09dde4 CRs-Fixed: 972184 --- core/cds/inc/cds_concurrency.h | 3 + core/cds/src/cds_concurrency.c | 81 +++++++++++++++++++++++++ core/mac/src/pe/lim/lim_process_message_queue.c | 62 ++----------------- 3 files changed, 90 insertions(+), 56 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 8bfa5663bb53..98cfafba73ad 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -657,4 +657,7 @@ QDF_STATUS qdf_reset_connection_update(void); QDF_STATUS qdf_set_connection_update(void); QDF_STATUS qdf_init_connection_update(void); QDF_STATUS cds_stop_start_opportunistic_timer(void); +QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, + uint8_t channel, uint8_t *bssid, void *dst, void *src, + uint32_t numbytes); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index adf5108a2aae..38f17b9287a3 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -8015,3 +8015,84 @@ QDF_STATUS cds_stop_start_opportunistic_timer(void) return status; } + +/** + * cds_handle_hw_mode_change_on_csa() - handle hw mode change for csa + * @session_id: SME session id + * @channel: given channel + * @bssid: pointer to bssid + * @dst: pointer to dest buffer + * @src: pointer to src buffer + * @numbytes: number of bytes to copy from src to dst + * + * Use this function to decide whether the hw mode upgrage or downgrade + * is required based on session_id and given channel + * + * Return: QDF_STATUS + */ +QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, + uint8_t channel, uint8_t *bssid, void *dst, void *src, + uint32_t numbytes) +{ + enum cds_conc_next_action action; + QDF_STATUS status; + + /* + * Since all the write to the policy manager table happens in the + * MC thread context and this channel change event is also processed + * in the MC thread context, explicit lock/unlock of qdf_conc_list_lock + * is not done here + */ + action = cds_get_pref_hw_mode_for_chan(session_id, channel); + + if (action == CDS_NOP) { + cds_info("no need for hw mode change"); + /* Proceed with processing csa params. So, not freeing it */ + return QDF_STATUS_SUCCESS; + } + cds_info("session:%d action:%d", session_id, action); + + /* + * 1. Start opportunistic timer + * 2. Do vdev restart on the new channel (by the caller) + * 3. PM will check if MCC upgrade can be done after timer expiry + */ + if (action == CDS_MCC_UPGRADE) { + status = cds_stop_start_opportunistic_timer(); + if (QDF_IS_STATUS_SUCCESS(status)) + cds_info("opportunistic timer for MCC upgrade"); + + /* + * After opportunistic timer is triggered, we can go ahead + * with processing the csa params. So, not freeing the memory + * through 'err' label. + */ + return QDF_STATUS_SUCCESS; + } + + /* + * CDS_DBS_DOWNGRADE: + * 1. PM will initiate HW mode change to DBS rightaway + * 2. Do vdev restart on the new channel (on getting hw mode resp) + */ + status = cds_next_actions(session_id, action, + CDS_UPDATE_REASON_CHANNEL_SWITCH_STA); + if (!QDF_IS_STATUS_SUCCESS(status)) { + cds_err("no set hw mode command was issued"); + /* Proceed with processing csa params. So, not freeing it */ + return QDF_STATUS_SUCCESS; + } else { + if ((NULL == dst) || (NULL == src)) { + cds_err("given buffers are null, can't copy csa param"); + return QDF_STATUS_E_FAILURE; + } + /* Save the csa params to be used after DBS downgrade */ + qdf_mem_copy(dst, src, numbytes); + cds_info("saved csa params for dbs downgrade for bssid %pM", + bssid); + + /* Returning error so that csa params are not processed here */ + status = QDF_STATUS_E_FAILURE; + } + return status; +} diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 664c5233cde2..4064a074ce6f 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1174,7 +1174,6 @@ static QDF_STATUS lim_handle_hw_mode_change_on_csa(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds = NULL; uint8_t session_id; uint16_t aid = 0; - enum cds_conc_next_action action; QDF_STATUS status = QDF_STATUS_E_FAILURE; lim_log(mac_ctx, LOG1, FL("handle hw mode change for csa")); @@ -1200,62 +1199,13 @@ static QDF_STATUS lim_handle_hw_mode_change_on_csa(tpAniSirGlobal mac_ctx, goto err; } - /* Since all the write to the policy manager table happens in the - * MC thread context and this channel change event is also processed - * in the MC thread context, explicit lock/unlock of qdf_conc_list_lock - * is not done here - */ - action = cds_get_pref_hw_mode_for_chan(session_entry->smeSessionId, - csa_params->channel); - - if (action == CDS_NOP) { - lim_log(mac_ctx, LOG1, FL("no need for hw mode change")); - /* Proceed with processing csa params. So, not freeing it */ - return QDF_STATUS_SUCCESS; - } - - lim_log(mac_ctx, LOG1, FL("session:%d action:%d"), - session_entry->smeSessionId, action); - - /* 1. Start opportunistic timer - * 2. Do vdev restart on the new channel (by the caller) - * 3. PM will check if MCC upgrade can be done after timer expiry - */ - if (action == CDS_MCC_UPGRADE) { - status = cds_stop_start_opportunistic_timer(); - if (QDF_IS_STATUS_SUCCESS(status)) - lim_log(mac_ctx, LOG1, - FL("opportunistic timer for MCC upgrade")); - - /* After opportunistic timer is triggered, we can go ahead - * with processing the csa params. So, not freeing the memory - * through 'err' label. - */ - return QDF_STATUS_SUCCESS; - } - - /* CDS_DBS_DOWNGRADE: - * 1. PM will initiate HW mode change to DBS rightaway - * 2. Do vdev restart on the new channel (on getting hw mode resp) - */ - status = cds_next_actions(session_entry->smeSessionId, action, - CDS_UPDATE_REASON_CHANNEL_SWITCH_STA); - if (!QDF_IS_STATUS_SUCCESS(status)) { - lim_log(mac_ctx, LOGE, FL("no set hw mode command was issued")); - /* Proceed with processing csa params. So, not freeing it */ - return QDF_STATUS_SUCCESS; - } else { - /* Save the csa params to be used after DBS downgrade */ - qdf_mem_copy(&session_entry->saved_csa_params, csa_params, - sizeof(session_entry->saved_csa_params)); + status = cds_handle_hw_mode_change_on_csa(session_entry->smeSessionId, + csa_params->channel, csa_params->bssId, + &session_entry->saved_csa_params, csa_params, + sizeof(session_entry->saved_csa_params)); - lim_log(mac_ctx, LOG1, - FL("saved csa params for dbs downgrade for %pM"), - session_entry->saved_csa_params.bssId); - - /* Returning error so that csa params are not processed here */ - status = QDF_STATUS_E_FAILURE; - } + if (QDF_IS_STATUS_SUCCESS(status)) + return status; err: qdf_mem_free(csa_params); -- cgit v1.2.3 From 41ab6b003672f15aeb33feaefd84966f04447178 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Mon, 8 Feb 2016 16:42:47 +0530 Subject: qcacld-3.0: Fix incorrect value of Rx Nss in operating mode field Fix the incorrect value of receive spatial streams added for use in operating mode field. The Operating Mode field is present in the Operating Mode Notification frame and Operating Mode Notification element. These are used to notify STAs that the transmitting STA is changing its operating channel width, the maximum number of spatial streams it can receive, or both. As per the 802.11ac spec: - If the Rx NSS Type subfield is 0, indicates the maximum number of spatial streams that the STA can receive. - If the Rx NSS Type subfield is 1, indicates the maximum number of spatial streams that the STA can receive as a beamformee in an SU PPDU using a beamforming steering matrix derived from a VHT Compressed Beamforming report with Feedback Type subfield indicating MU in the corresponding VHT Compressed Beamforming frame sent by the STA. Set to 0 for Nss = 1 Set to 1 for Nss = 2 ... Set to 7 for Nss = 8 Change-Id: I60cb7259df3986c0356666a357b8a4ef575b7ca4 CRs-Fixed: 973411 --- core/cds/inc/cds_concurrency.h | 25 +++++++++++++++++++++++++ core/cds/src/cds_concurrency.c | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 98cfafba73ad..42b6d3a5c101 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -43,6 +43,31 @@ #define DBS_OPPORTUNISTIC_TIME 10 #define CONNECTION_UPDATE_TIMEOUT 500 +/** + * enum cds_max_rx_ss - Maximum number of receive spatial streams + * @CDS_RX_NSS_1: Receive Nss = 1 + * @CDS_RX_NSS_2: Receive Nss = 2 + * @CDS_RX_NSS_3: Receive Nss = 3 + * @CDS_RX_NSS_4: Receive Nss = 4 + * @CDS_RX_NSS_5: Receive Nss = 5 + * @CDS_RX_NSS_6: Receive Nss = 6 + * @CDS_RX_NSS_7: Receive Nss = 7 + * @CDS_RX_NSS_8: Receive Nss = 8 + * + * Indicates the maximum number of spatial streams that the STA can receive + */ +enum cds_max_rx_ss { + CDS_RX_NSS_1 = 0, + CDS_RX_NSS_2 = 1, + CDS_RX_NSS_3 = 2, + CDS_RX_NSS_4 = 3, + CDS_RX_NSS_5 = 4, + CDS_RX_NSS_6 = 5, + CDS_RX_NSS_7 = 6, + CDS_RX_NSS_8 = 7, + CDS_RX_NSS_MAX, +}; + /** * enum cds_chain_mode - Chain Mask tx & rx combination. * diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 38f17b9287a3..08a21a361d39 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -5912,7 +5912,7 @@ QDF_STATUS cds_next_actions(uint32_t session_id, * update the beacon template & notify FW. Once FW confirms * beacon updated, send down the HW mode change req */ - status = cds_complete_action(1, CDS_DBS, reason, + status = cds_complete_action(CDS_RX_NSS_1, CDS_DBS, reason, session_id); break; case CDS_DBS: @@ -5930,7 +5930,7 @@ QDF_STATUS cds_next_actions(uint32_t session_id, * intially. If yes, update the beacon template & notify FW. * Once FW confirms beacon updated, send the HW mode change req */ - status = cds_complete_action(0, CDS_MCC, reason, + status = cds_complete_action(CDS_RX_NSS_2, CDS_MCC, reason, session_id); break; case CDS_MCC: -- cgit v1.2.3 From 2859de43af1ea417bff5230055e00b8313617c0c Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 11 Feb 2016 16:17:38 +0530 Subject: qcacld-3.0: Sanitize the session id before issuing scan Ensure that the session id is sanitized before issuing the scan request. During the transient stages of a new interface when no session exists for that interface and if a scan is received for that particular interface, it would result in scan with invalid vdev id. Validate the session id to avoid the same. Change-Id: Ib22262493a141491d1d86ae682b14113d303685d CRs-Fixed: 973773 --- core/hdd/src/wlan_hdd_scan.c | 3 +++ core/sme/inc/sme_api.h | 2 ++ core/sme/src/common/sme_api.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index c77a296ac279..db999d573fb8 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1254,6 +1254,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_SCAN, pAdapter->sessionId, request->n_channels)); + if (!sme_is_session_id_valid(pHddCtx->hHal, pAdapter->sessionId)) + return -EINVAL; + hddLog(LOG1, FL("Device_mode %s(%d)"), hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index e99d39d58d68..b198c76739bb 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1042,6 +1042,8 @@ bool sme_validate_sap_channel_switch(tHalHandle hal, uint16_t sap_ch, eCsrPhyMode sap_phy_mode, uint8_t cc_switch_mode, uint8_t session_id); +bool sme_is_session_id_valid(tHalHandle hal, uint32_t session_id); + #ifdef FEATURE_WLAN_TDLS void sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, uint8_t *opclass); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 423f56d2a178..61d27b19f130 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -2959,6 +2959,13 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id, MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, session_id, scan_req->scanType)); + + if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { + sms_log(mac_ctx, LOGE, FL("Invalid session id:%d"), + session_id); + return status; + } + if (!mac_ctx->scan.fScanEnable) { sms_log(mac_ctx, LOGE, FL("fScanEnable false")); return status; @@ -14785,6 +14792,32 @@ void sme_update_tgt_services(tHalHandle hal, struct wma_tgt_services *cfg) return; } +/** + * sme_is_session_id_valid() - Check if the session id is valid + * @hal: Pointer to HAL + * @session_id: Session id + * + * Checks if the session id is valid or not + * + * Return: True is the session id is valid, false otherwise + */ +bool sme_is_session_id_valid(tHalHandle hal, uint32_t session_id) +{ + tpAniSirGlobal mac = PMAC_STRUCT(hal); + if (!mac) { + sms_log(mac, LOGE, FL("null mac pointer")); + return false; + } + + if (CSR_IS_SESSION_VALID(mac, session_id)) { + return true; + } else { + sms_log(mac, LOGE, + FL("invalid session id:%d"), session_id); + return false; + } +} + #ifdef FEATURE_WLAN_TDLS /** -- cgit v1.2.3 From ce2172e9ed9f4edbb5b8a13104f28fe42c5c8953 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 18 Feb 2016 16:12:43 +0530 Subject: qcacld-3.0: Fix reason code used during Nss update request Fix the reason code used during Nss update request. If there is MCC upgrade or DBS downgrade, the hw mode change request internally send the Nss update request. But, the current implementation uses the same fixed reason code during Nss update request and due to this on receiving the hw mode change response, the expected callback function is not getting invoked. Fix this by passing the right reason code during Nss update request. CRs-Fixed: 978663 Change-Id: I706cb9a86d66d8601ec87f560459604e562f6037 --- core/cds/inc/cds_concurrency.h | 6 ++-- core/cds/src/cds_concurrency.c | 31 +++++++++------- core/hdd/src/wlan_hdd_cfg80211.c | 4 +-- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_wext.c | 6 ++-- core/mac/inc/sir_api.h | 48 ++++++++++++------------- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 20 +++++++++-- core/sap/src/sap_api_link_cntl.c | 2 +- core/sme/inc/sme_api.h | 3 +- core/sme/inc/sme_inside.h | 1 + core/sme/src/common/sme_api.c | 25 +++++++++---- core/sme/src/csr/csr_api_roam.c | 6 ++-- core/sme/src/csr/csr_api_scan.c | 2 +- core/wma/src/wma_mgmt.c | 2 ++ 14 files changed, 98 insertions(+), 60 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 42b6d3a5c101..e63a5a1e20d9 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -596,7 +596,7 @@ QDF_STATUS cds_update_connection_info(uint32_t vdev_id); QDF_STATUS cds_decr_connection_count(uint32_t vdev_id); QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, - enum cds_conn_update_reason); + enum sir_conn_update_reason); bool cds_is_ibss_conn_exist(uint8_t *ibss_channel); #ifdef MPC_UT_FRAMEWORK QDF_STATUS cds_incr_connection_count_utfw( @@ -652,11 +652,11 @@ QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_bandwidth mac1_bw, enum hw_mode_dbs_capab dbs, enum hw_mode_agile_dfs_capab dfs, - enum cds_conn_update_reason reason); + enum sir_conn_update_reason reason); enum cds_conc_next_action cds_need_opportunistic_upgrade(void); QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, - enum cds_conn_update_reason reason); + enum sir_conn_update_reason reason); void cds_set_dual_mac_scan_config(uint8_t dbs_val, uint8_t dbs_plus_agile_scan_val, uint8_t single_mac_scan_with_dbs_val); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 08a21a361d39..6718d3cbff41 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2531,7 +2531,7 @@ QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_bandwidth mac1_bw, enum hw_mode_dbs_capab dbs, enum hw_mode_agile_dfs_capab dfs, - enum cds_conn_update_reason reason) + enum sir_conn_update_reason reason) { int8_t hw_mode_index; struct sir_hw_mode msg; @@ -2556,8 +2556,8 @@ QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, msg.reason = reason; msg.session_id = session_id; - cds_info("set hw mode to sme: hw_mode_index: %d", - msg.hw_mode_index); + cds_info("set hw mode to sme: hw_mode_index: %d session:%d reason:%d", + msg.hw_mode_index, msg.session_id, msg.reason); status = sme_soc_set_hw_mode(hdd_ctx->hHal, msg); if (status != QDF_STATUS_SUCCESS) { @@ -3819,7 +3819,7 @@ void cds_dbs_opportunistic_timer_handler(void *data) * So, session id 0 is ok here. */ cds_next_actions(0, action, - CDS_UPDATE_REASON_OPPORTUNISTIC); + SIR_UPDATE_REASON_OPPORTUNISTIC); } qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); @@ -5557,7 +5557,7 @@ enum cds_two_connection_mode cds_get_third_connection_pcl_table_index(void) */ QDF_STATUS cds_current_connections_update(uint32_t session_id, uint8_t channel, - enum cds_conn_update_reason reason) + enum sir_conn_update_reason reason) { enum cds_conc_next_action next_action = CDS_NOP; uint32_t num_connections = 0; @@ -5711,6 +5711,7 @@ bool cds_wait_for_nss_update(uint8_t action) * @vdev_id: vdev id for the specific connection * @next_action: next action to happen at policy mgr after * beacon update + * @reason: Reason for nss update * * This function is the callback registered with SME at nss * update request time @@ -5718,7 +5719,8 @@ bool cds_wait_for_nss_update(uint8_t action) * Return: None */ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, - uint8_t next_action) + uint8_t next_action, + enum sir_conn_update_reason reason) { cds_context_type *cds_ctx; uint32_t conn_index = 0; @@ -5760,10 +5762,13 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, cds_err("unexpected action %d", next_action); break; } + + cds_debug("vdev:%d wait:%d", vdev_id, wait); + if (!wait) cds_next_actions(vdev_id, next_action, - CDS_UPDATE_REASON_NSS_UPDATE); + reason); qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); return; } @@ -5785,7 +5790,7 @@ void cds_nss_update_cb(void *context, uint8_t tx_status, uint8_t vdev_id, * Return: QDF_STATUS enum */ QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, - enum cds_conn_update_reason reason, + enum sir_conn_update_reason reason, uint32_t session_id) { QDF_STATUS status = QDF_STATUS_E_FAILURE; @@ -5826,7 +5831,7 @@ QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, conc_connection_list [list[index]].vdev_id, new_nss, cds_nss_update_cb, - next_action, hdd_ctx); + next_action, hdd_ctx, reason); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); @@ -5844,7 +5849,7 @@ QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, conc_connection_list [list[index]].vdev_id, new_nss, cds_nss_update_cb, - next_action, hdd_ctx); + next_action, hdd_ctx, reason); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("sme_nss_update_request() failed for vdev %d", conc_connection_list[list[index]].vdev_id); @@ -5875,7 +5880,7 @@ QDF_STATUS cds_complete_action(uint8_t new_nss, uint8_t next_action, */ QDF_STATUS cds_next_actions(uint32_t session_id, enum cds_conc_next_action action, - enum cds_conn_update_reason reason) + enum sir_conn_update_reason reason) { QDF_STATUS status = QDF_STATUS_E_FAILURE; struct sir_hw_mode_params hw_mode; @@ -6607,7 +6612,7 @@ QDF_STATUS cds_handle_conc_multiport(uint8_t session_id, uint8_t channel) status = cds_current_connections_update(session_id, channel, - CDS_UPDATE_REASON_NORMAL_STA); + SIR_UPDATE_REASON_NORMAL_STA); if (QDF_STATUS_E_FAILURE == status) { cds_err("connections update failed"); return status; @@ -8076,7 +8081,7 @@ QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, * 2. Do vdev restart on the new channel (on getting hw mode resp) */ status = cds_next_actions(session_id, action, - CDS_UPDATE_REASON_CHANNEL_SWITCH_STA); + SIR_UPDATE_REASON_CHANNEL_SWITCH_STA); if (!QDF_IS_STATUS_SUCCESS(status)) { cds_err("no set hw mode command was issued"); /* Proceed with processing csa params. So, not freeing it */ diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index e9a74a044d2b..c1b235ce88b7 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4243,7 +4243,7 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, ret = cds_current_connections_update(adapter->sessionId, channel_hint, - CDS_UPDATE_REASON_SET_OPER_CHAN); + SIR_UPDATE_REASON_SET_OPER_CHAN); if (QDF_STATUS_E_FAILURE == ret) { /* return in the failure case */ hdd_err("ERROR: connections update failed!!"); @@ -9351,7 +9351,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy, status = cds_current_connections_update(pAdapter->sessionId, channelNum, - CDS_UPDATE_REASON_JOIN_IBSS); + SIR_UPDATE_REASON_JOIN_IBSS); if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0bd09531c3f5..f0c503683489 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -8144,7 +8144,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, status = cds_current_connections_update(pAdapter->sessionId, channel, - CDS_UPDATE_REASON_START_AP); + SIR_UPDATE_REASON_START_AP); if (QDF_STATUS_E_FAILURE == status) { hdd_err("ERROR: connections update failed!!"); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 3f1ef0c9653f..145fd65bc689 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -7778,7 +7778,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, HW_MODE_SS_0x0, HW_MODE_BW_NONE, HW_MODE_DBS_NONE, HW_MODE_AGILE_DFS_NONE, - CDS_UPDATE_REASON_UT); + SIR_UPDATE_REASON_UT); } else if (apps_args[0] == 1) { hddLog(LOGE, FL("set hw mode for dual mac\n")); @@ -7789,7 +7789,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, HW_MODE_SS_1x1, HW_MODE_40_MHZ, HW_MODE_DBS, HW_MODE_AGILE_DFS_NONE, - CDS_UPDATE_REASON_UT); + SIR_UPDATE_REASON_UT); } } break; @@ -7801,7 +7801,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, FL(" is called\n")); action = cds_current_connections_update(pAdapter->sessionId, apps_args[0], - CDS_UPDATE_REASON_UT); + SIR_UPDATE_REASON_UT); pr_info("next action is %d {HDD_NOP = 0, HDD_DBS, HDD_DBS_DOWNGRADE, HDD_MCC, HDD_MCC_UPGRADE}", action); } break; diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 5e8e93efcd59..be4eef03b37a 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -95,29 +95,29 @@ typedef uint8_t tSirVersionString[SIR_VERSION_STRING_LEN]; #define MAX_VDEV_SUPPORTED 4 /** - * enum cds_conn_update_reason: Reason for conc connection update - * @CDS_UPDATE_REASON_SET_OPER_CHAN: Set probable operating channel - * @CDS_UPDATE_REASON_JOIN_IBSS: Join IBSS - * @CDS_UPDATE_REASON_UT: Unit test related - * @CDS_UPDATE_REASON_START_AP: Start AP - * @CDS_UPDATE_REASON_NORMAL_STA: Connection to Normal STA - * @CDS_UPDATE_REASON_HIDDEN_STA: Connection to Hidden STA - * @CDS_UPDATE_REASON_OPPORTUNISTIC: Opportunistic HW mode update - * @CDS_UPDATE_REASON_NSS_UPDATE: NSS update - * @CDS_UPDATE_REASON_CHANNEL_SWITCH: Channel switch - * @CDS_UPDATE_REASON_CHANNEL_SWITCH_STA: Channel switch for STA + * enum sir_conn_update_reason: Reason for conc connection update + * @SIR_UPDATE_REASON_SET_OPER_CHAN: Set probable operating channel + * @SIR_UPDATE_REASON_JOIN_IBSS: Join IBSS + * @SIR_UPDATE_REASON_UT: Unit test related + * @SIR_UPDATE_REASON_START_AP: Start AP + * @SIR_UPDATE_REASON_NORMAL_STA: Connection to Normal STA + * @SIR_UPDATE_REASON_HIDDEN_STA: Connection to Hidden STA + * @SIR_UPDATE_REASON_OPPORTUNISTIC: Opportunistic HW mode update + * @SIR_UPDATE_REASON_NSS_UPDATE: NSS update + * @SIR_UPDATE_REASON_CHANNEL_SWITCH: Channel switch + * @SIR_UPDATE_REASON_CHANNEL_SWITCH_STA: Channel switch for STA */ -enum cds_conn_update_reason { - CDS_UPDATE_REASON_SET_OPER_CHAN, - CDS_UPDATE_REASON_JOIN_IBSS, - CDS_UPDATE_REASON_UT, - CDS_UPDATE_REASON_START_AP, - CDS_UPDATE_REASON_NORMAL_STA, - CDS_UPDATE_REASON_HIDDEN_STA, - CDS_UPDATE_REASON_OPPORTUNISTIC, - CDS_UPDATE_REASON_NSS_UPDATE, - CDS_UPDATE_REASON_CHANNEL_SWITCH, - CDS_UPDATE_REASON_CHANNEL_SWITCH_STA, +enum sir_conn_update_reason { + SIR_UPDATE_REASON_SET_OPER_CHAN, + SIR_UPDATE_REASON_JOIN_IBSS, + SIR_UPDATE_REASON_UT, + SIR_UPDATE_REASON_START_AP, + SIR_UPDATE_REASON_NORMAL_STA, + SIR_UPDATE_REASON_HIDDEN_STA, + SIR_UPDATE_REASON_OPPORTUNISTIC, + SIR_UPDATE_REASON_NSS_UPDATE, + SIR_UPDATE_REASON_CHANNEL_SWITCH, + SIR_UPDATE_REASON_CHANNEL_SWITCH_STA, }; typedef enum { @@ -472,7 +472,7 @@ typedef struct sSirSmeReadyReq { struct sir_hw_mode { uint32_t hw_mode_index; void *set_hw_mode_cb; - enum cds_conn_update_reason reason; + enum sir_conn_update_reason reason; uint32_t session_id; }; @@ -5203,7 +5203,7 @@ struct sir_beacon_tx_complete_rsp { }; typedef void (*nss_update_cb)(void *context, uint8_t tx_status, uint8_t vdev_id, - uint8_t next_action); + uint8_t next_action, enum sir_conn_update_reason reason); /** * OCB structures diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 2256f851761b..6e9d4947b4e4 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2078,6 +2078,17 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) chnl_switch_info = &session_entry->gLimWiderBWChannelSwitch; + lim_log(mac_ctx, LOG1, + FL("vht:%d ht:%d flag:%x chan:%d seg1:%d seg2:%d width:%d country:%s class:%d"), + session_entry->vhtCapability, + session_entry->htSupportedChannelWidthSet, + csa_params->ies_present_flag, + csa_params->channel, csa_params->new_ch_freq_seg1, + csa_params->new_ch_freq_seg2, + csa_params->new_ch_width, + mac_ctx->scan.countryCodeCurrent, + csa_params->new_op_class); + if (session_entry->vhtCapability && session_entry->htSupportedChannelWidthSet) { if (csa_params->ies_present_flag & lim_wbw_ie_present) { @@ -2191,8 +2202,8 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } } - lim_log(mac_ctx, LOG1, FL("new ch width = %d"), - session_entry->gLimChannelSwitch.ch_width); + lim_log(mac_ctx, LOG1, FL("new ch width = %d space:%d"), + session_entry->gLimChannelSwitch.ch_width, chan_space); lim_prepare_for11h_channel_switch(mac_ctx, session_entry); csa_offload_ind = qdf_mem_malloc(sizeof(tSmeCsaOffloadInd)); @@ -2469,6 +2480,11 @@ lim_process_beacon_tx_success_ind(tpAniSirGlobal pMac, uint16_t msgType, void *e return; } + lim_log(pMac, LOG1, FL("role:%d swIe:%d opIe:%d"), + GET_LIM_SYSTEM_ROLE(psessionEntry), + psessionEntry->dfsIncludeChanSwIe, + psessionEntry->gLimOperatingMode.present); + if (LIM_IS_AP_ROLE(psessionEntry) && true == psessionEntry->dfsIncludeChanSwIe) { /* Send only 5 beacons with CSA IE Set in when a radar is detected */ diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 09fed3226582..777c0ed9f995 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -569,7 +569,7 @@ static QDF_STATUS wlansap_set_hw_mode_on_channel_switch(tpAniSirGlobal mac_ctx, * 2. Do vdev restart on the new channel */ status = cds_next_actions(sap_ctx->sessionId, action, - CDS_UPDATE_REASON_CHANNEL_SWITCH); + SIR_UPDATE_REASON_CHANNEL_SWITCH); if (!QDF_IS_STATUS_SUCCESS(status)) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, FL("no set hw mode command was issued")); diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index b198c76739bb..bf852a7231fc 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -978,7 +978,8 @@ void sme_register_hw_mode_trans_cb(tHalHandle hal, hw_mode_transition_cb callback); QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, - uint8_t next_action, void *hdd_context); + uint8_t next_action, void *hdd_context, + enum sir_conn_update_reason reason); typedef void (*sme_peer_authorized_fp) (uint32_t vdev_id); QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index c8ba415f2f68..cf062f77ee21 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -164,6 +164,7 @@ struct s_nss_update_cmd { void *nss_update_cb; void *context; uint8_t next_action; + enum sir_conn_update_reason reason; }; typedef struct tagSmeCmd { diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 61d27b19f130..1f9c74679010 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -153,7 +153,7 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) bool found; hw_mode_cb callback = NULL; struct sir_set_hw_mode_resp *param; - enum cds_conn_update_reason reason; + enum sir_conn_update_reason reason; tSmeCmd *saved_cmd; tCsrRoamInfo roam_info = {0}; QDF_STATUS status; @@ -187,11 +187,16 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) callback = command->u.set_hw_mode_cmd.set_hw_mode_cb; reason = command->u.set_hw_mode_cmd.reason; + + sms_log(mac, LOG1, FL("reason:%d session:%d"), + command->u.set_hw_mode_cmd.reason, + command->u.set_hw_mode_cmd.session_id); + if (callback) { if (!param) { sms_log(mac, LOGE, FL("Callback failed since HW mode params is NULL")); - } else if (reason == CDS_UPDATE_REASON_HIDDEN_STA) { + } else if (reason == SIR_UPDATE_REASON_HIDDEN_STA) { /* In the case of hidden SSID, connection update * (set hw mode) is done after the scan with reason * code eCsrScanForSsid completes. The connect/failure @@ -229,13 +234,13 @@ static QDF_STATUS sme_process_set_hw_mode_resp(tpAniSirGlobal mac, uint8_t *msg) saved_cmd = NULL; mac->sme.saved_scan_cmd = NULL; } - } else if (reason == CDS_UPDATE_REASON_CHANNEL_SWITCH) { + } else if (reason == SIR_UPDATE_REASON_CHANNEL_SWITCH) { csr_roam_call_callback(mac, command->u.set_hw_mode_cmd.session_id, &roam_info, 0, eCSR_ROAM_STATUS_UPDATE_HW_MODE, eCSR_ROAM_RESULT_UPDATE_HW_MODE); - } else if (reason == CDS_UPDATE_REASON_CHANNEL_SWITCH_STA) { + } else if (reason == SIR_UPDATE_REASON_CHANNEL_SWITCH_STA) { struct sir_saved_csa_params *msg; sms_log(mac, LOG1, FL("process channel switch sta")); @@ -2772,7 +2777,8 @@ QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg) callback(command->u.nss_update_cmd.context, param->tx_status, param->session_id, - command->u.nss_update_cmd.next_action); + command->u.nss_update_cmd.next_action, + command->u.nss_update_cmd.reason); } } else { sms_log(mac, LOGE, FL("Callback does not exisit")); @@ -14460,7 +14466,10 @@ QDF_STATUS sme_soc_set_hw_mode(tHalHandle hal, cmd->u.set_hw_mode_cmd.reason = msg.reason; cmd->u.set_hw_mode_cmd.session_id = msg.session_id; - sms_log(mac, LOG1, FL("Queuing e_sme_command_set_hw_mode to CSR")); + sms_log(mac, LOG1, + FL("Queuing set hw mode to CSR, session:%d reason:%d"), + cmd->u.set_hw_mode_cmd.session_id, + cmd->u.set_hw_mode_cmd.reason); csr_queue_sme_command(mac, cmd, false); sme_release_global_lock(&mac->sme); @@ -14500,7 +14509,8 @@ void sme_register_hw_mode_trans_cb(tHalHandle hal, */ QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, uint8_t new_nss, void *cback, uint8_t next_action, - void *hdd_context) + void *hdd_context, + enum sir_conn_update_reason reason) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal mac = PMAC_STRUCT(hHal); @@ -14522,6 +14532,7 @@ QDF_STATUS sme_nss_update_request(tHalHandle hHal, uint32_t vdev_id, cmd->u.nss_update_cmd.nss_update_cb = cback; cmd->u.nss_update_cmd.context = hdd_context; cmd->u.nss_update_cmd.next_action = next_action; + cmd->u.nss_update_cmd.reason = reason; sms_log(mac, LOG1, FL("Queuing e_sme_command_nss_update to CSR")); csr_queue_sme_command(mac, cmd, false); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 01e43eb37dcb..277b41d84c85 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18718,7 +18718,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) /* For hidden SSID case, if there is any scan command pending * it needs to be cleared before issuing set HW mode */ - if (command->u.set_hw_mode_cmd.reason == CDS_UPDATE_REASON_HIDDEN_STA) { + if (command->u.set_hw_mode_cmd.reason == SIR_UPDATE_REASON_HIDDEN_STA) { sms_log(mac, LOGE, FL("clear any pending scan command")); status = csr_scan_abort_mac_scan_not_for_connect(mac, command->u.set_hw_mode_cmd.session_id); @@ -18741,7 +18741,9 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command) cmd->set_hw.set_hw_mode_cb = command->u.set_hw_mode_cmd.set_hw_mode_cb; sms_log(mac, LOG1, - FL("Posting eWNI_SME_SET_HW_MODE_REQ to PE")); + FL("Posting set hw mode req to PE session:%d reason:%d"), + command->u.set_hw_mode_cmd.session_id, + command->u.set_hw_mode_cmd.reason); status = cds_send_mb_message_to_mac(cmd); if (QDF_STATUS_SUCCESS != status) { diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index f808ffc1194f..557cad320f19 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -3999,7 +3999,7 @@ csr_handle_nxt_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *pCommand, case eCsrNextCheckAllowConc: ret = cds_current_connections_update(pCommand->sessionId, chan, - CDS_UPDATE_REASON_HIDDEN_STA); + SIR_UPDATE_REASON_HIDDEN_STA); sms_log(mac_ctx, LOG1, FL("chan: %d session: %d status: %d"), chan, pCommand->sessionId, ret); if (mac_ctx->sme.saved_scan_cmd) { diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 4a44de63b952..cc4fc88e9366 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -470,6 +470,8 @@ int wma_unified_bcntx_status_event_handler(void *handle, resp_event = param_buf->fixed_param; + WMA_LOGD("%s", __func__); + /* Check for valid handle to ensure session is not * deleted in any race */ -- cgit v1.2.3 From 398b3d640f7f7b410798c6bc3bbcd902679a5cd4 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 10 Feb 2016 17:19:39 -0800 Subject: qcacld-3.0: Introduce ENTER_DEV() logging macro Currently HDD defines an ENTER() macro which is used to log entry into certain HDD functions. Many of the functions HDD registers with the kernel are called with either a netdev or wdev parameter. When logging entry into those functions it would be beneficial to log the name of the netdev so that in subsequent log analysis we not only know which functions were called but also know which device was being used. Introduce a new ENTER_DEV() macro for this purpose which will log both the function name and the device name. Change-Id: I32ef2bcc958b8148e6d439b30b21102be144a327 CRs-Fixed: 938146 --- core/hdd/inc/wlan_hdd_main.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index d9c5ca0d7302..776ec510a1f6 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -178,6 +178,8 @@ hdd_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args) #define ENTER() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "enter") +#define ENTER_DEV(dev) \ + hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "enter(%s)", (dev)->name) #define EXIT() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "exit") #define WLAN_HDD_GET_PRIV_PTR(__dev__) (hdd_adapter_t *)(netdev_priv((__dev__))) -- cgit v1.2.3 From a6177c31b653ee6b7bc7f7cb85c92b6ff02592fa Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 8 Jan 2016 08:39:46 -0800 Subject: qcacld-3.0: Convert wlan_hdd_trace.c to unified logging Currently the HDD code uses a variety of logging APIs. In qcacld-3.0 HDD should converge on a unified set of logging APIs. Update wlan_hdd_trace.c to use the unified set of APIs. Change-Id: I41f40000031a6a7203bebfdd4fcf11cc0673a973 CRs-Fixed: 959683 --- core/hdd/src/wlan_hdd_trace.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c index 0da7f7338442..37c141cf9aa3 100644 --- a/core/hdd/src/wlan_hdd_trace.c +++ b/core/hdd/src/wlan_hdd_trace.c @@ -34,6 +34,9 @@ * */ +/* denote that this file does not allow legacy hddLog */ +#define HDD_DISALLOW_LEGACY_HDDLOG 1 + #include "qdf_trace.h" #include "qdf_types.h" #include "wlan_hdd_trace.h" @@ -51,11 +54,11 @@ static void hdd_trace_dump(void *mac, tp_qdf_trace_record record, uint16_t index) { if (TRACE_CODE_HDD_RX_SME_MSG == record->code) - hddLog(LOGE, "%04d %012llu S%d %-14s %-30s(0x%x) ", + hdd_err("%04d %012llu S%d %-14s %-30s(0x%x)", index, record->time, record->session, "RX SME MSG:", get_e_roam_cmd_status_str(record->data), record->data); else - hddLog(LOGE, "%04d %012llu S%d %-14s %-30s(0x%x) ", + hdd_err("%04d %012llu S%d %-14s %-30s(0x%x)", index, record->time, record->session, "HDD Event:", hdd_trace_event_string(record->code), record->data); } -- cgit v1.2.3 From 3c3994a8bef11df1aa89782bcafc79ad057acf37 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 08:12:30 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in control plane netdev ops The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all control plane netdev methods to use this macro. Change-Id: Id73214481616eb34cc40f125ea7fb756b3097dc7 CRs-Fixed: 938146 --- core/hdd/src/wlan_hdd_hostapd.c | 13 ++++++++----- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/hdd/src/wlan_hdd_main.c | 16 +++++++++------- core/hdd/src/wlan_hdd_stats.c | 1 + 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index f0c503683489..a93978b50ce1 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -218,7 +218,7 @@ static int __hdd_hostapd_open(struct net_device *dev) { hdd_adapter_t *pAdapter = netdev_priv(dev); - ENTER(); + ENTER_DEV(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0)); @@ -267,7 +267,8 @@ static int hdd_hostapd_open(struct net_device *dev) static int __hdd_hostapd_stop(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER(); + + ENTER_DEV(dev); /* Stop all tx queues */ hddLog(LOG1, FL("Disabling queues")); @@ -311,7 +312,7 @@ static void __hdd_hostapd_uninit(struct net_device *dev) hdd_adapter_t *adapter = netdev_priv(dev); hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { hddLog(LOGE, FL("Invalid magic")); @@ -355,6 +356,8 @@ static void hdd_hostapd_uninit(struct net_device *dev) */ static int __hdd_hostapd_change_mtu(struct net_device *dev, int new_mtu) { + ENTER_DEV(dev); + return 0; } @@ -420,7 +423,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) hdd_context_t *hdd_ctx; int ret = 0; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -470,7 +473,7 @@ void hdd_hostapd_inactivity_timer_cb(void *usrDataForCallback) /* For the NULL at the end */ int event_len = strlen(autoShutEvent) + 1; - ENTER(); + ENTER_DEV(dev); #ifdef DISABLE_CONCURRENCY_AUTOSAVE if (cds_concurrent_open_sessions_running()) { diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index d2c14590e8fd..25882c73105c 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -6357,7 +6357,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); if (dev != adapter->dev) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index e2c3b0ad3320..2a98cf201537 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -91,8 +91,6 @@ #include "wlan_hdd_ocb.h" #include "cdp_txrx_flow_ctrl_v2.h" - -extern int hdd_hostapd_stop(struct net_device *dev); #endif /* FEATURE_WLAN_CH_AVOID */ #include "wlan_hdd_nan.h" @@ -318,6 +316,8 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; + ENTER_DEV(dev); + /* Make sure that this callback corresponds to our device. */ if ((strncmp(dev->name, "wlan", 4)) && (strncmp(dev->name, "p2p", 3))) return NOTIFY_DONE; @@ -1443,6 +1443,8 @@ static int __hdd_open(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; + ENTER_DEV(dev); + MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST, adapter->sessionId, adapter->device_mode)); @@ -1497,7 +1499,7 @@ static int __hdd_stop(struct net_device *dev) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int ret; - ENTER(); + ENTER_DEV(dev); MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST, adapter->sessionId, adapter->device_mode)); @@ -1576,7 +1578,7 @@ static void __hdd_uninit(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); - ENTER(); + ENTER_DEV(dev); do { if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { @@ -1641,7 +1643,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr) QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1726,11 +1728,11 @@ static void __hdd_set_multicast_list(struct net_device *dev) static const uint8_t ipv6_router_solicitation[] = {0x33, 0x33, 0x00, 0x00, 0x00, 0x02}; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) return; - ENTER(); - status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) return; diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 0ae9540a7d59..c102b8809743 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -2209,6 +2209,7 @@ struct net_device_stats *hdd_get_stats(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); + ENTER_DEV(dev); return &adapter->stats; } /** -- cgit v1.2.3 From b25dcb1704cf0ab52dcd7725a408e5c9021d0a81 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 17:46:42 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in STA standard WEXT ioctls The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all STA-mode standard wireless extensions ioctl handlers to use this macro. Change-Id: Ia76fb5a471e4e3f03a1b4cd53c95227e6b7a815c CRs-Fixed: 975414 --- core/hdd/src/wlan_hdd_assoc.c | 12 ++++----- core/hdd/src/wlan_hdd_scan.c | 4 +-- core/hdd/src/wlan_hdd_wext.c | 57 ++++++++++++++++++++++++------------------- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 07e3f2450cb3..f35fe2360e9a 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -4722,7 +4722,7 @@ static int __iw_set_essid(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4922,7 +4922,7 @@ static int __iw_get_essid(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4992,7 +4992,7 @@ static int __iw_set_auth(struct net_device *dev, struct iw_request_info *info, eCsrEncryptionType ucEncryptionType; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5239,7 +5239,7 @@ static int __iw_get_auth(struct net_device *dev, struct iw_request_info *info, tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5396,7 +5396,7 @@ static int __iw_set_ap_address(struct net_device *dev, uint8_t *pMacAddress = NULL; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -5456,7 +5456,7 @@ static int __iw_get_ap_address(struct net_device *dev, WLAN_HDD_GET_STATION_CTX_PTR(adapter); int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index db999d573fb8..1576b8e72110 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -716,7 +716,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info, uint16_t con_dfs_ch; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -897,7 +897,7 @@ static int __iw_get_scan(struct net_device *dev, int i = 0; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 145fd65bc689..e8760a524111 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1617,13 +1617,14 @@ static int __iw_set_commit(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; + ENTER_DEV(dev); + adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; - hddLog(LOG1, "In %s", __func__); /* Do nothing for now */ return 0; } @@ -1665,7 +1666,7 @@ static int __iw_get_name(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -1723,7 +1724,7 @@ static int __iw_set_mode(struct net_device *dev, struct wireless_dev *wdev; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1834,7 +1835,7 @@ __iw_get_mode(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -1908,7 +1909,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); tCsrRoamProfile *pRoamProfile; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2034,7 +2035,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2117,6 +2118,8 @@ static int __iw_get_tx_power(struct net_device *dev, hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); int ret; + ENTER_DEV(dev); + ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; @@ -2171,7 +2174,7 @@ static int __iw_set_tx_power(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2233,7 +2236,7 @@ static int __iw_get_bitrate(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2337,7 +2340,7 @@ static int __iw_set_bitrate(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2438,7 +2441,7 @@ static int __iw_set_genie(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2609,7 +2612,7 @@ static int __iw_get_genie(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2698,7 +2701,7 @@ static int __iw_get_encode(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2786,6 +2789,8 @@ static int __iw_get_rts_threshold(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); uint32_t status = 0; + ENTER_DEV(dev); + status = hdd_wlan_get_rts_threshold(pAdapter, wrqu); return status; @@ -2809,7 +2814,7 @@ static int __iw_set_rts_threshold(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2893,6 +2898,8 @@ static int __iw_get_frag_threshold(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); uint32_t status = 0; + ENTER_DEV(dev); + status = hdd_wlan_get_frag_threshold(pAdapter, wrqu); return status; @@ -2938,7 +2945,7 @@ static int __iw_set_frag_threshold(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3002,7 +3009,7 @@ static int __iw_get_power_mode(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3052,7 +3059,7 @@ static int __iw_set_power_mode(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3112,7 +3119,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3640,7 +3647,7 @@ static int __iw_set_nick(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3690,7 +3697,7 @@ static int __iw_get_nick(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); @@ -3748,7 +3755,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info, QDF_STATUS status = QDF_STATUS_SUCCESS; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3940,7 +3947,7 @@ static int __iw_get_encodeext(struct net_device *dev, int i, ret; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4043,7 +4050,7 @@ static int __iw_set_encodeext(struct net_device *dev, tCsrRoamSetKey setKey; uint32_t roamId = 0xFF; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4253,7 +4260,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4342,7 +4349,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4426,7 +4433,7 @@ static int __iw_set_mlme(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); -- cgit v1.2.3 From 651f9f2758e64b27c3701d5fbf2cf17b380d72b1 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 18:16:11 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in HostAP standard WEXT ioctls The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all HostAP-mode standard wireless extensions ioctl handlers to use this macro. Change-Id: I5cc2ee8c6fbde2778d4153a0dc3d5e509a3bb647 CRs-Fixed: 975414 --- core/hdd/src/wlan_hdd_hostapd.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index a93978b50ce1..6883af501202 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -3911,7 +3911,7 @@ int __iw_set_auth_hostap(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4003,7 +4003,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev, tCsrRoamSetKey setKey; int i; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4172,6 +4172,7 @@ static int __iw_set_ap_mlme(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { + ENTER_DEV(dev); return 0; } @@ -4215,7 +4216,7 @@ static int __iw_get_ap_rts_threshold(struct net_device *dev, int ret; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4266,7 +4267,7 @@ static int __iw_get_ap_frag_threshold(struct net_device *dev, hdd_context_t *hdd_ctx; int ret = 0; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4321,7 +4322,7 @@ static int __iw_get_ap_freq(struct net_device *dev, hdd_ap_ctx_t *pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pHostapdAdapter); int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4402,6 +4403,8 @@ static int __iw_get_mode(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; + ENTER_DEV(dev); + adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5248,7 +5251,7 @@ static int __iw_set_ap_genie(struct net_device *dev, uint8_t *genie = (uint8_t *)extra; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); -- cgit v1.2.3 From 0205031ea91b41d803821a054b8f74b24b80e777 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 18:40:28 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in HostAP private WEXT ioctls The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all HostAP-mode private wireless extensions ioctl handlers to use this macro. Change-Id: I746788be7dd9a0d5317b483908adde22d96413dc CRs-Fixed: 975414 --- core/hdd/src/wlan_hdd_hostapd.c | 51 ++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 6883af501202..682a53a34601 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2100,10 +2100,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev, hdd_adapter_t *pAdapter = (netdev_priv(dev)); hdd_context_t *pHddCtx; - if (pAdapter == NULL) { - hddLog(LOGE, FL("pAdapter is NULL!")); - return -EINVAL; - } + ENTER_DEV(dev); pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); @@ -2145,12 +2142,13 @@ static __iw_softap_get_ini_cfg(struct net_device *dev, hdd_context_t *pHddCtx; int ret = 0; + ENTER_DEV(dev); + pHddCtx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(pHddCtx); - if (ret != 0) { - hddLog(LOGE, FL("HDD context is not valid")); + if (ret != 0) return ret; - } + hddLog(LOG1, FL("Printing CLD global INI Config")); hdd_cfg_get_global_config(pHddCtx, extra, QCSAP_IOCTL_MAX_STR_LEN); wrqu->data.length = strlen(extra) + 1; @@ -2191,6 +2189,8 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev, int sub_cmd = value[0]; hdd_context_t *hdd_ctx; + ENTER_DEV(dev); + hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); if (ret != 0) @@ -2334,7 +2334,7 @@ static __iw_softap_setparam(struct net_device *dev, v_CONTEXT_t p_cds_context; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -2997,7 +2997,7 @@ static __iw_softap_getparam(struct net_device *dev, int ret; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3242,7 +3242,7 @@ int __iw_softap_modify_acl(struct net_device *dev, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3310,7 +3310,7 @@ static __iw_softap_getchannel(struct net_device *dev, int *value = (int *)extra; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3353,7 +3353,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev, struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER; struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; - ENTER(); + ENTER_DEV(dev); if (NULL == value) return -ENOMEM; @@ -3404,7 +3404,7 @@ static __iw_softap_set_tx_power(struct net_device *dev, struct qdf_mac_addr bssid; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3458,7 +3458,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev, /* maclist_index must be u32 to match userspace */ u32 maclist_index; - ENTER(); + ENTER_DEV(dev); /* * NOTE WELL: this is a "get" ioctl but it uses an even ioctl @@ -3558,7 +3558,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev, uint8_t *peerMacAddr; int ret; - ENTER(); + ENTER_DEV(dev); if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, @@ -3615,7 +3615,7 @@ static int __iw_get_char_setnone(struct net_device *dev, int sub_cmd = wrqu->data.flags; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3658,6 +3658,8 @@ static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev, hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter); int *value = (int *)extra; + ENTER_DEV(dev); + if (!capable(CAP_NET_ADMIN)) { hddLog(LOGE, FL("permission check failed")); return -EPERM; @@ -3702,6 +3704,8 @@ static int __iw_softap_get_channel_list(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; + ENTER_DEV(dev); + hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -3712,7 +3716,6 @@ static int __iw_softap_get_channel_list(struct net_device *dev, return -EIO; } wrqu->data.length = sizeof(tChannelListInfo); - ENTER(); if (eCSR_BAND_24 == curBand) { bandStartChannel = RF_CHAN_1; @@ -3774,7 +3777,7 @@ int __iw_get_genie(struct net_device *dev, uint32_t length = DOT11F_IE_RSN_MAX_LEN; uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN]; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -3846,7 +3849,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -4459,7 +4462,7 @@ __iw_softap_setwpsie(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, @@ -5045,7 +5048,7 @@ __iw_softap_stopbss(struct net_device *dev, QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); status = wlan_hdd_validate_context(hdd_ctx); @@ -5108,7 +5111,7 @@ __iw_softap_version(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5194,7 +5197,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -5341,7 +5344,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev, QDF_STATUS status = QDF_STATUS_E_FAILURE; int rc, valid, i; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter); valid = wlan_hdd_validate_context(hdd_ctx); -- cgit v1.2.3 From 6ee91eeeb336256e3120090a5e57a0c706c87e7b Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 11 Feb 2016 18:55:30 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in STA private WEXT ioctls The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all STA-mode private wireless extensions ioctl handlers to use this macro. Change-Id: I5a69d2a92c82bcf7931350e12ee7610748f5e3ab CRs-Fixed: 975414 --- core/hdd/src/wlan_hdd_ocb.c | 2 ++ core/hdd/src/wlan_hdd_wext.c | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 0a5c267ea6d9..9b439b71e89d 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -487,6 +487,8 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, int i, j; struct sir_ocb_config_channel *curr_chan; + ENTER_DEV(dev); + if (wlan_hdd_validate_context(WLAN_HDD_GET_CTX(adapter))) { hddLog(LOGE, FL("HDD context is not valid")); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index e8760a524111..2e1badca6a22 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3564,7 +3564,7 @@ static int __iw_get_linkspeed(struct net_device *dev, hdd_context_t *hdd_ctx; int rc, valid; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); valid = wlan_hdd_validate_context(hdd_ctx); @@ -4942,7 +4942,7 @@ static int __iw_setint_getnone(struct net_device *dev, int enable_pbm, enable_mp; QDF_STATUS status; - ENTER(); + ENTER_DEV(dev); INIT_COMPLETION(pWextState->completion_var); memset(&smeConfig, 0x00, sizeof(smeConfig)); @@ -6187,14 +6187,14 @@ static int __iw_setchar_getnone(struct net_device *dev, struct hdd_config *pConfig = hdd_ctx->config; struct iw_point s_priv_data; + ENTER_DEV(dev); + if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL("permission check failed")); return -EPERM; } - ENTER(); - ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; @@ -6327,7 +6327,7 @@ static int __iw_setnone_getint(struct net_device *dev, tSmeConfigParams smeConfig; hdd_context_t *hdd_ctx; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -6831,7 +6831,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev, int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -6938,7 +6938,7 @@ static int __iw_get_char_setnone(struct net_device *dev, pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); #endif - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -7444,7 +7444,7 @@ static int __iw_setnone_getnone(struct net_device *dev, int ret; int sub_cmd; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -7608,7 +7608,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, hdd_context_t *hdd_ctx; int ret, num_args; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8060,7 +8060,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8232,7 +8232,7 @@ static int __iw_del_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8296,7 +8296,7 @@ static int __iw_get_tspec(struct net_device *dev, struct iw_request_info *info, uint32_t handle; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8354,7 +8354,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8418,7 +8418,7 @@ static int __iw_set_host_offload(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8533,7 +8533,7 @@ static int __iw_set_keepalive_params(struct net_device *dev, hdd_context_t *hdd_ctx; int ret; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8751,7 +8751,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev, return -EPERM; } - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -8825,7 +8825,7 @@ static int __iw_get_statistics(struct net_device *dev, tCsrGlobalClassDStatsInfo *dStats = &(pAdapter->hdd_stats.ClassD_stat); int ret; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -9076,7 +9076,7 @@ static int __iw_set_pno(struct net_device *dev, */ static tSirPNOScanReq request; - ENTER(); + ENTER_DEV(dev); hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); @@ -9421,7 +9421,7 @@ static int __iw_set_band_config(struct net_device *dev, { int *value = (int *)extra; - ENTER(); + ENTER_DEV(dev); if (!capable(CAP_NET_ADMIN)) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, @@ -9455,6 +9455,8 @@ static int __iw_set_two_ints_getnone(struct net_device *dev, int ret; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); + ENTER_DEV(dev); + ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; -- cgit v1.2.3 From 1f61b61df47d48392e200f1afa0fb03de31774a4 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 12 Feb 2016 16:28:33 -0800 Subject: qcacld-3.0: Use ENTER_DEV() in cfg80211 vendor commands The ENTER_DEV macro was introduced to log both the function and device name when a function is entered. Update all cfg80211 vendor command handlers to use this macro. Change-Id: I3bb7112c6e5967577fa0f891e0b37ad7412bd2fc CRs-Fixed: 975826 --- core/hdd/src/wlan_hdd_cfg80211.c | 45 +++++++++++++++++++++++++++++------ core/hdd/src/wlan_hdd_ext_scan.c | 28 +++++++++++----------- core/hdd/src/wlan_hdd_memdump.c | 2 ++ core/hdd/src/wlan_hdd_nan.c | 2 +- core/hdd/src/wlan_hdd_ocb.c | 16 ++++++------- core/hdd/src/wlan_hdd_scan.c | 2 +- core/hdd/src/wlan_hdd_stats.c | 8 +++---- core/hdd/src/wlan_hdd_subnet_detect.c | 2 +- core/hdd/src/wlan_hdd_tdls.c | 6 +++-- 9 files changed, 73 insertions(+), 38 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index c1b235ce88b7..38f688602c7d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -671,6 +671,8 @@ static int __wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy, struct sk_buff *skb; uint32_t set = 0; + ENTER_DEV(wdev->netdev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -1100,7 +1102,7 @@ static int __is_driver_dfs_capable(struct wiphy *wiphy, int ret_val; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - ENTER(); + ENTER_DEV(wdev->netdev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -1413,6 +1415,8 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, * [QCA_WLAN_VENDOR_ATTR_ACS_CH_LIST] = { .type = NLA_NESTED }, */ + ENTER_DEV(ndev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -1800,7 +1804,7 @@ __wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy, uint32_t fset = 0; int ret; - ENTER(); + ENTER_DEV(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1941,7 +1945,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, QDF_STATUS status; int ret; - ENTER(); + ENTER_DEV(wdev->netdev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -2064,6 +2068,8 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, uint8_t feature_flags[(NUM_QCA_WLAN_VENDOR_FEATURES + 7) / 8] = {0}; hdd_context_t *hdd_ctx_ptr = wiphy_priv(wiphy); + ENTER_DEV(wdev->netdev); + ret_val = wlan_hdd_validate_context(hdd_ctx_ptr); if (ret_val) return ret_val; @@ -2187,6 +2193,8 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy, uint32_t buf_len = 0; int ret; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -2630,7 +2638,8 @@ static int __wlan_hdd_cfg80211_disable_dfs_chan_scan(struct wiphy *wiphy, int ret_val; uint32_t no_dfs_flag = 0; - ENTER(); + ENTER_DEV(dev); + ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) { @@ -2717,6 +2726,8 @@ static int __wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, hdd_context_t *hdd_ctx_ptr; int status; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -2806,6 +2817,8 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy, int status; struct sk_buff *reply_skb = NULL; + ENTER_DEV(wdev->netdev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -2903,6 +2916,8 @@ __wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy, uint32_t features; struct sk_buff *reply_skb = NULL; + ENTER_DEV(wdev->netdev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -3141,6 +3156,8 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u32 guard_time; QDF_STATUS status; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -3260,6 +3277,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_START_MAX + 1]; struct sir_wifi_start_log start_log; + ENTER_DEV(wdev->netdev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -3384,6 +3403,8 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy, struct nlattr *tb [QCA_WLAN_VENDOR_ATTR_WIFI_LOGGER_GET_RING_DATA_MAX + 1]; + ENTER_DEV(wdev->netdev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -3776,7 +3797,7 @@ __wlan_hdd_cfg80211_offloaded_packets(struct wiphy *wiphy, [PARAM_PERIOD] = { .type = NLA_U32 }, }; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3892,7 +3913,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy, [PARAM_MAX_RSSI] = { .type = NLA_S8 }, }; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) @@ -4081,6 +4102,8 @@ static int __wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_MAX + 1]; struct sk_buff *reply_skb; + ENTER_DEV(wdev->netdev); + ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return -EINVAL; @@ -4198,6 +4221,8 @@ static int __wlan_hdd_cfg80211_set_probable_oper_channel(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_PREFERRED_FREQ_LIST_MAX + 1]; uint32_t channel_hint; + ENTER_DEV(ndev); + ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return ret; @@ -4329,7 +4354,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, uint8_t final_rate_flags = 0; uint32_t freq; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -4514,6 +4539,8 @@ static int __wlan_hdd_cfg80211_set_ota_test(struct wiphy *wiphy, QDF_STATUS status; uint32_t current_roam_state; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; @@ -4620,6 +4647,8 @@ static int __wlan_hdd_cfg80211_txpower_scale(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TXPOWER_SCALE_MAX + 1]; uint8_t scale_value; + ENTER_DEV(dev); + ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return ret; @@ -4700,6 +4729,8 @@ static int __wlan_hdd_cfg80211_txpower_scale_decr_db(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TXPOWER_SCALE_DECR_DB_MAX + 1]; uint8_t scale_value; + ENTER_DEV(dev); + ret = wlan_hdd_validate_context(hdd_ctx); if (ret) return ret; diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index 8cd8b414f8c0..3303e1f59dd5 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -1716,7 +1716,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy, 1]; QDF_STATUS status; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1850,7 +1850,7 @@ static int __wlan_hdd_cfg80211_extscan_get_cached_results(struct wiphy *wiphy, int retval = 0; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1998,7 +1998,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy, int rem, retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -2195,7 +2195,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy, int rem, retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -2477,7 +2477,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, uint8_t i; int ret; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3142,7 +3142,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3352,7 +3352,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3479,7 +3479,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3604,7 +3604,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3816,7 +3816,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy, uint32_t num_networks, len; int ret_val; - ENTER(); + ENTER_DEV(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) @@ -4022,7 +4022,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy, uint32_t num_networks = 0; int ret; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -4138,7 +4138,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy, QDF_STATUS status; int ret; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (ret) @@ -4268,7 +4268,7 @@ __wlan_hdd_cfg80211_extscan_set_ssid_hotlist(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -4488,7 +4488,7 @@ __wlan_hdd_cfg80211_extscan_reset_ssid_hotlist(struct wiphy *wiphy, int retval; unsigned long rc; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c index ec3cb91631ac..568adfc99eaf 100644 --- a/core/hdd/src/wlan_hdd_memdump.c +++ b/core/hdd/src/wlan_hdd_memdump.c @@ -208,6 +208,8 @@ static int __wlan_hdd_cfg80211_get_fw_mem_dump(struct wiphy *wiphy, unsigned long rc; struct hdd_fw_dump_context *context; + ENTER_DEV(wdev->netdev); + status = wlan_hdd_validate_context(hdd_ctx); if (0 != status) { hddLog(LOGE, FL("HDD context is invalid")); diff --git a/core/hdd/src/wlan_hdd_nan.c b/core/hdd/src/wlan_hdd_nan.c index d95413da31bc..c88ac466d35a 100644 --- a/core/hdd/src/wlan_hdd_nan.c +++ b/core/hdd/src/wlan_hdd_nan.c @@ -62,7 +62,7 @@ static int __wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy, int ret_val; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - ENTER(); + ENTER_DEV(wdev->netdev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 9b439b71e89d..03fefbf3693c 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -796,7 +796,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, int rc = -EINVAL; uint8_t *mac_addr; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -991,7 +991,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, struct sir_ocb_utc *utc; int rc = -EINVAL; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1104,7 +1104,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, struct sir_ocb_timing_advert *timing_advert; int rc = -EINVAL; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1224,7 +1224,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, struct sir_ocb_timing_advert *timing_advert; int rc = -EINVAL; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1352,7 +1352,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy, struct sir_ocb_get_tsf_timer request = {0}; struct hdd_ocb_ctxt context = {0}; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1542,7 +1542,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, struct sir_dcc_get_stats request = {0}; struct hdd_ocb_ctxt context = {0}; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1709,7 +1709,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_MAX + 1]; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); @@ -1830,7 +1830,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, int rc = -EINVAL; struct hdd_ocb_ctxt context = {0}; - ENTER(); + ENTER_DEV(dev); if (wlan_hdd_validate_context(hdd_ctx)) { hddLog(LOGE, FL("HDD context is not valid")); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 1576b8e72110..15518b7d64e7 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1718,7 +1718,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, hdd_context_t *hdd_ctx = wiphy_priv(wiphy); int ret; - ENTER(); + ENTER_DEV(wdev->netdev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index c102b8809743..48b228458c02 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -1142,7 +1142,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = wiphy_priv(wiphy); - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1268,7 +1268,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); int status; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1399,7 +1399,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy, int status; struct sk_buff *temp_skbuff; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -1540,7 +1540,7 @@ static int __wlan_hdd_cfg80211_stats_ext_request(struct wiphy *wiphy, QDF_STATUS status; hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - ENTER(); + ENTER_DEV(dev); ret_val = wlan_hdd_validate_context(hdd_ctx); if (ret_val) diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 205865e159ad..04bfeba36711 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -80,7 +80,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, int ret; QDF_STATUS status; - ENTER(); + ENTER_DEV(dev); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 8f764fa688b4..3f525cf38fa1 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -3062,7 +3062,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy, uint32_t channel = 0; struct sk_buff *skb = NULL; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3241,7 +3241,7 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, tdls_req_params_t pReqMsg = { 0 }; int ret; - ENTER(); + ENTER_DEV(dev); if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); @@ -3362,6 +3362,8 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy, struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX + 1]; QDF_STATUS status; + ENTER_DEV(dev); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { hdd_err("Command not allowed in FTM mode"); return -EPERM; -- cgit v1.2.3 From e390be5cda04a4d165da4ab6708c92f7d2e6bfaf Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Mon, 8 Feb 2016 17:07:05 -0800 Subject: qcacld-3.0: Remove pending scans from HDD scan queue Pending scan entries are not cleared during SSR execution which is causing scan failure after SSR recovery. Remove all pendings scans from global scan queue and send scan complete callback to NL with abort flag set. Change-Id: Iebffcf56ace59a3ded4df8141caf639c55f0b278 CRs-Fixed: 966580 --- core/hdd/src/wlan_hdd_power.c | 3 ++- core/hdd/src/wlan_hdd_scan.c | 53 +++++++++++++++++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_scan.h | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index ed1e47a6ce3b..ceba3887ebf4 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -61,6 +61,7 @@ #include #include +#include #include #include #include @@ -1299,7 +1300,7 @@ QDF_STATUS hdd_wlan_shutdown(void) cds_set_recovery_in_progress(true); cds_clear_concurrent_session_count(); - + hdd_cleanup_scan_queue(pHddCtx); hdd_reset_all_adapters(pHddCtx); hdd_ipa_uc_ssr_deinit(); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 15518b7d64e7..08c45ccd4ba7 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -2418,3 +2418,56 @@ int hdd_vendor_put_ifindex(struct sk_buff *skb, int ifindex) return 0; } + + +/** + * hdd_cleanup_scan_queue() - remove entries in scan queue + * + * Removes entries in scan queue and sends scan complete event to NL + * Return: None + */ +void hdd_cleanup_scan_queue(hdd_context_t *hdd_ctx) +{ + struct hdd_scan_req *hdd_scan_req; + qdf_list_node_t *node = NULL; + struct cfg80211_scan_request *req; + hdd_adapter_t *adapter; + uint8_t source; + bool aborted = true; + + if (NULL == hdd_ctx) { + hdd_err("HDD context is Null"); + return; + } + + qdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); + while (!qdf_list_empty(&hdd_ctx->hdd_scan_req_q)) { + if (QDF_STATUS_SUCCESS != + qdf_list_remove_front(&hdd_ctx->hdd_scan_req_q, + &node)) { + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + hdd_err("Failed to remove scan request"); + return; + } + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + hdd_scan_req = (struct hdd_scan_req *)node; + req = hdd_scan_req->scan_request; + source = hdd_scan_req->source; + adapter = hdd_scan_req->adapter; + if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { + hdd_err("HDD adapter magic is invalid"); + } else { + if (NL_SCAN == source) + cfg80211_scan_done(req, aborted); + else + hdd_vendor_scan_callback(adapter, req, aborted); + hdd_info("removed Scan id: %d, req = %p", + hdd_scan_req->scan_id, req); + } + qdf_mem_free(hdd_scan_req); + qdf_spin_lock(&hdd_ctx->hdd_scan_req_q_lock); + } + qdf_spin_unlock(&hdd_ctx->hdd_scan_req_q_lock); + + return; +} diff --git a/core/hdd/src/wlan_hdd_scan.h b/core/hdd/src/wlan_hdd_scan.h index 05bc2754c354..5466d4a7cf86 100644 --- a/core/hdd/src/wlan_hdd_scan.h +++ b/core/hdd/src/wlan_hdd_scan.h @@ -68,5 +68,7 @@ int wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, int data_len); int hdd_vendor_put_ifindex(struct sk_buff *skb, int ifindex); +void hdd_cleanup_scan_queue(hdd_context_t *hdd_ctx); + #endif /* end #if !defined(WLAN_HDD_SCAN_H) */ -- cgit v1.2.3 From fade9b7887b88deeff66398230baa6fbffe7ee43 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Mon, 1 Feb 2016 12:41:54 -0800 Subject: qcacld3.0: Remove condition to start BSS in HT20 SAP is always coming up in HT20 on 2.4Ghz band even though hostapd configures HT40 mode. Remove condition to start BSS only in HT20 for 2.4Ghz channels. Change-Id: I1e4712ee49bbb079c81a2193e2130d2c846c865f CRs-Fixed: 970396 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 7b8149fd17d9..d9291d2d3e3a 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -822,16 +822,10 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) FL("cbMode %u"), sme_start_bss_req->cbMode); if (session->vhtCapability || session->htCapability) { chanwidth = sme_start_bss_req->vht_channel_width; - lim_log(mac_ctx, LOG1, FL("vht_channel_width %u"), - sme_start_bss_req->vht_channel_width); - if (channel_number <= RF_CHAN_14 && - chanwidth != eHT_CHANNEL_WIDTH_20MHZ) { - chanwidth = CH_WIDTH_20MHZ; - session->htSupportedChannelWidthSet = 0; - lim_log(mac_ctx, LOG1, - FL("Set chanwidth to 20Mhz, chan %d"), - channel_number); - } + lim_log(mac_ctx, LOG1, + FL("vht_channel_width %u htSupportedChannelWidthSet %d"), + sme_start_bss_req->vht_channel_width, + session->htSupportedChannelWidthSet); session->ch_width = chanwidth; if (session->htSupportedChannelWidthSet) { session->ch_center_freq_seg0 = -- cgit v1.2.3 From e6ddcaab1a5afad2fb510b870682709540cf655c Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Fri, 5 Feb 2016 16:50:18 -0800 Subject: qcacld-3.0: Proper mem allocation for lim, pre auth timers This is qcacld-2.0 to qcacld-3.0 propagation. Fix mem alloc for pre auth timer and add error handling for limInitMlm. Currently number of preauth timer is taken as cfg param and memory is allocated in bulk. In case the memory allocation fails, no error is returned from limInitMlm, which causes undefined behavior. Also preauth timers do not need contiguous memory allocation, so allocate an array of pointers instead of single chunk for pre auth timers. Change-Id: I92677aa9bb7970034630f4c6487fa9d196ccfb4c CRs-Fixed: 955557 --- core/mac/src/pe/include/lim_global.h | 2 +- core/mac/src/pe/lim/lim_api.c | 5 +++- core/mac/src/pe/lim/lim_assoc_utils.c | 23 +++++++-------- core/mac/src/pe/lim/lim_timer_utils.c | 16 ++++++++++- core/mac/src/pe/lim/lim_types.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 54 ++++++++++++----------------------- 6 files changed, 50 insertions(+), 52 deletions(-) diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 4a98ad38fe19..336a0e8b921a 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -330,7 +330,7 @@ typedef struct tLimPreAuthNode { /* Pre-authentication table definition */ typedef struct tLimPreAuthTable { uint32_t numEntry; - tpLimPreAuthNode pTable; + tLimPreAuthNode **pTable; } tLimPreAuthTable, *tpLimPreAuthTable; /* / Per STA context structure definition */ diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index 51bc6f0bde44..aaf5995062cd 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -541,7 +541,10 @@ tSirRetStatus lim_start(tpAniSirGlobal pMac) pMac->lim.gLimReturnAfterFirstMatch = 0; /* Initialize MLM state machine */ - lim_init_mlm(pMac); + if (eSIR_SUCCESS != lim_init_mlm(pMac)) { + lim_log(pMac, LOGE, FL("Init MLM failed.")); + return eSIR_FAILURE; + } /* By default return unique scan results */ pMac->lim.gLimReturnUniqueResults = true; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index e32676258a3c..f7616dea751a 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -4900,7 +4900,7 @@ void lim_init_pre_auth_timer_table(tpAniSirGlobal pMac, { uint32_t cfgValue; uint32_t authNodeIdx; - tpLimPreAuthNode pAuthNode = pPreAuthTimerTable->pTable; + tLimPreAuthNode **pAuthNode = pPreAuthTimerTable->pTable; /* Get AUTH_RSP Timers value */ @@ -4917,8 +4917,8 @@ void lim_init_pre_auth_timer_table(tpAniSirGlobal pMac, cfgValue = SYS_MS_TO_TICKS(cfgValue); for (authNodeIdx = 0; authNodeIdx < pPreAuthTimerTable->numEntry; - authNodeIdx++, pAuthNode++) { - if (tx_timer_create(pMac, &pAuthNode->timer, + authNodeIdx++) { + if (tx_timer_create(pMac, &(pAuthNode[authNodeIdx]->timer), "AUTH RESPONSE TIMEOUT", lim_auth_response_timer_handler, authNodeIdx, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { @@ -4928,10 +4928,9 @@ void lim_init_pre_auth_timer_table(tpAniSirGlobal pMac, authNodeIdx); return; } - pAuthNode->authNodeIdx = (uint8_t) authNodeIdx; - pAuthNode->fFree = 1; + pAuthNode[authNodeIdx]->authNodeIdx = (uint8_t) authNodeIdx; + pAuthNode[authNodeIdx]->fFree = 1; } - } /** ------------------------------------------------------------- @@ -4945,11 +4944,11 @@ tLimPreAuthNode *lim_acquire_free_pre_auth_node(tpAniSirGlobal pMac, tpLimPreAuthTable pPreAuthTimerTable) { uint32_t i; - tLimPreAuthNode *pTempNode = pPreAuthTimerTable->pTable; - for (i = 0; i < pPreAuthTimerTable->numEntry; i++, pTempNode++) { - if (pTempNode->fFree == 1) { - pTempNode->fFree = 0; - return pTempNode; + tLimPreAuthNode **pTempNode = pPreAuthTimerTable->pTable; + for (i = 0; i < pPreAuthTimerTable->numEntry; i++) { + if (pTempNode[i]->fFree == 1) { + pTempNode[i]->fFree = 0; + return pTempNode[i]; } } @@ -4976,7 +4975,7 @@ tLimPreAuthNode *lim_get_pre_auth_node_from_index(tpAniSirGlobal pMac, return NULL; } - return pAuthTable->pTable + authNodeIdx; + return pAuthTable->pTable[authNodeIdx]; } /* Util API to check if the channels supported by STA is within range */ diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 8f3b6605115f..6507497b6688 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -300,12 +300,24 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("could not retrieve mac preauth value")); pMac->lim.gLimPreAuthTimerTable.numEntry = cfgValue; pMac->lim.gLimPreAuthTimerTable.pTable = - qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode)); + qdf_mem_malloc(cfgValue * sizeof(tLimPreAuthNode *)); if (pMac->lim.gLimPreAuthTimerTable.pTable == NULL) { lim_log(pMac, LOGP, FL("AllocateMemory failed!")); goto err_timer; } + qdf_mem_zero(pMac->lim.gLimPreAuthTimerTable.pTable, + cfgValue * sizeof(tLimPreAuthNode *)); + + for (i = 0; i < cfgValue; i++) { + pMac->lim.gLimPreAuthTimerTable.pTable[i] = + qdf_mem_malloc(sizeof(tLimPreAuthNode)); + if (pMac->lim.gLimPreAuthTimerTable.pTable[i] == NULL) { + pMac->lim.gLimPreAuthTimerTable.numEntry = 0; + lim_log(pMac, LOGP, FL("AllocateMemory failed!")); + goto err_timer; + } + } lim_init_pre_auth_timer_table(pMac, &pMac->lim.gLimPreAuthTimerTable); PELOG1(lim_log(pMac, LOG1, @@ -425,6 +437,8 @@ err_timer: tx_timer_delete(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer); if (NULL != pMac->lim.gLimPreAuthTimerTable.pTable) { + for (i = 0; i < cfgValue; i++) + qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable[i]); qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); pMac->lim.gLimPreAuthTimerTable.pTable = NULL; } diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index ebe4374a0750..a8ed59362051 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -418,7 +418,7 @@ void lim_apply_configuration(tpAniSirGlobal, tpPESession); void lim_set_cfg_protection(tpAniSirGlobal pMac, tpPESession pesessionEntry); /* Function to Initialize MLM state machine on STA */ -void lim_init_mlm(tpAniSirGlobal); +tSirRetStatus lim_init_mlm(tpAniSirGlobal); /* Function to cleanup MLM state machine */ void lim_cleanup_mlm(tpAniSirGlobal); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 80bf76e2f644..512cf83bf60b 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -518,50 +518,36 @@ void lim_print_msg_name(tpAniSirGlobal pMac, uint16_t logLevel, uint32_t msgType } /** - * lim_init_mlm() - * - ***FUNCTION: - * This function is called by limProcessSmeMessages() to + * lim_init_mlm() - This function is called by limProcessSmeMessages() to * initialize MLM state machine on STA + * @pMac: Pointer to Global MAC structure * - ***PARAMS: - * - ***LOGIC: - * - ***ASSUMPTIONS: - * NA - * - ***NOTE: - * NA - * - * @param pMac Pointer to Global MAC structure - * @return None + * @Return: Status of operation */ -void lim_init_mlm(tpAniSirGlobal pMac) +tSirRetStatus lim_init_mlm(tpAniSirGlobal pMac) { uint32_t retVal; pMac->lim.gLimTimersCreated = 0; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, NO_SESSION, - pMac->lim.gLimMlmState)); - + MTRACE(mac_trace(pMac, TRACE_CODE_MLM_STATE, NO_SESSION, + pMac->lim.gLimMlmState)); - /* / Initialize number of pre-auth contexts */ + /* Initialize number of pre-auth contexts */ pMac->lim.gLimNumPreAuthContexts = 0; - /* / Initialize MAC based Authentication STA list */ + /* Initialize MAC based Authentication STA list */ lim_init_pre_auth_list(pMac); /* Create timers used by LIM */ retVal = lim_create_timers(pMac); - if (retVal == TX_SUCCESS) { - pMac->lim.gLimTimersCreated = 1; - } else { - lim_log(pMac, LOGP, - FL(" lim_create_timers Failed to create lim timers ")); + if (retVal != TX_SUCCESS) { + lim_log(pMac, LOGP, FL("lim_create_timers Failed")); + return eSIR_SUCCESS; } + + pMac->lim.gLimTimersCreated = 1; + return eSIR_SUCCESS; } /*** end lim_init_mlm() ***/ /** @@ -608,7 +594,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry, void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) { uint32_t n; - tLimPreAuthNode *pAuthNode; + tLimPreAuthNode **pAuthNode; #ifdef WLAN_FEATURE_11W uint32_t bss_entry; tpDphHashNode sta_ds = NULL; @@ -674,14 +660,10 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) /* Deactivate any Authentication response timers */ lim_delete_pre_auth_list(mac_ctx); + /* Delete any Auth rsp timers, which might have been started */ for (n = 0; n < mac_ctx->lim.gLimPreAuthTimerTable.numEntry; - n++, pAuthNode++) { - /* - * Delete any Authentication response - * timers, which might have been started. - */ - tx_timer_delete(&pAuthNode->timer); - } + n++) + tx_timer_delete(&pAuthNode[n]->timer); /* Deactivate and delete Hash Miss throttle timer */ tx_timer_deactivate(&lim_timer-> -- cgit v1.2.3 From 6186ff9600b519a4166ca6be5f002045e5f99efc Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Mon, 12 Oct 2015 14:33:53 -0700 Subject: qcacld-3.0: Reindent lim_fill_assoc_ind_wapi_info This patch fixes multi-level indentation for function lim_fill_assoc_ind_wapi_info() Change-Id: I438309425a82bb76c4c31d463b6cead7c661e27b CRs-Fixed: 824222 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 90 ++++++++++++----------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index 6611b7f98b58..d179c6a761d0 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1660,61 +1660,65 @@ static void lim_fill_assoc_ind_wapi_info(tpAniSirGlobal mac_ctx, * Return: None */ static void lim_fill_assoc_ind_vht_info(tpAniSirGlobal mac_ctx, - tpPESession session_entry, tpSirAssocReq assoc_req, - tpLimMlmAssocInd assoc_ind) + tpPESession session_entry, + tpSirAssocReq assoc_req, + tpLimMlmAssocInd assoc_ind) { uint8_t chan; if (session_entry->limRFBand == SIR_BAND_2_4_GHZ) { - if (session_entry->vhtCapability - && assoc_req->VHTCaps.present) + if (session_entry->vhtCapability && assoc_req->VHTCaps.present) assoc_ind->chan_info.info = MODE_11AC_VHT20; else if (session_entry->htCapability - && assoc_req->HTCaps.present) + && assoc_req->HTCaps.present) assoc_ind->chan_info.info = MODE_11NG_HT20; else assoc_ind->chan_info.info = MODE_11G; - } else { - if (session_entry->vhtCapability - && assoc_req->VHTCaps.present) { - if ((session_entry->ch_width > CH_WIDTH_40MHZ) - && assoc_req->HTCaps.supportedChannelWidthSet) { - chan = session_entry->ch_center_freq_seg0; - assoc_ind->chan_info.band_center_freq1 = - cds_chan_to_freq(chan); - assoc_ind->chan_info.info = MODE_11AC_VHT80; - } else if ((session_entry->ch_width == CH_WIDTH_40MHZ) - && assoc_req->HTCaps.supportedChannelWidthSet) { - assoc_ind->chan_info.info = MODE_11AC_VHT40; - if (session_entry->htSecondaryChannelOffset == - PHY_DOUBLE_CHANNEL_LOW_PRIMARY) - assoc_ind->chan_info.band_center_freq1 - += 10; - else - assoc_ind->chan_info.band_center_freq1 - -= 10; - } else { - assoc_ind->chan_info.info = MODE_11AC_VHT20; - } - } else if (session_entry->htCapability - && assoc_req->HTCaps.present) { - if ((session_entry->ch_width == CH_WIDTH_40MHZ) + return; + } + + if (session_entry->vhtCapability && assoc_req->VHTCaps.present) { + if ((session_entry->ch_width > CH_WIDTH_40MHZ) + && assoc_req->HTCaps.supportedChannelWidthSet) { + chan = session_entry->ch_center_freq_seg0; + assoc_ind->chan_info.band_center_freq1 = + cds_chan_to_freq(chan); + assoc_ind->chan_info.info = MODE_11AC_VHT80; + return; + } + + if ((session_entry->ch_width == CH_WIDTH_40MHZ) && assoc_req->HTCaps.supportedChannelWidthSet) { - assoc_ind->chan_info.info = MODE_11NA_HT40; - if (session_entry->htSecondaryChannelOffset == - PHY_DOUBLE_CHANNEL_LOW_PRIMARY) - assoc_ind->chan_info.band_center_freq1 - += 10; - else - assoc_ind->chan_info.band_center_freq1 - -= 10; - } else { - assoc_ind->chan_info.info = MODE_11NA_HT20; - } - } else { - assoc_ind->chan_info.info = MODE_11A; + assoc_ind->chan_info.info = MODE_11AC_VHT40; + if (session_entry->htSecondaryChannelOffset == + PHY_DOUBLE_CHANNEL_LOW_PRIMARY) + assoc_ind->chan_info.band_center_freq1 += 10; + else + assoc_ind->chan_info.band_center_freq1 -= 10; + return; + } + + assoc_ind->chan_info.info = MODE_11AC_VHT20; + return; + } + + if (session_entry->htCapability && assoc_req->HTCaps.present) { + if ((session_entry->ch_width == CH_WIDTH_40MHZ) + && assoc_req->HTCaps.supportedChannelWidthSet) { + assoc_ind->chan_info.info = MODE_11NA_HT40; + if (session_entry->htSecondaryChannelOffset == + PHY_DOUBLE_CHANNEL_LOW_PRIMARY) + assoc_ind->chan_info.band_center_freq1 += 10; + else + assoc_ind->chan_info.band_center_freq1 -= 10; + return; } + + assoc_ind->chan_info.info = MODE_11NA_HT20; + return; } + + assoc_ind->chan_info.info = MODE_11A; return; } -- cgit v1.2.3 From e3531947928d9dbe52e1290d3ca473d736482b38 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Tue, 12 Apr 2016 17:43:53 -0700 Subject: qcacld-3.0: Add support for changing FTM capability during runtime Add VENDOR subcmd to support changing of Fine Time Measurement capability dynamically. This command can be used by user space application to change FTM capability. FTM capability set by user space is intersected with capability set by firmware to compute new capability value. Change-Id: I5f3a57e66f2c6a9f3fa8acc7e9da8cb23cb766e3 CRs-Fixed: 968594 --- core/hdd/inc/wlan_hdd_main.h | 5 +++++ core/hdd/src/wlan_hdd_cfg80211.c | 13 +++++++++++++ core/hdd/src/wlan_hdd_cfg80211.h | 2 ++ core/hdd/src/wlan_hdd_main.c | 1 + core/sme/inc/sme_api.h | 3 +++ core/sme/src/common/sme_api.c | 24 ++++++++++++++++++++++++ 6 files changed, 48 insertions(+) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 776ec510a1f6..fb65d0a832bc 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1332,6 +1332,11 @@ struct hdd_context_s { * switch. */ struct mutex dfs_lock; + /* + * place to store FTM capab of target. This allows changing of FTM capab + * at runtime and intersecting it with target capab before updating. + */ + uint32_t fine_time_meas_cap_target; }; /*--------------------------------------------------------------------------- diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 38f688602c7d..98265e02b0ff 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -3154,6 +3154,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u32 modulated_dtim; u16 stats_avg_factor; u32 guard_time; + u32 ftm_capab; QDF_STATUS status; ENTER_DEV(dev); @@ -3176,6 +3177,18 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, return -EINVAL; } + if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT]) { + ftm_capab = nla_get_u32(tb[ + QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT]); + hdd_ctx->config->fine_time_meas_cap = + hdd_ctx->fine_time_meas_cap_target & ftm_capab; + sme_update_fine_time_measurement_capab(hdd_ctx->hHal, + hdd_ctx->config->fine_time_meas_cap); + hdd_info("FTM capability: user value: 0x%x, target value: 0x%x, final value: 0x%x", + ftm_capab, hdd_ctx->fine_time_meas_cap_target, + hdd_ctx->config->fine_time_meas_cap); + } + if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM]) { modulated_dtim = nla_get_u32( tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM]); diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 10962279f52d..7d05c1bd6e1b 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -1998,6 +1998,7 @@ enum qca_wlan_vendor_acs_hw_mode { * @QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM: modulated dtim * @QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR: stats avg. factor * @QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME: guard time + * @QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT: fine time measurement * @QCA_WLAN_VENDOR_ATTR_CONFIG_LAST: last config * @QCA_WLAN_VENDOR_ATTR_CONFIG_MAX: max config */ @@ -2006,6 +2007,7 @@ enum qca_wlan_vendor_config { QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM, QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR, QCA_WLAN_VENDOR_ATTR_CONFIG_GUARD_TIME, + QCA_WLAN_VENDOR_ATTR_CONFIG_FINE_TIME_MEASUREMENT, /* keep last */ QCA_WLAN_VENDOR_ATTR_CONFIG_LAST, QCA_WLAN_VENDOR_ATTR_CONFIG_MAX = diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 2a98cf201537..a9722789d714 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1330,6 +1330,7 @@ void hdd_update_tgt_cfg(void *context, void *param) hdd_update_tgt_vht_cap(hdd_ctx, &cfg->vht_cap); #endif /* #ifdef WLAN_FEATURE_11AC */ hdd_ctx->config->fine_time_meas_cap &= cfg->fine_time_measurement_cap; + hdd_ctx->fine_time_meas_cap_target = cfg->fine_time_measurement_cap; hdd_info(FL("fine_time_meas_cap: 0x%x"), hdd_ctx->config->fine_time_meas_cap); } diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index bf852a7231fc..d9b61b14d804 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1075,4 +1075,7 @@ static inline QDF_STATUS sme_send_egap_conf_params(uint32_t enable, return QDF_STATUS_E_NOSUPPORT; } #endif + +void sme_update_fine_time_measurement_capab(tHalHandle hal, uint32_t val); + #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1f9c74679010..6b0832eee9f0 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1347,6 +1347,30 @@ send_plm_start: } #endif +/** + * sme_update_fine_time_measurement_capab() - Update the FTM capabitlies from + * incoming val + * @hal: Handle for Hal layer + * @val: New FTM capability value + * + * Return: None + */ +void sme_update_fine_time_measurement_capab(tHalHandle hal, uint32_t val) +{ + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + mac_ctx->fine_time_meas_cap = val; + + if (val == 0) { + mac_ctx->rrm.rrmPEContext.rrmEnabledCaps.fine_time_meas_rpt = 0; + ((tpRRMCaps)mac_ctx->rrm.rrmSmeContext. + rrmConfig.rm_capability)->fine_time_meas_rpt = 0; + } else { + mac_ctx->rrm.rrmPEContext.rrmEnabledCaps.fine_time_meas_rpt = 1; + ((tpRRMCaps)mac_ctx->rrm.rrmSmeContext. + rrmConfig.rm_capability)->fine_time_meas_rpt = 1; + } +} + /*-------------------------------------------------------------------------- \brief sme_update_config() - Change configurations for all SME moduels -- cgit v1.2.3 From 99752a11b30a69128d0f750e4fc15d98a19b4789 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Tue, 12 Apr 2016 17:44:45 -0700 Subject: qcacld-3.0: Splits function lim_process_assoc_req_frame Splits function lim_process_assoc_req_frame into smaller sub functions Change-Id: Iaf21b0d157e910b740ac3288039465bac43507c4 CRs-Fixed: 824222 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 2300 ++++++++++++--------- 1 file changed, 1348 insertions(+), 952 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index d179c6a761d0..bd29fd130628 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -52,20 +52,19 @@ /** * lim_convert_supported_channels - Parses channel support IE - * - * @mac_ctx - A pointer to Global MAC structure - * @assoc_ind - A pointer to SME ASSOC/REASSOC IND - * @assoc_req - A pointer to ASSOC/REASSOC Request frame + * @mac_ctx: A pointer to Global MAC structure + * @assoc_ind: A pointer to SME ASSOC/REASSOC IND + * @assoc_req: A pointer to ASSOC/REASSOC Request frame * * This function is called by lim_process_assoc_req_frame() to * parse the channel support IE in the Assoc/Reassoc Request * frame, and send relevant information in the SME_ASSOC_IND * - * return None + * Return: None */ -static void -lim_convert_supported_channels(tpAniSirGlobal mac_ctx, - tpLimMlmAssocInd assoc_ind, tSirAssocReq *assoc_req) +static void lim_convert_supported_channels(tpAniSirGlobal mac_ctx, + tpLimMlmAssocInd assoc_ind, + tSirAssocReq *assoc_req) { uint16_t i, j, index = 0; uint8_t first_ch_no; @@ -136,8 +135,8 @@ lim_convert_supported_channels(tpAniSirGlobal mac_ctx, /** * lim_check_sta_in_pe_entries() - checks if sta exists in any dph tables. - * @mac_ctx: Pointer to Global MAC structure - * @hdr: A pointer to the MAC header + * @mac_ctx: Pointer to Global MAC structure + * @hdr: A pointer to the MAC header * * This function is called by lim_process_assoc_req_frame() to check if STA * entry already exists in any of the PE entries of the AP. If it exists, deauth @@ -181,962 +180,1047 @@ void lim_check_sta_in_pe_entries(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr) } /** - * lim_process_assoc_req_frame() - Process RE/ASSOC Request frame. - * @mac_ctx: Pointer to Global MAC structure - * @rx_pkt_info: A pointer to Buffer descriptor + associated PDUs - * @sub_type: Indicates whether it is Association Request(=0) - * or Reassociation Request(=1) frame - * @session: pe session entry + * lim_chk_sa_da() - checks source addr to destination addr of assoc req frame + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe * - * This function is called to process RE/ASSOC Request frame. + * Checks source addr to destination addr of assoc req frame * - * Return: void + * Return: true of no error, false otherwise */ -void -lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, - uint8_t sub_type, tpPESession session) +static bool lim_chk_sa_da(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, uint8_t sub_type) { - uint8_t update_ctx; - uint8_t *frm_body; - uint16_t peer_idx, temp; - uint32_t val; - int32_t frame_len; - tSirRetStatus status; - tpSirMacMgmtHdr hdr; - struct tLimPreAuthNode *sta_pre_auth_ctx; - tAniAuthType auth_type; - tSirMacCapabilityInfo local_cap; - tpDphHashNode sta_ds = NULL; - tpSirAssocReq assoc_req, tmp_assoc_req; - tLimMlmStates mlm_prev_state; - tDot11fIERSN dot11f_ie_rsn; - tDot11fIEWPA dot11f_ie_wpa; - uint32_t phy_mode; - tHalBitVal qos_mode; - tHalBitVal wsm_mode, wme_mode; - uint8_t *wps_ie = NULL; - uint8_t *ht_cap_ie = NULL; - tSirMacRateSet basic_rates; - uint8_t i = 0, j = 0; - bool pmf_connection = false; -#ifdef WLAN_FEATURE_11W - tPmfSaQueryTimerId timer_id; - uint32_t retry_interval; -#endif - uint16_t assoc_id = 0; - bool assoc_req_copied = false; - - lim_get_phy_mode(mac_ctx, &phy_mode, session); - - limGetQosMode(session, &qos_mode); - - hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); - frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); - - lim_log(mac_ctx, LOG1, - FL("Received %s Req Frame on sessionid: %d systemrole %d" - " limMlmState %d from: " MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - session->peSessionId, GET_LIM_SYSTEM_ROLE(session), - session->limMlmState, MAC_ADDR_ARRAY(hdr->sa)); - - if (LIM_IS_STA_ROLE(session) || - LIM_IS_BT_AMP_STA_ROLE(session)) { - lim_log(mac_ctx, LOGE, - FL("received unexpected ASSOC REQ on sessionid: %d " - "sys sub_type=%d for role=%d from: " MAC_ADDRESS_STR), - session->peSessionId, sub_type, - GET_LIM_SYSTEM_ROLE(session), - MAC_ADDR_ARRAY(hdr->sa)); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG3, - WMA_GET_RX_MPDU_DATA(rx_pkt_info), frame_len); - return; - } + int result = qdf_mem_cmp((uint8_t *) hdr->sa, + (uint8_t *) hdr->da, + (uint8_t) (sizeof(tSirMacAddr))); + if (0 != result) + return true; + + lim_log(mac_ctx, LOGE, FL("Assoc Req rejected: wlan.sa = wlan.da")); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; +} +/** + * lim_chk_tkip() - checks TKIP counter measure is active + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks TKIP counter measure is active + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_tkip(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, uint8_t sub_type) +{ /* - * If a STA is already present in DPH and it - * is initiating a Assoc re-transmit, do not - * process it. This can happen when first Assoc Req frame - * is received but ACK lost at STA side. The ACK for this - * dropped Assoc Req frame should be sent by HW. Host simply - * does not process it once the entry for the STA is already - * present in DPH. + * If TKIP counter measures active send Assoc Rsp frame to station + * with eSIR_MAC_MIC_FAILURE_REASON */ - sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa, &assoc_id, - &session->dph.dphHashTable); - if ((NULL != sta_ds)) { - if (hdr->fc.retry > 0) { - lim_log(mac_ctx, LOGE, - FL("STA is initiating Assoc Req after ACK lost. Do not process" - " sessionid: %d sys sub_type=%d for role=%d from: " - MAC_ADDRESS_STR), session->peSessionId, - sub_type, GET_LIM_SYSTEM_ROLE(session), - MAC_ADDR_ARRAY(hdr->sa)); - } else if (!sta_ds->rmfEnabled) { - /* Do this only for non PMF case. - * - * STA might have missed the assoc response, - * so it is sending assoc request frame again. - */ - lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_SUCCESS, - sta_ds->assocId, sta_ds->staAddr, - sta_ds->mlmStaContext.subType, sta_ds, - session); - lim_log(mac_ctx, LOGE, - FL("DUT already received an assoc request frame " - "and STA is sending another assoc req.So, do not " - "Process sessionid: %d sys sub_type=%d for role=%d " - "from: "MAC_ADDRESS_STR), - session->peSessionId, sub_type, - session->limSystemRole, - MAC_ADDR_ARRAY(hdr->sa)); - } - return; - } - - lim_check_sta_in_pe_entries(mac_ctx, hdr); - - /* Get pointer to Re/Association Request frame body */ - frm_body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); - - if (lim_is_group_addr(hdr->sa)) { - /* Received Re/Assoc Req frame from a BC/MC address */ - /* Log error and ignore it */ - lim_log(mac_ctx, LOGE, - FL("Received %s Req on sessionid: %d frame from a " - "BC/MC address" MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); - return; - } + if (!(session->bTkipCntrMeasActive && LIM_IS_AP_ROLE(session))) + return true; - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2, (uint8_t *) frm_body, frame_len); + lim_log(mac_ctx, LOGE, + FL("Assoc Req rejected: TKIP counter measure is active")); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_MIC_FAILURE_REASON, 1, + hdr->sa, sub_type, 0, session); + return false; +} - if (!qdf_mem_cmp((uint8_t *) hdr->sa, (uint8_t *) hdr->da, - (uint8_t) (sizeof(tSirMacAddr)))) { - lim_log(mac_ctx, LOGE, - FL("Rejected Assoc Req frame Since same mac as" - " SAP/GO")); - lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, - 1, hdr->sa, sub_type, 0, - session); - return; - } - /* If TKIP counter measures active send Assoc Rsp frame to station with eSIR_MAC_MIC_FAILURE_REASON */ - if (session->bTkipCntrMeasActive && - LIM_IS_AP_ROLE(session)) { - lim_log(mac_ctx, LOGE, FL("TKIP counter measure is active")); - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_MIC_FAILURE_REASON, - 1, hdr->sa, sub_type, - 0, session); - return; - } - /* Allocate memory for the Assoc Request frame */ - assoc_req = qdf_mem_malloc(sizeof(*assoc_req)); - if (NULL == assoc_req) { - lim_log(mac_ctx, LOGP, FL("Allocate Memory failed in assoc_req")); - return; - } - qdf_mem_set((void *)assoc_req, sizeof(*assoc_req), 0); +/** + * lim_chk_assoc_req_parse_error() - checks for error in frame parsing + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @frm_body: frame body + * @frame_len: frame len + * + * Checks for error in frame parsing + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_assoc_req_parse_error(tpAniSirGlobal mac_ctx, + tpSirMacMgmtHdr hdr, + tpPESession session, + tpSirAssocReq assoc_req, + uint8_t sub_type, uint8_t *frm_body, + uint8_t frame_len) +{ + tSirRetStatus status; - /* Parse Assoc Request frame */ if (sub_type == LIM_ASSOC) - status = - sir_convert_assoc_req_frame2_struct(mac_ctx, frm_body, frame_len, - assoc_req); + status = sir_convert_assoc_req_frame2_struct(mac_ctx, frm_body, + frame_len, assoc_req); else - status = - sir_convert_reassoc_req_frame2_struct(mac_ctx, frm_body, frame_len, - assoc_req); - - if (status != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL("Parse error AssocRequest, length=%d from " - MAC_ADDRESS_STR), frame_len, MAC_ADDR_ARRAY(hdr->sa)); - lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, - 1, hdr->sa, sub_type, 0, - session); - goto error; - } - - assoc_req->assocReqFrame = qdf_mem_malloc(frame_len); - if (NULL == assoc_req->assocReqFrame) { - lim_log(mac_ctx, LOGE, - FL("Unable to allocate memory for the assoc req, " - "length=%d from "), frame_len); - goto error; - } + status = sir_convert_reassoc_req_frame2_struct(mac_ctx, + frm_body, frame_len, assoc_req); + + if (status == eSIR_SUCCESS) + return true; + + lim_log(mac_ctx, LOGW, + FL("Assoc Req rejected: frame parsing error. source addr:" + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; +} - qdf_mem_copy((uint8_t *) assoc_req->assocReqFrame, - (uint8_t *) frm_body, frame_len); - assoc_req->assocReqFrameLength = frame_len; +/** + * lim_chk_capab() - checks for capab match + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @local_cap: local capabilities of SAP + * + * Checks for capab match + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_capab(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type, tSirMacCapabilityInfo *local_cap) +{ + uint16_t temp; if (cfg_get_capability_info(mac_ctx, &temp, session) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGP, FL("could not retrieve Capabilities")); - goto error; + return false; } - lim_copy_u16((uint8_t *) &local_cap, temp); + + lim_copy_u16((uint8_t *) local_cap, temp); if (lim_compare_capabilities(mac_ctx, assoc_req, - &local_cap, session) == false) { - lim_log(mac_ctx, LOGE, FL("local caps mismatch received caps")); - lim_log(mac_ctx, LOGE, FL("Received %s Req with unsupported " - "capabilities from" MAC_ADDRESS_STR), + local_cap, session) == false) { + lim_log(mac_ctx, LOGW, + FL("Rcvd %s Req with unsupported capab from" + MAC_ADDRESS_STR), (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); - /** + /* * Capabilities of requesting STA does not match with * local capabilities. Respond with 'unsupported capabilities' * status code. */ lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, - hdr->sa, sub_type, 0, session); - - goto error; + eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; } + return true; +} - update_ctx = false; - - if (lim_cmp_ssid(&assoc_req->ssId, session) != false) { - lim_log(mac_ctx, LOGE, - FL("Received %s Req with unmatched ssid ( Received" - " SSID: %.*s current SSID: %.*s ) from " - MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - assoc_req->ssId.length, assoc_req->ssId.ssId, - session->ssId.length, session->ssId.ssId, - MAC_ADDR_ARRAY(hdr->sa)); +/** + * lim_chk_ssid() - checks for SSID match + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for SSID match + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_ssid(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ + if (lim_cmp_ssid(&assoc_req->ssId, session) != true) + return true; - /** - * Received Re/Association Request with either - * Broadcast SSID OR with SSID that does not - * match with local one. - * Respond with unspecified status code. - */ - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_UNSPEC_FAILURE_STATUS, - 1, - hdr->sa, sub_type, 0, session); + lim_log(mac_ctx, LOGE, + FL("%s Req with ssid wrong(Rcvd: %.*s self: %.*s) from " + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + assoc_req->ssId.length, assoc_req->ssId.ssId, + session->ssId.length, session->ssId.ssId, + MAC_ADDR_ARRAY(hdr->sa)); - goto error; - } + /* + * Received Re/Association Request with either Broadcast SSID OR with + * SSID that does not match with local one. Respond with unspecified + * status code. + */ + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; +} - /*************************************************************** - ** Verify if the requested rates are available in supported rate - ** set or Extended rate set. Some APs are adding basic rates in - ** Extended rateset IE - ***************************************************************/ +/** + * lim_chk_rates() - checks for supported rates + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for supported rates + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_rates(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ + uint8_t i = 0, j = 0; + tSirMacRateSet basic_rates; + /* + * Verify if the requested rates are available in supported rate + * set or Extended rate set. Some APs are adding basic rates in + * Extended rateset IE + */ basic_rates.numRates = 0; - for (i = 0; - i < assoc_req->supportedRates.numRates - && (i < SIR_MAC_RATESET_EID_MAX); i++) { + for (i = 0; i < assoc_req->supportedRates.numRates + && (i < SIR_MAC_RATESET_EID_MAX); i++) { basic_rates.rate[i] = assoc_req->supportedRates.rate[i]; basic_rates.numRates++; } - for (j = 0; - (j < assoc_req->extendedRates.numRates) - && (i < SIR_MAC_RATESET_EID_MAX); i++, j++) { + for (j = 0; (j < assoc_req->extendedRates.numRates) + && (i < SIR_MAC_RATESET_EID_MAX); i++, j++) { basic_rates.rate[i] = assoc_req->extendedRates.rate[j]; basic_rates.numRates++; } - if (lim_check_rx_basic_rates(mac_ctx, basic_rates, session) == false) { - lim_log(mac_ctx, LOGE, FL("Received %s Req with unsupported " - "rates from" MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(hdr->sa)); - /** - * Requesting STA does not support ALL BSS basic - * rates. Respond with 'basic rates not supported' - * status code. - */ - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, - 1, - hdr->sa, sub_type, 0, session); - goto error; - } + if (lim_check_rx_basic_rates(mac_ctx, basic_rates, session) == true) + return true; + lim_log(mac_ctx, LOGW, + FL("Assoc Req rejected: unsupported rates, soruce addr: %s" + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); + /* + * Requesting STA does not support ALL BSS basic rates. Respond with + * 'basic rates not supported' status code. + */ + lim_send_assoc_rsp_mgmt_frame(mac_ctx, + eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, 1, + hdr->sa, sub_type, 0, session); + return false; +} + +/** + * lim_chk_11g_only() - checks for non 11g STA + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for non 11g STA + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_11g_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ if (LIM_IS_AP_ROLE(session) && (session->dot11mode == WNI_CFG_DOT11_MODE_11G_ONLY) && (assoc_req->HTCaps.present)) { lim_log(mac_ctx, LOGE, - FL("SOFTAP was in 11G only mode, rejecting legacy " - "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + FL("SOFTAP was in 11G only mode, rejecting legacy STA: " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, hdr->sa, sub_type, 0, - session); - goto error; - - } /* end if phy_mode == 11G_only */ + eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; + } + return true; +} +/** + * lim_chk_11n_only() - checks for non 11n STA + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for non 11n STA + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_11n_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ if (LIM_IS_AP_ROLE(session) && (session->dot11mode == WNI_CFG_DOT11_MODE_11N_ONLY) && (!assoc_req->HTCaps.present)) { lim_log(mac_ctx, LOGE, - FL("SOFTAP was in 11N only mode, rejecting legacy " - "STA : " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + FL("SOFTAP was in 11N only mode, rejecting legacy STA: " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(hdr->sa)); lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, hdr->sa, sub_type, 0, - session); - goto error; - } /* end if PhyMode == 11N_only */ + eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; + } + return true; +} +/** + * lim_chk_11ac_only() - checks for non 11ac STA + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for non 11ac STA + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_11ac_only(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ if (LIM_IS_AP_ROLE(session) && - (session->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY) && - (!assoc_req->VHTCaps.present)) { + (session->dot11mode == WNI_CFG_DOT11_MODE_11AC_ONLY) && + (!assoc_req->VHTCaps.present)) { lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, - 1, hdr->sa, sub_type, 0, - session); - lim_log(mac_ctx, LOGE, FL("SOFTAP was in 11AC only mode, reject")); - goto error; - } /* end if PhyMode == 11AC_only */ + eSIR_MAC_CAPABILITIES_NOT_SUPPORTED_STATUS, + 1, hdr->sa, sub_type, 0, session); + lim_log(mac_ctx, LOGE, + FL("SOFTAP was in 11AC only mode, reject")); + return false; + } + return true; +} - /* Spectrum Management (11h) specific checks */ +/** + * lim_process_for_spectrum_mgmt() - process assoc req for spectrum mgmt + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @local_cap: local capabilities of SAP + * + * Checks for SSID match + * + * process assoc req for spectrum mgmt + */ +static void +lim_process_for_spectrum_mgmt(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type, tSirMacCapabilityInfo local_cap) +{ if (local_cap.spectrumMgt) { tSirRetStatus status = eSIR_SUCCESS; - - /* If station is 11h capable, then it SHOULD send all mandatory + /* + * If station is 11h capable, then it SHOULD send all mandatory * IEs in assoc request frame. Let us verify that */ if (assoc_req->capabilityInfo.spectrumMgt) { - if (! - ((assoc_req->powerCapabilityPresent) + if (!((assoc_req->powerCapabilityPresent) && (assoc_req->supportedChannelsPresent))) { - /* One or more required information elements are missing, log the peers error */ + /* + * One or more required information elements are + * missing, log the peers error + */ if (!assoc_req->powerCapabilityPresent) { lim_log(mac_ctx, LOG1, - FL - ("LIM Info: Missing Power capability " - "IE in %s Req from " + FL("LIM Info: Missing Power capability IE in %s Req from " MAC_ADDRESS_STR), - (LIM_ASSOC == - sub_type) ? "Assoc" : "ReAssoc", + (LIM_ASSOC == sub_type) ? + "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); } if (!assoc_req->supportedChannelsPresent) { lim_log(mac_ctx, LOGW, - FL - ("LIM Info: Missing Supported channel " - "IE in %s Req from " + FL("LIM Info: Missing Supported channel IE in %s Req from " MAC_ADDRESS_STR), - (LIM_ASSOC == - sub_type) ? "Assoc" : "ReAssoc", + (LIM_ASSOC == sub_type) ? + "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); - } } else { /* Assoc request has mandatory fields */ status = - lim_is_dot11h_power_capabilities_in_range(mac_ctx, - assoc_req, - session); + lim_is_dot11h_power_capabilities_in_range( + mac_ctx, assoc_req, session); if (eSIR_SUCCESS != status) { lim_log(mac_ctx, LOGW, - FL("LIM Info: MinTxPower(STA) > " - "MaxTxPower(AP) in %s Req from " - MAC_ADDRESS_STR), - (LIM_ASSOC == - sub_type) ? "Assoc" : "ReAssoc", + FL("LIM Info: MinTxPower(STA) > MaxTxPower(AP) in %s Req from " + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? + "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); - } - status = - lim_is_dot11h_supported_channels_valid(mac_ctx, - assoc_req); + status = lim_is_dot11h_supported_channels_valid( + mac_ctx, assoc_req); if (eSIR_SUCCESS != status) { lim_log(mac_ctx, LOGW, - FL("LIM Info: wrong supported " - "channels (STA) in %s Req from " - MAC_ADDRESS_STR), - (LIM_ASSOC == - sub_type) ? "Assoc" : "ReAssoc", + FL("LIM Info: wrong supported channels (STA) in %s Req from " + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? + "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); - } /* IEs are valid, use them if needed */ } } /* if(assoc.capabilityInfo.spectrumMgt) */ else { - /* As per the capabiities, the spectrum management is not enabled on the station - * The AP may allow the associations to happen even if spectrum management is not - * allowed, if the transmit power of station is below the regulatory maximum + /* + * As per the capabiities, the spectrum management is + * not enabled on the station. The AP may allow the + * associations to happen even if spectrum management + * is not allowed, if the transmit power of station is + * below the regulatory maximum */ - /* TODO: presently, this is not handled. In the current implemetation, the AP would - * allow the station to associate even if it doesn't support spectrum management. + /* + * TODO: presently, this is not handled. In the current + * implemetation, the AP would allow the station to + * associate even if it doesn't support spectrum + * management. */ } } /* end of spectrum management related processing */ +} - if ((assoc_req->HTCaps.present) - && (lim_check_mcs_set(mac_ctx, assoc_req->HTCaps.supportedMCSSet) == - false)) { - lim_log(mac_ctx, LOGE, - FL("received %s req with unsupported" - "MCS Rate Set from " MAC_ADDRESS_STR), +/** + * lim_chk_mcs() - checks for supported MCS + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * + * Checks for supported MCS + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_mcs(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type) +{ + if ((assoc_req->HTCaps.present) && (lim_check_mcs_set(mac_ctx, + assoc_req->HTCaps.supportedMCSSet) == false)) { + lim_log(mac_ctx, LOGW, + FL("rcvd %s req with unsupported MCS Rate Set from " + MAC_ADDRESS_STR), (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", MAC_ADDR_ARRAY(hdr->sa)); - - /** - * Requesting STA does not support ALL BSS MCS basic Rate set rates. - * Spec does not define any status code for this scenario. + /* + * Requesting STA does not support ALL BSS MCS basic Rate set + * rates. Spec does not define any status code for this + * scenario. */ lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS, - 1, - hdr->sa, sub_type, 0, session); - - goto error; + eSIR_MAC_OUTSIDE_SCOPE_OF_SPEC_STATUS, + 1, hdr->sa, sub_type, 0, session); + return false; } + return true; +} - if (phy_mode == WNI_CFG_PHY_MODE_11G) { +/** + * lim_chk_is_11b_sta_supported() - checks if STA is 11b + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @phy_mode: phy mode + * + * Checks if STA is 11b + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_is_11b_sta_supported(tpAniSirGlobal mac_ctx, + tpSirMacMgmtHdr hdr, + tpPESession session, + tpSirAssocReq assoc_req, + uint8_t sub_type, uint32_t phy_mode) +{ + uint32_t cfg_11g_only; - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11G_ONLY_POLICY, &val) != - eSIR_SUCCESS) { + if (phy_mode == WNI_CFG_PHY_MODE_11G) { + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_11G_ONLY_POLICY, + &cfg_11g_only) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGP, - FL("could not retrieve 11g-only flag")); - goto error; + FL("couldn't get 11g-only flag")); + return false; } - if (!assoc_req->extendedRatesPresent && val) { - /** - * Received Re/Association Request from - * 11b STA when 11g only policy option - * is set. - * Reject with unspecified status code. + if (!assoc_req->extendedRatesPresent && cfg_11g_only) { + /* + * Received Re/Association Request from 11b STA when 11g + * only policy option is set. Reject with unspecified + * status code. */ lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, - 1, - hdr->sa, - sub_type, 0, session); + eSIR_MAC_BASIC_RATES_NOT_SUPPORTED_STATUS, + 1, hdr->sa, sub_type, 0, session); - lim_log(mac_ctx, LOGE, + lim_log(mac_ctx, LOGW, FL("Rejecting Re/Assoc req from 11b STA: ")); lim_print_mac_addr(mac_ctx, hdr->sa, LOGW); #ifdef WLAN_DEBUG mac_ctx->lim.gLim11bStaAssocRejectCount++; #endif - goto error; + return false; } } + return true; +} - /* Check for 802.11n HT caps compatibility; are HT Capabilities */ - /* turned on in lim? */ - if (session->htCapability) { - /* There are; are they turned on in the STA? */ - if (assoc_req->HTCaps.present) { - /* The station *does* support 802.11n HT capability... */ - - lim_log(mac_ctx, LOG1, FL("AdvCodingCap:%d ChaWidthSet:%d " - "PowerSave:%d greenField:%d " - "shortGI20:%d shortGI40:%d" - "txSTBC:%d rxSTBC:%d delayBA:%d" - "maxAMSDUsize:%d DSSS/CCK:%d " - "PSMP:%d stbcCntl:%d lsigTXProt:%d"), - assoc_req->HTCaps.advCodingCap, - assoc_req->HTCaps.supportedChannelWidthSet, - assoc_req->HTCaps.mimoPowerSave, - assoc_req->HTCaps.greenField, - assoc_req->HTCaps.shortGI20MHz, - assoc_req->HTCaps.shortGI40MHz, - assoc_req->HTCaps.txSTBC, - assoc_req->HTCaps.rxSTBC, - assoc_req->HTCaps.delayedBA, - assoc_req->HTCaps.maximalAMSDUsize, - assoc_req->HTCaps.dsssCckMode40MHz, - assoc_req->HTCaps.psmp, - assoc_req->HTCaps.stbcControlFrame, - assoc_req->HTCaps.lsigTXOPProtection); - - /* Make sure the STA's caps are compatible with our own: */ - /* 11.15.2 Support of DSSS/CCK in 40 MHz */ - /* the AP shall refuse association requests from an HT STA that has the DSSS/CCK */ - /* Mode in 40 MHz subfield set to 1; */ - } - } /* End if on HT caps turned on in lim. */ +/** + * lim_print_ht_cap() - prints HT caps + * @mac_ctx: pointer to Global MAC structure + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * + * Prints HT caps + * + * Return: void + */ +static void lim_print_ht_cap(tpAniSirGlobal mac_ctx, tpPESession session, + tpSirAssocReq assoc_req) +{ + if (!session->htCapability) + return; + + /* There are; are they turned on in the STA? */ + if (assoc_req->HTCaps.present) { + /* The station *does* support 802.11n HT capability... */ + lim_log(mac_ctx, LOG1, + FL("AdvCodingCap:%d ChaWidthSet:%d PowerSave:%d greenField:%d shortGI20:%d shortGI40:%d txSTBC:%d rxSTBC:%d delayBA:%d maxAMSDUsize:%d DSSS/CCK:%d PSMP:%d stbcCntl:%d lsigTXProt:%d"), + assoc_req->HTCaps.advCodingCap, + assoc_req->HTCaps.supportedChannelWidthSet, + assoc_req->HTCaps.mimoPowerSave, + assoc_req->HTCaps.greenField, + assoc_req->HTCaps.shortGI20MHz, + assoc_req->HTCaps.shortGI40MHz, + assoc_req->HTCaps.txSTBC, + assoc_req->HTCaps.rxSTBC, + assoc_req->HTCaps.delayedBA, + assoc_req->HTCaps.maximalAMSDUsize, + assoc_req->HTCaps.dsssCckMode40MHz, + assoc_req->HTCaps.psmp, + assoc_req->HTCaps.stbcControlFrame, + assoc_req->HTCaps.lsigTXOPProtection); + /* + * Make sure the STA's caps are compatible with our own: + * 11.15.2 Support of DSSS/CCK in 40 MHz the AP shall refuse + * association requests from an HT STA that has the DSSS/CCK + * Mode in 40 MHz subfield set to 1; + */ + } +} - /* Clear the buffers so that frame parser knows that there isn't a previously decoded IE in these buffers */ +/** + * lim_chk_n_process_wpa_rsn_ie() - wpa ie related checks + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @pmf_connection: flag indicating pmf connection + * + * wpa ie related checks + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_n_process_wpa_rsn_ie(tpAniSirGlobal mac_ctx, + tpSirMacMgmtHdr hdr, + tpPESession session, + tpSirAssocReq assoc_req, + uint8_t sub_type, bool *pmf_connection) +{ + uint8_t *wps_ie = NULL; + tDot11fIEWPA dot11f_ie_wpa; + tDot11fIERSN dot11f_ie_rsn; + tSirRetStatus status = eSIR_SUCCESS; + /* + * Clear the buffers so that frame parser knows that there isn't a + * previously decoded IE in these buffers + */ qdf_mem_set((uint8_t *) &dot11f_ie_rsn, sizeof(dot11f_ie_rsn), 0); qdf_mem_set((uint8_t *) &dot11f_ie_wpa, sizeof(dot11f_ie_wpa), 0); /* if additional IE is present, check if it has WscIE */ if (assoc_req->addIEPresent && assoc_req->addIE.length) - wps_ie = - limGetWscIEPtr(mac_ctx, assoc_req->addIE.addIEdata, - assoc_req->addIE.length); - else { - lim_log(mac_ctx, LOG1, FL("Assoc req addIEPresent = %d " - "addIE length = %d"), + wps_ie = limGetWscIEPtr(mac_ctx, assoc_req->addIE.addIEdata, + assoc_req->addIE.length); + else + lim_log(mac_ctx, LOG1, + FL("Assoc req addIEPresent = %d addIE length = %d"), assoc_req->addIEPresent, assoc_req->addIE.length); - } + /* when wps_ie is present, RSN/WPA IE is ignored */ if (wps_ie == NULL) { - /** check whether as RSN IE is present */ + /* check whether as RSN IE is present */ if (LIM_IS_AP_ROLE(session) && session->pLimStartBssReq->privacy && session->pLimStartBssReq->rsnIE.length) { - lim_log(mac_ctx, LOG1, + lim_log(mac_ctx, LOGE, FL("RSN enabled auth, Re/Assoc req from STA: " - MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(hdr->sa)); if (assoc_req->rsnPresent) { if (assoc_req->rsn.length) { /* Unpack the RSN IE */ dot11f_unpack_ie_rsn(mac_ctx, - &assoc_req->rsn. - info[0], - assoc_req->rsn.length, - &dot11f_ie_rsn); + &assoc_req->rsn.info[0], + assoc_req->rsn.length, + &dot11f_ie_rsn); - /* Check RSN version is supported or not */ + /* Check RSN version is supported */ if (SIR_MAC_OUI_VERSION_1 == - dot11f_ie_rsn.version) { - /* check the groupwise and pairwise cipher suites */ - status = lim_check_rx_rsn_ie_match(mac_ctx, - dot11f_ie_rsn, - session, - assoc_req-> - HTCaps. - present, - &pmf_connection); - + dot11f_ie_rsn.version) { + /* + * check the groupwise and + * pairwise cipher suites + */ + status = + lim_check_rx_rsn_ie_match( + mac_ctx, dot11f_ie_rsn, + session, + assoc_req->HTCaps.present, + pmf_connection); if (eSIR_SUCCESS != status) { - lim_log(mac_ctx, LOGE, - FL("RSN Mismatch." - "Rejecting Re/Assoc req from " - "STA: " - MAC_ADDRESS_STR), - MAC_ADDR_ARRAY - (hdr->sa)); - - /* some IE is not properly sent */ - /* received Association req frame with RSN IE but length is 0 */ - lim_send_assoc_rsp_mgmt_frame - (mac_ctx, status, 1, - hdr->sa, sub_type, - 0, session); - - goto error; - + lim_log(mac_ctx, LOGW, + FL("Re/Assoc rejected from: " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY( + hdr->sa)); + + /* + * some IE is not + * properly sent + * received Association + * req frame with RSN IE + * but length is 0 + */ + lim_send_assoc_rsp_mgmt_frame( + mac_ctx, + status, 1, + hdr->sa, + sub_type, 0, + session); + return false; } } else { - lim_log(mac_ctx, LOGE, - FL("RSN length not correct." - "Rejecting Re/Assoc req from " - "STA: " - MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(hdr-> - sa)); - - /* received Association req frame with RSN IE version wrong */ - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_UNSUPPORTED_RSN_IE_VERSION_STATUS, - 1, - hdr-> - sa, - sub_type, - 0, - session); - goto error; - + lim_log(mac_ctx, LOGW, + FL("Re/Assoc rejected from: " MAC_ADDRESS_STR), + MAC_ADDR_ARRAY( + hdr->sa)); + /* + * rcvd Assoc req frame with RSN + * IE version wrong + */ + lim_send_assoc_rsp_mgmt_frame( + mac_ctx, + eSIR_MAC_UNSUPPORTED_RSN_IE_VERSION_STATUS, + 1, hdr->sa, sub_type, 0, + session); + return false; } } else { lim_log(mac_ctx, LOGW, - FL - ("Rejecting Re/Assoc req from STA:" + FL("Re/Assoc rejected from: " MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); - /* received Association req frame with RSN IE but length is 0 */ + /* + * rcvd Assoc req frame with RSN IE but + * length is 0 + */ lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, - 1, - hdr->sa, - sub_type, 0, - session); - - goto error; - + eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, + 1, hdr->sa, sub_type, 0, + session); + return false; } } /* end - if(assoc_req->rsnPresent) */ if ((!assoc_req->rsnPresent) && assoc_req->wpaPresent) { /* Unpack the WPA IE */ if (assoc_req->wpa.length) { - dot11f_unpack_ie_wpa(mac_ctx, &assoc_req->wpa.info[4], /* OUI is not taken care */ - assoc_req->wpa.length, - &dot11f_ie_wpa); - /* check the groupwise and pairwise cipher suites */ - status = lim_check_rx_wpa_ie_match(mac_ctx, - dot11f_ie_wpa, - session, - assoc_req-> - HTCaps. - present); + /* OUI is not taken care */ + dot11f_unpack_ie_wpa(mac_ctx, + &assoc_req->wpa.info[4], + assoc_req->wpa.length, + &dot11f_ie_wpa); + /* + * check the groupwise and pairwise + * cipher suites + */ + status = lim_check_rx_wpa_ie_match( + mac_ctx, dot11f_ie_wpa, + session, + assoc_req->HTCaps.present); if (eSIR_SUCCESS != status) { lim_log(mac_ctx, LOGW, - FL("WPA IE mismatch" - "Rejecting Re/Assoc req from " - "STA: " - MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(hdr-> - sa)); - /* received Association req frame with WPA IE but mismatch */ - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - status, - 1, - hdr-> - sa, - sub_type, - 0, - session); - goto error; - + FL("Re/Assoc rejected from: " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY( + hdr->sa)); + /* + * rcvd Assoc req frame with WPA + * IE but mismatch + */ + lim_send_assoc_rsp_mgmt_frame( + mac_ctx, status, 1, + hdr->sa, sub_type, 0, + session); + return false; } } else { lim_log(mac_ctx, LOGW, - FL("WPA len incorrect." - "Rejecting Re/Assoc req from" - "STA: "MAC_ADDRESS_STR), + FL("Re/Assoc rejected from: " + MAC_ADDRESS_STR), MAC_ADDR_ARRAY(hdr->sa)); - /* received Association req frame with invalid WPA IE */ + /* + * rcvd Assoc req frame with invalid WPA + * IE + */ lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, - 1, - hdr->sa, - sub_type, 0, - session); - - goto error; + eSIR_MAC_INVALID_INFORMATION_ELEMENT_STATUS, + 1, hdr->sa, sub_type, 0, + session); + return false; } /* end - if(assoc_req->wpa.length) */ } /* end - if(assoc_req->wpaPresent) */ } - /* end of if(session->pLimStartBssReq->privacy - && session->pLimStartBssReq->rsnIE->length) */ - } /* end of if( ! assoc_req->wscInfo.present ) */ + /* + * end of if(session->pLimStartBssReq->privacy + * && session->pLimStartBssReq->rsnIE->length) + */ + } /* end of if( ! assoc_req->wscInfo.present ) */ else { lim_log(mac_ctx, LOG1, FL("Assoc req WSE IE is present")); } + return true; +} - /** - * Extract 'associated' context for STA, if any. - * This is maintained by DPH and created by LIM. - */ - sta_ds = - dph_lookup_hash_entry(mac_ctx, hdr->sa, &peer_idx, - &session->dph.dphHashTable); - - /* / Extract pre-auth context for the STA, if any. */ - sta_pre_auth_ctx = lim_search_pre_auth_list(mac_ctx, hdr->sa); - - if (sta_ds == NULL) { - /* / Requesting STA is not currently associated */ - if (pe_get_current_stas_count(mac_ctx) == - mac_ctx->lim.gLimAssocStaLimit) { - /** - * Maximum number of STAs that AP can handle reached. - * Send Association response to peer MAC entity - */ - lim_log(mac_ctx, LOGE, FL("Max Sta count reached : %d"), - mac_ctx->lim.maxStation); - lim_reject_association(mac_ctx, hdr->sa, - sub_type, false, - (tAniAuthType) 0, 0, - false, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); - - goto error; - } - /* / Check if STA is pre-authenticated. */ - if ((sta_pre_auth_ctx == NULL) || - (sta_pre_auth_ctx && - (sta_pre_auth_ctx->mlmState != - eLIM_MLM_AUTHENTICATED_STATE))) { - /** - * STA is not pre-authenticated yet requesting - * Re/Association before Authentication. - * OR STA is in the process of getting authenticated - * and sent Re/Association request. - * Send Deauthentication frame with 'prior - * authentication required' reason code. - */ - lim_send_deauth_mgmt_frame(mac_ctx, eSIR_MAC_STA_NOT_PRE_AUTHENTICATED_REASON, /* =9 */ - hdr->sa, session, false); - - lim_log(mac_ctx, LOGE, - FL("received %s req on sessionid: %d from STA " - "that does not have pre-auth context" - MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - session->peSessionId, - MAC_ADDR_ARRAY(hdr->sa)); - goto error; - } - /* / Delete 'pre-auth' context of STA */ - auth_type = sta_pre_auth_ctx->authType; - lim_delete_pre_auth_node(mac_ctx, hdr->sa); - - /* All is well. Assign AID (after else part) */ +/** + * lim_process_assoc_req_no_sta_ctx() - process assoc req for no sta ctx present + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @sta_pre_auth_ctx: sta pre auth context + * @sta_ds: station dph entry + * @auth_type: indicates security type + * + * Process assoc req for no sta ctx present + * + * Return: true of no error, false otherwise + */ +static bool lim_process_assoc_req_no_sta_ctx(tpAniSirGlobal mac_ctx, + tpSirMacMgmtHdr hdr, tpPESession session, + tpSirAssocReq assoc_req, uint8_t sub_type, + struct tLimPreAuthNode *sta_pre_auth_ctx, + tpDphHashNode sta_ds, tAniAuthType *auth_type) +{ + /* Requesting STA is not currently associated */ + if (pe_get_current_stas_count(mac_ctx) == + mac_ctx->lim.gLimAssocStaLimit) { + /* + * Maximum number of STAs that AP can handle reached. + * Send Association response to peer MAC entity + */ + lim_log(mac_ctx, LOGE, FL("Max Sta count reached : %d"), + mac_ctx->lim.maxStation); + lim_reject_association(mac_ctx, hdr->sa, sub_type, false, + (tAniAuthType) 0, 0, false, + (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); + return false; + } + /* Check if STA is pre-authenticated. */ + if ((sta_pre_auth_ctx == NULL) || (sta_pre_auth_ctx && + (sta_pre_auth_ctx->mlmState != eLIM_MLM_AUTHENTICATED_STATE))) { + /* + * STA is not pre-authenticated yet requesting Re/Association + * before Authentication. OR STA is in the process of getting + * authenticated and sent Re/Association request. Send + * Deauthentication frame with 'prior authentication required' + * reason code. + */ + lim_send_deauth_mgmt_frame(mac_ctx, + eSIR_MAC_STA_NOT_PRE_AUTHENTICATED_REASON, + hdr->sa, session, false); - } /* if (sta_ds == NULL) */ - else { - /* STA context does exist for this STA */ - - if (sta_ds->mlmStaContext.mlmState != - eLIM_MLM_LINK_ESTABLISHED_STATE) { - /** - * Requesting STA is in some 'transient' state? - * Ignore the Re/Assoc Req frame by incrementing - * debug counter & logging error. - */ - if (sub_type == LIM_ASSOC) { + lim_log(mac_ctx, LOGW, + FL("rcvd %s req, sessionid: %d, without pre-auth ctx" + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); + return false; + } + /* Delete 'pre-auth' context of STA */ + *auth_type = sta_pre_auth_ctx->authType; + lim_delete_pre_auth_node(mac_ctx, hdr->sa); + /* All is well. Assign AID (after else part) */ + return true; +} +/** + * lim_process_assoc_req_sta_ctx() - process assoc req for sta context present + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @sta_pre_auth_ctx: sta pre auth context + * @sta_ds: station dph entry + * @peer_idx: peer index + * @auth_type: indicates security type + * @update_ctx: indicates if STA context already exist + * + * Process assoc req for sta context present + * + * Return: true of no error, false otherwise + */ +static bool lim_process_assoc_req_sta_ctx(tpAniSirGlobal mac_ctx, + tpSirMacMgmtHdr hdr, tpPESession session, + tpSirAssocReq assoc_req, uint8_t sub_type, + struct tLimPreAuthNode *sta_pre_auth_ctx, + tpDphHashNode sta_ds, uint16_t peer_idx, + tAniAuthType *auth_type, uint8_t *update_ctx) +{ + /* STA context does exist for this STA */ + if (sta_ds->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) { + /* + * Requesting STA is in some 'transient' state? Ignore the + * Re/Assoc Req frame by incrementing debug counter & logging + * error. + */ + if (sub_type == LIM_ASSOC) { #ifdef WLAN_DEBUG - mac_ctx->lim.gLimNumAssocReqDropInvldState++; + mac_ctx->lim.gLimNumAssocReqDropInvldState++; #endif - lim_log(mac_ctx, LOGE, - FL("received Assoc req in state " - "%X from "), - sta_ds->mlmStaContext.mlmState); - } else { + lim_log(mac_ctx, LOG1, + FL("received Assoc req in state %X from "), + sta_ds->mlmStaContext.mlmState); + } else { #ifdef WLAN_DEBUG - mac_ctx->lim.gLimNumReassocReqDropInvldState++; + mac_ctx->lim.gLimNumReassocReqDropInvldState++; #endif - lim_log(mac_ctx, LOGE, - FL("received ReAssoc req in state %X" - " from "), - sta_ds->mlmStaContext.mlmState); - } - lim_print_mac_addr(mac_ctx, hdr->sa, LOG1); - lim_print_mlm_state(mac_ctx, LOG1, - (tLimMlmStates) sta_ds->mlmStaContext. - mlmState); - - goto error; - } /* if (sta_ds->mlmStaContext.mlmState != eLIM_MLM_LINK_ESTABLISHED_STATE) */ + lim_log(mac_ctx, LOG1, + FL("received ReAssoc req in state %X from "), + sta_ds->mlmStaContext.mlmState); + } + lim_print_mac_addr(mac_ctx, hdr->sa, LOG1); + lim_print_mlm_state(mac_ctx, LOG1, + (tLimMlmStates) sta_ds->mlmStaContext.mlmState); + return false; + } - /* STA sent association Request frame while already in - * 'associated' state */ + /* STA sent assoc req frame while already in 'associated' state */ #ifdef WLAN_FEATURE_11W - lim_log(mac_ctx, LOG1, - FL - ("Re/Assoc request from station that is already associated")); - lim_log(mac_ctx, LOG1, FL("PMF enabled %d, SA Query state %d"), - sta_ds->rmfEnabled, sta_ds->pmfSaQueryState); - if (sta_ds->rmfEnabled) { - switch (sta_ds->pmfSaQueryState) { - - /* start SA Query procedure, respond to Association Request */ - /* with try again later */ - case DPH_SA_QUERY_NOT_IN_PROGRESS: - /* - * We should reset the retry counter before we start - * the SA query procedure, otherwise in next set of SA query - * procedure we will end up using the stale value. - */ - sta_ds->pmfSaQueryRetryCount = 0; - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_TRY_AGAIN_LATER, - 1, hdr->sa, sub_type, - sta_ds, session); - lim_send_sa_query_request_frame(mac_ctx, - (uint8_t *) & - (sta_ds-> - pmfSaQueryCurrentTransId), - hdr->sa, - session); - sta_ds->pmfSaQueryStartTransId = - sta_ds->pmfSaQueryCurrentTransId; - sta_ds->pmfSaQueryCurrentTransId++; - - /* start timer for SA Query retry */ - if (tx_timer_activate(&sta_ds->pmfSaQueryTimer) - != TX_SUCCESS) { - lim_log(mac_ctx, LOGE, - FL - ("PMF SA Query timer activation failed!")); - goto error; - } - - sta_ds->pmfSaQueryState = - DPH_SA_QUERY_IN_PROGRESS; - goto error; - - /* SA Query procedure still going, respond to Association */ - /* Request with try again later */ - case DPH_SA_QUERY_IN_PROGRESS: - lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_TRY_AGAIN_LATER, - 1, hdr->sa, sub_type, - 0, session); - goto error; - - /* SA Query procedure timed out, accept Association Request */ - /* normally */ - case DPH_SA_QUERY_TIMED_OUT: - sta_ds->pmfSaQueryState = - DPH_SA_QUERY_NOT_IN_PROGRESS; - break; + lim_log(mac_ctx, LOG1, + FL("Re/Assoc request from station that is already associated")); + lim_log(mac_ctx, LOG1, FL("PMF enabled %d, SA Query state %d"), + sta_ds->rmfEnabled, sta_ds->pmfSaQueryState); + if (sta_ds->rmfEnabled) { + switch (sta_ds->pmfSaQueryState) { + /* + * start SA Query procedure, respond to Association Request with + * try again later + */ + case DPH_SA_QUERY_NOT_IN_PROGRESS: + /* + * We should reset the retry counter before we start + * the SA query procedure, otherwise in next set of SA + * query procedure we will end up using the stale value. + */ + sta_ds->pmfSaQueryRetryCount = 0; + lim_send_assoc_rsp_mgmt_frame(mac_ctx, + eSIR_MAC_TRY_AGAIN_LATER, 1, hdr->sa, + sub_type, sta_ds, session); + lim_send_sa_query_request_frame(mac_ctx, + (uint8_t *) &(sta_ds->pmfSaQueryCurrentTransId), + hdr->sa, session); + sta_ds->pmfSaQueryStartTransId = + sta_ds->pmfSaQueryCurrentTransId; + sta_ds->pmfSaQueryCurrentTransId++; + + /* start timer for SA Query retry */ + if (tx_timer_activate(&sta_ds->pmfSaQueryTimer) + != TX_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("PMF SA Query timer start failed!")); + return false; } + sta_ds->pmfSaQueryState = DPH_SA_QUERY_IN_PROGRESS; + return false; + /* + * SA Query procedure still going, respond to Association + * Request with try again later + */ + case DPH_SA_QUERY_IN_PROGRESS: + lim_send_assoc_rsp_mgmt_frame(mac_ctx, + eSIR_MAC_TRY_AGAIN_LATER, 1, + hdr->sa, sub_type, 0, session); + return false; + + /* + * SA Query procedure timed out, accept Association + * Request normally + */ + case DPH_SA_QUERY_TIMED_OUT: + sta_ds->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS; + break; } + } #endif - /* no change in the capability so drop the frame */ - if ((true != qdf_mem_cmp(&sta_ds->mlmStaContext.capabilityInfo, - &assoc_req->capabilityInfo, - sizeof(tSirMacCapabilityInfo))) - && (sub_type == LIM_ASSOC)) { - lim_log(mac_ctx, LOGE, - FL(" Received Assoc req in state %X STAid=%d"), - sta_ds->mlmStaContext.mlmState, peer_idx); - goto error; + /* no change in the capability so drop the frame */ + if ((sub_type == LIM_ASSOC) && + (0 == qdf_mem_cmp(&sta_ds->mlmStaContext.capabilityInfo, + &assoc_req->capabilityInfo, + sizeof(tSirMacCapabilityInfo)))) { + lim_log(mac_ctx, LOGE, + FL(" Received Assoc req in state %X STAid=%d"), + sta_ds->mlmStaContext.mlmState, peer_idx); + return false; + } else { + /* + * STA sent Re/association Request frame while already in + * 'associated' state. Update STA capabilities and send + * Association response frame with same AID + */ + lim_log(mac_ctx, LOG1, + FL("Rcvd Assoc req from STA already connected")); + sta_ds->mlmStaContext.capabilityInfo = + assoc_req->capabilityInfo; + if (sta_pre_auth_ctx && (sta_pre_auth_ctx->mlmState == + eLIM_MLM_AUTHENTICATED_STATE)) { + /* STA has triggered pre-auth again */ + *auth_type = sta_pre_auth_ctx->authType; + lim_delete_pre_auth_node(mac_ctx, hdr->sa); } else { - /** - * STA sent Re/association Request frame while already in - * 'associated' state. Update STA capabilities and - * send Association response frame with same AID - */ - lim_log(mac_ctx, LOG1, - FL("Recved Assoc req from STA already connected" - " UpdateConext")); - sta_ds->mlmStaContext.capabilityInfo = - assoc_req->capabilityInfo; - if (sta_pre_auth_ctx - && (sta_pre_auth_ctx->mlmState == - eLIM_MLM_AUTHENTICATED_STATE)) { - /* / STA has triggered pre-auth again */ - auth_type = sta_pre_auth_ctx->authType; - lim_delete_pre_auth_node(mac_ctx, hdr->sa); - } else - auth_type = sta_ds->mlmStaContext.authType; - - update_ctx = true; - if (dph_init_sta_state - (mac_ctx, hdr->sa, peer_idx, true, - &session->dph.dphHashTable) - == NULL) { - lim_log(mac_ctx, LOGE, - FL("could not Init STAid=%d"), peer_idx); - goto error; - } + *auth_type = sta_ds->mlmStaContext.authType; } - goto sendIndToSme; - } /* end if (lookup for STA in perStaDs fails) */ - /* check if sta is allowed per QoS AC rules */ + *update_ctx = true; + if (dph_init_sta_state(mac_ctx, hdr->sa, peer_idx, true, + &session->dph.dphHashTable) == NULL) { + lim_log(mac_ctx, LOGE, + FL("could not Init STAid=%d"), peer_idx); + return false; + } + } + return true; +} + +/** + * lim_chk_wmm() - wmm related checks + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @qos_mode: qos mode + * + * wmm related checks + * + * Return: true of no error, false otherwise + */ +static bool lim_chk_wmm(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type, tHalBitVal qos_mode) +{ + tHalBitVal wme_mode; limGetWmeMode(session, &wme_mode); if ((qos_mode == eHAL_SET) || (wme_mode == eHAL_SET)) { - /* for a qsta, check if the requested Traffic spec */ - /* is admissible */ - /* for a non-qsta check if the sta can be admitted */ + /* + * for a qsta, check if the requested Traffic spec is admissible + * for a non-qsta check if the sta can be admitted + */ if (assoc_req->addtsPresent) { - uint8_t tspec_idx = 0; /* index in the sch tspec table. */ + uint8_t tspecIdx = 0; if (lim_admit_control_add_ts(mac_ctx, hdr->sa, - &(assoc_req->addtsReq), - &(assoc_req->qosCapability), 0, false, NULL, - &tspec_idx, session) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, + &(assoc_req->addtsReq), + &(assoc_req->qosCapability), + 0, false, NULL, &tspecIdx, session) != + eSIR_SUCCESS) { + lim_log(mac_ctx, LOGW, FL("AdmitControl: TSPEC rejected")); lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_QAP_NO_BANDWIDTH_REASON, - 1, hdr->sa, sub_type, - 0, session); + eSIR_MAC_QAP_NO_BANDWIDTH_REASON, + 1, hdr->sa, sub_type, 0, session); #ifdef WLAN_DEBUG mac_ctx->lim.gLimNumAssocReqDropACRejectTS++; #endif - goto error; + return false; } } else if (lim_admit_control_add_sta(mac_ctx, hdr->sa, false) - != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, FL("AdmitControl: Sta rejected")); + != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGW, + FL("AdmitControl: Sta rejected")); lim_send_assoc_rsp_mgmt_frame(mac_ctx, - eSIR_MAC_QAP_NO_BANDWIDTH_REASON, - 1, - hdr->sa, - sub_type, 0, session); + eSIR_MAC_QAP_NO_BANDWIDTH_REASON, 1, + hdr->sa, sub_type, 0, session); #ifdef WLAN_DEBUG mac_ctx->lim.gLimNumAssocReqDropACRejectSta++; #endif - goto error; + return false; } /* else all ok */ lim_log(mac_ctx, LOG1, FL("AdmitControl: Sta OK!")); } + return true; +} - /** - * STA is Associated ! - */ - lim_log(mac_ctx, LOGE, - FL("Received %s Req successful from " MAC_ADDRESS_STR), - (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", - MAC_ADDR_ARRAY(hdr->sa)); - - /** - * AID for this association will be same as the peer Index used in DPH table. - * Assign unused/least recently used peer Index from perStaDs. - * NOTE: lim_assign_peer_idx() assigns AID values ranging - * between 1 - cfg_item(WNI_CFG_ASSOC_STA_LIMIT) - */ - - peer_idx = lim_assign_peer_idx(mac_ctx, session); - - if (!peer_idx) { - /* Could not assign AID */ - /* Reject association */ - lim_log(mac_ctx, LOGE, - FL("PeerIdx not avaialble. Reject associaton")); - lim_reject_association(mac_ctx, hdr->sa, - sub_type, true, auth_type, - peer_idx, false, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); - - goto error; - } - - /** - * Add an entry to hash table maintained by DPH module - */ - - sta_ds = - dph_add_hash_entry(mac_ctx, hdr->sa, peer_idx, - &session->dph.dphHashTable); - - if (sta_ds == NULL) { - /* Could not add hash table entry at DPH */ - lim_log(mac_ctx, LOGE, - FL("could not add hash entry at DPH for aid=%d, MacAddr:" - MAC_ADDRESS_STR), peer_idx, MAC_ADDR_ARRAY(hdr->sa)); - - /* Release AID */ - lim_release_peer_idx(mac_ctx, peer_idx, session); - - lim_reject_association(mac_ctx, hdr->sa, - sub_type, true, auth_type, peer_idx, false, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); - - goto error; - } - -sendIndToSme: +/** + * lim_update_sta_ds() - updates ds dph entry + * @mac_ctx: pointer to Global MAC structure + * @hdr: pointer to the MAC head + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @sta_ds: station dph entry + * @tmp_assoc_req: pointer to tmp ASSOC/REASSOC Request frame + * @auth_type: indicates security type + * @assoc_req_copied: boolean to indicate if assoc req was copied to tmp above + * @peer_idx: peer index + * @qos_mode: qos mode + * @pmf_connection: flag indicating pmf connection + * + * Updates ds dph entry + * + * Return: true of no error, false otherwise + */ +static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, + tpPESession session, tpSirAssocReq assoc_req, + uint8_t sub_type, tpDphHashNode sta_ds, + tpSirAssocReq tmp_assoc_req, + tAniAuthType auth_type, + bool *assoc_req_copied, uint16_t peer_idx, + tHalBitVal qos_mode, bool pmf_connection) +{ + uint32_t cfg_short_gi_20, cfg_short_gi_40; + tHalBitVal wme_mode, wsm_mode; + uint8_t *ht_cap_ie = NULL; +#ifdef WLAN_FEATURE_11W + tPmfSaQueryTimerId timer_id; + uint32_t retry_interval; +#endif /* - * check here if the parsedAssocReq already - * pointing to the assoc_req and free it before - * assigning this new assoc_req + * check here if the parsedAssocReq already pointing to the assoc_req + * and free it before assigning this new assoc_req */ if (session->parsedAssocReq != NULL) { tmp_assoc_req = session->parsedAssocReq[sta_ds->assocId]; @@ -1151,7 +1235,7 @@ sendIndToSme: } session->parsedAssocReq[sta_ds->assocId] = assoc_req; - assoc_req_copied = true; + *assoc_req_copied = true; } sta_ds->mlmStaContext.htCapability = assoc_req->HTCaps.present; @@ -1163,7 +1247,10 @@ sendIndToSme: sta_ds->qos.addts = assoc_req->addtsReq; sta_ds->qos.capability = assoc_req->qosCapability; sta_ds->versionPresent = 0; - /* short slot and short preamble should be updated before doing limaddsta */ + /* + * short slot and short preamble should be updated before doing + * limaddsta + */ sta_ds->shortPreambleEnabled = (uint8_t) assoc_req->capabilityInfo.shortPreamble; sta_ds->shortSlotTimeEnabled = @@ -1173,22 +1260,26 @@ sendIndToSme: sta_ds->mlmStaContext.authType = auth_type; sta_ds->staType = STA_ENTRY_PEER; - /* TODO: If listen interval is more than certain limit, reject the association. */ - /* Need to check customer requirements and then implement. */ + /* + * TODO: If listen interval is more than certain limit, reject the + * association. Need to check customer requirements and then implement. + */ sta_ds->mlmStaContext.listenInterval = assoc_req->listenInterval; sta_ds->mlmStaContext.capabilityInfo = assoc_req->capabilityInfo; - /* The following count will be used to knock-off the station if it doesn't - * come back to receive the buffered data. The AP will wait for numTimSent number - * of beacons after sending TIM information for the station, before assuming that - * the station is no more associated and disassociates it + /* + * The following count will be used to knock-off the station if it + * doesn't come back to receive the buffered data. The AP will wait + * for numTimSent number of beacons after sending TIM information for + * the station, before assuming that the station is no more associated + * and disassociates it */ - /** timWaitCount is used by PMM for monitoring the STA's in PS for LINK*/ + /* timWaitCount used by PMM for monitoring the STA's in PS for LINK */ sta_ds->timWaitCount = (uint8_t) GET_TIM_WAIT_COUNT(assoc_req->listenInterval); - /** Initialise the Current successful MPDU's tranfered to this STA count as 0 */ + /* Init the Current successful MPDU's tranfered to this STA count = 0 */ sta_ds->curTxMpduCnt = 0; if (IS_DOT11_MODE_HT(session->dot11mode) && @@ -1204,34 +1295,32 @@ sendIndToSme: sta_ds->htMaxRxAMpduFactor = assoc_req->HTCaps.maxRxAMPDUFactor; sta_ds->htMIMOPSState = assoc_req->HTCaps.mimoPowerSave; - /* assoc_req will be copied to session->parsedAssocReq - * later - */ + /* assoc_req will be copied to session->parsedAssocReq later */ ht_cap_ie = ((uint8_t *) &assoc_req->HTCaps) + 1; /* check whether AP is enabled with shortGI */ - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_20MHZ, &val) != - eSIR_SUCCESS) { + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_20MHZ, + &cfg_short_gi_20) != eSIR_SUCCESS) { PELOGE(lim_log(mac_ctx, LOGE, FL("could not retrieve shortGI 20Mhz CFG"));) - goto error; + return false; } - if (val) { + if (cfg_short_gi_20) { sta_ds->htShortGI20Mhz = - (uint8_t)assoc_req->HTCaps.shortGI20MHz; + (uint8_t)assoc_req->HTCaps.shortGI20MHz; } else { /* Unset htShortGI20Mhz in ht_caps*/ *ht_cap_ie &= ~(1 << SIR_MAC_HT_CAP_SHORTGI20MHZ_S); sta_ds->htShortGI20Mhz = 0; } - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_40MHZ, &val) != - eSIR_SUCCESS) { + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_SHORT_GI_40MHZ, + &cfg_short_gi_40) != eSIR_SUCCESS) { PELOGE(lim_log(mac_ctx, LOGE, FL("could not retrieve shortGI 40Mhz CFG"));) - goto error; + return false; } - if (val) { + if (cfg_short_gi_40) { sta_ds->htShortGI40Mhz = (uint8_t)assoc_req->HTCaps.shortGI40MHz; } else { @@ -1249,38 +1338,39 @@ sendIndToSme: * width support is disabled then secondary channel will be zero */ sta_ds->htSecondaryChannelOffset = - (sta_ds->htSupportedChannelWidthSet) ? session-> - htSecondaryChannelOffset : 0; + (sta_ds->htSupportedChannelWidthSet) ? + session->htSecondaryChannelOffset : 0; #ifdef WLAN_FEATURE_11AC if (assoc_req->operMode.present) { sta_ds->vhtSupportedChannelWidthSet = (uint8_t) ((assoc_req->operMode.chanWidth == - eHT_CHANNEL_WIDTH_80MHZ) ? - WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ : - WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ); + eHT_CHANNEL_WIDTH_80MHZ) ? + WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ : + WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ); sta_ds->htSupportedChannelWidthSet = - (uint8_t) (assoc_req->operMode. - chanWidth ? eHT_CHANNEL_WIDTH_40MHZ : - eHT_CHANNEL_WIDTH_20MHZ); + (uint8_t) (assoc_req->operMode.chanWidth ? + eHT_CHANNEL_WIDTH_40MHZ : + eHT_CHANNEL_WIDTH_20MHZ); } else if (assoc_req->VHTCaps.present) { - /* Check if STA has enabled it's channel bonding mode. */ - /* If channel bonding mode is enabled, we decide based on SAP's current configuration. */ - /* else, we set it to VHT20. */ + /* + * Check if STA has enabled it's channel bonding mode. + * If channel bonding mode is enabled, we decide based + * on SAP's current configuration. else, we set it to + * VHT20. */ sta_ds->vhtSupportedChannelWidthSet = - (uint8_t) ((sta_ds->htSupportedChannelWidthSet == - eHT_CHANNEL_WIDTH_20MHZ) ? - WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ : - session->ch_width - 1); + (uint8_t) ((sta_ds->htSupportedChannelWidthSet + == eHT_CHANNEL_WIDTH_20MHZ) ? + WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ : + session->ch_width - 1); sta_ds->htMaxRxAMpduFactor = assoc_req->VHTCaps.maxAMPDULenExp; } /* Lesser among the AP and STA bandwidth of operation. */ sta_ds->htSupportedChannelWidthSet = (sta_ds->htSupportedChannelWidthSet < - session->htSupportedChannelWidthSet) ? - sta_ds->htSupportedChannelWidthSet : - session->htSupportedChannelWidthSet; - + session->htSupportedChannelWidthSet) ? + sta_ds->htSupportedChannelWidthSet : + session->htSupportedChannelWidthSet; #endif sta_ds->baPolicyFlag = 0xFF; sta_ds->htLdpcCapable = @@ -1308,43 +1398,38 @@ sendIndToSme: else sta_ds->vht_su_bfee_capable = 0; } + #ifdef WLAN_FEATURE_11AC - if (lim_populate_matching_rate_set(mac_ctx, - sta_ds, - &(assoc_req->supportedRates), - &(assoc_req->extendedRates), - assoc_req->HTCaps.supportedMCSSet, - session, &assoc_req->VHTCaps) - != eSIR_SUCCESS) + if (lim_populate_matching_rate_set(mac_ctx, sta_ds, + &(assoc_req->supportedRates), + &(assoc_req->extendedRates), + assoc_req->HTCaps.supportedMCSSet, + session, &assoc_req->VHTCaps) != eSIR_SUCCESS) #else - - if (lim_populate_matching_rate_set(mac_ctx, - sta_ds, - &(assoc_req->supportedRates), - &(assoc_req->extendedRates), - assoc_req->HTCaps.supportedMCSSet, - session) != eSIR_SUCCESS) + if (lim_populate_matching_rate_set(mac_ctx, sta_ds, + &(assoc_req->supportedRates), + &(assoc_req->extendedRates), + assoc_req->HTCaps.supportedMCSSet, + session) != eSIR_SUCCESS) #endif { /* Could not update hash table entry at DPH with rateset */ lim_log(mac_ctx, LOGE, - FL - ("could not update hash entry at DPH for aid=%d, MacAddr: " - MAC_ADDRESS_STR), peer_idx, MAC_ADDR_ARRAY(hdr->sa)); + FL("Couldn't update hash entry for aid=%d, MacAddr: " + MAC_ADDRESS_STR), + peer_idx, MAC_ADDR_ARRAY(hdr->sa)); /* Release AID */ lim_release_peer_idx(mac_ctx, peer_idx, session); lim_reject_association(mac_ctx, hdr->sa, - sub_type, true, auth_type, peer_idx, true, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); + sub_type, true, auth_type, peer_idx, true, + (tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); if (session->parsedAssocReq) - assoc_req = - session->parsedAssocReq[sta_ds->assocId]; - goto error; + assoc_req = session->parsedAssocReq[sta_ds->assocId]; + return false; } #ifdef WLAN_FEATURE_11AC if (assoc_req->operMode.present) { @@ -1352,11 +1437,11 @@ sendIndToSme: } else { sta_ds->vhtSupportedRxNss = ((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2) - == MCSMAPMASK2x2) ? 1 : 2; + == MCSMAPMASK2x2) ? 1 : 2; } #endif - /* / Add STA context at MAC HW (BMU, RHP & TFP) */ + /* Add STA context at MAC HW (BMU, RHP & TFP) */ sta_ds->qosMode = false; sta_ds->lleEnabled = false; @@ -1373,31 +1458,30 @@ sendIndToSme: sta_ds->wmeEnabled = true; sta_ds->qosMode = true; limGetWsmMode(session, &wsm_mode); - /* WMM_APSD - WMM_SA related processing should be separate; WMM_SA and WMM_APSD - can coexist */ + /* + * WMM_APSD - WMM_SA related processing should be separate; + * WMM_SA and WMM_APSD can coexist + */ if (assoc_req->WMMInfoStation.present) { /* check whether AP supports or not */ if (LIM_IS_AP_ROLE(session) && - (session->apUapsdEnable == 0) && - (assoc_req->WMMInfoStation.acbe_uapsd || - assoc_req->WMMInfoStation.acbk_uapsd || - assoc_req->WMMInfoStation.acvo_uapsd || - assoc_req->WMMInfoStation.acvi_uapsd)) { - - /** - * Received Re/Association Request from - * STA when UPASD is not supported. + (session->apUapsdEnable == 0) && + (assoc_req->WMMInfoStation.acbe_uapsd || + assoc_req->WMMInfoStation.acbk_uapsd || + assoc_req->WMMInfoStation.acvo_uapsd || + assoc_req->WMMInfoStation.acvi_uapsd)) { + /* + * Rcvd Re/Assoc Req from STA when UPASD is + * not supported. */ lim_log(mac_ctx, LOGE, - FL("AP do not support UAPSD so reply " - "to STA accordingly")); + FL("UAPSD not supported, reply accordingly")); /* update UAPSD and send it to LIM to add STA */ sta_ds->qos.capability.qosInfo.acbe_uapsd = 0; sta_ds->qos.capability.qosInfo.acbk_uapsd = 0; sta_ds->qos.capability.qosInfo.acvo_uapsd = 0; sta_ds->qos.capability.qosInfo.acvi_uapsd = 0; sta_ds->qos.capability.qosInfo.maxSpLen = 0; - } else { /* update UAPSD and send it to LIM to add STA */ sta_ds->qos.capability.qosInfo.acbe_uapsd = @@ -1414,7 +1498,6 @@ sendIndToSme: } if (assoc_req->wsmCapablePresent && (wsm_mode == eHAL_SET)) sta_ds->wsmEnabled = true; - } /* Re/Assoc Response frame to requesting STA */ sta_ds->mlmStaContext.subType = sub_type; @@ -1425,32 +1508,30 @@ sendIndToSme: timer_id.fields.sessionId = session->peSessionId; timer_id.fields.peerIdx = peer_idx; if (wlan_cfg_get_int(mac_ctx, WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL, - &retry_interval) != eSIR_SUCCESS) { + &retry_interval) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, - FL - ("Could not retrieve PMF SA Query retry interval value")); - lim_reject_association(mac_ctx, hdr->sa, sub_type, true, auth_type, - peer_idx, false, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); - goto error; + FL("Couldn't get PMF SA Query retry interval value")); + lim_reject_association(mac_ctx, hdr->sa, sub_type, true, + auth_type, peer_idx, false, + (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); + return false; } if (WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STAMIN > retry_interval) { retry_interval = WNI_CFG_PMF_SA_QUERY_RETRY_INTERVAL_STADEF; } - if (tx_timer_create(mac_ctx, &sta_ds->pmfSaQueryTimer, "PMF SA Query timer", - lim_pmf_sa_query_timer_handler, timer_id.value, - SYS_MS_TO_TICKS((retry_interval * 1024) / 1000), - 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(mac_ctx, LOGE, FL("could not create PMF SA Query timer")); - lim_reject_association(mac_ctx, hdr->sa, - sub_type, true, auth_type, - peer_idx, false, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); - goto error; + if (tx_timer_create(mac_ctx, &sta_ds->pmfSaQueryTimer, + "PMF SA Query timer", lim_pmf_sa_query_timer_handler, + timer_id.value, + SYS_MS_TO_TICKS((retry_interval * 1024) / 1000), + 0, TX_NO_ACTIVATE) != TX_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("could not create PMF SA Query timer")); + lim_reject_association(mac_ctx, hdr->sa, sub_type, + true, auth_type, peer_idx, false, + (tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); + return false; } #endif @@ -1461,125 +1542,145 @@ sendIndToSme: sta_ds->timingMeasCap = 0; PELOG1(lim_log(mac_ctx, LOG1, FL("ExtCap not present"));) } + return true; +} - /* BTAMP: Storing the parsed assoc request in the session array */ - if (session->parsedAssocReq) - session->parsedAssocReq[sta_ds->assocId] = assoc_req; - assoc_req_copied = true; - - /* BTAMP: If STA context already exist (ie. update_ctx = 1) - * for this STA, then we should delete the old one, and add - * the new STA. This is taken care of in the lim_del_sta() routine. +/** + * lim_update_sta_ctx() - add/del sta depending on connection state machine + * @mac_ctx: pointer to Global MAC structure + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sub_type: Assoc(=0) or Reassoc(=1) Requestframe + * @sta_ds: station dph entry + * @update_ctx: indicates if STA context already exist + * + * Checks for SSID match + * + * Return: true of no error, false otherwise + */ +static bool lim_update_sta_ctx(tpAniSirGlobal mac_ctx, tpPESession session, + tpSirAssocReq assoc_req, uint8_t sub_type, + tpDphHashNode sta_ds, uint8_t update_ctx) +{ + tLimMlmStates mlm_prev_state; + /* + * BTAMP: If STA context already exist (ie. update_ctx = 1) for this STA + * then we should delete the old one, and add the new STA. This is taken + * care of in the lim_del_sta() routine. * - * Prior to BTAMP, we were setting this flag so that when - * PE receives SME_ASSOC_CNF, and if this flag is set, then - * PE shall delete the old station and then add. But now in - * BTAMP, we're directly adding station before waiting for - * SME_ASSOC_CNF, so we can do this now. + * Prior to BTAMP, we were setting this flag so that when PE receives + * SME_ASSOC_CNF, and if this flag is set, then PE shall delete the old + * station and then add. But now in BTAMP, we're directly adding station + * before waiting for SME_ASSOC_CNF, so we can do this now. */ - if (!update_ctx) { + if (!(update_ctx)) { sta_ds->mlmStaContext.updateContext = 0; - /* BTAMP: Add STA context at HW - issue WMA_ADD_STA_REQ to HAL */ + /* + * BTAMP: Add STA context at HW - issue WMA_ADD_STA_REQ to HAL + */ if (lim_add_sta(mac_ctx, sta_ds, false, session) != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, FL("could not Add STA with assocId=%d"), sta_ds->assocId); lim_reject_association(mac_ctx, sta_ds->staAddr, - sta_ds->mlmStaContext.subType, - true, - sta_ds->mlmStaContext.authType, - sta_ds->assocId, true, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); + sta_ds->mlmStaContext.subType, true, + sta_ds->mlmStaContext.authType, + sta_ds->assocId, true, + (tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); if (session->parsedAssocReq) - assoc_req = session->parsedAssocReq[ - sta_ds->assocId]; - goto error; + assoc_req = + session->parsedAssocReq[sta_ds->assocId]; + return false; } } else { sta_ds->mlmStaContext.updateContext = 1; - mlm_prev_state = sta_ds->mlmStaContext.mlmState; - /* As per the HAL/FW needs the reassoc req need not be calling lim_del_sta */ + /* + * As per the HAL/FW needs the reassoc req need not be calling + * lim_del_sta + */ if (sub_type != LIM_REASSOC) { - /* we need to set the mlmState here in order differentiate in lim_del_sta. */ + /* + * we need to set the mlmState here in order + * differentiate in lim_del_sta. + */ sta_ds->mlmStaContext.mlmState = eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE; - if (lim_del_sta(mac_ctx, sta_ds, true, session) != - eSIR_SUCCESS) { + if (lim_del_sta(mac_ctx, sta_ds, true, session) + != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, - FL - ("could not DEL STA with assocId=%d staId %d"), + FL("Couldn't DEL STA, assocId=%d staId %d"), sta_ds->assocId, sta_ds->staIndex); lim_reject_association(mac_ctx, sta_ds->staAddr, - sta_ds->mlmStaContext. - subType, true, - sta_ds->mlmStaContext. - authType, sta_ds->assocId, - true, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - session); + sta_ds->mlmStaContext.subType, true, + sta_ds->mlmStaContext.authType, + sta_ds->assocId, true, + (tSirResultCodes) + eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); /* Restoring the state back. */ sta_ds->mlmStaContext.mlmState = mlm_prev_state; if (session->parsedAssocReq) - assoc_req = - session->parsedAssocReq[ - sta_ds->assocId]; - goto error; + assoc_req = session->parsedAssocReq[ + sta_ds->assocId]; + return false; } } else { - /* mlmState is changed in lim_add_sta context */ - /* use the same AID, already allocated */ - if (lim_add_sta(mac_ctx, sta_ds, false, session) != - eSIR_SUCCESS) { + /* + * mlmState is changed in lim_add_sta context use the + * same AID, already allocated + */ + if (lim_add_sta(mac_ctx, sta_ds, false, session) + != eSIR_SUCCESS) { lim_log(mac_ctx, LOGE, - FL("Could not AddSta with assocId= %d" - "staId %d"), - sta_ds->assocId, sta_ds->staIndex); + FL("UPASD not supported, REASSOC Failed")); lim_reject_association(mac_ctx, sta_ds->staAddr, - sta_ds->mlmStaContext. - subType, true, - sta_ds->mlmStaContext. - authType, sta_ds->assocId, - true, - (tSirResultCodes) - eSIR_MAC_WME_REFUSED_STATUS, - session); + sta_ds->mlmStaContext.subType, true, + sta_ds->mlmStaContext.authType, + sta_ds->assocId, true, + (tSirResultCodes) + eSIR_MAC_WME_REFUSED_STATUS, + session); /* Restoring the state back. */ sta_ds->mlmStaContext.mlmState = mlm_prev_state; if (session->parsedAssocReq) - assoc_req = - session->parsedAssocReq[ + assoc_req = session->parsedAssocReq[ sta_ds->assocId]; - goto error; + return false; } - } - - } - - /* AddSta is sucess here */ - if (LIM_IS_AP_ROLE(session) && - IS_DOT11_MODE_HT(session->dot11mode) && - assoc_req->HTCaps.present && assoc_req->wmeInfoPresent) { - /** Update in the HAL Station Table for the Update of the Protection Mode */ - lim_post_sm_state_update(mac_ctx, sta_ds->staIndex, - sta_ds->htMIMOPSState, - sta_ds->staAddr, - session->smeSessionId); } + return true; +} - return; - -error: +/** + * lim_process_assoc_cleanup() - frees up resources used in function + * lim_process_assoc_req_frame() + * @mac_ctx: pointer to Global MAC structure + * @session: pointer to pe session entry + * @assoc_req: pointer to ASSOC/REASSOC Request frame + * @sta_ds: station dph entry + * @tmp_assoc_req: pointer to tmp ASSOC/REASSOC Request frame + * @assoc_req_copied: boolean to indicate if assoc req was copied to tmp above + * + * Frees up resources used in function lim_process_assoc_req_frame + * + * Return: void + */ +static void lim_process_assoc_cleanup(tpAniSirGlobal mac_ctx, + tpPESession session, + tpSirAssocReq assoc_req, + tpDphHashNode sta_ds, + tpSirAssocReq tmp_assoc_req, + bool *assoc_req_copied) +{ if (assoc_req != NULL) { if (assoc_req->assocReqFrame) { qdf_mem_free(assoc_req->assocReqFrame); @@ -1589,7 +1690,7 @@ error: qdf_mem_free(assoc_req); /* to avoid double free */ - if (assoc_req_copied && session->parsedAssocReq) + if (*assoc_req_copied && session->parsedAssocReq) session->parsedAssocReq[sta_ds->assocId] = NULL; } @@ -1601,17 +1702,312 @@ error: session->parsedAssocReq[sta_ds->assocId]; if (tmp_assoc_req != NULL) { if (tmp_assoc_req->assocReqFrame) { - qdf_mem_free(tmp_assoc_req-> - assocReqFrame); + qdf_mem_free( + tmp_assoc_req->assocReqFrame); tmp_assoc_req->assocReqFrame = NULL; tmp_assoc_req->assocReqFrameLength = 0; } qdf_mem_free(tmp_assoc_req); - session-> - parsedAssocReq[sta_ds->assocId] = NULL; + session->parsedAssocReq[sta_ds->assocId] = NULL; } } } +} + +/** + * lim_process_assoc_req_frame() - Process RE/ASSOC Request frame. + * @mac_ctx: Pointer to Global MAC structure + * @rx_pkt_info: A pointer to Buffer descriptor + associated PDUs + * @sub_type: Indicates whether it is Association Request(=0) or Reassociation + * Request(=1) frame + * @session: pe session entry + * + * This function is called to process RE/ASSOC Request frame. + * + * @Return: void + */ +void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, + uint8_t sub_type, tpPESession session) +{ + bool pmf_connection = false, assoc_req_copied = false; + uint8_t update_ctx, *frm_body; + uint16_t peer_idx, assoc_id = 0; + int32_t frame_len; + uint32_t phy_mode; + tHalBitVal qos_mode; + tpSirMacMgmtHdr hdr; + struct tLimPreAuthNode *sta_pre_auth_ctx; + tAniAuthType auth_type; + tSirMacCapabilityInfo local_cap; + tpDphHashNode sta_ds = NULL; + tpSirAssocReq assoc_req, tmp_assoc_req; + + lim_get_phy_mode(mac_ctx, &phy_mode, session); + + limGetQosMode(session, &qos_mode); + + hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); + frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); + + lim_log(mac_ctx, LOG1, + FL("Rcvd %s Req Frame, sessionid: %d systemrole %d MlmState %d from: " + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, GET_LIM_SYSTEM_ROLE(session), + session->limMlmState, MAC_ADDR_ARRAY(hdr->sa)); + + if (LIM_IS_STA_ROLE(session) || LIM_IS_BT_AMP_STA_ROLE(session)) { + lim_log(mac_ctx, LOGE, + FL("Rcvd unexpected ASSOC REQ, sessionid: %d sys sub_type=%d for role=%d from: " + MAC_ADDRESS_STR), + session->peSessionId, sub_type, + GET_LIM_SYSTEM_ROLE(session), + MAC_ADDR_ARRAY(hdr->sa)); + sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG3, + WMA_GET_RX_MPDU_DATA(rx_pkt_info), frame_len); + return; + } + + /* + * If a STA is already present in DPH and it is initiating a Assoc + * re-transmit, do not process it. This can happen when first Assoc Req + * frame is received but ACK lost at STA side. The ACK for this dropped + * Assoc Req frame should be sent by HW. Host simply does not process it + * once the entry for the STA is already present in DPH. + */ + sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa, &assoc_id, + &session->dph.dphHashTable); + if (NULL != sta_ds) { + if (hdr->fc.retry > 0) { + lim_log(mac_ctx, LOGE, + FL("STA is initiating Assoc Req after ACK lost. Do not process sessionid: %d sys sub_type=%d for role=%d from: " + MAC_ADDRESS_STR), session->peSessionId, + sub_type, GET_LIM_SYSTEM_ROLE(session), + MAC_ADDR_ARRAY(hdr->sa)); + } else if (!sta_ds->rmfEnabled) { + /* + * Do this only for non PMF case. + * STA might have missed the assoc response, so it is + * sending assoc request frame again. + */ + lim_send_assoc_rsp_mgmt_frame(mac_ctx, eSIR_SUCCESS, + sta_ds->assocId, sta_ds->staAddr, + sta_ds->mlmStaContext.subType, + sta_ds, session); + lim_log(mac_ctx, LOGE, + FL("DUT already received an assoc request frame and STA is sending another assoc req.So, do not Process sessionid: %d sys sub_type=%d for role=%d from: " + MAC_ADDRESS_STR), + session->peSessionId, sub_type, + session->limSystemRole, + MAC_ADDR_ARRAY(hdr->sa)); + } + return; + } + + lim_check_sta_in_pe_entries(mac_ctx, hdr); + + /* Get pointer to Re/Association Request frame body */ + frm_body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); + + if (lim_is_group_addr(hdr->sa)) { + /* + * Rcvd Re/Assoc Req frame from BC/MC address Log error and + * ignore it + */ + lim_log(mac_ctx, LOGE, + FL("Rcvd %s Req, sessionid: %d from a BC/MC address" + MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + session->peSessionId, MAC_ADDR_ARRAY(hdr->sa)); + return; + } + + sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG2, + (uint8_t *) frm_body, frame_len); + + if (false == lim_chk_sa_da(mac_ctx, hdr, session, sub_type)) + return; + + if (false == lim_chk_tkip(mac_ctx, hdr, session, sub_type)) + return; + + /* Allocate memory for the Assoc Request frame */ + assoc_req = qdf_mem_malloc(sizeof(*assoc_req)); + if (NULL == assoc_req) { + lim_log(mac_ctx, LOGP, + FL("Allocate Memory failed in assoc_req")); + return; + } + qdf_mem_set((void *)assoc_req, sizeof(*assoc_req), 0); + + /* Parse Assoc Request frame */ + if (false == lim_chk_assoc_req_parse_error(mac_ctx, hdr, session, + assoc_req, sub_type, frm_body, frame_len)) + goto error; + + assoc_req->assocReqFrame = qdf_mem_malloc(frame_len); + if (NULL == assoc_req->assocReqFrame) { + lim_log(mac_ctx, LOGE, + FL("Memory alloc failed for the assoc req, len=%d"), + frame_len); + goto error; + } + + qdf_mem_copy((uint8_t *) assoc_req->assocReqFrame, + (uint8_t *) frm_body, frame_len); + assoc_req->assocReqFrameLength = frame_len; + + if (false == lim_chk_capab(mac_ctx, hdr, session, assoc_req, + sub_type, &local_cap)) + goto error; + + update_ctx = false; + + if (false == lim_chk_ssid(mac_ctx, hdr, session, assoc_req, sub_type)) + goto error; + + if (false == lim_chk_rates(mac_ctx, hdr, session, assoc_req, sub_type)) + goto error; + + if (false == lim_chk_11g_only(mac_ctx, hdr, session, assoc_req, + sub_type)) + goto error; + + if (false == lim_chk_11n_only(mac_ctx, hdr, session, assoc_req, + sub_type)) + goto error; + + if (false == lim_chk_11ac_only(mac_ctx, hdr, session, assoc_req, + sub_type)) + goto error; + + /* Spectrum Management (11h) specific checks */ + lim_process_for_spectrum_mgmt(mac_ctx, hdr, session, + assoc_req, sub_type, local_cap); + + if (false == lim_chk_mcs(mac_ctx, hdr, session, assoc_req, sub_type)) + goto error; + + if (false == lim_chk_is_11b_sta_supported(mac_ctx, hdr, session, + assoc_req, sub_type, phy_mode)) + goto error; + + /* + * Check for 802.11n HT caps compatibility; are HT Capabilities + * turned on in lim? + */ + lim_print_ht_cap(mac_ctx, session, assoc_req); + + if (false == lim_chk_n_process_wpa_rsn_ie(mac_ctx, hdr, session, + assoc_req, sub_type, &pmf_connection)) + goto error; + + /* Extract 'associated' context for STA, if any. */ + sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa, &peer_idx, + &session->dph.dphHashTable); + + /* Extract pre-auth context for the STA, if any. */ + sta_pre_auth_ctx = lim_search_pre_auth_list(mac_ctx, hdr->sa); + + if (sta_ds == NULL) { + if (false == lim_process_assoc_req_no_sta_ctx(mac_ctx, hdr, + session, assoc_req, sub_type, sta_pre_auth_ctx, + sta_ds, &auth_type)) + goto error; + } else { + if (false == lim_process_assoc_req_sta_ctx(mac_ctx, hdr, + session, assoc_req, sub_type, sta_pre_auth_ctx, + sta_ds, peer_idx, &auth_type, &update_ctx)) + goto error; + goto sendIndToSme; + } + + /* check if sta is allowed per QoS AC rules */ + if (false == lim_chk_wmm(mac_ctx, hdr, session, + assoc_req, sub_type, qos_mode)) + goto error; + + /* STA is Associated ! */ + lim_log(mac_ctx, LOGE, + FL("Received %s Req successful from " MAC_ADDRESS_STR), + (LIM_ASSOC == sub_type) ? "Assoc" : "ReAssoc", + MAC_ADDR_ARRAY(hdr->sa)); + + /* + * AID for this association will be same as the peer Index used in DPH + * table. Assign unused/least recently used peer Index from perStaDs. + * NOTE: lim_assign_peer_idx() assigns AID values ranging between + * 1 - cfg_item(WNI_CFG_ASSOC_STA_LIMIT) + */ + + peer_idx = lim_assign_peer_idx(mac_ctx, session); + + if (!peer_idx) { + /* Could not assign AID. Reject association */ + lim_log(mac_ctx, LOGE, + FL("PeerIdx not avaialble. Reject associaton")); + lim_reject_association(mac_ctx, hdr->sa, sub_type, + true, auth_type, peer_idx, false, + (tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); + goto error; + } + + /* Add an entry to hash table maintained by DPH module */ + + sta_ds = dph_add_hash_entry(mac_ctx, hdr->sa, peer_idx, + &session->dph.dphHashTable); + + if (sta_ds == NULL) { + /* Could not add hash table entry at DPH */ + lim_log(mac_ctx, LOGE, + FL("couldn't add hash entry at DPH for aid=%d, MacAddr:" + MAC_ADDRESS_STR), peer_idx, MAC_ADDR_ARRAY(hdr->sa)); + + /* Release AID */ + lim_release_peer_idx(mac_ctx, peer_idx, session); + + lim_reject_association(mac_ctx, hdr->sa, sub_type, + true, auth_type, peer_idx, false, + (tSirResultCodes) eSIR_MAC_UNSPEC_FAILURE_STATUS, + session); + goto error; + } + +sendIndToSme: + if (false == lim_update_sta_ds(mac_ctx, hdr, session, assoc_req, + sub_type, sta_ds, tmp_assoc_req, auth_type, + &assoc_req_copied, peer_idx, qos_mode, + pmf_connection)) + goto error; + + /* BTAMP: Storing the parsed assoc request in the session array */ + if (session->parsedAssocReq) + session->parsedAssocReq[sta_ds->assocId] = assoc_req; + assoc_req_copied = true; + + if (false == lim_update_sta_ctx(mac_ctx, session, assoc_req, + sub_type, sta_ds, update_ctx)) + goto error; + + /* AddSta is sucess here */ + if (LIM_IS_AP_ROLE(session) && IS_DOT11_MODE_HT(session->dot11mode) && + assoc_req->HTCaps.present && assoc_req->wmeInfoPresent) { + /* + * Update in the HAL Sta Table for the Update of the Protection + * Mode + */ + lim_post_sm_state_update(mac_ctx, sta_ds->staIndex, + sta_ds->htMIMOPSState, sta_ds->staAddr, + session->smeSessionId); + } + + return; + +error: + + lim_process_assoc_cleanup(mac_ctx, session, assoc_req, sta_ds, + tmp_assoc_req, &assoc_req_copied); return; } -- cgit v1.2.3 From 2546093dca04eca518241f3fb8493d60b3efbf79 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Fri, 5 Feb 2016 16:56:08 -0800 Subject: qcacld-3.0: Fix memory leak for lim preauth timers at driver unload This is qcacld-2.0 to qcacld-3.0 propagation Fix memory leak at driver unload by freeing memory for lim preauth timers. Change-Id: I7be177e6c475a8f8fdc4cc7d2744e34a4bf5dbf5 CRs-Fixed: 960617 --- core/mac/src/pe/lim/lim_api.c | 3 +++ core/mac/src/pe/lim/lim_timer_utils.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index aaf5995062cd..d974686547a4 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -644,6 +644,7 @@ tSirRetStatus lim_initialize(tpAniSirGlobal pMac) void lim_cleanup(tpAniSirGlobal pMac) { + uint8_t i; /* * Before destroying the list making sure all the nodes have been * deleted Which should be the normal case, but a memory leak has been @@ -670,6 +671,8 @@ void lim_cleanup(tpAniSirGlobal pMac) /* free up preAuth table */ if (pMac->lim.gLimPreAuthTimerTable.pTable != NULL) { + for (i = 0; i < pMac->lim.gLimPreAuthTimerTable.numEntry; i++) + qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable[i]); qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); pMac->lim.gLimPreAuthTimerTable.pTable = NULL; pMac->lim.gLimPreAuthTimerTable.numEntry = 0; diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 6507497b6688..14222a61f14e 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -437,7 +437,7 @@ err_timer: tx_timer_delete(&pMac->lim.limTimers.gLimActiveToPassiveChannelTimer); if (NULL != pMac->lim.gLimPreAuthTimerTable.pTable) { - for (i = 0; i < cfgValue; i++) + for (i = 0; i < pMac->lim.gLimPreAuthTimerTable.numEntry; i++) qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable[i]); qdf_mem_free(pMac->lim.gLimPreAuthTimerTable.pTable); pMac->lim.gLimPreAuthTimerTable.pTable = NULL; -- cgit v1.2.3 From 5b34c95e1693874a7b0261194d10dd95fce27d9e Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Fri, 5 Feb 2016 17:08:25 -0800 Subject: qcacld-3.0: Do not request ROC if already on correct channel This is qcacld-2.0 to qcacld-3.0 propagation If cfg80211_mgmt_tx_params.offchan is set, driver need not send ROC if device is already on correct channel. Check current home channel of associated adapter and if it is same as target channel requested skip ROC request and directly send frame over the air. Change-Id: Ib13a885437a4349702e1706b3a466af262813f8a CRs-Fixed: 921117 --- core/hdd/src/wlan_hdd_p2p.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index b82eaf02d974..217c5278292f 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -1252,6 +1252,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned long rc; hdd_adapter_t *goAdapter; uint16_t current_freq; + uint8_t home_ch = 0; ENTER(); @@ -1268,9 +1269,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, if (0 != status) return status; - hddLog(LOG1, FL("Device_mode %s(%d) type: %d"), + hddLog(LOG1, FL("Device_mode %s(%d) type: %d, wait: %d, offchan: %d, category: %d, actionId: %d"), hdd_device_mode_to_string(pAdapter->device_mode), - pAdapter->device_mode, type); + pAdapter->device_mode, type, wait, offchan, + buf[WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET + + WLAN_HDD_PUBLIC_ACTION_FRAME_CATEGORY_OFFSET], + buf[WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET + + WLAN_HDD_PUBLIC_ACTION_FRAME_ACTION_OFFSET]); #ifdef WLAN_FEATURE_P2P_DEBUG if ((type == SIR_MAC_MGMT_FRAME) && @@ -1391,16 +1396,22 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, [WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET])); } - goAdapter = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_P2P_GO); + if (pAdapter->device_mode == WLAN_HDD_SOFTAP) { + home_ch = pAdapter->sessionCtx.ap.operatingChannel; + } else if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION) { + home_ch = + pAdapter->sessionCtx.station.conn_info.operationChannel; + } else { + goAdapter = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_P2P_GO); + if (goAdapter) + home_ch = goAdapter->sessionCtx.ap.operatingChannel; + } - /* If GO adapter exists and operating on same frequency */ - /* then we will not request remain on channel */ - if (goAdapter && (ieee80211_frequency_to_channel(chan->center_freq) - == goAdapter->sessionCtx.ap.operatingChannel)) { - /* if GO exist and is not off channel - * wait time should be zero - */ + if (ieee80211_frequency_to_channel(chan->center_freq) == home_ch) { + /* if adapter is already on requested ch, no need for ROC */ wait = 0; + hddLog(LOG1, + FL("Adapter already on requested ch. No ROC needed")); goto send_frame; } -- cgit v1.2.3 From e7bc3a73f636baabc63882ffe42cbe8245aa4064 Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Mon, 18 Jan 2016 12:08:22 -0800 Subject: qcacld-3.0: Clean up enum station_info_flags for Kernel upgrade Commit: 319090bf ("cfg80211: remove enum station_info_flags") The station_info_flags is removed from cfg80211.h since Kernel 4.0. Since they're duplicate information that's already in nl80211 attributes. One more small change needed: * remove STATION_INFO_ASSOC_REQ_IES, nl80211 interface use the length (assoc_req_ies_len) to check the existence Change-Id: I9ed324c097ac300c7233f439d71540176744e425 CRs-fixed: 961351 --- core/hdd/src/wlan_hdd_hostapd.c | 8 ++++++++ core/hdd/src/wlan_hdd_stats.c | 32 ++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 682a53a34601..2e82f5fc8fa8 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1405,7 +1405,15 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, (const u8 *)&pSapEvent->sapevt. sapStationAssocReassocCompleteEvent.ies[0]; staInfo.assoc_req_ies_len = iesLen; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) + /* + * After Kernel 4.0, it's no longer need to set + * STATION_INFO_ASSOC_REQ_IES flag, as it + * changed to use assoc_req_ies_len length to + * check the existance of request IE. + */ staInfo.filled |= STATION_INFO_ASSOC_REQ_IES; +#endif cfg80211_new_sta(dev, (const u8 *)&pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 48b228458c02..8137644a559b 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -1748,7 +1748,11 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, return status; wlan_hdd_get_rssi(pAdapter, &sinfo->signal); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) sinfo->filled |= STATION_INFO_SIGNAL; +#else + sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL); +#endif #ifdef WLAN_FEATURE_LPSS if (!pAdapter->rssi_send) { @@ -2118,10 +2122,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, } } - sinfo->filled |= STATION_INFO_TX_BITRATE; - sinfo->tx_bytes = pAdapter->stats.tx_bytes; - sinfo->filled |= STATION_INFO_TX_BYTES; sinfo->tx_packets = pAdapter->hdd_stats.summary_stat.tx_frm_cnt[0] + @@ -2141,15 +2142,26 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, pAdapter->hdd_stats.summary_stat.fail_cnt[2] + pAdapter->hdd_stats.summary_stat.fail_cnt[3]; - sinfo->filled |= - STATION_INFO_TX_PACKETS | - STATION_INFO_TX_RETRIES | STATION_INFO_TX_FAILED; - sinfo->rx_bytes = pAdapter->stats.rx_bytes; - sinfo->filled |= STATION_INFO_RX_BYTES; - sinfo->rx_packets = pAdapter->stats.rx_packets; - sinfo->filled |= STATION_INFO_RX_PACKETS; + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) + sinfo->filled |= STATION_INFO_TX_BITRATE | + STATION_INFO_TX_BYTES | + STATION_INFO_TX_PACKETS | + STATION_INFO_TX_RETRIES | + STATION_INFO_TX_FAILED | + STATION_INFO_RX_BYTES | + STATION_INFO_RX_PACKETS; +#else + sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES) | + BIT(NL80211_STA_INFO_TX_BITRATE) | + BIT(NL80211_STA_INFO_TX_PACKETS) | + BIT(NL80211_STA_INFO_TX_RETRIES) | + BIT(NL80211_STA_INFO_TX_FAILED) | + BIT(NL80211_STA_INFO_RX_BYTES) | + BIT(NL80211_STA_INFO_RX_PACKETS); +#endif if (rate_flags & eHAL_TX_RATE_LEGACY) hddLog(LOG1, FL("Reporting legacy rate %d pkt cnt tx %d rx %d"), -- cgit v1.2.3 From 8ecb0fa07ad0b171d8f5b82ee3aa48940e24d3fe Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Mon, 18 Jan 2016 15:40:55 -0800 Subject: qcacld-3.0: Clean up cfg80211 del_station for Kernel upgrade Commit: 89c771e ("cfg80211: Convert del_station() callback to use a param struct") Commit: 9885686 ("cfg80211: Specify frame and reason code for NL80211_CMD_DEL_STATION") These two commits have been merged in Kernel 3.19. Add a kernel version macro to support this. And refactor the inclusion of CFG80211_DEL_STA_V2 by adding a helper function to clean it up, that way we can keep the flag only in wlan_hdd_cfg80211.h/c as this is the cfg80211 interface related changes. Change-Id: I811065b7fa1cf2aee68cfe63c5cf78c2270e5af7 CRs-fixed: 963651 --- core/cds/src/cds_concurrency.c | 15 +-------------- core/hdd/src/wlan_hdd_cfg80211.c | 30 +++++++++++++++++++++++++++--- core/hdd/src/wlan_hdd_cfg80211.h | 11 +++++++++-- core/hdd/src/wlan_hdd_main.c | 16 +--------------- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 6718d3cbff41..19f19b0399ba 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -7286,9 +7286,6 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) QDF_STATUS qdf_status; QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); -#ifdef CFG80211_DEL_STA_V2 - struct tagCsrDelStaParams delStaParams; -#endif tsap_Config_t *sap_config; void *sap_ctx; @@ -7298,17 +7295,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) { -#ifdef CFG80211_DEL_STA_V2 - delStaParams.mac = NULL; - delStaParams.subtype = SIR_MAC_MGMT_DEAUTH >> 4; - delStaParams.reason_code = eCsrForcedDeauthSta; - wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, - ap_adapter->dev, - &delStaParams); -#else - wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, - ap_adapter->dev, NULL); -#endif + wlan_hdd_del_station(ap_adapter); hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); qdf_event_reset(&hostapd_state->qdf_stop_bss_event); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 98265e02b0ff..77d513eac8ac 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -10004,7 +10004,31 @@ fn_end: return 0; } -#ifdef CFG80211_DEL_STA_V2 +#if defined(USE_CFG80211_DEL_STA_V2) +/** + * wlan_hdd_del_station() - delete station wrapper + * @adapter: pointer to the hdd adapter + * + * Return: None + */ +void wlan_hdd_del_station(hdd_adapter_t *adapter) +{ + struct station_del_parameters del_sta; + del_sta.mac = NULL; + del_sta.subtype = SIR_MAC_MGMT_DEAUTH >> 4; + del_sta.reason_code = eCsrForcedDeauthSta; + + wlan_hdd_cfg80211_del_station(adapter->wdev.wiphy, adapter->dev, + &del_sta); +} +#else +void wlan_hdd_del_station(hdd_adapter_t *adapter) +{ + wlan_hdd_cfg80211_del_station(adapter->wdev.wiphy, adapter->dev, NULL); +} +#endif + +#if defined(USE_CFG80211_DEL_STA_V2) /** * wlan_hdd_cfg80211_del_station() - delete station v2 * @wiphy: Pointer to wiphy @@ -10038,9 +10062,9 @@ int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, struct tagCsrDelStaParams delStaParams; cds_ssr_protect(__func__); -#ifdef CFG80211_DEL_STA_V2 +#if defined(USE_CFG80211_DEL_STA_V2) if (NULL == param) { - hddLog(LOGE, FL("Invalid argumet passed")); + hdd_err("Invalid argument passed"); return -EINVAL; } wlansap_populate_del_sta_params(param->mac, param->reason_code, diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 7d05c1bd6e1b..eaa82bedf5dc 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -106,6 +106,10 @@ #define CHANNEL_SWITCH_SUPPORTED #endif +#if defined(CFG80211_DEL_STA_V2) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) || defined(WITH_BACKPORTS) +#define USE_CFG80211_DEL_STA_V2 +#endif + /** * typedef struct qcom_ie_age - age ie * @@ -2324,7 +2328,9 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel); uint8_t *wlan_hdd_cfg80211_get_ie_ptr(const uint8_t *ies_ptr, int length, uint8_t eid); -#ifdef CFG80211_DEL_STA_V2 +void wlan_hdd_del_station(hdd_adapter_t *adapter); + +#if defined(USE_CFG80211_DEL_STA_V2) int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, struct station_del_parameters *param); @@ -2338,7 +2344,8 @@ int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, uint8_t *mac); #endif -#endif +#endif /* USE_CFG80211_DEL_STA_V2 */ + #if defined(QCA_WIFI_FTM) && defined(CONFIG_NL80211_TESTMODE) void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index a9722789d714..9f0f4925d893 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6568,9 +6568,6 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) hdd_hostapd_state_t *hostapd_state; QDF_STATUS qdf_status; hdd_context_t *hdd_ctx; -#ifdef CFG80211_DEL_STA_V2 - struct station_del_parameters delStaParams; -#endif if (NULL == ap_adapter) { hddLog(QDF_TRACE_LEVEL_ERROR, @@ -6587,18 +6584,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) } mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) { -#ifdef CFG80211_DEL_STA_V2 - delStaParams.mac = NULL; - delStaParams.subtype = SIR_MAC_MGMT_DEAUTH >> 4; - delStaParams.reason_code = eCsrForcedDeauthSta; - wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, - ap_adapter->dev, - &delStaParams); -#else - wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, - ap_adapter->dev, - NULL); -#endif + wlan_hdd_del_station(ap_adapter); hdd_cleanup_actionframe(hdd_ctx, ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); hddLog(QDF_TRACE_LEVEL_INFO_HIGH, -- cgit v1.2.3 From a335c16780a7f3ee4293877d35c3d94b41fe1c48 Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Thu, 21 Jan 2016 12:12:20 -0800 Subject: qcacld-3.0: Update cfg80211_disconnected interface for Kernel update Commit: 80279fb ("cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect") Above commit is merged in Kernel 4.2, it introduces the new parameter to indicate if the disconnect event is generated locally. Change-Id: I016df3b400f5f4b8447676882df79fab6915a8f5 CRs-fixed: 966069 --- core/hdd/src/wlan_hdd_assoc.c | 13 +++++++++---- core/hdd/src/wlan_hdd_cfg80211.c | 7 +++++-- core/hdd/src/wlan_hdd_main.c | 6 +++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index f35fe2360e9a..216020c4a776 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1041,12 +1041,17 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, eSIR_MAC_PEER_STA_REQ_LEAVING_BSS_REASON) pr_info("wlan: disconnected due to poor signal, rssi is %d dB\n", pRoamInfo->rxRssi); cfg80211_disconnected(dev, pRoamInfo-> - reasonCode, NULL, - 0, GFP_KERNEL); + reasonCode, NULL, 0, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)) || defined(WITH_BACKPORTS) + true, +#endif + GFP_KERNEL); } else { cfg80211_disconnected(dev, - WLAN_REASON_UNSPECIFIED, - NULL, 0, + WLAN_REASON_UNSPECIFIED, NULL, 0, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)) || defined(WITH_BACKPORTS) + true, +#endif GFP_KERNEL); } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 77d513eac8ac..e86c52bf79f7 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9006,8 +9006,11 @@ disconnected: * is handled by __cfg80211_disconnect call to __cfg80211_disconnected */ hddLog(LOG1, FL("Send disconnected event to userspace")); - cfg80211_disconnected(pAdapter->dev, WLAN_REASON_UNSPECIFIED, - NULL, 0, GFP_KERNEL); + cfg80211_disconnected(pAdapter->dev, WLAN_REASON_UNSPECIFIED, NULL, 0, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)) || defined(WITH_BACKPORTS) + false, +#endif + GFP_KERNEL); #endif return result; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 9f0f4925d893..5d86191b6dde 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3127,7 +3127,11 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) /* indicate disconnected event to nl80211 */ cfg80211_disconnected(adapter->dev, WLAN_REASON_UNSPECIFIED, - NULL, 0, GFP_KERNEL); + NULL, 0, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)) || defined(WITH_BACKPORTS) + true, +#endif + GFP_KERNEL); } else if (eConnectionState_Connecting == connState) { /* * Indicate connect failure to supplicant if we were in the -- cgit v1.2.3 From 6bf33b327c306f99b486d60ca17a6a42b5e7be4a Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Thu, 21 Jan 2016 13:59:35 -0800 Subject: qcacld-3.0: Update cfg80211_sched_scan_request for Kernel upgrade Commit: 3b06d27 ("cfg80211: Add multiple scan plans for scheduled scan") Above commit introduces the scan_plan to include the interval parameters, to support configuring multiple sched scan, and is merged since Kernel 4.4. Change-Id: I9e232cfd6f82408fb2e21bef905b6e044951089d CRs-fixed: 966054 --- core/hdd/src/wlan_hdd_scan.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 08c45ccd4ba7..8898fa862fe4 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -2227,13 +2227,26 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, } /* - * Driver gets only one time interval which is hard coded in - * supplicant for 10000ms. Taking power consumption into account - * firmware after gPNOScanTimerRepeatValue times fast_scan_period - * switches slow_scan_period. This is less frequent scans and firmware - * shall be in slow_scan_period mode until next PNO Start. + * Before Kernel 4.4 + * Driver gets only one time interval which is hard coded in + * supplicant for 10000ms. + * + * After Kernel 4.4 + * User can configure multiple scan_plans, each scan would have + * separate scan cycle and interval. For our use case, we would + * only have supplicant set one scan_plan, and firmware also support + * only one as well, so pick up the first index. + * + * Taking power consumption into account + * firmware after gPNOScanTimerRepeatValue times fast_scan_period + * switches slow_scan_period. This is less frequent scans and firmware + * shall be in slow_scan_period mode until next PNO Start. */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) || defined(WITH_BACKPORTS) + pPnoRequest->fast_scan_period = request->scan_plans[0].interval; +#else pPnoRequest->fast_scan_period = request->interval; +#endif pPnoRequest->fast_scan_max_cycles = config->configPNOScanTimerRepeatValue; pPnoRequest->slow_scan_period = @@ -2241,7 +2254,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, pPnoRequest->fast_scan_period; hdd_info("Base scan interval: %d sec PNOScanTimerRepeatValue: %d", - (request->interval / 1000), + (pPnoRequest->fast_scan_period / 1000), config->configPNOScanTimerRepeatValue); pPnoRequest->modePNO = SIR_PNO_MODE_IMMEDIATE; -- cgit v1.2.3 From 3a0f5230d6e2940e614adffff2b3573eae277523 Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Thu, 21 Jan 2016 14:40:11 -0800 Subject: qcacld-3.0: Update rate_info_flag for Kernel upgrade Commit: b51f3be ("cfg80211: change bandwidth reporting to explicit field") Above commit clean up the rate flag and bandwidth info and is merged since Kernel 4.0. Remove bandwidth info from rate_info flag, and use a separate bw field instead. Change-Id: I655ed919f1069cc04ed71ee1f3d457e228734d33 CRs-fixed: 966065 --- core/hdd/src/wlan_hdd_cfg80211.c | 6 ++++++ core/hdd/src/wlan_hdd_stats.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index e86c52bf79f7..7b229e68015d 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -4447,18 +4447,24 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, if (!(rate_flags & eHAL_TX_RATE_LEGACY)) { if (rate_flags & eHAL_TX_RATE_VHT80) { final_rate_flags |= RATE_INFO_FLAGS_VHT_MCS; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) final_rate_flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH; +#endif } else if (rate_flags & eHAL_TX_RATE_VHT40) { final_rate_flags |= RATE_INFO_FLAGS_VHT_MCS; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) final_rate_flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } else if (rate_flags & eHAL_TX_RATE_VHT20) { final_rate_flags |= RATE_INFO_FLAGS_VHT_MCS; } else if (rate_flags & (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) { final_rate_flags |= RATE_INFO_FLAGS_MCS; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)) && !defined(WITH_BACKPORTS) if (rate_flags & eHAL_TX_RATE_HT40) final_rate_flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } if (rate_flags & eHAL_TX_RATE_SGI) { diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 8137644a559b..36d7087d54b3 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -2046,12 +2046,20 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.nss = nss; if (rate_flags & eHAL_TX_RATE_VHT80) { sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_80; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH; +#endif } else if (rate_flags & eHAL_TX_RATE_VHT40) { sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_40; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } else if (rate_flags & eHAL_TX_RATE_VHT20) { sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; } else @@ -2061,8 +2069,12 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) { sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; if (rate_flags & eHAL_TX_RATE_HT40) { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_40; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } } if (rate_flags & eHAL_TX_RATE_SGI) { @@ -2096,19 +2108,31 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.nss = nss; sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; if (rate_flags & eHAL_TX_RATE_VHT80) { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_80; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH; +#endif } else if (rate_flags & eHAL_TX_RATE_VHT40) { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_40; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } #endif /* WLAN_FEATURE_11AC */ if (rate_flags & (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) { sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; if (rate_flags & eHAL_TX_RATE_HT40) { +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || defined(WITH_BACKPORTS) + sinfo->txrate.bw = RATE_INFO_BW_40; +#else sinfo->txrate.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH; +#endif } } if (rate_flags & eHAL_TX_RATE_SGI) { -- cgit v1.2.3 From bc7e4945598c4bce333804538c6143dc6c0c6a9a Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Thu, 11 Feb 2016 15:09:40 -0800 Subject: qcacld-3.0: Fix error in populating oem data capabilities Fix the error in populating oem data capabilities by fixing incorrect conditional logic. populate_oem_data_cap API returns zero on success and that was misinterpreted as failure in the caller. Caller returns without doing proper assignment. Change-Id: I579106cb62c08622e8e5ab933747faf671a1d5cd CRs-Fixed: 975352 --- core/hdd/src/wlan_hdd_oemdata.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 924ac2eb2fa7..7c8a07ad5c60 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -150,8 +150,10 @@ int iw_get_oem_data_cap(struct net_device *dev, return ret; status = populate_oem_data_cap(pAdapter, &oemDataCap); - if (!status) + if (0 != status) { + hdd_err("Failed to populate oem data capabilities"); return status; + } pHddOemDataCap = (t_iw_oem_data_cap *) (extra); *pHddOemDataCap = oemDataCap; -- cgit v1.2.3 From f1d6deee43595b076c37c89bb70ffd05bdf22321 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Thu, 11 Feb 2016 16:40:43 -0800 Subject: qcacld-3.0: Fix the timeout handler to handle add bss timeout Fix the timeout handler to handle add bss request timeout. wma_hold_req_timer is not defined to handle WMA_ADD_BSS_REQ. When WMA_ADD_BSS_REQ times out, no response is sent back to SME which results in SME command queue stuck. This change set will enable wma_hold_req_timer to handle add bss request timeout. Change-Id: I55ec44acafc3af717458134340075b55bca7cddf CRs-Fixed: 975400 --- core/wma/src/wma_dev_if.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 1aa278e946c5..e353d42f6ebd 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -2157,6 +2157,13 @@ void wma_hold_req_timer(void *data) WMA_LOGD(FL("Sending add sta rsp to umac (mac:%pM, status:%d)"), params->staMac, params->status); wma_send_msg(wma, WMA_ADD_STA_RSP, (void *)params, 0); + } else if (tgt_req->msg_type == WMA_ADD_BSS_REQ) { + tpAddBssParams params = (tpAddBssParams) tgt_req->user_data; + params->status = QDF_STATUS_E_TIMEOUT; + WMA_LOGA(FL("WMA_ADD_BSS_REQ timed out")); + WMA_LOGD(FL("Sending add bss rsp to umac (mac:%pM, status:%d)"), + params->selfMacAddr, params->status); + wma_send_msg(wma, WMA_ADD_BSS_RSP, (void *)params, 0); } else if ((tgt_req->msg_type == WMA_DELETE_STA_REQ) && (tgt_req->type == WMA_DELETE_STA_RSP_START)) { tpDeleteStaParams params = @@ -2175,6 +2182,10 @@ void wma_hold_req_timer(void *data) (tgt_req->type == WMA_DEL_P2P_SELF_STA_RSP_START)) { WMA_LOGA(FL("wma delete sta p2p request timed out")); QDF_ASSERT(0); + } else { + WMA_LOGE(FL("Unhandled timeout for msg_type:%d and type:%d"), + tgt_req->msg_type, tgt_req->type); + QDF_BUG(0); } free_tgt_req: qdf_mc_timer_destroy(&tgt_req->event_timeout); -- cgit v1.2.3 From 0379b59f9542ac4005f76e63909066b75e71f3b0 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 9 Feb 2016 16:18:31 -0800 Subject: qcacld-3.0: Fix memory leak in dfs module Fix memory leak in dfs module by removing check for the board id. During dfs_attach dfs_hw_bd_id was zero, so memory was allocated for pulses_ext_seg but in wma registration process correct board was updated. In dfs_detach while freeing the memory we check for the board id and we leaked the memory for pulses_ext_seg. Change-Id: Ica9719cc4cd67e895fad850c59c753d39473f46d CRs-Fixed: 974299 --- core/sap/dfs/src/dfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 85266dc37eb0..4d7fbbc4ff65 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -489,8 +489,7 @@ void dfs_detach(struct ieee80211com *ic) dfs->pulses = NULL; } - if (dfs->pulses_ext_seg != NULL && - ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) { + if (dfs->pulses_ext_seg != NULL) { OS_FREE(dfs->pulses_ext_seg); dfs->pulses_ext_seg = NULL; } @@ -520,8 +519,7 @@ void dfs_detach(struct ieee80211com *ic) OS_FREE(dfs->dfs_b5radars); dfs->dfs_b5radars = NULL; } - if (dfs->dfs_b5radars_ext_seg != NULL && - ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) { + if (dfs->dfs_b5radars_ext_seg != NULL) { OS_FREE(dfs->dfs_b5radars_ext_seg); dfs->dfs_b5radars_ext_seg = NULL; } -- cgit v1.2.3 From 30a966ecd73ec809cd7eec27382742a8f713efce Mon Sep 17 00:00:00 2001 From: Ahmad Kholaif Date: Mon, 8 Feb 2016 15:58:32 -0800 Subject: qcacld-3.0: CL 1449067 update fw common interface files Increase WHAL_DBG_CMD_RESULT_MAXCNT from 10 --> 11 (affects Helium only). Change-Id: Id03083d3e791f7f5d3036b458e4a228765170553 CRs-fixed: 865207 --- target/inc/wlan_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/inc/wlan_defs.h b/target/inc/wlan_defs.h index 2a6003675337..f2e5caeae43e 100644 --- a/target/inc/wlan_defs.h +++ b/target/inc/wlan_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2010, 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2004-2010, 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -699,7 +699,7 @@ typedef struct { #define WHAL_DBG_PHY_ERR_MAXCNT 18 #define WHAL_DBG_SIFS_STATUS_MAXCNT 8 #define WHAL_DBG_SIFS_ERR_MAXCNT 8 -#define WHAL_DBG_CMD_RESULT_MAXCNT 10 +#define WHAL_DBG_CMD_RESULT_MAXCNT 11 #define WHAL_DBG_CMD_STALL_ERR_MAXCNT 4 #define WHAL_DBG_FLUSH_REASON_MAXCNT 40 -- cgit v1.2.3 From 40a9d8da1ff7dddee23200c295f15e0e34ed6b40 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Fri, 5 Feb 2016 17:52:46 -0800 Subject: qcacld-3.0: Remove the PS timer check in suspend req FW can enter into suspend mode even if the BMPS is not enabled. Hence the auto PS timer check is not required in suspend request. Change-Id: Ic2b774cea10516ea0b23141922ba1e16aa33f395 CRs-Fixed: 974918 --- core/hdd/src/wlan_hdd_power.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index ceba3887ebf4..66ebc57a9749 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1923,21 +1923,6 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, return -EAGAIN; } - if (pHddCtx->config->is_ps_enabled) { - if (sme_is_auto_ps_timer_running(pHddCtx->hHal, - pAdapter->sessionId)) { - hddLog(LOGE, - FL("Auto Power save timer is running; Do not allow suspend")); - return -EAGAIN; - } else { - sme_ps_enable_disable(pHddCtx->hHal, - pAdapter->sessionId, - SME_PS_ENABLE); - hddLog(LOG1, - FL("Auto PS timer is not running; allow suspend and enter into power save")); - } - } - if (pScanInfo->mScanPending) { INIT_COMPLETION(pScanInfo->abortscan_event_var); hdd_abort_mac_scan(pHddCtx, pAdapter->sessionId, -- cgit v1.2.3 From c68ad460fc6c45d13eece8756f317f3e8c818758 Mon Sep 17 00:00:00 2001 From: "Gupta, Kapil" Date: Mon, 1 Feb 2016 19:17:23 +0530 Subject: qcacld-3.0: Add support for dense roam params qcacld-2.0 to qcacld-3.0 propagation In High dense environment roaming should be triggered early at dense RSSI threshold which provide better throughput result. Add support for dense roaming parameters to read from ini file and send to FW with other roaming parameters CRs-Fixed: 953579 Change-Id: Ia63bfdd1248b4507d988b019f07164a7c75566af --- core/hdd/inc/wlan_hdd_cfg.h | 35 +++++++++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_cfg.c | 38 ++++++++++++++++++++++++++++++++++++++ core/mac/inc/sir_api.h | 4 ++++ core/sme/inc/csr_api.h | 3 +++ core/sme/src/csr/csr_api_roam.c | 22 +++++++++++++++++++++- core/wma/src/wma_scan_roam.c | 12 ++++++++++++ 6 files changed, 113 insertions(+), 1 deletion(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index f777dac935f0..02a5d59dc144 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2895,6 +2895,38 @@ enum dot11p_mode { #define CFG_ENABLE_M2M_LIMITATION_DEFAULT (1) #endif /* QCA_WIFI_3_0_EMU */ +/* + * Dense traffic threshold + * traffic threshold required for dense roam scan + * not used currently + */ +#define CFG_ROAM_DENSE_TRAFFIC_THRESHOLD "gtraffic_threshold" +#define CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_MIN (0) +#define CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_MAX (100) +#define CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_DEFAULT (0) + +/* + * Dense Roam RSSI Threshold diff + * offset value from normal RSSI threshold to dense RSSI threshold + * Fw will optimize roaming based on new RSSI threshold once it detects + * dense enviournment. + */ +#define CFG_ROAM_DENSE_RSSI_THRE_OFFSET "groam_dense_rssi_thresh_offset" +#define CFG_ROAM_DENSE_RSSI_THRE_OFFSET_MIN (0) +#define CFG_ROAM_DENSE_RSSI_THRE_OFFSET_MAX (20) +#define CFG_ROAM_DENSE_RSSI_THRE_OFFSET_DEFAULT (0) + +/* + * Dense Roam Min APs + * minimum number of AP required for dense roam + * FW will consider environment as dense once it detects #APs + * operating is more than CFG_ROAM_DENSE_MIN_APS. + */ +#define CFG_ROAM_DENSE_MIN_APS "groam_dense_min_aps" +#define CFG_ROAM_DENSE_MIN_APS_MIN (1) +#define CFG_ROAM_DENSE_MIN_APS_MAX (5) +#define CFG_ROAM_DENSE_MIN_APS_DEFAULT (1) + /*--------------------------------------------------------------------------- Type declarations -------------------------------------------------------------------------*/ @@ -3482,6 +3514,9 @@ struct hdd_config { #ifdef QCA_WIFI_3_0_EMU bool enable_m2m_limitation; #endif + uint32_t roam_dense_traffic_thresh; + uint32_t roam_dense_rssi_thresh_offset; + uint32_t roam_dense_min_aps; }; #define VAR_OFFSET(_Struct, _Var) (offsetof(_Struct, _Var)) diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index a9ac00a9aab3..b776f6396965 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3684,6 +3684,27 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_ENABLE_M2M_LIMITATION_MAX), #endif + REG_VARIABLE(CFG_ROAM_DENSE_TRAFFIC_THRESHOLD, WLAN_PARAM_Integer, + struct hdd_config, roam_dense_traffic_thresh, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_DEFAULT, + CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_MIN, + CFG_ROAM_DENSE_TRAFFIC_THRESHOLD_MAX), + + REG_VARIABLE(CFG_ROAM_DENSE_RSSI_THRE_OFFSET, WLAN_PARAM_Integer, + struct hdd_config, roam_dense_rssi_thresh_offset, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_ROAM_DENSE_RSSI_THRE_OFFSET_DEFAULT, + CFG_ROAM_DENSE_RSSI_THRE_OFFSET_MIN, + CFG_ROAM_DENSE_RSSI_THRE_OFFSET_MAX), + + REG_VARIABLE(CFG_ROAM_DENSE_MIN_APS, WLAN_PARAM_Integer, + struct hdd_config, roam_dense_min_aps, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_ROAM_DENSE_MIN_APS_DEFAULT, + CFG_ROAM_DENSE_MIN_APS_MIN, + CFG_ROAM_DENSE_MIN_APS_MAX), + }; @@ -5263,6 +5284,15 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) CFG_ENABLE_LFR_SUBNET_DETECTION, pHddCtx->config->enable_lfr_subnet_detection); #endif + hdd_info("Name = [%s] Value = [%u]", + CFG_ROAM_DENSE_TRAFFIC_THRESHOLD, + pHddCtx->config->roam_dense_traffic_thresh); + hdd_info("Name = [%s] Value = [%u]", + CFG_ROAM_DENSE_RSSI_THRE_OFFSET, + pHddCtx->config->roam_dense_rssi_thresh_offset); + hdd_info("Name = [%s] Value = [%u]", + CFG_ROAM_DENSE_MIN_APS, + pHddCtx->config->roam_dense_min_aps); } @@ -6698,6 +6728,14 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) pHddCtx->config->early_stop_scan_max_threshold; smeConfig->csrConfig.first_scan_bucket_threshold = pHddCtx->config->first_scan_bucket_threshold; + + smeConfig->csrConfig.roam_dense_rssi_thresh_offset = + pHddCtx->config->roam_dense_rssi_thresh_offset; + smeConfig->csrConfig.roam_dense_min_aps = + pHddCtx->config->roam_dense_min_aps; + smeConfig->csrConfig.roam_dense_traffic_thresh = + pHddCtx->config->roam_dense_traffic_thresh; + status = sme_update_config(pHddCtx->hHal, smeConfig); if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, "sme_update_config() return failure %d", diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index be4eef03b37a..4e38f8a21ab3 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -2916,6 +2916,10 @@ struct roam_ext_params { int rssi_diff; int good_rssi_roam; bool is_5g_pref_enabled; + int dense_rssi_thresh_offset; + int dense_min_aps_cnt; + int initial_dense_status; + int traffic_threshold; }; typedef struct sSirRoamOffloadScanReq { diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index bd2231db1104..c8714f85922e 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1217,6 +1217,9 @@ typedef struct tagCsrConfigParam { bool policy_manager_enabled; uint32_t fine_time_meas_cap; uint32_t dual_mac_feature_disable; + uint32_t roam_dense_traffic_thresh; + uint32_t roam_dense_rssi_thresh_offset; + uint32_t roam_dense_min_aps; } tCsrConfigParam; /* Tush */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 277b41d84c85..d364d791c738 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2069,6 +2069,13 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->isCoalesingInIBSSAllowed = pParam->isCoalesingInIBSSAllowed; + pMac->roam.configParam.roam_params.dense_rssi_thresh_offset = + pParam->roam_dense_rssi_thresh_offset; + pMac->roam.configParam.roam_params.dense_min_aps_cnt = + pParam->roam_dense_min_aps; + pMac->roam.configParam.roam_params.traffic_threshold = + pParam->roam_dense_traffic_thresh; + /* update p2p offload status */ pMac->pnoOffload = pParam->pnoOffload; @@ -2105,8 +2112,8 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pParam->early_stop_scan_min_threshold; pMac->roam.configParam.early_stop_scan_max_threshold = pParam->early_stop_scan_max_threshold; - } + } return status; } @@ -2238,6 +2245,13 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->enable_dot11p = pMac->enable_dot11p; csr_set_channels(pMac, pParam); pParam->obssEnabled = cfg_params->obssEnabled; + pParam->roam_dense_rssi_thresh_offset = + cfg_params->roam_params.dense_rssi_thresh_offset; + pParam->roam_dense_min_aps = + cfg_params->roam_params.dense_min_aps_cnt; + pParam->roam_dense_traffic_thresh = + cfg_params->roam_params.traffic_threshold; + pParam->conc_custom_rule1 = cfg_params->conc_custom_rule1; pParam->conc_custom_rule2 = cfg_params->conc_custom_rule2; pParam->is_sta_connection_in_5gz_enabled = @@ -17046,6 +17060,12 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id, roam_params_dst->max_drop_rssi_5g, req_buf->RoamRssiDiff, roam_params_dst->alert_rssi_threshold); + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + "dense_rssi_thresh_offset: %d, dense_min_aps_cnt:%d, traffic_threshold:%d", + roam_params_dst->dense_rssi_thresh_offset, + roam_params_dst->dense_min_aps_cnt, + roam_params_dst->traffic_threshold); + for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "Blacklist Bssid: ("MAC_ADDRESS_STR")", diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 472ae9b4025e..9d151ee73e95 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -804,6 +804,13 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, params.hi_rssi_scan_rssi_delta = hirssi_scan_delta; params.hi_rssi_scan_rssi_ub = hirssi_upper_bound & 0x00000ff; params.raise_rssi_thresh_5g = roam_params->raise_rssi_thresh_5g; + params.dense_rssi_thresh_offset = + roam_params->dense_rssi_thresh_offset; + params.dense_min_aps_cnt = roam_params->dense_min_aps_cnt; + params.traffic_threshold = + roam_params->traffic_threshold; + params.initial_dense_status = 0; /* reserved */ + /* * The current Noise floor in firmware is -96dBm. Penalty/Boost @@ -862,6 +869,11 @@ QDF_STATUS wma_roam_scan_offload_rssi_thresh(tp_wma_handle wma_handle, WMA_LOGI( FL("hirssi_scan max_count=%d, delta=%d, hirssi_upper_bound=%d"), hirssi_scan_max_count, hirssi_scan_delta, hirssi_upper_bound); + WMA_LOGI( + FL("dense_rssi_thresh_offset=%d, dense_min_aps_cnt=%d, traffic_threshold=%d"), + roam_params->dense_rssi_thresh_offset, + roam_params->dense_min_aps_cnt, + roam_params->traffic_threshold); return status; } -- cgit v1.2.3 From 7b67e626c5d4b93f645d780b716498ac4ac9f109 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Tue, 12 Apr 2016 15:18:45 +0530 Subject: qcacld-3.0: During load/unload ignore pdev suspend ack timeout qcacld-2.0 to qcacld-3.0 propagation Ignore the ack timeout in case of load/unload, as FW is anyways going to get reset. This handles the CDF_BUG assertion when FW crashed during driver unload and wma_suspend_target fails to receive ACK for pdev suspend. Change-Id: I0883c5161c6db18cf7af2b0c0ca23573ecd985ba CRs-Fixed: 911696 --- core/wma/src/wma_features.c | 47 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 2e5671de7746..5e5283fff471 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -5108,6 +5108,41 @@ int wma_bus_resume(void) return __wma_bus_resume(handle); } +/** + * wma_suspend_target_timeout() - Handles the target suspend timeout + * @is_self_recovery_enabled: Is self recovery enabled or not + * + * Return: NONE + */ +#ifdef QCA_WIFI_3_0_ADRASTEA +static inline void wma_suspend_target_timeout(bool is_self_recovery_enabled) +{ + if (cds_is_driver_recovering()) { + WMA_LOGE("%s: recovery is in progress, ignore!", __func__); + } else { + if (is_self_recovery_enabled) { + cds_trigger_recovery(); + } else { + QDF_BUG(0); + } + } +} +#else /* ROME chipset */ +static inline void wma_suspend_target_timeout(bool is_self_recovery_enabled) +{ + if (cds_is_load_or_unload_in_progress() || cds_is_driver_recovering()) { + WMA_LOGE("%s: Unloading/Loading/recovery is in progress, Ignore!", + __func__); + } else { + if (is_self_recovery_enabled) { + cds_trigger_recovery(); + } else { + QDF_BUG(0); + } + } +} +#endif + /** * wma_suspend_target() - suspend target * @handle: wma handle @@ -5152,17 +5187,7 @@ QDF_STATUS wma_suspend_target(WMA_HANDLE handle, int disable_target_intr) != QDF_STATUS_SUCCESS) { WMA_LOGE("Failed to get ACK from firmware for pdev suspend"); wmi_set_target_suspend(wma_handle->wmi_handle, false); -#ifdef CONFIG_CNSS - if (!cds_is_driver_recovering()) { - if (pmac->sme.enableSelfRecovery) { - cds_trigger_recovery(); - } else { - QDF_BUG(0); - } - } else { - WMA_LOGE("%s: LOGP is in progress, ignore!", __func__); - } -#endif + wma_suspend_target_timeout(pmac->sme.enableSelfRecovery); return QDF_STATUS_E_FAULT; } -- cgit v1.2.3 From a72a4e325dcfed6f2d38fe57c598ced09f60b381 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Tue, 12 Apr 2016 15:24:35 +0530 Subject: Release 5.1.0.4G Rebase of 5.0.0.164 onto 5.1.0.3G Change-Id: Ia080faea192c9da47bdf492535f2a42293a5ec17 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index c0b80b8a25be..f177d8d2317f 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 3 +#define QWLAN_VERSION_BUILD 4 -#define QWLAN_VERSIONSTR "5.1.0.3G" +#define QWLAN_VERSIONSTR "5.1.0.4G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 36a87bfb6ec086a9bbd1e2dc13a0616208d54dfc Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Mon, 22 Feb 2016 12:38:46 +0530 Subject: qcacld-3.0: Use sta id to derive peer in ol_rx_data_cb Derive peer from sta id in ol_rx_data_cb to make sure that peer is still valid before using peer to avoid NULL pointer dereference Change-Id: I8f9219d4c6ffbfb207385b08bc704cc0f86a1e1b CRs-Fixed: 962949 --- core/dp/txrx/ol_txrx.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c index 11e862e7a821..2316b1e5cd4f 100644 --- a/core/dp/txrx/ol_txrx.c +++ b/core/dp/txrx/ol_txrx.c @@ -3447,17 +3447,27 @@ void ol_txrx_clear_stats(uint16_t value) * ol_rx_data_cb() - data rx callback * @peer: peer * @buf_list: buffer list + * @staid: Station id * * Return: None */ -static void ol_rx_data_cb(struct ol_txrx_peer_t *peer, - qdf_nbuf_t buf_list) +static void ol_rx_data_cb(struct ol_txrx_pdev_t *pdev, + qdf_nbuf_t buf_list, uint16_t staid) { + void *cds_ctx = cds_get_global_context(); qdf_nbuf_t buf, next_buf; QDF_STATUS ret; ol_txrx_rx_fp data_rx = NULL; + struct ol_txrx_peer_t *peer; + + if (qdf_unlikely(!cds_ctx) || qdf_unlikely(!pdev)) + goto free_buf; - if (qdf_unlikely(!peer->vdev)) + /* Do not use peer directly. Derive peer from staid to + * make sure that peer is valid. + */ + peer = ol_txrx_peer_find_by_local_id(pdev, staid); + if (!peer) goto free_buf; qdf_spin_lock_bh(&peer->peer_info_lock); @@ -3563,7 +3573,7 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, * better use multicores. */ if (!ol_cfg_is_rx_thread_enabled(pdev->ctrl_pdev)) { - ol_rx_data_cb(peer, rx_buf_list); + ol_rx_data_cb(pdev, rx_buf_list, peer->local_id); } else { p_cds_sched_context sched_ctx = get_cds_sched_ctxt(); @@ -3580,13 +3590,13 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer, } pkt->callback = (cds_ol_rx_thread_cb) ol_rx_data_cb; - pkt->context = (void *)peer; + pkt->context = (void *)pdev; pkt->Rxpkt = (void *)rx_buf_list; pkt->staId = peer->local_id; cds_indicate_rxpkt(sched_ctx, pkt); } #else /* QCA_CONFIG_SMP */ - ol_rx_data_cb(peer, rx_buf_list, 0); + ol_rx_data_cb(pdev, rx_buf_list, peer->local_id); #endif /* QCA_CONFIG_SMP */ } -- cgit v1.2.3 From d004abc6f3d2581122c056ad19b41107e192068c Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Wed, 17 Feb 2016 12:09:56 -0800 Subject: qcacld-3.0: Fix compilation error caused by hdd_indicate_mgmt_frame hdd_indicate_mgmt_frame is defined under CONFIG_CNSS feature flag which is not defined for MSM8998 SNOC target. Fix this compilation error by taking out definition of hdd_indicate_mgmt_frame from CONFIG_CNSS feature flag. Change-Id: I4b2de5d947ff4fdd21032d6b7e3d5fe4e9eb3eec CRs-Fixed: 978800 --- core/hdd/src/wlan_hdd_main.c | 106 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 5d86191b6dde..f24caa1db9b6 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4676,59 +4676,6 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, } return 0; } -/** - * hdd_indicate_mgmt_frame() - Wrapper to indicate management frame to - * user space - * @frame_ind: Management frame data to be informed. - * - * This function is used to indicate management frame to - * user space - * - * Return: None - * - */ -void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind) -{ - hdd_context_t *hdd_ctx = NULL; - hdd_adapter_t *adapter = NULL; - void *cds_context = NULL; - int i; - - /* Get the global VOSS context.*/ - cds_context = cds_get_global_context(); - if (!cds_context) { - hddLog(LOGE, FL("Global VOS context is Null")); - return; - } - /* Get the HDD context.*/ - hdd_ctx = - (hdd_context_t *)cds_get_context(QDF_MODULE_ID_HDD); - - if (0 != wlan_hdd_validate_context(hdd_ctx)) - return; - - if (SME_SESSION_ID_ANY == frame_ind->sessionId) { - for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { - adapter = - hdd_get_adapter_by_sme_session_id(hdd_ctx, i); - if (adapter) - break; - } - } else { - adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx, - frame_ind->sessionId); - } - - if ((NULL != adapter) && - (WLAN_HDD_ADAPTER_MAGIC == adapter->magic)) - __hdd_indicate_mgmt_frame(adapter, - frame_ind->frame_len, - frame_ind->frameBuf, - frame_ind->frameType, - frame_ind->rxChan, - frame_ind->rxRssi); - return; -} /** * hdd_ch_avoid_cb() - Avoid notified channels from FW handler @@ -4973,6 +4920,59 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level) } #endif /* defined(FEATURE_WLAN_CH_AVOID) && defined(CONFIG_CNSS) */ +/** + * hdd_indicate_mgmt_frame() - Wrapper to indicate management frame to + * user space + * @frame_ind: Management frame data to be informed. + * + * This function is used to indicate management frame to + * user space + * + * Return: None + * + */ +void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind) +{ + hdd_context_t *hdd_ctx = NULL; + hdd_adapter_t *adapter = NULL; + void *cds_context = NULL; + int i; + + /* Get the global VOSS context.*/ + cds_context = cds_get_global_context(); + if (!cds_context) { + hdd_err("Global CDS context is Null"); + return; + } + /* Get the HDD context.*/ + hdd_ctx = (hdd_context_t *)cds_get_context(QDF_MODULE_ID_HDD); + + if (0 != wlan_hdd_validate_context(hdd_ctx)) + return; + + if (SME_SESSION_ID_ANY == frame_ind->sessionId) { + for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { + adapter = + hdd_get_adapter_by_sme_session_id(hdd_ctx, i); + if (adapter) + break; + } + } else { + adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx, + frame_ind->sessionId); + } + + if ((NULL != adapter) && + (WLAN_HDD_ADAPTER_MAGIC == adapter->magic)) + __hdd_indicate_mgmt_frame(adapter, + frame_ind->frame_len, + frame_ind->frameBuf, + frame_ind->frameType, + frame_ind->rxChan, + frame_ind->rxRssi); + return; +} + /** * wlan_hdd_disable_all_dual_mac_features() - Disable dual mac features * @hdd_ctx: HDD context -- cgit v1.2.3 From e4f28eedfdf05d0629c7810308e2f3af3f11526b Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 21 Oct 2015 14:36:56 -0700 Subject: qcacld-3.0: Re-arrange regulatory code. Re-arrange core regulatory code between HDD and CDS layers. Move the OS dependent code to HDD. Change-Id: I8ac26a48d0e8d613b2f6c23fd764e5cf94365c39 CRs-Fixed: 856727 --- Kbuild | 2 + core/cds/inc/cds_reg_service.h | 15 +- core/cds/inc/cds_regdomain.h | 38 +- core/cds/src/cds_reg_service.c | 780 +-------------------- core/cds/src/cds_regdomain.c | 6 +- core/hdd/inc/wlan_hdd_main.h | 4 +- core/hdd/inc/wlan_hdd_regulatory.h | 41 ++ core/hdd/src/wlan_hdd_cfg80211.c | 4 +- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_hostapd.h | 4 +- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/hdd/src/wlan_hdd_main.c | 37 +- core/hdd/src/wlan_hdd_regulatory.c | 766 ++++++++++++++++++++ core/mac/inc/sir_api.h | 36 +- core/mac/src/pe/include/lim_global.h | 2 +- core/mac/src/pe/include/lim_session.h | 2 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 +- core/mac/src/pe/lim/lim_send_messages.c | 2 +- core/mac/src/pe/lim/lim_send_messages.h | 3 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- core/mac/src/pe/lim/lim_types.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 2 +- core/mac/src/pe/lim/lim_utils.h | 2 +- core/sap/inc/sap_api.h | 13 +- core/sap/src/sap_api_link_cntl.c | 2 +- core/sap/src/sap_fsm.c | 8 +- core/sap/src/sap_internal.h | 2 +- core/sap/src/sap_module.c | 4 +- core/sme/inc/csr_api.h | 2 +- core/sme/inc/csr_internal.h | 22 +- core/sme/inc/sme_api.h | 20 +- core/sme/src/common/sme_api.c | 16 +- core/sme/src/csr/csr_api_roam.c | 35 +- core/wma/inc/wma.h | 2 +- core/wma/inc/wma_if.h | 4 +- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_features.c | 2 +- 37 files changed, 996 insertions(+), 894 deletions(-) create mode 100644 core/hdd/inc/wlan_hdd_regulatory.h create mode 100644 core/hdd/src/wlan_hdd_regulatory.c diff --git a/Kbuild b/Kbuild index 39a3b153b70b..b2ed9e5ea8ef 100755 --- a/Kbuild +++ b/Kbuild @@ -296,6 +296,7 @@ HDD_OBJS := $(HDD_SRC_DIR)/wlan_hdd_assoc.o \ $(HDD_SRC_DIR)/wlan_hdd_ocb.o \ $(HDD_SRC_DIR)/wlan_hdd_oemdata.o \ $(HDD_SRC_DIR)/wlan_hdd_power.o \ + $(HDD_SRC_DIR)/wlan_hdd_regulatory.o \ $(HDD_SRC_DIR)/wlan_hdd_scan.o \ $(HDD_SRC_DIR)/wlan_hdd_softap_tx_rx.o \ $(HDD_SRC_DIR)/wlan_hdd_tx_rx.o \ @@ -304,6 +305,7 @@ HDD_OBJS := $(HDD_SRC_DIR)/wlan_hdd_assoc.o \ $(HDD_SRC_DIR)/wlan_hdd_wmm.o \ $(HDD_SRC_DIR)/wlan_hdd_wowl.o + ifeq ($(CONFIG_WLAN_LRO), y) HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_lro.o endif diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index e9b9e93d72a5..bed2496adf8e 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -284,8 +284,6 @@ struct regulatory { uint32_t eeprom_rd_ext; uint16_t country_code; uint8_t alpha2[CDS_COUNTRY_CODE_LEN + 1]; - uint8_t def_country[CDS_COUNTRY_CODE_LEN + 1]; - uint8_t dfs_region; uint8_t ctl_2g; uint8_t ctl_5g; const void *regpair; @@ -314,9 +312,8 @@ enum channel_width { CHAN_WIDTH_160MHZ }; - -extern struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; extern const struct chan_map chan_mapping[NUM_RF_CHANNELS]; +extern struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, const uint8_t *country_alpha2, @@ -331,16 +328,16 @@ QDF_STATUS cds_get_channel_list_with_power(struct channel_power *channel_40mhz, uint8_t *num_channels_40mhz); -QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); - enum channel_state cds_get_channel_state(uint32_t chan_num); - -QDF_STATUS cds_regulatory_init(void); QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); -QDF_STATUS cds_set_dfs_region(uint8_t dfs_region); +QDF_STATUS cds_put_dfs_region(uint8_t dfs_region); + bool cds_is_dsrc_channel(uint16_t); enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, enum channel_width chan_width); enum channel_width cds_get_max_channel_bw(uint32_t chan_num); +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); + +QDF_STATUS cds_put_default_country(uint8_t *def_country); #endif /* __CDS_REG_SERVICE_H */ diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 7f40344e46ae..70207ef2c585 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -1070,13 +1070,47 @@ enum CountryCode { CTRY_BELGIUM2 = 5002 /* Belgium/Cisco implementation */ }; + +/** + * enum ch_width - channel width + * @CH_WIDTH_20MHZ: channel width 20 MHz + * @CH_WIDTH_40MHZ: channel width 40 MHz + * @CH_WIDTH_80MHZ: channel width 80MHz + * @CH_WIDTH_160MHZ: channel width 160 MHz + * @CH_WIDTH_80P80MHZ: channel width 160MHz(80+80) + */ +enum ch_width { + CH_WIDTH_20MHZ = 0, + CH_WIDTH_40MHZ = 1, + CH_WIDTH_80MHZ = 2, + CH_WIDTH_160MHZ = 3, + CH_WIDTH_80P80MHZ = 4, + CH_WIDTH_MAX +}; + +/** + * struct ch_params_s + * + * @ch_width: channel width + * @sec_ch_offset: secondary channel offset + * @center_freq_seg0: center freq for segment 0 + * @center_freq_seg1: center freq for segment 1 + */ +struct ch_params_s { + enum ch_width ch_width; + uint8_t sec_ch_offset; + uint8_t center_freq_seg0; + uint8_t center_freq_seg1; +}; + + int32_t cds_fill_some_regulatory_info(struct regulatory *reg); void cds_fill_and_send_ctl_to_fw(struct regulatory *reg); int32_t cds_get_country_from_alpha2(uint8_t *alpha2); void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, uint32_t modeSelect); -void cds_set_wma_dfs_region(struct regulatory *reg); +void cds_set_wma_dfs_region(uint8_t dfs_region); void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, - chan_params_t *ch_params); + struct ch_params_s *ch_params); #endif /* REGULATORY_H */ diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index a2d3f7066e35..37dcc635a150 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -36,92 +36,9 @@ #include "cds_reg_service.h" #include "qdf_trace.h" #include "sme_api.h" -#include "wlan_hdd_main.h" +#include "cds_api.h" +#include "cds_reg_service.h" #include "cds_regdomain.h" -#include "cds_regdomain_common.h" - -#define WORLD_SKU_MASK 0x00F0 -#define WORLD_SKU_PREFIX 0x0060 -#define REG_WAIT_TIME 50 - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) -#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR -#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR -#endif - -#define REG_RULE_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0) - -#define REG_RULE_2467_2472 REG_RULE(2467-10, 2472+10, 40, 0, 20, \ - NL80211_RRF_PASSIVE_SCAN) - -#define REG_RULE_2484 REG_RULE(2484-10, 2484+10, 40, 0, 20, \ - NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM) - -#define REG_RULE_5180_5320 REG_RULE(5180-10, 5320+10, 80, 0, 20, \ - NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) - -#define REG_RULE_5500_5720 REG_RULE(5500-10, 5720+10, 80, 0, 20, \ - NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) - -#define REG_RULE_5745_5925 REG_RULE(5745-10, 5925+10, 80, 0, 20, \ - NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) - -static const struct ieee80211_regdomain cds_world_regdom_60_61_62 = { - .n_reg_rules = 6, - .alpha2 = "00", - .reg_rules = { - REG_RULE_2412_2462, - REG_RULE_2467_2472, - REG_RULE_2484, - REG_RULE_5180_5320, - REG_RULE_5500_5720, - REG_RULE_5745_5925, - } -}; - -static const struct ieee80211_regdomain cds_world_regdom_63_65 = { - .n_reg_rules = 4, - .alpha2 = "00", - .reg_rules = { - REG_RULE_2412_2462, - REG_RULE_2467_2472, - REG_RULE_5180_5320, - REG_RULE_5745_5925, - } -}; - -static const struct ieee80211_regdomain cds_world_regdom_64 = { - .n_reg_rules = 3, - .alpha2 = "00", - .reg_rules = { - REG_RULE_2412_2462, - REG_RULE_5180_5320, - REG_RULE_5745_5925, - } -}; - -static const struct ieee80211_regdomain cds_world_regdom_66_69 = { - .n_reg_rules = 4, - .alpha2 = "00", - .reg_rules = { - REG_RULE_2412_2462, - REG_RULE_5180_5320, - REG_RULE_5500_5720, - REG_RULE_5745_5925, - } -}; - -static const struct ieee80211_regdomain cds_world_regdom_67_68_6A_6C = { - .n_reg_rules = 5, - .alpha2 = "00", - .reg_rules = { - REG_RULE_2412_2462, - REG_RULE_2467_2472, - REG_RULE_5180_5320, - REG_RULE_5500_5720, - REG_RULE_5745_5925, - } -}; const struct chan_map chan_mapping[NUM_RF_CHANNELS] = { {2412, 1}, @@ -212,143 +129,8 @@ const struct chan_map chan_mapping[NUM_RF_CHANNELS] = { }; struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; -static bool init_by_driver; -static bool init_by_reg_core; - -/** - * cds_is_world_regdomain() - whether world regdomain - * @regd: integer regulatory domain - * - * Return: bool - */ -bool cds_is_world_regdomain(uint32_t reg_domain) -{ - uint32_t temp_regd = reg_domain & ~WORLDWIDE_ROAMING_FLAG; - - return ((temp_regd & COUNTRY_ERD_FLAG) != COUNTRY_ERD_FLAG) && - (((temp_regd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) || - (temp_regd == WORLD)); - -} - - -/** - * cds_world_regdomain() - which constant world regdomain - * @reg: regulatory data - * - * Return: regdomain ptr - */ -static const struct ieee80211_regdomain -*cds_world_regdomain(struct regulatory *reg) -{ - REG_DMN_PAIR_MAPPING *regpair = - (REG_DMN_PAIR_MAPPING *)reg->regpair; - - switch (regpair->regDmnEnum) { - case 0x60: - case 0x61: - case 0x62: - return &cds_world_regdom_60_61_62; - case 0x63: - case 0x65: - return &cds_world_regdom_63_65; - case 0x64: - return &cds_world_regdom_64; - case 0x66: - case 0x69: - return &cds_world_regdom_66_69; - case 0x67: - case 0x68: - case 0x6A: - case 0x6C: - return &cds_world_regdom_67_68_6A_6C; - default: - WARN_ON(1); - return &cds_world_regdom_60_61_62; - } -} - -/** - * cds_regulatory_wiphy_init() - regulatory wiphy init - * @hdd_ctx: hdd context - * @reg: regulatory data - * @wiphy: wiphy structure - * - * Return: int - */ -static int cds_regulatory_wiphy_init(hdd_context_t *hdd_ctx, - struct regulatory *reg, - struct wiphy *wiphy) -{ - const struct ieee80211_regdomain *reg_domain; - - if (cds_is_world_regdomain(reg->reg_domain)) { - reg_domain = cds_world_regdomain(reg); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; -#else - wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; -#endif - } else if (hdd_ctx->config->fRegChangeDefCountry) { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; -#else - wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; -#endif - reg_domain = &cds_world_regdom_60_61_62; - } else { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - wiphy->regulatory_flags |= REGULATORY_STRICT_REG; -#else - wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY; -#endif - reg_domain = &cds_world_regdom_60_61_62; - } - - /* - * save the original driver regulatory flags - */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - hdd_ctx->reg.reg_flags = wiphy->regulatory_flags; -#else - hdd_ctx->reg.reg_flags = wiphy->flags; -#endif - wiphy_apply_custom_regulatory(wiphy, reg_domain); - - /* - * restore the driver regulatory flags since - * wiphy_apply_custom_regulatory may have - * changed them - */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - wiphy->regulatory_flags = hdd_ctx->reg.reg_flags; -#else - wiphy->flags = hdd_ctx->reg.reg_flags; -#endif - - return 0; -} - -/** - * cds_update_regulatory_info() - update regulatory info - * @hdd_ctx: hdd context - * - * Return: QDF_STATUS - */ -static void cds_update_regulatory_info(hdd_context_t *hdd_ctx) -{ - uint32_t country_code; - - country_code = cds_get_country_from_alpha2(hdd_ctx->reg.alpha2); - - hdd_ctx->reg.reg_domain = COUNTRY_ERD_FLAG; - hdd_ctx->reg.reg_domain |= country_code; - - cds_fill_some_regulatory_info(&hdd_ctx->reg); - - return; -} - +uint8_t default_country[CDS_COUNTRY_CODE_LEN + 1]; +uint8_t dfs_region; /** * cds_get_channel_list_with_power() - retrieve channel list with power @@ -418,29 +200,20 @@ QDF_STATUS cds_get_channel_list_with_power(struct channel_power /** * cds_read_default_country() - set the default country - * @default_country: default country + * @def_ctry: default country * * Return: QDF_STATUS */ -QDF_STATUS cds_read_default_country(uint8_t *default_country) +QDF_STATUS cds_read_default_country(uint8_t *def_ctry) { - hdd_context_t *hdd_ctx; - - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - if (!hdd_ctx) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "invalid hdd_ctx pointer"); - return QDF_STATUS_E_FAULT; - } - - memcpy(default_country, - hdd_ctx->reg.def_country, + memcpy(def_ctry, + default_country, CDS_COUNTRY_CODE_LEN + 1); QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "default country is %c%c\n", - default_country[0], - default_country[1]); + def_ctry[0], + def_ctry[1]); return QDF_STATUS_SUCCESS; } @@ -565,90 +338,15 @@ enum channel_width cds_get_max_channel_bw(uint32_t chan_num) } -static int cds_bw20_ch_index_to_bw40_ch_index(int k) -{ - int m = -1; - if (k >= RF_CHAN_1 && k <= RF_CHAN_13) { - /* - * Channel bonding is not valid for channel 14, - * Hence don't consider it - */ - m = k - RF_CHAN_1 + RF_CHAN_BOND_3; - if (m > RF_CHAN_BOND_11) - m = RF_CHAN_BOND_11; - } else if (k >= RF_CHAN_36 && k <= RF_CHAN_64) { - m = k - RF_CHAN_36 + RF_CHAN_BOND_38; - if (m > RF_CHAN_BOND_62) - m = RF_CHAN_BOND_62; - } else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) { - m = k - RF_CHAN_100 + RF_CHAN_BOND_102; - if (m > RF_CHAN_BOND_142) - m = RF_CHAN_BOND_142; - } else if (k >= RF_CHAN_149 && k <= RF_CHAN_165) { - m = k - RF_CHAN_149 + RF_CHAN_BOND_151; - if (m > RF_CHAN_BOND_163) - m = RF_CHAN_BOND_163; - } - return m; -} - -/** - * cds_set_dfs_region() - set the dfs_region - * @dfs_region: the dfs_region to set - * - * Return: QDF_STATUS_SUCCESS if dfs_region set correctly - * QDF_STATUS_E_EXISTS if hdd context not found - */ -QDF_STATUS cds_set_dfs_region(uint8_t dfs_region) -{ - hdd_context_t *hdd_ctx; - - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - - if (NULL == hdd_ctx) - return QDF_STATUS_E_EXISTS; - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - hdd_ctx->reg.dfs_region = dfs_region; -#else - - /* remap the ctl code to dfs region code */ - switch (hdd_ctx->reg.ctl_5g) { - case FCC: - hdd_ctx->reg.dfs_region = DFS_FCC_DOMAIN; - break; - case ETSI: - hdd_ctx->reg.dfs_region = DFS_ETSI_DOMAIN; - break; - case MKK: - hdd_ctx->reg.dfs_region = DFS_MKK4_DOMAIN; - break; - default: - /* set default dfs_region to FCC */ - hdd_ctx->reg.dfs_region = DFS_FCC_DOMAIN; - break; - } -#endif - return QDF_STATUS_SUCCESS; -} - /** * cds_get_dfs_region() - get the dfs_region * @dfs_region: the dfs_region to return * - * Return: QDF_STATUS_SUCCESS if dfs_region set correctly - * QDF_STATUS_E_EXISTS if hdd context not found + * Return: QDF_STATUS */ -QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region) +QDF_STATUS cds_get_dfs_region(uint8_t *dfs_reg) { - hdd_context_t *hdd_ctx; - - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - - if (NULL == hdd_ctx) - return QDF_STATUS_E_EXISTS; - - *dfs_region = hdd_ctx->reg.dfs_region; + *dfs_reg = dfs_region; return QDF_STATUS_SUCCESS; } @@ -665,12 +363,9 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, const uint8_t *country_alpha2, enum country_src source) { - hdd_context_t *hdd_ctx = NULL; - struct wiphy *wiphy = NULL; - if (NULL == reg_domain_ptr) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - ("Invalid reg domain pointer")); + "Invalid reg domain pointer"); return QDF_STATUS_E_FAULT; } @@ -681,7 +376,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, if (NULL == country_alpha2) { QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - ("Country code array is NULL")); + "Country code array is NULL"); return QDF_STATUS_E_FAULT; } @@ -691,28 +386,9 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr, return QDF_STATUS_SUCCESS; } - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - - if (NULL == hdd_ctx) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - ("Invalid pHddCtx pointer")); - return QDF_STATUS_E_FAULT; - } - - wiphy = hdd_ctx->wiphy; - - if ((SOURCE_DRIVER == source) && (false == init_by_reg_core)) { - init_by_driver = true; - if (('0' != country_alpha2[0]) || ('0' != country_alpha2[1])) { - INIT_COMPLETION(hdd_ctx->reg_init); - regulatory_hint(wiphy, country_alpha2); - wait_for_completion_timeout(&hdd_ctx->reg_init, - msecs_to_jiffies(REG_WAIT_TIME)); - } - } else if (SOURCE_11D == source || SOURCE_USERSPACE == source) { + if (SOURCE_11D == source || SOURCE_USERSPACE == source) regulatory_hint_user(country_alpha2, NL80211_USER_REG_HINT_USER); - } return QDF_STATUS_SUCCESS; } @@ -734,431 +410,47 @@ bool cds_is_dsrc_channel(uint16_t center_freq) } /** - * cds_process_regulatory_data() - process regulatory data - * @wiphy: wiphy - * @band_capability: band_capability + * cds_set_reg_domain() - set regulatory domain + * @client_ctxt: client context + * @reg_domain: regulatory domain * - * Return: int + * Return: QDF_STATUS */ -static int cds_process_regulatory_data(struct wiphy *wiphy, - uint8_t band_capability, - bool reset) +QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) { - int i, j, m; - int k = 0, n = 0; - hdd_context_t *hdd_ctx; - const struct ieee80211_reg_rule *reg_rule; - struct ieee80211_channel *chan; - struct regulatory_channel *temp_chan_k, *temp_chan_n, *temp_chan; - - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - if (NULL == hdd_ctx) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "invalid hdd_ctx pointer"); - return QDF_STATUS_E_FAULT; - } - - hdd_ctx->isVHT80Allowed = 0; - - if (band_capability == eCSR_BAND_24) - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, - "band capability is set to 2G only"); - - for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) { - - if (i == IEEE80211_BAND_2GHZ && band_capability == eCSR_BAND_5G) - continue; - - else if (i == IEEE80211_BAND_5GHZ - && band_capability == eCSR_BAND_24) - continue; - - if (wiphy->bands[i] == NULL) - continue; - - if (i == 0) - m = 0; - else - m = wiphy->bands[i-1]->n_channels + m; - - for (j = 0; j < wiphy->bands[i]->n_channels; j++) { - - k = m + j; - n = cds_bw20_ch_index_to_bw40_ch_index(k); - - chan = &(wiphy->bands[i]->channels[j]); - temp_chan_k = &(reg_channels[k]); - temp_chan_n = &(reg_channels[n]); - - if ((!reset) && -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - (wiphy->regulatory_flags & - REGULATORY_CUSTOM_REG)) { -#else - (wiphy->flags & - WIPHY_FLAG_CUSTOM_REGULATORY)) { -#endif - reg_rule = freq_reg_info(wiphy, - MHZ_TO_KHZ(chan-> - center_freq)); - - if (!IS_ERR(reg_rule)) { - chan->flags &= - ~IEEE80211_CHAN_DISABLED; - - if (!(reg_rule->flags & - NL80211_RRF_DFS)) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_INFO, - "%s: Remove passive scan restriction for %u", - __func__, - chan->center_freq); - chan->flags &= - ~IEEE80211_CHAN_RADAR; - } - - if (!(reg_rule->flags & - NL80211_RRF_PASSIVE_SCAN)) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_INFO, - "%s: Remove passive scan restriction for %u", - __func__, - chan->center_freq); - chan->flags &= - ~IEEE80211_CHAN_PASSIVE_SCAN; - } - - if (!(reg_rule->flags & - NL80211_RRF_NO_IBSS)) { - QDF_TRACE(QDF_MODULE_ID_QDF, - QDF_TRACE_LEVEL_INFO, - "%s: Remove no ibss restriction for %u", - __func__, - chan->center_freq); - chan->flags &= - ~IEEE80211_CHAN_NO_IBSS; - } - - chan->max_power = MBM_TO_DBM(reg_rule-> - power_rule. - max_eirp); - } - } - - if (chan->flags & IEEE80211_CHAN_DISABLED) { - temp_chan_k->state = - CHANNEL_STATE_DISABLE; - temp_chan_k->flags = chan->flags; - if (n != -1) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - temp_chan_n->flags = chan->flags; - } - } else if (chan->flags & - (IEEE80211_CHAN_RADAR | - IEEE80211_CHAN_PASSIVE_SCAN -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) - | - IEEE80211_CHAN_INDOOR_ONLY -#endif - )) { - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) - if (chan->flags & - IEEE80211_CHAN_INDOOR_ONLY) - chan->flags |= - IEEE80211_CHAN_PASSIVE_SCAN; -#endif - temp_chan_k->state = CHANNEL_STATE_DFS; - temp_chan_k->pwr_limit = - chan->max_power; - temp_chan_k->flags = chan->flags; - - if (n != -1) { - if ((chan->flags & - IEEE80211_CHAN_NO_HT40) == - IEEE80211_CHAN_NO_HT40) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - } else { - temp_chan_n->state = - CHANNEL_STATE_DFS; - temp_chan_n->pwr_limit = - chan->max_power-3; - } - temp_chan_n->flags = chan->flags; - } - if ((chan->flags & - IEEE80211_CHAN_NO_80MHZ) == 0) - hdd_ctx->isVHT80Allowed = 1; - } else { - temp_chan_k->state = CHANNEL_STATE_ENABLE; - temp_chan_k->pwr_limit = chan->max_power; - temp_chan_k->flags = chan->flags; - if (n != -1) { - if ((chan->flags & - IEEE80211_CHAN_NO_HT40) == - IEEE80211_CHAN_NO_HT40) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - } else { - temp_chan_n->state = - CHANNEL_STATE_ENABLE; - temp_chan_n->pwr_limit = - chan->max_power - 3; - } - temp_chan_n->flags = chan->flags; - } - if ((chan->flags & - IEEE80211_CHAN_NO_80MHZ) == 0) - hdd_ctx->isVHT80Allowed = 1; - } - } - } - - if (0 == (hdd_ctx->reg.eeprom_rd_ext & - (1 << WHAL_REG_EXT_FCC_CH_144))) { - temp_chan = &(reg_channels[RF_CHAN_144]); - temp_chan->state = - CHANNEL_STATE_DISABLE; + if (reg_domain >= REGDOMAIN_COUNT) { + QDF_TRACE(QDF_MODULE_ID_QDF_DEVICE, QDF_TRACE_LEVEL_ERROR, + "CDS set reg domain, invalid REG domain ID %d", + reg_domain); + return QDF_STATUS_E_INVAL; } - if (k == 0) - return -1; - return QDF_STATUS_SUCCESS; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) && !defined(WITH_BACKPORTS) -/** - * restore_custom_reg_settings() - restore custom reg settings - * @wiphy: wiphy structure - * - * Return: void - */ -static void restore_custom_reg_settings(struct wiphy *wiphy) -{ - struct ieee80211_supported_band *sband; - enum ieee80211_band band; - struct ieee80211_channel *chan; - int i; - - for (band = 0; band < IEEE80211_NUM_BANDS; band++) { - sband = wiphy->bands[band]; - if (!sband) - continue; - for (i = 0; i < sband->n_channels; i++) { - chan = &sband->channels[i]; - chan->flags = chan->orig_flags; - chan->max_antenna_gain = chan->orig_mag; - chan->max_power = chan->orig_mpwr; - } - } -} -#endif - /** - * __hdd_reg_notifier() - regulatory notifier - * @wiphy: wiphy - * @request: regulatory request + * cds_put_dfs_region() - save dfs region + * @dfs_reg: dfs region * - * Return: void or int - */ -void __hdd_reg_notifier(struct wiphy *wiphy, - struct regulatory_request *request) -{ - hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - eCsrBand band_capability = eCSR_BAND_ALL; - bool vht80_allowed; - bool reset = false; - - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, - FL("country: %c%c, initiator %d, dfs_region: %d"), - request->alpha2[0], - request->alpha2[1], - request->initiator, - request->dfs_region); - - if (NULL == hdd_ctx) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - ("Invalid pHddCtx pointer")); - return; - } - - if (cds_is_driver_unloading() || cds_is_driver_recovering()) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "%s: Unloading or SSR in Progress, Ignore!!!", - __func__); - return; - } - - sme_get_freq_band(hdd_ctx->hHal, &band_capability); - - /* first check if this callback is in response to the driver callback */ - - switch (request->initiator) { - case NL80211_REGDOM_SET_BY_DRIVER: - case NL80211_REGDOM_SET_BY_CORE: - case NL80211_REGDOM_SET_BY_USER: - - if ((false == init_by_driver) && - (false == init_by_reg_core)) { - - if (NL80211_REGDOM_SET_BY_CORE == request->initiator) { - return; - } - init_by_reg_core = true; - } - - if ((NL80211_REGDOM_SET_BY_DRIVER == request->initiator) && - (true == init_by_driver)) { - - /* - * restore the driver regulatory flags since - * regulatory_hint may have - * changed them - */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - wiphy->regulatory_flags = hdd_ctx->reg.reg_flags; -#else - wiphy->flags = hdd_ctx->reg.reg_flags; -#endif - } - - if (NL80211_REGDOM_SET_BY_CORE == request->initiator) { - hdd_ctx->reg.cc_src = SOURCE_CORE; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) - if (wiphy->regulatory_flags & REGULATORY_CUSTOM_REG) -#else - if (wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) -#endif - reset = true; - } else if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator) - hdd_ctx->reg.cc_src = SOURCE_DRIVER; - else { - hdd_ctx->reg.cc_src = SOURCE_USERSPACE; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) && !defined(WITH_BACKPORTS) - if ((request->alpha2[0] == '0') && - (request->alpha2[1] == '0') && - (wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)) { - restore_custom_reg_settings(wiphy); - reset = true; - } -#endif - } - - hdd_ctx->reg.alpha2[0] = request->alpha2[0]; - hdd_ctx->reg.alpha2[1] = request->alpha2[1]; - - cds_update_regulatory_info(hdd_ctx); - - vht80_allowed = hdd_ctx->isVHT80Allowed; - if (cds_process_regulatory_data(wiphy, band_capability, - reset) == 0) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, - (" regulatory entry created")); - } - if (hdd_ctx->isVHT80Allowed != vht80_allowed) - hdd_checkandupdate_phymode(hdd_ctx); - - if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator) - complete(&hdd_ctx->reg_init); - - sme_generic_change_country_code(hdd_ctx->hHal, - hdd_ctx->reg.alpha2); - - cds_fill_and_send_ctl_to_fw(&hdd_ctx->reg); - - cds_set_dfs_region(request->dfs_region); - - cds_set_wma_dfs_region(&hdd_ctx->reg); - default: - break; - } - - return; -} - -/** - * hdd_reg_notifier() - regulatory notifier - * @wiphy: wiphy - * @request: regulatory request - * - * Return: void or int - */ -void hdd_reg_notifier(struct wiphy *wiphy, - struct regulatory_request *request) -{ - cds_ssr_protect(__func__); - __hdd_reg_notifier(wiphy, request); - cds_ssr_unprotect(__func__); -} - -/** - * cds_regulatory_init() - regulatory_init * Return: QDF_STATUS */ -QDF_STATUS cds_regulatory_init(void) +QDF_STATUS cds_put_dfs_region(uint8_t dfs_reg) { - hdd_context_t *hdd_ctx = NULL; - struct wiphy *wiphy = NULL; - int ret_val = 0; - struct regulatory *reg_info; - - hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); - if (!hdd_ctx) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "invalid hdd_ctx pointer"); - return QDF_STATUS_E_FAULT; - } - - wiphy = hdd_ctx->wiphy; - - reg_info = &hdd_ctx->reg; - - cds_regulatory_wiphy_init(hdd_ctx, reg_info, wiphy); - - if (cds_process_regulatory_data(wiphy, - hdd_ctx->config-> - nBandCapability, true) != 0) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - ("Error while creating regulatory entry")); - return QDF_STATUS_E_FAULT; - } - - reg_info->cc_src = SOURCE_DRIVER; - - ret_val = cds_fill_some_regulatory_info(reg_info); - if (ret_val) { - qdf_print(KERN_ERR "Error in getting country code\n"); - return ret_val; - } - - hdd_ctx->reg.def_country[0] = reg_info->alpha2[0]; - hdd_ctx->reg.def_country[1] = reg_info->alpha2[1]; - - init_completion(&hdd_ctx->reg_init); - - cds_fill_and_send_ctl_to_fw(reg_info); + dfs_region = dfs_reg; return QDF_STATUS_SUCCESS; } /** - * cds_set_reg_domain() - set regulatory domain - * @client_ctxt: client context - * @reg_domain: regulatory domain + * cds_put_default_country() - save the default country + * @dfs_country: default country * * Return: QDF_STATUS */ -QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) +QDF_STATUS cds_put_default_country(uint8_t *def_country) { - if (reg_domain >= REGDOMAIN_COUNT) { - QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "CDS set reg domain, invalid REG domain ID %d", - reg_domain); - return QDF_STATUS_E_INVAL; - } + default_country[0] = def_country[0]; + default_country[1] = def_country[1]; return QDF_STATUS_SUCCESS; } @@ -1172,7 +464,7 @@ QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain) * Return: None */ void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, - chan_params_t *ch_params) + struct ch_params_s *ch_params) { tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE); if (!hal_ctx) { diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index c75d61f0516e..0507496b9598 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -557,7 +557,7 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, * * Return: none */ -void cds_set_wma_dfs_region(struct regulatory *reg) +void cds_set_wma_dfs_region(uint8_t dfs_region) { tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); @@ -566,8 +566,8 @@ void cds_set_wma_dfs_region(struct regulatory *reg) return; } - qdf_print("%s: dfs_region: %d", __func__, reg->dfs_region); - wma_set_dfs_region(wma, reg->dfs_region); + qdf_print("%s: dfs_region: %d", __func__, dfs_region); + wma_set_dfs_region(wma, dfs_region); } void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index fb65d0a832bc..796e10da61c1 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1344,7 +1344,7 @@ struct hdd_context_s { -------------------------------------------------------------------------*/ int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter, uint32_t chan_number, - phy_ch_width chan_bw); + enum ch_width chan_bw); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH void wlan_hdd_check_sta_ap_concurrent_ch_intf(void *sta_pAdapter); #endif @@ -1530,7 +1530,7 @@ const char *hdd_get_fwpath(void); void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind); hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, uint32_t sme_session_id); -phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); +enum ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); void hdd_update_config(hdd_context_t *hdd_ctx); diff --git a/core/hdd/inc/wlan_hdd_regulatory.h b/core/hdd/inc/wlan_hdd_regulatory.h new file mode 100644 index 000000000000..d541b14ba95c --- /dev/null +++ b/core/hdd/inc/wlan_hdd_regulatory.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ + +#if !defined __HDD_REGULATORY_H +#define __HDD_REGULATORY_H + +/** + * DOC: wlan_hdd_regulatory.h + * + * HDD Regulatory prototype implementation + */ + +int hdd_regulatory_init(hdd_context_t *hdd_ctx, struct wiphy *wiphy); + +void hdd_program_country_code(hdd_context_t *hdd_ctx); + +#endif diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 7b229e68015d..9176680ed33f 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -7776,7 +7776,7 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel) { uint8_t iniDot11Mode = (WLAN_HDD_GET_CTX(pAdapter))->config->dot11Mode; eHddDot11Mode hddDot11Mode = iniDot11Mode; - chan_params_t ch_params; + struct ch_params_s ch_params; ch_params.ch_width = (WLAN_HDD_GET_CTX(pAdapter))->config->vhtChannelWidth; @@ -11166,7 +11166,7 @@ static int __wlan_hdd_cfg80211_channel_switch(struct wiphy *wiphy, uint8_t channel; uint16_t freq; int ret; - phy_ch_width ch_width; + enum ch_width ch_width; hddLog(LOG1, FL("Set Freq %d"), csa_params->chandef.chan->center_freq); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 2e82f5fc8fa8..4351c7219b13 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2005,7 +2005,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, * Return: 0 for success, non zero for failure */ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, - phy_ch_width target_bw) + enum ch_width target_bw) { QDF_STATUS status; int ret = 0; diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 0706e56e6134..eff1d5d7bd42 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -58,8 +58,8 @@ eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4]); int hdd_softap_set_channel_change(struct net_device *dev, - int target_channel, - phy_ch_width target_bw); + int target_channel, + enum ch_width target_bw); eCsrEncryptionType hdd_translate_rsn_to_csr_encryption_type(uint8_t cipher_suite[4]); diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 25882c73105c..e8d80bb0da8d 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -6022,7 +6022,7 @@ static int drv_cmd_set_channel_switch(hdd_adapter_t *adapter, int status; uint32_t chan_number = 0, chan_bw = 0; uint8_t *value = command; - phy_ch_width width; + enum ch_width width; if ((adapter->device_mode != WLAN_HDD_P2P_GO) && (adapter->device_mode != WLAN_HDD_SOFTAP)) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f24caa1db9b6..8c4a7bf3bd1c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -106,6 +106,7 @@ #include "wlan_hdd_green_ap.h" #include "platform_icnss.h" #include "bmi.h" +#include #ifdef MODULE #define WLAN_MODULE_NAME module_name(THIS_MODULE) @@ -245,7 +246,7 @@ const char *hdd_device_mode_to_string(uint8_t device_mode) */ int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter, uint32_t chan_number, - phy_ch_width chan_bw) + enum ch_width chan_bw) { uint8_t chan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; uint32_t len = WNI_CFG_VALID_CHANNEL_LIST_LEN, i; @@ -432,7 +433,7 @@ static int curr_con_mode; * Return: Converted channel width. In case of non matching NL channel width, * CH_WIDTH_MAX will be returned. */ -phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width) +enum ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width) { switch (ch_width) { case NL80211_CHAN_WIDTH_20_NOHT: @@ -4163,10 +4164,10 @@ bool hdd_is_5g_supported(hdd_context_t *hdd_ctx) return true; } -static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) +static int hdd_wiphy_init(hdd_context_t *hdd_ctx) { struct wiphy *wiphy; - QDF_STATUS status = QDF_STATUS_SUCCESS; + int ret_val; wiphy = hdd_ctx->wiphy; @@ -4174,11 +4175,10 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) * The channel information in * wiphy needs to be initialized before wiphy registration */ - status = cds_regulatory_init(); - if (!QDF_IS_STATUS_SUCCESS(status)) { - hddLog(QDF_TRACE_LEVEL_FATAL, - FL("cds_init_wiphy failed")); - return status; + ret_val = hdd_regulatory_init(hdd_ctx, wiphy); + if (ret_val) { + hdd_alert("regulatory init failed"); + return ret_val; } #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) @@ -4200,12 +4200,11 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx) #endif /* registration of wiphy dev with cfg80211 */ - if (0 > wlan_hdd_cfg80211_register(wiphy)) { - hddLog(QDF_TRACE_LEVEL_ERROR, FL("wiphy register failed")); - status = QDF_STATUS_E_FAILURE; - } + ret_val = wlan_hdd_cfg80211_register(wiphy); + if (0 > ret_val) + hdd_err("wiphy registration failed"); - return status; + return ret_val; } #ifdef MSM_PLATFORM @@ -5468,6 +5467,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) tSirTxPowerLimit hddtxlimit; bool rtnl_held; tSirRetStatus hal_status; + int ret_val; ENTER(); @@ -5516,11 +5516,10 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) ol_txrx_register_pause_cb(wlan_hdd_txrx_pause_cb); - status = wlan_hdd_regulatory_init(hdd_ctx); + ret_val = hdd_wiphy_init(hdd_ctx); - if (status != QDF_STATUS_SUCCESS) { - hddLog(QDF_TRACE_LEVEL_FATAL, - FL("Failed to init channel list")); + if (ret_val) { + hdd_alert("failed to initialize wiphy"); goto err_cds_close; } @@ -5554,6 +5553,8 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) __func__, ret); } + hdd_program_country_code(hdd_ctx); + status = hdd_set_sme_chan_list(hdd_ctx); if (status != QDF_STATUS_SUCCESS) { hddLog(QDF_TRACE_LEVEL_FATAL, diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c new file mode 100644 index 000000000000..35886b71ac87 --- /dev/null +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -0,0 +1,766 @@ +/* + * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. + */ + +/** + * DOC: wlan_hdd_regulatory.c + * + * hdd regulatory implementation + */ + +#include "qdf_types.h" +#include "cds_reg_service.h" +#include "qdf_trace.h" +#include "sme_api.h" +#include "wlan_hdd_main.h" +#include "cds_regdomain.h" +#include "cds_regdomain_common.h" +#include "wlan_hdd_regulatory.h" + +#define WORLD_SKU_MASK 0x00F0 +#define WORLD_SKU_PREFIX 0x0060 +#define REG_WAIT_TIME 50 + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +#define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR +#define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR +#endif + +#define REG_RULE_2412_2462 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0) + +#define REG_RULE_2467_2472 REG_RULE(2467-10, 2472+10, 40, 0, 20, \ + NL80211_RRF_PASSIVE_SCAN) + +#define REG_RULE_2484 REG_RULE(2484-10, 2484+10, 40, 0, 20, \ + NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM) + +#define REG_RULE_5180_5320 REG_RULE(5180-10, 5320+10, 80, 0, 20, \ + NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) + +#define REG_RULE_5500_5720 REG_RULE(5500-10, 5720+10, 80, 0, 20, \ + NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) + +#define REG_RULE_5745_5925 REG_RULE(5745-10, 5925+10, 80, 0, 20, \ + NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS) + +static bool init_by_driver; +static bool init_by_reg_core; + +static const struct ieee80211_regdomain +hdd_world_regrules_60_61_62 = { + .n_reg_rules = 6, + .alpha2 = "00", + .reg_rules = { + REG_RULE_2412_2462, + REG_RULE_2467_2472, + REG_RULE_2484, + REG_RULE_5180_5320, + REG_RULE_5500_5720, + REG_RULE_5745_5925, + } +}; + +static const struct ieee80211_regdomain +hdd_world_regrules_63_65 = { + .n_reg_rules = 4, + .alpha2 = "00", + .reg_rules = { + REG_RULE_2412_2462, + REG_RULE_2467_2472, + REG_RULE_5180_5320, + REG_RULE_5745_5925, + } +}; + +static const struct ieee80211_regdomain +hdd_world_regrules_64 = { + .n_reg_rules = 3, + .alpha2 = "00", + .reg_rules = { + REG_RULE_2412_2462, + REG_RULE_5180_5320, + REG_RULE_5745_5925, + } +}; + +static const struct ieee80211_regdomain +hdd_world_regrules_66_69 = { + .n_reg_rules = 4, + .alpha2 = "00", + .reg_rules = { + REG_RULE_2412_2462, + REG_RULE_5180_5320, + REG_RULE_5500_5720, + REG_RULE_5745_5925, + } +}; + +static const struct ieee80211_regdomain +hdd_world_regrules_67_68_6A_6C = { + .n_reg_rules = 5, + .alpha2 = "00", + .reg_rules = { + REG_RULE_2412_2462, + REG_RULE_2467_2472, + REG_RULE_5180_5320, + REG_RULE_5500_5720, + REG_RULE_5745_5925, + } +}; + +/** + * hdd_get_world_regrules() - get the appropriate world regrules + * @reg: regulatory data + * + * Return: regulatory rules ptr + */ +static const struct ieee80211_regdomain *hdd_get_world_regrules( +struct regulatory *reg) +{ + REG_DMN_PAIR_MAPPING *regpair = + (REG_DMN_PAIR_MAPPING *)reg->regpair; + + switch (regpair->regDmnEnum) { + case 0x60: + case 0x61: + case 0x62: + return &hdd_world_regrules_60_61_62; + case 0x63: + case 0x65: + return &hdd_world_regrules_63_65; + case 0x64: + return &hdd_world_regrules_64; + case 0x66: + case 0x69: + return &hdd_world_regrules_66_69; + case 0x67: + case 0x68: + case 0x6A: + case 0x6C: + return &hdd_world_regrules_67_68_6A_6C; + default: + hdd_warn("invalid world mode in BDF"); + return &hdd_world_regrules_60_61_62; + } +} + +/** + * hdd_is_world_regdomain() - whether world regdomain + * @reg_domain: integer regulatory domain + * + * Return: bool + */ +bool hdd_is_world_regdomain(uint32_t reg_domain) +{ + uint32_t temp_regd = reg_domain & ~WORLDWIDE_ROAMING_FLAG; + + return ((temp_regd & COUNTRY_ERD_FLAG) != COUNTRY_ERD_FLAG) && + (((temp_regd & WORLD_SKU_MASK) == WORLD_SKU_PREFIX) || + (temp_regd == WORLD)); +} + + +/** + * hdd_update_regulatory_info() - update regulatory info + * @hdd_ctx: hdd context + * + * Return: void + */ +static void hdd_update_regulatory_info(hdd_context_t *hdd_ctx) +{ + uint32_t country_code; + + country_code = cds_get_country_from_alpha2(hdd_ctx->reg.alpha2); + + hdd_ctx->reg.reg_domain = COUNTRY_ERD_FLAG; + hdd_ctx->reg.reg_domain |= country_code; + + cds_fill_some_regulatory_info(&hdd_ctx->reg); + +} + +/** + * hdd_regulatory_wiphy_init() - regulatory wiphy init + * @hdd_ctx: hdd context + * @reg: regulatory data + * @wiphy: wiphy structure + * + * Return: void + */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +static void hdd_regulatory_wiphy_init(hdd_context_t *hdd_ctx, + struct regulatory *reg, + struct wiphy *wiphy) +{ + const struct ieee80211_regdomain *reg_rules; + + if (hdd_is_world_regdomain(reg->reg_domain)) { + reg_rules = hdd_get_world_regrules(reg); + wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; + } else if (hdd_ctx->config->fRegChangeDefCountry) { + wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG; + reg_rules = &hdd_world_regrules_60_61_62; + } else { + wiphy->regulatory_flags |= REGULATORY_STRICT_REG; + reg_rules = &hdd_world_regrules_60_61_62; + } + + /* + * save the original driver regulatory flags + */ + hdd_ctx->reg.reg_flags = wiphy->regulatory_flags; + wiphy_apply_custom_regulatory(wiphy, reg_rules); + + /* + * restore the driver regulatory flags since + * wiphy_apply_custom_regulatory may have + * changed them + */ + wiphy->regulatory_flags = hdd_ctx->reg.reg_flags; + +} +#else +static void hdd_regulatory_wiphy_init(hdd_context_t *hdd_ctx, + struct regulatory *reg, + struct wiphy *wiphy) +{ + const struct ieee80211_regdomain *reg_rules; + + if (hdd_is_world_regdomain(reg->reg_domain)) { + reg_rules = hdd_get_world_regrules(reg); + wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; + } else if (hdd_ctx->config->fRegChangeDefCountry) { + wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; + reg_rules = &hdd_world_regrules_60_61_62; + } else { + wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY; + reg_rules = &hdd_world_regrules_60_61_62; + } + + /* + * save the original driver regulatory flags + */ + hdd_ctx->reg.reg_flags = wiphy->flags; + wiphy_apply_custom_regulatory(wiphy, reg_rules); + + /* + * restore the driver regulatory flags since + * wiphy_apply_custom_regulatory may have + * changed them + */ + wiphy->flags = hdd_ctx->reg.reg_flags; + +} +#endif + +/** + * hdd_bw20_ch_index_to_() - convert 20 mhhz channel index to 40 mhz index + * @k: 20 mhz channel index + * + * Return: void + */ +static int hdd_bw20_ch_index_to_bw40_ch_index(int k) +{ + int m = -1; + + if (k >= RF_CHAN_1 && k <= RF_CHAN_14) { + m = k - RF_CHAN_1 + RF_CHAN_BOND_3; + if (m > RF_CHAN_BOND_11) + m = RF_CHAN_BOND_11; + } else if (k >= RF_CHAN_36 && k <= RF_CHAN_64) { + m = k - RF_CHAN_36 + RF_CHAN_BOND_38; + if (m > RF_CHAN_BOND_62) + m = RF_CHAN_BOND_62; + } else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) { + m = k - RF_CHAN_100 + RF_CHAN_BOND_102; + if (m > RF_CHAN_BOND_142) + m = RF_CHAN_BOND_142; + } else if (k >= RF_CHAN_149 && k <= RF_CHAN_165) { + m = k - RF_CHAN_149 + RF_CHAN_BOND_151; + if (m > RF_CHAN_BOND_163) + m = RF_CHAN_BOND_163; + } + + return m; +} + +/** + * is_wiphy_custom_regulatory() - is custom regulatory defined + * @wiphy: wiphy + * + * Return: int + */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +static int is_wiphy_custom_regulatory(struct wiphy *wiphy) +{ + + return wiphy->regulatory_flags & REGULATORY_CUSTOM_REG; +} +#else +static int is_wiphy_custom_regulatory(struct wiphy *wiphy) +{ + return wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY; +} +#endif + + +/** + * hdd_modify_wiphy() - modify wiphy + * @wiphy: wiphy + * @chan: channel structure + * + * Return: void + */ +static void hdd_modify_wiphy(struct wiphy *wiphy, + struct ieee80211_channel *chan) +{ + const struct ieee80211_reg_rule *reg_rule; + + if (is_wiphy_custom_regulatory(wiphy)) { + reg_rule = freq_reg_info(wiphy, MHZ_TO_KHZ(chan->center_freq)); + if (!IS_ERR(reg_rule)) { + chan->flags &= ~IEEE80211_CHAN_DISABLED; + + if (!(reg_rule->flags & NL80211_RRF_DFS)) { + hdd_info("%s: remove dfs restriction for %u", + __func__, chan->center_freq); + chan->flags &= ~IEEE80211_CHAN_RADAR; + } + + if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN)) { + hdd_info("%s: remove passive restriction for %u", + __func__, chan->center_freq); + chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN; + } + + if (!(reg_rule->flags & NL80211_RRF_NO_IBSS)) { + hdd_info("%s: remove no ibss restriction for %u", + __func__, chan->center_freq); + chan->flags &= ~IEEE80211_CHAN_NO_IBSS; + } + + chan->max_power = + MBM_TO_DBM(reg_rule->power_rule.max_eirp); + } + } +} + +/** + * hdd_process_regulatory_data() - process regulatory data + * @hdd_ctx: hdd context + * @wiphy: wiphy + * @reset: whether to reset channel data + * + * Return: void + */ +static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, + struct wiphy *wiphy, + bool reset) +{ + int i, j, m; + int k = 0, n = 0; + struct ieee80211_channel *chan; + struct regulatory_channel *temp_chan_k, *temp_chan_n, *temp_chan; + uint8_t band_capability; + + band_capability = hdd_ctx->config->nBandCapability; + + hdd_ctx->isVHT80Allowed = 0; + + if (band_capability == eCSR_BAND_24) + hdd_info("band capability is set to 2G only"); + + for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) { + + if (i == IEEE80211_BAND_2GHZ && + band_capability == eCSR_BAND_5G) + continue; + + else if (i == IEEE80211_BAND_5GHZ && + band_capability == eCSR_BAND_24) + continue; + + if (wiphy->bands[i] == NULL) { + hdd_info("wiphy band no %d is NULL", i); + continue; + } + + if (i == 0) + m = 0; + else + m = wiphy->bands[i-1]->n_channels + m; + + for (j = 0; j < wiphy->bands[i]->n_channels; j++) { + + k = m + j; + n = hdd_bw20_ch_index_to_bw40_ch_index(k); + + chan = &(wiphy->bands[i]->channels[j]); + temp_chan_k = &(reg_channels[k]); + temp_chan_n = &(reg_channels[n]); + + if (!reset) + hdd_modify_wiphy(wiphy, chan); + + if (chan->flags & IEEE80211_CHAN_DISABLED) { + temp_chan_k->state = + CHANNEL_STATE_DISABLE; + temp_chan_k->flags = chan->flags; + if (n != -1) { + temp_chan_n->state = + CHANNEL_STATE_DISABLE; + temp_chan_n->flags = chan->flags; + } + } else if (chan->flags & + (IEEE80211_CHAN_RADAR | + IEEE80211_CHAN_PASSIVE_SCAN | + IEEE80211_CHAN_INDOOR_ONLY)) { + + if (chan->flags & + IEEE80211_CHAN_INDOOR_ONLY) + chan->flags |= + IEEE80211_CHAN_PASSIVE_SCAN; + temp_chan_k->state = CHANNEL_STATE_DFS; + temp_chan_k->pwr_limit = + chan->max_power; + temp_chan_k->flags = chan->flags; + + if (n != -1) { + if ((chan->flags & + IEEE80211_CHAN_NO_HT40) == + IEEE80211_CHAN_NO_HT40) { + temp_chan_n->state = + CHANNEL_STATE_DISABLE; + } else { + temp_chan_n->state = + CHANNEL_STATE_DFS; + temp_chan_n->pwr_limit = + chan->max_power-3; + } + temp_chan_n->flags = chan->flags; + } + if ((chan->flags & + IEEE80211_CHAN_NO_80MHZ) == 0) + hdd_ctx->isVHT80Allowed = 1; + } else { + temp_chan_k->state = CHANNEL_STATE_ENABLE; + temp_chan_k->pwr_limit = chan->max_power; + temp_chan_k->flags = chan->flags; + if (n != -1) { + if ((chan->flags & + IEEE80211_CHAN_NO_HT40) == + IEEE80211_CHAN_NO_HT40) { + temp_chan_n->state = + CHANNEL_STATE_DISABLE; + } else { + temp_chan_n->state = + CHANNEL_STATE_ENABLE; + temp_chan_n->pwr_limit = + chan->max_power - 3; + } + temp_chan_n->flags = chan->flags; + } + if ((chan->flags & + IEEE80211_CHAN_NO_80MHZ) == 0) + hdd_ctx->isVHT80Allowed = 1; + } + } + } + + if (0 == (hdd_ctx->reg.eeprom_rd_ext & + (1 << WHAL_REG_EXT_FCC_CH_144))) { + temp_chan = &(reg_channels[RF_CHAN_144]); + temp_chan->state = + CHANNEL_STATE_DISABLE; + } + +} + + +/** + * hdd_regulatory_init() - regulatory_init + * @hdd_ctx: hdd context + * @wiphy: wiphy + * + * Return: int + */ +int hdd_regulatory_init(hdd_context_t *hdd_ctx, struct wiphy *wiphy) +{ + int ret_val; + struct regulatory *reg_info; + + reg_info = &hdd_ctx->reg; + + hdd_regulatory_wiphy_init(hdd_ctx, reg_info, wiphy); + + hdd_process_regulatory_data(hdd_ctx, wiphy, true); + + reg_info->cc_src = SOURCE_DRIVER; + + ret_val = cds_fill_some_regulatory_info(reg_info); + if (ret_val) { + hdd_err("incorrect BDF regulatory data"); + return ret_val; + } + + cds_put_default_country(reg_info->alpha2); + + init_completion(&hdd_ctx->reg_init); + + cds_fill_and_send_ctl_to_fw(reg_info); + + return 0; +} + +/** + * hdd_program_country_code() - process channel information from country code + * @hdd_ctx: hddc context + * + * Return: void + */ +void hdd_program_country_code(hdd_context_t *hdd_ctx) +{ + struct wiphy *wiphy = hdd_ctx->wiphy; + uint8_t *country_alpha2 = hdd_ctx->reg.alpha2; + + if (false == init_by_reg_core) { + init_by_driver = true; + if (('0' != country_alpha2[0]) || + ('0' != country_alpha2[1])) { + INIT_COMPLETION(hdd_ctx->reg_init); + regulatory_hint(wiphy, country_alpha2); + wait_for_completion_timeout(&hdd_ctx->reg_init, + msecs_to_jiffies(REG_WAIT_TIME)); + } + } +} + + +/** + * hdd_set_dfs_region() - set the dfs_region + * @dfs_region: the dfs_region to set + * + * Return: void + */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +static void hdd_set_dfs_region(hdd_context_t *hdd_ctx, + uint8_t dfs_reg) +{ + cds_put_dfs_region(dfs_reg); +} +#else +static void hdd_set_dfs_region(hdd_context_t *hdd_ctx, + uint8_t dfs_reg) +{ + + /* remap the ctl code to dfs region code */ + switch (hdd_ctx->reg.ctl_5g) { + case FCC: + cds_put_dfs_region(DFS_FCC_DOMAIN); + break; + case ETSI: + cds_put_dfs_region(DFS_ETSI_DOMAIN); + break; + case MKK: + cds_put_dfs_region(DFS_MKK4_DOMAIN); + break; + default: + /* set default dfs_region to FCC */ + cds_put_dfs_region(DFS_FCC_DOMAIN); + break; + } + +} +#endif + +/** + * hdd_restore_custom_reg_settings() - restore custom reg settings + * @wiphy: wiphy structure + * @country_alpha2: alpha2 of the country + * @reset: whether wiphy is reset + * + * Return: void + */ +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +static void hdd_restore_custom_reg_settings(struct wiphy *wiphy, + uint8_t *country_alpha2, + bool *reset) +{ +} +#else +static void hdd_restore_custom_reg_settings(struct wiphy *wiphy, + uint8_t *country_alpha2, + bool *reset) +{ + struct ieee80211_supported_band *sband; + enum ieee80211_band band; + struct ieee80211_channel *chan; + int i; + + if ((country_alpha2[0] == '0') && + (country_alpha2[1] == '0') && + (wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY)) { + + for (band = 0; band < IEEE80211_NUM_BANDS; band++) { + sband = wiphy->bands[band]; + if (!sband) + continue; + for (i = 0; i < sband->n_channels; i++) { + chan = &sband->channels[i]; + chan->flags = chan->orig_flags; + chan->max_antenna_gain = chan->orig_mag; + chan->max_power = chan->orig_mpwr; + } + } + *reset = true; + } +} +#endif + + +/** + * hdd_restore_reg_flags() - restore regulatory flags + * @flags: regulatory flags + * + * Return: void + */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(WITH_BACKPORTS) +static void hdd_restore_reg_flags(struct wiphy *wiphy, uint32_t flags) +{ + wiphy->regulatory_flags = flags; +} +#else +static void hdd_restore_reg_flags(struct wiphy *wiphy, uint32_t flags) +{ + wiphy->flags = flags; +} +#endif + + +/** + * hdd_reg_notifier() - regulatory notifier + * @wiphy: wiphy + * @request: regulatory request + * + * Return: void + */ +void hdd_reg_notifier(struct wiphy *wiphy, + struct regulatory_request *request) +{ + hdd_context_t *hdd_ctx = wiphy_priv(wiphy); + eCsrBand band_capability = eCSR_BAND_ALL; + bool vht80_allowed; + bool reset = false; + uint8_t dfs_reg; + + hdd_info("country: %c%c, initiator %d, dfs_region: %d", + request->alpha2[0], + request->alpha2[1], + request->initiator, + request->dfs_region); + + if (NULL == hdd_ctx) { + hdd_err("invalid hdd_ctx pointer"); + return; + } + + if (cds_is_driver_unloading() || cds_is_driver_recovering()) { + hdd_err("%s: unloading or ssr in progress, ignore", + __func__); + return; + } + + sme_get_freq_band(hdd_ctx->hHal, &band_capability); + + /* first check if this callback is in response to the driver callback */ + + switch (request->initiator) { + case NL80211_REGDOM_SET_BY_DRIVER: + case NL80211_REGDOM_SET_BY_CORE: + case NL80211_REGDOM_SET_BY_USER: + + if ((false == init_by_driver) && + (false == init_by_reg_core)) { + + if (NL80211_REGDOM_SET_BY_CORE == request->initiator) + return; + init_by_reg_core = true; + } + + if ((NL80211_REGDOM_SET_BY_DRIVER == request->initiator) && + (true == init_by_driver)) { + + /* + * restore the driver regulatory flags since + * regulatory_hint may have + * changed them + */ + hdd_restore_reg_flags(wiphy, hdd_ctx->reg.reg_flags); + } + + if (NL80211_REGDOM_SET_BY_CORE == request->initiator) { + hdd_ctx->reg.cc_src = SOURCE_CORE; + if (is_wiphy_custom_regulatory(wiphy)) + reset = true; + } else if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator) + hdd_ctx->reg.cc_src = SOURCE_DRIVER; + else { + hdd_ctx->reg.cc_src = SOURCE_USERSPACE; + hdd_restore_custom_reg_settings(wiphy, + request->alpha2, + &reset); + } + + hdd_ctx->reg.alpha2[0] = request->alpha2[0]; + hdd_ctx->reg.alpha2[1] = request->alpha2[1]; + + hdd_update_regulatory_info(hdd_ctx); + + vht80_allowed = hdd_ctx->isVHT80Allowed; + + hdd_process_regulatory_data(hdd_ctx, wiphy, reset); + + if (hdd_ctx->isVHT80Allowed != vht80_allowed) + hdd_checkandupdate_phymode(hdd_ctx); + + if (NL80211_REGDOM_SET_BY_DRIVER == request->initiator) + complete(&hdd_ctx->reg_init); + + sme_generic_change_country_code(hdd_ctx->hHal, + hdd_ctx->reg.alpha2); + + cds_fill_and_send_ctl_to_fw(&hdd_ctx->reg); + + hdd_set_dfs_region(hdd_ctx, request->dfs_region); + + cds_get_dfs_region(&dfs_reg); + cds_set_wma_dfs_region(dfs_reg); + break; + + default: + break; + } +} diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 4e38f8a21ab3..e32a9d9c65c5 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -38,6 +38,9 @@ #ifndef __SIR_API_H #define __SIR_API_H +#include "qdf_types.h" +#include "cds_reg_service.h" +#include "cds_regdomain.h" #include "sir_types.h" #include "sir_mac_prot_def.h" #include "ani_system_defs.h" @@ -288,37 +291,6 @@ struct rrm_config_param { uint8_t max_randn_interval; uint8_t rm_capability[RMENABLEDCAP_MAX_LEN]; }; -/** - * typedef ch_width - channel width - * @CH_WIDTH_20MHZ: channel width 20 MHz - * @CH_WIDTH_40MHZ: channel width 40 MHz - * @CH_WIDTH_80MHZ: channel width 80MHz - * @CH_WIDTH_160MHZ: channel width 160 MHz - * @CH_WIDTH_80P80MHZ: channel width 160MHz(80+80) - */ -typedef enum ch_width { - CH_WIDTH_20MHZ = 0, - CH_WIDTH_40MHZ = 1, - CH_WIDTH_80MHZ = 2, - CH_WIDTH_160MHZ = 3, - CH_WIDTH_80P80MHZ = 4, - CH_WIDTH_MAX -} phy_ch_width; - -/** - * struct ch_params_s - * - * @ch_width: channel width - * @sec_ch_offset: secondary channel offset - * @center_freq_seg0: center freq for segment 0 - * @center_freq_seg1: center freq for segment 1 - */ -typedef struct ch_params_s { - enum ch_width ch_width; - uint8_t sec_ch_offset; - uint8_t center_freq_seg0; - uint8_t center_freq_seg1; -} chan_params_t; /* each station added has a rate mode which specifies the sta attributes */ typedef enum eStaRateMode { @@ -3838,7 +3810,7 @@ typedef struct sSirChanChangeRequest { uint16_t messageLen; uint8_t targetChannel; uint8_t sec_ch_offset; - phy_ch_width ch_width; + enum ch_width ch_width; uint8_t center_freq_seg_0; uint8_t center_freq_seg_1; uint8_t bssid[QDF_MAC_ADDR_SIZE]; diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 336a0e8b921a..ce289a4be5ea 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -506,7 +506,7 @@ typedef struct sLimChannelSwitchInfo { uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t sec_ch_offset; - phy_ch_width ch_width; + enum ch_width ch_width; int8_t switchCount; uint32_t switchTimeoutValue; uint8_t switchMode; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index a95238389f7c..67efbf02a084 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -313,7 +313,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ tLimOperatingModeInfo gLimOperatingMode; uint8_t vhtCapabilityPresentInBeacon; uint8_t ch_center_freq_seg0; - phy_ch_width ch_width; + enum ch_width ch_width; uint8_t ch_center_freq_seg1; uint8_t txBFIniFeatureEnabled; uint8_t txbf_csn_value; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index d4b6d522cffd..003034de9b85 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -2888,7 +2888,7 @@ void lim_complete_mlm_scan(tpAniSirGlobal mac_ctx, tSirResultCodes ret_code) */ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, int8_t max_tx_power, + enum ch_width ch_width, int8_t max_tx_power, uint8_t pe_session_id) { tpPESession pe_session; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index b3ed1956dfb9..e04af171c9b5 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -207,7 +207,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, + enum ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart) diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index 7db70c48c89a..5bca22005521 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -67,10 +67,11 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, + enum ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart); + tSirRetStatus lim_send_edca_params(tpAniSirGlobal pMac, tSirMacEdcaParamRecord *pUpdatedEdcaParams, uint16_t bssIdx); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 6e9d4947b4e4..73adb6ea9983 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2023,7 +2023,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) uint8_t session_id; uint16_t aid = 0; uint16_t chan_space = 0; - chan_params_t ch_params; + struct ch_params_s ch_params; tLimWiderBWChannelSwitchInfo *chnl_switch_info = NULL; tLimChannelSwitchInfo *lim_ch_switch = NULL; diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index a8ed59362051..c6067ac77ea4 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -552,7 +552,7 @@ uint32_t lim_defer_msg(tpAniSirGlobal, tSirMsgQ *); /* / Function that Switches the Channel and sets the CB Mode */ void lim_set_channel(tpAniSirGlobal pMac, uint8_t channel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width, int8_t maxTxPower, + enum ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 512cf83bf60b..bb560d56e555 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -2727,7 +2727,7 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, uint8_t newChannel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width) + enum ch_width ch_width) { uint8_t subband = 0; diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 98b1e17cfa20..7d4ea1d3606b 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -219,7 +219,7 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, uint8_t newChannel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - phy_ch_width ch_width); + enum ch_width ch_width); void limUpdateStaRunTimeHTSwtichChnlParams(tpAniSirGlobal pMac, tDot11fIEHTInfo *pRcvdHTInfo, uint8_t bssIdx); diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index f0564b504fec..e7930449da74 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -507,7 +507,7 @@ typedef struct sap_Config { struct qdf_mac_addr self_macaddr; /* self macaddress or BSSID */ uint8_t channel; /* Operation channel */ uint8_t sec_ch; - chan_params_t ch_params; + struct ch_params_s ch_params; uint32_t ch_width_orig; uint8_t max_num_sta; /* maximum number of STAs in station table */ uint8_t dtim_period; /* dtim interval */ @@ -621,9 +621,9 @@ typedef struct sSapDfsInfo { * New channel width and new channel bonding mode * will only be updated via channel fallback mechanism */ - phy_ch_width orig_chanWidth; - phy_ch_width new_chanWidth; - chan_params_t new_ch_params; + enum ch_width orig_chanWidth; + enum ch_width new_chanWidth; + struct ch_params_s new_ch_params; /* * INI param to enable/disable SAP W53 @@ -827,9 +827,8 @@ QDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, QDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, struct tagCsrDelStaParams *pDelStaParams); QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, - uint32_t targetChannel, phy_ch_width target_bw); -QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, - tCsrRoamSetKey *pSetKeyInfo); + uint32_t targetChannel, enum ch_width target_bw); +QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, QDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 777c0ed9f995..643a21ee070a 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -238,7 +238,7 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx, uint32_t sec_ch) { uint32_t channel = sap_ctx->acs_cfg->pri_ch; - chan_params_t ch_params = {0}; + struct ch_params_s ch_params = {0}; ch_params.ch_width = sap_ctx->acs_cfg->ch_width; sme_set_ch_params(hal, sap_ctx->csr_roamProfile.phyMode, channel, diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index f1122249349e..b5a7353d4836 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -890,7 +890,7 @@ static inline void sap_event_init(ptWLAN_SAPEvent sapEvent) */ bool sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, - phy_ch_width ch_width, + enum ch_width ch_width, uint8_t NOL_channel, tSapTxLeakInfo **pTarget_chnl_mtrx) { @@ -955,7 +955,7 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, QDF_STATUS sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, - phy_ch_width ch_width, + enum ch_width ch_width, tSapDfsNolInfo *nol, uint8_t temp_ch_lst_sz, uint8_t *temp_ch_lst) @@ -1069,7 +1069,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel) * Return: number of channels found */ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, - phy_ch_width ch_width, + enum ch_width ch_width, uint8_t *avail_chnl) { uint8_t i = 0; @@ -1246,7 +1246,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) uint8_t channelID; tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); tpAniSirGlobal pMac; - phy_ch_width ch_width; + enum ch_width ch_width; uint8_t *tmp_ch_lst = NULL; uint8_t dfs_region; diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index d52d4f6d0059..3a1d2c8af965 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -212,7 +212,7 @@ typedef struct sSapContext { uint8_t *channelList; tSapChannelListInfo SapChnlList; uint16_t ch_width_orig; - chan_params_t ch_params; + struct ch_params_s ch_params; /* session to scan */ bool isScanSessionOpen; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 31450eccc537..a2aee093c08e 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1437,7 +1437,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, */ QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, - phy_ch_width target_bw) + enum ch_width target_bw) { ptSapContext sapContext = NULL; @@ -2246,7 +2246,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) void *hHal = NULL; tpAniSirGlobal mac_ctx = NULL; eCsrPhyMode phy_mode; - chan_params_t ch_params; + struct ch_params_s ch_params; sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index c8714f85922e..cd8691475971 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -876,7 +876,7 @@ typedef struct tagCsrRoamProfile { eCsrCBChoice CBMode; tCsrChannelInfo ChannelInfo; uint8_t operationChannel; - chan_params_t ch_params; + struct ch_params_s ch_params; /* If this is 0, SME will fill in for caller. */ uint16_t beaconInterval; /* diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index fb6107f83a8b..0231e1e72a3a 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -333,7 +333,7 @@ typedef struct tagCsrRoamStartBssParams { tSirMacRateSet operationalRateSet; tSirMacRateSet extendedRateSet; uint8_t operationChn; - chan_params_t ch_params; + struct ch_params_s ch_params; eCsrCfgDot11Mode uCfgDot11Mode; uint8_t privacy; bool fwdWPSPBCProbeReq; @@ -1323,21 +1323,21 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); /* Post Channel Change Indication */ -QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct qdf_mac_addr bssid, chan_params_t *ch_params, - tCsrRoamProfile *profile); +QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, struct qdf_mac_addr + bssid, struct ch_params_s *ch_params, + tCsrRoamProfile *profile); /* Post Beacon Tx Start Indication */ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); -QDF_STATUS -csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, struct qdf_mac_addr bssid, - uint8_t targetChannel, uint8_t csaIeReqd, - chan_params_t *ch_params); -QDF_STATUS -csr_roam_modify_add_ies(tpAniSirGlobal pMac, - tSirModifyIE *pModifyIE, eUpdateIEsType updateType); +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal pMac, + struct qdf_mac_addr bssid, + uint8_t targetChannel, + uint8_t csaIeReqd, + struct ch_params_s *ch_params); +QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, + eUpdateIEsType updateType); QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index d9b61b14d804..f0b226819714 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -693,9 +693,11 @@ eCsrPhyMode sme_get_phy_mode(tHalHandle hHal); * SME API to determine the channel bonding mode */ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, - uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params); + uint8_t channel, uint8_t ht_sec_ch, + struct ch_params_s *ch_params); + QDF_STATUS sme_handoff_request(tHalHandle hHal, uint8_t sessionId, - tCsrHandoffRequest *pHandoffInfo); + tCsrHandoffRequest *pHandoffInfo); QDF_STATUS sme_is_sta_p2p_client_connected(tHalHandle hHal); #ifdef FEATURE_WLAN_LPHB QDF_STATUS sme_lphb_config_req(tHalHandle hHal, @@ -769,15 +771,19 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)); QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_value); #endif QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct qdf_mac_addr bssid, chan_params_t *ch_params, - tCsrRoamProfile *profile); + struct qdf_mac_addr bssid, + struct ch_params_s *ch_params, + tCsrRoamProfile *profile); + QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t dfsCacWaitStatus); QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, - uint8_t targetChannel, uint8_t csaIeReqd, - chan_params_t *ch_params); + uint8_t targetChannel, uint8_t csaIeReqd, + struct ch_params_s *ch_params); + QDF_STATUS sme_init_thermal_info(tHalHandle hHal, - tSmeThermalParams thermalParam); + tSmeThermalParams thermalParam); + QDF_STATUS sme_set_thermal_level(tHalHandle hHal, uint8_t level); QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx); QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 6b0832eee9f0..9614bf6814ba 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -10150,7 +10150,7 @@ QDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, } void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, - chan_params_t *ch_params) + struct ch_params_s *ch_params) { uint8_t start_ch = 0; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -10173,7 +10173,7 @@ void sme_set_160bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, } void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, - chan_params_t *ch_params) + struct ch_params_s *ch_params) { uint8_t start_ch = 0; QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -10208,7 +10208,7 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, } void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, - chan_params_t *ch_params, uint8_t is_11ac_mode) + struct ch_params_s *ch_params, uint8_t is_11ac_mode) { uint8_t tmp; uint8_t center_freq = 0; @@ -10246,7 +10246,8 @@ void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, * SME API to determine the channel bonding mode */ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode, - uint8_t channel, uint8_t ht_sec_ch, chan_params_t *ch_params) + uint8_t channel, uint8_t ht_sec_ch, + struct ch_params_s *ch_params) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hHal); int is_11ac_mode = CSR_IS_PHY_MODE_11ac(eCsrPhyMode); @@ -11894,8 +11895,9 @@ QDF_STATUS sme_set_mas(uint32_t val) * Return: QDF_STATUS */ QDF_STATUS sme_roam_channel_change_req(tHalHandle hHal, - struct qdf_mac_addr bssid, chan_params_t *ch_params, - tCsrRoamProfile *profile) + struct qdf_mac_addr bssid, + struct ch_params_s *ch_params, + tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); @@ -12004,7 +12006,7 @@ QDF_STATUS sme_roam_start_beacon_req(tHalHandle hHal, struct qdf_mac_addr bssid, */ QDF_STATUS sme_roam_csa_ie_request(tHalHandle hHal, struct qdf_mac_addr bssid, uint8_t targetChannel, uint8_t csaIeReqd, - chan_params_t *ch_params) + struct ch_params_s *ch_params) { QDF_STATUS status = QDF_STATUS_E_FAILURE; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index d364d791c738..bd4e8ddcb64f 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -48,6 +48,7 @@ #include "cds_reg_service.h" #include "mac_trace.h" #include "csr_neighbor_roam.h" +#include "cds_regdomain.h" #include "cds_regdomain_common.h" #include "cds_utils.h" #include "sir_types.h" @@ -340,8 +341,6 @@ QDF_STATUS csr_open(tpAniSirGlobal pMac) QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) { QDF_STATUS status; - v_REGDOMAIN_t reg_id; - enum country_src source = SOURCE_DRIVER; mac->scan.countryCodeDefault[0] = alpha2[0]; mac->scan.countryCodeDefault[1] = alpha2[1]; @@ -350,21 +349,9 @@ QDF_STATUS csr_init_chan_list(tpAniSirGlobal mac, uint8_t *alpha2) sms_log(mac, LOGE, FL("init time country code %.2s"), mac->scan.countryCodeDefault); - status = csr_get_regulatory_domain_for_country(mac, - mac->scan.countryCodeDefault, - ®_id, source); - if (status != QDF_STATUS_SUCCESS) { - sms_log(mac, LOGE, - FL("csr_get_regulatory_domain_for_country failed")); - return status; - } + mac->scan.domainIdDefault = 0; + mac->scan.domainIdCurrent = 0; - if (cds_set_reg_domain(mac, reg_id) != QDF_STATUS_SUCCESS) { - sms_log(mac, LOGE, FL("cds_set_reg_domain failed")); - return QDF_STATUS_E_FAILURE; - } - mac->scan.domainIdDefault = reg_id; - mac->scan.domainIdCurrent = mac->scan.domainIdDefault; qdf_mem_copy(mac->scan.countryCodeCurrent, mac->scan.countryCodeDefault, WNI_CFG_COUNTRY_CODE_LEN); qdf_mem_copy(mac->scan.countryCodeElected, @@ -18014,8 +18001,9 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * Return: QDF_STATUS */ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac, - struct qdf_mac_addr bssid, - chan_params_t *ch_params, tCsrRoamProfile *profile) + struct qdf_mac_addr bssid, + struct ch_params_s *ch_params, + tCsrRoamProfile *profile) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirChanChangeRequest *pMsg; @@ -18245,10 +18233,11 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel, * * Return: success or failure **/ -QDF_STATUS -csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, - struct qdf_mac_addr bssid, uint8_t target_channel, - uint8_t csa_ie_reqd, chan_params_t *ch_params) +QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, + struct qdf_mac_addr bssid, + uint8_t target_channel, + uint8_t csa_ie_reqd, + struct ch_params_s *ch_params) { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirDfsCsaIeRequest *msg; @@ -18265,7 +18254,7 @@ csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx, msg->targetChannel = target_channel; msg->csaIeRequired = csa_ie_reqd; qdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE); - qdf_mem_copy(&msg->ch_params, ch_params, sizeof(chan_params_t)); + qdf_mem_copy(&msg->ch_params, ch_params, sizeof(struct ch_params_s)); status = cds_send_mb_message_to_mac(msg); diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 4ad606e6b564..06f390f8484c 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1493,7 +1493,7 @@ struct wma_vdev_start_req { uint32_t beacon_intval; uint32_t dtim_period; int32_t max_txpow; - phy_ch_width chan_width; + enum ch_width chan_width; bool is_dfs; uint8_t vdev_id; uint8_t chan; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index dcce413c6700..848f9c8925bc 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -498,7 +498,7 @@ typedef struct { uint8_t halPersona; uint8_t bSpectrumMgtEnabled; uint8_t vhtCapable; - phy_ch_width ch_width; + enum ch_width ch_width; uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t reassocReq; /* Set only during roaming reassociation */ @@ -912,7 +912,7 @@ typedef struct { uint16_t smpsMode; uint8_t isDfsChannel; uint8_t vhtCapable; - phy_ch_width ch_width; + enum ch_width ch_width; uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t dot11_mode; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 0dd428cfdacd..195bef70836f 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -891,7 +891,7 @@ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind); -WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, +WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum ch_width chan_width, u8 vht_capable, u8 dot11_mode); QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 5e5283fff471..2db824c61073 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -677,7 +677,7 @@ QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, * * Return: return phy mode */ -WLAN_PHY_MODE wma_chan_to_mode(u8 chan, phy_ch_width chan_width, +WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum ch_width chan_width, u8 vht_capable, u8 dot11_mode) { WLAN_PHY_MODE phymode = MODE_UNKNOWN; -- cgit v1.2.3 From 7ccdc4ff47c01204ed1871a279845afae981079a Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Fri, 30 Oct 2015 15:10:05 -0700 Subject: qcacld-3.0: Remove 40mhz bonded channel from driver 40 mhz channel array is redundant and does not give the correct channel bonding information. Therefore remove these channels, bonding array, and its associated usage. Change-Id: I913fb97cdc913b1a027d21b0df526dfd5cd5902f CRs-Fixed: 856727 --- core/cds/inc/cds_reg_service.h | 43 +---------------------- core/cds/src/cds_reg_service.c | 61 +------------------------------- core/hdd/src/wlan_hdd_regulatory.c | 72 +++----------------------------------- core/sme/inc/csr_internal.h | 4 --- core/sme/inc/sme_inside.h | 4 +++ core/sme/src/common/sme_api.c | 50 ++++++++++++++++++-------- core/sme/src/csr/csr_api_roam.c | 42 ++++------------------ 7 files changed, 53 insertions(+), 223 deletions(-) diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index bed2496adf8e..b8bc47c2df95 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -137,39 +137,6 @@ enum channel_enum { RF_CHAN_183, RF_CHAN_184, - /* CHANNEL BONDED CHANNELS */ - RF_CHAN_BOND_3, - RF_CHAN_BOND_4, - RF_CHAN_BOND_5, - RF_CHAN_BOND_6, - RF_CHAN_BOND_7, - RF_CHAN_BOND_8, - RF_CHAN_BOND_9, - RF_CHAN_BOND_10, - RF_CHAN_BOND_11, - RF_CHAN_BOND_38, - RF_CHAN_BOND_42, - RF_CHAN_BOND_46, - RF_CHAN_BOND_50, - RF_CHAN_BOND_54, - RF_CHAN_BOND_58, - RF_CHAN_BOND_62, - RF_CHAN_BOND_102, - RF_CHAN_BOND_106, - RF_CHAN_BOND_110, - RF_CHAN_BOND_114, - RF_CHAN_BOND_118, - RF_CHAN_BOND_122, - RF_CHAN_BOND_126, - RF_CHAN_BOND_130, - RF_CHAN_BOND_134, - RF_CHAN_BOND_138, - RF_CHAN_BOND_142, - RF_CHAN_BOND_151, - RF_CHAN_BOND_155, - RF_CHAN_BOND_159, - RF_CHAN_BOND_163, - NUM_RF_CHANNELS, MIN_24GHZ_CHANNEL = RF_CHAN_1, @@ -185,11 +152,6 @@ enum channel_enum { NUM_20MHZ_RF_CHANNELS = (MAX_20MHZ_RF_CHANNEL - MIN_20MHZ_RF_CHANNEL + 1), - MIN_40MHZ_RF_CHANNEL = RF_CHAN_BOND_3, - MAX_40MHZ_RF_CHANNEL = RF_CHAN_BOND_163, - NUM_40MHZ_RF_CHANNELS = - (MAX_40MHZ_RF_CHANNEL - MIN_40MHZ_RF_CHANNEL + 1), - MIN_59GHZ_CHANNEL = RF_CHAN_170, MAX_59GHZ_CHANNEL = RF_CHAN_184, @@ -323,10 +285,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country); QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, - uint8_t *num_base_channels, - struct channel_power - *channel_40mhz, - uint8_t *num_channels_40mhz); + uint8_t *num_base_channels); enum channel_state cds_get_channel_state(uint32_t chan_num); QDF_STATUS cds_get_dfs_region(uint8_t *dfs_region); diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 37dcc635a150..463d0a19b4e9 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -95,37 +95,6 @@ const struct chan_map chan_mapping[NUM_RF_CHANNELS] = { {5910, 182}, {5915, 183}, {5920, 184}, - {2422, 3}, - {2427, 4}, - {2432, 5}, - {2437, 6}, - {2442, 7}, - {2447, 8}, - {2452, 9}, - {2457, 10}, - {2462, 11}, - {5190, 38}, - {5210, 42}, - {5230, 46}, - {5250, 50}, - {5270, 54}, - {5290, 58}, - {5310, 62}, - {5510, 102}, - {5530, 106}, - {5550, 110}, - {5570, 114}, - {5590, 118}, - {5610, 122}, - {5630, 126}, - {5650, 130}, - {5670, 134}, - {5690, 138}, - {5710, 142}, - {5755, 151}, - {5775, 155}, - {5795, 159}, - {5815, 163}, }; struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; @@ -136,17 +105,12 @@ uint8_t dfs_region; * cds_get_channel_list_with_power() - retrieve channel list with power * @base_channels: base channels * @num_base_channels: number of base channels - * @channels_40mhz: 40 MHz channels - * @num_40mhz_channels: number of 40 Mhz channels * * Return: QDF_STATUS_SUCCESS */ QDF_STATUS cds_get_channel_list_with_power(struct channel_power *base_channels, - uint8_t *num_base_channels, - struct channel_power - *channels_40mhz, - uint8_t *num_40mhz_channels) + uint8_t *num_base_channels) { QDF_STATUS status = QDF_STATUS_SUCCESS; int i, count; @@ -172,29 +136,6 @@ QDF_STATUS cds_get_channel_list_with_power(struct channel_power *num_base_channels = count; } - if (channels_40mhz && num_40mhz_channels) { - count = 0; - - for (i = RF_CHAN_BOND_3; i <= RF_CHAN_BOND_11; i++) { - if (reg_channels[i].state) { - channels_40mhz[count].chan_num = - chan_mapping[i].chan_num; - channels_40mhz[count++].power = - reg_channels[i].pwr_limit; - } - } - - for (i = RF_CHAN_BOND_38; i <= RF_CHAN_BOND_163; i++) { - if (reg_channels[i].state) { - channels_40mhz[count].chan_num = - chan_mapping[i].chan_num; - channels_40mhz[count++].power = - reg_channels[i].pwr_limit; - } - } - *num_40mhz_channels = count; - } - return status; } diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 35886b71ac87..8e0e9aef41f2 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -276,37 +276,6 @@ static void hdd_regulatory_wiphy_init(hdd_context_t *hdd_ctx, } #endif -/** - * hdd_bw20_ch_index_to_() - convert 20 mhhz channel index to 40 mhz index - * @k: 20 mhz channel index - * - * Return: void - */ -static int hdd_bw20_ch_index_to_bw40_ch_index(int k) -{ - int m = -1; - - if (k >= RF_CHAN_1 && k <= RF_CHAN_14) { - m = k - RF_CHAN_1 + RF_CHAN_BOND_3; - if (m > RF_CHAN_BOND_11) - m = RF_CHAN_BOND_11; - } else if (k >= RF_CHAN_36 && k <= RF_CHAN_64) { - m = k - RF_CHAN_36 + RF_CHAN_BOND_38; - if (m > RF_CHAN_BOND_62) - m = RF_CHAN_BOND_62; - } else if (k >= RF_CHAN_100 && k <= RF_CHAN_144) { - m = k - RF_CHAN_100 + RF_CHAN_BOND_102; - if (m > RF_CHAN_BOND_142) - m = RF_CHAN_BOND_142; - } else if (k >= RF_CHAN_149 && k <= RF_CHAN_165) { - m = k - RF_CHAN_149 + RF_CHAN_BOND_151; - if (m > RF_CHAN_BOND_163) - m = RF_CHAN_BOND_163; - } - - return m; -} - /** * is_wiphy_custom_regulatory() - is custom regulatory defined * @wiphy: wiphy @@ -381,9 +350,9 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, bool reset) { int i, j, m; - int k = 0, n = 0; + int k = 0; struct ieee80211_channel *chan; - struct regulatory_channel *temp_chan_k, *temp_chan_n, *temp_chan; + struct regulatory_channel *temp_chan_k, *temp_chan; uint8_t band_capability; band_capability = hdd_ctx->config->nBandCapability; @@ -416,11 +385,9 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, for (j = 0; j < wiphy->bands[i]->n_channels; j++) { k = m + j; - n = hdd_bw20_ch_index_to_bw40_ch_index(k); chan = &(wiphy->bands[i]->channels[j]); temp_chan_k = &(reg_channels[k]); - temp_chan_n = &(reg_channels[n]); if (!reset) hdd_modify_wiphy(wiphy, chan); @@ -429,11 +396,7 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, temp_chan_k->state = CHANNEL_STATE_DISABLE; temp_chan_k->flags = chan->flags; - if (n != -1) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - temp_chan_n->flags = chan->flags; - } + } else if (chan->flags & (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN | @@ -448,20 +411,6 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, chan->max_power; temp_chan_k->flags = chan->flags; - if (n != -1) { - if ((chan->flags & - IEEE80211_CHAN_NO_HT40) == - IEEE80211_CHAN_NO_HT40) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - } else { - temp_chan_n->state = - CHANNEL_STATE_DFS; - temp_chan_n->pwr_limit = - chan->max_power-3; - } - temp_chan_n->flags = chan->flags; - } if ((chan->flags & IEEE80211_CHAN_NO_80MHZ) == 0) hdd_ctx->isVHT80Allowed = 1; @@ -469,20 +418,7 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, temp_chan_k->state = CHANNEL_STATE_ENABLE; temp_chan_k->pwr_limit = chan->max_power; temp_chan_k->flags = chan->flags; - if (n != -1) { - if ((chan->flags & - IEEE80211_CHAN_NO_HT40) == - IEEE80211_CHAN_NO_HT40) { - temp_chan_n->state = - CHANNEL_STATE_DISABLE; - } else { - temp_chan_n->state = - CHANNEL_STATE_ENABLE; - temp_chan_n->pwr_limit = - chan->max_power - 3; - } - temp_chan_n->flags = chan->flags; - } + if ((chan->flags & IEEE80211_CHAN_NO_80MHZ) == 0) hdd_ctx->isVHT80Allowed = 1; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 0231e1e72a3a..b9939a6a105e 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -690,11 +690,8 @@ typedef struct tagCsrScanStruct { tSirScanType curScanType; tCsrChannel channels11d; struct channel_power defaultPowerTable[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - struct channel_power - defaultPowerTable40MHz[WNI_CFG_VALID_CHANNEL_LIST_LEN]; uint32_t numChannelsDefault; tCsrChannel base_channels; /* The channel base to work on */ - tCsrChannel base40MHzChannels; /* center channels for 40MHz channels */ tDblLinkList channelPowerInfoList24; tDblLinkList channelPowerInfoList5G; uint32_t nLastAgeTimeOut; @@ -980,7 +977,6 @@ typedef struct tagCsrRoamStruct { tCsrConfig configParam; uint32_t numChannelsEeprom; /* total channels of eeprom */ tCsrChannel baseChannels; /* The channel base to work on */ - tCsrChannel base40MHzChannels; /* center channels for 40MHz channels */ eCsrRoamState curState[CSR_ROAM_SESSION_MAX]; eCsrRoamSubState curSubState[CSR_ROAM_SESSION_MAX]; /* diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index cf062f77ee21..f6fb7a6f0fa7 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -284,4 +284,8 @@ void active_list_cmd_timeout_handle(void *userData); void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command); void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command); void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command); + +QDF_STATUS sme_check_ch_in_band(tpAniSirGlobal mac_ctx, uint8_t start_ch, + uint8_t ch_cnt); + #endif /* #if !defined( __SMEINSIDE_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 9614bf6814ba..bc48a8392eec 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -7271,11 +7271,6 @@ sme_search_in_base_ch_lst(tpAniSirGlobal mac_ctx, uint8_t curr_ch) return true; } - ch_lst_info = &mac_ctx->scan.base40MHzChannels; - for (i = 0; i < ch_lst_info->numChannels; i++) { - if (ch_lst_info->channelList[i] == curr_ch) - return true; - } return false; } /** @@ -10208,11 +10203,12 @@ void sme_set_80bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, } void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, - struct ch_params_s *ch_params, uint8_t is_11ac_mode) + struct ch_params_s *ch_params, uint8_t is_11ac_mode) { uint8_t tmp; uint8_t center_freq = 0; - bool valid_40Mhz_ch = true; + uint8_t start_ch = 0; + QDF_STATUS status = QDF_STATUS_SUCCESS; if (channel == 165) { ch_params->ch_width = CH_WIDTH_20MHZ; @@ -10232,13 +10228,39 @@ void sme_set_40bw_params(tpAniSirGlobal mac_ctx, uint8_t channel, (ch_params->ch_width == CH_WIDTH_40MHZ))) { ch_params->ch_width = CH_WIDTH_40MHZ; ch_params->center_freq_seg0 = center_freq; - valid_40Mhz_ch = csr_roam_is_valid40_mhz_channel(mac_ctx, - ch_params->center_freq_seg0); - } - if (!valid_40Mhz_ch) { - ch_params->ch_width = CH_WIDTH_20MHZ; - ch_params->center_freq_seg0 = 0; - ch_params->sec_ch_offset = PHY_SINGLE_CHANNEL_CENTERED; + + if (channel <= 40) + start_ch = 36; + else if (channel <= 48) + start_ch = 44; + else if (channel <= 56) + start_ch = 52; + else if (channel <= 64) + start_ch = 60; + else if (channel <= 104) + start_ch = 100; + else if (channel <= 112) + start_ch = 108; + else if (channel <= 120) + start_ch = 116; + else if (channel <= 128) + start_ch = 124; + else if (channel <= 136) + start_ch = 132; + else if (channel <= 144) + start_ch = 140; + else if (channel <= 153) + start_ch = 149; + else if (channel <= 161) + start_ch = 157; + + status = sme_check_ch_in_band(mac_ctx, start_ch, 2); + + if (QDF_STATUS_SUCCESS != status) { + ch_params->ch_width = CH_WIDTH_20MHZ; + ch_params->center_freq_seg0 = 0; + ch_params->sec_ch_offset = PHY_SINGLE_CHANNEL_CENTERED; + } } } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index bd4e8ddcb64f..b12f9971cd42 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2487,17 +2487,13 @@ QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) uint8_t num20MHzChannelsFound = 0; QDF_STATUS qdf_status; uint8_t Index = 0; - uint8_t num40MHzChannelsFound = 0; - /* TODO: this interface changed to include the 40MHz channel list */ - /* this needs to be tied into the adapter structure somehow and referenced appropriately for CB operation */ - /* Read the scan channel list (including the power limit) from EEPROM */ qdf_status = cds_get_channel_list_with_power(pMac->scan.defaultPowerTable, - &num20MHzChannelsFound, - pMac->scan.defaultPowerTable40MHz, - &num40MHzChannelsFound); - if ((QDF_STATUS_SUCCESS != qdf_status) || (num20MHzChannelsFound == 0)) { + &num20MHzChannelsFound); + + if ((QDF_STATUS_SUCCESS != qdf_status) || + (num20MHzChannelsFound == 0)) { sms_log(pMac, LOGE, FL("failed to get channels ")); status = QDF_STATUS_E_FAILURE; } else { @@ -2513,16 +2509,6 @@ QDF_STATUS csr_get_channel_and_power_list(tpAniSirGlobal pMac) } pMac->scan.base_channels.numChannels = num20MHzChannelsFound; - if (num40MHzChannelsFound > WNI_CFG_VALID_CHANNEL_LIST_LEN) { - num40MHzChannelsFound = WNI_CFG_VALID_CHANNEL_LIST_LEN; - } - for (Index = 0; Index < num40MHzChannelsFound; Index++) { - pMac->scan.base40MHzChannels.channelList[Index] = - pMac->scan.defaultPowerTable40MHz[Index]. - chan_num; - } - pMac->scan.base40MHzChannels.numChannels = - num40MHzChannelsFound; } return status; } @@ -11919,19 +11905,6 @@ bool csr_roam_is_channel_valid(tpAniSirGlobal pMac, uint8_t channel) return fValid; } -bool csr_roam_is_valid40_mhz_channel(tpAniSirGlobal pMac, uint8_t channel) -{ - bool fValid = false; - uint8_t i; - for (i = 0; i < pMac->scan.base40MHzChannels.numChannels; i++) { - if (channel == pMac->scan.base40MHzChannels.channelList[i]) { - fValid = true; - break; - } - } - return fValid; -} - /* This function check and validate whether the NIC can do CB (40MHz) */ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, uint8_t primaryChn, @@ -12014,8 +11987,9 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, break; } - if ((PHY_SINGLE_CHANNEL_CENTERED != eRet) - && !csr_roam_is_valid40_mhz_channel(pMac, centerChn)) { + if ((PHY_SINGLE_CHANNEL_CENTERED != eRet) && + (QDF_STATUS_SUCCESS != sme_check_ch_in_band(pMac, + centerChn - 2, 2))) { sms_log(pMac, LOGE, "Invalid center channel (%d), disable 40MHz mode", centerChn); @@ -18419,8 +18393,6 @@ void csr_init_operating_classes(tHalHandle hHal) csr_update_op_class_array(pMac, opClasses, &pMac->scan.base_channels, "20MHz", &i); - csr_update_op_class_array(pMac, opClasses, - &pMac->scan.base40MHzChannels, "40MHz", &i); numClasses = i; /* As per spec the operating classes should be in ascending order. -- cgit v1.2.3 From b8d4f1575c9b9f2fdbdc227c798280612be9c3d3 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 10 Feb 2016 10:21:43 -0800 Subject: qcacld-3.0: Change channel nomenclature Change channel nomenclature to more appropriate names. Change-Id: If7fcd832a35563896534bab425ca05b528e1de93 CRs-Fixed: 856727 --- core/cds/inc/cds_reg_service.h | 146 ++++++++++++------------- core/cds/src/cds_reg_service.c | 130 +++++++++++----------- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_cfg80211.c | 18 +-- core/hdd/src/wlan_hdd_hostapd.c | 12 +- core/hdd/src/wlan_hdd_main.c | 30 ++--- core/hdd/src/wlan_hdd_regulatory.c | 2 +- core/mac/src/pe/lim/lim_process_action_frame.c | 2 +- core/mac/src/pe/sch/sch_beacon_process.c | 2 +- core/sap/inc/sap_api.h | 2 +- core/sap/src/sap_ch_select.c | 132 ++++++++-------------- core/sap/src/sap_ch_select.h | 2 +- core/sap/src/sap_fsm.c | 14 +-- core/sap/src/sap_module.c | 14 +-- core/sme/src/csr/csr_util.c | 2 +- 15 files changed, 234 insertions(+), 276 deletions(-) diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index b8bc47c2df95..65f3f9d98308 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -78,85 +78,79 @@ typedef enum { } v_REGDOMAIN_t; enum channel_enum { - RF_CHAN_1 = 0, - RF_CHAN_2, - RF_CHAN_3, - RF_CHAN_4, - RF_CHAN_5, - RF_CHAN_6, - RF_CHAN_7, - RF_CHAN_8, - RF_CHAN_9, - RF_CHAN_10, - RF_CHAN_11, - RF_CHAN_12, - RF_CHAN_13, - RF_CHAN_14, - - RF_CHAN_36, - RF_CHAN_40, - RF_CHAN_44, - RF_CHAN_48, - RF_CHAN_52, - RF_CHAN_56, - RF_CHAN_60, - RF_CHAN_64, - - RF_CHAN_100, - RF_CHAN_104, - RF_CHAN_108, - RF_CHAN_112, - RF_CHAN_116, - RF_CHAN_120, - RF_CHAN_124, - RF_CHAN_128, - RF_CHAN_132, - RF_CHAN_136, - RF_CHAN_140, - RF_CHAN_144, - - RF_CHAN_149, - RF_CHAN_153, - RF_CHAN_157, - RF_CHAN_161, - RF_CHAN_165, - - RF_CHAN_170, - RF_CHAN_171, - RF_CHAN_172, - RF_CHAN_173, - RF_CHAN_174, - RF_CHAN_175, - RF_CHAN_176, - RF_CHAN_177, - RF_CHAN_178, - RF_CHAN_179, - RF_CHAN_180, - RF_CHAN_181, - RF_CHAN_182, - RF_CHAN_183, - RF_CHAN_184, - - NUM_RF_CHANNELS, - - MIN_24GHZ_CHANNEL = RF_CHAN_1, - MAX_24GHZ_CHANNEL = RF_CHAN_14, + CHAN_ENUM_1 = 0, + CHAN_ENUM_2, + CHAN_ENUM_3, + CHAN_ENUM_4, + CHAN_ENUM_5, + CHAN_ENUM_6, + CHAN_ENUM_7, + CHAN_ENUM_8, + CHAN_ENUM_9, + CHAN_ENUM_10, + CHAN_ENUM_11, + CHAN_ENUM_12, + CHAN_ENUM_13, + CHAN_ENUM_14, + + CHAN_ENUM_36, + CHAN_ENUM_40, + CHAN_ENUM_44, + CHAN_ENUM_48, + CHAN_ENUM_52, + CHAN_ENUM_56, + CHAN_ENUM_60, + CHAN_ENUM_64, + + CHAN_ENUM_100, + CHAN_ENUM_104, + CHAN_ENUM_108, + CHAN_ENUM_112, + CHAN_ENUM_116, + CHAN_ENUM_120, + CHAN_ENUM_124, + CHAN_ENUM_128, + CHAN_ENUM_132, + CHAN_ENUM_136, + CHAN_ENUM_140, + CHAN_ENUM_144, + + CHAN_ENUM_149, + CHAN_ENUM_153, + CHAN_ENUM_157, + CHAN_ENUM_161, + CHAN_ENUM_165, + + CHAN_ENUM_170, + CHAN_ENUM_171, + CHAN_ENUM_172, + CHAN_ENUM_173, + CHAN_ENUM_174, + CHAN_ENUM_175, + CHAN_ENUM_176, + CHAN_ENUM_177, + CHAN_ENUM_178, + CHAN_ENUM_179, + CHAN_ENUM_180, + CHAN_ENUM_181, + CHAN_ENUM_182, + CHAN_ENUM_183, + CHAN_ENUM_184, + + NUM_CHANNELS, + + MIN_24GHZ_CHANNEL = CHAN_ENUM_1, + MAX_24GHZ_CHANNEL = CHAN_ENUM_14, NUM_24GHZ_CHANNELS = (MAX_24GHZ_CHANNEL - MIN_24GHZ_CHANNEL + 1), - MIN_5GHZ_CHANNEL = RF_CHAN_36, - MAX_5GHZ_CHANNEL = RF_CHAN_184, + MIN_5GHZ_CHANNEL = CHAN_ENUM_36, + MAX_5GHZ_CHANNEL = CHAN_ENUM_184, NUM_5GHZ_CHANNELS = (MAX_5GHZ_CHANNEL - MIN_5GHZ_CHANNEL + 1), - MIN_20MHZ_RF_CHANNEL = RF_CHAN_1, - MAX_20MHZ_RF_CHANNEL = RF_CHAN_184, - NUM_20MHZ_RF_CHANNELS = - (MAX_20MHZ_RF_CHANNEL - MIN_20MHZ_RF_CHANNEL + 1), + MIN_59GHZ_CHANNEL = CHAN_ENUM_170, + MAX_59GHZ_CHANNEL = CHAN_ENUM_184, - MIN_59GHZ_CHANNEL = RF_CHAN_170, - MAX_59GHZ_CHANNEL = RF_CHAN_184, - - INVALID_RF_CHANNEL = 0xBAD, - RF_CHANNEL_INVALID_MAX_FIELD = 0x7FFFFFFF + INVALID_CHANNEL = 0xBAD, }; /** @@ -274,8 +268,8 @@ enum channel_width { CHAN_WIDTH_160MHZ }; -extern const struct chan_map chan_mapping[NUM_RF_CHANNELS]; -extern struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; +extern const struct chan_map chan_mapping[NUM_CHANNELS]; +extern struct regulatory_channel reg_channels[NUM_CHANNELS]; QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *pRegDomain, const uint8_t *country_alpha2, diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 463d0a19b4e9..5f77ce5e9e8c 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -40,64 +40,68 @@ #include "cds_reg_service.h" #include "cds_regdomain.h" -const struct chan_map chan_mapping[NUM_RF_CHANNELS] = { - {2412, 1}, - {2417, 2}, - {2422, 3}, - {2427, 4}, - {2432, 5}, - {2437, 6}, - {2442, 7}, - {2447, 8}, - {2452, 9}, - {2457, 10}, - {2462, 11}, - {2467, 12}, - {2472, 13}, - {2484, 14}, - {5180, 36}, - {5200, 40}, - {5220, 44}, - {5240, 48}, - {5260, 52}, - {5280, 56}, - {5300, 60}, - {5320, 64}, - {5500, 100}, - {5520, 104}, - {5540, 108}, - {5560, 112}, - {5580, 116}, - {5600, 120}, - {5620, 124}, - {5640, 128}, - {5660, 132}, - {5680, 136}, - {5700, 140}, - {5720, 144}, - {5745, 149}, - {5765, 153}, - {5785, 157}, - {5805, 161}, - {5825, 165}, - {5852, 170}, - {5855, 171}, - {5860, 172}, - {5865, 173}, - {5870, 174}, - {5875, 175}, - {5880, 176}, - {5885, 177}, - {5890, 178}, - {5895, 179}, - {5900, 180}, - {5905, 181}, - {5910, 182}, - {5915, 183}, - {5920, 184}, +const struct chan_map chan_mapping[NUM_CHANNELS] = { + [CHAN_ENUM_1] = {2412, 1}, + [CHAN_ENUM_2] = {2417, 2}, + [CHAN_ENUM_3] = {2422, 3}, + [CHAN_ENUM_4] = {2427, 4}, + [CHAN_ENUM_5] = {2432, 5}, + [CHAN_ENUM_6] = {2437, 6}, + [CHAN_ENUM_7] = {2442, 7}, + [CHAN_ENUM_8] = {2447, 8}, + [CHAN_ENUM_9] = {2452, 9}, + [CHAN_ENUM_10] = {2457, 10}, + [CHAN_ENUM_11] = {2462, 11}, + [CHAN_ENUM_12] = {2467, 12}, + [CHAN_ENUM_13] = {2472, 13}, + [CHAN_ENUM_14] = {2484, 14}, + + [CHAN_ENUM_36] = {5180, 36}, + [CHAN_ENUM_40] = {5200, 40}, + [CHAN_ENUM_44] = {5220, 44}, + [CHAN_ENUM_48] = {5240, 48}, + [CHAN_ENUM_52] = {5260, 52}, + [CHAN_ENUM_56] = {5280, 56}, + [CHAN_ENUM_60] = {5300, 60}, + [CHAN_ENUM_64] = {5320, 64}, + + [CHAN_ENUM_100] = {5500, 100}, + [CHAN_ENUM_104] = {5520, 104}, + [CHAN_ENUM_108] = {5540, 108}, + [CHAN_ENUM_112] = {5560, 112}, + [CHAN_ENUM_116] = {5580, 116}, + [CHAN_ENUM_120] = {5600, 120}, + [CHAN_ENUM_124] = {5620, 124}, + [CHAN_ENUM_128] = {5640, 128}, + [CHAN_ENUM_132] = {5660, 132}, + [CHAN_ENUM_136] = {5680, 136}, + [CHAN_ENUM_140] = {5700, 140}, + [CHAN_ENUM_144] = {5720, 144}, + + [CHAN_ENUM_149] = {5745, 149}, + [CHAN_ENUM_153] = {5765, 153}, + [CHAN_ENUM_157] = {5785, 157}, + [CHAN_ENUM_161] = {5805, 161}, + [CHAN_ENUM_165] = {5825, 165}, + + [CHAN_ENUM_170] = {5852, 170}, + [CHAN_ENUM_171] = {5855, 171}, + [CHAN_ENUM_172] = {5860, 172}, + [CHAN_ENUM_173] = {5865, 173}, + [CHAN_ENUM_174] = {5870, 174}, + [CHAN_ENUM_175] = {5875, 175}, + [CHAN_ENUM_176] = {5880, 176}, + [CHAN_ENUM_177] = {5885, 177}, + [CHAN_ENUM_178] = {5890, 178}, + [CHAN_ENUM_179] = {5895, 179}, + [CHAN_ENUM_180] = {5900, 180}, + [CHAN_ENUM_181] = {5905, 181}, + [CHAN_ENUM_182] = {5910, 182}, + [CHAN_ENUM_183] = {5915, 183}, + [CHAN_ENUM_184] = {5920, 184}, }; -struct regulatory_channel reg_channels[NUM_RF_CHANNELS]; +struct regulatory_channel reg_channels[NUM_CHANNELS]; uint8_t default_country[CDS_COUNTRY_CODE_LEN + 1]; uint8_t dfs_region; @@ -117,7 +121,7 @@ QDF_STATUS cds_get_channel_list_with_power(struct channel_power if (base_channels && num_base_channels) { count = 0; - for (i = 0; i <= RF_CHAN_14; i++) { + for (i = 0; i <= CHAN_ENUM_14; i++) { if (reg_channels[i].state) { base_channels[count].chan_num = chan_mapping[i].chan_num; @@ -125,7 +129,7 @@ QDF_STATUS cds_get_channel_list_with_power(struct channel_power reg_channels[i].pwr_limit; } } - for (i = RF_CHAN_36; i <= RF_CHAN_184; i++) { + for (i = CHAN_ENUM_36; i <= CHAN_ENUM_184; i++) { if (reg_channels[i].state) { base_channels[count].chan_num = chan_mapping[i].chan_num; @@ -169,14 +173,14 @@ static enum channel_enum cds_get_channel_enum(uint32_t chan_num) { uint32_t loop; - for (loop = 0; loop <= RF_CHAN_184; loop++) + for (loop = 0; loop <= CHAN_ENUM_184; loop++) if (chan_mapping[loop].chan_num == chan_num) return loop; QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid channel number %d", chan_num); - return INVALID_RF_CHANNEL; + return INVALID_CHANNEL; } @@ -191,7 +195,7 @@ enum channel_state cds_get_channel_state(uint32_t chan_num) enum channel_enum chan_enum; chan_enum = cds_get_channel_enum(chan_num); - if (INVALID_RF_CHANNEL == chan_enum) + if (INVALID_CHANNEL == chan_enum) return CHANNEL_STATE_INVALID; else return reg_channels[chan_enum].state; @@ -211,7 +215,7 @@ enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, bool bw_enabled = false; chan_enum = cds_get_channel_enum(chan_num); - if (INVALID_RF_CHANNEL == chan_enum) + if (INVALID_CHANNEL == chan_enum) return CHANNEL_STATE_INVALID; if (reg_channels[chan_enum].state) { @@ -253,7 +257,7 @@ enum channel_width cds_get_max_channel_bw(uint32_t chan_num) chan_enum = cds_get_channel_enum(chan_num); - if ((INVALID_RF_CHANNEL != chan_enum) && + if ((INVALID_CHANNEL != chan_enum) && (CHANNEL_STATE_DISABLE != reg_channels[chan_enum].state)) { if (!(reg_channels[chan_enum].flags & diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 796e10da61c1..dbb6ac48124b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1245,7 +1245,7 @@ struct hdd_context_s { struct regulatory reg; #ifdef FEATURE_WLAN_CH_AVOID uint16_t unsafe_channel_count; - uint16_t unsafe_channel_list[NUM_20MHZ_RF_CHANNELS]; + uint16_t unsafe_channel_list[NUM_CHANNELS]; #endif /* FEATURE_WLAN_CH_AVOID */ uint8_t max_intf_count; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 9176680ed33f..2abd3ffef348 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1266,20 +1266,20 @@ static void wlan_hdd_set_acs_ch_range(tsap_Config_t *sap_cfg, bool ht_enabled, int i; if (sap_cfg->acs_cfg.hw_mode == QCA_ACS_MODE_IEEE80211B) { sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_11b; - sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(RF_CHAN_1); - sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(RF_CHAN_14); + sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(CHAN_ENUM_1); + sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(CHAN_ENUM_14); } else if (sap_cfg->acs_cfg.hw_mode == QCA_ACS_MODE_IEEE80211G) { sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_11g; - sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(RF_CHAN_1); - sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(RF_CHAN_13); + sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(CHAN_ENUM_1); + sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(CHAN_ENUM_13); } else if (sap_cfg->acs_cfg.hw_mode == QCA_ACS_MODE_IEEE80211A) { sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_11a; - sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(RF_CHAN_36); - sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(RF_CHAN_165); + sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(CHAN_ENUM_36); + sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(CHAN_ENUM_165); } else if (sap_cfg->acs_cfg.hw_mode == QCA_ACS_MODE_IEEE80211ANY) { sap_cfg->acs_cfg.hw_mode = eCSR_DOT11_MODE_abg; - sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(RF_CHAN_1); - sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(RF_CHAN_165); + sap_cfg->acs_cfg.start_ch = CDS_CHANNEL_NUM(CHAN_ENUM_1); + sap_cfg->acs_cfg.end_ch = CDS_CHANNEL_NUM(CHAN_ENUM_165); } if (ht_enabled) @@ -5812,7 +5812,7 @@ QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter, if (hdd_pConfig_ini->sapAllowAllChannel) { /* Validate the channel */ - for (count = RF_CHAN_1; count <= RF_CHAN_165; count++) { + for (count = CHAN_ENUM_1; count <= CHAN_ENUM_165; count++) { if (channel == CDS_CHANNEL_NUM(count)) { fValidChannel = true; break; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 4351c7219b13..901db25255a6 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -3703,8 +3703,8 @@ static int __iw_softap_get_channel_list(struct net_device *dev, { uint32_t num_channels = 0; uint8_t i = 0; - uint8_t bandStartChannel = RF_CHAN_1; - uint8_t bandEndChannel = RF_CHAN_184; + uint8_t bandStartChannel = CHAN_ENUM_1; + uint8_t bandEndChannel = CHAN_ENUM_184; hdd_adapter_t *pHostapdAdapter = (netdev_priv(dev)); tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); tpChannelListInfo channel_list = (tpChannelListInfo) extra; @@ -3726,11 +3726,11 @@ static int __iw_softap_get_channel_list(struct net_device *dev, wrqu->data.length = sizeof(tChannelListInfo); if (eCSR_BAND_24 == curBand) { - bandStartChannel = RF_CHAN_1; - bandEndChannel = RF_CHAN_14; + bandStartChannel = CHAN_ENUM_1; + bandEndChannel = CHAN_ENUM_14; } else if (eCSR_BAND_5G == curBand) { - bandStartChannel = RF_CHAN_36; - bandEndChannel = RF_CHAN_184; + bandStartChannel = CHAN_ENUM_36; + bandEndChannel = CHAN_ENUM_184; } hddLog(LOG1, FL("curBand = %d, StartChannel = %hu, EndChannel = %hu "), diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 8c4a7bf3bd1c..f7137745e647 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4623,7 +4623,7 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level) static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, hdd_adapter_t *ap_adapter) { - uint16_t safe_channels[NUM_20MHZ_RF_CHANNELS]; + uint16_t safe_channels[NUM_CHANNELS]; uint16_t safe_channel_count; uint16_t unsafe_channel_count; uint8_t is_unsafe = 1; @@ -4637,9 +4637,9 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt, safe_channel_count = 0; unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctxt->unsafe_channel_count, - (uint16_t)NUM_20MHZ_RF_CHANNELS); + (uint16_t)NUM_CHANNELS); - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { is_unsafe = 0; for (channel_loop = 0; channel_loop < unsafe_channel_count; channel_loop++) { @@ -4693,8 +4693,8 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) hdd_context_t *hdd_ctxt; tSirChAvoidIndType *ch_avoid_indi; uint8_t range_loop; - enum channel_enum channel_loop, start_channel_idx = INVALID_RF_CHANNEL, - end_channel_idx = INVALID_RF_CHANNEL; + enum channel_enum channel_loop, start_channel_idx = INVALID_CHANNEL, + end_channel_idx = INVALID_CHANNEL; uint16_t start_channel; uint16_t end_channel; v_CONTEXT_t cds_context; @@ -4737,7 +4737,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) for (range_loop = 0; range_loop < ch_avoid_indi->avoid_range_count; range_loop++) { - if (hdd_ctxt->unsafe_channel_count >= NUM_20MHZ_RF_CHANNELS) { + if (hdd_ctxt->unsafe_channel_count >= NUM_CHANNELS) { hddLog(LOGW, FL("LTE Coex unsafe channel list full")); break; } @@ -4758,8 +4758,8 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) if (start_channel == 0 || end_channel == 0) continue; - for (channel_loop = MIN_20MHZ_RF_CHANNEL; channel_loop <= - MAX_20MHZ_RF_CHANNEL; channel_loop++) { + for (channel_loop = CHAN_ENUM_1; channel_loop <= + CHAN_ENUM_184; channel_loop++) { if (CDS_CHANNEL_FREQ(channel_loop) >= ch_avoid_indi->avoid_freq_range[ range_loop].start_freq) { @@ -4767,8 +4767,8 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) break; } } - for (channel_loop = MIN_20MHZ_RF_CHANNEL; channel_loop <= - MAX_20MHZ_RF_CHANNEL; channel_loop++) { + for (channel_loop = CHAN_ENUM_1; channel_loop <= + CHAN_ENUM_184; channel_loop++) { if (CDS_CHANNEL_FREQ(channel_loop) >= ch_avoid_indi->avoid_freq_range[ range_loop].end_freq) { @@ -4781,8 +4781,8 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) } } - if (start_channel_idx == INVALID_RF_CHANNEL || - end_channel_idx == INVALID_RF_CHANNEL) + if (start_channel_idx == INVALID_CHANNEL || + end_channel_idx == INVALID_CHANNEL) continue; for (channel_loop = start_channel_idx; channel_loop <= @@ -4791,7 +4791,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) hdd_ctxt->unsafe_channel_count++] = CDS_CHANNEL_FREQ(channel_loop); if (hdd_ctxt->unsafe_channel_count >= - NUM_20MHZ_RF_CHANNELS) { + NUM_CHANNELS) { hddLog(LOGW, FL("LTECoex unsafe ch list full")); break; } @@ -4893,13 +4893,13 @@ static void hdd_init_channel_avoidance(hdd_context_t *hdd_ctx) cnss_get_wlan_unsafe_channel(hdd_ctx->unsafe_channel_list, &(hdd_ctx->unsafe_channel_count), - sizeof(uint16_t) * NUM_20MHZ_RF_CHANNELS); + sizeof(uint16_t) * NUM_CHANNELS); hddLog(QDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"), hdd_ctx->unsafe_channel_count); unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count, - (uint16_t)NUM_20MHZ_RF_CHANNELS); + (uint16_t)NUM_CHANNELS); for (index = 0; index < unsafe_channel_count; index++) { hddLog(QDF_TRACE_LEVEL_INFO, FL("channel %d is not safe"), diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 8e0e9aef41f2..46ee2fdf124c 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -428,7 +428,7 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, if (0 == (hdd_ctx->reg.eeprom_rd_ext & (1 << WHAL_REG_EXT_FCC_CH_144))) { - temp_chan = &(reg_channels[RF_CHAN_144]); + temp_chan = &(reg_channels[CHAN_ENUM_144]); temp_chan->state = CHANNEL_STATE_DISABLE; } diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 9069d5c1fd83..99bc342e0a38 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -473,7 +473,7 @@ static void __lim_process_operating_mode_action_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Received Operating Mode action frame")); - if (RF_CHAN_14 >= session->currentOperChannel) + if (CHAN_ENUM_14 >= session->currentOperChannel) cb_mode = mac_ctx->roam.configParam.channelBondingMode24GHz; else cb_mode = mac_ctx->roam.configParam.channelBondingMode5GHz; diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index a9595b4025e7..7b8c2661a0bf 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -532,7 +532,7 @@ sch_bcn_process_sta_bt_amp_sta_ibss(tpAniSirGlobal mac_ctx, uint32_t fw_vht_ch_wd = wma_get_vht_ch_width(); bool skip_opmode_update = false; - if (RF_CHAN_14 >= session->currentOperChannel) + if (CHAN_ENUM_14 >= session->currentOperChannel) cb_mode = mac_ctx->roam.configParam.channelBondingMode24GHz; else cb_mode = mac_ctx->roam.configParam.channelBondingMode5GHz; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index e7930449da74..de6a143d162a 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -485,7 +485,7 @@ struct sap_acs_cfg { #endif uint16_t ch_width; - uint8_t pcl_channels[NUM_RF_CHANNELS]; + uint8_t pcl_channels[NUM_CHANNELS]; uint32_t pcl_ch_count; /* ACS Algo Output */ uint8_t pri_ch; diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 8dab98eb2bee..9e0b14385d23 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -84,86 +84,46 @@ } #ifdef FEATURE_WLAN_CH_AVOID -sapSafeChannelType safe_channels[NUM_20MHZ_RF_CHANNELS] = { - /*CH , SAFE, default safe */ - {1, true} - , /* RF_CHAN_1, */ - {2, true} - , /* RF_CHAN_2, */ - {3, true} - , /* RF_CHAN_3, */ - {4, true} - , /* RF_CHAN_4, */ - {5, true} - , /* RF_CHAN_5, */ - {6, true} - , /* RF_CHAN_6, */ - {7, true} - , /* RF_CHAN_7, */ - {8, true} - , /* RF_CHAN_8, */ - {9, true} - , /* RF_CHAN_9, */ - {10, true} - , /* RF_CHAN_10, */ - {11, true} - , /* RF_CHAN_11, */ - {12, true} - , /* RF_CHAN_12, */ - {13, true} - , /* RF_CHAN_13, */ - {14, true} - , /* RF_CHAN_14, */ - {36, true} - , /* RF_CHAN_36, */ - {40, true} - , /* RF_CHAN_40, */ - {44, true} - , /* RF_CHAN_44, */ - {48, true} - , /* RF_CHAN_48, */ - {52, true} - , /* RF_CHAN_52, */ - {56, true} - , /* RF_CHAN_56, */ - {60, true} - , /* RF_CHAN_60, */ - {64, true} - , /* RF_CHAN_64, */ - {100, true} - , /* RF_CHAN_100, */ - {104, true} - , /* RF_CHAN_104, */ - {108, true} - , /* RF_CHAN_108, */ - {112, true} - , /* RF_CHAN_112, */ - {116, true} - , /* RF_CHAN_116, */ - {120, true} - , /* RF_CHAN_120, */ - {124, true} - , /* RF_CHAN_124, */ - {128, true} - , /* RF_CHAN_128, */ - {132, true} - , /* RF_CHAN_132, */ - {136, true} - , /* RF_CHAN_136, */ - {140, true} - , /* RF_CHAN_140, */ - {144, true} - , /* RF_CHAN_144, */ - {149, true} - , /* RF_CHAN_149, */ - {153, true} - , /* RF_CHAN_153, */ - {157, true} - , /* RF_CHAN_157, */ - {161, true} - , /* RF_CHAN_161, */ - {165, true} - , /* RF_CHAN_165, */ +sapSafeChannelType safe_channels[NUM_CHANNELS] = { + {1, true}, + {2, true}, + {3, true}, + {4, true}, + {5, true}, + {6, true}, + {7, true}, + {8, true}, + {9, true}, + {10, true}, + {11, true}, + {12, true}, + {13, true}, + {14, true}, + {36, true}, + {40, true}, + {44, true}, + {48, true}, + {52, true}, + {56, true}, + {60, true}, + {64, true}, + {100, true}, + {104, true}, + {108, true}, + {112, true}, + {116, true}, + {120, true}, + {124, true}, + {128, true}, + {132, true}, + {136, true}, + {140, true}, + {144, true}, + {149, true}, + {153, true}, + {157, true}, + {161, true}, + {165, true}, }; #endif @@ -411,17 +371,17 @@ void sap_process_avoid_ie(tHalHandle hal, void sap_update_unsafe_channel_list(ptSapContext pSapCtx) { uint16_t i, j; - uint16_t unsafe_channel_list[NUM_20MHZ_RF_CHANNELS]; + uint16_t unsafe_channel_list[NUM_CHANNELS]; uint16_t unsafe_channel_count = 0; /* Flush, default set all channel safe */ - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { safe_channels[i].isSafe = true; } /* Try to find unsafe channel */ #if defined(FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE) - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { if (pSapCtx->dfs_ch_disable == true) { if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) { safe_channels[i].isSafe = false; @@ -441,7 +401,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx) sizeof(unsafe_channel_list)); for (i = 0; i < unsafe_channel_count; i++) { - for (j = 0; j < NUM_20MHZ_RF_CHANNELS; j++) { + for (j = 0; j < NUM_CHANNELS; j++) { if (safe_channels[j].channelNumber == unsafe_channel_list[i]) { /* Found unsafe channel, update it */ @@ -661,7 +621,7 @@ bool sap_chan_sel_init(tHalHandle halHandle, } #ifdef FEATURE_WLAN_CH_AVOID - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { if ((safe_channels[i].channelNumber == *pChans) && (false == safe_channels[i].isSafe)) { QDF_TRACE(QDF_MODULE_ID_SAP, @@ -2012,7 +1972,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, if (SAP_CHANNEL_NOT_SELECTED != firstSafeChannelInRange) return firstSafeChannelInRange; - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { if ((safe_channels[i].channelNumber >= startChannelNum) && (safe_channels[i].channelNumber <= endChannelNum)) { diff --git a/core/sap/src/sap_ch_select.h b/core/sap/src/sap_ch_select.h index 692def6cbc08..8fe2d1738c6e 100644 --- a/core/sap/src/sap_ch_select.h +++ b/core/sap/src/sap_ch_select.h @@ -192,7 +192,7 @@ typedef struct sSapTxLeakInfo { typedef struct sSapChanMatrixInfo { uint8_t channel; /* channel to switch from */ - tSapTxLeakInfo chan_matrix[RF_CHAN_144 - RF_CHAN_36 + 1]; + tSapTxLeakInfo chan_matrix[CHAN_ENUM_144 - CHAN_ENUM_36 + 1]; } tSapChanMatrixInfo; #endif /* if !defined __SAP_CH_SELECT_H */ diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index b5a7353d4836..112a3b8b24d4 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -961,7 +961,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, uint8_t *temp_ch_lst) { tSapTxLeakInfo *target_chan_matrix = NULL; - uint32_t num_channel = (RF_CHAN_144 - RF_CHAN_36) + 1; + uint32_t num_channel = (CHAN_ENUM_144 - CHAN_ENUM_36) + 1; uint32_t i = 0; uint32_t j = 0; uint32_t k = 0; @@ -4181,10 +4181,10 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, sme_cfg_get_int(hal, WNI_CFG_ENABLE_LTE_COEX, &en_lte_coex); /* Check if LTE coex is enabled and 2.4GHz is selected */ - if (en_lte_coex && (band_start_ch == RF_CHAN_1) && - (band_end_ch == RF_CHAN_14)) { + if (en_lte_coex && (band_start_ch == CHAN_ENUM_1) && + (band_end_ch == CHAN_ENUM_14)) { /* Set 2.4GHz upper limit to channel 9 for LTE COEX */ - band_end_ch = RF_CHAN_9; + band_end_ch = CHAN_ENUM_9; } /* Allocate the max number of channel supported */ @@ -4219,7 +4219,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, continue; #ifdef FEATURE_WLAN_CH_AVOID - for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { if ((safe_channels[i].channelNumber == CDS_CHANNEL_NUM(loop_count))) { /* Check if channel is safe */ @@ -4324,7 +4324,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) return QDF_STATUS_E_NOMEM; } - for (i = RF_CHAN_36; i <= RF_CHAN_165; i++) { + for (i = CHAN_ENUM_36; i <= CHAN_ENUM_165; i++) { if (CDS_CHANNEL_STATE(i) == CHANNEL_STATE_ENABLE || CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { sapContext->SapAllChnlList.channelList[count].channel = @@ -4619,7 +4619,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext) bFound = true; } - for (i = RF_CHAN_36; i <= RF_CHAN_165; i++) { + for (i = CHAN_ENUM_36; i <= CHAN_ENUM_165; i++) { if (CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { /* if dfs nol is not found, initialize it */ if (!bFound) { diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index a2aee093c08e..5958c30db799 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1377,7 +1377,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, mac_ctx = PMAC_STRUCT(hal); - if (channel <= RF_CHAN_14) { + if (channel <= CHAN_ENUM_14) { /* * currently OBSS scan is done in hostapd, so to avoid * SAP coming up in HT40 on channel switch we are @@ -2818,22 +2818,22 @@ void wlansap_extend_to_acs_range(uint8_t *startChannelNum, uint8_t tmp_startChannelNum = 0, tmp_endChannelNum = 0; if (*startChannelNum <= 14 && *endChannelNum <= 14) { - *bandStartChannel = RF_CHAN_1; - *bandEndChannel = RF_CHAN_14; + *bandStartChannel = CHAN_ENUM_1; + *bandEndChannel = CHAN_ENUM_14; tmp_startChannelNum = *startChannelNum > 5 ? (*startChannelNum - ACS_2G_EXTEND) : 1; tmp_endChannelNum = (*endChannelNum + ACS_2G_EXTEND) <= 14 ? (*endChannelNum + ACS_2G_EXTEND) : 14; } else if (*startChannelNum >= 36 && *endChannelNum >= 36) { - *bandStartChannel = RF_CHAN_36; - *bandEndChannel = RF_CHAN_165; + *bandStartChannel = CHAN_ENUM_36; + *bandEndChannel = CHAN_ENUM_165; tmp_startChannelNum = (*startChannelNum - ACS_5G_EXTEND) > 36 ? (*startChannelNum - ACS_5G_EXTEND) : 36; tmp_endChannelNum = (*endChannelNum + ACS_5G_EXTEND) <= 165 ? (*endChannelNum + ACS_5G_EXTEND) : 165; } else { - *bandStartChannel = RF_CHAN_1; - *bandEndChannel = RF_CHAN_165; + *bandStartChannel = CHAN_ENUM_1; + *bandEndChannel = CHAN_ENUM_165; tmp_startChannelNum = *startChannelNum > 5 ? (*startChannelNum - ACS_2G_EXTEND) : 1; tmp_endChannelNum = (*endChannelNum + ACS_5G_EXTEND) <= 165 ? diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 0b0c5d1b75c2..9a67586bc7b9 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -5523,7 +5523,7 @@ uint16_t sme_chn_to_freq(uint8_t chanNum) { int i; - for (i = 0; i < NUM_RF_CHANNELS; i++) { + for (i = 0; i < NUM_CHANNELS; i++) { if (CDS_CHANNEL_NUM(i) == chanNum) return CDS_CHANNEL_FREQ(i); } -- cgit v1.2.3 From 388b3f01f0e6f519e212ea45491d796640ff81ce Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 10 Feb 2016 13:37:18 -0800 Subject: qcacld-3.0: Make regulatory code more readable Re-write part of regulatory code to make more readable. Rename variables to more intuitive names. Also simplify the logic. Change-Id: I4ab896d18a6b5f6e2f9c84884268e2af2077f74b CRs-Fixed: 856727 --- core/hdd/src/wlan_hdd_regulatory.c | 77 +++++++++++++++----------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 46ee2fdf124c..b8a513501f02 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -349,90 +349,73 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, struct wiphy *wiphy, bool reset) { - int i, j, m; - int k = 0; - struct ieee80211_channel *chan; - struct regulatory_channel *temp_chan_k, *temp_chan; + int band_num; + int chan_num; + int chan_enum = 0; + struct ieee80211_channel *wiphy_chan; + struct regulatory_channel *cds_chan; uint8_t band_capability; band_capability = hdd_ctx->config->nBandCapability; - hdd_ctx->isVHT80Allowed = 0; - if (band_capability == eCSR_BAND_24) - hdd_info("band capability is set to 2G only"); - - for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) { + for (band_num = 0; band_num < IEEE80211_NUM_BANDS; band_num++) { - if (i == IEEE80211_BAND_2GHZ && + if (band_num == IEEE80211_BAND_2GHZ && band_capability == eCSR_BAND_5G) continue; - else if (i == IEEE80211_BAND_5GHZ && + else if (band_num == IEEE80211_BAND_5GHZ && band_capability == eCSR_BAND_24) continue; - if (wiphy->bands[i] == NULL) { - hdd_info("wiphy band no %d is NULL", i); + if (wiphy->bands[band_num] == NULL) continue; - } - - if (i == 0) - m = 0; - else - m = wiphy->bands[i-1]->n_channels + m; - for (j = 0; j < wiphy->bands[i]->n_channels; j++) { + for (chan_num = 0; + chan_num < wiphy->bands[band_num]->n_channels; + chan_num++) { - k = m + j; + wiphy_chan = + &(wiphy->bands[band_num]->channels[chan_num]); + cds_chan = &(reg_channels[chan_enum]); - chan = &(wiphy->bands[i]->channels[j]); - temp_chan_k = &(reg_channels[k]); + chan_enum++; if (!reset) - hdd_modify_wiphy(wiphy, chan); + hdd_modify_wiphy(wiphy, wiphy_chan); - if (chan->flags & IEEE80211_CHAN_DISABLED) { - temp_chan_k->state = - CHANNEL_STATE_DISABLE; - temp_chan_k->flags = chan->flags; - - } else if (chan->flags & + if (wiphy_chan->flags & IEEE80211_CHAN_DISABLED) { + cds_chan->state = CHANNEL_STATE_DISABLE; + } else if (wiphy_chan->flags & (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_INDOOR_ONLY)) { - if (chan->flags & + if (wiphy_chan->flags & IEEE80211_CHAN_INDOOR_ONLY) - chan->flags |= + wiphy_chan->flags |= IEEE80211_CHAN_PASSIVE_SCAN; - temp_chan_k->state = CHANNEL_STATE_DFS; - temp_chan_k->pwr_limit = - chan->max_power; - temp_chan_k->flags = chan->flags; - - if ((chan->flags & + cds_chan->state = CHANNEL_STATE_DFS; + if ((wiphy_chan->flags & IEEE80211_CHAN_NO_80MHZ) == 0) hdd_ctx->isVHT80Allowed = 1; } else { - temp_chan_k->state = CHANNEL_STATE_ENABLE; - temp_chan_k->pwr_limit = chan->max_power; - temp_chan_k->flags = chan->flags; - - if ((chan->flags & + cds_chan->state = CHANNEL_STATE_ENABLE; + if ((wiphy_chan->flags & IEEE80211_CHAN_NO_80MHZ) == 0) hdd_ctx->isVHT80Allowed = 1; } + cds_chan->pwr_limit = wiphy_chan->max_power; + cds_chan->flags = wiphy_chan->flags; } } if (0 == (hdd_ctx->reg.eeprom_rd_ext & (1 << WHAL_REG_EXT_FCC_CH_144))) { - temp_chan = &(reg_channels[CHAN_ENUM_144]); - temp_chan->state = - CHANNEL_STATE_DISABLE; + cds_chan = &(reg_channels[CHAN_ENUM_144]); + cds_chan->state = CHANNEL_STATE_DISABLE; } - } -- cgit v1.2.3 From b8f2bb50a4772bb6b90d71e74765c91c9c36c9cf Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Fri, 19 Feb 2016 16:44:06 -0800 Subject: qcacld-3.0: Enable some features depending on ICNSS platform driver Currently some features depending on platform driver are only enabled when CNSS driver is enabled. Enable these features as well when ICNSS driver is enabled. Change-Id: I9c5296e888f81fcd40101f87d289f60f40f299e7 CRs-fixed: 979523 --- Kbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index b2ed9e5ea8ef..545389c1c000 100755 --- a/Kbuild +++ b/Kbuild @@ -67,7 +67,7 @@ ifeq ($(KERNEL_BUILD), 0) CONFIG_QCOM_VOWIFI_11R := y ifneq ($(CONFIG_QCA_CLD_WLAN),) - ifeq ($(CONFIG_CNSS),y) + ifeq (y,$(filter y,$(CONFIG_CNSS) $(CONFIG_ICNSS))) #Flag to enable Protected Managment Frames (11w) feature CONFIG_WLAN_FEATURE_11W := y #Flag to enable LTE CoEx feature -- cgit v1.2.3 From da39642b2464c27c83eb1c0bdedbffc4e8477766 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Fri, 19 Feb 2016 17:14:09 -0800 Subject: qcacld-3.0: Fix compilation bug for LPASS feature If CONFIG_WLAN_FEATURE_LPSS flag is not enabled, there will be compilation errors due to missing definitions. Fix them by moving inline funtions to the corresponding header file. Change-Id: I90b55daeb0068b2ab40fbb27d650a5382681705c CRs-fixed: 979523 --- core/hdd/inc/wlan_hdd_main.h | 18 ++++++++++++++++++ core/hdd/src/wlan_hdd_main.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index dbb6ac48124b..29b424fa1183 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1450,6 +1450,24 @@ void wlan_hdd_send_status_pkg(hdd_adapter_t *pAdapter, void wlan_hdd_send_version_pkg(uint32_t fw_version, uint32_t chip_id, const char *chip_name); void wlan_hdd_send_all_scan_intf_info(hdd_context_t *pHddCtx); +#else +static inline void wlan_hdd_send_status_pkg(hdd_adapter_t *pAdapter, + hdd_station_ctx_t *pHddStaCtx, + uint8_t is_on, uint8_t is_connected) +{ + return; +} + +static inline void wlan_hdd_send_version_pkg(uint32_t fw_version, uint32_t + chip_id, const char *chip_name) +{ + return; +} + +static inline void wlan_hdd_send_all_scan_intf_info(hdd_context_t *pHddCtx) +{ + return; +} #endif void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len); #ifdef FEATURE_WLAN_AUTO_SHUTDOWN diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f7137745e647..f7550bc664d4 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -6296,24 +6296,6 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) if (!scan_intf_found) wlan_hdd_send_status_pkg(pDataAdapter, NULL, 1, 0); } -#else -static inline void wlan_hdd_send_status_pkg(hdd_adapter_t *pAdapter, - hdd_station_ctx_t *pHddStaCtx, - uint8_t is_on, uint8_t is_connected) -{ - return; -} - -static inline void wlan_hdd_send_version_pkg(uint32_t fw_version, uint32_t - chip_id, const char *chip_name) -{ - return; -} - -static inline void wlan_hdd_send_all_scan_intf_info(hdd_context_t *pHddCtx) -{ - return; -} #endif #ifdef FEATURE_WLAN_AUTO_SHUTDOWN -- cgit v1.2.3 From 59f546c6ac10e3095bb633af4752e03518dff367 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 16 Feb 2016 10:31:55 -0800 Subject: qcacld-3.0: Fix incorrect flags setting in peer assoc command qcacld-2.0 to qcacld-3.0 propagation. Fix incorrect flag setting while sending peer assoc command. This change set will add a check before setting 40MHZ support bit and shortGI support bit in the peer flags. If the peer is not HT capable, these flags should not be set. Change-Id: I89d43bd86b97637b291dc871aaf7e2a3269df853 CRs-Fixed: 974242 --- core/wma/src/wma_mgmt.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index cc4fc88e9366..5c4251cc5b5a 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -890,15 +890,16 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, if (params->htCapable) { cmd->peer_flags |= (WMI_PEER_HT | WMI_PEER_QOS); cmd->peer_rate_caps |= WMI_RC_HT_FLAG; - } - if (params->ch_width) { - cmd->peer_flags |= WMI_PEER_40MHZ; - cmd->peer_rate_caps |= WMI_RC_CW40_FLAG; - if (params->fShortGI40Mhz) + if (params->ch_width) { + cmd->peer_flags |= WMI_PEER_40MHZ; + cmd->peer_rate_caps |= WMI_RC_CW40_FLAG; + if (params->fShortGI40Mhz) + cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; + } else if (params->fShortGI20Mhz) { cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; - } else if (params->fShortGI20Mhz) - cmd->peer_rate_caps |= WMI_RC_SGI_FLAG; + } + } #ifdef WLAN_FEATURE_11AC if (params->vhtCapable) { -- cgit v1.2.3 From 047e7d590ef85a4e2723bc37a02efb60b63a32b6 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Thu, 11 Feb 2016 16:30:02 -0800 Subject: qcacld-3.0: Redefine dfs data structure to fix prealloc size concern Redefine dfs filter type to avoid prealloc problem by making one large chunk into multiple smaller chunks. With current data structure, dfs attach was requesting huge chunk of memory from the heap which results in failure. This change set fixes the issue by modifying the data structure so that one large chunk is made as multiple smaller chunks. Change-Id: If944747de63a68d55a83b8595d0a07dd05f53dbe CRs-Fixed: 975903 --- core/sap/dfs/inc/dfs.h | 2 +- core/sap/dfs/src/dfs.c | 70 ++++++++++++++++++++++++++++--- core/sap/dfs/src/dfs_debug.c | 2 +- core/sap/dfs/src/dfs_init.c | 4 +- core/sap/dfs/src/dfs_process_radarevent.c | 2 +- 5 files changed, 69 insertions(+), 11 deletions(-) diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h index c367eec4dbcf..56187cbcdc8b 100644 --- a/core/sap/dfs/inc/dfs.h +++ b/core/sap/dfs/inc/dfs.h @@ -390,7 +390,7 @@ struct dfs_filter { #endif struct dfs_filtertype { - struct dfs_filter ft_filters[DFS_MAX_NUM_RADAR_FILTERS]; + struct dfs_filter *ft_filters[DFS_MAX_NUM_RADAR_FILTERS]; /* Duration of pulse which specifies filter type */ uint32_t ft_filterdur; /* Num filters of this type */ diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index 4d7fbbc4ff65..d938c0124931 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -215,6 +215,44 @@ static int dfs_get_debug_info(struct ieee80211com *ic, int type, void *data) return (int)dfs->dfs_proc_phyerr; } +/** + * dfs_alloc_mem_filter() - allocate memory for dfs ft_filters + * @radarf: pointer holding ft_filters + * + * Return: 0-success and 1-failure +*/ +static int dfs_alloc_mem_filter(struct dfs_filtertype *radarf) +{ + int status = 0, n, i; + + for (i = 0; i < DFS_MAX_NUM_RADAR_FILTERS; i++) { + radarf->ft_filters[i] = qdf_mem_malloc(sizeof(struct + dfs_filter)); + if (NULL == radarf->ft_filters[i]) { + DFS_PRINTK("%s[%d]: mem alloc failed\n", + __func__, __LINE__); + status = 1; + goto error; + } + } + + return status; + +error: + /* free up allocated memory */ + for (n = 0; n < i; n++) { + if (radarf->ft_filters[n]) { + qdf_mem_free(radarf->ft_filters[n]); + radarf->ft_filters[i] = NULL; + } + } + + DFS_PRINTK("%s[%d]: cannot allocate memory for radar filter types\n", + __func__, __LINE__); + + return status; +} + int dfs_attach(struct ieee80211com *ic) { int i, n; @@ -325,18 +363,20 @@ int dfs_attach(struct ieee80211com *ic) /* Allocate memory for radar filters */ for (n = 0; n < DFS_MAX_RADAR_TYPES; n++) { - dfs->dfs_radarf[n] = - (struct dfs_filtertype *)os_malloc(NULL, - sizeof(struct - dfs_filtertype), - GFP_ATOMIC); + dfs->dfs_radarf[n] = (struct dfs_filtertype *) + os_malloc(NULL, sizeof(struct dfs_filtertype), + GFP_ATOMIC); if (dfs->dfs_radarf[n] == NULL) { DFS_PRINTK ("%s: cannot allocate memory for radar filter types\n", __func__); goto bad1; + } else { + qdf_mem_zero(dfs->dfs_radarf[n], + sizeof(struct dfs_filtertype)); + if (0 != dfs_alloc_mem_filter(dfs->dfs_radarf[n])) + goto bad1; } - OS_MEMZERO(dfs->dfs_radarf[n], sizeof(struct dfs_filtertype)); } /* Allocate memory for radar table */ dfs->dfs_radartable = @@ -431,6 +471,23 @@ bad1: #undef N } +/** + * dfs_free_filter() - free memory allocated for dfs ft_filters + * @radarf: pointer holding ft_filters + * + * Return: NA +*/ +static void dfs_free_filter(struct dfs_filtertype *radarf) +{ + int i; + + for (i = 0; i < DFS_MAX_NUM_RADAR_FILTERS; i++) { + if (radarf->ft_filters[i]) { + qdf_mem_free(radarf->ft_filters[i]); + radarf->ft_filters[i] = NULL; + } + } +} void dfs_detach(struct ieee80211com *ic) { struct ath_dfs *dfs = (struct ath_dfs *)ic->ic_dfs; @@ -496,6 +553,7 @@ void dfs_detach(struct ieee80211com *ic) for (n = 0; n < DFS_MAX_RADAR_TYPES; n++) { if (dfs->dfs_radarf[n] != NULL) { + dfs_free_filter(dfs->dfs_radarf[n]); OS_FREE(dfs->dfs_radarf[n]); dfs->dfs_radarf[n] = NULL; } diff --git a/core/sap/dfs/src/dfs_debug.c b/core/sap/dfs/src/dfs_debug.c index 71f917ad00e6..1a5aa2be2e98 100644 --- a/core/sap/dfs/src/dfs_debug.c +++ b/core/sap/dfs/src/dfs_debug.c @@ -108,7 +108,7 @@ void dfs_print_filters(struct ath_dfs *dfs) ("===========ft->ft_numfilters=%u===========\n", ft->ft_numfilters); for (j = 0; j < ft->ft_numfilters; j++) { - rf = &(ft->ft_filters[j]); + rf = ft->ft_filters[j]; DFS_PRINTK ("filter[%d] filterID = %d rf_numpulses=%u; rf->rf_minpri=%u; rf->rf_maxpri=%u; rf->rf_threshold=%u; rf->rf_filterlen=%u; rf->rf_mindur=%u; rf->rf_maxdur=%u\n", j, rf->rf_pulseid, rf->rf_numpulses, diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c index b4db534a0ade..c67f7fcf1b03 100644 --- a/core/sap/dfs/src/dfs_init.c +++ b/core/sap/dfs/src/dfs_init.c @@ -118,7 +118,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id) ft = dfs->dfs_radarf[i]; if (NULL != ft) { for (j = 0; j < ft->ft_numfilters; j++) { - rf = &(ft->ft_filters[j]); + rf = ft->ft_filters[j]; if (dfs->ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) dl = (seg_id == 0) ? @@ -332,7 +332,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic, } dfs->dfs_rinfo.rn_numradars++; } - rf = &(ft->ft_filters[ft->ft_numfilters++]); + rf = ft->ft_filters[ft->ft_numfilters++]; dfs_reset_delayline(&rf->rf_dl); if (ic->dfs_hw_bd_id != DFS_HWBD_QCA6174) diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 6c4613b19a82..321161c197a4 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -634,7 +634,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, } for (p = 0, found = 0; (p < ft->ft_numfilters) && (!found); p++) { - rf = &(ft->ft_filters[p]); + rf = ft->ft_filters[p]; dl = (seg_id == 0) ? &rf->rf_dl : &rf->rf_dl_ext_seg; if ((re.re_dur >= rf->rf_mindur) -- cgit v1.2.3 From 9a733a7fcc36a098e2e820ba5544d679f092ebc9 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Wed, 17 Feb 2016 19:01:15 -0800 Subject: qcacld-3.0: Remove WLAN_FEATURE_11AC feature flag Remove WLAN_FEATURE_11AC feature flag Change-Id: I8c521502a44f2e8a0647843cd7a972497e900c17 CRs-Fixed: 980682 --- Kbuild | 1 - core/hdd/inc/wlan_hdd_cfg.h | 12 --- core/hdd/src/wlan_hdd_cfg.c | 21 ----- core/hdd/src/wlan_hdd_cfg80211.c | 4 - core/hdd/src/wlan_hdd_main.c | 6 -- core/hdd/src/wlan_hdd_stats.c | 14 +--- core/hdd/src/wlan_hdd_stats.h | 2 - core/hdd/src/wlan_hdd_wext.c | 18 ---- core/mac/inc/sir_api.h | 10 --- core/mac/inc/sir_mac_prop_exts.h | 2 - core/mac/inc/sir_mac_prot_def.h | 6 -- core/mac/src/include/parser_api.h | 11 --- core/mac/src/include/sir_params.h | 8 -- core/mac/src/pe/include/lim_global.h | 6 -- core/mac/src/pe/lim/lim_assoc_utils.c | 96 ++++------------------ core/mac/src/pe/lim/lim_assoc_utils.h | 30 ------- core/mac/src/pe/lim/lim_ft.c | 13 --- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 12 --- core/mac/src/pe/lim/lim_process_action_frame.c | 5 -- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 16 ---- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 12 --- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 5 -- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 8 -- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 9 -- core/mac/src/pe/lim/lim_process_tdls.c | 19 +---- core/mac/src/pe/lim/lim_prop_exts_utils.c | 10 --- core/mac/src/pe/lim/lim_prop_exts_utils.h | 2 - core/mac/src/pe/lim/lim_send_management_frames.c | 19 ----- core/mac/src/pe/lim/lim_send_messages.c | 11 +-- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 6 -- core/mac/src/pe/lim/lim_utils.c | 11 --- core/mac/src/pe/lim/lim_utils.h | 4 - core/mac/src/pe/sch/sch_beacon_gen.c | 7 -- core/mac/src/pe/sch/sch_beacon_process.c | 5 -- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 4 - core/mac/src/sys/legacy/src/utils/src/parser_api.c | 28 ------- core/sap/src/sap_fsm.c | 2 - core/sme/inc/csr_api.h | 6 -- core/sme/inc/csr_internal.h | 13 --- core/sme/src/csr/csr_api_roam.c | 27 +----- core/sme/src/csr/csr_api_scan.c | 4 - core/sme/src/csr/csr_util.c | 52 +----------- core/wma/inc/wma.h | 2 - core/wma/inc/wma_if.h | 3 - core/wma/inc/wma_internal.h | 2 - core/wma/inc/wma_tgt_cfg.h | 4 - core/wma/inc/wma_types.h | 2 - core/wma/src/wma_dev_if.c | 2 - core/wma/src/wma_main.c | 8 -- core/wma/src/wma_mgmt.c | 4 - core/wma/src/wma_utils.c | 4 - 51 files changed, 26 insertions(+), 562 deletions(-) diff --git a/Kbuild b/Kbuild index 545389c1c000..8bf73d63cf82 100755 --- a/Kbuild +++ b/Kbuild @@ -903,7 +903,6 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ -DWLAN_AP_STA_CONCURRENCY \ -DFEATURE_WLAN_SCAN_PNO \ -DWLAN_FEATURE_PACKET_FILTERING \ - -DWLAN_FEATURE_11AC \ -DWLAN_FEATURE_P2P_DEBUG \ -DWLAN_ENABLE_AGEIE_ON_SCAN_RESULTS \ -DWLANTL_DEBUG\ diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 02a5d59dc144..c3caa83d3078 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -186,11 +186,7 @@ typedef enum { #define CFG_DOT11_MODE_NAME "gDot11Mode" #define CFG_DOT11_MODE_MIN eHDD_DOT11_MODE_AUTO -#ifdef WLAN_FEATURE_11AC #define CFG_DOT11_MODE_DEFAULT eHDD_DOT11_MODE_11ac -#else -#define CFG_DOT11_MODE_DEFAULT eHDD_DOT11_MODE_11n -#endif #define CFG_DOT11_MODE_MAX eHDD_DOT11_MODE_11a #define CFG_CHANNEL_BONDING_MODE_24GHZ_NAME "gChannelBondingMode24GHz" @@ -1074,7 +1070,6 @@ typedef enum { eHDD_LINK_SPEED_REPORT_MAX = 1, eHDD_LINK_SPEED_REPORT_MAX_SCALED = 2, } eHddLinkSpeedReportType; -#ifdef WLAN_FEATURE_11AC #define CFG_VHT_CHANNEL_WIDTH "gVhtChannelWidth" #define CFG_VHT_CHANNEL_WIDTH_MIN (0) #define CFG_VHT_CHANNEL_WIDTH_MAX (4) @@ -1119,7 +1114,6 @@ typedef enum { #define CFG_VHT_ENABLE_GID_FEATURE_MIN (0) #define CFG_VHT_ENABLE_GID_FEATURE_MAX (1) #define CFG_VHT_ENABLE_GID_FEATURE_DEFAULT (0) -#endif #define CFG_VHT_ENABLE_1x1_TX_CHAINMASK "gSetTxChainmask1x1" #define CFG_VHT_ENABLE_1x1_TX_CHAINMASK_MIN (1) @@ -1788,12 +1782,10 @@ typedef enum { #define CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MAX (1) #define CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_DEFAULT (0) -#ifdef WLAN_FEATURE_11AC #define CFG_DISABLE_LDPC_WITH_TXBF_AP "gDisableLDPCWithTxbfAP" #define CFG_DISABLE_LDPC_WITH_TXBF_AP_MIN (0) #define CFG_DISABLE_LDPC_WITH_TXBF_AP_MAX (1) #define CFG_DISABLE_LDPC_WITH_TXBF_AP_DEFAULT (0) -#endif /* * IBSS Operating Channels for 2.4G and 5GHz channels @@ -1979,7 +1971,6 @@ typedef enum { #define CFG_ENABLE_FW_SELF_RECOVERY_ENABLE (1) #define CFG_ENABLE_FW_SELF_RECOVERY_DEFAULT (CFG_ENABLE_FW_SELF_RECOVERY_DISABLE) -#ifdef WLAN_FEATURE_11AC /* Macro to handle maximum receive AMPDU size configuration */ #define CFG_VHT_AMPDU_LEN_EXPONENT_NAME "gVhtAmpduLenExponent" #define CFG_VHT_AMPDU_LEN_EXPONENT_MIN (0) @@ -1990,7 +1981,6 @@ typedef enum { #define CFG_VHT_MPDU_LEN_MIN (0) #define CFG_VHT_MPDU_LEN_MAX (2) #define CFG_VHT_MPDU_LEN_DEFAULT (0) -#endif #define CFG_MAX_WOW_FILTERS_NAME "gMaxWoWFilters" #define CFG_MAX_WOW_FILTERS_MIN (0) @@ -3299,10 +3289,8 @@ struct hdd_config { bool enablePowersaveOffload; bool enablefwprint; bool enable_fw_log; -#ifdef WLAN_FEATURE_11AC uint8_t fVhtAmpduLenExponent; uint32_t vhtMpduLen; -#endif uint32_t IpaConfig; bool IpaClkScalingEnable; uint32_t IpaDescSize; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index b776f6396965..68d174a2d5d5 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -2010,7 +2010,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_MC_ADDR_LIST_ENABLE_MIN, CFG_MC_ADDR_LIST_ENABLE_MAX), -#ifdef WLAN_FEATURE_11AC REG_VARIABLE(CFG_VHT_CHANNEL_WIDTH, WLAN_PARAM_Integer, struct hdd_config, vhtChannelWidth, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, @@ -2073,7 +2072,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_VHT_ENABLE_GID_FEATURE_DEFAULT, CFG_VHT_ENABLE_GID_FEATURE_MIN, CFG_VHT_ENABLE_GID_FEATURE_MAX), -#endif REG_VARIABLE(CFG_VHT_ENABLE_1x1_TX_CHAINMASK, WLAN_PARAM_Integer, struct hdd_config, txchainmask1x1, @@ -2463,14 +2461,12 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MIN, CFG_SAP_ALLOW_ALL_CHANNEL_PARAM_MAX), -#ifdef WLAN_FEATURE_11AC REG_VARIABLE(CFG_DISABLE_LDPC_WITH_TXBF_AP, WLAN_PARAM_Integer, struct hdd_config, disableLDPCWithTxbfAP, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, CFG_DISABLE_LDPC_WITH_TXBF_AP_DEFAULT, CFG_DISABLE_LDPC_WITH_TXBF_AP_MIN, CFG_DISABLE_LDPC_WITH_TXBF_AP_MAX), -#endif REG_DYNAMIC_VARIABLE(CFG_ENABLE_SSR, WLAN_PARAM_Integer, struct hdd_config, enableSSR, @@ -2488,16 +2484,12 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_MAX_MEDIUM_TIME_STAMIN, CFG_MAX_MEDIUM_TIME_STAMAX), - - -#ifdef WLAN_FEATURE_11AC REG_VARIABLE(CFG_ENABLE_VHT_FOR_24GHZ_NAME, WLAN_PARAM_Integer, struct hdd_config, enableVhtFor24GHzBand, VAR_FLAGS_OPTIONAL, CFG_ENABLE_VHT_FOR_24GHZ_DEFAULT, CFG_ENABLE_VHT_FOR_24GHZ_MIN, CFG_ENABLE_VHT_FOR_24GHZ_MAX), -#endif REG_DYNAMIC_VARIABLE(CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY, WLAN_PARAM_Integer, @@ -2645,7 +2637,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_IPA_LOW_BANDWIDTH_MBPS_MAX), #endif -#ifdef WLAN_FEATURE_11AC REG_VARIABLE(CFG_VHT_AMPDU_LEN_EXPONENT_NAME, WLAN_PARAM_Integer, struct hdd_config, fVhtAmpduLenExponent, VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK, @@ -2659,7 +2650,6 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_VHT_MPDU_LEN_DEFAULT, CFG_VHT_MPDU_LEN_MIN, CFG_VHT_MPDU_LEN_MAX), -#endif REG_VARIABLE(CFG_MAX_WOW_FILTERS_NAME, WLAN_PARAM_Integer, struct hdd_config, maxWoWFilters, @@ -4946,11 +4936,9 @@ void hdd_cfg_print(hdd_context_t *pHddCtx) QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [thermalMitigationEnable] Value = [%u] ", pHddCtx->config->thermalMitigationEnable); -#ifdef WLAN_FEATURE_11AC QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [gVhtChannelWidth] value = [%u]", pHddCtx->config->vhtChannelWidth); -#endif QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH, "Name = [enableFirstScan2GOnly] Value = [%u] ", pHddCtx->config->enableFirstScan2GOnly); @@ -5526,17 +5514,10 @@ eCsrPhyMode hdd_cfg_xlate_to_csr_phy_mode(eHddDot11Mode dot11Mode) return eCSR_DOT11_MODE_11n_ONLY; case (eHDD_DOT11_MODE_11b_ONLY): return eCSR_DOT11_MODE_11b_ONLY; -#ifdef WLAN_FEATURE_11AC case (eHDD_DOT11_MODE_11ac_ONLY): return eCSR_DOT11_MODE_11ac_ONLY; case (eHDD_DOT11_MODE_11ac): return eCSR_DOT11_MODE_11ac; -#else - /* If 11AC support is not compiled set Auto mode */ - case (eHDD_DOT11_MODE_11ac): - case (eHDD_DOT11_MODE_11ac_ONLY): - return eCSR_DOT11_MODE_AUTO; -#endif case (eHDD_DOT11_MODE_AUTO): return eCSR_DOT11_MODE_AUTO; case (eHDD_DOT11_MODE_11a): @@ -6526,7 +6507,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) /* Remaining config params not obtained from registry * On RF EVB beacon using channel 1. */ -#ifdef WLAN_FEATURE_11AC smeConfig->csrConfig.nVhtChannelWidth = pConfig->vhtChannelWidth; smeConfig->csrConfig.enableTxBF = pConfig->enableTxBF; smeConfig->csrConfig.enable_txbf_sap_mode = @@ -6537,7 +6517,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig->csrConfig.enableMuBformee = pConfig->enableMuBformee; smeConfig->csrConfig.enableVhtpAid = pConfig->enableVhtpAid; smeConfig->csrConfig.enableVhtGid = pConfig->enableVhtGid; -#endif smeConfig->csrConfig.enableAmpduPs = pConfig->enableAmpduPs; smeConfig->csrConfig.enableHtSmps = pConfig->enableHtSmps; smeConfig->csrConfig.htSmps = pConfig->htSmps; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 2abd3ffef348..0cf30ce47739 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -7785,14 +7785,10 @@ void hdd_select_cbmode(hdd_adapter_t *pAdapter, uint8_t operationChannel) case eHDD_DOT11_MODE_AUTO: case eHDD_DOT11_MODE_11ac: case eHDD_DOT11_MODE_11ac_ONLY: -#ifdef WLAN_FEATURE_11AC if (sme_is_feature_supported_by_fw(DOT11AC)) hddDot11Mode = eHDD_DOT11_MODE_11ac; else hddDot11Mode = eHDD_DOT11_MODE_11n; -#else - hddDot11Mode = eHDD_DOT11_MODE_11n; -#endif break; case eHDD_DOT11_MODE_11n: case eHDD_DOT11_MODE_11n_ONLY: diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f7550bc664d4..73c75f5f8398 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -784,12 +784,10 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, /* Set up UAPSD */ config->apUapsdEnabled &= cfg->uapsd; -#ifdef WLAN_FEATURE_11AC /* 11AC mode support */ if ((config->dot11Mode == eHDD_DOT11_MODE_11ac || config->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY) && !cfg->en_11ac) config->dot11Mode = eHDD_DOT11_MODE_AUTO; -#endif /* #ifdef WLAN_FEATURE_11AC */ /* ARP offload: override user setting if invalid */ config->fhostArpOffload &= cfg->arp_offload; @@ -943,7 +941,6 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, #undef WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES } -#ifdef WLAN_FEATURE_11AC static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, struct wma_tgt_vht_cap *cfg) { @@ -1269,7 +1266,6 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_VHT_TXOP_PS; } -#endif /* #ifdef WLAN_FEATURE_11AC */ void hdd_update_tgt_cfg(void *context, void *param) { @@ -1327,9 +1323,7 @@ void hdd_update_tgt_cfg(void *context, void *param) hdd_update_tgt_ht_cap(hdd_ctx, &cfg->ht_cap); -#ifdef WLAN_FEATURE_11AC hdd_update_tgt_vht_cap(hdd_ctx, &cfg->vht_cap); -#endif /* #ifdef WLAN_FEATURE_11AC */ hdd_ctx->config->fine_time_meas_cap &= cfg->fine_time_measurement_cap; hdd_ctx->fine_time_meas_cap_target = cfg->fine_time_measurement_cap; hdd_info(FL("fine_time_meas_cap: 0x%x"), diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index 36d7087d54b3..c3af64498253 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -149,7 +149,6 @@ static struct index_data_rate_type supported_mcs_rate_nss2[] = { {7, {1300, 2700, 1444, 3000} } }; -#ifdef WLAN_FEATURE_11AC /* MCS Based VHT rate table MCS parameters with Nss = 1*/ static struct index_vht_data_rate_type supported_vht_mcs_rate_nss1[] = { /* MCS L80 S80 L40 S40 L20 S40*/ @@ -179,7 +178,6 @@ static struct index_vht_data_rate_type supported_vht_mcs_rate_nss2[] = { {8, {7020, 7800}, {3240, 3600}, {1560, 1733} }, {9, {7800, 8667}, {3600, 4000}, {1560, 1733} } }; -#endif /* End of WLAN_FEATURE_11AC */ /*array index ponints to MCS and array value points respective rssi*/ static int rssi_mcs_tbl[][10] = { @@ -1715,11 +1713,8 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, struct index_vht_data_rate_type *supported_vht_mcs_rate; struct index_data_rate_type *supported_mcs_rate; -#ifdef WLAN_FEATURE_11AC uint32_t vht_mcs_map; enum eDataRate11ACMaxMcs vhtMaxMcs; -#endif /* WLAN_FEATURE_11AC */ - ENTER(); @@ -1887,7 +1882,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, return 0; } rateFlag = 0; -#ifdef WLAN_FEATURE_11AC supported_vht_mcs_rate = (struct index_vht_data_rate_type *) ((nss == @@ -1967,9 +1961,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, if (currentRate > maxRate) maxRate = currentRate; - } else -#endif /* WLAN_FEATURE_11AC */ - { + } else { if (rate_flags & eHAL_TX_RATE_HT40) rateFlag |= 1; if (rate_flags & eHAL_TX_RATE_SGI) @@ -2042,7 +2034,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, #endif /* LINKSPEED_DEBUG_ENABLED */ } else { sinfo->txrate.mcs = maxMCSIdx; -#ifdef WLAN_FEATURE_11AC sinfo->txrate.nss = nss; if (rate_flags & eHAL_TX_RATE_VHT80) { sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; @@ -2064,7 +2055,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; } else sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; -#endif /* WLAN_FEATURE_11AC */ if (rate_flags & (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) { sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; @@ -2104,7 +2094,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, /* must be MCS */ sinfo->txrate.mcs = pAdapter->hdd_stats.ClassA_stat.mcs_index; -#ifdef WLAN_FEATURE_11AC sinfo->txrate.nss = nss; sinfo->txrate.flags |= RATE_INFO_FLAGS_VHT_MCS; if (rate_flags & eHAL_TX_RATE_VHT80) { @@ -2122,7 +2111,6 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy, RATE_INFO_FLAGS_40_MHZ_WIDTH; #endif } -#endif /* WLAN_FEATURE_11AC */ if (rate_flags & (eHAL_TX_RATE_HT20 | eHAL_TX_RATE_HT40)) { sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS; diff --git a/core/hdd/src/wlan_hdd_stats.h b/core/hdd/src/wlan_hdd_stats.h index b30b587be819..38e48f2b4e03 100644 --- a/core/hdd/src/wlan_hdd_stats.h +++ b/core/hdd/src/wlan_hdd_stats.h @@ -35,7 +35,6 @@ #define MAX_HT_MCS_IDX 8 #define MAX_VHT_MCS_IDX 10 -#ifdef WLAN_FEATURE_11AC #define DATA_RATE_11AC_MCS_MASK 0x03 /* LL stats get request time out value */ @@ -68,7 +67,6 @@ enum eDataRate11ACMaxMcs{ DATA_RATE_11AC_MAX_MCS_9, DATA_RATE_11AC_MAX_MCS_NA }; -#endif /* End of WLAN_FEATURE_11AC */ /** * struct index_data_rate_type - non vht data rate type diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 2e1badca6a22..ccc45f2b1aed 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -299,9 +299,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #define WE_GET_CFG 3 #define WE_GET_WMM_STATUS 4 #define WE_GET_CHANNEL_LIST 5 -#ifdef WLAN_FEATURE_11AC #define WE_GET_RSSI 6 -#endif #ifdef FEATURE_WLAN_TDLS #define WE_GET_TDLS_PEERS 8 #endif @@ -4550,9 +4548,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, bool ch_bond24 = false, ch_bond5g = false; tSmeConfigParams smeconfig; uint32_t chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; -#ifdef WLAN_FEATURE_11AC uint32_t vhtchanwidth; -#endif eCsrPhyMode phymode = -EIO, old_phymode; eHddDot11Mode hdd_dot11mode = phddctx->config->dot11Mode; eCsrBand curr_band = eCSR_BAND_ALL; @@ -4684,7 +4680,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, return -EIO; } break; -#ifdef WLAN_FEATURE_11AC case IEEE80211_MODE_11AC_VHT20: case IEEE80211_MODE_11AC_VHT40: case IEEE80211_MODE_11AC_VHT80: @@ -4699,7 +4694,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, return -EIO; } break; -#endif case IEEE80211_MODE_2G_AUTO: sme_set_phy_mode(hal, eCSR_DOT11_MODE_AUTO); if ((hdd_set_band(net, WLAN_HDD_UI_BAND_2_4_GHZ) == 0)) { @@ -4741,7 +4735,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, return -EIO; } -#ifdef WLAN_FEATURE_11AC switch (new_phymode) { case IEEE80211_MODE_11AC_VHT20: chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; @@ -4757,7 +4750,6 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, vhtchanwidth = phddctx->config->vhtChannelWidth; break; } -#endif if (phymode != -EIO) { sme_get_config_param(hal, &smeconfig); @@ -4800,9 +4792,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, smeconfig.csrConfig.channelBondingMode24GHz = chwidth; smeconfig.csrConfig.channelBondingMode5GHz = chwidth; } -#ifdef WLAN_FEATURE_11AC smeconfig.csrConfig.nVhtChannelWidth = vhtchanwidth; -#endif sme_update_config(hal, &smeconfig); phddctx->config->dot11Mode = hdd_dot11mode; @@ -5461,7 +5451,6 @@ static int __iw_setint_getnone(struct net_device *dev, return -EINVAL; break; -#ifdef WLAN_FEATURE_11AC case eHT_CHANNEL_WIDTH_80MHZ: if (chwidth) smeConfig.csrConfig. @@ -5472,7 +5461,6 @@ static int __iw_setint_getnone(struct net_device *dev, return -EINVAL; break; -#endif default: return -EINVAL; @@ -7128,7 +7116,6 @@ static int __iw_get_char_setnone(struct net_device *dev, wrqu->data.length = strlen(extra) + 1; break; } -#ifdef WLAN_FEATURE_11AC case WE_GET_RSSI: { int8_t s7Rssi = 0; @@ -7137,7 +7124,6 @@ static int __iw_get_char_setnone(struct net_device *dev, wrqu->data.length = strlen(extra) + 1; break; } -#endif case WE_GET_WMM_STATUS: { @@ -7339,7 +7325,6 @@ static int __iw_get_char_setnone(struct net_device *dev, case eCSR_DOT11_MODE_11g_ONLY: snprintf(extra, WE_MAX_STR_LEN, "11G"); break; -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: case eCSR_DOT11_MODE_11ac_ONLY: if (hddctx->config->vhtChannelWidth == @@ -7359,7 +7344,6 @@ static int __iw_get_char_setnone(struct net_device *dev, snprintf(extra, WE_MAX_STR_LEN, "11ACVHT160"); break; -#endif } wrqu->data.length = strlen(extra) + 1; @@ -10392,12 +10376,10 @@ static const struct iw_priv_args we_private_args[] = { 0, IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN, "getConfig"}, -#ifdef WLAN_FEATURE_11AC {WE_GET_RSSI, 0, IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN, "getRSSI"}, -#endif {WE_GET_WMM_STATUS, 0, IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index e32a9d9c65c5..79d8f5123f12 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -301,9 +301,7 @@ typedef enum eStaRateMode { eSTA_11bg, eSTA_11a, eSTA_11n, -#ifdef WLAN_FEATURE_11AC eSTA_11ac, -#endif eSTA_INVALID_RATE_MODE } tStaRateMode, *tpStaRateMode; @@ -355,7 +353,6 @@ typedef struct sSirSupportedRates { */ uint16_t rxHighestDataRate; -#ifdef WLAN_FEATURE_11AC /*Indicates the Maximum MCS that can be received for each number of spacial streams */ uint16_t vhtRxMCSMap; @@ -366,7 +363,6 @@ typedef struct sSirSupportedRates { uint16_t vhtTxMCSMap; /*Indicate the highest VHT data rate that the STA is able to transmit */ uint16_t vhtTxHighestDataRate; -#endif } tSirSupportedRates, *tpSirSupportedRates; typedef enum eSirRFBand { @@ -512,9 +508,7 @@ typedef enum eSirNwType { eSIR_11B_NW_TYPE, eSIR_11G_NW_TYPE, eSIR_11N_NW_TYPE, -#ifdef WLAN_FEATURE_11AC eSIR_11AC_NW_TYPE, -#endif eSIR_DONOT_USE_NW_TYPE = SIR_MAX_ENUM_SIZE } tSirNwType; @@ -681,12 +675,10 @@ typedef struct sSirSmeHTProfile { uint8_t htSupportedChannelWidthSet; uint8_t htRecommendedTxWidthSet; ePhyChanBondState htSecondaryChannelOffset; -#ifdef WLAN_FEATURE_11AC uint8_t vhtCapability; uint8_t vhtTxChannelWidthSet; uint8_t apCenterChan; uint8_t apChanWidth; -#endif } tSirSmeHTProfile; #endif /* / Definition for response message to previously */ @@ -973,13 +965,11 @@ typedef struct sSirSmeJoinReq { uint8_t txLdpcIniFeatureEnabled; tSirHTConfig htConfig; -#ifdef WLAN_FEATURE_11AC uint8_t txBFIniFeatureEnabled; uint8_t txBFCsnValue; uint8_t txMuBformee; uint8_t enableVhtpAid; uint8_t enableVhtGid; -#endif uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; diff --git a/core/mac/inc/sir_mac_prop_exts.h b/core/mac/inc/sir_mac_prop_exts.h index dd24a87904f4..260e081be46c 100644 --- a/core/mac/inc/sir_mac_prop_exts.h +++ b/core/mac/inc/sir_mac_prop_exts.h @@ -51,12 +51,10 @@ (dot11Mode == WNI_CFG_DOT11_MODE_11AC_ONLY) || \ (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? true:false) -#ifdef WLAN_FEATURE_11AC #define IS_DOT11_MODE_VHT(dot11Mode) \ (((dot11Mode == WNI_CFG_DOT11_MODE_11AC) || \ (dot11Mode == WNI_CFG_DOT11_MODE_11AC_ONLY) || \ (dot11Mode == WNI_CFG_DOT11_MODE_ALL)) ? true:false) -#endif #define IS_DOT11_MODE_11B(dot11Mode) \ ((dot11Mode == WNI_CFG_DOT11_MODE_11B) ? true:false) diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index a417daefd490..75ada58fea90 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -191,10 +191,8 @@ #define SIR_MAC_RRM_NEIGHBOR_RPT 5 /* VHT Action Field */ -#ifdef WLAN_FEATURE_11AC #define SIR_MAC_VHT_GID_NOTIFICATION 1 #define SIR_MAC_VHT_OPMODE_NOTIFICATION 2 -#endif #define NUM_OF_SOUNDING_DIMENSIONS 1 /*Nss - 1, (Nss = 2 for 2x2)*/ /* HT Action Field Codes */ @@ -382,12 +380,10 @@ #define SIR_MAC_HT_INFO_EID_MIN 0 #define SIR_MAC_HT_INFO_EID_MAX 255 -#ifdef WLAN_FEATURE_11AC #define SIR_MAC_VHT_CAPABILITIES_EID 191 #define SIR_MAC_VHT_OPERATION_EID 192 #define SIR_MAC_VHT_EXT_BSS_LOAD_EID 193 #define SIR_MAC_VHT_OPMODE_EID 199 -#endif #define SIR_MAC_MAX_SUPPORTED_MCS_SET 16 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE @@ -577,9 +573,7 @@ #define SIR_MAC_SET_RRM(x) (((uint16_t) x) | 0x1000) #define SIR_MAC_SET_GROUP_ACK(x) (((uint16_t) x) | 0x4000) -#ifdef WLAN_FEATURE_11AC #define SIR_MAC_GET_VHT_MAX_AMPDU_EXPO(x) ((((uint32_t) x) & 0x03800000) >> 23) -#endif /* bitname must be one of the above, eg ESS, CF_POLLABLE, etc. */ #define SIR_MAC_CLEAR_CAPABILITY(u16value, bitname) \ diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 087833dd8b1c..27e72b527a69 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -145,14 +145,12 @@ typedef struct sSirProbeRespBeacon { uint8_t mdiePresent; -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; tDot11fIEVHTOperation VHTOperation; tDot11fIEVHTExtBssLoad VHTExtBssLoad; tDot11fIEOperatingMode OperatingMode; uint8_t WiderBWChanSwitchAnnPresent; tDot11fIEWiderBWChanSwitchAnn WiderBWChanSwitchAnn; -#endif uint8_t Vendor1IEPresent; tDot11fIEvendor2_ie vendor2_ie; uint8_t Vendor3IEPresent; @@ -177,10 +175,7 @@ typedef struct sSirProbeReq { uint8_t extendedRatesPresent; uint8_t wscIePresent; uint8_t p2pIePresent; -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; -#endif - } tSirProbeReq, *tpSirProbeReq; /* / Association Request structure (one day to be replaced by */ @@ -229,10 +224,8 @@ typedef struct sSirAssocReq { required for indicating the frame to upper layers */ uint32_t assocReqFrameLength; uint8_t *assocReqFrame; -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; tDot11fIEOperatingMode operMode; -#endif tDot11fIEExtCap ExtCap; } tSirAssocReq, *tpSirAssocReq; @@ -275,10 +268,8 @@ typedef struct sSirAssocRsp { uint8_t tspecPresent; uint8_t tsmPresent; #endif -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; tDot11fIEVHTOperation VHTOperation; -#endif tDot11fIEExtCap ExtCap; tSirQosMapSet QosMapSet; #ifdef WLAN_FEATURE_11W @@ -904,7 +895,6 @@ void populate_dot11f_assoc_rsp_rates(tpAniSirGlobal pMac, int find_ie_location(tpAniSirGlobal pMac, tpSirRSNie pRsnIe, uint8_t EID); -#ifdef WLAN_FEATURE_11AC tSirRetStatus populate_dot11f_vht_caps(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIEVHTCaps *pDot11f); @@ -931,7 +921,6 @@ void populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac, tDot11fIEWiderBWChanSwitchAnn *pDot11f, tpPESession psessionEntry); -#endif void populate_dot11f_timeout_interval(tpAniSirGlobal pMac, tDot11fIETimeoutInterval *pDot11f, diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 30a0ad1cb1e0..62b8517406e8 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -59,7 +59,6 @@ typedef enum { PHY_SINGLE_CHANNEL_CENTERED = 0, /* 20MHz IF bandwidth centered on IF carrier */ PHY_DOUBLE_CHANNEL_LOW_PRIMARY = 1, /* 40MHz IF bandwidth with lower 20MHz supporting the primary channel */ PHY_DOUBLE_CHANNEL_HIGH_PRIMARY = 3, /* 40MHz IF bandwidth with higher 20MHz supporting the primary channel */ -#ifdef WLAN_FEATURE_11AC PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED = 4, /* 20/40MHZ offset LOW 40/80MHZ offset CENTERED */ PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED = 5, /* 20/40MHZ offset CENTERED 40/80MHZ offset CENTERED */ PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED = 6, /* 20/40MHZ offset HIGH 40/80MHZ offset CENTERED */ @@ -67,7 +66,6 @@ typedef enum { PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW = 8, /* 20/40MHZ offset HIGH 40/80MHZ offset LOW */ PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH = 9, /* 20/40MHZ offset LOW 40/80MHZ offset HIGH */ PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH = 10, /* 20/40MHZ offset-HIGH 40/80MHZ offset HIGH */ -#endif PHY_CHANNEL_BONDING_STATE_MAX = 11 } ePhyChanBondState; @@ -393,9 +391,7 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_SET_TM_LEVEL_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 134) -#ifdef WLAN_FEATURE_11AC #define SIR_HAL_UPDATE_OP_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 135) -#endif #ifdef FEATURE_WLAN_TDLS /* / PE <-> HAL TDLS messages */ @@ -453,10 +449,8 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ \ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 170) -#ifdef WLAN_FEATURE_11AC #define SIR_HAL_UPDATE_MEMBERSHIP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 172) #define SIR_HAL_UPDATE_USERPOS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 173) -#endif #ifdef FEATURE_WLAN_TDLS #define SIR_HAL_UPDATE_FW_TDLS_STATE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 174) @@ -485,9 +479,7 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_DISASSOC_TX_COMP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 191) #define SIR_HAL_DEAUTH_TX_COMP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 192) -#ifdef WLAN_FEATURE_11AC #define SIR_HAL_UPDATE_RX_NSS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 193) -#endif #ifdef WLAN_FEATURE_STATS_EXT #define SIR_HAL_STATS_EXT_REQUEST (SIR_HAL_ITC_MSG_TYPES_BEGIN + 194) diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index ce289a4be5ea..16e50515bae2 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -351,9 +351,7 @@ typedef struct sLimMlmStaContext { uint8_t schClean:1; /* 802.11n HT Capability in Station: Enabled 1 or DIsabled 0 */ uint8_t htCapability:1; -#ifdef WLAN_FEATURE_11AC uint8_t vhtCapability:1; -#endif } tLimMlmStaContext, *tpLimMlmStaContext; /* Structure definition to hold deferred messages queue parameters */ @@ -480,11 +478,9 @@ struct tLimIbssPeerNode { uint8_t *beacon; /* Hold beacon to be sent to HDD/CSR */ uint16_t beaconLen; -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps VHTCaps; uint8_t vhtSupportedChannelWidthSet; uint8_t vhtBeamFormerCapable; -#endif /* * Peer Atim Info */ @@ -512,7 +508,6 @@ typedef struct sLimChannelSwitchInfo { uint8_t switchMode; } tLimChannelSwitchInfo, *tpLimChannelSwitchInfo; -#ifdef WLAN_FEATURE_11AC typedef struct sLimOperatingModeInfo { uint8_t present; uint8_t chanWidth:2; @@ -520,7 +515,6 @@ typedef struct sLimOperatingModeInfo { uint8_t rxNSS:3; uint8_t rxNSSType:1; } tLimOperatingModeInfo, *tpLimOperatingModeInfo; -#endif typedef struct sLimWiderBWChannelSwitch { uint8_t newChanWidth; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index f7616dea751a..07dbb857eace 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1482,7 +1482,6 @@ bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry) return false; } /*** end lim_is_reassoc_in_progress() ***/ -#ifdef WLAN_FEATURE_11AC /** * lim_populate_vht_mcs_set - function to populate vht mcs rate set * @mac_ctx: pointer to global mac structure @@ -1616,7 +1615,6 @@ error: return eSIR_FAILURE; } -#endif /** * lim_populate_own_rate_set() - comprises the basic and extended rates read @@ -1640,19 +1638,11 @@ error: * * Return: eSIR_SUCCESS or eSIR_FAILURE. */ -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, tpSirSupportedRates rates, uint8_t *supported_mcs_set, uint8_t basic_only, tpPESession session_entry, tDot11fIEVHTCaps *vht_caps) -#else -tSirRetStatus -lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, - tpSirSupportedRates rates, - uint8_t *supported_mcs_set, - uint8_t basic_only, tpPESession session_entry) -#endif { tSirMacRateSet temp_rate_set; tSirMacRateSet temp_rate_set2; @@ -1662,7 +1652,6 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, uint8_t a_rate_index = 0; uint8_t b_rate_index = 0; - is_arate = 0; wlan_cfg_get_int(mac_ctx, WNI_CFG_DOT11_MODE, &self_sta_dot11mode); @@ -1700,7 +1689,7 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, /* we are in big trouble */ lim_log(mac_ctx, LOGP, FL("more than 12 rates in CFG")); /* panic */ - goto error; + return eSIR_FAILURE; } /* copy all rates in temp_rate_set, there are 12 rates max */ for (i = 0; i < temp_rate_set2.numRates; i++) @@ -1767,7 +1756,7 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, /* Could not get rateset from CFG. Log error. */ lim_log(mac_ctx, LOGE, FL("could not retrieve supportedMCSSet")); - goto error; + return eSIR_FAILURE; } /* @@ -1787,29 +1776,17 @@ lim_populate_own_rate_set(tpAniSirGlobal mac_ctx, PELOG2(lim_log(mac_ctx, LOG2, FL("%x "), rates->supportedMCSSet[i]);) } -#ifdef WLAN_FEATURE_11AC lim_populate_vht_mcs_set(mac_ctx, rates, vht_caps, session_entry); -#endif return eSIR_SUCCESS; -error: - return eSIR_FAILURE; } -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, tpSirSupportedRates pRates, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, tDot11fIEVHTCaps *pVHTCaps) -#else -tSirRetStatus -lim_populate_peer_rate_set(tpAniSirGlobal pMac, - tpSirSupportedRates pRates, - uint8_t *pSupportedMCSSet, - uint8_t basicOnly, tpPESession psessionEntry) -#endif { tSirMacRateSet tempRateSet; tSirMacRateSet tempRateSet2; @@ -1825,7 +1802,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, } else { lim_log(pMac, LOGE, FL("more than SIR_MAC_RATESET_EID_MAX rates\n")); - goto error; + return eSIR_FAILURE; } if ((psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11G) || (psessionEntry->dot11mode == WNI_CFG_DOT11_MODE_11A) || @@ -1843,7 +1820,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, lim_log(pMac, LOGE, FL ("psessionEntry->extRateSet.numRates more than SIR_MAC_RATESET_EID_MAX rates\n")); - goto error; + return eSIR_FAILURE; } } else tempRateSet2.numRates = 0; @@ -1851,7 +1828,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, SIR_MAC_RATESET_EID_MAX) { /* we are in big trouble */ lim_log(pMac, LOGP, FL("more than 12 rates in CFG")); - goto error; + return eSIR_FAILURE; } /* copy all rates in tempRateSet, there are 12 rates max */ @@ -1919,7 +1896,7 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, (pMac, LOGE, FL("could not retrieve supportedMCSSet")); ) - goto error; + return eSIR_FAILURE; } /* if supported MCS Set of the peer is passed in, then do the intersection */ /* else use the MCS set from local CFG. */ @@ -1935,12 +1912,8 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, pRates->supportedMCSSet[i]); ) } -#ifdef WLAN_FEATURE_11AC lim_populate_vht_mcs_set(pMac, pRates, pVHTCaps, psessionEntry); -#endif return eSIR_SUCCESS; -error: - return eSIR_FAILURE; } /*** lim_populate_peer_rate_set() ***/ /** @@ -1973,18 +1946,13 @@ error: * * Return: eSIR_SUCCESS on success else eSIR_FAILURE */ -#ifdef WLAN_FEATURE_11AC -tSirRetStatus -lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, - tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set, - uint8_t *supported_mcs_set, tpPESession session_entry, - tDot11fIEVHTCaps *vht_caps) -#else -tSirRetStatus -lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, - tSirMacRateSet *oper_rate_set, tSirMacRateSet *ext_rate_set, - uint8_t *supported_mcs_set, tpPESession session_entry) -#endif +tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, + tpDphHashNode sta_ds, + tSirMacRateSet *oper_rate_set, + tSirMacRateSet *ext_rate_set, + uint8_t *supported_mcs_set, + tpPESession session_entry, + tDot11fIEVHTCaps *vht_caps) { tSirMacRateSet temp_rate_set; tSirMacRateSet temp_rate_set2; @@ -2016,7 +1984,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, if ((temp_rate_set.numRates + temp_rate_set2.numRates) > 12) { lim_log(mac_ctx, LOGE, FL("more than 12 rates in CFG")); - goto error; + return eSIR_FAILURE; } /* @@ -2147,7 +2115,7 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, /* Could not get rateset from CFG. Log error. */ lim_log(mac_ctx, LOGP, FL("could not retrieve supportedMCSet")); - goto error; + return eSIR_FAILURE; } for (i = 0; i < val; i++) @@ -2162,10 +2130,8 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, sta_ds->supportedRates.supportedMCSSet[i]); } } -#ifdef WLAN_FEATURE_11AC lim_populate_vht_mcs_set(mac_ctx, &sta_ds->supportedRates, vht_caps, session_entry); -#endif /* * Set the erpEnabled bit if the phy is in G mode and at least * one A rate is supported @@ -2174,10 +2140,6 @@ lim_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, sta_ds->erpEnabled = eHAL_SET; return eSIR_SUCCESS; - -error: - - return eSIR_FAILURE; } /** @@ -2354,32 +2316,24 @@ lim_add_sta(tpAniSirGlobal mac_ctx, LIM_IS_BT_AMP_AP_ROLE(session_entry) || LIM_IS_IBSS_ROLE(session_entry)) { add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability; -#ifdef WLAN_FEATURE_11AC add_sta_params->vhtCapable = sta_ds->mlmStaContext.vhtCapability; -#endif } #ifdef FEATURE_WLAN_TDLS /* SystemRole shouldn't be matter if staType is TDLS peer */ else if (STA_ENTRY_TDLS_PEER == sta_ds->staType) { add_sta_params->htCapable = sta_ds->mlmStaContext.htCapability; -#ifdef WLAN_FEATURE_11AC add_sta_params->vhtCapable = sta_ds->mlmStaContext.vhtCapability; -#endif } #endif else { add_sta_params->htCapable = session_entry->htCapability; -#ifdef WLAN_FEATURE_11AC add_sta_params->vhtCapable = session_entry->vhtCapability; -#endif } -#ifdef WLAN_FEATURE_11AC lim_log(mac_ctx, LOG2, FL("vhtCapable: %d "), add_sta_params->vhtCapable); -#endif lim_log(mac_ctx, LOG2, FL(" StaIdx: %d updateSta = %d htcapable = %d "), add_sta_params->staIdx, add_sta_params->updateSta, add_sta_params->htCapable); @@ -2928,13 +2882,8 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->shortPreambleSupported = val; } -#ifdef WLAN_FEATURE_11AC lim_populate_own_rate_set(pMac, &pAddStaParams->supportedRates, NULL, false, psessionEntry, NULL); -#else - lim_populate_own_rate_set(pMac, &pAddStaParams->supportedRates, NULL, false, - psessionEntry); -#endif if (IS_DOT11_MODE_HT(selfStaDot11Mode)) { pAddStaParams->htCapable = true; #ifdef DISABLE_GF_FOR_INTEROP @@ -3042,7 +2991,6 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->mimoPS, pAddStaParams->rifsMode); } } -#ifdef WLAN_FEATURE_11AC pAddStaParams->vhtCapable = IS_DOT11_MODE_VHT(selfStaDot11Mode); if (pAddStaParams->vhtCapable) { pAddStaParams->ch_width = @@ -3070,7 +3018,6 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, } pAddStaParams->vhtTxMUBformeeCapable = psessionEntry->txMuBformee; pAddStaParams->enableVhtpAid = psessionEntry->enableVhtpAid; -#endif pAddStaParams->enableAmpduPs = psessionEntry->enableAmpduPs; pAddStaParams->enableHtSmps = psessionEntry->enableHtSmps; pAddStaParams->htSmpsconfig = psessionEntry->htSmpsvalue; @@ -4464,7 +4411,6 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->currentOperChannel = bssDescription->channelId; lim_log(pMac, LOG2, FL("currentOperChannel %d"), pAddBssParams->currentOperChannel); -#ifdef WLAN_FEATURE_11AC if (psessionEntry->vhtCapability && (IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) || IS_BSS_VHT_CAPABLE(pBeaconStruct->vendor2_ie.VHTCaps))) { @@ -4505,7 +4451,6 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->vhtCapable, pAddBssParams->ch_width, pAddBssParams->ch_center_freq_seg0, pAddBssParams->ch_center_freq_seg1); -#endif /* * Populate the STA-related parameters here @@ -4710,20 +4655,12 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pAddBssParams->staContext.wmmEnabled = 0; /* Update the rates */ -#ifdef WLAN_FEATURE_11AC lim_populate_peer_rate_set(pMac, &pAddBssParams->staContext. supportedRates, pBeaconStruct->HTCaps.supportedMCSSet, false, psessionEntry, &pBeaconStruct->VHTCaps); -#else - lim_populate_peer_rate_set(pMac, - &pAddBssParams->staContext. - supportedRates, - pBeaconStruct->HTCaps.supportedMCSSet, - false, psessionEntry); -#endif lim_fill_supported_rates_info(pMac, NULL, &pAddBssParams->staContext. supportedRates, psessionEntry); @@ -4876,14 +4813,11 @@ tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode) return eSTA_11bg; case WNI_CFG_DOT11_MODE_11N: return eSTA_11n; -#ifdef WLAN_FEATURE_11AC case WNI_CFG_DOT11_MODE_11AC: return eSTA_11ac; -#endif case WNI_CFG_DOT11_MODE_ALL: default: return eSTA_11n; - } } diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 7686940149c0..46f7e307537a 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -62,22 +62,13 @@ void lim_reject_association(tpAniSirGlobal, tSirMacAddr, uint8_t, uint8_t, tAniAuthType, uint16_t, uint8_t, tSirResultCodes, tpPESession); -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, tpSirSupportedRates pRates, uint8_t *pSupportedMCSSet, uint8_t basicOnly, tpPESession psessionEntry, tDot11fIEVHTCaps * pVHTCaps); -#else -tSirRetStatus lim_populate_peer_rate_set(tpAniSirGlobal pMac, - tpSirSupportedRates pRates, - uint8_t *pSupportedMCSSet, - uint8_t basicOnly, - tpPESession psessionEntry); -#endif -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, tpSirSupportedRates pRates, uint8_t *pSupportedMCSSet, @@ -85,15 +76,6 @@ tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, tpPESession psessionEntry, tDot11fIEVHTCaps * pVHTCaps); -#else -tSirRetStatus lim_populate_own_rate_set(tpAniSirGlobal pMac, - tpSirSupportedRates pRates, - uint8_t *pSupportedMCSSet, - uint8_t basicOnly, - tpPESession psessionEntry); -#endif - -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal pMac, tpDphHashNode pStaDs, @@ -102,20 +84,8 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, tpPESession psessionEntry, tDot11fIEVHTCaps * pVHTCaps); -#else -tSirRetStatus lim_populate_matching_rate_set(tpAniSirGlobal, - tpDphHashNode, - tSirMacRateSet *, - tSirMacRateSet *, - uint8_t *pSupportedMCSSet, - tpPESession); - -#endif - -#ifdef WLAN_FEATURE_11AC #define MCSMAPMASK1x1 0x3 #define MCSMAPMASK2x2 0xC -#endif tSirRetStatus lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, tpPESession); tSirRetStatus lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, tpPESession); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 99c3ed0f33be..c12dbd7a5dff 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -517,7 +517,6 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, pBeaconStruct->HTInfo.secondaryChannelOffset; sta_ctx = &pAddBssParams->staContext; -#ifdef WLAN_FEATURE_11AC if (pftSessionEntry->vhtCapability && pftSessionEntry->vhtCapabilityPresentInBeacon) { pAddBssParams->vhtCapable = pBeaconStruct->VHTCaps.present; @@ -573,7 +572,6 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, } else { pAddBssParams->vhtCapable = 0; } -#endif lim_log(pMac, LOG1, FL("SIR_HAL_ADD_BSS_REQ with channel = %d..."), pAddBssParams->currentOperChannel); @@ -683,20 +681,12 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, && (pftSessionEntry->isOSENConnection)) pAddBssParams->staContext.wpa_rsn = 1; /* Update the rates */ -#ifdef WLAN_FEATURE_11AC lim_populate_peer_rate_set(pMac, &pAddBssParams->staContext. supportedRates, pBeaconStruct->HTCaps.supportedMCSSet, false, pftSessionEntry, &pBeaconStruct->VHTCaps); -#else - lim_populate_peer_rate_set(pMac, - &pAddBssParams->staContext. - supportedRates, - beaconStruct.HTCaps.supportedMCSSet, - false, pftSessionEntry); -#endif if (pftSessionEntry->htCapability) { pAddBssParams->staContext.supportedRates.opRateMode = eSTA_11n; @@ -834,8 +824,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, pftSessionEntry->htRecommendedTxWidthSet = pftSessionEntry->htSupportedChannelWidthSet; - -#ifdef WLAN_FEATURE_11AC if (IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps) && pBeaconStruct->VHTOperation.present && pftSessionEntry->vhtCapability) { @@ -843,7 +831,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, } else { pftSessionEntry->vhtCapabilityPresentInBeacon = 0; } -#endif if (pftSessionEntry->htRecommendedTxWidthSet) { pftSessionEntry->ch_width = CH_WIDTH_40MHZ; if (pftSessionEntry->vhtCapabilityPresentInBeacon && diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index cfd4752271cd..f3814b151584 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -194,7 +194,6 @@ ibss_peer_collect(tpAniSirGlobal pMac, } /* Collect peer VHT capabilities based on the received beacon from the peer */ -#ifdef WLAN_FEATURE_11AC if (pBeacon->VHTCaps.present) { pPeer->vhtSupportedChannelWidthSet = pBeacon->VHTOperation.chanWidth; @@ -205,7 +204,6 @@ ibss_peer_collect(tpAniSirGlobal pMac, (uint8_t *) &pBeacon->VHTCaps, sizeof(tDot11fIEVHTCaps)); } -#endif pPeer->erpIePresent = pBeacon->erpPresent; qdf_mem_copy((uint8_t *) &pPeer->supportedRates, @@ -261,7 +259,6 @@ ibss_sta_caps_update(tpAniSirGlobal pMac, pStaDs->htLdpcCapable = pPeerNode->htLdpcCapable; } } -#ifdef WLAN_FEATURE_11AC if (IS_DOT11_MODE_VHT(psessionEntry->dot11mode)) { pStaDs->mlmStaContext.vhtCapability = pPeerNode->vhtCapable; if (pPeerNode->vhtCapable) { @@ -276,7 +273,6 @@ ibss_sta_caps_update(tpAniSirGlobal pMac, (uint8_t) pPeerNode->VHTCaps.ldpcCodingCap; } } -#endif /* peer is 11e capable but is not 11e enabled yet */ /* some STA's when joining Airgo IBSS, assert qos capability even when */ /* they don't suport qos. however, they do not include the edca parameter */ @@ -330,18 +326,10 @@ ibss_sta_rates_update(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tLimIbssPeerNode *pPeer, tpPESession psessionEntry) { -#ifdef WLAN_FEATURE_11AC lim_populate_matching_rate_set(pMac, pStaDs, &pPeer->supportedRates, &pPeer->extendedRates, pPeer->supportedMCSSet, psessionEntry, &pPeer->VHTCaps); -#else - /* Populate supported rateset */ - lim_populate_matching_rate_set(pMac, pStaDs, &pPeer->supportedRates, - &pPeer->extendedRates, - pPeer->supportedMCSSet, psessionEntry); -#endif - pStaDs->mlmStaContext.capabilityInfo = pPeer->capabilityInfo; } /*** end ibss_sta_info_update() ***/ diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 99bc342e0a38..81e076278913 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -440,7 +440,6 @@ lim_process_ext_channel_switch_action_frame(tpAniSirGlobal mac_ctx, return; } /*** end lim_process_ext_channel_switch_action_frame() ***/ -#ifdef WLAN_FEATURE_11AC /** * __lim_process_operating_mode_action_frame() - To process op mode frames * @mac_ctx: pointer to mac context @@ -680,8 +679,6 @@ out: return; } -#endif - static void __lim_process_add_ts_req(tpAniSirGlobal pMac, uint8_t *pRxPacketInfo, tpPESession psessionEntry) @@ -2094,7 +2091,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, } break; #endif -#ifdef WLAN_FEATURE_11AC case SIR_MAC_ACTION_VHT: if (!session->vhtCapability) break; @@ -2113,7 +2109,6 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx, break; } break; -#endif case SIR_MAC_ACTION_FST: { tpSirMacMgmtHdr hdr; uint32_t frame_len; diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index bd29fd130628..d01130f90b0f 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -1239,9 +1239,7 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, } sta_ds->mlmStaContext.htCapability = assoc_req->HTCaps.present; -#ifdef WLAN_FEATURE_11AC sta_ds->mlmStaContext.vhtCapability = assoc_req->VHTCaps.present; -#endif sta_ds->qos.addtsPresent = (assoc_req->addtsPresent == 0) ? false : true; sta_ds->qos.addts = assoc_req->addtsReq; @@ -1340,7 +1338,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, sta_ds->htSecondaryChannelOffset = (sta_ds->htSupportedChannelWidthSet) ? session->htSecondaryChannelOffset : 0; -#ifdef WLAN_FEATURE_11AC if (assoc_req->operMode.present) { sta_ds->vhtSupportedChannelWidthSet = (uint8_t) ((assoc_req->operMode.chanWidth == @@ -1371,7 +1368,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, session->htSupportedChannelWidthSet) ? sta_ds->htSupportedChannelWidthSet : session->htSupportedChannelWidthSet; -#endif sta_ds->baPolicyFlag = 0xFF; sta_ds->htLdpcCapable = (uint8_t) assoc_req->HTCaps.advCodingCap; @@ -1398,20 +1394,11 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, else sta_ds->vht_su_bfee_capable = 0; } - -#ifdef WLAN_FEATURE_11AC if (lim_populate_matching_rate_set(mac_ctx, sta_ds, &(assoc_req->supportedRates), &(assoc_req->extendedRates), assoc_req->HTCaps.supportedMCSSet, session, &assoc_req->VHTCaps) != eSIR_SUCCESS) -#else - if (lim_populate_matching_rate_set(mac_ctx, sta_ds, - &(assoc_req->supportedRates), - &(assoc_req->extendedRates), - assoc_req->HTCaps.supportedMCSSet, - session) != eSIR_SUCCESS) -#endif { /* Could not update hash table entry at DPH with rateset */ lim_log(mac_ctx, LOGE, @@ -1431,7 +1418,6 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, assoc_req = session->parsedAssocReq[sta_ds->assocId]; return false; } -#ifdef WLAN_FEATURE_11AC if (assoc_req->operMode.present) { sta_ds->vhtSupportedRxNss = assoc_req->operMode.rxNSS + 1; } else { @@ -1439,10 +1425,8 @@ static bool lim_update_sta_ds(tpAniSirGlobal mac_ctx, tpSirMacMgmtHdr hdr, ((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2) ? 1 : 2; } -#endif /* Add STA context at MAC HW (BMU, RHP & TFP) */ - sta_ds->qosMode = false; sta_ds->lleEnabled = false; if (assoc_req->capabilityInfo.qos && (qos_mode == eHAL_SET)) { diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 8faefd1cf15f..725e996e49de 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -190,7 +190,6 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx, lim_update_stads_htcap(mac_ctx, sta_ds, assoc_rsp, session_entry); -#ifdef WLAN_FEATURE_11AC if (assoc_rsp->VHTCaps.present) vht_caps = &assoc_rsp->VHTCaps; else if (assoc_rsp->vendor2_ie.VHTCaps.present) @@ -225,20 +224,9 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx, FL("could not get rateset and extended rate set")); return; } -#else - if (lim_populate_peer_rate_set(mac_ctx, &sta_ds->supportedRates, - assoc_rsp->HTCaps.supportedMCSSet, - false, session_entry) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("could not get rateset and extended rate set")); - return; - } -#endif -#ifdef WLAN_FEATURE_11AC sta_ds->vhtSupportedRxNss = ((sta_ds->supportedRates.vhtRxMCSMap & MCSMAPMASK2x2) == MCSMAPMASK2x2) ? 1 : 2; -#endif /* If one of the rates is 11g rates, set the ERP mode. */ if ((phy_mode == WNI_CFG_PHY_MODE_11G) && sirIsArate(sta_ds->supportedRates.llaRates[0] & 0x7f)) diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 003034de9b85..d5df1d4f2cfc 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -550,13 +550,8 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, sta_param->enableHtSmps = session_entry->enableHtSmps; sta_param->htSmpsconfig = session_entry->htSmpsvalue; -#ifdef WLAN_FEATURE_11AC lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL, false, session_entry, NULL); -#else - lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL, - false, session_entry); -#endif lim_fill_supported_rates_info(mac_ctx, NULL, &sta_param->supportedRates, session_entry); diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index e70c24f7e814..99d3be57e22f 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2804,21 +2804,13 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, pAddStaParams->shortPreambleSupported = (uint8_t) psessionEntry->beaconParams.fShortPreamble; -#ifdef WLAN_FEATURE_11AC lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL, false, psessionEntry, NULL); -#else - lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL, - false, psessionEntry); -#endif if (psessionEntry->htCapability) { pAddStaParams->htCapable = psessionEntry->htCapability; -#ifdef WLAN_FEATURE_11AC pAddStaParams->vhtCapable = psessionEntry->vhtCapability; pAddStaParams->ch_width = psessionEntry->ch_width; -#endif - pAddStaParams->greenFieldCapable = lim_get_ht_capability(pMac, eHT_GREENFIELD, psessionEntry); diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index d9291d2d3e3a..24c4f3f4e4a1 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1151,10 +1151,8 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, tSirMsgQ msg; uint16_t i, len; uint16_t ht_cap_len = 0, addn_ie_len = 0; -#ifdef WLAN_FEATURE_11AC uint8_t *vht_cap_ie; uint16_t vht_cap_len = 0; -#endif /* WLAN_FEATURE_11AC */ tSirRetStatus status, rc = eSIR_SUCCESS; tDot11fIEExtCap extracted_extcap = {0}; bool extcap_present = true; @@ -1198,7 +1196,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, addn_ie_len += ht_cap_len; } -#ifdef WLAN_FEATURE_11AC if (IS_DOT11_MODE_VHT(pScanReq->dot11mode)) { lim_log(pMac, LOG1, FL("Adding VHT Caps IE since dot11mode=%d"), @@ -1209,7 +1206,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, len += vht_cap_len; addn_ie_len += vht_cap_len; } -#endif /* WLAN_FEATURE_11AC */ pScanOffloadReq = qdf_mem_malloc(len); if (NULL == pScanOffloadReq) { @@ -1291,7 +1287,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, pScanOffloadReq->uIEFieldLen += ht_cap_len; } -#ifdef WLAN_FEATURE_11AC /* Copy VHT Capability info if dot11mode is VHT Capable */ if (IS_DOT11_MODE_VHT(pScanReq->dot11mode)) { /* Populate EID and Length field here */ @@ -1304,7 +1299,6 @@ static QDF_STATUS lim_send_hal_start_scan_offload_req(tpAniSirGlobal pMac, lim_set_vht_caps(pMac, NULL, vht_cap_ie, vht_cap_len); pScanOffloadReq->uIEFieldLen += vht_cap_len; } -#endif /* WLAN_FEATURE_11AC */ rc = wma_post_ctrl_msg(pMac, &msg); if (rc != eSIR_SUCCESS) { @@ -1691,7 +1685,6 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->nss = 2; else session->nss = 1; -#ifdef WLAN_FEATURE_11AC session->vhtCapability = IS_DOT11_MODE_VHT(session->dot11mode); QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, @@ -1740,8 +1733,6 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) sme_join_req->txBFCsnValue); session->txbf_csn_value = sme_join_req->txBFCsnValue; } -#endif - /*Phy mode */ session->gLimPhyMode = bss_desc.nwType; handle_ht_capabilityand_ht_info(mac_ctx, session); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 26abe4dc5d71..44973cd2fd54 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -564,7 +564,6 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac, } lim_log(pMac, LOG1, FL("HT present = %hu, Chan Width = %hu"), htCap->present, htCap->supportedChannelWidthSet); -#ifdef WLAN_FEATURE_11AC if (((psessionEntry->currentOperChannel <= SIR_11B_CHANNEL_END) && pMac->roam.configParam.enableVhtFor24GHz) || (psessionEntry->currentOperChannel >= SIR_11B_CHANNEL_END)) { @@ -585,7 +584,6 @@ static void populate_dot11f_tdls_ht_vht_cap(tpAniSirGlobal pMac, } lim_log(pMac, LOG1, FL("VHT present = %hu, Chan Width = %hu"), vhtCap->present, vhtCap->supportedChannelWidthSet); -#endif } /* @@ -2101,7 +2099,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads, if ((temp_rate_set.numRates + temp_rate_set2.numRates) > 12) { lim_log(mac_ctx, LOGE, FL("more than 12 rates in CFG")); - goto error; + return eSIR_FAILURE; } /** @@ -2198,7 +2196,7 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads, /* Could not get rateset from CFG. Log error. */ lim_log(mac_ctx, LOGP, FL("could not retrieve supportedMCSSet")); - goto error; + return eSIR_FAILURE; } for (i = 0; i < val; i++) @@ -2212,10 +2210,8 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads, stads->supportedRates.supportedMCSSet[i]); } } -#ifdef WLAN_FEATURE_11AC lim_populate_vht_mcs_set(mac_ctx, &stads->supportedRates, vht_caps, session_entry); -#endif /** * Set the erpEnabled bit if the phy is in G mode and at least * one A rate is supported @@ -2224,9 +2220,6 @@ lim_tdls_populate_matching_rate_set(tpAniSirGlobal mac_ctx, tpDphHashNode stads, stads->erpEnabled = eHAL_SET; return eSIR_SUCCESS; - -error: - return eSIR_FAILURE; } /* @@ -2241,10 +2234,8 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac, tDot11fIEHTCaps *htCaps; tDot11fIEVHTCaps *pVhtCaps = NULL; tDot11fIEVHTCaps *pVhtCaps_txbf = NULL; -#ifdef WLAN_FEATURE_11AC tDot11fIEVHTCaps vhtCap; uint8_t cbMode; -#endif tpDphHashNode pSessStaDs = NULL; uint16_t aid; @@ -2284,7 +2275,6 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac, pStaDs->mlmStaContext.htCapability = 0; pMac->lim.gLimTdlsLinkMode = TDLS_LINK_MODE_BG; } -#ifdef WLAN_FEATURE_11AC lim_tdls_populate_dot11f_vht_caps(pMac, pTdlsAddStaReq, &vhtCap); pVhtCaps = &vhtCap; if (pVhtCaps->present) { @@ -2328,7 +2318,6 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac, pStaDs->vhtSupportedChannelWidthSet = WNI_CFG_VHT_CHANNEL_WIDTH_20_40MHZ; } -#endif /*Calculate the Secondary Coannel Offset */ cbMode = lim_select_cb_mode(pStaDs, psessionEntry, psessionEntry->currentOperChannel, @@ -2336,15 +2325,11 @@ static void lim_tdls_update_hash_node_info(tpAniSirGlobal pMac, pStaDs->htSecondaryChannelOffset = cbMode; -#ifdef WLAN_FEATURE_11AC if (pStaDs->mlmStaContext.vhtCapability) { pStaDs->htSecondaryChannelOffset = lim_get_htcb_state(cbMode); } -#endif - pSessStaDs = dph_lookup_hash_entry(pMac, psessionEntry->bssId, &aid, &psessionEntry->dph.dphHashTable); - /* Lets enable QOS parameter */ pStaDs->qosMode = 1; pStaDs->wmeEnabled = 1; diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 93911d2c10b4..1126512f9121 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -111,7 +111,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, else mac_ctx->lim.htCapabilityPresentInBeacon = 0; -#ifdef WLAN_FEATURE_11AC QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED, "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d", beacon_struct->VHTCaps.present, @@ -195,7 +194,6 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, lim_log(mac_ctx, LOGP, FL("Set VHT_SU_BEAMFORMEE_CAP Fail")); } -#endif /* Extract the UAPSD flag from WMM Parameter element */ if (beacon_struct->wmeEdcaPresent) *uapsd = beacon_struct->edcaParams.qosInfo.uapsd; @@ -240,24 +238,18 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie, ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode) { switch (aniCBMode) { -#ifdef WLAN_FEATURE_11AC case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW: case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED: case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH: -#endif case PHY_DOUBLE_CHANNEL_HIGH_PRIMARY: return PHY_DOUBLE_CHANNEL_HIGH_PRIMARY; -#ifdef WLAN_FEATURE_11AC case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW: case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED: case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH: -#endif case PHY_DOUBLE_CHANNEL_LOW_PRIMARY: return PHY_DOUBLE_CHANNEL_LOW_PRIMARY; -#ifdef WLAN_FEATURE_11AC case PHY_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED: return PHY_SINGLE_CHANNEL_CENTERED; -#endif default: return PHY_SINGLE_CHANNEL_CENTERED; } @@ -284,10 +276,8 @@ tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession psessionEntry) { tStaRateMode staPeerType = eSTA_11b; -#ifdef WLAN_FEATURE_11AC if (pStaDs->mlmStaContext.vhtCapability) staPeerType = eSTA_11ac; -#endif else if (pStaDs->mlmStaContext.htCapability) staPeerType = eSTA_11n; else if (pStaDs->erpEnabled) diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.h b/core/mac/src/pe/lim/lim_prop_exts_utils.h index 6c0fd89b1886..50502536a12b 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.h +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.h @@ -57,8 +57,6 @@ void lim_extract_ap_capability(tpAniSirGlobal, uint8_t *, uint16_t, uint8_t *, uint16_t *, uint8_t *, int8_t *, tpPESession); tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal, tpDphHashNode, tpPESession); -#ifdef WLAN_FEATURE_11AC ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode); -#endif #endif /* __LIM_PROP_EXTS_UTILS_H */ diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 56f8c82e91d7..e36f2a629d63 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -323,7 +323,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, eHT_CHANNEL_WIDTH_40MHZ; } } -#ifdef WLAN_FEATURE_11AC if (pesession != NULL) { pesession->vhtCapability = IS_DOT11_MODE_VHT(dot11mode); /* Include VHT Capability IE */ @@ -339,7 +338,6 @@ lim_send_probe_req_mgmt_frame(tpAniSirGlobal mac_ctx, is_vht_enabled = true; } } -#endif if (pesession != NULL) populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &pr.ExtCap, pesession); @@ -648,7 +646,6 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps); populate_dot11f_ht_info(mac_ctx, &frm->HTInfo, pe_session); } -#ifdef WLAN_FEATURE_11AC if (pe_session->vhtCapability) { lim_log(mac_ctx, LOG1, FL("Populate VHT IE in Probe Response")); populate_dot11f_vht_caps(mac_ctx, pe_session, &frm->VHTCaps); @@ -661,7 +658,6 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, */ is_vht_enabled = true; } -#endif populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &frm->ExtCap, pe_session); @@ -1211,7 +1207,6 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, populate_dot11f_ht_info(mac_ctx, &frm.HTInfo, pe_session); } -#ifdef WLAN_FEATURE_11AC if (sta->mlmStaContext.vhtCapability && pe_session->vhtCapability) { lim_log(mac_ctx, LOG1, @@ -1222,8 +1217,6 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx, &frm.VHTOperation); is_vht = true; } -#endif - populate_dot11f_ext_cap(mac_ctx, is_vht, &frm.ExtCap, pe_session); @@ -1768,7 +1761,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("Populate HT Caps in Assoc Request")); populate_dot11f_ht_caps(mac_ctx, pe_session, &frm->HTCaps); } -#ifdef WLAN_FEATURE_11AC if (pe_session->vhtCapability && pe_session->vhtCapabilityPresentInBeacon) { lim_log(mac_ctx, LOG1, FL("Populate VHT IEs in Assoc Request")); @@ -1790,9 +1782,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, &frm->vendor2_ie.VHTCaps); vht_enabled = true; } - -#endif - populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm->ExtCap, pe_session); if (pe_session->pLimJoinReq->is11Rconnection) { @@ -2200,8 +2189,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, populate_mdie(mac_ctx, &frm.MobilityDomain, pe_session->pLimReAssocReq->bssDescription.mdie); } - -#ifdef WLAN_FEATURE_11AC if (pe_session->vhtCapability && pe_session->vhtCapabilityPresentInBeacon) { lim_log(mac_ctx, LOG1, @@ -2225,8 +2212,6 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, &frm.vendor2_ie.VHTCaps); vht_enabled = true; } -#endif - status = dot11f_get_packed_re_assoc_request_size(mac_ctx, &frm, &payload); if (DOT11F_FAILED(status)) { @@ -2579,17 +2564,13 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, pMac->lim.htCapabilityPresentInBeacon) { populate_dot11f_ht_caps(pMac, psessionEntry, &frm.HTCaps); } -#ifdef WLAN_FEATURE_11AC if (psessionEntry->vhtCapability && psessionEntry->vhtCapabilityPresentInBeacon) { lim_log(pMac, LOGW, FL("Populate VHT IEs in Re-Assoc Request")); populate_dot11f_vht_caps(pMac, psessionEntry, &frm.VHTCaps); isVHTEnabled = true; } -#endif - populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm.ExtCap, psessionEntry); - nStatus = dot11f_get_packed_re_assoc_request_size(pMac, &frm, &nPayload); if (DOT11F_FAILED(nStatus)) { lim_log(pMac, LOGP, FL("Failed to calculate the packed size f" diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index e04af171c9b5..5151cd45149c 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -62,11 +62,9 @@ static tBeaconFilterIe beacon_filter_table[] = { {SIR_MAC_HT_INFO_EID, 0, {0, 0, HT_BYTE0_FILTER_MASK, 0} }, {SIR_MAC_HT_INFO_EID, 0, {2, 0, HT_BYTE2_FILTER_MASK, 0} }, {SIR_MAC_HT_INFO_EID, 0, {5, 0, HT_BYTE5_FILTER_MASK, 0} }, - {SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} } -#ifdef WLAN_FEATURE_11AC - , {SIR_MAC_VHT_OPMODE_EID, 0, {0, 0, 0, 0} } - , {SIR_MAC_VHT_OPERATION_EID, 0, {0, 0, VHTOP_CHWIDTH_MASK, 0} } -#endif + {SIR_MAC_PWR_CONSTRAINT_EID, 0, {0, 0, 0, 0} }, + {SIR_MAC_VHT_OPMODE_EID, 0, {0, 0, 0, 0} }, + {SIR_MAC_VHT_OPERATION_EID, 0, {0, 0, VHTOP_CHWIDTH_MASK, 0} } }; /** @@ -620,7 +618,6 @@ tSirRetStatus lim_send_beacon_filter_info(tpAniSirGlobal pMac, return retCode; } -#ifdef WLAN_FEATURE_11AC tSirRetStatus lim_send_mode_update(tpAniSirGlobal pMac, tUpdateVHTOpMode *pTempParam, tpPESession psessionEntry) @@ -775,8 +772,6 @@ tSirRetStatus lim_set_user_pos(tpAniSirGlobal pMac, return retCode; } -#endif - #ifdef WLAN_FEATURE_11W /** * lim_send_exclude_unencrypt_ind() - sends WMA_EXCLUDE_UNENCRYPTED_IND to HAL diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 73adb6ea9983..411e407c85d1 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -351,14 +351,12 @@ static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, session_entry->htSecondaryChannelOffset; ht_profile->dot11mode = session_entry->dot11mode; ht_profile->htCapability = session_entry->htCapability; -#ifdef WLAN_FEATURE_11AC ht_profile->vhtCapability = session_entry->vhtCapability; ht_profile->vhtTxChannelWidthSet = session_entry->vhtTxChannelWidthSet; ht_profile->apCenterChan = session_entry->ch_center_freq_seg0; ht_profile->apChanWidth = session_entry->ch_width; -#endif } #endif } else { @@ -641,7 +639,6 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, psessionEntry->dot11mode; pSirSmeRsp->HTProfile.htCapability = psessionEntry->htCapability; -#ifdef WLAN_FEATURE_11AC pSirSmeRsp->HTProfile.vhtCapability = psessionEntry->vhtCapability; pSirSmeRsp->HTProfile.vhtTxChannelWidthSet = @@ -650,13 +647,10 @@ lim_send_sme_start_bss_rsp(tpAniSirGlobal pMac, psessionEntry->ch_center_freq_seg0; pSirSmeRsp->HTProfile.apChanWidth = psessionEntry->ch_width; -#endif } #endif } - } - pSirSmeRsp->messageType = msgType; pSirSmeRsp->length = size; diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index bb560d56e555..81769c79a6b5 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -2126,9 +2126,7 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, uint16_t beacon_period; tDot11fIEChanSwitchAnn *chnl_switch; tLimChannelSwitchInfo *ch_switch_params; -#ifdef WLAN_FEATURE_11AC tDot11fIEWiderBWChanSwitchAnn *widerchnl_switch; -#endif beacon_period = psession_entry->beaconParams.beaconInterval; @@ -2141,7 +2139,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, ch_switch_params->switchTimeoutValue = SYS_MS_TO_TICKS(beacon_period) * (chnl_switch->switchCount); ch_switch_params->switchMode = chnl_switch->switchMode; -#ifdef WLAN_FEATURE_11AC widerchnl_switch = &(beacon->WiderBWChanSwitchAnn); if (beacon->WiderBWChanSwitchAnnPresent) { psession_entry->gLimWiderBWChannelSwitch.newChanWidth = @@ -2151,8 +2148,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, psession_entry->gLimWiderBWChannelSwitch.newCenterChanFreq1 = widerchnl_switch->newCenterChanFreq1; } -#endif - /* Only primary channel switch element is present */ ch_switch_params->state = eLIM_CHANNEL_SWITCH_PRIMARY_ONLY; @@ -2179,7 +2174,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, ch_switch_params->ch_center_freq_seg0 = ch_switch_params->primaryChannel - 2; } -#ifdef WLAN_FEATURE_11AC if (psession_entry->vhtCapability && beacon->WiderBWChanSwitchAnnPresent) { ch_switch_params->ch_width = @@ -2190,7 +2184,6 @@ lim_update_channel_switch(struct sAniSirGlobal *mac_ctx, ch_switch_params->ch_center_freq_seg1 = psession_entry->gLimWiderBWChannelSwitch. newCenterChanFreq1; -#endif } } if (eSIR_SUCCESS != lim_start_channel_switch(mac_ctx, psession_entry)) @@ -6428,7 +6421,6 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param) } #endif -#ifdef WLAN_FEATURE_11AC bool lim_check_vht_op_mode_change(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t chanWidth, uint8_t staId, uint8_t *peerMac) @@ -6486,7 +6478,6 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac, return true; } -#endif void lim_get_short_slot_from_phy_mode(tpAniSirGlobal pMac, tpPESession psessionEntry, uint32_t phyMode, uint8_t *pShortSlotEnabled) @@ -6652,7 +6643,6 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, } } -#ifdef WLAN_FEATURE_11AC void lim_set_vht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, uint8_t *p_ie_start, uint32_t num_bytes) { @@ -6715,7 +6705,6 @@ void lim_set_vht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, vht_mcs->txHighest = u_vht_data_rate_info.u_value; } } -#endif /* WLAN_FEATURE_11AC */ /** * lim_validate_received_frame_a1_addr() - To validate received frame's A1 addr diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 7d4ea1d3606b..999ea46f49df 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -442,7 +442,6 @@ bool lim_isconnected_on_dfs_channel(uint8_t currentChannel); uint8_t lim_get_current_operating_channel(tpAniSirGlobal pMac); uint32_t lim_get_max_rate_flags(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds); -#ifdef WLAN_FEATURE_11AC bool lim_check_vht_op_mode_change(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t chanWidth, uint8_t staId, @@ -453,7 +452,6 @@ bool lim_check_membership_user_position(tpAniSirGlobal pMac, tpPESession psessionEntry, uint32_t membership, uint32_t userPosition, uint8_t staId); -#endif #ifdef FEATURE_WLAN_DIAG_SUPPORT @@ -561,12 +559,10 @@ void lim_set_ht_caps(tpAniSirGlobal p_mac, uint8_t *p_ie_start, uint32_t num_bytes); -#ifdef WLAN_FEATURE_11AC void lim_set_vht_caps(tpAniSirGlobal p_mac, tpPESession p_session_entry, uint8_t *p_ie_start, uint32_t num_bytes); -#endif /* WLAN_FEATURE_11AC */ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx, tSirMacAddr a1, tpPESession session); void lim_set_stads_rtt_cap(tpDphHashNode sta_ds, struct s_ext_cap *ext_cap, diff --git a/core/mac/src/pe/sch/sch_beacon_gen.c b/core/mac/src/pe/sch/sch_beacon_gen.c index 7f3a7b394c63..d8339aa08e3c 100644 --- a/core/mac/src/pe/sch/sch_beacon_gen.c +++ b/core/mac/src/pe/sch/sch_beacon_gen.c @@ -340,7 +340,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) populate_dot11f_ext_chan_switch_ann(mac_ctx, &bcn_2->ExtChanSwitchAnn, session); */ -#ifdef WLAN_FEATURE_11AC /* * TODO: If in 11AC mode, wider bw channel switch * announcement needs to be called @@ -349,7 +348,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) populate_dot11f_wider_bw_chan_switch_ann(mac_ctx, &bcn_2->WiderBWChanSwitchAnn, session); */ -#endif /* * Populate the Channel Switch Wrapper Element if * SAP operates in 40/80 Mhz Channel Width. @@ -383,7 +381,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) populate_dot11f_ht_caps(mac_ctx, session, &bcn_2->HTCaps); populate_dot11f_ht_info(mac_ctx, &bcn_2->HTInfo, session); } -#ifdef WLAN_FEATURE_11AC if (session->vhtCapability) { sch_log(mac_ctx, LOGW, FL("Populate VHT IEs in Beacon")); populate_dot11f_vht_caps(mac_ctx, session, &bcn_2->VHTCaps); @@ -398,7 +395,6 @@ sch_set_fixed_beacon_fields(tpAniSirGlobal mac_ctx, tpPESession session) populate_dot11f_operating_mode(mac_ctx, &bcn_2->OperatingMode, session); } -#endif populate_dot11f_ext_cap(mac_ctx, is_vht_enabled, &bcn_2->ExtCap, session); populate_dot11f_ext_supp_rates(mac_ctx, @@ -722,7 +718,6 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, qdf_mem_copy((void *)&prb_rsp->HTInfo, (void *)&beacon2->HTInfo, sizeof(beacon2->HTInfo)); } -#ifdef WLAN_FEATURE_11AC if (beacon2->VHTCaps.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_VHT_CAPABILITIES_EID); @@ -744,8 +739,6 @@ void lim_update_probe_rsp_template_ie_bitmap_beacon2(tpAniSirGlobal pMac, (void *)&beacon2->VHTExtBssLoad, sizeof(beacon2->VHTExtBssLoad)); } -#endif - /* WMM IE */ if (beacon2->WMMParams.present) { set_probe_rsp_ie_bitmap(DefProbeRspIeBitmap, SIR_MAC_WPA_EID); diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c index 7b8c2661a0bf..157ab11ca8da 100644 --- a/core/mac/src/pe/sch/sch_beacon_process.c +++ b/core/mac/src/pe/sch/sch_beacon_process.c @@ -719,9 +719,7 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, uint8_t bssIdx = 0; tUpdateBeaconParams beaconParams; uint8_t sendProbeReq = false; -#ifdef WLAN_FEATURE_11AC tpSirMacMgmtHdr pMh = WMA_GET_RX_MAC_HEADER(rx_pkt_info); -#endif int8_t regMax = 0, maxTxPower = 0; qdf_mem_zero(&beaconParams, sizeof(tUpdateBeaconParams)); beaconParams.paramChangeBitmap = 0; @@ -759,15 +757,12 @@ static void __sch_beacon_process_for_session(tpAniSirGlobal mac_ctx, lim_cancel_dot11h_channel_switch(mac_ctx, session); } } -#ifdef WLAN_FEATURE_11AC if (LIM_IS_STA_ROLE(session) || LIM_IS_BT_AMP_STA_ROLE(session) || LIM_IS_IBSS_ROLE(session)) sch_bcn_process_sta_bt_amp_sta_ibss(mac_ctx, bcn, rx_pkt_info, session, &bssIdx, &beaconParams, &sendProbeReq, pMh); -#endif - /* Obtain the Max Tx power for the current regulatory */ regMax = cfg_get_regulatory_max_transmit_power(mac_ctx, session->currentOperChannel); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index 44d2bf0f88bf..e170a11bbaa4 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -457,11 +457,9 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_GTK_OFFLOAD_GETINFO_RSP); #endif /* WLAN_FEATURE_GTK_OFFLOAD */ CASE_RETURN_STRING(WMA_SET_TM_LEVEL_REQ); -#ifdef WLAN_FEATURE_11AC CASE_RETURN_STRING(WMA_UPDATE_OP_MODE); CASE_RETURN_STRING(WMA_UPDATE_MEMBERSHIP); CASE_RETURN_STRING(WMA_UPDATE_USERPOS); -#endif CASE_RETURN_STRING(WMA_START_SCAN_OFFLOAD_REQ); CASE_RETURN_STRING(WMA_STOP_SCAN_OFFLOAD_REQ); CASE_RETURN_STRING(WMA_UPDATE_CHAN_LIST_REQ); @@ -543,9 +541,7 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) CASE_RETURN_STRING(WMA_ROAM_OFFLOAD_SYNCH_IND); #endif CASE_RETURN_STRING(WMA_HIDDEN_SSID_VDEV_RESTART); -#ifdef WLAN_FEATURE_11AC CASE_RETURN_STRING(WMA_UPDATE_RX_NSS); -#endif #ifdef WLAN_FEATURE_NAN CASE_RETURN_STRING(WMA_NAN_REQUEST); #endif diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 431bba7871f3..7bec234109a7 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -366,7 +366,6 @@ populate_dot11f_avoid_channel_ie(tpAniSirGlobal mac_ctx, } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ -#ifdef WLAN_FEATURE_11AC void populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac, tDot11fIEWiderBWChanSwitchAnn *pDot11f, @@ -380,7 +379,6 @@ populate_dot11f_wider_bw_chan_switch_ann(tpAniSirGlobal pMac, pDot11f->newCenterChanFreq1 = psessionEntry->gLimWiderBWChannelSwitch.newCenterChanFreq1; } -#endif tSirRetStatus populate_dot11f_country(tpAniSirGlobal pMac, @@ -826,8 +824,6 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac, } /* End populate_dot11f_ht_caps. */ -#ifdef WLAN_FEATURE_11AC - void lim_log_vht_cap(tpAniSirGlobal pMac, tDot11fIEVHTCaps *pDot11f) { #ifdef DUMP_MGMT_CNTNTS @@ -1216,10 +1212,8 @@ populate_dot11f_ext_cap(tpAniSirGlobal pMac, } p_ext_cap = (struct s_ext_cap *)pDot11f->bytes; -#ifdef WLAN_FEATURE_11AC if (isVHTEnabled == true) p_ext_cap->oper_mode_notification = 1; -#endif if (wlan_cfg_get_int(pMac, WNI_CFG_RTT3_ENABLE, &val) != eSIR_SUCCESS) { lim_log(pMac, LOGE, @@ -1267,7 +1261,6 @@ populate_dot11f_operating_mode(tpAniSirGlobal pMac, return eSIR_SUCCESS; } -#endif tSirRetStatus populate_dot11f_ht_info(tpAniSirGlobal pMac, tDot11fIEHTInfo *pDot11f, tpPESession psessionEntry) @@ -2200,19 +2193,14 @@ sir_convert_probe_req_frame2_struct(tpAniSirGlobal pMac, memcpy(&pProbeReq->probeReqWscIeInfo, &pr.WscProbeReq, sizeof(tDot11fIEWscProbeReq)); } -#ifdef WLAN_FEATURE_11AC if (pr.VHTCaps.present) { qdf_mem_copy(&pProbeReq->VHTCaps, &pr.VHTCaps, sizeof(tDot11fIEVHTCaps)); } -#endif - if (pr.P2PProbeReq.present) { pProbeReq->p2pIePresent = 1; } - return eSIR_SUCCESS; - } /* End sir_convert_probe_req_frame2_struct. */ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, @@ -2456,7 +2444,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pProbeResp->P2PProbeRes, &pr->P2PProbeRes, sizeof(tDot11fIEP2PProbeRes)); } -#ifdef WLAN_FEATURE_11AC if (pr->VHTCaps.present) { qdf_mem_copy(&pProbeResp->VHTCaps, &pr->VHTCaps, sizeof(tDot11fIEVHTCaps)); @@ -2469,7 +2456,6 @@ tSirRetStatus sir_convert_probe_frame2_struct(tpAniSirGlobal pMac, qdf_mem_copy(&pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, sizeof(tDot11fIEVHTExtBssLoad)); } -#endif pProbeResp->Vendor1IEPresent = pr->Vendor1IE.present; pProbeResp->Vendor3IEPresent = pr->Vendor3IE.present; @@ -2660,7 +2646,6 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, qdf_mem_free(ar); return eSIR_FAILURE; } -#ifdef WLAN_FEATURE_11AC if (ar->VHTCaps.present) { qdf_mem_copy(&pAssocReq->VHTCaps, &ar->VHTCaps, sizeof(tDot11fIEVHTCaps)); @@ -2674,7 +2659,6 @@ sir_convert_assoc_req_frame2_struct(tpAniSirGlobal pMac, FL("Received Assoc Req with Operating Mode IE\n")); lim_log_operating_mode(pMac, &pAssocReq->operMode); } -#endif if (ar->ExtCap.present) { struct s_ext_cap *ext_cap; qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar->ExtCap.bytes, @@ -2853,7 +2837,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, } #endif -#ifdef WLAN_FEATURE_11AC if (ar.VHTCaps.present) { qdf_mem_copy(&pAssocRsp->VHTCaps, &ar.VHTCaps, sizeof(tDot11fIEVHTCaps)); @@ -2867,7 +2850,6 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, FL("Received Assoc Response with VHT Operation")); lim_log_vht_operation(pMac, &pAssocRsp->VHTOperation); } -#endif if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; @@ -3070,7 +3052,6 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, } #endif -#ifdef WLAN_FEATURE_11AC if (ar.VHTCaps.present) { qdf_mem_copy(&pAssocReq->VHTCaps, &ar.VHTCaps, sizeof(tDot11fIEVHTCaps)); @@ -3082,8 +3063,6 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, FL("Received Assoc Req with Operating Mode IE\n")); lim_log_operating_mode(pMac, &pAssocReq->operMode); } -#endif - if (ar.ExtCap.present) { struct s_ext_cap *ext_cap; qdf_mem_copy(&pAssocReq->ExtCap.bytes, &ar.ExtCap.bytes, @@ -3600,7 +3579,6 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, convert_erp_info(pMac, &pBeaconStruct->erpIEInfo, &pBies->ERPInfo); } -#ifdef WLAN_FEATURE_11AC if (pBies->VHTCaps.present) { pBeaconStruct->VHTCaps.present = 1; qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBies->VHTCaps, @@ -3623,8 +3601,6 @@ sir_parse_beacon_ie(tpAniSirGlobal pMac, &pBies->OperatingMode, sizeof(tDot11fIEOperatingMode)); } -#endif - if (pBies->MobilityDomain.present) { pBeaconStruct->mdiePresent = 1; qdf_mem_copy(pBeaconStruct->mdie, &pBies->MobilityDomain.MDID, @@ -3925,8 +3901,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, &pBeacon->QBSSLoad, sizeof(tDot11fIEQBSSLoad)); } #endif - -#ifdef WLAN_FEATURE_11AC if (pBeacon->VHTCaps.present) { qdf_mem_copy(&pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, sizeof(tDot11fIEVHTCaps)); @@ -3952,8 +3926,6 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, &pBeacon->WiderBWChanSwitchAnn, sizeof(tDot11fIEWiderBWChanSwitchAnn)); } -#endif - /* IBSS Peer Params */ if (pBeacon->IBSSParams.present) { pBeaconStruct->IBSSParams.present = 1; diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 112a3b8b24d4..f13d8d0698c1 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1734,7 +1734,6 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel, channels[0] = channel; channels[1] = channel + 4; break; -#ifdef WLAN_FEATURE_11AC case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW: numChannel = 4; channels[0] = channel; @@ -1763,7 +1762,6 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel, channels[2] = channel - 4; channels[3] = channel; break; -#endif default: numChannel = 1; channels[0] = channel; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index cd8691475971..19884c35231b 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -195,7 +195,6 @@ typedef enum { eCSR_INI_SINGLE_CHANNEL_CENTERED = 0, eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY, eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY, -#ifdef WLAN_FEATURE_11AC eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED, eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_CENTERED_40MHZ_CENTERED, eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_CENTERED, @@ -203,7 +202,6 @@ typedef enum { eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW, eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH, eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH, -#endif eCSR_INI_CHANNEL_BONDING_STATE_MAX } eIniChanBondState; @@ -938,12 +936,10 @@ typedef struct tagCsrRoamHTProfile { uint8_t htSupportedChannelWidthSet; uint8_t htRecommendedTxWidthSet; ePhyChanBondState htSecondaryChannelOffset; -#ifdef WLAN_FEATURE_11AC uint8_t vhtCapability; uint8_t vhtTxChannelWidthSet; uint8_t apCenterChan; uint8_t apChanWidth; -#endif } tCsrRoamHTProfile; #endif typedef struct tagCsrRoamConnectedProfile { @@ -1146,7 +1142,6 @@ typedef struct tagCsrConfigParam { * request from HDD */ bool fScanTwice; -#ifdef WLAN_FEATURE_11AC uint32_t nVhtChannelWidth; uint8_t enableTxBF; uint8_t enable_txbf_sap_mode; @@ -1156,7 +1151,6 @@ typedef struct tagCsrConfigParam { uint8_t enableMuBformee; uint8_t enableVhtpAid; uint8_t enableVhtGid; -#endif uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index b9939a6a105e..acc4a890420c 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -105,14 +105,10 @@ typedef enum { eCSR_CFG_DOT11_MODE_11B, eCSR_CFG_DOT11_MODE_11G, eCSR_CFG_DOT11_MODE_11N, -#ifdef WLAN_FEATURE_11AC eCSR_CFG_DOT11_MODE_11AC, -#endif eCSR_CFG_DOT11_MODE_11G_ONLY, eCSR_CFG_DOT11_MODE_11N_ONLY, -#ifdef WLAN_FEATURE_11AC eCSR_CFG_DOT11_MODE_11AC_ONLY, -#endif /* This value can never set to CFG. Its for CSR's internal use */ eCSR_CFG_DOT11_MODE_AUTO, } eCsrCfgDot11Mode; @@ -594,7 +590,6 @@ typedef struct tagCsrConfig { bool doBMPSWorkaround; /* To enable scanning 2g channels twice on single scan req from HDD */ bool fScanTwice; -#ifdef WLAN_FEATURE_11AC uint32_t nVhtChannelWidth; uint8_t txBFEnable; uint8_t enable_txbf_sap_mode; @@ -604,7 +599,6 @@ typedef struct tagCsrConfig { uint8_t txMuBformee; uint8_t enableVhtpAid; uint8_t enableVhtGid; -#endif uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; @@ -1091,18 +1085,11 @@ typedef struct tagCsrRoamStruct { #define CSR_IS_PHY_MODE_A_ONLY(pMac) \ (eCSR_DOT11_MODE_11a == (pMac)->roam.configParam.phyMode) -#ifdef WLAN_FEATURE_11AC #define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \ ((eCSR_DOT11_MODE_abg & (phyMode)) || \ (eCSR_DOT11_MODE_11n & (phyMode)) || \ (eCSR_DOT11_MODE_11ac & (phyMode)) || \ (eCSR_DOT11_MODE_AUTO & (phyMode))) -#else -#define CSR_IS_PHY_MODE_DUAL_BAND(phyMode) \ - ((eCSR_DOT11_MODE_abg & (phyMode)) || \ - (eCSR_DOT11_MODE_11n & (phyMode)) || \ - (eCSR_DOT11_MODE_AUTO & (phyMode))) -#endif #define CSR_IS_PHY_MODE_11n(phy_mode) \ ((eCSR_DOT11_MODE_11n == phy_mode) || \ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b12f9971cd42..47f8827ad10e 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1344,10 +1344,8 @@ static void init_config_param(tpAniSirGlobal pMac) pMac->roam.configParam.neighborRoamConfig.nRoamBmissFirstBcnt = 10; pMac->roam.configParam.neighborRoamConfig.nRoamBmissFinalBcnt = 10; pMac->roam.configParam.neighborRoamConfig.nRoamBeaconRssiWeight = 14; -#ifdef WLAN_FEATURE_11AC pMac->roam.configParam.nVhtChannelWidth = WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ + 1; -#endif pMac->roam.configParam.addTSWhenACMIsOff = 0; pMac->roam.configParam.fScanTwice = false; @@ -1625,7 +1623,6 @@ ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue) case eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY: phyCbState = PHY_DOUBLE_CHANNEL_LOW_PRIMARY; break; -#ifdef WLAN_FEATURE_11AC case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED: phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED; break; @@ -1648,7 +1645,6 @@ ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue) case eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH: phyCbState = PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH; break; -#endif default: /* If an invalid value is passed, disable CHANNEL BONDING */ phyCbState = PHY_SINGLE_CHANNEL_CENTERED; @@ -1674,7 +1670,6 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState) case PHY_DOUBLE_CHANNEL_LOW_PRIMARY: cbIniValue = eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY; break; -#ifdef WLAN_FEATURE_11AC case PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED: cbIniValue = eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_CENTERED; @@ -1699,7 +1694,6 @@ uint32_t csr_convert_phy_cb_state_to_ini_value(ePhyChanBondState phyCbState) case PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH: cbIniValue = eCSR_INI_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH; break; -#endif default: /* return some invalid value */ cbIniValue = eCSR_INI_CHANNEL_BONDING_STATE_MAX; @@ -2001,7 +1995,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, /* BMPS_WORKAROUND_NOT_NEEDED */ pMac->roam.configParam.doBMPSWorkaround = 0; -#ifdef WLAN_FEATURE_11AC pMac->roam.configParam.nVhtChannelWidth = pParam->nVhtChannelWidth; pMac->roam.configParam.txBFEnable = pParam->enableTxBF; @@ -2014,7 +2007,6 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->roam.configParam.txMuBformee = pParam->enableMuBformee; pMac->roam.configParam.enableVhtpAid = pParam->enableVhtpAid; pMac->roam.configParam.enableVhtGid = pParam->enableVhtGid; -#endif pMac->roam.configParam.enableAmpduPs = pParam->enableAmpduPs; pMac->roam.configParam.enableHtSmps = pParam->enableHtSmps; pMac->roam.configParam.htSmps = pParam->htSmps; @@ -2174,7 +2166,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) qdf_mem_copy(&pParam->neighborRoamConfig, &cfg_params->neighborRoamConfig, sizeof(tCsrNeighborRoamConfigParams)); -#ifdef WLAN_FEATURE_11AC pParam->nVhtChannelWidth = cfg_params->nVhtChannelWidth; pParam->enableTxBF = cfg_params->txBFEnable; pParam->enable_txbf_sap_mode = @@ -2184,7 +2175,6 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pParam->enableVhtFor24GHz = cfg_params->enableVhtFor24GHz; pParam->ignore_peer_erp_info = cfg_params->ignore_peer_erp_info; pParam->enable2x2 = cfg_params->enable2x2; -#endif qdf_mem_copy(&cfg_params->csr11rConfig, &pParam->csr11rConfig, sizeof(tCsr11rConfigParams)); pParam->isFastTransitionEnabled = cfg_params->isFastTransitionEnabled; @@ -4166,7 +4156,6 @@ uint32_t csr_roam_get_phy_mode_from_dot11_mode(eCsrCfgDot11Mode dot11Mode, return WNI_CFG_PHY_MODE_11A; } -#ifdef WLAN_FEATURE_11AC ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMode) { switch (aniCBMode) { @@ -4183,7 +4172,6 @@ ePhyChanBondState csr_get_htcb_state_from_vhtcb_state(ePhyChanBondState aniCBMod return PHY_SINGLE_CHANNEL_CENTERED; } } -#endif /* pIes may be NULL */ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId, @@ -5690,12 +5678,10 @@ static void csr_roam_copy_ht_profile(tCsrRoamHTProfile *dst_profile, src_profile->htRecommendedTxWidthSet; dst_profile->htSecondaryChannelOffset = src_profile->htSecondaryChannelOffset; -#ifdef WLAN_FEATURE_11AC dst_profile->vhtCapability = src_profile->vhtCapability; dst_profile->vhtTxChannelWidthSet = src_profile->vhtTxChannelWidthSet; dst_profile->apCenterChan = src_profile->apCenterChan; dst_profile->apChanWidth = src_profile->apChanWidth; -#endif } #endif @@ -11587,7 +11573,6 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, *dot11_mode = eCSR_CFG_DOT11_MODE_11N; *band = CSR_GET_BAND(opr_ch); break; -#ifdef WLAN_FEATURE_11AC case eCSR_CFG_DOT11_MODE_11AC: if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) { /* @@ -11620,9 +11605,7 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, } *band = CSR_GET_BAND(opr_ch); break; -#endif case eCSR_CFG_DOT11_MODE_AUTO: -#ifdef WLAN_FEATURE_11AC if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) { /* * If the operating channel is in 2.4 GHz band, @@ -11638,9 +11621,6 @@ csr_compute_mode_and_band(tpAniSirGlobal mac_ctx, } else { *dot11_mode = eCSR_CFG_DOT11_MODE_11N; } -#else - *dot11_mode = eCSR_CFG_DOT11_MODE_11N; -#endif *band = CSR_GET_BAND(opr_ch); break; default: @@ -11760,10 +11740,7 @@ csr_roam_get_phy_mode_band_for_bss(tpAniSirGlobal mac_ctx, && (profile->EncryptionType.encryptionType[0] == eCSR_ENCRYPT_TYPE_NONE))) && ((eCSR_CFG_DOT11_MODE_11N == cfg_dot11_mode) || -#ifdef WLAN_FEATURE_11AC - (eCSR_CFG_DOT11_MODE_11AC == cfg_dot11_mode) -#endif - )) { + (eCSR_CFG_DOT11_MODE_11AC == cfg_dot11_mode))) { /* We cannot do 11n here */ if (CDS_IS_CHANNEL_24GHZ(opr_chn)) cfg_dot11_mode = eCSR_CFG_DOT11_MODE_11G; @@ -13800,7 +13777,6 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, } qdf_mem_copy(&csr_join_req->htConfig, &pSession->htConfig, sizeof(tSirHTConfig)); -#ifdef WLAN_FEATURE_11AC csr_join_req->txBFIniFeatureEnabled = (uint8_t) pMac->roam.configParam.txBFEnable; @@ -13827,7 +13803,6 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, csr_join_req->enableVhtGid = (uint8_t) pMac->roam.configParam.enableVhtGid; -#endif csr_join_req->enableAmpduPs = (uint8_t) pMac->roam.configParam.enableAmpduPs; diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 557cad320f19..12a6c8094870 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -4407,18 +4407,14 @@ static bool csr_scan_is_bss_allowed(tpAniSirGlobal pMac, fAllowed = (bool) ((eCSR_DOT11_MODE_11n == phyMode)); break; -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac_ONLY: fAllowed = (bool) ((eCSR_DOT11_MODE_11ac == phyMode)); break; -#endif case eCSR_DOT11_MODE_11b_ONLY: fAllowed = (bool) (eCSR_DOT11_MODE_11b == phyMode); break; case eCSR_DOT11_MODE_11n: -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: -#endif default: fAllowed = true; break; diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 9a67586bc7b9..134b995c8efc 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -512,19 +512,14 @@ void csr_get_ch_from_ht_profile(tpAniSirGlobal pMac, tCsrRoamHTProfile *htp, goto ret; sms_log(pMac, LOG1, FL("##HTC: %d scbw: %d rcbw: %d sco: %d" -#ifdef WLAN_FEATURE_11AC "VHTC: %d apc: %d apbw: %d" -#endif ), htp->htCapability, htp->htSupportedChannelWidthSet, htp->htRecommendedTxWidthSet, htp->htSecondaryChannelOffset, -#ifdef WLAN_FEATURE_11AC htp->vhtCapability, htp->apCenterChan, htp->apChanWidth -#endif ); -#ifdef WLAN_FEATURE_11AC if (htp->vhtCapability) { cch = htp->apCenterChan; if (htp->apChanWidth == WNI_CFG_VHT_CHANNEL_WIDTH_80MHZ) @@ -539,9 +534,7 @@ void csr_get_ch_from_ht_profile(tpAniSirGlobal pMac, tCsrRoamHTProfile *htp, else *hbw = HALF_BW_OF(eCSR_BW_20MHz_VAL); } - } else -#endif - if (htp->htCapability) { + } else if (htp->htCapability) { if (htp->htSupportedChannelWidthSet == eHT_CHANNEL_WIDTH_40MHZ) { *hbw = HALF_BW_OF(eCSR_BW_40MHz_VAL); @@ -588,9 +581,7 @@ static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx, else if (*chb == PHY_DOUBLE_CHANNEL_HIGH_PRIMARY) *sap_cch = CSR_GET_HT40_MINUS_CCH(*sap_ch); - } -#ifdef WLAN_FEATURE_11AC - else if (*sap_phymode == eCSR_DOT11_MODE_11ac || + } else if (*sap_phymode == eCSR_DOT11_MODE_11ac || *sap_phymode == eCSR_DOT11_MODE_11ac_ONLY) { /*11AC only 80/40/20 Mhz supported in Rome */ if (mac_ctx->roam.configParam.nVhtChannelWidth == @@ -630,7 +621,6 @@ static void csr_calc_chb_for_sap_phymode(tpAniSirGlobal mac_ctx, *sap_cch = CSR_GET_HT40_MINUS_CCH(*sap_ch); } } -#endif } /** @@ -1338,14 +1328,9 @@ eCsrPhyMode csr_translate_to_phy_mode_from_bss_desc(tSirBssDescription *pSirBssD case eSIR_11N_NW_TYPE: phyMode = eCSR_DOT11_MODE_11n; break; -#ifdef WLAN_FEATURE_11AC case eSIR_11AC_NW_TYPE: default: phyMode = eCSR_DOT11_MODE_11ac; -#else - default: - phyMode = eCSR_DOT11_MODE_11n; -#endif break; } return phyMode; @@ -1432,11 +1417,9 @@ QDF_STATUS csr_get_phy_mode_from_bss(tpAniSirGlobal pMac, if (pIes) { if (pIes->HTCaps.present) { phyMode = eCSR_DOT11_MODE_11n; -#ifdef WLAN_FEATURE_11AC if (IS_BSS_VHT_CAPABLE(pIes->VHTCaps) || IS_BSS_VHT_CAPABLE(pIes->vendor2_ie.VHTCaps)) phyMode = eCSR_DOT11_MODE_11ac; -#endif } *pPhyMode = phyMode; } @@ -1527,18 +1510,12 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, cfgDot11Mode = eCSR_CFG_DOT11_MODE_11A; break; case eCSR_DOT11_MODE_11n: -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: -#endif cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; default: -#ifdef WLAN_FEATURE_11AC cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; -#else - cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; -#endif break; } break; @@ -1551,7 +1528,6 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, } break; -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: fMatch = true; switch (bssPhyMode) { @@ -1580,7 +1556,6 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; } break; -#endif default: fMatch = true; @@ -1597,11 +1572,9 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, case eCSR_DOT11_MODE_11n: cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; break; -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; break; -#endif default: cfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO; break; @@ -1610,12 +1583,10 @@ bool csr_get_phy_mode_in_use(eCsrPhyMode phyModeIn, eCsrPhyMode bssPhyMode, } if (fMatch && pCfgDot11ModeToUse) { -#ifdef WLAN_FEATURE_11AC if (cfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC && (!IS_FEATURE_SUPPORTED_BY_FW(DOT11AC))) *pCfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11N; else -#endif *pCfgDot11ModeToUse = cfgDot11Mode; } return fMatch; @@ -1656,12 +1627,7 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, phyMode = eCSR_DOT11_MODE_abg; else if (eCSR_CFG_DOT11_MODE_AUTO == pMac->roam.configParam.uCfgDot11Mode) -#ifdef WLAN_FEATURE_11AC phyMode = eCSR_DOT11_MODE_11ac; -#else - phyMode = eCSR_DOT11_MODE_11n; -#endif - else /* user's pick */ phyMode = pMac->roam.configParam.phyMode; @@ -1707,11 +1673,8 @@ bool csr_is_phy_mode_match(tpAniSirGlobal pMac, uint32_t phyMode, pProfile->negotiatedUCEncryptionType)) && ((eCSR_CFG_DOT11_MODE_11N == cfgDot11ModeToUse) || -#ifdef WLAN_FEATURE_11AC (eCSR_CFG_DOT11_MODE_11AC == - cfgDot11ModeToUse) -#endif - )) { + cfgDot11ModeToUse))) { /* We cannot do 11n here */ if (!CDS_IS_CHANNEL_5GHZ (pSirBssDesc->channelId)) { @@ -1735,16 +1698,11 @@ eCsrCfgDot11Mode csr_find_best_phy_mode(tpAniSirGlobal pMac, uint32_t phyMode) eCsrBand eBand = pMac->roam.configParam.eBand; if ((0 == phyMode) || -#ifdef WLAN_FEATURE_11AC (eCSR_DOT11_MODE_11ac & phyMode) || -#endif (eCSR_DOT11_MODE_AUTO & phyMode)) { -#ifdef WLAN_FEATURE_11AC if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) { cfgDot11ModeToUse = eCSR_CFG_DOT11_MODE_11AC; - } else -#endif - { + } else { /* Default to 11N mode if user has configured 11ac mode * and FW doesn't supports 11ac mode . */ @@ -5360,7 +5318,6 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf cfgDot11Mode = eCSR_CFG_DOT11_MODE_AUTO; break; -#ifdef WLAN_FEATURE_11AC case eCSR_DOT11_MODE_11ac: if (IS_FEATURE_SUPPORTED_BY_FW(DOT11AC)) { cfgDot11Mode = eCSR_CFG_DOT11_MODE_11AC; @@ -5375,7 +5332,6 @@ eCsrCfgDot11Mode csr_get_cfg_dot11_mode_from_csr_phy_mode(tCsrRoamProfile *pProf cfgDot11Mode = eCSR_CFG_DOT11_MODE_11N; } break; -#endif default: /* No need to assign anything here */ break; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 06f390f8484c..87b0fb396c12 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1234,10 +1234,8 @@ typedef struct { qdf_list_t wma_hold_req_queue; qdf_spinlock_t wma_hold_req_q_lock; uint32_t ht_cap_info; -#ifdef WLAN_FEATURE_11AC uint32_t vht_cap_info; uint32_t vht_supp_mcs; -#endif uint32_t num_rf_chains; #if defined(QCA_WIFI_FTM) struct utf_event_info utf_event_info; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 848f9c8925bc..542a1e890ed4 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -797,7 +797,6 @@ typedef struct { uint8_t smeSessionId; } tUpdateBeaconParams, *tpUpdateBeaconParams; -#ifdef WLAN_FEATURE_11AC /** * struct tUpdateVHTOpMode - VHT operating mode * @opMode: VHT operating mode @@ -854,8 +853,6 @@ typedef struct { tSirMacAddr peer_mac; } tUpdateUserPos, *tpUpdateUserPos; -#endif /* WLAN_FEATURE_11AC */ - /** * struct tUpdateCFParams -CF parameters * @bssIdx: BSSID index diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 195bef70836f..9e97d2a7580f 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -128,7 +128,6 @@ struct index_data_rate_type { uint16_t ht40_rate[2]; }; -#ifdef WLAN_FEATURE_11AC /** * struct index_vht_data_rate_type - vht data rate type * @mcs_index: mcs rate index @@ -142,7 +141,6 @@ struct index_vht_data_rate_type { uint16_t ht40_rate[2]; uint16_t ht80_rate[2]; }; -#endif /* * wma_main.c functions declarations diff --git a/core/wma/inc/wma_tgt_cfg.h b/core/wma/inc/wma_tgt_cfg.h index 6b4cf5c3ffa4..94c5b05fca14 100644 --- a/core/wma/inc/wma_tgt_cfg.h +++ b/core/wma/inc/wma_tgt_cfg.h @@ -89,7 +89,6 @@ struct wma_tgt_ht_cap { uint32_t num_rf_chains; }; -#ifdef WLAN_FEATURE_11AC /** * struct wma_tgt_vht_cap - vht capabalities * @vht_max_mpdu: vht max mpdu @@ -121,7 +120,6 @@ struct wma_tgt_vht_cap { uint32_t vht_max_ampdu_len_exp; uint32_t vht_txop_ps; }; -#endif /* WLAN_FEATURE_11AC */ /** * struct wma_dfs_radar_ind - dfs radar indication @@ -157,9 +155,7 @@ struct wma_tgt_cfg { struct qdf_mac_addr hw_macaddr; struct wma_tgt_services services; struct wma_tgt_ht_cap ht_cap; -#ifdef WLAN_FEATURE_11AC struct wma_tgt_vht_cap vht_cap; -#endif uint8_t max_intf_count; #ifdef WLAN_FEATURE_LPSS uint8_t lpss_support; diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 8b0ce3ccb0ad..f018b0c7bbb7 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -311,12 +311,10 @@ #define WMA_SET_TM_LEVEL_REQ SIR_HAL_SET_TM_LEVEL_REQ -#ifdef WLAN_FEATURE_11AC #define WMA_UPDATE_OP_MODE SIR_HAL_UPDATE_OP_MODE #define WMA_UPDATE_RX_NSS SIR_HAL_UPDATE_RX_NSS #define WMA_UPDATE_MEMBERSHIP SIR_HAL_UPDATE_MEMBERSHIP #define WMA_UPDATE_USERPOS SIR_HAL_UPDATE_USERPOS -#endif #ifdef WLAN_FEATURE_NAN #define WMA_NAN_REQUEST SIR_HAL_NAN_REQUEST diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index e353d42f6ebd..e80e1393e865 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -3804,12 +3804,10 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) if (params->enableHtSmps) wma_set_mimops(wma, params->smesessionId, params->htSmpsconfig); -#ifdef WLAN_FEATURE_11AC /* Partial AID match power save, enable when SU bformee */ if (params->enableVhtpAid && params->vhtTxBFCapable) wma_set_ppsconfig(params->smesessionId, WMA_VHT_PPS_PAID_MATCH, 1); -#endif /* Enable AMPDU power save, if htCapable/vhtCapable */ if (params->enableAmpduPs && (params->htCapable || params->vhtCapable)) diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 2fd6f9314eb6..0299508559db 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -3372,7 +3372,6 @@ static inline void wma_update_target_ht_cap(tp_wma_handle wh, } -#ifdef WLAN_FEATURE_11AC /** * wma_update_target_vht_cap() - update vht capabality from wma handle * @wh: wma handle @@ -3433,7 +3432,6 @@ static inline void wma_update_target_vht_cap(tp_wma_handle wh, cfg->vht_txop_ps, cfg->vht_su_bformee, cfg->vht_mu_bformee, cfg->vht_max_ampdu_len_exp); } -#endif /* #ifdef WLAN_FEATURE_11AC */ /** * wma_update_hdd_cfg() - update HDD config @@ -3473,9 +3471,7 @@ static void wma_update_hdd_cfg(tp_wma_handle wma_handle) wma_update_target_services(wma_handle, &tgt_cfg.services); wma_update_target_ht_cap(wma_handle, &tgt_cfg.ht_cap); -#ifdef WLAN_FEATURE_11AC wma_update_target_vht_cap(wma_handle, &tgt_cfg.vht_cap); -#endif /* #ifdef WLAN_FEATURE_11AC */ tgt_cfg.target_fw_version = wma_handle->target_fw_version; #ifdef WLAN_FEATURE_LPSS @@ -3734,10 +3730,8 @@ int wma_rx_service_ready_event(void *handle, uint8_t *cmd_param_info, qdf_mem_copy(&wma_handle->reg_cap, param_buf->hal_reg_capabilities, sizeof(HAL_REG_CAPABILITIES)); wma_handle->ht_cap_info = ev->ht_cap_info; -#ifdef WLAN_FEATURE_11AC wma_handle->vht_cap_info = ev->vht_cap_info; wma_handle->vht_supp_mcs = ev->vht_supp_mcs; -#endif /* WLAN_FEATURE_11AC */ wma_handle->num_rf_chains = ev->num_rf_chains; wma_handle->target_fw_version = ev->fw_build_vers; @@ -4695,7 +4689,6 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) (tUpdateRxNss *) msg->bodyptr); qdf_mem_free(msg->bodyptr); break; -#ifdef WLAN_FEATURE_11AC case WMA_UPDATE_MEMBERSHIP: wma_process_update_membership(wma_handle, (tUpdateMembership *) msg->bodyptr); @@ -4704,7 +4697,6 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) wma_process_update_userpos(wma_handle, (tUpdateUserPos *) msg->bodyptr); break; -#endif /* WLAN_FEATURE_11AC */ case WMA_UPDATE_BEACON_IND: wma_process_update_beacon_params(wma_handle, (tUpdateBeaconParams *) msg->bodyptr); diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index 5c4251cc5b5a..c3bf626ab369 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -901,7 +901,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, } } -#ifdef WLAN_FEATURE_11AC if (params->vhtCapable) { cmd->peer_flags |= (WMI_PEER_HT | WMI_PEER_VHT | WMI_PEER_QOS); cmd->peer_rate_caps |= WMI_RC_HT_FLAG; @@ -915,7 +914,6 @@ QDF_STATUS wma_send_peer_assoc(tp_wma_handle wma, cmd->peer_flags |= WMI_PEER_160MHZ; cmd->peer_vht_caps = params->vht_caps; -#endif /* WLAN_FEATURE_11AC */ if (params->rmfEnabled) cmd->peer_flags |= WMI_PEER_PMF; @@ -2498,7 +2496,6 @@ void wma_process_update_rx_nss(tp_wma_handle wma_handle, update_rx_nss->smesessionId); } -#ifdef WLAN_FEATURE_11AC /** * wma_process_update_membership() - process update group membership cmd * @wma_handle: wma handle @@ -2538,7 +2535,6 @@ void wma_process_update_userpos(tp_wma_handle wma_handle, wma_set_ppsconfig(userpos->smesessionId, WMA_VHT_PPS_GID_MATCH, 1); } -#endif /* WLAN_FEATURE_11AC */ /** * wma_set_htconfig() - set ht config parameters to target diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 8457bd4d5ca7..02cdce327744 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -96,7 +96,6 @@ static struct index_data_rate_type mcs_nss2[] = { {7, {1300, 1440}, {2700, 3000} } }; -#ifdef WLAN_FEATURE_11AC /* MCS Based VHT rate table */ /* MCS parameters with Nss = 1*/ static struct index_vht_data_rate_type vht_mcs_nss1[] = { @@ -127,7 +126,6 @@ static struct index_vht_data_rate_type vht_mcs_nss2[] = { {8, {1560, 1733}, {3240, 3600}, {7020, 7800} }, {9, {1730, 1920}, {3600, 4000}, {7800, 8667} } }; -#endif /* WLAN_FEATURE_11AC */ #ifdef BIG_ENDIAN_HOST @@ -216,7 +214,6 @@ static uint8_t wma_get_mcs_idx(uint16_t maxRate, uint8_t rate_flags, *mcsRateFlag = rate_flags; *mcsRateFlag &= ~eHAL_TX_RATE_SGI; -#ifdef WLAN_FEATURE_11AC for (index = 0; index < MAX_VHT_MCS_IDX; index++) { if (rate_flags & eHAL_TX_RATE_VHT80) { /* check for vht80 nss1/2 rate set */ @@ -257,7 +254,6 @@ static uint8_t wma_get_mcs_idx(uint16_t maxRate, uint8_t rate_flags, } } } -#endif /* WLAN_FEATURE_11AC */ for (index = 0; index < MAX_HT_MCS_IDX; index++) { if (rate_flags & eHAL_TX_RATE_HT40) { /* check for ht40 nss1/2 rate set */ -- cgit v1.2.3 From 5899f438180ed70546ed5603e9d4f0474d59b4e0 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Thu, 18 Feb 2016 12:53:42 -0800 Subject: qcacld-3.0: Remove obsolete StaRateMode related code Remove obsolete StaRateMode related functionality. Change-Id: Id051d9081a68adfa8e32dd7960caff06fd9b677a CRs-Fixed: 980689 --- core/mac/inc/sir_api.h | 28 ---------- core/mac/src/pe/lim/lim_assoc_utils.c | 60 +--------------------- core/mac/src/pe/lim/lim_assoc_utils.h | 4 -- core/mac/src/pe/lim/lim_ft.c | 15 ------ core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 - core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 2 - core/mac/src/pe/lim/lim_prop_exts_utils.c | 32 ------------ core/mac/src/pe/lim/lim_prop_exts_utils.h | 1 - 8 files changed, 1 insertion(+), 143 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 79d8f5123f12..3abf7ff87fa0 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -292,19 +292,6 @@ struct rrm_config_param { uint8_t rm_capability[RMENABLEDCAP_MAX_LEN]; }; -/* each station added has a rate mode which specifies the sta attributes */ -typedef enum eStaRateMode { - eSTA_TAURUS = 0, - eSTA_TITAN, - eSTA_POLARIS, - eSTA_11b, - eSTA_11bg, - eSTA_11a, - eSTA_11n, - eSTA_11ac, - eSTA_INVALID_RATE_MODE -} tStaRateMode, *tpStaRateMode; - /* * although in tSirSupportedRates each IE is 16bit but PE only passes IEs in 8 * bits with MSB=1 for basic rates. change the mask for bit0-7 only so HAL gets @@ -318,21 +305,6 @@ const char *lim_bss_type_to_string(const uint16_t bss_type); const char *lim_scan_type_to_string(const uint8_t scan_type); typedef struct sSirSupportedRates { - /* - * For Self STA Entry: this represents Self Mode. - * For Peer Stations, this represents the mode of the peer. - * On Station: - * --this mode is updated when PE adds the Self Entry. - * -- OR when PE sends 'ADD_BSS' message and station context in BSS is - * used to indicate the mode of the AP. - * ON AP: - * -- this mode is updated when PE sends 'ADD_BSS' and Sta entry for - * that BSS is used to indicate the self mode of the AP. - * -- OR when a station is associated, PE sends 'ADD_STA' message with - * this mode updated. - */ - - tStaRateMode opRateMode; /* * 11b, 11a and aniLegacyRates are IE rates which gives rate in unit * of 500Kbps diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 07dbb857eace..766374ecfbf8 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -62,26 +62,6 @@ #include "wma_types.h" #include "lim_types.h" -/* - * fill up the rate info properly based on what is actually supported by the peer - * TBD TBD TBD - */ -void -lim_fill_supported_rates_info(tpAniSirGlobal pMac, - tpDphHashNode pSta, - tpSirSupportedRates pRates, tpPESession psessionEntry) -{ - /* pSta will be NULL for self entry, so get the opRateMode based on the self mode. */ - /* For the peer entry get it from the peer Capabilities present in hash table */ - if (pSta == NULL) - pRates->opRateMode = - lim_get_sta_rate_mode((uint8_t) psessionEntry->dot11mode); - else - pRates->opRateMode = - lim_get_sta_peer_type(pMac, pSta, psessionEntry); - -} - /** * lim_cmp_ssid() - utility function to compare SSIDs * @rx_ssid: Received SSID @@ -2260,9 +2240,6 @@ lim_add_sta(tpAniSirGlobal mac_ctx, &sta_ds->mlmStaContext.capabilityInfo, sizeof(add_sta_params->capab_info)); - lim_fill_supported_rates_info(mac_ctx, sta_ds, &sta_ds->supportedRates, - session_entry); - /* Copy legacy rates */ qdf_mem_copy((uint8_t *) &add_sta_params->supportedRates, (uint8_t *) &sta_ds->supportedRates, @@ -3037,9 +3014,6 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->p2pCapableSta = 1; } - pAddStaParams->supportedRates.opRateMode = - lim_get_sta_rate_mode((uint8_t) selfStaDot11Mode); - lim_log(pMac, LOG2, FL(" StaIdx: %d updateSta = %d htcapable = %d "), pAddStaParams->staIdx, pAddStaParams->updateSta, pAddStaParams->htCapable); @@ -4139,12 +4113,9 @@ tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, pStaDs = dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER, &psessionEntry->dph.dphHashTable); if (pStaDs != NULL) { - lim_fill_supported_rates_info(pMac, pStaDs, - &pStaDs->supportedRates, - psessionEntry); qdf_mem_copy((uint8_t *) &pAddBssParams->staContext. supportedRates, - (uint8_t *) &pStaDs->supportedRates, + (uint8_t *)&pStaDs->supportedRates, sizeof(tSirSupportedRates)); } else lim_log(pMac, LOGE, FL( @@ -4661,10 +4632,6 @@ tSirRetStatus lim_sta_send_add_bss_pre_assoc(tpAniSirGlobal pMac, uint8_t update pBeaconStruct->HTCaps.supportedMCSSet, false, psessionEntry, &pBeaconStruct->VHTCaps); - lim_fill_supported_rates_info(pMac, NULL, - &pAddBssParams->staContext. - supportedRates, psessionEntry); - pAddBssParams->staContext.encryptType = psessionEntry->encryptType; @@ -4796,31 +4763,6 @@ lim_prepare_and_send_del_sta_cnf(tpAniSirGlobal pMac, tpDphHashNode pStaDs, statusCode, psessionEntry); } -/** ------------------------------------------------------------- - \fn lim_get_sta_rate_mode - \brief Gets the Station Rate Mode. - \param uint8_t dot11Mode - \return none - -------------------------------------------------------------*/ -tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode) -{ - switch (dot11Mode) { - case WNI_CFG_DOT11_MODE_11A: - return eSTA_11a; - case WNI_CFG_DOT11_MODE_11B: - return eSTA_11b; - case WNI_CFG_DOT11_MODE_11G: - return eSTA_11bg; - case WNI_CFG_DOT11_MODE_11N: - return eSTA_11n; - case WNI_CFG_DOT11_MODE_11AC: - return eSTA_11ac; - case WNI_CFG_DOT11_MODE_ALL: - default: - return eSTA_11n; - } -} - /** ------------------------------------------------------------- \fn lim_init_pre_auth_timer_table \brief Initialize the Pre Auth Tanle and creates the timer for diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 46f7e307537a..9daef5193ebd 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -93,7 +93,6 @@ tSirRetStatus lim_del_sta(tpAniSirGlobal, tpDphHashNode, bool, tpPESession); tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, uint16_t assocId, tpPESession psessionEntry); tSirRetStatus lim_add_sta_self(tpAniSirGlobal, uint16_t, uint8_t, tpPESession); -tStaRateMode lim_get_sta_rate_mode(uint8_t dot11Mode); void lim_teardown_infra_bss(tpAniSirGlobal, tpPESession); void lim_restore_pre_reassoc_state(tpAniSirGlobal, @@ -118,9 +117,6 @@ void lim_update_re_assoc_globals(tpAniSirGlobal pMac, void lim_update_assoc_sta_datas(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpSirAssocRsp pAssocRsp, tpPESession psessionEntry); -void lim_fill_supported_rates_info(tpAniSirGlobal pMac, tpDphHashNode pSta, - tpSirSupportedRates pRates, - tpPESession psessionEntry); tSirRetStatus lim_sta_send_add_bss(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, tpSchBeaconStruct pBeaconStruct, diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index c12dbd7a5dff..5f1e54176e04 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -687,21 +687,6 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, pBeaconStruct->HTCaps.supportedMCSSet, false, pftSessionEntry, &pBeaconStruct->VHTCaps); - if (pftSessionEntry->htCapability) { - pAddBssParams->staContext.supportedRates.opRateMode = - eSTA_11n; - if (pftSessionEntry->vhtCapability) - pAddBssParams->staContext.supportedRates. - opRateMode = eSTA_11ac; - } else { - if (pftSessionEntry->limRFBand == SIR_BAND_5_GHZ) { - pAddBssParams->staContext.supportedRates. - opRateMode = eSTA_11a; - } else { - pAddBssParams->staContext.supportedRates. - opRateMode = eSTA_11bg; - } - } } pAddBssParams->maxTxPower = pftSessionEntry->maxTxPower; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index d5df1d4f2cfc..c938db44fab5 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -552,8 +552,6 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL, false, session_entry, NULL); - lim_fill_supported_rates_info(mac_ctx, NULL, &sta_param->supportedRates, - session_entry); lim_log(mac_ctx, LOGE, FL( "GF: %d, ChnlWidth: %d, MimoPS: %d, lsigTXOP: %d, dsssCCK: %d," diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 99d3be57e22f..1172dfadf7ab 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2845,8 +2845,6 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, pAddStaParams->listenInterval = (uint16_t) listenInterval; wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode); - pAddStaParams->supportedRates.opRateMode = - lim_get_sta_rate_mode((uint8_t) selfStaDot11Mode); pAddStaParams->encryptType = psessionEntry->encryptType; pAddStaParams->maxTxPower = psessionEntry->maxTxPower; diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c index 1126512f9121..93f820141d72 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.c +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c @@ -254,35 +254,3 @@ ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode) return PHY_SINGLE_CHANNEL_CENTERED; } } - -/* - * lim_get_sta_peer_type - * - ***FUNCTION: - * This API returns STA peer type - * - ***LOGIC: - * - ***ASSUMPTIONS: - * - ***NOTE: - * - * @param pMac - Pointer to Global MAC structure - * @param pStaDs - Pointer to the tpDphHashNode of the STA - * under consideration - * @return tStaRateMode - */ -tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal pMac, - tpDphHashNode pStaDs, tpPESession psessionEntry) -{ - tStaRateMode staPeerType = eSTA_11b; - if (pStaDs->mlmStaContext.vhtCapability) - staPeerType = eSTA_11ac; - else if (pStaDs->mlmStaContext.htCapability) - staPeerType = eSTA_11n; - else if (pStaDs->erpEnabled) - staPeerType = eSTA_11bg; - else if (psessionEntry->limRFBand == SIR_BAND_5_GHZ) - staPeerType = eSTA_11a; - return staPeerType; -} diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.h b/core/mac/src/pe/lim/lim_prop_exts_utils.h index 50502536a12b..9aaaab9dde73 100644 --- a/core/mac/src/pe/lim/lim_prop_exts_utils.h +++ b/core/mac/src/pe/lim/lim_prop_exts_utils.h @@ -56,7 +56,6 @@ uint32_t limComputeAvg(tpAniSirGlobal, uint32_t, uint32_t); void lim_extract_ap_capability(tpAniSirGlobal, uint8_t *, uint16_t, uint8_t *, uint16_t *, uint8_t *, int8_t *, tpPESession); -tStaRateMode lim_get_sta_peer_type(tpAniSirGlobal, tpDphHashNode, tpPESession); ePhyChanBondState lim_get_htcb_state(ePhyChanBondState aniCBMode); #endif /* __LIM_PROP_EXTS_UTILS_H */ -- cgit v1.2.3 From 15596cf5c194a6104f46937cf4c366afacd877e5 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Fri, 12 Feb 2016 11:57:02 -0800 Subject: qcacld-3.0: Fix compilation issues with ocb functions OCB header files shouldn't be under FEATURE_WLAN_CH_AVOID. During cld2.0 to cld3.0 propagation ocb header file inclusion mistakenly got inside above featurization. Relocate it outside the FEATURE_WLAN_CH_AVOID conditional. Change-Id: Ib1cbc179dc0f5b769e18a4d7d8268081a25ede3f CRs-Fixed: 975731 --- core/hdd/src/wlan_hdd_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 73c75f5f8398..b93e65cfe2c6 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -88,11 +88,9 @@ #include #endif #include "cds_regdomain.h" - -#include "wlan_hdd_ocb.h" #include "cdp_txrx_flow_ctrl_v2.h" #endif /* FEATURE_WLAN_CH_AVOID */ - +#include "wlan_hdd_ocb.h" #include "wlan_hdd_nan.h" #include "wlan_hdd_debugfs.h" #include "wlan_hdd_driver_ops.h" -- cgit v1.2.3 From e087566368c6d1cd648d33f2def73d65c60c823c Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Fri, 12 Feb 2016 16:09:21 -0800 Subject: qcacld-3.0: UMAC: Add support for 2.4Ghz HT40 STA - Add support for 2.4Ghz HT40 STA. - Add HT40 OBSS scan start and stop operation. - Add support for extraction of OBSS scan paramters from beacon and probe response. Change-Id: I58e8d72b8ee922f710af0474ed3efd0438fff3a7 CRs-Fixed: 947086 --- core/mac/inc/sir_api.h | 85 ++++++++++++ core/mac/inc/wni_api.h | 1 + core/mac/inc/wni_cfg.h | 40 +++++- core/mac/src/cfg/cfg_proc_msg.c | 44 ++++++- core/mac/src/include/parser_api.h | 2 + core/mac/src/include/sir_params.h | 2 +- core/mac/src/pe/include/lim_session.h | 2 + core/mac/src/pe/lim/lim_ft.c | 4 + core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 4 + core/mac/src/pe/lim/lim_process_message_queue.c | 38 ++++++ core/mac/src/pe/lim/lim_send_messages.c | 95 ++++++++++++++ core/mac/src/pe/lim/lim_send_messages.h | 2 + core/mac/src/pe/lim/lim_utils.c | 144 +++++++++++++++++++++ core/mac/src/pe/lim/lim_utils.h | 4 + core/mac/src/sys/legacy/src/utils/src/parser_api.c | 12 +- core/sme/inc/csr_api.h | 3 + core/sme/inc/csr_internal.h | 6 +- core/sme/inc/sme_api.h | 1 + core/sme/src/common/sme_api.c | 21 +++ core/sme/src/csr/csr_api_roam.c | 60 +++++++-- core/wma/inc/wma.h | 5 + core/wma/inc/wma_types.h | 2 + core/wma/src/wma_main.c | 5 + core/wma/src/wma_scan_roam.c | 139 ++++++++++++++++++++ 24 files changed, 704 insertions(+), 17 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 3abf7ff87fa0..d6c6af0b3130 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -5493,4 +5493,89 @@ struct sir_saved_csa_params { uint32_t session_id; }; +/** + * enum obss_ht40_scancmd_type - obss scan command type + * @HT40_OBSS_SCAN_PARAM_START: OBSS scan start + * @HT40_OBSS_SCAN_PARAM_UPDATE: OBSS scan param update + */ +enum obss_ht40_scancmd_type { + HT40_OBSS_SCAN_PARAM_START, + HT40_OBSS_SCAN_PARAM_UPDATE +}; + +/** + * struct sme_obss_ht40_scanind_msg - sme obss scan params + * @msg_type: message type + * @length: message length + * @mac_addr: mac address + */ +struct sme_obss_ht40_scanind_msg { + uint16_t msg_type; + uint16_t length; + struct qdf_mac_addr mac_addr; +}; + +/** + * struct obss_ht40_scanind - ht40 obss scan request + * @cmd: message type + * @scan_type: message length + * @obss_passive_dwelltime: obss passive dwelltime + * @obss_active_dwelltime: obss active dwelltime + * @obss_width_trigger_interval: scan interval + * @obss_passive_total_per_channel: total passive scan time per channel + * @obss_active_total_per_channel: total active scan time per channel + * @bsswidth_ch_trans_delay: OBSS transition delay time + * @obss_activity_threshold: OBSS activity threshold + * @self_sta_id: self sta identification + * @bss_id: BSS index + * @fortymhz_intolerent: Ht40mhz intolerance + * @channel_count: channel count + * @channels: channel information + * @current_operatingclass: operating class + * @iefield_len: ie's length + * @iefiled: ie's information + */ +struct obss_ht40_scanind { + enum obss_ht40_scancmd_type cmd; + enum eSirScanType scan_type; + /* In TUs */ + uint16_t obss_passive_dwelltime; + uint16_t obss_active_dwelltime; + /* In seconds */ + uint16_t obss_width_trigger_interval; + /* In TU's */ + uint16_t obss_passive_total_per_channel; + uint16_t obss_active_total_per_channel; + uint16_t bsswidth_ch_trans_delay; + uint16_t obss_activity_threshold; + uint8_t self_sta_idx; + uint8_t bss_id; + uint8_t fortymhz_intolerent; + uint8_t channel_count; + uint8_t channels[SIR_ROAM_MAX_CHANNELS]; + uint8_t current_operatingclass; + uint16_t iefield_len; + uint8_t iefield[SIR_ROAM_SCAN_MAX_PB_REQ_SIZE]; +}; + +/** + * struct obss_scanparam - OBSS scan parameters + * @obss_passive_dwelltime: message type + * @obss_active_dwelltime: message length + * @obss_width_trigger_interval: obss passive dwelltime + * @obss_passive_total_per_channel: obss passive total scan time + * @obss_active_total_per_channel: obss active total scan time + * @bsswidth_ch_trans_delay: OBSS transition delay time + * @obss_activity_threshold: OBSS activity threshold + */ +struct obss_scanparam { + uint16_t obss_passive_dwelltime; + uint16_t obss_active_dwelltime; + uint16_t obss_width_trigger_interval; + uint16_t obss_passive_total_per_channel; + uint16_t obss_active_total_per_channel; + uint16_t bsswidth_ch_trans_delay; + uint16_t obss_activity_threshold; +}; + #endif /* __SIR_API_H */ diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 2caf25d702fb..225149cda2d0 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -244,6 +244,7 @@ enum eWniMsgTypes { eWNI_SME_EXT_CHANGE_CHANNEL, eWNI_SME_EXT_CHANGE_CHANNEL_IND, eWNI_SME_REGISTER_MGMT_FRAME_CB, + eWNI_SME_HT40_OBSS_SCAN_IND, /* START and UPDATE OBSS SCAN Indication*/ eWNI_SME_MSG_TYPES_END }; diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h index adc9e6513d56..2c46e7d2ee35 100644 --- a/core/mac/inc/wni_cfg.h +++ b/core/mac/inc/wni_cfg.h @@ -318,7 +318,14 @@ enum { WNI_CFG_IBSS_ATIM_WIN_SIZE, WNI_CFG_DFS_MASTER_ENABLED, WNI_CFG_VHT_ENABLE_TXBF_20MHZ, - WNI_CFG_TDLS_WMM_MODE_ENABLED + WNI_CFG_TDLS_WMM_MODE_ENABLED, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL, + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY, + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD }; /* * String parameter lengths @@ -1548,7 +1555,36 @@ enum { #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMAX 1 #define WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF 0 -#define CFG_PARAM_MAX_NUM 286 +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMIN 5 +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMAX 1000 +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STADEF 20 + +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMIN 10 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMAX 1000 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STADEF 10 + +#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMIN 10 +#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMAX 900 +#define WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STADEF 200 + +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMIN 200 +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMAX 10000 +#define WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STADEF 200 + +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMIN 20 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMAX 10000 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STADEF 20 + +#define WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMIN 5 +#define WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMAX 100 +#define WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STADEF 5 + +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMIN 0 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMAX 100 +#define WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STADEF 25 + + +#define CFG_PARAM_MAX_NUM 293 #define CFG_STA_MAGIC_DWORD 0xbeefbeef diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c index 4c9969b84ef3..0105a09a52c8 100644 --- a/core/mac/src/cfg/cfg_proc_msg.c +++ b/core/mac/src/cfg/cfg_proc_msg.c @@ -1524,7 +1524,49 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = { CFG_CTL_NTF_LIM, WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMIN, WNI_CFG_TDLS_WMM_MODE_ENABLED_STAMAX, - WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF} + WNI_CFG_TDLS_WMM_MODE_ENABLED_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STADEF}, + {WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMIN, + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMAX, + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STADEF}, + {WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD, + CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT | + CFG_CTL_NTF_LIM, + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMIN, + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMAX, + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STADEF} }; diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 27e72b527a69..256967d6599d 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -161,6 +161,7 @@ typedef struct sSirProbeRespBeacon { #ifdef FEATURE_WLAN_ESE uint8_t is_ese_ver_ie_present; #endif + tDot11fIEOBSSScanParameters obss_scanparams; } tSirProbeRespBeacon, *tpSirProbeRespBeacon; /* probe Request structure */ @@ -276,6 +277,7 @@ typedef struct sSirAssocRsp { tDot11fIETimeoutInterval TimeoutInterval; #endif tDot11fIEvendor2_ie vendor2_ie; + tDot11fIEOBSSScanParameters obss_scanparams; } tSirAssocRsp, *tpSirAssocRsp; #if defined(FEATURE_WLAN_ESE_UPLOAD) diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 62b8517406e8..0264f898f947 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -600,7 +600,7 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_LRO_CONFIG_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 335) #define SIR_HAL_SET_EGAP_CONF_PARAMS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 336) - +#define SIR_HAL_HT40_OBSS_SCAN_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 337) #define SIR_HAL_MSG_TYPES_END (SIR_HAL_MSG_TYPES_BEGIN + 0x1FF) /* CFG message types */ diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 67efbf02a084..27d1f99c383c 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -472,6 +472,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint8_t nss; bool add_bss_failed; struct csa_offload_params saved_csa_params; + /* To hold OBSS Scan IE Parameters */ + struct obss_scanparam obss_ht40_scanparam; } tPESession, *tpPESession; /*------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 5f1e54176e04..728fb3846cd3 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -928,6 +928,10 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, #ifdef WLAN_FEATURE_11W pftSessionEntry->limRmfEnabled = psessionEntry->limRmfEnabled; #endif + if ((pftSessionEntry->limRFBand == SIR_BAND_2_4_GHZ) && + (pftSessionEntry->htSupportedChannelWidthSet == + eHT_CHANNEL_WIDTH_40MHZ)) + lim_init_obss_params(pMac, pftSessionEntry); qdf_mem_free(pBeaconStruct); } diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 725e996e49de..adeee6ad8045 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -1067,6 +1067,10 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_CONNECTED, session_entry, eSIR_SUCCESS, eSIR_SUCCESS); #endif + if (assoc_rsp->obss_scanparams.present) + lim_update_obss_scanparams(session_entry, + &assoc_rsp->obss_scanparams); + if (assoc_rsp->QosMapSet.present) qdf_mem_copy(&session_entry->QosMapSet, &assoc_rsp->QosMapSet, sizeof(tSirQosMapSet)); diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 4064a074ce6f..6866468577df 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1147,6 +1147,38 @@ void lim_process_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *body) #endif +static void lim_process_sme_obss_scan_ind(tpAniSirGlobal mac_ctx, + struct sSirMsgQ *msg) +{ + struct sPESession *session; + uint8_t session_id; + struct sme_obss_ht40_scanind_msg *ht40_scanind; + + ht40_scanind = (struct sme_obss_ht40_scanind_msg *)msg->bodyptr; + session = pe_find_session_by_bssid(mac_ctx, + ht40_scanind->mac_addr.bytes, &session_id); + if (session == NULL) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, + "OBSS Scan not started: session id is NULL"); + return; + } + if (session->htSupportedChannelWidthSet == + WNI_CFG_CHANNEL_BONDING_MODE_ENABLE) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, + "OBSS Scan Start Req: session id %d" + "htSupportedChannelWidthSet %d", + session->peSessionId, + session->htSupportedChannelWidthSet); + lim_send_ht40_obss_scanind(mac_ctx, session); + } else { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, + "OBSS Scan not started: channel width - %d session %d", + session->htSupportedChannelWidthSet, + session->peSessionId); + } + return; +} + /** * lim_handle_hw_mode_change_on_csa() - Do HW mode change on CSA for STA mode * @mac_ctx: Global MAC context @@ -1973,6 +2005,11 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; + case eWNI_SME_HT40_OBSS_SCAN_IND: + lim_process_sme_obss_scan_ind(mac_ctx, msg); + qdf_mem_free(msg->bodyptr); + msg->bodyptr = NULL; + break; default: qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; @@ -2208,6 +2245,7 @@ handle_ht_capabilityand_ht_info(struct sAniSirGlobal *pMac, IS_DOT11_MODE_HT(psessionEntry->dot11mode); psessionEntry->beaconParams.fLsigTXOPProtectionFullSupport = (uint8_t) macHTInfoField3.lsigTXOPProtectionFullSupport; + lim_init_obss_params(pMac, psessionEntry); } } diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 5151cd45149c..1023060347d2 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -42,6 +42,7 @@ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h" #endif /* FEATURE_WLAN_DIAG_SUPPORT */ +#include "cds_regdomain_common.h" /* When beacon filtering is enabled, firmware will * analyze the selected beacons received during BMPS, * and monitor any changes in the IEs as listed below. @@ -821,3 +822,97 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, return retCode; } #endif + +/** + * lim_send_ht40_obss_scanind() - send ht40 obss start scan request + * mac: mac context + * session PE session handle + * + * LIM sends a HT40 start scan message to WMA + * + * Return: status of operation + */ +tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx, + struct sPESession *session) +{ + enum eSirRetStatus ret = eSIR_SUCCESS; + struct obss_ht40_scanind *ht40_obss_scanind; + uint32_t channelnum; + struct sSirMsgQ msg; + uint8_t chan_list[WNI_CFG_VALID_CHANNEL_LIST_LEN]; + uint8_t channel24gnum, count; + + ht40_obss_scanind = qdf_mem_malloc(sizeof(struct obss_ht40_scanind)); + if (NULL == ht40_obss_scanind) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + "Memory allocation failed"); + return eSIR_FAILURE; + } + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + "OBSS Scan Indication bssIdx- %d staId %d", + session->bssIdx, session->staId); + + ht40_obss_scanind->cmd = HT40_OBSS_SCAN_PARAM_START; + ht40_obss_scanind->scan_type = eSIR_ACTIVE_SCAN; + ht40_obss_scanind->obss_passive_dwelltime = + session->obss_ht40_scanparam.obss_passive_dwelltime; + ht40_obss_scanind->obss_active_dwelltime = + session->obss_ht40_scanparam.obss_active_dwelltime; + ht40_obss_scanind->obss_width_trigger_interval = + session->obss_ht40_scanparam.obss_width_trigger_interval; + ht40_obss_scanind->obss_passive_total_per_channel = + session->obss_ht40_scanparam.obss_passive_total_per_channel; + ht40_obss_scanind->obss_active_total_per_channel = + session->obss_ht40_scanparam.obss_active_total_per_channel; + ht40_obss_scanind->bsswidth_ch_trans_delay = + session->obss_ht40_scanparam.bsswidth_ch_trans_delay; + ht40_obss_scanind->obss_activity_threshold = + session->obss_ht40_scanparam.obss_activity_threshold; + ht40_obss_scanind->current_operatingclass = + cds_regdm_get_opclass_from_channel( + mac_ctx->scan.countryCodeCurrent, + session->currentOperChannel, + session->ch_width); + channelnum = WNI_CFG_VALID_CHANNEL_LIST_LEN; + if (wlan_cfg_get_str(mac_ctx, WNI_CFG_VALID_CHANNEL_LIST, + chan_list, &channelnum) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("could not retrieve Valid channel list")); + qdf_mem_free(ht40_obss_scanind); + return eSIR_FAILURE; + } + /* Extract 24G channel list */ + channel24gnum = 0; + for (count = 0; count < channelnum && + (channel24gnum < SIR_ROAM_MAX_CHANNELS); count++) { + if ((chan_list[count] > CHAN_ENUM_1) && + (chan_list[count] < CHAN_ENUM_14)) { + ht40_obss_scanind->channels[channel24gnum] = + chan_list[count]; + channel24gnum++; + } + } + ht40_obss_scanind->channel_count = channel24gnum; + /* FW API requests BSS IDX */ + ht40_obss_scanind->self_sta_idx = session->staId; + ht40_obss_scanind->bss_id = session->bssIdx; + ht40_obss_scanind->fortymhz_intolerent = 0; + ht40_obss_scanind->iefield_len = 0; + msg.type = WMA_HT40_OBSS_SCAN_IND; + msg.reserved = 0; + msg.bodyptr = (void *)ht40_obss_scanind; + msg.bodyval = 0; + lim_log(mac_ctx, LOG1, + FL("Sending WDA_HT40_OBSS_SCAN_IND to WDA" + "Obss Scan trigger width = %d, delay factor = %d"), + ht40_obss_scanind->obss_width_trigger_interval, + ht40_obss_scanind->bsswidth_ch_trans_delay); + ret = wma_post_ctrl_msg(mac_ctx, &msg); + if (eSIR_SUCCESS != ret) { + lim_log(mac_ctx, LOGP, + FL("WDA_HT40_OBSS_SCAN_IND msg failed, reason=%X"), + ret); + qdf_mem_free(ht40_obss_scanind); + } + return ret; +} diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index 5bca22005521..9ac8fada3971 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -104,4 +104,6 @@ tSirRetStatus lim_send_exclude_unencrypt_ind(tpAniSirGlobal pMac, bool excludeUnenc, tpPESession psessionEntry); #endif +tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx, + tpPESession session); #endif diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 81769c79a6b5..16eabf4c7ea1 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -7105,3 +7105,147 @@ const char *lim_bss_type_to_string(const uint16_t bss_type) return "Unknown bss_type"; } } + +/** + * lim_init_obss_params(): Initializes the OBSS Scan Parameters + * @sesssion: LIM session + * @mac_ctx: Mac context + * + * Return: None + */ +void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session) +{ + uint32_t cfg_value; + + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME, + &cfg_value) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME); + return; + } + session->obss_ht40_scanparam.obss_active_dwelltime = cfg_value; + + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME, + &cfg_value) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME); + return; + } + session->obss_ht40_scanparam.obss_passive_dwelltime = cfg_value; + + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL, + &cfg_value) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL); + return; + } + session->obss_ht40_scanparam.obss_width_trigger_interval = cfg_value; + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL, + &cfg_value) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL); + return; + } + session->obss_ht40_scanparam.obss_active_total_per_channel = cfg_value; + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL, &cfg_value) + != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL); + return; + } + session->obss_ht40_scanparam.obss_passive_total_per_channel = cfg_value; + + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY, &cfg_value) + != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY); + return; + } + session->obss_ht40_scanparam.bsswidth_ch_trans_delay = + cfg_value; + + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD, + &cfg_value) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("Fail to retrieve %x value"), + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD); + return; + } + session->obss_ht40_scanparam.obss_activity_threshold = cfg_value; +} + +/** + * lim_update_obss_scanparams(): Updates OBSS SCAN IE parameters to session + * @sesssion: LIM session + * @scan_params: Scan parameters + * + * Return: None + */ +void lim_update_obss_scanparams(tpPESession session, + tDot11fIEOBSSScanParameters *scan_params) +{ + /* + * If the recieved value is not in the range specified + * by the Specification then it will be the default value + * configured through cfg + */ + if ((scan_params->obssScanActiveDwell > + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMIN) && + (scan_params->obssScanActiveDwell < + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_STAMAX)) + session->obss_ht40_scanparam.obss_active_dwelltime = + scan_params->obssScanActiveDwell; + + if ((scan_params->obssScanPassiveDwell > + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMIN) && + (scan_params->obssScanPassiveDwell < + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_STAMAX)) + session->obss_ht40_scanparam.obss_active_dwelltime = + scan_params->obssScanPassiveDwell; + + if ((scan_params->bssWidthChannelTransitionDelayFactor > + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMIN) && + (scan_params->bssWidthChannelTransitionDelayFactor < + WNI_CFG_OBSS_HT40_WIDTH_CH_TRANSITION_DELAY_STAMAX)) + session->obss_ht40_scanparam.bsswidth_ch_trans_delay = + scan_params->bssWidthChannelTransitionDelayFactor; + + if ((scan_params->obssScanActiveTotalPerChannel > + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMIN) && + (scan_params->obssScanActiveTotalPerChannel < + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_TOTAL_PER_CHANNEL_STAMAX)) + session->obss_ht40_scanparam.obss_active_total_per_channel = + scan_params->obssScanActiveTotalPerChannel; + + if ((scan_params->obssScanPassiveTotalPerChannel > + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMIN) && + (scan_params->obssScanPassiveTotalPerChannel < + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_TOTAL_PER_CHANNEL_STAMAX)) + session->obss_ht40_scanparam.obss_passive_total_per_channel = + scan_params->obssScanPassiveTotalPerChannel; + + if ((scan_params->bssChannelWidthTriggerScanInterval > + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMIN) && + (scan_params->bssChannelWidthTriggerScanInterval < + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_STAMAX)) + session->obss_ht40_scanparam.obss_width_trigger_interval = + scan_params->bssChannelWidthTriggerScanInterval; + + if ((scan_params->obssScanActivityThreshold > + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMIN) && + (scan_params->obssScanActivityThreshold < + WNI_CFG_OBSS_HT40_SCAN_ACTIVITY_THRESHOLD_STAMAX)) + session->obss_ht40_scanparam.obss_activity_threshold = + scan_params->obssScanActivityThreshold; + return; +} diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 999ea46f49df..b7b8715a9eb5 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -582,4 +582,8 @@ tSirRetStatus lim_strip_extcap_update_struct(tpAniSirGlobal mac_ctx, void lim_merge_extcap_struct(tDot11fIEExtCap *dst, tDot11fIEExtCap *src); uint8_t lim_get_80Mhz_center_channel(uint8_t primary_channel); +void lim_update_obss_scanparams(tpPESession session, + tDot11fIEOBSSScanParameters *scan_params); +void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session); + #endif /* __LIM_UTILS_H */ diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 7bec234109a7..8336d4866d65 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -2877,7 +2877,11 @@ sir_convert_assoc_resp_frame2_struct(tpAniSirGlobal pMac, pAssocRsp->vendor2_ie.type = ar.vendor2_ie.type; pAssocRsp->vendor2_ie.sub_type = ar.vendor2_ie.sub_type; } - + if (ar.OBSSScanParameters.present) { + qdf_mem_copy(&pAssocRsp->obss_scanparams, + &ar.OBSSScanParameters, + sizeof(struct sDot11fIEOBSSScanParameters)); + } if (ar.vendor2_ie.VHTCaps.present) { qdf_mem_copy(&pAssocRsp->vendor2_ie.VHTCaps, &ar.vendor2_ie.VHTCaps, @@ -3967,7 +3971,11 @@ sir_convert_beacon_frame2_struct(tpAniSirGlobal pMac, pBeacon->QComVendorIE.channel; } #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ - + if (pBeacon->OBSSScanParameters.present) { + qdf_mem_copy(&pBeaconStruct->obss_scanparams, + &pBeacon->OBSSScanParameters, + sizeof(struct sDot11fIEOBSSScanParameters)); + } qdf_mem_free(pBeacon); return eSIR_SUCCESS; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 19884c35231b..6072d95ec379 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1214,6 +1214,9 @@ typedef struct tagCsrConfigParam { uint32_t roam_dense_traffic_thresh; uint32_t roam_dense_rssi_thresh_offset; uint32_t roam_dense_min_aps; + uint32_t obss_width_interval; + uint32_t obss_active_dwelltime; + uint32_t obss_passive_dwelltime; } tCsrConfigParam; /* Tush */ diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index acc4a890420c..7d883931ee18 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -94,7 +94,8 @@ (((pMac)->roam.configParam.bFastRoamInConIniFeatureEnabled) ? \ true : false) \ ) - +#define CSR_IS_CHANNEL_24GHZ(chnNum) \ + (((chnNum) > 0) && ((chnNum) <= 14)) /* Support for "Fast roaming" (i.e., ESE, LFR, or 802.11r.) */ #define CSR_BG_SCAN_OCCUPIED_CHANNEL_LIST_LEN 15 @@ -633,6 +634,9 @@ typedef struct tagCsrConfig { bool early_stop_scan_enable; int8_t early_stop_scan_min_threshold; int8_t early_stop_scan_max_threshold; + uint32_t obss_width_interval; + uint32_t obss_active_dwelltime; + uint32_t obss_passive_dwelltime; } tCsrConfig; typedef struct tagCsrChannelPowerInfo { diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index f0b226819714..c50e837962ce 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1083,5 +1083,6 @@ static inline QDF_STATUS sme_send_egap_conf_params(uint32_t enable, #endif void sme_update_fine_time_measurement_capab(tHalHandle hal, uint32_t val); +QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hHal, uint32_t vdev_id); #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index bc48a8392eec..d393a0fa7546 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -14964,3 +14964,24 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time, return status; } #endif + +/** + * sme_ht40_stop_obss_scan() - ht40 obss stop scan + * @hal: mac handel + * @vdev_id: vdev identifier + * + * Return: Return QDF_STATUS, otherwise appropriate failure code + */ +QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hal, uint32_t vdev_id) +{ + void *wma_handle; + + wma_handle = cds_get_context(QDF_MODULE_ID_WMA); + if (!wma_handle) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "wma handle is NULL"); + return QDF_STATUS_E_FAILURE; + } + wma_ht40_stop_obss_scan(wma_handle, vdev_id); + return QDF_STATUS_SUCCESS; +} diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 47f8827ad10e..94500ed91419 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1861,6 +1861,27 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->roam.configParam.scanAgeTimeCPS = pParam->scanAgeTimeCPS; } + if (pParam->obss_width_interval) { + pMac->roam.configParam.obss_width_interval = + pParam->obss_width_interval; + cfg_set_int(pMac, + WNI_CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL, + pParam->obss_width_interval); + } + if (pParam->obss_active_dwelltime) { + pMac->roam.configParam.obss_active_dwelltime = + pParam->obss_active_dwelltime; + cfg_set_int(pMac, + WNI_CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME, + pParam->obss_active_dwelltime); + } + if (pParam->obss_passive_dwelltime) { + pMac->roam.configParam.obss_passive_dwelltime = + pParam->obss_passive_dwelltime; + cfg_set_int(pMac, + WNI_CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME, + pParam->obss_passive_dwelltime); + } pMac->first_scan_bucket_threshold = pParam->first_scan_bucket_threshold; @@ -2263,6 +2284,13 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pMac->roam.configParam.early_stop_scan_min_threshold; pParam->early_stop_scan_max_threshold = pMac->roam.configParam.early_stop_scan_max_threshold; + pParam->obss_width_interval = + pMac->roam.configParam.obss_width_interval; + pParam->obss_active_dwelltime = + pMac->roam.configParam.obss_active_dwelltime; + pParam->obss_passive_dwelltime = + pMac->roam.configParam.obss_passive_dwelltime; + return QDF_STATUS_SUCCESS; } @@ -10792,6 +10820,28 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) } else { result = eCSR_ROAM_RESULT_NONE; } + /* + * OBSS SCAN Indication will be sent to Firmware + * to start OBSS Scan + */ + if (CSR_IS_CHANNEL_24GHZ( + session->connectedProfile.operationChannel) + && (session->connectState == + eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED) + && session->pCurRoamProfile + && ((QDF_P2P_CLIENT_MODE == + session->pCurRoamProfile->csrPersona) + || (QDF_STA_MODE == + session->pCurRoamProfile->csrPersona))) { + struct sme_obss_ht40_scanind_msg *msg; + msg = qdf_mem_malloc(sizeof( + struct sme_obss_ht40_scanind_msg)); + msg->msg_type = eWNI_SME_HT40_OBSS_SCAN_IND; + msg->length = sizeof(struct sme_obss_ht40_scanind_msg); + qdf_copy_macaddr(&msg->mac_addr, + &session->connectedProfile.bssid); + status = cds_send_mb_message_to_mac(msg); + } roam_info_ptr = &roam_info; } else { result = eCSR_ROAM_RESULT_FAILURE; @@ -11891,18 +11941,8 @@ static ePhyChanBondState csr_get_cb_mode_from_ies(tpAniSirGlobal pMac, uint8_t centerChn; uint32_t ChannelBondingMode; if (CDS_IS_CHANNEL_24GHZ(primaryChn)) { - /* - * gChannelBondingMode24GHz configuration item is common for - * SAP and STA mode and currently MDM does not support - * HT40 in 2.4Ghz STA mode. - * So disabling the HT40 in 2.4GHz station mode - */ -#ifdef QCA_HT_20_24G_STA_ONLY - ChannelBondingMode = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE; -#else ChannelBondingMode = pMac->roam.configParam.channelBondingMode24GHz; -#endif } else { ChannelBondingMode = pMac->roam.configParam.channelBondingMode5GHz; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 87b0fb396c12..c20b6820f89b 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -2022,5 +2022,10 @@ static inline QDF_STATUS wma_lro_config_cmd(tp_wma_handle wma_handle, void wma_indicate_err(enum ol_rx_err_type err_type, struct ol_error_info *err_info); + +QDF_STATUS wma_ht40_stop_obss_scan(tp_wma_handle wma_handle, + int32_t vdev_id); +QDF_STATUS wma_send_ht40_obss_scanind(tp_wma_handle wma, + struct obss_ht40_scanind *req); #endif struct wma_ini_config *wma_get_ini_handle(tp_wma_handle wma_handle); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index f018b0c7bbb7..9d4d1af58cc9 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -196,6 +196,8 @@ #define WMA_TSM_STATS_RSP SIR_HAL_TSM_STATS_RSP #endif +#define WMA_HT40_OBSS_SCAN_IND SIR_HAL_HT40_OBSS_SCAN_IND + #define WMA_SET_MIMOPS_REQ SIR_HAL_SET_MIMOPS_REQ #define WMA_SET_MIMOPS_RSP SIR_HAL_SET_MIMOPS_RSP #define WMA_SYS_READY_IND SIR_HAL_SYS_READY_IND diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 0299508559db..9d4a9e2d4c0a 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -5183,6 +5183,11 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) (struct egap_conf_params *)msg->bodyptr); qdf_mem_free(msg->bodyptr); break; + case WMA_HT40_OBSS_SCAN_IND: + wma_send_ht40_obss_scanind(wma_handle, + (struct obss_ht40_scanind *)msg->bodyptr); + qdf_mem_free(msg->bodyptr); + break; default: WMA_LOGD("unknow msg type %x", msg->type); /* Do Nothing? MSG Body should be freed at here */ diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 9d151ee73e95..42362073e2e9 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -5511,3 +5511,142 @@ QDF_STATUS wma_set_gateway_params(tp_wma_handle wma, } #endif /* FEATURE_LFR_SUBNET_DETECTION */ +/** + * wma_ht40_stop_obss_scan() - ht40 obss stop scan + * @wma: WMA handel + * @vdev_id: vdev identifier + * + * Return: Return QDF_STATUS, otherwise appropriate failure code + */ +QDF_STATUS wma_ht40_stop_obss_scan(tp_wma_handle wma, int32_t vdev_id) +{ + + wmi_buf_t buf; + wmi_obss_scan_disable_cmd_fixed_param *cmd; + int ret; + int len = sizeof(*cmd); + + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGP("%s: wmi_buf_alloc failed", __func__); + return QDF_STATUS_E_NOMEM; + } + + WMA_LOGD("cmd %x vdev_id %d", WMI_OBSS_SCAN_DISABLE_CMDID, vdev_id); + + cmd = (wmi_obss_scan_disable_cmd_fixed_param *) wmi_buf_data(buf); + WMITLV_SET_HDR(&cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_obss_scan_disable_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN( + wmi_obss_scan_disable_cmd_fixed_param)); + + cmd->vdev_id = vdev_id; + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_OBSS_SCAN_DISABLE_CMDID); + if (ret != EOK) { + WMA_LOGE("Failed to send gw config parameter to fw, ret: %d", + ret); + wmi_buf_free(buf); + return QDF_STATUS_E_FAILURE; + } + + return QDF_STATUS_SUCCESS; +} + +/** + * wma_send_ht40_obss_scanind() - ht40 obss start scan indication + * @wma: WMA handel + * @req: start scan request + * + * Return: Return QDF_STATUS, otherwise appropriate failure code + */ +QDF_STATUS wma_send_ht40_obss_scanind(tp_wma_handle wma, + struct obss_ht40_scanind *req) +{ + wmi_buf_t buf; + wmi_obss_scan_enable_cmd_fixed_param *cmd; + int ret; + int len = 0; + uint8_t *buf_ptr, i; + uint8_t *channel_list; + + len += sizeof(wmi_obss_scan_enable_cmd_fixed_param); + + len += WMI_TLV_HDR_SIZE; + len += qdf_roundup(sizeof(uint8_t) * req->channel_count, + sizeof(uint32_t)); + + len += WMI_TLV_HDR_SIZE; + len += qdf_roundup(sizeof(uint8_t) * 1, sizeof(uint32_t)); + + WMA_LOGE("cmdlen %d vdev_id %d channel count %d iefield_len %d", + len, req->bss_id, req->channel_count, req->iefield_len); + + WMA_LOGE("scantype %d active_time %d passive %d Obss interval %d", + req->scan_type, req->obss_active_dwelltime, + req->obss_passive_dwelltime, + req->obss_width_trigger_interval); + + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGP("%s: wmi_buf_alloc failed", __func__); + return QDF_STATUS_E_NOMEM; + } + + cmd = (wmi_obss_scan_enable_cmd_fixed_param *) wmi_buf_data(buf); + WMITLV_SET_HDR(&cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_obss_scan_enable_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN(wmi_obss_scan_enable_cmd_fixed_param)); + + buf_ptr = (uint8_t *) cmd; + + cmd->vdev_id = req->bss_id; + cmd->scan_type = req->scan_type; + cmd->obss_scan_active_dwell = + req->obss_active_dwelltime; + cmd->obss_scan_passive_dwell = + req->obss_passive_dwelltime; + cmd->bss_channel_width_trigger_scan_interval = + req->obss_width_trigger_interval; + cmd->bss_width_channel_transition_delay_factor = + req->bsswidth_ch_trans_delay; + cmd->obss_scan_active_total_per_channel = + req->obss_active_total_per_channel; + cmd->obss_scan_passive_total_per_channel = + req->obss_passive_total_per_channel; + cmd->obss_scan_activity_threshold = + req->obss_activity_threshold; + + cmd->channel_len = req->channel_count; + cmd->forty_mhz_intolerant = req->fortymhz_intolerent; + cmd->current_operating_class = req->current_operatingclass; + cmd->ie_len = req->iefield_len; + + buf_ptr += sizeof(wmi_obss_scan_enable_cmd_fixed_param); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, + qdf_roundup(req->channel_count, sizeof(uint32_t))); + + buf_ptr += WMI_TLV_HDR_SIZE; + channel_list = (uint8_t *) buf_ptr; + + for (i = 0; i < req->channel_count; i++) { + channel_list[i] = req->channels[i]; + WMA_LOGD("Ch[%d]: %d ", i, channel_list[i]); + } + + buf_ptr += qdf_roundup(sizeof(uint8_t) * req->channel_count, + sizeof(uint32_t)); + WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_BYTE, + qdf_roundup(1, sizeof(uint32_t))); + buf_ptr += WMI_TLV_HDR_SIZE; + + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_OBSS_SCAN_ENABLE_CMDID); + if (ret != EOK) { + WMA_LOGE("Failed to send gw config parameter to fw, ret: %d", + ret); + wmi_buf_free(buf); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; +} -- cgit v1.2.3 From 93a29ecadde167b2956397a26b09d1516842a882 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Fri, 12 Feb 2016 16:10:56 -0800 Subject: qcacld-3.0: HDD: Add support for 2.4Ghz HT40 STA - Add support for 2.4Ghz HT40 STA. - Add HT40 OBSS scan start and stop operation. - Add support for extraction of OBSS scan paramters from beacon and probe response Change-Id: Idc69d4d17271864c1d3bc2c6e16f25eae73331b0 CRs-Fixed: 947086 --- core/hdd/inc/wlan_hdd_cfg.h | 26 +++++++++++++++++++++ core/hdd/src/wlan_hdd_cfg.c | 29 ++++++++++++++++++++++++ core/hdd/src/wlan_hdd_wext.c | 54 +++++++++++++++++++++++++++++++------------- 3 files changed, 93 insertions(+), 16 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index c3caa83d3078..bff10f57000a 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2871,6 +2871,29 @@ enum dot11p_mode { #define CFG_INFORM_BSS_RSSI_RAW_MAX (1) #define CFG_INFORM_BSS_RSSI_RAW_DEFAULT (1) + +/* + * OBSS scan parameters + * obss_active_dwelltime - minimum per channel scan duration in active scan + * obss_passive_dwelltime - minimum per channel scan duration in passive scan + * obss_width_trigger_interval - During an OBSS scan operation, each channel + * in the set is scanned at least once per configured trigger interval time. + */ +#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_NAME "obss_active_dwelltime" +#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MIN (5) +#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MAX (1000) +#define CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_DEFAULT (10) + +#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_NAME "obss_passive_dwelltime" +#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MIN (10) +#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MAX (1000) +#define CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_DEFAULT (20) + +#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_NAME "obss_width_trigger_interval" +#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MIN (10) +#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MAX (900) +#define CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_DEFAULT (200) + #ifdef QCA_WIFI_3_0_EMU /* * On M2M emulation platform we have a fixed mapping between macs, hence @@ -3498,6 +3521,9 @@ struct hdd_config { #ifdef FEATURE_LFR_SUBNET_DETECTION bool enable_lfr_subnet_detection; #endif + uint16_t obss_active_dwelltime; + uint16_t obss_passive_dwelltime; + uint16_t obss_width_trigger_interval; uint8_t inform_bss_rssi_raw; #ifdef QCA_WIFI_3_0_EMU bool enable_m2m_limitation; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 68d174a2d5d5..66663f6af9eb 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -3657,6 +3657,29 @@ REG_TABLE_ENTRY g_registry_table[] = { CFG_ENABLE_LFR_SUBNET_MIN, CFG_ENABLE_LFR_SUBNET_MAX), #endif + REG_VARIABLE(CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_NAME, + WLAN_PARAM_Integer, + struct hdd_config, obss_active_dwelltime, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_DEFAULT, + CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MIN, + CFG_OBSS_HT40_SCAN_ACTIVE_DWELL_TIME_MAX), + + REG_VARIABLE(CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_NAME, + WLAN_PARAM_Integer, + struct hdd_config, obss_passive_dwelltime, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_DEFAULT, + CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MIN, + CFG_OBSS_HT40_SCAN_PASSIVE_DWELL_TIME_MAX), + + REG_VARIABLE(CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_NAME, + WLAN_PARAM_Integer, + struct hdd_config, obss_width_trigger_interval, + VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, + CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_DEFAULT, + CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MIN, + CFG_OBSS_HT40_SCAN_WIDTH_TRIGGER_INTERVAL_MAX), REG_VARIABLE(CFG_INFORM_BSS_RSSI_RAW_NAME, WLAN_PARAM_Integer, struct hdd_config, inform_bss_rssi_raw, @@ -6714,6 +6737,12 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) pHddCtx->config->roam_dense_min_aps; smeConfig->csrConfig.roam_dense_traffic_thresh = pHddCtx->config->roam_dense_traffic_thresh; + smeConfig->csrConfig.obss_width_interval = + pHddCtx->config->obss_width_trigger_interval; + smeConfig->csrConfig.obss_active_dwelltime = + pHddCtx->config->obss_active_dwelltime; + smeConfig->csrConfig.obss_passive_dwelltime = + pHddCtx->config->obss_passive_dwelltime; status = sme_update_config(pHddCtx->hHal, smeConfig); if (!QDF_IS_STATUS_SUCCESS(status)) { diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index ccc45f2b1aed..3c3fd4a2fe75 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -328,7 +328,8 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #define WE_DUMP_PCIE_LOG 16 #endif #define WE_GET_RECOVERY_STAT 17 -#define WE_GET_FW_PROFILE_DATA 18 +#define WE_GET_FW_PROFILE_DATA 18 +#define WE_STOP_OBSS_SCAN 19 /* Private ioctls and their sub-ioctls */ #define WLAN_PRIV_SET_VAR_INT_GET_NONE (SIOCIWFIRSTPRIV + 7) @@ -7423,14 +7424,14 @@ static int __iw_setnone_getnone(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); + hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; int ret; int sub_cmd; ENTER_DEV(dev); - hdd_ctx = WLAN_HDD_GET_CTX(pAdapter); + hdd_ctx = WLAN_HDD_GET_CTX(adapter); ret = wlan_hdd_validate_context(hdd_ctx); if (0 != ret) return ret; @@ -7458,25 +7459,25 @@ static int __iw_setnone_getnone(struct net_device *dev, switch (sub_cmd) { case WE_GET_RECOVERY_STAT: { - tHalHandle hal = WLAN_HDD_GET_HAL_CTX(pAdapter); + tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter); sme_get_recovery_stats(hal); break; } case WE_GET_FW_PROFILE_DATA: - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID, 0, DBG_CMD); break; case WE_SET_REASSOC_TRIGGER: { - hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); - tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); + hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); + tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); uint32_t roamId = 0; tCsrRoamModifyProfileFields modProfileFields; hdd_station_ctx_t *hdd_sta_ctx = - WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + WLAN_HDD_GET_STATION_CTX_PTR(adapter); /* Reassoc to same AP, only supported for Open Security*/ if ((hdd_sta_ctx->conn_info.ucEncryptionType || @@ -7486,9 +7487,9 @@ static int __iw_setnone_getnone(struct net_device *dev, return -ENOTSUPP; } - sme_get_modify_profile_fields(hHal, pAdapter->sessionId, + sme_get_modify_profile_fields(hHal, adapter->sessionId, &modProfileFields); - sme_roam_reassoc(hHal, pAdapter->sessionId, + sme_roam_reassoc(hHal, adapter->sessionId, NULL, modProfileFields, &roamId, 1); return 0; } @@ -7496,7 +7497,7 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_AGC_START: { hddLog(LOG1, "WE_DUMP_AGC_START"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_AGC_START, 0, GEN_CMD); break; @@ -7504,7 +7505,7 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_AGC: { hddLog(LOG1, "WE_DUMP_AGC"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_AGC, 0, GEN_CMD); break; @@ -7513,7 +7514,7 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_CHANINFO_START: { hddLog(LOG1, "WE_DUMP_CHANINFO_START"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_CHANINFO_START, 0, GEN_CMD); break; @@ -7521,7 +7522,7 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_CHANINFO: { hddLog(LOG1, "WE_DUMP_CHANINFO_START"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_CHANINFO, 0, GEN_CMD); break; @@ -7529,7 +7530,7 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_WATCHDOG: { hddLog(LOG1, "WE_DUMP_WATCHDOG"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_WATCHDOG, 0, GEN_CMD); break; @@ -7538,12 +7539,29 @@ static int __iw_setnone_getnone(struct net_device *dev, case WE_DUMP_PCIE_LOG: { hddLog(LOGE, "WE_DUMP_PCIE_LOG"); - ret = wma_cli_set_command(pAdapter->sessionId, + ret = wma_cli_set_command(adapter->sessionId, GEN_PARAM_DUMP_PCIE_ACCESS_LOG, 0, GEN_CMD); break; } #endif + case WE_STOP_OBSS_SCAN: + { + /* + * 1.OBSS Scan is mandatory while operating in 2.4GHz + * 2.OBSS scan is stopped by Firmware during the disassociation + * 3.OBSS stop comamnd is added for debugging purpose + */ + tHalHandle hal; + + hal = WLAN_HDD_GET_HAL_CTX(adapter); + if (hal == NULL) { + hdd_err("hal context is NULL"); + return -EINVAL; + } + sme_ht40_stop_obss_scan(hal, adapter->sessionId); + } + break; default: { hddLog(LOGE, "%s: unknown ioctl %d", __func__, sub_cmd); @@ -10473,6 +10491,10 @@ static const struct iw_priv_args we_private_args[] = { 0, "dump_pcie_log"}, #endif + {WE_STOP_OBSS_SCAN, + 0, + 0, + "stop_obss_scan"}, /* handlers for main ioctl */ {WLAN_PRIV_SET_VAR_INT_GET_NONE, IW_PRIV_TYPE_INT | MAX_VAR_ARGS, -- cgit v1.2.3 From 66162de29e380890f1d39e726f9770d10f83cb5d Mon Sep 17 00:00:00 2001 From: Peng Xu Date: Thu, 11 Feb 2016 17:01:20 -0800 Subject: qcacld-3.0: Fix firmware assertion caused by vdev delete Currently the SME session is deleted during interface change API and a new session is not opened until SAP is ready to start. This will cause crash when scan API is invoked. This fix opens the SME session after interface type is changed, so that it can be used to scan and SAP later. Change-Id: I3c4f8da14dbc70a3102fb1892bb101eb1a90a00d CRs-fixed: 968572 --- core/hdd/src/wlan_hdd_assoc.c | 1 + core/hdd/src/wlan_hdd_hostapd.c | 21 ++- core/hdd/src/wlan_hdd_main.c | 64 +++++--- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 4 +- core/sap/inc/sap_api.h | 5 +- core/sap/src/sap_api_link_cntl.c | 17 +- core/sap/src/sap_fsm.c | 143 +++++++++-------- core/sap/src/sap_internal.h | 7 + core/sap/src/sap_module.c | 175 +++++++++------------ core/sme/src/common/sme_api.c | 11 +- core/sme/src/csr/csr_api_roam.c | 2 + core/wma/src/wma_dev_if.c | 4 +- 12 files changed, 236 insertions(+), 218 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 216020c4a776..5d2c4b662c81 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -3900,6 +3900,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, case eCSR_ROAM_SESSION_OPENED: set_bit(SME_SESSION_OPENED, &pAdapter->event_flags); complete(&pAdapter->session_open_comp_var); + hdd_debug("session %d opened", pAdapter->sessionId); break; /* diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 901db25255a6..2add4c68b337 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -6014,6 +6014,8 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) v_CONTEXT_t sapContext = NULL; #endif int ret; + enum tQDF_ADAPTER_MODE mode; + uint32_t session_id = CSR_SESSION_ID_INVALID; ENTER(); @@ -6026,12 +6028,25 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) pAdapter->sessionCtx.ap.sapContext = sapContext; - status = wlansap_start(sapContext); + if (pAdapter->device_mode == WLAN_HDD_P2P_GO) { + mode = QDF_P2P_GO_MODE; + } else if (pAdapter->device_mode == WLAN_HDD_SOFTAP) { + mode = QDF_SAP_MODE; + } else { + hdd_err("Invalid mode for AP: %d", pAdapter->device_mode); + return QDF_STATUS_E_FAULT; + } + + status = wlansap_start(sapContext, mode, + pAdapter->macAddressCurrent.bytes, + &session_id); if (!QDF_IS_STATUS_SUCCESS(status)) { hddLog(LOGE, ("ERROR: wlansap_start failed!!")); wlansap_close(sapContext); + pAdapter->sessionCtx.ap.sapContext = NULL; return status; } + pAdapter->sessionId = session_id; #endif /* Allocate the Wireless Extensions state structure */ @@ -6049,6 +6064,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) hddLog(LOGE, ("ERROR: hdd_set_hostapd failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); + pAdapter->sessionCtx.ap.sapContext = NULL; #endif return status; } @@ -6058,6 +6074,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) hddLog(LOGE, ("ERROR: Hostapd HDD qdf event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); + pAdapter->sessionCtx.ap.sapContext = NULL; #endif return qdf_status; } @@ -6068,6 +6085,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) ("ERROR: Hostapd HDD stop bss event init failed!!")); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); + pAdapter->sessionCtx.ap.sapContext = NULL; #endif return qdf_status; } @@ -6115,6 +6133,7 @@ error_wmm_init: hdd_softap_deinit_tx_rx(pAdapter); #ifdef WLAN_FEATURE_MBSSID wlansap_close(sapContext); + pAdapter->sessionCtx.ap.sapContext = NULL; #endif EXIT(); return status; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b93e65cfe2c6..96d4a81e02c4 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -2805,6 +2805,43 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) } } +/** + * hdd_wait_for_sme_close_sesion() - Close and wait for SME session close + * @hdd_ctx: HDD context which is already NULL validated + * @adapter: HDD adapter which is already NULL validated + * + * Close the SME session and wait for its completion, if needed. + * + * Return: None + */ +static void hdd_wait_for_sme_close_sesion(hdd_context_t *hdd_ctx, + hdd_adapter_t *adapter) +{ + unsigned long rc; + + if (!test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { + hdd_err("session is not opened:%d", adapter->sessionId); + return; + } + + INIT_COMPLETION(adapter->session_close_comp_var); + if (QDF_STATUS_SUCCESS == + sme_close_session(hdd_ctx->hHal, adapter->sessionId, + hdd_sme_close_session_callback, + adapter)) { + /* + * Block on a completion variable. Can't wait + * forever though. + */ + rc = wait_for_completion_timeout( + &adapter->session_close_comp_var, + msecs_to_jiffies + (WLAN_WAIT_TIME_SESSIONOPENCLOSE)); + if (!rc) + hdd_err("failure waiting for session_close_comp_var"); + } +} + QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, const bool bCloseSession) { @@ -2884,29 +2921,8 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, * It is possible that the caller of this function does not * wish to close the session */ - if (true == bCloseSession && - test_bit(SME_SESSION_OPENED, &adapter->event_flags)) { - INIT_COMPLETION(adapter->session_close_comp_var); - if (QDF_STATUS_SUCCESS == - sme_close_session(hdd_ctx->hHal, adapter->sessionId, - hdd_sme_close_session_callback, - adapter)) { - /* - * Block on a completion variable. Can't wait - * forever though. - */ - rc = wait_for_completion_timeout( - &adapter->session_close_comp_var, - msecs_to_jiffies - (WLAN_WAIT_TIME_SESSIONOPENCLOSE)); - if (!rc) { - hddLog(LOGE, - FL( - "failure waiting for session_close_comp_var" - )); - } - } - } + if (true == bCloseSession) + hdd_wait_for_sme_close_sesion(hdd_ctx, adapter); break; case WLAN_HDD_SOFTAP: @@ -2999,6 +3015,8 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, adapter->sessionCtx.ap.beacon = NULL; } mutex_unlock(&hdd_ctx->sap_lock); + if (true == bCloseSession) + hdd_wait_for_sme_close_sesion(hdd_ctx, adapter); break; case WLAN_HDD_OCB: ol_txrx_clear_peer(WLAN_HDD_GET_STATION_CTX_PTR(adapter)-> diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 1172dfadf7ab..bf4f3a6c3761 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2039,8 +2039,8 @@ void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx, session_entry = pe_find_session_by_session_id(mac_ctx, del_sta_params->sessionId); if (NULL == session_entry) { - lim_log(mac_ctx, LOGP, - FL("Session Doesn't exist")); + lim_log(mac_ctx, LOGP, FL("Session Doesn't exist: %d"), + del_sta_params->sessionId); qdf_mem_free(del_sta_params); msg->bodyptr = NULL; return; diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index de6a143d162a..3a390fae9323 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -806,11 +806,12 @@ QDF_STATUS wlansap_stop_Wps(void *p_cds_gctx); QDF_STATUS wlansap_get_wps_state(void *p_cds_gctx, bool *pbWPSState); void *wlansap_open(void *p_cds_gctx); -QDF_STATUS wlansap_start(void *p_cds_gctx); +QDF_STATUS wlansap_start(void *p_cds_gctx, enum tQDF_ADAPTER_MODE mode, + uint8_t *addr, uint32_t *session_id); QDF_STATUS wlansap_stop(void *p_cds_gctx); QDF_STATUS wlansap_close(void *p_cds_gctx); typedef QDF_STATUS (*tpWLAN_SAPEventCB)(tpSap_Event pSapEvent, - void *pUsrContext); + void *pUsrContext); uint8_t wlansap_get_state(void *p_cds_gctx); QDF_STATUS wlansap_start_bss(void *p_cds_gctx, diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 643a21ee070a..81713b077cce 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -407,15 +407,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext, sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED; sap_ctx->sap_status = eSAP_STATUS_SUCCESS; close_session: - status = sme_close_session(hal_handle, - sap_ctx->sessionId, sap_hdd_signal_event_handler, - sap_ctx); - if (QDF_STATUS_SUCCESS != status) - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CloseSession failed")); - else - sap_ctx->isScanSessionOpen = eSAP_FALSE; - sap_ctx->sessionId = 0xff; + sap_hdd_signal_event_handler(sap_ctx); return status; } @@ -949,11 +941,10 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId, switch (roam_status) { case eCSR_ROAM_SESSION_OPENED: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP")); + FL("Session %d opened successfully"), + sap_ctx->sessionId); sap_ctx->isSapSessionOpen = eSAP_TRUE; - qdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId, - &sap_ctx->csr_roamProfile, - &sap_ctx->csr_roamId); + qdf_event_set(&sap_ctx->sap_session_opened_evt); break; case eCSR_ROAM_INFRA_IND: QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index f13d8d0698c1..c4c53feb48fe 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -2214,29 +2214,20 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, return QDF_STATUS_SUCCESS; } -/*========================================================================== - FUNCTION sap_OpenSession - - DESCRIPTION - Function for opening SME and SAP sessions when system is in SoftAP role - - DEPENDENCIES - NA. - - PARAMETERS - - IN - hHal : Hal handle - sapContext : Sap Context value - - RETURN VALUE - The QDF_STATUS code associated with performing the operation - - QDF_STATUS_SUCCESS: Success +/** + * sap_open_session() - Opens a SAP session + * @hHal: Hal handle + * @sapContext: Sap Context value + * @session_id: Pointer to the session id + * + * Function for opening SME and SAP sessions when system is in SoftAP role + * + * Return: QDF_STATUS + */ - SIDE EFFECTS - ============================================================================*/ -QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) +#define SAP_OPEN_SESSION_TIMEOUT 500 +QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext, + uint32_t *session_id) { uint32_t type, subType; QDF_STATUS qdf_ret_status; @@ -2253,6 +2244,8 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) "failed to get vdev type"); return QDF_STATUS_E_FAILURE; } + + qdf_event_reset(&sapContext->sap_session_opened_evt); /* Open SME Session for Softap */ qdf_ret_status = sme_open_session(hHal, &wlansap_roam_callback, @@ -2268,11 +2261,21 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) return QDF_STATUS_E_FAILURE; } + status = qdf_wait_single_event(&sapContext->sap_session_opened_evt, + SAP_OPEN_SESSION_TIMEOUT); + + if (!QDF_IS_STATUS_SUCCESS(status)) { + cds_err("wait for sap open session event timed out"); + return QDF_STATUS_E_FAILURE; + } + pMac->sap.sapCtxList[sapContext->sessionId].sessionID = sapContext->sessionId; pMac->sap.sapCtxList[sapContext->sessionId].pSapContext = sapContext; pMac->sap.sapCtxList[sapContext->sessionId].sapPersona = sapContext->csr_roamProfile.csrPersona; + *session_id = sapContext->sessionId; + sapContext->isSapSessionOpen = eSAP_TRUE; return QDF_STATUS_SUCCESS; } @@ -2300,10 +2303,9 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext) SIDE EFFECTS ============================================================================*/ -QDF_STATUS -sap_goto_starting - (ptSapContext sapContext, - ptWLAN_SAPEvent sapEvent, eCsrRoamBssType bssType) { +QDF_STATUS sap_goto_starting(ptSapContext sapContext, ptWLAN_SAPEvent sapEvent, + eCsrRoamBssType bssType) +{ /* tHalHandle */ tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); QDF_STATUS qdf_ret_status; @@ -2313,7 +2315,9 @@ sap_goto_starting 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, }; sapContext->key_type = 0x05; sapContext->key_length = 32; - qdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material)); /* Need a key size define */ + /* Need a key size define */ + qdf_mem_copy(sapContext->key_material, key_material, + sizeof(key_material)); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s", __func__); @@ -2325,16 +2329,17 @@ sap_goto_starting return QDF_STATUS_E_FAULT; } - qdf_ret_status = sap_open_session(hHal, sapContext); + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: session: %d", + __func__, sapContext->sessionId); - if (QDF_STATUS_SUCCESS != qdf_ret_status) { + qdf_ret_status = sme_roam_connect(hHal, sapContext->sessionId, + &sapContext->csr_roamProfile, + &sapContext->csr_roamId); + if (QDF_STATUS_SUCCESS != qdf_ret_status) QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "Error: In %s calling sap_open_session status = %d", - __func__, qdf_ret_status); - return QDF_STATUS_E_FAILURE; - } + "%s: Failed to issue sme_roam_connect", __func__); - return QDF_STATUS_SUCCESS; + return qdf_ret_status; } /* sapGotoStarting */ /*========================================================================== @@ -2844,6 +2849,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal, sapContext->isCacStartNotified = false; sapContext->isCacEndNotified = false; pMac->sap.sapCtxList[sapContext->sessionId].pSapContext = NULL; + sapContext->isSapSessionOpen = false; if (NULL == sap_find_valid_concurrent_session(hHal)) { /* If timer is running then stop the timer and destory it */ @@ -3071,36 +3077,41 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx, * (both without substates) */ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("new from state %s => %s"), - "eSAP_DISCONNECTED", "eSAP_CH_SELECT"); + FL("new from state %s => %s: session:%d"), + "eSAP_DISCONNECTED", "eSAP_CH_SELECT", + sap_ctx->sessionId); - /* There can be one SAP Session for softap */ - if (sap_ctx->isSapSessionOpen == eSAP_TRUE) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, - FL("SME Session is already opened")); - return QDF_STATUS_E_EXISTS; - } - - sap_ctx->sessionId = 0xff; - - if ((sap_ctx->channel == AUTO_CHANNEL_SELECT) && - (sap_ctx->isScanSessionOpen == eSAP_FALSE)) { + if (sap_ctx->isSapSessionOpen == eSAP_FALSE) { uint32_t type, subtype; - if (QDF_STATUS_SUCCESS == cds_get_vdev_types( - QDF_STA_MODE, &type, &subtype)) { - /* Open SME Session for scan */ - qdf_status = sme_open_session(hal, NULL, - sap_ctx, sap_ctx->self_mac_addr, - &sap_ctx->sessionId, type, subtype); - if (QDF_STATUS_SUCCESS != qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - FL("Error: calling sme_open_session")); - } else { - sap_ctx->isScanSessionOpen = eSAP_TRUE; - } + if (sap_ctx->csr_roamProfile.csrPersona == + QDF_P2P_GO_MODE) + qdf_status = cds_get_vdev_types(QDF_P2P_GO_MODE, + &type, &subtype); + else + qdf_status = cds_get_vdev_types(QDF_SAP_MODE, + &type, + &subtype); + + if (QDF_STATUS_SUCCESS != qdf_status) { + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_FATAL, + "failed to get vdev type"); + return QDF_STATUS_E_FAILURE; + } + /* Open SME Session for scan */ + qdf_status = sme_open_session(hal, NULL, + sap_ctx, sap_ctx->self_mac_addr, + &sap_ctx->sessionId, type, subtype); + if (QDF_STATUS_SUCCESS != qdf_status) { + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_ERROR, + FL("Error: calling sme_open_session")); + return QDF_STATUS_E_FAILURE; } + + sap_ctx->isSapSessionOpen = eSAP_TRUE; } + /* init dfs channel nol */ sap_init_dfs_channel_nol_list(sap_ctx); @@ -3179,18 +3190,6 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx, tSapDfsNolInfo *p_nol; #endif - if (sap_ctx->isScanSessionOpen == eSAP_TRUE) { - /* scan completed, so close the session */ - qdf_status = sme_close_session(hal, sap_ctx->sessionId, - NULL, NULL); - if (QDF_STATUS_SUCCESS != qdf_status) - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("CloseSession error event msg %d"), msg); - else - sap_ctx->isScanSessionOpen = eSAP_FALSE; - sap_ctx->sessionId = 0xff; - } - if (msg == eSAP_MAC_SCAN_COMPLETE) { /* get the bonding mode */ if (sap_ctx->channel <= 14) diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 3a1d2c8af965..435fcb52854e 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -262,6 +262,8 @@ typedef struct sSapContext { eSapHddEvent sap_state; eSapStatus sap_status; uint32_t roc_ind_scan_id; + + qdf_event_t sap_session_opened_evt; } *ptSapContext; /*---------------------------------------------------------------------------- @@ -417,6 +419,11 @@ void sap_config_acs_result(tHalHandle hal, ptSapContext sap_ctx, */ bool sap_check_in_avoid_ch_list(ptSapContext sap_ctx, uint8_t channel); +QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext, + uint32_t *session_id); +QDF_STATUS sap_close_session(tHalHandle hHal, + ptSapContext sapContext, + csr_roamSessionCloseCallback callback, bool valid); #ifdef __cplusplus } #endif diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 5958c30db799..bdde7c52339e 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -134,6 +134,9 @@ void *wlansap_open(void *p_cds_gctx) * control block can be extracted from its context * When MBSSID feature is enabled, SAP context is directly * passed to SAP APIs + * @mode: Device mode + * @addr: MAC address of the SAP + * @session_id: Pointer to the session id * * Called as part of the overall start procedure (cds_enable). SAP will * use this call to register with TL as the SAP entity for SAP RSN frames. @@ -143,9 +146,12 @@ void *wlansap_open(void *p_cds_gctx) * access would cause a page fault. * QDF_STATUS_SUCCESS: Success */ -QDF_STATUS wlansap_start(void *pCtx) +QDF_STATUS wlansap_start(void *pCtx, enum tQDF_ADAPTER_MODE mode, + uint8_t *addr, uint32_t *session_id) { ptSapContext pSapCtx = NULL; + QDF_STATUS qdf_ret_status; + tHalHandle hal; /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ @@ -181,6 +187,9 @@ QDF_STATUS wlansap_start(void *pCtx) pSapCtx->csr_roamProfile.BSSIDs.numOfBSSIDs = 1; /* This is true for now. */ pSapCtx->csr_roamProfile.BSSIDs.bssid = &pSapCtx->bssid; + pSapCtx->csr_roamProfile.csrPersona = mode; + qdf_mem_copy(pSapCtx->self_mac_addr, addr, QDF_MAC_ADDR_SIZE); + qdf_event_create(&pSapCtx->sap_session_opened_evt); /* Now configure the auth type in the roaming profile. To open. */ pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM; /* open is the default */ @@ -191,6 +200,16 @@ QDF_STATUS wlansap_start(void *pCtx) return QDF_STATUS_E_FAULT; } + hal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); + qdf_ret_status = sap_open_session(hal, pSapCtx, session_id); + + if (QDF_STATUS_SUCCESS != qdf_ret_status) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + "Error: In %s calling sap_open_session status = %d", + __func__, qdf_ret_status); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; } @@ -295,6 +314,8 @@ QDF_STATUS wlansap_close(void *pCtx) */ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / *do not empty* /); */ ) { + tHalHandle hal; + /*------------------------------------------------------------------------ Sanity check SAP control block ------------------------------------------------------------------------*/ @@ -311,6 +332,13 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_clean_cb"); + hal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); + if (eSAP_TRUE == pSapCtx->isSapSessionOpen && hal) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + "close existing SAP session"); + sap_close_session(hal, pSapCtx, NULL, false); + } + qdf_mem_zero(pSapCtx, sizeof(tSapContext)); pSapCtx->p_cds_gctx = NULL; @@ -322,7 +350,6 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag /* 0 / pSapCtx->sapsMachine, pSapCtx); pSapCtx->sessionId = 0; pSapCtx->channel = 0; - pSapCtx->isSapSessionOpen = eSAP_FALSE; return QDF_STATUS_SUCCESS; } /* wlansap_clean_cb */ @@ -3167,116 +3194,66 @@ wlansap_acs_chselect(void *pvos_gctx, return QDF_STATUS_E_FAULT; } - if (sap_context->isSapSessionOpen == eSAP_TRUE) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL, - "%s:SME Session is already opened\n", __func__); - return QDF_STATUS_E_EXISTS; - } - - sap_context->sessionId = 0xff; - pmac = PMAC_STRUCT(h_hal); sap_context->acs_cfg = &pconfig->acs_cfg; sap_context->ch_width_orig = pconfig->acs_cfg.ch_width; sap_context->csr_roamProfile.phyMode = pconfig->acs_cfg.hw_mode; - if (sap_context->isScanSessionOpen == eSAP_FALSE) { - uint32_t type, subType; - - /* - * Now, configure the scan and ACS channel params - * to issue a scan request. - */ - wlansap_set_scan_acs_channel_params(pconfig, sap_context, + /* + * Now, configure the scan and ACS channel params + * to issue a scan request. + */ + wlansap_set_scan_acs_channel_params(pconfig, sap_context, pusr_context); - if (QDF_STATUS_SUCCESS == - cds_get_vdev_types(QDF_STA_MODE, &type, &subType)) { - /* - * Open SME Session for scan - */ - if (QDF_STATUS_SUCCESS != sme_open_session(h_hal, - NULL, sap_context, - sap_context->self_mac_addr, - &sap_context->sessionId, - type, subType)) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "Error: In %s calling sme_OpenSession", - __func__); - return QDF_STATUS_E_FAILURE; - } else { - sap_context->isScanSessionOpen = eSAP_TRUE; - } - } - - /* - * Copy the HDD callback function to report the - * ACS result after scan in SAP context callback function. - */ - sap_context->pfnSapEventCallback = pacs_event_callback; - /* - * init dfs channel nol - */ - sap_init_dfs_channel_nol_list(sap_context); + /* + * Copy the HDD callback function to report the + * ACS result after scan in SAP context callback function. + */ + sap_context->pfnSapEventCallback = pacs_event_callback; + /* + * init dfs channel nol + */ + sap_init_dfs_channel_nol_list(sap_context); - /* - * Issue the scan request. This scan request is - * issued before the start BSS is done so - * - * 1. No need to pass the second parameter - * as the SAP state machine is not started yet - * and there is no need for any event posting. - * - * 2. Set third parameter to TRUE to indicate the - * channel selection function to register a - * different scan callback fucntion to process - * the results pre start BSS. - */ - qdf_status = sap_goto_channel_sel(sap_context, NULL, true); + /* + * Issue the scan request. This scan request is + * issued before the start BSS is done so + * + * 1. No need to pass the second parameter + * as the SAP state machine is not started yet + * and there is no need for any event posting. + * + * 2. Set third parameter to TRUE to indicate the + * channel selection function to register a + * different scan callback fucntion to process + * the results pre start BSS. + */ + qdf_status = sap_goto_channel_sel(sap_context, NULL, true); - if (QDF_STATUS_E_ABORTED == qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + if (QDF_STATUS_E_ABORTED == qdf_status) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "In %s,DFS not supported in the current operating mode", __func__); - return QDF_STATUS_E_FAILURE; - } else if (QDF_STATUS_E_CANCELED == qdf_status) { - /* - * ERROR is returned when either the SME scan request - * failed or ACS is overridden due to other constrainst - * So send selected channel to HDD - */ - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Scan Req Failed/ACS Overridden")); - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - FL("Selected channel = %d"), - sap_context->channel); - if (sap_context->isScanSessionOpen == eSAP_TRUE) { - /* ACS scan not needed so close session */ - tHalHandle h_hal = CDS_GET_HAL_CB( - sap_context->p_cds_gctx); - if (h_hal == NULL) - return QDF_STATUS_E_FAILURE; - - if (sme_close_session(h_hal, - sap_context->sessionId, NULL, NULL) == - QDF_STATUS_SUCCESS) - sap_context->isScanSessionOpen = - eSAP_FALSE; - else - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_ERROR, - "ACS Scan Session close fail"); - sap_context->sessionId = 0xff; - } + return QDF_STATUS_E_FAILURE; + } else if (QDF_STATUS_E_CANCELED == qdf_status) { + /* + * ERROR is returned when either the SME scan request + * failed or ACS is overridden due to other constrainst + * So send selected channel to HDD + */ + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Scan Req Failed/ACS Overridden")); + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + FL("Selected channel = %d"), + sap_context->channel); - return sap_signal_hdd_event(sap_context, NULL, - eSAP_ACS_CHANNEL_SELECTED, - (void *) eSAP_STATUS_SUCCESS); - } else if (QDF_STATUS_SUCCESS == qdf_status) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + return sap_signal_hdd_event(sap_context, NULL, + eSAP_ACS_CHANNEL_SELECTED, + (void *) eSAP_STATUS_SUCCESS); + } else if (QDF_STATUS_SUCCESS == qdf_status) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, FL("Successfully Issued a Pre Start Bss Scan Request")); - } } return qdf_status; } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index d393a0fa7546..7c435503aac1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -5640,17 +5640,18 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback, tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: type=%d, subType=%d", __func__, type, subType); + "%s: type=%d, subType=%d addr:%pM", + __func__, type, subType, pSelfMacAddr); if (NULL == pbSessionId) { status = QDF_STATUS_E_INVAL; } else { status = sme_acquire_global_lock(&pMac->sme); if (QDF_IS_STATUS_SUCCESS(status)) { - status = - csr_roam_open_session(pMac, callback, pContext, - pSelfMacAddr, pbSessionId, type, - subType); + status = csr_roam_open_session(pMac, callback, pContext, + pSelfMacAddr, + pbSessionId, type, + subType); sme_release_global_lock(&pMac->sme); } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 94500ed91419..8a33e767cf55 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -14812,6 +14812,8 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac, *pbSessionId = CSR_SESSION_ID_INVALID; for (i = 0; i < pMac->sme.max_intf_count; i++) { + sms_log(pMac, LOG1, FL("session:%d active:%d"), i, + pMac->roam.roamSession[i].sessionActive); if (!CSR_IS_SESSION_VALID(pMac, i)) { pSession = CSR_GET_SESSION(pMac, i); if (!pSession) { diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index e80e1393e865..f0ba509ecbea 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -2663,7 +2663,9 @@ static void wma_add_bss_ap_mode(tp_wma_handle wma, tpAddBssParams add_bss) vdev = wma_find_vdev_by_addr(wma, add_bss->bssId, &vdev_id); if (!vdev) { - WMA_LOGE("%s: Failed to get vdev handle", __func__); + WMA_LOGE("%s: Failed to get vdev handle:"MAC_ADDRESS_STR, + __func__, MAC_ADDR_ARRAY(add_bss->bssId)); + goto send_fail_resp; } if (SAP_WPS_DISABLED == add_bss->wps_state) -- cgit v1.2.3 From faad20feb2d53948a0ac91ed6dcb55a4c08b78fa Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Tue, 12 Apr 2016 19:06:31 +0530 Subject: Release 5.1.0.5G Rebase of 5.0.0.165 onto 5.1.0.4G Change-Id: I7813c88803d912feea91609960bd6ed642fd05d7 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index f177d8d2317f..1a4bd75993f5 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 4 +#define QWLAN_VERSION_BUILD 5 -#define QWLAN_VERSIONSTR "5.1.0.4G" +#define QWLAN_VERSIONSTR "5.1.0.5G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 08abad6c0d6469ab0e034dd4c0b3f8a79052db88 Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Mon, 11 Apr 2016 23:41:47 -0700 Subject: qcacld-3.0: Cleanup proprietary and old stale lines qcacld-3.0: Cleanup proprietary and old stale lines Restrict build to msm8994,96,98,msmcobalt platform variants. Change-Id: Ic89ce4a786e884c24ab20ee201d9558f6cccc867 CRs-Fixed: 688141 --- Android.mk | 60 +++++------------------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) diff --git a/Android.mk b/Android.mk index ff889ef1c690..c0739ea6aa8b 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,7 @@ WLAN_CHIPSET := ifeq ($(BOARD_HAS_QCOM_WLAN), true) # Build/Package options for 8084/8092/8960/8992/8994 target -ifeq ($(call is-board-platform-in-list, apq8084 mpq8092 msm8960 msm8992 msm8994 msm8996 msm8998),true) +ifeq ($(call is-board-platform-in-list, msm8994 msm8996 msm8998 msmcobalt),true) WLAN_CHIPSET := qca_cld3 WLAN_SELECT := CONFIG_QCA_CLD_WLAN=m endif # platform @@ -20,11 +20,7 @@ LOCAL_PATH := $(call my-dir) ifneq ($(findstring vendor,$(LOCAL_PATH)),) ifneq ($(findstring opensource,$(LOCAL_PATH)),) - WLAN_PROPRIETARY := 0 WLAN_BLD_DIR := vendor/qcom/opensource/wlan -else - WLAN_PROPRIETARY := 1 - WLAN_BLD_DIR := vendor/qcom/proprietary/wlan-noship endif # opensource # DLKM_DIR was moved for JELLY_BEAN (PLATFORM_SDK 16) @@ -34,24 +30,14 @@ else DLKM_DIR := build/dlkm endif # platform-sdk-version -# Copy WCNSS_qcom_cfg.ini file from firmware_bin/ folder to target out directory. -ifeq ($(call is-board-platform-in-list, msm8960),true) -$(shell rm -f $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini) -$(shell cp $(LOCAL_PATH)/firmware_bin/WCNSS_qcom_cfg.ini $(TARGET_OUT_ETC)/firmware/wlan/qca_cld) -endif - # Build wlan.ko as $(WLAN_CHIPSET)_wlan.ko ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module -ifeq ($(WLAN_PROPRIETARY),1) - KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-new - KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn -else - KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 - KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn -endif # WLAN_PROPRIETARY +KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 +KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn + # We are actually building wlan.ko here, as per the # requirement we are specifying _wlan.ko as LOCAL_MODULE. # This means we need to rename the module to _wlan.ko @@ -61,11 +47,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(WLAN_SELECT) include $(CLEAR_VARS) -ifeq ($(WLAN_PROPRIETARY),1) - LOCAL_MODULE := proprietary_$(WLAN_CHIPSET)_wlan.ko -else - LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko -endif # WLAN_PROPRIETARY +LOCAL_MODULE := $(WLAN_CHIPSET)_wlan.ko LOCAL_MODULE_KBUILD_NAME := wlan.ko LOCAL_MODULE_TAGS := debug LOCAL_MODULE_DEBUG_ENABLE := true @@ -74,40 +56,8 @@ include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### # Create Symbolic link -ifeq ($(WLAN_PROPRIETARY),1) -$(shell mkdir -p $(TARGET_OUT)/lib/modules; \ - ln -sf /system/lib/modules/$(WLAN_CHIPSET)/$(LOCAL_MODULE) \ - $(TARGET_OUT)/lib/modules/wlan.ko) -endif $(shell ln -sf /persist/wlan_mac.bin $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin) -ifeq ($(call is-board-platform-in-list, msm8960),true) -$(shell ln -sf /firmware/image/bdwlan20.bin $(TARGET_OUT_ETC)/firmware/fakeboar.bin) -$(shell ln -sf /firmware/image/otp20.bin $(TARGET_OUT_ETC)/firmware/otp.bin) -$(shell ln -sf /firmware/image/utf20.bin $(TARGET_OUT_ETC)/firmware/utf.bin) -$(shell ln -sf /firmware/image/qwlan20.bin $(TARGET_OUT_ETC)/firmware/athwlan.bin) - -$(shell ln -sf /firmware/image/bdwlan20.bin $(TARGET_OUT_ETC)/firmware/bdwlan20.bin) -$(shell ln -sf /firmware/image/otp20.bin $(TARGET_OUT_ETC)/firmware/otp20.bin) -$(shell ln -sf /firmware/image/utf20.bin $(TARGET_OUT_ETC)/firmware/utf20.bin) -$(shell ln -sf /firmware/image/qwlan20.bin $(TARGET_OUT_ETC)/firmware/qwlan20.bin) - -$(shell ln -sf /firmware/image/bdwlan30.bin $(TARGET_OUT_ETC)/firmware/bdwlan30.bin) -$(shell ln -sf /firmware/image/otp30.bin $(TARGET_OUT_ETC)/firmware/otp30.bin) -$(shell ln -sf /firmware/image/utf30.bin $(TARGET_OUT_ETC)/firmware/utf30.bin) -$(shell ln -sf /firmware/image/qwlan30.bin $(TARGET_OUT_ETC)/firmware/qwlan30.bin) -endif - -# Copy config ini files to target -#ifeq ($(call is-board-platform-in-list, msm8992 msm8994),false) -ifeq ($(WLAN_PROPRIETARY),1) -$(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/$(WLAN_CHIPSET)) -$(shell mkdir -p $(TARGET_OUT)/etc/wifi) -$(shell rm -f $(TARGET_OUT)/etc/wifi/WCNSS_qcom_cfg.ini) -$(shell cp $(LOCAL_PATH)/config/WCNSS_qcom_cfg.ini $(TARGET_OUT)/etc/wifi) -endif -#endif - endif # DLKM check endif # supported target check -- cgit v1.2.3 From df1d46459b720ca2efa39d20b3bb48ef9efea9b4 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Wed, 13 Apr 2016 22:36:58 -0700 Subject: Release 5.1.0.5GG Intermediate release to address cleanup proprietary and old stale lines Change-Id: Ie68c7f85ca0694ae5b54feb18e3a666982714ebb CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 1a4bd75993f5..cebc96d22100 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "G" +#define QWLAN_VERSION_EXTRA "GG" #define QWLAN_VERSION_BUILD 5 -#define QWLAN_VERSIONSTR "5.1.0.5G" +#define QWLAN_VERSIONSTR "5.1.0.5GG" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 25a9578b3f3c8cb976e343ac083a86371f713883 Mon Sep 17 00:00:00 2001 From: Govind Singh Date: Wed, 13 Apr 2016 11:43:08 +0530 Subject: qcacld-3.0: Remove unused WMI layer code WMI layer is moved to converged repository. Remove unused WMI layer code from cld3.1 codebase. Change-Id: I6ca9d468ae9628f6b1d78a53917c9c67994e02dc CRs-Fixed: 987362 --- core/wmi/wmi_tlv_helper.c | 1190 ------------------------------- core/wmi/wmi_tlv_platform.c | 58 -- core/wmi/wmi_unified.c | 1422 -------------------------------------- core/wmi/wmi_unified_api.h | 180 ----- core/wmi/wmi_unified_priv.h | 100 --- core/wmi/wmi_version_whitelist.c | 38 - 6 files changed, 2988 deletions(-) delete mode 100644 core/wmi/wmi_tlv_helper.c delete mode 100644 core/wmi/wmi_tlv_platform.c delete mode 100644 core/wmi/wmi_unified.c delete mode 100644 core/wmi/wmi_unified_api.h delete mode 100644 core/wmi/wmi_unified_priv.h delete mode 100644 core/wmi/wmi_version_whitelist.c diff --git a/core/wmi/wmi_tlv_helper.c b/core/wmi/wmi_tlv_helper.c deleted file mode 100644 index f965f44b0131..000000000000 --- a/core/wmi/wmi_tlv_helper.c +++ /dev/null @@ -1,1190 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* wmi_tlv_platform.c file will be different for different components like Pronto firmware, Pronto windows host driver, - Pronto LA host driver because their memory management functions are different */ -#include "wmi_tlv_platform.c" -#include "wmi_tlv_defs.h" -#include "wmi_version.h" - -#define WMITLV_GET_ATTRIB_NUM_TLVS 0xFFFFFFFF - -#define WMITLV_GET_CMDID(val) (val & 0x00FFFFFF) -#define WMITLV_GET_NUM_TLVS(val) ((val >> 24) & 0xFF) - -#define WMITLV_GET_TAGID(val) (val & 0x00000FFF) -#define WMITLV_GET_TAG_STRUCT_SIZE(val) ((val >> 12) & 0x000001FF) -#define WMITLV_GET_TAG_ARRAY_SIZE(val) ((val >> 21) & 0x000001FF) -#define WMITLV_GET_TAG_VARIED(val) ((val >> 30) & 0x00000001) - -#define WMITLV_SET_ATTRB0(id) ((WMITLV_GET_TAG_NUM_TLV_ATTRIB(id) << 24) | (id & 0x00FFFFFF)) -#define WMITLV_SET_ATTRB1(tagID, tagStructSize, tagArraySize, tagVaried) (((tagVaried&0x1)<<30) | ((tagArraySize&0x1FF)<<21) | ((tagStructSize&0x1FF)<<12) | (tagID&0xFFF)) - -#define WMITLV_OP_SET_TLV_ATTRIB_macro(param_ptr, param_len, wmi_cmd_event_id, elem_tlv_tag, elem_struc_type, elem_name, var_len, arr_size) \ - WMITLV_SET_ATTRB1(elem_tlv_tag, sizeof(elem_struc_type), arr_size, var_len), - -#define WMITLV_GET_CMD_EVT_ATTRB_LIST(id) \ - WMITLV_SET_ATTRB0(id), \ - WMITLV_TABLE(id, SET_TLV_ATTRIB, NULL, 0) - -A_UINT32 cmd_attr_list[] = { - WMITLV_ALL_CMD_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) -}; - -A_UINT32 evt_attr_list[] = { - WMITLV_ALL_EVT_LIST(WMITLV_GET_CMD_EVT_ATTRB_LIST) -}; - -#ifdef NO_DYNAMIC_MEM_ALLOC -static wmitlv_cmd_param_info *g_wmi_static_cmd_param_info_buf; -A_UINT32 g_wmi_static_max_cmd_param_tlvs = 0; -#endif - -/* TLV helper routines */ - -/* - * WMI TLV Helper function to set the static cmd_param_tlv structure and number of TLVs that can be - * accomodated in the structure. This function should be used when dynamic memory allocation is not - * supported. - * - * When dynamic memory allocation is not supported by any component then NO_DYNAMIC_MEMALLOC - * macro has to be defined in respective tlv_platform.c file. And respective component has to allocate - * cmd_param_tlv structure buffer to accomodate whatever number of TLV's. Both the buffer address - * and number of TLV's that can be accomodated in the buffer should be sent as arguments to this function. - * - * Return None - */ -void -wmitlv_set_static_param_tlv_buf(void *param_tlv_buf, - A_UINT32 max_tlvs_accomodated) -{ -#ifdef NO_DYNAMIC_MEM_ALLOC - g_wmi_static_cmd_param_info_buf = param_tlv_buf; - g_wmi_static_max_cmd_param_tlvs = max_tlvs_accomodated; -#endif -} - -/* - * WMI TLV Helper functions to find the attributes of the Command/Event TLVs. - * Return 0 if success. Return >=1 if failure. - */ -A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id, - A_UINT32 curr_tlv_order, - wmitlv_attributes_struc *tlv_attr_ptr) -{ - A_UINT32 i, base_index, num_tlvs, num_entries; - A_UINT32 *pAttrArrayList; - - if (is_cmd_id) { - pAttrArrayList = &cmd_attr_list[0]; - num_entries = QDF_ARRAY_SIZE(cmd_attr_list); - } else { - pAttrArrayList = &evt_attr_list[0]; - num_entries = QDF_ARRAY_SIZE(evt_attr_list); - } - - for (i = 0; i < num_entries; i++) { - num_tlvs = WMITLV_GET_NUM_TLVS(pAttrArrayList[i]); - if (WMITLV_GET_CMDID(cmd_event_id) == - WMITLV_GET_CMDID(pAttrArrayList[i])) { - tlv_attr_ptr->cmd_num_tlv = num_tlvs; - /* Return success from here when only number of TLVS for this command/event is required */ - if (curr_tlv_order == WMITLV_GET_ATTRIB_NUM_TLVS) { - wmi_tlv_print_verbose - ("%s: WMI TLV attribute definitions for %s:0x%x found; num_of_tlvs:%d\n", - __func__, (is_cmd_id ? "Cmd" : "Evt"), - cmd_event_id, num_tlvs); - return 0; - } - - /* Return failure if tlv_order is more than the expected number of TLVs */ - if (curr_tlv_order >= num_tlvs) { - wmi_tlv_print_error - ("%s: ERROR: TLV order %d greater than num_of_tlvs:%d for %s:0x%x\n", - __func__, curr_tlv_order, num_tlvs, - (is_cmd_id ? "Cmd" : "Evt"), cmd_event_id); - return 1; - } - - base_index = i + 1; /* index to first TLV attributes */ - wmi_tlv_print_verbose - ("%s: WMI TLV attributes for %s:0x%x tlv[%d]:0x%x\n", - __func__, (is_cmd_id ? "Cmd" : "Evt"), - cmd_event_id, curr_tlv_order, - pAttrArrayList[(base_index + curr_tlv_order)]); - tlv_attr_ptr->tag_order = curr_tlv_order; - tlv_attr_ptr->tag_id = - WMITLV_GET_TAGID(pAttrArrayList - [(base_index + curr_tlv_order)]); - tlv_attr_ptr->tag_struct_size = - WMITLV_GET_TAG_STRUCT_SIZE(pAttrArrayList - [(base_index + - curr_tlv_order)]); - tlv_attr_ptr->tag_varied_size = - WMITLV_GET_TAG_VARIED(pAttrArrayList - [(base_index + - curr_tlv_order)]); - tlv_attr_ptr->tag_array_size = - WMITLV_GET_TAG_ARRAY_SIZE(pAttrArrayList - [(base_index + - curr_tlv_order)]); - return 0; - } - i += num_tlvs; - } - - wmi_tlv_print_error - ("%s: ERROR: Didn't found WMI TLV attribute definitions for %s:0x%x\n", - __func__, (is_cmd_id ? "Cmd" : "Evt"), cmd_event_id); - return 1; -} - -/* - * Helper Function to vaidate the prepared TLV's for an WMI event/command to be sent - * Return 0 if success. - * <0 if failure. - */ -static int -wmitlv_check_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 is_cmd_id, - A_UINT32 wmi_cmd_event_id) -{ - wmitlv_attributes_struc attr_struct_ptr; - A_UINT32 buf_idx = 0; - A_UINT32 ret = -1; - A_UINT32 tlv_index = 0; - A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; - A_UINT32 expected_num_tlvs, expected_tlv_len; - - /* Get the number of TLVs for this command/event */ - if (wmitlv_get_attributes - (is_cmd_id, wmi_cmd_event_id, WMITLV_GET_ATTRIB_NUM_TLVS, - &attr_struct_ptr) != 0) { - wmi_tlv_print_error - ("%s: ERROR: Couldn't get expected number of TLVs for Cmd=%d\n", - __func__, wmi_cmd_event_id); - goto Error_wmitlv_check_tlv_params; - } - - /* NOTE: the returned number of TLVs is in "attr_struct_ptr.cmd_num_tlv" */ - - expected_num_tlvs = attr_struct_ptr.cmd_num_tlv; - - while ((buf_idx + WMI_TLV_HDR_SIZE) <= param_buf_len) { - A_UINT32 curr_tlv_tag = - WMITLV_GET_TLVTAG(WMITLV_GET_HDR(buf_ptr)); - A_UINT32 curr_tlv_len = - WMITLV_GET_TLVLEN(WMITLV_GET_HDR(buf_ptr)); - - if ((buf_idx + WMI_TLV_HDR_SIZE + curr_tlv_len) > param_buf_len) { - wmi_tlv_print_error - ("%s: ERROR: Invalid TLV length for Cmd=%d Tag_order=%d buf_idx=%d Tag:%d Len:%d TotalLen:%d\n", - __func__, wmi_cmd_event_id, tlv_index, buf_idx, - curr_tlv_tag, curr_tlv_len, param_buf_len); - goto Error_wmitlv_check_tlv_params; - } - - /* Get the attributes of the TLV with the given order in "tlv_index" */ - wmi_tlv_OS_MEMZERO(&attr_struct_ptr, - sizeof(wmitlv_attributes_struc)); - if (wmitlv_get_attributes - (is_cmd_id, wmi_cmd_event_id, tlv_index, - &attr_struct_ptr) != 0) { - wmi_tlv_print_error - ("%s: ERROR: No TLV attributes found for Cmd=%d Tag_order=%d\n", - __func__, wmi_cmd_event_id, tlv_index); - goto Error_wmitlv_check_tlv_params; - } - - /* Found the TLV that we wanted */ - wmi_tlv_print_verbose("%s: [tlv %d]: tag=%d, len=%d\n", - __func__, tlv_index, curr_tlv_tag, - curr_tlv_len); - - /* Validating Tag ID order */ - if (curr_tlv_tag != attr_struct_ptr.tag_id) { - wmi_tlv_print_error - ("%s: ERROR: TLV has wrong tag in order for Cmd=0x%x. Given=%d, Expected=%d.\n", - __func__, wmi_cmd_event_id, curr_tlv_tag, - attr_struct_ptr.tag_id); - goto Error_wmitlv_check_tlv_params; - } - - /* Validate Tag length */ - /* Array TLVs length checking needs special handling */ - if ((curr_tlv_tag >= WMITLV_TAG_FIRST_ARRAY_ENUM) - && (curr_tlv_tag <= WMITLV_TAG_LAST_ARRAY_ENUM)) { - if (attr_struct_ptr.tag_varied_size == WMITLV_SIZE_FIX) { - /* Array size can't be invalid for fixed size Array TLV */ - if (WMITLV_ARR_SIZE_INVALID == - attr_struct_ptr.tag_array_size) { - wmi_tlv_print_error - ("%s: ERROR: array_size can't be invalid for Array TLV Cmd=0x%x Tag=%d\n", - __func__, wmi_cmd_event_id, - curr_tlv_tag); - goto Error_wmitlv_check_tlv_params; - } - - expected_tlv_len = - attr_struct_ptr.tag_array_size * - attr_struct_ptr.tag_struct_size; - /* Paddding is only required for Byte array Tlvs all other array tlv's should be aligned to 4 bytes during their definition */ - if (WMITLV_TAG_ARRAY_BYTE == - attr_struct_ptr.tag_id) { - expected_tlv_len = - roundup(expected_tlv_len, - sizeof(A_UINT32)); - } - - if (curr_tlv_len != expected_tlv_len) { - wmi_tlv_print_error - ("%s: ERROR: TLV has wrong length for Cmd=0x%x. Tag_order=%d Tag=%d, Given_Len:%d Expected_Len=%d.\n", - __func__, wmi_cmd_event_id, - tlv_index, curr_tlv_tag, - curr_tlv_len, expected_tlv_len); - goto Error_wmitlv_check_tlv_params; - } - } else { - /* Array size should be invalid for variable size Array TLV */ - if (WMITLV_ARR_SIZE_INVALID != - attr_struct_ptr.tag_array_size) { - wmi_tlv_print_error - ("%s: ERROR: array_size should be invalid for Array TLV Cmd=0x%x Tag=%d\n", - __func__, wmi_cmd_event_id, - curr_tlv_tag); - goto Error_wmitlv_check_tlv_params; - } - - /* Incase of variable length TLV's, there is no expectation on the length field so do whatever checking - you can depending on the TLV tag if TLV length is non-zero */ - if (curr_tlv_len != 0) { - /* Verify TLV length is aligned to the size of structure */ - if ((curr_tlv_len % - attr_struct_ptr.tag_struct_size) != - 0) { - wmi_tlv_print_error - ("%s: ERROR: TLV length %d for Cmd=0x%x is not aligned to size of structure(%d bytes)\n", - __func__, curr_tlv_len, - wmi_cmd_event_id, - attr_struct_ptr. - tag_struct_size); - goto Error_wmitlv_check_tlv_params; - } - - if (curr_tlv_tag == - WMITLV_TAG_ARRAY_STRUC) { - A_UINT8 *tlv_buf_ptr = NULL; - A_UINT32 in_tlv_len; - A_UINT32 idx; - A_UINT32 num_of_elems; - - /* Verify length of inner TLVs */ - - num_of_elems = - curr_tlv_len / - attr_struct_ptr. - tag_struct_size; - /* Set tlv_buf_ptr to the first inner TLV address */ - tlv_buf_ptr = - buf_ptr + WMI_TLV_HDR_SIZE; - for (idx = 0; - idx < num_of_elems; - idx++) { - in_tlv_len = - WMITLV_GET_TLVLEN - (WMITLV_GET_HDR - (tlv_buf_ptr)); - if ((in_tlv_len + - WMI_TLV_HDR_SIZE) - != - attr_struct_ptr. - tag_struct_size) { - wmi_tlv_print_error - ("%s: ERROR: TLV has wrong length for Cmd=0x%x. Tag_order=%d Tag=%d, Given_Len:%zu Expected_Len=%d.\n", - __func__, - wmi_cmd_event_id, - tlv_index, - curr_tlv_tag, - (in_tlv_len - + - WMI_TLV_HDR_SIZE), - attr_struct_ptr. - tag_struct_size); - goto Error_wmitlv_check_tlv_params; - } - tlv_buf_ptr += - in_tlv_len + - WMI_TLV_HDR_SIZE; - } - } else - if ((curr_tlv_tag == - WMITLV_TAG_ARRAY_UINT32) - || (curr_tlv_tag == - WMITLV_TAG_ARRAY_BYTE) - || (curr_tlv_tag == - WMITLV_TAG_ARRAY_FIXED_STRUC)) { - /* Nothing to verify here */ - } else { - wmi_tlv_print_error - ("%s ERROR Need to handle the Array tlv %d for variable length for Cmd=0x%x\n", - __func__, - attr_struct_ptr.tag_id, - wmi_cmd_event_id); - goto Error_wmitlv_check_tlv_params; - } - } - } - } else { - /* Non-array TLV. */ - - if ((curr_tlv_len + WMI_TLV_HDR_SIZE) != - attr_struct_ptr.tag_struct_size) { - wmi_tlv_print_error - ("%s: ERROR: TLV has wrong length for Cmd=0x%x. Given=%zu, Expected=%d.\n", - __func__, wmi_cmd_event_id, - (curr_tlv_len + WMI_TLV_HDR_SIZE), - attr_struct_ptr.tag_struct_size); - goto Error_wmitlv_check_tlv_params; - } - } - - /* Check TLV length is aligned to 4 bytes or not */ - if ((curr_tlv_len % sizeof(A_UINT32)) != 0) { - wmi_tlv_print_error - ("%s: ERROR: TLV length %d for Cmd=0x%x is not aligned to %zu bytes\n", - __func__, curr_tlv_len, wmi_cmd_event_id, - sizeof(A_UINT32)); - goto Error_wmitlv_check_tlv_params; - } - - tlv_index++; - buf_ptr += curr_tlv_len + WMI_TLV_HDR_SIZE; - buf_idx += curr_tlv_len + WMI_TLV_HDR_SIZE; - } - - if (tlv_index != expected_num_tlvs) { - wmi_tlv_print_verbose - ("%s: INFO: Less number of TLVs filled for Cmd=0x%x Filled %d Expected=%d\n", - __func__, wmi_cmd_event_id, tlv_index, expected_num_tlvs); - } - - return 0; -Error_wmitlv_check_tlv_params: - return ret; -} - -/* - * Helper Function to vaidate the prepared TLV's for an WMI event to be sent - * Return 0 if success. - * <0 if failure. - */ -int -wmitlv_check_event_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 wmi_cmd_event_id) -{ - A_UINT32 is_cmd_id = 0; - return wmitlv_check_tlv_params - (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id); -} - -/* - * Helper Function to vaidate the prepared TLV's for an WMI command to be sent - * Return 0 if success. - * <0 if failure. - */ -int -wmitlv_check_command_tlv_params(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id) -{ - A_UINT32 is_cmd_id = 1; - return wmitlv_check_tlv_params - (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id); -} - -/* - * Helper Function to vaidate the TLV's coming for an event/command and also pads data to TLV's if necessary - * Return 0 if success. - * <0 if failure. - */ -static int -wmitlv_check_and_pad_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, A_UINT32 is_cmd_id, - A_UINT32 wmi_cmd_event_id, void **wmi_cmd_struct_ptr) -{ - wmitlv_attributes_struc attr_struct_ptr; - A_UINT32 buf_idx = 0; - A_UINT32 ret = -1; - A_UINT32 tlv_index = 0; - A_UINT32 num_of_elems = 0; - int tlv_size_diff = 0; - A_UINT8 *buf_ptr = (unsigned char *)param_struc_ptr; - wmitlv_cmd_param_info *cmd_param_tlvs_ptr = NULL; - A_UINT32 remaining_expected_tlvs = 0xFFFFFFFF; - A_UINT32 len_wmi_cmd_struct_buf; - - /* Get the number of TLVs for this command/event */ - if (wmitlv_get_attributes - (is_cmd_id, wmi_cmd_event_id, WMITLV_GET_ATTRIB_NUM_TLVS, - &attr_struct_ptr) != 0) { - wmi_tlv_print_error - ("%s: ERROR: Couldn't get expected number of TLVs for Cmd=%d\n", - __func__, wmi_cmd_event_id); - return -1; - } - /* NOTE: the returned number of TLVs is in "attr_struct_ptr.cmd_num_tlv" */ - - /* Create base structure of format wmi_cmd_event_id##_param_tlvs */ - len_wmi_cmd_struct_buf = - attr_struct_ptr.cmd_num_tlv * sizeof(wmitlv_cmd_param_info); -#ifndef NO_DYNAMIC_MEM_ALLOC - /* Dynamic memory allocation supported */ - wmi_tlv_os_mem_alloc(os_handle, *wmi_cmd_struct_ptr, - len_wmi_cmd_struct_buf); -#else - /* Dynamic memory allocation is not supported. Use the buffer g_wmi_static_cmd_param_info_buf, which should be set using wmi_tlv_set_static_param_tlv_buf(), - for base structure of format wmi_cmd_event_id##_param_tlvs */ - *wmi_cmd_struct_ptr = g_wmi_static_cmd_param_info_buf; - if (attr_struct_ptr.cmd_num_tlv > g_wmi_static_max_cmd_param_tlvs) { - /* Error: Expecting more TLVs that accomodated for static structure */ - wmi_tlv_print_error - ("%s: Error: Expecting more TLVs that accomodated for static structure. Expected:%d Accomodated:%d\n", - __func__, attr_struct_ptr.cmd_num_tlv, - g_wmi_static_max_cmd_param_tlvs); - return -1; - } -#endif - if (*wmi_cmd_struct_ptr == NULL) { - /* Error: unable to alloc memory */ - wmi_tlv_print_error - ("%s: Error: unable to alloc memory (size=%d) for TLV\n", - __func__, len_wmi_cmd_struct_buf); - return -1; - } - - cmd_param_tlvs_ptr = (wmitlv_cmd_param_info *) *wmi_cmd_struct_ptr; - wmi_tlv_OS_MEMZERO(cmd_param_tlvs_ptr, len_wmi_cmd_struct_buf); - remaining_expected_tlvs = attr_struct_ptr.cmd_num_tlv; - - while (((buf_idx + WMI_TLV_HDR_SIZE) <= param_buf_len) - && (remaining_expected_tlvs)) { - A_UINT32 curr_tlv_tag = - WMITLV_GET_TLVTAG(WMITLV_GET_HDR(buf_ptr)); - A_UINT32 curr_tlv_len = - WMITLV_GET_TLVLEN(WMITLV_GET_HDR(buf_ptr)); - int num_padding_bytes = 0; - - /* Get the attributes of the TLV with the given order in "tlv_index" */ - wmi_tlv_OS_MEMZERO(&attr_struct_ptr, - sizeof(wmitlv_attributes_struc)); - if (wmitlv_get_attributes - (is_cmd_id, wmi_cmd_event_id, tlv_index, - &attr_struct_ptr) != 0) { - wmi_tlv_print_error - ("%s: ERROR: No TLV attributes found for Cmd=%d Tag_order=%d\n", - __func__, wmi_cmd_event_id, tlv_index); - goto Error_wmitlv_check_and_pad_tlvs; - } - - /* Found the TLV that we wanted */ - wmi_tlv_print_verbose("%s: [tlv %d]: tag=%d, len=%d\n", - __func__, tlv_index, curr_tlv_tag, - curr_tlv_len); - - /* Validating Tag order */ - if (curr_tlv_tag != attr_struct_ptr.tag_id) { - wmi_tlv_print_error - ("%s: ERROR: TLV has wrong tag in order for Cmd=0x%x. Given=%d, Expected=%d.\n", - __func__, wmi_cmd_event_id, curr_tlv_tag, - attr_struct_ptr.tag_id); - goto Error_wmitlv_check_and_pad_tlvs; - } - - if ((curr_tlv_tag >= WMITLV_TAG_FIRST_ARRAY_ENUM) - && (curr_tlv_tag <= WMITLV_TAG_LAST_ARRAY_ENUM)) { - /* Current Tag is an array of some kind. */ - /* Skip the TLV header of this array */ - buf_ptr += WMI_TLV_HDR_SIZE; - buf_idx += WMI_TLV_HDR_SIZE; - } else { - /* Non-array TLV. */ - curr_tlv_len += WMI_TLV_HDR_SIZE; - } - - if (attr_struct_ptr.tag_varied_size == WMITLV_SIZE_FIX) { - /* This TLV is fixed length */ - if (WMITLV_ARR_SIZE_INVALID == - attr_struct_ptr.tag_array_size) { - tlv_size_diff = - curr_tlv_len - - attr_struct_ptr.tag_struct_size; - num_of_elems = - (curr_tlv_len > WMI_TLV_HDR_SIZE) ? 1 : 0; - } else { - tlv_size_diff = - curr_tlv_len - - (attr_struct_ptr.tag_struct_size * - attr_struct_ptr.tag_array_size); - num_of_elems = attr_struct_ptr.tag_array_size; - } - } else { - /* This TLV has a variable number of elements */ - if (WMITLV_TAG_ARRAY_STRUC == attr_struct_ptr.tag_id) { - A_UINT32 in_tlv_len = 0; - - if (curr_tlv_len != 0) { - in_tlv_len = - WMITLV_GET_TLVLEN(WMITLV_GET_HDR - (buf_ptr)); - in_tlv_len += WMI_TLV_HDR_SIZE; - tlv_size_diff = - in_tlv_len - - attr_struct_ptr.tag_struct_size; - num_of_elems = - curr_tlv_len / in_tlv_len; - wmi_tlv_print_verbose - ("%s: WARN: TLV array of structures in_tlv_len=%d struct_size:%d diff:%d num_of_elems=%d \n", - __func__, in_tlv_len, - attr_struct_ptr.tag_struct_size, - tlv_size_diff, num_of_elems); - } else { - tlv_size_diff = 0; - num_of_elems = 0; - } - } else - if ((WMITLV_TAG_ARRAY_UINT32 == - attr_struct_ptr.tag_id) - || (WMITLV_TAG_ARRAY_BYTE == - attr_struct_ptr.tag_id) - || (WMITLV_TAG_ARRAY_FIXED_STRUC == - attr_struct_ptr.tag_id)) { - tlv_size_diff = 0; - num_of_elems = - curr_tlv_len / - attr_struct_ptr.tag_struct_size; - } else { - wmi_tlv_print_error - ("%s ERROR Need to handle this tag ID for variable length %d\n", - __func__, attr_struct_ptr.tag_id); - goto Error_wmitlv_check_and_pad_tlvs; - } - } - - if ((WMITLV_TAG_ARRAY_STRUC == attr_struct_ptr.tag_id) && - (tlv_size_diff != 0)) { - void *new_tlv_buf = NULL; - A_UINT8 *tlv_buf_ptr = NULL; - A_UINT32 in_tlv_len; - A_UINT32 i; - - if (attr_struct_ptr.tag_varied_size == WMITLV_SIZE_FIX) { - /* This is not allowed. The tag WMITLV_TAG_ARRAY_STRUC can only be used with variable-length structure array - should not have a fixed number of elements (contradicting). Use WMITLV_TAG_ARRAY_FIXED_STRUC tag for - fixed size structure array(where structure never change without breaking compatibility) */ - wmi_tlv_print_error - ("%s: ERROR: TLV (tag=%d) should be variable-length and not fixed length\n", - __func__, curr_tlv_tag); - goto Error_wmitlv_check_and_pad_tlvs; - } - - /* Warning: Needs to allocate a larger structure and pad with zeros */ - wmi_tlv_print_error - ("%s: WARN: TLV array of structures needs padding. tlv_size_diff=%d\n", - __func__, tlv_size_diff); - - /* incoming structure length */ - in_tlv_len = - WMITLV_GET_TLVLEN(WMITLV_GET_HDR(buf_ptr)) + - WMI_TLV_HDR_SIZE; -#ifndef NO_DYNAMIC_MEM_ALLOC - wmi_tlv_os_mem_alloc(os_handle, new_tlv_buf, - (num_of_elems * - attr_struct_ptr.tag_struct_size)); - if (new_tlv_buf == NULL) { - /* Error: unable to alloc memory */ - wmi_tlv_print_error - ("%s: Error: unable to alloc memory (size=%d) for padding the TLV array %d\n", - __func__, - (num_of_elems * - attr_struct_ptr.tag_struct_size), - curr_tlv_tag); - goto Error_wmitlv_check_and_pad_tlvs; - } - - wmi_tlv_OS_MEMZERO(new_tlv_buf, - (num_of_elems * - attr_struct_ptr.tag_struct_size)); - tlv_buf_ptr = (A_UINT8 *) new_tlv_buf; - for (i = 0; i < num_of_elems; i++) { - if (tlv_size_diff > 0) { - /* Incoming structure size is greater than expected structure size. - so copy the number of bytes equal to expected structure size */ - wmi_tlv_OS_MEMCPY(tlv_buf_ptr, - (void *)(buf_ptr + - i * - in_tlv_len), - attr_struct_ptr. - tag_struct_size); - } else { - /* Incoming structure size is smaller than expected structure size. - so copy the number of bytes equal to incoming structure size - (other bytes would be zeroes) */ - wmi_tlv_OS_MEMCPY(tlv_buf_ptr, - (void *)(buf_ptr + - i * - in_tlv_len), - in_tlv_len); - } - tlv_buf_ptr += attr_struct_ptr.tag_struct_size; - } -#else - { - A_UINT8 *src_addr; - A_UINT8 *dst_addr; - A_UINT32 buf_mov_len; - - if (tlv_size_diff < 0) { - /* Incoming structure size is smaller than expected size then this needs padding for each element in the array */ - - /* Find amount of bytes to be padded for one element */ - num_padding_bytes = tlv_size_diff * -1; - - /* Move subsequent TLVs by number of bytes to be padded for all elements */ - if (param_buf_len > - (buf_idx + curr_tlv_len)) { - src_addr = - buf_ptr + curr_tlv_len; - dst_addr = - buf_ptr + curr_tlv_len + - (num_padding_bytes * - num_of_elems); - buf_mov_len = - param_buf_len - (buf_idx + - curr_tlv_len); - - wmi_tlv_OS_MEMMOVE(dst_addr, - src_addr, - buf_mov_len); - } - - /* Move subsequent elements of array down by number of bytes to be padded for one element and alse set padding bytes to zero */ - tlv_buf_ptr = buf_ptr; - for (i = 0; i < num_of_elems; i++) { - src_addr = - tlv_buf_ptr + in_tlv_len; - if (i != (num_of_elems - 1)) { - /* Need not move anything for last element in the array */ - dst_addr = - tlv_buf_ptr + - in_tlv_len + - num_padding_bytes; - buf_mov_len = - curr_tlv_len - - ((i + - 1) * in_tlv_len); - - wmi_tlv_OS_MEMMOVE - (dst_addr, src_addr, - buf_mov_len); - } - - /* Set the padding bytes to zeroes */ - wmi_tlv_OS_MEMZERO(src_addr, - num_padding_bytes); - - tlv_buf_ptr += - attr_struct_ptr. - tag_struct_size; - } - - /* Update the number of padding bytes to total number of bytes padded for all elements in the array */ - num_padding_bytes = - num_padding_bytes * num_of_elems; - - new_tlv_buf = buf_ptr; - } else { - /* Incoming structure size is greater than expected size then this needs shrinking for each element in the array */ - - /* Find amount of bytes to be shrinked for one element */ - num_padding_bytes = tlv_size_diff * -1; - - /* Move subsequent elements of array up by number of bytes to be shrinked for one element */ - tlv_buf_ptr = buf_ptr; - for (i = 0; i < (num_of_elems - 1); i++) { - src_addr = - tlv_buf_ptr + in_tlv_len; - dst_addr = - tlv_buf_ptr + in_tlv_len + - num_padding_bytes; - buf_mov_len = - curr_tlv_len - - ((i + 1) * in_tlv_len); - - wmi_tlv_OS_MEMMOVE(dst_addr, - src_addr, - buf_mov_len); - - tlv_buf_ptr += - attr_struct_ptr. - tag_struct_size; - } - - /* Move subsequent TLVs by number of bytes to be shrinked for all elements */ - if (param_buf_len > - (buf_idx + curr_tlv_len)) { - src_addr = - buf_ptr + curr_tlv_len; - dst_addr = - buf_ptr + curr_tlv_len + - (num_padding_bytes * - num_of_elems); - buf_mov_len = - param_buf_len - (buf_idx + - curr_tlv_len); - - wmi_tlv_OS_MEMMOVE(dst_addr, - src_addr, - buf_mov_len); - } - - /* Update the number of padding bytes to total number of bytes shrinked for all elements in the array */ - num_padding_bytes = - num_padding_bytes * num_of_elems; - - new_tlv_buf = buf_ptr; - } - } -#endif - cmd_param_tlvs_ptr[tlv_index].tlv_ptr = new_tlv_buf; - cmd_param_tlvs_ptr[tlv_index].num_elements = - num_of_elems; - cmd_param_tlvs_ptr[tlv_index].buf_is_allocated = 1; /* Indicates that buffer is allocated */ - - } else if (tlv_size_diff >= 0) { - /* Warning: some parameter truncation */ - if (tlv_size_diff > 0) { - wmi_tlv_print_verbose - ("%s: WARN: TLV truncated. tlv_size_diff=%d, curr_tlv_len=%d\n", - __func__, tlv_size_diff, curr_tlv_len); - } - /* TODO: this next line needs more comments and explanation */ - cmd_param_tlvs_ptr[tlv_index].tlv_ptr = - (attr_struct_ptr.tag_varied_size - && !curr_tlv_len) ? NULL : (void *)buf_ptr; - cmd_param_tlvs_ptr[tlv_index].num_elements = - num_of_elems; - cmd_param_tlvs_ptr[tlv_index].buf_is_allocated = 0; /* Indicates that buffer is not allocated */ - } else { - void *new_tlv_buf = NULL; - - /* Warning: Needs to allocate a larger structure and pad with zeros */ - wmi_tlv_print_verbose - ("%s: WARN: TLV needs padding. tlv_size_diff=%d\n", - __func__, tlv_size_diff); -#ifndef NO_DYNAMIC_MEM_ALLOC - /* Dynamic memory allocation is supported */ - wmi_tlv_os_mem_alloc(os_handle, new_tlv_buf, - (curr_tlv_len - tlv_size_diff)); - if (new_tlv_buf == NULL) { - /* Error: unable to alloc memory */ - wmi_tlv_print_error - ("%s: Error: unable to alloc memory (size=%d) for padding the TLV %d\n", - __func__, (curr_tlv_len - tlv_size_diff), - curr_tlv_tag); - goto Error_wmitlv_check_and_pad_tlvs; - } - - wmi_tlv_OS_MEMZERO(new_tlv_buf, - (curr_tlv_len - tlv_size_diff)); - wmi_tlv_OS_MEMCPY(new_tlv_buf, (void *)buf_ptr, - curr_tlv_len); -#else - /* Dynamic memory allocation is not supported. Padding has to be done with in the existing buffer assuming we have enough space - to grow */ - { - /* Note: tlv_size_diff is a value less than zero */ - /* Move the Subsequent TLVs by amount of bytes needs to be padded */ - A_UINT8 *src_addr; - A_UINT8 *dst_addr; - A_UINT32 src_len; - - num_padding_bytes = (tlv_size_diff * -1); - - src_addr = buf_ptr + curr_tlv_len; - dst_addr = - buf_ptr + curr_tlv_len + num_padding_bytes; - src_len = - param_buf_len - (buf_idx + curr_tlv_len); - - wmi_tlv_OS_MEMMOVE(dst_addr, src_addr, src_len); - - /* Set the padding bytes to zeroes */ - wmi_tlv_OS_MEMZERO(src_addr, num_padding_bytes); - - new_tlv_buf = buf_ptr; - } -#endif - cmd_param_tlvs_ptr[tlv_index].tlv_ptr = new_tlv_buf; - cmd_param_tlvs_ptr[tlv_index].num_elements = - num_of_elems; - cmd_param_tlvs_ptr[tlv_index].buf_is_allocated = 1; /* Indicates that buffer is allocated */ - } - - tlv_index++; - remaining_expected_tlvs--; - buf_ptr += curr_tlv_len + num_padding_bytes; - buf_idx += curr_tlv_len + num_padding_bytes; - } - - return 0; -Error_wmitlv_check_and_pad_tlvs: - if (is_cmd_id) { - wmitlv_free_allocated_command_tlvs(wmi_cmd_event_id, - wmi_cmd_struct_ptr); - } else { - wmitlv_free_allocated_event_tlvs(wmi_cmd_event_id, - wmi_cmd_struct_ptr); - } - *wmi_cmd_struct_ptr = NULL; - return ret; -} - -/* - * Helper Function to validate and pad(if necessary) for incoming WMI Event TLVs - * Return 0 if success. - * <0 if failure. - */ -int -wmitlv_check_and_pad_event_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id, - void **wmi_cmd_struct_ptr) -{ - A_UINT32 is_cmd_id = 0; - return wmitlv_check_and_pad_tlvs - (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr); -} - -/* - * Helper Function to validate and pad(if necessary) for incoming WMI Command TLVs - * Return 0 if success. - * <0 if failure. - */ -int -wmitlv_check_and_pad_command_tlvs(void *os_handle, void *param_struc_ptr, - A_UINT32 param_buf_len, - A_UINT32 wmi_cmd_event_id, - void **wmi_cmd_struct_ptr) -{ - A_UINT32 is_cmd_id = 1; - return wmitlv_check_and_pad_tlvs - (os_handle, param_struc_ptr, param_buf_len, is_cmd_id, - wmi_cmd_event_id, wmi_cmd_struct_ptr); -} - -/* - * Helper Function to free any allocated buffers for WMI Event/Command TLV processing - * Return None - */ -static void wmitlv_free_allocated_tlvs(A_UINT32 is_cmd_id, - A_UINT32 cmd_event_id, - void **wmi_cmd_struct_ptr) -{ - void *ptr = *wmi_cmd_struct_ptr; - - if (!ptr) { - wmi_tlv_print_error("%s: Nothing to free for CMD/Event 0x%x\n", - __func__, cmd_event_id); - return; - } -#ifndef NO_DYNAMIC_MEM_ALLOC - -/* macro to free that previously allocated memory for this TLV. When (op==FREE_TLV_ELEM). */ -#define WMITLV_OP_FREE_TLV_ELEM_macro(param_ptr, param_len, wmi_cmd_event_id, elem_tlv_tag, elem_struc_type, elem_name, var_len, arr_size) \ - if ((((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->WMITLV_FIELD_BUF_IS_ALLOCATED(elem_name)) && \ - (((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name != NULL)) { \ - wmi_tlv_os_mem_free(((WMITLV_TYPEDEF_STRUCT_PARAMS_TLVS(wmi_cmd_event_id)*)ptr)->elem_name); \ - } - -#define WMITLV_FREE_TLV_ELEMS(id) \ -case id: \ -{ \ - WMITLV_TABLE(id, FREE_TLV_ELEM, NULL, 0) \ -} \ -break; - - if (is_cmd_id) { - switch (cmd_event_id) { - WMITLV_ALL_CMD_LIST(WMITLV_FREE_TLV_ELEMS); - default: - wmi_tlv_print_error - ("%s: ERROR: Cannot find the TLVs attributes for Cmd=0x%x, %d\n", - __func__, cmd_event_id, cmd_event_id); - } - } else { - switch (cmd_event_id) { - WMITLV_ALL_EVT_LIST(WMITLV_FREE_TLV_ELEMS); - default: - wmi_tlv_print_error - ("%s: ERROR: Cannot find the TLVs attributes for Cmd=0x%x, %d\n", - __func__, cmd_event_id, cmd_event_id); - } - } - - wmi_tlv_os_mem_free(*wmi_cmd_struct_ptr); - *wmi_cmd_struct_ptr = NULL; -#endif - - return; -} - -/* - * Helper Function to free any allocated buffers for WMI Command TLV processing - * Return None - */ -void wmitlv_free_allocated_command_tlvs(A_UINT32 cmd_event_id, - void **wmi_cmd_struct_ptr) -{ - wmitlv_free_allocated_tlvs(1, cmd_event_id, wmi_cmd_struct_ptr); -} - -/* - * Helper Function to free any allocated buffers for WMI Event TLV processing - * Return None - */ -void wmitlv_free_allocated_event_tlvs(A_UINT32 cmd_event_id, - void **wmi_cmd_struct_ptr) -{ - wmitlv_free_allocated_tlvs(0, cmd_event_id, wmi_cmd_struct_ptr); -} - -/* - * Returns 1 if the two given versions are compatible. - * Else return 0 if Incompatible. - */ -int -wmi_versions_are_compatible(wmi_abi_version *vers1, wmi_abi_version *vers2) -{ - if ((vers1->abi_version_ns_0 != vers2->abi_version_ns_0) || - (vers1->abi_version_ns_1 != vers2->abi_version_ns_1) || - (vers1->abi_version_ns_2 != vers2->abi_version_ns_2) || - (vers1->abi_version_ns_3 != vers2->abi_version_ns_3)) { - /* The namespaces are different. Incompatible. */ - return 0; - } - - if (vers1->abi_version_0 != vers2->abi_version_0) { - /* The major or minor versions are different. Incompatible */ - return 0; - } - /* We ignore the build version */ - return 1; -} - -/* - * Returns 1 if the two given versions are compatible. - * Else return 0 if Incompatible. - */ -int -wmi_versions_can_downgrade(int num_whitelist, - wmi_whitelist_version_info *version_whitelist_table, - wmi_abi_version *my_vers, - wmi_abi_version *opp_vers, - wmi_abi_version *out_vers) -{ - A_UINT8 can_try_to_downgrade; - A_UINT32 my_major_vers = WMI_VER_GET_MAJOR(my_vers->abi_version_0); - A_UINT32 my_minor_vers = WMI_VER_GET_MINOR(my_vers->abi_version_0); - A_UINT32 opp_major_vers = WMI_VER_GET_MAJOR(opp_vers->abi_version_0); - A_UINT32 opp_minor_vers = WMI_VER_GET_MINOR(opp_vers->abi_version_0); - A_UINT32 downgraded_minor_vers; - - if ((my_vers->abi_version_ns_0 != opp_vers->abi_version_ns_0) || - (my_vers->abi_version_ns_1 != opp_vers->abi_version_ns_1) || - (my_vers->abi_version_ns_2 != opp_vers->abi_version_ns_2) || - (my_vers->abi_version_ns_3 != opp_vers->abi_version_ns_3)) { - /* The namespaces are different. Incompatible. */ - can_try_to_downgrade = false; - } else if (my_major_vers != opp_major_vers) { - /* Major version is different. Incompatible and cannot downgrade. */ - can_try_to_downgrade = false; - } else { - /* Same major version. */ - - if (my_minor_vers < opp_minor_vers) { - /* Opposite party is newer. Incompatible and cannot downgrade. */ - can_try_to_downgrade = false; - } else if (my_minor_vers > opp_minor_vers) { - /* Opposite party is older. Check whitelist if we can downgrade */ - can_try_to_downgrade = true; - } else { - /* Same version */ - wmi_tlv_OS_MEMCPY(out_vers, my_vers, - sizeof(wmi_abi_version)); - return 1; - } - } - - if (!can_try_to_downgrade) { - wmi_tlv_print_error("%s: Warning: incompatible WMI version.\n", - __func__); - wmi_tlv_OS_MEMCPY(out_vers, my_vers, sizeof(wmi_abi_version)); - return 0; - } - /* Try to see we can downgrade the supported version */ - downgraded_minor_vers = my_minor_vers; - while (downgraded_minor_vers > opp_minor_vers) { - A_UINT8 downgraded = false; - int i; - - for (i = 0; i < num_whitelist; i++) { - if (version_whitelist_table[i].major != my_major_vers) { - continue; /* skip */ - } - if ((version_whitelist_table[i].namespace_0 != - my_vers->abi_version_ns_0) - || (version_whitelist_table[i].namespace_1 != - my_vers->abi_version_ns_1) - || (version_whitelist_table[i].namespace_2 != - my_vers->abi_version_ns_2) - || (version_whitelist_table[i].namespace_3 != - my_vers->abi_version_ns_3)) { - continue; /* skip */ - } - if (version_whitelist_table[i].minor == - downgraded_minor_vers) { - /* Found the next version that I can downgrade */ - wmi_tlv_print_error - ("%s: Note: found a whitelist entry to downgrade. wh. list ver: %d,%d,0x%x 0x%x 0x%x 0x%x\n", - __func__, version_whitelist_table[i].major, - version_whitelist_table[i].minor, - version_whitelist_table[i].namespace_0, - version_whitelist_table[i].namespace_1, - version_whitelist_table[i].namespace_2, - version_whitelist_table[i].namespace_3); - downgraded_minor_vers--; - downgraded = true; - break; - } - } - if (!downgraded) { - break; /* Done since we did not find any whitelist to downgrade version */ - } - } - wmi_tlv_OS_MEMCPY(out_vers, my_vers, sizeof(wmi_abi_version)); - out_vers->abi_version_0 = - WMI_VER_GET_VERSION_0(my_major_vers, downgraded_minor_vers); - if (downgraded_minor_vers != opp_minor_vers) { - wmi_tlv_print_error - ("%s: Warning: incompatible WMI version and cannot downgrade.\n", - __func__); - return 0; /* Incompatible */ - } else { - return 1; /* Compatible */ - } -} - -/* - * This routine will compare and set the WMI ABI version. - * First, compare my version with the opposite side's version. - * If incompatible, then check the whitelist to see if our side can downgrade. - * Finally, fill in the final ABI version into the output, out_vers. - * Return 0 if the output version is compatible . - * Else return 1 if the output version is incompatible. . - */ -int -wmi_cmp_and_set_abi_version(int num_whitelist, - wmi_whitelist_version_info * - version_whitelist_table, - struct _wmi_abi_version *my_vers, - struct _wmi_abi_version *opp_vers, - struct _wmi_abi_version *out_vers) -{ - wmi_tlv_print_verbose - ("%s: Our WMI Version: Mj=%d, Mn=%d, bd=%d, ns0=0x%x ns1:0x%x ns2:0x%x ns3:0x%x\n", - __func__, WMI_VER_GET_MAJOR(my_vers->abi_version_0), - WMI_VER_GET_MINOR(my_vers->abi_version_0), my_vers->abi_version_1, - my_vers->abi_version_ns_0, my_vers->abi_version_ns_1, - my_vers->abi_version_ns_2, my_vers->abi_version_ns_3); - - wmi_tlv_print_verbose - ("%s: Opposite side WMI Version: Mj=%d, Mn=%d, bd=%d, ns0=0x%x ns1:0x%x ns2:0x%x ns3:0x%x\n", - __func__, WMI_VER_GET_MAJOR(opp_vers->abi_version_0), - WMI_VER_GET_MINOR(opp_vers->abi_version_0), - opp_vers->abi_version_1, opp_vers->abi_version_ns_0, - opp_vers->abi_version_ns_1, opp_vers->abi_version_ns_2, - opp_vers->abi_version_ns_3); - - /* By default, the output version is our version. */ - wmi_tlv_OS_MEMCPY(out_vers, my_vers, sizeof(wmi_abi_version)); - if (!wmi_versions_are_compatible(my_vers, opp_vers)) { - /* Our host version and the given firmware version are incompatible. */ - if (wmi_versions_can_downgrade - (num_whitelist, version_whitelist_table, my_vers, opp_vers, - out_vers)) { - /* We can downgrade our host versions to match firmware. */ - wmi_tlv_print_error - ("%s: Host downgraded WMI Versions to match fw. Ret version: Mj=%d, Mn=%d, bd=%d, ns0=0x%x ns1:0x%x ns2:0x%x ns3:0x%x\n", - __func__, - WMI_VER_GET_MAJOR(out_vers->abi_version_0), - WMI_VER_GET_MINOR(out_vers->abi_version_0), - out_vers->abi_version_1, - out_vers->abi_version_ns_0, - out_vers->abi_version_ns_1, - out_vers->abi_version_ns_2, - out_vers->abi_version_ns_3); - return 0; /* Compatible */ - } else { - /* Warn: We cannot downgrade our host versions to match firmware. */ - wmi_tlv_print_error - ("%s: WARN: Host WMI Versions mismatch with fw. Ret version: Mj=%d, Mn=%d, bd=%d, ns0=0x%x ns1:0x%x ns2:0x%x ns3:0x%x\n", - __func__, - WMI_VER_GET_MAJOR(out_vers->abi_version_0), - WMI_VER_GET_MINOR(out_vers->abi_version_0), - out_vers->abi_version_1, - out_vers->abi_version_ns_0, - out_vers->abi_version_ns_1, - out_vers->abi_version_ns_2, - out_vers->abi_version_ns_3); - - return 1; /* Incompatible */ - } - } else { - /* We are compatible. Our host version is the output version */ - wmi_tlv_print_verbose - ("%s: Host and FW Compatible WMI Versions. Ret version: Mj=%d, Mn=%d, bd=%d, ns0=0x%x ns1:0x%x ns2:0x%x ns3:0x%x\n", - __func__, WMI_VER_GET_MAJOR(out_vers->abi_version_0), - WMI_VER_GET_MINOR(out_vers->abi_version_0), - out_vers->abi_version_1, out_vers->abi_version_ns_0, - out_vers->abi_version_ns_1, out_vers->abi_version_ns_2, - out_vers->abi_version_ns_3); - return 0; /* Compatible */ - } -} diff --git a/core/wmi/wmi_tlv_platform.c b/core/wmi/wmi_tlv_platform.c deleted file mode 100644 index 5e0795ce7ec0..000000000000 --- a/core/wmi/wmi_tlv_platform.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * LMAC offload interface functions for WMI TLV Interface - */ - -#include "ol_if_athvar.h" -#include /* qdf_mem_malloc,free, etc. */ -#include -#include "htc_api.h" -#include "wmi.h" -#include "wma.h" - -/* QCA Main host has dynamic memory allocation and should not define NO_DYNAMIC_MEM_ALLOC */ -/* #define NO_DYNAMIC_MEM_ALLOC */ - -/* Following macro definitions use OS or platform specific functions */ -/* Following macro definitions use QCA MAIN windows host driver(applicable for Perigrene and its future platforms, - Pronto and its future platforms) specific APIs */ -#define dummy_print(fmt, ...) {} -#define wmi_tlv_print_verbose dummy_print -#define wmi_tlv_print_error qdf_print -#define wmi_tlv_OS_MEMCPY OS_MEMCPY -#define wmi_tlv_OS_MEMZERO OS_MEMZERO -#define wmi_tlv_OS_MEMMOVE OS_MEMMOVE - -#ifndef NO_DYNAMIC_MEM_ALLOC -#define wmi_tlv_os_mem_alloc(scn, ptr, numBytes) \ - { \ - (ptr) = os_malloc(NULL, (numBytes), GFP_ATOMIC); \ - } -#define wmi_tlv_os_mem_free qdf_mem_free -#endif diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c deleted file mode 100644 index 7ede80e64d42..000000000000 --- a/core/wmi/wmi_unified.c +++ /dev/null @@ -1,1422 +0,0 @@ -/* - * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * Host WMI unified implementation - */ -#include "athdefs.h" -#include "osapi_linux.h" -#include "a_types.h" -#include "a_debug.h" -#include "ol_if_athvar.h" -#include "ol_defines.h" -#include "ol_fw.h" -#include "htc_api.h" -#include "htc_api.h" -#include "dbglog_host.h" -#include "wmi.h" -#include "wmi_unified_priv.h" -#include "wma_api.h" -#include "wma.h" -#include "mac_trace.h" - -#define WMI_MIN_HEAD_ROOM 64 - -#ifdef WMI_INTERFACE_EVENT_LOGGING -/* WMI commands */ -uint32_t g_wmi_command_buf_idx = 0; -struct wmi_command_debug wmi_command_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; - -/* WMI commands TX completed */ -uint32_t g_wmi_command_tx_cmp_buf_idx = 0; -struct wmi_command_debug - wmi_command_tx_cmp_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; - -/* WMI events when processed */ -uint32_t g_wmi_event_buf_idx = 0; -struct wmi_event_debug wmi_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; - -/* WMI events when queued */ -uint32_t g_wmi_rx_event_buf_idx = 0; -struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY]; - -#define WMI_COMMAND_RECORD(a, b) { \ - if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_buf_idx) \ - g_wmi_command_buf_idx = 0; \ - wmi_command_log_buffer[g_wmi_command_buf_idx].command = a; \ - qdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \ - wmi_command_log_buffer[g_wmi_command_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_command_buf_idx++; \ -} - -#define WMI_COMMAND_TX_CMP_RECORD(a, b) { \ - if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_tx_cmp_buf_idx) \ - g_wmi_command_tx_cmp_buf_idx = 0; \ - wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].command = a; \ - qdf_mem_copy(wmi_command_tx_cmp_log_buffer \ - [g_wmi_command_tx_cmp_buf_idx].data, b, 16); \ - wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_command_tx_cmp_buf_idx++; \ -} - -#define WMI_EVENT_RECORD(a, b) { \ - if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_event_buf_idx) \ - g_wmi_event_buf_idx = 0; \ - wmi_event_log_buffer[g_wmi_event_buf_idx].event = a; \ - qdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \ - wmi_event_log_buffer[g_wmi_event_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_event_buf_idx++; \ -} - -#define WMI_RX_EVENT_RECORD(a, b) { \ - if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_rx_event_buf_idx) \ - g_wmi_rx_event_buf_idx = 0; \ - wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].event = a; \ - qdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \ - wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_rx_event_buf_idx++; \ -} -/* wmi_mgmt commands */ -#define WMI_MGMT_EVENT_DEBUG_MAX_ENTRY (256) - -uint32_t g_wmi_mgmt_command_buf_idx = 0; -struct -wmi_command_debug wmi_mgmt_command_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; - -/* wmi_mgmt commands TX completed */ -uint32_t g_wmi_mgmt_command_tx_cmp_buf_idx = 0; -struct wmi_command_debug -wmi_mgmt_command_tx_cmp_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; - -/* wmi_mgmt events when processed */ -uint32_t g_wmi_mgmt_event_buf_idx = 0; -struct wmi_event_debug -wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY]; - -#define WMI_MGMT_COMMAND_RECORD(a, b) { \ - if (WMI_MGMT_EVENT_DEBUG_MAX_ENTRY <= \ - g_wmi_mgmt_command_buf_idx) \ - g_wmi_mgmt_command_buf_idx = 0; \ - wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].command = a; \ - qdf_mem_copy( \ - wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].data,\ - b, 16); \ - wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_mgmt_command_buf_idx++; \ -} - -#define WMI_MGMT_COMMAND_TX_CMP_RECORD(a, b) { \ - if (WMI_MGMT_EVENT_DEBUG_MAX_ENTRY <= \ - g_wmi_mgmt_command_tx_cmp_buf_idx) \ - g_wmi_mgmt_command_tx_cmp_buf_idx = 0; \ - wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\ - command = a; \ - qdf_mem_copy(wmi_mgmt_command_tx_cmp_log_buffer \ - [g_wmi_mgmt_command_tx_cmp_buf_idx].data, b, 16); \ - wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\ - time =\ - qdf_get_log_timestamp(); \ - g_wmi_mgmt_command_tx_cmp_buf_idx++; \ -} - -#define WMI_MGMT_EVENT_RECORD(a, b) { \ - if (WMI_MGMT_EVENT_DEBUG_MAX_ENTRY <= g_wmi_mgmt_event_buf_idx) \ - g_wmi_mgmt_event_buf_idx = 0; \ - wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].event = a; \ - qdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\ - b, 16); \ - wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].time = \ - qdf_get_log_timestamp(); \ - g_wmi_mgmt_event_buf_idx++; \ -} - -#endif /*WMI_INTERFACE_EVENT_LOGGING */ - -static void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf); -int wmi_get_host_credits(wmi_unified_t wmi_handle); -/* WMI buffer APIs */ - -#ifdef MEMORY_DEBUG -wmi_buf_t -wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name, - uint32_t line_num) -{ - wmi_buf_t wmi_buf; - - if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) { - QDF_ASSERT(0); - return NULL; - } - - wmi_buf = qdf_nbuf_alloc_debug(NULL, - roundup(len + WMI_MIN_HEAD_ROOM, 4), - WMI_MIN_HEAD_ROOM, 4, false, file_name, - line_num); - - if (!wmi_buf) - return NULL; - - /* Clear the wmi buffer */ - OS_MEMZERO(qdf_nbuf_data(wmi_buf), len); - - /* - * Set the length of the buffer to match the allocation size. - */ - qdf_nbuf_set_pktlen(wmi_buf, len); - - return wmi_buf; -} - -void wmi_buf_free(wmi_buf_t net_buf) -{ - qdf_nbuf_free(net_buf); -} -#else -wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len) -{ - wmi_buf_t wmi_buf; - - if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) { - QDF_ASSERT(0); - return NULL; - } - - wmi_buf = qdf_nbuf_alloc(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4), - WMI_MIN_HEAD_ROOM, 4, false); - if (!wmi_buf) - return NULL; - - /* Clear the wmi buffer */ - OS_MEMZERO(qdf_nbuf_data(wmi_buf), len); - - /* - * Set the length of the buffer to match the allocation size. - */ - qdf_nbuf_set_pktlen(wmi_buf, len); - return wmi_buf; -} - -void wmi_buf_free(wmi_buf_t net_buf) -{ - qdf_nbuf_free(net_buf); -} -#endif - -/** - * wmi_get_max_msg_len() - get maximum WMI message length - * @wmi_handle: WMI handle. - * - * This function returns the maximum WMI message length - * - * Return: maximum WMI message length - */ -uint16_t wmi_get_max_msg_len(wmi_unified_t wmi_handle) -{ - return wmi_handle->max_msg_len - WMI_MIN_HEAD_ROOM; -} - -static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command) -{ - switch (wmi_command) { - /** initialize the wlan sub system */ - CASE_RETURN_STRING(WMI_INIT_CMDID); - - /* Scan specific commands */ - - /** start scan request to FW */ - CASE_RETURN_STRING(WMI_START_SCAN_CMDID); - /** stop scan request to FW */ - CASE_RETURN_STRING(WMI_STOP_SCAN_CMDID); - /** full list of channels as defined by the regulatory that will be used by scanner */ - CASE_RETURN_STRING(WMI_SCAN_CHAN_LIST_CMDID); - /** overwrite default priority table in scan scheduler */ - CASE_RETURN_STRING(WMI_SCAN_SCH_PRIO_TBL_CMDID); - /** This command to adjust the priority and min.max_rest_time - * of an on ongoing scan request. - */ - CASE_RETURN_STRING(WMI_SCAN_UPDATE_REQUEST_CMDID); - - /* PDEV(physical device) specific commands */ - /** set regulatorty ctl id used by FW to determine the exact ctl power limits */ - CASE_RETURN_STRING(WMI_PDEV_SET_REGDOMAIN_CMDID); - /** set channel. mainly used for supporting monitor mode */ - CASE_RETURN_STRING(WMI_PDEV_SET_CHANNEL_CMDID); - /** set pdev specific parameters */ - CASE_RETURN_STRING(WMI_PDEV_SET_PARAM_CMDID); - /** enable packet log */ - CASE_RETURN_STRING(WMI_PDEV_PKTLOG_ENABLE_CMDID); - /** disable packet log*/ - CASE_RETURN_STRING(WMI_PDEV_PKTLOG_DISABLE_CMDID); - /** set wmm parameters */ - CASE_RETURN_STRING(WMI_PDEV_SET_WMM_PARAMS_CMDID); - /** set HT cap ie that needs to be carried probe requests HT/VHT channels */ - CASE_RETURN_STRING(WMI_PDEV_SET_HT_CAP_IE_CMDID); - /** set VHT cap ie that needs to be carried on probe requests on VHT channels */ - CASE_RETURN_STRING(WMI_PDEV_SET_VHT_CAP_IE_CMDID); - - /** Command to send the DSCP-to-TID map to the target */ - CASE_RETURN_STRING(WMI_PDEV_SET_DSCP_TID_MAP_CMDID); - /** set quiet ie parameters. primarily used in AP mode */ - CASE_RETURN_STRING(WMI_PDEV_SET_QUIET_MODE_CMDID); - /** Enable/Disable Green AP Power Save */ - CASE_RETURN_STRING(WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID); - /** get TPC config for the current operating channel */ - CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CONFIG_CMDID); - - /** set the base MAC address for the physical device before a VDEV is created. - * For firmware that doesn’t support this feature and this command, the pdev - * MAC address will not be changed. */ - CASE_RETURN_STRING(WMI_PDEV_SET_BASE_MACADDR_CMDID); - - /* eeprom content dump , the same to bdboard data */ - CASE_RETURN_STRING(WMI_PDEV_DUMP_CMDID); - - /* VDEV(virtual device) specific commands */ - /** vdev create */ - CASE_RETURN_STRING(WMI_VDEV_CREATE_CMDID); - /** vdev delete */ - CASE_RETURN_STRING(WMI_VDEV_DELETE_CMDID); - /** vdev start request */ - CASE_RETURN_STRING(WMI_VDEV_START_REQUEST_CMDID); - /** vdev restart request (RX only, NO TX, used for CAC period)*/ - CASE_RETURN_STRING(WMI_VDEV_RESTART_REQUEST_CMDID); - /** vdev up request */ - CASE_RETURN_STRING(WMI_VDEV_UP_CMDID); - /** vdev stop request */ - CASE_RETURN_STRING(WMI_VDEV_STOP_CMDID); - /** vdev down request */ - CASE_RETURN_STRING(WMI_VDEV_DOWN_CMDID); - /* set a vdev param */ - CASE_RETURN_STRING(WMI_VDEV_SET_PARAM_CMDID); - /* set a key (used for setting per peer unicast and per vdev multicast) */ - CASE_RETURN_STRING(WMI_VDEV_INSTALL_KEY_CMDID); - - /* wnm sleep mode command */ - CASE_RETURN_STRING(WMI_VDEV_WNM_SLEEPMODE_CMDID); - CASE_RETURN_STRING(WMI_VDEV_WMM_ADDTS_CMDID); - CASE_RETURN_STRING(WMI_VDEV_WMM_DELTS_CMDID); - CASE_RETURN_STRING(WMI_VDEV_SET_WMM_PARAMS_CMDID); - CASE_RETURN_STRING(WMI_VDEV_SET_GTX_PARAMS_CMDID); - CASE_RETURN_STRING(WMI_VDEV_IPSEC_NATKEEPALIVE_FILTER_CMDID); - - CASE_RETURN_STRING(WMI_VDEV_PLMREQ_START_CMDID); - CASE_RETURN_STRING(WMI_VDEV_PLMREQ_STOP_CMDID); - CASE_RETURN_STRING(WMI_VDEV_TSF_TSTAMP_ACTION_CMDID); - CASE_RETURN_STRING(WMI_VDEV_SET_IE_CMDID); - - /* peer specific commands */ - - /** create a peer */ - CASE_RETURN_STRING(WMI_PEER_CREATE_CMDID); - /** delete a peer */ - CASE_RETURN_STRING(WMI_PEER_DELETE_CMDID); - /** flush specific tid queues of a peer */ - CASE_RETURN_STRING(WMI_PEER_FLUSH_TIDS_CMDID); - /** set a parameter of a peer */ - CASE_RETURN_STRING(WMI_PEER_SET_PARAM_CMDID); - /** set peer to associated state. will cary all parameters determined during assocication time */ - CASE_RETURN_STRING(WMI_PEER_ASSOC_CMDID); - /**add a wds (4 address ) entry. used only for testing WDS feature on AP products */ - CASE_RETURN_STRING(WMI_PEER_ADD_WDS_ENTRY_CMDID); - /**remove wds (4 address ) entry. used only for testing WDS feature on AP products */ - CASE_RETURN_STRING(WMI_PEER_REMOVE_WDS_ENTRY_CMDID); - /** set up mcast group infor for multicast to unicast conversion */ - CASE_RETURN_STRING(WMI_PEER_MCAST_GROUP_CMDID); - /** request peer info from FW. FW shall respond with PEER_INFO_EVENTID */ - CASE_RETURN_STRING(WMI_PEER_INFO_REQ_CMDID); - - /* beacon/management specific commands */ - - /** transmit beacon by reference . used for transmitting beacon on low latency interface like pcie */ - CASE_RETURN_STRING(WMI_BCN_TX_CMDID); - /** transmit beacon by value */ - CASE_RETURN_STRING(WMI_PDEV_SEND_BCN_CMDID); - /** set the beacon template. used in beacon offload mode to setup the - * the common beacon template with the FW to be used by FW to generate beacons */ - CASE_RETURN_STRING(WMI_BCN_TMPL_CMDID); - /** set beacon filter with FW */ - CASE_RETURN_STRING(WMI_BCN_FILTER_RX_CMDID); - /* enable/disable filtering of probe requests in the firmware */ - CASE_RETURN_STRING(WMI_PRB_REQ_FILTER_RX_CMDID); - /** transmit management frame by value. will be deprecated */ - CASE_RETURN_STRING(WMI_MGMT_TX_CMDID); - /** set the probe response template. used in beacon offload mode to setup the - * the common probe response template with the FW to be used by FW to generate - * probe responses */ - CASE_RETURN_STRING(WMI_PRB_TMPL_CMDID); - - /** commands to directly control ba negotiation directly from host. only used in test mode */ - - /** turn off FW Auto addba mode and let host control addba */ - CASE_RETURN_STRING(WMI_ADDBA_CLEAR_RESP_CMDID); - /** send add ba request */ - CASE_RETURN_STRING(WMI_ADDBA_SEND_CMDID); - CASE_RETURN_STRING(WMI_ADDBA_STATUS_CMDID); - /** send del ba */ - CASE_RETURN_STRING(WMI_DELBA_SEND_CMDID); - /** set add ba response will be used by FW to generate addba response*/ - CASE_RETURN_STRING(WMI_ADDBA_SET_RESP_CMDID); - /** send single VHT MPDU with AMSDU */ - CASE_RETURN_STRING(WMI_SEND_SINGLEAMSDU_CMDID); - - /** Station power save specific config */ - /** enable/disable station powersave */ - CASE_RETURN_STRING(WMI_STA_POWERSAVE_MODE_CMDID); - /** set station power save specific parameter */ - CASE_RETURN_STRING(WMI_STA_POWERSAVE_PARAM_CMDID); - /** set station mimo powersave mode */ - CASE_RETURN_STRING(WMI_STA_MIMO_PS_MODE_CMDID); - - /** DFS-specific commands */ - /** enable DFS (radar detection)*/ - CASE_RETURN_STRING(WMI_PDEV_DFS_ENABLE_CMDID); - /** disable DFS (radar detection)*/ - CASE_RETURN_STRING(WMI_PDEV_DFS_DISABLE_CMDID); - /** enable DFS phyerr/parse filter offload */ - CASE_RETURN_STRING(WMI_DFS_PHYERR_FILTER_ENA_CMDID); - /** enable DFS phyerr/parse filter offload */ - CASE_RETURN_STRING(WMI_DFS_PHYERR_FILTER_DIS_CMDID); - - /* Roaming specific commands */ - /** set roam scan mode */ - CASE_RETURN_STRING(WMI_ROAM_SCAN_MODE); - /** set roam scan rssi threshold below which roam scan is enabled */ - CASE_RETURN_STRING(WMI_ROAM_SCAN_RSSI_THRESHOLD); - /** set roam scan period for periodic roam scan mode */ - CASE_RETURN_STRING(WMI_ROAM_SCAN_PERIOD); - /** set roam scan trigger rssi change threshold */ - CASE_RETURN_STRING(WMI_ROAM_SCAN_RSSI_CHANGE_THRESHOLD); - /** set roam AP profile */ - CASE_RETURN_STRING(WMI_ROAM_AP_PROFILE); - /** set channel list for roam scans */ - CASE_RETURN_STRING(WMI_ROAM_CHAN_LIST); - /** offload scan specific commands */ - /** set offload scan AP profile */ - CASE_RETURN_STRING(WMI_OFL_SCAN_ADD_AP_PROFILE); - /** remove offload scan AP profile */ - CASE_RETURN_STRING(WMI_OFL_SCAN_REMOVE_AP_PROFILE); - /** set offload scan period */ - CASE_RETURN_STRING(WMI_OFL_SCAN_PERIOD); - - /* P2P specific commands */ - /**set P2P device info. FW will used by FW to create P2P IE to be carried in probe response - * generated during p2p listen and for p2p discoverability */ - CASE_RETURN_STRING(WMI_P2P_DEV_SET_DEVICE_INFO); - /** enable/disable p2p discoverability on STA/AP VDEVs */ - CASE_RETURN_STRING(WMI_P2P_DEV_SET_DISCOVERABILITY); - /** set p2p ie to be carried in beacons generated by FW for GO */ - CASE_RETURN_STRING(WMI_P2P_GO_SET_BEACON_IE); - /** set p2p ie to be carried in probe response frames generated by FW for GO */ - CASE_RETURN_STRING(WMI_P2P_GO_SET_PROBE_RESP_IE); - /** set the vendor specific p2p ie data. FW will use this to parse the P2P NoA - * attribute in the beacons/probe responses received. - */ - CASE_RETURN_STRING(WMI_P2P_SET_VENDOR_IE_DATA_CMDID); - /** set the configure of p2p find offload */ - CASE_RETURN_STRING(WMI_P2P_DISC_OFFLOAD_CONFIG_CMDID); - /** set the vendor specific p2p ie data for p2p find offload using */ - CASE_RETURN_STRING(WMI_P2P_DISC_OFFLOAD_APPIE_CMDID); - /** set the BSSID/device name pattern of p2p find offload */ - CASE_RETURN_STRING(WMI_P2P_DISC_OFFLOAD_PATTERN_CMDID); - /** set OppPS related parameters **/ - CASE_RETURN_STRING(WMI_P2P_SET_OPPPS_PARAM_CMDID); - - /** AP power save specific config */ - /** set AP power save specific param */ - CASE_RETURN_STRING(WMI_AP_PS_PEER_PARAM_CMDID); - /** set AP UAPSD coex pecific param */ - CASE_RETURN_STRING(WMI_AP_PS_PEER_UAPSD_COEX_CMDID); - - /** Rate-control specific commands */ - CASE_RETURN_STRING(WMI_PEER_RATE_RETRY_SCHED_CMDID); - - /** WLAN Profiling commands. */ - CASE_RETURN_STRING(WMI_WLAN_PROFILE_TRIGGER_CMDID); - CASE_RETURN_STRING(WMI_WLAN_PROFILE_SET_HIST_INTVL_CMDID); - CASE_RETURN_STRING(WMI_WLAN_PROFILE_GET_PROFILE_DATA_CMDID); - CASE_RETURN_STRING(WMI_WLAN_PROFILE_ENABLE_PROFILE_ID_CMDID); - CASE_RETURN_STRING(WMI_WLAN_PROFILE_LIST_PROFILE_ID_CMDID); - - /** Suspend resume command Ids */ - CASE_RETURN_STRING(WMI_PDEV_SUSPEND_CMDID); - CASE_RETURN_STRING(WMI_PDEV_RESUME_CMDID); - - /* Beacon filter commands */ - /** add a beacon filter */ - CASE_RETURN_STRING(WMI_ADD_BCN_FILTER_CMDID); - /** remove a beacon filter */ - CASE_RETURN_STRING(WMI_RMV_BCN_FILTER_CMDID); - - /* WOW Specific WMI commands */ - /** add pattern for awake */ - CASE_RETURN_STRING(WMI_WOW_ADD_WAKE_PATTERN_CMDID); - /** deleta a wake pattern */ - CASE_RETURN_STRING(WMI_WOW_DEL_WAKE_PATTERN_CMDID); - /** enable/deisable wake event */ - CASE_RETURN_STRING(WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID); - /** enable WOW */ - CASE_RETURN_STRING(WMI_WOW_ENABLE_CMDID); - /** host woke up from sleep event to FW. Generated in response to WOW Hardware event */ - CASE_RETURN_STRING(WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID); - - /* RTT measurement related cmd */ - /** reques to make an RTT measurement */ - CASE_RETURN_STRING(WMI_RTT_MEASREQ_CMDID); - /** reques to report a tsf measurement */ - CASE_RETURN_STRING(WMI_RTT_TSF_CMDID); - - /** spectral scan command */ - /** configure spectral scan */ - CASE_RETURN_STRING(WMI_VDEV_SPECTRAL_SCAN_CONFIGURE_CMDID); - /** enable/disable spectral scan and trigger */ - CASE_RETURN_STRING(WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID); - - /* F/W stats */ - /** one time request for stats */ - CASE_RETURN_STRING(WMI_REQUEST_STATS_CMDID); - /** Push MCC Adaptive Scheduler Stats to Firmware */ - CASE_RETURN_STRING(WMI_MCC_SCHED_TRAFFIC_STATS_CMDID); - - /** ARP OFFLOAD REQUEST*/ - CASE_RETURN_STRING(WMI_SET_ARP_NS_OFFLOAD_CMDID); - - /** Proactive ARP Response Add Pattern Command*/ - CASE_RETURN_STRING(WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID); - - /** Proactive ARP Response Del Pattern Command*/ - CASE_RETURN_STRING(WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID); - - /** NS offload confid*/ - CASE_RETURN_STRING(WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID); - - /* GTK offload Specific WMI commands */ - CASE_RETURN_STRING(WMI_GTK_OFFLOAD_CMDID); - - /* CSA offload Specific WMI commands */ - /** csa offload enable */ - CASE_RETURN_STRING(WMI_CSA_OFFLOAD_ENABLE_CMDID); - /** chan switch command */ - CASE_RETURN_STRING(WMI_CSA_OFFLOAD_CHANSWITCH_CMDID); - - /* Chatter commands */ - /* Change chatter mode of operation */ - CASE_RETURN_STRING(WMI_CHATTER_SET_MODE_CMDID); - /** chatter add coalescing filter command */ - CASE_RETURN_STRING(WMI_CHATTER_ADD_COALESCING_FILTER_CMDID); - /** chatter delete coalescing filter command */ - CASE_RETURN_STRING(WMI_CHATTER_DELETE_COALESCING_FILTER_CMDID); - /** chatter coalecing query command */ - CASE_RETURN_STRING(WMI_CHATTER_COALESCING_QUERY_CMDID); - - /**addba specific commands */ - /** start the aggregation on this TID */ - CASE_RETURN_STRING(WMI_PEER_TID_ADDBA_CMDID); - /** stop the aggregation on this TID */ - CASE_RETURN_STRING(WMI_PEER_TID_DELBA_CMDID); - - /** set station mimo powersave method */ - CASE_RETURN_STRING(WMI_STA_DTIM_PS_METHOD_CMDID); - /** Configure the Station UAPSD AC Auto Trigger Parameters */ - CASE_RETURN_STRING(WMI_STA_UAPSD_AUTO_TRIG_CMDID); - /** Configure the Keep Alive Parameters */ - CASE_RETURN_STRING(WMI_STA_KEEPALIVE_CMDID); - - /* Request ssn from target for a sta/tid pair */ - CASE_RETURN_STRING(WMI_BA_REQ_SSN_CMDID); - /* misc command group */ - /** echo command mainly used for testing */ - CASE_RETURN_STRING(WMI_ECHO_CMDID); - - /* !!IMPORTANT!! - * If you need to add a new WMI command to the CASE_RETURN_STRING(WMI_GRP_MISC sub-group, - * please make sure you add it BEHIND CASE_RETURN_STRING(WMI_PDEV_UTF_CMDID); - * as we MUST have a fixed value here to maintain compatibility between - * UTF and the ART2 driver - */ - /** UTF WMI commands */ - CASE_RETURN_STRING(WMI_PDEV_UTF_CMDID); - - /** set debug log config */ - CASE_RETURN_STRING(WMI_DBGLOG_CFG_CMDID); - /* QVIT specific command id */ - CASE_RETURN_STRING(WMI_PDEV_QVIT_CMDID); - /* Factory Testing Mode request command - * used for integrated chipsets */ - CASE_RETURN_STRING(WMI_PDEV_FTM_INTG_CMDID); - /* set and get keepalive parameters command */ - CASE_RETURN_STRING(WMI_VDEV_SET_KEEPALIVE_CMDID); - CASE_RETURN_STRING(WMI_VDEV_GET_KEEPALIVE_CMDID); - /* For fw recovery test command */ - CASE_RETURN_STRING(WMI_FORCE_FW_HANG_CMDID); - /* Set Mcast/Bdcast filter */ - CASE_RETURN_STRING(WMI_SET_MCASTBCAST_FILTER_CMDID); - /** set thermal management params **/ - CASE_RETURN_STRING(WMI_THERMAL_MGMT_CMDID); - CASE_RETURN_STRING(WMI_RSSI_BREACH_MONITOR_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_LRO_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_TRANSFER_DATA_TO_FLASH_CMDID); - CASE_RETURN_STRING(WMI_MAWC_SENSOR_REPORT_IND_CMDID); - CASE_RETURN_STRING(WMI_ROAM_CONFIGURE_MAWC_CMDID); - CASE_RETURN_STRING(WMI_NLO_CONFIGURE_MAWC_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_CONFIGURE_MAWC_CMDID); - /* GPIO Configuration */ - CASE_RETURN_STRING(WMI_GPIO_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_GPIO_OUTPUT_CMDID); - - /* Txbf configuration command */ - CASE_RETURN_STRING(WMI_TXBF_CMDID); - - /* FWTEST Commands */ - CASE_RETURN_STRING(WMI_FWTEST_VDEV_MCC_SET_TBTT_MODE_CMDID); - /** set NoA descs **/ - CASE_RETURN_STRING(WMI_FWTEST_P2P_SET_NOA_PARAM_CMDID); - - /** TDLS Configuration */ - /** enable/disable TDLS */ - CASE_RETURN_STRING(WMI_TDLS_SET_STATE_CMDID); - /** set tdls peer state */ - CASE_RETURN_STRING(WMI_TDLS_PEER_UPDATE_CMDID); - - /** Resmgr Configuration */ - /** Adaptive OCS is enabled by default in the FW. This command is used to - * disable FW based adaptive OCS. - */ - CASE_RETURN_STRING - (WMI_RESMGR_ADAPTIVE_OCS_ENABLE_DISABLE_CMDID); - /** set the requested channel time quota for the home channels */ - CASE_RETURN_STRING(WMI_RESMGR_SET_CHAN_TIME_QUOTA_CMDID); - /** set the requested latency for the home channels */ - CASE_RETURN_STRING(WMI_RESMGR_SET_CHAN_LATENCY_CMDID); - - /** STA SMPS Configuration */ - /** force SMPS mode */ - CASE_RETURN_STRING(WMI_STA_SMPS_FORCE_MODE_CMDID); - /** set SMPS parameters */ - CASE_RETURN_STRING(WMI_STA_SMPS_PARAM_CMDID); - - /* Wlan HB commands */ - /* enalbe/disable wlan HB */ - CASE_RETURN_STRING(WMI_HB_SET_ENABLE_CMDID); - /* set tcp parameters for wlan HB */ - CASE_RETURN_STRING(WMI_HB_SET_TCP_PARAMS_CMDID); - /* set tcp pkt filter for wlan HB */ - CASE_RETURN_STRING(WMI_HB_SET_TCP_PKT_FILTER_CMDID); - /* set udp parameters for wlan HB */ - CASE_RETURN_STRING(WMI_HB_SET_UDP_PARAMS_CMDID); - /* set udp pkt filter for wlan HB */ - CASE_RETURN_STRING(WMI_HB_SET_UDP_PKT_FILTER_CMDID); - - /** Wlan RMC commands*/ - /** enable/disable RMC */ - CASE_RETURN_STRING(WMI_RMC_SET_MODE_CMDID); - /** configure action frame period */ - CASE_RETURN_STRING(WMI_RMC_SET_ACTION_PERIOD_CMDID); - /** For debug/future enhancement purposes only, - * configures/finetunes RMC algorithms */ - CASE_RETURN_STRING(WMI_RMC_CONFIG_CMDID); - - /** WLAN MHF offload commands */ - /** enable/disable MHF offload */ - CASE_RETURN_STRING(WMI_MHF_OFFLOAD_SET_MODE_CMDID); - /** Plumb routing table for MHF offload */ - CASE_RETURN_STRING(WMI_MHF_OFFLOAD_PLUMB_ROUTING_TBL_CMDID); - - /*location scan commands */ - /*start batch scan */ - CASE_RETURN_STRING(WMI_BATCH_SCAN_ENABLE_CMDID); - /*stop batch scan */ - CASE_RETURN_STRING(WMI_BATCH_SCAN_DISABLE_CMDID); - /*get batch scan result */ - CASE_RETURN_STRING(WMI_BATCH_SCAN_TRIGGER_RESULT_CMDID); - /* OEM related cmd */ - CASE_RETURN_STRING(WMI_OEM_REQ_CMDID); - CASE_RETURN_STRING(WMI_OEM_REQUEST_CMDID); - /* NAN request cmd */ - CASE_RETURN_STRING(WMI_NAN_CMDID); - /* Modem power state cmd */ - CASE_RETURN_STRING(WMI_MODEM_POWER_STATE_CMDID); - CASE_RETURN_STRING(WMI_REQUEST_STATS_EXT_CMDID); - CASE_RETURN_STRING(WMI_OBSS_SCAN_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_OBSS_SCAN_DISABLE_CMDID); - CASE_RETURN_STRING(WMI_PEER_GET_ESTIMATED_LINKSPEED_CMDID); - CASE_RETURN_STRING(WMI_ROAM_SCAN_CMD); - CASE_RETURN_STRING(WMI_PDEV_SET_LED_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_HOST_AUTO_SHUTDOWN_CFG_CMDID); - CASE_RETURN_STRING(WMI_CHAN_AVOID_UPDATE_CMDID); - CASE_RETURN_STRING(WMI_WOW_IOAC_ADD_KEEPALIVE_CMDID); - CASE_RETURN_STRING(WMI_WOW_IOAC_DEL_KEEPALIVE_CMDID); - CASE_RETURN_STRING(WMI_WOW_IOAC_ADD_WAKE_PATTERN_CMDID); - CASE_RETURN_STRING(WMI_WOW_IOAC_DEL_WAKE_PATTERN_CMDID); - CASE_RETURN_STRING(WMI_REQUEST_LINK_STATS_CMDID); - CASE_RETURN_STRING(WMI_START_LINK_STATS_CMDID); - CASE_RETURN_STRING(WMI_CLEAR_LINK_STATS_CMDID); - CASE_RETURN_STRING(WMI_GET_FW_MEM_DUMP_CMDID); - CASE_RETURN_STRING(WMI_LPI_MGMT_SNOOPING_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_LPI_START_SCAN_CMDID); - CASE_RETURN_STRING(WMI_LPI_STOP_SCAN_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_START_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_STOP_CMDID); - CASE_RETURN_STRING - (WMI_EXTSCAN_CONFIGURE_WLAN_CHANGE_MONITOR_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_CONFIGURE_HOTLIST_MONITOR_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_GET_CACHED_RESULTS_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_GET_WLAN_CHANGE_RESULTS_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_SET_CAPABILITIES_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_GET_CAPABILITIES_CMDID); - CASE_RETURN_STRING(WMI_EXTSCAN_CONFIGURE_HOTLIST_SSID_MONITOR_CMDID); - CASE_RETURN_STRING(WMI_ROAM_SYNCH_COMPLETE); - CASE_RETURN_STRING(WMI_D0_WOW_ENABLE_DISABLE_CMDID); - CASE_RETURN_STRING(WMI_EXTWOW_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID); - CASE_RETURN_STRING(WMI_EXTWOW_SET_APP_TYPE2_PARAMS_CMDID); - CASE_RETURN_STRING(WMI_UNIT_TEST_CMDID); - CASE_RETURN_STRING(WMI_ROAM_SET_RIC_REQUEST_CMDID); - CASE_RETURN_STRING(WMI_PDEV_GET_TEMPERATURE_CMDID); - CASE_RETURN_STRING(WMI_SET_DHCP_SERVER_OFFLOAD_CMDID); - CASE_RETURN_STRING(WMI_TPC_CHAINMASK_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_IPA_OFFLOAD_ENABLE_DISABLE_CMDID); - CASE_RETURN_STRING(WMI_SCAN_PROB_REQ_OUI_CMDID); - CASE_RETURN_STRING(WMI_TDLS_SET_OFFCHAN_MODE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_LED_FLASHING_CMDID); - CASE_RETURN_STRING(WMI_MDNS_OFFLOAD_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_MDNS_SET_FQDN_CMDID); - CASE_RETURN_STRING(WMI_MDNS_SET_RESPONSE_CMDID); - CASE_RETURN_STRING(WMI_MDNS_GET_STATS_CMDID); - CASE_RETURN_STRING(WMI_ROAM_INVOKE_CMDID); - CASE_RETURN_STRING(WMI_SET_ANTENNA_DIVERSITY_CMDID); - CASE_RETURN_STRING(WMI_SAP_OFL_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_APFIND_CMDID); - CASE_RETURN_STRING(WMI_PASSPOINT_LIST_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_OCB_SET_SCHED_CMDID); - CASE_RETURN_STRING(WMI_OCB_SET_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_OCB_SET_UTC_TIME_CMDID); - CASE_RETURN_STRING(WMI_OCB_START_TIMING_ADVERT_CMDID); - CASE_RETURN_STRING(WMI_OCB_STOP_TIMING_ADVERT_CMDID); - CASE_RETURN_STRING(WMI_OCB_GET_TSF_TIMER_CMDID); - CASE_RETURN_STRING(WMI_DCC_GET_STATS_CMDID); - CASE_RETURN_STRING(WMI_DCC_CLEAR_STATS_CMDID); - CASE_RETURN_STRING(WMI_DCC_UPDATE_NDL_CMDID); - CASE_RETURN_STRING(WMI_ROAM_FILTER_CMDID); - CASE_RETURN_STRING(WMI_ROAM_SUBNET_CHANGE_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_DEBUG_MESG_FLUSH_CMDID); - CASE_RETURN_STRING(WMI_PEER_SET_RATE_REPORT_CONDITION_CMDID); - CASE_RETURN_STRING(WMI_SOC_SET_PCL_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_PCL_CMDID); - CASE_RETURN_STRING(WMI_SOC_SET_HW_MODE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_HW_MODE_CMDID); - CASE_RETURN_STRING(WMI_SOC_SET_DUAL_MAC_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_MAC_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_WOW_ENABLE_ICMPV6_NA_FLT_CMDID); - CASE_RETURN_STRING(WMI_DIAG_EVENT_LOG_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_PACKET_FILTER_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_PACKET_FILTER_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_SAP_SET_BLACKLIST_PARAM_CMDID); - CASE_RETURN_STRING(WMI_WOW_UDP_SVC_OFLD_CMDID); - CASE_RETURN_STRING(WMI_MGMT_TX_SEND_CMDID); - CASE_RETURN_STRING(WMI_SOC_SET_ANTENNA_MODE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_MODE_CMDID); - CASE_RETURN_STRING(WMI_WOW_HOSTWAKEUP_GPIO_PIN_PATTERN_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_AP_PS_EGAP_PARAM_CMDID); - CASE_RETURN_STRING(WMI_PMF_OFFLOAD_SET_SA_QUERY_CMDID); - CASE_RETURN_STRING(WMI_BPF_GET_CAPABILITY_CMDID); - CASE_RETURN_STRING(WMI_BPF_GET_VDEV_STATS_CMDID); - CASE_RETURN_STRING(WMI_BPF_SET_VDEV_INSTRUCTIONS_CMDID); - CASE_RETURN_STRING(WMI_BPF_DEL_VDEV_INSTRUCTIONS_CMDID); - CASE_RETURN_STRING(WMI_NDI_GET_CAP_REQ_CMDID); - CASE_RETURN_STRING(WMI_NDP_INITIATOR_REQ_CMDID); - CASE_RETURN_STRING(WMI_NDP_RESPONDER_REQ_CMDID); - CASE_RETURN_STRING(WMI_NDP_END_REQ_CMDID); - CASE_RETURN_STRING(WMI_PEER_UPDATE_WDS_ENTRY_CMDID); - CASE_RETURN_STRING(WMI_PEER_ADD_PROXY_STA_ENTRY_CMDID); - CASE_RETURN_STRING(WMI_PDEV_FIPS_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_CTL_TABLE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_SET_MIMOGAIN_TABLE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_GET_TPC_CMDID); - CASE_RETURN_STRING(WMI_MIB_STATS_ENABLE_CMDID); - CASE_RETURN_STRING(WMI_PDEV_GET_ANI_CCK_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_PDEV_GET_ANI_OFDM_CONFIG_CMDID); - CASE_RETURN_STRING(WMI_VDEV_RATEMASK_CMDID); - CASE_RETURN_STRING(WMI_VDEV_ATF_REQUEST_CMDID); - CASE_RETURN_STRING(WMI_VDEV_SET_DSCP_TID_MAP_CMDID); - CASE_RETURN_STRING(WMI_VDEV_FILTER_NEIGHBOR_RX_PACKETS_CMDID); - CASE_RETURN_STRING(WMI_VDEV_SET_QUIET_MODE_CMDID); - CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TX_ANTENNA_CMDID); - CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_TRAIN_INFO_CMDID); - CASE_RETURN_STRING(WMI_PEER_SMART_ANT_SET_NODE_CONFIG_OPS_CMDID); - CASE_RETURN_STRING(WMI_PEER_ATF_REQUEST_CMDID); - CASE_RETURN_STRING(WMI_FWTEST_CMDID); - CASE_RETURN_STRING(WMI_QBOOST_CFG_CMDID); - CASE_RETURN_STRING(WMI_PDEV_GET_NFCAL_POWER_CMDID); - CASE_RETURN_STRING(WMI_ROAM_SET_MBO_PARAM_CMDID); - } - return "Invalid WMI cmd"; -} - -#ifdef QCA_WIFI_3_0_EMU -static inline void wma_log_cmd_id(WMI_CMD_ID cmd_id) -{ - WMA_LOGE("Send WMI command:%s command_id:%d", - get_wmi_cmd_string(cmd_id), cmd_id); -} -#else -static inline void wma_log_cmd_id(WMI_CMD_ID cmd_id) -{ - WMA_LOGD("Send WMI command:%s command_id:%d", - get_wmi_cmd_string(cmd_id), cmd_id); -} -#endif - -/** - * wmi_is_runtime_pm_cmd() - check if a cmd is part of the suspend resume sequence - * @cmd: command to check - * - * Return: true if the command is part of the suspend resume sequence. - */ -bool wmi_is_runtime_pm_cmd(WMI_CMD_ID cmd_id) -{ - switch (cmd_id) { - case WMI_WOW_ENABLE_CMDID: - case WMI_PDEV_SUSPEND_CMDID: - case WMI_WOW_ENABLE_DISABLE_WAKE_EVENT_CMDID: - case WMI_WOW_ADD_WAKE_PATTERN_CMDID: - case WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID: - case WMI_PDEV_RESUME_CMDID: - case WMI_WOW_DEL_WAKE_PATTERN_CMDID: - case WMI_D0_WOW_ENABLE_DISABLE_CMDID: - return true; - - default: - return false; - } -} - -/* WMI command API */ -int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len, - WMI_CMD_ID cmd_id) -{ - HTC_PACKET *pkt; - A_STATUS status; - struct hif_opaque_softc *scn; - uint16_t htc_tag = 0; - - if (wmi_get_runtime_pm_inprogress(wmi_handle)) { - if (wmi_is_runtime_pm_cmd(cmd_id)) - htc_tag = HTC_TX_PACKET_TAG_AUTO_PM; - } else if (qdf_atomic_read(&wmi_handle->is_target_suspended) && - ((WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID != cmd_id) && - (WMI_PDEV_RESUME_CMDID != cmd_id))) { - pr_err("%s: Target is suspended could not send WMI command\n", - __func__); - QDF_ASSERT(0); - return -EBUSY; - } - - /* Do sanity check on the TLV parameter structure */ - { - void *buf_ptr = (void *)qdf_nbuf_data(buf); - - if (wmitlv_check_command_tlv_params(NULL, buf_ptr, len, cmd_id) - != 0) { - qdf_print - ("\nERROR: %s: Invalid WMI Parameter Buffer for Cmd:%d\n", - __func__, cmd_id); - return -1; - } - } - - if (qdf_nbuf_push_head(buf, sizeof(WMI_CMD_HDR)) == NULL) { - pr_err("%s, Failed to send cmd %x, no memory\n", - __func__, cmd_id); - return -ENOMEM; - } - - WMI_SET_FIELD(qdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id); - - qdf_atomic_inc(&wmi_handle->pending_cmds); - if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) { - scn = cds_get_context(QDF_MODULE_ID_HIF); - pr_err("\n%s: hostcredits = %d\n", __func__, - wmi_get_host_credits(wmi_handle)); - htc_dump_counter_info(wmi_handle->htc_handle); - qdf_atomic_dec(&wmi_handle->pending_cmds); - pr_err("%s: MAX 1024 WMI Pending cmds reached.\n", __func__); - QDF_BUG(0); - return -EBUSY; - } - - pkt = qdf_mem_malloc(sizeof(*pkt)); - if (!pkt) { - qdf_atomic_dec(&wmi_handle->pending_cmds); - pr_err("%s, Failed to alloc htc packet %x, no memory\n", - __func__, cmd_id); - return -ENOMEM; - } - - SET_HTC_PACKET_INFO_TX(pkt, - NULL, - qdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR), - /* htt_host_data_dl_len(buf)+20 */ - wmi_handle->wmi_endpoint_id, htc_tag); - - SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf); - - wma_log_cmd_id(cmd_id); - -#ifdef WMI_INTERFACE_EVENT_LOGGING - qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); - /*Record 16 bytes of WMI cmd data - exclude TLV and WMI headers */ - if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { - WMI_MGMT_COMMAND_RECORD(cmd_id, - ((uint32_t *)qdf_nbuf_data(buf) + 2)); - } else { - WMI_COMMAND_RECORD(cmd_id, ((uint32_t *) qdf_nbuf_data(buf) + - 2)); - } - - qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); -#endif - - status = htc_send_pkt(wmi_handle->htc_handle, pkt); - - if (A_OK != status) { - qdf_atomic_dec(&wmi_handle->pending_cmds); - pr_err("%s %d, htc_send_pkt failed\n", __func__, __LINE__); - } - - return (status == A_OK) ? EOK : -1; -} - -/* WMI Event handler register API */ -int wmi_unified_get_event_handler_ix(wmi_unified_t wmi_handle, - WMI_EVT_ID event_id) -{ - uint32_t idx = 0; - for (idx = 0; (idx < wmi_handle->max_event_idx && - idx < WMI_UNIFIED_MAX_EVENT); ++idx) { - if (wmi_handle->event_id[idx] == event_id && - wmi_handle->event_handler[idx] != NULL) { - return idx; - } - } - return -1; -} - -int wmi_unified_register_event_handler(wmi_unified_t wmi_handle, - WMI_EVT_ID event_id, - wmi_unified_event_handler handler_func) -{ - uint32_t idx = 0; - - if (wmi_unified_get_event_handler_ix(wmi_handle, event_id) != -1) { - printk("%s : event handler already registered 0x%x \n", - __func__, event_id); - return -1; - } - if (wmi_handle->max_event_idx == WMI_UNIFIED_MAX_EVENT) { - printk("%s : no more event handlers 0x%x \n", - __func__, event_id); - return -1; - } - idx = wmi_handle->max_event_idx; - wmi_handle->event_handler[idx] = handler_func; - wmi_handle->event_id[idx] = event_id; - wmi_handle->max_event_idx++; - return 0; -} - -int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, - WMI_EVT_ID event_id) -{ - uint32_t idx = 0; - idx = wmi_unified_get_event_handler_ix(wmi_handle, event_id); - if (idx == -1) { - printk("%s : event handler is not registered: event id 0x%x \n", - __func__, event_id); - return -1; - } - wmi_handle->event_handler[idx] = NULL; - wmi_handle->event_id[idx] = 0; - --wmi_handle->max_event_idx; - wmi_handle->event_handler[idx] = - wmi_handle->event_handler[wmi_handle->max_event_idx]; - wmi_handle->event_id[idx] = - wmi_handle->event_id[wmi_handle->max_event_idx]; - return 0; -} - -#if 0 /* currently not used */ -static int wmi_unified_event_rx(struct wmi_unified *wmi_handle, - wmi_buf_t evt_buf) -{ - uint32_t id; - uint8_t *event; - uint16_t len; - int status = -1; - uint32_t idx = 0; - - ASSERT(evt_buf != NULL); - - id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - - if (qdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) - goto end; - - idx = wmi_unified_get_event_handler_ix(wmi_handle, id); - if (idx == -1) { - pr_err("%s : event handler is not registered: event id: 0x%x\n", - __func__, id); - goto end; - } - - event = qdf_nbuf_data(evt_buf); - len = qdf_nbuf_len(evt_buf); - - /* Call the WMI registered event handler */ - status = wmi_handle->event_handler[idx] (wmi_handle->scn_handle, - event, len); - -end: - qdf_nbuf_free(evt_buf); - return status; -} -#endif /* 0 */ -/* - * Event process by below function will be in tasket context. - * Please use this method only for time sensitive functions. - */ -static void wmi_process_fw_event_tasklet_ctx(struct wmi_unified *wmi_handle, - HTC_PACKET *htc_packet) -{ - - wmi_buf_t evt_buf; - evt_buf = (wmi_buf_t) htc_packet->pPktContext; - - __wmi_control_rx(wmi_handle, evt_buf); - return; -} - -/* - * Event process by below function will be in mc_thread context. - * By default all event will be executed in mc_thread context. - * Use this method for all events which are processed by protocol stack. - * This method will reduce context switching and race conditions. - */ -static void wmi_process_fw_event_mc_thread_ctx(struct wmi_unified *wmi_handle, - HTC_PACKET *htc_packet) -{ - wmi_buf_t evt_buf; - evt_buf = (wmi_buf_t) htc_packet->pPktContext; - - wmi_handle->wma_process_fw_event_handler_cbk(wmi_handle, evt_buf); - return; -} - -/* - * Event process by below function will be in worker thread context. - * Use this method for events which are not critical and not - * handled in protocol stack. - */ -static void wmi_process_fw_event_worker_thread_ctx - (struct wmi_unified *wmi_handle, HTC_PACKET *htc_packet) -{ - wmi_buf_t evt_buf; - uint32_t id; - uint8_t *data; - - evt_buf = (wmi_buf_t) htc_packet->pPktContext; - id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - data = qdf_nbuf_data(evt_buf); - - qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); - /* Exclude 4 bytes of TLV header */ - WMI_RX_EVENT_RECORD(id, ((uint8_t *) data + 4)); - qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); - qdf_spin_lock_bh(&wmi_handle->eventq_lock); - qdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf); - qdf_spin_unlock_bh(&wmi_handle->eventq_lock); - schedule_work(&wmi_handle->rx_event_work); - return; -} - -/* - * Temporarily added to support older WMI events. We should move all events to unified - * when the target is ready to support it. - */ -void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet) -{ - struct wmi_unified *wmi_handle = (struct wmi_unified *)ctx; - wmi_buf_t evt_buf; - uint32_t id; - - evt_buf = (wmi_buf_t) htc_packet->pPktContext; - id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - switch (id) { - /*Event will be handled in tasklet ctx*/ - case WMI_TX_PAUSE_EVENTID: - case WMI_WOW_WAKEUP_HOST_EVENTID: - case WMI_PDEV_RESUME_EVENTID: - case WMI_D0_WOW_DISABLE_ACK_EVENTID: - wmi_process_fw_event_tasklet_ctx - (wmi_handle, htc_packet); - break; - /*Event will be handled in worker thread ctx*/ - case WMI_DEBUG_MESG_EVENTID: - case WMI_DFS_RADAR_EVENTID: - case WMI_PHYERR_EVENTID: - case WMI_PEER_STATE_EVENTID: - case WMI_MGMT_RX_EVENTID: - case WMI_ROAM_EVENTID: - wmi_process_fw_event_worker_thread_ctx - (wmi_handle, htc_packet); - break; - /*Event will be handled in mc_thread ctx*/ - default: - wmi_process_fw_event_mc_thread_ctx - (wmi_handle, htc_packet); - break; - } -} - -void wmi_process_fw_event(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) -{ - __wmi_control_rx(wmi_handle, evt_buf); -} - -void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf) -{ - uint32_t id; - uint8_t *data; - uint32_t len; - void *wmi_cmd_struct_ptr = NULL; - int tlv_ok_status = 0; - - id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID); - - if (qdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL) - goto end; - - data = qdf_nbuf_data(evt_buf); - len = qdf_nbuf_len(evt_buf); - - /* Validate and pad(if necessary) the TLVs */ - tlv_ok_status = wmitlv_check_and_pad_event_tlvs(wmi_handle->scn_handle, - data, len, id, - &wmi_cmd_struct_ptr); - if (tlv_ok_status != 0) { - pr_err("%s: Error: id=0x%d, wmitlv_check_and_pad_tlvs ret=%d\n", - __func__, id, tlv_ok_status); - goto end; - } - - if ((id >= WMI_EVT_GRP_START_ID(WMI_GRP_START)) && - /* WMI_SERVICE_READY_EXT_EVENTID is supposed to be part of the - * WMI_GRP_START group. Since the group is out of space, FW - * has accomodated this in WMI_GRP_VDEV. - * WMI_SERVICE_READY_EXT_EVENTID does not have any specific - * event handler registered. So, we do not want to go through - * the WMI registered event handler path for this event. - */ - (id != WMI_SERVICE_READY_EXT_EVENTID)) { - uint32_t idx = 0; - - idx = wmi_unified_get_event_handler_ix(wmi_handle, id); - if (idx == -1) { - pr_err - ("%s : event handler is not registered: event id 0x%x\n", - __func__, id); - goto end; - } -#ifdef WMI_INTERFACE_EVENT_LOGGING - qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); - /* Exclude 4 bytes of TLV header */ - if (id == WMI_MGMT_TX_COMPLETION_EVENTID) { - WMI_MGMT_EVENT_RECORD(id, ((uint8_t *) data + 4)); - } else { - WMI_EVENT_RECORD(id, ((uint8_t *) data + 4)); - } - qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); -#endif - /* Call the WMI registered event handler */ - wmi_handle->event_handler[idx] (wmi_handle->scn_handle, - wmi_cmd_struct_ptr, len); - goto end; - } - - switch (id) { - default: - pr_info("%s: Unhandled WMI event %d\n", __func__, id); - break; - case WMI_SERVICE_READY_EVENTID: - pr_info("%s: WMI UNIFIED SERVICE READY event\n", __func__); - wma_rx_service_ready_event(wmi_handle->scn_handle, - wmi_cmd_struct_ptr); - break; - case WMI_SERVICE_READY_EXT_EVENTID: - WMA_LOGA("%s: WMI UNIFIED SERVICE READY Extended event", - __func__); - wma_rx_service_ready_ext_event(wmi_handle->scn_handle, - wmi_cmd_struct_ptr); - break; - case WMI_READY_EVENTID: - pr_info("%s: WMI UNIFIED READY event\n", __func__); - wma_rx_ready_event(wmi_handle->scn_handle, wmi_cmd_struct_ptr); - break; - } -end: - wmitlv_free_allocated_event_tlvs(id, &wmi_cmd_struct_ptr); - qdf_nbuf_free(evt_buf); -} - -void wmi_rx_event_work(struct work_struct *work) -{ - struct wmi_unified *wmi = container_of(work, struct wmi_unified, - rx_event_work); - wmi_buf_t buf; - - qdf_spin_lock_bh(&wmi->eventq_lock); - buf = qdf_nbuf_queue_remove(&wmi->event_queue); - qdf_spin_unlock_bh(&wmi->eventq_lock); - while (buf) { - __wmi_control_rx(wmi, buf); - qdf_spin_lock_bh(&wmi->eventq_lock); - buf = qdf_nbuf_queue_remove(&wmi->event_queue); - qdf_spin_unlock_bh(&wmi->eventq_lock); - } -} - -/* WMI Initialization functions */ - -#ifdef FEATURE_RUNTIME_PM -/** - * wmi_runtime_pm_init() - initialize runtime pm wmi variables - * @wmi_handle: wmi context - */ -void wmi_runtime_pm_init(struct wmi_unified *wmi_handle) -{ - qdf_atomic_init(&wmi_handle->runtime_pm_inprogress); -} -#else -void wmi_runtime_pm_init(struct wmi_unified *wmi_handle) -{ -} -#endif - -void *wmi_unified_attach(ol_scn_t scn_handle, - wma_process_fw_event_handler_cbk func) -{ - struct wmi_unified *wmi_handle; - wmi_handle = - (struct wmi_unified *)os_malloc(NULL, sizeof(struct wmi_unified), - GFP_ATOMIC); - if (wmi_handle == NULL) { - printk("allocation of wmi handle failed %zu \n", - sizeof(struct wmi_unified)); - return NULL; - } - OS_MEMZERO(wmi_handle, sizeof(struct wmi_unified)); - wmi_handle->scn_handle = scn_handle; - qdf_atomic_init(&wmi_handle->pending_cmds); - qdf_atomic_init(&wmi_handle->is_target_suspended); - wmi_runtime_pm_init(wmi_handle); - qdf_spinlock_create(&wmi_handle->eventq_lock); - qdf_nbuf_queue_init(&wmi_handle->event_queue); -#ifdef CONFIG_CNSS - cnss_init_work(&wmi_handle->rx_event_work, wmi_rx_event_work); -#else - INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work); -#endif -#ifdef WMI_INTERFACE_EVENT_LOGGING - qdf_spinlock_create(&wmi_handle->wmi_record_lock); -#endif - wmi_handle->wma_process_fw_event_handler_cbk = func; - return wmi_handle; -} - -void wmi_unified_detach(struct wmi_unified *wmi_handle) -{ - wmi_buf_t buf; - - cds_flush_work(&wmi_handle->rx_event_work); - qdf_spin_lock_bh(&wmi_handle->eventq_lock); - buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); - while (buf) { - qdf_nbuf_free(buf); - buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); - } - qdf_spin_unlock_bh(&wmi_handle->eventq_lock); - if (wmi_handle != NULL) { - OS_FREE(wmi_handle); - wmi_handle = NULL; - } -} - -/** - * wmi_unified_remove_work() - detach for WMI work - * @wmi_handle: handle to WMI - * - * A function that does not fully detach WMI, but just remove work - * queue items associated with it. This is used to make sure that - * before any other processing code that may destroy related contexts - * (HTC, etc), work queue processing on WMI has already been stopped. - * - * Return: None - */ -void -wmi_unified_remove_work(struct wmi_unified *wmi_handle) -{ - wmi_buf_t buf; - - QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO, - "Enter: %s", __func__); - cds_flush_work(&wmi_handle->rx_event_work); - qdf_spin_lock_bh(&wmi_handle->eventq_lock); - buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); - while (buf) { - qdf_nbuf_free(buf); - buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue); - } - qdf_spin_unlock_bh(&wmi_handle->eventq_lock); - QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, - "Done: %s", __func__); -} - -void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt) -{ - struct wmi_unified *wmi_handle = (struct wmi_unified *)ctx; - wmi_buf_t wmi_cmd_buf = GET_HTC_PACKET_NET_BUF_CONTEXT(htc_pkt); -#ifdef WMI_INTERFACE_EVENT_LOGGING - uint32_t cmd_id; -#endif - - ASSERT(wmi_cmd_buf); -#ifdef WMI_INTERFACE_EVENT_LOGGING - cmd_id = WMI_GET_FIELD(qdf_nbuf_data(wmi_cmd_buf), - WMI_CMD_HDR, COMMANDID); - -#ifdef QCA_WIFI_3_0_EMU - printk("\nSent WMI command:%s command_id:0x%x over dma and recieved tx complete interupt\n", - get_wmi_cmd_string(cmd_id), cmd_id); -#endif - - qdf_spin_lock_bh(&wmi_handle->wmi_record_lock); - /* Record 16 bytes of WMI cmd tx complete data - - exclude TLV and WMI headers */ - if (cmd_id == WMI_MGMT_TX_SEND_CMDID) { - WMI_MGMT_COMMAND_TX_CMP_RECORD(cmd_id, - ((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2)); - } else { - WMI_COMMAND_TX_CMP_RECORD(cmd_id, - ((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2)); - } - - qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock); -#endif - qdf_nbuf_free(wmi_cmd_buf); - qdf_mem_free(htc_pkt); - qdf_atomic_dec(&wmi_handle->pending_cmds); -} - -int -wmi_unified_connect_htc_service(struct wmi_unified *wmi_handle, - void *htc_handle) -{ - - int status; - HTC_SERVICE_CONNECT_RESP response; - HTC_SERVICE_CONNECT_REQ connect; - - OS_MEMZERO(&connect, sizeof(connect)); - OS_MEMZERO(&response, sizeof(response)); - - /* meta data is unused for now */ - connect.pMetaData = NULL; - connect.MetaDataLength = 0; - /* these fields are the same for all service endpoints */ - connect.EpCallbacks.pContext = wmi_handle; - connect.EpCallbacks.EpTxCompleteMultiple = - NULL /* Control path completion ar6000_tx_complete */; - connect.EpCallbacks.EpRecv = wmi_control_rx /* Control path rx */; - connect.EpCallbacks.EpRecvRefill = NULL /* ar6000_rx_refill */; - connect.EpCallbacks.EpSendFull = NULL /* ar6000_tx_queue_full */; - connect.EpCallbacks.EpTxComplete = - wmi_htc_tx_complete /* ar6000_tx_queue_full */; - - /* connect to control service */ - connect.service_id = WMI_CONTROL_SVC; - - status = htc_connect_service(htc_handle, &connect, &response); - if (status != EOK) { - printk - (" Failed to connect to WMI CONTROL service status:%d \n", - status); - return -1;; - } - wmi_handle->wmi_endpoint_id = response.Endpoint; - wmi_handle->htc_handle = htc_handle; - wmi_handle->max_msg_len = response.MaxMsgLength; - - return EOK; -} - -int wmi_get_host_credits(wmi_unified_t wmi_handle) -{ - int host_credits; - - htc_get_control_endpoint_tx_host_credits(wmi_handle->htc_handle, - &host_credits); - return host_credits; -} - -int wmi_get_pending_cmds(wmi_unified_t wmi_handle) -{ - return qdf_atomic_read(&wmi_handle->pending_cmds); -} - -void wmi_set_target_suspend(wmi_unified_t wmi_handle, A_BOOL val) -{ - qdf_atomic_set(&wmi_handle->is_target_suspended, val); -} - -#ifdef FEATURE_RUNTIME_PM -void wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, A_BOOL val) -{ - qdf_atomic_set(&wmi_handle->runtime_pm_inprogress, val); -} - -inline bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle) -{ - return qdf_atomic_read(&wmi_handle->runtime_pm_inprogress); -} -#endif diff --git a/core/wmi/wmi_unified_api.h b/core/wmi/wmi_unified_api.h deleted file mode 100644 index a995e04ab88b..000000000000 --- a/core/wmi/wmi_unified_api.h +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * This file contains the API definitions for the Unified Wireless Module Interface (WMI). - */ - -#ifndef _WMI_UNIFIED_API_H_ -#define _WMI_UNIFIED_API_H_ - -#include -#include "a_types.h" -#include "ol_defines.h" -#include "wmi.h" -#include "htc_api.h" - -typedef qdf_nbuf_t wmi_buf_t; -#define wmi_buf_data(_buf) qdf_nbuf_data(_buf) - -/** - * attach for unified WMI - * - * @param scn_handle : handle to SCN. - * @return opaque handle. - */ -void *wmi_unified_attach(void *scn_handle, - int (*func)(struct wmi_unified *, wmi_buf_t)); -/** - * detach for unified WMI - * - * @param wmi_handle : handle to WMI. - * @return void. - */ -void wmi_unified_detach(struct wmi_unified *wmi_handle); - -void -wmi_unified_remove_work(struct wmi_unified *wmi_handle); - -/** - * generic function to allocate WMI buffer - * - * @param wmi_handle : handle to WMI. - * @param len : length of the buffer - * @return wmi_buf_t. - */ -#ifdef MEMORY_DEBUG -#define wmi_buf_alloc(h, l) wmi_buf_alloc_debug(h, l, __FILE__, __LINE__) -wmi_buf_t -wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, - uint8_t *file_name, uint32_t line_num); -#else -wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len); -#endif - -/** - * generic function frees WMI net buffer - * - * @param net_buf : Pointer ot net_buf to be freed - */ -void wmi_buf_free(wmi_buf_t net_buf); - -/** - * generic function to send unified WMI command - * - * @param wmi_handle : handle to WMI. - * @param buf : wmi command buffer - * @param buflen : wmi command buffer length - * @return 0 on success and -ve on failure. - */ -int -wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int buflen, - WMI_CMD_ID cmd_id); - -/** - * WMI event handler register function - * - * @param wmi_handle : handle to WMI. - * @param event_id : WMI event ID - * @param handler_func : Event handler call back function - * @return 0 on success and -ve on failure. - */ -int -wmi_unified_register_event_handler(wmi_unified_t wmi_handle, - WMI_EVT_ID event_id, - wmi_unified_event_handler handler_func); - -/** - * WMI event handler unregister function - * - * @param wmi_handle : handle to WMI. - * @param event_id : WMI event ID - * @return 0 on success and -ve on failure. - */ -int -wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle, - WMI_EVT_ID event_id); - -/** - * request wmi to connet its htc service. - * @param wmi_handle : handle to WMI. - * @return void - */ -int -wmi_unified_connect_htc_service(struct wmi_unified *wmi_handle, - void *htc_handle); - -/* - * WMI API to verify the host has enough credits to suspend - */ - -int wmi_is_suspend_ready(wmi_unified_t wmi_handle); - -/** - WMI API to get updated host_credits - */ - -int wmi_get_host_credits(wmi_unified_t wmi_handle); - -/** - WMI API to get WMI Pending Commands in the HTC queue - */ - -int wmi_get_pending_cmds(wmi_unified_t wmi_handle); - -/** - WMI API to set target suspend state - */ - -void wmi_set_target_suspend(wmi_unified_t wmi_handle, bool val); - -#ifdef FEATURE_RUNTIME_PM -void -wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, bool val); -bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle); -#else -static inline void -wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, bool val) -{ - return; -} -static inline bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle) -{ - return false; -} -#endif - - -/** - * WMA Callback to process fw event. - */ -typedef int (*wma_process_fw_event_handler_cbk)(struct wmi_unified *wmi_handle, - wmi_buf_t evt_buf); - -void wmi_process_fw_event(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf); -uint16_t wmi_get_max_msg_len(wmi_unified_t wmi_handle); -#endif /* _WMI_UNIFIED_API_H_ */ diff --git a/core/wmi/wmi_unified_priv.h b/core/wmi/wmi_unified_priv.h deleted file mode 100644 index a508c828cdf4..000000000000 --- a/core/wmi/wmi_unified_priv.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * This file contains the API definitions for the Unified Wireless Module Interface (WMI). - */ -#ifndef _WMI_UNIFIED_PRIV_H_ -#define _WMI_UNIFIED_PRIV_H_ -#include -#include "a_types.h" -#include "wmi.h" -#include "wmi_unified.h" -#include "qdf_atomic.h" - -#define WMI_UNIFIED_MAX_EVENT 0x100 -#define WMI_MAX_CMDS 1024 - -typedef qdf_nbuf_t wmi_buf_t; - -#ifdef WMI_INTERFACE_EVENT_LOGGING - -#define WMI_EVENT_DEBUG_MAX_ENTRY (1024) - -struct wmi_command_debug { - uint32_t command; - uint32_t data[4]; /*16 bytes of WMI cmd excluding TLV and WMI headers */ - uint64_t time; -}; - -struct wmi_event_debug { - uint32_t event; - uint32_t data[4]; /*16 bytes of WMI event data excluding TLV header */ - uint64_t time; -}; - -#endif /*WMI_INTERFACE_EVENT_LOGGING */ - -#ifdef WLAN_OPEN_SOURCE -struct fwdebug { - struct sk_buff_head fwlog_queue; - struct completion fwlog_completion; - A_BOOL fwlog_open; -}; -#endif /* WLAN_OPEN_SOURCE */ - -struct wmi_unified { - ol_scn_t scn_handle; /* handle to device */ - qdf_atomic_t pending_cmds; - HTC_ENDPOINT_ID wmi_endpoint_id; - uint16_t max_msg_len; - WMI_EVT_ID event_id[WMI_UNIFIED_MAX_EVENT]; - wmi_unified_event_handler event_handler[WMI_UNIFIED_MAX_EVENT]; - uint32_t max_event_idx; - void *htc_handle; - qdf_spinlock_t eventq_lock; - qdf_nbuf_queue_t event_queue; - struct work_struct rx_event_work; -#ifdef WLAN_OPEN_SOURCE - struct fwdebug dbglog; - struct dentry *debugfs_phy; -#endif /* WLAN_OPEN_SOURCE */ - -#ifdef WMI_INTERFACE_EVENT_LOGGING - qdf_spinlock_t wmi_record_lock; -#endif /*WMI_INTERFACE_EVENT_LOGGING */ - - qdf_atomic_t is_target_suspended; - -#ifdef FEATURE_RUNTIME_PM - qdf_atomic_t runtime_pm_inprogress; -#endif - - int (*wma_process_fw_event_handler_cbk)(struct wmi_unified *wmi_handle, - wmi_buf_t evt_buf); -}; -#endif diff --git a/core/wmi/wmi_version_whitelist.c b/core/wmi/wmi_version_whitelist.c deleted file mode 100644 index ccad7fbeabd4..000000000000 --- a/core/wmi/wmi_version_whitelist.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * Every Product Line or chipset or team can have its own Whitelist table. - * The following is a list of versions that the present software can support - * even though its versions are incompatible. Any entry here means that the - * indicated version does not break WMI compatibility even though it has - * a minor version change. - */ -wmi_whitelist_version_info version_whitelist[] = { - {0, 0, 0x5F414351, 0x00004C4D, 0, 0} - , /* Placeholder: Major=0, Minor=0, Namespace="QCA_ML" (Dummy entry) */ -}; -- cgit v1.2.3 From 8e3e283a82fe6dbcd271120e4cbfdfba9c5fa1c3 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 6 Nov 2015 16:02:54 -0800 Subject: qcacld-3.0: Add extended IBSS feature on qcacld-3.0 Add extended IBSS feature on qcacld-3.0 Change-Id: I7faaf646df363a74954defbef103afbb4b72af92 CRs-Fixed: 766181 --- core/hdd/inc/wlan_hdd_assoc.h | 3 + core/hdd/inc/wlan_hdd_main.h | 29 + core/hdd/src/wlan_hdd_cfg80211.c | 17 + core/hdd/src/wlan_hdd_ioctl.c | 1221 +++++++++++++++++++- core/hdd/src/wlan_hdd_main.c | 51 + core/hdd/src/wlan_hdd_wext.c | 259 ++++- core/mac/inc/sir_api.h | 43 + core/mac/inc/wni_api.h | 1 + core/mac/src/include/sir_params.h | 10 + core/mac/src/pe/lim/lim_process_sme_req_messages.c | 55 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 6 + core/sme/inc/csr_api.h | 4 + core/sme/inc/sme_api.h | 10 + core/sme/inc/sme_internal.h | 10 + core/sme/src/common/sme_api.c | 267 ++++- core/sme/src/csr/csr_api_roam.c | 1 + core/wma/inc/wma.h | 6 +- core/wma/inc/wma_internal.h | 23 + core/wma/inc/wma_types.h | 12 + core/wma/src/wma_data.c | 146 +++ core/wma/src/wma_features.c | 319 +++++ core/wma/src/wma_main.c | 52 + 22 files changed, 2507 insertions(+), 38 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index e4b48f8f14b2..8b51e3b1adac 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -52,6 +52,9 @@ /* Timeout (in ms) for Link to Up before Registering Station */ #define ASSOC_LINKUP_TIMEOUT 60 +/* Timeout in ms for peer info request commpletion */ +#define IBSS_PEER_INFO_REQ_TIMOEUT 1000 + /* Type Declarations */ /** * typedef eConnectionState - Connection states diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 29b424fa1183..4ffb7a650b5b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -637,6 +637,29 @@ typedef struct hdd_cfg80211_state_s { eP2PActionFrameState actionFrmState; } hdd_cfg80211_state_t; + +/*--------------------------------------------------------------------------- + hdd_ibss_peer_info_params_t + ---------------------------------------------------------------------------*/ +typedef struct { + uint8_t staIdx; /* StaIdx */ + uint32_t txRate; /* Current Tx Rate */ + uint32_t mcsIndex; /* MCS Index */ + uint32_t txRateFlags; /* TxRate Flags */ + int8_t rssi; /* RSSI */ +} hdd_ibss_peer_info_params_t; + +typedef struct { + /** Request status */ + uint32_t status; + + /** Number of peers */ + uint8_t numIBSSPeers; + + /** Peer Info parameters */ + hdd_ibss_peer_info_params_t ibssPeerList[MAX_IBSS_PEERS]; +} hdd_ibss_peer_info_t; + struct hdd_station_ctx { /** Handle to the Wireless Extension State */ hdd_wext_state_t WextState; @@ -663,6 +686,7 @@ struct hdd_station_ctx { /*Save the wep/wpa-none keys */ tCsrRoamSetKey ibss_enc_key; + hdd_ibss_peer_info_t ibss_peer_info; bool hdd_ReassocScenario; @@ -906,6 +930,8 @@ struct hdd_adapter_s { QDF_STATUS tdlsAddStaStatus; #endif + struct completion ibss_peer_info_comp; + /* Track whether the linkup handling is needed */ bool isLinkUpSvcNeeded; @@ -1415,6 +1441,9 @@ int wlan_hdd_validate_context(hdd_context_t *pHddCtx); bool hdd_is_valid_mac_address(const uint8_t *pMacAddr); QDF_STATUS hdd_issta_p2p_clientconnected(hdd_context_t *pHddCtx); +struct qdf_mac_addr * +hdd_wlan_get_ibss_mac_addr_from_staid(hdd_adapter_t *pAdapter, + uint8_t staIdx); void hdd_checkandupdate_phymode(hdd_context_t *pHddCtx); #ifdef MSM_PLATFORM diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 0cf30ce47739..3f329fce1d18 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -9546,6 +9546,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, int status; QDF_STATUS hal_status; unsigned long rc; + tSirUpdateIE updateIE; ENTER(); @@ -9578,6 +9579,22 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, FL("BSS Type is not set to IBSS")); return -EINVAL; } + /* Clearing add IE of beacon */ + qdf_mem_copy(updateIE.bssid.bytes, pAdapter->macAddressCurrent.bytes, + sizeof(tSirMacAddr)); + updateIE.smeSessionId = pAdapter->sessionId; + updateIE.ieBufferlength = 0; + updateIE.pAdditionIEBuffer = NULL; + updateIE.append = true; + updateIE.notify = true; + if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pAdapter), + &updateIE, + eUPDATE_IE_PROBE_BCN) == QDF_STATUS_E_FAILURE) { + hddLog(LOGE, FL("Could not pass on PROBE_RSP_BCN data to PE")); + } + + /* Reset WNI_CFG_PROBE_RSP Flags */ + wlan_hdd_reset_prob_rspies(pAdapter); /* Issue Disconnect request */ INIT_COMPLETION(pAdapter->disconnect_comp_var); diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index e8d80bb0da8d..07667d51ce93 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -57,6 +57,12 @@ #define SIZE_OF_SETROAMMODE 11 /* size of SETROAMMODE */ #define SIZE_OF_GETROAMMODE 11 /* size of GETROAMMODE */ +/* + * Ibss prop IE from command will be of size: + * size = sizeof(oui) + sizeof(oui_data) + 1(Element ID) + 1(EID Length) + * OUI_DATA should be at least 3 bytes long + */ +#define WLAN_HDD_IBSS_MIN_OUI_DATA_LENGTH (3) #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) #define TID_MIN_VALUE 0 @@ -119,6 +125,9 @@ typedef struct { #define WLAN_HDD_MAX_TCP_PORT 65535 #endif +static uint16_t cesium_pid; +extern struct sock *cesium_nl_srv_sock; + #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, const uint32_t staId, void *context) @@ -261,6 +270,334 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, } #endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +/* Function header is left blank intentionally */ +static int hdd_parse_setrmcenable_command(uint8_t *pValue, + uint8_t *pRmcEnable) +{ + uint8_t *inPtr = pValue; + int tempInt; + int v = 0; + char buf[32]; + *pRmcEnable = 0; + + inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); + + if (NULL == inPtr) { + return 0; + } + + else if (SPACE_ASCII_VALUE != *inPtr) { + return 0; + } + + while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) + inPtr++; + + if ('\0' == *inPtr) { + return 0; + } + + sscanf(inPtr, "%32s ", buf); + v = kstrtos32(buf, 10, &tempInt); + if (v < 0) { + return -EINVAL; + } + + *pRmcEnable = tempInt; + + hddLog(LOG1, FL("ucRmcEnable: %d"), *pRmcEnable); + + return 0; +} + +/* Function header is left blank intentionally */ +static int hdd_parse_setrmcactionperiod_command(uint8_t *pValue, + uint32_t *pActionPeriod) +{ + uint8_t *inPtr = pValue; + int tempInt; + int v = 0; + char buf[32]; + *pActionPeriod = 0; + + inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); + + if (NULL == inPtr) { + return -EINVAL; + } + + else if (SPACE_ASCII_VALUE != *inPtr) { + return -EINVAL; + } + + while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) + inPtr++; + + if ('\0' == *inPtr) { + return 0; + } + + sscanf(inPtr, "%32s ", buf); + v = kstrtos32(buf, 10, &tempInt); + if (v < 0) { + return -EINVAL; + } + + if ((tempInt < WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMIN) || + (tempInt > WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STAMAX)) { + return -EINVAL; + } + + *pActionPeriod = tempInt; + + hddLog(LOG1, FL("uActionPeriod: %d"), *pActionPeriod); + + return 0; +} + +/* Function header is left blank intentionally */ +static int hdd_parse_setrmcrate_command(uint8_t *pValue, + uint32_t *pRate, + tTxrateinfoflags *pTxFlags) +{ + uint8_t *inPtr = pValue; + int tempInt; + int v = 0; + char buf[32]; + *pRate = 0; + *pTxFlags = 0; + + inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); + + if (NULL == inPtr) { + return -EINVAL; + } + + else if (SPACE_ASCII_VALUE != *inPtr) { + return -EINVAL; + } + + while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) + inPtr++; + + if ('\0' == *inPtr) { + return 0; + } + + sscanf(inPtr, "%32s ", buf); + v = kstrtos32(buf, 10, &tempInt); + if (v < 0) { + return -EINVAL; + } + + switch (tempInt) { + default: + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, + "Unsupported rate: %d", tempInt); + return -EINVAL; + case 0: + case 6: + case 9: + case 12: + case 18: + case 24: + case 36: + case 48: + case 54: + *pTxFlags = eHAL_TX_RATE_LEGACY; + *pRate = tempInt * 10; + break; + case 65: + *pTxFlags = eHAL_TX_RATE_HT20; + *pRate = tempInt * 10; + break; + case 72: + *pTxFlags = eHAL_TX_RATE_HT20 | eHAL_TX_RATE_SGI; + *pRate = 722; + break; + } + + hddLog(LOG1, FL("Rate: %d"), *pRate); + + return 0; +} + +/** + * hdd_cfg80211_get_ibss_peer_info_cb() - Callback function for IBSS + * Peer Info request + * @pUserData: Adapter private data + * @pPeerInfoRsp: Peer info response + * + * This is an asynchronous callback function from SME when the peer info + * is received + * + * Return: 0 for success non-zero for failure + */ +static void +hdd_cfg80211_get_ibss_peer_info_cb(void *pUserData, void *pPeerInfoRsp) +{ + hdd_adapter_t *adapter = (hdd_adapter_t *) pUserData; + hdd_ibss_peer_info_t *pPeerInfo = (hdd_ibss_peer_info_t *)pPeerInfoRsp; + hdd_station_ctx_t *pStaCtx; + uint8_t i; + + /* Sanity check */ + if ((NULL == adapter) || + (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) { + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, + "invalid adapter or adapter has invalid magic"); + return; + } + + pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + if (NULL != pPeerInfo && QDF_STATUS_SUCCESS == pPeerInfo->status) { + pStaCtx->ibss_peer_info.status = pPeerInfo->status; + pStaCtx->ibss_peer_info.numIBSSPeers = pPeerInfo->numIBSSPeers; + + /* Paranoia check */ + if (pPeerInfo->numIBSSPeers < MAX_IBSS_PEERS) { + for (i = 0; i < pPeerInfo->numIBSSPeers; i++) { + memcpy(&pStaCtx->ibss_peer_info.ibssPeerList[i], + &pPeerInfo->ibssPeerList[i], + sizeof(hdd_ibss_peer_info_params_t)); + } + hddLog(LOG1, FL("Peer Info copied in HDD")); + } else { + hddLog(LOG1, + FL("Number of peers %d returned is more than limit %d"), + pPeerInfo->numIBSSPeers, MAX_IBSS_PEERS); + } + } else { + hddLog(LOG1, FL("peerInfo returned is NULL")); + } + + complete(&adapter->ibss_peer_info_comp); +} + +/** + * hdd_cfg80211_get_ibss_peer_info_all() - get ibss peers' info + * @adapter: Adapter context + * + * Request function to get IBSS peer info from lower layers + * + * Return: 0 for success non-zero for failure + */ +static +QDF_STATUS hdd_cfg80211_get_ibss_peer_info_all(hdd_adapter_t *adapter) +{ + tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); + QDF_STATUS retStatus = QDF_STATUS_E_FAILURE; + unsigned long rc; + + INIT_COMPLETION(adapter->ibss_peer_info_comp); + + retStatus = sme_request_ibss_peer_info(hHal, adapter, + hdd_cfg80211_get_ibss_peer_info_cb, + true, 0xFF); + + if (QDF_STATUS_SUCCESS == retStatus) { + rc = wait_for_completion_timeout + (&adapter->ibss_peer_info_comp, + msecs_to_jiffies(IBSS_PEER_INFO_REQ_TIMOEUT)); + + /* status will be 0 if timed out */ + if (!rc) { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: IBSS_PEER_INFO_TIMEOUT", + __func__); + retStatus = QDF_STATUS_E_FAILURE; + return retStatus; + } + } else { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: sme_request_ibss_peer_info Request failed", + __func__); + } + + return retStatus; +} + +/** + * hdd_cfg80211_get_ibss_peer_info() - get ibss peer info + * @adapter: Adapter context + * @staIdx: Sta index for which the peer info is requested + * + * Request function to get IBSS peer info from lower layers + * + * Return: 0 for success non-zero for failure + */ +static QDF_STATUS +hdd_cfg80211_get_ibss_peer_info(hdd_adapter_t *adapter, uint8_t staIdx) +{ + unsigned long rc; + tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(adapter); + QDF_STATUS retStatus = QDF_STATUS_E_FAILURE; + + INIT_COMPLETION(adapter->ibss_peer_info_comp); + + retStatus = sme_request_ibss_peer_info(hHal, adapter, + hdd_cfg80211_get_ibss_peer_info_cb, + false, staIdx); + + if (QDF_STATUS_SUCCESS == retStatus) { + rc = wait_for_completion_timeout( + &adapter->ibss_peer_info_comp, + msecs_to_jiffies(IBSS_PEER_INFO_REQ_TIMOEUT)); + + /* status = 0 on timeout */ + if (!rc) { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: IBSS_PEER_INFO_TIMEOUT", + __func__); + retStatus = QDF_STATUS_E_FAILURE; + return retStatus; + } + } else { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: sme_request_ibss_peer_info Request failed", + __func__); + } + + return retStatus; +} + +/* Function header is left blank intentionally */ +QDF_STATUS +hdd_parse_get_ibss_peer_info(uint8_t *pValue, struct qdf_mac_addr *pPeerMacAddr) +{ + uint8_t *inPtr = pValue; + inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); + + if (NULL == inPtr) { + return QDF_STATUS_E_FAILURE;; + } + + else if (SPACE_ASCII_VALUE != *inPtr) { + return QDF_STATUS_E_FAILURE;; + } + + while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) + inPtr++; + + if ('\0' == *inPtr) { + return QDF_STATUS_E_FAILURE;; + } + + if (inPtr[2] != ':' || inPtr[5] != ':' || inPtr[8] != ':' || + inPtr[11] != ':' || inPtr[14] != ':') { + return QDF_STATUS_E_FAILURE;; + } + sscanf(inPtr, "%2x:%2x:%2x:%2x:%2x:%2x", + (unsigned int *)&pPeerMacAddr->bytes[0], + (unsigned int *)&pPeerMacAddr->bytes[1], + (unsigned int *)&pPeerMacAddr->bytes[2], + (unsigned int *)&pPeerMacAddr->bytes[3], + (unsigned int *)&pPeerMacAddr->bytes[4], + (unsigned int *)&pPeerMacAddr->bytes[5]); + + return QDF_STATUS_SUCCESS; +} + static void hdd_get_band_helper(hdd_context_t *hdd_ctx, int *pBand) { eCsrBand band = -1; @@ -2158,50 +2495,188 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) return adapter->linkStatus; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +static void hdd_tx_fail_ind_callback(uint8_t *MacAddr, uint8_t seqNo) +{ + int payload_len; + struct sk_buff *skb; + struct nlmsghdr *nlh; + uint8_t *data; + + payload_len = ETH_ALEN; + + if (0 == cesium_pid) { + hddLog(QDF_TRACE_LEVEL_ERROR, + "%s: cesium process not registered", __func__); + return; + } + + skb = nlmsg_new(payload_len, GFP_ATOMIC); + if (skb == NULL) { + hddLog(LOGE, + FL("nlmsg_new() failed for msg size[%d]"), + NLMSG_SPACE(payload_len)); + return; + } + + nlh = nlmsg_put(skb, cesium_pid, seqNo, 0, payload_len, NLM_F_REQUEST); + + if (NULL == nlh) { + hddLog(QDF_TRACE_LEVEL_ERROR, + "%s: nlmsg_put() failed for msg size[%d]", + __func__, NLMSG_SPACE(payload_len)); + + kfree_skb(skb); + return; + } + + data = nlmsg_data(nlh); + memcpy(data, MacAddr, ETH_ALEN); + + if (nlmsg_unicast(cesium_nl_srv_sock, skb, cesium_pid) < 0) { + hddLog(QDF_TRACE_LEVEL_ERROR, + "%s: nlmsg_unicast() failed for msg size[%d]", + __func__, NLMSG_SPACE(payload_len)); + } + + return; +} + + /** - * hdd_parse_ese_beacon_req() - Parse ese beacon request - * @pValue: Pointer to data - * @pEseBcnReq: Output pointer to store parsed ie information - * - * This function parses the ese beacon request passed in the format - * CCXBEACONREQ - * Channel 1Scan Mode Meas DurationChannel N - * Scan Mode NMeas Duration N + * hdd_ParseuserParams - return a pointer to the next argument + * @pValue: Input argument string + * @ppArg: Output pointer to the next argument * - * If the Number of bcn req fields (N) does not match with the - * actual number of fields passed then take N. - * and are treated - * as one pair. For example, CCXBEACONREQ 2 1 1 1 30 2 44 0 40. - * This function does not take care of removing duplicate channels from the - * list + * This function parses argument stream and finds the pointer + * to the next argument * - * Return: 0 for success non-zero for failure + * Return: 0 if the next argument found; -EINVAL otherwise */ -static int hdd_parse_ese_beacon_req(uint8_t *pValue, - tCsrEseBeaconReq *pEseBcnReq) +static int hdd_parse_user_params(uint8_t *pValue, uint8_t **ppArg) { - uint8_t *inPtr = pValue; - int tempInt = 0; - int j = 0, i = 0, v = 0; - char buf[32]; + uint8_t *pVal; - inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); - /* no argument after the command */ - if (NULL == inPtr) { + pVal = strnchr(pValue, strlen(pValue), ' '); + + if (NULL == pVal) { + /* no argument remains */ return -EINVAL; - } - /* no space after the command */ - else if (SPACE_ASCII_VALUE != *inPtr) { + } else if (SPACE_ASCII_VALUE != *pVal) { + /* no space after the current argument */ return -EINVAL; } + pVal++; + /* remove empty spaces */ - while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) - inPtr++; + while ((SPACE_ASCII_VALUE == *pVal) && ('\0' != *pVal)) { + pVal++; + } /* no argument followed by spaces */ - if ('\0' == *inPtr) + if ('\0' == *pVal) { + return -EINVAL; + } + + *ppArg = pVal; + + return 0; +} + +/** + * hdd_parse_ibsstx_fail_event_params - Parse params + * for SETIBSSTXFAILEVENT + * @pValue: Input ibss tx fail event argument + * @tx_fail_count: (Output parameter) Tx fail counter + * @pid: (Output parameter) PID + * + * Return: 0 if the parsing succeeds; -EINVAL otherwise + */ +static int hdd_parse_ibsstx_fail_event_params(uint8_t *pValue, + uint8_t *tx_fail_count, + uint16_t *pid) +{ + uint8_t *param = NULL; + int ret; + + ret = hdd_parse_user_params(pValue, ¶m); + + if (0 == ret && NULL != param) { + if (1 != sscanf(param, "%hhu", tx_fail_count)) { + ret = -EINVAL; + goto done; + } + } else { + goto done; + } + + if (0 == *tx_fail_count) { + *pid = 0; + goto done; + } + + pValue = param; + pValue++; + + ret = hdd_parse_user_params(pValue, ¶m); + + if (0 == ret) { + if (1 != sscanf(param, "%hu", pid)) { + ret = -EINVAL; + goto done; + } + } else { + goto done; + } + +done: + return ret; +} + +#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +/** + * hdd_parse_ese_beacon_req() - Parse ese beacon request + * @pValue: Pointer to data + * @pEseBcnReq: Output pointer to store parsed ie information + * + * This function parses the ese beacon request passed in the format + * CCXBEACONREQ + * Channel 1Scan Mode Meas DurationChannel N + * Scan Mode NMeas Duration N + * + * If the Number of bcn req fields (N) does not match with the + * actual number of fields passed then take N. + * and are treated + * as one pair. For example, CCXBEACONREQ 2 1 1 1 30 2 44 0 40. + * This function does not take care of removing duplicate channels from the + * list + * + * Return: 0 for success non-zero for failure + */ +static int hdd_parse_ese_beacon_req(uint8_t *pValue, + tCsrEseBeaconReq *pEseBcnReq) +{ + uint8_t *inPtr = pValue; + int tempInt = 0; + int j = 0, i = 0, v = 0; + char buf[32]; + + inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE); + /* no argument after the command */ + if (NULL == inPtr) { + return -EINVAL; + } + /* no space after the command */ + else if (SPACE_ASCII_VALUE != *inPtr) { + return -EINVAL; + } + + /* remove empty spaces */ + while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr)) + inPtr++; + + /* no argument followed by spaces */ + if ('\0' == *inPtr) return -EINVAL; /* get the first argument ie measurement token */ @@ -4658,6 +5133,683 @@ exit: return ret; } +/* Function header is left blank intentionally */ +static int hdd_parse_set_ibss_oui_data_command(uint8_t *command, uint8_t *ie, + int32_t *oui_length, int32_t limit) +{ + uint8_t len; + uint8_t data; + + while ((SPACE_ASCII_VALUE == *command) && ('\0' != *command)) { + command++; + limit--; + } + + len = 2; + + while ((SPACE_ASCII_VALUE != *command) && ('\0' != *command) && + (limit > 1)) { + sscanf(command, "%02x", (unsigned int *)&data); + ie[len++] = data; + command += 2; + limit -= 2; + } + + *oui_length = len - 2; + + while ((SPACE_ASCII_VALUE == *command) && ('\0' != *command)) { + command++; + limit--; + } + + while ((SPACE_ASCII_VALUE != *command) && ('\0' != *command) && + (limit > 1)) { + sscanf(command, "%02x", (unsigned int *)&data); + ie[len++] = data; + command += 2; + limit -= 2; + } + + ie[0] = IE_EID_VENDOR; + ie[1] = len - 2; + + return len; +} + +/** + * drv_cmd_set_ibss_beacon_oui_data() - set ibss oui data command + * @adapter: Pointer to adapter + * @hdd_ctx: Pointer to HDD context + * @command: Pointer to command string + * @command_len : Command length + * @priv_data : Pointer to priv data + * + * Return: + * int status code + */ +static int drv_cmd_set_ibss_beacon_oui_data(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int i = 0; + int status; + int ret = 0; + uint8_t *ibss_ie; + int32_t oui_length = 0; + uint32_t ibss_ie_length; + uint8_t *value = command; + tSirModifyIE ibssModifyIE; + tCsrRoamProfile *pRoamProfile; + hdd_wext_state_t *pWextState; + + + if (WLAN_HDD_IBSS != adapter->device_mode) { + hddLog(LOG1, FL("Device_mode %s(%d) not IBSS"), + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + return ret; + } + + pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter); + + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: received command %s", __func__, + ((char *)value)); + + + /* validate argument of command */ + if (strlen(value) <= command_len) { + hddLog(LOGE, + FL("No arguements in command length %zu"), + strlen(value)); + ret = -EFAULT; + goto exit; + } + + /* moving to arguments of commands */ + value = value + command_len; + command_len = strlen(value); + + /* oui_data can't be less than 3 bytes */ + if (command_len < (2 * WLAN_HDD_IBSS_MIN_OUI_DATA_LENGTH)) { + hddLog(LOGE, + FL("Invalid SETIBSSBEACONOUIDATA command length %d"), + command_len); + ret = -EFAULT; + goto exit; + } + + ibss_ie = qdf_mem_malloc(command_len); + if (!ibss_ie) { + hddLog(LOGE, + FL("Could not allocate memory for command length %d"), + command_len); + ret = -ENOMEM; + goto exit; + } + qdf_mem_zero(ibss_ie, command_len); + + ibss_ie_length = hdd_parse_set_ibss_oui_data_command(value, ibss_ie, + &oui_length, + command_len); + if (ibss_ie_length <= (2 * WLAN_HDD_IBSS_MIN_OUI_DATA_LENGTH)) { + hddLog(LOGE, FL("Could not parse command %s return length %d"), + value, ibss_ie_length); + ret = -EFAULT; + qdf_mem_free(ibss_ie); + goto exit; + } + + pRoamProfile = &pWextState->roamProfile; + + qdf_copy_macaddr(&ibssModifyIE.bssid, + pRoamProfile->BSSIDs.bssid); + + ibssModifyIE.smeSessionId = adapter->sessionId; + ibssModifyIE.notify = true; + ibssModifyIE.ieID = IE_EID_VENDOR; + ibssModifyIE.ieIDLen = ibss_ie_length; + ibssModifyIE.ieBufferlength = ibss_ie_length; + ibssModifyIE.pIEBuffer = ibss_ie; + ibssModifyIE.oui_length = oui_length; + + hddLog(LOGW, FL("ibss_ie length %d oui_length %d ibss_ie:"), + ibss_ie_length, oui_length); + while (i < ibssModifyIE.ieBufferlength) + hddLog(LOGW, FL("0x%x"), ibss_ie[i++]); + + /* Probe Bcn modification */ + sme_modify_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), + &ibssModifyIE, eUPDATE_IE_PROBE_BCN); + + /* Populating probe resp frame */ + sme_modify_add_ie(WLAN_HDD_GET_HAL_CTX(adapter), + &ibssModifyIE, eUPDATE_IE_PROBE_RESP); + + qdf_mem_free(ibss_ie); + + status = sme_send_cesium_enable_ind((tHalHandle)(hdd_ctx->hHal), + adapter->sessionId); + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Could not send cesium enable indication %d", + status); + ret = -EINVAL; + goto exit; + } + +exit: + return ret; +} + +static int drv_cmd_set_rmc_enable(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + uint8_t *value = command; + uint8_t ucRmcEnable = 0; + int status; + + if ((WLAN_HDD_IBSS != adapter->device_mode) && + (WLAN_HDD_SOFTAP != adapter->device_mode)) { + hddLog(LOGE, + "Received SETRMCENABLE cmd in invalid mode %s(%d)", + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + hddLog(LOGE, + "SETRMCENABLE cmd is allowed only in IBSS/SOFTAP mode"); + ret = -EINVAL; + goto exit; + } + + status = hdd_parse_setrmcenable_command(value, &ucRmcEnable); + if (status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Invalid SETRMCENABLE command "); + ret = -EINVAL; + goto exit; + } + + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: ucRmcEnable %d ", __func__, ucRmcEnable); + + if (true == ucRmcEnable) { + status = sme_enable_rmc((tHalHandle) + (hdd_ctx->hHal), + adapter->sessionId); + } else if (false == ucRmcEnable) { + status = sme_disable_rmc((tHalHandle) + (hdd_ctx->hHal), + adapter->sessionId); + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Invalid SETRMCENABLE command %d", + ucRmcEnable); + ret = -EINVAL; + goto exit; + } + + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: SETRMC %d failed status %d", + __func__, ucRmcEnable, status); + ret = -EINVAL; + goto exit; + } + +exit: + return ret; +} + +static int drv_cmd_set_rmc_action_period(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + uint8_t *value = command; + uint32_t uActionPeriod = 0; + int status; + + if ((WLAN_HDD_IBSS != adapter->device_mode) && + (WLAN_HDD_SOFTAP != adapter->device_mode)) { + hddLog(LOGE, "Received SETRMC cmd in invalid mode %s(%d)", + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + hddLog(LOGE, + "SETRMC cmd is allowed only in IBSS/SOFTAP mode"); + ret = -EINVAL; + goto exit; + } + + status = hdd_parse_setrmcactionperiod_command(value, &uActionPeriod); + if (status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Invalid SETRMCACTIONPERIOD command "); + ret = -EINVAL; + goto exit; + } + + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: uActionPeriod %d ", __func__, + uActionPeriod); + + if (sme_cfg_set_int(hdd_ctx->hHal, + WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY, + uActionPeriod)) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Could not set SETRMCACTIONPERIOD %d", + __func__, uActionPeriod); + ret = -EINVAL; + goto exit; + } + + status = sme_send_rmc_action_period((tHalHandle)(hdd_ctx->hHal), + adapter->sessionId); + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Could not send cesium enable indication %d", + status); + ret = -EINVAL; + goto exit; + } + +exit: + return ret; +} + +static int drv_cmd_get_ibss_peer_info_all(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + int status = QDF_STATUS_SUCCESS; + hdd_station_ctx_t *pHddStaCtx = NULL; + char *extra = NULL; + int idx = 0; + int length = 0; + struct qdf_mac_addr *macAddr; + uint32_t txRateMbps = 0; + uint32_t numOfBytestoPrint = 0; + + if (WLAN_HDD_IBSS != adapter->device_mode) { + hdd_warn("Unsupported in mode %s(%d)", + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + return -EINVAL; + } + + pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: Received GETIBSSPEERINFOALL Command", + __func__); + + /* Handle the command */ + status = hdd_cfg80211_get_ibss_peer_info_all(adapter); + if (QDF_STATUS_SUCCESS == status) { + /* + * The variable extra needed to be allocated on the heap since + * amount of memory required to copy the data for 32 devices + * exceeds the size of 1024 bytes of default stack size. On + * 64 bit devices, the default max stack size of 2048 bytes + */ + extra = kmalloc(WLAN_MAX_BUF_SIZE, GFP_KERNEL); + + if (NULL == extra) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s:kmalloc failed", + __func__); + ret = -EINVAL; + goto exit; + } + + /* Copy number of stations */ + length = scnprintf(extra, WLAN_MAX_BUF_SIZE, "%d ", + pHddStaCtx->ibss_peer_info. + numIBSSPeers); + numOfBytestoPrint = length; + for (idx = 0; idx < pHddStaCtx->ibss_peer_info.numIBSSPeers; + idx++) { + macAddr = hdd_wlan_get_ibss_mac_addr_from_staid + (adapter, + pHddStaCtx->ibss_peer_info. + ibssPeerList[idx].staIdx); + if (NULL != macAddr) { + txRateMbps = ((pHddStaCtx-> + ibss_peer_info. + ibssPeerList[idx].txRate) + * 500 * 1000) / 1000000; + length += scnprintf((extra + length), + WLAN_MAX_BUF_SIZE - length, + "%02x:%02x:%02x:%02x:%02x:%02x %d %d ", + macAddr->bytes[0], + macAddr->bytes[1], + macAddr->bytes[2], + macAddr->bytes[3], + macAddr->bytes[4], + macAddr->bytes[5], + (int)txRateMbps, + (int)pHddStaCtx-> + ibss_peer_info. + ibssPeerList[idx]. + rssi); + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: MAC ADDR is NULL for staIdx: %d", + __func__, + pHddStaCtx-> + ibss_peer_info. + ibssPeerList[idx]. + staIdx); + } + + /* + * QDF_TRACE() macro has limitation of 512 bytes + * for the print buffer. Hence printing the data + * in two chunks. The first chunk will have the data + * for 16 devices and the second chunk will + * have the rest. + */ + if (idx < NUM_OF_STA_DATA_TO_PRINT) + numOfBytestoPrint = length; + } + + /* + * Copy the data back into buffer, if the data to copy is + * more than 512 bytes than we will split the data and do + * it in two shots + */ + if (copy_to_user(priv_data->buf, extra, numOfBytestoPrint)) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Copy into user data buffer failed ", + __func__); + ret = -EFAULT; + goto exit; + } + + priv_data->buf[numOfBytestoPrint] = '\0'; + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO_MED, "%s", + priv_data->buf); + + if (length > numOfBytestoPrint) { + if (copy_to_user + (priv_data->buf + numOfBytestoPrint, + extra + numOfBytestoPrint, + length - numOfBytestoPrint + 1)) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Copy into user data buffer failed ", + __func__); + ret = -EFAULT; + goto exit; + } + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO_MED, + "%s", + &priv_data->buf[numOfBytestoPrint]); + } + + /* Free temporary buffer */ + kfree(extra); + } else { + /* Command failed, log error */ + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: GETIBSSPEERINFOALL command failed with status code %d", + __func__, status); + ret = -EINVAL; + goto exit; + } + ret = 0; + +exit: + return ret; +} + +/* Peer Info command */ +static int drv_cmd_get_ibss_peer_info(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + uint8_t *value = command; + QDF_STATUS status; + hdd_station_ctx_t *pHddStaCtx = NULL; + char extra[128] = { 0 }; + uint32_t length = 0; + uint8_t staIdx = 0; + uint32_t txRateMbps = 0; + uint32_t txRate; + struct qdf_mac_addr peerMacAddr; + + if (WLAN_HDD_IBSS != adapter->device_mode) { + hdd_warn("Unsupported in mode %s(%d)", + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + return -EINVAL; + } + + pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); + + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: Received GETIBSSPEERINFO Command", + __func__); + + /* if there are no peers, no need to continue with the command */ + if (eConnectionState_IbssConnected != + pHddStaCtx->conn_info.connState) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, + "%s:No IBSS Peers coalesced", + __func__); + ret = -EINVAL; + goto exit; + } + + /* Parse the incoming command buffer */ + status = hdd_parse_get_ibss_peer_info(value, &peerMacAddr); + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Invalid GETIBSSPEERINFO command", + __func__); + ret = -EINVAL; + goto exit; + } + + /* Get station index for the peer mac address */ + hdd_ibss_get_sta_id(pHddStaCtx, &peerMacAddr, &staIdx); + + if (staIdx > MAX_IBSS_PEERS) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Invalid StaIdx %d returned", + __func__, staIdx); + ret = -EINVAL; + goto exit; + } + + /* Handle the command */ + status = hdd_cfg80211_get_ibss_peer_info(adapter, staIdx); + if (QDF_STATUS_SUCCESS == status) { + txRate = pHddStaCtx->ibss_peer_info.ibssPeerList[0].txRate; + txRateMbps = (txRate * 500 * 1000) / 1000000; + + length = scnprintf(extra, sizeof(extra), "%d %d", + (int)txRateMbps, + (int)pHddStaCtx->ibss_peer_info. + ibssPeerList[0].rssi); + + /* Copy the data back into buffer */ + if (copy_to_user(priv_data->buf, &extra, length + 1)) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: copy data to user buffer failed GETIBSSPEERINFO command", + __func__); + ret = -EFAULT; + goto exit; + } + } else { + /* Command failed, log error */ + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: GETIBSSPEERINFO command failed with status code %d", + __func__, status); + ret = -EINVAL; + goto exit; + } + + /* Success ! */ + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_MED, + "%s", priv_data->buf); + ret = 0; + +exit: + return ret; +} + +static int drv_cmd_set_rmc_tx_rate(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + uint8_t *value = command; + uint32_t uRate = 0; + tTxrateinfoflags txFlags = 0; + tSirRateUpdateInd rateUpdateParams = {0}; + int status; + struct hdd_config *pConfig = hdd_ctx->config; + + if ((WLAN_HDD_IBSS != adapter->device_mode) && + (WLAN_HDD_SOFTAP != adapter->device_mode)) { + hddLog(LOGE, + "Received SETRMCTXRATE cmd in invalid mode %s(%d)", + hdd_device_mode_to_string(adapter->device_mode), + adapter->device_mode); + hddLog(LOGE, + "SETRMCTXRATE cmd is allowed only in IBSS/SOFTAP mode"); + ret = -EINVAL; + goto exit; + } + + status = hdd_parse_setrmcrate_command(value, &uRate, &txFlags); + if (status) { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "Invalid SETRMCTXRATE command "); + ret = -EINVAL; + goto exit; + } + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s: uRate %d ", __func__, uRate); + /* -1 implies ignore this param */ + rateUpdateParams.ucastDataRate = -1; + + /* + * Fill the user specifieed RMC rate param + * and the derived tx flags. + */ + rateUpdateParams.nss = (pConfig->enable2x2 == 0) ? 0 : 1; + rateUpdateParams.reliableMcastDataRate = uRate; + rateUpdateParams.reliableMcastDataRateTxFlag = txFlags; + rateUpdateParams.dev_mode = adapter->device_mode; + rateUpdateParams.bcastDataRate = -1; + memcpy(rateUpdateParams.bssid.bytes, + adapter->macAddressCurrent.bytes, + sizeof(rateUpdateParams.bssid)); + status = sme_send_rate_update_ind((tHalHandle) (hdd_ctx->hHal), + &rateUpdateParams); + +exit: + return ret; +} + +static int drv_cmd_set_ibss_tx_fail_event(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + int ret = 0; + char *value; + uint8_t tx_fail_count = 0; + uint16_t pid = 0; + + value = command; + + ret = hdd_parse_ibsstx_fail_event_params(value, &tx_fail_count, &pid); + + if (0 != ret) { + hddLog(QDF_TRACE_LEVEL_INFO, + "%s: Failed to parse SETIBSSTXFAILEVENT arguments", + __func__); + goto exit; + } + + hddLog(QDF_TRACE_LEVEL_INFO, + "%s: tx_fail_cnt=%hhu, pid=%hu", __func__, + tx_fail_count, pid); + + if (0 == tx_fail_count) { + /* Disable TX Fail Indication */ + if (QDF_STATUS_SUCCESS == + sme_tx_fail_monitor_start_stop_ind(hdd_ctx->hHal, + tx_fail_count, + NULL)) { + cesium_pid = 0; + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: failed to disable TX Fail Event ", + __func__); + ret = -EINVAL; + } + } else { + if (QDF_STATUS_SUCCESS == + sme_tx_fail_monitor_start_stop_ind(hdd_ctx->hHal, + tx_fail_count, + (void *)hdd_tx_fail_ind_callback)) { + cesium_pid = pid; + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_INFO, + "%s: Registered Cesium pid %u", + __func__, cesium_pid); + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + "%s: Failed to enable TX Fail Monitoring", + __func__); + ret = -EINVAL; + } + } + +exit: + return ret; +} + #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, @@ -6133,6 +7285,13 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = { {"GETDWELLTIME", drv_cmd_get_dwell_time}, {"SETDWELLTIME", drv_cmd_set_dwell_time}, {"MIRACAST", drv_cmd_miracast}, + {"SETIBSSBEACONOUIDATA", drv_cmd_set_ibss_beacon_oui_data}, + {"SETRMCENABLE", drv_cmd_set_rmc_enable}, + {"SETRMCACTIONPERIOD", drv_cmd_set_rmc_action_period}, + {"GETIBSSPEERINFOALL", drv_cmd_get_ibss_peer_info_all}, + {"GETIBSSPEERINFO", drv_cmd_get_ibss_peer_info}, + {"SETRMCTXRATE", drv_cmd_set_rmc_tx_rate}, + {"SETIBSSTXFAILEVENT", drv_cmd_set_ibss_tx_fail_event}, #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) {"SETCCXROAMSCANCHANNELS", drv_cmd_set_ccx_roam_scan_channels}, {"GETTSMSTATS", drv_cmd_get_tsm_stats}, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 96d4a81e02c4..e77dba13e1b8 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -146,6 +146,8 @@ static int wlan_hdd_inited; */ DEFINE_SPINLOCK(hdd_context_lock); +#define WLAN_NLINK_CESIUM 30 + static qdf_wake_lock_t wlan_wake_lock; #define WOW_MAX_FILTER_LISTS 1 @@ -1619,6 +1621,45 @@ static void hdd_uninit(struct net_device *dev) cds_ssr_unprotect(__func__); } +static int hdd_open_cesium_nl_sock(void) +{ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) + struct netlink_kernel_cfg cfg = { + .groups = WLAN_NLINK_MCAST_GRP_ID, + .input = NULL + }; +#endif + int ret = 0; + +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) + cesium_nl_srv_sock = netlink_kernel_create(&init_net, WLAN_NLINK_CESIUM, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)) + THIS_MODULE, +#endif + &cfg); +#else + cesium_nl_srv_sock = netlink_kernel_create(&init_net, WLAN_NLINK_CESIUM, + WLAN_NLINK_MCAST_GRP_ID, + NULL, NULL, THIS_MODULE); +#endif + + if (cesium_nl_srv_sock == NULL) { + hddLog(QDF_TRACE_LEVEL_ERROR, + FL("NLINK: cesium netlink_kernel_create failed")); + ret = -ECONNREFUSED; + } + + return ret; +} + +static void hdd_close_cesium_nl_sock(void) +{ + if (NULL != cesium_nl_srv_sock) { + netlink_kernel_release(cesium_nl_srv_sock); + cesium_nl_srv_sock = NULL; + } +} + /** * __hdd_set_mac_address() - set the user specified mac address * @dev: Pointer to the net device. @@ -1889,6 +1930,7 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, init_completion(&adapter->tdls_mgmt_comp); init_completion(&adapter->tdls_link_establish_req_comp); #endif + init_completion(&adapter->ibss_peer_info_comp); init_completion(&adapter->change_country_code); @@ -3832,6 +3874,8 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) hdd_close_all_adapters(hdd_ctx, false); + hdd_close_cesium_nl_sock(); + hdd_ipa_cleanup(hdd_ctx); /* Free up RoC request queue and flush workqueue */ @@ -5680,6 +5724,11 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) goto err_nl_srv; } + if (hdd_open_cesium_nl_sock() < 0) { + hdd_alert("hdd_open_cesium_nl_sock failed"); + goto err_nl_srv; + } + /* * Action frame registered in one adapter which will * applicable to all interfaces @@ -5832,6 +5881,8 @@ err_nl_srv: /* Proceed and complete the clean up */ } + hdd_close_cesium_nl_sock(); + err_close_adapter: hdd_release_rtnl_lock(); diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 3c3fd4a2fe75..e5df3242fb1e 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -307,7 +307,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #define WE_GET_11W_INFO 9 #endif #define WE_GET_STATES 10 - +#define WE_GET_IBSS_STA_INFO 11 #define WE_GET_PHYMODE 12 #ifdef FEATURE_OEM_DATA_SUPPORT #define WE_GET_OEM_DATA_CAP 13 @@ -318,7 +318,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { /* Private ioctls and their sub-ioctls */ #define WLAN_PRIV_SET_NONE_GET_NONE (SIOCIWFIRSTPRIV + 6) #define WE_SET_REASSOC_TRIGGER 8 - +#define WE_IBSS_GET_PEER_INFO_ALL 10 #define WE_DUMP_AGC_START 11 #define WE_DUMP_AGC 12 #define WE_DUMP_CHANINFO_START 13 @@ -341,7 +341,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = { #ifdef FEATURE_WLAN_TDLS #define WE_TDLS_CONFIG_PARAMS 5 #endif - +#define WE_IBSS_GET_PEER_INFO 6 #define WE_UNIT_TEST_CMD 7 #define WE_MTRACE_DUMP_CMD 8 @@ -766,6 +766,194 @@ error: return; } +/** + * hdd_get_ibss_peer_info_cb() - IBSS Peer Info Callback + * @pUserData: user context originally passed to SME; we pass hdd adapter + * @pPeerInfoRsp: IBSS Peer information + * + * Return: None + */ +void hdd_get_ibss_peer_info_cb(void *pUserData, void *pPeerInfoRsp) +{ + hdd_adapter_t *pAdapter = (hdd_adapter_t *) pUserData; + hdd_ibss_peer_info_t *pPeerInfo = (hdd_ibss_peer_info_t *) pPeerInfoRsp; + hdd_station_ctx_t *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + uint8_t i; + + if (NULL != pPeerInfo && QDF_STATUS_SUCCESS == pPeerInfo->status) { + pStaCtx->ibss_peer_info.status = pPeerInfo->status; + pStaCtx->ibss_peer_info.numIBSSPeers = pPeerInfo->numIBSSPeers; + for (i = 0; i < pPeerInfo->numIBSSPeers; i++) { + memcpy(&pStaCtx->ibss_peer_info.ibssPeerList[i], + &pPeerInfo->ibssPeerList[i], + sizeof(hdd_ibss_peer_info_params_t)); + } + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, + "%s] PEER_INFO_CMD_STATUS is not SUCCESS", __func__); + } + + complete(&pAdapter->ibss_peer_info_comp); +} + +/** + * hdd_wlan_get_ibss_mac_addr_from_staid() - Get IBSS MAC address + * @pAdapter: Adapter upon which the IBSS client is active + * @staIdx: Station index of the IBSS peer + * + * Return: a pointer to the MAC address of the IBSS peer if the peer is + * found, otherwise %NULL. + */ +struct qdf_mac_addr * +hdd_wlan_get_ibss_mac_addr_from_staid(hdd_adapter_t *pAdapter, + uint8_t staIdx) +{ + uint8_t idx; + hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + + for (idx = 0; idx < MAX_IBSS_PEERS; idx++) { + if (0 != pHddStaCtx->conn_info.staId[idx] && + staIdx == pHddStaCtx->conn_info.staId[idx]) { + return &pHddStaCtx->conn_info.peerMacAddress[idx]; + } + } + return NULL; +} + +/** + * hdd_wlan_get_ibss_peer_info() - Print IBSS peer information + * @pAdapter: Adapter upon which the IBSS client is active + * @staIdx: Station index of the IBSS peer + * + * Return: QDF_STATUS_STATUS if the peer was found and displayed, + * otherwise an appropriate QDF_STATUS_E_* failure code. + */ +QDF_STATUS hdd_wlan_get_ibss_peer_info(hdd_adapter_t *pAdapter, uint8_t staIdx) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); + hdd_station_ctx_t *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + hdd_ibss_peer_info_t *pPeerInfo = &pStaCtx->ibss_peer_info; + + status = + sme_request_ibss_peer_info(hHal, pAdapter, hdd_get_ibss_peer_info_cb, + false, staIdx); + + INIT_COMPLETION(pAdapter->ibss_peer_info_comp); + + if (QDF_STATUS_SUCCESS == status) { + unsigned long rc; + rc = wait_for_completion_timeout + (&pAdapter->ibss_peer_info_comp, + msecs_to_jiffies(IBSS_PEER_INFO_REQ_TIMOEUT)); + if (!rc) { + hddLog(QDF_TRACE_LEVEL_ERROR, + FL("failed wait on ibss_peer_info_comp")); + return QDF_STATUS_E_FAILURE; + } + + /** Print the peer info */ + pr_info("pPeerInfo->numIBSSPeers = %d ", + pPeerInfo->numIBSSPeers); + pr_info + ("============================================================"); + { + struct qdf_mac_addr *macAddr = + hdd_wlan_get_ibss_mac_addr_from_staid(pAdapter, + staIdx); + uint32_t txRateMbps = + ((pPeerInfo->ibssPeerList[0].txRate) * 500 * 1000) / + 1000000; + + if (NULL != macAddr) { + pr_info("PEER ADDR :" MAC_ADDRESS_STR + " TxRate: %d Mbps RSSI: %d", + MAC_ADDR_ARRAY(macAddr->bytes), + (int)txRateMbps, + (int)pPeerInfo->ibssPeerList[0].rssi); + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + " ERROR: PEER MAC ADDRESS NOT FOUND "); + } + } + } else { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: sme_request_ibss_peer_info Request failed", + __func__); + } + + return status; +} + +/** + * hdd_wlan_get_ibss_peer_info_all() - Print all IBSS peers + * @pAdapter: Adapter upon which the IBSS clients are active + * + * Return: QDF_STATUS_STATUS if the peer information was retrieved and + * displayed, otherwise an appropriate QDF_STATUS_E_* failure code. + */ +QDF_STATUS hdd_wlan_get_ibss_peer_info_all(hdd_adapter_t *pAdapter) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter); + hdd_station_ctx_t *pStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + hdd_ibss_peer_info_t *pPeerInfo = &pStaCtx->ibss_peer_info; + int i; + + status = + sme_request_ibss_peer_info(hHal, pAdapter, hdd_get_ibss_peer_info_cb, + true, 0xFF); + INIT_COMPLETION(pAdapter->ibss_peer_info_comp); + + if (QDF_STATUS_SUCCESS == status) { + unsigned long rc; + rc = wait_for_completion_timeout + (&pAdapter->ibss_peer_info_comp, + msecs_to_jiffies(IBSS_PEER_INFO_REQ_TIMOEUT)); + if (!rc) { + hddLog(QDF_TRACE_LEVEL_ERROR, + FL("failed wait on ibss_peer_info_comp")); + return QDF_STATUS_E_FAILURE; + } + + /** Print the peer info */ + pr_info("pPeerInfo->numIBSSPeers = %d ", + (int)pPeerInfo->numIBSSPeers); + pr_info + ("============================================================"); + for (i = 0; i < pPeerInfo->numIBSSPeers; i++) { + uint8_t staIdx = pPeerInfo->ibssPeerList[i].staIdx; + struct qdf_mac_addr *macAddr = + hdd_wlan_get_ibss_mac_addr_from_staid(pAdapter, + staIdx); + uint32_t txRateMbps = + ((pPeerInfo->ibssPeerList[0].txRate) * 500 * 1000) / + 1000000; + + pr_info("STAIDX:%d ", + (int)pPeerInfo->ibssPeerList[i].staIdx); + if (NULL != macAddr) { + pr_info(" PEER ADDR :" MAC_ADDRESS_STR + " TxRate: %d Mbps RSSI: %d", + MAC_ADDR_ARRAY(macAddr->bytes), + (int)txRateMbps, + (int)pPeerInfo->ibssPeerList[i].rssi); + } else { + QDF_TRACE(QDF_MODULE_ID_HDD, + QDF_TRACE_LEVEL_ERROR, + " ERROR: PEER MAC ADDRESS NOT FOUND "); + } + } + } else { + hddLog(QDF_TRACE_LEVEL_WARN, + "%s: Warning: sme_request_ibss_peer_info Request failed", + __func__); + } + + return status; +} + /** * hdd_wlan_get_rts_threshold() - Get RTS threshold * @pAdapter: adapter upon which the request was received @@ -7260,6 +7448,39 @@ static int __iw_get_char_setnone(struct net_device *dev, break; } #endif + case WE_GET_IBSS_STA_INFO: + { + hdd_station_ctx_t *pHddStaCtx = + WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + int idx = 0; + int length = 0, buf = 0; + + for (idx = 0; idx < MAX_IBSS_PEERS; idx++) { + if (0 != pHddStaCtx->conn_info.staId[idx]) { + buf = snprintf + ((extra + length), + WE_MAX_STR_LEN - length, + "\n%d .%02x:%02x:%02x:%02x:%02x:%02x\n", + pHddStaCtx->conn_info.staId[idx], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[0], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[1], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[2], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[3], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[4], + pHddStaCtx->conn_info. + peerMacAddress[idx].bytes[5] + ); + length += buf; + } + } + wrqu->data.length = strlen(extra) + 1; + break; + } case WE_GET_PHYMODE: { bool ch_bond24 = false, ch_bond5g = false; @@ -7470,6 +7691,12 @@ static int __iw_setnone_getnone(struct net_device *dev, 0, DBG_CMD); break; + case WE_IBSS_GET_PEER_INFO_ALL: + { + hdd_wlan_get_ibss_peer_info_all(adapter); + break; + } + case WE_SET_REASSOC_TRIGGER: { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); @@ -7628,6 +7855,12 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, hddLog(LOG1, FL("Received length %d"), wrqu->data.length); switch (sub_cmd) { + case WE_IBSS_GET_PEER_INFO: + { + pr_info("Station ID = %d\n", apps_args[0]); + hdd_wlan_get_ibss_peer_info(pAdapter, apps_args[0]); + } + break; case WE_P2P_NOA_CMD: { @@ -10424,7 +10657,12 @@ static const struct iw_priv_args we_private_args[] = { "getPMFInfo" }, #endif - + { + WE_GET_IBSS_STA_INFO, + 0, + IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN, + "getIbssSTAs" + }, {WE_GET_PHYMODE, 0, IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN, @@ -10446,6 +10684,13 @@ static const struct iw_priv_args we_private_args[] = { 0, ""}, + /* handlers for sub-ioctl */ + { + WE_IBSS_GET_PEER_INFO_ALL, + 0, + 0, + "ibssPeerInfoAll" + }, {WE_GET_RECOVERY_STAT, 0, 0, @@ -10501,6 +10746,12 @@ static const struct iw_priv_args we_private_args[] = { 0, ""}, + /* handlers for sub-ioctl */ + {WE_IBSS_GET_PEER_INFO, + IW_PRIV_TYPE_INT | MAX_VAR_ARGS, + 0, + "ibssPeerInfo"}, + /* handlers for sub-ioctl */ {WE_MTRACE_SELECTIVE_MODULE_LOG_ENABLE_CMD, IW_PRIV_TYPE_INT | MAX_VAR_ARGS, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index d6c6af0b3130..ee72d48841ca 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1770,6 +1770,13 @@ typedef struct sAniDHCPStopInd { struct qdf_mac_addr peerMacAddr; } tAniDHCPInd, *tpAniDHCPInd; +typedef struct sAniTXFailMonitorInd { + uint16_t msgType; /* message type is same as the request type */ + uint16_t msgLen; /* length of the entire request */ + uint8_t tx_fail_count; + void *txFailIndCallback; +} tAniTXFailMonitorInd, *tpAniTXFailMonitorInd; + typedef enum eTxRateInfo { eHAL_TX_RATE_LEGACY = 0x1, /* Legacy rates */ eHAL_TX_RATE_HT20 = 0x2, /* HT20 rates */ @@ -3683,6 +3690,41 @@ typedef struct sSirDelPeriodicTxPtrn { uint8_t ucPtrnId; /* Pattern ID */ } tSirDelPeriodicTxPtrn, *tpSirDelPeriodicTxPtrn; +/*--------------------------------------------------------------------------- +* tSirIbssGetPeerInfoReqParams +*--------------------------------------------------------------------------*/ +typedef struct { + bool allPeerInfoReqd; /* If set, all IBSS peers stats are reported */ + uint8_t staIdx; /* If allPeerInfoReqd is not set, only stats */ + /* of peer with staIdx is reported */ +} tSirIbssGetPeerInfoReqParams, *tpSirIbssGetPeerInfoReqParams; + +/*--------------------------------------------------------------------------- +* tSirIbssGetPeerInfoParams +*--------------------------------------------------------------------------*/ +typedef struct { + uint8_t staIdx; /* StaIdx */ + uint32_t txRate; /* Tx Rate */ + uint32_t mcsIndex; /* MCS Index */ + uint32_t txRateFlags; /* TxRate Flags */ + int8_t rssi; /* RSSI */ +} tSirIbssPeerInfoParams; + +typedef struct { + uint32_t status; + uint8_t numPeers; + tSirIbssPeerInfoParams peerInfoParams[32]; +} tSirPeerInfoRspParams, *tpSirIbssPeerInfoRspParams; + +/*--------------------------------------------------------------------------- +* tSirIbssGetPeerInfoRspParams +*--------------------------------------------------------------------------*/ +typedef struct { + uint16_t mesgType; + uint16_t mesgLen; + tSirPeerInfoRspParams ibssPeerInfoRspParams; +} tSirIbssGetPeerInfoRspParams, *tpSirIbssGetPeerInfoRspParams; + typedef struct { uint16_t mesgType; uint16_t mesgLen; @@ -3817,6 +3859,7 @@ typedef struct sSirModifyIE { uint8_t ieIDLen; /*ie length as per spec */ uint16_t ieBufferlength; uint8_t *pIEBuffer; + int32_t oui_length; } tSirModifyIE, *tpSirModifyIE; diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 225149cda2d0..103cb278d3f2 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -181,6 +181,7 @@ enum eWniMsgTypes { eWNI_SME_LPHB_IND, #endif /* FEATURE_WLAN_LPHB */ + eWNI_SME_IBSS_PEER_INFO_RSP, eWNI_SME_GET_TSM_STATS_REQ, eWNI_SME_GET_TSM_STATS_RSP, eWNI_SME_TSM_IE_IND, diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 0264f898f947..46e20cd29d25 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -427,6 +427,9 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_SOC_DUAL_MAC_CFG_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 154) #define SIR_HAL_SOC_DUAL_MAC_CFG_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 155) +/* For IBSS peer info related messages */ +#define SIR_HAL_IBSS_PEER_INFO_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 158) + #define SIR_HAL_RATE_UPDATE_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 159) #define SIR_HAL_FLUSH_LOG_TO_FW (SIR_HAL_ITC_MSG_TYPES_BEGIN + 160) @@ -449,6 +452,8 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_SET_MAX_TX_POWER_PER_BAND_REQ \ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 170) +#define SIR_HAL_TX_FAIL_MONITOR_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 171) + #define SIR_HAL_UPDATE_MEMBERSHIP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 172) #define SIR_HAL_UPDATE_USERPOS (SIR_HAL_ITC_MSG_TYPES_BEGIN + 173) @@ -464,6 +469,11 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_BEACON_TX_SUCCESS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 179) #define SIR_HAL_DFS_RADAR_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 180) +#define SIR_HAL_IBSS_CESIUM_ENABLE_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 181) + +#define SIR_HAL_RMC_ENABLE_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 182) +#define SIR_HAL_RMC_DISABLE_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 183) +#define SIR_HAL_RMC_ACTION_PERIOD_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 184) #define SIR_HAL_INIT_THERMAL_INFO_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 185) #define SIR_HAL_SET_THERMAL_LEVEL (SIR_HAL_ITC_MSG_TYPES_BEGIN + 186) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 24c4f3f4e4a1..f202f26d7ec2 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -106,7 +106,10 @@ static void lim_update_add_ie_buffer(tpAniSirGlobal pMac, uint8_t **pDstData_buff, uint16_t *pDstDataLen, uint8_t *pSrcData_buff, uint16_t srcDataLen); - +static bool lim_update_ibss_prop_add_ies(tpAniSirGlobal pMac, + uint8_t **pDstData_buff, + uint16_t *pDstDataLen, + tSirModifyIE *pModifyIE); static void lim_process_modify_add_ies(tpAniSirGlobal pMac, uint32_t *pMsg); static void lim_process_update_add_ies(tpAniSirGlobal pMac, uint32_t *pMsg); @@ -5177,6 +5180,44 @@ lim_update_add_ie_buffer(tpAniSirGlobal pMac, } +/** + * lim_update_ibss_prop_add_ies() - update IBSS prop IE + * @pMac : Pointer to Global MAC structure + * @pDstData_buff : A pointer to pointer of dst buffer + * @pDstDataLen : A pointer to pointer of dst buffer length + * @pModifyIE : A pointer to tSirModifyIE + * + * This function replaces previous ibss prop_ie with new ibss prop_ie. + * + * Return: + * True or false depending upon whether IE is updated or not + */ +static bool +lim_update_ibss_prop_add_ies(tpAniSirGlobal pMac, uint8_t **pDstData_buff, + uint16_t *pDstDataLen, tSirModifyIE *pModifyIE) +{ + int32_t oui_length; + uint8_t *ibss_ie = NULL; + + ibss_ie = pModifyIE->pIEBuffer; + oui_length = pModifyIE->oui_length; + + if ((0 == oui_length) || (NULL == ibss_ie)) { + PELOGE(lim_log(pMac, LOGE, + FL("Invalid set IBSS vendor IE command length %d "), + oui_length);) + return false; + } + + lim_update_add_ie_buffer(pMac, + pDstData_buff, + pDstDataLen, + pModifyIE->pIEBuffer, + pModifyIE->ieBufferlength); + + return true; +} + /* * lim_process_modify_add_ies() - process modify additional IE req. * @@ -5228,6 +5269,12 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, switch (modify_add_ies->updateType) { case eUPDATE_IE_PROBE_RESP: /* Probe resp */ + if (LIM_IS_IBSS_ROLE(session_entry)) { + lim_update_ibss_prop_add_ies(mac_ctx, + &add_ie_params->probeRespData_buff, + &add_ie_params->probeRespDataLen, + &modify_add_ies->modifyIE); + } break; case eUPDATE_IE_ASSOC_RESP: /* assoc resp IE */ @@ -5241,6 +5288,12 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx, break; case eUPDATE_IE_PROBE_BCN: /*probe beacon IE */ + if (LIM_IS_IBSS_ROLE(session_entry)) { + ret = lim_update_ibss_prop_add_ies(mac_ctx, + &add_ie_params->probeRespBCNData_buff, + &add_ie_params->probeRespBCNDataLen, + &modify_add_ies->modifyIE); + } if (ret == true && modify_add_ies->modifyIE.notify) { lim_handle_param_update(mac_ctx, modify_add_ies->updateType); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index e170a11bbaa4..b249ed6d8d2a 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -489,6 +489,12 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) #ifdef FEATURE_WLAN_AUTO_SHUTDOWN CASE_RETURN_STRING(WMA_SET_AUTO_SHUTDOWN_TIMER_REQ); #endif + CASE_RETURN_STRING(WMA_IBSS_CESIUM_ENABLE_IND); + CASE_RETURN_STRING(WMA_GET_IBSS_PEER_INFO_REQ); + CASE_RETURN_STRING(WMA_TX_FAIL_MONITOR_IND); + CASE_RETURN_STRING(WMA_RMC_ENABLE_IND); + CASE_RETURN_STRING(WMA_RMC_DISABLE_IND); + CASE_RETURN_STRING(WMA_RMC_ACTION_PERIOD_IND); CASE_RETURN_STRING(WMA_INIT_THERMAL_INFO_CMD); CASE_RETURN_STRING(WMA_SET_THERMAL_LEVEL); CASE_RETURN_STRING(WMA_SET_SAP_INTRABSS_DIS); diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 6072d95ec379..ea13b14f25ec 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -479,6 +479,8 @@ typedef enum { eCSR_ROAM_UNPROT_MGMT_FRAME_IND, #endif + eCSR_ROAM_IBSS_PEER_INFO_COMPLETE, + #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) eCSR_ROAM_TSM_IE_IND, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, @@ -583,6 +585,8 @@ typedef enum { eCSR_ROAM_RESULT_TDLS_SHOULD_PEER_DISCONNECTED, #endif + eCSR_ROAM_RESULT_IBSS_PEER_INFO_SUCCESS, + eCSR_ROAM_RESULT_IBSS_PEER_INFO_FAILED, eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND, eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS, eCSR_ROAM_RESULT_CHANNEL_CHANGE_FAILURE, diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index c50e837962ce..95af7d96b6c6 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -421,6 +421,9 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal, tAniBool sendRegHint); QDF_STATUS sme_generic_change_country_code(tHalHandle hHal, uint8_t *pCountry); +QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, + uint8_t tx_fail_count, + void *txFailIndCallback); QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal, uint8_t device_mode, uint8_t *macAddr, uint8_t sessionId); @@ -717,6 +720,13 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId, const uint8_t *pBSSId, bool flush_cache); void sme_get_command_q_status(tHalHandle hHal); +QDF_STATUS sme_enable_rmc(tHalHandle hHal, uint32_t sessionId); +QDF_STATUS sme_disable_rmc(tHalHandle hHal, uint32_t sessionId); +QDF_STATUS sme_send_rmc_action_period(tHalHandle hHal, uint32_t sessionId); +QDF_STATUS sme_request_ibss_peer_info(tHalHandle hHal, void *pUserData, + pIbssPeerInfoCb peerInfoCbk, bool allPeerInfoReqd, uint8_t staIdx); +QDF_STATUS sme_send_cesium_enable_ind(tHalHandle hHal, uint32_t sessionId); + /* * SME API to enable/disable idle mode powersave * This should be called only if powersave offload diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 9c9a9976147f..994fd53b2065 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -103,6 +103,15 @@ typedef enum eSmeState { #define SME_IS_START(pMac) (SME_STATE_STOP != (pMac)->sme.state) #define SME_IS_READY(pMac) (SME_STATE_READY == (pMac)->sme.state) +/* HDD Callback function */ +typedef void (*pIbssPeerInfoCb)(void *pUserData, void *infoParam); + +/* Peer info */ +typedef struct tagSmePeerInfoHddCbkInfo { + void *pUserData; + pIbssPeerInfoCb peerInfoCbk; +} tSmePeerInfoHddCbkInfo; + typedef struct sStatsExtEvent { uint32_t vdev_id; uint32_t event_data_len; @@ -156,6 +165,7 @@ typedef struct tagSmeStruct { tDblLinkList smeScanCmdPendingList; /* active scan command list */ tDblLinkList smeScanCmdActiveList; + tSmePeerInfoHddCbkInfo peerInfoParams; #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR host_event_wlan_status_payload_type eventPayload; #endif diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 7c435503aac1..be84e41c73b1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -2092,6 +2092,28 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, #endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +QDF_STATUS sme_ibss_peer_info_response_handleer(tHalHandle hHal, + tpSirIbssGetPeerInfoRspParams + pIbssPeerInfoParams) +{ + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + + if (NULL == pMac) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL, + "%s: pMac is null", __func__); + return QDF_STATUS_E_FAILURE; + } + if (pMac->sme.peerInfoParams.peerInfoCbk == NULL) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: HDD callback is null", __func__); + return QDF_STATUS_E_FAILURE; + } + pMac->sme.peerInfoParams.peerInfoCbk(pMac->sme.peerInfoParams.pUserData, + &pIbssPeerInfoParams-> + ibssPeerInfoRspParams); + return QDF_STATUS_SUCCESS; +} + /** * sme_process_fw_mem_dump_rsp - process fw memory dump response from WMA * @@ -2457,7 +2479,17 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) qdf_mem_free(pMsg->bodyptr); break; #endif /* FEATURE_WLAN_LPHB */ - + case eWNI_SME_IBSS_PEER_INFO_RSP: + if (pMsg->bodyptr) { + sme_ibss_peer_info_response_handleer(pMac, + pMsg-> + bodyptr); + qdf_mem_free(pMsg->bodyptr); + } else { + sms_log(pMac, LOGE, FL("Empty message for %d"), + pMsg->type); + } + break; case eWNI_SME_READY_TO_SUSPEND_IND: if (pMsg->bodyptr) { sme_process_ready_to_suspend(pMac, pMsg->bodyptr); @@ -5334,6 +5366,60 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal, return status; } +/*--------------------------------------------------------------------------- + + \fn sme_TXFailMonitorStopInd + + \brief API to signal the FW to start monitoring TX failures + + \return QDF_STATUS SUCCESS. + + FAILURE or RESOURCES The API finished and failed. + --------------------------------------------------------------------------*/ +QDF_STATUS sme_tx_fail_monitor_start_stop_ind(tHalHandle hHal, uint8_t tx_fail_count, + void *txFailIndCallback) +{ + QDF_STATUS status; + QDF_STATUS qdf_status; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + tAniTXFailMonitorInd *pMsg; + + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_STATUS_SUCCESS == status) { + pMsg = (tAniTXFailMonitorInd *) + qdf_mem_malloc(sizeof(tAniTXFailMonitorInd)); + if (NULL == pMsg) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: Failed to allocate memory", __func__); + sme_release_global_lock(&pMac->sme); + return QDF_STATUS_E_NOMEM; + } + + pMsg->msgType = WMA_TX_FAIL_MONITOR_IND; + pMsg->msgLen = (uint16_t) sizeof(tAniTXFailMonitorInd); + + /* tx_fail_count = 0 should disable the Monitoring in FW */ + pMsg->tx_fail_count = tx_fail_count; + pMsg->txFailIndCallback = txFailIndCallback; + + cds_message.type = WMA_TX_FAIL_MONITOR_IND; + cds_message.bodyptr = pMsg; + cds_message.reserved = 0; + + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: Post TX Fail monitor Start MSG fail", + __func__); + qdf_mem_free(pMsg); + status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + return status; +} + /* --------------------------------------------------------------------------- \fn sme_set_cfg_privacy \brief API to set configure privacy parameters @@ -10643,6 +10729,185 @@ sme_del_periodic_tx_ptrn(tHalHandle hal, return status; } +/** + * sme_enable_rmc() - enables RMC + * @hHal : Pointer to global HAL handle + * @sessionId : Session ID + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_enable_rmc(tHalHandle hHal, uint32_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + + sms_log(pMac, LOG1, FL("enable RMC")); + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_IS_STATUS_SUCCESS(status)) { + cds_message.bodyptr = NULL; + cds_message.type = WMA_RMC_ENABLE_IND; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: failed to post message to WMA", + __func__); + status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + return status; +} + +/** + * sme_disable_rmc() - disables RMC + * @hHal : Pointer to global HAL handle + * @sessionId : Session ID + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_disable_rmc(tHalHandle hHal, uint32_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + + sms_log(pMac, LOG1, FL("disable RMC")); + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_IS_STATUS_SUCCESS(status)) { + cds_message.bodyptr = NULL; + cds_message.type = WMA_RMC_DISABLE_IND; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: failed to post message to WMA", + __func__); + status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + return status; +} + +/** + * sme_send_rmc_action_period() - sends RMC action period param to target + * @hHal : Pointer to global HAL handle + * @sessionId : Session ID + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_send_rmc_action_period(tHalHandle hHal, uint32_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_STATUS_SUCCESS == status) { + cds_message.bodyptr = NULL; + cds_message.type = WMA_RMC_ACTION_PERIOD_IND; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: failed to post message to WMA", + __func__); + status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + + return status; +} + +/** + * sme_request_ibss_peer_info() - request ibss peer info + * @hHal : Pointer to global HAL handle + * @pUserData : Pointer to user data + * @peerInfoCbk : Peer info callback + * @allPeerInfoReqd : All peer info required or not + * @staIdx : sta index + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_request_ibss_peer_info(tHalHandle hHal, void *pUserData, + pIbssPeerInfoCb peerInfoCbk, + bool allPeerInfoReqd, uint8_t staIdx) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + tSirIbssGetPeerInfoReqParams *pIbssInfoReqParams; + + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_STATUS_SUCCESS == status) { + pMac->sme.peerInfoParams.peerInfoCbk = peerInfoCbk; + pMac->sme.peerInfoParams.pUserData = pUserData; + + pIbssInfoReqParams = (tSirIbssGetPeerInfoReqParams *) + qdf_mem_malloc(sizeof(tSirIbssGetPeerInfoReqParams)); + if (NULL == pIbssInfoReqParams) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: Not able to allocate memory for dhcp start", + __func__); + sme_release_global_lock(&pMac->sme); + return QDF_STATUS_E_NOMEM; + } + pIbssInfoReqParams->allPeerInfoReqd = allPeerInfoReqd; + pIbssInfoReqParams->staIdx = staIdx; + + cds_message.type = WMA_GET_IBSS_PEER_INFO_REQ; + cds_message.bodyptr = pIbssInfoReqParams; + cds_message.reserved = 0; + + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (QDF_STATUS_SUCCESS != qdf_status) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: Post WMA_GET_IBSS_PEER_INFO_REQ MSG failed", + __func__); + qdf_mem_free(pIbssInfoReqParams); + qdf_status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + + return qdf_status; +} + +/* --------------------------------------------------------------------------- + \fn sme_send_cesium_enable_ind + \brief Used to send proprietary cesium enable indication to fw + \param hHal + \param sessionId + \- return QDF_STATUS + -------------------------------------------------------------------------*/ +QDF_STATUS sme_send_cesium_enable_ind(tHalHandle hHal, uint32_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS qdf_status = QDF_STATUS_SUCCESS; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + cds_msg_t cds_message; + + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_STATUS_SUCCESS == status) { + cds_message.bodyptr = NULL; + cds_message.type = WMA_IBSS_CESIUM_ENABLE_IND; + qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: failed to post message to WMA", + __func__); + status = QDF_STATUS_E_FAILURE; + } + sme_release_global_lock(&pMac->sme); + } + + return status; +} + void sme_get_command_q_status(tHalHandle hHal) { tSmeCmd *pTempCmd = NULL; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 8a33e767cf55..fbc4e43a9c7a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18103,6 +18103,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac, pModifyAddIEInd->modifyIE.ieIDLen = pModifyIE->ieIDLen; pModifyAddIEInd->modifyIE.pIEBuffer = pLocalBuffer; pModifyAddIEInd->modifyIE.ieBufferlength = pModifyIE->ieBufferlength; + pModifyAddIEInd->modifyIE.oui_length = pModifyIE->oui_length; pModifyAddIEInd->updateType = updateType; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index c20b6820f89b..9b2ccdef514c 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -383,6 +383,8 @@ static const t_probeTime_dwellTime {28, 8} /* 10 SSID */ }; +typedef void (*txFailIndCallback)(uint8_t *peer_mac, uint8_t seqNo); + /** * enum t_wma_drv_type - wma driver type * @WMA_DRIVER_TYPE_PRODUCTION: production driver type @@ -1265,7 +1267,7 @@ typedef struct { uint8_t ibss_started; tSetBssKeyParams ibsskey_info; struct ieee80211com *dfs_ic; - + txFailIndCallback hddTxFailCb; #ifdef FEATURE_WLAN_SCAN_PNO qdf_wake_lock_t pno_wake_lock; #endif @@ -1292,6 +1294,8 @@ typedef struct { uint8_t staMaxLIModDtim; uint8_t staModDtim; uint8_t staDynamicDtim; + uint8_t enable_mhf_offload; + unsigned long last_mhf_entries_timestamp; int32_t dfs_pri_multiplier; uint32_t hw_bd_id; uint32_t hw_bd_info[HW_BD_INFO_SIZE]; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 9e97d2a7580f..b6741ea690ee 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -101,6 +101,9 @@ #define WMI_MAX_HOST_CREDITS 2 #define WMI_WOW_REQUIRED_CREDITS 1 +#define WMI_MAX_MHF_ENTRIES 32 + + #define MAX_HT_MCS_IDX 8 #define MAX_VHT_MCS_IDX 10 #define INVALID_MCS_IDX 255 @@ -795,6 +798,12 @@ QDF_STATUS wma_set_thermal_mgmt(tp_wma_handle wma_handle, int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, uint32_t len); +int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data, + uint32_t len); + +int wma_fast_tx_fail_event_handler(void *handle, uint8_t *data, + uint32_t len); + /* * wma_utils.c functions declarations */ @@ -1017,6 +1026,20 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, tpSirHostOffloadReq pHostOffloadParams, bool bArpOnly); +QDF_STATUS wma_process_cesium_enable_ind(tp_wma_handle wma); + +QDF_STATUS wma_process_get_peer_info_req + (tp_wma_handle wma, tSirIbssGetPeerInfoReqParams *pReq); + +QDF_STATUS wma_process_tx_fail_monitor_ind + (tp_wma_handle wma, tAniTXFailMonitorInd *pReq); + +QDF_STATUS wma_process_rmc_enable_ind(tp_wma_handle wma); + +QDF_STATUS wma_process_rmc_disable_ind(tp_wma_handle wma); + +QDF_STATUS wma_process_rmc_action_period_ind(tp_wma_handle wma); + QDF_STATUS wma_process_add_periodic_tx_ptrn_ind(WMA_HANDLE handle, tSirAddPeriodicTxPtrn * pAddPeriodicTxPtrnParams); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 9d4d1af58cc9..7d440c7a9163 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -303,6 +303,8 @@ #define WMA_DHCP_START_IND SIR_HAL_DHCP_START_IND #define WMA_DHCP_STOP_IND SIR_HAL_DHCP_STOP_IND +#define WMA_TX_FAIL_MONITOR_IND SIR_HAL_TX_FAIL_MONITOR_IND + #define WMA_HIDDEN_SSID_VDEV_RESTART SIR_HAL_HIDE_SSID_VDEV_RESTART #ifdef WLAN_FEATURE_GTK_OFFLOAD @@ -358,6 +360,14 @@ #define WMA_INIT_THERMAL_INFO_CMD SIR_HAL_INIT_THERMAL_INFO_CMD #define WMA_SET_THERMAL_LEVEL SIR_HAL_SET_THERMAL_LEVEL +#define WMA_RMC_ENABLE_IND SIR_HAL_RMC_ENABLE_IND +#define WMA_RMC_DISABLE_IND SIR_HAL_RMC_DISABLE_IND +#define WMA_RMC_ACTION_PERIOD_IND SIR_HAL_RMC_ACTION_PERIOD_IND + +/* IBSS peer info related message */ +#define WMA_GET_IBSS_PEER_INFO_REQ SIR_HAL_IBSS_PEER_INFO_REQ + +#define WMA_IBSS_CESIUM_ENABLE_IND SIR_HAL_IBSS_CESIUM_ENABLE_IND #ifdef FEATURE_WLAN_TDLS #define WMA_UPDATE_FW_TDLS_STATE SIR_HAL_UPDATE_FW_TDLS_STATE @@ -584,6 +594,8 @@ typedef void (*pWMATxRxCompFunc)(void *pContext, void *pData, /* parameter 2 - txComplete status : 1- success, 0 - failure. */ typedef QDF_STATUS (*pWMAAckFnTxComp)(tpAniSirGlobal, uint32_t); +typedef void (*wma_txFailIndCallback)(uint8_t *, uint8_t); + /* generic callback for updating parameters from target to UMAC */ typedef void (*wma_tgt_cfg_cb)(void *context, void *param); diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 22f727255185..18bc5059501f 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -1976,6 +1976,152 @@ int wma_thermal_mgmt_evt_handler(void *handle, uint8_t *event, return 0; } +/** + * wma_ibss_peer_info_event_handler() - IBSS peer info event handler + * @handle: wma handle + * @data: event data + * @len: length of data + * + * This function handles IBSS peer info event from FW. + * + * Return: 0 for success or error code + */ +int wma_ibss_peer_info_event_handler(void *handle, uint8_t *data, + uint32_t len) +{ + cds_msg_t cds_msg; + wmi_peer_info *peer_info; + ol_txrx_pdev_handle pdev; + struct ol_txrx_peer_t *peer; + tSirIbssPeerInfoParams *pSmeRsp; + uint32_t count, num_peers, status; + tSirIbssGetPeerInfoRspParams *pRsp; + WMI_PEER_INFO_EVENTID_param_tlvs *param_tlvs; + wmi_peer_info_event_fixed_param *fix_param; + uint8_t peer_mac[IEEE80211_ADDR_LEN], staIdx; + + pdev = cds_get_context(QDF_MODULE_ID_TXRX); + if (NULL == pdev) { + WMA_LOGE("%s: could not get pdev context", __func__); + return 0; + } + + param_tlvs = (WMI_PEER_INFO_EVENTID_param_tlvs *) data; + fix_param = param_tlvs->fixed_param; + peer_info = param_tlvs->peer_info; + num_peers = fix_param->num_peers; + status = 0; + + WMA_LOGE("%s: num_peers %d", __func__, num_peers); + + pRsp = qdf_mem_malloc(sizeof(tSirIbssGetPeerInfoRspParams)); + if (NULL == pRsp) { + WMA_LOGE("%s: could not allocate memory for ibss peer info rsp len %zu", + __func__, sizeof(tSirIbssGetPeerInfoRspParams)); + return 0; + } + + /*sanity check */ + if ((num_peers > 32) || (NULL == peer_info)) { + WMA_LOGE("%s: Invalid event data from target num_peers %d peer_info %p", + __func__, num_peers, peer_info); + status = 1; + goto send_response; + } + + for (count = 0; count < num_peers; count++) { + pSmeRsp = &pRsp->ibssPeerInfoRspParams.peerInfoParams[count]; + + WMI_MAC_ADDR_TO_CHAR_ARRAY(&peer_info->peer_mac_address, + peer_mac); + peer = ol_txrx_find_peer_by_addr(pdev, peer_mac, &staIdx); + if (NULL == peer) { + WMA_LOGE("%s: peer 0x:%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x does not" + " exist could not populate response", __func__, + peer_mac[0], peer_mac[1], peer_mac[2], + peer_mac[3], peer_mac[4], peer_mac[5]); + + pSmeRsp->staIdx = 0xff; /*fill invalid staIdx */ + peer_info++; + continue; + } + pSmeRsp->staIdx = staIdx; + pSmeRsp->mcsIndex = 0; + pSmeRsp->rssi = peer_info->rssi + WMA_TGT_NOISE_FLOOR_DBM; + pSmeRsp->txRate = peer_info->data_rate; + pSmeRsp->txRateFlags = 0; + + WMA_LOGE("%s: peer 0x:%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x staIdx %d " + "rssi %d txRate %d", __func__, peer_mac[0], peer_mac[1], + peer_mac[2], peer_mac[3], peer_mac[4], peer_mac[5], + staIdx, pSmeRsp->rssi, pSmeRsp->txRate); + + peer_info++; + } + +send_response: + /* message header */ + pRsp->mesgType = eWNI_SME_IBSS_PEER_INFO_RSP; + pRsp->mesgLen = sizeof(tSirIbssGetPeerInfoRspParams); + pRsp->ibssPeerInfoRspParams.status = status; + pRsp->ibssPeerInfoRspParams.numPeers = num_peers; + + /* cds message wrapper */ + cds_msg.type = eWNI_SME_IBSS_PEER_INFO_RSP; + cds_msg.bodyptr = (void *)pRsp; + cds_msg.bodyval = 0; + + if (QDF_STATUS_SUCCESS != + cds_mq_post_message(CDS_MQ_ID_SME, (cds_msg_t *) &cds_msg)) { + WMA_LOGE("%s: could not post peer info rsp msg to SME", + __func__); + /* free the mem and return */ + qdf_mem_free((void *)pRsp); + } + + return 0; +} + +/** + * wma_fast_tx_fail_event_handler() -tx failure event handler + * @handle: wma handle + * @data: event data + * @len: data length + * + * Handle fast tx failure indication event from FW + * + * Return: 0 for success or error code. + */ +int wma_fast_tx_fail_event_handler(void *handle, uint8_t *data, + uint32_t len) +{ + uint8_t tx_fail_cnt; + uint8_t peer_mac[IEEE80211_ADDR_LEN]; + tp_wma_handle wma = (tp_wma_handle) handle; + WMI_PEER_TX_FAIL_CNT_THR_EVENTID_param_tlvs *param_tlvs; + wmi_peer_tx_fail_cnt_thr_event_fixed_param *fix_param; + + param_tlvs = (WMI_PEER_TX_FAIL_CNT_THR_EVENTID_param_tlvs *) data; + fix_param = param_tlvs->fixed_param; + + WMI_MAC_ADDR_TO_CHAR_ARRAY(&fix_param->peer_mac_address, peer_mac); + WMA_LOGE("%s: received fast tx failure event for peer" + " 0x:%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x seq No %d", __func__, + peer_mac[0], peer_mac[1], peer_mac[2], peer_mac[3], + peer_mac[4], peer_mac[5], fix_param->seq_no); + + tx_fail_cnt = fix_param->seq_no; + + /*call HDD callback */ + if (NULL != wma->hddTxFailCb) { + wma->hddTxFailCb(peer_mac, tx_fail_cnt); + } else { + WMA_LOGE("%s: HDD callback is %p", __func__, wma->hddTxFailCb); + } + + return 0; +} + /** * wma_decap_to_8023() - Decapsulate to 802.3 format * @msdu: skb buffer diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 2db824c61073..b344c275cd9a 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -4323,6 +4323,325 @@ QDF_STATUS wma_enable_arp_ns_offload(tp_wma_handle wma, return QDF_STATUS_SUCCESS; } +/** + * wma_process_cesium_enable_ind() - enables cesium functionality in target + * @wma: wma handle + * + * Return: QDF status + */ +QDF_STATUS wma_process_cesium_enable_ind(tp_wma_handle wma) +{ + QDF_STATUS ret; + int32_t vdev_id; + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not enable cesium", + __func__); + return QDF_STATUS_E_FAILURE; + } + + /* Send enable cesium command to target */ + WMA_LOGE("Enable cesium in target for vdevId %d ", vdev_id); + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, + WMI_VDEV_PARAM_ENABLE_RMC, 1); + if (ret) { + WMA_LOGE("Enable cesium failed for vdevId %d", vdev_id); + return QDF_STATUS_E_FAILURE; + } + return QDF_STATUS_SUCCESS; +} + +/** + * wma_process_get_peer_info_req() - sends get peer info cmd to target + * @wma: wma handle + * @preq: get peer info request + * + * Return: QDF status + */ +QDF_STATUS wma_process_get_peer_info_req + (tp_wma_handle wma, tSirIbssGetPeerInfoReqParams *pReq) +{ + int32_t ret; + uint8_t *p; + uint16_t len; + wmi_buf_t buf; + int32_t vdev_id; + ol_txrx_pdev_handle pdev; + struct ol_txrx_peer_t *peer; + uint8_t peer_mac[IEEE80211_ADDR_LEN]; + wmi_peer_info_req_cmd_fixed_param *p_get_peer_info_cmd; + uint8_t bcast_mac[IEEE80211_ADDR_LEN] = { 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff }; + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not get peer info", + __func__); + return QDF_STATUS_E_FAILURE; + } + + pdev = cds_get_context(QDF_MODULE_ID_TXRX); + if (NULL == pdev) { + WMA_LOGE("%s: Failed to get pdev context", __func__); + return QDF_STATUS_E_FAILURE; + } + + if (0xFF == pReq->staIdx) { + /*get info for all peers */ + qdf_mem_copy(peer_mac, bcast_mac, IEEE80211_ADDR_LEN); + } else { + /*get info for a single peer */ + peer = ol_txrx_peer_find_by_local_id(pdev, pReq->staIdx); + if (!peer) { + WMA_LOGE("%s: Failed to get peer handle using peer id %d", + __func__, pReq->staIdx); + return QDF_STATUS_E_FAILURE; + } + WMA_LOGE("%s: staIdx %d peer mac: 0x%2x:0x%2x:0x%2x:0x%2x:0x%2x:0x%2x", + __func__, pReq->staIdx, peer->mac_addr.raw[0], + peer->mac_addr.raw[1], peer->mac_addr.raw[2], + peer->mac_addr.raw[3], peer->mac_addr.raw[4], + peer->mac_addr.raw[5]); + qdf_mem_copy(peer_mac, peer->mac_addr.raw, IEEE80211_ADDR_LEN); + } + + len = sizeof(wmi_peer_info_req_cmd_fixed_param); + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGE("%s %d: No WMI resource!", __func__, __LINE__); + return QDF_STATUS_E_FAILURE; + } + + p = (uint8_t *) wmi_buf_data(buf); + qdf_mem_zero(p, len); + p_get_peer_info_cmd = (wmi_peer_info_req_cmd_fixed_param *) p; + + WMITLV_SET_HDR(&p_get_peer_info_cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_peer_info_req_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN + (wmi_peer_info_req_cmd_fixed_param)); + + p_get_peer_info_cmd->vdev_id = vdev_id; + WMI_CHAR_ARRAY_TO_MAC_ADDR(peer_mac, + &p_get_peer_info_cmd->peer_mac_address); + + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_PEER_INFO_REQ_CMDID); + + WMA_LOGE("IBSS get peer info cmd sent len: %d, vdev %d" + " command id: %d, status: %d", len, + p_get_peer_info_cmd->vdev_id, WMI_PEER_INFO_REQ_CMDID, ret); + + return QDF_STATUS_SUCCESS; +} + +/** + * wma_process_tx_fail_monitor_ind() - sends tx fail monitor cmd to target + * @wma: wma handle + * @pReq: tx fail monitor command params + * + * Return: QDF status + */ +QDF_STATUS wma_process_tx_fail_monitor_ind + (tp_wma_handle wma, tAniTXFailMonitorInd *pReq) +{ + QDF_STATUS ret; + int32_t vdev_id; + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not send fast tx fail" + " monitor indication message to target", __func__); + return QDF_STATUS_E_FAILURE; + } + + /* Send enable cesium command to target */ + WMA_LOGE("send fast tx fail monitor ind cmd target for vdevId %d val %d", + vdev_id, pReq->tx_fail_count); + + if (0 == pReq->tx_fail_count) { + wma->hddTxFailCb = NULL; + } else { + wma->hddTxFailCb = pReq->txFailIndCallback; + } + ret = wma_vdev_set_param(wma->wmi_handle, vdev_id, + WMI_VDEV_PARAM_SET_IBSS_TX_FAIL_CNT_THR, + pReq->tx_fail_count); + if (ret) { + WMA_LOGE("tx fail monitor failed for vdevId %d", vdev_id); + return QDF_STATUS_E_FAILURE; + } + + return QDF_STATUS_SUCCESS; +} + +/** + * wma_process_rmc_enable_ind() - enables RMC functionality in target + * @wma: wma handle + * + * Return: QDF status + */ +QDF_STATUS wma_process_rmc_enable_ind(tp_wma_handle wma) +{ + int ret; + uint8_t *p; + uint16_t len; + wmi_buf_t buf; + int32_t vdev_id; + wmi_rmc_set_mode_cmd_fixed_param *p_rmc_enable_cmd; + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not enable RMC", + __func__); + return QDF_STATUS_E_FAILURE; + } + + len = sizeof(wmi_rmc_set_mode_cmd_fixed_param); + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGE("%s %d: No WMI resource!", __func__, __LINE__); + return QDF_STATUS_E_FAILURE; + } + + p = (uint8_t *) wmi_buf_data(buf); + qdf_mem_zero(p, len); + p_rmc_enable_cmd = (wmi_rmc_set_mode_cmd_fixed_param *) p; + + WMITLV_SET_HDR(&p_rmc_enable_cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_rmc_set_mode_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN + (wmi_rmc_set_mode_cmd_fixed_param)); + + p_rmc_enable_cmd->vdev_id = vdev_id; + p_rmc_enable_cmd->enable_rmc = WMI_RMC_MODE_ENABLED; + + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_RMC_SET_MODE_CMDID); + + WMA_LOGE("Enable RMC cmd sent len: %d, vdev %d" " command id: %d," + " status: %d", len, p_rmc_enable_cmd->vdev_id, + WMI_RMC_SET_MODE_CMDID, ret); + + return QDF_STATUS_SUCCESS; +} + +/** + * wma_process_rmc_disable_ind() - disables rmc functionality in target + * @wma: wma handle + * + * Return: QDF status + */ +QDF_STATUS wma_process_rmc_disable_ind(tp_wma_handle wma) +{ + int ret; + uint8_t *p; + uint16_t len; + wmi_buf_t buf; + int32_t vdev_id; + wmi_rmc_set_mode_cmd_fixed_param *p_rmc_disable_cmd; + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not disable RMC", + __func__); + return QDF_STATUS_E_FAILURE; + } + + len = sizeof(wmi_rmc_set_mode_cmd_fixed_param); + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGE("%s %d: No WMI resource!", __func__, __LINE__); + return QDF_STATUS_E_FAILURE; + } + + p = (uint8_t *) wmi_buf_data(buf); + qdf_mem_zero(p, len); + p_rmc_disable_cmd = (wmi_rmc_set_mode_cmd_fixed_param *) p; + + WMITLV_SET_HDR(&p_rmc_disable_cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_rmc_set_mode_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN + (wmi_rmc_set_mode_cmd_fixed_param)); + + p_rmc_disable_cmd->vdev_id = vdev_id; + p_rmc_disable_cmd->enable_rmc = WMI_RMC_MODE_DISABLED; + + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_RMC_SET_MODE_CMDID); + + WMA_LOGE("Disable RMC cmd sent len: %d, vdev %d" " command id: %d," + " status: %d", len, p_rmc_disable_cmd->vdev_id, + WMI_RMC_SET_MODE_CMDID, ret); + + return QDF_STATUS_SUCCESS; +} + +/** + * wma_process_rmc_action_period_ind() - sends RMC action period to target + * @wma: wma handle + * + * Return: QDF status + */ +QDF_STATUS wma_process_rmc_action_period_ind(tp_wma_handle wma) +{ + int ret; + uint8_t *p; + uint16_t len; + uint32_t val; + wmi_buf_t buf; + int32_t vdev_id; + wmi_rmc_set_action_period_cmd_fixed_param *p_rmc_cmd; + struct sAniSirGlobal *mac = cds_get_context(QDF_MODULE_ID_PE); + + if (NULL == mac) { + WMA_LOGE("%s: MAC mac does not exist", __func__); + return QDF_STATUS_E_FAILURE; + } + + vdev_id = wma_find_vdev_by_type(wma, WMI_VDEV_TYPE_IBSS); + if (vdev_id < 0) { + WMA_LOGE("%s: IBSS vdev does not exist could not send" + " RMC action period to target", __func__); + return QDF_STATUS_E_FAILURE; + } + + len = sizeof(wmi_rmc_set_action_period_cmd_fixed_param); + buf = wmi_buf_alloc(wma->wmi_handle, len); + if (!buf) { + WMA_LOGE("%s %d: No WMI resource!", __func__, __LINE__); + return QDF_STATUS_E_FAILURE; + } + + p = (uint8_t *) wmi_buf_data(buf); + qdf_mem_zero(p, len); + p_rmc_cmd = (wmi_rmc_set_action_period_cmd_fixed_param *) p; + + WMITLV_SET_HDR(&p_rmc_cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_rmc_set_action_period_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN + (wmi_rmc_set_action_period_cmd_fixed_param)); + + if (wlan_cfg_get_int(mac, WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY, &val) + != eSIR_SUCCESS) { + WMA_LOGE("Failed to get value for RMC action period using default"); + val = WNI_CFG_RMC_ACTION_PERIOD_FREQUENCY_STADEF; + } + + p_rmc_cmd->vdev_id = vdev_id; + p_rmc_cmd->periodicity_msec = val; + + ret = wmi_unified_cmd_send(wma->wmi_handle, buf, len, + WMI_RMC_SET_ACTION_PERIOD_CMDID); + + WMA_LOGE("RMC action period %d cmd sent len: %d, vdev %d" + " command id: %d, status: %d", p_rmc_cmd->periodicity_msec, + len, p_rmc_cmd->vdev_id, WMI_RMC_SET_ACTION_PERIOD_CMDID, ret); + + return QDF_STATUS_SUCCESS; +} + /** * wma_process_add_periodic_tx_ptrn_ind - add periodic tx ptrn * @handle: wma handle diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 9d4a9e2d4c0a..f503ed43a7e8 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -2695,6 +2695,34 @@ QDF_STATUS wma_start(void *cds_ctx) goto end; #endif /* QCA_WIFI_FTM */ + if (WMI_SERVICE_IS_ENABLED(wma_handle->wmi_service_bitmap, + WMI_SERVICE_RMC)) { + + WMA_LOGD("FW supports cesium network, registering event handlers"); + + status = wmi_unified_register_event_handler(wma_handle->wmi_handle, + WMI_PEER_INFO_EVENTID, + wma_ibss_peer_info_event_handler, + WMA_RX_SERIALIZER_CTX); + if (status) { + WMA_LOGE("Failed to register ibss peer info event cb"); + qdf_status = QDF_STATUS_E_FAILURE; + goto end; + } + + status = wmi_unified_register_event_handler(wma_handle->wmi_handle, + WMI_PEER_TX_FAIL_CNT_THR_EVENTID, + wma_fast_tx_fail_event_handler, + WMA_RX_SERIALIZER_CTX); + if (status) { + WMA_LOGE("Failed to register peer fast tx failure event cb"); + qdf_status = QDF_STATUS_E_FAILURE; + goto end; + } + } else { + WMA_LOGE("Target does not support cesium network"); + } + qdf_status = wma_tx_attach(wma_handle); if (qdf_status != QDF_STATUS_SUCCESS) { WMA_LOGP("%s: Failed to register tx management", __func__); @@ -4860,6 +4888,30 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) qdf_mem_free(msg->bodyptr); break; + case WMA_IBSS_CESIUM_ENABLE_IND: + wma_process_cesium_enable_ind(wma_handle); + break; + case WMA_GET_IBSS_PEER_INFO_REQ: + wma_process_get_peer_info_req(wma_handle, + (tSirIbssGetPeerInfoReqParams *) + msg->bodyptr); + qdf_mem_free(msg->bodyptr); + break; + case WMA_TX_FAIL_MONITOR_IND: + wma_process_tx_fail_monitor_ind(wma_handle, + (tAniTXFailMonitorInd *) msg->bodyptr); + qdf_mem_free(msg->bodyptr); + break; + + case WMA_RMC_ENABLE_IND: + wma_process_rmc_enable_ind(wma_handle); + break; + case WMA_RMC_DISABLE_IND: + wma_process_rmc_disable_ind(wma_handle); + break; + case WMA_RMC_ACTION_PERIOD_IND: + wma_process_rmc_action_period_ind(wma_handle); + break; case WMA_INIT_THERMAL_INFO_CMD: wma_process_init_thermal_info(wma_handle, (t_thermal_mgmt *) msg->bodyptr); -- cgit v1.2.3 From 3e61707d7cc1f4fa2d7cbc258181e8fc2072febb Mon Sep 17 00:00:00 2001 From: "Gupta, Kapil" Date: Mon, 8 Feb 2016 16:58:00 +0530 Subject: qcacld-3.0: Add debug print for EAPOL msg qcacld-2.0 to qcacld-3.0 propagation Currently driver has debug print for EAPOL but it doesn't tell whether its M1, M2 etc. As part of fix, add debug print for M1-M4 msg. Change-Id: I1eb4f9dac6520b1ce00cdfc3e0fcef721ae498d6 CRs-Fixed: 919617 --- core/hdd/src/wlan_hdd_tx_rx.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index c4db719dd8f3..a92bc0e37471 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -63,6 +63,11 @@ #define HDD_EAPOL_KEY_INFO_OFFSET (19) #define HDD_EAPOL_DEST_MAC_OFFSET (0) #define HDD_EAPOL_SRC_MAC_OFFSET (6) +#define EAPOL_MASK 0x8013 +#define EAPOL_M1_BIT_MASK 0x8000 +#define EAPOL_M2_BIT_MASK 0x0001 +#define EAPOL_M3_BIT_MASK 0x8013 +#define EAPOL_M4_BIT_MASK 0x0003 #endif /* FEATURE_WLAN_DIAG_SUPPORT */ const uint8_t hdd_wmm_ac_to_highest_up[] = { @@ -872,10 +877,27 @@ void wlan_hdd_log_eapol(struct sk_buff *skb, { int ret; struct host_event_wlan_eapol eapol_params; + uint16_t key_info; + const char *packet_type = "UND"; ret = wlan_hdd_get_eapol_params(skb, &eapol_params, event_type); if (!ret) - wlan_hdd_event_eapol_log(eapol_params); + return; + + wlan_hdd_event_eapol_log(eapol_params); + key_info = eapol_params.eapol_key_info & EAPOL_MASK; + if (key_info == EAPOL_M1_BIT_MASK) + packet_type = "M1"; + else if (key_info == EAPOL_M2_BIT_MASK) + packet_type = "M2"; + else if (key_info == EAPOL_M3_BIT_MASK) + packet_type = "M3"; + else if (key_info == EAPOL_M4_BIT_MASK) + packet_type = "M4"; + + hdd_notice("%s: %s packet", eapol_params.event_sub_type == + WIFI_EVENT_DRIVER_EAPOL_FRAME_RECEIVED ? + "RX" : "TX", packet_type); } #endif /* FEATURE_WLAN_DIAG_SUPPORT */ -- cgit v1.2.3 From 07495ea2e6c89725164fa453023657b36e92e006 Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Thu, 21 Jan 2016 15:25:39 -0800 Subject: qcacld-3.0: Update wlan_hdd_add_virtual_intf for Kernel upgrade Commit: 6bab2e19 ("cfg80211: pass name_assign_type to rdev_add_virtual_intf) Above commit add new parameter - name_assign_type to indicate the ifname is set by userspace or generated by the kernel. Also add this new param to all underlying interfaces, so that we can get rid of the conditional flag interleave in APIs but only to the toppest and lowest one. Change-Id: I2233391f4e7313cf4134c975e14b6060ad852c5d CRs-fixed: 966067 --- core/hdd/inc/wlan_hdd_main.h | 10 ++++++ core/hdd/inc/wlan_hdd_p2p.h | 10 ++++++ core/hdd/src/wlan_hdd_ftm.c | 3 +- core/hdd/src/wlan_hdd_hostapd.c | 15 +++++---- core/hdd/src/wlan_hdd_hostapd.h | 4 ++- core/hdd/src/wlan_hdd_main.c | 63 ++++++++++++++++++++++++++---------- core/hdd/src/wlan_hdd_p2p.c | 71 +++++++++++++++++++++++++++++++++++++---- 7 files changed, 144 insertions(+), 32 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 4ffb7a650b5b..ef5e2e86d56c 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -247,6 +247,15 @@ #endif #endif +/* + * NET_NAME_UNKNOWN is only introduced after Kernel 3.17, to have a macro + * here if the Kernel version is less than 3.17 to avoid the interleave + * conditional compilation. + */ +#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)) +#define NET_NAME_UNKNOWN 0 +#endif + #define BSS_WAIT_TIMEOUT 10000 /* @@ -1398,6 +1407,7 @@ QDF_STATUS hdd_add_adapter_front(hdd_context_t *pHddCtx, hdd_adapter_t *hdd_open_adapter(hdd_context_t *pHddCtx, uint8_t session_type, const char *name, tSirMacAddr macAddr, + unsigned char name_assign_type, bool rtnl_held); QDF_STATUS hdd_close_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); diff --git a/core/hdd/inc/wlan_hdd_p2p.h b/core/hdd/inc/wlan_hdd_p2p.h index cfd9aaf686d1..3cc7dc7c0d18 100644 --- a/core/hdd/inc/wlan_hdd_p2p.h +++ b/core/hdd/inc/wlan_hdd_p2p.h @@ -129,11 +129,21 @@ int wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, bool dont_wait_for_ack, u64 *cookie); #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) || defined(WITH_BACKPORTS) struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy, const char *name, + unsigned char name_assign_type, enum nl80211_iftype type, u32 *flags, struct vif_params *params); +#else +struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy, + const char *name, + enum nl80211_iftype type, + u32 *flags, + struct vif_params *params); + +#endif int wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 59e11a2a8ef6..1c6c5d07fa93 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -612,7 +612,8 @@ static int hdd_ftm_service_registration(hdd_context_t *hdd_ctx) { hdd_adapter_t *adapter; adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_FTM, "wlan%d", - wlan_hdd_get_intf_addr(hdd_ctx), false); + wlan_hdd_get_intf_addr(hdd_ctx), + NET_NAME_UNKNOWN, false); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", __func__); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 2add4c68b337..c93c55c2954d 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -6143,6 +6143,7 @@ error_wmm_init: * hdd_wlan_create_ap_dev() - create an AP-mode device * @pHddCtx: Global HDD context * @macAddr: MAC address to assign to the interface + * @name_assign_type: the name of assign type of the netdev * @iface_name: User-visible name of the interface * * This function will allocate a Linux net_device and configuration it @@ -6154,19 +6155,19 @@ error_wmm_init: */ hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, tSirMacAddr macAddr, - uint8_t *iface_name) { + unsigned char name_assign_type, + uint8_t *iface_name) +{ struct net_device *pWlanHostapdDev = NULL; hdd_adapter_t *pHostapdAdapter = NULL; hddLog(LOG4, FL("iface_name = %s"), iface_name); - pWlanHostapdDev = - alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) - NET_NAME_UNKNOWN, + pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS) + name_assign_type, #endif - ether_setup, - NUM_TX_QUEUES); + ether_setup, NUM_TX_QUEUES); if (pWlanHostapdDev != NULL) { pHostapdAdapter = netdev_priv(pWlanHostapdDev); diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index eff1d5d7bd42..4cd70afd5f18 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -48,7 +48,9 @@ #define HOSTAPD_IOCTL_COMMAND_STRLEN_MAX 8192 hdd_adapter_t *hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx, - tSirMacAddr macAddr, uint8_t *name); + tSirMacAddr macAddr, + unsigned char name_assign_type, + uint8_t *name); QDF_STATUS hdd_register_hostapd(hdd_adapter_t *pAdapter, uint8_t rtnl_held); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index e77dba13e1b8..f7ba9197c8fd 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1887,8 +1887,20 @@ void hdd_set_station_ops(struct net_device *pWlanDev) pWlanDev->netdev_ops = &wlan_drv_ops; } +/** + * hdd_alloc_station_adapter() - allocate the station hdd adapter + * @hdd_ctx: global hdd context + * @macAddr: mac address to assign to the interface + * @name: User-visible name of the interface + * + * hdd adapter pointer would point to the netdev->priv space, this function + * would retrive the pointer, and setup the hdd adapter configuration. + * + * Return: the pointer to hdd adapter, otherwise NULL + */ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, tSirMacAddr macAddr, + unsigned char name_assign_type, const char *name) { struct net_device *pWlanDev = NULL; @@ -1896,13 +1908,11 @@ static hdd_adapter_t *hdd_alloc_station_adapter(hdd_context_t *hdd_ctx, /* * cfg80211 initialization and registration.... */ - pWlanDev = - alloc_netdev_mq(sizeof(hdd_adapter_t), name, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) - NET_NAME_UNKNOWN, + pWlanDev = alloc_netdev_mq(sizeof(hdd_adapter_t), name, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS) + name_assign_type, #endif - ether_setup, - NUM_TX_QUEUES); + ether_setup, NUM_TX_QUEUES); if (pWlanDev != NULL) { @@ -2347,8 +2357,25 @@ QDF_STATUS hdd_check_for_existing_macaddr(hdd_context_t *hdd_ctx, } return QDF_STATUS_SUCCESS; } + +/** + * hdd_open_adapter() - open and setup the hdd adatper + * @hdd_ctx: global hdd context + * @session_type: type of the interface to be created + * @iface_name: User-visible name of the interface + * @macAddr: MAC address to assign to the interface + * @name_assign_type: the name of assign type of the netdev + * @rtnl_held: the rtnl lock hold flag + * + * This function open and setup the hdd adpater according to the device + * type request, assign the name, the mac address assigned, and then prepared + * the hdd related parameters, queue, lock and ready to start. + * + * Return: the pointer of hdd adapter, otherwise NULL. + */ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, const char *iface_name, tSirMacAddr macAddr, + unsigned char name_assign_type, bool rtnl_held) { hdd_adapter_t *adapter = NULL; @@ -2398,8 +2425,9 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, case WLAN_HDD_P2P_DEVICE: case WLAN_HDD_OCB: { - adapter = - hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name); + adapter = hdd_alloc_station_adapter(hdd_ctx, macAddr, + name_assign_type, + iface_name); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_FATAL, @@ -2470,9 +2498,9 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, case WLAN_HDD_P2P_GO: case WLAN_HDD_SOFTAP: { - adapter = - hdd_wlan_create_ap_dev(hdd_ctx, macAddr, - (uint8_t *) iface_name); + adapter = hdd_wlan_create_ap_dev(hdd_ctx, macAddr, + name_assign_type, + (uint8_t *) iface_name); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_FATAL, FL("failed to allocate adapter for session %d"), @@ -2505,8 +2533,9 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, } case WLAN_HDD_FTM: { - adapter = - hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name); + adapter = hdd_alloc_station_adapter(hdd_ctx, macAddr, + name_assign_type, + iface_name); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_FATAL, @@ -5307,7 +5336,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_P2P_DEVICE, "p2p%d", &hdd_ctx->p2pDeviceAddress.bytes[0], - rtnl_held); + NET_NAME_UNKNOWN, rtnl_held); if (NULL == adapter) { hdd_alert("Failed to do hdd_open_adapter for P2P Device Interface"); @@ -5344,7 +5373,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, if (hdd_ctx->config->dot11p_mode == WLAN_HDD_11P_STANDALONE) { adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_OCB, "wlanocb%d", wlan_hdd_get_intf_addr(hdd_ctx), - rtnl_held); + NET_NAME_UNKNOWN, rtnl_held); if (adapter == NULL) return ERR_PTR(-ENOSPC); @@ -5354,7 +5383,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION, "wlan%d", wlan_hdd_get_intf_addr(hdd_ctx), - rtnl_held); + NET_NAME_UNKNOWN, rtnl_held); if (adapter == NULL) return ERR_PTR(-ENOSPC); @@ -5368,7 +5397,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, adapter_11p = hdd_open_adapter(hdd_ctx, WLAN_HDD_OCB, "wlanocb%d", wlan_hdd_get_intf_addr(hdd_ctx), - rtnl_held); + NET_NAME_UNKNOWN, rtnl_held); if (adapter_11p == NULL) { hdd_err("Failed to open 802.11p interface"); goto err_close_adapter; diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 217c5278292f..44f14cb4bd53 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -1949,8 +1949,20 @@ static uint8_t wlan_hdd_get_session_type(enum nl80211_iftype type) return sessionType; } +/** + * __wlan_hdd_add_virtual_intf() - Add virtual interface + * @wiphy: wiphy pointer + * @name: User-visible name of the interface + * @name_assign_type: the name of assign type of the netdev + * @nl80211_iftype: (virtual) interface types + * @flags: moniter configuraiton flags (not used) + * @vif_params: virtual interface parameters (not used) + * + * Return: the pointer of wireless dev, otherwise NULL. + */ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, const char *name, + unsigned char name_assign_type, enum nl80211_iftype type, u32 *flags, struct vif_params *params) @@ -2020,12 +2032,16 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, p2pDeviceAddress.bytes[4] ^= 0x80; pAdapter = hdd_open_adapter(pHddCtx, wlan_hdd_get_session_type(type), - name, p2pDeviceAddress.bytes, true); + name, p2pDeviceAddress.bytes, + name_assign_type, + true); } else { - pAdapter = - hdd_open_adapter(pHddCtx, wlan_hdd_get_session_type(type), - name, wlan_hdd_get_intf_addr(pHddCtx), - true); + pAdapter = hdd_open_adapter(pHddCtx, + wlan_hdd_get_session_type(type), + name, + wlan_hdd_get_intf_addr(pHddCtx), + name_assign_type, + true); } if (NULL == pAdapter) { @@ -2037,6 +2053,45 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, return pAdapter->dev->ieee80211_ptr; } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) || defined(WITH_BACKPORTS) +/** + * wlan_hdd_add_virtual_intf() - Add virtual interface wrapper + * @wiphy: wiphy pointer + * @name: User-visible name of the interface + * @name_assign_type: the name of assign type of the netdev + * @nl80211_iftype: (virtual) interface types + * @flags: monitor mode configuration flags (not used) + * @vif_params: virtual interface parameters (not used) + * + * Return: the pointer of wireless dev, otherwise NULL. + */ +struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy, + const char *name, + unsigned char name_assign_type, + enum nl80211_iftype type, + u32 *flags, + struct vif_params *params) +{ + struct wireless_dev *wdev; + + cds_ssr_protect(__func__); + wdev = __wlan_hdd_add_virtual_intf(wiphy, name, name_assign_type, + type, flags, params); + cds_ssr_unprotect(__func__); + return wdev; + +} +#else +/** + * wlan_hdd_add_virtual_intf() - Add virtual interface wrapper + * @wiphy: wiphy pointer + * @name: User-visible name of the interface + * @nl80211_iftype: (virtual) interface types + * @flags: monitor mode configuration flags (not used) + * @vif_params: virtual interface parameters (not used) + * + * Return: the pointer of wireless dev, otherwise NULL. + */ struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, @@ -2044,12 +2099,16 @@ struct wireless_dev *wlan_hdd_add_virtual_intf(struct wiphy *wiphy, struct vif_params *params) { struct wireless_dev *wdev; + unsigned char name_assign_type = 0; cds_ssr_protect(__func__); - wdev = __wlan_hdd_add_virtual_intf(wiphy, name, type, flags, params); + wdev = __wlan_hdd_add_virtual_intf(wiphy, name, name_assign_type, + type, flags, params); cds_ssr_unprotect(__func__); return wdev; + } +#endif int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) { -- cgit v1.2.3 From 6e9aa1b9cdbbd59d3a921eb832b3e3491a3ab468 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Wed, 2 Dec 2015 18:04:00 +0530 Subject: qcacld-3.0: Avoid message handler of netlink APIs to be OS agnostic Avoid message handler of netlink APIs to be OS agnostic. Retain the message handler to get the concurrency matrix in HDD. Change-Id: Ieb121512e3d8ae15678da46ed8425c07fd003f69 CRs-Fixed: 946161 --- core/cds/inc/cds_concurrency.h | 4 -- core/cds/src/cds_concurrency.c | 108 ------------------------------------- core/hdd/src/wlan_hdd_assoc.c | 10 ++-- core/hdd/src/wlan_hdd_cfg80211.c | 114 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 117 insertions(+), 119 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index e63a5a1e20d9..d8dc3b338182 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -499,10 +499,6 @@ bool cds_is_sta_connection_pending(void); void cds_change_sta_conn_pending_status(bool value); void cds_change_sap_restart_required_status(bool value); bool cds_set_connection_in_progress(bool value); -int cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, - int data_len); uint32_t cds_get_concurrency_mode(void); QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, hdd_station_ctx_t *hdd_sta_ctx); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 19f19b0399ba..599e81765199 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -66,7 +66,6 @@ #include "wlan_hdd_ipa.h" #include "cdp_txrx_flow_ctrl_legacy.h" -#define CDS_MAX_FEATURE_SET 8 static struct cds_conc_connection_info conc_connection_list[MAX_NUMBER_OF_CONC_CONNECTIONS]; @@ -5957,113 +5956,6 @@ QDF_STATUS cds_next_actions(uint32_t session_id, return status; } -/** - * cds_cfg80211_get_concurrency_matrix() - to retrieve concurrency matrix - * @wiphy: pointer phy adapter - * @wdev: pointer to wireless device structure - * @data: pointer to data buffer - * @data_len: length of data - * - * This routine will give concurrency matrix - * - * Return: int status code - */ -static int __cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, - int data_len) -{ - uint32_t feature_set_matrix[CDS_MAX_FEATURE_SET] = {0}; - uint8_t i, feature_sets, max_feature_sets; - struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_MAX + 1]; - struct sk_buff *reply_skb; - hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - int ret; - - ENTER(); - - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { - cds_err("Command not allowed in FTM mode"); - return -EPERM; - } - - ret = wlan_hdd_validate_context(hdd_ctx); - if (0 != ret) { - cds_err("HDD context is not valid"); - return ret; - } - - if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_MAX, - data, data_len, NULL)) { - cds_err("Invalid ATTR"); - return -EINVAL; - } - - /* Parse and fetch max feature set */ - if (!tb[QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_CONFIG_PARAM_SET_SIZE_MAX]) { - cds_err("Attr max feature set size failed"); - return -EINVAL; - } - max_feature_sets = nla_get_u32(tb[ - QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_CONFIG_PARAM_SET_SIZE_MAX]); - cds_info("Max feature set size (%d)", max_feature_sets); - - /* Fill feature combination matrix */ - feature_sets = 0; - feature_set_matrix[feature_sets++] = WIFI_FEATURE_INFRA | - WIFI_FEATURE_P2P; - /* Add more feature combinations here */ - - feature_sets = QDF_MIN(feature_sets, max_feature_sets); - cds_info("Number of feature sets (%d)", feature_sets); - cds_info("Feature set matrix"); - for (i = 0; i < feature_sets; i++) - cds_info("[%d] 0x%02X", i, feature_set_matrix[i]); - - reply_skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, sizeof(u32) + - sizeof(u32) * feature_sets + NLMSG_HDRLEN); - - if (reply_skb) { - if (nla_put_u32(reply_skb, - QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET_SIZE, - feature_sets) || - nla_put(reply_skb, - QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET, - sizeof(u32) * feature_sets, - feature_set_matrix)) { - cds_err("nla put fail"); - kfree_skb(reply_skb); - return -EINVAL; - } - return cfg80211_vendor_cmd_reply(reply_skb); - } - cds_err("Feature set matrix: buffer alloc fail"); - return -ENOMEM; -} - -/** - * cds_cfg80211_get_concurrency_matrix() - get concurrency matrix - * @wiphy: pointer to wireless wiphy structure. - * @wdev: pointer to wireless_dev structure. - * @data: Pointer to the data to be passed via vendor interface - * @data_len:Length of the data to be passed - * - * Return: Return the Success or Failure code. - */ -int -cds_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) -{ - int ret = 0; - - cds_ssr_protect(__func__); - ret = __cds_cfg80211_get_concurrency_matrix(wiphy, wdev, data, - data_len); - cds_ssr_unprotect(__func__); - return ret; -} - /** * cds_get_concurrency_mode() - return concurrency mode * diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 5d2c4b662c81..1c2c8f53ebec 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -817,9 +817,8 @@ static void hdd_send_association_event(struct net_device *dev, pr_info("wlan: disconnected\n"); memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN); - cds_decr_session_set_pcl( - pAdapter->device_mode, - pAdapter->sessionId); + cds_decr_session_set_pcl(pAdapter->device_mode, + pAdapter->sessionId); wlan_hdd_enable_roaming(pAdapter); #ifdef FEATURE_WLAN_AUTO_SHUTDOWN @@ -1427,9 +1426,8 @@ static void hdd_send_re_assoc_event(struct net_device *dev, * successful reassoc decrement the active session count here. */ if (!hdd_is_roam_sync_in_progress(pCsrRoamInfo)) - cds_decr_session_set_pcl( - pAdapter->device_mode, - pAdapter->sessionId); + cds_decr_session_set_pcl(pAdapter->device_mode, + pAdapter->sessionId); /* Send the Assoc Resp, the supplicant needs this for initial Auth */ len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 3f329fce1d18..b4686cc65cde 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -137,6 +137,7 @@ #define HDD_CHANNEL_14 14 #define MAX_TXPOWER_SCALE 4 +#define CDS_MAX_FEATURE_SET 8 static const u32 hdd_cipher_suites[] = { WLAN_CIPHER_SUITE_WEP40, @@ -2020,6 +2021,117 @@ wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy, return ret; } +/** + * __wlan_hdd_cfg80211_get_concurrency_matrix() - to retrieve concurrency matrix + * @wiphy: pointer phy adapter + * @wdev: pointer to wireless device structure + * @data: pointer to data buffer + * @data_len: length of data + * + * This routine will give concurrency matrix + * + * Return: int status code + */ +static int __wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, + int data_len) +{ + uint32_t feature_set_matrix[CDS_MAX_FEATURE_SET] = {0}; + uint8_t i, feature_sets, max_feature_sets; + struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_MAX + 1]; + struct sk_buff *reply_skb; + hdd_context_t *hdd_ctx = wiphy_priv(wiphy); + int ret; + + ENTER_DEV(wdev->netdev); + + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { + hdd_err("Command not allowed in FTM mode"); + return -EPERM; + } + + ret = wlan_hdd_validate_context(hdd_ctx); + if (0 != ret) { + hdd_err("HDD context is not valid"); + return ret; + } + + if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_MAX, + data, data_len, NULL)) { + hdd_err("Invalid ATTR"); + return -EINVAL; + } + + /* Parse and fetch max feature set */ + if (!tb[QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_CONFIG_PARAM_SET_SIZE_MAX]) { + hdd_err("Attr max feature set size failed"); + return -EINVAL; + } + max_feature_sets = nla_get_u32(tb[ + QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_CONFIG_PARAM_SET_SIZE_MAX]); + hdd_info("Max feature set size: %d", max_feature_sets); + + /* Fill feature combination matrix */ + feature_sets = 0; + feature_set_matrix[feature_sets++] = WIFI_FEATURE_INFRA | + WIFI_FEATURE_P2P; + /* Add more feature combinations here */ + + feature_sets = QDF_MIN(feature_sets, max_feature_sets); + hdd_info("Number of feature sets:%d", feature_sets); + hdd_info("Feature set matrix"); + for (i = 0; i < feature_sets; i++) + hdd_info("[%d] 0x%02X", i, feature_set_matrix[i]); + + reply_skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, sizeof(u32) + + sizeof(u32) * feature_sets + NLMSG_HDRLEN); + if (!reply_skb) { + hdd_err("Feature set matrix: buffer alloc fail"); + return -ENOMEM; + } + + if (nla_put_u32(reply_skb, + QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET_SIZE, + feature_sets) || + nla_put(reply_skb, + QCA_WLAN_VENDOR_ATTR_GET_CONCURRENCY_MATRIX_RESULTS_SET, + sizeof(u32) * feature_sets, + feature_set_matrix)) { + hdd_err("nla put fail"); + kfree_skb(reply_skb); + return -EINVAL; + } + return cfg80211_vendor_cmd_reply(reply_skb); +} + +/** + * wlan_hdd_cfg80211_get_concurrency_matrix() - get concurrency matrix + * @wiphy: pointer to wireless wiphy structure. + * @wdev: pointer to wireless_dev structure. + * @data: Pointer to the data to be passed via vendor interface + * @data_len:Length of the data to be passed + * + * Retrieves the concurrency feature set matrix + * + * Return: 0 on success, negative errno on failure + */ +static int +wlan_hdd_cfg80211_get_concurrency_matrix(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, + int data_len) +{ + int ret; + + cds_ssr_protect(__func__); + ret = __wlan_hdd_cfg80211_get_concurrency_matrix(wiphy, wdev, + data, data_len); + cds_ssr_unprotect(__func__); + + return ret; +} + /** * wlan_hdd_cfg80211_set_feature() - Set the bitmask for supported features * @feature_flags: pointer to the byte array of features. @@ -4972,7 +5084,7 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] = { .info.vendor_id = QCA_NL80211_VENDOR_ID, .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_GET_CONCURRENCY_MATRIX, .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = cds_cfg80211_get_concurrency_matrix + .doit = wlan_hdd_cfg80211_get_concurrency_matrix }, { .info.vendor_id = QCA_NL80211_VENDOR_ID, -- cgit v1.2.3 From d3cb4778fe2b0e2dd3c1dfd0bf625601d60eb930 Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Mon, 22 Feb 2016 22:21:10 +0530 Subject: qcacld-3.0: Fix potential static code analysis issues Fix potential null pointer access during sap open session and validation of the session id which could be reported during static code analysis. Change-Id: I6146c7223c586df06c08c76abd9e38a3c1ad1c4b CRs-Fixed: 979960 --- core/sap/src/sap_module.c | 6 ++++++ core/sme/src/common/sme_api.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index bdde7c52339e..9961c6610168 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -201,6 +201,12 @@ QDF_STATUS wlansap_start(void *pCtx, enum tQDF_ADAPTER_MODE mode, } hal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx); + if (!hal) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, + "%s: Invalid HAL pointer", __func__); + return QDF_STATUS_E_INVAL; + } + qdf_ret_status = sap_open_session(hal, pSapCtx, session_id); if (QDF_STATUS_SUCCESS != qdf_ret_status) { diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index be84e41c73b1..4c87adcf469b 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15130,7 +15130,9 @@ bool sme_is_session_id_valid(tHalHandle hal, uint32_t session_id) { tpAniSirGlobal mac = PMAC_STRUCT(hal); if (!mac) { - sms_log(mac, LOGE, FL("null mac pointer")); + /* Using QDF_TRACE since mac is not available for sms_log */ + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: null mac pointer", __func__); return false; } -- cgit v1.2.3 From d41c3ed58ccb4026df3a19736322a58c0bbb1b59 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Wed, 10 Feb 2016 15:48:06 -0800 Subject: qcacld-3.0: Add interface files for dynamic antenna selection Add interface files for dynamic antenna selection feature CRs-Fixed: 931250 Change-Id: Ieafe368a25c3a69e32cd5de6822ef84130528096 --- core/hdd/inc/wlan_hdd_main.h | 39 +++++++++++++++++++++++++++++++ core/mac/inc/sir_api.h | 49 +++++++++++++++++++++++++++++++++++++++ core/mac/inc/wni_api.h | 2 ++ core/mac/src/include/sir_params.h | 4 +++- core/sme/inc/sme_api.h | 2 ++ core/sme/inc/sme_inside.h | 2 ++ core/sme/inc/sme_internal.h | 1 + core/wma/inc/wma.h | 2 ++ 8 files changed, 100 insertions(+), 1 deletion(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index ef5e2e86d56c..1075ec566ab6 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -146,6 +146,9 @@ /* Scan Req Timeout */ #define WLAN_WAIT_TIME_SCAN_REQ 100 +#define WLAN_WAIT_TIME_ANTENNA_MODE_REQ 3000 +#define WLAN_WAIT_TIME_SET_DUAL_MAC_CFG 1500 + #define MAX_NUMBER_OF_ADAPTERS 4 #define MAX_CFG_STRING_LEN 255 @@ -1112,6 +1115,36 @@ typedef struct { } fw_log_info; +/** + * enum antenna_mode - number of TX/RX chains + * @HDD_ANTENNA_MODE_INVALID: Invalid mode place holder + * @HDD_ANTENNA_MODE_1X1: Number of TX/RX chains equals 1 + * @HDD_ANTENNA_MODE_2X2: Number of TX/RX chains equals 2 + * @HDD_ANTENNA_MODE_MAX: Place holder for max mode + */ +enum antenna_mode { + HDD_ANTENNA_MODE_INVALID, + HDD_ANTENNA_MODE_1X1, + HDD_ANTENNA_MODE_2X2, + HDD_ANTENNA_MODE_MAX +}; + +/** + * enum smps_mode - SM power save mode + * @HDD_SMPS_MODE_STATIC: Static power save + * @HDD_SMPS_MODE_DYNAMIC: Dynamic power save + * @HDD_SMPS_MODE_RESERVED: Reserved + * @HDD_SMPS_MODE_DISABLED: Disable power save + * @HDD_SMPS_MODE_MAX: Place holder for max mode + */ +enum smps_mode { + HDD_SMPS_MODE_STATIC, + HDD_SMPS_MODE_DYNAMIC, + HDD_SMPS_MODE_RESERVED, + HDD_SMPS_MODE_DISABLED, + HDD_SMPS_MODE_MAX +}; + #ifdef WLAN_FEATURE_OFFLOAD_PACKETS /** * struct hdd_offloaded_packets - request id to pattern id mapping @@ -1372,6 +1405,10 @@ struct hdd_context_s { * at runtime and intersecting it with target capab before updating. */ uint32_t fine_time_meas_cap_target; + /* completion variable to indicate set antenna mode complete*/ + struct completion set_antenna_mode_cmpl; + /* Current number of TX X RX chains being used */ + enum antenna_mode current_antenna_mode; }; /*--------------------------------------------------------------------------- @@ -1566,6 +1603,8 @@ static inline void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) {} static inline void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) {} #endif +void wlan_hdd_soc_set_antenna_mode_cb(enum set_antenna_mode_status status); + #ifdef QCA_CONFIG_SMP int wlan_hdd_get_cpu(void); #else diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index ee72d48841ca..98247c6567ec 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -452,6 +452,31 @@ struct sir_set_dual_mac_cfg { struct sir_dual_mac_config set_dual_mac; }; +/** + * struct sir_antenna_mode_param - antenna mode param + * @num_tx_chains: Number of TX chains + * @num_rx_chains: Number of RX chains + * @reason: Reason for setting antenna mode + * @set_antenna_mode_resp: callback to set antenna mode command + */ +struct sir_antenna_mode_param { + uint32_t num_tx_chains; + uint32_t num_rx_chains; + void *set_antenna_mode_resp; +}; + +/** + * struct sir_set_antenna_mode - Set antenna mode request + * @message_type: Message type + * @length: Length of the message + * @set_antenna_mode: Params containing antenna mode params + */ +struct sir_set_antenna_mode { + uint16_t message_type; + uint16_t length; + struct sir_antenna_mode_param set_antenna_mode; +}; + /* / BSS type enum used in while scanning/joining etc */ typedef enum eSirBssType { eSIR_INFRASTRUCTURE_MODE, @@ -3258,6 +3283,29 @@ struct sir_dual_mac_config_resp { uint32_t status; }; +/** + * enum set_antenna_mode_status - Status of set antenna mode + * command + * @SET_ANTENNA_MODE_STATUS_OK: command successful + * @SET_ANTENNA_MODE_STATUS_EINVAL: invalid antenna mode + * @SET_ANTENNA_MODE_STATUS_ECANCELED: mode change cancelled + * @SET_ANTENNA_MODE_STATUS_ENOTSUP: mode not supported + */ +enum set_antenna_mode_status { + SET_ANTENNA_MODE_STATUS_OK, + SET_ANTENNA_MODE_STATUS_EINVAL, + SET_ANTENNA_MODE_STATUS_ECANCELED, + SET_ANTENNA_MODE_STATUS_ENOTSUP, +}; + +/** + * struct sir_antenna_mode_resp - set antenna mode response + * @status: Status of setting the antenna mode + */ +struct sir_antenna_mode_resp { + enum set_antenna_mode_status status; +}; + #ifdef WLAN_WAKEUP_EVENTS /*--------------------------------------------------------------------------- tSirWakeReasonInd @@ -5157,6 +5205,7 @@ typedef void (*hw_mode_transition_cb)(uint32_t old_hw_mode_index, struct sir_vdev_mac_map *vdev_mac_map); typedef void (*dual_mac_cb)(uint32_t status, uint32_t scan_config, uint32_t fw_mode_config); +typedef void (*antenna_mode_cb)(uint32_t status); /** * struct sir_nss_update_request diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h index 103cb278d3f2..23ab4d2dffe1 100644 --- a/core/mac/inc/wni_api.h +++ b/core/mac/inc/wni_api.h @@ -246,6 +246,8 @@ enum eWniMsgTypes { eWNI_SME_EXT_CHANGE_CHANNEL_IND, eWNI_SME_REGISTER_MGMT_FRAME_CB, eWNI_SME_HT40_OBSS_SCAN_IND, /* START and UPDATE OBSS SCAN Indication*/ + eWNI_SME_SET_ANTENNA_MODE_REQ, + eWNI_SME_SET_ANTENNA_MODE_RESP, eWNI_SME_MSG_TYPES_END }; diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 46e20cd29d25..89a0505f9785 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -358,9 +358,11 @@ typedef struct sSirMbMsgP2p { #ifdef FEATURE_WLAN_SCAN_PNO #define SIR_HAL_SET_PNO_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 119) -/* (SIR_HAL_ITC_MSG_TYPES_BEGIN + 120) is unused */ #endif /* FEATURE_WLAN_SCAN_PNO */ +#define SIR_HAL_SOC_ANTENNA_MODE_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 120) +#define SIR_HAL_SOC_ANTENNA_MODE_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 121) + /* (SIR_HAL_ITC_MSG_TYPES_BEGIN + 122) is unused */ #ifdef WLAN_FEATURE_PACKET_FILTERING diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 95af7d96b6c6..616beae018c5 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1003,6 +1003,8 @@ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr, uint32_t vdev_id); QDF_STATUS sme_soc_set_dual_mac_config(tHalHandle hal, struct sir_dual_mac_config msg); +QDF_STATUS sme_soc_set_antenna_mode(tHalHandle hal, + struct sir_antenna_mode_param *msg); void sme_set_scan_disable(tHalHandle h_hal, int value); void sme_setdef_dot11mode(tHalHandle hal); diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index f6fb7a6f0fa7..9ab29e53398c 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -191,6 +191,7 @@ typedef struct tagSmeCmd { struct sir_hw_mode set_hw_mode_cmd; struct s_nss_update_cmd nss_update_cmd; struct sir_dual_mac_config set_dual_mac_cmd; + struct sir_antenna_mode_param set_antenna_mode_cmd; } u; } tSmeCmd; @@ -282,6 +283,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, ePhyChanBondState csr_convert_cb_ini_value_to_phy_cb_state(uint32_t cbIniValue); void active_list_cmd_timeout_handle(void *userData); void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command); +void csr_process_set_antenna_mode(tpAniSirGlobal mac, tSmeCmd *command); void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command); void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command); diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h index 994fd53b2065..cca91d596243 100644 --- a/core/sme/inc/sme_internal.h +++ b/core/sme/inc/sme_internal.h @@ -92,6 +92,7 @@ typedef enum eSmeCommandType { e_sme_command_set_hw_mode, e_sme_command_nss_update, e_sme_command_set_dual_mac_config, + e_sme_command_set_antenna_mode, } eSmeCommandType; typedef enum eSmeState { diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 9b2ccdef514c..5b9ba1f34b7e 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1972,6 +1972,8 @@ QDF_STATUS wma_get_scan_id(uint32_t *scan_id); QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, struct sir_dual_mac_config *msg); +QDF_STATUS wma_send_pdev_set_antenna_mode(tp_wma_handle wma_handle, + struct sir_antenna_mode_param *msg); QDF_STATUS wma_crash_inject(tp_wma_handle wma_handle, uint32_t type, uint32_t delay_time_ms); -- cgit v1.2.3 From a20ef8127db344b91bd31c967c4049691f4b21b7 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Fri, 13 Nov 2015 16:12:13 -0800 Subject: qcacld-3.0: Dynamic antenna selection request/response messages Add support to request for antenna mode to FW to switch from 1x1 to 2x2 and vice versa dynamically and process the response status of whether the request was sent successfully. Change-Id: Ie4b0b36981423f9325c48c7ebad445d5cc1f2a21 CRs-Fixed: 931250 --- core/hdd/src/wlan_hdd_main.c | 26 ++++ core/mac/src/pe/lim/lim_process_message_queue.c | 57 +++++++++ core/mac/src/pe/lim/lim_process_sme_req_messages.c | 69 +++++++++++ core/sme/src/common/sme_api.c | 132 +++++++++++++++++++++ core/sme/src/csr/csr_api_roam.c | 69 +++++++++++ core/wma/src/wma_main.c | 85 +++++++++++++ 6 files changed, 438 insertions(+) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f7ba9197c8fd..ab3d68699565 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5235,6 +5235,8 @@ hdd_context_t *hdd_init_context(struct device *dev, void *hif_sc) hdd_tdls_pre_init(hdd_ctx); mutex_init(&hdd_ctx->dfs_lock); + init_completion(&hdd_ctx->set_antenna_mode_cmpl); + hdd_ctx->target_type = tgt_info->target_type; hdd_init_offloaded_packets_ctx(hdd_ctx); @@ -6765,6 +6767,30 @@ end: } #endif +/** + * wlan_hdd_soc_set_antenna_mode_cb() - Callback for set dual + * mac scan config + * @status: Status of set antenna mode + * + * Callback on setting the dual mac configuration + * + * Return: None + */ +void wlan_hdd_soc_set_antenna_mode_cb( + enum set_antenna_mode_status status) +{ + hdd_context_t *hdd_ctx; + + hdd_info("Status: %d", status); + + hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD); + if (0 != wlan_hdd_validate_context(hdd_ctx)) + return; + + /* Signal the completion of set dual mac config */ + complete(&hdd_ctx->set_antenna_mode_cmpl); +} + /** * hdd_get_fw_version() - Get FW version * @hdd_ctx: pointer to HDD context. diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 6866468577df..17073ce5b8e9 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -188,6 +188,58 @@ static void lim_process_set_hw_mode_resp(tpAniSirGlobal mac, void *body) return; } +/** + * lim_process_antenna_mode_resp() - Process set antenna mode + * response + * @mac: Global MAC pointer + * @body: Set antenna mode response in sir_antenna_mode_resp + * format + * + * Process the set antenna mode response and post the message + * to SME to process this further and release the active + * command list + * + * Return: None + */ +static void lim_process_set_antenna_resp(tpAniSirGlobal mac, void *body) +{ + struct sir_antenna_mode_resp *resp, *param; + bool fail_resp = false; + tSirMsgQ msg; + + resp = (struct sir_antenna_mode_resp *)body; + if (!resp) { + lim_log(mac, LOGE, FL("Set antenna mode resp is NULL")); + fail_resp = true; + /* Not returning here. If possible, let us proceed + * and send fail response to SME + */ + } + + param = qdf_mem_malloc(sizeof(*param)); + if (!param) { + lim_log(mac, LOGE, FL("Fail to allocate memory")); + /* Memory allocation for param failed. + * Cannot send fail status back to SME + */ + return; + } + + if (fail_resp) { + lim_log(mac, LOGE, FL("Send fail status to SME")); + param->status = SET_ANTENNA_MODE_STATUS_ECANCELED; + } else { + param->status = resp->status; + } + + msg.type = eWNI_SME_SET_ANTENNA_MODE_RESP; + msg.bodyptr = param; + msg.bodyval = 0; + lim_log(mac, LOG1, FL("Send eWNI_SME_SET_ANTENNA_MODE_RESP to SME")); + lim_sys_process_mmh_msg_api(mac, &msg, ePROT); + return; +} + /** * lim_process_hw_mode_trans_ind() - Process set HW mode transition indication * @mac: Global MAC pointer @@ -1491,6 +1543,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case eWNI_SME_RESET_AP_CAPS_CHANGED: case eWNI_SME_SET_HW_MODE_REQ: case eWNI_SME_SET_DUAL_MAC_CFG_REQ: + case eWNI_SME_SET_ANTENNA_MODE_REQ: /* These messages are from HDD. Need to respond to HDD */ lim_process_normal_hdd_msg(mac_ctx, msg, true); break; @@ -2008,6 +2061,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case eWNI_SME_HT40_OBSS_SCAN_IND: lim_process_sme_obss_scan_ind(mac_ctx, msg); qdf_mem_free(msg->bodyptr); + break; + case SIR_HAL_SOC_ANTENNA_MODE_RESP: + lim_process_set_antenna_resp(mac_ctx, msg->bodyptr); + qdf_mem_free((void *)msg->bodyptr); msg->bodyptr = NULL; break; default: diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index f202f26d7ec2..425af96ecc6b 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -266,6 +266,72 @@ fail: return QDF_STATUS_SUCCESS; } +/** + * lim_process_set_antenna_mode_req() - Set antenna mode command + * to WMA + * @mac: Global MAC pointer + * @msg: Message containing the antenna mode parameter + * + * Send the set antenna mode command to WMA + * + * Return: QDF_STATUS_SUCCESS if message posting is successful + */ +static QDF_STATUS lim_process_set_antenna_mode_req(tpAniSirGlobal mac, + uint32_t *msg) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + cds_msg_t cds_message; + struct sir_antenna_mode_param *req_msg; + struct sir_set_antenna_mode *buf; + tSirMsgQ resp_msg; + struct sir_antenna_mode_resp *param; + + buf = (struct sir_set_antenna_mode *) msg; + if (!buf) { + lim_log(mac, LOGE, FL("Set antenna mode is NULL")); + /* To free the active command list */ + goto fail; + } + + req_msg = qdf_mem_malloc(sizeof(*req_msg)); + if (!req_msg) { + lim_log(mac, LOGE, FL("qdf_mem_malloc failed")); + return QDF_STATUS_E_NOMEM; + } + + req_msg->num_rx_chains = buf->set_antenna_mode.num_rx_chains; + req_msg->num_tx_chains = buf->set_antenna_mode.num_tx_chains; + + cds_message.bodyptr = req_msg; + cds_message.type = SIR_HAL_SOC_ANTENNA_MODE_REQ; + + lim_log(mac, LOG1, + FL("Post SIR_HAL_SOC_ANTENNA_MODE_REQ to WMA: %d %d"), + req_msg->num_rx_chains, + req_msg->num_tx_chains); + status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message); + if (!QDF_IS_STATUS_SUCCESS(status)) { + lim_log(mac, LOGE, + FL("vos_mq_post_message failed!(err=%d)"), + status); + qdf_mem_free(req_msg); + goto fail; + } + return status; +fail: + param = qdf_mem_malloc(sizeof(*param)); + if (!param) { + lim_log(mac, LOGE, FL("antenna mode resp failed")); + return QDF_STATUS_E_NOMEM; + } + param->status = SET_ANTENNA_MODE_STATUS_ECANCELED; + resp_msg.type = eWNI_SME_SET_ANTENNA_MODE_RESP; + resp_msg.bodyptr = param; + resp_msg.bodyval = 0; + lim_sys_process_mmh_msg_api(mac, &resp_msg, ePROT); + return QDF_STATUS_SUCCESS; +} + /** * __lim_fresh_scan_reqd() - determine if a fresh scan request must be issued. * @mac_ctx: Pointer to Global MAC structure @@ -4909,6 +4975,9 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) case eWNI_SME_EXT_CHANGE_CHANNEL: lim_process_ext_change_channel(pMac, pMsgBuf); break; + case eWNI_SME_SET_ANTENNA_MODE_REQ: + lim_process_set_antenna_mode_req(pMac, pMsgBuf); + break; default: qdf_mem_free((void *)pMsg->bodyptr); pMsg->bodyptr = NULL; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 4c87adcf469b..856e3862d149 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -1028,6 +1028,10 @@ sme_process_cmd: csr_ll_unlock(&pMac->sme.smeCmdActiveList); csr_process_set_dual_mac_config(pMac, pCommand); break; + case e_sme_command_set_antenna_mode: + csr_ll_unlock(&pMac->sme.smeCmdActiveList); + csr_process_set_antenna_mode(pMac, pCommand); + break; default: /* something is wrong */ /* remove it from the active list */ @@ -2210,6 +2214,75 @@ static QDF_STATUS sme_process_dual_mac_config_resp(tpAniSirGlobal mac, return QDF_STATUS_SUCCESS; } +/** + * sme_process_antenna_mode_resp() - Process set antenna mode + * response + * @mac: Global MAC pointer + * @msg: antenna mode response + * + * Processes the antenna mode response and invokes the HDD + * callback to process further + */ +static QDF_STATUS sme_process_antenna_mode_resp(tpAniSirGlobal mac, + uint8_t *msg) +{ + tListElem *entry; + tSmeCmd *command; + bool found; + antenna_mode_cb callback; + struct sir_antenna_mode_resp *param; + + param = (struct sir_antenna_mode_resp *)msg; + if (!param) { + sms_log(mac, LOGE, FL("set antenna mode resp is NULL")); + /* Not returning. Need to check if active command list + * needs to be freed + */ + } + + entry = csr_ll_peek_head(&mac->sme.smeCmdActiveList, + LL_ACCESS_LOCK); + if (!entry) { + sms_log(mac, LOGE, FL("No cmd found in active list")); + return QDF_STATUS_E_FAILURE; + } + + command = GET_BASE_ADDR(entry, tSmeCmd, Link); + if (!command) { + sms_log(mac, LOGE, FL("Base address is NULL")); + return QDF_STATUS_E_FAILURE; + } + + if (e_sme_command_set_antenna_mode != command->command) { + sms_log(mac, LOGE, FL("Command mismatch!")); + return QDF_STATUS_E_FAILURE; + } + + callback = + command->u.set_antenna_mode_cmd.set_antenna_mode_resp; + if (callback) { + if (!param) { + sms_log(mac, LOGE, + FL("Set antenna mode call back is NULL")); + } else { + sms_log(mac, LOG1, + FL("HDD callback for set antenna mode")); + callback(param->status); + } + } else { + sms_log(mac, LOGE, FL("Callback does not exist")); + } + + found = csr_ll_remove_entry(&mac->sme.smeCmdActiveList, entry, + LL_ACCESS_LOCK); + if (found) + /* Now put this command back on the available command list */ + sme_release_command(mac, command); + + sme_process_pending_queue(mac); + return QDF_STATUS_SUCCESS; +} + /*-------------------------------------------------------------------------- \brief sme_process_msg() - The main message processor for SME. @@ -2756,6 +2829,16 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) status = sme_extended_change_channel_ind(pMac, pMsg->bodyptr); qdf_mem_free(pMsg->bodyptr); break; + case eWNI_SME_SET_ANTENNA_MODE_RESP: + if (pMsg->bodyptr) { + status = sme_process_antenna_mode_resp(pMac, + pMsg->bodyptr); + qdf_mem_free(pMsg->bodyptr); + } else { + sms_log(pMac, LOGE, FL("Empty message for %d"), + pMsg->type); + } + break; default: if ((pMsg->type >= eWNI_SME_MSG_TYPES_BEGIN) @@ -14941,6 +15024,55 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal, } #endif /* FEATURE_LFR_SUBNET_DETECTION */ +/** + * sme_soc_set_antenna_mode() - set antenna mode + * @hal: Handle returned by macOpen + * @msg: Structure containing the antenna mode parameters + * + * Send the command to CSR to send + * WMI_SOC_SET_ANTENNA_MODE_CMDID to FW + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_soc_set_antenna_mode(tHalHandle hal, + struct sir_antenna_mode_param *msg) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tpAniSirGlobal mac = PMAC_STRUCT(hal); + tSmeCmd *cmd; + + if (NULL == msg) { + sms_log(mac, LOGE, FL("antenna mode mesg is NULL")); + return QDF_STATUS_E_FAILURE; + } + + status = sme_acquire_global_lock(&mac->sme); + if (!QDF_IS_STATUS_SUCCESS(status)) { + sms_log(mac, LOGE, FL("Failed to acquire lock")); + return QDF_STATUS_E_RESOURCES; + } + + cmd = sme_get_command_buffer(mac); + if (!cmd) { + sme_release_global_lock(&mac->sme); + sms_log(mac, LOGE, FL("Get command buffer failed")); + return QDF_STATUS_E_NULL_VALUE; + } + + cmd->command = e_sme_command_set_antenna_mode; + cmd->u.set_antenna_mode_cmd = *msg; + + sms_log(mac, LOG1, + FL("Queuing e_sme_command_set_antenna_mode to CSR: %d %d"), + cmd->u.set_antenna_mode_cmd.num_rx_chains, + cmd->u.set_antenna_mode_cmd.num_tx_chains); + + csr_queue_sme_command(mac, cmd, false); + sme_release_global_lock(&mac->sme); + + return QDF_STATUS_SUCCESS; +} + /** * sme_set_peer_authorized() - call peer authorized callback * @peer_addr: peer mac address diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index fbc4e43a9c7a..836d09a915a6 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18841,6 +18841,75 @@ fail: sys_process_mmh_msg(mac, &msg); } +/** + * csr_process_set_antenna_mode() - Set antenna mode command to + * PE + * @mac: Global MAC pointer + * @command: Command received from SME + * + * Posts the set dual mac config command to PE. + * + * Return: None + */ +void csr_process_set_antenna_mode(tpAniSirGlobal mac, tSmeCmd *command) +{ + uint32_t len; + struct sir_set_antenna_mode *cmd; + QDF_STATUS status; + tSirMsgQ msg; + struct sir_antenna_mode_resp *param; + + /* Setting MAC configuration is for the entire system. + * So, no need to check session + */ + + if (!command) { + sms_log(mac, LOGE, FL("Set antenna mode param is NULL")); + goto fail; + } + + len = sizeof(*cmd); + cmd = qdf_mem_malloc(len); + if (!cmd) { + sms_log(mac, LOGE, FL("Memory allocation failed")); + goto fail; + } + + cmd->message_type = eWNI_SME_SET_ANTENNA_MODE_REQ; + cmd->length = len; + cmd->set_antenna_mode = command->u.set_antenna_mode_cmd; + + sms_log(mac, LOG1, + FL("Posting eWNI_SME_SET_ANTENNA_MODE_REQ to PE: %d %d"), + cmd->set_antenna_mode.num_rx_chains, + cmd->set_antenna_mode.num_tx_chains); + + status = cds_send_mb_message_to_mac(cmd); + if (QDF_STATUS_SUCCESS != status) { + sms_log(mac, LOGE, FL("Posting to PE failed")); + /* + * cds_send_mb_message_to_mac would've released the mem + * allocated by cmd. + */ + goto fail; + } + + return; +fail: + param = qdf_mem_malloc(sizeof(*param)); + if (!param) { + sms_log(mac, LOGE, + FL("Malloc fail: Fail to send response to SME")); + return; + } + sms_log(mac, LOGE, FL("Sending set dual mac fail response to SME")); + param->status = SET_ANTENNA_MODE_STATUS_ECANCELED; + msg.type = eWNI_SME_SET_ANTENNA_MODE_RESP; + msg.bodyptr = param; + msg.bodyval = 0; + sys_process_mmh_msg(mac, &msg); +} + /** * csr_process_nss_update_req() - Update nss command to PE * @mac: Globacl MAC pointer diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index f503ed43a7e8..49f95a2fff9f 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -5221,6 +5221,11 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) (struct vdev_ie_info *)msg->bodyptr); qdf_mem_free(msg->bodyptr); break; + case SIR_HAL_SOC_ANTENNA_MODE_REQ: + wma_send_pdev_set_antenna_mode(wma_handle, + (struct sir_antenna_mode_param *)msg->bodyptr); + qdf_mem_free(msg->bodyptr); + break; case WMA_LRO_CONFIG_CMD: wma_lro_config_cmd(wma_handle, (struct wma_lro_config_cmd_t *)msg->bodyptr); @@ -5393,6 +5398,86 @@ QDF_STATUS wma_send_soc_set_dual_mac_config(tp_wma_handle wma_handle, return QDF_STATUS_SUCCESS; } +/** + * wma_send_pdev_set_antenna_mode() - Set antenna mode to FW + * @wma_handle: WMA handle + * @msg: Antenna mode parameters + * + * Send WMI_PDEV_SET_ANTENNA_MODE_CMDID to FW requesting to + * modify the number of TX/RX chains from host + * + * Return: QDF_STATUS. 0 on success. + */ +QDF_STATUS wma_send_pdev_set_antenna_mode(tp_wma_handle wma_handle, + struct sir_antenna_mode_param *msg) +{ + wmi_pdev_set_antenna_mode_cmd_fixed_param *cmd; + wmi_buf_t buf; + uint32_t len; + QDF_STATUS status = QDF_STATUS_SUCCESS; + struct sir_antenna_mode_resp *param; + + if (!wma_handle) { + WMA_LOGE("%s: WMA handle is NULL. Cannot issue command", + __func__); + return QDF_STATUS_E_NULL_VALUE; + } + + if (!msg) { + WMA_LOGE("%s: Set antenna mode param is NULL", __func__); + return QDF_STATUS_E_NULL_VALUE; + } + + len = sizeof(*cmd); + + buf = wmi_buf_alloc(wma_handle->wmi_handle, len); + if (!buf) { + WMA_LOGE("%s: wmi_buf_alloc failed", __func__); + status = QDF_STATUS_E_NOMEM; + goto resp; + } + + cmd = (wmi_pdev_set_antenna_mode_cmd_fixed_param *) wmi_buf_data(buf); + WMITLV_SET_HDR(&cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_pdev_set_antenna_mode_cmd_fixed_param, + WMITLV_GET_STRUCT_TLVLEN( + wmi_pdev_set_antenna_mode_cmd_fixed_param)); + + cmd->pdev_id = WMI_PDEV_ID_SOC; + /* Bits 0-15 is num of RX chains 16-31 is num of TX chains */ + cmd->num_txrx_chains = msg->num_rx_chains; + cmd->num_txrx_chains |= (msg->num_tx_chains << 16); + + WMA_LOGI("%s: Num of chains TX: %d RX: %d txrx_chains: 0x%x", + __func__, msg->num_tx_chains, + msg->num_rx_chains, cmd->num_txrx_chains); + + if (wmi_unified_cmd_send(wma_handle->wmi_handle, buf, len, + WMI_PDEV_SET_ANTENNA_MODE_CMDID)) { + WMA_LOGE("%s: Failed to send WMI_PDEV_SET_ANTENNA_MODE_CMDID", + __func__); + wmi_buf_free(buf); + status = QDF_STATUS_E_FAILURE; + goto resp; + } + status = QDF_STATUS_SUCCESS; + +resp: + param = qdf_mem_malloc(sizeof(*param)); + if (!param) { + WMA_LOGE("%s: Memory allocation failed", __func__); + return QDF_STATUS_E_NOMEM; + } + param->status = (status) ? + SET_ANTENNA_MODE_STATUS_ECANCELED : + SET_ANTENNA_MODE_STATUS_OK; + WMA_LOGE("%s: Send antenna mode resp to LIM status: %d", + __func__, param->status); + wma_send_msg(wma_handle, SIR_HAL_SOC_ANTENNA_MODE_RESP, + (void *) param, 0); + return status; +} + /** * wma_crash_inject() - sends command to FW to simulate crash * @wma_handle: pointer of WMA context -- cgit v1.2.3 From 20d2e23fca49ba9383856c732e8abb23d817215b Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Thu, 11 Feb 2016 16:58:40 -0800 Subject: qcacld-3.0: Enable station SMPS only if the session supported NSS > 1 If HT SMPS is enabled and if the session supported NSS > 1 then include SMPS IE in the HT capabilities of the association and the reassociation management frame.Enabling SMPS with an AP whose capability is only 1x1 will result in association/reassociation request being rejected or an unexpected behavior. Send SMPS force mode to FW to trigger SMPS action frame only if SMPS is enabled in the INI. For dynamic antenna switch, the chain mask manager will send the SMPS action frames. CRs-Fixed: 931250 Change-Id: Ifff2ef2c8790994a68e676b8bba2fb03c21370d4 --- core/mac/inc/sir_api.h | 1 + core/mac/inc/sir_mac_prot_def.h | 2 + core/mac/src/pe/include/lim_session.h | 2 + core/mac/src/pe/lim/lim_assoc_utils.c | 17 ++++++- core/mac/src/pe/lim/lim_ft.c | 6 +++ core/mac/src/pe/lim/lim_process_sme_req_messages.c | 10 ++++ core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 7 +++ core/mac/src/sys/legacy/src/utils/src/parser_api.c | 12 +++++ core/sme/inc/csr_internal.h | 1 + core/sme/inc/sme_api.h | 5 ++ core/sme/src/common/sme_api.c | 57 ++++++++++++++++++++++ core/sme/src/csr/csr_api_roam.c | 10 ++++ core/wma/inc/wma_internal.h | 1 + core/wma/src/wma_dev_if.c | 23 ++++++--- core/wma/src/wma_main.c | 5 +- core/wma/src/wma_utils.c | 28 +++++++++++ 16 files changed, 178 insertions(+), 9 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 98247c6567ec..efdf4aedf729 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1032,6 +1032,7 @@ typedef struct sSirSmeJoinRsp { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH tSirSmeHTProfile HTProfile; #endif + bool supported_nss_1x1; uint8_t frames[1]; } tSirSmeJoinRsp, *tpSirSmeJoinRsp; diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 75ada58fea90..8ffaf0123502 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -386,6 +386,8 @@ #define SIR_MAC_VHT_OPMODE_EID 199 #define SIR_MAC_MAX_SUPPORTED_MCS_SET 16 +#define VHT_MCS_1x1 0xFFFC + #ifdef FEATURE_AP_MCC_CH_AVOIDANCE #define SIR_MAC_QCOM_VENDOR_EID 200 #define SIR_MAC_QCOM_VENDOR_OUI "\x00\xA0\xC6" diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 27d1f99c383c..dd2f8ecb21d6 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -474,6 +474,8 @@ typedef struct sPESession /* Added to Support BT-AMP */ struct csa_offload_params saved_csa_params; /* To hold OBSS Scan IE Parameters */ struct obss_scanparam obss_ht40_scanparam; + /* Supported NSS is intersection of self and peer NSS */ + bool supported_nss_1x1; } tPESession, *tpPESession; /*------------------------------------------------------------------------- diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 766374ecfbf8..caf77f5b5e9b 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1590,6 +1590,15 @@ tSirRetStatus lim_populate_vht_mcs_set(tpAniSirGlobal mac_ctx, mac_ctx->roam.configParam.enable2x2, rates->vhtRxMCSMap, rates->vhtTxMCSMap); + if (NULL != session_entry) { + session_entry->supported_nss_1x1 = + ((rates->vhtTxMCSMap & VHT_MCS_1x1) == + VHT_MCS_1x1) ? true : false; + lim_log(mac_ctx, LOG1, + FL("VHT supported nss 1x1: %d"), + session_entry->supported_nss_1x1); + } + return eSIR_SUCCESS; error: @@ -1891,6 +1900,11 @@ lim_populate_peer_rate_set(tpAniSirGlobal pMac, (pMac, LOG2, FL("%x "), pRates->supportedMCSSet[i]); ) + + psessionEntry->supported_nss_1x1 = + ((pRates->supportedMCSSet[1] != 0) ? false : true); + PELOG1(lim_log(pMac, LOG1, FL("HT supported nss 1x1: %d"), + psessionEntry->supported_nss_1x1);) } lim_populate_vht_mcs_set(pMac, pRates, pVHTCaps, psessionEntry); return eSIR_SUCCESS; @@ -2996,7 +3010,8 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->vhtTxMUBformeeCapable = psessionEntry->txMuBformee; pAddStaParams->enableVhtpAid = psessionEntry->enableVhtpAid; pAddStaParams->enableAmpduPs = psessionEntry->enableAmpduPs; - pAddStaParams->enableHtSmps = psessionEntry->enableHtSmps; + pAddStaParams->enableHtSmps = (psessionEntry->enableHtSmps && + (!psessionEntry->supported_nss_1x1)); pAddStaParams->htSmpsconfig = psessionEntry->htSmpsvalue; /* For Self STA get the LDPC capability from session i.e config.ini */ diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 728fb3846cd3..fd8cd22a4788 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -933,6 +933,12 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, eHT_CHANNEL_WIDTH_40MHZ)) lim_init_obss_params(pMac, pftSessionEntry); + pftSessionEntry->enableHtSmps = psessionEntry->enableHtSmps; + pftSessionEntry->smpsMode = psessionEntry->smpsMode; + lim_log(pMac, LOG1, FL("FT session enable smps: %d mode: %d"), + pftSessionEntry->enableHtSmps, + pftSessionEntry->smpsMode); + qdf_mem_free(pBeaconStruct); } diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 425af96ecc6b..ddcbaf7afeb6 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1744,6 +1744,10 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->enableAmpduPs = sme_join_req->enableAmpduPs; session->enableHtSmps = sme_join_req->enableHtSmps; session->htSmpsvalue = sme_join_req->htSmps; + lim_log(mac_ctx, LOG1, + FL("enableHtSmps: %d htSmps: %d"), + session->enableHtSmps, + session->htSmpsvalue); /*Store Persona */ session->pePersona = sme_join_req->staPersona; @@ -2164,6 +2168,12 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, session_entry->dot11mode = reassoc_req->dot11mode; session_entry->vhtCapability = IS_DOT11_MODE_VHT(reassoc_req->dot11mode); + + session_entry->enableHtSmps = reassoc_req->enableHtSmps; + session_entry->htSmpsvalue = reassoc_req->htSmps; + lim_log(mac_ctx, LOG1, FL("enableHtSmps: %d htSmps: %d"), + session_entry->enableHtSmps, + session_entry->htSmpsvalue); /* * Reassociate request is expected * in link established state only. diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 411e407c85d1..fa2dcd3a0bce 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -493,6 +493,13 @@ lim_send_sme_join_reassoc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type, lim_handle_join_rsp_status(mac_ctx, session_entry, result_code, sme_join_rsp); + + /* Send supported NSS 1x1 to SME */ + sme_join_rsp->supported_nss_1x1 = + session_entry->supported_nss_1x1; + lim_log(mac_ctx, LOG1, + FL("SME Join Rsp is supported NSS 1X1: %d"), + sme_join_rsp->supported_nss_1x1); } sme_join_rsp->messageType = msg_type; diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 8336d4866d65..d25eec71fc2d 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -769,6 +769,18 @@ populate_dot11f_ht_caps(tpAniSirGlobal pMac, pDot11f->supportedMCSSet[1] = 0; } + /* If STA mode, session supported NSS > 1 and + * SMPS enabled publish HT SMPS IE + */ + if (psessionEntry && (!pMac->lteCoexAntShare) && + LIM_IS_STA_ROLE(psessionEntry) && + (psessionEntry->enableHtSmps) && + (!psessionEntry->supported_nss_1x1)) { + lim_log(pMac, LOG1, FL("Add SM power save IE: %d"), + psessionEntry->htSmpsvalue); + pDot11f->mimoPowerSave = psessionEntry->htSmpsvalue; + } + CFG_GET_INT(nSirStatus, pMac, WNI_CFG_EXT_HT_CAP_INFO, nCfgValue); uHTCapabilityInfo.nCfgValue16 = nCfgValue & 0xFFFF; diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 7d883931ee18..bb4b103a489c 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -965,6 +965,7 @@ typedef struct tagCsrRoamSession { struct csr_roam_stored_profile stored_roam_profile; bool ch_switch_in_progress; bool roam_synch_in_progress; + bool supported_nss_1x1; } tCsrRoamSession; typedef struct tagCsrRoamStruct { diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 616beae018c5..980dfdc83700 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1097,4 +1097,9 @@ static inline QDF_STATUS sme_send_egap_conf_params(uint32_t enable, void sme_update_fine_time_measurement_capab(tHalHandle hal, uint32_t val); QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hHal, uint32_t vdev_id); +QDF_STATUS sme_update_mimo_power_save(tHalHandle hHal, + uint8_t is_ht_smps_enabled, + uint8_t ht_smps_mode); + +bool sme_is_sta_smps_allowed(tHalHandle hHal, uint8_t session_id); #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 856e3862d149..1d665f598a74 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15385,3 +15385,60 @@ QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hal, uint32_t vdev_id) wma_ht40_stop_obss_scan(wma_handle, vdev_id); return QDF_STATUS_SUCCESS; } + +/** + * sme_update_mimo_power_save() - Update MIMO power save + * configuration + * @hal: The handle returned by macOpen + * @is_ht_smps_enabled: enable/disable ht smps + * @ht_smps_mode: smps mode disabled/static/dynamic + * + * Return: QDF_STATUS if SME update mimo power save + * configuration sucsess else failue status + */ +QDF_STATUS sme_update_mimo_power_save(tHalHandle hal, + uint8_t is_ht_smps_enabled, + uint8_t ht_smps_mode) +{ + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + sms_log(mac_ctx, LOG1, + "update SMPS config enable smps: %d mode: %d", + is_ht_smps_enabled, ht_smps_mode); + mac_ctx->roam.configParam.enableHtSmps = + is_ht_smps_enabled; + mac_ctx->roam.configParam.htSmps = ht_smps_mode; + + return QDF_STATUS_SUCCESS; +} + +/** + * sme_is_sta_smps_allowed() - check if the supported nss for + * the session is greater than 1x1 to enable sta SMPS + * @hal: The handle returned by macOpen + * @session_id: session id + * + * Return: bool returns true if supported nss is greater than + * 1x1 else false + */ +bool sme_is_sta_smps_allowed(tHalHandle hal, uint8_t session_id) +{ + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + tCsrRoamSession *csr_session; + + if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) { + sms_log(mac_ctx, LOGE, + "CSR session not valid: %d", + session_id); + return false; + } + + csr_session = CSR_GET_SESSION(mac_ctx, session_id); + if (NULL == csr_session) { + sms_log(mac_ctx, LOGE, + "SME session not valid: %d", + session_id); + return false; + } + + return (csr_session->supported_nss_1x1 == true) ? false : true; +} diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 836d09a915a6..83b051d778fc 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2290,6 +2290,9 @@ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam) pMac->roam.configParam.obss_active_dwelltime; pParam->obss_passive_dwelltime = pMac->roam.configParam.obss_passive_dwelltime; + pParam->enableHtSmps = pMac->roam.configParam.enableHtSmps; + pParam->htSmps = pMac->roam.configParam.htSmps; + pParam->send_smps_action = pMac->roam.configParam.send_smps_action; return QDF_STATUS_SUCCESS; } @@ -8011,6 +8014,13 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac, SME_QOS_CSR_HANDOFF_COMPLETE, NULL); #endif } + + session_ptr->supported_nss_1x1 = + pSmeJoinRsp->supported_nss_1x1; + sms_log(pMac, LOG1, + FL("SME session supported nss: %d"), + session_ptr->supported_nss_1x1); + /* * * The join bssid count can be reset as soon as * we are done with the join requests and returning diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index b6741ea690ee..4893b0df029f 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -814,6 +814,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, #endif tSmpsModeValue host_map_smps_mode(A_UINT32 fw_smps_mode); +int wma_smps_mode_to_force_mode_param(uint8_t smps_mode); #ifdef WLAN_FEATURE_LINK_LAYER_STATS void wma_register_ll_stats_event_handler(tp_wma_handle wma_handle); diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index f0ba509ecbea..bea4eda97ef9 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -3623,6 +3623,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) bool peer_assoc_cnf = false; struct vdev_up_params param = {0}; struct pdev_params pdev_param = {0}; + int smps_param; #ifdef FEATURE_WLAN_TDLS if (STA_ENTRY_TDLS_PEER == params->staType) { @@ -3798,13 +3799,23 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) __func__, iface->type, iface->sub_type); /* Sta is now associated, configure various params */ - /* SM power save, configure the h/w as configured - * in the ini file. SMPS is not published in assoc - * request. Once configured, fw sends the required - * action frame to AP. + /* Send SMPS force command to FW to send the required + * action frame only when SM power save is enbaled in + * the INI. In case dynamic antenna selection, the + * action frames are sent by the chain mask manager. + * In addition to the action frames, The SM power save is + * published in the assoc request HT SMPS IE for both cases. */ - if (params->enableHtSmps) - wma_set_mimops(wma, params->smesessionId, params->htSmpsconfig); + if (params->enableHtSmps) { + smps_param = wma_smps_mode_to_force_mode_param( + params->htSmpsconfig); + if (smps_param >= 0) { + WMA_LOGD("%s: Set MIMO power save smps mode %d", + __func__, params->htSmpsconfig); + wma_set_mimops(wma, params->smesessionId, + smps_param); + } + } /* Partial AID match power save, enable when SU bformee */ if (params->enableVhtpAid && params->vhtTxBFCapable) diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 49f95a2fff9f..485aff03d4ae 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -566,8 +566,9 @@ static int32_t wma_set_priv_cfg(tp_wma_handle wma_handle, privcmd->param_value); break; case WMI_STA_SMPS_FORCE_MODE_CMDID: - wma_set_mimops(wma_handle, privcmd->param_vdev_id, - privcmd->param_value); + ret = wma_set_mimops(wma_handle, + privcmd->param_vdev_id, + privcmd->param_value); break; case WMI_STA_SMPS_PARAM_CMDID: wma_set_smps_params(wma_handle, privcmd->param_vdev_id, diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 02cdce327744..8ef3e1757eab 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -315,6 +315,34 @@ tSmpsModeValue host_map_smps_mode(A_UINT32 fw_smps_mode) return smps_mode; } +/** + * wma_smps_mode_to_force_mode_param() - Map smps mode to force + * mode commmand param + * @smps_mode: SMPS mode according to the protocol + * + * Return: int > 0 for success else failure + */ +int wma_smps_mode_to_force_mode_param(uint8_t smps_mode) +{ + int param = -EINVAL; + + switch (smps_mode) { + case STATIC_SMPS_MODE: + param = WMI_SMPS_FORCED_MODE_STATIC; + break; + case DYNAMIC_SMPS_MODE: + param = WMI_SMPS_FORCED_MODE_DYNAMIC; + break; + case SMPS_MODE_DISABLED: + param = WMI_SMPS_FORCED_MODE_DISABLED; + break; + default: + WMA_LOGE(FL("smps mode cannot be mapped :%d "), + smps_mode); + } + return param; +} + #ifdef WLAN_FEATURE_STATS_EXT /** * wma_stats_ext_event_handler() - extended stats event handler -- cgit v1.2.3 From fec2481466f946d241004d11f53866646a539e0c Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Tue, 16 Feb 2016 16:31:56 -0800 Subject: qcacld-3.0: Do not send SMPS force mode on dynamic antenna mode switch When dynamic antenna selection requests to change the number of TX/RX chains, the FW chain mask manager will take care of sending the corresponding SMPS action frames to the AP to put the station in 1x1 or 2x2 mode. The host driver should only handle setting the right SMPS mode in the HT capabilities of association or re-association requests. CRs-Fixed: 931250 Change-Id: I9bedcc5024a98040f571f730ff084f6fe3e3ad00 --- core/hdd/src/wlan_hdd_cfg.c | 2 ++ core/mac/inc/sir_api.h | 1 + core/mac/src/pe/include/lim_session.h | 1 + core/mac/src/pe/lim/lim_assoc_utils.c | 2 ++ core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 1 + core/mac/src/pe/lim/lim_process_sme_req_messages.c | 15 +++++++++++---- core/sme/inc/csr_api.h | 1 + core/sme/inc/csr_internal.h | 1 + core/sme/inc/sme_api.h | 3 ++- core/sme/src/common/sme_api.c | 13 ++++++++++--- core/sme/src/csr/csr_api_roam.c | 4 ++++ core/wma/inc/wma_if.h | 1 + core/wma/src/wma_dev_if.c | 8 ++++---- 13 files changed, 41 insertions(+), 12 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 66663f6af9eb..5d3b5d6d69b3 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -6543,6 +6543,8 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx) smeConfig->csrConfig.enableAmpduPs = pConfig->enableAmpduPs; smeConfig->csrConfig.enableHtSmps = pConfig->enableHtSmps; smeConfig->csrConfig.htSmps = pConfig->htSmps; + /* This param cannot be configured from INI */ + smeConfig->csrConfig.send_smps_action = true; smeConfig->csrConfig.AdHocChannel5G = pConfig->AdHocChannel5G; smeConfig->csrConfig.AdHocChannel24 = pConfig->AdHocChannel24G; smeConfig->csrConfig.ProprietaryRatesEnabled = 0; diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index efdf4aedf729..31ae9a21c696 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -970,6 +970,7 @@ typedef struct sSirSmeJoinReq { uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; + bool send_smps_action; uint8_t isAmsduSupportInAMPDU; tAniBool isWMEenabled; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index dd2f8ecb21d6..6371849ff1f7 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -325,6 +325,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmpsvalue; + bool send_smps_action; uint8_t spectrumMgtEnabled; /* *********************11H related**************************** */ tLimSpecMgmtInfo gLimSpecMgmt; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index caf77f5b5e9b..0dc7d791c979 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -3013,6 +3013,8 @@ lim_add_sta_self(tpAniSirGlobal pMac, uint16_t staIdx, uint8_t updateSta, pAddStaParams->enableHtSmps = (psessionEntry->enableHtSmps && (!psessionEntry->supported_nss_1x1)); pAddStaParams->htSmpsconfig = psessionEntry->htSmpsvalue; + pAddStaParams->send_smps_action = + psessionEntry->send_smps_action; /* For Self STA get the LDPC capability from session i.e config.ini */ pAddStaParams->htLdpcCapable = diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index c938db44fab5..e9abe6f2c933 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -549,6 +549,7 @@ static void mlm_add_sta(tpAniSirGlobal mac_ctx, tpAddStaParams sta_param, sta_param->enableAmpduPs = session_entry->enableAmpduPs; sta_param->enableHtSmps = session_entry->enableHtSmps; sta_param->htSmpsconfig = session_entry->htSmpsvalue; + sta_param->send_smps_action = session_entry->send_smps_action; lim_populate_own_rate_set(mac_ctx, &sta_param->supportedRates, NULL, false, session_entry, NULL); diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index ddcbaf7afeb6..c3f2ad98622a 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1744,10 +1744,13 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->enableAmpduPs = sme_join_req->enableAmpduPs; session->enableHtSmps = sme_join_req->enableHtSmps; session->htSmpsvalue = sme_join_req->htSmps; + session->send_smps_action = + sme_join_req->send_smps_action; lim_log(mac_ctx, LOG1, - FL("enableHtSmps: %d htSmps: %d"), + FL("enable Smps: %d mode: %d send action: %d"), session->enableHtSmps, - session->htSmpsvalue); + session->htSmpsvalue, + session->send_smps_action); /*Store Persona */ session->pePersona = sme_join_req->staPersona; @@ -2171,9 +2174,13 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, session_entry->enableHtSmps = reassoc_req->enableHtSmps; session_entry->htSmpsvalue = reassoc_req->htSmps; - lim_log(mac_ctx, LOG1, FL("enableHtSmps: %d htSmps: %d"), + session_entry->send_smps_action = + reassoc_req->send_smps_action; + lim_log(mac_ctx, LOG1, + FL("enableHtSmps: %d htSmps: %d send action: %d"), session_entry->enableHtSmps, - session_entry->htSmpsvalue); + session_entry->htSmpsvalue, + session_entry->send_smps_action); /* * Reassociate request is expected * in link established state only. diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index ea13b14f25ec..bae7eb13e0dd 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1158,6 +1158,7 @@ typedef struct tagCsrConfigParam { uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; + bool send_smps_action; bool ignore_peer_erp_info; /* * To enable/disable scanning only 2.4Ghz channels on first scan diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index bb4b103a489c..c8e99912eb8c 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -603,6 +603,7 @@ typedef struct tagCsrConfig { uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmps; + bool send_smps_action; uint8_t txLdpcEnable; /* * Enable/Disable heartbeat offload diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index 980dfdc83700..b14929a06114 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -1099,7 +1099,8 @@ QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hHal, uint32_t vdev_id); QDF_STATUS sme_update_mimo_power_save(tHalHandle hHal, uint8_t is_ht_smps_enabled, - uint8_t ht_smps_mode); + uint8_t ht_smps_mode, + bool send_smps_action); bool sme_is_sta_smps_allowed(tHalHandle hHal, uint8_t session_id); #endif /* #if !defined( __SME_API_H ) */ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1d665f598a74..eb254f31c990 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15392,21 +15392,28 @@ QDF_STATUS sme_ht40_stop_obss_scan(tHalHandle hal, uint32_t vdev_id) * @hal: The handle returned by macOpen * @is_ht_smps_enabled: enable/disable ht smps * @ht_smps_mode: smps mode disabled/static/dynamic + * @send_smps_action: flag to send smps force mode command + * to FW * * Return: QDF_STATUS if SME update mimo power save * configuration sucsess else failue status */ QDF_STATUS sme_update_mimo_power_save(tHalHandle hal, uint8_t is_ht_smps_enabled, - uint8_t ht_smps_mode) + uint8_t ht_smps_mode, + bool send_smps_action) { tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + sms_log(mac_ctx, LOG1, - "update SMPS config enable smps: %d mode: %d", - is_ht_smps_enabled, ht_smps_mode); + "SMPS enable: %d mode: %d send action: %d", + is_ht_smps_enabled, ht_smps_mode, + send_smps_action); mac_ctx->roam.configParam.enableHtSmps = is_ht_smps_enabled; mac_ctx->roam.configParam.htSmps = ht_smps_mode; + mac_ctx->roam.configParam.send_smps_action = + send_smps_action; return QDF_STATUS_SUCCESS; } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 83b051d778fc..4e4f472fddc3 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2031,6 +2031,8 @@ QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, pMac->roam.configParam.enableAmpduPs = pParam->enableAmpduPs; pMac->roam.configParam.enableHtSmps = pParam->enableHtSmps; pMac->roam.configParam.htSmps = pParam->htSmps; + pMac->roam.configParam.send_smps_action = + pParam->send_smps_action; pMac->roam.configParam.txLdpcEnable = pParam->enableTxLdpc; pMac->roam.configParam.ignore_peer_erp_info = pParam->ignore_peer_erp_info; @@ -13860,6 +13862,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, (uint8_t) pMac->roam.configParam.enableHtSmps; csr_join_req->htSmps = (uint8_t) pMac->roam.configParam.htSmps; + csr_join_req->send_smps_action = + pMac->roam.configParam.send_smps_action; csr_join_req->isAmsduSupportInAMPDU = (uint8_t) pMac->roam.configParam.isAmsduSupportInAMPDU; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index 542a1e890ed4..a380eecc745b 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -309,6 +309,7 @@ typedef struct { uint8_t enableAmpduPs; uint8_t enableHtSmps; uint8_t htSmpsconfig; + bool send_smps_action; uint8_t htLdpcCapable; uint8_t vhtLdpcCapable; uint8_t smesessionId; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index bea4eda97ef9..2477741ce969 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -3801,16 +3801,16 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params) /* Send SMPS force command to FW to send the required * action frame only when SM power save is enbaled in - * the INI. In case dynamic antenna selection, the - * action frames are sent by the chain mask manager. + * from INI. In case dynamic antenna selection, the + * action frames are sent by the chain mask manager * In addition to the action frames, The SM power save is * published in the assoc request HT SMPS IE for both cases. */ - if (params->enableHtSmps) { + if ((params->enableHtSmps) && (params->send_smps_action)) { smps_param = wma_smps_mode_to_force_mode_param( params->htSmpsconfig); if (smps_param >= 0) { - WMA_LOGD("%s: Set MIMO power save smps mode %d", + WMA_LOGD("%s: Send SMPS force mode: %d", __func__, params->htSmpsconfig); wma_set_mimops(wma, params->smesessionId, smps_param); -- cgit v1.2.3 From 393f3796b687570fb315c68ebb2730a7401289c5 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Fri, 13 Nov 2015 17:13:21 -0800 Subject: qcacld-3.0: Dynamic antenna switch in disconnected/station mode feature Functionality for switching antenna mode (TX/RX chains) from 1x1 to 2x2 and vice versa dynamically without reloading the driver. This feature is currently supported in the disconnected state where only scan operation can happen and standalone station mode. The changes include the following: 1. Driver command IOCTL to set/get antenna mode as follows DRIVER SETANTENNAMODE <# of streams> DRIVER GETANTENNAMODE 2. Processing SETANTENNAMODE and GETANTENNAMODE to dynamically change the number of TX/RX chains as follows Dynamic switch request is allowed only when the supported number of chains in the system is greater than 1. Dynamic antenna switch is achieved by sending WMI_PDEV_SET_ANTENNA_MODE command to the FW chain mask manager with parameters to change the number of TX/RX chains. This request will be maintained by the chain mask manager and applied whenever only one MAC is active. If there is a station association followed by dynamic switch to 1x1 mode then SM power save IE is included in the HT caps of the association/reassociation request management frame. Dynamic switch in the connected standalone station mode is achieved by sending SMPS force mode command with appropriate values for smps mode by the chain mask manager. Change-Id: I65d51d173a627dc2751ef10cc2172a5215e7b8db CRs-Fixed: 931250 --- core/hdd/src/wlan_hdd_ioctl.c | 260 ++++++++++++++++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_main.c | 7 ++ 2 files changed, 267 insertions(+) diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 07667d51ce93..b08bcf6ec900 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -7011,6 +7011,264 @@ static int drv_cmd_rx_filter_add(hdd_adapter_t *adapter, return hdd_driver_rxfilter_comand_handler(command, adapter, true); } +/** + * hdd_parse_setantennamode_command() - HDD Parse SETANTENNAMODE + * command + * @value: Pointer to SETANTENNAMODE command + * @mode: Pointer to antenna mode + * @reason: Pointer to reason for set antenna mode + * + * This function parses the SETANTENNAMODE command passed in the format + * SETANTENNAMODEmode + * + * Return: 0 for success non-zero for failure + */ +static int hdd_parse_setantennamode_command(const uint8_t *value) +{ + const uint8_t *in_ptr = value; + int tmp, v; + char arg1[32]; + + in_ptr = strnchr(value, strlen(value), SPACE_ASCII_VALUE); + + /* no argument after the command */ + if (NULL == in_ptr) { + hddLog(LOGE, FL("No argument after the command")); + return -EINVAL; + } + + /* no space after the command */ + if (SPACE_ASCII_VALUE != *in_ptr) { + hddLog(LOGE, FL("No space after the command")); + return -EINVAL; + } + + /* remove empty spaces */ + while ((SPACE_ASCII_VALUE == *in_ptr) && ('\0' != *in_ptr)) + in_ptr++; + + /* no argument followed by spaces */ + if ('\0' == *in_ptr) { + hddLog(LOGE, FL("No argument followed by spaces")); + return -EINVAL; + } + + /* get the argument i.e. antenna mode */ + v = sscanf(in_ptr, "%31s ", arg1); + if (1 != v) { + hddLog(LOGE, FL("argument retrieval from cmd string failed")); + return -EINVAL; + } + + v = kstrtos32(arg1, 10, &tmp); + if (v < 0) { + hddLog(LOGE, FL("argument string to int conversion failed")); + return -EINVAL; + } + + return tmp; +} + +/** + * hdd_is_supported_chain_mask_2x2() - Verify if supported chain + * mask is 2x2 mode + * @hdd_ctx: Pointer to hdd contex + * + * Return: true if supported chain mask 2x2 else false + */ +static bool hdd_is_supported_chain_mask_2x2(hdd_context_t *hdd_ctx) +{ + /* + * Revisit and the update logic to determine the number + * of TX/RX chains supported in the system when + * antenna sharing per band chain mask support is + * brought in + */ + return (hdd_ctx->config->enable2x2 == 0x01) ? true : false; +} + +/** + * hdd_is_supported_chain_mask_1x1() - Verify if the supported + * chain mask is 1x1 + * @hdd_ctx: Pointer to hdd contex + * + * Return: true if supported chain mask 1x1 else false + */ +static bool hdd_is_supported_chain_mask_1x1(hdd_context_t *hdd_ctx) +{ + /* + * Revisit and update the logic to determine the number + * of TX/RX chains supported in the system when + * antenna sharing per band chain mask support is + * brought in + */ + return (!hdd_ctx->config->enable2x2) ? true : false; +} + +/** + * drv_cmd_set_antenna_mode() - SET ANTENNA MODE driver command + * handler + * @adapter: Pointer to network adapter + * @hdd_ctx: Pointer to hdd context + * @command: Pointer to input command + * @command_len: Command length + * @priv_data: Pointer to private data in command + */ +static int drv_cmd_set_antenna_mode(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + struct sir_antenna_mode_param params; + QDF_STATUS status; + int ret = 0; + int mode; + uint8_t *value = command; + uint8_t smps_mode; + uint8_t smps_enable; + + if (((1 << QDF_STA_MODE) != hdd_ctx->concurrency_mode) || + (hdd_ctx->no_of_active_sessions[QDF_STA_MODE] > 1)) { + hdd_err("Operation invalid in non sta or concurrent mode"); + ret = -EPERM; + goto exit; + } + + mode = hdd_parse_setantennamode_command(value); + if (mode < 0) { + hdd_err("Invalid SETANTENNA command"); + ret = mode; + goto exit; + } + + hdd_info("Processing antenna mode switch to: %d", mode); + + if (hdd_ctx->current_antenna_mode == mode) { + hdd_err("System already in the requested mode"); + ret = 0; + goto exit; + } + + if ((HDD_ANTENNA_MODE_2X2 == mode) && + (!hdd_is_supported_chain_mask_2x2(hdd_ctx))) { + hdd_err("System does not support 2x2 mode"); + ret = -EPERM; + goto exit; + } + + if ((HDD_ANTENNA_MODE_1X1 == mode) && + hdd_is_supported_chain_mask_1x1(hdd_ctx)) { + hdd_err("System only supports 1x1 mode"); + ret = 0; + goto exit; + } + + switch (mode) { + case HDD_ANTENNA_MODE_1X1: + params.num_rx_chains = 1; + params.num_tx_chains = 1; + break; + case HDD_ANTENNA_MODE_2X2: + params.num_rx_chains = 2; + params.num_tx_chains = 2; + break; + default: + hdd_err("unsupported antenna mode"); + ret = -EINVAL; + goto exit; + } + + params.set_antenna_mode_resp = + (void *)wlan_hdd_soc_set_antenna_mode_cb; + hdd_info("Set antenna mode rx chains: %d tx chains: %d", + params.num_rx_chains, + params.num_tx_chains); + + + INIT_COMPLETION(hdd_ctx->set_antenna_mode_cmpl); + status = sme_soc_set_antenna_mode(hdd_ctx->hHal, ¶ms); + if (QDF_STATUS_SUCCESS != status) { + hdd_err("set antenna mode failed status : %d", status); + ret = -EFAULT; + goto exit; + } + + ret = wait_for_completion_timeout( + &hdd_ctx->set_antenna_mode_cmpl, + msecs_to_jiffies(WLAN_WAIT_TIME_ANTENNA_MODE_REQ)); + if (!ret) { + ret = -EFAULT; + hdd_err("send set antenna mode timed out"); + goto exit; + } + + /* Update SME SMPS config */ + if (HDD_ANTENNA_MODE_1X1 == mode) { + smps_enable = true; + smps_mode = HDD_SMPS_MODE_STATIC; + } else { + smps_enable = false; + smps_mode = HDD_SMPS_MODE_DISABLED; + } + + hdd_info("Update SME SMPS enable: %d mode: %d", + smps_enable, smps_mode); + status = sme_update_mimo_power_save( + hdd_ctx->hHal, smps_enable, smps_mode, false); + if (QDF_STATUS_SUCCESS != status) { + hdd_err("Update SMPS config failed enable: %d mode: %d status: %d", + smps_enable, smps_mode, status); + ret = -EFAULT; + goto exit; + } + + hdd_info("Successfully switched to mode: %d x %d", mode, mode); + ret = 0; + hdd_ctx->current_antenna_mode = mode; + +exit: + hdd_info("Set antenna status: %d current mode: %d", + ret, hdd_ctx->current_antenna_mode); + return ret; + +} + +/** + * drv_cmd_get_antenna_mode() - GET ANTENNA MODE driver command + * handler + * @adapter: Pointer to hdd adapter + * @hdd_ctx: Pointer to hdd context + * @command: Pointer to input command + * @command_len: length of the command + * @priv_data: private data coming with the driver command + * + * Return: 0 for success non-zero for failure + */ +static inline int drv_cmd_get_antenna_mode(hdd_adapter_t *adapter, + hdd_context_t *hdd_ctx, + uint8_t *command, + uint8_t command_len, + hdd_priv_data_t *priv_data) +{ + uint32_t antenna_mode = 0; + char extra[32]; + uint8_t len = 0; + + antenna_mode = hdd_ctx->current_antenna_mode; + len = scnprintf(extra, sizeof(extra), "%s %d", command, + antenna_mode); + len = QDF_MIN(priv_data->total_len, len + 1); + if (copy_to_user(priv_data->buf, &extra, len)) { + hdd_err("Failed to copy data to user buffer"); + return -EFAULT; + } + + hdd_info("Get antenna mode: %d", antenna_mode); + + return 0; +} + /* * dummy (no-op) hdd driver command handler */ @@ -7323,6 +7581,8 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = { {"RXFILTER-ADD", drv_cmd_rx_filter_add}, {"SET_FCC_CHANNEL", drv_cmd_set_fcc_channel}, {"CHANNEL_SWITCH", drv_cmd_set_channel_switch}, + {"SETANTENNAMODE", drv_cmd_set_antenna_mode}, + {"GETANTENNAMODE", drv_cmd_get_antenna_mode}, }; /** diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ab3d68699565..b6174c29d470 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1328,6 +1328,13 @@ void hdd_update_tgt_cfg(void *context, void *param) hdd_ctx->fine_time_meas_cap_target = cfg->fine_time_measurement_cap; hdd_info(FL("fine_time_meas_cap: 0x%x"), hdd_ctx->config->fine_time_meas_cap); + + hdd_ctx->current_antenna_mode = + (hdd_ctx->config->enable2x2 == 0x01) ? + HDD_ANTENNA_MODE_2X2 : HDD_ANTENNA_MODE_1X1; + hdd_info("Init current antenna mode: %d", + hdd_ctx->current_antenna_mode); + } /** -- cgit v1.2.3 From 76b4132090d8031585fac943197bad73f51fa1bb Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 9 Dec 2015 14:39:17 -0800 Subject: qcacld-3.0: Define correct country codes Define the correct country codes per the data published by the regulatory compliance team. Change-Id: I2474acb2657ba1e4a0f62aef013df296aebfcb53 CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 959 ++++++++---------------------------- core/cds/inc/cds_regdomain_common.h | 181 +------ core/wma/src/wma_features.c | 2 +- 3 files changed, 221 insertions(+), 921 deletions(-) diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 70207ef2c585..868b8e893494 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -315,759 +315,218 @@ typedef struct ath_hal_reg_dmn_tables { uint16_t regDomainsCt; /* Num reg domain entries */ } HAL_REG_DMN_TABLES; -/* - * Country/Region Codes from MS WINNLS.H - * Numbering from ISO 3166 - */ -/** @brief country code definitions - * - country definition: CTRY_DEBUG - * - country string: DB - * - country ID: 0 - * - country definition: CTRY_DEFAULT - * - country string: NA - * - country ID: 0 - * - country definition: CTRY_ALBANIA - * - country string: AL - * - country ID: 8 - * - country definition: CTRY_ALGERIA - * - country string: DZ - * - country ID: 12 - * - country definition: CTRY_ARGENTINA - * - country string: AR - * - country ID: 32 - * - country definition: CTRY_ARMENIA - * - country string: AM - * - country ID: 51 - * - country definition: CTRY_AUSTRALIA - * - country string: AU - * - country ID: 36 - * - country definition: CTRY_AUSTRALIA2 - * - country string: AU2 - * - country ID: 5000 - * - country definition: CTRY_AUSTRIA - * - country string: AT - * - country ID: 40 - * - country definition: CTRY_AZERBAIJAN - * - country string: AZ - * - country ID: 31 - * - country definition: CTRY_BAHAMAS - * - country string: BS - * - country ID: 44 - * - country definition: CTRY_BAHRAIN - * - country string: BH - * - country ID: 48 - * - country definition: CTRY_BELARUS - * - country string: BY - * - country ID: 112 - * - country definition: CTRY_BELGIUM - * - country string: BE - * - country ID: 56 - * - country definition: CTRY_BELIZE - * - country string: BZ - * - country ID: 84 - * - country definition: CTRY_BERMUDA - * - country string: BM - * - country ID: 60 - * - country definition: CTRY_BOLIVIA - * - country string: BO - * - country ID: 68 - * - country definition: CTRY_BOSNIA_HERZEGOWINA - * - country string: 70 - * - country ID: BA - * - country definition: CTRY_BRAZIL - * - country string: BR - * - country ID: 76 - * - country definition: CTRY_BRUNEI_DARUSSALAM - * - country string: BN - * - country ID: 96 - * - country definition: CTRY_BULGARIA - * - country string: BG - * - country ID: 100 - * - country definition: CTRY_CANADA - * - country string: CA - * - country ID: 124 - * - country definition: CTRY_CANADA2 - * - country string: CA2 - * - country ID: 5001 - * - country definition: CTRY_CHILE - * - country string: CL - * - country ID: 152 - * - country definition: CTRY_CHINA - * - country string: CN - * - country ID: 152 - * - country definition: CTRY_COLOMBIA - * - country string: CO - * - country ID: 170 - * - country definition: CTRY_COSTA_RICA - * - country string: CR - * - country ID: 191 - * - country definition: CTRY_CROATIA - * - country string: HR - * - country ID: 191 - * - country definition: CTRY_CYPRUS - * - country string: CY - * - country ID: 196 - * - country definition: CTRY_CZECH - * - country string: CZ - * - country ID: 203 - * - country definition: CTRY_DENMARK - * - country string: DK - * - country ID: 208 - * - country definition: CTRY_DOMINICAN_REPUBLIC - * - country string: DO - * - country ID: 214 - * - country definition: CTRY_ECUADOR - * - country string: EC - * - country ID: 218 - * - country definition: CTRY_EGYPT - * - country string: EG - * - country ID: 818 - * - country definition: CTRY_EL_SALVADOR - * - country string: SV - * - country ID: 222 - * - country definition: CTRY_ESTONIA - * - country string: EE - * - country ID: 233 - * - country definition: CTRY_FAEROE_ISLANDS - * - country string: FO - * - country ID: 234 - * - country definition: CTRY_FINLAND - * - country string: FI - * - country ID: 246 - * - country definition: CTRY_FRANCE - * - country string: FR - * - country ID: 250 - * - country definition: CTRY_FRANCE2 - * - country string: F2 - * - country ID: 255 - * - country definition: CTRY_GEORGIA - * - country string: GE - * - country ID: 268 - * - country definition: CTRY_GERMANY - * - country string: DE - * - country ID: 276 - * - country definition: CTRY_GREECE - * - country string: GR - * - country ID: 300 - * - country definition: CTRY_GUATEMALA - * - country string: GT - * - country ID: 320 - * - country definition: CTRY_HONDURAS - * - country string: HN - * - country ID: 340 - * - country definition: CTRY_HONG_KONG - * - country string: HK - * - country ID: 344 - * - country definition: CTRY_HUNGARY - * - country string: HU - * - country ID: 348 - * - country definition: CTRY_ICELAND - * - country string: IS - * - country ID: 352 - * - country definition: CTRY_INDIA - * - country string: IN - * - country ID: 356 - * - country definition: CTRY_INDONESIA - * - country string: ID - * - country ID: 360 - * - country definition: CTRY_IRAN - * - country string: IR - * - country ID: 364 - * - country definition: CTRY_IRAQ - * - country string: IQ - * - country ID: 368 - * - country definition: CTRY_IRELAND - * - country string: IE - * - country ID: 372 - * - country definition: CTRY_ISRAEL - * - country string: IL - * - country ID: 376 - * - country definition: CTRY_ITALY - * - country string: IT - * - country ID: 380 - * - country definition: CTRY_JAMAICA - * - country string: JM - * - country ID: 388 - * - country definition: CTRY_JAPAN - * - country string: JP - * - country ID: 392 - * - country definition: CTRY_JAPAN1 - * - country string: JP1 - * - country ID: 393 - * - country definition: CTRY_JAPAN2 - * - country string: JP2 - * - country ID: 394 - * - country definition: CTRY_JAPAN3 - * - country string: JP3 - * - country ID: 395 - * - country definition: CTRY_JAPAN4 - * - country string: JP4 - * - country ID: 396 - * - country definition: CTRY_JAPAN5 - * - country string: JP5 - * - country ID: 397 - * - country definition: CTRY_JAPAN6 - * - country string: JP6 - * - country ID: 399 - * - country definition: CTRY_JAPAN7 - * - country string: JP7 - * - country ID: 4007 - * - country definition: CTRY_JAPAN8 - * - country string: JP8 - * - country ID: 4008 - * - country definition: CTRY_JAPAN9 - * - country string: JP9 - * - country ID: 4009 - * - country definition: CTRY_JAPAN10 - * - country string: JP10 - * - country ID: 4010 - * - country definition: CTRY_JAPAN11 - * - country string: JP11 - * - country ID: 4011 - * - country definition: CTRY_JAPAN12 - * - country string: JP12 - * - country ID: 4012 - * - country definition: CTRY_JAPAN13 - * - country string: JP13 - * - country ID: 4013 - * - country definition: CTRY_JAPAN14 - * - country string: JP14 - * - country ID: 4014 - * - country definition: CTRY_JAPAN15 - * - country string: JP15 - * - country ID: 4015 - * - country definition: CTRY_JAPAN16 - * - country string: JP16 - * - country ID: 4016 - * - country definition: CTRY_JAPAN17 - * - country string: JP17 - * - country ID: 4017 - * - country definition: CTRY_JAPAN18 - * - country string: JP18 - * - country ID: 4018 - * - country definition: CTRY_JAPAN19 - * - country string: JP19 - * - country ID: 4019 - * - country definition: CTRY_JAPAN20 - * - country string: JP20 - * - country ID: 4020 - * - country definition: CTRY_JAPAN21 - * - country string: JP21 - * - country ID: 4021 - * - country definition: CTRY_JAPAN22 - * - country string: JP22 - * - country ID: 4022 - * - country definition: CTRY_JAPAN23 - * - country string: JP23 - * - country ID: 4023 - * - country definition: CTRY_JAPAN24 - * - country string: JP24 - * - country ID: 4024 - * - country definition: CTRY_JAPAN25 - * - country string: JP25 - * - country ID: 4025 - * - country definition: CTRY_JAPAN26 - * - country string: JP26 - * - country ID: 4026 - * - country definition: CTRY_JAPAN27 - * - country string: JP27 - * - country ID: 4027 - * - country definition: CTRY_JAPAN28 - * - country string: JP28 - * - country ID: 4028 - * - country definition: CTRY_JAPAN29 - * - country string: JP29 - * - country ID: 4029 - * - country definition: CTRY_JAPAN30 - * - country string: JP30 - * - country ID: 4030 - * - country definition: CTRY_JAPAN31 - * - country string: JP31 - * - country ID: 4031 - * - country definition: CTRY_JAPAN32 - * - country string: JP32 - * - country ID: 4032 - * - country definition: CTRY_JAPAN33 - * - country string: JP33 - * - country ID: 4033 - * - country definition: CTRY_JAPAN34 - * - country string: JP34 - * - country ID: 4034 - * - country definition: CTRY_JAPAN35 - * - country string: JP35 - * - country ID: 4035 - * - country definition: CTRY_JAPAN36 - * - country string: JP36 - * - country ID: 4036 - * - country definition: CTRY_JAPAN37 - * - country string: JP37 - * - country ID: 4037 - * - country definition: CTRY_JAPAN38 - * - country string: JP38 - * - country ID: 4038 - * - country definition: CTRY_JAPAN39 - * - country string: JP39 - * - country ID: 4039 - * - country definition: CTRY_JAPAN40 - * - country string: JP40 - * - country ID: 4040 - * - country definition: CTRY_JAPAN41 - * - country string: JP41 - * - country ID: 4041 - * - country definition: CTRY_JAPAN42 - * - country string: JP42 - * - country ID: 4042 - * - country definition: CTRY_JAPAN43 - * - country string: JP43 - * - country ID: 4043 - * - country definition: CTRY_JAPAN44 - * - country string: JP44 - * - country ID: 4044 - * - country definition: CTRY_JAPAN45 - * - country string: JP45 - * - country ID: 4045 - * - country definition: CTRY_JAPAN46 - * - country string: JP46 - * - country ID: 4046 - * - country definition: CTRY_JAPAN47 - * - country string: JP47 - * - country ID: 4047 - * - country definition: CTRY_JAPAN48 - * - country string: JP48 - * - country ID: 4048 - * - country definition: CTRY_JAPAN49 - * - country string: JP49 - * - country ID: 4049 - * - country definition: CTRY_JAPAN50 - * - country string: JP50 - * - country ID: 4050 - * - country definition: CTRY_JAPAN51 - * - country string: JP51 - * - country ID: 4051 - * - country definition: CTRY_JAPAN52 - * - country string: JP52 - * - country ID: 4052 - * - country definition: CTRY_JAPAN53 - * - country string: JP53 - * - country ID: 4053 - * - country definition: CTRY_JAPAN54 - * - country string: JP54 - * - country ID: 4054 - * - country definition: CTRY_JAPAN55 - * - country string: JP55 - * - country ID: 4055 - * - country definition: CTRY_JAPAN56 - * - country string: JP56 - * - country ID: 4056 - * - country definition: CTRY_JORDAN - * - country string: JO - * - country ID: 400 - * - country definition: CTRY_KAZAKHSTAN - * - country string: KZ - * - country ID: 398 - * - country definition: CTRY_KENYA - * - country string: KE - * - country ID: 404 - * - country definition: CTRY_KOREA_NORTH - * - country string: KP - * - country ID: 408 - * - country definition: CTRY_KOREA_ROC - * - country string: KR - * - country ID: 410 - * - country definition: CTRY_KOREA_ROC2 - * - country string: KR2 - * - country ID: 411 - * - country definition: CTRY_KOREA_ROC3 - * - country string: KR3 - * - country ID: 412 - * - country definition: CTRY_KUWAIT - * - country string: KW - * - country ID: 414 - * - country definition: CTRY_LATVIA - * - country string: LV - * - country ID: 428 - * - country definition: CTRY_LEBANON - * - country string: LB - * - country ID: 422 - * - country definition: CTRY_LIBYA - * - country string: LY - * - country ID: 434 - * - country definition: CTRY_LIECHTENSTEIN - * - country string: LI - * - country ID: 438 - * - country definition: CTRY_LITHUANIA - * - country string: LT - * - country ID: 440 - * - country definition: CTRY_LUXEMBOURG - * - country string: LU - * - country ID: 442 - * - country definition: CTRY_MACAU - * - country string: MO - * - country ID: 446 - * - country definition: CTRY_MACEDONIA - * - country string: MK - * - country ID: 807 - * - country definition: CTRY_MALAYSIA - * - country string: MY - * - country ID: 458 - * - country definition: CTRY_MALTA - * - country string: MT - * - country ID: 470 - * - country definition: CTRY_MAURITIUS - * - country string: MU - * - country ID: 480 - * - country definition: CTRY_MEXICO - * - country string: MX - * - country ID: 484 - * - country definition: CTRY_MONACO - * - country string: MC - * - country ID: 492 - * - country definition: CTRY_MOROCCO - * - country string: MA - * - country ID: 504 - * - country definition: CTRY_NETHERLANDS - * - country string: NL - * - country ID: 528 - * - country definition: CTRY_NEW_ZEALAND - * - country string: NZ - * - country ID: 554 - * - country definition: CTRY_NICARAGUA - * - country string: NI - * - country ID: 558 - * - country definition: CTRY_NORWAY - * - country string: NO - * - country ID: 578 - * - country definition: CTRY_OMAN - * - country string: OM - * - country ID: 512 - * - country definition: CTRY_PAKISTAN - * - country string: PK - * - country ID: 586 - * - country definition: CTRY_PANAMA - * - country string: PA - * - country ID: 591 - * - country definition: CTRY_PARAGUAY - * - country string: PY - * - country ID: 600 - * - country definition: CTRY_PERU - * - country string: PE - * - country ID: 604 - * - country definition: CTRY_PHILIPPINES - * - country string: PH - * - country ID: 608 - * - country definition: CTRY_POLAND - * - country string: PL - * - country ID: 616 - * - country definition: CTRY_PORTUGAL - * - country string: PT - * - country ID: 620 - * - country definition: CTRY_PUERTO_RICO - * - country string: PR - * - country ID: 630 - * - country definition: CTRY_QATAR - * - country string: QA - * - country ID: 634 - * - country definition: CTRY_ROMANIA - * - country string: RO - * - country ID: 642 - * - country definition: CTRY_RUSSIA - * - country string: RU - * - country ID: 643 - * - country definition: CTRY_SAUDI_ARABIA - * - country string: SA - * - country ID: 682 - * - country definition: CTRY_SERBIA - * - country string: RS - * - country ID: 688 - * - country definition: CTRY_MONTENEGRO - * - country string: ME - * - country ID: 499 - * - country definition: CTRY_SINGAPORE - * - country string: SG - * - country ID: 702 - * - country definition: CTRY_SLOVAKIA - * - country string: SK - * - country ID: 703 - * - country definition: CTRY_SLOVENIA - * - country string: SI - * - country ID: 705 - * - country definition: CTRY_SOUTH_AFRICA - * - country string: ZA - * - country ID: 710 - * - country definition: CTRY_SPAIN - * - country string: ES - * - country ID: 724 - * - country definition: CTRY_SRI_LANKA - * - country string: LK - * - country ID: 144 - * - country definition: CTRY_SWEDEN - * - country string: SE - * - country ID: 752 - * - country definition: CTRY_SWITZERLAND - * - country string: CH - * - country ID: 756 - * - country definition: CTRY_SYRIA - * - country string: SY - * - country ID: 760 - * - country definition: CTRY_TAIWAN - * - country string: TW - * - country ID: 158 - * - country definition: CTRY_TANZANIA - * - country string: TZ - * - country ID: 834 - * - country definition: CTRY_THAILAND - * - country string: TH - * - country ID: 764 - * - country definition: CTRY_TRINIDAD_Y_TOBAGO - * - country string: TT - * - country ID: 780 - * - country definition: CTRY_TUNISIA - * - country string: TN - * - country ID: 788 - * - country definition: CTRY_TURKEY - * - country string: TR - * - country ID: 792 - * - country definition: CTRY_UAE - * - country string: AE - * - country ID: 784 - * - country definition: CTRY_UKRAINE - * - country string: UA - * - country ID: 804 - * - country definition: CTRY_UNITED_KINGDOM - * - country string: GB - * - country ID: 826 - * - country definition: CTRY_UNITED_STATES - * - country string: US - * - country ID: 840 - * - country definition: CTRY_UNITED_STATES_FCC49 - * - country string: US - * - country ID: 842 - * - country definition: CTRY_URUGUAY - * - country string: UY - * - country ID: 858 - * - country definition: CTRY_UZBEKISTAN - * - country string: UZ - * - country ID: 860 - * - country definition: CTRY_VENEZUELA - * - country string: VE - * - country ID: 862 - * - country definition: CTRY_VIET_NAM - * - country string: VN - * - country ID: 704 - * - country definition: CTRY_YEMEN - * - country string: YE - * - country ID: 887 - * - country definition: CTRY_ZIMBABWE - * - country string: ZW - * - country ID: 716 - */ enum CountryCode { - CTRY_ALBANIA = 8, /* Albania */ - CTRY_ALGERIA = 12, /* Algeria */ - CTRY_ARGENTINA = 32, /* Argentina */ - CTRY_ARMENIA = 51, /* Armenia */ - CTRY_AUSTRALIA = 36, /* Australia */ - CTRY_AUSTRIA = 40, /* Austria */ - CTRY_AZERBAIJAN = 31, /* Azerbaijan */ - CTRY_BAHAMAS = 44, /* Bahamas */ - CTRY_BAHRAIN = 48, /* Bahrain */ - CTRY_BANGLADESH = 50, /* Bangladesh */ - CTRY_BARBADOS = 52, /* Barbados */ - CTRY_BELARUS = 112, /* Belarus */ - CTRY_BELGIUM = 56, /* Belgium */ - CTRY_BELIZE = 84, /* Belize */ - CTRY_BERMUDA = 60, /* Berumuda */ - CTRY_BOLIVIA = 68, /* Bolivia */ - CTRY_BOSNIA_HERZ = 70, /* Bosnia and Herzegowina */ - CTRY_BRAZIL = 76, /* Brazil */ - CTRY_BRUNEI_DARUSSALAM = 96, /* Brunei Darussalam */ - CTRY_BULGARIA = 100, /* Bulgaria */ - CTRY_CAMBODIA = 116, /* Cambodia */ - CTRY_CANADA = 124, /* Canada */ - CTRY_CHILE = 152, /* Chile */ - CTRY_CHINA = 156, /* People's Republic of China */ - CTRY_COLOMBIA = 170, /* Colombia */ - CTRY_COSTA_RICA = 188, /* Costa Rica */ - CTRY_CROATIA = 191, /* Croatia */ + CTRY_AFGHANISTAN = 4, + CTRY_ALBANIA = 8, + CTRY_ALGERIA = 12, + CTRY_AMERICAN_SAMOA = 16, + CTRY_ANGUILLA = 660, + CTRY_ARGENTINA = 32, + CTRY_ARGENTINA_AP = 5003, + CTRY_ARMENIA = 51, + CTRY_ARUBA = 533, + CTRY_AUSTRALIA = 36, + CTRY_AUSTRALIA_AP = 5000, + CTRY_AUSTRIA = 40, + CTRY_AZERBAIJAN = 31, + CTRY_BAHAMAS = 44, + CTRY_BAHRAIN = 48, + CTRY_BANGLADESH = 50, + CTRY_BARBADOS = 52, + CTRY_BELARUS = 112, + CTRY_BELGIUM = 56, + CTRY_BELIZE = 84, + CTRY_BERMUDA = 60, + CTRY_BHUTAN = 64, + CTRY_BOLIVIA = 68, + CTRY_BOSNIA_HERZ = 70, + CTRY_BRAZIL = 76, + CTRY_BRUNEI_DARUSSALAM = 96, + CTRY_BULGARIA = 100, + CTRY_BURKINA_FASO = 854, + CTRY_CAMBODIA = 116, + CTRY_CANADA = 124, + CTRY_CANADA_AP = 5001, + CTRY_CAYMAN_ISLANDS = 136, + CTRY_CENTRAL_AFRICA_REPUBLIC = 140, + CTRY_CHAD = 148, + CTRY_CHILE = 152, + CTRY_CHINA = 156, + CTRY_CHRISTMAS_ISLAND = 162, + CTRY_COLOMBIA = 170, + CTRY_COSTA_RICA = 188, + CTRY_COTE_DIVOIRE = 384, + CTRY_CROATIA = 191, CTRY_CYPRUS = 196, - CTRY_CZECH = 203, /* Czech Republic */ - CTRY_DENMARK = 208, /* Denmark */ - CTRY_DOMINICAN_REPUBLIC = 214, /* Dominican Republic */ - CTRY_ECUADOR = 218, /* Ecuador */ - CTRY_EGYPT = 818, /* Egypt */ - CTRY_EL_SALVADOR = 222, /* El Salvador */ - CTRY_ESTONIA = 233, /* Estonia */ - CTRY_FAEROE_ISLANDS = 234, /* Faeroe Islands */ - CTRY_FINLAND = 246, /* Finland */ - CTRY_FRANCE = 250, /* France */ - CTRY_GEORGIA = 268, /* Georgia */ - CTRY_GERMANY = 276, /* Germany */ - CTRY_GREECE = 300, /* Greece */ - CTRY_GREENLAND = 304, /* Greenland */ - CTRY_GRENADA = 308, /* Grenada */ - CTRY_GUAM = 316, /* Guam */ - CTRY_GUATEMALA = 320, /* Guatemala */ - CTRY_HAITI = 332, /* Haiti */ - CTRY_HONDURAS = 340, /* Honduras */ - CTRY_HONG_KONG = 344, /* Hong Kong S.A.R., P.R.C. */ - CTRY_HUNGARY = 348, /* Hungary */ - CTRY_ICELAND = 352, /* Iceland */ - CTRY_INDIA = 356, /* India */ - CTRY_INDONESIA = 360, /* Indonesia */ - CTRY_IRAN = 364, /* Iran */ - CTRY_IRAQ = 368, /* Iraq */ - CTRY_IRELAND = 372, /* Ireland */ - CTRY_ISRAEL = 376, /* Israel */ - CTRY_ITALY = 380, /* Italy */ - CTRY_JAMAICA = 388, /* Jamaica */ - CTRY_JAPAN = 392, /* Japan */ - CTRY_JORDAN = 400, /* Jordan */ - CTRY_KAZAKHSTAN = 398, /* Kazakhstan */ - CTRY_KENYA = 404, /* Kenya */ - CTRY_KOREA_NORTH = 408, /* North Korea */ - CTRY_KOREA_ROC = 410, /* South Korea */ - CTRY_KOREA_ROC3 = 412, /* South Korea */ - CTRY_KUWAIT = 414, /* Kuwait */ - CTRY_LATVIA = 428, /* Latvia */ - CTRY_LEBANON = 422, /* Lebanon */ - CTRY_LIBYA = 434, /* Libya */ - CTRY_LIECHTENSTEIN = 438, /* Liechtenstein */ - CTRY_LITHUANIA = 440, /* Lithuania */ - CTRY_LUXEMBOURG = 442, /* Luxembourg */ - CTRY_MACAU = 446, /* Macau SAR */ - CTRY_MACEDONIA = 807, /* the Former Yugoslav Republic of Macedonia */ - CTRY_MALAYSIA = 458, /* Malaysia */ - CTRY_MALDIVES = 462, /* Maldives */ - CTRY_MALTA = 470, /* Malta */ - CTRY_MAURITIUS = 480, /* Mauritius */ - CTRY_MEXICO = 484, /* Mexico */ - CTRY_MONACO = 492, /* Principality of Monaco */ - CTRY_MOROCCO = 504, /* Morocco */ - CTRY_NEPAL = 524, /* Nepal */ - CTRY_NETHERLANDS = 528, /* Netherlands */ - CTRY_NETHERLANDS_ANTILLES = 530, /* Netherlands-Antilles */ - CTRY_ARUBA = 533, /* Aruba */ - CTRY_NEW_ZEALAND = 554, /* New Zealand */ - CTRY_NICARAGUA = 558, /* Nicaragua */ - CTRY_NORWAY = 578, /* Norway */ - CTRY_OMAN = 512, /* Oman */ - CTRY_PAKISTAN = 586, /* Islamic Republic of Pakistan */ - CTRY_PANAMA = 591, /* Panama */ - CTRY_PAPUA_NEW_GUINEA = 598, /* Papua New Guinea */ - CTRY_PARAGUAY = 600, /* Paraguay */ - CTRY_PERU = 604, /* Peru */ - CTRY_PHILIPPINES = 608, /* Republic of the Philippines */ - CTRY_POLAND = 616, /* Poland */ - CTRY_PORTUGAL = 620, /* Portugal */ - CTRY_PUERTO_RICO = 630, /* Puerto Rico */ - CTRY_QATAR = 634, /* Qatar */ - CTRY_ROMANIA = 642, /* Romania */ - CTRY_RUSSIA = 643, /* Russia */ - CTRY_RWANDA = 646, /* Rwanda */ - CTRY_SAUDI_ARABIA = 682, /* Saudi Arabia */ - CTRY_SERBIA = 688, /* Republic of Serbia */ - CTRY_MONTENEGRO = 499, /* Montenegro */ - CTRY_SINGAPORE = 702, /* Singapore */ - CTRY_SLOVAKIA = 703, /* Slovak Republic */ - CTRY_SLOVENIA = 705, /* Slovenia */ - CTRY_SOUTH_AFRICA = 710, /* South Africa */ - CTRY_SPAIN = 724, /* Spain */ - CTRY_SRI_LANKA = 144, /* Sri Lanka */ - CTRY_SWEDEN = 752, /* Sweden */ - CTRY_SWITZERLAND = 756, /* Switzerland */ - CTRY_SYRIA = 760, /* Syria */ - CTRY_TAIWAN = 158, /* Taiwan */ - CTRY_TANZANIA = 834, /* Tanzania */ - CTRY_THAILAND = 764, /* Thailand */ - CTRY_TRINIDAD_Y_TOBAGO = 780, /* Trinidad y Tobago */ - CTRY_TUNISIA = 788, /* Tunisia */ - CTRY_TURKEY = 792, /* Turkey */ - CTRY_UAE = 784, /* U.A.E. */ - CTRY_UGANDA = 800, /* Uganda */ - CTRY_UKRAINE = 804, /* Ukraine */ - CTRY_UNITED_KINGDOM = 826, /* United Kingdom */ - CTRY_UNITED_STATES = 840, /* United States */ - CTRY_UNITED_STATES2 = 841, /* United States for AP */ - CTRY_UNITED_STATES_FCC49 = 842, /* United States (Public Safety) */ - CTRY_URUGUAY = 858, /* Uruguay */ - CTRY_UZBEKISTAN = 860, /* Uzbekistan */ - CTRY_VENEZUELA = 862, /* Venezuela */ - CTRY_VIET_NAM = 704, /* Viet Nam */ - CTRY_YEMEN = 887, /* Yemen */ - CTRY_ZIMBABWE = 716, /* Zimbabwe */ - - /* - ** Japan special codes. Boy, do they have a lot - */ - - CTRY_JAPAN1 = 393, /* Japan (JP1) */ - CTRY_JAPAN2 = 394, /* Japan (JP0) */ - CTRY_JAPAN3 = 395, /* Japan (JP1-1) */ - CTRY_JAPAN4 = 396, /* Japan (JE1) */ - CTRY_JAPAN5 = 397, /* Japan (JE2) */ - CTRY_JAPAN6 = 4006, /* Japan (JP6) */ - CTRY_JAPAN7 = 4007, /* Japan (J7) */ - CTRY_JAPAN8 = 4008, /* Japan (J8) */ - CTRY_JAPAN9 = 4009, /* Japan (J9) */ - CTRY_JAPAN10 = 4010, /* Japan (J10) */ - CTRY_JAPAN11 = 4011, /* Japan (J11) */ - CTRY_JAPAN12 = 4012, /* Japan (J12) */ - CTRY_JAPAN13 = 4013, /* Japan (J13) */ - CTRY_JAPAN14 = 4014, /* Japan (J14) */ - CTRY_JAPAN15 = 4015, /* Japan (J15) */ - CTRY_JAPAN16 = 4016, /* Japan (J16) */ - CTRY_JAPAN17 = 4017, /* Japan (J17) */ - CTRY_JAPAN18 = 4018, /* Japan (J18) */ - CTRY_JAPAN19 = 4019, /* Japan (J19) */ - CTRY_JAPAN20 = 4020, /* Japan (J20) */ - CTRY_JAPAN21 = 4021, /* Japan (J21) */ - CTRY_JAPAN22 = 4022, /* Japan (J22) */ - CTRY_JAPAN23 = 4023, /* Japan (J23) */ - CTRY_JAPAN24 = 4024, /* Japan (J24) */ - CTRY_JAPAN25 = 4025, /* Japan (J25) */ - CTRY_JAPAN26 = 4026, /* Japan (J26) */ - CTRY_JAPAN27 = 4027, /* Japan (J27) */ - CTRY_JAPAN28 = 4028, /* Japan (J28) */ - CTRY_JAPAN29 = 4029, /* Japan (J29) */ - CTRY_JAPAN30 = 4030, /* Japan (J30) */ - CTRY_JAPAN31 = 4031, /* Japan (J31) */ - CTRY_JAPAN32 = 4032, /* Japan (J32) */ - CTRY_JAPAN33 = 4033, /* Japan (J33) */ - CTRY_JAPAN34 = 4034, /* Japan (J34) */ - CTRY_JAPAN35 = 4035, /* Japan (J35) */ - CTRY_JAPAN36 = 4036, /* Japan (J36) */ - CTRY_JAPAN37 = 4037, /* Japan (J37) */ - CTRY_JAPAN38 = 4038, /* Japan (J38) */ - CTRY_JAPAN39 = 4039, /* Japan (J39) */ - CTRY_JAPAN40 = 4040, /* Japan (J40) */ - CTRY_JAPAN41 = 4041, /* Japan (J41) */ - CTRY_JAPAN42 = 4042, /* Japan (J42) */ - CTRY_JAPAN43 = 4043, /* Japan (J43) */ - CTRY_JAPAN44 = 4044, /* Japan (J44) */ - CTRY_JAPAN45 = 4045, /* Japan (J45) */ - CTRY_JAPAN46 = 4046, /* Japan (J46) */ - CTRY_JAPAN47 = 4047, /* Japan (J47) */ - CTRY_JAPAN48 = 4048, /* Japan (J48) */ - CTRY_JAPAN49 = 4049, /* Japan (J49) */ - CTRY_JAPAN50 = 4050, /* Japan (J50) */ - CTRY_JAPAN51 = 4051, /* Japan (J51) */ - CTRY_JAPAN52 = 4052, /* Japan (J52) */ - CTRY_JAPAN53 = 4053, /* Japan (J53) */ - CTRY_JAPAN54 = 4054, /* Japan (J54) */ - CTRY_JAPAN55 = 4055, /* Japan (J55) */ - CTRY_JAPAN56 = 4056, /* Japan (J56) */ - CTRY_JAPAN57 = 4057, /* Japan (J57) */ - CTRY_JAPAN58 = 4058, /* Japan (J58) */ - CTRY_JAPAN59 = 4059, /* Japan (J59) */ - - /* - ** "Special" codes for multiply defined countries, with the exception - ** of Japan and US. - */ + CTRY_CZECH = 203, + CTRY_DENMARK = 208, + CTRY_DOMINICA = 212, + CTRY_DOMINICAN_REPUBLIC = 214, + CTRY_ECUADOR = 218, + CTRY_EGYPT = 818, + CTRY_EL_SALVADOR = 222, + CTRY_ESTONIA = 233, + CTRY_ETHIOPIA = 231, + CTRY_FINLAND = 246, + CTRY_FRANCE = 250, + CTRY_FRENCH_GUIANA = 254, + CTRY_FRENCH_POLYNESIA = 258, + CTRY_GEORGIA = 268, + CTRY_GERMANY = 276, + CTRY_GHANA = 288, + CTRY_GREECE = 300, + CTRY_GREENLAND = 304, + CTRY_GRENADA = 308, + CTRY_GUADELOUPE = 312, + CTRY_GUAM = 316, + CTRY_GUATEMALA = 320, + CTRY_GUYANA = 328, + CTRY_HAITI = 332, + CTRY_HONDURAS = 340, + CTRY_HONG_KONG = 344, + CTRY_HUNGARY = 348, + CTRY_ICELAND = 352, + CTRY_INDIA = 356, + CTRY_INDONESIA = 360, + CTRY_IRAN = 364, + CTRY_IRELAND = 372, + CTRY_ISRAEL = 376, + CTRY_ITALY = 380, + CTRY_JAMAICA = 388, + CTRY_JORDAN = 400, + CTRY_KAZAKHSTAN = 398, + CTRY_KENYA = 404, + CTRY_KOREA_NORTH = 408, + CTRY_KOREA_ROC = 410, + CTRY_KOREA_ROC_AP = 412, + CTRY_KUWAIT = 414, + CTRY_LATVIA = 428, + CTRY_LEBANON = 422, + CTRY_LESOTHO = 426, + CTRY_LIBYA = 434, + CTRY_LIECHTENSTEIN = 438, + CTRY_LITHUANIA = 440, + CTRY_LUXEMBOURG = 442, + CTRY_MACAU = 446, + CTRY_MACEDONIA = 807, + CTRY_MALAWI = 454, + CTRY_MALAYSIA = 458, + CTRY_MALDIVES = 462, + CTRY_MALTA = 470, + CTRY_MARSHALL_ISLANDS = 584, + CTRY_MARTINIQUE = 474, + CTRY_MAURITANIA = 478, + CTRY_MAURITIUS = 480, + CTRY_MAYOTTE = 175, + CTRY_MEXICO = 484, + CTRY_MICRONESIA = 583, + CTRY_MOLDOVA = 498, + CTRY_MONACO = 492, + CTRY_MONGOLIA = 496, + CTRY_MONTENEGRO = 499, + CTRY_MOROCCO = 504, + CTRY_NEPAL = 524, + CTRY_NETHERLANDS = 528, + CTRY_NETHERLANDS_ANTILLES = 530, + CTRY_NEW_ZEALAND = 554, + CTRY_NIGERIA = 566, + CTRY_NORTHERN_MARIANA_ISLANDS = 580, + CTRY_NICARAGUA = 558, + CTRY_NORWAY = 578, + CTRY_OMAN = 512, + CTRY_PAKISTAN = 586, + CTRY_PALAU = 585, + CTRY_PANAMA = 591, + CTRY_PAPUA_NEW_GUINEA = 598, + CTRY_PARAGUAY = 600, + CTRY_PERU = 604, + CTRY_PHILIPPINES = 608, + CTRY_POLAND = 616, + CTRY_PORTUGAL = 620, + CTRY_PUERTO_RICO = 630, + CTRY_QATAR = 634, + CTRY_REUNION = 638, + CTRY_ROMANIA = 642, + CTRY_RUSSIA = 643, + CTRY_RWANDA = 646, + CTRY_SAINT_BARTHELEMY = 652, + CTRY_SAINT_KITTS_AND_NEVIS = 659, + CTRY_SAINT_LUCIA = 662, + CTRY_SAINT_MARTIN = 663, + CTRY_SAINT_PIERRE_AND_MIQUELON = 666, + CTRY_SAINT_VINCENT_AND_THE_GRENADIENS = 670, + CTRY_SAMOA = 882, + CTRY_SAUDI_ARABIA = 682, + CTRY_SENEGAL = 686, + CTRY_SERBIA = 688, + CTRY_SINGAPORE = 702, + CTRY_SLOVAKIA = 703, + CTRY_SLOVENIA = 705, + CTRY_SOUTH_AFRICA = 710, + CTRY_SPAIN = 724, + CTRY_SURINAME = 740, + CTRY_SRI_LANKA = 144, + CTRY_SWEDEN = 752, + CTRY_SWITZERLAND = 756, + CTRY_SYRIA = 760, + CTRY_TAIWAN = 158, + CTRY_TANZANIA = 834, + CTRY_THAILAND = 764, + CTRY_TOGO = 768, + CTRY_TRINIDAD_Y_TOBAGO = 780, + CTRY_TUNISIA = 788, + CTRY_TURKEY = 792, + CTRY_TURKS_AND_CAICOS = 796, + CTRY_UGANDA = 800, + CTRY_UKRAINE = 804, + CTRY_UAE = 784, + CTRY_UNITED_KINGDOM = 826, + CTRY_UNITED_STATES = 840, + CTRY_UNITED_STATES_AP = 841, + CTRY_UNITED_STATES_AP2 = 843, + CTRY_UNITED_STATES_PS = 842, + CTRY_URUGUAY = 858, + CTRY_UZBEKISTAN = 860, + CTRY_VANUATU = 548, + CTRY_VENEZUELA = 862, + CTRY_VIET_NAM = 704, + CTRY_VIRGIN_ISLANDS = 850, + CTRY_WALLIS_AND_FUTUNA = 876, + CTRY_YEMEN = 887, + CTRY_ZIMBABWE = 716, + CTRY_JAPAN7 = 4007, + CTRY_JAPAN8 = 4008, + CTRY_JAPAN9 = 4009, + CTRY_JAPAN10 = 4010, + CTRY_JAPAN11 = 4011, + CTRY_JAPAN12 = 4012, + CTRY_JAPAN13 = 4013, + CTRY_JAPAN14 = 4014, + CTRY_JAPAN15 = 4015, + CTRY_JAPAN25 = 4025, + CTRY_JAPAN26 = 4026, + CTRY_JAPAN27 = 4027, + CTRY_JAPAN28 = 4028, + CTRY_JAPAN29 = 4029, + CTRY_JAPAN34 = 4034, + CTRY_JAPAN35 = 4035, + CTRY_JAPAN36 = 4036, + CTRY_JAPAN37 = 4037, + CTRY_JAPAN38 = 4038, + CTRY_JAPAN39 = 4039, + CTRY_JAPAN40 = 4040, + CTRY_JAPAN41 = 4041, + CTRY_JAPAN42 = 4042, + CTRY_JAPAN43 = 4043, + CTRY_JAPAN44 = 4044, + CTRY_JAPAN45 = 4045, + CTRY_JAPAN46 = 4046, + CTRY_JAPAN47 = 4047, + CTRY_JAPAN48 = 4048, + CTRY_JAPAN49 = 4049, + CTRY_JAPAN55 = 4055, + CTRY_JAPAN56 = 4056, - CTRY_AUSTRALIA2 = 5000, /* Australia for AP only */ - CTRY_CANADA2 = 5001, /* Canada for AP only */ - CTRY_BELGIUM2 = 5002 /* Belgium/Cisco implementation */ }; diff --git a/core/cds/inc/cds_regdomain_common.h b/core/cds/inc/cds_regdomain_common.h index 36c480b9a309..d52cdf60f9e8 100644 --- a/core/cds/inc/cds_regdomain_common.h +++ b/core/cds/inc/cds_regdomain_common.h @@ -185,6 +185,7 @@ enum EnumRd { MKK5_MKKB = 0x86, /* Japan UNI-1 even + UNI-2 + mid-band + MKKB */ MKK5_MKKA2 = 0x87, /* Japan UNI-1 even + UNI-2 + mid-band + MKKA2 */ MKK5_MKKC = 0x88, /* Japan UNI-1 even + UNI-2 + mid-band + MKKC */ + MKK5_MKKA = 0x99, MKK5_FCCA = 0x9A, MKK6_MKKB = 0x89, /* Japan UNI-1 even + UNI-1 odd MKKB */ @@ -392,33 +393,6 @@ static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { {APL1_ETSIC, APL1, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, {APL2_ETSIC, APL2, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {MKK1_MKKA, MKK1, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA, CTRY_JAPAN}, - {MKK1_MKKB, MKK1, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK1 | PSCAN_MKKA | PSCAN_MKKA_G, - CTRY_JAPAN1}, - {MKK1_FCCA, MKK1, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1, CTRY_JAPAN2}, - {MKK1_MKKA1, MKK1, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN4}, - {MKK1_MKKA2, MKK1, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN5}, - {MKK1_MKKC, MKK1, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1, CTRY_JAPAN6}, - - /* MKK2 */ - {MKK2_MKKA, MKK2, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK2 | PSCAN_MKKA | PSCAN_MKKA_G, - CTRY_JAPAN3}, - - /* MKK3 */ {MKK3_MKKA, MKK3, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKKA, CTRY_JAPAN25}, @@ -473,51 +447,6 @@ static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { PSCAN_MKK3, CTRY_JAPAN15}, {MKK5_FCCA, MKK5, FCCA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN56 }, - /* MKK6 */ - {MKK6_MKKB, MKK6, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA | PSCAN_MKKA_G, CTRY_JAPAN16}, - {MKK6_MKKA1, MKK6, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN30}, - {MKK6_MKKA2, MKK6, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN17}, - {MKK6_MKKC, MKK6, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1, CTRY_JAPAN18}, - {MKK6_FCCA, MKK6, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1, CTRY_JAPAN31}, - - /* MKK7 */ - {MKK7_MKKB, MKK7, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA | PSCAN_MKKA_G, CTRY_JAPAN19}, - {MKK7_MKKA1, MKK7, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN32}, - {MKK7_MKKA2, MKK7, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN20}, - {MKK7_MKKC, MKK7, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN21}, - {MKK7_FCCA, MKK7, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN33}, - - /* MKK8 */ - {MKK8_MKKB, MKK8, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA | PSCAN_MKKA_G, CTRY_JAPAN22}, - {MKK8_MKKA2, MKK8, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN23}, - {MKK8_MKKC, MKK8, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN24}, - {MKK9_MKKA, MKK9, MKKA, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN34}, @@ -566,35 +495,6 @@ static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN48}, - {MKK12_MKKA, MKK12, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN50}, - {MKK12_FCCA, MKK12, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN51}, - {MKK12_MKKA1, MKK12, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN52}, - {MKK12_MKKA2, MKK12, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN54}, - {MKK12_MKKC, MKK12, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3, CTRY_JAPAN53}, - - {MKK13_MKKB, MKK13, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA | PSCAN_MKKA_G, CTRY_JAPAN57}, - - {MKK14_MKKA1, MKK14, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN58}, - {MKK15_MKKA1, MKK15, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK1 | PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN59}, - - /* These are super domains */ {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, @@ -634,8 +534,6 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, YES, 7000}, {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA", YES, YES, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_AUSTRALIA2, FCC6_WORLD, "AU", "AUSTRALIA2", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA", YES, NO, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN", YES, YES, YES, YES, @@ -652,8 +550,6 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, YES, YES, 7000}, {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM", YES, NO, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_BELGIUM2, ETSI4_WORLD, "BE", "BELGIUM2", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE", YES, YES, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA", YES, YES, YES, YES, YES, YES, @@ -672,8 +568,6 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, YES, YES, 7000}, {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA", YES, YES, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_CANADA2, FCC6_FCCA, "CA", "CANADA2", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, {CTRY_CHILE, APL6_WORLD, "CL", "CHILE", YES, YES, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_CHINA, APL1_WORLD, "CN", "CHINA", YES, YES, YES, YES, YES, YES, @@ -742,20 +636,8 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, YES, 7000}, {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA", YES, NO, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_JAPAN, MKK5_MKKA2, "JP", "JAPAN", YES, NO, NO, YES, YES, YES, NO, - NO, 7000}, - {CTRY_JAPAN1, MKK1_MKKB, "JP", "JAPAN1", YES, NO, NO, YES, YES, YES, NO, - NO, 7000}, - {CTRY_JAPAN2, MKK1_FCCA, "JP", "JAPAN2", YES, NO, NO, YES, YES, YES, NO, - NO, 7000}, - {CTRY_JAPAN3, MKK2_MKKA, "JP", "JAPAN3", YES, NO, NO, YES, YES, YES, NO, - NO, 7000}, - {CTRY_JAPAN4, MKK1_MKKA1, "JP", "JAPAN4", YES, NO, NO, YES, YES, YES, - NO, NO, 7000}, - {CTRY_JAPAN5, MKK1_MKKA2, "JP", "JAPAN5", YES, NO, NO, YES, YES, YES, - NO, NO, 7000}, - {CTRY_JAPAN6, MKK1_MKKC, "JP", "JAPAN6", YES, NO, NO, YES, YES, YES, NO, - NO, 7000}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN", YES, NO, NO, YES, YES, + YES, NO, NO, 7000}, {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8", YES, NO, NO, YES, YES, YES, @@ -774,24 +656,6 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, NO, 7000}, {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, - {CTRY_JAPAN16, MKK6_MKKB, "JP", "JAPAN16", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN17, MKK6_MKKA2, "JP", "JAPAN17", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN18, MKK6_MKKC, "JP", "JAPAN18", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN19, MKK7_MKKB, "JP", "JAPAN19", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN20, MKK7_MKKA2, "JP", "JAPAN20", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN21, MKK7_MKKC, "JP", "JAPAN21", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN22, MKK8_MKKB, "JP", "JAPAN22", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN23, MKK8_MKKA2, "JP", "JAPAN23", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN24, MKK8_MKKC, "JP", "JAPAN24", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26", YES, NO, NO, YES, YES, YES, @@ -802,14 +666,6 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, NO, 7000}, {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, - {CTRY_JAPAN30, MKK6_MKKA1, "JP", "JAPAN30", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN31, MKK6_FCCA, "JP", "JAPAN31", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN32, MKK7_MKKA1, "JP", "JAPAN32", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN33, MKK7_FCCA, "JP", "JAPAN33", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35", YES, NO, NO, YES, YES, YES, @@ -842,25 +698,10 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, NO, 7000}, {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49", YES, NO, NO, YES, YES, YES, YES, NO, 7000}, - {CTRY_JAPAN50, MKK12_MKKA, "JP", "JAPAN50", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN51, MKK12_FCCA, "JP", "JAPAN51", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN52, MKK12_MKKA1, "JP", "JAPAN52", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN53, MKK12_MKKC, "JP", "JAPAN53", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN54, MKK12_MKKA2, "JP", "JAPAN54", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, -/* {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55", YES, NO, NO, YES, YES, YES, YES, NO, 7000 },*/ - {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56", YES, NO, NO, + {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55", YES, NO, NO, YES, YES, YES, + YES, NO, 7000 }, + {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56", YES, NO, NO, YES, YES, YES, YES, NO, 7000 }, - {CTRY_JAPAN57, MKK13_MKKB, "JP", "JAPAN57", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN58, MKK14_MKKA1, "JP", "JAPAN58", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN59, MKK15_MKKA1, "JP", "JAPAN59", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN", YES, NO, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN", YES, NO, YES, YES, @@ -871,8 +712,8 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { NO, YES, NO, NO, 7000}, {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC", YES, NO, NO, YES, YES, YES, YES, YES, 7000}, - {CTRY_KOREA_ROC3, APL9_MKKC, "KR", "KOREA REPUBLIC3", YES, NO, NO, YES, - NO, YES, NO, NO, 7000}, + {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3", YES, NO, + NO, YES, NO, YES, NO, NO, 7000}, {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT", YES, NO, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA", YES, NO, YES, YES, YES, YES, @@ -987,9 +828,9 @@ static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { YES, YES, YES, YES, YES, 7000}, {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES", YES, YES, YES, YES, YES, YES, YES, YES, 5825}, - {CTRY_UNITED_STATES2, FCC6_FCCA, "US", "UNITED STATES2", YES, YES, YES, - YES, YES, YES, YES, YES, 7000}, - {CTRY_UNITED_STATES_FCC49, FCC4_FCCA, "PS", + {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2", YES, + YES, YES, YES, YES, YES, YES, YES, 7000}, + {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "UNITED STATES (PUBLIC SAFETY)", YES, YES, YES, YES, YES, YES, YES, YES, 7000}, {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY", YES, NO, YES, YES, YES, YES, diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index b344c275cd9a..1130abda7dfb 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -5206,7 +5206,7 @@ void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, if (status == QDF_STATUS_E_NOMEM) return; - if ((((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_JAPAN) || + if ((((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_JAPAN14) || ((reg_dmn & ~COUNTRY_ERD_FLAG) == CTRY_KOREA_ROC)) && (true == wma->tx_chain_mask_cck)) cck_mask_val = 1; -- cgit v1.2.3 From c1f9c1af050d5699019f5c5b06544bb97ef4b4be Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Tue, 19 Jan 2016 15:23:03 -0800 Subject: qcacld-3.0: Remove sub-ctl codes. Firmware does not require the sub-ctl codes from the host. Therefore, remove the calculation of sub-ctl codes from the host APIs. Also remove the associated data structures. Change-Id: Ib5d5f074b45f2dae2bb9a7c172ee7f8750ad5355 CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 91 +-- core/cds/inc/cds_regdomain_common.h | 1215 ++--------------------------------- core/cds/src/cds_regdomain.c | 156 +---- core/wma/inc/wma.h | 2 - core/wma/src/wma_features.c | 39 -- 5 files changed, 69 insertions(+), 1434 deletions(-) diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 868b8e893494..4a54aaf9ed59 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -92,6 +92,7 @@ enum { #define SUPER_DOMAIN_MASK 0x0fff #define COUNTRY_CODE_MASK 0x3fff #define CF_INTERFERENCE (CHANNEL_CW_INT | CHANNEL_RADAR_INT) +#define NO_CTL 0xff /* * The following describe the bit masks for different passive scan @@ -118,84 +119,6 @@ enum { #define PSCAN_DEFER 0x7FFFFFFFFFFFFFFFULL #define IS_ECM_CHAN 0x8000000000000000ULL -/* define in ah_eeprom.h */ -#define SD_NO_CTL 0xf0 -#define NO_CTL 0xff -#define CTL_MODE_M 0x0f -#define CTL_11A 0 -#define CTL_11B 1 -#define CTL_11G 2 -#define CTL_TURBO 3 -#define CTL_108G 4 -#define CTL_2GHT20 5 -#define CTL_5GHT20 6 -#define CTL_2GHT40 7 -#define CTL_5GHT40 8 -#define CTL_5GVHT80 9 - -#ifndef ATH_NO_5G_SUPPORT -#define REGDMN_MODE_11A_TURBO REGDMN_MODE_108A -#define CHAN_11A_BMZERO BMZERO, -#define CHAN_11A_BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l) \ - BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l), -#else -/* remove 11a channel info if 11a is not supported */ -#define CHAN_11A_BMZERO -#define CHAN_11A_BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l) -#endif -#ifndef ATH_REMOVE_2G_TURBO_RD_TABLE -#define REGDMN_MODE_11G_TURBO REGDMN_MODE_108G -#define CHAN_TURBO_G_BMZERO BMZERO, -#define CHAN_TURBO_G_BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l) \ - BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l), -#else -/* remove turbo-g channel info if turbo-g is not supported */ -#define CHAN_TURBO_G(a, b) -#define CHAN_TURBO_G_BMZERO -#define CHAN_TURBO_G_BM(_a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l) -#endif - -#define BMLEN 2 /* Use 2 64 bit uint for channel bitmask - NB: Must agree with macro below (BM) */ -#define BMZERO {(uint64_t) 0, (uint64_t) 0} /* BMLEN zeros */ - -#ifndef SUPPRESS_SHIFT_WARNING -#define SUPPRESS_SHIFT_WARNING -#endif - -/* Suppress MS warning "C4293: 'operator' : shift count negative or too big, - * undefined behavior" - * This is safe below because the the operand is properly range-checked, but - * the compiler can't reason that out before it spits the warning. - * Using suppress, so the warning can still be enabled globally to catch other - * incorrect uses. - */ -#define BM(_fa, _fb, _fc, _fd, _fe, _ff, _fg, _fh, _fi, _fj, _fk, _fl) \ - SUPPRESS_SHIFT_WARNING \ - {((((_fa >= 0) && (_fa < 64)) ? (((uint64_t) 1) << _fa) : (uint64_t) 0) | \ - (((_fb >= 0) && (_fb < 64)) ? (((uint64_t) 1) << _fb) : (uint64_t) 0) | \ - (((_fc >= 0) && (_fc < 64)) ? (((uint64_t) 1) << _fc) : (uint64_t) 0) | \ - (((_fd >= 0) && (_fd < 64)) ? (((uint64_t) 1) << _fd) : (uint64_t) 0) | \ - (((_fe >= 0) && (_fe < 64)) ? (((uint64_t) 1) << _fe) : (uint64_t) 0) | \ - (((_ff >= 0) && (_ff < 64)) ? (((uint64_t) 1) << _ff) : (uint64_t) 0) | \ - (((_fg >= 0) && (_fg < 64)) ? (((uint64_t) 1) << _fg) : (uint64_t) 0) | \ - (((_fh >= 0) && (_fh < 64)) ? (((uint64_t) 1) << _fh) : (uint64_t) 0) | \ - (((_fi >= 0) && (_fi < 64)) ? (((uint64_t) 1) << _fi) : (uint64_t) 0) | \ - (((_fj >= 0) && (_fj < 64)) ? (((uint64_t) 1) << _fj) : (uint64_t) 0) | \ - (((_fk >= 0) && (_fk < 64)) ? (((uint64_t) 1) << _fk) : (uint64_t) 0) | \ - (((_fl >= 0) && (_fl < 64)) ? (((uint64_t) 1) << _fl) : (uint64_t) 0) ) \ - ,(((((_fa > 63) && (_fa < 128)) ? (((uint64_t) 1) << (_fa - 64)) : (uint64_t) 0) | \ - (((_fb > 63) && (_fb < 128)) ? (((uint64_t) 1) << (_fb - 64)) : (uint64_t) 0) | \ - (((_fc > 63) && (_fc < 128)) ? (((uint64_t) 1) << (_fc - 64)) : (uint64_t) 0) | \ - (((_fd > 63) && (_fd < 128)) ? (((uint64_t) 1) << (_fd - 64)) : (uint64_t) 0) | \ - (((_fe > 63) && (_fe < 128)) ? (((uint64_t) 1) << (_fe - 64)) : (uint64_t) 0) | \ - (((_ff > 63) && (_ff < 128)) ? (((uint64_t) 1) << (_ff - 64)) : (uint64_t) 0) | \ - (((_fg > 63) && (_fg < 128)) ? (((uint64_t) 1) << (_fg - 64)) : (uint64_t) 0) | \ - (((_fh > 63) && (_fh < 128)) ? (((uint64_t) 1) << (_fh - 64)) : (uint64_t) 0) | \ - (((_fi > 63) && (_fi < 128)) ? (((uint64_t) 1) << (_fi - 64)) : (uint64_t) 0) | \ - (((_fj > 63) && (_fj < 128)) ? (((uint64_t) 1) << (_fj - 64)) : (uint64_t) 0) | \ - (((_fk > 63) && (_fk < 128)) ? (((uint64_t) 1) << (_fk - 64)) : (uint64_t) 0) | \ - (((_fl > 63) && (_fl < 128)) ? (((uint64_t) 1) << (_fl - 64)) : (uint64_t) 0)))} /* * THE following table is the mapping of regdomain pairs specified by @@ -255,15 +178,6 @@ typedef struct reg_domain { uint8_t conformance_test_limit; uint64_t dfsMask; /* DFS bitmask for 5Ghz tables */ uint64_t pscan; /* Bitmask for passive scan */ - uint32_t flags; /* Requirement flags (AdHoc disallow, noise - floor cal needed, etc) */ - uint64_t chan11a[BMLEN]; /* 128 bit bitmask for channel/band selection */ - uint64_t chan11a_turbo[BMLEN]; /* 128 bit bitmask for channel/band select */ - uint64_t chan11a_dyn_turbo[BMLEN]; /* 128 bit mask for chan/band select */ - - uint64_t chan11b[BMLEN]; /* 128 bit bitmask for channel/band selection */ - uint64_t chan11g[BMLEN]; /* 128 bit bitmask for channel/band selection */ - uint64_t chan11g_turbo[BMLEN]; } REG_DOMAIN; struct cmode { @@ -566,8 +480,7 @@ struct ch_params_s { int32_t cds_fill_some_regulatory_info(struct regulatory *reg); void cds_fill_and_send_ctl_to_fw(struct regulatory *reg); int32_t cds_get_country_from_alpha2(uint8_t *alpha2); -void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, - uint32_t modeSelect); +void cds_fill_send_ctl_info_to_fw(struct regulatory *reg); void cds_set_wma_dfs_region(uint8_t dfs_region); void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, struct ch_params_s *ch_params); diff --git a/core/cds/inc/cds_regdomain_common.h b/core/cds/inc/cds_regdomain_common.h index d52cdf60f9e8..ed762a0296ad 100644 --- a/core/cds/inc/cds_regdomain_common.h +++ b/core/cds/inc/cds_regdomain_common.h @@ -862,377 +862,12 @@ enum { * comments */ -/* - * 5GHz 11A channel tags - */ -enum { - F1_4912_4947, - F1_4915_4925, - F2_4915_4925, - F1_4935_4945, - F2_4935_4945, - F1_4920_4980, - F2_4920_4980, - F1_4942_4987, - F1_4945_4985, - F1_4950_4980, - F1_5032_5057, - F1_5035_5040, - F2_5035_5040, - F1_5035_5045, - F1_5040_5040, - F1_5040_5080, - F2_5040_5080, - F1_5055_5055, - F2_5055_5055, - - F1_5120_5240, - - F1_5170_5230, - F2_5170_5230, - - F1_5180_5240, - F2_5180_5240, - F3_5180_5240, - F4_5180_5240, - F5_5180_5240, - F6_5180_5240, - F7_5180_5240, - F8_5180_5240, - F9_5180_5240, - F10_5180_5240, - - F1_5240_5280, - - F1_5260_5280, - - F1_5260_5320, - F2_5260_5320, - F3_5260_5320, - F4_5260_5320, - F5_5260_5320, - F6_5260_5320, - F7_5260_5320, - - F1_5260_5700, - - F1_5280_5320, - F2_5280_5320, - F1_5500_5560, - - F1_5500_5580, - F2_5500_5580, - - F1_5500_5620, - - F1_5500_5660, - - F1_5500_5720, - F2_5500_5700, - F3_5500_5700, - F4_5500_5700, - F5_5500_5700, - F6_5500_5700, - - F1_5660_5700, - F2_5660_5720, - F3_5660_5720, - - F1_5745_5765, - - F1_5745_5805, - F2_5745_5805, - F3_5745_5805, - F4_5745_5805, - - F1_5745_5825, - F2_5745_5825, - F3_5745_5825, - F4_5745_5825, - F5_5745_5825, - F6_5745_5825, - F7_5745_5825, - F8_5745_5825, - F9_5745_5825, - - F1_5845_5865, - - W1_4920_4980, - W1_5040_5080, - W1_5170_5230, - W1_5180_5240, - W1_5260_5320, - W1_5745_5825, - W1_5500_5700, - A_DEMO_ALL_CHANNELS -}; - -static const REG_DMN_FREQ_BAND reg_dmn5_ghz_freq[] = { - {4915, 4925, 20, 0, 10, 5, NO_DFS, PSCAN_MKK2, 16}, /* F1_4915_4925 */ - {4915, 4925, 23, 0, 10, 5, NO_DFS, PSCAN_MKK2, 16}, /* F2_4915_4925 */ - {4935, 4945, 20, 0, 10, 5, NO_DFS, PSCAN_MKK2, 16}, /* F1_4935_4945 */ - {4935, 4945, 23, 0, 10, 5, NO_DFS, PSCAN_MKK2, 16}, /* F2_4935_4945 */ - {4920, 4980, 23, 0, 20, 20, NO_DFS, PSCAN_MKK2, 7}, /* F1_4920_4980 */ - {4920, 4980, 20, 0, 20, 20, NO_DFS, PSCAN_MKK2, 7}, /* F2_4920_4980 */ - {4942, 4987, 27, 6, 5, 5, NO_DFS, PSCAN_FCC, 0}, /* F1_4942_4987 */ - {4945, 4985, 30, 6, 10, 5, NO_DFS, PSCAN_FCC, 0}, /* F1_4945_4985 */ - {4950, 4980, 33, 6, 20, 5, NO_DFS, PSCAN_FCC, 0}, /* F1_4950_4980 */ - {5035, 5040, 23, 0, 10, 5, NO_DFS, PSCAN_MKK2, 12}, /* F1_5035_5040 */ - {5035, 5040, 23, 0, 10, 5, NO_DFS, PSCAN_MKK2, 12}, /* F2_5035_5040 */ - {5040, 5040, 20, 0, 10, 5, NO_DFS, PSCAN_MKK2, 12}, /* F1_5040_5040 */ - {5040, 5080, 23, 0, 20, 20, NO_DFS, PSCAN_MKK2, 2}, /* F1_5040_5080 */ - {5040, 5080, 20, 0, 20, 20, NO_DFS, NO_PSCAN, 6}, /* F2_5040_5080 */ - {5055, 5055, 20, 0, 10, 5, NO_DFS, PSCAN_MKK2, 12}, /* F1_5055_5055 */ - {5055, 5055, 23, 0, 10, 5, NO_DFS, PSCAN_MKK2, 12}, /* F2_5055_5055 */ - - {5120, 5240, 5, 6, 20, 20, NO_DFS, NO_PSCAN, 0}, /* F1_5120_5240 */ - - {5170, 5230, 23, 0, 20, 20, NO_DFS, PSCAN_MKK1 | PSCAN_MKK2, 1}, /* F1_5170_5230 */ - {5170, 5230, 20, 0, 20, 20, NO_DFS, PSCAN_MKK1 | PSCAN_MKK2, 1}, /* F2_5170_5230 */ - - {5180, 5240, 15, 0, 20, 20, NO_DFS, PSCAN_FCC | PSCAN_ETSI, 1}, /* F1_5180_5240 */ - {5180, 5240, 17, 6, 20, 20, NO_DFS, NO_PSCAN, 1}, /* F2_5180_5240 */ - {5180, 5240, 18, 0, 20, 20, NO_DFS, PSCAN_FCC | PSCAN_ETSI, 1}, /* F3_5180_5240 */ - {5180, 5240, 20, 0, 20, 20, NO_DFS, PSCAN_FCC | PSCAN_ETSI, 1}, /* F4_5180_5240 */ - {5180, 5240, 23, 0, 20, 20, NO_DFS, PSCAN_FCC | PSCAN_ETSI, 1}, /* F5_5180_5240 */ - {5180, 5240, 23, 6, 20, 20, NO_DFS, PSCAN_FCC, 1}, /* F6_5180_5240 */ - {5180, 5240, 20, 0, 20, 20, NO_DFS, PSCAN_MKK1 | PSCAN_MKK3, 0}, /* F7_5180_5240 */ - {5180, 5240, 23, 6, 20, 20, NO_DFS, NO_PSCAN, 1}, /* F8_5180_5240 */ - {5180, 5240, 20, 6, 20, 20, NO_DFS, PSCAN_ETSI, 0}, /* F9_5180_5240 */ - {5180, 5240, 23, 0, 20, 20, NO_DFS, PSCAN_FCC | PSCAN_ETSI, 1}, /* F10_5180_5240 */ - - {5240, 5280, 23, 0, 20, 20, DFS_FCC3, PSCAN_FCC | PSCAN_ETSI, 0}, /* F1_5240_5280 */ - - {5260, 5280, 23, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 2}, /* F1_5260_5280 */ - - {5260, 5320, 18, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 2}, /* F1_5260_5320 */ - - {5260, 5320, 20, 0, 20, 20, DFS_FCC3 | DFS_ETSI | DFS_MKK4, - PSCAN_FCC | PSCAN_ETSI | PSCAN_MKK3, 0}, - /* F2_5260_5320 */ - - {5260, 5320, 24, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 2}, /* F3_5260_5320 */ - {5260, 5320, 23, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC, 2}, /* F4_5260_5320 */ - {5260, 5320, 23, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC, 2}, /* F5_5260_5320 */ - {5260, 5320, 30, 0, 20, 20, NO_DFS, NO_PSCAN, 2}, /* F6_5260_5320 */ - {5260, 5320, 23, 0, 20, 20, DFS_FCC3 | DFS_ETSI | DFS_MKK4, - PSCAN_FCC | PSCAN_ETSI | PSCAN_MKK3, 0}, - /* F7_5260_5320 */ - - {5260, 5700, 5, 6, 20, 20, DFS_FCC3 | DFS_ETSI, NO_PSCAN, 0}, /* F1_5260_5700 */ - - {5280, 5320, 17, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC, 2}, /* F1_5280_5320 */ - - {5500, 5580, 23, 6, 20, 20, DFS_FCC3, PSCAN_FCC, 4}, /* F1_5500_5580 */ - {5500, 5580, 30, 6, 20, 20, DFS_FCC3, PSCAN_FCC, 4}, /* F2_5500_5580 */ - - {5500, 5620, 30, 6, 20, 20, DFS_ETSI, PSCAN_ETSI, 3}, /* F1_5500_5620 */ - - {5500, 5660, 20, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 0}, /* F1_5500_5660 */ - - {5500, 5720, 24, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC, 4}, /* F1_5500_5720 */ - {5500, 5700, 27, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 3}, /* F2_5500_5700 */ - {5500, 5700, 30, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 3}, /* F3_5500_5700 */ - {5500, 5700, 23, 0, 20, 20, DFS_FCC3 | DFS_ETSI | DFS_MKK4, PSCAN_MKK3 | PSCAN_FCC, 0}, /* F4_5500_5700 */ - {5500, 5700, 30, 6, 20, 20, DFS_ETSI, PSCAN_ETSI, 0}, /* F5_5500_5700 */ - {5500, 5700, 20, 0, 20, 20, DFS_FCC3 | DFS_ETSI | DFS_MKK4, PSCAN_MKK3 | PSCAN_FCC, 0}, /* F6_5500_5700 */ - - {5660, 5700, 20, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 4}, /* F1_5660_5700 */ - {5660, 5700, 23, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 4}, /* F2_5660_5700 */ - {5660, 5700, 30, 6, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, 4}, /* F3_5660_5700 */ - - {5745, 5805, 23, 0, 20, 20, NO_DFS, NO_PSCAN, 3}, /* F1_5745_5805 */ - {5745, 5805, 30, 6, 20, 20, NO_DFS, NO_PSCAN, 3}, /* F2_5745_5805 */ - {5745, 5805, 30, 6, 20, 20, NO_DFS, PSCAN_ETSI, 0}, /* F3_5745_5805 */ - {5745, 5805, 20, 0, 20, 20, NO_DFS, NO_PSCAN, 0}, /* F4_5745_5805 */ - - {5745, 5825, 5, 6, 20, 20, NO_DFS, NO_PSCAN, 5}, /* F1_5745_5825 */ - {5745, 5825, 17, 0, 20, 20, NO_DFS, NO_PSCAN, 5}, /* F2_5745_5825 */ - {5745, 5825, 20, 0, 20, 20, NO_DFS, NO_PSCAN, 0}, /* F3_5745_5825 */ - {5745, 5825, 30, 0, 20, 20, NO_DFS, NO_PSCAN, 0}, /* F4_5745_5825 */ - {5745, 5825, 30, 6, 20, 20, NO_DFS, NO_PSCAN, 5}, /* F5_5745_5825 */ - {5745, 5825, 30, 6, 20, 20, NO_DFS, NO_PSCAN, 5}, /* F6_5745_5825 */ - {5745, 5825, 30, 6, 20, 20, NO_DFS, PSCAN_ETSI, 0}, /* F7_5745_5825 */ - {5745, 5825, 20, 6, 20, 20, NO_DFS, PSCAN_ETSI, 0}, /* F8_5745_5825 */ - - /* - * Below are the world roaming channels - * All WWR domains have no power limit, instead use the card's CTL - * or max power settings. - */ - {4920, 4980, 30, 0, 20, 20, NO_DFS, PSCAN_WWR, 0}, /* W1_4920_4980 */ - {5040, 5080, 30, 0, 20, 20, NO_DFS, PSCAN_WWR, 0}, /* W1_5040_5080 */ - {5170, 5230, 30, 0, 20, 20, NO_DFS, PSCAN_WWR, 0}, /* W1_5170_5230 */ - {5180, 5240, 30, 0, 20, 20, NO_DFS, PSCAN_WWR, 0}, /* W1_5180_5240 */ - {5260, 5320, 30, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, 0}, /* W1_5260_5320 */ - {5745, 5825, 30, 0, 20, 20, NO_DFS, PSCAN_WWR, 0}, /* W1_5745_5825 */ - {5500, 5700, 30, 0, 20, 20, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, 0}, /* W1_5500_5700 */ - {4920, 6100, 30, 6, 20, 20, NO_DFS, NO_PSCAN, 0}, /* A_DEMO_ALL_CHANNELS */ -}; - -/* - * 2GHz 11b channel tags - */ -enum { - F1_2312_2372, - F2_2312_2372, - - F1_2412_2472, - F2_2412_2472, - F3_2412_2472, - F4_2412_2472, - - F1_2412_2462, - F2_2412_2462, - - F1_2432_2442, - - F1_2457_2472, - - F1_2467_2472, - - F1_2484_2484, - F2_2484_2484, - - F1_2512_2732, - - W1_2312_2372, - W1_2412_2412, - W1_2417_2432, - W1_2437_2442, - W1_2447_2457, - W1_2462_2462, - W1_2467_2467, - W2_2467_2467, - W1_2472_2472, - W2_2472_2472, - W1_2484_2484, - W2_2484_2484, -}; - -static const REG_DMN_FREQ_BAND reg_dmn2_ghz_freq[] = { - {2312, 2372, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F1_2312_2372 */ - {2312, 2372, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F2_2312_2372 */ - - {2412, 2472, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F1_2412_2472 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA, 30}, /* F2_2412_2472 */ - {2412, 2472, 30, 0, 20, 5, NO_DFS, NO_PSCAN, 4}, /* F3_2412_2472 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA, 0}, /* F4_2412_2472 */ - - {2412, 2462, 30, 6, 20, 5, NO_DFS, NO_PSCAN, 12}, /* F1_2412_2462 */ - {2412, 2462, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA, 30}, /* F2_2412_2462 */ - - {2432, 2442, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 4}, /* F1_2432_2442 */ - - {2457, 2472, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F1_2457_2472 */ - - {2467, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA2 | PSCAN_MKKA, 30}, /* F1_2467_2472 */ - - {2484, 2484, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F1_2484_2484 */ - {2484, 2484, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA | PSCAN_MKKA1 | PSCAN_MKKA2, 31}, /* F2_2484_2484 */ - - {2512, 2732, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* F1_2512_2732 */ - - /* - * WWR have powers opened up to 20dBm. Limits should often come from CTL/Max powers - */ - - {2312, 2372, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2312_2372 */ - {2412, 2412, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2412_2412 */ - {2417, 2432, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2417_2432 */ - {2437, 2442, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2437_2442 */ - {2447, 2457, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2447_2457 */ - {2462, 2462, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* W1_2462_2462 */ - {2467, 2467, 20, 0, 20, 5, NO_DFS, PSCAN_WWR | IS_ECM_CHAN, 0}, /* W1_2467_2467 */ - {2467, 2467, 20, 0, 20, 5, NO_DFS, NO_PSCAN | IS_ECM_CHAN, 0}, /* W2_2467_2467 */ - {2472, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_WWR | IS_ECM_CHAN, 0}, /* W1_2472_2472 */ - {2472, 2472, 20, 0, 20, 5, NO_DFS, NO_PSCAN | IS_ECM_CHAN, 0}, /* W2_2472_2472 */ - {2484, 2484, 20, 0, 20, 5, NO_DFS, PSCAN_WWR | IS_ECM_CHAN, 0}, /* W1_2484_2484 */ - {2484, 2484, 20, 0, 20, 5, NO_DFS, NO_PSCAN | IS_ECM_CHAN, 0}, /* W2_2484_2484 */ -}; - -/* - * 2GHz 11g channel tags - */ - -enum { - G1_2312_2372, - G2_2312_2372, - - G1_2412_2472, - G2_2412_2472, - G3_2412_2472, - G4_2412_2472, - - G1_2412_2462, - G2_2412_2462, - - G1_2432_2442, - - G1_2457_2472, - - G1_2512_2732, - - G1_2467_2472, - G2_2467_2472, - - G1_2484_2484, - - WG1_2312_2372, - WG1_2412_2462, - WG1_2412_2472, - WG2_2412_2472, - G_DEMO_ALMOST_ALL_CHANNELS, - G_DEMO_ALL_CHANNELS, -}; - -static const REG_DMN_FREQ_BAND reg_dmn2_ghz11g_freq[] = { - {2312, 2372, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G1_2312_2372 */ - {2312, 2372, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G2_2312_2372 */ - - {2412, 2472, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G1_2412_2472 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA_G | PSCAN_MKKA2 | PSCAN_MKKA | PSCAN_EXT_CHAN, 30}, /* G2_2412_2472 */ - {2412, 2472, 30, 0, 20, 5, NO_DFS, NO_PSCAN, 4}, /* G3_2412_2472 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA_G | PSCAN_MKKA2 | PSCAN_MKKA | PSCAN_EXT_CHAN, 0}, /* G4_2412_2472 */ - - {2412, 2462, 30, 6, 20, 5, NO_DFS, NO_PSCAN, 12}, /* G1_2412_2462 */ - {2412, 2462, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA_G, 30}, /* G2_2412_2462 */ - - {2432, 2442, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 4}, /* G1_2432_2442 */ - - {2457, 2472, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G1_2457_2472 */ - - {2512, 2732, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G1_2512_2732 */ - - {2467, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA2 | PSCAN_MKKA, 30}, /* G1_2467_2472 */ - {2467, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_MKKA_G | PSCAN_MKKA2, 0}, /* G2_2467_2472 */ - - {2484, 2484, 5, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G1_2484_2484 */ - /* - * WWR open up the power to 20dBm - */ - - {2312, 2372, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* WG1_2312_2372 */ - {2412, 2462, 20, 0, 20, 5, NO_DFS, NO_PSCAN, 0}, /* WG1_2412_2462 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, PSCAN_WWR | IS_ECM_CHAN | PSCAN_EXT_CHAN, 0}, /* WG1_2412_2472 */ - {2412, 2472, 20, 0, 20, 5, NO_DFS, NO_PSCAN | IS_ECM_CHAN, 0}, /* WG2_2412_2472 */ - {2312, 2532, 27, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G_DEMO_ALMOST_ALL_CHANNELS */ - {2312, 2732, 27, 6, 20, 5, NO_DFS, NO_PSCAN, 0}, /* G_DEMO_ALL_CHANNELS */ -}; - /* regulatory capabilities */ #define REGDMN_EEPROM_EEREGCAP_EN_KK_U1_EVEN 0x0080 #define REGDMN_EEPROM_EEREGCAP_EN_KK_U2 0x0100 #define REGDMN_EEPROM_EEREGCAP_EN_KK_MIDBAND 0x0200 #define REGDMN_EEPROM_EEREGCAP_EN_KK_U1_ODD 0x0400 -static const JAPAN_BANDCHECK j_bandcheck[] = { - {F1_5170_5230, REGDMN_EEPROM_EEREGCAP_EN_KK_U1_ODD}, - {F4_5180_5240, REGDMN_EEPROM_EEREGCAP_EN_KK_U1_EVEN}, - {F2_5260_5320, REGDMN_EEPROM_EEREGCAP_EN_KK_U2}, - {F4_5500_5700, REGDMN_EEPROM_EEREGCAP_EN_KK_MIDBAND} -}; - static const COMMON_MODE_POWER common_mode_pwrtbl[] = { {4900, 5000, 17}, {5000, 5100, 17}, @@ -1243,794 +878,72 @@ static const COMMON_MODE_POWER common_mode_pwrtbl[] = { {5825, 5850, 23} /* Korea */ }; -/* - * 5GHz Turbo (dynamic & static) tags - */ - -enum { - T1_5130_5650, - T1_5150_5670, - - T1_5200_5200, - T2_5200_5200, - T3_5200_5200, - T4_5200_5200, - T5_5200_5200, - T6_5200_5200, - T7_5200_5200, - T8_5200_5200, - - T1_5200_5280, - T2_5200_5280, - T3_5200_5280, - T4_5200_5280, - T5_5200_5280, - T6_5200_5280, - - T1_5200_5240, - T1_5210_5210, - T2_5210_5210, - T3_5210_5210, - T4_5210_5210, - T5_5210_5210, - T6_5210_5210, - T7_5210_5210, - T8_5210_5210, - T9_5210_5210, - T10_5210_5210, - T1_5240_5240, - - T1_5210_5250, - T1_5210_5290, - T2_5210_5290, - T3_5210_5290, - - T1_5280_5280, - T2_5280_5280, - T1_5290_5290, - T2_5290_5290, - T3_5290_5290, - T1_5250_5290, - T2_5250_5290, - T3_5250_5290, - T4_5250_5290, - - T1_5540_5660, - T2_5540_5660, - T3_5540_5660, - T1_5760_5800, - T2_5760_5800, - T3_5760_5800, - T4_5760_5800, - T5_5760_5800, - T6_5760_5800, - T7_5760_5800, - - T1_5765_5805, - T2_5765_5805, - T3_5765_5805, - T4_5765_5805, - T5_5765_5805, - T6_5765_5805, - T7_5765_5805, - T8_5765_5805, - T9_5765_5805, - - WT1_5210_5250, - WT1_5290_5290, - WT1_5540_5660, - WT1_5760_5800, -}; - -/* - * 2GHz Dynamic turbo tags - */ -#ifndef ATH_REMOVE_2G_TURBO_RD_TABLE -enum { - T1_2312_2372, - T1_2437_2437, - T2_2437_2437, - T3_2437_2437, - T1_2512_2732 -}; - -static const REG_DMN_FREQ_BAND reg_dmn2_ghz11g_turbo_freq[] = { - {2312, 2372, 5, 6, 40, 40, NO_DFS, NO_PSCAN, 0}, /* T1_2312_2372 */ - {2437, 2437, 5, 6, 40, 40, NO_DFS, NO_PSCAN, 0}, /* T1_2437_2437 */ - {2437, 2437, 20, 6, 40, 40, NO_DFS, NO_PSCAN, 0}, /* T2_2437_2437 */ - {2437, 2437, 18, 6, 40, 40, NO_DFS, PSCAN_WWR, 0}, /* T3_2437_2437 */ - {2512, 2732, 5, 6, 40, 40, NO_DFS, NO_PSCAN, 0}, /* T1_2512_2732 */ -}; -#endif /* ATH_REMOVE_2G_TURBO_RD_TABLE */ - static const REG_DOMAIN ah_cmn_reg_domains[] = { - {DEBUG_REG_DMN, FCC, DFS_FCC3, NO_PSCAN, NO_REQ, - CHAN_11A_BM(A_DEMO_ALL_CHANNELS, F6_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(T1_5130_5650, T1_5150_5670, F6_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(T1_5200_5240, T1_5280_5280, T1_5540_5660, T1_5765_5805, - -1, -1, -1, -1, -1, -1, -1, -1) - BM(F1_2312_2372, F1_2412_2472, F1_2484_2484, F1_2512_2732, - -1, -1, -1, -1, -1, -1, -1, -1), - BM(G_DEMO_ALMOST_ALL_CHANNELS, - G1_2484_2484, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T1_2312_2372, T1_2437_2437, T1_2512_2732, - -1, -1, -1, -1, -1, -1, -1, -1, -1)}, - - {APL1, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F4_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL2, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F1_5745_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL3, FCC, DFS_FCC3, PSCAN_FCC, NO_REQ, - BM(F1_5280_5320, F6_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5290_5290, T1_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL4, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F5_5180_5240, F9_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5210_5210, T3_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5200, T3_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL5, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F2_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T4_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T4_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL6, ETSI, DFS_ETSI, PSCAN_FCC_T | PSCAN_FCC, NO_REQ, - BM(F9_5180_5240, F2_5260_5320, F3_5745_5825, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T2_5210_5210, T1_5250_5290, T1_5760_5800, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T1_5200_5280, T5_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL7, FCC, DFS_FCC3 | DFS_ETSI, PSCAN_FCC | PSCAN_ETSI, NO_REQ, - BM(F2_5280_5320, F2_5500_5580, F3_5660_5720, F7_5745_5825, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T3_5290_5290, T5_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5540_5660, T6_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL8, ETSI, NO_DFS, NO_PSCAN, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F6_5260_5320, F4_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5290_5290, T2_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5280_5280, T1_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL9, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F9_5180_5240, F2_5260_5320, F1_5500_5620, F3_5745_5805, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T3_5290_5290, T5_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5540_5660, T6_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL10, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F9_5180_5240, F2_5260_5320, F5_5500_5700, F3_5745_5805, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T3_5290_5290, T5_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5540_5660, T6_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL11, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F9_5180_5240, F2_5260_5320, F5_5500_5700, F7_5745_5825, - F1_5845_5865, -1, -1, -1, -1, -1, -1, -1), - BM(T3_5290_5290, T5_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5540_5660, T6_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {APL12, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F5_5180_5240, F1_5500_5560, F1_5745_5765, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T2_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI1, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F2_5180_5240, F2_5260_5320, F2_5500_5700, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T1_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5200_5280, T2_5540_5660, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI2, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F3_5180_5240, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T3_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI3, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, F2_5260_5320, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI4, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F3_5180_5240, F1_5260_5320, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T3_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI5, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F1_5180_5240, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T4_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T3_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI6, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F5_5180_5240, F1_5260_5280, F3_5500_5700, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T1_5210_5250, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T4_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {ETSI8, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, F2_5260_5320, F1_5660_5700, F4_5745_5825, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T1_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5200_5280, T2_5540_5660, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - BMZERO}, - - {ETSI9, ETSI, DFS_ETSI, PSCAN_ETSI, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, F2_5260_5320, F1_5500_5660, F8_5745_5825, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T1_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T2_5200_5280, T2_5540_5660, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - BMZERO}, - - {FCC1, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F2_5180_5240, F4_5260_5320, F5_5745_5825, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T6_5210_5210, T2_5250_5290, T6_5760_5800, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T1_5200_5240, T2_5280_5280, T7_5765_5805, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {FCC2, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F6_5180_5240, F5_5260_5320, F6_5745_5825, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T7_5210_5210, T3_5250_5290, T2_5760_5800, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T7_5200_5200, T1_5240_5240, T2_5280_5280, T1_5765_5805, -1, -1, -1, - -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {FCC3, FCC, DFS_FCC3, PSCAN_FCC | PSCAN_FCC_T, NO_REQ, - BM(F2_5180_5240, F3_5260_5320, F1_5500_5720, F5_5745_5825, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T6_5210_5210, T2_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T4_5200_5200, T8_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - /* - - Bug Fix: EV 98583 Public Safety channel - Exclude the following channel in FCC Public safety domain - Uni-1: 5180, 5200, 5220, 5240 - Uni-2: 5260, 5280, 5300, 5320 - Uni-3: 5745, 5765, 5785, 5805, 5825 - */ - {FCC4, FCC, DFS_FCC3, PSCAN_FCC | PSCAN_FCC_T, NO_REQ, - BM(F1_4942_4987, F1_4945_4985, F1_4950_4980, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T8_5210_5210, T4_5250_5290, T7_5760_5800, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T1_5200_5240, T1_5280_5280, T9_5765_5805, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {FCC5, FCC, NO_DFS, NO_PSCAN, NO_REQ, - BM(F2_5180_5240, F6_5745_5825, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T6_5210_5210, T2_5760_5800, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T8_5200_5200, T7_5765_5805, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {FCC6, FCC, DFS_FCC3, PSCAN_FCC, NO_REQ, - BM(F8_5180_5240, F5_5260_5320, F1_5500_5580, F2_5660_5720, - F6_5745_5825, -1, -1, -1, -1, -1, -1, -1), - BM(T7_5210_5210, T3_5250_5290, T2_5760_5800, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T7_5200_5200, T1_5240_5240, T2_5280_5280, T1_5765_5805, -1, -1, -1, - -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {MKK1, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_5170_5230, F10_5180_5240, F7_5260_5320, F4_5500_5700, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T7_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T5_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - {MKK2, MKK, DFS_MKK4, PSCAN_MKK2 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F2_4915_4925, F2_4935_4945, F1_4920_4980, F1_5035_5040, - F2_5055_5055, F1_5040_5080, F1_5170_5230, F10_5180_5240, -1, -1, -1, - -1), - BM(T7_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T5_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 even */ - {MKK3, MKK, NO_DFS, PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T9_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 even + UNI-2 */ - {MKK4, MKK, DFS_MKK4, PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, F2_5260_5320, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T10_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T6_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 even + UNI-2 + mid-band */ - {MKK5, MKK, DFS_MKK4, PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F4_5180_5240, F2_5260_5320, F6_5500_5700, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T5_5200_5280, T3_5540_5660, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + even */ - {MKK6, MKK, NO_DFS, PSCAN_MKK1, DISALLOW_ADHOC_11A_TURB, - BM(F2_5170_5230, F4_5180_5240, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T3_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T6_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + UNI-1 even + UNI-2 */ - {MKK7, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F2_5170_5230, F4_5180_5240, F2_5260_5320, -1, -1, -1, -1, -1, -1, - -1, -1, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T5_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + UNI-1 even + UNI-2 + mid-band */ - {MKK8, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F2_5170_5230, F4_5180_5240, F2_5260_5320, F6_5500_5700, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T5_5200_5280, T3_5540_5660, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 even + 4.9 GHZ */ - {MKK9, MKK, NO_DFS, PSCAN_MKK2 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_4912_4947, F1_5032_5057, F1_4915_4925, F1_4935_4945, - F2_4920_4980, F1_5035_5045, F1_5055_5055, F2_5040_5080, - F4_5180_5240, -1, -1, -1), - BM(T9_5210_5210, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5200, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 even + UNI-2 + 4.9 GHZ */ - {MKK10, MKK, DFS_MKK4, PSCAN_MKK2 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_4912_4947, F1_5032_5057, F1_4915_4925, F1_4935_4945, - F2_4920_4980, F1_5035_5045, F1_5055_5055, F2_5040_5080, - F4_5180_5240, F2_5260_5320, -1, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz */ - {MKK11, MKK, DFS_MKK4, PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_4912_4947, F1_5032_5057, F1_4915_4925, F1_4935_4945, - F2_4920_4980, F1_5035_5045, F1_5055_5055, F2_5040_5080, - F4_5180_5240, F2_5260_5320, F6_5500_5700, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz */ - {MKK12, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_4915_4925, F1_4935_4945, F2_4920_4980, F1_5040_5040, - F1_5055_5055, F2_5040_5080, F2_5170_5230, F4_5180_5240, - F2_5260_5320, F6_5500_5700, -1, -1), - BM(T3_5210_5290, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(T1_5200_5280, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + UNI-1 even + UNI-2 + mid-band */ - {MKK13, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - BM(F2_5170_5230, F7_5180_5240, F2_5260_5320, F6_5500_5700, -1, -1, -1, - -1, -1, -1, -1, -1), - BMZERO, - BMZERO, - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + UNI-1 even + 4.9GHz */ - {MKK14, MKK, DFS_MKK4, PSCAN_MKK1, DISALLOW_ADHOC_11A_TURB, - BM(F1_4915_4925, F1_4935_4945, F2_4920_4980, F1_5040_5040, - F2_5040_5080, F1_5055_5055, F2_5170_5230, F4_5180_5240, -1, -1, -1, - -1), - BMZERO, - BMZERO, - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /* UNI-1 odd + UNI-1 even + UNI-2 + 4.9GHz */ - {MKK15, MKK, DFS_MKK4, PSCAN_MKK1 | PSCAN_MKK3, DISALLOW_ADHOC_11A_TURB, - BM(F1_4915_4925, F1_4935_4945, F2_4920_4980, F1_5040_5040, - F2_5040_5080, F1_5055_5055, F2_5170_5230, F4_5180_5240, - F2_5260_5320, -1, -1, -1), - BMZERO, - BMZERO, - BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, - - /*=== 2 GHz ===*/ - - /* Defined here to use when 2G channels are authorised for country K2 */ - {APLD, NO_CTL, NO_DFS, NO_PSCAN, NO_REQ, - CHAN_11A_BMZERO - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(F2_2312_2372, F4_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(G2_2312_2372, G4_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BMZERO}, - - {ETSIA, NO_CTL, NO_DFS, PSCAN_ETSIA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - CHAN_11A_BMZERO CHAN_11A_BMZERO CHAN_11A_BMZERO BM(F1_2457_2472, -1, - -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(G1_2457_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {ETSIB, ETSI, NO_DFS, PSCAN_ETSIB, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - CHAN_11A_BMZERO CHAN_11A_BMZERO CHAN_11A_BMZERO BM(F1_2432_2442, -1, - -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(G1_2432_2442, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {ETSIC, ETSI, NO_DFS, PSCAN_ETSIC, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - CHAN_11A_BMZERO CHAN_11A_BMZERO CHAN_11A_BMZERO BM(F3_2412_2472, -1, - -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1), - BM(G3_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {FCCA, FCC, NO_DFS, NO_PSCAN, NO_REQ, - CHAN_11A_BMZERO - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(F1_2412_2462, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(G1_2412_2462, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {MKKA, MKK, NO_DFS, - PSCAN_MKKA | PSCAN_MKKA_G | PSCAN_MKKA1 | PSCAN_MKKA1_G | PSCAN_MKKA2 | - PSCAN_MKKA2_G, DISALLOW_ADHOC_11A_TURB, - CHAN_11A_BMZERO CHAN_11A_BMZERO CHAN_11A_BMZERO BM(F2_2412_2462, - F1_2467_2472, - F2_2484_2484, - -1, -1, -1, -1, -1, - -1, -1, -1, -1), - BM(G2_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {MKKC, MKK, NO_DFS, NO_PSCAN, NO_REQ, - CHAN_11A_BMZERO - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(F2_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(G2_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WORLD, ETSI, NO_DFS, NO_PSCAN, NO_REQ, - CHAN_11A_BMZERO - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(F4_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - BM(G4_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T2_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR0_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5745_5825, W1_5500_5700, - -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, W1_2484_2484, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR01_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - W1_5500_5700, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2417_2432, - W1_2447_2457, - -1, -1, -1, -1, -1, -1, -1), - BM(WG1_2412_2462, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR02_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - W1_5500_5700, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {EU1_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - W1_5500_5700, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W2_2472_2472, - W1_2417_2432, - W1_2447_2457, W2_2467_2467, -1, -1, -1, -1, -1), - BM(WG2_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR1_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - W1_5500_5700, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, W1_2484_2484, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR2_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - W1_5500_5700, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, W1_2484_2484, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR3_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5170_5230, W1_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR4_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2417_2432, - W1_2447_2457, - -1, -1, -1, -1, -1, -1, -1), - BM(WG1_2412_2462, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR5_ETSIC, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WOR9_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5745_5825, W1_5500_5700, - -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BM(WT1_5210_5250, WT1_5290_5290, WT1_5760_5800, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2417_2432, - W1_2447_2457, - -1, -1, -1, -1, -1, -1, -1), - BM(WG1_2412_2462, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WORA_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5745_5825, W1_5500_5700, - -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WORB_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_NO_11A, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5500_5700, - -1, -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {WORC_WORLD, NO_CTL, DFS_FCC3 | DFS_ETSI, PSCAN_WWR, ADHOC_PER_11D, - CHAN_11A_BM(W1_5260_5320, W1_5180_5240, W1_5500_5700, W1_5745_5825, - -1, -1, -1, -1, -1, -1, -1, -1) - CHAN_11A_BMZERO - CHAN_11A_BMZERO - BM(W1_2412_2412, W1_2437_2442, W1_2462_2462, W1_2472_2472, - W1_2417_2432, - W1_2447_2457, W1_2467_2467, -1, -1, -1, -1, -1), - BM(WG1_2412_2472, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1), - CHAN_TURBO_G_BM(T3_2437_2437, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1)}, - - {NULL1, NO_CTL, NO_DFS, NO_PSCAN, NO_REQ, - CHAN_11A_BMZERO CHAN_11A_BMZERO CHAN_11A_BMZERO BMZERO, - BMZERO, - CHAN_TURBO_G_BMZERO}, -}; - -static const struct cmode modes[] = { - {REGDMN_MODE_TURBO, IEEE80211_CHAN_ST}, /* TURBO means 11a Static Turbo */ - {REGDMN_MODE_11A, IEEE80211_CHAN_A}, - {REGDMN_MODE_11B, IEEE80211_CHAN_B}, - {REGDMN_MODE_11G, IEEE80211_CHAN_PUREG}, - {REGDMN_MODE_11G_TURBO, IEEE80211_CHAN_108G}, - {REGDMN_MODE_11A_TURBO, IEEE80211_CHAN_108A}, - {REGDMN_MODE_11NG_HT20, IEEE80211_CHAN_11NG_HT20}, - {REGDMN_MODE_11NG_HT40PLUS, IEEE80211_CHAN_11NG_HT40PLUS}, - {REGDMN_MODE_11NG_HT40MINUS, IEEE80211_CHAN_11NG_HT40MINUS}, - {REGDMN_MODE_11NA_HT20, IEEE80211_CHAN_11NA_HT20}, - {REGDMN_MODE_11NA_HT40PLUS, IEEE80211_CHAN_11NA_HT40PLUS}, - {REGDMN_MODE_11NA_HT40MINUS, IEEE80211_CHAN_11NA_HT40MINUS}, - {REGDMN_MODE_11AC_VHT20, IEEE80211_CHAN_11AC_VHT20}, - {REGDMN_MODE_11AC_VHT40PLUS, IEEE80211_CHAN_11AC_VHT40PLUS}, - {REGDMN_MODE_11AC_VHT40MINUS, IEEE80211_CHAN_11AC_VHT40MINUS}, - {REGDMN_MODE_11AC_VHT80, IEEE80211_CHAN_11AC_VHT80}, - {REGDMN_MODE_11AC_VHT20_2G, IEEE80211_CHAN_11AC_VHT20_2G}, - {REGDMN_MODE_11AC_VHT40_2G, IEEE80211_CHAN_11AC_VHT40_2G}, - {REGDMN_MODE_11AC_VHT80_2G, IEEE80211_CHAN_11AC_VHT80_2G}, + {DEBUG_REG_DMN, FCC, DFS_FCC3}, + {APL1, FCC, NO_DFS}, + {APL2, FCC, NO_DFS}, + {APL3, FCC, DFS_FCC3}, + {APL4, FCC, NO_DFS}, + {APL5, FCC, NO_DFS}, + {APL6, ETSI, DFS_ETSI}, + {APL7, FCC, DFS_FCC3}, + {APL8, ETSI, NO_DFS}, + {APL9, ETSI, DFS_ETSI}, + {APL10, ETSI, DFS_ETSI}, + {APL11, ETSI, DFS_ETSI}, + {APL12, ETSI, DFS_ETSI}, + {ETSI1, ETSI, DFS_ETSI}, + {ETSI2, ETSI, DFS_ETSI}, + {ETSI3, ETSI, DFS_ETSI}, + {ETSI4, ETSI, DFS_ETSI}, + {ETSI5, ETSI, DFS_ETSI}, + {ETSI6, ETSI, DFS_ETSI}, + {ETSI8, ETSI, DFS_ETSI}, + {ETSI9, ETSI, DFS_ETSI}, + {FCC1, FCC, NO_DFS}, + {FCC2, FCC, NO_DFS}, + {FCC3, FCC, DFS_FCC3}, + {FCC4, FCC, DFS_FCC3}, + {FCC5, FCC, NO_DFS}, + {FCC6, FCC, DFS_FCC3}, + {MKK1, MKK, DFS_MKK4}, + {MKK2, MKK, DFS_MKK4}, + {MKK3, MKK, NO_DFS}, + {MKK4, MKK, DFS_MKK4}, + {MKK5, MKK, DFS_MKK4}, + {MKK6, MKK, NO_DFS}, + {MKK7, MKK, DFS_MKK4}, + {MKK8, MKK, DFS_MKK4}, + {MKK9, MKK, NO_DFS}, + {MKK10, MKK, DFS_MKK4}, + {MKK11, MKK, DFS_MKK4}, + {MKK12, MKK, DFS_MKK4}, + {MKK13, MKK, DFS_MKK4}, + {MKK14, MKK, DFS_MKK4}, + {MKK15, MKK, DFS_MKK4}, + {APLD, NO_CTL, NO_DFS}, + {ETSIA, NO_CTL, NO_DFS}, + {ETSIB, ETSI, NO_DFS}, + {ETSIC, ETSI, NO_DFS}, + {FCCA, FCC, NO_DFS}, + {MKKA, MKK, NO_DFS}, + {MKKC, MKK, NO_DFS}, + {WORLD, ETSI, NO_DFS}, + {WOR0_WORLD, NO_CTL, DFS_FCC3}, + {WOR01_WORLD, NO_CTL, DFS_FCC3}, + {WOR02_WORLD, NO_CTL, DFS_FCC3}, + {EU1_WORLD, NO_CTL, DFS_FCC3}, + {WOR1_WORLD, NO_CTL, DFS_FCC3}, + {WOR2_WORLD, NO_CTL, DFS_FCC3}, + {WOR3_WORLD, NO_CTL, DFS_FCC3}, + {WOR4_WORLD, NO_CTL, DFS_FCC3}, + {WOR5_ETSIC, NO_CTL, DFS_FCC3}, + {WOR9_WORLD, NO_CTL, DFS_FCC3}, + {WORA_WORLD, NO_CTL, DFS_FCC3}, + {WORB_WORLD, NO_CTL, DFS_FCC3}, + {WORC_WORLD, NO_CTL, DFS_FCC3}, + {NULL1, NO_CTL, NO_DFS}, }; typedef enum offset { diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 0507496b9598..67765ba91020 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -372,93 +372,11 @@ int32_t regdmn_get_regdmn_for_country(uint8_t *alpha2) return -1; } -/* - * Test to see if the bitmask array is all zeros - */ -static bool is_chan_bit_mask_zero(const uint64_t *bitmask) -{ - int i; - - for (i = 0; i < BMLEN; i++) { - if (bitmask[i] != 0) - return false; - } - return true; -} - -/* - * Return the mask of available modes based on the hardware - * capabilities and the specified country code and reg domain. - */ -static uint32_t regdmn_getwmodesnreg(uint32_t modesAvail, - const COUNTRY_CODE_TO_ENUM_RD *country, - const REG_DOMAIN *rd5GHz) -{ - - /* Check country regulations for allowed modes */ - if ((modesAvail & (REGDMN_MODE_11A_TURBO | REGDMN_MODE_TURBO)) && - (!country->allow11aTurbo)) - modesAvail &= ~(REGDMN_MODE_11A_TURBO | REGDMN_MODE_TURBO); - - if ((modesAvail & REGDMN_MODE_11G_TURBO) && (!country->allow11gTurbo)) - modesAvail &= ~REGDMN_MODE_11G_TURBO; - - if ((modesAvail & REGDMN_MODE_11G) && (!country->allow11g)) - modesAvail &= ~REGDMN_MODE_11G; - - if ((modesAvail & REGDMN_MODE_11A) && - (is_chan_bit_mask_zero(rd5GHz->chan11a))) - modesAvail &= ~REGDMN_MODE_11A; - - if ((modesAvail & REGDMN_MODE_11NG_HT20) && (!country->allow11ng20)) - modesAvail &= ~REGDMN_MODE_11NG_HT20; - - if ((modesAvail & REGDMN_MODE_11NA_HT20) && (!country->allow11na20)) - modesAvail &= ~REGDMN_MODE_11NA_HT20; - - if ((modesAvail & REGDMN_MODE_11NG_HT40PLUS) && (!country->allow11ng40)) - modesAvail &= ~REGDMN_MODE_11NG_HT40PLUS; - - if ((modesAvail & REGDMN_MODE_11NG_HT40MINUS) && - (!country->allow11ng40)) - modesAvail &= ~REGDMN_MODE_11NG_HT40MINUS; - - if ((modesAvail & REGDMN_MODE_11NA_HT40PLUS) && (!country->allow11na40)) - modesAvail &= ~REGDMN_MODE_11NA_HT40PLUS; - - if ((modesAvail & REGDMN_MODE_11NA_HT40MINUS) && - (!country->allow11na40)) - modesAvail &= ~REGDMN_MODE_11NA_HT40MINUS; - - if ((modesAvail & REGDMN_MODE_11AC_VHT20) && (!country->allow11na20)) - modesAvail &= ~REGDMN_MODE_11AC_VHT20; - - if ((modesAvail & REGDMN_MODE_11AC_VHT40PLUS) && - (!country->allow11na40)) - modesAvail &= ~REGDMN_MODE_11AC_VHT40PLUS; - - if ((modesAvail & REGDMN_MODE_11AC_VHT40MINUS) && - (!country->allow11na40)) - modesAvail &= ~REGDMN_MODE_11AC_VHT40MINUS; - - if ((modesAvail & REGDMN_MODE_11AC_VHT80) && (!country->allow11na80)) - modesAvail &= ~REGDMN_MODE_11AC_VHT80; - - if ((modesAvail & REGDMN_MODE_11AC_VHT20_2G) && (!country->allow11ng20)) - modesAvail &= ~REGDMN_MODE_11AC_VHT20_2G; - - return modesAvail; -} - -void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, - uint32_t modeSelect) +void cds_fill_send_ctl_info_to_fw(struct regulatory *reg) { const REG_DOMAIN *regdomain2G = NULL; const REG_DOMAIN *regdomain5G = NULL; - int8_t ctl_2g, ctl_5g, ctl; - const REG_DOMAIN *rd = NULL; - const struct cmode *cm; - const COUNTRY_CODE_TO_ENUM_RD *country; + int8_t ctl_2g, ctl_5g; const REG_DMN_PAIR_MAPPING *regpair; regpair = reg->regpair; @@ -478,70 +396,6 @@ void cds_fill_send_ctl_info_to_fw(struct regulatory *reg, uint32_t modesAvail, ctl_2g = regdomain2G->conformance_test_limit; ctl_5g = regdomain5G->conformance_test_limit; - /* find second nible of CTL */ - country = find_country(reg->country_code); - if (country != NULL) - modesAvail = - regdmn_getwmodesnreg(modesAvail, country, regdomain5G); - - for (cm = modes; cm < &modes[QDF_ARRAY_SIZE(modes)]; cm++) { - - if ((cm->mode & modeSelect) == 0) - continue; - - if ((cm->mode & modesAvail) == 0) - continue; - - switch (cm->mode) { - case REGDMN_MODE_TURBO: - rd = regdomain5G; - ctl = rd->conformance_test_limit | CTL_TURBO; - break; - case REGDMN_MODE_11A: - case REGDMN_MODE_11NA_HT20: - case REGDMN_MODE_11NA_HT40PLUS: - case REGDMN_MODE_11NA_HT40MINUS: - case REGDMN_MODE_11AC_VHT20: - case REGDMN_MODE_11AC_VHT40PLUS: - case REGDMN_MODE_11AC_VHT40MINUS: - case REGDMN_MODE_11AC_VHT80: - rd = regdomain5G; - ctl = rd->conformance_test_limit; - break; - case REGDMN_MODE_11B: - rd = regdomain2G; - ctl = rd->conformance_test_limit | CTL_11B; - break; - case REGDMN_MODE_11G: - case REGDMN_MODE_11NG_HT20: - case REGDMN_MODE_11NG_HT40PLUS: - case REGDMN_MODE_11NG_HT40MINUS: - case REGDMN_MODE_11AC_VHT20_2G: - case REGDMN_MODE_11AC_VHT40_2G: - case REGDMN_MODE_11AC_VHT80_2G: - rd = regdomain2G; - ctl = rd->conformance_test_limit | CTL_11G; - break; - case REGDMN_MODE_11G_TURBO: - rd = regdomain2G; - ctl = rd->conformance_test_limit | CTL_108G; - break; - case REGDMN_MODE_11A_TURBO: - rd = regdomain5G; - ctl = rd->conformance_test_limit | CTL_108G; - break; - default: - qdf_print(KERN_ERR "%s: Unkonwn HAL mode 0x%x\n", - __func__, cm->mode); - continue; - } - - if (rd == regdomain2G) - ctl_2g = ctl; - - if (rd == regdomain5G) - ctl_5g = ctl; - } /* save the ctl information for future reference */ reg->ctl_5g = ctl_5g; @@ -573,17 +427,13 @@ void cds_set_wma_dfs_region(uint8_t dfs_region) void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) { tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); - uint32_t modeSelect = 0xFFFFFFFF; if (!wma) { WMA_LOGE("%s: Unable to get WMA handle", __func__); return; } - wma_get_modeselect(wma, &modeSelect); - - cds_fill_send_ctl_info_to_fw(reg, wma->reg_cap.wireless_modes, - modeSelect); + cds_fill_send_ctl_info_to_fw(reg); return; } diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 5b9ba1f34b7e..07486eec7d55 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1417,8 +1417,6 @@ extern void cds_wma_complete_cback(void *p_cds_context); extern void wma_send_regdomain_info_to_fw(uint32_t reg_dmn, uint16_t regdmn2G, uint16_t regdmn5G, int8_t ctl2G, int8_t ctl5G); -void wma_get_modeselect(tp_wma_handle wma, uint32_t *modeSelect); - /** * enum frame_index - Frame index * @GENERIC_NODOWNLD_NOACK_COMP_INDEX: Frame index for no download comp no ack diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 1130abda7dfb..2e1f65d37247 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -5602,45 +5602,6 @@ QDF_STATUS wma_resume_target(WMA_HANDLE handle) return ret; } -/** - * wma_get_modeselect() - get modeSelect flag based on phy_capability - * @wma: wma handle - * @modeSelect: mode Select - * - * Return: none - */ -void wma_get_modeselect(tp_wma_handle wma, uint32_t *modeSelect) -{ - - switch (wma->phy_capability) { - case WMI_11G_CAPABILITY: - case WMI_11NG_CAPABILITY: - *modeSelect &= ~(REGDMN_MODE_11A | REGDMN_MODE_TURBO | - REGDMN_MODE_108A | REGDMN_MODE_11A_HALF_RATE | - REGDMN_MODE_11A_QUARTER_RATE | - REGDMN_MODE_11NA_HT20 | - REGDMN_MODE_11NA_HT40PLUS | - REGDMN_MODE_11NA_HT40MINUS | - REGDMN_MODE_11AC_VHT20 | - REGDMN_MODE_11AC_VHT40PLUS | - REGDMN_MODE_11AC_VHT40MINUS | - REGDMN_MODE_11AC_VHT80); - break; - case WMI_11A_CAPABILITY: - case WMI_11NA_CAPABILITY: - case WMI_11AC_CAPABILITY: - *modeSelect &= ~(REGDMN_MODE_11B | REGDMN_MODE_11G | - REGDMN_MODE_108G | REGDMN_MODE_11NG_HT20 | - REGDMN_MODE_11NG_HT40PLUS | - REGDMN_MODE_11NG_HT40MINUS | - REGDMN_MODE_11AC_VHT20_2G | - REGDMN_MODE_11AC_VHT40_2G | - REGDMN_MODE_11AC_VHT80_2G); - break; - } -} - - #ifdef FEATURE_WLAN_TDLS /** * wma_tdls_event_handler() - handle TDLS event -- cgit v1.2.3 From 30193a7fa41380d000ff89fc2e57534d834e7e56 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 20 Jan 2016 10:56:09 -0800 Subject: qcacld-3.0: Remove obsolete regdomain structures Remove obsolete regdomain data structures. Also remove the obsolete fields from REG_DOMAIN and REG_DMN_PAIR_MAPPING data structures. Change-Id: I1ff906571dfadf9cf6a4dc963d8eef62acc5f6b5 CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 126 +--- core/cds/inc/cds_regdomain_common.h | 1309 ++++++++++++--------------------- core/cds/src/cds_ieee80211_common_i.h | 8 - core/wma/inc/wma_dfs_interface.h | 4 +- 4 files changed, 500 insertions(+), 947 deletions(-) diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 4a54aaf9ed59..f101f0b44e4c 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -71,53 +71,19 @@ #ifndef REGULATORY_H #define REGULATORY_H -enum { - CTRY_DEBUG = 0x1ff, /* debug country code */ - CTRY_DEFAULT = 0 /* default country code */ -}; - -#define BMLEN 2 /* Use 2 64 bit uint for channel bitmask */ - -/* - * The following table is the master list for all different freqeuncy - * bands with the complete matrix of all possible flags and settings - * for each band if it is used in ANY reg domain. - */ - -#define DEF_REGDMN FCC3_FCCA -#define DEF_DMN_5 FCC1 -#define DEF_DMN_2 FCCA -#define COUNTRY_ERD_FLAG 0x8000 +#define CTRY_DEBUG 0x1ff +#define CTRY_DEFAULT 0 +#define COUNTRY_ERD_FLAG 0x8000 #define WORLDWIDE_ROAMING_FLAG 0x4000 -#define SUPER_DOMAIN_MASK 0x0fff -#define COUNTRY_CODE_MASK 0x3fff -#define CF_INTERFERENCE (CHANNEL_CW_INT | CHANNEL_RADAR_INT) -#define NO_CTL 0xff +#define DEF_REGDMN FCC3_FCCA -/* - * The following describe the bit masks for different passive scan - * capability/requirements per regdomain. - */ -#define NO_PSCAN 0x0ULL -#define PSCAN_FCC 0x0000000000000001ULL -#define PSCAN_FCC_T 0x0000000000000002ULL -#define PSCAN_ETSI 0x0000000000000004ULL -#define PSCAN_MKK1 0x0000000000000008ULL -#define PSCAN_MKK2 0x0000000000000010ULL -#define PSCAN_MKKA 0x0000000000000020ULL -#define PSCAN_MKKA_G 0x0000000000000040ULL -#define PSCAN_ETSIA 0x0000000000000080ULL -#define PSCAN_ETSIB 0x0000000000000100ULL -#define PSCAN_ETSIC 0x0000000000000200ULL -#define PSCAN_WWR 0x0000000000000400ULL -#define PSCAN_MKKA1 0x0000000000000800ULL -#define PSCAN_MKKA1_G 0x0000000000001000ULL -#define PSCAN_MKKA2 0x0000000000002000ULL -#define PSCAN_MKKA2_G 0x0000000000004000ULL -#define PSCAN_MKK3 0x0000000000008000ULL -#define PSCAN_EXT_CHAN 0x0000000000010000ULL -#define PSCAN_DEFER 0x7FFFFFFFFFFFFFFFULL -#define IS_ECM_CHAN 0x8000000000000000ULL +/* These defines should match the table from ah_internal.h */ +enum HAL_DFS_DOMAIN { + DFS_UNINIT_DOMAIN = 0, /* Uninitialized dfs domain */ + DFS_FCC_DOMAIN = 1, /* FCC3 dfs domain */ + DFS_ETSI_DOMAIN = 2, /* ETSI dfs domain */ + DFS_MKK4_DOMAIN = 3 /* Japan dfs domain */ +}; /* @@ -129,17 +95,6 @@ typedef struct reg_dmn_pair_mapping { uint16_t regDmnEnum; /* 16 bit reg domain pair */ uint16_t regDmn5GHz; /* 5GHz reg domain */ uint16_t regDmn2GHz; /* 2GHz reg domain */ - uint32_t flags5GHz; /* Requirements flags (AdHoc - disallow, noise floor cal needed, - etc) */ - uint32_t flags2GHz; /* Requirements flags (AdHoc - disallow, noise floor cal needed, - etc) */ - uint64_t pscanMask; /* Passive Scan flags which - can override unitary domain - passive scan flags. This - value is used as a mask on - the unitary flags */ uint16_t singleCC; /* Country code of single country if a one-on-one mapping exists */ } REG_DMN_PAIR_MAPPING; @@ -149,72 +104,13 @@ typedef struct { uint16_t regDmnEnum; const char *isoName; const char *name; - uint16_t allow11g : 1, allow11aTurbo : 1, allow11gTurbo : 1, allow11ng20 : 1, /* HT-20 allowed in 2GHz? */ - allow11ng40 : 1, /* HT-40 allowed in 2GHz? */ - allow11na20 : 1, /* HT-20 allowed in 5GHz? */ - allow11na40 : 1, /* HT-40 VHT-40 allowed in 5GHz? */ - allow11na80 : 1; /* VHT-80 allowed in 5GHz */ - uint16_t outdoorChanStart; } COUNTRY_CODE_TO_ENUM_RD; -typedef struct RegDmnFreqBand { - uint16_t lowChannel; /* Low channel center in MHz */ - uint16_t highChannel; /* High Channel center in MHz */ - uint8_t powerDfs; /* Max power (dBm) for channel - range when using DFS */ - uint8_t antennaMax; /* Max allowed antenna gain */ - uint8_t channelBW; /* Bandwidth of the channel */ - uint8_t channelSep; /* Channel separation within - the band */ - uint64_t useDfs; /* Use DFS in the RegDomain - if corresponding bit is set */ - uint64_t usePassScan; /* Use Passive Scan in the RegDomain - if corresponding bit is set */ - uint8_t regClassId; /* Regulatory class id */ -} REG_DMN_FREQ_BAND; - typedef struct reg_domain { uint16_t regDmnEnum; /* value from EnumRd table */ uint8_t conformance_test_limit; - uint64_t dfsMask; /* DFS bitmask for 5Ghz tables */ - uint64_t pscan; /* Bitmask for passive scan */ } REG_DOMAIN; -struct cmode { - uint32_t mode; - uint32_t flags; -}; - -#define YES true -#define NO false - -/* mapping of old skus to new skus for Japan */ -typedef struct { - uint16_t domain; - uint16_t newdomain_pre53; /* pre eeprom version 5.3 */ - uint16_t newdomain_post53; /* post eeprom version 5.3 */ -} JAPAN_SKUMAP; - -/* mapping of countrycode to new skus for Japan */ -typedef struct { - uint16_t ccode; - uint16_t newdomain_pre53; /* pre eeprom version 5.3 */ - uint16_t newdomain_post53; /* post eeprom version 5.3 */ -} JAPAN_COUNTRYMAP; - -/* check rd flags in eeprom for japan */ -typedef struct { - uint16_t freqbandbit; - uint32_t eepromflagtocheck; -} JAPAN_BANDCHECK; - -/* Common mode power table for 5Ghz */ -typedef struct { - uint16_t lchan; - uint16_t hchan; - uint8_t pwrlvl; -} COMMON_MODE_POWER; - /* Multi-Device RegDomain Support */ typedef struct ath_hal_reg_dmn_tables { /* regDomainPairs: Map of 8-bit regdomain values to unitary reg domain */ diff --git a/core/cds/inc/cds_regdomain_common.h b/core/cds/inc/cds_regdomain_common.h index ed762a0296ad..02ab52207a21 100644 --- a/core/cds/inc/cds_regdomain_common.h +++ b/core/cds/inc/cds_regdomain_common.h @@ -76,230 +76,204 @@ * frequency bitmasks and flags set. */ -#include "cds_ieee80211_common.h" -#include -#include "wlan_defs.h" #define MAX_CHANNELS_PER_OPERATING_CLASS 25 enum EnumRd { - /* - * The following regulatory domain definitions are - * found in the EEPROM. Each regulatory domain - * can operate in either a 5GHz or 2.4GHz wireless mode or - * both 5GHz and 2.4GHz wireless modes. - * In general, the value holds no special - * meaning and is used to decode into either specific - * 2.4GHz or 5GHz wireless mode for that particular - * regulatory domain. - */ NO_ENUMRD = 0x00, - NULL1_WORLD = 0x03, /* For 11b-only countries (no 11a allowed) */ - NULL1_ETSIB = 0x07, /* Israel */ + NULL1_WORLD = 0x03, + NULL1_ETSIB = 0x07, NULL1_ETSIC = 0x08, - FCC1_FCCA = 0x10, /* USA */ - FCC1_WORLD = 0x11, /* Hong Kong */ - FCC4_FCCA = 0x12, /* USA - Public Safety */ - FCC5_FCCA = 0x13, /* US with no DFS (UNII-1 + UNII-3 Only) */ - FCC6_FCCA = 0x14, /* Canada for AP only */ - - FCC2_FCCA = 0x20, /* Canada */ - FCC2_WORLD = 0x21, /* Australia & HK */ + FCC1_FCCA = 0x10, + FCC1_WORLD = 0x11, + FCC4_FCCA = 0x12, + FCC5_FCCA = 0x13, + FCC6_FCCA = 0x14, + + FCC2_FCCA = 0x20, + FCC2_WORLD = 0x21, FCC2_ETSIC = 0x22, - FCC6_WORLD = 0x23, /* Australia for AP only */ - FRANCE_RES = 0x31, /* Legacy France for OEM */ - FCC3_FCCA = 0x3A, /* USA & Canada w/5470 band, 11h, DFS enabled */ - FCC3_WORLD = 0x3B, /* USA & Canada w/5470 band, 11h, DFS enabled */ - FCC3_ETSIC = 0x3F, /* New Zealand, DFS enabled */ + FCC6_WORLD = 0x23, + FRANCE_RES = 0x31, + FCC3_FCCA = 0x3A, + FCC3_WORLD = 0x3B, + FCC3_ETSIC = 0x3F, ETSI1_WORLD = 0x37, - ETSI3_ETSIA = 0x32, /* France (optional) */ - ETSI2_WORLD = 0x35, /* Hungary & others */ - ETSI3_WORLD = 0x36, /* France & others */ + ETSI3_ETSIA = 0x32, + ETSI2_WORLD = 0x35, + ETSI3_WORLD = 0x36, ETSI4_WORLD = 0x30, ETSI4_ETSIC = 0x38, ETSI5_WORLD = 0x39, - ETSI6_WORLD = 0x34, /* Bulgaria */ - ETSI8_WORLD = 0x3D, /* Russia */ - ETSI9_WORLD = 0x3E, /* Ukraine */ - ETSI_RESERVED = 0x33, /* Reserved (Do not used) */ - - MKK1_MKKA = 0x40, /* Japan (JP1) */ - MKK1_MKKB = 0x41, /* Japan (JP0) */ - APL4_WORLD = 0x42, /* Singapore and Morocco */ - MKK2_MKKA = 0x43, /* Japan with 4.9G channels */ - APL_RESERVED = 0x44, /* Reserved (Do not used) */ - APL2_WORLD = 0x45, /* Korea */ + ETSI6_WORLD = 0x34, + ETSI8_WORLD = 0x3D, + ETSI9_WORLD = 0x3E, + ETSI_RESERVED = 0x33, + + MKK1_MKKA = 0x40, + MKK1_MKKB = 0x41, + APL4_WORLD = 0x42, + MKK2_MKKA = 0x43, + APL_RESERVED = 0x44, + APL2_WORLD = 0x45, APL2_APLC = 0x46, APL3_WORLD = 0x47, - MKK1_FCCA = 0x48, /* Japan (JP1-1) */ - APL2_APLD = 0x49, /* Korea with 2.3G channels */ - MKK1_MKKA1 = 0x4A, /* Japan (JE1) */ - MKK1_MKKA2 = 0x4B, /* Japan (JE2) */ - MKK1_MKKC = 0x4C, /* Japan (MKK1_MKKA,except Ch14) */ - APL2_FCCA = 0x4D, /* Mobile customer */ - APL11_FCCA = 0x4F, /* Specific AP Customer 5GHz, For APs Only */ + MKK1_FCCA = 0x48, + APL2_APLD = 0x49, + MKK1_MKKA1 = 0x4A, + MKK1_MKKA2 = 0x4B, + MKK1_MKKC = 0x4C, + APL2_FCCA = 0x4D, + APL11_FCCA = 0x4F, APL3_FCCA = 0x50, APL12_WORLD = 0x51, - APL1_WORLD = 0x52, /* Latin America */ + APL1_WORLD = 0x52, APL1_FCCA = 0x53, APL1_APLA = 0x54, APL1_ETSIC = 0x55, - APL2_ETSIC = 0x56, /* Venezuela */ - APL5_WORLD = 0x58, /* Chile */ - APL13_WORLD = 0x5A, /* Algeria */ - APL6_WORLD = 0x5B, /* Singapore */ - APL7_FCCA = 0x5C, /* Taiwan 5.47 Band */ - APL8_WORLD = 0x5D, /* Malaysia 5GHz */ - APL9_MKKC = 0x5E, /* Korea 5GHz, Before 11/2007. Now used only by APs */ - APL10_MKKC = 0x5F, /* Korea 5GHz, After 11/2007. For STAs only */ - - /* - * World mode SKUs - */ - WOR0_WORLD = 0x60, /* World0 (WO0 SKU) */ - WOR1_WORLD = 0x61, /* World1 (WO1 SKU) */ - WOR2_WORLD = 0x62, /* World2 (WO2 SKU) */ - WOR3_WORLD = 0x63, /* World3 (WO3 SKU) */ - WOR4_WORLD = 0x64, /* World4 (WO4 SKU) */ - WOR5_ETSIC = 0x65, /* World5 (WO5 SKU) */ - - WOR01_WORLD = 0x66, /* World0-1 (WW0-1 SKU) */ - WOR02_WORLD = 0x67, /* World0-2 (WW0-2 SKU) */ - EU1_WORLD = 0x68, /* Same as World0-2 (WW0-2 SKU), except active scan ch1-13. No ch14 */ - - WOR9_WORLD = 0x69, /* World9 (WO9 SKU) */ - WORA_WORLD = 0x6A, /* WorldA (WOA SKU) */ - WORB_WORLD = 0x6B, /* WorldB (WOB SKU) */ - WORC_WORLD = 0x6C, /* WorldC (WOC SKU) */ - - MKK3_MKKB = 0x80, /* Japan UNI-1 even + MKKB */ - MKK3_MKKA2 = 0x81, /* Japan UNI-1 even + MKKA2 */ - MKK3_MKKC = 0x82, /* Japan UNI-1 even + MKKC */ - - MKK4_MKKB = 0x83, /* Japan UNI-1 even + UNI-2 + MKKB */ - MKK4_MKKA2 = 0x84, /* Japan UNI-1 even + UNI-2 + MKKA2 */ - MKK4_MKKC = 0x85, /* Japan UNI-1 even + UNI-2 + MKKC */ - - MKK5_MKKB = 0x86, /* Japan UNI-1 even + UNI-2 + mid-band + MKKB */ - MKK5_MKKA2 = 0x87, /* Japan UNI-1 even + UNI-2 + mid-band + MKKA2 */ - MKK5_MKKC = 0x88, /* Japan UNI-1 even + UNI-2 + mid-band + MKKC */ + APL2_ETSIC = 0x56, + APL5_WORLD = 0x58, + APL13_WORLD = 0x5A, + APL6_WORLD = 0x5B, + APL7_FCCA = 0x5C, + APL8_WORLD = 0x5D, + APL9_MKKC = 0x5E, + APL10_MKKC = 0x5F, + + WOR0_WORLD = 0x60, + WOR1_WORLD = 0x61, + WOR2_WORLD = 0x62, + WOR3_WORLD = 0x63, + WOR4_WORLD = 0x64, + WOR5_ETSIC = 0x65, + + WOR01_WORLD = 0x66, + WOR02_WORLD = 0x67, + EU1_WORLD = 0x68, + + WOR9_WORLD = 0x69, + WORA_WORLD = 0x6A, + WORB_WORLD = 0x6B, + WORC_WORLD = 0x6C, + + MKK3_MKKB = 0x80, + MKK3_MKKA2 = 0x81, + MKK3_MKKC = 0x82, + + MKK4_MKKB = 0x83, + MKK4_MKKA2 = 0x84, + MKK4_MKKC = 0x85, + + MKK5_MKKB = 0x86, + MKK5_MKKA2 = 0x87, + MKK5_MKKC = 0x88, MKK5_MKKA = 0x99, MKK5_FCCA = 0x9A, - MKK6_MKKB = 0x89, /* Japan UNI-1 even + UNI-1 odd MKKB */ - MKK6_MKKA2 = 0x8A, /* Japan UNI-1 even + UNI-1 odd + MKKA2 */ - MKK6_MKKC = 0x8B, /* Japan UNI-1 even + UNI-1 odd + MKKC */ - - MKK7_MKKB = 0x8C, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + MKKB */ - MKK7_MKKA2 = 0x8D, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + MKKA2 */ - MKK7_MKKC = 0x8E, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + MKKC */ - - MKK8_MKKB = 0x8F, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + MKKB */ - MKK8_MKKA2 = 0x90, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + MKKA2 */ - MKK8_MKKC = 0x91, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + MKKC */ - - MKK14_MKKA1 = 0x92, /* Japan UNI-1 even + UNI-1 odd + 4.9GHz + MKKA1 */ - MKK15_MKKA1 = 0x93, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + 4.9GHz + MKKA1 */ - - MKK10_FCCA = 0xD0, /* Japan UNI-1 even + UNI-2 + 4.9GHz + FCCA */ - MKK10_MKKA1 = 0xD1, /* Japan UNI-1 even + UNI-2 + 4.9GHz + MKKA1 */ - MKK10_MKKC = 0xD2, /* Japan UNI-1 even + UNI-2 + 4.9GHz + MKKC */ - MKK10_MKKA2 = 0xD3, /* Japan UNI-1 even + UNI-2 + 4.9GHz + MKKA2 */ - - MKK11_MKKA = 0xD4, /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz + MKKA */ - MKK11_FCCA = 0xD5, /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz + FCCA */ - MKK11_MKKA1 = 0xD6, /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz + MKKA1 */ - MKK11_MKKC = 0xD7, /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz + MKKC */ - MKK11_MKKA2 = 0xD8, /* Japan UNI-1 even + UNI-2 + mid-band + 4.9GHz + MKKA2 */ - - MKK12_MKKA = 0xD9, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz + MKKA */ - MKK12_FCCA = 0xDA, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz + FCCA */ - MKK12_MKKA1 = 0xDB, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz + MKKA1 */ - MKK12_MKKC = 0xDC, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz + MKKC */ - MKK12_MKKA2 = 0xDD, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + 4.9GHz + MKKA2 */ - - MKK13_MKKB = 0xDE, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + mid-band + MKKB + All passive + no adhoc */ - - /* Following definitions are used only by s/w to map old - * Japan SKUs. - */ - MKK3_MKKA = 0xF0, /* Japan UNI-1 even + MKKA */ - MKK3_MKKA1 = 0xF1, /* Japan UNI-1 even + MKKA1 */ - MKK3_FCCA = 0xF2, /* Japan UNI-1 even + FCCA */ - MKK4_MKKA = 0xF3, /* Japan UNI-1 even + UNI-2 + MKKA */ - MKK4_MKKA1 = 0xF4, /* Japan UNI-1 even + UNI-2 + MKKA1 */ - MKK4_FCCA = 0xF5, /* Japan UNI-1 even + UNI-2 + FCCA */ - MKK9_MKKA = 0xF6, /* Japan UNI-1 even + 4.9GHz */ - MKK10_MKKA = 0xF7, /* Japan UNI-1 even + UNI-2 + 4.9GHz */ - MKK6_MKKA1 = 0xF8, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + MKKA1 */ - MKK6_FCCA = 0xF9, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + FCCA */ - MKK7_MKKA1 = 0xFA, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + MKKA1 */ - MKK7_FCCA = 0xFB, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + FCCA */ - MKK9_FCCA = 0xFC, /* Japan UNI-1 even + 4.9GHz + FCCA */ - MKK9_MKKA1 = 0xFD, /* Japan UNI-1 even + 4.9GHz + MKKA1 */ - MKK9_MKKC = 0xFE, /* Japan UNI-1 even + 4.9GHz + MKKC */ - MKK9_MKKA2 = 0xFF, /* Japan UNI-1 even + 4.9GHz + MKKA2 */ - - /* - * Regulator domains ending in a number (e.g. APL1, - * MK1, ETSI4, etc) apply to 5GHz channel and power - * information. Regulator domains ending in a letter - * (e.g. APLA, FCCA, etc) apply to 2.4GHz channel and - * power information. - */ - APL1 = 0x0150, /* LAT & Asia */ - APL2 = 0x0250, /* LAT & Asia */ - APL3 = 0x0350, /* Taiwan */ - APL4 = 0x0450, /* Jordan */ - APL5 = 0x0550, /* Chile */ - APL6 = 0x0650, /* Singapore */ - APL7 = 0x0750, /* Taiwan, disable ch52 */ - APL8 = 0x0850, /* Malaysia */ - APL9 = 0x0950, /* Korea. Before 11/2007. Now used only by APs */ - APL10 = 0x1050, /* Korea. After 11/2007. For STAs only */ - APL11 = 0x1150, /* Specific AP Customer 5GHz, For APs Only */ - APL12 = 0x1160, /* Kenya */ - - ETSI1 = 0x0130, /* Europe & others */ - ETSI2 = 0x0230, /* Europe & others */ - ETSI3 = 0x0330, /* Europe & others */ - ETSI4 = 0x0430, /* Europe & others */ - ETSI5 = 0x0530, /* Europe & others */ - ETSI6 = 0x0630, /* Europe & others */ - ETSI8 = 0x0830, /* Russia */ - ETSI9 = 0x0930, /* Ukraine */ - ETSIA = 0x0A30, /* France */ - ETSIB = 0x0B30, /* Israel */ - ETSIC = 0x0C30, /* Latin America */ - - FCC1 = 0x0110, /* US & others */ - FCC2 = 0x0120, /* Canada, Australia & New Zealand */ - FCC3 = 0x0160, /* US w/new middle band & DFS */ - FCC4 = 0x0165, /* US Public Safety */ + MKK6_MKKB = 0x89, + MKK6_MKKA2 = 0x8A, + MKK6_MKKC = 0x8B, + + MKK7_MKKB = 0x8C, + MKK7_MKKA2 = 0x8D, + MKK7_MKKC = 0x8E, + + MKK8_MKKB = 0x8F, + MKK8_MKKA2 = 0x90, + MKK8_MKKC = 0x91, + + MKK14_MKKA1 = 0x92, + MKK15_MKKA1 = 0x93, + + MKK10_FCCA = 0xD0, + MKK10_MKKA1 = 0xD1, + MKK10_MKKC = 0xD2, + MKK10_MKKA2 = 0xD3, + + MKK11_MKKA = 0xD4, + MKK11_FCCA = 0xD5, + MKK11_MKKA1 = 0xD6, + MKK11_MKKC = 0xD7, + MKK11_MKKA2 = 0xD8, + + MKK12_MKKA = 0xD9, + MKK12_FCCA = 0xDA, + MKK12_MKKA1 = 0xDB, + MKK12_MKKC = 0xDC, + MKK12_MKKA2 = 0xDD, + + MKK13_MKKB = 0xDE, + + MKK3_MKKA = 0xF0, + MKK3_MKKA1 = 0xF1, + MKK3_FCCA = 0xF2, + MKK4_MKKA = 0xF3, + MKK4_MKKA1 = 0xF4, + MKK4_FCCA = 0xF5, + MKK9_MKKA = 0xF6, + MKK10_MKKA = 0xF7, + MKK6_MKKA1 = 0xF8, + MKK6_FCCA = 0xF9, + MKK7_MKKA1 = 0xFA, + MKK7_FCCA = 0xFB, + MKK9_FCCA = 0xFC, + MKK9_MKKA1 = 0xFD, + MKK9_MKKC = 0xFE, + MKK9_MKKA2 = 0xFF, + + APL1 = 0x0150, + APL2 = 0x0250, + APL3 = 0x0350, + APL4 = 0x0450, + APL5 = 0x0550, + APL6 = 0x0650, + APL7 = 0x0750, + APL8 = 0x0850, + APL9 = 0x0950, + APL10 = 0x1050, + APL11 = 0x1150, + APL12 = 0x1160, + + ETSI1 = 0x0130, + ETSI2 = 0x0230, + ETSI3 = 0x0330, + ETSI4 = 0x0430, + ETSI5 = 0x0530, + ETSI6 = 0x0630, + ETSI8 = 0x0830, + ETSI9 = 0x0930, + ETSIA = 0x0A30, + ETSIB = 0x0B30, + ETSIC = 0x0C30, + + FCC1 = 0x0110, + FCC2 = 0x0120, + FCC3 = 0x0160, + FCC4 = 0x0165, FCC5 = 0x0510, - FCC6 = 0x0610, /* Canada & Australia */ + FCC6 = 0x0610, FCCA = 0x0A10, - APLD = 0x0D50, /* South Korea */ - - MKK1 = 0x0140, /* Japan (UNI-1 odd) */ - MKK2 = 0x0240, /* Japan (4.9 GHz + UNI-1 odd) */ - MKK3 = 0x0340, /* Japan (UNI-1 even) */ - MKK4 = 0x0440, /* Japan (UNI-1 even + UNI-2) */ - MKK5 = 0x0540, /* Japan (UNI-1 even + UNI-2 + mid-band) */ - MKK6 = 0x0640, /* Japan (UNI-1 odd + UNI-1 even) */ - MKK7 = 0x0740, /* Japan (UNI-1 odd + UNI-1 even + UNI-2 */ - MKK8 = 0x0840, /* Japan (UNI-1 odd + UNI-1 even + UNI-2 + mid-band) */ - MKK9 = 0x0940, /* Japan (UNI-1 even + 4.9 GHZ) */ - MKK10 = 0x0B40, /* Japan (UNI-1 even + UNI-2 + 4.9 GHZ) */ - MKK11 = 0x1140, /* Japan (UNI-1 even + UNI-2 + 4.9 GHZ) */ - MKK12 = 0x1240, /* Japan (UNI-1 even + UNI-2 + 4.9 GHZ) */ - MKK13 = 0x0C40, /* Same as MKK8 but all passive and no adhoc 11a */ - MKK14 = 0x1440, /* Japan UNI-1 even + UNI-1 odd + 4.9GHz */ - MKK15 = 0x1540, /* Japan UNI-1 even + UNI-1 odd + UNI-2 + 4.9GHz */ - MKKA = 0x0A40, /* Japan */ + APLD = 0x0D50, + + MKK1 = 0x0140, + MKK2 = 0x0240, + MKK3 = 0x0340, + MKK4 = 0x0440, + MKK5 = 0x0540, + MKK6 = 0x0640, + MKK7 = 0x0740, + MKK8 = 0x0840, + MKK9 = 0x0940, + MKK10 = 0x0B40, + MKK11 = 0x1140, + MKK12 = 0x1240, + MKK13 = 0x0C40, + MKK14 = 0x1440, + MKK15 = 0x1540, + MKKA = 0x0A40, MKKC = 0x0A50, NULL1 = 0x0198, @@ -307,643 +281,332 @@ enum EnumRd { DEBUG_REG_DMN = 0x01ff, }; -enum { /* conformance test limits */ +enum { FCC = 0x10, MKK = 0x40, ETSI = 0x30, -}; -/* - * The following are flags for different requirements per reg domain. - * These requirements are either inhereted from the reg domain pair or - * from the unitary reg domain if the reg domain pair flags value is - * 0 - */ - -enum { - NO_REQ = 0x00000000, - DISALLOW_ADHOC_11A = 0x00000001, - DISALLOW_ADHOC_11A_TURB = 0x00000002, - NEED_NFC = 0x00000004, - - ADHOC_PER_11D = 0x00000008, /* Start Ad-Hoc mode */ - ADHOC_NO_11A = 0x00000010, - - PUBLIC_SAFETY_DOMAIN = 0x00000020, /* public safety domain */ - LIMIT_FRAME_4MS = 0x00000040, /* 4msec limit on the frame length */ - - NO_HOSTAP = 0x00000080, /* No HOSTAP mode opereation */ - - REQ_MASK = 0x000000FF, /* Requirements bit mask */ + NO_CTL = 0xff }; static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { - {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, NO_REQ, NO_REQ, PSCAN_DEFER, - 0}, - {NULL1_WORLD, NULL1, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {NULL1_ETSIB, NULL1, ETSIB, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {NULL1_ETSIC, NULL1, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - - {FCC2_FCCA, FCC2, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC2_WORLD, FCC2, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC2_ETSIC, FCC2, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC3_FCCA, FCC3, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC3_WORLD, FCC3, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC3_ETSIC, FCC3, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC4_FCCA, FCC4, FCCA, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, - NO_REQ, PSCAN_DEFER, 0}, - {FCC5_FCCA, FCC5, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC6_FCCA, FCC6, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC6_WORLD, FCC6, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - - {ETSI1_WORLD, ETSI1, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI2_WORLD, ETSI2, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI3_WORLD, ETSI3, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI4_WORLD, ETSI4, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI5_WORLD, ETSI5, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI6_WORLD, ETSI6, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI8_WORLD, ETSI8, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {ETSI9_WORLD, ETSI9, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - - {ETSI3_ETSIA, ETSI3, WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {FRANCE_RES, ETSI3, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - - {FCC1_WORLD, FCC1, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {FCC1_FCCA, FCC1, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL1_WORLD, APL1, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL2_WORLD, APL2, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL2_FCCA, APL2, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL3_WORLD, APL3, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL4_WORLD, APL4, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL5_WORLD, APL5, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL6_WORLD, APL6, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL7_FCCA, APL7, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL8_WORLD, APL8, WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL9_MKKC, APL9, MKKC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL10_MKKC, APL10, MKKC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL3_FCCA, APL3, FCCA, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL1_ETSIC, APL1, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {APL2_ETSIC, APL2, ETSIC, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - - {MKK3_MKKA, MKK3, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKKA, CTRY_JAPAN25}, - {MKK3_MKKB, MKK3, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKKA | PSCAN_MKKA_G, CTRY_JAPAN7}, - {MKK3_MKKA1, MKK3, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN26}, - {MKK3_MKKA2, MKK3, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN8}, - {MKK3_MKKC, MKK3, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - NO_PSCAN, CTRY_JAPAN9}, - {MKK3_FCCA, MKK3, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - NO_PSCAN, CTRY_JAPAN27}, - - /* MKK4 */ - {MKK4_MKKA, MKK4, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN36}, - {MKK4_MKKB, MKK4, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3 | PSCAN_MKKA | PSCAN_MKKA_G, - CTRY_JAPAN10}, - {MKK4_MKKA1, MKK4, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN28}, - {MKK4_MKKA2, MKK4, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN11}, - {MKK4_MKKC, MKK4, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN12}, - {MKK4_FCCA, MKK4, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN29}, - - /* MKK5 */ -/* {MKK5_MKKA, MKK5, MKKA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN56 },*/ - {MKK5_MKKB, MKK5, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3 | PSCAN_MKKA | PSCAN_MKKA_G, - CTRY_JAPAN13}, - {MKK5_MKKA2, MKK5, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN14}, - {MKK5_MKKC, MKK5, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN15}, - {MKK5_FCCA, MKK5, FCCA, DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN56 }, - - {MKK9_MKKA, MKK9, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN34}, - {MKK9_FCCA, MKK9, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - NO_PSCAN, CTRY_JAPAN37}, - {MKK9_MKKA1, MKK9, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN38}, - {MKK9_MKKA2, MKK9, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN40}, - {MKK9_MKKC, MKK9, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - NO_PSCAN, CTRY_JAPAN39}, - - {MKK10_MKKA, MKK10, MKKA, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB | NEED_NFC | - LIMIT_FRAME_4MS, NEED_NFC, PSCAN_MKK3, CTRY_JAPAN35}, - {MKK10_FCCA, MKK10, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN41}, - {MKK10_MKKA1, MKK10, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN42}, - {MKK10_MKKA2, MKK10, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN44}, - {MKK10_MKKC, MKK10, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN43}, - - {MKK11_MKKA, MKK11, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN45}, - {MKK11_FCCA, MKK11, FCCA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN46}, - {MKK11_MKKA1, MKK11, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA1 | PSCAN_MKKA1_G, CTRY_JAPAN47}, - {MKK11_MKKA2, MKK11, MKKA, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3 | PSCAN_MKKA2 | PSCAN_MKKA2_G, CTRY_JAPAN49}, - {MKK11_MKKC, MKK11, MKKC, - DISALLOW_ADHOC_11A_TURB | NEED_NFC | LIMIT_FRAME_4MS, NEED_NFC, - PSCAN_MKK3, CTRY_JAPAN48}, - - {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, DISALLOW_ADHOC_11A_TURB, NO_REQ, - PSCAN_DEFER, 0}, - {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {EU1_WORLD, EU1_WORLD, EU1_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, - {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WORA_WORLD, WORA_WORLD, WORA_WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WORB_WORLD, WORB_WORLD, WORB_WORLD, - DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, 0}, - {WORC_WORLD, WORC_WORLD, WORC_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, 0}, + {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, + {NULL1_WORLD, NULL1, WORLD, 0}, + {NULL1_ETSIB, NULL1, ETSIB, 0}, + {NULL1_ETSIC, NULL1, ETSIC, 0}, + {FCC2_FCCA, FCC2, FCCA, 0}, + {FCC2_WORLD, FCC2, WORLD, 0}, + {FCC2_ETSIC, FCC2, ETSIC, 0}, + {FCC3_FCCA, FCC3, FCCA, 0}, + {FCC3_WORLD, FCC3, WORLD, 0}, + {FCC3_ETSIC, FCC3, ETSIC, 0}, + {FCC4_FCCA, FCC4, FCCA, 0}, + {FCC5_FCCA, FCC5, FCCA, 0}, + {FCC6_FCCA, FCC6, FCCA, 0}, + {FCC6_WORLD, FCC6, WORLD, 0}, + {ETSI1_WORLD, ETSI1, WORLD, 0}, + {ETSI2_WORLD, ETSI2, WORLD, 0}, + {ETSI3_WORLD, ETSI3, WORLD, 0}, + {ETSI4_WORLD, ETSI4, WORLD, 0}, + {ETSI5_WORLD, ETSI5, WORLD, 0}, + {ETSI6_WORLD, ETSI6, WORLD, 0}, + {ETSI8_WORLD, ETSI8, WORLD, 0}, + {ETSI9_WORLD, ETSI9, WORLD, 0}, + {ETSI3_ETSIA, ETSI3, WORLD, 0}, + {FRANCE_RES, ETSI3, WORLD, 0}, + {FCC1_WORLD, FCC1, WORLD, 0}, + {FCC1_FCCA, FCC1, FCCA, 0}, + {APL1_WORLD, APL1, WORLD, 0}, + {APL2_WORLD, APL2, WORLD, 0}, + {APL2_FCCA, APL2, FCCA, 0}, + {APL3_WORLD, APL3, WORLD, 0}, + {APL4_WORLD, APL4, WORLD, 0}, + {APL5_WORLD, APL5, WORLD, 0}, + {APL6_WORLD, APL6, WORLD, 0}, + {APL7_FCCA, APL7, FCCA, 0}, + {APL8_WORLD, APL8, WORLD, 0}, + {APL9_MKKC, APL9, MKKC, 0}, + {APL10_MKKC, APL10, MKKC, 0}, + {APL3_FCCA, APL3, FCCA, 0}, + {APL1_ETSIC, APL1, ETSIC, 0}, + {APL2_ETSIC, APL2, ETSIC, 0}, + {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, + {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, + {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, + {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, + {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, + {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, + {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, + {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, + {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, + {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, + {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, + {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, + {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, + {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, + {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, + {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, + {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, + {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, + {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, + {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, + {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, + {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, + {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, + {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, + {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, + {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, + {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, + {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, + {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, + {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, + {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, + + {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, + {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, + {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, + {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, + {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, + {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, + {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, + {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, + {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, + {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, + {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, + {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, + {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, }; static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { - {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA", YES, NO, YES, YES, YES, NO, - NO, NO, 7000}, - {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA", YES, NO, YES, YES, YES, NO, - NO, NO, 7000}, - {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA", YES, NO, NO, YES, YES, - YES, YES, YES, 7000}, - {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA", YES, NO, YES, YES, YES, - YES, NO, NO, 7000}, - {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN", YES, NO, YES, YES, YES, YES, - NO, NO, 7000}, - {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH", YES, NO, YES, YES, - YES, NO, NO, NO, 7000}, - {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA", YES, NO, - YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL", YES, NO, NO, YES, YES, YES, - YES, YES, 7000}, - {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM", YES, - YES, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_CHILE, APL6_WORLD, "CL", "CHILE", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_CHINA, APL1_WORLD, "CN", "CHINA", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA", YES, NO, YES, YES, - YES, YES, NO, NO, 7000}, - {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC", YES, - YES, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR", YES, NO, NO, YES, YES, YES, - NO, NO, 7000}, - {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT", YES, NO, YES, YES, YES, YES, - NO, NO, 7000}, - {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR", YES, NO, YES, YES, - YES, YES, NO, NO, 7000}, - {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND", YES, NO, YES, YES, YES, - YES, NO, NO, 7000}, - {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM", YES, NO, YES, YES, YES, YES, NO, - NO, 7000}, - {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_INDIA, APL6_WORLD, "IN", "INDIA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA", YES, NO, YES, YES, YES, - YES, NO, NO, 7000}, - {CTRY_IRAN, APL1_WORLD, "IR", "IRAN", YES, YES, YES, YES, YES, YES, YES, - YES, 7000}, - {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN", YES, NO, NO, YES, YES, - YES, NO, NO, 7000}, - {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55", YES, NO, NO, YES, YES, YES, - YES, NO, 7000 }, - {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56", YES, NO, NO, - YES, YES, YES, YES, NO, 7000 }, - {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN", YES, NO, YES, YES, - YES, NO, NO, NO, 7000}, - {CTRY_KENYA, APL1_WORLD, "KE", "KENYA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA", YES, NO, NO, YES, - NO, YES, NO, NO, 7000}, - {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC", YES, NO, NO, YES, - YES, YES, YES, YES, 7000}, - {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3", YES, NO, - NO, YES, NO, YES, NO, NO, 7000}, - {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN", YES, NO, YES, - YES, YES, YES, YES, YES, 7000}, - {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO", YES, NO, YES, - YES, YES, YES, YES, YES, 7000}, - {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA", YES, NO, NO, YES, YES, - YES, YES, YES, 7000}, - {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES", - YES, NO, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN", YES, NO, YES, YES, YES, YES, YES, - YES, 7000}, - {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA", YES, YES, - YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_PERU, FCC3_WORLD, "PE", "PERU", YES, NO, YES, YES, YES, YES, YES, - YES, 7000}, - {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_QATAR, APL1_WORLD, "QA", "QATAR", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA", YES, NO, YES, YES, - YES, YES, NO, NO, 7000}, - {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA", YES, NO, YES, - YES, YES, YES, YES, YES, 7000}, - {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA", YES, NO, YES, YES, YES, - YES, NO, NO, 7000}, - {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC", YES, NO, YES, - YES, YES, NO, NO, NO, 7000}, - {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN", YES, YES, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA", YES, YES, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO", YES, - NO, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA", YES, NO, YES, YES, YES, - YES, NO, NO, 7000}, - {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY", YES, NO, YES, YES, YES, YES, - NO, NO, 7000}, - {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA", YES, NO, NO, YES, YES, YES, - YES, YES, 7000}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE", YES, NO, NO, YES, YES, YES, - YES, NO, 7000}, - {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES", YES, NO, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM", YES, NO, YES, - YES, YES, YES, YES, YES, 7000}, - {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES", YES, YES, YES, - YES, YES, YES, YES, YES, 5825}, - {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2", YES, - YES, YES, YES, YES, YES, YES, YES, 7000}, - {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", - "UNITED STATES (PUBLIC SAFETY)", YES, YES, YES, YES, YES, YES, YES, - YES, 7000}, - {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY", YES, NO, YES, YES, YES, YES, - YES, YES, 7000}, - {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN", YES, YES, YES, YES, - YES, YES, YES, YES, 7000}, - {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIET NAM", YES, NO, YES, YES, YES, - YES, YES, YES, 7000}, - {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN", YES, NO, YES, YES, YES, NO, NO, - NO, 7000}, - {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE", YES, NO, YES, YES, YES, - NO, NO, NO, 7000} -}; - -/* Bit masks for DFS per regdomain */ - -enum { - NO_DFS = 0x0000000000000000ULL, - DFS_FCC3 = 0x0000000000000001ULL, - DFS_ETSI = 0x0000000000000002ULL, - DFS_MKK4 = 0x0000000000000004ULL, -}; - -/* The table of frequency bands is indexed by a bitmask. The ordering - * must be consistent with the enum below. When adding a new - * frequency band, be sure to match the location in the enum with the - * comments - */ - -/* regulatory capabilities */ -#define REGDMN_EEPROM_EEREGCAP_EN_KK_U1_EVEN 0x0080 -#define REGDMN_EEPROM_EEREGCAP_EN_KK_U2 0x0100 -#define REGDMN_EEPROM_EEREGCAP_EN_KK_MIDBAND 0x0200 -#define REGDMN_EEPROM_EEREGCAP_EN_KK_U1_ODD 0x0400 - -static const COMMON_MODE_POWER common_mode_pwrtbl[] = { - {4900, 5000, 17}, - {5000, 5100, 17}, - {5150, 5250, 17}, /* ETSI & MKK */ - {5250, 5350, 18}, /* ETSI */ - {5470, 5725, 20}, /* ETSI */ - {5725, 5825, 20}, /* Singapore */ - {5825, 5850, 23} /* Korea */ + {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, + {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, + {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, + {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, + {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, + {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, + {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, + {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, + {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, + {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, + {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, + {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, + {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, + {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, + {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, + {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, + {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, + {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, + {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, + {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, + {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, + {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, + {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, + {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, + {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, + {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, + {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, + {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, + {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, + {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, + {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, + {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, + {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, + {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, + {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, + {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, + {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, + {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, + {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, + {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, + {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, + {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, + {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, + {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, + {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, + {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, + {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, + {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, + {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, + {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, + {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, + {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, + {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, + {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, + {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, + {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, + {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, + {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, + {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, + {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, + {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, + {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, + {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, + {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, + {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, + {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, + {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, + {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, + {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, + {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, + {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, + {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, + {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, + {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, + {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, + {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, + {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, + {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, + {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, + {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, + {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, + {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, + {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, + {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, + {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, + {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, + {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, + {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, + {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, + {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, + {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, + {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, + {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, + {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, + {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, + {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, + {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, + {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, + {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, + {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, + {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, + {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, + {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, + {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, + {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, + {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, + {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, + {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, + {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, + {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, + {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, + {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, + {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, + {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, + {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, + {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, + {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, + {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, + {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, + {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, + {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, + {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, + {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, + {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, + {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, + {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, + {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, + {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, + {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, + {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, + {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, + {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, + {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, + {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, + {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, + {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, + {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, + {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, + {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, + {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, + {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, + {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, + {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, + {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, + {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, + {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, + {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, + {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, + {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, + {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, + {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, + {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, + {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, + {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, + {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, + {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, + {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, + {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} }; static const REG_DOMAIN ah_cmn_reg_domains[] = { - - {DEBUG_REG_DMN, FCC, DFS_FCC3}, - {APL1, FCC, NO_DFS}, - {APL2, FCC, NO_DFS}, - {APL3, FCC, DFS_FCC3}, - {APL4, FCC, NO_DFS}, - {APL5, FCC, NO_DFS}, - {APL6, ETSI, DFS_ETSI}, - {APL7, FCC, DFS_FCC3}, - {APL8, ETSI, NO_DFS}, - {APL9, ETSI, DFS_ETSI}, - {APL10, ETSI, DFS_ETSI}, - {APL11, ETSI, DFS_ETSI}, - {APL12, ETSI, DFS_ETSI}, - {ETSI1, ETSI, DFS_ETSI}, - {ETSI2, ETSI, DFS_ETSI}, - {ETSI3, ETSI, DFS_ETSI}, - {ETSI4, ETSI, DFS_ETSI}, - {ETSI5, ETSI, DFS_ETSI}, - {ETSI6, ETSI, DFS_ETSI}, - {ETSI8, ETSI, DFS_ETSI}, - {ETSI9, ETSI, DFS_ETSI}, - {FCC1, FCC, NO_DFS}, - {FCC2, FCC, NO_DFS}, - {FCC3, FCC, DFS_FCC3}, - {FCC4, FCC, DFS_FCC3}, - {FCC5, FCC, NO_DFS}, - {FCC6, FCC, DFS_FCC3}, - {MKK1, MKK, DFS_MKK4}, - {MKK2, MKK, DFS_MKK4}, - {MKK3, MKK, NO_DFS}, - {MKK4, MKK, DFS_MKK4}, - {MKK5, MKK, DFS_MKK4}, - {MKK6, MKK, NO_DFS}, - {MKK7, MKK, DFS_MKK4}, - {MKK8, MKK, DFS_MKK4}, - {MKK9, MKK, NO_DFS}, - {MKK10, MKK, DFS_MKK4}, - {MKK11, MKK, DFS_MKK4}, - {MKK12, MKK, DFS_MKK4}, - {MKK13, MKK, DFS_MKK4}, - {MKK14, MKK, DFS_MKK4}, - {MKK15, MKK, DFS_MKK4}, - {APLD, NO_CTL, NO_DFS}, - {ETSIA, NO_CTL, NO_DFS}, - {ETSIB, ETSI, NO_DFS}, - {ETSIC, ETSI, NO_DFS}, - {FCCA, FCC, NO_DFS}, - {MKKA, MKK, NO_DFS}, - {MKKC, MKK, NO_DFS}, - {WORLD, ETSI, NO_DFS}, - {WOR0_WORLD, NO_CTL, DFS_FCC3}, - {WOR01_WORLD, NO_CTL, DFS_FCC3}, - {WOR02_WORLD, NO_CTL, DFS_FCC3}, - {EU1_WORLD, NO_CTL, DFS_FCC3}, - {WOR1_WORLD, NO_CTL, DFS_FCC3}, - {WOR2_WORLD, NO_CTL, DFS_FCC3}, - {WOR3_WORLD, NO_CTL, DFS_FCC3}, - {WOR4_WORLD, NO_CTL, DFS_FCC3}, - {WOR5_ETSIC, NO_CTL, DFS_FCC3}, - {WOR9_WORLD, NO_CTL, DFS_FCC3}, - {WORA_WORLD, NO_CTL, DFS_FCC3}, - {WORB_WORLD, NO_CTL, DFS_FCC3}, - {WORC_WORLD, NO_CTL, DFS_FCC3}, - {NULL1, NO_CTL, NO_DFS}, + {DEBUG_REG_DMN, FCC}, + {APL1, FCC}, + {APL2, FCC}, + {APL3, FCC}, + {APL4, FCC}, + {APL5, FCC}, + {APL6, ETSI}, + {APL7, FCC}, + {APL8, ETSI}, + {APL9, ETSI}, + {APL10, ETSI}, + {APL11, ETSI}, + {APL12, ETSI}, + {ETSI1, ETSI}, + {ETSI2, ETSI}, + {ETSI3, ETSI}, + {ETSI4, ETSI}, + {ETSI5, ETSI}, + {ETSI6, ETSI}, + {ETSI8, ETSI}, + {ETSI9, ETSI}, + {FCC1, FCC}, + {FCC2, FCC}, + {FCC3, FCC}, + {FCC4, FCC}, + {FCC5, FCC}, + {FCC6, FCC}, + {MKK1, MKK}, + {MKK2, MKK}, + {MKK3, MKK}, + {MKK4, MKK}, + {MKK5, MKK}, + {MKK6, MKK}, + {MKK7, MKK}, + {MKK8, MKK}, + {MKK9, MKK}, + {MKK10, MKK}, + {MKK11, MKK}, + {MKK12, MKK}, + {MKK13, MKK}, + {MKK14, MKK}, + {MKK15, MKK}, + {APLD, NO_CTL}, + {ETSIA, NO_CTL}, + {ETSIB, ETSI}, + {ETSIC, ETSI}, + {FCCA, FCC}, + {MKKA, MKK}, + {MKKC, MKK}, + {WORLD, ETSI}, + {WOR0_WORLD, NO_CTL}, + {WOR01_WORLD, NO_CTL}, + {WOR02_WORLD, NO_CTL}, + {EU1_WORLD, NO_CTL}, + {WOR1_WORLD, NO_CTL}, + {WOR2_WORLD, NO_CTL}, + {WOR3_WORLD, NO_CTL}, + {WOR4_WORLD, NO_CTL}, + {WOR5_ETSIC, NO_CTL}, + {WOR9_WORLD, NO_CTL}, + {WORA_WORLD, NO_CTL}, + {WORB_WORLD, NO_CTL}, + {WORC_WORLD, NO_CTL}, + {NULL1, NO_CTL}, }; typedef enum offset { diff --git a/core/cds/src/cds_ieee80211_common_i.h b/core/cds/src/cds_ieee80211_common_i.h index 166c8e6ff737..e1ee02cd6e2c 100644 --- a/core/cds/src/cds_ieee80211_common_i.h +++ b/core/cds/src/cds_ieee80211_common_i.h @@ -28,14 +28,6 @@ #ifndef CDS_COMMON__IEEE80211_I_H_ #define CDS_COMMON__IEEE80211_I_H_ -/* These defines should match the table from ah_internal.h */ -typedef enum { - DFS_UNINIT_DOMAIN = 0, /* Uninitialized dfs domain */ - DFS_FCC_DOMAIN = 1, /* FCC3 dfs domain */ - DFS_ETSI_DOMAIN = 2, /* ETSI dfs domain */ - DFS_MKK4_DOMAIN = 3 /* Japan dfs domain */ -} HAL_DFS_DOMAIN; - /* XXX not really a mode; there are really multiple PHY's */ enum ieee80211_phymode { IEEE80211_MODE_AUTO = 0, /* autoselect */ diff --git a/core/wma/inc/wma_dfs_interface.h b/core/wma/inc/wma_dfs_interface.h index abb3490c4921..6887f11cff12 100644 --- a/core/wma/inc/wma_dfs_interface.h +++ b/core/wma/inc/wma_dfs_interface.h @@ -27,6 +27,8 @@ #include "ath_dfs_structs.h" #include +#include "cds_reg_service.h" +#include "cds_regdomain.h" #include "cds_ieee80211_common.h" #define IEEE80211_CHAN_MAX 255 @@ -258,7 +260,7 @@ typedef struct ieee80211com { int (*ic_dfs_control)(struct ieee80211com *ic, u_int id, void *indata, uint32_t insize, void *outdata, uint32_t *outsize); - HAL_DFS_DOMAIN current_dfs_regdomain; + enum HAL_DFS_DOMAIN current_dfs_regdomain; uint8_t vdev_id; uint8_t last_radar_found_chan; int32_t dfs_pri_multiplier; -- cgit v1.2.3 From 9d6b75d1a4d27995de2c9f7420d7c25940b13322 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Wed, 10 Feb 2016 12:17:23 +0530 Subject: qcacld-3.0: Downgrade WMM AC for data frames if BMPS disabled qcacld-2.0 to qcacld-3.0 propagation As per the current implementation STA is sending Vo tagged data after delTspec if BMPS disabled. To fix this issue, make wmmAcAccessAllowed to false in hdd_wmm_delts(). Change-Id: I2351a4fd463e0e80cc7aefa5485046eab491ce45 CRs-Fixed: 967685 --- core/hdd/src/wlan_hdd_wmm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 7c3e33f187cc..28e96fb7b299 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -2420,6 +2420,8 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle) */ pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcTspecValid = false; + pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed = + false; /* need to tell TL to stop trigger timer, etc */ hdd_wmm_disable_tl_uapsd(pQosContext); -- cgit v1.2.3 From 949eaa7aab04ba871d2418cdc37161128095233b Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Thu, 17 Dec 2015 18:43:52 -0800 Subject: qcacld-3.0: SAP DFS CAC Support in 80+80MHz mode Add support to perform CAC when SAP comes up in 160MHz or 80+80MHz with any of the 80MHz band is DFS band. Change-Id: If24d6cd325f747934195598ffe0f456eea939026 CRs-Fixed: 964262 --- core/mac/inc/sir_api.h | 1 + core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 24 ++++++++++++++++++---- core/sap/src/sap_fsm.c | 24 ++++++++++++++++++---- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 31ae9a21c696..56963efe916e 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3845,6 +3845,7 @@ typedef struct sSirChAvoidIndType { #endif /* FEATURE_WLAN_CH_AVOID || FEATURE_WLAN_FORCE_SAP_SCC */ #define SIR_DFS_MAX_20M_SUB_CH 8 +#define SIR_80MHZ_START_CENTER_CH_DIFF 6 typedef struct sSirSmeDfsChannelList { uint32_t nchannels; diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index bf4f3a6c3761..611161efe83c 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -225,6 +225,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf) uint8_t smesessionId; uint16_t smetransactionId; uint8_t channelId; + uint8_t send_bcon_ind = false; if (pMsgBuf == NULL) { PELOGE(lim_log(pMac, LOGE, FL("Buffer is Pointing to NULL"));) @@ -294,10 +295,25 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf) * request from upper layers to start the beacon transmission */ - if (LIM_IS_IBSS_ROLE(psessionEntry) || - (LIM_IS_AP_ROLE(psessionEntry) && - (cds_get_channel_state(channelId) != - CHANNEL_STATE_DFS))) { + if (!(LIM_IS_IBSS_ROLE(psessionEntry) || + (LIM_IS_AP_ROLE(psessionEntry)))) + return; + if (psessionEntry->ch_width == CH_WIDTH_160MHZ) { + send_bcon_ind = false; + } else if (psessionEntry->ch_width == CH_WIDTH_80P80MHZ) { + if ((cds_get_channel_state(channelId) != + CHANNEL_STATE_DFS) && + (cds_get_channel_state(psessionEntry-> + ch_center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) != + CHANNEL_STATE_DFS)) + send_bcon_ind = true; + } else { + if (cds_get_channel_state(channelId) != + CHANNEL_STATE_DFS) + send_bcon_ind = true; + } + if (send_bcon_ind) { /* Configure beacon and send beacons to HAL */ QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, FL("Start Beacon with ssid %s Ch %d"), diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index c4c53feb48fe..42fa493790bc 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -3433,6 +3433,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, tCsrRoamInfo *roam_info = (tCsrRoamInfo *) (sap_event->params); tSapDfsInfo *sap_dfs_info; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; + uint8_t is_dfs = false; if (msg == eSAP_MAC_START_BSS_SUCCESS) { /* @@ -3440,8 +3441,9 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * (both without substates) */ QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - FL("from state channel = %d %s => %s"), - sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED"); + FL("from state channel = %d %s => %s ch_width %d"), + sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED", + sap_ctx->ch_params.ch_width); sap_ctx->sapsMachine = eSAP_STARTED; /* Action code for transition */ @@ -3454,8 +3456,22 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx, * running, however, the AP is still not beaconing, until * CAC is done if the operating channel is DFS */ - if (CHANNEL_STATE_DFS == - cds_get_channel_state(sap_ctx->channel)) { + if (sap_ctx->ch_params.ch_width == CH_WIDTH_160MHZ) { + is_dfs = true; + } else if (sap_ctx->ch_params.ch_width == CH_WIDTH_80P80MHZ) { + if (cds_get_channel_state(sap_ctx->channel) == + CHANNEL_STATE_DFS || + cds_get_channel_state(sap_ctx-> + ch_params.center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + is_dfs = true; + } else { + if (cds_get_channel_state(sap_ctx->channel) == + CHANNEL_STATE_DFS) + is_dfs = true; + } + if (is_dfs) { sap_dfs_info = &mac_ctx->sap.SapDfsInfo; if ((false == sap_dfs_info->ignore_cac) && (eSAP_DFS_DO_NOT_SKIP_CAC == -- cgit v1.2.3 From 2111d3c9b620166b817c7130b08862693e50fb4d Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 3 Feb 2016 01:46:15 -0800 Subject: qcacld-3.0: SAP DFS-3 channel selection suppport for 80+80MHz/160MHz Add support for setting channel width for CSA and modify the SAP DFS channel width fallback algoritham to support DFS for 80+80Mhz and 160Mhz bandwidth. Also, compile out channel matrix restriction from channel selection process after radar indication is received for newer platforms and only compile for older platforms Change-Id: I771fc162b18aa1e485c513046a265b2d94612972 CRs-Fixed: 964262 --- Kbuild | 4 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 20 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 17 +- core/mac/src/pe/lim/lim_send_messages.c | 15 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 20 +- core/sap/src/sap_api_link_cntl.c | 18 +- core/sap/src/sap_fsm.c | 214 ++++++++++++++++----- core/sap/src/sap_module.c | 19 +- 8 files changed, 260 insertions(+), 67 deletions(-) diff --git a/Kbuild b/Kbuild index 8bf73d63cf82..0fad9cac9c9a 100755 --- a/Kbuild +++ b/Kbuild @@ -1206,8 +1206,10 @@ ifeq ($(CONFIG_WLAN_FEATURE_RX_WAKELOCK), y) CDEFINES += -DWLAN_FEATURE_HOLD_RX_WAKELOCK endif -#Enable Channel Matrix restriction for all targets +#Enable Channel Matrix restriction for all Rome only targets +ifneq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS))) CDEFINES += -DWLAN_ENABLE_CHNL_MATRIX_RESTRICTION +endif #features specific to mobile router use case ifeq ($(CONFIG_MOBILE_ROUTER), y) diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index e9abe6f2c933..a7be64004e85 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -582,6 +582,7 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, tSirMsgQ msg_buf; tpAddBssParams addbss_param = NULL; uint32_t retcode; + bool is_ch_dfs = false; /* Package WMA_ADD_BSS_REQ message parameters */ addbss_param = qdf_mem_malloc(sizeof(tAddBssParams)); @@ -673,8 +674,23 @@ lim_mlm_add_bss(tpAniSirGlobal mac_ctx, /* pass on the session persona to hal */ addbss_param->halPersona = session->pePersona; - addbss_param->bSpectrumMgtEnabled = session->spectrumMgtEnabled || - lim_isconnected_on_dfs_channel(mlm_start_req->channelNumber); + if (session->ch_width == CH_WIDTH_160MHZ) { + is_ch_dfs = true; + } else if (session->ch_width == CH_WIDTH_80P80MHZ) { + if (cds_get_channel_state(mlm_start_req->channelNumber) == + CHANNEL_STATE_DFS || + cds_get_channel_state(session->ch_center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } else { + if (cds_get_channel_state(mlm_start_req->channelNumber) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } + + addbss_param->bSpectrumMgtEnabled = + session->spectrumMgtEnabled || is_ch_dfs; addbss_param->extSetStaKeyParamValid = 0; addbss_param->dot11_mode = session->dot11mode; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index c3f2ad98622a..1d2058b81c5e 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -5665,6 +5665,15 @@ static void lim_process_sme_dfs_csa_ie_request(tpAniSirGlobal mac_ctx, session_entry->dfsIncludeChanWrapperIe = true; wider_bw_ch_switch->newChanWidth = WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ; + /* + * This is not applicable for 20/40/80 Mhz. + * Only used when we support 80+80 Mhz operation. + * In case of 80+80 Mhz, this parameter indicates + * center channel frequency index of 80 Mhz channel of + * frequency segment 1. + */ + wider_bw_ch_switch->newCenterChanFreq1 = + dfs_csa_ie_req->ch_params.center_freq_seg1; break; default: session_entry->dfsIncludeChanWrapperIe = false; @@ -5678,14 +5687,6 @@ static void lim_process_sme_dfs_csa_ie_request(tpAniSirGlobal mac_ctx, /* Fetch the center channel based on the channel width */ wider_bw_ch_switch->newCenterChanFreq0 = dfs_csa_ie_req->ch_params.center_freq_seg0; - /* - * This is not applicable for 20/40/80 Mhz.Only used when we support - * 80+80 Mhz operation. In case of 80+80 Mhz, this parameter indicates - * center channel frequency index of 80 Mhz channel of - * frequency segment 1. - */ - wider_bw_ch_switch->newCenterChanFreq1 = - dfs_csa_ie_req->ch_params.center_freq_seg1; skip_vht: /* Send CSA IE request from here */ if (sch_set_fixed_beacon_fields(mac_ctx, session_entry) != diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 1023060347d2..3c844b85c543 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -244,10 +244,21 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, lim_log(pMac, LOG2, FL("nss value: %d"), pChnlParams->nss); /*Set DFS flag for DFS channel */ - if (cds_get_channel_state(chnlNumber) == CHANNEL_STATE_DFS) + if (ch_width == CH_WIDTH_160MHZ) { pChnlParams->isDfsChannel = true; - else + } else if (ch_width == CH_WIDTH_80P80MHZ) { pChnlParams->isDfsChannel = false; + if (cds_get_channel_state(chnlNumber) == CHANNEL_STATE_DFS || + cds_get_channel_state(pChnlParams->ch_center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + pChnlParams->isDfsChannel = true; + } else { + if (cds_get_channel_state(chnlNumber) == CHANNEL_STATE_DFS) + pChnlParams->isDfsChannel = true; + else + pChnlParams->isDfsChannel = false; + } pChnlParams->restart_on_chan_switch = is_restart; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index fa2dcd3a0bce..9f9a145c42be 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2397,6 +2397,9 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac, tSirMsgQ mmhMsg; tpSwitchChannelParams pSmeSwithChnlParams; uint8_t channelId; + bool is_ch_dfs = false; + enum ch_width ch_width; + uint8_t ch_center_freq_seg1; pSmeSwithChnlParams = (tSwitchChannelParams *) qdf_mem_malloc(sizeof(tSwitchChannelParams)); @@ -2413,6 +2416,8 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac, sizeof(tSwitchChannelParams)); channelId = pSmeSwithChnlParams->channelNumber; + ch_width = pSmeSwithChnlParams->ch_width; + ch_center_freq_seg1 = pSmeSwithChnlParams->ch_center_freq_seg1; /* * Pass the sme sessionID to SME instead @@ -2432,7 +2437,20 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac, * upper layers to start the beacon transmission . */ - if (CHANNEL_STATE_DFS != cds_get_channel_state(channelId)) { + if (ch_width == CH_WIDTH_160MHZ) { + is_ch_dfs = true; + } else if (ch_width == CH_WIDTH_80P80MHZ) { + if (cds_get_channel_state(channelId) == CHANNEL_STATE_DFS || + cds_get_channel_state(ch_center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } else { + if (cds_get_channel_state(channelId) == CHANNEL_STATE_DFS) + is_ch_dfs = true; + } + + if (!is_ch_dfs) { if (channelId == psessionEntry->currentOperChannel) { lim_apply_configuration(pMac, psessionEntry); lim_send_beacon_ind(pMac, psessionEntry); diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c index 81713b077cce..78b71b4b0c3e 100644 --- a/core/sap/src/sap_api_link_cntl.c +++ b/core/sap/src/sap_api_link_cntl.c @@ -430,6 +430,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, { tWLAN_SAPEvent sap_event; QDF_STATUS qdf_status; + bool is_ch_dfs = false; /* * Channel change is successful. If the new channel is a DFS channel, * then we will to perform channel availability check for 60 seconds @@ -442,8 +443,23 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx, if (eSAP_DISCONNECTING != sap_ctx->sapsMachine) return; + if (sap_ctx->ch_params.ch_width == CH_WIDTH_160MHZ) { + is_ch_dfs = true; + } else if (sap_ctx->ch_params.ch_width == CH_WIDTH_80P80MHZ) { + if (cds_get_channel_state(sap_ctx->channel) == + CHANNEL_STATE_DFS || + cds_get_channel_state(sap_ctx->ch_params.center_freq_seg1 - + SIR_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } else { + if (cds_get_channel_state(sap_ctx->channel) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } + /* check if currently selected channel is a DFS channel */ - if (CHANNEL_STATE_DFS == cds_get_channel_state(sap_ctx->channel)) { + if (is_ch_dfs) { if ((false == mac_ctx->sap.SapDfsInfo.ignore_cac) && (eSAP_DFS_DO_NOT_SKIP_CAC == mac_ctx->sap.SapDfsInfo.cac_state)) { diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 42fa493790bc..44d8a8c5573f 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1078,6 +1078,8 @@ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, switch (ch_width) { /* VHT80 */ + case CH_WIDTH_160MHZ: + case CH_WIDTH_80P80MHZ: case CH_WIDTH_80MHZ: for (i = 0; i < MAX_80MHZ_BANDS; i++) { start_channel = bitmap->chanBondingSet[i].startChannel; @@ -1499,28 +1501,28 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channel list from bitmap */ if (ch_width != CH_WIDTH_20MHZ) { + bool flag = false; + uint8_t count = 0, new_160_startchannel = 0; + uint8_t index = 0, sec_seg_ch = 0; + uint8_t primary_seg_start_ch = 0; available_ch_cnt = sap_populate_available_channels(&channelBitmap, ch_width, availableChannels); + /* - * if no valid channel bonding found, + * If no valid channel bonding found, * fallback to lower bandwidth */ if (available_ch_cnt == 0) { - if (ch_width == CH_WIDTH_80MHZ) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_WARN, - FL - ("sapdfs:No 80MHz cb found, falling to 40MHz")); + if ((ch_width == CH_WIDTH_160MHZ) || + (ch_width == CH_WIDTH_80P80MHZ) || + (ch_width == CH_WIDTH_80MHZ)) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, - FL - ("sapdfs:Changing chanWidth from [%d] to [%d]"), - ch_width, - CH_WIDTH_40MHZ); + FL("sapdfs:Changing chanWidth from [%d] to 40Mhz"), + ch_width); ch_width = CH_WIDTH_40MHZ; - /* continue to start of do loop */ continue; } else if (ch_width == CH_WIDTH_40MHZ) { QDF_TRACE(QDF_MODULE_ID_SAP, @@ -1538,47 +1540,167 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) continue; } } - } - /* - * by now, available channels list will be populated or - * no channels are avaialbe - */ - if (available_ch_cnt) { - for (i = 0; i < available_ch_cnt; i++) { - if (CDS_IS_DFS_CH(availableChannels[i])) { - avail_dfs_chan_list[ - avail_dfs_chan_count++] = - availableChannels[i]; - } else { - avail_non_dfs_chan_list[ - avail_non_dfs_chan_count++] = - availableChannels[i]; + /* + * Number of channel count should be more than 8 to + * switch new channel in 160Mhz band + */ + if (((ch_width == CH_WIDTH_160MHZ) || + (ch_width == CH_WIDTH_80P80MHZ)) && + (available_ch_cnt < SIR_DFS_MAX_20M_SUB_CH)) { + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_WARN, + FL("sapdfs:Changing chanWidth from [%d] to [%d]"), + ch_width, CH_WIDTH_80MHZ); + ch_width = CH_WIDTH_80MHZ; + continue; + } + if (ch_width == CH_WIDTH_160MHZ) { + /* + * NA supports only 2 blocks for 160Mhz + * bandwidth i.e 36-64 & 100-128 and + * all the channels in these blocks are + * continuous and seperated by 4Mhz. + */ + for (i = 1; ((i < available_ch_cnt)); i++) { + if ((availableChannels[i] - + availableChannels[i-1]) == 4) + count++; + else + count = 0; + if (count == + SIR_DFS_MAX_20M_SUB_CH - 1) { + flag = true; + new_160_startchannel = + availableChannels[i-7]; + break; + } } + } else if (ch_width == CH_WIDTH_80P80MHZ) { + flag = true; } - } else { - QDF_TRACE(QDF_MODULE_ID_SAP, + if ((flag == false) && (ch_width > CH_WIDTH_80MHZ)) { + ch_width = CH_WIDTH_80MHZ; + continue; + } + + if (ch_width == CH_WIDTH_160MHZ) { + cds_rand_get_bytes(0, (uint8_t *)&random_byte, + 1); + random_byte = (random_byte + + qdf_mc_timer_get_system_ticks()) + % SIR_DFS_MAX_20M_SUB_CH; + pMac->sap.SapDfsInfo.new_chanWidth = ch_width; + target_channel = new_160_startchannel + + (random_byte * 4); + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, - FL("No target channel found")); - } + FL("sapdfs: New Channel width = %d"), + pMac->sap.SapDfsInfo.new_chanWidth); + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, + FL("sapdfs: target_channel = %d"), + target_channel); + + qdf_mem_free(tmp_ch_lst); + return target_channel; + } else if (ch_width == CH_WIDTH_80P80MHZ) { + cds_rand_get_bytes(0, + (uint8_t *)&random_byte, 1); + index = (random_byte + + qdf_mc_timer_get_system_ticks()) % + available_ch_cnt; + target_channel = availableChannels[index]; + index -= (index % 4); + primary_seg_start_ch = availableChannels[index]; + + /* reset channels associate with primary 80Mhz */ + for (i = 0; i < 4; i++) + availableChannels[i + index] = 0; + /* + * select and calculate center frequency for + * secondary segement + */ + for (i = 0; i < available_ch_cnt / 4; i++) { + if (availableChannels[i * 4] && + (abs(primary_seg_start_ch - + availableChannels[i * 4]) > + (SIR_DFS_MAX_20M_SUB_CH * 2))) { + + sec_seg_ch = + availableChannels[i * 4] + + SIR_80MHZ_START_CENTER_CH_DIFF; + + break; + } + } + if (!sec_seg_ch && + (available_ch_cnt == + SIR_DFS_MAX_20M_SUB_CH)) + ch_width = CH_WIDTH_160MHZ; + else if (!sec_seg_ch) + ch_width = CH_WIDTH_80MHZ; - cds_rand_get_bytes(0, (uint8_t *)&random_byte, 1); - - /* Give preference to non-DFS channel */ - if (!pMac->f_prefer_non_dfs_on_radar) { - i = (random_byte + qdf_mc_timer_get_system_ticks()) % - available_ch_cnt; - target_channel = availableChannels[i]; - } else if (avail_non_dfs_chan_count) { - i = (random_byte + qdf_mc_timer_get_system_ticks()) % - avail_non_dfs_chan_count; - target_channel = avail_non_dfs_chan_list[i]; - } else { - i = (random_byte + qdf_mc_timer_get_system_ticks()) % - avail_dfs_chan_count; - target_channel = avail_dfs_chan_list[i]; - } + pMac->sap.SapDfsInfo.new_ch_params.center_freq_seg1 + = sec_seg_ch; + pMac->sap.SapDfsInfo.new_chanWidth = ch_width; + + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, + FL("sapdfs: New Channel width = %d"), + pMac->sap.SapDfsInfo.new_chanWidth); + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, + FL("sapdfs: New Center Freq Seg1 = %d"), + sec_seg_ch); + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, + FL("sapdfs: target_channel = %d"), + target_channel); + + qdf_mem_free(tmp_ch_lst); + return target_channel; + } + /* + * by now, available channels list will be populated or + * no channels are avaialbe + */ + if (available_ch_cnt) { + for (i = 0; i < available_ch_cnt; i++) { + if (CDS_IS_DFS_CH(availableChannels[i])) { + avail_dfs_chan_list[ + avail_dfs_chan_count++] = + availableChannels[i]; + } else { + avail_non_dfs_chan_list[ + avail_non_dfs_chan_count++] = + availableChannels[i]; + } + } + } else { + QDF_TRACE(QDF_MODULE_ID_SAP, + QDF_TRACE_LEVEL_INFO_LOW, + FL("No target channel found")); + } + + cds_rand_get_bytes(0, (uint8_t *)&random_byte, 1); + + /* Give preference to non-DFS channel */ + if (!pMac->f_prefer_non_dfs_on_radar) { + i = (random_byte + qdf_mc_timer_get_system_ticks()) % + available_ch_cnt; + target_channel = availableChannels[i]; + } else if (avail_non_dfs_chan_count) { + i = (random_byte + qdf_mc_timer_get_system_ticks()) % + avail_non_dfs_chan_count; + target_channel = avail_non_dfs_chan_list[i]; + } else { + i = (random_byte + qdf_mc_timer_get_system_ticks()) % + avail_dfs_chan_count; + target_channel = avail_dfs_chan_list[i]; + } + } pMac->sap.SapDfsInfo.new_chanWidth = ch_width; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 9961c6610168..07fd12772816 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2279,7 +2279,7 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) void *hHal = NULL; tpAniSirGlobal mac_ctx = NULL; eCsrPhyMode phy_mode; - struct ch_params_s ch_params; + struct ch_params_s *ch_params; sapContext = (ptSapContext) pSapCtx; if (NULL == sapContext) { @@ -2302,16 +2302,16 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel) * because we've implemented channel width fallback mechanism for DFS * which will result in channel width changing dynamically. */ - ch_params.ch_width = mac_ctx->sap.SapDfsInfo.new_chanWidth; - sme_set_ch_params(hHal, phy_mode, target_channel, 0, &ch_params); - sapContext->ch_params.ch_width = ch_params.ch_width; + ch_params = &mac_ctx->sap.SapDfsInfo.new_ch_params; + sme_set_ch_params(hHal, phy_mode, target_channel, 0, ch_params); + sapContext->ch_params.ch_width = ch_params->ch_width; /* Update the channel as this will be used to * send event to supplicant */ sapContext->channel = target_channel; - sapContext->csr_roamProfile.ch_params.ch_width = ch_params.ch_width; + sapContext->csr_roamProfile.ch_params.ch_width = ch_params->ch_width; qdf_ret_status = sme_roam_channel_change_req(hHal, sapContext->bssid, - &ch_params, &sapContext->csr_roamProfile); + ch_params, &sapContext->csr_roamProfile); if (qdf_ret_status == QDF_STATUS_SUCCESS) { sap_signal_hdd_event(sapContext, NULL, @@ -2430,6 +2430,13 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) } pMac = PMAC_STRUCT(hHal); + pMac->sap.SapDfsInfo.new_ch_params.ch_width = + pMac->sap.SapDfsInfo.new_chanWidth; + + sme_set_ch_params(hHal, sapContext->csr_roamProfile.phyMode, + pMac->sap.SapDfsInfo.target_channel, 0, + &pMac->sap.SapDfsInfo.new_ch_params); + qdf_ret_status = sme_roam_csa_ie_request(hHal, sapContext->bssid, pMac->sap.SapDfsInfo.target_channel, -- cgit v1.2.3 From bf673e7258c82588d9a0412d21ff827375d8c764 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Tue, 19 Jan 2016 16:05:40 -0800 Subject: qcacld-3.0: Add support for SAP DFS-3 160MHz, 80+80MHz NOL Add support for DFS Master mode NOL channel blacklisting. In 80+80MHz mode add only the channels to NOL based on the segment id on which radar has been detected and in 160MHz add all or only DFS channels skipping the Non-DFS channels, part of the 160MHz bond. Acked-by: Rakesh Sunki Change-Id: Ie56d14b17997a86e12eacd0ea86cf1742899feb4 CRs-Fixed: 964262 --- core/wma/inc/wma.h | 3 ++ core/wma/src/wma_features.c | 68 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 07486eec7d55..062faaa6e035 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -355,6 +355,9 @@ #define WMA_VHT_PPS_DELIM_CRC_FAIL 3 #define WMA_DFS_MAX_20M_SUB_CH 8 +#define WMA_80MHZ_START_CENTER_CH_DIFF 6 +#define WMA_160MHZ_START_CENTER_CH_DIFF 14 +#define WMA_NEXT_20MHZ_START_CH_DIFF 4 #define WMA_DEFAULT_HW_MODE_INDEX 0xFFFF diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 2e1f65d37247..c0f502f47d1d 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1586,6 +1586,7 @@ static int wma_unified_dfs_radar_rx_event_handler(void *handle, int is_hw_chirp = 0; int is_sw_chirp = 0; int is_pri = 0; + bool is_ch_dfs = false; WMI_DFS_RADAR_EVENTID_param_tlvs *param_tlvs; wmi_dfs_radar_event_fixed_param *radar_event; @@ -1627,7 +1628,19 @@ static int wma_unified_dfs_radar_rx_event_handler(void *handle, return 0; } - if (CHANNEL_STATE_DFS != cds_get_channel_state(chan->ic_ieee)) { + if (IEEE80211_IS_CHAN_11AC_VHT160(chan)) { + is_ch_dfs = true; + } else if (IEEE80211_IS_CHAN_11AC_VHT80P80(chan)) { + if (cds_get_channel_state(chan->ic_ieee) == CHANNEL_STATE_DFS || + cds_get_channel_state(chan->ic_ieee_ext - + WMA_80MHZ_START_CENTER_CH_DIFF) == + CHANNEL_STATE_DFS) + is_ch_dfs = true; + } else { + if (cds_get_channel_state(chan->ic_ieee) == CHANNEL_STATE_DFS) + is_ch_dfs = true; + } + if (!is_ch_dfs) { WMA_LOGE ("%s: Invalid DFS Phyerror event. Channel=%d is Non-DFS", __func__, chan->ic_ieee); @@ -6132,13 +6145,9 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel( dfs_ic->ic_curchan->ic_ieee_ext = ext_channel; /* verify both the 80MHz are DFS bands or not */ - if ((CHANNEL_STATE_DFS == - cds_get_bonded_channel_state(req->chan , - CH_WIDTH_80MHZ)) && - (CHANNEL_STATE_DFS == - cds_get_bonded_channel_state( - ext_channel - 6 , - CH_WIDTH_80MHZ))) + if (CHANNEL_STATE_DFS == cds_get_channel_state(req->chan) && + CHANNEL_STATE_DFS == cds_get_channel_state(ext_channel - + WMA_80MHZ_START_CENTER_CH_DIFF)) dfs_ic->ic_curchan->ic_80p80_both_dfs = true; break; case CH_WIDTH_160MHZ: @@ -6202,10 +6211,51 @@ int wma_get_channels(struct dfs_ieee80211_channel *ichan, struct wma_dfs_radar_channel_list *chan_list) { uint8_t center_chan = cds_freq_to_chan(ichan->ic_vhtop_ch_freq_seg1); + int count = 0; + int start_channel = 0; + int loop; chan_list->nchannels = 0; - if (IEEE80211_IS_CHAN_11AC_VHT80(ichan)) { + if (IEEE80211_IS_CHAN_11AC_VHT160(ichan)) { + /* + * In 160MHz channel width, need to + * check if each of the 8 20MHz channel + * is DFS before adding to the NOL list. + * As it is possible that part of the + * 160MHz can be Non-DFS channels. + */ + start_channel = center_chan - WMA_160MHZ_START_CENTER_CH_DIFF; + for (loop = 0; loop < WMA_DFS_MAX_20M_SUB_CH; loop++) { + if (cds_get_channel_state(start_channel + + (loop * WMA_NEXT_20MHZ_START_CH_DIFF)) == + CHANNEL_STATE_DFS) { + chan_list->channels[count] = start_channel + + (loop * WMA_NEXT_20MHZ_START_CH_DIFF); + count++; + } + } + chan_list->nchannels = count; + } else if (IEEE80211_IS_CHAN_11AC_VHT80P80(ichan)) { + chan_list->nchannels = 4; + /* + * If SAP is operating in 80p80 mode, either + * one of the two 80 segments or both the 80 + * segments can be DFS channels, so need to + * identify on which 80 segment radar has + * been detected and only add those channels + * to the NOL list. center frequency should be + * based on the segment id passed as part of + * channel information in radar indication. + */ + if (ichan->ic_radar_found_segid == DFS_80P80_SEG1) + center_chan = + cds_freq_to_chan(ichan->ic_vhtop_ch_freq_seg2); + chan_list->channels[0] = center_chan - 6; + chan_list->channels[1] = center_chan - 2; + chan_list->channels[2] = center_chan + 2; + chan_list->channels[3] = center_chan + 6; + } else if (IEEE80211_IS_CHAN_11AC_VHT80(ichan)) { chan_list->nchannels = 4; chan_list->channels[0] = center_chan - 6; chan_list->channels[1] = center_chan - 2; -- cgit v1.2.3 From 575ff115409572bc4ebd54fca346b3200fdcbe10 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Thu, 14 Apr 2016 02:13:13 -0700 Subject: Release 5.0.0.6G Release 5.0.0.6G Change-Id: Ia8f15633bf15406cd628d86f7c17c4b176bf67aa CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index cebc96d22100..2a972614bf96 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "GG" -#define QWLAN_VERSION_BUILD 5 +#define QWLAN_VERSION_EXTRA "G" +#define QWLAN_VERSION_BUILD 6 -#define QWLAN_VERSIONSTR "5.1.0.5GG" +#define QWLAN_VERSIONSTR "5.1.0.6G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 333a995e90a8f19b2acefe1ed4bfd17633213253 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Tue, 1 Mar 2016 15:40:23 -0800 Subject: qcacld-3.0: Enable Tx LDPC by default Enable Tx LDPC by default. Change-Id: I5d276dbf40b8f85cedcf19be0aff5de2809661ea CRs-Fixed: 983920 --- core/hdd/inc/wlan_hdd_cfg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index bff10f57000a..4c1e182e3df5 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -1728,7 +1728,7 @@ typedef enum { #define CFG_TX_LDPC_ENABLE_FEATURE "gTxLdpcEnable" #define CFG_TX_LDPC_ENABLE_FEATURE_MIN (0) #define CFG_TX_LDPC_ENABLE_FEATURE_MAX (3) -#define CFG_TX_LDPC_ENABLE_FEATURE_DEFAULT (0) +#define CFG_TX_LDPC_ENABLE_FEATURE_DEFAULT (3) /* * Enable / Disable MCC Adaptive Scheduler feature -- cgit v1.2.3 From 9206a4ef778f1355141e9490321fb4ac2acc70bb Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Tue, 19 Jan 2016 17:23:13 -0800 Subject: qcacld-3.0: Update cfg80211_vendor_event_alloc for Kernel upgrade Commit: 6c09e79 ("cfg80211: Allow NL80211_ATTR_IFINDEX to be added to vendor events") This commit add parameter wdev to cfg80211_vendor_event_alloc(), that would be used to check at __cfg80211_alloc_vendor_skb() to assign ifindex to the skb and is merged in Kernel 4.1, so add a kernel version macro to support this Also merge the hdd_vendor_put_ifindex into cfg80211_vendor_event_alloc to assign the ifindex when wdev is given, that way we can unify the interface. Change-Id: I321e12bfe3f9160a8a0fcfeb2408f6336d50e2c5 CRs-fixed: 964291 --- core/hdd/src/wlan_hdd_cfg80211.c | 9 +-------- core/hdd/src/wlan_hdd_cfg80211.h | 27 +++++++++++++++++++++++++-- core/hdd/src/wlan_hdd_scan.c | 34 +--------------------------------- core/hdd/src/wlan_hdd_scan.h | 2 -- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index b4686cc65cde..3c39a1d07880 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1658,7 +1658,7 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(hdd_adapter_t *adapter) uint16_t ch_width; vendor_event = cfg80211_vendor_event_alloc(hdd_ctx->wiphy, - NULL, + &(adapter->wdev), 4 * sizeof(u8) + 1 * sizeof(u16) + 4 + NLMSG_HDRLEN, QCA_NL80211_VENDOR_SUBCMD_DO_ACS_INDEX, GFP_KERNEL); @@ -1668,13 +1668,6 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(hdd_adapter_t *adapter) return; } - ret_val = hdd_vendor_put_ifindex(vendor_event, adapter->dev->ifindex); - if (ret_val) { - hddLog(LOGE, FL("NL80211_ATTR_IFINDEX put fail")); - kfree_skb(vendor_event); - return; - } - ret_val = nla_put_u8(vendor_event, QCA_WLAN_VENDOR_ATTR_ACS_PRIMARY_CHANNEL, sap_cfg->acs_cfg.pri_ch); diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index eaa82bedf5dc..3b0cdbf2855e 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -2390,14 +2390,37 @@ static inline int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter); -#if !(defined (SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) +#if !(defined (SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && \ + !(defined(WITH_BACKPORTS)) + static inline struct sk_buff * backported_cfg80211_vendor_event_alloc(struct wiphy *wiphy, struct wireless_dev *wdev, int approxlen, int event_idx, gfp_t gfp) { - return cfg80211_vendor_event_alloc(wiphy, approxlen, event_idx, gfp); + struct sk_buff *skb; + + skb = cfg80211_vendor_event_alloc(wiphy, approxlen, event_idx, gfp); + + if (skb && wdev) { + struct nlattr *attr; + u32 ifindex = wdev->netdev->ifindex; + + nla_nest_cancel(skb, ((void **)skb->cb)[2]); + if (nla_put_u32(skb, NL80211_ATTR_IFINDEX, ifindex)) + goto nla_fail; + + attr = nla_nest_start(skb, NL80211_ATTR_VENDOR_DATA); + ((void **)skb->cb)[2] = attr; + } + + return skb; + +nla_fail: + kfree_skb(skb); + return NULL; } #define cfg80211_vendor_event_alloc backported_cfg80211_vendor_event_alloc #endif diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 8898fa862fe4..0ac1785a6ac9 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1017,7 +1017,7 @@ static void hdd_vendor_scan_callback(hdd_adapter_t *adapter, qdf_mem_free(req); return; } - skb = cfg80211_vendor_event_alloc(hddctx->wiphy, NULL, + skb = cfg80211_vendor_event_alloc(hddctx->wiphy, &(adapter->wdev), SCAN_DONE_EVENT_BUF_SIZE + 4 + NLMSG_HDRLEN, QCA_NL80211_VENDOR_SUBCMD_SCAN_DONE_INDEX, GFP_KERNEL); @@ -1028,9 +1028,6 @@ static void hdd_vendor_scan_callback(hdd_adapter_t *adapter, return; } - if (0 != hdd_vendor_put_ifindex(skb, adapter->dev->ifindex)) - goto nla_put_failure; - cookie = (uintptr_t)req; attr = nla_nest_start(skb, QCA_WLAN_VENDOR_ATTR_SCAN_SSIDS); @@ -1678,12 +1675,6 @@ static int wlan_hdd_send_scan_start_event(struct wiphy *wiphy, return -ENOMEM; } - ret = hdd_vendor_put_ifindex(skb, wdev->netdev->ifindex); - if (ret) { - kfree_skb(skb); - return -EINVAL; - } - if (nla_put_u64(skb, QCA_WLAN_VENDOR_ATTR_SCAN_COOKIE, cookie)) { kfree_skb(skb); return -EINVAL; @@ -2410,29 +2401,6 @@ int wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy, } #endif /*FEATURE_WLAN_SCAN_PNO */ -/** - * hdd_vendor_put_ifindex() -send interface index - * @skb: buffer pointer - * @ifindex: interface index - * - * Send the IF index to differentiate the events on each interface - * Return: 0 for success, non zero for failure - */ -int hdd_vendor_put_ifindex(struct sk_buff *skb, int ifindex) -{ - struct nlattr *attr; - - nla_nest_cancel(skb, ((void **)skb->cb)[2]); - if (nla_put_u32(skb, NL80211_ATTR_IFINDEX, ifindex)) - return -EINVAL; - - attr = nla_nest_start(skb, NL80211_ATTR_VENDOR_DATA); - ((void **)skb->cb)[2] = attr; - - return 0; -} - - /** * hdd_cleanup_scan_queue() - remove entries in scan queue * diff --git a/core/hdd/src/wlan_hdd_scan.h b/core/hdd/src/wlan_hdd_scan.h index 5466d4a7cf86..8b1d7489d80f 100644 --- a/core/hdd/src/wlan_hdd_scan.h +++ b/core/hdd/src/wlan_hdd_scan.h @@ -67,8 +67,6 @@ int wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, struct wireless_dev *wdev, const void *data, int data_len); -int hdd_vendor_put_ifindex(struct sk_buff *skb, int ifindex); void hdd_cleanup_scan_queue(hdd_context_t *hdd_ctx); - #endif /* end #if !defined(WLAN_HDD_SCAN_H) */ -- cgit v1.2.3 From 02a4d7c4afe6742767f26d8250293d7e52975540 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Thu, 14 Apr 2016 17:46:54 +0530 Subject: qcacld-3.0: CL 1463814 update fw common interface files adding wmi cmd for setting BT paging and WLAN P2P/STA/SAP sched interval. Change-Id: I07b885d726c12d8a9e7e8b179ad427b24a2f5db8 CRs-Fixed: 865207 --- target/inc/wmi_tlv_defs.h | 9 ++++++++- target/inc/wmi_unified.h | 19 +++++++++++++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 0c24a659840c..007beaed45eb 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -687,6 +687,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_pdev_hw_mode_transition_event_fixed_param, WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_vdev_mac_entry, WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param, + WMITLV_TAG_STRUC_WMI_COEX_CONFIG_CMD_fixed_param, } WMITLV_TAG_ID; /* @@ -962,7 +963,8 @@ typedef enum { OP(WMI_PDEV_SET_HW_MODE_CMDID) \ OP(WMI_PDEV_SET_MAC_CONFIG_CMDID) \ OP(WMI_PDEV_SET_ANTENNA_MODE_CMDID) \ - OP(WMI_VDEV_SET_QUIET_MODE_CMDID) + OP(WMI_VDEV_SET_QUIET_MODE_CMDID) \ + OP(WMI_COEX_CONFIG_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -2443,6 +2445,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_NLO_CONFIGURE_MAWC_CMDID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_extscan_configure_mawc_cmd_fixed_param, wmi_extscan_configure_mawc_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_EXTSCAN_CONFIGURE_MAWC_CMDID); +/* COEX config cmd */ +#define WMITLV_TABLE_WMI_COEX_CONFIG_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_WMI_COEX_CONFIG_CMD_fixed_param, WMI_COEX_CONFIG_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_COEX_CONFIG_CMDID); + /* bpf offload capability get cmd */ #define WMITLV_TABLE_WMI_BPF_GET_CAPABILITY_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_bpf_get_capability_cmd_fixed_param, wmi_bpf_get_capability_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 9c31e1c9e903..515d6c897544 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -858,6 +858,7 @@ typedef enum { WMI_MODEM_POWER_STATE_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_COEX), WMI_CHAN_AVOID_UPDATE_CMDID, + WMI_COEX_CONFIG_CMDID, /** * OBSS scan offload enable/disable commands @@ -14969,6 +14970,24 @@ typedef struct { A_UINT32 ofdm_level; } wmi_ani_ofdm_event_fixed_param; +typedef enum wmi_coex_config_type { + /* config interval (arg1 BT, arg2 WLAN) for P2P + PAGE */ + WMI_COEX_CONFIG_PAGE_P2P_TDM = 1, + /* config interval (arg1 BT, arg2 WLAN) for STA + PAGE */ + WMI_COEX_CONFIG_PAGE_STA_TDM = 2, + /* config interval (arg1 BT, arg2 WLAN) for SAP + PAGE */ + WMI_COEX_CONFIG_PAGE_SAP_TDM = 3, +} WMI_COEX_CONFIG_TYPE; + +typedef struct { + A_UINT32 tlv_header; + A_UINT32 vdev_id; + /* wmi_coex_config_type enum */ + A_UINT32 config_type; + A_UINT32 config_arg1; + A_UINT32 config_arg2; +} WMI_COEX_CONFIG_CMD_fixed_param; + /* ADD NEW DEFS HERE */ /***************************************************************************** diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 3e79cf5d8762..2bfa29567a4c 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 210 +#define __WMI_REVISION_ 211 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 8fd1bfd9f5c6807660d8edb16290d3f494865169 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Tue, 8 Mar 2016 11:06:50 +0530 Subject: qcacld-3.0: CL 1464702 update fw common interface files New events required for moving TDLS connection tracker to host. Change-Id: Icca87b3b3441fb126811d792ee59cebe14e0d462 CRs-Fixed: 865207 --- target/inc/wmi_services.h | 1 + target/inc/wmi_unified.h | 23 +++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index 4ab82d040e98..059f59d94b97 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -160,6 +160,7 @@ typedef enum { * - WMI_VDEV_SET_DSCP_TID_MAP_CMDID (vs. WMI_VDEV_SET_WMM_PARAMS_CMDID) */ WMI_SERVICE_DEPRECATED_REPLACE, + WMI_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE, /* FW supports a new mode that allows to run connection tracker in host */ WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 515d6c897544..52de40df1fda 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -3702,6 +3702,11 @@ typedef enum { /** for pausing AP vdev when all the connected clients are in PS. only vdev_map is valid */ PAUSE_TYPE_IBSS_PS = 0x8, /** for pausing IBSS vdev when all the peers are in PS. only vdev_map is valid */ + PAUSE_TYPE_CHOP_TDLS_OFFCHAN = 0x9, + /* + * for TDLS offchannel MCC (switch channel), only vdev_map is valid, + * TDLS connection tracker needs to be notified + */ PAUSE_TYPE_HOST = 0x15, /** host is requesting vdev pause */ } wmi_tx_pause_type; @@ -9434,6 +9439,8 @@ enum wmi_tdls_state { WMI_TDLS_ENABLE_ACTIVE, /* TDLS enabled - firmware waits for peer mac for connection tracking */ WMI_TDLS_ENABLE_ACTIVE_EXTERNAL_CONTROL, + /** TDLS enabled - TDLS connection tracking is done in host */ + WMI_TDLS_ENABLE_CONNECTION_TRACKER_IN_HOST, }; /* TDLS Options */ @@ -9682,6 +9689,8 @@ enum wmi_tdls_peer_notification { WMI_TDLS_SHOULD_TEARDOWN, /** tx peer TDLS link tear down complete */ WMI_TDLS_PEER_DISCONNECTED, + /** TDLS/BT role change notification for connection tracker */ + WMI_TDLS_CONNECTION_TRACKER_NOTIFICATION, }; enum wmi_tdls_peer_reason { @@ -9699,6 +9708,20 @@ enum wmi_tdls_peer_reason { WMI_TDLS_TEARDOWN_REASON_BAD_PTR, /** tdls peer not responding */ WMI_TDLS_TEARDOWN_REASON_NO_RESPONSE, + /* + * tdls entered buffer STA role, TDLS connection tracker + * needs to handle this + */ + WMI_TDLS_ENTER_BUF_STA, + /* + * tdls exited buffer STA role, TDLS connection tracker + * needs to handle this + */ + WMI_TDLS_EXIT_BUF_STA, + /* BT entered busy mode, TDLS connection tracker needs to handle this */ + WMI_TDLS_ENTER_BT_BUSY_MODE, + /** BT exited busy mode, TDLS connection tracker needs to handle this */ + WMI_TDLS_EXIT_BT_BUSY_MODE, }; /* WMI_TDLS_PEER_EVENTID */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 2bfa29567a4c..32f4dd42958c 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 211 +#define __WMI_REVISION_ 212 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From f9bde8477f834767d6da579b57d669dc3463017f Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Thu, 3 Mar 2016 19:03:02 +0530 Subject: qcacld-3.0: CL 1465726 update fw common interface files qcacld-2.0 to qcacld-3.0 propagation. add fields to WMI pdev LED config cmd to specify blink parameters Change-Id: Icd3cf8df3f5af6eed4c7263de641a61e3560b4fc CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 22 ++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 52de40df1fda..0204b452c853 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -10259,6 +10259,21 @@ typedef enum { WMI_CONFIG_LED_ENABLE = 1, } wmi_config_led_enable_flag; +typedef enum { + WMI_CONFIG_LED_HIGH_UNSPECIFIED = 0, + WMI_CONFIG_LED_HIGH_OFF = 1, + WMI_CONFIG_LED_HIGH_ON = 2, +} wmi_config_led_on_flag; + +typedef enum { + WMI_CONFIG_LED_UNSPECIFIED = 0, + WMI_CONFIG_LED_ON = 1, + WMI_CONFIG_LED_OFF = 2, + WMI_CONFIG_LED_DIM = 3, + WMI_CONFIG_LED_BLINK = 4, + WMI_CONFIG_LED_TXRX = 5, +} wmi_config_led_operation_type; + typedef struct { /** TLV tag and len; tag equals * WMITLV_TAG_STRUC_wmi_pdev_set_led_config_cmd_fixed_param */ @@ -10275,6 +10290,13 @@ typedef struct { * See macros starting with WMI_PDEV_ID_ for values. */ A_UINT32 pdev_id; + /* see wmi_config_led_operation_type enum */ + A_UINT32 led_operation_type; + /* see wmi_config_led_on_flag enum */ + A_UINT32 led_on_flag; /* configure high/low on/off sense */ + A_UINT32 led_on_interval; /* for blink function; unit: ms */ + A_UINT32 led_off_interval; /* for blink function; unit: ms */ + A_UINT32 led_repeat_cnt; /* for blink function: how many blinks */ } wmi_pdev_set_led_config_cmd_fixed_param; #define WMI_WNTS_CFG_GPIO_PIN_NUM_OFFSET 0 diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 32f4dd42958c..ef90b9fa12a8 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 212 +#define __WMI_REVISION_ 213 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 58f4d625fcc974ba3e2d985587fb096619f73a8e Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Thu, 14 Apr 2016 18:03:21 +0530 Subject: qcacld-3.0: CL 1466376 update fw common interface files qcacld-2.0 to qcacld-3.0 propagation. Enhanced mcast filtering for incoming packets that have multicast IP but unicast mac Change-Id: Id50d9130f050ec9a948fdba9931c88b9111bb6ad CRs-Fixed: 865207 --- target/inc/wmi_services.h | 1 + target/inc/wmi_tlv_defs.h | 8 +++++++- target/inc/wmi_unified.h | 22 ++++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_services.h b/target/inc/wmi_services.h index 059f59d94b97..2ea83914a7f9 100644 --- a/target/inc/wmi_services.h +++ b/target/inc/wmi_services.h @@ -161,6 +161,7 @@ typedef enum { */ WMI_SERVICE_DEPRECATED_REPLACE, WMI_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE, /* FW supports a new mode that allows to run connection tracker in host */ + WMI_SERVICE_ENHANCED_MCAST_FILTER,/* FW supports enhanced multicast filtering (of mcast IP inside ucast WLAN) */ WMI_MAX_SERVICE = 128 /* max service */ } WMI_SERVICE; diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 007beaed45eb..31c0a059f874 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -688,6 +688,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_pdev_set_hw_mode_response_vdev_mac_entry, WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param, WMITLV_TAG_STRUC_WMI_COEX_CONFIG_CMD_fixed_param, + WMITLV_TAG_STRUC_wmi_config_enhanced_mcast_filter_fixed_param, } WMITLV_TAG_ID; /* @@ -964,7 +965,8 @@ typedef enum { OP(WMI_PDEV_SET_MAC_CONFIG_CMDID) \ OP(WMI_PDEV_SET_ANTENNA_MODE_CMDID) \ OP(WMI_VDEV_SET_QUIET_MODE_CMDID) \ - OP(WMI_COEX_CONFIG_CMDID) + OP(WMI_COEX_CONFIG_CMDID) \ + OP(WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -2425,6 +2427,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_LRO_CONFIG_CMDID); WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, data, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_TRANSFER_DATA_TO_FLASH_CMDID); +#define WMITLV_TABLE_WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_config_enhanced_mcast_filter_fixed_param, wmi_config_enhanced_mcast_filter_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID); + /* MAWC sensor report indication cmd */ #define WMITLV_TABLE_WMI_MAWC_SENSOR_REPORT_IND_CMDID(id, op, buf, len) \ WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_wmi_mawc_sensor_report_ind_cmd_fixed_param, wmi_mawc_sensor_report_ind_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 0204b452c853..765dbcdf8292 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -766,6 +766,8 @@ typedef enum { WMI_LRO_CONFIG_CMDID, /*transfer data from host to firmware to write flash */ WMI_TRANSFER_DATA_TO_FLASH_CMDID, + /** Command to enable/disable filtering of multicast IP with unicast mac */ + WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID, /* GPIO Configuration */ WMI_GPIO_CONFIG_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_GPIO), WMI_GPIO_OUTPUT_CMDID, @@ -14325,6 +14327,26 @@ typedef struct { A_UINT32 status; } wmi_transfer_data_to_flash_complete_event_fixed_param; +typedef enum { + ENHANCED_MCAST_FILTER_DISABLED, + ENHANCED_MCAST_FILTER_ENABLED +} ENHANCED_MCAST_FILTER_CONFIG; + +/* + * Command to enable/disable filtering of multicast IP with unicast mac + */ +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_wmi_config_enhanced_mcast_filter_fixed_param + */ + A_UINT32 tlv_header; + /* Unique id identifying the VDEV */ + A_UINT32 vdev_id; + /* 1 = enable 0 = disable (see ENHANCED_MCAST_FILTER_CONFIG) */ + A_UINT32 enable; +} wmi_config_enhanced_mcast_filter_cmd_fixed_param; + /* * This structure is used to report SMPS force mode set complete to host. */ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index ef90b9fa12a8..f948a62ec96d 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 213 +#define __WMI_REVISION_ 214 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 068e25eeb8b3c5a7b13516aa9daecdf85c936b36 Mon Sep 17 00:00:00 2001 From: Chandrasekaran Manishekar Date: Mon, 7 Mar 2016 11:51:07 +0530 Subject: qcacld-3.0: Enable FEATURE_WLAN_MCC_TO_SCC_SWITCH flag in the driver Enable feature flag FEATURE_WLAN_MCC_TO_SCC_SWITCH in the Kbuild to make use of the MCC to SCC switch feature. The resulting errors in compilation are fixed along with some enhancement in the debug logs in this feature path Change-Id: I0ddb2f371c28ade6d8fc9ea12ba104a99394827f CRs-Fixed: 986079 --- Kbuild | 7 +++++++ core/cds/src/cds_concurrency.c | 13 +++++++++++-- core/hdd/src/wlan_hdd_assoc.c | 1 + core/mac/src/pe/lim/lim_api.c | 31 +++++++++++++++++-------------- core/sap/src/sap_fsm.c | 4 ++++ core/sme/src/csr/csr_api_roam.c | 4 ++++ core/sme/src/csr/csr_util.c | 21 ++++++++++++++++++++- 7 files changed, 64 insertions(+), 17 deletions(-) diff --git a/Kbuild b/Kbuild index 0fad9cac9c9a..790481678c58 100755 --- a/Kbuild +++ b/Kbuild @@ -135,6 +135,9 @@ ifeq ($(KERNEL_BUILD), 0) # Flag to enable LFR Subnet Detection CONFIG_LFR_SUBNET_DETECTION := y + + # Flag to enable MCC to SCC switch feature + CONFIG_MCC_TO_SCC_SWITCH := y endif # If not set, assume, Common driver is with in the build tree @@ -1363,6 +1366,10 @@ ifeq ($(CONFIG_LFR_SUBNET_DETECTION), y) CDEFINES += -DFEATURE_LFR_SUBNET_DETECTION endif +ifeq ($(CONFIG_MCC_TO_SCC_SWITCH), y) +CDEFINES += -DFEATURE_WLAN_MCC_TO_SCC_SWITCH +endif + KBUILD_CPPFLAGS += $(CDEFINES) # Currently, for versions of gcc which support it, the kernel Makefile diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 599e81765199..fff2820af871 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -6605,6 +6605,9 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) hdd_ap_ctx_t *hdd_ap_ctx; uint16_t intf_ch = 0; + cds_info("cds_concurrent_open_sessions_running: %d", + cds_concurrent_open_sessions_running()); + if ((hdd_ctx->config->WlanMccToSccSwitchMode == QDF_MCC_TO_SCC_SWITCH_DISABLE) || !(cds_concurrent_open_sessions_running() @@ -6626,6 +6629,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) return; intf_ch = wlansap_check_cc_intf(hdd_ap_ctx->sapContext); + cds_info("intf_ch:%d", intf_ch); if (intf_ch == 0) return; @@ -6658,6 +6662,12 @@ void cds_check_concurrent_intf_and_restart_sap(hdd_station_ctx_t *hdd_sta_ctx, return; } + cds_info("mode:%d rule1:%d rule2:%d chan:%d", + hdd_ctx->config->WlanMccToSccSwitchMode, + hdd_ctx->config->conc_custom_rule1, + hdd_ctx->config->conc_custom_rule2, + hdd_sta_ctx->conn_info.operationChannel); + if ((hdd_ctx->config->WlanMccToSccSwitchMode != QDF_MCC_TO_SCC_SWITCH_DISABLE) && ((0 == hdd_ctx->config->conc_custom_rule1) && @@ -7176,13 +7186,12 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) hdd_ap_ctx_t *hdd_ap_ctx; hdd_hostapd_state_t *hostapd_state; QDF_STATUS qdf_status; - QDF_STATUS qdf_status; hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); tsap_Config_t *sap_config; void *sap_ctx; hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); - sap_config = &hdd_ap_ctx.sapConfig; + sap_config = &hdd_ap_ctx->sapConfig; sap_ctx = hdd_ap_ctx->sapContext; mutex_lock(&hdd_ctx->sap_lock); diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 1c2c8f53ebec..80f775392fb8 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1839,6 +1839,7 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter, wlan_hdd_auto_shutdown_enable(pHddCtx, false); #endif + hdd_info("check for SAP restart"); cds_check_concurrent_intf_and_restart_sap(pHddStaCtx, pAdapter); diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c index d974686547a4..176a318deeed 100644 --- a/core/mac/src/pe/lim/lim_api.c +++ b/core/mac/src/pe/lim/lim_api.c @@ -1804,25 +1804,28 @@ void lim_fill_join_rsp_ht_caps(tpPESession session, tpSirSmeJoinRsp join_rsp) { tSirSmeHTProfile *ht_profile; if (session == NULL) { - lim_log(mac_ctx, LOGE, FL("Invalid Session")); + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + "Invalid Session"); return; } if (join_rsp == NULL) { - lim_log(mac_ctx, LOGE, FL("Invalid Join Response")); + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, + "Invalid Join Response"); return; } - if (session->cc_switch_mode != - QDF_MCC_TO_SCC_SWITCH_DISABLE) { - ht_profile = &join_rsp->HTProfile; - ht_profile->htSupportedChannelWidthSet = - session->htSupportedChannelWidthSet; - ht_profile->htRecommendedTxWidthSet = - session->htRecommendedTxWidthSet; - ht_profile->htSecondaryChannelOffset = - session->htSecondaryChannelOffset; - ht_profile->dot11mode = session->dot11mode; - ht_profile->htCapability = session->htCapability; - } + + if (session->cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_DISABLE) + return; + + ht_profile = &join_rsp->HTProfile; + ht_profile->htSupportedChannelWidthSet = + session->htSupportedChannelWidthSet; + ht_profile->htRecommendedTxWidthSet = + session->htRecommendedTxWidthSet; + ht_profile->htSecondaryChannelOffset = + session->htSecondaryChannelOffset; + ht_profile->dot11mode = session->dot11mode; + ht_profile->htCapability = session->htCapability; ht_profile->vhtCapability = session->vhtCapability; ht_profile->vhtTxChannelWidthSet = session->vhtTxChannelWidthSet; diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 44d8a8c5573f..8bbe02d4ae09 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -2146,6 +2146,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context, #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH if (sap_context->cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_DISABLE) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + FL("check for overlap: chan:%d mode:%d"), + sap_context->channel, + sap_context->csr_roamProfile.phyMode); con_ch = sme_check_concurrent_channel_overlap(h_hal, sap_context->channel, sap_context->csr_roamProfile.phyMode, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 4e4f472fddc3..302c9ad48021 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -19041,6 +19041,10 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, struct qdf_mac_addr bcast_mac = QDF_MAC_ADDR_BROADCAST_INITIALIZER; tpAddBssParams add_bss_params; QDF_STATUS status = QDF_STATUS_SUCCESS; +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH + tSirSmeHTProfile *src_profile = NULL; + tCsrRoamHTProfile *dst_profile = NULL; +#endif status = sme_acquire_global_lock(&mac_ctx->sme); if (!QDF_IS_STATUS_SUCCESS(status)) { diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 134b995c8efc..865bbb494cff 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -693,7 +693,10 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, uint8_t i = 0, chb = PHY_SINGLE_CHANNEL_CENTERED; uint16_t intf_ch = 0, sap_hbw = 0, intf_hbw = 0, intf_cfreq = 0; uint16_t sap_cfreq = 0; - uint16_t sap_lfreq, sap_hfreq, intf_lfreq, intf_hfreq, sap_cch; + uint16_t sap_lfreq, sap_hfreq, intf_lfreq, intf_hfreq, sap_cch = 0; + + sms_log(mac_ctx, LOG1, FL("sap_ch:%d sap_phymode:%d"), + sap_ch, sap_phymode); if (mac_ctx->roam.configParam.cc_switch_mode == QDF_MCC_TO_SCC_SWITCH_DISABLE) @@ -714,6 +717,10 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, sap_cfreq = cds_chan_to_freq(sap_cch); } + sms_log(mac_ctx, LOG1, + FL("sap_ch:%d sap_phymode:%d sap_cch:%d sap_hbw:%d chb:%d"), + sap_ch, sap_phymode, sap_cch, sap_hbw, chb); + for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { if (!CSR_IS_SESSION_VALID(mac_ctx, i)) continue; @@ -730,6 +737,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, csr_get_ch_from_ht_profile(mac_ctx, &session->connectedProfile.HTProfile, intf_ch, &intf_cfreq, &intf_hbw); + sms_log(mac_ctx, LOG1, + FL("%d: intf_ch:%d intf_cfreq:%d intf_hbw:%d"), + i, intf_ch, intf_cfreq, intf_hbw); } else if (((session->pCurRoamProfile->csrPersona == QDF_P2P_GO_MODE) || (session->pCurRoamProfile->csrPersona == @@ -742,9 +752,18 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, csr_handle_conc_chnl_overlap_for_sap_go(mac_ctx, session, &sap_ch, &sap_hbw, &sap_cfreq, &intf_ch, &intf_hbw, &intf_cfreq); + + sms_log(mac_ctx, LOG1, + FL("%d: sap_ch:%d sap_hbw:%d sap_cfreq:%d intf_ch:%d intf_hbw:%d, intf_cfreq:%d"), + i, sap_ch, sap_hbw, sap_cfreq, + intf_ch, intf_hbw, intf_cfreq); } } + sms_log(mac_ctx, LOG1, + FL("intf_ch:%d sap_ch:%d intf_ch:%d"), + intf_ch, sap_ch, intf_ch); + if (intf_ch && sap_ch != intf_ch && cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE) { sap_lfreq = sap_cfreq - sap_hbw; -- cgit v1.2.3 From 802827d23c17c86bd8c13f7e65f6c73926929b6f Mon Sep 17 00:00:00 2001 From: Chandrasekaran Manishekar Date: Tue, 8 Mar 2016 11:46:01 +0530 Subject: qcacld-3.0: Update config options for INI 'gWlanMccToSccSwitchMode' Update the configuration options of ini 'gWlanMccToSccSwitchMode' to include the value of '3' which can be used to force MCC to SCC switch without restarting the SAP by sending out channel switch announcements. Change-Id: Icd983b7373ea334d829a101e5296f74560851056 CRs-Fixed: 986202 --- config/WCNSS_qcom_cfg.ini | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/WCNSS_qcom_cfg.ini b/config/WCNSS_qcom_cfg.ini index a4184f591736..d544a4a88f0f 100644 --- a/config/WCNSS_qcom_cfg.ini +++ b/config/WCNSS_qcom_cfg.ini @@ -352,7 +352,11 @@ gActiveMinChannelTime=20 #If set to 0, MCC is not allowed. gEnableMCCMode=1 -# MCC to SCC Switch mode: 0-Disable 1-Enable 2-Force SCC if same band +# MCC to SCC Switch mode: +# 0-Disable +# 1-Enable +# 2-Force SCC if same band +# 3-Force SCC if same band, without SAP restart by sending (E)CSA gWlanMccToSccSwitchMode = 0 # 1=enable STBC; 0=disable STBC -- cgit v1.2.3 From 4fcb7f5feb0415b395decc04ba0fc73c7e481860 Mon Sep 17 00:00:00 2001 From: Chandrasekaran Manishekar Date: Mon, 7 Mar 2016 19:09:20 +0530 Subject: qcacld-3.0: Fix enum mismatch while calculating regulatory class Fix the enum value used while calculating the regulatory class from the operating channel. Currently, the channel width is of type 'enum ch_width' whereas the expected enum is of type 'offset_t'. Fixing the same by performing the enum conversion before calculating the regulatory class to avoid incorrect value of regulatory class. Change-Id: I6aabb8ae78836e3c640f41b27e10830adc91a57e CRs-Fixed: 986246 --- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 ++ core/mac/src/sys/legacy/src/utils/src/parser_api.c | 17 ++++++++++++++++- core/sap/src/sap_module.c | 7 +++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 1d2058b81c5e..1fb2a93fdf0f 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -5623,6 +5623,8 @@ static void lim_process_sme_dfs_csa_ie_request(tpAniSirGlobal mac_ctx, session_entry->gLimChannelSwitch.switchCount = LIM_MAX_CSA_IE_UPDATES; session_entry->gLimChannelSwitch.ch_width = dfs_csa_ie_req->ch_params.ch_width; + session_entry->gLimChannelSwitch.sec_ch_offset = + dfs_csa_ie_req->ch_params.sec_ch_offset; if (mac_ctx->sap.SapDfsInfo.disable_dfs_ch_switch == false) session_entry->gLimChannelSwitch.switchMode = 1; diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index d25eec71fc2d..fbe40637a5f5 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -248,16 +248,31 @@ void populate_dot_11_f_ext_chann_switch_ann(tpAniSirGlobal mac_ptr, tDot11fIEext_chan_switch_ann *dot_11_ptr, tpPESession session_entry) { + uint8_t ch_offset; + + if (session_entry->gLimChannelSwitch.ch_width == CH_WIDTH_80MHZ) + ch_offset = BW80; + else + ch_offset = session_entry->gLimChannelSwitch.sec_ch_offset; + dot_11_ptr->switch_mode = session_entry->gLimChannelSwitch.switchMode; dot_11_ptr->new_reg_class = cds_regdm_get_opclass_from_channel( mac_ptr->scan.countryCodeCurrent, session_entry->gLimChannelSwitch.primaryChannel, - session_entry->gLimChannelSwitch.ch_width); + ch_offset); dot_11_ptr->new_channel = session_entry->gLimChannelSwitch.primaryChannel; dot_11_ptr->switch_count = session_entry->gLimChannelSwitch.switchCount; dot_11_ptr->present = 1; + + dot11f_log(mac_ptr, LOG1, + FL("country:%s chan:%d width:%d reg:%d off:%d"), + mac_ptr->scan.countryCodeCurrent, + session_entry->gLimChannelSwitch.primaryChannel, + session_entry->gLimChannelSwitch.ch_width, + dot_11_ptr->new_reg_class, + session_entry->gLimChannelSwitch.sec_ch_offset); } void diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 07fd12772816..d93a79361aeb 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2437,6 +2437,13 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx) pMac->sap.SapDfsInfo.target_channel, 0, &pMac->sap.SapDfsInfo.new_ch_params); + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, + "%s: chan:%d req:%d width:%d off:%d", + __func__, pMac->sap.SapDfsInfo.target_channel, + pMac->sap.SapDfsInfo.csaIERequired, + pMac->sap.SapDfsInfo.new_ch_params.ch_width, + pMac->sap.SapDfsInfo.new_ch_params.sec_ch_offset); + qdf_ret_status = sme_roam_csa_ie_request(hHal, sapContext->bssid, pMac->sap.SapDfsInfo.target_channel, -- cgit v1.2.3 From cde33d77d673f0770d77b4926e0a9897e7cca95d Mon Sep 17 00:00:00 2001 From: Chandrasekaran Manishekar Date: Thu, 14 Apr 2016 19:03:39 +0530 Subject: qcacld-3.0: Send channel switch request instead of doing SAP restart Send channel switch request instead of performing SAP restart when doing a MCC to SCC switch. This is controlled using the existing INI item 'gWlanMccToSccSwitchMode'. The new value of '3' will perform this channel change by sending (E)/CSA whereas the old value of '2' can still be used to do a channel change by doing SAP restart Change-Id: I79e7317219503de0a9957940f3cf7a4e91c7a521 CRs-Fixed: 986202 --- core/cds/inc/cds_concurrency.h | 4 ++++ core/cds/inc/cds_sched.h | 4 +++- core/cds/src/cds_concurrency.c | 47 ++++++++++++++++++++++++++++++++++++++++- core/hdd/inc/wlan_hdd_cfg.h | 2 +- core/hdd/inc/wlan_hdd_main.h | 9 ++++++++ core/hdd/src/wlan_hdd_hostapd.c | 33 +++++++++++++++++++++++++++++ core/hdd/src/wlan_hdd_hostapd.h | 6 ++++++ core/hdd/src/wlan_hdd_main.c | 28 ++++++++++++++++++++++++ core/hdd/src/wlan_hdd_power.c | 6 ++++++ core/sme/src/csr/csr_util.c | 4 +++- 10 files changed, 139 insertions(+), 4 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index d8dc3b338182..14394162ea29 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -681,4 +681,8 @@ QDF_STATUS cds_stop_start_opportunistic_timer(void); QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, uint8_t channel, uint8_t *bssid, void *dst, void *src, uint32_t numbytes); +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +QDF_STATUS cds_register_sap_restart_channel_switch_cb( + void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t)); +#endif #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index e07f15143455..7325b6155e26 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -288,7 +288,9 @@ typedef struct _cds_context_type { qdf_event_t connection_update_done_evt; qdf_mutex_t qdf_conc_list_lock; qdf_mc_timer_t dbs_opportunistic_timer; - +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH + void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t); +#endif } cds_context_type, *p_cds_contextType; /*--------------------------------------------------------------------------- diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index fff2820af871..1d735a6d113f 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -6604,6 +6604,13 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) tHalHandle *hal_handle; hdd_ap_ctx_t *hdd_ap_ctx; uint16_t intf_ch = 0; + p_cds_contextType cds_ctx; + + cds_ctx = cds_get_global_context(); + if (!cds_ctx) { + cds_err("Invalid CDS context"); + return; + } cds_info("cds_concurrent_open_sessions_running: %d", cds_concurrent_open_sessions_running()); @@ -6642,7 +6649,18 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) hdd_ap_ctx->sapConfig.channel, hdd_ap_ctx->sapConfig.sec_ch, &hdd_ap_ctx->sapConfig.ch_params); - cds_restart_sap(ap_adapter); + + if ((hdd_ctx->config->WlanMccToSccSwitchMode == + QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION) && + (cds_ctx->sap_restart_chan_switch_cb)) { + cds_info("SAP chan change without restart"); + cds_ctx->sap_restart_chan_switch_cb(ap_adapter, + hdd_ap_ctx->sapConfig.channel, + hdd_ap_ctx->sapConfig.ch_params.ch_width); + } else { + cds_restart_sap(ap_adapter); + } + } /** * cds_check_concurrent_intf_and_restart_sap() - Check concurrent change intf @@ -7989,3 +8007,30 @@ QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, } return status; } + +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +/** + * cds_register_sap_restart_channel_switch_cb() - Register callback for SAP + * channel switch without restart + * @sap_restart_chan_switch_cb: Callback to perform channel switch + * + * Registers callback to perform channel switch without having to actually + * restart the beaconing entity + * + * Return: QDF_STATUS + */ +QDF_STATUS cds_register_sap_restart_channel_switch_cb( + void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t)) +{ + p_cds_contextType cds_ctx; + + cds_ctx = cds_get_global_context(); + if (!cds_ctx) { + cds_err("Invalid CDS context"); + return QDF_STATUS_E_FAILURE; + } + + cds_ctx->sap_restart_chan_switch_cb = sap_restart_chan_switch_cb; + return QDF_STATUS_SUCCESS; +} +#endif diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 4c1e182e3df5..93ceda3bb05b 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -343,7 +343,7 @@ typedef enum { #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH #define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE "gWlanMccToSccSwitchMode" #define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MIN (QDF_MCC_TO_SCC_SWITCH_DISABLE) -#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX (QDF_MCC_TO_SCC_SWITCH_FORCE) +#define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_MAX (QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION) #define CFG_WLAN_MCC_TO_SCC_SWITCH_MODE_DEFAULT (QDF_MCC_TO_SCC_SWITCH_DISABLE) #endif diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 1075ec566ab6..520c5440ebc0 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1631,6 +1631,15 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); void hdd_update_config(hdd_context_t *hdd_ctx); +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void); +#else +static inline QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void) +{ + return CDF_STATUS_SUCCESS; +} +#endif + #ifdef FEATURE_TSO /** * hdd_set_tso_flags() - enable TSO flags in the network device diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index c93c55c2954d..28ef83867844 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2098,6 +2098,39 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, return ret; } +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +/** + * hdd_sap_restart_with_channel_switch() - SAP channel change with E/CSA + * @ap_adapter: HDD adapter + * @target_channel: Channel to which switch must happen + * @target_bw: Bandwidth of the target channel + * + * Invokes the necessary API to perform channel switch for the SAP or GO + * + * Return: None + */ +void hdd_sap_restart_with_channel_switch(hdd_adapter_t *ap_adapter, + uint32_t target_channel, + uint32_t target_bw) +{ + struct net_device *dev = ap_adapter->dev; + int ret; + + ENTER(); + + if (!dev) { + hdd_err("Invalid dev pointer"); + return; + } + + ret = hdd_softap_set_channel_change(dev, target_channel, target_bw); + if (ret) { + hdd_err("channel switch failed"); + return; + } +} +#endif + int static __iw_softap_set_ini_cfg(struct net_device *dev, struct iw_request_info *info, diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 4cd70afd5f18..795a9d74a2ef 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -63,6 +63,12 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, enum ch_width target_bw); +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +void hdd_sap_restart_with_channel_switch(hdd_adapter_t *adapter, + uint32_t target_channel, + uint32_t target_bw); +#endif + eCsrEncryptionType hdd_translate_rsn_to_csr_encryption_type(uint8_t cipher_suite[4]); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b6174c29d470..0fae759c29ae 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5542,6 +5542,29 @@ static inline bool hdd_hold_rtnl_lock(void) { return false; } static inline void hdd_release_rtnl_lock(void) { } #endif +#ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH +/** + * hdd_register_for_sap_restart_with_channel_switch() - Register for SAP channel + * switch without restart + * + * Registers callback function to change the operating channel of SAP by using + * channel switch announcements instead of restarting SAP. + * + * Return: QDF_STATUS + */ +QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void) +{ + QDF_STATUS status; + + status = cds_register_sap_restart_channel_switch_cb( + (void *)hdd_sap_restart_with_channel_switch); + if (!QDF_IS_STATUS_SUCCESS(status)) + hdd_err("restart cb registration failed"); + + return status; +} +#endif + /** * hdd_wlan_startup() - HDD init function * @dev: Pointer to the underlying device @@ -5852,6 +5875,11 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) sme_ext_scan_register_callback(hdd_ctx->hHal, wlan_hdd_cfg80211_extscan_callback); + status = hdd_register_for_sap_restart_with_channel_switch(); + if (!QDF_IS_STATUS_SUCCESS(status)) + /* Error already logged */ + goto err_unreg_netdev_notifier; + sme_set_rssi_threshold_breached_cb(hdd_ctx->hHal, hdd_rssi_threshold_breached); diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 66ebc57a9749..4a9870aabda3 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1594,6 +1594,12 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) sme_ext_scan_register_callback(pHddCtx->hHal, wlan_hdd_cfg80211_extscan_callback); + + qdf_status = hdd_register_for_sap_restart_with_channel_switch(); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + /* Error already logged */ + goto err_cds_disable; + sme_set_rssi_threshold_breached_cb(pHddCtx->hHal, hdd_rssi_threshold_breached); #ifdef WLAN_FEATURE_LPSS diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 865bbb494cff..56786f996c38 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -765,7 +765,9 @@ uint16_t csr_check_concurrent_channel_overlap(tpAniSirGlobal mac_ctx, intf_ch, sap_ch, intf_ch); if (intf_ch && sap_ch != intf_ch && - cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE) { + cc_switch_mode != QDF_MCC_TO_SCC_SWITCH_FORCE && + cc_switch_mode != + QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION) { sap_lfreq = sap_cfreq - sap_hbw; sap_hfreq = sap_cfreq + sap_hbw; intf_lfreq = intf_cfreq - intf_hbw; -- cgit v1.2.3 From db582ec0e0b0e00fa8d501a0d158426c4089f4a1 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 8 Mar 2016 17:37:04 -0800 Subject: qcacld-3.0: Fix incorrect argument type in lim_chk_assoc_req_parse_error Fix incorrect argument type in lim_chk_assoc_req_parse_error function Currently uint32_t is passed to the function but this function typecasts it to uint8_t which results in losing 3 bytes of data. This lead to incorrect parsing of Assoc request frame. Change-Id: Ib55f7afa06972234d06edd12098e44608460a10d CRs-Fixed: 987559 --- core/mac/src/pe/lim/lim_process_assoc_req_frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c index d01130f90b0f..025e1a5e99f2 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_req_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_req_frame.c @@ -252,7 +252,7 @@ static bool lim_chk_assoc_req_parse_error(tpAniSirGlobal mac_ctx, tpPESession session, tpSirAssocReq assoc_req, uint8_t sub_type, uint8_t *frm_body, - uint8_t frame_len) + uint32_t frame_len) { tSirRetStatus status; @@ -1716,7 +1716,7 @@ void lim_process_assoc_req_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, bool pmf_connection = false, assoc_req_copied = false; uint8_t update_ctx, *frm_body; uint16_t peer_idx, assoc_id = 0; - int32_t frame_len; + uint32_t frame_len; uint32_t phy_mode; tHalBitVal qos_mode; tpSirMacMgmtHdr hdr; -- cgit v1.2.3 From 93e789e6d5a6118ef24eb239bd2fc8f7a648b2a4 Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Thu, 14 Apr 2016 19:47:43 +0530 Subject: qcacld-3.0: Fix firmware statistics mask and format Send prorper firmware statistics mask and fix firmware statistics format Change-Id: I786a7a6e3cec46660c497a001b4b39fb1a049b3a CRs-Fixed: 986060 --- core/dp/htt/htt_fw_stats.c | 803 ++++++++++++++++++++++++++------------------- core/wma/inc/wma.h | 13 - core/wma/src/wma_utils.c | 126 +++---- 3 files changed, 510 insertions(+), 432 deletions(-) diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c index 0bf4c13d4f31..ea54e1efd003 100644 --- a/core/dp/htt/htt_fw_stats.c +++ b/core/dp/htt/htt_fw_stats.c @@ -59,84 +59,79 @@ static char *bw_str_arr[] = {"20MHz", "40MHz", "80MHz", "160MHz"}; * trick to use to avoid the code duplication. */ #define tx_rate_stats_print_cmn(_tx_rate_info, _concise) \ -{ \ - int i; \ - \ - qdf_print("TX Rate Info:\n"); \ - \ - /* MCS */ \ - qdf_print("MCS counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _tx_rate_info->mcs[0], \ - _tx_rate_info->mcs[1], \ - _tx_rate_info->mcs[2], \ - _tx_rate_info->mcs[3], \ - _tx_rate_info->mcs[4], \ - _tx_rate_info->mcs[5], \ - _tx_rate_info->mcs[6], \ - _tx_rate_info->mcs[7], \ - _tx_rate_info->mcs[8], \ - _tx_rate_info->mcs[9]); \ - \ - /* SGI */ \ - qdf_print("SGI counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _tx_rate_info->sgi[0], \ - _tx_rate_info->sgi[1], \ - _tx_rate_info->sgi[2], \ - _tx_rate_info->sgi[3], \ - _tx_rate_info->sgi[4], \ - _tx_rate_info->sgi[5], \ - _tx_rate_info->sgi[6], \ - _tx_rate_info->sgi[7], \ - _tx_rate_info->sgi[8], \ - _tx_rate_info->sgi[9]); \ - \ - /* NSS */ \ - qdf_print("NSS counts: "); \ - qdf_print("1x1 %d, 2x2 %d, 3x3 %d\n", \ - _tx_rate_info->nss[0], \ +{ \ + qdf_print("TX Rate Info:"); \ + \ + /* MCS */ \ + qdf_print("MCS counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _tx_rate_info->mcs[0], \ + _tx_rate_info->mcs[1], \ + _tx_rate_info->mcs[2], \ + _tx_rate_info->mcs[3], \ + _tx_rate_info->mcs[4], \ + _tx_rate_info->mcs[5], \ + _tx_rate_info->mcs[6], \ + _tx_rate_info->mcs[7], \ + _tx_rate_info->mcs[8], \ + _tx_rate_info->mcs[9]); \ + \ + /* SGI */ \ + qdf_print("SGI counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _tx_rate_info->sgi[0], \ + _tx_rate_info->sgi[1], \ + _tx_rate_info->sgi[2], \ + _tx_rate_info->sgi[3], \ + _tx_rate_info->sgi[4], \ + _tx_rate_info->sgi[5], \ + _tx_rate_info->sgi[6], \ + _tx_rate_info->sgi[7], \ + _tx_rate_info->sgi[8], \ + _tx_rate_info->sgi[9]); \ + \ + /* NSS */ \ + qdf_print("NSS counts: 1x1 %d, 2x2 %d, 3x3 %d", \ + _tx_rate_info->nss[0], \ _tx_rate_info->nss[1], _tx_rate_info->nss[2]);\ - \ - /* BW */ \ - qdf_print("BW counts: "); \ - \ - for (i = 0; \ - i < sizeof(_tx_rate_info->bw) / sizeof(_tx_rate_info->bw[0]);\ - i++) { \ - qdf_print("%s %d ", bw_str_arr[i], _tx_rate_info->bw[i]);\ - } \ - qdf_print("\n"); \ - \ - /* Preamble */ \ - qdf_print("Preamble (O C H V) counts: "); \ - qdf_print("%d, %d, %d, %d\n", \ - _tx_rate_info->pream[0], \ - _tx_rate_info->pream[1], \ - _tx_rate_info->pream[2], \ - _tx_rate_info->pream[3]); \ - \ - /* STBC rate counts */ \ - qdf_print("STBC rate counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _tx_rate_info->stbc[0], \ - _tx_rate_info->stbc[1], \ - _tx_rate_info->stbc[2], \ - _tx_rate_info->stbc[3], \ - _tx_rate_info->stbc[4], \ - _tx_rate_info->stbc[5], \ - _tx_rate_info->stbc[6], \ - _tx_rate_info->stbc[7], \ - _tx_rate_info->stbc[8], \ - _tx_rate_info->stbc[9]); \ - \ - /* LDPC and TxBF counts */ \ - qdf_print("LDPC Counts: "); \ - qdf_print("%d\n", _tx_rate_info->ldpc); \ - qdf_print("RTS Counts: "); \ - qdf_print("%d\n", _tx_rate_info->rts_cnt); \ - /* RSSI Values for last ack frames */ \ - qdf_print("Ack RSSI: %d\n", _tx_rate_info->ack_rssi);\ + \ + /* BW */ \ + if (sizeof(_tx_rate_info->bw) / sizeof(_tx_rate_info->bw[0]) == 3)\ + qdf_print("BW counts: %s %d, %s %d, %s %d", \ + bw_str_arr[0], _tx_rate_info->bw[0], \ + bw_str_arr[1], _tx_rate_info->bw[1], \ + bw_str_arr[2], _tx_rate_info->bw[2]); \ + else if (sizeof(_tx_rate_info->bw) / sizeof(_tx_rate_info->bw[0]) == 4)\ + qdf_print("BW counts: %s %d, %s %d, %s %d, %s %d", \ + bw_str_arr[0], _tx_rate_info->bw[0], \ + bw_str_arr[1], _tx_rate_info->bw[1], \ + bw_str_arr[2], _tx_rate_info->bw[2], \ + bw_str_arr[3], _tx_rate_info->bw[3]); \ + \ + \ + /* Preamble */ \ + qdf_print("Preamble (O C H V) counts: %d, %d, %d, %d",\ + _tx_rate_info->pream[0], \ + _tx_rate_info->pream[1], \ + _tx_rate_info->pream[2], \ + _tx_rate_info->pream[3]); \ + \ + /* STBC rate counts */ \ + qdf_print("STBC rate counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _tx_rate_info->stbc[0], \ + _tx_rate_info->stbc[1], \ + _tx_rate_info->stbc[2], \ + _tx_rate_info->stbc[3], \ + _tx_rate_info->stbc[4], \ + _tx_rate_info->stbc[5], \ + _tx_rate_info->stbc[6], \ + _tx_rate_info->stbc[7], \ + _tx_rate_info->stbc[8], \ + _tx_rate_info->stbc[9]); \ + \ + /* LDPC and TxBF counts */ \ + qdf_print("LDPC Counts: %d", _tx_rate_info->ldpc);\ + qdf_print("RTS Counts: %d", _tx_rate_info->rts_cnt);\ + /* RSSI Values for last ack frames */ \ + qdf_print("Ack RSSI: %d", _tx_rate_info->ack_rssi);\ } static void htt_t2h_stats_tx_rate_stats_print(wlan_dbg_tx_rate_info_t * @@ -162,111 +157,107 @@ static void htt_t2h_stats_tx_rate_stats_print_v2(wlan_dbg_tx_rate_info_v2_t * * trick to use to avoid the code duplication. */ #define rx_rate_stats_print_cmn(_rx_phy_info, _concise) \ -{ \ - int i; \ - \ - qdf_print("RX Rate Info:\n"); \ - \ - /* MCS */ \ - qdf_print("MCS counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _rx_phy_info->mcs[0], \ - _rx_phy_info->mcs[1], \ - _rx_phy_info->mcs[2], \ - _rx_phy_info->mcs[3], \ - _rx_phy_info->mcs[4], \ - _rx_phy_info->mcs[5], \ - _rx_phy_info->mcs[6], \ - _rx_phy_info->mcs[7], \ - _rx_phy_info->mcs[8], \ - _rx_phy_info->mcs[9]); \ - \ - /* SGI */ \ - qdf_print("SGI counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _rx_phy_info->sgi[0], \ - _rx_phy_info->sgi[1], \ - _rx_phy_info->sgi[2], \ - _rx_phy_info->sgi[3], \ - _rx_phy_info->sgi[4], \ - _rx_phy_info->sgi[5], \ - _rx_phy_info->sgi[6], \ - _rx_phy_info->sgi[7], \ - _rx_phy_info->sgi[8], \ - _rx_phy_info->sgi[9]); \ - \ - /* NSS */ \ - qdf_print("NSS counts: "); \ +{ \ + qdf_print("RX Rate Info:"); \ + \ + /* MCS */ \ + qdf_print("MCS counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _rx_phy_info->mcs[0], \ + _rx_phy_info->mcs[1], \ + _rx_phy_info->mcs[2], \ + _rx_phy_info->mcs[3], \ + _rx_phy_info->mcs[4], \ + _rx_phy_info->mcs[5], \ + _rx_phy_info->mcs[6], \ + _rx_phy_info->mcs[7], \ + _rx_phy_info->mcs[8], \ + _rx_phy_info->mcs[9]); \ + \ + /* SGI */ \ + qdf_print("SGI counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _rx_phy_info->sgi[0], \ + _rx_phy_info->sgi[1], \ + _rx_phy_info->sgi[2], \ + _rx_phy_info->sgi[3], \ + _rx_phy_info->sgi[4], \ + _rx_phy_info->sgi[5], \ + _rx_phy_info->sgi[6], \ + _rx_phy_info->sgi[7], \ + _rx_phy_info->sgi[8], \ + _rx_phy_info->sgi[9]); \ + \ + /* NSS */ \ /* nss[0] just holds the count of non-stbc frames that were sent at 1x1 \ * rates and nsts holds the count of frames sent with stbc. \ * It was decided to not include PPDUs sent w/ STBC in nss[0]\ * since it would be easier to change the value that needs to be\ * printed (from "stbc+non-stbc count to only non-stbc count")\ * if needed in the future. Hence the addition in the host code\ - * at this line. */ \ - qdf_print("1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d\n", \ + * at this line. */ \ + qdf_print("NSS counts: 1x1 %d, 2x2 %d, 3x3 %d, 4x4 %d",\ _rx_phy_info->nss[0] + _rx_phy_info->nsts, \ - _rx_phy_info->nss[1], \ - _rx_phy_info->nss[2], \ - _rx_phy_info->nss[3]); \ - \ - /* NSTS */ \ - qdf_print("NSTS count: "); \ - qdf_print("%d\n", _rx_phy_info->nsts); \ - \ - /* BW */ \ - qdf_print("BW counts: "); \ - for (i = 0; \ - i < sizeof(_rx_phy_info->bw) / sizeof(_rx_phy_info->bw[0]); \ - i++) { \ - qdf_print("%s %d ", bw_str_arr[i], _rx_phy_info->bw[i]);\ - } \ - qdf_print("\n"); \ - \ - /* Preamble */ \ - qdf_print("Preamble counts: "); \ - qdf_print("%d, %d, %d, %d, %d, %d\n", \ - _rx_phy_info->pream[0], \ - _rx_phy_info->pream[1], \ - _rx_phy_info->pream[2], \ - _rx_phy_info->pream[3], \ - _rx_phy_info->pream[4], \ - _rx_phy_info->pream[5]); \ - \ - /* STBC rate counts */ \ - qdf_print("STBC rate counts (0..9): "); \ - qdf_print("%d, %d, %d, %d, %d, %d, %d, %d, %d, %d\n",\ - _rx_phy_info->stbc[0], \ - _rx_phy_info->stbc[1], \ - _rx_phy_info->stbc[2], \ - _rx_phy_info->stbc[3], \ - _rx_phy_info->stbc[4], \ - _rx_phy_info->stbc[5], \ - _rx_phy_info->stbc[6], \ - _rx_phy_info->stbc[7], \ - _rx_phy_info->stbc[8], \ - _rx_phy_info->stbc[9]); \ - \ - /* LDPC and TxBF counts */ \ - qdf_print("LDPC TXBF Counts: "); \ - qdf_print("%d, %d\n", _rx_phy_info->ldpc, _rx_phy_info->txbf);\ - /* RSSI Values for last received frames */ \ - qdf_print("RSSI (data, mgmt): %d, %d\n", _rx_phy_info->data_rssi,\ - _rx_phy_info->mgmt_rssi); \ - \ - qdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + _rx_phy_info->nss[1], \ + _rx_phy_info->nss[2], \ + _rx_phy_info->nss[3]); \ + \ + /* NSTS */ \ + qdf_print("NSTS count: %d", _rx_phy_info->nsts); \ + \ + /* BW */ \ + if (sizeof(_rx_phy_info->bw) / sizeof(_rx_phy_info->bw[0]) == 3)\ + qdf_print("BW counts: %s %d, %s %d, %s %d", \ + bw_str_arr[0], _rx_phy_info->bw[0], \ + bw_str_arr[1], _rx_phy_info->bw[1], \ + bw_str_arr[2], _rx_phy_info->bw[2]); \ + else if (sizeof(_rx_phy_info->bw) / sizeof(_rx_phy_info->bw[0]) == 4) \ + qdf_print("BW counts: %s %d, %s %d, %s %d, %s %d", \ + bw_str_arr[0], _rx_phy_info->bw[0], \ + bw_str_arr[1], _rx_phy_info->bw[1], \ + bw_str_arr[2], _rx_phy_info->bw[2], \ + bw_str_arr[3], _rx_phy_info->bw[3]); \ + \ + /* Preamble */ \ + qdf_print("Preamble counts: %d, %d, %d, %d, %d, %d",\ + _rx_phy_info->pream[0], \ + _rx_phy_info->pream[1], \ + _rx_phy_info->pream[2], \ + _rx_phy_info->pream[3], \ + _rx_phy_info->pream[4], \ + _rx_phy_info->pream[5]); \ + \ + /* STBC rate counts */ \ + qdf_print("STBC rate counts (0..9): %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",\ + _rx_phy_info->stbc[0], \ + _rx_phy_info->stbc[1], \ + _rx_phy_info->stbc[2], \ + _rx_phy_info->stbc[3], \ + _rx_phy_info->stbc[4], \ + _rx_phy_info->stbc[5], \ + _rx_phy_info->stbc[6], \ + _rx_phy_info->stbc[7], \ + _rx_phy_info->stbc[8], \ + _rx_phy_info->stbc[9]); \ + \ + /* LDPC and TxBF counts */ \ + qdf_print("LDPC TXBF Counts: %d, %d", \ + _rx_phy_info->ldpc, _rx_phy_info->txbf);\ + /* RSSI Values for last received frames */ \ + qdf_print("RSSI (data, mgmt): %d, %d", _rx_phy_info->data_rssi,\ + _rx_phy_info->mgmt_rssi); \ + \ + qdf_print("RSSI Chain 0 (0x%02x 0x%02x 0x%02x 0x%02x)",\ ((_rx_phy_info->rssi_chain0 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 8) & 0xff), \ ((_rx_phy_info->rssi_chain0 >> 0) & 0xff)); \ - \ - qdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + \ + qdf_print("RSSI Chain 1 (0x%02x 0x%02x 0x%02x 0x%02x)",\ ((_rx_phy_info->rssi_chain1 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 8) & 0xff), \ ((_rx_phy_info->rssi_chain1 >> 0) & 0xff)); \ - \ - qdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)\n",\ + \ + qdf_print("RSSI Chain 2 (0x%02x 0x%02x 0x%02x 0x%02x)",\ ((_rx_phy_info->rssi_chain2 >> 24) & 0xff), \ ((_rx_phy_info->rssi_chain2 >> 16) & 0xff), \ ((_rx_phy_info->rssi_chain2 >> 8) & 0xff), \ @@ -292,78 +283,78 @@ htt_t2h_stats_pdev_stats_print(struct wlan_dbg_stats *wlan_pdev_stats, struct wlan_dbg_tx_stats *tx = &wlan_pdev_stats->tx; struct wlan_dbg_rx_stats *rx = &wlan_pdev_stats->rx; - qdf_print("WAL Pdev stats:\n"); - qdf_print("\n### Tx ###\n"); + qdf_print("WAL Pdev stats:"); + qdf_print("\n### Tx ###"); /* Num HTT cookies queued to dispatch list */ - qdf_print("comp_queued :\t%d\n", tx->comp_queued); + qdf_print("comp_queued :\t%d", tx->comp_queued); /* Num HTT cookies dispatched */ - qdf_print("comp_delivered :\t%d\n", tx->comp_delivered); + qdf_print("comp_delivered :\t%d", tx->comp_delivered); /* Num MSDU queued to WAL */ - qdf_print("msdu_enqued :\t%d\n", tx->msdu_enqued); + qdf_print("msdu_enqued :\t%d", tx->msdu_enqued); /* Num MPDU queued to WAL */ - qdf_print("mpdu_enqued :\t%d\n", tx->mpdu_enqued); + qdf_print("mpdu_enqued :\t%d", tx->mpdu_enqued); /* Num MSDUs dropped by WMM limit */ - qdf_print("wmm_drop :\t%d\n", tx->wmm_drop); + qdf_print("wmm_drop :\t%d", tx->wmm_drop); /* Num Local frames queued */ - qdf_print("local_enqued :\t%d\n", tx->local_enqued); + qdf_print("local_enqued :\t%d", tx->local_enqued); /* Num Local frames done */ - qdf_print("local_freed :\t%d\n", tx->local_freed); + qdf_print("local_freed :\t%d", tx->local_freed); /* Num queued to HW */ - qdf_print("hw_queued :\t%d\n", tx->hw_queued); + qdf_print("hw_queued :\t%d", tx->hw_queued); /* Num PPDU reaped from HW */ - qdf_print("hw_reaped :\t%d\n", tx->hw_reaped); + qdf_print("hw_reaped :\t%d", tx->hw_reaped); /* Num underruns */ - qdf_print("mac underrun :\t%d\n", tx->underrun); + qdf_print("mac underrun :\t%d", tx->underrun); /* Num underruns */ - qdf_print("phy underrun :\t%d\n", tx->phy_underrun); + qdf_print("phy underrun :\t%d", tx->phy_underrun); /* Num PPDUs cleaned up in TX abort */ - qdf_print("tx_abort :\t%d\n", tx->tx_abort); + qdf_print("tx_abort :\t%d", tx->tx_abort); /* Num MPDUs requed by SW */ - qdf_print("mpdus_requed :\t%d\n", tx->mpdus_requed); + qdf_print("mpdus_requed :\t%d", tx->mpdus_requed); /* Excessive retries */ - qdf_print("excess retries :\t%d\n", tx->tx_ko); + qdf_print("excess retries :\t%d", tx->tx_ko); /* last data rate */ - qdf_print("last rc :\t%d\n", tx->data_rc); + qdf_print("last rc :\t%d", tx->data_rc); /* scheduler self triggers */ - qdf_print("sched self trig :\t%d\n", tx->self_triggers); + qdf_print("sched self trig :\t%d", tx->self_triggers); /* SW retry failures */ - qdf_print("ampdu retry failed:\t%d\n", tx->sw_retry_failure); + qdf_print("ampdu retry failed:\t%d", tx->sw_retry_failure); /* ilegal phy rate errirs */ - qdf_print("illegal rate errs :\t%d\n", tx->illgl_rate_phy_err); + qdf_print("illegal rate errs :\t%d", tx->illgl_rate_phy_err); /* pdev continous excessive retries */ - qdf_print("pdev cont xretry :\t%d\n", tx->pdev_cont_xretry); + qdf_print("pdev cont xretry :\t%d", tx->pdev_cont_xretry); /* pdev continous excessive retries */ - qdf_print("pdev tx timeout :\t%d\n", tx->pdev_tx_timeout); + qdf_print("pdev tx timeout :\t%d", tx->pdev_tx_timeout); /* pdev resets */ - qdf_print("pdev resets :\t%d\n", tx->pdev_resets); + qdf_print("pdev resets :\t%d", tx->pdev_resets); /* PPDU > txop duration */ - qdf_print("ppdu txop ovf :\t%d\n", tx->txop_ovf); + qdf_print("ppdu txop ovf :\t%d", tx->txop_ovf); qdf_print("\n### Rx ###\n"); /* Cnts any change in ring routing mid-ppdu */ - qdf_print("ppdu_route_change :\t%d\n", rx->mid_ppdu_route_change); + qdf_print("ppdu_route_change :\t%d", rx->mid_ppdu_route_change); /* Total number of statuses processed */ - qdf_print("status_rcvd :\t%d\n", rx->status_rcvd); + qdf_print("status_rcvd :\t%d", rx->status_rcvd); /* Extra frags on rings 0-3 */ - qdf_print("r0_frags :\t%d\n", rx->r0_frags); - qdf_print("r1_frags :\t%d\n", rx->r1_frags); - qdf_print("r2_frags :\t%d\n", rx->r2_frags); - qdf_print("r3_frags :\t%d\n", rx->r3_frags); + qdf_print("r0_frags :\t%d", rx->r0_frags); + qdf_print("r1_frags :\t%d", rx->r1_frags); + qdf_print("r2_frags :\t%d", rx->r2_frags); + qdf_print("r3_frags :\t%d", rx->r3_frags); /* MSDUs / MPDUs delivered to HTT */ - qdf_print("htt_msdus :\t%d\n", rx->htt_msdus); - qdf_print("htt_mpdus :\t%d\n", rx->htt_mpdus); + qdf_print("htt_msdus :\t%d", rx->htt_msdus); + qdf_print("htt_mpdus :\t%d", rx->htt_mpdus); /* MSDUs / MPDUs delivered to local stack */ - qdf_print("loc_msdus :\t%d\n", rx->loc_msdus); - qdf_print("loc_mpdus :\t%d\n", rx->loc_mpdus); + qdf_print("loc_msdus :\t%d", rx->loc_msdus); + qdf_print("loc_mpdus :\t%d", rx->loc_mpdus); /* AMSDUs that have more MSDUs than the status ring size */ - qdf_print("oversize_amsdu :\t%d\n", rx->oversize_amsdu); + qdf_print("oversize_amsdu :\t%d", rx->oversize_amsdu); /* Number of PHY errors */ - qdf_print("phy_errs :\t%d\n", rx->phy_errs); + qdf_print("phy_errs :\t%d", rx->phy_errs); /* Number of PHY errors dropped */ - qdf_print("phy_errs dropped :\t%d\n", rx->phy_err_drop); + qdf_print("phy_errs dropped :\t%d", rx->phy_err_drop); /* Number of mpdu errors - FCS, MIC, ENC etc. */ - qdf_print("mpdu_errs :\t%d\n", rx->mpdu_errs); + qdf_print("mpdu_errs :\t%d", rx->mpdu_errs); } @@ -371,112 +362,112 @@ static void htt_t2h_stats_rx_reorder_stats_print(struct rx_reorder_stats *stats_ptr, int concise) { - qdf_print("Rx reorder statistics:\n"); - qdf_print(" %u non-QoS frames received\n", stats_ptr->deliver_non_qos); - qdf_print(" %u frames received in-order\n", + qdf_print("Rx reorder statistics:"); + qdf_print(" %u non-QoS frames received", stats_ptr->deliver_non_qos); + qdf_print(" %u frames received in-order", stats_ptr->deliver_in_order); - qdf_print(" %u frames flushed due to timeout\n", + qdf_print(" %u frames flushed due to timeout", stats_ptr->deliver_flush_timeout); - qdf_print(" %u frames flushed due to moving out of window\n", + qdf_print(" %u frames flushed due to moving out of window", stats_ptr->deliver_flush_oow); - qdf_print(" %u frames flushed due to receiving DELBA\n", + qdf_print(" %u frames flushed due to receiving DELBA", stats_ptr->deliver_flush_delba); - qdf_print(" %u frames discarded due to FCS error\n", + qdf_print(" %u frames discarded due to FCS error", stats_ptr->fcs_error); - qdf_print(" %u frames discarded due to invalid peer\n", + qdf_print(" %u frames discarded due to invalid peer", stats_ptr->invalid_peer); qdf_print - (" %u frames discarded due to duplication (non aggregation)\n", + (" %u frames discarded due to duplication (non aggregation)", stats_ptr->dup_non_aggr); - qdf_print(" %u frames discarded due to duplication in reorder queue\n", + qdf_print(" %u frames discarded due to duplication in reorder queue", stats_ptr->dup_in_reorder); - qdf_print(" %u frames discarded due to processed before\n", + qdf_print(" %u frames discarded due to processed before", stats_ptr->dup_past); - qdf_print(" %u times reorder timeout happened\n", + qdf_print(" %u times reorder timeout happened", stats_ptr->reorder_timeout); - qdf_print(" %u times incorrect bar received\n", + qdf_print(" %u times incorrect bar received", stats_ptr->invalid_bar_ssn); - qdf_print(" %u times bar ssn reset happened\n", + qdf_print(" %u times bar ssn reset happened", stats_ptr->ssn_reset); - qdf_print(" %u times flushed due to peer delete\n", + qdf_print(" %u times flushed due to peer delete", stats_ptr->deliver_flush_delpeer); - qdf_print(" %u times flushed due to offload\n", + qdf_print(" %u times flushed due to offload", stats_ptr->deliver_flush_offload); - qdf_print(" %u times flushed due to ouf of buffer\n", + qdf_print(" %u times flushed due to ouf of buffer", stats_ptr->deliver_flush_oob); - qdf_print(" %u MPDU's dropped due to PN check fail\n", + qdf_print(" %u MPDU's dropped due to PN check fail", stats_ptr->pn_fail); - qdf_print(" %u MPDU's dropped due to lack of memory\n", + qdf_print(" %u MPDU's dropped due to lack of memory", stats_ptr->store_fail); - qdf_print(" %u times tid pool alloc succeeded\n", + qdf_print(" %u times tid pool alloc succeeded", stats_ptr->tid_pool_alloc_succ); - qdf_print(" %u times MPDU pool alloc succeeded\n", + qdf_print(" %u times MPDU pool alloc succeeded", stats_ptr->mpdu_pool_alloc_succ); - qdf_print(" %u times MSDU pool alloc succeeded\n", + qdf_print(" %u times MSDU pool alloc succeeded", stats_ptr->msdu_pool_alloc_succ); - qdf_print(" %u times tid pool alloc failed\n", + qdf_print(" %u times tid pool alloc failed", stats_ptr->tid_pool_alloc_fail); - qdf_print(" %u times MPDU pool alloc failed\n", + qdf_print(" %u times MPDU pool alloc failed", stats_ptr->mpdu_pool_alloc_fail); - qdf_print(" %u times MSDU pool alloc failed\n", + qdf_print(" %u times MSDU pool alloc failed", stats_ptr->msdu_pool_alloc_fail); - qdf_print(" %u times tid pool freed\n", + qdf_print(" %u times tid pool freed", stats_ptr->tid_pool_free); - qdf_print(" %u times MPDU pool freed\n", + qdf_print(" %u times MPDU pool freed", stats_ptr->mpdu_pool_free); - qdf_print(" %u times MSDU pool freed\n", + qdf_print(" %u times MSDU pool freed", stats_ptr->msdu_pool_free); - qdf_print(" %u MSDUs undelivered to HTT, queued to Rx MSDU free list\n", + qdf_print(" %u MSDUs undelivered to HTT, queued to Rx MSDU free list", stats_ptr->msdu_queued); - qdf_print(" %u MSDUs released from Rx MSDU list to MAC ring\n", + qdf_print(" %u MSDUs released from Rx MSDU list to MAC ring", stats_ptr->msdu_recycled); - qdf_print(" %u MPDUs with invalid peer but A2 found in AST\n", + qdf_print(" %u MPDUs with invalid peer but A2 found in AST", stats_ptr->invalid_peer_a2_in_ast); - qdf_print(" %u MPDUs with invalid peer but A3 found in AST\n", + qdf_print(" %u MPDUs with invalid peer but A3 found in AST", stats_ptr->invalid_peer_a3_in_ast); - qdf_print(" %u MPDUs with invalid peer, Broadcast or Mulitcast frame\n", + qdf_print(" %u MPDUs with invalid peer, Broadcast or Mulitcast frame", stats_ptr->invalid_peer_bmc_mpdus); - qdf_print(" %u MSDUs with err attention word\n", + qdf_print(" %u MSDUs with err attention word", stats_ptr->rxdesc_err_att); - qdf_print(" %u MSDUs with flag of peer_idx_invalid\n", + qdf_print(" %u MSDUs with flag of peer_idx_invalid", stats_ptr->rxdesc_err_peer_idx_inv); - qdf_print(" %u MSDUs with flag of peer_idx_timeout\n", + qdf_print(" %u MSDUs with flag of peer_idx_timeout", stats_ptr->rxdesc_err_peer_idx_to); - qdf_print(" %u MSDUs with flag of overflow\n", + qdf_print(" %u MSDUs with flag of overflow", stats_ptr->rxdesc_err_ov); - qdf_print(" %u MSDUs with flag of msdu_length_err\n", + qdf_print(" %u MSDUs with flag of msdu_length_err", stats_ptr->rxdesc_err_msdu_len); - qdf_print(" %u MSDUs with flag of mpdu_length_err\n", + qdf_print(" %u MSDUs with flag of mpdu_length_err", stats_ptr->rxdesc_err_mpdu_len); - qdf_print(" %u MSDUs with flag of tkip_mic_err\n", + qdf_print(" %u MSDUs with flag of tkip_mic_err", stats_ptr->rxdesc_err_tkip_mic); - qdf_print(" %u MSDUs with flag of decrypt_err\n", + qdf_print(" %u MSDUs with flag of decrypt_err", stats_ptr->rxdesc_err_decrypt); - qdf_print(" %u MSDUs with flag of fcs_err\n", + qdf_print(" %u MSDUs with flag of fcs_err", stats_ptr->rxdesc_err_fcs); - qdf_print(" %u Unicast frames with invalid peer handler\n", + qdf_print(" %u Unicast frames with invalid peer handler", stats_ptr->rxdesc_uc_msdus_inv_peer); - qdf_print(" %u unicast frame directly to DUT with invalid peer handler\n", + qdf_print(" %u unicast frame directly to DUT with invalid peer handler", stats_ptr->rxdesc_direct_msdus_inv_peer); - qdf_print(" %u Broadcast/Multicast frames with invalid peer handler\n", + qdf_print(" %u Broadcast/Multicast frames with invalid peer handler", stats_ptr->rxdesc_bmc_msdus_inv_peer); - qdf_print(" %u MSDUs dropped due to no first MSDU flag\n", + qdf_print(" %u MSDUs dropped due to no first MSDU flag", stats_ptr->rxdesc_no_1st_msdu); - qdf_print(" %u MSDUs dropped due to ring overflow\n", + qdf_print(" %u MSDUs dropped due to ring overflow", stats_ptr->msdu_drop_ring_ov); - qdf_print(" %u MSDUs dropped due to FC mismatch\n", + qdf_print(" %u MSDUs dropped due to FC mismatch", stats_ptr->msdu_drop_fc_mismatch); - qdf_print(" %u MSDUs dropped due to mgt frame in Remote ring\n", + qdf_print(" %u MSDUs dropped due to mgt frame in Remote ring", stats_ptr->msdu_drop_mgmt_remote_ring); - qdf_print(" %u MSDUs dropped due to misc non error\n", + qdf_print(" %u MSDUs dropped due to misc non error", stats_ptr->msdu_drop_misc); - qdf_print(" %u MSDUs go to offload before reorder\n", + qdf_print(" %u MSDUs go to offload before reorder", stats_ptr->offload_msdu_wal); - qdf_print(" %u data frame dropped by offload after reorder\n", + qdf_print(" %u data frame dropped by offload after reorder", stats_ptr->offload_msdu_reorder); - qdf_print(" %u MPDUs with SN in the past & within BA window\n", + qdf_print(" %u MPDUs with SN in the past & within BA window", stats_ptr->dup_past_within_window); - qdf_print(" %u MPDUs with SN in the past & outside BA window\n", + qdf_print(" %u MPDUs with SN in the past & outside BA window", stats_ptr->dup_past_outside_window); } @@ -484,32 +475,32 @@ static void htt_t2h_stats_rx_rem_buf_stats_print( struct rx_remote_buffer_mgmt_stats *stats_ptr, int concise) { - qdf_print("Rx Remote Buffer Statistics:\n"); - qdf_print(" %u MSDU's reaped for Rx processing\n", + qdf_print("Rx Remote Buffer Statistics:"); + qdf_print(" %u MSDU's reaped for Rx processing", stats_ptr->remote_reaped); - qdf_print(" %u MSDU's recycled within firmware\n", + qdf_print(" %u MSDU's recycled within firmware", stats_ptr->remote_recycled); - qdf_print(" %u MSDU's stored by Data Rx\n", + qdf_print(" %u MSDU's stored by Data Rx", stats_ptr->data_rx_msdus_stored); - qdf_print(" %u HTT indications from WAL Rx MSDU\n", + qdf_print(" %u HTT indications from WAL Rx MSDU", stats_ptr->wal_rx_ind); - qdf_print(" %u HTT indications unconsumed from WAL Rx MSDU\n", + qdf_print(" %u HTT indications unconsumed from WAL Rx MSDU", stats_ptr->wal_rx_ind_unconsumed); - qdf_print(" %u HTT indications from Data Rx MSDU\n", + qdf_print(" %u HTT indications from Data Rx MSDU", stats_ptr->data_rx_ind); - qdf_print(" %u HTT indications unconsumed from Data Rx MSDU\n", + qdf_print(" %u HTT indications unconsumed from Data Rx MSDU", stats_ptr->data_rx_ind_unconsumed); - qdf_print(" %u HTT indications from ATHBUF\n", + qdf_print(" %u HTT indications from ATHBUF", stats_ptr->athbuf_rx_ind); - qdf_print(" %u Remote buffers requested for refill\n", + qdf_print(" %u Remote buffers requested for refill", stats_ptr->refill_buf_req); - qdf_print(" %u Remote buffers filled by host\n", + qdf_print(" %u Remote buffers filled by host", stats_ptr->refill_buf_rsp); - qdf_print(" %u times MAC has no buffers\n", + qdf_print(" %u times MAC has no buffers", stats_ptr->mac_no_bufs); - qdf_print(" %u times f/w write & read indices on MAC ring are equal\n", + qdf_print(" %u times f/w write & read indices on MAC ring are equal", stats_ptr->fw_indices_equal); - qdf_print(" %u times f/w has no remote buffers to post to MAC\n", + qdf_print(" %u times f/w has no remote buffers to post to MAC", stats_ptr->host_no_bufs); } @@ -517,9 +508,8 @@ static void htt_t2h_stats_txbf_info_buf_stats_print( struct wlan_dbg_txbf_data_stats *stats_ptr) { - qdf_print("TXBF data Statistics:\n"); - qdf_print("tx_txbf_vht (0..9): "); - qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %d\n", + qdf_print("TXBF data Statistics:"); + qdf_print("tx_txbf_vht (0..9): %u, %u, %u, %u, %u, %u, %u, %u, %u, %d", stats_ptr->tx_txbf_vht[0], stats_ptr->tx_txbf_vht[1], stats_ptr->tx_txbf_vht[2], @@ -530,8 +520,7 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_vht[7], stats_ptr->tx_txbf_vht[8], stats_ptr->tx_txbf_vht[9]); - qdf_print("rx_txbf_vht (0..9): "); - qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("rx_txbf_vht (0..9): %u, %u, %u, %u, %u, %u, %u, %u, %u, %u", stats_ptr->rx_txbf_vht[0], stats_ptr->rx_txbf_vht[1], stats_ptr->rx_txbf_vht[2], @@ -542,8 +531,7 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->rx_txbf_vht[7], stats_ptr->rx_txbf_vht[8], stats_ptr->rx_txbf_vht[9]); - qdf_print("tx_txbf_ht (0..7): "); - qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_ht (0..7): %u, %u, %u, %u, %u, %u, %u, %u", stats_ptr->tx_txbf_ht[0], stats_ptr->tx_txbf_ht[1], stats_ptr->tx_txbf_ht[2], @@ -552,8 +540,7 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_ht[5], stats_ptr->tx_txbf_ht[6], stats_ptr->tx_txbf_ht[7]); - qdf_print("tx_txbf_ofdm (0..7): "); - qdf_print("%u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_ofdm (0..7): %u, %u, %u, %u, %u, %u, %u, %u", stats_ptr->tx_txbf_ofdm[0], stats_ptr->tx_txbf_ofdm[1], stats_ptr->tx_txbf_ofdm[2], @@ -562,8 +549,7 @@ htt_t2h_stats_txbf_info_buf_stats_print( stats_ptr->tx_txbf_ofdm[5], stats_ptr->tx_txbf_ofdm[6], stats_ptr->tx_txbf_ofdm[7]); - qdf_print("tx_txbf_cck (0..6): "); - qdf_print("%u, %u, %u, %u, %u, %u, %u\n", + qdf_print("tx_txbf_cck (0..6): %u, %u, %u, %u, %u, %u, %u", stats_ptr->tx_txbf_cck[0], stats_ptr->tx_txbf_cck[1], stats_ptr->tx_txbf_cck[2], @@ -577,27 +563,23 @@ static void htt_t2h_stats_txbf_snd_buf_stats_print( struct wlan_dbg_txbf_snd_stats *stats_ptr) { - qdf_print("TXBF snd Buffer Statistics:\n"); - qdf_print("cbf_20: "); - qdf_print("%u, %u, %u, %u\n", + qdf_print("TXBF snd Buffer Statistics:"); + qdf_print("cbf_20: %u, %u, %u, %u", stats_ptr->cbf_20[0], stats_ptr->cbf_20[1], stats_ptr->cbf_20[2], stats_ptr->cbf_20[3]); - qdf_print("cbf_40: "); - qdf_print("%u, %u, %u, %u\n", + qdf_print("cbf_40: %u, %u, %u, %u", stats_ptr->cbf_40[0], stats_ptr->cbf_40[1], stats_ptr->cbf_40[2], stats_ptr->cbf_40[3]); - qdf_print("cbf_80: "); - qdf_print("%u, %u, %u, %u\n", + qdf_print("cbf_80: %u, %u, %u, %u", stats_ptr->cbf_80[0], stats_ptr->cbf_80[1], stats_ptr->cbf_80[2], stats_ptr->cbf_80[3]); - qdf_print("sounding: "); - qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u\n", + qdf_print("sounding: %u, %u, %u, %u, %u, %u, %u, %u, %u", stats_ptr->sounding[0], stats_ptr->sounding[1], stats_ptr->sounding[2], @@ -613,34 +595,34 @@ static void htt_t2h_stats_tx_selfgen_buf_stats_print( struct wlan_dbg_tx_selfgen_stats *stats_ptr) { - qdf_print("Tx selfgen Buffer Statistics:\n"); - qdf_print(" %u su_ndpa\n", + qdf_print("Tx selfgen Buffer Statistics:"); + qdf_print(" %u su_ndpa", stats_ptr->su_ndpa); - qdf_print(" %u mu_ndp\n", + qdf_print(" %u mu_ndp", stats_ptr->mu_ndp); - qdf_print(" %u mu_ndpa\n", + qdf_print(" %u mu_ndpa", stats_ptr->mu_ndpa); - qdf_print(" %u mu_ndp\n", + qdf_print(" %u mu_ndp", stats_ptr->mu_ndp); - qdf_print(" %u mu_brpoll_1\n", + qdf_print(" %u mu_brpoll_1", stats_ptr->mu_brpoll_1); - qdf_print(" %u mu_brpoll_2\n", + qdf_print(" %u mu_brpoll_2", stats_ptr->mu_brpoll_2); - qdf_print(" %u mu_bar_1\n", + qdf_print(" %u mu_bar_1", stats_ptr->mu_bar_1); - qdf_print(" %u mu_bar_2\n", + qdf_print(" %u mu_bar_2", stats_ptr->mu_bar_2); - qdf_print(" %u cts_burst\n", + qdf_print(" %u cts_burst", stats_ptr->cts_burst); - qdf_print(" %u su_ndp_err\n", + qdf_print(" %u su_ndp_err", stats_ptr->su_ndp_err); - qdf_print(" %u su_ndpa_err\n", + qdf_print(" %u su_ndpa_err", stats_ptr->su_ndpa_err); - qdf_print(" %u mu_ndp_err\n", + qdf_print(" %u mu_ndp_err", stats_ptr->mu_ndp_err); - qdf_print(" %u mu_brp1_err\n", + qdf_print(" %u mu_brp1_err", stats_ptr->mu_brp1_err); - qdf_print(" %u mu_brp2_err\n", + qdf_print(" %u mu_brp2_err", stats_ptr->mu_brp2_err); } @@ -650,9 +632,9 @@ htt_t2h_stats_wifi2_error_stats_print( { int i; - qdf_print("Scheduler error Statistics:\n"); + qdf_print("Scheduler error Statistics:"); qdf_print("urrn_stats: "); - qdf_print("%d, %d, %d\n", + qdf_print("urrn_stats: %d, %d, %d", stats_ptr->urrn_stats[0], stats_ptr->urrn_stats[1], stats_ptr->urrn_stats[2]); @@ -662,7 +644,7 @@ htt_t2h_stats_wifi2_error_stats_print( qdf_print(" %u", stats_ptr->flush_errs[i]); qdf_print("\n"); qdf_print("schd_stall_errs (0..3): "); - qdf_print("%d, %d, %d, %d\n", + qdf_print("%d, %d, %d, %d", stats_ptr->schd_stall_errs[0], stats_ptr->schd_stall_errs[1], stats_ptr->schd_stall_errs[2], @@ -682,7 +664,7 @@ htt_t2h_stats_wifi2_error_stats_print( for (i = 0; i < WHAL_DBG_PHY_ERR_MAXCNT; i++) qdf_print(" %u", stats_ptr->phy_errs[i]); qdf_print("\n"); - qdf_print(" %u rx_rate_inval\n", + qdf_print(" %u rx_rate_inval", stats_ptr->rx_rate_inval); } @@ -690,16 +672,16 @@ static void htt_t2h_rx_musu_ndpa_pkts_stats_print( struct rx_txbf_musu_ndpa_pkts_stats *stats_ptr) { - qdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:\n"); - qdf_print(" %u Number of TXBF MU packets received\n", + qdf_print("Rx TXBF MU/SU Packets and NDPA Statistics:"); + qdf_print(" %u Number of TXBF MU packets received", stats_ptr->number_mu_pkts); - qdf_print(" %u Number of TXBF SU packets received\n", + qdf_print(" %u Number of TXBF SU packets received", stats_ptr->number_su_pkts); - qdf_print(" %u Number of TXBF directed NDPA\n", + qdf_print(" %u Number of TXBF directed NDPA", stats_ptr->txbf_directed_ndpa_count); - qdf_print(" %u Number of TXBF retried NDPA\n", + qdf_print(" %u Number of TXBF retried NDPA", stats_ptr->txbf_ndpa_retry_count); - qdf_print(" %u Total number of TXBF NDPA\n", + qdf_print(" %u Total number of TXBF NDPA", stats_ptr->txbf_total_ndpa_count); } @@ -855,7 +837,7 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, hdr->mpdu_msdus_array_len * sizeof(uint8_t) + hdr->msdu_bytes_array_len * sizeof(uint16_t); num_records = (length - sizeof(*hdr)) / record_size; - qdf_print("Tx PPDU log elements:\n"); + qdf_print("Tx PPDU log elements: num_records %d", num_records); for (i = 0; i < num_records; i++) { uint16_t start_seq_num; @@ -924,35 +906,35 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, OL_FW_TX_DBG_PPDU_TRIES_M) >> OL_FW_TX_DBG_PPDU_TRIES_S; - qdf_print(" - PPDU tx to peer %d, TID %d\n", peer_id, + qdf_print(" - PPDU tx to peer %d, TID %d", peer_id, ext_tid); qdf_print - (" start seq num= %u, start PN LSBs= %#04x\n", + (" start seq num= %u, start PN LSBs= %#04x", start_seq_num, start_pn_lsbs); qdf_print - (" PPDU: %d MPDUs, (?) MSDUs, %d bytes\n", + (" PPDU: %d MPDUs, (?) MSDUs, %d bytes", num_mpdus, /* num_msdus - not yet computed in target */ record->num_bytes); if (complete) { qdf_print - (" enqueued: %u, completed: %u usec)\n", + (" enqueued: %u, completed: %u usec)", time_enqueue_us, time_completion_us); qdf_print (" %d tries, last tx used rate %d ", tries, rate_code); - qdf_print("on %d MHz chan (flags = %#x)\n", + qdf_print("on %d MHz chan (flags = %#x)", htt_rate_flags_to_mhz (rate_flags), rate_flags); qdf_print - (" enqueued and acked MPDU bitmaps:\n"); + (" enqueued and acked MPDU bitmaps:"); htt_t2h_tx_ppdu_bitmaps_pr(msg_word + OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16, msg_word + OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16); } else { qdf_print - (" enqueued: %d us, not yet completed\n", + (" enqueued: %d us, not yet completed", time_enqueue_us); } /* skip the regular msg fields to reach the tail area */ @@ -963,14 +945,14 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, BUF_SIZE, hdr-> mpdu_bytes_array_len); - qdf_print(" MPDU bytes: %s\n", buf); + qdf_print(" MPDU bytes: %s", buf); } p8 += hdr->mpdu_bytes_array_len * sizeof(uint16_t); if (hdr->mpdu_msdus_array_len) { htt_make_u8_list_str((uint32_t *) p8, buf, BUF_SIZE, hdr->mpdu_msdus_array_len); - qdf_print(" MPDU MSDUs: %s\n", buf); + qdf_print(" MPDU MSDUs: %s", buf); } p8 += hdr->mpdu_msdus_array_len * sizeof(uint8_t); if (hdr->msdu_bytes_array_len) { @@ -978,19 +960,19 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, BUF_SIZE, hdr-> msdu_bytes_array_len); - qdf_print(" MSDU bytes: %s\n", buf); + qdf_print(" MSDU bytes: %s", buf); } } else { /* concise */ qdf_print("start seq num = %u ", start_seq_num); - qdf_print("enqueued and acked MPDU bitmaps:\n"); + qdf_print("enqueued and acked MPDU bitmaps:"); if (complete) { htt_t2h_tx_ppdu_bitmaps_pr(msg_word + OL_FW_TX_DBG_PPDU_ENQUEUED_LSBS_16, msg_word + OL_FW_TX_DBG_PPDU_BLOCK_ACK_LSBS_16); } else { - qdf_print("(not completed)\n"); + qdf_print("(not completed)"); } } record = (struct ol_fw_tx_dbg_ppdu_base *) @@ -998,6 +980,135 @@ htt_t2h_tx_ppdu_log_print(struct ol_fw_tx_dbg_ppdu_msg_hdr *hdr, } } +void htt_t2h_stats_tidq_stats_print( + struct wlan_dbg_tidq_stats *tidq_stats, int concise) +{ + qdf_print("TID QUEUE STATS:"); + qdf_print("tid_txq_stats: %u", tidq_stats->wlan_dbg_tid_txq_status); + qdf_print("num_pkts_queued(0..9):"); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u", + tidq_stats->txq_st.num_pkts_queued[0], + tidq_stats->txq_st.num_pkts_queued[1], + tidq_stats->txq_st.num_pkts_queued[2], + tidq_stats->txq_st.num_pkts_queued[3], + tidq_stats->txq_st.num_pkts_queued[4], + tidq_stats->txq_st.num_pkts_queued[5], + tidq_stats->txq_st.num_pkts_queued[6], + tidq_stats->txq_st.num_pkts_queued[7], + tidq_stats->txq_st.num_pkts_queued[8], + tidq_stats->txq_st.num_pkts_queued[9]); + qdf_print("tid_hw_qdepth(0..19):"); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u", + tidq_stats->txq_st.tid_hw_qdepth[0], + tidq_stats->txq_st.tid_hw_qdepth[1], + tidq_stats->txq_st.tid_hw_qdepth[2], + tidq_stats->txq_st.tid_hw_qdepth[3], + tidq_stats->txq_st.tid_hw_qdepth[4], + tidq_stats->txq_st.tid_hw_qdepth[5], + tidq_stats->txq_st.tid_hw_qdepth[6], + tidq_stats->txq_st.tid_hw_qdepth[7], + tidq_stats->txq_st.tid_hw_qdepth[8], + tidq_stats->txq_st.tid_hw_qdepth[9]); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u", + tidq_stats->txq_st.tid_hw_qdepth[10], + tidq_stats->txq_st.tid_hw_qdepth[11], + tidq_stats->txq_st.tid_hw_qdepth[12], + tidq_stats->txq_st.tid_hw_qdepth[13], + tidq_stats->txq_st.tid_hw_qdepth[14], + tidq_stats->txq_st.tid_hw_qdepth[15], + tidq_stats->txq_st.tid_hw_qdepth[16], + tidq_stats->txq_st.tid_hw_qdepth[17], + tidq_stats->txq_st.tid_hw_qdepth[18], + tidq_stats->txq_st.tid_hw_qdepth[19]); + qdf_print("tid_sw_qdepth(0..19):"); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u", + tidq_stats->txq_st.tid_sw_qdepth[0], + tidq_stats->txq_st.tid_sw_qdepth[1], + tidq_stats->txq_st.tid_sw_qdepth[2], + tidq_stats->txq_st.tid_sw_qdepth[3], + tidq_stats->txq_st.tid_sw_qdepth[4], + tidq_stats->txq_st.tid_sw_qdepth[5], + tidq_stats->txq_st.tid_sw_qdepth[6], + tidq_stats->txq_st.tid_sw_qdepth[7], + tidq_stats->txq_st.tid_sw_qdepth[8], + tidq_stats->txq_st.tid_sw_qdepth[9]); + qdf_print("%u, %u, %u, %u, %u, %u, %u, %u, %u, %u", + tidq_stats->txq_st.tid_sw_qdepth[10], + tidq_stats->txq_st.tid_sw_qdepth[11], + tidq_stats->txq_st.tid_sw_qdepth[12], + tidq_stats->txq_st.tid_sw_qdepth[13], + tidq_stats->txq_st.tid_sw_qdepth[14], + tidq_stats->txq_st.tid_sw_qdepth[15], + tidq_stats->txq_st.tid_sw_qdepth[16], + tidq_stats->txq_st.tid_sw_qdepth[17], + tidq_stats->txq_st.tid_sw_qdepth[18], + tidq_stats->txq_st.tid_sw_qdepth[19]); +} + +void htt_t2h_stats_tx_mu_stats_print( + struct wlan_dbg_tx_mu_stats *tx_mu_stats, int concise) +{ + qdf_print("TX MU STATS:"); + qdf_print("mu_sch_nusers_2: %u", tx_mu_stats->mu_sch_nusers_2); + qdf_print("mu_sch_nusers_3: %u", tx_mu_stats->mu_sch_nusers_3); + qdf_print("mu_mpdus_queued_usr: %u, %u, %u, %u", + tx_mu_stats->mu_mpdus_queued_usr[0], + tx_mu_stats->mu_mpdus_queued_usr[1], + tx_mu_stats->mu_mpdus_queued_usr[2], + tx_mu_stats->mu_mpdus_queued_usr[3]); + qdf_print("mu_mpdus_tried_usr: %u, %u, %u, %u", + tx_mu_stats->mu_mpdus_tried_usr[0], + tx_mu_stats->mu_mpdus_tried_usr[1], + tx_mu_stats->mu_mpdus_tried_usr[2], + tx_mu_stats->mu_mpdus_tried_usr[3]); + qdf_print("mu_mpdus_failed_usr: %u, %u, %u, %u", + tx_mu_stats->mu_mpdus_failed_usr[0], + tx_mu_stats->mu_mpdus_failed_usr[1], + tx_mu_stats->mu_mpdus_failed_usr[2], + tx_mu_stats->mu_mpdus_failed_usr[3]); + qdf_print("mu_mpdus_requeued_usr: %u, %u, %u, %u", + tx_mu_stats->mu_mpdus_requeued_usr[0], + tx_mu_stats->mu_mpdus_requeued_usr[1], + tx_mu_stats->mu_mpdus_requeued_usr[2], + tx_mu_stats->mu_mpdus_requeued_usr[3]); + qdf_print("mu_err_no_ba_usr: %u, %u, %u, %u", + tx_mu_stats->mu_err_no_ba_usr[0], + tx_mu_stats->mu_err_no_ba_usr[1], + tx_mu_stats->mu_err_no_ba_usr[2], + tx_mu_stats->mu_err_no_ba_usr[3]); + qdf_print("mu_mpdu_underrun_usr: %u, %u, %u, %u", + tx_mu_stats->mu_mpdu_underrun_usr[0], + tx_mu_stats->mu_mpdu_underrun_usr[1], + tx_mu_stats->mu_mpdu_underrun_usr[2], + tx_mu_stats->mu_mpdu_underrun_usr[3]); + qdf_print("mu_ampdu_underrun_usr: %u, %u, %u, %u", + tx_mu_stats->mu_ampdu_underrun_usr[0], + tx_mu_stats->mu_ampdu_underrun_usr[1], + tx_mu_stats->mu_ampdu_underrun_usr[2], + tx_mu_stats->mu_ampdu_underrun_usr[3]); + +} + +void htt_t2h_stats_sifs_resp_stats_print( + struct wlan_dbg_sifs_resp_stats *sifs_stats, int concise) +{ + qdf_print("SIFS RESP STATS:"); + qdf_print("num of ps-poll trigger frames: %u", + sifs_stats->ps_poll_trigger); + qdf_print("num of uapsd trigger frames: %u", + sifs_stats->uapsd_trigger); + qdf_print("num of data trigger frames: %u, %u", + sifs_stats->qb_data_trigger[0], + sifs_stats->qb_data_trigger[1]); + qdf_print("num of bar trigger frames: %u, %u", + sifs_stats->qb_bar_trigger[0], + sifs_stats->qb_bar_trigger[1]); + qdf_print("num of ppdu transmitted at SIFS interval: %u", + sifs_stats->sifs_resp_data); + qdf_print("num of ppdu failed to meet SIFS resp timing: %u", + sifs_stats->sifs_resp_err); +} + void htt_t2h_stats_print(uint8_t *stats_data, int concise) { uint32_t *msg_word = (uint32_t *) stats_data; @@ -1013,10 +1124,10 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise) if (status == HTT_DBG_STATS_STATUS_SERIES_DONE) { return; } else if (status == HTT_DBG_STATS_STATUS_INVALID) { - qdf_print("Target doesn't support stats type %d\n", type); + qdf_print("Target doesn't support stats type %d", type); return; } else if (status == HTT_DBG_STATS_STATUS_ERROR) { - qdf_print("Target couldn't upload stats type %d (no mem?)\n", + qdf_print("Target couldn't upload stats type %d (no mem?)", type); return; } @@ -1069,7 +1180,7 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise) if (status == HTT_DBG_STATS_STATUS_PARTIAL && length == 0) { qdf_print - ("HTT_DBG_STATS_TX_PPDU_LOG -- length = 0!\n"); + ("HTT_DBG_STATS_TX_PPDU_LOG -- length = 0!"); break; } hdr = @@ -1149,6 +1260,30 @@ void htt_t2h_stats_print(uint8_t *stats_data, int concise) htt_t2h_rx_musu_ndpa_pkts_stats_print(rx_musu_ndpa_stats); break; } + case HTT_DBG_STATS_TIDQ: + { + struct wlan_dbg_tidq_stats *tidq_stats; + tidq_stats = (struct wlan_dbg_tidq_stats *)(msg_word + 1); + + htt_t2h_stats_tidq_stats_print(tidq_stats, concise); + break; + } + case HTT_DBG_STATS_TX_MU_INFO: + { + struct wlan_dbg_tx_mu_stats *tx_mu_stats; + tx_mu_stats = (struct wlan_dbg_tx_mu_stats *)(msg_word + 1); + + htt_t2h_stats_tx_mu_stats_print(tx_mu_stats, concise); + break; + } + case HTT_DBG_STATS_SIFS_RESP_INFO: + { + struct wlan_dbg_sifs_resp_stats *sifs_stats; + sifs_stats = (struct wlan_dbg_sifs_resp_stats *)(msg_word + 1); + + htt_t2h_stats_sifs_resp_stats_print(sifs_stats, concise); + break; + } default: break; } diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 062faaa6e035..8dc2d4862d08 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -206,19 +206,6 @@ #define WMA_BSS_STATUS_STARTED 0x1 #define WMA_BSS_STATUS_STOPPED 0x2 -#define WMA_FW_PHY_STATS 0x1 -#define WMA_FW_RX_REORDER_STATS 0x2 -#define WMA_FW_RX_RC_STATS 0x3 -#define WMA_FW_TX_PPDU_STATS 0x4 -#define WMA_FW_TX_CONCISE_STATS 0x5 -#define WMA_FW_TX_RC_STATS 0x6 -#define WMA_FW_TXBF_INFO_STATS 0x07 -#define WMA_FW_SND_INFO_STATS 0x08 -#define WMA_FW_ERROR_INFO_STATS 0x09 -#define WMA_FW_TX_SELFGEN_INFO_STATS 0xa -#define WMA_FW_RX_REM_RING_BUF 0xc -#define WMA_FW_RX_TXBF_MUSU_NDPA 0xf - #define WMA_TARGET_REQ_TYPE_VDEV_START 0x1 #define WMA_TARGET_REQ_TYPE_VDEV_STOP 0x2 #define WMA_TARGET_REQ_TYPE_VDEV_DEL 0x3 diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 8ef3e1757eab..7816236f9c4d 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -406,6 +406,7 @@ int wma_stats_ext_event_handler(void *handle, uint8_t *event_buf, } #endif /* WLAN_FEATURE_STATS_EXT */ + /** * wma_profile_data_report_event_handler() - fw profiling handler * @handle: wma handle @@ -423,6 +424,7 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, uint32_t i = 0; uint32_t entries; uint8_t *buf_ptr; + char temp_str[150]; param_buf = (WMI_WLAN_PROFILE_DATA_EVENTID_param_tlvs *) event_buf; if (!param_buf) { @@ -452,19 +454,14 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, profile_ctx->rx_mpdu_cnt, profile_ctx->bin_count); + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, + "Profile ID: Count: TOT: Min: Max: hist_intvl: hist[0]: hist[1]:hist[2]"); + for (i = 0; i < entries; i++) { if (i == WMI_WLAN_PROFILE_MAX_BIN_CNT) break; - QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, - "Profile ID: %d\n" - "Profile Count: %d\n" - "Profile TOT: %d\n" - "Profile Min: %d\n" - "Profile Max: %d\n" - "Profile hist_intvl: %d\n" - "Profile hist[0]: %d\n" - "Profile hist[1]: %d\n" - "Profile hist[2]: %d\n", + snprintf(temp_str, sizeof(temp_str), + " %d : %d : %d : %d : %d : %d : %d : %d : %d", profile_data[i].id, profile_data[i].cnt, profile_data[i].tot, @@ -474,6 +471,8 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf, profile_data[i].hist[0], profile_data[i].hist[1], profile_data[i].hist[2]); + QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, + "%s", temp_str); } return 0; @@ -1782,6 +1781,32 @@ int32_t wma_txrx_fw_stats_reset(tp_wma_handle wma_handle, ((_mask) = 1 << (_rate_info)) #endif +#ifdef HELIUMPLUS +bool wma_is_valid_fw_stats_cmd(uint32_t value) +{ + if (value > (HTT_DBG_NUM_STATS + 1) || + value == (HTT_DBG_STATS_RX_RATE_INFO + 1) || + value == (HTT_DBG_STATS_TX_RATE_INFO + 1) || + value == (HTT_DBG_STATS_TXBF_MUSU_NDPA_PKT + 1)) { + WMA_LOGE("%s: Not supported", __func__); + return false; + } + return true; +} +#else +bool wma_is_valid_fw_stats_cmd(uint32_t value) +{ + if (value > (HTT_DBG_NUM_STATS + 1) || + value == (HTT_DBG_STATS_RX_RATE_INFO_V2 + 1) || + value == (HTT_DBG_STATS_TX_RATE_INFO_V2 + 1) || + value == (HTT_DBG_STATS_TXBF_MUSU_NDPA_PKT + 1)) { + WMA_LOGE("%s: Not supported", __func__); + return false; + } + return true; +} +#endif + /** * wma_set_txrx_fw_stats_level() - set txrx fw stats level * @wma_handle: wma handle @@ -1802,84 +1827,15 @@ int32_t wma_set_txrx_fw_stats_level(tp_wma_handle wma_handle, WMA_LOGE("%s:Invalid vdev handle", __func__); return -EINVAL; } - qdf_mem_zero(&req, sizeof(req)); - req.print.verbose = 1; - - switch (value) { - /* txrx_fw_stats 1 */ - case WMA_FW_PHY_STATS: - l_up_mask = 1 << HTT_DBG_STATS_WAL_PDEV_TXRX; - break; - - /* txrx_fw_stats 2 */ - case WMA_FW_RX_REORDER_STATS: - l_up_mask = 1 << HTT_DBG_STATS_RX_REORDER; - break; - - /* txrx_fw_stats 3 */ - case WMA_FW_RX_RC_STATS: - SET_UPLOAD_MASK(l_up_mask, HTT_DBG_STATS_RX_RATE_INFO); - break; - /* txrx_fw_stats 5 */ - case WMA_FW_TX_CONCISE_STATS: - req.print.concise = 1; - /* No break here, since l_up_mask is same for - * both WMA_FW_TX_CONCISE_STATS & WMA_FW_TX_PPDU_STATS */ - - /* txrx_fw_stats 4 */ - case WMA_FW_TX_PPDU_STATS: - l_up_mask = 1 << HTT_DBG_STATS_TX_PPDU_LOG; - break; - - /* txrx_fw_stats 6 */ - case WMA_FW_TX_RC_STATS: - SET_UPLOAD_MASK(l_up_mask, HTT_DBG_STATS_TX_RATE_INFO); - break; - - /* txrx_fw_stats 12 */ - /* - * This is 1:1 correspondence with WMA defined value - * and the f/w bitmask. - */ - case WMA_FW_RX_REM_RING_BUF: - l_up_mask = 1 << HTT_DBG_STATS_RX_REMOTE_RING_BUFFER_INFO; - break; - - /* txrx_fw_stats 7 */ - case WMA_FW_TXBF_INFO_STATS: - l_up_mask = 1 << HTT_DBG_STATS_TXBF_INFO; - break; - - /* txrx_fw_stats 8 */ - case WMA_FW_SND_INFO_STATS: - l_up_mask = 1 << HTT_DBG_STATS_SND_INFO; - break; - - /* txrx_fw_stats 9 */ - case WMA_FW_ERROR_INFO_STATS: - l_up_mask = 1 << HTT_DBG_STATS_ERROR_INFO; - break; - - /* txrx_fw_stats 10 */ - case WMA_FW_TX_SELFGEN_INFO_STATS: - l_up_mask = 1 << HTT_DBG_STATS_TX_SELFGEN_INFO; - break; + if (wma_is_valid_fw_stats_cmd(value) == false) + return -EINVAL; - /* txrx_fw_stats 15 */ - /* - * This is 1:1 correspondence with WMA defined value - * and the f/w bitmask. - */ - case WMA_FW_RX_TXBF_MUSU_NDPA: - l_up_mask = 1 << HTT_DBG_STATS_TXBF_MUSU_NDPA_PKT; - break; + qdf_mem_zero(&req, sizeof(req)); + req.print.verbose = 1; - default: - qdf_print("%s %d Invalid value %d\n", - __func__, __LINE__, value); - return 0; - } + /* TODO: Need to check how to avoid mem leak*/ + l_up_mask = 1 << (value - 1); req.stats_type_upload_mask = l_up_mask; ol_txrx_fw_stats_get(vdev, &req, true); -- cgit v1.2.3 From 242002c7590f9273fe373beb3ca31f30cdc5aa14 Mon Sep 17 00:00:00 2001 From: Peng Xu Date: Mon, 29 Feb 2016 14:39:18 -0800 Subject: qcacld-3.0: Increase connection update timeout value Current connection update timeout value for DBS concurrency case is 500ms, which is not long enough as there are other WMI messages need to be processed by master thread. Increase the timeout value to 1000ms to ensure the set hardware mode WMI message has enough time to be processed Change-Id: Idecf2e830a7a37258787eb4f8c5f117cbe2a825b CRs-fixed: 983174 --- core/cds/inc/cds_concurrency.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 14394162ea29..d79d9d236055 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -41,7 +41,12 @@ #define MAX_NUMBER_OF_CONC_CONNECTIONS 3 #define MAX_NUM_CHAN 128 #define DBS_OPPORTUNISTIC_TIME 10 -#define CONNECTION_UPDATE_TIMEOUT 500 +#ifdef QCA_WIFI_3_0_EMU +#define CONNECTION_UPDATE_TIMEOUT 3000 +#else +#define CONNECTION_UPDATE_TIMEOUT 1000 +#endif + /** * enum cds_max_rx_ss - Maximum number of receive spatial streams -- cgit v1.2.3 From 90aaa6ae4991e31a5d6c428ce17b5abd43f61b04 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Tue, 1 Mar 2016 16:53:37 -0800 Subject: qcacld-3.0: Fix setting vht160/80p80 driver capablities. We dont need to set both 80p80 and 160 mhz driver capabilties in driver. Since 160 is a subset of 80p80 capability; we need to set only one Change-Id: I20ea254523bade3ad93e49added35d4bdc1d0509 CRs-Fixed: 985763 --- core/hdd/src/wlan_hdd_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 0fae759c29ae..79b527354eb0 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1222,14 +1222,12 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx, band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895; - if (cfg->supp_chan_width & (1 << eHT_CHANNEL_WIDTH_80P80MHZ)) { + if (cfg->supp_chan_width & (1 << eHT_CHANNEL_WIDTH_80P80MHZ)) band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ; - } - if (cfg->supp_chan_width & (1 << eHT_CHANNEL_WIDTH_160MHZ)) { + else if (cfg->supp_chan_width & (1 << eHT_CHANNEL_WIDTH_160MHZ)) band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ; - } if (cfg->vht_rx_ldpc & WMI_VHT_CAP_RX_LDPC) band_5g->vht_cap.cap |= IEEE80211_VHT_CAP_RXLDPC; -- cgit v1.2.3 From 7e16b0a68f55038df67045bfb7d1bda9e5bf83f1 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Tue, 8 Mar 2016 15:24:48 -0800 Subject: qcacld-3.0: Use fastpath Tx entry point with flowcontrol V2 Use common entry point ol_tx_ll_wrapper and use fastpath Tx if enabled. Change-Id: I3a19fd6af43ab10eb5d8dd2754134a8dbc3783ab CRs-Fixed: 987182 --- core/dp/txrx/ol_tx.c | 4 ++-- core/dp/txrx/ol_tx.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c index 3b324abfd5d8..e8b5e9b7d2c0 100644 --- a/core/dp/txrx/ol_tx.c +++ b/core/dp/txrx/ol_tx.c @@ -702,7 +702,7 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) * ol_tx_ll_wrapper() wrapper to ol_tx_ll * */ -static inline qdf_nbuf_t +qdf_nbuf_t ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { struct hif_opaque_softc *hif_device = @@ -716,7 +716,7 @@ ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) return msdu_list; } #else -static inline qdf_nbuf_t +qdf_nbuf_t ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list) { return ol_tx_ll(vdev, msdu_list); diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h index 3b2acf499e2a..d90e44d697e5 100644 --- a/core/dp/txrx/ol_tx.h +++ b/core/dp/txrx/ol_tx.h @@ -37,7 +37,10 @@ #include /* ol_txrx_vdev_t, etc. */ #include /* ol_tx_spec */ +#include /* ol_tx_desc_t, ol_txrx_msdu_info_t */ + qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); +qdf_nbuf_t ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef WLAN_FEATURE_FASTPATH qdf_nbuf_t ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #endif @@ -47,7 +50,7 @@ qdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list); #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL #define OL_TX_LL ol_tx_ll_queue #else -#define OL_TX_LL ol_tx_ll +#define OL_TX_LL ol_tx_ll_wrapper #endif #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL -- cgit v1.2.3 From dd4dd08b2c87f226777d7725b8c599641504988e Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Thu, 25 Feb 2016 12:24:32 -0800 Subject: qcacld-3.0: Fix deadlock in hdd_adapter_lock usage hdd_adapter_lock is acquired from MC thread and hif_napi soft IRQ context so it should be acquired using spin_lock_bh such that when MC thread is holding the lock soft IRQ can't pre-empt it and lead to deadlock Change-Id: Iee4a4905bf7cc09cba9bd26f416d505eb47a5c96 CRs-Fixed: 981886 --- core/hdd/src/wlan_hdd_main.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 79b527354eb0..2c954e302bbc 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3272,10 +3272,10 @@ QDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_peek_front(&hdd_ctx->hddAdapters, (qdf_list_node_t **) padapterNode); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3284,12 +3284,12 @@ QDF_STATUS hdd_get_next_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **pNextAdapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_peek_next(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode, (qdf_list_node_t **) pNextAdapterNode); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3297,10 +3297,10 @@ QDF_STATUS hdd_remove_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_remove_node(&hdd_ctx->hddAdapters, &adapterNode->node); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3308,10 +3308,10 @@ QDF_STATUS hdd_remove_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_remove_front(&hdd_ctx->hddAdapters, (qdf_list_node_t **) padapterNode); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3319,10 +3319,10 @@ QDF_STATUS hdd_add_adapter_back(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_back(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } @@ -3330,10 +3330,10 @@ QDF_STATUS hdd_add_adapter_front(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t *adapterNode) { QDF_STATUS status; - qdf_spin_lock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_lock_bh(&hdd_ctx->hdd_adapter_lock); status = qdf_list_insert_front(&hdd_ctx->hddAdapters, (qdf_list_node_t *) adapterNode); - qdf_spin_unlock(&hdd_ctx->hdd_adapter_lock); + qdf_spin_unlock_bh(&hdd_ctx->hdd_adapter_lock); return status; } -- cgit v1.2.3 From 28ab41212dee52cff7adf4ae5c4af3476b5128d7 Mon Sep 17 00:00:00 2001 From: Archana Ramachandran Date: Tue, 8 Mar 2016 16:17:14 -0800 Subject: qcacld-3.0: Fix memory leak in protocol stack due to cdf_mem_free removal Fix memory leak in protocol stack due to cdf_mem_free removal. CRs-Fixed: 987178 Change-Id: If2aa813322cbfea68001862098e6c0b18e6921ae --- core/wma/src/wma_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index 485aff03d4ae..e4e69ae9985c 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -5235,6 +5235,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) case WMA_GW_PARAM_UPDATE_REQ: wma_set_gateway_params(wma_handle, (struct gateway_param_update_req *)msg->bodyptr); + qdf_mem_free(msg->bodyptr); break; case WMA_SET_EGAP_CONF_PARAMS: wma_send_egap_conf_params(wma_handle, -- cgit v1.2.3 From 762490223734d19ef49de92449027bf3b8257452 Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Wed, 9 Mar 2016 11:53:55 -0800 Subject: Release 5.1.0.7G Release 5.1.0.7G Change-Id: Ic169127937315b8f84983b656fbf97ff824234d7 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 2a972614bf96..4f3977ba447c 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 6 +#define QWLAN_VERSION_BUILD 7 -#define QWLAN_VERSIONSTR "5.1.0.6G" +#define QWLAN_VERSIONSTR "5.1.0.7G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 276241e3d2f1e3f0e4ef28fcfb8a41f6b5758348 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 12:58:11 -0800 Subject: qcacld-3.0: (part-1)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: Ie41244becec39fe1f5f24a721f5b24e137e7fd26 CRs-Fixed: 985273 --- core/cds/inc/cds_concurrency.h | 4 ++-- core/hdd/inc/wlan_hdd_main.h | 36 ++++++++---------------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index d79d9d236055..11aebdd2ccf2 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -644,8 +644,8 @@ static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) return NULL; } #endif -enum cds_con_mode cds_convert_device_mode_to_hdd_type( - device_mode_t device_mode); +enum cds_con_mode cds_convert_device_mode_to_qdf_type( + enum tQDF_ADAPTER_MODE device_mode); QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, enum hw_mode_ss_config mac0_ss, enum hw_mode_bandwidth mac0_bw, diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 520c5440ebc0..156865465e55 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -546,28 +546,6 @@ typedef struct beacon_data_s { int dtim_period; } beacon_data_t; -/** - * enum device_mode: Maintain one to one correspondence with tQDF_ADAPTER_MODE - * @WLAN_HDD_INFRA_STATION: station mode - * @WLAN_HDD_SOFTAP: sap mode - * @WLAN_HDD_P2P_CLIENT: p2p client mode - * @WLAN_HDD_P2P_GO: p2p go mode - * @WLAN_HDD_FTM: ftm mode - * @WLAN_HDD_IBSS: ibss mode - * @WLAN_HDD_P2P_DEVICE: p2p device mode - * @WLAN_HDD_OCB: ocb mode - */ -typedef enum device_mode { - WLAN_HDD_INFRA_STATION, - WLAN_HDD_SOFTAP, - WLAN_HDD_P2P_CLIENT, - WLAN_HDD_P2P_GO, - WLAN_HDD_FTM, - WLAN_HDD_IBSS, - WLAN_HDD_P2P_DEVICE, - WLAN_HDD_OCB -} device_mode_t; - typedef enum rem_on_channel_request_type { REMAIN_ON_CHANNEL_REQUEST, OFF_CHANNEL_ACTION_TX, @@ -869,7 +847,7 @@ struct hdd_adapter_s { /** Handle to the network device */ struct net_device *dev; - device_mode_t device_mode; + enum tQDF_ADAPTER_MODE device_mode; /** IPv4 notifier callback for handling ARP offload on change in IP */ struct work_struct ipv4NotifierWorkQueue; @@ -1080,8 +1058,8 @@ struct hdd_adapter_s { #endif #ifdef FEATURE_WLAN_TDLS #define WLAN_HDD_IS_TDLS_SUPPORTED_ADAPTER(pAdapter) \ - (((WLAN_HDD_INFRA_STATION != pAdapter->device_mode) && \ - (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode)) ? 0 : 1) + (((QDF_STA_MODE != pAdapter->device_mode) && \ + (QDF_P2P_CLIENT_MODE != pAdapter->device_mode)) ? 0 : 1) #define WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter) \ ((WLAN_HDD_IS_TDLS_SUPPORTED_ADAPTER(pAdapter)) ? \ (tdlsCtx_t *)(pAdapter)->sessionCtx.station.pHddTdlsCtx : NULL) @@ -1457,7 +1435,8 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *pHddCtx, hdd_adapter_t *hdd_get_adapter_by_macaddr(hdd_context_t *pHddCtx, tSirMacAddr macAddr); QDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter); -hdd_adapter_t *hdd_get_adapter(hdd_context_t *pHddCtx, device_mode_t mode); +hdd_adapter_t *hdd_get_adapter(hdd_context_t *pHddCtx, + enum tQDF_ADAPTER_MODE mode); void hdd_deinit_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, bool rtnl_held); QDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, @@ -1465,7 +1444,8 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *pHddCtx, hdd_adapter_t *pAdapter, void hdd_set_station_ops(struct net_device *pWlanDev); uint8_t *wlan_hdd_get_intf_addr(hdd_context_t *pHddCtx); void wlan_hdd_release_intf_addr(hdd_context_t *pHddCtx, uint8_t *releaseAddr); -uint8_t hdd_get_operating_channel(hdd_context_t *pHddCtx, device_mode_t mode); +uint8_t hdd_get_operating_channel(hdd_context_t *pHddCtx, + enum tQDF_ADAPTER_MODE mode); void hdd_set_conparam(uint32_t con_param); enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void); @@ -1636,7 +1616,7 @@ QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void); #else static inline QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void) { - return CDF_STATUS_SUCCESS; + return QDF_STATUS_SUCCESS; } #endif -- cgit v1.2.3 From be766b01b88f302148eae2fa45cda672af757cc2 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:00:44 -0800 Subject: qcacld-3.0: (part-2)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: If20617734c5f6f71cef6b85b86d907f8be9d39f9 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_assoc.c | 34 ++++++++++++++-------------- core/hdd/src/wlan_hdd_debugfs.c | 2 +- core/hdd/src/wlan_hdd_ext_scan.c | 2 +- core/hdd/src/wlan_hdd_ftm.c | 6 ++--- core/hdd/src/wlan_hdd_green_ap.c | 2 +- core/hdd/src/wlan_hdd_ioctl.c | 48 ++++++++++++++++++++-------------------- core/hdd/src/wlan_hdd_ipa.c | 12 +++++----- core/hdd/src/wlan_hdd_ocb.c | 18 +++++++-------- core/hdd/src/wlan_hdd_oemdata.c | 4 ++-- 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 80f775392fb8..d8f8742e2ea3 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -731,7 +731,7 @@ static void hdd_send_association_event(struct net_device *dev, sizeof(pCsrRoamInfo->pBssDesc->bssId)); #ifdef WLAN_FEATURE_P2P_DEBUG - if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) { if (global_p2p_connection_status == P2P_CLIENT_CONNECTING_STATE_1) { global_p2p_connection_status = @@ -772,7 +772,7 @@ static void hdd_send_association_event(struct net_device *dev, ) { hdd_send_ft_assoc_response(dev, pAdapter, pCsrRoamInfo); } - if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) { tSirSmeChanInfo chan_info; qdf_copy_macaddr(&peerMacAddr, &pHddStaCtx->conn_info.bssId); @@ -825,7 +825,7 @@ static void hdd_send_association_event(struct net_device *dev, wlan_hdd_auto_shutdown_enable(pHddCtx, true); #endif - if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) { qdf_copy_macaddr(&peerMacAddr, &pHddStaCtx->conn_info.bssId); @@ -840,7 +840,7 @@ static void hdd_send_association_event(struct net_device *dev, wlan_hdd_send_status_pkg(pAdapter, pHddStaCtx, 1, 0); #endif #ifdef FEATURE_WLAN_TDLS - if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) && + if ((pAdapter->device_mode == QDF_STA_MODE) && (pCsrRoamInfo)) { hddLog(LOG4, FL("tdls_prohibited: %d, tdls_chan_swit_prohibited: %d"), @@ -1064,7 +1064,7 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, */ if (cds_is_load_or_unload_in_progress()) { #ifdef WLAN_FEATURE_P2P_DEBUG - if (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) { if (global_p2p_connection_status == P2P_CLIENT_CONNECTED_STATE_1) { global_p2p_connection_status = @@ -1137,8 +1137,8 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, hddLog(LOG1, FL("Set HDD connState to eConnectionState_NotConnected")); hdd_conn_set_connection_state(pAdapter, eConnectionState_NotConnected); #ifdef WLAN_FEATURE_GTK_OFFLOAD - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { memset(&pHddStaCtx->gtkOffloadReqParams, 0, sizeof(tSirGtkOffloadParams)); pHddStaCtx->gtkOffloadReqParams.ulFlags = GTK_OFFLOAD_DISABLE; @@ -1150,8 +1150,8 @@ static QDF_STATUS hdd_dis_connect_handler(hdd_adapter_t *pAdapter, wlan_hdd_tdls_disconnection_callback(pAdapter); #endif - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { sme_ps_disable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX (pAdapter), pAdapter->sessionId); @@ -1243,8 +1243,8 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, return QDF_STATUS_E_FAULT; } - if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || - pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode == QDF_STA_MODE || + pAdapter->device_mode == QDF_P2P_CLIENT_MODE) { #if defined(QCA_LL_LEGACY_TX_FLOW_CONTROL) || defined(QCA_LL_TX_FLOW_CONTROL_V2) unsigned long rc; @@ -1545,8 +1545,8 @@ static int hdd_change_sta_state_authenticated(hdd_adapter_t *adapter, OL_TXRX_PEER_STATE_AUTH, hdd_is_roam_sync_in_progress(roaminfo)); hdd_conn_set_authenticated(adapter, true); - if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == adapter->device_mode)) { + if ((QDF_STA_MODE == adapter->device_mode) || + (QDF_P2P_CLIENT_MODE == adapter->device_mode)) { sme_ps_enable_auto_ps_timer( WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId, @@ -1595,7 +1595,7 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, fConnected = hdd_conn_get_connected_cipher_algo(pHddStaCtx, &connectedCipherAlgo); if (fConnected) { - if (WLAN_HDD_IBSS == pAdapter->device_mode) { + if (QDF_IBSS_MODE == pAdapter->device_mode) { uint8_t staId; if (qdf_is_macaddr_broadcast(&pRoamInfo->peerMac)) { @@ -4531,7 +4531,7 @@ int hdd_set_genie_to_csr(hdd_adapter_t *pAdapter, eCsrAuthType *RSNAuthType) pWextState->roamProfile.mcEncryptionType.encryptionType[0] = mcRSNEncryptType; - if ((WLAN_HDD_IBSS == pAdapter->device_mode) && + if ((QDF_IBSS_MODE == pAdapter->device_mode) && ((eCSR_ENCRYPT_TYPE_AES == mcRSNEncryptType) || (eCSR_ENCRYPT_TYPE_TKIP == mcRSNEncryptType))) { /* @@ -4734,8 +4734,8 @@ static int __iw_set_essid(struct net_device *dev, if (0 != ret) return ret; - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION && - pAdapter->device_mode != WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode != QDF_STA_MODE && + pAdapter->device_mode != QDF_P2P_CLIENT_MODE) { hddLog(LOGW, FL("device mode %s(%d) is not allowed"), hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index 89aac4e51cc9..dd9fc15957ad 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -430,7 +430,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, * patterns */ hdd_info("device mode %d", pAdapter->device_mode); - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) && + if ((QDF_STA_MODE == pAdapter->device_mode) && (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: Not in Connected state!", __func__); diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c index 3303e1f59dd5..06473990b67c 100644 --- a/core/hdd/src/wlan_hdd_ext_scan.c +++ b/core/hdd/src/wlan_hdd_ext_scan.c @@ -2538,7 +2538,7 @@ __wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy, hdd_remove_dsrc_channels(wiphy, chan_list, &num_channels); - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || + if ((QDF_SAP_MODE == pAdapter->device_mode) || !strncmp(hdd_get_fwpath(), "ap", 2)) hdd_remove_indoor_channels(wiphy, chan_list, &num_channels); diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c index 1c6c5d07fa93..94cd241c2bef 100644 --- a/core/hdd/src/wlan_hdd_ftm.c +++ b/core/hdd/src/wlan_hdd_ftm.c @@ -611,9 +611,9 @@ err_qdf_status_failure: static int hdd_ftm_service_registration(hdd_context_t *hdd_ctx) { hdd_adapter_t *adapter; - adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_FTM, "wlan%d", + adapter = hdd_open_adapter(hdd_ctx, QDF_FTM_MODE, "wlan%d", wlan_hdd_get_intf_addr(hdd_ctx), - NET_NAME_UNKNOWN, false); + NET_NAME_UNKNOWN, false); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed", __func__); @@ -659,7 +659,7 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx) QDF_STATUS qdf_status; v_CONTEXT_t cds_context = hdd_ctx->pcds_context; - hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM); + hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, QDF_FTM_MODE); ENTER(); if (adapter == NULL) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c index ae802895d1d7..83f015452238 100644 --- a/core/hdd/src/wlan_hdd_green_ap.c +++ b/core/hdd/src/wlan_hdd_green_ap.c @@ -193,7 +193,7 @@ static void hdd_wlan_green_ap_mc(struct hdd_context_s *hdd_ctx, goto done; } - adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (adapter == NULL) { hdd_err("Green-AP no SAP adapter"); goto done; diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index b08bcf6ec900..90104812d73e 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -874,7 +874,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid, hdd_station_ctx_t *pHddStaCtx; int ret = 0; - if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { + if (QDF_STA_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -1061,7 +1061,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid, struct cfg80211_mgmt_tx_params params; #endif - if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { + if (QDF_STA_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -2451,8 +2451,8 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter) return 0; } - if ((WLAN_HDD_INFRA_STATION != adapter->device_mode) && - (WLAN_HDD_P2P_CLIENT != adapter->device_mode)) { + if ((QDF_STA_MODE != adapter->device_mode) && + (QDF_P2P_CLIENT_MODE != adapter->device_mode)) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -2883,9 +2883,9 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) "%s: HDD context is null", __func__); return -EINVAL; } - if ((WLAN_HDD_IBSS != pAdapter->device_mode) && - (WLAN_HDD_SOFTAP != pAdapter->device_mode) && - (WLAN_HDD_INFRA_STATION != pAdapter->device_mode)) { + if ((QDF_IBSS_MODE != pAdapter->device_mode) && + (QDF_SAP_MODE != pAdapter->device_mode) && + (QDF_STA_MODE != pAdapter->device_mode)) { hddLog(LOGE, FL("Received SETMCRATE cmd in invalid mode %s(%d)"), hdd_device_mode_to_string(pAdapter->device_mode), @@ -4660,7 +4660,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, #endif hdd_station_ctx_t *pHddStaCtx; - if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { + if (QDF_STA_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -5205,7 +5205,7 @@ static int drv_cmd_set_ibss_beacon_oui_data(hdd_adapter_t *adapter, hdd_wext_state_t *pWextState; - if (WLAN_HDD_IBSS != adapter->device_mode) { + if (QDF_IBSS_MODE != adapter->device_mode) { hddLog(LOG1, FL("Device_mode %s(%d) not IBSS"), hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -5316,8 +5316,8 @@ static int drv_cmd_set_rmc_enable(hdd_adapter_t *adapter, uint8_t ucRmcEnable = 0; int status; - if ((WLAN_HDD_IBSS != adapter->device_mode) && - (WLAN_HDD_SOFTAP != adapter->device_mode)) { + if ((QDF_IBSS_MODE != adapter->device_mode) && + (QDF_SAP_MODE != adapter->device_mode)) { hddLog(LOGE, "Received SETRMCENABLE cmd in invalid mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), @@ -5381,8 +5381,8 @@ static int drv_cmd_set_rmc_action_period(hdd_adapter_t *adapter, uint32_t uActionPeriod = 0; int status; - if ((WLAN_HDD_IBSS != adapter->device_mode) && - (WLAN_HDD_SOFTAP != adapter->device_mode)) { + if ((QDF_IBSS_MODE != adapter->device_mode) && + (QDF_SAP_MODE != adapter->device_mode)) { hddLog(LOGE, "Received SETRMC cmd in invalid mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -5447,7 +5447,7 @@ static int drv_cmd_get_ibss_peer_info_all(hdd_adapter_t *adapter, uint32_t txRateMbps = 0; uint32_t numOfBytestoPrint = 0; - if (WLAN_HDD_IBSS != adapter->device_mode) { + if (QDF_IBSS_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -5603,7 +5603,7 @@ static int drv_cmd_get_ibss_peer_info(hdd_adapter_t *adapter, uint32_t txRate; struct qdf_mac_addr peerMacAddr; - if (WLAN_HDD_IBSS != adapter->device_mode) { + if (QDF_IBSS_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -5703,8 +5703,8 @@ static int drv_cmd_set_rmc_tx_rate(hdd_adapter_t *adapter, int status; struct hdd_config *pConfig = hdd_ctx->config; - if ((WLAN_HDD_IBSS != adapter->device_mode) && - (WLAN_HDD_SOFTAP != adapter->device_mode)) { + if ((QDF_IBSS_MODE != adapter->device_mode) && + (QDF_SAP_MODE != adapter->device_mode)) { hddLog(LOGE, "Received SETRMCTXRATE cmd in invalid mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), @@ -5872,8 +5872,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter, hdd_station_ctx_t *pHddStaCtx; tAniTrafStrmMetrics tsm_metrics; - if ((WLAN_HDD_INFRA_STATION != adapter->device_mode) && - (WLAN_HDD_P2P_CLIENT != adapter->device_mode)) { + if ((QDF_STA_MODE != adapter->device_mode) && + (QDF_P2P_CLIENT_MODE != adapter->device_mode)) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -6032,7 +6032,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, tCsrEseBeaconReq eseBcnReq; QDF_STATUS status = QDF_STATUS_SUCCESS; - if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { + if (QDF_STA_MODE != adapter->device_mode) { hdd_warn("Unsupported in mode %s(%d)", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); @@ -6882,8 +6882,8 @@ static int hdd_set_rx_filter(hdd_adapter_t *adapter, bool action, else adapter->addr_filter_pattern = 0; - if (((adapter->device_mode == WLAN_HDD_INFRA_STATION) || - (adapter->device_mode == WLAN_HDD_P2P_CLIENT)) && + if (((adapter->device_mode == QDF_STA_MODE) || + (adapter->device_mode == QDF_P2P_CLIENT_MODE)) && adapter->mc_addr_list.mc_cnt && hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) { @@ -7434,8 +7434,8 @@ static int drv_cmd_set_channel_switch(hdd_adapter_t *adapter, uint8_t *value = command; enum ch_width width; - if ((adapter->device_mode != WLAN_HDD_P2P_GO) && - (adapter->device_mode != WLAN_HDD_SOFTAP)) { + if ((adapter->device_mode != QDF_P2P_GO_MODE) && + (adapter->device_mode != QDF_SAP_MODE)) { hdd_err("IOCTL CHANNEL_SWITCH not supported for mode %d", adapter->device_mode); return -EINVAL; diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 215797222035..19f55055d60c 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -814,7 +814,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext) "%s: Dummy alloc fail", __func__); hdd_ipa_uc_rt_debug_host_dump(hdd_ctx); hdd_ipa_uc_stat_request( - hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP), 1); + hdd_get_adapter(hdd_ctx, QDF_SAP_MODE), 1); } else { kfree(dummy_ptr); } @@ -1628,7 +1628,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter, * layer as SAP updates and IPA doesn't have to do anything for these * updates so ignoring! */ - if (WLAN_HDD_SOFTAP == adapter->device_mode && adapter->ipa_context) + if (QDF_SAP_MODE == adapter->device_mode && adapter->ipa_context) return; /* Lower layer may send multiple START_BSS_EVENT in DFS mode or during @@ -3431,7 +3431,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa, * layer as SAP updates and IPA doesn't have to do anything for these * updates so ignoring! */ - if (WLAN_HDD_SOFTAP == adapter->device_mode && adapter->ipa_context) + if (QDF_SAP_MODE == adapter->device_mode && adapter->ipa_context) return 0; for (i = 0; i < HDD_IPA_MAX_IFACE; i++) { @@ -3523,8 +3523,8 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode) status = hdd_get_front_adapter(pHddCtx, &adapter_node); while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { pAdapter = adapter_node->pAdapter; - if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || - pAdapter->device_mode == WLAN_HDD_SOFTAP) { + if (pAdapter->device_mode == QDF_STA_MODE || + pAdapter->device_mode == QDF_SAP_MODE) { hddLog(QDF_TRACE_LEVEL_INFO, "MCC->SCC: Flush TxRx queue(d_mode=%d)", pAdapter->device_mode); @@ -3632,7 +3632,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id, if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx) && !hdd_ipa_uc_sta_is_enabled(hdd_ipa->hdd_ctx) && - (WLAN_HDD_SOFTAP != adapter->device_mode)) { + (QDF_SAP_MODE != adapter->device_mode)) { return 0; } diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c index 03fefbf3693c..93c4bc0a0da1 100644 --- a/core/hdd/src/wlan_hdd_ocb.c +++ b/core/hdd/src/wlan_hdd_ocb.c @@ -494,7 +494,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -803,7 +803,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -998,7 +998,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1111,7 +1111,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1231,7 +1231,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1359,7 +1359,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1549,7 +1549,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1716,7 +1716,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy, return -EINVAL; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); return -EINVAL; } @@ -1837,7 +1837,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy, goto end; } - if (adapter->device_mode != WLAN_HDD_OCB) { + if (adapter->device_mode != QDF_OCB_MODE) { hddLog(LOGE, FL("Device not in OCB mode!")); goto end; } diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c index 7c8a07ad5c60..0112f694fe0c 100644 --- a/core/hdd/src/wlan_hdd_oemdata.c +++ b/core/hdd/src/wlan_hdd_oemdata.c @@ -376,7 +376,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData) QDF_STATUS status = QDF_STATUS_SUCCESS; /* for now, STA interface only */ - pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); + pAdapter = hdd_get_adapter(p_hdd_ctx, QDF_STA_MODE); if (!pAdapter) { QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, "%s: No adapter for STA mode", __func__); @@ -609,7 +609,7 @@ static int oem_process_get_cap_req_msg(void) uint8_t *buf; /* for now, STA interface only */ - adapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION); + adapter = hdd_get_adapter(p_hdd_ctx, QDF_STA_MODE); if (!adapter) { hdd_err("No adapter for STA mode"); return -EINVAL; -- cgit v1.2.3 From f07bb387274bbd619e44dc5b9e6d8a74de25494b Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:02:11 -0800 Subject: qcacld-3.0: (part-3)Replace enum device_mode to tCDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: I963d1d7f854ecdfe8c301cc5c8fc554ce8df4e35 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_scan.c | 16 ++++++++-------- core/hdd/src/wlan_hdd_stats.c | 16 ++++++++-------- core/hdd/src/wlan_hdd_subnet_detect.c | 2 +- core/hdd/src/wlan_hdd_tdls.c | 4 ++-- core/hdd/src/wlan_hdd_tx_rx.c | 4 ++-- core/hdd/src/wlan_hdd_wext.c | 34 +++++++++++++++++----------------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 0ac1785a6ac9..561290eb2c81 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1386,7 +1386,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, } /* set the scan type to active */ scan_req.scanType = eSIR_ACTIVE_SCAN; - } else if (WLAN_HDD_P2P_GO == pAdapter->device_mode) { + } else if (QDF_P2P_GO_MODE == pAdapter->device_mode) { /* set the scan type to active */ scan_req.scanType = eSIR_ACTIVE_SCAN; } else { @@ -1462,9 +1462,9 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, request->ie_len); pScanInfo->scanAddIE.length = request->ie_len; - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { pwextBuf->roamProfile.pAddIEScan = pScanInfo->scanAddIE.addIEdata; @@ -1482,7 +1482,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, if (((global_p2p_connection_status == P2P_GO_NEG_COMPLETED) || (global_p2p_connection_status == P2P_GO_NEG_PROCESS)) - && (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + && (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { global_p2p_connection_status = P2P_CLIENT_CONNECTING_STATE_1; hddLog(LOGE, @@ -1492,7 +1492,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, } else if ((global_p2p_connection_status == P2P_CLIENT_DISCONNECTED_STATE) - && (WLAN_HDD_P2P_CLIENT == + && (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { global_p2p_connection_status = P2P_CLIENT_CONNECTING_STATE_2; @@ -1986,7 +1986,7 @@ static QDF_STATUS wlan_hdd_is_pno_allowed(hdd_adapter_t *adapter) adapter->device_mode, adapter->sessionCtx.station.conn_info.connState, adapter->sessionId); - if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) && + if ((adapter->device_mode == QDF_STA_MODE) && (eConnectionState_NotConnected == adapter->sessionCtx.station.conn_info.connState)) return QDF_STATUS_SUCCESS; @@ -2043,7 +2043,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, return -EINVAL; } - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) && + if ((QDF_STA_MODE == pAdapter->device_mode) && (eConnectionState_Connecting == (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))->conn_info.connState)) { hddLog(LOGE, diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c index c3af64498253..07643549d147 100644 --- a/core/hdd/src/wlan_hdd_stats.c +++ b/core/hdd/src/wlan_hdd_stats.c @@ -518,15 +518,15 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat, static tSirWifiInterfaceMode hdd_map_device_to_ll_iface_mode(int deviceMode) { switch (deviceMode) { - case WLAN_HDD_INFRA_STATION: + case QDF_STA_MODE: return WIFI_INTERFACE_STA; - case WLAN_HDD_SOFTAP: + case QDF_SAP_MODE: return WIFI_INTERFACE_SOFTAP; - case WLAN_HDD_P2P_CLIENT: + case QDF_P2P_CLIENT_MODE: return WIFI_INTERFACE_P2P_CLIENT; - case WLAN_HDD_P2P_GO: + case QDF_P2P_GO_MODE: return WIFI_INTERFACE_P2P_GO; - case WLAN_HDD_IBSS: + case QDF_IBSS_MODE: return WIFI_INTERFACE_IBSS; default: /* Return Interface Mode as STA for all the unsupported modes */ @@ -553,9 +553,9 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter, qdf_copy_macaddr(&pInfo->macAddr, &pAdapter->macAddressCurrent); - if (((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode))) { + if (((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode))) { pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); if (eConnectionState_NotConnected == pHddStaCtx->conn_info.connState) { diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c index 04bfeba36711..cf9f39bbfb21 100644 --- a/core/hdd/src/wlan_hdd_subnet_detect.c +++ b/core/hdd/src/wlan_hdd_subnet_detect.c @@ -95,7 +95,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy, /* The gateway parameters are only valid in the STA persona * and only in the connected state. */ - if (WLAN_HDD_INFRA_STATION != adapter->device_mode) { + if (QDF_STA_MODE != adapter->device_mode) { hdd_err("Received GW param update for non-STA mode adapter"); return -ENOTSUPP; } diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 3f525cf38fa1..e0978c31b2e1 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -121,7 +121,7 @@ void wlan_hdd_tdls_disable_offchan_and_teardown_links(hdd_context_t *hddctx) return ; } - adapter = hdd_get_adapter(hddctx, WLAN_HDD_INFRA_STATION); + adapter = hdd_get_adapter(hddctx, QDF_STA_MODE); if (adapter == NULL) { hddLog(LOGE, FL("Station Adapter Not Found")); @@ -180,7 +180,7 @@ void wlan_hdd_tdls_disable_offchan_and_teardown_links(hdd_context_t *hddctx) */ void hdd_tdls_notify_mode_change(hdd_adapter_t *adapter, hdd_context_t *hddctx) { - if (adapter->device_mode != WLAN_HDD_INFRA_STATION) + if (adapter->device_mode != QDF_STA_MODE) wlan_hdd_tdls_disable_offchan_and_teardown_links(hddctx); } diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index a92bc0e37471..f8f90d9d50cf 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -327,7 +327,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } - if (WLAN_HDD_IBSS == pAdapter->device_mode) { + if (QDF_IBSS_MODE == pAdapter->device_mode) { struct qdf_mac_addr *pDestMacAddress = (struct qdf_mac_addr *) skb->data; @@ -353,7 +353,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) return NETDEV_TX_OK; } } else { - if (WLAN_HDD_OCB != pAdapter->device_mode && + if (QDF_OCB_MODE != pAdapter->device_mode && eConnectionState_Associated != pHddStaCtx->conn_info.connState) { QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index e5df3242fb1e..0caea59c2a0e 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -1933,7 +1933,7 @@ static int __iw_set_mode(struct net_device *dev, pConfig = (WLAN_HDD_GET_CTX(pAdapter))->config; pWextState->roamProfile.phyMode = hdd_cfg_xlate_to_csr_phy_mode(pConfig->dot11Mode); - pAdapter->device_mode = WLAN_HDD_IBSS; + pAdapter->device_mode = QDF_IBSS_MODE; wdev->iftype = NL80211_IFTYPE_ADHOC; break; case IW_MODE_INFRA: @@ -6009,7 +6009,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_PAID_MATCH: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_PAID_MATCH val %d ", @@ -6022,7 +6022,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_GID_MATCH: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_GID_MATCH val %d ", set_value); @@ -6034,7 +6034,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_EARLY_TIM_CLEAR: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, " WMI_VDEV_PPS_EARLY_TIM_CLEAR val %d ", set_value); @@ -6046,7 +6046,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_EARLY_DTIM_CLEAR: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_EARLY_DTIM_CLEAR val %d", set_value); @@ -6058,7 +6058,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_EOF_PAD_DELIM: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_EOF_PAD_DELIM val %d ", set_value); @@ -6070,7 +6070,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_MACADDR_MISMATCH: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_MACADDR_MISMATCH val %d ", set_value); @@ -6082,7 +6082,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_DELIM_CRC_FAIL: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_DELIM_CRC_FAIL val %d ", set_value); @@ -6094,7 +6094,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_GID_NSTS_ZERO: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_GID_NSTS_ZERO val %d ", set_value); @@ -6106,7 +6106,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_RSSI_CHECK: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_RSSI_CHECK val %d ", set_value); @@ -6118,7 +6118,7 @@ static int __iw_setint_getnone(struct net_device *dev, case WE_PPS_5G_EBT: { - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION) + if (pAdapter->device_mode != QDF_STA_MODE) return -EINVAL; hddLog(LOG1, "WMI_VDEV_PPS_5G_EBT val %d", set_value); @@ -6296,8 +6296,8 @@ static int __iw_setint_getnone(struct net_device *dev, hddLog(LOG1, "Set Channel %d Session ID %d mode %d", set_value, pAdapter->sessionId, pAdapter->device_mode); - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { status = sme_ext_change_channel(hHal, set_value, pAdapter->sessionId); @@ -7193,7 +7193,7 @@ static int __iw_get_char_setnone(struct net_device *dev, */ useAdapter = hdd_get_adapter(pHddCtx, - WLAN_HDD_P2P_CLIENT); + QDF_P2P_CLIENT_MODE); if (!useAdapter) { buf = scnprintf(extra + len, @@ -7866,7 +7866,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev, { p2p_app_setP2pPs_t p2pNoA; - if (pAdapter->device_mode != WLAN_HDD_P2P_GO) { + if (pAdapter->device_mode != QDF_P2P_GO_MODE) { hdd_err("Setting NoA is not allowed in Device mode %s(%d)", hdd_device_mode_to_string( pAdapter->device_mode), @@ -9570,8 +9570,8 @@ int hdd_set_band(struct net_device *dev, u8 ui_band) /* Handling is done only for STA and P2P */ if (band != eCSR_BAND_ALL && - ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) - || (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) + ((pAdapter->device_mode == QDF_STA_MODE) + || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) && (hdd_conn_is_connected (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) -- cgit v1.2.3 From a368784fee9e53ed8bf9d8d48bc75e7f15c7223b Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:04:30 -0800 Subject: qcacld-3.0: (part-4)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: Iaa945f64dd9f90f6abc0b1716b176fce0971ba71 CRs-Fixed: 985273 --- core/cds/inc/cds_concurrency.h | 1 + core/cds/src/cds_concurrency.c | 104 ++++++++++++++++++++--------------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 11aebdd2ccf2..619a7a60825f 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -644,6 +644,7 @@ static inline struct cds_conc_connection_info *cds_get_conn_info(uint32_t *len) return NULL; } #endif + enum cds_con_mode cds_convert_device_mode_to_qdf_type( enum tQDF_ADAPTER_MODE device_mode); QDF_STATUS cds_soc_set_hw_mode(uint32_t session_id, diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 1d735a6d113f..1ad7c27733b6 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -2604,9 +2604,9 @@ bool cds_is_connection_in_progress(void) cds_info("Adapter with device mode %s(%d) exists", hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode); - if (((WLAN_HDD_INFRA_STATION == adapter->device_mode) - || (WLAN_HDD_P2P_CLIENT == adapter->device_mode) - || (WLAN_HDD_P2P_DEVICE == adapter->device_mode)) + if (((QDF_STA_MODE == adapter->device_mode) + || (QDF_P2P_CLIENT_MODE == adapter->device_mode) + || (QDF_P2P_DEVICE_MODE == adapter->device_mode)) && (eConnectionState_Connecting == (WLAN_HDD_GET_STATION_CTX_PTR(adapter))-> conn_info.connState)) { @@ -2615,7 +2615,7 @@ bool cds_is_connection_in_progress(void) adapter->sessionId); return true; } - if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) && + if ((QDF_STA_MODE == adapter->device_mode) && sme_neighbor_middle_of_roaming( WLAN_HDD_GET_HAL_CTX(adapter), adapter->sessionId)) { @@ -2624,9 +2624,9 @@ bool cds_is_connection_in_progress(void) adapter->sessionId); return true; } - if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == adapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == adapter->device_mode)) { + if ((QDF_STA_MODE == adapter->device_mode) || + (QDF_P2P_CLIENT_MODE == adapter->device_mode) || + (QDF_P2P_DEVICE_MODE == adapter->device_mode)) { hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if ((eConnectionState_Associated == @@ -2640,8 +2640,8 @@ bool cds_is_connection_in_progress(void) MAC_ADDR_ARRAY(sta_mac)); return true; } - } else if ((WLAN_HDD_SOFTAP == adapter->device_mode) || - (WLAN_HDD_P2P_GO == adapter->device_mode)) { + } else if ((QDF_SAP_MODE == adapter->device_mode) || + (QDF_P2P_GO_MODE == adapter->device_mode)) { for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) { if (!((adapter->aStaInfo[sta_id].isUsed) @@ -3115,7 +3115,7 @@ void cds_dump_concurrency_info(void) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; switch (adapter->device_mode) { - case WLAN_HDD_INFRA_STATION: + case QDF_STA_MODE: pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if (eConnectionState_Associated == pHddStaCtx->conn_info.connState) { @@ -3128,7 +3128,7 @@ void cds_dump_concurrency_info(void) #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ } break; - case WLAN_HDD_P2P_CLIENT: + case QDF_P2P_CLIENT_MODE: pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if (eConnectionState_Associated == pHddStaCtx->conn_info.connState) { @@ -3142,7 +3142,7 @@ void cds_dump_concurrency_info(void) #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ } break; - case WLAN_HDD_P2P_GO: + case QDF_P2P_GO_MODE: hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START @@ -3157,7 +3157,7 @@ void cds_dump_concurrency_info(void) } p2pMode = "GO"; break; - case WLAN_HDD_SOFTAP: + case QDF_SAP_MODE: hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); if (hostapd_state->bssState == BSS_START @@ -3171,7 +3171,7 @@ void cds_dump_concurrency_info(void) #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */ } break; - case WLAN_HDD_IBSS: + case QDF_IBSS_MODE: default: break; } @@ -3190,7 +3190,7 @@ void cds_dump_concurrency_info(void) * data path enabled */ if (hdd_ipa_uc_is_enabled(hdd_ctx) && - (WLAN_HDD_SOFTAP == adapter->device_mode)) { + (QDF_SAP_MODE == adapter->device_mode)) { adapter->tx_flow_low_watermark = hdd_ctx->config->TxFlowLowWaterMark + WLAN_TFC_IPAUC_TX_DESC_RESERVE; @@ -5999,7 +5999,7 @@ static void cds_sap_restart_handle(struct work_struct *work) cds_ssr_unprotect(__func__); return; } - sap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + sap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (sap_adapter == NULL) { cds_err("sap_adapter is NULL"); cds_ssr_unprotect(__func__); @@ -6038,7 +6038,7 @@ QDF_STATUS cds_check_and_restart_sap(eCsrRoamResult roam_result, (true == cds_is_sap_restart_required()))) return QDF_STATUS_SUCCESS; - sap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + sap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (sap_adapter == NULL) { cds_err("sap_adapter is NULL"); return QDF_STATUS_E_FAILURE; @@ -6119,7 +6119,7 @@ static bool cds_sta_sap_concur_handle(hdd_adapter_t *sta_adapter, return are_cc_channels_same; } - ap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + ap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if ((ap_adapter != NULL) && test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) { status = @@ -6189,7 +6189,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter, cds_err("HDD context is NULL"); return are_cc_channels_same; } - p2pgo_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_P2P_GO); + p2pgo_adapter = hdd_get_adapter(hdd_ctx, QDF_P2P_GO_MODE); if ((p2pgo_adapter != NULL) && test_bit(SOFTAP_BSS_STARTED, &p2pgo_adapter->event_flags)) { status = @@ -6306,7 +6306,7 @@ void cds_handle_conc_rule1(hdd_adapter_t *adapter, * channel. */ if (hdd_ctx->config->conc_custom_rule1 && - (WLAN_HDD_INFRA_STATION == adapter->device_mode)) { + (QDF_STA_MODE == adapter->device_mode)) { ret = cds_sta_sap_concur_handle(adapter, roam_profile); if (true != ret) { @@ -6346,7 +6346,7 @@ bool cds_handle_conc_rule2(hdd_adapter_t *adapter, * started state then P2PGO should restart in station's channel. */ if (hdd_ctx->config->conc_custom_rule2 && - (WLAN_HDD_INFRA_STATION == adapter->device_mode)) { + (QDF_STA_MODE == adapter->device_mode)) { if (false == cds_sta_p2pgo_concur_handle( adapter, roam_profile, roam_id)) { cds_err("P2PGO-STA chnl diff, cache join req"); @@ -6423,7 +6423,7 @@ uint8_t cds_search_and_check_for_session_conc(uint8_t session_id, /* Take care of 160MHz and 80+80Mhz later */ ret = cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( adapter->device_mode), channel, HW_MODE_20_MHZ); if (false == ret) { @@ -6468,7 +6468,7 @@ bool cds_check_for_session_conc(uint8_t session_id, uint8_t channel) /* Take care of 160MHz and 80+80Mhz later */ ret = cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( adapter->device_mode), channel, HW_MODE_20_MHZ); if (false == ret) { @@ -6572,7 +6572,7 @@ void cds_force_sap_on_scc(eCsrRoamResult roam_result, cds_err("Not able to force SAP on SCC"); return; } - hostapd_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + hostapd_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (hostapd_adapter != NULL) { /* Restart SAP if its operating channel is different * from AP channel. @@ -6622,7 +6622,7 @@ static void cds_check_sta_ap_concurrent_ch_intf(void *data) (QDF_STA_MASK | QDF_SAP_MASK)))) return; - ap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + ap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (ap_adapter == NULL) return; @@ -6738,18 +6738,18 @@ uint8_t cds_is_mcc_in_24G(void) while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) { hdd_adapter = adapter_node->pAdapter; - if (!((hdd_adapter->device_mode >= WLAN_HDD_INFRA_STATION) + if (!((hdd_adapter->device_mode >= QDF_STA_MODE) || (hdd_adapter->device_mode - <= WLAN_HDD_P2P_GO))) { + <= QDF_P2P_GO_MODE))) { /* skip for other adapters */ status = hdd_get_next_adapter(hdd_ctx, adapter_node, &next); adapter_node = next; continue; } - if (WLAN_HDD_INFRA_STATION == + if (QDF_STA_MODE == hdd_adapter->device_mode || - WLAN_HDD_P2P_CLIENT == + QDF_P2P_CLIENT_MODE == hdd_adapter->device_mode) { sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR( @@ -6759,9 +6759,9 @@ uint8_t cds_is_mcc_in_24G(void) channel = sta_ctx->conn_info. operationChannel; - } else if (WLAN_HDD_P2P_GO == + } else if (QDF_P2P_GO_MODE == hdd_adapter->device_mode || - WLAN_HDD_SOFTAP == + QDF_SAP_MODE == hdd_adapter->device_mode) { ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(hdd_adapter); hostapd_state = @@ -6830,10 +6830,10 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) } /* Config p2p quota */ - if (adapter->device_mode == WLAN_HDD_INFRA_STATION) + if (adapter->device_mode == QDF_STA_MODE) cds_set_mcc_p2p_quota(adapter, 100 - HDD_DEFAULT_MCC_P2P_QUOTA); - else if (adapter->device_mode == WLAN_HDD_P2P_GO) + else if (adapter->device_mode == QDF_P2P_GO_MODE) cds_go_set_mcc_p2p_quota(adapter, HDD_DEFAULT_MCC_P2P_QUOTA); else @@ -6841,7 +6841,7 @@ int32_t cds_set_mas(hdd_adapter_t *adapter, uint8_t mas_value) HDD_DEFAULT_MCC_P2P_QUOTA); } else { /* Reset p2p quota */ - if (adapter->device_mode == WLAN_HDD_P2P_GO) + if (adapter->device_mode == QDF_P2P_GO_MODE) cds_go_set_mcc_p2p_quota(adapter, HDD_RESET_MCC_P2P_QUOTA); else @@ -6922,7 +6922,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, */ set_value = set_value | first_adapter_operating_channel; /* Find out the 2nd MCC adapter and its operating channel */ - if (hostapd_adapater->device_mode == WLAN_HDD_INFRA_STATION) { + if (hostapd_adapater->device_mode == QDF_STA_MODE) { /* * iwpriv cmd was issued on wlan0; * get p2p0 vdev channel @@ -6931,12 +6931,12 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, /* The 2nd MCC vdev is P2P client */ sta_adapter = hdd_get_adapter( hostapd_adapater->pHddCtx, - WLAN_HDD_P2P_CLIENT); + QDF_P2P_CLIENT_MODE); } else { /* The 2nd MCC vdev is P2P GO */ sta_adapter = hdd_get_adapter( hostapd_adapater->pHddCtx, - WLAN_HDD_P2P_GO); + QDF_P2P_GO_MODE); } } else { /* @@ -6944,7 +6944,7 @@ int32_t cds_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapater, * get wlan0 vdev channel */ sta_adapter = hdd_get_adapter(hostapd_adapater->pHddCtx, - WLAN_HDD_INFRA_STATION); + QDF_STA_MODE); } if (sta_adapter != NULL) { second_adapter_opertaing_channel = @@ -7000,7 +7000,7 @@ QDF_STATUS cds_change_mcc_go_beacon_interval(hdd_adapter_t *pHostapdAdapter) cds_info("UPDATE Beacon Params"); - if (WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode) { + if (QDF_SAP_MODE == pHostapdAdapter->device_mode) { hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { cds_err("Hal ctx is null"); @@ -7074,21 +7074,21 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, */ set_value = set_value | first_adapter_operating_channel; if (hostapd_adapter->device_mode == - WLAN_HDD_INFRA_STATION) { + QDF_STA_MODE) { /* iwpriv cmd issued on wlan0; get p2p0 vdev chan */ if ((concurrent_state & QDF_P2P_CLIENT_MASK) != 0) { /* The 2nd MCC vdev is P2P client */ sta_adapter = hdd_get_adapter ( hostapd_adapter->pHddCtx, - WLAN_HDD_P2P_CLIENT + QDF_P2P_CLIENT_MODE ); } else { /* The 2nd MCC vdev is P2P GO */ sta_adapter = hdd_get_adapter ( hostapd_adapter->pHddCtx, - WLAN_HDD_P2P_GO + QDF_P2P_GO_MODE ); } } else { @@ -7096,7 +7096,7 @@ int32_t cds_go_set_mcc_p2p_quota(hdd_adapter_t *hostapd_adapter, sta_adapter = hdd_get_adapter ( hostapd_adapter->pHddCtx, - WLAN_HDD_INFRA_STATION + QDF_STA_MODE ); } if (sta_adapter != NULL) { @@ -7299,7 +7299,7 @@ void cds_check_and_restart_sap_with_non_dfs_acs(void) return; } - ap_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_SOFTAP); + ap_adapter = hdd_get_adapter(hdd_ctx, QDF_SAP_MODE); if (ap_adapter != NULL && test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags) @@ -7475,7 +7475,7 @@ enum cds_pcl_type get_pcl_from_third_conn_table( #endif /** - * cds_convert_device_mode_to_hdd_type() - provides the + * cds_convert_device_mode_to_qdf_type() - provides the * type translation from HDD to policy manager type * @device_mode: Generic connection mode type * @@ -7484,24 +7484,24 @@ enum cds_pcl_type get_pcl_from_third_conn_table( * * Return: cds_con_mode enum */ -enum cds_con_mode cds_convert_device_mode_to_hdd_type( - device_mode_t device_mode) +enum cds_con_mode cds_convert_device_mode_to_qdf_type( + enum tQDF_ADAPTER_MODE device_mode) { enum cds_con_mode mode = CDS_MAX_NUM_OF_MODE; switch (device_mode) { - case WLAN_HDD_INFRA_STATION: + case QDF_STA_MODE: mode = CDS_STA_MODE; break; - case WLAN_HDD_P2P_CLIENT: + case QDF_P2P_CLIENT_MODE: mode = CDS_P2P_CLIENT_MODE; break; - case WLAN_HDD_P2P_GO: + case QDF_P2P_GO_MODE: mode = CDS_P2P_GO_MODE; break; - case WLAN_HDD_SOFTAP: + case QDF_SAP_MODE: mode = CDS_SAP_MODE; break; - case WLAN_HDD_IBSS: + case QDF_IBSS_MODE: mode = CDS_IBSS_MODE; break; default: -- cgit v1.2.3 From b4326f27d9a103aaf710b719c91866aa02383930 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:05:51 -0800 Subject: qcacld-3.0: (part-5)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: I62a36b3e4d7f92a6d8b15648645035c6ea7735c2 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_cfg80211.c | 112 +++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 3c39a1d07880..2d6ef17ac33b 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2590,7 +2590,7 @@ wlan_hdd_set_no_dfs_flag_config_policy[QCA_WLAN_VENDOR_ATTR_SET_NO_DFS_FLAG_MAX * Return: bool */ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, - device_mode_t device_mode) + enum tQDF_ADAPTER_MODE device_mode) { hdd_adapter_t *adapter; hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL; @@ -2606,7 +2606,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, adapter = adapter_node->pAdapter; if ((device_mode == adapter->device_mode) && - (device_mode == WLAN_HDD_SOFTAP)) { + (device_mode == QDF_SAP_MODE)) { ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); @@ -2627,7 +2627,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx, } if ((device_mode == adapter->device_mode) && - (device_mode == WLAN_HDD_INFRA_STATION)) { + (device_mode == QDF_STA_MODE)) { sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); @@ -2678,13 +2678,13 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, if (no_dfs_flag == hdd_ctx->config->enableDFSChnlScan) { if (no_dfs_flag) { status = wlan_hdd_check_dfs_channel_for_adapter( - hdd_ctx, WLAN_HDD_INFRA_STATION); + hdd_ctx, QDF_STA_MODE); if (true == status) return -EOPNOTSUPP; status = wlan_hdd_check_dfs_channel_for_adapter( - hdd_ctx, WLAN_HDD_SOFTAP); + hdd_ctx, QDF_SAP_MODE); if (true == status) return -EOPNOTSUPP; @@ -4501,8 +4501,8 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"), MAC_ADDR_ARRAY(peer_mac), adapter->device_mode); - if (adapter->device_mode == WLAN_HDD_INFRA_STATION || - adapter->device_mode == WLAN_HDD_P2P_CLIENT) { + if (adapter->device_mode == QDF_STA_MODE || + adapter->device_mode == QDF_P2P_CLIENT_MODE) { hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter); if ((hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) || @@ -4518,8 +4518,8 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy, freq = cds_chan_to_freq( hdd_sta_ctx->conn_info.operationChannel); rate_flags = hdd_sta_ctx->conn_info.rate_flags; - } else if (adapter->device_mode == WLAN_HDD_P2P_GO || - adapter->device_mode == WLAN_HDD_SOFTAP) { + } else if (adapter->device_mode == QDF_P2P_GO_MODE || + adapter->device_mode == QDF_SAP_MODE) { for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) { if (adapter->aStaInfo[sta_id].isUsed && @@ -6037,8 +6037,8 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, if (0 != ret) return ret; - if (!(pAdapter->device_mode == WLAN_HDD_SOFTAP || - pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + if (!(pAdapter->device_mode == QDF_SAP_MODE || + pAdapter->device_mode == QDF_P2P_GO_MODE)) { return -EOPNOTSUPP; } @@ -6097,13 +6097,13 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev, if (NULL != strnstr(ndev->name, "p2p", 3)) { adapter->device_mode = (type == NL80211_IFTYPE_STATION) ? - WLAN_HDD_P2P_DEVICE : WLAN_HDD_P2P_CLIENT; + QDF_P2P_DEVICE_MODE : QDF_P2P_CLIENT_MODE; } else if (type == NL80211_IFTYPE_ADHOC) { - adapter->device_mode = WLAN_HDD_IBSS; + adapter->device_mode = QDF_IBSS_MODE; } else { adapter->device_mode = (type == NL80211_IFTYPE_STATION) ? - WLAN_HDD_INFRA_STATION : WLAN_HDD_P2P_CLIENT; + QDF_STA_MODE : QDF_P2P_CLIENT_MODE; } memset(&adapter->sessionCtx, 0, sizeof(adapter->sessionCtx)); hdd_set_station_ops(adapter->dev); @@ -6204,10 +6204,10 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, hdd_tdls_notify_mode_change(pAdapter, pHddCtx); - if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) || - (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) || - (pAdapter->device_mode == WLAN_HDD_P2P_DEVICE) || - (pAdapter->device_mode == WLAN_HDD_IBSS)) { + if ((pAdapter->device_mode == QDF_STA_MODE) || + (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) || + (pAdapter->device_mode == QDF_P2P_DEVICE_MODE) || + (pAdapter->device_mode == QDF_IBSS_MODE)) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); @@ -6261,14 +6261,14 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, sizeof(pAdapter->sessionCtx)); pAdapter->device_mode = (type == - NL80211_IFTYPE_AP) ? WLAN_HDD_SOFTAP : - WLAN_HDD_P2P_GO; + NL80211_IFTYPE_AP) ? QDF_SAP_MODE : + QDF_P2P_GO_MODE; /* * Fw will take care incase of concurrency */ - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) + if ((QDF_SAP_MODE == pAdapter->device_mode) && (pConfig->apRandomBssidEnabled)) { /* To meet Android requirements create a randomized MAC address of the form 02:1A:11:Fx:xx:xx */ @@ -6315,8 +6315,8 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, type); return -EOPNOTSUPP; } - } else if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) || - (pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + } else if ((pAdapter->device_mode == QDF_SAP_MODE) || + (pAdapter->device_mode == QDF_P2P_GO_MODE)) { switch (type) { case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: @@ -6339,7 +6339,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy, case NL80211_IFTYPE_P2P_GO: wdev->iftype = type; pAdapter->device_mode = (type == NL80211_IFTYPE_AP) ? - WLAN_HDD_SOFTAP : WLAN_HDD_P2P_GO; + QDF_SAP_MODE : QDF_P2P_GO_MODE; hdd_register_tx_flow_control(pAdapter, hdd_softap_tx_resume_timer_expired_handler, @@ -6460,8 +6460,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, qdf_mem_copy(STAMacAddress.bytes, mac, QDF_MAC_ADDR_SIZE); - if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) || - (pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + if ((pAdapter->device_mode == QDF_SAP_MODE) || + (pAdapter->device_mode == QDF_P2P_GO_MODE)) { if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED)) { status = hdd_softap_change_sta_state(pAdapter, @@ -6475,8 +6475,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy, return -EINVAL; } } - } else if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) || - (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) { + } else if ((pAdapter->device_mode == QDF_STA_MODE) || + (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { #ifdef FEATURE_WLAN_TDLS if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) { StaParams.capability = params->capability; @@ -6864,7 +6864,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, setKey.keyDirection = eSIR_TX_RX; qdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); } - if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) { + if ((QDF_IBSS_MODE == pAdapter->device_mode) && !pairwise) { /* if a key is already installed, block all subsequent ones */ if (pAdapter->sessionCtx.station.ibss_enc_key_installed) { hddLog(QDF_TRACE_LEVEL_INFO_MED, @@ -6891,8 +6891,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, pAdapter->sessionCtx.station.ibss_enc_key_installed = 1; return status; } - if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) || - (pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + if ((pAdapter->device_mode == QDF_SAP_MODE) || + (pAdapter->device_mode == QDF_P2P_GO_MODE)) { pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); if (pHostapdState->bssState == BSS_START) { #ifdef WLAN_FEATURE_MBSSID @@ -6920,8 +6920,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, qdf_mem_copy(&ap_ctx->groupKey, &setKey, sizeof(tCsrRoamSetKey)); - } else if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) || - (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) { + } else if ((pAdapter->device_mode == QDF_STA_MODE) || + (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); hdd_station_ctx_t *pHddStaCtx = @@ -7233,8 +7233,8 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, if (0 != status) return status; - if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) || - (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) { + if ((pAdapter->device_mode == QDF_STA_MODE) || + (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { if ((eCSR_ENCRYPT_TYPE_TKIP != pHddStaCtx->conn_info.ucEncryptionType) && (eCSR_ENCRYPT_TYPE_AES != @@ -7292,7 +7292,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, return -EINVAL; } } - } else if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { + } else if (QDF_SAP_MODE == pAdapter->device_mode) { /* In SoftAp mode setting key direction for default mode */ if ((eCSR_ENCRYPT_TYPE_TKIP != pWextState->roamProfile.EncryptionType.encryptionType[0]) @@ -7686,7 +7686,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy, * if hostapd is restarted, we need to flush previous scan * result so that it will reflect environment change */ - if (pAdapter->device_mode == WLAN_HDD_SOFTAP + if (pAdapter->device_mode == QDF_SAP_MODE #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE && pHddCtx->skip_acs_scan_status != eSAP_SKIP_ACS_SCAN #endif @@ -8056,8 +8056,8 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, #endif /* FEATURE_WLAN_WAPI */ #ifdef WLAN_FEATURE_GTK_OFFLOAD /* Initializing gtkOffloadReqParams */ - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { memset(&pHddStaCtx->gtkOffloadReqParams, 0, sizeof(tSirGtkOffloadParams)); pHddStaCtx->gtkOffloadReqParams.ulFlags = @@ -8074,7 +8074,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, pRoamProfile->ChannelInfo.ChannelList = NULL; pRoamProfile->ChannelInfo.numOfChannels = 0; } - if ((WLAN_HDD_IBSS == pAdapter->device_mode) + if ((QDF_IBSS_MODE == pAdapter->device_mode) && operatingChannel) { /* * Need to post the IBSS power save parameters @@ -8104,8 +8104,8 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, * by either hdd_association_completion_handler() or hdd_dis_connect_handler() in sme_RoamCallback() * if sme_RomConnect is to be queued, Connecting state will remain until it is completed. */ - if (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || - WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) { + if (QDF_STA_MODE == pAdapter->device_mode || + QDF_P2P_CLIENT_MODE == pAdapter->device_mode) { hddLog(LOG1, FL("Set HDD connState to eConnectionState_Connecting")); hdd_conn_set_connection_state(pAdapter, @@ -8120,7 +8120,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, * IE present in roamProfile, then use the addtional IE form scan_info */ - if ((pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) && + if ((pAdapter->device_mode == QDF_P2P_CLIENT_MODE) && (!pRoamProfile->pAddIEScan)) { pRoamProfile->pAddIEScan = &pAdapter->scan_info.scanAddIE.addIEdata[0]; @@ -8162,8 +8162,8 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, &roamId); if ((QDF_STATUS_SUCCESS != status) && - (WLAN_HDD_INFRA_STATION == pAdapter->device_mode || - WLAN_HDD_P2P_CLIENT == pAdapter->device_mode)) { + (QDF_STA_MODE == pAdapter->device_mode || + QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { hddLog(LOGE, FL("sme_roam_connect (session %d) failed with " "status %d. -> NotConnected"), @@ -8492,7 +8492,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie, else if ((0 == memcmp(&genie[0], WFD_OUI_TYPE, WFD_OUI_TYPE_SIZE)) && /* Consider WFD IE, only for P2P Client */ - (WLAN_HDD_P2P_CLIENT == + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) { uint16_t curAddIELen = pWextState->assocAddIE.length; @@ -8956,8 +8956,8 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); - if (pAdapter->device_mode != WLAN_HDD_INFRA_STATION && - pAdapter->device_mode != WLAN_HDD_P2P_CLIENT) { + if (pAdapter->device_mode != QDF_STA_MODE && + pAdapter->device_mode != QDF_P2P_CLIENT_MODE) { hddLog(LOGE, FL("Device_mode %s(%d) is not supported"), hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); @@ -8975,7 +8975,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, return status; if (req->channel) { if (!cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( pAdapter->device_mode), req->channel->hw_value, HW_MODE_20_MHZ)) { hdd_err("This concurrency combination is not allowed"); @@ -8983,7 +8983,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, } } else { if (!cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( pAdapter->device_mode), 0, HW_MODE_20_MHZ)) { hdd_err("This concurrency combination is not allowed"); return -ECONNREFUSED; @@ -10001,8 +10001,8 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, mac = (uint8_t *) pDelStaParams->peerMacAddr.bytes; - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode)) { + if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode)) { hapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter); if (!hapd_state) { @@ -10812,7 +10812,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, pAdapter->sessionId, pAdapter->device_mode)); - if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { + if (QDF_SAP_MODE == pAdapter->device_mode) { pConfig = &pAdapter->sessionCtx.ap.sapConfig; /* default value */ @@ -11223,7 +11223,7 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, if (!cbModeChange) return 0; - if (WLAN_HDD_SOFTAP != pAdapter->device_mode) + if (QDF_SAP_MODE != pAdapter->device_mode) return 0; hddLog(LOG1, FL("Channel bonding changed to %d"), @@ -11295,8 +11295,8 @@ static int __wlan_hdd_cfg80211_channel_switch(struct wiphy *wiphy, if (0 != ret) return ret; - if ((WLAN_HDD_P2P_GO != adapter->device_mode) && - (WLAN_HDD_SOFTAP != adapter->device_mode)) + if ((QDF_P2P_GO_MODE != adapter->device_mode) && + (QDF_SAP_MODE != adapter->device_mode)) return -ENOTSUPP; freq = csa_params->chandef.chan->center_freq; -- cgit v1.2.3 From 056ea0ffde2fa26d41b8b1c1b63df8fcc390a4e8 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:07:10 -0800 Subject: qcacld-3.0: (part-6)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: Ia98c4406992c1065850dc70ab3b33c49216d0a24 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_hostapd.c | 86 ++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 28ef83867844..48356ac49f0f 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -388,7 +388,7 @@ QDF_STATUS hdd_set_sap_ht2040_mode(hdd_adapter_t *pHostapdAdapter, hddLog(LOGE, FL("change HT20/40 mode")); - if (WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode) { + if (QDF_SAP_MODE == pHostapdAdapter->device_mode) { hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter); if (NULL == hHal) { hddLog(LOGE, FL("Hal ctx is null")); @@ -1140,9 +1140,9 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; } if (pHddCtx->config->conc_custom_rule2 && - (WLAN_HDD_P2P_GO == pHostapdAdapter->device_mode)) { + (QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) { hdd_adapter_t *sta_adapter = hdd_get_adapter(pHddCtx, - WLAN_HDD_INFRA_STATION); + QDF_STA_MODE); hddLog(LOG2, FL("P2PGO is going down now")); hdd_issue_stored_joinreq(sta_adapter, pHddCtx); @@ -1431,7 +1431,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hdd_abort_mac_scan(pHddCtx, pHostapdAdapter->sessionId, eCSR_SCAN_ABORT_DEFAULT); } - if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { + if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) { /* send peer status indication to oem app */ hdd_send_peer_status_ind_to_oem_app(&pSapEvent->sapevt. sapStationAssocReassocCompleteEvent. @@ -1551,7 +1551,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, hddLog(LOGE, FL("failed to update Beacon interval %d"), qdf_status); } - if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { + if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) { /* send peer status indication to oem app */ hdd_send_peer_status_ind_to_oem_app(&pSapEvent->sapevt. sapStationDisassocCompleteEvent. @@ -1715,7 +1715,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, /* Indicate operating channel change to hostapd * only for non driver override acs */ - if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP && + if (pHostapdAdapter->device_mode == QDF_SAP_MODE && pHddCtx->config->force_sap_acs) return QDF_STATUS_SUCCESS; else @@ -2033,7 +2033,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, return ret; } - sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); + sta_adapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE); /* * conc_custom_rule1: * Force SCC for SAP + STA @@ -2432,8 +2432,8 @@ static __iw_softap_setparam(struct net_device *dev, break; case QCSAP_PARAM_SET_CHANNEL_CHANGE: - if ((WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pHostapdAdapter->device_mode)) { + if ((QDF_SAP_MODE == pHostapdAdapter->device_mode) || + (QDF_P2P_GO_MODE == pHostapdAdapter->device_mode)) { hddLog(LOG1, "SET Channel Change to new channel= %d", set_value); @@ -2855,7 +2855,7 @@ static __iw_softap_setparam(struct net_device *dev, { hddLog(LOG1, "Set Dfs ignore CAC %d", set_value); - if (pHostapdAdapter->device_mode != WLAN_HDD_SOFTAP) + if (pHostapdAdapter->device_mode != QDF_SAP_MODE) return -EINVAL; ret = wlansap_set_dfs_ignore_cac(hHal, set_value); @@ -2866,7 +2866,7 @@ static __iw_softap_setparam(struct net_device *dev, { hddLog(LOG1, "Set Dfs target channel %d", set_value); - if (pHostapdAdapter->device_mode != WLAN_HDD_SOFTAP) + if (pHostapdAdapter->device_mode != QDF_SAP_MODE) return -EINVAL; ret = wlansap_set_dfs_target_chnl(hHal, set_value); @@ -6061,9 +6061,9 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter) pAdapter->sessionCtx.ap.sapContext = sapContext; - if (pAdapter->device_mode == WLAN_HDD_P2P_GO) { + if (pAdapter->device_mode == QDF_P2P_GO_MODE) { mode = QDF_P2P_GO_MODE; - } else if (pAdapter->device_mode == WLAN_HDD_SOFTAP) { + } else if (pAdapter->device_mode == QDF_SAP_MODE) { mode = QDF_SAP_MODE; } else { hdd_err("Invalid mode for AP: %d", pAdapter->device_mode); @@ -6473,8 +6473,8 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, num_ch = WNI_CFG_VALID_CHANNEL_LIST_LEN; - if ((WLAN_HDD_SOFTAP != pAdapter->device_mode) && - (WLAN_HDD_P2P_GO != pAdapter->device_mode)) { + if ((QDF_SAP_MODE != pAdapter->device_mode) && + (QDF_P2P_GO_MODE != pAdapter->device_mode)) { if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { hddLog(LOGE, FL("Invalid Channel [%d]"), channel); @@ -6487,8 +6487,8 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, pAdapter->device_mode); } - if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) - || (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT) + if ((pAdapter->device_mode == QDF_STA_MODE) + || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE) ) { hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter); @@ -6508,11 +6508,11 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy, pHddStaCtx->conn_info.operationChannel = channel; pRoamProfile->ChannelInfo.ChannelList = &pHddStaCtx->conn_info.operationChannel; - } else if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) - || (pAdapter->device_mode == WLAN_HDD_P2P_GO) + } else if ((pAdapter->device_mode == QDF_SAP_MODE) + || (pAdapter->device_mode == QDF_P2P_GO_MODE) ) { sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig); - if (WLAN_HDD_P2P_GO == pAdapter->device_mode) { + if (QDF_P2P_GO_MODE == pAdapter->device_mode) { if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter, channel)) { @@ -6948,14 +6948,14 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) #endif #ifdef FEATURE_WLAN_WAPI - if (WLAN_HDD_SOFTAP == adapter->device_mode) { + if (QDF_SAP_MODE == adapter->device_mode) { wlan_hdd_add_extra_ie(adapter, genie, &total_ielen, WLAN_EID_WAPI); } #endif - if (adapter->device_mode == WLAN_HDD_SOFTAP || - adapter->device_mode == WLAN_HDD_P2P_GO) + if (adapter->device_mode == QDF_SAP_MODE || + adapter->device_mode == QDF_P2P_GO_MODE) wlan_hdd_add_hostapd_conf_vsie(adapter, genie, &total_ielen); @@ -6967,7 +6967,7 @@ int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter) } #ifdef QCA_HT_2040_COEX - if (WLAN_HDD_SOFTAP == adapter->device_mode) { + if (QDF_SAP_MODE == adapter->device_mode) { tSmeConfigParams smeConfig; qdf_mem_zero(&smeConfig, sizeof(smeConfig)); sme_get_config_param(WLAN_HDD_GET_HAL_CTX(adapter), @@ -7258,7 +7258,7 @@ int wlan_hdd_setup_driver_overrides(hdd_adapter_t *ap_adapter) hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); tHalHandle h_hal = WLAN_HDD_GET_HAL_CTX(ap_adapter); - if (ap_adapter->device_mode == WLAN_HDD_SOFTAP && + if (ap_adapter->device_mode == QDF_SAP_MODE && hdd_ctx->config->force_sap_acs) goto setup_acs_overrides; @@ -7437,7 +7437,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, hddLog(LOG2, FL("****pConfig->dtim_period=%d***"), pConfig->dtim_period); - if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) { + if (pHostapdAdapter->device_mode == QDF_SAP_MODE) { pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len, @@ -7489,7 +7489,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, wlan_sap_set_channel_avoidance(hHal, iniConfig->sap_channel_avoidance); #endif - } else if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { + } else if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) { pConfig->countryCode[0] = pHddCtx->reg.alpha2[0]; pConfig->countryCode[1] = pHddCtx->reg.alpha2[1]; pConfig->ieee80211d = 0; @@ -7677,7 +7677,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, */ if ((0 == pHddCtx->config->conc_custom_rule1) || (pHddCtx->config->conc_custom_rule1 && - WLAN_HDD_SOFTAP == pHostapdAdapter->device_mode)) + QDF_SAP_MODE == pHostapdAdapter->device_mode)) pConfig->cc_switch_mode = iniConfig->WlanMccToSccSwitchMode; #endif @@ -7792,7 +7792,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, /* Enable OBSS protection */ pConfig->obssProtEnabled = iniConfig->apOBSSProtEnabled; - if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP) + if (pHostapdAdapter->device_mode == QDF_SAP_MODE) pConfig->sap_dot11mc = (WLAN_HDD_GET_CTX(pHostapdAdapter))->config->sap_dot11mc; else /* for P2P-Go case */ @@ -7830,7 +7830,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, } if (!cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( pHostapdAdapter->device_mode), pConfig->channel, HW_MODE_20_MHZ)) { hddLog(LOGW, @@ -7898,7 +7898,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, #endif /* DHCP_SERVER_OFFLOAD */ #ifdef WLAN_FEATURE_P2P_DEBUG - if (pHostapdAdapter->device_mode == WLAN_HDD_P2P_GO) { + if (pHostapdAdapter->device_mode == QDF_P2P_GO_MODE) { if (global_p2p_connection_status == P2P_GO_NEG_COMPLETED) { global_p2p_connection_status = P2P_GO_COMPLETED_STATE; hddLog(LOGE, @@ -7957,8 +7957,8 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, if (0 != ret) return ret; - if (!(pAdapter->device_mode == WLAN_HDD_SOFTAP || - pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + if (!(pAdapter->device_mode == QDF_SAP_MODE || + pAdapter->device_mode == QDF_P2P_GO_MODE)) { return -EOPNOTSUPP; } @@ -7970,9 +7970,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { staAdapter = pAdapterNode->pAdapter; - if (WLAN_HDD_INFRA_STATION == staAdapter->device_mode || - (WLAN_HDD_P2P_CLIENT == staAdapter->device_mode) || - (WLAN_HDD_P2P_GO == staAdapter->device_mode)) { + if (QDF_STA_MODE == staAdapter->device_mode || + (QDF_P2P_CLIENT_MODE == staAdapter->device_mode) || + (QDF_P2P_GO_MODE == staAdapter->device_mode)) { pScanInfo = &staAdapter->scan_info; if (pScanInfo && pScanInfo->mScanPending) { @@ -8003,7 +8003,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, * then lets finish it and go ahead from there. */ if (pHddCtx->config->conc_custom_rule1 && - (WLAN_HDD_SOFTAP == pAdapter->device_mode)) { + (QDF_SAP_MODE == pAdapter->device_mode)) { cds_flush_work(&pHddCtx->sap_start_work); hddLog(LOGW, FL("Canceled the pending restart work")); spin_lock(&pHddCtx->sap_update_info_lock); @@ -8085,7 +8085,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, wlan_hdd_reset_prob_rspies(pAdapter); #ifdef WLAN_FEATURE_P2P_DEBUG - if ((pAdapter->device_mode == WLAN_HDD_P2P_GO) && + if ((pAdapter->device_mode == QDF_P2P_GO_MODE) && (global_p2p_connection_status == P2P_GO_COMPLETED_STATE)) { hddLog(LOGE, "[P2P State] From GO completed to Inactive state GO got removed"); @@ -8200,7 +8200,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, /* check if concurrency is allowed */ if (!cds_allow_concurrency( - cds_convert_device_mode_to_hdd_type( + cds_convert_device_mode_to_qdf_type( pAdapter->device_mode), channel, channel_width)) { @@ -8229,8 +8229,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, } } - if ((pAdapter->device_mode == WLAN_HDD_SOFTAP) - || (pAdapter->device_mode == WLAN_HDD_P2P_GO) + if ((pAdapter->device_mode == QDF_SAP_MODE) + || (pAdapter->device_mode == QDF_P2P_GO_MODE) ) { beacon_data_t *old, *new; enum nl80211_channel_type channel_type; @@ -8347,8 +8347,8 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, if (0 != status) return status; - if (!(pAdapter->device_mode == WLAN_HDD_SOFTAP || - pAdapter->device_mode == WLAN_HDD_P2P_GO)) { + if (!(pAdapter->device_mode == QDF_SAP_MODE || + pAdapter->device_mode == QDF_P2P_GO_MODE)) { return -EOPNOTSUPP; } -- cgit v1.2.3 From 9b04c9b8dde6d9a7a82aaa49db13a8612eef666d Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:08:05 -0800 Subject: qcacld-3.0: (part-7)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: If408976d5554a50a0023c2a49f80876911fdf1d8 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_main.c | 206 +++++++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 97 deletions(-) diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 2c954e302bbc..243a6fc90ac9 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -221,14 +221,14 @@ uint8_t g_wlan_driver_version[] = QWLAN_VERSIONSTR; const char *hdd_device_mode_to_string(uint8_t device_mode) { switch (device_mode) { - CASE_RETURN_STRING(WLAN_HDD_INFRA_STATION); - CASE_RETURN_STRING(WLAN_HDD_SOFTAP); - CASE_RETURN_STRING(WLAN_HDD_P2P_CLIENT); - CASE_RETURN_STRING(WLAN_HDD_P2P_GO); - CASE_RETURN_STRING(WLAN_HDD_FTM); - CASE_RETURN_STRING(WLAN_HDD_IBSS); - CASE_RETURN_STRING(WLAN_HDD_P2P_DEVICE); - CASE_RETURN_STRING(WLAN_HDD_OCB); + CASE_RETURN_STRING(QDF_STA_MODE); + CASE_RETURN_STRING(QDF_SAP_MODE); + CASE_RETURN_STRING(QDF_P2P_CLIENT_MODE); + CASE_RETURN_STRING(QDF_P2P_GO_MODE); + CASE_RETURN_STRING(QDF_FTM_MODE); + CASE_RETURN_STRING(QDF_IBSS_MODE); + CASE_RETURN_STRING(QDF_P2P_DEVICE_MODE); + CASE_RETURN_STRING(QDF_OCB_MODE); default: return "Unknown"; } @@ -551,7 +551,7 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx) return; } - adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION); + adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE); if (NULL == adapter) { hddLog(QDF_TRACE_LEVEL_FATAL, FL("adapter is null !!")); return; @@ -1378,8 +1378,8 @@ bool hdd_dfs_indicate_radar(void *context, void *param) status = hdd_get_front_adapter(hdd_ctx, &adapterNode); while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; - if (WLAN_HDD_SOFTAP == adapter->device_mode || - WLAN_HDD_P2P_GO == adapter->device_mode) { + if (QDF_SAP_MODE == adapter->device_mode || + QDF_P2P_GO_MODE == adapter->device_mode) { WLAN_HDD_GET_AP_CTX_PTR(adapter)-> dfs_cac_block_tx = true; } @@ -2259,9 +2259,9 @@ void hdd_deinit_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, { ENTER(); switch (adapter->device_mode) { - case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: - case WLAN_HDD_P2P_DEVICE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_DEVICE_MODE: { if (test_bit (INIT_TX_RX_SUCCESS, &adapter->event_flags)) { @@ -2281,8 +2281,8 @@ void hdd_deinit_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, break; } - case WLAN_HDD_SOFTAP: - case WLAN_HDD_P2P_GO: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: { if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) { @@ -2422,13 +2422,13 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, } switch (session_type) { - case WLAN_HDD_INFRA_STATION: + case QDF_STA_MODE: /* Reset locally administered bit if the device mode is STA */ WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(macAddr); /* fall through */ - case WLAN_HDD_P2P_CLIENT: - case WLAN_HDD_P2P_DEVICE: - case WLAN_HDD_OCB: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_DEVICE_MODE: + case QDF_OCB_MODE: { adapter = hdd_alloc_station_adapter(hdd_ctx, macAddr, name_assign_type, @@ -2441,9 +2441,9 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, return NULL; } - if (WLAN_HDD_P2P_CLIENT == session_type) + if (QDF_P2P_CLIENT_MODE == session_type) adapter->wdev.iftype = NL80211_IFTYPE_P2P_CLIENT; - else if (WLAN_HDD_P2P_DEVICE == session_type) + else if (QDF_P2P_DEVICE_MODE == session_type) adapter->wdev.iftype = NL80211_IFTYPE_P2P_DEVICE; else adapter->wdev.iftype = NL80211_IFTYPE_STATION; @@ -2500,8 +2500,8 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, break; } - case WLAN_HDD_P2P_GO: - case WLAN_HDD_SOFTAP: + case QDF_P2P_GO_MODE: + case QDF_SAP_MODE: { adapter = hdd_wlan_create_ap_dev(hdd_ctx, macAddr, name_assign_type, @@ -2515,7 +2515,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, adapter->wdev.iftype = (session_type == - WLAN_HDD_SOFTAP) ? NL80211_IFTYPE_AP : + QDF_SAP_MODE) ? NL80211_IFTYPE_AP : NL80211_IFTYPE_P2P_GO; adapter->device_mode = session_type; @@ -2536,7 +2536,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type, break; } - case WLAN_HDD_FTM: + case QDF_FTM_MODE: { adapter = hdd_alloc_station_adapter(hdd_ctx, macAddr, name_assign_type, @@ -2840,23 +2840,23 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter) struct qdf_mac_addr *bssid = NULL; tSirUpdateIE updateIE; switch (pHostapdAdapter->device_mode) { - case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: { hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pHostapdAdapter); bssid = &pHddStaCtx->conn_info.bssId; break; } - case WLAN_HDD_SOFTAP: - case WLAN_HDD_P2P_GO: - case WLAN_HDD_IBSS: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: + case QDF_IBSS_MODE: { bssid = &pHostapdAdapter->macAddressCurrent; break; } - case WLAN_HDD_FTM: - case WLAN_HDD_P2P_DEVICE: + case QDF_FTM_MODE: + case QDF_P2P_DEVICE_MODE: default: /* * wlan_hdd_reset_prob_rspies should not have been called @@ -2933,10 +2933,10 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, wlan_hdd_netif_queue_control(adapter, WLAN_NETIF_TX_DISABLE_N_CARRIER, WLAN_CONTROL_PATH); switch (adapter->device_mode) { - case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: - case WLAN_HDD_IBSS: - case WLAN_HDD_P2P_DEVICE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_IBSS_MODE: + case QDF_P2P_DEVICE_MODE: if (hdd_conn_is_connected( WLAN_HDD_GET_STATION_CTX_PTR(adapter)) || hdd_is_connecting( @@ -3001,10 +3001,10 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, hdd_wait_for_sme_close_sesion(hdd_ctx, adapter); break; - case WLAN_HDD_SOFTAP: - case WLAN_HDD_P2P_GO: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: if (hdd_ctx->config->conc_custom_rule1 && - (WLAN_HDD_SOFTAP == adapter->device_mode)) { + (QDF_SAP_MODE == adapter->device_mode)) { /* * Before stopping the sap adapter, lets make sure there * is no sap restart work pending. @@ -3015,7 +3015,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, cds_change_sap_restart_required_status(false); } /* Any softap specific cleanup here... */ - if (adapter->device_mode == WLAN_HDD_P2P_GO) + if (adapter->device_mode == QDF_P2P_GO_MODE) wlan_hdd_cleanup_remain_on_channel_ctx(adapter); hdd_deregister_tx_flow_control(adapter); @@ -3094,7 +3094,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, if (true == bCloseSession) hdd_wait_for_sme_close_sesion(hdd_ctx, adapter); break; - case WLAN_HDD_OCB: + case QDF_OCB_MODE: ol_txrx_clear_peer(WLAN_HDD_GET_STATION_CTX_PTR(adapter)-> conn_info.staId[0]); break; @@ -3184,9 +3184,9 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) hdd_wmm_init(adapter); switch (adapter->device_mode) { - case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: - case WLAN_HDD_P2P_DEVICE: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: + case QDF_P2P_DEVICE_MODE: connState = (WLAN_HDD_GET_STATION_CTX_PTR(adapter)) ->conn_info.connState; @@ -3236,11 +3236,11 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) break; - case WLAN_HDD_SOFTAP: + case QDF_SAP_MODE: /* softAP can handle SSR */ break; - case WLAN_HDD_P2P_GO: + case QDF_P2P_GO_MODE: #ifdef MSM_PLATFORM hddLog(QDF_TRACE_LEVEL_ERROR, FL("[SSR] send stop ap to supplicant")); @@ -3425,7 +3425,18 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, return NULL; } -hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) +/** + * hdd_get_adapter() - to get adapter matching the mode + * @hdd_ctx: hdd context + * @mode: adapter mode + * + * This routine will return the pointer to adapter matching + * with the passed mode. + * + * Return: pointer to adapter or null + */ +hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, + enum tQDF_ADAPTER_MODE mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; hdd_adapter_t *adapter; @@ -3452,17 +3463,18 @@ hdd_adapter_t *hdd_get_adapter(hdd_context_t *hdd_ctx, device_mode_t mode) * @hdd_ctx: Pointer to the HDD context. * @mode: Device mode for which operating channel is required. * Suported modes: - * WLAN_HDD_INFRA_STATION, - * WLAN_HDD_P2P_CLIENT, - * WLAN_HDD_SOFTAP, - * WLAN_HDD_P2P_GO. + * QDF_STA_MODE, + * QDF_P2P_CLIENT_MODE, + * QDF_SAP_MODE, + * QDF_P2P_GO_MODE. * * This API returns the operating channel of the requested device mode * * Return: channel number. "0" id the requested device is not found OR it is * not connected. */ -uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) +uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, + enum tQDF_ADAPTER_MODE mode) { hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL; QDF_STATUS status; @@ -3476,8 +3488,8 @@ uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) if (mode == adapter->device_mode) { switch (adapter->device_mode) { - case WLAN_HDD_INFRA_STATION: - case WLAN_HDD_P2P_CLIENT: + case QDF_STA_MODE: + case QDF_P2P_CLIENT_MODE: if (hdd_conn_is_connected (WLAN_HDD_GET_STATION_CTX_PTR (adapter))) { @@ -3487,8 +3499,8 @@ uint8_t hdd_get_operating_channel(hdd_context_t *hdd_ctx, device_mode_t mode) operationChannel; } break; - case WLAN_HDD_SOFTAP: - case WLAN_HDD_P2P_GO: + case QDF_SAP_MODE: + case QDF_P2P_GO_MODE: /* softap connection info */ if (test_bit (SOFTAP_BSS_STARTED, @@ -3523,12 +3535,12 @@ static inline QDF_STATUS hdd_unregister_wext_all_adapters(hdd_context_t * while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; - if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || - (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || - (adapter->device_mode == WLAN_HDD_IBSS) || - (adapter->device_mode == WLAN_HDD_P2P_DEVICE) || - (adapter->device_mode == WLAN_HDD_SOFTAP) || - (adapter->device_mode == WLAN_HDD_P2P_GO)) { + if ((adapter->device_mode == QDF_STA_MODE) || + (adapter->device_mode == QDF_P2P_CLIENT_MODE) || + (adapter->device_mode == QDF_IBSS_MODE) || + (adapter->device_mode == QDF_P2P_DEVICE_MODE) || + (adapter->device_mode == QDF_SAP_MODE) || + (adapter->device_mode == QDF_P2P_GO_MODE)) { wlan_hdd_cfg80211_deregister_frames(adapter); hdd_unregister_wext(adapter->dev); } @@ -3553,12 +3565,12 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(hdd_context_t *hdd_ctx) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; - if ((adapter->device_mode == WLAN_HDD_INFRA_STATION) || - (adapter->device_mode == WLAN_HDD_P2P_CLIENT) || - (adapter->device_mode == WLAN_HDD_IBSS) || - (adapter->device_mode == WLAN_HDD_P2P_DEVICE) || - (adapter->device_mode == WLAN_HDD_SOFTAP) || - (adapter->device_mode == WLAN_HDD_P2P_GO)) { + if ((adapter->device_mode == QDF_STA_MODE) || + (adapter->device_mode == QDF_P2P_CLIENT_MODE) || + (adapter->device_mode == QDF_IBSS_MODE) || + (adapter->device_mode == QDF_P2P_DEVICE_MODE) || + (adapter->device_mode == QDF_SAP_MODE) || + (adapter->device_mode == QDF_P2P_GO_MODE)) { hdd_abort_mac_scan(hdd_ctx, adapter->sessionId, eCSR_SCAN_ABORT_DEFAULT); } @@ -4397,16 +4409,16 @@ static void hdd_bus_bw_compute_cbk(void *priv) continue; adapter = adapterNode->pAdapter; - if ((adapter->device_mode == WLAN_HDD_INFRA_STATION || - adapter->device_mode == WLAN_HDD_P2P_CLIENT) && + if ((adapter->device_mode == QDF_STA_MODE || + adapter->device_mode == QDF_P2P_CLIENT_MODE) && WLAN_HDD_GET_STATION_CTX_PTR(adapter)->conn_info.connState != eConnectionState_Associated) { continue; } - if ((adapter->device_mode == WLAN_HDD_SOFTAP || - adapter->device_mode == WLAN_HDD_P2P_GO) && + if ((adapter->device_mode == QDF_SAP_MODE || + adapter->device_mode == QDF_P2P_GO_MODE) && WLAN_HDD_GET_AP_CTX_PTR(adapter)->bApActive == false) { continue; @@ -4918,7 +4930,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param) * stay current operating channel. */ if (hdd_ctxt->unsafe_channel_count) { - hostapd_adapter = hdd_get_adapter(hdd_ctxt, WLAN_HDD_SOFTAP); + hostapd_adapter = hdd_get_adapter(hdd_ctxt, QDF_SAP_MODE); if (hostapd_adapter) { if ((hostapd_adapter->sessionCtx.ap.sapConfig. acs_cfg.acs_mode) && @@ -5341,7 +5353,7 @@ static int hdd_open_p2p_interface(hdd_context_t *hdd_ctx, bool rtnl_held) QDF_MAC_ADDR_SIZE); } - adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_P2P_DEVICE, "p2p%d", + adapter = hdd_open_adapter(hdd_ctx, QDF_P2P_DEVICE_MODE, "p2p%d", &hdd_ctx->p2pDeviceAddress.bytes[0], NET_NAME_UNKNOWN, rtnl_held); @@ -5378,7 +5390,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, /* Create only 802.11p interface */ if (hdd_ctx->config->dot11p_mode == WLAN_HDD_11P_STANDALONE) { - adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_OCB, "wlanocb%d", + adapter = hdd_open_adapter(hdd_ctx, QDF_OCB_MODE, "wlanocb%d", wlan_hdd_get_intf_addr(hdd_ctx), NET_NAME_UNKNOWN, rtnl_held); @@ -5388,7 +5400,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, return adapter; } - adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION, "wlan%d", + adapter = hdd_open_adapter(hdd_ctx, QDF_STA_MODE, "wlan%d", wlan_hdd_get_intf_addr(hdd_ctx), NET_NAME_UNKNOWN, rtnl_held); @@ -5401,7 +5413,7 @@ static hdd_adapter_t *hdd_open_interfaces(hdd_context_t *hdd_ctx, /* Open 802.11p Interface */ if (hdd_ctx->config->dot11p_mode == WLAN_HDD_11P_CONCURRENT) { - adapter_11p = hdd_open_adapter(hdd_ctx, WLAN_HDD_OCB, + adapter_11p = hdd_open_adapter(hdd_ctx, QDF_OCB_MODE, "wlanocb%d", wlan_hdd_get_intf_addr(hdd_ctx), NET_NAME_UNKNOWN, rtnl_held); @@ -6186,7 +6198,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && - WLAN_HDD_INFRA_STATION == adapter->device_mode && + QDF_STA_MODE == adapter->device_mode && cds_is_sta_active_connection_exists()) { hddLog(LOG1, FL("Connect received on STA sessionId(%d)"), adapter->sessionId); @@ -6199,7 +6211,7 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; - if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode + if (QDF_STA_MODE == adapterIdx->device_mode && adapter->sessionId != adapterIdx->sessionId) { hddLog(LOG1, FL("Disable Roaming on sessionId(%d)"), @@ -6238,7 +6250,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) if (hdd_ctx->config->isFastRoamIniFeatureEnabled && hdd_ctx->config->isRoamOffloadScanEnabled && - WLAN_HDD_INFRA_STATION == adapter->device_mode && + QDF_STA_MODE == adapter->device_mode && cds_is_sta_active_connection_exists()) { hddLog(LOG1, FL("Disconnect received on STA sessionId(%d)"), adapter->sessionId); @@ -6251,7 +6263,7 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapterIdx = adapterNode->pAdapter; - if (WLAN_HDD_INFRA_STATION == adapterIdx->device_mode + if (QDF_STA_MODE == adapterIdx->device_mode && adapter->sessionId != adapterIdx->sessionId) { hddLog(LOG1, FL("Enabling Roaming on sessionId(%d)"), @@ -6405,10 +6417,10 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { pDataAdapter = adapterNode->pAdapter; if (pDataAdapter) { - if (pDataAdapter->device_mode == WLAN_HDD_INFRA_STATION - || pDataAdapter->device_mode == WLAN_HDD_P2P_CLIENT + if (pDataAdapter->device_mode == QDF_STA_MODE + || pDataAdapter->device_mode == QDF_P2P_CLIENT_MODE || pDataAdapter->device_mode == - WLAN_HDD_P2P_DEVICE) { + QDF_P2P_DEVICE_MODE) { scan_intf_found = true; wlan_hdd_send_status_pkg(pDataAdapter, NULL, 1, 0); @@ -6462,7 +6474,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) adapter = adapterNode->pAdapter; if (adapter && adapter->device_mode == - WLAN_HDD_INFRA_STATION) { + QDF_STA_MODE) { if (WLAN_HDD_GET_STATION_CTX_PTR(adapter)-> conn_info.connState == eConnectionState_Associated) { @@ -6471,7 +6483,7 @@ void wlan_hdd_auto_shutdown_enable(hdd_context_t *hdd_ctx, bool enable) } } if (adapter - && adapter->device_mode == WLAN_HDD_SOFTAP) { + && adapter->device_mode == QDF_SAP_MODE) { if (WLAN_HDD_GET_AP_CTX_PTR(adapter)-> bApActive == true) { ap_connected = true; @@ -6518,8 +6530,8 @@ hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter, status = hdd_get_front_adapter(hdd_ctx, &adapterNode); while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; - if (adapter && ((adapter->device_mode == WLAN_HDD_SOFTAP) || - (adapter->device_mode == WLAN_HDD_P2P_GO)) && + if (adapter && ((adapter->device_mode == QDF_SAP_MODE) || + (adapter->device_mode == QDF_P2P_GO_MODE)) && adapter != this_sap_adapter) { if (check_start_bss) { if (test_bit(SOFTAP_BSS_STARTED, @@ -6573,8 +6585,8 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) { adapter = adapterNode->pAdapter; if (adapter - && (adapter->device_mode == WLAN_HDD_INFRA_STATION - || adapter->device_mode == WLAN_HDD_P2P_CLIENT) + && (adapter->device_mode == QDF_STA_MODE + || adapter->device_mode == QDF_P2P_CLIENT_MODE) && WLAN_HDD_GET_STATION_CTX_PTR(adapter)-> conn_info.connState == eConnectionState_Associated) { @@ -6582,8 +6594,8 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter) break; } if (adapter - && (adapter->device_mode == WLAN_HDD_SOFTAP - || adapter->device_mode == WLAN_HDD_P2P_GO) + && (adapter->device_mode == QDF_SAP_MODE + || adapter->device_mode == QDF_P2P_GO_MODE) && WLAN_HDD_GET_AP_CTX_PTR(adapter)->bApActive == true) { can_stop = false; @@ -6625,7 +6637,7 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, hdd_ap_ctx_t *hdd_ap_ctx; uint8_t channel_id; QDF_STATUS status; - device_mode_t device_mode = ap_adapter->device_mode; + enum tQDF_ADAPTER_MODE device_mode = ap_adapter->device_mode; *concurrent_chnl_same = true; hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); @@ -6635,14 +6647,14 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter, scan_cache, &channel_id); if ((QDF_STATUS_SUCCESS == status)) { - if ((WLAN_HDD_SOFTAP == device_mode) && + if ((QDF_SAP_MODE == device_mode) && (channel_id < SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { *concurrent_chnl_same = false; hddLog(QDF_TRACE_LEVEL_INFO_MED, FL("channels are different")); } - } else if ((WLAN_HDD_P2P_GO == device_mode) && + } else if ((QDF_P2P_GO_MODE == device_mode) && (channel_id >= SIR_11A_CHANNEL_BEGIN)) { if (hdd_ap_ctx->operatingChannel != channel_id) { *concurrent_chnl_same = false; @@ -6749,7 +6761,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) return; } - if (WLAN_HDD_SOFTAP != ap_adapter->device_mode) { + if (QDF_SAP_MODE != ap_adapter->device_mode) { hdd_err("SoftAp role has not been enabled"); return; } -- cgit v1.2.3 From fb84cbd91184a5e1a379e0b535d404a1ce24bea4 Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Thu, 10 Mar 2016 13:09:07 -0800 Subject: qcacld-3.0: (part-8)Replace enum device_mode to tQDF_ADAPTER_MODE Instead of using two different enums for setting adapter mode, combined them to make only one set of enum. Change-Id: Ic3e7c2944d1b8d66042398c57eb307ab30223524 CRs-Fixed: 985273 --- core/hdd/src/wlan_hdd_p2p.c | 115 +++++++++++++++++++++--------------------- core/hdd/src/wlan_hdd_power.c | 42 +++++++-------- 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c index 44f14cb4bd53..b54a41baba96 100644 --- a/core/hdd/src/wlan_hdd_p2p.c +++ b/core/hdd/src/wlan_hdd_p2p.c @@ -229,9 +229,9 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, */ schedule_delayed_work(&hdd_ctx->roc_req_work, 0); - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { uint8_t sessionId = pAdapter->sessionId; if (REMAIN_ON_CHANNEL_REQUEST == @@ -241,8 +241,8 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx, (SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0); } - } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode) + } else if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode) ) { wlansap_de_register_mgmt_frame( #ifdef WLAN_FEATURE_MBSSID @@ -327,16 +327,16 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter) * The remain on channel callback will make sure the remain_on_chan * expired event is sent. */ - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX (pAdapter), pAdapter->sessionId, pRemainChanCtx->scan_id); - } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) - || (WLAN_HDD_P2P_GO == pAdapter->device_mode) + } else if ((QDF_SAP_MODE == pAdapter->device_mode) + || (QDF_P2P_GO_MODE == pAdapter->device_mode) ) { wlansap_cancel_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -368,7 +368,7 @@ int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter) int status = 0; hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR(pAdapter); - if (WLAN_HDD_P2P_GO != pAdapter->device_mode) { + if (QDF_P2P_GO_MODE != pAdapter->device_mode) { /* Cancel Existing Remain On Channel */ /* If no action frame is pending */ if (cfgState->remain_on_chan_ctx != NULL) { @@ -420,13 +420,13 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter) } mutex_unlock(&cfg_state->remain_on_chan_ctx_lock); - if (adapter->device_mode == WLAN_HDD_P2P_GO) { + if (adapter->device_mode == QDF_P2P_GO_MODE) { wlansap_cancel_remain_on_channel((WLAN_HDD_GET_CTX (adapter))->pcds_context, cfg_state->remain_on_chan_ctx->scan_id); - } else if (adapter->device_mode == WLAN_HDD_P2P_CLIENT + } else if (adapter->device_mode == QDF_P2P_CLIENT_MODE || adapter->device_mode == - WLAN_HDD_P2P_DEVICE) { + QDF_P2P_DEVICE_MODE) { sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX (adapter), adapter->sessionId, @@ -519,15 +519,15 @@ void wlan_hdd_remain_on_chan_timeout(void *data) mutex_unlock(&cfgState->remain_on_chan_ctx_lock); hddLog(LOG1, "%s: Cancel Remain on Channel on timeout", __func__); - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX(pAdapter), pAdapter->sessionId, pRemainChanCtx->scan_id); - } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode) + } else if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode) ) { wlansap_cancel_remain_on_channel( (WLAN_HDD_GET_CTX(pAdapter))->pcds_context, @@ -583,9 +583,8 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter_temp = pAdapterNode->pAdapter; - if (pAdapter_temp->device_mode == WLAN_HDD_P2P_GO) { + if (pAdapter_temp->device_mode == QDF_P2P_GO_MODE) isGoPresent = true; - } status = hdd_get_next_adapter(pHddCtx, pAdapterNode, &pNext); pAdapterNode = pNext; } @@ -601,9 +600,9 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, INIT_COMPLETION(pAdapter->rem_on_chan_ready_event); /* call sme API to start remain on channel. */ - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { uint8_t sessionId = pAdapter->sessionId; /* call sme API to start remain on channel. */ @@ -641,8 +640,8 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter, FL("sme_register_mgmt_frame failed")); } - } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode)) { + } else if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode)) { /* call sme API to start remain on channel. */ if (QDF_STATUS_SUCCESS != wlansap_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -870,7 +869,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy, pRemainChanCtx->action_pkt_buff.frame_length = 0; pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress = false; if (REMAIN_ON_CHANNEL_REQUEST == request_type) { - sta_adapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); + sta_adapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE); if ((NULL != sta_adapter) && hdd_conn_is_connected( WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter))) { @@ -1178,17 +1177,17 @@ int __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, * The remain on channel callback will make sure the remain_on_chan * expired event is sent. */ - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { uint8_t sessionId = pAdapter->sessionId; sme_cancel_remain_on_channel(WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId, pRemainChanCtx->scan_id); - } else if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode) + } else if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode) ) { wlansap_cancel_remain_on_channel( #ifdef WLAN_FEATURE_MBSSID @@ -1333,7 +1332,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, mutex_unlock(&cfgState->remain_on_chan_ctx_lock); } - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) && + if ((QDF_STA_MODE == pAdapter->device_mode) && (type == SIR_MAC_MGMT_FRAME && subType == SIR_MAC_MGMT_PROBE_RSP)) { /* Drop Probe response received @@ -1345,8 +1344,8 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, /* Call sme API to send out a action frame. */ /* OR can we send it directly through data path?? */ /* After tx completion send tx status back. */ - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode) + if ((QDF_SAP_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode) ) { if (type == SIR_MAC_MGMT_FRAME) { if (subType == SIR_MAC_MGMT_PROBE_RSP) { @@ -1396,13 +1395,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, [WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET])); } - if (pAdapter->device_mode == WLAN_HDD_SOFTAP) { + if (pAdapter->device_mode == QDF_SAP_MODE) { home_ch = pAdapter->sessionCtx.ap.operatingChannel; - } else if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION) { + } else if (pAdapter->device_mode == QDF_STA_MODE) { home_ch = pAdapter->sessionCtx.station.conn_info.operationChannel; } else { - goAdapter = hdd_get_adapter(pAdapter->pHddCtx, WLAN_HDD_P2P_GO); + goAdapter = hdd_get_adapter(pAdapter->pHddCtx, QDF_P2P_GO_MODE); if (goAdapter) home_ch = goAdapter->sessionCtx.ap.operatingChannel; } @@ -1544,9 +1543,9 @@ send_frame: * Firmware needs channel information for action frames * which are not sent on the current operating channel of VDEV */ - if ((WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_GO == pAdapter->device_mode)) { + if ((QDF_P2P_DEVICE_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_GO_MODE == pAdapter->device_mode)) { if (chan && (chan->center_freq != 0)) current_freq = chan->center_freq; else @@ -1557,9 +1556,9 @@ send_frame: INIT_COMPLETION(pAdapter->tx_action_cnf_event); - if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) || - (WLAN_HDD_P2P_DEVICE == pAdapter->device_mode) + if ((QDF_STA_MODE == pAdapter->device_mode) || + (QDF_P2P_CLIENT_MODE == pAdapter->device_mode) || + (QDF_P2P_DEVICE_MODE == pAdapter->device_mode) ) { uint8_t sessionId = pAdapter->sessionId; @@ -1591,8 +1590,8 @@ send_frame: "%s: sme_send_action returned fail", __func__); goto err; } - } else if (WLAN_HDD_SOFTAP == pAdapter->device_mode || - WLAN_HDD_P2P_GO == pAdapter->device_mode) { + } else if (QDF_SAP_MODE == pAdapter->device_mode || + QDF_P2P_GO_MODE == pAdapter->device_mode) { if (QDF_STATUS_SUCCESS != #ifdef WLAN_FEATURE_MBSSID wlansap_send_action(WLAN_HDD_GET_SAP_CTX_PTR(pAdapter), @@ -1930,19 +1929,19 @@ static uint8_t wlan_hdd_get_session_type(enum nl80211_iftype type) switch (type) { case NL80211_IFTYPE_AP: - sessionType = WLAN_HDD_SOFTAP; + sessionType = QDF_SAP_MODE; break; case NL80211_IFTYPE_P2P_GO: - sessionType = WLAN_HDD_P2P_GO; + sessionType = QDF_P2P_GO_MODE; break; case NL80211_IFTYPE_P2P_CLIENT: - sessionType = WLAN_HDD_P2P_CLIENT; + sessionType = QDF_P2P_CLIENT_MODE; break; case NL80211_IFTYPE_STATION: - sessionType = WLAN_HDD_INFRA_STATION; + sessionType = QDF_STA_MODE; break; default: - sessionType = WLAN_HDD_INFRA_STATION; + sessionType = QDF_STA_MODE; break; } @@ -1987,18 +1986,18 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type)); /* - * Allow addition multiple interfaces for WLAN_HDD_P2P_GO, - * WLAN_HDD_SOFTAP, WLAN_HDD_P2P_CLIENT and WLAN_HDD_INFRA_STATION + * Allow addition multiple interfaces for QDF_P2P_GO_MODE, + * QDF_SAP_MODE, QDF_P2P_CLIENT_MODE and QDF_STA_MODE * session type. */ session_type = wlan_hdd_get_session_type(type); if ((hdd_get_adapter(pHddCtx, session_type) != NULL) #ifdef WLAN_FEATURE_MBSSID - && WLAN_HDD_SOFTAP != session_type - && WLAN_HDD_P2P_GO != session_type + && QDF_SAP_MODE != session_type + && QDF_P2P_GO_MODE != session_type #endif - && WLAN_HDD_P2P_CLIENT != session_type - && WLAN_HDD_INFRA_STATION != session_type) { + && QDF_P2P_CLIENT_MODE != session_type + && QDF_STA_MODE != session_type) { hddLog(LOGE, "%s: Interface type %d already exists. " "Two interfaces of same type are not supported currently.", @@ -2008,7 +2007,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy, wlan_hdd_tdls_disable_offchan_and_teardown_links(pHddCtx); - pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); + pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE); if (pAdapter != NULL) { scan_info = &pAdapter->scan_info; if (scan_info->mScanPending) { diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index 4a9870aabda3..8863e8486f71 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -223,8 +223,8 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb, } if ((pAdapter->dev == ndev) && - (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || - pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) { + (pAdapter->device_mode == QDF_STA_MODE || + pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); if (0 != status) @@ -294,8 +294,8 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) * is controlled by one bit. */ - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode || - WLAN_HDD_P2P_GO == pAdapter->device_mode) && + if ((QDF_SAP_MODE == pAdapter->device_mode || + QDF_P2P_GO_MODE == pAdapter->device_mode) && !pHddCtx->ap_arpns_support) { hddLog(LOG1, FL("NS Offload is not supported in SAP/P2PGO mode")); @@ -496,8 +496,8 @@ void hdd_conf_hostoffload(hdd_adapter_t *pAdapter, bool fenable) /* Get the HDD context. */ pHddCtx = WLAN_HDD_GET_CTX(pAdapter); - if (((WLAN_HDD_INFRA_STATION != pAdapter->device_mode) && - (WLAN_HDD_P2P_CLIENT != pAdapter->device_mode))) { + if (((QDF_STA_MODE != pAdapter->device_mode) && + (QDF_P2P_CLIENT_MODE != pAdapter->device_mode))) { hdd_err("Offloads not supported in mode %d", pAdapter->device_mode); return; @@ -618,8 +618,8 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb, } if ((pAdapter && pAdapter->dev == ndev) && - (pAdapter->device_mode == WLAN_HDD_INFRA_STATION || - pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) { + (pAdapter->device_mode == QDF_STA_MODE || + pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) { pHddCtx = WLAN_HDD_GET_CTX(pAdapter); status = wlan_hdd_validate_context(pHddCtx); @@ -698,8 +698,8 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable) /* In SAP/P2P Go mode, ARP/NS Offload feature capability * is controlled by one bit. */ - if ((WLAN_HDD_SOFTAP == pAdapter->device_mode || - WLAN_HDD_P2P_GO == pAdapter->device_mode) && + if ((QDF_SAP_MODE == pAdapter->device_mode || + QDF_P2P_GO_MODE == pAdapter->device_mode) && !pHddCtx->ap_arpns_support) { hddLog(LOG1, FL("ARP Offload is not supported in SAP/P2PGO mode")); @@ -918,8 +918,8 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set) /* Following pre-conditions should be satisfied before we * configure the MC address list. */ - if (((pAdapter->device_mode == WLAN_HDD_INFRA_STATION) - || (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)) + if (((pAdapter->device_mode == QDF_STA_MODE) + || (pAdapter->device_mode == QDF_P2P_CLIENT_MODE)) && pAdapter->mc_addr_list.mc_cnt && (eConnectionState_Associated == (WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))-> @@ -1517,11 +1517,11 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc) } /* Try to get an adapter from mode ID */ - pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); + pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE); if (!pAdapter) { - pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_SOFTAP); + pAdapter = hdd_get_adapter(pHddCtx, QDF_SAP_MODE); if (!pAdapter) { - pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_IBSS); + pAdapter = hdd_get_adapter(pHddCtx, QDF_IBSS_MODE); if (!pAdapter) { hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Failed to get Adapter!", __func__); @@ -1689,8 +1689,8 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode) */ sme_ps_enable_disable(hal, adapter->sessionId, SME_PS_DISABLE); } else if (DRIVER_POWER_MODE_AUTO == mode) { - if ((WLAN_HDD_INFRA_STATION == adapter->device_mode) || - (WLAN_HDD_P2P_CLIENT == adapter->device_mode)) { + if ((QDF_STA_MODE == adapter->device_mode) || + (QDF_P2P_CLIENT_MODE == adapter->device_mode)) { hddLog(LOG1, FL("Disabling Auto Power save timer")); sme_ps_disable_auto_ps_timer(WLAN_HDD_GET_HAL_CTX (adapter), @@ -1778,7 +1778,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy) while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; if ((NULL != pAdapter) && - (WLAN_HDD_INFRA_STATION == pAdapter->device_mode)) { + (QDF_STA_MODE == pAdapter->device_mode)) { if (0 != wlan_hdd_cfg80211_update_bss(pHddCtx->wiphy, pAdapter, 0)) { @@ -1885,7 +1885,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, status = hdd_get_front_adapter(pHddCtx, &pAdapterNode); while (NULL != pAdapterNode && QDF_STATUS_SUCCESS == status) { pAdapter = pAdapterNode->pAdapter; - if (WLAN_HDD_SOFTAP == pAdapter->device_mode) { + if (QDF_SAP_MODE == pAdapter->device_mode) { if (BSS_START == WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter)->bssState && true == @@ -1902,7 +1902,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy, FL("SAP does not support suspend!!")); return -EOPNOTSUPP; } - } else if (WLAN_HDD_P2P_GO == pAdapter->device_mode) { + } else if (QDF_P2P_GO_MODE == pAdapter->device_mode) { if (!pHddCtx->config->enableSapSuspend) { /* return -EOPNOTSUPP if GO does not support * suspend @@ -2270,7 +2270,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy, return status; } - pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_INFRA_STATION); + pAdapter = hdd_get_adapter(pHddCtx, QDF_STA_MODE); if (NULL == pAdapter) { hddLog(LOGE, FL("pAdapter is NULL")); return -ENOENT; -- cgit v1.2.3 From 0acfdcd69665941bbbf6f00a57da2b63c5eb5e8a Mon Sep 17 00:00:00 2001 From: Krunal Soni Date: Wed, 9 Mar 2016 12:03:06 -0800 Subject: qcacld-3.0: Fix incorrect struct assignment & HT-ie addition Fix incorrect struct assignment while handling join request in SME module. Fix not to add HT ie in outgoing P2P action frames. Change-Id: Ic49ca5ca3171be50a16a16281ae68edb35449605 CRs-Fixed: 985273 --- core/mac/src/pe/lim/lim_p2p.c | 3 +-- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/core/mac/src/pe/lim/lim_p2p.c b/core/mac/src/pe/lim/lim_p2p.c index bf79d48ba613..476d9d944e10 100644 --- a/core/mac/src/pe/lim/lim_p2p.c +++ b/core/mac/src/pe/lim/lim_p2p.c @@ -647,8 +647,7 @@ void lim_send_p2p_action_frame(tpAniSirGlobal mac_ctx, } } - if ((SIR_MAC_MGMT_PROBE_RSP == fc->subType || - SIR_MAC_MGMT_ACTION == fc->subType)) + if (SIR_MAC_MGMT_PROBE_RSP == fc->subType) lim_set_ht_caps(mac_ctx, session_entry, (uint8_t *) mb_msg->data + PROBE_RSP_IE_OFFSET, msg_len - PROBE_RSP_IE_OFFSET); diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 1fb2a93fdf0f..679cee43708e 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1580,7 +1580,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) int8_t local_power_constraint = 0, reg_max = 0; uint16_t ie_len; uint8_t *vendor_ie; - tSirBssDescription bss_desc; + tSirBssDescription *bss_desc; /* FEATURE_WLAN_DIAG_SUPPORT */ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM @@ -1632,9 +1632,9 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) */ lim_update_rrm_capability(mac_ctx, sme_join_req); - bss_desc = sme_join_req->bssDescription; + bss_desc = &sme_join_req->bssDescription; /* check for the existence of start BSS session */ - session = pe_find_session_by_bssid(mac_ctx, bss_desc.bssId, + session = pe_find_session_by_bssid(mac_ctx, bss_desc->bssId, &session_id); if (session != NULL) { @@ -1642,7 +1642,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) FL("Session(%d) Already exists for BSSID: " MAC_ADDRESS_STR " in limSmeState = %X"), session_id, - MAC_ADDR_ARRAY(bss_desc.bssId), + MAC_ADDR_ARRAY(bss_desc->bssId), session->limSmeState); if (session->limSmeState == eLIM_SME_LINK_EST_STATE && @@ -1672,7 +1672,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) * Session Entry does not exist for given BSSId * Try to Create a new session */ - session = pe_create_session(mac_ctx, bss_desc.bssId, + session = pe_create_session(mac_ctx, bss_desc->bssId, &session_id, mac_ctx->lim.maxStation, eSIR_INFRASTRUCTURE_MODE); if (session == NULL) { @@ -1705,7 +1705,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) /* Store beaconInterval */ session->beaconParams.beaconInterval = - bss_desc.beaconInterval; + bss_desc->beaconInterval; qdf_mem_copy(&(session->htConfig), &(sme_join_req->htConfig), sizeof(session->htConfig)); @@ -1720,12 +1720,12 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->limQosEnabled = sme_join_req->isQosEnabled; /* Store vendor specfic IE for CISCO AP */ - ie_len = (bss_desc.length + sizeof(bss_desc.length) - + ie_len = (bss_desc->length + sizeof(bss_desc->length) - GET_FIELD_OFFSET(tSirBssDescription, ieFields)); vendor_ie = cfg_get_vendor_ie_ptr_from_oui(mac_ctx, SIR_MAC_CISCO_OUI, SIR_MAC_CISCO_OUI_SIZE, - ((uint8_t *)&bss_desc.ieFields), ie_len); + ((uint8_t *)&bss_desc->ieFields), ie_len); if (NULL != vendor_ie) { lim_log(mac_ctx, LOG1, FL("Cisco vendor OUI present")); @@ -1740,7 +1740,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH session->cc_switch_mode = sme_join_req->cc_switch_mode; #endif - session->nwType = bss_desc.nwType; + session->nwType = bss_desc->nwType; session->enableAmpduPs = sme_join_req->enableAmpduPs; session->enableHtSmps = sme_join_req->enableHtSmps; session->htSmpsvalue = sme_join_req->htSmps; @@ -1810,10 +1810,10 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->txbf_csn_value = sme_join_req->txBFCsnValue; } /*Phy mode */ - session->gLimPhyMode = bss_desc.nwType; + session->gLimPhyMode = bss_desc->nwType; handle_ht_capabilityand_ht_info(mac_ctx, session); /* Copy The channel Id to the session Table */ - session->currentOperChannel = bss_desc.channelId; + session->currentOperChannel = bss_desc->channelId; /* cbMode is already merged value of peer and self - * done by csr in csr_get_cb_mode_from_ies */ session->htSupportedChannelWidthSet = @@ -1845,7 +1845,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) #endif #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM - session->rssi = bss_desc.rssi; + session->rssi = bss_desc->rssi; #endif /* Copy the SSID from smejoinreq to session entry */ -- cgit v1.2.3 From 206e2ac7878c83a5f44b4cd96da4e7883c851295 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 14 Apr 2016 18:01:38 -0700 Subject: qcacld-3.0: Reindent csr_validate_mcc_beacon_interval This patch is to reindent csr_validate_mcc_beacon_interval Change-Id: I0e9c420aab7a2f5534e8acc52d09a27693194073 CRs-Fixed: 985273 --- core/sme/src/csr/csr_util.c | 530 +++++++++++++++++++++++--------------------- 1 file changed, 275 insertions(+), 255 deletions(-) diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 56786f996c38..43f3bfea26f1 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -2046,274 +2046,294 @@ uint16_t csr_calculate_mcc_beacon_interval(tpAniSirGlobal pMac, uint16_t sta_bi, return go_fbi; } -QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, - uint8_t channelId, - uint16_t *beaconInterval, - uint32_t cursessionId, - enum tQDF_ADAPTER_MODE currBssPersona) +/** + * csr_validate_p2pcli_bcn_intrvl() - to validate p2pcli beacon interval + * @mac_ctx: pointer to mac context + * @chnl_id: channel id variable + * @bcn_interval: pointer to given beacon interval + * @session_id: given session id + * @status: fill the status in terms of QDF_STATUS to inform caller + * + * This API can provide the validation the beacon interval and re-calculate + * in case concurrency + * + * Return: bool + */ +static bool csr_validate_p2pcli_bcn_intrvl(tpAniSirGlobal mac_ctx, + uint8_t chnl_id, uint16_t *bcn_interval, uint32_t session_id, + QDF_STATUS *status) +{ + tCsrRoamSession *roamsession; + + roamsession = &mac_ctx->roam.roamSession[session_id]; + if (roamsession->pCurRoamProfile && + (roamsession->pCurRoamProfile->csrPersona == + QDF_STA_MODE)) { + /* check for P2P client mode */ + sms_log(mac_ctx, LOG1, + FL(" Ignore Beacon Interval Validation...")); + } else if (roamsession->bssParams.bssPersona == QDF_P2P_GO_MODE) { + /* Check for P2P go scenario */ + if ((roamsession->bssParams.operationChn != chnl_id) + && (roamsession->bssParams.beaconInterval != + *bcn_interval)) { + sms_log(mac_ctx, LOGE, + FL("BcnIntrvl is diff can't connect to P2P_GO network ...")); + *status = QDF_STATUS_E_FAILURE; + return true; + } + } + return false; +} + +/** + * csr_validate_p2pgo_bcn_intrvl() - to validate p2pgo beacon interval + * @mac_ctx: pointer to mac context + * @chnl_id: channel id variable + * @bcn_interval: pointer to given beacon interval + * @session_id: given session id + * @status: fill the status in terms of QDF_STATUS to inform caller + * + * This API can provide the validation the beacon interval and re-calculate + * in case concurrency + * + * Return: bool + */ +static bool csr_validate_p2pgo_bcn_intrvl(tpAniSirGlobal mac_ctx, + uint8_t chnl_id, uint16_t *bcn_interval, + uint32_t session_id, QDF_STATUS *status) +{ + tCsrRoamSession *roamsession; + tCsrConfig *cfg_param; + tCsrRoamConnectedProfile *conn_profile; + uint16_t new_bcn_interval; + + roamsession = &mac_ctx->roam.roamSession[session_id]; + cfg_param = &mac_ctx->roam.configParam; + conn_profile = &roamsession->connectedProfile; + if (roamsession->pCurRoamProfile && + ((roamsession->pCurRoamProfile->csrPersona == + QDF_P2P_CLIENT_MODE) || + (roamsession->pCurRoamProfile->csrPersona == + QDF_STA_MODE))) { + /* check for P2P_client scenario */ + if ((conn_profile->operationChannel == 0) && + (conn_profile->beaconInterval == 0)) + return false; + + if (csr_is_conn_state_connected_infra(mac_ctx, session_id) && + (conn_profile->operationChannel != chnl_id) && + (conn_profile->beaconInterval != *bcn_interval)) { + /* + * Updated beaconInterval should be used only when + * we are starting a new BSS not incase of + * client or STA case + */ + + /* Calculate beacon Interval for P2P-GO incase of MCC */ + if (cfg_param->conc_custom_rule1 || + cfg_param->conc_custom_rule2) { + new_bcn_interval = CSR_CUSTOM_CONC_GO_BI; + } else { + new_bcn_interval = + csr_calculate_mcc_beacon_interval( + mac_ctx, + conn_profile->beaconInterval, + *bcn_interval); + } + if (*bcn_interval != new_bcn_interval) + *bcn_interval = new_bcn_interval; + *status = QDF_STATUS_SUCCESS; + return true; + } + } + return false; +} + +/** + * csr_validate_sta_bcn_intrvl() - to validate sta beacon interval + * @mac_ctx: pointer to mac context + * @chnl_id: channel id variable + * @bcn_interval: pointer to given beacon interval + * @session_id: given session id + * @status: fill the status in terms of QDF_STATUS to inform caller + * + * This API can provide the validation the beacon interval and re-calculate + * in case concurrency + * + * Return: bool + */ +static bool csr_validate_sta_bcn_intrvl(tpAniSirGlobal mac_ctx, + uint8_t chnl_id, uint16_t *bcn_interval, + uint32_t session_id, QDF_STATUS *status) +{ + tCsrRoamSession *roamsession; + tCsrConfig *cfg_param; + uint16_t new_bcn_interval; + + roamsession = &mac_ctx->roam.roamSession[session_id]; + cfg_param = &mac_ctx->roam.configParam; + + if (roamsession->pCurRoamProfile && + (roamsession->pCurRoamProfile->csrPersona == + QDF_P2P_CLIENT_MODE)) { + /* check for P2P client mode */ + sms_log(mac_ctx, LOG1, + FL("Bcn Intrvl validation not require for STA/CLIENT")); + return false; + } + if ((roamsession->bssParams.bssPersona == QDF_SAP_MODE) && + (roamsession->bssParams.operationChn != chnl_id)) { + /* + * IF SAP has started and STA wants to connect + * on different channel MCC should + * MCC should not be enabled so making it + * false to enforce on same channel + */ + sms_log(mac_ctx, LOGE, + FL("*** MCC with SAP+STA sessions ****")); + *status = QDF_STATUS_SUCCESS; + return true; + } + /* + * Check for P2P go scenario + * if GO in MCC support different + * beacon interval, + * change the BI of the P2P-GO + */ + if ((roamsession->bssParams.bssPersona == QDF_P2P_GO_MODE) && + (roamsession->bssParams.operationChn != chnl_id) && + (roamsession->bssParams.beaconInterval != *bcn_interval)) { + /* if GO in MCC support diff beacon interval, return success */ + if (cfg_param->fAllowMCCGODiffBI == 0x01) { + *status = QDF_STATUS_SUCCESS; + return true; + } + /* + * Send only Broadcast disassoc and update bcn_interval + * If configuration is set to 0x04 then dont + * disconnect all the station + */ + if ((cfg_param->fAllowMCCGODiffBI == 0x02) + || (cfg_param->fAllowMCCGODiffBI == 0x04)) { + /* Check to pass the right beacon Interval */ + if (cfg_param->conc_custom_rule1 || + cfg_param->conc_custom_rule2) { + new_bcn_interval = CSR_CUSTOM_CONC_GO_BI; + } else { + new_bcn_interval = + csr_calculate_mcc_beacon_interval( + mac_ctx, *bcn_interval, + roamsession->bssParams.beaconInterval); + } + sms_log(mac_ctx, LOG1, + FL(" Peer AP BI : %d, new Beacon Interval: %d"), + *bcn_interval, new_bcn_interval); + /* Update the becon Interval */ + if (new_bcn_interval != + roamsession->bssParams.beaconInterval) { + /* Update the bcn_interval now */ + sms_log(mac_ctx, LOGE, + FL(" Beacon Interval got changed config used: %d\n"), + cfg_param->fAllowMCCGODiffBI); + + roamsession->bssParams.beaconInterval = + new_bcn_interval; + roamsession->bssParams.updatebeaconInterval = + true; + *status = csr_update_mcc_p2p_beacon_interval( + mac_ctx); + return true; + } + *status = QDF_STATUS_SUCCESS; + return true; + } + if (cfg_param->fAllowMCCGODiffBI + == 0x03) { + /* Disconnect the P2P session */ + roamsession->bssParams.updatebeaconInterval = false; + *status = csr_roam_call_callback(mac_ctx, + session_id, NULL, 0, + eCSR_ROAM_SEND_P2P_STOP_BSS, + eCSR_ROAM_RESULT_NONE); + return true; + } + sms_log(mac_ctx, LOGE, + FL("BcnIntrvl is diff can't connect to preferred AP...")); + *status = QDF_STATUS_E_FAILURE; + return true; + } + return false; +} + +/** + * csr_validate_mcc_beacon_interval() - to validate the mcc beacon interval + * @mac_ctx: pointer to mac context + * @chnl_id: channel number + * @bcn_interval: provided beacon interval + * @cur_session_id: current session id + * @cur_bss_persona: Current BSS persona + * + * This API will validate the mcc beacon interval + * + * Return: QDF_STATUS + */ +QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal mac_ctx, + uint8_t chnl_id, + uint16_t *bcn_interval, + uint32_t cur_session_id, + enum tQDF_ADAPTER_MODE cur_bss_persona) { - uint32_t sessionId = 0; - uint16_t new_beaconInterval = 0; + uint32_t session_id = 0; + QDF_STATUS status; + bool is_done; /* If MCC is not supported just break */ - if (!pMac->roam.configParam.fenableMCCMode) { + if (!mac_ctx->roam.configParam.fenableMCCMode) return QDF_STATUS_E_FAILURE; - } - for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { - if (cursessionId != sessionId) { - if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { - continue; - } + for (session_id = 0; session_id < CSR_ROAM_SESSION_MAX; session_id++) { + if (cur_session_id == session_id) + continue; - switch (currBssPersona) { - case QDF_STA_MODE: - if (pMac->roam.roamSession[sessionId]. - pCurRoamProfile && - (pMac->roam.roamSession[sessionId]. - pCurRoamProfile->csrPersona == - QDF_P2P_CLIENT_MODE)) { - /* check for P2P client mode */ - sms_log(pMac, LOG1, - FL - (" Beacon Interval Validation not required for STA/CLIENT")); - } - /* - * IF SAP has started and STA wants to connect - * on different channel MCC should - * MCC should not be enabled so making it - * false to enforce on same channel - */ - else if (pMac->roam.roamSession[sessionId]. - bssParams.bssPersona == - QDF_SAP_MODE) { - if (pMac->roam.roamSession[sessionId]. - bssParams.operationChn != - channelId) { - sms_log(pMac, LOGE, - FL - ("*** MCC with SAP+STA sessions ****")); - return QDF_STATUS_SUCCESS; - } - } else if (pMac->roam.roamSession[sessionId]. - bssParams.bssPersona == - QDF_P2P_GO_MODE) { - /* - * Check for P2P go scenario - * if GO in MCC support different - * beacon interval, - * change the BI of the P2P-GO - */ - if ((pMac->roam.roamSession[sessionId]. - bssParams.operationChn != - channelId) - && (pMac->roam. - roamSession[sessionId]. - bssParams.beaconInterval != - *beaconInterval)) { - /* if GO in MCC support different beacon interval, return success */ - if (pMac->roam.configParam. - fAllowMCCGODiffBI == 0x01) { - return - QDF_STATUS_SUCCESS; - } - /* Send only Broadcast disassoc and update beaconInterval */ - /* If configuration is set to 0x04 then dont */ - /* disconnect all the station */ - else if ((pMac->roam. - configParam. - fAllowMCCGODiffBI == - 0x02) - || (pMac->roam. - configParam. - fAllowMCCGODiffBI - == 0x04)) { - /* Check to pass the right beacon Interval */ - if (pMac->roam.configParam.conc_custom_rule1 || - pMac->roam.configParam.conc_custom_rule2) { - new_beaconInterval = CSR_CUSTOM_CONC_GO_BI; - } else { - new_beaconInterval = - csr_calculate_mcc_beacon_interval(pMac, - *beaconInterval, - pMac->roam. - roamSession - [sessionId]. - bssParams. - beaconInterval); - } - sms_log(pMac, LOG1, - FL - (" Peer AP BI : %d, new Beacon Interval: %d"), - *beaconInterval, - new_beaconInterval); - /* Update the becon Interval */ - if (new_beaconInterval - != - pMac->roam. - roamSession - [sessionId]. - bssParams. - beaconInterval) { - /* Update the beaconInterval now */ - sms_log(pMac, - LOGE, - FL - (" Beacon Interval got changed config used: %d\n"), - pMac-> - roam. - configParam. - fAllowMCCGODiffBI); - - pMac->roam. - roamSession - [sessionId]. - bssParams. - beaconInterval - = - new_beaconInterval; - pMac->roam. - roamSession - [sessionId]. - bssParams. - updatebeaconInterval - = true; - return - csr_update_mcc_p2p_beacon_interval - (pMac); - } - return - QDF_STATUS_SUCCESS; - } - /* Disconnect the P2P session */ - else if (pMac->roam.configParam. - fAllowMCCGODiffBI == - 0x03) { - pMac->roam.roamSession[sessionId].bssParams.updatebeaconInterval = false; - return - csr_roam_call_callback - (pMac, sessionId, - NULL, 0, - eCSR_ROAM_SEND_P2P_STOP_BSS, - eCSR_ROAM_RESULT_NONE); - } else { - sms_log(pMac, LOGE, - FL - ("BeaconInterval is different cannot connect to preferred AP...")); - return - QDF_STATUS_E_FAILURE; - } - } - } - break; + if (!CSR_IS_SESSION_VALID(mac_ctx, session_id)) + continue; - case QDF_P2P_CLIENT_MODE: - if (pMac->roam.roamSession[sessionId]. - pCurRoamProfile && - (pMac->roam.roamSession[sessionId]. - pCurRoamProfile->csrPersona == - QDF_STA_MODE)) { - /* check for P2P client mode */ - sms_log(pMac, LOG1, - FL - (" Ignore Beacon Interval Validation...")); - } else if (pMac->roam.roamSession[sessionId]. - bssParams.bssPersona == - QDF_P2P_GO_MODE) { - /* Check for P2P go scenario */ - if ((pMac->roam.roamSession[sessionId]. - bssParams.operationChn != - channelId) - && (pMac->roam. - roamSession[sessionId]. - bssParams.beaconInterval != - *beaconInterval)) { - sms_log(pMac, LOGE, - FL - ("BeaconInterval is different cannot connect to P2P_GO network ...")); - return QDF_STATUS_E_FAILURE; - } - } - break; + switch (cur_bss_persona) { + case QDF_STA_MODE: + is_done = csr_validate_sta_bcn_intrvl(mac_ctx, chnl_id, + bcn_interval, session_id, &status); + if (true == is_done) + return status; + break; - case QDF_SAP_MODE: - case QDF_IBSS_MODE: - break; + case QDF_P2P_CLIENT_MODE: + is_done = csr_validate_p2pcli_bcn_intrvl(mac_ctx, + chnl_id, bcn_interval, session_id, + &status); + if (true == is_done) + return status; + break; - case QDF_P2P_GO_MODE: - { - if (pMac->roam.roamSession[sessionId]. - pCurRoamProfile && - ((pMac->roam.roamSession[sessionId]. - pCurRoamProfile->csrPersona == - QDF_P2P_CLIENT_MODE) || - (pMac->roam.roamSession[sessionId]. - pCurRoamProfile->csrPersona == - QDF_STA_MODE))) { - /* check for P2P_client scenario */ - if ((pMac->roam. - roamSession[sessionId]. - connectedProfile. - operationChannel == 0) - && (pMac->roam. - roamSession[sessionId]. - connectedProfile. - beaconInterval == 0)) { - continue; - } - - if (csr_is_conn_state_connected_infra - (pMac, sessionId) - && (pMac->roam. - roamSession[sessionId]. - connectedProfile. - operationChannel != - channelId) - && (pMac->roam. - roamSession[sessionId]. - connectedProfile. - beaconInterval != - *beaconInterval)) { - /* - * Updated beaconInterval should be used only when we are starting a new BSS - * not incase of client or STA case - */ - /* Calculate beacon Interval for P2P-GO incase of MCC */ - if (pMac->roam.configParam.conc_custom_rule1 || - pMac->roam.configParam.conc_custom_rule2) { - new_beaconInterval = CSR_CUSTOM_CONC_GO_BI; - } else { - new_beaconInterval = - csr_calculate_mcc_beacon_interval - (pMac, - pMac->roam. - roamSession - [sessionId]. - connectedProfile. - beaconInterval, - *beaconInterval); - } - if (*beaconInterval != - new_beaconInterval) - *beaconInterval - = - new_beaconInterval; - return - QDF_STATUS_SUCCESS; - } - } - } + case QDF_SAP_MODE: + case QDF_IBSS_MODE: break; - default: - sms_log(pMac, LOGE, - FL(" Persona not supported : %d"), - currBssPersona); - return QDF_STATUS_E_FAILURE; - } + case QDF_P2P_GO_MODE: + is_done = csr_validate_p2pgo_bcn_intrvl(mac_ctx, + chnl_id, bcn_interval, + session_id, &status); + if (true == is_done) + return status; + break; + + default: + sms_log(mac_ctx, LOGE, + FL("Persona not supported : %d"), + cur_bss_persona); + return QDF_STATUS_E_FAILURE; } } - return QDF_STATUS_SUCCESS; } -- cgit v1.2.3 From 062d054549486401b6ea9d7be3593f1e5863e768 Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Tue, 1 Mar 2016 17:56:11 -0800 Subject: qcacld-3.0: Update dot11f.frms for new radio measurement types Update dot11f.frms to decode LCI and Fine Time Measurement in incoming Radio Measurement frames. Currently we do not have these new types supported leading to incorrect frame parsing. Adding these types make sure that incoming radio measurement request frames are unpacked correctly. Change-Id: I542bb2b782fed144702c372cbfc314c666c72f53 CRs-Fixed: 980863 --- core/mac/src/cfg/cfgUtil/dot11f.frms | 253 ++- core/mac/src/include/dot11f.h | 383 +++- core/mac/src/sys/legacy/src/utils/src/dot11f.c | 2705 +++++++++++++++--------- 3 files changed, 2114 insertions(+), 1227 deletions(-) diff --git a/core/mac/src/cfg/cfgUtil/dot11f.frms b/core/mac/src/cfg/cfgUtil/dot11f.frms index 5f50801751f5..91b3b1d5c542 100644 --- a/core/mac/src/cfg/cfgUtil/dot11f.frms +++ b/core/mac/src/cfg/cfgUtil/dot11f.frms @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2007, 2014-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2006-2007, 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -1469,80 +1469,6 @@ IE TCLAS (EID_TCLAS) // 7.3.2.31 }; } // End IE TCLASS -const EID_RRM_BEACON_REPORTING = 1; -const EID_RRM_BCN_REPORTING_DETAIL = 2; - -IE BeaconReporting (EID_RRM_BEACON_REPORTING) -{ - reportingCondition, 1; - threshold, 1; -} - -IE BcnReportingDetail (EID_RRM_BCN_REPORTING_DETAIL) -{ - reportingDetail, 1; -} - -IE APChannelReport (EID_AP_CHAN_REPORT) -{ - regulatoryClass, 1; - channelList[0..50]; -} - -IE MeasurementRequest (EID_MEAS_REQUEST) // 7.3.2.21 -{ - measurement_token, 1; - - // Measurement Request Mode - { - parallel: 1; - enable: 1; - request: 1; - report: 1; - durationMandatory: 1; - unused: 3; - } - - measurement_type, 1; - UNION measurement_request (DISCRIMINATOR measurement_type) - { - Basic (measurement_type IS 0) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - CCA (measurement_type IS 1) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - RPIHistogram (measurement_type IS 2) - { - channel_no, 1; - meas_start_time[8]; - meas_duration, 2; - } - Beacon (measurement_type IS 5) - { - regClass, 1; - channel, 1; - randomization, 2; - meas_duration, 2; - meas_mode, 1; - BSSID[6]; - OPTIE SSID; - OPTIE BeaconReporting; - OPTIE BcnReportingDetail; - OPTIE RequestedInfo; - OPTIE APChannelReport[0..2]; - //OPTIONAL vendor_specific[1..239]; - } - - }; -} - const EID_BCN_REPORT_FRAME_BODY = 1; IE BeaconReportFrmBody (EID_BCN_REPORT_FRAME_BODY) { @@ -2059,7 +1985,16 @@ IE ht2040_bss_intolerant_report (EID_20_40_BSS_INTOLERANT_REPORT) const EID_RRM_NBR_RPT_TSF = 1; const EID_RRM_NBR_CD_COUNTRY = 2; -const EID_RRM_NBR_MSMT_PILOT_TX_INFO = 66; + +IE TSFInfo (EID_RRM_NBR_RPT_TSF) +{ + TsfOffset, 2; + BeaconIntvl, 2; +} +IE CondensedCountryStr (EID_RRM_NBR_CD_COUNTRY) +{ + countryStr[2]; +} IE NeighborReport (EID_NEIGHBOR_REPORT) { @@ -2089,20 +2024,9 @@ IE NeighborReport (EID_NEIGHBOR_REPORT) regulatoryClass, 1; channel, 1; PhyType, 1; - OPTIE IE TSFInfo (EID_RRM_NBR_RPT_TSF) - { - TsfOffset, 2; - BeaconIntvl, 2; - } - OPTIE IE CondensedCountryStr (EID_RRM_NBR_CD_COUNTRY) - { - countryStr[2]; - } - OPTIE IE MeasurementPilot; // (EID_RRM_NBR_MSMT_PILOT_TX_INFO) -// { -// measurementPilot, 1; -// vendorSpecific[0..255]; //Should be an IE. But currently only one level of nesting allowed. Can ignore for now. -// } + OPTIE IE TSFInfo; + OPTIE IE CondensedCountryStr; + OPTIE IE MeasurementPilot; OPTIE IE RRMEnabledCap; OPTIE IE MultiBssid; //Ignoring vendor specific. @@ -2466,6 +2390,155 @@ IE TimeAdvertisement (EID_TIME_ADVERTISEMENT) // 8.4.2.63 time_error[5]; } +const EID_RRM_BEACON_REPORTING = 1; +const EID_RRM_BCN_REPORTING_DETAIL = 2; + +const SUB_EID_AZIMUTH_REQ = 1; +const SUB_EID_REQ_MAC_ADDR = 2; +const SUB_EID_TGT_MAC_ADDR = 3; +const SUB_EID_MAX_AGE = 4; +const SUB_EID_NEIGHBOR_RPT = 52; + +IE BeaconReporting (EID_RRM_BEACON_REPORTING) +{ + reportingCondition, 1; + threshold, 1; +} + +IE BcnReportingDetail (EID_RRM_BCN_REPORTING_DETAIL) +{ + reportingDetail, 1; +} + +IE APChannelReport (EID_AP_CHAN_REPORT) +{ + regulatoryClass, 1; + channelList[0..50]; +} + +IE azimuth_req (SUB_EID_AZIMUTH_REQ) +{ + request, 1; +} + +IE req_mac_addr (SUB_EID_REQ_MAC_ADDR) +{ + addr[6]; +} + +IE tgt_mac_addr (SUB_EID_TGT_MAC_ADDR) +{ + addr[6]; +} + +IE max_age (SUB_EID_MAX_AGE) +{ + max_age, 2; +} + +IE neighbor_rpt (SUB_EID_NEIGHBOR_RPT) +{ + bssid[6]; + //Bssid Info + { + APReachability: 2; + Security: 1; + KeyScope: 1; + //Capabilities + SpecMgmtCap: 1; + QosCap: 1; + apsd: 1; + rrm: 1; + } + //Capabilities contd. + { + DelayedBA: 1; + ImmBA: 1; + //Capabilities end. + MobilityDomain: 1; + reserved: 5; + } + reserved1, 2; //part of BSSID Info. + regulatoryClass, 1; + channel, 1; + PhyType, 1; + OPTIE IE TSFInfo; + OPTIE IE CondensedCountryStr; + OPTIE IE MeasurementPilot; + OPTIE IE RRMEnabledCap; + OPTIE IE MultiBssid; +} + +IE MeasurementRequest (EID_MEAS_REQUEST) // 7.3.2.21 +{ + measurement_token, 1; + + // Measurement Request Mode + { + parallel: 1; + enable: 1; + request: 1; + report: 1; + durationMandatory: 1; + unused: 3; + } + + measurement_type, 1; + UNION measurement_request (DISCRIMINATOR measurement_type) + { + Basic (measurement_type IS 0) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + CCA (measurement_type IS 1) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + RPIHistogram (measurement_type IS 2) + { + channel_no, 1; + meas_start_time[8]; + meas_duration, 2; + } + Beacon (measurement_type IS 5) + { + regClass, 1; + channel, 1; + randomization, 2; + meas_duration, 2; + meas_mode, 1; + BSSID[6]; + OPTIE SSID; + OPTIE BeaconReporting; + OPTIE BcnReportingDetail; + OPTIE RequestedInfo; + OPTIE APChannelReport[0..2]; + //OPTIONAL vendor_specific[1..239]; + } + lci (measurement_type IS 8) + { + loc_subject, 1; + OPTIE azimuth_req; + OPTIE req_mac_addr; + OPTIE tgt_mac_addr; + OPTIE max_age; + } + ftmrr (measurement_type IS 16) + { + random_interval, 2; + min_ap_count, 1; + + OPTIE neighbor_rpt; + OPTIE max_age; + } + + }; +} + ///////////////////////////////////////////////////////////////////////////// // MULTIIEs // ///////////////////////////////////////////////////////////////////////////// diff --git a/core/mac/src/include/dot11f.h b/core/mac/src/include/dot11f.h index a174f5e35f9e..e51bd61cb5c3 100644 --- a/core/mac/src/include/dot11f.h +++ b/core/mac/src/include/dot11f.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -35,7 +35,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Nov 16 14:10:10 2015 from the following file(s): + * Wed Mar 2 11:45:36 2016 from the following file(s): * * dot11f.frms * @@ -2012,44 +2012,6 @@ uint32_t dot11f_get_packed_tlv_P2PManageability( ********************************************************************/ -/* EID 2 (0x02) */ -typedef struct sDot11fIECondensedCountryStr { - uint8_t present; - uint8_t countryStr[2]; -} tDot11fIECondensedCountryStr; - -#define DOT11F_EID_CONDENSEDCOUNTRYSTR (2) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MIN_LEN (2) - -#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MAX_LEN (2) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -uint32_t dot11f_unpack_ie_condensed_country_str( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIECondensedCountryStr*); - -uint32_t dot11f_pack_ie_condensed_country_str( - tpAniSirGlobal, - tDot11fIECondensedCountryStr *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_CondensedCountryStr( - tpAniSirGlobal, - tDot11fIECondensedCountryStr *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 2 (0x02) */ typedef struct sDot11fIEGTK { uint8_t present; @@ -2211,45 +2173,6 @@ uint32_t dot11f_get_packed_ie_R1KH_ID( }; /* End extern "C". */ #endif /* C++ */ -/* EID 1 (0x01) */ -typedef struct sDot11fIETSFInfo { - uint8_t present; - uint16_t TsfOffset; - uint16_t BeaconIntvl; -} tDot11fIETSFInfo; - -#define DOT11F_EID_TSFINFO (1) - -/* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_TSFINFO_MIN_LEN (4) - -#define DOT11F_IE_TSFINFO_MAX_LEN (4) - -#ifdef __cplusplus -extern "C" { -#endif /* C++ */ -uint32_t dot11f_unpack_ie_tsf_info( - tpAniSirGlobal, - uint8_t *, - uint8_t, - tDot11fIETSFInfo*); - -uint32_t dot11f_pack_ie_tsf_info( - tpAniSirGlobal, - tDot11fIETSFInfo *, - uint8_t *, - uint32_t, - uint32_t*); - -uint32_t dot11f_get_packed_ie_TSFInfo( - tpAniSirGlobal, - tDot11fIETSFInfo *, - uint32_t*); - -#ifdef __cplusplus -}; /* End extern "C". */ -#endif /* C++ */ - /* EID 51 (0x33) */ typedef struct sDot11fIEAPChannelReport { uint8_t present; @@ -2406,6 +2329,44 @@ uint32_t dot11f_get_packed_ie_BeaconReporting( }; /* End extern "C". */ #endif /* C++ */ +/* EID 2 (0x02) */ +typedef struct sDot11fIECondensedCountryStr { + uint8_t present; + uint8_t countryStr[2]; +} tDot11fIECondensedCountryStr; + +#define DOT11F_EID_CONDENSEDCOUNTRYSTR (2) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MIN_LEN (2) + +#define DOT11F_IE_CONDENSEDCOUNTRYSTR_MAX_LEN (2) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_condensed_country_str( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIECondensedCountryStr*); + +uint32_t dot11f_pack_ie_condensed_country_str( + tpAniSirGlobal, + tDot11fIECondensedCountryStr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_CondensedCountryStr( + tpAniSirGlobal, + tDot11fIECondensedCountryStr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 66 (0x42) */ typedef struct sDot11fIEMeasurementPilot { uint8_t present; @@ -2904,6 +2865,45 @@ uint32_t dot11f_get_packed_ie_TSDelay( }; /* End extern "C". */ #endif /* C++ */ +/* EID 1 (0x01) */ +typedef struct sDot11fIETSFInfo { + uint8_t present; + uint16_t TsfOffset; + uint16_t BeaconIntvl; +} tDot11fIETSFInfo; + +#define DOT11F_EID_TSFINFO (1) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_TSFINFO_MIN_LEN (4) + +#define DOT11F_IE_TSFINFO_MAX_LEN (4) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_tsf_info( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIETSFInfo*); + +uint32_t dot11f_pack_ie_tsf_info( + tpAniSirGlobal, + tDot11fIETSFInfo *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_TSFInfo( + tpAniSirGlobal, + tDot11fIETSFInfo *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 13 (0x0d) */ typedef struct sDot11fIETSPEC { uint8_t present; @@ -3371,6 +3371,216 @@ uint32_t dot11f_get_packed_ie_WiderBWChanSwitchAnn( }; /* End extern "C". */ #endif /* C++ */ +/* EID 1 (0x01) */ +typedef struct sDot11fIEazimuth_req { + uint8_t present; + uint8_t request; +} tDot11fIEazimuth_req; + +#define DOT11F_EID_AZIMUTH_REQ (1) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_AZIMUTH_REQ_MIN_LEN (1) + +#define DOT11F_IE_AZIMUTH_REQ_MAX_LEN (1) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_azimuth_req( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEazimuth_req*); + +uint32_t dot11f_pack_ie_azimuth_req( + tpAniSirGlobal, + tDot11fIEazimuth_req *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_azimuth_req( + tpAniSirGlobal, + tDot11fIEazimuth_req *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 4 (0x04) */ +typedef struct sDot11fIEmax_age { + uint8_t present; + uint16_t max_age; +} tDot11fIEmax_age; + +#define DOT11F_EID_MAX_AGE (4) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_MAX_AGE_MIN_LEN (2) + +#define DOT11F_IE_MAX_AGE_MAX_LEN (2) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_max_age( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEmax_age*); + +uint32_t dot11f_pack_ie_max_age( + tpAniSirGlobal, + tDot11fIEmax_age *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_max_age( + tpAniSirGlobal, + tDot11fIEmax_age *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 52 (0x34) */ +typedef struct sDot11fIEneighbor_rpt { + uint8_t present; + uint8_t bssid[6]; + uint8_t APReachability:2; + uint8_t Security:1; + uint8_t KeyScope:1; + uint8_t SpecMgmtCap:1; + uint8_t QosCap:1; + uint8_t apsd:1; + uint8_t rrm:1; + uint8_t DelayedBA:1; + uint8_t ImmBA:1; + uint8_t MobilityDomain:1; + uint8_t reserved:5; + uint16_t reserved1; + uint8_t regulatoryClass; + uint8_t channel; + uint8_t PhyType; + tDot11fIETSFInfo TSFInfo; + tDot11fIECondensedCountryStr CondensedCountryStr; + tDot11fIEMeasurementPilot MeasurementPilot; + tDot11fIERRMEnabledCap RRMEnabledCap; + tDot11fIEMultiBssid MultiBssid; +} tDot11fIEneighbor_rpt; + +#define DOT11F_EID_NEIGHBOR_RPT (52) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_NEIGHBOR_RPT_MIN_LEN (13) + +#define DOT11F_IE_NEIGHBOR_RPT_MAX_LEN (546) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_neighbor_rpt( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEneighbor_rpt*); + +uint32_t dot11f_pack_ie_neighbor_rpt( + tpAniSirGlobal, + tDot11fIEneighbor_rpt *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_neighbor_rpt( + tpAniSirGlobal, + tDot11fIEneighbor_rpt *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 2 (0x02) */ +typedef struct sDot11fIEreq_mac_addr { + uint8_t present; + uint8_t addr[6]; +} tDot11fIEreq_mac_addr; + +#define DOT11F_EID_REQ_MAC_ADDR (2) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_REQ_MAC_ADDR_MIN_LEN (6) + +#define DOT11F_IE_REQ_MAC_ADDR_MAX_LEN (6) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_req_mac_addr( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEreq_mac_addr*); + +uint32_t dot11f_pack_ie_req_mac_addr( + tpAniSirGlobal, + tDot11fIEreq_mac_addr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_req_mac_addr( + tpAniSirGlobal, + tDot11fIEreq_mac_addr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + +/* EID 3 (0x03) */ +typedef struct sDot11fIEtgt_mac_addr { + uint8_t present; + uint8_t addr[6]; +} tDot11fIEtgt_mac_addr; + +#define DOT11F_EID_TGT_MAC_ADDR (3) + +/* N.B. These #defines do *not* include the EID & length */ +#define DOT11F_IE_TGT_MAC_ADDR_MIN_LEN (6) + +#define DOT11F_IE_TGT_MAC_ADDR_MAX_LEN (6) + +#ifdef __cplusplus +extern "C" { +#endif /* C++ */ +uint32_t dot11f_unpack_ie_tgt_mac_addr( + tpAniSirGlobal, + uint8_t *, + uint8_t, + tDot11fIEtgt_mac_addr*); + +uint32_t dot11f_pack_ie_tgt_mac_addr( + tpAniSirGlobal, + tDot11fIEtgt_mac_addr *, + uint8_t *, + uint32_t, + uint32_t*); + +uint32_t dot11f_get_packed_ie_tgt_mac_addr( + tpAniSirGlobal, + tDot11fIEtgt_mac_addr *, + uint32_t*); + +#ifdef __cplusplus +}; /* End extern "C". */ +#endif /* C++ */ + /* EID 197 (0xc5) */ typedef struct sDot11fIEAID { uint8_t present; @@ -4588,13 +4798,26 @@ typedef struct sDot11fIEMeasurementRequest { uint16_t num_APChannelReport; tDot11fIEAPChannelReport APChannelReport[2]; } Beacon; /* measurement_type = 5 */ + struct { + uint8_t loc_subject; + tDot11fIEazimuth_req azimuth_req; + tDot11fIEreq_mac_addr req_mac_addr; + tDot11fIEtgt_mac_addr tgt_mac_addr; + tDot11fIEmax_age max_age; + } lci; /* measurement_type = 8 */ + struct { + uint16_t random_interval; + uint8_t min_ap_count; + tDot11fIEneighbor_rpt neighbor_rpt; + tDot11fIEmax_age max_age; + } ftmrr; /* measurement_type = 16 */ } measurement_request; } tDot11fIEMeasurementRequest; #define DOT11F_EID_MEASUREMENTREQUEST (38) /* N.B. These #defines do *not* include the EID & length */ -#define DOT11F_IE_MEASUREMENTREQUEST_MIN_LEN (14) +#define DOT11F_IE_MEASUREMENTREQUEST_MIN_LEN (4) #define DOT11F_IE_MEASUREMENTREQUEST_MAX_LEN (16) diff --git a/core/mac/src/sys/legacy/src/utils/src/dot11f.c b/core/mac/src/sys/legacy/src/utils/src/dot11f.c index 3cbbf29ae9e1..8c4be956ef30 100644 --- a/core/mac/src/sys/legacy/src/utils/src/dot11f.c +++ b/core/mac/src/sys/legacy/src/utils/src/dot11f.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -33,7 +33,7 @@ * * * This file was automatically generated by 'framesc' - * Mon Nov 16 10:55:21 2015 from the following file(s): + * Wed Mar 2 11:45:36 2016 from the following file(s): * * dot11f.frms * @@ -1320,24 +1320,6 @@ uint32_t dot11f_unpack_tlv_p2_p_interface(tpAniSirGlobal pCtx, #define SigTlvP2PManageability (0x0025) -uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIECondensedCountryStr *pDst) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - DOT11F_MEMCPY(pCtx, pDst->countryStr, pBuf, 2); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_condensed_country_str. */ - -#define SigIeCondensedCountryStr (0x0001) - - uint32_t dot11f_unpack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -1371,7 +1353,7 @@ uint32_t dot11f_unpack_ie_gtk(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_gtk. */ -#define SigIeGTK (0x0002) +#define SigIeGTK (0x0001) uint32_t dot11f_unpack_ie_igtk(tpAniSirGlobal pCtx, @@ -1398,7 +1380,7 @@ uint32_t dot11f_unpack_ie_igtk(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_igtk. */ -#define SigIeIGTK (0x0003) +#define SigIeIGTK (0x0002) uint32_t dot11f_unpack_ie_r0_kh_id(tpAniSirGlobal pCtx, @@ -1422,7 +1404,7 @@ uint32_t dot11f_unpack_ie_r0_kh_id(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_r0_kh_id. */ -#define SigIeR0KH_ID (0x0004) +#define SigIeR0KH_ID (0x0003) uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx, @@ -1440,28 +1422,7 @@ uint32_t dot11f_unpack_ie_r1_kh_id(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_r1_kh_id. */ -#define SigIeR1KH_ID (0x0005) - - -uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx, - uint8_t *pBuf, - uint8_t ielen, - tDot11fIETSFInfo *pDst) -{ - uint32_t status = DOT11F_PARSE_SUCCESS; - (void) pBuf; (void)ielen; /* Shutup the compiler */ - if (pDst->present) - status = DOT11F_DUPLICATE_IE; - pDst->present = 1; - framesntohs(pCtx, &pDst->TsfOffset, pBuf, 0); - pBuf += 2; - ielen -= (uint8_t)2; - framesntohs(pCtx, &pDst->BeaconIntvl, pBuf, 0); - (void)pCtx; - return status; -} /* End dot11f_unpack_ie_tsf_info. */ - -#define SigIeTSFInfo (0x0006) +#define SigIeR1KH_ID (0x0004) uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, @@ -1488,7 +1449,7 @@ uint32_t dot11f_unpack_ie_ap_channel_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ap_channel_report. */ -#define SigIeAPChannelReport (0x0007) +#define SigIeAPChannelReport (0x0005) uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, @@ -1506,7 +1467,7 @@ uint32_t dot11f_unpack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_bcn_reporting_detail. */ -#define SigIeBcnReportingDetail (0x0008) +#define SigIeBcnReportingDetail (0x0006) uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, @@ -1530,7 +1491,7 @@ uint32_t dot11f_unpack_ie_beacon_report_frm_body(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_report_frm_body. */ -#define SigIeBeaconReportFrmBody (0x0009) +#define SigIeBeaconReportFrmBody (0x0007) uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, @@ -1551,7 +1512,25 @@ uint32_t dot11f_unpack_ie_beacon_reporting(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_beacon_reporting. */ -#define SigIeBeaconReporting (0x000a) +#define SigIeBeaconReporting (0x0008) + + +uint32_t dot11f_unpack_ie_condensed_country_str(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIECondensedCountryStr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->countryStr, pBuf, 2); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_condensed_country_str. */ + +#define SigIeCondensedCountryStr (0x0009) uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx, @@ -1573,7 +1552,7 @@ uint32_t dot11f_unpack_ie_measurement_pilot(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_pilot. */ -#define SigIeMeasurementPilot (0x000b) +#define SigIeMeasurementPilot (0x000a) uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx, @@ -1595,7 +1574,7 @@ uint32_t dot11f_unpack_ie_multi_bssid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_multi_bssid. */ -#define SigIeMultiBssid (0x000c) +#define SigIeMultiBssid (0x000b) uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx, @@ -1619,7 +1598,7 @@ uint32_t dot11f_unpack_ie_ric_data(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data. */ -#define SigIeRICData (0x000d) +#define SigIeRICData (0x000c) uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx, @@ -1641,7 +1620,7 @@ uint32_t dot11f_unpack_ie_ric_descriptor(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_descriptor. */ -#define SigIeRICDescriptor (0x000e) +#define SigIeRICDescriptor (0x000d) uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, @@ -1707,7 +1686,7 @@ uint32_t dot11f_unpack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rrm_enabled_cap. */ -#define SigIeRRMEnabledCap (0x000f) +#define SigIeRRMEnabledCap (0x000e) uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx, @@ -1726,7 +1705,7 @@ uint32_t dot11f_unpack_ie_requested_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_requested_info. */ -#define SigIeRequestedInfo (0x0010) +#define SigIeRequestedInfo (0x000f) uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx, @@ -1752,7 +1731,7 @@ uint32_t dot11f_unpack_ie_ssid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ssid. */ -#define SigIeSSID (0x0011) +#define SigIeSSID (0x0010) uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx, @@ -1787,7 +1766,7 @@ uint32_t dot11f_unpack_ie_schedule(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_schedule. */ -#define SigIeSchedule (0x0012) +#define SigIeSchedule (0x0011) uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx, @@ -1878,10 +1857,10 @@ uint32_t dot11f_unpack_ie_tclas(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tclas. */ -#define SigIeTCLAS (0x0013) +#define SigIeTCLAS (0x0012) -#define SigIeTCLASSPROC (0x0014) +#define SigIeTCLASSPROC (0x0013) uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx, @@ -1899,7 +1878,28 @@ uint32_t dot11f_unpack_ie_ts_delay(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ts_delay. */ -#define SigIeTSDelay (0x0015) +#define SigIeTSDelay (0x0014) + + +uint32_t dot11f_unpack_ie_tsf_info(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIETSFInfo *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + framesntohs(pCtx, &pDst->TsfOffset, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + framesntohs(pCtx, &pDst->BeaconIntvl, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_tsf_info. */ + +#define SigIeTSFInfo (0x0015) uint32_t dot11f_unpack_ie_tspec(tpAniSirGlobal pCtx, @@ -2369,6 +2369,163 @@ uint32_t dot11f_unpack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, #define SigIeWiderBWChanSwitchAnn (0x001e) +uint32_t dot11f_unpack_ie_azimuth_req(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEazimuth_req *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + pDst->request = *pBuf; + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_azimuth_req. */ + +#define SigIeazimuth_req (0x001f) + + +uint32_t dot11f_unpack_ie_max_age(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEmax_age *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + framesntohs(pCtx, &pDst->max_age, pBuf, 0); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_max_age. */ + +#define SigIemax_age (0x0020) + + +static const tFFDefn FFS_neighbor_rpt[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_neighbor_rpt[] = { + { offsetof(tDot11fIEneighbor_rpt, TSFInfo), offsetof(tDot11fIETSFInfo, + present), 0, "TSFInfo", 0, 6, 6, SigIeTSFInfo, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_TSFINFO, 0, }, + { offsetof(tDot11fIEneighbor_rpt, CondensedCountryStr), + offsetof(tDot11fIECondensedCountryStr, present), 0, "CondensedCountryStr", + 0, 4, 4, SigIeCondensedCountryStr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_CONDENSEDCOUNTRYSTR, 0, }, + { offsetof(tDot11fIEneighbor_rpt, MeasurementPilot), + offsetof(tDot11fIEMeasurementPilot, present), 0, "MeasurementPilot", + 0, 3, 258, SigIeMeasurementPilot, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTPILOT, 0, }, + { offsetof(tDot11fIEneighbor_rpt, RRMEnabledCap), + offsetof(tDot11fIERRMEnabledCap, present), 0, "RRMEnabledCap", + 0, 7, 7, SigIeRRMEnabledCap, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_RRMENABLEDCAP, 0, }, + { offsetof(tDot11fIEneighbor_rpt, MultiBssid), + offsetof(tDot11fIEMultiBssid, present), 0, "MultiBssid", + 0, 3, 258, SigIeMultiBssid, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MULTIBSSID, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + +uint32_t dot11f_unpack_ie_neighbor_rpt(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEneighbor_rpt *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + uint8_t tmp24__; + uint8_t tmp25__; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); + pBuf += 6; + ielen -= (uint8_t)6; + tmp24__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->APReachability = tmp24__ >> 0 & 0x3; + pDst->Security = tmp24__ >> 2 & 0x1; + pDst->KeyScope = tmp24__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp24__ >> 4 & 0x1; + pDst->QosCap = tmp24__ >> 5 & 0x1; + pDst->apsd = tmp24__ >> 6 & 0x1; + pDst->rrm = tmp24__ >> 7 & 0x1; + tmp25__ = *pBuf; + pBuf += 1; + ielen -= 1; + pDst->DelayedBA = tmp25__ >> 0 & 0x1; + pDst->ImmBA = tmp25__ >> 1 & 0x1; + pDst->MobilityDomain = tmp25__ >> 2 & 0x1; + pDst->reserved = tmp25__ >> 3 & 0x1f; + framesntohs(pCtx, &pDst->reserved1, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + pDst->regulatoryClass = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + pDst->channel = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + pDst->PhyType = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + (void)pCtx; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_neighbor_rpt, + IES_neighbor_rpt, + (uint8_t *)pDst, + sizeof(*pDst)); + return status; +} /* End dot11f_unpack_ie_neighbor_rpt. */ + +#define SigIeneighbor_rpt (0x0021) + + +uint32_t dot11f_unpack_ie_req_mac_addr(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEreq_mac_addr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->addr, pBuf, 6); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_req_mac_addr. */ + +#define SigIereq_mac_addr (0x0022) + + +uint32_t dot11f_unpack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, + uint8_t *pBuf, + uint8_t ielen, + tDot11fIEtgt_mac_addr *pDst) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void) pBuf; (void)ielen; /* Shutup the compiler */ + if (pDst->present) + status = DOT11F_DUPLICATE_IE; + pDst->present = 1; + DOT11F_MEMCPY(pCtx, pDst->addr, pBuf, 6); + (void)pCtx; + return status; +} /* End dot11f_unpack_ie_tgt_mac_addr. */ + +#define SigIetgt_mac_addr (0x0023) + + uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, @@ -2384,7 +2541,7 @@ uint32_t dot11f_unpack_ie_aid(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_aid. */ -#define SigIeAID (0x001f) +#define SigIeAID (0x0024) uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, @@ -2411,7 +2568,7 @@ uint32_t dot11f_unpack_ie_cf_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_cf_params. */ -#define SigIeCFParams (0x0020) +#define SigIeCFParams (0x0025) uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, @@ -2435,7 +2592,7 @@ uint32_t dot11f_unpack_ie_challenge_text(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_challenge_text. */ -#define SigIeChallengeText (0x0021) +#define SigIeChallengeText (0x0026) uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, @@ -2459,7 +2616,7 @@ uint32_t dot11f_unpack_ie_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_chan_switch_ann. */ -#define SigIeChanSwitchAnn (0x0022) +#define SigIeChanSwitchAnn (0x0027) static const tFFDefn FFS_ChannelSwitchWrapper[] = { @@ -2495,7 +2652,7 @@ uint32_t dot11f_unpack_ie_channel_switch_wrapper(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_channel_switch_wrapper. */ -#define SigIeChannelSwitchWrapper (0x0023) +#define SigIeChannelSwitchWrapper (0x0028) uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, @@ -2527,10 +2684,10 @@ uint32_t dot11f_unpack_ie_country(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_country. */ -#define SigIeCountry (0x0024) +#define SigIeCountry (0x0029) -#define SigIeDSParams (0x0025) +#define SigIeDSParams (0x002a) uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, @@ -2539,14 +2696,14 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, tDot11fIEEDCAParamSet *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp24__; - uint8_t tmp25__; uint8_t tmp26__; uint8_t tmp27__; uint8_t tmp28__; uint8_t tmp29__; uint8_t tmp30__; uint8_t tmp31__; + uint8_t tmp32__; + uint8_t tmp33__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2557,69 +2714,69 @@ uint32_t dot11f_unpack_ie_edca_param_set(tpAniSirGlobal pCtx, pDst->reserved = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp24__ = *pBuf; + tmp26__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp24__ >> 0 & 0xf; - pDst->acbe_acm = tmp24__ >> 4 & 0x1; - pDst->acbe_aci = tmp24__ >> 5 & 0x3; - pDst->unused1 = tmp24__ >> 7 & 0x1; - tmp25__ = *pBuf; + pDst->acbe_aifsn = tmp26__ >> 0 & 0xf; + pDst->acbe_acm = tmp26__ >> 4 & 0x1; + pDst->acbe_aci = tmp26__ >> 5 & 0x3; + pDst->unused1 = tmp26__ >> 7 & 0x1; + tmp27__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp25__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp25__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp27__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp27__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp26__ = *pBuf; + tmp28__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp26__ >> 0 & 0xf; - pDst->acbk_acm = tmp26__ >> 4 & 0x1; - pDst->acbk_aci = tmp26__ >> 5 & 0x3; - pDst->unused2 = tmp26__ >> 7 & 0x1; - tmp27__ = *pBuf; + pDst->acbk_aifsn = tmp28__ >> 0 & 0xf; + pDst->acbk_acm = tmp28__ >> 4 & 0x1; + pDst->acbk_aci = tmp28__ >> 5 & 0x3; + pDst->unused2 = tmp28__ >> 7 & 0x1; + tmp29__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp27__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp27__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp29__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp29__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp28__ = *pBuf; + tmp30__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp28__ >> 0 & 0xf; - pDst->acvi_acm = tmp28__ >> 4 & 0x1; - pDst->acvi_aci = tmp28__ >> 5 & 0x3; - pDst->unused3 = tmp28__ >> 7 & 0x1; - tmp29__ = *pBuf; + pDst->acvi_aifsn = tmp30__ >> 0 & 0xf; + pDst->acvi_acm = tmp30__ >> 4 & 0x1; + pDst->acvi_aci = tmp30__ >> 5 & 0x3; + pDst->unused3 = tmp30__ >> 7 & 0x1; + tmp31__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp29__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp29__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp31__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp31__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp30__ = *pBuf; + tmp32__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp30__ >> 0 & 0xf; - pDst->acvo_acm = tmp30__ >> 4 & 0x1; - pDst->acvo_aci = tmp30__ >> 5 & 0x3; - pDst->unused4 = tmp30__ >> 7 & 0x1; - tmp31__ = *pBuf; + pDst->acvo_aifsn = tmp32__ >> 0 & 0xf; + pDst->acvo_acm = tmp32__ >> 4 & 0x1; + pDst->acvo_aci = tmp32__ >> 5 & 0x3; + pDst->unused4 = tmp32__ >> 7 & 0x1; + tmp33__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp31__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp31__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp33__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp33__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_edca_param_set. */ -#define SigIeEDCAParamSet (0x0026) +#define SigIeEDCAParamSet (0x002b) uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, @@ -2628,21 +2785,21 @@ uint32_t dot11f_unpack_ie_erp_info(tpAniSirGlobal pCtx, tDot11fIEERPInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp32__; + uint8_t tmp34__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp32__ = *pBuf; - pDst->non_erp_present = tmp32__ >> 0 & 0x1; - pDst->use_prot = tmp32__ >> 1 & 0x1; - pDst->barker_preamble = tmp32__ >> 2 & 0x1; - pDst->unused = tmp32__ >> 3 & 0x1f; + tmp34__ = *pBuf; + pDst->non_erp_present = tmp34__ >> 0 & 0x1; + pDst->use_prot = tmp34__ >> 1 & 0x1; + pDst->barker_preamble = tmp34__ >> 2 & 0x1; + pDst->unused = tmp34__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_erp_info. */ -#define SigIeERPInfo (0x0027) +#define SigIeERPInfo (0x002c) uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, @@ -2666,7 +2823,7 @@ uint32_t dot11f_unpack_ie_ese_cckm_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_cckm_opaque. */ -#define SigIeESECckmOpaque (0x0028) +#define SigIeESECckmOpaque (0x002d) uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, @@ -2675,7 +2832,7 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, tDot11fIEESERadMgmtCap *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp33__; + uint8_t tmp35__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -2683,14 +2840,14 @@ uint32_t dot11f_unpack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, pDst->mgmt_state = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp33__ = *pBuf; - pDst->mbssid_mask = tmp33__ >> 0 & 0x7; - pDst->reserved = tmp33__ >> 3 & 0x1f; + tmp35__ = *pBuf; + pDst->mbssid_mask = tmp35__ >> 0 & 0x7; + pDst->reserved = tmp35__ >> 3 & 0x1f; (void)pCtx; return status; } /* End dot11f_unpack_ie_ese_rad_mgmt_cap. */ -#define SigIeESERadMgmtCap (0x0029) +#define SigIeESERadMgmtCap (0x002e) uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, @@ -2714,7 +2871,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_met(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_traf_strm_met. */ -#define SigIeESETrafStrmMet (0x002a) +#define SigIeESETrafStrmMet (0x002f) uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx, @@ -2741,7 +2898,7 @@ uint32_t dot11f_unpack_ie_ese_traf_strm_rate_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_traf_strm_rate_set. */ -#define SigIeESETrafStrmRateSet (0x002b) +#define SigIeESETrafStrmRateSet (0x0030) uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, @@ -2762,7 +2919,7 @@ uint32_t dot11f_unpack_ie_ese_txmit_power(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_txmit_power. */ -#define SigIeESETxmitPower (0x002c) +#define SigIeESETxmitPower (0x0031) uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, @@ -2780,7 +2937,7 @@ uint32_t dot11f_unpack_ie_ese_version(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ese_version. */ -#define SigIeESEVersion (0x002d) +#define SigIeESEVersion (0x0032) uint32_t dot11f_unpack_ie_ext_cap(tpAniSirGlobal pCtx, @@ -2809,7 +2966,7 @@ endUnpackIeExtCap: return status; } /* End dot11f_unpack_ie_ext_cap. */ -#define SigIeExtCap (0x002e) +#define SigIeExtCap (0x0033) uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, @@ -2841,7 +2998,7 @@ uint32_t dot11f_unpack_ie_ext_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_supp_rates. */ -#define SigIeExtSuppRates (0x002f) +#define SigIeExtSuppRates (0x0034) uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, @@ -2868,7 +3025,7 @@ uint32_t dot11f_unpack_ie_fh_param_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_param_set. */ -#define SigIeFHParamSet (0x0030) +#define SigIeFHParamSet (0x0035) uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, @@ -2889,7 +3046,7 @@ uint32_t dot11f_unpack_ie_fh_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_params. */ -#define SigIeFHParams (0x0031) +#define SigIeFHParams (0x0036) uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, @@ -2925,7 +3082,7 @@ uint32_t dot11f_unpack_ie_fh_patt_table(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_fh_patt_table. */ -#define SigIeFHPattTable (0x0032) +#define SigIeFHPattTable (0x0037) static const tFFDefn FFS_FTInfo[] = { @@ -2952,16 +3109,16 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, tDot11fIEFTInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp34__; + uint16_t tmp36__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp34__, pBuf, 0); + framesntohs(pCtx, &tmp36__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->reserved = tmp34__ >> 0 & 0xff; - pDst->IECount = tmp34__ >> 8 & 0xff; + pDst->reserved = tmp36__ >> 0 & 0xff; + pDst->IECount = tmp36__ >> 8 & 0xff; DOT11F_MEMCPY(pCtx, pDst->MIC, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -2982,7 +3139,7 @@ uint32_t dot11f_unpack_ie_ft_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ft_info. */ -#define SigIeFTInfo (0x0033) +#define SigIeFTInfo (0x0038) uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, @@ -2991,79 +3148,79 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, tDot11fIEHTCaps *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp35__; - uint8_t tmp36__; uint16_t tmp37__; - uint32_t tmp38__; - uint8_t tmp39__; + uint8_t tmp38__; + uint16_t tmp39__; + uint32_t tmp40__; + uint8_t tmp41__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - framesntohs(pCtx, &tmp35__, pBuf, 0); + framesntohs(pCtx, &tmp37__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->advCodingCap = tmp35__ >> 0 & 0x1; - pDst->supportedChannelWidthSet = tmp35__ >> 1 & 0x1; - pDst->mimoPowerSave = tmp35__ >> 2 & 0x3; - pDst->greenField = tmp35__ >> 4 & 0x1; - pDst->shortGI20MHz = tmp35__ >> 5 & 0x1; - pDst->shortGI40MHz = tmp35__ >> 6 & 0x1; - pDst->txSTBC = tmp35__ >> 7 & 0x1; - pDst->rxSTBC = tmp35__ >> 8 & 0x3; - pDst->delayedBA = tmp35__ >> 10 & 0x1; - pDst->maximalAMSDUsize = tmp35__ >> 11 & 0x1; - pDst->dsssCckMode40MHz = tmp35__ >> 12 & 0x1; - pDst->psmp = tmp35__ >> 13 & 0x1; - pDst->stbcControlFrame = tmp35__ >> 14 & 0x1; - pDst->lsigTXOPProtection = tmp35__ >> 15 & 0x1; - tmp36__ = *pBuf; + pDst->advCodingCap = tmp37__ >> 0 & 0x1; + pDst->supportedChannelWidthSet = tmp37__ >> 1 & 0x1; + pDst->mimoPowerSave = tmp37__ >> 2 & 0x3; + pDst->greenField = tmp37__ >> 4 & 0x1; + pDst->shortGI20MHz = tmp37__ >> 5 & 0x1; + pDst->shortGI40MHz = tmp37__ >> 6 & 0x1; + pDst->txSTBC = tmp37__ >> 7 & 0x1; + pDst->rxSTBC = tmp37__ >> 8 & 0x3; + pDst->delayedBA = tmp37__ >> 10 & 0x1; + pDst->maximalAMSDUsize = tmp37__ >> 11 & 0x1; + pDst->dsssCckMode40MHz = tmp37__ >> 12 & 0x1; + pDst->psmp = tmp37__ >> 13 & 0x1; + pDst->stbcControlFrame = tmp37__ >> 14 & 0x1; + pDst->lsigTXOPProtection = tmp37__ >> 15 & 0x1; + tmp38__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->maxRxAMPDUFactor = tmp36__ >> 0 & 0x3; - pDst->mpduDensity = tmp36__ >> 2 & 0x7; - pDst->reserved1 = tmp36__ >> 5 & 0x7; + pDst->maxRxAMPDUFactor = tmp38__ >> 0 & 0x3; + pDst->mpduDensity = tmp38__ >> 2 & 0x7; + pDst->reserved1 = tmp38__ >> 5 & 0x7; DOT11F_MEMCPY(pCtx, pDst->supportedMCSSet, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; - framesntohs(pCtx, &tmp37__, pBuf, 0); + framesntohs(pCtx, &tmp39__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->pco = tmp37__ >> 0 & 0x1; - pDst->transitionTime = tmp37__ >> 1 & 0x3; - pDst->reserved2 = tmp37__ >> 3 & 0x1f; - pDst->mcsFeedback = tmp37__ >> 8 & 0x3; - pDst->reserved3 = tmp37__ >> 10 & 0x3f; - framesntohl(pCtx, &tmp38__, pBuf, 0); + pDst->pco = tmp39__ >> 0 & 0x1; + pDst->transitionTime = tmp39__ >> 1 & 0x3; + pDst->reserved2 = tmp39__ >> 3 & 0x1f; + pDst->mcsFeedback = tmp39__ >> 8 & 0x3; + pDst->reserved3 = tmp39__ >> 10 & 0x3f; + framesntohl(pCtx, &tmp40__, pBuf, 0); pBuf += 4; ielen -= 4; - pDst->txBF = tmp38__ >> 0 & 0x1; - pDst->rxStaggeredSounding = tmp38__ >> 1 & 0x1; - pDst->txStaggeredSounding = tmp38__ >> 2 & 0x1; - pDst->rxZLF = tmp38__ >> 3 & 0x1; - pDst->txZLF = tmp38__ >> 4 & 0x1; - pDst->implicitTxBF = tmp38__ >> 5 & 0x1; - pDst->calibration = tmp38__ >> 6 & 0x3; - pDst->explicitCSITxBF = tmp38__ >> 8 & 0x1; - pDst->explicitUncompressedSteeringMatrix = tmp38__ >> 9 & 0x1; - pDst->explicitBFCSIFeedback = tmp38__ >> 10 & 0x7; - pDst->explicitUncompressedSteeringMatrixFeedback = tmp38__ >> 13 & 0x7; - pDst->explicitCompressedSteeringMatrixFeedback = tmp38__ >> 16 & 0x7; - pDst->csiNumBFAntennae = tmp38__ >> 19 & 0x3; - pDst->uncompressedSteeringMatrixBFAntennae = tmp38__ >> 21 & 0x3; - pDst->compressedSteeringMatrixBFAntennae = tmp38__ >> 23 & 0x3; - pDst->reserved4 = tmp38__ >> 25 & 0x7f; - tmp39__ = *pBuf; + pDst->txBF = tmp40__ >> 0 & 0x1; + pDst->rxStaggeredSounding = tmp40__ >> 1 & 0x1; + pDst->txStaggeredSounding = tmp40__ >> 2 & 0x1; + pDst->rxZLF = tmp40__ >> 3 & 0x1; + pDst->txZLF = tmp40__ >> 4 & 0x1; + pDst->implicitTxBF = tmp40__ >> 5 & 0x1; + pDst->calibration = tmp40__ >> 6 & 0x3; + pDst->explicitCSITxBF = tmp40__ >> 8 & 0x1; + pDst->explicitUncompressedSteeringMatrix = tmp40__ >> 9 & 0x1; + pDst->explicitBFCSIFeedback = tmp40__ >> 10 & 0x7; + pDst->explicitUncompressedSteeringMatrixFeedback = tmp40__ >> 13 & 0x7; + pDst->explicitCompressedSteeringMatrixFeedback = tmp40__ >> 16 & 0x7; + pDst->csiNumBFAntennae = tmp40__ >> 19 & 0x3; + pDst->uncompressedSteeringMatrixBFAntennae = tmp40__ >> 21 & 0x3; + pDst->compressedSteeringMatrixBFAntennae = tmp40__ >> 23 & 0x3; + pDst->reserved4 = tmp40__ >> 25 & 0x7f; + tmp41__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->antennaSelection = tmp39__ >> 0 & 0x1; - pDst->explicitCSIFeedbackTx = tmp39__ >> 1 & 0x1; - pDst->antennaIndicesFeedbackTx = tmp39__ >> 2 & 0x1; - pDst->explicitCSIFeedback = tmp39__ >> 3 & 0x1; - pDst->antennaIndicesFeedback = tmp39__ >> 4 & 0x1; - pDst->rxAS = tmp39__ >> 5 & 0x1; - pDst->txSoundingPPDUs = tmp39__ >> 6 & 0x1; - pDst->reserved5 = tmp39__ >> 7 & 0x1; + pDst->antennaSelection = tmp41__ >> 0 & 0x1; + pDst->explicitCSIFeedbackTx = tmp41__ >> 1 & 0x1; + pDst->antennaIndicesFeedbackTx = tmp41__ >> 2 & 0x1; + pDst->explicitCSIFeedback = tmp41__ >> 3 & 0x1; + pDst->antennaIndicesFeedback = tmp41__ >> 4 & 0x1; + pDst->rxAS = tmp41__ >> 5 & 0x1; + pDst->txSoundingPPDUs = tmp41__ >> 6 & 0x1; + pDst->reserved5 = tmp41__ >> 7 & 0x1; pDst->num_rsvd = (uint8_t)(ielen); if (ielen > 32) { pDst->present = 0; @@ -3075,7 +3232,7 @@ uint32_t dot11f_unpack_ie_ht_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_caps. */ -#define SigIeHTCaps (0x0034) +#define SigIeHTCaps (0x0039) uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, @@ -3084,9 +3241,9 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, tDot11fIEHTInfo *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp40__; - uint16_t tmp41__; - uint16_t tmp42__; + uint8_t tmp42__; + uint16_t tmp43__; + uint16_t tmp44__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3094,32 +3251,32 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, pDst->primaryChannel = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp40__ = *pBuf; + tmp42__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->secondaryChannelOffset = tmp40__ >> 0 & 0x3; - pDst->recommendedTxWidthSet = tmp40__ >> 2 & 0x1; - pDst->rifsMode = tmp40__ >> 3 & 0x1; - pDst->controlledAccessOnly = tmp40__ >> 4 & 0x1; - pDst->serviceIntervalGranularity = tmp40__ >> 5 & 0x7; - framesntohs(pCtx, &tmp41__, pBuf, 0); + pDst->secondaryChannelOffset = tmp42__ >> 0 & 0x3; + pDst->recommendedTxWidthSet = tmp42__ >> 2 & 0x1; + pDst->rifsMode = tmp42__ >> 3 & 0x1; + pDst->controlledAccessOnly = tmp42__ >> 4 & 0x1; + pDst->serviceIntervalGranularity = tmp42__ >> 5 & 0x7; + framesntohs(pCtx, &tmp43__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->opMode = tmp41__ >> 0 & 0x3; - pDst->nonGFDevicesPresent = tmp41__ >> 2 & 0x1; - pDst->transmitBurstLimit = tmp41__ >> 3 & 0x1; - pDst->obssNonHTStaPresent = tmp41__ >> 4 & 0x1; - pDst->reserved = tmp41__ >> 5 & 0x7ff; - framesntohs(pCtx, &tmp42__, pBuf, 0); + pDst->opMode = tmp43__ >> 0 & 0x3; + pDst->nonGFDevicesPresent = tmp43__ >> 2 & 0x1; + pDst->transmitBurstLimit = tmp43__ >> 3 & 0x1; + pDst->obssNonHTStaPresent = tmp43__ >> 4 & 0x1; + pDst->reserved = tmp43__ >> 5 & 0x7ff; + framesntohs(pCtx, &tmp44__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->basicSTBCMCS = tmp42__ >> 0 & 0x7f; - pDst->dualCTSProtection = tmp42__ >> 7 & 0x1; - pDst->secondaryBeacon = tmp42__ >> 8 & 0x1; - pDst->lsigTXOPProtectionFullSupport = tmp42__ >> 9 & 0x1; - pDst->pcoActive = tmp42__ >> 10 & 0x1; - pDst->pcoPhase = tmp42__ >> 11 & 0x1; - pDst->reserved2 = tmp42__ >> 12 & 0xf; + pDst->basicSTBCMCS = tmp44__ >> 0 & 0x7f; + pDst->dualCTSProtection = tmp44__ >> 7 & 0x1; + pDst->secondaryBeacon = tmp44__ >> 8 & 0x1; + pDst->lsigTXOPProtectionFullSupport = tmp44__ >> 9 & 0x1; + pDst->pcoActive = tmp44__ >> 10 & 0x1; + pDst->pcoPhase = tmp44__ >> 11 & 0x1; + pDst->reserved2 = tmp44__ >> 12 & 0xf; DOT11F_MEMCPY(pCtx, pDst->basicMCSSet, pBuf, 16); pBuf += 16; ielen -= (uint8_t)16; @@ -3134,7 +3291,7 @@ uint32_t dot11f_unpack_ie_ht_info(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht_info. */ -#define SigIeHTInfo (0x0035) +#define SigIeHTInfo (0x003a) uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, @@ -3152,7 +3309,7 @@ uint32_t dot11f_unpack_ie_ibss_params(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ibss_params. */ -#define SigIeIBSSParams (0x0036) +#define SigIeIBSSParams (0x003b) uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, @@ -3176,7 +3333,7 @@ uint32_t dot11f_unpack_ie_link_identifier(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_link_identifier. */ -#define SigIeLinkIdentifier (0x0037) +#define SigIeLinkIdentifier (0x003c) static const tFFDefn FFS_reportBeacon[] = { @@ -3198,9 +3355,9 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, tDot11fIEMeasurementReport *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp43__; - uint8_t tmp44__; uint8_t tmp45__; + uint8_t tmp46__; + uint8_t tmp47__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3208,13 +3365,13 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, pDst->token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp43__ = *pBuf; + tmp45__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->late = tmp43__ >> 0 & 0x1; - pDst->incapable = tmp43__ >> 1 & 0x1; - pDst->refused = tmp43__ >> 2 & 0x1; - pDst->unused = tmp43__ >> 3 & 0x1f; + pDst->late = tmp45__ >> 0 & 0x1; + pDst->incapable = tmp45__ >> 1 & 0x1; + pDst->refused = tmp45__ >> 2 & 0x1; + pDst->unused = tmp45__ >> 3 & 0x1f; pDst->type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3232,15 +3389,15 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->report.Basic.meas_duration, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp44__ = *pBuf; + tmp46__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Basic.bss = tmp44__ >> 0 & 0x1; - pDst->report.Basic.ofdm_preamble = tmp44__ >> 1 & 0x1; - pDst->report.Basic.unid_signal = tmp44__ >> 2 & 0x1; - pDst->report.Basic.rader = tmp44__ >> 3 & 0x1; - pDst->report.Basic.unmeasured = tmp44__ >> 4 & 0x1; - pDst->report.Basic.unused = tmp44__ >> 5 & 0x7; + pDst->report.Basic.bss = tmp46__ >> 0 & 0x1; + pDst->report.Basic.ofdm_preamble = tmp46__ >> 1 & 0x1; + pDst->report.Basic.unid_signal = tmp46__ >> 2 & 0x1; + pDst->report.Basic.rader = tmp46__ >> 3 & 0x1; + pDst->report.Basic.unmeasured = tmp46__ >> 4 & 0x1; + pDst->report.Basic.unused = tmp46__ >> 5 & 0x7; break; case 1: pDst->report.CCA.channel = *pBuf; @@ -3304,11 +3461,11 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->report.Beacon.meas_duration, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp45__ = *pBuf; + tmp47__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->report.Beacon.condensed_PHY = tmp45__ >> 0 & 0x7f; - pDst->report.Beacon.reported_frame_type = tmp45__ >> 7 & 0x1; + pDst->report.Beacon.condensed_PHY = tmp47__ >> 0 & 0x7f; + pDst->report.Beacon.reported_frame_type = tmp47__ >> 7 & 0x1; pDst->report.Beacon.RCPI = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3338,7 +3495,7 @@ uint32_t dot11f_unpack_ie_measurement_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_measurement_report. */ -#define SigIeMeasurementReport (0x0038) +#define SigIeMeasurementReport (0x003d) static const tFFDefn FFS_measurement_requestBeacon[] = { @@ -3371,13 +3528,53 @@ static const tIEDefn IES_measurement_requestBeacon[] = { {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, }; +static const tFFDefn FFS_measurement_requestlci[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_measurement_requestlci[] = { + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.azimuth_req), offsetof(tDot11fIEazimuth_req, + present), 0, "azimuth_req", 0, 3, 3, SigIeazimuth_req, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_AZIMUTH_REQ, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.req_mac_addr), offsetof(tDot11fIEreq_mac_addr, + present), 0, "req_mac_addr", 0, 8, 8, SigIereq_mac_addr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_REQ_MAC_ADDR, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.tgt_mac_addr), offsetof(tDot11fIEtgt_mac_addr, + present), 0, "tgt_mac_addr", 0, 8, 8, SigIetgt_mac_addr, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_TGT_MAC_ADDR, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.lci.max_age), offsetof(tDot11fIEmax_age, present), 0, + "max_age", 0, 4, 4, SigIemax_age, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MAX_AGE, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + +static const tFFDefn FFS_measurement_requestftmrr[] = { + { NULL, 0, 0, 0,}, +}; + +static const tIEDefn IES_measurement_requestftmrr[] = { + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.ftmrr.neighbor_rpt), offsetof(tDot11fIEneighbor_rpt, + present), 0, "neighbor_rpt", 0, 15, 548, SigIeneighbor_rpt, + {0, 0, 0, 0, 0}, 0, DOT11F_EID_NEIGHBOR_RPT, 0, }, + { offsetof(tDot11fIEMeasurementRequest, + measurement_request.ftmrr.max_age), offsetof(tDot11fIEmax_age, present), + 0, "max_age", 0, 4, 4, SigIemax_age, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MAX_AGE, 0, }, + {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, }, +}; + uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pBuf, uint8_t ielen, tDot11fIEMeasurementRequest *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp46__; + uint8_t tmp48__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3385,15 +3582,15 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, pDst->measurement_token = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp46__ = *pBuf; + tmp48__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->parallel = tmp46__ >> 0 & 0x1; - pDst->enable = tmp46__ >> 1 & 0x1; - pDst->request = tmp46__ >> 2 & 0x1; - pDst->report = tmp46__ >> 3 & 0x1; - pDst->durationMandatory = tmp46__ >> 4 & 0x1; - pDst->unused = tmp46__ >> 5 & 0x7; + pDst->parallel = tmp48__ >> 0 & 0x1; + pDst->enable = tmp48__ >> 1 & 0x1; + pDst->request = tmp48__ >> 2 & 0x1; + pDst->report = tmp48__ >> 3 & 0x1; + pDst->durationMandatory = tmp48__ >> 4 & 0x1; + pDst->unused = tmp48__ >> 5 & 0x7; pDst->measurement_type = *pBuf; pBuf += 1; ielen -= (uint8_t)1; @@ -3458,12 +3655,39 @@ uint32_t dot11f_unpack_ie_measurement_request(tpAniSirGlobal pCtx, (uint8_t *)pDst, sizeof(*pDst)); break; + case 8: + pDst->measurement_request.lci.loc_subject = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_measurement_requestlci, + IES_measurement_requestlci, + (uint8_t *)pDst, + sizeof(*pDst)); + break; + case 16: + framesntohs(pCtx, &pDst->measurement_request.ftmrr.random_interval, pBuf, 0); + pBuf += 2; + ielen -= (uint8_t)2; + pDst->measurement_request.ftmrr.min_ap_count = *pBuf; + pBuf += 1; + ielen -= (uint8_t)1; + status |= unpack_core(pCtx, + pBuf, + ielen, + FFS_measurement_requestftmrr, + IES_measurement_requestftmrr, + (uint8_t *)pDst, + sizeof(*pDst)); + break; } (void)pCtx; return status; } /* End dot11f_unpack_ie_measurement_request. */ -#define SigIeMeasurementRequest (0x0039) +#define SigIeMeasurementRequest (0x003e) uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, @@ -3472,7 +3696,7 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, tDot11fIEMobilityDomain *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp47__; + uint8_t tmp49__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3480,15 +3704,15 @@ uint32_t dot11f_unpack_ie_mobility_domain(tpAniSirGlobal pCtx, framesntohs(pCtx, &pDst->MDID, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp47__ = *pBuf; - pDst->overDSCap = tmp47__ >> 0 & 0x1; - pDst->resourceReqCap = tmp47__ >> 1 & 0x1; - pDst->reserved = tmp47__ >> 2 & 0x3f; + tmp49__ = *pBuf; + pDst->overDSCap = tmp49__ >> 0 & 0x1; + pDst->resourceReqCap = tmp49__ >> 1 & 0x1; + pDst->reserved = tmp49__ >> 2 & 0x3f; (void)pCtx; return status; } /* End dot11f_unpack_ie_mobility_domain. */ -#define SigIeMobilityDomain (0x003a) +#define SigIeMobilityDomain (0x003f) static const tFFDefn FFS_NeighborReport[] = { @@ -3524,8 +3748,8 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, tDot11fIENeighborReport *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp48__; - uint8_t tmp49__; + uint8_t tmp50__; + uint8_t tmp51__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -3533,23 +3757,23 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->bssid, pBuf, 6); pBuf += 6; ielen -= (uint8_t)6; - tmp48__ = *pBuf; + tmp50__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->APReachability = tmp48__ >> 0 & 0x3; - pDst->Security = tmp48__ >> 2 & 0x1; - pDst->KeyScope = tmp48__ >> 3 & 0x1; - pDst->SpecMgmtCap = tmp48__ >> 4 & 0x1; - pDst->QosCap = tmp48__ >> 5 & 0x1; - pDst->apsd = tmp48__ >> 6 & 0x1; - pDst->rrm = tmp48__ >> 7 & 0x1; - tmp49__ = *pBuf; + pDst->APReachability = tmp50__ >> 0 & 0x3; + pDst->Security = tmp50__ >> 2 & 0x1; + pDst->KeyScope = tmp50__ >> 3 & 0x1; + pDst->SpecMgmtCap = tmp50__ >> 4 & 0x1; + pDst->QosCap = tmp50__ >> 5 & 0x1; + pDst->apsd = tmp50__ >> 6 & 0x1; + pDst->rrm = tmp50__ >> 7 & 0x1; + tmp51__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->DelayedBA = tmp49__ >> 0 & 0x1; - pDst->ImmBA = tmp49__ >> 1 & 0x1; - pDst->MobilityDomain = tmp49__ >> 2 & 0x1; - pDst->reserved = tmp49__ >> 3 & 0x1f; + pDst->DelayedBA = tmp51__ >> 0 & 0x1; + pDst->ImmBA = tmp51__ >> 1 & 0x1; + pDst->MobilityDomain = tmp51__ >> 2 & 0x1; + pDst->reserved = tmp51__ >> 3 & 0x1f; framesntohs(pCtx, &pDst->reserved1, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; @@ -3573,7 +3797,7 @@ uint32_t dot11f_unpack_ie_neighbor_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_neighbor_report. */ -#define SigIeNeighborReport (0x003b) +#define SigIeNeighborReport (0x0040) uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, @@ -3609,7 +3833,7 @@ uint32_t dot11f_unpack_ie_obss_scan_parameters(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_obss_scan_parameters. */ -#define SigIeOBSSScanParameters (0x003c) +#define SigIeOBSSScanParameters (0x0041) uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, @@ -3618,21 +3842,21 @@ uint32_t dot11f_unpack_ie_operating_mode(tpAniSirGlobal pCtx, tDot11fIEOperatingMode *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp50__; + uint8_t tmp52__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp50__ = *pBuf; - pDst->chanWidth = tmp50__ >> 0 & 0x3; - pDst->reserved = tmp50__ >> 2 & 0x3; - pDst->rxNSS = tmp50__ >> 4 & 0x7; - pDst->rxNSSType = tmp50__ >> 7 & 0x1; + tmp52__ = *pBuf; + pDst->chanWidth = tmp52__ >> 0 & 0x3; + pDst->reserved = tmp52__ >> 2 & 0x3; + pDst->rxNSS = tmp52__ >> 4 & 0x7; + pDst->rxNSSType = tmp52__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_operating_mode. */ -#define SigIeOperatingMode (0x003d) +#define SigIeOperatingMode (0x0042) static const tTLVDefn TLVS_P2PAssocReq[] = { @@ -3663,7 +3887,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_req. */ -#define SigIeP2PAssocReq (0x003e) +#define SigIeP2PAssocReq (0x0043) static const tTLVDefn TLVS_P2PAssocRes[] = { @@ -3691,7 +3915,7 @@ uint32_t dot11f_unpack_ie_p2_p_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_assoc_res. */ -#define SigIeP2PAssocRes (0x003f) +#define SigIeP2PAssocRes (0x0044) static const tTLVDefn TLVS_P2PBeacon[] = { @@ -3722,7 +3946,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon. */ -#define SigIeP2PBeacon (0x0040) +#define SigIeP2PBeacon (0x0045) static const tTLVDefn TLVS_P2PBeaconProbeRes[] = { @@ -3763,7 +3987,7 @@ uint32_t dot11f_unpack_ie_p2_p_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_beacon_probe_res. */ -#define SigIeP2PBeaconProbeRes (0x0041) +#define SigIeP2PBeaconProbeRes (0x0046) static const tTLVDefn TLVS_P2PDeAuth[] = { @@ -3788,7 +4012,7 @@ uint32_t dot11f_unpack_ie_p2_p_de_auth(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_de_auth. */ -#define SigIeP2PDeAuth (0x0042) +#define SigIeP2PDeAuth (0x0047) static const tTLVDefn TLVS_P2PDisAssoc[] = { @@ -3813,7 +4037,7 @@ uint32_t dot11f_unpack_ie_p2_p_dis_assoc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_dis_assoc. */ -#define SigIeP2PDisAssoc (0x0043) +#define SigIeP2PDisAssoc (0x0048) uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, @@ -3837,7 +4061,7 @@ uint32_t dot11f_unpack_ie_p2_pie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_pie_opaque. */ -#define SigIeP2PIEOpaque (0x0044) +#define SigIeP2PIEOpaque (0x0049) static const tTLVDefn TLVS_P2PProbeReq[] = { @@ -3875,7 +4099,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_req. */ -#define SigIeP2PProbeReq (0x0045) +#define SigIeP2PProbeReq (0x004a) static const tTLVDefn TLVS_P2PProbeRes[] = { @@ -3913,7 +4137,7 @@ uint32_t dot11f_unpack_ie_p2_p_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_p2_p_probe_res. */ -#define SigIeP2PProbeRes (0x0046) +#define SigIeP2PProbeRes (0x004b) uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, @@ -3934,7 +4158,7 @@ uint32_t dot11f_unpack_ie_pti_control(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_pti_control. */ -#define SigIePTIControl (0x0047) +#define SigIePTIControl (0x004c) uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, @@ -3943,22 +4167,22 @@ uint32_t dot11f_unpack_ie_pu_buffer_status(tpAniSirGlobal pCtx, tDot11fIEPUBufferStatus *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp51__; + uint8_t tmp53__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp51__ = *pBuf; - pDst->ac_bk_traffic_aval = tmp51__ >> 0 & 0x1; - pDst->ac_be_traffic_aval = tmp51__ >> 1 & 0x1; - pDst->ac_vi_traffic_aval = tmp51__ >> 2 & 0x1; - pDst->ac_vo_traffic_aval = tmp51__ >> 3 & 0x1; - pDst->reserved = tmp51__ >> 4 & 0xf; + tmp53__ = *pBuf; + pDst->ac_bk_traffic_aval = tmp53__ >> 0 & 0x1; + pDst->ac_be_traffic_aval = tmp53__ >> 1 & 0x1; + pDst->ac_vi_traffic_aval = tmp53__ >> 2 & 0x1; + pDst->ac_vo_traffic_aval = tmp53__ >> 3 & 0x1; + pDst->reserved = tmp53__ >> 4 & 0xf; (void)pCtx; return status; } /* End dot11f_unpack_ie_pu_buffer_status. */ -#define SigIePUBufferStatus (0x0048) +#define SigIePUBufferStatus (0x004d) uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, @@ -3979,7 +4203,7 @@ uint32_t dot11f_unpack_ie_power_caps(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_caps. */ -#define SigIePowerCaps (0x0049) +#define SigIePowerCaps (0x004e) uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, @@ -3997,7 +4221,7 @@ uint32_t dot11f_unpack_ie_power_constraints(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_power_constraints. */ -#define SigIePowerConstraints (0x004a) +#define SigIePowerConstraints (0x004f) uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, @@ -4021,7 +4245,7 @@ uint32_t dot11f_unpack_ie_qbss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qbss_load. */ -#define SigIeQBSSLoad (0x004b) +#define SigIeQBSSLoad (0x0050) uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, @@ -4042,7 +4266,7 @@ uint32_t dot11f_unpack_ie_QComVendorIE(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_QComVendorIE. */ -#define SigIeQComVendorIE (0x004c) +#define SigIeQComVendorIE (0x0051) uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, @@ -4051,22 +4275,22 @@ uint32_t dot11f_unpack_ie_qos_caps_ap(tpAniSirGlobal pCtx, tDot11fIEQOSCapsAp *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp52__; + uint8_t tmp54__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp52__ = *pBuf; - pDst->count = tmp52__ >> 0 & 0xf; - pDst->qack = tmp52__ >> 4 & 0x1; - pDst->qreq = tmp52__ >> 5 & 0x1; - pDst->txopreq = tmp52__ >> 6 & 0x1; - pDst->reserved = tmp52__ >> 7 & 0x1; + tmp54__ = *pBuf; + pDst->count = tmp54__ >> 0 & 0xf; + pDst->qack = tmp54__ >> 4 & 0x1; + pDst->qreq = tmp54__ >> 5 & 0x1; + pDst->txopreq = tmp54__ >> 6 & 0x1; + pDst->reserved = tmp54__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_ap. */ -#define SigIeQOSCapsAp (0x004d) +#define SigIeQOSCapsAp (0x0052) uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, @@ -4075,24 +4299,24 @@ uint32_t dot11f_unpack_ie_qos_caps_station(tpAniSirGlobal pCtx, tDot11fIEQOSCapsStation *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp53__; + uint8_t tmp55__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp53__ = *pBuf; - pDst->acvo_uapsd = tmp53__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp53__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp53__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp53__ >> 3 & 0x1; - pDst->qack = tmp53__ >> 4 & 0x1; - pDst->max_sp_length = tmp53__ >> 5 & 0x3; - pDst->more_data_ack = tmp53__ >> 7 & 0x1; + tmp55__ = *pBuf; + pDst->acvo_uapsd = tmp55__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp55__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp55__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp55__ >> 3 & 0x1; + pDst->qack = tmp55__ >> 4 & 0x1; + pDst->max_sp_length = tmp55__ >> 5 & 0x3; + pDst->more_data_ack = tmp55__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_qos_caps_station. */ -#define SigIeQOSCapsStation (0x004e) +#define SigIeQOSCapsStation (0x0053) uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, @@ -4116,7 +4340,7 @@ uint32_t dot11f_unpack_ie_qos_map_set(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_qos_map_set. */ -#define SigIeQosMapSet (0x004f) +#define SigIeQosMapSet (0x0054) uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, @@ -4143,7 +4367,7 @@ uint32_t dot11f_unpack_ie_quiet(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_quiet. */ -#define SigIeQuiet (0x0050) +#define SigIeQuiet (0x0055) uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, @@ -4161,7 +4385,7 @@ uint32_t dot11f_unpack_ie_rcpiie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rcpiie. */ -#define SigIeRCPIIE (0x0051) +#define SigIeRCPIIE (0x0056) static const tFFDefn FFS_RICDataDesc[] = { @@ -4235,7 +4459,7 @@ uint32_t dot11f_unpack_ie_ric_data_desc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ric_data_desc. */ -#define SigIeRICDataDesc (0x0052) +#define SigIeRICDataDesc (0x0057) uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, @@ -4326,7 +4550,7 @@ uint32_t dot11f_unpack_ie_rsn(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn. */ -#define SigIeRSN (0x0053) +#define SigIeRSN (0x0058) uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, @@ -4344,7 +4568,7 @@ uint32_t dot11f_unpack_ie_rsniie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsniie. */ -#define SigIeRSNIIE (0x0054) +#define SigIeRSNIIE (0x0059) uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, @@ -4368,7 +4592,7 @@ uint32_t dot11f_unpack_ie_rsn_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_rsn_opaque. */ -#define SigIeRSNOpaque (0x0055) +#define SigIeRSNOpaque (0x005a) uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, @@ -4392,7 +4616,7 @@ uint32_t dot11f_unpack_ie_supp_channels(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_channels. */ -#define SigIeSuppChannels (0x0056) +#define SigIeSuppChannels (0x005b) uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, @@ -4416,7 +4640,7 @@ uint32_t dot11f_unpack_ie_supp_operating_classes(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_operating_classes. */ -#define SigIeSuppOperatingClasses (0x0057) +#define SigIeSuppOperatingClasses (0x005c) uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, @@ -4448,7 +4672,7 @@ uint32_t dot11f_unpack_ie_supp_rates(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_supp_rates. */ -#define SigIeSuppRates (0x0058) +#define SigIeSuppRates (0x005d) uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, @@ -4481,7 +4705,7 @@ uint32_t dot11f_unpack_ie_tim(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tim. */ -#define SigIeTIM (0x0059) +#define SigIeTIM (0x005e) uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, @@ -4502,7 +4726,7 @@ uint32_t dot11f_unpack_ie_tpc_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_report. */ -#define SigIeTPCReport (0x005a) +#define SigIeTPCReport (0x005f) uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, @@ -4519,7 +4743,7 @@ uint32_t dot11f_unpack_ie_tpc_request(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_tpc_request. */ -#define SigIeTPCRequest (0x005b) +#define SigIeTPCRequest (0x0060) uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, @@ -4543,7 +4767,7 @@ uint32_t dot11f_unpack_ie_time_advertisement(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_time_advertisement. */ -#define SigIeTimeAdvertisement (0x005c) +#define SigIeTimeAdvertisement (0x0061) uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, @@ -4564,7 +4788,7 @@ uint32_t dot11f_unpack_ie_timeout_interval(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_timeout_interval. */ -#define SigIeTimeoutInterval (0x005d) +#define SigIeTimeoutInterval (0x0062) uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, @@ -4594,7 +4818,7 @@ uint32_t dot11f_unpack_ie_vht_ext_bss_load(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vht_ext_bss_load. */ -#define SigIeVHTExtBssLoad (0x005e) +#define SigIeVHTExtBssLoad (0x0063) uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, @@ -4611,7 +4835,7 @@ uint32_t dot11f_unpack_ie_vendor1_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor1_ie. */ -#define SigIeVendor1IE (0x005f) +#define SigIeVendor1IE (0x0064) uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, @@ -4628,7 +4852,7 @@ uint32_t dot11f_unpack_ie_vendor3_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor3_ie. */ -#define SigIeVendor3IE (0x0060) +#define SigIeVendor3IE (0x0065) uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, @@ -4637,7 +4861,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, tDot11fIEWAPI *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint16_t tmp54__; + uint16_t tmp56__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4674,11 +4898,11 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pDst->multicast_cipher_suite, pBuf, 4); pBuf += 4; ielen -= (uint8_t)4; - framesntohs(pCtx, &tmp54__, pBuf, 0); + framesntohs(pCtx, &tmp56__, pBuf, 0); pBuf += 2; ielen -= 2; - pDst->preauth = tmp54__ >> 0 & 0x1; - pDst->reserved = tmp54__ >> 1 & 0x7fff; + pDst->preauth = tmp56__ >> 0 & 0x1; + pDst->reserved = tmp56__ >> 1 & 0x7fff; if (!ielen) { pDst->bkid_count = 0U; return 0U; @@ -4697,7 +4921,7 @@ uint32_t dot11f_unpack_ie_wapi(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi. */ -#define SigIeWAPI (0x0061) +#define SigIeWAPI (0x0066) uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, @@ -4721,7 +4945,7 @@ uint32_t dot11f_unpack_ie_wapi_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wapi_opaque. */ -#define SigIeWAPIOpaque (0x0062) +#define SigIeWAPIOpaque (0x0067) uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, @@ -4742,7 +4966,7 @@ uint32_t dot11f_unpack_ie_wfatpc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfatpc. */ -#define SigIeWFATPC (0x0063) +#define SigIeWFATPC (0x0068) uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, @@ -4766,7 +4990,7 @@ uint32_t dot11f_unpack_ie_wfdie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wfdie_opaque. */ -#define SigIeWFDIEOpaque (0x0064) +#define SigIeWFDIEOpaque (0x0069) uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, @@ -4775,7 +4999,7 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, tDot11fIEWMMCaps *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp55__; + uint8_t tmp57__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4787,17 +5011,17 @@ uint32_t dot11f_unpack_ie_wmm_caps(tpAniSirGlobal pCtx, pDst->present = 0; return status | DOT11F_BAD_FIXED_VALUE; } - tmp55__ = *pBuf; - pDst->reserved = tmp55__ >> 0 & 0xf; - pDst->qack = tmp55__ >> 4 & 0x1; - pDst->queue_request = tmp55__ >> 5 & 0x1; - pDst->txop_request = tmp55__ >> 6 & 0x1; - pDst->more_ack = tmp55__ >> 7 & 0x1; + tmp57__ = *pBuf; + pDst->reserved = tmp57__ >> 0 & 0xf; + pDst->qack = tmp57__ >> 4 & 0x1; + pDst->queue_request = tmp57__ >> 5 & 0x1; + pDst->txop_request = tmp57__ >> 6 & 0x1; + pDst->more_ack = tmp57__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_caps. */ -#define SigIeWMMCaps (0x0065) +#define SigIeWMMCaps (0x006a) uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, @@ -4806,7 +5030,7 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, tDot11fIEWMMInfoAp *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp56__; + uint8_t tmp58__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4814,15 +5038,15 @@ uint32_t dot11f_unpack_ie_wmm_info_ap(tpAniSirGlobal pCtx, pDst->version = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp56__ = *pBuf; - pDst->param_set_count = tmp56__ >> 0 & 0xf; - pDst->reserved = tmp56__ >> 4 & 0x7; - pDst->uapsd = tmp56__ >> 7 & 0x1; + tmp58__ = *pBuf; + pDst->param_set_count = tmp58__ >> 0 & 0xf; + pDst->reserved = tmp58__ >> 4 & 0x7; + pDst->uapsd = tmp58__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_info_ap. */ -#define SigIeWMMInfoAp (0x0066) +#define SigIeWMMInfoAp (0x006b) uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, @@ -4831,7 +5055,7 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, tDot11fIEWMMInfoStation *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp57__; + uint8_t tmp59__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4839,19 +5063,19 @@ uint32_t dot11f_unpack_ie_wmm_info_station(tpAniSirGlobal pCtx, pDst->version = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp57__ = *pBuf; - pDst->acvo_uapsd = tmp57__ >> 0 & 0x1; - pDst->acvi_uapsd = tmp57__ >> 1 & 0x1; - pDst->acbk_uapsd = tmp57__ >> 2 & 0x1; - pDst->acbe_uapsd = tmp57__ >> 3 & 0x1; - pDst->reserved1 = tmp57__ >> 4 & 0x1; - pDst->max_sp_length = tmp57__ >> 5 & 0x3; - pDst->reserved2 = tmp57__ >> 7 & 0x1; + tmp59__ = *pBuf; + pDst->acvo_uapsd = tmp59__ >> 0 & 0x1; + pDst->acvi_uapsd = tmp59__ >> 1 & 0x1; + pDst->acbk_uapsd = tmp59__ >> 2 & 0x1; + pDst->acbe_uapsd = tmp59__ >> 3 & 0x1; + pDst->reserved1 = tmp59__ >> 4 & 0x1; + pDst->max_sp_length = tmp59__ >> 5 & 0x3; + pDst->reserved2 = tmp59__ >> 7 & 0x1; (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_info_station. */ -#define SigIeWMMInfoStation (0x0067) +#define SigIeWMMInfoStation (0x006c) uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, @@ -4860,14 +5084,14 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, tDot11fIEWMMParams *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp58__; - uint8_t tmp59__; uint8_t tmp60__; uint8_t tmp61__; uint8_t tmp62__; uint8_t tmp63__; uint8_t tmp64__; uint8_t tmp65__; + uint8_t tmp66__; + uint8_t tmp67__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; @@ -4885,69 +5109,69 @@ uint32_t dot11f_unpack_ie_wmm_params(tpAniSirGlobal pCtx, pDst->reserved2 = *pBuf; pBuf += 1; ielen -= (uint8_t)1; - tmp58__ = *pBuf; + tmp60__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_aifsn = tmp58__ >> 0 & 0xf; - pDst->acbe_acm = tmp58__ >> 4 & 0x1; - pDst->acbe_aci = tmp58__ >> 5 & 0x3; - pDst->unused1 = tmp58__ >> 7 & 0x1; - tmp59__ = *pBuf; + pDst->acbe_aifsn = tmp60__ >> 0 & 0xf; + pDst->acbe_acm = tmp60__ >> 4 & 0x1; + pDst->acbe_aci = tmp60__ >> 5 & 0x3; + pDst->unused1 = tmp60__ >> 7 & 0x1; + tmp61__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbe_acwmin = tmp59__ >> 0 & 0xf; - pDst->acbe_acwmax = tmp59__ >> 4 & 0xf; + pDst->acbe_acwmin = tmp61__ >> 0 & 0xf; + pDst->acbe_acwmax = tmp61__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbe_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp60__ = *pBuf; + tmp62__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_aifsn = tmp60__ >> 0 & 0xf; - pDst->acbk_acm = tmp60__ >> 4 & 0x1; - pDst->acbk_aci = tmp60__ >> 5 & 0x3; - pDst->unused2 = tmp60__ >> 7 & 0x1; - tmp61__ = *pBuf; + pDst->acbk_aifsn = tmp62__ >> 0 & 0xf; + pDst->acbk_acm = tmp62__ >> 4 & 0x1; + pDst->acbk_aci = tmp62__ >> 5 & 0x3; + pDst->unused2 = tmp62__ >> 7 & 0x1; + tmp63__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acbk_acwmin = tmp61__ >> 0 & 0xf; - pDst->acbk_acwmax = tmp61__ >> 4 & 0xf; + pDst->acbk_acwmin = tmp63__ >> 0 & 0xf; + pDst->acbk_acwmax = tmp63__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acbk_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp62__ = *pBuf; + tmp64__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_aifsn = tmp62__ >> 0 & 0xf; - pDst->acvi_acm = tmp62__ >> 4 & 0x1; - pDst->acvi_aci = tmp62__ >> 5 & 0x3; - pDst->unused3 = tmp62__ >> 7 & 0x1; - tmp63__ = *pBuf; + pDst->acvi_aifsn = tmp64__ >> 0 & 0xf; + pDst->acvi_acm = tmp64__ >> 4 & 0x1; + pDst->acvi_aci = tmp64__ >> 5 & 0x3; + pDst->unused3 = tmp64__ >> 7 & 0x1; + tmp65__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvi_acwmin = tmp63__ >> 0 & 0xf; - pDst->acvi_acwmax = tmp63__ >> 4 & 0xf; + pDst->acvi_acwmin = tmp65__ >> 0 & 0xf; + pDst->acvi_acwmax = tmp65__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvi_txoplimit, pBuf, 0); pBuf += 2; ielen -= (uint8_t)2; - tmp64__ = *pBuf; + tmp66__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_aifsn = tmp64__ >> 0 & 0xf; - pDst->acvo_acm = tmp64__ >> 4 & 0x1; - pDst->acvo_aci = tmp64__ >> 5 & 0x3; - pDst->unused4 = tmp64__ >> 7 & 0x1; - tmp65__ = *pBuf; + pDst->acvo_aifsn = tmp66__ >> 0 & 0xf; + pDst->acvo_acm = tmp66__ >> 4 & 0x1; + pDst->acvo_aci = tmp66__ >> 5 & 0x3; + pDst->unused4 = tmp66__ >> 7 & 0x1; + tmp67__ = *pBuf; pBuf += 1; ielen -= 1; - pDst->acvo_acwmin = tmp65__ >> 0 & 0xf; - pDst->acvo_acwmax = tmp65__ >> 4 & 0xf; + pDst->acvo_acwmin = tmp67__ >> 0 & 0xf; + pDst->acvo_acwmax = tmp67__ >> 4 & 0xf; framesntohs(pCtx, &pDst->acvo_txoplimit, pBuf, 0); (void)pCtx; return status; } /* End dot11f_unpack_ie_wmm_params. */ -#define SigIeWMMParams (0x0068) +#define SigIeWMMParams (0x006d) uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, @@ -5020,7 +5244,7 @@ uint32_t dot11f_unpack_ie_wpa(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa. */ -#define SigIeWPA (0x0069) +#define SigIeWPA (0x006e) uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, @@ -5044,7 +5268,7 @@ uint32_t dot11f_unpack_ie_wpa_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wpa_opaque. */ -#define SigIeWPAOpaque (0x006a) +#define SigIeWPAOpaque (0x006f) static const tTLVDefn TLVS_WSC[] = { @@ -5134,7 +5358,7 @@ uint32_t dot11f_unpack_ie_wsc(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc. */ -#define SigIeWSC (0x006b) +#define SigIeWSC (0x0070) static const tTLVDefn TLVS_WscAssocReq[] = { @@ -5165,7 +5389,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_req. */ -#define SigIeWscAssocReq (0x006c) +#define SigIeWscAssocReq (0x0071) static const tTLVDefn TLVS_WscAssocRes[] = { @@ -5196,7 +5420,7 @@ uint32_t dot11f_unpack_ie_wsc_assoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_assoc_res. */ -#define SigIeWscAssocRes (0x006d) +#define SigIeWscAssocRes (0x0072) static const tTLVDefn TLVS_WscBeacon[] = { @@ -5248,7 +5472,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon. */ -#define SigIeWscBeacon (0x006e) +#define SigIeWscBeacon (0x0073) static const tTLVDefn TLVS_WscBeaconProbeRes[] = { @@ -5325,7 +5549,7 @@ uint32_t dot11f_unpack_ie_wsc_beacon_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_beacon_probe_res. */ -#define SigIeWscBeaconProbeRes (0x006f) +#define SigIeWscBeaconProbeRes (0x0074) uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, @@ -5349,7 +5573,7 @@ uint32_t dot11f_unpack_ie_wsc_ie_opaque(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_ie_opaque. */ -#define SigIeWscIEOpaque (0x0070) +#define SigIeWscIEOpaque (0x0075) static const tTLVDefn TLVS_WscProbeReq[] = { @@ -5421,7 +5645,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_req(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_req. */ -#define SigIeWscProbeReq (0x0071) +#define SigIeWscProbeReq (0x0076) static const tTLVDefn TLVS_WscProbeRes[] = { @@ -5498,7 +5722,7 @@ uint32_t dot11f_unpack_ie_wsc_probe_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_probe_res. */ -#define SigIeWscProbeRes (0x0072) +#define SigIeWscProbeRes (0x0077) static const tTLVDefn TLVS_WscReassocRes[] = { @@ -5529,7 +5753,7 @@ uint32_t dot11f_unpack_ie_wsc_reassoc_res(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_wsc_reassoc_res. */ -#define SigIeWscReassocRes (0x0073) +#define SigIeWscReassocRes (0x0078) uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, @@ -5556,7 +5780,7 @@ uint32_t dot11f_unpack_ie_ext_chan_switch_ann(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ext_chan_switch_ann. */ -#define SigIeext_chan_switch_ann (0x0074) +#define SigIeext_chan_switch_ann (0x0079) uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, @@ -5565,23 +5789,23 @@ uint32_t dot11f_unpack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, tDot11fIEht2040_bss_coexistence *pDst) { uint32_t status = DOT11F_PARSE_SUCCESS; - uint8_t tmp66__; + uint8_t tmp68__; (void) pBuf; (void)ielen; /* Shutup the compiler */ if (pDst->present) status = DOT11F_DUPLICATE_IE; pDst->present = 1; - tmp66__ = *pBuf; - pDst->info_request = tmp66__ >> 0 & 0x1; - pDst->forty_mhz_intolerant = tmp66__ >> 1 & 0x1; - pDst->twenty_mhz_bsswidth_req = tmp66__ >> 2 & 0x1; - pDst->obss_scan_exemption_req = tmp66__ >> 3 & 0x1; - pDst->obss_scan_exemption_grant = tmp66__ >> 4 & 0x1; - pDst->unused = tmp66__ >> 5 & 0x7; + tmp68__ = *pBuf; + pDst->info_request = tmp68__ >> 0 & 0x1; + pDst->forty_mhz_intolerant = tmp68__ >> 1 & 0x1; + pDst->twenty_mhz_bsswidth_req = tmp68__ >> 2 & 0x1; + pDst->obss_scan_exemption_req = tmp68__ >> 3 & 0x1; + pDst->obss_scan_exemption_grant = tmp68__ >> 4 & 0x1; + pDst->unused = tmp68__ >> 5 & 0x7; (void)pCtx; return status; } /* End dot11f_unpack_ie_ht2040_bss_coexistence. */ -#define SigIeht2040_bss_coexistence (0x0075) +#define SigIeht2040_bss_coexistence (0x007a) uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, @@ -5608,7 +5832,7 @@ uint32_t dot11f_unpack_ie_ht2040_bss_intolerant_report(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_ht2040_bss_intolerant_report. */ -#define SigIeht2040_bss_intolerant_report (0x0076) +#define SigIeht2040_bss_intolerant_report (0x007b) uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, @@ -5626,7 +5850,7 @@ uint32_t dot11f_unpack_ie_sec_chan_offset_ele(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_sec_chan_offset_ele. */ -#define SigIesec_chan_offset_ele (0x0077) +#define SigIesec_chan_offset_ele (0x007c) static const tFFDefn FFS_vendor2_ie[] = { @@ -5671,7 +5895,7 @@ uint32_t dot11f_unpack_ie_vendor2_ie(tpAniSirGlobal pCtx, return status; } /* End dot11f_unpack_ie_vendor2_ie. */ -#define SigIevendor2_ie (0x0078) +#define SigIevendor2_ie (0x007d) static const tFFDefn FFS_AddTSRequest[] = { @@ -6906,8 +7130,8 @@ static const tIEDefn IES_MeasurementRequest[] = { { offsetof(tDot11fMeasurementRequest, MeasurementRequest), offsetof(tDot11fIEMeasurementRequest, present), offsetof(tDot11fMeasurementRequest, num_MeasurementRequest), - "MeasurementRequest", 4, 16, 18, SigIeMeasurementRequest, - {0, 0, 0, 0, 0}, 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, + "MeasurementRequest", 4, 6, 18, SigIeMeasurementRequest, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_measurement_request(tpAniSirGlobal pCtx, @@ -7346,8 +7570,8 @@ static const tIEDefn IES_RadioMeasurementRequest[] = { { offsetof(tDot11fRadioMeasurementRequest, MeasurementRequest), offsetof(tDot11fIEMeasurementRequest, present), offsetof(tDot11fRadioMeasurementRequest, num_MeasurementRequest), - "MeasurementRequest", 2, 16, 18, SigIeMeasurementRequest, - {0, 0, 0, 0, 0}, 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, + "MeasurementRequest", 2, 6, 18, SigIeMeasurementRequest, {0, 0, 0, 0, 0}, + 0, DOT11F_EID_MEASUREMENTREQUEST, 1, }, {0, 0, 0, NULL, 0, 0, 0, 0, {0, 0, 0, 0, 0}, 0, 0xff, 0, },}; uint32_t dot11f_unpack_radio_measurement_request(tpAniSirGlobal pCtx, @@ -8771,15 +8995,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, countOffset = ((0 != pIe->arraybound) * (*(uint16_t *)(pFrm + pIe->countOffset))); switch (pIe->sig) { - case SigIeCondensedCountryStr: - status |= - dot11f_unpack_ie_condensed_country_str( - pCtx, pBufRemaining, len, - (tDot11fIECondensedCountryStr *) - (pFrm + pIe->offset + - sizeof(tDot11fIECondensedCountryStr) * - countOffset)); - break; case SigIeGTK: status |= dot11f_unpack_ie_gtk( @@ -8816,15 +9031,6 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIER1KH_ID) * countOffset)); break; - case SigIeTSFInfo: - status |= - dot11f_unpack_ie_tsf_info( - pCtx, pBufRemaining, len, - (tDot11fIETSFInfo *) - (pFrm + pIe->offset + - sizeof(tDot11fIETSFInfo) * - countOffset)); - break; case SigIeAPChannelReport: status |= dot11f_unpack_ie_ap_channel_report( @@ -8861,6 +9067,15 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEBeaconReporting) * countOffset)); break; + case SigIeCondensedCountryStr: + status |= + dot11f_unpack_ie_condensed_country_str( + pCtx, pBufRemaining, len, + (tDot11fIECondensedCountryStr *) + (pFrm + pIe->offset + + sizeof(tDot11fIECondensedCountryStr) * + countOffset)); + break; case SigIeMeasurementPilot: status |= dot11f_unpack_ie_measurement_pilot( @@ -8956,6 +9171,15 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIETSDelay) * countOffset)); break; + case SigIeTSFInfo: + status |= + dot11f_unpack_ie_tsf_info( + pCtx, pBufRemaining, len, + (tDot11fIETSFInfo *) + (pFrm + pIe->offset + + sizeof(tDot11fIETSFInfo) * + countOffset)); + break; case SigIeTSPEC: status |= dot11f_unpack_ie_tspec( @@ -9037,6 +9261,51 @@ static uint32_t unpack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEWiderBWChanSwitchAnn) * countOffset)); break; + case SigIeazimuth_req: + status |= + dot11f_unpack_ie_azimuth_req( + pCtx, pBufRemaining, len, + (tDot11fIEazimuth_req *) + (pFrm + pIe->offset + + sizeof(tDot11fIEazimuth_req) * + countOffset)); + break; + case SigIemax_age: + status |= + dot11f_unpack_ie_max_age( + pCtx, pBufRemaining, len, + (tDot11fIEmax_age *) + (pFrm + pIe->offset + + sizeof(tDot11fIEmax_age) * + countOffset)); + break; + case SigIeneighbor_rpt: + status |= + dot11f_unpack_ie_neighbor_rpt( + pCtx, pBufRemaining, len, + (tDot11fIEneighbor_rpt *) + (pFrm + pIe->offset + + sizeof(tDot11fIEneighbor_rpt) * + countOffset)); + break; + case SigIereq_mac_addr: + status |= + dot11f_unpack_ie_req_mac_addr( + pCtx, pBufRemaining, len, + (tDot11fIEreq_mac_addr *) + (pFrm + pIe->offset + + sizeof(tDot11fIEreq_mac_addr) * + countOffset)); + break; + case SigIetgt_mac_addr: + status |= + dot11f_unpack_ie_tgt_mac_addr( + pCtx, pBufRemaining, len, + (tDot11fIEtgt_mac_addr *) + (pFrm + pIe->offset + + sizeof(tDot11fIEtgt_mac_addr) * + countOffset)); + break; case SigIeAID: status |= dot11f_unpack_ie_aid( @@ -10489,6 +10758,26 @@ uint32_t dot11f_get_packed_iewmmtclas(tpAniSirGlobal pCtx, return status; } /* End dot11f_get_packed_iewmmtclas. */ +uint32_t dot11f_get_packed_ie_neighbor_rpt(tpAniSirGlobal pCtx, + tDot11fIEneighbor_rpt *pIe, uint32_t *pnNeeded) +{ + uint32_t status = DOT11F_PARSE_SUCCESS; + (void)pCtx; + while (pIe->present) { + *pnNeeded += 6; + *pnNeeded += 1; + *pnNeeded += 1; + *pnNeeded += 2; + *pnNeeded += 1; + *pnNeeded += 1; + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, + IES_neighbor_rpt); + break; + } + return status; +} /* End dot11f_get_packed_ie_neighbor_rpt. */ + uint32_t dot11f_get_packed_ie_channel_switch_wrapper(tpAniSirGlobal pCtx, tDot11fIEChannelSwitchWrapper *pIe, uint32_t *pnNeeded) { @@ -10628,6 +10917,15 @@ uint32_t dot11f_get_packed_ie_measurement_request(tpAniSirGlobal pCtx, *pnNeeded += 6; status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestBeacon); break; + case 8: + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestlci); + break; + case 16: + *pnNeeded += 2; + *pnNeeded += 1; + status = get_packed_size_core(pCtx, (uint8_t *)pIe, pnNeeded, IES_measurement_requestftmrr); + break; } break; } @@ -11489,13 +11787,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, *pnNeeded += 2U + pIe->noui; byteCount = 0; switch (pIe->sig) { - case SigIeCondensedCountryStr: - offset = sizeof(tDot11fIECondensedCountryStr); - byteCount = 2; - pIePresent = ((tDot11fIECondensedCountryStr *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeGTK: offset = sizeof(tDot11fIEGTK); byteCount = ((tDot11fIEGTK *) @@ -11528,13 +11819,6 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; - case SigIeTSFInfo: - offset = sizeof(tDot11fIETSFInfo); - byteCount = 4; - pIePresent = ((tDot11fIETSFInfo *) - (pFrm + pIe->offset + offset * i))-> - present; - break; case SigIeAPChannelReport: offset = sizeof(tDot11fIEAPChannelReport); byteCount = ((tDot11fIEAPChannelReport *) @@ -11567,6 +11851,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeCondensedCountryStr: + offset = sizeof(tDot11fIECondensedCountryStr); + byteCount = 2; + pIePresent = ((tDot11fIECondensedCountryStr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeMeasurementPilot: offset = sizeof(tDot11fIEMeasurementPilot); byteCount = ((tDot11fIEMeasurementPilot *) @@ -11655,6 +11946,13 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeTSFInfo: + offset = sizeof(tDot11fIETSFInfo); + byteCount = 4; + pIePresent = ((tDot11fIETSFInfo *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeTSPEC: offset = sizeof(tDot11fIETSPEC); byteCount = 55; @@ -11719,6 +12017,42 @@ static uint32_t get_packed_size_core(tpAniSirGlobal pCtx, (pFrm + pIe->offset + offset * i))-> present; break; + case SigIeazimuth_req: + offset = sizeof(tDot11fIEazimuth_req); + byteCount = 1; + pIePresent = ((tDot11fIEazimuth_req *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIemax_age: + offset = sizeof(tDot11fIEmax_age); + byteCount = 2; + pIePresent = ((tDot11fIEmax_age *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIeneighbor_rpt: + offset = sizeof(tDot11fIEneighbor_rpt); + status |= + dot11f_get_packed_ie_neighbor_rpt( + pCtx, (tDot11fIEneighbor_rpt *) + (pFrm + pIe->offset + offset * i), + pnNeeded); + break; + case SigIereq_mac_addr: + offset = sizeof(tDot11fIEreq_mac_addr); + byteCount = 6; + pIePresent = ((tDot11fIEreq_mac_addr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; + case SigIetgt_mac_addr: + offset = sizeof(tDot11fIEtgt_mac_addr); + byteCount = 6; + pIePresent = ((tDot11fIEtgt_mac_addr *) + (pFrm + pIe->offset + offset * i))-> + present; + break; case SigIeAID: offset = sizeof(tDot11fIEAID); byteCount = 2; @@ -12701,25 +13035,25 @@ void dot11f_pack_ff_capabilities(tpAniSirGlobal pCtx, tDot11fFfCapabilities *pSrc, uint8_t *pBuf) { - uint16_t tmp67__; - tmp67__ = 0U; - tmp67__ |= (pSrc->ess << 0); - tmp67__ |= (pSrc->ibss << 1); - tmp67__ |= (pSrc->cfPollable << 2); - tmp67__ |= (pSrc->cfPollReq << 3); - tmp67__ |= (pSrc->privacy << 4); - tmp67__ |= (pSrc->shortPreamble << 5); - tmp67__ |= (pSrc->pbcc << 6); - tmp67__ |= (pSrc->channelAgility << 7); - tmp67__ |= (pSrc->spectrumMgt << 8); - tmp67__ |= (pSrc->qos << 9); - tmp67__ |= (pSrc->shortSlotTime << 10); - tmp67__ |= (pSrc->apsd << 11); - tmp67__ |= (pSrc->rrm << 12); - tmp67__ |= (pSrc->dsssOfdm << 13); - tmp67__ |= (pSrc->delayedBA << 14); - tmp67__ |= (pSrc->immediateBA << 15); - frameshtons(pCtx, pBuf, tmp67__, 0); + uint16_t tmp69__; + tmp69__ = 0U; + tmp69__ |= (pSrc->ess << 0); + tmp69__ |= (pSrc->ibss << 1); + tmp69__ |= (pSrc->cfPollable << 2); + tmp69__ |= (pSrc->cfPollReq << 3); + tmp69__ |= (pSrc->privacy << 4); + tmp69__ |= (pSrc->shortPreamble << 5); + tmp69__ |= (pSrc->pbcc << 6); + tmp69__ |= (pSrc->channelAgility << 7); + tmp69__ |= (pSrc->spectrumMgt << 8); + tmp69__ |= (pSrc->qos << 9); + tmp69__ |= (pSrc->shortSlotTime << 10); + tmp69__ |= (pSrc->apsd << 11); + tmp69__ |= (pSrc->rrm << 12); + tmp69__ |= (pSrc->dsssOfdm << 13); + tmp69__ |= (pSrc->delayedBA << 14); + tmp69__ |= (pSrc->immediateBA << 15); + frameshtons(pCtx, pBuf, tmp69__, 0); (void)pCtx; } /* End dot11f_pack_ff_capabilities. */ @@ -12783,13 +13117,13 @@ void dot11f_pack_ff_operating_mode(tpAniSirGlobal pCtx, tDot11fFfOperatingMode *pSrc, uint8_t *pBuf) { - uint8_t tmp68__; - tmp68__ = 0U; - tmp68__ |= (pSrc->chanWidth << 0); - tmp68__ |= (pSrc->reserved << 2); - tmp68__ |= (pSrc->rxNSS << 4); - tmp68__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp68__; + uint8_t tmp70__; + tmp70__ = 0U; + tmp70__ |= (pSrc->chanWidth << 0); + tmp70__ |= (pSrc->reserved << 2); + tmp70__ |= (pSrc->rxNSS << 4); + tmp70__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp70__; (void)pCtx; } /* End dot11f_pack_ff_operating_mode. */ @@ -12829,12 +13163,12 @@ void dot11f_pack_ff_sm_power_mode_set(tpAniSirGlobal pCtx, tDot11fFfSMPowerModeSet *pSrc, uint8_t *pBuf) { - uint8_t tmp69__; - tmp69__ = 0U; - tmp69__ |= (pSrc->PowerSave_En << 0); - tmp69__ |= (pSrc->Mode << 1); - tmp69__ |= (pSrc->reserved << 2); - *pBuf = tmp69__; + uint8_t tmp71__; + tmp71__ = 0U; + tmp71__ |= (pSrc->PowerSave_En << 0); + tmp71__ |= (pSrc->Mode << 1); + tmp71__ |= (pSrc->reserved << 2); + *pBuf = tmp71__; (void)pCtx; } /* End dot11f_pack_ff_sm_power_mode_set. */ @@ -12874,19 +13208,19 @@ void dot11f_pack_ff_ts_info(tpAniSirGlobal pCtx, tDot11fFfTSInfo *pSrc, uint8_t *pBuf) { - uint32_t tmp70__; - tmp70__ = 0U; - tmp70__ |= (pSrc->traffic_type << 0); - tmp70__ |= (pSrc->tsid << 1); - tmp70__ |= (pSrc->direction << 5); - tmp70__ |= (pSrc->access_policy << 7); - tmp70__ |= (pSrc->aggregation << 9); - tmp70__ |= (pSrc->psb << 10); - tmp70__ |= (pSrc->user_priority << 11); - tmp70__ |= (pSrc->tsinfo_ack_pol << 14); - tmp70__ |= (pSrc->schedule << 16); - tmp70__ |= (pSrc->unused << 17); - frameshtonl(pCtx, pBuf, tmp70__, 0); + uint32_t tmp72__; + tmp72__ = 0U; + tmp72__ |= (pSrc->traffic_type << 0); + tmp72__ |= (pSrc->tsid << 1); + tmp72__ |= (pSrc->direction << 5); + tmp72__ |= (pSrc->access_policy << 7); + tmp72__ |= (pSrc->aggregation << 9); + tmp72__ |= (pSrc->psb << 10); + tmp72__ |= (pSrc->user_priority << 11); + tmp72__ |= (pSrc->tsinfo_ack_pol << 14); + tmp72__ |= (pSrc->schedule << 16); + tmp72__ |= (pSrc->unused << 17); + frameshtonl(pCtx, pBuf, tmp72__, 0); (void)pCtx; } /* End dot11f_pack_ff_ts_info. */ @@ -12942,13 +13276,13 @@ void dot11f_pack_ff_ext_chan_switch_ann_action(tpAniSirGlobal pCtx, tDot11fFfext_chan_switch_ann_action *pSrc, uint8_t *pBuf) { - uint32_t tmp71__; - tmp71__ = 0U; - tmp71__ |= (pSrc->switch_mode << 0); - tmp71__ |= (pSrc->op_class << 8); - tmp71__ |= (pSrc->new_channel << 16); - tmp71__ |= (pSrc->switch_count << 24); - frameshtonl(pCtx, pBuf, tmp71__, 0); + uint32_t tmp73__; + tmp73__ = 0U; + tmp73__ |= (pSrc->switch_mode << 0); + tmp73__ |= (pSrc->op_class << 8); + tmp73__ |= (pSrc->new_channel << 16); + tmp73__ |= (pSrc->switch_count << 24); + frameshtonl(pCtx, pBuf, tmp73__, 0); (void)pCtx; } /* End dot11f_pack_ff_ext_chan_switch_ann_action. */ @@ -13019,7 +13353,7 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp72__; + uint8_t tmp74__; nNeeded += 3; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -13028,10 +13362,10 @@ uint32_t dot11f_pack_tlv_version2(tpAniSirGlobal pCtx, pBuf += 1; *pnConsumed += 1; pTlvLen = pBuf; pBuf += 1; *pnConsumed += 1; - tmp72__ = 0U; - tmp72__ |= (pSrc->minor << 0); - tmp72__ |= (pSrc->major << 4); - *pBuf = tmp72__; + tmp74__ = 0U; + tmp74__ |= (pSrc->minor << 0); + tmp74__ |= (pSrc->major << 4); + *pBuf = tmp74__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -13988,7 +14322,7 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, uint8_t *pTlvLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp73__; + uint8_t tmp75__; nNeeded += 5; if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; @@ -13997,10 +14331,10 @@ uint32_t dot11f_pack_tlv_version(tpAniSirGlobal pCtx, pBuf += 2; *pnConsumed += 2; pTlvLen = pBuf; pBuf += 2; *pnConsumed += 2; - tmp73__ = 0U; - tmp73__ |= (pSrc->minor << 0); - tmp73__ |= (pSrc->major << 4); - *pBuf = tmp73__; + tmp75__ = 0U; + tmp75__ |= (pSrc->minor << 0); + tmp75__ |= (pSrc->major << 4); + *pBuf = tmp75__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -14100,35 +14434,6 @@ uint32_t dot11f_pack_tlv_p2_p_manageability(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_tlv_p2_p_manageability. */ -uint32_t dot11f_pack_ie_condensed_country_str(tpAniSirGlobal pCtx, - tDot11fIECondensedCountryStr *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - nNeeded += 2; - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 2; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - DOT11F_MEMCPY(pCtx, pBuf, pSrc->countryStr, 2); - *pnConsumed += 2; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_condensed_country_str. */ - uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, tDot11fIEGTK *pSrc, uint8_t *pBuf, @@ -14138,7 +14443,7 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp74__; + uint16_t tmp76__; nNeeded += (pSrc->num_key + 11); while (pSrc->present) { if (nNeeded > nBuf) @@ -14147,10 +14452,10 @@ uint32_t dot11f_pack_ie_gtk(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp74__ = 0U; - tmp74__ |= (pSrc->keyId << 0); - tmp74__ |= (pSrc->reserved << 2); - frameshtons(pCtx, pBuf, tmp74__, 0); + tmp76__ = 0U; + tmp76__ |= (pSrc->keyId << 0); + tmp76__ |= (pSrc->reserved << 2); + frameshtons(pCtx, pBuf, tmp76__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -14268,28 +14573,28 @@ uint32_t dot11f_pack_ie_r1_kh_id(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_r1_kh_id. */ -uint32_t dot11f_pack_ie_tsf_info(tpAniSirGlobal pCtx, - tDot11fIETSFInfo *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) +uint32_t dot11f_pack_ie_ap_channel_report(tpAniSirGlobal pCtx, + tDot11fIEAPChannelReport *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) { uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - nNeeded += 4; + nNeeded += (pSrc->num_channelList + 1); while (pSrc->present) { if (nNeeded > nBuf) return DOT11F_BUFFER_OVERFLOW; - *pBuf = 1; + *pBuf = 51; ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - frameshtons(pCtx, pBuf, pSrc->TsfOffset, 0); - *pnConsumed += 2; - pBuf += 2; - frameshtons(pCtx, pBuf, pSrc->BeaconIntvl, 0); - *pnConsumed += 2; + *pBuf = pSrc->regulatoryClass; + *pnConsumed += 1; + pBuf += 1; + DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->channelList), pSrc->num_channelList); + *pnConsumed += pSrc->num_channelList; /* fieldsEndFlag = 1 */ break; } @@ -14298,39 +14603,7 @@ uint32_t dot11f_pack_ie_tsf_info(tpAniSirGlobal pCtx, *pIeLen = *pnConsumed - nConsumedOnEntry - 2; } return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_tsf_info. */ - -uint32_t dot11f_pack_ie_ap_channel_report(tpAniSirGlobal pCtx, - tDot11fIEAPChannelReport *pSrc, - uint8_t *pBuf, - uint32_t nBuf, - uint32_t *pnConsumed) -{ - uint8_t *pIeLen = 0; - uint32_t nConsumedOnEntry = *pnConsumed; - uint32_t nNeeded = 0U; - nNeeded += (pSrc->num_channelList + 1); - while (pSrc->present) { - if (nNeeded > nBuf) - return DOT11F_BUFFER_OVERFLOW; - *pBuf = 51; - ++pBuf; ++(*pnConsumed); - pIeLen = pBuf; - ++pBuf; ++(*pnConsumed); - *pBuf = pSrc->regulatoryClass; - *pnConsumed += 1; - pBuf += 1; - DOT11F_MEMCPY(pCtx, pBuf, &(pSrc->channelList), pSrc->num_channelList); - *pnConsumed += pSrc->num_channelList; - /* fieldsEndFlag = 1 */ - break; - } - (void)pCtx; - if (pIeLen) { - *pIeLen = *pnConsumed - nConsumedOnEntry - 2; - } - return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_ap_channel_report. */ +} /* End dot11f_pack_ie_ap_channel_report. */ uint32_t dot11f_pack_ie_bcn_reporting_detail(tpAniSirGlobal pCtx, tDot11fIEBcnReportingDetail *pSrc, @@ -14422,6 +14695,35 @@ uint32_t dot11f_pack_ie_beacon_reporting(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_beacon_reporting. */ +uint32_t dot11f_pack_ie_condensed_country_str(tpAniSirGlobal pCtx, + tDot11fIECondensedCountryStr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 2; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->countryStr, 2); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_condensed_country_str. */ + uint32_t dot11f_pack_ie_measurement_pilot(tpAniSirGlobal pCtx, tDot11fIEMeasurementPilot *pSrc, uint8_t *pBuf, @@ -14562,11 +14864,11 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp75__; - uint8_t tmp76__; uint8_t tmp77__; uint8_t tmp78__; uint8_t tmp79__; + uint8_t tmp80__; + uint8_t tmp81__; nNeeded += 5; while (pSrc->present) { if (nNeeded > nBuf) @@ -14575,60 +14877,60 @@ uint32_t dot11f_pack_ie_rrm_enabled_cap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp75__ = 0U; - tmp75__ |= (pSrc->LinkMeasurement << 0); - tmp75__ |= (pSrc->NeighborRpt << 1); - tmp75__ |= (pSrc->parallel << 2); - tmp75__ |= (pSrc->repeated << 3); - tmp75__ |= (pSrc->BeaconPassive << 4); - tmp75__ |= (pSrc->BeaconActive << 5); - tmp75__ |= (pSrc->BeaconTable << 6); - tmp75__ |= (pSrc->BeaconRepCond << 7); - *pBuf = tmp75__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; - tmp76__ = 0U; - tmp76__ |= (pSrc->FrameMeasurement << 0); - tmp76__ |= (pSrc->ChannelLoad << 1); - tmp76__ |= (pSrc->NoiseHistogram << 2); - tmp76__ |= (pSrc->statistics << 3); - tmp76__ |= (pSrc->LCIMeasurement << 4); - tmp76__ |= (pSrc->LCIAzimuth << 5); - tmp76__ |= (pSrc->TCMCapability << 6); - tmp76__ |= (pSrc->triggeredTCM << 7); - *pBuf = tmp76__; - *pnConsumed += 1; - pBuf += 1; - nBuf -= 1 ; tmp77__ = 0U; - tmp77__ |= (pSrc->APChanReport << 0); - tmp77__ |= (pSrc->RRMMIBEnabled << 1); - tmp77__ |= (pSrc->operatingChanMax << 2); - tmp77__ |= (pSrc->nonOperatinChanMax << 5); + tmp77__ |= (pSrc->LinkMeasurement << 0); + tmp77__ |= (pSrc->NeighborRpt << 1); + tmp77__ |= (pSrc->parallel << 2); + tmp77__ |= (pSrc->repeated << 3); + tmp77__ |= (pSrc->BeaconPassive << 4); + tmp77__ |= (pSrc->BeaconActive << 5); + tmp77__ |= (pSrc->BeaconTable << 6); + tmp77__ |= (pSrc->BeaconRepCond << 7); *pBuf = tmp77__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp78__ = 0U; - tmp78__ |= (pSrc->MeasurementPilot << 0); - tmp78__ |= (pSrc->MeasurementPilotEnabled << 3); - tmp78__ |= (pSrc->NeighborTSFOffset << 4); - tmp78__ |= (pSrc->RCPIMeasurement << 5); - tmp78__ |= (pSrc->RSNIMeasurement << 6); - tmp78__ |= (pSrc->BssAvgAccessDelay << 7); + tmp78__ |= (pSrc->FrameMeasurement << 0); + tmp78__ |= (pSrc->ChannelLoad << 1); + tmp78__ |= (pSrc->NoiseHistogram << 2); + tmp78__ |= (pSrc->statistics << 3); + tmp78__ |= (pSrc->LCIMeasurement << 4); + tmp78__ |= (pSrc->LCIAzimuth << 5); + tmp78__ |= (pSrc->TCMCapability << 6); + tmp78__ |= (pSrc->triggeredTCM << 7); *pBuf = tmp78__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; tmp79__ = 0U; - tmp79__ |= (pSrc->BSSAvailAdmission << 0); - tmp79__ |= (pSrc->AntennaInformation << 1); - tmp79__ |= (pSrc->fine_time_meas_rpt << 2); - tmp79__ |= (pSrc->lci_capability << 3); - tmp79__ |= (pSrc->reserved << 4); + tmp79__ |= (pSrc->APChanReport << 0); + tmp79__ |= (pSrc->RRMMIBEnabled << 1); + tmp79__ |= (pSrc->operatingChanMax << 2); + tmp79__ |= (pSrc->nonOperatinChanMax << 5); *pBuf = tmp79__; *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp80__ = 0U; + tmp80__ |= (pSrc->MeasurementPilot << 0); + tmp80__ |= (pSrc->MeasurementPilotEnabled << 3); + tmp80__ |= (pSrc->NeighborTSFOffset << 4); + tmp80__ |= (pSrc->RCPIMeasurement << 5); + tmp80__ |= (pSrc->RSNIMeasurement << 6); + tmp80__ |= (pSrc->BssAvgAccessDelay << 7); + *pBuf = tmp80__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp81__ = 0U; + tmp81__ |= (pSrc->BSSAvailAdmission << 0); + tmp81__ |= (pSrc->AntennaInformation << 1); + tmp81__ |= (pSrc->fine_time_meas_rpt << 2); + tmp81__ |= (pSrc->lci_capability << 3); + tmp81__ |= (pSrc->reserved << 4); + *pBuf = tmp81__; + *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; break; @@ -14707,7 +15009,7 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp80__; + uint16_t tmp82__; nNeeded += 14; while (pSrc->present) { if (nNeeded > nBuf) @@ -14716,12 +15018,12 @@ uint32_t dot11f_pack_ie_schedule(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp80__ = 0U; - tmp80__ |= (pSrc->aggregation << 0); - tmp80__ |= (pSrc->tsid << 1); - tmp80__ |= (pSrc->direction << 5); - tmp80__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp80__, 0); + tmp82__ = 0U; + tmp82__ |= (pSrc->aggregation << 0); + tmp82__ |= (pSrc->tsid << 1); + tmp82__ |= (pSrc->direction << 5); + tmp82__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp82__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -14907,6 +15209,38 @@ uint32_t dot11f_pack_ie_ts_delay(tpAniSirGlobal pCtx, return DOT11F_PARSE_SUCCESS; } /* End dot11f_pack_ie_ts_delay. */ +uint32_t dot11f_pack_ie_tsf_info(tpAniSirGlobal pCtx, + tDot11fIETSFInfo *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 4; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 1; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + frameshtons(pCtx, pBuf, pSrc->TsfOffset, 0); + *pnConsumed += 2; + pBuf += 2; + frameshtons(pCtx, pBuf, pSrc->BeaconIntvl, 0); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_tsf_info. */ + uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, tDot11fIETSPEC *pSrc, uint8_t *pBuf, @@ -14916,9 +15250,9 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp81__; - uint8_t tmp82__; uint16_t tmp83__; + uint8_t tmp84__; + uint16_t tmp85__; nNeeded += 55; while (pSrc->present) { if (nNeeded > nBuf) @@ -14927,30 +15261,30 @@ uint32_t dot11f_pack_ie_tspec(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp81__ = 0U; - tmp81__ |= (pSrc->traffic_type << 0); - tmp81__ |= (pSrc->tsid << 1); - tmp81__ |= (pSrc->direction << 5); - tmp81__ |= (pSrc->access_policy << 7); - tmp81__ |= (pSrc->aggregation << 9); - tmp81__ |= (pSrc->psb << 10); - tmp81__ |= (pSrc->user_priority << 11); - tmp81__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp81__, 0); + tmp83__ = 0U; + tmp83__ |= (pSrc->traffic_type << 0); + tmp83__ |= (pSrc->tsid << 1); + tmp83__ |= (pSrc->direction << 5); + tmp83__ |= (pSrc->access_policy << 7); + tmp83__ |= (pSrc->aggregation << 9); + tmp83__ |= (pSrc->psb << 10); + tmp83__ |= (pSrc->user_priority << 11); + tmp83__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp83__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp82__ = 0U; - tmp82__ |= (pSrc->schedule << 0); - tmp82__ |= (pSrc->unused << 1); - *pBuf = tmp82__; + tmp84__ = 0U; + tmp84__ |= (pSrc->schedule << 0); + tmp84__ |= (pSrc->unused << 1); + *pBuf = tmp84__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp83__ = 0U; - tmp83__ |= (pSrc->size << 0); - tmp83__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp83__, 0); + tmp85__ = 0U; + tmp85__ |= (pSrc->size << 0); + tmp85__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp85__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15014,9 +15348,9 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint32_t tmp84__; - uint16_t tmp85__; - uint16_t tmp86__; + uint32_t tmp86__; + uint16_t tmp87__; + uint16_t tmp88__; nNeeded += 12; while (pSrc->present) { if (nNeeded > nBuf) @@ -15025,48 +15359,48 @@ uint32_t dot11f_pack_ie_vht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp84__ = 0U; - tmp84__ |= (pSrc->maxMPDULen << 0); - tmp84__ |= (pSrc->supportedChannelWidthSet << 2); - tmp84__ |= (pSrc->ldpcCodingCap << 4); - tmp84__ |= (pSrc->shortGI80MHz << 5); - tmp84__ |= (pSrc->shortGI160and80plus80MHz << 6); - tmp84__ |= (pSrc->txSTBC << 7); - tmp84__ |= (pSrc->rxSTBC << 8); - tmp84__ |= (pSrc->suBeamFormerCap << 11); - tmp84__ |= (pSrc->suBeamformeeCap << 12); - tmp84__ |= (pSrc->csnofBeamformerAntSup << 13); - tmp84__ |= (pSrc->numSoundingDim << 16); - tmp84__ |= (pSrc->muBeamformerCap << 19); - tmp84__ |= (pSrc->muBeamformeeCap << 20); - tmp84__ |= (pSrc->vhtTXOPPS << 21); - tmp84__ |= (pSrc->htcVHTCap << 22); - tmp84__ |= (pSrc->maxAMPDULenExp << 23); - tmp84__ |= (pSrc->vhtLinkAdaptCap << 26); - tmp84__ |= (pSrc->rxAntPattern << 28); - tmp84__ |= (pSrc->txAntPattern << 29); - tmp84__ |= (pSrc->reserved1 << 30); - frameshtonl(pCtx, pBuf, tmp84__, 0); + tmp86__ = 0U; + tmp86__ |= (pSrc->maxMPDULen << 0); + tmp86__ |= (pSrc->supportedChannelWidthSet << 2); + tmp86__ |= (pSrc->ldpcCodingCap << 4); + tmp86__ |= (pSrc->shortGI80MHz << 5); + tmp86__ |= (pSrc->shortGI160and80plus80MHz << 6); + tmp86__ |= (pSrc->txSTBC << 7); + tmp86__ |= (pSrc->rxSTBC << 8); + tmp86__ |= (pSrc->suBeamFormerCap << 11); + tmp86__ |= (pSrc->suBeamformeeCap << 12); + tmp86__ |= (pSrc->csnofBeamformerAntSup << 13); + tmp86__ |= (pSrc->numSoundingDim << 16); + tmp86__ |= (pSrc->muBeamformerCap << 19); + tmp86__ |= (pSrc->muBeamformeeCap << 20); + tmp86__ |= (pSrc->vhtTXOPPS << 21); + tmp86__ |= (pSrc->htcVHTCap << 22); + tmp86__ |= (pSrc->maxAMPDULenExp << 23); + tmp86__ |= (pSrc->vhtLinkAdaptCap << 26); + tmp86__ |= (pSrc->rxAntPattern << 28); + tmp86__ |= (pSrc->txAntPattern << 29); + tmp86__ |= (pSrc->reserved1 << 30); + frameshtonl(pCtx, pBuf, tmp86__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; frameshtons(pCtx, pBuf, pSrc->rxMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp85__ = 0U; - tmp85__ |= (pSrc->rxHighSupDataRate << 0); - tmp85__ |= (pSrc->reserved2 << 13); - frameshtons(pCtx, pBuf, tmp85__, 0); + tmp87__ = 0U; + tmp87__ |= (pSrc->rxHighSupDataRate << 0); + tmp87__ |= (pSrc->reserved2 << 13); + frameshtons(pCtx, pBuf, tmp87__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; frameshtons(pCtx, pBuf, pSrc->txMCSMap, 0); *pnConsumed += 2; pBuf += 2; - tmp86__ = 0U; - tmp86__ |= (pSrc->txSupDataRate << 0); - tmp86__ |= (pSrc->reserved3 << 13); - frameshtons(pCtx, pBuf, tmp86__, 0); + tmp88__ = 0U; + tmp88__ |= (pSrc->txSupDataRate << 0); + tmp88__ |= (pSrc->reserved3 << 13); + frameshtons(pCtx, pBuf, tmp88__, 0); *pnConsumed += 2; /* fieldsEndFlag = 1 */ nBuf -= 2 ; @@ -15126,7 +15460,7 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp87__; + uint16_t tmp89__; nNeeded += 15; while (pSrc->present) { if (nNeeded > nBuf) @@ -15148,12 +15482,12 @@ uint32_t dot11f_pack_ie_wmm_schedule(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp87__ = 0U; - tmp87__ |= (pSrc->aggregation << 0); - tmp87__ |= (pSrc->tsid << 1); - tmp87__ |= (pSrc->direction << 5); - tmp87__ |= (pSrc->reserved << 7); - frameshtons(pCtx, pBuf, tmp87__, 0); + tmp89__ = 0U; + tmp89__ |= (pSrc->aggregation << 0); + tmp89__ |= (pSrc->tsid << 1); + tmp89__ |= (pSrc->direction << 5); + tmp89__ |= (pSrc->reserved << 7); + frameshtons(pCtx, pBuf, tmp89__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15387,9 +15721,9 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp88__; - uint8_t tmp89__; uint16_t tmp90__; + uint8_t tmp91__; + uint16_t tmp92__; nNeeded += 38; while (pSrc->present) { if (nNeeded > nBuf) @@ -15411,30 +15745,30 @@ uint32_t dot11f_pack_ie_wmmtspec(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp88__ = 0U; - tmp88__ |= (pSrc->traffic_type << 0); - tmp88__ |= (pSrc->tsid << 1); - tmp88__ |= (pSrc->direction << 5); - tmp88__ |= (pSrc->access_policy << 7); - tmp88__ |= (pSrc->aggregation << 9); - tmp88__ |= (pSrc->psb << 10); - tmp88__ |= (pSrc->user_priority << 11); - tmp88__ |= (pSrc->tsinfo_ack_pol << 14); - frameshtons(pCtx, pBuf, tmp88__, 0); + tmp90__ = 0U; + tmp90__ |= (pSrc->traffic_type << 0); + tmp90__ |= (pSrc->tsid << 1); + tmp90__ |= (pSrc->direction << 5); + tmp90__ |= (pSrc->access_policy << 7); + tmp90__ |= (pSrc->aggregation << 9); + tmp90__ |= (pSrc->psb << 10); + tmp90__ |= (pSrc->user_priority << 11); + tmp90__ |= (pSrc->tsinfo_ack_pol << 14); + frameshtons(pCtx, pBuf, tmp90__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp89__ = 0U; - tmp89__ |= (pSrc->tsinfo_rsvd << 0); - tmp89__ |= (pSrc->burst_size_defn << 7); - *pBuf = tmp89__; + tmp91__ = 0U; + tmp91__ |= (pSrc->tsinfo_rsvd << 0); + tmp91__ |= (pSrc->burst_size_defn << 7); + *pBuf = tmp91__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp90__ = 0U; - tmp90__ |= (pSrc->size << 0); - tmp90__ |= (pSrc->fixed << 15); - frameshtons(pCtx, pBuf, tmp90__, 0); + tmp92__ = 0U; + tmp92__ |= (pSrc->size << 0); + tmp92__ |= (pSrc->fixed << 15); + frameshtons(pCtx, pBuf, tmp92__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -15522,7 +15856,197 @@ uint32_t dot11f_pack_ie_wider_bw_chan_switch_ann(tpAniSirGlobal pCtx, *pIeLen = *pnConsumed - nConsumedOnEntry - 2; } return DOT11F_PARSE_SUCCESS; -} /* End dot11f_pack_ie_wider_bw_chan_switch_ann. */ +} /* End dot11f_pack_ie_wider_bw_chan_switch_ann. */ + +uint32_t dot11f_pack_ie_azimuth_req(tpAniSirGlobal pCtx, + tDot11fIEazimuth_req *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 1; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 1; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + *pBuf = pSrc->request; + *pnConsumed += 1; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_azimuth_req. */ + +uint32_t dot11f_pack_ie_max_age(tpAniSirGlobal pCtx, + tDot11fIEmax_age *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 2; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 4; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + frameshtons(pCtx, pBuf, pSrc->max_age, 0); + *pnConsumed += 2; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_max_age. */ + +uint32_t dot11f_pack_ie_neighbor_rpt(tpAniSirGlobal pCtx, + tDot11fIEneighbor_rpt *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + uint8_t tmp93__; + uint8_t tmp94__; + uint32_t status = DOT11F_PARSE_SUCCESS; + status = dot11f_get_packed_ie_neighbor_rpt(pCtx, pSrc, &nNeeded); + if (!DOT11F_SUCCEEDED(status)) + return status; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 52; + ++pBuf; --nBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; --nBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); + *pnConsumed += 6; + pBuf += 6; + tmp93__ = 0U; + tmp93__ |= (pSrc->APReachability << 0); + tmp93__ |= (pSrc->Security << 2); + tmp93__ |= (pSrc->KeyScope << 3); + tmp93__ |= (pSrc->SpecMgmtCap << 4); + tmp93__ |= (pSrc->QosCap << 5); + tmp93__ |= (pSrc->apsd << 6); + tmp93__ |= (pSrc->rrm << 7); + *pBuf = tmp93__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + tmp94__ = 0U; + tmp94__ |= (pSrc->DelayedBA << 0); + tmp94__ |= (pSrc->ImmBA << 1); + tmp94__ |= (pSrc->MobilityDomain << 2); + tmp94__ |= (pSrc->reserved << 3); + *pBuf = tmp94__; + *pnConsumed += 1; + pBuf += 1; + nBuf -= 1 ; + frameshtons(pCtx, pBuf, pSrc->reserved1, 0); + *pnConsumed += 2; + pBuf += 2; + *pBuf = pSrc->regulatoryClass; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->channel; + *pnConsumed += 1; + pBuf += 1; + *pBuf = pSrc->PhyType; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_neighbor_rpt, + IES_neighbor_rpt); + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return status; +} /* End dot11f_pack_ie_neighbor_rpt. */ + +uint32_t dot11f_pack_ie_req_mac_addr(tpAniSirGlobal pCtx, + tDot11fIEreq_mac_addr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 6; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 2; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->addr, 6); + *pnConsumed += 6; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_req_mac_addr. */ + +uint32_t dot11f_pack_ie_tgt_mac_addr(tpAniSirGlobal pCtx, + tDot11fIEtgt_mac_addr *pSrc, + uint8_t *pBuf, + uint32_t nBuf, + uint32_t *pnConsumed) +{ + uint8_t *pIeLen = 0; + uint32_t nConsumedOnEntry = *pnConsumed; + uint32_t nNeeded = 0U; + nNeeded += 6; + while (pSrc->present) { + if (nNeeded > nBuf) + return DOT11F_BUFFER_OVERFLOW; + *pBuf = 3; + ++pBuf; ++(*pnConsumed); + pIeLen = pBuf; + ++pBuf; ++(*pnConsumed); + DOT11F_MEMCPY(pCtx, pBuf, pSrc->addr, 6); + *pnConsumed += 6; + /* fieldsEndFlag = 1 */ + break; + } + (void)pCtx; + if (pIeLen) { + *pIeLen = *pnConsumed - nConsumedOnEntry - 2; + } + return DOT11F_PARSE_SUCCESS; +} /* End dot11f_pack_ie_tgt_mac_addr. */ uint32_t dot11f_pack_ie_aid(tpAniSirGlobal pCtx, tDot11fIEAID *pSrc, @@ -15768,14 +16292,14 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp91__; - uint8_t tmp92__; - uint8_t tmp93__; - uint8_t tmp94__; uint8_t tmp95__; uint8_t tmp96__; uint8_t tmp97__; uint8_t tmp98__; + uint8_t tmp99__; + uint8_t tmp100__; + uint8_t tmp101__; + uint8_t tmp102__; nNeeded += 18; while (pSrc->present) { if (nNeeded > nBuf) @@ -15790,76 +16314,76 @@ uint32_t dot11f_pack_ie_edca_param_set(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved; *pnConsumed += 1; pBuf += 1; - tmp91__ = 0U; - tmp91__ |= (pSrc->acbe_aifsn << 0); - tmp91__ |= (pSrc->acbe_acm << 4); - tmp91__ |= (pSrc->acbe_aci << 5); - tmp91__ |= (pSrc->unused1 << 7); - *pBuf = tmp91__; + tmp95__ = 0U; + tmp95__ |= (pSrc->acbe_aifsn << 0); + tmp95__ |= (pSrc->acbe_acm << 4); + tmp95__ |= (pSrc->acbe_aci << 5); + tmp95__ |= (pSrc->unused1 << 7); + *pBuf = tmp95__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp92__ = 0U; - tmp92__ |= (pSrc->acbe_acwmin << 0); - tmp92__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp92__; + tmp96__ = 0U; + tmp96__ |= (pSrc->acbe_acwmin << 0); + tmp96__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp96__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp93__ = 0U; - tmp93__ |= (pSrc->acbk_aifsn << 0); - tmp93__ |= (pSrc->acbk_acm << 4); - tmp93__ |= (pSrc->acbk_aci << 5); - tmp93__ |= (pSrc->unused2 << 7); - *pBuf = tmp93__; + tmp97__ = 0U; + tmp97__ |= (pSrc->acbk_aifsn << 0); + tmp97__ |= (pSrc->acbk_acm << 4); + tmp97__ |= (pSrc->acbk_aci << 5); + tmp97__ |= (pSrc->unused2 << 7); + *pBuf = tmp97__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp94__ = 0U; - tmp94__ |= (pSrc->acbk_acwmin << 0); - tmp94__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp94__; + tmp98__ = 0U; + tmp98__ |= (pSrc->acbk_acwmin << 0); + tmp98__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp98__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp95__ = 0U; - tmp95__ |= (pSrc->acvi_aifsn << 0); - tmp95__ |= (pSrc->acvi_acm << 4); - tmp95__ |= (pSrc->acvi_aci << 5); - tmp95__ |= (pSrc->unused3 << 7); - *pBuf = tmp95__; + tmp99__ = 0U; + tmp99__ |= (pSrc->acvi_aifsn << 0); + tmp99__ |= (pSrc->acvi_acm << 4); + tmp99__ |= (pSrc->acvi_aci << 5); + tmp99__ |= (pSrc->unused3 << 7); + *pBuf = tmp99__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp96__ = 0U; - tmp96__ |= (pSrc->acvi_acwmin << 0); - tmp96__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp96__; + tmp100__ = 0U; + tmp100__ |= (pSrc->acvi_acwmin << 0); + tmp100__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp100__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp97__ = 0U; - tmp97__ |= (pSrc->acvo_aifsn << 0); - tmp97__ |= (pSrc->acvo_acm << 4); - tmp97__ |= (pSrc->acvo_aci << 5); - tmp97__ |= (pSrc->unused4 << 7); - *pBuf = tmp97__; + tmp101__ = 0U; + tmp101__ |= (pSrc->acvo_aifsn << 0); + tmp101__ |= (pSrc->acvo_acm << 4); + tmp101__ |= (pSrc->acvo_aci << 5); + tmp101__ |= (pSrc->unused4 << 7); + *pBuf = tmp101__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp98__ = 0U; - tmp98__ |= (pSrc->acvo_acwmin << 0); - tmp98__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp98__; + tmp102__ = 0U; + tmp102__ |= (pSrc->acvo_acwmin << 0); + tmp102__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp102__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -15884,7 +16408,7 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp99__; + uint8_t tmp103__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -15893,12 +16417,12 @@ uint32_t dot11f_pack_ie_erp_info(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp99__ = 0U; - tmp99__ |= (pSrc->non_erp_present << 0); - tmp99__ |= (pSrc->use_prot << 1); - tmp99__ |= (pSrc->barker_preamble << 2); - tmp99__ |= (pSrc->unused << 3); - *pBuf = tmp99__; + tmp103__ = 0U; + tmp103__ |= (pSrc->non_erp_present << 0); + tmp103__ |= (pSrc->use_prot << 1); + tmp103__ |= (pSrc->barker_preamble << 2); + tmp103__ |= (pSrc->unused << 3); + *pBuf = tmp103__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -15957,7 +16481,7 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp100__; + uint8_t tmp104__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -15977,10 +16501,10 @@ uint32_t dot11f_pack_ie_ese_rad_mgmt_cap(tpAniSirGlobal pCtx, *pBuf = pSrc->mgmt_state; *pnConsumed += 1; pBuf += 1; - tmp100__ = 0U; - tmp100__ |= (pSrc->mbssid_mask << 0); - tmp100__ |= (pSrc->reserved << 3); - *pBuf = tmp100__; + tmp104__ = 0U; + tmp104__ |= (pSrc->mbssid_mask << 0); + tmp104__ |= (pSrc->reserved << 3); + *pBuf = tmp104__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16331,7 +16855,7 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp101__; + uint16_t tmp105__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ieft_info(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16343,10 +16867,10 @@ uint32_t dot11f_pack_ie_ft_info(tpAniSirGlobal pCtx, ++pBuf; --nBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; --nBuf; ++(*pnConsumed); - tmp101__ = 0U; - tmp101__ |= (pSrc->reserved << 0); - tmp101__ |= (pSrc->IECount << 8); - frameshtons(pCtx, pBuf, tmp101__, 0); + tmp105__ = 0U; + tmp105__ |= (pSrc->reserved << 0); + tmp105__ |= (pSrc->IECount << 8); + frameshtons(pCtx, pBuf, tmp105__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -16384,11 +16908,11 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp102__; - uint8_t tmp103__; - uint16_t tmp104__; - uint32_t tmp105__; - uint8_t tmp106__; + uint16_t tmp106__; + uint8_t tmp107__; + uint16_t tmp108__; + uint32_t tmp109__; + uint8_t tmp110__; nNeeded += (pSrc->num_rsvd + 26); while (pSrc->present) { if (nNeeded > nBuf) @@ -16397,77 +16921,77 @@ uint32_t dot11f_pack_ie_ht_caps(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp102__ = 0U; - tmp102__ |= (pSrc->advCodingCap << 0); - tmp102__ |= (pSrc->supportedChannelWidthSet << 1); - tmp102__ |= (pSrc->mimoPowerSave << 2); - tmp102__ |= (pSrc->greenField << 4); - tmp102__ |= (pSrc->shortGI20MHz << 5); - tmp102__ |= (pSrc->shortGI40MHz << 6); - tmp102__ |= (pSrc->txSTBC << 7); - tmp102__ |= (pSrc->rxSTBC << 8); - tmp102__ |= (pSrc->delayedBA << 10); - tmp102__ |= (pSrc->maximalAMSDUsize << 11); - tmp102__ |= (pSrc->dsssCckMode40MHz << 12); - tmp102__ |= (pSrc->psmp << 13); - tmp102__ |= (pSrc->stbcControlFrame << 14); - tmp102__ |= (pSrc->lsigTXOPProtection << 15); - frameshtons(pCtx, pBuf, tmp102__, 0); + tmp106__ = 0U; + tmp106__ |= (pSrc->advCodingCap << 0); + tmp106__ |= (pSrc->supportedChannelWidthSet << 1); + tmp106__ |= (pSrc->mimoPowerSave << 2); + tmp106__ |= (pSrc->greenField << 4); + tmp106__ |= (pSrc->shortGI20MHz << 5); + tmp106__ |= (pSrc->shortGI40MHz << 6); + tmp106__ |= (pSrc->txSTBC << 7); + tmp106__ |= (pSrc->rxSTBC << 8); + tmp106__ |= (pSrc->delayedBA << 10); + tmp106__ |= (pSrc->maximalAMSDUsize << 11); + tmp106__ |= (pSrc->dsssCckMode40MHz << 12); + tmp106__ |= (pSrc->psmp << 13); + tmp106__ |= (pSrc->stbcControlFrame << 14); + tmp106__ |= (pSrc->lsigTXOPProtection << 15); + frameshtons(pCtx, pBuf, tmp106__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp103__ = 0U; - tmp103__ |= (pSrc->maxRxAMPDUFactor << 0); - tmp103__ |= (pSrc->mpduDensity << 2); - tmp103__ |= (pSrc->reserved1 << 5); - *pBuf = tmp103__; + tmp107__ = 0U; + tmp107__ |= (pSrc->maxRxAMPDUFactor << 0); + tmp107__ |= (pSrc->mpduDensity << 2); + tmp107__ |= (pSrc->reserved1 << 5); + *pBuf = tmp107__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; DOT11F_MEMCPY(pCtx, pBuf, pSrc->supportedMCSSet, 16); *pnConsumed += 16; pBuf += 16; - tmp104__ = 0U; - tmp104__ |= (pSrc->pco << 0); - tmp104__ |= (pSrc->transitionTime << 1); - tmp104__ |= (pSrc->reserved2 << 3); - tmp104__ |= (pSrc->mcsFeedback << 8); - tmp104__ |= (pSrc->reserved3 << 10); - frameshtons(pCtx, pBuf, tmp104__, 0); + tmp108__ = 0U; + tmp108__ |= (pSrc->pco << 0); + tmp108__ |= (pSrc->transitionTime << 1); + tmp108__ |= (pSrc->reserved2 << 3); + tmp108__ |= (pSrc->mcsFeedback << 8); + tmp108__ |= (pSrc->reserved3 << 10); + frameshtons(pCtx, pBuf, tmp108__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp105__ = 0U; - tmp105__ |= (pSrc->txBF << 0); - tmp105__ |= (pSrc->rxStaggeredSounding << 1); - tmp105__ |= (pSrc->txStaggeredSounding << 2); - tmp105__ |= (pSrc->rxZLF << 3); - tmp105__ |= (pSrc->txZLF << 4); - tmp105__ |= (pSrc->implicitTxBF << 5); - tmp105__ |= (pSrc->calibration << 6); - tmp105__ |= (pSrc->explicitCSITxBF << 8); - tmp105__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); - tmp105__ |= (pSrc->explicitBFCSIFeedback << 10); - tmp105__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); - tmp105__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); - tmp105__ |= (pSrc->csiNumBFAntennae << 19); - tmp105__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); - tmp105__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); - tmp105__ |= (pSrc->reserved4 << 25); - frameshtonl(pCtx, pBuf, tmp105__, 0); + tmp109__ = 0U; + tmp109__ |= (pSrc->txBF << 0); + tmp109__ |= (pSrc->rxStaggeredSounding << 1); + tmp109__ |= (pSrc->txStaggeredSounding << 2); + tmp109__ |= (pSrc->rxZLF << 3); + tmp109__ |= (pSrc->txZLF << 4); + tmp109__ |= (pSrc->implicitTxBF << 5); + tmp109__ |= (pSrc->calibration << 6); + tmp109__ |= (pSrc->explicitCSITxBF << 8); + tmp109__ |= (pSrc->explicitUncompressedSteeringMatrix << 9); + tmp109__ |= (pSrc->explicitBFCSIFeedback << 10); + tmp109__ |= (pSrc->explicitUncompressedSteeringMatrixFeedback << 13); + tmp109__ |= (pSrc->explicitCompressedSteeringMatrixFeedback << 16); + tmp109__ |= (pSrc->csiNumBFAntennae << 19); + tmp109__ |= (pSrc->uncompressedSteeringMatrixBFAntennae << 21); + tmp109__ |= (pSrc->compressedSteeringMatrixBFAntennae << 23); + tmp109__ |= (pSrc->reserved4 << 25); + frameshtonl(pCtx, pBuf, tmp109__, 0); *pnConsumed += 4; pBuf += 4; nBuf -= 4 ; - tmp106__ = 0U; - tmp106__ |= (pSrc->antennaSelection << 0); - tmp106__ |= (pSrc->explicitCSIFeedbackTx << 1); - tmp106__ |= (pSrc->antennaIndicesFeedbackTx << 2); - tmp106__ |= (pSrc->explicitCSIFeedback << 3); - tmp106__ |= (pSrc->antennaIndicesFeedback << 4); - tmp106__ |= (pSrc->rxAS << 5); - tmp106__ |= (pSrc->txSoundingPPDUs << 6); - tmp106__ |= (pSrc->reserved5 << 7); - *pBuf = tmp106__; + tmp110__ = 0U; + tmp110__ |= (pSrc->antennaSelection << 0); + tmp110__ |= (pSrc->explicitCSIFeedbackTx << 1); + tmp110__ |= (pSrc->antennaIndicesFeedbackTx << 2); + tmp110__ |= (pSrc->explicitCSIFeedback << 3); + tmp110__ |= (pSrc->antennaIndicesFeedback << 4); + tmp110__ |= (pSrc->rxAS << 5); + tmp110__ |= (pSrc->txSoundingPPDUs << 6); + tmp110__ |= (pSrc->reserved5 << 7); + *pBuf = tmp110__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16492,9 +17016,9 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp107__; - uint16_t tmp108__; - uint16_t tmp109__; + uint8_t tmp111__; + uint16_t tmp112__; + uint16_t tmp113__; nNeeded += (pSrc->num_rsvd + 22); while (pSrc->present) { if (nNeeded > nBuf) @@ -16506,35 +17030,35 @@ uint32_t dot11f_pack_ie_ht_info(tpAniSirGlobal pCtx, *pBuf = pSrc->primaryChannel; *pnConsumed += 1; pBuf += 1; - tmp107__ = 0U; - tmp107__ |= (pSrc->secondaryChannelOffset << 0); - tmp107__ |= (pSrc->recommendedTxWidthSet << 2); - tmp107__ |= (pSrc->rifsMode << 3); - tmp107__ |= (pSrc->controlledAccessOnly << 4); - tmp107__ |= (pSrc->serviceIntervalGranularity << 5); - *pBuf = tmp107__; + tmp111__ = 0U; + tmp111__ |= (pSrc->secondaryChannelOffset << 0); + tmp111__ |= (pSrc->recommendedTxWidthSet << 2); + tmp111__ |= (pSrc->rifsMode << 3); + tmp111__ |= (pSrc->controlledAccessOnly << 4); + tmp111__ |= (pSrc->serviceIntervalGranularity << 5); + *pBuf = tmp111__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp108__ = 0U; - tmp108__ |= (pSrc->opMode << 0); - tmp108__ |= (pSrc->nonGFDevicesPresent << 2); - tmp108__ |= (pSrc->transmitBurstLimit << 3); - tmp108__ |= (pSrc->obssNonHTStaPresent << 4); - tmp108__ |= (pSrc->reserved << 5); - frameshtons(pCtx, pBuf, tmp108__, 0); + tmp112__ = 0U; + tmp112__ |= (pSrc->opMode << 0); + tmp112__ |= (pSrc->nonGFDevicesPresent << 2); + tmp112__ |= (pSrc->transmitBurstLimit << 3); + tmp112__ |= (pSrc->obssNonHTStaPresent << 4); + tmp112__ |= (pSrc->reserved << 5); + frameshtons(pCtx, pBuf, tmp112__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; - tmp109__ = 0U; - tmp109__ |= (pSrc->basicSTBCMCS << 0); - tmp109__ |= (pSrc->dualCTSProtection << 7); - tmp109__ |= (pSrc->secondaryBeacon << 8); - tmp109__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); - tmp109__ |= (pSrc->pcoActive << 10); - tmp109__ |= (pSrc->pcoPhase << 11); - tmp109__ |= (pSrc->reserved2 << 12); - frameshtons(pCtx, pBuf, tmp109__, 0); + tmp113__ = 0U; + tmp113__ |= (pSrc->basicSTBCMCS << 0); + tmp113__ |= (pSrc->dualCTSProtection << 7); + tmp113__ |= (pSrc->secondaryBeacon << 8); + tmp113__ |= (pSrc->lsigTXOPProtectionFullSupport << 9); + tmp113__ |= (pSrc->pcoActive << 10); + tmp113__ |= (pSrc->pcoPhase << 11); + tmp113__ |= (pSrc->reserved2 << 12); + frameshtons(pCtx, pBuf, tmp113__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -16626,9 +17150,9 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp110__; - uint8_t tmp111__; - uint8_t tmp112__; + uint8_t tmp114__; + uint8_t tmp115__; + uint8_t tmp116__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16643,12 +17167,12 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, *pBuf = pSrc->token; *pnConsumed += 1; pBuf += 1; - tmp110__ = 0U; - tmp110__ |= (pSrc->late << 0); - tmp110__ |= (pSrc->incapable << 1); - tmp110__ |= (pSrc->refused << 2); - tmp110__ |= (pSrc->unused << 3); - *pBuf = tmp110__; + tmp114__ = 0U; + tmp114__ |= (pSrc->late << 0); + tmp114__ |= (pSrc->incapable << 1); + tmp114__ |= (pSrc->refused << 2); + tmp114__ |= (pSrc->unused << 3); + *pBuf = tmp114__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16667,14 +17191,14 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Basic.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp111__ = 0U; - tmp111__ |= (pSrc->report.Basic.bss << 0); - tmp111__ |= (pSrc->report.Basic.ofdm_preamble << 1); - tmp111__ |= (pSrc->report.Basic.unid_signal << 2); - tmp111__ |= (pSrc->report.Basic.rader << 3); - tmp111__ |= (pSrc->report.Basic.unmeasured << 4); - tmp111__ |= (pSrc->report.Basic.unused << 5); - *pBuf = tmp111__; + tmp115__ = 0U; + tmp115__ |= (pSrc->report.Basic.bss << 0); + tmp115__ |= (pSrc->report.Basic.ofdm_preamble << 1); + tmp115__ |= (pSrc->report.Basic.unid_signal << 2); + tmp115__ |= (pSrc->report.Basic.rader << 3); + tmp115__ |= (pSrc->report.Basic.unmeasured << 4); + tmp115__ |= (pSrc->report.Basic.unused << 5); + *pBuf = tmp115__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16741,10 +17265,10 @@ uint32_t dot11f_pack_ie_measurement_report(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->report.Beacon.meas_duration, 0); *pnConsumed += 2; pBuf += 2; - tmp112__ = 0U; - tmp112__ |= (pSrc->report.Beacon.condensed_PHY << 0); - tmp112__ |= (pSrc->report.Beacon.reported_frame_type << 7); - *pBuf = tmp112__; + tmp116__ = 0U; + tmp116__ |= (pSrc->report.Beacon.condensed_PHY << 0); + tmp116__ |= (pSrc->report.Beacon.reported_frame_type << 7); + *pBuf = tmp116__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16793,7 +17317,7 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp113__; + uint8_t tmp117__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_measurement_request(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16808,14 +17332,14 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, *pBuf = pSrc->measurement_token; *pnConsumed += 1; pBuf += 1; - tmp113__ = 0U; - tmp113__ |= (pSrc->parallel << 0); - tmp113__ |= (pSrc->enable << 1); - tmp113__ |= (pSrc->request << 2); - tmp113__ |= (pSrc->report << 3); - tmp113__ |= (pSrc->durationMandatory << 4); - tmp113__ |= (pSrc->unused << 5); - *pBuf = tmp113__; + tmp117__ = 0U; + tmp117__ |= (pSrc->parallel << 0); + tmp117__ |= (pSrc->enable << 1); + tmp117__ |= (pSrc->request << 2); + tmp117__ |= (pSrc->report << 3); + tmp117__ |= (pSrc->durationMandatory << 4); + tmp117__ |= (pSrc->unused << 5); + *pBuf = tmp117__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -16883,6 +17407,33 @@ uint32_t dot11f_pack_ie_measurement_request(tpAniSirGlobal pCtx, FFS_measurement_requestBeacon, IES_measurement_requestBeacon); break; + case 8: + *pBuf = pSrc->measurement_request.lci.loc_subject; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_measurement_requestlci, + IES_measurement_requestlci); + break; + case 16: + frameshtons(pCtx, pBuf, pSrc->measurement_request.ftmrr.random_interval, 0); + *pnConsumed += 2; + pBuf += 2; + *pBuf = pSrc->measurement_request.ftmrr.min_ap_count; + *pnConsumed += 1; + pBuf += 1; + status = pack_core(pCtx, + (uint8_t *)pSrc, + pBuf, + nBuf, + pnConsumed, + FFS_measurement_requestftmrr, + IES_measurement_requestftmrr); + break; } break; } @@ -16902,7 +17453,7 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp114__; + uint8_t tmp118__; nNeeded += 3; while (pSrc->present) { if (nNeeded > nBuf) @@ -16914,11 +17465,11 @@ uint32_t dot11f_pack_ie_mobility_domain(tpAniSirGlobal pCtx, frameshtons(pCtx, pBuf, pSrc->MDID, 0); *pnConsumed += 2; pBuf += 2; - tmp114__ = 0U; - tmp114__ |= (pSrc->overDSCap << 0); - tmp114__ |= (pSrc->resourceReqCap << 1); - tmp114__ |= (pSrc->reserved << 2); - *pBuf = tmp114__; + tmp118__ = 0U; + tmp118__ |= (pSrc->overDSCap << 0); + tmp118__ |= (pSrc->resourceReqCap << 1); + tmp118__ |= (pSrc->reserved << 2); + *pBuf = tmp118__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -16940,8 +17491,8 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp115__; - uint8_t tmp116__; + uint8_t tmp119__; + uint8_t tmp120__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_ie_neighbor_report(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -16956,24 +17507,24 @@ uint32_t dot11f_pack_ie_neighbor_report(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->bssid, 6); *pnConsumed += 6; pBuf += 6; - tmp115__ = 0U; - tmp115__ |= (pSrc->APReachability << 0); - tmp115__ |= (pSrc->Security << 2); - tmp115__ |= (pSrc->KeyScope << 3); - tmp115__ |= (pSrc->SpecMgmtCap << 4); - tmp115__ |= (pSrc->QosCap << 5); - tmp115__ |= (pSrc->apsd << 6); - tmp115__ |= (pSrc->rrm << 7); - *pBuf = tmp115__; + tmp119__ = 0U; + tmp119__ |= (pSrc->APReachability << 0); + tmp119__ |= (pSrc->Security << 2); + tmp119__ |= (pSrc->KeyScope << 3); + tmp119__ |= (pSrc->SpecMgmtCap << 4); + tmp119__ |= (pSrc->QosCap << 5); + tmp119__ |= (pSrc->apsd << 6); + tmp119__ |= (pSrc->rrm << 7); + *pBuf = tmp119__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp116__ = 0U; - tmp116__ |= (pSrc->DelayedBA << 0); - tmp116__ |= (pSrc->ImmBA << 1); - tmp116__ |= (pSrc->MobilityDomain << 2); - tmp116__ |= (pSrc->reserved << 3); - *pBuf = tmp116__; + tmp120__ = 0U; + tmp120__ |= (pSrc->DelayedBA << 0); + tmp120__ |= (pSrc->ImmBA << 1); + tmp120__ |= (pSrc->MobilityDomain << 2); + tmp120__ |= (pSrc->reserved << 3); + *pBuf = tmp120__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -17061,7 +17612,7 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp117__; + uint8_t tmp121__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17070,12 +17621,12 @@ uint32_t dot11f_pack_ie_operating_mode(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp117__ = 0U; - tmp117__ |= (pSrc->chanWidth << 0); - tmp117__ |= (pSrc->reserved << 2); - tmp117__ |= (pSrc->rxNSS << 4); - tmp117__ |= (pSrc->rxNSSType << 7); - *pBuf = tmp117__; + tmp121__ = 0U; + tmp121__ |= (pSrc->chanWidth << 0); + tmp121__ |= (pSrc->reserved << 2); + tmp121__ |= (pSrc->rxNSS << 4); + tmp121__ |= (pSrc->rxNSSType << 7); + *pBuf = tmp121__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17550,7 +18101,7 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp118__; + uint8_t tmp122__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17559,13 +18110,13 @@ uint32_t dot11f_pack_ie_pu_buffer_status(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp118__ = 0U; - tmp118__ |= (pSrc->ac_bk_traffic_aval << 0); - tmp118__ |= (pSrc->ac_be_traffic_aval << 1); - tmp118__ |= (pSrc->ac_vi_traffic_aval << 2); - tmp118__ |= (pSrc->ac_vo_traffic_aval << 3); - tmp118__ |= (pSrc->reserved << 4); - *pBuf = tmp118__; + tmp122__ = 0U; + tmp122__ |= (pSrc->ac_bk_traffic_aval << 0); + tmp122__ |= (pSrc->ac_be_traffic_aval << 1); + tmp122__ |= (pSrc->ac_vi_traffic_aval << 2); + tmp122__ |= (pSrc->ac_vo_traffic_aval << 3); + tmp122__ |= (pSrc->reserved << 4); + *pBuf = tmp122__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17721,7 +18272,7 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp119__; + uint8_t tmp123__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17730,13 +18281,13 @@ uint32_t dot11f_pack_ie_qos_caps_ap(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp119__ = 0U; - tmp119__ |= (pSrc->count << 0); - tmp119__ |= (pSrc->qack << 4); - tmp119__ |= (pSrc->qreq << 5); - tmp119__ |= (pSrc->txopreq << 6); - tmp119__ |= (pSrc->reserved << 7); - *pBuf = tmp119__; + tmp123__ = 0U; + tmp123__ |= (pSrc->count << 0); + tmp123__ |= (pSrc->qack << 4); + tmp123__ |= (pSrc->qreq << 5); + tmp123__ |= (pSrc->txopreq << 6); + tmp123__ |= (pSrc->reserved << 7); + *pBuf = tmp123__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -17758,7 +18309,7 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp120__; + uint8_t tmp124__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -17767,15 +18318,15 @@ uint32_t dot11f_pack_ie_qos_caps_station(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp120__ = 0U; - tmp120__ |= (pSrc->acvo_uapsd << 0); - tmp120__ |= (pSrc->acvi_uapsd << 1); - tmp120__ |= (pSrc->acbk_uapsd << 2); - tmp120__ |= (pSrc->acbe_uapsd << 3); - tmp120__ |= (pSrc->qack << 4); - tmp120__ |= (pSrc->max_sp_length << 5); - tmp120__ |= (pSrc->more_data_ack << 7); - *pBuf = tmp120__; + tmp124__ = 0U; + tmp124__ |= (pSrc->acvo_uapsd << 0); + tmp124__ |= (pSrc->acvi_uapsd << 1); + tmp124__ |= (pSrc->acbk_uapsd << 2); + tmp124__ |= (pSrc->acbe_uapsd << 3); + tmp124__ |= (pSrc->qack << 4); + tmp124__ |= (pSrc->max_sp_length << 5); + tmp124__ |= (pSrc->more_data_ack << 7); + *pBuf = tmp124__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18412,7 +18963,7 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint16_t tmp121__; + uint16_t tmp125__; uint32_t status = DOT11F_PARSE_SUCCESS; status = dot11f_get_packed_iewapi(pCtx, pSrc, &nNeeded); if (!DOT11F_SUCCEEDED(status)) @@ -18442,10 +18993,10 @@ uint32_t dot11f_pack_ie_wapi(tpAniSirGlobal pCtx, DOT11F_MEMCPY(pCtx, pBuf, pSrc->multicast_cipher_suite, 4); *pnConsumed += 4; pBuf += 4; - tmp121__ = 0U; - tmp121__ |= (pSrc->preauth << 0); - tmp121__ |= (pSrc->reserved << 1); - frameshtons(pCtx, pBuf, tmp121__, 0); + tmp125__ = 0U; + tmp125__ |= (pSrc->preauth << 0); + tmp125__ |= (pSrc->reserved << 1); + frameshtons(pCtx, pBuf, tmp125__, 0); *pnConsumed += 2; pBuf += 2; nBuf -= 2 ; @@ -18585,7 +19136,7 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp122__; + uint8_t tmp126__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18607,13 +19158,13 @@ uint32_t dot11f_pack_ie_wmm_caps(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp122__ = 0U; - tmp122__ |= (pSrc->reserved << 0); - tmp122__ |= (pSrc->qack << 4); - tmp122__ |= (pSrc->queue_request << 5); - tmp122__ |= (pSrc->txop_request << 6); - tmp122__ |= (pSrc->more_ack << 7); - *pBuf = tmp122__; + tmp126__ = 0U; + tmp126__ |= (pSrc->reserved << 0); + tmp126__ |= (pSrc->qack << 4); + tmp126__ |= (pSrc->queue_request << 5); + tmp126__ |= (pSrc->txop_request << 6); + tmp126__ |= (pSrc->more_ack << 7); + *pBuf = tmp126__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18635,7 +19186,7 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp123__; + uint8_t tmp127__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18657,11 +19208,11 @@ uint32_t dot11f_pack_ie_wmm_info_ap(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp123__ = 0U; - tmp123__ |= (pSrc->param_set_count << 0); - tmp123__ |= (pSrc->reserved << 4); - tmp123__ |= (pSrc->uapsd << 7); - *pBuf = tmp123__; + tmp127__ = 0U; + tmp127__ |= (pSrc->param_set_count << 0); + tmp127__ |= (pSrc->reserved << 4); + tmp127__ |= (pSrc->uapsd << 7); + *pBuf = tmp127__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18683,7 +19234,7 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp124__; + uint8_t tmp128__; nNeeded += 2; while (pSrc->present) { if (nNeeded > nBuf) @@ -18705,15 +19256,15 @@ uint32_t dot11f_pack_ie_wmm_info_station(tpAniSirGlobal pCtx, *pBuf = pSrc->version; *pnConsumed += 1; pBuf += 1; - tmp124__ = 0U; - tmp124__ |= (pSrc->acvo_uapsd << 0); - tmp124__ |= (pSrc->acvi_uapsd << 1); - tmp124__ |= (pSrc->acbk_uapsd << 2); - tmp124__ |= (pSrc->acbe_uapsd << 3); - tmp124__ |= (pSrc->reserved1 << 4); - tmp124__ |= (pSrc->max_sp_length << 5); - tmp124__ |= (pSrc->reserved2 << 7); - *pBuf = tmp124__; + tmp128__ = 0U; + tmp128__ |= (pSrc->acvo_uapsd << 0); + tmp128__ |= (pSrc->acvi_uapsd << 1); + tmp128__ |= (pSrc->acbk_uapsd << 2); + tmp128__ |= (pSrc->acbe_uapsd << 3); + tmp128__ |= (pSrc->reserved1 << 4); + tmp128__ |= (pSrc->max_sp_length << 5); + tmp128__ |= (pSrc->reserved2 << 7); + *pBuf = tmp128__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -18735,14 +19286,14 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp125__; - uint8_t tmp126__; - uint8_t tmp127__; - uint8_t tmp128__; uint8_t tmp129__; uint8_t tmp130__; uint8_t tmp131__; uint8_t tmp132__; + uint8_t tmp133__; + uint8_t tmp134__; + uint8_t tmp135__; + uint8_t tmp136__; nNeeded += 19; while (pSrc->present) { if (nNeeded > nBuf) @@ -18770,76 +19321,76 @@ uint32_t dot11f_pack_ie_wmm_params(tpAniSirGlobal pCtx, *pBuf = pSrc->reserved2; *pnConsumed += 1; pBuf += 1; - tmp125__ = 0U; - tmp125__ |= (pSrc->acbe_aifsn << 0); - tmp125__ |= (pSrc->acbe_acm << 4); - tmp125__ |= (pSrc->acbe_aci << 5); - tmp125__ |= (pSrc->unused1 << 7); - *pBuf = tmp125__; + tmp129__ = 0U; + tmp129__ |= (pSrc->acbe_aifsn << 0); + tmp129__ |= (pSrc->acbe_acm << 4); + tmp129__ |= (pSrc->acbe_aci << 5); + tmp129__ |= (pSrc->unused1 << 7); + *pBuf = tmp129__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp126__ = 0U; - tmp126__ |= (pSrc->acbe_acwmin << 0); - tmp126__ |= (pSrc->acbe_acwmax << 4); - *pBuf = tmp126__; + tmp130__ = 0U; + tmp130__ |= (pSrc->acbe_acwmin << 0); + tmp130__ |= (pSrc->acbe_acwmax << 4); + *pBuf = tmp130__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbe_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp127__ = 0U; - tmp127__ |= (pSrc->acbk_aifsn << 0); - tmp127__ |= (pSrc->acbk_acm << 4); - tmp127__ |= (pSrc->acbk_aci << 5); - tmp127__ |= (pSrc->unused2 << 7); - *pBuf = tmp127__; + tmp131__ = 0U; + tmp131__ |= (pSrc->acbk_aifsn << 0); + tmp131__ |= (pSrc->acbk_acm << 4); + tmp131__ |= (pSrc->acbk_aci << 5); + tmp131__ |= (pSrc->unused2 << 7); + *pBuf = tmp131__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp128__ = 0U; - tmp128__ |= (pSrc->acbk_acwmin << 0); - tmp128__ |= (pSrc->acbk_acwmax << 4); - *pBuf = tmp128__; + tmp132__ = 0U; + tmp132__ |= (pSrc->acbk_acwmin << 0); + tmp132__ |= (pSrc->acbk_acwmax << 4); + *pBuf = tmp132__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acbk_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp129__ = 0U; - tmp129__ |= (pSrc->acvi_aifsn << 0); - tmp129__ |= (pSrc->acvi_acm << 4); - tmp129__ |= (pSrc->acvi_aci << 5); - tmp129__ |= (pSrc->unused3 << 7); - *pBuf = tmp129__; + tmp133__ = 0U; + tmp133__ |= (pSrc->acvi_aifsn << 0); + tmp133__ |= (pSrc->acvi_acm << 4); + tmp133__ |= (pSrc->acvi_aci << 5); + tmp133__ |= (pSrc->unused3 << 7); + *pBuf = tmp133__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp130__ = 0U; - tmp130__ |= (pSrc->acvi_acwmin << 0); - tmp130__ |= (pSrc->acvi_acwmax << 4); - *pBuf = tmp130__; + tmp134__ = 0U; + tmp134__ |= (pSrc->acvi_acwmin << 0); + tmp134__ |= (pSrc->acvi_acwmax << 4); + *pBuf = tmp134__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; frameshtons(pCtx, pBuf, pSrc->acvi_txoplimit, 0); *pnConsumed += 2; pBuf += 2; - tmp131__ = 0U; - tmp131__ |= (pSrc->acvo_aifsn << 0); - tmp131__ |= (pSrc->acvo_acm << 4); - tmp131__ |= (pSrc->acvo_aci << 5); - tmp131__ |= (pSrc->unused4 << 7); - *pBuf = tmp131__; + tmp135__ = 0U; + tmp135__ |= (pSrc->acvo_aifsn << 0); + tmp135__ |= (pSrc->acvo_acm << 4); + tmp135__ |= (pSrc->acvo_aci << 5); + tmp135__ |= (pSrc->unused4 << 7); + *pBuf = tmp135__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; - tmp132__ = 0U; - tmp132__ |= (pSrc->acvo_acwmin << 0); - tmp132__ |= (pSrc->acvo_acwmax << 4); - *pBuf = tmp132__; + tmp136__ = 0U; + tmp136__ |= (pSrc->acvo_acwmin << 0); + tmp136__ |= (pSrc->acvo_acwmax << 4); + *pBuf = tmp136__; *pnConsumed += 1; pBuf += 1; nBuf -= 1 ; @@ -19434,7 +19985,7 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, uint8_t *pIeLen = 0; uint32_t nConsumedOnEntry = *pnConsumed; uint32_t nNeeded = 0U; - uint8_t tmp133__; + uint8_t tmp137__; nNeeded += 1; while (pSrc->present) { if (nNeeded > nBuf) @@ -19443,14 +19994,14 @@ uint32_t dot11f_pack_ie_ht2040_bss_coexistence(tpAniSirGlobal pCtx, ++pBuf; ++(*pnConsumed); pIeLen = pBuf; ++pBuf; ++(*pnConsumed); - tmp133__ = 0U; - tmp133__ |= (pSrc->info_request << 0); - tmp133__ |= (pSrc->forty_mhz_intolerant << 1); - tmp133__ |= (pSrc->twenty_mhz_bsswidth_req << 2); - tmp133__ |= (pSrc->obss_scan_exemption_req << 3); - tmp133__ |= (pSrc->obss_scan_exemption_grant << 4); - tmp133__ |= (pSrc->unused << 5); - *pBuf = tmp133__; + tmp137__ = 0U; + tmp137__ |= (pSrc->info_request << 0); + tmp137__ |= (pSrc->forty_mhz_intolerant << 1); + tmp137__ |= (pSrc->twenty_mhz_bsswidth_req << 2); + tmp137__ |= (pSrc->obss_scan_exemption_req << 3); + tmp137__ |= (pSrc->obss_scan_exemption_grant << 4); + tmp137__ |= (pSrc->unused << 5); + *pBuf = tmp137__; *pnConsumed += 1; /* fieldsEndFlag = 1 */ nBuf -= 1 ; @@ -20497,14 +21048,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, for (i = 0; i < countOffset; ++i) { len = 0U; switch (pIe->sig) { - case SigIeCondensedCountryStr: - status |= - dot11f_pack_ie_condensed_country_str( - pCtx, (tDot11fIECondensedCountryStr *) - (pSrc + pIe->offset + - sizeof(tDot11fIECondensedCountryStr) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeGTK: status |= dot11f_pack_ie_gtk( @@ -20537,14 +21080,6 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIER1KH_ID) * i), pBufRemaining, nBufRemaining, &len); break; - case SigIeTSFInfo: - status |= - dot11f_pack_ie_tsf_info( - pCtx, (tDot11fIETSFInfo *) - (pSrc + pIe->offset + - sizeof(tDot11fIETSFInfo) * i), - pBufRemaining, nBufRemaining, &len); - break; case SigIeAPChannelReport: status |= dot11f_pack_ie_ap_channel_report( @@ -20577,6 +21112,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEBeaconReporting) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeCondensedCountryStr: + status |= + dot11f_pack_ie_condensed_country_str( + pCtx, (tDot11fIECondensedCountryStr *) + (pSrc + pIe->offset + + sizeof(tDot11fIECondensedCountryStr) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeMeasurementPilot: status |= dot11f_pack_ie_measurement_pilot( @@ -20665,6 +21208,14 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIETSDelay) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeTSFInfo: + status |= + dot11f_pack_ie_tsf_info( + pCtx, (tDot11fIETSFInfo *) + (pSrc + pIe->offset + + sizeof(tDot11fIETSFInfo) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeTSPEC: status |= dot11f_pack_ie_tspec( @@ -20737,6 +21288,46 @@ static uint32_t pack_core(tpAniSirGlobal pCtx, sizeof(tDot11fIEWiderBWChanSwitchAnn) * i), pBufRemaining, nBufRemaining, &len); break; + case SigIeazimuth_req: + status |= + dot11f_pack_ie_azimuth_req( + pCtx, (tDot11fIEazimuth_req *) + (pSrc + pIe->offset + + sizeof(tDot11fIEazimuth_req) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIemax_age: + status |= + dot11f_pack_ie_max_age( + pCtx, (tDot11fIEmax_age *) + (pSrc + pIe->offset + + sizeof(tDot11fIEmax_age) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIeneighbor_rpt: + status |= + dot11f_pack_ie_neighbor_rpt( + pCtx, (tDot11fIEneighbor_rpt *) + (pSrc + pIe->offset + + sizeof(tDot11fIEneighbor_rpt) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIereq_mac_addr: + status |= + dot11f_pack_ie_req_mac_addr( + pCtx, (tDot11fIEreq_mac_addr *) + (pSrc + pIe->offset + + sizeof(tDot11fIEreq_mac_addr) * i), + pBufRemaining, nBufRemaining, &len); + break; + case SigIetgt_mac_addr: + status |= + dot11f_pack_ie_tgt_mac_addr( + pCtx, (tDot11fIEtgt_mac_addr *) + (pSrc + pIe->offset + + sizeof(tDot11fIEtgt_mac_addr) * i), + pBufRemaining, nBufRemaining, &len); + break; case SigIeAID: status |= dot11f_pack_ie_aid( -- cgit v1.2.3 From 0f25bbb0b3a2dfbd1dbb7168a8aec34169b9d2cd Mon Sep 17 00:00:00 2001 From: Krishna Kumaar Natarajan Date: Thu, 3 Mar 2016 11:25:42 -0800 Subject: qcacld-3.0: Fix layering violation in wma_get_vht_ch_width Fix layering violation in wma_get_vht_ch_width by using macros defined in WMI instead of kernel defined macros. Use WMI_VHT_CAP_CH_WIDTH_160MHZ and WMI_VHT_CAP_CH_WIDTH_80P80_160MHZ instead of kernel defined macros. Change-Id: I7d389c21d8c16fd9528cd06d98f2ec84b84aadf7 CRs-Fixed: 985099 --- core/wma/src/wma_utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c index 7816236f9c4d..516bc47ae369 100644 --- a/core/wma/src/wma_utils.c +++ b/core/wma/src/wma_utils.c @@ -3379,11 +3379,9 @@ uint32_t wma_get_vht_ch_width(void) if (NULL == wm_hdl) return fw_ch_wd; - if (wm_hdl->vht_cap_info & - IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ) + if (wm_hdl->vht_cap_info & WMI_VHT_CAP_CH_WIDTH_160MHZ) fw_ch_wd = WNI_CFG_VHT_CHANNEL_WIDTH_160MHZ; - else if (wm_hdl->vht_cap_info & - IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ) + else if (wm_hdl->vht_cap_info & WMI_VHT_CAP_CH_WIDTH_80P80_160MHZ) fw_ch_wd = WNI_CFG_VHT_CHANNEL_WIDTH_80_PLUS_80MHZ; return fw_ch_wd; -- cgit v1.2.3 From 7d3bc3e5001d44d6b5afa40bc16cf2f34728c509 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Wed, 3 Feb 2016 17:45:01 +0530 Subject: qcacld-3.0: Retry Auth from host in case ack is not received for Auth qcacld-2.0 to qcacld-3.0 propagation In few APs with power save feature, if no STA is connected, the AP does not respond to the Auth from STA, unless Auth is sent near to the AP's CT window. With current implementation host does not retry the auth and wait for the auth timeout to happen before returning connect failure. With this change Host will retry the Auth frame with interval of 3/5 * beacon interval, if no Ack is received for the frame, until the auth timeout happens. This increases the probability for the Auth to be received by AP near to its beacon and thus initiate the connection. CRs-Fixed: 816177 Change-Id: I51a6032f910b32eb91d67cb078e6434016ae8650 --- core/mac/inc/ani_global.h | 17 +++++ core/mac/src/include/sir_params.h | 1 + core/mac/src/pe/lim/lim_ft.c | 2 +- core/mac/src/pe/lim/lim_process_auth_frame.c | 64 ++++++++++------ core/mac/src/pe/lim/lim_process_message_queue.c | 1 + core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 86 +++++++++++++++++++++- core/mac/src/pe/lim/lim_security_utils.c | 9 +++ core/mac/src/pe/lim/lim_send_management_frames.c | 72 ++++++++++++++---- core/mac/src/pe/lim/lim_timer_utils.c | 48 ++++++++++++ core/mac/src/pe/lim/lim_timer_utils.h | 3 +- core/mac/src/pe/lim/lim_trace.c | 1 + core/mac/src/pe/lim/lim_types.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 5 ++ core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 1 + 14 files changed, 271 insertions(+), 41 deletions(-) diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index db0618a5ea28..8f68465306b0 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -324,6 +324,7 @@ typedef struct sLimTimers { * for a period of time on a particular DFS channel */ TX_TIMER gLimActiveToPassiveChannelTimer; + TX_TIMER g_lim_periodic_auth_retry_timer; /* ********************TIMER SECTION ENDS************************************************** */ /* ALL THE FIELDS BELOW THIS CAN BE ZEROED OUT in lim_initialize */ @@ -962,6 +963,21 @@ typedef struct sHalMacStartParameters { } tHalMacStartParameters; +/** + * enum auth_tx_ack_status - Indicate TX status of AUTH + * @LIM_AUTH_ACK_NOT_RCD : Default status while waiting for ack status. + * @LIM_AUTH_ACK_RCD_SUCCESS : Ack is received. + * @LIM_AUTH_ACK_RCD_FAILURE : No Ack received. + * + * Indicate if driver is waiting for ACK status of auth or ACK received for AUTH + * OR NO ACK is received for the auth sent. + */ +enum auth_tx_ack_status { + LIM_AUTH_ACK_NOT_RCD, + LIM_AUTH_ACK_RCD_SUCCESS, + LIM_AUTH_ACK_RCD_FAILURE, +}; + /* ------------------------------------------------------------------- */ /* / MAC Sirius parameter structure */ typedef struct sAniSirGlobal { @@ -1030,6 +1046,7 @@ typedef struct sAniSirGlobal { sir_mgmt_frame_ind_callback mgmt_frame_ind_cb; bool first_scan_done; int8_t first_scan_bucket_threshold; + enum auth_tx_ack_status auth_ack_status; } tAniSirGlobal; typedef enum { diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index 89a0505f9785..d8b64181c008 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -693,6 +693,7 @@ typedef struct sSirMbMsgP2p { #define SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE \ (SIR_LIM_TIMEOUT_MSG_START + 0x2C) +#define SIR_LIM_AUTH_RETRY_TIMEOUT (SIR_LIM_TIMEOUT_MSG_START + 0x2D) #define SIR_LIM_MSG_TYPES_END (SIR_LIM_MSG_TYPES_BEGIN+0xFF) diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index fd8cd22a4788..82f2498359e4 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -359,7 +359,7 @@ void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, lim_send_auth_mgmt_frame(pMac, &authFrame, psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId, - LIM_NO_WEP_IN_FC, psessionEntry); + LIM_NO_WEP_IN_FC, psessionEntry, false); return; diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index ce612bf9d716..5eb8084520d2 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -141,7 +141,8 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } else { /* Create entry for this STA in pre-auth list */ @@ -188,7 +189,8 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa); return; } @@ -219,7 +221,8 @@ static void lim_process_auth_shared_system_algo(tpAniSirGlobal mac_ctx, auth_node->challengeText, SIR_MAC_AUTH_CHALLENGE_LENGTH); lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); } } @@ -262,7 +265,8 @@ static void lim_process_auth_open_system_algo(tpAniSirGlobal mac_ctx, rx_auth_frm_body->authTransactionSeqNumber + 1; auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa, - LIM_NO_WEP_IN_FC, pe_session); + LIM_NO_WEP_IN_FC, + pe_session, false); } static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, @@ -427,7 +431,8 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, eSIR_MAC_UNSPEC_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } /* No Pre-auth context exists for the STA. */ @@ -466,7 +471,8 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } } else { @@ -489,7 +495,8 @@ static void lim_process_auth_frame_type1(tpAniSirGlobal mac_ctx, lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa, - LIM_NO_WEP_IN_FC, pe_session); + LIM_NO_WEP_IN_FC, + pe_session, false); return; } } @@ -671,7 +678,7 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, eSIR_MAC_AUTH_ALGO_NOT_SUPPORTED_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa, LIM_NO_WEP_IN_FC, - pe_session); + pe_session, false); return; } if (rx_auth_frm_body->type != SIR_MAC_CHALLENGE_TEXT_EID) { @@ -704,7 +711,8 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, eSIR_MAC_CHALLENGE_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa, - LIM_NO_WEP_IN_FC, pe_session); + LIM_NO_WEP_IN_FC, + pe_session, false); lim_restore_from_auth_state(mac_ctx, eSIR_SME_INVALID_WEP_DEFAULT_KEY, eSIR_MAC_UNSPEC_FAILURE_REASON, @@ -737,7 +745,8 @@ static void lim_process_auth_frame_type2(tpAniSirGlobal mac_ctx, pe_session->limMlmState)); lim_send_auth_mgmt_frame(mac_ctx, (tpSirMacAuthFrameBody)encr_auth_frame, - mac_hdr->sa, LIM_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_WEP_IN_FC, + pe_session, false); return; } @@ -768,7 +777,8 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -794,7 +804,7 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, lim_send_auth_mgmt_frame(mac_ctx, auth_frame, mac_hdr->sa, LIM_NO_WEP_IN_FC, - pe_session); + pe_session, false); return; } @@ -815,7 +825,8 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -836,7 +847,8 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, eSIR_MAC_AUTH_RSP_TIMEOUT_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); /* Delete pre-auth context of STA */ lim_delete_pre_auth_node(mac_ctx, mac_hdr->sa); return; @@ -881,7 +893,8 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_SUCCESS_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } else { lim_log(mac_ctx, LOGW, @@ -901,7 +914,8 @@ static void lim_process_auth_frame_type3(tpAniSirGlobal mac_ctx, auth_frame->authStatusCode = eSIR_MAC_CHALLENGE_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } } @@ -1147,7 +1161,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, FL("rx Auth frm with wep bit set role=%d %pM"), GET_LIM_SYSTEM_ROLE(pe_session), mac_hdr->sa); lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -1192,7 +1207,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, auth_frame.authStatusCode = eSIR_MAC_CHALLENGE_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -1219,7 +1235,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, auth_frame.authStatusCode = eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } /* Change the auth-response timeout */ @@ -1248,7 +1265,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, eSIR_MAC_AUTH_FRAME_OUT_OF_SEQ_STATUS; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -1276,7 +1294,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, auth_frame.authStatusCode = eSIR_MAC_CHALLENGE_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } @@ -1299,7 +1318,8 @@ lim_process_auth_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info, eSIR_MAC_CHALLENGE_FAILURE_STATUS; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame, - mac_hdr->sa, LIM_NO_WEP_IN_FC, pe_session); + mac_hdr->sa, LIM_NO_WEP_IN_FC, + pe_session, false); return; } if ((sir_convert_auth_frame2_struct(mac_ctx, plainbody, diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index 17073ce5b8e9..e4b1649e7bfb 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1766,6 +1766,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_DISASSOC_ACK_TIMEOUT: case SIR_LIM_DEAUTH_ACK_TIMEOUT: case SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE: + case SIR_LIM_AUTH_RETRY_TIMEOUT: /* These timeout messages are handled by MLM sub module */ lim_process_mlm_req_messages(mac_ctx, msg); break; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index a7be64004e85..6d5b78ae70da 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -66,6 +66,7 @@ static void lim_process_auth_failure_timeout(tpAniSirGlobal); static void lim_process_auth_rsp_timeout(tpAniSirGlobal, uint32_t); static void lim_process_assoc_failure_timeout(tpAniSirGlobal, uint32_t); static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal); +static void lim_process_auth_retry_timer(tpAniSirGlobal); /** * lim_process_mlm_req_messages() - process mlm request messages @@ -154,6 +155,9 @@ void lim_process_mlm_req_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case SIR_LIM_DEAUTH_ACK_TIMEOUT: lim_process_deauth_ack_timeout(mac_ctx); break; + case SIR_LIM_AUTH_RETRY_TIMEOUT: + lim_process_auth_retry_timer(mac_ctx); + break; case LIM_MLM_TSPEC_REQ: default: break; @@ -1284,25 +1288,39 @@ static void lim_process_mlm_auth_req(tpAniSirGlobal mac_ctx, uint32_t *msg) lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_AUTH_START_EVENT, session, eSIR_SUCCESS, auth_frame_body.authStatusCode); #endif - + mac_ctx->auth_ack_status = LIM_AUTH_ACK_NOT_RCD; lim_send_auth_mgmt_frame(mac_ctx, &auth_frame_body, mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, - LIM_NO_WEP_IN_FC, session); + LIM_NO_WEP_IN_FC, session, true); /* assign appropriate session_id to the timer object */ mac_ctx->lim.limTimers.gLimAuthFailureTimer.sessionId = session_id; + /* assign appropriate sessionId to the timer object */ + mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer.sessionId = + session_id; + lim_deactivate_and_change_timer(mac_ctx, eLIM_AUTH_RETRY_TIMER); /* Activate Auth failure timer */ MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, session->peSessionId, eLIM_AUTH_FAIL_TIMER)); if (tx_timer_activate(&mac_ctx->lim.limTimers.gLimAuthFailureTimer) != TX_SUCCESS) { /* Could not start Auth failure timer. */ - lim_log(mac_ctx, LOGP, + lim_log(mac_ctx, LOGE, FL("could not start Auth failure timer")); /* Cleanup as if auth timer expired */ lim_process_auth_failure_timeout(mac_ctx); + } else { + MTRACE(mac_trace(mac_ctx, TRACE_CODE_TIMER_ACTIVATE, + session->peSessionId, eLIM_AUTH_RETRY_TIMER)); + /* Activate Auth Retry timer */ + if (tx_timer_activate + (&mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer) + != TX_SUCCESS) + lim_log(mac_ctx, LOGE, + FL("could not activate Auth Retry timer")); } + return; end: qdf_mem_copy((uint8_t *) &mlm_auth_cnf.peerMacAddr, @@ -2602,6 +2620,68 @@ static void lim_process_periodic_join_probe_req_timer(tpAniSirGlobal mac_ctx) } } +/** + * lim_process_auth_retry_timer()- function to Retry Auth + * @mac_ctx:pointer to global mac + * + * Return: void + */ + +static void lim_process_auth_retry_timer(tpAniSirGlobal mac_ctx) +{ + tpPESession session_entry; + + lim_log(mac_ctx, LOG1, FL("ENTER")); + + session_entry = + pe_find_session_by_session_id(mac_ctx, + mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer.sessionId); + if (NULL == session_entry) { + lim_log(mac_ctx, LOGE, + FL("session does not exist for given SessionId : %d"), + mac_ctx->lim.limTimers. + g_lim_periodic_auth_retry_timer.sessionId); + return; + } + + if (tx_timer_running(&mac_ctx->lim.limTimers.gLimAuthFailureTimer) && + (session_entry->limMlmState == eLIM_MLM_WT_AUTH_FRAME2_STATE) && + (LIM_AUTH_ACK_RCD_SUCCESS != mac_ctx->auth_ack_status)) { + tSirMacAuthFrameBody auth_frame; + + /* + * Send the auth retry only in case we have received ack failure + * else just restart the retry timer. + */ + if (LIM_AUTH_ACK_RCD_FAILURE == mac_ctx->auth_ack_status) { + /* Prepare & send Authentication frame */ + auth_frame.authAlgoNumber = + (uint8_t) mac_ctx->lim.gpLimMlmAuthReq->authType; + auth_frame.authTransactionSeqNumber = + SIR_MAC_AUTH_FRAME_1; + auth_frame.authStatusCode = 0; + lim_log(mac_ctx, LOGW, FL("Retry Auth ")); + mac_ctx->auth_ack_status = LIM_AUTH_ACK_NOT_RCD; + lim_send_auth_mgmt_frame(mac_ctx, + &auth_frame, + mac_ctx->lim.gpLimMlmAuthReq->peerMacAddr, + LIM_NO_WEP_IN_FC, session_entry, true); + } + + lim_deactivate_and_change_timer(mac_ctx, eLIM_AUTH_RETRY_TIMER); + + /* Activate Auth Retry timer */ + if (tx_timer_activate + (&mac_ctx->lim.limTimers.g_lim_periodic_auth_retry_timer) + != TX_SUCCESS) { + lim_log(mac_ctx, LOGE, + FL("could not activate Auth Retry failure timer")); + return; + } + } + return; +} /*** lim_process_auth_retry_timer() ***/ + /** * lim_process_auth_failure_timeout() - This function is called to process Min * Channel Timeout during channel scan. diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c index 77edf9ff2842..a76eea60c45c 100644 --- a/core/mac/src/pe/lim/lim_security_utils.c +++ b/core/mac/src/pe/lim/lim_security_utils.c @@ -500,6 +500,15 @@ lim_restore_from_auth_state(tpAniSirGlobal pMac, tSirResultCodes resultCode, (pMac, TRACE_CODE_MLM_STATE, sessionEntry->peSessionId, sessionEntry->limMlmState)); + /* + * Set the auth_ack_status status flag as success as + * host have received the auth rsp and no longer auth + * retry is needed also cancel the auth rety timer + */ + pMac->auth_ack_status = LIM_AUTH_ACK_RCD_SUCCESS; + /* 'Change' timer for future activations */ + lim_deactivate_and_change_timer(pMac, eLIM_AUTH_RETRY_TIMER); + /* 'Change' timer for future activations */ lim_deactivate_and_change_timer(pMac, eLIM_AUTH_FAIL_TIMER); diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index e36f2a629d63..0b6d8bace2bb 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -2689,6 +2689,30 @@ end: } /* lim_send_reassoc_req_mgmt_frame */ +/** + * lim_auth_tx_complete_cnf()- Confirmation for auth sent over the air + * + * @mac_ctx: pointer to global mac + * @tx_complete : Sent status + * + * Return: This returns QDF_STATUS + */ + +QDF_STATUS lim_auth_tx_complete_cnf(tpAniSirGlobal mac_ctx, + uint32_t tx_complete) +{ + lim_log(mac_ctx, LOG1, + FL("tx_complete= %d"), tx_complete); + if (tx_complete) { + mac_ctx->auth_ack_status = LIM_AUTH_ACK_RCD_SUCCESS; + /* 'Change' timer for future activations */ + lim_deactivate_and_change_timer(mac_ctx, eLIM_AUTH_RETRY_TIMER); + } else { + mac_ctx->auth_ack_status = LIM_AUTH_ACK_RCD_FAILURE; + } + return QDF_STATUS_SUCCESS; +} + /** * lim_send_auth_mgmt_frame() - Send an Authentication frame * @@ -2708,7 +2732,8 @@ void lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, tpSirMacAuthFrameBody auth_frame, tSirMacAddr peer_addr, - uint8_t wep_bit, tpPESession session) + uint8_t wep_bit, + tpPESession session, bool wait_for_ack) { uint8_t *frame, *body; uint32_t frame_len = 0, body_len = 0; @@ -2727,10 +2752,12 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, sme_sessionid = session->smeSessionId; lim_log(mac_ctx, LOG1, - FL("Sending Auth seq# %d status %d (%d) to " MAC_ADDRESS_STR), + FL("Sending Auth seq# %d status %d (%d) wait_for_ack %d to " + MAC_ADDRESS_STR), auth_frame->authTransactionSeqNumber, auth_frame->authStatusCode, (auth_frame->authStatusCode == eSIR_MAC_SUCCESS_STATUS), + wait_for_ack, MAC_ADDR_ARRAY(peer_addr)); switch (auth_frame->authTransactionSeqNumber) { @@ -2959,18 +2986,37 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx, MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, session->peSessionId, mac_hdr->fc.subType)); - /* Queue Authentication frame in high priority WQ */ - qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, - TXRX_FRM_802_11_MGMT, - ANI_TXDIR_TODS, 7, lim_tx_complete, - frame, tx_flag, sme_sessionid, 0); - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - session->peSessionId, qdf_status)); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - lim_log(mac_ctx, LOGE, - FL("*** Could not send Auth frame, retCode=%X ***"), - qdf_status); + if (wait_for_ack) { + mac_ctx->auth_ack_status = LIM_AUTH_ACK_NOT_RCD; + qdf_status = wma_tx_frameWithTxComplete(mac_ctx, packet, + (uint16_t)frame_len, + TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, + 7, lim_tx_complete, frame, + lim_auth_tx_complete_cnf, + tx_flag, sme_sessionid, false, 0); + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + lim_log(mac_ctx, LOGE, + FL("*** Could not send Auth frame, retCode=%X ***"), + qdf_status); + mac_ctx->auth_ack_status = LIM_AUTH_ACK_RCD_FAILURE; + /* Pkt will be freed up by the callback */ + } + } else { + /* Queue Authentication frame in high priority WQ */ + qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len, + TXRX_FRM_802_11_MGMT, + ANI_TXDIR_TODS, 7, lim_tx_complete, + frame, tx_flag, sme_sessionid, 0); + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) + lim_log(mac_ctx, LOGE, + FL("*** Could not send Auth frame, retCode=%X ***"), + qdf_status); + } return; } diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index 14222a61f14e..bcf3c68442c4 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -50,6 +50,9 @@ #define LIM_KEEPALIVE_TIMER_MS 3000 /* Lim JoinProbeRequest Retry timer default (200)ms */ #define LIM_JOIN_PROBE_REQ_TIMER_MS 200 +/* Lim Periodic Auth Retry timer default 60 ms */ +#define LIM_AUTH_RETRY_TIMER_MS 60 + /* This timer is a periodic timer which expires at every 1 sec to convert ACTIVE DFS channel to DFS channels */ @@ -122,6 +125,18 @@ lim_create_non_ap_timers(tpAniSirGlobal pMac) return false; } + /* Send Auth frame every 60 ms */ + if ((tx_timer_create(pMac, + &pMac->lim.limTimers.g_lim_periodic_auth_retry_timer, + "Periodic AUTH Timer", + lim_timer_handler, SIR_LIM_AUTH_RETRY_TIMEOUT, + SYS_MS_TO_TICKS(LIM_AUTH_RETRY_TIMER_MS), 0, + TX_NO_ACTIVATE)) != TX_SUCCESS) { + lim_log(pMac, LOGP, + FL("could not create Periodic AUTH Timer")); + return false; + } + if (wlan_cfg_get_int(pMac, WNI_CFG_ASSOCIATION_FAILURE_TIMEOUT, &cfgValue) != eSIR_SUCCESS) lim_log(pMac, LOGP, @@ -429,6 +444,7 @@ err_timer: tx_timer_delete(&pMac->lim.limTimers.gLimAssocFailureTimer); tx_timer_delete(&pMac->lim.limTimers.gLimJoinFailureTimer); tx_timer_delete(&pMac->lim.limTimers.gLimPeriodicJoinProbeReqTimer); + tx_timer_delete(&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer); tx_timer_delete(&pMac->lim.limTimers.gLimQuietBssTimer); tx_timer_delete(&pMac->lim.limTimers.gLimQuietTimer); tx_timer_delete(&pMac->lim.limTimers.gLimChannelSwitchTimer); @@ -668,6 +684,7 @@ void lim_update_olbc_cache_timer_handler(void *pMacGlobal, uint32_t param) void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) { uint32_t val = 0; + tpPESession session_entry; MTRACE(mac_trace (pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, timerId)); @@ -799,6 +816,37 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) break; + case eLIM_AUTH_RETRY_TIMER: + + if (tx_timer_deactivate + (&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer) + != TX_SUCCESS) { + /* Could not deactivate Auth Retry Timer. */ + lim_log(pMac, LOGE, + FL("Unable to deactivate Auth Retry timer")); + } + session_entry = pe_find_session_by_session_id(pMac, + pMac->lim.limTimers. + g_lim_periodic_auth_retry_timer.sessionId); + if (NULL == session_entry) { + lim_log(pMac, LOGE, + FL("session does not exist for given SessionId : %d"), + pMac->lim.limTimers. + g_lim_periodic_auth_retry_timer.sessionId); + break; + } + /* 3/5 of the beacon interval */ + val = (session_entry->beaconParams.beaconInterval * 3) / 5; + val = SYS_MS_TO_TICKS(val); + if (tx_timer_change + (&pMac->lim.limTimers.g_lim_periodic_auth_retry_timer, + val, 0) != TX_SUCCESS) { + /* Could not change Auth Retry timer. */ + lim_log(pMac, LOGE, + FL("Unable to change Auth Retry timer")); + } + break; + case eLIM_ASSOC_FAIL_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimAssocFailureTimer) != diff --git a/core/mac/src/pe/lim/lim_timer_utils.h b/core/mac/src/pe/lim/lim_timer_utils.h index 1f1af1daafb5..50f3ef4d0899 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.h +++ b/core/mac/src/pe/lim/lim_timer_utils.h @@ -67,7 +67,8 @@ enum { eLIM_DEAUTH_ACK_TIMER, eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER, eLIM_INSERT_SINGLESHOT_NOA_TIMER, - eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE + eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE, + eLIM_AUTH_RETRY_TIMER }; #define LIM_DISASSOC_DEAUTH_ACK_TIMEOUT 500 diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c index d287ca38ea60..89d9d02b9e15 100644 --- a/core/mac/src/pe/lim/lim_trace.c +++ b/core/mac/src/pe/lim/lim_trace.c @@ -79,6 +79,7 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId) CASE_RETURN_STRING(eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER); CASE_RETURN_STRING(eLIM_INSERT_SINGLESHOT_NOA_TIMER); CASE_RETURN_STRING(eLIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE); + CASE_RETURN_STRING(eLIM_AUTH_RETRY_TIMER); default: return "UNKNOWN"; break; diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index c6067ac77ea4..616147cd8cdc 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -456,7 +456,7 @@ tSirRetStatus lim_send_probe_req_mgmt_frame(tpAniSirGlobal, tSirMacSSid *, void lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal, tSirMacAddr, tpAniSSID, short, uint8_t, tpPESession, uint8_t); void lim_send_auth_mgmt_frame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAddr, - uint8_t, tpPESession); + uint8_t, tpPESession, bool wait_for_ack); void lim_send_assoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmAssocReq *, tpPESession); void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmReassocReq *, tpPESession); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 16eabf4c7ea1..23af25a3be6e 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -625,6 +625,11 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) tx_timer_deactivate(&lim_timer->gLimPeriodicJoinProbeReqTimer); tx_timer_delete(&lim_timer->gLimPeriodicJoinProbeReqTimer); + /* Deactivate and delete Auth Retry timer. */ + tx_timer_deactivate + (&lim_timer->g_lim_periodic_auth_retry_timer); + tx_timer_delete(&lim_timer->g_lim_periodic_auth_retry_timer); + /* Deactivate and delete Association failure timer. */ tx_timer_deactivate(&lim_timer->gLimAssocFailureTimer); tx_timer_delete(&lim_timer->gLimAssocFailureTimer); diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index b249ed6d8d2a..e9adfc85fafc 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -654,6 +654,7 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg) CASE_RETURN_STRING(SIR_LIM_DISASSOC_ACK_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_DEAUTH_ACK_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT); + CASE_RETURN_STRING(SIR_LIM_AUTH_RETRY_TIMEOUT); CASE_RETURN_STRING(SIR_LIM_MSG_TYPES_END); default: -- cgit v1.2.3 From 79e7750d56c79b79daa457b35d45f16bef8a2354 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Wed, 30 Dec 2015 17:11:49 +0530 Subject: qcacld-3.0: In case ADD STA fails, clear IBSS sta entry properly qcacld-2.0 to qcacld-3.0 propagation. If ADD STA fails for IBSS, sta entry is not cleared from dphHashTable and gLimIbssPeerList. Thus if same IBSS peer tries to connect again it fails to connect as driver assume that peer is already connected as its entry is present in gLimIbssPeerList. With this change IBSS sta entry is cleared in case ADD STA fails. Change-Id: I6cc778cf74d91952dfd239d4ca62362b8e95467c CRs-Fixed: 944480 --- core/mac/src/pe/lim/lim_ibss_peer_mgmt.c | 203 +++++++++++++++++-------------- 1 file changed, 112 insertions(+), 91 deletions(-) diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c index f3814b151584..c6a14ad1df4e 100644 --- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c +++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c @@ -1044,6 +1044,105 @@ lim_ibss_sta_add(tpAniSirGlobal pMac, void *pBody, tpPESession psessionEntry) return retCode; } +/** + * __lim_ibss_search_and_delete_peer()- to cleanup the IBSS peer + * + * @mac_ptr: Pointer to Global MAC structure + * @session_entry: Session entry + * @mac_addr: Mac Address of the IBSS peer + * + * This function is called to cleanup the IBSS peer while + * operating in IBSS mode. + * + * Return: None + * + */ +static void +__lim_ibss_search_and_delete_peer(tpAniSirGlobal mac_ptr, + tpPESession session_entry, tSirMacAddr mac_addr) +{ + tLimIbssPeerNode *temp_node, *prev_node; + tLimIbssPeerNode *temp_next_node = NULL; + tpDphHashNode sta = NULL; + uint16_t peer_idx = 0; + uint16_t sta_index = 0; + uint8_t uc_ucast_sig; + uint8_t uc_bcast_sig; + + prev_node = temp_node = mac_ptr->lim.gLimIbssPeerList; + + lim_log(mac_ptr, LOG1, FL(" PEER ADDR :" MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(mac_addr)); + + /** Compare Peer */ + while (NULL != temp_node) { + temp_next_node = temp_node->next; + + /* Delete the STA with MAC address */ + if (!qdf_mem_cmp((uint8_t *) mac_addr, + (uint8_t *) &temp_node->peerMacAddr, + sizeof(tSirMacAddr))) { + sta = dph_lookup_hash_entry(mac_ptr, mac_addr, + &peer_idx, + &session_entry->dph. + dphHashTable); + if (sta) { + sta_index = sta->staIndex; + uc_ucast_sig = sta->ucUcastSig; + uc_bcast_sig = sta->ucBcastSig; + /* + * Send DEL STA only if ADD STA + * was success i.e staid is Valid. + */ + if (STA_INVALID_IDX != sta_index) + lim_del_sta(mac_ptr, sta, + false /*asynchronous */, + session_entry); + lim_delete_dph_hash_entry(mac_ptr, sta->staAddr, + peer_idx, session_entry); + lim_release_peer_idx(mac_ptr, + peer_idx, session_entry); + + /* + * Send indication to upper layers only if ADD + * STA was success i.e staid is Valid. + */ + if (STA_INVALID_IDX != sta_index) + ibss_status_chg_notify(mac_ptr, + mac_addr, sta_index, + uc_ucast_sig, uc_bcast_sig, + eWNI_SME_IBSS_PEER_DEPARTED_IND, + session_entry-> + smeSessionId); + if (temp_node == + mac_ptr->lim.gLimIbssPeerList) { + mac_ptr->lim.gLimIbssPeerList = + temp_node->next; + prev_node = + mac_ptr->lim.gLimIbssPeerList; + } else + prev_node->next = temp_node->next; + + qdf_mem_free(temp_node); + mac_ptr->lim.gLimNumIbssPeers--; + + temp_node = temp_next_node; + break; + } + } + prev_node = temp_node; + temp_node = temp_next_node; + } + /* + * if it is the last peer walking out, we better + * we set IBSS state to inactive. + */ + if (0 == mac_ptr->lim.gLimNumIbssPeers) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, + "Last STA from IBSS walked out"); + session_entry->limIbssActive = false; + } +} /* handle the response from HAL for an ADD STA request */ tSirRetStatus @@ -1055,9 +1154,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) SET_LIM_PROCESS_DEFD_MESGS(pMac, true); if (pAddStaParams == NULL) { - PELOGE(lim_log - (pMac, LOGE, FL("IBSS: ADD_STA_RSP with no body!")); - ) + lim_log(pMac, LOGE, FL("IBSS: ADD_STA_RSP with no body!")); return eSIR_FAILURE; } @@ -1065,21 +1162,22 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) dph_lookup_hash_entry(pMac, pAddStaParams->staMac, &peerIdx, &psessionEntry->dph.dphHashTable); if (pStaDs == NULL) { - PELOGE(lim_log - (pMac, LOGE, - FL("IBSS: ADD_STA_RSP for unknown MAC addr ")); - ) - lim_print_mac_addr(pMac, pAddStaParams->staMac, LOGE); + lim_log(pMac, LOGE, + FL("IBSS: ADD_STA_RSP for unknown MAC addr: " + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(pAddStaParams->staMac)); qdf_mem_free(pAddStaParams); return eSIR_FAILURE; } if (pAddStaParams->status != QDF_STATUS_SUCCESS) { - PELOGE(lim_log - (pMac, LOGE, FL("IBSS: ADD_STA_RSP error (%x) "), - pAddStaParams->status); - ) - lim_print_mac_addr(pMac, pAddStaParams->staMac, LOGE); + lim_log(pMac, LOGE, + FL("IBSS: ADD_STA_RSP error (%x) for MAC: " + MAC_ADDRESS_STR), + pAddStaParams->status, + MAC_ADDR_ARRAY(pAddStaParams->staMac)); + __lim_ibss_search_and_delete_peer(pMac, + psessionEntry, pAddStaParams->staMac); qdf_mem_free(pAddStaParams); return eSIR_FAILURE; } @@ -1091,9 +1189,7 @@ lim_ibss_add_sta_rsp(tpAniSirGlobal pMac, void *msg, tpPESession psessionEntry) pStaDs->valid = 1; pStaDs->mlmStaContext.mlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; - PELOGW(lim_log - (pMac, LOGW, FL("IBSS: sending IBSS_NEW_PEER msg to SME!")); - ) + lim_log(pMac, LOGW, FL("IBSS: sending IBSS_NEW_PEER msg to SME!")); ibss_status_chg_notify(pMac, pAddStaParams->staMac, pStaDs->staIndex, pStaDs->ucUcastSig, @@ -1271,81 +1367,6 @@ end: } } -static void -__lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac, - tpPESession psessionEntry, tSirMacAddr macAddr) -{ - tLimIbssPeerNode *pTempNode, *pPrevNode; - tLimIbssPeerNode *pTempNextNode = NULL; - tpDphHashNode pStaDs = NULL; - uint16_t peerIdx = 0; - uint16_t staIndex = 0; - uint8_t ucUcastSig; - uint8_t ucBcastSig; - - pPrevNode = pTempNode = pMac->lim.gLimIbssPeerList; - - lim_log(pMac, LOG1, FL(" PEER ADDR :" MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(macAddr)); - - /** Compare Peer */ - while (NULL != pTempNode) { - pTempNextNode = pTempNode->next; - - /* Delete the STA with MAC address */ - if (!qdf_mem_cmp((uint8_t *) macAddr, - (uint8_t *) &pTempNode->peerMacAddr, - sizeof(tSirMacAddr))) { - pStaDs = dph_lookup_hash_entry(pMac, macAddr, - &peerIdx, - &psessionEntry->dph. - dphHashTable); - if (pStaDs) { - staIndex = pStaDs->staIndex; - ucUcastSig = pStaDs->ucUcastSig; - ucBcastSig = pStaDs->ucBcastSig; - - (void)lim_del_sta(pMac, pStaDs, - false /*asynchronous */, - psessionEntry); - lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, - peerIdx, psessionEntry); - lim_release_peer_idx(pMac, peerIdx, psessionEntry); - - /* Send indication to upper layers */ - ibss_status_chg_notify(pMac, macAddr, staIndex, - ucUcastSig, ucBcastSig, - eWNI_SME_IBSS_PEER_DEPARTED_IND, - psessionEntry-> - smeSessionId); - if (pTempNode == pMac->lim.gLimIbssPeerList) { - pMac->lim.gLimIbssPeerList = - pTempNode->next; - pPrevNode = pMac->lim.gLimIbssPeerList; - } else - pPrevNode->next = pTempNode->next; - - qdf_mem_free(pTempNode); - pMac->lim.gLimNumIbssPeers--; - - pTempNode = pTempNextNode; - break; - } - } - pPrevNode = pTempNode; - pTempNode = pTempNextNode; - } - /* - * if it is the last peer walking out, we better - * we set IBSS state to inactive. - */ - if (0 == pMac->lim.gLimNumIbssPeers) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO, - "Last STA from IBSS walked out"); - psessionEntry->limIbssActive = false; - } -} - /** * lim_ibss_coalesce() * -- cgit v1.2.3 From d86d983a20435f558d98c8ef913aff00e5dfe684 Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Wed, 30 Dec 2015 17:18:13 +0530 Subject: qcacld-3.0: Remove roam cmd from roam pending list is case of disconnect qcacld-2.0 to qcacld-3.0 propagation. If back to back connect and disconnect are issued by supplicant, disconnect ends up queued at the head of roam/sme pending cmd queue due to its high priority. Thus sme processes the disconnect command before the connect command making sme and hdd out of sync. Now if unload is triggered, with hdd in disconnected state, disconnect is dropped in hdd. Thus no DEL BSS is sent before HAL STOP leading to firmware crash. This change removes the roam connect cmd from roam/sme pending list when disconnect is issued by supplicant. Change-Id: I34f192b3d549c6179ddc49bba376dbc007efa2c2 CRs-Fixed: 955178 --- core/sme/src/csr/csr_api_roam.c | 164 ++++++++++++++++++++++++---------------- 1 file changed, 99 insertions(+), 65 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 302c9ad48021..c765aeb186eb 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -2694,82 +2694,116 @@ QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, tCsr11dinfo *ps11din return QDF_STATUS_SUCCESS; } -/* pCommand may be NULL */ -/* Pass in sessionId in case pCommand is NULL. sessionId is not used in case pCommand is not NULL. */ -void csr_roam_remove_duplicate_command(tpAniSirGlobal pMac, uint32_t sessionId, - tSmeCmd *pCommand, - eCsrRoamReason eRoamReason) -{ - tListElem *pEntry, *pNextEntry; - tSmeCmd *pDupCommand; - tDblLinkList localList; +/** + * csr_roam_remove_duplicate_cmd_from_list()- Remove duplicate roam cmd from + * list + * + * @mac_ctx: pointer to global mac + * @session_id: session id for the cmd + * @list: pending list from which cmd needs to be removed + * @command: cmd to be removed, can be NULL + * @roam_reason: cmd with reason to be removed + * + * Remove duplicate command from the pending list. + * + * Return: void + */ +static void csr_roam_remove_duplicate_cmd_from_list(tpAniSirGlobal mac_ctx, + uint32_t session_id, tDblLinkList *list, + tSmeCmd *command, eCsrRoamReason roam_reason) +{ + tListElem *entry, *next_entry; + tSmeCmd *dup_cmd; + tDblLinkList local_list; - qdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { - sms_log(pMac, LOGE, FL(" failed to open list")); + qdf_mem_zero(&local_list, sizeof(tDblLinkList)); + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(mac_ctx->hHdd, &local_list))) { + sms_log(mac_ctx, LOGE, FL(" failed to open list")); return; } - csr_ll_lock(&pMac->sme.smeCmdPendingList); - pEntry = csr_ll_peek_head(&pMac->sme.smeCmdPendingList, LL_ACCESS_NOLOCK); - while (pEntry) { - pNextEntry = - csr_ll_next(&pMac->sme.smeCmdPendingList, pEntry, - LL_ACCESS_NOLOCK); - pDupCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); - /* Remove the previous command if.. */ - /* - the new roam command is for the same RoamReason... */ - /* - the new roam command is a NewProfileList. */ - /* - the new roam command is a Forced Dissoc */ - /* - the new roam command is from an 802.11 OID (OID_SSID or OID_BSSID). */ - if ((pCommand && (pCommand->sessionId == pDupCommand->sessionId) - && ((pCommand->command == pDupCommand->command) && + csr_ll_lock(list); + entry = csr_ll_peek_head(list, LL_ACCESS_NOLOCK); + while (entry) { + next_entry = csr_ll_next(list, entry, LL_ACCESS_NOLOCK); + dup_cmd = GET_BASE_ADDR(entry, tSmeCmd, Link); + /* + * Remove the previous command if.. + * - the new roam command is for the same RoamReason... + * - the new roam command is a NewProfileList. + * - the new roam command is a Forced Dissoc + * - the new roam command is from an 802.11 OID + * (OID_SSID or OID_BSSID). + */ + if ((command && (command->sessionId == dup_cmd->sessionId) && + ((command->command == dup_cmd->command) && /* * This peermac check is requried for Softap/GO - * scenarios. For STA scenario below OR check will - * suffice as pCommand will always be NULL for STA - * scenarios + * scenarios. for STA scenario below OR check will + * suffice as command will always be NULL for + * STA scenarios */ - (!qdf_mem_cmp - (pDupCommand->u.roamCmd.peerMac, - pCommand->u.roamCmd.peerMac, - QDF_MAC_ADDR_SIZE)) - && (pCommand->u.roamCmd.roamReason == - pDupCommand->u.roamCmd.roamReason - || eCsrForcedDisassoc == - pCommand->u.roamCmd.roamReason - || eCsrHddIssued == - pCommand->u.roamCmd.roamReason))) - || - /* below the pCommand is NULL */ - ((sessionId == pDupCommand->sessionId) && - (eSmeCommandRoam == pDupCommand->command) && - ((eCsrForcedDisassoc == eRoamReason) || - (eCsrHddIssued == eRoamReason)) - ) - ) { - sms_log(pMac, LOGW, FL(" roamReason = %d"), - pDupCommand->u.roamCmd.roamReason); - /* Remove the 'stale' roam command from the pending list... */ - if (csr_ll_remove_entry - (&pMac->sme.smeCmdPendingList, pEntry, - LL_ACCESS_NOLOCK)) { - csr_ll_insert_tail(&localList, pEntry, - LL_ACCESS_NOLOCK); - } + (!qdf_mem_cmp(dup_cmd->u.roamCmd.peerMac, + command->u.roamCmd.peerMac, + sizeof(QDF_MAC_ADDR_SIZE))) && + ((command->u.roamCmd.roamReason == + dup_cmd->u.roamCmd.roamReason) || + (eCsrForcedDisassoc == + command->u.roamCmd.roamReason) || + (eCsrHddIssued == + command->u.roamCmd.roamReason)))) || + /* OR if pCommand is NULL */ + ((session_id == dup_cmd->sessionId) && + (eSmeCommandRoam == dup_cmd->command) && + ((eCsrForcedDisassoc == roam_reason) || + (eCsrHddIssued == roam_reason)))) { + sms_log(mac_ctx, LOGW, FL("RoamReason = %d"), + dup_cmd->u.roamCmd.roamReason); + /* Remove the roam command from the pending list */ + if (csr_ll_remove_entry(list, entry, LL_ACCESS_NOLOCK)) + csr_ll_insert_tail(&local_list, entry, + LL_ACCESS_NOLOCK); } - pEntry = pNextEntry; + entry = next_entry; } - csr_ll_unlock(&pMac->sme.smeCmdPendingList); + csr_ll_unlock(list); - while ((pEntry = csr_ll_remove_head(&localList, LL_ACCESS_NOLOCK))) { - pDupCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); + while ((entry = csr_ll_remove_head(&local_list, LL_ACCESS_NOLOCK))) { + dup_cmd = GET_BASE_ADDR(entry, tSmeCmd, Link); /* Tell caller that the command is cancelled */ - csr_roam_call_callback(pMac, pDupCommand->sessionId, NULL, - pDupCommand->u.roamCmd.roamId, - eCSR_ROAM_CANCELLED, eCSR_ROAM_RESULT_NONE); - csr_release_command_roam(pMac, pDupCommand); + csr_roam_call_callback(mac_ctx, dup_cmd->sessionId, NULL, + dup_cmd->u.roamCmd.roamId, + eCSR_ROAM_CANCELLED, eCSR_ROAM_RESULT_NONE); + csr_release_command_roam(mac_ctx, dup_cmd); } - csr_ll_close(&localList); + csr_ll_close(&local_list); +} + +/** + * csr_roam_remove_duplicate_command()- Remove duplicate roam cmd + * from pending lists. + * + * @mac_ctx: pointer to global mac + * @session_id: session id for the cmd + * @command: cmd to be removed, can be null + * @roam_reason: cmd with reason to be removed + * + * Remove duplicate command from the sme and roam pending list. + * + * Return: void + */ +void csr_roam_remove_duplicate_command(tpAniSirGlobal mac_ctx, + uint32_t session_id, tSmeCmd *command, + eCsrRoamReason roam_reason) +{ + /* Always lock active list before locking pending lists */ + csr_ll_lock(&mac_ctx->sme.smeCmdActiveList); + csr_roam_remove_duplicate_cmd_from_list(mac_ctx, + session_id, &mac_ctx->sme.smeCmdPendingList, + command, roam_reason); + csr_roam_remove_duplicate_cmd_from_list(mac_ctx, + session_id, &mac_ctx->roam.roamCmdPendingList, + command, roam_reason); + csr_ll_unlock(&mac_ctx->sme.smeCmdActiveList); } /** -- cgit v1.2.3 From 3b6068c457cf69f12aea80ee3ec5c271cc75df57 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Thu, 14 Apr 2016 19:01:06 -0700 Subject: qcacld-3.0: Remove the file cds_regdomain_common.h Data structures defined in cds_regdomain_common.h are similar to those defined in cds_regdomain.h. Therefore remove the file. Change-Id: I929b03058e9441e4a652314789cf91dbd94d0329 CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 599 ++++++++++++++++++- core/cds/inc/cds_regdomain_common.h | 637 --------------------- core/cds/src/cds_regdomain.c | 3 +- core/hdd/inc/wlan_hdd_tdls.h | 2 +- core/hdd/src/wlan_hdd_regulatory.c | 1 - core/mac/inc/sir_api.h | 3 +- core/mac/inc/sir_mac_prot_def.h | 1 - core/mac/src/pe/lim/lim_process_sme_req_messages.c | 2 +- core/mac/src/pe/lim/lim_process_tdls.c | 4 +- core/mac/src/pe/lim/lim_send_messages.c | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 2 +- core/sap/src/sap_module.c | 2 +- core/sme/inc/csr_api.h | 4 +- core/sme/inc/sme_inside.h | 2 +- core/sme/src/common/sme_api.c | 2 +- core/sme/src/csr/csr_api_roam.c | 7 +- 17 files changed, 591 insertions(+), 684 deletions(-) delete mode 100644 core/cds/inc/cds_regdomain_common.h diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index f101f0b44e4c..519f4e874243 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -71,11 +71,223 @@ #ifndef REGULATORY_H #define REGULATORY_H +#define MAX_CHANNELS_PER_OPERATING_CLASS 25 #define CTRY_DEBUG 0x1ff #define CTRY_DEFAULT 0 #define COUNTRY_ERD_FLAG 0x8000 #define WORLDWIDE_ROAMING_FLAG 0x4000 #define DEF_REGDMN FCC3_FCCA +#define CDS_MAX_SUPP_OPER_CLASSES 32 + +enum EnumRd { + NO_ENUMRD = 0x00, + NULL1_WORLD = 0x03, + NULL1_ETSIB = 0x07, + NULL1_ETSIC = 0x08, + FCC1_FCCA = 0x10, + FCC1_WORLD = 0x11, + FCC4_FCCA = 0x12, + FCC5_FCCA = 0x13, + FCC6_FCCA = 0x14, + + FCC2_FCCA = 0x20, + FCC2_WORLD = 0x21, + FCC2_ETSIC = 0x22, + FCC6_WORLD = 0x23, + FRANCE_RES = 0x31, + FCC3_FCCA = 0x3A, + FCC3_WORLD = 0x3B, + FCC3_ETSIC = 0x3F, + + ETSI1_WORLD = 0x37, + ETSI3_ETSIA = 0x32, + ETSI2_WORLD = 0x35, + ETSI3_WORLD = 0x36, + ETSI4_WORLD = 0x30, + ETSI4_ETSIC = 0x38, + ETSI5_WORLD = 0x39, + ETSI6_WORLD = 0x34, + ETSI8_WORLD = 0x3D, + ETSI9_WORLD = 0x3E, + ETSI_RESERVED = 0x33, + + MKK1_MKKA = 0x40, + MKK1_MKKB = 0x41, + APL4_WORLD = 0x42, + MKK2_MKKA = 0x43, + APL_RESERVED = 0x44, + APL2_WORLD = 0x45, + APL2_APLC = 0x46, + APL3_WORLD = 0x47, + MKK1_FCCA = 0x48, + APL2_APLD = 0x49, + MKK1_MKKA1 = 0x4A, + MKK1_MKKA2 = 0x4B, + MKK1_MKKC = 0x4C, + APL2_FCCA = 0x4D, + APL11_FCCA = 0x4F, + + APL3_FCCA = 0x50, + APL12_WORLD = 0x51, + APL1_WORLD = 0x52, + APL1_FCCA = 0x53, + APL1_APLA = 0x54, + APL1_ETSIC = 0x55, + APL2_ETSIC = 0x56, + APL5_WORLD = 0x58, + APL13_WORLD = 0x5A, + APL6_WORLD = 0x5B, + APL7_FCCA = 0x5C, + APL8_WORLD = 0x5D, + APL9_MKKC = 0x5E, + APL10_MKKC = 0x5F, + + WOR0_WORLD = 0x60, + WOR1_WORLD = 0x61, + WOR2_WORLD = 0x62, + WOR3_WORLD = 0x63, + WOR4_WORLD = 0x64, + WOR5_ETSIC = 0x65, + + WOR01_WORLD = 0x66, + WOR02_WORLD = 0x67, + EU1_WORLD = 0x68, + + WOR9_WORLD = 0x69, + WORA_WORLD = 0x6A, + WORB_WORLD = 0x6B, + WORC_WORLD = 0x6C, + + MKK3_MKKB = 0x80, + MKK3_MKKA2 = 0x81, + MKK3_MKKC = 0x82, + + MKK4_MKKB = 0x83, + MKK4_MKKA2 = 0x84, + MKK4_MKKC = 0x85, + + MKK5_MKKB = 0x86, + MKK5_MKKA2 = 0x87, + MKK5_MKKC = 0x88, + MKK5_MKKA = 0x99, + MKK5_FCCA = 0x9A, + + MKK6_MKKB = 0x89, + MKK6_MKKA2 = 0x8A, + MKK6_MKKC = 0x8B, + + MKK7_MKKB = 0x8C, + MKK7_MKKA2 = 0x8D, + MKK7_MKKC = 0x8E, + + MKK8_MKKB = 0x8F, + MKK8_MKKA2 = 0x90, + MKK8_MKKC = 0x91, + + MKK14_MKKA1 = 0x92, + MKK15_MKKA1 = 0x93, + + MKK10_FCCA = 0xD0, + MKK10_MKKA1 = 0xD1, + MKK10_MKKC = 0xD2, + MKK10_MKKA2 = 0xD3, + + MKK11_MKKA = 0xD4, + MKK11_FCCA = 0xD5, + MKK11_MKKA1 = 0xD6, + MKK11_MKKC = 0xD7, + MKK11_MKKA2 = 0xD8, + + MKK12_MKKA = 0xD9, + MKK12_FCCA = 0xDA, + MKK12_MKKA1 = 0xDB, + MKK12_MKKC = 0xDC, + MKK12_MKKA2 = 0xDD, + + MKK13_MKKB = 0xDE, + + MKK3_MKKA = 0xF0, + MKK3_MKKA1 = 0xF1, + MKK3_FCCA = 0xF2, + MKK4_MKKA = 0xF3, + MKK4_MKKA1 = 0xF4, + MKK4_FCCA = 0xF5, + MKK9_MKKA = 0xF6, + MKK10_MKKA = 0xF7, + MKK6_MKKA1 = 0xF8, + MKK6_FCCA = 0xF9, + MKK7_MKKA1 = 0xFA, + MKK7_FCCA = 0xFB, + MKK9_FCCA = 0xFC, + MKK9_MKKA1 = 0xFD, + MKK9_MKKC = 0xFE, + MKK9_MKKA2 = 0xFF, + + APL1 = 0x0150, + APL2 = 0x0250, + APL3 = 0x0350, + APL4 = 0x0450, + APL5 = 0x0550, + APL6 = 0x0650, + APL7 = 0x0750, + APL8 = 0x0850, + APL9 = 0x0950, + APL10 = 0x1050, + APL11 = 0x1150, + APL12 = 0x1160, + + ETSI1 = 0x0130, + ETSI2 = 0x0230, + ETSI3 = 0x0330, + ETSI4 = 0x0430, + ETSI5 = 0x0530, + ETSI6 = 0x0630, + ETSI8 = 0x0830, + ETSI9 = 0x0930, + ETSIA = 0x0A30, + ETSIB = 0x0B30, + ETSIC = 0x0C30, + + FCC1 = 0x0110, + FCC2 = 0x0120, + FCC3 = 0x0160, + FCC4 = 0x0165, + FCC5 = 0x0510, + FCC6 = 0x0610, + FCCA = 0x0A10, + + APLD = 0x0D50, + + MKK1 = 0x0140, + MKK2 = 0x0240, + MKK3 = 0x0340, + MKK4 = 0x0440, + MKK5 = 0x0540, + MKK6 = 0x0640, + MKK7 = 0x0740, + MKK8 = 0x0840, + MKK9 = 0x0940, + MKK10 = 0x0B40, + MKK11 = 0x1140, + MKK12 = 0x1240, + MKK13 = 0x0C40, + MKK14 = 0x1440, + MKK15 = 0x1540, + MKKA = 0x0A40, + MKKC = 0x0A50, + + NULL1 = 0x0198, + WORLD = 0x0199, + DEBUG_REG_DMN = 0x01ff, +}; + +enum { + FCC = 0x10, + MKK = 0x40, + ETSI = 0x30, + NO_CTL = 0xff +}; + /* These defines should match the table from ah_internal.h */ enum HAL_DFS_DOMAIN { @@ -85,18 +297,11 @@ enum HAL_DFS_DOMAIN { DFS_MKK4_DOMAIN = 3 /* Japan dfs domain */ }; - -/* - * THE following table is the mapping of regdomain pairs specified by - * an 8 bit regdomain value to the individual unitary reg domains - */ - typedef struct reg_dmn_pair_mapping { - uint16_t regDmnEnum; /* 16 bit reg domain pair */ - uint16_t regDmn5GHz; /* 5GHz reg domain */ - uint16_t regDmn2GHz; /* 2GHz reg domain */ - uint16_t singleCC; /* Country code of single country if - a one-on-one mapping exists */ + uint16_t regDmnEnum; + uint16_t regDmn5GHz; + uint16_t regDmn2GHz; + uint16_t singleCC; } REG_DMN_PAIR_MAPPING; typedef struct { @@ -107,24 +312,10 @@ typedef struct { } COUNTRY_CODE_TO_ENUM_RD; typedef struct reg_domain { - uint16_t regDmnEnum; /* value from EnumRd table */ + uint16_t regDmnEnum; uint8_t conformance_test_limit; } REG_DOMAIN; -/* Multi-Device RegDomain Support */ -typedef struct ath_hal_reg_dmn_tables { - /* regDomainPairs: Map of 8-bit regdomain values to unitary reg domain */ - const REG_DMN_PAIR_MAPPING *regDomainPairs; - /* allCountries: Master list of freq. bands (flags, settings) */ - const COUNTRY_CODE_TO_ENUM_RD *allCountries; - /* regDomains: Array of supported reg domains */ - const REG_DOMAIN *regDomains; - - uint16_t regDomainPairsCt; /* Num reg domain pair entries */ - uint16_t allCountriesCt; /* Num country entries */ - uint16_t regDomainsCt; /* Num reg domain entries */ -} HAL_REG_DMN_TABLES; - enum CountryCode { CTRY_AFGHANISTAN = 4, CTRY_ALBANIA = 8, @@ -336,9 +527,271 @@ enum CountryCode { CTRY_JAPAN49 = 4049, CTRY_JAPAN55 = 4055, CTRY_JAPAN56 = 4056, +}; +typedef struct ath_hal_reg_dmn_tables { + const REG_DMN_PAIR_MAPPING *regDomainPairs; + const COUNTRY_CODE_TO_ENUM_RD *allCountries; + const REG_DOMAIN *regDomains; + uint16_t regDomainPairsCt; + uint16_t allCountriesCt; + uint16_t regDomainsCt; +} HAL_REG_DMN_TABLES; + + +static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { + {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, + {NULL1_WORLD, NULL1, WORLD, 0}, + {NULL1_ETSIB, NULL1, ETSIB, 0}, + {NULL1_ETSIC, NULL1, ETSIC, 0}, + {FCC2_FCCA, FCC2, FCCA, 0}, + {FCC2_WORLD, FCC2, WORLD, 0}, + {FCC2_ETSIC, FCC2, ETSIC, 0}, + {FCC3_FCCA, FCC3, FCCA, 0}, + {FCC3_WORLD, FCC3, WORLD, 0}, + {FCC3_ETSIC, FCC3, ETSIC, 0}, + {FCC4_FCCA, FCC4, FCCA, 0}, + {FCC5_FCCA, FCC5, FCCA, 0}, + {FCC6_FCCA, FCC6, FCCA, 0}, + {FCC6_WORLD, FCC6, WORLD, 0}, + {ETSI1_WORLD, ETSI1, WORLD, 0}, + {ETSI2_WORLD, ETSI2, WORLD, 0}, + {ETSI3_WORLD, ETSI3, WORLD, 0}, + {ETSI4_WORLD, ETSI4, WORLD, 0}, + {ETSI5_WORLD, ETSI5, WORLD, 0}, + {ETSI6_WORLD, ETSI6, WORLD, 0}, + {ETSI8_WORLD, ETSI8, WORLD, 0}, + {ETSI9_WORLD, ETSI9, WORLD, 0}, + {ETSI3_ETSIA, ETSI3, WORLD, 0}, + {FRANCE_RES, ETSI3, WORLD, 0}, + {FCC1_WORLD, FCC1, WORLD, 0}, + {FCC1_FCCA, FCC1, FCCA, 0}, + {APL1_WORLD, APL1, WORLD, 0}, + {APL2_WORLD, APL2, WORLD, 0}, + {APL2_FCCA, APL2, FCCA, 0}, + {APL3_WORLD, APL3, WORLD, 0}, + {APL4_WORLD, APL4, WORLD, 0}, + {APL5_WORLD, APL5, WORLD, 0}, + {APL6_WORLD, APL6, WORLD, 0}, + {APL7_FCCA, APL7, FCCA, 0}, + {APL8_WORLD, APL8, WORLD, 0}, + {APL9_MKKC, APL9, MKKC, 0}, + {APL10_MKKC, APL10, MKKC, 0}, + {APL3_FCCA, APL3, FCCA, 0}, + {APL1_ETSIC, APL1, ETSIC, 0}, + {APL2_ETSIC, APL2, ETSIC, 0}, + {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, + {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, + {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, + {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, + {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, + {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, + {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, + {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, + {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, + {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, + {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, + {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, + {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, + {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, + {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, + {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, + {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, + {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, + {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, + {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, + {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, + {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, + {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, + {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, + {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, + {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, + {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, + {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, + {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, + {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, + {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, + + {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, + {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, + {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, + {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, + {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, + {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, + {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, + {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, + {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, + {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, + {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, + {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, + {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, }; +static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { + {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, + {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, + {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, + {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, + {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, + {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, + {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, + {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, + {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, + {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, + {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, + {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, + {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, + {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, + {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, + {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, + {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, + {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, + {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, + {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, + {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, + {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, + {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, + {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, + {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, + {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, + {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, + {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, + {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, + {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, + {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, + {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, + {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, + {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, + {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, + {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, + {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, + {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, + {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, + {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, + {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, + {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, + {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, + {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, + {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, + {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, + {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, + {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, + {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, + {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, + {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, + {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, + {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, + {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, + {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, + {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, + {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, + {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, + {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, + {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, + {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, + {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, + {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, + {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, + {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, + {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, + {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, + {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, + {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, + {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, + {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, + {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, + {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, + {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, + {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, + {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, + {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, + {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, + {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, + {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, + {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, + {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, + {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, + {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, + {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, + {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, + {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, + {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, + {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, + {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, + {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, + {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, + {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, + {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, + {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, + {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, + {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, + {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, + {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, + {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, + {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, + {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, + {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, + {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, + {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, + {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, + {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, + {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, + {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, + {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, + {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, + {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, + {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, + {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, + {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, + {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, + {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, + {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, + {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, + {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, + {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, + {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, + {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, + {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, + {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, + {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, + {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, + {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, + {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, + {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, + {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, + {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, + {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, + {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, + {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, + {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, + {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, + {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, + {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, + {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, + {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, + {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, + {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, + {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, + {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, + {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, + {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, + {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, + {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, + {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, + {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, + {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, + {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, + {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, + {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, + {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, + {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, + {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} +}; /** * enum ch_width - channel width @@ -372,6 +825,93 @@ struct ch_params_s { uint8_t center_freq_seg1; }; +static const REG_DOMAIN ah_cmn_reg_domains[] = { + {DEBUG_REG_DMN, FCC}, + {APL1, FCC}, + {APL2, FCC}, + {APL3, FCC}, + {APL4, FCC}, + {APL5, FCC}, + {APL6, ETSI}, + {APL7, FCC}, + {APL8, ETSI}, + {APL9, ETSI}, + {APL10, ETSI}, + {APL11, ETSI}, + {APL12, ETSI}, + {ETSI1, ETSI}, + {ETSI2, ETSI}, + {ETSI3, ETSI}, + {ETSI4, ETSI}, + {ETSI5, ETSI}, + {ETSI6, ETSI}, + {ETSI8, ETSI}, + {ETSI9, ETSI}, + {FCC1, FCC}, + {FCC2, FCC}, + {FCC3, FCC}, + {FCC4, FCC}, + {FCC5, FCC}, + {FCC6, FCC}, + {MKK1, MKK}, + {MKK2, MKK}, + {MKK3, MKK}, + {MKK4, MKK}, + {MKK5, MKK}, + {MKK6, MKK}, + {MKK7, MKK}, + {MKK8, MKK}, + {MKK9, MKK}, + {MKK10, MKK}, + {MKK11, MKK}, + {MKK12, MKK}, + {MKK13, MKK}, + {MKK14, MKK}, + {MKK15, MKK}, + {APLD, NO_CTL}, + {ETSIA, NO_CTL}, + {ETSIB, ETSI}, + {ETSIC, ETSI}, + {FCCA, FCC}, + {MKKA, MKK}, + {MKKC, MKK}, + {WORLD, ETSI}, + {WOR0_WORLD, NO_CTL}, + {WOR01_WORLD, NO_CTL}, + {WOR02_WORLD, NO_CTL}, + {EU1_WORLD, NO_CTL}, + {WOR1_WORLD, NO_CTL}, + {WOR2_WORLD, NO_CTL}, + {WOR3_WORLD, NO_CTL}, + {WOR4_WORLD, NO_CTL}, + {WOR5_ETSIC, NO_CTL}, + {WOR9_WORLD, NO_CTL}, + {WORA_WORLD, NO_CTL}, + {WORB_WORLD, NO_CTL}, + {WORC_WORLD, NO_CTL}, + {NULL1, NO_CTL}, +}; + +typedef enum offset { + BW20 = 0, + BW40_LOW_PRIMARY = 1, + BW40_HIGH_PRIMARY = 3, + BW80, + BWALL +} offset_t; + +typedef struct _regdm_op_class_map { + uint8_t op_class; + uint8_t ch_spacing; + offset_t offset; + uint8_t channels[MAX_CHANNELS_PER_OPERATING_CLASS]; +} regdm_op_class_map_t; + +typedef struct _regdm_supp_op_classes { + uint8_t num_classes; + uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES]; +} regdm_supp_op_classes; + int32_t cds_fill_some_regulatory_info(struct regulatory *reg); void cds_fill_and_send_ctl_to_fw(struct regulatory *reg); @@ -381,4 +921,11 @@ void cds_set_wma_dfs_region(uint8_t dfs_region); void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, struct ch_params_s *ch_params); +uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, + uint8_t offset); +uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel, + uint8_t opclass); +uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class); +uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class); + #endif /* REGULATORY_H */ diff --git a/core/cds/inc/cds_regdomain_common.h b/core/cds/inc/cds_regdomain_common.h deleted file mode 100644 index 02ab52207a21..000000000000 --- a/core/cds/inc/cds_regdomain_common.h +++ /dev/null @@ -1,637 +0,0 @@ -/* - * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved. - * - * Previously licensed under the ISC license by Qualcomm Atheros, Inc. - * - * - * Permission to use, copy, modify, and/or distribute this software for - * any purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * This file was originally distributed by Qualcomm Atheros, Inc. - * under proprietary terms before Copyright ownership was assigned - * to the Linux Foundation. - */ - -/* - * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting - * Copyright (c) 2005-2011 Atheros Communications, Inc. - * 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 above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $FreeBSD: release/9.0.0/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h 224226 2011-07-20 12:46:58Z adrian $ - */ -/* - * This module contains the common regulatory domain database tables: - * - * - reg domain enum constants - * - reg domain enum to reg domain pair mappings - * - country to regdomain mappings - * - channel tag enums and the frequency-to-frequency band mappings - * for all the modes - * - * "The country table and respective Regulatory Domain channel and power - * settings are based on available knowledge as of software release. The - * underlying global regulatory and spectrum rules change on a regular basis, - * therefore, no warranty is given that the channel and power information - * herein is complete, accurate or up to date. Developers are responsible - * for regulatory compliance of end-products developed using the enclosed - * data per all applicable national requirements. Furthermore, data in this - * table does not guarantee that spectrum is available and that regulatory - * approval is possible in every case. Knowldegable regulatory compliance - * or government contacts should be consulted by the manufacturer to ensure - * that the most current and accurate settings are used in each end-product. - * This table was designed so that developers are able to update the country - * table mappings as well as the Regulatory Domain definitions in order to - * incorporate the most current channel and power settings in the end-product." - * - */ - -/* Enumerated Regulatory Domain Information 8 bit values indicate that - * the regdomain is really a pair of unitary regdomains. 12 bit values - * are the real unitary regdomains and are the only ones which have the - * frequency bitmasks and flags set. - */ - - -#define MAX_CHANNELS_PER_OPERATING_CLASS 25 - -enum EnumRd { - NO_ENUMRD = 0x00, - NULL1_WORLD = 0x03, - NULL1_ETSIB = 0x07, - NULL1_ETSIC = 0x08, - FCC1_FCCA = 0x10, - FCC1_WORLD = 0x11, - FCC4_FCCA = 0x12, - FCC5_FCCA = 0x13, - FCC6_FCCA = 0x14, - - FCC2_FCCA = 0x20, - FCC2_WORLD = 0x21, - FCC2_ETSIC = 0x22, - FCC6_WORLD = 0x23, - FRANCE_RES = 0x31, - FCC3_FCCA = 0x3A, - FCC3_WORLD = 0x3B, - FCC3_ETSIC = 0x3F, - - ETSI1_WORLD = 0x37, - ETSI3_ETSIA = 0x32, - ETSI2_WORLD = 0x35, - ETSI3_WORLD = 0x36, - ETSI4_WORLD = 0x30, - ETSI4_ETSIC = 0x38, - ETSI5_WORLD = 0x39, - ETSI6_WORLD = 0x34, - ETSI8_WORLD = 0x3D, - ETSI9_WORLD = 0x3E, - ETSI_RESERVED = 0x33, - - MKK1_MKKA = 0x40, - MKK1_MKKB = 0x41, - APL4_WORLD = 0x42, - MKK2_MKKA = 0x43, - APL_RESERVED = 0x44, - APL2_WORLD = 0x45, - APL2_APLC = 0x46, - APL3_WORLD = 0x47, - MKK1_FCCA = 0x48, - APL2_APLD = 0x49, - MKK1_MKKA1 = 0x4A, - MKK1_MKKA2 = 0x4B, - MKK1_MKKC = 0x4C, - APL2_FCCA = 0x4D, - APL11_FCCA = 0x4F, - - APL3_FCCA = 0x50, - APL12_WORLD = 0x51, - APL1_WORLD = 0x52, - APL1_FCCA = 0x53, - APL1_APLA = 0x54, - APL1_ETSIC = 0x55, - APL2_ETSIC = 0x56, - APL5_WORLD = 0x58, - APL13_WORLD = 0x5A, - APL6_WORLD = 0x5B, - APL7_FCCA = 0x5C, - APL8_WORLD = 0x5D, - APL9_MKKC = 0x5E, - APL10_MKKC = 0x5F, - - WOR0_WORLD = 0x60, - WOR1_WORLD = 0x61, - WOR2_WORLD = 0x62, - WOR3_WORLD = 0x63, - WOR4_WORLD = 0x64, - WOR5_ETSIC = 0x65, - - WOR01_WORLD = 0x66, - WOR02_WORLD = 0x67, - EU1_WORLD = 0x68, - - WOR9_WORLD = 0x69, - WORA_WORLD = 0x6A, - WORB_WORLD = 0x6B, - WORC_WORLD = 0x6C, - - MKK3_MKKB = 0x80, - MKK3_MKKA2 = 0x81, - MKK3_MKKC = 0x82, - - MKK4_MKKB = 0x83, - MKK4_MKKA2 = 0x84, - MKK4_MKKC = 0x85, - - MKK5_MKKB = 0x86, - MKK5_MKKA2 = 0x87, - MKK5_MKKC = 0x88, - MKK5_MKKA = 0x99, - MKK5_FCCA = 0x9A, - - MKK6_MKKB = 0x89, - MKK6_MKKA2 = 0x8A, - MKK6_MKKC = 0x8B, - - MKK7_MKKB = 0x8C, - MKK7_MKKA2 = 0x8D, - MKK7_MKKC = 0x8E, - - MKK8_MKKB = 0x8F, - MKK8_MKKA2 = 0x90, - MKK8_MKKC = 0x91, - - MKK14_MKKA1 = 0x92, - MKK15_MKKA1 = 0x93, - - MKK10_FCCA = 0xD0, - MKK10_MKKA1 = 0xD1, - MKK10_MKKC = 0xD2, - MKK10_MKKA2 = 0xD3, - - MKK11_MKKA = 0xD4, - MKK11_FCCA = 0xD5, - MKK11_MKKA1 = 0xD6, - MKK11_MKKC = 0xD7, - MKK11_MKKA2 = 0xD8, - - MKK12_MKKA = 0xD9, - MKK12_FCCA = 0xDA, - MKK12_MKKA1 = 0xDB, - MKK12_MKKC = 0xDC, - MKK12_MKKA2 = 0xDD, - - MKK13_MKKB = 0xDE, - - MKK3_MKKA = 0xF0, - MKK3_MKKA1 = 0xF1, - MKK3_FCCA = 0xF2, - MKK4_MKKA = 0xF3, - MKK4_MKKA1 = 0xF4, - MKK4_FCCA = 0xF5, - MKK9_MKKA = 0xF6, - MKK10_MKKA = 0xF7, - MKK6_MKKA1 = 0xF8, - MKK6_FCCA = 0xF9, - MKK7_MKKA1 = 0xFA, - MKK7_FCCA = 0xFB, - MKK9_FCCA = 0xFC, - MKK9_MKKA1 = 0xFD, - MKK9_MKKC = 0xFE, - MKK9_MKKA2 = 0xFF, - - APL1 = 0x0150, - APL2 = 0x0250, - APL3 = 0x0350, - APL4 = 0x0450, - APL5 = 0x0550, - APL6 = 0x0650, - APL7 = 0x0750, - APL8 = 0x0850, - APL9 = 0x0950, - APL10 = 0x1050, - APL11 = 0x1150, - APL12 = 0x1160, - - ETSI1 = 0x0130, - ETSI2 = 0x0230, - ETSI3 = 0x0330, - ETSI4 = 0x0430, - ETSI5 = 0x0530, - ETSI6 = 0x0630, - ETSI8 = 0x0830, - ETSI9 = 0x0930, - ETSIA = 0x0A30, - ETSIB = 0x0B30, - ETSIC = 0x0C30, - - FCC1 = 0x0110, - FCC2 = 0x0120, - FCC3 = 0x0160, - FCC4 = 0x0165, - FCC5 = 0x0510, - FCC6 = 0x0610, - FCCA = 0x0A10, - - APLD = 0x0D50, - - MKK1 = 0x0140, - MKK2 = 0x0240, - MKK3 = 0x0340, - MKK4 = 0x0440, - MKK5 = 0x0540, - MKK6 = 0x0640, - MKK7 = 0x0740, - MKK8 = 0x0840, - MKK9 = 0x0940, - MKK10 = 0x0B40, - MKK11 = 0x1140, - MKK12 = 0x1240, - MKK13 = 0x0C40, - MKK14 = 0x1440, - MKK15 = 0x1540, - MKKA = 0x0A40, - MKKC = 0x0A50, - - NULL1 = 0x0198, - WORLD = 0x0199, - DEBUG_REG_DMN = 0x01ff, -}; - -enum { - FCC = 0x10, - MKK = 0x40, - ETSI = 0x30, - NO_CTL = 0xff -}; - -static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { - {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, - {NULL1_WORLD, NULL1, WORLD, 0}, - {NULL1_ETSIB, NULL1, ETSIB, 0}, - {NULL1_ETSIC, NULL1, ETSIC, 0}, - {FCC2_FCCA, FCC2, FCCA, 0}, - {FCC2_WORLD, FCC2, WORLD, 0}, - {FCC2_ETSIC, FCC2, ETSIC, 0}, - {FCC3_FCCA, FCC3, FCCA, 0}, - {FCC3_WORLD, FCC3, WORLD, 0}, - {FCC3_ETSIC, FCC3, ETSIC, 0}, - {FCC4_FCCA, FCC4, FCCA, 0}, - {FCC5_FCCA, FCC5, FCCA, 0}, - {FCC6_FCCA, FCC6, FCCA, 0}, - {FCC6_WORLD, FCC6, WORLD, 0}, - {ETSI1_WORLD, ETSI1, WORLD, 0}, - {ETSI2_WORLD, ETSI2, WORLD, 0}, - {ETSI3_WORLD, ETSI3, WORLD, 0}, - {ETSI4_WORLD, ETSI4, WORLD, 0}, - {ETSI5_WORLD, ETSI5, WORLD, 0}, - {ETSI6_WORLD, ETSI6, WORLD, 0}, - {ETSI8_WORLD, ETSI8, WORLD, 0}, - {ETSI9_WORLD, ETSI9, WORLD, 0}, - {ETSI3_ETSIA, ETSI3, WORLD, 0}, - {FRANCE_RES, ETSI3, WORLD, 0}, - {FCC1_WORLD, FCC1, WORLD, 0}, - {FCC1_FCCA, FCC1, FCCA, 0}, - {APL1_WORLD, APL1, WORLD, 0}, - {APL2_WORLD, APL2, WORLD, 0}, - {APL2_FCCA, APL2, FCCA, 0}, - {APL3_WORLD, APL3, WORLD, 0}, - {APL4_WORLD, APL4, WORLD, 0}, - {APL5_WORLD, APL5, WORLD, 0}, - {APL6_WORLD, APL6, WORLD, 0}, - {APL7_FCCA, APL7, FCCA, 0}, - {APL8_WORLD, APL8, WORLD, 0}, - {APL9_MKKC, APL9, MKKC, 0}, - {APL10_MKKC, APL10, MKKC, 0}, - {APL3_FCCA, APL3, FCCA, 0}, - {APL1_ETSIC, APL1, ETSIC, 0}, - {APL2_ETSIC, APL2, ETSIC, 0}, - {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, - {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, - {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, - {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, - {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, - {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, - {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, - {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, - {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, - {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, - {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, - {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, - {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, - {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, - {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, - {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, - {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, - {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, - {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, - {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, - {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, - {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, - {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, - {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, - {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, - {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, - {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, - {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, - {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, - {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, - {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, - - {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, - {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, - {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, - {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, - {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, - {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, - {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, - {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, - {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, - {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, - {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, - {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, - {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, -}; - -static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { - {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, - {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, - {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, - {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, - {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, - {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, - {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, - {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, - {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, - {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, - {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, - {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, - {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, - {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, - {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, - {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, - {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, - {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, - {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, - {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, - {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, - {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, - {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, - {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, - {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, - {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, - {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, - {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, - {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, - {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, - {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, - {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, - {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, - {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, - {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, - {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, - {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, - {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, - {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, - {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, - {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, - {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, - {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, - {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, - {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, - {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, - {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, - {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, - {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, - {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, - {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, - {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, - {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, - {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, - {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, - {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, - {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, - {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, - {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, - {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, - {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, - {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, - {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, - {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, - {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, - {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, - {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, - {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, - {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, - {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, - {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, - {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, - {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, - {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, - {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, - {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, - {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, - {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, - {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, - {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, - {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, - {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, - {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, - {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, - {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, - {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, - {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, - {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, - {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, - {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, - {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, - {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, - {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, - {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, - {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, - {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, - {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, - {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, - {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, - {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, - {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, - {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, - {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, - {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, - {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, - {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, - {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, - {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, - {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, - {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, - {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, - {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, - {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, - {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, - {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, - {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, - {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, - {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, - {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, - {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, - {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, - {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, - {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, - {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, - {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, - {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, - {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, - {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, - {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, - {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, - {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, - {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, - {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, - {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, - {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, - {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, - {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, - {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, - {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, - {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, - {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, - {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, - {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, - {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, - {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, - {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, - {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, - {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, - {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, - {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, - {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, - {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, - {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, - {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, - {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, - {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, - {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, - {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} -}; - -static const REG_DOMAIN ah_cmn_reg_domains[] = { - {DEBUG_REG_DMN, FCC}, - {APL1, FCC}, - {APL2, FCC}, - {APL3, FCC}, - {APL4, FCC}, - {APL5, FCC}, - {APL6, ETSI}, - {APL7, FCC}, - {APL8, ETSI}, - {APL9, ETSI}, - {APL10, ETSI}, - {APL11, ETSI}, - {APL12, ETSI}, - {ETSI1, ETSI}, - {ETSI2, ETSI}, - {ETSI3, ETSI}, - {ETSI4, ETSI}, - {ETSI5, ETSI}, - {ETSI6, ETSI}, - {ETSI8, ETSI}, - {ETSI9, ETSI}, - {FCC1, FCC}, - {FCC2, FCC}, - {FCC3, FCC}, - {FCC4, FCC}, - {FCC5, FCC}, - {FCC6, FCC}, - {MKK1, MKK}, - {MKK2, MKK}, - {MKK3, MKK}, - {MKK4, MKK}, - {MKK5, MKK}, - {MKK6, MKK}, - {MKK7, MKK}, - {MKK8, MKK}, - {MKK9, MKK}, - {MKK10, MKK}, - {MKK11, MKK}, - {MKK12, MKK}, - {MKK13, MKK}, - {MKK14, MKK}, - {MKK15, MKK}, - {APLD, NO_CTL}, - {ETSIA, NO_CTL}, - {ETSIB, ETSI}, - {ETSIC, ETSI}, - {FCCA, FCC}, - {MKKA, MKK}, - {MKKC, MKK}, - {WORLD, ETSI}, - {WOR0_WORLD, NO_CTL}, - {WOR01_WORLD, NO_CTL}, - {WOR02_WORLD, NO_CTL}, - {EU1_WORLD, NO_CTL}, - {WOR1_WORLD, NO_CTL}, - {WOR2_WORLD, NO_CTL}, - {WOR3_WORLD, NO_CTL}, - {WOR4_WORLD, NO_CTL}, - {WOR5_ETSIC, NO_CTL}, - {WOR9_WORLD, NO_CTL}, - {WORA_WORLD, NO_CTL}, - {WORB_WORLD, NO_CTL}, - {WORC_WORLD, NO_CTL}, - {NULL1, NO_CTL}, -}; - -typedef enum offset { - BW20 = 0, - BW40_LOW_PRIMARY = 1, - BW40_HIGH_PRIMARY = 3, - BW80, - BWALL -} offset_t; - -typedef struct _regdm_op_class_map { - uint8_t op_class; - uint8_t ch_spacing; - offset_t offset; - uint8_t channels[MAX_CHANNELS_PER_OPERATING_CLASS]; -} regdm_op_class_map_t; - -typedef struct _regdm_supp_op_classes { - uint8_t num_classes; - uint8_t classes[SIR_MAC_MAX_SUPP_OPER_CLASSES]; -} regdm_supp_op_classes; - -uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, - uint8_t offset); -uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel, - uint8_t opclass); -uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class); -uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class); diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 67765ba91020..20c056b77281 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -68,7 +68,6 @@ #include #include "wma.h" #include "cds_regdomain.h" -#include "cds_regdomain_common.h" static regdm_supp_op_classes regdm_curr_supp_opp_classes = { 0 }; @@ -556,7 +555,7 @@ uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class) { uint8_t i; - if (SIR_MAC_MAX_SUPP_OPER_CLASSES < num_classes) { + if (CDS_MAX_SUPP_OPER_CLASSES < num_classes) { qdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n", __func__, num_classes); return -1; diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index 03c7ff1c3db0..8a4cd45e7f89 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -342,7 +342,7 @@ typedef struct _hddTdlsPeer_t { uint8_t supported_channels_len; uint8_t supported_channels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supported_oper_classes_len; - uint8_t supported_oper_classes[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t supported_oper_classes[CDS_MAX_SUPP_OPER_CLASSES]; bool isForcedPeer; uint8_t op_class_for_pref_off_chan; uint8_t pref_off_chan_num; diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index b8a513501f02..6e367700af57 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -37,7 +37,6 @@ #include "sme_api.h" #include "wlan_hdd_main.h" #include "cds_regdomain.h" -#include "cds_regdomain_common.h" #include "wlan_hdd_regulatory.h" #define WORLD_SKU_MASK 0x00F0 diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 56963efe916e..2737f9ecb1c2 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -45,6 +45,7 @@ #include "sir_mac_prot_def.h" #include "ani_system_defs.h" #include "sir_params.h" +#include "cds_regdomain.h" #define OFFSET_OF(structType, fldName) (&((structType *)0)->fldName) @@ -3417,7 +3418,7 @@ typedef struct { uint8_t supportedChannelsLen; uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supportedOperClassesLen; - uint8_t supportedOperClasses[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t supportedOperClasses[CDS_MAX_SUPP_OPER_CLASSES]; } tSirTdlsLinkEstablishReq, *tpSirTdlsLinkEstablishReq; /* TDLS Request struct SME-->PE */ diff --git a/core/mac/inc/sir_mac_prot_def.h b/core/mac/inc/sir_mac_prot_def.h index 8ffaf0123502..c675af7c0758 100644 --- a/core/mac/inc/sir_mac_prot_def.h +++ b/core/mac/inc/sir_mac_prot_def.h @@ -1385,7 +1385,6 @@ typedef struct sSirMacMeasReqIE { #define SIR_MAC_MAX_SUPP_RATES 32 #define SIR_MAC_MAX_SUPP_CHANNELS 100 -#define SIR_MAC_MAX_SUPP_OPER_CLASSES 32 #define SIR_MAC_MAX_EXTN_CAP 8 /* VHT Capabilities Info */ diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 679cee43708e..c0bab96447f7 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -62,7 +62,7 @@ #include -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" /* * This overhead is time for sending NOA start to host in case of GO/sending diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 44973cd2fd54..5bf81e6c9cb7 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -75,7 +75,7 @@ #include "lim_assoc_utils.h" #include "dph_hash_table.h" #include "wma_types.h" -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" /* define NO_PAD_TDLS_MIN_8023_SIZE to NOT padding: See CR#447630 There was IOT issue with cisco 1252 open mode, where it pads @@ -2556,7 +2556,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, uint8_t chanOffset; uint8_t op_class; uint8_t numClasses; - uint8_t classes[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES]; if (wlan_cfg_get_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, validChan, &numChans) != eSIR_SUCCESS) { /** diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 3c844b85c543..574116591fdd 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -42,7 +42,7 @@ #ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ #include "host_diag_core_log.h" #endif /* FEATURE_WLAN_DIAG_SUPPORT */ -#include "cds_regdomain_common.h" + /* When beacon filtering is enabled, firmware will * analyze the selected beacons received during BMPS, * and monitor any changes in the IEs as listed below. diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 9f9a145c42be..17d44927d859 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -55,7 +55,7 @@ #include "lim_session_utils.h" #include "lim_types.h" #include "sir_api.h" -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" #include "lim_send_messages.h" static void lim_handle_join_rsp_status(tpAniSirGlobal mac_ctx, diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index fbe40637a5f5..80c7a66a2ab0 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -47,7 +47,7 @@ #include "wmm_apsd.h" #include "rrm_api.h" -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" /* ////////////////////////////////////////////////////////////////////// */ void dot11f_log(tpAniSirGlobal pMac, int loglevel, const char *pString, ...) diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index d93a79361aeb..4e907aa955ae 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -52,7 +52,7 @@ #include "sap_internal.h" #include "sme_inside.h" #include "cds_ieee80211_common_i.h" -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" #include "cds_concurrency.h" /*---------------------------------------------------------------------------- diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index bae7eb13e0dd..dd18be8b54f4 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -260,7 +260,7 @@ typedef struct tagCsrStaParams { uint8_t supported_channels_len; uint8_t supported_channels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supported_oper_classes_len; - uint8_t supported_oper_classes[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t supported_oper_classes[CDS_MAX_SUPP_OPER_CLASSES]; } tCsrStaParams; typedef struct tagCsrScanRequest { @@ -1477,7 +1477,7 @@ typedef struct tagCsrLinkEstablishParams { uint8_t supportedChannelsLen; uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supportedOperClassesLen; - uint8_t supportedOperClasses[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t supportedOperClasses[CDS_MAX_SUPP_OPER_CLASSES]; } tCsrTdlsLinkEstablishParams; typedef struct tagCsrTdlsSendMgmt { diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 9ab29e53398c..65ee8cd83843 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -116,7 +116,7 @@ typedef struct TdlsLinkEstablishInfo { uint8_t supportedChannelsLen; uint8_t supportedChannels[SIR_MAC_MAX_SUPP_CHANNELS]; uint8_t supportedOperClassesLen; - uint8_t supportedOperClasses[SIR_MAC_MAX_SUPP_OPER_CLASSES]; + uint8_t supportedOperClasses[CDS_MAX_SUPP_OPER_CLASSES]; } tTdlsLinkEstablishCmdInfo; typedef struct TdlsAddStaInfo { diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index eb254f31c990..cdbe608b0346 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -54,7 +54,7 @@ #ifdef WLAN_FEATURE_NAN #include "nan_api.h" #endif -#include "cds_regdomain_common.h" +#include "cds_regdomain.h" #include "cfg_api.h" #include "sme_power_save_api.h" #include "wma.h" diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index c765aeb186eb..19f173ecda9b 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -49,7 +49,6 @@ #include "mac_trace.h" #include "csr_neighbor_roam.h" #include "cds_regdomain.h" -#include "cds_regdomain_common.h" #include "cds_utils.h" #include "sir_types.h" #include "cfg_api.h" @@ -18411,7 +18410,7 @@ csr_update_op_class_array(tpAniSirGlobal mac_ctx, ch_name, num_channels); for (idx = 0; idx < num_channels - && *i < (SIR_MAC_MAX_SUPP_OPER_CLASSES - 1); idx++) { + && *i < (CDS_MAX_SUPP_OPER_CLASSES - 1); idx++) { for (ch_bandwidth = BW20; ch_bandwidth < BWALL; ch_bandwidth++) { class = cds_regdm_get_opclass_from_channel( @@ -18422,7 +18421,7 @@ csr_update_op_class_array(tpAniSirGlobal mac_ctx, channel_info->channelList[idx], class); found = false; - for (j = 0; j < SIR_MAC_MAX_SUPP_OPER_CLASSES - 1; + for (j = 0; j < CDS_MAX_SUPP_OPER_CLASSES - 1; j++) { if (op_classes[j] == class) { found = true; @@ -18450,7 +18449,7 @@ void csr_init_operating_classes(tHalHandle hHal) uint8_t j = 0; uint8_t swap = 0; uint8_t numClasses = 0; - uint8_t opClasses[SIR_MAC_MAX_SUPP_OPER_CLASSES] = {0,}; + uint8_t opClasses[CDS_MAX_SUPP_OPER_CLASSES] = {0,}; tpAniSirGlobal pMac = PMAC_STRUCT(hHal); sms_log(pMac, LOG1, FL("Current Country = %c%c"), -- cgit v1.2.3 From 2299511d9f2af144076ed9663f2080962b796aef Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Fri, 22 Jan 2016 10:42:33 -0800 Subject: qcacld-3.0: Make regdomain code linux style Fix the data structures of regdomain code; to make it linux style. Change-Id: If8123370f4ce370adba1a49636b42449c2644144 CRs-Fixed: 961806 --- core/cds/inc/cds_reg_service.h | 4 +- core/cds/inc/cds_regdomain.h | 440 ++------------ core/cds/src/cds_regdomain.c | 662 +++++++++++++++------ core/hdd/src/wlan_hdd_regulatory.c | 6 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 4 +- core/mac/src/pe/lim/lim_process_tdls.c | 4 +- core/mac/src/pe/lim/lim_send_messages.c | 8 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 4 +- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 6 +- core/sap/src/sap_module.c | 2 +- core/sme/src/common/sme_api.c | 8 +- core/sme/src/csr/csr_api_roam.c | 4 +- core/wma/inc/wma_dfs_interface.h | 2 +- 13 files changed, 543 insertions(+), 611 deletions(-) diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index 65f3f9d98308..5eef8b36cbca 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -287,10 +287,10 @@ QDF_STATUS cds_put_dfs_region(uint8_t dfs_region); bool cds_is_dsrc_channel(uint16_t); enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, - enum channel_width chan_width); + enum channel_width chan_width); enum channel_width cds_get_max_channel_bw(uint32_t chan_num); QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); - QDF_STATUS cds_put_default_country(uint8_t *def_country); + #endif /* __CDS_REG_SERVICE_H */ diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 519f4e874243..0c4f15705f3b 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -68,8 +68,8 @@ * */ -#ifndef REGULATORY_H -#define REGULATORY_H +#ifndef __CDS_REGDOMAIN_H +#define __CDS_REGDOMAIN_H #define MAX_CHANNELS_PER_OPERATING_CLASS 25 #define CTRY_DEBUG 0x1ff @@ -79,7 +79,7 @@ #define DEF_REGDMN FCC3_FCCA #define CDS_MAX_SUPP_OPER_CLASSES 32 -enum EnumRd { +enum reg_domain { NO_ENUMRD = 0x00, NULL1_WORLD = 0x03, NULL1_ETSIB = 0x07, @@ -89,7 +89,6 @@ enum EnumRd { FCC4_FCCA = 0x12, FCC5_FCCA = 0x13, FCC6_FCCA = 0x14, - FCC2_FCCA = 0x20, FCC2_WORLD = 0x21, FCC2_ETSIC = 0x22, @@ -148,11 +147,9 @@ enum EnumRd { WOR3_WORLD = 0x63, WOR4_WORLD = 0x64, WOR5_ETSIC = 0x65, - WOR01_WORLD = 0x66, WOR02_WORLD = 0x67, EU1_WORLD = 0x68, - WOR9_WORLD = 0x69, WORA_WORLD = 0x6A, WORB_WORLD = 0x6B, @@ -161,51 +158,40 @@ enum EnumRd { MKK3_MKKB = 0x80, MKK3_MKKA2 = 0x81, MKK3_MKKC = 0x82, - MKK4_MKKB = 0x83, MKK4_MKKA2 = 0x84, MKK4_MKKC = 0x85, - MKK5_MKKB = 0x86, MKK5_MKKA2 = 0x87, MKK5_MKKC = 0x88, MKK5_MKKA = 0x99, MKK5_FCCA = 0x9A, - MKK6_MKKB = 0x89, MKK6_MKKA2 = 0x8A, MKK6_MKKC = 0x8B, - MKK7_MKKB = 0x8C, MKK7_MKKA2 = 0x8D, MKK7_MKKC = 0x8E, - MKK8_MKKB = 0x8F, MKK8_MKKA2 = 0x90, MKK8_MKKC = 0x91, - MKK14_MKKA1 = 0x92, MKK15_MKKA1 = 0x93, - MKK10_FCCA = 0xD0, MKK10_MKKA1 = 0xD1, MKK10_MKKC = 0xD2, MKK10_MKKA2 = 0xD3, - MKK11_MKKA = 0xD4, MKK11_FCCA = 0xD5, MKK11_MKKA1 = 0xD6, MKK11_MKKC = 0xD7, MKK11_MKKA2 = 0xD8, - MKK12_MKKA = 0xD9, MKK12_FCCA = 0xDA, MKK12_MKKA1 = 0xDB, MKK12_MKKC = 0xDC, MKK12_MKKA2 = 0xDD, - MKK13_MKKB = 0xDE, - MKK3_MKKA = 0xF0, MKK3_MKKA1 = 0xF1, MKK3_FCCA = 0xF2, @@ -281,42 +267,14 @@ enum EnumRd { DEBUG_REG_DMN = 0x01ff, }; -enum { +enum ctl_val { FCC = 0x10, MKK = 0x40, ETSI = 0x30, NO_CTL = 0xff }; - -/* These defines should match the table from ah_internal.h */ -enum HAL_DFS_DOMAIN { - DFS_UNINIT_DOMAIN = 0, /* Uninitialized dfs domain */ - DFS_FCC_DOMAIN = 1, /* FCC3 dfs domain */ - DFS_ETSI_DOMAIN = 2, /* ETSI dfs domain */ - DFS_MKK4_DOMAIN = 3 /* Japan dfs domain */ -}; - -typedef struct reg_dmn_pair_mapping { - uint16_t regDmnEnum; - uint16_t regDmn5GHz; - uint16_t regDmn2GHz; - uint16_t singleCC; -} REG_DMN_PAIR_MAPPING; - -typedef struct { - uint16_t countryCode; - uint16_t regDmnEnum; - const char *isoName; - const char *name; -} COUNTRY_CODE_TO_ENUM_RD; - -typedef struct reg_domain { - uint16_t regDmnEnum; - uint8_t conformance_test_limit; -} REG_DOMAIN; - -enum CountryCode { +enum country_code { CTRY_AFGHANISTAN = 4, CTRY_ALBANIA = 8, CTRY_ALGERIA = 12, @@ -529,268 +487,25 @@ enum CountryCode { CTRY_JAPAN56 = 4056, }; -typedef struct ath_hal_reg_dmn_tables { - const REG_DMN_PAIR_MAPPING *regDomainPairs; - const COUNTRY_CODE_TO_ENUM_RD *allCountries; - const REG_DOMAIN *regDomains; - uint16_t regDomainPairsCt; - uint16_t allCountriesCt; - uint16_t regDomainsCt; -} HAL_REG_DMN_TABLES; - - -static const REG_DMN_PAIR_MAPPING ah_cmn_reg_domain_pairs[] = { - {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, - {NULL1_WORLD, NULL1, WORLD, 0}, - {NULL1_ETSIB, NULL1, ETSIB, 0}, - {NULL1_ETSIC, NULL1, ETSIC, 0}, - {FCC2_FCCA, FCC2, FCCA, 0}, - {FCC2_WORLD, FCC2, WORLD, 0}, - {FCC2_ETSIC, FCC2, ETSIC, 0}, - {FCC3_FCCA, FCC3, FCCA, 0}, - {FCC3_WORLD, FCC3, WORLD, 0}, - {FCC3_ETSIC, FCC3, ETSIC, 0}, - {FCC4_FCCA, FCC4, FCCA, 0}, - {FCC5_FCCA, FCC5, FCCA, 0}, - {FCC6_FCCA, FCC6, FCCA, 0}, - {FCC6_WORLD, FCC6, WORLD, 0}, - {ETSI1_WORLD, ETSI1, WORLD, 0}, - {ETSI2_WORLD, ETSI2, WORLD, 0}, - {ETSI3_WORLD, ETSI3, WORLD, 0}, - {ETSI4_WORLD, ETSI4, WORLD, 0}, - {ETSI5_WORLD, ETSI5, WORLD, 0}, - {ETSI6_WORLD, ETSI6, WORLD, 0}, - {ETSI8_WORLD, ETSI8, WORLD, 0}, - {ETSI9_WORLD, ETSI9, WORLD, 0}, - {ETSI3_ETSIA, ETSI3, WORLD, 0}, - {FRANCE_RES, ETSI3, WORLD, 0}, - {FCC1_WORLD, FCC1, WORLD, 0}, - {FCC1_FCCA, FCC1, FCCA, 0}, - {APL1_WORLD, APL1, WORLD, 0}, - {APL2_WORLD, APL2, WORLD, 0}, - {APL2_FCCA, APL2, FCCA, 0}, - {APL3_WORLD, APL3, WORLD, 0}, - {APL4_WORLD, APL4, WORLD, 0}, - {APL5_WORLD, APL5, WORLD, 0}, - {APL6_WORLD, APL6, WORLD, 0}, - {APL7_FCCA, APL7, FCCA, 0}, - {APL8_WORLD, APL8, WORLD, 0}, - {APL9_MKKC, APL9, MKKC, 0}, - {APL10_MKKC, APL10, MKKC, 0}, - {APL3_FCCA, APL3, FCCA, 0}, - {APL1_ETSIC, APL1, ETSIC, 0}, - {APL2_ETSIC, APL2, ETSIC, 0}, - {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, - {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, - {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, - {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, - {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, - {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, - {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, - {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, - {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, - {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, - {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, - {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, - {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, - {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, - {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, - {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, - {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, - {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, - {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, - {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, - {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, - {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, - {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, - {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, - {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, - {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, - {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, - {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, - {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, - {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, - {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, +enum dfs_domain { + DFS_UNINIT_DOMAIN = 0, + DFS_FCC_DOMAIN = 1, + DFS_ETSI_DOMAIN = 2, + DFS_MKK4_DOMAIN = 3 +}; - {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, - {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, - {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, - {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, - {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, - {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, - {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, - {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, - {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, - {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, - {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, - {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, - {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, +struct reg_dmn_pair { + uint16_t reg_dmn_enum; + uint16_t reg_dmn_5ghz; + uint16_t reg_dmn_2ghz; + uint16_t single_cc; }; -static const COUNTRY_CODE_TO_ENUM_RD ah_cmn_all_countries[] = { - {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, - {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, - {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, - {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, - {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, - {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, - {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, - {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, - {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, - {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, - {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, - {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, - {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, - {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, - {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, - {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, - {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, - {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, - {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, - {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, - {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, - {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, - {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, - {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, - {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, - {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, - {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, - {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, - {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, - {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, - {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, - {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, - {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, - {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, - {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, - {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, - {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, - {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, - {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, - {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, - {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, - {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, - {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, - {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, - {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, - {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, - {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, - {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, - {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, - {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, - {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, - {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, - {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, - {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, - {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, - {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, - {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, - {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, - {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, - {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, - {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, - {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, - {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, - {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, - {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, - {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, - {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, - {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, - {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, - {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, - {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, - {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, - {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, - {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, - {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, - {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, - {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, - {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, - {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, - {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, - {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, - {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, - {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, - {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, - {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, - {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, - {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, - {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, - {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, - {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, - {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, - {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, - {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, - {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, - {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, - {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, - {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, - {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, - {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, - {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, - {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, - {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, - {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, - {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, - {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, - {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, - {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, - {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, - {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, - {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, - {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, - {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, - {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, - {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, - {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, - {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, - {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, - {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, - {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, - {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, - {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, - {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, - {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, - {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, - {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, - {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, - {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, - {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, - {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, - {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, - {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, - {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, - {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, - {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, - {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, - {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, - {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, - {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, - {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, - {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, - {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, - {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, - {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, - {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, - {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, - {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, - {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, - {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, - {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, - {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, - {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, - {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, - {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, - {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, - {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, - {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, - {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, - {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, - {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, - {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, - {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} +struct country_code_to_reg_dmn { + uint16_t country_code; + uint16_t reg_dmn_enum; + const char *iso_name; + const char *name; }; /** @@ -825,107 +540,54 @@ struct ch_params_s { uint8_t center_freq_seg1; }; -static const REG_DOMAIN ah_cmn_reg_domains[] = { - {DEBUG_REG_DMN, FCC}, - {APL1, FCC}, - {APL2, FCC}, - {APL3, FCC}, - {APL4, FCC}, - {APL5, FCC}, - {APL6, ETSI}, - {APL7, FCC}, - {APL8, ETSI}, - {APL9, ETSI}, - {APL10, ETSI}, - {APL11, ETSI}, - {APL12, ETSI}, - {ETSI1, ETSI}, - {ETSI2, ETSI}, - {ETSI3, ETSI}, - {ETSI4, ETSI}, - {ETSI5, ETSI}, - {ETSI6, ETSI}, - {ETSI8, ETSI}, - {ETSI9, ETSI}, - {FCC1, FCC}, - {FCC2, FCC}, - {FCC3, FCC}, - {FCC4, FCC}, - {FCC5, FCC}, - {FCC6, FCC}, - {MKK1, MKK}, - {MKK2, MKK}, - {MKK3, MKK}, - {MKK4, MKK}, - {MKK5, MKK}, - {MKK6, MKK}, - {MKK7, MKK}, - {MKK8, MKK}, - {MKK9, MKK}, - {MKK10, MKK}, - {MKK11, MKK}, - {MKK12, MKK}, - {MKK13, MKK}, - {MKK14, MKK}, - {MKK15, MKK}, - {APLD, NO_CTL}, - {ETSIA, NO_CTL}, - {ETSIB, ETSI}, - {ETSIC, ETSI}, - {FCCA, FCC}, - {MKKA, MKK}, - {MKKC, MKK}, - {WORLD, ETSI}, - {WOR0_WORLD, NO_CTL}, - {WOR01_WORLD, NO_CTL}, - {WOR02_WORLD, NO_CTL}, - {EU1_WORLD, NO_CTL}, - {WOR1_WORLD, NO_CTL}, - {WOR2_WORLD, NO_CTL}, - {WOR3_WORLD, NO_CTL}, - {WOR4_WORLD, NO_CTL}, - {WOR5_ETSIC, NO_CTL}, - {WOR9_WORLD, NO_CTL}, - {WORA_WORLD, NO_CTL}, - {WORB_WORLD, NO_CTL}, - {WORC_WORLD, NO_CTL}, - {NULL1, NO_CTL}, +struct reg_dmn { + uint16_t reg_dmn; + uint8_t conformance_test_limit; }; -typedef enum offset { +enum offset_t { BW20 = 0, BW40_LOW_PRIMARY = 1, BW40_HIGH_PRIMARY = 3, BW80, BWALL -} offset_t; +}; -typedef struct _regdm_op_class_map { +struct reg_dmn_op_class_map_t { uint8_t op_class; uint8_t ch_spacing; - offset_t offset; + enum offset_t offset; uint8_t channels[MAX_CHANNELS_PER_OPERATING_CLASS]; -} regdm_op_class_map_t; +}; -typedef struct _regdm_supp_op_classes { +struct reg_dmn_supp_op_classes { uint8_t num_classes; uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES]; -} regdm_supp_op_classes; +}; +struct reg_dmn_tables { + const struct reg_dmn_pair *reg_dmn_pairs; + const struct country_code_to_reg_dmn *all_countries; + const struct reg_dmn *reg_dmns; + uint16_t reg_dmn_pairs_cnt; + uint16_t all_countries_cnt; + uint16_t reg_dmns_cnt; +}; int32_t cds_fill_some_regulatory_info(struct regulatory *reg); -void cds_fill_and_send_ctl_to_fw(struct regulatory *reg); int32_t cds_get_country_from_alpha2(uint8_t *alpha2); -void cds_fill_send_ctl_info_to_fw(struct regulatory *reg); +void cds_fill_and_send_ctl_to_fw(struct regulatory *reg); void cds_set_wma_dfs_region(uint8_t dfs_region); + void cds_set_ch_params(uint8_t ch, uint32_t phy_mode, struct ch_params_s *ch_params); - -uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, - uint8_t offset); -uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel, - uint8_t opclass); -uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class); -uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class); - -#endif /* REGULATORY_H */ +uint16_t cds_reg_dmn_get_opclass_from_channel(uint8_t *country, + uint8_t channel, + uint8_t offset); +uint16_t cds_reg_dmn_get_chanwidth_from_opclass(uint8_t *country, + uint8_t channel, + uint8_t opclass); +uint16_t cds_reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class); +uint16_t cds_reg_dmn_get_curr_opclasses(uint8_t *num_classes, uint8_t *class); + +#endif /* __CDS_REGDOMAIN_H */ diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 20c056b77281..19a91319d114 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -69,10 +69,9 @@ #include "wma.h" #include "cds_regdomain.h" -static regdm_supp_op_classes regdm_curr_supp_opp_classes = { 0 }; +static struct reg_dmn_supp_op_classes reg_dmn_curr_supp_opp_classes = { 0 }; -/* Global Operating Classes */ -regdm_op_class_map_t global_op_class[] = { +static const struct reg_dmn_op_class_map_t global_op_class[] = { {81, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} }, {82, 25, BW20, {14} }, {83, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7, 8, 9} }, @@ -96,12 +95,11 @@ regdm_op_class_map_t global_op_class[] = { {0, 0, 0, {0} }, }; -/* Operating Classes in US */ -regdm_op_class_map_t us_op_class[] = { +static const struct reg_dmn_op_class_map_t us_op_class[] = { {1, 20, BW20, {36, 40, 44, 48} }, {2, 20, BW20, {52, 56, 60, 64} }, {4, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, - 144} }, + 144} }, {5, 20, BW20, {149, 153, 157, 161, 165} }, {12, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11} }, {22, 40, BW40_LOW_PRIMARY, {36, 44} }, @@ -115,13 +113,12 @@ regdm_op_class_map_t us_op_class[] = { {32, 40, BW40_LOW_PRIMARY, {1, 2, 3, 4, 5, 6, 7} }, {33, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, - 112, 116, 120, 124, 128, 132, 136, 140, 144, - 149, 153, 157, 161} }, + 112, 116, 120, 124, 128, 132, 136, 140, 144, + 149, 153, 157, 161} }, {0, 0, 0, {0} }, }; -/* Operating Classes in Europe */ -regdm_op_class_map_t euro_op_class[] = { +static const struct reg_dmn_op_class_map_t euro_op_class[] = { {1, 20, BW20, {36, 40, 44, 48} }, {2, 20, BW20, {52, 56, 60, 64} }, {3, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, @@ -136,17 +133,17 @@ regdm_op_class_map_t euro_op_class[] = { {12, 40, BW40_HIGH_PRIMARY, {5, 6, 7, 8, 9, 10, 11, 12, 13} }, {17, 20, BW20, {149, 153, 157, 161, 165, 169} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, - 116, 120, 124, 128} }, + 116, 120, 124, 128} }, {0, 0, 0, {0} }, }; -/* Operating Classes in Japan */ -regdm_op_class_map_t japan_op_class[] = { +static const struct reg_dmn_op_class_map_t japan_op_class[] = { {1, 20, BW20, {36, 40, 44, 48} }, {30, 25, BW20, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13} }, {31, 25, BW20, {14} }, {32, 20, BW20, {52, 56, 60, 64} }, - {34, 20, BW20, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, + {34, 20, BW20, + {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140} }, {36, 40, BW40_LOW_PRIMARY, {36, 44} }, {37, 40, BW40_LOW_PRIMARY, {52, 60} }, {39, 40, BW40_LOW_PRIMARY, {100, 108, 116, 124, 132} }, @@ -154,22 +151,339 @@ regdm_op_class_map_t japan_op_class[] = { {42, 40, BW40_HIGH_PRIMARY, {56, 64} }, {44, 40, BW40_HIGH_PRIMARY, {104, 112, 120, 128, 136} }, {128, 80, BW80, {36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108, 112, - 116, 120, 124, 128} }, + 116, 120, 124, 128} }, {0, 0, 0, {0} }, }; -/* - * By default, the regdomain tables reference the common tables - * from regdomain_common.h. These default tables can be replaced - * by calls to populate_regdomain_tables functions. - */ -HAL_REG_DMN_TABLES ol_regdmn_rdt = { - ah_cmn_reg_domain_pairs, /* regDomainPairs */ - ah_cmn_all_countries, /* allCountries */ - ah_cmn_reg_domains, /* allRegDomains */ - QDF_ARRAY_SIZE(ah_cmn_reg_domain_pairs), /* regDomainPairsCt */ - QDF_ARRAY_SIZE(ah_cmn_all_countries), /* allCountriesCt */ - QDF_ARRAY_SIZE(ah_cmn_reg_domains), /* allRegDomainCt */ +static const struct reg_dmn_pair g_reg_dmn_pairs[] = { + {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, + {NULL1_WORLD, NULL1, WORLD, 0}, + {NULL1_ETSIB, NULL1, ETSIB, 0}, + {NULL1_ETSIC, NULL1, ETSIC, 0}, + {FCC2_FCCA, FCC2, FCCA, 0}, + {FCC2_WORLD, FCC2, WORLD, 0}, + {FCC2_ETSIC, FCC2, ETSIC, 0}, + {FCC3_FCCA, FCC3, FCCA, 0}, + {FCC3_WORLD, FCC3, WORLD, 0}, + {FCC3_ETSIC, FCC3, ETSIC, 0}, + {FCC4_FCCA, FCC4, FCCA, 0}, + {FCC5_FCCA, FCC5, FCCA, 0}, + {FCC6_FCCA, FCC6, FCCA, 0}, + {FCC6_WORLD, FCC6, WORLD, 0}, + {ETSI1_WORLD, ETSI1, WORLD, 0}, + {ETSI2_WORLD, ETSI2, WORLD, 0}, + {ETSI3_WORLD, ETSI3, WORLD, 0}, + {ETSI4_WORLD, ETSI4, WORLD, 0}, + {ETSI5_WORLD, ETSI5, WORLD, 0}, + {ETSI6_WORLD, ETSI6, WORLD, 0}, + {ETSI8_WORLD, ETSI8, WORLD, 0}, + {ETSI9_WORLD, ETSI9, WORLD, 0}, + {ETSI3_ETSIA, ETSI3, WORLD, 0}, + {FRANCE_RES, ETSI3, WORLD, 0}, + {FCC1_WORLD, FCC1, WORLD, 0}, + {FCC1_FCCA, FCC1, FCCA, 0}, + {APL1_WORLD, APL1, WORLD, 0}, + {APL2_WORLD, APL2, WORLD, 0}, + {APL2_FCCA, APL2, FCCA, 0}, + {APL3_WORLD, APL3, WORLD, 0}, + {APL4_WORLD, APL4, WORLD, 0}, + {APL5_WORLD, APL5, WORLD, 0}, + {APL6_WORLD, APL6, WORLD, 0}, + {APL7_FCCA, APL7, FCCA, 0}, + {APL8_WORLD, APL8, WORLD, 0}, + {APL9_MKKC, APL9, MKKC, 0}, + {APL10_MKKC, APL10, MKKC, 0}, + {APL3_FCCA, APL3, FCCA, 0}, + {APL1_ETSIC, APL1, ETSIC, 0}, + {APL2_ETSIC, APL2, ETSIC, 0}, + {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, + {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, + {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, + {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, + {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, + {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, + {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, + {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, + {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, + {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, + {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, + {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, + {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, + {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, + {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, + {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, + {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, + {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, + {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, + {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, + {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, + {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, + {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, + {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, + {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, + {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, + {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, + {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, + {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, + {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, + {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, + + {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, + {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, + {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, + {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, + {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, + {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, + {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, + {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, + {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, + {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, + {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, + {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, + {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, +}; + +static const struct country_code_to_reg_dmn g_all_countries[] = { + {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, + {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, + {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, + {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, + {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, + {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, + {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, + {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, + {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, + {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, + {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, + {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, + {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, + {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, + {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, + {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, + {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, + {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, + {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, + {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, + {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, + {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, + {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, + {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, + {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, + {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, + {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, + {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, + {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, + {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, + {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, + {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, + {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, + {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, + {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, + {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, + {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, + {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, + {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, + {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, + {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, + {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, + {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, + {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, + {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, + {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, + {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, + {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, + {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, + {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, + {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, + {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, + {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, + {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, + {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, + {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, + {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, + {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, + {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, + {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, + {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, + {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, + {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, + {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, + {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, + {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, + {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, + {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, + {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, + {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, + {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, + {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, + {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, + {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, + {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, + {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, + {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, + {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, + {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, + {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, + {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, + {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, + {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, + {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, + {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, + {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, + {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, + {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, + {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, + {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, + {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, + {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, + {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, + {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, + {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, + {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, + {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, + {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, + {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, + {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, + {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, + {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, + {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, + {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, + {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, + {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, + {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, + {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, + {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, + {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, + {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, + {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, + {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, + {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, + {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, + {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, + {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, + {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, + {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, + {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, + {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, + {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, + {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, + {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, + {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, + {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, + {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, + {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, + {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, + {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, + {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, + {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, + {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, + {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, + {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, + {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, + {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, + {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, + {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, + {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, + {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, + {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, + {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, + {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, + {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, + {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, + {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, + {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, + {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, + {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, + {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, + {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, + {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, + {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, + {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, + {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, + {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, + {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, + {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, + {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, + {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, + {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} +}; + +static const struct reg_dmn g_reg_dmns[] = { + {DEBUG_REG_DMN, FCC}, + {APL1, FCC}, + {APL2, FCC}, + {APL3, FCC}, + {APL4, FCC}, + {APL5, FCC}, + {APL6, ETSI}, + {APL7, FCC}, + {APL8, ETSI}, + {APL9, ETSI}, + {APL10, ETSI}, + {APL11, ETSI}, + {APL12, ETSI}, + {ETSI1, ETSI}, + {ETSI2, ETSI}, + {ETSI3, ETSI}, + {ETSI4, ETSI}, + {ETSI5, ETSI}, + {ETSI6, ETSI}, + {ETSI8, ETSI}, + {ETSI9, ETSI}, + {FCC1, FCC}, + {FCC2, FCC}, + {FCC3, FCC}, + {FCC4, FCC}, + {FCC5, FCC}, + {FCC6, FCC}, + {MKK1, MKK}, + {MKK2, MKK}, + {MKK3, MKK}, + {MKK4, MKK}, + {MKK5, MKK}, + {MKK6, MKK}, + {MKK7, MKK}, + {MKK8, MKK}, + {MKK9, MKK}, + {MKK10, MKK}, + {MKK11, MKK}, + {MKK12, MKK}, + {MKK13, MKK}, + {MKK14, MKK}, + {MKK15, MKK}, + {APLD, NO_CTL}, + {ETSIA, NO_CTL}, + {ETSIB, ETSI}, + {ETSIC, ETSI}, + {FCCA, FCC}, + {MKKA, MKK}, + {MKKC, MKK}, + {WORLD, ETSI}, + {WOR0_WORLD, NO_CTL}, + {WOR01_WORLD, NO_CTL}, + {WOR02_WORLD, NO_CTL}, + {EU1_WORLD, NO_CTL}, + {WOR1_WORLD, NO_CTL}, + {WOR2_WORLD, NO_CTL}, + {WOR3_WORLD, NO_CTL}, + {WOR4_WORLD, NO_CTL}, + {WOR5_ETSIC, NO_CTL}, + {WOR9_WORLD, NO_CTL}, + {WORA_WORLD, NO_CTL}, + {WORB_WORLD, NO_CTL}, + {WORC_WORLD, NO_CTL}, + {NULL1, NO_CTL}, +}; + + +struct reg_dmn_tables g_reg_dmn_tbl = { + g_reg_dmn_pairs, + g_all_countries, + g_reg_dmns, + QDF_ARRAY_SIZE(g_reg_dmn_pairs), + QDF_ARRAY_SIZE(g_all_countries), + QDF_ARRAY_SIZE(g_reg_dmns), }; static uint16_t get_eeprom_rd(uint16_t rd) @@ -177,177 +491,165 @@ static uint16_t get_eeprom_rd(uint16_t rd) return rd & ~WORLDWIDE_ROAMING_FLAG; } -/* - * Return whether or not the regulatory domain/country in EEPROM - * is acceptable. - */ -static bool regdmn_is_eeprom_valid(uint16_t rd) +static bool reg_dmn_is_eeprom_valid(uint16_t rd) { int32_t i; if (rd & COUNTRY_ERD_FLAG) { uint16_t cc = rd & ~COUNTRY_ERD_FLAG; - for (i = 0; i < ol_regdmn_rdt.allCountriesCt; i++) - if (ol_regdmn_rdt.allCountries[i].countryCode == cc) + for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) + if (g_reg_dmn_tbl.all_countries[i].country_code == cc) return true; } else { - for (i = 0; i < ol_regdmn_rdt.regDomainPairsCt; i++) - if (ol_regdmn_rdt.regDomainPairs[i].regDmnEnum == rd) + for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == rd) return true; } - /* TODO: Bring it under debug level */ - qdf_print("%s: invalid regulatory domain/country code 0x%x\n", - __func__, rd); + + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "invalid regulatory domain/country code 0x%x", rd); + return false; } -/* - * Find the pointer to the country element in the country table - * corresponding to the country code - */ -static const COUNTRY_CODE_TO_ENUM_RD *find_country(uint16_t country_code) +static const struct country_code_to_reg_dmn *find_country(uint16_t country_code) { int32_t i; - for (i = 0; i < ol_regdmn_rdt.allCountriesCt; i++) { - if (ol_regdmn_rdt.allCountries[i].countryCode == country_code) - return &ol_regdmn_rdt.allCountries[i]; + for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { + if (g_reg_dmn_tbl.all_countries[i].country_code == country_code) + return &g_reg_dmn_tbl.all_countries[i]; } - return NULL; /* Not found */ + + return NULL; } int32_t cds_get_country_from_alpha2(uint8_t *alpha2) { int32_t i; - for (i = 0; i < ol_regdmn_rdt.allCountriesCt; i++) { - if (ol_regdmn_rdt.allCountries[i].isoName[0] == alpha2[0] && - ol_regdmn_rdt.allCountries[i].isoName[1] == alpha2[1]) - return ol_regdmn_rdt.allCountries[i].countryCode; + for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { + if (g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0] && + g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1]) + return g_reg_dmn_tbl.all_countries[i].country_code; } + return CTRY_DEFAULT; } -static uint16_t regdmn_get_default_country(uint16_t rd) +static uint16_t reg_dmn_get_default_country(uint16_t rd) { int32_t i; + const struct country_code_to_reg_dmn *country = NULL; + uint16_t cc = rd & ~COUNTRY_ERD_FLAG; if (rd & COUNTRY_ERD_FLAG) { - const COUNTRY_CODE_TO_ENUM_RD *country = NULL; - uint16_t cc = rd & ~COUNTRY_ERD_FLAG; - country = find_country(cc); if (country) return cc; } - /* - * Check reg domains that have only one country - */ - for (i = 0; i < ol_regdmn_rdt.regDomainPairsCt; i++) { - if (ol_regdmn_rdt.regDomainPairs[i].regDmnEnum == rd) { - if (ol_regdmn_rdt.regDomainPairs[i].singleCC != 0) - return ol_regdmn_rdt.regDomainPairs[i].singleCC; + for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == rd) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc != 0) + return g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc; else - i = ol_regdmn_rdt.regDomainPairsCt; + i = g_reg_dmn_tbl.reg_dmn_pairs_cnt; } } + return CTRY_DEFAULT; } -static const REG_DMN_PAIR_MAPPING *get_regdmn_pair(uint16_t reg_dmn) +static const struct reg_dmn_pair *get_reg_dmn_pair(uint16_t reg_dmn) { int32_t i; - for (i = 0; i < ol_regdmn_rdt.regDomainPairsCt; i++) { - if (ol_regdmn_rdt.regDomainPairs[i].regDmnEnum == reg_dmn) - return &ol_regdmn_rdt.regDomainPairs[i]; + for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) + return &g_reg_dmn_tbl.reg_dmn_pairs[i]; } + return NULL; } -static const REG_DOMAIN *get_regdmn(uint16_t reg_dmn) +static const struct reg_dmn *get_reg_dmn(uint16_t reg_dmn) { int32_t i; - for (i = 0; i < ol_regdmn_rdt.regDomainsCt; i++) { - if (ol_regdmn_rdt.regDomains[i].regDmnEnum == reg_dmn) - return &ol_regdmn_rdt.regDomains[i]; + for (i = 0; i < g_reg_dmn_tbl.reg_dmns_cnt; i++) { + if (g_reg_dmn_tbl.reg_dmns[i].reg_dmn == reg_dmn) + return &g_reg_dmn_tbl.reg_dmns[i]; } + return NULL; } -static const COUNTRY_CODE_TO_ENUM_RD *get_country_from_rd(uint16_t regdmn) +static const struct country_code_to_reg_dmn *get_country_from_rd( + uint16_t reg_dmn) { int32_t i; - for (i = 0; i < ol_regdmn_rdt.allCountriesCt; i++) { - if (ol_regdmn_rdt.allCountries[i].regDmnEnum == regdmn) - return &ol_regdmn_rdt.allCountries[i]; + for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { + if (g_reg_dmn_tbl.all_countries[i].reg_dmn_enum == reg_dmn) + return &g_reg_dmn_tbl.all_countries[i]; } - return NULL; /* Not found */ + + return NULL; } -/* - * Some users have reported their EEPROM programmed with - * 0x8000 set, this is not a supported regulatory domain - * but since we have more than one user with it we need - * a solution for them. We default to WOR0_WORLD - */ static void regd_sanitize(struct regulatory *reg) { if (reg->reg_domain != COUNTRY_ERD_FLAG) return; + reg->reg_domain = WOR0_WORLD; } -/* - * Returns country string for the given regulatory domain. - */ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) { uint16_t country_code; - uint16_t regdmn, rd; - const COUNTRY_CODE_TO_ENUM_RD *country = NULL; + uint16_t reg_dmn, rd; + const struct country_code_to_reg_dmn *country = NULL; regd_sanitize(reg); rd = reg->reg_domain; - if (!regdmn_is_eeprom_valid(rd)) + if (!reg_dmn_is_eeprom_valid(rd)) return -EINVAL; - regdmn = get_eeprom_rd(rd); + reg_dmn = get_eeprom_rd(rd); - country_code = regdmn_get_default_country(regdmn); - if (country_code == CTRY_DEFAULT && regdmn == CTRY_DEFAULT) { - /* Set to CTRY_UNITED_STATES for testing */ + country_code = reg_dmn_get_default_country(reg_dmn); + if (country_code == CTRY_DEFAULT && reg_dmn == CTRY_DEFAULT) country_code = CTRY_UNITED_STATES; - } if (country_code != CTRY_DEFAULT) { country = find_country(country_code); if (!country) { - /* TODO: Bring it under debug level */ - qdf_print(KERN_ERR "Not a valid country code\n"); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "not a valid country code"); return -EINVAL; } - regdmn = country->regDmnEnum; + + reg_dmn = country->reg_dmn_enum; } - reg->regpair = get_regdmn_pair(regdmn); + reg->regpair = get_reg_dmn_pair(reg_dmn); if (!reg->regpair) { - /* TODO: Bring it under debug level */ - qdf_print(KERN_ERR "No regpair is found, can not proceeed\n"); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "no regpair is found, can not proceeed"); return -EINVAL; } + reg->country_code = country_code; if (!country) - country = get_country_from_rd(regdmn); + country = get_country_from_rd(reg_dmn); if (country) { - reg->alpha2[0] = country->isoName[0]; - reg->alpha2[1] = country->isoName[1]; + reg->alpha2[0] = country->iso_name[0]; + reg->alpha2[1] = country->iso_name[1]; } else { reg->alpha2[0] = '0'; reg->alpha2[1] = '0'; @@ -356,52 +658,57 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) return 0; } -/* - * Returns regulatory domain for given country string - */ -int32_t regdmn_get_regdmn_for_country(uint8_t *alpha2) +int32_t get_reg_dmn_for_country(uint8_t *alpha2) { uint8_t i; - for (i = 0; i < ol_regdmn_rdt.allCountriesCt; i++) { - if ((ol_regdmn_rdt.allCountries[i].isoName[0] == alpha2[0]) && - (ol_regdmn_rdt.allCountries[i].isoName[1] == alpha2[1])) - return ol_regdmn_rdt.allCountries[i].regDmnEnum; + for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { + if ((g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0]) && + (g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1])) + return g_reg_dmn_tbl.all_countries[i].reg_dmn_enum; } + return -1; } -void cds_fill_send_ctl_info_to_fw(struct regulatory *reg) +void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) { - const REG_DOMAIN *regdomain2G = NULL; - const REG_DOMAIN *regdomain5G = NULL; + const struct reg_dmn *reg_dmn_2g = NULL; + const struct reg_dmn *reg_dmn_5g = NULL; int8_t ctl_2g, ctl_5g; - const REG_DMN_PAIR_MAPPING *regpair; + const struct reg_dmn_pair *regpair; + tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); + + if (!wma) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "unable to get WMA handle"); + return; + } regpair = reg->regpair; - regdomain2G = get_regdmn(regpair->regDmn2GHz); - if (!regdomain2G) { - qdf_print(KERN_ERR "Failed to get regdmn 2G"); + reg_dmn_2g = get_reg_dmn(regpair->reg_dmn_2ghz); + if (!reg_dmn_2g) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "failed to get regdmn 2G"); return; } - regdomain5G = get_regdmn(regpair->regDmn5GHz); - if (!regdomain5G) { - qdf_print(KERN_ERR "Failed to get regdmn 5G"); + reg_dmn_5g = get_reg_dmn(regpair->reg_dmn_5ghz); + if (!reg_dmn_5g) { + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "failed to get regdmn 5G"); return; } - /* find first nible of CTL */ - ctl_2g = regdomain2G->conformance_test_limit; - ctl_5g = regdomain5G->conformance_test_limit; + ctl_2g = reg_dmn_2g->conformance_test_limit; + ctl_5g = reg_dmn_5g->conformance_test_limit; - /* save the ctl information for future reference */ reg->ctl_5g = ctl_5g; reg->ctl_2g = ctl_2g; - wma_send_regdomain_info_to_fw(reg->reg_domain, regpair->regDmn2GHz, - regpair->regDmn5GHz, ctl_2g, ctl_5g); + wma_send_regdomain_info_to_fw(reg->reg_domain, regpair->reg_dmn_2ghz, + regpair->reg_dmn_5ghz, ctl_2g, ctl_5g); } /* cds_set_wma_dfs_region() - to set the dfs region to wma @@ -415,64 +722,34 @@ void cds_set_wma_dfs_region(uint8_t dfs_region) tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); if (!wma) { - qdf_print(KERN_ERR "%s: Unable to get WMA handle", __func__); - return; - } - - qdf_print("%s: dfs_region: %d", __func__, dfs_region); - wma_set_dfs_region(wma, dfs_region); -} - -void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) -{ - tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA); - - if (!wma) { - WMA_LOGE("%s: Unable to get WMA handle", __func__); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "unable to get WMA handle"); return; } - cds_fill_send_ctl_info_to_fw(reg); - return; -} - -/* get the ctl from regdomain */ -uint8_t cds_get_ctl_for_regdmn(uint32_t reg_dmn) -{ - uint8_t i; - uint8_t default_regdmn_ctl = FCC; + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, + "dfs_region: %d", dfs_region); - if (reg_dmn == CTRY_DEFAULT) { - return default_regdmn_ctl; - } else { - for (i = 0; i < ol_regdmn_rdt.regDomainsCt; i++) { - if (ol_regdmn_rdt.regDomains[i].regDmnEnum == reg_dmn) - return ol_regdmn_rdt.regDomains[i]. - conformance_test_limit; - } - } - return -1; + wma_set_dfs_region(wma, dfs_region); } -/* - * Get the 5G reg domain value for reg doamin - */ -uint16_t cds_get_regdmn_5g(uint32_t reg_dmn) +uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn) { uint16_t i; - for (i = 0; i < ol_regdmn_rdt.regDomainPairsCt; i++) { - if (ol_regdmn_rdt.regDomainPairs[i].regDmnEnum == reg_dmn) { - return ol_regdmn_rdt.regDomainPairs[i].regDmn5GHz; - } + for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) + return g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_5ghz; } - qdf_print("%s: invalid regulatory domain/country code 0x%x\n", - __func__, reg_dmn); + + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "invalid regulatory domain/country code 0x%x", + reg_dmn); return 0; } /** - * cds_regdm_get_chanwidth_from_opclass() - return chan width based on opclass + * cds_reg_dmn_get_chanwidth_from_opclass() - return chan width based on opclass * @country: country name * @channel: operating channel * @opclass: operating class @@ -483,11 +760,11 @@ uint16_t cds_get_regdmn_5g(uint32_t reg_dmn) * Return: channel width * */ -uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, +uint16_t cds_reg_dmn_get_chanwidth_from_opclass(uint8_t *country, uint8_t channel, uint8_t opclass) { - regdm_op_class_map_t *class; + const struct reg_dmn_op_class_map_t *class; uint16_t i; if (true != qdf_mem_cmp(country, "US", 2)) @@ -511,17 +788,15 @@ uint16_t cds_regdm_get_chanwidth_from_opclass(uint8_t *country, } class++; } + return 0; } -/* - * Get operating class for a given channel - */ -uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, +uint16_t cds_reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel, uint8_t offset) { - regdm_op_class_map_t *class = NULL; + const struct reg_dmn_op_class_map_t *class = NULL; uint16_t i = 0; if (true != qdf_mem_cmp(country, "US", 2)) { @@ -545,48 +820,43 @@ uint16_t cds_regdm_get_opclass_from_channel(uint8_t *country, uint8_t channel, } class++; } + return 0; } -/* - * Set current operating classes per country, regdomain - */ -uint16_t cds_regdm_set_curr_opclasses(uint8_t num_classes, uint8_t *class) +uint16_t cds_reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class) { uint8_t i; if (CDS_MAX_SUPP_OPER_CLASSES < num_classes) { - qdf_print(KERN_ERR "%s: Invalid numClasses (%d)\n", - __func__, num_classes); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "invalid num classes %d", num_classes); return -1; } for (i = 0; i < num_classes; i++) { - regdm_curr_supp_opp_classes.classes[i] = class[i]; + reg_dmn_curr_supp_opp_classes.classes[i] = class[i]; } - regdm_curr_supp_opp_classes.num_classes = num_classes; + + reg_dmn_curr_supp_opp_classes.num_classes = num_classes; return 0; } -/* - * Get current operating classes - */ -uint16_t cds_regdm_get_curr_opclasses(uint8_t *num_classes, uint8_t *class) +uint16_t cds_reg_dmn_get_curr_opclasses(uint8_t *num_classes, uint8_t *class) { uint8_t i; if (!num_classes || !class) { - qdf_print(KERN_ERR "%s: Either num_classes or class is null\n", - __func__); + QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, + "either num_classes or class is null"); return -1; } - for (i = 0; i < regdm_curr_supp_opp_classes.num_classes; i++) { - class[i] = regdm_curr_supp_opp_classes.classes[i]; - } + for (i = 0; i < reg_dmn_curr_supp_opp_classes.num_classes; i++) + class[i] = reg_dmn_curr_supp_opp_classes.classes[i]; - *num_classes = regdm_curr_supp_opp_classes.num_classes; + *num_classes = reg_dmn_curr_supp_opp_classes.num_classes; return 0; } diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 6e367700af57..960962090b01 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -139,10 +139,10 @@ hdd_world_regrules_67_68_6A_6C = { static const struct ieee80211_regdomain *hdd_get_world_regrules( struct regulatory *reg) { - REG_DMN_PAIR_MAPPING *regpair = - (REG_DMN_PAIR_MAPPING *)reg->regpair; + struct reg_dmn_pair *regpair = + (struct reg_dmn_pair *)reg->regpair; - switch (regpair->regDmnEnum) { + switch (regpair->reg_dmn_enum) { case 0x60: case 0x61: case 0x62: diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index c0bab96447f7..3c605798497f 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -5544,7 +5544,7 @@ static void send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx, tpDphHashNode psta; - op_class = cds_regdm_get_opclass_from_channel( + op_class = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, new_channel, ch_bandwidth); @@ -5591,7 +5591,7 @@ static void lim_process_sme_dfs_csa_ie_request(tpAniSirGlobal mac_ctx, tpPESession session_entry = NULL; uint8_t session_id; tLimWiderBWChannelSwitchInfo *wider_bw_ch_switch; - offset_t ch_offset; + enum offset_t ch_offset; if (msg_buf == NULL) { lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 5bf81e6c9cb7..f524a28f2b22 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -2610,7 +2610,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, } - op_class = cds_regdm_get_opclass_from_channel( + op_class = cds_reg_dmn_get_opclass_from_channel( pMac->scan.countryCodeCurrent, psessionEntry->currentOperChannel, chanOffset); @@ -2635,7 +2635,7 @@ void populate_dot11f_tdls_offchannel_params(tpAniSirGlobal pMac, suppOperClasses->present = 1; suppOperClasses->classes[0] = op_class; - cds_regdm_get_curr_opclasses(&numClasses, &classes[0]); + cds_reg_dmn_get_curr_opclasses(&numClasses, &classes[0]); for (i = 0; i < numClasses; i++) { suppOperClasses->classes[i + 1] = classes[i]; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index 574116591fdd..c990d54dbe4a 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -880,10 +880,10 @@ tSirRetStatus lim_send_ht40_obss_scanind(tpAniSirGlobal mac_ctx, ht40_obss_scanind->obss_activity_threshold = session->obss_ht40_scanparam.obss_activity_threshold; ht40_obss_scanind->current_operatingclass = - cds_regdm_get_opclass_from_channel( - mac_ctx->scan.countryCodeCurrent, - session->currentOperChannel, - session->ch_width); + cds_reg_dmn_get_opclass_from_channel( + mac_ctx->scan.countryCodeCurrent, + session->currentOperChannel, + session->ch_width); channelnum = WNI_CFG_VALID_CHANNEL_LIST_LEN; if (wlan_cfg_get_str(mac_ctx, WNI_CFG_VALID_CHANNEL_LIST, chan_list, &channelnum) != eSIR_SUCCESS) { diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 17d44927d859..590d8eba74b3 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2106,7 +2106,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) } else if (csa_params->ies_present_flag & lim_xcsa_ie_present) { chan_space = - cds_regdm_get_chanwidth_from_opclass( + cds_reg_dmn_get_chanwidth_from_opclass( mac_ctx->scan.countryCodeCurrent, csa_params->channel, csa_params->new_op_class); @@ -2157,7 +2157,7 @@ void lim_handle_csa_offload_msg(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) if (csa_params->ies_present_flag & lim_xcsa_ie_present) { chan_space = - cds_regdm_get_chanwidth_from_opclass( + cds_reg_dmn_get_chanwidth_from_opclass( mac_ctx->scan.countryCodeCurrent, csa_params->channel, csa_params->new_op_class); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index 80c7a66a2ab0..b41e6163ed56 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -256,7 +256,7 @@ void populate_dot_11_f_ext_chann_switch_ann(tpAniSirGlobal mac_ptr, ch_offset = session_entry->gLimChannelSwitch.sec_ch_offset; dot_11_ptr->switch_mode = session_entry->gLimChannelSwitch.switchMode; - dot_11_ptr->new_reg_class = cds_regdm_get_opclass_from_channel( + dot_11_ptr->new_reg_class = cds_reg_dmn_get_opclass_from_channel( mac_ptr->scan.countryCodeCurrent, session_entry->gLimChannelSwitch.primaryChannel, ch_offset); @@ -320,9 +320,9 @@ populate_dot11_supp_operating_classes(tpAniSirGlobal mac_ptr, } } - cds_regdm_get_curr_opclasses(&dot_11_ptr->num_classes, + cds_reg_dmn_get_curr_opclasses(&dot_11_ptr->num_classes, &dot_11_ptr->classes[1]); - dot_11_ptr->classes[0] = cds_regdm_get_opclass_from_channel( + dot_11_ptr->classes[0] = cds_reg_dmn_get_opclass_from_channel( mac_ptr->scan.countryCodeCurrent, session_entry->currentOperChannel, ch_bandwidth); diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 4e907aa955ae..709719fac326 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1430,7 +1430,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, for (; bw >= BW20; bw--) { uint16_t op_class; - op_class = cds_regdm_get_opclass_from_channel( + op_class = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel, bw); if (!op_class) diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index cdbe608b0346..6840dcf32361 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15303,20 +15303,20 @@ void sme_get_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset, * matching 20MHz, else for any BW. */ if (bw_offset & (1 << BW_40_OFFSET_BIT)) { - *opclass = cds_regdm_get_opclass_from_channel( + *opclass = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel, BW40_LOW_PRIMARY); if (!(*opclass)) { - *opclass = cds_regdm_get_opclass_from_channel( + *opclass = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel, BW40_HIGH_PRIMARY); } } else if (bw_offset & (1 << BW_20_OFFSET_BIT)) { - *opclass = cds_regdm_get_opclass_from_channel( + *opclass = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel, BW20); } else { - *opclass = cds_regdm_get_opclass_from_channel( + *opclass = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel, BWALL); } diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 19f173ecda9b..3b68d448bfe3 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -18413,7 +18413,7 @@ csr_update_op_class_array(tpAniSirGlobal mac_ctx, && *i < (CDS_MAX_SUPP_OPER_CLASSES - 1); idx++) { for (ch_bandwidth = BW20; ch_bandwidth < BWALL; ch_bandwidth++) { - class = cds_regdm_get_opclass_from_channel( + class = cds_reg_dmn_get_opclass_from_channel( mac_ctx->scan.countryCodeCurrent, channel_info->channelList[idx], ch_bandwidth); @@ -18484,7 +18484,7 @@ void csr_init_operating_classes(tHalHandle hHal) /* Set the ordered list of op classes in regdomain * for use by other modules */ - cds_regdm_set_curr_opclasses(numClasses, &opClasses[0]); + cds_reg_dmn_set_curr_opclasses(numClasses, &opClasses[0]); } /** diff --git a/core/wma/inc/wma_dfs_interface.h b/core/wma/inc/wma_dfs_interface.h index 6887f11cff12..ae21355bfa2c 100644 --- a/core/wma/inc/wma_dfs_interface.h +++ b/core/wma/inc/wma_dfs_interface.h @@ -260,7 +260,7 @@ typedef struct ieee80211com { int (*ic_dfs_control)(struct ieee80211com *ic, u_int id, void *indata, uint32_t insize, void *outdata, uint32_t *outsize); - enum HAL_DFS_DOMAIN current_dfs_regdomain; + enum dfs_domain current_dfs_regdomain; uint8_t vdev_id; uint8_t last_radar_found_chan; int32_t dfs_pri_multiplier; -- cgit v1.2.3 From 0f5dc481251658c1812a856685a435b895fca0b5 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Mon, 25 Jan 2016 10:23:30 -0800 Subject: qcacld-3.0: Add kernel-doc for regdomain functions Add kernel documentation for regdomain functions and data structures. Change-Id: I438c81892216354d9fbda6947fabba031ddcc854 CRs-Fixed: 961806 --- core/cds/src/cds_regdomain.c | 144 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 123 insertions(+), 21 deletions(-) diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 19a91319d114..fd15d36b54c0 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -65,7 +65,7 @@ * SUCH DAMAGES. */ -#include +#include "qdf_types.h" #include "wma.h" #include "cds_regdomain.h" @@ -486,32 +486,51 @@ struct reg_dmn_tables g_reg_dmn_tbl = { QDF_ARRAY_SIZE(g_reg_dmns), }; -static uint16_t get_eeprom_rd(uint16_t rd) +/** + * get_bdf_reg_dmn() - get regulatory domain from BDF + * @reg_dmn: BDF regulatory domain + * + * Return: regulatory domain + */ +static uint16_t get_bdf_reg_dmn(uint16_t reg_dmn) { - return rd & ~WORLDWIDE_ROAMING_FLAG; + return reg_dmn & ~WORLDWIDE_ROAMING_FLAG; } -static bool reg_dmn_is_eeprom_valid(uint16_t rd) +/** + * is_reg_dmn_valid() - is regulatory domain valid + * @reg_dmn: regulatory domain + * + * Return: true or false + */ +static bool is_reg_dmn_valid(uint16_t reg_dmn) { int32_t i; - if (rd & COUNTRY_ERD_FLAG) { - uint16_t cc = rd & ~COUNTRY_ERD_FLAG; + if (reg_dmn & COUNTRY_ERD_FLAG) { + uint16_t cc = reg_dmn & ~COUNTRY_ERD_FLAG; for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) if (g_reg_dmn_tbl.all_countries[i].country_code == cc) return true; } else { for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == rd) + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum + == reg_dmn) return true; } QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, - "invalid regulatory domain/country code 0x%x", rd); + "invalid regulatory domain/country code 0x%x", reg_dmn); return false; } +/** + * find_country() - find country data + * @country_code: country code + * + * Return: country code data pointer + */ static const struct country_code_to_reg_dmn *find_country(uint16_t country_code) { int32_t i; @@ -524,6 +543,12 @@ static const struct country_code_to_reg_dmn *find_country(uint16_t country_code) return NULL; } +/** + * cds_get_country_from_alpha2() - get country from alpha2 + * @alpha2: country code alpha2 + * + * Return: country code + */ int32_t cds_get_country_from_alpha2(uint8_t *alpha2) { int32_t i; @@ -537,20 +562,26 @@ int32_t cds_get_country_from_alpha2(uint8_t *alpha2) return CTRY_DEFAULT; } -static uint16_t reg_dmn_get_default_country(uint16_t rd) +/** + * reg_dmn_get_default_country() - get default country for regulatory domain + * @reg_dmn: regulatory domain + * + * Return: default country + */ +static uint16_t reg_dmn_get_default_country(uint16_t reg_dmn) { int32_t i; const struct country_code_to_reg_dmn *country = NULL; - uint16_t cc = rd & ~COUNTRY_ERD_FLAG; + uint16_t cc = reg_dmn & ~COUNTRY_ERD_FLAG; - if (rd & COUNTRY_ERD_FLAG) { + if (reg_dmn & COUNTRY_ERD_FLAG) { country = find_country(cc); if (country) return cc; } for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == rd) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) { if (g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc != 0) return g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc; else @@ -561,6 +592,12 @@ static uint16_t reg_dmn_get_default_country(uint16_t rd) return CTRY_DEFAULT; } +/** + * get_reg_dmn_pair() - get regulatory domain pair pointer + * @reg_dmn: regulatory domain + * + * Return: pointer to regulatory domain pair data + */ static const struct reg_dmn_pair *get_reg_dmn_pair(uint16_t reg_dmn) { int32_t i; @@ -573,6 +610,12 @@ static const struct reg_dmn_pair *get_reg_dmn_pair(uint16_t reg_dmn) return NULL; } +/** + * get_reg_dmn() - get regulatory domain pointer + * @reg_dmn: regulatory domain + * + * Return: pointer to regulatory domain data + */ static const struct reg_dmn *get_reg_dmn(uint16_t reg_dmn) { int32_t i; @@ -585,6 +628,12 @@ static const struct reg_dmn *get_reg_dmn(uint16_t reg_dmn) return NULL; } +/** + * get_country_from_rd() - get country from regulatory domain + * @reg_dmn: regulatory domain + * + * Return: country code enum + */ static const struct country_code_to_reg_dmn *get_country_from_rd( uint16_t reg_dmn) { @@ -598,7 +647,13 @@ static const struct country_code_to_reg_dmn *get_country_from_rd( return NULL; } -static void regd_sanitize(struct regulatory *reg) +/** + * reg_dmn_sanitize() - sanitize regulatory domain + * @reg: regulatory data structure + * + * Return: none + */ +static void reg_dmn_sanitize(struct regulatory *reg) { if (reg->reg_domain != COUNTRY_ERD_FLAG) return; @@ -606,19 +661,25 @@ static void regd_sanitize(struct regulatory *reg) reg->reg_domain = WOR0_WORLD; } +/** + * cds_fill_some_regulatory_info() - fill regulatory information + * @reg: regulatory data structure + * + * Return: error code + */ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) { uint16_t country_code; uint16_t reg_dmn, rd; const struct country_code_to_reg_dmn *country = NULL; - regd_sanitize(reg); + reg_dmn_sanitize(reg); rd = reg->reg_domain; - if (!reg_dmn_is_eeprom_valid(rd)) + if (!is_reg_dmn_valid(rd)) return -EINVAL; - reg_dmn = get_eeprom_rd(rd); + reg_dmn = get_bdf_reg_dmn(rd); country_code = reg_dmn_get_default_country(reg_dmn); if (country_code == CTRY_DEFAULT && reg_dmn == CTRY_DEFAULT) @@ -658,6 +719,12 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) return 0; } +/** + * get_reg_dmn_for_country() - get regulatory domain for country + * @alpha2: country alpha2 + * + * Return: regulatory domain + */ int32_t get_reg_dmn_for_country(uint8_t *alpha2) { uint8_t i; @@ -671,6 +738,12 @@ int32_t get_reg_dmn_for_country(uint8_t *alpha2) return -1; } +/** + * cds_fill_and_send_ctl_to_fw() - fill and send ctl to firmware + * @reg: the regulatory handle + * + * Return: none + */ void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) { const struct reg_dmn *reg_dmn_2g = NULL; @@ -711,8 +784,8 @@ void cds_fill_and_send_ctl_to_fw(struct regulatory *reg) regpair->reg_dmn_5ghz, ctl_2g, ctl_5g); } -/* cds_set_wma_dfs_region() - to set the dfs region to wma - * +/** + * cds_set_wma_dfs_region() - to set the dfs region to wma * @reg: the regulatory handle * * Return: none @@ -733,6 +806,12 @@ void cds_set_wma_dfs_region(uint8_t dfs_region) wma_set_dfs_region(wma, dfs_region); } +/** + * cds_get_reg_dmn_5g() - get the 5G reg-domain + * @reg_dmn: the complete reg domain + * + * Return: 5 G reg domain + */ uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn) { uint16_t i; @@ -745,6 +824,7 @@ uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn) QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "invalid regulatory domain/country code 0x%x", reg_dmn); + return 0; } @@ -761,8 +841,8 @@ uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn) * */ uint16_t cds_reg_dmn_get_chanwidth_from_opclass(uint8_t *country, - uint8_t channel, - uint8_t opclass) + uint8_t channel, + uint8_t opclass) { const struct reg_dmn_op_class_map_t *class; uint16_t i; @@ -793,8 +873,16 @@ uint16_t cds_reg_dmn_get_chanwidth_from_opclass(uint8_t *country, } +/** + * cds_reg_dmn_get_opclass_from_channel() - get operating class from channel + * @country: the complete reg domain + * @channel: channel number + * @offset: the value of offset + * + * Return: operating class + */ uint16_t cds_reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel, - uint8_t offset) + uint8_t offset) { const struct reg_dmn_op_class_map_t *class = NULL; uint16_t i = 0; @@ -824,6 +912,13 @@ uint16_t cds_reg_dmn_get_opclass_from_channel(uint8_t *country, uint8_t channel, return 0; } +/** + * cds_reg_dmn_set_curr_opclasses() - set the current operating class + * @num_classes: number of classes + * @class: operating class + * + * Return: error code + */ uint16_t cds_reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class) { uint8_t i; @@ -843,6 +938,13 @@ uint16_t cds_reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class) return 0; } +/** + * cds_reg_dmn_get_curr_opclasses() - get the current operating class + * @num_classes: number of classes + * @class: operating class + * + * Return: error code + */ uint16_t cds_reg_dmn_get_curr_opclasses(uint8_t *num_classes, uint8_t *class) { uint8_t i; -- cgit v1.2.3 From c3c490cd0f07c682c27a3793fc7df2fa84458295 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Mon, 25 Jan 2016 16:33:10 -0800 Subject: qcacld-3.0: Correct the country code definitions Correct the definitions from country code to regulatory domains mappings. Add the missing countries to regulatory domain mappings. Also streamline the definitions of regulatory domain pairs and regulatory domains. Change-Id: I0ff5a13425c6b5d4671864745f6b44a0d16b78aa CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 158 ++++++++---------- core/cds/src/cds_regdomain.c | 372 ++++++++++++++++++++----------------------- 2 files changed, 236 insertions(+), 294 deletions(-) diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 0c4f15705f3b..c5db379a6281 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -72,31 +72,34 @@ #define __CDS_REGDOMAIN_H #define MAX_CHANNELS_PER_OPERATING_CLASS 25 -#define CTRY_DEBUG 0x1ff +#define CDS_MAX_SUPP_OPER_CLASSES 32 #define CTRY_DEFAULT 0 #define COUNTRY_ERD_FLAG 0x8000 #define WORLDWIDE_ROAMING_FLAG 0x4000 -#define DEF_REGDMN FCC3_FCCA -#define CDS_MAX_SUPP_OPER_CLASSES 32 enum reg_domain { NO_ENUMRD = 0x00, NULL1_WORLD = 0x03, NULL1_ETSIB = 0x07, NULL1_ETSIC = 0x08, + FCC1_FCCA = 0x10, FCC1_WORLD = 0x11, - FCC4_FCCA = 0x12, - FCC5_FCCA = 0x13, - FCC6_FCCA = 0x14, FCC2_FCCA = 0x20, FCC2_WORLD = 0x21, FCC2_ETSIC = 0x22, - FCC6_WORLD = 0x23, - FRANCE_RES = 0x31, FCC3_FCCA = 0x3A, FCC3_WORLD = 0x3B, FCC3_ETSIC = 0x3F, + FCC4_FCCA = 0x12, + FCC5_FCCA = 0x13, + FCC6_FCCA = 0x14, + FCC7_FCCA = 0x15, + FCC8_FCCA = 0x16, + FCC6_WORLD = 0x23, + FCC9_FCCA = 0x17, + FCC10_FCCA = 0x18, + FCC11_WORLD = 0x19, ETSI1_WORLD = 0x37, ETSI3_ETSIA = 0x32, @@ -106,46 +109,42 @@ enum reg_domain { ETSI4_ETSIC = 0x38, ETSI5_WORLD = 0x39, ETSI6_WORLD = 0x34, + ETSI_RESERVED = 0x33, + FRANCE_RES = 0x31, + ETSI7_WORLD = 0x3C, ETSI8_WORLD = 0x3D, ETSI9_WORLD = 0x3E, - ETSI_RESERVED = 0x33, + ETSI10_WORLD = 0x24, + ETSI11_WORLD = 0x26, - MKK1_MKKA = 0x40, - MKK1_MKKB = 0x41, APL4_WORLD = 0x42, - MKK2_MKKA = 0x43, + APL3_FCCA = 0x50, APL_RESERVED = 0x44, APL2_WORLD = 0x45, + APL2_FCCA = 0x4D, APL2_APLC = 0x46, APL3_WORLD = 0x47, - MKK1_FCCA = 0x48, APL2_APLD = 0x49, - MKK1_MKKA1 = 0x4A, - MKK1_MKKA2 = 0x4B, - MKK1_MKKC = 0x4C, - APL2_FCCA = 0x4D, - APL11_FCCA = 0x4F, - - APL3_FCCA = 0x50, - APL12_WORLD = 0x51, APL1_WORLD = 0x52, APL1_FCCA = 0x53, APL1_APLA = 0x54, APL1_ETSIC = 0x55, APL2_ETSIC = 0x56, APL5_WORLD = 0x58, - APL13_WORLD = 0x5A, APL6_WORLD = 0x5B, APL7_FCCA = 0x5C, APL8_WORLD = 0x5D, - APL9_MKKC = 0x5E, - APL10_MKKC = 0x5F, + APL9_WORLD = 0x5E, + APL10_WORLD = 0x5F, + APL11_FCCA = 0x4F, + APL12_WORLD = 0x51, + APL13_WORLD = 0x5A, WOR0_WORLD = 0x60, WOR1_WORLD = 0x61, WOR2_WORLD = 0x62, WOR3_WORLD = 0x63, - WOR4_WORLD = 0x64, + WOR4_FCCA = 0x64, WOR5_ETSIC = 0x65, WOR01_WORLD = 0x66, WOR02_WORLD = 0x67, @@ -161,37 +160,11 @@ enum reg_domain { MKK4_MKKB = 0x83, MKK4_MKKA2 = 0x84, MKK4_MKKC = 0x85, + MKK5_MKKA = 0x99, + MKK5_FCCA = 0x9A, MKK5_MKKB = 0x86, MKK5_MKKA2 = 0x87, MKK5_MKKC = 0x88, - MKK5_MKKA = 0x99, - MKK5_FCCA = 0x9A, - MKK6_MKKB = 0x89, - MKK6_MKKA2 = 0x8A, - MKK6_MKKC = 0x8B, - MKK7_MKKB = 0x8C, - MKK7_MKKA2 = 0x8D, - MKK7_MKKC = 0x8E, - MKK8_MKKB = 0x8F, - MKK8_MKKA2 = 0x90, - MKK8_MKKC = 0x91, - MKK14_MKKA1 = 0x92, - MKK15_MKKA1 = 0x93, - MKK10_FCCA = 0xD0, - MKK10_MKKA1 = 0xD1, - MKK10_MKKC = 0xD2, - MKK10_MKKA2 = 0xD3, - MKK11_MKKA = 0xD4, - MKK11_FCCA = 0xD5, - MKK11_MKKA1 = 0xD6, - MKK11_MKKC = 0xD7, - MKK11_MKKA2 = 0xD8, - MKK12_MKKA = 0xD9, - MKK12_FCCA = 0xDA, - MKK12_MKKA1 = 0xDB, - MKK12_MKKC = 0xDC, - MKK12_MKKA2 = 0xDD, - MKK13_MKKB = 0xDE, MKK3_MKKA = 0xF0, MKK3_MKKA1 = 0xF1, MKK3_FCCA = 0xF2, @@ -199,15 +172,43 @@ enum reg_domain { MKK4_MKKA1 = 0xF4, MKK4_FCCA = 0xF5, MKK9_MKKA = 0xF6, - MKK10_MKKA = 0xF7, - MKK6_MKKA1 = 0xF8, - MKK6_FCCA = 0xF9, - MKK7_MKKA1 = 0xFA, - MKK7_FCCA = 0xFB, MKK9_FCCA = 0xFC, MKK9_MKKA1 = 0xFD, MKK9_MKKC = 0xFE, MKK9_MKKA2 = 0xFF, + MKK10_MKKA = 0xF7, + MKK10_FCCA = 0xD0, + MKK10_MKKA1 = 0xD1, + MKK10_MKKC = 0xD2, + MKK10_MKKA2 = 0xD3, + MKK11_MKKA = 0xD4, + MKK11_FCCA = 0xD5, + MKK11_MKKA1 = 0xD6, + MKK11_MKKC = 0xD7, + MKK11_MKKA2 = 0xD8, + + FCC1 = 0x0110, + FCC2 = 0x0120, + FCC3 = 0x0160, + FCC4 = 0x0165, + FCC5 = 0x0510, + FCC6 = 0x0610, + FCC7 = 0x0710, + FCC8 = 0x0810, + FCC9 = 0x0910, + FCC10 = 0x0B10, + FCC11 = 0x0B20, + + ETSI1 = 0x0130, + ETSI2 = 0x0230, + ETSI3 = 0x0330, + ETSI4 = 0x0430, + ETSI5 = 0x0530, + ETSI6 = 0x0630, + ETSI8 = 0x0830, + ETSI9 = 0x0930, + ETSI10 = 0x0D30, + ETSI11 = 0x0E30, APL1 = 0x0150, APL2 = 0x0250, @@ -221,49 +222,22 @@ enum reg_domain { APL10 = 0x1050, APL11 = 0x1150, APL12 = 0x1160, + APL13 = 0x1170, - ETSI1 = 0x0130, - ETSI2 = 0x0230, - ETSI3 = 0x0330, - ETSI4 = 0x0430, - ETSI5 = 0x0530, - ETSI6 = 0x0630, - ETSI8 = 0x0830, - ETSI9 = 0x0930, - ETSIA = 0x0A30, - ETSIB = 0x0B30, - ETSIC = 0x0C30, - - FCC1 = 0x0110, - FCC2 = 0x0120, - FCC3 = 0x0160, - FCC4 = 0x0165, - FCC5 = 0x0510, - FCC6 = 0x0610, - FCCA = 0x0A10, - - APLD = 0x0D50, - - MKK1 = 0x0140, - MKK2 = 0x0240, + NULL1 = 0x0198, MKK3 = 0x0340, MKK4 = 0x0440, MKK5 = 0x0540, - MKK6 = 0x0640, - MKK7 = 0x0740, - MKK8 = 0x0840, MKK9 = 0x0940, - MKK10 = 0x0B40, + MKK10 = 0x1040, MKK11 = 0x1140, - MKK12 = 0x1240, - MKK13 = 0x0C40, - MKK14 = 0x1440, - MKK15 = 0x1540, + + WORLD = 0x0199, + FCCA = 0x0A10, MKKA = 0x0A40, MKKC = 0x0A50, + ETSIC = 0x0C30, - NULL1 = 0x0198, - WORLD = 0x0199, DEBUG_REG_DMN = 0x01ff, }; diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index fd15d36b54c0..89bba138a60d 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -156,273 +156,244 @@ static const struct reg_dmn_op_class_map_t japan_op_class[] = { }; static const struct reg_dmn_pair g_reg_dmn_pairs[] = { - {NO_ENUMRD, DEBUG_REG_DMN, DEBUG_REG_DMN, 0}, - {NULL1_WORLD, NULL1, WORLD, 0}, - {NULL1_ETSIB, NULL1, ETSIB, 0}, - {NULL1_ETSIC, NULL1, ETSIC, 0}, - {FCC2_FCCA, FCC2, FCCA, 0}, - {FCC2_WORLD, FCC2, WORLD, 0}, - {FCC2_ETSIC, FCC2, ETSIC, 0}, - {FCC3_FCCA, FCC3, FCCA, 0}, - {FCC3_WORLD, FCC3, WORLD, 0}, - {FCC3_ETSIC, FCC3, ETSIC, 0}, - {FCC4_FCCA, FCC4, FCCA, 0}, - {FCC5_FCCA, FCC5, FCCA, 0}, - {FCC6_FCCA, FCC6, FCCA, 0}, - {FCC6_WORLD, FCC6, WORLD, 0}, - {ETSI1_WORLD, ETSI1, WORLD, 0}, - {ETSI2_WORLD, ETSI2, WORLD, 0}, - {ETSI3_WORLD, ETSI3, WORLD, 0}, - {ETSI4_WORLD, ETSI4, WORLD, 0}, - {ETSI5_WORLD, ETSI5, WORLD, 0}, - {ETSI6_WORLD, ETSI6, WORLD, 0}, - {ETSI8_WORLD, ETSI8, WORLD, 0}, - {ETSI9_WORLD, ETSI9, WORLD, 0}, - {ETSI3_ETSIA, ETSI3, WORLD, 0}, - {FRANCE_RES, ETSI3, WORLD, 0}, - {FCC1_WORLD, FCC1, WORLD, 0}, - {FCC1_FCCA, FCC1, FCCA, 0}, - {APL1_WORLD, APL1, WORLD, 0}, - {APL2_WORLD, APL2, WORLD, 0}, - {APL2_FCCA, APL2, FCCA, 0}, - {APL3_WORLD, APL3, WORLD, 0}, - {APL4_WORLD, APL4, WORLD, 0}, - {APL5_WORLD, APL5, WORLD, 0}, - {APL6_WORLD, APL6, WORLD, 0}, - {APL7_FCCA, APL7, FCCA, 0}, - {APL8_WORLD, APL8, WORLD, 0}, - {APL9_MKKC, APL9, MKKC, 0}, - {APL10_MKKC, APL10, MKKC, 0}, - {APL3_FCCA, APL3, FCCA, 0}, - {APL1_ETSIC, APL1, ETSIC, 0}, - {APL2_ETSIC, APL2, ETSIC, 0}, - {MKK3_MKKA, MKK3, MKKA, CTRY_JAPAN25}, - {MKK3_MKKB, MKK3, MKKA, CTRY_JAPAN7}, - {MKK3_MKKA1, MKK3, MKKA, CTRY_JAPAN26}, - {MKK3_MKKA2, MKK3, MKKA, CTRY_JAPAN8}, - {MKK3_MKKC, MKK3, MKKC, CTRY_JAPAN9}, - {MKK3_FCCA, MKK3, FCCA, CTRY_JAPAN27}, - {MKK4_MKKA, MKK4, MKKA, CTRY_JAPAN36}, - {MKK4_MKKB, MKK4, MKKA, CTRY_JAPAN10}, - {MKK4_MKKA1, MKK4, MKKA, CTRY_JAPAN28}, - {MKK4_MKKA2, MKK4, MKKA, CTRY_JAPAN11}, - {MKK4_MKKC, MKK4, MKKC, CTRY_JAPAN12}, - {MKK4_FCCA, MKK4, FCCA, CTRY_JAPAN29}, - {MKK5_MKKB, MKK5, MKKA, CTRY_JAPAN13}, + {NO_ENUMRD, FCC8, FCCA, CTRY_DEFAULT}, + {NULL1_WORLD, NULL1, WORLD, CTRY_DEFAULT}, + {FCC1_FCCA, FCC1, FCCA, CTRY_DEFAULT}, + {FCC1_WORLD, FCC1, WORLD, CTRY_DEFAULT}, + {FCC2_WORLD, FCC2, WORLD, CTRY_DEFAULT}, + {FCC2_ETSIC, FCC2, ETSIC, CTRY_DEFAULT}, + {FCC3_FCCA, FCC3, FCCA, CTRY_DEFAULT}, + {FCC3_WORLD, FCC3, WORLD, CTRY_DEFAULT}, + {FCC3_ETSIC, FCC3, ETSIC, CTRY_DEFAULT}, + {FCC4_FCCA, FCC4, FCCA, CTRY_DEFAULT}, + {FCC5_FCCA, FCC5, FCCA, CTRY_DEFAULT}, + {FCC6_FCCA, FCC6, FCCA, CTRY_DEFAULT}, + {FCC7_FCCA, FCC7, FCCA, CTRY_DEFAULT}, + {FCC8_FCCA, FCC8, FCCA, CTRY_DEFAULT}, + {FCC6_WORLD, FCC6, WORLD, CTRY_DEFAULT}, + {FCC9_FCCA, FCC9, FCCA, CTRY_DEFAULT}, + {FCC10_FCCA, FCC10, FCCA, CTRY_DEFAULT}, + {FCC11_WORLD, FCC11, WORLD, CTRY_DEFAULT}, + {ETSI1_WORLD, ETSI1, WORLD, CTRY_DEFAULT}, + {ETSI3_WORLD, ETSI3, WORLD, CTRY_DEFAULT}, + {ETSI4_WORLD, ETSI4, WORLD, CTRY_DEFAULT}, + {ETSI7_WORLD, ETSI4, WORLD, CTRY_DEFAULT}, + {ETSI8_WORLD, ETSI8, WORLD, CTRY_DEFAULT}, + {ETSI9_WORLD, ETSI9, WORLD, CTRY_DEFAULT}, + {APL4_WORLD, APL4, WORLD, CTRY_DEFAULT}, + {APL2_WORLD, APL2, WORLD, CTRY_DEFAULT}, + {APL2_FCCA, APL2, FCCA, CTRY_DEFAULT}, + {APL1_WORLD, APL1, WORLD, CTRY_DEFAULT}, + {APL1_ETSIC, APL1, ETSIC, CTRY_DEFAULT}, + {APL6_WORLD, APL6, WORLD, CTRY_DEFAULT}, + {APL7_FCCA, APL7, FCCA, CTRY_DEFAULT}, + {APL9_WORLD, APL9, WORLD, CTRY_DEFAULT}, + {APL10_WORLD, APL10, WORLD, CTRY_DEFAULT}, + {APL12_WORLD, APL12, WORLD, CTRY_DEFAULT}, + {APL13_WORLD, APL13, WORLD, CTRY_DEFAULT}, + {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, CTRY_DEFAULT}, + {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, CTRY_DEFAULT}, + {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, CTRY_DEFAULT}, + {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, CTRY_DEFAULT}, + {WOR4_FCCA, WOR4_FCCA, WOR4_FCCA, CTRY_DEFAULT}, + {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, CTRY_DEFAULT}, + {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, CTRY_DEFAULT}, + {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, CTRY_DEFAULT}, + {EU1_WORLD, EU1_WORLD, EU1_WORLD, CTRY_DEFAULT}, + {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, CTRY_DEFAULT}, + {WORA_WORLD, WORA_WORLD, WORA_WORLD, CTRY_DEFAULT}, + {WORB_WORLD, WORB_WORLD, WORB_WORLD, CTRY_DEFAULT}, + {WORC_WORLD, WORC_WORLD, WORC_WORLD, CTRY_DEFAULT}, {MKK5_MKKA2, MKK5, MKKA, CTRY_JAPAN14}, - {MKK5_MKKC, MKK5, MKKC, CTRY_JAPAN15}, - {MKK5_FCCA, MKK5, FCCA, CTRY_JAPAN56}, - {MKK9_MKKA, MKK9, MKKA, CTRY_JAPAN34}, - {MKK9_FCCA, MKK9, FCCA, CTRY_JAPAN37}, - {MKK9_MKKA1, MKK9, MKKA, CTRY_JAPAN38}, - {MKK9_MKKA2, MKK9, MKKA, CTRY_JAPAN40}, - {MKK9_MKKC, MKK9, MKKC, CTRY_JAPAN39}, - {MKK10_MKKA, MKK10, MKKA, CTRY_JAPAN35}, - {MKK10_FCCA, MKK10, FCCA, CTRY_JAPAN41}, - {MKK10_MKKA1, MKK10, MKKA, CTRY_JAPAN42}, - {MKK10_MKKA2, MKK10, MKKA, CTRY_JAPAN44}, - {MKK10_MKKC, MKK10, MKKC, CTRY_JAPAN43}, - {MKK11_MKKA, MKK11, MKKA, CTRY_JAPAN45}, - {MKK11_FCCA, MKK11, FCCA, CTRY_JAPAN46}, - {MKK11_MKKA1, MKK11, MKKA, CTRY_JAPAN47}, - {MKK11_MKKA2, MKK11, MKKA, CTRY_JAPAN49}, - {MKK11_MKKC, MKK11, MKKC, CTRY_JAPAN48}, - - {WOR0_WORLD, WOR0_WORLD, WOR0_WORLD, 0}, - {WOR1_WORLD, WOR1_WORLD, WOR1_WORLD, 0}, - {WOR2_WORLD, WOR2_WORLD, WOR2_WORLD, 0}, - {WOR3_WORLD, WOR3_WORLD, WOR3_WORLD, 0}, - {WOR4_WORLD, WOR4_WORLD, WOR4_WORLD, 0}, - {WOR5_ETSIC, WOR5_ETSIC, WOR5_ETSIC, 0}, - {WOR01_WORLD, WOR01_WORLD, WOR01_WORLD, 0}, - {WOR02_WORLD, WOR02_WORLD, WOR02_WORLD, 0}, - {EU1_WORLD, EU1_WORLD, EU1_WORLD, 0}, - {WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, 0}, - {WORA_WORLD, WORA_WORLD, WORA_WORLD, 0}, - {WORB_WORLD, WORB_WORLD, WORB_WORLD, 0}, - {WORC_WORLD, WORC_WORLD, WORC_WORLD, 0}, }; static const struct country_code_to_reg_dmn g_all_countries[] = { - {CTRY_DEBUG, NO_ENUMRD, "DB", "DEBUG"}, - {CTRY_DEFAULT, DEF_REGDMN, "NA", "NO_COUNTRY_SET"}, - {CTRY_ALBANIA, NULL1_WORLD, "AL", "ALBANIA"}, - {CTRY_ALGERIA, NULL1_WORLD, "DZ", "ALGERIA"}, - {CTRY_ARGENTINA, FCC3_WORLD, "AR", "ARGENTINA"}, + {CTRY_AFGHANISTAN, ETSI1_WORLD, "AF", "AFGHANISTAN"}, + {CTRY_ALBANIA, ETSI1_WORLD, "AL", "ALBANIA"}, + {CTRY_ALGERIA, APL13_WORLD, "DZ", "ALGERIA"}, + {CTRY_AMERICAN_SAMOA, FCC3_FCCA, "AS", "AMERICAN SAMOA"}, + {CTRY_ANGUILLA, ETSI1_WORLD, "AI", "ANGUILLA"}, + {CTRY_ARGENTINA, FCC6_WORLD, "AR", "ARGENTINA"}, {CTRY_ARMENIA, ETSI4_WORLD, "AM", "ARMENIA"}, {CTRY_ARUBA, ETSI1_WORLD, "AW", "ARUBA"}, - {CTRY_AUSTRALIA, FCC3_WORLD, "AU", "AUSTRALIA"}, + {CTRY_AUSTRALIA, FCC6_WORLD, "AU", "AUSTRALIA"}, {CTRY_AUSTRIA, ETSI1_WORLD, "AT", "AUSTRIA"}, {CTRY_AZERBAIJAN, ETSI4_WORLD, "AZ", "AZERBAIJAN"}, {CTRY_BAHAMAS, FCC3_WORLD, "BS", "BAHAMAS"}, {CTRY_BAHRAIN, APL6_WORLD, "BH", "BAHRAIN"}, - {CTRY_BANGLADESH, NULL1_WORLD, "BD", "BANGLADESH"}, + {CTRY_BANGLADESH, APL1_WORLD, "BD", "BANGLADESH"}, {CTRY_BARBADOS, FCC2_WORLD, "BB", "BARBADOS"}, {CTRY_BELARUS, ETSI1_WORLD, "BY", "BELARUS"}, {CTRY_BELGIUM, ETSI1_WORLD, "BE", "BELGIUM"}, {CTRY_BELIZE, APL1_ETSIC, "BZ", "BELIZE"}, {CTRY_BERMUDA, FCC3_FCCA, "BM", "BERMUDA"}, - {CTRY_BOLIVIA, APL1_ETSIC, "BO", "BOLIVIA"}, + {CTRY_BHUTAN, ETSI1_WORLD, "BT", "BHUTAN"}, + {CTRY_BOLIVIA, APL8_WORLD, "BO", "BOLIVIA"}, {CTRY_BOSNIA_HERZ, ETSI1_WORLD, "BA", "BOSNIA AND HERZEGOVINA"}, - {CTRY_BRAZIL, FCC3_WORLD, "BR", "BRAZIL"}, + {CTRY_BRAZIL, FCC3_ETSIC, "BR", "BRAZIL"}, {CTRY_BRUNEI_DARUSSALAM, APL6_WORLD, "BN", "BRUNEI DARUSSALAM"}, {CTRY_BULGARIA, ETSI1_WORLD, "BG", "BULGARIA"}, + {CTRY_BURKINA_FASO, FCC3_WORLD, "BF", "BURKINA-FASO"}, {CTRY_CAMBODIA, ETSI1_WORLD, "KH", "CAMBODIA"}, - {CTRY_CANADA, FCC3_FCCA, "CA", "CANADA"}, + {CTRY_CANADA, FCC6_FCCA, "CA", "CANADA"}, + {CTRY_CAYMAN_ISLANDS, FCC3_WORLD, "KY", "CAYMAN ISLANDS"}, + {CTRY_CENTRAL_AFRICA_REPUBLIC, FCC3_WORLD, "CF", "AFRICA REPUBLIC"}, + {CTRY_CHAD, ETSI1_WORLD, "TD", "CHAD"}, {CTRY_CHILE, APL6_WORLD, "CL", "CHILE"}, - {CTRY_CHINA, APL1_WORLD, "CN", "CHINA"}, - {CTRY_COLOMBIA, FCC1_FCCA, "CO", "COLOMBIA"}, - {CTRY_COSTA_RICA, FCC1_WORLD, "CR", "COSTA RICA"}, + {CTRY_CHINA, FCC2_WORLD, "CN", "CHINA"}, + {CTRY_CHRISTMAS_ISLAND, FCC3_WORLD, "CX", "CHRISTMAS ISLAND"}, + {CTRY_COLOMBIA, FCC3_WORLD, "CO", "COLOMBIA"}, + {CTRY_COSTA_RICA, FCC3_WORLD, "CR", "COSTA RICA"}, + {CTRY_COTE_DIVOIRE, FCC3_WORLD, "CI", "COTE DIVOIRE"}, {CTRY_CROATIA, ETSI1_WORLD, "HR", "CROATIA"}, {CTRY_CYPRUS, ETSI1_WORLD, "CY", "CYPRUS"}, {CTRY_CZECH, ETSI1_WORLD, "CZ", "CZECH REPUBLIC"}, {CTRY_DENMARK, ETSI1_WORLD, "DK", "DENMARK"}, + {CTRY_DOMINICA, FCC1_FCCA, "DM", "DOMINICA"}, {CTRY_DOMINICAN_REPUBLIC, FCC1_FCCA, "DO", "DOMINICAN REPUBLIC"}, - {CTRY_ECUADOR, FCC1_WORLD, "EC", "ECUADOR"}, + {CTRY_ECUADOR, FCC3_WORLD, "EC", "ECUADOR"}, {CTRY_EGYPT, ETSI3_WORLD, "EG", "EGYPT"}, {CTRY_EL_SALVADOR, FCC1_WORLD, "SV", "EL SALVADOR"}, {CTRY_ESTONIA, ETSI1_WORLD, "EE", "ESTONIA"}, + {CTRY_ETHIOPIA, ETSI1_WORLD, "ET", "ETHIOPIA"}, {CTRY_FINLAND, ETSI1_WORLD, "FI", "FINLAND"}, {CTRY_FRANCE, ETSI1_WORLD, "FR", "FRANCE"}, + {CTRY_FRENCH_GUIANA, ETSI1_WORLD, "GF", "FRENCH GUIANA"}, + {CTRY_FRENCH_POLYNESIA, ETSI1_WORLD, "PF", "FRENCH POLYNESIA"}, {CTRY_GEORGIA, ETSI4_WORLD, "GE", "GEORGIA"}, {CTRY_GERMANY, ETSI1_WORLD, "DE", "GERMANY"}, + {CTRY_GHANA, FCC3_WORLD, "GH", "GHANA"}, {CTRY_GREECE, ETSI1_WORLD, "GR", "GREECE"}, {CTRY_GREENLAND, ETSI1_WORLD, "GL", "GREENLAND"}, {CTRY_GRENADA, FCC3_FCCA, "GD", "GRENADA"}, - {CTRY_GUAM, FCC1_FCCA, "GU", "GUAM"}, - {CTRY_GUATEMALA, FCC1_FCCA, "GT", "GUATEMALA"}, - {CTRY_HAITI, ETSI1_WORLD, "HT", "HAITI"}, + {CTRY_GUADELOUPE, ETSI1_WORLD, "GP", "GUADELOUPE"}, + {CTRY_GUAM, FCC3_FCCA, "GU", "GUAM"}, + {CTRY_GUATEMALA, ETSI1_WORLD, "GT", "GUATEMALA"}, + {CTRY_GUYANA, APL1_ETSIC, "GY", "GUYANA"}, + {CTRY_HAITI, FCC3_FCCA, "HT", "HAITI"}, {CTRY_HONDURAS, FCC3_WORLD, "HN", "HONDURAS"}, {CTRY_HONG_KONG, FCC3_WORLD, "HK", "HONG KONG"}, {CTRY_HUNGARY, ETSI1_WORLD, "HU", "HUNGARY"}, {CTRY_ICELAND, ETSI1_WORLD, "IS", "ICELAND"}, {CTRY_INDIA, APL6_WORLD, "IN", "INDIA"}, - {CTRY_INDONESIA, APL2_WORLD, "ID", "INDONESIA"}, + {CTRY_INDONESIA, APL2_ETSIC, "ID", "INDONESIA"}, {CTRY_IRAN, APL1_WORLD, "IR", "IRAN"}, {CTRY_IRELAND, ETSI1_WORLD, "IE", "IRELAND"}, {CTRY_ISRAEL, ETSI3_WORLD, "IL", "ISRAEL"}, {CTRY_ITALY, ETSI1_WORLD, "IT", "ITALY"}, {CTRY_JAMAICA, FCC3_WORLD, "JM", "JAMAICA"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN"}, - {CTRY_JAPAN7, MKK3_MKKB, "JP", "JAPAN7"}, - {CTRY_JAPAN8, MKK3_MKKA2, "JP", "JAPAN8"}, - {CTRY_JAPAN9, MKK3_MKKC, "JP", "JAPAN9"}, - {CTRY_JAPAN10, MKK4_MKKB, "JP", "JAPAN10"}, - {CTRY_JAPAN11, MKK4_MKKA2, "JP", "JAPAN11"}, - {CTRY_JAPAN12, MKK4_MKKC, "JP", "JAPAN12"}, - {CTRY_JAPAN13, MKK5_MKKB, "JP", "JAPAN13"}, - {CTRY_JAPAN14, MKK5_MKKA2, "JP", "JAPAN14"}, - {CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN15"}, - {CTRY_JAPAN25, MKK3_MKKA, "JP", "JAPAN25"}, - {CTRY_JAPAN26, MKK3_MKKA1, "JP", "JAPAN26"}, - {CTRY_JAPAN27, MKK3_FCCA, "JP", "JAPAN27"}, - {CTRY_JAPAN28, MKK4_MKKA1, "JP", "JAPAN28"}, - {CTRY_JAPAN29, MKK4_FCCA, "JP", "JAPAN29"}, - {CTRY_JAPAN34, MKK9_MKKA, "JP", "JAPAN34"}, - {CTRY_JAPAN35, MKK10_MKKA, "JP", "JAPAN35"}, - {CTRY_JAPAN36, MKK4_MKKA, "JP", "JAPAN36"}, - {CTRY_JAPAN37, MKK9_FCCA, "JP", "JAPAN37"}, - {CTRY_JAPAN38, MKK9_MKKA1, "JP", "JAPAN38"}, - {CTRY_JAPAN39, MKK9_MKKC, "JP", "JAPAN39"}, - {CTRY_JAPAN40, MKK9_MKKA2, "JP", "JAPAN40"}, - {CTRY_JAPAN41, MKK10_FCCA, "JP", "JAPAN41"}, - {CTRY_JAPAN42, MKK10_MKKA1, "JP", "JAPAN42"}, - {CTRY_JAPAN43, MKK10_MKKC, "JP", "JAPAN43"}, - {CTRY_JAPAN44, MKK10_MKKA2, "JP", "JAPAN44"}, - {CTRY_JAPAN45, MKK11_MKKA, "JP", "JAPAN45"}, - {CTRY_JAPAN46, MKK11_FCCA, "JP", "JAPAN46"}, - {CTRY_JAPAN47, MKK11_MKKA1, "JP", "JAPAN47"}, - {CTRY_JAPAN48, MKK11_MKKC, "JP", "JAPAN48"}, - {CTRY_JAPAN49, MKK11_MKKA2, "JP", "JAPAN49"}, - {CTRY_JAPAN55, MKK5_MKKA, "JP", "JAPAN55"}, - {CTRY_JAPAN56, MKK5_FCCA, "JP", "JAPAN56"}, - {CTRY_JORDAN, ETSI2_WORLD, "JO", "JORDAN"}, + {CTRY_JORDAN, APL4_WORLD, "JO", "JORDAN"}, {CTRY_KAZAKHSTAN, NULL1_WORLD, "KZ", "KAZAKHSTAN"}, - {CTRY_KENYA, APL1_WORLD, "KE", "KENYA"}, - {CTRY_KOREA_NORTH, APL9_MKKC, "KP", "NORTH KOREA"}, - {CTRY_KOREA_ROC, APL10_MKKC, "KR", "KOREA REPUBLIC"}, - {CTRY_KOREA_ROC_AP, APL9_MKKC, "KR", "KOREA REPUBLIC3"}, + {CTRY_KENYA, APL12_WORLD, "KE", "KENYA"}, + {CTRY_KOREA_NORTH, APL9_WORLD, "KP", "NORTH KOREA"}, + {CTRY_KOREA_ROC, APL9_WORLD, "KR", "KOREA REPUBLIC"}, {CTRY_KUWAIT, ETSI3_WORLD, "KW", "KUWAIT"}, {CTRY_LATVIA, ETSI1_WORLD, "LV", "LATVIA"}, - {CTRY_LEBANON, APL1_WORLD, "LB", "LEBANON"}, + {CTRY_LEBANON, FCC3_WORLD, "LB", "LEBANON"}, + {CTRY_LESOTHO, ETSI1_WORLD, "LS", "LESOTHO"}, {CTRY_LIECHTENSTEIN, ETSI1_WORLD, "LI", "LIECHTENSTEIN"}, {CTRY_LITHUANIA, ETSI1_WORLD, "LT", "LITHUANIA"}, {CTRY_LUXEMBOURG, ETSI1_WORLD, "LU", "LUXEMBOURG"}, - {CTRY_MACAU, FCC2_WORLD, "MO", "MACAU SAR"}, + {CTRY_MACAU, FCC3_WORLD, "MO", "MACAU SAR"}, {CTRY_MACEDONIA, ETSI1_WORLD, "MK", "MACEDONIA, FYRO"}, - {CTRY_MALAYSIA, FCC1_WORLD, "MY", "MALAYSIA"}, + {CTRY_MALAWI, ETSI1_WORLD, "MW", "MALAWI"}, + {CTRY_MALAYSIA, FCC11_WORLD, "MY", "MALAYSIA"}, + {CTRY_MALDIVES, APL6_WORLD, "MV", "MALDIVES"}, {CTRY_MALTA, ETSI1_WORLD, "MT", "MALTA"}, - {CTRY_MAURITIUS, ETSI1_WORLD, "MU", "MAURITIUS"}, - {CTRY_MEXICO, FCC1_WORLD, "MX", "MEXICO"}, - {CTRY_MONACO, ETSI4_WORLD, "MC", "MONACO"}, - {CTRY_MOROCCO, APL4_WORLD, "MA", "MOROCCO"}, - {CTRY_NEPAL, APL1_WORLD, "NP", "NEPAL"}, + {CTRY_MARSHALL_ISLANDS, FCC3_FCCA, "MH", "MARSHALL ISLANDS"}, + {CTRY_MARTINIQUE, ETSI1_WORLD, "MQ", "MARTINIQUE"}, + {CTRY_MAURITANIA, ETSI1_WORLD, "MR", "MAURITANA"}, + {CTRY_MAURITIUS, FCC3_WORLD, "MU", "MAURITIUS"}, + {CTRY_MAYOTTE, ETSI1_WORLD, "YT", "MAYOTTE"}, + {CTRY_MEXICO, FCC3_ETSIC, "MX", "MEXICO"}, + {CTRY_MICRONESIA, FCC3_FCCA, "FM", "MICRONESIA"}, + {CTRY_MOLDOVA, ETSI1_WORLD, "MD", "MOLDOVA"}, + {CTRY_MONACO, ETSI1_WORLD, "MC", "MONACO"}, + {CTRY_MONGOLIA, FCC3_WORLD, "MN", "MONGOLIA"}, + {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, + {CTRY_MOROCCO, ETSI3_WORLD, "MA", "MOROCCO"}, + {CTRY_NEPAL, APL6_WORLD, "NP", "NEPAL"}, {CTRY_NETHERLANDS, ETSI1_WORLD, "NL", "NETHERLANDS"}, {CTRY_NETHERLANDS_ANTILLES, ETSI1_WORLD, "AN", "NETHERLANDS ANTILLES"}, {CTRY_NEW_ZEALAND, FCC3_ETSIC, "NZ", "NEW ZEALAND"}, + {CTRY_NIGERIA, APL8_WORLD, "NG", "NIGERIA"}, + {CTRY_NORTHERN_MARIANA_ISLANDS, FCC3_FCCA, "MP", "MARIANA ISLANDS"}, {CTRY_NICARAGUA, FCC3_FCCA, "NI", "NICARAGUA"}, {CTRY_NORWAY, ETSI1_WORLD, "NO", "NORWAY"}, - {CTRY_OMAN, FCC3_WORLD, "OM", "OMAN"}, + {CTRY_OMAN, ETSI1_WORLD, "OM", "OMAN"}, {CTRY_PAKISTAN, APL1_WORLD, "PK", "PAKISTAN"}, + {CTRY_PALAU, FCC3_FCCA, "PW", "PALAU"}, {CTRY_PANAMA, FCC1_FCCA, "PA", "PANAMA"}, - {CTRY_PAPUA_NEW_GUINEA, FCC1_WORLD, "PG", "PAPUA NEW GUINEA"}, + {CTRY_PAPUA_NEW_GUINEA, FCC3_WORLD, "PG", "PAPUA NEW GUINEA"}, {CTRY_PARAGUAY, FCC3_WORLD, "PY", "PARAGUAY"}, {CTRY_PERU, FCC3_WORLD, "PE", "PERU"}, {CTRY_PHILIPPINES, FCC3_WORLD, "PH", "PHILIPPINES"}, {CTRY_POLAND, ETSI1_WORLD, "PL", "POLAND"}, {CTRY_PORTUGAL, ETSI1_WORLD, "PT", "PORTUGAL"}, - {CTRY_PUERTO_RICO, FCC1_FCCA, "PR", "PUERTO RICO"}, + {CTRY_PUERTO_RICO, FCC3_FCCA, "PR", "PUERTO RICO"}, {CTRY_QATAR, APL1_WORLD, "QA", "QATAR"}, + {CTRY_REUNION, ETSI1_WORLD, "RE", "REUNION"}, {CTRY_ROMANIA, ETSI1_WORLD, "RO", "ROMANIA"}, {CTRY_RUSSIA, ETSI8_WORLD, "RU", "RUSSIA"}, - {CTRY_RWANDA, APL1_WORLD, "RW", "RWANDA"}, - {CTRY_SAUDI_ARABIA, FCC2_WORLD, "SA", "SAUDI ARABIA"}, + {CTRY_RWANDA, FCC3_WORLD, "RW", "RWANDA"}, + {CTRY_SAINT_BARTHELEMY, ETSI1_WORLD, "BL", "SAINT BARTHELEMY"}, + {CTRY_SAINT_KITTS_AND_NEVIS, APL10_WORLD, "KN", "SAINT KITTS"}, + {CTRY_SAINT_LUCIA, APL10_WORLD, "LC", "SAINT LUCIA"}, + {CTRY_SAINT_MARTIN, ETSI1_WORLD, "MF", "SAINT MARTIN"}, + {CTRY_SAINT_PIERRE_AND_MIQUELON, ETSI1_WORLD, "PM", "SAINT PIERRE"}, + {CTRY_SAINT_VINCENT_AND_THE_GRENADIENS, ETSI1_WORLD, "VC", "VINCENT"}, + {CTRY_SAMOA, ETSI1_WORLD, "WS", "SAMOA"}, + {CTRY_SAUDI_ARABIA, ETSI1_WORLD, "SA", "SAUDI ARABIA"}, + {CTRY_SENEGAL, FCC3_WORLD, "SN", "SENEGAL"}, {CTRY_SERBIA, ETSI1_WORLD, "RS", "REPUBLIC OF SERBIA"}, - {CTRY_MONTENEGRO, ETSI1_WORLD, "ME", "MONTENEGRO"}, {CTRY_SINGAPORE, FCC3_WORLD, "SG", "SINGAPORE"}, {CTRY_SLOVAKIA, ETSI1_WORLD, "SK", "SLOVAKIA"}, {CTRY_SLOVENIA, ETSI1_WORLD, "SI", "SLOVENIA"}, {CTRY_SOUTH_AFRICA, FCC3_WORLD, "ZA", "SOUTH AFRICA"}, {CTRY_SPAIN, ETSI1_WORLD, "ES", "SPAIN"}, + {CTRY_SURINAME, ETSI1_WORLD, "SR", "SURINAME"}, {CTRY_SRI_LANKA, FCC3_WORLD, "LK", "SRI LANKA"}, {CTRY_SWEDEN, ETSI1_WORLD, "SE", "SWEDEN"}, {CTRY_SWITZERLAND, ETSI1_WORLD, "CH", "SWITZERLAND"}, {CTRY_SYRIA, NULL1_WORLD, "SY", "SYRIAN ARAB REPUBLIC"}, - {CTRY_TAIWAN, APL7_FCCA, "TW", "TAIWAN"}, + {CTRY_TAIWAN, FCC3_FCCA, "TW", "TAIWAN"}, {CTRY_TANZANIA, APL1_WORLD, "TZ", "TANZANIA"}, {CTRY_THAILAND, FCC3_WORLD, "TH", "THAILAND"}, + {CTRY_TOGO, ETSI1_WORLD, "TG", "TOGO"}, {CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"}, {CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"}, - {CTRY_TURKEY, ETSI3_WORLD, "TR", "TURKEY"}, + {CTRY_TURKEY, ETSI1_WORLD, "TR", "TURKEY"}, + {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"}, {CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"}, {CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"}, - {CTRY_UAE, ETSI1_WORLD, "AE", "UNITED ARAB EMIRATES"}, + {CTRY_UAE, FCC3_WORLD, "AE", "UNITED ARAB EMIRATES"}, {CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB", "UNITED KINGDOM"}, - {CTRY_UNITED_STATES, FCC3_FCCA, "US", "UNITED STATES"}, - {CTRY_UNITED_STATES_AP, FCC6_FCCA, "US", "UNITED STATES2"}, + {CTRY_UNITED_STATES, FCC8_FCCA, "US", "UNITED STATES"}, {CTRY_UNITED_STATES_PS, FCC4_FCCA, "PS", "US PUBLIC SAFETY"}, - {CTRY_URUGUAY, FCC3_WORLD, "UY", "URUGUAY"}, - {CTRY_UZBEKISTAN, FCC3_FCCA, "UZ", "UZBEKISTAN"}, - {CTRY_VENEZUELA, FCC1_WORLD, "VE", "VENEZUELA"}, - {CTRY_VIET_NAM, ETSI3_WORLD, "VN", "VIETNAM"}, + {CTRY_URUGUAY, FCC2_WORLD, "UY", "URUGUAY"}, + {CTRY_UZBEKISTAN, ETSI3_WORLD, "UZ", "UZBEKISTAN"}, + {CTRY_VANUATU, FCC3_WORLD, "VU", "VANUATU"}, + {CTRY_VENEZUELA, FCC2_ETSIC, "VE", "VENEZUELA"}, + {CTRY_VIET_NAM, FCC3_WORLD, "VN", "VIETNAM"}, + {CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", "VIRGIN ISLANDS"}, + {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"}, {CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"}, - {CTRY_ZIMBABWE, NULL1_WORLD, "ZW", "ZIMBABWE"} + {CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZIMBABWE"}, + {CTRY_JAPAN14, MKK5_MKKA, "JP", "JAPAN"} }; static const struct reg_dmn g_reg_dmns[] = { - {DEBUG_REG_DMN, FCC}, - {APL1, FCC}, - {APL2, FCC}, - {APL3, FCC}, - {APL4, FCC}, - {APL5, FCC}, - {APL6, ETSI}, - {APL7, FCC}, - {APL8, ETSI}, - {APL9, ETSI}, - {APL10, ETSI}, - {APL11, ETSI}, - {APL12, ETSI}, + {FCC1, FCC}, + {FCC2, FCC}, + {FCC3, FCC}, + {FCC4, FCC}, + {FCC5, FCC}, + {FCC6, FCC}, + {FCC7, FCC}, + {FCC8, FCC}, + {FCC9, FCC}, + {FCC10, FCC}, + {FCC11, FCC}, {ETSI1, ETSI}, {ETSI2, ETSI}, {ETSI3, ETSI}, @@ -431,49 +402,46 @@ static const struct reg_dmn g_reg_dmns[] = { {ETSI6, ETSI}, {ETSI8, ETSI}, {ETSI9, ETSI}, - {FCC1, FCC}, - {FCC2, FCC}, - {FCC3, FCC}, - {FCC4, FCC}, - {FCC5, FCC}, - {FCC6, FCC}, - {MKK1, MKK}, - {MKK2, MKK}, + {ETSI10, ETSI}, + {ETSI11, ETSI}, + {APL1, ETSI}, + {APL2, ETSI}, + {APL3, ETSI}, + {APL4, ETSI}, + {APL5, ETSI}, + {APL6, ETSI}, + {APL7, ETSI}, + {APL8, ETSI}, + {APL9, ETSI}, + {APL10, ETSI}, + {APL11, ETSI}, + {APL12, ETSI}, + {APL13, ETSI}, + {NULL1, NO_CTL}, {MKK3, MKK}, {MKK4, MKK}, {MKK5, MKK}, - {MKK6, MKK}, - {MKK7, MKK}, - {MKK8, MKK}, {MKK9, MKK}, {MKK10, MKK}, {MKK11, MKK}, - {MKK12, MKK}, - {MKK13, MKK}, - {MKK14, MKK}, - {MKK15, MKK}, - {APLD, NO_CTL}, - {ETSIA, NO_CTL}, - {ETSIB, ETSI}, - {ETSIC, ETSI}, + {WORLD, ETSI}, {FCCA, FCC}, {MKKA, MKK}, {MKKC, MKK}, - {WORLD, ETSI}, + {ETSIC, ETSI}, {WOR0_WORLD, NO_CTL}, - {WOR01_WORLD, NO_CTL}, - {WOR02_WORLD, NO_CTL}, - {EU1_WORLD, NO_CTL}, {WOR1_WORLD, NO_CTL}, {WOR2_WORLD, NO_CTL}, {WOR3_WORLD, NO_CTL}, - {WOR4_WORLD, NO_CTL}, + {WOR4_FCCA, NO_CTL}, {WOR5_ETSIC, NO_CTL}, + {WOR01_WORLD, NO_CTL}, + {WOR02_WORLD, NO_CTL}, + {EU1_WORLD, NO_CTL}, {WOR9_WORLD, NO_CTL}, {WORA_WORLD, NO_CTL}, {WORB_WORLD, NO_CTL}, {WORC_WORLD, NO_CTL}, - {NULL1, NO_CTL}, }; -- cgit v1.2.3 From a7bb01b460a5529c435e8bf9400ee3e4fa60a971 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Wed, 27 Jan 2016 11:31:59 -0800 Subject: qcacld-3.0: Regdomain kernel-doc and other changes Add kernel documentation for regdomain data structures. Also rename some of the data structures to better names. Change-Id: Iae26079ae8a7f06e2670594694ae36c2c2a0a524 CRs-Fixed: 961806 --- core/cds/inc/cds_regdomain.h | 449 +++++++++++++++++------------- core/cds/src/cds_regdomain.c | 26 +- core/hdd/src/wlan_hdd_regulatory.c | 10 +- core/sap/dfs/src/dfs.c | 2 +- core/sap/dfs/src/dfs_process_phyerr.c | 8 +- core/sap/dfs/src/dfs_process_radarevent.c | 16 +- core/sap/src/sap_fsm.c | 6 +- core/sap/src/sap_module.c | 4 +- core/wma/inc/wma_dfs_interface.h | 2 +- core/wma/src/wma_dev_if.c | 2 +- core/wma/src/wma_features.c | 22 +- 11 files changed, 303 insertions(+), 244 deletions(-) diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index c5db379a6281..68a0bb191350 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -77,177 +77,6 @@ #define COUNTRY_ERD_FLAG 0x8000 #define WORLDWIDE_ROAMING_FLAG 0x4000 -enum reg_domain { - NO_ENUMRD = 0x00, - NULL1_WORLD = 0x03, - NULL1_ETSIB = 0x07, - NULL1_ETSIC = 0x08, - - FCC1_FCCA = 0x10, - FCC1_WORLD = 0x11, - FCC2_FCCA = 0x20, - FCC2_WORLD = 0x21, - FCC2_ETSIC = 0x22, - FCC3_FCCA = 0x3A, - FCC3_WORLD = 0x3B, - FCC3_ETSIC = 0x3F, - FCC4_FCCA = 0x12, - FCC5_FCCA = 0x13, - FCC6_FCCA = 0x14, - FCC7_FCCA = 0x15, - FCC8_FCCA = 0x16, - FCC6_WORLD = 0x23, - FCC9_FCCA = 0x17, - FCC10_FCCA = 0x18, - FCC11_WORLD = 0x19, - - ETSI1_WORLD = 0x37, - ETSI3_ETSIA = 0x32, - ETSI2_WORLD = 0x35, - ETSI3_WORLD = 0x36, - ETSI4_WORLD = 0x30, - ETSI4_ETSIC = 0x38, - ETSI5_WORLD = 0x39, - ETSI6_WORLD = 0x34, - ETSI_RESERVED = 0x33, - FRANCE_RES = 0x31, - ETSI7_WORLD = 0x3C, - ETSI8_WORLD = 0x3D, - ETSI9_WORLD = 0x3E, - ETSI10_WORLD = 0x24, - ETSI11_WORLD = 0x26, - - APL4_WORLD = 0x42, - APL3_FCCA = 0x50, - APL_RESERVED = 0x44, - APL2_WORLD = 0x45, - APL2_FCCA = 0x4D, - APL2_APLC = 0x46, - APL3_WORLD = 0x47, - APL2_APLD = 0x49, - APL1_WORLD = 0x52, - APL1_FCCA = 0x53, - APL1_APLA = 0x54, - APL1_ETSIC = 0x55, - APL2_ETSIC = 0x56, - APL5_WORLD = 0x58, - APL6_WORLD = 0x5B, - APL7_FCCA = 0x5C, - APL8_WORLD = 0x5D, - APL9_WORLD = 0x5E, - APL10_WORLD = 0x5F, - APL11_FCCA = 0x4F, - APL12_WORLD = 0x51, - APL13_WORLD = 0x5A, - - WOR0_WORLD = 0x60, - WOR1_WORLD = 0x61, - WOR2_WORLD = 0x62, - WOR3_WORLD = 0x63, - WOR4_FCCA = 0x64, - WOR5_ETSIC = 0x65, - WOR01_WORLD = 0x66, - WOR02_WORLD = 0x67, - EU1_WORLD = 0x68, - WOR9_WORLD = 0x69, - WORA_WORLD = 0x6A, - WORB_WORLD = 0x6B, - WORC_WORLD = 0x6C, - - MKK3_MKKB = 0x80, - MKK3_MKKA2 = 0x81, - MKK3_MKKC = 0x82, - MKK4_MKKB = 0x83, - MKK4_MKKA2 = 0x84, - MKK4_MKKC = 0x85, - MKK5_MKKA = 0x99, - MKK5_FCCA = 0x9A, - MKK5_MKKB = 0x86, - MKK5_MKKA2 = 0x87, - MKK5_MKKC = 0x88, - MKK3_MKKA = 0xF0, - MKK3_MKKA1 = 0xF1, - MKK3_FCCA = 0xF2, - MKK4_MKKA = 0xF3, - MKK4_MKKA1 = 0xF4, - MKK4_FCCA = 0xF5, - MKK9_MKKA = 0xF6, - MKK9_FCCA = 0xFC, - MKK9_MKKA1 = 0xFD, - MKK9_MKKC = 0xFE, - MKK9_MKKA2 = 0xFF, - MKK10_MKKA = 0xF7, - MKK10_FCCA = 0xD0, - MKK10_MKKA1 = 0xD1, - MKK10_MKKC = 0xD2, - MKK10_MKKA2 = 0xD3, - MKK11_MKKA = 0xD4, - MKK11_FCCA = 0xD5, - MKK11_MKKA1 = 0xD6, - MKK11_MKKC = 0xD7, - MKK11_MKKA2 = 0xD8, - - FCC1 = 0x0110, - FCC2 = 0x0120, - FCC3 = 0x0160, - FCC4 = 0x0165, - FCC5 = 0x0510, - FCC6 = 0x0610, - FCC7 = 0x0710, - FCC8 = 0x0810, - FCC9 = 0x0910, - FCC10 = 0x0B10, - FCC11 = 0x0B20, - - ETSI1 = 0x0130, - ETSI2 = 0x0230, - ETSI3 = 0x0330, - ETSI4 = 0x0430, - ETSI5 = 0x0530, - ETSI6 = 0x0630, - ETSI8 = 0x0830, - ETSI9 = 0x0930, - ETSI10 = 0x0D30, - ETSI11 = 0x0E30, - - APL1 = 0x0150, - APL2 = 0x0250, - APL3 = 0x0350, - APL4 = 0x0450, - APL5 = 0x0550, - APL6 = 0x0650, - APL7 = 0x0750, - APL8 = 0x0850, - APL9 = 0x0950, - APL10 = 0x1050, - APL11 = 0x1150, - APL12 = 0x1160, - APL13 = 0x1170, - - NULL1 = 0x0198, - MKK3 = 0x0340, - MKK4 = 0x0440, - MKK5 = 0x0540, - MKK9 = 0x0940, - MKK10 = 0x1040, - MKK11 = 0x1140, - - WORLD = 0x0199, - FCCA = 0x0A10, - MKKA = 0x0A40, - MKKC = 0x0A50, - ETSIC = 0x0C30, - - DEBUG_REG_DMN = 0x01ff, -}; - -enum ctl_val { - FCC = 0x10, - MKK = 0x40, - ETSI = 0x30, - NO_CTL = 0xff -}; - enum country_code { CTRY_AFGHANISTAN = 4, CTRY_ALBANIA = 8, @@ -461,25 +290,194 @@ enum country_code { CTRY_JAPAN56 = 4056, }; -enum dfs_domain { - DFS_UNINIT_DOMAIN = 0, - DFS_FCC_DOMAIN = 1, - DFS_ETSI_DOMAIN = 2, - DFS_MKK4_DOMAIN = 3 +enum reg_domain { + NO_ENUMRD = 0x00, + NULL1_WORLD = 0x03, + NULL1_ETSIB = 0x07, + NULL1_ETSIC = 0x08, + + FCC1_FCCA = 0x10, + FCC1_WORLD = 0x11, + FCC2_FCCA = 0x20, + FCC2_WORLD = 0x21, + FCC2_ETSIC = 0x22, + FCC3_FCCA = 0x3A, + FCC3_WORLD = 0x3B, + FCC3_ETSIC = 0x3F, + FCC4_FCCA = 0x12, + FCC5_FCCA = 0x13, + FCC6_FCCA = 0x14, + FCC7_FCCA = 0x15, + FCC8_FCCA = 0x16, + FCC6_WORLD = 0x23, + FCC9_FCCA = 0x17, + FCC10_FCCA = 0x18, + FCC11_WORLD = 0x19, + + ETSI1_WORLD = 0x37, + ETSI3_ETSIA = 0x32, + ETSI2_WORLD = 0x35, + ETSI3_WORLD = 0x36, + ETSI4_WORLD = 0x30, + ETSI4_ETSIC = 0x38, + ETSI5_WORLD = 0x39, + ETSI6_WORLD = 0x34, + ETSI_RESERVED = 0x33, + FRANCE_RES = 0x31, + ETSI7_WORLD = 0x3C, + ETSI8_WORLD = 0x3D, + ETSI9_WORLD = 0x3E, + ETSI10_WORLD = 0x24, + ETSI11_WORLD = 0x26, + + APL4_WORLD = 0x42, + APL3_FCCA = 0x50, + APL_RESERVED = 0x44, + APL2_WORLD = 0x45, + APL2_FCCA = 0x4D, + APL2_APLC = 0x46, + APL3_WORLD = 0x47, + APL2_APLD = 0x49, + APL1_WORLD = 0x52, + APL1_FCCA = 0x53, + APL1_APLA = 0x54, + APL1_ETSIC = 0x55, + APL2_ETSIC = 0x56, + APL5_WORLD = 0x58, + APL6_WORLD = 0x5B, + APL7_FCCA = 0x5C, + APL8_WORLD = 0x5D, + APL9_WORLD = 0x5E, + APL10_WORLD = 0x5F, + APL11_FCCA = 0x4F, + APL12_WORLD = 0x51, + APL13_WORLD = 0x5A, + + WOR0_WORLD = 0x60, + WOR1_WORLD = 0x61, + WOR2_WORLD = 0x62, + WOR3_WORLD = 0x63, + WOR4_FCCA = 0x64, + WOR5_ETSIC = 0x65, + WOR01_WORLD = 0x66, + WOR02_WORLD = 0x67, + EU1_WORLD = 0x68, + WOR9_WORLD = 0x69, + WORA_WORLD = 0x6A, + WORB_WORLD = 0x6B, + WORC_WORLD = 0x6C, + + MKK3_MKKB = 0x80, + MKK3_MKKA2 = 0x81, + MKK3_MKKC = 0x82, + MKK4_MKKB = 0x83, + MKK4_MKKA2 = 0x84, + MKK4_MKKC = 0x85, + MKK5_MKKA = 0x99, + MKK5_FCCA = 0x9A, + MKK5_MKKB = 0x86, + MKK5_MKKA2 = 0x87, + MKK5_MKKC = 0x88, + MKK3_MKKA = 0xF0, + MKK3_MKKA1 = 0xF1, + MKK3_FCCA = 0xF2, + MKK4_MKKA = 0xF3, + MKK4_MKKA1 = 0xF4, + MKK4_FCCA = 0xF5, + MKK9_MKKA = 0xF6, + MKK9_FCCA = 0xFC, + MKK9_MKKA1 = 0xFD, + MKK9_MKKC = 0xFE, + MKK9_MKKA2 = 0xFF, + MKK10_MKKA = 0xF7, + MKK10_FCCA = 0xD0, + MKK10_MKKA1 = 0xD1, + MKK10_MKKC = 0xD2, + MKK10_MKKA2 = 0xD3, + MKK11_MKKA = 0xD4, + MKK11_FCCA = 0xD5, + MKK11_MKKA1 = 0xD6, + MKK11_MKKC = 0xD7, + MKK11_MKKA2 = 0xD8, + + FCC1 = 0x0110, + FCC2 = 0x0120, + FCC3 = 0x0160, + FCC4 = 0x0165, + FCC5 = 0x0510, + FCC6 = 0x0610, + FCC7 = 0x0710, + FCC8 = 0x0810, + FCC9 = 0x0910, + FCC10 = 0x0B10, + FCC11 = 0x0B20, + + ETSI1 = 0x0130, + ETSI2 = 0x0230, + ETSI3 = 0x0330, + ETSI4 = 0x0430, + ETSI5 = 0x0530, + ETSI6 = 0x0630, + ETSI8 = 0x0830, + ETSI9 = 0x0930, + ETSI10 = 0x0D30, + ETSI11 = 0x0E30, + + APL1 = 0x0150, + APL2 = 0x0250, + APL3 = 0x0350, + APL4 = 0x0450, + APL5 = 0x0550, + APL6 = 0x0650, + APL7 = 0x0750, + APL8 = 0x0850, + APL9 = 0x0950, + APL10 = 0x1050, + APL11 = 0x1150, + APL12 = 0x1160, + APL13 = 0x1170, + + NULL1 = 0x0198, + MKK3 = 0x0340, + MKK4 = 0x0440, + MKK5 = 0x0540, + MKK9 = 0x0940, + MKK10 = 0x1040, + MKK11 = 0x1140, + + WORLD = 0x0199, + FCCA = 0x0A10, + MKKA = 0x0A40, + MKKC = 0x0A50, + ETSIC = 0x0C30, }; -struct reg_dmn_pair { - uint16_t reg_dmn_enum; - uint16_t reg_dmn_5ghz; - uint16_t reg_dmn_2ghz; - uint16_t single_cc; +/** + * enum ctl_val - CTL value + * @FCC: FCC + * @MKK: MKK + * @ETSI: ETSI + * @NO_CTL: no CTL + */ +enum ctl_val { + FCC = 0x10, + MKK = 0x40, + ETSI = 0x30, + NO_CTL = 0xff }; -struct country_code_to_reg_dmn { - uint16_t country_code; - uint16_t reg_dmn_enum; - const char *iso_name; - const char *name; +/** + * enum dfs_region - DFS region + * @DFS_UNINIT_REGION: un-initialized region + * @DFS_FCC_REGION: FCC region + * @DFS_ETSI_REGION: ETSI region + * @DFS_MKK_REGION: MKK region + */ +enum dfs_region { + DFS_UNINIT_REGION = 0, + DFS_FCC_REGION = 1, + DFS_ETSI_REGION = 2, + DFS_MKK_REGION = 3 }; /** @@ -499,9 +497,52 @@ enum ch_width { CH_WIDTH_MAX }; +/** + * enum offset_t: channel offset + * @BW20: 20 mhz channel + * @BW40_LOW_PRIMARY: lower channel in 40 mhz + * @BW40_HIGH_PRIMARY: higher channel in 40 mhz + * @BW80: 80 mhz channel + * @BWALL: unknown bandwidth + */ +enum offset_t { + BW20 = 0, + BW40_LOW_PRIMARY = 1, + BW40_HIGH_PRIMARY = 3, + BW80, + BWALL +}; + +/** + * struct reg_dmn_pair: regulatory domain pair + * @reg_dmn_pair: reg domain pair + * @reg_dmn_5ghz: 5G reg domain + * @reg_dmn_2ghz: 2G reg domain + * @single_cc: country with this reg domain + */ +struct reg_dmn_pair { + uint16_t reg_dmn_pair; + uint16_t reg_dmn_5ghz; + uint16_t reg_dmn_2ghz; + uint16_t single_cc; +}; + +/** + * struct country_code_to_reg_dmn: country code to reg domain mapping + * @country_code: country code + * @reg_dmn_pair: regulatory domain pair + * @alpha2: country alpha2 + * @name: country name + */ +struct country_code_to_reg_dmn { + uint16_t country_code; + uint16_t reg_dmn_pair; + const char *alpha2; + const char *name; +}; + /** * struct ch_params_s - * * @ch_width: channel width * @sec_ch_offset: secondary channel offset * @center_freq_seg0: center freq for segment 0 @@ -514,19 +555,23 @@ struct ch_params_s { uint8_t center_freq_seg1; }; +/** + * struct reg_dmn: regulatory domain structure + * @reg_dmn: regulatory domain + * @conformance_test_limit: CTL limit + */ struct reg_dmn { uint16_t reg_dmn; uint8_t conformance_test_limit; }; -enum offset_t { - BW20 = 0, - BW40_LOW_PRIMARY = 1, - BW40_HIGH_PRIMARY = 3, - BW80, - BWALL -}; - +/** + * struct reg_dmn_op_class_map_t: operating class + * @op_class: operating class number + * @ch_spacing: channel spacing + * @offset: offset + * @channels: channel set + */ struct reg_dmn_op_class_map_t { uint8_t op_class; uint8_t ch_spacing; @@ -534,11 +579,25 @@ struct reg_dmn_op_class_map_t { uint8_t channels[MAX_CHANNELS_PER_OPERATING_CLASS]; }; +/** + * struct reg_dmn_supp_op_classes: operating classes + * @num_classes: number of classes + * @classes: classes + */ struct reg_dmn_supp_op_classes { uint8_t num_classes; uint8_t classes[CDS_MAX_SUPP_OPER_CLASSES]; }; +/** + * struct reg_dmn_tables: reg domain table + * @reg_dmn_pairs: list of reg domain pairs + * @all_countries: list of countries + * @reg_dmns: list of reg domains + * @reg_dmn_pairs_cnt: count of reg domain pairs + * @all_countries_cnt: count of countries + * @reg_dmns_cnt: count of reg domains + */ struct reg_dmn_tables { const struct reg_dmn_pair *reg_dmn_pairs; const struct country_code_to_reg_dmn *all_countries; diff --git a/core/cds/src/cds_regdomain.c b/core/cds/src/cds_regdomain.c index 89bba138a60d..a7e8e3ec1e41 100644 --- a/core/cds/src/cds_regdomain.c +++ b/core/cds/src/cds_regdomain.c @@ -482,7 +482,7 @@ static bool is_reg_dmn_valid(uint16_t reg_dmn) return true; } else { for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn) return true; } @@ -522,8 +522,8 @@ int32_t cds_get_country_from_alpha2(uint8_t *alpha2) int32_t i; for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { - if (g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0] && - g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1]) + if (g_reg_dmn_tbl.all_countries[i].alpha2[0] == alpha2[0] && + g_reg_dmn_tbl.all_countries[i].alpha2[1] == alpha2[1]) return g_reg_dmn_tbl.all_countries[i].country_code; } @@ -549,7 +549,7 @@ static uint16_t reg_dmn_get_default_country(uint16_t reg_dmn) } for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) { + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn) { if (g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc != 0) return g_reg_dmn_tbl.reg_dmn_pairs[i].single_cc; else @@ -571,7 +571,7 @@ static const struct reg_dmn_pair *get_reg_dmn_pair(uint16_t reg_dmn) int32_t i; for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn) return &g_reg_dmn_tbl.reg_dmn_pairs[i]; } @@ -608,7 +608,7 @@ static const struct country_code_to_reg_dmn *get_country_from_rd( int32_t i; for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { - if (g_reg_dmn_tbl.all_countries[i].reg_dmn_enum == reg_dmn) + if (g_reg_dmn_tbl.all_countries[i].reg_dmn_pair == reg_dmn) return &g_reg_dmn_tbl.all_countries[i]; } @@ -661,7 +661,7 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) return -EINVAL; } - reg_dmn = country->reg_dmn_enum; + reg_dmn = country->reg_dmn_pair; } reg->regpair = get_reg_dmn_pair(reg_dmn); @@ -677,8 +677,8 @@ int32_t cds_fill_some_regulatory_info(struct regulatory *reg) country = get_country_from_rd(reg_dmn); if (country) { - reg->alpha2[0] = country->iso_name[0]; - reg->alpha2[1] = country->iso_name[1]; + reg->alpha2[0] = country->alpha2[0]; + reg->alpha2[1] = country->alpha2[1]; } else { reg->alpha2[0] = '0'; reg->alpha2[1] = '0'; @@ -698,9 +698,9 @@ int32_t get_reg_dmn_for_country(uint8_t *alpha2) uint8_t i; for (i = 0; i < g_reg_dmn_tbl.all_countries_cnt; i++) { - if ((g_reg_dmn_tbl.all_countries[i].iso_name[0] == alpha2[0]) && - (g_reg_dmn_tbl.all_countries[i].iso_name[1] == alpha2[1])) - return g_reg_dmn_tbl.all_countries[i].reg_dmn_enum; + if ((g_reg_dmn_tbl.all_countries[i].alpha2[0] == alpha2[0]) && + (g_reg_dmn_tbl.all_countries[i].alpha2[1] == alpha2[1])) + return g_reg_dmn_tbl.all_countries[i].reg_dmn_pair; } return -1; @@ -785,7 +785,7 @@ uint16_t cds_get_reg_dmn_5g(uint32_t reg_dmn) uint16_t i; for (i = 0; i < g_reg_dmn_tbl.reg_dmn_pairs_cnt; i++) { - if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_enum == reg_dmn) + if (g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_pair == reg_dmn) return g_reg_dmn_tbl.reg_dmn_pairs[i].reg_dmn_5ghz; } diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 960962090b01..5ddb11b40e8a 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -142,7 +142,7 @@ struct regulatory *reg) struct reg_dmn_pair *regpair = (struct reg_dmn_pair *)reg->regpair; - switch (regpair->reg_dmn_enum) { + switch (regpair->reg_dmn_pair) { case 0x60: case 0x61: case 0x62: @@ -497,17 +497,17 @@ static void hdd_set_dfs_region(hdd_context_t *hdd_ctx, /* remap the ctl code to dfs region code */ switch (hdd_ctx->reg.ctl_5g) { case FCC: - cds_put_dfs_region(DFS_FCC_DOMAIN); + cds_put_dfs_region(DFS_FCC_REGION); break; case ETSI: - cds_put_dfs_region(DFS_ETSI_DOMAIN); + cds_put_dfs_region(DFS_ETSI_REGION); break; case MKK: - cds_put_dfs_region(DFS_MKK4_DOMAIN); + cds_put_dfs_region(DFS_MKK_REGION); break; default: /* set default dfs_region to FCC */ - cds_put_dfs_region(DFS_FCC_DOMAIN); + cds_put_dfs_region(DFS_FCC_REGION); break; } diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c index d938c0124931..a2b5cff32ac1 100644 --- a/core/sap/dfs/src/dfs.c +++ b/core/sap/dfs/src/dfs.c @@ -61,7 +61,7 @@ #include "dfs_ioctl.h" #include "dfs.h" -int domainoverride = DFS_UNINIT_DOMAIN; +int domainoverride = DFS_UNINIT_REGION; /* ** channel switch announcement (CSA) diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c index f91aa6464629..8725236b08a8 100644 --- a/core/sap/dfs/src/dfs_process_phyerr.c +++ b/core/sap/dfs/src/dfs_process_phyerr.c @@ -625,8 +625,8 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, * * BIN 5 chirping pulses are only for FCC or Japan MMK4 domain */ - if (((dfs->dfsdomain == DFS_FCC_DOMAIN) || - (dfs->dfsdomain == DFS_MKK4_DOMAIN)) && + if (((dfs->dfsdomain == DFS_FCC_REGION) || + (dfs->dfsdomain == DFS_MKK_REGION)) && (e.dur >= MAYBE_BIN5_DUR) && (e.dur < MAX_BIN5_DUR)) { int add_dur; int slope = 0, dc_found = 0; @@ -675,8 +675,8 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen, * We have a pulse that is either bigger than * MAX_BIN5_DUR or * less than MAYBE_BIN5_DUR */ - if ((dfs->dfsdomain == DFS_FCC_DOMAIN) || - (dfs->dfsdomain == DFS_MKK4_DOMAIN)) { + if ((dfs->dfsdomain == DFS_FCC_REGION) || + (dfs->dfsdomain == DFS_MKK_REGION)) { /* * XXX Would this result in very large pulses * wrapping around to become short pulses? diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c index 321161c197a4..30392b1b41cc 100644 --- a/core/sap/dfs/src/dfs_process_radarevent.c +++ b/core/sap/dfs/src/dfs_process_radarevent.c @@ -176,7 +176,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, This is normally 2 but can be higher for W53. */ - if ((dfs->dfsdomain == DFS_MKK4_DOMAIN) && + if ((dfs->dfsdomain == DFS_MKK_REGION) && (dfs->dfs_caps.ath_chip_is_bb_tlv) && (chan->ic_freq < FREQ_5500_MHZ)) { @@ -430,8 +430,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, * so process the next pulse in the queue. */ if ((dfs->disable_dfs_ch_switch == false) && - (DFS_FCC_DOMAIN == dfs->dfsdomain || - DFS_MKK4_DOMAIN == dfs->dfsdomain) && + (DFS_FCC_REGION == dfs->dfsdomain || + DFS_MKK_REGION == dfs->dfsdomain) && (re.re_dur >= 11 && re.re_dur <= 20) && (diff_ts > 500 || diff_ts <= 305) && (re.sidx == -4)) { @@ -452,8 +452,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, * following condition is reported in radar * summary report. */ - if ((DFS_FCC_DOMAIN == dfs->dfsdomain || - DFS_MKK4_DOMAIN == dfs->dfsdomain) && + if ((DFS_FCC_REGION == dfs->dfsdomain || + DFS_MKK_REGION == dfs->dfsdomain) && ((chan->ic_flags & IEEE80211_CHAN_VHT80) == IEEE80211_CHAN_VHT80) && (chan->ic_pri_freq_center_freq_mhz_separation == @@ -486,7 +486,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs, * and ETSI type 3 radar pulses when the following * condition is reported in radar summary report. */ - if ((DFS_ETSI_DOMAIN == dfs->dfsdomain) && + if ((DFS_ETSI_REGION == dfs->dfsdomain) && ((chan->ic_flags & IEEE80211_CHAN_VHT80) == IEEE80211_CHAN_VHT80) && (chan->ic_pri_freq_center_freq_mhz_separation == @@ -520,8 +520,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs, /* BIN5 pulses are FCC and Japan specific */ - if ((dfs->dfsdomain == DFS_FCC_DOMAIN) - || (dfs->dfsdomain == DFS_MKK4_DOMAIN)) { + if ((dfs->dfsdomain == DFS_FCC_REGION) + || (dfs->dfsdomain == DFS_MKK_REGION)) { for (p = 0; (p < dfs->dfs_rinfo.rn_numbin5radars) && (!found); p++) { diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 8bbe02d4ae09..8d4e690ef858 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -1296,7 +1296,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) channelID = sapContext->SapAllChnlList.channelList[i].channel; /* - * IN JAPAN REGULATORY DOMAIN CHECK IF THE FOLLOWING TWO + * IN MKK DFS REGION CHECK IF THE FOLLOWING TWO * TWO RULES APPLY AND FILTER THE AVAILABLE CHANNELS * ACCORDINGLY. * @@ -1312,7 +1312,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) * channels only based up on the SAP Channel location * indicated by "sap_operating_channel_location" param. */ - if (DFS_MKK4_DOMAIN == dfs_region) { + if (DFS_MKK_REGION == dfs_region) { /* * Check for JAPAN W53 Channel operation capability */ @@ -4698,7 +4698,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext) cds_get_dfs_region(&dfs_region); - if ((dfs_region == DFS_ETSI_DOMAIN) + if ((dfs_region == DFS_ETSI_REGION) && ((IS_ETSI_WEATHER_CH(sapContext->channel)) || (sap_is_channel_bonding_etsi_weather_channel(sapContext)))) { cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 709719fac326..983ce4247c30 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -2563,7 +2563,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53) * Set the JAPAN W53 restriction only if the current * regulatory domain is JAPAN. */ - if (DFS_MKK4_DOMAIN == dfs_region) { + if (DFS_MKK_REGION == dfs_region) { pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, @@ -2648,7 +2648,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal, * restriction is currently enforeced only for * JAPAN regulatory domain. */ - if (DFS_MKK4_DOMAIN == dfs_region) { + if (DFS_MKK_REGION == dfs_region) { pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location = dfs_Preferred_Channels_location; QDF_TRACE(QDF_MODULE_ID_SAP, diff --git a/core/wma/inc/wma_dfs_interface.h b/core/wma/inc/wma_dfs_interface.h index ae21355bfa2c..f30f7b3a291f 100644 --- a/core/wma/inc/wma_dfs_interface.h +++ b/core/wma/inc/wma_dfs_interface.h @@ -260,7 +260,7 @@ typedef struct ieee80211com { int (*ic_dfs_control)(struct ieee80211com *ic, u_int id, void *indata, uint32_t insize, void *outdata, uint32_t *outsize); - enum dfs_domain current_dfs_regdomain; + enum dfs_region current_dfs_regdomain; uint8_t vdev_id; uint8_t last_radar_found_chan; int32_t dfs_pri_multiplier; diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c index 2477741ce969..8d367b1e1560 100644 --- a/core/wma/src/wma_dev_if.c +++ b/core/wma/src/wma_dev_if.c @@ -1805,7 +1805,7 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma, * early on, to protect the DFS module from * processing phyerrors without being intialized. */ - if (DFS_UNINIT_DOMAIN == + if (DFS_UNINIT_REGION == wma->dfs_ic->current_dfs_regdomain) { WMA_LOGE("%s[%d]:DFS Configured with Invalid regdomain" " Failed to send VDEV START command", diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index c0f502f47d1d..a50cf7eb69b7 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -6008,25 +6008,25 @@ void wma_dfs_configure(struct ieee80211com *ic) * which radar pulses to use. */ switch (dfsdomain) { - case DFS_FCC_DOMAIN: + case DFS_FCC_REGION: WMA_LOGI("%s: DFS-FCC domain", __func__); - rinfo.dfsdomain = DFS_FCC_DOMAIN; + rinfo.dfsdomain = DFS_FCC_REGION; rinfo.dfs_radars = dfs_fcc_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_fcc_radars); rinfo.b5pulses = dfs_fcc_bin5pulses; rinfo.numb5radars = QDF_ARRAY_SIZE(dfs_fcc_bin5pulses); break; - case DFS_ETSI_DOMAIN: + case DFS_ETSI_REGION: WMA_LOGI("%s: DFS-ETSI domain", __func__); - rinfo.dfsdomain = DFS_ETSI_DOMAIN; + rinfo.dfsdomain = DFS_ETSI_REGION; rinfo.dfs_radars = dfs_etsi_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_etsi_radars); rinfo.b5pulses = NULL; rinfo.numb5radars = 0; break; - case DFS_MKK4_DOMAIN: - WMA_LOGI("%s: DFS-MKK4 domain", __func__); - rinfo.dfsdomain = DFS_MKK4_DOMAIN; + case DFS_MKK_REGION: + WMA_LOGI("%s: DFS-MKK domain", __func__); + rinfo.dfsdomain = DFS_MKK_REGION; rinfo.dfs_radars = dfs_mkk4_radars; rinfo.numradars = QDF_ARRAY_SIZE(dfs_mkk4_radars); rinfo.b5pulses = dfs_jpn_bin5pulses; @@ -6034,7 +6034,7 @@ void wma_dfs_configure(struct ieee80211com *ic) break; default: WMA_LOGI("%s: DFS-UNINT domain", __func__); - rinfo.dfsdomain = DFS_UNINIT_DOMAIN; + rinfo.dfsdomain = DFS_UNINIT_REGION; rinfo.dfs_radars = NULL; rinfo.numradars = 0; rinfo.b5pulses = NULL; @@ -6190,9 +6190,9 @@ struct dfs_ieee80211_channel *wma_dfs_configure_channel( void wma_set_dfs_region(tp_wma_handle wma, uint8_t dfs_region) { /* dfs information is passed */ - if (dfs_region > DFS_MKK4_DOMAIN || dfs_region == DFS_UNINIT_DOMAIN) - /* assign DFS_FCC_DOMAIN as default domain*/ - wma->dfs_ic->current_dfs_regdomain = DFS_FCC_DOMAIN; + if (dfs_region > DFS_MKK_REGION || dfs_region == DFS_UNINIT_REGION) + /* assign DFS_FCC_REGION as default region*/ + wma->dfs_ic->current_dfs_regdomain = DFS_FCC_REGION; else wma->dfs_ic->current_dfs_regdomain = dfs_region; -- cgit v1.2.3 From 6842e8f33ac4ef082acdbf5bca3591db0cac4062 Mon Sep 17 00:00:00 2001 From: Amar Singhal Date: Tue, 23 Feb 2016 16:30:32 -0800 Subject: qcacld-3.0: Fix set-band operation Currently, in regulatory callback, we do not update channels that are out-of-band. For example, if the current band is set to 2.4 GHz, we do not update channels of 5 GHZ band. Now, if the band gets changed, the channel list goes wrong. Fix this issue by updating all the channels and then calling wlan_hdd_cfg80211_update_band to update wiphy for the current in-band channels. Change-Id: If6d6fee01c7a7d6b2aa0f7d3acb862decce0819e CRs-Fixed: 978660 --- core/hdd/src/wlan_hdd_cfg80211.c | 12 +----------- core/hdd/src/wlan_hdd_cfg80211.h | 2 ++ core/hdd/src/wlan_hdd_regulatory.c | 13 ++----------- core/hdd/src/wlan_hdd_wext.c | 1 - 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 2d6ef17ac33b..d6002c55bda6 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -5441,19 +5441,9 @@ int wlan_hdd_cfg80211_update_band(struct wiphy *wiphy, eCsrBand eBand) continue; } - if (CHANNEL_STATE_DISABLE == channelEnabledState || - CHANNEL_STATE_INVALID == channelEnabledState) { - band->channels[j].flags |= - IEEE80211_CHAN_DISABLED; - } else if (CHANNEL_STATE_DFS == channelEnabledState) { + if (CHANNEL_STATE_DISABLE != channelEnabledState) band->channels[j].flags &= ~IEEE80211_CHAN_DISABLED; - band->channels[j].flags |= IEEE80211_CHAN_RADAR; - } else { - band->channels[j].flags &= - ~(IEEE80211_CHAN_DISABLED | - IEEE80211_CHAN_RADAR); - } } } return 0; diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 3b0cdbf2855e..9ba52bb31790 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -2433,4 +2433,6 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter, uint32_t no_dfs_flag); +int wlan_hdd_cfg80211_update_band(struct wiphy *wiphy, + eCsrBand eBand); #endif diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 5ddb11b40e8a..67ecde1c18f3 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -360,14 +360,6 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, for (band_num = 0; band_num < IEEE80211_NUM_BANDS; band_num++) { - if (band_num == IEEE80211_BAND_2GHZ && - band_capability == eCSR_BAND_5G) - continue; - - else if (band_num == IEEE80211_BAND_5GHZ && - band_capability == eCSR_BAND_24) - continue; - if (wiphy->bands[band_num] == NULL) continue; @@ -415,6 +407,8 @@ static void hdd_process_regulatory_data(hdd_context_t *hdd_ctx, cds_chan = &(reg_channels[CHAN_ENUM_144]); cds_chan->state = CHANNEL_STATE_DISABLE; } + + wlan_hdd_cfg80211_update_band(wiphy, band_capability); } @@ -589,7 +583,6 @@ void hdd_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) { hdd_context_t *hdd_ctx = wiphy_priv(wiphy); - eCsrBand band_capability = eCSR_BAND_ALL; bool vht80_allowed; bool reset = false; uint8_t dfs_reg; @@ -611,8 +604,6 @@ void hdd_reg_notifier(struct wiphy *wiphy, return; } - sme_get_freq_band(hdd_ctx->hHal, &band_capability); - /* first check if this callback is in response to the driver callback */ switch (request->initiator) { diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 0caea59c2a0e..4215f68cc27a 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -92,7 +92,6 @@ #define HDD_SET_MCBC_FILTERS_TO_FW 1 #define HDD_DELETE_MCBC_FILTERS_FROM_FW 0 -extern int wlan_hdd_cfg80211_update_band(struct wiphy *wiphy, eCsrBand eBand); static int ioctl_debug; module_param(ioctl_debug, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); -- cgit v1.2.3 From 4871cdbc0187d4f5997d4ebdc362e8aa7c4d8fd7 Mon Sep 17 00:00:00 2001 From: Mahesh A Saptasagar Date: Fri, 6 Nov 2015 12:23:30 +0530 Subject: qcacld 3.0: Validate ioctls for valid input length qcacld-2.0 to qcacld-3.0 propagation Return failure to applications if ioctl is invoked with arguments of improper length. Change-Id: I01589f37996510ee130485ef43e1f36811692e28 CRs-Fixed: 930542 --- core/hdd/src/wlan_hdd_hostapd.c | 68 ++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 48356ac49f0f..17ce14e943dd 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -4562,9 +4562,8 @@ __iw_softap_setwpsie(struct net_device *dev, switch (wps_genie[0]) { case DOT11F_EID_WPA: if (wps_genie[1] < 2 + 4) { - qdf_mem_free(pSap_WPSIe); - kfree(fwps_genie); - return -EINVAL; + ret = -EINVAL; + goto exit; } else if (memcmp(&wps_genie[2], "\x00\x50\xf2\x04", 4) == 0) { hddLog(LOG1, FL("Set WPS BEACON IE(len %d)"), @@ -4674,6 +4673,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + sizeof(pSap_WPSIe->sapwpsie. + sapWPSBeaconIE.UUID_E)) { + ret = -EINVAL; + goto exit; + } qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSBeaconIE. @@ -4705,9 +4710,8 @@ __iw_softap_setwpsie(struct net_device *dev, "UNKNOWN TLV in WPS IE(%x)", (*pos << 8 | *(pos + 1))); - qdf_mem_free(pSap_WPSIe); - kfree(fwps_genie); - return -EINVAL; + ret = -EINVAL; + goto exit; } } } else { @@ -4718,9 +4722,8 @@ __iw_softap_setwpsie(struct net_device *dev, default: hddLog(LOGE, FL("Set UNKNOWN IE %X"), wps_genie[0]); - qdf_mem_free(pSap_WPSIe); - kfree(fwps_genie); - return 0; + ret = -EINVAL; + goto exit; } } else if (wps_genie[0] == eQC_WPS_PROBE_RSP_IE) { pSap_WPSIe->sapWPSIECode = eSAP_WPS_PROBE_RSP_IE; @@ -4728,9 +4731,8 @@ __iw_softap_setwpsie(struct net_device *dev, switch (wps_genie[0]) { case DOT11F_EID_WPA: if (wps_genie[1] < 2 + 4) { - qdf_mem_free(pSap_WPSIe); - kfree(fwps_genie); - return -EINVAL; + ret = -EINVAL; + goto exit; } else if (memcmp(&wps_genie[2], "\x00\x50\xf2\x04", 4) == 0) { hddLog(LOG1, FL("Set WPS PROBE RSP IE(len %d)"), @@ -4857,6 +4859,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.UUID_E))) { + ret = -EINVAL; + goto exit; + } qdf_mem_copy(pSap_WPSIe-> sapwpsie. sapWPSProbeRspIE. @@ -4873,6 +4881,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.Manufacture.name))) { + ret = -EINVAL; + goto exit; + } pSap_WPSIe->sapwpsie. sapWPSProbeRspIE. Manufacture.num_name = @@ -4893,6 +4907,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.ModelName.text))) { + ret = -EINVAL; + goto exit; + } pSap_WPSIe->sapwpsie. sapWPSProbeRspIE.ModelName. num_text = length; @@ -4911,6 +4931,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.ModelNumber.text))) { + ret = -EINVAL; + goto exit; + } pSap_WPSIe->sapwpsie. sapWPSProbeRspIE. ModelNumber.num_text = @@ -4930,6 +4956,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.SerialNumber.text))) { + ret = -EINVAL; + goto exit; + } pSap_WPSIe->sapwpsie. sapWPSProbeRspIE. SerialNumber.num_text = @@ -4988,6 +5020,12 @@ __iw_softap_setwpsie(struct net_device *dev, pos += 2; length = *pos << 8 | *(pos + 1); pos += 2; + if (length > + (sizeof(pSap_WPSIe->sapwpsie. + sapWPSProbeRspIE.DeviceName.text))) { + ret = -EINVAL; + goto exit; + } pSap_WPSIe->sapwpsie. sapWPSProbeRspIE.DeviceName. num_text = length; @@ -5050,6 +5088,8 @@ __iw_softap_setwpsie(struct net_device *dev, #else qdf_ret_status = wlansap_set_wps_ie(p_cds_context, pSap_WPSIe); #endif + if (qdf_ret_status != QDF_STATUS_SUCCESS) + ret = -EINVAL; pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(pHostapdAdapter); if (pHostapdState->bCommit && WPSIeType == eQC_WPS_PROBE_RSP_IE) { #ifdef WLAN_FEATURE_MBSSID @@ -5058,11 +5098,11 @@ __iw_softap_setwpsie(struct net_device *dev, wlansap_update_wps_ie(p_cds_context); #endif } - +exit: qdf_mem_free(pSap_WPSIe); kfree(fwps_genie); EXIT(); - return qdf_ret_status; + return ret; } static int iw_softap_setwpsie(struct net_device *dev, -- cgit v1.2.3 From d639dde9ec9815f0c17ad299611c91973830c7c7 Mon Sep 17 00:00:00 2001 From: Mahesh A Saptasagar Date: Fri, 6 Nov 2015 12:39:13 +0530 Subject: qcacld 3.0: Validate WPA and RSN IE for valid length qcacld-2.0 to qcacld-3.0 propagation Return failure to applications if genie ioctl is invoked to configure WPS/WPA/RSN IEs with arguments of improper length. Change-Id: I2e034ef9f2537922be35d46ce266e6b99dab7bb6 CRs-Fixed: 931451 --- core/hdd/src/wlan_hdd_wext.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 4215f68cc27a..d7152da246b7 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -2671,8 +2671,8 @@ static int __iw_set_genie(struct net_device *dev, switch (elementId) { case IE_EID_VENDOR: if ((IE_LEN_SIZE + IE_EID_SIZE + IE_VENDOR_OUI_SIZE) > eLen) { /* should have at least OUI */ - kfree(base_genie); - return -EINVAL; + ret = -EINVAL; + goto exit; } if (0 == memcmp(&genie[0], "\x00\x50\xf2\x04", 4)) { @@ -2688,8 +2688,8 @@ static int __iw_set_genie(struct net_device *dev, "Cannot accommodate genIE. " "Need bigger buffer space"); QDF_ASSERT(0); - kfree(base_genie); - return -ENOMEM; + ret = -ENOMEM; + goto exit; } /* save to Additional IE ; it should be accumulated to handle WPS IE + other IE */ memcpy(pWextState->genIE.addIEdata + @@ -2699,6 +2699,12 @@ static int __iw_set_genie(struct net_device *dev, hddLog(QDF_TRACE_LEVEL_INFO, "%s Set WPA IE (len %d)", __func__, eLen + 2); + if ((eLen + 2) > (sizeof(pWextState->WPARSNIE))) { + hdd_warn("Cannot accommodate genIE, Need bigger buffer space"); + ret = -EINVAL; + QDF_ASSERT(0); + goto exit; + } memset(pWextState->WPARSNIE, 0, MAX_WPA_RSN_IE_LEN); memcpy(pWextState->WPARSNIE, genie - 2, @@ -2721,8 +2727,8 @@ static int __iw_set_genie(struct net_device *dev, "Cannot accommodate genIE. " "Need bigger buffer space"); QDF_ASSERT(0); - kfree(base_genie); - return -ENOMEM; + ret = -ENOMEM; + goto exit; } /* save to Additional IE ; it should be accumulated to handle WPS IE + other IE */ memcpy(pWextState->genIE.addIEdata + @@ -2733,6 +2739,12 @@ static int __iw_set_genie(struct net_device *dev, case DOT11F_EID_RSN: hddLog(LOG1, "%s Set RSN IE (len %d)", __func__, eLen + 2); + if ((eLen + 2) > (sizeof(pWextState->WPARSNIE))) { + hdd_warn("Cannot accommodate genIE, Need bigger buffer space"); + ret = -EINVAL; + QDF_ASSERT(0); + goto exit; + } memset(pWextState->WPARSNIE, 0, MAX_WPA_RSN_IE_LEN); memcpy(pWextState->WPARSNIE, genie - 2, (eLen + 2)); pWextState->roamProfile.pRSNReqIE = @@ -2743,15 +2755,15 @@ static int __iw_set_genie(struct net_device *dev, default: hddLog(LOGE, "%s Set UNKNOWN IE %X", __func__, elementId); - kfree(base_genie); - return 0; + goto exit; } genie += eLen; remLen -= eLen; } +exit: EXIT(); kfree(base_genie); - return 0; + return ret; } /** -- cgit v1.2.3 From 0a9901ba8c658fb26b0b2b2151a579751ad0a0c1 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Tue, 15 Dec 2015 15:59:19 -0800 Subject: qcacld-3.0: Do not allow crash_inject command in FTM mode - Subsystem restart is not supported in FTM mode - Do not allow force crash inject command to test SSR in FTM mode Change-Id: I743aba2082af5537e627b678b159ba9985986e07 CRs-Fixed: 954374 --- core/wma/src/wma_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index e4e69ae9985c..fc5b1130d26c 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -912,9 +912,12 @@ static void wma_process_cli_set_cmd(tp_wma_handle wma, htc_dump(wma->htc_handle, WD_DUMP, false); break; case GEN_PARAM_CRASH_INJECT: - ret = wma_crash_inject(wma, - privcmd->param_value, - privcmd->param_sec_value); + if (QDF_GLOBAL_FTM_MODE == cds_get_conparam()) + WMA_LOGE("Crash inject not allowed in FTM mode"); + else + ret = wma_crash_inject(wma, + privcmd->param_value, + privcmd->param_sec_value); break; #ifdef CONFIG_ATH_PCIE_ACCESS_DEBUG case GEN_PARAM_DUMP_PCIE_ACCESS_LOG: -- cgit v1.2.3 From 13644679a274444c429ae92278d50c5e28590115 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Mon, 29 Feb 2016 15:40:10 -0800 Subject: qcacld-3.0: Move the channel width enum to cds Currently channel width has different enum values in different modules. Move the channel width enum definition to CDS to maintain single channel width enum value in the driver Change-Id: I6a46d0c02546263080a15a3ec7c52486fc51e98e CRs-Fixed: 983914 --- core/cds/inc/cds_reg_service.h | 40 ++++++++++++---------- core/cds/inc/cds_regdomain.h | 19 +--------- core/cds/src/cds_reg_service.c | 32 ++++++++--------- core/hdd/inc/wlan_hdd_main.h | 4 +-- core/hdd/src/wlan_hdd_cfg80211.c | 2 +- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_hostapd.h | 4 +-- core/hdd/src/wlan_hdd_ioctl.c | 2 +- core/hdd/src/wlan_hdd_main.c | 8 +++-- core/mac/inc/sir_api.h | 2 +- core/mac/src/pe/include/lim_global.h | 2 +- core/mac/src/pe/include/lim_session.h | 2 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 +- core/mac/src/pe/lim/lim_send_messages.c | 2 +- core/mac/src/pe/lim/lim_send_messages.h | 2 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 2 +- core/mac/src/pe/lim/lim_types.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 2 +- core/mac/src/pe/lim/lim_utils.h | 2 +- core/sap/inc/sap_api.h | 9 ++--- core/sap/src/sap_fsm.c | 8 ++--- core/sap/src/sap_module.c | 2 +- core/wma/inc/wma.h | 2 +- core/wma/inc/wma_if.h | 4 +-- core/wma/inc/wma_internal.h | 2 +- core/wma/src/wma_features.c | 2 +- target/inc/wmi_unified.h | 11 ------ 27 files changed, 74 insertions(+), 99 deletions(-) diff --git a/core/cds/inc/cds_reg_service.h b/core/cds/inc/cds_reg_service.h index 5eef8b36cbca..8e858866be05 100644 --- a/core/cds/inc/cds_reg_service.h +++ b/core/cds/inc/cds_reg_service.h @@ -248,24 +248,25 @@ struct regulatory { }; /** - * enum chan_width: channel width - * - * @CHAN_WIDTH_0MHZ: channel disabled or invalid - * @CHAN_WIDTH_5MHZ: channel width 5 MHZ - * @CHAN_WIDTH_10MHZ: channel width 10 MHZ - * @CHAN_WIDTH_20MHZ: channel width 20 MHZ - * @CHAN_WIDTH_40MHZ: channel width 40 MHZ - * @CHAN_WIDTH_80MHZ: channel width 80MHZ - * @CHAN_WIDTH_160MHZ: channel width 160 MHZ + * phy_ch_width - channel width + * @CH_WIDTH_20MHZ: channel width 20 MHz + * @CH_WIDTH_40MHZ: channel width 40 MHz + * @CH_WIDTH_80MHZ: channel width 80MHz + * @CH_WIDTH_160MHZ: channel width 160 MHz + * @CH_WIDTH_80P80MHZ: channel width 160MHz(80+80) + * @CH_WIDTH_5MHZ: channel width 5MHz + * @CH_WIDTH_10MHZ: channel width 10MHz */ -enum channel_width { - CHAN_WIDTH_0MHZ, - CHAN_WIDTH_5MHZ, - CHAN_WIDTH_10MHZ, - CHAN_WIDTH_20MHZ, - CHAN_WIDTH_40MHZ, - CHAN_WIDTH_80MHZ, - CHAN_WIDTH_160MHZ +enum phy_ch_width { + CH_WIDTH_20MHZ = 0, + CH_WIDTH_40MHZ = 1, + CH_WIDTH_80MHZ = 2, + CH_WIDTH_160MHZ = 3, + CH_WIDTH_80P80MHZ = 4, + CH_WIDTH_5MHZ = 5, + CH_WIDTH_10MHZ = 6, + CH_WIDTH_INVALID = 7, + CH_WIDTH_MAX }; extern const struct chan_map chan_mapping[NUM_CHANNELS]; @@ -287,8 +288,9 @@ QDF_STATUS cds_put_dfs_region(uint8_t dfs_region); bool cds_is_dsrc_channel(uint16_t); enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, - enum channel_width chan_width); -enum channel_width cds_get_max_channel_bw(uint32_t chan_num); + enum phy_ch_width chan_width); + +enum phy_ch_width cds_get_max_channel_bw(uint32_t chan_num); QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain); QDF_STATUS cds_put_default_country(uint8_t *def_country); diff --git a/core/cds/inc/cds_regdomain.h b/core/cds/inc/cds_regdomain.h index 68a0bb191350..594eea8d7a0a 100644 --- a/core/cds/inc/cds_regdomain.h +++ b/core/cds/inc/cds_regdomain.h @@ -480,23 +480,6 @@ enum dfs_region { DFS_MKK_REGION = 3 }; -/** - * enum ch_width - channel width - * @CH_WIDTH_20MHZ: channel width 20 MHz - * @CH_WIDTH_40MHZ: channel width 40 MHz - * @CH_WIDTH_80MHZ: channel width 80MHz - * @CH_WIDTH_160MHZ: channel width 160 MHz - * @CH_WIDTH_80P80MHZ: channel width 160MHz(80+80) - */ -enum ch_width { - CH_WIDTH_20MHZ = 0, - CH_WIDTH_40MHZ = 1, - CH_WIDTH_80MHZ = 2, - CH_WIDTH_160MHZ = 3, - CH_WIDTH_80P80MHZ = 4, - CH_WIDTH_MAX -}; - /** * enum offset_t: channel offset * @BW20: 20 mhz channel @@ -549,7 +532,7 @@ struct country_code_to_reg_dmn { * @center_freq_seg1: center freq for segment 1 */ struct ch_params_s { - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t sec_ch_offset; uint8_t center_freq_seg0; uint8_t center_freq_seg1; diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c index 5f77ce5e9e8c..d43acc041225 100644 --- a/core/cds/src/cds_reg_service.c +++ b/core/cds/src/cds_reg_service.c @@ -209,7 +209,7 @@ enum channel_state cds_get_channel_state(uint32_t chan_num) * Return: channel state */ enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, - enum channel_width ch_width) + enum phy_ch_width ch_width) { enum channel_enum chan_enum; bool bw_enabled = false; @@ -219,21 +219,21 @@ enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, return CHANNEL_STATE_INVALID; if (reg_channels[chan_enum].state) { - if (CHAN_WIDTH_5MHZ == ch_width) + if (CH_WIDTH_5MHZ == ch_width) bw_enabled = 1; - else if (CHAN_WIDTH_10MHZ == ch_width) + else if (CH_WIDTH_10MHZ == ch_width) bw_enabled = !(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_10MHZ); - else if (CHAN_WIDTH_20MHZ == ch_width) + else if (CH_WIDTH_20MHZ == ch_width) bw_enabled = !(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_20MHZ); - else if (CHAN_WIDTH_40MHZ == ch_width) + else if (CH_WIDTH_40MHZ == ch_width) bw_enabled = !(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_HT40); - else if (CHAN_WIDTH_80MHZ == ch_width) + else if (CH_WIDTH_80MHZ == ch_width) bw_enabled = !(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_80MHZ); - else if (CHAN_WIDTH_160MHZ == ch_width) + else if (CH_WIDTH_160MHZ == ch_width) bw_enabled = !(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_160MHZ); } @@ -250,10 +250,10 @@ enum channel_state cds_get_bonded_channel_state(uint32_t chan_num, * * Return: channel_width */ -enum channel_width cds_get_max_channel_bw(uint32_t chan_num) +enum phy_ch_width cds_get_max_channel_bw(uint32_t chan_num) { enum channel_enum chan_enum; - enum channel_width chan_bw = CHAN_WIDTH_0MHZ; + enum phy_ch_width chan_bw = CH_WIDTH_INVALID; chan_enum = cds_get_channel_enum(chan_num); @@ -262,25 +262,23 @@ enum channel_width cds_get_max_channel_bw(uint32_t chan_num) if (!(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_160MHZ)) - chan_bw = CHAN_WIDTH_160MHZ; + chan_bw = CH_WIDTH_160MHZ; else if (!(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_80MHZ)) - chan_bw = CHAN_WIDTH_80MHZ; + chan_bw = CH_WIDTH_80MHZ; else if (!(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_HT40)) - chan_bw = CHAN_WIDTH_40MHZ; + chan_bw = CH_WIDTH_40MHZ; else if (!(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_20MHZ)) - chan_bw = CHAN_WIDTH_20MHZ; + chan_bw = CH_WIDTH_20MHZ; else if (!(reg_channels[chan_enum].flags & IEEE80211_CHAN_NO_10MHZ)) - chan_bw = CHAN_WIDTH_10MHZ; + chan_bw = CH_WIDTH_10MHZ; else - chan_bw = CHAN_WIDTH_5MHZ; + chan_bw = CH_WIDTH_5MHZ; } - return chan_bw; - } /** diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 156865465e55..6c847f3d6874 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1394,7 +1394,7 @@ struct hdd_context_s { -------------------------------------------------------------------------*/ int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter, uint32_t chan_number, - enum ch_width chan_bw); + enum phy_ch_width chan_bw); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH void wlan_hdd_check_sta_ap_concurrent_ch_intf(void *sta_pAdapter); #endif @@ -1606,7 +1606,7 @@ const char *hdd_get_fwpath(void); void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind); hdd_adapter_t *hdd_get_adapter_by_sme_session_id(hdd_context_t *hdd_ctx, uint32_t sme_session_id); -enum ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); +enum phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width); uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel, uint8_t bw_offset); void hdd_update_config(hdd_context_t *hdd_ctx); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index d6002c55bda6..1ce82c2e06c8 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -11274,7 +11274,7 @@ static int __wlan_hdd_cfg80211_channel_switch(struct wiphy *wiphy, uint8_t channel; uint16_t freq; int ret; - enum ch_width ch_width; + enum phy_ch_width ch_width; hddLog(LOG1, FL("Set Freq %d"), csa_params->chandef.chan->center_freq); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 17ce14e943dd..3e5e6406c430 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2005,7 +2005,7 @@ int hdd_softap_unpack_ie(tHalHandle halHandle, * Return: 0 for success, non zero for failure */ int hdd_softap_set_channel_change(struct net_device *dev, int target_channel, - enum ch_width target_bw) + enum phy_ch_width target_bw) { QDF_STATUS status; int ret = 0; diff --git a/core/hdd/src/wlan_hdd_hostapd.h b/core/hdd/src/wlan_hdd_hostapd.h index 795a9d74a2ef..223b1c12cf0e 100644 --- a/core/hdd/src/wlan_hdd_hostapd.h +++ b/core/hdd/src/wlan_hdd_hostapd.h @@ -60,8 +60,8 @@ eCsrAuthType hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4]); int hdd_softap_set_channel_change(struct net_device *dev, - int target_channel, - enum ch_width target_bw); + int target_channel, + enum phy_ch_width target_bw); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH void hdd_sap_restart_with_channel_switch(hdd_adapter_t *adapter, diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 90104812d73e..d031427d7f3e 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -7432,7 +7432,7 @@ static int drv_cmd_set_channel_switch(hdd_adapter_t *adapter, int status; uint32_t chan_number = 0, chan_bw = 0; uint8_t *value = command; - enum ch_width width; + enum phy_ch_width width; if ((adapter->device_mode != QDF_P2P_GO_MODE) && (adapter->device_mode != QDF_SAP_MODE)) { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 243a6fc90ac9..ae1e9d00109c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -246,7 +246,7 @@ const char *hdd_device_mode_to_string(uint8_t device_mode) */ int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter, uint32_t chan_number, - enum ch_width chan_bw) + enum phy_ch_width chan_bw) { uint8_t chan[WNI_CFG_VALID_CHANNEL_LIST_LEN]; uint32_t len = WNI_CFG_VALID_CHANNEL_LIST_LEN, i; @@ -433,7 +433,7 @@ static int curr_con_mode; * Return: Converted channel width. In case of non matching NL channel width, * CH_WIDTH_MAX will be returned. */ -enum ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width) +enum phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width) { switch (ch_width) { case NL80211_CHAN_WIDTH_20_NOHT: @@ -449,11 +449,13 @@ enum ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width) case NL80211_CHAN_WIDTH_160: return CH_WIDTH_160MHZ; case NL80211_CHAN_WIDTH_5: + return CH_WIDTH_5MHZ; case NL80211_CHAN_WIDTH_10: + return CH_WIDTH_10MHZ; default: hdd_err("Invalid channel width %d, setting to default", ch_width); - return CH_WIDTH_MAX; + return CH_WIDTH_INVALID; } } diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 2737f9ecb1c2..2bae37ae0f7a 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -3866,7 +3866,7 @@ typedef struct sSirChanChangeRequest { uint16_t messageLen; uint8_t targetChannel; uint8_t sec_ch_offset; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t center_freq_seg_0; uint8_t center_freq_seg_1; uint8_t bssid[QDF_MAC_ADDR_SIZE]; diff --git a/core/mac/src/pe/include/lim_global.h b/core/mac/src/pe/include/lim_global.h index 16e50515bae2..e1efe10930f0 100644 --- a/core/mac/src/pe/include/lim_global.h +++ b/core/mac/src/pe/include/lim_global.h @@ -502,7 +502,7 @@ typedef struct sLimChannelSwitchInfo { uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t sec_ch_offset; - enum ch_width ch_width; + enum phy_ch_width ch_width; int8_t switchCount; uint32_t switchTimeoutValue; uint8_t switchMode; diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h index 6371849ff1f7..8ff3010ee5a7 100644 --- a/core/mac/src/pe/include/lim_session.h +++ b/core/mac/src/pe/include/lim_session.h @@ -313,7 +313,7 @@ typedef struct sPESession /* Added to Support BT-AMP */ tLimOperatingModeInfo gLimOperatingMode; uint8_t vhtCapabilityPresentInBeacon; uint8_t ch_center_freq_seg0; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t ch_center_freq_seg1; uint8_t txBFIniFeatureEnabled; uint8_t txbf_csn_value; diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 6d5b78ae70da..e1d3899d033a 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -2978,7 +2978,7 @@ void lim_complete_mlm_scan(tpAniSirGlobal mac_ctx, tSirResultCodes ret_code) */ void lim_set_channel(tpAniSirGlobal mac_ctx, uint8_t channel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width, int8_t max_tx_power, + enum phy_ch_width ch_width, int8_t max_tx_power, uint8_t pe_session_id) { tpPESession pe_session; diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index c990d54dbe4a..02088d335d75 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -206,7 +206,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width, + enum phy_ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart) diff --git a/core/mac/src/pe/lim/lim_send_messages.h b/core/mac/src/pe/lim/lim_send_messages.h index 9ac8fada3971..187c1aeaddf1 100644 --- a/core/mac/src/pe/lim/lim_send_messages.h +++ b/core/mac/src/pe/lim/lim_send_messages.h @@ -67,7 +67,7 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, uint8_t chnlNumber, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width, + enum phy_ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId, uint8_t is_restart); diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index 590d8eba74b3..c6565a52f809 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -2398,7 +2398,7 @@ lim_send_sme_ap_channel_switch_resp(tpAniSirGlobal pMac, tpSwitchChannelParams pSmeSwithChnlParams; uint8_t channelId; bool is_ch_dfs = false; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t ch_center_freq_seg1; pSmeSwithChnlParams = (tSwitchChannelParams *) diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 616147cd8cdc..2bbb79d19221 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -552,7 +552,7 @@ uint32_t lim_defer_msg(tpAniSirGlobal, tSirMsgQ *); /* / Function that Switches the Channel and sets the CB Mode */ void lim_set_channel(tpAniSirGlobal pMac, uint8_t channel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width, int8_t maxTxPower, + enum phy_ch_width ch_width, int8_t maxTxPower, uint8_t peSessionId); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 23af25a3be6e..1f349688f72e 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -2725,7 +2725,7 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, uint8_t newChannel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width) + enum phy_ch_width ch_width) { uint8_t subband = 0; diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index b7b8715a9eb5..fb39f47705ce 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -219,7 +219,7 @@ void lim_switch_primary_secondary_channel(tpAniSirGlobal pMac, uint8_t newChannel, uint8_t ch_center_freq_seg0, uint8_t ch_center_freq_seg1, - enum ch_width ch_width); + enum phy_ch_width ch_width); void limUpdateStaRunTimeHTSwtichChnlParams(tpAniSirGlobal pMac, tDot11fIEHTInfo *pRcvdHTInfo, uint8_t bssIdx); diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index 3a390fae9323..51751d6bddb9 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -621,8 +621,8 @@ typedef struct sSapDfsInfo { * New channel width and new channel bonding mode * will only be updated via channel fallback mechanism */ - enum ch_width orig_chanWidth; - enum ch_width new_chanWidth; + enum phy_ch_width orig_chanWidth; + enum phy_ch_width new_chanWidth; struct ch_params_s new_ch_params; /* @@ -828,8 +828,9 @@ QDF_STATUS wlansap_disassoc_sta(void *p_cds_gctx, QDF_STATUS wlansap_deauth_sta(void *p_cds_gctx, struct tagCsrDelStaParams *pDelStaParams); QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, - uint32_t targetChannel, enum ch_width target_bw); -QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, tCsrRoamSetKey *pSetKeyInfo); + uint32_t targetChannel, enum phy_ch_width target_bw); +QDF_STATUS wlansap_set_key_sta(void *p_cds_gctx, + tCsrRoamSetKey *pSetKeyInfo); QDF_STATUS wlansap_get_assoc_stations(void *p_cds_gctx, QDF_MODULE_ID module, tpSap_AssocMacAddr pAssocStas); QDF_STATUS wlansap_remove_wps_session_overlap(void *p_cds_gctx, diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 8d4e690ef858..77428fc2600b 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -890,7 +890,7 @@ static inline void sap_event_init(ptWLAN_SAPEvent sapEvent) */ bool sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, - enum ch_width ch_width, + enum phy_ch_width ch_width, uint8_t NOL_channel, tSapTxLeakInfo **pTarget_chnl_mtrx) { @@ -955,7 +955,7 @@ sap_find_target_channel_in_channel_matrix(ptSapContext sapContext, QDF_STATUS sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx, - enum ch_width ch_width, + enum phy_ch_width ch_width, tSapDfsNolInfo *nol, uint8_t temp_ch_lst_sz, uint8_t *temp_ch_lst) @@ -1069,7 +1069,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel) * Return: number of channels found */ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap, - enum ch_width ch_width, + enum phy_ch_width ch_width, uint8_t *avail_chnl) { uint8_t i = 0; @@ -1248,7 +1248,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) uint8_t channelID; tHalHandle hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx); tpAniSirGlobal pMac; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t *tmp_ch_lst = NULL; uint8_t dfs_region; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 983ce4247c30..a08c12c76c3f 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1470,7 +1470,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context, */ QDF_STATUS wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel, - enum ch_width target_bw) + enum phy_ch_width target_bw) { ptSapContext sapContext = NULL; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 8dc2d4862d08..137d719e07a7 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1483,7 +1483,7 @@ struct wma_vdev_start_req { uint32_t beacon_intval; uint32_t dtim_period; int32_t max_txpow; - enum ch_width chan_width; + enum phy_ch_width chan_width; bool is_dfs; uint8_t vdev_id; uint8_t chan; diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h index a380eecc745b..831a9058023f 100644 --- a/core/wma/inc/wma_if.h +++ b/core/wma/inc/wma_if.h @@ -499,7 +499,7 @@ typedef struct { uint8_t halPersona; uint8_t bSpectrumMgtEnabled; uint8_t vhtCapable; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t reassocReq; /* Set only during roaming reassociation */ @@ -910,7 +910,7 @@ typedef struct { uint16_t smpsMode; uint8_t isDfsChannel; uint8_t vhtCapable; - enum ch_width ch_width; + enum phy_ch_width ch_width; uint8_t ch_center_freq_seg0; uint8_t ch_center_freq_seg1; uint8_t dot11_mode; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index 4893b0df029f..b033c825ab24 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -899,7 +899,7 @@ QDF_STATUS wma_process_lphb_conf_req(tp_wma_handle wma_handle, QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, tAniDHCPInd *ta_dhcp_ind); -WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum ch_width chan_width, +WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum phy_ch_width chan_width, u8 vht_capable, u8 dot11_mode); QDF_STATUS wma_get_link_speed(WMA_HANDLE handle, tSirLinkSpeedInfo *pLinkSpeed); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index a50cf7eb69b7..1bc6879eb3f0 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -677,7 +677,7 @@ QDF_STATUS wma_process_dhcp_ind(tp_wma_handle wma_handle, * * Return: return phy mode */ -WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum ch_width chan_width, +WLAN_PHY_MODE wma_chan_to_mode(u8 chan, enum phy_ch_width chan_width, u8 vht_capable, u8 dot11_mode) { WLAN_PHY_MODE phymode = MODE_UNKNOWN; diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 765dbcdf8292..6092d3547b94 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -4235,17 +4235,6 @@ typedef enum { WMI_MESH_STATS = 6, } wmi_link_iface_type; -/* channel operating width */ -typedef enum { - WMI_CHAN_WIDTH_20 = 0, - WMI_CHAN_WIDTH_40 = 1, - WMI_CHAN_WIDTH_80 = 2, - WMI_CHAN_WIDTH_160 = 3, - WMI_CHAN_WIDTH_80P80 = 4, - WMI_CHAN_WIDTH_5 = 5, - WMI_CHAN_WIDTH_10 = 6, -} wmi_channel_width; - /*Clear stats*/ typedef struct { A_UINT32 tlv_header; -- cgit v1.2.3 From 89223f7e3693e5867660c586f540e921d7e40ab5 Mon Sep 17 00:00:00 2001 From: Nirav Shah Date: Tue, 1 Mar 2016 18:10:38 +0530 Subject: qcacld-3.0: Update netif queue timestamp to avoid watchdog Update netif queue timestamp while stopping queues to avoid NETDEV watchdog CRs-Fixed: 983687 Change-Id: Ifb0777001fead64836f1ea38eb8a3becc47ecac2 --- core/hdd/src/wlan_hdd_softap_tx_rx.c | 22 ++++++++++++++++-- core/hdd/src/wlan_hdd_tx_rx.c | 45 +++++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index faf3fbe53a87..5bb3492c54b7 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -370,11 +370,11 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) { hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *hdd_ctx; + struct netdev_queue *txq; + int i; DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT, NULL, 0)); - QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, - "%s: Transmission timeout occurred", __func__); /* Getting here implies we disabled the TX queues for too * long. Queues are disabled either because of disassociation * or low resource scenarios. In case of disassociation it is @@ -387,6 +387,24 @@ static void __hdd_softap_tx_timeout(struct net_device *dev) "%s: Recovery in Progress. Ignore!!!", __func__); return; } + + QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR, + "%s: Transmission timeout occurred jiffies %lu trans_start %lu" + , __func__, jiffies, dev->trans_start); + + for (i = 0; i < NUM_TX_QUEUES; i++) { + txq = netdev_get_tx_queue(dev, i); + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, + QDF_TRACE_LEVEL_ERROR, + "Queue%d status: %d txq->trans_start %lu", + i, netif_tx_queue_stopped(txq), txq->trans_start); + } + + wlan_hdd_display_netif_queue_history(hdd_ctx); + ol_tx_dump_flow_pool_info(); + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, + "carrier state: %d", netif_carrier_ok(dev)); + } /** diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index f8f90d9d50cf..68b3fa7ea6c9 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -583,6 +583,8 @@ QDF_STATUS hdd_ibss_get_sta_id(hdd_station_ctx_t *pHddStaCtx, */ static void __hdd_tx_timeout(struct net_device *dev) { + hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); + hdd_context_t *hdd_ctx; struct netdev_queue *txq; int i = 0; @@ -601,13 +603,16 @@ static void __hdd_tx_timeout(struct net_device *dev) for (i = 0; i < NUM_TX_QUEUES; i++) { txq = netdev_get_tx_queue(dev, i); - QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, + QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR, "Queue%d status: %d txq->trans_start %lu", i, netif_tx_queue_stopped(txq), txq->trans_start); } QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO, "carrier state: %d", netif_carrier_ok(dev)); + hdd_ctx = WLAN_HDD_GET_CTX(adapter); + wlan_hdd_display_netif_queue_history(hdd_ctx); + ol_tx_dump_flow_pool_info(); } /** @@ -980,6 +985,27 @@ static void wlan_hdd_update_queue_oper_stats(hdd_adapter_t *adapter, return; } +/** + * wlan_hdd_update_txq_timestamp() - update txq timestamp + * @dev: net device + * + * Return: none + */ +void wlan_hdd_update_txq_timestamp(struct net_device *dev) +{ + struct netdev_queue *txq; + int i; + bool unlock; + + for (i = 0; i < NUM_TX_QUEUES; i++) { + txq = netdev_get_tx_queue(dev, i); + unlock = __netif_tx_trylock(txq); + txq_trans_update(txq); + if (unlock == true) + __netif_tx_unlock(txq); + } +} + /** * wlan_hdd_netif_queue_control() - Use for netif_queue related actions * @adapter: adapter handle @@ -1014,8 +1040,10 @@ void wlan_hdd_netif_queue_control(hdd_adapter_t *adapter, case WLAN_STOP_ALL_NETIF_QUEUE: spin_lock_bh(&adapter->pause_map_lock); - if (!adapter->pause_map) + if (!adapter->pause_map) { netif_tx_stop_all_queues(adapter->dev); + wlan_hdd_update_txq_timestamp(adapter->dev); + } adapter->pause_map |= (1 << reason); spin_unlock_bh(&adapter->pause_map_lock); break; @@ -1038,8 +1066,10 @@ void wlan_hdd_netif_queue_control(hdd_adapter_t *adapter, case WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER: spin_lock_bh(&adapter->pause_map_lock); - if (!adapter->pause_map) + if (!adapter->pause_map) { netif_tx_stop_all_queues(adapter->dev); + wlan_hdd_update_txq_timestamp(adapter->dev); + } adapter->pause_map |= (1 << reason); netif_carrier_off(adapter->dev); spin_unlock_bh(&adapter->pause_map_lock); @@ -1056,16 +1086,20 @@ void wlan_hdd_netif_queue_control(hdd_adapter_t *adapter, case WLAN_NETIF_TX_DISABLE: spin_lock_bh(&adapter->pause_map_lock); - if (!adapter->pause_map) + if (!adapter->pause_map) { netif_tx_disable(adapter->dev); + wlan_hdd_update_txq_timestamp(adapter->dev); + } adapter->pause_map |= (1 << reason); spin_unlock_bh(&adapter->pause_map_lock); break; case WLAN_NETIF_TX_DISABLE_N_CARRIER: spin_lock_bh(&adapter->pause_map_lock); - if (!adapter->pause_map) + if (!adapter->pause_map) { netif_tx_disable(adapter->dev); + wlan_hdd_update_txq_timestamp(adapter->dev); + } adapter->pause_map |= (1 << reason); netif_carrier_off(adapter->dev); spin_unlock_bh(&adapter->pause_map_lock); @@ -1080,7 +1114,6 @@ void wlan_hdd_netif_queue_control(hdd_adapter_t *adapter, wlan_hdd_process_peer_unauthorised_pause(adapter); spin_unlock_bh(&adapter->pause_map_lock); - wlan_hdd_update_queue_oper_stats(adapter, action, reason); adapter->queue_oper_history[adapter->history_index].time = -- cgit v1.2.3 From 515a9efb36304cf20cf1247698da24a18cb8de8f Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 11 Dec 2015 11:00:48 -0800 Subject: qcacld-3.0: Remove FEATURE_WLAN_ESE_UPLOAD compile macro At present and going forward ESE and ESE_UPLOAD will be the de-facto approach supporting ESE. Hence there is no need of two compile macros FEATURE_WLAN_ESE and FEATURE_WLAN_ESE_UPLOAD. Instead Remove FEATURE_WLAN_ESE_UPLOAD and Keep only FEATURE_WLAN_ESE. Change-Id: If1a04e95211a0d639db7b60a57a6d5f215d26f4e CRs-Fixed: 950762 --- Kbuild | 18 - core/hdd/inc/wlan_hdd_assoc.h | 4 +- core/hdd/inc/wlan_hdd_main.h | 2 +- core/hdd/src/wlan_hdd_assoc.c | 8 +- core/hdd/src/wlan_hdd_ioctl.c | 142 +---- core/mac/inc/sir_api.h | 251 +++++---- core/mac/src/include/parser_api.h | 16 +- core/mac/src/include/sir_params.h | 2 +- core/mac/src/pe/lim/lim_assoc_utils.c | 6 +- core/mac/src/pe/lim/lim_assoc_utils.h | 4 +- core/mac/src/pe/lim/lim_process_action_frame.c | 4 - core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 2 - core/mac/src/pe/lim/lim_process_message_queue.c | 6 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 19 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.c | 24 +- core/mac/src/pe/lim/lim_send_sme_rsp_messages.h | 2 +- core/mac/src/pe/lim/lim_utils.c | 4 +- core/mac/src/sys/legacy/src/utils/src/mac_trace.c | 2 +- core/mac/src/sys/legacy/src/utils/src/parser_api.c | 4 +- core/sme/inc/csr_api.h | 18 +- core/sme/inc/csr_internal.h | 14 +- core/sme/inc/csr_neighbor_roam.h | 4 +- core/sme/inc/sme_api.h | 11 +- core/sme/inc/sme_inside.h | 2 +- core/sme/inc/sme_rrm_internal.h | 4 +- core/sme/src/common/sme_api.c | 587 ++++++++++---------- core/sme/src/csr/csr_api_roam.c | 610 +++++++++++---------- core/sme/src/csr/csr_util.c | 4 +- core/sme/src/rrm/sme_rrm.c | 20 +- core/wma/inc/wma.h | 2 +- core/wma/inc/wma_internal.h | 10 +- core/wma/inc/wma_types.h | 2 +- core/wma/src/wma_features.c | 9 +- core/wma/src/wma_main.c | 2 +- core/wma/src/wma_scan_roam.c | 3 +- 35 files changed, 849 insertions(+), 973 deletions(-) diff --git a/Kbuild b/Kbuild index 790481678c58..a2cc3b43316a 100755 --- a/Kbuild +++ b/Kbuild @@ -145,10 +145,7 @@ WLAN_COMMON_ROOT ?= qca-wifi-host-cmn WLAN_COMMON_INC ?= $(WLAN_ROOT)/$(WLAN_COMMON_ROOT) ifneq ($(CONFIG_MOBILE_ROUTER), y) -# To enable ESE upload, dependent config -# CONFIG_QCOM_ESE must be enabled. CONFIG_QCOM_ESE := y -CONFIG_QCOM_ESE_UPLOAD := y endif # Feature flags which are not (currently) configurable via Kconfig @@ -434,12 +431,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_trace.o \ $(MAC_SRC_DIR)/pe/lim/lim_utils.o -ifeq ($(CONFIG_QCOM_ESE),y) -ifneq ($(CONFIG_QCOM_ESE_UPLOAD),y) -MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/limProcessEseFrame.o -endif -endif - ifeq ($(CONFIG_QCOM_TDLS),y) MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_tdls.o endif @@ -506,12 +497,6 @@ SME_CSR_OBJS := $(SME_SRC_DIR)/csr/csr_api_roam.o \ $(SME_SRC_DIR)/csr/csr_neighbor_roam.o \ $(SME_SRC_DIR)/csr/csr_util.o -ifeq ($(CONFIG_QCOM_ESE),y) -ifneq ($(CONFIG_QCOM_ESE_UPLOAD),y) -SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csrEse.o -endif -endif - ifeq ($(CONFIG_QCOM_TDLS),y) SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csr_tdls_process.o endif @@ -1012,9 +997,6 @@ ifeq ($(CONFIG_QCOM_ESE),y) CDEFINES += -DFEATURE_WLAN_ESE CDEFINES += -DQCA_COMPUTE_TX_DELAY CDEFINES += -DQCA_COMPUTE_TX_DELAY_PER_TID -ifeq ($(CONFIG_QCOM_ESE_UPLOAD),y) -CDEFINES += -DFEATURE_WLAN_ESE_UPLOAD -endif endif #normally, TDLS negative behavior is not needed diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h index 8b51e3b1adac..0081155c14c3 100644 --- a/core/hdd/inc/wlan_hdd_assoc.h +++ b/core/hdd/inc/wlan_hdd_assoc.h @@ -232,7 +232,7 @@ QDF_STATUS hdd_roam_register_tdlssta(hdd_adapter_t *pAdapter, */ void hdd_perform_roam_set_key_complete(hdd_adapter_t *pAdapter); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** * hdd_indicate_ese_bcn_report_no_results() - beacon report no scan results * @pAdapter: pointer to adapter @@ -250,7 +250,7 @@ hdd_indicate_ese_bcn_report_no_results(const hdd_adapter_t *pAdapter, const uint16_t measurementToken, const bool flag, const uint8_t numBss); -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter, uint8_t sta_id, diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 6c847f3d6874..53a8445cf356 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -974,7 +974,7 @@ struct hdd_adapter_s { bool survey_idx; hdd_scaninfo_t scan_info; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE tAniTrafStrmMetrics tsmStats; #endif /* Flag to ensure PSB is configured through framework */ diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index d8f8742e2ea3..d6060f067b6e 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -3453,7 +3453,7 @@ hdd_indicate_unprot_mgmt_frame(hdd_adapter_t *pAdapter, uint32_t nFrameLength, } #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** * hdd_indicate_tsm_ie() - send traffic stream metrics ie * @pAdapter: pointer to adapter @@ -3835,7 +3835,7 @@ hdd_indicate_ese_bcn_report_ind(const hdd_adapter_t *pAdapter, } } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /** * hdd_is_8021x_sha256_auth_type() - check authentication type to 8021x_sha256 @@ -4172,7 +4172,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, pRoamInfo->frameType); break; #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eCSR_ROAM_TSM_IE_IND: hdd_indicate_tsm_ie(pAdapter, pRoamInfo->tsmIe.tsid, pRoamInfo->tsmIe.state, @@ -4201,7 +4201,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId, hdd_indicate_ese_bcn_report_ind(pAdapter, pRoamInfo); break; } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ default: break; } diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index d031427d7f3e..a042203e4a34 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -41,7 +41,7 @@ #include "wma.h" #include "wlan_hdd_napi.h" -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE #include #include #endif @@ -64,10 +64,10 @@ */ #define WLAN_HDD_IBSS_MIN_OUI_DATA_LENGTH (3) -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE #define TID_MIN_VALUE 0 #define TID_MAX_VALUE 15 -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /* * Maximum buffer size used for returning the data back to user space @@ -128,7 +128,7 @@ typedef struct { static uint16_t cesium_pid; extern struct sock *cesium_nl_srv_sock; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics, const uint32_t staId, void *context) { @@ -268,7 +268,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter, } return vstatus; } -#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /*FEATURE_WLAN_ESE */ /* Function header is left blank intentionally */ static int hdd_parse_setrmcenable_command(uint8_t *pValue, @@ -1600,7 +1600,7 @@ hdd_parse_set_roam_scan_channels(hdd_adapter_t *adapter, const char *command) return ret; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** * hdd_parse_plm_cmd() - HDD Parse Plm command * @pValue: Pointer to input data @@ -2633,7 +2633,7 @@ done: return ret; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** * hdd_parse_ese_beacon_req() - Parse ese beacon request * @pValue: Pointer to data @@ -2794,9 +2794,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue, return 0; } -#endif /* defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) */ -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) /** * hdd_parse_get_cckm_ie() - HDD Parse and fetch the CCKM IE * @pValue: Pointer to input data @@ -2869,7 +2867,7 @@ static int hdd_parse_get_cckm_ie(uint8_t *pValue, uint8_t **pCckmIe, *pCckmIeLen = i; return 0; } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate) { @@ -4738,116 +4736,6 @@ exit: return ret; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -static int drv_cmd_ccx_plm_req(hdd_adapter_t *adapter, - hdd_context_t *hdd_ctx, - uint8_t *command, - uint8_t command_len, - hdd_priv_data_t *priv_data) -{ - int ret = 0; - uint8_t *value = command; - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpSirPlmReq pPlmRequest = NULL; - - pPlmRequest = qdf_mem_malloc(sizeof(tSirPlmReq)); - if (NULL == pPlmRequest) { - ret = -ENOMEM; - goto exit; - } - - status = hdd_parse_plm_cmd(value, pPlmRequest); - if (QDF_STATUS_SUCCESS != status) { - qdf_mem_free(pPlmRequest); - pPlmRequest = NULL; - ret = -EINVAL; - goto exit; - } - pPlmRequest->sessionId = adapter->sessionId; - - status = sme_set_plm_request(hdd_ctx->hHal, pPlmRequest); - if (QDF_STATUS_SUCCESS != status) { - qdf_mem_free(pPlmRequest); - pPlmRequest = NULL; - ret = -EINVAL; - goto exit; - } - -exit: - return ret; -} -#endif - -#ifdef FEATURE_WLAN_ESE -static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter, - hdd_context_t *hdd_ctx, - uint8_t *command, - uint8_t command_len, - hdd_priv_data_t *priv_data) -{ - int ret = 0; - uint8_t *value = command; - uint8_t eseMode = CFG_ESE_FEATURE_ENABLED_DEFAULT; - - /* - * Check if the features OKC/ESE/11R are supported simultaneously, - * then this operation is not permitted (return FAILURE) - */ - if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) && - hdd_is_okc_mode_enabled(hdd_ctx) && - sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) { - QDF_TRACE(QDF_MODULE_ID_HDD, - QDF_TRACE_LEVEL_WARN, - "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!", - __func__); - ret = -EPERM; - goto exit; - } - - /* Move pointer to ahead of SETCCXMODE */ - value = value + command_len + 1; - - /* Convert the value from ascii to integer */ - ret = kstrtou8(value, 10, &eseMode); - if (ret < 0) { - /* - * If the input value is greater than max value of datatype, - * then also kstrtou8 fails - */ - QDF_TRACE(QDF_MODULE_ID_HDD, - QDF_TRACE_LEVEL_ERROR, - "%s: kstrtou8 failed range [%d - %d]", - __func__, CFG_ESE_FEATURE_ENABLED_MIN, - CFG_ESE_FEATURE_ENABLED_MAX); - ret = -EINVAL; - goto exit; - } - - if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) || - (eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) { - QDF_TRACE(QDF_MODULE_ID_HDD, - QDF_TRACE_LEVEL_ERROR, - "Ese mode value %d is out of range (Min: %d Max: %d)", - eseMode, - CFG_ESE_FEATURE_ENABLED_MIN, - CFG_ESE_FEATURE_ENABLED_MAX); - ret = -EINVAL; - goto exit; - } - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, - "%s: Received Command to change ese mode = %d", - __func__, eseMode); - - hdd_ctx->config->isEseIniFeatureEnabled = eseMode; - sme_update_is_ese_feature_enabled(hdd_ctx->hHal, - adapter->sessionId, - eseMode); - -exit: - return ret; -} -#endif - static int drv_cmd_set_roam_scan_control(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, uint8_t *command, @@ -5810,7 +5698,7 @@ exit: return ret; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, uint8_t *command, @@ -6079,7 +5967,7 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter, exit: return ret; } -#endif /* #if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) */ +#endif /* FEATURE_WLAN_ESE */ static int drv_cmd_set_mc_rate(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, @@ -7526,12 +7414,6 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = { {"SETFASTROAM", drv_cmd_set_fast_roam}, {"SETFASTTRANSITION", drv_cmd_set_fast_transition}, {"FASTREASSOC", drv_cmd_fast_reassoc}, -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) - {"CCXPLMREQ", drv_cmd_ccx_plm_req}, -#endif -#ifdef FEATURE_WLAN_ESE - {"SETCCXMODE", drv_cmd_set_ccx_mode}, -#endif {"SETROAMSCANCONTROL", drv_cmd_set_roam_scan_control}, #ifdef FEATURE_WLAN_OKC {"SETOKCMODE", drv_cmd_set_okc_mode}, @@ -7550,12 +7432,12 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = { {"GETIBSSPEERINFO", drv_cmd_get_ibss_peer_info}, {"SETRMCTXRATE", drv_cmd_set_rmc_tx_rate}, {"SETIBSSTXFAILEVENT", drv_cmd_set_ibss_tx_fail_event}, -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE {"SETCCXROAMSCANCHANNELS", drv_cmd_set_ccx_roam_scan_channels}, {"GETTSMSTATS", drv_cmd_get_tsm_stats}, {"SETCCKMIE", drv_cmd_set_cckm_ie}, {"CCXBEACONREQ", drv_cmd_ccx_beacon_req}, -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ {"SETMCRATE", drv_cmd_set_mc_rate}, {"MAXTXPOWER", drv_cmd_max_tx_power}, {"SETDFSSCANMODE", drv_cmd_set_dfs_scan_mode}, diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 2bae37ae0f7a..7859837648f8 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -707,19 +707,6 @@ typedef struct sSirDFSChannelList { } tSirDFSChannelList, *tpSirDFSChannelList; -#ifdef FEATURE_WLAN_ESE -typedef struct sTspecInfo { - uint8_t valid; - tSirMacTspecIE tspec; -} tTspecInfo; - -#define SIR_ESE_MAX_TSPEC_IES 4 -typedef struct sESETspecTspecInfo { - uint8_t numTspecs; - tTspecInfo tspec[SIR_ESE_MAX_TSPEC_IES]; -} tESETspecInfo; -#endif - /* / Two Background Scan mode */ typedef enum eSirBackgroundScanMode { eSIR_ROAMING_SCAN = 2, @@ -886,6 +873,127 @@ typedef struct sSirOemDataRsp { #endif /* FEATURE_OEM_DATA_SUPPORT */ +#ifdef FEATURE_WLAN_ESE +typedef struct sTspecInfo { + uint8_t valid; + tSirMacTspecIE tspec; +} tTspecInfo; + +#define SIR_ESE_MAX_TSPEC_IES 4 +typedef struct sESETspecTspecInfo { + uint8_t numTspecs; + tTspecInfo tspec[SIR_ESE_MAX_TSPEC_IES]; +} tESETspecInfo; + +typedef struct sSirTsmIE { + uint8_t tsid; + uint8_t state; + uint16_t msmt_interval; +} tSirTsmIE, *tpSirTsmIE; +typedef struct sSirSmeTsmIEInd { + tSirTsmIE tsmIe; + uint8_t sessionId; +} tSirSmeTsmIEInd, *tpSirSmeTsmIEInd; +typedef struct sAniTrafStrmMetrics { + uint16_t UplinkPktQueueDly; + uint16_t UplinkPktQueueDlyHist[4]; + uint32_t UplinkPktTxDly; + uint16_t UplinkPktLoss; + uint16_t UplinkPktCount; + uint8_t RoamingCount; + uint16_t RoamingDly; +} tAniTrafStrmMetrics, *tpAniTrafStrmMetrics; + +typedef struct sAniGetTsmStatsReq { + /* Common for all types are requests */ + uint16_t msgType; /* message type is same as the request type */ + uint16_t msgLen; /* length of the entire request */ + uint8_t staId; + uint8_t tid; /* traffic id */ + struct qdf_mac_addr bssId; + void *tsmStatsCallback; + void *pDevContext; /* device context */ + void *p_cds_context; /* cds context */ +} tAniGetTsmStatsReq, *tpAniGetTsmStatsReq; + +typedef struct sAniGetTsmStatsRsp { + /* Common for all types are responses */ + uint16_t msgType; /* + * message type is same as + * the request type + */ + uint16_t msgLen; /* + * length of the entire request, + * includes the pStatsBuf length too + */ + uint8_t sessionId; + uint32_t rc; /* success/failure */ + uint32_t staId; /* + * Per STA stats request must + * contain valid + */ + tAniTrafStrmMetrics tsmMetrics; + void *tsmStatsReq; /* tsm stats request backup */ +} tAniGetTsmStatsRsp, *tpAniGetTsmStatsRsp; + +typedef struct sSirEseBcnReportBssInfo { + tBcnReportFields bcnReportFields; + uint8_t ieLen; + uint8_t *pBuf; +} tSirEseBcnReportBssInfo, *tpSirEseBcnReportBssInfo; + +typedef struct sSirEseBcnReportRsp { + uint16_t measurementToken; + uint8_t flag; /* Flag to report measurement done and more data */ + uint8_t numBss; + tSirEseBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC]; +} tSirEseBcnReportRsp, *tpSirEseBcnReportRsp; + +#define TSRS_11AG_RATE_6MBPS 0xC +#define TSRS_11B_RATE_5_5MBPS 0xB +typedef struct sSirMacESETSRSIE { + uint8_t tsid; + uint8_t rates[8]; +} tSirMacESETSRSIE; +typedef struct sSirMacESETSMIE { + uint8_t tsid; + uint8_t state; + uint16_t msmt_interval; +} tSirMacESETSMIE; +typedef struct sTSMStats { + uint8_t tid; + struct qdf_mac_addr bssid; + tTrafStrmMetrics tsmMetrics; +} tTSMStats, *tpTSMStats; +typedef struct sEseTSMContext { + uint8_t tid; + tSirMacESETSMIE tsmInfo; + tTrafStrmMetrics tsmMetrics; +} tEseTSMContext, *tpEseTSMContext; +typedef struct sEsePEContext { + tEseTSMContext tsm; +} tEsePEContext, *tpEsePEContext; + +typedef struct sSirPlmReq { + uint16_t diag_token; /* Dialog token */ + uint16_t meas_token; /* measurement token */ + uint16_t numBursts; /* total number of bursts */ + uint16_t burstInt; /* burst interval in seconds */ + uint16_t measDuration; /* in TU's,STA goes off-ch */ + /* no of times the STA should cycle through PLM ch list */ + uint8_t burstLen; + int8_t desiredTxPwr; /* desired tx power */ + struct qdf_mac_addr mac_addr; /* MC dest addr */ + /* no of channels */ + uint8_t plmNumCh; + /* channel numbers */ + uint8_t plmChList[WNI_CFG_VALID_CHANNEL_LIST_LEN]; + uint8_t sessionId; + bool enable; +} tSirPlmReq, *tpSirPlmReq; + +#endif /* FEATURE_WLAN_ESE */ + /* / Definition for response message to previously issued scan request */ typedef struct sSirSmeScanRsp { uint16_t messageType; /* eWNI_SME_SCAN_RSP */ @@ -1644,73 +1752,6 @@ typedef struct sAniGetSnrReq { int8_t snr; } tAniGetSnrReq, *tpAniGetSnrReq; -#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) -typedef struct sSirTsmIE { - uint8_t tsid; - uint8_t state; - uint16_t msmt_interval; -} tSirTsmIE, *tpSirTsmIE; -typedef struct sSirSmeTsmIEInd { - tSirTsmIE tsmIe; - uint8_t sessionId; -} tSirSmeTsmIEInd, *tpSirSmeTsmIEInd; -typedef struct sAniTrafStrmMetrics { - uint16_t UplinkPktQueueDly; - uint16_t UplinkPktQueueDlyHist[4]; - uint32_t UplinkPktTxDly; - uint16_t UplinkPktLoss; - uint16_t UplinkPktCount; - uint8_t RoamingCount; - uint16_t RoamingDly; -} tAniTrafStrmMetrics, *tpAniTrafStrmMetrics; - -typedef struct sAniGetTsmStatsReq { - /* Common for all types are requests */ - uint16_t msgType; /* message type is same as the request type */ - uint16_t msgLen; /* length of the entire request */ - uint8_t staId; - uint8_t tid; /* traffic id */ - struct qdf_mac_addr bssId; - void *tsmStatsCallback; - void *pDevContext; /* device context */ - void *p_cds_context; /* cds context */ -} tAniGetTsmStatsReq, *tpAniGetTsmStatsReq; - -typedef struct sAniGetTsmStatsRsp { - /* Common for all types are responses */ - uint16_t msgType; /* - * message type is same as - * the request type - */ - uint16_t msgLen; /* - * length of the entire request, - * includes the pStatsBuf length too - */ - uint8_t sessionId; - uint32_t rc; /* success/failure */ - uint32_t staId; /* - * Per STA stats request must - * contain valid - */ - tAniTrafStrmMetrics tsmMetrics; - void *tsmStatsReq; /* tsm stats request backup */ -} tAniGetTsmStatsRsp, *tpAniGetTsmStatsRsp; - -typedef struct sSirEseBcnReportBssInfo { - tBcnReportFields bcnReportFields; - uint8_t ieLen; - uint8_t *pBuf; -} tSirEseBcnReportBssInfo, *tpSirEseBcnReportBssInfo; - -typedef struct sSirEseBcnReportRsp { - uint16_t measurementToken; - uint8_t flag; /* Flag to report measurement done and more data */ - uint8_t numBss; - tSirEseBcnReportBssInfo bcnRepBssInfo[SIR_BCN_REPORT_MAX_BSS_DESC]; -} tSirEseBcnReportRsp, *tpSirEseBcnReportRsp; - -#endif /* FEATURE_WLAN_ESE || FEATURE_WLAN_ESE_UPLOAD */ - /* Change country code request MSG structure */ typedef struct sAniChangeCountryCodeReq { /* Common for all types are requests */ @@ -1877,33 +1918,6 @@ typedef struct sSirTclasInfo { } qdf_packed tclasParams; } qdf_packed tSirTclasInfo; -#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) -#define TSRS_11AG_RATE_6MBPS 0xC -#define TSRS_11B_RATE_5_5MBPS 0xB -typedef struct sSirMacESETSRSIE { - uint8_t tsid; - uint8_t rates[8]; -} tSirMacESETSRSIE; -typedef struct sSirMacESETSMIE { - uint8_t tsid; - uint8_t state; - uint16_t msmt_interval; -} tSirMacESETSMIE; -typedef struct sTSMStats { - uint8_t tid; - struct qdf_mac_addr bssid; - tTrafStrmMetrics tsmMetrics; -} tTSMStats, *tpTSMStats; -typedef struct sEseTSMContext { - uint8_t tid; - tSirMacESETSMIE tsmInfo; - tTrafStrmMetrics tsmMetrics; -} tEseTSMContext, *tpEseTSMContext; -typedef struct sEsePEContext { - tEseTSMContext tsm; -} tEsePEContext, *tpEsePEContext; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ - typedef struct sSirAddtsReqInfo { uint8_t dialogToken; tSirMacTspecIE tspec; @@ -1931,7 +1945,7 @@ typedef struct sSirAddtsRspInfo { tSirTclasInfo tclasInfo[SIR_MAC_TCLASIE_MAXNUM]; uint8_t tclasProc; tSirMacScheduleIE schedule; -#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE tSirMacESETSMIE tsmIE; uint8_t tsmPresent:1; #endif @@ -1994,27 +2008,6 @@ typedef struct sSirDeltsRsp { tSirDeltsReqInfo rsp; } tSirDeltsRsp, *tpSirDeltsRsp; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -typedef struct sSirPlmReq { - uint16_t diag_token; /* Dialog token */ - uint16_t meas_token; /* measurement token */ - uint16_t numBursts; /* total number of bursts */ - uint16_t burstInt; /* burst interval in seconds */ - uint16_t measDuration; /* in TU's,STA goes off-ch */ - /* no of times the STA should cycle through PLM ch list */ - uint8_t burstLen; - int8_t desiredTxPwr; /* desired tx power */ - struct qdf_mac_addr mac_addr; /* MC dest addr */ - /* no of channels */ - uint8_t plmNumCh; - /* channel numbers */ - uint8_t plmChList[WNI_CFG_VALID_CHANNEL_LIST_LEN]; - uint8_t sessionId; - bool enable; -} tSirPlmReq, *tpSirPlmReq; -#endif - - #define SIR_QOS_NUM_AC_MAX 4 typedef struct sSirAggrQosReqInfo { diff --git a/core/mac/src/include/parser_api.h b/core/mac/src/include/parser_api.h index 256967d6599d..f48aac5c416f 100644 --- a/core/mac/src/include/parser_api.h +++ b/core/mac/src/include/parser_api.h @@ -280,7 +280,7 @@ typedef struct sSirAssocRsp { tDot11fIEOBSSScanParameters obss_scanparams; } tSirAssocRsp, *tpSirAssocRsp; -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /* Structure to hold ESE Beacon report mandatory IEs */ typedef struct sSirEseBcnReportMandatoryIe { tSirMacSSid ssId; @@ -301,7 +301,7 @@ typedef struct sSirEseBcnReportMandatoryIe { uint8_t timPresent; uint8_t rrmPresent; } tSirEseBcnReportMandatoryIe, *tpSirEseBcnReportMandatoryIe; -#endif /* FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /** * struct s_ext_cap - holds bitfields of extended capability IE @@ -457,13 +457,6 @@ sir_parse_beacon_ie(struct sAniSirGlobal *pMac, tpSirProbeRespBeacon pBeaconStruct, uint8_t *pPayload, uint32_t payloadLength); -#if defined(FEATURE_WLAN_ESE_UPLOAD) -tSirRetStatus -sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, - uint8_t *pPayload, const uint32_t payloadLength, - uint8_t **outIeBuf, uint32_t *pOutIeLen); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ - tSirRetStatus sir_convert_beacon_frame2_struct(struct sAniSirGlobal *pMac, uint8_t *pBeaconFrame, @@ -786,6 +779,11 @@ void populate_dot11_tsrsie(tpAniSirGlobal pMac, void populate_dot11f_re_assoc_tspec(tpAniSirGlobal pMac, tDot11fReAssocRequest *pReassoc, tpPESession psessionEntry); +tSirRetStatus +sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, + uint8_t *pPayload, const uint32_t payloadLength, + uint8_t **outIeBuf, uint32_t *pOutIeLen); + #endif void populate_dot11f_wmm_info_ap(tpAniSirGlobal pMac, diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h index d8b64181c008..c9d78ddaeb69 100644 --- a/core/mac/src/include/sir_params.h +++ b/core/mac/src/include/sir_params.h @@ -479,7 +479,7 @@ typedef struct sSirMbMsgP2p { #define SIR_HAL_INIT_THERMAL_INFO_CMD (SIR_HAL_ITC_MSG_TYPES_BEGIN + 185) #define SIR_HAL_SET_THERMAL_LEVEL (SIR_HAL_ITC_MSG_TYPES_BEGIN + 186) -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE #define SIR_HAL_SET_PLM_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 187) #endif diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 0dc7d791c979..72331a346757 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -623,8 +623,6 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs, lim_deactivate_and_change_timer(pMac, eLIM_JOIN_FAIL_TIMER); pMac->lim.gLastBeaconDtimCount = 0; pMac->lim.gLastBeaconDtimPeriod = 0; - - } #ifdef WLAN_DEBUG /* increment a debug count */ @@ -4992,7 +4990,7 @@ void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameT } #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** ------------------------------------------------------------- \fn lim_send_sme_tsm_ie_ind \brief Forwards the TSM IE information to SME. @@ -5032,4 +5030,4 @@ void lim_send_sme_tsm_ie_ind(tpAniSirGlobal pMac, tpPESession psessionEntry, lim_sys_process_mmh_msg_api(pMac, &mmhMsg, ePROT); return; } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 9daef5193ebd..0331e5a973bc 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -166,7 +166,7 @@ void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameT tpPESession psessionEntry); #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE void lim_send_sme_tsm_ie_ind(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t tid, uint8_t state, uint16_t measInterval); #else @@ -174,6 +174,6 @@ static inline void lim_send_sme_tsm_ie_ind(tpAniSirGlobal pMac, tpPESession psessionEntry, uint8_t tid, uint8_t state, uint16_t measInterval) {} -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ #endif /* __LIM_ASSOC_UTILS_H */ diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index 81e076278913..bc4ccaff45db 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -813,11 +813,9 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx, addts.tspec.tsinfo.traffic.userPrio; qdf_mem_copy(&session->eseContext.tsm.tsmInfo, &addts.tsmIE, sizeof(tSirMacESETSMIE)); -#ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(mac_ctx, session, addts.tsmIE.tsid, addts.tsmIE.state, addts.tsmIE.msmt_interval); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ } #endif /* @@ -1090,9 +1088,7 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx, lim_log(mac_ctx, LOG1, FL("DeleteTS succeeded")); #ifdef FEATURE_WLAN_ESE -#ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(mac_ctx, session, 0, 0, 0); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ #endif } diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index adeee6ad8045..3fa8cf4c68c1 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -484,12 +484,10 @@ static void lim_update_ese_tsm(tpAniSirGlobal mac_ctx, assoc_rsp->TSPECInfo[cnt].user_priority; qdf_mem_copy(&tsm_ctx->tsmInfo, &assoc_rsp->tsmIE, sizeof(tSirMacESETSMIE)); -#ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(mac_ctx, session_entry, assoc_rsp->tsmIE.tsid, assoc_rsp->tsmIE.state, assoc_rsp->tsmIE.msmt_interval); -#endif if (tsm_ctx->tsmInfo.state) tsm_ctx->tsmMetrics.RoamingCount++; break; diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c index e4b1649e7bfb..b239c8529c6b 100644 --- a/core/mac/src/pe/lim/lim_process_message_queue.c +++ b/core/mac/src/pe/lim/lim_process_message_queue.c @@ -1590,9 +1590,9 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) case eWNI_SME_UPDATE_NOA: case eWNI_SME_CLEAR_DFS_CHANNEL_LIST: case eWNI_SME_GET_STATISTICS_REQ: -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eWNI_SME_GET_TSM_STATS_REQ: -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ case eWNI_SME_REGISTER_MGMT_FRAME_CB: case eWNI_SME_EXT_CHANGE_CHANNEL: /* These messages are from HDD.No need to respond to HDD */ @@ -1734,10 +1734,8 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) break; #ifdef FEATURE_WLAN_ESE case WMA_TSM_STATS_RSP: -#ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_pe_ese_tsm_rsp(mac_ctx, (tAniGetTsmStatsRsp *) msg->bodyptr); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ break; #endif case WMA_ADD_TS_RSP: diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 3c605798497f..3bbbf64c389b 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -3962,9 +3962,7 @@ static void __lim_process_sme_delts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf) status = eSIR_FAILURE; } #ifdef FEATURE_WLAN_ESE -#ifdef FEATURE_WLAN_ESE_UPLOAD lim_send_sme_tsm_ie_ind(pMac, psessionEntry, 0, 0, 0); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ #endif /* send an sme response back */ @@ -4052,15 +4050,14 @@ __lim_process_sme_get_statistics_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) return; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** - *FUNCTION: __lim_process_sme_get_tsm_stats_request() + * __lim_process_sme_get_tsm_stats_request() - get tsm stats request * - ***NOTE: + * @pMac: Pointer to Global MAC structure + * @pMsgBuf: A pointer to the SME message buffer * - * @param pMac Pointer to Global MAC structure - * @param *pMsgBuf A pointer to the SME message buffer - * @return None + * Return: None */ static void __lim_process_sme_get_tsm_stats_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) @@ -4080,7 +4077,7 @@ __lim_process_sme_get_tsm_stats_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf) return; } } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ static void __lim_process_sme_update_apwpsi_es(tpAniSirGlobal pMac, uint32_t *pMsgBuf) @@ -4880,12 +4877,12 @@ bool lim_process_sme_req_messages(tpAniSirGlobal pMac, tpSirMsgQ pMsg) /* HAL consumes pMsgBuf. It will be freed there. Set bufConsumed to false. */ bufConsumed = false; break; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eWNI_SME_GET_TSM_STATS_REQ: __lim_process_sme_get_tsm_stats_request(pMac, pMsgBuf); bufConsumed = false; break; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ case eWNI_SME_GET_ASSOC_STAS_REQ: lim_process_sme_get_assoc_sta_info(pMac, pMsgBuf); break; diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c index c6565a52f809..54eb1f07951c 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c @@ -1907,23 +1907,20 @@ lim_send_sme_pe_statistics_rsp(tpAniSirGlobal pMac, uint16_t msgType, void *stat } /*** end lim_send_sme_pe_statistics_rsp() ***/ -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** - * lim_send_sme_pe_ese_tsm_rsp() + * lim_send_sme_pe_ese_tsm_rsp() - send tsm response + * @pMac: Pointer to global pMac structure + * @pStats: Pointer to TSM Stats * - ***FUNCTION: * This function is called to send tsm stats response to HDD. * This function posts the result back to HDD. This is a response to * HDD's request to get tsm stats. * - ***PARAMS: - * @param pMac - Pointer to global pMac structure - * @param pStats - Pointer to TSM Stats - * - * @return none + * Return: None */ - -void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats) +void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, + tAniGetTsmStatsRsp *pStats) { tSirMsgQ mmhMsg; uint8_t sessionId; @@ -1940,9 +1937,8 @@ void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats pPeStats->sessionId = pPeSessionEntry->smeSessionId; } else { PELOGE(lim_log - (pMac, LOGE, FL("Session not found for the Sta id(%d)"), - pPeStats->staId); - ) + (pMac, LOGE, FL("Session not found for the Sta id(%d)"), + pPeStats->staId);) return; } @@ -1961,7 +1957,7 @@ void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats return; } /*** end lim_send_sme_pe_ese_tsm_rsp() ***/ -#endif /* FEATURE_WLAN_ESE) && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ void lim_send_sme_ibss_peer_ind(tpAniSirGlobal pMac, diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h index 4e94f4246678..f8997d19bc43 100644 --- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h +++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.h @@ -89,7 +89,7 @@ void lim_send_sme_stats_rsp(tpAniSirGlobal pMac, uint16_t msgtype, void *stats); void lim_send_sme_pe_statistics_rsp(tpAniSirGlobal pMac, uint16_t msgtype, void *stats); -#ifdef FEATURE_WLAN_ESE_UPLOAD +#ifdef FEATURE_WLAN_ESE void lim_send_sme_pe_ese_tsm_rsp(tpAniSirGlobal pMac, tAniGetTsmStatsRsp *pStats); #endif diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 1f349688f72e..65a231fd8605 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -422,12 +422,12 @@ char *lim_msg_str(uint32_t msgType) return "eWNI_PMC_EXIT_BMPS_IND"; case eWNI_SME_SET_BCN_FILTER_REQ: return "eWNI_SME_SET_BCN_FILTER_REQ"; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eWNI_SME_GET_TSM_STATS_REQ: return "eWNI_SME_GET_TSM_STATS_REQ"; case eWNI_SME_GET_TSM_STATS_RSP: return "eWNI_SME_GET_TSM_STATS_RSP"; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ case eWNI_SME_CSA_OFFLOAD_EVENT: return "eWNI_SME_CSA_OFFLOAD_EVENT"; case eWNI_SME_SET_HW_MODE_REQ: diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c index e9adfc85fafc..75b4b5a06be0 100644 --- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c +++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c @@ -467,7 +467,7 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg) #ifndef REMOVE_PKT_LOG CASE_RETURN_STRING(WMA_PKTLOG_ENABLE_REQ); #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE CASE_RETURN_STRING(WMA_SET_PLM_REQ); #endif CASE_RETURN_STRING(WMA_CONFIG_PARAM_UPDATE_REQ); diff --git a/core/mac/src/sys/legacy/src/utils/src/parser_api.c b/core/mac/src/sys/legacy/src/utils/src/parser_api.c index b41e6163ed56..e94a5f6d2b02 100644 --- a/core/mac/src/sys/legacy/src/utils/src/parser_api.c +++ b/core/mac/src/sys/legacy/src/utils/src/parser_api.c @@ -3110,7 +3110,7 @@ sir_convert_reassoc_req_frame2_struct(tpAniSirGlobal pMac, } /* End sir_convert_reassoc_req_frame2_struct. */ -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE tSirRetStatus sir_beacon_ie_ese_bcn_report(tpAniSirGlobal pMac, uint8_t *pPayload, const uint32_t nPayload, @@ -3409,7 +3409,7 @@ err_bcnrep: return retStatus; } -#endif /* FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ tSirRetStatus sir_parse_beacon_ie(tpAniSirGlobal pMac, diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index dd18be8b54f4..5570ac6ab277 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -323,15 +323,13 @@ typedef struct tagCsrEseCckmInfo { uint8_t btk[SIR_BTK_KEY_LEN]; #endif } tCsrEseCckmInfo; -#endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) #define CSR_DOT11F_IE_RSN_MAX_LEN (114) typedef struct tagCsrEseCckmIe { uint8_t cckmIe[CSR_DOT11F_IE_RSN_MAX_LEN]; uint8_t cckmIeLen; } tCsrEseCckmIe; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ typedef struct sCsrChannel_ { uint8_t numChannels; @@ -481,12 +479,12 @@ typedef enum { eCSR_ROAM_IBSS_PEER_INFO_COMPLETE, -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE eCSR_ROAM_TSM_IE_IND, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, eCSR_ROAM_ESE_ADJ_AP_REPORT_IND, eCSR_ROAM_ESE_BCN_REPORT_IND, -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /* Radar indication from lower layers */ eCSR_ROAM_DFS_RADAR_IND, @@ -1291,12 +1289,10 @@ typedef struct tagCsrRoamInfo { uint32_t dtimPeriod; #ifdef FEATURE_WLAN_ESE bool isESEAssoc; -#ifdef FEATURE_WLAN_ESE_UPLOAD tSirTsmIE tsmIe; uint32_t timestamp[2]; uint16_t tsmRoamDelay; tSirEseBcnReportRsp *pEseBcnReportRsp; -#endif /* FEATURE_WLAN_ESE_UPLOAD */ #endif void *pRemainCtx; uint32_t roc_scan_id; @@ -1506,7 +1502,7 @@ typedef struct tagCsrHandoffRequest { uint8_t src; /* To check if its a REASSOC or a FASTREASSOC IOCTL */ } tCsrHandoffRequest; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE typedef struct tagCsrEseBeaconReqParams { uint16_t measurementToken; uint8_t channel; @@ -1518,7 +1514,7 @@ typedef struct tagCsrEseBeaconReq { uint8_t numBcnReqIe; tCsrEseBeaconReqParams bcnReq[SIR_ESE_MAX_MEAS_IE_REQS]; } tCsrEseBeaconReq, *tpCsrEseBeaconReq; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ struct tagCsrDelStaParams { struct qdf_mac_addr peerMacAddr; @@ -1572,10 +1568,10 @@ typedef void (*csr_roamLinkQualityIndCallback) typedef void (*tCsrStatsCallback)(void *stats, void *pContext); typedef void (*tCsrRssiCallback)(int8_t rssi, uint32_t staId, void *pContext); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics, uint32_t staId, void *pContext); -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext); QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index c8e99912eb8c..07246ae2eeff 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -944,9 +944,7 @@ typedef struct tagCsrRoamSession { uint8_t prevOpChannel; uint16_t clientDissSecs; uint32_t roamTS1; -#if defined(FEATURE_WLAN_ESE_UPLOAD) tCsrEseCckmIe suppCckmIeInfo; -#endif #endif uint8_t bRefAssocStartCnt; /* Tracking assoc start indication */ tSirHTConfig htConfig; @@ -1225,13 +1223,6 @@ QDF_STATUS csr_get_rssi(tpAniSirGlobal pMac, tCsrRssiCallback callback, void *pContext, void *p_cds_context); QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, tCsrSnrCallback callback, uint8_t staId, struct qdf_mac_addr bssId, void *pContext); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, - tCsrTsmStatsCallback callback, - uint8_t staId, - struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid); -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ QDF_STATUS csr_get_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); QDF_STATUS csr_change_default_config_param(tpAniSirGlobal pMac, tCsrConfigParam *pParam); @@ -1293,6 +1284,11 @@ bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac); bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, + tCsrTsmStatsCallback callback, + uint8_t staId, + struct qdf_mac_addr bssId, + void *pContext, void *p_cds_context, uint8_t tid); #endif /* Remove this code once SLM_Sessionization is supported */ diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index aeafbad84d09..30af1b19641a 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -282,12 +282,12 @@ QDF_STATUS csr_neighbor_roam_sssid_scan_done(tpAniSirGlobal pMac, QDF_STATUS csr_neighbor_roam_start_lfr_scan(tpAniSirGlobal pMac, uint8_t sessionId); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, const uint8_t *pCckmIe, const uint8_t ccKmIeLen); QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, const uint8_t sessionId); -#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, roam_offload_synch_ind *roam_synch_ind_ptr, uint8_t sessionId); diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index b14929a06114..3d3f8c8f7394 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -231,10 +231,6 @@ static inline void sme_update_roam_pno_channel_prediction_config( QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); -#endif - QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams); QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp); @@ -337,7 +333,7 @@ QDF_STATUS sme_get_rssi(tHalHandle hHal, QDF_STATUS sme_get_snr(tHalHandle hHal, tCsrSnrCallback callback, uint8_t staId, struct qdf_mac_addr bssId, void *pContext); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, tCsrTsmStatsCallback callback, uint8_t staId, struct qdf_mac_addr bssId, @@ -347,7 +343,8 @@ QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t *pCckmIe, uint8_t cckmIeLen); QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq); -#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlm); +#endif /*FEATURE_WLAN_ESE */ QDF_STATUS sme_cfg_set_int(tHalHandle hal, uint16_t cfg_id, uint32_t value); QDF_STATUS sme_cfg_set_str(tHalHandle hal, uint16_t cfg_id, uint8_t *str, uint32_t length); @@ -645,11 +642,9 @@ uint8_t sme_get_roam_rssi_diff(tHalHandle hHal); QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); -#ifdef FEATURE_WLAN_ESE_UPLOAD QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, uint8_t *pChannelList, uint8_t numChannels); -#endif QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal, uint8_t *pChannelList, uint8_t *pNumChannels, uint8_t sessionId); diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h index 65ee8cd83843..cf5614ded55d 100644 --- a/core/sme/inc/sme_inside.h +++ b/core/sme/inc/sme_inside.h @@ -272,7 +272,7 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, QDF_STATUS csr_update_bg_scan_config_ini_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, eCsrBand eBand); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t *pChannelList, diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h index a4eb3b5a3355..d172894acb3f 100644 --- a/core/sme/inc/sme_rrm_internal.h +++ b/core/sme/inc/sme_rrm_internal.h @@ -88,10 +88,10 @@ typedef struct sRrmSMEContext { tDblLinkList neighborReportCache; tRrmNeighborRequestControlInfo neighborReqControlInfo; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE tCsrEseBeaconReq eseBcnReqInfo; bool eseBcnReqInProgress; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ tRrmMsgReqSource msgSource; } tRrmSMEContext, *tpRrmSMEContext; diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 6840dcf32361..39a5fe27c5a2 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -92,7 +92,7 @@ QDF_STATUS sme_handle_generic_change_country_code(tpAniSirGlobal pMac, QDF_STATUS sme_process_nss_update_resp(tpAniSirGlobal mac, uint8_t *msg); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE bool csr_is_supported_channel(tpAniSirGlobal pMac, uint8_t channelId); #endif @@ -1264,93 +1264,6 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode) return status; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) -{ - QDF_STATUS status; - bool ret = false; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - uint8_t ch_list[WNI_CFG_VALID_CHANNEL_LIST] = { 0 }; - uint8_t count, valid_count = 0; - cds_msg_t msg; - tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pPlmReq->sessionId); - - status = sme_acquire_global_lock(&pMac->sme); - if (!QDF_IS_STATUS_SUCCESS(status)) - return status; - - if (!pSession) { - sms_log(pMac, LOGE, FL("session %d not found"), - pPlmReq->sessionId); - sme_release_global_lock(&pMac->sme); - return QDF_STATUS_E_FAILURE; - } - - if (!pSession->sessionActive) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - FL("Invalid Sessionid")); - sme_release_global_lock(&pMac->sme); - return QDF_STATUS_E_FAILURE; - } - - if (!pPlmReq->enable) - goto send_plm_start; - /* validating channel numbers */ - for (count = 0; count < pPlmReq->plmNumCh; count++) { - ret = csr_is_supported_channel(pMac, pPlmReq->plmChList[count]); - if (ret && pPlmReq->plmChList[count] > 14) { - if (CHANNEL_STATE_DFS == cds_get_channel_state( - pPlmReq->plmChList[count])) { - /* DFS channel is provided, no PLM bursts can be - * transmitted. Ignoring these channels. - */ - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_INFO, - FL("DFS channel %d ignored for PLM"), - pPlmReq->plmChList[count]); - continue; - } - } else if (!ret) { - /* Not supported, ignore the channel */ - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, - FL("Unsupported channel %d ignored for PLM"), - pPlmReq->plmChList[count]); - continue; - } - ch_list[valid_count] = pPlmReq->plmChList[count]; - valid_count++; - } /* End of for () */ - - /* Copying back the valid channel list to plm struct */ - qdf_mem_set((void *)pPlmReq->plmChList, - pPlmReq->plmNumCh, 0); - if (valid_count) - qdf_mem_copy(pPlmReq->plmChList, ch_list, - valid_count); - /* All are invalid channels, FW need to send the PLM - * report with "incapable" bit set. - */ - pPlmReq->plmNumCh = valid_count; - -send_plm_start: - /* PLM START */ - msg.type = WMA_SET_PLM_REQ; - msg.reserved = 0; - msg.bodyptr = pPlmReq; - - if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, - &msg))) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - FL("Not able to post WMA_SET_PLM_REQ to WMA")); - sme_release_global_lock(&pMac->sme); - return QDF_STATUS_E_FAILURE; - } - - sme_release_global_lock(&pMac->sme); - return status; -} -#endif - /** * sme_update_fine_time_measurement_capab() - Update the FTM capabitlies from * incoming val @@ -1980,13 +1893,181 @@ static QDF_STATUS sme_extended_change_channel_ind(tpAniSirGlobal mac_ctx, return status; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -/*------------------------------------------------------------------ +/** + * sme_process_fw_mem_dump_rsp - process fw memory dump response from WMA + * + * @mac_ctx: pointer to MAC handle. + * @msg: pointer to received SME msg. + * + * This function process the received SME message and calls the corresponding + * callback which was already registered with SME. + * + * Return: None + */ +#ifdef WLAN_FEATURE_MEMDUMP +static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) +{ + if (msg->bodyptr) { + if (mac_ctx->sme.fw_dump_callback) + mac_ctx->sme.fw_dump_callback(mac_ctx->hHdd, + (struct fw_dump_rsp *) msg->bodyptr); + qdf_mem_free(msg->bodyptr); + } +} +#else +static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) +{ +} +#endif + +#ifdef FEATURE_WLAN_ESE +/** + * sme_update_is_ese_feature_enabled() - enable/disable ESE support at runtime + * @hHal: HAL handle + * @sessionId: session id + * @isEseIniFeatureEnabled: ese ini enabled + * + * It is used at in the REG_DYNAMIC_VARIABLE macro definition of + * isEseIniFeatureEnabled. This is a synchronous call + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS sme_update_is_ese_feature_enabled(tHalHandle hHal, + uint8_t sessionId, const bool isEseIniFeatureEnabled) +{ + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + + if (pMac->roam.configParam.isEseIniFeatureEnabled == + isEseIniFeatureEnabled) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, + "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", + __func__, + pMac->roam.configParam.isEseIniFeatureEnabled, + isEseIniFeatureEnabled); + return QDF_STATUS_SUCCESS; + } + + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, + "%s: EseEnabled is changed from %d to %d", __func__, + pMac->roam.configParam.isEseIniFeatureEnabled, + isEseIniFeatureEnabled); + pMac->roam.configParam.isEseIniFeatureEnabled = isEseIniFeatureEnabled; + csr_neighbor_roam_update_ese_mode_enabled(pMac, sessionId, + isEseIniFeatureEnabled); + + if (true == isEseIniFeatureEnabled) + sme_update_fast_transition_enabled(hHal, true); + + if (pMac->roam.configParam.isRoamOffloadScanEnabled) + csr_roam_offload_scan(pMac, sessionId, + ROAM_SCAN_OFFLOAD_UPDATE_CFG, + REASON_ESE_INI_CFG_CHANGED); + + return QDF_STATUS_SUCCESS; +} + +/** + * sme_set_plm_request() - set plm request + * @hHal: HAL handle + * @pPlmReq: Pointer to input plm request + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq) +{ + QDF_STATUS status; + bool ret = false; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + uint8_t ch_list[WNI_CFG_VALID_CHANNEL_LIST] = { 0 }; + uint8_t count, valid_count = 0; + cds_msg_t msg; + tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, pPlmReq->sessionId); + + status = sme_acquire_global_lock(&pMac->sme); + if (!QDF_IS_STATUS_SUCCESS(status)) + return status; + + if (!pSession) { + sms_log(pMac, LOGE, FL("session %d not found"), + pPlmReq->sessionId); + sme_release_global_lock(&pMac->sme); + return QDF_STATUS_E_FAILURE; + } + + if (!pSession->sessionActive) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + FL("Invalid Sessionid")); + sme_release_global_lock(&pMac->sme); + return QDF_STATUS_E_FAILURE; + } + + if (!pPlmReq->enable) + goto send_plm_start; + /* validating channel numbers */ + for (count = 0; count < pPlmReq->plmNumCh; count++) { + ret = csr_is_supported_channel(pMac, pPlmReq->plmChList[count]); + if (ret && pPlmReq->plmChList[count] > 14) { + if (CHANNEL_STATE_DFS == cds_get_channel_state( + pPlmReq->plmChList[count])) { + /* DFS channel is provided, no PLM bursts can be + * transmitted. Ignoring these channels. + */ + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, + FL("DFS channel %d ignored for PLM"), + pPlmReq->plmChList[count]); + continue; + } + } else if (!ret) { + /* Not supported, ignore the channel */ + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, + FL("Unsupported channel %d ignored for PLM"), + pPlmReq->plmChList[count]); + continue; + } + ch_list[valid_count] = pPlmReq->plmChList[count]; + valid_count++; + } /* End of for () */ + + /* Copying back the valid channel list to plm struct */ + qdf_mem_set((void *)pPlmReq->plmChList, + pPlmReq->plmNumCh, 0); + if (valid_count) + qdf_mem_copy(pPlmReq->plmChList, ch_list, + valid_count); + /* All are invalid channels, FW need to send the PLM + * report with "incapable" bit set. + */ + pPlmReq->plmNumCh = valid_count; + +send_plm_start: + /* PLM START */ + msg.type = WMA_SET_PLM_REQ; + msg.reserved = 0; + msg.bodyptr = pPlmReq; + + if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA, + &msg))) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + FL("Not able to post WMA_SET_PLM_REQ to WMA")); + sme_release_global_lock(&pMac->sme); + return QDF_STATUS_E_FAILURE; + } + + sme_release_global_lock(&pMac->sme); + return status; +} + +/** + * sme_tsm_ie_ind() - sme tsm ie indication + * @hHal: HAL handle + * @pSmeTsmIeInd: Pointer to tsm ie indication * * Handle the tsm ie indication from LIM and forward it to HDD. * - *------------------------------------------------------------------*/ -QDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) + * Return: QDF_STATUS enumeration + */ +static QDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) { tpAniSirGlobal pMac = PMAC_STRUCT(hHal); QDF_STATUS status = QDF_STATUS_SUCCESS; @@ -2001,16 +2082,18 @@ QDF_STATUS sme_tsm_ie_ind(tHalHandle hHal, tSirSmeTsmIEInd *pSmeTsmIeInd) return status; } -/* --------------------------------------------------------------------------- - \fn sme_set_cckm_ie - \brief function to store the CCKM IE passed from supplicant and use - it while packing reassociation request - \param hHal - HAL handle for device - \param sessionId - Session Identifier - \param pCckmIe - pointer to CCKM IE data - \param pCckmIeLen - length of the CCKM IE - \- return Success or failure - -------------------------------------------------------------------------*/ +/** + * sme_set_cckm_ie() - set cckm ie + * @hHal: HAL handle + * @sessionId: session id + * @pCckmIe: Pointer to CCKM Ie + * @cckmIeLen: Length of @pCckmIe + * + * Function to store the CCKM IE passed from supplicant and use + * it while packing reassociation request. + * + * Return: QDF_STATUS enumeration + */ QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, uint8_t *pCckmIe, uint8_t cckmIeLen) { @@ -2022,16 +2105,18 @@ QDF_STATUS sme_set_cckm_ie(tHalHandle hHal, uint8_t sessionId, sme_release_global_lock(&pMac->sme); } return status; -} - -/* --------------------------------------------------------------------------- - \fn sme_set_ese_beacon_request - \brief function to set ESE beacon request parameters - \param hHal - HAL handle for device - \param sessionId - Session id - \param pEseBcnReq - pointer to ESE beacon request - \- return Success or failure - -------------------------------------------------------------------------*/ +} + +/** + * sme_set_ese_beacon_request() - set ese beacon request + * @hHal: HAL handle + * @sessionId: session id + * @pEseBcnReq: Ese beacon report + * + * function to set ESE beacon request parameters + * + * Return: QDF_STATUS enumeration + */ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, const tCsrEseBeaconReq *pEseBcnReq) { @@ -2094,7 +2179,106 @@ QDF_STATUS sme_set_ese_beacon_request(tHalHandle hHal, const uint8_t sessionId, return status; } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +/** + * sme_get_tsm_stats() - SME get tsm stats + * @hHal: HAL handle + * @callback: SME sends back the requested stats using the callback + * @staId: The station ID for which the stats is requested for + * @bssId: bssid + * @pContext: user context to be passed back along with the callback + * @p_cds_context: CDS context + * @tid: Traffic id + * + * API register a callback to get TSM Stats. + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, + tCsrTsmStatsCallback callback, + uint8_t staId, struct qdf_mac_addr bssId, + void *pContext, void *p_cds_context, uint8_t tid) +{ + QDF_STATUS status = QDF_STATUS_E_FAILURE; + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + + status = sme_acquire_global_lock(&pMac->sme); + if (QDF_IS_STATUS_SUCCESS(status)) { + status = csr_get_tsm_stats(pMac, callback, + staId, bssId, pContext, + p_cds_context, tid); + sme_release_global_lock(&pMac->sme); + } + return status; +} + +/** + * sme_set_ese_roam_scan_channel_list() - To set ese roam scan channel list + * @hHal: pointer HAL handle returned by mac_open + * @sessionId: sme session id + * @pChannelList: Output channel list + * @numChannels: Output number of channels + * + * This routine is called to set ese roam scan channel list. + * This is a synchronous call + * + * Return: QDF_STATUS + */ +QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, + uint8_t sessionId, + uint8_t *pChannelList, + uint8_t numChannels) +{ + tpAniSirGlobal pMac = PMAC_STRUCT(hHal); + QDF_STATUS status = QDF_STATUS_SUCCESS; + tpCsrNeighborRoamControlInfo pNeighborRoamInfo + = &pMac->roam.neighborRoamInfo[sessionId]; + tpCsrChannelInfo curchnl_list_info + = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo; + uint8_t oldChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN * 2] = { 0 }; + uint8_t newChannelList[128] = { 0 }; + uint8_t i = 0, j = 0; + + status = sme_acquire_global_lock(&pMac->sme); + if (!QDF_IS_STATUS_SUCCESS(status)) { + if (pMac->roam.configParam.isRoamOffloadScanEnabled) + csr_roam_offload_scan(pMac, sessionId, + ROAM_SCAN_OFFLOAD_UPDATE_CFG, + REASON_CHANNEL_LIST_CHANGED); + return status; + } + if (NULL != curchnl_list_info->ChannelList) { + for (i = 0; i < curchnl_list_info->numOfChannels; i++) { + j += snprintf(oldChannelList + j, + sizeof(oldChannelList) - j, "%d", + curchnl_list_info->ChannelList[i]); + } + } + status = csr_create_roam_scan_channel_list(pMac, sessionId, + pChannelList, numChannels, + csr_get_current_band(hHal)); + if (QDF_IS_STATUS_SUCCESS(status)) { + if (NULL != curchnl_list_info->ChannelList) { + j = 0; + for (i = 0; i < curchnl_list_info->numOfChannels; i++) { + j += snprintf(newChannelList + j, + sizeof(newChannelList) - j, "%d", + curchnl_list_info->ChannelList[i]); + } + } + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + "ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d", + newChannelList, oldChannelList, + pNeighborRoamInfo->neighborRoamState); + } + sme_release_global_lock(&pMac->sme); + if (pMac->roam.configParam.isRoamOffloadScanEnabled) + csr_roam_offload_scan(pMac, sessionId, + ROAM_SCAN_OFFLOAD_UPDATE_CFG, + REASON_CHANNEL_LIST_CHANGED); + return status; +} + +#endif /* FEATURE_WLAN_ESE */ QDF_STATUS sme_ibss_peer_info_response_handleer(tHalHandle hHal, tpSirIbssGetPeerInfoRspParams @@ -2118,33 +2302,6 @@ QDF_STATUS sme_ibss_peer_info_response_handleer(tHalHandle hHal, return QDF_STATUS_SUCCESS; } -/** - * sme_process_fw_mem_dump_rsp - process fw memory dump response from WMA - * - * @mac_ctx: pointer to MAC handle. - * @msg: pointer to received SME msg. - * - * This function process the received SME message and calls the corresponding - * callback which was already registered with SME. - * - * Return: None - */ -#ifdef WLAN_FEATURE_MEMDUMP -static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) -{ - if (msg->bodyptr) { - if (mac_ctx->sme.fw_dump_callback) - mac_ctx->sme.fw_dump_callback(mac_ctx->hHdd, - (struct fw_dump_rsp *) msg->bodyptr); - qdf_mem_free(msg->bodyptr); - } -} -#else -static void sme_process_fw_mem_dump_rsp(tpAniSirGlobal mac_ctx, cds_msg_t *msg) -{ -} -#endif - /** * sme_process_dual_mac_config_resp() - Process set Dual mac config response * @mac: Global MAC pointer @@ -2517,7 +2674,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) } break; #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eWNI_SME_TSM_IE_IND: if (pMsg->bodyptr) { sme_tsm_ie_ind(pMac, pMsg->bodyptr); @@ -2527,7 +2684,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) pMsg->type); } break; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ case eWNI_SME_ROAM_SCAN_OFFLOAD_RSP: status = csr_roam_offload_scan_rsp_hdlr((void *)pMac, pMsg->bodyptr); @@ -4964,35 +5121,6 @@ QDF_STATUS sme_get_snr(tHalHandle hHal, return status; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -/* --------------------------------------------------------------------------- - \fn sme_get_tsm_stats - \brief a wrapper function that client calls to register a callback to - get TSM Stats - \param callback - SME sends back the requested stats using the callback - \param staId - The station ID for which the stats is requested for - \param pContext - user context to be passed back along with the callback - \param p_cds_context - cds context - \return QDF_STATUS - ---------------------------------------------------------------------------*/ -QDF_STATUS sme_get_tsm_stats(tHalHandle hHal, - tCsrTsmStatsCallback callback, - uint8_t staId, struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid) -{ - QDF_STATUS status = QDF_STATUS_E_FAILURE; - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - status = sme_acquire_global_lock(&pMac->sme); - if (QDF_IS_STATUS_SUCCESS(status)) { - status = csr_get_tsm_stats(pMac, callback, - staId, bssId, pContext, p_cds_context, - tid); - sme_release_global_lock(&pMac->sme); - } - return status; -} -#endif - /* --------------------------------------------------------------------------- \fn sme_get_statistics \brief a wrapper function that client calls to register a callback to get @@ -8616,54 +8744,6 @@ QDF_STATUS sme_update_enable_fast_roam_in_concurrency(tHalHandle hHal, return status; } -#ifdef FEATURE_WLAN_ESE -/*-------------------------------------------------------------------------- - \brief sme_update_is_ese_feature_enabled() - enable/disable ESE support at runtime - It is used at in the REG_DYNAMIC_VARIABLE macro definition of - isEseIniFeatureEnabled. - This is a synchronous call - \param hHal - The handle returned by mac_open. - \param sessionId - Session Identifier - \param isEseIniFeatureEnabled - flag to enable/disable - \return QDF_STATUS_SUCCESS - SME update isEseIniFeatureEnabled config - successfully. - Other status means SME is failed to update isEseIniFeatureEnabled. - \sa - --------------------------------------------------------------------------*/ -QDF_STATUS sme_update_is_ese_feature_enabled - (tHalHandle hHal, uint8_t sessionId, const bool isEseIniFeatureEnabled) { - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - - if (pMac->roam.configParam.isEseIniFeatureEnabled == - isEseIniFeatureEnabled) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, - "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)", - __func__, - pMac->roam.configParam.isEseIniFeatureEnabled, - isEseIniFeatureEnabled); - return QDF_STATUS_SUCCESS; - } - - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, - "%s: EseEnabled is changed from %d to %d", __func__, - pMac->roam.configParam.isEseIniFeatureEnabled, - isEseIniFeatureEnabled); - pMac->roam.configParam.isEseIniFeatureEnabled = isEseIniFeatureEnabled; - csr_neighbor_roam_update_ese_mode_enabled(pMac, sessionId, - isEseIniFeatureEnabled); - - if (true == isEseIniFeatureEnabled) { - sme_update_fast_transition_enabled(hHal, true); - } - if (pMac->roam.configParam.isRoamOffloadScanEnabled) { - csr_roam_offload_scan(pMac, sessionId, - ROAM_SCAN_OFFLOAD_UPDATE_CFG, - REASON_ESE_INI_CFG_CHANGED); - } - return QDF_STATUS_SUCCESS; -} -#endif /* FEATURE_WLAN_ESE */ - /*-------------------------------------------------------------------------- \brief sme_update_config_fw_rssi_monitoring() - enable/disable firmware RSSI Monitoring at runtime @@ -9596,75 +9676,6 @@ QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId, return status; } -#ifdef FEATURE_WLAN_ESE_UPLOAD -/** - * sme_set_ese_roam_scan_channel_list() - To set ese roam scan channel list - * @hHal: pointer HAL handle returned by mac_open - * @sessionId: sme session id - * @pChannelList: Output channel list - * @numChannels: Output number of channels - * - * This routine is called to set ese roam scan channel list. - * This is a synchronous call - * - * Return: QDF_STATUS - */ -QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal, - uint8_t sessionId, - uint8_t *pChannelList, - uint8_t numChannels) -{ - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo - = &pMac->roam.neighborRoamInfo[sessionId]; - tpCsrChannelInfo curchnl_list_info - = &pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo; - uint8_t oldChannelList[WNI_CFG_VALID_CHANNEL_LIST_LEN * 2] = { 0 }; - uint8_t newChannelList[128] = { 0 }; - uint8_t i = 0, j = 0; - - status = sme_acquire_global_lock(&pMac->sme); - if (!QDF_IS_STATUS_SUCCESS(status)) { - if (pMac->roam.configParam.isRoamOffloadScanEnabled) - csr_roam_offload_scan(pMac, sessionId, - ROAM_SCAN_OFFLOAD_UPDATE_CFG, - REASON_CHANNEL_LIST_CHANGED); - return status; - } - if (NULL != curchnl_list_info->ChannelList) { - for (i = 0; i < curchnl_list_info->numOfChannels; i++) { - j += snprintf(oldChannelList + j, - sizeof(oldChannelList) - j, "%d", - curchnl_list_info->ChannelList[i]); - } - } - status = csr_create_roam_scan_channel_list(pMac, sessionId, - pChannelList, numChannels, - csr_get_current_band(hHal)); - if (QDF_IS_STATUS_SUCCESS(status)) { - if (NULL != curchnl_list_info->ChannelList) { - j = 0; - for (i = 0; i < curchnl_list_info->numOfChannels; i++) { - j += snprintf(newChannelList + j, - sizeof(newChannelList) - j, "%d", - curchnl_list_info->ChannelList[i]); - } - } - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d", - newChannelList, oldChannelList, - pNeighborRoamInfo->neighborRoamState); - } - sme_release_global_lock(&pMac->sme); - if (pMac->roam.configParam.isRoamOffloadScanEnabled) - csr_roam_offload_scan(pMac, sessionId, - ROAM_SCAN_OFFLOAD_UPDATE_CFG, - REASON_CHANNEL_LIST_CHANGED); - return status; -} -#endif - /** * sme_get_roam_scan_channel_list() - To get roam scan channel list * @hHal: HAL pointer diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 3b68d448bfe3..02912198b717 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1363,31 +1363,7 @@ eCsrBand csr_get_current_band(tHalHandle hHal) return pMac->roam.configParam.bandCapability; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -/* - This function flushes the roam scan cache - */ -QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo - = &pMac->roam.neighborRoamInfo[sessionId]; - /* Free up the memory first (if required) */ - if (NULL != - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - ChannelList) { - qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. - currentChannelListInfo.ChannelList); - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - ChannelList = NULL; - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - numOfChannels = 0; - } - return status; -} -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ - +#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) /* This function flushes the roam scan cache */ @@ -1441,9 +1417,40 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, return status; } +#endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /* + This function flushes the roam scan cache + */ +QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, + uint8_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tpCsrNeighborRoamControlInfo pNeighborRoamInfo + = &pMac->roam.neighborRoamInfo[sessionId]; + /* Free up the memory first (if required) */ + if (NULL != + pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. + ChannelList) { + qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. + currentChannelListInfo.ChannelList); + pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. + ChannelList = NULL; + pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. + numOfChannels = 0; + } + return status; +} + +/** + * csr_create_roam_scan_channel_list() - create roam scan channel list + * @pMac: Global mac pointer + * @sessionId: session id + * @pChannelList: pointer to channel list + * @numChannels: number of channels + * @eBand: band enumeration + * * This function modifies the roam scan channel list as per AP neighbor * report; AP neighbor report may be empty or may include only other AP * channels; in any case, we merge the channel list with the learned occupied @@ -1451,6 +1458,8 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, * if the band is 2.4G, then make sure channel list contains only 2.4G * valid channels if the band is 5G, then make sure channel list contains * only 5G valid channels + * + * Return: QDF_STATUS enumeration */ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, uint8_t sessionId, @@ -1554,7 +1563,296 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, } return status; } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ + +/** + * csr_roam_is_ese_assoc() - is this ese association + * @mac_ctx: Global MAC context + * @session_id: session identifier + * + * Returns whether the current association is a ESE assoc or not. + * + * Return: true if ese association; false otherwise + */ +bool csr_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) +{ +#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING + return csr_neighbor_roam_is_ese_assoc(mac_ctx, session_id); +#else + return false; +#endif +} + +/** + * csr_neighbor_roam_is_ese_assoc() - Check the Association type + * @mac_ctx: Global MAC Context + * @session_id: Session ID on which the check should be done + * + * This function returns whether the current association + * is a ESE assoc or not + * + * Return: True if ESE association, false otherwise. + **/ +bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) +{ + return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc; +} + +/** + * csr_roam_is_roam_offload_scan_enabled() - is roam offload enabled + * @mac_ctx: Global MAC context + * + * Returns whether "FW based BG scan" is currently enabled or not + * + * Return: true if roam offload scan enabled; false otherwise + */ +bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac) +{ + return pMac->roam.configParam.isRoamOffloadScanEnabled; +} + +/** + * csr_roam_is_ese_ini_feature_enabled() - is ese feature enabled + * @mac_ctx: Global MAC context + * + * Return: true if ese feature is enabled; false otherwise + */ +bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac) +{ + return pMac->roam.configParam.isEseIniFeatureEnabled; +} + +/** + * csr_tsm_stats_rsp_processor() - tsm stats response processor + * @pMac: Global MAC context + * @pMsg: Message pointer + * + * Return: None + */ +void csr_tsm_stats_rsp_processor(tpAniSirGlobal pMac, void *pMsg) +{ + tAniGetTsmStatsRsp *pTsmStatsRsp = (tAniGetTsmStatsRsp *) pMsg; + + if (NULL != pTsmStatsRsp) { + /* + * Get roam Rssi request is backed up and passed back + * to the response, Extract the request message + * to fetch callback. + */ + tpAniGetTsmStatsReq reqBkp + = (tAniGetTsmStatsReq *) pTsmStatsRsp->tsmStatsReq; + + if (NULL != reqBkp) { + if (NULL != reqBkp->tsmStatsCallback) { + ((tCsrTsmStatsCallback) + (reqBkp->tsmStatsCallback))(pTsmStatsRsp-> + tsmMetrics, + pTsmStatsRsp-> + staId, + reqBkp-> + pDevContext); + reqBkp->tsmStatsCallback = NULL; + } + qdf_mem_free(reqBkp); + pTsmStatsRsp->tsmStatsReq = NULL; + } else { + sms_log(pMac, LOGE, FL("reqBkp is NULL")); + if (NULL != reqBkp) { + qdf_mem_free(reqBkp); + pTsmStatsRsp->tsmStatsReq = NULL; + } + } + } else { + sms_log(pMac, LOGE, FL("pTsmStatsRsp is NULL")); + } + return; +} + +/** + * csr_send_ese_adjacent_ap_rep_ind() - ese send adjacent ap report + * @pMac: Global MAC context + * @pSession: Session pointer + * + * Return: None + */ +void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, + tCsrRoamSession *pSession) +{ + uint32_t roamTS2 = 0; + tCsrRoamInfo roamInfo; + tpPESession pSessionEntry = NULL; + uint8_t sessionId = CSR_SESSION_ID_INVALID; + + if (NULL == pSession) { + sms_log(pMac, LOGE, FL("pSession is NULL")); + return; + } + + roamTS2 = qdf_mc_timer_get_system_time(); + roamInfo.tsmRoamDelay = roamTS2 - pSession->roamTS1; + sms_log(pMac, LOG1, "Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)", + MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes), + roamInfo.tsmRoamDelay); + + pSessionEntry = pe_find_session_by_bssid(pMac, + pSession->connectedProfile.bssid.bytes, + &sessionId); + if (NULL == pSessionEntry) { + sms_log(pMac, LOGE, FL("session %d not found"), sessionId); + return; + } + + pSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly + = roamInfo.tsmRoamDelay; + + csr_roam_call_callback(pMac, pSession->sessionId, &roamInfo, + 0, eCSR_ROAM_ESE_ADJ_AP_REPORT_IND, 0); +} + +/** + * csr_get_tsm_stats() - get tsm stats + * @pMac: Global MAC context + * @callback: TSM stats callback + * @staId: Station id + * @bssId: bssid + * @pContext: pointer to context + * @p_cds_context: cds context + * @tid: traffic id + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, + tCsrTsmStatsCallback callback, + uint8_t staId, + struct qdf_mac_addr bssId, + void *pContext, void *p_cds_context, uint8_t tid) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tAniGetTsmStatsReq *pMsg = NULL; + pMsg = qdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); + if (!pMsg) { + sms_log(pMac, LOGE, + "csr_get_tsm_stats: failed to allocate mem for req"); + return QDF_STATUS_E_NOMEM; + } + /* need to initiate a stats request to PE */ + pMsg->msgType = eWNI_SME_GET_TSM_STATS_REQ; + pMsg->msgLen = (uint16_t) sizeof(tAniGetTsmStatsReq); + pMsg->staId = staId; + pMsg->tid = tid; + qdf_copy_macaddr(&pMsg->bssId, &bssId); + pMsg->tsmStatsCallback = callback; + pMsg->pDevContext = pContext; + pMsg->p_cds_context = p_cds_context; + status = cds_send_mb_message_to_mac(pMsg); + if (!QDF_IS_STATUS_SUCCESS(status)) { + sms_log(pMac, LOG1, + " csr_get_tsm_stats: failed to send down the rssi req"); + /* pMsg is freed by cds_send_mb_message_to_mac */ + status = QDF_STATUS_E_FAILURE; + } + return status; +} + +/** + * csr_fetch_ch_lst_from_received_list() - fetch channel list from received list + * and update req msg + * paramters + * @mac_ctx: global mac ctx + * @roam_info: roam info struct + * @curr_ch_lst_info: current channel list info + * @req_buf: out param, roam offload scan request packet + * + * Return: void + */ +static void +csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, + tpCsrNeighborRoamControlInfo roam_info, + tpCsrChannelInfo curr_ch_lst_info, + tSirRoamOffloadScanReq *req_buf) +{ + uint8_t i = 0; + uint8_t num_channels = 0; + uint8_t *ch_lst = NULL; + + if (curr_ch_lst_info->numOfChannels == 0) + return; + + ch_lst = curr_ch_lst_info->ChannelList; + for (i = 0; i < curr_ch_lst_info->numOfChannels; i++) { + if (((mac_ctx->roam.configParam.allowDFSChannelRoam + != CSR_ROAMING_DFS_CHANNEL_DISABLED) || + (!CDS_IS_DFS_CH(*ch_lst))) && *ch_lst) { + req_buf->ConnectedNetwork.ChannelCache[num_channels++] = + *ch_lst; + } + ch_lst++; + } + req_buf->ConnectedNetwork.ChannelCount = num_channels; + req_buf->ChannelCacheType = CHANNEL_LIST_DYNAMIC_UPDATE; +} + +/** + * csr_set_cckm_ie() - set CCKM IE + * @pMac: Global MAC context + * @sessionId: session identifier + * @pCckmIe: Pointer to input CCKM IE data + * @ccKmIeLen: Length of @pCckmIe + * + * This function stores the CCKM IE passed by the supplicant + * in a place holder data structure and this IE will be packed inside + * reassociation request + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, + const uint8_t *pCckmIe, const uint8_t ccKmIeLen) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); + if (!pSession) { + sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); + return QDF_STATUS_E_FAILURE; + } + qdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); + pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen; + return status; +} + +/** + * csr_roam_read_tsf() - read TSF + * @pMac: Global MAC context + * @sessionId: session identifier + * @pTimestamp: output TSF timestamp + * + * This function reads the TSF; and also add the time elapsed since + * last beacon or probe response reception from the hand off AP to arrive at + * the latest TSF value. + * + * Return: QDF_STATUS enumeration + */ +QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, + uint8_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tCsrNeighborRoamBSSInfo handoffNode; + uint32_t timer_diff = 0; + uint32_t timeStamp[2]; + tpSirBssDescription pBssDescription = NULL; + csr_neighbor_roam_get_handoff_ap_info(pMac, &handoffNode, sessionId); + pBssDescription = handoffNode.pBssDescription; + /* Get the time diff in milli seconds */ + timer_diff = qdf_mc_timer_get_system_time() - + pBssDescription->scanSysTimeMsec; + /* Convert msec to micro sec timer */ + timer_diff = (uint32_t) (timer_diff * SYSTEM_TIME_MSEC_TO_USEC); + timeStamp[0] = pBssDescription->timeStamp[0]; + timeStamp[1] = pBssDescription->timeStamp[1]; + update_cckmtsf(&(timeStamp[0]), &(timeStamp[1]), &timer_diff); + qdf_mem_copy(pTimestamp, (void *)&timeStamp[0], sizeof(uint32_t) * 2); + return status; +} + +#endif /* FEATURE_WLAN_ESE */ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand) { @@ -5587,13 +5885,6 @@ bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId) return csr_neighbor_roam_is11r_assoc(pMac, sessionId); } -#ifdef FEATURE_WLAN_ESE -/* Returns whether the current association is a ESE assoc or not */ -bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId) -{ - return csr_neighbor_roam_is_ese_assoc(pMac, sessionId); -} -#endif /* Returns whether "Legacy Fast Roaming" is currently enabled...or not */ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId) { @@ -5616,36 +5907,6 @@ bool csr_roam_is_fast_roam_enabled(tpAniSirGlobal pMac, uint32_t sessionId) } } -#ifdef FEATURE_WLAN_ESE -/** - * csr_neighbor_roam_is_ese_assoc() - Check the Association type - * @mac_ctx: Global MAC Context - * @session_id: Session ID on which the check should be done - * - * This function returns whether the current association - * is a ESE assoc or not - * - * Return: True if ESE association, false otherwise. - **/ -bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) -{ - return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc; -} -#endif /* FEATURE_WLAN_ESE */ - -/* Returns whether "FW based BG scan" is currently enabled...or not */ -bool csr_roam_is_roam_offload_scan_enabled(tpAniSirGlobal pMac) -{ - return pMac->roam.configParam.isRoamOffloadScanEnabled; -} - -#if defined(FEATURE_WLAN_ESE) -bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac) -{ - return pMac->roam.configParam.isEseIniFeatureEnabled; -} -#endif /*FEATURE_WLAN_ESE */ - #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH eCsrPhyMode csr_roamdot11mode_to_phymode(uint8_t dot11mode) { @@ -9902,77 +10163,6 @@ static void csr_update_snr(tpAniSirGlobal pMac, void *pMsg) return; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -void csr_tsm_stats_rsp_processor(tpAniSirGlobal pMac, void *pMsg) -{ - tAniGetTsmStatsRsp *pTsmStatsRsp = (tAniGetTsmStatsRsp *) pMsg; - - if (NULL != pTsmStatsRsp) { - /* Get roam Rssi request is backed up and passed back to the response, - Extract the request message to fetch callback */ - tpAniGetTsmStatsReq reqBkp - = (tAniGetTsmStatsReq *) pTsmStatsRsp->tsmStatsReq; - - if (NULL != reqBkp) { - if (NULL != reqBkp->tsmStatsCallback) { - ((tCsrTsmStatsCallback) - (reqBkp->tsmStatsCallback))(pTsmStatsRsp-> - tsmMetrics, - pTsmStatsRsp-> - staId, - reqBkp-> - pDevContext); - reqBkp->tsmStatsCallback = NULL; - } - qdf_mem_free(reqBkp); - pTsmStatsRsp->tsmStatsReq = NULL; - } else { - sms_log(pMac, LOGE, FL("reqBkp is NULL")); - if (NULL != reqBkp) { - qdf_mem_free(reqBkp); - pTsmStatsRsp->tsmStatsReq = NULL; - } - } - } else { - sms_log(pMac, LOGE, FL("pTsmStatsRsp is NULL")); - } - return; -} - -void csr_send_ese_adjacent_ap_rep_ind(tpAniSirGlobal pMac, tCsrRoamSession *pSession) -{ - uint32_t roamTS2 = 0; - tCsrRoamInfo roamInfo; - tpPESession pSessionEntry = NULL; - uint8_t sessionId = CSR_SESSION_ID_INVALID; - - if (NULL == pSession) { - sms_log(pMac, LOGE, FL("pSession is NULL")); - return; - } - - roamTS2 = qdf_mc_timer_get_system_time(); - roamInfo.tsmRoamDelay = roamTS2 - pSession->roamTS1; - sms_log(pMac, LOG1, "Bssid(" MAC_ADDRESS_STR ") Roaming Delay(%u ms)", - MAC_ADDR_ARRAY(pSession->connectedProfile.bssid.bytes), - roamInfo.tsmRoamDelay); - - pSessionEntry = pe_find_session_by_bssid(pMac, - pSession->connectedProfile.bssid.bytes, - &sessionId); - if (NULL == pSessionEntry) { - sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return; - } - - pSessionEntry->eseContext.tsm.tsmMetrics.RoamingDly - = roamInfo.tsmRoamDelay; - - csr_roam_call_callback(pMac, pSession->sessionId, &roamInfo, - 0, eCSR_ROAM_ESE_ADJ_AP_REPORT_IND, 0); -} -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ - static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac, struct qdf_mac_addr *bssId) { @@ -10909,9 +11099,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr) if (result == eCSR_ROAM_RESULT_AUTHENTICATED && session->isPrevApInfoValid && session->connectedProfile.isESEAssoc) { -#ifdef FEATURE_WLAN_ESE_UPLOAD csr_send_ese_adjacent_ap_rep_ind(mac_ctx, session); -#endif session->isPrevApInfoValid = false; } #endif @@ -10990,12 +11178,12 @@ void csr_roam_check_for_link_status_change(tpAniSirGlobal pMac, tSirSmeRsp *pSir sms_log(pMac, LOG2, FL("Stats rsp from PE")); csr_roam_stats_rsp_processor(pMac, pSirMsg); break; -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case eWNI_SME_GET_TSM_STATS_RSP: sms_log(pMac, LOG2, FL("TSM Stats rsp from PE")); csr_tsm_stats_rsp_processor(pMac, pSirMsg); break; -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ case eWNI_SME_GET_RSSI_REQ: sms_log(pMac, LOG2, FL("GetRssiReq from self")); csr_update_rssi(pMac, pSirMsg); @@ -13636,12 +13824,10 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId, /* cckmIE */ if (csr_is_profile_ese(pProfile)) { /* Insert the CCKM IE into the join request */ -#ifdef FEATURE_WLAN_ESE_UPLOAD ieLen = pSession->suppCckmIeInfo.cckmIeLen; qdf_mem_copy((void *)(wpaRsnIE), pSession->suppCckmIeInfo.cckmIe, ieLen); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ } else ieLen = 0; /* @@ -15896,41 +16082,6 @@ QDF_STATUS csr_get_snr(tpAniSirGlobal pMac, return status; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, - tCsrTsmStatsCallback callback, - uint8_t staId, - struct qdf_mac_addr bssId, - void *pContext, void *p_cds_context, uint8_t tid) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tAniGetTsmStatsReq *pMsg = NULL; - pMsg = qdf_mem_malloc(sizeof(tAniGetTsmStatsReq)); - if (!pMsg) { - sms_log(pMac, LOGE, - "csr_get_tsm_stats: failed to allocate mem for req"); - return QDF_STATUS_E_NOMEM; - } - /* need to initiate a stats request to PE */ - pMsg->msgType = eWNI_SME_GET_TSM_STATS_REQ; - pMsg->msgLen = (uint16_t) sizeof(tAniGetTsmStatsReq); - pMsg->staId = staId; - pMsg->tid = tid; - qdf_copy_macaddr(&pMsg->bssId, &bssId); - pMsg->tsmStatsCallback = callback; - pMsg->pDevContext = pContext; - pMsg->p_cds_context = p_cds_context; - status = cds_send_mb_message_to_mac(pMsg); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOG1, - " csr_get_tsm_stats: failed to send down the rssi req"); - /* pMsg is freed by cds_send_mb_message_to_mac */ - status = QDF_STATUS_E_FAILURE; - } - return status; -} -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ - /** * csr_deregister_client_request() - deregisters a get stats request * @mac_ctx: mac global context @@ -16519,46 +16670,6 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx, } } -#ifdef FEATURE_WLAN_ESE -/** - * csr_fetch_ch_lst_from_received_list() - fetch channel list from received list - * and update req msg - * paramters - * @mac_ctx: global mac ctx - * @roam_info: roam info struct - * @curr_ch_lst_info: current channel list info - * @req_buf: out param, roam offload scan request packet - * - * Return: void - */ -static void -csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx, - tpCsrNeighborRoamControlInfo roam_info, - tpCsrChannelInfo curr_ch_lst_info, - tSirRoamOffloadScanReq *req_buf) -{ - uint8_t i = 0; - uint8_t num_channels = 0; - uint8_t *ch_lst = NULL; - - if (curr_ch_lst_info->numOfChannels == 0) - return; - - ch_lst = curr_ch_lst_info->ChannelList; - for (i = 0; i < curr_ch_lst_info->numOfChannels; i++) { - if (((mac_ctx->roam.configParam.allowDFSChannelRoam - != CSR_ROAMING_DFS_CHANNEL_DISABLED) || - (!CDS_IS_DFS_CH(*ch_lst))) && *ch_lst) { - req_buf->ConnectedNetwork.ChannelCache[num_channels++] = - *ch_lst; - } - ch_lst++; - } - req_buf->ConnectedNetwork.ChannelCount = num_channels; - req_buf->ChannelCacheType = CHANNEL_LIST_DYNAMIC_UPDATE; -} -#endif - /** * csr_fetch_valid_ch_lst() - fetch channel list from valid channel list and * update req msg @@ -17778,7 +17889,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, pSession->ftSmeContext.psavedFTPreAuthRsp = pFTPreAuthRsp; /* No need to notify qos module if this is a non 11r & ESE roam */ if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId) -#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE || csr_roam_is_ese_assoc(pMac, pFTPreAuthRsp->smeSessionId) #endif ) { @@ -17806,7 +17917,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE if (csr_roam_is_ese_assoc(pMac, pFTPreAuthRsp->smeSessionId)) { /* read TSF */ csr_roam_read_tsf(pMac, (uint8_t *) roamInfo.timestamp, @@ -17819,7 +17930,7 @@ void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, 0); } -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /* If Legacy Fast Roaming is enabled, signal the supplicant */ /* So he can send us a PMK-ID for this candidate AP. */ @@ -17968,64 +18079,6 @@ QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, return status; } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -/* --------------------------------------------------------------------------- - \fn csr_set_cckm_ie - \brief This function stores the CCKM IE passed by the supplicant - in a place holder data structure and this IE will be packed inside - reassociation request - \param pMac - pMac global structure - \param sessionId - Current session id - \param pCckmIe - pointer to CCKM IE data - \param ccKmIeLen - length of the CCKM IE - \- return Success or failure - -------------------------------------------------------------------------*/ -QDF_STATUS csr_set_cckm_ie(tpAniSirGlobal pMac, const uint8_t sessionId, - const uint8_t *pCckmIe, const uint8_t ccKmIeLen) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - if (!pSession) { - sms_log(pMac, LOGE, FL(" session %d not found "), sessionId); - return QDF_STATUS_E_FAILURE; - } - qdf_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen); - pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen; - return status; -} - -/* --------------------------------------------------------------------------- - \fn csr_roam_read_tsf - \brief This function reads the TSF; and also add the time elapsed since - last beacon or probe response reception from the hand off AP to arrive at - the latest TSF value. - \param pMac - pMac global structure - \param pTimestamp - output TSF timestamp - \- return Success or failure - -------------------------------------------------------------------------*/ -QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, - uint8_t sessionId) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tCsrNeighborRoamBSSInfo handoffNode; - uint32_t timer_diff = 0; - uint32_t timeStamp[2]; - tpSirBssDescription pBssDescription = NULL; - csr_neighbor_roam_get_handoff_ap_info(pMac, &handoffNode, sessionId); - pBssDescription = handoffNode.pBssDescription; - /* Get the time diff in milli seconds */ - timer_diff = - qdf_mc_timer_get_system_time() - pBssDescription->scanSysTimeMsec; - /* Convert msec to micro sec timer */ - timer_diff = (uint32_t) (timer_diff * SYSTEM_TIME_MSEC_TO_USEC); - timeStamp[0] = pBssDescription->timeStamp[0]; - timeStamp[1] = pBssDescription->timeStamp[1]; - update_cckmtsf(&(timeStamp[0]), &(timeStamp[1]), &timer_diff); - qdf_mem_copy(pTimestamp, (void *)&timeStamp[0], sizeof(uint32_t) * 2); - return status; -} -#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ - /** * csr_roam_channel_change_req() - Post channel change request to LIM * @pMac: mac context @@ -18033,8 +18086,7 @@ QDF_STATUS csr_roam_read_tsf(tpAniSirGlobal pMac, uint8_t *pTimestamp, * @ch_params: channel information * @profile: CSR profile * - * This API is primarily used to post - * Channel Change Req for SAP + * This API is primarily used to post Channel Change Req for SAP * * Return: QDF_STATUS */ diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 43f3bfea26f1..720e7c4ff20a 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -223,12 +223,12 @@ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val) #ifdef WLAN_FEATURE_RMC CASE_RETURN_STR(eCSR_ROAM_IBSS_PEER_INFO_COMPLETE); #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE CASE_RETURN_STR(eCSR_ROAM_TSM_IE_IND); CASE_RETURN_STR(eCSR_ROAM_CCKM_PREAUTH_NOTIFY); CASE_RETURN_STR(eCSR_ROAM_ESE_ADJ_AP_REPORT_IND); CASE_RETURN_STR(eCSR_ROAM_ESE_BCN_REPORT_IND); -#endif /* FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ default: return "unknown"; } diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index ad1716998d3a..d99411e89b8e 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -263,7 +263,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, return status; } -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE /** * sme_ese_send_beacon_req_scan_results () - Send beacon report * @mac_ctx Pointer to mac context @@ -409,7 +409,7 @@ static QDF_STATUS sme_ese_send_beacon_req_scan_results( return status; } -#endif /* FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ /** * sme_rrm_send_scan_result() - to get scan result and send the beacon report @@ -510,20 +510,20 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, */ if (!measurementdone) return status; -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE if (eRRM_MSG_SOURCE_ESE_UPLOAD == rrm_ctx->msgSource) status = sme_ese_send_beacon_req_scan_results(mac_ctx, session_id, chan_list[0], NULL, measurementdone, 0); else -#endif /*FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ status = sme_rrm_send_beacon_report_xmit_ind(mac_ctx, NULL, measurementdone, 0); return status; } scan_results = sme_scan_result_get_first(mac_ctx, result_handle); if (NULL == scan_results && measurementdone) { -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE if (eRRM_MSG_SOURCE_ESE_UPLOAD == rrm_ctx->msgSource) { status = sme_ese_send_beacon_req_scan_results(mac_ctx, session_id, @@ -532,7 +532,7 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, measurementdone, 0); } else -#endif /*FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ status = sme_rrm_send_beacon_report_xmit_ind(mac_ctx, NULL, measurementdone, 0); } @@ -549,14 +549,14 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOG1, FL(" Number of BSS Desc with RRM Scan %d "), counter); -#if defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE if (eRRM_MSG_SOURCE_ESE_UPLOAD == rrm_ctx->msgSource) status = sme_ese_send_beacon_req_scan_results(mac_ctx, session_id, chan_list[0], scanresults_arr, measurementdone, counter); else -#endif /*FEATURE_WLAN_ESE_UPLOAD */ +#endif /* FEATURE_WLAN_ESE */ status = sme_rrm_send_beacon_report_xmit_ind(mac_ctx, scanresults_arr, measurementdone, counter); @@ -623,7 +623,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, ChannelList[pSmeRrmContext->currentIndex], true); qdf_mem_free(pSmeRrmContext->channelList.ChannelList); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE pSmeRrmContext->eseBcnReqInProgress = false; #endif #if defined WLAN_VOWIFI_DEBUG @@ -764,7 +764,7 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) /* Advance the current index. */ sme_rrm_ctx->currentIndex++; sme_rrm_issue_scan_req(mac_ctx); -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE sme_rrm_ctx->eseBcnReqInProgress = false; #endif } else { diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 137d719e07a7..4f21445d87cd 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -848,7 +848,7 @@ struct wma_txrx_node { bool nlo_match_evt_received; bool pno_in_progress; #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE bool plm_in_progress; #endif bool ptrn_match_enable; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index b033c825ab24..d3c653a22037 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -289,13 +289,6 @@ static inline void wma_set_pno_channel_prediction(uint8_t *buf_ptr, WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_FIXED_STRUC, 0); } #endif -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) -QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); - -QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); - -void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm); -#endif #ifdef WLAN_FEATURE_ROAM_OFFLOAD void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts); @@ -1010,6 +1003,9 @@ void wma_start_oem_data_req(tp_wma_handle wma_handle, #ifdef FEATURE_WLAN_ESE QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, void *pTsmStatsMsg); +QDF_STATUS wma_plm_start(tp_wma_handle wma, const tpSirPlmReq plm); +QDF_STATUS wma_plm_stop(tp_wma_handle wma, const tpSirPlmReq plm); +void wma_config_plm(tp_wma_handle wma, tpSirPlmReq plm); #endif QDF_STATUS wma_process_mcbc_set_filter_req(tp_wma_handle wma_handle, diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 7d440c7a9163..12b7ff62c8d6 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -281,7 +281,7 @@ #endif /* FEATURE_WLAN_SCAN_PNO */ -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE #define WMA_SET_PLM_REQ SIR_HAL_SET_PLM_REQ #endif diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 1bc6879eb3f0..3e500bc59f9d 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -3938,10 +3938,8 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, uint16_t packet_count = 0; uint16_t packet_loss_count = 0; tpAniTrafStrmMetrics pTsmMetric = NULL; -#ifdef FEATURE_WLAN_ESE_UPLOAD tpAniGetTsmStatsReq pStats = (tpAniGetTsmStatsReq) pTsmStatsMsg; tpAniGetTsmStatsRsp pTsmRspParams = NULL; -#endif /* FEATURE_WLAN_ESE_UPLOAD */ int tid = pStats->tid; /* * The number of histrogram bin report by data path api are different @@ -3962,9 +3960,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, ol_tx_delay_hist(pdev, bin_values, tid); ol_tx_packet_count(pdev, &packet_count, &packet_loss_count, tid); -#ifdef FEATURE_WLAN_ESE_UPLOAD - pTsmRspParams = - (tpAniGetTsmStatsRsp) qdf_mem_malloc(sizeof(tAniGetTsmStatsRsp)); + pTsmRspParams = qdf_mem_malloc(sizeof(*pTsmRspParams)); if (NULL == pTsmRspParams) { QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, "%s: QDF MEM Alloc Failure", __func__); @@ -3976,7 +3972,6 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, pTsmRspParams->rc = eSIR_FAILURE; pTsmRspParams->tsmStatsReq = pStats; pTsmMetric = &pTsmRspParams->tsmMetrics; -#endif /* FEATURE_WLAN_ESE_UPLOAD */ /* populate pTsmMetric */ pTsmMetric->UplinkPktQueueDly = queue_delay_microsec; /* store only required number of bin values */ @@ -3993,9 +3988,7 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler, * being populated just before sending IAPP frame out */ /* post this message to LIM/PE */ -#ifdef FEATURE_WLAN_ESE_UPLOAD wma_send_msg(wma_handler, WMA_TSM_STATS_RSP, (void *)pTsmRspParams, 0); -#endif /* FEATURE_WLAN_ESE_UPLOAD */ return QDF_STATUS_SUCCESS; } diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c index fc5b1130d26c..cafc91be6143 100644 --- a/core/wma/src/wma_main.c +++ b/core/wma/src/wma_main.c @@ -4697,7 +4697,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg) wma_scan_cache_updated_ind(wma_handle, msg->bodyval); break; #endif /* FEATURE_WLAN_SCAN_PNO */ -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) +#ifdef FEATURE_WLAN_ESE case WMA_SET_PLM_REQ: wma_config_plm(wma_handle, (tpSirPlmReq) msg->bodyptr); break; diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 42362073e2e9..2196320a51a1 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2726,8 +2726,7 @@ void wma_config_pno(tp_wma_handle wma, tpSirPNOScanReq pno) qdf_mem_free(pno); } -#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD) - +#ifdef FEATURE_WLAN_ESE /** * wma_plm_start() - plm start request * @wma: wma handle -- cgit v1.2.3 From d0bae5f2dcb72c6e9722260f5bba60dcf368cb13 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 16 Dec 2015 18:05:21 -0800 Subject: qcacld-3.0: Remove obsolete csr_flush_roam_scan_roam_channel_list Remove obsolete csr_flush_roam_scan_roam_channel_list(). Change-Id: I535e4e5ce2c934451e0c94b4da825163138fe3b0 CRs-Fixed: 950762 --- core/sme/src/csr/csr_api_roam.c | 23 ----------------------- core/sme/src/csr/csr_neighbor_roam.c | 2 -- 2 files changed, 25 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 02912198b717..b877c2e9d007 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1420,29 +1420,6 @@ QDF_STATUS csr_create_bg_scan_roam_channel_list(tpAniSirGlobal pMac, #endif #ifdef FEATURE_WLAN_ESE -/* - This function flushes the roam scan cache - */ -QDF_STATUS csr_flush_roam_scan_roam_channel_list(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo - = &pMac->roam.neighborRoamInfo[sessionId]; - /* Free up the memory first (if required) */ - if (NULL != - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - ChannelList) { - qdf_mem_free(pNeighborRoamInfo->roamChannelInfo. - currentChannelListInfo.ChannelList); - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - ChannelList = NULL; - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. - numOfChannels = 0; - } - return status; -} - /** * csr_create_roam_scan_channel_list() - create roam scan channel list * @pMac: Global mac pointer diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index a26ae1fd1e7e..a53ac928c504 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -2859,8 +2859,6 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) CSR_NEIGHBOR_ROAM_INVALID_CHANNEL_INDEX; pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo. numOfChannels = 0; - pNeighborRoamInfo->roamChannelInfo.currentChannelListInfo.ChannelList = - NULL; pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; /* Free the profile.. */ -- cgit v1.2.3 From 18dcf3d53208c1740dc5abaf4a71e191d0053474 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Wed, 16 Dec 2015 18:11:48 -0800 Subject: qcacld-3.0: Remove csr_neighbor_roam_is_ese_assoc() There are two utility functions to check if the association is ESE or not. csr_neighbor_roam_is_ese_assoc() and csr_roam_is_ese_assoc(). Both serves the same purpose, hence remove csr_neighbor_roam_is_ese_assoc() and use csr_roam_is_ese_assoc(). Change-Id: I857f9c16eb73a4b0f72e0a622be47ab756fb70f4 CRs-Fixed: 950762 --- core/sme/inc/csr_internal.h | 1 - core/sme/src/csr/csr_api_roam.c | 19 ++----------------- core/sme/src/rrm/sme_rrm.c | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 07246ae2eeff..3b5616280317 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1283,7 +1283,6 @@ bool csr_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); /* Returns whether the current association is a ESE assoc or not */ bool csr_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId); bool csr_roam_is_ese_ini_feature_enabled(tpAniSirGlobal pMac); -bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac, tCsrTsmStatsCallback callback, uint8_t staId, diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index b877c2e9d007..81ea9fadad07 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -1553,27 +1553,12 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac, bool csr_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) { #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING - return csr_neighbor_roam_is_ese_assoc(mac_ctx, session_id); + return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc; #else return false; #endif } -/** - * csr_neighbor_roam_is_ese_assoc() - Check the Association type - * @mac_ctx: Global MAC Context - * @session_id: Session ID on which the check should be done - * - * This function returns whether the current association - * is a ESE assoc or not - * - * Return: True if ESE association, false otherwise. - **/ -bool csr_neighbor_roam_is_ese_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) -{ - return mac_ctx->roam.neighborRoamInfo[session_id].isESEAssoc; -} - /** * csr_roam_is_roam_offload_scan_enabled() - is roam offload enabled * @mac_ctx: Global MAC context @@ -16804,7 +16789,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx, req_buf->MAWCEnabled = mac_ctx->roam.configParam.MAWCEnabled; #ifdef FEATURE_WLAN_ESE req_buf->IsESEAssoc = - csr_neighbor_roam_is_ese_assoc(mac_ctx, session_id) && + csr_roam_is_ese_assoc(mac_ctx, session_id) && ((req_buf->ConnectedNetwork.authentication == eCSR_AUTH_TYPE_OPEN_SYSTEM) || (csr_is_auth_type_ese(req_buf-> diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index d99411e89b8e..45431c17448c 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -1187,7 +1187,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE /* Clear the cache for ESE. */ - if (csr_neighbor_roam_is_ese_assoc(pMac, sessionId)) { + if (csr_roam_is_ese_assoc(pMac, sessionId)) { rrm_ll_purge_neighbor_cache(pMac, &pMac->rrm.rrmSmeContext. neighborReportCache); -- cgit v1.2.3 From ff55fecd915a490b90d5e4f07721379f523bc4af Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 9 Mar 2016 12:54:23 -0800 Subject: qcacld-3.0: CL 1469034 - update fw common interface files qcacld-2.0 to qcacld-3.0 propagation add a wmi command to enable/disable channel avoidance report event from firmware Change-Id: Ic84728b315b4729470238098a91ef6bb629b3f7b CRs-Fixed: 865207 --- target/inc/wmi_tlv_defs.h | 10 +++++++++- target/inc/wmi_unified.h | 21 +++++++++++++++++++++ target/inc/wmi_version.h | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_tlv_defs.h b/target/inc/wmi_tlv_defs.h index 31c0a059f874..ba0a43f1e4cf 100644 --- a/target/inc/wmi_tlv_defs.h +++ b/target/inc/wmi_tlv_defs.h @@ -689,6 +689,7 @@ typedef enum { WMITLV_TAG_STRUC_wmi_pdev_set_mac_config_response_event_fixed_param, WMITLV_TAG_STRUC_WMI_COEX_CONFIG_CMD_fixed_param, WMITLV_TAG_STRUC_wmi_config_enhanced_mcast_filter_fixed_param, + WMITLV_TAG_STRUC_WMI_CHAN_AVOID_RPT_ALLOW_CMD_fixed_param, } WMITLV_TAG_ID; /* @@ -966,7 +967,8 @@ typedef enum { OP(WMI_PDEV_SET_ANTENNA_MODE_CMDID) \ OP(WMI_VDEV_SET_QUIET_MODE_CMDID) \ OP(WMI_COEX_CONFIG_CMDID) \ - OP(WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID) + OP(WMI_CONFIG_ENHANCED_MCAST_FILTER_CMDID) \ + OP(WMI_CHAN_AVOID_RPT_ALLOW_CMDID) /* * IMPORTANT: Please add _ALL_ WMI Events Here. @@ -2403,6 +2405,12 @@ WMITLV_CREATE_PARAM_STRUC(WMI_TPC_CHAINMASK_CONFIG_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_chan_avoid_update_cmd_param, wmi_chan_avoid_update_cmd_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_CHAN_AVOID_UPDATE_CMDID); +/* Ch avoidance report allow/disallow cmd*/ +#define WMITLV_TABLE_WMI_CHAN_AVOID_RPT_ALLOW_CMDID(id, op, buf, len) \ + WMITLV_ELEM(id, op, buf, len, WMITLV_TAG_STRUC_WMI_CHAN_AVOID_RPT_ALLOW_CMD_fixed_param, WMI_CHAN_AVOID_RPT_ALLOW_CMD_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_CHAN_AVOID_RPT_ALLOW_CMDID); + + /* D0-WOW Enable Disable Cmd */ #define WMITLV_TABLE_WMI_D0_WOW_ENABLE_DISABLE_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_d0_wow_enable_disable_cmd_fixed_param, wmi_d0_wow_enable_disable_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 6092d3547b94..4d68a322764d 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -861,6 +861,7 @@ typedef enum { WMI_CMD_GRP_START_ID(WMI_GRP_COEX), WMI_CHAN_AVOID_UPDATE_CMDID, WMI_COEX_CONFIG_CMDID, + WMI_CHAN_AVOID_RPT_ALLOW_CMDID, /** * OBSS scan offload enable/disable commands @@ -15044,6 +15045,26 @@ typedef struct { A_UINT32 config_arg2; } WMI_COEX_CONFIG_CMD_fixed_param; +/** + * This command is sent from WLAN host driver to firmware to + * request firmware to enable/disable channel avoidance report + * to host. + */ +enum { + WMI_MWSCOEX_CHAN_AVD_RPT_DISALLOW = 0, + WMI_MWSCOEX_CHAN_AVD_RPT_ALLOW = 1 +}; + +typedef struct { + /* + * TLV tag and len; tag equals + * WMITLV_TAG_STRUC_WMI_CHAN_AVOID_RPT_ALLOW_CMD_fixed_param + */ + A_UINT32 tlv_header; + /* Allow/disallow flag - see WMI_MWSCOEX_CHAN_AVD_RPT enum */ + A_UINT32 rpt_allow; +} WMI_CHAN_AVOID_RPT_ALLOW_CMD_fixed_param; + /* ADD NEW DEFS HERE */ /***************************************************************************** diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index f948a62ec96d..d69c11749fad 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 214 +#define __WMI_REVISION_ 215 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From b6ddc26740f3b8240b221026d7cc0ba6be63227e Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 9 Mar 2016 13:06:16 -0800 Subject: qcacld-3.0: CL 1469344 - update fw common interface files propagation from qcacld-2.0 to qcacld-3.0 bpf_instruction_size parameter is added in wmi_resource_config Change-Id: I188395cefc997052d7e4cd020a41e6ef788e82f3 CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 5 +++++ target/inc/wmi_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 4d68a322764d..61a10e2c0815 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -2272,6 +2272,11 @@ typedef struct { * specs */ A_UINT32 num_ns_ext_tuples_cfg; + /** + * size (in bytes) of the buffer the FW shall allocate to store + * packet filtering instructions + */ + A_UINT32 bpf_instruction_size; } wmi_resource_config; #define WMI_RSRC_CFG_FLAG_SET(word32, flag, value) \ diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index d69c11749fad..026931a8b1f6 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 215 +#define __WMI_REVISION_ 216 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 1d9a8d8cc14736fcb46b8ff8fc33b0a0eca45cee Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 9 Mar 2016 13:07:58 -0800 Subject: qcacld-3.0: CL 1469405 - update fw common interface files Propagation from qcacld-2.0 to qcacld-3.0 WMI scan flag to enable strict passive scan on passive chns Provide initial Hawkeye HW header files. Change-Id: I31b3244441857c812dc208d4ea2ce66d65c4fec3 CRs-Fixed: 865207 --- target/inc/wmi_unified.h | 3 ++- target/inc/wmi_version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/inc/wmi_unified.h b/target/inc/wmi_unified.h index 61a10e2c0815..c673a9cb9540 100644 --- a/target/inc/wmi_unified.h +++ b/target/inc/wmi_unified.h @@ -2516,7 +2516,8 @@ typedef struct { #define WMI_SCAN_OFFCHAN_DATA_TX 0x4000 /** allow capture ppdu with phy errrors */ #define WMI_SCAN_CAPTURE_PHY_ERROR 0x8000 - +/** always do passive scan on passive channels */ +#define WMI_SCAN_FLAG_STRICT_PASSIVE_ON_PCHN 0x1000 /** WMI_SCAN_CLASS_MASK must be the same value as IEEE80211_SCAN_CLASS_MASK */ #define WMI_SCAN_CLASS_MASK 0xFF000000 diff --git a/target/inc/wmi_version.h b/target/inc/wmi_version.h index 026931a8b1f6..acf977788270 100644 --- a/target/inc/wmi_version.h +++ b/target/inc/wmi_version.h @@ -36,7 +36,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility */ -#define __WMI_REVISION_ 216 +#define __WMI_REVISION_ 217 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work -- cgit v1.2.3 From 3e6b687e3a9b54d9478d5eaeda043d224770612a Mon Sep 17 00:00:00 2001 From: "Chandrasekaran, Manishekar" Date: Thu, 10 Mar 2016 09:30:52 +0530 Subject: qcacld-3.0: Add Kconfig entry to control MCC to SCC switch logic Add Kconfig entry to control the MCC to SCC switch logic so that the feature can be enabled when part of a built-in kernel. Change-Id: I8a4297e245b2be1b1cca81cc10bdccdfd34f8941 CRs-Fixed: 986079 --- Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Kconfig b/Kconfig index 940ae4dcf1fd..029683a4b317 100644 --- a/Kconfig +++ b/Kconfig @@ -111,4 +111,8 @@ config FEATURE_LFR_SUBNET_DETECTION bool "Enable LFR Subnet Change Detection" default n +config FEATURE_WLAN_MCC_TO_SCC_SWITCH + bool "Enable MCC to SCC Switch Logic" + default n + endif # QCA_CLD_WLAN -- cgit v1.2.3 From 4c2ed0798f0be66b11e4bc08623d444f0301c9f0 Mon Sep 17 00:00:00 2001 From: Komal Seelam Date: Mon, 1 Feb 2016 12:28:33 +0530 Subject: qcacld-3.0: Clean up mlm states during heart beat failure During Heart Beat failures, the mlm states are not cleared properly which resulted in stability issues. Fix it by setting the mlm states properly during heart beat failure. Change-Id: Ib54a29758ad31fa95726a59a7118b11931b49970 CRs-Fixed: 967796 --- core/mac/src/pe/lim/lim_link_monitoring_algo.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/core/mac/src/pe/lim/lim_link_monitoring_algo.c b/core/mac/src/pe/lim/lim_link_monitoring_algo.c index 07ca20322c8b..7aefc449485a 100644 --- a/core/mac/src/pe/lim/lim_link_monitoring_algo.c +++ b/core/mac/src/pe/lim/lim_link_monitoring_algo.c @@ -361,20 +361,6 @@ lim_tear_down_link_with_ap(tpAniSirGlobal pMac, uint8_t sessionId, pStaDs->mlmStaContext.disassocReason = reasonCode; pStaDs->mlmStaContext.cleanupTrigger = eLIM_LINK_MONITORING_DEAUTH; - - /* - * Set state to mlm State to eLIM_MLM_WT_DEL_STA_RSP_STATE - * This is to address the issue of race condition between - * disconnect request from the HDD and deauth from - * Tx inactivity timer by FWR. This will make sure that we - * will not process disassoc if deauth is in progress for - * the station and thus mlmStaContext.cleanupTrigger will - * not be overwritten. - */ - - pStaDs->mlmStaContext.mlmState = - eLIM_MLM_WT_DEL_STA_RSP_STATE; - /* / Issue Deauth Indication to SME. */ qdf_mem_copy((uint8_t *) &mlmDeauthInd.peerMacAddr, pStaDs->staAddr, sizeof(tSirMacAddr)); -- cgit v1.2.3 From fa2cfa10852a40cf40dd7930c87e968dd8c3042d Mon Sep 17 00:00:00 2001 From: Dhanashri Atre Date: Tue, 15 Mar 2016 18:00:41 -0700 Subject: qcacld-3.0: Revert "qcacld-3.0: Add debug print for EAPOL msg" Revert Change-Id: I1eb4f9dac6520b1ce00cdfc3e0fcef721ae498d6 This change is causing a regression on the UDP SAP -> STA throughput. CRs-Fixed: 990954 Change-Id: I09b8b61e70eddc2a85a6b22a186cc2eef0f8510f --- core/hdd/src/wlan_hdd_tx_rx.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c index 68b3fa7ea6c9..60d3162afaed 100644 --- a/core/hdd/src/wlan_hdd_tx_rx.c +++ b/core/hdd/src/wlan_hdd_tx_rx.c @@ -63,11 +63,6 @@ #define HDD_EAPOL_KEY_INFO_OFFSET (19) #define HDD_EAPOL_DEST_MAC_OFFSET (0) #define HDD_EAPOL_SRC_MAC_OFFSET (6) -#define EAPOL_MASK 0x8013 -#define EAPOL_M1_BIT_MASK 0x8000 -#define EAPOL_M2_BIT_MASK 0x0001 -#define EAPOL_M3_BIT_MASK 0x8013 -#define EAPOL_M4_BIT_MASK 0x0003 #endif /* FEATURE_WLAN_DIAG_SUPPORT */ const uint8_t hdd_wmm_ac_to_highest_up[] = { @@ -882,27 +877,10 @@ void wlan_hdd_log_eapol(struct sk_buff *skb, { int ret; struct host_event_wlan_eapol eapol_params; - uint16_t key_info; - const char *packet_type = "UND"; ret = wlan_hdd_get_eapol_params(skb, &eapol_params, event_type); if (!ret) - return; - - wlan_hdd_event_eapol_log(eapol_params); - key_info = eapol_params.eapol_key_info & EAPOL_MASK; - if (key_info == EAPOL_M1_BIT_MASK) - packet_type = "M1"; - else if (key_info == EAPOL_M2_BIT_MASK) - packet_type = "M2"; - else if (key_info == EAPOL_M3_BIT_MASK) - packet_type = "M3"; - else if (key_info == EAPOL_M4_BIT_MASK) - packet_type = "M4"; - - hdd_notice("%s: %s packet", eapol_params.event_sub_type == - WIFI_EVENT_DRIVER_EAPOL_FRAME_RECEIVED ? - "RX" : "TX", packet_type); + wlan_hdd_event_eapol_log(eapol_params); } #endif /* FEATURE_WLAN_DIAG_SUPPORT */ -- cgit v1.2.3 From 36ae57e9b4ef34c66e7ddce4d0f7ae98562f7e21 Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Mon, 14 Mar 2016 16:59:10 -0700 Subject: Release 5.1.0.8G Release 5.1.0.8G Change-Id: I2fc70ba6ced542a8791254a18871c8d8fc1c4fe3 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 4f3977ba447c..960b9429861b 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 7 +#define QWLAN_VERSION_BUILD 8 -#define QWLAN_VERSIONSTR "5.1.0.7G" +#define QWLAN_VERSIONSTR "5.1.0.8G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From 57d10c2115d46ac994b5e89fdcc3f5d99d230273 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Tue, 8 Mar 2016 13:04:20 -0800 Subject: qcacld-3.0: Make CONFIG_ICNSS set the bus to SNOC Currently HIF_PCI and snoc are not supported at the same time. Bus should be set to snoc when CONFIG_ICNSS is defined. Change-Id: I900cb70136a9be5406df05d06419e57ca0fa71be CRs-Fixed: 989686 --- Kbuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Kbuild b/Kbuild index a2cc3b43316a..d4ac68b34633 100755 --- a/Kbuild +++ b/Kbuild @@ -6,6 +6,10 @@ else KERNEL_BUILD := 0 endif +ifdef CONFIG_ICNSS + CONFIG_ROME_IF = snoc +endif + ifeq ($(CONFIG_CNSS), y) ifndef CONFIG_ROME_IF #use pci as default interface -- cgit v1.2.3 From 0e3989af45b3d1d4a7b0c08d4beecb5e4921c98d Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 15 Apr 2016 13:30:42 +0530 Subject: qcacld-3.0: Remove WLAN_VOWIFI_DEBUG and cleanup logging Feature WLAN_VOWIFI_DEBUG is not defined. Hence remove it. Also cleanup the logging. CRs-Fixed: 960105 Change-Id: I76d83d5d5c93aa7e4669a73c0d3300ed5b727bb1 --- core/mac/src/cfg/cfg_api.c | 4 +- core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 4 +- core/mac/src/pe/lim/lim_process_sme_req_messages.c | 34 ++---- core/sme/src/common/sme_api.c | 4 - core/sme/src/rrm/sme_rrm.c | 126 ++++----------------- 5 files changed, 28 insertions(+), 144 deletions(-) diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c index 596794cd4be9..78c0018055aa 100644 --- a/core/mac/src/cfg/cfg_api.c +++ b/core/mac/src/cfg/cfg_api.c @@ -819,9 +819,7 @@ tSirRetStatus cfg_get_capability_info(tpAniSirGlobal pMac, uint16_t *pCap, pCapInfo->apsd = 1; pCapInfo->rrm = pMac->rrm.rrmSmeContext.rrmConfig.rrm_enabled; -#if defined WLAN_VOWIFI_DEBUG - cfg_log(pMac, LOGE, FL("RRM = %d"), pCapInfo->rrm); -#endif + cfg_log(pMac, LOG1, FL("RRM = %d"), pCapInfo->rrm); /* DSSS-OFDM */ /* FIXME : no config defined yet. */ diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index e1d3899d033a..22ea9129b71a 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -201,9 +201,7 @@ lim_change_channel_with_callback(tpAniSirGlobal mac_ctx, uint8_t new_chan, uint32_t *cbdata, tpPESession session_entry) { /* Sanity checks for the current and new channel */ -#if defined WLAN_VOWIFI_DEBUG - lim_log(mac_ctx, LOGE, FL("Switching channel to %d"), new_chan); -#endif + lim_log(mac_ctx, LOG1, FL("Switching channel to %d"), new_chan); session_entry->channelChangeReasonCode = LIM_SWITCH_CHANNEL_OPERATION; diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c index 3bbbf64c389b..a1833859c6a1 100644 --- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c @@ -1967,13 +1967,9 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) session->maxTxPower = QDF_MIN(reg_max, (local_power_constraint)); #endif -#if defined WLAN_VOWIFI_DEBUG - lim_log(mac_ctx, LOGE, - "Regulatory max = %d, local power constraint = %d" - reg_max, local_power_constraint); - lim_log(mac_ctx, LOGE, FL(" max tx = %d"), - session->maxTxPower); -#endif + lim_log(mac_ctx, LOG1, + FL("Reg max = %d, local power con = %d, max tx = %d"), + reg_max, local_power_constraint, session->maxTxPower); if (session->gLimCurrentBssUapsd) { session->gUapsdPerAcBitmask = @@ -2254,12 +2250,9 @@ static void __lim_process_sme_reassoc_req(tpAniSirGlobal mac_ctx, &session_entry->gLimCurrentBssUapsd, &local_pwr_constraint, session_entry); session_entry->maxTxPower = QDF_MIN(reg_max, (local_pwr_constraint)); -#if defined WLAN_VOWIFI_DEBUG lim_log(mac_ctx, LOGE, - "Regulatory max = %d, local pwr constraint = %d, max tx = %d", - reg_max, local_pwr_constraint, - session_entry->maxTxPower); -#endif + FL("Reg max = %d, local pwr constraint = %d, max tx = %d"), + reg_max, local_pwr_constraint, session_entry->maxTxPower); /* Copy the SSID from session entry to local variable */ session_entry->limReassocSSID.length = reassoc_req->ssId.length; qdf_mem_copy(session_entry->limReassocSSID.ssId, @@ -4489,10 +4482,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, tSirMsgQ msgQ; if (pSessionEntry == NULL) { - PELOGE(lim_log - (pMac, LOGE, "%s:%d: Inavalid parameters", __func__, - __LINE__); - ) + lim_log(pMac, LOGE, FL("Inavalid parameters")); return eSIR_FAILURE; } @@ -4503,14 +4493,6 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, return eSIR_MEM_ALLOC_FAILED; } -#if defined(WLAN_VOWIFI_DEBUG) || defined(FEATURE_WLAN_ESE) - lim_log(pMac, LOG1, - FL("pMaxTxParams allocated...will be freed in other module")); -#endif - if (pMaxTxParams == NULL) { - lim_log(pMac, LOGE, FL("pMaxTxParams is NULL")); - return eSIR_FAILURE; - } pMaxTxParams->power = txPower; qdf_mem_copy(pMaxTxParams->bssId.bytes, pSessionEntry->bssId, QDF_MAC_ADDR_SIZE); @@ -4521,9 +4503,7 @@ lim_send_set_max_tx_power_req(tpAniSirGlobal pMac, int8_t txPower, msgQ.type = WMA_SET_MAX_TX_POWER_REQ; msgQ.bodyptr = pMaxTxParams; msgQ.bodyval = 0; - PELOG1(lim_log - (pMac, LOG1, FL("Posting WMA_SET_MAX_TX_POWER_REQ to WMA")); - ) + lim_log(pMac, LOG1, FL("Post WMA_SET_MAX_TX_POWER_REQ to WMA")); MTRACE(mac_trace_msg_tx(pMac, pSessionEntry->peSessionId, msgQ.type)); retCode = wma_post_ctrl_msg(pMac, &msgQ); if (eSIR_SUCCESS != retCode) { diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 39a5fe27c5a2..3384d3e0cf53 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -2515,10 +2515,6 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg) break; case eWNI_SME_NEIGHBOR_REPORT_IND: case eWNI_SME_BEACON_REPORT_REQ_IND: -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, FL("Received RRM message. Message Id = %d"), - pMsg->type); -#endif if (pMsg->bodyptr) { status = sme_rrm_msg_processor(pMac, pMsg->type, pMsg->bodyptr); diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 45431c17448c..eea4a764fbb0 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -178,10 +178,6 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, QDF_STATUS status = QDF_STATUS_E_FAILURE; tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to PE"); -#endif - if (NULL == result_arr && !msrmnt_status) { sms_log(mac_ctx, LOGE, "Beacon report xmit Ind to PE Failed"); return QDF_STATUS_E_FAILURE; @@ -199,9 +195,6 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_NOMEM; } qdf_mem_zero(beacon_rep, length); -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Allocated memory for beacon_rep")); -#endif beacon_rep->messageType = eWNI_SME_BEACON_REPORT_RESP_XMIT_IND; beacon_rep->length = length; beacon_rep->uDialogToken = rrm_ctx->token; @@ -437,10 +430,6 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, tpRrmSMEContext rrm_ctx = &mac_ctx->rrm.rrmSmeContext; uint32_t session_id; -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Send scan result to PE ")); -#endif - qdf_mem_zero(&filter, sizeof(filter)); qdf_mem_zero(scanresults_arr, sizeof(next_result) * SIR_BCN_REPORT_MAX_BSS_DESC); @@ -454,9 +443,6 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, sms_log(mac_ctx, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Allocated memory for SSIDList")); -#endif qdf_mem_zero(filter.SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); filter.SSIDs.SSIDList->SSID.length = @@ -486,13 +472,8 @@ static QDF_STATUS sme_rrm_send_scan_result(tpAniSirGlobal mac_ctx, status = sme_scan_get_result(mac_ctx, (uint8_t) session_id, &filter, &result_handle); - if (filter.SSIDs.SSIDList) { - /* Free the memory allocated for SSIDList */ + if (filter.SSIDs.SSIDList) qdf_mem_free(filter.SSIDs.SSIDList); -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Free memory for SSIDList")); -#endif - } if (NULL == result_handle) { /* @@ -591,9 +572,6 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, tpRrmSMEContext pSmeRrmContext = &pMac->rrm.rrmSmeContext; uint32_t time_tick; -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, "Scan Request callback "); -#endif /* if any more channels are pending, start a timer of a random value within randomization interval. */ /* */ /* */ @@ -611,9 +589,7 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, interval = time_tick % (pSmeRrmContext->randnIntvl - 10 + 1) + 10; -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, "Set timer for interval %d ", interval); -#endif + sms_log(pMac, LOG1, "Set timer for interval %d ", interval); qdf_mc_timer_start(&pSmeRrmContext->IterMeasTimer, interval); } else { @@ -625,9 +601,6 @@ static QDF_STATUS sme_rrm_scan_request_callback(tHalHandle halHandle, qdf_mem_free(pSmeRrmContext->channelList.ChannelList); #ifdef FEATURE_WLAN_ESE pSmeRrmContext->eseBcnReqInProgress = false; -#endif -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, FL("Free memory for ChannelList")); #endif } @@ -670,9 +643,6 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) if ((eSIR_ACTIVE_SCAN == scan_type) || (eSIR_PASSIVE_SCAN == scan_type)) { -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Issue scan request")); -#endif qdf_mem_zero(&scan_req, sizeof(scan_req)); /* set scan_type, active or passive */ scan_req.bcnRptReqScan = true; @@ -689,10 +659,6 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, - FL("Allocated memory for pSSIDList")); -#endif qdf_mem_zero(scan_req.SSIDs.SSIDList, sizeof(tCsrSSIDInfo)); scan_req.SSIDs.SSIDList->SSID.length = @@ -719,10 +685,6 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) rrm_scan_timer = qdf_mc_timer_get_system_time(); -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("For Duration %d "), - scan_req.maxChnTime); -#endif /* set BSSType to default type */ scan_req.BSSType = eCSR_BSS_TYPE_ANY; /*Scan all the channels */ @@ -730,23 +692,18 @@ QDF_STATUS sme_rrm_issue_scan_req(tpAniSirGlobal mac_ctx) scan_req.ChannelInfo.ChannelList = &sme_rrm_ctx->channelList.ChannelList[ sme_rrm_ctx->currentIndex]; -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("On channel %d "), + sms_log(mac_ctx, LOG1, FL("Duration %d On channel %d "), + scan_req.maxChnTime, sme_rrm_ctx->channelList.ChannelList[ sme_rrm_ctx->currentIndex]); -#endif /* set requestType to full scan */ scan_req.requestType = eCSR_SCAN_REQUEST_FULL_SCAN; status = sme_scan_request(mac_ctx, (uint8_t) session_id, &scan_req, &sme_rrm_scan_request_callback, NULL); - if (sme_rrm_ctx->ssId.length) { + if (sme_rrm_ctx->ssId.length) qdf_mem_free(scan_req.SSIDs.SSIDList); -#if defined WLAN_VOWIFI_DEBUG - sms_log(mac_ctx, LOGE, FL("Free memory for SSIDList")); -#endif - } } else if (eSIR_BEACON_TABLE == scan_type) { /* * In beacon table mode, scan results are taken directly from @@ -809,10 +766,8 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg uint32_t len = 0, i = 0; QDF_STATUS status = QDF_STATUS_SUCCESS; -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, "Received Beacon report request ind Channel = %d", + sms_log(pMac, LOG1, "Received Beacon report request ind Channel = %d", pBeaconReq->channelInfo.channelNum); -#endif /* section 11.10.8.1 (IEEE Std 802.11k-2008) */ /* channel 0 and 255 has special meaning. */ if ((pBeaconReq->channelInfo.channelNum == 0) || @@ -825,16 +780,10 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); -#endif csr_get_cfg_valid_channels(pMac, pSmeRrmContext->channelList.ChannelList, &len); pSmeRrmContext->channelList.numOfChannels = (uint8_t) len; -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, "channel == 0 performing on all channels"); -#endif } else { len = 0; pSmeRrmContext->channelList.numOfChannels = 0; @@ -843,10 +792,6 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg /* if there are additional channels present in APchannelreport, measure on these also. */ if (pBeaconReq->channelInfo.channelNum != 255) len = 1; -#if defined WLAN_VOWIFI_DEBUG - else - sms_log(pMac, LOGE, "channel == 255"); -#endif len += pBeaconReq->channelList.numChannels; @@ -855,26 +800,16 @@ QDF_STATUS sme_rrm_process_beacon_report_req_ind(tpAniSirGlobal pMac, void *pMsg sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); return QDF_STATUS_E_NOMEM; } -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, FL("Allocated memory for ChannelList")); -#endif if (pBeaconReq->channelInfo.channelNum != 255) { -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, "channel == %d ", - pBeaconReq->channelInfo.channelNum); -#endif if (csr_roam_is_channel_valid (pMac, pBeaconReq->channelInfo.channelNum)) pSmeRrmContext->channelList. ChannelList[pSmeRrmContext->channelList. numOfChannels++] = pBeaconReq->channelInfo.channelNum; -#if defined WLAN_VOWIFI_DEBUG else - sms_log(pMac, LOGE, - "is Invalid channel, Ignoring this channel"); -#endif + sms_log(pMac, LOGE, "Invalid channel"); } for (i = 0; i < pBeaconReq->channelList.numChannels; i++) { @@ -939,10 +874,8 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI tpSirNeighborReportReqInd pMsg; tCsrRoamSession *pSession; -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, + sms_log(pMac, LOG1, FL("Request to send Neighbor report request received ")); -#endif if (!CSR_IS_SESSION_VALID(pMac, sessionId)) { sms_log(pMac, LOGE, FL("Invalid session %d"), sessionId); return QDF_STATUS_E_INVAL; @@ -966,19 +899,8 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI } qdf_mem_zero(pMsg, sizeof(tSirNeighborReportReqInd)); -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, FL(" Allocated memory for Neighbor request")); -#endif - rrm_ll_purge_neighbor_cache(pMac, - &pMac->rrm.rrmSmeContext.neighborReportCache); - -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, - FL - ("Purged the neighbor cache before sending Neighbor request: Status = %d"), - status); -#endif + &pMac->rrm.rrmSmeContext.neighborReportCache); pMsg->messageType = eWNI_SME_NEIGHBOR_REPORT_REQ_IND; pMsg->length = sizeof(tSirNeighborReportReqInd); @@ -1182,8 +1104,8 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) /* Get the session id */ status = csr_roam_get_session_id_from_bssid(pMac, - (struct qdf_mac_addr *) pNeighborRpt->bssId, - (uint32_t *) &sessionId); + (struct qdf_mac_addr *) pNeighborRpt->bssId, + (uint32_t *) &sessionId); if (QDF_IS_STATUS_SUCCESS(status)) { #ifdef FEATURE_WLAN_ESE /* Clear the cache for ESE. */ @@ -1200,7 +1122,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) qdf_mem_malloc(sizeof(tRrmNeighborReportDesc)); if (NULL == pNeighborReportDesc) { sms_log(pMac, LOGE, - "Failed to allocate memory for RRM Neighbor report desc"); + "Failed to alloc memory for RRM report desc"); status = QDF_STATUS_E_NOMEM; goto end; @@ -1212,7 +1134,7 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) qdf_mem_malloc(sizeof(tSirNeighborBssDescription)); if (NULL == pNeighborReportDesc->pNeighborBssDescription) { sms_log(pMac, LOGE, - "Failed to allocate memory for RRM Neighbor report BSS Description"); + "Failed to alloc mem for RRM BSS Description"); qdf_mem_free(pNeighborReportDesc); status = QDF_STATUS_E_NOMEM; goto end; @@ -1223,21 +1145,17 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) &pNeighborRpt->sNeighborBssDescription[i], sizeof(tSirNeighborBssDescription)); -#if defined WLAN_VOWIFI_DEBUG - sms_log(pMac, LOGE, + sms_log(pMac, LOG1, "Received neighbor report with Neighbor BSSID: " MAC_ADDRESS_STR, - MAC_ADDR_ARRAY(pNeighborRpt->sNeighborBssDescription[i]. - bssId)); -#endif + MAC_ADDR_ARRAY( + pNeighborRpt->sNeighborBssDescription[i].bssId)); - /* Calculate the roam score based on the BSS Capability in the BSSID Information and store it in Neighbor report Desc */ rrm_calculate_neighbor_ap_roam_score(pMac, pNeighborReportDesc); - /* Store the Neighbor report Desc in the cache based on the roam score */ if (pNeighborReportDesc->roamScore > 0) { rrm_store_neighbor_rpt_by_roam_score(pMac, - pNeighborReportDesc); + pNeighborReportDesc); } else { sms_log(pMac, LOGE, FL("Roam score of BSSID " MAC_ADDRESS_STR @@ -1246,8 +1164,8 @@ QDF_STATUS sme_rrm_process_neighbor_report(tpAniSirGlobal pMac, void *pMsgBuf) sNeighborBssDescription[i]. bssId)); - qdf_mem_free(pNeighborReportDesc-> - pNeighborBssDescription); + qdf_mem_free( + pNeighborReportDesc->pNeighborBssDescription); qdf_mem_free(pNeighborReportDesc); } } @@ -1256,9 +1174,7 @@ end: if (!csr_ll_count(&pMac->rrm.rrmSmeContext.neighborReportCache)) qdf_status = QDF_STATUS_E_FAILURE; - /* Received a report from AP. Indicate SUCCESS to the caller if there are some valid reports */ rrm_indicate_neighbor_report_result(pMac, qdf_status); - return status; } @@ -1315,10 +1231,8 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type, void rrm_iter_meas_timer_handle(void *userData) { tpAniSirGlobal pMac = (tpAniSirGlobal) userData; -#if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Randomization timer expired...send on next channel "); -#endif /* Issue a scan req for next channel. */ sme_rrm_issue_scan_req(pMac); } @@ -1334,9 +1248,7 @@ void rrm_iter_meas_timer_handle(void *userData) void rrm_neighbor_rsp_timeout_handler(void *userData) { tpAniSirGlobal pMac = (tpAniSirGlobal) userData; -#if defined WLAN_VOWIFI_DEBUG sms_log(pMac, LOGE, "Neighbor Response timed out "); -#endif rrm_indicate_neighbor_report_result(pMac, QDF_STATUS_E_FAILURE); return; } -- cgit v1.2.3 From 32de0e4137f3c1ab2df4391c19c6dfdba89c0aac Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 15 Apr 2016 14:25:59 +0530 Subject: qcacld-3.0: Isolate roaming related timers Create separate routines for all the host roaming related timers and hence they can be compiled out if roaming feature is not needed CRs-Fixed: 978905 Change-Id: I29f99a075c72d877fc97f760449e3421ebd64916 --- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 37 ++-- core/mac/src/pe/lim/lim_timer_utils.c | 226 +++++++++++++--------- core/mac/src/pe/lim/lim_utils.c | 9 +- core/mac/src/pe/lim/lim_utils.h | 4 + 4 files changed, 161 insertions(+), 115 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 3fa8cf4c68c1..af41128c61b4 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -535,6 +535,27 @@ static void lim_update_stads_ext_cap(tpAniSirGlobal mac_ctx, #endif } +/** + * lim_stop_reassoc_retry_timer() - Cleanup after reassoc response is received + * @mac_ctx: Global MAC context + * + * Stop the reassoc retry timer and release the stored reassoc request. + * + * Return: None + */ +void lim_stop_reassoc_retry_timer(tpAniSirGlobal mac_ctx) +{ + mac_ctx->lim.reAssocRetryAttempt = 0; + if ((NULL != mac_ctx->lim.pSessionEntry) + && (NULL != + mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq)) { + qdf_mem_free( + mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq); + mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq = NULL; + } + lim_deactivate_and_change_timer(mac_ctx, eLIM_REASSOC_FAIL_TIMER); +} + /** * lim_process_assoc_rsp_frame() - Processes assoc response * @mac_ctx: Pointer to Global MAC structure @@ -793,20 +814,8 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, /* Stop Association failure timer */ if (subtype == LIM_ASSOC) lim_deactivate_and_change_timer(mac_ctx, eLIM_ASSOC_FAIL_TIMER); - else { - /* Stop Reassociation failure timer */ - mac_ctx->lim.reAssocRetryAttempt = 0; - if ((NULL != mac_ctx->lim.pSessionEntry) - && (NULL != - mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq)) { - qdf_mem_free( - mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq); - mac_ctx->lim.pSessionEntry->pLimMlmReassocRetryReq = - NULL; - } - lim_deactivate_and_change_timer(mac_ctx, - eLIM_REASSOC_FAIL_TIMER); - } + else + lim_stop_reassoc_retry_timer(mac_ctx); if (assoc_rsp->statusCode != eSIR_MAC_SUCCESS_STATUS #ifdef WLAN_FEATURE_11W diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index bcf3c68442c4..b79b8ca1aef7 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -58,8 +58,129 @@ convert ACTIVE DFS channel to DFS channels */ #define ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT 1000 -static bool -lim_create_non_ap_timers(tpAniSirGlobal pMac) +/** + * lim_create_timers_host_roam() - Create timers used in host based roaming + * @mac_ctx: Global MAC context + * + * Create reassoc and preauth timers + * + * Return: TX_SUCCESS or TX_TIMER_ERROR + */ +uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx) +{ + uint32_t cfg_value; + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + &cfg_value) != eSIR_SUCCESS) + lim_log(mac_ctx, LOGP, + FL("could not retrieve ReassocFailureTimeout value")); + + cfg_value = SYS_MS_TO_TICKS(cfg_value); + /* Create Association failure timer and activate it later */ + if (tx_timer_create(mac_ctx, + &mac_ctx->lim.limTimers.gLimReassocFailureTimer, + "REASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, + LIM_REASSOC, cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, FL("failed to create Reassoc timer")); + return TX_TIMER_ERROR; + } + cfg_value = 1000; + cfg_value = SYS_MS_TO_TICKS(cfg_value); + if (tx_timer_create(mac_ctx, + &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + "FT PREAUTH RSP TIMEOUT", + lim_timer_handler, SIR_LIM_FT_PREAUTH_RSP_TIMEOUT, + cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, FL("failed to create Join fail timer")); + goto err_roam_timer; + } + return TX_SUCCESS; + +err_roam_timer: + tx_timer_delete(&mac_ctx->lim.limTimers.gLimReassocFailureTimer); + return TX_TIMER_ERROR; +} + +/** + * lim_delete_timers_host_roam() - Delete timers used in host based roaming + * @mac_ctx: Global MAC context + * + * Delete reassoc and preauth timers + * + * Return: none + */ +void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx) +{ + tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + + /* Deactivate and delete Reassociation failure timer. */ + tx_timer_deactivate(&lim_timer->gLimReassocFailureTimer); + tx_timer_delete(&lim_timer->gLimReassocFailureTimer); + + /* Deactivate and delete FT Preauth response timer */ + tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); + tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); +} + +/** + * lim_deactivate_and_change_timer_host_roam() - Change timers in host roaming + * @mac_ctx: Pointer to Global MAC structure + * @timer_id: enum of timer to be deactivated and changed + * + * This function is called to deactivate and change a timer for future + * re-activation for host roaming timers. + * + * Return: None + */ +void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx, + uint32_t timer_id) +{ + uint32_t val = 0; + + switch (timer_id) { + case eLIM_REASSOC_FAIL_TIMER: + if (tx_timer_deactivate + (&mac_ctx->lim.limTimers.gLimReassocFailureTimer) != + TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("unable to deactivate Reassoc fail timer")); + } + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + &val) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("could not get ReassocFailureTimeout val")); + } + val = SYS_MS_TO_TICKS(val); + if (tx_timer_change + (&mac_ctx->lim.limTimers.gLimReassocFailureTimer, val, + 0) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("unable to change Reassoc fail timer")); + } + break; + + case eLIM_FT_PREAUTH_RSP_TIMER: + if (tx_timer_deactivate + (&mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer) != + TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("Unable to deactivate Preauth Fail timer")); + return; + } + val = 1000; + val = SYS_MS_TO_TICKS(val); + if (tx_timer_change( + &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + val, 0) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("Unable to change Join Failure timer")); + return; + } + break; + } +} + +static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) { uint32_t cfgValue; /* Create Channel Switch Timer */ @@ -152,20 +273,6 @@ lim_create_non_ap_timers(tpAniSirGlobal pMac) FL("could not create Association failure timer")); return false; } - if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - &cfgValue) != eSIR_SUCCESS) - lim_log(pMac, LOGP, - FL("could not retrieve ReassocFailureTimeout value")); - - cfgValue = SYS_MS_TO_TICKS(cfgValue); - /* Create Association failure timer and activate it later */ - if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimReassocFailureTimer, - "REASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, - LIM_REASSOC, cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGP, - FL("could not create Reassociation failure timer")); - return false; - } if (wlan_cfg_get_int(pMac, WNI_CFG_ADDTS_RSP_TIMEOUT, &cfgValue) != eSIR_SUCCESS) @@ -236,9 +343,12 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) uint32_t cfgValue, i = 0; uint32_t cfgValue1; - PELOG1(lim_log(pMac, LOG1, + lim_log(pMac, LOG1, FL("Creating Timers used by LIM module in Role %d"), - pMac->lim.gLimSystemRole);) + pMac->lim.gLimSystemRole); + /* Create timers required for host roaming feature */ + if (TX_SUCCESS != lim_create_timers_host_roam(pMac)) + return TX_TIMER_ERROR; if (wlan_cfg_get_int(pMac, WNI_CFG_ACTIVE_MINIMUM_CHANNEL_TIME, &cfgValue) != eSIR_SUCCESS) { @@ -352,19 +462,6 @@ uint32_t lim_create_timers(tpAniSirGlobal pMac) lim_log(pMac, LOGP, FL("Cannot create update OLBC cache tmr")); goto err_timer; } - /* In future we need to use the auth timer, cause the pre auth session - * will be introduced before sending Auth frame. We need to go off - * channel and come back to home channel - */ - cfgValue = 1000; - cfgValue = SYS_MS_TO_TICKS(cfgValue); - if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimFTPreAuthRspTimer, - "FT PREAUTH RSP TIMEOUT", - lim_timer_handler, SIR_LIM_FT_PREAUTH_RSP_TIMEOUT, - cfgValue, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(pMac, LOGP, FL("could not create Join failure timer")); - goto err_timer; - } cfgValue = 1000; cfgValue = SYS_MS_TO_TICKS(cfgValue); if (tx_timer_create(pMac, &pMac->lim.limTimers.gLimRemainOnChannelTimer, @@ -690,6 +787,11 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) (pMac, TRACE_CODE_TIMER_DEACTIVATE, NO_SESSION, timerId)); switch (timerId) { + case eLIM_REASSOC_FAIL_TIMER: + case eLIM_FT_PREAUTH_RSP_TIMER: + lim_deactivate_and_change_timer_host_roam(pMac, timerId); + break; + case eLIM_ADDTS_RSP_TIMER: pMac->lim.gLimAddtsRspTimerCount++; if (tx_timer_deactivate(&pMac->lim.limTimers.gLimAddtsRspTimer) @@ -880,41 +982,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) break; - case eLIM_REASSOC_FAIL_TIMER: - if (tx_timer_deactivate - (&pMac->lim.limTimers.gLimReassocFailureTimer) != - TX_SUCCESS) { - /* Could not deactivate Reassociation failure timer. */ - /* Log error */ - lim_log(pMac, LOGP, - FL - ("unable to deactivate Reassoc failure timer")); - } - /* Change timer to reactivate it in future */ - if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - &val) != eSIR_SUCCESS) { - /** - * Could not get ReassocFailureTimeout value - * from CFG. Log error. - */ - lim_log(pMac, LOGP, - FL - ("could not retrieve ReassocFailureTimeout value")); - } - val = SYS_MS_TO_TICKS(val); - - if (tx_timer_change - (&pMac->lim.limTimers.gLimReassocFailureTimer, val, - 0) != TX_SUCCESS) { - /* Could not change Reassociation failure timer. */ - /* Log error */ - lim_log(pMac, LOGP, - FL - ("unable to change Reassociation failure timer")); - } - - break; - case eLIM_PROBE_AFTER_HB_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimProbeAfterHBTimer) != @@ -958,33 +1025,6 @@ void lim_deactivate_and_change_timer(tpAniSirGlobal pMac, uint32_t timerId) case eLIM_LEARN_DURATION_TIMER: break; - case eLIM_FT_PREAUTH_RSP_TIMER: - if (tx_timer_deactivate - (&pMac->lim.limTimers.gLimFTPreAuthRspTimer) != - TX_SUCCESS) { - /** - ** Could not deactivate Join Failure - ** timer. Log error. - **/ - lim_log(pMac, LOGP, - FL - ("Unable to deactivate Preauth response Failure timer")); - return; - } - val = 1000; - val = SYS_MS_TO_TICKS(val); - if (tx_timer_change(&pMac->lim.limTimers.gLimFTPreAuthRspTimer, - val, 0) != TX_SUCCESS) { - /** - * Could not change Join Failure - * timer. Log error. - */ - lim_log(pMac, LOGP, - FL("Unable to change Join Failure timer")); - return; - } - break; - case eLIM_REMAIN_CHN_TIMER: if (tx_timer_deactivate (&pMac->lim.limTimers.gLimRemainOnChannelTimer) != diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 65a231fd8605..d3e4bc11d2ad 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -605,6 +605,7 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) if (mac_ctx->lim.gLimTimersCreated == 1) { lim_timer = &mac_ctx->lim.limTimers; + lim_delete_timers_host_roam(mac_ctx); /* Deactivate and delete Periodic Probe channel timers. */ tx_timer_deactivate(&lim_timer->gLimPeriodicProbeReqTimer); tx_timer_delete(&lim_timer->gLimPeriodicProbeReqTimer); @@ -634,10 +635,6 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) tx_timer_deactivate(&lim_timer->gLimAssocFailureTimer); tx_timer_delete(&lim_timer->gLimAssocFailureTimer); - /* Deactivate and delete Reassociation failure timer. */ - tx_timer_deactivate(&lim_timer->gLimReassocFailureTimer); - tx_timer_delete(&lim_timer->gLimReassocFailureTimer); - /* Deactivate and delete Authentication failure timer. */ tx_timer_deactivate(&lim_timer->gLimAuthFailureTimer); tx_timer_delete(&lim_timer->gLimAuthFailureTimer); @@ -681,10 +678,6 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx) tx_timer_deactivate(&lim_timer->gLimPreAuthClnupTimer); tx_timer_delete(&lim_timer->gLimPreAuthClnupTimer); - /* Deactivate and delete FT Preauth response timer */ - tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); - tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); - /* Deactivate and delete remain on channel timer */ tx_timer_deactivate(&lim_timer->gLimRemainOnChannelTimer); tx_timer_delete(&lim_timer->gLimRemainOnChannelTimer); diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index fb39f47705ce..1ceeabd0daf4 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -585,5 +585,9 @@ uint8_t lim_get_80Mhz_center_channel(uint8_t primary_channel); void lim_update_obss_scanparams(tpPESession session, tDot11fIEOBSSScanParameters *scan_params); void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session); +uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx); +void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx); +void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx, + uint32_t timer_id); #endif /* __LIM_UTILS_H */ -- cgit v1.2.3 From dbbb9919e9ae7d1043ef8205b28f55e37a3a7a54 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 10 Feb 2016 14:32:50 -0800 Subject: qcacld-3.0: Isolate the pre-authentication code into a new file Move all the pre-authentication related code in LIM to a separate file so that it is feature specific and easy to maintain across different projects CRs-Fixed: 978905 Change-Id: I3ca443139b974b25be8121fd6df040d858693708 --- Kbuild | 1 + core/mac/src/pe/lim/lim_ft.c | 724 +------------------------------- core/mac/src/pe/lim/lim_ft_preauth.c | 782 +++++++++++++++++++++++++++++++++++ 3 files changed, 785 insertions(+), 722 deletions(-) create mode 100644 core/mac/src/pe/lim/lim_ft_preauth.c diff --git a/Kbuild b/Kbuild index d4ac68b34633..7b13789bb13e 100755 --- a/Kbuild +++ b/Kbuild @@ -403,6 +403,7 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_assoc_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_debug.o \ $(MAC_SRC_DIR)/pe/lim/lim_ft.o \ + $(MAC_SRC_DIR)/pe/lim/lim_ft_preauth.o \ $(MAC_SRC_DIR)/pe/lim/lim_ibss_peer_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_link_monitoring_algo.o \ $(MAC_SRC_DIR)/pe/lim/lim_p2p.o \ diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 82f2498359e4..ad918d237540 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -64,75 +64,6 @@ void lim_ft_open(tpAniSirGlobal pMac, tpPESession psessionEntry) 0); } -/*-------------------------------------------------------------------------- - Cleanup FT variables. - ------------------------------------------------------------------------*/ -void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry) -{ - tpPESession pReAssocSessionEntry = NULL; - uint8_t sessionId = 0; - - if (!psessionEntry) { - lim_log(pMac, LOGE, FL("psessionEntry is NULL")); - return; - } - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return; - } - - if (psessionEntry->ftPEContext.pFTPreAuthReq) { - pReAssocSessionEntry = - pe_find_session_by_bssid(pMac, - psessionEntry->ftPEContext. - pFTPreAuthReq->preAuthbssId, - &sessionId); - - lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"), - psessionEntry->ftPEContext.pFTPreAuthReq); - if (psessionEntry->ftPEContext.pFTPreAuthReq-> - pbssDescription) { - qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> - pbssDescription); - psessionEntry->ftPEContext.pFTPreAuthReq-> - pbssDescription = NULL; - } - qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); - psessionEntry->ftPEContext.pFTPreAuthReq = NULL; - } - - if (psessionEntry->ftPEContext.pAddBssReq) { - qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); - psessionEntry->ftPEContext.pAddBssReq = NULL; - } - - if (psessionEntry->ftPEContext.pAddStaReq) { - qdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); - psessionEntry->ftPEContext.pAddStaReq = NULL; - } - - /* The session is being deleted, cleanup the contents */ - qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); - - /* Delete the session created while handling pre-auth response */ - if (pReAssocSessionEntry) { - /* If we have successful pre-auth response, then we would have - * created a session on which reassoc request will be sent - */ - if (pReAssocSessionEntry->valid && - pReAssocSessionEntry->limSmeState == - eLIM_SME_WT_REASSOC_STATE) { - QDF_TRACE(QDF_MODULE_ID_PE, - QDF_TRACE_LEVEL_DEBUG, - FL("Deleting Preauth session(%d)"), - pReAssocSessionEntry->peSessionId); - pe_delete_session(pMac, pReAssocSessionEntry); - } - } -} - void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal pMac) { /* Wrapper function to cleanup all FT sessions */ @@ -188,186 +119,6 @@ void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry) qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); } -/* - * lim_process_ft_pre_auth_req() - process ft pre auth req - * - * @mac_ctx: global mac ctx - * @msg: pointer to message - * - * In this function, we process the FT Pre Auth Req: - * We receive Pre-Auth, suspend link, register a call back. In the call back, - * we will need to accept frames from the new bssid. Send out the auth req to - * new AP. Start timer and when the timer is done or if we receive the Auth - * response. We change channel. Resume link - * - * Return: value to indicate if buffer was consumed - */ -int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) -{ - int buf_consumed = false; - tpPESession session; - uint8_t session_id; - tpSirFTPreAuthReq ft_pre_auth_req = (tSirFTPreAuthReq *) msg->bodyptr; - - if (NULL == ft_pre_auth_req) { - lim_log(mac_ctx, LOGE, FL("tSirFTPreAuthReq is NULL")); - return buf_consumed; - } - - /* Get the current session entry */ - session = pe_find_session_by_bssid(mac_ctx, - ft_pre_auth_req->currbssId, - &session_id); - if (session == NULL) { - lim_log(mac_ctx, LOGE, - FL("Unable to find session for the bssid" - MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId)); - /* Post the FT Pre Auth Response to SME */ - lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, - session); - /* - * return FALSE, since the Pre-Auth Req will be freed in - * limPostFTPreAuthRsp on failure - */ - return buf_consumed; - } - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(session)) { - lim_log(mac_ctx, LOGE, FL("session is not in STA mode")); - buf_consumed = true; - return buf_consumed; - } - - /* Can set it only after sending auth */ - session->ftPEContext.ftPreAuthStatus = eSIR_FAILURE; - session->ftPEContext.ftPreAuthSession = true; - - /* Indicate that this is the session on which preauth is being done */ - if (session->ftPEContext.pFTPreAuthReq) { - if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { - qdf_mem_free( - session->ftPEContext.pFTPreAuthReq->pbssDescription); - session->ftPEContext.pFTPreAuthReq->pbssDescription = - NULL; - } - qdf_mem_free(session->ftPEContext.pFTPreAuthReq); - session->ftPEContext.pFTPreAuthReq = NULL; - } - - /* We need information from the Pre-Auth Req. Lets save that */ - session->ftPEContext.pFTPreAuthReq = ft_pre_auth_req; - - lim_log(mac_ctx, LOG1, FL("PRE Auth ft_ies_length=%02x%02x%02x"), - session->ftPEContext.pFTPreAuthReq->ft_ies[0], - session->ftPEContext.pFTPreAuthReq->ft_ies[1], - session->ftPEContext.pFTPreAuthReq->ft_ies[2]); -#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ - lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PRE_AUTH_REQ_EVENT, - session, 0, 0); -#endif - - /* Dont need to suspend if APs are in same channel */ - if (session->currentOperChannel != - session->ftPEContext.pFTPreAuthReq->preAuthchannelNum) { - /* Need to suspend link only if the channels are different */ - lim_log(mac_ctx, LOG2, - FL("Performing pre-auth on diff channel(session %p)"), - session); - lim_send_preauth_scan_offload(mac_ctx, session->peSessionId, - session->ftPEContext.pFTPreAuthReq); - } else { - lim_log(mac_ctx, LOG2, - FL("Performing pre-auth on same channel (session %p)"), - session); - /* We are in the same channel. Perform pre-auth */ - lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, - session); - } - - return buf_consumed; -} - -/*------------------------------------------------------------------ - * Send the Auth1 - * Receive back Auth2 - *------------------------------------------------------------------*/ -void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, - uint32_t *data, tpPESession psessionEntry) -{ - tSirMacAuthFrameBody authFrame; - - if (NULL == psessionEntry) { - PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL"));) - return; - } - - if (psessionEntry->is11Rconnection && - psessionEntry->ftPEContext.pFTPreAuthReq) { - /* Only 11r assoc has FT IEs */ - if (psessionEntry->ftPEContext.pFTPreAuthReq->ft_ies == NULL) { - lim_log(pMac, LOGE, - FL("FTIEs for Auth Req Seq 1 is absent")); - goto preauth_fail; - } - } - - if (status != QDF_STATUS_SUCCESS) { - lim_log(pMac, LOGE, - FL(" Change channel not successful for FT pre-auth")); - goto preauth_fail; - } - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return; - } - lim_log(pMac, LOG2, "Entered wait auth2 state for FT (old session %p)", - psessionEntry); - if (psessionEntry->is11Rconnection) { - /* Now we are on the right channel and need to send out Auth1 and - * receive Auth2 - */ - authFrame.authAlgoNumber = eSIR_FT_AUTH; - } else { - /* Will need to make isESEconnection a enum may be for further - * improvements to this to match this algorithm number - */ - authFrame.authAlgoNumber = eSIR_OPEN_SYSTEM; - } - authFrame.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1; - authFrame.authStatusCode = 0; - - /* Start timer here to come back to operating channel */ - pMac->lim.limTimers.gLimFTPreAuthRspTimer.sessionId = - psessionEntry->peSessionId; - if (TX_SUCCESS != - tx_timer_activate(&pMac->lim.limTimers.gLimFTPreAuthRspTimer)) { - lim_log(pMac, LOGE, FL("FT Auth Rsp Timer Start Failed")); - goto preauth_fail; - } - MTRACE(mac_trace(pMac, TRACE_CODE_TIMER_ACTIVATE, - psessionEntry->peSessionId, eLIM_FT_PREAUTH_RSP_TIMER)); - - lim_log(pMac, LOG1, FL("FT Auth Rsp Timer Started")); -#ifdef FEATURE_WLAN_DIAG_SUPPORT - lim_diag_event_report(pMac, WLAN_PE_DIAG_ROAM_AUTH_START_EVENT, - pMac->lim.pSessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); -#endif - - lim_send_auth_mgmt_frame(pMac, &authFrame, - psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId, - LIM_NO_WEP_IN_FC, psessionEntry, false); - - return; - -preauth_fail: - lim_handle_ft_pre_auth_rsp(pMac, eSIR_FAILURE, NULL, 0, psessionEntry); - return; -} - /*------------------------------------------------------------------ * * Create the new Add Bss Req to the new AP. @@ -942,272 +693,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, qdf_mem_free(pBeaconStruct); } -/*------------------------------------------------------------------ - * - * Setup the session and the add bss req for the pre-auth AP. - * - *------------------------------------------------------------------*/ -tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, - tpPESession psessionEntry) -{ - tpPESession pftSessionEntry = NULL; - uint8_t sessionId = 0; - - pftSessionEntry = - pe_find_session_by_bssid(pMac, psessionEntry->limReAssocbssId, - &sessionId); - if (pftSessionEntry == NULL) { - PELOGE(lim_log(pMac, LOGE, - FL - ("Unable to find session for the following bssid")); - ) - lim_print_mac_addr(pMac, psessionEntry->limReAssocbssId, LOGE); - return eSIR_FAILURE; - } - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return eSIR_FAILURE; - } - - if (psessionEntry->ftPEContext.pFTPreAuthReq && - psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription) { - lim_fill_ft_session(pMac, - psessionEntry->ftPEContext.pFTPreAuthReq-> - pbssDescription, pftSessionEntry, - psessionEntry); - - lim_ft_prepare_add_bss_req(pMac, false, pftSessionEntry, - psessionEntry->ftPEContext.pFTPreAuthReq-> - pbssDescription); - } - - return eSIR_SUCCESS; -} - -/*------------------------------------------------------------------ - * Resume Link Call Back - *------------------------------------------------------------------*/ -void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, QDF_STATUS status, - tpPESession psessionEntry) -{ - if (NULL == psessionEntry || - NULL == psessionEntry->ftPEContext.pFTPreAuthReq) - return; - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return; - } - - if (psessionEntry->ftPEContext.ftPreAuthStatus == eSIR_SUCCESS) { - psessionEntry->ftPEContext.ftPreAuthStatus = - lim_ft_setup_auth_session(pMac, psessionEntry); - } - /* Post the FT Pre Auth Response to SME */ - lim_post_ft_pre_auth_rsp(pMac, psessionEntry->ftPEContext.ftPreAuthStatus, - psessionEntry->ftPEContext.saved_auth_rsp, - psessionEntry->ftPEContext.saved_auth_rsp_length, - psessionEntry); -} - -/* - * lim_post_ft_pre_auth_rsp() - post ft pre auth response to SME. - * - * @mac_ctx: global mac ctx - * @status: status code to post in auth rsp - * @auth_rsp: pointer to auth rsp FT ie - * @auth_rsp_length: len of the IE field - * @session: pe session - * - * post pre auth response to SME. - * - * Return: void - */ -void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, - tSirRetStatus status, - uint8_t *auth_rsp, - uint16_t auth_rsp_length, - tpPESession session) -{ - tpSirFTPreAuthRsp ft_pre_auth_rsp; - tSirMsgQ mmh_msg; - uint16_t rsp_len = sizeof(tSirFTPreAuthRsp); - - ft_pre_auth_rsp = (tpSirFTPreAuthRsp) qdf_mem_malloc(rsp_len); - if (NULL == ft_pre_auth_rsp) { - lim_log(mac_ctx, LOGE, "Failed to allocate memory"); - QDF_ASSERT(ft_pre_auth_rsp != NULL); - return; - } - qdf_mem_zero(ft_pre_auth_rsp, rsp_len); - - lim_log(mac_ctx, LOG1, FL("Auth Rsp = %p"), ft_pre_auth_rsp); - if (session) { - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(session)) { - lim_log(mac_ctx, LOGE, - FL("session is not in STA mode")); - qdf_mem_free(ft_pre_auth_rsp); - return; - } - ft_pre_auth_rsp->smeSessionId = session->smeSessionId; - /* The bssid of the AP we are sending Auth1 to. */ - if (session->ftPEContext.pFTPreAuthReq) - sir_copy_mac_addr(ft_pre_auth_rsp->preAuthbssId, - session->ftPEContext.pFTPreAuthReq->preAuthbssId); - } - - ft_pre_auth_rsp->messageType = eWNI_SME_FT_PRE_AUTH_RSP; - ft_pre_auth_rsp->length = (uint16_t) rsp_len; - ft_pre_auth_rsp->status = status; - - /* Attach the auth response now back to SME */ - ft_pre_auth_rsp->ft_ies_length = 0; - if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { - /* Only 11r assoc has FT IEs */ - qdf_mem_copy(ft_pre_auth_rsp->ft_ies, - auth_rsp, auth_rsp_length); - ft_pre_auth_rsp->ft_ies_length = auth_rsp_length; - } - - if (status != eSIR_SUCCESS) { - /* - * Ensure that on Pre-Auth failure the cached Pre-Auth Req and - * other allocated memory is freed up before returning. - */ - lim_log(mac_ctx, LOG1, "Pre-Auth Failed, Cleanup!"); - lim_ft_cleanup(mac_ctx, session); - } - - mmh_msg.type = ft_pre_auth_rsp->messageType; - mmh_msg.bodyptr = ft_pre_auth_rsp; - mmh_msg.bodyval = 0; - - lim_log(mac_ctx, LOG1, FL("Posted Auth Rsp to SME with status of 0x%x"), - status); -#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ - if (status == eSIR_SUCCESS) - lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PREAUTH_DONE, - session, status, 0); -#endif - lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT); -} - -/*------------------------------------------------------------------ - * - * Send the FT Pre Auth Response to SME whenever we have a status - * ready to be sent to SME - * - * SME will be the one to send it up to the supplicant to receive - * FTIEs which will be required for Reassoc Req. - * - *------------------------------------------------------------------*/ -void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, - uint8_t *auth_rsp, uint16_t auth_rsp_length, - tpPESession psessionEntry) -{ - tpPESession pftSessionEntry = NULL; - uint8_t sessionId = 0; - tpSirBssDescription pbssDescription = NULL; -#ifdef FEATURE_WLAN_DIAG_SUPPORT - lim_diag_event_report(pMac, WLAN_PE_DIAG_PRE_AUTH_RSP_EVENT, - psessionEntry, (uint16_t) status, 0); -#endif - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return; - } - - /* Save the status of pre-auth */ - psessionEntry->ftPEContext.ftPreAuthStatus = status; - - /* Save the auth rsp, so we can send it to - * SME once we resume link - */ - psessionEntry->ftPEContext.saved_auth_rsp_length = 0; - if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { - qdf_mem_copy(psessionEntry->ftPEContext.saved_auth_rsp, - auth_rsp, auth_rsp_length); - psessionEntry->ftPEContext.saved_auth_rsp_length = - auth_rsp_length; - } - - if (!psessionEntry->ftPEContext.pFTPreAuthReq || - !psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription) { - lim_log(pMac, LOGE, - FL("pFTPreAuthReq or pbssDescription is NULL")); - return; - } - - /* Create FT session for the re-association at this point */ - if (psessionEntry->ftPEContext.ftPreAuthStatus == eSIR_SUCCESS) { - pbssDescription = - psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription; - lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1); - pftSessionEntry = - pe_create_session(pMac, pbssDescription->bssId, - &sessionId, pMac->lim.maxStation, - psessionEntry->bssType); - if (pftSessionEntry == NULL) { - lim_log(pMac, LOGE, FL( - "Session not created for pre-auth 11R AP")); - status = eSIR_FAILURE; - psessionEntry->ftPEContext.ftPreAuthStatus = status; - goto send_rsp; - } - pftSessionEntry->peSessionId = sessionId; - pftSessionEntry->smeSessionId = psessionEntry->smeSessionId; - sir_copy_mac_addr(pftSessionEntry->selfMacAddr, - psessionEntry->selfMacAddr); - sir_copy_mac_addr(pftSessionEntry->limReAssocbssId, - pbssDescription->bssId); - pftSessionEntry->bssType = psessionEntry->bssType; - - if (pftSessionEntry->bssType == eSIR_INFRASTRUCTURE_MODE) { - pftSessionEntry->limSystemRole = eLIM_STA_ROLE; - } else if (pftSessionEntry->bssType == eSIR_BTAMP_AP_MODE) { - pftSessionEntry->limSystemRole = eLIM_BT_AMP_STA_ROLE; - } else { - lim_log(pMac, LOGE, FL("Invalid bss type")); - } - pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState; - qdf_mem_copy(&(pftSessionEntry->htConfig), - &(psessionEntry->htConfig), - sizeof(psessionEntry->htConfig)); - pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - - PELOGE(lim_log - (pMac, LOG1, "%s:created session (%p) with id = %d", - __func__, pftSessionEntry, - pftSessionEntry->peSessionId); - ) - - /* Update the ReAssoc BSSID of the current session */ - sir_copy_mac_addr(psessionEntry->limReAssocbssId, - pbssDescription->bssId); - lim_print_mac_addr(pMac, psessionEntry->limReAssocbssId, LOG1); - } -send_rsp: - if (psessionEntry->currentOperChannel != - psessionEntry->ftPEContext.pFTPreAuthReq->preAuthchannelNum) { - /* Need to move to the original AP channel */ - lim_process_abort_scan_ind(pMac, psessionEntry->peSessionId, - psessionEntry->ftPEContext.pFTPreAuthReq->scan_id, - PREAUTH_REQUESTOR_ID); - } else { - lim_log(pMac, LOG1, - "Pre auth on same channel as connected AP channel %d", - psessionEntry->ftPEContext.pFTPreAuthReq-> - preAuthchannelNum); - lim_ft_process_pre_auth_result(pMac, status, psessionEntry); - } -} - /*------------------------------------------------------------------ * * This function handles the 11R Reassoc Req from SME @@ -1352,81 +837,6 @@ void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, return; } -/* - * lim_process_ft_preauth_rsp_timeout() - process ft preauth rsp timeout - * - * @mac_ctx: global mac ctx - * - * This function is called if preauth response is not received from the AP - * within this timeout while FT in progress - * - * Return: void - */ -void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx) -{ - tpPESession session; - - /* - * We have failed pre auth. We need to resume link and get back on - * home channel - */ - lim_log(mac_ctx, LOGE, FL("FT Pre-Auth Time Out!!!!")); - session = pe_find_session_by_session_id(mac_ctx, - mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); - if (NULL == session) { - lim_log(mac_ctx, LOGE, - FL("Session Does not exist for given sessionID")); - return; - } - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(session)) { - lim_log(mac_ctx, LOGE, FL("session is not in STA mode")); - return; - } - - /* Reset the flag to indicate preauth request session */ - session->ftPEContext.ftPreAuthSession = false; - - if (NULL == session->ftPEContext.pFTPreAuthReq) { - lim_log(mac_ctx, LOGE, - FL("pFTPreAuthReq is NULL. Auth Rsp might already be posted to SME and ftcleanup done! sessionId:%d"), - mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); - return; - } - - /* - * To handle the race condition where we recieve preauth rsp after - * timer has expired. - */ - if (true == - session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed) { - lim_log(mac_ctx, LOGE, - FL("Auth rsp already posted to SME (session %p)"), - session); - return; - } else { - /* - * Here we are sending preauth rsp with failure state - * and which is forwarded to SME. Now, if we receive an preauth - * resp from AP with success it would create a FT pesession, but - * will be dropped in SME leaving behind the pesession. Mark - * Preauth rsp processed so that any rsp from AP is dropped in - * lim_process_auth_frame_no_session. - */ - lim_log(mac_ctx, LOG1, - FL("Auth rsp not yet posted to SME (session %p)"), - session); - session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed = true; - } - - /* - * Attempted at Pre-Auth and failed. If we are off channel. We need - * to get back to home channel - */ - lim_handle_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, session); -} - /*------------------------------------------------------------------ * * This function is called to process the update key request from SME @@ -1599,6 +1009,7 @@ lim_ft_send_aggr_qos_rsp(tpAniSirGlobal pMac, uint8_t rspReqd, lim_send_sme_aggr_qos_rsp(pMac, rsp, smesessionId); return; } + void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) { tpAggrAddTsParams pAggrQosRspMsg = NULL; @@ -1662,6 +1073,7 @@ void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg) } return; } + tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf) { tSirMsgQ msg; @@ -1843,135 +1255,3 @@ tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf return eSIR_SUCCESS; } -/** - * lim_send_preauth_scan_offload() - Send scan command to handle preauth. - * - * @mac_ctx: Pointer to Global MAC structure - * @session_id: pe session id - * @ft_preauth_req: Preauth request with parameters - * - * Builds a single channel scan request and sends it to WMA. - * Scan dwell time is the time allocated to go to preauth candidate - * channel for auth frame exchange. - * - * Return: Status of sending message to WMA. - */ -QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, - uint8_t session_id, - tSirFTPreAuthReq *ft_preauth_req) -{ - tSirScanOffloadReq *scan_offload_req; - tSirRetStatus rc = eSIR_SUCCESS; - tSirMsgQ msg; - - scan_offload_req = qdf_mem_malloc(sizeof(tSirScanOffloadReq)); - if (NULL == scan_offload_req) { - lim_log(mac_ctx, LOGE, - FL("Memory allocation failed for pScanOffloadReq")); - return QDF_STATUS_E_NOMEM; - } - - qdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq)); - - msg.type = WMA_START_SCAN_OFFLOAD_REQ; - msg.bodyptr = scan_offload_req; - msg.bodyval = 0; - - qdf_mem_copy((uint8_t *) &scan_offload_req->selfMacAddr.bytes, - (uint8_t *) ft_preauth_req->self_mac_addr, - sizeof(tSirMacAddr)); - - qdf_mem_copy((uint8_t *) &scan_offload_req->bssId.bytes, - (uint8_t *) ft_preauth_req->currbssId, - sizeof(tSirMacAddr)); - scan_offload_req->scanType = eSIR_PASSIVE_SCAN; - /* - * P2P_SCAN_TYPE_LISTEN tells firmware to allow mgt frames to/from - * mac address that is not of connected AP. - */ - scan_offload_req->p2pScanType = P2P_SCAN_TYPE_LISTEN; - scan_offload_req->restTime = 0; - scan_offload_req->minChannelTime = LIM_FT_PREAUTH_SCAN_TIME; - scan_offload_req->maxChannelTime = LIM_FT_PREAUTH_SCAN_TIME; - scan_offload_req->sessionId = session_id; - scan_offload_req->channelList.numChannels = 1; - scan_offload_req->channelList.channelNumber[0] = - ft_preauth_req->preAuthchannelNum; - wma_get_scan_id(&ft_preauth_req->scan_id); - scan_offload_req->scan_id = ft_preauth_req->scan_id; - scan_offload_req->scan_requestor_id = PREAUTH_REQUESTOR_ID; - - lim_log(mac_ctx, LOG1, - FL("Scan request: duration %u, session %hu, chan %hu"), - scan_offload_req->maxChannelTime, session_id, - ft_preauth_req->preAuthchannelNum); - - rc = wma_post_ctrl_msg(mac_ctx, &msg); - if (rc != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGE, FL("START_SCAN_OFFLOAD failed %u"), rc); - qdf_mem_free(scan_offload_req); - return QDF_STATUS_E_FAILURE; - } - - return QDF_STATUS_SUCCESS; -} - - -/** - * lim_preauth_scan_event_handler() - Process firmware preauth scan events - * - * @mac_ctx:Pointer to global MAC structure - * @event: Scan event - * @session_id: session entry - * @scan_id: scan id from WMA scan event. - * - * If scan event signifies failure or successful completion, operation - * is complete. - * If scan event signifies that STA is on foreign channel, send auth frame - * - * Return: void - */ - -void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, - enum lim_scan_event_type event, - uint8_t session_id, - uint32_t scan_id) -{ - tpPESession session_entry; - - session_entry = pe_find_session_by_session_id(mac_ctx, session_id); - if (session_entry == NULL) { - lim_log(mac_ctx, LOGE, - FL("SessionId:%d Session Does not exist"), session_id); - return; - } - - switch (event) { - case LIM_SCAN_EVENT_START_FAILED: - /* Scan command is rejected by firmware */ - lim_log(mac_ctx, LOGE, FL("Failed to start preauth scan")); - lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, - session_entry); - return; - - case LIM_SCAN_EVENT_COMPLETED: - /* - * Scan either completed succesfully or or got terminated - * after successful auth, or timed out. Either way, STA - * is back to home channel. Data traffic can continue. - */ - lim_ft_process_pre_auth_result(mac_ctx, QDF_STATUS_SUCCESS, - session_entry); - break; - - case LIM_SCAN_EVENT_FOREIGN_CHANNEL: - /* Sta is on candidate channel. Send auth */ - lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, - session_entry); - break; - default: - /* Don't print message for scan events that are ignored */ - break; - } -} - diff --git a/core/mac/src/pe/lim/lim_ft_preauth.c b/core/mac/src/pe/lim/lim_ft_preauth.c new file mode 100644 index 000000000000..0bc94f9c1fbb --- /dev/null +++ b/core/mac/src/pe/lim/lim_ft_preauth.c @@ -0,0 +1,782 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: lim_ft_preauth.c + * + * Pre-Authentication implementation for host based roaming + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "wma.h" + +/** + * lim_ft_cleanup_pre_auth_info() - Cleanup preauth related information + * @pMac: Global MAC Context + * @psessionEntry: PE Session + * + * This routine is called to free the FT context, session and other + * information used during preauth operation. + * + * Return: None + */ +void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, + tpPESession psessionEntry) +{ + tpPESession pReAssocSessionEntry = NULL; + uint8_t sessionId = 0; + + if (!psessionEntry) { + lim_log(pMac, LOGE, FL("psessionEntry is NULL")); + return; + } + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return; + } + + if (psessionEntry->ftPEContext.pFTPreAuthReq) { + pReAssocSessionEntry = + pe_find_session_by_bssid(pMac, + psessionEntry->ftPEContext. + pFTPreAuthReq->preAuthbssId, + &sessionId); + + lim_log(pMac, LOG1, FL("Freeing pFTPreAuthReq= %p"), + psessionEntry->ftPEContext.pFTPreAuthReq); + if (psessionEntry->ftPEContext.pFTPreAuthReq-> + pbssDescription) { + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq-> + pbssDescription); + psessionEntry->ftPEContext.pFTPreAuthReq-> + pbssDescription = NULL; + } + qdf_mem_free(psessionEntry->ftPEContext.pFTPreAuthReq); + psessionEntry->ftPEContext.pFTPreAuthReq = NULL; + } + + if (psessionEntry->ftPEContext.pAddBssReq) { + qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); + psessionEntry->ftPEContext.pAddBssReq = NULL; + } + + if (psessionEntry->ftPEContext.pAddStaReq) { + qdf_mem_free(psessionEntry->ftPEContext.pAddStaReq); + psessionEntry->ftPEContext.pAddStaReq = NULL; + } + + /* The session is being deleted, cleanup the contents */ + qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); + + /* Delete the session created while handling pre-auth response */ + if (pReAssocSessionEntry) { + /* If we have successful pre-auth response, then we would have + * created a session on which reassoc request will be sent + */ + if (pReAssocSessionEntry->valid && + pReAssocSessionEntry->limSmeState == + eLIM_SME_WT_REASSOC_STATE) { + QDF_TRACE(QDF_MODULE_ID_PE, + QDF_TRACE_LEVEL_DEBUG, + FL("Deleting Preauth session(%d)"), + pReAssocSessionEntry->peSessionId); + pe_delete_session(pMac, pReAssocSessionEntry); + } + } +} + +/* + * lim_process_ft_pre_auth_req() - process ft pre auth req + * + * @mac_ctx: global mac ctx + * @msg: pointer to message + * + * In this function, we process the FT Pre Auth Req: + * We receive Pre-Auth, suspend link, register a call back. In the call back, + * we will need to accept frames from the new bssid. Send out the auth req to + * new AP. Start timer and when the timer is done or if we receive the Auth + * response. We change channel. Resume link + * + * Return: value to indicate if buffer was consumed + */ +int lim_process_ft_pre_auth_req(tpAniSirGlobal mac_ctx, tpSirMsgQ msg) +{ + int buf_consumed = false; + tpPESession session; + uint8_t session_id; + tpSirFTPreAuthReq ft_pre_auth_req = (tSirFTPreAuthReq *) msg->bodyptr; + + if (NULL == ft_pre_auth_req) { + lim_log(mac_ctx, LOGE, FL("tSirFTPreAuthReq is NULL")); + return buf_consumed; + } + + /* Get the current session entry */ + session = pe_find_session_by_bssid(mac_ctx, + ft_pre_auth_req->currbssId, + &session_id); + if (session == NULL) { + lim_log(mac_ctx, LOGE, + FL("Unable to find session for the bssid" + MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(ft_pre_auth_req->currbssId)); + /* Post the FT Pre Auth Response to SME */ + lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, + session); + /* + * return FALSE, since the Pre-Auth Req will be freed in + * limPostFTPreAuthRsp on failure + */ + return buf_consumed; + } + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(session)) { + lim_log(mac_ctx, LOGE, FL("session is not in STA mode")); + buf_consumed = true; + return buf_consumed; + } + + /* Can set it only after sending auth */ + session->ftPEContext.ftPreAuthStatus = eSIR_FAILURE; + session->ftPEContext.ftPreAuthSession = true; + + /* Indicate that this is the session on which preauth is being done */ + if (session->ftPEContext.pFTPreAuthReq) { + if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { + qdf_mem_free( + session->ftPEContext.pFTPreAuthReq->pbssDescription); + session->ftPEContext.pFTPreAuthReq->pbssDescription = + NULL; + } + qdf_mem_free(session->ftPEContext.pFTPreAuthReq); + session->ftPEContext.pFTPreAuthReq = NULL; + } + + /* We need information from the Pre-Auth Req. Lets save that */ + session->ftPEContext.pFTPreAuthReq = ft_pre_auth_req; + + lim_log(mac_ctx, LOG1, FL("PRE Auth ft_ies_length=%02x%02x%02x"), + session->ftPEContext.pFTPreAuthReq->ft_ies[0], + session->ftPEContext.pFTPreAuthReq->ft_ies[1], + session->ftPEContext.pFTPreAuthReq->ft_ies[2]); +#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ + lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PRE_AUTH_REQ_EVENT, + session, 0, 0); +#endif + + /* Dont need to suspend if APs are in same channel */ + if (session->currentOperChannel != + session->ftPEContext.pFTPreAuthReq->preAuthchannelNum) { + /* Need to suspend link only if the channels are different */ + lim_log(mac_ctx, LOG2, + FL("Performing pre-auth on diff channel(session %p)"), + session); + lim_send_preauth_scan_offload(mac_ctx, session->peSessionId, + session->ftPEContext.pFTPreAuthReq); + } else { + lim_log(mac_ctx, LOG2, + FL("Performing pre-auth on same channel (session %p)"), + session); + /* We are in the same channel. Perform pre-auth */ + lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, + session); + } + + return buf_consumed; +} + +/** + * lim_perform_ft_pre_auth() - Perform preauthentication + * @pMac: Global MAC Context + * @status: Status Code + * @data: pre-auth data + * @psessionEntry: PE Session + * + * This routine will trigger the sending of authentication frame + * to the peer. + * + * Return: None + */ +void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, + uint32_t *data, tpPESession psessionEntry) +{ + tSirMacAuthFrameBody authFrame; + + if (NULL == psessionEntry) { + PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL"));) + return; + } + + if (psessionEntry->is11Rconnection && + psessionEntry->ftPEContext.pFTPreAuthReq) { + /* Only 11r assoc has FT IEs */ + if (psessionEntry->ftPEContext.pFTPreAuthReq->ft_ies == NULL) { + lim_log(pMac, LOGE, + FL("FTIEs for Auth Req Seq 1 is absent")); + goto preauth_fail; + } + } + + if (status != QDF_STATUS_SUCCESS) { + lim_log(pMac, LOGE, + FL(" Change channel not successful for FT pre-auth")); + goto preauth_fail; + } + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return; + } + lim_log(pMac, LOG2, "Entered wait auth2 state for FT (old session %p)", + psessionEntry); + if (psessionEntry->is11Rconnection) { + /* Now we are on the right channel and need to send out Auth1 + * and receive Auth2 + */ + authFrame.authAlgoNumber = eSIR_FT_AUTH; + } else { + /* Will need to make isESEconnection a enum may be for further + * improvements to this to match this algorithm number + */ + authFrame.authAlgoNumber = eSIR_OPEN_SYSTEM; + } + authFrame.authTransactionSeqNumber = SIR_MAC_AUTH_FRAME_1; + authFrame.authStatusCode = 0; + + /* Start timer here to come back to operating channel */ + pMac->lim.limTimers.gLimFTPreAuthRspTimer.sessionId = + psessionEntry->peSessionId; + if (TX_SUCCESS != + tx_timer_activate(&pMac->lim.limTimers.gLimFTPreAuthRspTimer)) { + lim_log(pMac, LOGE, FL("FT Auth Rsp Timer Start Failed")); + goto preauth_fail; + } + MTRACE(mac_trace(pMac, TRACE_CODE_TIMER_ACTIVATE, + psessionEntry->peSessionId, eLIM_FT_PREAUTH_RSP_TIMER)); + + lim_log(pMac, LOG1, FL("FT Auth Rsp Timer Started")); +#ifdef FEATURE_WLAN_DIAG_SUPPORT + lim_diag_event_report(pMac, WLAN_PE_DIAG_ROAM_AUTH_START_EVENT, + pMac->lim.pSessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); +#endif + + lim_send_auth_mgmt_frame(pMac, &authFrame, + psessionEntry->ftPEContext.pFTPreAuthReq->preAuthbssId, + LIM_NO_WEP_IN_FC, psessionEntry, false); + + return; + +preauth_fail: + lim_handle_ft_pre_auth_rsp(pMac, eSIR_FAILURE, NULL, 0, psessionEntry); + return; +} + +/** + * lim_ft_setup_auth_session() - Fill the FT Session + * @pMac: Global MAC Context + * @psessionEntry: PE Session + * + * Setup the session and the add bss req for the pre-auth AP. + * + * Return: Success or Failure Status + */ +tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, + tpPESession psessionEntry) +{ + tpPESession pftSessionEntry = NULL; + uint8_t sessionId = 0; + + pftSessionEntry = + pe_find_session_by_bssid(pMac, psessionEntry->limReAssocbssId, + &sessionId); + if (pftSessionEntry == NULL) { + lim_log(pMac, LOGE, FL("No session found for bssid")); + lim_print_mac_addr(pMac, psessionEntry->limReAssocbssId, LOGE); + return eSIR_FAILURE; + } + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return eSIR_FAILURE; + } + + if (psessionEntry->ftPEContext.pFTPreAuthReq && + psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription) { + lim_fill_ft_session(pMac, + psessionEntry->ftPEContext.pFTPreAuthReq-> + pbssDescription, pftSessionEntry, + psessionEntry); + + lim_ft_prepare_add_bss_req(pMac, false, pftSessionEntry, + psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription); + } + + return eSIR_SUCCESS; +} + +/** + * lim_ft_process_pre_auth_result() - Process the Auth frame + * @pMac: Global MAC context + * @status: Status code + * psessionEntry: PE Session + * + * Return: None + */ +void lim_ft_process_pre_auth_result(tpAniSirGlobal pMac, QDF_STATUS status, + tpPESession psessionEntry) +{ + if (NULL == psessionEntry || + NULL == psessionEntry->ftPEContext.pFTPreAuthReq) + return; + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return; + } + + if (psessionEntry->ftPEContext.ftPreAuthStatus == eSIR_SUCCESS) { + psessionEntry->ftPEContext.ftPreAuthStatus = + lim_ft_setup_auth_session(pMac, psessionEntry); + } + /* Post the FT Pre Auth Response to SME */ + lim_post_ft_pre_auth_rsp(pMac, + psessionEntry->ftPEContext.ftPreAuthStatus, + psessionEntry->ftPEContext.saved_auth_rsp, + psessionEntry->ftPEContext.saved_auth_rsp_length, + psessionEntry); +} + +/** + * lim_handle_ft_pre_auth_rsp() - Handle the Auth response + * @pMac: Global MAC Context + * @status: Status Code + * @auth_rsp: Auth Response + * @auth_rsp_length: Auth response length + * @psessionEntry: PE Session + * + * Send the FT Pre Auth Response to SME whenever we have a status + * ready to be sent to SME + * + * SME will be the one to send it up to the supplicant to receive + * FTIEs which will be required for Reassoc Req. + * + * @Return: None + */ +void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, + uint8_t *auth_rsp, uint16_t auth_rsp_length, + tpPESession psessionEntry) +{ + tpPESession pftSessionEntry = NULL; + uint8_t sessionId = 0; + tpSirBssDescription pbssDescription = NULL; +#ifdef FEATURE_WLAN_DIAG_SUPPORT + lim_diag_event_report(pMac, WLAN_PE_DIAG_PRE_AUTH_RSP_EVENT, + psessionEntry, (uint16_t) status, 0); +#endif + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return; + } + + /* Save the status of pre-auth */ + psessionEntry->ftPEContext.ftPreAuthStatus = status; + + /* Save the auth rsp, so we can send it to + * SME once we resume link + */ + psessionEntry->ftPEContext.saved_auth_rsp_length = 0; + if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { + qdf_mem_copy(psessionEntry->ftPEContext.saved_auth_rsp, + auth_rsp, auth_rsp_length); + psessionEntry->ftPEContext.saved_auth_rsp_length = + auth_rsp_length; + } + + if (!psessionEntry->ftPEContext.pFTPreAuthReq || + !psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription) { + lim_log(pMac, LOGE, + FL("pFTPreAuthReq or pbssDescription is NULL")); + return; + } + + /* Create FT session for the re-association at this point */ + if (psessionEntry->ftPEContext.ftPreAuthStatus == eSIR_SUCCESS) { + pbssDescription = + psessionEntry->ftPEContext.pFTPreAuthReq->pbssDescription; + lim_print_mac_addr(pMac, pbssDescription->bssId, LOG1); + pftSessionEntry = + pe_create_session(pMac, pbssDescription->bssId, + &sessionId, pMac->lim.maxStation, + psessionEntry->bssType); + if (pftSessionEntry == NULL) { + lim_log(pMac, LOGE, FL( + "Session not created for pre-auth 11R AP")); + status = eSIR_FAILURE; + psessionEntry->ftPEContext.ftPreAuthStatus = status; + goto send_rsp; + } + pftSessionEntry->peSessionId = sessionId; + pftSessionEntry->smeSessionId = psessionEntry->smeSessionId; + sir_copy_mac_addr(pftSessionEntry->selfMacAddr, + psessionEntry->selfMacAddr); + sir_copy_mac_addr(pftSessionEntry->limReAssocbssId, + pbssDescription->bssId); + pftSessionEntry->bssType = psessionEntry->bssType; + + if (pftSessionEntry->bssType == eSIR_INFRASTRUCTURE_MODE) + pftSessionEntry->limSystemRole = eLIM_STA_ROLE; + else if (pftSessionEntry->bssType == eSIR_BTAMP_AP_MODE) + pftSessionEntry->limSystemRole = eLIM_BT_AMP_STA_ROLE; + else + lim_log(pMac, LOGE, FL("Invalid bss type")); + pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState; + qdf_mem_copy(&(pftSessionEntry->htConfig), + &(psessionEntry->htConfig), + sizeof(psessionEntry->htConfig)); + pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; + + lim_log(pMac, LOG1, FL("created session (%p) with id = %d"), + pftSessionEntry, pftSessionEntry->peSessionId); + + /* Update the ReAssoc BSSID of the current session */ + sir_copy_mac_addr(psessionEntry->limReAssocbssId, + pbssDescription->bssId); + lim_print_mac_addr(pMac, psessionEntry->limReAssocbssId, LOG1); + } +send_rsp: + if (psessionEntry->currentOperChannel != + psessionEntry->ftPEContext.pFTPreAuthReq->preAuthchannelNum) { + /* Need to move to the original AP channel */ + lim_process_abort_scan_ind(pMac, psessionEntry->peSessionId, + psessionEntry->ftPEContext.pFTPreAuthReq->scan_id, + PREAUTH_REQUESTOR_ID); + } else { + lim_log(pMac, LOG1, + "Pre auth on same channel as connected AP channel %d", + psessionEntry->ftPEContext.pFTPreAuthReq-> + preAuthchannelNum); + lim_ft_process_pre_auth_result(pMac, status, psessionEntry); + } +} + +/* + * lim_process_ft_preauth_rsp_timeout() - process ft preauth rsp timeout + * + * @mac_ctx: global mac ctx + * + * This function is called if preauth response is not received from the AP + * within this timeout while FT in progress + * + * Return: void + */ +void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal mac_ctx) +{ + tpPESession session; + + /* + * We have failed pre auth. We need to resume link and get back on + * home channel + */ + lim_log(mac_ctx, LOGE, FL("FT Pre-Auth Time Out!!!!")); + session = pe_find_session_by_session_id(mac_ctx, + mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); + if (NULL == session) { + lim_log(mac_ctx, LOGE, + FL("Session Does not exist for given sessionID")); + return; + } + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(session)) { + lim_log(mac_ctx, LOGE, FL("session is not in STA mode")); + return; + } + + /* Reset the flag to indicate preauth request session */ + session->ftPEContext.ftPreAuthSession = false; + + if (NULL == session->ftPEContext.pFTPreAuthReq) { + /* Auth Rsp might already be posted to SME and ftcleanup done */ + lim_log(mac_ctx, LOGE, FL("pFTPreAuthReq is NULL sessionId:%d"), + mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer.sessionId); + return; + } + + /* + * To handle the race condition where we recieve preauth rsp after + * timer has expired. + */ + if (true == + session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed) { + lim_log(mac_ctx, LOGE, + FL("Auth rsp already posted to SME (session %p)"), + session); + return; + } else { + /* + * Here we are sending preauth rsp with failure state + * and which is forwarded to SME. Now, if we receive an preauth + * resp from AP with success it would create a FT pesession, but + * will be dropped in SME leaving behind the pesession. Mark + * Preauth rsp processed so that any rsp from AP is dropped in + * lim_process_auth_frame_no_session. + */ + lim_log(mac_ctx, LOG1, + FL("Auth rsp not yet posted to SME (session %p)"), + session); + session->ftPEContext.pFTPreAuthReq->bPreAuthRspProcessed = true; + } + + /* + * Attempted at Pre-Auth and failed. If we are off channel. We need + * to get back to home channel + */ + lim_handle_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, session); +} + +/* + * lim_post_ft_pre_auth_rsp() - post ft pre auth response to SME. + * + * @mac_ctx: global mac ctx + * @status: status code to post in auth rsp + * @auth_rsp: pointer to auth rsp FT ie + * @auth_rsp_length: len of the IE field + * @session: pe session + * + * post pre auth response to SME. + * + * Return: void + */ +void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx, + tSirRetStatus status, + uint8_t *auth_rsp, + uint16_t auth_rsp_length, + tpPESession session) +{ + tpSirFTPreAuthRsp ft_pre_auth_rsp; + tSirMsgQ mmh_msg; + uint16_t rsp_len = sizeof(tSirFTPreAuthRsp); + + ft_pre_auth_rsp = (tpSirFTPreAuthRsp) qdf_mem_malloc(rsp_len); + if (NULL == ft_pre_auth_rsp) { + lim_log(mac_ctx, LOGE, "Failed to allocate memory"); + QDF_ASSERT(ft_pre_auth_rsp != NULL); + return; + } + qdf_mem_zero(ft_pre_auth_rsp, rsp_len); + + lim_log(mac_ctx, LOG1, FL("Auth Rsp = %p"), ft_pre_auth_rsp); + if (session) { + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(session)) { + lim_log(mac_ctx, LOGE, + FL("session is not in STA mode")); + qdf_mem_free(ft_pre_auth_rsp); + return; + } + ft_pre_auth_rsp->smeSessionId = session->smeSessionId; + /* The bssid of the AP we are sending Auth1 to. */ + if (session->ftPEContext.pFTPreAuthReq) + sir_copy_mac_addr(ft_pre_auth_rsp->preAuthbssId, + session->ftPEContext.pFTPreAuthReq->preAuthbssId); + } + + ft_pre_auth_rsp->messageType = eWNI_SME_FT_PRE_AUTH_RSP; + ft_pre_auth_rsp->length = (uint16_t) rsp_len; + ft_pre_auth_rsp->status = status; + + /* Attach the auth response now back to SME */ + ft_pre_auth_rsp->ft_ies_length = 0; + if ((auth_rsp != NULL) && (auth_rsp_length < MAX_FTIE_SIZE)) { + /* Only 11r assoc has FT IEs */ + qdf_mem_copy(ft_pre_auth_rsp->ft_ies, + auth_rsp, auth_rsp_length); + ft_pre_auth_rsp->ft_ies_length = auth_rsp_length; + } + + if (status != eSIR_SUCCESS) { + /* + * Ensure that on Pre-Auth failure the cached Pre-Auth Req and + * other allocated memory is freed up before returning. + */ + lim_log(mac_ctx, LOG1, "Pre-Auth Failed, Cleanup!"); + lim_ft_cleanup(mac_ctx, session); + } + + mmh_msg.type = ft_pre_auth_rsp->messageType; + mmh_msg.bodyptr = ft_pre_auth_rsp; + mmh_msg.bodyval = 0; + + lim_log(mac_ctx, LOG1, FL("Posted Auth Rsp to SME with status of 0x%x"), + status); +#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ + if (status == eSIR_SUCCESS) + lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_PREAUTH_DONE, + session, status, 0); +#endif + lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT); +} + +/** + * lim_send_preauth_scan_offload() - Send scan command to handle preauth. + * + * @mac_ctx: Pointer to Global MAC structure + * @session_id: pe session id + * @ft_preauth_req: Preauth request with parameters + * + * Builds a single channel scan request and sends it to WMA. + * Scan dwell time is the time allocated to go to preauth candidate + * channel for auth frame exchange. + * + * Return: Status of sending message to WMA. + */ +QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, + uint8_t session_id, + tSirFTPreAuthReq *ft_preauth_req) +{ + tSirScanOffloadReq *scan_offload_req; + tSirRetStatus rc = eSIR_SUCCESS; + tSirMsgQ msg; + + scan_offload_req = qdf_mem_malloc(sizeof(tSirScanOffloadReq)); + if (NULL == scan_offload_req) { + lim_log(mac_ctx, LOGE, + FL("Memory allocation failed for pScanOffloadReq")); + return QDF_STATUS_E_NOMEM; + } + + qdf_mem_zero(scan_offload_req, sizeof(tSirScanOffloadReq)); + + msg.type = WMA_START_SCAN_OFFLOAD_REQ; + msg.bodyptr = scan_offload_req; + msg.bodyval = 0; + + qdf_mem_copy((uint8_t *) &scan_offload_req->selfMacAddr.bytes, + (uint8_t *) ft_preauth_req->self_mac_addr, + sizeof(tSirMacAddr)); + + qdf_mem_copy((uint8_t *) &scan_offload_req->bssId.bytes, + (uint8_t *) ft_preauth_req->currbssId, + sizeof(tSirMacAddr)); + scan_offload_req->scanType = eSIR_PASSIVE_SCAN; + /* + * P2P_SCAN_TYPE_LISTEN tells firmware to allow mgt frames to/from + * mac address that is not of connected AP. + */ + scan_offload_req->p2pScanType = P2P_SCAN_TYPE_LISTEN; + scan_offload_req->restTime = 0; + scan_offload_req->minChannelTime = LIM_FT_PREAUTH_SCAN_TIME; + scan_offload_req->maxChannelTime = LIM_FT_PREAUTH_SCAN_TIME; + scan_offload_req->sessionId = session_id; + scan_offload_req->channelList.numChannels = 1; + scan_offload_req->channelList.channelNumber[0] = + ft_preauth_req->preAuthchannelNum; + wma_get_scan_id(&ft_preauth_req->scan_id); + scan_offload_req->scan_id = ft_preauth_req->scan_id; + scan_offload_req->scan_requestor_id = PREAUTH_REQUESTOR_ID; + + lim_log(mac_ctx, LOG1, + FL("Scan request: duration %u, session %hu, chan %hu"), + scan_offload_req->maxChannelTime, session_id, + ft_preauth_req->preAuthchannelNum); + + rc = wma_post_ctrl_msg(mac_ctx, &msg); + if (rc != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, FL("START_SCAN_OFFLOAD failed %u"), rc); + qdf_mem_free(scan_offload_req); + return QDF_STATUS_E_FAILURE; + } + + return QDF_STATUS_SUCCESS; +} + +/** + * lim_preauth_scan_event_handler() - Process firmware preauth scan events + * + * @mac_ctx:Pointer to global MAC structure + * @event: Scan event + * @session_id: session entry + * @scan_id: scan id from WMA scan event. + * + * If scan event signifies failure or successful completion, operation + * is complete. + * If scan event signifies that STA is on foreign channel, send auth frame + * + * Return: void + */ + +void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, + enum lim_scan_event_type event, + uint8_t session_id, + uint32_t scan_id) +{ + tpPESession session_entry; + + session_entry = pe_find_session_by_session_id(mac_ctx, session_id); + if (session_entry == NULL) { + lim_log(mac_ctx, LOGE, + FL("SessionId:%d Session Does not exist"), session_id); + return; + } + + switch (event) { + case LIM_SCAN_EVENT_START_FAILED: + /* Scan command is rejected by firmware */ + lim_log(mac_ctx, LOGE, FL("Failed to start preauth scan")); + lim_post_ft_pre_auth_rsp(mac_ctx, eSIR_FAILURE, NULL, 0, + session_entry); + return; + + case LIM_SCAN_EVENT_COMPLETED: + /* + * Scan either completed succesfully or or got terminated + * after successful auth, or timed out. Either way, STA + * is back to home channel. Data traffic can continue. + */ + lim_ft_process_pre_auth_result(mac_ctx, QDF_STATUS_SUCCESS, + session_entry); + break; + + case LIM_SCAN_EVENT_FOREIGN_CHANNEL: + /* Sta is on candidate channel. Send auth */ + lim_perform_ft_pre_auth(mac_ctx, QDF_STATUS_SUCCESS, NULL, + session_entry); + break; + default: + /* Don't print message for scan events that are ignored */ + break; + } +} + -- cgit v1.2.3 From c3843188c5b6b154f356c30151d8c0b28dcaaf33 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 10 Feb 2016 17:23:59 -0800 Subject: qcacld-3.0: Move Host based roaming MLM code into a separate file Separate the host based roaming MLM code into a separate file to maintain it easily across different projects CRs-Fixed: 978905 Change-Id: I1fad25ffbaa49bb2380c32ca9612ad46e3bca65c --- Kbuild | 1 + core/mac/src/pe/include/lim_ft.h | 4 + core/mac/src/pe/lim/lim_ft.c | 144 ---- core/mac/src/pe/lim/lim_process_mlm_host_roam.c | 744 +++++++++++++++++++++ core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 126 ---- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 429 ------------ 6 files changed, 749 insertions(+), 699 deletions(-) create mode 100644 core/mac/src/pe/lim/lim_process_mlm_host_roam.c diff --git a/Kbuild b/Kbuild index 7b13789bb13e..1578d0ccacc7 100755 --- a/Kbuild +++ b/Kbuild @@ -416,6 +416,7 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_deauth_frame.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_disassoc_frame.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_message_queue.o \ + $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_host_roam.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_req_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_rsp_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_probe_req_frame.o \ diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index 3f514877282c..2b40efc364bd 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -58,6 +58,10 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, uint8_t *auth_rsp, uint16_t auth_rsp_len, tpPESession psessionEntry); +void lim_process_mlm_reassoc_cnf(tpAniSirGlobal, uint32_t *); +void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, + tpSirMsgQ limMsgQ, tpPESession psessionEntry); +void lim_process_mlm_reassoc_req(tpAniSirGlobal, uint32_t *); void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, tpPESession psessionEntry); void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal pMac); diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index ad918d237540..f79494777954 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -693,150 +693,6 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, qdf_mem_free(pBeaconStruct); } -/*------------------------------------------------------------------ - * - * This function handles the 11R Reassoc Req from SME - * - *------------------------------------------------------------------*/ -void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, - tpPESession psessionEntry) -{ - uint8_t smeSessionId = 0; - uint16_t transactionId = 0; - uint8_t chanNum = 0; - tLimMlmReassocReq *pMlmReassocReq; - uint16_t caps; - uint32_t val; - tSirMsgQ msgQ; - tSirRetStatus retCode; - uint32_t teleBcnEn = 0; - - chanNum = psessionEntry->currentOperChannel; - lim_get_session_info(pMac, (uint8_t *) pMsgBuf, &smeSessionId, - &transactionId); - psessionEntry->smeSessionId = smeSessionId; - psessionEntry->transactionId = transactionId; - -#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ - lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOCIATING, psessionEntry, 0, - 0); -#endif - - /* Nothing to be done if the session is not in STA mode */ - if (!LIM_IS_STA_ROLE(psessionEntry)) { - lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return; - } - - if (NULL == psessionEntry->ftPEContext.pAddBssReq) { - lim_log(pMac, LOGE, FL("pAddBssReq is NULL")); - return; - } - pMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); - if (NULL == pMlmReassocReq) { - lim_log(pMac, LOGE, - FL("call to AllocateMemory failed for mlmReassocReq")); - return; - } - - qdf_mem_copy(pMlmReassocReq->peerMacAddr, - psessionEntry->bssId, sizeof(tSirMacAddr)); - - if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - (uint32_t *) &pMlmReassocReq->reassocFailureTimeout) - != eSIR_SUCCESS) { - /** - * Could not get ReassocFailureTimeout value - * from CFG. Log error. - */ - lim_log(pMac, LOGE, - FL("could not retrieve ReassocFailureTimeout value")); - qdf_mem_free(pMlmReassocReq); - return; - } - - if (cfg_get_capability_info(pMac, &caps, psessionEntry) != eSIR_SUCCESS) { - /** - * Could not get Capabilities value - * from CFG. Log error. - */ - lim_log(pMac, LOGE, FL("could not retrieve Capabilities value")); - qdf_mem_free(pMlmReassocReq); - return; - } - pMlmReassocReq->capabilityInfo = caps; - - /* Update PE sessionId */ - pMlmReassocReq->sessionId = psessionEntry->peSessionId; - - /* If telescopic beaconing is enabled, set listen interval - to WNI_CFG_TELE_BCN_MAX_LI - */ - if (wlan_cfg_get_int(pMac, WNI_CFG_TELE_BCN_WAKEUP_EN, &teleBcnEn) != - eSIR_SUCCESS) { - lim_log(pMac, LOGP, - FL("Couldn't get WNI_CFG_TELE_BCN_WAKEUP_EN")); - qdf_mem_free(pMlmReassocReq); - return; - } - - if (teleBcnEn) { - if (wlan_cfg_get_int(pMac, WNI_CFG_TELE_BCN_MAX_LI, &val) != - eSIR_SUCCESS) { - /** - * Could not get ListenInterval value - * from CFG. Log error. - */ - lim_log(pMac, LOGE, - FL("could not retrieve ListenInterval")); - qdf_mem_free(pMlmReassocReq); - return; - } - } else { - if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &val) != - eSIR_SUCCESS) { - /** - * Could not get ListenInterval value - * from CFG. Log error. - */ - lim_log(pMac, LOGE, - FL("could not retrieve ListenInterval")); - qdf_mem_free(pMlmReassocReq); - return; - } - } - if (lim_set_link_state - (pMac, eSIR_LINK_PREASSOC_STATE, psessionEntry->bssId, - psessionEntry->selfMacAddr, NULL, NULL) != eSIR_SUCCESS) { - qdf_mem_free(pMlmReassocReq); - return; - } - - pMlmReassocReq->listenInterval = (uint16_t) val; - psessionEntry->pLimMlmReassocReq = pMlmReassocReq; - - /* we need to defer the message until we get the response back from HAL */ - SET_LIM_PROCESS_DEFD_MESGS(pMac, false); - - msgQ.type = SIR_HAL_ADD_BSS_REQ; - msgQ.reserved = 0; - msgQ.bodyptr = psessionEntry->ftPEContext.pAddBssReq; - msgQ.bodyval = 0; - - lim_log(pMac, LOG1, FL("Sending SIR_HAL_ADD_BSS_REQ...")); - MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); - retCode = wma_post_ctrl_msg(pMac, &msgQ); - if (eSIR_SUCCESS != retCode) { - qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); - lim_log(pMac, LOGE, - FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), - retCode); - } - - psessionEntry->ftPEContext.pAddBssReq = NULL; - return; -} - /*------------------------------------------------------------------ * * This function is called to process the update key request from SME diff --git a/core/mac/src/pe/lim/lim_process_mlm_host_roam.c b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c new file mode 100644 index 000000000000..5fcea0264fbc --- /dev/null +++ b/core/mac/src/pe/lim/lim_process_mlm_host_roam.c @@ -0,0 +1,744 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: lim_process_mlm_host_roam.c + * + * Host based roaming MLM implementation + */ +#include "cds_api.h" +#include "wni_cfg.h" +#include "ani_global.h" +#include "sir_api.h" +#include "sir_params.h" +#include "cfg_api.h" + +#include "sch_api.h" +#include "utils_api.h" +#include "lim_utils.h" +#include "lim_assoc_utils.h" +#include "lim_prop_exts_utils.h" +#include "lim_security_utils.h" +#include "lim_send_messages.h" +#include "lim_send_messages.h" +#include "lim_session_utils.h" +#include +#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM +#include "host_diag_core_log.h" +#endif +#include "wma_if.h" +#include "rrm_api.h" +static void lim_handle_sme_reaasoc_result(tpAniSirGlobal, tSirResultCodes, + uint16_t, tpPESession); +/** + * lim_process_mlm_reassoc_req() - process mlm reassoc request. + * + * @mac_ctx: pointer to Global MAC structure + * @msg: pointer to the MLM message buffer + * + * This function is called to process MLM_REASSOC_REQ message + * from SME + * + * Return: None + */ +void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) +{ + uint8_t channel, sec_ch_offset; + struct tLimPreAuthNode *auth_node; + tLimMlmReassocReq *reassoc_req; + tLimMlmReassocCnf reassoc_cnf; + tpPESession session; + + if (msg == NULL) { + lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); + return; + } + + reassoc_req = (tLimMlmReassocReq *) msg; + session = pe_find_session_by_session_id(mac_ctx, + reassoc_req->sessionId); + if (NULL == session) { + lim_log(mac_ctx, LOGE, + FL("Session Does not exist for given sessionId %d"), + reassoc_req->sessionId); + qdf_mem_free(reassoc_req); + return; + } + + lim_log(mac_ctx, LOG1, + FL("ReAssoc Req on session %d role %d mlm %d " MAC_ADDRESS_STR), + reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session), + session->limMlmState, MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); + + if ((LIM_IS_AP_ROLE(session) || + LIM_IS_BT_AMP_AP_ROLE(session)) || + (session->limMlmState != + eLIM_MLM_LINK_ESTABLISHED_STATE)) { + /* + * Received Reassoc request in invalid state or + * in AP role.Return Reassoc confirm with Invalid + * parameters code. + */ + + lim_log(mac_ctx, LOGW, + FL("unexpect msg,state %Xrole %d,MAC" MAC_ADDRESS_STR), + session->limMlmState, GET_LIM_SYSTEM_ROLE(session), + MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); + lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState); + reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; + reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + goto end; + } + + if (session->pLimMlmReassocReq) + qdf_mem_free(session->pLimMlmReassocReq); + + /* + * Hold Re-Assoc request as part of Session, knock-out mac_ctx + * Hold onto Reassoc request parameters + */ + session->pLimMlmReassocReq = reassoc_req; + + /* See if we have pre-auth context with new AP */ + auth_node = lim_search_pre_auth_list(mac_ctx, session->limReAssocbssId); + + if (!auth_node && (qdf_mem_cmp(reassoc_req->peerMacAddr, + session->bssId, + sizeof(tSirMacAddr)))) { + /* + * Either pre-auth context does not exist AND + * we are not reassociating with currently + * associated AP. + * Return Reassoc confirm with not authenticated + */ + reassoc_cnf.resultCode = eSIR_SME_STA_NOT_AUTHENTICATED; + reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + + goto end; + } + /* assign the sessionId to the timer object */ + mac_ctx->lim.limTimers.gLimReassocFailureTimer.sessionId = + reassoc_req->sessionId; + session->limPrevMlmState = session->limMlmState; + session->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; + MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, session->peSessionId, + session->limMlmState)); + + /* Derive channel from BSS description and store it at CFG. */ + channel = session->limReassocChannelId; + sec_ch_offset = session->reAssocHtSecondaryChannelOffset; + + /* Apply previously set configuration at HW */ + lim_apply_configuration(mac_ctx, session); + + /* store the channel switch sessionEntry in the lim global var */ + session->channelChangeReasonCode = + LIM_SWITCH_CHANNEL_REASSOC; + + /* Switch channel to the new Operating channel for Reassoc */ + lim_set_channel(mac_ctx, channel, + session->ch_center_freq_seg0, + session->ch_center_freq_seg1, + session->ch_width, + session->maxTxPower, + session->peSessionId); + + return; +end: + reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + /* Update PE sessio Id */ + reassoc_cnf.sessionId = reassoc_req->sessionId; + /* Free up buffer allocated for reassocReq */ + qdf_mem_free(reassoc_req); + session->pLimReAssocReq = NULL; + lim_post_sme_message(mac_ctx, LIM_MLM_REASSOC_CNF, + (uint32_t *) &reassoc_cnf); +} + +/** + * lim_handle_sme_reaasoc_result() - Handle the reassoc result + * @pMac: Global MAC Context + * @resultCode: Result code + * @protStatusCode: Protocol Status Code + * @psessionEntry: PE Session + * + * This function is called to process reassoc failures + * upon receiving REASSOC_CNF with a failure code or + * MLM_REASSOC_CNF with a success code in case of STA role + * + * Return: None + */ +static void lim_handle_sme_reaasoc_result(tpAniSirGlobal pMac, + tSirResultCodes resultCode, uint16_t protStatusCode, + tpPESession psessionEntry) +{ + tpDphHashNode pStaDs = NULL; + uint8_t smesessionId; + uint16_t smetransactionId; + + if (psessionEntry == NULL) { + PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL "));) + return; + } + smesessionId = psessionEntry->smeSessionId; + smetransactionId = psessionEntry->transactionId; + if (resultCode != eSIR_SME_SUCCESS) { + pStaDs = + dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER, + &psessionEntry->dph.dphHashTable); + if (pStaDs != NULL) { + pStaDs->mlmStaContext.disassocReason = + eSIR_MAC_UNSPEC_FAILURE_REASON; + pStaDs->mlmStaContext.cleanupTrigger = + eLIM_JOIN_FAILURE; + pStaDs->mlmStaContext.resultCode = resultCode; + pStaDs->mlmStaContext.protStatusCode = protStatusCode; + lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); + /* Cleanup if add bss failed */ + if (psessionEntry->add_bss_failed) { + dph_delete_hash_entry(pMac, + pStaDs->staAddr, pStaDs->assocId, + &psessionEntry->dph.dphHashTable); + goto error; + } + return; + } + } +error: + /* Delete teh session if REASSOC failure occurred. */ + if (resultCode != eSIR_SME_SUCCESS) { + if (NULL != psessionEntry) { + pe_delete_session(pMac, psessionEntry); + psessionEntry = NULL; + } + } + lim_send_sme_join_reassoc_rsp(pMac, eWNI_SME_REASSOC_RSP, resultCode, + protStatusCode, psessionEntry, smesessionId, smetransactionId); +} + +/** + * lim_process_mlm_reassoc_cnf() - process mlm reassoc cnf msg + * + * @mac_ctx: Pointer to Global MAC structure + * @msg_buf: A pointer to the MLM message buffer + * + * This function is called to process MLM_REASSOC_CNF message from MLM State + * machine. + * + * @Return: void + */ +void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) +{ + tpPESession session; + tLimMlmReassocCnf *lim_mlm_reassoc_cnf; + + if (msg_buf == NULL) { + lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); + return; + } + lim_mlm_reassoc_cnf = (tLimMlmReassocCnf *) msg_buf; + session = pe_find_session_by_session_id(mac_ctx, + lim_mlm_reassoc_cnf->sessionId); + if (session == NULL) { + lim_log(mac_ctx, LOGE, + FL("session Does not exist for given session Id")); + return; + } + if ((session->limSmeState != eLIM_SME_WT_REASSOC_STATE) || + LIM_IS_AP_ROLE(session) || LIM_IS_BT_AMP_AP_ROLE(session)) { + /* + * Should not have received Reassocication confirm + * from MLM in other states OR on AP. + */ + lim_log(mac_ctx, LOGE, + FL("Rcv unexpected MLM_REASSOC_CNF role %d, sme 0x%X"), + GET_LIM_SYSTEM_ROLE(session), session->limSmeState); + return; + } + if (session->pLimReAssocReq) { + qdf_mem_free(session->pLimReAssocReq); + session->pLimReAssocReq = NULL; + } + + /* + * Upon Reassoc success or failure, freeup the cached preauth request, + * to ensure that channel switch is now allowed following any change in + * HT params. + */ + if (session->ftPEContext.pFTPreAuthReq) { + lim_log(mac_ctx, LOG1, FL("Freeing pFTPreAuthReq= %p"), + session->ftPEContext.pFTPreAuthReq); + if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { + qdf_mem_free( + session->ftPEContext.pFTPreAuthReq->pbssDescription); + session->ftPEContext.pFTPreAuthReq->pbssDescription = + NULL; + } + qdf_mem_free(session->ftPEContext.pFTPreAuthReq); + session->ftPEContext.pFTPreAuthReq = NULL; + session->ftPEContext.ftPreAuthSession = false; + } + +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + if (session->bRoamSynchInProgress) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress")); + session->bRoamSynchInProgress = false; + } +#endif + + lim_log(mac_ctx, LOG1, FL("Rcv MLM_REASSOC_CNF with result code %d"), + lim_mlm_reassoc_cnf->resultCode); + if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) { + /* Successful Reassociation */ + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + FL("*** Reassociated with new BSS ***")); + + session->limSmeState = eLIM_SME_LINK_EST_STATE; + MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, + session->peSessionId, session->limSmeState)); + + /* Need to send Reassoc rsp with Reassoc success to Host. */ + lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP, + lim_mlm_reassoc_cnf->resultCode, + lim_mlm_reassoc_cnf->protStatusCode, + session, session->smeSessionId, + session->transactionId); + } else if (lim_mlm_reassoc_cnf->resultCode + == eSIR_SME_REASSOC_REFUSED) { + /* + * Reassociation failure With the New AP but we still have the + * link with the Older AP + */ + session->limSmeState = eLIM_SME_LINK_EST_STATE; + MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, + session->peSessionId, session->limSmeState)); + + /* Need to send Reassoc rsp with Assoc failure to Host. */ + lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP, + lim_mlm_reassoc_cnf->resultCode, + lim_mlm_reassoc_cnf->protStatusCode, + session, session->smeSessionId, + session->transactionId); + } else { + /* Reassociation failure */ + session->limSmeState = eLIM_SME_JOIN_FAILURE_STATE; + MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, + session->peSessionId, session->limSmeState)); + /* Need to send Reassoc rsp with Assoc failure to Host. */ + lim_handle_sme_reaasoc_result(mac_ctx, + lim_mlm_reassoc_cnf->resultCode, + lim_mlm_reassoc_cnf->protStatusCode, + session); + } +} + +/** + * lim_process_sta_mlm_add_bss_rsp_ft() - Handle the ADD BSS response + * @pMac: Global MAC context + * @limMsgQ: ADD BSS Parameters + * @psessionEntry: PE Session + * + * Function to handle WMA_ADD_BSS_RSP, in FT reassoc state. + * Send ReAssociation Request. + * + *Return: None + */ +void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, + tpSirMsgQ limMsgQ, tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; /* keep sme */ + tpDphHashNode pStaDs = NULL; + tpAddStaParams pAddStaParams = NULL; + uint32_t listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF; + tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr; + uint32_t selfStaDot11Mode = 0; + + /* Sanity Checks */ + + if (pAddBssParams == NULL) { + PELOGE(lim_log(pMac, LOGE, FL("Invalid parameters"));) + goto end; + } + if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE != + psessionEntry->limMlmState) { + goto end; + } + + pStaDs = dph_add_hash_entry(pMac, pAddBssParams->bssId, + DPH_STA_HASH_INDEX_PEER, + &psessionEntry->dph.dphHashTable); + if (pStaDs == NULL) { + /* Could not add hash table entry */ + lim_log(pMac, LOGE, FL("could not add hash entry at DPH for")); + lim_print_mac_addr(pMac, pAddBssParams->staContext.staMac, + LOGE); + goto end; + } + /* Prepare and send Reassociation request frame */ + /* start reassoc timer. */ +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + if (psessionEntry->bRoamSynchInProgress != true) { +#endif + pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = + psessionEntry->peSessionId; + /* / Start reassociation failure timer */ + MTRACE(mac_trace + (pMac, TRACE_CODE_TIMER_ACTIVATE, + psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); + if (tx_timer_activate + (&pMac->lim.limTimers.gLimReassocFailureTimer) + != TX_SUCCESS) { + /* / Could not start reassoc failure timer. */ + /* Log error */ + lim_log(pMac, LOGP, + FL("could not start Reassoc failure timer")); + /* Return Reassoc confirm with */ + /* Resources Unavailable */ + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = + eSIR_MAC_UNSPEC_FAILURE_STATUS; + goto end; + } + pMac->lim.pSessionEntry = psessionEntry; + if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) { + /* Take a copy of reassoc request for retrying */ + pMac->lim.pSessionEntry->pLimMlmReassocRetryReq = + qdf_mem_malloc(sizeof(tLimMlmReassocReq)); + if (NULL == + pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) + goto end; + qdf_mem_set(pMac->lim.pSessionEntry-> + pLimMlmReassocRetryReq, + sizeof(tLimMlmReassocReq), 0); + qdf_mem_copy(pMac->lim.pSessionEntry-> + pLimMlmReassocRetryReq, + psessionEntry->pLimMlmReassocReq, + sizeof(tLimMlmReassocReq)); + } + pMac->lim.reAssocRetryAttempt = 0; + lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac, + psessionEntry-> + pLimMlmReassocReq, + psessionEntry); +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + } else { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + "LFR3:Do not activate timer and dont send the reassoc"); + } +#endif + psessionEntry->limPrevMlmState = psessionEntry->limMlmState; + psessionEntry->limMlmState = eLIM_MLM_WT_FT_REASSOC_RSP_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, + eLIM_MLM_WT_FT_REASSOC_RSP_STATE)); + PELOGE(lim_log + (pMac, LOG1, FL("Set the mlm state to %d session=%d"), + psessionEntry->limMlmState, psessionEntry->peSessionId); + ) + + psessionEntry->bssIdx = (uint8_t) pAddBssParams->bssIdx; + + /* Success, handle below */ + pStaDs->bssId = pAddBssParams->bssIdx; + /* STA Index(genr by HAL) for the BSS entry is stored here */ + pStaDs->staIndex = pAddBssParams->staContext.staIdx; + pStaDs->ucUcastSig = pAddBssParams->staContext.ucUcastSig; + pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig; + + rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower, + psessionEntry); + + pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); + if (NULL == pAddStaParams) { + lim_log(pMac, LOGP, + FL("Unable to allocate memory during ADD_STA")); + goto end; + } + qdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); + + /* / Add STA context at MAC HW (BMU, RHP & TFP) */ + qdf_mem_copy((uint8_t *) pAddStaParams->staMac, + (uint8_t *) psessionEntry->selfMacAddr, + sizeof(tSirMacAddr)); + + qdf_mem_copy((uint8_t *) pAddStaParams->bssId, + psessionEntry->bssId, sizeof(tSirMacAddr)); + + pAddStaParams->staType = STA_ENTRY_SELF; + pAddStaParams->status = QDF_STATUS_SUCCESS; + pAddStaParams->respReqd = 1; + + /* Update PE session ID */ + pAddStaParams->sessionId = psessionEntry->peSessionId; + pAddStaParams->smesessionId = psessionEntry->smeSessionId; + + /* This will indicate HAL to "allocate" a new STA index */ +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + if (psessionEntry->bRoamSynchInProgress != true) +#endif + pAddStaParams->staIdx = STA_INVALID_IDX; + pAddStaParams->updateSta = false; + + pAddStaParams->shortPreambleSupported = + (uint8_t) psessionEntry->beaconParams.fShortPreamble; + lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL, + false, psessionEntry, NULL); + + if (psessionEntry->htCapability) { + pAddStaParams->htCapable = psessionEntry->htCapability; + pAddStaParams->vhtCapable = psessionEntry->vhtCapability; + pAddStaParams->ch_width = psessionEntry->ch_width; + pAddStaParams->greenFieldCapable = + lim_get_ht_capability(pMac, eHT_GREENFIELD, + psessionEntry); + pAddStaParams->mimoPS = + lim_get_ht_capability(pMac, eHT_MIMO_POWER_SAVE, + psessionEntry); + pAddStaParams->rifsMode = + lim_get_ht_capability(pMac, eHT_RIFS_MODE, + psessionEntry); + pAddStaParams->lsigTxopProtection = + lim_get_ht_capability(pMac, eHT_LSIG_TXOP_PROTECTION, + psessionEntry); + pAddStaParams->maxAmpduDensity = + lim_get_ht_capability(pMac, eHT_MPDU_DENSITY, + psessionEntry); + pAddStaParams->maxAmpduSize = + lim_get_ht_capability(pMac, eHT_MAX_RX_AMPDU_FACTOR, + psessionEntry); + pAddStaParams->maxAmsduSize = + lim_get_ht_capability(pMac, eHT_MAX_AMSDU_LENGTH, + psessionEntry); + pAddStaParams->fDsssCckMode40Mhz = + lim_get_ht_capability(pMac, eHT_DSSS_CCK_MODE_40MHZ, + psessionEntry); + pAddStaParams->fShortGI20Mhz = + lim_get_ht_capability(pMac, eHT_SHORT_GI_20MHZ, + psessionEntry); + pAddStaParams->fShortGI40Mhz = + lim_get_ht_capability(pMac, eHT_SHORT_GI_40MHZ, + psessionEntry); + } + + if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &listenInterval) != + eSIR_SUCCESS) + lim_log(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL")); + pAddStaParams->listenInterval = (uint16_t) listenInterval; + + wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode); + pAddStaParams->encryptType = psessionEntry->encryptType; + pAddStaParams->maxTxPower = psessionEntry->maxTxPower; + + /* Lets save this for when we receive the Reassoc Rsp */ + psessionEntry->ftPEContext.pAddStaReq = pAddStaParams; + + if (pAddBssParams != NULL) { + qdf_mem_free(pAddBssParams); + pAddBssParams = NULL; + limMsgQ->bodyptr = NULL; + } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD + if (psessionEntry->bRoamSynchInProgress) { + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + "LFR3:Prep and save AddStaReq for post-assoc-rsp"); + lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp, + LIM_REASSOC, psessionEntry); + } +#endif + return; + +end: + /* Free up buffer allocated for reassocReq */ + if (psessionEntry != NULL) + if (psessionEntry->pLimMlmReassocReq != NULL) { + qdf_mem_free(psessionEntry->pLimMlmReassocReq); + psessionEntry->pLimMlmReassocReq = NULL; + } + + if (pAddBssParams != NULL) { + qdf_mem_free(pAddBssParams); + pAddBssParams = NULL; + limMsgQ->bodyptr = NULL; + } + + mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; + mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + /* Update PE session Id */ + if (psessionEntry != NULL) + mlmReassocCnf.sessionId = psessionEntry->peSessionId; + else + mlmReassocCnf.sessionId = 0; + + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); +} + +/** + * lim_process_mlm_ft_reassoc_req() - Handle the Reassoc request + * @pMac: Global MAC context + * @pMsgBuf: Buffer which holds the data + * @psessionEntry: PE Session + * + * This function handles the Reassoc Req from SME + * + * Return: None + */ +void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, + tpPESession psessionEntry) +{ + uint8_t smeSessionId = 0; + uint16_t transactionId = 0; + uint8_t chanNum = 0; + tLimMlmReassocReq *pMlmReassocReq; + uint16_t caps; + uint32_t val; + tSirMsgQ msgQ; + tSirRetStatus retCode; + uint32_t teleBcnEn = 0; + + chanNum = psessionEntry->currentOperChannel; + lim_get_session_info(pMac, (uint8_t *) pMsgBuf, &smeSessionId, + &transactionId); + psessionEntry->smeSessionId = smeSessionId; + psessionEntry->transactionId = transactionId; + +#ifdef FEATURE_WLAN_DIAG_SUPPORT_LIM /* FEATURE_WLAN_DIAG_SUPPORT */ + lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOCIATING, + psessionEntry, 0, 0); +#endif + + /* Nothing to be done if the session is not in STA mode */ + if (!LIM_IS_STA_ROLE(psessionEntry)) { + lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); + return; + } + + if (NULL == psessionEntry->ftPEContext.pAddBssReq) { + lim_log(pMac, LOGE, FL("pAddBssReq is NULL")); + return; + } + pMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); + if (NULL == pMlmReassocReq) { + lim_log(pMac, LOGE, + FL("call to AllocateMemory failed for mlmReassocReq")); + return; + } + + qdf_mem_copy(pMlmReassocReq->peerMacAddr, + psessionEntry->bssId, sizeof(tSirMacAddr)); + + if (wlan_cfg_get_int(pMac, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + (uint32_t *) &pMlmReassocReq->reassocFailureTimeout) + != eSIR_SUCCESS) { + /** + * Could not get ReassocFailureTimeout value + * from CFG. Log error. + */ + lim_log(pMac, LOGE, + FL("could not retrieve ReassocFailureTimeout value")); + qdf_mem_free(pMlmReassocReq); + return; + } + + if (cfg_get_capability_info(pMac, &caps, psessionEntry) != + eSIR_SUCCESS) { + /** + * Could not get Capabilities value + * from CFG. Log error. + */ + lim_log(pMac, LOGE, FL("could not get Capabilities value")); + qdf_mem_free(pMlmReassocReq); + return; + } + pMlmReassocReq->capabilityInfo = caps; + + /* Update PE sessionId */ + pMlmReassocReq->sessionId = psessionEntry->peSessionId; + + /* If telescopic beaconing is enabled, set listen interval + to WNI_CFG_TELE_BCN_MAX_LI + */ + if (wlan_cfg_get_int(pMac, WNI_CFG_TELE_BCN_WAKEUP_EN, &teleBcnEn) != + eSIR_SUCCESS) { + lim_log(pMac, LOGP, + FL("Couldn't get WNI_CFG_TELE_BCN_WAKEUP_EN")); + qdf_mem_free(pMlmReassocReq); + return; + } + + if (teleBcnEn) { + if (wlan_cfg_get_int(pMac, WNI_CFG_TELE_BCN_MAX_LI, &val) != + eSIR_SUCCESS) { + /** + * Could not get ListenInterval value + * from CFG. Log error. + */ + lim_log(pMac, LOGE, + FL("could not retrieve ListenInterval")); + qdf_mem_free(pMlmReassocReq); + return; + } + } else { + if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &val) != + eSIR_SUCCESS) { + /** + * Could not get ListenInterval value + * from CFG. Log error. + */ + lim_log(pMac, LOGE, + FL("could not retrieve ListenInterval")); + qdf_mem_free(pMlmReassocReq); + return; + } + } + if (lim_set_link_state + (pMac, eSIR_LINK_PREASSOC_STATE, psessionEntry->bssId, + psessionEntry->selfMacAddr, NULL, NULL) != eSIR_SUCCESS) { + qdf_mem_free(pMlmReassocReq); + return; + } + + pMlmReassocReq->listenInterval = (uint16_t) val; + psessionEntry->pLimMlmReassocReq = pMlmReassocReq; + + /* we need to defer the message until we get response back from HAL */ + SET_LIM_PROCESS_DEFD_MESGS(pMac, false); + + msgQ.type = SIR_HAL_ADD_BSS_REQ; + msgQ.reserved = 0; + msgQ.bodyptr = psessionEntry->ftPEContext.pAddBssReq; + msgQ.bodyval = 0; + + lim_log(pMac, LOG1, FL("Sending SIR_HAL_ADD_BSS_REQ...")); + MTRACE(mac_trace_msg_tx(pMac, psessionEntry->peSessionId, msgQ.type)); + retCode = wma_post_ctrl_msg(pMac, &msgQ); + if (eSIR_SUCCESS != retCode) { + qdf_mem_free(psessionEntry->ftPEContext.pAddBssReq); + lim_log(pMac, LOGE, + FL("Posting ADD_BSS_REQ to HAL failed, reason=%X"), + retCode); + } + + psessionEntry->ftPEContext.pAddBssReq = NULL; + return; +} + diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 22ea9129b71a..29bc4c61c773 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -54,7 +54,6 @@ static void lim_process_mlm_oem_data_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_join_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_auth_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_assoc_req(tpAniSirGlobal, uint32_t *); -static void lim_process_mlm_reassoc_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_disassoc_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_deauth_req(tpAniSirGlobal, uint32_t *); static void lim_process_mlm_set_keys_req(tpAniSirGlobal, uint32_t *); @@ -1458,131 +1457,6 @@ end: (uint32_t *) &mlm_assoc_cnf); } -/** - * lim_process_mlm_reassoc_req() - process mlm reassoc request. - * - * @mac_ctx: pointer to Global MAC structure - * @msg: pointer to the MLM message buffer - * - * This function is called to process MLM_REASSOC_REQ message - * from SME - * - * Return: None - */ -static void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg) -{ - uint8_t channel, sec_ch_offset; - struct tLimPreAuthNode *auth_node; - tLimMlmReassocReq *reassoc_req; - tLimMlmReassocCnf reassoc_cnf; - tpPESession session; - - if (msg == NULL) { - lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); - return; - } - - reassoc_req = (tLimMlmReassocReq *) msg; - session = pe_find_session_by_session_id(mac_ctx, - reassoc_req->sessionId); - if (NULL == session) { - lim_log(mac_ctx, LOGE, - FL("Session Does not exist for given sessionId %d"), - reassoc_req->sessionId); - qdf_mem_free(reassoc_req); - return; - } - - lim_log(mac_ctx, LOG1, - FL("Process ReAssoc Req on sessionID %d Systemrole %d mlmstate %d from: " MAC_ADDRESS_STR), - reassoc_req->sessionId, GET_LIM_SYSTEM_ROLE(session), - session->limMlmState, MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); - - if ((LIM_IS_AP_ROLE(session) || - LIM_IS_BT_AMP_AP_ROLE(session)) || - (session->limMlmState != - eLIM_MLM_LINK_ESTABLISHED_STATE)) { - /* - * Received Reassoc request in invalid state or - * in AP role.Return Reassoc confirm with Invalid - * parameters code. - */ - - lim_log(mac_ctx, LOGW, - FL("received unexpected MLM_REASSOC_CNF in state %X for role=%d, MAC addr= " MAC_ADDRESS_STR), - session->limMlmState, GET_LIM_SYSTEM_ROLE(session), - MAC_ADDR_ARRAY(reassoc_req->peerMacAddr)); - lim_print_mlm_state(mac_ctx, LOGW, session->limMlmState); - reassoc_cnf.resultCode = eSIR_SME_INVALID_PARAMETERS; - reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - goto end; - } - - if (session->pLimMlmReassocReq) - qdf_mem_free(session->pLimMlmReassocReq); - - /* - * Hold Re-Assoc request as part of Session, knock-out mac_ctx - * Hold onto Reassoc request parameters - */ - session->pLimMlmReassocReq = reassoc_req; - - /* See if we have pre-auth context with new AP */ - auth_node = lim_search_pre_auth_list(mac_ctx, session->limReAssocbssId); - - if (!auth_node && qdf_mem_cmp(reassoc_req->peerMacAddr, - session->bssId, - sizeof(tSirMacAddr))) { - /* - * Either pre-auth context does not exist AND - * we are not reassociating with currently - * associated AP. - * Return Reassoc confirm with not authenticated - */ - reassoc_cnf.resultCode = eSIR_SME_STA_NOT_AUTHENTICATED; - reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - - goto end; - } - /* assign the sessionId to the timer object */ - mac_ctx->lim.limTimers.gLimReassocFailureTimer.sessionId = - reassoc_req->sessionId; - session->limPrevMlmState = session->limMlmState; - session->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; - MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, session->peSessionId, - session->limMlmState)); - - /* Derive channel from BSS description and store it at CFG. */ - channel = session->limReassocChannelId; - sec_ch_offset = session->reAssocHtSecondaryChannelOffset; - - /* Apply previously set configuration at HW */ - lim_apply_configuration(mac_ctx, session); - - /* store the channel switch sessionEntry in the lim global var */ - session->channelChangeReasonCode = - LIM_SWITCH_CHANNEL_REASSOC; - - /* Switch channel to the new Operating channel for Reassoc */ - lim_set_channel(mac_ctx, channel, - session->ch_center_freq_seg0, - session->ch_center_freq_seg1, - session->ch_width, - session->maxTxPower, - session->peSessionId); - - return; -end: - reassoc_cnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - /* Update PE sessio Id */ - reassoc_cnf.sessionId = reassoc_req->sessionId; - /* Free up buffer allocated for reassocReq */ - qdf_mem_free(reassoc_req); - session->pLimReAssocReq = NULL; - lim_post_sme_message(mac_ctx, LIM_MLM_REASSOC_CNF, - (uint32_t *) &reassoc_cnf); -} - /** * lim_process_mlm_disassoc_req_ntf() - process disassoc request notification * diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index 611161efe83c..eab1d8ec5c20 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -54,9 +54,6 @@ static void lim_handle_sme_join_result(tpAniSirGlobal, tSirResultCodes, uint16_t, tpPESession); -static void lim_handle_sme_reaasoc_result(tpAniSirGlobal, tSirResultCodes, uint16_t, - tpPESession); - #ifdef FEATURE_OEM_DATA_SUPPORT void lim_process_mlm_oem_data_req_cnf(tpAniSirGlobal, uint32_t *); #endif @@ -65,7 +62,6 @@ void lim_process_mlm_auth_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_start_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_assoc_ind(tpAniSirGlobal, uint32_t *); void lim_process_mlm_assoc_cnf(tpAniSirGlobal, uint32_t *); -void lim_process_mlm_reassoc_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_reassoc_ind(tpAniSirGlobal, uint32_t *); void lim_process_mlm_set_keys_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_disassoc_ind(tpAniSirGlobal, uint32_t *); @@ -788,123 +784,6 @@ void lim_process_mlm_assoc_cnf(tpAniSirGlobal mac_ctx, } } -/** - * lim_process_mlm_reassoc_cnf() - process mlm reassoc cnf msg - * - * @mac_ctx: Pointer to Global MAC structure - * @msg_buf: A pointer to the MLM message buffer - * - * This function is called to process MLM_REASSOC_CNF message from MLM State - * machine. - * - * @Return: void - */ -void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf) -{ - tpPESession session; - tLimMlmReassocCnf *lim_mlm_reassoc_cnf; - - if (msg_buf == NULL) { - lim_log(mac_ctx, LOGE, FL("Buffer is Pointing to NULL")); - return; - } - lim_mlm_reassoc_cnf = (tLimMlmReassocCnf *) msg_buf; - session = pe_find_session_by_session_id(mac_ctx, - lim_mlm_reassoc_cnf->sessionId); - if (session == NULL) { - lim_log(mac_ctx, LOGE, - FL("session Does not exist for given session Id")); - return; - } - if ((session->limSmeState != eLIM_SME_WT_REASSOC_STATE) || - LIM_IS_AP_ROLE(session) || LIM_IS_BT_AMP_AP_ROLE(session)) { - /* - * Should not have received Reassocication confirm - * from MLM in other states OR on AP. - */ - lim_log(mac_ctx, LOGE, - FL("Rcv unexpected MLM_REASSOC_CNF in role %d, sme state 0x%X"), - GET_LIM_SYSTEM_ROLE(session), session->limSmeState); - return; - } - if (session->pLimReAssocReq) { - qdf_mem_free(session->pLimReAssocReq); - session->pLimReAssocReq = NULL; - } - - /* - * Upon Reassoc success or failure, freeup the cached preauth request, - * to ensure that channel switch is now allowed following any change in - * HT params. - */ - if (session->ftPEContext.pFTPreAuthReq) { - lim_log(mac_ctx, LOG1, FL("Freeing pFTPreAuthReq= %p"), - session->ftPEContext.pFTPreAuthReq); - if (session->ftPEContext.pFTPreAuthReq->pbssDescription) { - qdf_mem_free( - session->ftPEContext.pFTPreAuthReq->pbssDescription); - session->ftPEContext.pFTPreAuthReq->pbssDescription = - NULL; - } - qdf_mem_free(session->ftPEContext.pFTPreAuthReq); - session->ftPEContext.pFTPreAuthReq = NULL; - session->ftPEContext.ftPreAuthSession = false; - } - -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session->bRoamSynchInProgress) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress")); - session->bRoamSynchInProgress = false; - } -#endif - - lim_log(mac_ctx, LOG1, FL("Rcv MLM_REASSOC_CNF with result code %d"), - lim_mlm_reassoc_cnf->resultCode); - if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) { - /* Successful Reassociation */ - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - FL("*** Reassociated with new BSS ***")); - - session->limSmeState = eLIM_SME_LINK_EST_STATE; - MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, - session->peSessionId, session->limSmeState)); - - /* Need to send Reassoc rsp with Reassoc success to Host. */ - lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP, - lim_mlm_reassoc_cnf->resultCode, - lim_mlm_reassoc_cnf->protStatusCode, - session, session->smeSessionId, - session->transactionId); - } else if (lim_mlm_reassoc_cnf->resultCode - == eSIR_SME_REASSOC_REFUSED) { - /* - * Reassociation failure With the New AP but we still have the - * link with the Older AP - */ - session->limSmeState = eLIM_SME_LINK_EST_STATE; - MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, - session->peSessionId, session->limSmeState)); - - /* Need to send Reassoc rsp with Assoc failure to Host. */ - lim_send_sme_join_reassoc_rsp(mac_ctx, eWNI_SME_REASSOC_RSP, - lim_mlm_reassoc_cnf->resultCode, - lim_mlm_reassoc_cnf->protStatusCode, - session, session->smeSessionId, - session->transactionId); - } else { - /* Reassociation failure */ - session->limSmeState = eLIM_SME_JOIN_FAILURE_STATE; - MTRACE(mac_trace(mac_ctx, TRACE_CODE_SME_STATE, - session->peSessionId, session->limSmeState)); - /* Need to send Reassoc rsp with Assoc failure to Host. */ - lim_handle_sme_reaasoc_result(mac_ctx, - lim_mlm_reassoc_cnf->resultCode, - lim_mlm_reassoc_cnf->protStatusCode, - session); - } -} - /** * lim_fill_assoc_ind_params() - Initialize association indication * mac_ctx: Pointer to Global MAC structure @@ -1597,76 +1476,6 @@ error: prot_status_code, session_entry, sme_session_id, sme_trans_id); } -/** - * lim_handle_sme_reaasoc_result() - * - ***FUNCTION: - * This function is called to process reassoc failures - * upon receiving REASSOC_CNF with a failure code or - * MLM_REASSOC_CNF with a success code in case of STA role - * - ***LOGIC: - * - ***ASSUMPTIONS: - * - ***NOTE: - * - * @param pMac Pointer to Global MAC structure - * @param resultCode Failure code to be sent - * - * - * @return None - */ -static void -lim_handle_sme_reaasoc_result(tpAniSirGlobal pMac, tSirResultCodes resultCode, - uint16_t protStatusCode, tpPESession psessionEntry) -{ - tpDphHashNode pStaDs = NULL; - uint8_t smesessionId; - uint16_t smetransactionId; - - if (psessionEntry == NULL) { - PELOGE(lim_log(pMac, LOGE, FL("psessionEntry is NULL "));) - return; - } - smesessionId = psessionEntry->smeSessionId; - smetransactionId = psessionEntry->transactionId; - /* When associations is failed , delete the session created and pass NULL to limsendsmeJoinReassocRsp() */ - if (resultCode != eSIR_SME_SUCCESS) { - pStaDs = - dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER, - &psessionEntry->dph.dphHashTable); - if (pStaDs != NULL) { - pStaDs->mlmStaContext.disassocReason = - eSIR_MAC_UNSPEC_FAILURE_REASON; - pStaDs->mlmStaContext.cleanupTrigger = - eLIM_JOIN_FAILURE; - pStaDs->mlmStaContext.resultCode = resultCode; - pStaDs->mlmStaContext.protStatusCode = protStatusCode; - lim_cleanup_rx_path(pMac, pStaDs, psessionEntry); - /* Cleanup if add bss failed */ - if (psessionEntry->add_bss_failed) { - dph_delete_hash_entry(pMac, - pStaDs->staAddr, pStaDs->assocId, - &psessionEntry->dph.dphHashTable); - goto error; - } - return; - } - } -error: - /* Delete teh session if REASSOC failure occurred. */ - if (resultCode != eSIR_SME_SUCCESS) { - if (NULL != psessionEntry) { - pe_delete_session(pMac, psessionEntry); - psessionEntry = NULL; - } - } - lim_send_sme_join_reassoc_rsp(pMac, eWNI_SME_REASSOC_RSP, resultCode, - protStatusCode, psessionEntry, smesessionId, - smetransactionId); -} /*** end limHandleSmeReassocResult() ***/ - /** * lim_process_mlm_add_sta_rsp() * @@ -2670,244 +2479,6 @@ joinFailure: } -/*------------------------------------------------------------------------------------------ - * - * Function to handle WMA_ADD_BSS_RSP, in FT reassoc state. - * Function to Send ReAssociation Request. - * - * - ***------------------------------------------------------------------------------------------ - */ -static inline void -lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, - tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; /* keep sme */ - tpDphHashNode pStaDs = NULL; - tpAddStaParams pAddStaParams = NULL; - uint32_t listenInterval = WNI_CFG_LISTEN_INTERVAL_STADEF; - tpAddBssParams pAddBssParams = (tpAddBssParams) limMsgQ->bodyptr; - uint32_t selfStaDot11Mode = 0; - - /* Sanity Checks */ - - if (pAddBssParams == NULL) { - PELOGE(lim_log(pMac, LOGE, FL("Invalid parameters"));) - goto end; - } - if (eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE != - psessionEntry->limMlmState) { - goto end; - } - - pStaDs = dph_add_hash_entry(pMac, pAddBssParams->bssId, - DPH_STA_HASH_INDEX_PEER, - &psessionEntry->dph.dphHashTable); - if (pStaDs == NULL) { - /* Could not add hash table entry */ - PELOGE(lim_log - (pMac, LOGE, FL("could not add hash entry at DPH for ")); - ) - lim_print_mac_addr(pMac, pAddBssParams->staContext.staMac, - LOGE); - goto end; - } - /* Prepare and send Reassociation request frame */ - /* start reassoc timer. */ -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (psessionEntry->bRoamSynchInProgress != true) { -#endif - pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = - psessionEntry->peSessionId; - /* / Start reassociation failure timer */ - MTRACE(mac_trace - (pMac, TRACE_CODE_TIMER_ACTIVATE, - psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); - if (tx_timer_activate - (&pMac->lim.limTimers.gLimReassocFailureTimer) - != TX_SUCCESS) { - /* / Could not start reassoc failure timer. */ - /* Log error */ - lim_log(pMac, LOGP, - FL - ("could not start Reassociation failure timer")); - /* Return Reassoc confirm with */ - /* Resources Unavailable */ - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = - eSIR_MAC_UNSPEC_FAILURE_STATUS; - goto end; - } - pMac->lim.pSessionEntry = psessionEntry; - if (NULL == pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) { - /* Take a copy of reassoc request for retrying */ - pMac->lim.pSessionEntry->pLimMlmReassocRetryReq = - qdf_mem_malloc(sizeof(tLimMlmReassocReq)); - if (NULL == - pMac->lim.pSessionEntry->pLimMlmReassocRetryReq) - goto end; - qdf_mem_set(pMac->lim.pSessionEntry-> - pLimMlmReassocRetryReq, - sizeof(tLimMlmReassocReq), 0); - qdf_mem_copy(pMac->lim.pSessionEntry-> - pLimMlmReassocRetryReq, - psessionEntry->pLimMlmReassocReq, - sizeof(tLimMlmReassocReq)); - } - pMac->lim.reAssocRetryAttempt = 0; - lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac, - psessionEntry-> - pLimMlmReassocReq, - psessionEntry); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD -} else { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - "LFR3:Do not activate timer and dont send the reassoc req"); -} -#endif - psessionEntry->limPrevMlmState = psessionEntry->limMlmState; - psessionEntry->limMlmState = eLIM_MLM_WT_FT_REASSOC_RSP_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, - eLIM_MLM_WT_FT_REASSOC_RSP_STATE)); - PELOGE(lim_log - (pMac, LOG1, FL("Set the mlm state to %d session=%d"), - psessionEntry->limMlmState, psessionEntry->peSessionId); - ) - - psessionEntry->bssIdx = (uint8_t) pAddBssParams->bssIdx; - - /* Success, handle below */ - pStaDs->bssId = pAddBssParams->bssIdx; - /* STA Index(genr by HAL) for the BSS entry is stored here */ - pStaDs->staIndex = pAddBssParams->staContext.staIdx; - pStaDs->ucUcastSig = pAddBssParams->staContext.ucUcastSig; - pStaDs->ucBcastSig = pAddBssParams->staContext.ucBcastSig; - - rrm_cache_mgmt_tx_power(pMac, pAddBssParams->txMgmtPower, psessionEntry); - - pAddStaParams = qdf_mem_malloc(sizeof(tAddStaParams)); - if (NULL == pAddStaParams) { - lim_log(pMac, LOGP, - FL("Unable to allocate memory during ADD_STA")); - goto end; - } - qdf_mem_set((uint8_t *) pAddStaParams, sizeof(tAddStaParams), 0); - - /* / Add STA context at MAC HW (BMU, RHP & TFP) */ - qdf_mem_copy((uint8_t *) pAddStaParams->staMac, - (uint8_t *) psessionEntry->selfMacAddr, - sizeof(tSirMacAddr)); - - qdf_mem_copy((uint8_t *) pAddStaParams->bssId, - psessionEntry->bssId, sizeof(tSirMacAddr)); - - pAddStaParams->staType = STA_ENTRY_SELF; - pAddStaParams->status = QDF_STATUS_SUCCESS; - pAddStaParams->respReqd = 1; - - /* Update PE session ID */ - pAddStaParams->sessionId = psessionEntry->peSessionId; - pAddStaParams->smesessionId = psessionEntry->smeSessionId; - - /* This will indicate HAL to "allocate" a new STA index */ -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (psessionEntry->bRoamSynchInProgress != true) -#endif - pAddStaParams->staIdx = STA_INVALID_IDX; - pAddStaParams->updateSta = false; - - pAddStaParams->shortPreambleSupported = - (uint8_t) psessionEntry->beaconParams.fShortPreamble; - lim_populate_peer_rate_set(pMac, &pAddStaParams->supportedRates, NULL, - false, psessionEntry, NULL); - - if (psessionEntry->htCapability) { - pAddStaParams->htCapable = psessionEntry->htCapability; - pAddStaParams->vhtCapable = psessionEntry->vhtCapability; - pAddStaParams->ch_width = psessionEntry->ch_width; - pAddStaParams->greenFieldCapable = - lim_get_ht_capability(pMac, eHT_GREENFIELD, - psessionEntry); - pAddStaParams->mimoPS = - lim_get_ht_capability(pMac, eHT_MIMO_POWER_SAVE, - psessionEntry); - pAddStaParams->rifsMode = - lim_get_ht_capability(pMac, eHT_RIFS_MODE, psessionEntry); - pAddStaParams->lsigTxopProtection = - lim_get_ht_capability(pMac, eHT_LSIG_TXOP_PROTECTION, - psessionEntry); - pAddStaParams->maxAmpduDensity = - lim_get_ht_capability(pMac, eHT_MPDU_DENSITY, psessionEntry); - pAddStaParams->maxAmpduSize = - lim_get_ht_capability(pMac, eHT_MAX_RX_AMPDU_FACTOR, - psessionEntry); - pAddStaParams->maxAmsduSize = - lim_get_ht_capability(pMac, eHT_MAX_AMSDU_LENGTH, - psessionEntry); - pAddStaParams->fDsssCckMode40Mhz = - lim_get_ht_capability(pMac, eHT_DSSS_CCK_MODE_40MHZ, - psessionEntry); - pAddStaParams->fShortGI20Mhz = - lim_get_ht_capability(pMac, eHT_SHORT_GI_20MHZ, psessionEntry); - pAddStaParams->fShortGI40Mhz = - lim_get_ht_capability(pMac, eHT_SHORT_GI_40MHZ, psessionEntry); - } - - if (wlan_cfg_get_int(pMac, WNI_CFG_LISTEN_INTERVAL, &listenInterval) != - eSIR_SUCCESS) - lim_log(pMac, LOGP, FL("Couldn't get LISTEN_INTERVAL")); - pAddStaParams->listenInterval = (uint16_t) listenInterval; - - wlan_cfg_get_int(pMac, WNI_CFG_DOT11_MODE, &selfStaDot11Mode); - pAddStaParams->encryptType = psessionEntry->encryptType; - pAddStaParams->maxTxPower = psessionEntry->maxTxPower; - - /* Lets save this for when we receive the Reassoc Rsp */ - psessionEntry->ftPEContext.pAddStaReq = pAddStaParams; - - if (pAddBssParams != NULL) { - qdf_mem_free(pAddBssParams); - pAddBssParams = NULL; - limMsgQ->bodyptr = NULL; - } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (psessionEntry->bRoamSynchInProgress) { - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - "LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp"); - lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp, - LIM_REASSOC, psessionEntry); - } -#endif - return; - -end: - /* Free up buffer allocated for reassocReq */ - if (psessionEntry != NULL) - if (psessionEntry->pLimMlmReassocReq != NULL) { - qdf_mem_free(psessionEntry->pLimMlmReassocReq); - psessionEntry->pLimMlmReassocReq = NULL; - } - - if (pAddBssParams != NULL) { - qdf_mem_free(pAddBssParams); - pAddBssParams = NULL; - limMsgQ->bodyptr = NULL; - } - - mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; - mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - /* Update PE session Id */ - if (psessionEntry != NULL) - mlmReassocCnf.sessionId = psessionEntry->peSessionId; - else - mlmReassocCnf.sessionId = 0; - - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); -} - /** * lim_process_sta_mlm_add_bss_rsp() - Process ADD BSS response * @mac_ctx: Pointer to Global MAC structure -- cgit v1.2.3 From 99ff7f0b1ab3b15205a04a08c6486d2f49e75588 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 11 Feb 2016 07:10:22 -0800 Subject: qcacld-3.0: Move Reassociation utils into a separate file Move all the reassociation related utilities to a separate file for easy maintenance across different projects CRs-Fixed: 978905 Change-Id: I86809ac48659dc91222624fec616bab6533d75dd --- Kbuild | 1 + core/mac/src/pe/lim/lim_assoc_utils.c | 167 ------ core/mac/src/pe/lim/lim_assoc_utils.h | 3 + core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 50 -- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 324 ------------ core/mac/src/pe/lim/lim_reassoc_utils.c | 561 +++++++++++++++++++++ 6 files changed, 565 insertions(+), 541 deletions(-) create mode 100644 core/mac/src/pe/lim/lim_reassoc_utils.c diff --git a/Kbuild b/Kbuild index 1578d0ccacc7..a9c5967d4597 100755 --- a/Kbuild +++ b/Kbuild @@ -401,6 +401,7 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_admit_control.o \ $(MAC_SRC_DIR)/pe/lim/lim_api.o \ $(MAC_SRC_DIR)/pe/lim/lim_assoc_utils.o \ + $(MAC_SRC_DIR)/pe/lim/lim_reassoc_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_debug.o \ $(MAC_SRC_DIR)/pe/lim/lim_ft.o \ $(MAC_SRC_DIR)/pe/lim/lim_ft_preauth.o \ diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 72331a346757..673e5c3d7359 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -1346,120 +1346,6 @@ lim_decide_short_slot(tpAniSirGlobal mac_ctx, tpDphHashNode sta_ds, } } -void -lim_post_reassoc_failure(tpAniSirGlobal pMac, - tSirResultCodes resultCode, - uint16_t protStatusCode, tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; - - psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, - eLIM_MLM_LINK_ESTABLISHED_STATE)); - - /* 'Change' timer for future activations */ - lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER); - - mlmReassocCnf.resultCode = resultCode; - mlmReassocCnf.protStatusCode = protStatusCode; - /* Update PE session Id */ - mlmReassocCnf.sessionId = psessionEntry->peSessionId; - lim_post_sme_message(pMac, - LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); -} /*** end lim_post_reassoc_failure() ***/ - -/** - * lim_restore_pre_reassoc_state() - * - ***FUNCTION: - * This function is called on STA role whenever Reasociation - * Response with a reject code is received from AP. - * - ***LOGIC: - * Reassociation failure timer is stopped, Old (or current) AP's - * context is restored both at Polaris & software - * - ***ASSUMPTIONS: - * - ***NOTE: - * - * @param pMac - Pointer to Global MAC structure - * @param resultCode - Result code that specifies why Reassociation - * attemp failed - * - * @return None - */ - -void -lim_restore_pre_reassoc_state(tpAniSirGlobal pMac, - tSirResultCodes resultCode, - uint16_t protStatusCode, tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; - - lim_log(pMac, LOG1, - FL("sessionid: %d protStatusCode: %d resultCode: %d"), - psessionEntry->smeSessionId, protStatusCode, resultCode); - - psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, - eLIM_MLM_LINK_ESTABLISHED_STATE)); - - /* 'Change' timer for future activations */ - lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER); - - lim_set_channel(pMac, psessionEntry->currentOperChannel, - psessionEntry->ch_center_freq_seg0, - psessionEntry->ch_center_freq_seg1, - psessionEntry->ch_width, - psessionEntry->maxTxPower, - psessionEntry->peSessionId); - - /** @ToDo : Need to Integrate the STOP the DataTransfer to the AP from 11H code */ - - mlmReassocCnf.resultCode = resultCode; - mlmReassocCnf.protStatusCode = protStatusCode; - /* Update PE session Id */ - mlmReassocCnf.sessionId = psessionEntry->peSessionId; - lim_post_sme_message(pMac, - LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); -} /*** end lim_restore_pre_reassoc_state() ***/ - -/** - * lim_is_reassoc_in_progress() - * - ***FUNCTION: - * This function is called to see if STA is in wt-reassoc-rsp state. - * - ***LOGIC: - * - ***ASSUMPTIONS: - * - ***NOTE: - * - * @param pMac - Pointer to Global MAC structure - * - * @return true When STA is waiting for Reassoc response from AP \n - * else false - */ - -bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry) -{ - if (psessionEntry == NULL) { - return false; - } - if ((LIM_IS_STA_ROLE(psessionEntry) || - LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) && - ((psessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) || - (psessionEntry->limSmeState == - eLIM_SME_WT_REASSOC_LINK_FAIL_STATE))) - return true; - - return false; -} /*** end lim_is_reassoc_in_progress() ***/ - /** * lim_populate_vht_mcs_set - function to populate vht mcs rate set * @mac_ctx: pointer to global mac structure @@ -2724,59 +2610,6 @@ lim_del_sta(tpAniSirGlobal pMac, return retCode; } -/** - * lim_add_ft_sta_self()- function to add STA once we have connected with a - * new AP - * @mac_ctx: pointer to global mac structure - * @assoc_id: association id for the station connection - * @session_entry: pe session entr - * - * This function is called to add a STA once we have connected with a new - * AP, that we have performed an FT to. - * - * The Add STA Response is created and now after the ADD Bss Is Successful - * we add the self sta. We update with the association id from the reassoc - * response from the AP. - * - * Return: eSIR_SUCCESS on success else eSirRetStatus failure codes - */ -tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, - tpPESession session_entry) -{ - tpAddStaParams add_sta_params = NULL; - tSirRetStatus ret_code = eSIR_SUCCESS; - tSirMsgQ msg_q; - - add_sta_params = session_entry->ftPEContext.pAddStaReq; - add_sta_params->assocId = assoc_id; - add_sta_params->smesessionId = session_entry->smeSessionId; - - msg_q.type = WMA_ADD_STA_REQ; - msg_q.reserved = 0; - msg_q.bodyptr = add_sta_params; - msg_q.bodyval = 0; - - QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, - "Sending WMA_ADD_STA_REQ (aid %d)", - add_sta_params->assocId); - MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId, - msg_q.type)); - - session_entry->limPrevMlmState = session_entry->limMlmState; - MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, - session_entry->peSessionId, eLIM_MLM_WT_ADD_STA_RSP_STATE)); - session_entry->limMlmState = eLIM_MLM_WT_ADD_STA_RSP_STATE; - ret_code = wma_post_ctrl_msg(mac_ctx, &msg_q); - if (eSIR_SUCCESS != ret_code) { - lim_log(mac_ctx, LOGE, - FL("Posting WMA_ADD_STA_REQ to HAL failed, reason=%X"), - ret_code); - qdf_mem_free(add_sta_params); - } - - session_entry->ftPEContext.pAddStaReq = NULL; - return ret_code; -} /** * lim_add_sta_self() diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 0331e5a973bc..43c5d9018443 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -84,6 +84,9 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, tpPESession psessionEntry, tDot11fIEVHTCaps * pVHTCaps); +void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry); + #define MCSMAPMASK1x1 0x3 #define MCSMAPMASK2x2 0xC diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index af41128c61b4..707d6e6876b8 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -302,55 +302,6 @@ void lim_update_assoc_sta_datas(tpAniSirGlobal mac_ctx, #endif } -/** - * @function : lim_update_re_assoc_globals - * - * @brief : This function is called to Update the Globals (LIM) during ReAssoc. - * - ***LOGIC: - * - ***ASSUMPTIONS: - * - ***NOTE: - * - * @param pMac - Pointer to Global MAC structure - * @param pAssocRsp - Pointer to Association Response Structure - * - * @return None - */ - -void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, - tpPESession psessionEntry) -{ - /* Update the current Bss Information */ - qdf_mem_copy(psessionEntry->bssId, - psessionEntry->limReAssocbssId, sizeof(tSirMacAddr)); - psessionEntry->currentOperChannel = psessionEntry->limReassocChannelId; - psessionEntry->htSecondaryChannelOffset = - psessionEntry->reAssocHtSupportedChannelWidthSet; - psessionEntry->htRecommendedTxWidthSet = - psessionEntry->reAssocHtRecommendedTxWidthSet; - psessionEntry->htSecondaryChannelOffset = - psessionEntry->reAssocHtSecondaryChannelOffset; - psessionEntry->limCurrentBssCaps = psessionEntry->limReassocBssCaps; - psessionEntry->limCurrentBssQosCaps = - psessionEntry->limReassocBssQosCaps; - psessionEntry->limCurrentBssPropCap = - psessionEntry->limReassocBssPropCap; - - qdf_mem_copy((uint8_t *) &psessionEntry->ssId, - (uint8_t *) &psessionEntry->limReassocSSID, - psessionEntry->limReassocSSID.length + 1); - - /* Store assigned AID for TIM processing */ - psessionEntry->limAID = pAssocRsp->aid & 0x3FFF; - /** Set the State Back to ReAssoc Rsp*/ - psessionEntry->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, - psessionEntry->limMlmState)); - -} /** * lim_update_ric_data() - update session with ric data * @mac_ctx: Pointer to Global MAC structure @@ -398,7 +349,6 @@ static void lim_update_ric_data(tpAniSirGlobal mac_ctx, } #ifdef FEATURE_WLAN_ESE - /** * lim_update_ese_tspec() - update session with Tspec info. * @mac_ctx: Pointer to Global MAC structure diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index eab1d8ec5c20..eea32a860406 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -69,9 +69,6 @@ void lim_process_mlm_disassoc_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_deauth_ind(tpAniSirGlobal, uint32_t *); void lim_process_mlm_deauth_cnf(tpAniSirGlobal, uint32_t *); void lim_process_mlm_purge_sta_ind(tpAniSirGlobal, uint32_t *); -static void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, - tpDphHashNode pStaDs, - tpPESession psessionEntry); void lim_get_session_info(tpAniSirGlobal pMac, uint8_t *, uint8_t *, uint16_t *); static void lim_process_btamp_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, @@ -3274,164 +3271,6 @@ void lim_process_switch_channel_rsp(tpAniSirGlobal pMac, void *body) qdf_mem_free(body); } -/** - * @function : lim_handle_del_bss_in_re_assoc_context - * @brief : While Processing the ReAssociation Response Frame in STA, - * a. immediately after receiving the Reassoc Response the RxCleanUp is - * being issued and the end of DelBSS the new BSS is being added. - * - * b .If an AP rejects the ReAssociation (Disassoc / Deauth) with some context - * change, We need to update CSR with ReAssocCNF Response with the - * ReAssoc Fail and the reason Code, that is also being handled in the DELBSS - * context only - * - * @param : pMac - tpAniSirGlobal - * pStaDs - Station Descriptor - * - * @return : none - */ -static void -lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs, - tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; - /* - * Skipped the DeleteDPH Hash Entry as we need it for the new BSS - * Set the MlmState to IDLE - */ - psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE; - /* Update PE session Id */ - mlmReassocCnf.sessionId = psessionEntry->peSessionId; - switch (psessionEntry->limSmeState) { - case eLIM_SME_WT_REASSOC_STATE: - { - tpSirAssocRsp assocRsp; - tpDphHashNode pStaDs; - tSirRetStatus retStatus = eSIR_SUCCESS; - tpSchBeaconStruct beacon_struct; - beacon_struct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); - if (NULL == beacon_struct) { - lim_log(pMac, LOGE, FL("beaconStruct alloc failed")); - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = - eSIR_MAC_UNSPEC_FAILURE_STATUS; - lim_delete_dph_hash_entry(pMac, psessionEntry->bssId, - DPH_STA_HASH_INDEX_PEER, psessionEntry); - goto error; - } - /* Delete the older STA Table entry */ - lim_delete_dph_hash_entry(pMac, psessionEntry->bssId, - DPH_STA_HASH_INDEX_PEER, psessionEntry); - /* - * Add an entry for AP to hash table - * maintained by DPH module - */ - pStaDs = dph_add_hash_entry(pMac, - psessionEntry->limReAssocbssId, - DPH_STA_HASH_INDEX_PEER, - &psessionEntry->dph.dphHashTable); - if (pStaDs == NULL) { - /* Could not add hash table entry */ - lim_log(pMac, LOGE, - FL("could not add hash entry at DPH for ")); - lim_print_mac_addr(pMac, - psessionEntry->limReAssocbssId, LOGE); - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; - qdf_mem_free(beacon_struct); - goto error; - } - /* - * While Processing the ReAssoc Response Frame the ReAssocRsp Frame - * is being stored to be used here for sending ADDBSS - */ - assocRsp = - (tpSirAssocRsp) psessionEntry->limAssocResponseData; - lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp, - psessionEntry); - lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry); - lim_extract_ap_capabilities(pMac, - (uint8_t *) psessionEntry->pLimReAssocReq->bssDescription.ieFields, - lim_get_ielen_from_bss_description( - &psessionEntry->pLimReAssocReq->bssDescription), - beacon_struct); - if (pMac->lim.gLimProtectionControl != - WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) - lim_decide_sta_protection_on_assoc(pMac, - beacon_struct, - psessionEntry); - if (beacon_struct->erpPresent) { - if (beacon_struct->erpIEInfo.barkerPreambleMode) - psessionEntry->beaconParams.fShortPreamble = 0; - else - psessionEntry->beaconParams.fShortPreamble = 1; - } - /* - * updateBss flag is false, as in this case, PE is first - * deleting the existing BSS and then adding a new one - */ - if (eSIR_SUCCESS != - lim_sta_send_add_bss(pMac, assocRsp, beacon_struct, - &psessionEntry->pLimReAssocReq->bssDescription, - false, psessionEntry)) { - lim_log(pMac, LOGE, - FL("Posting ADDBSS in the ReAssocCtx has Failed ")); - retStatus = eSIR_FAILURE; - } - if (retStatus != eSIR_SUCCESS) { - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = - eSIR_MAC_UNSPEC_FAILURE_STATUS; - qdf_mem_free(assocRsp); - pMac->lim.gLimAssocResponseData = NULL; - qdf_mem_free(beacon_struct); - goto error; - } - qdf_mem_free(assocRsp); - qdf_mem_free(beacon_struct); - psessionEntry->limAssocResponseData = NULL; - } - break; - case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: - { - /** Case wherein the DisAssoc / Deauth - * being sent as response to ReAssoc Req*/ - /** Send the Reason code as the same received in Disassoc / Deauth Frame*/ - mlmReassocCnf.resultCode = - pStaDs->mlmStaContext.disassocReason; - mlmReassocCnf.protStatusCode = - pStaDs->mlmStaContext.cleanupTrigger; - /** Set the SME State back to WT_Reassoc State*/ - psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, - pStaDs->assocId, psessionEntry); - if (LIM_IS_STA_ROLE(psessionEntry) || - LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) { - psessionEntry->limMlmState = - eLIM_MLM_IDLE_STATE; - } - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); - } - break; - default: - lim_log(pMac, LOGE, - FL("DelBss is being invoked in the wrong system Role /unhandled SME State")); - - mlmReassocCnf.resultCode = eSIR_SME_REFUSED; - mlmReassocCnf.protStatusCode = - eSIR_SME_UNEXPECTED_REQ_RESULT_CODE; - goto error; - } - return; -error: - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); -} - /* Added For BT -AMP Support */ static void lim_process_btamp_add_bss_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, @@ -3485,169 +3324,6 @@ end: } } -/** - * @function : lim_handle_add_bss_in_re_assoc_context - * @brief : While Processing the ReAssociation Response Frame in STA, - * a. immediately after receiving the Reassoc Response the RxCleanUp is - * being issued and the end of DelBSS the new BSS is being added. - * - * b .If an AP rejects the ReAssociation (Disassoc / Deauth) with some context - * change, We need to update CSR with ReAssocCNF Response with the - * ReAssoc Fail and the reason Code, that is also being handled in the DELBSS - * context only - * - * @param : pMac - tpAniSirGlobal - * pStaDs - Station Descriptor - * - * @return : none - */ -void -lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs, - tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; - /** Skipped the DeleteDPH Hash Entry as we need it for the new BSS*/ - /** Set the MlmState to IDLE*/ - psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, - psessionEntry->limMlmState)); - switch (psessionEntry->limSmeState) { - case eLIM_SME_WT_REASSOC_STATE: { - tpSirAssocRsp assocRsp; - tpDphHashNode pStaDs; - tSirRetStatus retStatus = eSIR_SUCCESS; - tSchBeaconStruct *pBeaconStruct; - pBeaconStruct = - qdf_mem_malloc(sizeof(tSchBeaconStruct)); - if (NULL == pBeaconStruct) { - lim_log(pMac, LOGE, - FL - ("Unable to allocate memory in lim_handle_add_bss_in_re_assoc_context")); - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - goto Error; - } - /* Get the AP entry from DPH hash table */ - pStaDs = - dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER, - &psessionEntry->dph.dphHashTable); - if (pStaDs == NULL) { - PELOGE(lim_log - (pMac, LOGE, - FL - ("Fail to get STA PEER entry from hash")); - ) - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; - qdf_mem_free(pBeaconStruct); - goto Error; - } - /** While Processing the ReAssoc Response Frame the ReAssocRsp Frame - * is being stored to be used here for sending ADDBSS - */ - assocRsp = - (tpSirAssocRsp) psessionEntry->limAssocResponseData; - lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp, - psessionEntry); - lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry); - lim_extract_ap_capabilities(pMac, - (uint8_t *) psessionEntry-> - pLimReAssocReq->bssDescription. - ieFields, - lim_get_ielen_from_bss_description - (&psessionEntry-> - pLimReAssocReq-> - bssDescription), - pBeaconStruct); - if (pMac->lim.gLimProtectionControl != - WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) - lim_decide_sta_protection_on_assoc(pMac, - pBeaconStruct, - psessionEntry); - - if (pBeaconStruct->erpPresent) { - if (pBeaconStruct->erpIEInfo.barkerPreambleMode) - psessionEntry->beaconParams. - fShortPreamble = 0; - else - psessionEntry->beaconParams. - fShortPreamble = 1; - } - - psessionEntry->isNonRoamReassoc = 1; - if (eSIR_SUCCESS != - lim_sta_send_add_bss(pMac, assocRsp, pBeaconStruct, - &psessionEntry->pLimReAssocReq-> - bssDescription, true, - psessionEntry)) { - lim_log(pMac, LOGE, - FL - ("Posting ADDBSS in the ReAssocContext has Failed ")); - retStatus = eSIR_FAILURE; - } - if (retStatus != eSIR_SUCCESS) { - mlmReassocCnf.resultCode = - eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = - eSIR_MAC_UNSPEC_FAILURE_STATUS; - qdf_mem_free(assocRsp); - pMac->lim.gLimAssocResponseData = NULL; - qdf_mem_free(pBeaconStruct); - goto Error; - } - qdf_mem_free(assocRsp); - psessionEntry->limAssocResponseData = NULL; - qdf_mem_free(pBeaconStruct); - } - break; - case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: { - /* Case wherein the DisAssoc / Deauth - * being sent as response to ReAssoc Req - * Send the Reason code as the same received - * in Disassoc / Deauth Frame - */ - mlmReassocCnf.resultCode = - pStaDs->mlmStaContext.disassocReason; - mlmReassocCnf.protStatusCode = - pStaDs->mlmStaContext.cleanupTrigger; - /** Set the SME State back to WT_Reassoc State*/ - psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; - lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, - pStaDs->assocId, psessionEntry); - if (LIM_IS_STA_ROLE(psessionEntry)) { - psessionEntry->limMlmState = - eLIM_MLM_IDLE_STATE; - MTRACE(mac_trace - (pMac, TRACE_CODE_MLM_STATE, - psessionEntry->peSessionId, - psessionEntry->limMlmState)); - } - - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); - } - break; - default: - PELOGE(lim_log - (pMac, LOGE, - FL - ("DelBss is being invoked in the wrong system Role /unhandled SME State")); - ) - mlmReassocCnf.resultCode = eSIR_SME_REFUSED; - mlmReassocCnf.protStatusCode = - eSIR_SME_UNEXPECTED_REQ_RESULT_CODE; - goto Error; - } - return; -Error: - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); -} - void lim_send_beacon_ind(tpAniSirGlobal pMac, tpPESession psessionEntry) { tBeaconGenParams *pBeaconGenParams = NULL; diff --git a/core/mac/src/pe/lim/lim_reassoc_utils.c b/core/mac/src/pe/lim/lim_reassoc_utils.c new file mode 100644 index 000000000000..de92887ac6f0 --- /dev/null +++ b/core/mac/src/pe/lim/lim_reassoc_utils.c @@ -0,0 +1,561 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: lim_reassoc_utils.c + * + * Host based roaming re-association utilities + */ + +#include "cds_api.h" +#include "ani_global.h" +#include "wni_api.h" +#include "sir_common.h" + +#include "wni_cfg.h" +#include "cfg_api.h" + +#include "sch_api.h" +#include "utils_api.h" +#include "lim_utils.h" +#include "lim_assoc_utils.h" +#include "lim_security_utils.h" +#include "lim_ser_des_utils.h" +#include "lim_sta_hash_api.h" +#include "lim_admit_control.h" +#include "lim_send_messages.h" +#include "lim_ibss_peer_mgmt.h" +#include "lim_ft_defs.h" +#include "lim_session.h" + +#include "qdf_types.h" +#include "wma_types.h" +#include "lim_types.h" + +/** + * lim_update_re_assoc_globals() - Update reassoc global data + * @pMac: Global MAC context + * @pAssocRsp: Reassociation response data + * @psessionEntry: PE Session + * + * This function is called to Update the Globals (LIM) during ReAssoc. + * + * Return: None + */ + +void lim_update_re_assoc_globals(tpAniSirGlobal pMac, tpSirAssocRsp pAssocRsp, + tpPESession psessionEntry) +{ + /* Update the current Bss Information */ + qdf_mem_copy(psessionEntry->bssId, + psessionEntry->limReAssocbssId, sizeof(tSirMacAddr)); + psessionEntry->currentOperChannel = psessionEntry->limReassocChannelId; + psessionEntry->htSecondaryChannelOffset = + psessionEntry->reAssocHtSupportedChannelWidthSet; + psessionEntry->htRecommendedTxWidthSet = + psessionEntry->reAssocHtRecommendedTxWidthSet; + psessionEntry->htSecondaryChannelOffset = + psessionEntry->reAssocHtSecondaryChannelOffset; + psessionEntry->limCurrentBssCaps = psessionEntry->limReassocBssCaps; + psessionEntry->limCurrentBssQosCaps = + psessionEntry->limReassocBssQosCaps; + psessionEntry->limCurrentBssPropCap = + psessionEntry->limReassocBssPropCap; + + qdf_mem_copy((uint8_t *) &psessionEntry->ssId, + (uint8_t *) &psessionEntry->limReassocSSID, + psessionEntry->limReassocSSID.length + 1); + + /* Store assigned AID for TIM processing */ + psessionEntry->limAID = pAssocRsp->aid & 0x3FFF; + /** Set the State Back to ReAssoc Rsp*/ + psessionEntry->limMlmState = eLIM_MLM_WT_REASSOC_RSP_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, + psessionEntry->limMlmState)); + +} + +/** + * @lim_handle_del_bss_in_re_assoc_context() - DEL BSS during reassociation + * @pMac: Global MAC Context + * @pStaDs: Station Hash entry + * @psessionEntry: PE Session + * + * While Processing the ReAssociation Response Frame in STA, + * a.immediately after receiving the Reassoc Response the RxCleanUp is + * being issued and the end of DelBSS the new BSS is being added. + * + * b. If an AP rejects the ReAssociation (Disassoc/Deauth) with some context + * change, We need to update CSR with ReAssocCNF Response with the + * ReAssoc Fail and the reason Code, that is also being handled in the + * DELBSS context only + * + * Return: None + */ +void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; + tpSirBssDescription bss_desc; + /* + * Skipped the DeleteDPH Hash Entry as we need it for the new BSS + * Set the MlmState to IDLE + */ + psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE; + /* Update PE session Id */ + mlmReassocCnf.sessionId = psessionEntry->peSessionId; + switch (psessionEntry->limSmeState) { + case eLIM_SME_WT_REASSOC_STATE: + { + tpSirAssocRsp assocRsp; + tpDphHashNode pStaDs; + tSirRetStatus retStatus = eSIR_SUCCESS; + tpSchBeaconStruct beacon_struct; + beacon_struct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); + if (NULL == beacon_struct) { + lim_log(pMac, LOGE, FL("beaconStruct alloc failed")); + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = + eSIR_MAC_UNSPEC_FAILURE_STATUS; + lim_delete_dph_hash_entry(pMac, psessionEntry->bssId, + DPH_STA_HASH_INDEX_PEER, psessionEntry); + goto error; + } + /* Delete the older STA Table entry */ + lim_delete_dph_hash_entry(pMac, psessionEntry->bssId, + DPH_STA_HASH_INDEX_PEER, psessionEntry); + /* + * Add an entry for AP to hash table + * maintained by DPH module + */ + pStaDs = dph_add_hash_entry(pMac, + psessionEntry->limReAssocbssId, + DPH_STA_HASH_INDEX_PEER, + &psessionEntry->dph.dphHashTable); + if (pStaDs == NULL) { + /* Could not add hash table entry */ + lim_log(pMac, LOGE, + FL("could not add hash entry at DPH for ")); + lim_print_mac_addr(pMac, + psessionEntry->limReAssocbssId, LOGE); + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; + qdf_mem_free(beacon_struct); + goto error; + } + /* + * While Processing the ReAssoc Response Frame the Rsp Frame + * is being stored to be used here for sending ADDBSS + */ + assocRsp = + (tpSirAssocRsp) psessionEntry->limAssocResponseData; + lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp, + psessionEntry); + lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry); + bss_desc = &psessionEntry->pLimReAssocReq->bssDescription; + lim_extract_ap_capabilities(pMac, + (uint8_t *) bss_desc->ieFields, + lim_get_ielen_from_bss_description(bss_desc), + beacon_struct); + if (pMac->lim.gLimProtectionControl != + WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) + lim_decide_sta_protection_on_assoc(pMac, + beacon_struct, + psessionEntry); + if (beacon_struct->erpPresent) { + if (beacon_struct->erpIEInfo.barkerPreambleMode) + psessionEntry->beaconParams.fShortPreamble = 0; + else + psessionEntry->beaconParams.fShortPreamble = 1; + } + /* + * updateBss flag is false, as in this case, PE is first + * deleting the existing BSS and then adding a new one + */ + if (eSIR_SUCCESS != + lim_sta_send_add_bss(pMac, assocRsp, beacon_struct, + bss_desc, + false, psessionEntry)) { + lim_log(pMac, LOGE, + FL("Posting ADDBSS in the ReAssocCtx Failed ")); + retStatus = eSIR_FAILURE; + } + if (retStatus != eSIR_SUCCESS) { + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = + eSIR_MAC_UNSPEC_FAILURE_STATUS; + qdf_mem_free(assocRsp); + pMac->lim.gLimAssocResponseData = NULL; + qdf_mem_free(beacon_struct); + goto error; + } + qdf_mem_free(assocRsp); + qdf_mem_free(beacon_struct); + psessionEntry->limAssocResponseData = NULL; + } + break; + case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: + { + mlmReassocCnf.resultCode = + pStaDs->mlmStaContext.disassocReason; + mlmReassocCnf.protStatusCode = + pStaDs->mlmStaContext.cleanupTrigger; + /** Set the SME State back to WT_Reassoc State*/ + psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; + lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, + pStaDs->assocId, psessionEntry); + if (LIM_IS_STA_ROLE(psessionEntry) || + LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) { + psessionEntry->limMlmState = + eLIM_MLM_IDLE_STATE; + } + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); + } + break; + default: + lim_log(pMac, LOGE, + FL("DelBss in wrong system Role and SME State")); + + mlmReassocCnf.resultCode = eSIR_SME_REFUSED; + mlmReassocCnf.protStatusCode = + eSIR_SME_UNEXPECTED_REQ_RESULT_CODE; + goto error; + } + return; +error: + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); +} + +/** + * @lim_handle_add_bss_in_re_assoc_context() - ADD BSS during reassociation + * @pMac: Global MAC Context + * @pStaDs: Station Hash entry + * @psessionEntry: PE Session + * + * While Processing the ReAssociation Response Frame in STA, + * a. immediately after receiving the Reassoc Response the RxCleanUp is + * being issued and the end of DelBSS the new BSS is being added. + * + * b. If an AP rejects the ReAssociation (Disassoc/Deauth) with some context + * change, We need to update CSR with ReAssocCNF Response with the + * ReAssoc Fail and the reason Code, that is also being handled in the + * DELBSS context only + * + * Return: None + */ +void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; + /** Skipped the DeleteDPH Hash Entry as we need it for the new BSS*/ + /** Set the MlmState to IDLE*/ + psessionEntry->limMlmState = eLIM_MLM_IDLE_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, + psessionEntry->limMlmState)); + switch (psessionEntry->limSmeState) { + case eLIM_SME_WT_REASSOC_STATE: { + tpSirAssocRsp assocRsp; + tpDphHashNode pStaDs; + tSirRetStatus retStatus = eSIR_SUCCESS; + tSchBeaconStruct *pBeaconStruct; + pBeaconStruct = + qdf_mem_malloc(sizeof(tSchBeaconStruct)); + if (NULL == pBeaconStruct) { + lim_log(pMac, LOGE, FL("Unable to allocate memory")); + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + goto Error; + } + /* Get the AP entry from DPH hash table */ + pStaDs = + dph_get_hash_entry(pMac, DPH_STA_HASH_INDEX_PEER, + &psessionEntry->dph.dphHashTable); + if (pStaDs == NULL) { + lim_log(pMac, LOGE, + FL("Fail to get STA PEER entry from hash")); + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = eSIR_SME_SUCCESS; + qdf_mem_free(pBeaconStruct); + goto Error; + } + /* + * While Processing the ReAssoc Response Frame the Rsp Frame + * is being stored to be used here for sending ADDBSS + */ + assocRsp = + (tpSirAssocRsp) psessionEntry->limAssocResponseData; + lim_update_assoc_sta_datas(pMac, pStaDs, assocRsp, + psessionEntry); + lim_update_re_assoc_globals(pMac, assocRsp, psessionEntry); + lim_extract_ap_capabilities(pMac, + (uint8_t *) psessionEntry-> + pLimReAssocReq->bssDescription. + ieFields, + lim_get_ielen_from_bss_description + (&psessionEntry-> + pLimReAssocReq-> + bssDescription), + pBeaconStruct); + if (pMac->lim.gLimProtectionControl != + WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE) + lim_decide_sta_protection_on_assoc(pMac, + pBeaconStruct, + psessionEntry); + + if (pBeaconStruct->erpPresent) { + if (pBeaconStruct->erpIEInfo.barkerPreambleMode) + psessionEntry->beaconParams. + fShortPreamble = 0; + else + psessionEntry->beaconParams. + fShortPreamble = 1; + } + + psessionEntry->isNonRoamReassoc = 1; + if (eSIR_SUCCESS != + lim_sta_send_add_bss(pMac, assocRsp, pBeaconStruct, + &psessionEntry->pLimReAssocReq-> + bssDescription, true, + psessionEntry)) { + lim_log(pMac, LOGE, + FL("Post ADDBSS in the ReAssocCtxt Failed ")); + retStatus = eSIR_FAILURE; + } + if (retStatus != eSIR_SUCCESS) { + mlmReassocCnf.resultCode = + eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = + eSIR_MAC_UNSPEC_FAILURE_STATUS; + qdf_mem_free(assocRsp); + pMac->lim.gLimAssocResponseData = NULL; + qdf_mem_free(pBeaconStruct); + goto Error; + } + qdf_mem_free(assocRsp); + psessionEntry->limAssocResponseData = NULL; + qdf_mem_free(pBeaconStruct); + } + break; + case eLIM_SME_WT_REASSOC_LINK_FAIL_STATE: { + /* Case wherein the DisAssoc / Deauth + * being sent as response to ReAssoc Req + * Send the Reason code as the same received + * in Disassoc / Deauth Frame + */ + mlmReassocCnf.resultCode = + pStaDs->mlmStaContext.disassocReason; + mlmReassocCnf.protStatusCode = + pStaDs->mlmStaContext.cleanupTrigger; + /** Set the SME State back to WT_Reassoc State*/ + psessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; + lim_delete_dph_hash_entry(pMac, pStaDs->staAddr, + pStaDs->assocId, psessionEntry); + if (LIM_IS_STA_ROLE(psessionEntry)) { + psessionEntry->limMlmState = + eLIM_MLM_IDLE_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, + psessionEntry->peSessionId, + psessionEntry->limMlmState)); + } + + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); + } + break; + default: + lim_log(pMac, LOGE, + FL("DelBss in the wrong system Role and SME State")); + mlmReassocCnf.resultCode = eSIR_SME_REFUSED; + mlmReassocCnf.protStatusCode = + eSIR_SME_UNEXPECTED_REQ_RESULT_CODE; + goto Error; + } + return; +Error: + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); +} + +/** + * lim_is_reassoc_in_progress() - Check if reassoiciation is in progress + * @pMac: Global MAC Context + * @psessionEntry: PE Session + * + * Return: true When STA is waiting for Reassoc response from AP + * else false + */ +bool lim_is_reassoc_in_progress(tpAniSirGlobal pMac, tpPESession psessionEntry) +{ + if (psessionEntry == NULL) + return false; + if ((LIM_IS_STA_ROLE(psessionEntry) || + LIM_IS_BT_AMP_STA_ROLE(psessionEntry)) && + ((psessionEntry->limSmeState == eLIM_SME_WT_REASSOC_STATE) || + (psessionEntry->limSmeState == + eLIM_SME_WT_REASSOC_LINK_FAIL_STATE))) + return true; + + return false; +} + +/** + * lim_add_ft_sta_self()- function to add STA once we have connected with a + * new AP + * @mac_ctx: pointer to global mac structure + * @assoc_id: association id for the station connection + * @session_entry: pe session entr + * + * This function is called to add a STA once we have connected with a new + * AP, that we have performed an FT to. + * + * The Add STA Response is created and now after the ADD Bss Is Successful + * we add the self sta. We update with the association id from the reassoc + * response from the AP. + * + * Return: eSIR_SUCCESS on success else eSirRetStatus failure codes + */ +tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id, + tpPESession session_entry) +{ + tpAddStaParams add_sta_params = NULL; + tSirRetStatus ret_code = eSIR_SUCCESS; + tSirMsgQ msg_q; + + add_sta_params = session_entry->ftPEContext.pAddStaReq; + add_sta_params->assocId = assoc_id; + add_sta_params->smesessionId = session_entry->smeSessionId; + + msg_q.type = WMA_ADD_STA_REQ; + msg_q.reserved = 0; + msg_q.bodyptr = add_sta_params; + msg_q.bodyval = 0; + + QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG, + "Sending WMA_ADD_STA_REQ (aid %d)", + add_sta_params->assocId); + MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId, + msg_q.type)); + + session_entry->limPrevMlmState = session_entry->limMlmState; + MTRACE(mac_trace(mac_ctx, TRACE_CODE_MLM_STATE, + session_entry->peSessionId, eLIM_MLM_WT_ADD_STA_RSP_STATE)); + session_entry->limMlmState = eLIM_MLM_WT_ADD_STA_RSP_STATE; + ret_code = wma_post_ctrl_msg(mac_ctx, &msg_q); + if (eSIR_SUCCESS != ret_code) { + lim_log(mac_ctx, LOGE, + FL("Posting WMA_ADD_STA_REQ to HAL failed, reason=%X"), + ret_code); + qdf_mem_free(add_sta_params); + } + + session_entry->ftPEContext.pAddStaReq = NULL; + return ret_code; +} + +/** + * lim_restore_pre_reassoc_state() - Restore the pre-association context + * @pMac: Global MAC Context + * @resultCode: Assoc response result + * @protStatusCode: Internal protocol status code + * @psessionEntry: PE Session + * + * This function is called on STA role whenever Reasociation + * Response with a reject code is received from AP. + * Reassociation failure timer is stopped, Old (or current) AP's + * context is restored both at Polaris & software + * + * Return: None + */ + +void +lim_restore_pre_reassoc_state(tpAniSirGlobal pMac, + tSirResultCodes resultCode, uint16_t protStatusCode, + tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; + + lim_log(pMac, LOG1, + FL("sessionid: %d protStatusCode: %d resultCode: %d"), + psessionEntry->smeSessionId, protStatusCode, resultCode); + + psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, + eLIM_MLM_LINK_ESTABLISHED_STATE)); + + /* 'Change' timer for future activations */ + lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER); + + lim_set_channel(pMac, psessionEntry->currentOperChannel, + psessionEntry->ch_center_freq_seg0, + psessionEntry->ch_center_freq_seg1, + psessionEntry->ch_width, + psessionEntry->maxTxPower, + psessionEntry->peSessionId); + + /* @ToDo:Need to Integrate the STOP the Dataxfer to AP from 11H code */ + + mlmReassocCnf.resultCode = resultCode; + mlmReassocCnf.protStatusCode = protStatusCode; + mlmReassocCnf.sessionId = psessionEntry->peSessionId; + lim_post_sme_message(pMac, + LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); +} + +/** + * lim_post_reassoc_failure() - Post failure message to SME + * @pMac: Global MAC Context + * @resultCode: Result Code + * @protStatusCode: Protocol Status Code + * @psessionEntry: PE Session + * + * Return: None + */ +void lim_post_reassoc_failure(tpAniSirGlobal pMac, + tSirResultCodes resultCode, uint16_t protStatusCode, + tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; + + psessionEntry->limMlmState = eLIM_MLM_LINK_ESTABLISHED_STATE; + MTRACE(mac_trace + (pMac, TRACE_CODE_MLM_STATE, psessionEntry->peSessionId, + eLIM_MLM_LINK_ESTABLISHED_STATE)); + + lim_deactivate_and_change_timer(pMac, eLIM_REASSOC_FAIL_TIMER); + + mlmReassocCnf.resultCode = resultCode; + mlmReassocCnf.protStatusCode = protStatusCode; + mlmReassocCnf.sessionId = psessionEntry->peSessionId; + lim_post_sme_message(pMac, + LIM_MLM_REASSOC_CNF, (uint32_t *) &mlmReassocCnf); +} + -- cgit v1.2.3 From b6ef113b4b06ceb8aa7d467adbe1f7d60cff7b2c Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Thu, 11 Feb 2016 10:09:20 -0800 Subject: qcacld-3.0: Move the code related to sending roam frames to a separate file Move the routines which help in building and sending the roaming related management frames into a separate file for easy maintenance across different projects CRs-Fixed: 978905 Change-Id: If8e5cbdabef7747e58359961c3b13c577eb3b777 --- Kbuild | 1 + core/mac/src/pe/lim/lim_send_frames_host_roam.c | 801 +++++++++++++++++++++++ core/mac/src/pe/lim/lim_send_management_frames.c | 741 --------------------- 3 files changed, 802 insertions(+), 741 deletions(-) create mode 100644 core/mac/src/pe/lim/lim_send_frames_host_roam.c diff --git a/Kbuild b/Kbuild index a9c5967d4597..14375b1c087f 100755 --- a/Kbuild +++ b/Kbuild @@ -427,6 +427,7 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_scan_result_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_security_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_management_frames.o \ + $(MAC_SRC_DIR)/pe/lim/lim_send_frames_host_roam.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_sme_rsp_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_ser_des_utils.o \ diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c new file mode 100644 index 000000000000..b4cff732b25b --- /dev/null +++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c @@ -0,0 +1,801 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: lim_send_frames_host_roam.c + * + * Send management frames for host based roaming + */ +#include "sir_api.h" +#include "ani_global.h" +#include "sir_mac_prot_def.h" +#include "cfg_api.h" +#include "utils_api.h" +#include "lim_types.h" +#include "lim_utils.h" +#include "lim_security_utils.h" +#include "lim_prop_exts_utils.h" +#include "dot11f.h" +#include "lim_sta_hash_api.h" +#include "sch_api.h" +#include "lim_send_messages.h" +#include "lim_assoc_utils.h" +#include "lim_ft.h" +#ifdef WLAN_FEATURE_11W +#include "wni_cfg.h" +#endif + +#include "lim_ft_defs.h" +#include "lim_session.h" +#include "qdf_types.h" +#include "qdf_trace.h" +#include "cds_utils.h" +#include "sme_trace.h" +#include "rrm_api.h" + +#include "wma_types.h" + +/** + * lim_send_reassoc_req_with_ft_ies_mgmt_frame() - Send Reassoc Req with FTIEs. + * + * @mac_ctx: Handle to mac context + * @mlm_reassoc_req: Original reassoc request + * @pe_session: PE session information + * + * It builds a reassoc request with FT IEs and sends it to AP through WMA. + * Then it creates assoc request and stores it for sending after join + * confirmation. + * + * Return: None + */ +void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, + tLimMlmReassocReq *mlm_reassoc_req, + tpPESession pe_session) +{ + static tDot11fReAssocRequest frm; + uint16_t caps; + uint8_t *frame; + uint32_t bytes, payload, status; + uint8_t qos_enabled, wme_enabled, wsm_enabled; + void *packet; + QDF_STATUS qdf_status; + uint8_t power_caps_populated = false; + uint16_t ft_ies_length = 0; + uint8_t *body; + uint16_t add_ie_len; + uint8_t *add_ie; + uint8_t *wps_ie = NULL; + uint8_t tx_flag = 0; + uint8_t sme_sessionid = 0; + bool vht_enabled = false; + tpSirMacMgmtHdr mac_hdr; + tftSMEContext *ft_sme_context; + + if (NULL == pe_session) + return; + + sme_sessionid = pe_session->smeSessionId; + + /* check this early to avoid unncessary operation */ + if (NULL == pe_session->pLimReAssocReq) + return; + + add_ie_len = pe_session->pLimReAssocReq->addIEAssoc.length; + add_ie = pe_session->pLimReAssocReq->addIEAssoc.addIEdata; + lim_log(mac_ctx, LOG1, + FL("called in state (%d)."), pe_session->limMlmState); + + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + + caps = mlm_reassoc_req->capabilityInfo; +#if defined(FEATURE_WLAN_WAPI) + /* + * According to WAPI standard: + * 7.3.1.4 Capability Information field + * In WAPI, non-AP STAs within an ESS set the Privacy subfield + * to 0 in transmitted Association or Reassociation management + * frames. APs ignore the Privacy subfield within received + * Association and Reassociation management frames. + */ + if (pe_session->encryptType == eSIR_ED_WPI) + ((tSirMacCapabilityInfo *) &caps)->privacy = 0; +#endif + swap_bit_field16(caps, (uint16_t *) &frm.Capabilities); + + frm.ListenInterval.interval = mlm_reassoc_req->listenInterval; + + /* + * Get the old bssid of the older AP. + * The previous ap bssid is stored in the FT Session + * while creating the PE FT Session for reassociation. + */ + qdf_mem_copy((uint8_t *)frm.CurrentAPAddress.mac, + pe_session->prev_ap_bssid, sizeof(tSirMacAddr)); + + populate_dot11f_ssid2(mac_ctx, &frm.SSID); + populate_dot11f_supp_rates(mac_ctx, POPULATE_DOT11F_RATES_OPERATIONAL, + &frm.SuppRates, pe_session); + + qos_enabled = (pe_session->limQosEnabled) && + SIR_MAC_GET_QOS(pe_session->limReassocBssCaps); + + wme_enabled = (pe_session->limWmeEnabled) && + LIM_BSS_CAPS_GET(WME, pe_session->limReassocBssQosCaps); + + wsm_enabled = (pe_session->limWsmEnabled) && wme_enabled && + LIM_BSS_CAPS_GET(WSM, pe_session->limReassocBssQosCaps); + + if (pe_session->lim11hEnable && + pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { + power_caps_populated = true; + + populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps, + LIM_REASSOC, pe_session); + populate_dot11f_supp_channels(mac_ctx, &frm.SuppChannels, + LIM_REASSOC, pe_session); + } + if (mac_ctx->rrm.rrmPEContext.rrmEnable && + SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) { + if (power_caps_populated == false) { + power_caps_populated = true; + populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps, + LIM_REASSOC, pe_session); + } + } + + if (qos_enabled) + populate_dot11f_qos_caps_station(mac_ctx, &frm.QOSCapsStation); + + populate_dot11f_ext_supp_rates(mac_ctx, + POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, + pe_session); + + if (mac_ctx->rrm.rrmPEContext.rrmEnable && + SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) + populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session); + + /* + * Ideally this should be enabled for 11r also. But 11r does + * not follow the usual norm of using the Opaque object + * for rsnie and fties. Instead we just add the rsnie and fties + * at the end of the pack routine for 11r. + * This should ideally! be fixed. + */ + /* + * The join request *should* contain zero or one of the WPA and RSN + * IEs. The payload send along with the request is a + * 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': + * + * typedef struct sSirRSNie + * { + * uint16_t length; + * uint8_t rsnIEdata[SIR_MAC_MAX_IE_LENGTH+2]; + * } tSirRSNie, *tpSirRSNie; + * + * So, we should be able to make the following two calls harmlessly, + * since they do nothing if they don't find the given IE in the + * bytestream with which they're provided. + * + * The net effect of this will be to faithfully transmit whatever + * security IE is in the join request. + + * However, if we're associating for the purpose of WPS + * enrollment, and we've been configured to indicate that by + * eliding the WPA or RSN IE, we just skip this: + */ + if (!pe_session->is11Rconnection) { + if (add_ie_len && add_ie) + wps_ie = limGetWscIEPtr(mac_ctx, add_ie, add_ie_len); + if (NULL == wps_ie) { + populate_dot11f_rsn_opaque(mac_ctx, + &(pe_session->pLimReAssocReq->rsnIE), + &frm.RSNOpaque); + populate_dot11f_wpa_opaque(mac_ctx, + &(pe_session->pLimReAssocReq->rsnIE), + &frm.WPAOpaque); + } +#ifdef FEATURE_WLAN_ESE + if (pe_session->pLimReAssocReq->cckmIE.length) { + populate_dot11f_ese_cckm_opaque(mac_ctx, + &(pe_session->pLimReAssocReq->cckmIE), + &frm.ESECckmOpaque); + } +#endif + } +#ifdef FEATURE_WLAN_ESE + /* + * ESE Version IE will be included in re-association request + * when ESE is enabled on DUT through ini and it is also + * advertised by the peer AP to which we are trying to + * associate to. + */ + if (pe_session->is_ese_version_ie_present && + mac_ctx->roam.configParam.isEseIniFeatureEnabled) + populate_dot11f_ese_version(&frm.ESEVersion); + /* For ESE Associations fill the ESE IEs */ + if (pe_session->isESEconnection && + pe_session->pLimReAssocReq->isESEFeatureIniEnabled) { +#ifndef FEATURE_DISABLE_RM + populate_dot11f_ese_rad_mgmt_cap(&frm.ESERadMgmtCap); +#endif + } +#endif /* FEATURE_WLAN_ESE */ + + /* include WME EDCA IE as well */ + if (wme_enabled) { + populate_dot11f_wmm_info_station_per_session(mac_ctx, + pe_session, &frm.WMMInfoStation); + if (wsm_enabled) + populate_dot11f_wmm_caps(&frm.WMMCaps); +#ifdef FEATURE_WLAN_ESE + if (pe_session->isESEconnection) { + uint32_t phymode; + uint8_t rate; + + populate_dot11f_re_assoc_tspec(mac_ctx, &frm, + pe_session); + + /* + * Populate the TSRS IE if TSPEC is included in + * the reassoc request + */ + lim_get_phy_mode(mac_ctx, &phymode, pe_session); + if (phymode == WNI_CFG_PHY_MODE_11G || + phymode == WNI_CFG_PHY_MODE_11A) + rate = TSRS_11AG_RATE_6MBPS; + else + rate = TSRS_11B_RATE_5_5MBPS; + + if (pe_session->pLimReAssocReq->eseTspecInfo. + numTspecs) { + tSirMacESETSRSIE tsrs_ie; + + tsrs_ie.tsid = 0; + tsrs_ie.rates[0] = rate; + populate_dot11_tsrsie(mac_ctx, &tsrs_ie, + &frm.ESETrafStrmRateSet, + sizeof(uint8_t)); + } + } +#endif + } + + ft_sme_context = &mac_ctx->roam.roamSession[sme_sessionid].ftSmeContext; + if (pe_session->htCapability && + mac_ctx->lim.htCapabilityPresentInBeacon) { + populate_dot11f_ht_caps(mac_ctx, pe_session, &frm.HTCaps); + } + if (pe_session->pLimReAssocReq->bssDescription.mdiePresent && + (ft_sme_context->addMDIE == true) +#if defined FEATURE_WLAN_ESE + && !pe_session->isESEconnection +#endif + ) { + populate_mdie(mac_ctx, &frm.MobilityDomain, + pe_session->pLimReAssocReq->bssDescription.mdie); + } + if (pe_session->vhtCapability && + pe_session->vhtCapabilityPresentInBeacon) { + lim_log(mac_ctx, LOG1, + FL("Populate VHT IEs in Re-Assoc Request")); + populate_dot11f_vht_caps(mac_ctx, pe_session, &frm.VHTCaps); + vht_enabled = true; + populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm.ExtCap, + pe_session); + } + if (!vht_enabled && + pe_session->is_vendor_specific_vhtcaps) { + lim_log(mac_ctx, LOG1, + FL("Populate Vendor VHT IEs in Re-Assoc Request")); + frm.vendor2_ie.present = 1; + frm.vendor2_ie.type = + pe_session->vendor_specific_vht_ie_type; + frm.vendor2_ie.sub_type = + pe_session->vendor_specific_vht_ie_sub_type; + frm.vendor2_ie.VHTCaps.present = 1; + populate_dot11f_vht_caps(mac_ctx, pe_session, + &frm.vendor2_ie.VHTCaps); + vht_enabled = true; + } + status = dot11f_get_packed_re_assoc_request_size(mac_ctx, &frm, + &payload); + if (DOT11F_FAILED(status)) { + lim_log(mac_ctx, LOGP, + FL("Failure in size calculation (0x%08x)."), status); + /* We'll fall back on the worst case scenario: */ + payload = sizeof(tDot11fReAssocRequest); + } else if (DOT11F_WARNED(status)) { + lim_log(mac_ctx, LOGW, + FL("Warnings in size calculation(0x%08x)."), status); + } + + bytes = payload + sizeof(tSirMacMgmtHdr) + add_ie_len; + + lim_log(mac_ctx, LOG1, FL("FT IE Reassoc Req (%d)."), + ft_sme_context->reassoc_ft_ies_length); + + if (pe_session->is11Rconnection) + ft_ies_length = ft_sme_context->reassoc_ft_ies_length; + + qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, + (void **)&frame, (void **)&packet); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + pe_session->limMlmState = pe_session->limPrevMlmState; + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + pe_session->peSessionId, + pe_session->limMlmState)); + lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes); + goto end; + } + /* Paranoia: */ + qdf_mem_set(frame, bytes + ft_ies_length, 0); + + lim_print_mac_addr(mac_ctx, pe_session->limReAssocbssId, LOG1); + /* Next, we fill out the buffer descriptor: */ + lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, + SIR_MAC_MGMT_REASSOC_REQ, pe_session->limReAssocbssId, + pe_session->selfMacAddr); + mac_hdr = (tpSirMacMgmtHdr) frame; + /* That done, pack the ReAssoc Request: */ + status = dot11f_pack_re_assoc_request(mac_ctx, &frm, frame + + sizeof(tSirMacMgmtHdr), + payload, &payload); + if (DOT11F_FAILED(status)) { + lim_log(mac_ctx, LOGE, FL("Failure in pack (0x%08x)."), status); + cds_packet_free((void *)packet); + goto end; + } else if (DOT11F_WARNED(status)) { + lim_log(mac_ctx, LOGW, FL("Warnings in pack (0x%08x)."), + status); + } + + lim_log(mac_ctx, LOG3, + FL("*** Sending Re-Assoc Request length %d %d to "), + bytes, payload); + + if (pe_session->assocReq != NULL) { + qdf_mem_free(pe_session->assocReq); + pe_session->assocReq = NULL; + pe_session->assocReqLen = 0; + } + + if (add_ie_len) { + qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, + add_ie, add_ie_len); + payload += add_ie_len; + } + + pe_session->assocReq = qdf_mem_malloc(payload); + if (NULL == pe_session->assocReq) { + lim_log(mac_ctx, LOGE, FL("Failed to alloc memory")); + } else { + /* + * Store the Assoc request. This is sent to csr/hdd in + * join cnf response. + */ + qdf_mem_copy(pe_session->assocReq, + frame + sizeof(tSirMacMgmtHdr), payload); + pe_session->assocReqLen = payload; + } + + if (pe_session->is11Rconnection && ft_sme_context->reassoc_ft_ies) { + int i = 0; + + body = frame + bytes; + for (i = 0; i < ft_ies_length; i++) { + *body = ft_sme_context->reassoc_ft_ies[i]; + body++; + } + } + lim_log(mac_ctx, LOG1, FL("Re-assoc Req Frame is: ")); + sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG1, + (uint8_t *) frame, (bytes + ft_ies_length)); + if ((SIR_BAND_5_GHZ == + lim_get_rf_band(pe_session->currentOperChannel)) || + (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || + (pe_session->pePersona == QDF_P2P_GO_MODE)) { + tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; + } + + if (NULL != pe_session->assocReq) { + qdf_mem_free(pe_session->assocReq); + pe_session->assocReq = NULL; + pe_session->assocReqLen = 0; + } + if (ft_ies_length) { + pe_session->assocReq = qdf_mem_malloc(ft_ies_length); + if (NULL == pe_session->assocReq) { + lim_log(mac_ctx, + LOGE, FL("Failed to alloc memory for FT IEs")); + pe_session->assocReqLen = 0; + } else { + /* + * Store the FT IEs. This is sent to csr/hdd in + * join cnf response. + */ + qdf_mem_copy(pe_session->assocReq, + ft_sme_context->reassoc_ft_ies, ft_ies_length); + pe_session->assocReqLen = ft_ies_length; + } + } else { + lim_log(mac_ctx, LOG1, FL("FT IEs not present")); + pe_session->assocReqLen = 0; + } + +#ifdef FEATURE_WLAN_DIAG_SUPPORT + lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT, + pe_session, eSIR_SUCCESS, eSIR_SUCCESS); +#endif + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + pe_session->peSessionId, mac_hdr->fc.subType)); + qdf_status = wma_tx_frame(mac_ctx, packet, + (uint16_t) (bytes + ft_ies_length), + TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, + lim_tx_complete, frame, tx_flag, sme_sessionid, + 0); + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + pe_session->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + lim_log(mac_ctx, LOGE, + FL("Failed to send Re-Assoc Request (%X)!"), + qdf_status); + } + +end: + /* Free up buffer allocated for mlmAssocReq */ + qdf_mem_free(mlm_reassoc_req); + pe_session->pLimMlmReassocReq = NULL; + +} + +/** + * lim_send_retry_reassoc_req_frame() - Retry for reassociation + * @pMac: Global MAC Context + * @pMlmReassocReq: Request buffer to be sent + * @psessionEntry: PE Session + * + * Return: None + */ +void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, + tLimMlmReassocReq *pMlmReassocReq, + tpPESession psessionEntry) +{ + tLimMlmReassocCnf mlmReassocCnf; /* keep sme */ + tLimMlmReassocReq *pTmpMlmReassocReq = NULL; + if (NULL == pTmpMlmReassocReq) { + pTmpMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); + if (NULL == pTmpMlmReassocReq) + goto end; + qdf_mem_set(pTmpMlmReassocReq, sizeof(tLimMlmReassocReq), 0); + qdf_mem_copy(pTmpMlmReassocReq, pMlmReassocReq, + sizeof(tLimMlmReassocReq)); + } + /* Prepare and send Reassociation request frame */ + /* start reassoc timer. */ + pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = + psessionEntry->peSessionId; + /* Start reassociation failure timer */ + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, + psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); + if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer) + != TX_SUCCESS) { + /* Could not start reassoc failure timer. */ + /* Log error */ + lim_log(pMac, LOGP, + FL("could not start Reassociation failure timer")); + /* Return Reassoc confirm with */ + /* Resources Unavailable */ + mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; + mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + goto end; + } + + lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac, pTmpMlmReassocReq, + psessionEntry); + return; + +end: + /* Free up buffer allocated for reassocReq */ + if (pMlmReassocReq != NULL) { + qdf_mem_free(pMlmReassocReq); + pMlmReassocReq = NULL; + } + if (pTmpMlmReassocReq != NULL) { + qdf_mem_free(pTmpMlmReassocReq); + pTmpMlmReassocReq = NULL; + } + mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; + mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; + /* Update PE sessio Id */ + mlmReassocCnf.sessionId = psessionEntry->peSessionId; + + lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, + (uint32_t *) &mlmReassocCnf); +} + +/** + * lim_send_reassoc_req_mgmt_frame() - Send the reassociation frame + * @pMac: Global MAC Context + * @pMlmReassocReq: Reassociation request buffer to be sent + * @psessionEntry: PE Session + * + * Return: None + */ +void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, + tLimMlmReassocReq *pMlmReassocReq, + tpPESession psessionEntry) +{ + static tDot11fReAssocRequest frm; + uint16_t caps; + uint8_t *pFrame; + uint32_t nBytes, nPayload, nStatus; + uint8_t fQosEnabled, fWmeEnabled, fWsmEnabled; + void *pPacket; + QDF_STATUS qdf_status; + uint16_t nAddIELen; + uint8_t *pAddIE; + uint8_t *wpsIe = NULL; + uint8_t txFlag = 0; + uint8_t PowerCapsPopulated = false; + uint8_t smeSessionId = 0; + bool isVHTEnabled = false; + tpSirMacMgmtHdr pMacHdr; + + if (NULL == psessionEntry) + return; + + smeSessionId = psessionEntry->smeSessionId; + if (NULL == psessionEntry->pLimReAssocReq) + return; + nAddIELen = psessionEntry->pLimReAssocReq->addIEAssoc.length; + pAddIE = psessionEntry->pLimReAssocReq->addIEAssoc.addIEdata; + + qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); + + caps = pMlmReassocReq->capabilityInfo; +#if defined(FEATURE_WLAN_WAPI) + /* + * CR: 262463 : + * According to WAPI standard: + * 7.3.1.4 Capability Information field + * In WAPI, non-AP STAs within an ESS set the Privacy subfield to 0 in + * transmitted. Association or Reassociation management frames. APs + * ignore the Privacy subfield within received Association and + * Reassociation management frames. + */ + if (psessionEntry->encryptType == eSIR_ED_WPI) + ((tSirMacCapabilityInfo *) &caps)->privacy = 0; +#endif + swap_bit_field16(caps, (uint16_t *) &frm.Capabilities); + + frm.ListenInterval.interval = pMlmReassocReq->listenInterval; + + qdf_mem_copy((uint8_t *) frm.CurrentAPAddress.mac, + (uint8_t *) psessionEntry->bssId, 6); + + populate_dot11f_ssid2(pMac, &frm.SSID); + populate_dot11f_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL, + &frm.SuppRates, psessionEntry); + + fQosEnabled = (psessionEntry->limQosEnabled) && + SIR_MAC_GET_QOS(psessionEntry->limReassocBssCaps); + + fWmeEnabled = (psessionEntry->limWmeEnabled) && + LIM_BSS_CAPS_GET(WME, psessionEntry->limReassocBssQosCaps); + + fWsmEnabled = (psessionEntry->limWsmEnabled) && fWmeEnabled && + LIM_BSS_CAPS_GET(WSM, psessionEntry->limReassocBssQosCaps); + + if (psessionEntry->lim11hEnable && + psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { + PowerCapsPopulated = true; + populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC, + psessionEntry); + populate_dot11f_supp_channels(pMac, &frm.SuppChannels, + LIM_REASSOC, psessionEntry); + } + if (pMac->rrm.rrmPEContext.rrmEnable && + SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) { + if (PowerCapsPopulated == false) { + PowerCapsPopulated = true; + populate_dot11f_power_caps(pMac, &frm.PowerCaps, + LIM_REASSOC, psessionEntry); + } + } + + if (fQosEnabled) + populate_dot11f_qos_caps_station(pMac, &frm.QOSCapsStation); + + populate_dot11f_ext_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL, + &frm.ExtSuppRates, psessionEntry); + + if (pMac->rrm.rrmPEContext.rrmEnable && + SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) + populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry); + /* The join request *should* contain zero or one of the WPA and RSN */ + /* IEs. The payload send along with the request is a */ + /* 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': */ + + /* typedef struct sSirRSNie */ + /* { */ + /* uint16_t length; */ + /* uint8_t rsnIEdata[SIR_MAC_MAX_IE_LENGTH+2]; */ + /* } tSirRSNie, *tpSirRSNie; */ + + /* So, we should be able to make the following two calls harmlessly, */ + /* since they do nothing if they don't find the given IE in the */ + /* bytestream with which they're provided. */ + + /* The net effect of this will be to faithfully transmit whatever */ + /* security IE is in the join request. */ + + /**However*, if we're associating for the purpose of WPS */ + /* enrollment, and we've been configured to indicate that by */ + /* eliding the WPA or RSN IE, we just skip this: */ + if (nAddIELen && pAddIE) + wpsIe = limGetWscIEPtr(pMac, pAddIE, nAddIELen); + if (NULL == wpsIe) { + populate_dot11f_rsn_opaque(pMac, + &(psessionEntry->pLimReAssocReq->rsnIE), + &frm.RSNOpaque); + populate_dot11f_wpa_opaque(pMac, + &(psessionEntry->pLimReAssocReq->rsnIE), + &frm.WPAOpaque); +#if defined(FEATURE_WLAN_WAPI) + populate_dot11f_wapi_opaque(pMac, + &(psessionEntry->pLimReAssocReq-> + rsnIE), &frm.WAPIOpaque); +#endif /* defined(FEATURE_WLAN_WAPI) */ + } + /* include WME EDCA IE as well */ + if (fWmeEnabled) { + populate_dot11f_wmm_info_station_per_session(pMac, + psessionEntry, &frm.WMMInfoStation); + + if (fWsmEnabled) + populate_dot11f_wmm_caps(&frm.WMMCaps); + } + + if (psessionEntry->htCapability && + pMac->lim.htCapabilityPresentInBeacon) { + populate_dot11f_ht_caps(pMac, psessionEntry, &frm.HTCaps); + } + if (psessionEntry->vhtCapability && + psessionEntry->vhtCapabilityPresentInBeacon) { + lim_log(pMac, LOGW, FL("Populate VHT IEs in Re-Assoc Request")); + populate_dot11f_vht_caps(pMac, psessionEntry, &frm.VHTCaps); + isVHTEnabled = true; + } + populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm.ExtCap, psessionEntry); + nStatus = + dot11f_get_packed_re_assoc_request_size(pMac, &frm, &nPayload); + if (DOT11F_FAILED(nStatus)) { + lim_log(pMac, LOGP, FL("Fail to get size:ReassocReq(0x%08x)"), + nStatus); + /* We'll fall back on the worst case scenario: */ + nPayload = sizeof(tDot11fReAssocRequest); + } else if (DOT11F_WARNED(nStatus)) { + lim_log(pMac, LOGW, FL("warning for size:ReAssoc Req(0x%08x)."), + nStatus); + } + + nBytes = nPayload + sizeof(tSirMacMgmtHdr) + nAddIELen; + + qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, + (void **)&pPacket); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + psessionEntry->limMlmState = psessionEntry->limPrevMlmState; + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, + psessionEntry->peSessionId, + psessionEntry->limMlmState)); + lim_log(pMac, LOGP, + FL("Failed to alloc %d bytes for a ReAssociation Req."), + nBytes); + goto end; + } + /* Paranoia: */ + qdf_mem_set(pFrame, nBytes, 0); + + /* Next, we fill out the buffer descriptor: */ + lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, + SIR_MAC_MGMT_REASSOC_REQ, psessionEntry->limReAssocbssId, + psessionEntry->selfMacAddr); + pMacHdr = (tpSirMacMgmtHdr) pFrame; + + /* That done, pack the Probe Request: */ + nStatus = dot11f_pack_re_assoc_request(pMac, &frm, pFrame + + sizeof(tSirMacMgmtHdr), + nPayload, &nPayload); + if (DOT11F_FAILED(nStatus)) { + lim_log(pMac, LOGE, FL("Fail to pack a Re-Assoc Req(0x%08x)."), + nStatus); + cds_packet_free((void *)pPacket); + goto end; + } else if (DOT11F_WARNED(nStatus)) { + lim_log(pMac, LOGW, FL("warning packing a Re-AssocReq(0x%08x)"), + nStatus); + } + + PELOG1(lim_log + (pMac, LOG1, + FL("*** Sending Re-Association Request length %d" "to "), + nBytes); + ) + + if (psessionEntry->assocReq != NULL) { + qdf_mem_free(psessionEntry->assocReq); + psessionEntry->assocReq = NULL; + psessionEntry->assocReqLen = 0; + } + + if (nAddIELen) { + qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, + pAddIE, nAddIELen); + nPayload += nAddIELen; + } + + psessionEntry->assocReq = qdf_mem_malloc(nPayload); + if (NULL == psessionEntry->assocReq) { + lim_log(pMac, LOGE, FL("Unable to allocate mem for assoc req")); + } else { + /* Store the Assocrequest. It is sent to csr in joincnfrsp */ + qdf_mem_copy(psessionEntry->assocReq, + pFrame + sizeof(tSirMacMgmtHdr), nPayload); + psessionEntry->assocReqLen = nPayload; + } + + if ((SIR_BAND_5_GHZ == + lim_get_rf_band(psessionEntry->currentOperChannel)) + || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || + (psessionEntry->pePersona == QDF_P2P_GO_MODE)) + txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; + + if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE || + psessionEntry->pePersona == QDF_STA_MODE) + txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; + +#ifdef FEATURE_WLAN_DIAG_SUPPORT + lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT, + psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); +#endif + MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, + psessionEntry->peSessionId, pMacHdr->fc.subType)); + qdf_status = + wma_tx_frame(pMac, pPacket, + (uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload), + TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, + lim_tx_complete, pFrame, txFlag, smeSessionId, 0); + MTRACE(qdf_trace + (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, + psessionEntry->peSessionId, qdf_status)); + if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { + lim_log(pMac, LOGE, + FL("Failed to send Re-Association Request (%X)!"), + qdf_status); + /* Pkt will be freed up by the callback */ + } + +end: + /* Free up buffer allocated for mlmAssocReq */ + qdf_mem_free(pMlmReassocReq); + psessionEntry->pLimMlmReassocReq = NULL; + +} + diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c index 0b6d8bace2bb..46987e92081e 100644 --- a/core/mac/src/pe/lim/lim_send_management_frames.c +++ b/core/mac/src/pe/lim/lim_send_management_frames.c @@ -1948,747 +1948,6 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, return; } -/** - * lim_send_reassoc_req_with_ft_ies_mgmt_frame() - Send Reassoc Req with FTIEs. - * - * @mac_ctx: Handle to mac context - * @mlm_reassoc_req: Original reassoc request - * @pe_session: PE session information - * - * It builds a reassoc request with FT IEs and sends it to AP through WMA. - * Then it creates assoc request and stores it for sending after join - * confirmation. - * - * Return: void - */ - -void -lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx, - tLimMlmReassocReq *mlm_reassoc_req, - tpPESession pe_session) -{ - static tDot11fReAssocRequest frm; - uint16_t caps; - uint8_t *frame; - uint32_t bytes, payload, status; - uint8_t qos_enabled, wme_enabled, wsm_enabled; - void *packet; - QDF_STATUS qdf_status; - uint8_t power_caps_populated = false; - uint16_t ft_ies_length = 0; - uint8_t *body; - uint16_t add_ie_len; - uint8_t *add_ie; - uint8_t *wps_ie = NULL; - uint8_t tx_flag = 0; - uint8_t sme_sessionid = 0; - bool vht_enabled = false; - tpSirMacMgmtHdr mac_hdr; - tftSMEContext *ft_sme_context; - - if (NULL == pe_session) - return; - - sme_sessionid = pe_session->smeSessionId; - - /* check this early to avoid unncessary operation */ - if (NULL == pe_session->pLimReAssocReq) - return; - - add_ie_len = pe_session->pLimReAssocReq->addIEAssoc.length; - add_ie = pe_session->pLimReAssocReq->addIEAssoc.addIEdata; - lim_log(mac_ctx, LOG1, - FL("called in state (%d)."), pe_session->limMlmState); - - qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); - - caps = mlm_reassoc_req->capabilityInfo; -#if defined(FEATURE_WLAN_WAPI) - /* - * According to WAPI standard: - * 7.3.1.4 Capability Information field - * In WAPI, non-AP STAs within an ESS set the Privacy subfield - * to 0 in transmitted Association or Reassociation management - * frames. APs ignore the Privacy subfield within received - * Association and Reassociation management frames. - */ - if (pe_session->encryptType == eSIR_ED_WPI) - ((tSirMacCapabilityInfo *) &caps)->privacy = 0; -#endif - swap_bit_field16(caps, (uint16_t *) &frm.Capabilities); - - frm.ListenInterval.interval = mlm_reassoc_req->listenInterval; - - /* - * Get the old bssid of the older AP. - * The previous ap bssid is stored in the FT Session - * while creating the PE FT Session for reassociation. - */ - qdf_mem_copy((uint8_t *)frm.CurrentAPAddress.mac, - pe_session->prev_ap_bssid, sizeof(tSirMacAddr)); - - populate_dot11f_ssid2(mac_ctx, &frm.SSID); - populate_dot11f_supp_rates(mac_ctx, POPULATE_DOT11F_RATES_OPERATIONAL, - &frm.SuppRates, pe_session); - - qos_enabled = (pe_session->limQosEnabled) && - SIR_MAC_GET_QOS(pe_session->limReassocBssCaps); - - wme_enabled = (pe_session->limWmeEnabled) && - LIM_BSS_CAPS_GET(WME, pe_session->limReassocBssQosCaps); - - wsm_enabled = (pe_session->limWsmEnabled) && wme_enabled && - LIM_BSS_CAPS_GET(WSM, pe_session->limReassocBssQosCaps); - - if (pe_session->lim11hEnable && - pe_session->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { - power_caps_populated = true; - - populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps, - LIM_REASSOC, pe_session); - populate_dot11f_supp_channels(mac_ctx, &frm.SuppChannels, - LIM_REASSOC, pe_session); - } - if (mac_ctx->rrm.rrmPEContext.rrmEnable && - SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) { - if (power_caps_populated == false) { - power_caps_populated = true; - populate_dot11f_power_caps(mac_ctx, &frm.PowerCaps, - LIM_REASSOC, pe_session); - } - } - - if (qos_enabled) - populate_dot11f_qos_caps_station(mac_ctx, &frm.QOSCapsStation); - - populate_dot11f_ext_supp_rates(mac_ctx, - POPULATE_DOT11F_RATES_OPERATIONAL, &frm.ExtSuppRates, - pe_session); - - if (mac_ctx->rrm.rrmPEContext.rrmEnable && - SIR_MAC_GET_RRM(pe_session->limCurrentBssCaps)) - populate_dot11f_rrm_ie(mac_ctx, &frm.RRMEnabledCap, pe_session); - - /* - * Ideally this should be enabled for 11r also. But 11r does - * not follow the usual norm of using the Opaque object - * for rsnie and fties. Instead we just add the rsnie and fties - * at the end of the pack routine for 11r. - * This should ideally! be fixed. - */ - /* - * The join request *should* contain zero or one of the WPA and RSN - * IEs. The payload send along with the request is a - * 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': - * - * typedef struct sSirRSNie - * { - * uint16_t length; - * uint8_t rsnIEdata[SIR_MAC_MAX_IE_LENGTH+2]; - * } tSirRSNie, *tpSirRSNie; - * - * So, we should be able to make the following two calls harmlessly, - * since they do nothing if they don't find the given IE in the - * bytestream with which they're provided. - * - * The net effect of this will be to faithfully transmit whatever - * security IE is in the join request. - - * However, if we're associating for the purpose of WPS - * enrollment, and we've been configured to indicate that by - * eliding the WPA or RSN IE, we just skip this: - */ - if (!pe_session->is11Rconnection) { - if (add_ie_len && add_ie) - wps_ie = limGetWscIEPtr(mac_ctx, add_ie, add_ie_len); - if (NULL == wps_ie) { - populate_dot11f_rsn_opaque(mac_ctx, - &(pe_session->pLimReAssocReq->rsnIE), - &frm.RSNOpaque); - populate_dot11f_wpa_opaque(mac_ctx, - &(pe_session->pLimReAssocReq->rsnIE), - &frm.WPAOpaque); - } -#ifdef FEATURE_WLAN_ESE - if (pe_session->pLimReAssocReq->cckmIE.length) { - populate_dot11f_ese_cckm_opaque(mac_ctx, - &(pe_session->pLimReAssocReq->cckmIE), - &frm.ESECckmOpaque); - } -#endif - } -#ifdef FEATURE_WLAN_ESE - /* - * ESE Version IE will be included in re-association request - * when ESE is enabled on DUT through ini and it is also - * advertised by the peer AP to which we are trying to - * associate to. - */ - if (pe_session->is_ese_version_ie_present && - mac_ctx->roam.configParam.isEseIniFeatureEnabled) - populate_dot11f_ese_version(&frm.ESEVersion); - /* For ESE Associations fill the ESE IEs */ - if (pe_session->isESEconnection && - pe_session->pLimReAssocReq->isESEFeatureIniEnabled) { -#ifndef FEATURE_DISABLE_RM - populate_dot11f_ese_rad_mgmt_cap(&frm.ESERadMgmtCap); -#endif - } -#endif /* FEATURE_WLAN_ESE */ - - /* include WME EDCA IE as well */ - if (wme_enabled) { - populate_dot11f_wmm_info_station_per_session(mac_ctx, - pe_session, &frm.WMMInfoStation); - if (wsm_enabled) - populate_dot11f_wmm_caps(&frm.WMMCaps); -#ifdef FEATURE_WLAN_ESE - if (pe_session->isESEconnection) { - uint32_t phymode; - uint8_t rate; - - populate_dot11f_re_assoc_tspec(mac_ctx, &frm, - pe_session); - - /* - * Populate the TSRS IE if TSPEC is included in - * the reassoc request - */ - lim_get_phy_mode(mac_ctx, &phymode, pe_session); - if (phymode == WNI_CFG_PHY_MODE_11G || - phymode == WNI_CFG_PHY_MODE_11A) - rate = TSRS_11AG_RATE_6MBPS; - else - rate = TSRS_11B_RATE_5_5MBPS; - - if (pe_session->pLimReAssocReq->eseTspecInfo. - numTspecs) { - tSirMacESETSRSIE tsrs_ie; - - tsrs_ie.tsid = 0; - tsrs_ie.rates[0] = rate; - populate_dot11_tsrsie(mac_ctx, &tsrs_ie, - &frm.ESETrafStrmRateSet, - sizeof(uint8_t)); - } - } -#endif - } - - ft_sme_context = &mac_ctx->roam.roamSession[sme_sessionid].ftSmeContext; - if (pe_session->htCapability && - mac_ctx->lim.htCapabilityPresentInBeacon) { - populate_dot11f_ht_caps(mac_ctx, pe_session, &frm.HTCaps); - } - if (pe_session->pLimReAssocReq->bssDescription.mdiePresent && - (ft_sme_context->addMDIE == true) -#if defined FEATURE_WLAN_ESE - && !pe_session->isESEconnection -#endif - ) { - populate_mdie(mac_ctx, &frm.MobilityDomain, - pe_session->pLimReAssocReq->bssDescription.mdie); - } - if (pe_session->vhtCapability && - pe_session->vhtCapabilityPresentInBeacon) { - lim_log(mac_ctx, LOG1, - FL("Populate VHT IEs in Re-Assoc Request")); - populate_dot11f_vht_caps(mac_ctx, pe_session, &frm.VHTCaps); - vht_enabled = true; - populate_dot11f_ext_cap(mac_ctx, vht_enabled, &frm.ExtCap, - pe_session); - } - if (!vht_enabled && - pe_session->is_vendor_specific_vhtcaps) { - lim_log(mac_ctx, LOG1, - FL("Populate Vendor VHT IEs in Re-Assoc Request")); - frm.vendor2_ie.present = 1; - frm.vendor2_ie.type = - pe_session->vendor_specific_vht_ie_type; - frm.vendor2_ie.sub_type = - pe_session->vendor_specific_vht_ie_sub_type; - frm.vendor2_ie.VHTCaps.present = 1; - populate_dot11f_vht_caps(mac_ctx, pe_session, - &frm.vendor2_ie.VHTCaps); - vht_enabled = true; - } - status = dot11f_get_packed_re_assoc_request_size(mac_ctx, &frm, - &payload); - if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGP, - FL("Failure in size calculation (0x%08x)."), status); - /* We'll fall back on the worst case scenario: */ - payload = sizeof(tDot11fReAssocRequest); - } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, - FL("Warnings in size calculation(0x%08x)."), status); - } - - bytes = payload + sizeof(tSirMacMgmtHdr) + add_ie_len; - - lim_log(mac_ctx, LOG1, FL("FT IE Reassoc Req (%d)."), - ft_sme_context->reassoc_ft_ies_length); - - if (pe_session->is11Rconnection) - ft_ies_length = ft_sme_context->reassoc_ft_ies_length; - - qdf_status = cds_packet_alloc((uint16_t) bytes + ft_ies_length, - (void **)&frame, (void **)&packet); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - pe_session->limMlmState = pe_session->limPrevMlmState; - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, - pe_session->peSessionId, - pe_session->limMlmState)); - lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes); - goto end; - } - /* Paranoia: */ - qdf_mem_set(frame, bytes + ft_ies_length, 0); - - lim_print_mac_addr(mac_ctx, pe_session->limReAssocbssId, LOG1); - /* Next, we fill out the buffer descriptor: */ - lim_populate_mac_header(mac_ctx, frame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_REASSOC_REQ, pe_session->limReAssocbssId, - pe_session->selfMacAddr); - mac_hdr = (tpSirMacMgmtHdr) frame; - /* That done, pack the ReAssoc Request: */ - status = dot11f_pack_re_assoc_request(mac_ctx, &frm, frame + - sizeof(tSirMacMgmtHdr), - payload, &payload); - if (DOT11F_FAILED(status)) { - lim_log(mac_ctx, LOGE, FL("Failure in pack (0x%08x)."), status); - cds_packet_free((void *)packet); - goto end; - } else if (DOT11F_WARNED(status)) { - lim_log(mac_ctx, LOGW, FL("Warnings in pack (0x%08x)."), - status); - } - - lim_log(mac_ctx, LOG3, - FL("*** Sending Re-Assoc Request length %d %d to "), - bytes, payload); - - if (pe_session->assocReq != NULL) { - qdf_mem_free(pe_session->assocReq); - pe_session->assocReq = NULL; - pe_session->assocReqLen = 0; - } - - if (add_ie_len) { - qdf_mem_copy(frame + sizeof(tSirMacMgmtHdr) + payload, - add_ie, add_ie_len); - payload += add_ie_len; - } - - pe_session->assocReq = qdf_mem_malloc(payload); - if (NULL == pe_session->assocReq) { - lim_log(mac_ctx, LOGE, FL("Failed to alloc memory")); - } else { - /* - * Store the Assoc request. This is sent to csr/hdd in - * join cnf response. - */ - qdf_mem_copy(pe_session->assocReq, - frame + sizeof(tSirMacMgmtHdr), payload); - pe_session->assocReqLen = payload; - } - - if (pe_session->is11Rconnection && ft_sme_context->reassoc_ft_ies) { - int i = 0; - - body = frame + bytes; - for (i = 0; i < ft_ies_length; i++) { - *body = ft_sme_context->reassoc_ft_ies[i]; - body++; - } - } - lim_log(mac_ctx, LOG1, FL("Re-assoc Req Frame is: ")); - sir_dump_buf(mac_ctx, SIR_LIM_MODULE_ID, LOG1, - (uint8_t *) frame, (bytes + ft_ies_length)); - if ((SIR_BAND_5_GHZ == - lim_get_rf_band(pe_session->currentOperChannel)) || - (pe_session->pePersona == QDF_P2P_CLIENT_MODE) || - (pe_session->pePersona == QDF_P2P_GO_MODE)) { - tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - } - - if (NULL != pe_session->assocReq) { - qdf_mem_free(pe_session->assocReq); - pe_session->assocReq = NULL; - pe_session->assocReqLen = 0; - } - if (ft_ies_length) { - pe_session->assocReq = qdf_mem_malloc(ft_ies_length); - if (NULL == pe_session->assocReq) { - lim_log(mac_ctx, - LOGE, FL("Failed to alloc memory for FT IEs")); - pe_session->assocReqLen = 0; - } else { - /* - * Store the FT IEs. This is sent to csr/hdd in - * join cnf response. - */ - qdf_mem_copy(pe_session->assocReq, - ft_sme_context->reassoc_ft_ies, ft_ies_length); - pe_session->assocReqLen = ft_ies_length; - } - } else { - lim_log(mac_ctx, LOG1, FL("FT IEs not present")); - pe_session->assocReqLen = 0; - } - -#ifdef FEATURE_WLAN_DIAG_SUPPORT - lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT, - pe_session, eSIR_SUCCESS, eSIR_SUCCESS); -#endif - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, - pe_session->peSessionId, mac_hdr->fc.subType)); - qdf_status = wma_tx_frame(mac_ctx, packet, - (uint16_t) (bytes + ft_ies_length), - TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, - lim_tx_complete, frame, tx_flag, sme_sessionid, - 0); - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - pe_session->peSessionId, qdf_status)); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - lim_log(mac_ctx, LOGE, - FL("Failed to send Re-Assoc Request (%X)!"), - qdf_status); - } - -end: - /* Free up buffer allocated for mlmAssocReq */ - qdf_mem_free(mlm_reassoc_req); - pe_session->pLimMlmReassocReq = NULL; - -} - -void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, - tLimMlmReassocReq *pMlmReassocReq, - tpPESession psessionEntry) -{ - tLimMlmReassocCnf mlmReassocCnf; /* keep sme */ - tLimMlmReassocReq *pTmpMlmReassocReq = NULL; - if (NULL == pTmpMlmReassocReq) { - pTmpMlmReassocReq = qdf_mem_malloc(sizeof(tLimMlmReassocReq)); - if (NULL == pTmpMlmReassocReq) - goto end; - qdf_mem_set(pTmpMlmReassocReq, sizeof(tLimMlmReassocReq), 0); - qdf_mem_copy(pTmpMlmReassocReq, pMlmReassocReq, - sizeof(tLimMlmReassocReq)); - } - /* Prepare and send Reassociation request frame */ - /* start reassoc timer. */ - pMac->lim.limTimers.gLimReassocFailureTimer.sessionId = - psessionEntry->peSessionId; - /* Start reassociation failure timer */ - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE, - psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER)); - if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer) - != TX_SUCCESS) { - /* Could not start reassoc failure timer. */ - /* Log error */ - lim_log(pMac, LOGP, - FL("could not start Reassociation failure timer")); - /* Return Reassoc confirm with */ - /* Resources Unavailable */ - mlmReassocCnf.resultCode = eSIR_SME_RESOURCES_UNAVAILABLE; - mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - goto end; - } - - lim_send_reassoc_req_with_ft_ies_mgmt_frame(pMac, pTmpMlmReassocReq, - psessionEntry); - return; - -end: - /* Free up buffer allocated for reassocReq */ - if (pMlmReassocReq != NULL) { - qdf_mem_free(pMlmReassocReq); - pMlmReassocReq = NULL; - } - if (pTmpMlmReassocReq != NULL) { - qdf_mem_free(pTmpMlmReassocReq); - pTmpMlmReassocReq = NULL; - } - mlmReassocCnf.resultCode = eSIR_SME_FT_REASSOC_FAILURE; - mlmReassocCnf.protStatusCode = eSIR_MAC_UNSPEC_FAILURE_STATUS; - /* Update PE sessio Id */ - mlmReassocCnf.sessionId = psessionEntry->peSessionId; - - lim_post_sme_message(pMac, LIM_MLM_REASSOC_CNF, - (uint32_t *) &mlmReassocCnf); -} - - -void -lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac, - tLimMlmReassocReq *pMlmReassocReq, - tpPESession psessionEntry) -{ - static tDot11fReAssocRequest frm; - uint16_t caps; - uint8_t *pFrame; - uint32_t nBytes, nPayload, nStatus; - uint8_t fQosEnabled, fWmeEnabled, fWsmEnabled; - void *pPacket; - QDF_STATUS qdf_status; - uint16_t nAddIELen; - uint8_t *pAddIE; - uint8_t *wpsIe = NULL; - uint8_t txFlag = 0; - uint8_t PowerCapsPopulated = false; - uint8_t smeSessionId = 0; - bool isVHTEnabled = false; - tpSirMacMgmtHdr pMacHdr; - - if (NULL == psessionEntry) { - return; - } - - smeSessionId = psessionEntry->smeSessionId; - - /* check this early to avoid unncessary operation */ - if (NULL == psessionEntry->pLimReAssocReq) { - return; - } - nAddIELen = psessionEntry->pLimReAssocReq->addIEAssoc.length; - pAddIE = psessionEntry->pLimReAssocReq->addIEAssoc.addIEdata; - - qdf_mem_set((uint8_t *) &frm, sizeof(frm), 0); - - caps = pMlmReassocReq->capabilityInfo; -#if defined(FEATURE_WLAN_WAPI) - /* CR: 262463 : - According to WAPI standard: - 7.3.1.4 Capability Information field - In WAPI, non-AP STAs within an ESS set the Privacy subfield to 0 in transmitted - Association or Reassociation management frames. APs ignore the Privacy subfield within received Association and - Reassociation management frames. */ - if (psessionEntry->encryptType == eSIR_ED_WPI) - ((tSirMacCapabilityInfo *) &caps)->privacy = 0; -#endif - swap_bit_field16(caps, (uint16_t *) &frm.Capabilities); - - frm.ListenInterval.interval = pMlmReassocReq->listenInterval; - - qdf_mem_copy((uint8_t *) frm.CurrentAPAddress.mac, - (uint8_t *) psessionEntry->bssId, 6); - - populate_dot11f_ssid2(pMac, &frm.SSID); - populate_dot11f_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL, - &frm.SuppRates, psessionEntry); - - fQosEnabled = (psessionEntry->limQosEnabled) && - SIR_MAC_GET_QOS(psessionEntry->limReassocBssCaps); - - fWmeEnabled = (psessionEntry->limWmeEnabled) && - LIM_BSS_CAPS_GET(WME, psessionEntry->limReassocBssQosCaps); - - fWsmEnabled = (psessionEntry->limWsmEnabled) && fWmeEnabled && - LIM_BSS_CAPS_GET(WSM, psessionEntry->limReassocBssQosCaps); - - if (psessionEntry->lim11hEnable && - psessionEntry->pLimReAssocReq->spectrumMgtIndicator == eSIR_TRUE) { - PowerCapsPopulated = true; - populate_dot11f_power_caps(pMac, &frm.PowerCaps, LIM_REASSOC, - psessionEntry); - populate_dot11f_supp_channels(pMac, &frm.SuppChannels, LIM_REASSOC, - psessionEntry); - } - if (pMac->rrm.rrmPEContext.rrmEnable && - SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) { - if (PowerCapsPopulated == false) { - PowerCapsPopulated = true; - populate_dot11f_power_caps(pMac, &frm.PowerCaps, - LIM_REASSOC, psessionEntry); - } - } - - if (fQosEnabled) - populate_dot11f_qos_caps_station(pMac, &frm.QOSCapsStation); - - populate_dot11f_ext_supp_rates(pMac, POPULATE_DOT11F_RATES_OPERATIONAL, - &frm.ExtSuppRates, psessionEntry); - - if (pMac->rrm.rrmPEContext.rrmEnable && - SIR_MAC_GET_RRM(psessionEntry->limCurrentBssCaps)) - populate_dot11f_rrm_ie(pMac, &frm.RRMEnabledCap, psessionEntry); - /* The join request *should* contain zero or one of the WPA and RSN */ - /* IEs. The payload send along with the request is a */ - /* 'tSirSmeJoinReq'; the IE portion is held inside a 'tSirRSNie': */ - - /* typedef struct sSirRSNie */ - /* { */ - /* uint16_t length; */ - /* uint8_t rsnIEdata[SIR_MAC_MAX_IE_LENGTH+2]; */ - /* } tSirRSNie, *tpSirRSNie; */ - - /* So, we should be able to make the following two calls harmlessly, */ - /* since they do nothing if they don't find the given IE in the */ - /* bytestream with which they're provided. */ - - /* The net effect of this will be to faithfully transmit whatever */ - /* security IE is in the join request. */ - - /**However*, if we're associating for the purpose of WPS */ - /* enrollment, and we've been configured to indicate that by */ - /* eliding the WPA or RSN IE, we just skip this: */ - if (nAddIELen && pAddIE) { - wpsIe = limGetWscIEPtr(pMac, pAddIE, nAddIELen); - } - if (NULL == wpsIe) { - populate_dot11f_rsn_opaque(pMac, - &(psessionEntry->pLimReAssocReq->rsnIE), - &frm.RSNOpaque); - populate_dot11f_wpa_opaque(pMac, - &(psessionEntry->pLimReAssocReq->rsnIE), - &frm.WPAOpaque); -#if defined(FEATURE_WLAN_WAPI) - populate_dot11f_wapi_opaque(pMac, - &(psessionEntry->pLimReAssocReq-> - rsnIE), &frm.WAPIOpaque); -#endif /* defined(FEATURE_WLAN_WAPI) */ - } - /* include WME EDCA IE as well */ - if (fWmeEnabled) { - populate_dot11f_wmm_info_station_per_session(pMac, - psessionEntry, - &frm.WMMInfoStation); - - if (fWsmEnabled) - populate_dot11f_wmm_caps(&frm.WMMCaps); - } - - if (psessionEntry->htCapability && - pMac->lim.htCapabilityPresentInBeacon) { - populate_dot11f_ht_caps(pMac, psessionEntry, &frm.HTCaps); - } - if (psessionEntry->vhtCapability && - psessionEntry->vhtCapabilityPresentInBeacon) { - lim_log(pMac, LOGW, FL("Populate VHT IEs in Re-Assoc Request")); - populate_dot11f_vht_caps(pMac, psessionEntry, &frm.VHTCaps); - isVHTEnabled = true; - } - populate_dot11f_ext_cap(pMac, isVHTEnabled, &frm.ExtCap, psessionEntry); - nStatus = dot11f_get_packed_re_assoc_request_size(pMac, &frm, &nPayload); - if (DOT11F_FAILED(nStatus)) { - lim_log(pMac, LOGP, FL("Failed to calculate the packed size f" - "or a Re-Association Request (0x%08x)."), - nStatus); - /* We'll fall back on the worst case scenario: */ - nPayload = sizeof(tDot11fReAssocRequest); - } else if (DOT11F_WARNED(nStatus)) { - lim_log(pMac, LOGW, FL("There were warnings while calculating " - "the packed size for a Re-Association Re " - "quest(0x%08x)."), nStatus); - } - - nBytes = nPayload + sizeof(tSirMacMgmtHdr) + nAddIELen; - - qdf_status = cds_packet_alloc((uint16_t) nBytes, (void **)&pFrame, - (void **)&pPacket); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - psessionEntry->limMlmState = psessionEntry->limPrevMlmState; - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE, - psessionEntry->peSessionId, - psessionEntry->limMlmState)); - lim_log(pMac, LOGP, - FL("Failed to allocate %d bytes for a Re-As" - "sociation Request."), nBytes); - goto end; - } - /* Paranoia: */ - qdf_mem_set(pFrame, nBytes, 0); - - /* Next, we fill out the buffer descriptor: */ - lim_populate_mac_header(pMac, pFrame, SIR_MAC_MGMT_FRAME, - SIR_MAC_MGMT_REASSOC_REQ, psessionEntry->limReAssocbssId, - psessionEntry->selfMacAddr); - pMacHdr = (tpSirMacMgmtHdr) pFrame; - - /* That done, pack the Probe Request: */ - nStatus = dot11f_pack_re_assoc_request(pMac, &frm, pFrame + - sizeof(tSirMacMgmtHdr), - nPayload, &nPayload); - if (DOT11F_FAILED(nStatus)) { - lim_log(pMac, LOGE, FL("Failed to pack a Re-Association Reque" - "st (0x%08x)."), nStatus); - cds_packet_free((void *)pPacket); - goto end; - } else if (DOT11F_WARNED(nStatus)) { - lim_log(pMac, LOGW, FL("There were warnings while packing a R" - "e-Association Request (0x%08x)."), - nStatus); - } - - PELOG1(lim_log - (pMac, LOG1, - FL("*** Sending Re-Association Request length %d" "to "), - nBytes); - ) - - if (psessionEntry->assocReq != NULL) { - qdf_mem_free(psessionEntry->assocReq); - psessionEntry->assocReq = NULL; - psessionEntry->assocReqLen = 0; - } - - if (nAddIELen) { - qdf_mem_copy(pFrame + sizeof(tSirMacMgmtHdr) + nPayload, - pAddIE, nAddIELen); - nPayload += nAddIELen; - } - - psessionEntry->assocReq = qdf_mem_malloc(nPayload); - if (NULL == psessionEntry->assocReq) { - lim_log(pMac, LOGE, FL("Unable to allocate mem for assoc req")); - } else { - /* Store the Assoc request. This is sent to csr/hdd in join cnf response. */ - qdf_mem_copy(psessionEntry->assocReq, - pFrame + sizeof(tSirMacMgmtHdr), nPayload); - psessionEntry->assocReqLen = nPayload; - } - - if ((SIR_BAND_5_GHZ == lim_get_rf_band(psessionEntry->currentOperChannel)) - || (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE) || - (psessionEntry->pePersona == QDF_P2P_GO_MODE) - ) { - txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME; - } - - if (psessionEntry->pePersona == QDF_P2P_CLIENT_MODE || - psessionEntry->pePersona == QDF_STA_MODE) - txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK; - -#ifdef FEATURE_WLAN_DIAG_SUPPORT - lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT, - psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS); -#endif - MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT, - psessionEntry->peSessionId, pMacHdr->fc.subType)); - qdf_status = - wma_tx_frame(pMac, pPacket, - (uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload), - TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7, - lim_tx_complete, pFrame, txFlag, smeSessionId, 0); - MTRACE(qdf_trace - (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE, - psessionEntry->peSessionId, qdf_status)); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) { - lim_log(pMac, LOGE, - FL("Failed to send Re-Association Request (%X)!"), - qdf_status); - /* Pkt will be freed up by the callback */ - } - -end: - /* Free up buffer allocated for mlmAssocReq */ - qdf_mem_free(pMlmReassocReq); - psessionEntry->pLimMlmReassocReq = NULL; - -} /* lim_send_reassoc_req_mgmt_frame */ - /** * lim_auth_tx_complete_cnf()- Confirmation for auth sent over the air * -- cgit v1.2.3 From 4204eed710f9cf44a66507573c2becbb904ad2c1 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Tue, 16 Feb 2016 10:02:01 -0800 Subject: qcacld-3.0: Isolate roaming timers into a separate file Move all the roaming related timers into a separate file for easy maintenance and management across different projects CRs-Fixed: 978905 Change-Id: I3bdbf13d9f962af36d74837bf50be7c9a93e824e --- Kbuild | 1 + core/mac/src/pe/lim/lim_roam_timer_utils.c | 153 +++++++++++++++++++++++++++++ core/mac/src/pe/lim/lim_timer_utils.c | 122 ----------------------- 3 files changed, 154 insertions(+), 122 deletions(-) create mode 100644 core/mac/src/pe/lim/lim_roam_timer_utils.c diff --git a/Kbuild b/Kbuild index 14375b1c087f..8d91605cde10 100755 --- a/Kbuild +++ b/Kbuild @@ -436,6 +436,7 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_sme_req_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_sta_hash_api.o \ $(MAC_SRC_DIR)/pe/lim/lim_timer_utils.o \ + $(MAC_SRC_DIR)/pe/lim/lim_roam_timer_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_trace.o \ $(MAC_SRC_DIR)/pe/lim/lim_utils.o diff --git a/core/mac/src/pe/lim/lim_roam_timer_utils.c b/core/mac/src/pe/lim/lim_roam_timer_utils.c new file mode 100644 index 000000000000..32383b5f89f8 --- /dev/null +++ b/core/mac/src/pe/lim/lim_roam_timer_utils.c @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: lim_roam_timer_utils.c + * + * Host based roaming timers implementation + */ + +#include "lim_types.h" +#include "lim_utils.h" +#include "lim_assoc_utils.h" +#include "lim_security_utils.h" + +/** + * lim_create_timers_host_roam() - Create timers used in host based roaming + * @mac_ctx: Global MAC context + * + * Create reassoc and preauth timers + * + * Return: TX_SUCCESS or TX_TIMER_ERROR + */ +uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx) +{ + uint32_t cfg_value; + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + &cfg_value) != eSIR_SUCCESS) + lim_log(mac_ctx, LOGP, + FL("could not retrieve ReassocFailureTimeout value")); + + cfg_value = SYS_MS_TO_TICKS(cfg_value); + /* Create Association failure timer and activate it later */ + if (tx_timer_create(mac_ctx, + &mac_ctx->lim.limTimers.gLimReassocFailureTimer, + "REASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, + LIM_REASSOC, cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, FL("failed to create Reassoc timer")); + return TX_TIMER_ERROR; + } + cfg_value = 1000; + cfg_value = SYS_MS_TO_TICKS(cfg_value); + if (tx_timer_create(mac_ctx, + &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + "FT PREAUTH RSP TIMEOUT", + lim_timer_handler, SIR_LIM_FT_PREAUTH_RSP_TIMEOUT, + cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, FL("failed to create Join fail timer")); + goto err_roam_timer; + } + return TX_SUCCESS; + +err_roam_timer: + tx_timer_delete(&mac_ctx->lim.limTimers.gLimReassocFailureTimer); + return TX_TIMER_ERROR; +} + +/** + * lim_delete_timers_host_roam() - Delete timers used in host based roaming + * @mac_ctx: Global MAC context + * + * Delete reassoc and preauth timers + * + * Return: none + */ +void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx) +{ + tLimTimers *lim_timer = &mac_ctx->lim.limTimers; + + /* Deactivate and delete Reassociation failure timer. */ + tx_timer_deactivate(&lim_timer->gLimReassocFailureTimer); + tx_timer_delete(&lim_timer->gLimReassocFailureTimer); + + /* Deactivate and delete FT Preauth response timer */ + tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); + tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); +} + +/** + * lim_deactivate_and_change_timer_host_roam() - Change timers in host roaming + * @mac_ctx: Pointer to Global MAC structure + * @timer_id: enum of timer to be deactivated and changed + * + * This function is called to deactivate and change a timer for future + * re-activation for host roaming timers. + * + * Return: None + */ +void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx, + uint32_t timer_id) +{ + uint32_t val = 0; + + switch (timer_id) { + case eLIM_REASSOC_FAIL_TIMER: + if (tx_timer_deactivate + (&mac_ctx->lim.limTimers.gLimReassocFailureTimer) != + TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("unable to deactivate Reassoc fail timer")); + } + if (wlan_cfg_get_int(mac_ctx, + WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + &val) != eSIR_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("could not get ReassocFailureTimeout val")); + } + val = SYS_MS_TO_TICKS(val); + if (tx_timer_change + (&mac_ctx->lim.limTimers.gLimReassocFailureTimer, val, + 0) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("unable to change Reassoc fail timer")); + } + break; + + case eLIM_FT_PREAUTH_RSP_TIMER: + if (tx_timer_deactivate + (&mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer) != + TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("Unable to deactivate Preauth Fail timer")); + return; + } + val = 1000; + val = SYS_MS_TO_TICKS(val); + if (tx_timer_change( + &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, + val, 0) != TX_SUCCESS) { + lim_log(mac_ctx, LOGP, + FL("Unable to change Join Failure timer")); + return; + } + break; + } +} + diff --git a/core/mac/src/pe/lim/lim_timer_utils.c b/core/mac/src/pe/lim/lim_timer_utils.c index b79b8ca1aef7..31be129d8581 100644 --- a/core/mac/src/pe/lim/lim_timer_utils.c +++ b/core/mac/src/pe/lim/lim_timer_utils.c @@ -58,128 +58,6 @@ convert ACTIVE DFS channel to DFS channels */ #define ACTIVE_TO_PASSIVE_CONVERISON_TIMEOUT 1000 -/** - * lim_create_timers_host_roam() - Create timers used in host based roaming - * @mac_ctx: Global MAC context - * - * Create reassoc and preauth timers - * - * Return: TX_SUCCESS or TX_TIMER_ERROR - */ -uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx) -{ - uint32_t cfg_value; - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - &cfg_value) != eSIR_SUCCESS) - lim_log(mac_ctx, LOGP, - FL("could not retrieve ReassocFailureTimeout value")); - - cfg_value = SYS_MS_TO_TICKS(cfg_value); - /* Create Association failure timer and activate it later */ - if (tx_timer_create(mac_ctx, - &mac_ctx->lim.limTimers.gLimReassocFailureTimer, - "REASSOC FAILURE TIMEOUT", lim_assoc_failure_timer_handler, - LIM_REASSOC, cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(mac_ctx, LOGP, FL("failed to create Reassoc timer")); - return TX_TIMER_ERROR; - } - cfg_value = 1000; - cfg_value = SYS_MS_TO_TICKS(cfg_value); - if (tx_timer_create(mac_ctx, - &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, - "FT PREAUTH RSP TIMEOUT", - lim_timer_handler, SIR_LIM_FT_PREAUTH_RSP_TIMEOUT, - cfg_value, 0, TX_NO_ACTIVATE) != TX_SUCCESS) { - lim_log(mac_ctx, LOGP, FL("failed to create Join fail timer")); - goto err_roam_timer; - } - return TX_SUCCESS; - -err_roam_timer: - tx_timer_delete(&mac_ctx->lim.limTimers.gLimReassocFailureTimer); - return TX_TIMER_ERROR; -} - -/** - * lim_delete_timers_host_roam() - Delete timers used in host based roaming - * @mac_ctx: Global MAC context - * - * Delete reassoc and preauth timers - * - * Return: none - */ -void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx) -{ - tLimTimers *lim_timer = &mac_ctx->lim.limTimers; - - /* Deactivate and delete Reassociation failure timer. */ - tx_timer_deactivate(&lim_timer->gLimReassocFailureTimer); - tx_timer_delete(&lim_timer->gLimReassocFailureTimer); - - /* Deactivate and delete FT Preauth response timer */ - tx_timer_deactivate(&lim_timer->gLimFTPreAuthRspTimer); - tx_timer_delete(&lim_timer->gLimFTPreAuthRspTimer); -} - -/** - * lim_deactivate_and_change_timer_host_roam() - Change timers in host roaming - * @mac_ctx: Pointer to Global MAC structure - * @timer_id: enum of timer to be deactivated and changed - * - * This function is called to deactivate and change a timer for future - * re-activation for host roaming timers. - * - * Return: None - */ -void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx, - uint32_t timer_id) -{ - uint32_t val = 0; - - switch (timer_id) { - case eLIM_REASSOC_FAIL_TIMER: - if (tx_timer_deactivate - (&mac_ctx->lim.limTimers.gLimReassocFailureTimer) != - TX_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("unable to deactivate Reassoc fail timer")); - } - if (wlan_cfg_get_int(mac_ctx, - WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - &val) != eSIR_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("could not get ReassocFailureTimeout val")); - } - val = SYS_MS_TO_TICKS(val); - if (tx_timer_change - (&mac_ctx->lim.limTimers.gLimReassocFailureTimer, val, - 0) != TX_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("unable to change Reassoc fail timer")); - } - break; - - case eLIM_FT_PREAUTH_RSP_TIMER: - if (tx_timer_deactivate - (&mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer) != - TX_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("Unable to deactivate Preauth Fail timer")); - return; - } - val = 1000; - val = SYS_MS_TO_TICKS(val); - if (tx_timer_change( - &mac_ctx->lim.limTimers.gLimFTPreAuthRspTimer, - val, 0) != TX_SUCCESS) { - lim_log(mac_ctx, LOGP, - FL("Unable to change Join Failure timer")); - return; - } - break; - } -} - static bool lim_create_non_ap_timers(tpAniSirGlobal pMac) { uint32_t cfgValue; -- cgit v1.2.3 From a66f9c5d71758472cdffd826d77150d8437a8f04 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 17 Feb 2016 09:58:40 -0800 Subject: qcacld-3.0: Remove WLAN_FEATURE_ROAM_SCAN_OFFLOAD Remove WLAN_FEATURE_ROAM_SCAN_OFFLOAD compile time flag from the code since this is relevant to roaming (LFR2.0) and always enabled by default. The flag also does not seem to cover the feature entirely and it does not make any meaning to only cover this piece of code. CRs-Fixed: 978905 Change-Id: Ifa393c2733e87fcb34aba3e4f4cdb5f534196537 --- core/hdd/src/wlan_hdd_ioctl.c | 7 +------ core/sme/src/common/sme_api.c | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index a042203e4a34..eb2622b3149d 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -4653,9 +4653,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, tSirMacAddr targetApBssid; uint32_t roamId = 0; tCsrRoamModifyProfileFields modProfileFields; -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD tCsrHandoffRequest handoffInfo; -#endif hdd_station_ctx_t *pHddStaCtx; if (QDF_STA_MODE != adapter->device_mode) { @@ -4723,15 +4721,12 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, } #endif /* Proceed with reassoc */ -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD handoffInfo.channel = channel; handoffInfo.src = FASTREASSOC; - qdf_mem_copy(handoffInfo.bssid, targetApBssid, + qdf_mem_copy(handoffInfo.bssid.bytes, targetApBssid, sizeof(tSirMacAddr)); sme_handoff_request(hdd_ctx->hHal, adapter->sessionId, &handoffInfo); -#endif - exit: return ret; } diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 3384d3e0cf53..4c4bdcb744c1 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -15223,13 +15223,11 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle, } sme_release_global_lock(&mac_ctx->sme); } -#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD if (mac_ctx->roam.configParam.isRoamOffloadScanEnabled && status == QDF_STATUS_SUCCESS) { csr_roam_offload_scan(mac_ctx, session_id, ROAM_SCAN_OFFLOAD_UPDATE_CFG, reason); } -#endif return status; } -- cgit v1.2.3 From d318632e760dfe349ed164af85c04e70a8934ec3 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 19 Feb 2016 14:20:55 -0800 Subject: qcacld-3.0: Create new function for roaming state transitions Create a new function csr_neighbor_roam_state_transition to transition the roaming state and also log it CRs-Fixed: 978905 Change-Id: Id50d51fe1fa09dc9984ba83fbc01e8d9c7d00ffa --- core/sme/inc/csr_neighbor_roam.h | 4 ++ core/sme/src/csr/csr_neighbor_roam.c | 86 +++++++++++++++++------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 30af1b19641a..22872036e9cb 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -295,4 +295,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); #endif +void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx, + uint8_t newstate, uint8_t session); +uint8_t *csr_neighbor_roam_state_to_string(uint8_t state); + #endif /* CSR_NEIGHBOR_ROAM_H */ diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index a53ac928c504..92424ea10838 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -61,16 +61,17 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t session static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, uint8_t sessionId); -#define CSR_NEIGHBOR_ROAM_STATE_TRANSITION(mac_ctx, newstate, session) \ -{ \ - mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = \ - mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; \ - mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; \ - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, \ - FL("Sessionid (%d) NeighborRoam transition from %s to %s"), \ - session, csr_neighbor_roam_state_to_string( \ - mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState),\ - csr_neighbor_roam_state_to_string(newstate)); \ +void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx, + uint8_t newstate, uint8_t session) +{ + mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = + mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; + mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + FL("Sessionid (%d) NeighborRoam transition from %s to %s"), + session, csr_neighbor_roam_state_to_string( + mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState), + csr_neighbor_roam_state_to_string(newstate)); } uint8_t *csr_neighbor_roam_state_to_string(uint8_t state) @@ -922,9 +923,8 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, neighbor_roam_info->FTRoamInfo.numPreAuthRetries++; /* Transition the state to preauthenticating */ - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (mac_ctx, eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING, - session_id) + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING, session_id); return status; } @@ -1013,9 +1013,8 @@ QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, &preauth_rsp_node->List, LL_ACCESS_LOCK); /* Pre-auth successful. Transition to PREAUTH Done state */ - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (mac_ctx, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, - session_id) + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id); neighbor_roam_info->FTRoamInfo.numPreAuthRetries = 0; /* @@ -1103,9 +1102,8 @@ ABORT_PREAUTH: ROAM_SCAN_OFFLOAD_RESTART, REASON_PREAUTH_FAILED_FOR_ALL); } - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (mac_ctx, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, - session_id); + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id); } } @@ -1167,8 +1165,8 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, csr_ll_insert_tail(&neighbor_roam_info_ptr->FTRoamInfo.preAuthDoneList, &bss_info_ptr->List, LL_ACCESS_LOCK); - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (pMac, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id); neighbor_roam_info_ptr->FTRoamInfo.numPreAuthRetries = 0; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "LFR3:Entry added to Auth Done List"); @@ -1663,8 +1661,8 @@ static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, ROAM_SCAN_OFFLOAD_RESTART, REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); } - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); } return QDF_STATUS_SUCCESS; @@ -2304,9 +2302,8 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, * Otherwise, we will be stuck in reassoc state which'll * in-turn block scans. */ - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, - sessionId); + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo. IAPPNeighborListReceived = false; } @@ -2318,8 +2315,8 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, break; case eCSR_NEIGHBOR_ROAM_STATE_CONNECTED: - CSR_NEIGHBOR_ROAM_STATE_TRANSITION( - pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; csr_neighbor_roam_reset_connected_state_control_info(pMac, @@ -2331,8 +2328,8 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, qdf_mc_timer_stop(&pSession->ftSmeContext. preAuthReassocIntvlTimer); case eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING: - CSR_NEIGHBOR_ROAM_STATE_TRANSITION( - pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; csr_neighbor_roam_reset_preauth_control_info(pMac, sessionId); @@ -2345,8 +2342,8 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, mac_trace_get_neighbour_roam_state( pNeighborRoamInfo->neighborRoamState)); NEIGHBOR_ROAM_DEBUG(pMac, LOGW, FL("Transit to INIT state")); - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo. IAPPNeighborListReceived = false; break; @@ -2387,8 +2384,8 @@ static void csr_neighbor_roam_info_ctx_init( if (eCSR_NEIGHBOR_ROAM_STATE_INIT == ngbr_roam_info->neighborRoamState) csr_init_occupied_channels_list(pMac, session_id); - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (pMac, eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id); + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id); qdf_copy_macaddr(&ngbr_roam_info->currAPbssid, &session->connectedProfile.bssid); @@ -2567,9 +2564,8 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( * Just transition the state to INIT state.Rest of the * clean up happens when we get next connect indication */ - CSR_NEIGHBOR_ROAM_STATE_TRANSITION( - pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, - session_id) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, session_id); ngbr_roam_info->roamChannelInfo.IAPPNeighborListReceived = false; break; @@ -2805,8 +2801,8 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) return QDF_STATUS_E_RESOURCES; } - CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, - sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; /* Set the Last Sent Cmd as RSO_STOP */ pNeighborRoamInfo->last_sent_cmd = ROAM_SCAN_OFFLOAD_STOP; @@ -2874,8 +2870,8 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) preAuthDoneList); csr_ll_close(&pNeighborRoamInfo->FTRoamInfo.preAuthDoneList); - CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, - eCSR_NEIGHBOR_ROAM_STATE_CLOSED, sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_CLOSED, sessionId); return; } @@ -2928,8 +2924,8 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); - CSR_NEIGHBOR_ROAM_STATE_TRANSITION - (mac_ctx, eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING, session_id) + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING, session_id); csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, handoff_node.pBssDescription->bssId, @@ -3133,8 +3129,8 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM qdf_mc_timer_stop(&session->ftSmeContext.preAuthReassocIntvlTimer); /* Transition to init state */ - CSR_NEIGHBOR_ROAM_STATE_TRANSITION(pMac, eCSR_NEIGHBOR_ROAM_STATE_INIT, - sessionId) + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; } -- cgit v1.2.3 From 883c4f20f9f3073e49d1a68c1b4d2e91c55d3d3c Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Fri, 19 Feb 2016 11:32:52 -0800 Subject: qcacld-3.0: Move CSR preauth related code to a separate file Move the preauthentication related code in the CSR module into a separate file so that it is easy to maintain across different projects CRs-Fixed: 978905 Change-Id: I56e8441f08dec180f080c305ba5c6541302f107c --- Kbuild | 1 + core/sme/inc/csr_neighbor_roam.h | 22 + core/sme/src/csr/csr_api_roam.c | 258 ------------ core/sme/src/csr/csr_inside_api.h | 1 + core/sme/src/csr/csr_neighbor_roam.c | 501 +---------------------- core/sme/src/csr/csr_roam_preauth.c | 754 +++++++++++++++++++++++++++++++++++ 6 files changed, 779 insertions(+), 758 deletions(-) create mode 100644 core/sme/src/csr/csr_roam_preauth.c diff --git a/Kbuild b/Kbuild index 8d91605cde10..fbae71cd533e 100755 --- a/Kbuild +++ b/Kbuild @@ -500,6 +500,7 @@ SME_INC := -I$(WLAN_ROOT)/$(SME_INC_DIR) \ -I$(WLAN_ROOT)/$(SME_SRC_DIR)/csr SME_CSR_OBJS := $(SME_SRC_DIR)/csr/csr_api_roam.o \ + $(SME_SRC_DIR)/csr/csr_roam_preauth.o \ $(SME_SRC_DIR)/csr/csr_api_scan.o \ $(SME_SRC_DIR)/csr/csr_cmd_process.o \ $(SME_SRC_DIR)/csr/csr_link_list.o \ diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 22872036e9cb..00fc97725f9a 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -298,5 +298,27 @@ void csr_roam_synch_callback(tpAniSirGlobal mac, void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx, uint8_t newstate, uint8_t session); uint8_t *csr_neighbor_roam_state_to_string(uint8_t state); +tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap( + tpAniSirGlobal mac_ctx, tDblLinkList *llist, + tpCsrNeighborRoamBSSInfo neighbor_entry); +bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac, + tDblLinkList *pList, tpCsrNeighborRoamBSSInfo pNeighborEntry); +void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, + tpCsrNeighborRoamBSSInfo neighborRoamBSSNode); +QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, + uint8_t sessionId); +void csr_neighbor_roam_reset_preauth_control_info( + tpAniSirGlobal mac_ctx, uint8_t session_id); +bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, + uint8_t sessionId, tSirMacAddr bssId); +#ifdef FEATURE_WLAN_LFR_METRICS +void csr_neighbor_roam_send_lfr_metric_event(tpAniSirGlobal mac_ctx, + uint8_t session_id, tSirMacAddr bssid, eRoamCmdStatus status); +#else +static inline void csr_neighbor_roam_send_lfr_metric_event( + tpAniSirGlobal mac_ctx, uint8_t session_id, + tSirMacAddr bssid, eRoamCmdStatus status) +{} +#endif #endif /* CSR_NEIGHBOR_ROAM_H */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 81ea9fadad07..800a28d71f84 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -280,7 +280,6 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac, void csr_roam_reissue_roam_command(tpAniSirGlobal pMac); static void csr_ser_des_unpack_diassoc_rsp(uint8_t *pBuf, tSirSmeDisassocRsp *pRsp); -void csr_reinit_preauth_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); void csr_init_operating_classes(tHalHandle hHal); /* Initialize global variables */ @@ -1089,12 +1088,6 @@ static QDF_STATUS csr_roam_free_connected_info(tpAniSirGlobal pMac, return status; } -void csr_release_command_preauth(tpAniSirGlobal pMac, tSmeCmd *pCommand) -{ - csr_reinit_preauth_cmd(pMac, pCommand); - csr_release_command(pMac, pCommand); -} - void csr_release_command_roam(tpAniSirGlobal pMac, tSmeCmd *pCommand) { csr_reinit_roam_cmd(pMac, pCommand); @@ -5508,14 +5501,6 @@ QDF_STATUS csr_roam_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand) return status; } -void csr_reinit_preauth_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) -{ - pCommand->u.roamCmd.pLastRoamBss = NULL; - pCommand->u.roamCmd.pRoamBssEntry = NULL; - /* Because u.roamCmd is union and share with scanCmd and StatusChange */ - qdf_mem_set(&pCommand->u.roamCmd, sizeof(tRoamCmd), 0); -} - void csr_reinit_roam_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand) { if (pCommand->u.roamCmd.fReleaseBssList) { @@ -7323,42 +7308,6 @@ QDF_STATUS csr_roam_issue_reassoc(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal pMac, uint32_t sessionId, - tpSirBssDescription pBssDescription, - eCsrRoamReason reason, bool fImmediate) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tSmeCmd *pCommand; - - pCommand = csr_get_command_buffer(pMac); - if (NULL == pCommand) { - sms_log(pMac, LOGE, FL(" fail to get command buffer")); - status = QDF_STATUS_E_RESOURCES; - } else { - if (pBssDescription) { - /* copy over the parameters we need later */ - pCommand->command = eSmeCommandRoam; - pCommand->sessionId = (uint8_t) sessionId; - pCommand->u.roamCmd.roamReason = reason; - /* this is the important parameter */ - /* in this case we are using this field for the "next" BSS */ - pCommand->u.roamCmd.pLastRoamBss = pBssDescription; - status = csr_queue_sme_command(pMac, pCommand, fImmediate); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - FL - (" fail to enqueue preauth command, status = %d"), - status); - csr_release_command_preauth(pMac, pCommand); - } - } else { - /* Return failure */ - status = QDF_STATUS_E_RESOURCES; - } - } - return status; -} - QDF_STATUS csr_dequeue_roam_command(tpAniSirGlobal pMac, eCsrRoamReason reason) { tListElem *pEntry; @@ -17743,213 +17692,6 @@ QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -QDF_STATUS -csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, - tpSirBssDescription pBssDescription) -{ - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - tpSirFTPreAuthReq pftPreAuthReq; - uint16_t auth_req_len = 0; - tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - - if (NULL == pSession) { - sms_log(pMac, LOGE, - FL("Session does not exist for session id(%d)"), - sessionId); - return QDF_STATUS_E_FAILURE; - } - - auth_req_len = sizeof(tSirFTPreAuthReq); - pftPreAuthReq = (tpSirFTPreAuthReq) qdf_mem_malloc(auth_req_len); - if (NULL == pftPreAuthReq) { - sms_log(pMac, LOGE, - FL("Memory allocation for FT Preauth request failed")); - return QDF_STATUS_E_NOMEM; - } - /* Save the SME Session ID here. We need it while processing the preauth response */ - pSession->ftSmeContext.smeSessionId = sessionId; - qdf_mem_zero(pftPreAuthReq, auth_req_len); - - pftPreAuthReq->pbssDescription = - (tpSirBssDescription) qdf_mem_malloc(sizeof(pBssDescription->length) - + pBssDescription->length); - if (NULL == pftPreAuthReq->pbssDescription) { - sms_log(pMac, LOGE, - FL("Memory allocation for FT Preauth request failed")); - return QDF_STATUS_E_NOMEM; - } - - pftPreAuthReq->messageType = eWNI_SME_FT_PRE_AUTH_REQ; - - pftPreAuthReq->preAuthchannelNum = pBssDescription->channelId; - - qdf_mem_copy((void *)&pftPreAuthReq->currbssId, - (void *)pSession->connectedProfile.bssid.bytes, - sizeof(tSirMacAddr)); - qdf_mem_copy((void *)&pftPreAuthReq->preAuthbssId, - (void *)pBssDescription->bssId, sizeof(tSirMacAddr)); - qdf_mem_copy((void *)&pftPreAuthReq->self_mac_addr, - (void *)&pSession->selfMacAddr.bytes, sizeof(tSirMacAddr)); - - if (csr_roam_is11r_assoc(pMac, sessionId) && - (pMac->roam.roamSession[sessionId].connectedProfile.AuthType != - eCSR_AUTH_TYPE_OPEN_SYSTEM)) { - pftPreAuthReq->ft_ies_length = - (uint16_t) pSession->ftSmeContext.auth_ft_ies_length; - qdf_mem_copy(pftPreAuthReq->ft_ies, - pSession->ftSmeContext.auth_ft_ies, - pSession->ftSmeContext.auth_ft_ies_length); - } else { - pftPreAuthReq->ft_ies_length = 0; - } - qdf_mem_copy(pftPreAuthReq->pbssDescription, pBssDescription, - sizeof(pBssDescription->length) + pBssDescription->length); - pftPreAuthReq->length = auth_req_len; - return cds_send_mb_message_to_mac(pftPreAuthReq); -} - -/*-------------------------------------------------------------------------- - * This will receive and process the FT Pre Auth Rsp from the current - * associated ap. - * - * This will invoke the hdd call back. This is so that hdd can now - * send the FTIEs from the Auth Rsp (Auth Seq 2) to the supplicant. - ------------------------------------------------------------------------*/ -void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, - tpSirFTPreAuthRsp pFTPreAuthRsp) -{ - tpAniSirGlobal pMac = PMAC_STRUCT(hHal); - QDF_STATUS status = QDF_STATUS_SUCCESS; - tCsrRoamInfo roamInfo; - eCsrAuthType conn_Auth_type; - uint32_t sessionId = pFTPreAuthRsp->smeSessionId; - tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - - if (NULL == pSession) { - sms_log(pMac, LOGE, FL("pSession is NULL")); - return; - } - status = csr_neighbor_roam_preauth_rsp_handler(pMac, - pFTPreAuthRsp->smeSessionId, - pFTPreAuthRsp->status); - if (status != QDF_STATUS_SUCCESS) { - /* - * Bail out if pre-auth was not even processed. - */ - sms_log(pMac, LOGE, - FL("Preauth was not processed: %d SessionID: %d"), - status, sessionId); - return; - } - - /* The below function calls/timers should be invoked only if the pre-auth is successful */ - if (QDF_STATUS_SUCCESS != (QDF_STATUS) pFTPreAuthRsp->status) - return; - /* Implies a success */ - pSession->ftSmeContext.FTState = eFT_AUTH_COMPLETE; - /* Indicate SME QoS module the completion of Preauth success. This will trigger the creation of RIC IEs */ - pSession->ftSmeContext.psavedFTPreAuthRsp = pFTPreAuthRsp; - /* No need to notify qos module if this is a non 11r & ESE roam */ - if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId) -#ifdef FEATURE_WLAN_ESE - || csr_roam_is_ese_assoc(pMac, pFTPreAuthRsp->smeSessionId) -#endif - ) { - sme_qos_csr_event_ind(pMac, - pSession->ftSmeContext.smeSessionId, - SME_QOS_CSR_PREAUTH_SUCCESS_IND, NULL); - } - /* Start the pre-auth reassoc interval timer with a period of 400ms. When this expires, - * actual transition from the current to handoff AP is triggered */ - status = - qdf_mc_timer_start(&pSession->ftSmeContext.preAuthReassocIntvlTimer, - 60); - if (QDF_STATUS_SUCCESS != status) { - sms_log(pMac, LOGE, - FL - ("Preauth reassoc interval timer start failed to start with status %d"), - status); - return; - } - /* Save the received response */ - qdf_mem_copy((void *)&pSession->ftSmeContext.preAuthbssId, - (void *)pFTPreAuthRsp->preAuthbssId, sizeof(struct qdf_mac_addr)); - if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId)) - csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, NULL, 0, - eCSR_ROAM_FT_RESPONSE, - eCSR_ROAM_RESULT_NONE); - -#ifdef FEATURE_WLAN_ESE - if (csr_roam_is_ese_assoc(pMac, pFTPreAuthRsp->smeSessionId)) { - /* read TSF */ - csr_roam_read_tsf(pMac, (uint8_t *) roamInfo.timestamp, - pFTPreAuthRsp->smeSessionId); - /* Save the bssid from the received response */ - qdf_mem_copy((void *)&roamInfo.bssid, - (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct qdf_mac_addr)); - csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, - &roamInfo, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, - 0); - } -#endif /* FEATURE_WLAN_ESE */ - - /* If Legacy Fast Roaming is enabled, signal the supplicant */ - /* So he can send us a PMK-ID for this candidate AP. */ - if (csr_roam_is_fast_roam_enabled(pMac, pFTPreAuthRsp->smeSessionId)) { - /* Save the bssid from the received response */ - qdf_mem_copy((void *)&roamInfo.bssid, - (void *)pFTPreAuthRsp->preAuthbssId, - sizeof(struct qdf_mac_addr)); - csr_roam_call_callback(pMac, pFTPreAuthRsp->smeSessionId, - &roamInfo, 0, eCSR_ROAM_PMK_NOTIFY, 0); - } - - /* If its an Open Auth, FT IEs are not provided by supplicant */ - /* Hence populate them here */ - conn_Auth_type = - pMac->roam.roamSession[sessionId].connectedProfile.AuthType; - - pSession->ftSmeContext.addMDIE = false; - - /* Done with it, init it. */ - pSession->ftSmeContext.psavedFTPreAuthRsp = NULL; - - if (csr_roam_is11r_assoc(pMac, pFTPreAuthRsp->smeSessionId) && - (conn_Auth_type == eCSR_AUTH_TYPE_OPEN_SYSTEM)) { - uint16_t ft_ies_length; - ft_ies_length = pFTPreAuthRsp->ric_ies_length; - - if ((pSession->ftSmeContext.reassoc_ft_ies) && - (pSession->ftSmeContext.reassoc_ft_ies_length)) { - qdf_mem_free(pSession->ftSmeContext.reassoc_ft_ies); - pSession->ftSmeContext.reassoc_ft_ies_length = 0; - pSession->ftSmeContext.reassoc_ft_ies = NULL; - } - - if (!ft_ies_length) - return; - - pSession->ftSmeContext.reassoc_ft_ies = - qdf_mem_malloc(ft_ies_length); - if (NULL == pSession->ftSmeContext.reassoc_ft_ies) { - sms_log(pMac, LOGE, - FL("Memory allocation failed for ft_ies")); - return; - } else { - /* Copy the RIC IEs to reassoc IEs */ - qdf_mem_copy(((uint8_t *) pSession->ftSmeContext. - reassoc_ft_ies), - (uint8_t *) pFTPreAuthRsp->ric_ies, - pFTPreAuthRsp->ric_ies_length); - pSession->ftSmeContext.reassoc_ft_ies_length = - ft_ies_length; - pSession->ftSmeContext.addMDIE = true; - } - } -} - - /* pBuf points to the beginning of the message LIM packs disassoc rsp as below, diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 37b7c05a696a..1e7ae4cdbc99 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -1058,3 +1058,4 @@ bool is_disconnect_pending(tpAniSirGlobal mac_ctx, void csr_scan_active_list_timeout_handle(void *userData); QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd); +void csr_release_command_preauth(tpAniSirGlobal mac_ctx, tSmeCmd *command); diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 92424ea10838..76781a8bb692 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -52,15 +52,10 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo rChInfo); -static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac, - uint8_t sessionId); QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile); -static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, - uint8_t sessionId); - void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx, uint8_t newstate, uint8_t session) { @@ -103,7 +98,7 @@ uint8_t *csr_neighbor_roam_state_to_string(uint8_t state) * Return: void */ -static void csr_neighbor_roam_send_lfr_metric_event( +void csr_neighbor_roam_send_lfr_metric_event( tpAniSirGlobal mac_ctx, uint8_t session_id, tSirMacAddr bssid, @@ -122,16 +117,6 @@ static void csr_neighbor_roam_send_lfr_metric_event( qdf_mem_free(roam_info); } } -#else -/* Empty inline function will be a no-op */ -static inline void csr_neighbor_roam_send_lfr_metric_event( - tpAniSirGlobal mac_ctx, - uint8_t session_id, - tSirMacAddr bssid, - eRoamCmdStatus status) -{ - ; -} #endif /** @@ -633,30 +618,6 @@ static void csr_neighbor_roam_reset_channel_info(tpCsrNeighborRoamChannelInfo } } -static void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; - - pNeighborRoamInfo->is11rAssoc = false; - /* Purge pre-auth fail list */ - csr_neighbor_roam_purge_preauth_failed_list(pMac); - - pNeighborRoamInfo->FTRoamInfo.preauthRspPending = false; - pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0; - /* Do not free up the preauth done list here */ - pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0; - pNeighborRoamInfo->FTRoamInfo.neighborRptPending = false; - pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0; - qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo, - sizeof(tCsrNeighborReportBssInfo) * - MAX_BSS_IN_NEIGHBOR_RPT); - pNeighborRoamInfo->uOsRequestedHandoff = 0; - qdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo, - sizeof(tCsrHandoffRequest)); -} - /** * csr_neighbor_roam_reset_connected_state_control_info() * @@ -734,384 +695,6 @@ void csr_neighbor_roam_reset_init_state_control_info(tpAniSirGlobal pMac, csr_neighbor_roam_reset_report_scan_state_control_info(pMac, sessionId); } -/* --------------------------------------------------------------------------- - - \fn csr_neighbor_roam_purge_preauth_fail_list - - \brief This function empties the preauth fail list - - \param pMac - The handle returned by mac_open. - - \return VOID - - ---------------------------------------------------------------------------*/ -void csr_neighbor_roam_purge_preauth_fail_list(tpAniSirGlobal pMac) -{ - uint8_t i; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; - - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, FL("Purging the preauth fail list")); - for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { - pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[i]; - while (pNeighborRoamInfo->FTRoamInfo.preAuthFailList. - numMACAddress) { - qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. - preAuthFailList. - macAddress[pNeighborRoamInfo->FTRoamInfo. - preAuthFailList.numMACAddress - - 1], sizeof(tSirMacAddr)); - pNeighborRoamInfo->FTRoamInfo.preAuthFailList. - numMACAddress--; - } - } - return; -} - -/** - * csr_neighbor_roam_add_preauth_fail() - add bssid to preauth failed list - * @mac_ctx: The handle returned by mac_open. - * @bssid: BSSID to be added to the preauth fail list - * - * This function adds the given BSSID to the Preauth fail list - * - * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise - */ -QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, - uint8_t session_id, - tSirMacAddr bssid) -{ - uint8_t i = 0; - tpCsrNeighborRoamControlInfo neighbor_roam_info = - &mac_ctx->roam.neighborRoamInfo[session_id]; - uint8_t num_mac_addr = neighbor_roam_info->FTRoamInfo.preAuthFailList. - numMACAddress; - - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGE, - FL(" Added BSSID " MAC_ADDRESS_STR " to Preauth failed list"), - MAC_ADDR_ARRAY(bssid)); - - for (i = 0; - i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress; - i++) { - if (true != qdf_mem_cmp( - neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i], - bssid, sizeof(tSirMacAddr))) { - sms_log(mac_ctx, LOGW, FL("BSSID "MAC_ADDRESS_STR" already present in preauth fail list"), - MAC_ADDR_ARRAY(bssid)); - return QDF_STATUS_SUCCESS; - } - } - - if ((num_mac_addr + 1) > MAX_NUM_PREAUTH_FAIL_LIST_ADDRESS) { - sms_log(mac_ctx, LOGE, - FL("Cannot add, preauth fail list is full.")); - return QDF_STATUS_E_FAILURE; - } - qdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. - macAddress[num_mac_addr], bssid, sizeof(tSirMacAddr)); - neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress++; - - return QDF_STATUS_SUCCESS; -} - -/** - * csr_neighbor_roam_is_preauth_candidate() - * - * @mac_ctx: Pointer to Global MAC structure - * @bssId : BSSID of the candidate - * - * This function checks whether the given MAC address is already present - * in the preauth fail list and returns true/false accordingly - * - * Return: true if preauth candidate, false otherwise - */ -bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, - uint8_t sessionId, tSirMacAddr bssId) -{ - uint8_t i = 0; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; - - if (csr_roam_is_roam_offload_scan_enabled(pMac)) { - return true; - } - if (0 == pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress) - return true; - - for (i = 0; - i < pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress; - i++) { - if (true != - qdf_mem_cmp(pNeighborRoamInfo->FTRoamInfo. - preAuthFailList.macAddress[i], bssId, - sizeof(tSirMacAddr))) { - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, - FL("BSSID " MAC_ADDRESS_STR - " already present in preauth fail list"), - MAC_ADDR_ARRAY(bssId)); - return false; - } - } - - return true; -} - -/** - * csr_neighbor_roam_issue_preauth_req() - Send preauth request to first AP - * @mac_ctx: The handle returned by mac_open. - * @session_id: Session information - * - * This function issues preauth request to PE with the 1st AP entry in the - * roamable AP list - * - * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise - */ -static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, - uint8_t session_id) -{ - tpCsrNeighborRoamControlInfo neighbor_roam_info = - &mac_ctx->roam.neighborRoamInfo[session_id]; - QDF_STATUS status = QDF_STATUS_SUCCESS; - tpCsrNeighborRoamBSSInfo neighbor_bss_node; - - - if (false != neighbor_roam_info->FTRoamInfo.preauthRspPending) { - /* This must not be true here */ - QDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == - false); - return QDF_STATUS_E_FAILURE; - } - - /* - * Issue Preauth request to PE here. - * Need to issue the preauth request with the BSSID that is in the - * head of the roamable AP list. Parameters that should be passed are - * BSSID, Channel number and the neighborScanPeriod(probably). If - * roamableAPList gets empty, should transition to REPORT_SCAN state - */ - neighbor_bss_node = csr_neighbor_roam_next_roamable_ap(mac_ctx, - &neighbor_roam_info->roamableAPList, NULL); - - if (NULL == neighbor_bss_node) { - sms_log(mac_ctx, LOGW, FL("Roamable AP list is empty.. ")); - return QDF_STATUS_E_FAILURE; - } else { - csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, - neighbor_bss_node->pBssDescription->bssId, - eCSR_ROAM_PREAUTH_INIT_NOTIFY); - status = csr_roam_enqueue_preauth(mac_ctx, session_id, - neighbor_bss_node->pBssDescription, - eCsrPerformPreauth, true); - - sms_log(mac_ctx, LOG1, - FL("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"), - MAC_ADDR_ARRAY( - neighbor_bss_node->pBssDescription->bssId), - (int)neighbor_bss_node->pBssDescription->channelId); - - if (QDF_STATUS_SUCCESS != status) { - sms_log(mac_ctx, LOGE, - FL("Return failed preauth request status %d"), - status); - return status; - } - } - - neighbor_roam_info->FTRoamInfo.preauthRspPending = true; - - /* Increment the preauth retry count */ - neighbor_roam_info->FTRoamInfo.numPreAuthRetries++; - - /* Transition the state to preauthenticating */ - csr_neighbor_roam_state_transition(mac_ctx, - eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING, session_id); - - return status; -} - -/** - * csr_neighbor_roam_preauth_rsp_handler() - handle preauth response - * @mac_ctx: The handle returned by mac_open. - * @session_id: SME session - * @lim_status: eSIR_SUCCESS/eSIR_FAILURE/eSIR_LIM_MAX_STA_REACHED_ERROR/ - * eSIT_LIM_AUTH_RSP_TIMEOUT status from PE - * - * This function handle the Preauth response from PE - * Every preauth is allowed max 3 tries if it fails. If a bssid failed - * for more than MAX_TRIES, we will remove it from the list and try - * with the next node in the roamable AP list and add the BSSID to - * pre-auth failed list. If no more entries present in roamable AP list, - * transition to REPORT_SCAN state. - * - * Return: QDF_STATUS_SUCCESS on success (i.e. pre-auth processed), - * QDF_STATUS_E_FAILURE otherwise - */ -QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, - uint8_t session_id, - tSirRetStatus lim_status) -{ - tpCsrNeighborRoamControlInfo neighbor_roam_info = - &mac_ctx->roam.neighborRoamInfo[session_id]; - QDF_STATUS status = QDF_STATUS_SUCCESS; - QDF_STATUS preauth_processed = QDF_STATUS_SUCCESS; - tpCsrNeighborRoamBSSInfo preauth_rsp_node = NULL; - - if (false == neighbor_roam_info->FTRoamInfo.preauthRspPending) { - /* - * This can happen when we disconnect immediately - * after sending a pre-auth request. During processing - * of the disconnect command, we would have reset - * preauthRspPending and transitioned to INIT state. - */ - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, - FL("Unexpected pre-auth response in state %d"), - neighbor_roam_info->neighborRoamState); - preauth_processed = QDF_STATUS_E_FAILURE; - goto DEQ_PREAUTH; - } - /* We can receive it in these 2 states. */ - if ((neighbor_roam_info->neighborRoamState != - eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING)) { - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, - FL("Preauth response received in state %s"), - mac_trace_get_neighbour_roam_state - (neighbor_roam_info->neighborRoamState)); - preauth_processed = QDF_STATUS_E_FAILURE; - goto DEQ_PREAUTH; - } - - neighbor_roam_info->FTRoamInfo.preauthRspPending = false; - - if (eSIR_SUCCESS == lim_status) - preauth_rsp_node = - csr_neighbor_roam_next_roamable_ap( - mac_ctx, - &neighbor_roam_info->roamableAPList, - NULL); - if ((eSIR_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) { - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOG1, - FL("Preauth completed successfully after %d tries"), - neighbor_roam_info->FTRoamInfo.numPreAuthRetries); - sms_log(mac_ctx, LOG1, - FL("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"), - MAC_ADDR_ARRAY( - preauth_rsp_node->pBssDescription->bssId), - (int)preauth_rsp_node->pBssDescription->channelId); - - csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, - preauth_rsp_node->pBssDescription->bssId, - eCSR_ROAM_PREAUTH_STATUS_SUCCESS); - /* - * Preauth completed successfully. Insert the preauthenticated - * node to tail of preAuthDoneList. - */ - csr_neighbor_roam_remove_roamable_ap_list_entry(mac_ctx, - &neighbor_roam_info->roamableAPList, - preauth_rsp_node); - csr_ll_insert_tail( - &neighbor_roam_info->FTRoamInfo.preAuthDoneList, - &preauth_rsp_node->List, LL_ACCESS_LOCK); - - /* Pre-auth successful. Transition to PREAUTH Done state */ - csr_neighbor_roam_state_transition(mac_ctx, - eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id); - neighbor_roam_info->FTRoamInfo.numPreAuthRetries = 0; - - /* - * The caller of this function would start a timer and by - * the time it expires, supplicant should have provided - * the updated FTIEs to SME. So, when it expires, handoff - * will be triggered then. - */ - } else { - tpCsrNeighborRoamBSSInfo neighbor_bss_node = NULL; - tListElem *entry; - bool is_dis_pending = false; - - sms_log(mac_ctx, LOGE, - FL("Preauth failed retry number %d, status = 0x%x"), - neighbor_roam_info->FTRoamInfo.numPreAuthRetries, - lim_status); - - /* - * Preauth failed. Add the bssId to the preAuth failed list - * of MAC Address. Also remove the AP from roamable AP list. - */ - if ((neighbor_roam_info->FTRoamInfo.numPreAuthRetries >= - CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES) || - (eSIR_LIM_MAX_STA_REACHED_ERROR == lim_status)) { - /* - * We are going to remove the node as it fails for - * more than MAX tries. Reset this count to 0 - */ - neighbor_roam_info->FTRoamInfo.numPreAuthRetries = 0; - - /* - * The one in the head of the list should be one with - * which we issued pre-auth and failed - */ - entry = csr_ll_remove_head( - &neighbor_roam_info->roamableAPList, - LL_ACCESS_LOCK); - if (!entry) { - sms_log(mac_ctx, LOGE, - FL("Preauth list is empty")); - goto NEXT_PREAUTH; - } - neighbor_bss_node = GET_BASE_ADDR(entry, - tCsrNeighborRoamBSSInfo, - List); - /* - * Add the BSSID to pre-auth fail list if - * it is not requested by HDD - */ - if (!neighbor_roam_info->uOsRequestedHandoff) - status = - csr_neighbor_roam_add_preauth_fail( - mac_ctx, session_id, - neighbor_bss_node-> - pBssDescription->bssId); - csr_neighbor_roam_send_lfr_metric_event(mac_ctx, - session_id, - neighbor_bss_node->pBssDescription->bssId, - eCSR_ROAM_PREAUTH_STATUS_FAILURE); - /* Now we can free this node */ - csr_neighbor_roam_free_neighbor_roam_bss_node( - mac_ctx, neighbor_bss_node); - } -NEXT_PREAUTH: - is_dis_pending = is_disconnect_pending(mac_ctx, session_id); - if (is_dis_pending) { - sms_log(mac_ctx, LOGE, - FL("Disconnect in progress, Abort preauth")); - goto ABORT_PREAUTH; - } - /* Issue preauth request for the same/next entry */ - if (QDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( - mac_ctx, session_id)) - goto DEQ_PREAUTH; -ABORT_PREAUTH: - if (csr_roam_is_roam_offload_scan_enabled(mac_ctx)) { - if (neighbor_roam_info->uOsRequestedHandoff) { - neighbor_roam_info->uOsRequestedHandoff = 0; - csr_roam_offload_scan(mac_ctx, 0, - ROAM_SCAN_OFFLOAD_START, - REASON_PREAUTH_FAILED_FOR_ALL); - } else { - csr_roam_offload_scan(mac_ctx, 0, - ROAM_SCAN_OFFLOAD_RESTART, - REASON_PREAUTH_FAILED_FOR_ALL); - } - csr_neighbor_roam_state_transition(mac_ctx, - eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, session_id); - } - } - -DEQ_PREAUTH: - csr_dequeue_roam_command(mac_ctx, eCsrPerformPreauth); - return preauth_processed; -} - #ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * csr_neighbor_roam_offload_update_preauth_list() @@ -2587,36 +2170,6 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( return status; } -/* --------------------------------------------------------------------------- - - \fn csr_neighbor_roam_purge_preauth_failed_list - - \brief This function purges all the MAC addresses in the pre-auth fail list - - \param pMac - The handle returned by mac_open. - - \return VOID - - ---------------------------------------------------------------------------*/ -void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac) -{ - uint8_t i, j; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = NULL; - - for (j = 0; j < CSR_ROAM_SESSION_MAX; j++) { - pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[j]; - for (i = 0; - i < - pNeighborRoamInfo->FTRoamInfo.preAuthFailList. - numMACAddress; i++) { - qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo. - preAuthFailList.macAddress[i], - sizeof(tSirMacAddr)); - } - pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress = 0; - } -} - /* --------------------------------------------------------------------------- \fn csr_neighbor_roam_init11r_assoc_info @@ -3081,58 +2634,6 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, return true; } -/* --------------------------------------------------------------------------- - \brief This function returns true if preauth is completed - - \param pMac - The handle returned by mac_open. - - \return bool - - ---------------------------------------------------------------------------*/ -bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal pMac, uint8_t sessionId) -{ - return pMac->roam.neighborRoamInfo[sessionId].neighborRoamState == - eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE; -} - -/* --------------------------------------------------------------------------- - \brief In the event that we are associated with AP1 and we have - completed pre auth with AP2. Then we receive a deauth/disassoc from - AP1. - At this point neighbor roam is in pre auth done state, pre auth timer - is running. We now handle this case by stopping timer and clearing - the pre-auth state. We basically clear up and just go to disconnected - state. - - \param pMac - The handle returned by mac_open. - - \return bool - ---------------------------------------------------------------------------*/ -void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; - tCsrRoamSession *session = CSR_GET_SESSION(pMac, sessionId); - - if (!session) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - FL("session is NULL")); - return; - } - - if (pNeighborRoamInfo->neighborRoamState != - eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) - return; - - /* Stop timer */ - qdf_mc_timer_stop(&session->ftSmeContext.preAuthReassocIntvlTimer); - - /* Transition to init state */ - csr_neighbor_roam_state_transition(pMac, - eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId); - pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; -} /* --------------------------------------------------------------------------- \brief This function returns true if STA is in the middle of roaming states diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c new file mode 100644 index 000000000000..3a5bc43628d3 --- /dev/null +++ b/core/sme/src/csr/csr_roam_preauth.c @@ -0,0 +1,754 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: csr_roam_preauth.c + * + * Host based roaming preauthentication implementation + */ + +#include "wma_types.h" +#include "cds_mq.h" +#include "csr_inside_api.h" +#include "sms_debug.h" +#include "sme_qos_internal.h" +#include "sme_inside.h" +#include "host_diag_core_event.h" +#include "host_diag_core_log.h" +#include "csr_api.h" +#include "sme_api.h" +#include "csr_neighbor_roam.h" +#include "mac_trace.h" +#include "cds_concurrency.h" + +static void csr_reinit_preauth_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand); +static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, + uint8_t session_id, tSirMacAddr bssid); +/** + * csr_neighbor_roam_state_preauth_done() - Check if state is preauth done + * @mac_ctx: Global MAC context + * @session_id: SME session ID + * + * Return: True if the state id preauth done, false otherwise + */ +bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal mac_ctx, + uint8_t session_id) +{ + return mac_ctx->roam.neighborRoamInfo[session_id].neighborRoamState == + eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE; +} + +/** + * csr_neighbor_roam_tranistion_preauth_done_to_disconnected() - Transition + * the state from preauth done to disconnected + * @mac_ctx: Global MAC Context + * @session_id: SME Session ID + * + * In the event that we are associated with AP1 and we have + * completed pre auth with AP2. Then we receive a deauth/disassoc from AP1. + * At this point neighbor roam is in pre auth done state, pre auth timer + * is running. We now handle this case by stopping timer and clearing + * the pre-auth state. We basically clear up and just go to disconnected + * state + * + * Return: None + */ +void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( + tpAniSirGlobal mac_ctx, uint8_t session_id) +{ + tpCsrNeighborRoamControlInfo pNeighborRoamInfo = + &mac_ctx->roam.neighborRoamInfo[session_id]; + tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id); + + if (!session) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + FL("session is NULL")); + return; + } + + if (pNeighborRoamInfo->neighborRoamState != + eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) + return; + + qdf_mc_timer_stop(&session->ftSmeContext.preAuthReassocIntvlTimer); + csr_neighbor_middle_of_roaming(mac_ctx, session_id); + pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false; +} + +/** + * csr_reinit_preauth_cmd() - Cleanup the preauth command + * @mac_ctx: Global MAC context + * @command: Command to be cleaned up + * + * Return: None + */ +static void csr_reinit_preauth_cmd(tpAniSirGlobal mac_ctx, tSmeCmd *command) +{ + command->u.roamCmd.pLastRoamBss = NULL; + command->u.roamCmd.pRoamBssEntry = NULL; + qdf_mem_set(&command->u.roamCmd, sizeof(tRoamCmd), 0); +} + +/** + * csr_release_command_preauth() - Release the preauth command + * @mac_ctx: Global MAC context + * @command: Command to be released + * + * Return: None + */ +void csr_release_command_preauth(tpAniSirGlobal mac_ctx, tSmeCmd *command) +{ + csr_reinit_preauth_cmd(mac_ctx, command); + csr_release_command(mac_ctx, command); +} + +/** + * csr_roam_enqueue_preauth() - Put the preauth command in the queue + * @mac_ctx: Global MAC Context + * @session_id: SME Session ID + * @bss_desc: BSS descriptor + * @reason: roaming reason + * @immediate: High priority in the queue or not + * + * Return: Success if queued properly, false otherwise. + */ +QDF_STATUS csr_roam_enqueue_preauth(tpAniSirGlobal mac_ctx, + uint32_t session_id, tpSirBssDescription bss_desc, + eCsrRoamReason reason, bool immediate) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tSmeCmd *command; + + command = csr_get_command_buffer(mac_ctx); + if (NULL == command) { + sms_log(mac_ctx, LOGE, FL(" fail to get command buffer")); + status = QDF_STATUS_E_RESOURCES; + } else { + if (bss_desc) { + command->command = eSmeCommandRoam; + command->sessionId = (uint8_t) session_id; + command->u.roamCmd.roamReason = reason; + command->u.roamCmd.pLastRoamBss = bss_desc; + status = csr_queue_sme_command(mac_ctx, command, + immediate); + if (!QDF_IS_STATUS_SUCCESS(status)) { + sms_log(mac_ctx, LOGE, + FL("fail to queue preauth,status=%d"), + status); + csr_release_command_preauth(mac_ctx, command); + } + } else { + status = QDF_STATUS_E_RESOURCES; + } + } + return status; +} + +/** + * csr_neighbor_roam_purge_preauth_failed_list() - Purge the preauth fail list + * @mac_ctx: Global MAC Context + * + * Return: None + */ +void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal mac_ctx) +{ + uint8_t i; + uint8_t j; + uint8_t num_mac_addr; + tpCsrNeighborRoamControlInfo neigh_roam_info = NULL; + tpCsrPreauthFailListInfo fail_list; + + for (j = 0; j < CSR_ROAM_SESSION_MAX; j++) { + neigh_roam_info = &mac_ctx->roam.neighborRoamInfo[j]; + fail_list = &neigh_roam_info->FTRoamInfo.preAuthFailList; + num_mac_addr = fail_list->numMACAddress; + for (i = 0; i < num_mac_addr; i++) + qdf_mem_zero(fail_list->macAddress[i], + sizeof(tSirMacAddr)); + fail_list->numMACAddress = 0; + } +} + +/** + * @csr_neighbor_roam_reset_preauth_control_info - Reset preauth info + * @mac_ctx: Global MAC Context + * @session_id: SME Session ID + * + * Return: None + */ +void csr_neighbor_roam_reset_preauth_control_info(tpAniSirGlobal mac_ctx, + uint8_t session_id) +{ + tpCsrNeighborRoamControlInfo neigh_roam_info = + &mac_ctx->roam.neighborRoamInfo[session_id]; + + neigh_roam_info->is11rAssoc = false; + csr_neighbor_roam_purge_preauth_failed_list(mac_ctx); + + neigh_roam_info->FTRoamInfo.preauthRspPending = false; + neigh_roam_info->FTRoamInfo.numPreAuthRetries = 0; + neigh_roam_info->FTRoamInfo.currentNeighborRptRetryNum = 0; + neigh_roam_info->FTRoamInfo.neighborRptPending = false; + neigh_roam_info->FTRoamInfo.numBssFromNeighborReport = 0; + qdf_mem_zero(neigh_roam_info->FTRoamInfo.neighboReportBssInfo, + sizeof(tCsrNeighborReportBssInfo) * + MAX_BSS_IN_NEIGHBOR_RPT); + neigh_roam_info->uOsRequestedHandoff = 0; + qdf_mem_zero(&neigh_roam_info->handoffReqInfo, + sizeof(tCsrHandoffRequest)); +} + +/** + * csr_neighbor_roam_preauth_rsp_handler() - handle preauth response + * @mac_ctx: The handle returned by mac_open. + * @session_id: SME session + * @lim_status: eSIR_SUCCESS/eSIR_FAILURE/eSIR_LIM_MAX_STA_REACHED_ERROR/ + * eSIT_LIM_AUTH_RSP_TIMEOUT status from PE + * + * This function handle the Preauth response from PE + * Every preauth is allowed max 3 tries if it fails. If a bssid failed + * for more than MAX_TRIES, we will remove it from the list and try + * with the next node in the roamable AP list and add the BSSID to + * pre-auth failed list. If no more entries present in roamable AP list, + * transition to REPORT_SCAN state. + * + * Return: QDF_STATUS_SUCCESS on success (i.e. pre-auth processed), + * QDF_STATUS_E_FAILURE otherwise + */ +QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal mac_ctx, + uint8_t session_id, + tSirRetStatus lim_status) +{ + tpCsrNeighborRoamControlInfo neighbor_roam_info = + &mac_ctx->roam.neighborRoamInfo[session_id]; + QDF_STATUS status = QDF_STATUS_SUCCESS; + QDF_STATUS preauth_processed = QDF_STATUS_SUCCESS; + tpCsrNeighborRoamBSSInfo preauth_rsp_node = NULL; + + if (false == neighbor_roam_info->FTRoamInfo.preauthRspPending) { + /* + * This can happen when we disconnect immediately + * after sending a pre-auth request. During processing + * of the disconnect command, we would have reset + * preauthRspPending and transitioned to INIT state. + */ + sms_log(mac_ctx, LOGW, + FL("Unexpected pre-auth response in state %d"), + neighbor_roam_info->neighborRoamState); + preauth_processed = QDF_STATUS_E_FAILURE; + goto DEQ_PREAUTH; + } + /* We can receive it in these 2 states. */ + if ((neighbor_roam_info->neighborRoamState != + eCSR_NEIGHBOR_ROAM_STATE_PREAUTHENTICATING)) { + sms_log(mac_ctx, LOGW, + FL("Preauth response received in state %s"), + mac_trace_get_neighbour_roam_state + (neighbor_roam_info->neighborRoamState)); + preauth_processed = QDF_STATUS_E_FAILURE; + goto DEQ_PREAUTH; + } + + neighbor_roam_info->FTRoamInfo.preauthRspPending = false; + + if (eSIR_SUCCESS == lim_status) + preauth_rsp_node = + csr_neighbor_roam_next_roamable_ap( + mac_ctx, &neighbor_roam_info->roamableAPList, + NULL); + if ((eSIR_SUCCESS == lim_status) && (NULL != preauth_rsp_node)) { + sms_log(mac_ctx, LOG1, + FL("Preauth completed successfully after %d tries"), + neighbor_roam_info->FTRoamInfo.numPreAuthRetries); + sms_log(mac_ctx, LOG1, + FL("After Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"), + MAC_ADDR_ARRAY( + preauth_rsp_node->pBssDescription->bssId), + (int)preauth_rsp_node->pBssDescription->channelId); + + csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, + preauth_rsp_node->pBssDescription->bssId, + eCSR_ROAM_PREAUTH_STATUS_SUCCESS); + /* + * Preauth completed successfully. Insert the preauthenticated + * node to tail of preAuthDoneList. + */ + csr_neighbor_roam_remove_roamable_ap_list_entry(mac_ctx, + &neighbor_roam_info->roamableAPList, + preauth_rsp_node); + csr_ll_insert_tail( + &neighbor_roam_info->FTRoamInfo.preAuthDoneList, + &preauth_rsp_node->List, LL_ACCESS_LOCK); + + /* Pre-auth successful. Transition to PREAUTH Done state */ + csr_neighbor_middle_of_roaming(mac_ctx, session_id); + neighbor_roam_info->FTRoamInfo.numPreAuthRetries = 0; + + /* + * The caller of this function would start a timer and by + * the time it expires, supplicant should have provided + * the updated FTIEs to SME. So, when it expires, handoff + * will be triggered then. + */ + } else { + tpCsrNeighborRoamBSSInfo neighbor_bss_node = NULL; + tListElem *entry; + bool is_dis_pending = false; + + sms_log(mac_ctx, LOGE, + FL("Preauth failed retry number %d, status = 0x%x"), + neighbor_roam_info->FTRoamInfo.numPreAuthRetries, + lim_status); + + /* + * Preauth failed. Add the bssId to the preAuth failed list + * of MAC Address. Also remove the AP from roamable AP list. + */ + if ((neighbor_roam_info->FTRoamInfo.numPreAuthRetries >= + CSR_NEIGHBOR_ROAM_MAX_NUM_PREAUTH_RETRIES) || + (eSIR_LIM_MAX_STA_REACHED_ERROR == lim_status)) { + /* + * We are going to remove the node as it fails for + * more than MAX tries. Reset this count to 0 + */ + neighbor_roam_info->FTRoamInfo.numPreAuthRetries = 0; + + /* + * The one in the head of the list should be one with + * which we issued pre-auth and failed + */ + entry = csr_ll_remove_head( + &neighbor_roam_info->roamableAPList, + LL_ACCESS_LOCK); + if (!entry) { + sms_log(mac_ctx, LOGE, + FL("Preauth list is empty")); + goto NEXT_PREAUTH; + } + neighbor_bss_node = GET_BASE_ADDR(entry, + tCsrNeighborRoamBSSInfo, + List); + /* + * Add the BSSID to pre-auth fail list if + * it is not requested by HDD + */ + if (!neighbor_roam_info->uOsRequestedHandoff) + status = + csr_neighbor_roam_add_preauth_fail( + mac_ctx, session_id, + neighbor_bss_node-> + pBssDescription->bssId); + csr_neighbor_roam_send_lfr_metric_event(mac_ctx, + session_id, + neighbor_bss_node->pBssDescription->bssId, + eCSR_ROAM_PREAUTH_STATUS_FAILURE); + /* Now we can free this node */ + csr_neighbor_roam_free_neighbor_roam_bss_node( + mac_ctx, neighbor_bss_node); + } +NEXT_PREAUTH: + is_dis_pending = is_disconnect_pending(mac_ctx, session_id); + if (is_dis_pending) { + sms_log(mac_ctx, LOGE, + FL("Disconnect in progress, Abort preauth")); + goto ABORT_PREAUTH; + } + /* Issue preauth request for the same/next entry */ + if (QDF_STATUS_SUCCESS == csr_neighbor_roam_issue_preauth_req( + mac_ctx, session_id)) + goto DEQ_PREAUTH; +ABORT_PREAUTH: + if (csr_roam_is_roam_offload_scan_enabled(mac_ctx)) { + if (neighbor_roam_info->uOsRequestedHandoff) { + neighbor_roam_info->uOsRequestedHandoff = 0; + csr_roam_offload_scan(mac_ctx, 0, + ROAM_SCAN_OFFLOAD_START, + REASON_PREAUTH_FAILED_FOR_ALL); + } else { + csr_roam_offload_scan(mac_ctx, 0, + ROAM_SCAN_OFFLOAD_RESTART, + REASON_PREAUTH_FAILED_FOR_ALL); + } + csr_neighbor_middle_of_roaming(mac_ctx, session_id); + } + } + +DEQ_PREAUTH: + csr_dequeue_roam_command(mac_ctx, eCsrPerformPreauth); + return preauth_processed; +} + +/** + * csr_neighbor_roam_add_preauth_fail() - add bssid to preauth failed list + * @mac_ctx: The handle returned by mac_open. + * @bssid: BSSID to be added to the preauth fail list + * + * This function adds the given BSSID to the Preauth fail list + * + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise + */ +static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx, + uint8_t session_id, tSirMacAddr bssid) +{ + uint8_t i = 0; + tpCsrNeighborRoamControlInfo neighbor_roam_info = + &mac_ctx->roam.neighborRoamInfo[session_id]; + uint8_t num_mac_addr = neighbor_roam_info->FTRoamInfo.preAuthFailList. + numMACAddress; + + sms_log(mac_ctx, LOGE, + FL(" Added BSSID " MAC_ADDRESS_STR " to Preauth failed list"), + MAC_ADDR_ARRAY(bssid)); + + for (i = 0; + i < neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress; + i++) { + if (!qdf_mem_cmp( + neighbor_roam_info->FTRoamInfo.preAuthFailList.macAddress[i], + bssid, sizeof(tSirMacAddr))) { + sms_log(mac_ctx, LOGW, + FL("BSSID "MAC_ADDRESS_STR" already fail list"), + MAC_ADDR_ARRAY(bssid)); + return QDF_STATUS_SUCCESS; + } + } + + if ((num_mac_addr + 1) > MAX_NUM_PREAUTH_FAIL_LIST_ADDRESS) { + sms_log(mac_ctx, LOGE, + FL("Cannot add, preauth fail list is full.")); + return QDF_STATUS_E_FAILURE; + } + qdf_mem_copy(neighbor_roam_info->FTRoamInfo.preAuthFailList. + macAddress[num_mac_addr], bssid, sizeof(tSirMacAddr)); + neighbor_roam_info->FTRoamInfo.preAuthFailList.numMACAddress++; + + return QDF_STATUS_SUCCESS; +} + +/** + * csr_neighbor_roam_is_preauth_candidate() + * + * @mac_ctx: Pointer to Global MAC structure + * @bssId : BSSID of the candidate + * + * This function checks whether the given MAC address is already present + * in the preauth fail list and returns true/false accordingly + * + * Return: true if preauth candidate, false otherwise + */ +bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, + uint8_t sessionId, tSirMacAddr bssId) +{ + uint8_t i = 0; + tpCsrNeighborRoamControlInfo pNeighborRoamInfo = + &pMac->roam.neighborRoamInfo[sessionId]; + + if (csr_roam_is_roam_offload_scan_enabled(pMac)) + return true; + if (0 == pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress) + return true; + + for (i = 0; + i < pNeighborRoamInfo->FTRoamInfo.preAuthFailList.numMACAddress; + i++) { + if (!qdf_mem_cmp(pNeighborRoamInfo->FTRoamInfo. + preAuthFailList.macAddress[i], bssId, + sizeof(tSirMacAddr))) { + sms_log(pMac, LOGE, + FL("BSSID exists in fail list" MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(bssId)); + return false; + } + } + + return true; +} + +/** + * csr_roam_issue_ft_preauth_req() - Initiate Preauthentication request + * @hal: Global Handle + * @session_id: SME Session ID + * @bss_desc: BSS descriptor + * + * Return: Success or Failure + */ +QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id, + tpSirBssDescription bss_desc) +{ + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + tpSirFTPreAuthReq preauth_req; + uint16_t auth_req_len = 0; + tCsrRoamSession *csr_session = CSR_GET_SESSION(mac_ctx, session_id); + + if (NULL == csr_session) { + sms_log(mac_ctx, LOGE, + FL("Session does not exist for session id(%d)"), + session_id); + return QDF_STATUS_E_FAILURE; + } + + auth_req_len = sizeof(tSirFTPreAuthReq); + preauth_req = (tpSirFTPreAuthReq) qdf_mem_malloc(auth_req_len); + if (NULL == preauth_req) { + sms_log(mac_ctx, LOGE, + FL("Memory allocation for FT Preauth request failed")); + return QDF_STATUS_E_NOMEM; + } + /* Save the SME Session ID. We need it while processing preauth resp */ + csr_session->ftSmeContext.smeSessionId = session_id; + qdf_mem_zero(preauth_req, auth_req_len); + + preauth_req->pbssDescription = + (tpSirBssDescription) qdf_mem_malloc(sizeof(bss_desc->length) + + bss_desc->length); + if (NULL == preauth_req->pbssDescription) { + sms_log(mac_ctx, LOGE, + FL("Memory allocation for FT Preauth request failed")); + return QDF_STATUS_E_NOMEM; + } + + preauth_req->messageType = eWNI_SME_FT_PRE_AUTH_REQ; + + preauth_req->preAuthchannelNum = bss_desc->channelId; + + qdf_mem_copy((void *)&preauth_req->currbssId, + (void *)csr_session->connectedProfile.bssid.bytes, + sizeof(tSirMacAddr)); + qdf_mem_copy((void *)&preauth_req->preAuthbssId, + (void *)bss_desc->bssId, sizeof(tSirMacAddr)); + qdf_mem_copy((void *)&preauth_req->self_mac_addr, + (void *)&csr_session->selfMacAddr.bytes, sizeof(tSirMacAddr)); + + if (csr_roam_is11r_assoc(mac_ctx, session_id) && + (mac_ctx->roam.roamSession[session_id].connectedProfile.AuthType != + eCSR_AUTH_TYPE_OPEN_SYSTEM)) { + preauth_req->ft_ies_length = + (uint16_t) csr_session->ftSmeContext.auth_ft_ies_length; + qdf_mem_copy(preauth_req->ft_ies, + csr_session->ftSmeContext.auth_ft_ies, + csr_session->ftSmeContext.auth_ft_ies_length); + } else { + preauth_req->ft_ies_length = 0; + } + qdf_mem_copy(preauth_req->pbssDescription, bss_desc, + sizeof(bss_desc->length) + bss_desc->length); + preauth_req->length = auth_req_len; + return cds_send_mb_message_to_mac(preauth_req); +} + +/** + * csr_roam_ft_pre_auth_rsp_processor() - Handle the preauth response + * @hal: Global Handle + * preauth_rsp: Received preauthentication response + * + * Return: None + */ +void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hal, + tpSirFTPreAuthRsp preauth_rsp) +{ + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); + QDF_STATUS status = QDF_STATUS_SUCCESS; + tCsrRoamInfo roam_info; + eCsrAuthType conn_Auth_type; + uint32_t session_id = preauth_rsp->smeSessionId; + tCsrRoamSession *csr_session = CSR_GET_SESSION(mac_ctx, session_id); + + if (NULL == csr_session) { + sms_log(mac_ctx, LOGE, FL("CSR session is NULL")); + return; + } + status = csr_neighbor_roam_preauth_rsp_handler(mac_ctx, + preauth_rsp->smeSessionId, preauth_rsp->status); + if (status != QDF_STATUS_SUCCESS) { + sms_log(mac_ctx, LOGE, + FL("Preauth was not processed: %d SessionID: %d"), + status, session_id); + return; + } + + if (QDF_STATUS_SUCCESS != (QDF_STATUS) preauth_rsp->status) + return; + csr_session->ftSmeContext.FTState = eFT_AUTH_COMPLETE; + csr_session->ftSmeContext.psavedFTPreAuthRsp = preauth_rsp; + /* No need to notify qos module if this is a non 11r & ESE roam */ + if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId) +#ifdef FEATURE_WLAN_ESE + || csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->smeSessionId) +#endif + ) { + sme_qos_csr_event_ind(mac_ctx, + csr_session->ftSmeContext.smeSessionId, + SME_QOS_CSR_PREAUTH_SUCCESS_IND, NULL); + } + status = + qdf_mc_timer_start( + &csr_session->ftSmeContext.preAuthReassocIntvlTimer, + 60); + if (QDF_STATUS_SUCCESS != status) { + sms_log(mac_ctx, LOGE, + FL("PreauthReassocInterval timer failed status %d"), + status); + return; + } + qdf_mem_copy((void *)&csr_session->ftSmeContext.preAuthbssId, + (void *)preauth_rsp->preAuthbssId, + sizeof(struct qdf_mac_addr)); + if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId)) + csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId, + NULL, 0, eCSR_ROAM_FT_RESPONSE, eCSR_ROAM_RESULT_NONE); + +#ifdef FEATURE_WLAN_ESE + if (csr_roam_is_ese_assoc(mac_ctx, preauth_rsp->smeSessionId)) { + csr_roam_read_tsf(mac_ctx, (uint8_t *) roam_info.timestamp, + preauth_rsp->smeSessionId); + qdf_mem_copy((void *)&roam_info.bssid, + (void *)preauth_rsp->preAuthbssId, + sizeof(struct qdf_mac_addr)); + csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId, + &roam_info, 0, eCSR_ROAM_CCKM_PREAUTH_NOTIFY, + 0); + } +#endif + + if (csr_roam_is_fast_roam_enabled(mac_ctx, preauth_rsp->smeSessionId)) { + /* Save the bssid from the received response */ + qdf_mem_copy((void *)&roam_info.bssid, + (void *)preauth_rsp->preAuthbssId, + sizeof(struct qdf_mac_addr)); + csr_roam_call_callback(mac_ctx, preauth_rsp->smeSessionId, + &roam_info, 0, eCSR_ROAM_PMK_NOTIFY, 0); + } + + /* If its an Open Auth, FT IEs are not provided by supplicant */ + /* Hence populate them here */ + conn_Auth_type = + mac_ctx->roam.roamSession[session_id].connectedProfile.AuthType; + + csr_session->ftSmeContext.addMDIE = false; + + /* Done with it, init it. */ + csr_session->ftSmeContext.psavedFTPreAuthRsp = NULL; + + if (csr_roam_is11r_assoc(mac_ctx, preauth_rsp->smeSessionId) && + (conn_Auth_type == eCSR_AUTH_TYPE_OPEN_SYSTEM)) { + uint16_t ft_ies_length; + ft_ies_length = preauth_rsp->ric_ies_length; + + if ((csr_session->ftSmeContext.reassoc_ft_ies) && + (csr_session->ftSmeContext.reassoc_ft_ies_length)) { + qdf_mem_free(csr_session->ftSmeContext.reassoc_ft_ies); + csr_session->ftSmeContext.reassoc_ft_ies_length = 0; + csr_session->ftSmeContext.reassoc_ft_ies = NULL; + } + + if (!ft_ies_length) + return; + + csr_session->ftSmeContext.reassoc_ft_ies = + qdf_mem_malloc(ft_ies_length); + if (NULL == csr_session->ftSmeContext.reassoc_ft_ies) { + sms_log(mac_ctx, LOGE, + FL("Memory allocation failed for ft_ies")); + return; + } else { + /* Copy the RIC IEs to reassoc IEs */ + qdf_mem_copy(((uint8_t *) csr_session->ftSmeContext. + reassoc_ft_ies), + (uint8_t *) preauth_rsp->ric_ies, + preauth_rsp->ric_ies_length); + csr_session->ftSmeContext.reassoc_ft_ies_length = + ft_ies_length; + csr_session->ftSmeContext.addMDIE = true; + } + } +} + +/** + * csr_neighbor_roam_issue_preauth_req() - Send preauth request to first AP + * @mac_ctx: The handle returned by mac_open. + * @session_id: Session information + * + * This function issues preauth request to PE with the 1st AP entry in the + * roamable AP list + * + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE otherwise + */ +QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx, + uint8_t session_id) +{ + tpCsrNeighborRoamControlInfo neighbor_roam_info = + &mac_ctx->roam.neighborRoamInfo[session_id]; + QDF_STATUS status = QDF_STATUS_SUCCESS; + tpCsrNeighborRoamBSSInfo neighbor_bss_node; + + + if (false != neighbor_roam_info->FTRoamInfo.preauthRspPending) { + /* This must not be true here */ + QDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending == + false); + return QDF_STATUS_E_FAILURE; + } + + /* + * Issue Preauth request to PE here. + * Need to issue the preauth request with the BSSID that is in the + * head of the roamable AP list. Parameters that should be passed are + * BSSID, Channel number and the neighborScanPeriod(probably). If + * roamableAPList gets empty, should transition to REPORT_SCAN state + */ + neighbor_bss_node = csr_neighbor_roam_next_roamable_ap(mac_ctx, + &neighbor_roam_info->roamableAPList, NULL); + + if (NULL == neighbor_bss_node) { + sms_log(mac_ctx, LOGW, FL("Roamable AP list is empty.. ")); + return QDF_STATUS_E_FAILURE; + } else { + csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, + neighbor_bss_node->pBssDescription->bssId, + eCSR_ROAM_PREAUTH_INIT_NOTIFY); + status = csr_roam_enqueue_preauth(mac_ctx, session_id, + neighbor_bss_node->pBssDescription, + eCsrPerformPreauth, true); + + sms_log(mac_ctx, LOG1, + FL("Before Pre-Auth: BSSID " MAC_ADDRESS_STR ", Ch:%d"), + MAC_ADDR_ARRAY( + neighbor_bss_node->pBssDescription->bssId), + (int)neighbor_bss_node->pBssDescription->channelId); + + if (QDF_STATUS_SUCCESS != status) { + sms_log(mac_ctx, LOGE, + FL("Return failed preauth request status %d"), + status); + return status; + } + } + + neighbor_roam_info->FTRoamInfo.preauthRspPending = true; + + /* Increment the preauth retry count */ + neighbor_roam_info->FTRoamInfo.numPreAuthRetries++; + + /* Transition the state to preauthenticating */ + csr_neighbor_middle_of_roaming(mac_ctx, session_id); + + return status; +} + -- cgit v1.2.3 From 86459d63ca6d141bf3045af9166f8a3fc1bcb3a1 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Mon, 22 Feb 2016 10:07:02 -0800 Subject: qcacld-3.0: Isolate roaming related scan functionality Move the scanning related code which is pertinent to roaming into a separate file so that any future maintenace would be easy across different projects CRs-Fixed: 978905 Change-Id: Ia8c81726eb843d0a5aa89affa89d84d77994932e --- Kbuild | 3 +- core/sme/inc/csr_internal.h | 3 + core/sme/inc/csr_neighbor_roam.h | 14 + core/sme/src/csr/csr_api_roam.c | 83 ---- core/sme/src/csr/csr_host_scan_roam.c | 816 ++++++++++++++++++++++++++++++++++ core/sme/src/csr/csr_neighbor_roam.c | 676 ---------------------------- 6 files changed, 835 insertions(+), 760 deletions(-) create mode 100644 core/sme/src/csr/csr_host_scan_roam.c diff --git a/Kbuild b/Kbuild index fbae71cd533e..f14e5a9c2952 100755 --- a/Kbuild +++ b/Kbuild @@ -505,7 +505,8 @@ SME_CSR_OBJS := $(SME_SRC_DIR)/csr/csr_api_roam.o \ $(SME_SRC_DIR)/csr/csr_cmd_process.o \ $(SME_SRC_DIR)/csr/csr_link_list.o \ $(SME_SRC_DIR)/csr/csr_neighbor_roam.o \ - $(SME_SRC_DIR)/csr/csr_util.o + $(SME_SRC_DIR)/csr/csr_util.o \ + $(SME_SRC_DIR)/csr/csr_host_scan_roam.o ifeq ($(CONFIG_QCOM_TDLS),y) SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csr_tdls_process.o diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index 3b5616280317..a476d8d493aa 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1383,4 +1383,7 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac, bool do_release_reacquire_lock); enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac, uint32_t session_id); +void csr_roam_substate_change(tpAniSirGlobal pMac, eCsrRoamSubState NewSubstate, + uint32_t sessionId); + #endif diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 00fc97725f9a..5bae53f64cf1 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -320,5 +320,19 @@ static inline void csr_neighbor_roam_send_lfr_metric_event( tSirMacAddr bssid, eRoamCmdStatus status) {} #endif +void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, + tDblLinkList * llist); +QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, + uint8_t sessionId); +QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); +uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, + tScanResultHandle *pScanResultList, uint8_t sessionId); +QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, + uint32_t sessionId, tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile); +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, + uint32_t sessionId); +QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, + uint32_t sessionId, tCsrRoamProfile *pDstProfile); #endif /* CSR_NEIGHBOR_ROAM_H */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 800a28d71f84..310dd9a251f0 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -204,7 +204,6 @@ static QDF_STATUS csr_roam_stop_roaming_timer(tpAniSirGlobal pMac, uint32_t sessionId); static void csr_roam_roaming_timer_handler(void *pv); QDF_STATUS csr_roam_start_wait_for_key_timer(tpAniSirGlobal pMac, uint32_t interval); -QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); static void csr_roam_wait_for_key_time_out_handler(void *pv); static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo); static QDF_STATUS csr_init_channel_power_list(tpAniSirGlobal pMac, @@ -220,11 +219,6 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, uint32_t session uint8_t keyId, uint8_t keyLength, uint8_t *pKey, uint8_t paeRole, uint8_t *pKeyRsc); -static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, - uint32_t sessionId, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, - tCsrRoamProfile *pProfile); void csr_roamStatisticsTimerHandler(void *pv); void csr_roamStatsGlobalClassDTimerHandler(void *pv); static void csr_roam_link_up(tpAniSirGlobal pMac, struct qdf_mac_addr bssid); @@ -8316,22 +8310,6 @@ QDF_STATUS csr_roam_issue_join(tpAniSirGlobal pMac, uint32_t sessionId, return status; } -static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, - uint32_t sessionId, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, - tCsrRoamProfile *pProfile) -{ - csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); - /* Set the roaming substate to 'join attempt'... */ - csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId); - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, - FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); - /* attempt to Join this BSS... */ - return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, pIes, - eWNI_SME_REASSOC_REQ); -} - void csr_roam_reissue_roam_command(tpAniSirGlobal pMac) { tListElem *pEntry; @@ -8501,67 +8479,6 @@ bool csr_is_scan_for_roam_command_active(tpAniSirGlobal pMac) return fRet; } -QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, uint32_t sessionId) -{ - QDF_STATUS status = QDF_STATUS_SUCCESS; - tSmeCmd *pCommand = NULL; - bool fHighPriority = true; - bool fRemoveCmd = false; - tListElem *pEntry; - /* Delete the old assoc command. All is setup for reassoc to be serialized */ - pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); - if (pEntry) { - pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); - if (!pCommand) { - sms_log(pMac, LOGE, FL(" fail to get command buffer")); - return QDF_STATUS_E_RESOURCES; - } - if (eSmeCommandRoam == pCommand->command) { - if (pCommand->u.roamCmd.roamReason == - eCsrSmeIssuedAssocToSimilarAP) { - fRemoveCmd = - csr_ll_remove_entry(&pMac->sme. - smeCmdActiveList, pEntry, - LL_ACCESS_LOCK); - } else { - sms_log(pMac, LOGE, - FL - (" Unexpected active roam command present ")); - } - if (fRemoveCmd == false) { - /* Implies we did not get the serialized assoc command we */ - /* were expecting */ - pCommand = NULL; - } - } - } - if (NULL == pCommand) { - sms_log(pMac, LOGE, - FL - (" fail to get command buffer as expected based on previous connect roam command")); - return QDF_STATUS_E_RESOURCES; - } - do { - /* Change the substate in case it is wait-for-key */ - if (CSR_IS_WAIT_FOR_KEY(pMac, sessionId)) { - csr_roam_stop_wait_for_key_timer(pMac); - csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_NONE, - sessionId); - } - pCommand->command = eSmeCommandRoam; - pCommand->sessionId = (uint8_t) sessionId; - pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; - status = csr_queue_sme_command(pMac, pCommand, fHighPriority); - if (!QDF_IS_STATUS_SUCCESS(status)) { - sms_log(pMac, LOGE, - FL(" fail to send message status = %d"), status); - csr_release_command_roam(pMac, pCommand); - } - } while (0); - - return status; -} - static void csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx, uint32_t result) diff --git a/core/sme/src/csr/csr_host_scan_roam.c b/core/sme/src/csr/csr_host_scan_roam.c new file mode 100644 index 000000000000..fb29ee10db7f --- /dev/null +++ b/core/sme/src/csr/csr_host_scan_roam.c @@ -0,0 +1,816 @@ +/* + * Copyright (c) 2016 The Linux Foundation. All rights reserved. + * + * Previously licensed under the ISC license by Qualcomm Atheros, Inc. + * + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all + * copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/** + * DOC: csr_host_scan_roam.c + * + * Host based roaming processing scan results and initiating the roaming + */ + +#include "wma_types.h" +#include "cds_mq.h" +#include "csr_inside_api.h" +#include "sms_debug.h" +#include "sme_qos_internal.h" +#include "sme_inside.h" +#include "host_diag_core_event.h" +#include "host_diag_core_log.h" +#include "csr_api.h" +#include "sme_api.h" +#include "csr_neighbor_roam.h" +#include "mac_trace.h" +#include "cds_concurrency.h" + +/** + * csr_roam_issue_reassociate() - Issue Reassociate + * @pMac: Global MAC Context + * @sessionId: SME Session ID + * @pSirBssDesc: BSS Descriptor + * @pIes: Pointer to the IE's + * @pProfile: Roaming profile + * + * Return: Success or Failure + */ +QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, + uint32_t sessionId, tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile) +{ + csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId); + /* Set the roaming substate to 'join attempt'... */ + csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, + sessionId); + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, + FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)")); + /* attempt to Join this BSS... */ + return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, + pIes, eWNI_SME_REASSOC_REQ); +} + +/** + * csr_roam_issue_reassociate_cmd() - Issue the reassociate command + * @pMac: Global MAC Context + * @sessionId: SME Session ID + * + * Return: Success or Failure status + */ +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, + uint32_t sessionId) +{ + QDF_STATUS status = QDF_STATUS_SUCCESS; + tSmeCmd *pCommand = NULL; + bool fHighPriority = true; + bool fRemoveCmd = false; + tListElem *pEntry; + pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK); + if (pEntry) { + pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); + if (!pCommand) { + sms_log(pMac, LOGE, FL(" fail to get command buffer")); + return QDF_STATUS_E_RESOURCES; + } + if (eSmeCommandRoam == pCommand->command) { + if (pCommand->u.roamCmd.roamReason == + eCsrSmeIssuedAssocToSimilarAP) + fRemoveCmd = + csr_ll_remove_entry(&pMac->sme. + smeCmdActiveList, + pEntry, + LL_ACCESS_LOCK); + else + sms_log(pMac, LOGE, + FL(" Unexpected roam cmd present")); + if (fRemoveCmd == false) + pCommand = NULL; + } + } + if (NULL == pCommand) { + sms_log(pMac, LOGE, + FL(" fail to get cmd buf based on prev roam command")); + return QDF_STATUS_E_RESOURCES; + } + do { + /* Change the substate in case it is wait-for-key */ + if (CSR_IS_WAIT_FOR_KEY(pMac, sessionId)) { + csr_roam_stop_wait_for_key_timer(pMac); + csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_NONE, + sessionId); + } + pCommand->command = eSmeCommandRoam; + pCommand->sessionId = (uint8_t) sessionId; + pCommand->u.roamCmd.roamReason = eCsrSmeIssuedFTReassoc; + status = csr_queue_sme_command(pMac, pCommand, fHighPriority); + if (!QDF_IS_STATUS_SUCCESS(status)) { + sms_log(pMac, LOGE, + FL("fail to send message status=%d"), status); + csr_release_command_roam(pMac, pCommand); + } + } while (0); + + return status; +} + +/** + * csr_neighbor_roam_process_scan_results() - build roaming candidate list + * + * @mac_ctx: The handle returned by mac_open. + * @sessionid: Session information + * @scan_results_list: List obtained from csr_scan_get_result() + * + * This function applies various candidate checks like LFR, 11r, preauth, ESE + * and builds a roamable AP list. It applies age limit only if no suitable + * recent candidates are found. + * + * Output list is built in mac_ctx->roam.neighborRoamInfo[sessionid]. + * + * Return: void + */ + +static void +csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, + uint8_t sessionid, + tScanResultHandle *scan_results_list) +{ + tCsrScanResultInfo *scan_result; + tpCsrNeighborRoamControlInfo n_roam_info = + &mac_ctx->roam.neighborRoamInfo[sessionid]; + tpCsrNeighborRoamBSSInfo bss_info; + uint32_t cur_ap_rssi; + uint32_t age_ticks = 0; + uint32_t limit_ticks = + qdf_system_msecs_to_ticks(ROAM_AP_AGE_LIMIT_MS); + uint8_t num_candidates = 0; + uint8_t num_dropped = 0; + /* + * first iteration of scan list should consider + * age constraint for candidates + */ + bool age_constraint = true; +#ifdef FEATURE_WLAN_ESE + uint16_t qpresent; + uint16_t qavail; + bool voadmitted; +#endif + /* + * Find out the Current AP RSSI and keep it handy to check if + * it is better than the RSSI of the AP which we are + * going to roam.If so, we are going to continue with the + * current AP. + */ + cur_ap_rssi = csr_get_current_ap_rssi(mac_ctx, scan_results_list, + sessionid); + + /* + * Expecting the scan result already to be in the sorted order based on + * RSSI. Based on the previous state we need to check whether the list + * should be sorted again taking neighbor score into consideration. If + * previous state is CFG_CHAN_LIST_SCAN, there should not be a neighbor + * score associated with any of the BSS. If the previous state is + * REPORT_QUERY, then there will be neighbor score for each of the APs. + * For now, let us take top of the list provided as it is by CSR Scan + * result API. Hence it is assumed that neighbor score and rssi score + * are in the same order. This will be taken care later. + */ + + do { + while (true) { + tSirBssDescription *descr; + + scan_result = csr_scan_result_get_next( + mac_ctx, *scan_results_list); + if (NULL == scan_result) + break; + descr = &scan_result->BssDescriptor; + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + FL("Scan result: BSSID " MAC_ADDRESS_STR + " (Rssi %ld, Ch:%d)"), + MAC_ADDR_ARRAY(descr->bssId), + abs(descr->rssi), descr->channelId); + + if (!qdf_mem_cmp(descr->bssId, + n_roam_info->currAPbssid.bytes, + sizeof(tSirMacAddr))) { + /* + * currently associated AP. Do not have this + * in the roamable AP list + */ + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, + "SKIP-currently associated AP"); + continue; + } + /* + * In case of reassoc requested by upper layer, look + * for exact match of bssid & channel. csr cache might + * have duplicates + */ + if ((n_roam_info->uOsRequestedHandoff) && + ((qdf_mem_cmp(descr->bssId, + n_roam_info->handoffReqInfo.bssid.bytes, + sizeof(tSirMacAddr))) + || (descr->channelId != + n_roam_info->handoffReqInfo.channel))) { + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, + "SKIP-not a candidate AP for OS requested roam"); + continue; + } + + if ((n_roam_info->is11rAssoc) && + (!csr_neighbor_roam_is_preauth_candidate(mac_ctx, + sessionid, descr->bssId))) { + sms_log(mac_ctx, LOGE, + FL("BSSID in preauth faillist.Ignore")); + continue; + } + +#ifdef FEATURE_WLAN_ESE + if (!csr_roam_is_roam_offload_scan_enabled(mac_ctx) && + (n_roam_info->isESEAssoc) && + !csr_neighbor_roam_is_preauth_candidate(mac_ctx, + sessionid, descr->bssId)) { + sms_log(mac_ctx, LOGE, + FL("BSSID in preauth faillist.Ignore")); + continue; + } + + qpresent = descr->QBSSLoad_present; + qavail = descr->QBSSLoad_avail; + voadmitted = n_roam_info->isVOAdmitted; + if (voadmitted) + sms_log(mac_ctx, LOG1, + FL("New QBSS=%s,BWavail=0x%x,req=0x%x"), + ((qpresent) ? "yes" : "no"), qavail, + n_roam_info->MinQBssLoadRequired); + if (voadmitted && qpresent && + (qavail < n_roam_info->MinQBssLoadRequired)) { + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, + "BSSID:" MAC_ADDRESS_STR "has no BW", + MAC_ADDR_ARRAY(descr->bssId)); + continue; + } + if (voadmitted && !qpresent) { + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_INFO, + "BSSID:" MAC_ADDRESS_STR "no LOAD IE", + MAC_ADDR_ARRAY(descr->bssId)); + continue; + } +#endif /* FEATURE_WLAN_ESE */ + + /* + * If we are supporting legacy roaming, and + * if the candidate is on the "pre-auth failed" list, + * ignore it. + */ + if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionid) && + !csr_neighbor_roam_is_preauth_candidate(mac_ctx, + sessionid, descr->bssId)) { + sms_log(mac_ctx, LOGE, + FL("BSSID in preauth faillist Ignore")); + continue; + } + + /* check the age of the AP */ + age_ticks = (uint32_t) qdf_mc_timer_get_system_ticks() - + descr->nReceivedTime; + if (age_constraint == true && age_ticks > limit_ticks) { + num_dropped++; + QDF_TRACE(QDF_MODULE_ID_SME, + QDF_TRACE_LEVEL_WARN, + FL("Old AP (probe rsp/beacon) skipped.") + ); + continue; + } + + /* Finished all checks, now add it to candidate list */ + bss_info = + qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); + if (NULL == bss_info) { + sms_log(mac_ctx, LOGE, + FL("Memory alloc fail. Ignored cnd.")); + continue; + } + bss_info->pBssDescription = + qdf_mem_malloc(descr->length + + sizeof(descr->length)); + if (bss_info->pBssDescription != NULL) { + qdf_mem_copy(bss_info->pBssDescription, descr, + descr->length + sizeof(descr->length)); + } else { + sms_log(mac_ctx, LOGE, + FL("Mem alloc failed. Ignore cand.")); + qdf_mem_free(bss_info); + continue; + } + /* + * Assign some preference value for now. Need to + * calculate theactual score based on RSSI and neighbor + * AP score + */ + bss_info->apPreferenceVal = 10; + num_candidates++; + csr_ll_insert_tail(&n_roam_info->roamableAPList, + &bss_info->List, LL_ACCESS_LOCK); + } /* end of while (csr_scan_result_get_next) */ + + /* if some candidates were found, then no need to repeat */ + if (num_candidates) + break; + /* + * if age_constraint is already false, we have done two + * iterations and no candidate were found + */ + if (age_constraint == false) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + "%s: No roam able candidates found", + __func__); + break; + } + /* + * if all candidates were dropped rescan the scan + * list but this time without age constraint. + */ + age_constraint = false; + /* if no candidates were dropped no need to repeat */ + } while (num_dropped); + + /* + * Now we have all the scan results in our local list. Good time to free + * up the the list we got as a part of csrGetScanResult + */ + csr_scan_result_purge(mac_ctx, *scan_results_list); +} + +/** + * csr_neighbor_roam_trigger_handoff() - Start roaming + * @mac_ctx: Global MAC Context + * @session_id: SME Session ID + * + * Return: None + */ +static void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal mac_ctx, + uint8_t session_id) +{ + if (csr_roam_is_fast_roam_enabled(mac_ctx, session_id)) + csr_neighbor_roam_issue_preauth_req(mac_ctx, session_id); + else + sms_log(mac_ctx, LOGE, FL("Roaming is disabled")); +} + +/** + * csr_neighbor_roam_process_scan_complete() - Post process the scan results + * @pMac: Global MAC Context + * @sessionId: SME Session ID + * + * Return: Success or Failure + */ +QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, + uint8_t sessionId) +{ + tpCsrNeighborRoamControlInfo pNeighborRoamInfo = + &pMac->roam.neighborRoamInfo[sessionId]; + tCsrScanResultFilter scanFilter; + tScanResultHandle scanResult; + uint32_t tempVal = 0; + QDF_STATUS hstatus; + + hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, + &scanFilter, + sessionId); + sms_log(pMac, LOGW, + FL("Prepare scan to find neighbor AP filter status = %d"), + hstatus); + if (QDF_STATUS_SUCCESS != hstatus) { + sms_log(pMac, LOGE, + FL("Scan Filter prep fail for Assoc %d Bail out"), + tempVal); + return QDF_STATUS_E_FAILURE; + } + hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); + if (hstatus != QDF_STATUS_SUCCESS) { + sms_log(pMac, LOGE, + FL("Get Scan Result status code %d"), + hstatus); + } + /* Process the scan results and update roamable AP list */ + csr_neighbor_roam_process_scan_results(pMac, sessionId, &scanResult); + + /* Free the scan filter */ + csr_free_scan_filter(pMac, &scanFilter); + + tempVal = csr_ll_count(&pNeighborRoamInfo->roamableAPList); + + if (tempVal) { + csr_neighbor_roam_trigger_handoff(pMac, sessionId); + return QDF_STATUS_SUCCESS; + } + + if (csr_roam_is_roam_offload_scan_enabled(pMac)) { + if (pNeighborRoamInfo->uOsRequestedHandoff) { + csr_roam_offload_scan(pMac, sessionId, + ROAM_SCAN_OFFLOAD_START, + REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); + pNeighborRoamInfo->uOsRequestedHandoff = 0; + } else { + /* There is no candidate or We are not roaming Now. + * Inform the FW to restart Roam Offload Scan */ + csr_roam_offload_scan(pMac, sessionId, + ROAM_SCAN_OFFLOAD_RESTART, + REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); + } + csr_neighbor_roam_state_transition(pMac, + eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); + } + return QDF_STATUS_SUCCESS; + +} + +/** + * csr_neighbor_roam_candidate_found_ind_hdlr() + * + * @mac_ctx: Pointer to Global MAC structure + * @msg_buf: pointer to msg buff + * + * This function is called by CSR as soon as TL posts the candidate + * found indication to SME via MC thread + * + * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise + */ +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, + void *pMsg) +{ + tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd = + (tSirSmeCandidateFoundInd *) pMsg; + uint32_t sessionId = pSirSmeCandidateFoundInd->sessionId; + tpCsrNeighborRoamControlInfo pNeighborRoamInfo = + &pMac->roam.neighborRoamInfo[sessionId]; + QDF_STATUS status = QDF_STATUS_SUCCESS; + + sms_log(pMac, LOG1, FL("Received indication from firmware")); + + /* we must be in connected state, if not ignore it */ + if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != + pNeighborRoamInfo->neighborRoamState) + || (pNeighborRoamInfo->uOsRequestedHandoff)) { + sms_log(pMac, LOGE, + FL("Recvd in NotCONNECTED or OsReqHandoff. Ignore")); + status = QDF_STATUS_E_FAILURE; + } else { + /* Firmware indicated that roaming candidate is found. Beacons + * are already in the SME scan results table. + * Process the results for choosing best roaming candidate. + */ + csr_save_scan_results(pMac, eCsrScanCandidateFound, + sessionId); + /* Future enhancements: + * If firmware tags candidate beacons, give them preference + * for roaming. + * Age out older entries so that new candidate beacons + * will get preference. + */ + status = csr_neighbor_roam_process_scan_complete(pMac, + sessionId); + if (QDF_STATUS_SUCCESS != status) { + sms_log(pMac, LOGE, + FL("scan process complete failed, status %d"), + status); + return QDF_STATUS_E_FAILURE; + } + } + + return status; +} + +/** + * csr_neighbor_roam_free_roamable_bss_list() - Frees roamable APs list + * @mac_ctx: The handle returned by mac_open. + * @llist: Neighbor Roam BSS List to be emptied + * + * Empties and frees all the nodes in the roamable AP list + * + * Return: none + */ +void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, + tDblLinkList *llist) +{ + tpCsrNeighborRoamBSSInfo result = NULL; + + sms_log(mac_ctx, LOG2, + FL("Emptying the BSS list. Current count = %d"), + csr_ll_count(llist)); + + /* + * Pick up the head, remove and free the node till + * the list becomes empty + */ + while ((result = csr_neighbor_roam_next_roamable_ap(mac_ctx, llist, + NULL)) != NULL) { + csr_neighbor_roam_remove_roamable_ap_list_entry(mac_ctx, + llist, result); + csr_neighbor_roam_free_neighbor_roam_bss_node(mac_ctx, result); + } + return; +} + +/** + * csr_neighbor_roam_remove_roamable_ap_list_entry() + * + * @mac_ctx: Pointer to Global MAC structure + * @pList: The list from which the entry should be removed + * @pNeighborEntry: Neighbor Roam BSS Node to be removed + * + * This function removes a given entry from the given list + * + * Return: true if successfully removed, else false + */ +bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac, + tDblLinkList *pList, + tpCsrNeighborRoamBSSInfo + pNeighborEntry) +{ + if (pList) { + return csr_ll_remove_entry(pList, &pNeighborEntry->List, + LL_ACCESS_LOCK); + } + + sms_log(pMac, LOGE, + FL("Remove neigh BSS node from fail list. Current count = %d"), + csr_ll_count(pList)); + + return false; +} + +/** + * csr_neighbor_roam_next_roamable_ap() - Get next AP from roamable AP list + * @mac_ctx - The handle returned by mac_open. + * @plist - The list from which the entry should be returned + * @neighbor_entry - Neighbor Roam BSS Node whose next entry should be returned + * + * Gets the entry next to passed entry. If NULL is passed, return the entry + * in the head of the list + * + * Return: Neighbor Roam BSS Node to be returned + */ +tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap( + tpAniSirGlobal mac_ctx, tDblLinkList *llist, + tpCsrNeighborRoamBSSInfo neighbor_entry) +{ + tListElem *entry = NULL; + tpCsrNeighborRoamBSSInfo result = NULL; + + if (llist) { + if (NULL == neighbor_entry) + entry = csr_ll_peek_head(llist, LL_ACCESS_LOCK); + else + entry = csr_ll_next(llist, &neighbor_entry->List, + LL_ACCESS_LOCK); + if (entry) + result = GET_BASE_ADDR(entry, tCsrNeighborRoamBSSInfo, + List); + } + + return result; +} + + +/** + * csr_neighbor_roam_request_handoff() - Handoff to a different AP + * @mac_ctx: Pointer to Global MAC structure + * @session_id: Session ID + * + * This function triggers actual switching from one AP to the new AP. + * It issues disassociate with reason code as Handoff and CSR as a part of + * handling disassoc rsp, issues reassociate to the new AP + * + * Return: none + */ +void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, + uint8_t session_id) +{ + tCsrRoamInfo roam_info; + tpCsrNeighborRoamControlInfo neighbor_roam_info = + &mac_ctx->roam.neighborRoamInfo[session_id]; + tCsrNeighborRoamBSSInfo handoff_node; + uint32_t roamid = 0; + QDF_STATUS status; + + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", + __func__, session_id); + + if (neighbor_roam_info->neighborRoamState != + eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) { + sms_log(mac_ctx, LOGE, + FL("Roam requested when Neighbor roam is in %s state"), + mac_trace_get_neighbour_roam_state( + neighbor_roam_info->neighborRoamState)); + return; + } + + if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx, + &handoff_node, session_id)) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + FL("failed to obtain handoff AP")); + return; + } + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), + MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); + + qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); + csr_roam_call_callback(mac_ctx, session_id, &roam_info, roamid, + eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); + + qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); + csr_neighbor_roam_state_transition(mac_ctx, + eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING, session_id); + + csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, + handoff_node.pBssDescription->bssId, + eCSR_ROAM_HANDOVER_SUCCESS); + /* Free the profile.. Just to make sure we dont leak memory here */ + csr_release_profile(mac_ctx, + &neighbor_roam_info->csrNeighborRoamProfile); + /* + * Create the Handoff AP profile. Copy the currently connected profile + * and update only the BSSID and channel number. This should happen + * before issuing disconnect + */ + status = csr_roam_copy_connected_profile(mac_ctx, session_id, + &neighbor_roam_info->csrNeighborRoamProfile); + if (QDF_STATUS_SUCCESS != status) { + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, + FL("csr_roam_copy_connected_profile failed %d"), + status); + return; + } + qdf_mem_copy(neighbor_roam_info->csrNeighborRoamProfile.BSSIDs.bssid, + handoff_node.pBssDescription->bssId, sizeof(tSirMacAddr)); + neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] = + handoff_node.pBssDescription->channelId; + + sms_log(mac_ctx, LOGW, + " csr_roamHandoffRequested: disassociating with current AP"); + + if (!QDF_IS_STATUS_SUCCESS + (csr_roam_issue_disassociate_cmd + (mac_ctx, session_id, + eCSR_DISCONNECT_REASON_HANDOFF))) { + sms_log(mac_ctx, LOGW, + "csr_roamHandoffRequested: fail to issue disassoc"); + return; + } + /* notify HDD for handoff, providing the BSSID too */ + roam_info.reasonCode = eCsrRoamReasonBetterAP; + + qdf_mem_copy(roam_info.bssid.bytes, + handoff_node.pBssDescription->bssId, + sizeof(struct qdf_mac_addr)); + + csr_roam_call_callback(mac_ctx, session_id, &roam_info, 0, + eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE); + + return; +} + + +/** + * csr_neighbor_roam_get_handoff_ap_info - Identifies the best AP for roaming + * + * @pMac: mac context + * @session_id: Session Id + * @hand_off_node: AP node that is the handoff candidate returned + * + * This function returns the best possible AP for handoff. For 11R case, it + * returns the 1st entry from pre-auth done list. For non-11r case, it returns + * the 1st entry from roamable AP list + * + * Return: true if able find handoff AP, false otherwise + */ + +bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, + tpCsrNeighborRoamBSSInfo hand_off_node, + uint8_t session_id) +{ + tpCsrNeighborRoamControlInfo ngbr_roam_info = + &pMac->roam.neighborRoamInfo[session_id]; + tpCsrNeighborRoamBSSInfo bss_node = NULL; + + if (NULL == hand_off_node) { + QDF_ASSERT(NULL != hand_off_node); + return false; + } + if (ngbr_roam_info->is11rAssoc) { + /* Always the BSS info in the head is the handoff candidate */ + bss_node = csr_neighbor_roam_next_roamable_ap( + pMac, + &ngbr_roam_info->FTRoamInfo.preAuthDoneList, + NULL); + sms_log(pMac, LOG1, + FL("Number of Handoff candidates = %d"), + csr_ll_count(& + ngbr_roam_info->FTRoamInfo.preAuthDoneList)); + } else +#ifdef FEATURE_WLAN_ESE + if (ngbr_roam_info->isESEAssoc) { + /* Always the BSS info in the head is the handoff candidate */ + bss_node = + csr_neighbor_roam_next_roamable_ap(pMac, + &ngbr_roam_info->FTRoamInfo.preAuthDoneList, + NULL); + sms_log(pMac, LOG1, + FL("Number of Handoff candidates = %d"), + csr_ll_count(&ngbr_roam_info->FTRoamInfo. + preAuthDoneList)); + } else +#endif + if (csr_roam_is_fast_roam_enabled(pMac, session_id)) { + /* Always the BSS info in the head is the handoff candidate */ + bss_node = + csr_neighbor_roam_next_roamable_ap(pMac, + &ngbr_roam_info->FTRoamInfo.preAuthDoneList, + NULL); + sms_log(pMac, LOG1, + FL("Number of Handoff candidates = %d"), + csr_ll_count( + &ngbr_roam_info->FTRoamInfo.preAuthDoneList)); + } else { + bss_node = + csr_neighbor_roam_next_roamable_ap(pMac, + &ngbr_roam_info->roamableAPList, + NULL); + sms_log(pMac, LOG1, + FL("Number of Handoff candidates = %d"), + csr_ll_count(&ngbr_roam_info->roamableAPList)); + } + if (NULL == bss_node) + return false; + qdf_mem_copy(hand_off_node, bss_node, sizeof(tCsrNeighborRoamBSSInfo)); + return true; +} + +/** + * csr_neighbor_roam_is_handoff_in_progress() + * + * @mac_ctx: Pointer to Global MAC structure + * @session_id: Session ID + * + * This function returns whether handoff is in progress or not based on + * the current neighbor roam state + * + * Return: true if reassoc in progress, false otherwise + */ +bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, + uint8_t sessionId) +{ + if (eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING == + pMac->roam.neighborRoamInfo[sessionId].neighborRoamState) + return true; + + return false; +} + +/** + * csr_neighbor_roam_free_neighbor_roam_bss_node() + * + * @mac_ctx: Pointer to Global MAC structure + * @neighborRoamBSSNode: Neighbor Roam BSS Node to be freed + * + * This function frees all the internal pointers CSR NeighborRoam BSS Info + * and also frees the node itself + * + * Return: None + */ +void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, + tpCsrNeighborRoamBSSInfo + neighborRoamBSSNode) +{ + if (neighborRoamBSSNode) { + if (neighborRoamBSSNode->pBssDescription) { + qdf_mem_free(neighborRoamBSSNode->pBssDescription); + neighborRoamBSSNode->pBssDescription = NULL; + } + qdf_mem_free(neighborRoamBSSNode); + neighborRoamBSSNode = NULL; + } + + return; +} + diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 76781a8bb692..469e788c76af 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -119,135 +119,6 @@ void csr_neighbor_roam_send_lfr_metric_event( } #endif -/** - * csr_neighbor_roam_free_neighbor_roam_bss_node() - * - * @mac_ctx: Pointer to Global MAC structure - * @neighborRoamBSSNode: Neighbor Roam BSS Node to be freed - * - * This function frees all the internal pointers CSR NeighborRoam BSS Info - * and also frees the node itself - * - * Return: None - */ -void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, - tpCsrNeighborRoamBSSInfo - neighborRoamBSSNode) -{ - if (neighborRoamBSSNode) { - if (neighborRoamBSSNode->pBssDescription) { - qdf_mem_free(neighborRoamBSSNode->pBssDescription); - neighborRoamBSSNode->pBssDescription = NULL; - } - qdf_mem_free(neighborRoamBSSNode); - neighborRoamBSSNode = NULL; - } - - return; -} - -/** - * csr_neighbor_roam_remove_roamable_ap_list_entry() - * - * @mac_ctx: Pointer to Global MAC structure - * @pList: The list from which the entry should be removed - * @pNeighborEntry: Neighbor Roam BSS Node to be removed - * - * This function removes a given entry from the given list - * - * Return: true if successfully removed, else false - */ -bool csr_neighbor_roam_remove_roamable_ap_list_entry(tpAniSirGlobal pMac, - tDblLinkList *pList, - tpCsrNeighborRoamBSSInfo - pNeighborEntry) -{ - if (pList) { - return csr_ll_remove_entry(pList, &pNeighborEntry->List, - LL_ACCESS_LOCK); - } - - sms_log(pMac, LOGE, - FL - ("Removing neighbor BSS node from list failed. Current count = %d"), - csr_ll_count(pList)); - - return false; -} - -/** - * csr_neighbor_roam_next_roamable_ap() - Get next AP from roamable AP list - * @mac_ctx - The handle returned by mac_open. - * @plist - The list from which the entry should be returned - * @neighbor_entry - Neighbor Roam BSS Node whose next entry should be returned - * - * Gets the entry next to passed entry. If NULL is passed, return the entry - * in the head of the list - * - * Return: Neighbor Roam BSS Node to be returned - */ -tpCsrNeighborRoamBSSInfo csr_neighbor_roam_next_roamable_ap( - tpAniSirGlobal mac_ctx, tDblLinkList *llist, - tpCsrNeighborRoamBSSInfo neighbor_entry) -{ - tListElem *entry = NULL; - tpCsrNeighborRoamBSSInfo result = NULL; - - if (llist) { - if (NULL == neighbor_entry) - entry = csr_ll_peek_head(llist, LL_ACCESS_LOCK); - else - entry = csr_ll_next(llist, &neighbor_entry->List, - LL_ACCESS_LOCK); - if (entry) - result = GET_BASE_ADDR(entry, tCsrNeighborRoamBSSInfo, - List); - } - - return result; -} - -/** - * csr_neighbor_roam_free_roamable_bss_list() - Frees roamable APs list - * @mac_ctx: The handle returned by mac_open. - * @llist: Neighbor Roam BSS List to be emptied - * - * Empties and frees all the nodes in the roamable AP list - * - * Return: none - */ -void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, - tDblLinkList *llist) -{ - tpCsrNeighborRoamBSSInfo result = NULL; - - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOG2, - FL("Emptying the BSS list. Current count = %d"), - csr_ll_count(llist)); - - /* - * Pick up the head, remove and free the node till - * the list becomes empty - */ - while ((result = csr_neighbor_roam_next_roamable_ap(mac_ctx, llist, - NULL)) != NULL) { - csr_neighbor_roam_remove_roamable_ap_list_entry(mac_ctx, - llist, result); - csr_neighbor_roam_free_neighbor_roam_bss_node(mac_ctx, result); - } - return; -} - -static void csr_neighbor_roam_trigger_handoff(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - if (csr_roam_is_fast_roam_enabled(pMac, sessionId)) { - csr_neighbor_roam_issue_preauth_req(pMac, sessionId); - } else { - sms_log(pMac, LOGE, FL("Roaming is diisabled")); - } -} - QDF_STATUS csr_neighbor_roam_update_fast_roaming_enabled(tpAniSirGlobal pMac, uint8_t sessionId, @@ -955,303 +826,6 @@ uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, } -/** - * csr_neighbor_roam_process_scan_results() - build roaming candidate list - * - * @mac_ctx: The handle returned by mac_open. - * @sessionid: Session information - * @scan_results_list: List obtained from csr_scan_get_result() - * - * This function applies various candidate checks like LFR, 11r, preauth, ESE - * and builds a roamable AP list. It applies age limit only if no suitable - * recent candidates are found. - * - * Output list is built in mac_ctx->roam.neighborRoamInfo[sessionid]. - * - * Return: void - */ - -static void -csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx, - uint8_t sessionid, - tScanResultHandle *scan_results_list) -{ - tCsrScanResultInfo *scan_result; - tpCsrNeighborRoamControlInfo n_roam_info = - &mac_ctx->roam.neighborRoamInfo[sessionid]; - tpCsrNeighborRoamBSSInfo bss_info; - uint32_t cur_ap_rssi; - uint32_t age_ticks = 0; - uint32_t limit_ticks = - qdf_system_msecs_to_ticks(ROAM_AP_AGE_LIMIT_MS); - uint8_t num_candidates = 0; - uint8_t num_dropped = 0; - /* - * first iteration of scan list should consider - * age constraint for candidates - */ - bool age_constraint = true; -#ifdef FEATURE_WLAN_ESE - uint16_t qpresent; - uint16_t qavail; - bool voadmitted; -#endif - /* - * Find out the Current AP RSSI and keep it handy to check if - * it is better than the RSSI of the AP which we are - * going to roam.If so, we are going to continue with the - * current AP. - */ - cur_ap_rssi = csr_get_current_ap_rssi(mac_ctx, scan_results_list, - sessionid); - - /* - * Expecting the scan result already to be in the sorted order based on - * RSSI. Based on the previous state we need to check whether the list - * should be sorted again taking neighbor score into consideration. If - * previous state is CFG_CHAN_LIST_SCAN, there should not be a neighbor - * score associated with any of the BSS. If the previous state is - * REPORT_QUERY, then there will be neighbor score for each of the APs. - * For now, let us take top of the list provided as it is by CSR Scan - * result API. Hence it is assumed that neighbor score and rssi score - * are in the same order. This will be taken care later. - */ - - do { - while (true) { - tSirBssDescription *descr; - - scan_result = csr_scan_result_get_next( - mac_ctx, *scan_results_list); - if (NULL == scan_result) - break; - descr = &scan_result->BssDescriptor; - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - FL("Scan result: BSSID " MAC_ADDRESS_STR - " (Rssi %ld, Ch:%d)"), - MAC_ADDR_ARRAY(descr->bssId), - abs(descr->rssi), descr->channelId); - - if (true != qdf_mem_cmp(descr->bssId, - n_roam_info->currAPbssid.bytes, - sizeof(tSirMacAddr))) { - /* - * currently associated AP. Do not have this - * in the roamable AP list - */ - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_INFO, - "SKIP-currently associated AP"); - continue; - } - /* - * In case of reassoc requested by upper layer, look - * for exact match of bssid & channel. csr cache might - * have duplicates - */ - if ((n_roam_info->uOsRequestedHandoff) && - ((false != qdf_mem_cmp(descr->bssId, - n_roam_info->handoffReqInfo.bssid.bytes, - sizeof(tSirMacAddr))) - || (descr->channelId != - n_roam_info->handoffReqInfo.channel))) { - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_INFO, - "SKIP-not a candidate AP for OS requested roam"); - continue; - } - - if ((n_roam_info->is11rAssoc) && - (!csr_neighbor_roam_is_preauth_candidate(mac_ctx, - sessionid, descr->bssId))) { - sms_log(mac_ctx, LOGE, - FL("BSSID present in pre-auth fail list.. Ignoring")); - continue; - } - -#ifdef FEATURE_WLAN_ESE - if (!csr_roam_is_roam_offload_scan_enabled(mac_ctx) && - (n_roam_info->isESEAssoc) && - !csr_neighbor_roam_is_preauth_candidate(mac_ctx, - sessionid, descr->bssId)) { - sms_log(mac_ctx, LOGE, - FL("BSSID present in pre-auth fail list.. Ignoring")); - continue; - } - - qpresent = descr->QBSSLoad_present; - qavail = descr->QBSSLoad_avail; - voadmitted = n_roam_info->isVOAdmitted; - if (voadmitted) - sms_log(mac_ctx, LOG1, - FL("New AP QBSS present = %s, BW available = 0x%x, required = 0x%x"), - ((qpresent) ? "yes" : "no"), qavail, - n_roam_info->MinQBssLoadRequired); - if (voadmitted && qpresent && - (qavail < n_roam_info->MinQBssLoadRequired)) { - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_INFO, - "BSSID : " MAC_ADDRESS_STR " has no bandwidth, ignoring", - MAC_ADDR_ARRAY(descr->bssId)); - continue; - } - if (voadmitted && !qpresent) { - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_INFO, - "BSSID : " MAC_ADDRESS_STR " has no QBSS LOAD IE, ignoring", - MAC_ADDR_ARRAY(descr->bssId)); - continue; - } -#endif /* FEATURE_WLAN_ESE */ - - /* - * If we are supporting legacy roaming, and - * if the candidate is on the "pre-auth failed" list, - * ignore it. - */ - if (csr_roam_is_fast_roam_enabled(mac_ctx, sessionid) && - !csr_neighbor_roam_is_preauth_candidate(mac_ctx, - sessionid, descr->bssId)) { - sms_log(mac_ctx, LOGE, - FL("BSSID present in pre-auth fail list.. Ignoring")); - continue; - } - - /* check the age of the AP */ - age_ticks = (uint32_t) qdf_mc_timer_get_system_ticks() - - descr->nReceivedTime; - if (age_constraint == true && age_ticks > limit_ticks) { - num_dropped++; - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_WARN, - FL("Old AP (probe rsp/beacon) skipped.") - ); - continue; - } - - /* Finished all checks, now add it to candidate list */ - bss_info = - qdf_mem_malloc(sizeof(tCsrNeighborRoamBSSInfo)); - if (NULL == bss_info) { - sms_log(mac_ctx, LOGE, - FL("Memory allocation failed. Ignored candidate.")); - continue; - } - bss_info->pBssDescription = - qdf_mem_malloc(descr->length + - sizeof(descr->length)); - if (bss_info->pBssDescription != NULL) { - qdf_mem_copy(bss_info->pBssDescription, descr, - descr->length + sizeof(descr->length)); - } else { - sms_log(mac_ctx, LOGE, - FL("Memory allocation failed. Ignored candidate.")); - qdf_mem_free(bss_info); - continue; - } - /* - * Assign some preference value for now. Need to - * calculate theactual score based on RSSI and neighbor - * AP score - */ - bss_info->apPreferenceVal = 10; - num_candidates++; - csr_ll_insert_tail(&n_roam_info->roamableAPList, - &bss_info->List, LL_ACCESS_LOCK); - } /* end of while (csr_scan_result_get_next) */ - - /* if some candidates were found, then no need to repeat */ - if (num_candidates) - break; - /* - * if age_constraint is already false, we have done two - * iterations and no candidate were found - */ - if (age_constraint == false) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - "%s: No roam able candidates found", - __func__); - break; - } - /* - * if all candidates were dropped rescan the scan - * list but this time without age constraint. - */ - age_constraint = false; - /* if no candidates were dropped no need to repeat */ - } while (num_dropped); - - /* - * Now we have all the scan results in our local list. Good time to free - * up the the list we got as a part of csrGetScanResult - */ - csr_scan_result_purge(mac_ctx, *scan_results_list); -} - -static QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, - uint8_t sessionId) -{ - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; - tCsrScanResultFilter scanFilter; - tScanResultHandle scanResult; - uint32_t tempVal = 0; - QDF_STATUS hstatus; - - hstatus = csr_neighbor_roam_prepare_scan_profile_filter(pMac, - &scanFilter, - sessionId); - NEIGHBOR_ROAM_DEBUG(pMac, LOGW, - FL - ("11R/ESE/Other Association: Prepare scan to find neighbor AP filter status = %d"), - hstatus); - if (QDF_STATUS_SUCCESS != hstatus) { - sms_log(pMac, LOGE, - FL - ("Scan Filter preparation failed for Assoc type %d.. Bailing out.."), - tempVal); - return QDF_STATUS_E_FAILURE; - } - hstatus = csr_scan_get_result(pMac, &scanFilter, &scanResult); - if (hstatus != QDF_STATUS_SUCCESS) { - NEIGHBOR_ROAM_DEBUG(pMac, LOGE, - FL("Get Scan Result status code %d"), - hstatus); - } - /* Process the scan results and update roamable AP list */ - csr_neighbor_roam_process_scan_results(pMac, sessionId, &scanResult); - - /* Free the scan filter */ - csr_free_scan_filter(pMac, &scanFilter); - - tempVal = csr_ll_count(&pNeighborRoamInfo->roamableAPList); - - if (tempVal) { - csr_neighbor_roam_trigger_handoff(pMac, sessionId); - return QDF_STATUS_SUCCESS; - } - - if (csr_roam_is_roam_offload_scan_enabled(pMac)) { - if (pNeighborRoamInfo->uOsRequestedHandoff) { - csr_roam_offload_scan(pMac, sessionId, - ROAM_SCAN_OFFLOAD_START, - REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); - pNeighborRoamInfo->uOsRequestedHandoff = 0; - } else { - /* There is no candidate or We are not roaming Now. - * Inform the FW to restart Roam Offload Scan */ - csr_roam_offload_scan(pMac, sessionId, - ROAM_SCAN_OFFLOAD_RESTART, - REASON_NO_CAND_FOUND_OR_NOT_ROAMING_NOW); - } - csr_neighbor_roam_state_transition(pMac, - eCSR_NEIGHBOR_ROAM_STATE_CONNECTED, sessionId); - } - return QDF_STATUS_SUCCESS; - -} - - /** * csr_neighbor_roam_channels_filter_by_current_band() * @@ -2429,124 +2003,6 @@ void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId) return; } -/** - * csr_neighbor_roam_request_handoff() - Handoff to a different AP - * @mac_ctx: Pointer to Global MAC structure - * @session_id: Session ID - * - * This function triggers actual switching from one AP to the new AP. - * It issues disassociate with reason code as Handoff and CSR as a part of - * handling disassoc rsp, issues reassociate to the new AP - * - * Return: none - */ -void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx, - uint8_t session_id) -{ - tCsrRoamInfo roam_info; - tpCsrNeighborRoamControlInfo neighbor_roam_info = - &mac_ctx->roam.neighborRoamInfo[session_id]; - tCsrNeighborRoamBSSInfo handoff_node; - uint32_t roamid = 0; - QDF_STATUS status; - - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s session_id=%d", - __func__, session_id); - - if (neighbor_roam_info->neighborRoamState != - eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE) { - sms_log(mac_ctx, LOGE, - FL("Roam requested when Neighbor roam is in %s state"), - mac_trace_get_neighbour_roam_state( - neighbor_roam_info->neighborRoamState)); - return; - } - - if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx, - &handoff_node, session_id)) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - FL("failed to obtain handoff AP")); - return; - } - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR), - MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId)); - - qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); - csr_roam_call_callback(mac_ctx, session_id, &roam_info, roamid, - eCSR_ROAM_FT_START, eSIR_SME_SUCCESS); - - qdf_mem_zero(&roam_info, sizeof(tCsrRoamInfo)); - csr_neighbor_roam_state_transition(mac_ctx, - eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING, session_id); - - csr_neighbor_roam_send_lfr_metric_event(mac_ctx, session_id, - handoff_node.pBssDescription->bssId, - eCSR_ROAM_HANDOVER_SUCCESS); - /* Free the profile.. Just to make sure we dont leak memory here */ - csr_release_profile(mac_ctx, - &neighbor_roam_info->csrNeighborRoamProfile); - /* - * Create the Handoff AP profile. Copy the currently connected profile - * and update only the BSSID and channel number. This should happen - * before issuing disconnect - */ - status = csr_roam_copy_connected_profile(mac_ctx, session_id, - &neighbor_roam_info->csrNeighborRoamProfile); - if (QDF_STATUS_SUCCESS != status) { - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, - FL("csr_roam_copy_connected_profile failed %d"), - status); - return; - } - qdf_mem_copy(neighbor_roam_info->csrNeighborRoamProfile.BSSIDs.bssid, - handoff_node.pBssDescription->bssId, sizeof(tSirMacAddr)); - neighbor_roam_info->csrNeighborRoamProfile.ChannelInfo.ChannelList[0] = - handoff_node.pBssDescription->channelId; - - NEIGHBOR_ROAM_DEBUG(mac_ctx, LOGW, - " csr_roamHandoffRequested: disassociating with current AP"); - - if (!QDF_IS_STATUS_SUCCESS - (csr_roam_issue_disassociate_cmd - (mac_ctx, session_id, - eCSR_DISCONNECT_REASON_HANDOFF))) { - sms_log(mac_ctx, LOGW, - "csr_roamHandoffRequested: fail to issue disassociate"); - return; - } - /* notify HDD for handoff, providing the BSSID too */ - roam_info.reasonCode = eCsrRoamReasonBetterAP; - - qdf_mem_copy(roam_info.bssid.bytes, - handoff_node.pBssDescription->bssId, - sizeof(struct qdf_mac_addr)); - - csr_roam_call_callback(mac_ctx, session_id, &roam_info, 0, - eCSR_ROAM_ROAMING_START, eCSR_ROAM_RESULT_NONE); - - return; -} - -/** - * csr_neighbor_roam_is_handoff_in_progress() - * - * @mac_ctx: Pointer to Global MAC structure - * @session_id: Session ID - * - * This function returns whether handoff is in progress or not based on - * the current neighbor roam state - * - * Return: true if reassoc in progress, false otherwise - */ -bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, uint8_t sessionId) -{ - if (eCSR_NEIGHBOR_ROAM_STATE_REASSOCIATING == - pMac->roam.neighborRoamInfo[sessionId].neighborRoamState) - return true; - - return false; -} /** * csr_neighbor_roam_is11r_assoc() - Check if association type is 11R * @mac_ctx: MAC Global context @@ -2559,82 +2015,6 @@ bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal mac_ctx, uint8_t session_id) return mac_ctx->roam.neighborRoamInfo[session_id].is11rAssoc; } -/** - * csr_neighbor_roam_get_handoff_ap_info - Identifies the best AP for roaming - * - * @pMac: mac context - * @session_id: Session Id - * @hand_off_node: AP node that is the handoff candidate returned - * - * This function returns the best possible AP for handoff. For 11R case, it - * returns the 1st entry from pre-auth done list. For non-11r case, it returns - * the 1st entry from roamable AP list - * - * Return: true if able find handoff AP, false otherwise - */ - -bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, - tpCsrNeighborRoamBSSInfo hand_off_node, - uint8_t session_id) -{ - tpCsrNeighborRoamControlInfo ngbr_roam_info = - &pMac->roam.neighborRoamInfo[session_id]; - tpCsrNeighborRoamBSSInfo bss_node = NULL; - - if (NULL == hand_off_node) { - QDF_ASSERT(NULL != hand_off_node); - return false; - } - if (ngbr_roam_info->is11rAssoc) { - /* Always the BSS info in the head is the handoff candidate */ - bss_node = csr_neighbor_roam_next_roamable_ap( - pMac, - &ngbr_roam_info->FTRoamInfo.preAuthDoneList, - NULL); - NEIGHBOR_ROAM_DEBUG(pMac, LOG1, - FL("Number of Handoff candidates = %d"), - csr_ll_count(& - ngbr_roam_info->FTRoamInfo.preAuthDoneList)); - } else -#ifdef FEATURE_WLAN_ESE - if (ngbr_roam_info->isESEAssoc) { - /* Always the BSS info in the head is the handoff candidate */ - bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, - &ngbr_roam_info->FTRoamInfo.preAuthDoneList, - NULL); - NEIGHBOR_ROAM_DEBUG(pMac, LOG1, - FL("Number of Handoff candidates = %d"), - csr_ll_count(&ngbr_roam_info->FTRoamInfo. - preAuthDoneList)); - } else -#endif - if (csr_roam_is_fast_roam_enabled(pMac, session_id)) { - /* Always the BSS info in the head is the handoff candidate */ - bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, - &ngbr_roam_info->FTRoamInfo.preAuthDoneList, - NULL); - NEIGHBOR_ROAM_DEBUG(pMac, LOG1, - FL("Number of Handoff candidates = %d"), - csr_ll_count( - &ngbr_roam_info->FTRoamInfo.preAuthDoneList)); - } else { - bss_node = - csr_neighbor_roam_next_roamable_ap(pMac, - &ngbr_roam_info->roamableAPList, - NULL); - NEIGHBOR_ROAM_DEBUG(pMac, LOG1, - FL("Number of Handoff candidates = %d"), - csr_ll_count(&ngbr_roam_info->roamableAPList)); - } - if (NULL == bss_node) - return false; - qdf_mem_copy(hand_off_node, bss_node, sizeof(tCsrNeighborRoamBSSInfo)); - return true; -} - - /* --------------------------------------------------------------------------- \brief This function returns true if STA is in the middle of roaming states @@ -2657,62 +2037,6 @@ bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId) return val; } -/** - * csr_neighbor_roam_candidate_found_ind_hdlr() - * - * @mac_ctx: Pointer to Global MAC structure - * @msg_buf: pointer to msg buff - * - * This function is called by CSR as soon as TL posts the candidate - * found indication to SME via MC thread - * - * Return: QDF_STATUS_SUCCESS on success, corresponding error code otherwise - */ -QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, void *pMsg) -{ - tSirSmeCandidateFoundInd *pSirSmeCandidateFoundInd = - (tSirSmeCandidateFoundInd *) pMsg; - uint32_t sessionId = pSirSmeCandidateFoundInd->sessionId; - tpCsrNeighborRoamControlInfo pNeighborRoamInfo = - &pMac->roam.neighborRoamInfo[sessionId]; - QDF_STATUS status = QDF_STATUS_SUCCESS; - - sms_log(pMac, LOG1, FL("Received indication from firmware")); - - /* we must be in connected state, if not ignore it */ - if ((eCSR_NEIGHBOR_ROAM_STATE_CONNECTED != - pNeighborRoamInfo->neighborRoamState) - || (pNeighborRoamInfo->uOsRequestedHandoff)) { - sms_log(pMac, LOGE, - FL - ("Received in not CONNECTED state OR uOsRequestedHandoff is set. Ignore it")); - status = QDF_STATUS_E_FAILURE; - } else { - /* Firmware indicated that roaming candidate is found. Beacons - * are already in the SME scan results table. - * Process the results for choosing best roaming candidate. - */ - csr_save_scan_results(pMac, eCsrScanCandidateFound, - sessionId); - /* Future enhancements: - * If firmware tags candidate beacons, give them preference - * for roaming. - * Age out older entries so that new candidate beacons - * will get preference. - */ - status = csr_neighbor_roam_process_scan_complete(pMac, - sessionId); - if (QDF_STATUS_SUCCESS != status) { - sms_log(pMac, LOGE, - FL("Neighbor scan process complete failed with status %d"), - status); - return QDF_STATUS_E_FAILURE; - } - } - - return status; -} - /** * csr_neighbor_roam_process_handoff_req - Processes handoff request * -- cgit v1.2.3 From bbbbe237f9fa0ac35a93a6b863d2d64e71e51229 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Mon, 29 Feb 2016 14:01:57 -0800 Subject: qcacld-3.0: Enable compile time enable/disable for roaming Enable compile time featurization support for both LFR2.0 and LFR3.0 using WLAN_FEATURE_HOST_ROAM and WLAN_FEATURE_ROAM_OFFLOAD respectively CRs-Fixed: 978905 Change-Id: Ib5976cd0cd5a6e117a1334bfc73a043e36e25f77 --- Kbuild | 26 ++- Kconfig | 4 + core/hdd/inc/wlan_hdd_main.h | 13 ++ core/hdd/src/wlan_hdd_cfg80211.c | 8 +- core/hdd/src/wlan_hdd_ioctl.c | 8 +- core/mac/inc/sir_api.h | 5 +- core/mac/src/pe/include/lim_api.h | 7 + core/mac/src/pe/include/lim_ft.h | 90 ++++++-- core/mac/src/pe/lim/lim_assoc_utils.c | 2 +- core/mac/src/pe/lim/lim_assoc_utils.h | 64 ++++-- core/mac/src/pe/lim/lim_ft.c | 25 ++- core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c | 51 ++--- core/mac/src/pe/lim/lim_process_tdls.c | 2 +- core/mac/src/pe/lim/lim_types.h | 15 +- core/mac/src/pe/lim/lim_utils.h | 12 ++ core/sme/inc/csr_api.h | 11 +- core/sme/inc/csr_internal.h | 20 +- core/sme/inc/csr_neighbor_roam.h | 105 ++++++++-- core/sme/src/csr/csr_api_roam.c | 243 +++++++++------------- core/sme/src/csr/csr_inside_api.h | 17 +- core/sme/src/csr/csr_neighbor_roam.c | 2 +- core/wma/inc/wma.h | 2 + core/wma/inc/wma_internal.h | 2 - core/wma/inc/wma_types.h | 13 ++ core/wma/src/wma_mgmt.c | 3 + core/wma/src/wma_scan_roam.c | 90 ++++---- 26 files changed, 523 insertions(+), 317 deletions(-) diff --git a/Kbuild b/Kbuild index f14e5a9c2952..33169715e278 100755 --- a/Kbuild +++ b/Kbuild @@ -41,6 +41,8 @@ ifeq ($(KERNEL_BUILD), 0) CONFIG_MOBILE_ROUTER := y endif + #Flag to enable Legacy Fast Roaming2(LFR2) + CONFIG_QCACLD_WLAN_LFR2 := y #Flag to enable Legacy Fast Roaming3(LFR3) CONFIG_QCACLD_WLAN_LFR3 := y @@ -401,10 +403,8 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_admit_control.o \ $(MAC_SRC_DIR)/pe/lim/lim_api.o \ $(MAC_SRC_DIR)/pe/lim/lim_assoc_utils.o \ - $(MAC_SRC_DIR)/pe/lim/lim_reassoc_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_debug.o \ $(MAC_SRC_DIR)/pe/lim/lim_ft.o \ - $(MAC_SRC_DIR)/pe/lim/lim_ft_preauth.o \ $(MAC_SRC_DIR)/pe/lim/lim_ibss_peer_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_link_monitoring_algo.o \ $(MAC_SRC_DIR)/pe/lim/lim_p2p.o \ @@ -417,7 +417,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_deauth_frame.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_disassoc_frame.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_message_queue.o \ - $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_host_roam.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_req_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_rsp_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_process_probe_req_frame.o \ @@ -427,7 +426,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_scan_result_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_security_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_management_frames.o \ - $(MAC_SRC_DIR)/pe/lim/lim_send_frames_host_roam.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_send_sme_rsp_messages.o \ $(MAC_SRC_DIR)/pe/lim/lim_ser_des_utils.o \ @@ -436,7 +434,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \ $(MAC_SRC_DIR)/pe/lim/lim_sme_req_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_sta_hash_api.o \ $(MAC_SRC_DIR)/pe/lim/lim_timer_utils.o \ - $(MAC_SRC_DIR)/pe/lim/lim_roam_timer_utils.o \ $(MAC_SRC_DIR)/pe/lim/lim_trace.o \ $(MAC_SRC_DIR)/pe/lim/lim_utils.o @@ -444,6 +441,14 @@ ifeq ($(CONFIG_QCOM_TDLS),y) MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_tdls.o endif +ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y) + MAC_LIM_OBJS += $(MAC_SRC_DIR)/pe/lim/lim_process_mlm_host_roam.o \ + $(MAC_SRC_DIR)/pe/lim/lim_send_frames_host_roam.o \ + $(MAC_SRC_DIR)/pe/lim/lim_roam_timer_utils.o \ + $(MAC_SRC_DIR)/pe/lim/lim_ft_preauth.o \ + $(MAC_SRC_DIR)/pe/lim/lim_reassoc_utils.o +endif + MAC_SCH_OBJS := $(MAC_SRC_DIR)/pe/sch/sch_api.o \ $(MAC_SRC_DIR)/pe/sch/sch_beacon_gen.o \ $(MAC_SRC_DIR)/pe/sch/sch_beacon_process.o \ @@ -500,13 +505,18 @@ SME_INC := -I$(WLAN_ROOT)/$(SME_INC_DIR) \ -I$(WLAN_ROOT)/$(SME_SRC_DIR)/csr SME_CSR_OBJS := $(SME_SRC_DIR)/csr/csr_api_roam.o \ - $(SME_SRC_DIR)/csr/csr_roam_preauth.o \ $(SME_SRC_DIR)/csr/csr_api_scan.o \ $(SME_SRC_DIR)/csr/csr_cmd_process.o \ $(SME_SRC_DIR)/csr/csr_link_list.o \ $(SME_SRC_DIR)/csr/csr_neighbor_roam.o \ $(SME_SRC_DIR)/csr/csr_util.o \ + + +ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y) +SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csr_roam_preauth.o \ $(SME_SRC_DIR)/csr/csr_host_scan_roam.o +endif + ifeq ($(CONFIG_QCOM_TDLS),y) SME_CSR_OBJS += $(SME_SRC_DIR)/csr/csr_tdls_process.o @@ -1019,6 +1029,10 @@ ifeq ($(CONFIG_QCACLD_WLAN_LFR3),y) CDEFINES += -DWLAN_FEATURE_ROAM_OFFLOAD endif +ifeq ($(CONFIG_QCACLD_WLAN_LFR2),y) +CDEFINES += -DWLAN_FEATURE_HOST_ROAM +endif + ifeq ($(CONFIG_PRIMA_WLAN_OKC),y) CDEFINES += -DFEATURE_WLAN_OKC endif diff --git a/Kconfig b/Kconfig index 029683a4b317..13c92b848e28 100644 --- a/Kconfig +++ b/Kconfig @@ -115,4 +115,8 @@ config FEATURE_WLAN_MCC_TO_SCC_SWITCH bool "Enable MCC to SCC Switch Logic" default n +config QCACLD_WLAN_LFR2 + bool "Enable the WLAN Legacy Fast Roaming feature Version 2" + default n + endif # QCA_CLD_WLAN diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 53a8445cf356..0e3224aed16b 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1645,4 +1645,17 @@ static inline void hdd_set_tso_flags(hdd_context_t *hdd_ctx, static inline void hdd_set_tso_flags(hdd_context_t *hdd_ctx, struct net_device *wlan_dev){} #endif /* FEATURE_TSO */ + +#ifdef WLAN_FEATURE_ROAM_OFFLOAD +static inline bool is_roaming_offload_enabled(hdd_context_t *hdd_ctx) +{ + return hdd_ctx->config->isRoamOffloadEnabled; +} +#else +static inline bool is_roaming_offload_enabled(hdd_context_t *hdd_ctx) +{ + return false; +} +#endif + #endif /* end #if !defined(WLAN_HDD_MAIN_H) */ diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 1ce82c2e06c8..cdf0e41d7fde 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2184,7 +2184,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, return -EPERM; } - if (hdd_ctx_ptr->config->isRoamOffloadEnabled) { + if (is_roaming_offload_enabled(hdd_ctx_ptr)) { hddLog(LOG1, FL("Key Mgmt Offload is supported")); wlan_hdd_cfg80211_set_feature(feature_flags, QCA_WLAN_VENDOR_FEATURE_KEY_MGMT_OFFLOAD); @@ -2889,6 +2889,7 @@ static int wlan_hdd_cfg80211_keymgmt_set_key(struct wiphy *wiphy, return ret; } +#endif static const struct nla_policy qca_wlan_vendor_get_wifi_info_policy[ QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_MAX + 1] = { @@ -3086,6 +3087,7 @@ wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy, return ret; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * wlan_hdd_send_roam_auth_event() - Send the roamed and authorized event * @hdd_ctx_ptr: pointer to HDD Context. @@ -3126,7 +3128,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, return -EINVAL; } - if (!hdd_ctx_ptr->config->isRoamOffloadEnabled || + if (!is_roaming_offload_enabled(hdd_ctx_ptr) || !roam_info_ptr->roamSynchInProgress) return 0; @@ -3221,7 +3223,7 @@ nla_put_failure: kfree_skb(skb); return -EINVAL; } -#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ +#endif static const struct nla_policy wlan_hdd_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = { diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index eb2622b3149d..9723486740e3 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -4640,6 +4640,10 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid, FL("Not able to post ROAM_INVOKE_CMD message to WMA")); } } +#else +static inline void hdd_wma_send_fastreassoc_cmd(int sessionId, + tSirMacAddr bssid, int channel) +{} #endif static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, hdd_context_t *hdd_ctx, @@ -4713,13 +4717,11 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (hdd_ctx->config->isRoamOffloadEnabled) { + if (is_roaming_offload_enabled(hdd_ctx)) { hdd_wma_send_fastreassoc_cmd((int)adapter->sessionId, targetApBssid, (int)channel); goto exit; } -#endif /* Proceed with reassoc */ handoffInfo.channel = channel; handoffInfo.src = FASTREASSOC; diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 7859837648f8..e6d13f0219da 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -154,12 +154,11 @@ typedef enum { #endif /* FEATURE_WLAN_EXTSCAN */ #define SIR_KRK_KEY_LEN 16 -#ifdef WLAN_FEATURE_ROAM_OFFLOAD #define SIR_BTK_KEY_LEN 32 #define SIR_KCK_KEY_LEN 16 #define SIR_KEK_KEY_LEN 16 #define SIR_REPLAY_CTR_LEN 8 - +#ifdef WLAN_FEATURE_ROAM_OFFLOAD #define SIR_UAPSD_BITOFFSET_ACVO 0 #define SIR_UAPSD_BITOFFSET_ACVI 1 #define SIR_UAPSD_BITOFFSET_ACBK 2 @@ -4006,7 +4005,6 @@ typedef struct { uint8_t event_data[]; } tSirNanEvent, *tpSirNanEvent; #endif -#ifdef WLAN_FEATURE_ROAM_OFFLOAD typedef struct sSirSmeRoamOffloadSynchInd { uint16_t messageType; /*eWNI_SME_ROAM_OFFLOAD_SYNCH_IND */ uint16_t length; @@ -4034,6 +4032,7 @@ typedef struct sSirSmeRoamOffloadSynchInd { tpSirBssDescription bss_desc_ptr; } roam_offload_synch_ind; +#ifdef WLAN_FEATURE_ROAM_OFFLOAD typedef struct sSirSmeRoamOffloadSynchCnf { uint8_t sessionId; } tSirSmeRoamOffloadSynchCnf, *tpSirSmeRoamOffloadSynchCnf; diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h index 149a2c0d71f9..126f2aa1baa8 100644 --- a/core/mac/src/pe/include/lim_api.h +++ b/core/mac/src/pe/include/lim_api.h @@ -170,6 +170,13 @@ bool lim_is_assoc_req_for_drop(tpAniSirGlobal mac, uint8_t *rx_pkt_info); QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr, tpSirBssDescription bss_desc_ptr); +#else +static inline QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx, + struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr, + tpSirBssDescription bss_desc_ptr) +{ + return QDF_STATUS_E_NOSUPPORT; +} #endif #define limGetQosMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limQosEnabled) #define limGetWmeMode(psessionEntry, pVal) (*(pVal) = (psessionEntry)->limWmeEnabled) diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h index 2b40efc364bd..01307d77f5a3 100644 --- a/core/mac/src/pe/include/lim_ft.h +++ b/core/mac/src/pe/include/lim_ft.h @@ -45,45 +45,91 @@ ------------------------------------------------------------------------*/ void lim_ft_open(tpAniSirGlobal pMac, tpPESession psessionEntry); void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry); -void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry); +#ifdef WLAN_FEATURE_HOST_ROAM +void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, + tpPESession psessionEntry); int lim_process_ft_pre_auth_req(tpAniSirGlobal pMac, tpSirMsgQ pMsg); +void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal pMac); +void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, + tpPESession psessionEntry); void lim_perform_ft_pre_auth(tpAniSirGlobal pMac, QDF_STATUS status, - uint32_t *data, tpPESession psessionEntry); -void limPerformPostFTPreAuth(tpAniSirGlobal pMac, QDF_STATUS status, - uint32_t *data, tpPESession psessionEntry); -void limFTResumeLinkCb(tpAniSirGlobal pMac, QDF_STATUS status, uint32_t *data); + uint32_t *data, tpPESession psessionEntry); void lim_post_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, - uint8_t *auth_rsp, uint16_t auth_rsp_length, - tpPESession psessionEntry); + uint8_t *auth_rsp, uint16_t auth_rsp_length, + tpPESession psessionEntry); void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, tSirRetStatus status, - uint8_t *auth_rsp, uint16_t auth_rsp_len, - tpPESession psessionEntry); -void lim_process_mlm_reassoc_cnf(tpAniSirGlobal, uint32_t *); + uint8_t *auth_rsp, uint16_t auth_rsp_len, + tpPESession psessionEntry); +tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, + tpPESession psessionEntry); +void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg); void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, tpPESession psessionEntry); -void lim_process_mlm_reassoc_req(tpAniSirGlobal, uint32_t *); -void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf, - tpPESession psessionEntry); -void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal pMac); +void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, uint32_t *msg); void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, enum lim_scan_event_type event, uint8_t session_id, uint32_t scan_id); -tSirRetStatus lim_ft_setup_auth_session(tpAniSirGlobal pMac, - tpPESession psessionEntry); +QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, + uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req); +#else +static inline void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, + tpPESession psessionEntry) +{} +static inline void lim_process_ft_preauth_rsp_timeout(tpAniSirGlobal pMac) +{} +static inline void lim_process_mlm_ft_reassoc_req(tpAniSirGlobal pMac, + uint32_t *pMsgBuf, tpPESession psessionEntry) +{} +static inline void lim_handle_ft_pre_auth_rsp(tpAniSirGlobal pMac, + tSirRetStatus status, uint8_t *auth_rsp, + uint16_t auth_rsp_len, tpPESession psessionEntry) +{} +static inline void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, + uint32_t *msg) +{} +static inline void lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, + tpSirMsgQ limMsgQ, tpPESession psessionEntry) +{} +static inline void lim_process_mlm_reassoc_req(tpAniSirGlobal mac_ctx, + uint32_t *msg) +{} +static inline void lim_preauth_scan_event_handler(tpAniSirGlobal mac_ctx, + enum lim_scan_event_type event, + uint8_t session_id, uint32_t scan_id) +{} +static inline int lim_process_ft_pre_auth_req(tpAniSirGlobal pMac, + tpSirMsgQ pMsg) +{ + return 0; +} +#endif -bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf); -tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf); -void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg); -void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal pMac); +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) void lim_fill_ft_session(tpAniSirGlobal pMac, tpSirBssDescription pbssDescription, tpPESession pftSessionEntry, tpPESession psessionEntry); -tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, - uint8_t updateEntry, +void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, uint8_t updateEntry, tpPESession pftSessionEntry, tpSirBssDescription bssDescription); QDF_STATUS lim_send_preauth_scan_offload(tpAniSirGlobal mac_ctx, uint8_t session_id, tSirFTPreAuthReq *ft_preauth_req); +#else +static inline void lim_fill_ft_session(tpAniSirGlobal pMac, + tpSirBssDescription pbssDescription, + tpPESession pftSessionEntry, + tpPESession psessionEntry) +{} +static inline void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, + uint8_t updateEntry, tpPESession pftSessionEntry, + tpSirBssDescription bssDescription) +{} +#endif + +bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf); +tSirRetStatus lim_process_ft_aggr_qos_req(tpAniSirGlobal pMac, + uint32_t *pMsgBuf); +void lim_process_ft_aggr_qo_s_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsg); +void lim_ft_cleanup_all_ft_sessions(tpAniSirGlobal pMac); #endif /* __LIMFT_H__ */ diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index 673e5c3d7359..04f13f0cc050 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -608,7 +608,7 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs, pStaDs->valid = 0; lim_send_sme_tsm_ie_ind(pMac, psessionEntry, 0, 0, 0); /* Any roaming related changes should be above this line */ - if (psessionEntry->bRoamSynchInProgress) + if (lim_is_roam_synch_in_progress(psessionEntry)) return eSIR_SUCCESS; pStaDs->mlmStaContext.mlmState = eLIM_MLM_WT_DEL_STA_RSP_STATE; diff --git a/core/mac/src/pe/lim/lim_assoc_utils.h b/core/mac/src/pe/lim/lim_assoc_utils.h index 43c5d9018443..9e605f16dfa6 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.h +++ b/core/mac/src/pe/lim/lim_assoc_utils.h @@ -84,8 +84,6 @@ lim_populate_matching_rate_set(tpAniSirGlobal pMac, uint8_t *pSupportedMCSSet, tpPESession psessionEntry, tDot11fIEVHTCaps * pVHTCaps); -void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, - tpDphHashNode pStaDs, tpPESession psessionEntry); #define MCSMAPMASK1x1 0x3 #define MCSMAPMASK2x2 0xC @@ -93,16 +91,66 @@ void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, tSirRetStatus lim_add_sta(tpAniSirGlobal, tpDphHashNode, uint8_t, tpPESession); tSirRetStatus lim_del_bss(tpAniSirGlobal, tpDphHashNode, uint16_t, tpPESession); tSirRetStatus lim_del_sta(tpAniSirGlobal, tpDphHashNode, bool, tpPESession); -tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, uint16_t assocId, - tpPESession psessionEntry); tSirRetStatus lim_add_sta_self(tpAniSirGlobal, uint16_t, uint8_t, tpPESession); void lim_teardown_infra_bss(tpAniSirGlobal, tpPESession); +#ifdef WLAN_FEATURE_HOST_ROAM void lim_restore_pre_reassoc_state(tpAniSirGlobal, tSirResultCodes, uint16_t, tpPESession); void lim_post_reassoc_failure(tpAniSirGlobal, tSirResultCodes, uint16_t, tpPESession); bool lim_is_reassoc_in_progress(tpAniSirGlobal, tpPESession); + +void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry); +void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry); +void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, + tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry); +tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, uint16_t assocId, + tpPESession psessionEntry); +#else +static inline void lim_restore_pre_reassoc_state(tpAniSirGlobal mac_ctx, + tSirResultCodes res_code, uint16_t prot_status, + tpPESession pe_session) +{} +static inline void lim_post_reassoc_failure(tpAniSirGlobal mac_ctx, + tSirResultCodes res_code, uint16_t prot_status, + tpPESession pe_session) +{} +static inline void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry) +{} +static inline void lim_handle_del_bss_in_re_assoc_context(tpAniSirGlobal pMac, + tpDphHashNode pStaDs, tpPESession psessionEntry) +{} +static inline void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, + tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry) +{} +static inline bool lim_is_reassoc_in_progress(tpAniSirGlobal mac_ctx, + tpPESession pe_session) +{ + return false; +} +static inline tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal pMac, + uint16_t assocId, tpPESession psessionEntry) +{ + return eSIR_SUCCESS; +} +#endif + +#ifdef WLAN_FEATURE_ROAM_OFFLOAD +static inline bool lim_is_roam_synch_in_progress(tpPESession pe_session) +{ + return pe_session->bRoamSynchInProgress; +} +#else +static inline bool lim_is_roam_synch_in_progress(tpPESession pe_session) +{ + return false; +} +#endif + void lim_send_del_sta_cnf(tpAniSirGlobal pMac, struct qdf_mac_addr sta_dsaddr, uint16_t staDsAssocId, tLimMlmStaContext mlmStaContext, @@ -150,18 +198,10 @@ tSirRetStatus lim_is_dot11h_supported_channels_valid(tpAniSirGlobal pMac, tSirRetStatus lim_is_dot11h_power_capabilities_in_range(tpAniSirGlobal pMac, tSirAssocReq *assoc, tpPESession); - -/* API to re-add the same BSS during re-association */ -void lim_handle_add_bss_in_re_assoc_context(tpAniSirGlobal pMac, tpDphHashNode pStaDs, - tpPESession psessionEntry); - /* API to fill in RX Highest Supported data Rate */ void lim_fill_rx_highest_supported_rate(tpAniSirGlobal pMac, uint16_t *rxHighestRate, uint8_t *pSupportedMCSSet); -void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac, - tLimMlmReassocReq *pMlmReassocReq, - tpPESession psessionEntry); #ifdef WLAN_FEATURE_11W void lim_send_sme_unprotected_mgmt_frame_ind(tpAniSirGlobal pMac, uint8_t frameType, uint8_t *frame, uint32_t frameLen, diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index f79494777954..01a2afc88750 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -119,6 +119,7 @@ void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry) qdf_mem_set(&psessionEntry->ftPEContext, sizeof(tftPEContext), 0); } +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) /*------------------------------------------------------------------ * * Create the new Add Bss Req to the new AP. @@ -126,10 +127,9 @@ void lim_ft_cleanup(tpAniSirGlobal pMac, tpPESession psessionEntry) * The newly created ft Session entry is passed to this function * *------------------------------------------------------------------*/ -tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, - uint8_t updateEntry, - tpPESession pftSessionEntry, - tpSirBssDescription bssDescription) +void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, + uint8_t updateEntry, tpPESession pftSessionEntry, + tpSirBssDescription bssDescription) { tpAddBssParams pAddBssParams = NULL; tAddStaParams *sta_ctx; @@ -139,14 +139,14 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, /* Nothing to be done if the session is not in STA mode */ if (!LIM_IS_STA_ROLE(pftSessionEntry)) { lim_log(pMac, LOGE, FL("psessionEntry is not in STA mode")); - return eSIR_FAILURE; + return; } pBeaconStruct = qdf_mem_malloc(sizeof(tSchBeaconStruct)); if (NULL == pBeaconStruct) { lim_log(pMac, LOGE, FL("Unable to allocate memory for creating ADD_BSS")); - return eSIR_MEM_ALLOC_FAILED; + return; } /* Package SIR_HAL_ADD_BSS_REQ message parameters */ pAddBssParams = qdf_mem_malloc(sizeof(tAddBssParams)); @@ -154,7 +154,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, qdf_mem_free(pBeaconStruct); lim_log(pMac, LOGP, FL("Unable to allocate memory for creating ADD_BSS")); - return eSIR_MEM_ALLOC_FAILED; + return; } qdf_mem_set((uint8_t *) pAddBssParams, sizeof(tAddBssParams), 0); @@ -457,7 +457,7 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, pAddBssParams->sessionId = pftSessionEntry->peSessionId; /* Set a new state for MLME */ - if (!pftSessionEntry->bRoamSynchInProgress) { + if (!lim_is_roam_synch_in_progress(pftSessionEntry)) { pftSessionEntry->limMlmState = eLIM_MLM_WT_ADD_BSS_RSP_FT_REASSOC_STATE; MTRACE(mac_trace @@ -469,12 +469,14 @@ tSirRetStatus lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac, pftSessionEntry->ftPEContext.pAddBssReq = pAddBssParams; - lim_log(pMac, LOG1, FL("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap...")); + lim_log(pMac, LOG1, FL("Saving SIR_HAL_ADD_BSS_REQ for pre-auth ap.")); qdf_mem_free(pBeaconStruct); - return 0; + return; } +#endif +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) /*------------------------------------------------------------------ * * Setup the new session for the pre-auth AP. @@ -667,7 +669,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, regMax, localPowerConstraint, pMac->roam.configParam.nTxPowerCap, pftSessionEntry->maxTxPower); - if (!psessionEntry->bRoamSynchInProgress) { + if (!lim_is_roam_synch_in_progress(psessionEntry)) { pftSessionEntry->limPrevSmeState = pftSessionEntry->limSmeState; pftSessionEntry->limSmeState = eLIM_SME_WT_REASSOC_STATE; MTRACE(mac_trace(pMac, @@ -692,6 +694,7 @@ void lim_fill_ft_session(tpAniSirGlobal pMac, qdf_mem_free(pBeaconStruct); } +#endif /*------------------------------------------------------------------ * diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c index 707d6e6876b8..03577a99d285 100644 --- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c +++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c @@ -535,16 +535,14 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, tSchBeaconStruct *beacon; #ifdef WLAN_FEATURE_ROAM_OFFLOAD uint8_t sme_sessionid = 0; -#endif tCsrRoamSession *roam_session; +#endif /* Initialize status code to success. */ -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session_entry->bRoamSynchInProgress) + if (lim_is_roam_synch_in_progress(session_entry)) hdr = (tpSirMacMgmtHdr) mac_ctx->roam.pReassocResp; else -#endif - hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); + hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); #ifdef WLAN_FEATURE_ROAM_OFFLOAD sme_sessionid = session_entry->smeSessionId; #endif @@ -587,21 +585,17 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, qdf_mem_free(beacon); return; } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session_entry->bRoamSynchInProgress) { + if (lim_is_roam_synch_in_progress(session_entry)) { hdr = (tpSirMacMgmtHdr) mac_ctx->roam.pReassocResp; frame_len = mac_ctx->roam.reassocRespLen - SIR_MAC_HDR_LEN_3A; } else { -#endif - hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); - frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD -} -#endif + hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info); + frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info); + } if (((subtype == LIM_ASSOC) && (session_entry->limMlmState != eLIM_MLM_WT_ASSOC_RSP_STATE)) || ((subtype == LIM_REASSOC) && - !session_entry->bRoamSynchInProgress && + !lim_is_roam_synch_in_progress(session_entry) && ((session_entry->limMlmState != eLIM_MLM_WT_REASSOC_RSP_STATE) && (session_entry->limMlmState != eLIM_MLM_WT_FT_REASSOC_RSP_STATE) @@ -667,12 +661,10 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, return; } /* Get pointer to Re/Association Response frame body */ -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session_entry->bRoamSynchInProgress) + if (lim_is_roam_synch_in_progress(session_entry)) body = mac_ctx->roam.pReassocResp + SIR_MAC_HDR_LEN_3A; else -#endif - body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); + body = WMA_GET_RX_MPDU_DATA(rx_pkt_info); /* parse Re/Association Response frame. */ if (sir_convert_assoc_resp_frame2_struct(mac_ctx, body, frame_len, assoc_rsp) == eSIR_FAILURE) { @@ -853,7 +845,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, if (!((session_entry->bssType == eSIR_BTAMP_STA_MODE) || ((session_entry->bssType == eSIR_BTAMP_AP_MODE) && LIM_IS_BT_AMP_STA_ROLE(session_entry)) || - session_entry->bRoamSynchInProgress)) { + lim_is_roam_synch_in_progress(session_entry))) { if (lim_set_link_state (mac_ctx, eSIR_LINK_POSTASSOC_STATE, session_entry->bssId, @@ -909,7 +901,7 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, } if ((session_entry->limMlmState == eLIM_MLM_WT_FT_REASSOC_RSP_STATE) || - session_entry->bRoamSynchInProgress) { + lim_is_roam_synch_in_progress(session_entry)) { lim_log(mac_ctx, LOG1, FL("Sending self sta")); lim_update_assoc_sta_datas(mac_ctx, sta_ds, assoc_rsp, session_entry); @@ -920,17 +912,14 @@ lim_process_assoc_rsp_frame(tpAniSirGlobal mac_ctx, session_entry->gLimEdcaParams, session_entry); /* Send the active EDCA parameters to HAL */ -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (!session_entry->bRoamSynchInProgress) { -#endif - lim_send_edca_params(mac_ctx, - session_entry->gLimEdcaParamsActive, - sta_ds->bssId); - lim_add_ft_sta_self(mac_ctx, (assoc_rsp->aid & 0x3FFF), - session_entry); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - } -#endif + if (!lim_is_roam_synch_in_progress(session_entry)) { + lim_send_edca_params(mac_ctx, + session_entry->gLimEdcaParamsActive, + sta_ds->bssId); + lim_add_ft_sta_self(mac_ctx, + (assoc_rsp->aid & 0x3FFF), + session_entry); + } qdf_mem_free(beacon); return; } diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index f524a28f2b22..5950dd373704 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -3257,7 +3257,7 @@ tSirRetStatus lim_delete_tdls_peers(tpAniSirGlobal mac_ctx, CLEAR_BIT(session_entry->peerAIDBitmap[i], aid); } } - if (session_entry->bRoamSynchInProgress) + if (lim_is_roam_synch_in_progress(session_entry)) return eSIR_SUCCESS; lim_send_sme_tdls_delete_all_peer_ind(mac_ctx, session_entry); diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h index 2bbb79d19221..c2a4bb4a4fb0 100644 --- a/core/mac/src/pe/lim/lim_types.h +++ b/core/mac/src/pe/lim/lim_types.h @@ -458,11 +458,20 @@ void lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal, tSirMacAddr, tpAniSSID, short void lim_send_auth_mgmt_frame(tpAniSirGlobal, tSirMacAuthFrameBody *, tSirMacAddr, uint8_t, tpPESession, bool wait_for_ack); void lim_send_assoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmAssocReq *, tpPESession); +#ifdef WLAN_FEATURE_HOST_ROAM +void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, + tLimMlmReassocReq *pMlmReassocReq, tpPESession psessionEntry); void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal, tLimMlmReassocReq *, tpPESession); -void lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal pMac, - tLimMlmReassocReq *pMlmReassocReq, - tpPESession psessionEntry); +#else +static inline void lim_send_reassoc_req_with_ft_ies_mgmt_frame( + tpAniSirGlobal pMac, tLimMlmReassocReq *pMlmReassocReq, + tpPESession psessionEntry) +{} +static inline void lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal mac_ctx, + tLimMlmReassocReq *reassoc_req, tpPESession pe_session) +{} +#endif void lim_send_delts_req_action_frame(tpAniSirGlobal pMac, tSirMacAddr peer, uint8_t wmmTspecPresent, tSirMacTSInfo * pTsinfo, diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h index 1ceeabd0daf4..b96e9b87a049 100644 --- a/core/mac/src/pe/lim/lim_utils.h +++ b/core/mac/src/pe/lim/lim_utils.h @@ -585,9 +585,21 @@ uint8_t lim_get_80Mhz_center_channel(uint8_t primary_channel); void lim_update_obss_scanparams(tpPESession session, tDot11fIEOBSSScanParameters *scan_params); void lim_init_obss_params(tpAniSirGlobal mac_ctx, tpPESession session); +#ifdef WLAN_FEATURE_HOST_ROAM uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx); void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx); void lim_deactivate_and_change_timer_host_roam(tpAniSirGlobal mac_ctx, uint32_t timer_id); +#else +static inline uint32_t lim_create_timers_host_roam(tpAniSirGlobal mac_ctx) +{ + return 0; +} +static inline void lim_delete_timers_host_roam(tpAniSirGlobal mac_ctx) +{} +static inline void lim_deactivate_and_change_timer_host_roam( + tpAniSirGlobal mac_ctx, uint32_t timer_id) +{} +#endif #endif /* __LIM_UTILS_H */ diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 5570ac6ab277..8a05500d717d 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1573,9 +1573,16 @@ typedef void (*tCsrTsmStatsCallback)(tAniTrafStrmMetrics tsmMetrics, uint32_t staId, void *pContext); #endif /* FEATURE_WLAN_ESE */ typedef void (*tCsrSnrCallback)(int8_t snr, uint32_t staId, void *pContext); - +#ifdef WLAN_FEATURE_HOST_ROAM QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, uint32_t sessionId, - tpSirBssDescription pBssDescription); + tpSirBssDescription pBssDescription); +#else +static inline QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hHal, + uint32_t sessionId, tpSirBssDescription pBssDescription) +{ + return QDF_STATUS_E_NOSUPPORT; +} +#endif QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand); eCsrBand csr_get_current_band(tHalHandle hHal); typedef void (*csr_readyToSuspendCallback)(void *pContext, bool suspended); diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index a476d8d493aa..290584e89be5 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -1008,10 +1008,8 @@ typedef struct tagCsrRoamStruct { uint8_t RoamRssiDiff; bool isWESModeEnabled; uint32_t deauthRspStatus; -#ifdef WLAN_FEATURE_ROAM_OFFLOAD uint8_t *pReassocResp; /* reassociation response from new AP */ uint16_t reassocRespLen; /* length of reassociation response */ -#endif } tCsrRoamStruct; #define GET_NEXT_ROAM_ID(pRoamStruct) (((pRoamStruct)->nextRoamId + 1 == 0) ? \ @@ -1300,8 +1298,16 @@ bool csr_is_channel_present_in_list(uint8_t *pChannelList, int numChannels, uint8_t channel); QDF_STATUS csr_add_to_channel_list_front(uint8_t *pChannelList, int numChannels, uint8_t channel); +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, tpSirRoamOffloadScanRsp scanOffloadRsp); +#else +static inline QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, + tpSirRoamOffloadScanRsp scanOffloadRsp) +{ + return QDF_STATUS_E_NOSUPPORT; +} +#endif QDF_STATUS csr_handoff_request(tpAniSirGlobal pMac, uint8_t sessionId, tCsrHandoffRequest *pHandoffInfo); bool csr_roam_is_sta_mode(tpAniSirGlobal pMac, uint32_t sessionId); @@ -1325,6 +1331,11 @@ QDF_STATUS csr_roam_modify_add_ies(tpAniSirGlobal pMac, tSirModifyIE *pModifyIE, QDF_STATUS csr_roam_update_add_ies(tpAniSirGlobal pMac, tSirUpdateIE *pUpdateIE, eUpdateIEsType updateType); +#ifdef WLAN_FEATURE_ROAM_OFFLOAD +QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, + struct sSirSmeRoamOffloadSynchInd *roam_synch_ind_ptr, + tpSirBssDescription bss_desc_ptr); +void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf); #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, roam_offload_synch_ind *roam_synch_ind_ptr, @@ -1335,11 +1346,6 @@ static inline void csr_roaming_report_diag_event(tpAniSirGlobal mac_ctx, eCsrDiagWlanStatusEventReason reason) {} #endif -#ifdef WLAN_FEATURE_ROAM_OFFLOAD -QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac, - roam_offload_synch_ind *roam_synch_ind_ptr, - tpSirBssDescription bss_desc_ptr); -void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf); #endif bool csr_store_joinreq_param(tpAniSirGlobal mac_ctx, tCsrRoamProfile *profile, diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h index 5bae53f64cf1..1283abf7fe39 100644 --- a/core/sme/inc/csr_neighbor_roam.h +++ b/core/sme/inc/csr_neighbor_roam.h @@ -177,28 +177,95 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(tpAniSirGlobal pMac, uint8_t sessionId, QDF_STATUS status); QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac, uint8_t sessionId); -bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, - uint8_t sessionId); -void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId); void csr_neighbor_roam_close(tpAniSirGlobal pMac, uint8_t sessionId); -void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac); QDF_STATUS csr_neighbor_roam_transit_to_cfg_chan_scan(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csrNeighborRoamTransitionToPreauthDone(tpAniSirGlobal pMac); QDF_STATUS csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac, tCsrScanResultFilter *pScanFilter, uint8_t sessionId); -bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, - tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_preauth_rsp_handler(tpAniSirGlobal pMac, uint8_t sessionId, tSirRetStatus limStatus); bool csr_neighbor_roam_is11r_assoc(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report( tpAniSirGlobal pMac, uint8_t sessionId); +#ifdef WLAN_FEATURE_HOST_ROAM void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( tpAniSirGlobal pMac, uint8_t sessionId); bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, + uint32_t sessionId); +void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, + tDblLinkList *llist); +bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, + tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId); +QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, + uint32_t sessionId, tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile); +void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, uint8_t sessionId); +QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, + void *pMsg); +QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, + uint8_t sessionId); +bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, + uint8_t sessionId); +void csr_neighbor_roam_reset_preauth_control_info( + tpAniSirGlobal mac_ctx, uint8_t session_id); +void csr_neighbor_roam_purge_preauth_failed_list(tpAniSirGlobal pMac); +#else +static inline bool csr_neighbor_roam_state_preauth_done(tpAniSirGlobal pMac, + uint8_t sessionId) +{ + return false; +} +static inline QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, + uint32_t sessionId) +{ + return QDF_STATUS_E_NOSUPPORT; +} +static inline QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, + uint32_t sessionId, tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile) +{ + return QDF_STATUS_E_NOSUPPORT; +} +static inline QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr( + tpAniSirGlobal pMac, void *pMsg) +{ + return QDF_STATUS_E_NOSUPPORT; +} +static inline QDF_STATUS csr_neighbor_roam_process_scan_complete( + tpAniSirGlobal pMac, uint8_t sessionId) +{ + return QDF_STATUS_E_NOSUPPORT; +} +static inline void csr_neighbor_roam_tranistion_preauth_done_to_disconnected( + tpAniSirGlobal pMac, uint8_t sessionId) +{} +static inline void csr_neighbor_roam_free_roamable_bss_list( + tpAniSirGlobal mac_ctx, tDblLinkList *llist) +{} +static inline void csr_neighbor_roam_request_handoff(tpAniSirGlobal pMac, + uint8_t sessionId) +{} +static inline void csr_neighbor_roam_reset_preauth_control_info( + tpAniSirGlobal mac_ctx, uint8_t session_id) +{} +static inline void csr_neighbor_roam_purge_preauth_failed_list( + tpAniSirGlobal pMac) +{} +static inline bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac, + tpCsrNeighborRoamBSSInfo pHandoffNode, uint8_t sessionId) +{ + return false; +} +static inline bool csr_neighbor_roam_is_handoff_in_progress(tpAniSirGlobal pMac, + uint8_t sessionId) +{ + return false; +} +#endif bool csr_neighbor_middle_of_roaming(tpAniSirGlobal pMac, uint8_t sessionId); QDF_STATUS csr_neighbor_roam_set_lookup_rssi_threshold(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t neighborLookupRssiThreshold); @@ -270,10 +337,16 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ptr); #define REASON_ROAM_SCAN_HI_RSSI_DELAY_CHANGED 32 #define REASON_ROAM_SCAN_HI_RSSI_UB_CHANGED 33 +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, uint8_t sessionId, uint8_t command, uint8_t reason); -QDF_STATUS csr_neighbor_roam_candidate_found_ind_hdlr(tpAniSirGlobal pMac, - void *pMsg); +#else +static inline QDF_STATUS csr_roam_offload_scan(tpAniSirGlobal pMac, + uint8_t sessionId, uint8_t command, uint8_t reason) +{ + return QDF_STATUS_E_NOSUPPORT; +} +#endif QDF_STATUS csr_neighbor_roam_handoff_req_hdlr(tpAniSirGlobal pMac, void *pMsg); QDF_STATUS csr_neighbor_roam_proceed_with_handoff_req(tpAniSirGlobal pMac, uint8_t sessionId); @@ -294,6 +367,11 @@ QDF_STATUS csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac, void csr_roam_synch_callback(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); +#else +static inline void csr_roam_synch_callback(tpAniSirGlobal mac, + roam_offload_synch_ind *roam_synch_data, + tpSirBssDescription bss_desc_ptr, uint8_t reason) +{} #endif void csr_neighbor_roam_state_transition(tpAniSirGlobal mac_ctx, uint8_t newstate, uint8_t session); @@ -307,8 +385,6 @@ void csr_neighbor_roam_free_neighbor_roam_bss_node(tpAniSirGlobal pMac, tpCsrNeighborRoamBSSInfo neighborRoamBSSNode); QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac, uint8_t sessionId); -void csr_neighbor_roam_reset_preauth_control_info( - tpAniSirGlobal mac_ctx, uint8_t session_id); bool csr_neighbor_roam_is_preauth_candidate(tpAniSirGlobal pMac, uint8_t sessionId, tSirMacAddr bssId); #ifdef FEATURE_WLAN_LFR_METRICS @@ -320,18 +396,9 @@ static inline void csr_neighbor_roam_send_lfr_metric_event( tSirMacAddr bssid, eRoamCmdStatus status) {} #endif -void csr_neighbor_roam_free_roamable_bss_list(tpAniSirGlobal mac_ctx, - tDblLinkList * llist); -QDF_STATUS csr_neighbor_roam_process_scan_complete(tpAniSirGlobal pMac, - uint8_t sessionId); QDF_STATUS csr_roam_stop_wait_for_key_timer(tpAniSirGlobal pMac); uint32_t csr_get_current_ap_rssi(tpAniSirGlobal pMac, tScanResultHandle *pScanResultList, uint8_t sessionId); -QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac, - uint32_t sessionId, tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes, tCsrRoamProfile *pProfile); -QDF_STATUS csr_roam_issue_reassociate_cmd(tpAniSirGlobal pMac, - uint32_t sessionId); QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac, uint32_t sessionId, tCsrRoamProfile *pDstProfile); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 310dd9a251f0..15c702f328c2 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -6355,7 +6355,6 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, tSirBssDescription *bss_desc = NULL; tCsrScanResult *scan_res = NULL; sme_qos_csr_event_indType ind_qos; - csr_roam_offload_synch_params *roam_offload_params = NULL; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH tSirSmeHTProfile *src_profile = NULL; tCsrRoamHTProfile *dst_profile = NULL; @@ -6367,7 +6366,6 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, tSirSmeJoinRsp *join_rsp = (tSirSmeJoinRsp *) context; uint32_t len; - roam_offload_params = &session->roamOffloadSynchParams; conn_profile = &session->connectedProfile; if (eCsrReassocSuccess == res) ind_qos = SME_QOS_CSR_REASSOC_COMPLETE; @@ -6496,63 +6494,49 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, bss_desc, &bcast_mac, false, false, eSIR_TX_RX, 0, 0, NULL, 0); } else { -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session->roam_synch_in_progress - && (roam_offload_params->authStatus - == CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) { - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_DEBUG, - FL("LFR3:Don't start waitforkey timer")); - csr_roam_substate_change(mac_ctx, - eCSR_ROAM_SUBSTATE_NONE, session_id); - } else { -#endif - /* Need to wait for supplicant authtication */ - roam_info.fAuthRequired = true; - /* - * Set the substate to WaitForKey in case - * authentiation is needed - */ - csr_roam_substate_change(mac_ctx, + /* Need to wait for supplicant authtication */ + roam_info.fAuthRequired = true; + /* + * Set the substate to WaitForKey in case + * authentiation is needed + */ + csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_WAIT_FOR_KEY, session_id); - /* - * Set remain_in_power_active_till_dhcp to make - * sure we wait for until keys are set before - * going into BMPS. - */ - ps_global_info->remain_in_power_active_till_dhcp - = true; + /* + * Set remain_in_power_active_till_dhcp to make + * sure we wait for until keys are set before + * going into BMPS. + */ + ps_global_info->remain_in_power_active_till_dhcp + = true; - if (profile->bWPSAssociation) - key_timeout_interval = - CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD; - else - key_timeout_interval = - CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD; + if (profile->bWPSAssociation) + key_timeout_interval = + CSR_WAIT_FOR_WPS_KEY_TIMEOUT_PERIOD; + else + key_timeout_interval = + CSR_WAIT_FOR_KEY_TIMEOUT_PERIOD; - /* Save session_id in case of timeout */ - mac_ctx->roam.WaitForKeyTimerInfo.sessionId = - (uint8_t) session_id; - /* - * This time should be long enough for the rest - * of the process plus setting key - */ - if (!QDF_IS_STATUS_SUCCESS + /* Save session_id in case of timeout */ + mac_ctx->roam.WaitForKeyTimerInfo.sessionId = + (uint8_t) session_id; + /* + * This time should be long enough for the rest + * of the process plus setting key + */ + if (!QDF_IS_STATUS_SUCCESS (csr_roam_start_wait_for_key_timer( - mac_ctx, key_timeout_interval)) - ) { - /* Reset state so nothing is blocked. */ - sms_log(mac_ctx, LOGE, FL + mac_ctx, key_timeout_interval)) + ) { + /* Reset state so nothing is blocked. */ + sms_log(mac_ctx, LOGE, FL ("Failed preauth timer start")); - csr_roam_substate_change(mac_ctx, + csr_roam_substate_change(mac_ctx, eCSR_ROAM_SUBSTATE_NONE, session_id); - } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD } -#endif } assoc_info.pBssDesc = bss_desc; /* could be NULL */ @@ -6699,29 +6683,6 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx, (csr_is_concurrent_session_running(mac_ctx))) { mac_ctx->roam.configParam.doBMPSWorkaround = 1; } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - if (session->roam_synch_in_progress) { - roam_info.roamSynchInProgress = 1; - roam_info.synchAuthStatus = - roam_offload_params->authStatus; - qdf_mem_copy(roam_info.kck, - roam_offload_params->kck, - SIR_KCK_KEY_LEN); - qdf_mem_copy(roam_info.kek, - roam_offload_params->kek, - SIR_KEK_KEY_LEN); - qdf_mem_copy(roam_info.replay_ctr, - roam_offload_params->replay_ctr, - SIR_REPLAY_CTR_LEN); - QDF_TRACE(QDF_MODULE_ID_SME, - QDF_TRACE_LEVEL_DEBUG, - FL - ("LFR3: Copy KCK, KEK and Replay Ctr")); - } - - roam_info.subnet_change_status = - CSR_GET_SUBNET_STATUS(roam_offload_params->roamReason); -#endif csr_roam_call_callback(mac_ctx, session_id, &roam_info, cmd->u.roamCmd.roamId, eCSR_ROAM_ASSOCIATION_COMPLETION, @@ -16181,6 +16142,74 @@ QDF_STATUS csr_get_statistics(tpAniSirGlobal pMac, return QDF_STATUS_SUCCESS; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD +QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, + uint32_t sessionId, + bool nRoamKeyMgmtOffloadEnabled) +{ + tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); + if (!pSession) { + sms_log(pMac, LOGE, FL("session %d not found"), sessionId); + return QDF_STATUS_E_FAILURE; + } + pSession->RoamKeyMgmtOffloadEnabled = nRoamKeyMgmtOffloadEnabled; + return QDF_STATUS_SUCCESS; +} + +/** + * csr_update_roam_scan_offload_request() - updates req msg with roam offload + * paramters + * @pMac: mac global context + * @req_buf: out param, roam offload scan request packet + * @session: roam session + * + * Return: void + */ +static void +csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, + tSirRoamOffloadScanReq *req_buf, + tCsrRoamSession *session) +{ + qdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, + sizeof(req_buf->PSK_PMK)); + req_buf->pmk_len = session->pmk_len; + QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, + "LFR3: PMK Length = %d", req_buf->pmk_len); + req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; + qdf_mem_copy(req_buf->R0KH_ID, + session->ftSmeContext.r0kh_id, + req_buf->R0KH_ID_Length); + req_buf->Prefer5GHz = mac_ctx->roam.configParam.nRoamPrefer5GHz; + req_buf->RoamRssiCatGap = mac_ctx->roam.configParam.bCatRssiOffset; + req_buf->Select5GHzMargin = mac_ctx->roam.configParam.nSelect5GHzMargin; + if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, + (uint32_t *) &req_buf->ReassocFailureTimeout) + != eSIR_SUCCESS) { + sms_log(mac_ctx, LOGE, + FL("could not retrieve ReassocFailureTimeout value")); + req_buf->ReassocFailureTimeout = + DEFAULT_REASSOC_FAILURE_TIMEOUT; + } +#ifdef FEATURE_WLAN_ESE + if (csr_is_auth_type_ese(req_buf->ConnectedNetwork.authentication)) { + qdf_mem_copy(req_buf->KRK, session->eseCckmInfo.krk, + SIR_KRK_KEY_LEN); + qdf_mem_copy(req_buf->BTK, session->eseCckmInfo.btk, + SIR_BTK_KEY_LEN); + } +#endif + req_buf->AcUapsd.acbe_uapsd = + SIR_UAPSD_GET(ACBE, mac_ctx->lim.gUapsdPerAcBitmask); + req_buf->AcUapsd.acbk_uapsd = + SIR_UAPSD_GET(ACBK, mac_ctx->lim.gUapsdPerAcBitmask); + req_buf->AcUapsd.acvi_uapsd = + SIR_UAPSD_GET(ACVI, mac_ctx->lim.gUapsdPerAcBitmask); + req_buf->AcUapsd.acvo_uapsd = + SIR_UAPSD_GET(ACVO, mac_ctx->lim.gUapsdPerAcBitmask); +} +#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ + +#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD) static tSirRetStatus csr_roam_scan_offload_populate_mac_header(tpAniSirGlobal pMac, uint8_t *pBD, @@ -16297,73 +16326,6 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac, return eSIR_SUCCESS; } -#ifdef WLAN_FEATURE_ROAM_OFFLOAD -QDF_STATUS csr_roam_set_key_mgmt_offload(tpAniSirGlobal pMac, - uint32_t sessionId, - bool nRoamKeyMgmtOffloadEnabled) -{ - tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId); - if (!pSession) { - sms_log(pMac, LOGE, FL("session %d not found"), sessionId); - return QDF_STATUS_E_FAILURE; - } - pSession->RoamKeyMgmtOffloadEnabled = nRoamKeyMgmtOffloadEnabled; - return QDF_STATUS_SUCCESS; -} - -/** - * csr_update_roam_scan_offload_request() - updates req msg with roam offload - * paramters - * @pMac: mac global context - * @req_buf: out param, roam offload scan request packet - * @session: roam session - * - * Return: void - */ -static void -csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx, - tSirRoamOffloadScanReq *req_buf, - tCsrRoamSession *session) -{ - qdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk, - sizeof(req_buf->PSK_PMK)); - req_buf->pmk_len = session->pmk_len; - QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, - "LFR3: PMK Length = %d", req_buf->pmk_len); - req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len; - qdf_mem_copy(req_buf->R0KH_ID, - session->ftSmeContext.r0kh_id, - req_buf->R0KH_ID_Length); - req_buf->Prefer5GHz = mac_ctx->roam.configParam.nRoamPrefer5GHz; - req_buf->RoamRssiCatGap = mac_ctx->roam.configParam.bCatRssiOffset; - req_buf->Select5GHzMargin = mac_ctx->roam.configParam.nSelect5GHzMargin; - if (wlan_cfg_get_int(mac_ctx, WNI_CFG_REASSOCIATION_FAILURE_TIMEOUT, - (uint32_t *) &req_buf->ReassocFailureTimeout) - != eSIR_SUCCESS) { - sms_log(mac_ctx, LOGE, - FL("could not retrieve ReassocFailureTimeout value")); - req_buf->ReassocFailureTimeout = - DEFAULT_REASSOC_FAILURE_TIMEOUT; - } -#ifdef FEATURE_WLAN_ESE - if (csr_is_auth_type_ese(req_buf->ConnectedNetwork.authentication)) { - qdf_mem_copy(req_buf->KRK, session->eseCckmInfo.krk, - SIR_KRK_KEY_LEN); - qdf_mem_copy(req_buf->BTK, session->eseCckmInfo.btk, - SIR_BTK_KEY_LEN); - } -#endif - req_buf->AcUapsd.acbe_uapsd = - SIR_UAPSD_GET(ACBE, mac_ctx->lim.gUapsdPerAcBitmask); - req_buf->AcUapsd.acbk_uapsd = - SIR_UAPSD_GET(ACBK, mac_ctx->lim.gUapsdPerAcBitmask); - req_buf->AcUapsd.acvi_uapsd = - SIR_UAPSD_GET(ACVI, mac_ctx->lim.gUapsdPerAcBitmask); - req_buf->AcUapsd.acvo_uapsd = - SIR_UAPSD_GET(ACVO, mac_ctx->lim.gUapsdPerAcBitmask); -} -#endif /* WLAN_FEATURE_ROAM_OFFLOAD */ - /** * csr_check_band_channel_match() - check if passed band and channel match * paramters @@ -17120,6 +17082,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac, } return QDF_STATUS_SUCCESS; } +#endif tCsrPeStatsReqInfo *csr_roam_check_pe_stats_req_list(tpAniSirGlobal pMac, uint32_t statsMask, @@ -18718,6 +18681,7 @@ void csr_roam_fill_tdls_info(tCsrRoamInfo *roam_info, tpSirSmeJoinRsp join_rsp) } #endif +#ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * csr_roam_synch_callback() - SME level callback for roam synch propagation * @mac_ctx: MAC Context @@ -18980,3 +18944,4 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx, qdf_mem_free(roam_info); sme_release_global_lock(&mac_ctx->sme); } +#endif diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 1e7ae4cdbc99..7bc3d3676fd7 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -997,12 +997,18 @@ QDF_STATUS csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessionId); -/* --------------------------------------------------------------------------- - \fn csr_roam_ft_pre_auth_rsp_processor - \brief csr function that handles pre auth response from LIM - ---------------------------------------------------------------------------*/ +#ifdef WLAN_FEATURE_HOST_ROAM void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, - tpSirFTPreAuthRsp pFTPreAuthRsp); + tpSirFTPreAuthRsp pFTPreAuthRsp); +void csr_release_command_preauth(tpAniSirGlobal mac_ctx, tSmeCmd *command); +#else +static inline void csr_roam_ft_pre_auth_rsp_processor(tHalHandle hHal, + tpSirFTPreAuthRsp pFTPreAuthRsp) +{} +static inline void csr_release_command_preauth(tpAniSirGlobal mac_ctx, + tSmeCmd *command) +{} +#endif #if defined(FEATURE_WLAN_ESE) void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1, @@ -1058,4 +1064,3 @@ bool is_disconnect_pending(tpAniSirGlobal mac_ctx, void csr_scan_active_list_timeout_handle(void *userData); QDF_STATUS csr_prepare_disconnect_command(tpAniSirGlobal mac, uint32_t session_id, tSmeCmd **sme_cmd); -void csr_release_command_preauth(tpAniSirGlobal mac_ctx, tSmeCmd *command); diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 469e788c76af..0a26228496d5 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1647,9 +1647,9 @@ QDF_STATUS csr_neighbor_roam_indicate_connect( { tpCsrNeighborRoamControlInfo ngbr_roam_info = &pMac->roam.neighborRoamInfo[session_id]; + tCsrRoamSession *session = &pMac->roam.roamSession[session_id]; #ifdef WLAN_FEATURE_ROAM_OFFLOAD tCsrRoamInfo roamInfo; - tCsrRoamSession *session = &pMac->roam.roamSession[session_id]; tpSirSetActiveModeSetBncFilterReq msg; #endif QDF_STATUS status = QDF_STATUS_SUCCESS; diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index 4f21445d87cd..bf5933a1a82f 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -1334,12 +1334,14 @@ typedef struct { * the serialized MC thread context with a timer. */ qdf_mc_timer_t service_ready_ext_timer; +#ifdef WLAN_FEATURE_ROAM_OFFLOAD void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason); QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr); +#endif qdf_wake_lock_t wmi_cmd_rsp_wake_lock; qdf_runtime_lock_t wmi_cmd_rsp_runtime_lock; qdf_runtime_lock_t wma_runtime_resume_lock; diff --git a/core/wma/inc/wma_internal.h b/core/wma/inc/wma_internal.h index d3c653a22037..6d2dd9acb7fc 100644 --- a/core/wma/inc/wma_internal.h +++ b/core/wma/inc/wma_internal.h @@ -395,10 +395,8 @@ wma_set_ssid_hotlist(tp_wma_handle wma, QDF_STATUS wma_ipa_offload_enable_disable(tp_wma_handle wma, struct sir_ipa_offload_enable_disable *ipa_offload); -#ifdef WLAN_FEATURE_ROAM_OFFLOAD void wma_process_unit_test_cmd(WMA_HANDLE handle, t_wma_unit_test_cmd * wma_utest); -#endif QDF_STATUS wma_scan_probe_setoui(tp_wma_handle wma, tSirScanMacOui *psetoui); diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 12b7ff62c8d6..56575030e534 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -698,11 +698,24 @@ QDF_STATUS wma_register_mgmt_frm_client(void *p_cds_gctx, QDF_STATUS wma_de_register_mgmt_frm_client(void *p_cds_gctx); QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +#ifdef WLAN_FEATURE_ROAM_OFFLOAD void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)); +#else +static inline CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, + void (*csr_roam_synch_cb)(tpAniSirGlobal mac, + roam_offload_synch_ind *roam_synch_data, + tpSirBssDescription bss_desc_ptr, uint8_t reason), + CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + roam_offload_synch_ind *roam_synch_data, + tpSirBssDescription bss_desc_ptr)) +{ + return CDF_STATUS_E_NOSUPPORT; +} +#endif #endif diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index c3bf626ab369..38dcfaf93b31 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -3062,6 +3062,7 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void *cds_ctx) return QDF_STATUS_SUCCESS; } +#ifdef WLAN_FEATURE_ROAM_OFFLOAD /** * wma_register_roaming_callbacks() - Register roaming callbacks * @cds_ctx: CDS Context @@ -3093,6 +3094,8 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, WMA_LOGD("Registered roam synch callbacks with WMA successfully"); return QDF_STATUS_SUCCESS; } +#endif + /** * wma_register_mgmt_frm_client() - register management frame callback * @cds_ctx: cds context diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c index 2196320a51a1..6f776835d919 100644 --- a/core/wma/src/wma_scan_roam.c +++ b/core/wma/src/wma_scan_roam.c @@ -2102,51 +2102,6 @@ cleanup_label: return 0; } -/** - * wma_rssi_breached_event_handler() - rssi breached event handler - * @handle: wma handle - * @cmd_param_info: event handler data - * @len: length of @cmd_param_info - * - * Return: 0 on success; error number otherwise - */ -int wma_rssi_breached_event_handler(void *handle, - u_int8_t *cmd_param_info, u_int32_t len) -{ - WMI_RSSI_BREACH_EVENTID_param_tlvs *param_buf; - wmi_rssi_breach_event_fixed_param *event; - struct rssi_breach_event rssi; - tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); - - if (!mac) { - WMA_LOGE("%s: Invalid mac context", __func__); - return -EINVAL; - } - if (!mac->sme.rssi_threshold_breached_cb) { - WMA_LOGE("%s: Callback not registered", __func__); - return -EINVAL; - } - param_buf = (WMI_RSSI_BREACH_EVENTID_param_tlvs *)cmd_param_info; - if (!param_buf) { - WMA_LOGE("%s: Invalid rssi breached event", __func__); - return -EINVAL; - } - event = param_buf->fixed_param; - - rssi.request_id = event->request_id; - rssi.session_id = event->vdev_id; - rssi.curr_rssi = event->rssi + WMA_TGT_NOISE_FLOOR_DBM; - WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->bssid, rssi.curr_bssid.bytes); - - WMA_LOGD("%s: req_id: %u vdev_id: %d curr_rssi: %d", __func__, - rssi.request_id, rssi.session_id, rssi.curr_rssi); - WMA_LOGI("%s: curr_bssid: %pM", __func__, rssi.curr_bssid.bytes); - - mac->sme.rssi_threshold_breached_cb(mac->hHdd, &rssi); - WMA_LOGD("%s: Invoke HDD rssi breached callback", __func__); - return 0; -} - /** * wma_roam_scan_fill_self_caps() - fill capabilities * @wma_handle: wma handle @@ -2351,6 +2306,51 @@ void wma_set_ric_req(tp_wma_handle wma, void *msg, uint8_t is_add_ts) } #endif /* WLAN_FEATURE_ROAM_OFFLOAD */ +/** + * wma_rssi_breached_event_handler() - rssi breached event handler + * @handle: wma handle + * @cmd_param_info: event handler data + * @len: length of @cmd_param_info + * + * Return: 0 on success; error number otherwise + */ +int wma_rssi_breached_event_handler(void *handle, + u_int8_t *cmd_param_info, u_int32_t len) +{ + WMI_RSSI_BREACH_EVENTID_param_tlvs *param_buf; + wmi_rssi_breach_event_fixed_param *event; + struct rssi_breach_event rssi; + tpAniSirGlobal mac = cds_get_context(QDF_MODULE_ID_PE); + + if (!mac) { + WMA_LOGE("%s: Invalid mac context", __func__); + return -EINVAL; + } + if (!mac->sme.rssi_threshold_breached_cb) { + WMA_LOGE("%s: Callback not registered", __func__); + return -EINVAL; + } + param_buf = (WMI_RSSI_BREACH_EVENTID_param_tlvs *)cmd_param_info; + if (!param_buf) { + WMA_LOGE("%s: Invalid rssi breached event", __func__); + return -EINVAL; + } + event = param_buf->fixed_param; + + rssi.request_id = event->request_id; + rssi.session_id = event->vdev_id; + rssi.curr_rssi = event->rssi + WMA_TGT_NOISE_FLOOR_DBM; + WMI_MAC_ADDR_TO_CHAR_ARRAY(&event->bssid, rssi.curr_bssid.bytes); + + WMA_LOGD("%s: req_id: %u vdev_id: %d curr_rssi: %d", __func__, + rssi.request_id, rssi.session_id, rssi.curr_rssi); + WMA_LOGI("%s: curr_bssid: %pM", __func__, rssi.curr_bssid.bytes); + + mac->sme.rssi_threshold_breached_cb(mac->hHdd, &rssi); + WMA_LOGD("%s: Invoke HDD rssi breached callback", __func__); + return 0; +} + /** * wma_process_unit_test_cmd() - send unit test command to fw. * @handle: wma handle -- cgit v1.2.3 From d351a6c58e58459a6e506e104632af1de4b51cf5 Mon Sep 17 00:00:00 2001 From: Varun Reddy Yeturu Date: Wed, 16 Mar 2016 14:01:00 -0700 Subject: qcacld-3.0: Change name of routine is_roaming_offload_enabled Modify the routine name of is_roaming_offload_enabled to roaming_offload_enabled CRs-Fixed: 978905 Change-Id: I1bfa1ebe1f7dd9dc88c68a0c660fa1886cf0e0fe --- core/hdd/inc/wlan_hdd_main.h | 4 ++-- core/hdd/src/wlan_hdd_cfg80211.c | 4 ++-- core/hdd/src/wlan_hdd_ioctl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 0e3224aed16b..ffa86e6c1376 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1647,12 +1647,12 @@ static inline void hdd_set_tso_flags(hdd_context_t *hdd_ctx, #endif /* FEATURE_TSO */ #ifdef WLAN_FEATURE_ROAM_OFFLOAD -static inline bool is_roaming_offload_enabled(hdd_context_t *hdd_ctx) +static inline bool roaming_offload_enabled(hdd_context_t *hdd_ctx) { return hdd_ctx->config->isRoamOffloadEnabled; } #else -static inline bool is_roaming_offload_enabled(hdd_context_t *hdd_ctx) +static inline bool roaming_offload_enabled(hdd_context_t *hdd_ctx) { return false; } diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index cdf0e41d7fde..2a2c9940a53a 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -2184,7 +2184,7 @@ __wlan_hdd_cfg80211_get_features(struct wiphy *wiphy, return -EPERM; } - if (is_roaming_offload_enabled(hdd_ctx_ptr)) { + if (roaming_offload_enabled(hdd_ctx_ptr)) { hddLog(LOG1, FL("Key Mgmt Offload is supported")); wlan_hdd_cfg80211_set_feature(feature_flags, QCA_WLAN_VENDOR_FEATURE_KEY_MGMT_OFFLOAD); @@ -3128,7 +3128,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid, return -EINVAL; } - if (!is_roaming_offload_enabled(hdd_ctx_ptr) || + if (!roaming_offload_enabled(hdd_ctx_ptr) || !roam_info_ptr->roamSynchInProgress) return 0; diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c index 9723486740e3..d98a6cf6adf9 100644 --- a/core/hdd/src/wlan_hdd_ioctl.c +++ b/core/hdd/src/wlan_hdd_ioctl.c @@ -4717,7 +4717,7 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter, hddLog(LOGE, FL("Invalid Channel [%d]"), channel); return -EINVAL; } - if (is_roaming_offload_enabled(hdd_ctx)) { + if (roaming_offload_enabled(hdd_ctx)) { hdd_wma_send_fastreassoc_cmd((int)adapter->sessionId, targetApBssid, (int)channel); goto exit; -- cgit v1.2.3 From 80897d86c9746981a9a61f5754cfc15cec0f39a3 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Wed, 2 Mar 2016 19:41:42 -0800 Subject: qcacld-3.0: Use pcl channel list for sap channel selection Use the pcl channel list to do random channel selection when the radar is detected. Change-Id: I286bf447a398bf1d9a7a1493ac4bbfd9847de148 CRs-Fixed: 988325 --- core/cds/inc/cds_concurrency.h | 2 ++ core/cds/src/cds_concurrency.c | 34 ++++++++++++++++++++++++++++++++++ core/sap/src/sap_fsm.c | 34 ++++++++++++++++++++++------------ 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index 619a7a60825f..71d61ed720fb 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -691,4 +691,6 @@ QDF_STATUS cds_handle_hw_mode_change_on_csa(uint16_t session_id, QDF_STATUS cds_register_sap_restart_channel_switch_cb( void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t)); #endif +QDF_STATUS cds_get_pcl_for_existing_conn(enum cds_con_mode mode, + uint8_t *pcl_ch, uint32_t *len); #endif /* __CDS_CONCURRENCY_H */ diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 1ad7c27733b6..50e2238a0717 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -3680,6 +3680,40 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) } } +/** + * cds_get_pcl_for_existing_conn() - Get PCL for existing connection + * @mode: Connection mode of type 'cds_con_mode' + * + * Get the PCL for an existing connection + * + * Return: None + */ +QDF_STATUS cds_get_pcl_for_existing_conn(enum cds_con_mode mode, + uint8_t *pcl_ch, uint32_t *len) +{ + struct cds_conc_connection_info info; + + cds_context_type *cds_ctx; + QDF_STATUS status = QDF_STATUS_SUCCESS; + cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); + if (!cds_ctx) { + cds_err("Invalid CDS Context"); + return QDF_STATUS_E_INVAL; + } + qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock); + if (cds_mode_specific_connection_count(mode, NULL) > 0) { + /* Check, store and temp delete the mode's parameter */ + cds_store_and_del_conn_info(mode, &info); + /* Set the PCL to the FW since connection got updated */ + status = cds_get_pcl(mode, pcl_ch, len); + cds_info("Get PCL to FW for mode:%d", mode); + /* Restore the connection info */ + cds_restore_deleted_conn_info(&info); + } + qdf_mutex_release(&cds_ctx->qdf_conc_list_lock); + return status; +} + /** * cds_decr_session_set_pcl() - Decrement session count and set PCL * @mode: Adapter mode diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c index 77428fc2600b..815415e67101 100644 --- a/core/sap/src/sap_fsm.c +++ b/core/sap/src/sap_fsm.c @@ -738,7 +738,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sapContext, #endif /*========================================================================== - FUNCTION sapGet5GHzChannelList + FUNCTION sap_get_5ghz_channel_list DESCRIPTION Function for initializing list of 2.4/5 Ghz [NON-DFS/DFS] available @@ -757,7 +757,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sapContext, SIDE EFFECTS ============================================================================*/ -static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext); +static QDF_STATUS sap_get_5ghz_channel_list(ptSapContext sapContext); /*========================================================================== FUNCTION sapStopDfsCacTimer @@ -1278,7 +1278,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext) ch_width = pMac->sap.SapDfsInfo.orig_chanWidth; } - if (sap_get5_g_hz_channel_list(sapContext)) { + if (sap_get_5ghz_channel_list(sapContext)) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, FL("Getting 5Ghz channel list failed")); return target_channel; @@ -4439,10 +4439,14 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx, * Function for initializing list of 2.4/5 Ghz [NON-DFS/DFS] * available channels in the current regulatory domain. */ -static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) +static QDF_STATUS sap_get_5ghz_channel_list(ptSapContext sapContext) { uint8_t count = 0; int i; + struct sir_pcl_list pcl; + QDF_STATUS status; + enum channel_state ch_state; + pcl.pcl_len = 0; if (NULL == sapContext) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, "Invalid sapContext pointer on sap_get_channel_list"); @@ -4463,15 +4467,23 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext) return QDF_STATUS_E_NOMEM; } - for (i = CHAN_ENUM_36; i <= CHAN_ENUM_165; i++) { - if (CDS_CHANNEL_STATE(i) == CHANNEL_STATE_ENABLE || - CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) { + status = cds_get_pcl_for_existing_conn(CDS_SAP_MODE, + pcl.pcl_list, &pcl.pcl_len); + if (status != QDF_STATUS_SUCCESS) { + cds_err("Get PCL failed"); + return status; + } + for (i = 0; i <= pcl.pcl_len; i++) { + if (CDS_IS_CHANNEL_5GHZ(pcl.pcl_list[i])) { + ch_state = cds_get_channel_state(pcl.pcl_list[i]); + if (!(ch_state == CHANNEL_STATE_ENABLE || + ch_state == CHANNEL_STATE_DFS)) + continue; sapContext->SapAllChnlList.channelList[count].channel = - CDS_CHANNEL_NUM(i); + pcl.pcl_list[i]; QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW, "%s[%d] CHANNEL = %d", __func__, __LINE__, - sapContext->SapAllChnlList.channelList[count]. - channel); + pcl.pcl_list[i]); sapContext->SapAllChnlList.channelList[count].valid = true; count++; @@ -4533,8 +4545,6 @@ uint8_t sap_indicate_radar(ptSapContext sapContext, /* set the Radar Found flag in SapDfsInfo */ pMac->sap.SapDfsInfo.sap_radar_found_status = true; - sap_get5_g_hz_channel_list(sapContext); - if (dfs_event->chan_list.nchannels > SIR_DFS_MAX_20M_SUB_CH) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN, FL("nchannels >SIR_DFS_MAX_20M_SUB_CH so resetting")); -- cgit v1.2.3 From 830ba166630df9eb840a7579f917e5a8aa780c03 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Fri, 11 Mar 2016 17:28:28 -0800 Subject: qcacld-3.0: Enable UAPSD only when device is in power save Send UAPSD parameters to FW and enable it only if the device is in power save mode. Change-Id: I14ecfc8bace7ec15eebe18296355544cdbdf030e CRs-Fixed: 991119 --- core/sme/src/common/sme_power_save.c | 141 +++++++++++++++++++++++++---------- core/wma/inc/wma_types.h | 7 +- core/wma/src/wma_power.c | 22 +++--- 3 files changed, 118 insertions(+), 52 deletions(-) diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c index 784270996a6f..3e7546b7ff82 100644 --- a/core/sme/src/common/sme_power_save.c +++ b/core/sme/src/common/sme_power_save.c @@ -62,6 +62,78 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body) return QDF_STATUS_SUCCESS; } +/** + * sme_ps_enable_uapsd_req_params(): enables UASPD req params + * @mac_ctx: global mac context + * @session_id: session id + * + * Return: QDF_STATUS + */ +static void sme_ps_fill_uapsd_req_params(tpAniSirGlobal mac_ctx, + tUapsd_Params *uapsdParams, uint32_t session_id, + enum ps_state *ps_state) +{ + + uint8_t uapsd_delivery_mask = 0; + uint8_t uapsd_trigger_mask = 0; + struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; + struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; + + uapsd_delivery_mask = + ps_param->uapsd_per_ac_bit_mask | + ps_param->uapsd_per_ac_delivery_enable_mask; + + uapsd_trigger_mask = + ps_param->uapsd_per_ac_bit_mask | + ps_param->uapsd_per_ac_trigger_enable_mask; + + uapsdParams->bkDeliveryEnabled = + LIM_UAPSD_GET(ACBK, uapsd_delivery_mask); + + uapsdParams->beDeliveryEnabled = + LIM_UAPSD_GET(ACBE, uapsd_delivery_mask); + + uapsdParams->viDeliveryEnabled = + LIM_UAPSD_GET(ACVI, uapsd_delivery_mask); + + uapsdParams->voDeliveryEnabled = + LIM_UAPSD_GET(ACVO, uapsd_delivery_mask); + + uapsdParams->bkTriggerEnabled = + LIM_UAPSD_GET(ACBK, uapsd_trigger_mask); + + uapsdParams->beTriggerEnabled = + LIM_UAPSD_GET(ACBE, uapsd_trigger_mask); + + uapsdParams->viTriggerEnabled = + LIM_UAPSD_GET(ACVI, uapsd_trigger_mask); + + uapsdParams->voTriggerEnabled = + LIM_UAPSD_GET(ACVO, uapsd_trigger_mask); + if (ps_param->ps_state != FULL_POWER_MODE) { + uapsdParams->enable_ps = true; + *ps_state = UAPSD_MODE; + } else { + uapsdParams->enable_ps = false; + *ps_state = FULL_POWER_MODE; + } +} + +static void sme_set_ps_state(tpAniSirGlobal mac_ctx, + uint32_t session_id, enum ps_state ps_state) +{ + struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; + struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; + ps_param->ps_state = ps_state; +} + +static void sme_get_ps_state(tpAniSirGlobal mac_ctx, + uint32_t session_id, enum ps_state *ps_state) +{ + struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; + struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; + *ps_state = ps_param->ps_state; +} /** * sme_ps_enable_ps_req_params(): enables power save req params * @mac_ctx: global mac context @@ -74,6 +146,9 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, { struct sEnablePsParams *enable_ps_req_params; QDF_STATUS status = QDF_STATUS_SUCCESS; + struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; + struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; + enum ps_state ps_state; enable_ps_req_params = qdf_mem_malloc(sizeof(*enable_ps_req_params)); if (NULL == enable_ps_req_params) { @@ -81,7 +156,17 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, FL("Memory allocation failed for enable_ps_req_params")); return QDF_STATUS_E_NOMEM; } - enable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; + if (ps_param->uapsd_per_ac_bit_mask) { + enable_ps_req_params->psSetting = eSIR_ADDON_ENABLE_UAPSD; + sme_ps_fill_uapsd_req_params(mac_ctx, + &enable_ps_req_params->uapsdParams, + session_id, &ps_state); + ps_state = UAPSD_MODE; + enable_ps_req_params->uapsdParams.enable_ps = true; + } else { + enable_ps_req_params->psSetting = eSIR_ADDON_NOTHING; + ps_state = LEGACY_POWER_SAVE_MODE; + } enable_ps_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params); @@ -89,6 +174,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_FAILURE; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA")); + ps_param->ps_state = ps_state; return QDF_STATUS_SUCCESS; } @@ -120,6 +206,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_FAILURE; QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA")); + sme_set_ps_state(mac_ctx, session_id, FULL_POWER_MODE); return QDF_STATUS_SUCCESS; } @@ -135,11 +222,8 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, { struct sEnableUapsdParams *enable_uapsd_req_params; - uint8_t uapsd_delivery_mask = 0; - uint8_t uapsd_trigger_mask = 0; - struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info; - struct ps_params *ps_param = &ps_global_info->ps_params[session_id]; QDF_STATUS status = QDF_STATUS_SUCCESS; + enum ps_state ps_state; enable_uapsd_req_params = qdf_mem_malloc(sizeof(*enable_uapsd_req_params)); @@ -149,40 +233,9 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, return QDF_STATUS_E_NOMEM; } - - uapsd_delivery_mask = - ps_param->uapsd_per_ac_bit_mask | - ps_param->uapsd_per_ac_delivery_enable_mask; - - uapsd_trigger_mask = - ps_param->uapsd_per_ac_bit_mask | - ps_param->uapsd_per_ac_trigger_enable_mask; - - - enable_uapsd_req_params->uapsdParams.bkDeliveryEnabled = - LIM_UAPSD_GET(ACBK, uapsd_delivery_mask); - - enable_uapsd_req_params->uapsdParams.beDeliveryEnabled = - LIM_UAPSD_GET(ACBE, uapsd_delivery_mask); - - enable_uapsd_req_params->uapsdParams.viDeliveryEnabled = - LIM_UAPSD_GET(ACVI, uapsd_delivery_mask); - - enable_uapsd_req_params->uapsdParams.voDeliveryEnabled = - LIM_UAPSD_GET(ACVO, uapsd_delivery_mask); - - enable_uapsd_req_params->uapsdParams.bkTriggerEnabled = - LIM_UAPSD_GET(ACBK, uapsd_trigger_mask); - - enable_uapsd_req_params->uapsdParams.beTriggerEnabled = - LIM_UAPSD_GET(ACBE, uapsd_trigger_mask); - - enable_uapsd_req_params->uapsdParams.viTriggerEnabled = - LIM_UAPSD_GET(ACVI, uapsd_trigger_mask); - - enable_uapsd_req_params->uapsdParams.voTriggerEnabled = - LIM_UAPSD_GET(ACVO, uapsd_trigger_mask); - + sme_ps_fill_uapsd_req_params(mac_ctx, + &enable_uapsd_req_params->uapsdParams, + session_id, &ps_state); enable_uapsd_req_params->sessionid = session_id; status = sme_post_ps_msg_to_wma(WMA_ENABLE_UAPSD_REQ, @@ -192,6 +245,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA")); + sme_set_ps_state(mac_ctx, session_id, ps_state); return QDF_STATUS_SUCCESS; } @@ -207,12 +261,18 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, { struct sDisableUapsdParams *disable_uapsd_req_params; QDF_STATUS status = QDF_STATUS_SUCCESS; + enum ps_state ps_state; + sme_get_ps_state(mac_ctx, session_id, &ps_state); + if (ps_state != UAPSD_MODE) { + sms_log(mac_ctx, LOGE, FL("UAPSD is already disabled")); + return QDF_STATUS_SUCCESS; + } disable_uapsd_req_params = qdf_mem_malloc(sizeof(*disable_uapsd_req_params)); if (NULL == disable_uapsd_req_params) { sms_log(mac_ctx, LOGE, - FL("Memory allocation failed for disable_uapsd_req_params")); + FL("Mem alloc failed for disable_uapsd_req_params")); return QDF_STATUS_E_NOMEM; } @@ -224,6 +284,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx, QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA")); + sme_set_ps_state(mac_ctx, session_id, LEGACY_POWER_SAVE_MODE); return QDF_STATUS_SUCCESS; } diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 56575030e534..d58167928c1d 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -526,6 +526,7 @@ typedef struct sUapsd_Params { uint8_t beTriggerEnabled:1; uint8_t viTriggerEnabled:1; uint8_t voTriggerEnabled:1; + bool enable_ps; } tUapsd_Params, *tpUapsd_Params; /** @@ -706,15 +707,15 @@ QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)); #else -static inline CDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, +static inline QDF_STATUS wma_register_roaming_callbacks(void *cds_ctx, void (*csr_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr, uint8_t reason), - CDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, + QDF_STATUS (*pe_roam_synch_cb)(tpAniSirGlobal mac, roam_offload_synch_ind *roam_synch_data, tpSirBssDescription bss_desc_ptr)) { - return CDF_STATUS_E_NOSUPPORT; + return QDF_STATUS_E_NOSUPPORT; } #endif diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c index e383e3906d8f..05bed06f0ea9 100644 --- a/core/wma/src/wma_power.c +++ b/core/wma/src/wma_power.c @@ -552,7 +552,8 @@ static inline uint32_t wma_get_uapsd_mask(tpUapsd_Params uapsd_params) static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma, uint32_t vdev_id, uint8_t enable, - enum powersave_qpower_mode qpower_config) + enum powersave_qpower_mode qpower_config, + bool enable_ps) { QDF_STATUS ret; uint32_t cfg_data_val = 0; @@ -680,11 +681,14 @@ static QDF_STATUS wma_set_force_sleep(tp_wma_handle wma, vdev_id, inactivity_time); /* Enable Sta Mode Power save */ - ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, true); + if (enable_ps) { + ret = wmi_unified_set_sta_ps(wma->wmi_handle, vdev_id, true); - if (QDF_IS_STATUS_ERROR(ret)) { - WMA_LOGE("Enable Sta Mode Ps Failed vdevId %d", vdev_id); - return ret; + if (QDF_IS_STATUS_ERROR(ret)) { + WMA_LOGE("Enable Sta Mode Ps Failed vdevId %d", + vdev_id); + return ret; + } } /* Set Listen Interval */ @@ -886,7 +890,7 @@ void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) } ret = wma_set_force_sleep(wma, vdev_id, false, - qpower_config); + qpower_config, true); if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Sta Ps Failed vdevId %d", vdev_id); return; @@ -916,7 +920,7 @@ void wma_enable_sta_ps_mode(tp_wma_handle wma, tpEnablePsParams ps_req) WMA_LOGD("Enable Forced Sleep vdevId %d", vdev_id); ret = wma_set_force_sleep(wma, vdev_id, true, - qpower_config); + qpower_config, true); if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", @@ -996,7 +1000,7 @@ void wma_enable_uapsd_mode(tp_wma_handle wma, tpEnableUapsdParams ps_req) WMA_LOGD("Enable Forced Sleep vdevId %d", vdev_id); ret = wma_set_force_sleep(wma, vdev_id, true, - qpower_config); + qpower_config, ps_req->uapsdParams.enable_ps); if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Enable Forced Sleep Failed vdevId %d", vdev_id); return; @@ -1036,7 +1040,7 @@ void wma_disable_uapsd_mode(tp_wma_handle wma, /* Re enable Sta Mode Powersave with proper configuration */ ret = wma_set_force_sleep(wma, vdev_id, false, - qpower_config); + qpower_config, true); if (QDF_IS_STATUS_ERROR(ret)) { WMA_LOGE("Disable Forced Sleep Failed vdevId %d", vdev_id); return; -- cgit v1.2.3 From 20ee4d635eee14b27cd2047e86355c919a7156d2 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Mon, 7 Mar 2016 16:10:25 +0530 Subject: qcacld-3.0: Re-indent rrm_process_beacon_report_xmit Fix to reindent rrm_process_beacon_report_xmit Change-Id: I1fb528755f6b204086d544ff3ab957abdcb7d642 CRs-Fixed: 978014 --- core/mac/src/pe/rrm/rrm_api.c | 321 ++++++++++++++++-------------------------- 1 file changed, 124 insertions(+), 197 deletions(-) diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index dab718ea963e..1c6f161b4eb7 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -780,235 +780,162 @@ rrm_fill_beacon_ies(tpAniSirGlobal pMac, lim_log(pMac, LOG1, "Total length of Ies added = %d", *pNumIes); } -/* -------------------------------------------------------------------- */ /** - * rrm_process_beacon_report_xmit - * - * FUNCTION: - * - * LOGIC: Create a Radio measurement report action frame and send it to peer. - * - * ASSUMPTIONS: + * rrm_process_beacon_report_xmit() - create a rrm action frame + * @mac_ctx: Global pointer to MAC context + * @beacon_xmit_ind: Data for beacon report IE from SME. * - * NOTE: + * Create a Radio measurement report action frame and send it to peer. * - * @param pBcnReport Data for beacon report IE from SME. - * @return None + * Return: tSirRetStatus */ tSirRetStatus -rrm_process_beacon_report_xmit(tpAniSirGlobal pMac, - tpSirBeaconReportXmitInd pBcnReport) +rrm_process_beacon_report_xmit(tpAniSirGlobal mac_ctx, + tpSirBeaconReportXmitInd beacon_xmit_ind) { tSirRetStatus status = eSIR_SUCCESS; - tSirMacRadioMeasureReport *pReport = NULL; - tpRRMReq pCurrentReq = pMac->rrm.rrmPEContext.pCurrentReq; - tpPESession pSessionEntry; - uint8_t sessionId; - uint8_t flagBSSPresent = false, bssDescCnt = 0; - - lim_log(pMac, LOG1, "Received beacon report xmit indication"); - - if (NULL == pBcnReport) { - PELOGE(lim_log(pMac, LOGE, "Received pBcnReport is NULL in PE");) + tSirMacRadioMeasureReport *report = NULL; + tSirMacBeaconReport beacon_report; + tpSirBssDescription bss_desc; + tpRRMReq curr_req = mac_ctx->rrm.rrmPEContext.pCurrentReq; + tpPESession session_entry; + uint8_t session_id; + bool flag_bss_present = false, bss_desc_count = 0; + + lim_log(mac_ctx, LOG1, FL("Received beacon report xmit indication")); + + if (NULL == beacon_xmit_ind) { + lim_log(mac_ctx, LOGE, + FL("Received beacon_xmit_ind is NULL in PE")); return eSIR_FAILURE; } - if (NULL == pCurrentReq) { - PELOGE(lim_log(pMac, LOGE, - "Received report xmit while there is no request pending in PE"); - ) + if (NULL == curr_req) { + lim_log(mac_ctx, LOGE, + FL("Received report xmit while there is no request pending in PE")); return eSIR_FAILURE; } - if ((pBcnReport->numBssDesc) || - (!pBcnReport->numBssDesc && pCurrentReq->sendEmptyBcnRpt)) { - pBcnReport->numBssDesc = - (pBcnReport->numBssDesc == - RRM_BCN_RPT_NO_BSS_INFO) ? RRM_BCN_RPT_MIN_RPT : - pBcnReport->numBssDesc; + if ((beacon_xmit_ind->numBssDesc) || curr_req->sendEmptyBcnRpt) { + beacon_xmit_ind->numBssDesc = (beacon_xmit_ind->numBssDesc == + RRM_BCN_RPT_NO_BSS_INFO) ? RRM_BCN_RPT_MIN_RPT : + beacon_xmit_ind->numBssDesc; - pSessionEntry = pe_find_session_by_bssid(pMac, - pBcnReport->bssId, - &sessionId); - if (NULL == pSessionEntry) { - PELOGE(lim_log - (pMac, LOGE, - FL("session does not exist for given bssId")); - ) + session_entry = pe_find_session_by_bssid(mac_ctx, + beacon_xmit_ind->bssId, &session_id); + if (NULL == session_entry) { + lim_log(mac_ctx, LOGE, FL("session does not exist for given bssId")); return eSIR_FAILURE; } - pReport = qdf_mem_malloc(pBcnReport->numBssDesc * - sizeof(tSirMacRadioMeasureReport)); + report = qdf_mem_malloc(beacon_xmit_ind->numBssDesc * + sizeof(*report)); - if (NULL == pReport) { - PELOGE(lim_log - (pMac, LOGE, - FL("RRM Report is NULL, allocation failed")); - ) + if (NULL == report) { + lim_log(mac_ctx, LOGE, FL("RRM Report is NULL, allocation failed")); return eSIR_MEM_ALLOC_FAILED; } - qdf_mem_zero(pReport, - pBcnReport->numBssDesc * - sizeof(tSirMacRadioMeasureReport)); - - for (bssDescCnt = 0; bssDescCnt < pBcnReport->numBssDesc; - bssDescCnt++) { - /* Prepare the beacon report and send it to the peer. */ - pReport[bssDescCnt].token = pBcnReport->uDialogToken; - pReport[bssDescCnt].refused = 0; - pReport[bssDescCnt].incapable = 0; - pReport[bssDescCnt].type = SIR_MAC_RRM_BEACON_TYPE; - - /* If the scan result is NULL then send report request with */ - /* option subelement as NULL.. */ - if (NULL != pBcnReport->pBssDescription[bssDescCnt]) { - flagBSSPresent = true; + qdf_mem_zero(report, beacon_xmit_ind->numBssDesc * + sizeof(*report)); + + for (bss_desc_count = 0; bss_desc_count < + beacon_xmit_ind->numBssDesc; bss_desc_count++) { + beacon_report = + report[bss_desc_count].report.beaconReport; + bss_desc = beacon_xmit_ind-> + pBssDescription[bss_desc_count]; + /* Prepare the beacon report and send it to the peer.*/ + report[bss_desc_count].token = + beacon_xmit_ind->uDialogToken; + report[bss_desc_count].refused = 0; + report[bss_desc_count].incapable = 0; + report[bss_desc_count].type = SIR_MAC_RRM_BEACON_TYPE; + /* + * If the scan result is NULL then send report request + * with option subelement as NULL. + */ + if (NULL != bss_desc) + flag_bss_present = true; + /* + * Valid response is included if the size of + * becon xmit is == size of beacon xmit ind + ies + */ + if (beacon_xmit_ind->length < sizeof(*beacon_xmit_ind)) + continue; + beacon_report.regClass = beacon_xmit_ind->regClass; + if (flag_bss_present) { + beacon_report.channel = bss_desc->channelId; + qdf_mem_copy(beacon_report.measStartTime, + bss_desc->startTSF, + sizeof(bss_desc->startTSF)); + beacon_report.measDuration = + SYS_MS_TO_TU(beacon_xmit_ind->duration); + beacon_report.phyType = bss_desc->nwType; + beacon_report.bcnProbeRsp = 1; + beacon_report.rsni = bss_desc->sinr; + beacon_report.rcpi = bss_desc->rssi; + beacon_report.antennaId = 0; + beacon_report.parentTSF = bss_desc->parentTSF; + qdf_mem_copy(beacon_report.bssid, + bss_desc->bssId, sizeof(tSirMacAddr)); } - /* Valid response is included if the size of beacon xmit */ - /* is == size of beacon xmit ind + ies */ - if (pBcnReport->length >= - sizeof(tSirBeaconReportXmitInd)) { - pReport[bssDescCnt].report.beaconReport. - regClass = pBcnReport->regClass; - if (flagBSSPresent) { - pReport[bssDescCnt].report.beaconReport. - channel = - pBcnReport-> - pBssDescription[bssDescCnt]-> - channelId; - qdf_mem_copy(pReport[bssDescCnt].report. - beaconReport.measStartTime, - pBcnReport-> - pBssDescription - [bssDescCnt]->startTSF, - sizeof(pBcnReport-> - pBssDescription - [bssDescCnt]-> - startTSF)); - pReport[bssDescCnt].report.beaconReport. - measDuration = - SYS_MS_TO_TU(pBcnReport->duration); - pReport[bssDescCnt].report.beaconReport. - phyType = - pBcnReport-> - pBssDescription[bssDescCnt]->nwType; - pReport[bssDescCnt].report.beaconReport. - bcnProbeRsp = 1; - pReport[bssDescCnt].report.beaconReport. - rsni = - pBcnReport-> - pBssDescription[bssDescCnt]->sinr; - pReport[bssDescCnt].report.beaconReport. - rcpi = - pBcnReport-> - pBssDescription[bssDescCnt]->rssi; - - pReport[bssDescCnt].report.beaconReport. - antennaId = 0; - pReport[bssDescCnt].report.beaconReport. - parentTSF = - pBcnReport-> - pBssDescription[bssDescCnt]-> - parentTSF; - qdf_mem_copy(pReport[bssDescCnt].report. - beaconReport.bssid, - pBcnReport-> - pBssDescription - [bssDescCnt]->bssId, - sizeof(tSirMacAddr)); - } - - switch (pCurrentReq->request.Beacon. - reportingDetail) { - case BEACON_REPORTING_DETAIL_NO_FF_IE: - /* 0 No need to include any elements. */ - lim_log(pMac, LOG3, - "No reporting detail requested"); - break; - case BEACON_REPORTING_DETAIL_ALL_FF_REQ_IE: - /* 1: Include all FFs and Requested Ies. */ - lim_log(pMac, LOG3, - "Only requested IEs in reporting detail requested"); - - if (flagBSSPresent) { - rrm_fill_beacon_ies(pMac, - (uint8_t *) & - pReport - [bssDescCnt]. - report. - beaconReport. - Ies[0], - (uint8_t *) & - pReport - [bssDescCnt]. - report. - beaconReport. - numIes, - BEACON_REPORT_MAX_IES, - pCurrentReq-> - request.Beacon. - reqIes. - pElementIds, - pCurrentReq-> - request.Beacon. - reqIes.num, - pBcnReport-> - pBssDescription - [bssDescCnt]); - } - break; - case BEACON_REPORTING_DETAIL_ALL_FF_IE: - /* 2 / default - Include all FFs and all Ies. */ - default: - lim_log(pMac, LOG3, - "Default all IEs and FFs"); - if (flagBSSPresent) { - rrm_fill_beacon_ies(pMac, - (uint8_t *) & - pReport - [bssDescCnt]. - report. - beaconReport. - Ies[0], - (uint8_t *) & - pReport - [bssDescCnt]. - report. - beaconReport. - numIes, - BEACON_REPORT_MAX_IES, - NULL, 0, - pBcnReport-> - pBssDescription - [bssDescCnt]); - } - break; + switch (curr_req->request.Beacon.reportingDetail) { + case BEACON_REPORTING_DETAIL_NO_FF_IE: + /* 0: No need to include any elements. */ + lim_log(mac_ctx, LOG3, + FL("No reporting detail requested")); + break; + case BEACON_REPORTING_DETAIL_ALL_FF_REQ_IE: + /* 1: Include all FFs and Requested Ies. */ + lim_log(mac_ctx, LOG3, + FL("Only requested IEs in reporting detail requested")); + + if (flag_bss_present) { + rrm_fill_beacon_ies(mac_ctx, + (uint8_t *) &beacon_report.Ies[0], + (uint8_t *) &beacon_report.numIes, + BEACON_REPORT_MAX_IES, + curr_req->request.Beacon.reqIes. + pElementIds, + curr_req->request.Beacon.reqIes.num, + bss_desc); + } + break; + case BEACON_REPORTING_DETAIL_ALL_FF_IE: + /* 2: default - Include all FFs and all Ies. */ + default: + lim_log(mac_ctx, LOG3, FL("Default all IEs and FFs")); + if (flag_bss_present) { + rrm_fill_beacon_ies(mac_ctx, + (uint8_t *) &beacon_report.Ies[0], + (uint8_t *) &beacon_report.numIes, + BEACON_REPORT_MAX_IES, + NULL, + 0, + bss_desc); } + break; } } - lim_log(pMac, LOG1, "Sending Action frame with %d bss info", - bssDescCnt); - lim_send_radio_measure_report_action_frame(pMac, - pCurrentReq->dialog_token, - bssDescCnt, pReport, - pBcnReport->bssId, - pSessionEntry); + lim_log(mac_ctx, LOG1, FL("Sending Action frame with %d bss info"), + bss_desc_count); + lim_send_radio_measure_report_action_frame(mac_ctx, + curr_req->dialog_token, bss_desc_count, report, + beacon_xmit_ind->bssId, session_entry); - pCurrentReq->sendEmptyBcnRpt = false; + curr_req->sendEmptyBcnRpt = false; } - if (pBcnReport->fMeasureDone) { - lim_log(pMac, LOG3, "Measurement done....cleanup the context"); - - rrm_cleanup(pMac); + if (beacon_xmit_ind->fMeasureDone) { + lim_log(mac_ctx, LOG3, FL("Measurement done....cleanup the context")); + rrm_cleanup(mac_ctx); } - if (NULL != pReport) - qdf_mem_free(pReport); + if (NULL != report) + qdf_mem_free(report); return status; } -- cgit v1.2.3 From 86d79203a7b6bd2280fcad32af32fca07c28b5ba Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Wed, 10 Feb 2016 12:33:40 +0530 Subject: qcacld-3.0: Fix Suspicious pointer dereference before NULL check qcacld-2.0 to qcacld-3.0 propagation Fix to add NULL check before dereference of pointer Change-Id: I520aca1fc46cf3fbb30d2f068f6da43a2b2986e6 CRs-Fixed: 965800 --- core/sme/src/oem_data/oem_data_api.c | 4 ++-- core/wma/src/wma_features.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index a607caab6d9f..aa0923141036 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -209,8 +209,7 @@ QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, { QDF_STATUS status = QDF_STATUS_SUCCESS; tSirOemDataReq *pMsg; - tCsrRoamSession *pSession = - CSR_GET_SESSION(pMac, pOemDataReq->sessionId); + tCsrRoamSession *pSession; uint16_t msgLen; sms_log(pMac, LOGW, "OEM_DATA: entering Function %s", __func__); @@ -220,6 +219,7 @@ QDF_STATUS oem_data_send_mb_oem_data_req(tpAniSirGlobal pMac, return QDF_STATUS_E_INVAL; } + pSession = CSR_GET_SESSION(pMac, pOemDataReq->sessionId); pMsg = qdf_mem_malloc(sizeof(*pMsg)); if (NULL == pMsg) { sms_log(pMac, LOGP, FL("qdf_mem_malloc failed")); diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c index 3e500bc59f9d..669854cce0be 100644 --- a/core/wma/src/wma_features.c +++ b/core/wma/src/wma_features.c @@ -1506,7 +1506,7 @@ void wma_start_oem_data_req(tp_wma_handle wma_handle, WMA_LOGD(FL("Send OEM Data Request to target")); - if (!startOemDataReq && !startOemDataReq->data) { + if (!startOemDataReq || !startOemDataReq->data) { WMA_LOGE(FL("startOemDataReq is null")); goto out; } -- cgit v1.2.3 From 720f2b7ac2d8d65e87d62013bd5e729d402723ea Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Fri, 26 Feb 2016 16:44:04 +0530 Subject: qcacld-3.0: Fix to set ptk_installed to true in 11R roaming qcacld-2.0 to qcacld-3.0 propagation PTK exchange and install happens during preauthentication if key_mgmt is FT-PSK. STA TL state moves to authenticated only if ptk_installed is true. Currently ptk_installed is false after roaming due to which STA TL state does not move to authenticated state and also does not enter BMPS. To fix this issue, set ptk_installed to true in case of 11R roaming Change-Id: I59e4466994e59b055246e86613315b0299b767a7 CRs-Fixed: 961555 --- core/hdd/src/wlan_hdd_assoc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index d6060f067b6e..e090491c0a69 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1576,6 +1576,9 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, bool fConnected = false; QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE; hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter); + tHalHandle hal_ctx = WLAN_HDD_GET_HAL_CTX(pAdapter); + tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx); + ENTER(); if (NULL == pRoamInfo) { @@ -1623,10 +1626,23 @@ static QDF_STATUS hdd_roam_set_key_complete_handler(hdd_adapter_t *pAdapter, * At this time we don't handle the state in detail. * Related CR: 174048 - TL not in authenticated state */ - if (eCSR_ROAM_RESULT_AUTHENTICATED == roamResult) + if (eCSR_ROAM_RESULT_AUTHENTICATED == roamResult) { pHddStaCtx->conn_info.gtk_installed = true; - else + /* + * PTK exchange happens in preauthentication + * itself if key_mgmt is FT-PSK, ptk_installed + * was false as there is no set PTK after + * roaming. STA TL state moves to authenticated + * only if ptk_installed is true. So, make + * ptk_installed to true in case of 11R roaming. + */ + if (csr_neighbor_roam_is11r_assoc(mac_ctx, + pAdapter->sessionId)) + pHddStaCtx->conn_info.ptk_installed = + true; + } else { pHddStaCtx->conn_info.ptk_installed = true; + } /* In WPA case move STA to authenticated when * ptk is installed.Earlier in WEP case STA -- cgit v1.2.3 From d178ca89db1323c49d2b71bf771934a3ba434cf7 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Tue, 15 Mar 2016 10:26:04 +0530 Subject: qcacld-3.0: Re-indent rrm_process_radio_measurement_request Fix to reindent rrm_process_radio_measurement_request Change-Id: Ic11301553533706a2799a5d42bedede87ca49357 CRs-Fixed: 978014 --- core/mac/src/pe/rrm/rrm_api.c | 336 +++++++++++++++++++++--------------------- 1 file changed, 171 insertions(+), 165 deletions(-) diff --git a/core/mac/src/pe/rrm/rrm_api.c b/core/mac/src/pe/rrm/rrm_api.c index 1c6f161b4eb7..2ddc38bd7571 100644 --- a/core/mac/src/pe/rrm/rrm_api.c +++ b/core/mac/src/pe/rrm/rrm_api.c @@ -983,215 +983,221 @@ void rrm_process_beacon_request_failure(tpAniSirGlobal pMac, return; } -/* -------------------------------------------------------------------- */ /** - * rrm_process_radio_measurement_request + * rrm_process_beacon_req() - Update curr_req and report + * @mac_ctx: Global pointer to MAC context + * @peer: Macaddress of the peer requesting the radio measurement + * @session_entry: session entry + * @curr_req: Pointer to RRM request + * @report: Pointer to radio measurement report + * @rrm_req: Array of Measurement request IEs + * @num_report: No.of reports + * @index: Index for Measurement request * - * FUNCTION: Processes the Radio Resource Measurement request. + * Update structure sRRMReq and sSirMacRadioMeasureReport and pass it to + * rrm_process_beacon_report_req(). * - * LOGIC: + * Return: tSirRetStatus + */ +tSirRetStatus rrm_process_beacon_req(tpAniSirGlobal mac_ctx, tSirMacAddr peer, + tpPESession session_entry, tpRRMReq curr_req, + tpSirMacRadioMeasureReport report, + tDot11fRadioMeasurementRequest *rrm_req, + uint8_t *num_report, int index) +{ + tRrmRetStatus rrm_status = eRRM_SUCCESS; + + if (curr_req) { + if (report == NULL) { + /* + * Allocate memory to send reports for + * any subsequent requests. + */ + report = qdf_mem_malloc(sizeof(*report) * + (rrm_req->num_MeasurementRequest - index)); + if (NULL == report) { + lim_log(mac_ctx, LOGP, + FL("Unable to allocate memory during RRM Req processing")); + return eSIR_MEM_ALLOC_FAILED; + } + qdf_mem_set(report, sizeof(*report) * + (rrm_req->num_MeasurementRequest - index), 0); + lim_log(mac_ctx, LOG3, + FL("rrm beacon type refused of %d report in beacon table"), + *num_report); + } + report[*num_report].refused = 1; + report[*num_report].type = SIR_MAC_RRM_BEACON_TYPE; + report[*num_report].token = + rrm_req->MeasurementRequest[index].measurement_token; + (*num_report)++; + return eSIR_SUCCESS; + } else { + curr_req = qdf_mem_malloc(sizeof(*curr_req)); + if (NULL == curr_req) { + lim_log(mac_ctx, LOGP, + FL("Unable to allocate memory during RRM Req processing")); + qdf_mem_free(report); + return eSIR_MEM_ALLOC_FAILED; + } + lim_log(mac_ctx, LOG3, FL(" Processing Beacon Report request")); + qdf_mem_set(curr_req, sizeof(*curr_req), 0); + curr_req->dialog_token = rrm_req->DialogToken.token; + curr_req->token = rrm_req-> + MeasurementRequest[index].measurement_token; + curr_req->sendEmptyBcnRpt = true; + mac_ctx->rrm.rrmPEContext.pCurrentReq = curr_req; + rrm_status = rrm_process_beacon_report_req(mac_ctx, curr_req, + &rrm_req->MeasurementRequest[index], session_entry); + if (eRRM_SUCCESS != rrm_status) { + rrm_process_beacon_request_failure(mac_ctx, + session_entry, peer, rrm_status); + rrm_cleanup(mac_ctx); + } + } + return eSIR_SUCCESS; +} +/** + * update_rrm_report() - Set incapable bit + * @mac_ctx: Global pointer to MAC context + * @report: Pointer to radio measurement report + * @rrm_req: Array of Measurement request IEs + * @num_report: No.of reports + * @index: Index for Measurement request * - * ASSUMPTIONS: + * Send a report with incapabale bit set * - * NOTE: + * Return: tSirRetStatus + */ + +tSirRetStatus update_rrm_report(tpAniSirGlobal mac_ctx, + tpSirMacRadioMeasureReport report, + tDot11fRadioMeasurementRequest *rrm_req, + uint8_t *num_report, int index) +{ + if (report == NULL) { + /* + * Allocate memory to send reports for + * any subsequent requests. + */ + report = qdf_mem_malloc(sizeof(*report) * + (rrm_req->num_MeasurementRequest - index)); + if (NULL == report) { + lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing")); + return eSIR_MEM_ALLOC_FAILED; + } + qdf_mem_set(report, sizeof(*report) * + (rrm_req->num_MeasurementRequest - index), 0); + lim_log(mac_ctx, LOG3, FL("rrm beacon type incapable of %d report "), + *num_report); + } + report[*num_report].incapable = 1; + report[*num_report].type = + rrm_req->MeasurementRequest[index].measurement_type; + report[*num_report].token = + rrm_req->MeasurementRequest[index].measurement_token; + (*num_report)++; + return eSIR_SUCCESS; +} + +/* -------------------------------------------------------------------- */ +/** + * rrm_process_radio_measurement_request - Process rrm request + * @mac_ctx: Global pointer to MAC context + * @peer: Macaddress of the peer requesting the radio measurement. + * @rrm_req: Array of Measurement request IEs + * @session_entry: session entry. * - * @param peer Macaddress of the peer requesting the radio measurement. - * @param pRRMReq Array of Measurement request IEs - * @param pSessionEntry session entry. - * @return None + * Processes the Radio Resource Measurement request. + * + * Return: tSirRetStatus */ tSirRetStatus -rrm_process_radio_measurement_request(tpAniSirGlobal pMac, +rrm_process_radio_measurement_request(tpAniSirGlobal mac_ctx, tSirMacAddr peer, - tDot11fRadioMeasurementRequest *pRRMReq, - tpPESession pSessionEntry) + tDot11fRadioMeasurementRequest *rrm_req, + tpPESession session_entry) { uint8_t i; tSirRetStatus status = eSIR_SUCCESS; - tpSirMacRadioMeasureReport pReport = NULL; + tpSirMacRadioMeasureReport report = NULL; uint8_t num_report = 0; - tpRRMReq pCurrentReq = pMac->rrm.rrmPEContext.pCurrentReq; - tRrmRetStatus rrmStatus = eRRM_SUCCESS; + tpRRMReq curr_req = mac_ctx->rrm.rrmPEContext.pCurrentReq; - if (!pRRMReq->num_MeasurementRequest) { - /* No measurement requests.... */ - /* */ - pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); - if (NULL == pReport) { - lim_log(pMac, LOGP, - FL - ("Unable to allocate memory during RRM Req processing")); + if (!rrm_req->num_MeasurementRequest) { + report = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); + if (NULL == report) { + lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); - PELOGE(lim_log(pMac, LOGE, - FL - ("No requestIes in the measurement request, sending incapable report")); - ) - pReport->incapable = 1; + qdf_mem_set(report, sizeof(tSirMacRadioMeasureReport), 0); + lim_log(mac_ctx, LOGE, FL("No requestIes in the measurement request, sending incapable report")); + report->incapable = 1; num_report = 1; - lim_send_radio_measure_report_action_frame(pMac, - pRRMReq->DialogToken.token, - num_report, pReport, peer, - pSessionEntry); - qdf_mem_free(pReport); + lim_send_radio_measure_report_action_frame(mac_ctx, + rrm_req->DialogToken.token, num_report, report, peer, + session_entry); + qdf_mem_free(report); return eSIR_FAILURE; } /* PF Fix */ - if (pRRMReq->NumOfRepetitions.repetitions > 0) { - lim_log(pMac, LOG1, - FL(" number of repetitions %d"), - pRRMReq->NumOfRepetitions.repetitions); - - /* Send a report with incapable bit set. Not supporting repetitions. */ - pReport = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); - if (NULL == pReport) { - lim_log(pMac, LOGP, - FL - ("Unable to allocate memory during RRM Req processing")); + if (rrm_req->NumOfRepetitions.repetitions > 0) { + lim_log(mac_ctx, LOG1, FL(" number of repetitions %d"), + rrm_req->NumOfRepetitions.repetitions); + /* + * Send a report with incapable bit set. + * Not supporting repetitions. + */ + report = qdf_mem_malloc(sizeof(tSirMacRadioMeasureReport)); + if (NULL == report) { + lim_log(mac_ctx, LOGP, FL("Unable to allocate memory during RRM Req processing")); return eSIR_MEM_ALLOC_FAILED; } - qdf_mem_set(pReport, sizeof(tSirMacRadioMeasureReport), 0); - PELOGE(lim_log(pMac, LOGE, FL(" Allocated memory for pReport"));) - pReport->incapable = 1; - pReport->type = pRRMReq->MeasurementRequest[0].measurement_type; + qdf_mem_set(report, sizeof(tSirMacRadioMeasureReport), 0); + lim_log(mac_ctx, LOGE, FL("Allocated memory for report")); + report->incapable = 1; + report->type = rrm_req->MeasurementRequest[0].measurement_type; num_report = 1; goto end; - } - for (i = 0; i < pRRMReq->num_MeasurementRequest; i++) { - switch (pRRMReq->MeasurementRequest[i].measurement_type) { + for (i = 0; i < rrm_req->num_MeasurementRequest; i++) { + switch (rrm_req->MeasurementRequest[i].measurement_type) { case SIR_MAC_RRM_BEACON_TYPE: /* Process beacon request. */ - if (pCurrentReq) { - if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ - pReport = - qdf_mem_malloc(sizeof - (tSirMacRadioMeasureReport) - * - (pRRMReq-> - num_MeasurementRequest - - i)); - if (NULL == pReport) { - lim_log(pMac, LOGP, - FL - ("Unable to allocate memory during RRM Req processing")); - return eSIR_MEM_ALLOC_FAILED; - } - qdf_mem_set(pReport, - sizeof - (tSirMacRadioMeasureReport) - * - (pRRMReq-> - num_MeasurementRequest - - i), 0); - lim_log(pMac, LOG3, - FL - (" rrm beacon type refused of %d report in beacon table"), - num_report); - - } - pReport[num_report].refused = 1; - pReport[num_report].type = - SIR_MAC_RRM_BEACON_TYPE; - pReport[num_report].token = - pRRMReq->MeasurementRequest[i]. - measurement_token; - num_report++; - continue; - } else { - pCurrentReq = - qdf_mem_malloc(sizeof(*pCurrentReq)); - if (NULL == pCurrentReq) { - lim_log(pMac, LOGP, - FL - ("Unable to allocate memory during RRM Req processing")); - qdf_mem_free(pReport); - return eSIR_MEM_ALLOC_FAILED; - } - lim_log(pMac, LOG3, - FL(" Processing Beacon Report request")); - qdf_mem_set(pCurrentReq, sizeof(*pCurrentReq), - 0); - pCurrentReq->dialog_token = - pRRMReq->DialogToken.token; - pCurrentReq->token = - pRRMReq->MeasurementRequest[i]. - measurement_token; - pCurrentReq->sendEmptyBcnRpt = true; - pMac->rrm.rrmPEContext.pCurrentReq = - pCurrentReq; - rrmStatus = - rrm_process_beacon_report_req(pMac, pCurrentReq, - &pRRMReq-> - MeasurementRequest - [i], - pSessionEntry); - if (eRRM_SUCCESS != rrmStatus) { - rrm_process_beacon_request_failure(pMac, - pSessionEntry, - peer, - rrmStatus); - rrm_cleanup(pMac); - } - } + status = rrm_process_beacon_req(mac_ctx, peer, + session_entry, curr_req, report, rrm_req, + &num_report, i); + if (eSIR_SUCCESS != status) + return status; break; case SIR_MAC_RRM_LCI_TYPE: case SIR_MAC_RRM_LOCATION_CIVIC_TYPE: case SIR_MAC_RRM_FINE_TIME_MEAS_TYPE: - lim_log(pMac, LOG1, + lim_log(mac_ctx, LOG1, FL("RRM with type: %d sent to userspace"), - pRRMReq->MeasurementRequest[i].measurement_type); + rrm_req->MeasurementRequest[i].measurement_type); break; default: /* Send a report with incapabale bit set. */ - if (pReport == NULL) { /* Allocate memory to send reports for any subsequent requests. */ - pReport = - qdf_mem_malloc(sizeof - (tSirMacRadioMeasureReport) - * - (pRRMReq-> - num_MeasurementRequest - - i)); - if (NULL == pReport) { - lim_log(pMac, LOGP, - FL - ("Unable to allocate memory during RRM Req processing")); - return eSIR_MEM_ALLOC_FAILED; - } - qdf_mem_set(pReport, - sizeof(tSirMacRadioMeasureReport) - * (pRRMReq->num_MeasurementRequest - - i), 0); - lim_log(pMac, LOG3, - FL - ("rrm beacon type incapable of %d report "), - num_report); - } - pReport[num_report].incapable = 1; - pReport[num_report].type = - pRRMReq->MeasurementRequest[i].measurement_type; - pReport[num_report].token = - pRRMReq->MeasurementRequest[i].measurement_token; - num_report++; + status = update_rrm_report(mac_ctx, report, rrm_req, + &num_report, i); + if (eSIR_SUCCESS != status) + return status; break; } } end: - if (pReport) { - lim_send_radio_measure_report_action_frame(pMac, - pRRMReq->DialogToken.token, - num_report, pReport, peer, - pSessionEntry); - - qdf_mem_free(pReport); - lim_log(pMac, LOG3, FL(" Free memory for pReport")); + if (report) { + lim_send_radio_measure_report_action_frame(mac_ctx, + rrm_req->DialogToken.token, num_report, report, + peer, session_entry); + qdf_mem_free(report); + lim_log(mac_ctx, LOG3, FL(" Free memory for report")); } return status; - } /* -------------------------------------------------------------------- */ -- cgit v1.2.3 From f611d1a0ce5064b393df2d0d4523ecc0e9c7bb3c Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Fri, 19 Feb 2016 17:47:42 +0530 Subject: qcacld-3.0: Re-indent lim_update_short_slot_time Fix to reindent lim_update_short_slot_time Change-Id: Id99dd182d592d3a9135e362265484654ebe81911 CRs-Fixed: 978014 --- core/mac/src/pe/lim/lim_utils.c | 199 +++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 105 deletions(-) diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index d3e4bc11d2ad..0ae1b16cc3ad 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -1502,7 +1502,7 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, * lim_update_short_slot_time() - This function Updates short slot time * @mac_ctx: pointer to Global MAC structure * @peer_mac_addr: pointer to tSirMacAddr - * @beaconparams: pointer to tpUpdateBeaconParams + * @beacon_params: pointer to tpUpdateBeaconParams * @psession_entry: pointer to tpPESession * * Function Updates short slot time if needed when a new station joins @@ -1511,8 +1511,8 @@ lim_update_short_preamble(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, */ void lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, - tpUpdateBeaconParams beaconparams, - tpPESession session_entry) + tpUpdateBeaconParams beacon_params, + tpPESession session_entry) { uint16_t aid; tpDphHashNode sta_ds; @@ -1521,9 +1521,8 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, uint16_t i; /* check whether to enable protection or not */ - sta_ds = - dph_lookup_hash_entry(mac_ctx, peer_mac_addr, &aid, - &session_entry->dph.dphHashTable); + sta_ds = dph_lookup_hash_entry(mac_ctx, peer_mac_addr, &aid, + &session_entry->dph.dphHashTable); lim_get_phy_mode(mac_ctx, &phy_mode, session_entry); if (sta_ds == NULL || phy_mode != WNI_CFG_PHY_MODE_11G) @@ -1538,114 +1537,104 @@ lim_update_short_slot_time(tpAniSirGlobal mac_ctx, tSirMacAddr peer_mac_addr, * softap is always short slot enabled. When the last long slot STA * leaves softAP, we take care of it in lim_decide_short_slot */ - if (sta_ds->shortSlotTimeEnabled == eHAL_CLEAR) { - lim_log(mac_ctx, LOG1, - FL("Short Slot Time is not enabled in Assoc Req from ")); - lim_print_mac_addr(mac_ctx, peer_mac_addr, LOG1); - for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { - if (LIM_IS_AP_ROLE(session_entry) && - session_entry->gLimNoShortSlotParams. - staNoShortSlotCache[i].active) { - if (!qdf_mem_cmp( - session_entry->gLimNoShortSlotParams. - staNoShortSlotCache[i].addr, - peer_mac_addr, sizeof(tSirMacAddr))) - return; - } else if (!LIM_IS_AP_ROLE(session_entry)) { - if (mac_ctx->lim.gLimNoShortSlotParams. - staNoShortSlotCache[i].active) { - if (!qdf_mem_cmp(mac_ctx->lim. - gLimNoShortSlotParams. - staNoShortSlotCache[i]. - addr, peer_mac_addr, - sizeof(tSirMacAddr))) - return; - } - } - } - for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { - if (LIM_IS_AP_ROLE(session_entry) && - !session_entry->gLimNoShortSlotParams. - staNoShortSlotCache[i].active) - break; - else { - if (!mac_ctx->lim.gLimNoShortSlotParams. - staNoShortSlotCache[i].active) - break; - } - } + if (sta_ds->shortSlotTimeEnabled != eHAL_CLEAR) + return; - if (i >= LIM_PROT_STA_CACHE_SIZE) { - if (LIM_IS_AP_ROLE(session_entry)) { - lim_log(mac_ctx, LOGE, - FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), - i, - session_entry->gLimNoShortSlotParams. - numNonShortSlotSta); - lim_print_mac_addr(mac_ctx, peer_mac_addr, - LOGE); - return; - } else { - lim_log(mac_ctx, LOGE, - FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), - i, - mac_ctx->lim.gLimNoShortSlotParams. - numNonShortSlotSta); - lim_print_mac_addr(mac_ctx, peer_mac_addr, - LOGE); + lim_log(mac_ctx, LOG1, FL("Short Slot Time is not enabled in Assoc Req from ")); + lim_print_mac_addr(mac_ctx, peer_mac_addr, LOG1); + for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { + if (LIM_IS_AP_ROLE(session_entry) && + session_entry->gLimNoShortSlotParams. + staNoShortSlotCache[i].active) { + if (!qdf_mem_cmp(session_entry-> + gLimNoShortSlotParams.staNoShortSlotCache[i].addr, + peer_mac_addr, sizeof(tSirMacAddr))) return; + } else if (!LIM_IS_AP_ROLE(session_entry)) { + if (mac_ctx->lim.gLimNoShortSlotParams. + staNoShortSlotCache[i].active) { + if (!qdf_mem_cmp(mac_ctx-> + lim.gLimNoShortSlotParams. + staNoShortSlotCache[i].addr, + peer_mac_addr, sizeof(tSirMacAddr))) + return; } } + } + for (i = 0; i < LIM_PROT_STA_CACHE_SIZE; i++) { + if (LIM_IS_AP_ROLE(session_entry) && + !session_entry->gLimNoShortSlotParams. + staNoShortSlotCache[i].active) + break; + else + if (!mac_ctx->lim.gLimNoShortSlotParams. + staNoShortSlotCache[i].active) + break; + } + if (i >= LIM_PROT_STA_CACHE_SIZE) { if (LIM_IS_AP_ROLE(session_entry)) { - qdf_mem_copy(session_entry->gLimNoShortSlotParams. - staNoShortSlotCache[i].addr, - peer_mac_addr, sizeof(tSirMacAddr)); - session_entry->gLimNoShortSlotParams. - staNoShortSlotCache[i].active = true; - session_entry->gLimNoShortSlotParams. - numNonShortSlotSta++; + lim_log(mac_ctx, LOGE, + FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), + i, session_entry->gLimNoShortSlotParams. + numNonShortSlotSta); + lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); + return; } else { - qdf_mem_copy(mac_ctx->lim.gLimNoShortSlotParams. - staNoShortSlotCache[i].addr, - peer_mac_addr, sizeof(tSirMacAddr)); - mac_ctx->lim.gLimNoShortSlotParams. - staNoShortSlotCache[i].active = true; - mac_ctx->lim.gLimNoShortSlotParams. - numNonShortSlotSta++; + lim_log(mac_ctx, LOGE, + FL("No space in ShortSlot cache (#active %d, #sta %d) for sta "), + i, + mac_ctx->lim.gLimNoShortSlotParams. + numNonShortSlotSta); + lim_print_mac_addr(mac_ctx, peer_mac_addr, LOGE); + return; } - wlan_cfg_get_int(mac_ctx, - WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, - &val); - /* - * Here we check if we are AP role and short slot enabled - * (both admin and oper modes) but we have atleast one STA - * connected with only long slot enabled, we need to change - * our beacon/pb rsp to broadcast short slot disabled - */ - if ((LIM_IS_AP_ROLE(session_entry)) && (val && - session_entry->gLimNoShortSlotParams.numNonShortSlotSta - && session_entry->shortSlotTimeSupported)) { - /* enable long slot time */ - beaconparams->fShortSlotTime = false; - beaconparams->paramChangeBitmap |= + } + + if (LIM_IS_AP_ROLE(session_entry)) { + qdf_mem_copy(session_entry->gLimNoShortSlotParams. + staNoShortSlotCache[i].addr, + peer_mac_addr, sizeof(tSirMacAddr)); + session_entry->gLimNoShortSlotParams. + staNoShortSlotCache[i].active = true; + session_entry->gLimNoShortSlotParams.numNonShortSlotSta++; + } else { + qdf_mem_copy(mac_ctx->lim.gLimNoShortSlotParams. + staNoShortSlotCache[i].addr, + peer_mac_addr, sizeof(tSirMacAddr)); + mac_ctx->lim.gLimNoShortSlotParams. + staNoShortSlotCache[i].active = true; + mac_ctx->lim.gLimNoShortSlotParams. + numNonShortSlotSta++; + } + wlan_cfg_get_int(mac_ctx, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED, &val); + /* + * Here we check if we are AP role and short slot enabled + * (both admin and oper modes) but we have atleast one STA + * connected with only long slot enabled, we need to change + * our beacon/pb rsp to broadcast short slot disabled + */ + if ((LIM_IS_AP_ROLE(session_entry)) && (val && + session_entry->gLimNoShortSlotParams.numNonShortSlotSta + && session_entry->shortSlotTimeSupported)) { + /* enable long slot time */ + beacon_params->fShortSlotTime = false; + beacon_params->paramChangeBitmap |= PARAM_SHORT_SLOT_TIME_CHANGED; - lim_log(mac_ctx, LOG1, - FL("Disable short slot time. Enable long slot time.")); - session_entry->shortSlotTimeSupported = false; - } else if (!LIM_IS_AP_ROLE(session_entry) && - (val && mac_ctx->lim.gLimNoShortSlotParams. - numNonShortSlotSta && - session_entry->shortSlotTimeSupported)) { - /* enable long slot time */ - beaconparams->fShortSlotTime = false; - beaconparams->paramChangeBitmap |= - PARAM_SHORT_SLOT_TIME_CHANGED; - lim_log(mac_ctx, LOG1, - FL("Disable short slot time. Enable long slot time.")); - session_entry->shortSlotTimeSupported = - false; - } + lim_log(mac_ctx, LOG1, + FL("Disable short slot time. Enable long slot time.")); + session_entry->shortSlotTimeSupported = false; + } else if (!LIM_IS_AP_ROLE(session_entry) && + (val && mac_ctx->lim.gLimNoShortSlotParams. + numNonShortSlotSta && + session_entry->shortSlotTimeSupported)) { + /* enable long slot time */ + beacon_params->fShortSlotTime = false; + beacon_params->paramChangeBitmap |= + PARAM_SHORT_SLOT_TIME_CHANGED; + lim_log(mac_ctx, LOG1, + FL("Disable short slot time. Enable long slot time.")); + session_entry->shortSlotTimeSupported = false; } } -- cgit v1.2.3 From c43ee5b756cb92f2be04f1d438337e4ebf551d36 Mon Sep 17 00:00:00 2001 From: Sreelakshmi Konamki Date: Wed, 9 Mar 2016 14:28:05 +0530 Subject: qcacld-3.0: Re-indent lim_process_bt_amp_ap_mlm_del_sta_rsp Fix to reindent lim_process_bt_amp_ap_mlm_del_sta_rsp Change-Id: I1afe50720dc4f560c1bf9e40c1cdb9194e0b121b CRs-Fixed: 978014 --- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 181 ++++++++++----------- 1 file changed, 88 insertions(+), 93 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index eea32a860406..82d39cb22dae 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -1877,112 +1877,107 @@ void lim_process_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx, lim_process_sta_mlm_del_sta_rsp(mac_ctx, msg, session_entry); } -void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ, - tpPESession psessionEntry) +/** + * lim_process_bt_amp_ap_mlm_del_sta_rsp() - Process WMA_DEL_STA_RSP + * @mac_ctx: Global pointer to MAC context + * @msg: Received message + * @session_entry: Session entry + * + * Process WMA_DEL_STA_RSP for AP or bt_amp_ap role + * + * Retunrn: None + */ +void lim_process_bt_amp_ap_mlm_del_sta_rsp(tpAniSirGlobal mac_ctx, + tpSirMsgQ msg, + tpPESession session_entry) { - tpDeleteStaParams pDelStaParams = (tpDeleteStaParams) limMsgQ->bodyptr; - tpDphHashNode pStaDs; - tSirResultCodes statusCode = eSIR_SME_SUCCESS; - if (limMsgQ->bodyptr == NULL) { - lim_log(pMac, LOGE, FL("limMsgQ->bodyptry NULL")); + tpDeleteStaParams del_sta_params = (tpDeleteStaParams) msg->bodyptr; + tpDphHashNode sta_ds; + tSirResultCodes status_code = eSIR_SME_SUCCESS; + + if (msg->bodyptr == NULL) { + lim_log(mac_ctx, LOGE, FL("msg->bodyptr NULL")); return; } - pStaDs = - dph_get_hash_entry(pMac, pDelStaParams->assocId, - &psessionEntry->dph.dphHashTable); - if (pStaDs == NULL) { - lim_log(pMac, LOGE, - FL("DPH Entry for STA %X missing."), - pDelStaParams->assocId); - statusCode = eSIR_SME_REFUSED; - qdf_mem_free(pDelStaParams); - limMsgQ->bodyptr = NULL; - + sta_ds = dph_get_hash_entry(mac_ctx, del_sta_params->assocId, + &session_entry->dph.dphHashTable); + if (sta_ds == NULL) { + lim_log(mac_ctx, LOGE, FL("DPH Entry for STA %X missing."), + del_sta_params->assocId); + status_code = eSIR_SME_REFUSED; + qdf_mem_free(del_sta_params); + msg->bodyptr = NULL; return; } - lim_log(pMac, LOG1, FL("Received del Sta Rsp in StaD MlmState : %d"), - pStaDs->mlmStaContext.mlmState); - if (QDF_STATUS_SUCCESS == pDelStaParams->status) { - lim_log(pMac, LOGW, - FL("AP received the DEL_STA_RSP for assocID: %X."), - pDelStaParams->assocId); - - if ((eLIM_MLM_WT_DEL_STA_RSP_STATE != - pStaDs->mlmStaContext.mlmState) - && (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE != - pStaDs->mlmStaContext.mlmState)) { - lim_log(pMac, LOGE, - FL - ("Received unexpected WMA_DEL_STA_RSP in state %s for staId %d assocId %d "), - lim_mlm_state_str(pStaDs->mlmStaContext.mlmState), - pStaDs->staIndex, pStaDs->assocId); - statusCode = eSIR_SME_REFUSED; - goto end; - } + lim_log(mac_ctx, LOG1, FL("Received del Sta Rsp in StaD MlmState : %d"), + sta_ds->mlmStaContext.mlmState); + if (QDF_STATUS_SUCCESS != del_sta_params->status) { + lim_log(mac_ctx, LOGW, FL("DEL STA failed!")); + status_code = eSIR_SME_REFUSED; + goto end; + } - lim_log(pMac, LOG1, - FL("Deleted STA AssocID %d staId %d MAC "), - pStaDs->assocId, pStaDs->staIndex); - lim_print_mac_addr(pMac, pStaDs->staAddr, LOG1); - if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE == - pStaDs->mlmStaContext.mlmState) { - qdf_mem_free(pDelStaParams); - limMsgQ->bodyptr = NULL; - if (lim_add_sta(pMac, pStaDs, false, psessionEntry) != - eSIR_SUCCESS) { - PELOGE(lim_log - (pMac, LOGE, - FL("could not Add STA with assocId=%d"), - pStaDs->assocId); - ) - /* delete the TS if it has already been added. */ - /* send the response with error status. */ - if (pStaDs->qos.addtsPresent) { - tpLimTspecInfo pTspecInfo; - if (eSIR_SUCCESS == - lim_tspec_find_by_assoc_id(pMac, - pStaDs->assocId, - &pStaDs->qos.addts.tspec, - &pMac->lim.tspecInfo[0], - &pTspecInfo)) { - lim_admit_control_delete_ts(pMac, - pStaDs-> - assocId, - &pStaDs-> - qos. - addts. - tspec. - tsinfo, - NULL, - &pTspecInfo-> - idx); - } + lim_log(mac_ctx, LOGW, + FL("AP received the DEL_STA_RSP for assocID: %X."), + del_sta_params->assocId); + if ((eLIM_MLM_WT_DEL_STA_RSP_STATE != sta_ds->mlmStaContext.mlmState) && + (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE != + sta_ds->mlmStaContext.mlmState)) { + lim_log(mac_ctx, LOGE, + FL("Received unexpected WMA_DEL_STA_RSP in state %s for staId %d assocId %d "), + lim_mlm_state_str(sta_ds->mlmStaContext.mlmState), + sta_ds->staIndex, sta_ds->assocId); + status_code = eSIR_SME_REFUSED; + goto end; + } + + lim_log(mac_ctx, LOG1, FL("Deleted STA AssocID %d staId %d MAC "), + sta_ds->assocId, sta_ds->staIndex); + lim_print_mac_addr(mac_ctx, sta_ds->staAddr, LOG1); + if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE == + sta_ds->mlmStaContext.mlmState) { + qdf_mem_free(del_sta_params); + msg->bodyptr = NULL; + if (lim_add_sta(mac_ctx, sta_ds, false, session_entry) != + eSIR_SUCCESS) { + lim_log(mac_ctx, LOGE, FL("could not Add STA with assocId=%d"), + sta_ds->assocId); + /* + * delete the TS if it has already been added. + * send the response with error status. + */ + if (sta_ds->qos.addtsPresent) { + tpLimTspecInfo pTspecInfo; + if (eSIR_SUCCESS == + lim_tspec_find_by_assoc_id(mac_ctx, + sta_ds->assocId, + &sta_ds->qos.addts.tspec, + &mac_ctx->lim.tspecInfo[0], + &pTspecInfo)) { + lim_admit_control_delete_ts(mac_ctx, + sta_ds->assocId, + &sta_ds->qos.addts.tspec.tsinfo, + NULL, + &pTspecInfo->idx); } - lim_reject_association(pMac, - pStaDs->staAddr, - pStaDs->mlmStaContext. - subType, true, - pStaDs->mlmStaContext. - authType, pStaDs->assocId, - true, - (tSirResultCodes) - eSIR_MAC_UNSPEC_FAILURE_STATUS, - psessionEntry); } - return; + lim_reject_association(mac_ctx, sta_ds->staAddr, + sta_ds->mlmStaContext.subType, true, + sta_ds->mlmStaContext.authType, sta_ds->assocId, + true, + (tSirResultCodes)eSIR_MAC_UNSPEC_FAILURE_STATUS, + session_entry); } - } else { - lim_log(pMac, LOGW, FL("DEL STA failed!")); - statusCode = eSIR_SME_REFUSED; + return; } end: - qdf_mem_free(pDelStaParams); - limMsgQ->bodyptr = NULL; + qdf_mem_free(del_sta_params); + msg->bodyptr = NULL; if (eLIM_MLM_WT_ASSOC_DEL_STA_RSP_STATE != - pStaDs->mlmStaContext.mlmState) { - lim_prepare_and_send_del_sta_cnf(pMac, pStaDs, statusCode, - psessionEntry); + sta_ds->mlmStaContext.mlmState) { + lim_prepare_and_send_del_sta_cnf(mac_ctx, sta_ds, status_code, + session_entry); } return; } -- cgit v1.2.3 From 365d1cb2dce62fe0b5c55b2cbbac8037aa689589 Mon Sep 17 00:00:00 2001 From: Naveen Rawat Date: Fri, 5 Feb 2016 12:10:43 -0800 Subject: qcacld-3.0: Re-indent function sap_select_channel Fix indentation for function sap_select_channel Change-Id: I079648a7f553689b14b7bf940fc835aa60e944b7 CRs-Fixed: 972906 --- core/sap/src/sap_ch_select.c | 434 ++++++++++++++++++++----------------------- 1 file changed, 203 insertions(+), 231 deletions(-) diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c index 9e0b14385d23..4eeea7c3bce4 100644 --- a/core/sap/src/sap_ch_select.c +++ b/core/sap/src/sap_ch_select.c @@ -1890,299 +1890,271 @@ bool sap_filter_over_lap_ch(ptSapContext pSapCtx, uint16_t chNum) return eSAP_FALSE; } -/*========================================================================== - FUNCTION sap_select_channel +/** + * sap_select_channel_no_scan_result() - select SAP channel when no scan results + * are available. + * @sap_ctx: Sap context + * + * Returns: channel number if success, 0 otherwise + */ +static uint8_t sap_select_channel_no_scan_result(ptSapContext sap_ctx) +{ + enum channel_state ch_type; + uint32_t start_ch_num, end_ch_num; +#ifdef FEATURE_WLAN_CH_AVOID + uint8_t i, first_safe_ch_in_range = SAP_CHANNEL_NOT_SELECTED; +#endif + start_ch_num = sap_ctx->acs_cfg->start_ch; + end_ch_num = sap_ctx->acs_cfg->end_ch; - DESCRIPTION - Runs a algorithm to select the best channel to operate in based on BSS - rssi and bss count on each channel + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + FL("start - end: %d - %d"), start_ch_num, end_ch_num); - DEPENDENCIES - NA. +#ifndef FEATURE_WLAN_CH_AVOID + sap_ctx->acs_cfg->pri_ch = start_ch_num; + sap_ctx->acs_cfg->ht_sec_ch = 0; + /* pick the first channel in configured range */ + return start_ch_num; +#else - PARAMETERS + /* get a channel in PCL and within the range */ + for (i = 0; i < sap_ctx->acs_cfg->pcl_ch_count; i++) { + if ((sap_ctx->acs_cfg->pcl_channels[i] < start_ch_num) || + (sap_ctx->acs_cfg->pcl_channels[i] > end_ch_num)) + continue; - IN - halHandle : Pointer to HAL handle - pResult : Pointer to tScanResultHandle + first_safe_ch_in_range = sap_ctx->acs_cfg->pcl_channels[i]; + break; + } - RETURN VALUE - uint8_t : Success - channel number, Fail - zero + if (SAP_CHANNEL_NOT_SELECTED != first_safe_ch_in_range) + return first_safe_ch_in_range; - SIDE EFFECTS - ============================================================================*/ -uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx, - tScanResultHandle pScanResult) + for (i = 0; i < NUM_CHANNELS; i++) { + if ((safe_channels[i].channelNumber < start_ch_num) || + (safe_channels[i].channelNumber > end_ch_num)) + continue; + + ch_type = cds_get_channel_state(safe_channels[i].channelNumber); + + if ((ch_type == CHANNEL_STATE_DISABLE) || + (ch_type == CHANNEL_STATE_INVALID)) + continue; + + if (safe_channels[i].isSafe == true) { + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + FL("channel %d in the configuration is safe"), + safe_channels[i].channelNumber); + first_safe_ch_in_range = safe_channels[i].channelNumber; + break; + } + + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + FL("channel %d in the configuration is unsafe"), + safe_channels[i].channelNumber); + } + + /* if no channel selected return SAP_CHANNEL_NOT_SELECTED */ + return first_safe_ch_in_range; +#endif /* !FEATURE_WLAN_CH_AVOID */ +} + +/** + * sap_select_channel() - select SAP channel + * @hal: Pointer to HAL handle + * @sap_ctx: Sap context + * @scan_result: Pointer to tScanResultHandle + * + * Runs a algorithm to select the best channel to operate in based on BSS + * rssi and bss count on each channel + * + * Returns: channel number if success, 0 otherwise + */ +uint8_t sap_select_channel(tHalHandle hal, ptSapContext sap_ctx, + tScanResultHandle scan_result) { /* DFS param object holding all the data req by the algo */ - tSapChSelSpectInfo oSpectInfoParams = { NULL, 0 }; - tSapChSelSpectInfo *pSpectInfoParams = &oSpectInfoParams; /* Memory? NB */ - uint8_t bestChNum = SAP_CHANNEL_NOT_SELECTED; -#ifdef FEATURE_WLAN_CH_AVOID - uint8_t i; - uint8_t firstSafeChannelInRange = SAP_CHANNEL_NOT_SELECTED; -#endif + tSapChSelSpectInfo spect_info_obj = { NULL, 0 }; + tSapChSelSpectInfo *spect_info = &spect_info_obj; + uint8_t best_ch_num = SAP_CHANNEL_NOT_SELECTED; #ifdef SOFTAP_CHANNEL_RANGE - uint32_t startChannelNum; - uint32_t endChannelNum; - uint32_t operatingBand = 0; - uint32_t tmpChNum; uint8_t count; + uint32_t start_ch_num, end_ch_num, tmp_ch_num, operating_band = 0; #endif QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s, Running SAP Ch Select", __func__); #ifdef FEATURE_WLAN_CH_AVOID - sap_update_unsafe_channel_list(pSapCtx); + sap_update_unsafe_channel_list(sap_ctx); #endif - if (NULL == pScanResult) { + if (NULL == scan_result) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: No external AP present\n", __func__); + FL("No external AP present")); #ifndef SOFTAP_CHANNEL_RANGE - return bestChNum; + return SAP_CHANNEL_NOT_SELECTED; #else - startChannelNum = pSapCtx->acs_cfg->start_ch; - endChannelNum = pSapCtx->acs_cfg->end_ch; - - - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "%s: start - end: %d - %d\n", __func__, - startChannelNum, endChannelNum); - -#ifndef FEATURE_WLAN_CH_AVOID /* FEATURE_WLAN_CH_AVOID NOT defined case */ - pSapCtx->acs_cfg->pri_ch = startChannelNum; - pSapCtx->acs_cfg->ht_sec_ch = 0; - /* pick the first channel in configured range */ - return startChannelNum; -#else /* FEATURE_WLAN_CH_AVOID defined */ - - /* get a channel in PCL and within the range */ - for (i = 0; i < pSapCtx->acs_cfg->pcl_ch_count; i++) { - if ((pSapCtx->acs_cfg->pcl_channels[i] >= - startChannelNum) - && (pSapCtx->acs_cfg->pcl_channels[i] <= - endChannelNum)) { - firstSafeChannelInRange = - pSapCtx->acs_cfg->pcl_channels[i]; - break; - } - } - if (SAP_CHANNEL_NOT_SELECTED != firstSafeChannelInRange) - return firstSafeChannelInRange; - - for (i = 0; i < NUM_CHANNELS; i++) { - if ((safe_channels[i].channelNumber >= startChannelNum) - && (safe_channels[i].channelNumber <= - endChannelNum)) { - enum channel_state channel_type = - cds_get_channel_state(safe_channels[i]. - channelNumber); - - if ((channel_type == CHANNEL_STATE_DISABLE) || - (channel_type == CHANNEL_STATE_INVALID)) - continue; - - if (safe_channels[i].isSafe == true) { - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - "%s: channel %d in the configuration is safe\n", - __func__, - safe_channels[i]. - channelNumber); - firstSafeChannelInRange = - safe_channels[i].channelNumber; - break; - } - - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - "%s: channel %d in the configuration is unsafe\n", - __func__, - safe_channels[i].channelNumber); - } - } - - /* if no channel selected return SAP_CHANNEL_NOT_SELECTED */ - return firstSafeChannelInRange; -#endif /* !FEATURE_WLAN_CH_AVOID */ -#endif /* SOFTAP_CHANNEL_RANGE */ + return sap_select_channel_no_scan_result(sap_ctx); +#endif } - /* Initialize the structure pointed by pSpectInfoParams */ - if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) { + /* Initialize the structure pointed by spect_info */ + if (sap_chan_sel_init(hal, spect_info, sap_ctx) != eSAP_TRUE) { QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "In %s, Ch Select initialization failed", __func__); + FL("Ch Select initialization failed")); return SAP_CHANNEL_NOT_SELECTED; } /* Compute the weight of the entire spectrum in the operating band */ - sap_compute_spect_weight(pSpectInfoParams, halHandle, pScanResult, - pSapCtx); + sap_compute_spect_weight(spect_info, hal, scan_result, sap_ctx); #ifdef FEATURE_AP_MCC_CH_AVOIDANCE /* process avoid channel IE to collect all channels to avoid */ - sap_process_avoid_ie(halHandle, pSapCtx, pScanResult, pSpectInfoParams); + sap_process_avoid_ie(hal, sap_ctx, scan_result, spect_info); #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */ #ifdef SOFTAP_CHANNEL_RANGE - startChannelNum = pSapCtx->acs_cfg->start_ch; - endChannelNum = pSapCtx->acs_cfg->end_ch; - SET_ACS_BAND(operatingBand, pSapCtx); + start_ch_num = sap_ctx->acs_cfg->start_ch; + end_ch_num = sap_ctx->acs_cfg->end_ch; + SET_ACS_BAND(operating_band, sap_ctx); - pSapCtx->acsBestChannelInfo.channelNum = 0; - pSapCtx->acsBestChannelInfo.weight = SAP_ACS_WEIGHT_MAX; + sap_ctx->acsBestChannelInfo.channelNum = 0; + sap_ctx->acsBestChannelInfo.weight = SAP_ACS_WEIGHT_MAX; - /* Sort the channel list as per the computed weights, lesser weight first. */ - sap_sort_chl_weight_all(pSapCtx, pSpectInfoParams, operatingBand); + /* Sort the ch lst as per the computed weights, lesser weight first. */ + sap_sort_chl_weight_all(sap_ctx, spect_info, operating_band); /*Loop till get the best channel in the given range */ - for (count = 0; count < pSpectInfoParams->numSpectChans; count++) { - if ((startChannelNum <= pSpectInfoParams->pSpectCh[count].chNum) - && (endChannelNum >= - pSpectInfoParams->pSpectCh[count].chNum)) { - if (bestChNum == SAP_CHANNEL_NOT_SELECTED) { - bestChNum = - pSpectInfoParams->pSpectCh[count].chNum; - /* check if bestChNum is in preferred channel list */ - bestChNum = - sap_select_preferred_channel_from_channel_list - (bestChNum, pSapCtx, pSpectInfoParams); - if (bestChNum == SAP_CHANNEL_NOT_SELECTED) { - /* not in preferred channel list, go to next best channel */ - continue; - } + for (count = 0; count < spect_info->numSpectChans; count++) { + if ((start_ch_num > spect_info->pSpectCh[count].chNum) || + (end_ch_num < spect_info->pSpectCh[count].chNum)) + continue; -#ifdef FEATURE_AP_MCC_CH_AVOIDANCE - /* Weight of the channels(device's AP is - * operating) increased to MAX+1 so that they - * will be choosen only when there is no other - * best channel to choose - */ - if (sap_check_in_avoid_ch_list(pSapCtx, - bestChNum)) { - bestChNum = SAP_CHANNEL_NOT_SELECTED; - continue; - } -#endif + if (best_ch_num == SAP_CHANNEL_NOT_SELECTED) { + best_ch_num = spect_info->pSpectCh[count].chNum; + /* check if best_ch_num is in preferred channel list */ + best_ch_num = + sap_select_preferred_channel_from_channel_list( + best_ch_num, sap_ctx, spect_info); + /* if not in preferred ch lst, go to nxt best ch */ + if (best_ch_num == SAP_CHANNEL_NOT_SELECTED) + continue; - pSapCtx->acsBestChannelInfo.channelNum = - bestChNum; - pSapCtx->acsBestChannelInfo.weight = - pSpectInfoParams-> - pSpectCh[count]. - weight_copy; +#ifdef FEATURE_AP_MCC_CH_AVOIDANCE + /* + * Weight of the channels(device's AP is operating) + * increased to MAX+1 so that they will be choosen only + * when there is no other best channel to choose + */ + if (sap_check_in_avoid_ch_list(sap_ctx, best_ch_num)) { + best_ch_num = SAP_CHANNEL_NOT_SELECTED; + continue; } +#endif - if (bestChNum != SAP_CHANNEL_NOT_SELECTED) { - if (operatingBand == eCSR_DOT11_MODE_11g) { - /* Give preference to Non-overlap channels */ - if (sap_filter_over_lap_ch(pSapCtx, - pSpectInfoParams-> - pSpectCh[count]. - chNum)) { - tmpChNum = - pSpectInfoParams-> - pSpectCh[count].chNum; - tmpChNum = - sap_select_preferred_channel_from_channel_list - (tmpChNum, pSapCtx, - pSpectInfoParams); - if (tmpChNum != - SAP_CHANNEL_NOT_SELECTED) { - bestChNum = tmpChNum; - break; - } - } - } - } + sap_ctx->acsBestChannelInfo.channelNum = best_ch_num; + sap_ctx->acsBestChannelInfo.weight = + spect_info->pSpectCh[count].weight_copy; } + + if (best_ch_num == SAP_CHANNEL_NOT_SELECTED) + continue; + + if (operating_band != eCSR_DOT11_MODE_11g) + continue; + + /* Give preference to Non-overlap channels */ + if (false == sap_filter_over_lap_ch(sap_ctx, + spect_info->pSpectCh[count].chNum)) + continue; + + tmp_ch_num = spect_info->pSpectCh[count].chNum; + tmp_ch_num = sap_select_preferred_channel_from_channel_list( + tmp_ch_num, sap_ctx, spect_info); + if (tmp_ch_num == SAP_CHANNEL_NOT_SELECTED) + continue; + + best_ch_num = tmp_ch_num; + break; } #else - /* Sort the channel list as per the computed weights, lesser weight first. */ - sap_sort_chl_weight_all(pSapCtx, halHandle, pSpectInfoParams); + /* Sort the ch lst as per the computed weights, lesser weight first. */ + sap_sort_chl_weight_all(sap_ctx, hal, spect_info); /* Get the first channel in sorted array as best 20M Channel */ - bestChNum = (uint8_t) pSpectInfoParams->pSpectCh[0].chNum; + best_ch_num = (uint8_t) spect_info->pSpectCh[0].chNum; /* Select Best Channel from Channel List if Configured */ - bestChNum = sap_select_preferred_channel_from_channel_list(bestChNum, - pSapCtx, - pSpectInfoParams); + best_ch_num = sap_select_preferred_channel_from_channel_list( + best_ch_num, sap_ctx, spect_info); #endif - /** in case the best channel seleted is not in PCL and there is another + /* + * in case the best channel seleted is not in PCL and there is another * channel which has same weightage and is in PCL, choose the one in * PCL */ - for (count = 0; count < pSpectInfoParams->numSpectChans; count++) { - /** check if a pcl channel has the same weightage - * as the best channel - */ - if (ch_in_pcl(pSapCtx, pSpectInfoParams->pSpectCh[count].chNum) - && (pSpectInfoParams->pSpectCh[count].weight == - pSapCtx->acsBestChannelInfo.weight)) { - if (sap_select_preferred_channel_from_channel_list( - pSpectInfoParams->pSpectCh[count].chNum, - pSapCtx, pSpectInfoParams) == - SAP_CHANNEL_NOT_SELECTED) - continue; + for (count = 0; count < spect_info->numSpectChans; count++) { + if (!ch_in_pcl(sap_ctx, spect_info->pSpectCh[count].chNum) || + (spect_info->pSpectCh[count].weight != + sap_ctx->acsBestChannelInfo.weight)) + continue; + + if (sap_select_preferred_channel_from_channel_list( + spect_info->pSpectCh[count].chNum, sap_ctx, spect_info) + == SAP_CHANNEL_NOT_SELECTED) + continue; #ifdef FEATURE_AP_MCC_CH_AVOIDANCE - if (sap_check_in_avoid_ch_list(pSapCtx, bestChNum)) - continue; + if (sap_check_in_avoid_ch_list(sap_ctx, best_ch_num)) + continue; #endif - bestChNum = pSpectInfoParams->pSpectCh[count].chNum; - QDF_TRACE(QDF_MODULE_ID_SAP, - QDF_TRACE_LEVEL_INFO_HIGH, - "change best channel to %d in PCL", - bestChNum); - break; - } + best_ch_num = spect_info->pSpectCh[count].chNum; + QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, + FL("change best channel to %d in PCL"), best_ch_num); + break; } - pSapCtx->acs_cfg->pri_ch = bestChNum; + sap_ctx->acs_cfg->pri_ch = best_ch_num; /* determine secondary channel for 2.4G channel 5, 6, 7 in HT40 */ - if ((operatingBand == eCSR_DOT11_MODE_11g) && - (pSapCtx->acs_cfg->ch_width == CH_WIDTH_40MHZ)) { - if ((bestChNum >= 5) && (bestChNum <= 7)) { - int weight_below, weight_above, i; - tSapSpectChInfo *pspect_info; - - weight_below = weight_above = SAP_ACS_WEIGHT_MAX; - pspect_info = pSpectInfoParams->pSpectCh; - for (i = 0; i < pSpectInfoParams->numSpectChans; - i++) { - if (pspect_info[i].chNum == (bestChNum - 4)) - weight_below = pspect_info[i].weight; - - if (pspect_info[i].chNum == (bestChNum + 4)) - weight_above = pspect_info[i].weight; - } - - if (weight_below < weight_above) - pSapCtx->acs_cfg->ht_sec_ch = - pSapCtx->acs_cfg->pri_ch - 4; - else - pSapCtx->acs_cfg->ht_sec_ch = - pSapCtx->acs_cfg->pri_ch + 4; - } else if (bestChNum >= 1 && bestChNum <= 4) { - pSapCtx->acs_cfg->ht_sec_ch = - pSapCtx->acs_cfg->pri_ch + 4; - } else if (bestChNum >= 8 && bestChNum <= 13) { - pSapCtx->acs_cfg->ht_sec_ch = - pSapCtx->acs_cfg->pri_ch - 4; - } else if (bestChNum == 14) { - pSapCtx->acs_cfg->ht_sec_ch = 0; + if ((operating_band != eCSR_DOT11_MODE_11g) || + (sap_ctx->acs_cfg->ch_width != CH_WIDTH_40MHZ)) + goto sap_ch_sel_end; + + if ((best_ch_num >= 5) && (best_ch_num <= 7)) { + int weight_below, weight_above, i; + tSapSpectChInfo *pspect_info; + + weight_below = weight_above = SAP_ACS_WEIGHT_MAX; + pspect_info = spect_info->pSpectCh; + for (i = 0; i < spect_info->numSpectChans; i++) { + if (pspect_info[i].chNum == (best_ch_num - 4)) + weight_below = pspect_info[i].weight; + if (pspect_info[i].chNum == (best_ch_num + 4)) + weight_above = pspect_info[i].weight; } - pSapCtx->secondary_ch = pSapCtx->acs_cfg->ht_sec_ch; + + if (weight_below < weight_above) + sap_ctx->acs_cfg->ht_sec_ch = + sap_ctx->acs_cfg->pri_ch - 4; + else + sap_ctx->acs_cfg->ht_sec_ch = + sap_ctx->acs_cfg->pri_ch + 4; + } else if (best_ch_num >= 1 && best_ch_num <= 4) { + sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch + 4; + } else if (best_ch_num >= 8 && best_ch_num <= 13) { + sap_ctx->acs_cfg->ht_sec_ch = sap_ctx->acs_cfg->pri_ch - 4; + } else if (best_ch_num == 14) { + sap_ctx->acs_cfg->ht_sec_ch = 0; } + sap_ctx->secondary_ch = sap_ctx->acs_cfg->ht_sec_ch; + +sap_ch_sel_end: /* Free all the allocated memory */ - sap_chan_sel_exit(pSpectInfoParams); + sap_chan_sel_exit(spect_info); QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, - "In %s, Running SAP Ch select Completed, Ch=%d", __func__, - bestChNum); - if (bestChNum > 0 && bestChNum <= 252) - return bestChNum; + FL("Running SAP Ch select Completed, Ch=%d"), best_ch_num); + if (best_ch_num > 0 && best_ch_num <= 252) + return best_ch_num; else return SAP_CHANNEL_NOT_SELECTED; } -- cgit v1.2.3 From 1ed781ff3af88e0a7994bb74af693a139b3fc944 Mon Sep 17 00:00:00 2001 From: Sandeep Puligilla Date: Wed, 16 Mar 2016 12:18:50 -0700 Subject: qcacld-3.0: Increase Scan timeout for emulation platform Increase scan timeout for emulation platform from 30secs to 600secs. Change-Id: I5ed28990917f1262263fc05bd997b51d3cc65bbd CRs-Fixed: 990987 --- core/sme/src/csr/csr_inside_api.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h index 7bc3d3676fd7..829c4f604b64 100644 --- a/core/sme/src/csr/csr_inside_api.h +++ b/core/sme/src/csr/csr_inside_api.h @@ -100,8 +100,11 @@ * can be of a fraction of 3/4 of the total command timeout value. * ***************************************************************************/ #define CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE (1000*30*4) +#ifdef QCA_WIFI_3_0_EMU +#define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30*20) +#else #define CSR_ACTIVE_SCAN_LIST_CMD_TIMEOUT (1000*30) - +#endif #define CSR_MAX_BSSID_COUNT ((CSR_ACTIVE_LIST_CMD_TIMEOUT_VALUE/4000) * 3) #define CSR_CUSTOM_CONC_GO_BI 100 -- cgit v1.2.3 From bedf772bc57f99cdadb83b52c1e87f9d57e0a41b Mon Sep 17 00:00:00 2001 From: Satish Singh Date: Wed, 16 Mar 2016 19:49:05 -0700 Subject: Release 5.1.0.9G Rebase of 5.0.0.169 onto 5.1.0.9G Change-Id: I45b5abfe04dd6b5c66f54a336beb6eef14a7ffc9 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index 960b9429861b..ddfaefaec2a0 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -42,8 +42,8 @@ #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "G" -#define QWLAN_VERSION_BUILD 8 +#define QWLAN_VERSION_BUILD 9 -#define QWLAN_VERSIONSTR "5.1.0.8G" +#define QWLAN_VERSIONSTR "5.1.0.9G" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From decd7afdddf1f043ef895187d1fab3c2632339fa Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 21 Mar 2016 16:45:05 -0700 Subject: qcacld-3.0: Support new build tree structure The kernel can be either directly under build_root/kernel or in a subdirectory within it. The WLAN module has a hard coded assumption for the path. Hence add the changes to correct it based on flags TARGET_KERNEL_VERSION and KERNEL_TO_BUILD_ROOT_OFFSET. Change-Id: Ic4738da5c414a1ce1d74e2b42b918b906f5fda98 CRs-fixed: 992940 --- Android.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index c0739ea6aa8b..69e91dc99641 100644 --- a/Android.mk +++ b/Android.mk @@ -14,6 +14,14 @@ endif # platform # Build/Package only in case of supported target ifneq ($(WLAN_CHIPSET),) +# If TARGET_KERNEL_VERSION is not defined, using default kernel path, +# otherwise kernel path should come from top level Android makefiles. +ifeq ($(TARGET_KERNEL_VERSION),) +$(info "WLAN: TARGET_KERNEL_VERSION not defined, assuming default") +TARGET_KERNEL_SOURCE := kernel +KERNEL_TO_BUILD_ROOT_OFFSET := ../ +endif + LOCAL_PATH := $(call my-dir) # This makefile is only for DLKM @@ -33,7 +41,7 @@ endif # platform-sdk-version # Build wlan.ko as $(WLAN_CHIPSET)_wlan.ko ########################################################### # This is set once per LOCAL_PATH, not per (kernel) module -KBUILD_OPTIONS := WLAN_ROOT=../$(WLAN_BLD_DIR)/qcacld-3.0 +KBUILD_OPTIONS := WLAN_ROOT=$(KERNEL_TO_BUILD_ROOT_OFFSET)$(WLAN_BLD_DIR)/qcacld-3.0 KBUILD_OPTIONS += WLAN_COMMON_ROOT=../../../opensource/wlan/qca-wifi-host-cmn KBUILD_OPTIONS += WLAN_COMMON_INC=../vendor/qcom/opensource/wlan/qca-wifi-host-cmn -- cgit v1.2.3 From b20a81f29dd48ecfa22e93922000ae763d76c7b9 Mon Sep 17 00:00:00 2001 From: Akash Patel Date: Mon, 21 Mar 2016 17:00:02 -0700 Subject: Release 5.1.0.9GG Rebase of 5.0.0.169A onto 5.1.0.9GG Change-Id: I1bf1ab580a20f1bf590fb58e7c1d307a397ae078 CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index ddfaefaec2a0..c89e16f1dbf0 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "G" +#define QWLAN_VERSION_EXTRA "GG" #define QWLAN_VERSION_BUILD 9 -#define QWLAN_VERSIONSTR "5.1.0.9G" +#define QWLAN_VERSIONSTR "5.1.0.9GG" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3 From c1f962efb7163d85d08c17c15f0e1ba71748b0a1 Mon Sep 17 00:00:00 2001 From: Houston Hoffman Date: Wed, 13 Apr 2016 16:35:44 -0700 Subject: qcacld-3.0: Support multiple RX CEs for NAPI/LRO/FastPath Make changes so that LRO and FastPath can check whether a given CE is a datapath RX CE. This is done through new flags in CE_state which indicate whether or not a given CE is a htt_[tr]x CE. Also add support to enable multi-queue NAPI. Note that the paths are not yet parallel-execution protected, but this should be OK as all NAPI instances are processing the same interrupt now and as such as serialized. Acked-by: Orhan K AKYILDIZ Change-Id: I57125b3e1fbad0345b6e1f4ed25e71babaf4f520 CRs-Fixed: 982728 --- core/hdd/src/wlan_hdd_driver_ops.c | 25 ++++++++++--------------- core/hdd/src/wlan_hdd_napi.c | 37 ++++++++++--------------------------- target/inc/htc_services.h | 1 + 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 86d93f084d27..3d72466d9608 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -245,17 +245,6 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, goto err_hif_close; } - ret = hdd_napi_create(); - if (hdd_napi_enabled(HDD_NAPI_ANY)) { - hdd_info("hdd_napi_create returned: %d", ret); - if (ret <= 0) { - hdd_err("NAPI creation error, rc: 0x%x, reinit = %d", - ret, reinit); - ret = -EFAULT; - goto err_hif_close; - } - } - status = hif_enable(hif_ctx, dev, bdev, bid, bus_type, (reinit == true) ? HIF_ENABLE_TYPE_REINIT : HIF_ENABLE_TYPE_PROBE); @@ -263,14 +252,20 @@ static int hdd_hif_open(struct device *dev, void *bdev, const hif_bus_id *bid, hdd_err("hif_enable error = %d, reinit = %d", status, reinit); ret = qdf_status_to_os_return(status); - goto err_napi_destroy; + goto err_hif_close; + } else { + ret = hdd_napi_create(); + hdd_info("hdd_napi_create returned: %d", ret); + if (ret <= 0) { + hdd_err("NAPI creation error, rc: 0x%x, reinit = %d", + ret, reinit); + ret = -EFAULT; + goto err_hif_close; + } } return 0; -err_napi_destroy: - hdd_napi_destroy(true); - err_hif_close: hdd_deinit_cds_hif_context(); hif_close(hif_ctx); diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c index f1907e2f8389..2706b71037e1 100644 --- a/core/hdd/src/wlan_hdd_napi.c +++ b/core/hdd/src/wlan_hdd_napi.c @@ -103,9 +103,7 @@ static uint32_t hdd_napi_get_map(void) */ int hdd_napi_create(void) { - struct hif_opaque_softc *hif_ctx; - uint8_t ul, dl; - int ul_polled, dl_polled; + struct hif_opaque_softc *hif_ctx; int rc = 0; NAPI_DEBUG("-->"); @@ -115,30 +113,15 @@ int hdd_napi_create(void) QDF_ASSERT(NULL != hif_ctx); rc = -EFAULT; } else { - /* - * Note: hif_service_to_pipe returns one pipe id per service. - * For multi-queue NAPI for Adrastea, we will use multiple - * services/calls. - * For Rome, there is only one service, hence a single call - */ - if (QDF_STATUS_SUCCESS != - hif_map_service_to_pipe(hif_ctx, HTT_DATA_MSG_SVC, - &ul, &dl, &ul_polled, &dl_polled)) { - hdd_err("cannot map service to pipe"); - rc = -EINVAL; - } else { - rc = hif_napi_create(hif_ctx, dl, hdd_napi_poll, - QCA_NAPI_BUDGET, - QCA_NAPI_DEF_SCALE); - if (rc < 0) - hdd_err("ERR(%d) creating NAPI on pipe %d", - rc, dl); - else { - hdd_info("napi instance %d created on pipe %d", - rc, dl); - /* rc = (0x01 << rc); -- phase 2 */ - } - } + rc = hif_napi_create(hif_ctx, hdd_napi_poll, + QCA_NAPI_BUDGET, + QCA_NAPI_DEF_SCALE); + if (rc < 0) + hdd_err("ERR(%d) creating NAPI instances", + rc); + else + hdd_info("napi instances were created. Map=0x%x", rc); + } NAPI_DEBUG("<-- [rc=%d]", rc); diff --git a/target/inc/htc_services.h b/target/inc/htc_services.h index bd43772ac53d..8efa640336a2 100644 --- a/target/inc/htc_services.h +++ b/target/inc/htc_services.h @@ -58,6 +58,7 @@ typedef enum { #define HTT_DATA_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP,0) #define HTT_DATA2_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP,1) +#define HTT_DATA3_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 2) /* raw stream service (i.e. flash, tcmd, calibration apps) */ #define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0) -- cgit v1.2.3 From 1c9562691142e02d08c40bf796d36751b4c9cfe3 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Wed, 13 Apr 2016 23:39:04 -0700 Subject: qcacld-3.0: add fastpath Rx support With dedicated CE for Rx HTT messages, skip processing in HTC layer. Do special handling in HIF-CE and HTT layer, this optimization results in 3-4% CPU utilization gain. Change-Id: I400148a0e24ac62dd09e2a95d5f35d94d83fe2df CRs-Fixed: 987182 --- core/dp/htt/htt.c | 4 + core/dp/htt/htt_internal.h | 2 + core/dp/htt/htt_t2h.c | 245 ++++++++++++++++++++++++++++++++++++++++++- core/hdd/src/wlan_hdd_main.c | 2 + 4 files changed, 250 insertions(+), 3 deletions(-) diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index 840692b82dce..ed114ac44caa 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -397,6 +397,10 @@ int htt_htc_attach(struct htt_pdev_t *pdev) HTC_SERVICE_CONNECT_RESP response; A_STATUS status; + if (QDF_STATUS_SUCCESS != + hif_ce_fastpath_cb_register(htt_t2h_msg_handler_fast, pdev)) + qdf_print("failed to register fastpath callback\n"); + qdf_mem_set(&connect, sizeof(connect), 0); qdf_mem_set(&response, sizeof(response), 0); diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 8b371ae5f58e..9e4628b86b3d 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -431,6 +431,8 @@ void htt_rx_detach(struct htt_pdev_t *pdev); int htt_htc_attach(struct htt_pdev_t *pdev); void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt); +int htt_t2h_msg_handler_fast(void *htt_pdev, qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls); void htt_h2t_send_complete(void *context, HTC_PACKET *pkt); diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 3da86ec398d8..3efa3f76cf80 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -44,6 +44,7 @@ #include #include /* htt_tx_status */ +#include #include /* HTT_TX_SCHED, etc. */ #include #include @@ -132,7 +133,8 @@ static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, qdf_nbuf_t msg) } /* Target to host Msg/event handler for low priority messages*/ -void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg) +void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg, bool + free_msg_buf) { struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; uint32_t *msg_word; @@ -473,7 +475,8 @@ void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg) break; }; /* Free the indication buffer */ - qdf_nbuf_free(htt_t2h_msg); + if (free_msg_buf) + qdf_nbuf_free(htt_t2h_msg); } /* Generic Target to host Msg/event handler for low priority messages @@ -680,7 +683,7 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) } default: - htt_t2h_lp_msg_handler(context, htt_t2h_msg); + htt_t2h_lp_msg_handler(context, htt_t2h_msg, true); return; }; @@ -689,6 +692,242 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) qdf_nbuf_free(htt_t2h_msg); } +#ifdef WLAN_FEATURE_FASTPATH +#define HTT_T2H_MSG_BUF_REINIT(_buf, dev) \ + do { \ + QDF_NBUF_CB_PADDR(_buf) -= (HTC_HEADER_LEN + \ + HTC_HDR_ALIGNMENT_PADDING); \ + qdf_nbuf_init_fast((_buf)); \ + OS_SYNC_SINGLE_FOR_DEVICE(dev, (QDF_NBUF_CB_PADDR(_buf)), \ + (skb_end_pointer(_buf) - \ + (_buf)->data) , \ + PCI_DMA_FROMDEVICE); \ + } while (0) + +/** + * htt_t2h_msg_handler_fast() - Fastpath specific message handler + * @context: HTT context + * @cmpl_msdus: netbuf completions + * @num_cmpls: number of completions to be handled + * + * Return: Number of completions handled + */ +int +htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls) +{ + struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; + qdf_nbuf_t htt_t2h_msg; + uint32_t *msg_word; + uint32_t i; + enum htt_t2h_msg_type msg_type; + uint32_t msg_len; + uint32_t num_htt_tx_cmpls = 0; + + for (i = 0; i < num_cmpls; i++) { + htt_t2h_msg = cmpl_msdus[i]; + msg_len = qdf_nbuf_len(htt_t2h_msg); + + /* + * Move the data pointer to point to HTT header + * past the HTC header + HTC header alignment padding + */ + qdf_nbuf_pull_head(htt_t2h_msg, HTC_HEADER_LEN + + HTC_HDR_ALIGNMENT_PADDING); + + /* confirm alignment */ + HTT_ASSERT3((((unsigned long) qdf_nbuf_data(htt_t2h_msg)) & 0x3) + == 0); + + msg_word = (u_int32_t *) qdf_nbuf_data(htt_t2h_msg); + msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word); + + switch (msg_type) { + case HTT_T2H_MSG_TYPE_RX_IND: + { + unsigned int num_mpdu_ranges; + unsigned int num_msdu_bytes; + u_int16_t peer_id; + u_int8_t tid; + + peer_id = HTT_RX_IND_PEER_ID_GET(*msg_word); + tid = HTT_RX_IND_EXT_TID_GET(*msg_word); + + num_msdu_bytes = + HTT_RX_IND_FW_RX_DESC_BYTES_GET( + *(msg_word + 2 + + HTT_RX_PPDU_DESC_SIZE32)); + /* + * 1 word for the message header, + * HTT_RX_PPDU_DESC_SIZE32 words for the FW + * rx PPDU desc. + * 1 word to specify the number of MSDU bytes, + * 1 word for every 4 MSDU bytes (round up), + * 1 word for the MPDU range header + */ + pdev->rx_mpdu_range_offset_words = + (HTT_RX_IND_HDR_BYTES + num_msdu_bytes + 3) >> + 2; + num_mpdu_ranges = + HTT_RX_IND_NUM_MPDU_RANGES_GET(*(msg_word + + 1)); + pdev->rx_ind_msdu_byte_idx = 0; + ol_rx_indication_handler(pdev->txrx_pdev, htt_t2h_msg, + peer_id, tid, num_mpdu_ranges); + break; + } + case HTT_T2H_MSG_TYPE_TX_COMPL_IND: + { + int num_msdus; + enum htt_tx_status status; + + /* status - no enum translation needed */ + status = HTT_TX_COMPL_IND_STATUS_GET(*msg_word); + num_msdus = HTT_TX_COMPL_IND_NUM_GET(*msg_word); + if (num_msdus & 0x1) { + struct htt_tx_compl_ind_base *compl = + (void *)msg_word; + + /* + * Host CPU endianness can be different + * from FW CPU. This can result in even + * and odd MSDU IDs being switched. If + * this happens, copy the switched final + * odd MSDU ID from location + * payload[size], to location + * payload[size-1],where the message + * handler function expects to find it + */ + if (compl->payload[num_msdus] != + HTT_TX_COMPL_INV_MSDU_ID) { + compl->payload[num_msdus - 1] = + compl->payload[num_msdus]; + } + } + ol_tx_completion_handler(pdev->txrx_pdev, num_msdus, + status, msg_word + 1); + + num_htt_tx_cmpls += SLOTS_PER_TX; + break; + } + case HTT_T2H_MSG_TYPE_RX_PN_IND: + { + u_int16_t peer_id; + u_int8_t tid, pn_ie_cnt, *pn_ie = NULL; + int seq_num_start, seq_num_end; + + /*First dword */ + peer_id = HTT_RX_PN_IND_PEER_ID_GET(*msg_word); + tid = HTT_RX_PN_IND_EXT_TID_GET(*msg_word); + + msg_word++; + /*Second dword */ + seq_num_start = + HTT_RX_PN_IND_SEQ_NUM_START_GET(*msg_word); + seq_num_end = + HTT_RX_PN_IND_SEQ_NUM_END_GET(*msg_word); + pn_ie_cnt = + HTT_RX_PN_IND_PN_IE_CNT_GET(*msg_word); + + msg_word++; + /*Third dword*/ + if (pn_ie_cnt) + pn_ie = (u_int8_t *)msg_word; + + ol_rx_pn_ind_handler(pdev->txrx_pdev, peer_id, tid, + seq_num_start, seq_num_end, pn_ie_cnt, pn_ie); + + break; + } + case HTT_T2H_MSG_TYPE_TX_INSPECT_IND: + { + int num_msdus; + + num_msdus = HTT_TX_COMPL_IND_NUM_GET(*msg_word); + if (num_msdus & 0x1) { + struct htt_tx_compl_ind_base *compl = + (void *)msg_word; + + /* + * Host CPU endianness can be different + * from FW CPU. This * can result in + * even and odd MSDU IDs being switched. + * If this happens, copy the switched + * final odd MSDU ID from location + * payload[size], to location + * payload[size-1], where the message + * handler function expects to find it + */ + if (compl->payload[num_msdus] != + HTT_TX_COMPL_INV_MSDU_ID) { + compl->payload[num_msdus - 1] = + compl->payload[num_msdus]; + } + } + ol_tx_inspect_handler(pdev->txrx_pdev, + num_msdus, msg_word + 1); + num_htt_tx_cmpls += SLOTS_PER_TX; + break; + } + case HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND: + { + u_int16_t peer_id; + u_int8_t tid; + u_int8_t offload_ind, frag_ind; + + if (qdf_unlikely( + !pdev->cfg.is_full_reorder_offload)) { + qdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not supported when full reorder offload is disabled\n"); + break; + } + + if (qdf_unlikely( + pdev->txrx_pdev->cfg.is_high_latency)) { + qdf_print("HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND not supported on high latency\n"); + break; + } + + peer_id = HTT_RX_IN_ORD_PADDR_IND_PEER_ID_GET( + *msg_word); + tid = HTT_RX_IN_ORD_PADDR_IND_EXT_TID_GET( + *msg_word); + offload_ind = + HTT_RX_IN_ORD_PADDR_IND_OFFLOAD_GET( + *msg_word); + frag_ind = HTT_RX_IN_ORD_PADDR_IND_FRAG_GET( + *msg_word); + + if (qdf_unlikely(frag_ind)) { + ol_rx_frag_indication_handler( + pdev->txrx_pdev, htt_t2h_msg, peer_id, + tid); + break; + } + + ol_rx_in_order_indication_handler( + pdev->txrx_pdev, htt_t2h_msg, + peer_id, tid, offload_ind); + break; + } + default: + htt_t2h_lp_msg_handler(context, htt_t2h_msg, false); + break; + }; + + /* Re-initialize the indication buffer */ + HTT_T2H_MSG_BUF_REINIT(htt_t2h_msg, pdev->osdev->dev); + qdf_nbuf_set_pktlen(htt_t2h_msg, 0); + } + return num_htt_tx_cmpls; +} +#else +int htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls) +{ + return 0; +} +#endif /* WLAN_FEATURE_FASTPATH */ + /*--- target->host HTT message Info Element access methods ------------------*/ /*--- tx completion message ---*/ diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index ae1e9d00109c..60270235ffdc 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5609,6 +5609,8 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (IS_ERR(hdd_ctx)) return PTR_ERR(hdd_ctx); + hif_update_fastpath_recv_bufs_cnt(hif_sc); + if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { ret = hdd_enable_ftm(hdd_ctx); -- cgit v1.2.3 From 585178db34ffb93318da51f54c8cdf55d9cd0433 Mon Sep 17 00:00:00 2001 From: Manjunathappa Prakash Date: Thu, 14 Apr 2016 01:11:18 -0700 Subject: qcacld-3.0: Cleanup fastpath changes Do following cleanup on fastpath code changes: 1) Remove reaping of Tx HIF buffers in Rx handling, instead handle reaping in Tx fastpath itself. 2) In ce_per_engine_service_fast check for more Rx packets after packet processing. 3) Make stub functions as static inline for non-fastpath enabled case. Change-Id: If07c4344a424ce13b94128bf28931a24255b661a CRs-Fixed: 987182 --- core/dp/htt/htt.c | 6 ++---- core/dp/htt/htt_internal.h | 12 ++++++++++-- core/dp/htt/htt_t2h.c | 33 +++++++++++---------------------- core/hdd/src/wlan_hdd_main.c | 2 -- uapi/linux/osapi_linux.h | 1 + 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c index ed114ac44caa..8b6afd1f9b59 100644 --- a/core/dp/htt/htt.c +++ b/core/dp/htt/htt.c @@ -195,6 +195,8 @@ htt_pdev_alloc(ol_txrx_pdev_handle txrx_pdev, #ifndef AR6004_HW if (htt_htc_attach(pdev)) goto fail2; + if (hif_ce_fastpath_cb_register(htt_t2h_msg_handler_fast, pdev)) + qdf_print("failed to register fastpath callback\n"); #endif return pdev; @@ -397,10 +399,6 @@ int htt_htc_attach(struct htt_pdev_t *pdev) HTC_SERVICE_CONNECT_RESP response; A_STATUS status; - if (QDF_STATUS_SUCCESS != - hif_ce_fastpath_cb_register(htt_t2h_msg_handler_fast, pdev)) - qdf_print("failed to register fastpath callback\n"); - qdf_mem_set(&connect, sizeof(connect), 0); qdf_mem_set(&response, sizeof(response), 0); diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h index 9e4628b86b3d..5b8b167260c7 100644 --- a/core/dp/htt/htt_internal.h +++ b/core/dp/htt/htt_internal.h @@ -431,8 +431,16 @@ void htt_rx_detach(struct htt_pdev_t *pdev); int htt_htc_attach(struct htt_pdev_t *pdev); void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt); -int htt_t2h_msg_handler_fast(void *htt_pdev, qdf_nbuf_t *cmpl_msdus, - uint32_t num_cmpls); +#ifdef WLAN_FEATURE_FASTPATH +void htt_t2h_msg_handler_fast(void *htt_pdev, qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls); +#else +static inline void htt_t2h_msg_handler_fast(void *htt_pdev, + qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls) +{ +} +#endif void htt_h2t_send_complete(void *context, HTC_PACKET *pkt); diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c index 3efa3f76cf80..63fbe2eab7ce 100644 --- a/core/dp/htt/htt_t2h.c +++ b/core/dp/htt/htt_t2h.c @@ -44,7 +44,6 @@ #include #include /* htt_tx_status */ -#include #include /* HTT_TX_SCHED, etc. */ #include #include @@ -133,8 +132,8 @@ static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, qdf_nbuf_t msg) } /* Target to host Msg/event handler for low priority messages*/ -void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg, bool - free_msg_buf) +void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg, + bool free_msg_buf) { struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; uint32_t *msg_word; @@ -698,10 +697,11 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) QDF_NBUF_CB_PADDR(_buf) -= (HTC_HEADER_LEN + \ HTC_HDR_ALIGNMENT_PADDING); \ qdf_nbuf_init_fast((_buf)); \ - OS_SYNC_SINGLE_FOR_DEVICE(dev, (QDF_NBUF_CB_PADDR(_buf)), \ - (skb_end_pointer(_buf) - \ - (_buf)->data) , \ - PCI_DMA_FROMDEVICE); \ + qdf_mem_dma_sync_single_for_device(dev, \ + (QDF_NBUF_CB_PADDR(_buf)), \ + (skb_end_pointer(_buf) - \ + (_buf)->data) , \ + PCI_DMA_FROMDEVICE); \ } while (0) /** @@ -710,11 +710,10 @@ void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt) * @cmpl_msdus: netbuf completions * @num_cmpls: number of completions to be handled * - * Return: Number of completions handled + * Return: None */ -int -htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, - uint32_t num_cmpls) +void htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, + uint32_t num_cmpls) { struct htt_pdev_t *pdev = (struct htt_pdev_t *)context; qdf_nbuf_t htt_t2h_msg; @@ -722,7 +721,6 @@ htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, uint32_t i; enum htt_t2h_msg_type msg_type; uint32_t msg_len; - uint32_t num_htt_tx_cmpls = 0; for (i = 0; i < num_cmpls; i++) { htt_t2h_msg = cmpl_msdus[i]; @@ -807,7 +805,6 @@ htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, ol_tx_completion_handler(pdev->txrx_pdev, num_msdus, status, msg_word + 1); - num_htt_tx_cmpls += SLOTS_PER_TX; break; } case HTT_T2H_MSG_TYPE_RX_PN_IND: @@ -866,7 +863,6 @@ htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, } ol_tx_inspect_handler(pdev->txrx_pdev, num_msdus, msg_word + 1); - num_htt_tx_cmpls += SLOTS_PER_TX; break; } case HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND: @@ -915,16 +911,9 @@ htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, }; /* Re-initialize the indication buffer */ - HTT_T2H_MSG_BUF_REINIT(htt_t2h_msg, pdev->osdev->dev); + HTT_T2H_MSG_BUF_REINIT(htt_t2h_msg, pdev->osdev); qdf_nbuf_set_pktlen(htt_t2h_msg, 0); } - return num_htt_tx_cmpls; -} -#else -int htt_t2h_msg_handler_fast(void *context, qdf_nbuf_t *cmpl_msdus, - uint32_t num_cmpls) -{ - return 0; } #endif /* WLAN_FEATURE_FASTPATH */ diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 60270235ffdc..ae1e9d00109c 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -5609,8 +5609,6 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc) if (IS_ERR(hdd_ctx)) return PTR_ERR(hdd_ctx); - hif_update_fastpath_recv_bufs_cnt(hif_sc); - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { ret = hdd_enable_ftm(hdd_ctx); diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h index a62b96d3f613..21f8ff629ab1 100644 --- a/uapi/linux/osapi_linux.h +++ b/uapi/linux/osapi_linux.h @@ -231,6 +231,7 @@ void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q); #include "ath_carr_pltfrm.h" #endif /* QCA_PARTNER_PLATFORM */ +#define SLOTS_PER_DATAPATH_TX 2 #else /* __KERNEL__ */ #ifdef __GNUC__ -- cgit v1.2.3 From 4f97daa90f8f53ea45d624a12c68ca1bf31d39d3 Mon Sep 17 00:00:00 2001 From: Vishwajith Upendra Date: Sun, 17 Apr 2016 16:52:16 -0700 Subject: Release 5.1.0.2 Corresponds to SU 169 qcacld-3.0 unconverged Change-Id: Ie4b0853e17e15d7ca418dd276385c2e4f9f5f8af CRs-Fixed: 688141 --- core/mac/inc/qwlan_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/mac/inc/qwlan_version.h b/core/mac/inc/qwlan_version.h index c89e16f1dbf0..e473452593ef 100644 --- a/core/mac/inc/qwlan_version.h +++ b/core/mac/inc/qwlan_version.h @@ -41,9 +41,9 @@ #define QWLAN_VERSION_MAJOR 5 #define QWLAN_VERSION_MINOR 1 #define QWLAN_VERSION_PATCH 0 -#define QWLAN_VERSION_EXTRA "GG" -#define QWLAN_VERSION_BUILD 9 +#define QWLAN_VERSION_EXTRA "" +#define QWLAN_VERSION_BUILD 2 -#define QWLAN_VERSIONSTR "5.1.0.9GG" +#define QWLAN_VERSIONSTR "5.1.0.2" #endif /* QWLAN_VERSION_H */ -- cgit v1.2.3